diff options
Diffstat (limited to 'pkgs/development')
7451 files changed, 75115 insertions, 278846 deletions
diff --git a/pkgs/development/ada-modules/gnatcoll/bindings.nix b/pkgs/development/ada-modules/gnatcoll/bindings.nix index 0b7efb60deb9..32d490c1e1ba 100644 --- a/pkgs/development/ada-modules/gnatcoll/bindings.nix +++ b/pkgs/development/ada-modules/gnatcoll/bindings.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { python3 ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; diff --git a/pkgs/development/ada-modules/gnatprove/0001-fix-install.patch b/pkgs/development/ada-modules/gnatprove/0001-fix-install.patch new file mode 100644 index 000000000000..d6911fb9a56a --- /dev/null +++ b/pkgs/development/ada-modules/gnatprove/0001-fix-install.patch @@ -0,0 +1,33 @@ +From 7458110cc50d91cb7833b2abd232faca52865566 Mon Sep 17 00:00:00 2001 +From: Thomas Heijligen <src@posteo.de> +Date: Tue, 21 May 2024 22:02:09 +0000 +Subject: [PATCH] fix install + +--- + Makefile | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index 4950b2d5cc..9d9358ad08 100644 +--- a/Makefile ++++ b/Makefile +@@ -106,11 +106,11 @@ install: + $(CP) share/spark/theories/*why $(THEORIESDIR) + $(CP) share/spark/theories/*mlw $(THEORIESDIR) + $(CP) share/spark/runtimes/README $(RUNTIMESDIR) +- @echo "Generate Coq files by preprocessing context files:" +- $(MAKE) -C include generate +- $(CP) include/src/*.ad? $(INCLUDEDIR) +- $(CP) include/*.gpr $(LIBDIR) +- $(CP) include/proof $(LIBDIR) ++ #@echo "Generate Coq files by preprocessing context files:" ++ #$(MAKE) -C include generate ++ #$(CP) include/src/*.ad? $(INCLUDEDIR) ++ #$(CP) include/*.gpr $(LIBDIR) ++ #$(CP) include/proof $(LIBDIR) + + doc: $(DOC) + +-- +2.44.0 + diff --git a/pkgs/development/ada-modules/gnatprove/default.nix b/pkgs/development/ada-modules/gnatprove/default.nix index d50baba1391f..6e0eda57e8db 100644 --- a/pkgs/development/ada-modules/gnatprove/default.nix +++ b/pkgs/development/ada-modules/gnatprove/default.nix @@ -7,10 +7,22 @@ , python3 , ocamlPackages , makeWrapper +, gpr2 }: let gnat_version = lib.versions.major gnat.version; + # gnatprove fsf-14 requires gpr2 from a special branch + gpr2_24_2_next = gpr2.overrideAttrs(old: rec { + version = "24.2.0-next"; + src = fetchFromGitHub { + owner = "AdaCore"; + repo = "gpr"; + rev = "v${version}"; + hash = "sha256-Tp+N9VLKjVWs1VRPYE0mQY3rl4E5iGb8xDoNatEYBg4="; + }; + }); + fetchSpark2014 = { rev, hash } : fetchFromGitHub { owner = "AdaCore"; repo = "spark2014"; @@ -33,10 +45,21 @@ let }; commit_date = "2023-01-05"; }; + "14" = { + src = fetchSpark2014 { + rev = "ce5fad038790d5dc18f9b5345dc604f1ccf45b06"; # branch fsf-14 + hash = "sha256-WprJJIe/GpcdabzR2xC2dAV7kIYdNTaTpNYoR3UYTVo="; + }; + patches = [ + # Disable Coq related targets which are missing in the fsf-14 branch + ./0001-fix-install.patch + ]; + commit_date = "2024-01-11"; + }; }; thisSpark = spark2014.${gnat_version} or - (builtins.throw "GNATprove depend on a specific GNAT version and can't be built using GNAT ${gnat_version}."); + (builtins.throw "GNATprove depends on a specific GNAT version and can't be built using GNAT ${gnat_version}."); in stdenv.mkDerivation rec { @@ -45,24 +68,35 @@ stdenv.mkDerivation rec { src = thisSpark.src; + patches = thisSpark.patches or []; + nativeBuildInputs = [ gnat gprbuild python3 - ocamlPackages.ocaml makeWrapper - ]; + ] ++ (with ocamlPackages; [ + ocaml + findlib + menhir + ]); buildInputs = [ gnatcoll-core - ocamlPackages.camlzip - ocamlPackages.findlib - ocamlPackages.menhir - ocamlPackages.menhirLib - ocamlPackages.num - ocamlPackages.yojson - ocamlPackages.zarith - ]; + ] ++ (with ocamlPackages; [ + ocamlgraph + zarith + ppx_deriving + ppx_sexp_conv + camlzip + menhirLib + num + re + sexplib + yojson + ]) ++ (lib.optionals (gnat_version == "14")[ + gpr2_24_2_next + ]); propagatedBuildInputs = [ gprbuild @@ -75,14 +109,18 @@ stdenv.mkDerivation rec { ''; configurePhase = '' + runHook preConfigure make setup + runHook postConfigure ''; installPhase = '' + runHook preInstall make install-all cp -a ./install/. $out mkdir $out/share/gpr ln -s $out/lib/gnat/* $out/share/gpr/ + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/ada-modules/gpr2/default.nix b/pkgs/development/ada-modules/gpr2/default.nix new file mode 100644 index 000000000000..1ad58b125db4 --- /dev/null +++ b/pkgs/development/ada-modules/gpr2/default.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchurl, + gprbuild, + which, + gnat, + gnatcoll-core, + gnatcoll-iconv, + gnatcoll-gmp, + enableShared ? !stdenv.hostPlatform.isStatic, +}: + +stdenv.mkDerivation rec { + pname = "gpr2"; + version = "24.0.0"; + + src = fetchurl { + url = "https://github.com/AdaCore/gpr/releases/download/v${version}/gpr2-with-lkparser-${lib.versions.majorMinor version}.tgz"; + sha256 = "1g90689k94q3ma7q76gnjipfblgfvcq6ldwbzcf0l5hx6n8vbly8"; + }; + + nativeBuildInputs = [ + which + gnat + gprbuild + ]; + + makeFlags = [ + "prefix=$(out)" + "GPR2KBDIR=${gprbuild}/share/gprconfig" + "PROCESSORS=$(NIX_BUILD_CORES)" + "ENABLE_SHARED=${if enableShared then "yes" else "no"}" + ]; + + propagatedBuildInputs = [ + gprbuild + gnatcoll-gmp + gnatcoll-core + gnatcoll-iconv + ]; + + meta = with lib; { + description = "The framework for analyzing the GNAT Project (GPR) files"; + homepage = "https://github.com/AdaCore/gpr"; + license = with licenses; [ + asl20 + gpl3Only + ]; + maintainers = with maintainers; [ heijligen ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/ada-modules/gprbuild/default.nix b/pkgs/development/ada-modules/gprbuild/default.nix index f1cf28f00af3..3965789d742e 100644 --- a/pkgs/development/ada-modules/gprbuild/default.nix +++ b/pkgs/development/ada-modules/gprbuild/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { "LIBRARY_TYPE=relocatable" ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Ensure that there is enough space for the `fixDarwinDylibNames` hook to # update the install names of the output dylibs. NIX_LDFLAGS = "-headerpad_max_install_names"; diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix index 98ffe5e6af60..3bf8c57b7543 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.23.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "elixir-lsp"; repo = "elixir-ls"; rev = "v${version}"; - hash = "sha256-X5BJuqr3TVwpv731ym+Ac3+goA0LH9f3H5wWFwQsAB8="; + hash = "sha256-d5O7DGEKuwHbjxwJa3HNtaycQIzFTi74UxszRH7TVzQ="; }; in mixRelease { @@ -20,7 +20,7 @@ mixRelease { mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version elixir; - hash = "sha256-2b5XJnS4ipSjppUniXr1ep8Ymv3yd6COYM/W1QNM/zc="; + hash = "sha256-OxQeIdqjY/k02q+nLQnZ+/Zxy/bdjjSCRrVu0usQcsc="; }; # elixir-ls is an umbrella app @@ -52,10 +52,13 @@ mixRelease { substitute release/debug_adapter.sh $out/bin/elixir-debug-adapter \ --replace 'exec "''${dir}/launch.sh"' "exec $out/lib/launch.sh" chmod +x $out/bin/elixir-debug-adapter - # prepare the launcher + # prepare the launchers substituteInPlace $out/lib/launch.sh \ --replace "ERL_LIBS=\"\$SCRIPTPATH:\$ERL_LIBS\"" \ "ERL_LIBS=$out/lib:\$ERL_LIBS" \ + --replace "exec elixir" "exec ${elixir}/bin/elixir" \ + --replace 'echo "" | elixir' "echo \"\" | ${elixir}/bin/elixir" + substituteInPlace $out/lib/exec.zsh \ --replace "exec elixir" "exec ${elixir}/bin/elixir" runHook postInstall ''; diff --git a/pkgs/development/beam-modules/elvis-erlang/default.nix b/pkgs/development/beam-modules/elvis-erlang/default.nix index cf65e6b1b568..2d9475e72fbb 100644 --- a/pkgs/development/beam-modules/elvis-erlang/default.nix +++ b/pkgs/development/beam-modules/elvis-erlang/default.nix @@ -8,10 +8,10 @@ in rebar3Relx rec { releaseType = "escript"; # The package name "elvis" is already taken pname = "elvis-erlang"; - version = "3.2.5"; + version = "3.2.6"; src = fetchFromGitHub { inherit owner repo; - sha256 = "I0GgfNyozkrM1PRkIXwANr1lji4qZCtOQ/bBEgZc5gc="; + sha256 = "13QM6UbH+1PxzhY/ufi5PEP2pKqSl5+g6tMvKmOUMb0="; rev = version; }; beamDeps = builtins.attrValues (import ./rebar-deps.nix { diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index a2ea7c8bd449..6fa2eb007134 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper , stdenv, writeScript, lib }: let - version = "0.52.0"; + version = "1.1.0"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -16,6 +16,15 @@ let substituteInPlace rebar.config --replace ", warnings_as_errors" "" ''; }); + json_polyfill = super.json_polyfill.overrideAttrs (_: { + # When compiling with erlang >= 27, the json_polyfill rebar script will + # delete the json.beam file as it's not needed. However, we need to + # adjust this path as the nix build will put the beam file under `ebin` + # instead of `$REBAR_DEPS_DIR/json_polyfill/ebin`. + postPatch = '' + substituteInPlace rebar.config.script --replace "{erlc_compile, \"rm \\\"\$REBAR_DEPS_DIR/json_polyfill/ebin/json.beam\\\"\"}" "{erlc_compile, \"rm \\\"ebin/json.beam\\\"\"}" + ''; + }); }); }; in @@ -24,7 +33,7 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - hash = "sha256-tV7M8y0R+BN5ATxM03K0/gtHgITI9KxtvA7o0ft8RuE="; + hash = "sha256-MSDBU+blsAdeixaHMMXmeMJ+9Yrzn3HekE8KbIc/Guo="; rev = version; }; releaseType = "escript"; @@ -45,7 +54,7 @@ rebar3Relx { HOME=. rebar3 proper --constraint_tries 100 ''; # tests seem to be a bit flaky on darwin, skip them for now - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { homepage = "https://github.com/erlang-ls/erlang_ls"; diff --git a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix index 6a6ef5b3747c..76ac0b9581bd 100644 --- a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix +++ b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix @@ -26,11 +26,11 @@ let }; quickrand = builder { name = "quickrand"; - version = "2.0.1"; + version = "2.0.7"; src = fetchHex { pkg = "quickrand"; - version = "2.0.1"; - sha256 = "sha256-FNtn1K72uIFYEOyfPM714yS3O1bK42h/mddSuFvdTJY="; + version = "2.0.7"; + sha256 = "sha256-uKy/iaIkvCF8MHDKi+vG6yNtvn+XZ5k7J0CE6gRNNfA="; }; beamDeps = [ ]; }; @@ -46,11 +46,11 @@ let }; katana_code = builder { name = "katana_code"; - version = "0.2.1"; + version = "2.1.1"; src = fetchHex { pkg = "katana_code"; - version = "0.2.1"; - sha256 = "sha256-hEitP1bZgU+YoovmUPcZG91QZXXjRcwW1YZmCxD26ZI="; + version = "2.1.1"; + sha256 = "sha256-BoDzNSW5qILm9NMCJRixXEb2SL17Db6GkAmA/hwpFAQ="; }; beamDeps = [ ]; }; @@ -115,13 +115,23 @@ let }; beamDeps = [ katana_code ]; }; + json_polyfill = builder { + name = "json_polyfill"; + version = "0.1.4"; + src = fetchHex { + pkg = "json_polyfill"; + version = "0.1.4"; + sha256 = "sha256-SMOX7iVH+kWe3gGjDsDoVxer7TAQhnpj7qrF8gMnQwM="; + }; + beamDeps = [ ]; + }; jsx = builder { name = "jsx"; - version = "3.0.0"; + version = "2.10.0"; src = fetchHex { pkg = "jsx"; - version = "3.0.0"; - sha256 = "sha256-N77KBDX1yoovRfdqRiEedkGPvvgMNvA2HCSfx1BZ3G0="; + version = "2.10.0"; + sha256 = "sha256-moPjcEgHKYAWlo21Bvn60PAn3jdUbrg4s64QZMOgrWI="; }; beamDeps = [ ]; }; @@ -138,11 +148,11 @@ let }; erlfmt = builder { name = "erlfmt"; - version = "1.3.0"; + version = "1.5.0"; src = fetchHex { pkg = "erlfmt"; - version = "1.3.0"; - sha256 = "sha256-KoSqHrovT8190x1cV+neK8JwXdoY2kVT8n33EUz6oFI="; + version = "1.5.0"; + sha256 = "sha256-OTOkDPvnkK2U5bZQs2iB3nBFYxkmPBR5tVbpr9vYDHU="; }; beamDeps = [ ]; }; @@ -158,11 +168,11 @@ let }; elvis_core = builder { name = "elvis_core"; - version = "1.3.1"; + version = "3.2.5"; src = fetchHex { pkg = "elvis_core"; - version = "1.3.1"; - sha256 = "sha256-eoiQv4GFoyUs1OvYJv5fita5MCTt+IV26yeunl3BnWk="; + version = "3.2.5"; + sha256 = "sha256-NNkhjwuAclEZA79sy/WesXZd7Pxz/MaDO6XIlZ2384M="; }; beamDeps = [ katana_code zipper ]; }; diff --git a/pkgs/development/chez-modules/chez-matchable/default.nix b/pkgs/development/chez-modules/chez-matchable/default.nix deleted file mode 100644 index b815567e4b4f..000000000000 --- a/pkgs/development/chez-modules/chez-matchable/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, chez }: - -stdenv.mkDerivation rec { - pname = "chez-matchable"; - version = "0.2"; - - src = fetchFromGitHub { - owner = "fedeinthemix"; - repo = "chez-matchable"; - rev = "v${version}"; - sha256 = "sha256-UYoT8Kp1FTfiL22ntrFXFcAB1HGVrJ6p9JgvhUKi+Yo="; - }; - - buildInputs = [ chez ]; - - makeFlags = [ "CHEZ=${lib.getExe chez}" "PREFIX=$(out)" ]; - - doCheck = false; - - meta = with lib; { - description = "This is a Library for ChezScheme providing the portable hygenic pattern matcher by Alex Shinn"; - homepage = "https://github.com/fedeinthemix/chez-matchable/"; - maintainers = [ maintainers.jitwit ]; - license = licenses.publicDomain; - }; - -} diff --git a/pkgs/development/chez-modules/chez-mit/default.nix b/pkgs/development/chez-modules/chez-mit/default.nix deleted file mode 100644 index 154c7362de18..000000000000 --- a/pkgs/development/chez-modules/chez-mit/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, chez, chez-srfi }: - -stdenv.mkDerivation rec { - pname = "chez-mit"; - version = "0.2"; - - src = fetchFromGitHub { - owner = "fedeinthemix"; - repo = "chez-mit"; - rev = "v${version}"; - sha256 = "sha256-TmoLA0zLETKE+PsrGS5dce9xLQUIKwSNixRSVjbrOlk="; - }; - - buildInputs = [ chez chez-srfi ]; - - makeFlags = [ - "CHEZ=${lib.getExe chez}" - "PREFIX=$(out)" - "CHEZSCHEMELIBDIRS=${chez-srfi}/lib/csv${lib.versions.majorMinor chez.version}-site" - ]; - - doCheck = false; - - meta = with lib; { - description = "This is a MIT/GNU Scheme compatibility library for Chez Scheme"; - homepage = "https://github.com/fedeinthemix/chez-mit/"; - maintainers = [ maintainers.jitwit ]; - license = licenses.gpl3Plus; - }; - -} diff --git a/pkgs/development/chez-modules/chez-scmutils/default.nix b/pkgs/development/chez-modules/chez-scmutils/default.nix deleted file mode 100644 index 843a8752df38..000000000000 --- a/pkgs/development/chez-modules/chez-scmutils/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, chez, chez-srfi, chez-mit }: - -stdenv.mkDerivation rec { - pname = "chez-scmutils"; - version = "0.2"; - - src = fetchFromGitHub { - owner = "fedeinthemix"; - repo = "chez-scmutils"; - rev = "v${version}"; - sha256 = "sha256-y2ug7GfmkJC6jddgB8YllsumjmGxFJxTGTpPf1Vcs/s="; - }; - - buildInputs = [ chez chez-srfi chez-mit ]; - - lib-path = "lib/csv${lib.versions.majorMinor chez.version}-site"; - - makeFlags = [ - "CHEZ=${lib.getExe chez}" - "PREFIX=$(out)" - "CHEZSCHEMELIBDIRS=${chez-srfi}/${lib-path}:${chez-mit}/${lib-path}" - ]; - - doCheck = false; - - meta = with lib; { - description = "This is a port of the ‘MIT Scmutils’ library to Chez Scheme"; - homepage = "https://github.com/fedeinthemix/chez-scmutils/"; - maintainers = [ maintainers.jitwit ]; - license = licenses.gpl3; - }; - -} diff --git a/pkgs/development/chez-modules/chez-srfi/default.nix b/pkgs/development/chez-modules/chez-srfi/default.nix deleted file mode 100644 index 317ce8f713ba..000000000000 --- a/pkgs/development/chez-modules/chez-srfi/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, chez }: - -stdenv.mkDerivation rec { - pname = "chez-srfi"; - version = "1.1"; - - src = fetchFromGitHub { - owner = "fedeinthemix"; - repo = "chez-srfi"; - rev = "v${version}"; - sha256 = "sha256-yBhRNfoEt1LOn3/zd/yOWwfErN/qG/tQZnDRqEf8j/0="; - }; - - buildInputs = [ chez ]; - - makeFlags = [ "CHEZ=${lib.getExe chez}" "PREFIX=$(out)" ]; - - doCheck = false; - - meta = with lib; { - description = "This package provides a collection of SRFI libraries for Chez Scheme"; - homepage = "https://github.com/fedeinthemix/chez-srfi/"; - maintainers = [ maintainers.jitwit ]; - license = licenses.x11; - }; - -} diff --git a/pkgs/development/compilers/acme/default.nix b/pkgs/development/compilers/acme/default.nix deleted file mode 100644 index 855abe1844d6..000000000000 --- a/pkgs/development/compilers/acme/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchsvn }: - -stdenv.mkDerivation rec { - pname = "acme"; - version = "unstable-2021-11-05"; - - src = fetchsvn { - url = "svn://svn.code.sf.net/p/acme-crossass/code-0/trunk"; - rev = "323"; - sha256 = "1dzvip90yf1wg0fhfghn96dwrhg289d06b624px9a2wwy3vp5ryg"; - }; - - sourceRoot = "${src.name}/src"; - - postPatch = '' - substituteInPlace Makefile \ - --replace "= gcc" "?= gcc" - ''; - - enableParallelBuilding = true; - - makeFlags = [ "BINDIR=$(out)/bin" ]; - - meta = with lib; { - description = "Multi-platform cross assembler for 6502/6510/65816 CPUs"; - mainProgram = "acme"; - homepage = "https://sourceforge.net/projects/acme-crossass/"; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = with maintainers; [ OPNA2608 ]; - }; -} diff --git a/pkgs/development/compilers/ante/Cargo.lock b/pkgs/development/compilers/ante/Cargo.lock deleted file mode 100644 index a3ffcbfbdaf4..000000000000 --- a/pkgs/development/compilers/ante/Cargo.lock +++ /dev/null @@ -1,970 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ahash" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "anstream" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anstyle-parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" -dependencies = [ - "anstyle", - "windows-sys 0.48.0", -] - -[[package]] -name = "ante" -version = "0.1.1" -dependencies = [ - "clap", - "clap_complete", - "colored", - "cranelift", - "cranelift-jit", - "cranelift-module", - "cranelift-object", - "difference", - "goldentests", - "inkwell", - "mimalloc", - "petgraph", - "target-lexicon", -] - -[[package]] -name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" - -[[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.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "4.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_complete" -version = "4.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" -dependencies = [ - "clap", -] - -[[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", -] - -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "colored" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" -dependencies = [ - "is-terminal", - "lazy_static", - "windows-sys 0.48.0", -] - -[[package]] -name = "cranelift" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd96bba738454eb373087df6d6891b18009361123fef90930def4978e3837448" -dependencies = [ - "cranelift-codegen", - "cranelift-frontend", -] - -[[package]] -name = "cranelift-bforest" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "529ffacce2249ac60edba2941672dfedf3d96558b415d0d8083cd007456e0f55" -dependencies = [ - "cranelift-entity", -] - -[[package]] -name = "cranelift-codegen" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427d105f617efc8cb55f8d036a7fded2e227892d8780b4985e5551f8d27c4a92" -dependencies = [ - "cranelift-bforest", - "cranelift-codegen-meta", - "cranelift-codegen-shared", - "cranelift-entity", - "cranelift-isle", - "log", - "regalloc2", - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cranelift-codegen-meta" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551674bed85b838d45358e3eab4f0ffaa6790c70dc08184204b9a54b41cdb7d1" -dependencies = [ - "cranelift-codegen-shared", -] - -[[package]] -name = "cranelift-codegen-shared" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b3a63ae57498c3eb495360944a33571754241e15e47e3bcae6082f40fec5866" - -[[package]] -name = "cranelift-entity" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11aa8aa624c72cc1c94ea3d0739fa61248260b5b14d3646f51593a88d67f3e6e" - -[[package]] -name = "cranelift-frontend" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "544ee8f4d1c9559c9aa6d46e7aaeac4a13856d620561094f35527356c7d21bd0" -dependencies = [ - "cranelift-codegen", - "log", - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cranelift-isle" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed16b14363d929b8c37e3c557d0a7396791b383ecc302141643c054343170aad" - -[[package]] -name = "cranelift-jit" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0308e7418208639fb96c1a3dc04955fa41c4bc92dfce9106635185f71d5caf46" -dependencies = [ - "anyhow", - "cranelift-codegen", - "cranelift-entity", - "cranelift-module", - "cranelift-native", - "libc", - "log", - "region", - "target-lexicon", - "windows-sys 0.36.1", -] - -[[package]] -name = "cranelift-module" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76979aac10dbcf0c222cd5902565bc93597ac30bbe9d879a2aa5f2402d1561f2" -dependencies = [ - "anyhow", - "cranelift-codegen", -] - -[[package]] -name = "cranelift-native" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51617cf8744634f2ed3c989c3c40cd6444f63377c6d994adab0d85807f3eb682" -dependencies = [ - "cranelift-codegen", - "libc", - "target-lexicon", -] - -[[package]] -name = "cranelift-object" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e649a13f3951ad3b8cb13a3a774481c12159a98eb386b04583573c57d7cf56" -dependencies = [ - "anyhow", - "cranelift-codegen", - "cranelift-module", - "log", - "object", - "target-lexicon", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - -[[package]] -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.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "getrandom" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "goldentests" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8476785a67758ffc17be1d41009468ef27fb96b5211c9d375a4356bf891dcbc5" -dependencies = [ - "colored", - "rayon", - "shlex", - "similar", -] - -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash", -] - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[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.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" -dependencies = [ - "equivalent", - "hashbrown 0.14.2", -] - -[[package]] -name = "inkwell" -version = "0.2.0" -source = "git+https://github.com/TheDan64/inkwell?branch=master#7a09ad8a5f3b1fc416f95b5e1c97d33df0ab3f06" -dependencies = [ - "either", - "inkwell_internals", - "libc", - "llvm-sys", - "once_cell", - "thiserror", -] - -[[package]] -name = "inkwell_internals" -version = "0.8.0" -source = "git+https://github.com/TheDan64/inkwell?branch=master#7a09ad8a5f3b1fc416f95b5e1c97d33df0ab3f06" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys 0.48.0", -] - -[[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.150" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" - -[[package]] -name = "libmimalloc-sys" -version = "0.1.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" - -[[package]] -name = "llvm-sys" -version = "160.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf51981ac0622b10fe4790763e3de1f3d68a0ee4222e03accaaab6731bd508d" -dependencies = [ - "cc", - "lazy_static", - "libc", - "regex", - "semver", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mimalloc" -version = "0.1.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" -dependencies = [ - "libmimalloc-sys", -] - -[[package]] -name = "object" -version = "0.28.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" -dependencies = [ - "crc32fast", - "hashbrown 0.11.2", - "indexmap 1.9.3", - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap 2.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rayon" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "regalloc2" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d43a209257d978ef079f3d446331d0f1794f5e0fc19b306a199983857833a779" -dependencies = [ - "fxhash", - "log", - "slice-group-by", - "smallvec", -] - -[[package]] -name = "regex" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "region" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877e54ea2adcd70d80e9179344c97f93ef0dffd6b03e1f4529e6e83ab2fa9ae0" -dependencies = [ - "bitflags 1.3.2", - "libc", - "mach", - "winapi", -] - -[[package]] -name = "rustix" -version = "0.38.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "semver" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" - -[[package]] -name = "shlex" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" - -[[package]] -name = "similar" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" - -[[package]] -name = "slice-group-by" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" - -[[package]] -name = "smallvec" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "2.0.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "target-lexicon" -version = "0.12.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" - -[[package]] -name = "thiserror" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[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 = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm", - "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", - "windows_x86_64_msvc 0.48.5", -] - -[[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_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[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_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[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_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/pkgs/development/compilers/ante/default.nix b/pkgs/development/compilers/ante/default.nix deleted file mode 100644 index e3b4738b7b21..000000000000 --- a/pkgs/development/compilers/ante/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ fetchFromGitHub -, lib -, libffi -, libxml2 -, llvmPackages_16 -, ncurses -, rustPlatform -}: - -rustPlatform.buildRustPackage { - pname = "ante"; - version = "unstable-2023-12-18"; - src = fetchFromGitHub { - owner = "jfecher"; - repo = "ante"; - rev = "e38231ffa51b84a2ca53b4b0439d1ca5e0dea32a"; - hash = "sha256-UKEoOm+Jc0YUwO74Tn038MLeX/c3d2z8I0cTBVfX61U="; - }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "inkwell-0.2.0" = "sha256-eMoclRtekg8v+m5KsTcjB3zCdPkcJy42NALEEuT/fw8="; - }; - }; - - /* - https://crates.io/crates/llvm-sys#llvm-compatibility - llvm-sys requires a specific version of llvmPackages, - that is not the same as the one included by default with rustPlatform. - */ - nativeBuildInputs = [ llvmPackages_16.llvm ]; - buildInputs = [ libffi libxml2 ncurses ]; - - postPatch = '' - substituteInPlace tests/golden_tests.rs --replace \ - 'target/debug' "target/$(rustc -vV | sed -n 's|host: ||p')/release" - ''; - preBuild = - let - major = lib.versions.major llvmPackages_16.llvm.version; - minor = lib.versions.minor llvmPackages_16.llvm.version; - llvm-sys-ver = "${major}${builtins.substring 0 1 minor}"; - in - '' - # On some architectures llvm-sys is not using the package listed inside nativeBuildInputs - export LLVM_SYS_${llvm-sys-ver}_PREFIX=${llvmPackages_16.llvm.dev} - export ANTE_STDLIB_DIR=$out/lib - mkdir -p $ANTE_STDLIB_DIR - cp -r $src/stdlib/* $ANTE_STDLIB_DIR - ''; - - meta = with lib; { - homepage = "https://antelang.org/"; - description = "Low-level functional language for exploring refinement types, lifetime inference, and algebraic effects"; - mainProgram = "ante"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ ehllie ]; - }; -} diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/pkgs/development/compilers/apache-flex-sdk/default.nix deleted file mode 100644 index 527b800551eb..000000000000 --- a/pkgs/development/compilers/apache-flex-sdk/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre }: - -let - playerglobal_ver = "27.0"; - playerglobal = fetchurl { - url = "https://fpdownload.macromedia.com/get/flashplayer/updaters/27/playerglobal27_0.swc"; - sha256 = "0qw2bgls8qsmp80j8vpd4c7s0c8anlrk0ac8z42w89bajcdbwk2f"; - }; -in stdenv.mkDerivation rec { - pname = "apache-flex-sdk"; - version = "4.16.1"; - - src = fetchurl { - url = "mirror://apache/flex/${version}/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "13iq16dqvgcpb0p35x66hzxsq5pkbr2lbwr766nnqiryinnagz8p"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ jre ]; - - dontBuild = true; - - postPatch = '' - shopt -s extglob - for i in bin/!(aasdoc|acompc|amxmlc); do - substituteInPlace $i --replace "java " "${jre}/bin/java " - done - ''; - - installPhase = '' - t=$out/opt/apache-flex-sdk - mkdir -p $t $out/bin - mv * $t - rm $t/bin/*.bat - ln -s $t/bin/* $out/bin/ - - for i in $out/bin/!(aasdoc|acompc|amxmlc); do - wrapProgram $i \ - --set FLEX_HOME $t \ - --set PLAYERGLOBAL_HOME $t/frameworks/libs/player/ - done - - mkdir -p $t/frameworks/libs/player/${playerglobal_ver}/ - cp ${playerglobal} $t/frameworks/libs/player/${playerglobal_ver}/playerglobal.swc - ''; - - dontFixup = true; - - meta = with lib; { - description = "Flex SDK for Adobe Flash / ActionScript"; - homepage = "https://flex.apache.org/"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ dywedir ]; - }; -} diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix deleted file mode 100644 index 37b7158c6284..000000000000 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, icestorm }: - -stdenv.mkDerivation rec { - pname = "arachne-pnr"; - version = "2019.07.29"; - - src = fetchFromGitHub { - owner = "yosyshq"; - repo = "arachne-pnr"; - rev = "c40fb2289952f4f120cc10a5a4c82a6fb88442dc"; - sha256 = "0lg9rccr486cvips3jf289af2b4a2j9chc8iqnkhykgi1hw4pszc"; - }; - - enableParallelBuilding = true; - makeFlags = [ - "PREFIX=$(out)" - "ICEBOX=${icestorm}/share/icebox" - ]; - - postPatch = '' - substituteInPlace ./Makefile \ - --replace 'echo UNKNOWN' 'echo ${lib.substring 0 10 src.rev}' - ''; - - meta = with lib; { - description = "Place and route tool for FPGAs"; - mainProgram = "arachne-pnr"; - longDescription = '' - Arachne-pnr implements the place and route step of - the hardware compilation process for FPGAs. It - accepts as input a technology-mapped netlist in BLIF - format, as output by the Yosys [0] synthesis suite - for example. It currently targets the Lattice - Semiconductor iCE40 family of FPGAs [1]. Its output - is a textual bitstream representation for assembly by - the IceStorm [2] icepack command. - ''; - homepage = "https://github.com/cseed/arachne-pnr"; - license = licenses.mit; - maintainers = with maintainers; [ shell thoughtpolice ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix deleted file mode 100644 index bcaab6fae867..000000000000 --- a/pkgs/development/compilers/asn1c/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, perl }: - -stdenv.mkDerivation rec { - pname = "asn1c"; - version = "0.9.28"; - - src = fetchurl { - url = "https://lionet.info/soft/asn1c-${version}.tar.gz"; - sha256 = "1fc64g45ykmv73kdndr4zdm4wxhimhrir4rxnygxvwkych5l81w0"; - }; - - outputs = [ "out" "doc" "man" ]; - - buildInputs = [ perl ]; - - preConfigure = '' - patchShebangs examples/crfc2asn1.pl - ''; - - postInstall = '' - cp -r skeletons/standard-modules $out/share/asn1c - ''; - - doCheck = true; - - meta = with lib; { - homepage = "http://lionet.info/asn1c/compiler.html"; - description = "Open Source ASN.1 Compiler"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = [ maintainers.numinit ]; - }; -} diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix deleted file mode 100644 index 55b9cf5af86c..000000000000 --- a/pkgs/development/compilers/aspectj/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchurl, - jre, -}: - -let - version = "1.9.22.1"; - versionSnakeCase = builtins.replaceStrings [ "." ] [ "_" ] version; -in -stdenvNoCC.mkDerivation { - pname = "aspectj"; - inherit version; - - __structuredAttrs = true; - - src = fetchurl { - url = "https://github.com/eclipse/org.aspectj/releases/download/V${versionSnakeCase}/aspectj-${version}.jar"; - hash = "sha256-NIyYVhJIGXz+vNVoAQzYsDfmOYc4QrRzJGWeQjS4X0U="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ jre ]; - - installPhase = '' - runHook preInstall - - cat >> props <<EOF - output.dir=$out - context.javaPath=${jre} - EOF - - mkdir -p $out - java -jar $src -text props - - cat >> $out/bin/aj-runtime-env <<EOF - #! ${stdenvNoCC.shell} - - export CLASSPATH=$CLASSPATH:.:$out/lib/aspectjrt.jar - EOF - - chmod u+x $out/bin/aj-runtime-env - - runHook postInstall - ''; - - meta = { - homepage = "https://www.eclipse.org/aspectj/"; - description = "Seamless aspect-oriented extension to the Java programming language"; - license = lib.licenses.epl10; - platforms = lib.platforms.unix; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - }; -} diff --git a/pkgs/development/compilers/ats/default.nix b/pkgs/development/compilers/ats/default.nix deleted file mode 100644 index 35e1b1dd1058..000000000000 --- a/pkgs/development/compilers/ats/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, gmp }: - -stdenv.mkDerivation rec { - pname = "ats"; - version = "0.2.12"; - - src = fetchurl { - url = "mirror://sourceforge/ats-lang/ats-lang-anairiats-${version}.tgz"; - sha256 = "0l2kj1fzhxwsklwmn5yj2vp9rmw4jg0b18bzwqz72bfi8i39736k"; - }; - - # this is necessary because atxt files usually include some .hats files - patches = [ ./install-atsdoc-hats-files.patch ]; - buildInputs = [ gmp ]; - - meta = { - description = "Functional programming language with dependent types"; - homepage = "http://www.ats-lang.org"; - license = lib.licenses.gpl3Plus; - # TODO: it looks like ATS requires gcc specifically. Someone with more knowledge - # will need to experiment. - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.thoughtpolice ]; - }; -} diff --git a/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch b/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch deleted file mode 100644 index 93c6fa07d8a6..000000000000 --- a/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- ats-lang-anairiats-0.2.11/Makefile 2013-12-10 00:43:52.000000000 +0100 -+++ ats-lang-anairiats-0.2.11/Makefile 2014-03-02 07:49:06.985837425 +0100 -@@ -97,7 +97,7 @@ - cd $(abs_top_srcdir) - [ -d $(bindir2) ] || $(MKDIR_P) $(bindir2) - $(MKDIR_P) $(ATSLIBHOME2)/bin -- find ccomp contrib doc libats libc prelude -type d \ -+ find ccomp contrib doc libats libatsdoc libc prelude -type d \ - -exec $(MKDIR_P) $(ATSLIBHOME2)/\{} \; \ - -print - -@@ -105,7 +105,7 @@ - # - # recursively install all files in the list except .svn control files. - # -- for d in ccomp/runtime contrib doc libats libc prelude; do \ -+ for d in ccomp/runtime contrib doc libats libatsdoc libc prelude; do \ - cd $(abs_top_srcdir) && \ - $(INSTALL) -d $(ATSLIBHOME2)/"$$d" && \ - find "$$d" -name .svn -prune -o -type f \ -@@ -143,6 +143,17 @@ - $(INSTALL) -m 755 ats_env.sh $(bindir2)/"$$b" && \ - echo [ats_env.sh] is installed into $(bindir2)/"$$b"; \ - done -+# -+# install atsdoc headers -+# -+ for f in \ -+ utils/atsdoc/SATS/*.sats utils/atsdoc/DATS/*.dats utils/atsdoc/HATS/*.hats; \ -+ do \ -+ [ -f "$$f" ] || continue; \ -+ cd $(abs_top_srcdir) && \ -+ $(INSTALL) -m 644 -D "$$f" $(ATSLIBHOME2)/"$$f" && \ -+ echo "$$f"; \ -+ done - - install:: install_files - diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix deleted file mode 100644 index 2dad47c08abc..000000000000 --- a/pkgs/development/compilers/ats2/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib, stdenv, fetchurl, gmp -, withEmacsSupport ? true -, withContrib ? true }: - -let - versionPkg = "0.4.2"; - - contrib = fetchurl { - url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz"; - hash = "sha256-m0hfBLsaNiLaIktcioK+ZtWUsWht3IDSJ6CzgJmS06c="; - }; - - postInstallContrib = lib.optionalString withContrib - '' - local contribDir=$out/lib/ats2-postiats-*/ ; - mkdir -p $contribDir ; - tar -xzf "${contrib}" --strip-components 1 -C $contribDir ; - ''; - - postInstallEmacs = lib.optionalString withEmacsSupport - '' - local siteLispDir=$out/share/emacs/site-lisp/ats2 ; - mkdir -p $siteLispDir ; - install -m 0644 -v ./utils/emacs/*.el $siteLispDir ; - ''; -in - -stdenv.mkDerivation rec { - pname = "ats2"; - version = versionPkg; - - src = fetchurl { - url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-gmp-${version}.tgz"; - hash = "sha256-UWgDjFojPBYgykrCrJyYvVWY+Gc5d4aRGjTWjc528AM="; - }; - - postPatch = lib.optionalString stdenv.cc.isClang '' - sed -i 's/gcc/clang/g' utils/*/DATS/atscc_util.dats - ''; - - buildInputs = [ gmp ]; - - # Disable parallel build, errors: - # *** No rule to make target 'patscc.dats', needed by 'patscc_dats.c'. Stop. - enableParallelBuilding = false; - - makeFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - "CCOMP=${stdenv.cc.targetPrefix}cc" - ]; - - setupHook = - let - hookFiles = [ ./setup-hook.sh ] ++ lib.optional withContrib ./setup-contrib-hook.sh; - in - builtins.toFile "setupHook.sh" - (lib.concatMapStringsSep "\n" builtins.readFile hookFiles); - - postInstall = postInstallContrib + postInstallEmacs; - - meta = with lib; { - description = "Functional programming language with dependent types"; - homepage = "http://www.ats-lang.org"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice ttuegel bbarker ]; - }; -} diff --git a/pkgs/development/compilers/ats2/setup-contrib-hook.sh b/pkgs/development/compilers/ats2/setup-contrib-hook.sh deleted file mode 100644 index 8c5e123b61c4..000000000000 --- a/pkgs/development/compilers/ats2/setup-contrib-hook.sh +++ /dev/null @@ -1 +0,0 @@ -export PATSHOMERELOC=@out@/lib/ats2-postiats-@version@ diff --git a/pkgs/development/compilers/ats2/setup-hook.sh b/pkgs/development/compilers/ats2/setup-hook.sh deleted file mode 100644 index 67647b1edf69..000000000000 --- a/pkgs/development/compilers/ats2/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -export PATSHOME=@out@/lib/ats2-postiats-@version@ diff --git a/pkgs/development/compilers/august/default.nix b/pkgs/development/compilers/august/default.nix deleted file mode 100644 index 2e8aec11763c..000000000000 --- a/pkgs/development/compilers/august/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage { - pname = "august"; - version = "unstable-2023-08-13"; - - src = fetchFromGitHub { - owner = "yoav-lavi"; - repo = "august"; - rev = "42b8a1bf5ca079aca1769d92315f70b193a9cd4a"; - hash = "sha256-58DZMoRH9PBbM4sok/XbUcwSXBeqUAmFZpffdMKQ+dE="; - }; - - cargoHash = "sha256-/GvBbsSL0dZ0xTystIpb8sk1nNg5hmP4yceCHlh7EQE="; - - postInstall = '' - mv $out/bin/{august-cli,ag} - ''; - - meta = with lib; { - description = "Emmet-like language that produces JSON, TOML, or YAML"; - homepage = "https://github.com/yoav-lavi/august"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "ag"; - }; -} diff --git a/pkgs/development/compilers/avra/default.nix b/pkgs/development/compilers/avra/default.nix deleted file mode 100644 index 8e2d2558c571..000000000000 --- a/pkgs/development/compilers/avra/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "avra"; - version = "1.4.2"; - - src = fetchFromGitHub { - owner = "Ro5bert"; - repo = pname; - rev = version; - hash = "sha256-joOj89WZ9Si5fcu1w1VHj5fOcnB9N2313Yb29A+nCCY="; - }; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - doCheck = true; - - meta = with lib; { - description = "Assembler for the Atmel AVR microcontroller family"; - mainProgram = "avra"; - homepage = "https://github.com/Ro5bert/avra"; - license = licenses.gpl2Plus; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/ballerina/default.nix b/pkgs/development/compilers/ballerina/default.nix index 6dd49281bb81..2b75299dd81e 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.2"; + version = "2201.10.1"; 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-J73fai5mPPNHk/wux4nhX3KsalxWER8nMqWovWgm6WA="; + hash = "sha256-gKxJnoNWYE3ozQ0JvMgHgrg/DCkvFnJqZAecgqvJGq8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/bfc/default.nix b/pkgs/development/compilers/bfc/default.nix deleted file mode 100644 index 83710df4c13b..000000000000 --- a/pkgs/development/compilers/bfc/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, llvmPackages_13 -, libxml2 -, ncurses -, zlib -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "bfc"; - version = "1.12.0"; - - src = fetchFromGitHub { - owner = "Wilfred"; - repo = "bfc"; - rev = version; - hash = "sha256-5pcvwCtXWEexvV3TS62dZ6Opg8ANP2L8B0Z8u/OQENU="; - }; - - cargoHash = "sha256-1w/jPBO1TZpa0ju+O/NxQ/oMyzIvYVoXpj+ZLcIpQoU="; - - buildInputs = [ - libxml2 - ncurses - zlib - ]; - - env.LLVM_SYS_130_PREFIX = llvmPackages_13.llvm.dev; - - # process didn't exit successfully: <...> SIGSEGV - doCheck = false; - - meta = with lib; { - description = "Industrial-grade brainfuck compiler"; - mainProgram = "bfc"; - homepage = "https://bfc.wilfred.me.uk"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ figsoda ]; - broken = stdenv.isAarch64 && stdenv.isLinux; - }; -} diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix deleted file mode 100644 index 9bf22ba6dcf2..000000000000 --- a/pkgs/development/compilers/bigloo/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ fetchurl, lib, stdenv, autoconf, automake, libtool, gmp -, darwin, libunistring -}: - -stdenv.mkDerivation rec { - pname = "bigloo"; - version = "4.4b"; - - src = fetchurl { - url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo-${version}.tar.gz"; - sha256 = "sha256-oxOSJwKWmwo7PYAwmeoFrKaYdYvmvQquWXyutolc488="; - }; - - nativeBuildInputs = [ autoconf automake libtool ]; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.ApplicationServices - libunistring - ]; - - propagatedBuildInputs = [ gmp ]; - - preConfigure = - # For libuv on darwin - lib.optionalString stdenv.isDarwin '' - export LIBTOOLIZE=libtoolize - '' + - # Help libgc's configure. - '' export CXXCPP="$CXX -E" - ''; - - patchPhase = '' - # Fix absolute paths. - sed -e 's=/bin/mv=mv=g' -e 's=/bin/rm=rm=g' \ - -e 's=/tmp=$TMPDIR=g' -i autoconf/* \ - [Mm]akefile* */[Mm]akefile* */*/[Mm]akefile* \ - */*/*/[Mm]akefile* */*/*/*/[Mm]akefile* \ - comptime/Cc/cc.scm gc/install-* - - # Make sure we don't change string lengths in the generated - # C files. - sed -e 's=/bin/rm= rm=g' -e 's=/bin/mv= mv=g' \ - -i comptime/Cc/cc.c - ''; - - checkTarget = "test"; - - # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' - for f in "$out"/bin/*; do - if isELF "$f"; then - patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" - fi - done - ''; - - meta = { - description = "Efficient Scheme compiler"; - homepage = "http://www-sop.inria.fr/indes/fp/Bigloo/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ thoughtpolice ]; - broken = stdenv.isDarwin && stdenv.isAarch64; # segfault during build - - longDescription = '' - Bigloo is a Scheme implementation devoted to one goal: enabling - Scheme based programming style where C(++) is usually - required. Bigloo attempts to make Scheme practical by offering - features usually presented by traditional programming languages - but not offered by Scheme and functional programming. Bigloo - compiles Scheme modules. It delivers small and fast stand alone - binary executables. Bigloo enables full connections between - Scheme and C programs, between Scheme and Java programs, and - between Scheme and C# programs. - ''; - }; -} diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index d6c1442a8b8b..7d78c1d65972 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # "binaryenjs" "binaryenjs_wasm" # not building this "lit" "gtest" ]; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; meta = with lib; { homepage = "https://github.com/WebAssembly/binaryen"; diff --git a/pkgs/development/compilers/blueprint/default.nix b/pkgs/development/compilers/blueprint/default.nix deleted file mode 100644 index 5c1aa1b2a2cd..000000000000 --- a/pkgs/development/compilers/blueprint/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ dbus -, fetchFromGitLab -, gobject-introspection -, lib -, libadwaita -, meson -, ninja -, python3 -, stdenv -, testers -, xvfb-run -}: -stdenv.mkDerivation (finalAttrs: { - pname = "blueprint-compiler"; - version = "0.12.0"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "jwestman"; - repo = "blueprint-compiler"; - rev = "v${finalAttrs.version}"; - hash = "sha256-pvYSFCiYynH3E6QOTu4RfG+6eucq++yiRu75qucSlZU="; - }; - - nativeBuildInputs = [ - meson - ninja - ]; - - buildInputs = [ - libadwaita - (python3.withPackages (ps: with ps; [ - pygobject3 - ])) - ]; - - propagatedBuildInputs = [ - # For setup hook, so that the compiler can find typelib files - gobject-introspection - ]; - - nativeCheckInputs = [ - dbus - xvfb-run - ]; - - # requires xvfb-run - doCheck = !stdenv.isDarwin - && false; # tests time out - - checkPhase = '' - runHook preCheck - - xvfb-run dbus-run-session \ - --config-file=${dbus}/share/dbus-1/session.conf \ - meson test --no-rebuild --print-errorlogs - - runHook postCheck - ''; - - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - }; - - meta = with lib; { - description = "Markup language for GTK user interface files"; - mainProgram = "blueprint-compiler"; - homepage = "https://gitlab.gnome.org/jwestman/blueprint-compiler"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ benediktbroich ranfdev ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix deleted file mode 100644 index e761c8609e8b..000000000000 --- a/pkgs/development/compilers/bluespec/default.nix +++ /dev/null @@ -1,138 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchurl -, autoconf -, automake -, fontconfig -, libX11 -, perl -, flex -, bison -, pkg-config -, tcl -, tk -, xorg -, yices # bsc uses a patched version of yices -, zlib -, ghc -, gmp-static -, iverilog -, asciidoctor -, texliveFull -, which -}: - -let - ghcWithPackages = ghc.withPackages (g: (with g; [ old-time regex-compat syb split ])); - -in stdenv.mkDerivation rec { - pname = "bluespec"; - version = "2024.01"; - - src = fetchFromGitHub { - owner = "B-Lang-org"; - repo = "bsc"; - rev = version; - sha256 = "sha256-yqmtydv94p7qhps0t4EdPaSZNh/9XCuUwOzLqz0gjxE="; - }; - - yices-src = fetchurl { - url = "https://github.com/B-Lang-org/bsc/releases/download/${version}/yices-src-for-bsc-${version}.tar.gz"; - sha256 = "sha256-pyEdCJvmgwOYPMZEtw7aro76tSn/Y/2GcKTyARmIh4E="; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - # https://github.com/B-Lang-org/bsc/pull/278 is still applicable, but will probably not be applied as such - # there is work ongoing: https://github.com/B-Lang-org/bsc/issues/595 https://github.com/B-Lang-org/bsc/pull/600 - patches = [ ./libstp_stub_makefile.patch ]; - - postUnpack = '' - tar -C $sourceRoot/ -xf ${yices-src} - chmod -R +rwX $sourceRoot/src/vendor/yices/v2.6/yices2 - ''; - - preBuild = '' - patchShebangs \ - src/Verilog/copy_module.pl \ - src/comp/update-build-version.sh \ - src/comp/update-build-system.sh \ - src/comp/wrapper.sh - - substituteInPlace src/comp/Makefile \ - --replace 'BINDDIR' 'BINDIR' \ - --replace 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) install-utils' - - # allow running bsc to bootstrap - export LD_LIBRARY_PATH=$PWD/inst/lib/SAT - - # use more cores for GHC building, 44 causes heap overflows in ghc, and - # there is not much speedup after 8.. - if [[ $NIX_BUILD_CORES -gt 8 ]] ; then export GHCJOBS=8; else export GHCJOBS=$NIX_BUILD_CORES; fi - ''; - - buildInputs = yices.buildInputs ++ [ - fontconfig - libX11 # tcltk - tcl - tk - which - xorg.libXft - zlib - ]; - - nativeBuildInputs = [ - automake - autoconf - asciidoctor - bison - flex - ghcWithPackages - perl - pkg-config - texliveFull - ]; - - makeFlags = [ - "release" - "NO_DEPS_CHECKS=1" # skip the subrepo check (this deriviation uses yices-src instead of the subrepo) - "NOGIT=1" # https://github.com/B-Lang-org/bsc/issues/12 - "LDCONFIG=ldconfig" # https://github.com/B-Lang-org/bsc/pull/43 - "STP_STUB=1" # uses yices as a SMT solver and stub out STP - ]; - - doCheck = true; - - nativeCheckInputs = [ - gmp-static - iverilog - ]; - - checkTarget = "check-smoke"; # this is the shortest check but "check-suite" tests much more - - installPhase = '' - mkdir -p $out - mv inst/bin $out - mv inst/lib $out - - # fragile, I know.. - mkdir -p $doc/share/doc/bsc - mv inst/README $doc/share/doc/bsc - mv inst/ReleaseNotes.* $doc/share/doc/bsc - mv inst/doc/*.pdf $doc/share/doc/bsc - ''; - - meta = { - description = "Toolchain for the Bluespec Hardware Definition Language"; - homepage = "https://github.com/B-Lang-org/bsc"; - license = lib.licenses.bsd3; - platforms = [ "x86_64-linux" ]; - mainProgram = "bsc"; - # darwin fails at https://github.com/B-Lang-org/bsc/pull/35#issuecomment-583731562 - # aarch64 fails, as GHC fails with "ghc: could not execute: opt" - maintainers = with lib.maintainers; [ jcumming thoughtpolice ]; - }; -} diff --git a/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch b/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch deleted file mode 100644 index c714afc670c5..000000000000 --- a/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ru bsc-orig/src/vendor/stp/Makefile bsc-new/src/vendor/stp/Makefile ---- bsc-orig/src/vendor/stp/Makefile 1969-12-31 16:00:01.000000000 -0800 -+++ bsc-new/src/vendor/stp/Makefile 2020-11-12 17:42:40.115143035 -0800 -@@ -9,12 +9,13 @@ - SRC = src - else - SRC = src_stub -+SNAME += lib/libstp_stub.so - endif - - ifeq ($(OSTYPE), Darwin) --SNAME=libstp.dylib -+SNAME = lib/libstp.dylib - else --SNAME=libstp.so.1 -+SNAME += lib/libstp.so.1 - endif - - all: install -@@ -23,7 +24,7 @@ - $(MAKE) -C $(SRC) install - ln -fsn HaskellIfc include_hs - install -m 755 -d $(PREFIX)/lib/SAT -- install -m 644 lib/$(SNAME) $(PREFIX)/lib/SAT -+ install -m 644 $(SNAME) $(PREFIX)/lib/SAT - - clean: - $(MAKE) -C $(SRC) clean diff --git a/pkgs/development/compilers/c0/default.nix b/pkgs/development/compilers/c0/default.nix index 4c3f5ba201de..8dbb1627db3a 100644 --- a/pkgs/development/compilers/c0/default.nix +++ b/pkgs/development/compilers/c0/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { --replace '`../get_version.sh`' '${version}' \ --replace '`date`' '1970-01-01T00:00:00Z' \ --replace '`hostname`' 'nixpkgs' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' for f in cc0/compiler/bin/coin-o0-support cc0/compiler/bin/cc0-o0-support; do substituteInPlace $f --replace '$(brew --prefix gnu-getopt)' '${getopt}' done @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { getopt mlton pkg-config - ] ++ lib.optionals stdenv.isDarwin [ darwin.sigtool ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ]; buildInputs = [ boehmgc @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; # line 1: ../../bin/wrappergen: cannot execute: required file not found # make[2]: *** [../../lib.mk:83: - broken = stdenv.isLinux; + broken = stdenv.hostPlatform.isLinux; }; } diff --git a/pkgs/development/compilers/c3c/default.nix b/pkgs/development/compilers/c3c/default.nix deleted file mode 100644 index 01cc7fa28ce3..000000000000 --- a/pkgs/development/compilers/c3c/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - llvmPackages, - lib, - fetchFromGitHub, - cmake, - python3, - curl, - libxml2, - libffi, - xar, - versionCheckHook, -}: - -llvmPackages.stdenv.mkDerivation (finalAttrs: { - pname = "c3c"; - version = "0.6.2"; - - src = fetchFromGitHub { - owner = "c3lang"; - repo = "c3c"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-bGMtrdwjlTxEQdsasOvVuI+mRzir/tnENCIfy1/6JMM="; - }; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "\''${LLVM_LIBRARY_DIRS}" "${llvmPackages.lld.lib}/lib ${llvmPackages.llvm.lib}/lib" - ''; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - llvmPackages.llvm - llvmPackages.lld - curl - libxml2 - libffi - ] ++ lib.optionals llvmPackages.stdenv.isDarwin [ xar ]; - - nativeCheckInputs = [ python3 ]; - - doCheck = llvmPackages.stdenv.system == "x86_64-linux"; - - checkPhase = '' - runHook preCheck - ( cd ../resources/testproject; ../../build/c3c build ) - ( cd ../test; python src/tester.py ../build/c3c test_suite ) - runHook postCheck - ''; - - nativeInstallCheckInputs = [ versionCheckHook ]; - doInstallCheck = true; - - meta = with lib; { - description = "Compiler for the C3 language"; - homepage = "https://github.com/c3lang/c3c"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ - luc65r - anas - ]; - platforms = platforms.all; - mainProgram = "c3c"; - }; -}) diff --git a/pkgs/development/compilers/cairo/default.nix b/pkgs/development/compilers/cairo/default.nix deleted file mode 100644 index 0749175f0837..000000000000 --- a/pkgs/development/compilers/cairo/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, rustfmt -, perl -}: - -rustPlatform.buildRustPackage rec { - pname = "cairo"; - version = "2.8.2"; - - src = fetchFromGitHub { - owner = "starkware-libs"; - repo = "cairo"; - rev = "v${version}"; - hash = "sha256-vBdIGkdQa/csqsu4DbgIYitVbDLDUAFmIUytZ7IcxNk="; - }; - - cargoHash = "sha256-w3kzEM34HYQ6KgILaDpmZbCgAh8Ql24DRe12woUAhVI="; - - # openssl crate requires perl during build process - nativeBuildInputs = [ - perl - ]; - - nativeCheckInputs = [ - rustfmt - ]; - - checkFlags = [ - # Requires a mythical rustfmt 2.0 or a nightly compiler - "--skip=golden_test::sourcegen_ast" - - # Test broken - "--skip=test_lowering_consistency" - ]; - - postInstall = '' - # The core library is needed for compilation. - cp -r corelib $out/ - ''; - - meta = with lib; { - description = "Turing-complete language for creating provable programs for general computation"; - homepage = "https://github.com/starkware-libs/cairo"; - license = licenses.asl20; - maintainers = with maintainers; [ raitobezarius ]; - }; -} diff --git a/pkgs/development/compilers/cakelisp/default.nix b/pkgs/development/compilers/cakelisp/default.nix deleted file mode 100644 index c52c93c5e6c7..000000000000 --- a/pkgs/development/compilers/cakelisp/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchgit, gcc, unstableGitUpdater }: - -stdenv.mkDerivation { - pname = "cakelisp"; - # using unstable as it's the only version that builds against gcc-13 - version = "0.3.0-unstable-2024-04-25"; - - src = fetchgit { - url = "https://macoy.me/code/macoy/cakelisp"; - rev = "eb4427f555c3def9d65612672ccfe59e11b14059"; - hash = "sha256-wFyqAbHrBMFKqMYlBjS6flYHPn3Rxtaiqb1rRmlZrB4="; - }; - - buildInputs = [ gcc ]; - - postPatch = '' - substituteInPlace runtime/HotReloading.cake \ - --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"' - substituteInPlace src/ModuleManager.cpp \ - --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"' - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace Build.sh --replace '--export-dynamic' '-export_dynamic' - substituteInPlace runtime/HotReloading.cake --replace '--export-dynamic' '-export_dynamic' - substituteInPlace Bootstrap.cake --replace '--export-dynamic' '-export_dynamic' - ''; - - buildPhase = '' - runHook preBuild - ./Build.sh - runHook postBuild - ''; - - env.NIX_CFLAGS_COMPILE = "-Wno-error=format"; - - installPhase = '' - runHook preInstall - install -Dm755 bin/cakelisp -t $out/bin - runHook postInstall - ''; - - passthru.updateScript = unstableGitUpdater { - url = "https://macoy.me/code/macoy/cakelisp"; - }; - - meta = with lib; { - description = "Performance-oriented Lisp-like language"; - mainProgram = "cakelisp"; - homepage = "https://macoy.me/code/macoy/cakelisp"; - license = licenses.gpl3Plus; - platforms = platforms.darwin ++ platforms.linux; - maintainers = [ maintainers.sbond75 ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; - }; -} diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix deleted file mode 100644 index 9e54e19ba699..000000000000 --- a/pkgs/development/compilers/carp/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, fetchFromGitHub, fetchpatch, makeWrapper, clang, haskellPackages }: - -haskellPackages.mkDerivation rec { - pname = "carp"; - version = "0.5.5"; - - src = fetchFromGitHub { - owner = "carp-lang"; - repo = "Carp"; - rev = "v${version}"; - sha256 = "sha256-B7SBzjegFzL2gGivIJE6BZcLD3f0Bsh8yndjScG2TZI="; - }; - - patches = [ - # Compat with GHC 9.2 / Stackage LTS 20, can be dropped at the next release - # https://github.com/carp-lang/Carp/pull/1449 - (fetchpatch { - name = "carp-lts-20.patch"; - url = "https://github.com/carp-lang/Carp/commit/25f50c92a57cc91b6cb4ec48df658439f936b641.patch"; - sha256 = "14yjv0hcvw1qyjmrhksrj6chac3n14d1f1gcaxldfa05llrbfqk0"; - }) - ]; - - # -Werror breaks build with GHC >= 9.0 - # https://github.com/carp-lang/Carp/issues/1386 - postPatch = '' - substituteInPlace CarpHask.cabal --replace "-Werror" "" - ''; - - buildTools = [ makeWrapper ]; - - executableHaskellDepends = with haskellPackages; [ - HUnit blaze-markup blaze-html split ansi-terminal cmark - edit-distance hashable open-browser optparse-applicative - ]; - - isExecutable = true; - - # The carp executable must know where to find its core libraries and other - # files. Set the environment variable CARP_DIR so that it points to the root - # of the Carp repo. See: - # https://github.com/carp-lang/Carp/blob/master/docs/Install.md#setting-the-carp_dir - # - # Also, clang must be available run-time because carp is compiled to C which - # is then compiled with clang. - postInstall = '' - wrapProgram $out/bin/carp \ - --set CARP_DIR $src \ - --prefix PATH : ${clang}/bin - wrapProgram $out/bin/carp-header-parse \ - --set CARP_DIR $src \ - --prefix PATH : ${clang}/bin - ''; - - description = "Statically typed lisp, without a GC, for real-time applications"; - homepage = "https://github.com/carp-lang/Carp"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ jluttine ]; - # Not actively maintained at the moment - broken = true; - - # Windows not (yet) supported. - platforms = with lib.platforms; unix ++ darwin; -} diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 9fe1a8aa8e56..ae82b0ccfda2 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -40,12 +40,12 @@ in stdenv.mkDerivation rec { sha256 = cfg.sha256; }; - buildInputs = if stdenv.isDarwin then [ bootstrap_cmds m4 ] else [ glibc m4 ]; + buildInputs = if stdenv.hostPlatform.isDarwin then [ bootstrap_cmds m4 ] else [ glibc m4 ]; CCL_RUNTIME = cfg.runtime; CCL_KERNEL = cfg.kernel; - postPatch = if stdenv.isDarwin then '' + postPatch = if stdenv.hostPlatform.isDarwin then '' substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \ --replace "M4 = gm4" "M4 = m4" \ --replace "dtrace" "/usr/sbin/dtrace" \ @@ -88,7 +88,7 @@ in stdenv.mkDerivation rec { maintainers = lib.teams.lisp.members; platforms = attrNames options; # assembler failures during build, x86_64-darwin broken since 2020-10-14 - broken = (stdenv.isDarwin && stdenv.isx86_64); + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); license = licenses.asl20; }; } diff --git a/pkgs/development/compilers/chez-racket/default.nix b/pkgs/development/compilers/chez-racket/default.nix deleted file mode 100644 index 158dfa052933..000000000000 --- a/pkgs/development/compilers/chez-racket/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, buildPackages, callPackage }: - -let - chezArch = - /**/ if stdenv.hostPlatform.isAarch then "arm${toString stdenv.hostPlatform.parsed.cpu.bits}" - else if stdenv.hostPlatform.isx86_32 then "i3" - else if stdenv.hostPlatform.isx86_64 then "a6" - else if stdenv.hostPlatform.isPower then "ppc${toString stdenv.hostPlatform.parsed.cpu.bits}" - else throw "Add ${stdenv.hostPlatform.parsed.cpu.arch} to chezArch to enable building chez-racket"; - - chezOs = - /**/ if stdenv.hostPlatform.isDarwin then "osx" - else if stdenv.hostPlatform.isFreeBSD then "fb" - else if stdenv.hostPlatform.isLinux then "le" - else if stdenv.hostPlatform.isNetBSD then "nb" - else if stdenv.hostPlatform.isOpenBSD then "ob" - else throw "Add ${stdenv.hostPlatform.uname.system} to chezOs to enable building chez-racket"; - - inherit (stdenv.hostPlatform) system; - chezSystem = "t${chezArch}${chezOs}"; - # Chez Scheme uses an ad-hoc `configure`, hence we don't use the usual - # stdenv abstractions. - forBoot = { - pname = "chez-scheme-racket-boot"; - configurePhase = '' - runHook preConfigure - ./configure --pb ZLIB=$ZLIB LZ4=$LZ4 - runHook postConfigure - ''; - makeFlags = [ "${chezSystem}.bootquick" ]; - installPhase = '' - runHook preInstall - mkdir -p $out - pushd boot - mv $(ls -1 | grep -v "^pb$") -t $out - popd - runHook postInstall - ''; - }; - boot = buildPackages.callPackage (import ./shared.nix forBoot) {}; - forFinal = { - pname = "chez-scheme-racket"; - configurePhase = '' - runHook preConfigure - cp -r ${boot}/* -t ./boot - ./configure -m=${chezSystem} --installprefix=$out --installman=$out/share/man ZLIB=$ZLIB LZ4=$LZ4 - runHook postConfigure - ''; - preBuild = '' - pushd ${chezSystem}/c - ''; - postBuild = '' - popd - ''; - setupHook = ./setup-hook.sh; - }; - final = callPackage (import ./shared.nix forFinal) {}; -in -final diff --git a/pkgs/development/compilers/chez-racket/setup-hook.sh b/pkgs/development/compilers/chez-racket/setup-hook.sh deleted file mode 100644 index 1d81489bd4e4..000000000000 --- a/pkgs/development/compilers/chez-racket/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addChezLibraryPath() { - addToSearchPath CHEZSCHEMELIBDIRS "$1/lib/csv-site" -} - -addEnvHooks "$targetOffset" addChezLibraryPath diff --git a/pkgs/development/compilers/chez-racket/shared.nix b/pkgs/development/compilers/chez-racket/shared.nix deleted file mode 100644 index b9368dd4ebea..000000000000 --- a/pkgs/development/compilers/chez-racket/shared.nix +++ /dev/null @@ -1,40 +0,0 @@ -args: -{ stdenv, lib, fetchFromGitHub, coreutils, cctools, darwin -, ncurses, libiconv, libX11, zlib, lz4 -}: - -stdenv.mkDerivation (args // { - version = "unstable-2021-12-11"; - - src = fetchFromGitHub { - owner = "racket"; - repo = "ChezScheme"; - rev = "8846c96b08561f05a937d5ecfe4edc96cc99be39"; - sha256 = "IYJQzT88T8kFahx2BusDOyzz6lQDCbZIfSz9rZoNF7A="; - fetchSubmodules = true; - }; - - prePatch = '' - rm -rf zlib/*.c lz4/lib/*.c - ''; - - postPatch = '' - export ZLIB="$(find ${zlib.out}/lib -type f | sort | head -n1)" - export LZ4="$(find ${lz4.out}/lib -type f | sort | head -n1)" - ''; - - nativeBuildInputs = lib.optionals stdenv.isDarwin ([ cctools darwin.autoSignDarwinBinariesHook ]); - buildInputs = [ libiconv libX11 lz4 ncurses zlib ]; - - enableParallelBuilding = true; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"; - - meta = { - description = "Fork of Chez Scheme for Racket"; - homepage = "https://github.com/racket/ChezScheme"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ l-as ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix deleted file mode 100644 index 9002db42abc2..000000000000 --- a/pkgs/development/compilers/chez/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib, stdenv, fetchurl -, coreutils, cctools -, darwin -, ncurses, libiconv, libX11, libuuid, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "chez-scheme"; - version = "10.0.0"; - - src = fetchurl { - url = "https://github.com/cisco/ChezScheme/releases/download/v${finalAttrs.version}/csv${finalAttrs.version}.tar.gz"; - hash = "sha256-03GZASte0ZhcQGnWqH/xjl4fWi3yfkApkfr0XcTyIyw="; - }; - - nativeBuildInputs = lib.optionals stdenv.isDarwin [ - cctools - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - darwin.autoSignDarwinBinariesHook - ]; - buildInputs = [ ncurses libiconv libX11 libuuid ]; - - enableParallelBuilding = true; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"; - - /* - ** We have to fix a few occurrences to tools with absolute - ** paths in some helper scripts, otherwise the build will fail on - ** NixOS or in any chroot build. - */ - patchPhase = '' - substituteInPlace ./makefiles/installsh \ - --replace-warn "/usr/bin/true" "${coreutils}/bin/true" - - substituteInPlace zlib/configure \ - --replace-warn "/usr/bin/libtool" libtool - ''; - - /* - ** Don't use configureFlags, since that just implicitly appends - ** everything onto a --prefix flag, which ./configure gets very angry - ** about. - ** - ** Also, carefully set a manual workarea argument, so that we - ** can later easily find the machine type that we built Chez - ** for. - */ - configurePhase = '' - ./configure --as-is --threads --installprefix=$out --installman=$out/share/man - ''; - - /* - ** Clean up some of the examples from the build output. - */ - postInstall = '' - rm -rf $out/lib/csv${finalAttrs.version}/examples - ''; - - setupHook = ./setup-hook.sh; - - passthru.tests = { - version = testers.testVersion { - package = finalAttrs.finalPackage; - }; - }; - - meta = { - description = "Powerful and incredibly fast R6RS Scheme compiler"; - homepage = "https://cisco.github.io/ChezScheme/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ thoughtpolice ]; - platforms = lib.platforms.unix; - mainProgram = "scheme"; - }; -}) diff --git a/pkgs/development/compilers/chez/setup-hook.sh b/pkgs/development/compilers/chez/setup-hook.sh deleted file mode 100644 index 1d81489bd4e4..000000000000 --- a/pkgs/development/compilers/chez/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addChezLibraryPath() { - addToSearchPath CHEZSCHEMELIBDIRS "$1/lib/csv-site" -} - -addEnvHooks "$targetOffset" addChezLibraryPath diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix index b96a1d459d71..a36ef4569e30 100644 --- a/pkgs/development/compilers/chicken/4/chicken.nix +++ b/pkgs/development/compilers/chicken/4/chicken.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { sha256 = "0hvckhi5gfny3mlva6d7y9pmx7cbwvq0r7mk11k3sdiik9hlkmdd"; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # There is not enough space in the load command to accomodate a full path to the store, # so use `@executable_path` to specify a relative path to chicken’s lib folder. sed -e '/POSTINSTALL_PROGRAM_FLAGS = /{s|$(LIBDIR)|@executable_path/../lib|}' \ @@ -30,12 +30,12 @@ stdenv.mkDerivation { setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh; # -fno-strict-overflow is not a supported argument in clang on darwin - hardeningDisable = lib.optionals stdenv.isDarwin ["strictoverflow"]; + hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin ["strictoverflow"]; makeFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "VARDIR=$(out)/var/lib" - ] ++ (lib.optionals stdenv.isDarwin [ + ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "C_COMPILER=$(CC)" "POSTINSTALL_PROGRAM=${stdenv.cc.targetPrefix}install_name_tool" @@ -49,7 +49,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ darwin.autoSignDarwinBinariesHook ]; diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index 2f0b8316ae8b..6d9563b9f662 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -27,15 +27,12 @@ stdenv.mkDerivation (finalAttrs: { setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh; - # -fno-strict-overflow is not a supported argument in clang - hardeningDisable = lib.optionals stdenv.cc.isClang [ "strictoverflow" ]; - makeFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "C_COMPILER=$(CC)" "CXX_COMPILER=$(CXX)" - ] ++ (lib.optionals stdenv.isDarwin [ + ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "LINKER_OPTIONS=-headerpad_max_install_names" "POSTINSTALL_PROGRAM=install_name_tool" @@ -47,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ darwin.autoSignDarwinBinariesHook ]; @@ -55,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { bootstrap-chicken ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postCheck = '' ./csi -R chicken.pathname -R chicken.platform \ -p "(assert (equal? \"${toString finalAttrs.binaryVersion}\" (pathname-file (car (repository-path)))))" diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index b132036bbae4..ec465aa8d783 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -19,7 +19,7 @@ let addToPropagatedBuildInputsWithPkgConfig = pkg: old: (addPkgConfig old) // (addToPropagatedBuildInputs pkg old); broken = addMetaAttrs { broken = true; }; - brokenOnDarwin = addMetaAttrs { broken = stdenv.isDarwin; }; + brokenOnDarwin = addMetaAttrs { broken = stdenv.hostPlatform.isDarwin; }; addToCscOptions = opt: old: { CSC_OPTIONS = lib.concatStringsSep " " ([ old.CSC_OPTIONS or "" ] ++ lib.toList opt); }; @@ -27,8 +27,8 @@ in { 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) // { + ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenGL ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkgs.xorg.libX11 ])) old) // { # depends on 'chicken' egg, which doesn't exist, # so we specify all the deps here propagatedBuildInputs = [ @@ -43,6 +43,13 @@ in (addToBuildInputsWithPkgConfig pkgs.cairo old) // (addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 srfi-13 ]) old); cmark = addToBuildInputs pkgs.cmark; + comparse = old: { + # For some reason lazy-seq 2 gets interpreted as lazy-seq 0.0.0?? + postPatch = '' + substituteInPlace comparse.egg \ + --replace-fail 'lazy-seq "0.1.0"' 'lazy-seq "0.0.0"' + ''; + }; epoxy = old: (addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy old) // lib.optionalAttrs stdenv.cc.isClang { @@ -72,12 +79,12 @@ in gl-utils = addPkgConfig; glfw3 = addToBuildInputsWithPkgConfig pkgs.glfw3; glls = addPkgConfig; - iconv = addToBuildInputs (lib.optional stdenv.isDarwin pkgs.libiconv); + iconv = addToBuildInputs (lib.optional stdenv.hostPlatform.isDarwin pkgs.libiconv); icu = addToBuildInputsWithPkgConfig pkgs.icu; imlib2 = addToBuildInputsWithPkgConfig pkgs.imlib2; inotify = old: - (addToBuildInputs (lib.optional stdenv.isDarwin pkgs.libinotify-kqueue) old) - // lib.optionalAttrs stdenv.isDarwin (addToCscOptions "-L -linotify" old); + (addToBuildInputs (lib.optional stdenv.hostPlatform.isDarwin pkgs.libinotify-kqueue) old) + // lib.optionalAttrs stdenv.hostPlatform.isDarwin (addToCscOptions "-L -linotify" old); leveldb = addToBuildInputs pkgs.leveldb; magic = addToBuildInputs pkgs.file; mdh = old: @@ -94,7 +101,7 @@ in nanomsg = addToBuildInputs pkgs.nanomsg; ncurses = addToBuildInputsWithPkgConfig [ pkgs.ncurses ]; opencl = addToBuildInputs ([ pkgs.opencl-headers pkgs.ocl-icd ] - ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]); openssl = addToBuildInputs pkgs.openssl; plot = addToBuildInputs pkgs.plotutils; postgresql = addToBuildInputsWithPkgConfig pkgs.postgresql; @@ -132,6 +139,7 @@ in addToNativeBuildInputs pkgs.taglib old ); uuid-lib = addToBuildInputs pkgs.libuuid; + webview = addToBuildInputsWithPkgConfig pkgs.webkitgtk_4_0; ws-client = addToBuildInputs pkgs.zlib; xlib = addToPropagatedBuildInputs pkgs.xorg.libX11; yaml = addToBuildInputs pkgs.libyaml; @@ -154,8 +162,8 @@ in }; opengl = old: (addToBuildInputsWithPkgConfig - (lib.optionals (!stdenv.isDarwin) [ pkgs.libGL pkgs.libGLU ] - ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Foundation pkgs.darwin.apple_sdk.frameworks.OpenGL ]) + (lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkgs.libGL pkgs.libGLU ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Foundation pkgs.darwin.apple_sdk.frameworks.OpenGL ]) old) // { postPatch = '' @@ -164,7 +172,7 @@ in ''; }; posix-shm = old: { - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace build.scm \ --replace "-lrt" "" ''; @@ -209,7 +217,6 @@ in begin-syntax = broken; canvas-draw = broken; chicken-doc-admin = broken; - comparse = broken; coops-utils = broken; crypt = broken; hypergiant = broken; @@ -224,7 +231,6 @@ in svn-client = broken; system = broken; tokyocabinet = broken; - webview = broken; # mark broken darwin diff --git a/pkgs/development/compilers/ciao/default.nix b/pkgs/development/compilers/ciao/default.nix deleted file mode 100644 index 29e103226022..000000000000 --- a/pkgs/development/compilers/ciao/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "ciao"; - version = "1.23.0-m1"; - src = fetchFromGitHub { - owner = "ciao-lang"; - repo = "ciao"; - rev = "v${version}"; - sha256 = "sha256-JMHln0nYveEEfEr4AMyrEL9KlCDiqV53BWRNMUL8nN0="; - }; - - configurePhase = '' - ./ciao-boot.sh configure --instype=global --prefix=$prefix - ''; - - buildPhase = '' - ./ciao-boot.sh build - ''; - - installPhase = '' - ./ciao-boot.sh install - ''; - - meta = with lib; { - homepage = "https://ciao-lang.org/"; - description = "General purpose, multi-paradigm programming language in the Prolog family"; - license = licenses.lgpl21; - maintainers = with maintainers; [ suhr ]; - platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/ciao.x86_64-darwin - }; -} diff --git a/pkgs/development/compilers/circt/circt-llvm.nix b/pkgs/development/compilers/circt/circt-llvm.nix deleted file mode 100644 index 0043702fd847..000000000000 --- a/pkgs/development/compilers/circt/circt-llvm.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ lib -, stdenv -, cmake -, ninja -, circt -, llvm -, python3 -}: stdenv.mkDerivation { - pname = circt.pname + "-llvm"; - inherit (circt) version src; - - requiredSystemFeatures = [ "big-parallel" ]; - - nativeBuildInputs = [ cmake ninja python3 ]; - - preConfigure = '' - cd llvm/llvm - ''; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DLLVM_ENABLE_BINDINGS=OFF" - "-DLLVM_ENABLE_OCAMLDOC=OFF" - "-DLLVM_BUILD_EXAMPLES=OFF" - "-DLLVM_OPTIMIZED_TABLEGEN=ON" - "-DLLVM_ENABLE_PROJECTS=mlir" - "-DLLVM_TARGETS_TO_BUILD=Native" - - # This option is needed to install llvm-config - "-DLLVM_INSTALL_UTILS=ON" - ]; - - outputs = [ "out" "lib" "dev" ]; - - # Get rid of ${extra_libdir} (which ends up containing a path to circt-llvm.dev - # in circt) so that we only have to remove the one fixed rpath. - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace llvm/llvm/cmake/modules/AddLLVM.cmake \ - --replace-fail 'set(_install_rpath "@loader_path/../lib''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' \ - 'set(_install_rpath "@loader_path/../lib''${LLVM_LIBDIR_SUFFIX}")' - ''; - - postInstall = '' - # move llvm-config to $dev to resolve a circular dependency - moveToOutput "bin/llvm-config*" "$dev" - - # move all lib files to $lib except lib/cmake - moveToOutput "lib" "$lib" - moveToOutput "lib/cmake" "$dev" - - # patch configuration files so each path points to the new $lib or $dev paths - substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ - --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")' - substituteInPlace \ - "$dev/lib/cmake/llvm/LLVMExports-release.cmake" \ - "$dev/lib/cmake/mlir/MLIRTargets-release.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ - --replace "\''${_IMPORT_PREFIX}/lib/objects-Release" "$lib/lib/objects-Release" \ - --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" # patch path for llvm-config - ''; - - # Replace all references to @rpath with absolute paths and remove the rpaths. - # - # This is different from what the regular LLVM package does, which is to make - # everything absolute from the start: however, that doesn't work for us because - # we have `-DBUILD_SHARED_LIBS=ON`, meaning that many more things are - # dynamically rather than statically linked. This includes TableGen, which then - # fails to run halfway through the build because it tries to reference $lib when - # it hasn't been populated yet. - # - # Inspired by fixDarwinDylibNames. - postFixup = lib.optionalString stdenv.isDarwin '' - local flags=(-delete_rpath @loader_path/../lib) - for file in "$lib"/lib/*.dylib; do - flags+=(-change @rpath/"$(basename "$file")" "$file") - done - - for file in "$out"/bin/* "$lib"/lib/*.dylib; do - if [ -L "$file" ]; then continue; fi - echo "$file: fixing dylib references" - # note that -id does nothing on binaries - install_name_tool -id "$file" "''${flags[@]}" "$file" - done - ''; - - # circt only use the mlir part of llvm, occasionally there are some unrelated failure from llvm, - # disable the llvm check, but keep the circt check enabled. - doCheck = false; - checkTarget = "check-mlir"; - - meta = llvm.meta // { - inherit (circt.meta) maintainers; - }; -} diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix deleted file mode 100644 index 493a42613584..000000000000 --- a/pkgs/development/compilers/circt/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ stdenv -, lib -, cmake -, coreutils -, python3 -, git -, fetchFromGitHub -, ninja -, lit -, z3 -, gitUpdater -, callPackage -}: - -let - pythonEnv = python3.withPackages (ps: [ ps.psutil ]); - circt-llvm = callPackage ./circt-llvm.nix { }; -in -stdenv.mkDerivation rec { - pname = "circt"; - version = "1.86.0"; - src = fetchFromGitHub { - owner = "llvm"; - repo = "circt"; - rev = "firtool-${version}"; - hash = "sha256-xV7vu3zdWBXgnCCUN9ge1GZemo0prmpQrZ1np86i3jI="; - fetchSubmodules = true; - }; - - requiredSystemFeatures = [ "big-parallel" ]; - - nativeBuildInputs = [ cmake ninja git pythonEnv z3 ]; - buildInputs = [ circt-llvm ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DMLIR_DIR=${circt-llvm.dev}/lib/cmake/mlir" - - # LLVM_EXTERNAL_LIT is executed by python3, the wrapped bash script will not work - "-DLLVM_EXTERNAL_LIT=${lit}/bin/.lit-wrapped" - "-DCIRCT_LLHD_SIM_ENABLED=OFF" - ]; - - # There are some tests depending on `clang-tools` to work. They are activated only when detected - # `clang-tidy` in PATH, However, we cannot simply put `clang-tools` in checkInputs to make these - # tests work. Because - # - # 1. The absolute paths of binaries used in tests are resolved in configure phase. - # 2. When stdenv = clangStdenv, the `clang-tidy` binary appears in PATH via `clang-unwrapped`, - # which is always placed before `${clang-tools}/bin` in PATH. `clang-tidy` provided in - # `clang-unwrapped` cause tests failing because it is not wrapped to resolve header search paths. - # https://github.com/NixOS/nixpkgs/issues/214945 discusses this issue. - # - # As a temporary fix, we disabled these tests when using clang stdenv - # cannot use lib.optionalString as it creates an empty string, disabling all tests - LIT_FILTER_OUT = if stdenv.cc.isClang then "CIRCT :: Target/ExportSystemC/.*\.mlir" else null; - - preConfigure = '' - find ./test -name '*.mlir' -exec sed -i 's|/usr/bin/env|${coreutils}/bin/env|g' {} \; - # circt uses git to check its version, but when cloned on nix it can't access git. - # So this hard codes the version. - substituteInPlace cmake/modules/GenVersionFile.cmake --replace "unknown git version" "${src.rev}" - ''; - - doCheck = true; - checkTarget = "check-circt check-circt-integration"; - - outputs = [ "out" "lib" "dev" ]; - - # Copy circt-llvm's postFixup stage so that it can make all our dylib references - # absolute as well. - # - # We don't need `postPatch` because circt seems to be automatically inheriting - # the config somehow, presumably via. `-DMLIR_DIR`. - postFixup = circt-llvm.postFixup; - - postInstall = '' - moveToOutput lib "$lib" - ''; - - passthru = { - updateScript = gitUpdater { - rev-prefix = "firtool-"; - }; - llvm = circt-llvm; - }; - - meta = { - description = "Circuit IR compilers and tools"; - homepage = "https://circt.org/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ sharzy pineapplehunter sequencer ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index d5d56546b576..4613357ded3b 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { platforms = ["x86_64-linux" "x86_64-darwin"]; # Upstream claims support, but breaks with: # error: use of undeclared identifier 'aligned_alloc' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/clasp-developers/clasp"; mainProgram = "clasp"; }; diff --git a/pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch b/pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch deleted file mode 100644 index 3e0fbe6b996d..000000000000 --- a/pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch +++ /dev/null @@ -1,17 +0,0 @@ -The clean command line compiler clm checks modules for freshness by comparing timestamps. -However, in chroot builds all files installed have the same timestamp. This leads to clm -trying to rebuild the library modules distributed with the Clean install every time a user -compiles any file. This patch changes the freshness check to use less than instead of less -than or equal to in order to avoid this. - ---- clean-upstream/src/tools/clm/clm.c 2010-12-10 06:12:17.000000000 -0430 -+++ clean/src/tools/clm/clm.c 2010-12-25 10:29:09.840675925 -0430 -@@ -250,7 +250,7 @@ - || (t1.dwHighDateTime==t2.dwHighDateTime && (unsigned)(t1.dwLowDateTime)<=(unsigned)(t2.dwLowDateTime))) - #else - typedef unsigned long FileTime; --# define FILE_TIME_LE(t1,t2) (t1<=t2) -+# define FILE_TIME_LE(t1,t2) (t1<t2) - #endif - - typedef struct project_node { diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix deleted file mode 100644 index e360bb05f40d..000000000000 --- a/pkgs/development/compilers/clean/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation { - pname = "clean"; - version = "3.0"; - - src = - if stdenv.hostPlatform.system == "i686-linux" then (fetchurl { - url = "https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_32_boot.tar.gz"; - sha256 = "0cjxv3vqrg6pz3aicwfdz1zyhk0q650464j3qyl0wzaikh750010"; - }) - else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl { - url = "https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_64_boot.tar.gz"; - sha256 = "06k283y9adbi28f78k3m5ssg6py73qqkz3sm8dgxc89drv4krl2i"; - }) - else throw "Architecture not supported"; - - hardeningDisable = [ "format" "pic" ]; - - # clm uses timestamps of dcl, icl, abc and o files to decide what must be rebuild - # and for chroot builds all of the library files will have equal timestamps. This - # makes clm try to rebuild the library modules (and fail due to absence of write permission - # on the Nix store) every time any file is compiled. - patches = [ ./chroot-build-support-do-not-rebuild-equal-timestamps.patch ]; - - preBuild = '' - substituteInPlace Makefile --replace 'INSTALL_DIR = $(CURRENTDIR)' 'INSTALL_DIR = '$out - - substituteInPlace src/tools/clm/clm.c --replace '/usr/bin/gcc' $(type -p gcc) - substituteInPlace src/tools/clm/clm.c --replace '/usr/bin/as' $(type -p as) - - cd src - ''; - - postBuild = '' - cd .. - ''; - - meta = { - description = "General purpose, state-of-the-art, pure and lazy functional programming language"; - longDescription = '' - Clean is a general purpose, state-of-the-art, pure and lazy functional - programming language designed for making real-world applications. Some - of its most notable language features are uniqueness typing, dynamic typing, - and generic functions. - ''; - - homepage = "http://wiki.clean.cs.ru.nl/Clean"; - license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.erin ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix deleted file mode 100644 index 2bb2340261c2..000000000000 --- a/pkgs/development/compilers/closure/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "closure-compiler"; - version = "20240317"; - - src = fetchurl { - url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar"; - sha256 = "sha256-axJQrCHAW90gncUV2bYDezC1VVooTddB/wWRqChIt84="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre ]; - - installPhase = '' - mkdir -p $out/share/java $out/bin - cp ${src} $out/share/java/closure-compiler-v${version}.jar - makeWrapper ${jre}/bin/java $out/bin/closure-compiler \ - --add-flags "-jar $out/share/java/closure-compiler-v${version}.jar" - ''; - - meta = with lib; { - description = "Tool for making JavaScript download and run faster"; - mainProgram = "closure-compiler"; - homepage = "https://developers.google.com/closure/compiler/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.asl20; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix deleted file mode 100644 index a6b6833289b7..000000000000 --- a/pkgs/development/compilers/cmdstan/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, python3 -, stanc -, buildPackages -, runtimeShell -, runCommandCC -, cmdstan -}: - -stdenv.mkDerivation rec { - pname = "cmdstan"; - version = "2.35.0"; - - src = fetchFromGitHub { - owner = "stan-dev"; - repo = pname; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-bmzkXbR4KSnpfXjs2MAx8mbNSbNrIWDP/O8S+JGWrcg="; - }; - - postPatch = '' - substituteInPlace stan/lib/stan_math/make/libraries \ - --replace "/usr/bin/env bash" "bash" - ''; - - nativeBuildInputs = [ - python3 - stanc - ]; - - preConfigure = '' - patchShebangs test-all.sh runCmdStanTests.py stan/ - '' - # Fix inclusion of hardcoded paths in PCH files, by building in the store. - + '' - mkdir -p $out/opt - cp -R . $out/opt/cmdstan - cd $out/opt/cmdstan - mkdir -p bin - ln -s ${buildPackages.stanc}/bin/stanc bin/stanc - ''; - - makeFlags = [ - "build" - ] ++ lib.optionals stdenv.isDarwin [ - "arch=${stdenv.hostPlatform.darwinArch}" - ]; - - # Disable inclusion of timestamps in PCH files when using Clang. - env.CXXFLAGS = lib.optionalString stdenv.cc.isClang "-Xclang -fno-pch-timestamp"; - - enableParallelBuilding = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - ln -s $out/opt/cmdstan/bin/stanc $out/bin/stanc - ln -s $out/opt/cmdstan/bin/stansummary $out/bin/stansummary - cat > $out/bin/stan <<EOF - #!${runtimeShell} - make -C $out/opt/cmdstan "\$(realpath "\$1")" - EOF - chmod a+x $out/bin/stan - - runHook postInstall - ''; - - passthru.tests = { - test = runCommandCC "cmdstan-test" { } '' - cp -R ${cmdstan}/opt/cmdstan cmdstan - chmod -R +w cmdstan - cd cmdstan - ./runCmdStanTests.py -j$NIX_BUILD_CORES src/test/interface - touch $out - ''; - }; - - meta = with lib; { - description = "Command-line interface to Stan"; - longDescription = '' - Stan is a probabilistic programming language implementing full Bayesian - statistical inference with MCMC sampling (NUTS, HMC), approximate Bayesian - inference with Variational inference (ADVI) and penalized maximum - likelihood estimation with Optimization (L-BFGS). - ''; - homepage = "https://mc-stan.org/interfaces/cmdstan.html"; - license = licenses.bsd3; - maintainers = with maintainers; [ wegank ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/compilers/codon/default.nix b/pkgs/development/compilers/codon/default.nix index 520c6386490b..88d3c01d713a 100644 --- a/pkgs/development/compilers/codon/default.nix +++ b/pkgs/development/compilers/codon/default.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation { "-DLLVM_USE_LINKER=lld" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/lib/codon/*.dylib $out/lib/ ''; diff --git a/pkgs/development/compilers/coffeescript/default.nix b/pkgs/development/compilers/coffeescript/default.nix deleted file mode 100644 index a5ef29967e07..000000000000 --- a/pkgs/development/compilers/coffeescript/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "coffeescript"; - version = "2.7.0"; - - src = fetchFromGitHub { - owner = "jashkenas"; - repo = "coffeescript"; - rev = version; - hash = "sha256-vr46LKICX61rFPCkZ3G+8gJykg+MO43YRJnZGM3RoY0="; - }; - - npmDepsHash = "sha256-mCm31OwI3wjq8taKRQuEj4+IWVZO9Z5KuIDBf39lYoQ="; - - env = { - PUPPETEER_SKIP_DOWNLOAD = true; - }; - - dontNpmBuild = true; - - meta = { - description = "Little language that compiles into JavaScript"; - homepage = "https://github.com/jashkenas/coffeescript"; - license = lib.licenses.mit; - mainProgram = "coffee"; - maintainers = with lib.maintainers; [ cdmistman ]; - }; -} diff --git a/pkgs/development/compilers/colm/cross-compile.patch b/pkgs/development/compilers/colm/cross-compile.patch deleted file mode 100644 index 470ea23aaf1b..000000000000 --- a/pkgs/development/compilers/colm/cross-compile.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/configure.ac 2019-07-09 22:41:03.166948024 -0700 -+++ b/configure.ac 2019-07-09 22:41:16.699948056 -0700 -@@ -40,9 +40,7 @@ - - dnl Choose a default for the build_manual var. If the dist file is present in - dnl the root then default to no, otherwise go for it. --AC_CHECK_FILES( [$srcdir/DIST], -- [. $srcdir/DIST;], -- [build_manual=yes; ] ) -+build_manual=yes; - - dnl Set to true if the manual should be built. - AM_CONDITIONAL(BUILD_MANUAL, [test "x$build_manual" = "xyes"]) diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix deleted file mode 100644 index 6ec15a0ebdf9..000000000000 --- a/pkgs/development/compilers/colm/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "colm"; - version = "0.13.0.7"; - - src = fetchurl { - url = "https://www.colm.net/files/colm/${pname}-${version}.tar.gz"; - sha256 = "0f76iri173l2wja2v7qrwmf958cqwh5g9x4bhj2z8wknmlla6gz4"; - }; - - patches = [ ./cross-compile.patch ]; - - nativeBuildInputs = [ makeWrapper asciidoc autoreconfHook ]; - - doCheck = true; - - postInstall = '' - wrapProgram $out/bin/colm \ - --prefix PATH ":" ${gcc}/bin - ''; - - meta = with lib; { - description = "Programming language for the analysis and transformation of computer languages"; - mainProgram = "colm"; - homepage = "http://www.colm.net/open-source/colm"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ pSub ]; - }; -} diff --git a/pkgs/development/compilers/computecpp/default.nix b/pkgs/development/compilers/computecpp/default.nix deleted file mode 100644 index 4e6e7ad43416..000000000000 --- a/pkgs/development/compilers/computecpp/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv -, fetchzip -, pkg-config -, autoPatchelfHook -, installShellFiles -, ocl-icd -, zlib -}: - -stdenv.mkDerivation rec { - pname = "computecpp"; - version = "2.11.0"; - - src = fetchzip { - url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/x86_64-linux-gnu.tar.gz"; - hash = "sha256-xHOPuijx5TZeHzRHPXcll0WqoBzHBryIoe3BnOxBVVY="; - stripRoot = true; - }; - - dontStrip = true; - - buildInputs = [ stdenv.cc.cc.lib ocl-icd zlib ]; - nativeBuildInputs = [ autoPatchelfHook pkg-config installShellFiles ]; - - installPhase = '' - runHook preInstall - - find ./lib -type f -exec install -D -m 0755 {} -t $out/lib \; - find ./bin -type l -exec install -D -m 0755 {} -t $out/bin \; - find ./bin -type f -exec install -D -m 0755 {} -t $out/bin \; - find ./doc -type f -exec install -D -m 0644 {} -t $out/doc \; - find ./include -type f -exec install -D -m 0644 {} -t $out/include \; - - runHook postInstall - ''; - - passthru = { - isClang = true; - }; - - meta = with lib; { - description = - "Accelerate Complex C++ Applications on Heterogeneous Compute Systems using Open Standards"; - homepage = "https://www.codeplay.com/products/computesuite/computecpp"; - license = licenses.unfree; - maintainers = with maintainers; [ davidtwco ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/compilers/copper/default.nix b/pkgs/development/compilers/copper/default.nix deleted file mode 100644 index f202932743f1..000000000000 --- a/pkgs/development/compilers/copper/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchurl -, libffi -}: -stdenv.mkDerivation rec { - pname = "copper"; - version = "4.6"; - src = fetchurl { - url = "https://tibleiz.net/download/copper-${version}-src.tar.gz"; - sha256 = "sha256-tyxAMJp4H50eBz8gjt2O3zj5fq6nOIXKX47wql8aUUg="; - }; - buildInputs = [ - libffi - ]; - postPatch = '' - patchShebangs . - ''; - buildPhase = '' - make BACKEND=elf64 boot-elf64 - make BACKEND=elf64 COPPER=stage3/copper-elf64 copper-elf64 - ''; - installPhase = '' - make BACKEND=elf64 install prefix=$out - ''; - meta = with lib; { - description = "Simple imperative language, statically typed with type inference and genericity"; - homepage = "https://tibleiz.net/copper/"; - license = licenses.bsd2; - platforms = platforms.x86_64; - broken = true; - }; -} diff --git a/pkgs/development/compilers/corretto/11.nix b/pkgs/development/compilers/corretto/11.nix index b7bd676143c0..c1bf6347947c 100644 --- a/pkgs/development/compilers/corretto/11.nix +++ b/pkgs/development/compilers/corretto/11.nix @@ -1,16 +1,23 @@ -{ fetchFromGitHub -, gradle_7 -, jdk11 -, lib -, stdenv -, rsync -, runCommand -, testers +{ + fetchFromGitHub, + gradle_7, + jdk11, + lib, + stdenv, + rsync, + runCommand, + testers, }: let corretto = import ./mk-corretto.nix rec { - inherit lib stdenv rsync runCommand testers; + inherit + lib + stdenv + rsync + runCommand + testers + ; jdk = jdk11; gradle = gradle_7; extraConfig = [ @@ -19,12 +26,12 @@ let # Corretto, too. "--disable-warnings-as-errors" ]; - version = "11.0.23.9.1"; + version = "11.0.24.8.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-11"; rev = version; - sha256 = "sha256-qSx0kgXTgvsvBaEqgy7Jrp/c1Imoi5/IOqEWoLenJYI="; + sha256 = "sha256-MD/ipEulQCEgfqqa0QQrD6x6GQwirQfb8OT2UBDLYEE="; }; }; in diff --git a/pkgs/development/compilers/corretto/17.nix b/pkgs/development/compilers/corretto/17.nix index c557012e8cdb..90ca350a355d 100644 --- a/pkgs/development/compilers/corretto/17.nix +++ b/pkgs/development/compilers/corretto/17.nix @@ -1,34 +1,43 @@ -{ fetchFromGitHub -, fetchurl -, gradle_7 -, jdk17 -, lib -, stdenv -, rsync -, runCommand -, testers +{ + fetchFromGitHub, + fetchurl, + gradle_7, + jdk17, + lib, + stdenv, + rsync, + runCommand, + testers, }: let corretto = import ./mk-corretto.nix rec { - inherit lib stdenv rsync runCommand testers; + inherit + lib + stdenv + rsync + runCommand + testers + ; jdk = jdk17; gradle = gradle_7; - version = "17.0.11.9.1"; + version = "17.0.12.7.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-17"; rev = version; - sha256 = "sha256-LxZSFILFfyh8oBiYEnuBQ0Og2i713qdK2jIiCBnrlj0="; + sha256 = "sha256-aRn1hqaqNsBkp2jHHkwMKc8cNiBM+TYVm3tVMPJJ1YE="; }; }; in -corretto.overrideAttrs (final: prev: { - # HACK: Removes the FixNullPtrCast patch, as it fails to apply. Need to figure out what causes it to fail to apply. - patches = lib.remove - (fetchurl { +corretto.overrideAttrs ( + final: prev: { + # Corretto17 has incorporated this patch already so it fails to apply. + # We thus skip it here. + # See https://github.com/corretto/corretto-17/pull/158 + patches = lib.remove (fetchurl { url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c"; sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo="; - }) - (prev.patches or [ ]); -}) + }) (prev.patches or [ ]); + } +) diff --git a/pkgs/development/compilers/corretto/21.nix b/pkgs/development/compilers/corretto/21.nix index 9656ace73cef..a5ab64d02c24 100644 --- a/pkgs/development/compilers/corretto/21.nix +++ b/pkgs/development/compilers/corretto/21.nix @@ -1,25 +1,32 @@ -{ corretto21 -, fetchFromGitHub -, gradle_7 -, jdk21 -, lib -, stdenv -, rsync -, runCommand -, testers +{ + corretto21, + fetchFromGitHub, + gradle_7, + jdk21, + lib, + stdenv, + rsync, + runCommand, + testers, }: let corretto = import ./mk-corretto.nix rec { - inherit lib stdenv rsync runCommand testers; + inherit + lib + stdenv + rsync + runCommand + testers + ; jdk = jdk21; gradle = gradle_7; - version = "21.0.3.9.1"; + version = "21.0.4.7.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-21"; rev = version; - sha256 = "sha256-V8UDyukDCQVTWUg4IpSKoY0qnnQ5fePbm3rxcw06Vr0="; + sha256 = "sha256-EQqktd2Uz9PhkCaqvbuzmONcSiRppQ40tpLB3mqu2wo="; }; }; in diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix index 1059935ce20f..0de05fb0f6c8 100644 --- a/pkgs/development/compilers/corretto/mk-corretto.nix +++ b/pkgs/development/compilers/corretto/mk-corretto.nix @@ -1,13 +1,14 @@ -{ jdk -, version -, src -, lib -, stdenv -, gradle -, extraConfig ? [ ] -, rsync -, runCommand -, testers +{ + jdk, + version, + src, + lib, + stdenv, + gradle, + extraConfig ? [ ], + rsync, + runCommand, + testers, }: # Each Corretto version is based on a corresponding OpenJDK version. So @@ -19,97 +20,111 @@ let pname = "corretto"; - # The version scheme is different between OpenJDK & Corretto. - # See https://github.com/corretto/corretto-17/blob/release-17.0.8.8.1/build.gradle#L40 - # "major.minor.security.build.revision" in -jdk.overrideAttrs (finalAttrs: oldAttrs: { - inherit pname version src; - name = "${pname}-${version}"; +# The version scheme is different between OpenJDK & Corretto. +# See https://github.com/corretto/corretto-17/blob/release-17.0.8.8.1/build.gradle#L40 +# "major.minor.security.build.revision" +jdk.overrideAttrs ( + finalAttrs: oldAttrs: { + inherit pname version src; + name = "${pname}-${version}"; - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ jdk gradle rsync ]; + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ + jdk + gradle + rsync + ]; - dontConfigure = true; + dontConfigure = true; - 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. - rm -rf installers/linux/universal/{rpm,deb} + 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. + rm -rf installers/linux/universal/{rpm,deb} - # `/usr/bin/rsync` is invoked to copy the source tree. We don't have that. - for file in $(find installers -name "build.gradle"); do - substituteInPlace $file --replace-warn "workingDir '/usr/bin'" "workingDir '.'" - done + # `/usr/bin/rsync` is invoked to copy the source tree. We don't have that. + for file in $(find installers -name "build.gradle"); do + substituteInPlace $file --replace-warn "workingDir '/usr/bin'" "workingDir '.'" + done - gradleFlagsArray+=(-Pcorretto.extra_config="${extra_config}") - ''; + gradleFlagsArray+=(-Pcorretto.extra_config="${extra_config}") + ''; - # since we dontConfigure, we must run this manually - preBuild = "gradleConfigureHook"; + # since we dontConfigure, we must run this manually + preBuild = "gradleConfigureHook"; - # 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"; + # The Linux installer is placed at linux/universal/tar whereas the MacOS + # one is at mac/tar. + gradleBuildTask = + if stdenv.hostPlatform.isDarwin then + ":installers:mac:tar:build" + else + ":installers:linux:universal:tar:packageBuildResults"; - 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 ""; + 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 - # reference through symlinks. We don't rewrite the installPhase but at - # least move the folder to convey that this is not OpenJDK anymore. - mv $out/lib/openjdk $out/lib/corretto - ln -s $out/lib/corretto $out/lib/openjdk - ''; + installPhase = + oldAttrs.installPhase + + '' + # The installPhase will place everything in $out/lib/openjdk and + # reference through symlinks. We don't rewrite the installPhase but at + # least move the folder to convey that this is not OpenJDK anymore. + mv $out/lib/openjdk $out/lib/corretto + ln -s $out/lib/corretto $out/lib/openjdk + ''; - passthru = - let - pkg = finalAttrs.finalPackage; - in - oldAttrs.passthru // { - tests = { - version = testers.testVersion { - package = pkg; + passthru = + let + pkg = finalAttrs.finalPackage; + in + oldAttrs.passthru + // { + tests = { + version = testers.testVersion { package = pkg; }; + vendor = runCommand "${pname}-vendor" { nativeBuildInputs = [ pkg ]; } '' + output=$(${pkg.meta.mainProgram} -XshowSettings:properties -version 2>&1 | grep vendor) + grep -Fq "java.vendor = Amazon.com Inc." - <<< "$output" && touch $out + ''; + compiler = runCommand "${pname}-compiler" { nativeBuildInputs = [ pkg ]; } '' + cat << EOF > Main.java + class Main { + public static void main(String[] args) { + System.out.println("Hello, World!"); + } + } + EOF + ${pkg}/bin/javac Main.java + ${pkg}/bin/java Main | grep -q "Hello, World!" && touch $out + ''; }; - vendor = runCommand "${pname}-vendor" { nativeBuildInputs = [ pkg ]; } '' - output=$(${pkg.meta.mainProgram} -XshowSettings:properties -version 2>&1 | grep vendor) - grep -Fq "java.vendor = Amazon.com Inc." - <<< "$output" && touch $out - ''; - compiler = runCommand "${pname}-compiler" { nativeBuildInputs = [ pkg ]; } '' - cat << EOF > Main.java - class Main { - public static void main(String[] args) { - System.out.println("Hello, World!"); - } - } - EOF - ${pkg}/bin/javac Main.java - ${pkg}/bin/java Main | grep -q "Hello, World!" && touch $out - ''; }; - }; - - # Some of the OpenJDK derivation set their `pos` by hand. We need to - # overwrite this in order to point to Corretto, not OpenJDK. - pos = __curPos; - meta = with lib; oldAttrs.meta // { - homepage = "https://aws.amazon.com/corretto"; - license = licenses.gpl2Only; - description = "Amazon's distribution of OpenJDK"; - maintainers = with maintainers; [ rollf ]; - }; -}) + # Some of the OpenJDK derivation set their `pos` by hand. We need to + # overwrite this in order to point to Corretto, not OpenJDK. + pos = __curPos; + meta = + with lib; + oldAttrs.meta + // { + homepage = "https://aws.amazon.com/corretto"; + license = licenses.gpl2Only; + description = "Amazon's distribution of OpenJDK"; + maintainers = with maintainers; [ rollf ]; + }; + } +) diff --git a/pkgs/development/compilers/critcl/default.nix b/pkgs/development/compilers/critcl/default.nix deleted file mode 100644 index 5caf63d9dba6..000000000000 --- a/pkgs/development/compilers/critcl/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, fetchFromGitHub -, tcl -, tcllib -}: - -tcl.mkTclDerivation rec { - pname = "critcl"; - version = "3.2"; - - src = fetchFromGitHub { - owner = "andreas-kupries"; - repo = "critcl"; - rev = version; - hash = "sha256-IxScn9ZTlqD9mG9VJLG+TtplLFhhahOiFhQCjxp22Uk="; - }; - - buildInputs = [ - tcl - tcllib - ]; - - dontBuild = true; - doCheck = true; - - checkPhase = '' - runHook preInstall - HOME="$(mktemp -d)" tclsh ./build.tcl test - runHook postInstall - ''; - - installPhase = '' - runHook preInstall - tclsh ./build.tcl install --prefix $out - runHook postInstall - ''; - - meta = with lib; { - description = "Easily embed C code in Tcl"; - homepage = "https://andreas-kupries.github.io/critcl/"; - license = licenses.tcltk; - mainProgram = "critcl"; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index c95298cbfe2a..39745f61faca 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -19,6 +19,7 @@ , libffi , llvmPackages_13 , llvmPackages_15 +, llvmPackages_18 , makeWrapper , openssl , pcre2 @@ -144,7 +145,7 @@ let substituteInPlace spec/std/socket/udp_socket_spec.cr \ --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"' - '' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.7.0") '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.7.0") '' # See https://github.com/NixOS/nixpkgs/pull/195606#issuecomment-1356491277 substituteInPlace spec/compiler/loader/unix_spec.cr \ --replace 'it "parses file paths"' 'pending "parses file paths"' @@ -175,7 +176,7 @@ let libxml2 openssl ] ++ extraBuildInputs - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}" @@ -246,6 +247,7 @@ let passthru.buildCrystalPackage = callPackage ./build-package.nix { crystal = finalAttrs.finalPackage; }; + passthru.llvmPackages = llvmPackages; meta = with lib; { inherit (binary.meta) platforms; @@ -314,5 +316,21 @@ rec { llvmPackages = llvmPackages_15; }; - crystal = crystal_1_11; + crystal_1_12 = generic { + version = "1.12.1"; + sha256 = "sha256-Q6uI9zPZ3IOGyUuWdC179GPktPGFPRbRWKtOF4YWCBw="; + binary = binaryCrystal_1_10; + llvmPackages = llvmPackages_18; + }; + + crystal_1_14 = generic { + version = "1.14.0"; + sha256 = "sha256-ayMF5yinHVOUaZxhlmqxb/iiGJHmloeYuKcnrPmxo9Y="; + binary = binaryCrystal_1_10; + llvmPackages = llvmPackages_18; + doCheck = false; # Some compiler spec problems on x86-64_linux with the .0 release + }; + + + crystal = crystal_1_14; } diff --git a/pkgs/development/compilers/crystal2nix/default.nix b/pkgs/development/compilers/crystal2nix/default.nix deleted file mode 100644 index 2ba0fefd6aba..000000000000 --- a/pkgs/development/compilers/crystal2nix/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, fetchFromGitHub, crystal, makeWrapper, nix-prefetch-git }: - -crystal.buildCrystalPackage rec { - pname = "crystal2nix"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "peterhoeg"; - repo = "crystal2nix"; - rev = "v${version}"; - hash = "sha256-gb2vgKWVXwYWfUUcFvOLFF0qB4CTBekEllpyKduU1Mo="; - }; - - format = "shards"; - - shardsFile = ./shards.nix; - - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram $out/bin/crystal2nix \ - --prefix PATH : ${lib.makeBinPath [ nix-prefetch-git ]} - ''; - - # temporarily off. We need the checks to execute the wrapped binary - doCheck = false; - - doInstallCheck = true; - - meta = with lib; { - description = "Utility to convert Crystal's shard.lock files to a Nix file"; - mainProgram = "crystal2nix"; - license = licenses.mit; - maintainers = with maintainers; [ manveru peterhoeg ]; - }; -} diff --git a/pkgs/development/compilers/crystal2nix/shards.nix b/pkgs/development/compilers/crystal2nix/shards.nix deleted file mode 100644 index 728aefb80502..000000000000 --- a/pkgs/development/compilers/crystal2nix/shards.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - spectator = { - url = "https://gitlab.com/arctic-fox/spectator.git"; - rev = "v0.10.5"; - sha256 = "1fgjz5vg59h4m25v4fjklimcdn62ngqbchm00kw1160ggjpgpzw2"; - }; - version_from_shard = { - url = "https://github.com/hugopl/version_from_shard.git"; - rev = "v1.2.5"; - sha256 = "0xizj0q4rd541rwjbx04cjifc2gfx4l5v6q2y7gmd0ndjmkgb8ik"; - }; -} diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix deleted file mode 100644 index 816e8e08f4a7..000000000000 --- a/pkgs/development/compilers/dale/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, libffi -, llvm_13 -, perl -}: - -stdenv.mkDerivation { - pname = "dale"; - version = "20220411"; - - src = fetchFromGitHub { - owner = "tomhrr"; - repo = "dale"; - rev = "7386ef2d8912c60c6fb157a1e5cd772e15eaf658"; - sha256 = "sha256-LNWqrFuEjtL7zuPTBfe4qQWr8IrT/ldQWSeDTK3Wqmo="; - }; - - nativeBuildInputs = [ cmake pkg-config llvm_13.dev ]; - buildInputs = [ libffi llvm_13 ]; - - nativeCheckInputs = [ perl ]; - - checkTarget = "tests"; - - meta = with lib; { - description = "Lisp-flavoured C"; - longDescription = '' - Dale is a system (no GC) programming language that uses - S-expressions for syntax and supports syntactic macros. - ''; - homepage = "https://github.com/tomhrr/dale"; - license = licenses.bsd3; - maintainers = with maintainers; [ amiloradovsky ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; - # failed on Darwin: linker couldn't find the FFI lib - }; -} diff --git a/pkgs/development/compilers/dart/default.nix b/pkgs/development/compilers/dart/default.nix index 9a08b3d51732..d6d538d5c844 100644 --- a/pkgs/development/compilers/dart/default.nix +++ b/pkgs/development/compilers/dart/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out cp -R * $out/ echo $libPath - '' + lib.optionalString (stdenv.isLinux) '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux) '' find $out/bin -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; ''; @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { testCompile = runCommand "dart-test-compile" { nativeBuildInputs = [ finalAttrs.finalPackage ] - ++ lib.optionals stdenv.isDarwin [ cctools darwin.sigtool ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.sigtool ]; } '' HELLO_MESSAGE="Hello, world!" echo "void main() => print('$HELLO_MESSAGE');" > hello.dart diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix index 7f2054e3e0c1..b2fc4fdc01ee 100644 --- a/pkgs/development/compilers/dart/sources.nix +++ b/pkgs/development/compilers/dart/sources.nix @@ -1,24 +1,24 @@ -let version = "3.5.3"; in +let version = "3.5.4"; in { fetchurl }: { versionUsed = version; "${version}-x86_64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip"; - sha256 = "1z6hl6pqsg2l7pfchzr5dk90b2dchidhwnnnc4q5dzz0xjikqrvx"; + sha256 = "0x4kjkgva143g0d07rcz9zd9dfmsr9zfhrx4kj9z0ap9s3rv6vdh"; }; "${version}-aarch64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - sha256 = "12rzl1nm1y0q5ff9p8gslki4cz37y3bdn8p2s3x2nc81bdda4gn7"; + sha256 = "00iw0nsxhq4aas717b0vhcz3hlwrpyixbgkf9sksqk2x1w798if0"; }; "${version}-aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - sha256 = "1rp54g8di8j715n955wdr6i0pcrx2dn73qmvmrisyahi0qjrk0py"; + sha256 = "1v437zpksk0jhib6vhpcbvv715mv32zmwby8b3p9qd3k67fn87d9"; }; "${version}-x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "001mpb3fniamlmnqmhxdpbvp8crdvnf6sam13vvfmnr6na1fpxil"; + sha256 = "0rv9rp8g5blhncqwciymhxh3z2832yp54lphxgsvkmm9y8s5w34d"; }; "${version}-i686-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "0z9qjx2b2rmiqyqww0a5slj0pi1k8sn4fjihkn53im65rhhqra2y"; + sha256 = "02kv119swcp7y4n3yb2i5a4dagjpf0zq3b3an1apahj5zn6ak41g"; }; } diff --git a/pkgs/development/compilers/dasm/default.nix b/pkgs/development/compilers/dasm/default.nix deleted file mode 100644 index 7f57f47f2ed6..000000000000 --- a/pkgs/development/compilers/dasm/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "dasm"; - version = "2.20.14.1"; - - src = fetchFromGitHub { - owner = "dasm-assembler"; - repo = "dasm"; - rev = version; - sha256 = "1bna0bj503xyn5inwzzsrsgi9qg8p20by4dfk7azj91ynw56pl41"; - }; - - configurePhase = false; - installPhase = '' - mkdir -p $out/bin - install bin/* $out/bin - ''; - - preCheck = '' - patchShebangs ./test/ - ''; - - checkTarget = "test"; - doCheck = true; - - meta = with lib; { - description = "Assembler for 6502 and other 8-bit microprocessors"; - homepage = "https://dasm-assembler.github.io"; - license = licenses.gpl2; - maintainers = [ maintainers.jwatt ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/dictu/0001-force-sqlite-to-be-found.patch b/pkgs/development/compilers/dictu/0001-force-sqlite-to-be-found.patch deleted file mode 100644 index 8de4c9f57f6a..000000000000 --- a/pkgs/development/compilers/dictu/0001-force-sqlite-to-be-found.patch +++ /dev/null @@ -1,46 +0,0 @@ -From bb4767f8fc413ca4cb42879a9a226fd26f10e094 Mon Sep 17 00:00:00 2001 -From: Lucas Ransan <lucas@ransan.tk> -Date: Tue, 3 Aug 2021 20:39:11 +0200 -Subject: [PATCH] force sqlite to be found - ---- - src/CMakeLists.txt | 16 +++++----------- - 1 file changed, 5 insertions(+), 11 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index a0f3fee..58b4d0b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -9,7 +9,7 @@ set(INCLUDE_DIR include/) - list(FILTER sources EXCLUDE REGEX "(main|linenoise|utf8).c") - list(FILTER headers EXCLUDE REGEX "(linenoise|utf8).h") - --find_library(SQLITE_LIB SQLite3) -+find_package(SQLite3 REQUIRED) - set(THREADS) - - if(DISABLE_HTTP) -@@ -20,16 +20,10 @@ else() - list(APPEND libraries curl) - endif() - --if(NOT SQLITE_LIB) -- set(THREADS_PREFER_PTHREAD_FLAG ON) -- find_package(Threads REQUIRED) -- set(THREADS Threads::Threads) --else() -- list(FILTER sources EXCLUDE REGEX "sqlite3.c") -- list(FILTER headers EXCLUDE REGEX "sqlite3.h") -- list(APPEND libraries ${SQLITE_LIB}) -- add_compile_definitions(INCLUDE_SQLITE_LIB) --endif() -+list(FILTER sources EXCLUDE REGEX "sqlite3.c") -+list(FILTER headers EXCLUDE REGEX "sqlite3.h") -+list(APPEND libraries ${SQLite3_LIBRARIES}) -+add_compile_definitions(SQLite3_INCLUDE_DIR) - - if(WIN32) - # ws2_32 is required for winsock2.h to work correctly --- -2.32.0 - diff --git a/pkgs/development/compilers/dictu/default.nix b/pkgs/development/compilers/dictu/default.nix deleted file mode 100644 index b58d86871374..000000000000 --- a/pkgs/development/compilers/dictu/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, sqlite -, httpSupport ? true, curl -, cliSupport ? true -, linenoiseSupport ? cliSupport, linenoise -, enableLTO ? stdenv.cc.isGNU -}: - -assert enableLTO -> stdenv.cc.isGNU; - -stdenv.mkDerivation rec { - pname = "dictu"; - version = "0.25.0"; - - src = fetchFromGitHub { - owner = "dictu-lang"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Tahi2K8Q/KPc9MN7yWhkqp/MzXfzJzrGSsvnTCyI03U="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - sqlite - ] ++ lib.optional httpSupport curl - ++ lib.optional linenoiseSupport linenoise; - - patches = [ - ./0001-force-sqlite-to-be-found.patch - ]; - - postPatch = lib.optionalString (!enableLTO) '' - sed -i src/CMakeLists.txt \ - -e 's/-flto/${lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"}/' - ''; - - cmakeFlags = [ - "-DBUILD_CLI=${if cliSupport then "ON" else "OFF"}" - "-DDISABLE_HTTP=${if httpSupport then "OFF" else "ON"}" - "-DDISABLE_LINENOISE=${if linenoiseSupport then "OFF" else "ON"}" - ] ++ lib.optionals enableLTO [ # TODO: LTO with LLVM - "-DCMAKE_AR=${stdenv.cc.cc}/bin/gcc-ar" - "-DCMAKE_RANLIB=${stdenv.cc.cc}/bin/gcc-ranlib" - ]; - - postBuild = '' - cd .. # move out of cmakeBuildDir - ''; - - doCheck = cliSupport; - - preCheck = '' - sed -i tests/runTests.du \ - -e '/http/d' - sed -i tests/path/realpath.du \ - -e 's/usr/build/g' - sed -i tests/path/isDir.du \ - -e "s,/usr/bin,$PWD," \ - -e '/home/d' - ''; - - checkPhase = '' - runHook preCheck - ./dictu tests/runTests.du - ''; - - installPhase = '' - mkdir -p $out - cp -r src/include $out/include - mkdir -p $out/lib - cp build/src/libdictu_api* $out/lib - '' + lib.optionalString cliSupport '' - install -Dm755 dictu $out/bin/dictu - ''; - - meta = with lib; { - description = "High-level dynamically typed, multi-paradigm, interpreted programming language"; - mainProgram = "dictu"; - homepage = "https://dictu-lang.com"; - license = licenses.mit; - maintainers = with maintainers; [ luc65r ]; - platforms = platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dictu.x86_64-darwin - }; -} diff --git a/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix new file mode 100644 index 000000000000..06153d33d4ce --- /dev/null +++ b/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix @@ -0,0 +1,293 @@ +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: + +# v8.0 (active) + +let + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.8"; hash = "sha256-5iWiiKBaB6V5x3GDvZ1DpyxDHFIsmewksoeIizz8Z7k="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-2KBKkVUlpiO1bOY+Ia2PKjurY2taV7CHnzU7Jr5HYUs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.8"; hash = "sha256-3x7ltOqJJXYO+zHIIvH1SDEz9fTrHqNoyK68teiHGZQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-ZGunPQaL6Kz97BpQY9lSOPEsy1CvZiTZeidqnG18anw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-x45oE7EFl6V29tVnuvzfcnAufOQjVf8FYxG8TSNz77k="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-UHKTFAfqIxoBZ38I6wBdMNA6NyQ4FhSJcHNQZxjaCu4="; }) + (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-KmiA+uHHYOnsfdG3F20mu0XllcRxEvMvWkHz7vK39KQ="; }) + (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.8"; hash = "sha256-st7UdPx9AFKf9o6WewsmUKhbP2IG2KQjHRCTdP4Vj00="; }) + ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.8"; hash = "sha256-VL9omnR1wz323jyU+UQWPuwKOv7UfkkiZ+8ja1JYDM8="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.8"; hash = "sha256-MaWj6kbZ4td5Yq1aMyK1nqUva7d5bDXSewRoqjF0jS0="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-Dz8dkFRN//VvdLjWxe8+5o81adh/gqYyo5aHxtjzoqs="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.8"; hash = "sha256-MJmQmBHWgvsqO8XYLnqsyUTfQ72VeJ/3EHq6OHtZ+n8="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-dmtcy7cqijoJAUCEJTNcvqaRneRMCn7WJkurjk2YpN8="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.8"; hash = "sha256-liIF45Ljv47Wkl9xhN2IWH4vbFPCUkvF++i7ENsCB+o="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-Y3KRiZ9i1IQoU/X70+c5hUkPsfSUJD8mrWecspUAEPw="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-LACty1K+yIIJiTgArn6DpuMqKS+uhVBCgIG2e4W1XBI="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.8"; hash = "sha256-deYqv/tadlpOOMof1/MoLu2fIjcfbQ4Y/auc97c0GIM="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-a6q/Fq88tknCNUEMiGAdCNOMj8rUyWMa3LdasqMl06I="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.8"; hash = "sha256-MeztjburvdAXPWL4eLVhvL2+K9qd3otNatH8QbJf3Mk="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-Q7ZRUqGLN41EIbmTPQXiiLIJsLWwHHlTMCg7e9B38Fs="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.8"; hash = "sha256-nb0PV2g3PjENKIFLnnUynIxa9GWjVRyprHRbrMAfHW4="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-exBYb8kUySdkudyNrs5ArXa/wkkS2b6lhVpm4jZMnqQ="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "8.0.8"; hash = "sha256-b6WidfvMYv6zHy1nd4kGc5oCg5tTDxPlg8CESjurv5E="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-4OtC6HUOpa6DSJPkA+/72wQHgGj3Kqh7iQyJtvvNtz8="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "8.0.8"; hash = "sha256-bHuEFTwVzaQOEV1w/Jtfe8ZHMOtwHWsSqiiqoun+SkQ="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-wTLpzd7iu6eCyOn6ct4ZzB2NQq7GzNUJEsh+zkgHbdU="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "8.0.8"; hash = "sha256-Q6mYxptkYaF0ThyJSX0uUVKK6R6x6Xkfi/40EqiDAQA="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.8"; hash = "sha256-H3XoUT5B3taEoJvUFhlTRZ5/LI8VVaFxd82QZejD+xE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.8"; hash = "sha256-eYuDkv5aQvet7FzZOsZ5LZHnbNE4na74cmq3JsDaBNA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.8"; hash = "sha256-UMSNfp7fmU9UTkCj6GFoqz4iLDpM1zh0WP9W7KBIMAM="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-lSBjAXq7gADmOA7NaK9S+S+8Xx8oTsI6Mrp3fgA3eVM="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-RZ3KnxLJocJS9mSAwP69XCe0kA/uCppUNSMp4soCkN0="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-iW0U93hxohZrnGYB4us1XAaOBXMtMofMlN/FVdVjSS4="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-X6iM6I4WpVbLCEDhwwUrih1801VKfFz3gAaYZuQMTxk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.8"; hash = "sha256-wCNIvKB1pav/orE1e9Ljcb8NUiaIZ447KsyHtEI1uFM="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.8"; hash = "sha256-Yu/CZXF9OS9CtGV1ohPRRLHKpg3xZXmH+8aukhZjJO4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.8"; hash = "sha256-hSj6/ogmBRNoC4VIqmkp7IsFcYf1IzVhHFsGU4BW/ug="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.8"; hash = "sha256-VXwu3zMEoxrLfABVIc2zIN22JsoUwCeuM7W++7lGeVc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-GRldzHE2XXJdR6qAdcxgLcXZM1gNoiGsfJg0M5qnlR4="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-VACUGeR/lEFnS8O3kVBimN8U2sIr1/aU9hHyBA4cnKU="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-C3891F6er32h/x4bjp7nMbHOWvaGhjaAVxPwGQtxwtc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-s57vIXMmdrTdlGmfqyemkSJP11MltQWemJnet92e+A8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.8"; hash = "sha256-HDpL4+yMCXuy05nnJWKqZB2KkumluhvznAxAglZ2x5o="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.8"; hash = "sha256-/9Hsru4pLWKMb2LTF1erdHILGdEc/2NnuTIG+dcf1jY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.8"; hash = "sha256-Leqb/Un4/GRgRcymCJWnPhjZCn8A2hl4nFdYJfkNdqs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.8"; hash = "sha256-y5IbKOkqAKBpyWiA0PFmrtVXGXsWLHvX2FsiICm6egU="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-Ls2+jcDC4FW9zO81O2JP6BtKeazhydWEiXBPg/GJsfw="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-jJ7jGIYzDYqBZzJEG3BwS+NqUv7o7tRxUNgOTQ0oFSs="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-SCj9QjWOJvv3TvlR0TpIyFZrebRFTkVFVPdQ82F08gQ="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-LbvKpuOg1Rdqtabz1UvoADiNOkh+phBdXcD9iBGAAD0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.8"; hash = "sha256-TwTvStZ7PMGpFh16lSI4iAJwDz/lnJkqHk/RQ0KEQB0="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.8"; hash = "sha256-p2Xix0JrQlMxDbvuPmXXaikVLVdKo1OPdk5w5PKSp3A="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.8"; hash = "sha256-shWbs109a6xx0JyJH1hwjs0OR/KhemxYjjLJhrTzE7w="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.8"; hash = "sha256-cdjNG4XehuADgSuW0c/PKC+6VA0rdzisUKYJXMPhSvM="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-kxAG5q8z/6d3jjYhIbEOLTa9sFUveg9AK9QWEYb+Osc="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-M881jx3YlNWC51BZguFtvn9UfU6neFeRhSaq0zsMCFI="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-BwC5R+ECo52tePjkq/B6OEQvS4hq8tlAfUOBi9UufSg="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-E6clBJ6GdZd3d6XaGqlwcyJq9UN4a9t+ixdZi7Ro4Xw="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-epjQsC2vTOpppEuMljG78vm/RWecUu/YJRAt+2ETd9s="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-DHGL/dDpQ6LhathaNJxp3M3qQcCEG9oYisUQ6WMurMA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-6hx88DtgvvwRhyEFHS32AKvRwwHZyS44SxYRG4La+i0="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-KdRDHgeE6ShPewlbreXJ+87JrPGdhO5CEGBzVOyn44M="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-g7De3JFCkr1wtMguY1QJXAZD5CX855/xen6pCMCrkDE="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-PdskfOr7EiC4VDvyAo5k5MjmKayexsyPNkJhaAhVXjg="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-tSZ9tj81dWrHqrau0in1b/ZgbMyDs5P9Ea3sofhQ/ks="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.8"; hash = "sha256-21RqIxjfaIOaABcqoe9AlZElWdXNd44dX0jodejOFNY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.8"; hash = "sha256-nCSziE636/NGvg4J8HKI0CZ48SZZvwKu22QZa7Q/sAg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.8"; hash = "sha256-3vnqKFPAhjoLP6h/MnVfhoWOr2/0XvnUyufafbYED8Q="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-4zmkFZSBB46KjlubRHJ+DIBZs22CJLbIonT9hVsf57o="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-JeCvY8S+YPlFMwNokIxIfOsMc+cPSxIRozAVT03+ZlU="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-EXfxzK1Z7kqCDckq829GHat6EfYCKJ+9BrcBeHd1raA="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-oDjnxygsxPsy1Mgnx59tpmqikAgN5H4o3IBzXup4zNo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.8"; hash = "sha256-xxkmlp9i3x/4Ii+e4YYMPAA4iWdK2cwwj4030tp3o+U="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.8"; hash = "sha256-ZB3eGK98abOZpcYmfWx0V3G/8AWr20gGyB/Ko5Zl91I="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.8"; hash = "sha256-L1IBy+DvMCZIbTzmlvSU2vsRrlZz7f29VS4H0+1/stw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.8"; hash = "sha256-6G+7coU3SeYUTAjWl0iSYi28nGv5mzTnS8nkMMffGP0="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-O59V6pzicz7KWwUy+5qB3nAwSxhRsM9HoCq2uInaaHY="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-o3tSBAtHJGV5FbpreOQPF1VPb1ZoJI0unynfBUwvZ+E="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-NI6EnCoVuFHZ6mH9ZMXb38GhmQUhfxwP+vPlO/MsVnI="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-zvmCpjhY5JRezpwVr0S90rJfV0YGZ/wFJswo7Bl6tQQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.8"; hash = "sha256-D4qB2A3tJGN3nJcxMl/gBxA+LQx5QiawYWHn1Y3jWHs="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.8"; hash = "sha256-emanxsPDi9tYicfkeLRVN4r+yZq06jG2RdoVpRG/lK0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.8"; hash = "sha256-x7WOZWhE4NX6yc5MBlFO4EKHt4ExhnGx6lhmYrr8wfk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.8"; hash = "sha256-SWEUTsvHkPP9S8iRW/PrneIZV7NRkz3IPiVmKZ95X6w="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-bG/yxRP8uNHjCcZkSOlqSqgWIesuww8irvtSsC8jIfE="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-0EJXF7Aa+7nEUOvqMCDLr5Gwa9OWu/Ol5kpCymTVkP8="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-sdCf4IfySwQalViNicdX1NFN3obWCImm6I6Zzhu1pxs="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-jHU0GS/mtOjKniVojxzKdk6VgQghNLRWi4G0/W+kflw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.8"; hash = "sha256-hBmQqsJX4lPCEkwh0kuZl81KNkqR+4FZWwBKaGQPPPk="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.8"; hash = "sha256-kWp27hqFc4GlvnFiiPZlW8F6UEXmFRNAN5RkkNfM0D4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.8"; hash = "sha256-lD/M7PhWXUSsS3FJ4doXNo+zFLIAnhqBmtfBkDvOX9U="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.8"; hash = "sha256-xJc8ynP8Yaq3fdBrd+1wSgF02dx6fKaO8Ty1JJvm87w="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-/1nQT+3thlkAeQbfsIakuD+/oZsq9KeI0vCgCFubOO8="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-2P9wZVY4iQmOxKttjrqb2fKQMWHzupFgVuwcE4egAOU="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-ZTK07ZSjid/flmTDgrp/GH37rmYpOYdXTKzJnEeIx3k="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-Lzxot9nzljMCvyqLHiXOu6qC3rgB3iN6JG5t1QCAbko="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.8"; hash = "sha256-NmsUnkmjpbxYa3jNjLa3+CbbSa1ipFvolk6fjJQ52co="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.8"; hash = "sha256-pkfKvNeb779TUp9jp19peJjCXK3NGpexaFjWwc3dSBo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.8"; hash = "sha256-C0zUiMMAQ9nd1n7PDVoBhCShHzdGI67YFySTpeFH8uE="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-ojXEKX1OwepAx61seCAPh27UATzGTsE6VenT061IOmU="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-wMhsf3QncEUGSnFrGEck2Kyb8cPLPW8n7ZgKHwebdI4="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-AGqQ6fZicft/cBquuHb9jOh10N8gr/sLfijYzwm9vcM="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-hl5uj5iR2xXkefLQJ7DVU0NfThLatJUOqm9MGZUN9HM="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.8"; hash = "sha256-gS1Lu8UcYwlJL+N4Q86NnObCYOjsaG09+bHbjXr1Ro8="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.8"; hash = "sha256-z5swa/BoIPh7oDb4WpAh5uvXZ46artGD/lnQm4e2cko="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.8"; hash = "sha256-fpqkDTGVOO85fWS+X5Yj//NRkVoRf/RxJZ974N4OKvI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.8"; hash = "sha256-nZEdf9Y3TLgyLOzSpn5ryl4xAbIy1vMGnVqCcYr4G74="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-NDGG0iZtxXLArTb3DEF1ELT3nHNTT5ogXqG00+70f9s="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-QYpsPJMunG+1LY6iOhkqe3TWZeUnV2sFdCRGKByEJcg="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-B0EIM5Jxi367oSvB1mHiHE3VpdoE02OF9FbFC1FlkLk="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-y1V5P/emZwwzWoz0UtMC/OYQjK+nGe9vkrY4RE9HRVI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.8"; hash = "sha256-vz7hG4LOgtZVpOMCCDrosxSiSUAIFmHWHxPe2kfIAWo="; }) + ]; + }; + +in rec { + release_8_0 = "8.0.8"; + + aspnetcore_8_0 = buildAspNetCore { + version = "8.0.8"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/26f16795-9928-4ddd-96f4-666e6e256715/bf797e4f997c965aeb0183b467fcf71a/aspnetcore-runtime-8.0.8-linux-arm.tar.gz"; + hash = "sha512-0P7t2Ru0AoBp2M/xcmGR6fCZIOdWQF3g0rv29DEWJ3zJPr4kg/QFuqSXK1T/6JsJy+FypjnmA5eucTjfXvSMTg=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f6fcf2c9-39ad-49c7-80b5-92306309e796/3cac9217f55528cb60c95702ba92d78b/aspnetcore-runtime-8.0.8-linux-arm64.tar.gz"; + hash = "sha512-w9ydcfygpI7algdMvO9MmiZcHE4Qy/84YU3XTXlEOunRzNEHFHZM0EEpH4HYPA7Rwwer+JJJq0tvWKXelS/P/Q=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/648de803-0b0c-46bc-9601-42a94dae0b41/241fd17cee8d473a78675e30681979bb/aspnetcore-runtime-8.0.8-linux-x64.tar.gz"; + hash = "sha512-1sDMKqx5+6y/gbWX8oZ2NZn2YnjBfdtEjOC5PUmbrY+Id31CWFTmhgKUWrGK+KYfHuWdQx1VAwBhN/hhE/qosg=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/9255e487-cdf2-4690-9840-74712503e37d/40be3d122db1d1ffa53a9843321c3979/aspnetcore-runtime-8.0.8-linux-musl-arm.tar.gz"; + hash = "sha512-XZ9gnnLc/MFra7Y9Sef9R8Pi13kT2d4UhkQX+ypTSy99tWUw2xZazGNjNkHHBtD6upXbmFsJhEZ32MtBA5oMZw=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/95f358cf-86b5-4789-8ee8-063067081c8b/e50e603b2453d7dc65eeb26dd4cfb398/aspnetcore-runtime-8.0.8-linux-musl-arm64.tar.gz"; + hash = "sha512-YCjCkwbUlp7kBMRZ3KMTDx6WFNGVTo7UQAFAs1rYoeZqCos64CFV32vQRs2TCQdCIEh6HCYlw58IG9xsjtYgBQ=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/7d2ac05d-2bef-4069-9513-bb2ef7fab48d/4f3d2d3fec003a65513dc1f70c126ab7/aspnetcore-runtime-8.0.8-linux-musl-x64.tar.gz"; + hash = "sha512-gi8uFxbcLSqkb/CPTS2bueqMgjMnhdCrpfTzPl62C9zYTomc0qE8qTAyImcQtfDKXHFZvtoXAn+E76KFJ4tXmA=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/a7080974-fac8-446c-ba20-313f6f323fbe/f907c126c9bcd394939a7cdf86b85f4b/aspnetcore-runtime-8.0.8-osx-arm64.tar.gz"; + hash = "sha512-oZbGKxTpE2NiBzgmoD524KFHAn8DZVUpQm5ZT35E643QNtrqgJl4dgRxccF5PH7c+lFGvVWgG1kdlAX7FkbrAA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/465bdf6e-407d-4512-a222-32dafb225ad8/c22004de330d10a06141dee0f42b5d12/aspnetcore-runtime-8.0.8-osx-x64.tar.gz"; + hash = "sha512-07qNz63c1tUP1DSRH+PrgwlmaTmooe3oANfaLdgU7714HRRJpCtx0ccdlZNGXp6XIFAl60MoCO+aO6DcvboOPg=="; + }; + }; + }; + + runtime_8_0 = buildNetRuntime { + version = "8.0.8"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/5e427de4-981a-481e-9fec-fa77b02a7edb/0d156acae55ca1329b6b9a8de70f398f/dotnet-runtime-8.0.8-linux-arm.tar.gz"; + hash = "sha512-yHr1qq8y4YzNwpZRecZaq65eDp6Oogn2w2QnDOLkr//ql5yiLhQ95GdONqKxLGa1dViK4hnxZjaspxIUQCQCiA=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ac04b123-0542-4e80-9216-93f51a6814b3/d110733c152d34ab4eedb435ccfdab4d/dotnet-runtime-8.0.8-linux-arm64.tar.gz"; + hash = "sha512-JG+35e21Hbk0Ica7dCD3o1hDC5iyJKcftw5xorzgvJH4U6qJEJ8hiLCrKFMqJFw9UrqsFjRj4BoCAZ3qN/058g=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/68c87f8a-862c-4870-a792-9c89b3c8aa2d/2319ebfb46d3a903341966586e8b0898/dotnet-runtime-8.0.8-linux-x64.tar.gz"; + hash = "sha512-j1IgCYxWL6NJBBd0jrn0+coVUfcVVyi567GSQ1nGPBje3vZDvNiexntZy1sbnecoPuFW7zgf+xaAG1FtupsbDw=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/2f4507aa-972d-429c-9129-cfe95c1279eb/60dd9afc3f4786a568b01119c2280c63/dotnet-runtime-8.0.8-linux-musl-arm.tar.gz"; + hash = "sha512-im+SDZPX1VJ9won0clIeKmca+05mOqrP2CwyZYwuo56rQ6XJfT09e6WEA+v79suW/HP/W3zMGpRH0Tv0HuuAyQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8d78f160-0833-4db5-bd62-947f8bc2d571/25638f47211018a7bd8fd9d314763196/dotnet-runtime-8.0.8-linux-musl-arm64.tar.gz"; + hash = "sha512-JvNeHGB0p9maQOpI9sAtt49OLHQ8vHRGOglNoBThJuk3nQm05WgJrJgpsmtroKkBrcR638PF01qX6erVppMUiQ=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/d9c4e4e4-bb2d-4f1a-9ded-bff5e354bd5a/0c6dbc5f68bea36a65fdf80e6aa4d55f/dotnet-runtime-8.0.8-linux-musl-x64.tar.gz"; + hash = "sha512-yi/zIUVQZRMlP4Ds1ytcJNi9oo9EroPJiMOev6dec31VELy4S8J6FJ0uaZV2H4sSTXcBUirpu8rBf8MmZyF+tg=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/e9ded115-7a30-4952-bb72-ff101583f20b/5a7628261b98d095d2c97ec3fe5267be/dotnet-runtime-8.0.8-osx-arm64.tar.gz"; + hash = "sha512-iLBt0FGBm9noziw0CyUW3A5Kd9Vl7/FF2OlXslUqZB4jWlzn6Ns2B0dYh7x2bxUw0B0Ofv2A0QzWUqKZlUOYtA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0159972b-a4d6-4683-b32a-9da824d5689e/ffb0784119abf49015be375b5a016413/dotnet-runtime-8.0.8-osx-x64.tar.gz"; + hash = "sha512-gCmYbB+LvxsOjQkpdWFW/kHUbS326+GrHGb7zqKt1Hw1uTRXPGGYeXz2DSs3LNRj5wMmwKNbCSbatNXBV6NX8w=="; + }; + }; + }; + + sdk_8_0_1xx = buildNetSdk { + version = "8.0.108"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/27228a4b-1ae9-4c1f-8a21-eecd21d6c7b8/c0500c9fac6db54f68c04956b828e8ea/dotnet-sdk-8.0.108-linux-arm.tar.gz"; + hash = "sha512-+vqFZLNLUktCCeEEfOfPEZCl1C57obE1JPXeYCsHXmMM3SKVZ/FOsvCubJaskQrp27T8TlKN+VjJ0xRxNB7tyg=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/07df5bfc-98ae-4335-91c4-c95ec5f99a58/48a310e5d1bde3e77c53a51c99bdfc08/dotnet-sdk-8.0.108-linux-arm64.tar.gz"; + hash = "sha512-bMcj8rE50ZsuF9pZNmmNOIpbZGOLde94xAxAftPP096nRcKRbwPvyeZkefxV1gjrOokwVyfs2xyZmxg7WN4ljQ=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/95a365b4-ac3b-4300-ab6b-54cbc73220f4/4aabad928064af8761315ef34b08c24b/dotnet-sdk-8.0.108-linux-x64.tar.gz"; + hash = "sha512-Vmbd9vqbZd6rpNfF/MLi1W9jHE9fb7Kp9ZGa8GFqsrQgsSqCi+zC5LhiinasPa6CS1Wr3lxtWsWe4THX7Ornwg=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/24ef2f24-ca8e-4c3d-8466-2311550147d4/acbf2877ab4b8a611a3b63a9b9853dfc/dotnet-sdk-8.0.108-linux-musl-arm.tar.gz"; + hash = "sha512-77MI2BrBAgli8U0D58qUGaKQGghGEg4HzZXGVAf+KYGiY2DC/+oUHYBYGqxtLDanN5x2wHsvs31O+4NpBfj/aA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/63bf0f75-e962-46b3-b7c3-12aa20129d46/071514943265037c423e6f5e40df7ace/dotnet-sdk-8.0.108-linux-musl-arm64.tar.gz"; + hash = "sha512-5wCbo3OwQ8y0aVVycayK5RirnJtbNk6YQdi5cwW2A28zJA5nLnxIN5hhaiM0KXSNUDj9/TNjUrggYK/WRXRwRQ=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/cab77c39-2e16-4f29-a9cb-e490d7fff442/ee37bc88e34e082a64d834ed5041bcee/dotnet-sdk-8.0.108-linux-musl-x64.tar.gz"; + hash = "sha512-dEcVUB3jlG8GzTFvNcq8DjY+CvZRBEyXZwjA1I1OsNCUidkszrKDx1Gy7tDik86qq93Lq/fCXiHWWOv/ncMEqg=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/64a3d858-c2e3-48d1-8236-7c6702efc1f8/191bed6c7f89244eb998b0f186db57d7/dotnet-sdk-8.0.108-osx-arm64.tar.gz"; + hash = "sha512-g7ASdkdLS2K/CigvvhHSNTohkdkL7NQDs3PNbfyVJkRCqQcRetj2FXZbE5aSZ7iH0mqfJNvV+I2LVdqpRBLRPA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5ea78b09-65a7-4b08-ac65-bfae17afb322/7416ecc76a30ae4c77e71aade36e037f/dotnet-sdk-8.0.108-osx-x64.tar.gz"; + hash = "sha512-qA/uJ5q/61WKVUDKKpaaEbs9vq3ow52MR76KLWIu8cK+2yLIdFmK1B2/8rldWkMZe9n1X8kzq07eXty2p2z2yw=="; + }; + }; + inherit commonPackages hostPackages targetPackages; + }; + + sdk = sdk_8_0; + + + sdk_8_0 = sdk_8_0_1xx; +} diff --git a/pkgs/development/compilers/dotnet/8/default.nix b/pkgs/development/compilers/dotnet/8/default.nix index 8b98aa962dc9..d7310cd81994 100644 --- a/pkgs/development/compilers/dotnet/8/default.nix +++ b/pkgs/development/compilers/dotnet/8/default.nix @@ -1,9 +1,8 @@ { callPackage , dotnetCorePackages -, bootstrapSdk }: callPackage ../dotnet.nix { releaseManifestFile = ./release.json; releaseInfoFile = ./release-info.json; + bootstrapSdkFile = ./bootstrap-sdk.nix; depsFile = ./deps.nix; - inherit bootstrapSdk; } diff --git a/pkgs/development/compilers/dotnet/8/deps.nix b/pkgs/development/compilers/dotnet/8/deps.nix index b77029b3ac7a..db44150cdd91 100644 --- a/pkgs/development/compilers/dotnet/8/deps.nix +++ b/pkgs/development/compilers/dotnet/8/deps.nix @@ -1,11 +1,11 @@ { fetchNuGet }: [ (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 = "327399b6bee8f18db222120e77f662addcac6fe8c6e46a5e238d4cc9a3ee7b30"; 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.7-servicing.24313.11/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "c8adbb9a816a3272fd305c827a6183be673a143e693a803ab038b737ce5cc7eb"; 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.7-servicing.24313.11/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { hash = "sha256-8B+2bg279IxspjUCUG2kvvwrOJ4kBfqgAZLYkSpFXDA="; 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.7-servicing.24313.11/runtime.linux-x64.microsoft.netcore.ilasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { hash = "sha256-qwzB9mCoBWiqz7sMfDMwBwgZHm4Jls7Uq23dhpPE8dE="; 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.7-servicing.24313.11/runtime.linux-x64.microsoft.netcore.ildasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "6b4e532da6481799e2d5ba0f466439b1dbb72b38f99d658f01ef13abb8fa4143"; 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.7-servicing.24313.11/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "45944f5e8b6a2f55defb432e47aef685842445edcbd209dc714efea5a7500422"; 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.7-servicing.24313.11/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "249166f90b4ed837c0797d8c7bed45d55d058aae223e9f163590bee2bbeaf996"; 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.7-servicing.24313.11/runtime.osx-x64.microsoft.netcore.ilasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "ad9bda1369dab0aeb3179735a653f6cd92af08a01c33b220a902f9da1b0b9e65"; 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.7-servicing.24313.11/runtime.osx-x64.microsoft.netcore.ildasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "5e6469e8cb678ffe0dd238b80cec17ef6667291b481c375e81292fd403b9ae6e"; 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.8-servicing.24366.12/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "57aba33fa6933c296454ceab3d58469ce089573218595efdaac74ca047562dce"; 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.8-servicing.24366.12/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { hash = "sha256-5wddL132f1W80dHLP8Nn5EVvStTauNUH+E5JvVboC5k="; 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.8-servicing.24366.12/runtime.linux-x64.microsoft.netcore.ilasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { hash = "sha256-73CVn14q/pnCxN2qPaINi+u6YQSVwEKI8xtCT1NAs04="; 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.8-servicing.24366.12/runtime.linux-x64.microsoft.netcore.ildasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "e386ffb4c9bb0a5f9f3fc8ff1cf389a6564c8d4d6747b39954207f2a541cc67c"; 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.8-servicing.24366.12/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "479117fab25d26d59d8d605a308b53116a0cdce88e4cb5923a31187916d8297c"; 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.8-servicing.24366.12/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "dcd72a80e4268a8231790b647ed83b214185f0c8c33fc3656618495d2cefb343"; 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.8-servicing.24366.12/runtime.osx-x64.microsoft.netcore.ilasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "0a77e58f66baa31981d503bcc8ebbda4816643c8162e685d8b0620cb707f5668"; 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.8-servicing.24366.12/runtime.osx-x64.microsoft.netcore.ildasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) ] diff --git a/pkgs/development/compilers/dotnet/8/release-info.json b/pkgs/development/compilers/dotnet/8/release-info.json index c444ebd7f13e..55471559c4c7 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-/LB6wcJyN25e8+wuBBmnBhdafkczl0LoUX0R/NlUdEU=", - "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.107-servicing.24317.1.centos.9-x64.tar.gz", - "artifactsHash": "sha256-eduApTyIPz8aVvMCHckVLEJ69/fDLWNtw7EpRq36Qfo=" + "tarballHash": "sha256-HSks3/qFi3khT0E4bU1ek+g8xd5yzmhlqCfnec30EKo=", + "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.108-servicing.24372.1.centos.9-x64.tar.gz", + "artifactsHash": "sha256-hEAyX3XJG6jHJV4sv1DHxT48u1mSTTXEWwODBm4L7cE=" } diff --git a/pkgs/development/compilers/dotnet/8/release.json b/pkgs/development/compilers/dotnet/8/release.json index 0da99bb31cd9..501d01cd0a3a 100644 --- a/pkgs/development/compilers/dotnet/8/release.json +++ b/pkgs/development/compilers/dotnet/8/release.json @@ -1,10 +1,10 @@ { - "release": "8.0.8", + "release": "8.0.10", "channel": "8.0", - "tag": "v8.0.8", - "sdkVersion": "8.0.108", - "runtimeVersion": "8.0.8", - "aspNetCoreVersion": "8.0.8", + "tag": "v8.0.10", + "sdkVersion": "8.0.110", + "runtimeVersion": "8.0.10", + "aspNetCoreVersion": "8.0.10", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "e78e8a64f20e61e1fea4f24afca66ad1dc56285f" + "sourceVersion": "8922fe64a1903ed4e35e24568efb056b3e0fad43" } diff --git a/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix new file mode 100644 index 000000000000..f01b54a350d3 --- /dev/null +++ b/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix @@ -0,0 +1,249 @@ +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: + +# v9.0 (go-live) + +let + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-IcIfs7kmYWeUW0xI23FCgzzdTx/TstTzY/En7HZ3IYE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-YtwuWl1DpYuKY97P2iJmm7ov5q05by3eFL4inl+Kwhc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-aHywWxrhPfKRL5sZelbQiUZaMLRn+e4A3UXihjNBLoE="; }) + (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-KaSR5WA+aTDOR41PuvwsXZt/zHsOJOKxBEfSGxFO07o="; }) + (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-f9o3PGHsW2BNMN9noBsUFv0SRRUR2m+RHceJtjCzd60="; }) + ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-1P7Y8+FoxfaL3vTLPx5/LPYw2ZVhxC5sTSKbjHCPAuc="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-yT+zcwYGL1f8oMC7S9sdLjbLpaR5/zdrRtpozZ+w/YY="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-U8rxugP2w8JS1I1cTMzN3XYjw9uVHZqPDDppdE9dtns="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-iRO1a77VwLcu4vWro3eHHcxh8nQlY/ik4+pT/2c3khA="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-XIODRgELUOKfn5L5g40Mxzcf/qH7pCJoRRvZPW1eY38="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-hqYfNrj8fhgSMkK+sEQTtZdidJeD2vvvDoMBtK8ZmYI="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-JMpiQJY23noyNK0KjkkyGmYJJLyTNiHhlZPKA6vSQB4="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-XjcQWqUEadp9u90HZU45gt/ANzn7Z7yuV24SrMKY7tM="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-Dbt1T/Y9AsuITCNDu7+9to+9Q8aUAGmEsemONyucNkg="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-AlWrYGpqFSTj6UDEZ77kFq+KrN9SOO7fLu+R5hiICTM="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ewDINCVRtePHQRceMn0xhUFNjEr08AsaS9WBvz3lcLs="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-8CNaSv1PxoyQGSc7W64BlviEgBtggYzSjDh6vPl3YSI="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-DV1kc2BhDSHgmWE7lqUtM3u5YfXl/EKo3FU04LHzP5o="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-58cO2fdzdLYkWC6q7dn5dXKpMj4WzE95tlnPqW0X+W0="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-GugOroZ0SRoGoP3xE3jt91vTbHwXLPq8bHYckNC8SIA="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ceT9q9ZCwhGnp+BrxgjPcoyrAqKHc7VK47M4tM2pQmw="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-lvAHbw3hhS6OnCuUMLEa4NKJWZPHqcBM3IeXpeYtLHo="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ZV5ptFKjt4UX+ytjnWMRk0/Xc+hR8tuYb8ADqLlTFnU="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ULArvCiy+bOHtkD5E0q7u+Cfg7R+IJZ4A60ldV798vs="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-eC46DyuObx9VhFP4PyY/3JWqAck8bW4Bt2hZyuapLRY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-6WaE1hKyIBnsTe3YlVP/lHR9HOnMkYtqDZEZLzidFAc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-u7sukf/qUk+gUVxFj/r9rzkQTVUcg2SqNhOmhPOsEyg="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-pYPVNaL6x5zRCBxCsPso8Ae0k9aaDbvH0aHS+j5pdIs="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-hKCalXcwzlgMLwthSnTcHkDOW1g2XUo4Kj49uryZvt8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-qlxs6pqhMQHkvOkJY37f9VMlxwnjUffue656XJaRLWI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-h1FtdGrQp0HjK8fJajK1h5YV9fgBZCBQOH9M4pqMamE="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-EBCX8Uvy+Z40i+VjuUK+F5CAZYblQLKzAExfx/uQ+gE="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-KmyOl6C8u/PrCAMiY/KwELYvRafnM4SfcnEhKvU5BeU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-Q41rpitFgIbgUpIh7iGzXTaCVDoUoDJ7HYddW2krHAE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-bsQyjyidOkZLtjR1JadsIkRp6gDlHjEsJEbNLgKGtdE="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-2YfhVuvSJe2sIkPFgocqAJubbb1PU7r93YoICq3ntAo="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-oPUyQZ9bGNbk6yPeIAQkNmDmDNcq3o2jFIsunotBBps="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-CBwqR3ii9Yg3O9lG/UAFaltVHmH5aFk2r8+IV1zeIS4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-Uw965RIeMJJ3uV5xX6WWGVq8i+CHXpiOw1mOT6rPmFI="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-JBUxkn0eUboAElHl+o2LyC7f9eJz4jJ9/odxXa43FSM="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-ZsUpPpaD4cfjTnTPAw1VqKHYX51XFG1ck0Ae2dWUKt8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-RY5CrQ9K9VZeh8+1r8Rjg0gEFBBRqR5EGTFkBfx0+3Q="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-FG9CGm1wZlMzKGzr70+qg62NLmYot0uG9yilyoEBpmw="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-QtCqH/Ah7EW2lNWHq9y4sAQI+8XOWMLBrqPIuDEV1ic="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-wdwHZFStEDDU0v8nah6hylLErKUxC9x3CvgL/9Qcfwo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-QnGhafheornOKm2H+UO9M+a57S7OzU7oomMp1Gs+qcQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-v8J9etz1hP2q02KbUjKxDUc8So2qlzajFCDbM9N9TiE="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-HZS5qup9w2rWf1K5zIq7BEYTi8BC5co+Mz9Ey7iOcPc="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-hSj4rqdeeerbuFQT7DI38eIOI3XUUun7nfi4ypPyggU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-4sp79lNVzgWRV2l1WjURkZBTq13OTRPfoRsaWU1Kd+Q="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-JT2SL5C1RXS80C7hB+YcCHW9Nynq4+1dCd4nckZVDsM="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-pnE0Z0AxP+2tiQT72EIjrsfRxN9q/rWQ/5J1SIF8rVg="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-DO5bDJGbzav8ji/1Wp5+VCU2xd/7P+tD8eMCBCeisq0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ORBkaFVuxvBBcqo0vklECC72Paoy13E33gt/ctHojq0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-oFvsMtKz+O9/B7asuc2DsH8KhRhAdS4D6qR64O8dE48="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-sXYAaSQvdrsknqu85ZzDfRFKQ3lKxPmK3CeYJwJ/u78="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-/GFhQQTpATa+eVsIKIS5hYQwEzueYT7IClqfTuO7OiY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-DJWq3FrbwU6QCJLuMWKFvQhwrszUHIHbZEi+cjnUkAI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-NtpJ9HN+LvXLb/qBn3Dz5XGTqhrlB8oUFCzge9zkxJ0="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-quzQ5GEyFmdsn7VXSsjSFHIcYnHwxb3OXP5Rcnar7mw="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-53HpBsY1A7xFKDSKW+yMjoTdK+calt2k8z1XQbIx39I="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-zzq0pwTb9ayiuFijGfhXPyIk7YsGu1Q611CvHhPAGPM="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-WUB7TDKuqe/+vZMdwtmb8yst0+6STi/H7gf1jmb0adw="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-mc6g5oRPUbsFFwn5KDeY0LbzLGlyiPZxAhtjGEsIh+I="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-lMVZtEPD48KKReYFsJ2rmJzCvlQNkGvajbfmd/ZYfFA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-mHRvOES1i3VCmHfyQOakMNyvvJYS0xGdF8YFNpTEDx8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-X29sAPaFb6yZptgoQK6QnRKbLRmmkrnvWw2zHC1MHE8="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-8LP07HWuRAyUGk5aSIpBHcAso16yM6UQ7YbPAen0Zgs="; }) + ]; + }; + +in rec { + release_9_0 = "9.0.0-rc.1"; + + aspnetcore_9_0 = buildAspNetCore { + version = "9.0.0-rc.1.24452.1"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/c414fabc-f831-4c5d-af5e-8e85ebecc6a0/670acec9f83315bec2788393db85e708/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-arm.tar.gz"; + hash = "sha512-EgHd12xUpnbLKHRD7xszFtCHufNVfHl/ckzU/LhphutJmzEilZskl2RE4mIoXAWooPjz8oKJRjHlj6TeQrtUiQ=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c5075cd5-2552-4f77-96ce-31450f9ff8d5/e6ff2b52e2a27a60eb3585cbca01d60b/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-arm64.tar.gz"; + hash = "sha512-hGEKOPuamOt70muompxJmGguw//7Xq3lu6+6/WPKx9mlJ5YYu1slddJ/7sCY2l/m9xUMZyU/Pzd2JgFZA5bhIg=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/da25731f-e296-4e2a-8f2b-0213d26e1799/859039cd012f8cfba53991f8f5543609/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-x64.tar.gz"; + hash = "sha512-+P0oXWe7BE1jFZaGnWMB4QoqJDyByaBQlqZq/0+zQxUpgSx0gubPDgZejgZfxQsWtQ1/KklaswB3povUWzujdg=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/8d4492ed-c733-4cfc-bf16-4f13191587f2/c843723067d5fc1d790ffa1810c683c1/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-musl-arm.tar.gz"; + hash = "sha512-Kdvu4spDebM0V+KwVliBFPoxgTUGxTWaIxRfI6QdBj0F6qCX6hF2I6QPqxE1FrRRUL0XovBXKHViwz/pFovymQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/bc3735cb-fea1-4f97-8669-3ab0e389d055/084b94228b13a45478ac75f5158801b3/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-musl-arm64.tar.gz"; + hash = "sha512-n08aOk85N3d5v092zguXYxAtnKYX/99h/3Wg2Bxcxj+1BCcI/xCxqD5VgFDZuVu68Vn6d+J8wD4K00NEHhZLXg=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/10aac5f7-c037-4874-8c05-425e668b0a24/4706d38e511259862e93a61f15dda28f/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-musl-x64.tar.gz"; + hash = "sha512-D5RfnHYZkY1hmmbPtsiwH9mTlDjOjvi+B5f66ky9c87eb9JcIlhV77eTvmcL/A9xmOnyMfoFEdfPMZ0vq7rJ0w=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0bae8dff-9440-4388-a03e-af44e20673a8/8ab257a4963967970cd59c31c213f38d/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-arm64.tar.gz"; + hash = "sha512-A/fgM1LRrS1U6d5MHN16lMIxG7NtTGKWZh+rKGzd6/P1cgT3OJLv1T9Dz7E7pzyvrpXQUixHvgMgPV+2mg7P6Q=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b0414fd7-20f9-4363-9dbf-072880e97b17/89584fa06e9ba1154a7e02402a28d82f/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-x64.tar.gz"; + hash = "sha512-/0puNbQfUgBSHqSyV7KT5NSPF4bMqpzYW1W6lq02A228FJ0v+CDx3/Xy2az2w4tsNUDnAMLC21/m2C1PhfRhrg=="; + }; + }; + }; + + runtime_9_0 = buildNetRuntime { + version = "9.0.0-rc.1.24431.7"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/26c238f2-53a2-4fdc-981e-31272c80d107/67c11b008d57d501cd2e5ca642cbc8c1/dotnet-runtime-9.0.0-rc.1.24431.7-linux-arm.tar.gz"; + hash = "sha512-ioPeMA6PnsZ/cFAE9VIpVz3Yv7EG9sQjie+ylsI4buJ4Rvgbqv5rQmnpxyaQN+XsPxN2xyvBA+RkHJGBp+V2Rw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/54f6fb3b-da5b-4a2d-98f4-ae07c814a586/e5f2a5ba551ffe53ea1c2ae9b7681f0b/dotnet-runtime-9.0.0-rc.1.24431.7-linux-arm64.tar.gz"; + hash = "sha512-hUK7k4Hk7Kbw687d7GhSXMWeNPckRhPPM8shUfVwwzRcttCBxJKwEHDnYtNEDwLUVYI0Uy1Y/z3JGQV+Bre9rA=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/72048153-7c19-4e69-bcf3-22563060db07/cd181715a0f7cd3cec8c87b115181da9/dotnet-runtime-9.0.0-rc.1.24431.7-linux-x64.tar.gz"; + hash = "sha512-n5qFuNn2Ni7SwtDt79BJmRgbLDhmR2RPvB2fJIJVOHMkOZ7bHEC8f6jEetwi4tcdtfJc55RSHVnkbEBZO19sxQ=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/c948e710-a590-4492-870d-1e44ce476a55/86522880c5160af3c81bfa71378b79b9/dotnet-runtime-9.0.0-rc.1.24431.7-linux-musl-arm.tar.gz"; + hash = "sha512-ERibzBMUhpSROsX7BQt324EErGLdOblwzZau85n3p87mVqMUtE8BE/lnJufuCiad6jhjcCD+BiYaiwHKDfnktA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/9ef6c8f0-49ac-4b37-9e7a-0f2cbbc74472/ceebdb8281a18bc80d17147ec3146cd0/dotnet-runtime-9.0.0-rc.1.24431.7-linux-musl-arm64.tar.gz"; + hash = "sha512-3WKnNzaydaFbWv+jRloO89aWGaBsyqo5FrMx9Fs4WakCjnjrfNhcdm3v+5cDx7uWeI9AYdVJy98yW/gYlDEFIQ=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/30c11bec-b456-45de-bb45-5e892fd1a509/cd72910d2c8b0c908f717a3563c2445f/dotnet-runtime-9.0.0-rc.1.24431.7-linux-musl-x64.tar.gz"; + hash = "sha512-vXcBXKRriSj3CmHmz+8jxeMIrUDAPd1CHCEBQbGjjNXE2O31Nl6LruIn21pqxx++pIHBqLPFum6lgzCv3X/iMQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8abf3e03-1ab3-40fd-a9cf-fa22005be2e8/cb0c3c5d130ef8ae76a982860fd3606a/dotnet-runtime-9.0.0-rc.1.24431.7-osx-arm64.tar.gz"; + hash = "sha512-qCX8qe3eU6tqvA7+DETW+yXFx3rrLTW2xBTULzZEU86wae2duIZcK7glI5ifzrfMy/hgR2mVkP91amucVMIddA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/13d7d905-549f-44e8-9062-a678a742c5fb/94c51ca9c08ef9b5cceabafc2337118f/dotnet-runtime-9.0.0-rc.1.24431.7-osx-x64.tar.gz"; + hash = "sha512-9i+GfqtjNzfEUP+wVDpybxui9GpCZctHl42I2tDGuAqNtcz29YOEL4XLYTuW0vfGgG1mmCb0uSuQbnHY0Q5T6A=="; + }; + }; + }; + + sdk_9_0_1xx = buildNetSdk { + version = "9.0.100-rc.1.24452.12"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/87c96627-cf20-47d7-8cb4-d5e083084dd4/07d4b533e746b344a3dbf9f7279f450b/dotnet-sdk-9.0.100-rc.1.24452.12-linux-arm.tar.gz"; + hash = "sha512-8xpKLDCAqSHP3XGTPR9XwvV/9MQ/WgrW9SZAvHkeVPjAUm2OEgatIfhoI1elPPbUiKiwEQfnw0vq/iyMNCXdjA=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f7739964-9e84-4bb7-9435-509458a15f9c/a95ad7f9deb8ce2fd30173dfe86f55ba/dotnet-sdk-9.0.100-rc.1.24452.12-linux-arm64.tar.gz"; + hash = "sha512-9XQlNxKIAcGZoScmYXUGYFh4iibopgPL0mocFunvM6XUGOR5Cjzqci195IPu6LaODeS7Hf3yeXEzae07TRY6EQ=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3b2b3c23-574b-45d7-b2b0-c67f0e935308/23ed647eb71a8f07414124422c15927d/dotnet-sdk-9.0.100-rc.1.24452.12-linux-x64.tar.gz"; + hash = "sha512-6BMIF7d50BBKbu4z2Y2Xw/rRwzYBNDX0fA6eIjcBcrddo3reduSd7Hy+aWiEOQ0uaUHMaeK61Vk9bRxrQQgwUQ=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/8cb683aa-4558-45ac-944a-73ac40b708d2/2795bd0253d5518490378edc7f7b562e/dotnet-sdk-9.0.100-rc.1.24452.12-linux-musl-arm.tar.gz"; + hash = "sha512-hICQDhS9EDT1hsPhdAK+LwTKslDXm00d2jqoh+n6+mg604it9/JbXHsNxDM3XOHCcrPZQZY25tsPe/MA6EGgpQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8737d284-0c4b-49a0-984c-23fddc7abcd8/ada586539e4417b557d60d0214e8b2eb/dotnet-sdk-9.0.100-rc.1.24452.12-linux-musl-arm64.tar.gz"; + hash = "sha512-ZWv6TnxKPuKAuZ6v+mILCbibOjufbTPJ14fB+JOLhK+1qkPYBUboGiv9UydwwoLFmuoWf1DQGlcCeiBh5ZXw6Q=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/791e9a41-59da-4f92-9dfb-2cceaaea001b/710f7adf35dc2f32be49ac2834ad0afd/dotnet-sdk-9.0.100-rc.1.24452.12-linux-musl-x64.tar.gz"; + hash = "sha512-sdgATPnD/7Uw+7PUJZF0ywdqMroAJo2qQ9v0Uv5tRsz5eaY9f1OucKL6ehAanfG9O4QFUqySqFIRm7c4WmX2Xw=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/930f4eb8-188f-47d5-8a26-28ca393b7d1b/c07a519e3d7e326c3f640ef72ea1193e/dotnet-sdk-9.0.100-rc.1.24452.12-osx-arm64.tar.gz"; + hash = "sha512-rzCzHNk36fyX4WS4NijCwezSEym3X3Qtn1IyqmhCfSW11wLMVlqoYNPHOMhyd5BWm/ZqPtdOXO9xmuWJ0wKEbw=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/e26e36f6-746f-462c-8599-5d0a1f00e786/f1b8264ac10442b40009aa8cea46b23b/dotnet-sdk-9.0.100-rc.1.24452.12-osx-x64.tar.gz"; + hash = "sha512-DR8HGO7vAGw+z77+6/nfB3LsIsdNtLtjW2RjuK7f05VydLkItR7AGc7WnT569K6SUvGOh7FKRBHhCJpMxB430A=="; + }; + }; + inherit commonPackages hostPackages targetPackages; + }; + + sdk = sdk_9_0; + + + sdk_9_0 = sdk_9_0_1xx; +} diff --git a/pkgs/development/compilers/dotnet/9/default.nix b/pkgs/development/compilers/dotnet/9/default.nix index 2c7c83aaa6be..55cb65f49503 100644 --- a/pkgs/development/compilers/dotnet/9/default.nix +++ b/pkgs/development/compilers/dotnet/9/default.nix @@ -3,7 +3,7 @@ }: callPackage ../dotnet.nix { releaseManifestFile = ./release.json; releaseInfoFile = ./release-info.json; + bootstrapSdkFile = ./bootstrap-sdk.nix; allowPrerelease = true; depsFile = ./deps.nix; - bootstrapSdk = dotnetCorePackages.sdk_9_0; } diff --git a/pkgs/development/compilers/dotnet/9/release-info.json b/pkgs/development/compilers/dotnet/9/release-info.json index 89a33e292fae..6e9805f3ea94 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-t4BQcN1rCG5XKfsJJqnpBHzyXtCrWbQaxpJ8gBpRrVk=", + "tarballHash": "sha256-VvRGu2GKw8XBvfOuICjQvV1UlTjRcuHX8j6x3w7uJtY=", "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-rc.1.24452.1.centos.9-x64.tar.gz", "artifactsHash": "sha256-HRu23+7cJVAoTaFm0hnHk1lOC8HiBIvTs9TgWKVS8xw=" } diff --git a/pkgs/development/compilers/dotnet/9/release.json b/pkgs/development/compilers/dotnet/9/release.json index 61f7c3e524a7..2afbc2fc6e33 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-rc.1", + "release": "9.0.0-rc.2", "channel": "9.0", - "tag": "v9.0.0-rc.1.24431.7", - "sdkVersion": "9.0.100-rc.1.24452.1", - "runtimeVersion": "9.0.0-rc.1.24431.7", - "aspNetCoreVersion": "9.0.0-rc.1.24452.1", + "tag": "v9.0.0-rc.2.24473.5", + "sdkVersion": "9.0.100-rc.2.24474.1", + "runtimeVersion": "9.0.0-rc.2.24473.5", + "aspNetCoreVersion": "9.0.0-rc.2.24474.3", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "f2e150252ab0fe4f796fac30ba5ffeb22c1c4156" + "sourceVersion": "b4c156e3f670d86ad737595a912c5c85c481b9ac" } diff --git a/pkgs/development/compilers/dotnet/UpdateNuGetConfigPackageSourcesMappings-don-t-add-em.patch b/pkgs/development/compilers/dotnet/UpdateNuGetConfigPackageSourcesMappings-don-t-add-em.patch new file mode 100644 index 000000000000..089b8b0fcaab --- /dev/null +++ b/pkgs/development/compilers/dotnet/UpdateNuGetConfigPackageSourcesMappings-don-t-add-em.patch @@ -0,0 +1,30 @@ +From 93137ea040472f4042dd186427699ad249e7251b Mon Sep 17 00:00:00 2001 +From: David McFarland <corngood@gmail.com> +Date: Sun, 22 Sep 2024 16:41:07 -0300 +Subject: [PATCH] UpdateNuGetConfigPackageSourcesMappings: don't add empty + mappings + +--- + .../UpdateNuGetConfigPackageSourcesMappings.cs | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs b/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs +index 3b188c1801..9b7050ef46 100644 +--- a/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs ++++ b/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs +@@ -115,7 +115,11 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks + // Skip sources with zero package patterns + if (allSourcesPackages[packageSource]?.Count > 0) + { +- pkgSrcMappingClearElement.AddAfterSelf(GetPackageMappingsElementForSource(packageSource)); ++ var pkgSrc = GetPackageMappingsElementForSource(packageSource); ++ if (pkgSrc.Elements().Any()) ++ { ++ pkgSrcMappingClearElement.AddAfterSelf(pkgSrc); ++ } + } + } + +-- +2.46.0 + diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index 0c9de3f05cab..3d48e1d98178 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -1,33 +1,45 @@ -{ type -, version -, srcs -, packages ? null +{ + type, + version, + srcs, + commonPackages ? null, + hostPackages ? null, + targetPackages ? null, }: -assert builtins.elem type [ "aspnetcore" "runtime" "sdk" ]; -assert if type == "sdk" then packages != null else true; - -{ lib -, stdenv -, fetchurl -, writeText -, autoPatchelfHook -, makeWrapper -, libunwind -, icu -, libuuid -, zlib -, libkrb5 -, openssl -, curl -, lttng-ust_2_12 -, testers -, runCommand -, writeShellScript -, mkNugetDeps -, callPackage -, dotnetCorePackages -, xmlstarlet +assert builtins.elem type [ + "aspnetcore" + "runtime" + "sdk" +]; +assert + if type == "sdk" then + commonPackages != null && hostPackages != null && targetPackages != null + else + true; + +{ + lib, + stdenv, + fetchurl, + writeText, + autoPatchelfHook, + makeWrapper, + libunwind, + icu, + libuuid, + zlib, + libkrb5, + openssl, + curl, + lttng-ust_2_12, + testers, + runCommand, + writeShellScript, + mkNugetDeps, + callPackage, + systemToDotnetRid, + xmlstarlet, }: let @@ -45,40 +57,53 @@ let sdk = ".NET SDK ${version}"; }; - mkCommon = callPackage ./common.nix {}; + mkCommon = callPackage ./common.nix { }; - targetRid = dotnetCorePackages.systemToDotnetRid stdenv.targetPlatform.system; + hostRid = systemToDotnetRid stdenv.hostPlatform.system; + targetRid = systemToDotnetRid stdenv.targetPlatform.system; - sigtool = callPackage ./sigtool.nix {}; - signAppHost = callPackage ./sign-apphost.nix {}; + sigtool = callPackage ./sigtool.nix { }; + signAppHost = callPackage ./sign-apphost.nix { }; - hasILCompiler = - lib.versionAtLeast version (if targetRid == "osx-arm64" then "8" else "7"); + hasILCompiler = lib.versionAtLeast version (if hostRid == "osx-arm64" then "8" else "7"); - extraTargets = writeText "extra.targets" ('' - <Project> - '' + lib.optionalString hasILCompiler '' + extraTargets = writeText "extra.targets" ( + '' + <Project> + '' + + lib.optionalString hasILCompiler '' <ItemGroup> - <CustomLinkerArg Include="-Wl,-rpath,'${lib.makeLibraryPath [ icu zlib openssl ]}'" /> + <CustomLinkerArg Include="-Wl,-rpath,'${ + lib.makeLibraryPath [ + icu + zlib + openssl + ] + }'" /> </ItemGroup> - '' + lib.optionalString stdenv.isDarwin '' + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' <Import Project="${signAppHost}" /> - '' + '' - </Project> - ''); + '' + + '' + </Project> + '' + ); in mkCommon type rec { inherit pname version; # Some of these dependencies are `dlopen()`ed. - nativeBuildInputs = [ - makeWrapper - ] ++ lib.optional stdenv.isLinux autoPatchelfHook - ++ lib.optionals (type == "sdk" && stdenv.isDarwin) [ - xmlstarlet - sigtool - ]; + nativeBuildInputs = + [ + makeWrapper + ] + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook + ++ lib.optionals (type == "sdk" && stdenv.hostPlatform.isDarwin) [ + xmlstarlet + sigtool + ]; buildInputs = [ stdenv.cc.cc @@ -87,24 +112,30 @@ mkCommon type rec { libkrb5 curl xmlstarlet - ] ++ lib.optional stdenv.isLinux lttng-ust_2_12; + ] ++ lib.optional stdenv.hostPlatform.isLinux lttng-ust_2_12; src = fetchurl ( - srcs."${stdenv.hostPlatform.system}" or (throw - "Missing source (url and hash) for host system: ${stdenv.hostPlatform.system}") + srcs.${hostRid} or (throw "Missing source (url and hash) for host RID: ${hostRid}") ); sourceRoot = "."; - postPatch = if type == "sdk" then ('' - xmlstarlet ed \ - --inplace \ - -s //_:Project -t elem -n Import \ - -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; + postPatch = + if type == "sdk" then + ( + '' + xmlstarlet ed \ + --inplace \ + -s //_:Project -t elem -n Import \ + -i \$prev -t attr -n Project -v "${extraTargets}" \ + sdk/*/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.targets + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + codesign --remove-signature packs/Microsoft.NETCore.App.Host.osx-*/*/runtimes/osx-*/native/{apphost,singlefilehost} + '' + ) + else + null; dontPatchELF = true; noDumpEnvVars = true; @@ -132,49 +163,63 @@ mkCommon type rec { --add-needed libicuuc.so \ $out/shared/Microsoft.NETCore.App/*/libcoreclr.so \ $out/shared/Microsoft.NETCore.App/*/*System.Globalization.Native.so \ - $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host + $out/packs/Microsoft.NETCore.App.Host.${hostRid}/*/runtimes/${hostRid}/native/*host patchelf \ --add-needed libgssapi_krb5.so \ $out/shared/Microsoft.NETCore.App/*/*System.Net.Security.Native.so \ - $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host + $out/packs/Microsoft.NETCore.App.Host.${hostRid}/*/runtimes/${hostRid}/native/*host patchelf \ --add-needed libssl.so \ $out/shared/Microsoft.NETCore.App/*/*System.Security.Cryptography.Native.OpenSsl.so \ - $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host + $out/packs/Microsoft.NETCore.App.Host.${hostRid}/*/runtimes/${hostRid}/native/*host ''; # fixes: Could not load ICU data. UErrorCode: 2 - propagatedSandboxProfile = lib.optionalString stdenv.isDarwin '' + propagatedSandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin '' (allow file-read* (subpath "/usr/share/icu")) (allow file-read* (subpath "/private/var/db/mds/system")) (allow mach-lookup (global-name "com.apple.SecurityServer") (global-name "com.apple.system.opendirectoryd.membership")) ''; - passthru = { - inherit icu hasILCompiler; - } // lib.optionalAttrs (type == "sdk") { - packages = mkNugetDeps { - name = "${pname}-${version}-deps"; - nugetDeps = packages; + passthru = + { + inherit icu hasILCompiler; + } + // lib.optionalAttrs (type == "sdk") { + packages = commonPackages ++ hostPackages.${hostRid} ++ targetPackages.${targetRid}; + inherit targetPackages; + + updateScript = + let + majorVersion = lib.concatStringsSep "." (lib.take 2 (lib.splitVersion version)); + in + [ + ./update.sh + majorVersion + ]; }; - updateScript = - let - majorVersion = lib.concatStringsSep "." (lib.take 2 (lib.splitVersion version)); - in - writeShellScript "update-dotnet-${majorVersion}" '' - pushd pkgs/development/compilers/dotnet - exec ${./update.sh} "${majorVersion}" - ''; - }; - meta = with lib; { description = builtins.getAttr type descriptions; homepage = "https://dotnet.github.io/"; license = licenses.mit; - maintainers = with maintainers; [ kuznero mdarocha ]; + maintainers = with maintainers; [ + kuznero + mdarocha + corngood + ]; mainProgram = "dotnet"; - platforms = attrNames srcs; + platforms = lib.filter ( + platform: + let + e = builtins.tryEval (systemToDotnetRid platform); + in + e.success && srcs ? "${e.value}" + ) lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; }; } diff --git a/pkgs/development/compilers/dotnet/combine-deps.nix b/pkgs/development/compilers/dotnet/combine-deps.nix index af21c3aa248e..188c26cf27fa 100644 --- a/pkgs/development/compilers/dotnet/combine-deps.nix +++ b/pkgs/development/compilers/dotnet/combine-deps.nix @@ -2,7 +2,7 @@ list, baseRid, otherRids, - pkgs ? import ../../../.. {} + pkgs ? import ../../../.. { }, }: let inherit (pkgs) writeText; @@ -20,31 +20,36 @@ let fns = map (file: import file) list; - packages = unique - (concatMap (fn: fn { fetchNuGet = package: package; }) fns); + packages = unique (concatMap (fn: fn { fetchNuGet = package: package; }) fns); - changePackageRid = package: rid: - let replace = replaceStrings [".${baseRid}"] [".${rid}"]; - in rec { + changePackageRid = + package: rid: + let + replace = replaceStrings [ ".${baseRid}" ] [ ".${rid}" ]; + in + rec { pname = replace package.pname; inherit (package) version; url = replace package.url; sha256 = builtins.hashFile "sha256" (builtins.fetchurl url); }; - expandPackage = package: - [ package ] ++ - optionals (strings.match ".*\\.${baseRid}(\\..*|$)" package.pname != null) - (map (changePackageRid package) otherRids); + expandPackage = + package: + [ package ] + ++ optionals (strings.match ".*\\.${baseRid}(\\..*|$)" package.pname != null) ( + map (changePackageRid package) otherRids + ); - allPackages = - sortOn (package: [ package.pname package.version ]) - (concatMap expandPackage packages); + allPackages = sortOn (package: [ + package.pname + package.version + ]) (concatMap expandPackage packages); - fetchExpr = package: - " (fetchNuGet ${generators.toPretty { multiline = false; } package})"; + fetchExpr = package: " (fetchNuGet ${generators.toPretty { multiline = false; } package})"; -in writeText "deps.nix" '' +in +writeText "deps.nix" '' { fetchNuGet }: [ ${concatMapStringsSep "\n" fetchExpr allPackages} ] diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index 303e5eaba847..661f9c482a12 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -1,37 +1,50 @@ dotnetPackages: -{ buildEnv, makeWrapper, lib, symlinkJoin }: +{ + 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 # 2. Use the highest version SDK for the CLI (as suggested by GGG) # 3. Something else? -let cli = builtins.head dotnetPackages; +let + cli = builtins.head dotnetPackages; in -assert lib.assertMsg ((builtins.length dotnetPackages) > 0) - ''You must include at least one package, e.g - `with dotnetCorePackages; combinePackages [ - sdk_6_0 aspnetcore_7_0 - ];`'' ; - buildEnv { - name = "dotnet-core-combined"; - paths = dotnetPackages; - pathsToLink = [ "/host" "/packs" "/sdk" "/sdk-manifests" "/shared" "/templates" ]; - ignoreCollisions = true; - postBuild = '' - cp -R ${cli}/{dotnet,share,nix-support} $out/ +assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' + You must include at least one package, e.g + `with dotnetCorePackages; combinePackages [ + sdk_6_0 aspnetcore_7_0 + ];`''; +buildEnv { + name = "dotnet-core-combined"; + paths = dotnetPackages; + pathsToLink = [ + "/host" + "/packs" + "/sdk" + "/sdk-manifests" + "/shared" + "/templates" + ]; + ignoreCollisions = true; + postBuild = '' + cp -R ${cli}/{dotnet,share,nix-support} $out/ - mkdir $out/bin - ln -s $out/dotnet $out/bin/dotnet - ''; - passthru = { - inherit (cli) icu; + mkdir $out/bin + ln -s $out/dotnet $out/bin/dotnet + ''; + passthru = { + inherit (cli) icu; - versions = lib.catAttrs "version" dotnetPackages; - packages = symlinkJoin { - name = "combined-packages"; - paths = lib.remove null (lib.catAttrs "packages" dotnetPackages); - }; - }; + versions = lib.catAttrs "version" dotnetPackages; + packages = lib.concatLists (lib.catAttrs "packages" dotnetPackages); + targetPackages = lib.zipAttrsWith (_: lib.concatLists) ( + lib.catAttrs "targetPackages" dotnetPackages + ); + }; - inherit (cli) meta; - } + inherit (cli) meta; +} diff --git a/pkgs/development/compilers/dotnet/common.nix b/pkgs/development/compilers/dotnet/common.nix index 9fcd79c752d1..426eb848d869 100644 --- a/pkgs/development/compilers/dotnet/common.nix +++ b/pkgs/development/compilers/dotnet/common.nix @@ -1,204 +1,241 @@ # TODO: switch to stdenvNoCC -{ stdenv -, stdenvNoCC -, lib -, writeText -, testers -, runCommand -, runCommandWith -, expect -, curl -, installShellFiles -, callPackage -, zlib -, swiftPackages -, darwin -, icu -, lndir -, substituteAll -, nugetPackageHook -, xmlstarlet -}: type: args: stdenv.mkDerivation (finalAttrs: args // { - doInstallCheck = true; +{ + stdenv, + stdenvNoCC, + lib, + writeText, + testers, + runCommand, + runCommandWith, + expect, + curl, + installShellFiles, + callPackage, + zlib, + swiftPackages, + darwin, + icu, + lndir, + substituteAll, + nugetPackageHook, + xmlstarlet, +}: +type: args: +stdenv.mkDerivation ( + finalAttrs: + args + // { + doInstallCheck = true; - # TODO: this should probably be postInstallCheck - # TODO: send output to /dev/null - installCheckPhase = args.installCheckPhase or "" + '' - $out/bin/dotnet --info - ''; + # TODO: this should probably be postInstallCheck + # TODO: send output to /dev/null + installCheckPhase = + args.installCheckPhase or "" + + '' + $out/bin/dotnet --info + ''; - setupHooks = args.setupHooks or [] ++ [ - ./dotnet-setup-hook.sh - ] ++ lib.optional (type == "sdk") (substituteAll { - src = ./dotnet-sdk-setup-hook.sh; - inherit lndir xmlstarlet; - }); + setupHooks = + args.setupHooks or [ ] + ++ [ + ./dotnet-setup-hook.sh + ] + ++ lib.optional (type == "sdk") (substituteAll { + src = ./dotnet-sdk-setup-hook.sh; + inherit lndir xmlstarlet; + }); - propagatedBuildInputs = - (args.propagatedBuildInputs or [ ]) - ++ lib.optional (type == "sdk") nugetPackageHook; + propagatedBuildInputs = + (args.propagatedBuildInputs or [ ]) + ++ lib.optional (type == "sdk") nugetPackageHook; - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ installShellFiles ]; + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ installShellFiles ]; - postInstall = '' - # completions snippets taken from https://learn.microsoft.com/en-us/dotnet/core/tools/enable-tab-autocomplete - installShellCompletion --cmd dotnet \ - --bash ${./completions/dotnet.bash} \ - --zsh ${./completions/dotnet.zsh} \ - --fish ${./completions/dotnet.fish} - ''; + postInstall = '' + # completions snippets taken from https://learn.microsoft.com/en-us/dotnet/core/tools/enable-tab-autocomplete + installShellCompletion --cmd dotnet \ + --bash ${./completions/dotnet.bash} \ + --zsh ${./completions/dotnet.zsh} \ + --fish ${./completions/dotnet.fish} + ''; - passthru = { - tests = let - mkDotnetTest = - { - name, - stdenv ? stdenvNoCC, - template, - usePackageSource ? false, - build, - buildInputs ? [], - # TODO: use correct runtimes instead of sdk - runtime ? finalAttrs.finalPackage, - runInputs ? [], - run ? null, - runAllowNetworking ? false, - }: + passthru = { + tests = let - sdk = finalAttrs.finalPackage; - 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; - unpackPhase = '' - mkdir test - cd test - dotnet new ${template} -o . - ''; - buildPhase = build; - dontPatchELF = true; - }; - in - if run == null - then built - else - runCommand "${built.name}-run" ({ - src = built; - nativeBuildInputs = [ built ] ++ runInputs; - passthru = { inherit built; }; - } // lib.optionalAttrs (stdenv.isDarwin && runAllowNetworking) { - sandboxProfile = '' - (allow network-inbound (local ip)) - (allow mach-lookup (global-name "com.apple.FSEvents")) - ''; - __darwinAllowLocalNetworking = true; - }) (lib.optionalString (runtime != null) '' - # TODO: use runtime here - export DOTNET_ROOT=${runtime} - '' + run); + mkDotnetTest = + { + name, + stdenv ? stdenvNoCC, + template, + usePackageSource ? false, + build, + buildInputs ? [ ], + # TODO: use correct runtimes instead of sdk + runtime ? finalAttrs.finalPackage, + runInputs ? [ ], + run ? null, + runAllowNetworking ? false, + }: + let + sdk = finalAttrs.finalPackage; + 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; + unpackPhase = '' + mkdir test + cd test + dotnet new ${template} -o . --no-restore + ''; + buildPhase = build; + dontPatchELF = true; + }; + in + if run == null then + built + else + runCommand "${built.name}-run" + ( + { + src = built; + nativeBuildInputs = [ built ] ++ runInputs; + passthru = { + inherit built; + }; + } + // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && runAllowNetworking) { + sandboxProfile = '' + (allow network-inbound (local ip)) + (allow mach-lookup (global-name "com.apple.FSEvents")) + ''; + __darwinAllowLocalNetworking = true; + } + ) + ( + lib.optionalString (runtime != null) '' + # TODO: use runtime here + export DOTNET_ROOT=${runtime} + '' + + run + ); - # Setting LANG to something other than 'C' forces the runtime to search - # for ICU, which will be required in most user environments. - checkConsoleOutput = command: '' - output="$(LANG=C.UTF-8 ${command})" - # yes, older SDKs omit the comma - [[ "$output" =~ Hello,?\ World! ]] && touch "$out" - ''; - in { - version = testers.testVersion ({ - package = finalAttrs.finalPackage; - } // lib.optionalAttrs (type != "sdk") { - command = "dotnet --info"; - }); - } - // lib.optionalAttrs (type == "sdk") ({ - console = mkDotnetTest { - name = "console"; - template = "console"; - build = checkConsoleOutput "dotnet run"; - }; + # Setting LANG to something other than 'C' forces the runtime to search + # for ICU, which will be required in most user environments. + checkConsoleOutput = command: '' + output="$(LANG=C.UTF-8 ${command})" + # yes, older SDKs omit the comma + [[ "$output" =~ Hello,?\ World! ]] && touch "$out" + ''; + in + { + version = testers.testVersion ( + { + package = finalAttrs.finalPackage; + } + // lib.optionalAttrs (type != "sdk") { + command = "dotnet --info"; + } + ); + } + // lib.optionalAttrs (type == "sdk") ( + { + console = mkDotnetTest { + name = "console"; + template = "console"; + build = checkConsoleOutput "dotnet run"; + }; - publish = mkDotnetTest { - name = "publish"; - template = "console"; - build = "dotnet publish -o $out/bin"; - run = checkConsoleOutput "$src/bin/test"; - }; + publish = mkDotnetTest { + name = "publish"; + template = "console"; + build = "dotnet publish -o $out/bin"; + run = checkConsoleOutput "$src/bin/test"; + }; - self-contained = mkDotnetTest { - name = "self-contained"; - template = "console"; - usePackageSource = true; - build = "dotnet publish --use-current-runtime --sc -o $out"; - runtime = null; - run = checkConsoleOutput "$src/test"; - }; + self-contained = mkDotnetTest { + name = "self-contained"; + template = "console"; + usePackageSource = true; + build = "dotnet publish --use-current-runtime --sc -o $out"; + runtime = null; + run = checkConsoleOutput "$src/test"; + }; - single-file = mkDotnetTest { - name = "single-file"; - template = "console"; - usePackageSource = true; - build = "dotnet publish --use-current-runtime -p:PublishSingleFile=true -o $out/bin"; - runtime = null; - run = checkConsoleOutput "$src/bin/test"; - }; + single-file = mkDotnetTest { + name = "single-file"; + template = "console"; + usePackageSource = true; + build = "dotnet publish --use-current-runtime -p:PublishSingleFile=true -o $out/bin"; + runtime = null; + run = checkConsoleOutput "$src/bin/test"; + }; - web = mkDotnetTest { - name = "web"; - template = "web"; - build = "dotnet publish -o $out/bin"; - runInputs = [ expect curl ]; - run = '' - expect <<"EOF" - set status 1 - spawn $env(src)/bin/test - proc abort { } { exit 2 } - expect_before default abort - expect -re {Now listening on: ([^\r]+)\r} { - set url $expect_out(1,string) - } - expect "Application started. Press Ctrl+C to shut down." - set output [exec curl -sSf $url] - if {$output != "Hello World!"} { - send_error "Unexpected output: $output\n" - exit 1 - } - send \x03 - expect_before timeout abort - expect eof - catch wait result - exit [lindex $result 3] - EOF - touch $out - ''; - runAllowNetworking = true; - }; - } // 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 {}; -}) + web = mkDotnetTest { + name = "web"; + template = "web"; + build = "dotnet publish -o $out/bin"; + runInputs = [ + expect + curl + ]; + run = '' + expect <<"EOF" + set status 1 + spawn $env(src)/bin/test + proc abort { } { exit 2 } + expect_before default abort + expect -re {Now listening on: ([^\r]+)\r} { + set url $expect_out(1,string) + } + expect "Application started. Press Ctrl+C to shut down." + set output [exec curl -sSf $url] + if {$output != "Hello World!"} { + send_error "Unexpected output: $output\n" + exit 1 + } + send \x03 + expect_before timeout abort + expect eof + catch wait result + exit [lindex $result 3] + EOF + touch $out + ''; + runAllowNetworking = true; + }; + } + // lib.optionalAttrs finalAttrs.finalPackage.hasILCompiler { + aot = mkDotnetTest { + name = "aot"; + stdenv = if stdenv.hostPlatform.isDarwin then swiftPackages.stdenv else stdenv; + template = "console"; + usePackageSource = true; + buildInputs = + [ + zlib + ] + ++ lib.optional stdenv.hostPlatform.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 0c6999471c48..88aaa28c8d2d 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -1,35 +1,42 @@ /* -How to combine packages for use in development: -dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7_0 ]; + How to combine packages for use in development: + dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7_0 ]; -Hashes and urls are retrieved from: -https://dotnet.microsoft.com/download/dotnet + Hashes and urls are retrieved from: + https://dotnet.microsoft.com/download/dotnet */ -{ lib -, config -, recurseIntoAttrs -, generateSplicesForMkScope -, makeScopeWithSplicing' +{ + lib, + config, + recurseIntoAttrs, + generateSplicesForMkScope, + makeScopeWithSplicing', }: makeScopeWithSplicing' { otherSplices = generateSplicesForMkScope "dotnetCorePackages"; - f = (self: + 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"; }); - }; + fetchNupkg = callPackage ../../../build-support/dotnet/fetch-nupkg { }; + + buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) { }; + buildDotnetSdk = + version: + import version { + inherit fetchNupkg; + 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; + dotnet_6_0 = buildDotnetSdk ./versions/6.0.nix; + dotnet_7_0 = buildDotnetSdk ./versions/7.0.nix; + dotnet_8_0 = buildDotnetSdk ./versions/8.0.nix; + dotnet_9_0 = buildDotnetSdk ./versions/9.0.nix; runtimeIdentifierMap = { "x86_64-linux" = "linux-x64"; @@ -40,16 +47,18 @@ makeScopeWithSplicing' { "i686-windows" = "win-x86"; }; - in { - inherit callPackage; + in + { + inherit callPackage fetchNupkg buildDotnetSdk; # Convert a "stdenv.hostPlatform.system" to a dotnet RID - systemToDotnetRid = system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); + systemToDotnetRid = + system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); - combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {}; + combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) { }; - patchNupkgs = callPackage ./patch-nupkgs.nix {}; - nugetPackageHook = callPackage ./nuget-package-hook.nix {}; + patchNupkgs = callPackage ./patch-nupkgs.nix { }; + nugetPackageHook = callPackage ./nuget-package-hook.nix { }; buildDotnetModule = callPackage ../../../build-support/dotnet/build-dotnet-module { }; buildDotnetGlobalTool = callPackage ../../../build-support/dotnet/build-dotnet-global-tool { }; @@ -57,16 +66,21 @@ makeScopeWithSplicing' { mkNugetSource = callPackage ../../../build-support/dotnet/make-nuget-source { }; mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { }; addNuGetDeps = callPackage ../../../build-support/dotnet/add-nuget-deps { }; - fetchNupkg = callPackage ../../../build-support/dotnet/fetch-nupkg { }; - dotnet_8 = recurseIntoAttrs (callPackage ./8 { bootstrapSdk = dotnet_8_0.sdk_8_0_1xx; }); - dotnet_9 = recurseIntoAttrs (callPackage ./9 {}); - } // lib.optionalAttrs config.allowAliases { + dotnet_8 = recurseIntoAttrs (callPackage ./8 { }); + 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); + } + // 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 index b36f3dfd7059..76f8734d4e12 100644 --- a/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh +++ b/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh @@ -135,7 +135,7 @@ configureNuget() { -s '/configuration/packageSourceMapping/packageSource[@key="_nix"]' -t elem -n package -i \$prev -t attr -n pattern -v "$id") done - cd - < /dev/null + cd - > /dev/null else xmlConfigArgs+=( "${xmlSourceConfigArgs[@]}" @@ -198,5 +198,5 @@ configureNuget() { } if [[ -z ${dontConfigureNuget-} ]]; then - preConfigurePhases+=(configureNuget) + appendToVar preConfigurePhases configureNuget fi diff --git a/pkgs/development/compilers/dotnet/dotnet.nix b/pkgs/development/compilers/dotnet/dotnet.nix index 7e629383ab37..c56ff5527982 100644 --- a/pkgs/development/compilers/dotnet/dotnet.nix +++ b/pkgs/development/compilers/dotnet/dotnet.nix @@ -1,48 +1,64 @@ -{ callPackage -, lib -, releaseManifestFile -, releaseInfoFile -, allowPrerelease ? false -, depsFile -, bootstrapSdk -, pkgsBuildHost +{ + stdenvNoCC, + callPackage, + lib, + fetchurl, + releaseManifestFile, + releaseInfoFile, + bootstrapSdkFile, + allowPrerelease ? false, + depsFile, + pkgsBuildHost, + buildDotnetSdk, }: let - inherit (lib.importJSON releaseInfoFile) tarballHash artifactsUrl artifactsHash; + inherit (lib.importJSON releaseInfoFile) + tarballHash + artifactsUrl + artifactsHash + bootstrapSdk + ; pkgs = callPackage ./stage1.nix { - inherit releaseManifestFile tarballHash depsFile; - bootstrapSdk = - { stdenvNoCC - , dotnetCorePackages - , fetchurl - }: bootstrapSdk.overrideAttrs (old: { - passthru = old.passthru or {} // { - artifacts = stdenvNoCC.mkDerivation rec { - name = lib.nameFromURL artifactsUrl ".tar.gz"; + inherit + releaseManifestFile + tarballHash + depsFile + ; + bootstrapSdk = (buildDotnetSdk bootstrapSdkFile).sdk.overrideAttrs (old: { + passthru = old.passthru or { } // { + artifacts = stdenvNoCC.mkDerivation rec { + name = lib.nameFromURL artifactsUrl ".tar.gz"; - src = fetchurl { - url = artifactsUrl; - hash = artifactsHash; - }; + src = fetchurl { + url = artifactsUrl; + hash = artifactsHash; + }; - sourceRoot = "."; + sourceRoot = "."; - installPhase = '' - mkdir -p $out - cp -r * $out/ - ''; - }; + installPhase = '' + mkdir -p $out + cp -r * $out/ + ''; }; - }); + }; + }); }; -in pkgs // { - vmr = pkgs.vmr.overrideAttrs(old: { +in +pkgs +// { + vmr = pkgs.vmr.overrideAttrs (old: { passthru = old.passthru // { updateScript = pkgsBuildHost.callPackage ./update.nix { - inherit releaseManifestFile releaseInfoFile allowPrerelease; + inherit + releaseManifestFile + releaseInfoFile + bootstrapSdkFile + allowPrerelease + ; }; }; }); diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix index 801896f38625..b32bf3f2d9cf 100644 --- a/pkgs/development/compilers/dotnet/packages.nix +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -1,19 +1,100 @@ -{ stdenv -, callPackage -, vmr -, xmlstarlet -, strip-nondeterminism -, zip +{ + stdenvNoCC, + lib, + callPackage, + vmr, + xmlstarlet, + strip-nondeterminism, + zip, + nugetPackageHook, + baseName ? "dotnet", + fallbackTargetPackages ? { }, }: let - mkCommon = callPackage ./common.nix {}; + mkCommon = callPackage ./common.nix { }; inherit (vmr) targetRid releaseManifest; -in { - inherit vmr; + # TODO: do this properly + hostRid = targetRid; + + mkPackage = + pname: version: + stdenvNoCC.mkDerivation { + inherit pname version; + + src = vmr; + dontUnpack = true; + + nativeBuildInputs = [ + xmlstarlet + nugetPackageHook + ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out" + + pushd "$src"/Private.SourceBuilt.Artifacts.*.${targetRid} + pushd ${pname}.${version}.nupkg + + xmlstarlet \ + sel -t \ + -m /_:package/_:metadata \ + -v _:id -nl \ + -v _:version -nl \ + *.nuspec | ( + read id + read version + id=''${id,,} + version=''${version,,} + mkdir -p "$out"/share/nuget/packages/"$id" + cp -r . "$out"/share/nuget/packages/"$id"/"$version" + chmod +w "$out"/share/nuget/packages/"$id"/"$version" + echo {} > "$out"/share/nuget/packages/"$id"/"$version"/.nupkg.metadata + ) + + popd + popd + + runHook postInstall + ''; + }; + + packages = + [ + (mkPackage "Microsoft.AspNetCore.App.Ref" aspnetcore.version) + (mkPackage "Microsoft.NETCore.DotNetAppHost" runtime.version) + (mkPackage "Microsoft.NETCore.App.Ref" runtime.version) + (mkPackage "Microsoft.DotNet.ILCompiler" runtime.version) + (mkPackage "Microsoft.NET.ILLink.Tasks" runtime.version) + (mkPackage "Microsoft.NETCore.App.Crossgen2.${hostRid}" runtime.version) + (mkPackage "runtime.${hostRid}.Microsoft.DotNet.ILCompiler" runtime.version) + ] + ++ lib.optionals (lib.versionOlder runtime.version "9") [ + (mkPackage "Microsoft.NETCore.DotNetHost" runtime.version) + (mkPackage "Microsoft.NETCore.DotNetHostPolicy" runtime.version) + (mkPackage "Microsoft.NETCore.DotNetHostResolver" runtime.version) + ]; + + targetPackages = fallbackTargetPackages // { + ${targetRid} = + [ + (mkPackage "Microsoft.AspNetCore.App.Runtime.${targetRid}" aspnetcore.version) + (mkPackage "Microsoft.NETCore.App.Host.${targetRid}" runtime.version) + (mkPackage "Microsoft.NETCore.App.Runtime.${targetRid}" runtime.version) + (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetAppHost" runtime.version) + ] + ++ lib.optionals (lib.versionOlder runtime.version "9") [ + (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHost" runtime.version) + (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHostPolicy" runtime.version) + (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHostResolver" runtime.version) + ]; + }; + sdk = mkCommon "sdk" rec { - pname = "dotnet-sdk"; + pname = "${baseName}-sdk"; version = releaseManifest.sdkVersion; src = vmr; @@ -25,7 +106,10 @@ in { zip ]; - outputs = [ "out" "packages" "artifacts" ]; + outputs = [ + "out" + "artifacts" + ]; installPhase = '' runHook preInstall @@ -35,42 +119,12 @@ in { mkdir "$out"/bin ln -s "$out"/dotnet "$out"/bin/dotnet - mkdir -p "$packages" "$artifacts" + mkdir -p "$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 | ( - read id - read version - id=''${id,,} - version=''${version,,} - mkdir -p "$packages"/share/nuget/packages/"$id" - cp -r "$package" "$packages"/share/nuget/packages/"$id"/"$version" - echo {} > "$packages"/share/nuget/packages/"$id"/"$version"/.nupkg.metadata - ) - fi - done - for package in "$artifacts"/{,SourceBuildReferencePackages/}*.nupkg; do echo packing "$package" to artifacts (cd "$package" && zip -rq0 "$package.tmp" .) @@ -84,6 +138,8 @@ in { passthru = { inherit (vmr) icu targetRid hasILCompiler; + + inherit packages targetPackages; }; meta = vmr.meta // { @@ -92,7 +148,7 @@ in { }; runtime = mkCommon "runtime" rec { - pname = "dotnet-runtime"; + pname = "${baseName}-runtime"; version = releaseManifest.runtimeVersion; src = vmr; @@ -117,7 +173,7 @@ in { }; aspnetcore = mkCommon "aspnetcore" rec { - pname = "dotnet-aspnetcore-runtime"; + pname = "${baseName}-aspnetcore-runtime"; version = releaseManifest.aspNetCoreVersion or releaseManifest.runtimeVersion; src = vmr; @@ -143,4 +199,13 @@ in { mainProgram = "dotnet"; }; }; +in +{ + inherit + vmr + sdk + runtime + aspnetcore + ; + } diff --git a/pkgs/development/compilers/dotnet/patch-nupkgs.nix b/pkgs/development/compilers/dotnet/patch-nupkgs.nix index c351ea7b32ef..6885d8df71f3 100644 --- a/pkgs/development/compilers/dotnet/patch-nupkgs.nix +++ b/pkgs/development/compilers/dotnet/patch-nupkgs.nix @@ -1,83 +1,92 @@ -{ stdenv -, lib -, zlib -, curl -, icu -, libunwind -, libuuid -, openssl -, lttng-ust_2_12 -, patchelf -, writeShellScriptBin +{ + stdenv, + lib, + zlib, + curl, + icu, + libunwind, + libuuid, + openssl, + lttng-ust_2_12, + patchelf, + writeShellScriptBin, }: let - binaryRPath = lib.makeLibraryPath ([ - stdenv.cc.cc - zlib - curl - icu - libunwind - libuuid - openssl - ] ++ lib.optional stdenv.isLinux lttng-ust_2_12); + binaryRPath = lib.makeLibraryPath ( + [ + stdenv.cc.cc + zlib + curl + icu + libunwind + libuuid + openssl + ] + ++ lib.optional stdenv.hostPlatform.isLinux lttng-ust_2_12 + ); -in writeShellScriptBin "patch-nupkgs" ('' - set -euo pipefail - shopt -s nullglob - isELF() { - local fn="$1" - local fd - local magic - exec {fd}< "$fn" - read -r -n 4 -u "$fd" magic - exec {fd}<&- - if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi - } - cd "$1" -'' + lib.optionalString stdenv.isLinux '' - 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" - find "$x" -type f -print0 | while IFS= read -rd "" p; do - if [[ "$p" != *.nix-patched ]] \ - && isELF "$p" \ - && ${patchelf}/bin/patchelf --print-interpreter "$p" &>/dev/null; then - tmp="$p".$$.nix-patched - # if this fails to copy then another process must have patched it - cp --reflink=auto "$p" "$tmp" || continue - echo "Patchelfing $p as $tmp" - ${patchelf}/bin/patchelf \ - --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ - "$tmp" ||: - # This makes sure that if the binary requires some specific runtime dependencies, it can find it. - # This fixes dotnet-built binaries like crossgen2 - ${patchelf}/bin/patchelf \ - --add-needed libicui18n.so \ - --add-needed libicuuc.so \ - --add-needed libz.so \ - --add-needed libssl.so \ - "$tmp" - ${patchelf}/bin/patchelf \ - --add-rpath "${binaryRPath}" \ - "$tmp" ||: - mv "$tmp" "$p" - fi +in +writeShellScriptBin "patch-nupkgs" ( + '' + set -euo pipefail + shopt -s nullglob + isELF() { + local fn="$1" + local fd + local magic + exec {fd}< "$fn" + read -r -n 4 -u "$fd" magic + exec {fd}<&- + if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi + } + cd "$1" + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + 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" + find "$x" -type f -print0 | while IFS= read -rd "" p; do + if [[ "$p" != *.nix-patched ]] \ + && isELF "$p" \ + && ${patchelf}/bin/patchelf --print-interpreter "$p" &>/dev/null; then + tmp="$p".$$.nix-patched + # if this fails to copy then another process must have patched it + cp --reflink=auto "$p" "$tmp" || continue + echo "Patchelfing $p as $tmp" + ${patchelf}/bin/patchelf \ + --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ + "$tmp" ||: + # This makes sure that if the binary requires some specific runtime dependencies, it can find it. + # This fixes dotnet-built binaries like crossgen2 + ${patchelf}/bin/patchelf \ + --add-needed libicui18n.so \ + --add-needed libicuuc.so \ + --add-needed libz.so \ + --add-needed libssl.so \ + "$tmp" + ${patchelf}/bin/patchelf \ + --add-rpath "${binaryRPath}" \ + "$tmp" ||: + mv "$tmp" "$p" + fi + done + touch "$x"/.nix-patched done - 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 -'') + '' + + lib.optionalString stdenv.hostPlatform.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/sign-apphost.nix b/pkgs/development/compilers/dotnet/sign-apphost.nix index f804ab79d332..021d9ef61a90 100644 --- a/pkgs/development/compilers/dotnet/sign-apphost.nix +++ b/pkgs/development/compilers/dotnet/sign-apphost.nix @@ -1,10 +1,12 @@ -{ substituteAll -, callPackage +{ + substituteAll, + callPackage, }: let - sigtool = callPackage ./sigtool.nix {}; + sigtool = callPackage ./sigtool.nix { }; -in substituteAll { +in +substituteAll { src = ./sign-apphost.proj; codesign = "${sigtool}/bin/codesign"; } diff --git a/pkgs/development/compilers/dotnet/sigtool.nix b/pkgs/development/compilers/dotnet/sigtool.nix index fe5d1ebc6879..04e0d5215098 100644 --- a/pkgs/development/compilers/dotnet/sigtool.nix +++ b/pkgs/development/compilers/dotnet/sigtool.nix @@ -1,7 +1,8 @@ -{ cctools -, darwin -, fetchFromGitHub -, makeWrapper +{ + cctools, + darwin, + fetchFromGitHub, + makeWrapper, }: darwin.sigtool.overrideAttrs (old: { @@ -14,13 +15,15 @@ darwin.sigtool.overrideAttrs (old: { sha256 = "sha256-EVM5ZG3sAHrIXuWrnqA9/4pDkJOpWCeBUl5fh0mkK4k="; }; - nativeBuildInputs = old.nativeBuildInputs or [] ++ [ + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ makeWrapper ]; - postInstall = old.postInstall or "" + '' - wrapProgram $out/bin/codesign \ - --set-default CODESIGN_ALLOCATE \ - "${cctools}/bin/${cctools.targetPrefix}codesign_allocate" - ''; + postInstall = + old.postInstall or "" + + '' + wrapProgram $out/bin/codesign \ + --set-default CODESIGN_ALLOCATE \ + "${cctools}/bin/${cctools.targetPrefix}codesign_allocate" + ''; }) diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix index 7e2717aba1a1..e8be69d1f038 100644 --- a/pkgs/development/compilers/dotnet/stage0.nix +++ b/pkgs/development/compilers/dotnet/stage0.nix @@ -1,130 +1,147 @@ -{ stdenv -, callPackage -, lib -, writeShellScript -, mkNugetDeps -, nix -, cacert -, nuget-to-nix -, dotnetCorePackages -, xmlstarlet -, patchNupkgs - -, releaseManifestFile -, tarballHash -, depsFile -, bootstrapSdk +{ + stdenv, + callPackage, + lib, + writeShellScript, + mkNugetDeps, + nix, + cacert, + nuget-to-nix, + dotnetCorePackages, + xmlstarlet, + patchNupkgs, + symlinkJoin, + + baseName ? "dotnet", + releaseManifestFile, + tarballHash, + depsFile, + bootstrapSdk, }: let mkPackages = callPackage ./packages.nix; mkVMR = callPackage ./vmr.nix; - dotnetSdk = callPackage bootstrapSdk {}; - - deps = mkNugetDeps { - name = "dotnet-vmr-deps"; - sourceFile = depsFile; - }; - - sdkPackages = dotnetSdk.packages.override { - installable = true; + sdkPackages = symlinkJoin { + name = "${bootstrapSdk.name}-packages"; + paths = map ( + p: + p.override { + installable = true; + } + ) bootstrapSdk.packages; }; - vmr = (mkVMR { - inherit releaseManifestFile tarballHash dotnetSdk; - }).overrideAttrs (old: rec { - prebuiltPackages = mkNugetDeps { - name = "dotnet-vmr-deps"; - sourceFile = depsFile; - installable = true; - }; - - nativeBuildInputs = - old.nativeBuildInputs or [] - ++ [ xmlstarlet patchNupkgs ]; - - postPatch = old.postPatch or "" + '' - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n Import \ - -i \$prev -t attr -n Project -v "${./patch-restored-packages.proj}" \ - src/*/Directory.Build.targets - ''; - - postConfigure = old.postConfigure or "" + '' - [[ ! -v prebuiltPackages ]] || \ - ln -sf "$prebuiltPackages"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ - ln -sf "${sdkPackages}"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ - ''; - - buildFlags = - old.buildFlags - ++ lib.optionals (lib.versionAtLeast old.version "9") [ - # We need to set this as long as we have something in deps.nix. Currently - # that's the portable ilasm/ildasm which aren't in the centos sourcebuilt - # artifacts. - "-p:SkipErrorOnPrebuilts=true" - ]; - - passthru = old.passthru or {} // { fetch-deps = - let - inherit (vmr) targetRid updateScript; - otherRids = - lib.remove targetRid ( - map (system: dotnetCorePackages.systemToDotnetRid system) - vmr.meta.platforms); - - pkg = vmr.overrideAttrs (old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ - nix - cacert - nuget-to-nix - ]; - postPatch = old.postPatch or "" + '' + vmr = + (mkVMR { + inherit + baseName + releaseManifestFile + tarballHash + bootstrapSdk + ; + }).overrideAttrs + (old: rec { + prebuiltPackages = mkNugetDeps { + name = "dotnet-vmr-deps"; + sourceFile = depsFile; + installable = true; + }; + + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ + xmlstarlet + patchNupkgs + ]; + + postPatch = + old.postPatch or "" + + '' xmlstarlet ed \ --inplace \ -s //Project -t elem -n Import \ - -i \$prev -t attr -n Project -v "${./record-downloaded-packages.proj}" \ - repo-projects/Directory.Build.targets - # make nuget-client use the standard arcade package-cache dir, which - # is where we scan for dependencies - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n ItemGroup \ - -s \$prev -t elem -n EnvironmentVariables \ - -i \$prev -t attr -n Include -v 'NUGET_PACKAGES=$(ProjectDirectory)artifacts/sb/package-cache/' \ - repo-projects/nuget-client.proj + -i \$prev -t attr -n Project -v "${./patch-restored-packages.proj}" \ + src/*/Directory.Build.targets ''; - buildFlags = [ "--online" ] ++ old.buildFlags; - prebuiltPackages = null; - }); - - drv = builtins.unsafeDiscardOutputDependency pkg.drvPath; - in - writeShellScript "fetch-dotnet-sdk-deps" '' - ${nix}/bin/nix-shell --pure --run 'source /dev/stdin' "${drv}" << 'EOF' - set -e - - tmp=$(mktemp -d) - trap 'rm -fr "$tmp"' EXIT - - HOME=$tmp/.home - cd "$tmp" - - phases="''${prePhases[*]:-} unpackPhase patchPhase ''${preConfigurePhases[*]:-} \ - configurePhase ''${preBuildPhases[*]:-} buildPhase checkPhase" \ - genericBuild - - depsFiles=(./src/*/deps.nix) - - cat $(nix-build ${toString ./combine-deps.nix} \ - --arg list "[ ''${depsFiles[*]} ]" \ - --argstr baseRid ${targetRid} \ - --arg otherRids '${lib.generators.toPretty { multiline = false; } otherRids}' \ - ) > "${toString prebuiltPackages.sourceFile}" - EOF - ''; - }; - }); -in mkPackages { inherit vmr; } + + postConfigure = + old.postConfigure or "" + + '' + [[ ! -v prebuiltPackages ]] || \ + ln -sf "$prebuiltPackages"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ + ln -sf "${sdkPackages}"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ + ''; + + buildFlags = + old.buildFlags + ++ lib.optionals (lib.versionAtLeast old.version "9") [ + # We need to set this as long as we have something in deps.nix. Currently + # that's the portable ilasm/ildasm which aren't in the centos sourcebuilt + # artifacts. + "-p:SkipErrorOnPrebuilts=true" + ]; + + passthru = old.passthru or { } // { + fetch-deps = + let + inherit (vmr) targetRid updateScript; + otherRids = lib.remove targetRid ( + map (system: dotnetCorePackages.systemToDotnetRid system) vmr.meta.platforms + ); + + pkg = vmr.overrideAttrs (old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + nix + cacert + nuget-to-nix + ]; + postPatch = + old.postPatch or "" + + '' + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n Import \ + -i \$prev -t attr -n Project -v "${./record-downloaded-packages.proj}" \ + repo-projects/Directory.Build.targets + # make nuget-client use the standard arcade package-cache dir, which + # is where we scan for dependencies + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n ItemGroup \ + -s \$prev -t elem -n EnvironmentVariables \ + -i \$prev -t attr -n Include -v 'NUGET_PACKAGES=$(ProjectDirectory)artifacts/sb/package-cache/' \ + repo-projects/nuget-client.proj + ''; + buildFlags = [ "--online" ] ++ old.buildFlags; + prebuiltPackages = null; + }); + + drv = builtins.unsafeDiscardOutputDependency pkg.drvPath; + in + writeShellScript "fetch-dotnet-sdk-deps" '' + ${nix}/bin/nix-shell --pure --run 'source /dev/stdin' "${drv}" << 'EOF' + set -e + + tmp=$(mktemp -d) + trap 'rm -fr "$tmp"' EXIT + + HOME=$tmp/.home + cd "$tmp" + + phases="''${prePhases[*]:-} unpackPhase patchPhase ''${preConfigurePhases[*]:-} \ + configurePhase ''${preBuildPhases[*]:-} buildPhase checkPhase" \ + genericBuild + + depsFiles=(./src/*/deps.nix) + + cat $(nix-build ${toString ./combine-deps.nix} \ + --arg list "[ ''${depsFiles[*]} ]" \ + --argstr baseRid ${targetRid} \ + --arg otherRids '${lib.generators.toPretty { multiline = false; } otherRids}' \ + ) > "${toString prebuiltPackages.sourceFile}" + EOF + ''; + }; + }); +in +mkPackages { inherit baseName vmr; } diff --git a/pkgs/development/compilers/dotnet/stage1.nix b/pkgs/development/compilers/dotnet/stage1.nix index 9014e60b4e90..0aa67615ade5 100644 --- a/pkgs/development/compilers/dotnet/stage1.nix +++ b/pkgs/development/compilers/dotnet/stage1.nix @@ -1,26 +1,41 @@ -{ stdenv -, lib -, callPackage +{ + stdenv, + lib, + callPackage, -, releaseManifestFile -, tarballHash -, depsFile -, bootstrapSdk + releaseManifestFile, + tarballHash, + depsFile, + bootstrapSdk, }@args: let mkPackages = callPackage ./packages.nix; mkVMR = callPackage ./vmr.nix; - stage0 = callPackage ./stage0.nix args; + stage0 = callPackage ./stage0.nix ( + args + // { + baseName = "dotnet-stage0"; + } + ); - vmr = (mkVMR { - inherit releaseManifestFile tarballHash; - dotnetSdk = stage0.sdk; - }).overrideAttrs (old: { - passthru = old.passthru or {} // { - inherit (stage0.vmr) fetch-deps; - }; - }); + vmr = + (mkVMR { + inherit releaseManifestFile tarballHash; + bootstrapSdk = stage0.sdk; + }).overrideAttrs + (old: { + passthru = old.passthru or { } // { + inherit (stage0.vmr) fetch-deps; + }; + }); -in mkPackages { inherit vmr; } // { stage0 = lib.dontRecurseIntoAttrs stage0; } +in +mkPackages { + inherit vmr; + fallbackTargetPackages = bootstrapSdk.targetPackages; +} +// { + stage0 = lib.dontRecurseIntoAttrs stage0; +} diff --git a/pkgs/development/compilers/dotnet/update.nix b/pkgs/development/compilers/dotnet/update.nix index 58304188afa8..4fa837a4a274 100644 --- a/pkgs/development/compilers/dotnet/update.nix +++ b/pkgs/development/compilers/dotnet/update.nix @@ -1,18 +1,20 @@ -{ stdenvNoCC -, lib -, fetchurl -, writeScript -, nix -, runtimeShell -, curl -, cacert -, jq -, yq -, gnupg - -, releaseManifestFile -, releaseInfoFile -, allowPrerelease +{ + stdenvNoCC, + lib, + fetchurl, + writeScript, + nix, + runtimeShell, + curl, + cacert, + jq, + yq, + gnupg, + + releaseManifestFile, + releaseInfoFile, + bootstrapSdkFile, + allowPrerelease, }: let @@ -38,18 +40,36 @@ let drv = builtins.unsafeDiscardOutputDependency pkg.drvPath; -in writeScript "update-dotnet-vmr.sh" '' +in +writeScript "update-dotnet-vmr.sh" '' #! ${nix}/bin/nix-shell - #! nix-shell -i ${runtimeShell} --pure ${drv} + #! nix-shell -i ${runtimeShell} --pure ${drv} --keep UPDATE_NIX_ATTR_PATH set -euo pipefail - query=$(cat <<EOF - map( - select( - ${lib.optionalString (!allowPrerelease) ".prerelease == false and"} - .draft == false and - (.name | startswith(".NET ${channel}")))) | - first | ( + tag=''${1-} + + if [[ -n $tag ]]; then + query=$(cat <<EOF + map( + select( + (.tag_name == "$tag"))) | + first + EOF + ) + else + query=$(cat <<EOF + map( + select( + ${lib.optionalString (!allowPrerelease) ".prerelease == false and"} + .draft == false and + (.tag_name | startswith("v${channel}")))) | + first + EOF + ) + fi + + query="$query "$(cat <<EOF + | ( .tag_name, (.assets | .[] | @@ -63,7 +83,7 @@ in writeScript "update-dotnet-vmr.sh" '' ) ( - curl -fsL https://api.github.com/repos/dotnet/dotnet/releases | \ + curl -fsSL https://api.github.com/repos/dotnet/dotnet/releases | \ jq -r "$query" \ ) | ( read tagName @@ -73,12 +93,15 @@ in writeScript "update-dotnet-vmr.sh" '' tmp="$(mktemp -d)" trap 'rm -rf "$tmp"' EXIT + echo ${lib.escapeShellArg (toString ./update.sh)} \ + -o ${lib.escapeShellArg (toString bootstrapSdkFile)} --sdk foo + cd "$tmp" - curl -fsL "$releaseUrl" -o release.json + curl -fsSL "$releaseUrl" -o release.json release=$(jq -r .release release.json) - if [[ "$release" == "${release}" ]]; then + if [[ -z $tag && "$release" == "${release}" ]]; then >&2 echo "release is already $release" exit fi @@ -89,13 +112,16 @@ in writeScript "update-dotnet-vmr.sh" '' tarballHash=$(nix-hash --to-sri --type sha256 "''${prefetch[0]}") tarball=''${prefetch[1]} - curl -L "$sigUrl" -o release.sig + curl -fssL "$sigUrl" -o release.sig - export GNUPGHOME=$PWD/.gnupg - gpg --batch --import ${releaseKey} - gpg --batch --verify release.sig "$tarball" + ( + export GNUPGHOME=$PWD/.gnupg + trap 'gpgconf --kill all' EXIT + gpg --batch --import ${releaseKey} + gpg --batch --verify release.sig "$tarball" + ) - tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props + tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props \*/global.json artifactsVersion=$(xq -r '.Project.PropertyGroup | map(select(.PrivateSourceBuiltArtifactsVersion)) | .[] | .PrivateSourceBuiltArtifactsVersion' eng/Versions.props) @@ -110,6 +136,8 @@ in writeScript "update-dotnet-vmr.sh" '' artifactsHash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$artifactsUrl")") + sdkVersion=$(jq -r .tools.dotnet global.json) + jq --null-input \ --arg _0 "$tarballHash" \ --arg _1 "$artifactsUrl" \ @@ -121,5 +149,13 @@ in writeScript "update-dotnet-vmr.sh" '' }' > "${toString releaseInfoFile}" cp release.json "${toString releaseManifestFile}" + + cd - + + # needs to be run in nixpkgs + ${lib.escapeShellArg (toString ./update.sh)} \ + -o ${lib.escapeShellArg (toString bootstrapSdkFile)} --sdk "$sdkVersion" + + $(nix-build -A $UPDATE_NIX_ATTR_PATH.fetch-deps --no-out-link) ) '' diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index 3c5f29d8f046..8598f1f5d783 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -4,7 +4,7 @@ set -Eeuo pipefail -cd "$(dirname "${BASH_SOURCE[0]}")" +rids=({linux-{,musl-}{arm,arm64,x64},osx-{arm64,x64},win-{arm64,x64,x86}}) release () { local content="$1" @@ -30,373 +30,291 @@ release_platform_attr () { 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 = {" - local kv - for kv in "${platforms[@]}"; do - local nix_platform=${kv%% *} - local ms_platform=${kv##* } + for rid in "${rids[@]}"; do local url hash - url=$(release_platform_attr "$release_files" "$ms_platform" url) - hash=$(release_platform_attr "$release_files" "$ms_platform" hash) + url=$(release_platform_attr "$release_files" "$rid" url) + hash=$(release_platform_attr "$release_files" "$rid" hash) [[ -z "$url" || -z "$hash" ]] && continue - echo " $nix_platform = { - url = \"$url\"; - sha512 = \"$hash\"; + + hash=$(nix-hash --to-sri --type sha512 "$hash") + + echo " $rid = { + url = \"$url\"; + hash = \"$hash\"; };" done echo " };" } -generate_package_list() { - local version="$1" - shift - local pkgs=( "$@" ) nuget_url pkg url hash +nuget_url="$(curl -fsSL "https://api.nuget.org/v3/index.json" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')" - nuget_url="$(curl -f "https://api.nuget.org/v3/index.json" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')" +generate_package_list() { + local version="$1" indent="$2" + shift 2 + local pkgs=( "$@" ) pkg url hash for pkg in "${pkgs[@]}"; do - url="${nuget_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg" - hash="$(nix-prefetch-url "$url")" - if [[ -z "$hash" ]]; then + url=${nuget_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg + if ! hash=$(nix-prefetch-url "$url"); then echo "Failed to fetch hash for $url" >&2 exit 1 fi + hash=$(nix-hash --to-sri --type sha256 "$hash") - echo " (fetchNuGet { pname = \"${pkg}\"; version = \"${version}\"; sha256 = \"${hash}\"; })" + echo "$indent(fetchNupkg { pname = \"${pkg}\"; version = \"${version}\"; hash = \"${hash}\"; })" done } -version_older () { - 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 - return 0 - else - return 1 - fi +versionAtLeast () { + local cur_version=$1 min_version=$2 + printf "%s\0%s" "$min_version" "$cur_version" | sort -zVC } +# These packages are implicitly references by the build process, +# based on the specific project configurations (RIDs, used features, etc.) +# They are always referenced with the same version as the SDK used for building. +# Since we lock nuget dependencies, when these packages are included in the generated +# lock files (deps.nix), every update of SDK required those lock files to be +# updated to reflect the new versions of these packages - otherwise, the build +# would fail due to missing dependencies. +# +# Moving them to a separate list stored alongside the SDK package definitions, +# and implicitly including them along in buildDotnetModule allows us +# to make updating .NET SDK packages a lot easier - we now just update +# the versions of these packages in one place, and all packages that +# use buildDotnetModule continue building with the new .NET version without changes. +# +# Keep in mind that there is no canonical list of these implicitly +# referenced packages - this list was created based on looking into +# the deps.nix files of existing packages, and which dependencies required +# updating after a SDK version bump. +# +# Due to this, make sure to check if new SDK versions introduce any new packages. +# This should not happend in minor or bugfix updates, but probably happens +# with every new major .NET release. aspnetcore_packages () { local version=$1 - # These packages are implicitly references by the build process, - # based on the specific project configurations (RIDs, used features, etc.) - # They are always referenced with the same version as the SDK used for building. - # Since we lock nuget dependencies, when these packages are included in the generated - # lock files (deps.nix), every update of SDK required those lock files to be - # updated to reflect the new versions of these packages - otherwise, the build - # would fail due to missing dependencies. - # - # Moving them to a separate list stored alongside the SDK package definitions, - # and implicitly including them along in buildDotnetModule allows us - # to make updating .NET SDK packages a lot easier - we now just update - # the versions of these packages in one place, and all packages that - # use buildDotnetModule continue building with the new .NET version without changes. - # - # Keep in mind that there is no canonical list of these implicitly - # referenced packages - this list was created based on looking into - # the deps.nix files of existing packages, and which dependencies required - # updating after a SDK version bump. - # - # Due to this, make sure to check if new SDK versions introduce any new 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.Ref + ) + + generate_package_list "$version" ' ' "${pkgs[@]}" +} + +aspnetcore_target_packages () { + local version=$1 + local rid=$2 + local pkgs=( + "Microsoft.AspNetCore.App.Runtime.$rid" + ) + + generate_package_list "$version" ' ' "${pkgs[@]}" +} + +netcore_packages () { + local version=$1 + local pkgs=( + Microsoft.NETCore.DotNetAppHost + Microsoft.NETCore.App.Ref ) - # These packages are currently broken on .NET 8 - if version_older "$version" "8"; then + if ! versionAtLeast "$version" 9; then pkgs+=( - "Microsoft.AspNetCore.App.Runtime.win-arm" + Microsoft.NETCore.DotNetHost + Microsoft.NETCore.DotNetHostPolicy + Microsoft.NETCore.DotNetHostResolver ) fi - # Packages that only apply to .NET 6 and up - if ! version_older "$version" "6"; then + if versionAtLeast "$version" 7; then pkgs+=( - "Microsoft.AspNetCore.App.Ref" - "Microsoft.AspNetCore.App.Runtime.linux-musl-arm" - "Microsoft.AspNetCore.App.Runtime.osx-arm64" + Microsoft.DotNet.ILCompiler ) fi + if versionAtLeast "$version" 8; then + pkgs+=( + Microsoft.NET.ILLink.Tasks + ) + fi - generate_package_list "$version" "${pkgs[@]}" + generate_package_list "$version" ' ' "${pkgs[@]}" } -sdk_packages () { +netcore_host_packages () { local version=$1 - # These packages are implicitly references by the build process, - # based on the specific project configurations (RIDs, used features, etc.) - # They are always referenced with the same version as the SDK used for building. - # Since we lock nuget dependencies, when these packages are included in the generated - # lock files (deps.nix), every update of SDK required those lock files to be - # updated to reflect the new versions of these packages - otherwise, the build - # would fail due to missing dependencies. - # - # Moving them to a separate list stored alongside the SDK package definitions, - # and implicitly including them along in buildDotnetModule allows us - # to make updating .NET SDK packages a lot easier - we now just update - # the versions of these packages in one place, and all packages that - # use buildDotnetModule continue building with the new .NET version without changes. - # - # Keep in mind that there is no canonical list of these implicitly - # referenced packages - this list was created based on looking into - # the deps.nix files of existing packages, and which dependencies required - # updating after a SDK version bump. - # - # Due to this, make sure to check if new SDK versions introduce any new packages. - # This should not happend in minor or bugfix updates, but probably happens - # with every new major .NET release. + local rid=$2 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.Crossgen2.$rid" ) - # These packages were removed on .NET 9 - if ! version_older "$version" "9"; then - local newpkgs=() - local pkg - for pkg in "${pkgs[@]}"; do - case "$pkg" in - *Microsoft.NETCore.DotNetHost*);; - Microsoft.NETCore.App.Runtime.Mono.*);; - *) newpkgs+=("$pkg");; - esac - done - pkgs=("${newpkgs[@]}") - fi + local min_ilcompiler= + case "$rid" in + linux-musl-arm) ;; + linux-arm) ;; + win-x86) ;; + osx-arm64) min_ilcompiler=8 ;; + *) min_ilcompiler=7 ;; + esac - # These packages were removed on .NET 8 - if version_older "$version" "8"; then + if [[ -n "$min_ilcompiler" ]] && versionAtLeast "$version" "$min_ilcompiler"; then pkgs+=( - "Microsoft.NETCore.App.Host.win-arm" - "Microsoft.NETCore.App.Runtime.win-arm" - "runtime.win-arm.Microsoft.NETCore.DotNetAppHost" - "runtime.win-arm.Microsoft.NETCore.DotNetHost" - "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy" - "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver" - "Microsoft.NETCore.App.Composite" + "runtime.$rid.Microsoft.DotNet.ILCompiler" ) fi - # Packages that only apply to .NET 7 and up - if ! version_older "$version" "7"; then - pkgs+=( - "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 + generate_package_list "$version" ' ' "${pkgs[@]}" +} + +netcore_target_packages () { + local version=$1 + local rid=$2 + local pkgs=( + "Microsoft.NETCore.App.Host.$rid" + "Microsoft.NETCore.App.Runtime.$rid" + "runtime.$rid.Microsoft.NETCore.DotNetAppHost" + ) - # These packges were added on .NET 8 - if ! version_older "$version" "8"; then + if ! versionAtLeast "$version" 9; then pkgs+=( - "Microsoft.NET.ILLink.Tasks" - "runtime.osx-arm64.Microsoft.DotNet.ILCompiler" + "runtime.$rid.Microsoft.NETCore.DotNetHost" + "runtime.$rid.Microsoft.NETCore.DotNetHostPolicy" + "runtime.$rid.Microsoft.NETCore.DotNetHostResolver" ) + case "$rid" in + linux-musl-arm*) ;; + win-arm64) ;; + *) pkgs+=( + "Microsoft.NETCore.App.Runtime.Mono.$rid" + ) ;; + esac fi - generate_package_list "$version" "${pkgs[@]}" + generate_package_list "$version" ' ' "${pkgs[@]}" } -main () { - local pname - pname=$(basename "$0") - if [[ ! "$*" =~ ^.*[0-9]{1,}\.[0-9]{1,}.*$ ]]; then - echo "Usage: $pname [sem-versions] +usage () { + echo "Usage: $pname [[--sdk] [-o output] sem-version] ... 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" - 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 +update() { + local -r sem_version=$1 sdk=$2 + local output=$3 + + 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 + usage + return 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. - 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) + : ${output:="$(dirname "${BASH_SOURCE[0]}")"/versions/$sem_version.nix} + echo "Generating $output" + + # 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 -fsSL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json) + if [[ -n $sdk ]]; then + major_minor_patch=$( + jq -r --arg version "$sem_version" ' + .releases[] | + select(.sdks[].version == $version) | + ."release-version"' <<< "$content") + else major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -r '."latest-release"' <<< "$content") - local major_minor_underscore=${major_minor/./_} + fi + 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 + local release_content aspnetcore_version runtime_version + local -a sdk_versions + + release_content=$(release "$content" "$major_minor_patch") + aspnetcore_version=$(jq -r '."aspnetcore-runtime".version' <<< "$release_content") + runtime_version=$(jq -r '.runtime.version' <<< "$release_content") + + if [[ -n $sdk ]]; then + sdk_versions=("$sem_version") + else mapfile -t sdk_versions < <(jq -r '.sdks[] | .version' <<< "$release_content" | sort -rn) + fi - # 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 - fi + # If patch was not specified, check if the package is already the latest version + # If it is, exit early + if [ "$patch_specified" == false ] && [ -f "$output" ]; then + local current_version + current_version=$(nix-instantiate --eval -E "(import $output { \ + buildAspNetCore = { ... }: {}; \ + buildNetSdk = { ... }: {}; \ + buildNetRuntime = { ... }: {}; \ + fetchNupkg = { ... }: {}; \ + }).release_${major_minor_underscore}" | jq -r) + + if [[ "$current_version" == "$major_minor_patch" ]]; then + echo "Nothing to update." + return fi + fi - local aspnetcore_files runtime_files - aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")" - runtime_files="$(release_files "$release_content" .runtime)" - - local channel_version support_phase - channel_version=$(jq -r '."channel-version"' <<< "$content") - support_phase=$(jq -r '."support-phase"' <<< "$content") + local aspnetcore_files runtime_files + aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")" + runtime_files="$(release_files "$release_content" .runtime)" - local aspnetcore_sources runtime_sources - aspnetcore_sources="$(platform_sources "$aspnetcore_files")" - runtime_sources="$(platform_sources "$runtime_files")" + local channel_version support_phase + channel_version=$(jq -r '."channel-version"' <<< "$content") + support_phase=$(jq -r '."support-phase"' <<< "$content") - local sdk_packages aspnetcore_packages - sdk_packages="$(sdk_packages "${runtime_version}")" - aspnetcore_packages="$(aspnetcore_packages "${aspnetcore_version}")" + local aspnetcore_sources runtime_sources + aspnetcore_sources="$(platform_sources "$aspnetcore_files")" + runtime_sources="$(platform_sources "$runtime_files")" - 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, fetchNupkg }: # v$channel_version ($support_phase) let - packages = { fetchNuGet }: [ -$aspnetcore_packages -$sdk_packages - ]; + commonPackages = [" + aspnetcore_packages "${aspnetcore_version}" + netcore_packages "${runtime_version}" + echo " ]; + + hostPackages = {" + for rid in "${rids[@]}"; do + echo " $rid = [" + netcore_host_packages "${runtime_version}" "$rid" + echo " ];" + done + echo " }; + + targetPackages = {" + for rid in "${rids[@]}"; do + echo " $rid = [" + aspnetcore_target_packages "${aspnetcore_version}" "$rid" + netcore_target_packages "${runtime_version}" "$rid" + echo " ];" + done + echo " }; + in rec { release_$major_minor_underscore = \"$major_minor_patch\"; @@ -408,7 +326,7 @@ in rec { runtime_$major_minor_underscore = buildNetRuntime { version = \"${runtime_version}\"; $runtime_sources - };" > "${result}" + };" local -A feature_bands unset latest_sdk @@ -429,17 +347,49 @@ in rec { $sdk_attrname = buildNetSdk { version = \"${sdk_version}\"; $sdk_sources - inherit packages; - };" >> "${result}" + inherit commonPackages hostPackages targetPackages; + };" done + if [[ -n $sdk ]]; then + echo " + sdk = sdk_$major_minor_underscore; +" + fi + echo " sdk_$major_minor_underscore = $latest_sdk; -}" >> "${result}" +}" + )> "${result}" - cp "${result}" "./versions/${sem_version}.nix" - echo "Generated ./versions/${sem_version}.nix" - done + cp "${result}" "$output" + echo "Generated $output" +} + +main () { + local pname sdk output + pname=$(basename "$0") + + sdk= + output= + + while [ $# -gt 0 ]; do + case $1 in + --sdk) + shift + sdk=1 + ;; + -o) + shift + output=$1 + shift + ;; + *) + update "$1" "$sdk" "$output" + shift + ;; + esac + done } main "$@" diff --git a/pkgs/development/compilers/dotnet/versions/6.0.nix b/pkgs/development/compilers/dotnet/versions/6.0.nix index e2a792457994..388943cf2378 100644 --- a/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -1,208 +1,318 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk }: +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v6.0 (maintenance) let - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.33"; sha256 = "0xpki5wnl629zcih2d70vr1cgrhwr10mf4r89dyfm4hmwfpjz0pl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.33"; sha256 = "0d26nch9v7aaxb6m8xjbwbbag88j8r7igbg512p242g7a03xp743"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.33"; sha256 = "06mdbp3z8pvj6q15agzdgxiqdvk057k0ld0q6q2bcy5i39x9744m"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.33"; sha256 = "1gyxvfaigp8i7x7yf24xzk4z5p638zxfa0pmahcyly0afl8s0i2v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.33"; sha256 = "1q5aigywyx1jcm0ws2gql8y2ns6lrs9q6h85k3l8kamrbjls51jf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.33"; sha256 = "1m1qac3mpnhdz3xpjn3a659nis10v687aacjrgrlbmjffibh0wz7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.33"; sha256 = "0rks3lj4vwxlv1w6bk2v0z7lm5i22hzf46qcmc3qxndwmlp1frr3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.33"; sha256 = "101ibi2xfy9wnll7qbm257ifsmn4plqfa5649i331481m6hjscjj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.33"; sha256 = "14fgl7m0r9q3j0ab2v2g0jkby28d6c7386n0dx4zd1j516kcrzpg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.33"; sha256 = "00ky4jnrpq5zcpmrkjny74j2k466kw7sj4sbh361wql3q0ma9nm2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.33"; sha256 = "0fx2zh5266inw8c2a353gl6sfcssnc4l952sc83rpl48x0xy5hqr"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.33"; sha256 = "0iwxzkdlmhd4ks6ivrfp5hgwgxmr2cbx8jvz7vzj01v3zbv8m8hd"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.33"; sha256 = "0r1knq9hzvx4qibrlvq8809r6pf3j3inq6aiw94dyrrkl1vfz3rr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.33"; sha256 = "03rxxv7vlaf7pbdcbyv2q93f5d0w7v9mhi2qy2nyiwscx1b1rrj5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.33"; sha256 = "1qazlv2aczbrzv5l4l0p94ix7q321i3j3jn6fcw0yxlgznjqw1dg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.33"; sha256 = "01kqcqjp2f5bx7nwx7ma90r7pjnc9vdb16k3fs1v3lvdb83mlwjn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.33"; sha256 = "04vrmd5blrqv2immaw4xlwcc8krlpnckdlxl5jg9mr7azq657z9d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.33"; sha256 = "15ki8y9607dw4ldixy041v3s6ld36j7r8gdhn31y6ffp0ij0s9p6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.33"; sha256 = "153hdch33nxbs4lwd799rvbac8kvbg1jbkkq440fmmy7001zdvmn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.33"; sha256 = "0v86zfpln81b7r5yxjf676xx372kmwn0fcciwnnx6xks3i9qdzy0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.33"; sha256 = "0rcg68qj84584v6vij6kqk2jrmgci26rc40cmf9ibc2h65cm3hjx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.33"; sha256 = "1605avj9l3f6vxghkwzvqhyx5n2ipyb9y7d0n32777pg0kjc29iv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.33"; sha256 = "0f92sp9120a4bqcws53migvpbv6iixfqb43jp38s3sgdv0dx3i1l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.33"; sha256 = "0xn1ckjg0zha3wib7pin29i0b3390xmanfrivm29x98mj644md51"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.33"; sha256 = "0yn9cczgh2clmxl92jca176dkvqn33jc4jyl25s41z9y58gbc9nz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.33"; sha256 = "18b8pf3dkbgav63yb2szdi96v6s1brn6yhbragzsw9iiwhvqxw8n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.33"; sha256 = "1c4j03a7dcxvb0lajllnkyi7jdjzvvfd739mnhpcy5dcfaz625yv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.33"; sha256 = "09hbn47rn8yn5646p12xzw60ijhshrwav5jsha2hn27d4i57ls5j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.33"; sha256 = "1x1b6hc4jg3l3fypdll6rqq29021v2p8y5piclyhsqwwhlzjb2cl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.33"; sha256 = "01pvlmwhdhp6ny3h5m0rm5mahkj33xgmrbcldvh1qsilwb4vqvsb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.33"; sha256 = "1yl8gy6abj4c7n2mkzs6v9mjzv2bhwdny7za6pclay4m1a4kijlf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "16ij3bf9kil06kh0ca1csqcg3x5ang46z9pd17y6f08im1l0xfj9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "122aw6hy2xws6wi00g3swcp7ria1qwzrz4ywakwbqjac0winshmn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "186r14nlx93g053yhxcq9lfai2j9w7nrjiff1y2q5bmnkfnbd38j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "12mxxvzi9rf53lj3vz2q8fpar915ghdhixpkm9q29kz8ly3hbv1c"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "0zjpj744gld18fni5gwr94yp5bmf7hk8k7mcpg5s34pyyzp3zd0q"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "0yzs527173v46x77if2ark872sjx0a1spz08xsm9d3bpkx0ncyd1"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "1hf30pxgpc1kcmfpcnd4v69xrav99npsv7apzj55fy9z83a2djgy"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "13vpx6vayxqk7g975bgvdslcfwaxvs3rj7ikn7ir3k0kivsp7dlq"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "1i60ry18padghnnwlyxcij0hc8361mh4mnsx4wy1y8ys45s5garc"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "0k4h0j73sjd1w1zkcq1qdz2kdmrjnssr5w9g7xx2l1djkvw93lkv"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "09kzlvz9ddzj4x8p9qnjvb2xkzbhwn2phs4sxwa8305janbhypy7"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "12sjcxxg0l2q3ks4s8lac2l5yb7xn691idww895jkxar7d47vjy4"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "119szgcdrbxqqmmz59phw83b7kv0vmfl2pafhnmx63wvyda1717x"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "15fmfgl0ga7fkz4bw74552ljs2l0iw6sm6xk0v90k6qdihy4z9ay"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "1a0dvvsivcsr6r2ln8r0g7d08swh2pa5fnzcabif833x7rxlriqz"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0kv445lsj1kkp2mgayp211i5q28j808v54z4fxifda3cynjpsyv1"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "090v3q7d7i1h4a8zafhhh4h4qgws7i4vr20px4x3sq2lcigqky28"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "1s9ia1hh82pnzj0w6szjyg56vb9w9h1rlnqj1nb6nk6vj3a6ihiq"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "1n5j69z3pvmas6a6p5c45qn6mzdmb8ns4yl2if1cc69n3fs6axmw"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "1zbdbainvfx8m1228ql3zs2zs2dincl1fwgfivbwg0pb578l70ab"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "08aqnwzvxhvk9dlxra5f022hjgcsqgcs1kpdm09yy6yma3xd8v6y"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "04asl4lwf3wlrghccip463fri9sgarbgijky8052c1caj68bmscv"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "0x38bnmilkkc2c3i62jkn3vj3visjx87drsj3m3k0x6psn6h3qmr"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "1hkfp1p8z6ada8z5ilbn2j1pw6mqxw69r6719rcv8ggngpwwd21y"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "099s3fcqjl2sjp3fsn1xb3yq3qjv5nwsmy40ipr2wrf17lasjz2w"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "1wbzabbc7br7my9f453n8jds29ry2mx3l3b03b4bc3zl1ri6spzn"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "0jwyfcw085svfr1f3y5xbpap3mhszpax95l7rw6g77fp15qfdzf0"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0yk7j0d8hgkb9dkgkxrp19cjg09sl3vycpz9ff16md8jjakd2ywz"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "06156xl3wia310qcfjahs5ni58j42pg8s0gjy7yzz7m7ixkig1kp"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "1sydbax1kcg8nbcry6h4ik54gk2q5swbw5cay2w5xl985p6dwkjg"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "00pcsz4vd9mscrwbpwlqqnlacw2xihxgvlp6xw0ycjsdrkq4621z"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0l9j0fqpi22b791xs1vik98gr4zz004gxni85zmss64pqj7zabkb"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "1zpciqzf5g7sygj1iw3r575msfmr8bs56j68rx7jl90hzrdf14mr"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "1qwbplriqj5b720lnl4h9848pixxagqqa7k73fa11x2r8yqn399b"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "1nyffsb8lvj23x2xg38ngcbg8bh3apv9px1n9slf8jf9qlb6hnhc"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "1ynzpwx6mmj3w5x37ivqjjk5is9hmgwwlb8p50rjhidhc99avlwj"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "00if84zqqkrl7gdak1hx8l93ixidj4sgxj5d6wjji93iiph4m9md"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "0vd5xvmxvlqc6k1c86ib0fk582899vvkfnsnnfmw7f6s8271jcs3"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "0lkv19rqhvykdvs3lnbv0lda66s6wz52ad244yirmmr6gx54a7jg"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0g4aqyz0685mh4b2w3d96q0m7138w3j5w9ds9yli51gdlv0xpy13"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.33"; sha256 = "11qqd4vkjmypah5lg9y37ma374a7kwvrrqi14knc9rzi038xdzc3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.33"; sha256 = "0ghxb55azggk0cs8aasv57w7n1ag7wb981dfrqrag5cfi6gdwwlk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.33"; sha256 = "0vglrj3yx5ykxy6lbpb6frsxcp3109rpl6zl859vy6vdmjskpdn2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.33"; sha256 = "1cnm270drlfq1f839r5frljfg8q4xqn0fqicf97bd2cwd1nyx8gl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.33"; sha256 = "0vrg6xbzhi8mbp6nas6admh6pja3akc9synlcpjh859mg9qr8886"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.33"; sha256 = "0vdabiysl8hjaza06yfmk2x45i2qhr092izx820qv8clfdggmb8k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.33"; sha256 = "0zlsdg3bn5i1s09p9lw7xfdcfrm0ii9a1zbfqhvqgvs4zwcvk17n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.33"; sha256 = "0jgmmy5y2ci29izn0w1dh73xvrmvmypbyxjiq1kxjq1si5j465mv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.33"; sha256 = "0l7bh7mfha16dbpmlvgfpkgblw0p00x52bcki96pkjldgqnf2fwr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.33"; sha256 = "03bk8c7shd8sfvlw8k58aq95yc094247722fs2s2456j1gsirqqj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.33"; sha256 = "0qzdhg82sxa1srjh5lpnjyyz6lww00j1b4sgm0581ya1cjz8b38c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.33"; sha256 = "1sn5q5q0qwnj5majqsfbzgirv0kgxs538ri9cbrp52sdz017c3a1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.33"; sha256 = "1ddmaapazmsvwmry58x117hjl2l3q7r52l8wk45h820q46v8m26v"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "13l2xvm9zlb2b8xmznjj341nrknhaqcz7hlg4ccs9rmw32p0zvdy"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "1fiqsm2nwz45gxrakbkvfcsp3g8l0nl678df0k52ql4inn77f7p3"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "1nrnwgpgqrjr1pipjld74h1nk2m1gfk83f6lid4hvznyvi4181ph"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0n8hm8dhl1k70iag7n6pkzi9nfc56xkz4y4xsn6hy792nw17haz2"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "02cjzf07kp8k2vb8hmf72rz6fx2y29biqvdhdva2jj2j1768a9gd"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "0k0cc1swhcrf6ydw0qkx52ikc8mnjv9i0v963yp61n6dhsa5cv2z"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "0ascpl1c8a710ggmxvkxw63rgp1gwkjdr03mmvwlwiwgxks5z4d0"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0ra2v9l3w9sid1hg21ss7lawp8mgdhv1g04napa4nrv84bcz7kkh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.33"; sha256 = "10hswinnzm4mvhaqj1kr352lx7a7m2c6dc96q7p5dizlsg2rsh54"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.33"; sha256 = "0h990mf442c2s9k3vfis7r1nhf36bm2xsmz8472vlhdgym3bvr9h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.33"; sha256 = "15s3ihn50jwh3wdswy2563fl8rjdn5lxwhfcsd8xsjp9j5ixpm27"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.33"; sha256 = "1vcq2m5bcrkvqdphjcx7lz780rgddi4h2sbwhw5ysxmns5nkpim4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.33"; sha256 = "1jh4xm42mzrd7xqp96qvvinhz7rs9qfal7243nfiznl4y9az4k85"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.33"; sha256 = "0zfqp5axbl5066655wsd4435194xfnfbs2k8hb1dp82a74fwz2p1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.33"; sha256 = "0kkqj31kxdsd8jzna25lh6f1kqlwpx5pfwgdn02qr7dzln8c25vw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.33"; sha256 = "04gc5p591kmn3divsqqn8s29x1l3klcysj4zskcidp1dkclx1dq2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.33"; sha256 = "1aik89f8pjg5vrz1lx6g0ccsbkcf38mw0591dbryqjwfdzp08g2f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.33"; sha256 = "171qj7ajbc3fhld7dbqm04xrqmqmhbfmh9vpsl6sqkgp58b8vg11"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "1pf31zyfxd68cs6pklhg5g8izp8r5jzkcxgq85px62ym6xp83r0w"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "0in7gk5bi69gmm992cs4apj2kaxdjsdmfxcrl291822mi2ai3d2r"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "18m6qi5hjlscd8lkmc8a513zycfhm64mqyd7g032j02vrrz1d20y"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "1jq2mc722g8xc7wggyxayfvhan9dplvk4rbp9pjkpiby25mlhj8g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.33"; sha256 = "1ighzhn8ngjnv53nn98b8n8krwh6k764r2kkxwfccajwhpn9sb23"; }) + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.35"; hash = "sha256-BxvIeZIaBdC0wyDQqKW0E5axSRSrtQk3oEPsT287014="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-9q5paA6a9Z9XH939/LI3CY3WUMI3k+3r5ql5DCQIvR4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.35"; hash = "sha256-IcpSbsSHgYBbNVvbcXfmRRM9bdx3pogLncO4RuXEab0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-sbboITtBgkzX9wtGhtQbjVHVlP+tOjr0eBvuTPR5n+I="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-CgptZ0sWSK+sq1S6vaHPSeX2VZiWQ1qB94BngSE3eTg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-3fYohmmqpwAaIbZSD8bCOrHpsj6HbbOebamH4JxNk/8="; }) ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.35"; hash = "sha256-VQHuYjJLLOhgV0Bc2qiuLjDBYj/ZdayFApxvsMaybfQ="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.35"; hash = "sha256-CEguy8PYd6Q/xgPVoUJiT9Kjvpk3ViyY9S0mKkZRtYc="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.35"; hash = "sha256-3vy31ixbl8nmjyWgquh47daDf8KYJK1GiKdgUobZ4OE="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.35"; hash = "sha256-HffLekYLq/WAmBJaK7JS+08P5MXbsZRSO7zQsP28KIg="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.35"; hash = "sha256-7SitZSktVg5PPAxl3zh9v09ls4u57jqKoV3YDZWgkRo="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.35"; hash = "sha256-b7swPOMAs3J++EXnwPP9BnG/5ti+qs3q+73gO33cIx0="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.35"; hash = "sha256-LjGQxsPj2WeXJEM/t89iw5mZg6uOFD0fkLil0lqKq50="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.35"; hash = "sha256-6Zc+12VfsFsFbfuh727PB1j7EDQeiuJYtSA7MUxUXj0="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "6.0.35"; hash = "sha256-XPnsu3T9dfuwupKbGDQK2LsrMsvVasZZlN1b7usP+kg="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "6.0.35"; hash = "sha256-7+ldzOhrKwoQymhLz9Nk6tO7Hd3VxLYYUuTLAttmWZ8="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "6.0.35"; hash = "sha256-SWxLLPrTpdw9EE0sZeS4GGcDzi7vGVvO19TeD/Zo+kA="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.35"; hash = "sha256-tpSLvTe0WX8+N4L6Ww9F35aobI2F06lGLwmtoVGPoMc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.35"; hash = "sha256-NDUtM1/wQYziwzGZEtizHqLfgsbqCDyXdqRziZgZ1xc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.35"; hash = "sha256-eJDl6txbRr3/Bcm0jgLq5sa0RjCpKjx9gJtxRkwKFa0="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-c4OtjF4mwQ5oDg7aTIL3UXWlgjzScj7MAiOZkwvtUBs="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-NqFL81Xr7RMl7Mc/bdKI2TCHzq4QpG4kdd7sERPzOWc="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-WUnzXWrYltA+PDv5lOIoNA6d7c6Yk0x5bO4AqjkttFM="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-PR+IPCMNROJiZxu7ZYRpzeAhW5N+HC6jEC3N/VXwyyQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.35"; hash = "sha256-RoTet98wvZZiKsDu2ex7HPtxrEIvDXm571bTMHPd4zc="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.35"; hash = "sha256-jM/HzLumZvI939DrNb8LHnEr/in1Lws0j/FAfdXSzbk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.35"; hash = "sha256-yrtPCYD8skaWnfIoaUdQ1dns0YrypxDocskS2WGxF6g="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.35"; hash = "sha256-jPUhSrzqnH1GNi/c7dSnZSQhFNVGdmlAQkDLdXVWBBc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-pQd99gNiGGK41kib34QMP2JN2nkqrVrYJqX4qZoZSN0="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-86wblZsGVVwesDUfxhsCHXecS2NpwBLAEZUeUmaHnVg="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-JRXfIeOZL7DVzc2Tb0AuNo3PBKn//bqtUzkyoqWF8oA="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-A1E7kjTJKLAoZ4CyImcFGus7w+/H99/U1MUhQXJzIl8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.35"; hash = "sha256-VbV29mYgcewUk/aCnc28eUCH616+h3M7K+HTLs4rqeU="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.35"; hash = "sha256-2eUqoTcqTU3ebv53IV6yvN9EhkOqnyBRd2tz74HuSsE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.35"; hash = "sha256-maNzxJQ5oCd86VI4ROzl4RqOV1RNXn3qWjrAfBjr2Y0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.35"; hash = "sha256-Gf3e0EdBEgq8GcZttTHbKGupFlDyB80nhYpBN0X9Kro="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-FemQgMovKuiS9dS48aAsMH9rQbUJnTM+olHU2gXJiqI="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-bQHLUwuKtiBUc02l6nqw0UntRySCZZ5f80jqE9GRJ1k="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-y0ZMcO7UQHK/tsV7FWxcaWs4cHnQIwDyS5KF4/MUrB4="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-0Nf5dX053Yy3ErDt/GH0IdefsE4C5Iwxu+V3yBQGXac="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.35"; hash = "sha256-NK9bR7E+4z4v6G1WqG74Be431jTgQZZnVUKIL1YH1vA="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.35"; hash = "sha256-INxaOVFZsCkue1I+uBBbB6bVUinMSJwzoW1nREyC/TY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.35"; hash = "sha256-KG5o3HrmzzUcHn9MmaQsELqhW9pbf8v/BEl8XOy26bE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.35"; hash = "sha256-1gKuXzwtNC84PBNOSX76ZFUT87DHuOEJmKhmZg026tM="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-G9oP2+gqthzh1TzcPx9rhuA9rIdxm4aKpds2jLbz98g="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-fMyXnJKdHAcPQF3bG5It53BmwVICOBJZ9mZ5e8rhjIg="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-rL3yEEknGnpA0/W8GWkoT62C2nm2P1IY5b0FlWqNVIQ="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-hBpRmWVYievxvE7Oq2LOsq6flZWAMqOGILa1T4dySL8="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.35"; hash = "sha256-FfDa/XMaER+fNf0ESjA+ZG1YsxbniiDf667N1I0i9EM="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.35"; hash = "sha256-Yb5w1a3vVPTd9YRdmsmB/GmVIA2h5UUMex6eJILttyQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.35"; hash = "sha256-T9wE4xhZFDRBFdY+aJ5ljQedmq94ULjgUl80JgOOLls="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-GqDM1An86Cix3IeE0ptVz/GevTeodIap+OnC+UK1JCE="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-Z2v8eRQTqqI1JTZELbRyC5nXWtq6Iq4hw2Kq/kZesTQ="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-Y+0OeW13o2vT3ZRUlSQnVMzhQefZnB3bEpniCK/7NXs="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-hkiXK3LEUWpi1sPKfjISRyDN9whidIW/7TcYKsf5sX0="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.35"; hash = "sha256-QtmwSe9LB21xBOEIP37msHIbLV9g/cp5j5qI7UeVy8k="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.35"; hash = "sha256-H+fKDq3g0i6dgvbpI2U/EcH0qW+oTr5mkh7S44AWaLo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.35"; hash = "sha256-lyFTNQNL5Gd/Yz/wIn5pp38lQh91mpfSSX4ofsyPaXE="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-zP5FKatImRSjN+UKbPpmB+ILTrBrL+YnEt+DoI2x00c="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-s+E1b74zGUPjb2ON4Ecu0YyaBmh89R7FuLumBIWwrww="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-71iLcbj3hgrGalx1p3aP3gnukTbbIzGX0DHayfoqc14="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-myOR5s0P8oGaNvefX2RBOMKIoWKdTYyN/VVXzjOUkRs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.35"; hash = "sha256-vTMU6Vb6WXB9Nwf/naJAG1Lv2SfmAd2rTSEh9e+ITsM="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.35"; hash = "sha256-6mY2uBhvKCpEFJLYX9+f1mpYrWdN69i+14DPjO4U8eo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.35"; hash = "sha256-cBcfv7tnZa2xO5T5VOx3/7EvJ5u4/C4dFnV1Jj6VFPU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.35"; hash = "sha256-IGArFhlq3UzZY93lJ+WrB+zmuu/2o8lVwT7MJKpz6DE="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-L1rUVh+A+U0kgoPe5dtsPiigrAwHYkMaHeI5deU/VCw="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-cOGw/YSJucZXdEki9rDo7XAWibi/9xbC1dfE13g+dNw="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-oZujYDpYlBKGKd6W72VJklXnywJmTAJAUbgD90u7wC0="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-9OvPAvtnIEx/opAkBBmqMGcRfjfCP3WVgJSydZNT2Rw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.35"; hash = "sha256-uOoIWrQ6cAUFTtAaaI8VMzk43m+eA6jijUQUU7e/87I="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.35"; hash = "sha256-ljEkMgkgfEeqzRnmTubjSK2dzkph0cSQ7+2J986F7HI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.35"; hash = "sha256-05wMp5+etiV/vgktqGo8+4XB7FNYxwCUKpJsW48tgvQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.35"; hash = "sha256-EtFBg8yBNhAEQlL97oVGiu05rPMSKLd0wE44zTBT7FI="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-v9FM/PSYQ0a6Mhp/xU0kTzqz6G1JEvFDgcvcOgoMg4c="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-UalwiTf1Wqbxi8duMS1L9S/P1xFAD4qkd1YnJjkWWMA="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-TKywsrAlBP3OIY6rieeO4wGuGvKIoeNx+rhRz3Qn+tw="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-nBjl1AgKzjNgAy9ebqwuMW++3agzj21DQRGOE6i4s6w="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.35"; hash = "sha256-Cal1R6Vv7iuN45fuIOx85LlRk0tdB0YmhVtoKmkmWCQ="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.35"; hash = "sha256-cDfyVD5ium1TUmjAEwmSIPZVOodXsE76lSi5l6fRiZI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.35"; hash = "sha256-/bEn2roiWJVqTJvBFIAdNDLVHaP6HVWRkJYFKQ1BwnQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.35"; hash = "sha256-yzO+2ZY1c2Qa5zYlGWcPw62lorqvmC9w3kqMemuDdIs="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-HBi4LxSX6yEC/L8b2SIOXxNLeUAJz2XJ8m0gSvg8JEs="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-P0bPG2kQtwoaSZRrWvWbHvVtKQ0bbaYBIL6y6R4AzCw="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-8KpLHzAuQtxX9ZvAah9tIZffgr3UdA1ioVjQhTGGoF8="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-4gcr5XiY62fdxU1PgF8URrhmRF38IwqTnCb4w211me8="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.35"; hash = "sha256-CbAFtObNlLAFckuxQ098QyRydKFer3Lx5GFqI384IHY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.35"; hash = "sha256-K48UCK5GmLu8XcwnhcnU/vGRp3Myg99zA1qjLmYf++0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.35"; hash = "sha256-TF0WcItnVgxmveY+HuQuPkJcTN0Ow2ek2vLNrYnM1wI="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-zQTo+xPX8ybQNELE+urZr4gpkk7DVmWioAh95yrTMaQ="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-9gM7UTQezIFzY12Q2hCnHfTyyP08LokuEpQM92axC3Q="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-4MuvhqMTP7CjUU5t5FuR31tDr36XGe4vO1Qa9T6OCb0="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-Xx5O61O33NGDkh5+RYwBtHKuiWr40Y7T01dwCSAzd+M="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.35"; hash = "sha256-1Lj+5osDgRccxe8LD7cFnOQLSznv7QqspICltvG5Jag="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.35"; hash = "sha256-54J48BHMX4YBZYBlSh8servhI9IVHs1rsf5gJVr2SPg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.35"; hash = "sha256-ckJ2xR4qf8OQdk/KhCjVmV91lX8pj19qjlsJ+i5bkMI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.35"; hash = "sha256-yKl+zDJ8afJUSJbaoXvgEWDGsedDFR0xL7ov+ww8MXk="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-8+ZO5pMigKiX5bVQSthNZGm+HV3MCiDOZZ/RvyFZ6hw="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-LQ5JsLnwzLDBWi0vEBAFD3tsLTqxn8pB21nyxctBXDg="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-CK5Ms6ByKq57M0zbzRclrooBpNW4CHq5Pr8D1I8jvQY="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-A3STk3RqaylVSY2mKRgcF+WHXXIKhobaOT/zNRo+wHs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.35"; hash = "sha256-Z3OPxtSzMp5QpQKPg7/PSPMSKbx1XNK3rOGvMulLCq4="; }) + ]; + }; + in rec { - release_6_0 = "6.0.33"; + release_6_0 = "6.0.35"; aspnetcore_6_0 = buildAspNetCore { - version = "6.0.33"; + version = "6.0.35"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/91f66f75-bd3e-48f1-acb9-99c0da753f96/42c47999ee4c4d108774536afe5da160/aspnetcore-runtime-6.0.33-linux-x64.tar.gz"; - sha512 = "12b34fe1d0a679ff63db4bf002a2988194d9e64d0e107d128c247821dd939a86eced0fe453c0638d3742dac3a32e533792c26299400fb4fd5566b75177e66875"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/44b0aa96-3ad1-4406-946f-680e9a52897b/8a6b84db7a63924f98b4197ce07313be/aspnetcore-runtime-6.0.35-linux-arm.tar.gz"; + hash = "sha512-LRUjAbm/xfnO2rxsmJAYdXXpDCNivscJ+73opCPab1M6z3ePNNVf4XSQbq7y3AnaVwtanSXdeopUy+TnP3RfQw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5b5b9407-22c3-4ea4-aefe-c958ea78e7d1/1abb142a2ff944d822d133af369dbe21/aspnetcore-runtime-6.0.35-linux-arm64.tar.gz"; + hash = "sha512-yUn9G57+kjHkxuAG7zxKWu3B1M5kypvBzVLxzpiE6iODe0nx5qerS23wxvYKMlc+Ku/eThTyBYEtAEt7nr4Pdg=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/0c5a5f3a-881e-4ceb-a334-c5e3b210eef8/9834ffebacea659cd14d272fb01f81c4/aspnetcore-runtime-6.0.33-linux-arm64.tar.gz"; - sha512 = "7a60a77a306070a3b94db1acfa73938b6880cd079bdac3e5cab174a47af467b9208e9f41d8e12e080831d528151cdaa5b660bea5aa6fe537ec144543c0fffd95"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ccdb3628-8f55-411b-b0f1-669d42604ad8/81283ab8762aaab1be72772711f07f86/aspnetcore-runtime-6.0.35-linux-x64.tar.gz"; + hash = "sha512-2G2pODOKbZclBDbUk0Do8RTAW0ZRLKViqtym8+d0A9NkaNPzTtXy2TXAcPnhSu33KZ9aA9KWTb1ldrmi0+d26A=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/d4641b35-5b85-4250-9913-0f6a2c276888/bd8483d09a767f6c19f9274da2819624/aspnetcore-runtime-6.0.33-osx-x64.tar.gz"; - sha512 = "f8dcf3d6de7a34d7fb402fd1ddf55bd810cccb95831d12312bc7607c6c7de8a46200c66d7e753250103961ba2e97fa6a85206b49442e1aeab1e290ec69bb55c5"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/5d62f7bf-a359-4213-9801-a6e625abcd5f/3d21aef16435231e8dba45d9d97b66f4/aspnetcore-runtime-6.0.35-linux-musl-arm.tar.gz"; + hash = "sha512-Rbo8KaqV5IEKcQkHvZPafD46CceXLXsZhXqkeuT9X60ZvawsXgN/mr0ZlqJ9Djms/8Mnjy53gkdBQAcPNV2Iig=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/74fa4afa-a6d6-4c32-8ef7-fe88148f10cd/c887bff014d198532ba942988cba124b/aspnetcore-runtime-6.0.33-osx-arm64.tar.gz"; - sha512 = "26a2f1d6cb3ef9df5b6abc16e025fc2e9aeda386b5da53428abae67d76ff007bc921aec60cff9675dbb7291db7b75c5a7bcaadb54e8c04de59308b02dde924cc"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/fd8b54ab-b3da-4bbc-8cad-e15955a61813/f8afd41bb9cf46a39da72177b56b3a29/aspnetcore-runtime-6.0.35-linux-musl-arm64.tar.gz"; + hash = "sha512-TpkmOTjp3h+lCPzfClnn9hojT4vWCklH0EPFrFvDEI60YlS8txSMoKA5H16c7nTbHqYX9XbX43ryK6EI6UM+Gg=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/69cd357d-c16c-4578-a109-8fbcdd5f0e30/9c6b46794e4c784fdec1990ffeffb021/aspnetcore-runtime-6.0.35-linux-musl-x64.tar.gz"; + hash = "sha512-UCEM7ZDRfqg3D7vK3j+/ub6SaQ+up31VFtyK3k7ug0CLLTf4EsygIAh0QdLzFGUHCGeSz/F/dBMwjrEvpKvWbQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ebda945e-7bb9-4079-b4f2-6a444bbc8d4c/1b7c0b929586db13610d8613329a9fba/aspnetcore-runtime-6.0.35-osx-arm64.tar.gz"; + hash = "sha512-VEhzIbRxDYIt1W31Bp1q/N0fmHZyd9yJ4bMDWrG61QKLRXk+m4+f9X4y1jMrW//ztobGUIbsR0OgJ2G0KVeTtA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/12e0840c-f541-4796-9b7d-7c4568f6af78/41fd0ea7532a0f0e26a6a8755103856e/aspnetcore-runtime-6.0.35-osx-x64.tar.gz"; + hash = "sha512-zIC6WajaQRI4noQs89svOqJjZUR1neTScPuwXHAOyR2gYrrTSYSYnFblwaecL/YMuDR+jmei8UqSqFm2pSVHxQ=="; }; }; }; runtime_6_0 = buildNetRuntime { - version = "6.0.33"; + version = "6.0.35"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/250c78ac-a53f-4679-ad2a-cc31fa4c4001/204b39eb9634a8dd9f39cbcaf56030f2/dotnet-runtime-6.0.33-linux-x64.tar.gz"; - sha512 = "0892015544d8903999f8e0fadab6b4b91eb180e495fa5e36c1a755b1d42e134858b7bdbfd60d1880650d9c528d07e31b9ccfc73e650e5d890a955902a89139cf"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/2c52af07-c968-4edd-acb7-766d81766809/9de0174ec8abfc27498b763c0e1bd370/dotnet-runtime-6.0.35-linux-arm.tar.gz"; + hash = "sha512-X0HAD45gzirQe+91o+rYmGuZtwaoxLsssPqMrfovq9rjwXUBqpx39jSq0CooyMiGkjWQe68LnXI9ZQITlSzpJA=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8f344652-6b7e-4136-b6ca-c1a46d998835/e00bad479ac747a8ddc90e7d006aaa52/dotnet-runtime-6.0.35-linux-arm64.tar.gz"; + hash = "sha512-lF4k+cLWd+Zf3aoGyv6NUY7lmc6YiDtg/Z1zQyD6Lz4cy/tG6ibukl4xn7VDDC4Y1kJp/a6WAwFpxLbT2BHqdw=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/79e3d66e-14b8-4c20-9816-37c0c0964c8c/98ed84be388dfa1a7db279e9beefbee8/dotnet-runtime-6.0.35-linux-x64.tar.gz"; + hash = "sha512-2NENYA+2ZDNpSVdvjsBTTb/9Vz91S550HyCBIiH6/KxfUJp+GrROnmP8Mae128sZ5OwZMP/SkxIhLcdFSXcJDg=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/694cd8af-7e9f-4161-8c1d-1c9a7b1d074f/d3a8dc90d971ec4f135f6452c176dc93/dotnet-runtime-6.0.33-linux-arm64.tar.gz"; - sha512 = "c700d4ae3e361fa2a390a8fcf294a2277931b0ea60bd4a2f0ec2bb982bb6c618ba002e5955c3ee96807207b256e10289cf1cfa372029b758aefa6bf1268d45fb"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/4355d376-a0b5-4b33-8a80-3171b45100bb/d8ee2b66411370f06b55daaaa8bbac4f/dotnet-runtime-6.0.35-linux-musl-arm.tar.gz"; + hash = "sha512-ya+XXOzd9F2FX8DnU1dkokso1kr0OmasJb/9a+lpmn5dsg9WrN7emeluRun2ITXlGvE25yJVnQx3++uH0m3qxg=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/82217487-71ef-43cb-8678-d293b802b5a6/cfe49dd7b7e0e3040d4fdc9258c61dde/dotnet-runtime-6.0.33-osx-x64.tar.gz"; - sha512 = "a0ad81d4bb361d91edc7b42142828fb5ac5b75376e6ad0137f7f28bba5c0d0b68c67af708bc85c15ebb7aac5f98df20bd83a56144a1bf9ac5aeaf5caf84e4128"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b737d8bf-ec51-490b-a86d-fd6309965ed4/c2631e668020a1114fd5aa54adabb19f/dotnet-runtime-6.0.35-linux-musl-arm64.tar.gz"; + hash = "sha512-wBNlsOXMct/HvzwdUS7cdNDvlZy3phN9Z+ntnYom2HRCWOowBd8AmELLr0aETJE2JuPcuhWDARis2V4U08LmcA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/aad5df88-c193-4579-b847-633186659a2f/1688cb1838ae0f0b67d16f3ed808f566/dotnet-runtime-6.0.33-osx-arm64.tar.gz"; - sha512 = "95d0e646f688e6f46545625dfae46d8325c7aee4661d3f0e59044acced9c6192ff51524355696e8f868ebd112e9a036d01c951f7249d863c300d07c1a0913d1a"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/30443c06-a028-4ccc-88b0-8a98691ec823/d0ee93efc931577aa00eabf7cfea98ad/dotnet-runtime-6.0.35-linux-musl-x64.tar.gz"; + hash = "sha512-sqP6JlbLJVI12IbadHU8eMPW1Sti4Q1pBTucCLZiZYZ9bzabSm4TOr/yHSspEnIudXQ44unbrRC522pVVFzUFQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/079437b4-612a-4a5e-be11-decf9fd90666/1932ebb2603542a3b647d958c9412824/dotnet-runtime-6.0.35-osx-arm64.tar.gz"; + hash = "sha512-SIDLPGlnRFKDHBMOAqShKCZTTWBbEVnEMu060E5hjg2gdgN0hMPDS9jHORwXMF63a2lXzaFGAK755yvUfaW9Zg=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/55a4f552-2e06-4ecf-bb99-873cc072646f/0b2a5a90c60e8ceb862aa7f7160cf0e8/dotnet-runtime-6.0.35-osx-x64.tar.gz"; + hash = "sha512-czTb9uCb6tbvJwPd5p5qWo2b9D08otb8rzk/XE9K5arXyAPQxFR9AdbwgGD4Zm/PLB+9VDlXnVjZKHCGwNwfSg=="; }; }; }; sdk_6_0_4xx = buildNetSdk { - version = "6.0.425"; + version = "6.0.427"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f57cd7db-7781-4ee0-9285-010a6435ef4f/ebc5bb7e43d2a288a8efcc6401ce3f85/dotnet-sdk-6.0.425-linux-x64.tar.gz"; - sha512 = "a04b75af7c5850238a8d99a6f60b37753467db615831bb3833c14aec86faa2d6ee9b8643885798924a01e28acff44ac9ed39c89f7cbe53c5cb8753c802e85039"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/7ba415c7-4750-44a2-9007-1bdcdee75c34/05c4467df0d7b5de0bc228a25e342ea4/dotnet-sdk-6.0.427-linux-arm.tar.gz"; + hash = "sha512-THZlTY0q6YxztN+GAC3wfFSaQRz3+hPxHoEVAbpH5e4EKC6sdab82s8686M/h/WrOowfLLTebSXgkTl5edDy6g=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/30d99992-ae6a-45b8-a8b3-560d2e587ea8/a35304fce1d8a6f5c76a2ccd8da9d431/dotnet-sdk-6.0.427-linux-arm64.tar.gz"; + hash = "sha512-kSmWG1Std9rCtN6XOHX3rNHo0oM2c6UZI3BmIODFt7jFsFfI05VTKtnaRrHctauP0HpPVSvVclbVoMIQcK1XcQ=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/12ee34e8-640c-400e-a6dc-4892b442df92/81d40fc98a5bbbfbafa4cc1ab86d6288/dotnet-sdk-6.0.427-linux-x64.tar.gz"; + hash = "sha512-qc0eXMw8XYR6yi7yHdFF9hxrGMTnWjwvya7VksYGbVEbi2WMVMLNhRk4/lq6I4bl9vUQBfZAa0IBEMDsQIqEAQ=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/58a54963-a8a8-44fc-bfc2-c2e87e066656/7d0a5a831d123b801c55bd6993c9e69b/dotnet-sdk-6.0.427-linux-musl-arm.tar.gz"; + hash = "sha512-QpfEiPsM33LE+zutBXQTwXOgcGa/ZR/IxAdbhsIjFhLmlJR7fsvsDUPNaSG4PfIGulKNOHo23dbGcLOK/ZOV2Q=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ec8e29f5-2fbe-47d8-b0c5-81f11434c00f/ba4bd30be448d649e5ddf1991bf76252/dotnet-sdk-6.0.425-linux-arm64.tar.gz"; - sha512 = "c15f95664fd0570d5b0cb94c7af6bba5fe830470004f0e958e49d53764714cbf8ddd620b38d487b60a27dbfd467a955856aab3df9c958cde17c942079fdaa55a"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/49bb77df-ebaf-4a77-b6d7-d178c3b1f97f/c87e3f996af3fddd9cb253f0f5720d1c/dotnet-sdk-6.0.427-linux-musl-arm64.tar.gz"; + hash = "sha512-Zw6MlJQ5qm11NI0vphAYxmIdghzrX4Rz/5uBvBsh3Ck9Cxb6gETG5XKarcBJEmVNGuCkqEr03KCJFXExHp1M8A=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/ce410b9f-c7f6-4180-a373-bcb6528a0778/448c9df07432b5dc62d08868ccfef62a/dotnet-sdk-6.0.425-osx-x64.tar.gz"; - sha512 = "5757c661d82408680a6e45efbca260bb9da145bd83f8275280e9ba756a2827ce35c7ae77cb248e9ee6c6cf46730c6e50152b98c0a082c0de764f5e522dfb6ca2"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8db04a7e-0da2-4064-b17a-c36888961d8a/3919a6cc424dc0dfd581569d02f1db54/dotnet-sdk-6.0.427-linux-musl-x64.tar.gz"; + hash = "sha512-OOY7wulLXfuqX/zDHpbqr5iJqGrgOyu6cu1zQ015hX1WVmNFxlogx6XmL0RLjxOj7Wo+flaKPDTIN8/OzRymjw=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/24192716-57e3-4e69-9950-7840e05053d1/79398f054d34fb3e424c029e6d41a551/dotnet-sdk-6.0.425-osx-arm64.tar.gz"; - sha512 = "7383b188c8500ab8625cd34f69f7ec5a4d9ff4ca715f95ee020f2bd082d5023697b021ca4b3b1e6a0782fae2ff89586e541e454fedacdf1c49b42f6e47d12011"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/9354e51e-f557-4d99-8b0c-53bb03055201/8267bd56eb17a930408805fc986e8b98/dotnet-sdk-6.0.427-osx-arm64.tar.gz"; + hash = "sha512-itcxThu4FvtBmIQpMSIOnsjIiFtDWW7IkK88IXeJQQE1Ov66tj8rhwFiMExqKiDRpFzu9Bn3LZBNWYouTo2c6Q=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/fb30dfb9-b1d0-46a1-a59f-ae1037158de1/83d66d2d78b8ae231c3ded22f1832537/dotnet-sdk-6.0.427-osx-x64.tar.gz"; + hash = "sha512-HVZg3R7ObcaX5GeYGy9pxrM5q5PJdtSC76m0L2tcg/EsGS5bQg9zqajkb7vtk1+DZCF6pBC+3g8DKsmSstPqfA=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_6_0_1xx = buildNetSdk { - version = "6.0.133"; + version = "6.0.135"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/3fd189c1-072f-4193-8f1c-663b68b9b06f/bf63007e0f0ba0b3d07f1af06c1dee6a/dotnet-sdk-6.0.133-linux-x64.tar.gz"; - sha512 = "7b4fe0095bc6d3ea43fc3b32f2fc2ccc8fec83b0c50ff74b9e9a019ed40721f46c60d7b3ac08841a5f89d0802d8c347b14a445032a00f3d9a8661558b9c74794"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/dfdf3287-c7bd-42be-9bbe-caeb66babde2/c611e2e9ea33fa8fd38f56fac2b185aa/dotnet-sdk-6.0.135-linux-arm.tar.gz"; + hash = "sha512-i5xwskkBYby1C9jOi/gis+ToVv62pVJXVSzBEaaBBb2HJkHBBIwTKAWEhJLoS8Ryc3zqZkcG/Mt5Duu//ASd3g=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/26d70255-74d7-4d66-81e2-529690046f82/701bfc25c386baea4bfcc727c9790b81/dotnet-sdk-6.0.135-linux-arm64.tar.gz"; + hash = "sha512-aTnKlKkdaGKn8+shVeRXIMmetEHBzR8qIt7YNRxf6gmBwu9DOwVzwe0uQzdWRmZqmvLI4KUawabDA92R4YdnYQ=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/69e35e96-d24c-45c9-a653-ea977a7e2a22/f31e9851ba9b2524740bf9d8b5a9af70/dotnet-sdk-6.0.135-linux-x64.tar.gz"; + hash = "sha512-+ZD6BjY4WjpOprDhzKpFYT/vRC02EAFSNvwkdIlfLCRGVZ8vuULJARcbuEfNgl/MV1+4LRIMxdHPF11cCuAc/w=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/1bec17df-b72b-4c12-a2b6-c994a956fa68/11909df0d405b09250451b8392eaa953/dotnet-sdk-6.0.135-linux-musl-arm.tar.gz"; + hash = "sha512-efG9eL5bl3eyr9+J+SVy0ykVja4A+qVPTnquRxZBzOkNQx8DmpNQ2iWPz+MhjF62ovJnbzl25RqLp0KBy5q44A=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/350dc511-d24e-4435-a503-97cb85bc2e10/9adae96f67f61a23a47a73165a55117a/dotnet-sdk-6.0.135-linux-musl-arm64.tar.gz"; + hash = "sha512-3Jw7lZ/WZCT7nDdVf/ZdsH7dXsgWvNBSTNYPioeQJa4bQOy3dXkto3etz8IjDl0g9y5olGQU8xi7M5AdXmKJaQ=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/759c84b7-4d67-4eb4-94c6-0214d150db31/aea9ac1878560278c50174ee213d88c6/dotnet-sdk-6.0.133-linux-arm64.tar.gz"; - sha512 = "6820d62ced6d9770ebd3667a64a74e2249471ee5920e4ce4101f21e55950f8d44ebe4ffbf20bc66260fd5d1edc5e534a6f0b70522fc41a5e48e75b0bb00e6ea1"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/97d9a05f-760a-43a3-84c2-d401617a76b7/17811377c44145af03fab8023b8b1661/dotnet-sdk-6.0.135-linux-musl-x64.tar.gz"; + hash = "sha512-5g8kSywm1Aurm3r05RBcQtM3928dMzcQk9ssfsARi6Zl2VoJzZSl3jJPIspEWAayD+ELMGhEBjhzI60PoiKgVw=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c8f09b91-04fe-4d0a-8d01-0556c53f2a5d/cbfe49b3182a2c4ebc7aecd22b6ac881/dotnet-sdk-6.0.133-osx-x64.tar.gz"; - sha512 = "e142785256b731abd6f7bda79b1422ba6eb9135f61526d6f687be67146253403cbec85d3ee66f49e577e7f296b32f94fa705ccf048292b1c00f981d2ef4fd52e"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/82ff3f30-674d-4b21-94c1-9dc86a365a35/49c84376a1478ce39a77447e1b0925fe/dotnet-sdk-6.0.135-osx-arm64.tar.gz"; + hash = "sha512-R2bOlU/MCbDAThs+GeVZ3JzdwFU8gPKhanf7UGoqthAEDu05DJFT8+6nYnG7W6/NaWyhvHry7JzZIE9G72acTQ=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/fee562a1-baa6-4e8f-a3dd-2c49eae8a891/564d31d1daea39179782c413f99c6160/dotnet-sdk-6.0.133-osx-arm64.tar.gz"; - sha512 = "c0193152166cefbe60a7cbdb4af7e2df365c9e67a0ce0ff5cc1aa06a46d4ffd6cccda3bf026a47116f02e4c52875fdd704aa380817dbc3eab653d30f4f5ffe20"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/22a4f335-6027-4d0e-a3bf-8ae061a5c958/8c710aceee7279ed15e5acdcaff49589/dotnet-sdk-6.0.135-osx-x64.tar.gz"; + hash = "sha512-jyLm2pDs2qiwXu5EP+YIn+iWgto6xOjT7i7iyf5gorXxZap0TKEqCnG3HsoSXVPa/GSL6C0a7ErjOhRDzpZj+g=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_6_0 = sdk_6_0_4xx; diff --git a/pkgs/development/compilers/dotnet/versions/7.0.nix b/pkgs/development/compilers/dotnet/versions/7.0.nix index 159d9cc23985..21fa129c3363 100644 --- a/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -1,146 +1,208 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk }: +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v7.0 (eol) let - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.20"; sha256 = "0ab1l6r77a11sk450jhhi9flvsn8gp4fz2il2a0vk1lw5rw23047"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.20"; sha256 = "050wdpwp7hjk5c9xyx0vj1cmslcdl9acldhxs6al3nx83vssa1kv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.20"; sha256 = "0wi679cxlfx8s5nl3iqgma9nmxzbi73wamxshgpaaj2dg3z5xrqz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.20"; sha256 = "0bgi8rx7dam9727v936h5ap81fx4k9n708002raw9v69p8yva5v6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.20"; sha256 = "0h6f18k05w66797yyj7yqbf6jv5k3c5r089mkw43y4gbqz27vbmy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.20"; sha256 = "1xlqjar4j0g1a7wf8ixjpnn6i19zxr3c7pwr6jdn06yzbi20ri7q"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.20"; sha256 = "0l2md2g657arlf703vf9y8x1k0zx50zf4wy4f96m6qgs9jx8s6py"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.20"; sha256 = "1r2nxc0nm2n5dc7laf65yqbjv23g9fzwcvv8vhrnvir6j3lgxfcl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.20"; sha256 = "1n0dz6k338wmadkgb7x0jywz2qxf3427wkjw8xn2zdz4m1fcj58c"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.20"; sha256 = "05srdy7bvgasr0yx1mxkilbkls14k0dmp4mzc7jiqv7xspc4jwwn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.20"; sha256 = "00npza90sgnvls4k1k95mhgiw5fpxcrxf60fi17k871m6igdfh1q"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.20"; sha256 = "1q86xz3v8p24728bl7sw0flhzk042ygxa23k0qyhxdn0qwzzq6bw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.20"; sha256 = "1jjb4jsnm0f1q0s8199nympm9vifaa129l0bj4j1z94i1g85nw1w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.20"; sha256 = "0cn8j76jbbp6vpf00kr1wwr4z1ij0sgdymawff32qvj44wfmhpnl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.20"; sha256 = "0cbk7shnry75p95zyg14pszf396pgpyjwzhraqbds5mmncqisvgz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.20"; sha256 = "02fz22di6ax1819spb4v22nb89glp3h08kk88am6rx3vgb440sbm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.20"; sha256 = "0wvg2rfp4v8cnqkfjv4ifj9q0bd3vljqnbnf719nf1h0ilmcxcjx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.20"; sha256 = "1mq59gpd6p46zl2nl5ijjncghx6fms9nig9zqhxazjd15bqy0l33"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.20"; sha256 = "01xpgbphknkjqgsbcngvckg3a8q0y74g409v7hmxsh7rjcradnqd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.20"; sha256 = "155z494bpri732h1yba6ggmalgwxw68qjpyrbzfj9mi4whwy6p47"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.20"; sha256 = "021mg80b9x25jpdm2rc6m91wib15bb5arkxjjfa0cp509i5hnshi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.20"; sha256 = "0jpxs82ndrbs3r28951v0p31ngfkhcs0k7plgywyvd1lpkvdm2nh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.20"; sha256 = "0bcnw653m7w7if6z84rf4k3mr7hdmvnlv4icflk0kc5jd98bkvhc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.20"; sha256 = "03107bdy4i9sckpwnk9s497sfq1prl4mccbc3mak43vbnfyqrsad"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.20"; sha256 = "1lhlaj2ra25jjr6f6rq5rw4wg981h9js7amld10ccyg2vfrswv9d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.20"; sha256 = "1w5r2nv27h3csd5qd3sx2zmf5drrp3ygb519m4hvn5lazyfah5p6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.20"; sha256 = "0r002hclq07y275qwj5pq0nxmb6k8h8yglcynpvw8m0pz8d9mr9g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.20"; sha256 = "0msncsn0lz0dvc6clvc4blq8a1bv5qap7qx27fdibdx24i5lsjya"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.20"; sha256 = "13x37m9mdg8pvq1rzcrr4bp5yqaayz7173p39s623n8zjxrh60ww"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.20"; sha256 = "1cv1zmkiz114vk0b0spnnczagbcks5k1fb198lc88pi3c9dpfm0d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.20"; sha256 = "0wpf2p1476ns8xd5qvih5llswag133q4s6mj62yzbba890lg5y78"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "02iri99mhfq9awdymsqhg86pg6qfgfig2r2w96jm9lbx4gkg1rgm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0g24nr6v86nikikfvg2b3d8im9cp1hib3xiccklbhkpbym3y98dj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "1dldykby8yfvq7r7kmlg5wi6spy1ngsxbs18ng34lcqjfxjjdnpb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "07ip7aflkg89gsbfm1w7sgidn4lvc3csrirzkbdv2jhm876bxz2y"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "13pvjwqlacls6hz719lwc6rz0ghs29gxywisldwnwwbm9i6wdnga"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "15qwwdf3c03gs916r3k49wwg411cmrf5xldydkxjjab8pavdlq0s"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "1mjwlxy5gy7k2iil1jcrssqspn3hrpm2dqwghzx9dr61wvpl6sq6"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "0dwpzaasn5044aqm2xix3czfgrwx0y0jwis6p0x8n8jdqyskpim2"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "0ai75b700v76rmqlblxpkwsd97jidfd5kn3jl0y52yq0ylvc4zyf"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "1jkh7kjhaghslhlx6x7w03kdxi1xbrgxwdj9qav0ci7nvf5j00v6"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "0k5skgnss5hknr4r15gxph54zhk65cnglp117gih8qxyzn0245m7"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1kllpbyldix05ab1pb775ykxwh9lrcji9vqbyp964b8m68r9yf1h"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "0a5gajmkchf2ad3zwmjaa6mw72snf6hrf3xz581mn8qnjjv68whj"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0xsyd8jvj39z99ga9x26g1fi4zi39pf3ym87fr9102bg5rllj8m6"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "18jp8cykpj40r61ji5fpvfj7yw6cw041l6r4q30am9sj80sgq73m"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "086cn7jilskr7q2hfy810f4hshzhm9r6kvd2kjzvjwf93s0qfgya"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "11y8c16m63kb1masa0x7ympwjg93ffyp4yfycd0fcf0zhzyw00bx"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "175qh1czpm8vs0ifbg3iwgz2cn3v0rvd51g1k81k6j00z9gmhrsm"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "098177bqda2viwzcabsxrpj1p45jqi5fnyfg9xnnw198gh0iskvj"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "180bkmdr4h14a8l2gs9khm835037pw8aqgjz4snx6wxhq7jbdypr"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "0jdvi1pcb3fxqa01633asixs93rg1lfq98vnba018nbqdifqyvf1"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "09can99m6psr9v93awwkahyxq899sg1l6p8gpp4qscqwpil22r4c"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "0idzsi16ny8bjhii6fwjwqn8wmy8x4q2y0zx4d1vmxfx51ym634f"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1k5yigh196dn961bbvbyy8jfvw8ghmk4da313a304b4m9rf6q5c6"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "1rnpmqmgdw2y9snjj3kp2irg1aggkq2lccd7v4q53ghnl55jdil8"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0xibpawi6nahdbrdcb71panhx4w5zlmbfxspwmljn2a77sy9caw7"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "07qrpww6nd67xjj3jin97jwiymyxgpm9mdg4raxs9ss0pc05l5xv"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "0dskgn19yhsq28hvzqs422bq64y5gx5cx33m1m3zq8mfycvscnsv"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "0k70cb1lh6j9qg4pjy6r58z0n5xip3l6i6vkgrdx2rqqvpmq2ky8"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "1qr458jrmsb9nijll88hp56msjmvnk20q73x7qypvqlydsn2ap3y"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "1503pddh5klr3z9kpmbxnr4w472v1w8ggh37iqi79z3b0x72zzi6"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "09ddji35a92iq9f4rm5xmz1vi3bki75xskq3iypjbc52ar7wkfl1"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "03338hfl2sb8ca9v3a42b4fgr7qyv3r2khc0ydhif45r0xjx6zrx"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0lnm29n2z4r7kjwyfa5gbl8qc5nbbc5qkl9kg8vj2xb9mlk5zsmz"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "15ah793265ikivb5iqblcl4x86g4bqgwmhdlhikgv6a18bq32sjz"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1jnz72f7m292863wvpmm12gwdnqwbvm45br1958f0gkgp0zmhyjs"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "18k3qs54a4x342ypc0p54ch6xwx9wpfgb5f6iyw0i0f8jjxspbay"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0nyk8x3myh6b0jfka8mvxbhlzl38qiljky8acfkyvw4dzw0y63rb"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "0541ykf9hhc56jin59lg5iw96apcg740wg1hrj0m8dagjll2c599"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "09dlmiqcscdrvjrg9w5mjlz59ly0la4as4hkadz6j4mqvv2k7j6y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.20"; sha256 = "11bcpf986m4wzrln9v4frh63arrg9r3vmv2lq7x338xnrwxadz8q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.20"; sha256 = "0i07x8kwsifhzkbx1j8argx31g9dxppqwaysn21cd623d16r2g1i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.20"; sha256 = "0aq01ld9k4064bgki4q4g4fl08i82pnh5xgxaqk3k48nbsbrzvwc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.20"; sha256 = "18an54s6jldf330ckigig6s1xnadm7zygrlb35qrhawvygbqayal"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.20"; sha256 = "1fv6p9idx6g58y0khw7jl23lkwj01l8246mv045i9q6sp3fm9m2v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.20"; sha256 = "0qfv5w1s5pj3c46jx2g75parx12p40rywacvb7v0fbllj2nvm89r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.20"; sha256 = "10d13b4vl5nhk3iqcpbhdhqgwmymzx875w4yq3pwjkcc2vyhg3j5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.20"; sha256 = "1rbl46pfwh1hkbf5djy1khqyiv2fivkgxs0gcnpx0kpx4lncf73a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.20"; sha256 = "03760jw9bbhcg5gmx5z5xjyccl0sv1lzznk3hx2ynwrwg6dhbkyi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.20"; sha256 = "1gw4wlraqbr5m5w62wyfx7gsvyj92a8h7i04n9jgc6sfs4yfrsz4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.20"; sha256 = "0fcph5pd0myyzzl3ihnvp6wii4vl09ayri5ba12xgixb3qidskgp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.20"; sha256 = "1zxpbwc52xsylc6kwk0sqf24cgyv9b2cz9l3icpl1hnkqims9xy4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.20"; sha256 = "1jhw9f2mzx8a1bqdiq7ylk8nccwcqa57sd31ykd7lzq1wbhy2r45"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "11l84kx7v6y10kzlsr74kwvvz44wzj476m5mkm2xv2b8pv1z0i7z"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "11xxvyals3q16bzjd7a4gg0nzidsm822aa92yd752jzcxchdn6z0"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "0dg1m80mxvabdkqjgynnws6vlzj9469d5nrjnk5x2zqcsw9kjj08"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "0rdq3z66azlwsak8n8j9jz8pj0lwsvz9f7n6k7x6mlz20wcw4qs6"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "02ymh38rj3pwak3g9qhviv64kqpclcp40paijg7m184y5bli68b3"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0s9bca6p8j96as25r22vbcmyyhbavkczdk68ypd7qn4g1s44l34w"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "1mi25ilkzw9375lybrmi78g24xzmcz7mnqgjf8y9qvivwsf7ysgn"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "15jfwa5fva8qz6g2gnbxnppd9cfs7r8fspc9xb7n9zgxl7w5n6gd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.20"; sha256 = "1xvhyafgxaraf97s364a3jk5dad4hsssqqvzx4i8qwg36fdijcq2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.20"; sha256 = "1r27bm12x9gwzv0cid1fdzx9hv9bdy6p6a65lypjzvgwfdgnyksv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.20"; sha256 = "039l3qdsz3ima2jgvp8nqby68cr9mvj8q2xd0lmx37drxvck7bx4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.20"; sha256 = "05zybhb8dc22f934gj3f55xvsfvqizq0nf4d29ns3z9d370jklp3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.20"; sha256 = "01rrnbwjpy138pra53ypixk3cr528fazjsl3vsrvf6jnymgxlb4y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.20"; sha256 = "0g09yyi0a00q9xa51p1k9hvdj20jmy1ss2r2l28zk9s7lwyih7kl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.20"; sha256 = "09kb949p1qc6rz6mf736id8qfsj6dq8azbrpzx19xzpnylqjch47"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.20"; sha256 = "0l76v2w34igvh6i2hgvhfwmkcch1574ylwl1159649pg7c95kj7c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.20"; sha256 = "1jj2mzcn1dd66fic37wnyrvd07fplrsdj4azrvi0qz3qyykc8wmj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.20"; sha256 = "0q8i69qc58kyxzxfz0cqjlbjcz1n3p130nz2q852rvvcxa4644zc"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "09xk16nb9wrsgjr531dhd7mvpqa7b50akmkqrlndyspma7cbvrzn"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0l82bqvqw5qqhkgrxfscc4dw197b5sh7ic63pymdhixvx0d3fi1h"; }) - (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"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "0iyn0rkf9vf7vbd58xs24209557dzq1dppjb5d35g39z2kh06k1c"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "1b0ys3g3bg9kxxvs1h1kj79b9n9nl2g6hjhmb3c2cpp4slzlsd3d"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "14nq8b869k43chsn4ba3b3ww9w25fip39ik8rfxa1z8l5k4k6xb0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "1gajqvzf18p0jppvcwky0shkmw4nzwz8hzx4kwblrs41d8xmw39a"; }) + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.20"; hash = "sha256-OEDXXjQ1HDRPiA4Y1zPr1xUeH6wlzTCJpts+DZL61wI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-9eXw5iN90VSlSVxk8aJ7Dpt3DXoQ6+obVwk7WFOKOQo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.20"; hash = "sha256-W9RU3bja4BQLAbsaIhANQPJJh6DycDiBR+WZ3mK6Zrs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-sqHkR/XrTrjoZCz2sSIMl6UaURtLvO1mnNEatE22RDw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-69omZXcSM0rGsyjo1fWzwV9tIi+P1nnywdt55Nf0jbY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-Xvy+zEEVSrHbmj/HrNlgmxLb4tOHh+qWfgm9SZ06Nx4="; }) + (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-Ctj9D/SUldo8X8lYSQ8N3sRNDM1CJDs8FKIaOYgwJjE="; }) ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.20"; hash = "sha256-49IpwRkt/aFtEo04C/CPeDu9eyluyEdGckKwhhZc/hc="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.20"; hash = "sha256-nizaX/VWGrez3oNq+ZVDomQ2Zo/Xj6LyRSP4K/myOQc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-7jC6NKfeXJDowb/aFpzSSWisrGt/mzu+Zt1hgr8Lg4U="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.20"; hash = "sha256-dB4YPadHp/mRoCILrYOvEgjZNkwz3FBUTxgABaL3CTw="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-LEwD4BQ/jVdGK0ve2wL+7ZSSgCBCd1Ta2sft5GYG1kc="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.20"; hash = "sha256-AjMZmzPjcYwi6X9jrLWGpKlWphyKmKFPciqr/pzycPc="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.20"; hash = "sha256-W09vX3P87S+vp8Uoc41vK22Y+m8utMjA/vylLkJdR+Q="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-UdYeRmRNstyV4QFiNOmfQWARN9/j9ov/37tafcod+CA="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.20"; hash = "sha256-pK8z2e65ndErBa0LjOSuKTNk/MIW3f2kUDWOrxseNA0="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-jsGx6b/etx7Zj1FqvZQmGbBBZzPOCGvJSFFhLdGoiNk="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.20"; hash = "sha256-7MhZEjvvJmJSCYFy6skpATI2K3dwPyiigftFMrjY5lA="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.20"; hash = "sha256-h0AmMfX2/p5C/zevrxBuRmqHUYtmHFfNz4bhcBNJayY="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-bTRNP9XkXibYWBVKaJ6gNtm00pEzwKB37zO9Nd7QHqw="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "7.0.20"; hash = "sha256-dXex6q5gQcBJ5Xccf27GxrTAvTlJyTC5i9Ln0IWBjJA="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-YHUzySwU/aC6y2jGNG50RfDE+VhDLWI1ZIPMZNBC2JI="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "7.0.20"; hash = "sha256-5nZu1DgEqIy5HufEOE/4wyXuVyUWSozmpMh/+kqt95A="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-Kg1eO2qB6EwXn6R/iD7/lvA6oQZ+crbvleCi4P7GUr0="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "7.0.20"; hash = "sha256-T6M4ND0K6i9CI5g08rgaPpECR2968YsJ2+2N2FsKYz4="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.20"; hash = "sha256-h4AheC6chrmBEjSK78h9yOpNXYoQSlDI1CGoc7KhYSk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.20"; hash = "sha256-1F5YHSdEbiyGc1xV354GMoZPMuchTwDc3eauJc2RyDI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.20"; hash = "sha256-DO65UGqysAkmdSySTe2uDZ5cxyQuE/SNi4efOorhli0="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-zn/CNvUAe1E8oHLYWZprUZ7UNJ+300VxzeZsAM4qJyo="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-ZgMgi9v2RAa2wkk23l9ePcTe5gD8dNMppBo+BeU8cMo="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-pxYigP2+YwTjOyFc+iwrZsJPCrz9lZBJthMWre2bukw="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-MDifMjIVLWLS9QvvFCXLNEHepy/nrBuWKqDHRv26lM4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.20"; hash = "sha256-OaG6rZCULgf2WZsp7jMgV4Se1S3niS4NYUPeogMv22E="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.20"; hash = "sha256-ewal9R6o20GV0R02ylSijVFdWZAbdN8TK1PCc/ltHBQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.20"; hash = "sha256-/20dMbO1Ft0WVhl+Lv1916Thvr4kPP9LuuX4bKE+czE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.20"; hash = "sha256-TemMvbNrDzJVHWwxVgnNN2CnTyI6TcvvZDpF4ts6IAw="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-6tnGTUx1cW55ozpy318SGj7ws2GcpnA+NJoyRTGX+44="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-GmDatrpoKSn7bL7RXlyuLATyOE9kjmxC0m8ANlzjHJc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-BmtD7+bB5Jb6h4/jJurNcNirsdaZyUBjFPP4V3ynXNY="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-osY7tcdNIos6uEZHLoEHnefnPhs9dlGxIgQUq5X6lzc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.20"; hash = "sha256-RY4H/RaMTcnvwJ7wclD/1Vf+MGxwXYbjmNAWuskaoYE="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.20"; hash = "sha256-vq59xMfrET8InzUhkAsbs2xp3ML+SO9POsbwAiYKzkA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.20"; hash = "sha256-Y1Dg8Sqhya86xD+9aJOuznT4mJUyFmoF/YZc0+5LBdc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.20"; hash = "sha256-L+WaGvoXVMT3tZ7R5xFE06zaLcC3SI7LEf4ATBkUAGQ="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-wW2PXWx4WRSAWnajhB0NL4+ke9RqDBOAwt2NxW6Iu0k="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-jGQhaLwcM43JvQ9dQ8PTKSHcPVSTczXSTllfU1OyiiU="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-jgxTfSjd9bpDI/0DLzDpyFeOLOaSOxMjlAt5a0LUv0U="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-hhVsXE6VLAKGGmGoRmaFD/HtJPJ+7bWCSbaZFOCLvsw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.20"; hash = "sha256-0c8Fm3k8c+tFh2Pa/2nYGlDGvOzll15feQyulbgE5gw="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.20"; hash = "sha256-fBn8P8fAtg49BnMI1Z8XBMwPqQNcH7qQOERctMfvBuE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.20"; hash = "sha256-GP2mOs+2ozH6wVTsukdOL2c1DMyO7GRp/pxUg5K7bIU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.20"; hash = "sha256-jO+fl14WkTkmVv31Au0VKCJAHXkEkzjfIgaQmRoNACs="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-/0Tww75oid1FnbVUc4j8nJC/N5/kZE3/BMGbffokiIY="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-4BvbIOvsS1FO8yIpJQSqusVvwXtEnSb/MgEPTZXfvYc="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-CEg5E9cMf9HLtDLb0pIhSX66jebW+ifxbEvtXgGq4TU="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-RmPCGQfi02r6mcYel/7WnAJ50ZdJIoum0px+ZcwfuGU="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.20"; hash = "sha256-H+de/nhNSKXug7pXxceJ6/dqk6oPx0Ft0ag72lk6JnI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.20"; hash = "sha256-dWlAyHp79GyqQmhOBOC49CW0rBCbrKtTQKErE5sQ3wk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.20"; hash = "sha256-LW2us9viecZAaLSqo2WCAaXHCc8FZ+NMlrIIlYVUFNI="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-EnJktpQWI1sDKr8Pl6FxVovDq1FKVv5HU8JBNqtUryg="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-piJJaS5vCRBSdgdVP9xNI34SXXhG9KReSj8NuSVqXnc="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-dRz8NEBSp6rAwCQbGgjgzHB/pNvXlSiDyYDIOz1DV6I="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-yj+HgR7Jcbm/nKLtaXKq8EMNiQMBeQcFPnlqGuWxzCA="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.20"; hash = "sha256-Zhe1PbrJ7MRVFgAgcGyapLuArirQjLSPOKmqdnpG8S0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.20"; hash = "sha256-XbLOKo0ABmdTOM4uiyXdoy2Ak3SRbOkmtgxtcl0Wb3M="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.20"; hash = "sha256-5haonP+KFrshqSmU9fy4Obfi6hddj4ZL02zAI7YVufA="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-fQHA/YcfOOZAY955cr1zIz3Jb/WnA6VVDWsOU01gyIc="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-VWdYX/oASDMDmuGF0nYGe1gm/uNxvOUi0BvV+1mAuJw="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-ck8dAXwoBW5tT89560rEspAb5M1dL8U+j1uohtc5ASU="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-+fq25MGwc9OtJl8+rBC/Z4AyUIUz6ScoUiRAkludC6A="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.20"; hash = "sha256-ahzHLCX9TtCvZQ/o/uaOTuzoMZzBy1bcmjBA7q4hdOU="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.20"; hash = "sha256-PHBb0AuRpB8kkQvQJIJSLu5Ub/U2pYA0wMGBarUkS8o="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.20"; hash = "sha256-MTyRTWhDmMaCsNorju/tLb0w+ssKydDX/NBFzSfqB0Q="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.20"; hash = "sha256-VHmF1/ObK5hxGYvm5/+pTdketHnxxcnAGK5RaTQpVqE="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-YyET6SqeoFDPk1FdQC6j7OJJzI4b4vTGVPwOmdGA1Qs="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-nAxKiA6PWHza9cjM9tncakHvK1tbiFyEViZJdI1iK2k="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-9ml/nOY7bpw8cvJhW89n9XciHjqx5uVpOSPxP2ksItY="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-7Rlb+KH9/WTP6old7VA+2rHU7rV92See+Rip7YriTpY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.20"; hash = "sha256-5OvsPNFOG/ZksgTEA5ESSfqt3+nOc2F4qSUvrDLlhL8="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.20"; hash = "sha256-+MQMRFzfG2CbNJnfw0buP4VorL2yR+T4UeEBSbKSmPY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.20"; hash = "sha256-DdumMpP5QN0rPDsB8sjxACM13mT7Wbb0w3LaCe96twc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.20"; hash = "sha256-yktNSySitxWbO6LjcxUuewWFMF2EbcoM2w18CqxmVlc="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-iMYmS6EWvlEw2acxRgWe76nwchR3DimtTl7w9iqu1+Y="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-hyuWvD5HCStp5Vd3tyr9hZMOrbrhLNbyalBZE7m6K3Y="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-uxdaALtA66S7yuS1mup93VcfuTzJRjmk7Mc0azi/GR8="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-W1umN/OuIvxHDXWMzkp/xRODlxBE478hElhDn4J9Uzc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.20"; hash = "sha256-903dIh6rx9dFUKvE7FUCdJMYubnbwjjo/95X0G6Blzk="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.20"; hash = "sha256-/hqNukz6YVNNcsRz4j4o/YMZOvLJ7QGOo1mdYp5oVVA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.20"; hash = "sha256-h1zjOeQk1iTdX9lfiZHhnT+q6ntGLR+gGCfmu0giv5Q="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.20"; hash = "sha256-nAMDc5cf2SGMTuOOE873SmFf7iI5s58D3he9VlM9o48="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-yE+B690YZ9FbfnObaOi4sRcLPirZeHnJw0kaSMNi4Ew="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-flwlrG6e4n09Pn0cDMS0u0pdTbkQIUpltGnpmiUqJOM="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-Jv4vTgdr/HQijmfA9xAPWxzCSbZ91TvTH5nOAlu7A5Q="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-gbrJT1aisCWvjwNP3cuJc424w6+91ExcwlEkVUaUrSU="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.20"; hash = "sha256-lLn+6JAmx20z3Ghvxr9Lb4gtF/bFOEUPa8WKagHrVuQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.20"; hash = "sha256-EWoLS0ygXAaUk7LPrMpaJazIQ6qGZVHblUX0tAB6NQg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.20"; hash = "sha256-DVR3W2IjXoQYRSksF2bRk62nPrP2arDA3CSEH2f9YbM="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-PX/TZQe5EBdh84DBKfLYHp/8HFmCqLGTYmhpQR1EYww="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-v+pfJq1pdSE3ejPRiQtbyxaGEV2vKOe5nCeTL2wS1VI="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-X2ox8EJBmf1mhLTByh9e5BnUCWV04VjWjjMWI0Y6UJU="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-WnpYP7hvPuBQSSGvQupeHNvGnwi13s2HQSKJepw438o="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.20"; hash = "sha256-xPeka8TTwkAvi4Omz8RK2z9GhMMaTD4No153URhft/8="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.20"; hash = "sha256-DBXJXKjkty9sR1xOfgQZrmPxuZegn/VmU5WjMab5Ddg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.20"; hash = "sha256-0Ira9rw0tO25f/SeCTSD0z0bxgU7lIREHnrlZgXS/Uo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.20"; hash = "sha256-6PjyKEhIrfW9MLIaTfAY4SmuKS0wblxaR9qaQ8IV7nI="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-Xq2ru5TIgQi4j8aV9dzlqfNuICPlAna9IKMTRYrGY6I="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-Kw/jAf+N8O2nYwr5KWnEaNBP4eq7IjWdBMtAX0dH01s="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-KRUmKJVPNVSBzDA8Dsh57CqTeCyPpmKjNIVBmNz0gRQ="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-3sgzxd64Eml+UxMSrYiiwNNUPpW18PSy3LkxzXCstCU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.20"; hash = "sha256-hWTh4eIBf3ra9GE0fYrCjDNm0aT+4NjwCgr1X4VLHMo="; }) + ]; + }; + in rec { release_7_0 = "7.0.20"; aspnetcore_7_0 = buildAspNetCore { version = "7.0.20"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/09e67261-215a-4003-bcf8-f90d67dcd02b/b32cf12a5c10b1f74e21c8cb03880891/aspnetcore-runtime-7.0.20-linux-x64.tar.gz"; - sha512 = "62ed9743972043a72e48d5aa2f7fdf3483cf684a32b051315004d1c778e9712bf66e5e7a97a5a53993fa8e92daf5bacaf2cdb3eae44bb9a9e25532b9a80f4f70"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/7e8680cf-0baa-4957-99b7-81395b8ff60d/5a9c578ff9aaefc7ed77e63b6a90dc03/aspnetcore-runtime-7.0.20-linux-arm.tar.gz"; + hash = "sha512-6Cuw8dUtkf6mvtQZoYVhKC7Q6d425WTmQeKWyRf39l/HVVzMBG/tZ1rWe058UKcPD0joVZ/08qm7rSvGLc9qsw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ae3027ce-cadf-4510-a1aa-125958cf0432/c3d958ba80ec21e9d75ca5e8f43ec2d3/aspnetcore-runtime-7.0.20-linux-arm64.tar.gz"; + hash = "sha512-37HBvvTYJt79PZlVmaXAPhvxpkxl2YtnXWwF27c4DZgjOVPmjVP8Xr7GCtTvdUFwc/sfsyVqAXa7lk8OARYfbA=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/09e67261-215a-4003-bcf8-f90d67dcd02b/b32cf12a5c10b1f74e21c8cb03880891/aspnetcore-runtime-7.0.20-linux-x64.tar.gz"; + hash = "sha512-Yu2XQ5cgQ6cuSNWqL3/fNIPPaEoysFExUATRx3jpcSv2bl56l6WlOZP6jpLa9brK8s2z6uRLuaniVTK5qA9PcA=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ae3027ce-cadf-4510-a1aa-125958cf0432/c3d958ba80ec21e9d75ca5e8f43ec2d3/aspnetcore-runtime-7.0.20-linux-arm64.tar.gz"; - sha512 = "dfb1c1bef4d826defd3d995599a5c03e1bf1a64c65d98b675d6c05dbb7380d98233953e68d53fc5ebec60ad4ef75417073fb1fb3256a0176bb964f0e01161f6c"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/40131679-906c-4afd-90f0-576fbed036b1/85a0c856077ad82c29350486ebdb912d/aspnetcore-runtime-7.0.20-linux-musl-arm.tar.gz"; + hash = "sha512-yoTg7/BS1Ft/qa/Ypo8dViZBVbUHiBEF0gaWmSIFe/MyiVo8OioXAmSORnEvAiV02Trhh8j9JhD4OSkJVoq/Vg=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/65fff3f3-1b87-42aa-b1f9-04e7e318c1af/4bfbb002455b9a037e75791e99a18c19/aspnetcore-runtime-7.0.20-osx-x64.tar.gz"; - sha512 = "00677819450d14d9adc2b65f25b9a069bc2b43f72e4db651e77fe0e48320be8eb7c555277281de968e75d0fb19bef960d4dcb27161b8c57bce076ee18bb5ca98"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/6ef9e16e-9a83-401e-8ef5-905ef374b768/725507d68a8bc4a4297e2c82bb1d06db/aspnetcore-runtime-7.0.20-linux-musl-arm64.tar.gz"; + hash = "sha512-ZUBuFxSjEX2qNCs/0NvNXDIUMVYR6su9hYCCf2mgepSAUwMgukBpKj1tv/gy2SmhQgB58dswyj/Wem/QNRSdBA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/2833b957-8fb7-45fa-bf85-4960260ae344/fa4678e8c3ceba67771b5195a2343049/aspnetcore-runtime-7.0.20-osx-arm64.tar.gz"; - sha512 = "7de161ea45faef7693d78ca44b585ab73fc183232d3f8d229fde3d05d696818d8d6402ac7ac86ce239a0a6cdae8fc2eafbb445e99443d0c7a4aab3781df35be6"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/a3f5953c-68f8-48e1-91bb-0ca62199e6db/b3d7a2de0488fd63fa286c3fc371d68f/aspnetcore-runtime-7.0.20-linux-musl-x64.tar.gz"; + hash = "sha512-qA8xGTr3DVVujQJtOdeYY8g4mwZf4HeOe0Ng99H202UDulJzbEDnSnFsPDBQCxhYFu1g15sGrilXVLZzdKH6RQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/2833b957-8fb7-45fa-bf85-4960260ae344/fa4678e8c3ceba67771b5195a2343049/aspnetcore-runtime-7.0.20-osx-arm64.tar.gz"; + hash = "sha512-feFh6kX673aT14ykS1hatz/BgyMtP40in949BdaWgY2NZAKseshs4jmgps2uj8Lq+7RF6ZRD0MekqrN4HfNb5g=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/65fff3f3-1b87-42aa-b1f9-04e7e318c1af/4bfbb002455b9a037e75791e99a18c19/aspnetcore-runtime-7.0.20-osx-x64.tar.gz"; + hash = "sha512-AGd4GUUNFNmtwrZfJbmgabwrQ/cuTbZR53/g5IMgvo63xVUncoHelo510PsZvvlg1NyycWG4xXvOB27hi7XKmA=="; }; }; }; @@ -148,21 +210,37 @@ in rec { runtime_7_0 = buildNetRuntime { version = "7.0.20"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/2c5981ff-0f0c-47ab-bff4-0ea4919b395b/cbfdfa7f35d133b0bdef87fa3830bfa0/dotnet-runtime-7.0.20-linux-x64.tar.gz"; - sha512 = "87855297338555a7b577d7e314e5dbf2c2350f8c867a489cd1e535634bad5c123a1871464d37fc9421837ff5d426c2eadecbe0f60bbf3fd32bc2461f47790a40"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/06e8869b-e332-411b-aea2-7e29daae6953/6b8f60cbb630acd5d94219faa15faf6f/dotnet-runtime-7.0.20-linux-arm.tar.gz"; + hash = "sha512-okqnr+R45ir052xA5j5eXoMkqwHZrZz/MYMkXN63CGH/wRjJq9qfLy/tQjc1yieqwVvsjMX8NS8FvVtyYmWEmg=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/af6e12de-a63c-449f-b35b-b72ec6ee3da5/ae129eca3d734117d14cd5965dca93a3/dotnet-runtime-7.0.20-linux-arm64.tar.gz"; + hash = "sha512-wkUSXuJwglIRmhVEVW4aqeAKoYsjA95ph32hDGwX4/JQJLdJypO1O+du4Ojkp11AP3AZuLwuUO0SePZWyy9+Bg=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/2c5981ff-0f0c-47ab-bff4-0ea4919b395b/cbfdfa7f35d133b0bdef87fa3830bfa0/dotnet-runtime-7.0.20-linux-x64.tar.gz"; + hash = "sha512-h4VSlzOFVae1d9fjFOXb8sI1D4yGekic0eU1Y0utXBI6GHFGTTf8lCGDf/XUJsLq3svg9gu/P9MrwkYfR3kKQA=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/7d1ca778-4415-451e-873a-dc4062d8d9a9/f38f41e5784c0832e24fe18a938ed5e5/dotnet-runtime-7.0.20-linux-musl-arm.tar.gz"; + hash = "sha512-JczDc9HEwOt0HgSMb9SDZjELNqxvBoxQ9rwBNCoABGQUToRX5+G2zPbZlUTUkUAi78uCTnVjZRe79hyUhSzddA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c30b2e10-7c18-447c-b66b-47bf12f88692/0d5fbdecc6b2cc86fd2f43ebfffd7aa2/dotnet-runtime-7.0.20-linux-musl-arm64.tar.gz"; + hash = "sha512-VSynNGf4BD01HCDXHflbqWOzLox1cG329dP85SXz798TFN8pbET77a1VdXguN2M5mKebLCP390IPgU7iSI8wog=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/af6e12de-a63c-449f-b35b-b72ec6ee3da5/ae129eca3d734117d14cd5965dca93a3/dotnet-runtime-7.0.20-linux-arm64.tar.gz"; - sha512 = "c245125ee2708252119a1544556e1aa9e00aa18b2303de69877da10c6c17e3f25024b749ca93b53be76ee0e8e4a75d403f7019b8bc2e50ed1278f656cb2f7e06"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3297a5d6-9f41-4098-9597-c1b966c19983/46559d0d813b36264fb414562caca171/dotnet-runtime-7.0.20-linux-musl-x64.tar.gz"; + hash = "sha512-MbnaCNYzzQAo6wjDbuLFw8sb5tPF4BDIWuKRSW/l6Bi1vln11Hr/hu2TnCYPdi5X/waTSk0JVDdpNbGtx5nxvw=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/cbade9d9-be1e-46c0-9f90-13ba882965dc/31c86e8f4beaf0e5ad9ad35a408be7de/dotnet-runtime-7.0.20-osx-x64.tar.gz"; - sha512 = "acdcde92f2f2e43584ee59be447f778f4a152c308975c7bdc5c2372b5bbd3092eb9d2233aec3b82756ba1e352a0877ffc17e4c8cfb20a9de91ca6db54d79b591"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/50dbf5c1-942d-4fd8-b646-1f024326ec1c/5fb99e9dae294298a8131757b3ea829e/dotnet-runtime-7.0.20-osx-arm64.tar.gz"; + hash = "sha512-rxy2LinGlkjr4zTmUcJwPNXof6C7KMZwuss7PdFgiurjWuU0AsXrTti/NKvYMaCMy174Tl7HBhfZ+NmWn+e4+g=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/50dbf5c1-942d-4fd8-b646-1f024326ec1c/5fb99e9dae294298a8131757b3ea829e/dotnet-runtime-7.0.20-osx-arm64.tar.gz"; - sha512 = "af1cb62e29c69648ebe334e651c2703cd5e87fa0bb28c670bacb3b3dd1608aeae35ae53402c5eb4ed8bf34abd831a08ccb5ef84e5ec70617d9f8d9969fe7b8fa"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/cbade9d9-be1e-46c0-9f90-13ba882965dc/31c86e8f4beaf0e5ad9ad35a408be7de/dotnet-runtime-7.0.20-osx-x64.tar.gz"; + hash = "sha512-rNzekvLy5DWE7lm+RH93j0oVLDCJdce9xcI3K1u9MJLrnSIzrsO4J1a6HjUqCHf/wX5MjPsgqd6Rym21TXm1kQ=="; }; }; }; @@ -170,70 +248,118 @@ in rec { sdk_7_0_4xx = buildNetSdk { version = "7.0.410"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/0ddc1522-2361-4394-97e9-52318bf51951/c5aef30601a86810f1f8ea89d42c26a0/dotnet-sdk-7.0.410-linux-x64.tar.gz"; - sha512 = "20b8e02979328e4c4a14493f7791ed419aabd0175233db80cd60e2c004b829b3e8301281ea86b27ba818372473accf5a6d553e5354c54917c8e84d25f5855caa"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/4b1d565b-7a3d-4e7e-87ad-7c662ec59020/4c6cb8a150efb42f7cea7e0b4c2f61cf/dotnet-sdk-7.0.410-linux-arm.tar.gz"; + hash = "sha512-lbY5oUddm3Y31BoUwMqzmTs6K0vmPb8lH/74QEYcUdnV7NeO8JyFf+KDmRVfekBEngjHozzgiFDE4Y76q6tFrA=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/3e408891-74af-4ccb-9ce8-895f6806a97d/3a589bbf6e264059544cef47be672540/dotnet-sdk-7.0.410-linux-arm64.tar.gz"; - sha512 = "2db6a3b9a532d2f59a2b459e634206913a9585c821f3f578a421e3bae346a92dd9b85b76ebde343ca3057275f7ec4d0bca71cbb7f2badb6dcdb516244e84da46"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3e408891-74af-4ccb-9ce8-895f6806a97d/3a589bbf6e264059544cef47be672540/dotnet-sdk-7.0.410-linux-arm64.tar.gz"; + hash = "sha512-LbajuaUy0vWaK0WeY0IGkTqVhcgh8/V4pCHjuuNGqS3ZuFt26940PKMFcnX37E0LynHLt/K6223NtRYkToTaRg=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/fc8614cd-f333-4adb-815a-9bbd07e02b16/0ccf5e50cf8fa5c600716395e240aff1/dotnet-sdk-7.0.410-osx-x64.tar.gz"; - sha512 = "782e15c19ce20aa8333566f23c2d3cdb8e89c7626de6330ddf670c4426e30cc854e44ff3341578622aecf210fa66ddcb63a7d2ad629ed92cb5582ab670f953d2"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0ddc1522-2361-4394-97e9-52318bf51951/c5aef30601a86810f1f8ea89d42c26a0/dotnet-sdk-7.0.410-linux-x64.tar.gz"; + hash = "sha512-ILjgKXkyjkxKFEk/d5HtQZqr0BdSM9uAzWDiwAS4KbPoMBKB6oaye6gYNyRzrM9abVU+U1TFSRfI6E0l9YVcqg=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/bfba06ea-d182-4a12-8066-fd78413e6cc3/f7940d1e8d8ae641a3a3d65b6bfa1071/dotnet-sdk-7.0.410-osx-arm64.tar.gz"; - sha512 = "c0ef1914f2b298504433bca9cdab02dcf324421ece39657b66523f13b7a7166e726783673a602fb462f3db5c53f59a89381b918e7658d49a57763b43cf75cedc"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/fb542b02-38a4-4564-bc66-d7822758cf1c/d18f1e24ef1b3cdb4ef10bc641ce9a5b/dotnet-sdk-7.0.410-linux-musl-arm.tar.gz"; + hash = "sha512-x7Gc3yExJkVv5/IBcf+/XMQXcjBbR9jQbGRhKlCeiRMSZAXKjqW2T5P/TSz+op+hKGcdQO8jrWadi0coIjjfwQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/7e1f9446-53ee-469e-8dde-cc307306ac61/bce850d1c118b4b6dcf9f808b22a8a54/dotnet-sdk-7.0.410-linux-musl-arm64.tar.gz"; + hash = "sha512-O+6089U2DMm8Fzm2kCj1grZqajhMlmj/EqD9ucKfktx1e3sXs9/MgeVQP5razNe56lSQ+OFinN2Y4bRZKbaS3Q=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/6d16b077-939f-435d-8f2e-11813d76db6b/ba4829249b04d6c818bc175846e694b5/dotnet-sdk-7.0.410-linux-musl-x64.tar.gz"; + hash = "sha512-Y0W6gTmvQteoMwtaXhfHGz4GgGZWEAbGi/4r+1wavSiS8NkD+3rrwqU22Ee8End4DNZR+lMTMMFvowKgdstUFQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/bfba06ea-d182-4a12-8066-fd78413e6cc3/f7940d1e8d8ae641a3a3d65b6bfa1071/dotnet-sdk-7.0.410-osx-arm64.tar.gz"; + hash = "sha512-wO8ZFPKymFBEM7ypzasC3PMkQh7OOWV7ZlI/E7enFm5yZ4NnOmAvtGLz21xT9ZqJOBuRjnZY1JpXdjtDz3XO3A=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/fc8614cd-f333-4adb-815a-9bbd07e02b16/0ccf5e50cf8fa5c600716395e240aff1/dotnet-sdk-7.0.410-osx-x64.tar.gz"; + hash = "sha512-eC4VwZziCqgzNWbyPC08246Jx2Jt5jMN32cMRCbjDMhU5E/zNBV4Yirs8hD6Zt3LY6fSrWKe2Sy1WCq2cPlT0g=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_7_0_3xx = buildNetSdk { version = "7.0.317"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/3207f51e-26ad-4d43-9249-5e03e93e5895/af409554ce918557a05f8e8102f199ea/dotnet-sdk-7.0.317-linux-x64.tar.gz"; - sha512 = "906ecbfa31b10ae5e2a8ba713d113ccd83e3a9b9e4d3e322482692891542959e76c51db5dd3825fb4a2cf1e951737006a99be7290f309d6822567d3a533a7a9e"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/8aacc3f6-bf06-4cb1-ba10-ea76c29bf550/7c657ce9fbaf35843a30a34a7ba0e3c9/dotnet-sdk-7.0.317-linux-arm.tar.gz"; + hash = "sha512-S1DHTRWHGrRc9/0Bb6BR8Dg/AJX5G07ycQUCgY4vn2kCO00A1YTvd9gYeujpWo0pI7PQPr4qP/cKkQntEvdI/w=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/e08e38c2-46b5-45ba-b318-6b0949b3cc2b/1780549adba82e521439b7a0511229ef/dotnet-sdk-7.0.317-linux-arm64.tar.gz"; + hash = "sha512-Irrc2yy6Dxvtsfy9yZJppmoBojIZPgC0KCOAbO5dRhlLjdAIpT4XRVBypBD3e9NRZ281FnC+lsE1ctjjDPrRgA=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3207f51e-26ad-4d43-9249-5e03e93e5895/af409554ce918557a05f8e8102f199ea/dotnet-sdk-7.0.317-linux-x64.tar.gz"; + hash = "sha512-kG7L+jGxCuXiqLpxPRE8zYPjqbnk0+MiSCaSiRVClZ52xR213Tgl+0os8elRc3AGqZvnKQ8wnWgiVn06Uzp6ng=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e08e38c2-46b5-45ba-b318-6b0949b3cc2b/1780549adba82e521439b7a0511229ef/dotnet-sdk-7.0.317-linux-arm64.tar.gz"; - sha512 = "22badcdb2cba0f1bedb1fcbdc99269a66a01a232193e00b42823806cee5d46194b8dd008a53e17455072a410f77bd351676f351670be96c13572d8e30cfad180"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/6e895738-571a-4d6f-8519-0d64ad4a95d2/75c8734c8f3dee31dca0591f7634b4f8/dotnet-sdk-7.0.317-linux-musl-arm.tar.gz"; + hash = "sha512-fKoRN8pHJHGrlZ3s634+KCigjbX7Dhxrlz8kcKHLbIv60zLMrDH2bhGYLkc6/4KAmzX6XANkF4J66DcTe+NPOQ=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c03db249-372d-404f-8767-dc7e4a104ade/49d2336dc14b70dc937d8f91716e4fba/dotnet-sdk-7.0.317-osx-x64.tar.gz"; - sha512 = "d3dbd0fe7cbc62388f150adba5d818abee3986863d757ce63088f4feabf801052c08a608acd5036f97191435fe99224acb12c7365be7f77def28553a231ac3c9"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/2df5854b-e405-4191-a794-8c24ddb9b95b/b0c9ac55d4f324aa81bb5918e115347c/dotnet-sdk-7.0.317-linux-musl-arm64.tar.gz"; + hash = "sha512-7US11MyzefQoaSLiJtGC5eubwS9M7bYALwbleUt5XT6/GajlqOmQxFfff566mUe8HHIQr2qN/yxnItZMnmHwQA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/697b6485-989f-48d7-86ac-320529a85b35/5b5ed55e7e4e2c0a1ba2c3e0cceefe95/dotnet-sdk-7.0.317-osx-arm64.tar.gz"; - sha512 = "b5f367e1e20d728d7167c81e4146358e760f136b9ee0fc410d813c14366e38b09a069031aa8ca6d8df438435b6ab4e2e989be309e097169459365d4befaf9f5a"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/9141d472-8ae1-46aa-8218-190017c16ed6/7877e0accaa6b6800570f7b46a831c97/dotnet-sdk-7.0.317-linux-musl-x64.tar.gz"; + hash = "sha512-Wn1fIXAQs1QfqdC9tD12lJaFW54RQ4TPZ4jtR3G4NUZqsYeMU3nIkUk7VLh8FHB3j1CTHFpsiZr2E0gZO7lj1A=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/697b6485-989f-48d7-86ac-320529a85b35/5b5ed55e7e4e2c0a1ba2c3e0cceefe95/dotnet-sdk-7.0.317-osx-arm64.tar.gz"; + hash = "sha512-tfNn4eINco1xZ8geQUY1jnYPE2ue4PxBDYE8FDZuOLCaBpAxqoym2N9DhDW2q04umJvjCeCXFpRZNl1L76+fWg=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c03db249-372d-404f-8767-dc7e4a104ade/49d2336dc14b70dc937d8f91716e4fba/dotnet-sdk-7.0.317-osx-x64.tar.gz"; + hash = "sha512-09vQ/ny8YjiPFQrbpdgYq+45hoY9dXzmMIj0/qv4AQUsCKYIrNUDb5cZFDX+mSJKyxLHNlvn933vKFU6IxrDyQ=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_7_0_1xx = buildNetSdk { version = "7.0.120"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/8b678e05-b3c7-43ae-a31a-c007a901d939/934ec0853faa6404aa924c99e019f788/dotnet-sdk-7.0.120-linux-x64.tar.gz"; - sha512 = "cb9faba83ab276c935ef35b31f016ca4617f0d967c5b4bf1e993c2159992fb59d1dd25dce09928915b9ff586ead7acf92ec1dd96937c93317a99ca0c92b616c9"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/3ab51fcf-7641-4e33-aa59-53b394ae1e2e/79905a3a4708000a7a50da44a7256ad7/dotnet-sdk-7.0.120-linux-arm.tar.gz"; + hash = "sha512-epZI3jwx+NElfZiYL0rivTusMkQLz8uAQCdShZkJNK7ocZASoso/VkZUblZtKWP2O/idGbVordxNMkzpdOpLxw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/17a7bef9-4696-4b93-a3cb-f4bb9aaf2985/3e19b62d05b8e85b0a46d5dfd99196a5/dotnet-sdk-7.0.120-linux-arm64.tar.gz"; + hash = "sha512-9TD3lK/jw7m9h7jtUJoaE7HI/m8rxubM4+jNa1YyfA/yf8E4EiwtrWh3DMUBVzfgB+9XBlmcGJ7wzHUhy/C2VA=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8b678e05-b3c7-43ae-a31a-c007a901d939/934ec0853faa6404aa924c99e019f788/dotnet-sdk-7.0.120-linux-x64.tar.gz"; + hash = "sha512-y5+rqDqydsk17zWzHwFspGF/DZZ8W0vx6ZPCFZmS+1nR3SXc4JkokVuf9Ybq16z5LsHdlpN8kzF6mcoMkrYWyQ=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/202eccdf-4461-42ed-a260-0061216380b1/076bff1764888073337b16ed57dbdbec/dotnet-sdk-7.0.120-linux-musl-arm.tar.gz"; + hash = "sha512-HNomb4ipUPRUT9/M8ezCaBa3XCn0hmv9mFiSkJQtmCp0zhfy9QfGKAsPM3t0OprQHlOjwQAcdHe91K3VO7BhXw=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/69b2b43d-6e1b-46c8-96b1-6f2e8871dd26/0405b62c3762de24e55635674a37f038/dotnet-sdk-7.0.120-linux-musl-arm64.tar.gz"; + hash = "sha512-XTEkw9rx7RzvDIOOdTY3rx5SAws2Ywu/p9uhdqfsok/p5cTfnv8hcPqWz2PgBV30LwlQs7WQDesoJZDkthLz+w=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/17a7bef9-4696-4b93-a3cb-f4bb9aaf2985/3e19b62d05b8e85b0a46d5dfd99196a5/dotnet-sdk-7.0.120-linux-arm64.tar.gz"; - sha512 = "f530f794afe3c3b9bd87b8ed509a1a13b1c8fe6f2bc6e6cce3e8cd6b56327c0ff27fc138122c2dad68770cc5015737e007ef5706599c189ef0cc7521cbf0b654"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0aafc9ee-0ca2-484e-b1ce-5f40458d49ed/06cf3c6a1515f931527e8fd6986e3982/dotnet-sdk-7.0.120-linux-musl-x64.tar.gz"; + hash = "sha512-xQirUxDXQ/V+p4YR/+NUJo/og+fGc+6Ajaqm3eMLpFTV1w+BkcSetSrkqAwGLtZJC6HWt1L8xUGw63g19O7ofw=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/b1da5ec0-e336-4716-b9ff-77f8160e7878/5c40db0a17dc493eb0be8d047d0c6885/dotnet-sdk-7.0.120-osx-x64.tar.gz"; - sha512 = "94deb9988509fcbfffc357114d0f5645fc6b6f6156664040cd5643a191bef10ae2fba4168aa689ff7da1a1b6fa779eb4e53a77a7847beceb7f0ba451d2c20d57"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3d081107-64cb-46ef-ab37-41560d585efb/5aa6a70b37790bbea98d7b8c380eacaa/dotnet-sdk-7.0.120-osx-arm64.tar.gz"; + hash = "sha512-3AaAHY3jTfaY+T46qHLVcTHdPjOsT3zdvJYiORHg/zL9zqeDMtp74AEzYskM0k2y2GweJ1KXvm3RYpSPK9OMvA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/3d081107-64cb-46ef-ab37-41560d585efb/5aa6a70b37790bbea98d7b8c380eacaa/dotnet-sdk-7.0.120-osx-arm64.tar.gz"; - sha512 = "dc06801d8de34df698f93e3aa872d57131dd3e33ac4f7cddbc96223911e0ff32fdcea78332da7be0013362c90cd24db2d86c1e275297be6dd162948f2bd38cbc"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b1da5ec0-e336-4716-b9ff-77f8160e7878/5c40db0a17dc493eb0be8d047d0c6885/dotnet-sdk-7.0.120-osx-x64.tar.gz"; + hash = "sha512-lN65mIUJ/L//w1cRTQ9WRfxrb2FWZkBAzVZDoZG+8Qri+6QWiqaJ/32hobb6d5605Tp3p4R77Ot/C6RR0sINVw=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_7_0 = sdk_7_0_4xx; diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/versions/8.0.nix index a982f4ab9f88..56c405200a39 100644 --- a/pkgs/development/compilers/dotnet/versions/8.0.nix +++ b/pkgs/development/compilers/dotnet/versions/8.0.nix @@ -1,233 +1,367 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk }: +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v8.0 (active) let - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.8"; sha256 = "04gvqgl6b46dfxqs2m8miwn7z7j5accidm4vl22ddpj17r8yhx8z"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.8"; sha256 = "1vi4ccb95bn6zf3pjrgi1nkcmca4s49s4xb5ni12yfbxf5jw5vv2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.8"; sha256 = "1nvp2dhznb8h4pcfyllwcx2vzygjpcqrd32blilylk5g5nqd163s"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.8"; sha256 = "1mhlrvl7bs28bwfqwxydsmcjb4cm83ps2ahp02d86s6z30inlm6v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.8"; sha256 = "0dnn3zbzj1ijp5kn7zqws4chnwklmdbiglv2dy664b99xspfrlgz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.8"; sha256 = "1bclpw8sa5fs8nv33smlkb4zx2ipans7ir67i5cdp2y3qg3afrks"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.8"; sha256 = "0gnhrkbr0r4l6x0165g68m87mhavcpv8hqkipsjq2ww53bp7csli"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.8"; sha256 = "1jnr76a8r7sfjvl5p932mm4xn9pqnyv8rkbqddcbr9d396g18srn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.8"; sha256 = "0jkjns3rpl2rzs1x3blsirkxgsz64685my1nl1xzh838y1mk16yg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.8"; sha256 = "1fb7zhy8p247n8jfr69ca8f46b578ffvv0viqxwsa1ssl24a49g6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.8"; sha256 = "0w57jbrf8w2ffs7m78saawniaabasxjkxvmv1lqm6hkb8b3y4rd7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.8"; sha256 = "0lppcnba7jhzr034inxb0pqbywapfin7s9n6lncv6sbwmwcdw7b4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.8"; sha256 = "1l04vb02ddvafbwax79qs5nfg49dg733mnawxjnzfhjszs9872vr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.8"; sha256 = "1s7yas0561jv3ihka8zmhxqhb2zc55lslj451dl16196i3zgla45"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.8"; sha256 = "1h5c5riyj465i8cdl6w4q10ymkfwd6f38nnqdbhs4hz9s3yqnw8c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.8"; sha256 = "025h7ys6n6b4vfp05gsr4vqph9nhi1rg028fpr3g7sxp9s4b694w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.8"; sha256 = "1avn1pwjan2pkiw1knh0gw5dj61ylyahi9nc8mh69z7q97yrpsid"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.8"; sha256 = "1yf1zjx64rjqxaqp31iih6vqfhp09r8hck6fr7xdbq24d1jqxdf7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.8"; sha256 = "1mazrqxr1hfpka0im7h0n8ab73rn2zdf2jbi9fn48panz3ncqgwl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.8"; sha256 = "06j8vp6w3mjqd2qrf6ndmmfc563qd5gsfqwza99vzvwvsyyclix6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.8"; sha256 = "1wia1vgf0ywz4mqz8zqiba8m3wzz4fb5zgk4glwyyf4m646s96ky"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.8"; sha256 = "00rh92hfqmpzb1s3imsc78n24gmbd1hyi8s09ra4z6fzkrz8vi2h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.8"; sha256 = "0mvr8swzpgmm6fp2gh0lr8kbdp90ng6j2m80gk5im8q46ggjwz2m"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.8"; sha256 = "0bgsva11n48n9cw2xjfr071x3aq0yqnis191hw8zrgk07gq7q77a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.8"; sha256 = "1i0g0jv7vnp7rbagjppldypqx1c6bxsk4zx87w5km1n0aclfmyfy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.8"; sha256 = "01bsp8lj08jvv3bpnb0ngccmgmdfcvqx1038r5ls001ax4l1p4nb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.8"; sha256 = "1b2zg6gjjri57v43v4sindbikqlxxgrmp4f89gyz7467rd718qa9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.8"; sha256 = "1g7kwsdj9d9wy67acz3svkcp80aaf3npfsyhgnvslqgwfg53r5y4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.8"; sha256 = "1qgj8zhsb4r42zcaw8s66wgs294405d0vkvysvfxjhq0qf4d8k0b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.8"; sha256 = "1ghvz25730jskl3g7mijn80k2pnaddzadlpc5hrbhk1psrziv4cx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "0jv18yz2cfrmky3v0mssddisnfraiynj2gp6djsj79i5an8lm86q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "0z3aginrqsi7gbcj8rmga35jrw9qabcn6l0sxkysrs4b0qysfsv4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "1fggfcilvg0icc2zym93wiy2ww3jvzyblrymyrvab5q5n49ni3n7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "1vhav8c6fl3kf24i85iq4hvkml1hbl0fn23zcw0il8za0wa96wjh"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "07lmlyd36d4qgjn238hdb0rxki9dc367b05a8xfp4p9nf765s68r"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "19cw3h709whiysagdmrbqbd19pwqc9893dy39dkl353zwhcr802l"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "1my2f45ikw0kay03d1l6yrdcxc9iwyg8w6qyzyhpvbwybva3szqb"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "03zqkvfvgplrk2g0bd95agbly8lilqksp7v9jkfv8xi6fchyz7mk"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "0lvr6w07wxxs68xc4ki83xgvqbzraapnik8f73k0105vg80n684m"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "1pch0b5f4a936ma9l2pf1y8b89swppzc1034yr9c58f92agwm7a5"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "0bj9cgambifzjk68fcidfc2qw1jw6pmy40b6kimid8kig3vi8vc9"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "06ag1kj6d606h3vmqz2aap9pq7ca5c2w7qa0135md98nivl8ra2z"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "10z3lzn58wv0211fx14xy6nckkpvr7jssnq9gd7jisc40wg47m19"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "0cchmg00iabygbqrzrzw4pj461jw15a66bn8niqbv4j2j7fdxc43"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "0f2yal46hqa26s7wrilymhlydj74cj705wivajw204pvx9y29nrx"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0jzya3wa3v5d27yr7cw3rin61xkgyllx5bmnmb3nlx9m7yv7s9mm"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1fp73xdqbzbllb4bc942dnrmk00cgrr496svis58w1w1jhas8fg3"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "0mb6zr6ly59hlc8i4jqgwxrhrsvw92690s036d2zjq5yqiiszq15"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "185dfmvph0dp0syrya02yq8pmaqx8rpz6an91n14mvjrmp6g2xqi"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "1nncg3m5www0vhl7xr0d128a4sm6dngwf9y8shrgpi1c533yff50"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1z5ii7qq6kvhi62dbjg1miwll6z89xi3ndggrjymbq62q26vxk9f"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "0aqm506ls3nqa1qx9vp8zr96mqsbf1q1ni1jcy0ql39khqcf77lc"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "017jfihz6l7pai2lakj5niwnnmn890xd2lgr9vvzn9lf6m1gsa28"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0g80h08qizf0bmfi19ky90x8sf00x15xbwx6nmm1gmd0wfkcmfrd"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1w914cpv0lpvmqi0zhrfxchida2adbllhr6617ix3f7w2g2z4vvc"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "1zwhsmjclhjawsjz7fwnsdmv14dgrch31spba32bkyqsn0bmfhnh"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "06x7nldwx6cfx2k8j26nhvg4vlflaz3qk3aqjld08jzjhzh9zl5i"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0p3ylipzvd41idbb8d11120rakknr8f8ys15kv5fid765wck8xcc"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1vrqkddhi87hsa4agx1akfhvygxqlj3b1pq6g405k1pdxm7x0ngz"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "1r80l23i677carh93fpkc4qr1wnrkfx8wvdbqj70k29qarjp1zyq"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "0yf7i13rrjdc9ibqff99cspgnz8qgyx85hv4jvgxz2d3jknv8ck5"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0jkfh00davbf4ix27ph1p3g85amvrqjix2rapw1375pkv6vnhg1g"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "0r9s92nx7lz9alxc2kn67h0x8vl71wh7hv5dqx0fmhafgllw8dd2"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "13klkc3iy2lqxlknygfbqgqrpb6q4i3ihsvi9834aw17fiznrj60"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "1hxxpl4wzn18gq5zpbr0vz87bs4czmvbibhsf1zznwb2yvlr0sh0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0wzl1naijk3gm879bd6s2975yhsksnq2gl7jg7j1bnwik27nwpl6"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1nvzykpd7d51bqh9lkskfffggd0hfm0hrxrnmp075ibd4v98cc9l"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "1j15hhf2hii4fh2nnmr7wmjxcx3v58ckm8lf5nsnz71fjcy6r2j1"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "1fchcm8hpianyj2n7lq4vajxak8ww9hxdh9bl6xpx2vij8rhhh87"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0lj58x7l8f5nj9pyy6d7my611rpw0b9m5x4cb8rhqrx6ywzpjmfb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.8"; sha256 = "1g0kyfs8dj9jirc6qym1y93hxkcff1c1z2cws1qsqsrxbnrrn5dj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.8"; sha256 = "1p5jgznx61rfanyzvvbkasp13yysjks9driwdm42cc7gw35h2lig"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.8"; sha256 = "1wsaw71mq2d6a2n3hxrb1mablbr8rz7x35ibh41y11nyhldwvn3i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.8"; sha256 = "1z8qvz3k1r699gkk96zrdffbqbb2j949gmh89hafcj9phmrbnvz8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.8"; sha256 = "150rhzlbbg5fr1la67pbyksk6ca8ypqj5j1izc77c9c9xasfa7nz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.8"; sha256 = "0lxq6m1b91yc58xqwrw84r90vgviwg97nddilbzsp9bml2y4h8y0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.8"; sha256 = "16n7frb84h0ckkripfm5x698l7b4m9i2brwrsfr7n2ccxkilnfhw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.8"; sha256 = "1rd3fzdd4dwdiwqcrnaacy4kh01w1j3f37ig4bw1zpv2kyb2c6f7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.8"; sha256 = "07a0hi147lag3qm9k7757w7p00l870i9ayhx2slw2g3vsr5fy12g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.8"; sha256 = "0ysqwf6xbrv1c6q2chkr1hnkw407w1gk4ccpkivn697d1pc832hg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.8"; sha256 = "1y9w1xj6hjh0bdcq3ywi98v4mkcpk55x48ac2b157qjpqam906c4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.8"; sha256 = "13s6ymx8vnxiz4ynss7cx1hc5rlwip746y735x4hjqqwqnxlnbc1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.8"; sha256 = "0sh1r13xmphk3zb625h8814s455kx0x0h0p3liaxd0nfh8dy2gmz"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1irszs3125nl5d00yyiganqbsdid1sqj289nirvsgzrkmzk0c44k"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "0lh81hxx7ai6hn8mfy579rym8zxydphq4nahwy1db56q3n7kbkrk"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "0a3x5vaqp0a3gm0dkwkai15jyi1qgbqapr7qg2nrv8q2w53vj007"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0z71d2s8nn8pidzdnsvq8gsnl8kkf2limnm5fxvrfxc6kq22b9qk"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "0xk8va4vidial13wzc2i315k0w6yh6dgnch5bg53wwz2kkm5b7rv"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "1qb75x60bpr9kwp8s938arplym8p1zj7hsxs2mwna9271c254yx3"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "0wjn5krkprgkz87iqzr10ncs3hfzvg2n9zb1xbcm3f0m5af893il"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "015mg8cyqa6c4q2zqrq68rbmzcnjpm2ay5cwrrg99r2q72k85yff"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.8"; sha256 = "1sh70bdi1fz8zg2lnln2adn2yzjqi3fq8wazjbb8xgz3jbiha8ln"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.8"; sha256 = "1z0h02av5737mlk3y94lyjqhyjc577kx7yzmacl89m32ky4r2wk3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.8"; sha256 = "10qq6jvzg75bzlc0wv8z6wi9zv9f53rxf7ya7175lxjszfzjmrkm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.8"; sha256 = "1kqcb196n8zgcwi4jznlzqx0mv1y2r2gk51wvvv3vhvmfjd6igsl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.8"; sha256 = "0bcdfhqsls04gg93av3rnxmjz9cynli36nmdc9wxgqnr8vma799i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.8"; sha256 = "0zzsb5xkifks23vryy4mpm1xyi69mix2xn657cmgp0nn26c9169h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.8"; sha256 = "0vhx3z0aqnvlmjliqmd3cps5m34w69srwjw1506k2gipd1bhzgcx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.8"; sha256 = "1jfwbyr43z6id96qpplxv8mvxgdwc6spiy327lbx1gdbpf6yvv1i"; }) - (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "197lnzrfxws1b8pz64kiqjayaidv4rnigdyigpnfjq67w7x80s1a"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "1ax2ygccd1wnlcrad0kzv1lkb3z67vpwbmmqfipzbzsdaj81sgqg"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "04jwnn2ppdl1h11511df5wljmqx6hdzaw01qi44q5j5yab5ss01c"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "18nk4niv4nmpvhd67jflra7qrlq83mh8h3216p14kdiwmwbbzakb"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "1px4k16qxasb4vb7w2jcwjfr39mybhrjb120044km2ianz5mqsvn"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "194y9hvf4rjshnjvxn8j971byxmd837ax3fwp5j2gj8lr5pmh43v"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "0gxprpxvd28ci5xshappd200f16vzgph7r4k921sx98ffpl45sz0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "1mbd0x4cwzn8284xbk66mr18s7fc37g75yp9r21agfz2vv6yjcn1"; }) - (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.8"; sha256 = "0kcg2pz794qh3lis9n06c8zmpa2h4q5pp5lfysgm403xzisd9pmj"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "0nzhfz87nfr8619pj75hnnq0kcl8w82kv4xr4528sdwbl5953dj3"; }) + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.10"; hash = "sha256-qr83tlgz2OZRkz8f8uquUeZbQpB8WAGd5o+XYl36giY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-IKp5I4FIEGQ5+Xsjc48EG63eHAIraQWUcJcvf5vIeIE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.10"; hash = "sha256-DloETXESPFWqSvOdmAOFnKCq+veTqhdltiYj87Euhr4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-2co1p+5boK5rAuf9AET29KV+kTv9zhHc6PSoamkHZRA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-HFlAWYmT55k/Y+QxnueMGptQDgkuFdQtrmWL1lCVviE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-29PVFF5yeT0svgK2xWVG23xOrRSDCFJK+wVZGZHtY7c="; }) + (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-vSt23zRo8oVhOv91+Eo743yMB5ng+X7iKkr+NW4EfMc="; }) + (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.10"; hash = "sha256-QIiMkIBvrdaep+lvBn4YiB6h63FbSVi7UmDz32nLZ+E="; }) ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.10"; hash = "sha256-PAHPeo+P+orHurd4JstFAFnC61j4uwq2eE4c1nQmh+w="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.10"; hash = "sha256-ssF6ALeeAGnvYFd5kFTuJoxLwtV8lk5u6LlnXMbJ59U="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-ufgpQqiZuvToDX8hMnZ7KSZPiVJKRuHzOo/uVtwWQpQ="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.10"; hash = "sha256-EBtD7t30cZibJ4VDdZET1ASVU2yp9FYMDNUsgaJoLGw="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-dUr7mwCg93f+Oc54hzUzxGxv8J5TR4dCVhsYBfLn6KY="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.10"; hash = "sha256-rtKhU2VHqLi7cHJVb6Miw0BJNcabrHNve4fjpsIQe5E="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.10"; hash = "sha256-1wIIAc/Bp4YnWSXxI9/1UT/Iz8mW/OQSgGKCEen7SD4="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-DYMtF8/2qOg+XrfPSWJ1RB623Wn8Bjp3cuaqT5iQiZI="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.10"; hash = "sha256-zcfmtvbRzfrzM/fc7aPWHUhLGetn8u3G9LXTBNGy55I="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-GIwrkh6iD0c+cLdcYhJJHAXhBhA7ZWXs4/MmWWnaHOY="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.10"; hash = "sha256-okqfX5kWkn+fYSqx/lNhvxkGeTmgjlvrXMVDpuF+/y0="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-5U/C3N47whMMmfBAD8hyM3ZBs2ZxFqaKhobXWLkRXgs="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.10"; hash = "sha256-8+LQHhzQvobpEOVLDC8ySv/qhzC1uf0jk6nj8ioMWnc="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-NZVCCKfPG3LBGYVGTk23fvSqXk8AOq8J9f4caTvRulg="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "8.0.10"; hash = "sha256-CZL295MOXANUs9tgO9Kul2m46zfr/EcrJWXep74w8PE="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-yrvkrtY6qrs+2a6FghTL2uQgf6L2o3oh/WG9KWcwgog="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "8.0.10"; hash = "sha256-ccqaKMg/PMKHZ2kjqOrM4wIh8V/R1cYyPnWYYa9jR+w="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-HqFgB9cr0v3WstnK+wNjdVZerbQbfufzKA9NsHdIrWw="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "8.0.10"; hash = "sha256-jenosV/Wf8K2SiLsp4rzIu7/c2A3s+jydkmwCZ+jj44="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.10"; hash = "sha256-/s3SAZgRROQSOBYAAKgZwhj/FJXN3+RG5VPDbn663QA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.10"; hash = "sha256-aVWKeHvQ4zS5bXZAoUqjefBp4TYwxW6vap5XvklN7uc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.10"; hash = "sha256-Eg/hxnHtIiJ8Zcne4x4KI0xzpmxlK+1Xm2WtrZZXWjg="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-xfTjxK8Oojq87vappJZkQDWvt406M8LjqrWmzdb7SQQ="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-qNdDGfs2NBc22FcSI/jut1QPCaRn//vEZbl3+YieO2Q="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-juf2Zbtxh2JqAXB7GYa5HBJxcUrzXQrtK16ZfszEJ4A="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-SRtJaf4VwCLFM1NICesfSgrxYYYVEXK3bCse0QJ0yW8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.10"; hash = "sha256-X4vSzi9KUcNracYG7VtEGBuLfI0UBljMjypxqQBFFfw="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.10"; hash = "sha256-uiplc7OczySA2Ni9Tnmi17FOYHp/U57qH0ou7Pc2OzI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.10"; hash = "sha256-VFIH/EWE2TW+akirg+IpaISG289PP0tl5Ur8+sGFj8I="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.10"; hash = "sha256-EhepWr2Mk/nPAtE+J++1MHQkbu5n9xewHwroSWlcr/Y="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-eLxtO3uYgCYryuidL2O2fG8egh+np0HTb3bJ/rKs14Q="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-oQ7p6X/5NVdVw7U4wbnNy4xK+dZNvPbXWFjA4UuPGzo="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-2l0Q+H02bzRG0NBStTaVOKLeZ4CNjWCj07cjkgOugIs="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-EmYjZ/h+hH0NLe4estuua0Yh33yoIMHNosVuyTNQDaY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.10"; hash = "sha256-yyTxpyvp6NWMODvZ0wVZRAWVzCgODFvBBnWrGawP7+8="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.10"; hash = "sha256-8noK1Ws4w7JCCH5NGT9DYNqKUIE/89omwoJJaT31DvE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.10"; hash = "sha256-NUzt/9eU3UV1iw8hggRTDV1po5Xtq9ooEZ5inJ0TRp8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.10"; hash = "sha256-lYyvJWF0qVxM1u/rpXMpAuekwQX8+ATX4H0B1VYKPu8="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-Yp9WQ3kQzP5AFc+luQ3t+6x3nbpnSBmSeXaQUda2+jM="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-H6CfsMpTtenNySVdYFt27DJqM+89paFp6V7PK91XDqA="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-RUTadf5Nxvt0McVm/z29y3LQNGvakR0DGAXvQISk/F4="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-CSp3a8I3EbjXozgWQGl2nzn1o4TdbgZeQ6d5A/ipOVg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.10"; hash = "sha256-t0vB9HOaB5CLKvRST1QeKlpgEG6nvX+qRkEvAZffUFY="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.10"; hash = "sha256-wDwLqu16ILj4q1eu+/tMZR3D0CuX7zeoPZe233hg7Vc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.10"; hash = "sha256-n3fx5GHZrP0PTb8UMusgZe1nHkrsi6Vk7iY+NqRJ4Ss="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.10"; hash = "sha256-l3yE6YMFKts1bBxbJUILpd2g4I75MWAgqeW2TMMgNzs="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-yxkx7C3R64TDYbsgVGPoM+8BFD8PS41/MHmOZiJJhwc="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-yqOvz/0ZgF6pWzg6gtiHGPfm3GKfMwAaqJGfd+K+0ng="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-EGK0d5m88xBScyeohJOsfNeiaK4Iis94TkqPHoBDOrI="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-iACw3MvgxtdoHeLF+sBPJVbRYDlFj/ixTeaNw5qXGR4="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.10"; hash = "sha256-trm/1LZPN4BDr1SvQmacTGVZDQLVKuVH0w7GJ84FQVg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.10"; hash = "sha256-e+o0ec/E4I4blmj1ltcovIXqK6GCEwV5CMblUZuD2/8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.10"; hash = "sha256-OhXUVHm0WABY9w9oTX6rCNI5iQhJcqzhwS7V2HIsWp4="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-IzTftfK+vS8ZBo//8XPxDMUbvNirBaQSz21q3jNAvag="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-XRTCbG+e85AGYcv8wDvL2NmrRwHUPb4xgjKWwmOhVyw="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-9kP2XFjP+som53HTV97vTEmqyZLN+KIVj+RzcaPKcI0="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-k3XtnZPIHDWE6bZX0IDVOJ3MMhBcd/y3Wq0Qkeqm7bU="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.10"; hash = "sha256-HUrye7hNJsLS36Vh/dDiQDn1oUtoNcTWwulersn2k/c="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.10"; hash = "sha256-Jqxj6tDq1DadZk4tMNQo8RpLNhmlFlN0kBFY9VRJmb0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.10"; hash = "sha256-JnHGicqJ2Na95KyJkX+UAM0uDmAhkqmVIhktMg49aWU="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-Itqy8JDjPpXH5U1wLl6gj80b65zI8tQYAe+AEzgxtZE="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-OSDH9d9EASV/kswQjlEIu6kaQlfRMpT91TPJDkPlb4Q="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-GdPlVPjzC0scVledxgs24kFZSHujYyq2UHDAzLgt/eE="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-I3jZdK86aqDnxz2xvcp8oGJurpmaPckuJR0TG3OxOOc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.10"; hash = "sha256-QQ+B9S/q35MsxikeP43OQ8J5mghq5f+xdPHaNdBMeCc="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.10"; hash = "sha256-GL7OjLalZPKLsoheVJAmVStJFpJ7zTDJtikCP7fB3jU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.10"; hash = "sha256-IZ59kjeU/mGHBVXtOO5AFK0ocxwFAkFqwtn99N+l0zw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.10"; hash = "sha256-0fH2KlzVL5ydblrVtBtAoHa5kNYY92Wzv8FCVqav3Mw="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-XTWvKlTEEi6lrBZcJawPrxj2bjmsWVFGphjCxpSIBLM="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-C+u78GUiX6VzkoOYuqiTy8DvHUsJzWR+apJu8ZU/tWI="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-DVxeH8nfflyG+pCdft8MfDfEBCD/7dXTwlOz0aGnH8A="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-p9KjfiNnhtqTCl2aQlYq/UmPsyqx2+mddTA8nbh2xnk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.10"; hash = "sha256-d7Gb+lPHI7xmMwhsTQzWJBq42QUsSRRU9BWZxmdXKWo="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.10"; hash = "sha256-u6/4q54irXtyKSSi1bH6HYrvcod7yfs5YdYD0NXeYbs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.10"; hash = "sha256-B4aqUvMpyewAwquTRVh+bs2RG875ZsveYQU89+4VFxw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.10"; hash = "sha256-XKUQ0DDWWbZNtgGPKhdI7ufpd9Ki1EcOcK9ojiaWEVM="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-Gl5S9T53P3xZj5eRwPe26SnMlPboQHB4lxTw1nIB2Ac="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-vmGaHkqKQC4WA9Kl26ZpQv4H8YIJblk15RayYATG1JA="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-MFSnCAiE9A6EvhUQff4g/6Js/sxORln2lhW74NTeQ34="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-lYNFKHvU3RZVzwqkGzxPem5LHfijEFnO4OcGGn5BUMg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.10"; hash = "sha256-7RRH1rAdGFkdB/FNrQTDgBywr1tYc1Rezo8LXRSZ70A="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.10"; hash = "sha256-OdRFIExBixFh1xwOtEA94xedmHVGPXvPopF9Lbf3ec0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.10"; hash = "sha256-pmsaof0XFXZQmn+s5nijm820TSdQaFlH/EpGy4OqMhA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.10"; hash = "sha256-xbgfV4a1gtH6gzoXSe7njaDEvvx3L+zVfLhfF4705r8="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-1H/t2OQMWfypSe1g6jWITx3klMD+QgUAj5iApzL2vTY="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-HmWsVmYVtNxX4xbQ3Mbra2vo0kjvMGXEQ+zbcTAAmsY="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-rHlT/ZFXIVkgo1QgJh+h0OJ6gnizyuqAaBczb7Z1NOU="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-d+ILcAY9ZvXx2klfv6zxASRq76htI4k9eTO+Ctq6+DE="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.10"; hash = "sha256-MrEAlX9Ep1w6fnXM1H5PehDbVXj6HrSSBE8ka5+zr4w="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.10"; hash = "sha256-bLWBI3G4+TrV5cyaaKbuk0RSh7Q6lYI5msZd8QXi7so="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.10"; hash = "sha256-B6o1+6o3Cih7cmgo2ClwBkIYcDA7NGZ6JClaHRDJ/B8="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-TJtsPhmyiE6XAX6WmSASd7vcRQwREJYd76CKGzCt3c4="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-59D1z/LeAqw09/SsJegUQWQ702r5wsmp7O87iDZz788="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-OCDkL6JuPoxle/clIRlg8A2/COUIuzqeq7cSYzNWcmQ="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-ld/Tu7HAiAGZg6+RYMO4hpg3NKs3dX8XlSHPsLLygrs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.10"; hash = "sha256-3nn0MR1m1P1usLy0JCtiCjon3w0xdl2MyEJaHbILmW0="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.10"; hash = "sha256-O7gy7qe+EQsU/i9LVpNFjs2RjrLppQFatD+u9W8Wgo4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.10"; hash = "sha256-oA9gg0LDJrjGx69md9bWUfQy2ED3OVhhMMmAw26L2mg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.10"; hash = "sha256-02ueHHg0U7yEvkLV4gdxXg2XIDSJ0LBCt5gNcrsy3O4="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-M4LLVUaJpyHWzSqYsXMzB4OgxlzHf4Pp79XwNgnO6DQ="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-yRaUcqgJr+XHo70nWJUxX4yJwavaiN3pBKE+Ov8bFTs="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-ZJN/v/J1b/89BquCxWHZlnfbsQn8N3756HPQ3Z8Zv0g="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-4mNR0mls8jqyh4Lu+Wv/HykJOlwLlX0ceyR4arrnNe4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.10"; hash = "sha256-KUdzJDhpW9xj5xSH4zovpwZb7I3zcTKXa2PFRlBlOzs="; }) + ]; + }; + in rec { - release_8_0 = "8.0.8"; + release_8_0 = "8.0.10"; aspnetcore_8_0 = buildAspNetCore { - version = "8.0.8"; + version = "8.0.10"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/648de803-0b0c-46bc-9601-42a94dae0b41/241fd17cee8d473a78675e30681979bb/aspnetcore-runtime-8.0.8-linux-x64.tar.gz"; - sha512 = "d6c0cc2aac79fbacbf81b597f286763599f66278c17ddb448ce0b93d499bad8f88777d425854e68602945ab18af8a61f1ee59d431d5503006137f86113faa8b2"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/50a67fd4-a5dd-42f1-a3ac-e008c3115dcc/816972da008ae5cee7612cad9b6808f0/aspnetcore-runtime-8.0.10-linux-arm.tar.gz"; + hash = "sha512-+ui2snCk3JIY35m7PMEPClLbntNjC6ggVkAhVNJ8I4925EVh+FNIzxpPfivR29kQ1BOKke9mq+VoXZlys9BQqg=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f93af34d-cde3-4231-a54f-119c328bd876/663b3c2dbf1ed2a3e08ac8e614060571/aspnetcore-runtime-8.0.10-linux-arm64.tar.gz"; + hash = "sha512-OkePkxDHSLdCfJHes7qD9MAlV6fXo9c4JSa23Dna09k4AiR1qyDwYPG07TZcexuVodCJzKUCpCMpjEE3m/+BEQ=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/6d143cf6-e215-428e-bcde-9fd50ea0e1be/99652e31b3e0161a3f1f933e0bedf223/aspnetcore-runtime-8.0.10-linux-x64.tar.gz"; + hash = "sha512-MyIfGZZMywbLp0Qg2sv+W/0Db3hHOHCTEZ+POR1XFuHFqOBXIfIzWYRAm0NCPXm1HsVx5R8M365tnSorLZhQWg=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f6fcf2c9-39ad-49c7-80b5-92306309e796/3cac9217f55528cb60c95702ba92d78b/aspnetcore-runtime-8.0.8-linux-arm64.tar.gz"; - sha512 = "c3dc9d71fca0a48eda96074cbcef4c9a265c1c4e10cbff38614dd74d79443ae9d1ccd10714764cd041291f81d83c0ed1c307abf89249ab4b6f58a5de952fcffd"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/ccbec918-1f15-4f1e-ad7e-b4d1a679fa91/f8fc5b5f2fccf1fbdf164132da8fbda6/aspnetcore-runtime-8.0.10-linux-musl-arm.tar.gz"; + hash = "sha512-RbGzEQzSxmhMMSCnGdemLXpqwVR0EB5in0fOASq+HGWqZ7k/sKBRKLdGL+PwPtxcukD8eIAE+Iio47J8hh7sVg=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/465bdf6e-407d-4512-a222-32dafb225ad8/c22004de330d10a06141dee0f42b5d12/aspnetcore-runtime-8.0.8-osx-x64.tar.gz"; - sha512 = "d3ba8dcfaddcd6d50fd434911fe3eb8309666939a8a1ede800d7da2dd814efbd781d1449a42b71d1c71d9593465e9e97205025eb432808ef9a3ba0dcbdba0e3e"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c150b15d-79f6-4343-8aad-7748ad4765de/0e0768e8874957a8b37415919d77a9e1/aspnetcore-runtime-8.0.10-linux-musl-arm64.tar.gz"; + hash = "sha512-xx6iRxYGYJa0i+XOi5/ToUT/hlg4L3sZPJw4jq20J5tkSyvHoCk8AaYQhDmdXonIlS+T3tkL6qxqAcNhxXqP4Q=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/a7080974-fac8-446c-ba20-313f6f323fbe/f907c126c9bcd394939a7cdf86b85f4b/aspnetcore-runtime-8.0.8-osx-arm64.tar.gz"; - sha512 = "a196c62b14e9136362073826a03e76e0a147027f03655529426e594f7e44eb8dd036daea80997876047171c1793c7edcfa5146bd55a01b591d9405fb1646eb00"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/fd29b6fd-e351-4758-8c61-0d9c0a6813d9/8be59cf5b2537298eb59d44e472c6b4b/aspnetcore-runtime-8.0.10-linux-musl-x64.tar.gz"; + hash = "sha512-hK8Vb9YUX8aZxzhl6hKlmU5D54iUX+3NXIDZE2uUgq0NngvduTP19y/x3PuQ0G3C6Uoh0C7aELwQFfPkuGOdFA=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/05bfc51d-d738-4796-ad78-6f16dadd2382/9a64a66f30708e38b6470a480ecc850c/aspnetcore-runtime-8.0.10-osx-arm64.tar.gz"; + hash = "sha512-K8kXmEOTIij7NVDNPu6IpkXFttaVpWFWQZXwtFg/wMkHFiVN3pJQIL3aA9DgGB8El1DAb4OYoht/0O9bjB/lhA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/135424ff-12b7-4b4b-83e0-1d04b053ef5e/9274109d1ec702677474c148ad2af1ff/aspnetcore-runtime-8.0.10-osx-x64.tar.gz"; + hash = "sha512-euH0JLv/pSuB5duPHVkNZ8NKiGUOtXPQXJIiu7dP+J5v8FgbbOJnVY8Z/jQzRz1KhRO+9PXhiAzeA/GWBrDULQ=="; }; }; }; runtime_8_0 = buildNetRuntime { - version = "8.0.8"; + version = "8.0.10"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/68c87f8a-862c-4870-a792-9c89b3c8aa2d/2319ebfb46d3a903341966586e8b0898/dotnet-runtime-8.0.8-linux-x64.tar.gz"; - sha512 = "8f5220098c562fa3490417748eb9f4f9ca1551f7155728b9ebb1924359c63c18dedef643bcd89ec67b59cb5b1b9de7283ee156ef381ffb16801b516dba9b1b0f"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/3f8dea7e-13bf-4931-b11e-77fcc6de7ca9/37531adc6a054037c064c47dae4e7f77/dotnet-runtime-8.0.10-linux-arm.tar.gz"; + hash = "sha512-8GuHh+T4b2FWmVkiiprn0Qu3ofqWcBDX88oAgMhQUTz1ZXwY1HIhHOFogP9er8bIRCpWSy+DUdd8XdJwITyYTA=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/6c71a005-d902-4df5-8cbb-f1fd53cf14f7/658dd2a2a839c14173e3804befec6a7e/dotnet-runtime-8.0.10-linux-arm64.tar.gz"; + hash = "sha512-MVmf+8pxAkf04D/pmxCYsoeg7YIKlEtabtIjcmUcl9Z1McNKutvFLlno9wtPds0zEiHQCGhPP+79m+KQSnPjiA=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ebc433c4-8f01-43c8-a1e2-bbe1291ba857/e073f3f679d7a4067a56e8f5d12fc0e5/dotnet-runtime-8.0.10-linux-x64.tar.gz"; + hash = "sha512-f7gTZ3cg0SXCM3/txhMbIw2vHB151ZEqHKa14Iv3gCtBLeMkjWRbZIOrI/P66DftAqDlIOMwIM/vLIiMVPR0rA=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/a254fc53-e78b-4039-91ca-38fb3e42535e/be0d765e74b082a5919248c97866c7cd/dotnet-runtime-8.0.10-linux-musl-arm.tar.gz"; + hash = "sha512-rsjIIFkaE9F9gKFogPpiKWHqOpgtXqMLJuqRXtjYYOlQCyrHruB6rMCj9QXqM6ZlA3CWo9vJ7ZX8zzNeS0udqw=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/aa047a4f-73b1-4a00-bb94-1fdf28bdf606/533876a5403795f02d8071d6fc9be4d6/dotnet-runtime-8.0.10-linux-musl-arm64.tar.gz"; + hash = "sha512-Huyv4nKgce14vJG0yQCrcOwQLJ+Cztz94nm9mSGn50DunogVOKAKbOQA2dwOvJMF6M1JYtskMec7aR4QUmlOwQ=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ac04b123-0542-4e80-9216-93f51a6814b3/d110733c152d34ab4eedb435ccfdab4d/dotnet-runtime-8.0.8-linux-arm64.tar.gz"; - sha512 = "246fb7e5edb51db93421c6bb7420f7a358430b98b224a71fb70e71a2bce0bc91f853aa89109f2188b0ab28532a245c3d52baac163463e01a02019dea37fd39f2"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/abd532e1-6dae-443d-a35c-fdbd5053e239/1ab2cb2acddcbd435cb6970721f0f85a/dotnet-runtime-8.0.10-linux-musl-x64.tar.gz"; + hash = "sha512-LW7cwUudn++TrHL7MrF6Yxjyr1vdg8SzSzXFkdzUBtpNSJwaTVgIphusLuFLQLtrDo/+m0JJAbcP4tlp3v+ghw=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/0159972b-a4d6-4683-b32a-9da824d5689e/ffb0784119abf49015be375b5a016413/dotnet-runtime-8.0.8-osx-x64.tar.gz"; - sha512 = "8029986c1f8bbf1b0e8d0929756156fe41d46d2df6ebe1ab1c66fbcea2add47c35b934573c6198797cf60d2b372cd463e70326c0a35b0926dab4d5c157a357f3"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5fcb418a-d290-4fd9-bba3-d0ebe56eab58/e20afef70b5f56e36daf054ee3e09d82/dotnet-runtime-8.0.10-osx-arm64.tar.gz"; + hash = "sha512-10aWjQSUf0qH0k+/RxMJoDd/mQoYd+km1uUbUCIQQ6snDABRf1eKpT1lPhiszDhvVVGp9KzTawIz+2Y8NTOtLg=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e9ded115-7a30-4952-bb72-ff101583f20b/5a7628261b98d095d2c97ec3fe5267be/dotnet-runtime-8.0.8-osx-arm64.tar.gz"; - sha512 = "88b06dd051819bd9e8ce2c340b2516dc0e4a77d565eff145d8e957b2552a641e235a5ce7e8db3607475887bc766f1530d01d0e7efd80d10cd652a299954398b4"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c71dbec0-22de-4f32-aa1f-8e7112fa380a/54b3ec6159d2f72c813d913afaebcf2f/dotnet-runtime-8.0.10-osx-x64.tar.gz"; + hash = "sha512-RKvEd79+tA4UHXFfiVw8WwkUgYVHNt3lNHqZcxkdy188P5bdk2DighSfHZejPXwIuTgAil7fO1xI47k9s1FxBw=="; }; }; }; sdk_8_0_4xx = buildNetSdk { - version = "8.0.401"; + version = "8.0.403"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/db901b0a-3144-4d07-b8ab-6e7a43e7a791/4d9d1b39b879ad969c6c0ceb6d052381/dotnet-sdk-8.0.401-linux-x64.tar.gz"; - sha512 = "4d2180e82c963318863476cf61c035bd3d82165e7b70751ba231225b5575df24d30c0789d5748c3a379e1e6896b57e59286218cacd440ffb0075c9355094fd8c"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/382e3bc7-f055-48b9-965b-89b070c15713/54b2af6b1ef970f852c29a850661728b/dotnet-sdk-8.0.403-linux-arm.tar.gz"; + hash = "sha512-3cwikxZHW6c8xGUY6iY6l71X+nhGpP5277kPh0MR6Kf1cYrG3LhhaDW0Mhr0bw4CZa5IsQblrcm6gszojoBKSw=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/14742499-fc32-461e-bdb8-67b147763eee/c14113944f734526153f1aaac38ddfca/dotnet-sdk-8.0.401-linux-arm64.tar.gz"; - sha512 = "e8738b21351d030a83be644571f3674c8dda9e6fbd360b221907a7108fab02becd18e1331907535a1294d8c4d0f608519674c27c77dc2c2803cc53cce3e10e0d"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/853490db-6fd3-4c17-ad8e-9dbb61261252/3d36d7d5b861bbb219aa1a66af6e6fd2/dotnet-sdk-8.0.403-linux-arm64.tar.gz"; + hash = "sha512-9C4bqaiX+RyNc0sJqb/IJCjwYpt83ZN1JiFY2fKCeXwZlVjDeufzaUflfYrcYa+UkFlcTmu9BSF/1tBRM93tTQ=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/b266f183-c677-4f93-a729-abe0334401ea/ca0ce4f684c4cfea2d372223f9c67cbd/dotnet-sdk-8.0.401-osx-x64.tar.gz"; - sha512 = "063aeaf4e949b96d501b77873279f0286cde46f9212b59181c6db21630401fd6a352e3259848cee8e127e4ceac85a25e0bce36699a2fb6f6e2a91997c6f61eae"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ca6cd525-677e-4d3a-b66c-11348a6f920a/ec395f498f89d0ca4d67d903892af82d/dotnet-sdk-8.0.403-linux-x64.tar.gz"; + hash = "sha512-eqA2eCKLF09RxFNfGDSM33pdNeJDsfjLKKSjDkAuR1Z9Bt9jyPbaS9w8fomPVPSswI2ZUr+knT8iDQNTJTrD6Q=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/29ef2c29-154a-4c44-9450-071ae664767a/4ce00627f3eaee13874b54f033a9a27a/dotnet-sdk-8.0.401-osx-arm64.tar.gz"; - sha512 = "a3232c0693b41ee6b18dc3c8b26d82dd9116132bd7871dc9c0a0acc5e7995f352e760869fe91a08828417ea7b91fc27859aeea449b9efabc17c136a57737c93e"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/8c87dbf9-f000-41f4-bb78-3aea9eceb73c/d75a2445ca5e49bb07243f047c602013/dotnet-sdk-8.0.403-linux-musl-arm.tar.gz"; + hash = "sha512-a8XsagruodiwAq8e32PaD9yj1U0s605RqQ6lOpp1hWHRYeT6EKw+68Vku9QAwblN8uBMJrrgHZm7wQnk7uMjZQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/18e32a84-60ec-4d82-8ab1-84511be4172b/4a1e6bdd4f15e0d55e0d9bb20c67631e/dotnet-sdk-8.0.403-linux-musl-arm64.tar.gz"; + hash = "sha512-u2POAascZLhr2U2QwQ5WhocnYnWlz5FvaE/l8TFyN0UhZjnjfTzPK3kj9VjxkN04SP9iH7yOnspbSVG1t1uhEA=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/662d63c4-fb9e-494f-96a6-e5d564dbb488/b39e35ac3115e6c8b0c1333d8327d7c8/dotnet-sdk-8.0.403-linux-musl-x64.tar.gz"; + hash = "sha512-kgNzMgsHaVRhgPUJn9ujNDg7RRAxIPxa34dlg5huw6VxToL81kdUed9BXzMtzk0KmJwF2uH00aUNAmW5Eh+NLw=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0f1c8c1a-a14d-451e-8a14-4088b0d29cf0/37d7a2637468a506214ce484985fe040/dotnet-sdk-8.0.403-osx-arm64.tar.gz"; + hash = "sha512-89r8w54THem///GQrswI2HqgYlpmJFr1XAGbXLZNFZPNq/ZSwZfOQVK718VM9ownNJnZaaNIheO33wiQv1yTNg=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8d0cf513-65cf-4691-a436-7363a5c10af7/ea63a46f9c1f901cec977f2c88538146/dotnet-sdk-8.0.403-osx-x64.tar.gz"; + hash = "sha512-Px9csJDUYaAmUF/8XR/ObxW6U1SzAiVMB37rl88jyDUDtFTi+BJfvdNkf00686GkNngNKihC1csJ0HarXkAURg=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_8_0_3xx = buildNetSdk { - version = "8.0.304"; + version = "8.0.306"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/52cedf32-8a92-4966-b184-18404ea1c5a4/cc399fff1b152b822776514ad247df50/dotnet-sdk-8.0.304-linux-x64.tar.gz"; - sha512 = "971c344379240ec4bfaaf1eca69c6667e594cdd0dfdcde6e8962cb7a41d669dff91c644e48eed3573d841b7b3e60ce02e0c27a7ce37b66cdec27bf3457087c4a"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/4bbd0de3-6535-4f95-9b21-e0ca491bf9e3/9fb72861024e7ba9d6a35292cbc0e06c/dotnet-sdk-8.0.306-linux-arm.tar.gz"; + hash = "sha512-3fTLvDPhTqU0n9DRNy82uOMpIL7INiXa0YeH5xf2FNlKn9ntpC4LP75o/9vHnTQ/Nww0EsagvEdQqIw+XF3wpw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ef4ce459-c628-43c8-86af-353d9d7e7c44/804deed3b6ec5a3312867f62e6cda7f4/dotnet-sdk-8.0.306-linux-arm64.tar.gz"; + hash = "sha512-OlVLkjULbn09hu2SlJKV1GmWNZRhgkDJiBrbNvzK+4pRpZYahQVvMvC7V0O23c/YjnOTWeDKzGniAnfHR8K+Kw=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/29fd0b9f-1b65-41ee-8d3b-9621c99ffa68/67a5a0c8846c41bfb5521c1df3915bd8/dotnet-sdk-8.0.306-linux-x64.tar.gz"; + hash = "sha512-tZZTUIp/G3/1Y8M9ItkufnHV/qLwHWAEKd8+8mL9rfEdEcwlH8s0lxWuhv4Os/jzUiPw+E1w3S/hw5o/CfbgIQ=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/be9572a5-bcd5-46a0-b10d-0d00229ad57c/b80d3adb25c20fec467bd33f29f9a1be/dotnet-sdk-8.0.304-linux-arm64.tar.gz"; - sha512 = "6ce93ba330848b4045b6c63f96ad0a91c474361cb0a208bd4128d418fd6da04695559add63df9a0acf283a32e6e781328d3979af900e0b2382cf006c9982806d"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/45e213b3-e64a-4425-8022-12551182f8d7/7440e33fddc3b065de3ec91c25dc1169/dotnet-sdk-8.0.306-linux-musl-arm.tar.gz"; + hash = "sha512-JtkK+U9PC0AXRiHatloxTBxlgSNlDV5ypD/9rNxdHocYGo7OHNDuZwrmkLZRzWiUdW/RqzzxMxfeVddhkK+vEA=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/8b5c27ce-6c82-4a06-8960-15ebd5434595/508572144872e190e7f00ba6583011d4/dotnet-sdk-8.0.304-osx-x64.tar.gz"; - sha512 = "50f0265436e8c3d756ba00ab7fcd606cb5d452d7bede4daf97e4c02cc97dbbafc00b76f37ec4f07bbed4bee643a433849ddbd363ad2d916aa5965ee74ba317d6"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5ecf5f2d-d4a3-4e2d-a78e-9d0d02352473/b1167527b6911875ef8b4ae1734c6fd3/dotnet-sdk-8.0.306-linux-musl-arm64.tar.gz"; + hash = "sha512-Ce0bWlt6EDoFg1O+EHEhK16ZWI2fiEHWeRSsO/c1b3zWGn2qnU+JmMlBCARiVxe4Cgw2eygNxBubelwTJRnV9A=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5ba638c9-0721-42c5-8bf8-9706c0f9c033/f8dbde51758bd9e734a9c932b60e12bc/dotnet-sdk-8.0.304-osx-arm64.tar.gz"; - sha512 = "6993a950bc5bff0efe762ba2562a88761e93c61024d93633209950cbb68aeb5ff189fcbfe9247a1cdebbe37e738136123c7d4eda1050708608bb1ff0408eff4d"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5b32ef16-9c52-45e7-b713-afede9fad881/f15872dc2cc9df4d85b4b8d34f94d559/dotnet-sdk-8.0.306-linux-musl-x64.tar.gz"; + hash = "sha512-dWVzSibY7znXyOrylnYoyeDkyr3CJTkKhOKI4zXNLjZ67zxivkLybqP3cA+T12wFyulXyqjY96yOKsSl0SfT6Q=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5750e793-89c6-419a-9d06-cb4f85dc5884/de1bdcda0b0a5b42ce1e82e8011d97ac/dotnet-sdk-8.0.306-osx-arm64.tar.gz"; + hash = "sha512-MGq/ju8/FtiJlW8YQzsKcdnf7sw8Bj5ODTP9/jfU8tEQbCfMxElhqeLgWIOCwz0SGSuXNGIeqk7a5o561BWRpQ=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c5d29ba1-2952-4da3-8eb0-9eb0aad0a857/8535d896d90cf0e02244a20ad895290e/dotnet-sdk-8.0.306-osx-x64.tar.gz"; + hash = "sha512-cq9N/PmNTi7bq0hd1zeRoXucJ+ya/YekCo8KsDXKcE0MxRScNLSeKZh1/K7DCaFy2rgTYLziewm1F94CJLyuAg=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_8_0_1xx = buildNetSdk { - version = "8.0.108"; + version = "8.0.110"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/95a365b4-ac3b-4300-ab6b-54cbc73220f4/4aabad928064af8761315ef34b08c24b/dotnet-sdk-8.0.108-linux-x64.tar.gz"; - sha512 = "5666ddf6fa9b65deaba4d7c5fcc2e2d56f631c4f5f6fb2a9f5919af0616ab2b420b12a828becc2e4b8628a76ac3dae824b55abde5c6d5ac59ee131d7eceae7c2"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/090357d3-4a98-4737-af12-95cd0f7c51d9/d3c813f556a47c6e302767b8ee1d2915/dotnet-sdk-8.0.110-linux-arm.tar.gz"; + hash = "sha512-QP5sEu4/Vim45hUFIGVPmVqg7pgxXeFiN0IDDhaLFiJyGtZA0m9Ev8EfIZO3r6D4vcu5U81Be0V254rLBTu3Yw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/22fdf62f-eb78-456c-9a82-75da635a2dfc/d47faae423b4f0666944beeee63cb6b3/dotnet-sdk-8.0.110-linux-arm64.tar.gz"; + hash = "sha512-KGylYOebHHidgPtvm2qtLhBdbjk5z2djlBJ+SB6bIAvJ2nLYe7gWK2sqT2JpSjbtZsofPY7eJhp5CrtnZTfRZA=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/9d4db360-5016-4be5-9783-cbf515a7d011/17e0019da97f0f57548a2d7a53edcf28/dotnet-sdk-8.0.110-linux-x64.tar.gz"; + hash = "sha512-Pcckqt3tl7rmOZafixVgGWJlSvZWGhMv1lDsagOnRzoQYfj192BstLGksSfmzb+1k1S8AlvT8HtW4Khxa0tmrA=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/8991cc2c-60ba-4cf9-a687-1fc9c07f459b/12e0c566b39176c4c57f080c30754964/dotnet-sdk-8.0.110-linux-musl-arm.tar.gz"; + hash = "sha512-5YzynONaW3dGYQ8u3TVVZ1GTUBuZjafZ7FKHVcuz/cTSJJ2zOGRah4DUevRvFpw3wTybrWfgDIYNM0xGoBFAeg=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/a06e8e00-14bf-48c6-af18-799760b12228/8765ce8c3bf2e468a640084d3c12a702/dotnet-sdk-8.0.110-linux-musl-arm64.tar.gz"; + hash = "sha512-ejcF2layS9s3tRbkJd+UT6jPMqPV4lI5z6Sq2UpxbV8QkYMK1FJ0omEEq0q3cuDc2GeaaY2vW8NLJMtygtiG4A=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/07df5bfc-98ae-4335-91c4-c95ec5f99a58/48a310e5d1bde3e77c53a51c99bdfc08/dotnet-sdk-8.0.108-linux-arm64.tar.gz"; - sha512 = "6cc723f2b139d19b2e17da5936698d388a5b64638b75ef78c40c407ed3cfd3dea745c2916f03efc9e66479fc55d608eb3a89305727ecdb1c999b183b58de258d"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/47769d7e-7c66-4887-9041-caf21b3766f7/46218edc4901dc48740c6a154ae21b83/dotnet-sdk-8.0.110-linux-musl-x64.tar.gz"; + hash = "sha512-jjgxPlsWv8ATmiK6tkx4GPm2bbn/7U5q3sINyuhhjZ3CDGy+8rwks0QLZ5Vp4d3qRLB2YeQdRd4LoZbkUm9oGA=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5ea78b09-65a7-4b08-ac65-bfae17afb322/7416ecc76a30ae4c77e71aade36e037f/dotnet-sdk-8.0.108-osx-x64.tar.gz"; - sha512 = "a80fee279abfeb558a5540ca2a969a11bb3dbeade8c39d8c47be8a2d622ef1c2bedb22c874598ad41dbff2b95d5a43197bd9f55fc933ab4ede5edcb6a76cf6cb"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8d926822-6970-434e-b77f-13db037f929c/73e8ebd5b9129e903e6833c8e755b1ed/dotnet-sdk-8.0.110-osx-arm64.tar.gz"; + hash = "sha512-bWTqXAA4FLD+9LW750yvnqUCZ32iLGdrLbAbuUBTokM+qaqTIGcUWAnF2YhTpsSoB0s/JK6Ld8g1lAJwiYv8zA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/64a3d858-c2e3-48d1-8236-7c6702efc1f8/191bed6c7f89244eb998b0f186db57d7/dotnet-sdk-8.0.108-osx-arm64.tar.gz"; - sha512 = "83b01276474b4b62bf0a282fbe11d2353a2191d90becd403b373cd6dfc95264442a907117ad8f615765b13969267b887d26a9f24dbd5f88d8b55daa94412d13c"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3927a23c-34ce-48e5-804d-a83c9a4110f9/5e5642702e03e8572f2f772c2166d331/dotnet-sdk-8.0.110-osx-x64.tar.gz"; + hash = "sha512-xWuCfacAPfcAZiq9CPWvBr4iOHlL9O0kl41hLkW5fA2ieSv7RSOHGoCjI7stT3aJ3p0hbu8ptlEIeV3sIKdBgA=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_8_0 = sdk_8_0_4xx; diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix index 9232daa7073c..e740d180f0aa 100644 --- a/pkgs/development/compilers/dotnet/versions/9.0.nix +++ b/pkgs/development/compilers/dotnet/versions/9.0.nix @@ -1,143 +1,245 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk }: +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v9.0 (go-live) let - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24452.1"; sha256 = "05idm7kclnb8nw0nwv9wr40sm5fw7wk3zy2khiaiyvwf5c7klbkq"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1pxyk6yblg9y58w4lp9nb1dwwh0yvis4lq8b5w65ikihfyarm844"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1prajkaxj7j0jdf6s52pkmgxi8d8al6h7kvl9viwgqc3jqz2kib6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24452.1"; sha256 = "02kz3kagy2zq19vxq2rilnnc8lnal4g6l9zzsba3045daij0gp61"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1r8577sjl8bifagq8cz7lx2jzdhhn3r668h313mz7fxwl2bqwv1a"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1bdjl8kh80p3y51yngzvvz2kc9algsg5mx9givyapkcvj465pvhc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24452.1"; sha256 = "09ispgilx7ss1b43wqcy7c9k1145p622h22vg6z3c0g90i0n2qgw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1lnz66r42mrxyfjdv5hswwmxv14fikn5p2il512vq0rmqq3fjwg7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24452.1"; sha256 = "0l3wb3v7grmpipd6p40dajzc574qmffv01g68n5c5qy38fs5kicl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-rc.1.24452.1"; sha256 = "1091fxvfq9zicgrx9cnk3x7xsg4389qxnj2cbfa6fq96p6rizhi1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24452.1"; sha256 = "16q6865rwblb2jiqvpiasw6fcq1n4h221pi3xgjdc62vkx0k5xd0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24452.1"; sha256 = "01c2ya9wmf7qkpxyjlnlflihxqpi6wrfq4slp3dylyaylypgha45"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "01qlklw2y6ci1mm8p4fcx4f7sx4lzx9rbn7d9pn1j85j2bb88rp9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0qidj6b5qymfggpgflg3173jalzmvxz662g9pkj02cd1kbm6qp5a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0x7vfky0ar1i3521xaai20a08j43cg2azdfghxg5dxaa1ynl53j5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1i597rmx8ab3lbl4xkff5vnvkrikpm1zk1vd5b7bk8jyz1ls2wa2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "008w5dlmnpc73mxk580l79a84djxnchyw8cjabh8d0255fk6p3a3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1bcfx38p4zqbvqvp3mrjm8yzcbh88i4vwd5af90z1ikfaml6841r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "00lhshwp5gj8ckdq276lrjp7025xhmi33vlj1284xhfvbbfam58c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1wqqq09ixbshswx59fq6ignj88izazw1k8sqp2iarxfv0jkv8fng"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-rc.1.24431.7"; sha256 = "07qgqja3c1f62yfi3lqjjsyazp1hlkk41wkpk117b2xm8hw6yx4q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "0a0kmkrq99hk6sm690qwam6i0fdgzpx8yiawa6h4ylpazy8jxfxv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0qbaijdf4k3z71820r01z3sib5l7nlr6mjf75gil39yhd9s6slc7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0v56060wm998yy34pdr8cqp8vbc3m97yzsvc50rm6rkhdld44vql"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "08afgp9k7nr02jikd5xaim53qiqdn4r556v2sfmgv17mvix7vhmz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1ldmhq12xka64hn327p503m6ji12djkjax9lnr5lcflx527k5i3f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "13qk3ppy0ym4x81jwxa0322hlzxhhg6vkb5n0xzyzy5ks8rfqnx0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "17f4wkf7pq1c2hacl1z53am96wg5ydq9z0gsdz5zabkyfgs4knin"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1p39yik8xx87xv3jykljxv9jsazkkgcw47ckppzfzadf6967nh2r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24431.7"; sha256 = "0kqw9hnircqdbgpvk4m634nrn4lxj2p40a6qlscsqvw5yq06qvsz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "05y2i9grw8my2kg2svrrmpk2zflvcqidmkyycf58p9a3bmd2xp32"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "00gsj3xwfpsc02rv4h75hrjq140ppr1bjqz5ics9xygj9gqrf40h"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "12vld4zgmlm1s73vn3csss9v81zh53xv0hhw138rrizsl8sxb0x5"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "09yn2lqvij53mv0w4n6fqpxhh15hp3fap1ymjjv4bv11y0gsml22"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "1xvhiswcni1z6czcmra2q25i6ih4pf5crfajgzb6mhvxxambk50x"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "02mlwynhl24avpyvllsgpmnrp6q05a3q5ia34anfs9fjxdbf31yr"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "1gxvgw12g617vj5gki2ag51ll4bxqfffbg5bkqjbnxig4ilh0xmi"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "0v7fmdv74lgybk7bvighf5i1qwhlsb44lmxmkxn6f5ijc7jd1v5a"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "1ql7115ihqqv09qzd23jd4ng7dnhk0vjiy892w2vnlaghkka1klr"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "02v6yklh3kw6xl8aacxjbsijrh0x8654hnjf3aa0qi5ffpng9czh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "0bi1vrf5g26gmwv5js7rc4g5anva0m0gsinr7cvqixd2g13jl708"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1r3p996mj6hvl7gi6kffbnmm744i24smlxb9ay8hbkjmagv7pjp2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "0llqrym4z3jrqf79hpl7w25vqnhrjsjmywayp5vr4c0y2bjpl3sk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1hqfam3749yy15fyvqza54vvsx883kk0gq9fs2y78idmj0pr4g95"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-rc.1.24431.7"; sha256 = "109f84rqdqj5vl0fxyb7nhq5lil9s1b7l6cv5y8z4gg139dv0z38"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "08qm6yp5swc7zryk5qkkwbsxybn8if6zmrai280bll8ygn932594"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "0n5dgj0lhxcjzy8bbzkavz2d3ixf4d1diyq4i6nysgri81kk8wd6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "10lr36pv80c31vpzpnl3jxs655xm2d2b1gj26891hzpwp0v1z9l6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "07j0samh7jlkjphj2dlkphj0jrhs694qw2md6hr7mpinjr065ji4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0j1nkhmkg3p9n626j04lqr1vv3xnpnzvnhr39j4cn0ixyr7pbfqd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "1rq2ixq8r6r29mn2xi31jpck1xicgwg3zjzlvs5zdib8w7rxiznl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "11pxn2gwss6s8rmkgzvrljjwndif3pdlpfy0l3y5fbq60rrv6gy9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "044j6xkzylzawfjghqr5fkr63k0xhxvs7azmw8pbgh6mprmva4w9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "16izyfqy0d2mvjl45z75ymhvjyrk5njrcfv1k7h223b1c1rn8p8d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1fvhwlyvz0fm9cd0pw7l9a64shc565yk47hp873y7dai4lsch03v"; }) - (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "1fnk9q8iplj70jqy490fgg67z6sx5kyblkwd8z730s9yc3jr3919"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0yxnbm7p8s9s1j7rl7cmvg1j6xnxrp64qp4dsi9c5hzn0fxg3jjk"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "1lzfk31aq4kfaypbqrzv74vw1pw27576a1yxpdyxls84lmd10dsy"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0cq9i0cfd4gg5vgywf2jvyn8mbqnwjz6gi20x7ij85bad9hanm82"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0zv3brnkvn8v8ml2597vl7z1ydy71j6q7ycjkygy4l0b053870sw"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0vgr2xnskksrnrwlzk0n7qrajwkmz7cyvaifb0jbcx3kyzchxiz7"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0v22m76v8f5kwd5baww7l81ap33jrw4ccsz0lyki3hj2ssmzvr3i"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0x8nafwsh0y0dycdpwjix1rxfkwk25irsqrbzcbqbdx3aas6jpk5"; }) - (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-rc.1.24431.7"; sha256 = "1bbpncqbd2f73n8nznhi2m2i5z8n2hds0ryz616n0nzcc4y3gnkz"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "08k1fzwvqyiqik98r0b03f089y4n06p5nfr73688rijgzm55l8zh"; }) + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-dhl6zr9+TY8ty/bJjkm7bVbRwc6J+P8FqOiv1B3/+yc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-5NMC2RF2xmdc5tPbeDvkMtr24JeWfh1LzqU8+3o9nz8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-N3eNI7njwqYAwf6Y/MEliLinqCbR05lSelIWgFG/P1A="; }) + (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-KlBEQYRSy00ZH+bFkG0xPpwT7qOmm47bBgeblYtI5G4="; }) + (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-FJ+4ZPyU6LZLGr0c/zffRGH2lpNrclbaC3V8a8u9kro="; }) ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Ye6nUVh6gkD68zVlUg5uXYob2WCfNb+NgI7ByGkPrsY="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-PnyYvI8pAmh1P9VWXX/Ckz4THQEbiwg/3wD7unDy/5E="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-leqqHeRkRMJCDX6P4mzjdc/E7X1GfvdN2iZ3QRAOjCA="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-tmEH/rvjBsmocEFt4iFnzILq+kJqEO9E6GHXqFTLmE4="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-v5lk9Y0Krg3P6umdHnB+3RORoovXRzUkKjmd0WWLtB8="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Yv0eYUjFuGPEl+NNGboMQEsuuh72pg5adUHWA0lg+9w="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-x1VIdkrzpg3GTVtHRlKPsPC062H3FZyu4ZZsaitTjLw="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-f7gxJhKCgdqoByaOCQUCJRfkzvvQn+EbaZJqXJTTLCU="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-qjvgKFhLLRDYEJZqJzzosj+G0/2rHVo9iltR6w5YvOI="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-9odWsDB2OiwJ1Rw0SfNREnSvYn1p3WSmomBFbWegwOw="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-BVQtI6mHKz/uRk6jszpYesgKvnOmiTEQa5JwjFmhp4A="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-hioVbT84W4i7/Li0UIuebF34RHwkHRCdYyn7vxkMyk0="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-zqAivHOPdikSayzdg4lWEaB8yvbdRIbhwuYonx+cYoo="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-y+lKV0p7ybzXtDpTY2GwCdh2IWnAb6MdeQiRD87tr4Y="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-fhc4491T3JB+k4XmPyfMK6bwqpfx7Mbugs/sh9hCb6U="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-hF/f/muateSDsp9oNafpzgtFtNm0kYuAG5YhJCVx0L0="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-9AbfJQ6S6wxIwyecuMQPFp5g1Be/MZKz0A+YLvg0vME="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-gJIIbWDEcDP3fJZLS67+pSeIUBJPdAxy/ICLU8nKGLU="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-SdNqAE+cjhGk8Be1sPOy3SvcXmUlBEvFUAMnGaBm9dU="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-C/rbNcMEVFr+X4cc8uWafZZfTBmVrdohkwlVay49i5o="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-CrY8BoFI0y3jGCoMUxGle+q/1eR0jDo3c4/OHGkfpWc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-ry7q5h8R7E5EYWekPpurKvQSzIvgk6+PDhXmO8LGmbc="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-rWX+2sujaeh4865lAXlazeEkAhdHv+nOw+nUGFg/PCY="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-X+/z6pjwjLfAaVlRu9a8UppQH+rWGNfOd+M6T6IpGA8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-AkQO8KH84aWw/nbLTU5Pwe3Y+nMY6qO/ocak626vfTI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-gX5B8VfFFKQ/c+ZyW/plJQvJR0tD3/L5u2LAF0GwqKg="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-/h8tt997pSkGTKFcPjc41m1L6aFtnlrhyI89qtT4AAo="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-hzjiFI6ldUwohHqn+joLwj0QCSEsKA7fpsusiSUYiOE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-c7USudhIPx+sIax6rAq35ZWENK7VcvTRMI5Zjw0lBRg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-rW+noSMYQ/9HGMWY4Q1GdLyJ4XlwPGyBoOxJaldKU3k="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-3PrM40rNOxEETs+BuB4apQp11UM/Tt4qCqqEe6pDCug="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-fbp4ArPk2XTAssAQTkrNtFHU9kzIV5zY/Jjq92Mpi+s="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-RWW2aK5C5b6opNsXqnO6XjCDPZ0EtHToHBOgPjGQS1g="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Wd+w/+tWFL+gmhmf0wj1ym/JURGxHjJqLsieHsDw5sg="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-QELdzwfVBm1vMmFWdSN23g35/O/rtan708KHN1PiDV4="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-yvHXdiGpCUWxLduToPbio8fcw9Mtyl5zvo9tCg0aV98="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Zrs2qA7PtIYBjpk/i3HzMrqOvU00I9hBfTjp5o+4fsk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-fsmi+VG1+9QYegQT3vPN6QhNVUOKQu2X4u92etqPTfI="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Wr6Tsylj+lyhfrwMUJ44duIJ8qTNQzxkmAMy90hv1uM="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-Cn7eSPm1YLMdEXGkNwiFo9nGfHNq+bJRFA3f4A/9Aec="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-CGdQ7pTIO8gUrWB6KozR9DWrILLNk4K50p7hfj/KA/4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-PHMxmQJ8GxmSliTONInEGcKUxAfLAlmY4v8H86dxxYs="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-9Botmmfm2w8kmre5N6QdhczSl9ULvPKzNi8A5SNxP/I="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-FCTCJCtnbeN46+G6jionwMVL/ombLiWJ12w8gZv7vPk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-O2kh/ld/qx8AoltZBY5QScxXmePNwu25xwix6aLPhuQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Nek+eCGSSlSXFElKc3ZDdKAR+VqfYIKO0ZvXxLPAnvQ="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-GhT5AhdQZnFFr3LZsArYg9asONt+teRjUJJjenhSY3k="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-Goj+/hMmaBAMPB9E1whGTgDfu2a5Kd6uAnIrLI88juQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-dkt2vVIvPIt+ewrp8ggNODm6Bvbj6LLpFmHH81PnVSw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-mQflfj047ONkda7KpQZga0WWzbIGzMf9Ls+ipMrnpuw="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-LIOwkyYFeTVmiQjJLt++yutwY7rLupshKhptuciNjVI="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-6aXnFRj5cnGWFjL830CktLTqisZsqnSaeuBC5J39eeY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-V0WFhdRjor/oI4pcB7/XhKjBFefJFy6Mo4BZjmUJjEc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-btKg62ky/0St7WYjXXZnoz99DdHNUpCnOXHaBWSc/rs="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-LX5fCmJl4PFgHStU5s4cNjUIeXFlinlA0PAD4tRYZk8="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-gRLb6tj22ig30xwYcSGL+mb3IEAoPweMGJtbTpfTS5k="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-WgEZAR4QO34XCQHhxbZ4DAlRDXkdyftbVFjanN7lm1o="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-W2K3711R50a4ofgvv9lOsHY8HC2luKjfSTPByGJhP1I="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Zv+W3RVduqZy+8tDuGOzgYEDwsJf3rBTehoZKGC1eEw="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-R2ZhPNxNQxgvDMENdOblDL+PpZqfjzau70COkjUTO10="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-XgQyMZ2KEgZaBgrJKGYtlL6msnvxoLvzisHdOkN3Nlc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-1RpTJXq08lBJ1SqBNKSzZPs3DB6Wc1hNXYYuyqwI700="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-IMroqfAI4aHTFggLYwURdsY7Z8M3mly8QEJjQRSgPa8="; }) + ]; + }; + in rec { - release_9_0 = "9.0.0-rc.1"; + release_9_0 = "9.0.0-rc.2"; aspnetcore_9_0 = buildAspNetCore { - version = "9.0.0-rc.1.24452.1"; + version = "9.0.0-rc.2.24474.3"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/da25731f-e296-4e2a-8f2b-0213d26e1799/859039cd012f8cfba53991f8f5543609/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-x64.tar.gz"; - sha512 = "f8fd285d67bb044d631596869d6301e10a2a243c81c9a05096a66aff4fb3431529812c7482e6cf0e065e8e065fc50b16b50d7f2a495ab30077a68bd45b3ba376"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/bb68e2f8-fc3e-42ae-85f6-ba2bf4bc8ecb/524d5256a3798a7795837d7b104fb927/aspnetcore-runtime-9.0.0-rc.2.24474.3-linux-arm.tar.gz"; + hash = "sha512-1qqmHfZrxCKWNQ9WoT5PWltWdw5izfS7KmR/gNs7ymMuf4tk27LSuEJuhi7fPKdb68/p219qbpTsCFV6T3pGGw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/687495c2-a3a5-4cf5-98e3-2adfef55a1e4/ef59f43e13c7107ab17e59c276da2485/aspnetcore-runtime-9.0.0-rc.2.24474.3-linux-arm64.tar.gz"; + hash = "sha512-tt5mjOhxRHa+eK4A7WYCfzpbBtlcZ2itaz7KTQ85bJGEMmfA6MAxYLcJp6zcvCsJBH8eyNRjCdQMPTH4ScyYHw=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f75b68ca-9e93-468c-925d-3ce85f8a4d0f/3a31e60149a0ca0f9e8d7c05666cfcba/aspnetcore-runtime-9.0.0-rc.2.24474.3-linux-x64.tar.gz"; + hash = "sha512-k3DCYXTNfxsv71jgpTBByUt9VBLxXqWGX7xlOmWxSLH5LnmS8UdhCmyi6SAR/yjENICrJqbn+M1W8hia8GEL6A=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/bc4a32ff-51a4-44af-9f7e-fec219ed91b6/4ef16e8019a45a760fc00569cb979ccd/aspnetcore-runtime-9.0.0-rc.2.24474.3-linux-musl-arm.tar.gz"; + hash = "sha512-+mwjYESxZ9+g44mq87jkLRQp8ZOvAUua5oV+LcG2SmWoAoxqwX6D2+Xsh25o7py4U9/gGciLOp+hX8xqoLAX+A=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8548303d-93c5-4846-87ad-af4c79877a26/6e3dc8573f2cd923959bdc39c8d37eb4/aspnetcore-runtime-9.0.0-rc.2.24474.3-linux-musl-arm64.tar.gz"; + hash = "sha512-YwPe+FCO5N+Xnm7mgBB32n0FF9MgO9/3SjbNuuVwidfHJpHtoApdqnQLKDGQlQtcqO0PoRErfSqxHBRZCd6RmQ=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/c5075cd5-2552-4f77-96ce-31450f9ff8d5/e6ff2b52e2a27a60eb3585cbca01d60b/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-arm64.tar.gz"; - sha512 = "84610a38fb9a98eb7bd26ba89a9c4998682ec3fffb5eade5bbafbafd63cac7d9a5279618bb5b2575d27feec098da5fe6f7150c67253f3f37762601590396e122"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ee8ef896-6330-4f7f-86ad-172d67793e08/fdbe8aa1eb6fe38e8ad3fe471495d388/aspnetcore-runtime-9.0.0-rc.2.24474.3-linux-musl-x64.tar.gz"; + hash = "sha512-nEGqO/ymPJSP+HPMNBoJEEmEEWfmRMwU8fVD/qO+dbEICMOEgwORb/NHIAOszYAfe8gfzIbZLBpcns0p2b3jug=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/b0414fd7-20f9-4363-9dbf-072880e97b17/89584fa06e9ba1154a7e02402a28d82f/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-x64.tar.gz"; - sha512 = "ff4a6e35b41f5200521ea4b257b293e4d48f1786ccaa9cd85b55ba96ad36036dbc149d2ff820f1dff5f2d9acf6c38b6c3540e700c2c2db5fe6d82d4f85f461ae"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0ffcfb0e-3d17-4b00-8bf2-db75b095252c/5bd0a672caf63b32b39b92c0677a2a4f/aspnetcore-runtime-9.0.0-rc.2.24474.3-osx-arm64.tar.gz"; + hash = "sha512-HdXqCzgA3Ti9piOSgJM2A5ummzrD8agnOmhmTKDCO2MoSKNIuNnp4OdlObbl4VgkMguDBXHC+uPflK0PJiiNMA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/0bae8dff-9440-4388-a03e-af44e20673a8/8ab257a4963967970cd59c31c213f38d/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-arm64.tar.gz"; - sha512 = "03f7e03352d1ad2d54e9de4c1cdd7a94c2311bb36d4c6296661fab286cddebf3f57204f73892efd53f43cfb13ba73cafae95d0522c47be03203d5fb69a0ecfe9"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/7a757e46-1c68-449e-8b1c-64293c30242d/aa10955edc95ab4419bbad34f8e4899a/aspnetcore-runtime-9.0.0-rc.2.24474.3-osx-x64.tar.gz"; + hash = "sha512-tirwJSlndP0w9g6+OKgGEviqB4Av/PHJPT2pBStGEQj+XK7DVvlczYdy6nUUhiw3mvuzwZsjyOi1OvmhhAiBPg=="; }; }; }; runtime_9_0 = buildNetRuntime { - version = "9.0.0-rc.1.24431.7"; + version = "9.0.0-rc.2.24473.5"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/72048153-7c19-4e69-bcf3-22563060db07/cd181715a0f7cd3cec8c87b115181da9/dotnet-runtime-9.0.0-rc.1.24431.7-linux-x64.tar.gz"; - sha512 = "9f9a85b8d9f6362ed2c2d0edefd04999181b2c386647644fbc1d9f248255387324399edb1c40bc7fa8c47adc22e2d71db5f25ce794521d59e46c40593b5f6cc5"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/a0fea09f-b78f-4381-be80-3bb7c363f010/7dbd31bdfde0fd28038f9feb5c24de4e/dotnet-runtime-9.0.0-rc.2.24473.5-linux-arm.tar.gz"; + hash = "sha512-w+oUlK7VbFV0BnhuFtriWi0bCeCG+kcL7nhQID88mV/wh4ujZwehFxnbHlF8b8ulOxA6aYe0/akVjfU2y/0n0A=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/54f6fb3b-da5b-4a2d-98f4-ae07c814a586/e5f2a5ba551ffe53ea1c2ae9b7681f0b/dotnet-runtime-9.0.0-rc.1.24431.7-linux-arm64.tar.gz"; - sha512 = "8542bb9381e4eca6f0ebceddec68525cc59e34f7244613cf33cb2151f570c3345cb6d081c492b01070e762d3440f02d4558234532d58ff3dc919057e06b7bdac"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/59fcedfa-70be-4166-ad7a-aa724c8d0754/56ab42fd18b3ec36eca8e9a52398032a/dotnet-runtime-9.0.0-rc.2.24473.5-linux-arm64.tar.gz"; + hash = "sha512-NVzbOrCgH74jtwZ5FsdRazFq2jYN6pt3Nf6TXsoXI8obMkB+yjr6fHIrvwYZkAGabVY7w1l/33KUDOs4rirQTg=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/13d7d905-549f-44e8-9062-a678a742c5fb/94c51ca9c08ef9b5cceabafc2337118f/dotnet-runtime-9.0.0-rc.1.24431.7-osx-x64.tar.gz"; - sha512 = "f62f867eab633737c450ffb0543a726f1ba2f46a4265cb47978d88dad0c6b80a8db5ccf6f583842f85cb613b96d2f7c6806d669826f4b92b906e71d8d10e53e8"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/69beb740-ba0e-4a0b-a82a-737c61cb75cb/eff5e94b382efcdcd2a80278e04edb92/dotnet-runtime-9.0.0-rc.2.24473.5-linux-x64.tar.gz"; + hash = "sha512-ugQx57uCrMqxRM8WZsRwVJ2BAqF/JgzX4NmIkjon861cEMrdFgtaGA1bsVlyFD8w/bc7aH0fjMwC6ekzSrjCzQ=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/8abf3e03-1ab3-40fd-a9cf-fa22005be2e8/cb0c3c5d130ef8ae76a982860fd3606a/dotnet-runtime-9.0.0-rc.1.24431.7-osx-arm64.tar.gz"; - sha512 = "a825fca9edde53ab6abc0efe0c44d6fb25c5c77aeb2d35b6c414d42f364453ceb069ed9db8865c2bb82523989fceb7cccbf86047699590ff756a6b9c54c21d74"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/1ae9bcc8-f0c6-4e58-ae9e-1a97ad4176e7/97a25ba8dd8535ed125d0c3773a8f64b/dotnet-runtime-9.0.0-rc.2.24473.5-linux-musl-arm.tar.gz"; + hash = "sha512-WeLXyzWmOYR1LSlr8CoejCqNsNy7K7zkM3X59+qN7ZOGfOTCCwnAPelOPjNGPxXL+a/wWKkzHa8KxQTEdx25bA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f5868a65-9c13-4020-8f22-afbd6ce09d13/7a342e4798cebc6cba90a6569e9dbec0/dotnet-runtime-9.0.0-rc.2.24473.5-linux-musl-arm64.tar.gz"; + hash = "sha512-PekyCYPo4EPrW8MB4yRCVXCyHM8NXrl8Ph/eKrl+mCBtjReE2W1pE74LtLjOUMXP+Vbn+Jge4KHxyd8idnkhKg=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/d9e2009e-5bab-4a62-88e1-ae5e3ed4e0a0/617b2bf0e8292164424e71c342ed8d13/dotnet-runtime-9.0.0-rc.2.24473.5-linux-musl-x64.tar.gz"; + hash = "sha512-1AoYYdTlUKRtTpEEF20QfqoKG+lMxqxYPvMx5q0xzK9NN6QnYgMAo3N2yG8SKpIKK3tAtOSsNHvi1io43IPZZQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/cb30091f-cc2e-489f-a8ae-87a08a9d220d/7ce11a740f6d5641c514fe68b2cb2dd2/dotnet-runtime-9.0.0-rc.2.24473.5-osx-arm64.tar.gz"; + hash = "sha512-e1DF3vwyGDOYKU5MuRpZBgYXZ4QIpYbOmB4PR/uDPIUxsw4D/EZXoJFjRgYFcwJB42bJITw4EHfmVHU441bosw=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b9385375-2ccd-4e9f-9e4a-8d7f6d58c3d3/00e123163e6bfaae9119c5fb355f0d53/dotnet-runtime-9.0.0-rc.2.24473.5-osx-x64.tar.gz"; + hash = "sha512-TSYNygwim2QOkORVS1FhwLnZX4u5gOtT5hlAviLIMoSdMokQfhyBWMgYklh2GidpXppClrkIag1EyMEkQFMfyA=="; }; }; }; sdk_9_0_1xx = buildNetSdk { - version = "9.0.100-rc.1.24452.12"; + version = "9.0.100-rc.2.24474.11"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/3b2b3c23-574b-45d7-b2b0-c67f0e935308/23ed647eb71a8f07414124422c15927d/dotnet-sdk-9.0.100-rc.1.24452.12-linux-x64.tar.gz"; - sha512 = "e8130817b779d0104a6eee33d98d97c3fad1c336013435f47c0e9e22370172b75da37ade76e49dec7cbe696884390d2e6941cc69e2bad5593d6d1c6b41083051"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/ba992713-4a38-4b45-9c24-8222f2ba01d7/e8746f2e70e0f06e3d9282c6d43bce65/dotnet-sdk-9.0.100-rc.2.24474.11-linux-arm.tar.gz"; + hash = "sha512-c2oOG/d5FSjmyYhIUX9s5x2U+hpacrHl2iybVycJ1Xlkq1OyDx4rn8aOLMc5zbo7kfwI2F6EB/u/zQ1fuxHH2Q=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/817f5589-0347-4254-b19a-67c30d9ce4f8/3dfe6b98927c4003fc004a1a32132a76/dotnet-sdk-9.0.100-rc.2.24474.11-linux-arm64.tar.gz"; + hash = "sha512-tTLcvLR8T9LJBgGNLsZj3hcZF598naj2Kj8hpi40zSYJ+3zuyJ9a7bKjUkf2f1Q6AsaE4WkgU7/y/cQYTfY/Uw=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/202e929a-e985-4eab-a78a-d7159fc204e4/0c85219d441cd3bbffd4fb65b7e36fe5/dotnet-sdk-9.0.100-rc.2.24474.11-linux-x64.tar.gz"; + hash = "sha512-EmqSv6nvTnBgn4snzeD64bFEqRr4pG3pSdgD0qobrQKFsbm4/GDUAgbTRqrEnkhwm+xOds325Un4kFCGAD6AmA=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/ce9a6b41-d58d-4def-bf4d-2ff6a022c846/321706c736aaf0391a642d5d1e4d3e1b/dotnet-sdk-9.0.100-rc.2.24474.11-linux-musl-arm.tar.gz"; + hash = "sha512-pzn40pdEFS0zt7O3SThvD1E7ZtHy42PBCCu4dt7TiOHMbdJrD5ArO835V07dOGn4ALkjZIw92pDckbdsStXNlw=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/add40efa-8de0-4fb8-9ac1-bed94c85caae/30527cbdf0f429eb778ab03f2fadf896/dotnet-sdk-9.0.100-rc.2.24474.11-linux-musl-arm64.tar.gz"; + hash = "sha512-KlWo4OMbUg3ZzfPvqA9Seuh77DuA26RLxhPKq0dWtz0fFFCGSJ+rD1WpZogCmsoUBhriWNHc/Dbt6O4LKo9Htw=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f7739964-9e84-4bb7-9435-509458a15f9c/a95ad7f9deb8ce2fd30173dfe86f55ba/dotnet-sdk-9.0.100-rc.1.24452.12-linux-arm64.tar.gz"; - sha512 = "f5742537128801c199a127266175066058788a26e8a603cbd26a1c16e9ef33a5d418e4790a3cea722d7de483eee8b68e0de4bb1dfdf279713369ed3b4d163a11"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5e1ed970-6da9-42aa-840c-784c63c3a1af/4bb5d67f6983d22667d4d198d6e72ffd/dotnet-sdk-9.0.100-rc.2.24474.11-linux-musl-x64.tar.gz"; + hash = "sha512-JCyCo2HXOcuZdhnJggR7BfpGyNclZOq4TaSdK4Mb6xxcvyveWA3wtoVYdL8aQ2CiYxkSd9VgLc3GoBlDWgDO2A=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e26e36f6-746f-462c-8599-5d0a1f00e786/f1b8264ac10442b40009aa8cea46b23b/dotnet-sdk-9.0.100-rc.1.24452.12-osx-x64.tar.gz"; - sha512 = "0d1f0718eeef006c3ecfbefeebf9df0772ec22c74db4bb635b6463b8aedfd3957274b908b51ec019ced69d3e7af4ae9252f18e87b14a4411e1089a4cc41e37d0"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/90c92374-0f9d-457b-a612-13cef4db7507/fc5ff8876123abfcde954906215ed1d0/dotnet-sdk-9.0.100-rc.2.24474.11-osx-arm64.tar.gz"; + hash = "sha512-wkVoXBJXKVaXrqxs8WnNY3XX5yXruHYO/OvsOfpuv2/jrVtgmUJviZ+KCgMywEeXfef4QypObyijSEiRSpJboQ=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/930f4eb8-188f-47d5-8a26-28ca393b7d1b/c07a519e3d7e326c3f640ef72ea1193e/dotnet-sdk-9.0.100-rc.1.24452.12-osx-arm64.tar.gz"; - sha512 = "af30b31cd937e9fc97e164b83628c2c1ecd21329b75f742d9f5232aa68427d25b5d702cc565aa860d3c738c8727790569bf66a3ed74e5cef719ae589d302846f"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/33f4f5cb-7423-4930-8e4b-d96f1fd088a9/87d414df2c160713cdaeec06c62cf6a9/dotnet-sdk-9.0.100-rc.2.24474.11-osx-x64.tar.gz"; + hash = "sha512-EY+pVt0zDQ30SeFGhbNi4ut7RPvpVBuXwSXZOnjcLlMCiKO6Hro5KNMF9KC5JUyEgMC4kwQYciZnn5W9bxvHWg=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_9_0 = sdk_9_0_1xx; diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index d6cfcd9035d9..7cdbd36e9b5d 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -1,46 +1,48 @@ -{ clangStdenv -, lib -, fetchurl -, dotnetCorePackages -, jq -, curl -, git -, cmake -, pkg-config -, llvm -, zlib -, icu -, lttng-ust_2_12 -, krb5 -, glibcLocales -, ensureNewerSourcesForZipFilesHook -, darwin -, xcbuild -, swiftPackages -, openssl -, getconf -, python3 -, xmlstarlet -, nodejs -, callPackage -, unzip -, yq - -, dotnetSdk -, releaseManifestFile -, tarballHash +{ + clangStdenv, + lib, + fetchurl, + fetchpatch, + dotnetCorePackages, + jq, + curl, + git, + cmake, + pkg-config, + llvm, + zlib, + icu, + lttng-ust_2_12, + krb5, + glibcLocales, + ensureNewerSourcesForZipFilesHook, + darwin, + xcbuild, + swiftPackages, + openssl, + getconf, + python3, + xmlstarlet, + nodejs, + callPackage, + unzip, + yq, + + baseName ? "dotnet", + bootstrapSdk, + releaseManifestFile, + tarballHash, }: let - stdenv = if clangStdenv.isDarwin - then swiftPackages.stdenv - else clangStdenv; + stdenv = if clangStdenv.hostPlatform.isDarwin then swiftPackages.stdenv else clangStdenv; inherit (stdenv) isLinux isDarwin buildPlatform - targetPlatform; + targetPlatform + ; inherit (swiftPackages) apple_sdk swift; releaseManifest = lib.importJSON releaseManifestFile; @@ -50,16 +52,23 @@ let targetRid = dotnetCorePackages.systemToDotnetRid targetPlatform.system; targetArch = lib.elemAt (lib.splitString "-" targetRid) 1; - sigtool = callPackage ./sigtool.nix {}; + sigtool = callPackage ./sigtool.nix { }; _icu = if isDarwin then darwin.ICU else icu; -in stdenv.mkDerivation rec { - pname = "dotnet-vmr"; + # error NU1903: Package 'System.Text.Json' 8.0.4 has a known high severity vulnerability, + disableNU1903 = fetchpatch { + url = "https://github.com/dotnet/sdk/pull/44028.patch"; + hash = "sha256-r6AOhXhwT8ar3aS0r5CA9sPiBsp3pnnPIVO+5l5CUGM="; + }; + +in +stdenv.mkDerivation rec { + pname = "${baseName}-vmr"; version = release; # TODO: fix this in the binary sdk packages - preHook = lib.optionalString stdenv.isDarwin '' + preHook = lib.optionalString stdenv.hostPlatform.isDarwin '' addToSearchPath DYLD_LIBRARY_PATH "${_icu}/lib" export DYLD_LIBRARY_PATH ''; @@ -69,53 +78,58 @@ in stdenv.mkDerivation rec { hash = tarballHash; }; - nativeBuildInputs = [ - ensureNewerSourcesForZipFilesHook - jq - curl.bin - git - cmake - pkg-config - python3 - xmlstarlet - unzip - yq - ] - ++ lib.optionals (lib.versionAtLeast version "9") [ - nodejs - ] - ++ lib.optionals isDarwin [ - getconf - ]; + nativeBuildInputs = + [ + ensureNewerSourcesForZipFilesHook + jq + curl.bin + git + cmake + pkg-config + python3 + xmlstarlet + unzip + yq + ] + ++ lib.optionals (lib.versionAtLeast version "9") [ + nodejs + ] + ++ lib.optionals isDarwin [ + getconf + ]; - buildInputs = [ - # this gets copied into the tree, but we still want the hooks to run - dotnetSdk - # the propagated build inputs in llvm.dev break swift compilation - llvm.out - zlib - _icu - openssl - ] - ++ lib.optionals isLinux [ - krb5 - lttng-ust_2_12 - ] - ++ lib.optionals isDarwin (with apple_sdk.frameworks; [ - xcbuild - swift - (krb5.overrideAttrs (old: { - # the propagated build inputs break swift compilation - buildInputs = old.buildInputs ++ old.propagatedBuildInputs; - propagatedBuildInputs = []; - })) - sigtool - Foundation - CoreFoundation - CryptoKit - System - ] - ++ lib.optional (lib.versionAtLeast version "9") GSS); + buildInputs = + [ + # this gets copied into the tree, but we still want the hooks to run + bootstrapSdk + # the propagated build inputs in llvm.dev break swift compilation + llvm.out + zlib + _icu + openssl + ] + ++ lib.optionals isLinux [ + krb5 + lttng-ust_2_12 + ] + ++ lib.optionals isDarwin ( + with apple_sdk.frameworks; + [ + xcbuild + swift + (krb5.overrideAttrs (old: { + # the propagated build inputs break swift compilation + buildInputs = old.buildInputs ++ old.propagatedBuildInputs; + propagatedBuildInputs = [ ]; + })) + sigtool + Foundation + CoreFoundation + CryptoKit + System + ] + ++ lib.optional (lib.versionAtLeast version "9") GSS + ); # This is required to fix the error: # > CSSM_ModuleLoad(): One or more parameters passed to a function were not valid. @@ -132,216 +146,228 @@ in stdenv.mkDerivation rec { (global-name "com.apple.system.opendirectoryd.membership")) ''; - patches = lib.optionals (lib.versionOlder version "9") [ - ./fix-aspnetcore-portable-build.patch - ]; + patches = + lib.optionals (lib.versionAtLeast version "9") [ + ./UpdateNuGetConfigPackageSourcesMappings-don-t-add-em.patch + ] + ++ lib.optionals (lib.versionOlder version "9") [ + ./fix-aspnetcore-portable-build.patch + ]; - postPatch = '' - # set the sdk version in global.json to match the bootstrap sdk - jq '(.tools.dotnet=$dotnet)' global.json --arg dotnet "$(${dotnetSdk}/bin/dotnet --version)" > global.json~ - mv global.json{~,} - - patchShebangs $(find -name \*.sh -type f -executable) - - # I'm not sure why this is required, but these files seem to use the wrong - # property name. - # TODO: not needed in 9.0? - [[ ! -f src/xliff-tasks/eng/Versions.props ]] || \ - sed -i 's:\bVersionBase\b:VersionPrefix:g' \ - src/xliff-tasks/eng/Versions.props - - # at least in 9.0 preview 1, this package depends on a specific beta build - # of System.CommandLine - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n NoWarn -v '$(NoWarn);NU1603' \ - src/nuget-client/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj - - # AD0001 crashes intermittently in source-build-reference-packages with - # CSC : error AD0001: Analyzer 'Microsoft.NetCore.CSharp.Analyzers.Runtime.CSharpDetectPreviewFeatureAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'. - # possibly related to https://github.com/dotnet/runtime/issues/90356 - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n NoWarn -v '$(NoWarn);AD0001' \ - src/source-build-reference-packages/src/referencePackages/Directory.Build.props - - # https://github.com/microsoft/ApplicationInsights-dotnet/issues/2848 - xmlstarlet ed \ - --inplace \ - -u //_:Project/_:PropertyGroup/_:BuildNumber -v 0 \ - src/source-build-externals/src/application-insights/.props/_GlobalStaticVersion.props - - # this fixes compile errors with clang 15 (e.g. darwin) - substituteInPlace \ - src/runtime/src/native/libs/CMakeLists.txt \ - --replace-fail 'add_compile_options(-Weverything)' 'add_compile_options(-Wall)' - - # strip native symbols in runtime - # see: https://github.com/dotnet/source-build/issues/2543 - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n KeepNativeSymbols -v false \ - src/runtime/Directory.Build.props - '' - + lib.optionalString (lib.versionAtLeast version "9") '' - # repro.csproj fails to restore due to missing freebsd packages - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n RuntimeIdentifiers -v ${targetRid} \ - src/runtime/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj - - # https://github.com/dotnet/runtime/pull/98559#issuecomment-1965338627 - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n NoWarn -v '$(NoWarn);CS9216' \ - src/runtime/Directory.Build.props - - # patch packages installed from npm cache - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n Import \ - -i \$prev -t attr -n Project -v "${./patch-npm-packages.proj}" \ - src/aspnetcore/eng/DotNetBuild.props - '' - + lib.optionalString (lib.versionAtLeast version "9") '' - # https://github.com/dotnet/source-build/issues/3131#issuecomment-2030215805 - substituteInPlace \ - src/aspnetcore/eng/Dependencies.props \ - --replace-fail \ - "'\$(DotNetBuildSourceOnly)' == 'true'" \ - "'\$(DotNetBuildSourceOnly)' == 'true' and \$(PortableBuild) == 'false'" - - # https://github.com/dotnet/source-build/issues/4325 - xmlstarlet ed \ - --inplace \ - -r '//Target[@Name="UnpackTarballs"]/Move' -v Copy \ - eng/init-source-only.proj - - # error: _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror,-W#warnings] - substituteInPlace \ - src/runtime/src/coreclr/ilasm/CMakeLists.txt \ - --replace-fail 'set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" )' "" - - # https://github.com/dotnet/source-build/issues/4444 - xmlstarlet ed \ - --inplace \ - -s '//Project/Target/MSBuild[@Targets="Restore"]' \ - -t attr -n Properties -v "NUGET_PACKAGES='\$(CurrentRepoSourceBuildPackageCache)'" \ - src/aspnetcore/eng/Tools.props - '' - + lib.optionalString isLinux ('' - substituteInPlace \ - src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.c \ - --replace-fail '"libssl.so"' '"${openssl.out}/lib/libssl.so"' - - substituteInPlace \ - src/runtime/src/native/libs/System.Net.Security.Native/pal_gssapi.c \ - --replace-fail '"libgssapi_krb5.so.2"' '"${lib.getLib krb5}/lib/libgssapi_krb5.so.2"' - - substituteInPlace \ - src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ - --replace-fail '"libicui18n.so"' '"${icu}/lib/libicui18n.so"' \ - --replace-fail '"libicuuc.so"' '"${icu}/lib/libicuuc.so"' - '' - + lib.optionalString (lib.versionAtLeast version "9") '' - substituteInPlace \ - src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ - --replace-fail '#define VERSIONED_LIB_NAME_LEN 64' '#define VERSIONED_LIB_NAME_LEN 256' - '' - + lib.optionalString (lib.versionOlder version "9") '' - substituteInPlace \ - src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ - --replace-warn 'libicuucName[64]' 'libicuucName[256]' \ - --replace-warn 'libicui18nName[64]' 'libicui18nName[256]' - '') - + lib.optionalString isDarwin ('' - substituteInPlace \ - src/runtime/src/native/libs/System.Globalization.Native/CMakeLists.txt \ - --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib' - - substituteInPlace \ - src/runtime/src/installer/managed/Microsoft.NET.HostModel/HostModelUtils.cs \ - src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets \ - --replace-fail '/usr/bin/codesign' '${sigtool}/bin/codesign' - - # fix: strip: error: unknown argument '-n' - substituteInPlace \ - src/runtime/eng/native/functions.cmake \ - --replace-fail ' -no_code_signature_warning' "" - - # [...]/installer.singlerid.targets(434,5): error MSB3073: The command "pkgbuild [...]" exited with code 127 - xmlstarlet ed \ - --inplace \ - -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' - substituteInPlace \ - src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets \ - src/runtime/src/native/managed/native-library.targets \ - --replace-fail ' -no_code_signature_warning' "" - - # ld: library not found for -ld_classic - substituteInPlace \ - src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets \ - src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj \ - --replace-fail 'Include="-ld_classic"' "" - '' - + lib.optionalString (lib.versionOlder version "9") '' - # [...]/build.proj(123,5): error : Did not find PDBs for the following SDK files: - # [...]/build.proj(123,5): error : sdk/8.0.102/System.Resources.Extensions.dll - # [...]/build.proj(123,5): error : sdk/8.0.102/System.CodeDom.dll - # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.Resources.Extensions.dll - # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.CodeDom.dll - substituteInPlace \ - build.proj \ - --replace-fail 'FailOnMissingPDBs="true"' 'FailOnMissingPDBs="false"' - - substituteInPlace \ - src/runtime/src/mono/CMakeLists.txt \ - --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib' - ''); + postPatch = + '' + # set the sdk version in global.json to match the bootstrap sdk + jq '(.tools.dotnet=$dotnet)' global.json --arg dotnet "$(${bootstrapSdk}/bin/dotnet --version)" > global.json~ + mv global.json{~,} + + patchShebangs $(find -name \*.sh -type f -executable) + + # I'm not sure why this is required, but these files seem to use the wrong + # property name. + # TODO: not needed in 9.0? + [[ ! -f src/xliff-tasks/eng/Versions.props ]] || \ + sed -i 's:\bVersionBase\b:VersionPrefix:g' \ + src/xliff-tasks/eng/Versions.props + + # at least in 9.0 preview 1, this package depends on a specific beta build + # of System.CommandLine + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n NoWarn -v '$(NoWarn);NU1603' \ + src/nuget-client/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj + + # AD0001 crashes intermittently in source-build-reference-packages with + # CSC : error AD0001: Analyzer 'Microsoft.NetCore.CSharp.Analyzers.Runtime.CSharpDetectPreviewFeatureAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'. + # possibly related to https://github.com/dotnet/runtime/issues/90356 + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n NoWarn -v '$(NoWarn);AD0001' \ + src/source-build-reference-packages/src/referencePackages/Directory.Build.props + + # https://github.com/microsoft/ApplicationInsights-dotnet/issues/2848 + xmlstarlet ed \ + --inplace \ + -u //_:Project/_:PropertyGroup/_:BuildNumber -v 0 \ + src/source-build-externals/src/application-insights/.props/_GlobalStaticVersion.props + + # this fixes compile errors with clang 15 (e.g. darwin) + substituteInPlace \ + src/runtime/src/native/libs/CMakeLists.txt \ + --replace-fail 'add_compile_options(-Weverything)' 'add_compile_options(-Wall)' + + # strip native symbols in runtime + # see: https://github.com/dotnet/source-build/issues/2543 + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n KeepNativeSymbols -v false \ + src/runtime/Directory.Build.props + '' + + lib.optionalString (lib.versionAtLeast version "9") '' + # repro.csproj fails to restore due to missing freebsd packages + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n RuntimeIdentifiers -v ${targetRid} \ + src/runtime/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj + + # https://github.com/dotnet/runtime/pull/98559#issuecomment-1965338627 + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n NoWarn -v '$(NoWarn);CS9216' \ + src/runtime/Directory.Build.props + + # patch packages installed from npm cache + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n Import \ + -i \$prev -t attr -n Project -v "${./patch-npm-packages.proj}" \ + src/aspnetcore/eng/DotNetBuild.props + + # patch is from sdk repo where vmr bits are in src/SourceBuild/content + patch -p4 < ${disableNU1903} + '' + + lib.optionalString (lib.versionAtLeast version "9") '' + # https://github.com/dotnet/source-build/issues/3131#issuecomment-2030215805 + substituteInPlace \ + src/aspnetcore/eng/Dependencies.props \ + --replace-fail \ + "'\$(DotNetBuildSourceOnly)' == 'true'" \ + "'\$(DotNetBuildSourceOnly)' == 'true' and \$(PortableBuild) == 'false'" + + # https://github.com/dotnet/source-build/issues/4325 + xmlstarlet ed \ + --inplace \ + -r '//Target[@Name="UnpackTarballs"]/Move' -v Copy \ + eng/init-source-only.proj + + # error: _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror,-W#warnings] + substituteInPlace \ + src/runtime/src/coreclr/ilasm/CMakeLists.txt \ + --replace-fail 'set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" )' "" + + # https://github.com/dotnet/source-build/issues/4444 + xmlstarlet ed \ + --inplace \ + -s '//Project/Target/MSBuild[@Targets="Restore"]' \ + -t attr -n Properties -v "NUGET_PACKAGES='\$(CurrentRepoSourceBuildPackageCache)'" \ + src/aspnetcore/eng/Tools.props + '' + + lib.optionalString isLinux ( + '' + substituteInPlace \ + src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.c \ + --replace-fail '"libssl.so"' '"${openssl.out}/lib/libssl.so"' + + substituteInPlace \ + src/runtime/src/native/libs/System.Net.Security.Native/pal_gssapi.c \ + --replace-fail '"libgssapi_krb5.so.2"' '"${lib.getLib krb5}/lib/libgssapi_krb5.so.2"' + + substituteInPlace \ + src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ + --replace-fail '"libicui18n.so"' '"${icu}/lib/libicui18n.so"' \ + --replace-fail '"libicuuc.so"' '"${icu}/lib/libicuuc.so"' + '' + + lib.optionalString (lib.versionAtLeast version "9") '' + substituteInPlace \ + src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ + --replace-fail '#define VERSIONED_LIB_NAME_LEN 64' '#define VERSIONED_LIB_NAME_LEN 256' + '' + + lib.optionalString (lib.versionOlder version "9") '' + substituteInPlace \ + src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ + --replace-warn 'libicuucName[64]' 'libicuucName[256]' \ + --replace-warn 'libicui18nName[64]' 'libicui18nName[256]' + '' + ) + + lib.optionalString isDarwin ( + '' + substituteInPlace \ + src/runtime/src/native/libs/System.Globalization.Native/CMakeLists.txt \ + --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib' + + substituteInPlace \ + src/runtime/src/installer/managed/Microsoft.NET.HostModel/HostModelUtils.cs \ + src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets \ + --replace-fail '/usr/bin/codesign' '${sigtool}/bin/codesign' + + # fix: strip: error: unknown argument '-n' + substituteInPlace \ + src/runtime/eng/native/functions.cmake \ + --replace-fail ' -no_code_signature_warning' "" + + # [...]/installer.singlerid.targets(434,5): error MSB3073: The command "pkgbuild [...]" exited with code 127 + xmlstarlet ed \ + --inplace \ + -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' + substituteInPlace \ + src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets \ + src/runtime/src/native/managed/native-library.targets \ + --replace-fail ' -no_code_signature_warning' "" + + # ld: library not found for -ld_classic + substituteInPlace \ + src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets \ + src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj \ + --replace-fail 'Include="-ld_classic"' "" + '' + + lib.optionalString (lib.versionOlder version "9") '' + # [...]/build.proj(123,5): error : Did not find PDBs for the following SDK files: + # [...]/build.proj(123,5): error : sdk/8.0.102/System.Resources.Extensions.dll + # [...]/build.proj(123,5): error : sdk/8.0.102/System.CodeDom.dll + # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.Resources.Extensions.dll + # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.CodeDom.dll + substituteInPlace \ + build.proj \ + --replace-fail 'FailOnMissingPDBs="true"' 'FailOnMissingPDBs="false"' + + substituteInPlace \ + src/runtime/src/mono/CMakeLists.txt \ + --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib' + '' + ); prepFlags = [ "--no-artifacts" "--no-prebuilts" - "--with-packages" dotnetSdk.artifacts + "--with-packages" + bootstrapSdk.artifacts ]; - configurePhase = let - prepScript = - if (lib.versionAtLeast version "9") - then "./prep-source-build.sh" - else "./prep.sh"; - in '' - runHook preConfigure + configurePhase = + let + prepScript = if (lib.versionAtLeast version "9") then "./prep-source-build.sh" else "./prep.sh"; + in + '' + runHook preConfigure - # The build process tries to overwrite some things in the sdk (e.g. - # SourceBuild.MSBuildSdkResolver.dll), so it needs to be mutable. - cp -Tr ${dotnetSdk} .dotnet - chmod -R +w .dotnet + # The build process tries to overwrite some things in the sdk (e.g. + # SourceBuild.MSBuildSdkResolver.dll), so it needs to be mutable. + cp -Tr ${bootstrapSdk} .dotnet + chmod -R +w .dotnet - ${prepScript} $prepFlags + ${prepScript} $prepFlags - runHook postConfigure - ''; + runHook postConfigure + ''; postConfigure = lib.optionalString (lib.versionAtLeast version "9") '' # see patch-npm-packages.proj @@ -353,21 +379,24 @@ in stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/38991 # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) - LOCALE_ARCHIVE = lib.optionalString isLinux - "${glibcLocales}/lib/locale/locale-archive"; - - buildFlags = [ - "--with-packages" dotnetSdk.artifacts - "--clean-while-building" - "--release-manifest" releaseManifestFile - ] - ++ lib.optionals (lib.versionAtLeast version "9") [ - "--source-build" - ] - ++ [ - "--" - "-p:PortableBuild=true" - ] ++ lib.optional (targetRid != buildRid) "-p:TargetRid=${targetRid}"; + LOCALE_ARCHIVE = lib.optionalString isLinux "${glibcLocales}/lib/locale/locale-archive"; + + buildFlags = + [ + "--with-packages" + bootstrapSdk.artifacts + "--clean-while-building" + "--release-manifest" + releaseManifestFile + ] + ++ lib.optionals (lib.versionAtLeast version "9") [ + "--source-build" + ] + ++ [ + "--" + "-p:PortableBuild=true" + ] + ++ lib.optional (targetRid != buildRid) "-p:TargetRid=${targetRid}"; buildPhase = '' runHook preBuild @@ -389,35 +418,37 @@ in stdenv.mkDerivation rec { runHook postBuild ''; - installPhase = let - assets = if (lib.versionAtLeast version "9") then "assets" else targetArch; - in '' - runHook preInstall - - mkdir "$out" - - pushd "artifacts/${assets}/Release" - find . -name \*.tar.gz | while read archive; do - target=$out/$(basename "$archive" .tar.gz) - # dotnet 9 currently has two copies of the sdk tarball - [[ ! -e "$target" ]] || continue - mkdir "$target" - tar -C "$target" -xzf "$PWD/$archive" - 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 - ''; + installPhase = + let + assets = if (lib.versionAtLeast version "9") then "assets" else targetArch; + in + '' + runHook preInstall + + mkdir "$out" + + pushd "artifacts/${assets}/Release" + find . -name \*.tar.gz | while read archive; do + target=$out/$(basename "$archive" .tar.gz) + # dotnet 9 currently has two copies of the sdk tarball + [[ ! -e "$target" ]] || continue + mkdir "$target" + tar -C "$target" -xzf "$PWD/$archive" + 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 + ''; # dotnet cli is in the root, so we need to strip from there # TODO: should we install in $out/share/dotnet? diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix deleted file mode 100644 index d244fc62aef4..000000000000 --- a/pkgs/development/compilers/dtc/default.nix +++ /dev/null @@ -1,131 +0,0 @@ -{ stdenv -, lib -, fetchzip -, fetchpatch -, meson -, ninja -, flex -, bison -, pkg-config -, which -, pythonSupport ? false -, python ? null -, swig -, libyaml -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dtc"; - version = "1.7.0"; - - src = fetchzip { - url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/dtc-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-FMh3VvlY3fUK8fbd0M+aCmlUrmG9YegiOOQ7MOByffc="; - }; - - # Big pile of backports. - # FIXME: remove all of these after next upstream release. - patches = let - fetchUpstreamPatch = { rev, hash }: fetchpatch { - name = "dtc-${rev}.patch"; - url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=${rev}"; - inherit hash; - }; - in [ - # meson: Fix cell overflow tests when running from meson - (fetchUpstreamPatch { - rev = "32174a66efa4ad19fc6a2a6422e4af2ae4f055cb"; - hash = "sha256-C7OzwY0zq+2CV3SB5unI7Ill2M3deF7FXeQE3B/Kx2s="; - }) - - # Use #ifdef NO_VALGRIND - (fetchUpstreamPatch { - rev = "41821821101ad8a9f83746b96b163e5bcbdbe804"; - hash = "sha256-7QEFDtap2DWbUGqtyT/RgJZJFldKB8oSubKiCtLZ0w4="; - }) - - # dtc: Fix linker options so it also works in Darwin - (fetchUpstreamPatch { - rev = "71a8b8ef0adf01af4c78c739e04533a35c1dc89c"; - hash = "sha256-uLXL0Sjcn+bnMuF+A6PjUW1Rq6uNg1dQl58zbeYpP/U="; - }) - - # meson: allow disabling tests - (fetchUpstreamPatch { - rev = "bdc5c8793a13abb8846d115b7923df87605d05bd"; - hash = "sha256-cO4f/jJX/pQL7kk4jpKUhsCVESW2ZuWaTr7z3BuvVkw="; - }) - - # meson: fix installation with meson-python - (fetchUpstreamPatch { - rev = "3fbfdd08afd2a7a25b27433f6f5678c0fe694721"; - hash = "sha256-skK8m1s4xkK6x9AqzxiEK+1uMEmS27dBI1CdEXNFTfU="; - }) - - # pylibfdt: fix get_mem_rsv for newer Python versions - (fetchUpstreamPatch { - rev = "822123856980f84562406cc7bd1d4d6c2b8bc184"; - hash = "sha256-IJpRgP3pP8Eewx2PNKxhXZdsnomz2AR6oOsun50qAms="; - }) - ]; - - env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; - - nativeBuildInputs = [ - meson - ninja - flex - bison - pkg-config - which - ] ++ lib.optionals pythonSupport [ - python - python.pkgs.setuptools-scm - swig - ]; - - buildInputs = [ libyaml ]; - - postPatch = '' - patchShebangs setup.py - - # meson.build: bump version to 1.7.0 - substituteInPlace libfdt/meson.build \ - --replace "version: '1.6.0'," "version: '${finalAttrs.version}'," - substituteInPlace meson.build \ - --replace "version: '1.6.0'," "version: '${finalAttrs.version}'," - ''; - - # Required for installation of Python library and is innocuous otherwise. - env.DESTDIR = "/"; - - mesonAutoFeatures = "auto"; - mesonFlags = [ - (lib.mesonBool "static-build" stdenv.hostPlatform.isStatic) - (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) - ]; - - doCheck = - # Checks are broken on aarch64 darwin - # https://github.com/NixOS/nixpkgs/pull/118700#issuecomment-885892436 - !stdenv.isDarwin && - # Checks are broken when building statically on x86_64 linux with musl - # One of the test tries to build a shared library and this causes the linker: - # x86_64-unknown-linux-musl-ld: /nix/store/h9gcvnp90mpniyx2v0d0p3s06hkx1v2p-x86_64-unknown-linux-musl-gcc-13.3.0/lib/gcc/x86_64-unknown-linux-musl/13.3.0/crtbeginT.o: relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a shared object - # x86_64-unknown-linux-musl-ld: failed to set dynamic section sizes: bad value - !stdenv.hostPlatform.isStatic && - - # we must explicitly disable this here so that mesonFlags receives - # `-Dtests=disabled`; without it meson will attempt to run - # hostPlatform binaries during the configurePhase. - (with stdenv; buildPlatform.canExecute hostPlatform); - - meta = with lib; { - description = "Device Tree Compiler"; - homepage = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git"; - license = licenses.gpl2Plus; # dtc itself is GPLv2, libfdt is dual GPL/BSD - maintainers = [ maintainers.dezgeg ]; - platforms = platforms.unix; - mainProgram = "dtc"; - }; -}) diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix index 75055130ada2..121935df5f05 100644 --- a/pkgs/development/compilers/ecl/16.1.2.nix +++ b/pkgs/development/compilers/ecl/16.1.2.nix @@ -94,6 +94,6 @@ stdenv.mkDerivation rec { maintainers = lib.teams.lisp.members; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix deleted file mode 100644 index 7cd9413991fc..000000000000 --- a/pkgs/development/compilers/eli/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ lib, stdenv -, fetchurl -, symlinkJoin -, makeWrapper -, tcl -, fontconfig -, tk -, ncurses -, xorg -, file -}: - -let - # eli derives the location of the include folder from the location of the lib folder - tk_combined = symlinkJoin { - name = "tk_combined"; - paths = [ - tk - tk.dev - ]; - }; - curses_combined = symlinkJoin { - name = "curses_combined"; - paths = [ - ncurses - ncurses.dev - ]; - }; -in -stdenv.mkDerivation rec { - pname = "eli"; - version = "4.8.1"; - - src = fetchurl { - url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${pname}-${version}.tar.bz2"; - sha256="1vran8583hbwrr5dciji4zkhz3f88w4mn8n9sdpr6zw0plpf1whj"; - }; - - buildInputs = [ - ncurses - fontconfig - ] ++ (with xorg; [ - libX11.dev - libXt.dev - libXaw.dev - libXext.dev - ]); - - nativeBuildInputs = [ - file - makeWrapper - ]; - - # skip interactive browser check - buildFlags = [ "nobrowsers" ]; - - # Workaround build failure on -fno-common toolchains: - # ld: cexp.o:(.bss+0x40): multiple definition of `obstck'; cccp.o:(.bss+0x0): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - preConfigure='' - configureFlagsArray=( - --with-tcltk="${tcl} ${tk_combined}" - --with-curses="${curses_combined}" - ) - export ODIN_LOCALIPC=1 - ''; - - postInstall = '' - wrapProgram "$out/bin/eli" \ - --set ODIN_LOCALIPC 1 - ''; - - # Test if eli starts - doInstallCheck = true; - installCheckPhase = '' - export HOME="$TMP/home" - mkdir -p "$HOME" - $out/bin/eli "!ls" - ''; - - meta = { - description = "Translator Construction Made Easy"; - longDescription = '' - Eli is a programming environment that supports all phases of translator - construction with extensive libraries implementing common tasks, yet handling - arbitrary special cases. Output is the C subset of C++. - ''; - homepage = "https://eli-project.sourceforge.net/"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ timokau ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/compilers/elm/packages/elm-json/default.nix b/pkgs/development/compilers/elm/packages/elm-json/default.nix index efb3fbfcc5cd..bc456d2479c1 100644 --- a/pkgs/development/compilers/elm/packages/elm-json/default.nix +++ b/pkgs/development/compilers/elm/packages/elm-json/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ curl openssl - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; cargoHash = "sha256-8SOpL8nfhYen9vza0LYpB/5fgVmBwG7vGMmFOaJskIc="; diff --git a/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix b/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix index a457a422cf85..5ff6d4117b10 100644 --- a/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix +++ b/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix @@ -19,8 +19,8 @@ rustPlatform.buildRustPackage rec { }; buildInputs = - lib.optionals (!stdenv.isDarwin) [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security diff --git a/pkgs/development/compilers/elm/packages/lamdera/default.nix b/pkgs/development/compilers/elm/packages/lamdera/default.nix index 79101092e788..60c72eb623fa 100644 --- a/pkgs/development/compilers/elm/packages/lamdera/default.nix +++ b/pkgs/development/compilers/elm/packages/lamdera/default.nix @@ -4,20 +4,20 @@ }: let - os = if stdenv.isDarwin then "macos" else "linux"; - arch = if stdenv.isAarch64 then "arm64" else "x86_64"; + os = if stdenv.hostPlatform.isDarwin then "macos" else "linux"; + arch = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64"; hashes = { - "x86_64-linux" = "a51d5b9a011c54b0001ff3273cee027774686e233adadb20b1978d2cabfe32a6"; - "aarch64-linux" = "8904ce928f60e06df1f06b3af5ee5eb320c388922aa38b698d823df1d73e8e49"; - "x86_64-darwin" = "b4d1bb5ddc3503862750e5b241f74c22dc013792bc4f410dd914a5216e20ed2f"; - "aarch64-darwin" = "6d20e384dae90bb994c3f1e866c964124c7e8a51e9e08bad0e90a2b560bb5a18"; + "x86_64-linux" = "15a69bfa98155651749e31c68d05a04fcf48bdccb86bce77b7c8872f545cecfa"; + "aarch64-linux" = "68a16bbbd2ed0ee19c36112a4c2d0abca66cf17465747e55adf2596b0921f8d7"; + "x86_64-darwin" = "af2c63a60a689091a01bfd212e0ce141a6d7ba61d34a585d8f83159d0ed39c6f"; + "aarch64-darwin" = "06f9f7fdcbb392a0a8a5034baf915d2b95b2876255aa8df8397ddafd1e540b7a"; }; in stdenv.mkDerivation rec { pname = "lamdera"; - version = "1.2.1"; + version = "1.3.2"; src = fetchurl { url = "https://static.lamdera.com/bin/lamdera-${version}-${os}-${arch}"; diff --git a/pkgs/development/compilers/elm/packages/node/default.nix b/pkgs/development/compilers/elm/packages/node/default.nix index bb58c212649b..3d6f550f4331 100644 --- a/pkgs/development/compilers/elm/packages/node/default.nix +++ b/pkgs/development/compilers/elm/packages/node/default.nix @@ -6,6 +6,20 @@ let inherit pkgs nodejs; inherit (pkgs.stdenv.hostPlatform) system; }; + ESBUILD_BINARY_PATH = lib.getExe ( + pkgs.esbuild.override { + buildGoModule = args: pkgs.buildGoModule (args // rec { + version = "0.20.2"; + src = pkgs.fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + } + ); in with self; with elmLib; { inherit (nodePkgs) elm-live elm-upgrade elm-xref elm-analyse elm-git-install; @@ -22,6 +36,7 @@ with self; with elmLib; { }; in patched.override (old: { + inherit ESBUILD_BINARY_PATH; preRebuild = (old.preRebuild or "") + '' # This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done # in case of just this package @@ -124,6 +139,7 @@ with self; with elmLib; { patched = patchNpmElm nodePkgs.elm-land; in patched.override (old: { + inherit ESBUILD_BINARY_PATH; meta = with lib; nodePkgs."elm-land".meta // { description = "Production-ready framework for building Elm applications"; homepage = "https://elm.land/"; diff --git a/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix b/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix index 4f057be3a304..d3f48ae83505 100644 --- a/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix +++ b/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix @@ -1,9 +1,29 @@ { nodePkgs, pkgs, lib, makeWrapper }: -nodePkgs."elm-pages".overrideAttrs ( +let + ESBUILD_BINARY_PATH = lib.getExe ( + pkgs.esbuild.override { + buildGoModule = args: pkgs.buildGoModule (args // rec { + version = "0.21.5"; + src = pkgs.fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-FpvXWIlt67G8w3pBKZo/mcp57LunxDmRUaCU/Ne89B8="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + } + ); +in nodePkgs."elm-pages".overrideAttrs ( old: { + inherit ESBUILD_BINARY_PATH; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ makeWrapper old.nodejs.pkgs.node-gyp-build ]; + preRebuild = '' + sed -i 's/"esbuild": "0\.19\.12"/"esbuild": "0.21.5"/' package.json + ''; + # can't use `patches = [ <patch_file> ]` with a nodePkgs derivation; # need to patch in one of the build phases instead. # see upstream issue https://github.com/dillonkearns/elm-pages/issues/305 for dealing with the read-only problem diff --git a/pkgs/development/compilers/elm/packages/node/generate-node-packages.sh b/pkgs/development/compilers/elm/packages/node/generate-node-packages.sh index 66cc71ca32bb..8a326b6fc5ba 100755 --- a/pkgs/development/compilers/elm/packages/node/generate-node-packages.sh +++ b/pkgs/development/compilers/elm/packages/node/generate-node-packages.sh @@ -10,3 +10,5 @@ $(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ -o node-packages.nix \ -c node-composition.nix \ --no-copy-node-env -e ../../../../node-packages/node-env.nix +# well, elm-pages requires two different version of esbuild so we twist it's wrist to only use one +sed -i 's/sources."esbuild-0.19.12"/sources."esbuild-0.21.5"/' node-packages.nix diff --git a/pkgs/development/compilers/elm/packages/node/node-packages.nix b/pkgs/development/compilers/elm/packages/node/node-packages.nix index 3c7d770bdf48..a542d0e7ec4b 100644 --- a/pkgs/development/compilers/elm/packages/node/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node/node-packages.nix @@ -4,13 +4,13 @@ let sources = { - "@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=="; + url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.3.tgz"; + sha512 = "rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ=="; }; }; "@babel/cli-7.12.10" = { @@ -31,22 +31,22 @@ let sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="; }; }; - "@babel/code-frame-7.23.5" = { + "@babel/code-frame-7.24.7" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.23.5"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz"; - sha512 = "CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz"; + sha512 = "BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA=="; }; }; - "@babel/compat-data-7.23.5" = { + "@babel/compat-data-7.25.4" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.23.5"; + version = "7.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz"; - sha512 = "uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz"; + sha512 = "+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ=="; }; }; "@babel/core-7.12.10" = { @@ -58,238 +58,211 @@ let sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; }; }; - "@babel/generator-7.23.6" = { + "@babel/generator-7.25.6" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.23.6"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz"; - sha512 = "qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz"; + sha512 = "VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw=="; }; }; - "@babel/helper-annotate-as-pure-7.22.5" = { + "@babel/helper-annotate-as-pure-7.24.7" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.22.5"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz"; - sha512 = "LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz"; + sha512 = "BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.22.15" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.24.7" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.22.15"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz"; - sha512 = "QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz"; + sha512 = "xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA=="; }; }; - "@babel/helper-compilation-targets-7.23.6" = { + "@babel/helper-compilation-targets-7.25.2" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.23.6"; + version = "7.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz"; - sha512 = "9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz"; + sha512 = "U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw=="; }; }; - "@babel/helper-create-class-features-plugin-7.23.7" = { + "@babel/helper-create-class-features-plugin-7.25.4" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.23.7"; + version = "7.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.7.tgz"; - sha512 = "xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz"; + sha512 = "ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.22.15" = { + "@babel/helper-create-regexp-features-plugin-7.25.2" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.22.15"; + version = "7.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz"; - sha512 = "29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz"; + sha512 = "+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g=="; }; }; - "@babel/helper-environment-visitor-7.22.20" = { + "@babel/helper-environment-visitor-7.24.7" = { name = "_at_babel_slash_helper-environment-visitor"; packageName = "@babel/helper-environment-visitor"; - version = "7.22.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz"; - sha512 = "zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="; - }; - }; - "@babel/helper-function-name-7.23.0" = { - name = "_at_babel_slash_helper-function-name"; - packageName = "@babel/helper-function-name"; - version = "7.23.0"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz"; - sha512 = "OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw=="; + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz"; + sha512 = "DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ=="; }; }; - "@babel/helper-hoist-variables-7.22.5" = { - name = "_at_babel_slash_helper-hoist-variables"; - packageName = "@babel/helper-hoist-variables"; - version = "7.22.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz"; - sha512 = "wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw=="; - }; - }; - "@babel/helper-member-expression-to-functions-7.23.0" = { + "@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.23.0"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz"; - sha512 = "6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA=="; + 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.22.15" = { + "@babel/helper-module-imports-7.24.7" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.22.15"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz"; - sha512 = "0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz"; + sha512 = "8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA=="; }; }; - "@babel/helper-module-transforms-7.23.3" = { + "@babel/helper-module-transforms-7.25.2" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.23.3"; + version = "7.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz"; - sha512 = "7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz"; + sha512 = "BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ=="; }; }; - "@babel/helper-optimise-call-expression-7.22.5" = { + "@babel/helper-optimise-call-expression-7.24.7" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.22.5"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz"; - sha512 = "HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz"; + sha512 = "jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A=="; }; }; - "@babel/helper-plugin-utils-7.22.5" = { + "@babel/helper-plugin-utils-7.24.8" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.22.5"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz"; - sha512 = "uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg=="; + 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.22.20" = { + "@babel/helper-remap-async-to-generator-7.25.0" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.22.20"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz"; - sha512 = "pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz"; + sha512 = "NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw=="; }; }; - "@babel/helper-replace-supers-7.22.20" = { + "@babel/helper-replace-supers-7.25.0" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.22.20"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz"; - sha512 = "qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz"; + sha512 = "q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg=="; }; }; - "@babel/helper-simple-access-7.22.5" = { + "@babel/helper-simple-access-7.24.7" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.22.5"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz"; - sha512 = "n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz"; + sha512 = "zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg=="; }; }; - "@babel/helper-skip-transparent-expression-wrappers-7.22.5" = { + "@babel/helper-skip-transparent-expression-wrappers-7.24.7" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.22.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz"; - sha512 = "tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q=="; - }; - }; - "@babel/helper-split-export-declaration-7.22.6" = { - name = "_at_babel_slash_helper-split-export-declaration"; - packageName = "@babel/helper-split-export-declaration"; - version = "7.22.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz"; - sha512 = "AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g=="; + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz"; + sha512 = "IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ=="; }; }; - "@babel/helper-string-parser-7.23.4" = { + "@babel/helper-string-parser-7.24.8" = { name = "_at_babel_slash_helper-string-parser"; packageName = "@babel/helper-string-parser"; - version = "7.23.4"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz"; - sha512 = "803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ=="; + 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.22.20" = { + "@babel/helper-validator-identifier-7.24.7" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.22.20"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz"; - sha512 = "Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz"; + sha512 = "rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w=="; }; }; - "@babel/helper-validator-option-7.23.5" = { + "@babel/helper-validator-option-7.24.8" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.23.5"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz"; - sha512 = "85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw=="; + 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.22.20" = { + "@babel/helper-wrap-function-7.25.0" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.22.20"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz"; - sha512 = "pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz"; + sha512 = "s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ=="; }; }; - "@babel/helpers-7.23.7" = { + "@babel/helpers-7.25.6" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.23.7"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.7.tgz"; - sha512 = "6AMnjCoC8wjqBzDHkuqpa7jAKwvMo4dC+lr/TFBz+ucfulO1XMpDnwWPGBNwClOKZ8h6xn5N81W/R5OrcKtCbQ=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz"; + sha512 = "Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q=="; }; }; - "@babel/highlight-7.23.4" = { + "@babel/highlight-7.24.7" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.23.4"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz"; - sha512 = "acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz"; + sha512 = "EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw=="; }; }; - "@babel/parser-7.23.6" = { + "@babel/parser-7.25.6" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.23.6"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz"; - sha512 = "Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz"; + sha512 = "trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q=="; }; }; "@babel/plugin-proposal-async-generator-functions-7.20.7" = { @@ -517,229 +490,229 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-transform-arrow-functions-7.23.3" = { + "@babel/plugin-transform-arrow-functions-7.24.7" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz"; - sha512 = "NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz"; + sha512 = "Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ=="; }; }; - "@babel/plugin-transform-async-to-generator-7.23.3" = { + "@babel/plugin-transform-async-to-generator-7.24.7" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz"; - sha512 = "A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz"; + sha512 = "SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.23.3" = { + "@babel/plugin-transform-block-scoped-functions-7.24.7" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz"; - sha512 = "vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz"; + sha512 = "yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.23.4" = { + "@babel/plugin-transform-block-scoping-7.25.0" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.23.4"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz"; - sha512 = "0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz"; + sha512 = "yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ=="; }; }; - "@babel/plugin-transform-classes-7.23.5" = { + "@babel/plugin-transform-classes-7.25.4" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.23.5"; + version = "7.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.5.tgz"; - sha512 = "jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz"; + sha512 = "oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg=="; }; }; - "@babel/plugin-transform-computed-properties-7.23.3" = { + "@babel/plugin-transform-computed-properties-7.24.7" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz"; - sha512 = "dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz"; + sha512 = "25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ=="; }; }; - "@babel/plugin-transform-destructuring-7.23.3" = { + "@babel/plugin-transform-destructuring-7.24.8" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.23.3"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz"; - sha512 = "n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw=="; + 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.23.3" = { + "@babel/plugin-transform-dotall-regex-7.24.7" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz"; - sha512 = "vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz"; + sha512 = "ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.23.3" = { + "@babel/plugin-transform-duplicate-keys-7.24.7" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz"; - sha512 = "RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz"; + sha512 = "JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.23.3" = { + "@babel/plugin-transform-exponentiation-operator-7.24.7" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz"; - sha512 = "5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz"; + sha512 = "Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ=="; }; }; - "@babel/plugin-transform-for-of-7.23.6" = { + "@babel/plugin-transform-for-of-7.24.7" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.23.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz"; - sha512 = "aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz"; + sha512 = "wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g=="; }; }; - "@babel/plugin-transform-function-name-7.23.3" = { + "@babel/plugin-transform-function-name-7.25.1" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.23.3"; + version = "7.25.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz"; - sha512 = "I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz"; + sha512 = "TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA=="; }; }; - "@babel/plugin-transform-literals-7.23.3" = { + "@babel/plugin-transform-literals-7.25.2" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.23.3"; + version = "7.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz"; - sha512 = "wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz"; + sha512 = "HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.23.3" = { + "@babel/plugin-transform-member-expression-literals-7.24.7" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz"; - sha512 = "sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz"; + sha512 = "T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw=="; }; }; - "@babel/plugin-transform-modules-amd-7.23.3" = { + "@babel/plugin-transform-modules-amd-7.24.7" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz"; - sha512 = "vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz"; + sha512 = "9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.23.3" = { + "@babel/plugin-transform-modules-commonjs-7.24.8" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.23.3"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz"; - sha512 = "aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA=="; + 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.23.3" = { + "@babel/plugin-transform-modules-systemjs-7.25.0" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.23.3"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz"; - sha512 = "ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz"; + sha512 = "YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw=="; }; }; - "@babel/plugin-transform-modules-umd-7.23.3" = { + "@babel/plugin-transform-modules-umd-7.24.7" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz"; - sha512 = "zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz"; + sha512 = "3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.22.5" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.24.7" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.22.5"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz"; - sha512 = "YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz"; + sha512 = "/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g=="; }; }; - "@babel/plugin-transform-new-target-7.23.3" = { + "@babel/plugin-transform-new-target-7.24.7" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz"; - sha512 = "YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz"; + sha512 = "RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA=="; }; }; - "@babel/plugin-transform-object-super-7.23.3" = { + "@babel/plugin-transform-object-super-7.24.7" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz"; - sha512 = "BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz"; + sha512 = "A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg=="; }; }; - "@babel/plugin-transform-parameters-7.23.3" = { + "@babel/plugin-transform-parameters-7.24.7" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz"; - sha512 = "09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz"; + sha512 = "yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA=="; }; }; - "@babel/plugin-transform-property-literals-7.23.3" = { + "@babel/plugin-transform-property-literals-7.24.7" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz"; - sha512 = "jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz"; + sha512 = "EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA=="; }; }; - "@babel/plugin-transform-regenerator-7.23.3" = { + "@babel/plugin-transform-regenerator-7.24.7" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz"; - sha512 = "KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz"; + sha512 = "lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA=="; }; }; - "@babel/plugin-transform-reserved-words-7.23.3" = { + "@babel/plugin-transform-reserved-words-7.24.7" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz"; - sha512 = "QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz"; + sha512 = "0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ=="; }; }; "@babel/plugin-transform-runtime-7.12.10" = { @@ -751,67 +724,67 @@ let sha512 = "xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.23.3" = { + "@babel/plugin-transform-shorthand-properties-7.24.7" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz"; - sha512 = "ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz"; + sha512 = "KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA=="; }; }; - "@babel/plugin-transform-spread-7.23.3" = { + "@babel/plugin-transform-spread-7.24.7" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz"; - sha512 = "VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz"; + sha512 = "x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng=="; }; }; - "@babel/plugin-transform-sticky-regex-7.23.3" = { + "@babel/plugin-transform-sticky-regex-7.24.7" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz"; - sha512 = "HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz"; + sha512 = "kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g=="; }; }; - "@babel/plugin-transform-template-literals-7.23.3" = { + "@babel/plugin-transform-template-literals-7.24.7" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz"; - sha512 = "Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz"; + sha512 = "AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.23.3" = { + "@babel/plugin-transform-typeof-symbol-7.24.8" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.23.3"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz"; - sha512 = "4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz"; + sha512 = "adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.23.3" = { + "@babel/plugin-transform-unicode-escapes-7.24.7" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz"; - sha512 = "OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz"; + sha512 = "U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw=="; }; }; - "@babel/plugin-transform-unicode-regex-7.23.3" = { + "@babel/plugin-transform-unicode-regex-7.24.7" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz"; - sha512 = "wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz"; + sha512 = "hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg=="; }; }; "@babel/preset-env-7.12.10" = { @@ -850,427 +823,40 @@ let sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg=="; }; }; - "@babel/template-7.22.15" = { + "@babel/template-7.25.0" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.22.15"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz"; - sha512 = "QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz"; + sha512 = "aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q=="; }; }; - "@babel/traverse-7.23.7" = { + "@babel/traverse-7.25.6" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.23.7"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz"; - sha512 = "tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz"; + sha512 = "9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ=="; }; }; - "@babel/types-7.23.6" = { + "@babel/types-7.25.6" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.23.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz"; - sha512 = "+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg=="; - }; - }; - "@esbuild/android-arm-0.17.19" = { - name = "_at_esbuild_slash_android-arm"; - packageName = "@esbuild/android-arm"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.19.tgz"; - sha512 = "rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A=="; - }; - }; - "@esbuild/android-arm-0.18.20" = { - name = "_at_esbuild_slash_android-arm"; - packageName = "@esbuild/android-arm"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz"; - sha512 = "fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw=="; - }; - }; - "@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.18.20" = { - name = "_at_esbuild_slash_android-arm64"; - packageName = "@esbuild/android-arm64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz"; - sha512 = "Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ=="; - }; - }; - "@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.18.20" = { - name = "_at_esbuild_slash_android-x64"; - packageName = "@esbuild/android-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz"; - sha512 = "8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg=="; - }; - }; - "@esbuild/darwin-arm64-0.17.19" = { - name = "_at_esbuild_slash_darwin-arm64"; - packageName = "@esbuild/darwin-arm64"; - version = "0.17.19"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz"; - sha512 = "80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz"; + sha512 = "/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw=="; }; }; - "@esbuild/darwin-arm64-0.18.20" = { - name = "_at_esbuild_slash_darwin-arm64"; - packageName = "@esbuild/darwin-arm64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz"; - sha512 = "bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA=="; - }; - }; - "@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.18.20" = { - name = "_at_esbuild_slash_darwin-x64"; - packageName = "@esbuild/darwin-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz"; - sha512 = "pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ=="; - }; - }; - "@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.18.20" = { - name = "_at_esbuild_slash_freebsd-arm64"; - packageName = "@esbuild/freebsd-arm64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz"; - sha512 = "yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw=="; - }; - }; - "@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.18.20" = { - name = "_at_esbuild_slash_freebsd-x64"; - packageName = "@esbuild/freebsd-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz"; - sha512 = "tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ=="; - }; - }; - "@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.18.20" = { - name = "_at_esbuild_slash_linux-arm"; - packageName = "@esbuild/linux-arm"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz"; - sha512 = "/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg=="; - }; - }; - "@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.18.20" = { - name = "_at_esbuild_slash_linux-arm64"; - packageName = "@esbuild/linux-arm64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz"; - sha512 = "2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA=="; - }; - }; - "@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.18.20" = { - name = "_at_esbuild_slash_linux-ia32"; - packageName = "@esbuild/linux-ia32"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz"; - sha512 = "P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA=="; - }; - }; - "@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.18.20" = { - name = "_at_esbuild_slash_linux-loong64"; - packageName = "@esbuild/linux-loong64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz"; - sha512 = "nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg=="; - }; - }; - "@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.18.20" = { - name = "_at_esbuild_slash_linux-mips64el"; - packageName = "@esbuild/linux-mips64el"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz"; - sha512 = "d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ=="; - }; - }; - "@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.18.20" = { - name = "_at_esbuild_slash_linux-ppc64"; - packageName = "@esbuild/linux-ppc64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz"; - sha512 = "WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA=="; - }; - }; - "@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.18.20" = { - name = "_at_esbuild_slash_linux-riscv64"; - packageName = "@esbuild/linux-riscv64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz"; - sha512 = "WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A=="; - }; - }; - "@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.18.20" = { - name = "_at_esbuild_slash_linux-s390x"; - packageName = "@esbuild/linux-s390x"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz"; - sha512 = "+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ=="; - }; - }; - "@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.18.20" = { - name = "_at_esbuild_slash_linux-x64"; - packageName = "@esbuild/linux-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz"; - sha512 = "UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w=="; - }; - }; - "@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.18.20" = { - name = "_at_esbuild_slash_netbsd-x64"; - packageName = "@esbuild/netbsd-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz"; - sha512 = "iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A=="; - }; - }; - "@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.18.20" = { - name = "_at_esbuild_slash_openbsd-x64"; - packageName = "@esbuild/openbsd-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz"; - sha512 = "e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg=="; - }; - }; - "@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.18.20" = { - name = "_at_esbuild_slash_sunos-x64"; - packageName = "@esbuild/sunos-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz"; - sha512 = "kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ=="; - }; - }; - "@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.18.20" = { - name = "_at_esbuild_slash_win32-arm64"; - packageName = "@esbuild/win32-arm64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz"; - sha512 = "ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg=="; - }; - }; - "@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.18.20" = { - name = "_at_esbuild_slash_win32-ia32"; - packageName = "@esbuild/win32-ia32"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz"; - sha512 = "Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g=="; - }; - }; - "@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.18.20" = { - name = "_at_esbuild_slash_win32-x64"; - packageName = "@esbuild/win32-x64"; - version = "0.18.20"; + "@bufbuild/protobuf-2.1.0" = { + name = "_at_bufbuild_slash_protobuf"; + packageName = "@bufbuild/protobuf"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz"; - sha512 = "kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ=="; + url = "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.1.0.tgz"; + sha512 = "+2Mx67Y3skJ4NCD/qNSdBJNWtu6x6Qr53jeNg+QcwiL6mt0wK+3jwHH2x1p7xaYH6Ve2JKOVn0OxU35WsmqI9A=="; }; }; "@hapi/address-2.1.4" = { @@ -1327,58 +913,85 @@ let sha512 = "O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA=="; }; }; - "@jridgewell/gen-mapping-0.3.3" = { + "@jridgewell/gen-mapping-0.3.5" = { name = "_at_jridgewell_slash_gen-mapping"; packageName = "@jridgewell/gen-mapping"; - version = "0.3.3"; + version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz"; - sha512 = "HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ=="; + url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz"; + sha512 = "IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg=="; }; }; - "@jridgewell/resolve-uri-3.1.1" = { + "@jridgewell/resolve-uri-3.1.2" = { name = "_at_jridgewell_slash_resolve-uri"; packageName = "@jridgewell/resolve-uri"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz"; - sha512 = "dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA=="; + url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz"; + sha512 = "bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw=="; }; }; - "@jridgewell/set-array-1.1.2" = { + "@jridgewell/set-array-1.2.1" = { name = "_at_jridgewell_slash_set-array"; packageName = "@jridgewell/set-array"; - version = "1.1.2"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"; - sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; + url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz"; + sha512 = "R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A=="; }; }; - "@jridgewell/source-map-0.3.5" = { + "@jridgewell/source-map-0.3.6" = { name = "_at_jridgewell_slash_source-map"; packageName = "@jridgewell/source-map"; - version = "0.3.5"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz"; - sha512 = "UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ=="; + url = "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz"; + 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.20" = { + "@jridgewell/trace-mapping-0.3.25" = { name = "_at_jridgewell_slash_trace-mapping"; packageName = "@jridgewell/trace-mapping"; - version = "0.3.20"; + version = "0.3.25"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz"; + sha512 = "vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ=="; + }; + }; + "@jsonjoy.com/base64-1.1.2" = { + name = "_at_jsonjoy.com_slash_base64"; + packageName = "@jsonjoy.com/base64"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz"; - sha512 = "R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q=="; + url = "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz"; + sha512 = "q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA=="; + }; + }; + "@jsonjoy.com/json-pack-1.1.0" = { + name = "_at_jsonjoy.com_slash_json-pack"; + packageName = "@jsonjoy.com/json-pack"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.1.0.tgz"; + sha512 = "zlQONA+msXPPwHWZMKFVS78ewFczIll5lXiVPwFPCZUsrOKdxc2AvxU1HoNBmMRhqDZUR9HkC3UOm+6pME6Xsg=="; + }; + }; + "@jsonjoy.com/util-1.3.0" = { + name = "_at_jsonjoy.com_slash_util"; + packageName = "@jsonjoy.com/util"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.3.0.tgz"; + sha512 = "Cebt4Vk7k1xHy87kHY7KSPLT77A7Ev7IfOblyLZhtYEhrdQ6fX4EoLq3xOQ3O/DRMEh2ok5nyC180E+ABS8Wmw=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -1399,6 +1012,69 @@ let sha512 = "GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="; }; }; + "@lydell/elm-0.19.1-14" = { + name = "_at_lydell_slash_elm"; + packageName = "@lydell/elm"; + version = "0.19.1-14"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm/-/elm-0.19.1-14.tgz"; + sha512 = "otpGlYiNRvL7F9k6MJOTcuyIgHr+XWy/1NtHpGUgQi8lHrnuyCjwKFPPiimKpr3bcZTwpD4nebHuYR0bmPIKuA=="; + }; + }; + "@lydell/elm_darwin_arm64-0.19.1-3" = { + name = "_at_lydell_slash_elm_darwin_arm64"; + packageName = "@lydell/elm_darwin_arm64"; + version = "0.19.1-3"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_darwin_arm64/-/elm_darwin_arm64-0.19.1-3.tgz"; + sha512 = "RuKTz5ck+RBx4urj1EL/r0xWZZqBMPEXzNBQTEBCAMWLSi4Ck3TVz5pkhBaK+cRZXI+cCgytm/1bIttbp2fFIg=="; + }; + }; + "@lydell/elm_darwin_x64-0.19.1-2" = { + name = "_at_lydell_slash_elm_darwin_x64"; + packageName = "@lydell/elm_darwin_x64"; + version = "0.19.1-2"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_darwin_x64/-/elm_darwin_x64-0.19.1-2.tgz"; + sha512 = "MXfQwxdQfmuQ22iDCFlcXu5YTA0w6/ASzbxmWc+8DkgUkHTynjViGBVkQljAbYe4ZWgrYGWinZQQyhVnp/5oZw=="; + }; + }; + "@lydell/elm_linux_arm-0.19.1-0" = { + name = "_at_lydell_slash_elm_linux_arm"; + packageName = "@lydell/elm_linux_arm"; + version = "0.19.1-0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_linux_arm/-/elm_linux_arm-0.19.1-0.tgz"; + sha512 = "crKrLzuT6jn4OOS7PWKZGYFw6vHwPu3iNP7lg8rFkOog/HxlkRwX4S695aILBG8SGTLhEdfP9tg28SQ7vR4Lpg=="; + }; + }; + "@lydell/elm_linux_arm64-0.19.1-4" = { + name = "_at_lydell_slash_elm_linux_arm64"; + packageName = "@lydell/elm_linux_arm64"; + version = "0.19.1-4"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_linux_arm64/-/elm_linux_arm64-0.19.1-4.tgz"; + sha512 = "JuUkkVBtJjUajtTriQFFANHDmwA14NhqNqgIcq5LCJ6vUQv5/LVd6NUOkl/Rdq7Ju/VN/XwBD1/vm7MGIMOTqA=="; + }; + }; + "@lydell/elm_linux_x64-0.19.1-1" = { + name = "_at_lydell_slash_elm_linux_x64"; + packageName = "@lydell/elm_linux_x64"; + version = "0.19.1-1"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_linux_x64/-/elm_linux_x64-0.19.1-1.tgz"; + sha512 = "1Y8UAb+GfUqlSjUTX9CaaZhJqvhVcfNbYC0N9AEutlXf1CzFMvF4VsDeZdxzhNI4allPRWBD1IqtdlLhBTFacA=="; + }; + }; + "@lydell/elm_win32_x64-0.19.1-1" = { + name = "_at_lydell_slash_elm_win32_x64"; + packageName = "@lydell/elm_win32_x64"; + version = "0.19.1-1"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_win32_x64/-/elm_win32_x64-0.19.1-1.tgz"; + sha512 = "3LMiJ+uUxDFLNnCd6HBmvVWSjSWjs/Z9dMXZWCMOcw3vrW9iOkRrsNGNxohRXun2YRd8wXOX8/DwVn8i2SJ3KA=="; + }; + }; "@mrmlnc/readdir-enhanced-2.2.1" = { name = "_at_mrmlnc_slash_readdir-enhanced"; packageName = "@mrmlnc/readdir-enhanced"; @@ -1444,13 +1120,22 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@npmcli/fs-3.1.0" = { + "@npmcli/agent-2.2.2" = { + name = "_at_npmcli_slash_agent"; + packageName = "@npmcli/agent"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz"; + sha512 = "OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og=="; + }; + }; + "@npmcli/fs-3.1.1" = { name = "_at_npmcli_slash_fs"; packageName = "@npmcli/fs"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz"; - sha512 = "7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w=="; + url = "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz"; + sha512 = "q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -1480,6 +1165,24 @@ let sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw=="; }; }; + "@sindresorhus/merge-streams-1.0.0" = { + name = "_at_sindresorhus_slash_merge-streams"; + packageName = "@sindresorhus/merge-streams"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-1.0.0.tgz"; + sha512 = "rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw=="; + }; + }; + "@sindresorhus/merge-streams-3.0.0" = { + name = "_at_sindresorhus_slash_merge-streams"; + packageName = "@sindresorhus/merge-streams"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-3.0.0.tgz"; + sha512 = "5Muw0TDzXvK/i0BmrL1tiTsb6Sh/DXe/e5d63GpmHWr59t7rUyQhhiIuw605q/yvJxyBf6gMWmsxCC2fqtcFvQ=="; + }; + }; "@szmarczak/http-timer-1.1.2" = { name = "_at_szmarczak_slash_http-timer"; packageName = "@szmarczak/http-timer"; @@ -1498,15 +1201,6 @@ let sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; }; }; - "@tootallnate/once-2.0.0" = { - name = "_at_tootallnate_slash_once"; - packageName = "@tootallnate/once"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz"; - sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; - }; - }; "@types/cacheable-request-6.0.3" = { name = "_at_types_slash_cacheable-request"; packageName = "@types/cacheable-request"; @@ -1534,6 +1228,15 @@ let sha512 = "orGL5LXERPYsLov6CWs3Fh6203+dXzJkR7OnddIr2514Hsecwc8xRpzCapshBbKFImCsvS/mk6+FWiN5LyZJAQ=="; }; }; + "@types/estree-1.0.6" = { + name = "_at_types_slash_estree"; + packageName = "@types/estree"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz"; + sha512 = "AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="; + }; + }; "@types/get-port-3.2.0" = { name = "_at_types_slash_get-port"; packageName = "@types/get-port"; @@ -1579,13 +1282,13 @@ let sha512 = "1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA=="; }; }; - "@types/http-proxy-1.17.14" = { + "@types/http-proxy-1.17.15" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.14"; + version = "1.17.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz"; - sha512 = "SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz"; + sha512 = "25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ=="; }; }; "@types/jest-27.5.2" = { @@ -1615,13 +1318,13 @@ let sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; }; }; - "@types/lodash-4.14.202" = { + "@types/lodash-4.17.9" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.202"; + version = "4.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz"; - sha512 = "OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.9.tgz"; + sha512 = "w9iWudx1XWOHW5lQRS9iKpK/XuRhnN+0T7HvdCCd802FYkT1AMTnxndJHGrNJwRoRHkslGr4S29tjm1cT7x/7w=="; }; }; "@types/minimatch-5.1.2" = { @@ -1642,13 +1345,13 @@ let sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg=="; }; }; - "@types/node-20.10.6" = { + "@types/node-22.7.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.10.6"; + version = "22.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.10.6.tgz"; - sha512 = "Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw=="; + url = "https://registry.npmjs.org/@types/node/-/node-22.7.3.tgz"; + sha512 = "qXKfhXXqGTyBskvWEzJZPUxSslAiLaB6JGP1ic/XTH9ctGgzdgYguuLP1C601aRTSDNlLb0jbKqXjZ48GNraSA=="; }; }; "@types/node-8.10.66" = { @@ -1723,22 +1426,22 @@ let sha512 = "gVC1InwyVrO326wbBZw+AO3u2vRXz/iRWq9jYhpG4W8LXyIgDv3ZmcLQ5Q4Gs+gFMyqx+viFoFT+l3p61QFCmQ=="; }; }; - "@types/uglify-js-3.17.4" = { + "@types/uglify-js-3.17.5" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.17.4"; + version = "3.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.4.tgz"; - sha512 = "Hm/T0kV3ywpJyMGNbsItdivRhYNCQQf1IIsYsXnoVPES4t+FMLyDe0/K+Ea7ahWtMtSNb22ZdY7MIyoD9rqARg=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.5.tgz"; + sha512 = "TU+fZFBTBcXj/GpDpDaBmgWk/gn96kMZ+uocaFUlV2f8a6WdMzzI44QBCmGcCiYR0Y6ZlNRiyUyKKt5nl/lbzQ=="; }; }; - "@types/webpack-4.41.38" = { + "@types/webpack-4.41.39" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.38"; + version = "4.41.39"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.38.tgz"; - sha512 = "oOW7E931XJU1mVfCnxCVgv8GLFL768pDO5u2Gzk82i8yTIgX6i7cntyZOkZYb/JtYM8252SN9bQp9tgkVDSsRw=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.39.tgz"; + sha512 = "otxUJvoi6FbBq/64gGH34eblpKLgdi+gf08GaAh8Bx6So0ZZic028Ev/SUxD22gbthMKCkeeiXEat1kHLDJfYg=="; }; }; "@types/webpack-sources-3.2.3" = { @@ -1930,15 +1633,6 @@ let sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; }; }; - "abbrev-1.1.1" = { - name = "abbrev"; - packageName = "abbrev"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; - }; - }; "accepts-1.3.8" = { name = "accepts"; packageName = "accepts"; @@ -1957,13 +1651,13 @@ let sha512 = "XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="; }; }; - "acorn-8.11.3" = { + "acorn-8.12.1" = { name = "acorn"; packageName = "acorn"; - version = "8.11.3"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz"; - sha512 = "Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz"; + sha512 = "tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg=="; }; }; "address-1.0.3" = { @@ -1975,22 +1669,13 @@ let sha512 = "z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg=="; }; }; - "agent-base-6.0.2" = { + "agent-base-7.1.1" = { name = "agent-base"; packageName = "agent-base"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"; - sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; - }; - }; - "agentkeepalive-4.5.0" = { - name = "agentkeepalive"; - packageName = "agentkeepalive"; - version = "4.5.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz"; - sha512 = "5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew=="; + url = "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz"; + sha512 = "H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA=="; }; }; "aggregate-error-3.1.0" = { @@ -2011,13 +1696,13 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; - "ajv-8.12.0" = { + "ajv-8.17.1" = { name = "ajv"; packageName = "ajv"; - version = "8.12.0"; + version = "8.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz"; - sha512 = "sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz"; + sha512 = "B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g=="; }; }; "ajv-errors-1.0.1" = { @@ -2119,13 +1804,13 @@ let sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; }; - "ansi-regex-6.0.1" = { + "ansi-regex-6.1.0" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz"; - sha512 = "n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz"; + sha512 = "7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA=="; }; }; "ansi-styles-2.2.1" = { @@ -2245,13 +1930,13 @@ let sha512 = "sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q=="; }; }; - "array-buffer-byte-length-1.0.0" = { + "array-buffer-byte-length-1.0.1" = { name = "array-buffer-byte-length"; packageName = "array-buffer-byte-length"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz"; - sha512 = "LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A=="; + url = "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz"; + sha512 = "ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg=="; }; }; "array-filter-0.0.1" = { @@ -2335,22 +2020,22 @@ let sha512 = "SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="; }; }; - "array.prototype.reduce-1.0.6" = { + "array.prototype.reduce-1.0.7" = { name = "array.prototype.reduce"; packageName = "array.prototype.reduce"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz"; - sha512 = "UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg=="; + url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.7.tgz"; + sha512 = "mzmiUCVwtiD4lgxYP8g7IYy8El8p2CSMePvIbTS7gchKir/L1fgJrk0yDKmAX6mnRQFKNADYIk8nNlTris5H1Q=="; }; }; - "arraybuffer.prototype.slice-1.0.2" = { + "arraybuffer.prototype.slice-1.0.3" = { name = "arraybuffer.prototype.slice"; packageName = "arraybuffer.prototype.slice"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz"; - sha512 = "yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw=="; + url = "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz"; + sha512 = "bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A=="; }; }; "asap-2.0.6" = { @@ -2371,13 +2056,13 @@ let sha512 = "ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ=="; }; }; - "asn1.js-5.4.1" = { + "asn1.js-4.10.1" = { name = "asn1.js"; packageName = "asn1.js"; - version = "5.4.1"; + version = "4.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz"; - sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA=="; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; + sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="; }; }; "assert-1.5.1" = { @@ -2506,13 +2191,13 @@ let sha512 = "0/lBNwN+ZUnb5su18NZo5MBIjDaq6boQKZcxwy86Gip/CmXA2zZqUoFQLCNAGI5P25ZWSP2RWdhDJ8osfKEjoQ=="; }; }; - "available-typed-arrays-1.0.5" = { + "available-typed-arrays-1.0.7" = { name = "available-typed-arrays"; packageName = "available-typed-arrays"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"; - sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="; + url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz"; + sha512 = "wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ=="; }; }; "aws-sign2-0.7.0" = { @@ -2524,13 +2209,13 @@ let sha512 = "08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="; }; }; - "aws4-1.12.0" = { + "aws4-1.13.2" = { name = "aws4"; packageName = "aws4"; - version = "1.12.0"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz"; - sha512 = "NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz"; + sha512 = "lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw=="; }; }; "babel-extract-comments-1.0.0" = { @@ -2677,13 +2362,13 @@ let sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; }; }; - "binary-extensions-2.2.0" = { + "binary-extensions-2.3.0" = { name = "binary-extensions"; packageName = "binary-extensions"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"; - sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz"; + sha512 = "Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw=="; }; }; "bindings-1.5.0" = { @@ -2767,13 +2452,13 @@ let sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; }; - "body-parser-1.20.1" = { + "body-parser-1.20.3" = { name = "body-parser"; packageName = "body-parser"; - version = "1.20.1"; + version = "1.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"; - sha512 = "jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw=="; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz"; + sha512 = "7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g=="; }; }; "bonjour-3.5.0" = { @@ -2821,13 +2506,13 @@ let sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; }; }; - "braces-3.0.2" = { + "braces-3.0.3" = { name = "braces"; packageName = "braces"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; - sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; + url = "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz"; + sha512 = "yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA=="; }; }; "brorand-1.1.0" = { @@ -2866,22 +2551,22 @@ let sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; }; }; - "browserify-rsa-4.1.0" = { + "browserify-rsa-4.1.1" = { name = "browserify-rsa"; packageName = "browserify-rsa"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz"; - sha512 = "AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog=="; + url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.1.tgz"; + sha512 = "YBjSAiTqM04ZVei6sXighu679a3SqWORA3qZTEqZImnlkDIFtKc6pNutpjyZ8RJTjQtuYfeetkxM11GwoYXMIQ=="; }; }; - "browserify-sign-4.2.2" = { + "browserify-sign-4.2.3" = { name = "browserify-sign"; packageName = "browserify-sign"; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz"; - sha512 = "1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg=="; + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.3.tgz"; + sha512 = "JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw=="; }; }; "browserify-zlib-0.2.0" = { @@ -2902,13 +2587,13 @@ let sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; }; }; - "browserslist-4.22.2" = { + "browserslist-4.24.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.22.2"; + version = "4.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz"; - sha512 = "0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz"; + sha512 = "Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A=="; }; }; "buffer-4.9.2" = { @@ -2929,6 +2614,15 @@ let sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; }; }; + "buffer-builder-0.2.0" = { + name = "buffer-builder"; + packageName = "buffer-builder"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz"; + sha512 = "7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg=="; + }; + }; "buffer-from-1.1.2" = { name = "buffer-from"; packageName = "buffer-from"; @@ -3037,13 +2731,13 @@ let sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="; }; }; - "cacache-17.1.4" = { + "cacache-18.0.4" = { name = "cacache"; packageName = "cacache"; - version = "17.1.4"; + version = "18.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz"; - sha512 = "/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A=="; + url = "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz"; + sha512 = "B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ=="; }; }; "cache-base-1.0.1" = { @@ -3091,13 +2785,13 @@ let sha512 = "v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg=="; }; }; - "call-bind-1.0.5" = { + "call-bind-1.0.7" = { name = "call-bind"; packageName = "call-bind"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz"; - sha512 = "C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ=="; + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz"; + sha512 = "GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w=="; }; }; "call-me-maybe-1.0.2" = { @@ -3190,13 +2884,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001574" = { + "caniuse-lite-1.0.30001664" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001574"; + version = "1.0.30001664"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001574.tgz"; - sha512 = "BtYEK4r/iHt/txm81KBudCUcTy7t+s9emrIaHqjYurQ10x71zJ5VQ9x1dYPcz/b+pKSp4y/v1xSI67A+LzpNyg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz"; + sha512 = "AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -3343,6 +3037,24 @@ let sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; }; }; + "chokidar-3.6.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz"; + sha512 = "7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="; + }; + }; + "chokidar-4.0.1" = { + name = "chokidar"; + packageName = "chokidar"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz"; + sha512 = "n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA=="; + }; + }; "chownr-1.1.4" = { name = "chownr"; packageName = "chownr"; @@ -3361,13 +3073,13 @@ let sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; }; }; - "chrome-trace-event-1.0.3" = { + "chrome-trace-event-1.0.4" = { name = "chrome-trace-event"; packageName = "chrome-trace-event"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; - sha512 = "p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="; + url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz"; + sha512 = "rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ=="; }; }; "cipher-base-1.0.4" = { @@ -3424,6 +3136,15 @@ let sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; }; }; + "cli-cursor-4.0.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz"; + sha512 = "VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg=="; + }; + }; "cli-spinners-2.9.2" = { name = "cli-spinners"; packageName = "cli-spinners"; @@ -3595,6 +3316,15 @@ let sha512 = "Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="; }; }; + "colorjs.io-0.5.2" = { + name = "colorjs.io"; + packageName = "colorjs.io"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/colorjs.io/-/colorjs.io-0.5.2.tgz"; + sha512 = "twmVoizEW7ylZSN32OgKdXRmo1qg+wT5/6C3xu5b9QsWzSFAhHLn2xd8ro0diCsKfCj1RdaTP/nrcW+vAoQPIw=="; + }; + }; "colors-1.0.3" = { name = "colors"; packageName = "colors"; @@ -3631,13 +3361,13 @@ let sha512 = "LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="; }; }; - "commander-10.0.1" = { + "commander-11.1.0" = { name = "commander"; packageName = "commander"; - version = "10.0.1"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz"; - sha512 = "y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug=="; + url = "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz"; + sha512 = "yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ=="; }; }; "commander-2.14.1" = { @@ -3874,13 +3604,13 @@ let sha512 = "+IJOX0OqlHCszo2mBUq+SrEbCj6w7Kpffqx60zYbPTFaO4+yYgRjHwcZNpWvaTylDHaV7PPmBHzSecZiMhtPgw=="; }; }; - "cookie-0.5.0" = { + "cookie-0.6.0" = { name = "cookie"; packageName = "cookie"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"; - sha512 = "YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="; + url = "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz"; + sha512 = "U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw=="; }; }; "cookie-signature-1.0.6" = { @@ -3946,13 +3676,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.35.0" = { + "core-js-compat-3.38.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.35.0"; + version = "3.38.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.35.0.tgz"; - sha512 = "5blwFAddknKeNgsjBzilkdQ0+YK8L1PfqPYq40NOYMYFSS38qj+hpTcLLWwpIwA2A5bje/x5jmVn2tzUMg9IVw=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz"; + sha512 = "JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw=="; }; }; "core-util-is-1.0.2" = { @@ -4279,13 +4009,13 @@ let sha512 = "0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA=="; }; }; - "d-1.0.1" = { + "d-1.0.2" = { name = "d"; packageName = "d"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz"; - sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; + url = "https://registry.npmjs.org/d/-/d-1.0.2.tgz"; + sha512 = "MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw=="; }; }; "dashdash-1.14.1" = { @@ -4297,6 +4027,33 @@ let sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="; }; }; + "data-view-buffer-1.0.1" = { + name = "data-view-buffer"; + packageName = "data-view-buffer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz"; + sha512 = "0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA=="; + }; + }; + "data-view-byte-length-1.0.1" = { + name = "data-view-byte-length"; + packageName = "data-view-byte-length"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz"; + sha512 = "4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ=="; + }; + }; + "data-view-byte-offset-1.0.0" = { + name = "data-view-byte-offset"; + packageName = "data-view-byte-offset"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz"; + sha512 = "t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA=="; + }; + }; "debug-2.6.9" = { name = "debug"; packageName = "debug"; @@ -4315,13 +4072,13 @@ let sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; }; }; - "debug-4.3.4" = { + "debug-4.3.7" = { name = "debug"; packageName = "debug"; - version = "4.3.4"; + version = "4.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; - sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz"; + sha512 = "Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ=="; }; }; "decamelize-1.2.0" = { @@ -4432,13 +4189,13 @@ let sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="; }; }; - "define-data-property-1.1.1" = { + "define-data-property-1.1.4" = { name = "define-data-property"; packageName = "define-data-property"; - version = "1.1.1"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz"; - sha512 = "E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ=="; + url = "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz"; + sha512 = "rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A=="; }; }; "define-properties-1.2.1" = { @@ -4810,22 +4567,22 @@ let sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; }; - "electron-to-chromium-1.4.622" = { + "electron-to-chromium-1.5.29" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.622"; + version = "1.5.29"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.622.tgz"; - sha512 = "GZ47DEy0Gm2Z8RVG092CkFvX7SdotG57c4YZOe8W8qD4rOmk3plgeNmiLVRHP/Liqj1wRiY3uUUod9vb9hnxZA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.29.tgz"; + sha512 = "PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw=="; }; }; - "elliptic-6.5.4" = { + "elliptic-6.5.7" = { name = "elliptic"; packageName = "elliptic"; - version = "6.5.4"; + version = "6.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz"; - sha512 = "iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ=="; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz"; + sha512 = "ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q=="; }; }; "elm-0.19.1" = { @@ -4927,15 +4684,6 @@ let sha512 = "5GV3WkJ8R/faOP1hwElQdNuCt8tKx2+1lsMrdeIYWSFz01Kp9gJl/R6zGtp4QUyrUtO8KnHsxjHrQNUf2CHkrg=="; }; }; - "elm-tooling-1.15.0" = { - name = "elm-tooling"; - packageName = "elm-tooling"; - version = "1.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.15.0.tgz"; - sha512 = "quRE5LGJyrkPBoJ3MvFQ5RGgf80J0L0d3NkduStvXh4TmZuMXNC3Z/l2ZRoq2UTUaNWeYfO1Zx5wns1AvsTrnw=="; - }; - }; "elm-webpack-loader-6.0.1" = { name = "elm-webpack-loader"; packageName = "elm-webpack-loader"; @@ -5008,6 +4756,15 @@ let sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; }; }; + "encodeurl-2.0.0" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz"; + sha512 = "Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="; + }; + }; "encoding-0.1.13" = { name = "encoding"; packageName = "encoding"; @@ -5080,13 +4837,13 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.22.3" = { + "es-abstract-1.23.3" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.22.3"; + version = "1.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz"; - sha512 = "eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz"; + sha512 = "e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A=="; }; }; "es-array-method-boxes-properly-1.0.0" = { @@ -5098,13 +4855,40 @@ let sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; }; }; - "es-set-tostringtag-2.0.2" = { + "es-define-property-1.0.0" = { + name = "es-define-property"; + packageName = "es-define-property"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz"; + sha512 = "jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ=="; + }; + }; + "es-errors-1.3.0" = { + name = "es-errors"; + packageName = "es-errors"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz"; + sha512 = "Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="; + }; + }; + "es-object-atoms-1.0.0" = { + name = "es-object-atoms"; + packageName = "es-object-atoms"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz"; + sha512 = "MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw=="; + }; + }; + "es-set-tostringtag-2.0.3" = { name = "es-set-tostringtag"; packageName = "es-set-tostringtag"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz"; - sha512 = "BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q=="; + url = "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz"; + sha512 = "3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ=="; }; }; "es-to-primitive-1.2.1" = { @@ -5116,13 +4900,13 @@ let sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; }; }; - "es5-ext-0.10.62" = { + "es5-ext-0.10.64" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.62"; + version = "0.10.64"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz"; - sha512 = "BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA=="; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz"; + sha512 = "p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg=="; }; }; "es6-iterator-2.0.3" = { @@ -5143,40 +4927,49 @@ let sha512 = "HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg=="; }; }; - "es6-symbol-3.1.3" = { + "es6-symbol-3.1.4" = { name = "es6-symbol"; packageName = "es6-symbol"; - version = "3.1.3"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz"; + sha512 = "U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg=="; + }; + }; + "esbuild-0.19.12" = { + name = "esbuild"; + packageName = "esbuild"; + version = "0.19.12"; src = fetchurl { - url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz"; - sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz"; + sha512 = "aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg=="; }; }; - "esbuild-0.17.19" = { + "esbuild-0.20.2" = { name = "esbuild"; packageName = "esbuild"; - version = "0.17.19"; + version = "0.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz"; - sha512 = "XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz"; + sha512 = "WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g=="; }; }; - "esbuild-0.18.20" = { + "esbuild-0.21.5" = { name = "esbuild"; packageName = "esbuild"; - version = "0.18.20"; + version = "0.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz"; - sha512 = "ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz"; + sha512 = "mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw=="; }; }; - "escalade-3.1.1" = { + "escalade-3.2.0" = { name = "escalade"; packageName = "escalade"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; - sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; + url = "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz"; + sha512 = "WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA=="; }; }; "escape-html-1.0.3" = { @@ -5224,6 +5017,15 @@ let sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg=="; }; }; + "esniff-2.0.1" = { + name = "esniff"; + packageName = "esniff"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz"; + sha512 = "kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg=="; + }; + }; "esprima-4.0.1" = { name = "esprima"; packageName = "esprima"; @@ -5278,6 +5080,15 @@ let sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; }; }; + "event-emitter-0.3.5" = { + name = "event-emitter"; + packageName = "event-emitter"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; + sha512 = "D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA=="; + }; + }; "eventemitter3-3.1.2" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -5377,13 +5188,13 @@ let sha512 = "CDaOBMB9knI6vx9SpIxEMOJ6VBbC2U/tYNILs0qv1YOZc15K9U2EcF06v10F0JX6IYcWnKYZJwIDJspEHLvUaQ=="; }; }; - "express-4.18.2" = { + "express-4.21.0" = { name = "express"; packageName = "express"; - version = "4.18.2"; + version = "4.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.18.2.tgz"; - sha512 = "5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ=="; + url = "https://registry.npmjs.org/express/-/express-4.21.0.tgz"; + sha512 = "VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng=="; }; }; "express-ws-2.0.0" = { @@ -5530,6 +5341,15 @@ let sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; + "fast-uri-3.0.2" = { + name = "fast-uri"; + packageName = "fast-uri"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.2.tgz"; + sha512 = "GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row=="; + }; + }; "fastest-levenshtein-1.0.16" = { name = "fastest-levenshtein"; packageName = "fastest-levenshtein"; @@ -5539,13 +5359,13 @@ let sha512 = "eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg=="; }; }; - "fastq-1.16.0" = { + "fastq-1.17.1" = { name = "fastq"; packageName = "fastq"; - version = "1.16.0"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz"; - sha512 = "ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz"; + sha512 = "sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w=="; }; }; "faye-websocket-0.10.0" = { @@ -5620,13 +5440,13 @@ let sha512 = "VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ=="; }; }; - "fill-range-7.0.1" = { + "fill-range-7.1.1" = { name = "fill-range"; packageName = "fill-range"; - version = "7.0.1"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; - sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + url = "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz"; + sha512 = "YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg=="; }; }; "finalhandler-1.1.1" = { @@ -5647,13 +5467,13 @@ let sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; - "finalhandler-1.2.0" = { + "finalhandler-1.3.1" = { name = "finalhandler"; packageName = "finalhandler"; - version = "1.2.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"; - sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz"; + sha512 = "6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ=="; }; }; "find-0.2.7" = { @@ -5809,13 +5629,13 @@ let sha512 = "SDgHBgV+RCjrYs8aUwCb9rTgbTVuSdzvFmLaChsLre1yf+D64khCW++VYciaByZ8Rm0uKF8R/XEpXuTRSGUM1A=="; }; }; - "follow-redirects-1.15.4" = { + "follow-redirects-1.15.9" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.15.4"; + version = "1.15.9"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz"; - sha512 = "Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz"; + sha512 = "gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ=="; }; }; "for-each-0.3.3" = { @@ -5836,13 +5656,13 @@ let sha512 = "7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ=="; }; }; - "foreground-child-3.1.1" = { + "foreground-child-3.3.0" = { name = "foreground-child"; packageName = "foreground-child"; - version = "3.1.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz"; - sha512 = "TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg=="; + url = "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz"; + sha512 = "Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg=="; }; }; "forever-agent-0.6.1" = { @@ -6007,15 +5827,6 @@ let sha512 = "XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw=="; }; }; - "fs-monkey-1.0.5" = { - name = "fs-monkey"; - packageName = "fs-monkey"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz"; - sha512 = "8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew=="; - }; - }; "fs-readdir-recursive-1.1.0" = { name = "fs-readdir-recursive"; packageName = "fs-readdir-recursive"; @@ -6124,13 +5935,13 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; - "get-intrinsic-1.2.2" = { + "get-intrinsic-1.2.4" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz"; - sha512 = "0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz"; + sha512 = "5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ=="; }; }; "get-own-enumerable-property-symbols-3.0.2" = { @@ -6187,13 +5998,13 @@ let sha512 = "ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="; }; }; - "get-symbol-description-1.0.0" = { + "get-symbol-description-1.0.2" = { name = "get-symbol-description"; packageName = "get-symbol-description"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; - sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; + url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz"; + sha512 = "g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg=="; }; }; "get-value-2.0.6" = { @@ -6223,13 +6034,13 @@ let sha512 = "0pcXixfRCfLXdkwC/FJxiYEg5sYnbqYqtMmtXRzlKrStI9tLev7G/PDuFH2GmySJQ3ix5YUPRN/OJEuFD827EA=="; }; }; - "glob-10.3.10" = { + "glob-10.4.5" = { name = "glob"; packageName = "glob"; - version = "10.3.10"; + version = "10.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz"; - sha512 = "fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g=="; + url = "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz"; + sha512 = "7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="; }; }; "glob-7.1.4" = { @@ -6313,13 +6124,13 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globalthis-1.0.3" = { + "globalthis-1.0.4" = { name = "globalthis"; packageName = "globalthis"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz"; - sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; + url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz"; + sha512 = "DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ=="; }; }; "globby-11.1.0" = { @@ -6331,13 +6142,22 @@ let sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; }; - "globby-13.1.4" = { + "globby-13.2.2" = { + name = "globby"; + packageName = "globby"; + version = "13.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz"; + sha512 = "Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w=="; + }; + }; + "globby-14.0.0" = { name = "globby"; packageName = "globby"; - version = "13.1.4"; + version = "14.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-13.1.4.tgz"; - sha512 = "iui/IiiW+QrJ1X1hKH5qwlMQyv34wJAYwH1vrf8b9kBA4sNiif3gKsMHa+BrdnOpEudWjpotfa7LrTzB1ERS/g=="; + url = "https://registry.npmjs.org/globby/-/globby-14.0.0.tgz"; + sha512 = "/1WM/LNHRAOH9lZta77uGbq0dAEQM+XjNesWwhlERDVenqothRbnzTrL3/LrIoEPPjeUHC3vrS6TwoyxeHs7MQ=="; }; }; "globby-6.1.0" = { @@ -6412,13 +6232,13 @@ let sha512 = "RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="; }; }; - "graphql-16.8.1" = { + "graphql-16.9.0" = { name = "graphql"; packageName = "graphql"; - version = "16.8.1"; + version = "16.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-16.8.1.tgz"; - sha512 = "59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw=="; + url = "https://registry.npmjs.org/graphql/-/graphql-16.9.0.tgz"; + sha512 = "GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw=="; }; }; "graphql-request-3.7.0" = { @@ -6520,22 +6340,22 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-property-descriptors-1.0.1" = { + "has-property-descriptors-1.0.2" = { name = "has-property-descriptors"; packageName = "has-property-descriptors"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz"; - sha512 = "VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg=="; + url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz"; + sha512 = "55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg=="; }; }; - "has-proto-1.0.1" = { + "has-proto-1.0.3" = { name = "has-proto"; packageName = "has-proto"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz"; - sha512 = "7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="; + url = "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz"; + sha512 = "SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q=="; }; }; "has-symbol-support-x-1.4.2" = { @@ -6565,13 +6385,13 @@ let sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw=="; }; }; - "has-tostringtag-1.0.0" = { + "has-tostringtag-1.0.2" = { name = "has-tostringtag"; packageName = "has-tostringtag"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; - sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; + url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz"; + sha512 = "NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw=="; }; }; "has-value-0.3.1" = { @@ -6610,6 +6430,15 @@ let sha512 = "ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ=="; }; }; + "hash-base-3.0.4" = { + name = "hash-base"; + packageName = "hash-base"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz"; + sha512 = "EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow=="; + }; + }; "hash-base-3.1.0" = { name = "hash-base"; packageName = "hash-base"; @@ -6628,13 +6457,13 @@ let sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; }; }; - "hasown-2.0.0" = { + "hasown-2.0.2" = { name = "hasown"; packageName = "hasown"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz"; - sha512 = "vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA=="; + url = "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz"; + sha512 = "0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ=="; }; }; "he-1.2.0" = { @@ -6835,13 +6664,13 @@ let sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="; }; }; - "http-proxy-agent-5.0.0" = { + "http-proxy-agent-7.0.2" = { name = "http-proxy-agent"; packageName = "http-proxy-agent"; - version = "5.0.0"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"; - sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz"; + sha512 = "T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig=="; }; }; "http-proxy-middleware-0.19.1" = { @@ -6889,13 +6718,13 @@ let sha512 = "J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg=="; }; }; - "https-proxy-agent-5.0.1" = { + "https-proxy-agent-7.0.5" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "5.0.1"; + version = "7.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; - sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz"; + sha512 = "1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw=="; }; }; "human-signals-2.1.0" = { @@ -6907,13 +6736,13 @@ let sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; }; }; - "humanize-ms-1.2.1" = { - name = "humanize-ms"; - packageName = "humanize-ms"; - version = "1.2.1"; + "hyperdyperid-1.2.0" = { + name = "hyperdyperid"; + packageName = "hyperdyperid"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz"; - sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="; + url = "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz"; + sha512 = "Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A=="; }; }; "i-0.3.7" = { @@ -6988,13 +6817,13 @@ let sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="; }; }; - "ignore-5.3.0" = { + "ignore-5.3.2" = { name = "ignore"; packageName = "ignore"; - version = "5.3.0"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz"; - sha512 = "g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg=="; + url = "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz"; + sha512 = "hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="; }; }; "image-size-0.5.5" = { @@ -7015,13 +6844,13 @@ let sha512 = "4Urocwu9+XLDJw4Tc6ZCg7APVjjLInCFvO4TwGsAYV5zT6YYSor14dsZR0+0tHlDIN92cFUOq+i7fC00G5vTxA=="; }; }; - "immutable-4.3.4" = { + "immutable-4.3.7" = { name = "immutable"; packageName = "immutable"; - version = "4.3.4"; + version = "4.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz"; - sha512 = "fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA=="; + url = "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz"; + sha512 = "1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw=="; }; }; "import-fresh-2.0.0" = { @@ -7141,13 +6970,13 @@ let sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; - "internal-slot-1.0.6" = { + "internal-slot-1.0.7" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz"; - sha512 = "Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg=="; + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz"; + sha512 = "NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g=="; }; }; "invert-kv-1.0.0" = { @@ -7159,22 +6988,22 @@ let sha512 = "xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ=="; }; }; - "ip-1.1.8" = { + "ip-1.1.9" = { name = "ip"; packageName = "ip"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz"; - sha512 = "PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="; + url = "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz"; + sha512 = "cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ=="; }; }; - "ip-2.0.0" = { - name = "ip"; - packageName = "ip"; - version = "2.0.0"; + "ip-address-9.0.5" = { + name = "ip-address"; + packageName = "ip-address"; + version = "9.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz"; - sha512 = "WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="; + url = "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz"; + sha512 = "zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g=="; }; }; "ip-regex-2.1.0" = { @@ -7231,13 +7060,13 @@ let sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; }; }; - "is-array-buffer-3.0.2" = { + "is-array-buffer-3.0.4" = { name = "is-array-buffer"; packageName = "is-array-buffer"; - version = "3.0.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz"; - sha512 = "y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w=="; + url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz"; + sha512 = "wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw=="; }; }; "is-arrayish-0.2.1" = { @@ -7321,13 +7150,13 @@ let sha512 = "H1U8Vz0cfXNujrJzEcvvwMDW9Ra+biSYA3ThdQvAnMLJkEHQXn6bWzLkxHtVYJ+Sdbx0b6finn3jZiaVe7MAHA=="; }; }; - "is-core-module-2.13.1" = { + "is-core-module-2.15.1" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.13.1"; + version = "2.15.1"; 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.1.tgz"; + sha512 = "z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ=="; }; }; "is-data-descriptor-1.0.1" = { @@ -7339,6 +7168,15 @@ let sha512 = "bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw=="; }; }; + "is-data-view-1.0.1" = { + name = "is-data-view"; + packageName = "is-data-view"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz"; + sha512 = "AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w=="; + }; + }; "is-date-object-1.0.5" = { name = "is-date-object"; packageName = "is-date-object"; @@ -7474,13 +7312,13 @@ let sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; }; }; - "is-negative-zero-2.0.2" = { + "is-negative-zero-2.0.3" = { name = "is-negative-zero"; packageName = "is-negative-zero"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz"; - sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; + url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz"; + sha512 = "5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw=="; }; }; "is-number-3.0.0" = { @@ -7618,13 +7456,13 @@ let sha512 = "F/pJIk8QD6OX5DNhRB7hWamLsUilmkDGho48KbgZ6xg/lmAZXHxzXQ91jzB3yRSw5kdQGGGc4yz8HYhTYIMWPg=="; }; }; - "is-shared-array-buffer-1.0.2" = { + "is-shared-array-buffer-1.0.3" = { name = "is-shared-array-buffer"; packageName = "is-shared-array-buffer"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"; - sha512 = "sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA=="; + url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz"; + sha512 = "nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg=="; }; }; "is-stream-1.1.0" = { @@ -7663,13 +7501,13 @@ let sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; }; - "is-typed-array-1.1.12" = { + "is-typed-array-1.1.13" = { name = "is-typed-array"; packageName = "is-typed-array"; - version = "1.1.12"; + version = "1.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz"; - sha512 = "Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg=="; + url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz"; + sha512 = "uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw=="; }; }; "is-typedarray-1.0.0" = { @@ -7780,6 +7618,15 @@ let sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; }; }; + "isexe-3.1.1" = { + name = "isexe"; + packageName = "isexe"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz"; + sha512 = "LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ=="; + }; + }; "isobject-2.1.0" = { name = "isobject"; packageName = "isobject"; @@ -7816,13 +7663,13 @@ let sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="; }; }; - "jackspeak-2.3.6" = { + "jackspeak-3.4.3" = { name = "jackspeak"; packageName = "jackspeak"; - version = "2.3.6"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz"; - sha512 = "N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ=="; + url = "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz"; + sha512 = "OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw=="; }; }; "jest-diff-27.5.1" = { @@ -7879,6 +7726,15 @@ let sha512 = "UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="; }; }; + "jsbn-1.1.0" = { + name = "jsbn"; + packageName = "jsbn"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz"; + sha512 = "4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="; + }; + }; "jsesc-0.5.0" = { name = "jsesc"; packageName = "jsesc"; @@ -7969,13 +7825,13 @@ let sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; }; }; - "json-stable-stringify-1.1.0" = { + "json-stable-stringify-1.1.1" = { name = "json-stable-stringify"; packageName = "json-stable-stringify"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.0.tgz"; - sha512 = "zfA+5SuwYN2VWqN1/5HZaDzQKLJHaBVMZIIM+wuYjdptkaQsqzDdqjqf+lZZJUuJq1aanHiY8LhH8LmH+qBYJA=="; + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz"; + sha512 = "SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg=="; }; }; "json-stringify-safe-5.0.1" = { @@ -8176,6 +8032,15 @@ let sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; }; }; + "launch-editor-2.6.1" = { + name = "launch-editor"; + packageName = "launch-editor"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz"; + sha512 = "eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw=="; + }; + }; "lcid-1.0.0" = { name = "lcid"; packageName = "lcid"; @@ -8194,13 +8059,13 @@ let sha512 = "P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA=="; }; }; - "lightningcss-1.22.1" = { + "lightningcss-1.27.0" = { name = "lightningcss"; packageName = "lightningcss"; - version = "1.22.1"; + version = "1.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.22.1.tgz"; - sha512 = "Fy45PhibiNXkm0cK5FJCbfO8Y6jUpD/YcHf/BtuI+jvYYqSXKF4muk61jjE8YxCR9y+hDYIWSzHTc+bwhDE6rQ=="; + url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.27.0.tgz"; + sha512 = "8f7aNmS1+etYSLHht0fQApPc2kNO8qGRutifN5rVIc6Xo6ABsEbqOr758UwI7ALVbTt4x1fllKt0PYgzD9S3yQ=="; }; }; "lines-and-columns-1.2.4" = { @@ -8365,13 +8230,13 @@ let sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; }; }; - "loglevel-1.8.1" = { + "loglevel-1.9.2" = { name = "loglevel"; packageName = "loglevel"; - version = "1.8.1"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.8.1.tgz"; - sha512 = "tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.9.2.tgz"; + sha512 = "HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg=="; }; }; "lower-case-2.0.2" = { @@ -8401,13 +8266,13 @@ let sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; }; }; - "lru-cache-10.1.0" = { + "lru-cache-10.4.3" = { name = "lru-cache"; packageName = "lru-cache"; - version = "10.1.0"; + version = "10.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz"; - sha512 = "/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag=="; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz"; + sha512 = "JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="; }; }; "lru-cache-4.1.5" = { @@ -8428,24 +8293,6 @@ let sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; }; }; - "lru-cache-6.0.0" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; - sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; - }; - }; - "lru-cache-7.18.3" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "7.18.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz"; - sha512 = "jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="; - }; - }; "make-dir-1.3.0" = { name = "make-dir"; packageName = "make-dir"; @@ -8473,13 +8320,13 @@ let sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; }; - "make-fetch-happen-11.1.1" = { + "make-fetch-happen-13.0.1" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "11.1.1"; + version = "13.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz"; - sha512 = "rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz"; + sha512 = "cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA=="; }; }; "map-cache-0.2.2" = { @@ -8545,13 +8392,13 @@ let sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; }; }; - "memfs-3.6.0" = { + "memfs-4.12.0" = { name = "memfs"; packageName = "memfs"; - version = "3.6.0"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/memfs/-/memfs-3.6.0.tgz"; - sha512 = "EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ=="; + url = "https://registry.npmjs.org/memfs/-/memfs-4.12.0.tgz"; + sha512 = "74wDsex5tQDSClVkeK1vtxqYCAgCoXxx+K4NSHzgU/muYVYByFqa+0RnrPO9NM6naWm1+G9JmZ0p6QHhXmeYfA=="; }; }; "memory-fs-0.4.1" = { @@ -8581,6 +8428,15 @@ let sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="; }; }; + "merge-descriptors-1.0.3" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz"; + sha512 = "gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ=="; + }; + }; "merge-stream-2.0.0" = { name = "merge-stream"; packageName = "merge-stream"; @@ -8617,13 +8473,13 @@ let sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; - "micromatch-4.0.5" = { + "micromatch-4.0.8" = { name = "micromatch"; packageName = "micromatch"; - version = "4.0.5"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"; - sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz"; + sha512 = "PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA=="; }; }; "miller-rabin-4.0.1" = { @@ -8806,13 +8662,13 @@ let sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; }; - "minimatch-9.0.3" = { + "minimatch-9.0.5" = { name = "minimatch"; packageName = "minimatch"; - version = "9.0.3"; + version = "9.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz"; - sha512 = "RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz"; + sha512 = "G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="; }; }; "minimist-1.2.0" = { @@ -8869,31 +8725,31 @@ let sha512 = "3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="; }; }; - "minipass-7.0.4" = { + "minipass-7.1.2" = { name = "minipass"; packageName = "minipass"; - version = "7.0.4"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz"; - sha512 = "jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ=="; + url = "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz"; + sha512 = "qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw=="; }; }; - "minipass-collect-1.0.2" = { + "minipass-collect-2.0.1" = { name = "minipass-collect"; packageName = "minipass-collect"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz"; - sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; + url = "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz"; + sha512 = "D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw=="; }; }; - "minipass-fetch-3.0.4" = { + "minipass-fetch-3.0.5" = { name = "minipass-fetch"; packageName = "minipass-fetch"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz"; - sha512 = "jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg=="; + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz"; + sha512 = "2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg=="; }; }; "minipass-flush-1.0.5" = { @@ -9040,15 +8896,6 @@ let sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; }; }; - "ms-2.1.2" = { - name = "ms"; - packageName = "ms"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; - }; - }; "ms-2.1.3" = { name = "ms"; packageName = "ms"; @@ -9112,13 +8959,13 @@ let sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; }; }; - "nan-2.18.0" = { + "nan-2.20.0" = { name = "nan"; packageName = "nan"; - version = "2.18.0"; + version = "2.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz"; - sha512 = "W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w=="; + url = "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz"; + sha512 = "bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw=="; }; }; "nanoid-3.3.7" = { @@ -9247,13 +9094,13 @@ let sha512 = "PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="; }; }; - "node-gyp-build-4.7.1" = { + "node-gyp-build-4.8.2" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.7.1"; + version = "4.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.7.1.tgz"; - sha512 = "wTSrZ+8lsRRa3I3H8Xr65dLWSgCvY2l4AOnaeKdPA9TB/WYMPaTcrzf3rXvFoVvjKNVnu0CcWSx54qq9GKRUYg=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz"; + sha512 = "IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw=="; }; }; "node-libs-browser-2.2.1" = { @@ -9274,31 +9121,22 @@ let sha512 = "rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ=="; }; }; - "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-watch-0.7.4" = { + "node-watch-0.5.5" = { name = "node-watch"; packageName = "node-watch"; - version = "0.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/node-watch/-/node-watch-0.7.4.tgz"; - sha512 = "RinNxoz4W1cep1b928fuFhvAQ5ag/+1UlMDV7rbyGthBIgsiEouS4kvRayvvboxii4m8eolKOIBo3OjDqbc+uQ=="; - }; - }; - "nopt-1.0.10" = { - name = "nopt"; - packageName = "nopt"; - version = "1.0.10"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; - sha512 = "NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg=="; + url = "https://registry.npmjs.org/node-watch/-/node-watch-0.5.5.tgz"; + sha512 = "z9xN2ibI6P0UylFadN7oMcIMsoTeCENC0rZyRM5MVK9AqzSPx+uGqKG6KMPeC/laOV4wOGZq/GH0PTstRNSqOA=="; }; }; "normalize-package-data-2.5.0" = { @@ -9454,22 +9292,22 @@ let sha512 = "79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ=="; }; }; - "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.5" = { + "object-is-1.1.6" = { name = "object-is"; packageName = "object-is"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz"; - sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="; + url = "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz"; + sha512 = "F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q=="; }; }; "object-keys-1.1.1" = { @@ -9499,22 +9337,22 @@ let sha512 = "byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ=="; }; }; - "object.entries-1.1.7" = { + "object.entries-1.1.8" = { name = "object.entries"; packageName = "object.entries"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz"; - sha512 = "jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA=="; + url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz"; + sha512 = "cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ=="; }; }; - "object.getownpropertydescriptors-2.1.7" = { + "object.getownpropertydescriptors-2.1.8" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.1.7"; + version = "2.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz"; - sha512 = "PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g=="; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.8.tgz"; + sha512 = "qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A=="; }; }; "object.pick-1.3.0" = { @@ -9526,13 +9364,13 @@ let sha512 = "tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ=="; }; }; - "object.values-1.1.7" = { + "object.values-1.2.0" = { name = "object.values"; packageName = "object.values"; - version = "1.1.7"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz"; - sha512 = "aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng=="; + url = "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz"; + sha512 = "yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ=="; }; }; "obuf-1.1.2" = { @@ -9850,6 +9688,15 @@ let sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; }; }; + "package-json-from-dist-1.0.1" = { + name = "package-json-from-dist"; + packageName = "package-json-from-dist"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz"; + sha512 = "UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="; + }; + }; "pako-1.0.11" = { name = "pako"; packageName = "pako"; @@ -9886,13 +9733,13 @@ let sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; }; }; - "parse-asn1-5.1.6" = { + "parse-asn1-5.1.7" = { name = "parse-asn1"; packageName = "parse-asn1"; - version = "5.1.6"; + version = "5.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz"; - sha512 = "RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw=="; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.7.tgz"; + sha512 = "CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg=="; }; }; "parse-json-2.2.0" = { @@ -10066,13 +9913,22 @@ let sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; }; - "path-scurry-1.10.1" = { + "path-scurry-1.11.1" = { name = "path-scurry"; packageName = "path-scurry"; - version = "1.10.1"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz"; - sha512 = "MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ=="; + url = "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz"; + sha512 = "Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA=="; + }; + }; + "path-to-regexp-0.1.10" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "0.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz"; + sha512 = "7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="; }; }; "path-to-regexp-0.1.7" = { @@ -10111,6 +9967,15 @@ let sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; }; + "path-type-5.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz"; + sha512 = "5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg=="; + }; + }; "pbkdf2-3.1.2" = { name = "pbkdf2"; packageName = "pbkdf2"; @@ -10147,13 +10012,13 @@ let sha512 = "cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="; }; }; - "picocolors-1.0.0" = { + "picocolors-1.1.0" = { name = "picocolors"; packageName = "picocolors"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"; - sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; + url = "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz"; + sha512 = "TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw=="; }; }; "picomatch-2.3.1" = { @@ -10291,6 +10156,15 @@ let sha512 = "xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg=="; }; }; + "possible-typed-array-names-1.0.0" = { + name = "possible-typed-array-names"; + packageName = "possible-typed-array-names"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz"; + sha512 = "d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q=="; + }; + }; "postcss-7.0.39" = { name = "postcss"; packageName = "postcss"; @@ -10300,13 +10174,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.33" = { + "postcss-8.4.47" = { name = "postcss"; packageName = "postcss"; - version = "8.4.33"; + version = "8.4.47"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz"; - sha512 = "Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz"; + sha512 = "56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ=="; }; }; "postcss-calc-7.0.5" = { @@ -10606,13 +10480,13 @@ let sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; }; }; - "postcss-selector-parser-6.0.15" = { + "postcss-selector-parser-6.1.2" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; - version = "6.0.15"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz"; - sha512 = "rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw=="; + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz"; + sha512 = "Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg=="; }; }; "postcss-svgo-4.0.3" = { @@ -10696,6 +10570,15 @@ let sha512 = "Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ=="; }; }; + "proc-log-4.2.0" = { + name = "proc-log"; + packageName = "proc-log"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz"; + sha512 = "g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA=="; + }; + }; "process-0.11.10" = { name = "process"; packageName = "process"; @@ -10831,13 +10714,13 @@ let sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="; }; }; - "pump-3.0.0" = { + "pump-3.0.2" = { name = "pump"; packageName = "pump"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; - sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + url = "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz"; + sha512 = "tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw=="; }; }; "pumpify-1.5.1" = { @@ -10876,22 +10759,13 @@ let sha512 = "kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="; }; }; - "qs-6.11.0" = { - name = "qs"; - packageName = "qs"; - version = "6.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz"; - sha512 = "MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="; - }; - }; - "qs-6.11.2" = { + "qs-6.13.0" = { name = "qs"; packageName = "qs"; - version = "6.11.2"; + version = "6.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz"; - sha512 = "tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA=="; + url = "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz"; + sha512 = "+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg=="; }; }; "qs-6.5.1" = { @@ -11011,13 +10885,13 @@ let sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; - "raw-body-2.5.1" = { + "raw-body-2.5.2" = { name = "raw-body"; packageName = "raw-body"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"; - sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz"; + sha512 = "8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA=="; }; }; "rc-1.2.8" = { @@ -11155,6 +11029,15 @@ let sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; }; + "readdirp-4.0.1" = { + name = "readdirp"; + packageName = "readdirp"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-4.0.1.tgz"; + sha512 = "GkMg9uOTpIWWKbSsgwb5fA4EavTR+SG/PMPoAY8hkhHfEEY0/vqljY+XHqtDf2cr2IJtoNRDbrrEpZUiZCkYRw=="; + }; + }; "recursive-readdir-2.2.2" = { name = "recursive-readdir"; packageName = "recursive-readdir"; @@ -11164,13 +11047,13 @@ let sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg=="; }; }; - "reflect-metadata-0.2.1" = { + "reflect-metadata-0.2.2" = { name = "reflect-metadata"; packageName = "reflect-metadata"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.1.tgz"; - sha512 = "i5lLI6iw9AU3Uu4szRNPPEkomnkjRTaVt9hy/bn5g/oSzekBSMeLZblcjP74AW0vBabqERLLIrz+gR8QYR54Tw=="; + url = "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz"; + sha512 = "urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q=="; }; }; "regenerate-1.4.2" = { @@ -11182,13 +11065,13 @@ let sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; }; }; - "regenerate-unicode-properties-10.1.1" = { + "regenerate-unicode-properties-10.2.0" = { name = "regenerate-unicode-properties"; packageName = "regenerate-unicode-properties"; - version = "10.1.1"; + version = "10.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz"; - sha512 = "X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q=="; + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz"; + sha512 = "DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA=="; }; }; "regenerator-runtime-0.11.1" = { @@ -11236,13 +11119,13 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexp.prototype.flags-1.5.1" = { + "regexp.prototype.flags-1.5.2" = { name = "regexp.prototype.flags"; packageName = "regexp.prototype.flags"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz"; - sha512 = "sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg=="; + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz"; + sha512 = "NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw=="; }; }; "regexpu-core-5.3.2" = { @@ -11515,6 +11398,15 @@ let sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; }; }; + "restore-cursor-4.0.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz"; + sha512 = "I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg=="; + }; + }; "ret-0.1.15" = { name = "ret"; packageName = "ret"; @@ -11587,13 +11479,13 @@ let sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; }; }; - "rimraf-5.0.5" = { + "rimraf-5.0.10" = { name = "rimraf"; packageName = "rimraf"; - version = "5.0.5"; + version = "5.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz"; - sha512 = "CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A=="; + url = "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz"; + sha512 = "l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ=="; }; }; "ripemd160-2.0.2" = { @@ -11605,13 +11497,13 @@ let sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="; }; }; - "rollup-3.29.4" = { + "rollup-4.22.5" = { name = "rollup"; packageName = "rollup"; - version = "3.29.4"; + version = "4.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz"; - sha512 = "oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-4.22.5.tgz"; + sha512 = "WoinX7GeQOFMGznEcWA1WrTQCd/tpEbMkc3nuMs9BT0CPjMdSjPMTVClwWd4pgSQwJdP65SK9mTCNvItlr5o7w=="; }; }; "run-async-2.4.1" = { @@ -11650,13 +11542,22 @@ let sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; - "safe-array-concat-1.0.1" = { + "rxjs-7.8.1" = { + name = "rxjs"; + packageName = "rxjs"; + version = "7.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz"; + sha512 = "AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg=="; + }; + }; + "safe-array-concat-1.1.2" = { name = "safe-array-concat"; packageName = "safe-array-concat"; - version = "1.0.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz"; - sha512 = "6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q=="; + url = "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz"; + sha512 = "vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q=="; }; }; "safe-buffer-5.1.1" = { @@ -11695,13 +11596,13 @@ let sha512 = "aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg=="; }; }; - "safe-regex-test-1.0.0" = { + "safe-regex-test-1.0.3" = { name = "safe-regex-test"; packageName = "safe-regex-test"; - version = "1.0.0"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz"; - sha512 = "JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA=="; + url = "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz"; + sha512 = "CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw=="; }; }; "safename-1.0.2" = { @@ -11722,13 +11623,22 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sass-1.69.7" = { + "sass-1.79.3" = { name = "sass"; packageName = "sass"; - version = "1.69.7"; + version = "1.79.3"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.69.7.tgz"; - sha512 = "rzj2soDeZ8wtE2egyLXgOOHQvaC2iosZrkF6v3EUG+tBwEvhqUCzm0VP3k9gHF9LXbSrRhT5SksoI56Iw8NPnQ=="; + url = "https://registry.npmjs.org/sass/-/sass-1.79.3.tgz"; + sha512 = "m7dZxh0W9EZ3cw50Me5GOuYm/tVAJAn91SUnohLRo9cXBixGUOdvmryN+dXpwR831bhoY3Zv7rEFt85PUwTmzA=="; + }; + }; + "sass-embedded-1.79.3" = { + name = "sass-embedded"; + packageName = "sass-embedded"; + version = "1.79.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.79.3.tgz"; + sha512 = "zUve2qCn6uSOMZnZazLzrDWq//OQWFle5G45vJjv3B/ADIA3TXVgqHqN3u7D2vGajOGREz0HN5nhliSoKmQqZA=="; }; }; "sax-1.2.4" = { @@ -11749,6 +11659,15 @@ let sha512 = "0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="; }; }; + "sax-1.4.1" = { + name = "sax"; + packageName = "sax"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz"; + sha512 = "+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg=="; + }; + }; "schema-utils-0.4.7" = { name = "schema-utils"; packageName = "schema-utils"; @@ -11830,13 +11749,13 @@ let sha512 = "BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="; }; }; - "semver-7.5.4" = { + "semver-7.6.3" = { name = "semver"; packageName = "semver"; - version = "7.5.4"; + version = "7.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz"; - sha512 = "1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="; + url = "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz"; + sha512 = "oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A=="; }; }; "semver-regex-3.1.4" = { @@ -11875,13 +11794,13 @@ let sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; - "send-0.18.0" = { + "send-0.19.0" = { name = "send"; packageName = "send"; - version = "0.18.0"; + version = "0.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.18.0.tgz"; - sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; + url = "https://registry.npmjs.org/send/-/send-0.19.0.tgz"; + sha512 = "dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw=="; }; }; "serialize-javascript-1.9.1" = { @@ -11929,13 +11848,13 @@ let sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; }; - "serve-static-1.15.0" = { + "serve-static-1.16.2" = { name = "serve-static"; packageName = "serve-static"; - version = "1.15.0"; + version = "1.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"; - sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz"; + sha512 = "VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw=="; }; }; "set-blocking-2.0.0" = { @@ -11947,22 +11866,22 @@ let sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; - "set-function-length-1.1.1" = { + "set-function-length-1.2.2" = { name = "set-function-length"; packageName = "set-function-length"; - version = "1.1.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz"; - sha512 = "VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ=="; + url = "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz"; + sha512 = "pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg=="; }; }; - "set-function-name-2.0.1" = { + "set-function-name-2.0.2" = { name = "set-function-name"; packageName = "set-function-name"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz"; - sha512 = "tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA=="; + url = "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz"; + sha512 = "7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ=="; }; }; "set-value-2.0.1" = { @@ -12073,13 +11992,22 @@ let sha512 = "V0iQEZ/uoem3NmD91rD8XiuozJnq9/ZJnbHVXHnWqP1ucAhS3yJ7sLIIzEi57wFFcK3oi3kFUC46uSyWr35mxg=="; }; }; - "side-channel-1.0.4" = { + "shell-quote-1.8.1" = { + name = "shell-quote"; + packageName = "shell-quote"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz"; + sha512 = "6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA=="; + }; + }; + "side-channel-1.0.6" = { name = "side-channel"; packageName = "side-channel"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; - sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; + url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz"; + sha512 = "fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA=="; }; }; "signal-exit-3.0.7" = { @@ -12100,13 +12028,13 @@ let sha512 = "bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="; }; }; - "simple-git-3.22.0" = { + "simple-git-3.27.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.22.0"; + version = "3.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.22.0.tgz"; - sha512 = "6JujwSs0ac82jkGjMHiCnTifvf1crOiY/+tfs/Pqih6iow7VrpNKRRNdWm6RtaXpvvv/JGNYhlUtLhGFqHF+Yw=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.27.0.tgz"; + sha512 = "ivHoFS9Yi9GY49ogc6/YAi3Fl9ROnF4VyubNylgCkA+RVqLaKWnDSzXOVzya8csELIaWaYNutsEuAhZrtOjozA=="; }; }; "simple-swizzle-0.2.2" = { @@ -12163,6 +12091,15 @@ let sha512 = "3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="; }; }; + "slash-5.1.0" = { + name = "slash"; + packageName = "slash"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz"; + sha512 = "ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg=="; + }; + }; "slice-ansi-4.0.0" = { name = "slice-ansi"; packageName = "slice-ansi"; @@ -12235,22 +12172,22 @@ let sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; }; }; - "socks-2.7.1" = { + "socks-2.8.3" = { name = "socks"; packageName = "socks"; - version = "2.7.1"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz"; - sha512 = "7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ=="; + url = "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz"; + sha512 = "l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw=="; }; }; - "socks-proxy-agent-7.0.0" = { + "socks-proxy-agent-8.0.4" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; - version = "7.0.0"; + version = "8.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz"; - sha512 = "Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww=="; + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz"; + sha512 = "GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw=="; }; }; "sort-keys-1.1.2" = { @@ -12298,13 +12235,13 @@ let sha512 = "l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="; }; }; - "source-map-js-1.0.2" = { + "source-map-js-1.2.1" = { name = "source-map-js"; packageName = "source-map-js"; - version = "1.0.2"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"; - sha512 = "R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="; + url = "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz"; + sha512 = "UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="; }; }; "source-map-resolve-0.5.3" = { @@ -12343,13 +12280,13 @@ let sha512 = "kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA=="; }; }; - "spdx-exceptions-2.3.0" = { + "spdx-exceptions-2.5.0" = { name = "spdx-exceptions"; packageName = "spdx-exceptions"; - version = "2.3.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; - sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz"; + sha512 = "PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w=="; }; }; "spdx-expression-parse-3.0.1" = { @@ -12361,13 +12298,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.16" = { + "spdx-license-ids-3.0.20" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.16"; + version = "3.0.20"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz"; - sha512 = "eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz"; + sha512 = "jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw=="; }; }; "spdy-4.0.2" = { @@ -12415,6 +12352,15 @@ let sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; }; }; + "sprintf-js-1.1.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz"; + sha512 = "Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="; + }; + }; "sshpk-1.18.0" = { name = "sshpk"; packageName = "sshpk"; @@ -12424,13 +12370,13 @@ let sha512 = "2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ=="; }; }; - "ssri-10.0.5" = { + "ssri-10.0.6" = { name = "ssri"; packageName = "ssri"; - version = "10.0.5"; + version = "10.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz"; - sha512 = "bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A=="; + url = "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz"; + sha512 = "MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ=="; }; }; "ssri-5.3.0" = { @@ -12541,13 +12487,13 @@ let sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw=="; }; }; - "stream-shift-1.0.1" = { + "stream-shift-1.0.3" = { name = "stream-shift"; packageName = "stream-shift"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"; - sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; + url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz"; + sha512 = "76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ=="; }; }; "streamsearch-1.1.0" = { @@ -12631,31 +12577,31 @@ let sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; - "string.prototype.trim-1.2.8" = { + "string.prototype.trim-1.2.9" = { name = "string.prototype.trim"; packageName = "string.prototype.trim"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz"; - sha512 = "lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ=="; + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz"; + sha512 = "klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw=="; }; }; - "string.prototype.trimend-1.0.7" = { + "string.prototype.trimend-1.0.8" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz"; - sha512 = "Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz"; + sha512 = "p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ=="; }; }; - "string.prototype.trimstart-1.0.7" = { + "string.prototype.trimstart-1.0.8" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz"; - sha512 = "NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz"; + sha512 = "UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg=="; }; }; "string_decoder-0.10.31" = { @@ -12829,13 +12775,13 @@ let sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; - "stylus-0.62.0" = { + "stylus-0.63.0" = { name = "stylus"; packageName = "stylus"; - version = "0.62.0"; + version = "0.63.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylus/-/stylus-0.62.0.tgz"; - sha512 = "v3YCf31atbwJQIMtPNX8hcQ+okD4NQaTuKGUWfII8eaqn+3otrbttGL1zSMZAAtiPsBztQnujVBugg/cXFUpyg=="; + url = "https://registry.npmjs.org/stylus/-/stylus-0.63.0.tgz"; + sha512 = "OMlgrTCPzE/ibtRMoeLVhOY0RcNuNWh0rhAVqeKnk/QwcuUKQbnqhZ1kg2vzD8VU/6h3FoPTq4RJPHgLBvX6Bw=="; }; }; "sudo-prompt-8.2.5" = { @@ -12910,6 +12856,15 @@ let sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; + "supports-color-8.1.1" = { + name = "supports-color"; + packageName = "supports-color"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"; + sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; + }; + }; "supports-hyperlinks-2.3.0" = { name = "supports-hyperlinks"; packageName = "supports-hyperlinks"; @@ -12937,13 +12892,13 @@ let sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; }; }; - "table-6.8.1" = { + "table-6.8.2" = { name = "table"; packageName = "table"; - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.8.1.tgz"; - sha512 = "Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA=="; + url = "https://registry.npmjs.org/table/-/table-6.8.2.tgz"; + sha512 = "w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA=="; }; }; "tapable-1.1.3" = { @@ -12964,13 +12919,13 @@ let sha512 = "a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA=="; }; }; - "tar-6.2.0" = { + "tar-6.2.1" = { name = "tar"; packageName = "tar"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz"; - sha512 = "/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ=="; + url = "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz"; + sha512 = "DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A=="; }; }; "temp-0.9.0" = { @@ -13036,13 +12991,22 @@ let sha512 = "zVotuHoIfnYjtlurOouTazciEfL7V38QMAOhGqpXDEg6yT13cF4+fEP9b0rrCEQTn+tT46uxgFsTZzhygk+CzQ=="; }; }; - "terser-webpack-plugin-1.4.5" = { + "terser-5.34.0" = { + name = "terser"; + packageName = "terser"; + version = "5.34.0"; + src = fetchurl { + url = "https://registry.npmjs.org/terser/-/terser-5.34.0.tgz"; + sha512 = "y5NUX+U9HhVsK/zihZwoq4r9dICLyV2jXGOriDAVOeKhq3LKVjgJbGO90FisozXLlJfvjHqgckGmJFBb9KYoWQ=="; + }; + }; + "terser-webpack-plugin-1.4.6" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz"; - sha512 = "04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.6.tgz"; + sha512 = "2lBVf/VMVIddjSn3GqbT90GvIJ/eYXJkt8cTzU7NbjKqK8fwv18Ftr4PlbF46b/e88743iZFL5Dtr/rC4hjIeA=="; }; }; "text-table-0.2.0" = { @@ -13054,6 +13018,15 @@ let sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; }; }; + "thingies-1.21.0" = { + name = "thingies"; + packageName = "thingies"; + version = "1.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thingies/-/thingies-1.21.0.tgz"; + sha512 = "hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g=="; + }; + }; "through-2.3.8" = { name = "through"; packageName = "through"; @@ -13108,6 +13081,15 @@ let sha512 = "qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A=="; }; }; + "tiny-decoders-7.0.1" = { + name = "tiny-decoders"; + packageName = "tiny-decoders"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tiny-decoders/-/tiny-decoders-7.0.1.tgz"; + sha512 = "P1LaHTLASl/lCrdtwgAAVwxt4bEAPmxpf9HMQrlCkAseaT8oH8oxm8ndy4nx5rLTcL5U/Qxp1a+FDoQfS/ZgQQ=="; + }; + }; "tmp-0.0.31" = { name = "tmp"; packageName = "tmp"; @@ -13225,13 +13207,13 @@ let sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; }; }; - "touch-3.1.0" = { + "touch-3.1.1" = { name = "touch"; packageName = "touch"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz"; - sha512 = "WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA=="; + url = "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz"; + sha512 = "r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA=="; }; }; "tough-cookie-2.4.3" = { @@ -13279,6 +13261,15 @@ let sha512 = "up6Yvai4PYKhpNp5PkYtx50m3KbwQrqDwbuZP/ItyL64YEWHAvH6Md83LFLV/GRSk/BoUVwwgUzX6SOQSbsfAg=="; }; }; + "tree-dump-1.0.2" = { + name = "tree-dump"; + packageName = "tree-dump"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tree-dump/-/tree-dump-1.0.2.tgz"; + sha512 = "dpev9ABuLWdEubk+cIaI9cHwRNNDjkBBLXTwI4UCUFdQ5xXKqNXoK4FEciw/vxf+NQ7Cb7sGUyeUtORvHIdRXQ=="; + }; + }; "ts-debounce-4.0.0" = { name = "ts-debounce"; packageName = "ts-debounce"; @@ -13306,13 +13297,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.6.2" = { + "tslib-2.7.0" = { name = "tslib"; packageName = "tslib"; - version = "2.6.2"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz"; - sha512 = "AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz"; + sha512 = "gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="; }; }; "tsyringe-4.8.0" = { @@ -13351,22 +13342,13 @@ let sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="; }; }; - "type-1.2.0" = { - name = "type"; - packageName = "type"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz"; - sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; - }; - }; - "type-2.7.2" = { + "type-2.7.3" = { name = "type"; packageName = "type"; - version = "2.7.2"; + version = "2.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-2.7.2.tgz"; - sha512 = "dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="; + url = "https://registry.npmjs.org/type/-/type-2.7.3.tgz"; + sha512 = "8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ=="; }; }; "type-fest-0.10.0" = { @@ -13396,40 +13378,40 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typed-array-buffer-1.0.0" = { + "typed-array-buffer-1.0.2" = { name = "typed-array-buffer"; packageName = "typed-array-buffer"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz"; - sha512 = "Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw=="; + url = "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz"; + sha512 = "gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ=="; }; }; - "typed-array-byte-length-1.0.0" = { + "typed-array-byte-length-1.0.1" = { name = "typed-array-byte-length"; packageName = "typed-array-byte-length"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz"; - sha512 = "Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA=="; + url = "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz"; + sha512 = "3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw=="; }; }; - "typed-array-byte-offset-1.0.0" = { + "typed-array-byte-offset-1.0.2" = { name = "typed-array-byte-offset"; packageName = "typed-array-byte-offset"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz"; - sha512 = "RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg=="; + url = "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz"; + sha512 = "Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA=="; }; }; - "typed-array-length-1.0.4" = { + "typed-array-length-1.0.6" = { name = "typed-array-length"; packageName = "typed-array-length"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz"; - sha512 = "KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng=="; + url = "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz"; + sha512 = "/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g=="; }; }; "typedarray-0.0.6" = { @@ -13522,22 +13504,22 @@ let sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; }; }; - "undici-types-5.26.5" = { + "undici-types-6.19.8" = { name = "undici-types"; packageName = "undici-types"; - version = "5.26.5"; + version = "6.19.8"; src = fetchurl { - url = "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz"; - sha512 = "JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="; + url = "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz"; + sha512 = "ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="; }; }; - "unicode-canonical-property-names-ecmascript-2.0.0" = { + "unicode-canonical-property-names-ecmascript-2.0.1" = { name = "unicode-canonical-property-names-ecmascript"; packageName = "unicode-canonical-property-names-ecmascript"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"; - sha512 = "yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="; + url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz"; + sha512 = "dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg=="; }; }; "unicode-match-property-ecmascript-2.0.0" = { @@ -13549,13 +13531,13 @@ let sha512 = "5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q=="; }; }; - "unicode-match-property-value-ecmascript-2.1.0" = { + "unicode-match-property-value-ecmascript-2.2.0" = { name = "unicode-match-property-value-ecmascript"; packageName = "unicode-match-property-value-ecmascript"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz"; - sha512 = "qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA=="; + url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz"; + sha512 = "4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg=="; }; }; "unicode-property-aliases-ecmascript-2.1.0" = { @@ -13567,6 +13549,15 @@ let sha512 = "6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="; }; }; + "unicorn-magic-0.1.0" = { + name = "unicorn-magic"; + packageName = "unicorn-magic"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz"; + sha512 = "lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ=="; + }; + }; "union-value-1.0.1" = { name = "union-value"; packageName = "union-value"; @@ -13675,13 +13666,13 @@ let sha512 = "PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ=="; }; }; - "unzip-stream-0.3.1" = { + "unzip-stream-0.3.4" = { name = "unzip-stream"; packageName = "unzip-stream"; - version = "0.3.1"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/unzip-stream/-/unzip-stream-0.3.1.tgz"; - sha512 = "RzaGXLNt+CW+T41h1zl6pGz3EaeVhYlK+rdAap+7DxW5kqsqePO8kRtWPaCiVqdhZc86EctSPVYNix30YOMzmw=="; + url = "https://registry.npmjs.org/unzip-stream/-/unzip-stream-0.3.4.tgz"; + sha512 = "PyofABPVv+d7fL7GOpusx7eRT9YETY2X04PhwbSipdj6bMxVCFJrr+nm0Mxqbf9hUiTin/UsnuFWBXlDZFy0Cw=="; }; }; "upath-1.2.0" = { @@ -13702,13 +13693,13 @@ let sha512 = "1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w=="; }; }; - "update-browserslist-db-1.0.13" = { + "update-browserslist-db-1.1.1" = { name = "update-browserslist-db"; packageName = "update-browserslist-db"; - version = "1.0.13"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz"; - sha512 = "xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg=="; + url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz"; + sha512 = "R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A=="; }; }; "upgrade-1.1.0" = { @@ -13738,13 +13729,13 @@ let sha512 = "Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg=="; }; }; - "url-0.11.3" = { + "url-0.11.4" = { name = "url"; packageName = "url"; - version = "0.11.3"; + version = "0.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/url/-/url-0.11.3.tgz"; - sha512 = "6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw=="; + url = "https://registry.npmjs.org/url/-/url-0.11.4.tgz"; + sha512 = "oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg=="; }; }; "url-loader-4.1.1" = { @@ -13882,6 +13873,15 @@ let sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; }; }; + "varint-6.0.0" = { + name = "varint"; + packageName = "varint"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz"; + sha512 = "cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg=="; + }; + }; "vary-1.1.2" = { name = "vary"; packageName = "vary"; @@ -13909,22 +13909,31 @@ let sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; - "vite-4.3.9" = { + "vite-5.2.8" = { name = "vite"; packageName = "vite"; - version = "4.3.9"; + version = "5.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/vite/-/vite-4.3.9.tgz"; - sha512 = "qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg=="; + url = "https://registry.npmjs.org/vite/-/vite-5.2.8.tgz"; + sha512 = "OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA=="; }; }; - "vite-4.5.1" = { + "vite-5.4.8" = { name = "vite"; packageName = "vite"; - version = "4.5.1"; + version = "5.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/vite/-/vite-4.5.1.tgz"; - sha512 = "AXXFaAJ8yebyqzoNB9fu2pHoo/nWX+xZlaRwoeYUxEqBO+Zj4msE5G+BhGBll9lYEKv9Hfks52PAF2X7qDYXQA=="; + url = "https://registry.npmjs.org/vite/-/vite-5.4.8.tgz"; + sha512 = "FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ=="; + }; + }; + "vite-plugin-elm-watch-1.3.3" = { + name = "vite-plugin-elm-watch"; + packageName = "vite-plugin-elm-watch"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vite-plugin-elm-watch/-/vite-plugin-elm-watch-1.3.3.tgz"; + sha512 = "rR78gmeYp08E4CvtpnZuumsmNXaG/XOJ/xtOVfEG3TOJqDChXy1DzE1pnPsERohbELkov7ZZPHRLGV1z2iyxKg=="; }; }; "vm-browserify-1.1.2" = { @@ -14179,13 +14188,13 @@ let sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; }; - "which-3.0.1" = { + "which-4.0.0" = { name = "which"; packageName = "which"; - version = "3.0.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-3.0.1.tgz"; - sha512 = "XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg=="; + url = "https://registry.npmjs.org/which/-/which-4.0.0.tgz"; + sha512 = "GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg=="; }; }; "which-boxed-primitive-1.0.2" = { @@ -14215,13 +14224,13 @@ let sha512 = "iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="; }; }; - "which-typed-array-1.1.13" = { + "which-typed-array-1.1.15" = { name = "which-typed-array"; packageName = "which-typed-array"; - version = "1.1.13"; + version = "1.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz"; - sha512 = "P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow=="; + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz"; + sha512 = "oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA=="; }; }; "winston-2.1.1" = { @@ -14467,22 +14476,22 @@ let sha512 = "8A/uRMnQy8KCQsmep1m7Bk+z/+LIkeF7w+TDMLtX1iZm5Hq9HsUDmgFGaW1ACW5Cj0b2Qo7wCvRhYN2ErUVp/A=="; }; }; - "ws-5.2.3" = { + "ws-5.2.4" = { name = "ws"; packageName = "ws"; - version = "5.2.3"; + version = "5.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz"; - sha512 = "jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA=="; + url = "https://registry.npmjs.org/ws/-/ws-5.2.4.tgz"; + sha512 = "fFCejsuC8f9kOSu9FYaOw8CdO68O3h5v0lg4p74o8JqWpwTf9tniOD+nOB78aWoVSS6WptVUmDrp/KPsMVBWFQ=="; }; }; - "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.1.1" = { @@ -14494,13 +14503,13 @@ let sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A=="; }; }; - "ws-7.5.9" = { + "ws-7.5.10" = { name = "ws"; packageName = "ws"; - version = "7.5.9"; + version = "7.5.10"; 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=="; }; }; "xmlbuilder-13.0.2" = { @@ -14703,7 +14712,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" + sources."aws4-1.13.2" sources."babel-runtime-6.18.0" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" @@ -14795,7 +14804,7 @@ in sources."minimist-1.2.0" sources."ms-2.0.0" sources."negotiator-0.6.3" - sources."node-watch-0.7.4" + sources."node-watch-0.5.5" sources."oauth-sign-0.9.0" sources."on-finished-2.3.0" sources."opn-5.4.0" @@ -14808,7 +14817,7 @@ in sources."process-nextick-args-1.0.7" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.3.1" + sources."punycode-1.4.1" sources."qs-6.7.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" @@ -14838,11 +14847,7 @@ in sources."through2-2.0.1" sources."tmp-0.0.31" sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.4.3" sources."traverse-chain-0.1.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -14850,7 +14855,11 @@ in sources."typedarray-0.0.7" sources."ultron-1.0.2" sources."unpipe-1.0.0" - sources."uri-js-4.4.1" + (sources."uri-js-4.4.1" // { + dependencies = [ + sources."punycode-2.3.1" + ]; + }) sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -14881,7 +14890,6 @@ in sha512 = "flFXaCikbA6NccBEvrFIgJj9up7rc9A8aOwe0o0Erruvk5f5idWu3/gIBfqTaos7Xc2Fz6fshYyoH5sfyt1r7g=="; }; dependencies = [ - sources."abbrev-1.1.1" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" @@ -14891,15 +14899,15 @@ in sources."astral-regex-2.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" + sources."aws4-1.13.2" sources."balanced-match-1.0.2" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" - sources."binary-extensions-2.2.0" + sources."binary-extensions-2.3.0" sources."binwrap-0.2.3" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."buffers-0.1.1" sources."camelcase-5.3.1" sources."caseless-0.12.0" @@ -14953,7 +14961,8 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."fill-range-7.0.1" + sources."fast-uri-3.0.2" + sources."fill-range-7.1.1" sources."find-0.2.9" (sources."find-elm-dependencies-2.0.2" // { dependencies = [ @@ -15030,7 +15039,6 @@ in sources."path-key-2.0.1" ]; }) - sources."nopt-1.0.10" sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" sources."once-1.4.0" @@ -15079,25 +15087,25 @@ in sources."has-flag-4.0.0" ]; }) - (sources."table-6.8.1" // { + (sources."table-6.8.2" // { dependencies = [ - sources."ajv-8.12.0" + sources."ajv-8.17.1" sources."json-schema-traverse-1.0.0" ]; }) - sources."tar-6.2.0" + sources."tar-6.2.1" sources."temp-0.9.0" sources."through-2.3.8" sources."tmp-0.0.33" sources."to-regex-range-5.0.1" - sources."touch-3.1.0" + sources."touch-3.1.1" sources."tough-cookie-2.5.0" sources."traverse-0.3.9" sources."traverse-chain-0.1.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."universalify-0.1.2" - (sources."unzip-stream-0.3.1" // { + (sources."unzip-stream-0.3.4" // { dependencies = [ sources."mkdirp-0.5.6" ]; @@ -15150,10 +15158,10 @@ in sources."async-limiter-1.0.1" sources."balanced-match-1.0.2" sources."batch-0.6.1" - sources."binary-extensions-2.2.0" - sources."body-parser-1.20.1" + sources."binary-extensions-2.3.0" + sources."body-parser-1.20.3" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."bufferutil-4.0.8" sources."bytes-3.1.2" (sources."cacheable-request-6.1.0" // { @@ -15162,9 +15170,9 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."chalk-3.0.0" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -15172,46 +15180,51 @@ in sources."concat-map-0.0.1" sources."content-disposition-0.5.4" sources."content-type-1.0.5" - sources."cookie-0.5.0" + sources."cookie-0.6.0" sources."cookie-signature-1.0.6" sources."cross-spawn-7.0.3" - sources."debug-2.6.9" + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."depd-2.0.0" sources."destroy-1.2.0" sources."duplexer3-0.1.5" sources."ee-first-1.1.1" - sources."encodeurl-1.0.2" + sources."encodeurl-2.0.0" sources."end-of-stream-1.4.4" + 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.18.2" + sources."express-4.21.0" (sources."express-ws-4.0.0" // { dependencies = [ - sources."ws-5.2.3" + sources."ws-5.2.4" ]; }) - sources."fill-range-7.0.1" - sources."finalhandler-1.2.0" + sources."fill-range-7.1.1" + sources."finalhandler-1.3.1" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-stream-4.1.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."gopd-1.0.1" sources."got-9.6.0" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" - sources."has-proto-1.0.1" + sources."has-property-descriptors-1.0.2" + sources."has-proto-1.0.3" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.2" sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."iconv-lite-0.4.24" @@ -15231,7 +15244,7 @@ in sources."latest-version-5.1.0" sources."lowercase-keys-1.0.1" sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" + sources."merge-descriptors-1.0.3" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.52.0" @@ -15239,12 +15252,12 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.8" - sources."ms-2.0.0" + sources."ms-2.1.3" sources."negotiator-0.6.3" - sources."node-gyp-build-4.7.1" + sources."node-gyp-build-4.8.2" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."on-finished-2.4.1" sources."once-1.4.0" sources."open-7.4.2" @@ -15253,14 +15266,14 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-to-regexp-0.1.7" + sources."path-to-regexp-0.1.10" sources."picomatch-2.3.1" sources."prepend-http-2.0.0" sources."proxy-addr-2.0.7" - sources."pump-3.0.0" - sources."qs-6.11.0" + sources."pump-3.0.2" + sources."qs-6.13.0" sources."range-parser-1.2.1" - sources."raw-body-2.5.1" + sources."raw-body-2.5.2" sources."rc-1.2.8" sources."readdirp-3.6.0" sources."registry-auth-token-4.2.2" @@ -15270,9 +15283,9 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-6.3.1" - (sources."send-0.18.0" // { + (sources."send-0.19.0" // { dependencies = [ - sources."ms-2.1.3" + sources."encodeurl-1.0.2" ]; }) (sources."serve-index-1.9.1" // { @@ -15284,12 +15297,12 @@ in sources."statuses-1.5.0" ]; }) - sources."serve-static-1.15.0" - sources."set-function-length-1.1.1" + sources."serve-static-1.16.2" + 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.4" + sources."side-channel-1.0.6" sources."statuses-2.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" @@ -15305,7 +15318,7 @@ in sources."vary-1.1.2" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-7.5.9" + sources."ws-7.5.10" ]; buildInputs = globalBuildInputs; meta = { @@ -15331,23 +15344,22 @@ in sources."@nodelib/fs.walk-1.2.8" sources."anymatch-3.1.3" sources."array-union-2.1.0" - sources."binary-extensions-2.2.0" - sources."braces-3.0.2" - sources."chokidar-3.5.3" + sources."binary-extensions-2.3.0" + sources."braces-3.0.3" + sources."chokidar-3.6.0" sources."cross-spawn-7.0.3" sources."dir-glob-3.0.1" sources."escape-string-regexp-4.0.0" sources."execa-5.1.1" sources."fast-diff-1.3.0" sources."fast-glob-3.3.2" - sources."fastq-1.16.0" - sources."fill-range-7.0.1" - sources."fsevents-2.3.3" + sources."fastq-1.17.1" + sources."fill-range-7.1.1" sources."get-stream-6.0.1" sources."glob-parent-5.1.2" sources."globby-11.1.0" sources."human-signals-2.1.0" - sources."ignore-5.3.0" + sources."ignore-5.3.2" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" @@ -15356,7 +15368,7 @@ in sources."isexe-2.0.0" sources."merge-stream-2.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.5" + sources."micromatch-4.0.8" sources."mimic-fn-2.1.0" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" @@ -15367,7 +15379,7 @@ in sources."pjson-1.0.9" sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" - sources."reflect-metadata-0.2.1" + sources."reflect-metadata-0.2.2" sources."request-light-0.7.0" sources."reusify-1.0.4" sources."run-parallel-1.2.0" @@ -15402,61 +15414,46 @@ in elm-land = nodeEnv.buildNodePackage { name = "elm-land"; packageName = "elm-land"; - version = "0.19.5"; + version = "0.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/elm-land/-/elm-land-0.19.5.tgz"; - sha512 = "OWcnWmd+BMzRlyLpjkKjmazUJeKlgvXsPJcrhdVYhfeSdAbDDcAok7CgvSoqReN6Y36DEUUeRE5AGJMj8HVUOA=="; + url = "https://registry.npmjs.org/elm-land/-/elm-land-0.20.1.tgz"; + sha512 = "AY8BxYNT7mblaIO9SS2YQPdskZdMsLL6fqjAA5bORdkGIRDkMeaw+rXgiVSHUM2+TK0k/ld0TdQEAd24Moi5nw=="; }; dependencies = [ - sources."@adobe/css-tools-4.3.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."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/source-map-0.3.5" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.20" - sources."@types/node-20.10.6" - sources."acorn-8.11.3" + sources."@adobe/css-tools-4.3.3" + 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.5.0" + sources."@jridgewell/trace-mapping-0.3.25" + sources."@lydell/elm-0.19.1-14" + sources."@lydell/elm_darwin_arm64-0.19.1-3" + sources."@lydell/elm_darwin_x64-0.19.1-2" + sources."@lydell/elm_linux_arm-0.19.1-0" + sources."@lydell/elm_linux_arm64-0.19.1-4" + sources."@lydell/elm_linux_x64-0.19.1-1" + sources."@lydell/elm_win32_x64-0.19.1-1" + sources."@types/estree-1.0.6" + sources."@types/node-22.7.3" + sources."acorn-8.12.1" sources."anymatch-3.1.3" sources."balanced-match-1.0.2" - sources."binary-extensions-2.2.0" + sources."binary-extensions-2.3.0" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."buffer-from-1.1.2" sources."chokidar-3.5.3" sources."commander-2.20.3" sources."concat-map-0.0.1" sources."copy-anything-2.0.6" - sources."cross-spawn-6.0.5" - sources."debug-4.3.4" + sources."cross-spawn-7.0.3" + sources."debug-4.3.7" + sources."detect-libc-1.0.3" sources."elm-0.19.1-6" sources."errno-0.1.8" - sources."esbuild-0.17.19" - sources."fill-range-7.0.1" - sources."find-elm-dependencies-2.0.4" - sources."firstline-1.3.1" + sources."esbuild-0.20.2" + sources."fill-range-7.1.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" sources."glob-7.2.3" @@ -15464,7 +15461,7 @@ in sources."graceful-fs-4.2.11" sources."iconv-lite-0.6.3" sources."image-size-0.5.5" - sources."immutable-4.3.4" + sources."immutable-4.3.7" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" @@ -15473,54 +15470,62 @@ in sources."is-number-7.0.0" sources."is-what-3.14.1" sources."isexe-2.0.0" + sources."launch-editor-2.6.1" sources."less-4.2.0" - sources."lodash-4.17.21" + sources."lightningcss-1.27.0" sources."make-dir-2.1.0" sources."mime-1.6.0" sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."nanoid-3.3.7" sources."needle-3.3.1" - sources."nice-try-1.0.5" - sources."node-elm-compiler-5.0.6" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."parse-node-version-1.0.1" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."picocolors-1.0.0" + sources."path-key-3.1.1" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."postcss-8.4.33" + sources."postcss-8.4.47" sources."prr-1.0.1" sources."readdirp-3.6.0" - sources."rimraf-2.6.3" - sources."rollup-3.29.4" + sources."rollup-4.22.5" sources."safer-buffer-2.1.2" - sources."sass-1.69.7" - sources."sax-1.3.0" + (sources."sass-1.79.3" // { + dependencies = [ + sources."chokidar-4.0.1" + sources."readdirp-4.0.1" + ]; + }) + sources."sax-1.4.1" sources."semver-5.7.2" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."shell-quote-1.8.1" sources."source-map-0.6.1" - sources."source-map-js-1.0.2" + sources."source-map-js-1.2.1" sources."source-map-support-0.5.21" - (sources."stylus-0.62.0" // { + (sources."stylus-0.63.0" // { dependencies = [ + sources."sax-1.3.0" sources."source-map-0.7.4" ]; }) sources."sugarss-4.0.1" - sources."temp-0.9.4" sources."terser-5.15.1" + sources."tiny-decoders-7.0.1" sources."to-regex-range-5.0.1" - sources."tslib-2.6.2" + sources."tslib-2.7.0" sources."typescript-4.9.3" - sources."undici-types-5.26.5" - sources."vite-4.3.9" - sources."which-1.3.1" + sources."undici-types-6.19.8" + sources."vite-5.2.8" + (sources."vite-plugin-elm-watch-1.3.3" // { + dependencies = [ + sources."terser-5.26.0" + ]; + }) + sources."which-2.0.2" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -15546,8 +15551,8 @@ in sources."ansi-styles-2.2.1" sources."anymatch-3.1.3" sources."async-limiter-1.0.1" - sources."binary-extensions-2.2.0" - sources."braces-3.0.2" + sources."binary-extensions-2.3.0" + sources."braces-3.0.3" sources."chalk-1.1.3" sources."charenc-0.0.2" sources."chokidar-3.0.2" @@ -15573,9 +15578,9 @@ in sources."cross-spawn-6.0.5" ]; }) - sources."fill-range-7.0.1" + sources."fill-range-7.1.1" sources."finalhandler-1.1.2" - sources."follow-redirects-1.15.4" + sources."follow-redirects-1.15.9" sources."fresh-0.5.2" sources."fsevents-2.3.3" sources."get-stream-4.1.0" @@ -15612,7 +15617,7 @@ in sources."pem-1.14.2" sources."picomatch-2.3.1" sources."pseudomap-1.0.2" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."range-parser-1.2.1" sources."readdirp-3.6.0" sources."requires-port-1.0.0" @@ -15653,34 +15658,32 @@ in elm-spa = nodeEnv.buildNodePackage { name = "elm-spa"; packageName = "elm-spa"; - version = "6.0.4"; + version = "6.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/elm-spa/-/elm-spa-6.0.4.tgz"; - sha512 = "TiOBuxL1SrzqYyWkime3AZ1/xFqKa6B/Bi4SplFg7YmlwPL5d7R+u6w0dxc14cnvmP1RS2+QZAkczZtqayFK9A=="; + url = "https://registry.npmjs.org/elm-spa/-/elm-spa-6.0.6.tgz"; + sha512 = "FslLqKt2D5EjMJjtYU55P9xu/LGNnWL8pTzWAaOtTTFkNq2vVXFEknXRq1SCahicMEPRp+26r7NvawV+XuAxMA=="; }; dependencies = [ sources."anymatch-3.1.3" sources."balanced-match-1.0.2" - sources."binary-extensions-2.2.0" + sources."binary-extensions-2.3.0" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."buffer-from-1.1.2" sources."bufferutil-4.0.8" sources."chokidar-3.4.2" sources."commander-2.20.3" sources."concat-map-0.0.1" sources."cross-spawn-6.0.5" - sources."d-1.0.1" + sources."d-1.0.2" sources."debug-2.6.9" - sources."es5-ext-0.10.62" + sources."es5-ext-0.10.64" sources."es6-iterator-2.0.3" - sources."es6-symbol-3.1.3" - (sources."ext-1.7.0" // { - dependencies = [ - sources."type-2.7.2" - ]; - }) - sources."fill-range-7.0.1" + sources."es6-symbol-3.1.4" + sources."esniff-2.0.1" + sources."event-emitter-0.3.5" + sources."ext-1.7.0" + sources."fill-range-7.1.1" sources."find-elm-dependencies-2.0.4" sources."firstline-1.3.1" sources."fs.realpath-1.0.0" @@ -15704,7 +15707,7 @@ in sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-elm-compiler-5.0.5" - sources."node-gyp-build-4.7.1" + sources."node-gyp-build-4.8.2" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -15724,7 +15727,7 @@ in sources."temp-0.9.4" sources."terser-5.3.8" sources."to-regex-range-5.0.1" - sources."type-1.2.0" + sources."type-2.7.3" sources."typedarray-to-buffer-3.1.5" sources."utf-8-validate-5.0.10" sources."websocket-1.0.32" @@ -15735,7 +15738,7 @@ in buildInputs = globalBuildInputs; meta = { description = "single page apps made easy"; - homepage = "https://github.com/ryannhg/elm-spa#readme"; + homepage = "https://github.com/ryan-haskell/elm-spa#readme"; license = "BSD-3-Clause"; }; production = true; @@ -15754,19 +15757,18 @@ in sources."ansi-styles-4.3.0" sources."anymatch-3.1.3" sources."balanced-match-1.0.2" - sources."binary-extensions-2.2.0" + sources."binary-extensions-2.3.0" sources."brace-expansion-2.0.1" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."chalk-4.1.2" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-9.5.0" sources."cross-spawn-7.0.3" sources."elm-solve-deps-wasm-1.0.2" - sources."fill-range-7.0.1" + sources."fill-range-7.1.1" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" sources."glob-8.1.0" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.11" @@ -15818,7 +15820,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.10.6" + sources."@types/node-22.7.3" sources."@types/responselike-1.0.3" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.4" @@ -15849,7 +15851,6 @@ in sources."jsonfile-4.0.0" sources."keyv-4.5.4" sources."lowercase-keys-2.0.0" - sources."lru-cache-6.0.0" sources."mimic-response-2.1.0" sources."normalize-url-6.1.0" sources."npm-conf-1.1.3" @@ -15860,20 +15861,19 @@ in sources."p-timeout-3.2.0" sources."pify-3.0.0" sources."proto-list-1.2.4" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."responselike-2.0.1" sources."safe-buffer-5.2.1" sources."safename-1.0.2" - sources."semver-7.5.4" + sources."semver-7.6.3" sources."to-readable-stream-2.1.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.10.0" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."universalify-0.1.2" sources."url-to-options-1.0.1" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."yallist-4.0.0" sources."yn-4.0.0" ]; buildInputs = globalBuildInputs; @@ -15889,36 +15889,18 @@ in elm-verify-examples = nodeEnv.buildNodePackage { name = "elm-verify-examples"; packageName = "elm-verify-examples"; - version = "5.3.0"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-5.3.0.tgz"; - sha512 = "6TG+4L/yEamiHpxVQUJPRgHoeEOmk5LhWuVRECMHTKPpvuM2BCYMGwCMUGJ0Wh64RW8oERIdnicsvUDlvDwiTg=="; + url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-6.0.3.tgz"; + sha512 = "VgZpUwYik+d7u9ZDLhbTEMN/MIE7qJ9OQRtreGmwE9ehr+JSJvnKcpZwGILIHjiNWjZqarx4d6vA2OtLZm48AA=="; }; dependencies = [ sources."@isaacs/cliui-8.0.2" - sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."anymatch-3.1.3" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" sources."balanced-match-1.0.2" - sources."bcrypt-pbkdf-1.0.2" - sources."binary-0.3.0" - sources."binary-extensions-2.2.0" - sources."binwrap-0.2.2" - sources."bluebird-3.7.2" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."buffers-0.1.1" - sources."caseless-0.12.0" - sources."chainsaw-0.1.0" + sources."brace-expansion-2.0.1" sources."chalk-4.1.2" - sources."chokidar-3.2.1" - sources."chownr-1.1.4" (sources."cliui-8.0.1" // { dependencies = [ sources."emoji-regex-8.0.0" @@ -15929,151 +15911,32 @@ in }) sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."combined-stream-1.0.8" - sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" - (sources."cross-spawn-7.0.0" // { - dependencies = [ - sources."which-1.3.1" - ]; - }) - sources."dashdash-1.14.1" - sources."delayed-stream-1.0.0" + sources."cross-spawn-7.0.3" sources."eastasianwidth-0.2.0" - sources."ecc-jsbn-0.1.2" - (sources."elm-test-0.19.1" // { - dependencies = [ - sources."ansi-styles-3.2.1" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."supports-color-5.5.0" - ]; - }) - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."fs-extra-8.1.0" - sources."has-flag-3.0.0" - (sources."supports-color-7.1.0" // { - dependencies = [ - sources."has-flag-4.0.0" - ]; - }) - ]; - }) - sources."elmi-to-json-1.2.0" sources."emoji-regex-9.2.2" - sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fill-range-7.0.1" - (sources."find-elm-dependencies-2.0.2" // { - dependencies = [ - sources."firstline-1.2.0" - ]; - }) - sources."find-parent-dir-0.3.1" - sources."firstline-2.0.2" - sources."foreground-child-3.1.1" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - (sources."fs-extra-11.2.0" // { - dependencies = [ - sources."jsonfile-6.1.0" - sources."universalify-2.0.1" - ]; - }) - sources."fs-minipass-1.2.7" - sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."escalade-3.2.0" + sources."foreground-child-3.3.0" + sources."fs-extra-11.2.0" sources."get-caller-file-2.0.5" - sources."getpass-0.1.7" - sources."glob-7.1.4" - sources."glob-parent-5.1.2" + sources."glob-10.4.5" sources."graceful-fs-4.2.11" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" sources."has-flag-4.0.0" - sources."http-signature-1.2.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-binary-path-2.1.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-2.3.6" - 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."jsonfile-4.0.0" - sources."jsprim-1.4.2" - sources."lodash-4.17.15" - sources."lru-cache-10.1.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" + sources."jackspeak-3.4.3" + sources."jsonfile-6.1.0" + sources."lru-cache-10.4.3" + sources."minimatch-9.0.5" + sources."minipass-7.1.2" sources."mkdirp-3.0.1" - sources."murmur-hash-js-1.0.0" - sources."mustache-3.2.1" - sources."nice-try-1.0.5" - (sources."node-elm-compiler-5.0.4" // { - dependencies = [ - sources."cross-spawn-6.0.5" - sources."path-key-2.0.1" - sources."which-1.3.1" - ]; - }) - sources."normalize-path-3.0.0" - sources."oauth-sign-0.9.0" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" + sources."package-json-from-dist-1.0.1" sources."path-key-3.1.1" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) - sources."performance-now-2.1.0" - sources."picomatch-2.3.1" - sources."psl-1.9.0" - sources."punycode-2.3.1" - sources."qs-6.5.3" - sources."readdirp-3.1.3" - sources."request-2.88.2" - sources."request-promise-4.2.6" - (sources."request-promise-core-1.1.4" // { - dependencies = [ - sources."lodash-4.17.21" - ]; - }) + sources."path-scurry-1.11.1" sources."require-directory-2.1.1" - (sources."rimraf-5.0.5" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" - sources."minipass-7.0.4" - ]; - }) - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."semver-5.7.2" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."rimraf-5.0.10" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" - sources."split-1.0.1" - sources."sshpk-1.18.0" - sources."stealthy-require-1.1.1" sources."string-width-5.1.2" (sources."string-width-cjs-4.2.3" // { dependencies = [ @@ -16083,37 +15946,13 @@ in }) (sources."strip-ansi-7.1.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" ]; }) sources."strip-ansi-cjs-6.0.1" sources."supports-color-7.2.0" - (sources."tar-4.4.19" // { - dependencies = [ - sources."mkdirp-0.5.6" - ]; - }) - (sources."temp-0.9.0" // { - dependencies = [ - sources."rimraf-2.6.3" - ]; - }) - sources."through-2.3.8" - sources."to-regex-range-5.0.1" - sources."tough-cookie-2.5.0" - sources."traverse-0.3.9" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."universalify-0.1.2" - (sources."unzip-stream-0.3.1" // { - dependencies = [ - sources."mkdirp-0.5.6" - ]; - }) - sources."uri-js-4.4.1" - sources."uuid-3.4.0" - sources."verror-1.10.0" - sources."which-2.0.1" + sources."universalify-2.0.1" + sources."which-2.0.2" (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-styles-6.2.1" @@ -16126,10 +15965,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."wrappy-1.0.2" - sources."xmlbuilder-13.0.2" sources."y18n-5.0.8" - sources."yallist-3.1.1" (sources."yargs-17.7.2" // { dependencies = [ sources."emoji-regex-8.0.0" @@ -16203,47 +16039,44 @@ in }; dependencies = [ sources."@babel/cli-7.12.10" - sources."@babel/code-frame-7.23.5" - sources."@babel/compat-data-7.23.5" + sources."@babel/code-frame-7.24.7" + sources."@babel/compat-data-7.25.4" sources."@babel/core-7.12.10" - sources."@babel/generator-7.23.6" - sources."@babel/helper-annotate-as-pure-7.22.5" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.15" - (sources."@babel/helper-compilation-targets-7.23.6" // { + sources."@babel/generator-7.25.6" + 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.25.2" // { dependencies = [ sources."semver-6.3.1" ]; }) - (sources."@babel/helper-create-class-features-plugin-7.23.7" // { + (sources."@babel/helper-create-class-features-plugin-7.25.4" // { dependencies = [ sources."semver-6.3.1" ]; }) - (sources."@babel/helper-create-regexp-features-plugin-7.22.15" // { + (sources."@babel/helper-create-regexp-features-plugin-7.25.2" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/helper-environment-visitor-7.22.20" - sources."@babel/helper-function-name-7.23.0" - sources."@babel/helper-hoist-variables-7.22.5" - sources."@babel/helper-member-expression-to-functions-7.23.0" - sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.3" - sources."@babel/helper-optimise-call-expression-7.22.5" - sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-remap-async-to-generator-7.22.20" - sources."@babel/helper-replace-supers-7.22.20" - sources."@babel/helper-simple-access-7.22.5" - sources."@babel/helper-skip-transparent-expression-wrappers-7.22.5" - sources."@babel/helper-split-export-declaration-7.22.6" - sources."@babel/helper-string-parser-7.23.4" - sources."@babel/helper-validator-identifier-7.22.20" - sources."@babel/helper-validator-option-7.23.5" - sources."@babel/helper-wrap-function-7.22.20" - sources."@babel/helpers-7.23.7" - sources."@babel/highlight-7.23.4" - sources."@babel/parser-7.23.6" + sources."@babel/helper-environment-visitor-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.25.2" + sources."@babel/helper-optimise-call-expression-7.24.7" + sources."@babel/helper-plugin-utils-7.24.8" + sources."@babel/helper-remap-async-to-generator-7.25.0" + sources."@babel/helper-replace-supers-7.25.0" + sources."@babel/helper-simple-access-7.24.7" + sources."@babel/helper-skip-transparent-expression-wrappers-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.8" + sources."@babel/helper-wrap-function-7.25.0" + sources."@babel/helpers-7.25.6" + sources."@babel/highlight-7.24.7" + sources."@babel/parser-7.25.6" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-dynamic-import-7.18.6" @@ -16269,74 +16102,74 @@ in sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.23.3" - sources."@babel/plugin-transform-async-to-generator-7.23.3" - sources."@babel/plugin-transform-block-scoped-functions-7.23.3" - sources."@babel/plugin-transform-block-scoping-7.23.4" - sources."@babel/plugin-transform-classes-7.23.5" - sources."@babel/plugin-transform-computed-properties-7.23.3" - sources."@babel/plugin-transform-destructuring-7.23.3" - sources."@babel/plugin-transform-dotall-regex-7.23.3" - sources."@babel/plugin-transform-duplicate-keys-7.23.3" - sources."@babel/plugin-transform-exponentiation-operator-7.23.3" - sources."@babel/plugin-transform-for-of-7.23.6" - sources."@babel/plugin-transform-function-name-7.23.3" - sources."@babel/plugin-transform-literals-7.23.3" - sources."@babel/plugin-transform-member-expression-literals-7.23.3" - sources."@babel/plugin-transform-modules-amd-7.23.3" - sources."@babel/plugin-transform-modules-commonjs-7.23.3" - sources."@babel/plugin-transform-modules-systemjs-7.23.3" - sources."@babel/plugin-transform-modules-umd-7.23.3" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.22.5" - sources."@babel/plugin-transform-new-target-7.23.3" - sources."@babel/plugin-transform-object-super-7.23.3" - sources."@babel/plugin-transform-parameters-7.23.3" - sources."@babel/plugin-transform-property-literals-7.23.3" - sources."@babel/plugin-transform-regenerator-7.23.3" - sources."@babel/plugin-transform-reserved-words-7.23.3" + sources."@babel/plugin-transform-arrow-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.25.0" + sources."@babel/plugin-transform-classes-7.25.4" + sources."@babel/plugin-transform-computed-properties-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-exponentiation-operator-7.24.7" + sources."@babel/plugin-transform-for-of-7.24.7" + sources."@babel/plugin-transform-function-name-7.25.1" + sources."@babel/plugin-transform-literals-7.25.2" + 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.8" + sources."@babel/plugin-transform-modules-systemjs-7.25.0" + 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-object-super-7.24.7" + sources."@babel/plugin-transform-parameters-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-runtime-7.12.10" - sources."@babel/plugin-transform-shorthand-properties-7.23.3" - sources."@babel/plugin-transform-spread-7.23.3" - sources."@babel/plugin-transform-sticky-regex-7.23.3" - sources."@babel/plugin-transform-template-literals-7.23.3" - sources."@babel/plugin-transform-typeof-symbol-7.23.3" - sources."@babel/plugin-transform-unicode-escapes-7.23.3" - sources."@babel/plugin-transform-unicode-regex-7.23.3" + 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.8" + sources."@babel/plugin-transform-unicode-escapes-7.24.7" + sources."@babel/plugin-transform-unicode-regex-7.24.7" sources."@babel/preset-env-7.12.10" sources."@babel/preset-modules-0.1.6" sources."@babel/regjsgen-0.8.0" sources."@babel/runtime-7.12.5" - sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.7" - sources."@babel/types-7.23.6" + sources."@babel/template-7.25.0" + sources."@babel/traverse-7.25.6" + sources."@babel/types-7.25.6" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" sources."@hapi/joi-15.1.1" sources."@hapi/topo-3.1.6" - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.20" + 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.5.0" + sources."@jridgewell/trace-mapping-0.3.25" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-5.1.2" - sources."@types/http-proxy-1.17.14" + sources."@types/http-proxy-1.17.15" sources."@types/json-schema-7.0.15" sources."@types/minimatch-5.1.2" - sources."@types/node-20.10.6" + sources."@types/node-22.7.3" sources."@types/parse-json-4.0.2" sources."@types/q-1.5.8" sources."@types/source-list-map-0.1.6" sources."@types/tapable-1.0.12" - (sources."@types/uglify-js-3.17.4" // { + (sources."@types/uglify-js-3.17.5" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.38" // { + (sources."@types/webpack-4.41.39" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -16384,7 +16217,7 @@ in sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-buffer-byte-length-1.0.0" + sources."array-buffer-byte-length-1.0.1" sources."array-filter-0.0.1" sources."array-flatten-2.1.2" sources."array-map-0.0.1" @@ -16392,11 +16225,11 @@ in sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."array-unique-0.3.2" - sources."array.prototype.reduce-1.0.6" - sources."arraybuffer.prototype.slice-1.0.2" + sources."array.prototype.reduce-1.0.7" + sources."arraybuffer.prototype.slice-1.0.3" sources."asap-2.0.6" sources."asn1-0.2.6" - (sources."asn1.js-5.4.1" // { + (sources."asn1.js-4.10.1" // { dependencies = [ sources."bn.js-4.12.0" ]; @@ -16420,9 +16253,9 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."autoprefixer-10.1.0" - sources."available-typed-arrays-1.0.5" + sources."available-typed-arrays-1.0.7" sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" + sources."aws4-1.13.2" sources."babel-extract-comments-1.0.0" (sources."babel-loader-8.2.2" // { dependencies = [ @@ -16448,16 +16281,15 @@ in sources."batch-0.6.1" sources."bcrypt-pbkdf-1.0.2" sources."big.js-5.2.2" - sources."binary-extensions-2.2.0" + sources."binary-extensions-2.3.0" sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."bn.js-5.2.1" - (sources."body-parser-1.20.1" // { + (sources."body-parser-1.20.3" // { dependencies = [ - sources."bytes-3.1.2" sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.11.0" + sources."qs-6.13.0" ]; }) (sources."bonjour-3.5.0" // { @@ -16467,29 +16299,33 @@ in }) sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."brorand-1.1.0" sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" sources."browserify-des-1.0.2" - sources."browserify-rsa-4.1.0" - (sources."browserify-sign-4.2.2" // { + (sources."browserify-rsa-4.1.1" // { dependencies = [ - sources."readable-stream-3.6.2" + sources."safe-buffer-5.2.1" + ]; + }) + (sources."browserify-sign-4.2.3" // { + dependencies = [ + sources."hash-base-3.0.4" sources."safe-buffer-5.2.1" ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.22.2" + sources."browserslist-4.24.0" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" - sources."bytes-3.0.0" + sources."bytes-3.1.2" sources."cacache-12.0.4" sources."cache-base-1.0.1" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."call-me-maybe-1.0.2" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" @@ -16497,7 +16333,7 @@ in sources."camel-case-4.1.2" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001574" + sources."caniuse-lite-1.0.30001664" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { @@ -16506,13 +16342,13 @@ in ]; }) sources."chardet-0.7.0" - (sources."chokidar-3.5.3" // { + (sources."chokidar-3.6.0" // { dependencies = [ sources."glob-parent-5.1.2" ]; }) sources."chownr-1.1.4" - sources."chrome-trace-event-1.0.3" + sources."chrome-trace-event-1.0.4" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ @@ -16553,6 +16389,7 @@ in 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" ]; @@ -16569,7 +16406,7 @@ in }) sources."content-type-1.0.5" sources."convert-source-map-1.9.0" - sources."cookie-0.5.0" + sources."cookie-0.6.0" sources."cookie-signature-1.0.6" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" @@ -16585,7 +16422,7 @@ in ]; }) sources."core-js-2.6.12" - sources."core-js-compat-3.35.0" + sources."core-js-compat-3.38.1" sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { @@ -16609,18 +16446,17 @@ in dependencies = [ sources."camelcase-6.3.0" sources."loader-utils-2.0.4" - sources."lru-cache-6.0.0" sources."picocolors-0.2.1" sources."postcss-7.0.39" - sources."semver-7.5.4" + sources."semver-7.6.3" sources."source-map-0.6.1" - sources."yallist-4.0.0" ]; }) sources."css-select-4.3.0" sources."css-select-base-adapter-0.1.1" (sources."css-tree-1.0.0-alpha.37" // { dependencies = [ + sources."mdn-data-2.0.4" sources."source-map-0.6.1" ]; }) @@ -16653,19 +16489,21 @@ in (sources."csso-4.2.0" // { dependencies = [ sources."css-tree-1.1.3" - sources."mdn-data-2.0.14" sources."source-map-0.6.1" ]; }) sources."cycle-1.0.3" sources."cyclist-1.0.2" sources."dashdash-1.14.1" - sources."debug-4.3.4" + sources."data-view-buffer-1.0.1" + sources."data-view-byte-length-1.0.1" + sources."data-view-byte-offset-1.0.0" + sources."debug-4.3.7" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.2" sources."deep-equal-0.2.2" sources."default-gateway-4.2.0" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" sources."define-property-2.0.2" (sources."del-4.1.1" // { @@ -16710,8 +16548,8 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.622" - (sources."elliptic-6.5.4" // { + sources."electron-to-chromium-1.5.29" + (sources."elliptic-6.5.7" // { dependencies = [ sources."bn.js-4.12.0" ]; @@ -16738,7 +16576,7 @@ in sources."elm-webpack-loader-6.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" - sources."encodeurl-1.0.2" + sources."encodeurl-2.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-4.5.0" // { dependencies = [ @@ -16748,11 +16586,14 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.22.3" + sources."es-abstract-1.23.3" sources."es-array-method-boxes-properly-1.0.0" - sources."es-set-tostringtag-2.0.2" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" + sources."es-object-atoms-1.0.0" + sources."es-set-tostringtag-2.0.3" sources."es-to-primitive-1.2.1" - sources."escalade-3.1.1" + sources."escalade-3.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-2.0.0" sources."eslint-scope-4.0.3" @@ -16788,12 +16629,12 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."express-4.18.2" // { + (sources."express-4.21.0" // { dependencies = [ sources."array-flatten-1.1.1" sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.11.0" + sources."qs-6.13.0" sources."safe-buffer-5.2.1" ]; }) @@ -16850,8 +16691,8 @@ in }) sources."file-uri-to-path-1.0.0" sources."filesize-3.6.1" - sources."fill-range-7.0.1" - (sources."finalhandler-1.2.0" // { + sources."fill-range-7.1.1" + (sources."finalhandler-1.3.1" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -16867,7 +16708,7 @@ in sources."find-up-4.1.0" sources."firstline-1.3.1" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.15.4" + sources."follow-redirects-1.15.9" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -16881,16 +16722,16 @@ in sources."fs-readdir-recursive-1.1.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" + sources."fsevents-1.2.13" sources."function-bind-1.1.2" sources."function.prototype.name-1.1.6" sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-stream-4.1.0" - sources."get-symbol-description-1.0.0" + sources."get-symbol-description-1.0.2" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -16907,7 +16748,7 @@ in ]; }) sources."globals-11.12.0" - sources."globalthis-1.0.3" + sources."globalthis-1.0.4" (sources."globby-7.1.1" // { dependencies = [ sources."pify-3.0.0" @@ -16927,10 +16768,10 @@ in sources."has-1.0.4" sources."has-bigints-1.0.2" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.1" - sources."has-proto-1.0.1" + sources."has-property-descriptors-1.0.2" + sources."has-proto-1.0.3" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" + sources."has-tostringtag-1.0.2" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -16949,7 +16790,7 @@ in ]; }) sources."hash.js-1.1.7" - sources."hasown-2.0.0" + sources."hasown-2.0.2" sources."he-1.2.0" sources."hex-color-regex-1.1.0" sources."hmac-drbg-1.0.1" @@ -17008,15 +16849,15 @@ in ]; }) sources."internal-ip-4.3.0" - sources."internal-slot-1.0.6" + sources."internal-slot-1.0.7" sources."invert-kv-1.0.0" - sources."ip-1.1.8" + sources."ip-1.1.9" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-absolute-url-2.1.0" sources."is-accessor-descriptor-1.0.1" sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.2" + sources."is-array-buffer-3.0.4" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" @@ -17024,8 +16865,9 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.7" sources."is-color-stop-1.1.0" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.1" sources."is-data-descriptor-1.0.1" + sources."is-data-view-1.0.1" sources."is-date-object-1.0.5" sources."is-descriptor-1.0.3" sources."is-directory-0.3.1" @@ -17033,7 +16875,7 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" - sources."is-negative-zero-2.0.2" + sources."is-negative-zero-2.0.3" sources."is-number-7.0.0" sources."is-number-object-1.0.7" sources."is-obj-2.0.0" @@ -17046,11 +16888,11 @@ in sources."is-regexp-1.0.0" sources."is-resolvable-1.1.0" sources."is-root-2.0.0" - sources."is-shared-array-buffer-1.0.2" + sources."is-shared-array-buffer-1.0.3" sources."is-stream-1.1.0" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.12" + sources."is-typed-array-1.1.13" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-weakref-1.0.2" @@ -17068,7 +16910,7 @@ in sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" - (sources."json-stable-stringify-1.1.0" // { + (sources."json-stable-stringify-1.1.1" // { dependencies = [ sources."isarray-2.0.5" ]; @@ -17104,20 +16946,20 @@ in sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" sources."lodash.uniq-4.5.0" - sources."loglevel-1.8.1" + sources."loglevel-1.9.2" sources."lower-case-2.0.2" sources."lru-cache-5.1.1" sources."make-dir-2.1.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."md5.js-1.3.5" - sources."mdn-data-2.0.4" + sources."mdn-data-2.0.14" sources."media-typer-0.3.0" sources."memory-fs-0.4.1" - sources."merge-descriptors-1.0.1" + sources."merge-descriptors-1.0.3" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-4.0.5" + sources."micromatch-4.0.8" (sources."miller-rabin-4.0.1" // { dependencies = [ sources."bn.js-4.12.0" @@ -17144,11 +16986,11 @@ in }) sources."mkdirp-0.5.3" sources."move-concurrently-1.0.1" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" sources."mute-stream-0.0.8" - sources."nan-2.18.0" + sources."nan-2.20.0" sources."nanoid-3.3.7" sources."nanomatch-1.2.13" sources."ncp-1.0.1" @@ -17171,7 +17013,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.14" + sources."node-releases-2.0.18" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" @@ -17192,15 +17034,15 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.13.1" - sources."object-is-1.1.5" + sources."object-inspect-1.13.2" + sources."object-is-1.1.6" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.5" - sources."object.entries-1.1.7" - sources."object.getownpropertydescriptors-2.1.7" + sources."object.entries-1.1.8" + sources."object.getownpropertydescriptors-2.1.8" sources."object.pick-1.3.0" - sources."object.values-1.1.7" + sources."object.values-1.2.0" sources."obuf-1.1.2" sources."on-finished-2.4.1" sources."on-headers-1.0.2" @@ -17226,7 +17068,12 @@ in sources."callsites-3.1.0" ]; }) - sources."parse-asn1-5.1.6" + (sources."parse-asn1-5.1.7" // { + dependencies = [ + sources."hash-base-3.0.4" + sources."safe-buffer-5.2.1" + ]; + }) sources."parse-json-4.0.0" sources."parse-passwd-1.0.0" sources."parseurl-1.3.3" @@ -17239,7 +17086,7 @@ in sources."path-is-inside-1.0.2" sources."path-key-3.1.1" sources."path-parse-1.0.7" - sources."path-to-regexp-0.1.7" + sources."path-to-regexp-0.1.10" (sources."path-type-3.0.0" // { dependencies = [ sources."pify-3.0.0" @@ -17247,7 +17094,7 @@ in }) sources."pbkdf2-3.1.2" sources."performance-now-2.1.0" - sources."picocolors-1.0.0" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pify-4.0.1" sources."pinkie-2.0.4" @@ -17273,7 +17120,8 @@ in ]; }) sources."posix-character-classes-0.1.1" - sources."postcss-8.4.33" + sources."possible-typed-array-names-1.0.0" + sources."postcss-8.4.47" (sources."postcss-calc-7.0.5" // { dependencies = [ sources."picocolors-0.2.1" @@ -17337,13 +17185,11 @@ in sources."cosmiconfig-7.1.0" sources."import-fresh-3.3.0" sources."loader-utils-2.0.4" - sources."lru-cache-6.0.0" sources."parse-json-5.2.0" sources."path-type-4.0.0" sources."resolve-from-4.0.0" sources."schema-utils-3.3.0" - sources."semver-7.5.4" - sources."yallist-4.0.0" + sources."semver-7.6.3" ]; }) (sources."postcss-merge-longhand-4.0.11" // { @@ -17518,7 +17364,7 @@ in ]; }) sources."postcss-safe-parser-5.0.2" - sources."postcss-selector-parser-6.0.15" + sources."postcss-selector-parser-6.1.2" (sources."postcss-svgo-4.0.3" // { dependencies = [ sources."picocolors-0.2.1" @@ -17552,7 +17398,7 @@ in sources."bn.js-4.12.0" ]; }) - sources."pump-3.0.0" + sources."pump-3.0.2" (sources."pumpify-1.5.1" // { dependencies = [ sources."pump-2.0.1" @@ -17567,11 +17413,7 @@ in sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.1" - (sources."raw-body-2.5.1" // { - dependencies = [ - sources."bytes-3.1.2" - ]; - }) + sources."raw-body-2.5.2" (sources."react-dev-utils-6.1.1" // { dependencies = [ sources."@babel/code-frame-7.0.0" @@ -17625,11 +17467,11 @@ in ]; }) sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-10.1.1" + sources."regenerate-unicode-properties-10.2.0" sources."regenerator-runtime-0.13.11" sources."regenerator-transform-0.15.2" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.5.1" + sources."regexp.prototype.flags-1.5.2" sources."regexpu-core-5.3.2" (sources."regjsparser-0.9.1" // { dependencies = [ @@ -17670,28 +17512,28 @@ in sources."tslib-1.14.1" ]; }) - (sources."safe-array-concat-1.0.1" // { + (sources."safe-array-concat-1.1.2" // { dependencies = [ sources."isarray-2.0.5" ]; }) sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."safe-regex-test-1.0.0" + sources."safe-regex-test-1.0.3" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."schema-utils-2.7.1" sources."select-hose-2.0.0" sources."selfsigned-1.10.14" sources."semver-5.7.2" - (sources."send-0.18.0" // { + (sources."send-0.19.0" // { dependencies = [ (sources."debug-2.6.9" // { dependencies = [ sources."ms-2.0.0" ]; }) - sources."ms-2.1.3" + sources."encodeurl-1.0.2" ]; }) sources."serialize-javascript-4.0.0" @@ -17706,10 +17548,10 @@ in sources."statuses-1.5.0" ]; }) - sources."serve-static-1.15.0" + sources."serve-static-1.16.2" sources."set-blocking-2.0.0" - sources."set-function-length-1.1.1" - sources."set-function-name-2.0.1" + sources."set-function-length-1.2.2" + sources."set-function-name-2.0.2" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -17721,7 +17563,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shell-quote-1.6.1" - sources."side-channel-1.0.4" + sources."side-channel-1.0.6" sources."signal-exit-3.0.7" (sources."simple-swizzle-0.2.2" // { dependencies = [ @@ -17763,7 +17605,7 @@ in sources."sort-keys-1.1.2" sources."source-list-map-2.0.1" sources."source-map-0.5.7" - sources."source-map-js-1.0.2" + sources."source-map-js-1.2.1" sources."source-map-resolve-0.5.3" (sources."source-map-support-0.5.21" // { dependencies = [ @@ -17772,9 +17614,9 @@ in }) sources."source-map-url-0.4.1" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.20" sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ @@ -17798,7 +17640,7 @@ in sources."stream-browserify-2.0.2" sources."stream-each-1.2.3" sources."stream-http-2.8.3" - sources."stream-shift-1.0.1" + sources."stream-shift-1.0.3" sources."strict-uri-encode-1.1.0" sources."string-replace-loader-2.3.0" (sources."string-width-4.2.3" // { @@ -17806,9 +17648,9 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."string.prototype.trim-1.2.8" - sources."string.prototype.trimend-1.0.7" - sources."string.prototype.trimstart-1.0.7" + 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" (sources."stringify-object-3.3.0" // { dependencies = [ @@ -17860,7 +17702,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.4.5" // { + (sources."terser-webpack-plugin-1.4.6" // { dependencies = [ sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" @@ -17890,15 +17732,15 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tough-cookie-2.5.0" - sources."tslib-2.6.2" + sources."tslib-2.7.0" sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."typed-array-buffer-1.0.0" - sources."typed-array-byte-length-1.0.0" - sources."typed-array-byte-offset-1.0.0" - sources."typed-array-length-1.0.4" + 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."typedarray-0.0.6" (sources."uglify-es-3.3.10" // { dependencies = [ @@ -17930,10 +17772,10 @@ in ]; }) sources."unbox-primitive-1.0.2" - sources."undici-types-5.26.5" - sources."unicode-canonical-property-names-ecmascript-2.0.0" + sources."undici-types-6.19.8" + sources."unicode-canonical-property-names-ecmascript-2.0.1" sources."unicode-match-property-ecmascript-2.0.0" - sources."unicode-match-property-value-ecmascript-2.1.0" + sources."unicode-match-property-value-ecmascript-2.2.0" sources."unicode-property-aliases-ecmascript-2.1.0" sources."union-value-1.0.1" sources."uniq-1.0.1" @@ -17954,13 +17796,13 @@ in ]; }) sources."upath-1.2.0" - sources."update-browserslist-db-1.0.13" + sources."update-browserslist-db-1.1.1" sources."uri-js-4.4.1" sources."urix-0.1.0" - (sources."url-0.11.3" // { + (sources."url-0.11.4" // { dependencies = [ sources."punycode-1.4.1" - sources."qs-6.11.2" + sources."qs-6.13.0" ]; }) (sources."url-loader-4.1.1" // { @@ -18000,11 +17842,16 @@ in sources."chokidar-2.1.8" sources."extend-shallow-2.0.1" sources."fill-range-4.0.0" - sources."fsevents-1.2.13" sources."is-binary-path-1.0.1" + sources."is-extendable-1.0.1" sources."is-number-3.0.0" sources."kind-of-3.2.2" - sources."micromatch-3.1.10" + (sources."micromatch-3.1.10" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."kind-of-6.0.3" + ]; + }) sources."normalize-path-2.1.1" sources."readdirp-2.2.1" sources."to-regex-range-2.1.1" @@ -18030,14 +17877,13 @@ in }) (sources."webpack-dev-server-3.11.0" // { dependencies = [ - sources."ansi-regex-2.1.1" + sources."ansi-regex-4.1.1" sources."anymatch-2.0.0" sources."binary-extensions-1.13.1" sources."braces-2.3.2" sources."chokidar-2.1.8" (sources."cliui-5.0.0" // { dependencies = [ - sources."ansi-regex-4.1.1" sources."strip-ansi-5.2.0" ]; }) @@ -18045,16 +17891,21 @@ in sources."extend-shallow-2.0.1" sources."fill-range-4.0.0" sources."find-up-3.0.0" - sources."fsevents-1.2.13" sources."get-caller-file-2.0.5" sources."http-proxy-middleware-0.19.1" sources."is-absolute-url-3.0.3" sources."is-binary-path-1.0.1" + sources."is-extendable-1.0.1" sources."is-fullwidth-code-point-2.0.0" sources."is-number-3.0.0" sources."kind-of-3.2.2" sources."locate-path-3.0.0" - sources."micromatch-3.1.10" + (sources."micromatch-3.1.10" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."kind-of-6.0.3" + ]; + }) sources."normalize-path-2.1.1" sources."opn-5.5.0" sources."p-locate-3.0.0" @@ -18065,17 +17916,19 @@ in sources."semver-6.3.1" (sources."string-width-3.1.0" // { dependencies = [ - sources."ansi-regex-4.1.1" sources."strip-ansi-5.2.0" ]; }) - sources."strip-ansi-3.0.1" + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) sources."supports-color-6.1.0" sources."to-regex-range-2.1.1" sources."which-module-2.0.1" (sources."wrap-ansi-5.1.0" // { dependencies = [ - sources."ansi-regex-4.1.1" sources."strip-ansi-5.2.0" ]; }) @@ -18100,7 +17953,7 @@ in sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" sources."which-module-1.0.0" - sources."which-typed-array-1.1.13" + sources."which-typed-array-1.1.15" (sources."winston-2.1.1" // { dependencies = [ sources."async-1.0.0" @@ -18138,7 +17991,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-6.2.2" + sources."ws-6.2.3" sources."xmlbuilder-15.1.1" sources."xtend-4.0.2" sources."y18n-4.0.3" @@ -18241,73 +18094,67 @@ in elm-pages = nodeEnv.buildNodePackage { name = "elm-pages"; packageName = "elm-pages"; - version = "3.0.9"; + version = "3.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/elm-pages/-/elm-pages-3.0.9.tgz"; - sha512 = "EFwDCYHm3rwCiwXwfSUKeDDcIYrQ61deChDk7ruXPN4y0PkIINIKbljLu3uOnKSYhzc5CGSc7avwiAlkxXnJsA=="; + url = "https://registry.npmjs.org/elm-pages/-/elm-pages-3.0.16.tgz"; + sha512 = "UG/tC57uFQ5bkhW+L+7ZFjSg0uPHEtUPsjotHl8CzXHqfOUR4pRIqQ6kyi7DOGxStmoTyTvjh7TFZGA54/mXgw=="; }; dependencies = [ - sources."@adobe/css-tools-4.3.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."@adobe/css-tools-4.3.3" + sources."@bufbuild/protobuf-2.1.0" sources."@isaacs/cliui-8.0.2" - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/source-map-0.3.5" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.20" + 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.5.0" + sources."@jridgewell/trace-mapping-0.3.25" + (sources."@jsonjoy.com/base64-1.1.2" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) + (sources."@jsonjoy.com/json-pack-1.1.0" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) + (sources."@jsonjoy.com/util-1.3.0" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@npmcli/fs-3.1.0" // { + sources."@npmcli/agent-2.2.2" + (sources."@npmcli/fs-3.1.1" // { dependencies = [ - sources."lru-cache-6.0.0" - sources."semver-7.5.4" + sources."semver-7.6.3" ]; }) sources."@sindresorhus/is-0.14.0" + sources."@sindresorhus/merge-streams-3.0.0" sources."@szmarczak/http-timer-1.1.2" - sources."@tootallnate/once-2.0.0" sources."@types/configstore-2.1.1" sources."@types/debug-0.0.30" + sources."@types/estree-1.0.6" sources."@types/get-port-3.2.0" sources."@types/glob-5.0.38" - sources."@types/lodash-4.14.202" + sources."@types/lodash-4.17.9" sources."@types/minimatch-5.1.2" sources."@types/mkdirp-0.5.2" sources."@types/node-8.10.66" sources."@types/rimraf-2.0.5" sources."@types/tmp-0.0.33" sources."accepts-1.3.8" - sources."acorn-8.11.3" - (sources."agent-base-6.0.2" // { + sources."acorn-8.12.1" + (sources."agent-base-7.1.1" // { dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) - sources."agentkeepalive-4.5.0" sources."aggregate-error-3.1.0" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -18319,24 +18166,24 @@ in sources."async-limiter-1.0.1" sources."balanced-match-1.0.2" sources."batch-0.6.1" - sources."binary-extensions-2.2.0" - (sources."body-parser-1.20.1" // { + sources."binary-extensions-2.3.0" + (sources."body-parser-1.20.3" // { dependencies = [ sources."on-finished-2.4.1" ]; }) sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" + sources."buffer-builder-0.2.0" sources."buffer-from-1.1.2" sources."bufferutil-4.0.8" sources."busboy-1.6.0" sources."bytes-3.1.2" - (sources."cacache-17.1.4" // { + (sources."cacache-18.0.4" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" - sources."minipass-7.0.4" + sources."glob-10.4.5" + sources."minimatch-9.0.5" ]; }) (sources."cacheable-request-6.1.0" // { @@ -18345,21 +18192,23 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."chalk-3.0.0" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."chownr-2.0.0" sources."clean-stack-2.2.0" + sources."cli-cursor-4.0.0" sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."colorjs.io-0.5.2" sources."command-exists-1.2.9" - sources."commander-10.0.1" + sources."commander-11.1.0" sources."concat-map-0.0.1" sources."connect-3.7.0" sources."content-disposition-0.5.4" sources."content-type-1.0.5" - sources."cookie-0.5.0" + sources."cookie-0.6.0" sources."cookie-signature-1.2.1" sources."copy-anything-2.0.6" (sources."cross-spawn-7.0.3" // { @@ -18371,7 +18220,7 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."depd-2.0.0" sources."destroy-1.2.0" sources."detect-libc-1.0.3" @@ -18381,7 +18230,6 @@ in sources."ms-2.1.3" ]; }) - sources."dir-glob-3.0.1" sources."duplexer3-0.1.5" sources."eastasianwidth-0.2.0" sources."ee-first-1.1.1" @@ -18398,85 +18246,94 @@ in sources."eol-0.9.1" sources."err-code-2.0.3" sources."errno-0.1.8" - sources."esbuild-0.17.19" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" + sources."esbuild-0.21.5" sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" - (sources."express-4.18.2" // { + (sources."express-4.21.0" // { dependencies = [ sources."cookie-signature-1.0.6" - sources."finalhandler-1.2.0" + sources."encodeurl-2.0.0" + sources."finalhandler-1.3.1" sources."on-finished-2.4.1" sources."statuses-2.0.1" ]; }) (sources."express-ws-4.0.0" // { dependencies = [ - sources."ws-5.2.3" + sources."ws-5.2.4" ]; }) sources."extend-shallow-2.0.1" sources."fast-glob-3.3.2" - sources."fastq-1.16.0" - sources."fill-range-7.0.1" + sources."fastq-1.17.1" + sources."fill-range-7.1.1" sources."finalhandler-1.1.2" - sources."foreground-child-3.1.1" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."fs-extra-11.2.0" - (sources."fs-minipass-3.0.3" // { + (sources."foreground-child-3.3.0" // { dependencies = [ - sources."minipass-7.0.4" + sources."signal-exit-4.1.0" ]; }) - sources."fs-monkey-1.0.5" + sources."forwarded-0.2.0" + sources."fresh-0.5.2" + sources."fs-extra-11.2.0" + sources."fs-minipass-3.0.3" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-port-3.2.0" sources."get-stream-4.1.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globby-13.1.4" + (sources."globby-14.0.0" // { + dependencies = [ + sources."@sindresorhus/merge-streams-1.0.0" + ]; + }) sources."gopd-1.0.1" sources."got-9.6.0" sources."graceful-fs-4.2.11" sources."gray-matter-4.0.3" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" - sources."has-proto-1.0.1" + sources."has-property-descriptors-1.0.2" + sources."has-proto-1.0.3" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.2" sources."http-cache-semantics-4.1.1" (sources."http-errors-2.0.0" // { dependencies = [ sources."statuses-2.0.1" ]; }) - (sources."http-proxy-agent-5.0.0" // { + (sources."http-proxy-agent-7.0.2" // { dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) - (sources."https-proxy-agent-5.0.1" // { + (sources."https-proxy-agent-7.0.5" // { dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) - sources."humanize-ms-1.2.1" + sources."hyperdyperid-1.2.0" sources."iconv-lite-0.4.24" - sources."ignore-5.3.0" + sources."ignore-5.3.2" sources."image-size-0.5.5" - sources."immutable-4.3.4" + sources."immutable-4.3.7" 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."ip-2.0.0" + (sources."ip-address-9.0.5" // { + dependencies = [ + sources."sprintf-js-1.1.3" + ]; + }) sources."ipaddr.js-1.9.1" sources."is-binary-path-2.1.0" sources."is-docker-2.2.1" @@ -18490,8 +18347,9 @@ in sources."is-what-3.14.1" sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."jackspeak-2.3.6" + sources."jackspeak-3.4.3" sources."js-yaml-3.14.1" + sources."jsbn-1.1.0" sources."jsesc-3.0.2" sources."json-buffer-3.0.0" sources."jsonfile-6.1.0" @@ -18501,42 +18359,39 @@ in sources."latest-version-5.1.0" (sources."less-4.2.0" // { dependencies = [ - sources."tslib-2.6.2" + sources."tslib-2.7.0" ]; }) - sources."lightningcss-1.22.1" + sources."lightningcss-1.27.0" sources."lodash-4.17.21" sources."lowercase-keys-1.0.1" - sources."lru-cache-7.18.3" + sources."lru-cache-10.4.3" (sources."make-dir-2.1.0" // { dependencies = [ sources."semver-5.7.2" ]; }) - sources."make-fetch-happen-11.1.1" + sources."make-fetch-happen-13.0.1" sources."media-typer-0.3.0" - sources."memfs-3.6.0" - sources."merge-descriptors-1.0.1" + (sources."memfs-4.12.0" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) + sources."merge-descriptors-1.0.3" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-4.0.5" + sources."micromatch-4.0.8" 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."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-fetch-3.0.4" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) + sources."minipass-7.1.2" + sources."minipass-collect-2.0.1" + sources."minipass-fetch-3.0.5" (sources."minipass-flush-1.0.5" // { dependencies = [ sources."minipass-3.3.6" @@ -18566,60 +18421,75 @@ in ]; }) sources."negotiator-0.6.3" - sources."node-gyp-build-4.7.1" + sources."node-gyp-build-4.8.2" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."on-finished-2.3.0" sources."once-1.4.0" + sources."onetime-5.1.2" sources."open-7.4.2" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-map-4.0.0" sources."package-json-6.5.0" + sources."package-json-from-dist-1.0.1" sources."parse-node-version-1.0.1" sources."parseurl-1.3.3" sources."password-prompt-1.1.3" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."lru-cache-10.1.0" - ]; - }) - sources."path-to-regexp-0.1.7" - sources."path-type-4.0.0" - sources."picocolors-1.0.0" + sources."path-scurry-1.11.1" + sources."path-to-regexp-0.1.10" + sources."path-type-5.0.0" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."postcss-8.4.33" + sources."postcss-8.4.47" sources."prepend-http-2.0.0" + sources."proc-log-4.2.0" sources."promise-retry-2.0.1" sources."proxy-addr-2.0.7" sources."prr-1.0.1" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."punycode-2.3.1" - sources."qs-6.11.0" + sources."qs-6.13.0" sources."queue-microtask-1.2.3" sources."range-parser-1.2.1" - sources."raw-body-2.5.1" + sources."raw-body-2.5.2" sources."rc-1.2.8" sources."readdirp-3.6.0" sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" sources."responselike-1.0.2" + sources."restore-cursor-4.0.0" sources."retry-0.12.0" sources."reusify-1.0.4" sources."rimraf-2.7.1" - sources."rollup-3.29.4" + sources."rollup-4.22.5" sources."run-parallel-1.2.0" + (sources."rxjs-7.8.1" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sass-1.69.7" - sources."sax-1.3.0" + (sources."sass-1.79.3" // { + dependencies = [ + sources."chokidar-4.0.1" + sources."readdirp-4.0.1" + ]; + }) + (sources."sass-embedded-1.79.3" // { + dependencies = [ + sources."supports-color-8.1.1" + ]; + }) + sources."sax-1.4.1" sources."section-matter-1.0.0" sources."semver-6.3.1" - (sources."send-0.18.0" // { + (sources."send-0.19.0" // { dependencies = [ sources."ms-2.1.3" sources."on-finished-2.4.1" @@ -18634,31 +18504,31 @@ in sources."setprototypeof-1.1.0" ]; }) - sources."serve-static-1.15.0" - sources."set-function-length-1.1.1" + (sources."serve-static-1.16.2" // { + dependencies = [ + sources."encodeurl-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.4" - sources."signal-exit-4.1.0" - sources."slash-4.0.0" + sources."side-channel-1.0.6" + sources."signal-exit-3.0.7" + sources."slash-5.1.0" sources."smart-buffer-4.2.0" - sources."socks-2.7.1" - (sources."socks-proxy-agent-7.0.0" // { + sources."socks-2.8.3" + (sources."socks-proxy-agent-8.0.4" // { dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) sources."source-map-0.6.1" - sources."source-map-js-1.0.2" + sources."source-map-js-1.2.1" sources."source-map-support-0.5.21" sources."sprintf-js-1.0.3" - (sources."ssri-10.0.5" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) + sources."ssri-10.0.6" sources."statuses-1.5.0" sources."streamsearch-1.1.0" sources."string-width-5.1.2" @@ -18670,45 +18540,58 @@ in }) (sources."strip-ansi-7.1.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" ]; }) sources."strip-ansi-cjs-6.0.1" sources."strip-bom-string-1.0.0" sources."strip-json-comments-2.0.1" - (sources."stylus-0.62.0" // { + (sources."stylus-0.63.0" // { dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" + sources."sax-1.3.0" sources."source-map-0.7.4" ]; }) sources."sudo-prompt-8.2.5" sources."sugarss-4.0.1" sources."supports-color-7.2.0" - (sources."tar-6.2.0" // { + (sources."tar-6.2.1" // { dependencies = [ (sources."fs-minipass-2.1.0" // { dependencies = [ sources."minipass-3.3.6" ]; }) + sources."minipass-5.0.0" sources."mkdirp-1.0.4" ]; }) - (sources."terser-5.26.0" // { + (sources."terser-5.34.0" // { dependencies = [ sources."commander-2.20.3" ]; }) + (sources."thingies-1.21.0" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" + (sources."tree-dump-1.0.2" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) sources."tslib-1.14.1" sources."type-fest-0.21.3" sources."type-is-1.6.18" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" + sources."unicorn-magic-0.1.0" sources."unique-filename-3.0.0" sources."unique-slug-4.0.0" sources."universalify-2.0.1" @@ -18716,36 +18599,19 @@ in sources."url-parse-lax-3.0.0" sources."utf-8-validate-5.0.10" sources."utils-merge-1.0.1" + sources."varint-6.0.0" sources."vary-1.1.2" - (sources."vite-4.5.1" // { + (sources."vite-5.4.8" // { dependencies = [ - sources."@esbuild/android-arm-0.18.20" - sources."@esbuild/android-arm64-0.18.20" - sources."@esbuild/android-x64-0.18.20" - sources."@esbuild/darwin-arm64-0.18.20" - sources."@esbuild/darwin-x64-0.18.20" - sources."@esbuild/freebsd-arm64-0.18.20" - sources."@esbuild/freebsd-x64-0.18.20" - sources."@esbuild/linux-arm-0.18.20" - sources."@esbuild/linux-arm64-0.18.20" - sources."@esbuild/linux-ia32-0.18.20" - sources."@esbuild/linux-loong64-0.18.20" - sources."@esbuild/linux-mips64el-0.18.20" - sources."@esbuild/linux-ppc64-0.18.20" - sources."@esbuild/linux-riscv64-0.18.20" - sources."@esbuild/linux-s390x-0.18.20" - sources."@esbuild/linux-x64-0.18.20" - sources."@esbuild/netbsd-x64-0.18.20" - sources."@esbuild/openbsd-x64-0.18.20" - sources."@esbuild/sunos-x64-0.18.20" - sources."@esbuild/win32-arm64-0.18.20" - sources."@esbuild/win32-ia32-0.18.20" - sources."@esbuild/win32-x64-0.18.20" - sources."@types/node-20.10.6" - sources."esbuild-0.18.20" + sources."@types/node-22.7.3" + sources."esbuild-0.21.5" + ]; + }) + (sources."which-4.0.0" // { + dependencies = [ + sources."isexe-3.1.1" ]; }) - sources."which-3.0.1" (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-styles-6.2.1" @@ -18759,7 +18625,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.9" + sources."ws-7.5.10" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -18775,10 +18641,10 @@ in elm-review = nodeEnv.buildNodePackage { name = "elm-review"; packageName = "elm-review"; - version = "2.10.3"; + version = "2.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/elm-review/-/elm-review-2.10.3.tgz"; - sha512 = "9gBqLc5Xm3v9Ncpf8y2haEaBZZyMX25vmwQkrNqSIaNYQ2vdGOIx1eyqRtt1xwX5O8pZdqU8IWC/ENyTrOTKbw=="; + url = "https://registry.npmjs.org/elm-review/-/elm-review-2.12.0.tgz"; + sha512 = "so+G1hvCV85A63sQQzEhCNFNYyQVWDexXrz0TNEYg3/IIGHzN1bcRN+W4KJSvvFcmfEImzMSJ9AN20bvemU+4Q=="; }; dependencies = [ (sources."@isaacs/cliui-8.0.2" // { @@ -18788,29 +18654,32 @@ in 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" sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" 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.10.6" + sources."@types/node-22.7.3" sources."@types/responselike-1.0.3" sources."ansi-escapes-4.3.2" - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."ansi-styles-4.3.0" sources."anymatch-3.1.3" sources."at-least-node-1.0.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" - sources."binary-extensions-2.2.0" + sources."binary-extensions-2.3.0" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."buffer-5.7.1" sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.4" sources."chalk-4.1.2" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.9.2" sources."clone-1.0.4" @@ -18819,7 +18688,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."debug-4.3.4" + sources."debug-4.3.7" (sources."decompress-response-6.0.0" // { dependencies = [ sources."mimic-response-3.1.0" @@ -18827,36 +18696,35 @@ in }) sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" + sources."dir-glob-3.0.1" sources."eastasianwidth-0.2.0" - sources."elm-tooling-1.15.0" + sources."elm-solve-deps-wasm-1.0.2" sources."emoji-regex-9.2.2" sources."end-of-stream-1.4.4" + sources."fast-glob-3.3.2" sources."fastest-levenshtein-1.0.16" - sources."fill-range-7.0.1" + sources."fastq-1.17.1" + sources."fill-range-7.1.1" sources."find-up-4.1.0" sources."folder-hash-3.3.3" - (sources."foreground-child-3.1.1" // { - dependencies = [ - sources."signal-exit-4.1.0" - ]; - }) + sources."foreground-child-3.3.0" sources."fs-extra-9.1.0" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" sources."get-stream-5.2.0" - (sources."glob-7.2.3" // { + (sources."glob-10.4.5" // { dependencies = [ - sources."minimatch-3.1.2" + sources."brace-expansion-2.0.1" + sources."minimatch-9.0.5" ]; }) sources."glob-parent-5.1.2" + sources."globby-13.2.2" sources."got-11.8.6" sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" sources."http-cache-semantics-4.1.1" sources."http2-wrapper-1.0.3" sources."ieee754-1.2.1" - sources."inflight-1.0.6" + sources."ignore-5.3.2" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" @@ -18866,7 +18734,7 @@ in sources."is-number-7.0.0" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - sources."jackspeak-2.3.6" + sources."jackspeak-3.4.3" sources."json-buffer-3.0.1" sources."jsonfile-6.1.0" sources."keyv-4.5.4" @@ -18874,13 +18742,15 @@ in sources."locate-path-5.0.0" sources."log-symbols-4.1.0" sources."lowercase-keys-2.0.0" - sources."lru-cache-10.1.0" + sources."lru-cache-10.4.3" + sources."merge2-1.4.1" + sources."micromatch-4.0.8" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.8" sources."minimist-1.2.8" - sources."minipass-7.0.4" - sources."ms-2.1.2" + sources."minipass-7.1.2" + sources."ms-2.1.3" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" sources."once-1.4.0" @@ -18890,31 +18760,34 @@ in sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" + sources."package-json-from-dist-1.0.1" sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-scurry-1.10.1" + sources."path-scurry-1.11.1" + sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."prompts-2.4.2" - sources."pump-3.0.0" + sources."pump-3.0.2" + sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."readable-stream-3.6.2" sources."readdirp-3.6.0" sources."resolve-alpn-1.2.1" sources."responselike-2.0.1" - sources."restore-cursor-3.1.0" - (sources."rimraf-5.0.5" // { + (sources."restore-cursor-3.1.0" // { dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" + sources."signal-exit-3.0.7" ]; }) + sources."reusify-1.0.4" + sources."rimraf-5.0.10" + sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.7" + sources."signal-exit-4.1.0" sources."sisteransi-1.0.5" + sources."slash-4.0.0" (sources."string-width-5.1.2" // { dependencies = [ sources."strip-ansi-7.1.0" @@ -18941,12 +18814,12 @@ in sources."terminal-link-2.1.1" sources."to-regex-range-5.0.1" sources."type-fest-0.21.3" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."universalify-2.0.1" sources."util-deprecate-1.0.2" sources."wcwidth-1.0.1" sources."which-2.0.2" - (sources."wrap-ansi-6.2.0" // { + (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."emoji-regex-8.0.0" sources."string-width-4.2.3" @@ -18981,14 +18854,12 @@ in dependencies = [ sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" - sources."debug-4.3.4" + sources."debug-4.3.7" sources."git-clone-able-0.1.2" - sources."lru-cache-6.0.0" - sources."ms-2.1.2" - sources."semver-7.5.4" - sources."simple-git-3.22.0" + sources."ms-2.1.3" + sources."semver-7.6.3" + sources."simple-git-3.27.0" sources."upath-2.0.1" - sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -19022,7 +18893,7 @@ in sources."form-data-3.0.1" sources."fs.realpath-1.0.0" sources."glob-7.2.3" - sources."graphql-16.8.1" + sources."graphql-16.9.0" sources."graphql-request-3.7.0" sources."iconv-lite-0.6.3" sources."inflight-1.0.6" diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 2d94880976d7..7779bbbc670b 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; - paths = with llvmPackages; [ clang-unwrapped clang-unwrapped.lib lld llvm ]; + paths = with llvmPackages; [ clang-unwrapped (lib.getLib clang-unwrapped) lld llvm ]; }; nodeModules = buildNpmPackage { diff --git a/pkgs/development/compilers/erg/default.nix b/pkgs/development/compilers/erg/default.nix deleted file mode 100644 index 9276a311a581..000000000000 --- a/pkgs/development/compilers/erg/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, makeWrapper -, python3 -, which -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "erg"; - version = "0.6.44"; - - src = fetchFromGitHub { - owner = "erg-lang"; - repo = "erg"; - rev = "v${version}"; - hash = "sha256-Pw6q3qmYehTPnB3MyDi8Q5tC018H3zLsZAXWuc+abjE="; - }; - - cargoHash = "sha256-uO+j1kmoCLy00P0QHGy30XVPyG1tH4FU6YvTfWxxvWE="; - - nativeBuildInputs = [ - makeWrapper - python3 - which - ]; - - buildFeatures = [ "full" ]; - - env = { - BUILD_DATE = "1970/01/01 00:00:00"; - CASE_SENSITIVE = lib.boolToString (!stdenv.isDarwin); - GIT_HASH_SHORT = src.rev; - }; - - # TODO(figsoda): fix tests - doCheck = false; - - # the build script is impure and also assumes we are in a git repository - postPatch = '' - rm crates/erg_common/build.rs - ''; - - preBuild = '' - export HOME=$(mktemp -d) - export CARGO_ERG_PATH=$HOME/.erg - ''; - - postInstall = '' - mkdir -p $out/share - mv "$CARGO_ERG_PATH" $out/share/erg - - wrapProgram $out/bin/erg \ - --set-default ERG_PATH $out/share/erg - ''; - - meta = with lib; { - description = "Statically typed language that can deeply improve the Python ecosystem"; - mainProgram = "erg"; - homepage = "https://github.com/erg-lang/erg"; - changelog = "https://github.com/erg-lang/erg/releases/tag/${src.rev}"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index f23e9540928a..71e2146a7004 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -D fasm${lib.optionalString stdenvNoCC.isx86_64 ".x64"} $out/bin/fasm + install -D fasm${lib.optionalString stdenvNoCC.hostPlatform.isx86_64 ".x64"} $out/bin/fasm runHook postInstall ''; diff --git a/pkgs/development/compilers/fasmg/default.nix b/pkgs/development/compilers/fasmg/default.nix deleted file mode 100644 index b62c114c77e4..000000000000 --- a/pkgs/development/compilers/fasmg/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, stdenv -, fetchzip -}: - -stdenv.mkDerivation rec { - pname = "fasmg"; - version = "j27m"; - - src = fetchzip { - url = "https://flatassembler.net/fasmg.${version}.zip"; - sha256 = "0qmklb24n3r0my2risid8r61pi88gqrvm1c0xvyd0bp1ans6d7zd"; - stripRoot = false; - }; - - buildPhase = let - inherit (stdenv.hostPlatform) system; - - path = { - x86_64-linux = { - bin = "fasmg.x64"; - asm = "source/linux/x64/fasmg.asm"; - }; - x86_64-darwin = { - bin = "source/macos/x64/fasmg"; - asm = "source/macos/x64/fasmg.asm"; - }; - x86-linux = { - bin = "fasmg"; - asm = "source/linux/fasmg.asm"; - }; - x86-darwin = { - bin = "source/macos/fasmg"; - asm = "source/macos/fasmg.asm"; - }; - }.${system} or (throw "Unsupported system: ${system}"); - - in '' - chmod +x ${path.bin} - ./${path.bin} ${path.asm} fasmg - ''; - - outputs = [ "out" "doc" ]; - - installPhase = '' - install -Dm755 fasmg $out/bin/fasmg - - mkdir -p $doc/share/doc/fasmg - cp docs/*.txt $doc/share/doc/fasmg - ''; - - meta = with lib; { - description = "x86(-64) macro assembler to binary, MZ, PE, COFF, and ELF"; - mainProgram = "fasmg"; - homepage = "https://flatassembler.net"; - license = licenses.bsd3; - maintainers = with maintainers; [ orivej luc65r ]; - platforms = with platforms; intersectLists (linux ++ darwin) x86; - }; -} diff --git a/pkgs/development/compilers/firrtl/default.nix b/pkgs/development/compilers/firrtl/default.nix deleted file mode 100644 index 3f005243d607..000000000000 --- a/pkgs/development/compilers/firrtl/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib, stdenv, jre, setJavaClassPath, coursier, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "firrtl"; - version = "1.5.3"; - scalaVersion = "2.13"; # pin, for determinism - - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit version; - nativeBuildInputs = [ coursier ]; - buildCommand = '' - export COURSIER_CACHE=$(pwd) - cs fetch edu.berkeley.cs:${pname}_${scalaVersion}:${version} > deps - mkdir -p $out/share/java - cp $(< deps) $out/share/java - ''; - outputHashMode = "recursive"; - outputHash = "sha256-xy3zdJZk6Q2HbEn5tRQ9Z0AjyXEteXepoWDaATjiUUw="; - }; - - nativeBuildInputs = [ makeWrapper setJavaClassPath ]; - buildInputs = [ deps ]; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - - makeWrapper ${jre}/bin/java $out/bin/${pname} \ - --add-flags "-cp $CLASSPATH firrtl.stage.FirrtlMain" - - runHook postInstall - ''; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/firrtl --firrtl-source "${'' - circuit test: - module test: - input a: UInt<8> - input b: UInt<8> - output o: UInt - o <= add(a, not(b)) - ''}" -o test.v - cat test.v - grep -qFe "module test" -e "endmodule" test.v - ''; - - meta = with lib; { - description = "Flexible Intermediate Representation for RTL"; - mainProgram = "firrtl"; - longDescription = '' - Firrtl is an intermediate representation (IR) for digital circuits - designed as a platform for writing circuit-level transformations. - ''; - homepage = "https://www.chisel-lang.org/firrtl/"; - license = licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/compilers/flasm/default.nix b/pkgs/development/compilers/flasm/default.nix deleted file mode 100644 index e1da977b0039..000000000000 --- a/pkgs/development/compilers/flasm/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchzip, unzip, fetchpatch, bison, flex, gperf, zlib }: - -stdenv.mkDerivation rec { - pname = "flasm"; - version = "1.64"; - - src = fetchzip { - url = "https://www.nowrap.de/download/flasm16src.zip"; - sha256 = "03hvxm66rb6rjwbr07hc3k7ia5rim2xlhxbd9qmcai9xwmyiqafg"; - stripRoot = false; - }; - - patches = [ - # Pull patch pending upstream inclusion for -fno-common toolchains: - # https://sourceforge.net/p/flasm/patches/2/ - (fetchpatch { - name = "fno-common.patch"; - url = "https://sourceforge.net/p/flasm/patches/2/attachment/0001-flasm-fix-build-on-gcc-10-fno-common.patch"; - sha256 = "0ic7k1mmyvhpnxam89dbg8i9bfzk70zslfdxgpmkszx097bj1hv6"; - }) - ]; - - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - - nativeBuildInputs = [ unzip bison flex gperf ]; - - buildInputs = [ zlib ]; - - installPhase = '' - install -Dm755 flasm -t $out/bin - ''; - - meta = with lib; { - description = "Assembler and disassembler for Flash (SWF) bytecode"; - mainProgram = "flasm"; - homepage = "https://flasm.sourceforge.net/"; - license = licenses.bsd2; - maintainers = with maintainers; [ siraben ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/flix/default.nix b/pkgs/development/compilers/flix/default.nix deleted file mode 100644 index 61fbdd6fe9d8..000000000000 --- a/pkgs/development/compilers/flix/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, fetchurl, stdenvNoCC, makeWrapper, jre }: - -stdenvNoCC.mkDerivation rec { - pname = "flix"; - version = "0.50.0"; - - src = fetchurl { - url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-fAEt7JsljnEXubYgiF8uEOuoOXHjv9AHgQbPunaEMw4="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - export JAR=$out/share/java/flix/flix.jar - install -D $src $JAR - makeWrapper ${jre}/bin/java $out/bin/flix \ - --add-flags "-jar $JAR" - - runHook postInstall - ''; - - meta = with lib; { - description = "Flix Programming Language"; - mainProgram = "flix"; - homepage = "https://github.com/flix/flix"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.asl20; - maintainers = with maintainers; [ athas ]; - inherit (jre.meta) platforms; - }; -} diff --git a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix index 0e1ce6e678cb..e42654c36c51 100644 --- a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix +++ b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix @@ -59,15 +59,24 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}" passthru = { inherit flutterPlatform; }; -} '' +} ('' export FLUTTER_ROOT="$NIX_BUILD_TOP" lndir -silent '${flutter'}' "$FLUTTER_ROOT" rm -rf "$FLUTTER_ROOT/bin/cache" mkdir "$FLUTTER_ROOT/bin/cache" +'' + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") '' + mkdir "$FLUTTER_ROOT/bin/cache/dart-sdk" + lndir -silent '${flutter'}/bin/cache/dart-sdk' "$FLUTTER_ROOT/bin/cache/dart-sdk" +'' + '' + + HOME="$(mktemp -d)" flutter precache ${lib.optionalString (flutter ? engine && flutter.engine.meta.available) "--local-engine ${flutter.engine.outName}"} \ + -v '--${flutterPlatform}' ${builtins.concatStringsSep " " (map (p: "'--no-${p}'") (lib.remove flutterPlatform flutterPlatforms))} - HOME="$(mktemp -d)" flutter precache -v '--${flutterPlatform}' ${builtins.concatStringsSep " " (map (p: "'--no-${p}'") (lib.remove flutterPlatform flutterPlatforms))} rm -rf "$FLUTTER_ROOT/bin/cache/lockfile" +'' + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") '' + rm -rf "$FLUTTER_ROOT/bin/cache/dart-sdk" +'' + '' find "$FLUTTER_ROOT" -type l -lname '${flutter'}/*' -delete cp -r bin/cache "$out" -'' +'') diff --git a/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix index def75e280da7..23bd8485ccff 100644 --- a/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix +++ b/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix @@ -16,6 +16,7 @@ mkdir -p "$out/bin" cp -r . "$out/bin/cache" + rm -f "$out/bin/cache/flutter.version.json" runHook postInstall ''; diff --git a/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix b/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix index ff6c6b31006f..ae89d3720b33 100644 --- a/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix +++ b/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix @@ -146,21 +146,22 @@ let built=build/linux/*/$flutterMode/bundle mkdir -p $out/bin - mv $built $out/app + mkdir -p $out/app + mv $built $out/app/$pname - for f in $(find $out/app -iname "*.desktop" -type f); do + for f in $(find $out/app/$pname -iname "*.desktop" -type f); do install -D $f $out/share/applications/$(basename $f) done - for f in $(find $out/app -maxdepth 1 -type f); do + for f in $(find $out/app/$pname -maxdepth 1 -type f); do ln -s $f $out/bin/$(basename $f) done # make *.so executable - find $out/app -iname "*.so" -type f -exec chmod +x {} + + find $out/app/$pname -iname "*.so" -type f -exec chmod +x {} + # remove stuff like /build/source/packages/ubuntu_desktop_installer/linux/flutter/ephemeral - for f in $(find $out/app -executable -type f); do + for f in $(find $out/app/$pname -executable -type f); do if patchelf --print-rpath "$f" | grep /build; then # this ignores static libs (e,g. libapp.so) also echo "strip RPath of $f" newrp=$(patchelf --print-rpath $f | sed -r "s|/build.*ephemeral:||g" | sed -r "s|/build.*profile:||g") diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix index 443db6af3680..b4ac8c9828d9 100644 --- a/pkgs/development/compilers/flutter/engine/package.nix +++ b/pkgs/development/compilers/flutter/engine/package.nix @@ -3,12 +3,10 @@ callPackage, writeText, symlinkJoin, - targetPlatform, - buildPlatform, darwin, clang, llvm, - tools ? callPackage ./tools.nix { inherit buildPlatform; }, + tools ? callPackage ./tools.nix { }, stdenv, stdenvNoCC, dart, @@ -53,7 +51,7 @@ let expandDeps = deps: lib.flatten (map expandSingleDep deps); - constants = callPackage ./constants.nix { platform = targetPlatform; }; + constants = callPackage ./constants.nix { platform = stdenv.targetPlatform; }; python3 = if lib.versionAtLeast flutterVersion "3.20" then python312 else python39; @@ -64,8 +62,6 @@ let version hashes url - targetPlatform - buildPlatform ; }; @@ -114,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { paths = expandDeps ( - lib.optionals (stdenv.isLinux) [ + lib.optionals (stdenv.hostPlatform.isLinux) [ gtk3 wayland libepoxy @@ -139,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.xorgproto zlib ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ clang llvm ] @@ -161,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: { "-I${finalAttrs.toolchain}/include" ] ++ lib.optional (!isOptimized) "-U_FORTIFY_SOURCE"; - nativeCheckInputs = lib.optionals stdenv.isLinux [ + nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [ xorg.xorgserver openbox ]; @@ -175,8 +171,8 @@ stdenv.mkDerivation (finalAttrs: { ninja dart ] - ++ lib.optionals (stdenv.isLinux) [ patchelf ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux) [ patchelf ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ darwin.system_cmds darwin.xcode tools.xcode-select @@ -214,7 +210,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p src/${dartPath}/tools/sdks ln -s ${dart} src/${dartPath}/tools/sdks/dart-sdk - ${lib.optionalString (stdenv.isLinux) '' + ${lib.optionalString (stdenv.hostPlatform.isLinux) '' for patchtool in ''${patchtools[@]}; do patchelf src/$patchtool --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) done @@ -253,7 +249,7 @@ stdenv.mkDerivation (finalAttrs: { "--embedder-for-target" "--no-goma" ] - ++ lib.optionals (targetPlatform.isx86_64 == false) [ + ++ lib.optionals (stdenv.targetPlatform.isx86_64 == false) [ "--linux" "--linux-cpu ${constants.alt-arch}" ] @@ -269,7 +265,7 @@ stdenv.mkDerivation (finalAttrs: { export PYTHONPATH=$src/src/build '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' export PATH=${darwin.xcode}/Contents/Developer/usr/bin/:$PATH '' + '' @@ -278,7 +274,7 @@ stdenv.mkDerivation (finalAttrs: { --out-dir $out \ --target-sysroot $toolchain \ --target-dir $outName \ - --target-triple ${targetPlatform.config} \ + --target-triple ${stdenv.targetPlatform.config} \ --enable-fontconfig runHook postConfigure @@ -322,7 +318,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { # Very broken on Darwin - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "The Flutter engine"; homepage = "https://flutter.dev"; maintainers = with maintainers; [ RossComputerGuy ]; diff --git a/pkgs/development/compilers/flutter/engine/source.nix b/pkgs/development/compilers/flutter/engine/source.nix index 426e4db4e664..8d38362464a2 100644 --- a/pkgs/development/compilers/flutter/engine/source.nix +++ b/pkgs/development/compilers/flutter/engine/source.nix @@ -1,9 +1,7 @@ { + stdenv, lib, callPackage, - buildPlatform, - targetPlatform, - hostPlatform, fetchgit, tools ? null, curl, @@ -19,13 +17,14 @@ url, }@pkgs: let - target-constants = callPackage ./constants.nix { platform = targetPlatform; }; - build-constants = callPackage ./constants.nix { platform = buildPlatform; }; - tools = pkgs.tools or (callPackage ./tools.nix { inherit hostPlatform buildPlatform; }); + target-constants = callPackage ./constants.nix { platform = stdenv.targetPlatform; }; + build-constants = callPackage ./constants.nix { platform = stdenv.buildPlatform; }; + tools = pkgs.tools or (callPackage ./tools.nix { }); boolOption = value: if value then "True" else "False"; in -runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPlatform.system}" +runCommand + "flutter-engine-source-${version}-${stdenv.buildPlatform.system}-${stdenv.targetPlatform.system}" { pname = "flutter-engine-source"; inherit version; @@ -53,7 +52,7 @@ runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPla "custom_vars": { "download_fuchsia_deps": False, "download_android_deps": False, - "download_linux_deps": ${boolOption targetPlatform.isLinux}, + "download_linux_deps": ${boolOption stdenv.targetPlatform.isLinux}, "setup_githooks": False, "download_esbuild": False, "download_dart_sdk": False, @@ -83,8 +82,8 @@ runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPla outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = - (hashes."${buildPlatform.system}" or { })."${targetPlatform.system}" - or (throw "Hash not set for ${targetPlatform.system} on ${buildPlatform.system}"); + (hashes."${stdenv.buildPlatform.system}" or { })."${stdenv.targetPlatform.system}" + or (throw "Hash not set for ${stdenv.targetPlatform.system} on ${stdenv.buildPlatform.system}"); } '' source ${../../../../build-support/fetchgit/deterministic-git} @@ -101,7 +100,7 @@ runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPla rm -rf $out/src/{buildtools,fuchsia} rm -rf $out/src/flutter/{buildtools,prebuilts,third_party/swiftshader,third_party/gn/.versions} - rm -rf $out/src/flutter/{third_party/dart/tools/sdks/dart-sdk,third_party/ninja/ninja} + rm -rf $out/src/flutter/{third_party/dart/tools/sdks/dart-sdk,third_party/ninja/ninja,third_party/java} rm -rf $out/src/third_party/{dart/tools/sdks/dart-sdk,libcxx/test} rm -rf $out/.cipd $out/.gclient $out/.gclient_entries $out/.gclient_previous_custom_vars $out/.gclient_previous_sync_commits diff --git a/pkgs/development/compilers/flutter/engine/tools.nix b/pkgs/development/compilers/flutter/engine/tools.nix index 42cfd5e6dca6..5fa068480515 100644 --- a/pkgs/development/compilers/flutter/engine/tools.nix +++ b/pkgs/development/compilers/flutter/engine/tools.nix @@ -5,8 +5,6 @@ fetchurl, writeText, runCommand, - buildPlatform, - hostPlatform, darwin, writeShellScriptBin, depot_toolsCommit ? "7d95eb2eb054447592585c73a8ff7adad97ecba1", @@ -31,8 +29,8 @@ }, }: let - constants = callPackage ./constants.nix { platform = buildPlatform; }; - host-constants = callPackage ./constants.nix { platform = hostPlatform; }; + constants = callPackage ./constants.nix { platform = stdenv.buildPlatform; }; + host-constants = callPackage ./constants.nix { platform = stdenv.hostPlatform; }; stdenv-constants = callPackage ./constants.nix { platform = stdenv.hostPlatform; }; in { @@ -73,6 +71,10 @@ in sed -i 's/''${platform}/${host-constants.platform}/g' "$ensureFile" sed -i 's/gn\/gn\/${stdenv-constants.platform}/gn\/gn\/${constants.platform}/g' "$ensureFile" + + if grep flutter/java/openjdk "$ensureFile" >/dev/null; then + sed -i '/src\/flutter\/third_party\/java\/openjdk/,+2 d' "$ensureFile" + fi else params="$params $1" shift 1 diff --git a/pkgs/development/compilers/flutter/flutter-tools.nix b/pkgs/development/compilers/flutter/flutter-tools.nix index 306765cd0a42..1639d54a869e 100644 --- a/pkgs/development/compilers/flutter/flutter-tools.nix +++ b/pkgs/development/compilers/flutter/flutter-tools.nix @@ -28,7 +28,7 @@ buildDartApplication.override { inherit dart; } rec { popd '' # Use arm64 instead of arm64e. - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace lib/src/ios/xcodeproj.dart \ --replace-fail arm64e arm64 ''; diff --git a/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in index f6746db43a76..5af7d7fc7719 100644 --- a/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in +++ b/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in @@ -1,4 +1,4 @@ -{ callPackage, symlinkJoin, lib }: +{ callPackage, symlinkJoin, stdenv, lib }: let nixpkgsRoot = "@nixpkgs_root@"; version = "@flutter_version@"; @@ -17,9 +17,11 @@ let ++ (map (targetPlatform: callPackage "${nixpkgsRoot}/pkgs/development/compilers/flutter/engine/source.nix" { - targetPlatform = lib.systems.elaborate targetPlatform; - hostPlatform = lib.systems.elaborate buildPlatform; - buildPlatform = lib.systems.elaborate buildPlatform; + stdenv = stdenv.override { + targetPlatform = lib.systems.elaborate targetPlatform; + hostPlatform = lib.systems.elaborate buildPlatform; + buildPlatform = lib.systems.elaborate buildPlatform; + }; flutterVersion = version; version = engineVersion; diff --git a/pkgs/development/compilers/flutter/versions/3_13/data.json b/pkgs/development/compilers/flutter/versions/3_13/data.json deleted file mode 100644 index e2df3de88528..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_13/data.json +++ /dev/null @@ -1,922 +0,0 @@ -{ - "version": "3.13.8", - "engineVersion": "767d8c75e898091b925519803830fc2721658d07", - "engineSwiftShaderHash": "sha256-qKf5gXIpI4+05bs7d3W6JlMNTn3vHFQL+i3JpFdyPao=", - "engineSwiftShaderRev": "5f9ed9b16931c7155171d31f75004f73f0a3abc8", - "channel": "stable", - "engineHashes": { - "aarch64-linux": { - "aarch64-linux": "sha256-neB6HtnVeDFycfDNxoYvh1i8QwgtHx9zeEdVGXsm0cM=", - "x86_64-linux": "sha256-neB6HtnVeDFycfDNxoYvh1i8QwgtHx9zeEdVGXsm0cM=" - }, - "x86_64-linux": { - "aarch64-linux": "sha256-yMjdFSF8NoPnG7wHi6K14DobYjYDk9BCUWwWaWspLIA=", - "x86_64-linux": "sha256-yMjdFSF8NoPnG7wHi6K14DobYjYDk9BCUWwWaWspLIA=" - } - }, - "dartVersion": "3.1.4", - "dartHash": { - "x86_64-linux": "sha256-42wrqzjRcFDWw2aEY6+/faX+QE9PA8FmRWP4M/NkgBE=", - "aarch64-linux": "sha256-/tWWWwTOgXHbwzotc7ZDDZa8+cbX6NODGYrjLK9gPPg=", - "x86_64-darwin": "sha256-BchKowKd6BscVuk/dXibcQzdFkW9//GDfll77mHEI4M=", - "aarch64-darwin": "sha256-9yrx09vYrOTmdqkfJI7mfh7DI1/rg67tPlf82m5+iKI=" - }, - "flutterHash": "sha256-00G030FvZZTsdf9ruFs9jdIHcC5h+xpp4NlmL64qVZA=", - "artifactHashes": { - "android": { - "aarch64-darwin": "sha256-v/6/GTj7732fEOIgSaoM00yaw2qNwOMuvbuoCvii7vQ=", - "aarch64-linux": "sha256-Uc36aBq8wQo2aEvjAPOoixZElWOE/GNRm2GUfhbwT3Y=", - "x86_64-darwin": "sha256-v/6/GTj7732fEOIgSaoM00yaw2qNwOMuvbuoCvii7vQ=", - "x86_64-linux": "sha256-Uc36aBq8wQo2aEvjAPOoixZElWOE/GNRm2GUfhbwT3Y=" - }, - "fuchsia": { - "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" - }, - "ios": { - "aarch64-darwin": "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao=", - "aarch64-linux": "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao=", - "x86_64-darwin": "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao=", - "x86_64-linux": "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao=" - }, - "linux": { - "aarch64-darwin": "sha256-drGHsuJoOCLqrhVrXczqJRCOtpeWVlqdWW0OSMS/l5M=", - "aarch64-linux": "sha256-drGHsuJoOCLqrhVrXczqJRCOtpeWVlqdWW0OSMS/l5M=", - "x86_64-darwin": "sha256-0gIOwux3YBdmcXgwICr8dpftj1CauaBUX8Rt5GG0WSs=", - "x86_64-linux": "sha256-0gIOwux3YBdmcXgwICr8dpftj1CauaBUX8Rt5GG0WSs=" - }, - "macos": { - "aarch64-darwin": "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc=", - "aarch64-linux": "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc=", - "x86_64-darwin": "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc=", - "x86_64-linux": "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc=" - }, - "universal": { - "aarch64-darwin": "sha256-mSpAPKyP9v0dbkXqYkzGOnD5OEjRZigiRElXXcHZ5TE=", - "aarch64-linux": "sha256-Z9bszNaIpCccG7OfvE5WFsw36dITiyCQAZ6p29+Yq68=", - "x86_64-darwin": "sha256-qN5bAXRfQ78TWF3FLBIxWzUB5y5OrZVQTEilY5J/+2k=", - "x86_64-linux": "sha256-wATt1UPjo/fh7RFO1vvcUAdo0dMAaaOUIuzYodsM0v0=" - }, - "web": { - "aarch64-darwin": "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0=", - "aarch64-linux": "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0=", - "x86_64-darwin": "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0=", - "x86_64-linux": "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0=" - }, - "windows": { - "aarch64-darwin": "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI=", - "aarch64-linux": "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI=", - "x86_64-darwin": "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI=", - "x86_64-linux": "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI=" - } - }, - "pubspecLock": { - "packages": { - "_fe_analyzer_shared": { - "dependency": "direct main", - "description": { - "name": "_fe_analyzer_shared", - "sha256": "ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "61.0.0" - }, - "analyzer": { - "dependency": "direct main", - "description": { - "name": "analyzer", - "sha256": "ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.13.0" - }, - "archive": { - "dependency": "direct main", - "description": { - "name": "archive", - "sha256": "80e5141fafcb3361653ce308776cfd7d45e6e9fbb429e14eec571382c0c5fecb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.3.2" - }, - "args": { - "dependency": "direct main", - "description": { - "name": "args", - "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.2" - }, - "async": { - "dependency": "direct main", - "description": { - "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.11.0" - }, - "boolean_selector": { - "dependency": "direct main", - "description": { - "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "browser_launcher": { - "dependency": "direct main", - "description": { - "name": "browser_launcher", - "sha256": "6ee4c6b1f68a42e769ef6e663c4f56708522f7bce9d2ab6e308a37b612ffa4ec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "built_collection": { - "dependency": "direct main", - "description": { - "name": "built_collection", - "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.1.1" - }, - "built_value": { - "dependency": "direct main", - "description": { - "name": "built_value", - "sha256": "598a2a682e2a7a90f08ba39c0aaa9374c5112340f0a2e275f61b59389543d166", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.6.1" - }, - "checked_yaml": { - "dependency": "direct dev", - "description": { - "name": "checked_yaml", - "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.3" - }, - "clock": { - "dependency": "direct main", - "description": { - "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "collection": { - "dependency": "direct dev", - "description": { - "name": "collection", - "sha256": "f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.17.2" - }, - "completion": { - "dependency": "direct main", - "description": { - "name": "completion", - "sha256": "f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.1" - }, - "convert": { - "dependency": "direct main", - "description": { - "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.1" - }, - "coverage": { - "dependency": "direct main", - "description": { - "name": "coverage", - "sha256": "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.6.3" - }, - "crypto": { - "dependency": "direct main", - "description": { - "name": "crypto", - "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.3" - }, - "csslib": { - "dependency": "direct main", - "description": { - "name": "csslib", - "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "dap": { - "dependency": "direct main", - "description": { - "name": "dap", - "sha256": "2120d4a8cbad45e5dbd518b713e8f064274e0a4c0e3edcaef1f4cf9ccbc90cd9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "dds": { - "dependency": "direct main", - "description": { - "name": "dds", - "sha256": "397c3c80919ee187b2efc28205af3c0378b6b757ea6d059083dece145a2e31e9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.9.0+hotfix" - }, - "dds_service_extensions": { - "dependency": "direct main", - "description": { - "name": "dds_service_extensions", - "sha256": "9ac669bef49a4c13ed62073685089be121200fb213800ec59c202e90d569ea44", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.0" - }, - "devtools_shared": { - "dependency": "direct main", - "description": { - "name": "devtools_shared", - "sha256": "ad58ac3a5df41adf08d0d6f0a4d73349533edcc383ee93a30ac3d0fd0bb6df49", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.24.0" - }, - "dwds": { - "dependency": "direct main", - "description": { - "name": "dwds", - "sha256": "b6dad73ae56f00bff7647f531b9db018005f713328e816e7a277b544184e9170", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "19.0.1+1" - }, - "fake_async": { - "dependency": "direct main", - "description": { - "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.1" - }, - "file": { - "dependency": "direct main", - "description": { - "name": "file", - "sha256": "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.1.4" - }, - "file_testing": { - "dependency": "direct dev", - "description": { - "name": "file_testing", - "sha256": "0aaadb4025bd350403f4308ad6c4cea953278d9407814b8342558e4946840fb5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, - "fixnum": { - "dependency": "direct main", - "description": { - "name": "fixnum", - "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "flutter_template_images": { - "dependency": "direct main", - "description": { - "name": "flutter_template_images", - "sha256": "fd3e55af73c577b9e3f88d4080d3e366cb5c8ef3fbd50b94dfeca56bb0235df6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.2.0" - }, - "frontend_server_client": { - "dependency": "direct main", - "description": { - "name": "frontend_server_client", - "sha256": "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.0" - }, - "glob": { - "dependency": "direct main", - "description": { - "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "html": { - "dependency": "direct main", - "description": { - "name": "html", - "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.15.4" - }, - "http": { - "dependency": "direct main", - "description": { - "name": "http", - "sha256": "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.13.6" - }, - "http_multi_server": { - "dependency": "direct main", - "description": { - "name": "http_multi_server", - "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.1" - }, - "http_parser": { - "dependency": "direct main", - "description": { - "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.2" - }, - "intl": { - "dependency": "direct main", - "description": { - "name": "intl", - "sha256": "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.18.1" - }, - "io": { - "dependency": "direct main", - "description": { - "name": "io", - "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "js": { - "dependency": "direct main", - "description": { - "name": "js", - "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.7" - }, - "json_annotation": { - "dependency": "direct dev", - "description": { - "name": "json_annotation", - "sha256": "b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.8.1" - }, - "json_rpc_2": { - "dependency": "direct main", - "description": { - "name": "json_rpc_2", - "sha256": "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "logging": { - "dependency": "direct main", - "description": { - "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "matcher": { - "dependency": "direct main", - "description": { - "name": "matcher", - "sha256": "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.12.16" - }, - "meta": { - "dependency": "direct main", - "description": { - "name": "meta", - "sha256": "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.9.1" - }, - "mime": { - "dependency": "direct main", - "description": { - "name": "mime", - "sha256": "e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "multicast_dns": { - "dependency": "direct main", - "description": { - "name": "multicast_dns", - "sha256": "80e54aba906a7cc68fdc6a201e76b135af27155e2f8e958181d85e2b73786591", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.2+3" - }, - "mustache_template": { - "dependency": "direct main", - "description": { - "name": "mustache_template", - "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "native_stack_traces": { - "dependency": "direct main", - "description": { - "name": "native_stack_traces", - "sha256": "c797830b9910d13b0f4e70ddef15cde034214fe3bdb8092c4ea5ffad2f74013f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.6" - }, - "node_preamble": { - "dependency": "direct dev", - "description": { - "name": "node_preamble", - "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "package_config": { - "dependency": "direct main", - "description": { - "name": "package_config", - "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "path": { - "dependency": "direct main", - "description": { - "name": "path", - "sha256": "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.8.3" - }, - "petitparser": { - "dependency": "direct main", - "description": { - "name": "petitparser", - "sha256": "cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.4.0" - }, - "platform": { - "dependency": "direct main", - "description": { - "name": "platform", - "sha256": "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.0" - }, - "pool": { - "dependency": "direct main", - "description": { - "name": "pool", - "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.1" - }, - "process": { - "dependency": "direct main", - "description": { - "name": "process", - "sha256": "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.2.4" - }, - "pub_semver": { - "dependency": "direct main", - "description": { - "name": "pub_semver", - "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.4" - }, - "pubspec_parse": { - "dependency": "direct dev", - "description": { - "name": "pubspec_parse", - "sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.3" - }, - "shelf": { - "dependency": "direct main", - "description": { - "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.1" - }, - "shelf_packages_handler": { - "dependency": "direct main", - "description": { - "name": "shelf_packages_handler", - "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "shelf_proxy": { - "dependency": "direct main", - "description": { - "name": "shelf_proxy", - "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "shelf_static": { - "dependency": "direct main", - "description": { - "name": "shelf_static", - "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2" - }, - "shelf_web_socket": { - "dependency": "direct main", - "description": { - "name": "shelf_web_socket", - "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "source_map_stack_trace": { - "dependency": "direct main", - "description": { - "name": "source_map_stack_trace", - "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "source_maps": { - "dependency": "direct main", - "description": { - "name": "source_maps", - "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.12" - }, - "source_span": { - "dependency": "direct main", - "description": { - "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.10.0" - }, - "sse": { - "dependency": "direct main", - "description": { - "name": "sse", - "sha256": "3ff9088cac3f45aa8b91336f1962e3ea6c81baaba0bbba361c05f8aa7fb59442", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.2" - }, - "stack_trace": { - "dependency": "direct main", - "description": { - "name": "stack_trace", - "sha256": "c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.11.0" - }, - "standard_message_codec": { - "dependency": "direct main", - "description": { - "name": "standard_message_codec", - "sha256": "906e66549f0ea90d87c5320e0b0f04738c5d14bc7fb121a15da31b60e84f5b15", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.1+3" - }, - "stream_channel": { - "dependency": "direct main", - "description": { - "name": "stream_channel", - "sha256": "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "string_scanner": { - "dependency": "direct main", - "description": { - "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "sync_http": { - "dependency": "direct main", - "description": { - "name": "sync_http", - "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.1" - }, - "term_glyph": { - "dependency": "direct main", - "description": { - "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "test": { - "dependency": "direct dev", - "description": { - "name": "test", - "sha256": "13b41f318e2a5751c3169137103b60c584297353d4b1761b66029bae6411fe46", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.24.3" - }, - "test_api": { - "dependency": "direct main", - "description": { - "name": "test_api", - "sha256": "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.0" - }, - "test_core": { - "dependency": "direct main", - "description": { - "name": "test_core", - "sha256": "99806e9e6d95c7b059b7a0fc08f07fc53fabe54a829497f0d9676299f1e8637e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.3" - }, - "typed_data": { - "dependency": "direct main", - "description": { - "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.2" - }, - "unified_analytics": { - "dependency": "direct main", - "description": { - "name": "unified_analytics", - "sha256": "4f9f29e5fd357d68fce270e37c7ad9bb489ee20098529199d6bc786b2b624298", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "usage": { - "dependency": "direct main", - "description": { - "name": "usage", - "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.1" - }, - "uuid": { - "dependency": "direct main", - "description": { - "name": "uuid", - "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.7" - }, - "vm_service": { - "dependency": "direct main", - "description": { - "name": "vm_service", - "sha256": "c620a6f783fa22436da68e42db7ebbf18b8c44b9a46ab911f666ff09ffd9153f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "11.7.1" - }, - "vm_snapshot_analysis": { - "dependency": "direct main", - "description": { - "name": "vm_snapshot_analysis", - "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.6" - }, - "watcher": { - "dependency": "direct main", - "description": { - "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "web_socket_channel": { - "dependency": "direct main", - "description": { - "name": "web_socket_channel", - "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.0" - }, - "webdriver": { - "dependency": "direct main", - "description": { - "name": "webdriver", - "sha256": "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "webkit_inspection_protocol": { - "dependency": "direct main", - "description": { - "name": "webkit_inspection_protocol", - "sha256": "67d3a8b6c79e1987d19d848b0892e582dbb0c66c57cc1fef58a177dd2aa2823d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "xml": { - "dependency": "direct main", - "description": { - "name": "xml", - "sha256": "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.3.0" - }, - "yaml": { - "dependency": "direct main", - "description": { - "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.2" - } - }, - "sdks": { - "dart": ">=3.0.0 <4.0.0" - } - } -} diff --git a/pkgs/development/compilers/flutter/versions/3_13/engine/patches/flutter-45098.patch b/pkgs/development/compilers/flutter/versions/3_13/engine/patches/flutter-45098.patch deleted file mode 100644 index 9f1b4f76f4d6..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_13/engine/patches/flutter-45098.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 41bb032ef3e8332115ed9ebdaeed5d47b9c56098 Mon Sep 17 00:00:00 2001 -From: Robert Ancell <robert.ancell@canonical.com> -Date: Fri, 25 Aug 2023 16:46:52 +1200 -Subject: [PATCH] Fix building on Pango 1.49.4 - -This version added the autoptr macros which we no longer need to define. - -https://github.com/flutter/flutter/issues/132881 ---- - shell/platform/linux/fl_accessible_text_field.cc | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/shell/platform/linux/fl_accessible_text_field.cc b/shell/platform/linux/fl_accessible_text_field.cc -index 9a6052d4777ec..9dcc7f64fb820 100644 ---- a/shell/platform/linux/fl_accessible_text_field.cc -+++ b/shell/platform/linux/fl_accessible_text_field.cc -@@ -7,7 +7,11 @@ - #include "flutter/shell/platform/linux/public/flutter_linux/fl_value.h" - - G_DEFINE_AUTOPTR_CLEANUP_FUNC(PangoContext, g_object_unref) -+// PangoLayout g_autoptr macro weren't added until 1.49.4. Add them manually. -+// https://gitlab.gnome.org/GNOME/pango/-/commit/0b84e14 -+#if !PANGO_VERSION_CHECK(1, 49, 4) - G_DEFINE_AUTOPTR_CLEANUP_FUNC(PangoLayout, g_object_unref) -+#endif - - typedef bool (*FlTextBoundaryCallback)(const PangoLogAttr* attr); diff --git a/pkgs/development/compilers/flutter/versions/3_13/patches/disable-auto-update-shared.patch b/pkgs/development/compilers/flutter/versions/3_13/patches/disable-auto-update-shared.patch deleted file mode 100644 index be08c419fe1b..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_13/patches/disable-auto-update-shared.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index 3532c23114..25dfcae4c7 100644 ---- a/bin/internal/shared.sh -+++ b/bin/internal/shared.sh -@@ -229,8 +229,6 @@ function shared::execute() { - exit 1 - fi - -- upgrade_flutter 7< "$PROG_NAME" -- - BIN_NAME="$(basename "$PROG_NAME")" - case "$BIN_NAME" in - flutter*) diff --git a/pkgs/development/compilers/flutter/versions/3_13/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_13/patches/disable-auto-update.patch deleted file mode 100644 index 05960c01b737..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_13/patches/disable-auto-update.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart -index b7e624b4e2..edfdde118b 100644 ---- a/packages/flutter_tools/lib/src/runner/flutter_command.dart -+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart -@@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and - - // Populate the cache. We call this before pub get below so that the - // sky_engine package is available in the flutter cache for pub to find. -- if (shouldUpdateCache) { -+ if (false) { - // First always update universal artifacts, as some of these (e.g. - // ios-deploy on macOS) are required to determine `requiredArtifacts`. - final bool offline; -diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 5d6d78639f..90a4dfa555 100644 ---- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - globals.flutterUsage.suppressAnalytics = true; - } - -- globals.flutterVersion.ensureVersionFile(); - final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; - final bool ci = await globals.botDetector.isRunningOnBot; - final bool redirectedCompletion = !globals.stdio.hasTerminal && -@@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false; - final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag; - -- if (topLevelResults.command?.name != 'upgrade' && -- (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { -- await globals.flutterVersion.checkFlutterVersionFreshness(); -- } -- - // See if the user specified a specific device. - final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; - if (specifiedDeviceId != null) { diff --git a/pkgs/development/compilers/flutter/versions/3_16/data.json b/pkgs/development/compilers/flutter/versions/3_16/data.json deleted file mode 100644 index a7724ad99952..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_16/data.json +++ /dev/null @@ -1,972 +0,0 @@ -{ - "version": "3.16.7", - "engineVersion": "4a585b79294e830fa89c24924d58a27cc8fbf406", - "engineSwiftShaderHash": "sha256-qKf5gXIpI4+05bs7d3W6JlMNTn3vHFQL+i3JpFdyPao=", - "engineSwiftShaderRev": "5f9ed9b16931c7155171d31f75004f73f0a3abc8", - "channel": "stable", - "engineHashes": { - "aarch64-linux": { - "aarch64-linux": "sha256-yjoHWnuZCH6+khbO9DQ9ofn0ve9MQLe5d45itVENNSI=", - "x86_64-linux": "sha256-yjoHWnuZCH6+khbO9DQ9ofn0ve9MQLe5d45itVENNSI=" - }, - "x86_64-linux": { - "aarch64-linux": "sha256-4hGQ+SB+51b41Jq8wNXNORpRayFR2/IS7kPPgwv5HbU=", - "x86_64-linux": "sha256-4hGQ+SB+51b41Jq8wNXNORpRayFR2/IS7kPPgwv5HbU=" - } - }, - "dartVersion": "3.2.4", - "dartHash": { - "x86_64-linux": "sha256-qslf+wgmNz9r+e45o3Bg9/vDj75GkM9gQE2tb5rbIvw=", - "aarch64-linux": "sha256-Wsm8GKi7PR5iGx/lNtp2qBK+lMk2NIHf/RvO5G94QnQ=", - "x86_64-darwin": "sha256-8DXMj0yhKpxHdqS0vr5C/RwhQGxvUmvxJA6mOgqBXU8=", - "aarch64-darwin": "sha256-ic6txmbhsv4CarUwG+4xqXsaQrMN4AQrWwg8DxsZGps=" - }, - "flutterHash": "sha256-j+tc8hMgZMBhju89n4e9tKRrq+CFBGOyeE0y+Z4FtHE=", - "artifactHashes": { - "android": { - "aarch64-darwin": "sha256-0FBI0CGMcxyttkzrdyjJlkGAjFd/yMuAQS3pDrNXZZw=", - "aarch64-linux": "sha256-j8jstEE1RsTVHJbq6f6We0An+CyJz9JH/YClyNA4mwg=", - "x86_64-darwin": "sha256-0FBI0CGMcxyttkzrdyjJlkGAjFd/yMuAQS3pDrNXZZw=", - "x86_64-linux": "sha256-j8jstEE1RsTVHJbq6f6We0An+CyJz9JH/YClyNA4mwg=" - }, - "fuchsia": { - "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" - }, - "ios": { - "aarch64-darwin": "sha256-V3VXRX8hn45J+NhzKli+NAc3TGiSoeVQRlJte8DDbZw=", - "aarch64-linux": "sha256-V3VXRX8hn45J+NhzKli+NAc3TGiSoeVQRlJte8DDbZw=", - "x86_64-darwin": "sha256-V3VXRX8hn45J+NhzKli+NAc3TGiSoeVQRlJte8DDbZw=", - "x86_64-linux": "sha256-V3VXRX8hn45J+NhzKli+NAc3TGiSoeVQRlJte8DDbZw=" - }, - "linux": { - "aarch64-darwin": "sha256-LWpou3L7bAWGn8i4nDT/BZez2Uhf/LbqC2C4Z98hCHQ=", - "aarch64-linux": "sha256-LWpou3L7bAWGn8i4nDT/BZez2Uhf/LbqC2C4Z98hCHQ=", - "x86_64-darwin": "sha256-BzjmO4F8B9GagYPbdvoT55r+YgZcP4BUaKgJPGZDXOU=", - "x86_64-linux": "sha256-BzjmO4F8B9GagYPbdvoT55r+YgZcP4BUaKgJPGZDXOU=" - }, - "macos": { - "aarch64-darwin": "sha256-BMFqhhy1O1hK33Pj2cxnCAzK9wwHkwT4gNbJ1GaLrnk=", - "aarch64-linux": "sha256-BMFqhhy1O1hK33Pj2cxnCAzK9wwHkwT4gNbJ1GaLrnk=", - "x86_64-darwin": "sha256-BMFqhhy1O1hK33Pj2cxnCAzK9wwHkwT4gNbJ1GaLrnk=", - "x86_64-linux": "sha256-BMFqhhy1O1hK33Pj2cxnCAzK9wwHkwT4gNbJ1GaLrnk=" - }, - "universal": { - "aarch64-darwin": "sha256-Emus5J3mqPv47PD6xqNUD1KpXhVkX4JpURWuYG6KC14=", - "aarch64-linux": "sha256-uB2YZRjioP/koMbPvaBHsezjPO0w5a+BpxZaDuiINIY=", - "x86_64-darwin": "sha256-Qwf12gMqrW5nDC9Is08oxWTbKMptRQRAIb58JETq3xA=", - "x86_64-linux": "sha256-quSFKx7TZRJpK+4YDt5f9jwr7rZsSsaXMxhJ8vIcczQ=" - }, - "web": { - "aarch64-darwin": "sha256-rQphVm+T4k5B4OYYw0sJwYBOsNvUOC9fu8IuvXN7hVw=", - "aarch64-linux": "sha256-rQphVm+T4k5B4OYYw0sJwYBOsNvUOC9fu8IuvXN7hVw=", - "x86_64-darwin": "sha256-rQphVm+T4k5B4OYYw0sJwYBOsNvUOC9fu8IuvXN7hVw=", - "x86_64-linux": "sha256-rQphVm+T4k5B4OYYw0sJwYBOsNvUOC9fu8IuvXN7hVw=" - }, - "windows": { - "aarch64-darwin": "sha256-HL3QLwzze9aO+T/2/xbHqhKV1/ba++MuRnk206hfJdU=", - "aarch64-linux": "sha256-HL3QLwzze9aO+T/2/xbHqhKV1/ba++MuRnk206hfJdU=", - "x86_64-darwin": "sha256-HL3QLwzze9aO+T/2/xbHqhKV1/ba++MuRnk206hfJdU=", - "x86_64-linux": "sha256-HL3QLwzze9aO+T/2/xbHqhKV1/ba++MuRnk206hfJdU=" - } - }, - "pubspecLock": { - "packages": { - "_fe_analyzer_shared": { - "dependency": "direct main", - "description": { - "name": "_fe_analyzer_shared", - "sha256": "eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "64.0.0" - }, - "analyzer": { - "dependency": "direct main", - "description": { - "name": "analyzer", - "sha256": "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.2.0" - }, - "archive": { - "dependency": "direct main", - "description": { - "name": "archive", - "sha256": "80e5141fafcb3361653ce308776cfd7d45e6e9fbb429e14eec571382c0c5fecb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.3.2" - }, - "args": { - "dependency": "direct main", - "description": { - "name": "args", - "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.2" - }, - "async": { - "dependency": "direct main", - "description": { - "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.11.0" - }, - "boolean_selector": { - "dependency": "direct main", - "description": { - "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "browser_launcher": { - "dependency": "direct main", - "description": { - "name": "browser_launcher", - "sha256": "6ee4c6b1f68a42e769ef6e663c4f56708522f7bce9d2ab6e308a37b612ffa4ec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "built_collection": { - "dependency": "direct main", - "description": { - "name": "built_collection", - "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.1.1" - }, - "built_value": { - "dependency": "direct main", - "description": { - "name": "built_value", - "sha256": "a8de5955205b4d1dbbbc267daddf2178bd737e4bab8987c04a500478c9651e74", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.6.3" - }, - "checked_yaml": { - "dependency": "direct dev", - "description": { - "name": "checked_yaml", - "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.3" - }, - "cli_config": { - "dependency": "direct main", - "description": { - "name": "cli_config", - "sha256": "76910209e4aee158f5e26721509c98d7cbb97085da637f62b7c461298033752d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.1" - }, - "clock": { - "dependency": "direct main", - "description": { - "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "collection": { - "dependency": "direct dev", - "description": { - "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.18.0" - }, - "completion": { - "dependency": "direct main", - "description": { - "name": "completion", - "sha256": "f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.1" - }, - "convert": { - "dependency": "direct main", - "description": { - "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.1" - }, - "coverage": { - "dependency": "direct main", - "description": { - "name": "coverage", - "sha256": "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.6.3" - }, - "crypto": { - "dependency": "direct main", - "description": { - "name": "crypto", - "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.3" - }, - "csslib": { - "dependency": "direct main", - "description": { - "name": "csslib", - "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "dap": { - "dependency": "direct main", - "description": { - "name": "dap", - "sha256": "1dc9a11bc60836b151672d3edb6a56a18383ecf122e56eaf5837b32c81641aeb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "dds": { - "dependency": "direct main", - "description": { - "name": "dds", - "sha256": "b7c2e57d24edda6b1d37fbd0748aefc1d75d9257a7dd0328d31398754144eac4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.9.5" - }, - "dds_service_extensions": { - "dependency": "direct main", - "description": { - "name": "dds_service_extensions", - "sha256": "609d0a5d928502f7d160e4466f644474352721f4880c840ec9e8d208fff16d95", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.6.0" - }, - "devtools_shared": { - "dependency": "direct main", - "description": { - "name": "devtools_shared", - "sha256": "2fc4a90ba419b5cb59c6c7a060e94e9c4fdd993d96ef598910c572cb107f1f42", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.26.1" - }, - "dwds": { - "dependency": "direct main", - "description": { - "name": "dwds", - "sha256": "44778de6f92203fad32c550ca0d7a9bd1377e6926272ff7eda7c7a1bdde0cf2b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "21.0.0+1" - }, - "fake_async": { - "dependency": "direct main", - "description": { - "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.1" - }, - "file": { - "dependency": "direct main", - "description": { - "name": "file", - "sha256": "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.1.4" - }, - "file_testing": { - "dependency": "direct dev", - "description": { - "name": "file_testing", - "sha256": "0aaadb4025bd350403f4308ad6c4cea953278d9407814b8342558e4946840fb5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, - "fixnum": { - "dependency": "direct main", - "description": { - "name": "fixnum", - "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "flutter_template_images": { - "dependency": "direct main", - "description": { - "name": "flutter_template_images", - "sha256": "fd3e55af73c577b9e3f88d4080d3e366cb5c8ef3fbd50b94dfeca56bb0235df6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.2.0" - }, - "frontend_server_client": { - "dependency": "direct main", - "description": { - "name": "frontend_server_client", - "sha256": "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.0" - }, - "glob": { - "dependency": "direct main", - "description": { - "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "graphs": { - "dependency": "direct main", - "description": { - "name": "graphs", - "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.1" - }, - "html": { - "dependency": "direct main", - "description": { - "name": "html", - "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.15.4" - }, - "http": { - "dependency": "direct main", - "description": { - "name": "http", - "sha256": "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.13.6" - }, - "http_multi_server": { - "dependency": "direct main", - "description": { - "name": "http_multi_server", - "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.1" - }, - "http_parser": { - "dependency": "direct main", - "description": { - "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.2" - }, - "intl": { - "dependency": "direct main", - "description": { - "name": "intl", - "sha256": "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.18.1" - }, - "io": { - "dependency": "direct main", - "description": { - "name": "io", - "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "js": { - "dependency": "direct main", - "description": { - "name": "js", - "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.7" - }, - "json_annotation": { - "dependency": "direct dev", - "description": { - "name": "json_annotation", - "sha256": "b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.8.1" - }, - "json_rpc_2": { - "dependency": "direct main", - "description": { - "name": "json_rpc_2", - "sha256": "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "logging": { - "dependency": "direct main", - "description": { - "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "matcher": { - "dependency": "direct main", - "description": { - "name": "matcher", - "sha256": "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.12.16" - }, - "meta": { - "dependency": "direct main", - "description": { - "name": "meta", - "sha256": "a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.10.0" - }, - "mime": { - "dependency": "direct main", - "description": { - "name": "mime", - "sha256": "e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "multicast_dns": { - "dependency": "direct main", - "description": { - "name": "multicast_dns", - "sha256": "f4fd1c3365171fac5160afcb1a283001d3413dee5fd41c61d80888952d609379", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.2+4" - }, - "mustache_template": { - "dependency": "direct main", - "description": { - "name": "mustache_template", - "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "native_assets_builder": { - "dependency": "direct main", - "description": { - "name": "native_assets_builder", - "sha256": "83e92c0f4917cfea0af594aac9ab5ee7d396fbcee1c19839ff33b8e1666cd84e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.3" - }, - "native_assets_cli": { - "dependency": "direct main", - "description": { - "name": "native_assets_cli", - "sha256": "51d1af3ebc2437f5883ed749f1877cb82d6a569b0712dad02c8370e6e4f2b5e3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "native_stack_traces": { - "dependency": "direct main", - "description": { - "name": "native_stack_traces", - "sha256": "c797830b9910d13b0f4e70ddef15cde034214fe3bdb8092c4ea5ffad2f74013f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.6" - }, - "node_preamble": { - "dependency": "direct dev", - "description": { - "name": "node_preamble", - "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "package_config": { - "dependency": "direct main", - "description": { - "name": "package_config", - "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "path": { - "dependency": "direct main", - "description": { - "name": "path", - "sha256": "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.8.3" - }, - "petitparser": { - "dependency": "direct main", - "description": { - "name": "petitparser", - "sha256": "eeb2d1428ee7f4170e2bd498827296a18d4e7fc462b71727d111c0ac7707cfa6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.1" - }, - "platform": { - "dependency": "direct main", - "description": { - "name": "platform", - "sha256": "ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.2" - }, - "pool": { - "dependency": "direct main", - "description": { - "name": "pool", - "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.1" - }, - "process": { - "dependency": "direct main", - "description": { - "name": "process", - "sha256": "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.2.4" - }, - "pub_semver": { - "dependency": "direct main", - "description": { - "name": "pub_semver", - "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.4" - }, - "pubspec_parse": { - "dependency": "direct dev", - "description": { - "name": "pubspec_parse", - "sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.3" - }, - "shelf": { - "dependency": "direct main", - "description": { - "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.1" - }, - "shelf_packages_handler": { - "dependency": "direct main", - "description": { - "name": "shelf_packages_handler", - "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "shelf_proxy": { - "dependency": "direct main", - "description": { - "name": "shelf_proxy", - "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "shelf_static": { - "dependency": "direct main", - "description": { - "name": "shelf_static", - "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2" - }, - "shelf_web_socket": { - "dependency": "direct main", - "description": { - "name": "shelf_web_socket", - "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "source_map_stack_trace": { - "dependency": "direct main", - "description": { - "name": "source_map_stack_trace", - "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "source_maps": { - "dependency": "direct main", - "description": { - "name": "source_maps", - "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.12" - }, - "source_span": { - "dependency": "direct main", - "description": { - "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.10.0" - }, - "sse": { - "dependency": "direct main", - "description": { - "name": "sse", - "sha256": "3ff9088cac3f45aa8b91336f1962e3ea6c81baaba0bbba361c05f8aa7fb59442", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.2" - }, - "stack_trace": { - "dependency": "direct main", - "description": { - "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.11.1" - }, - "standard_message_codec": { - "dependency": "direct main", - "description": { - "name": "standard_message_codec", - "sha256": "fc7dd712d191b7e33196a0ecf354c4573492bb95995e7166cb6f73b047f9cae0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.1+4" - }, - "stream_channel": { - "dependency": "direct main", - "description": { - "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "string_scanner": { - "dependency": "direct main", - "description": { - "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "sync_http": { - "dependency": "direct main", - "description": { - "name": "sync_http", - "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.1" - }, - "term_glyph": { - "dependency": "direct main", - "description": { - "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "test": { - "dependency": "direct dev", - "description": { - "name": "test", - "sha256": "9b0dd8e36af4a5b1569029949d50a52cb2a2a2fdaa20cebb96e6603b9ae241f9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.24.6" - }, - "test_api": { - "dependency": "direct main", - "description": { - "name": "test_api", - "sha256": "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.1" - }, - "test_core": { - "dependency": "direct main", - "description": { - "name": "test_core", - "sha256": "4bef837e56375537055fdbbbf6dd458b1859881f4c7e6da936158f77d61ab265", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.6" - }, - "typed_data": { - "dependency": "direct main", - "description": { - "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.2" - }, - "unified_analytics": { - "dependency": "direct main", - "description": { - "name": "unified_analytics", - "sha256": "fbcb0ad896a15c1ddea7ec45e8bfc92a894490e5792e07b74b2e6e992f4c77f8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.8.0" - }, - "usage": { - "dependency": "direct main", - "description": { - "name": "usage", - "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.1" - }, - "uuid": { - "dependency": "direct main", - "description": { - "name": "uuid", - "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.7" - }, - "vm_service": { - "dependency": "direct main", - "description": { - "name": "vm_service", - "sha256": "c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "11.10.0" - }, - "vm_snapshot_analysis": { - "dependency": "direct main", - "description": { - "name": "vm_snapshot_analysis", - "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.6" - }, - "watcher": { - "dependency": "direct main", - "description": { - "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "web_socket_channel": { - "dependency": "direct main", - "description": { - "name": "web_socket_channel", - "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.0" - }, - "webdriver": { - "dependency": "direct main", - "description": { - "name": "webdriver", - "sha256": "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "webkit_inspection_protocol": { - "dependency": "direct main", - "description": { - "name": "webkit_inspection_protocol", - "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "xml": { - "dependency": "direct main", - "description": { - "name": "xml", - "sha256": "af5e77e9b83f2f4adc5d3f0a4ece1c7f45a2467b695c2540381bac793e34e556", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.4.2" - }, - "yaml": { - "dependency": "direct main", - "description": { - "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.2" - }, - "yaml_edit": { - "dependency": "direct main", - "description": { - "name": "yaml_edit", - "sha256": "1579d4a0340a83cf9e4d580ea51a16329c916973bffd5bd4b45e911b25d46bfd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - } - }, - "sdks": { - "dart": ">=3.2.0-36.0.dev <4.0.0" - } - } -} diff --git a/pkgs/development/compilers/flutter/versions/3_16/patches/disable-auto-update-shared.patch b/pkgs/development/compilers/flutter/versions/3_16/patches/disable-auto-update-shared.patch deleted file mode 100644 index 961b41f7327c..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_16/patches/disable-auto-update-shared.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index 75d9d3013e..657ad3cb78 100644 ---- a/bin/internal/shared.sh -+++ b/bin/internal/shared.sh -@@ -245,7 +245,7 @@ function shared::execute() { - # and will corrupt each others' downloads. - # - # SHARED_NAME itself is prepared by the caller script. -- upgrade_flutter 7< "$SHARED_NAME" -+ # upgrade_flutter 7< "$SHARED_NAME" - - BIN_NAME="$(basename "$PROG_NAME")" - case "$BIN_NAME" in diff --git a/pkgs/development/compilers/flutter/versions/3_16/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_16/patches/disable-auto-update.patch deleted file mode 100644 index 05960c01b737..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_16/patches/disable-auto-update.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart -index b7e624b4e2..edfdde118b 100644 ---- a/packages/flutter_tools/lib/src/runner/flutter_command.dart -+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart -@@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and - - // Populate the cache. We call this before pub get below so that the - // sky_engine package is available in the flutter cache for pub to find. -- if (shouldUpdateCache) { -+ if (false) { - // First always update universal artifacts, as some of these (e.g. - // ios-deploy on macOS) are required to determine `requiredArtifacts`. - final bool offline; -diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 5d6d78639f..90a4dfa555 100644 ---- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - globals.flutterUsage.suppressAnalytics = true; - } - -- globals.flutterVersion.ensureVersionFile(); - final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; - final bool ci = await globals.botDetector.isRunningOnBot; - final bool redirectedCompletion = !globals.stdio.hasTerminal && -@@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false; - final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag; - -- if (topLevelResults.command?.name != 'upgrade' && -- (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { -- await globals.flutterVersion.checkFlutterVersionFreshness(); -- } -- - // See if the user specified a specific device. - final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; - if (specifiedDeviceId != null) { diff --git a/pkgs/development/compilers/flutter/versions/3_22/data.json b/pkgs/development/compilers/flutter/versions/3_22/data.json deleted file mode 100644 index 397b5934356a..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_22/data.json +++ /dev/null @@ -1,1020 +0,0 @@ -{ - "version": "3.22.2", - "engineVersion": "edd8546116457bdf1c5bdfb13ecb9463d2bb5ed4", - "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=", - "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", - "channel": "stable", - "engineHashes": { - "aarch64-linux": { - "aarch64-linux": "sha256-MiokUhxz23/HANUv8pD4jrJuj3/EAZNbJVpovM9upKI=", - "x86_64-linux": "sha256-MiokUhxz23/HANUv8pD4jrJuj3/EAZNbJVpovM9upKI=" - }, - "x86_64-linux": { - "aarch64-linux": "sha256-UWVjNgF94dYG7nSX+Gu6B9500RAHw1EOxE0+QJhS+Ao=", - "x86_64-linux": "sha256-UWVjNgF94dYG7nSX+Gu6B9500RAHw1EOxE0+QJhS+Ao=" - } - }, - "dartVersion": "3.4.3", - "dartHash": { - "x86_64-linux": "sha256-wDIdoWoKlutP8kixd12Lppzv2aYeiTJ1A1Sy6lguXgg=", - "aarch64-linux": "sha256-sJBsZBA71Sht8wdUbPVzPv3Zf+vDJXY9w0a7ZC8/aF8=", - "x86_64-darwin": "sha256-XWDZae1bMeQsIOdv7BiMNneBKt6Xhras/QXtPukGyKA=", - "aarch64-darwin": "sha256-4D1e5EmBoA5eDw50EIVNsMjhCP33fNemmUD8/1WvxOM=" - }, - "flutterHash": "sha256-7ndnIw72YxNB+VeeejEeRD+xxuLXOcWo322s5CMWzBM=", - "artifactHashes": { - "android": { - "aarch64-darwin": "sha256-loGG9c6F0cnc5ue7cD6Tk8b79LGijd9YSfKWjlXk+TI=", - "aarch64-linux": "sha256-lIxH729tt0p+5LkLguf1lBk7YdinXngKPL05W6XdVDg=", - "x86_64-darwin": "sha256-loGG9c6F0cnc5ue7cD6Tk8b79LGijd9YSfKWjlXk+TI=", - "x86_64-linux": "sha256-lIxH729tt0p+5LkLguf1lBk7YdinXngKPL05W6XdVDg=" - }, - "fuchsia": { - "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" - }, - "ios": { - "aarch64-darwin": "sha256-d/1d8/Md2tzf/Mu4d3RKHl5Jd8u5HzZSGfBKomt1mlo=", - "aarch64-linux": "sha256-d/1d8/Md2tzf/Mu4d3RKHl5Jd8u5HzZSGfBKomt1mlo=", - "x86_64-darwin": "sha256-d/1d8/Md2tzf/Mu4d3RKHl5Jd8u5HzZSGfBKomt1mlo=", - "x86_64-linux": "sha256-d/1d8/Md2tzf/Mu4d3RKHl5Jd8u5HzZSGfBKomt1mlo=" - }, - "linux": { - "aarch64-darwin": "sha256-UYb2OOB0riL+Qrhpke0vYpo0U4buKYcbJRgYSpugJQc=", - "aarch64-linux": "sha256-UYb2OOB0riL+Qrhpke0vYpo0U4buKYcbJRgYSpugJQc=", - "x86_64-darwin": "sha256-ytfyeJeDnAGDsg98POe3fKAxpq8lNVYlV1wY6p2pkbU=", - "x86_64-linux": "sha256-ytfyeJeDnAGDsg98POe3fKAxpq8lNVYlV1wY6p2pkbU=" - }, - "macos": { - "aarch64-darwin": "sha256-0XEdCeY1KTmtLz/cgZLSfDbjucXk0FpwVIDZuEPqngk=", - "aarch64-linux": "sha256-0XEdCeY1KTmtLz/cgZLSfDbjucXk0FpwVIDZuEPqngk=", - "x86_64-darwin": "sha256-0XEdCeY1KTmtLz/cgZLSfDbjucXk0FpwVIDZuEPqngk=", - "x86_64-linux": "sha256-0XEdCeY1KTmtLz/cgZLSfDbjucXk0FpwVIDZuEPqngk=" - }, - "universal": { - "aarch64-darwin": "sha256-TLDwggTgVTe0+v5lCutysF4ygKPiA1b48ImyNDyl7oA=", - "aarch64-linux": "sha256-rTAX+i+OhyKIevwSFgoWRHw8bHuQCC0Lx/YVlbpwL6c=", - "x86_64-darwin": "sha256-1NztXAPG6HWjk7++TLkq791f5t3Va/wP0I2j3ddmURI=", - "x86_64-linux": "sha256-qWZQdDB+yd7i/Cx15K7KQmzbgzxWDeOwcsHkNeDwRqw=" - }, - "web": { - "aarch64-darwin": "sha256-IFg4+IOJbb2Zi4axzL9FezCzp3kLr2gHmEWUupBmxlg=", - "aarch64-linux": "sha256-IFg4+IOJbb2Zi4axzL9FezCzp3kLr2gHmEWUupBmxlg=", - "x86_64-darwin": "sha256-IFg4+IOJbb2Zi4axzL9FezCzp3kLr2gHmEWUupBmxlg=", - "x86_64-linux": "sha256-IFg4+IOJbb2Zi4axzL9FezCzp3kLr2gHmEWUupBmxlg=" - }, - "windows": { - "x86_64-darwin": "sha256-gTnkbp6cJHiW9nFYIfnHYJ+vMG1nGV5nZLY0LgFQPtg=", - "x86_64-linux": "sha256-gTnkbp6cJHiW9nFYIfnHYJ+vMG1nGV5nZLY0LgFQPtg=" - } - }, - "pubspecLock": { - "packages": { - "_fe_analyzer_shared": { - "dependency": "direct main", - "description": { - "name": "_fe_analyzer_shared", - "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "67.0.0" - }, - "analyzer": { - "dependency": "direct main", - "description": { - "name": "analyzer", - "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.4.1" - }, - "archive": { - "dependency": "direct main", - "description": { - "name": "archive", - "sha256": "80e5141fafcb3361653ce308776cfd7d45e6e9fbb429e14eec571382c0c5fecb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.3.2" - }, - "args": { - "dependency": "direct main", - "description": { - "name": "args", - "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.2" - }, - "async": { - "dependency": "direct main", - "description": { - "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.11.0" - }, - "boolean_selector": { - "dependency": "direct main", - "description": { - "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "browser_launcher": { - "dependency": "direct main", - "description": { - "name": "browser_launcher", - "sha256": "6ee4c6b1f68a42e769ef6e663c4f56708522f7bce9d2ab6e308a37b612ffa4ec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "built_collection": { - "dependency": "direct main", - "description": { - "name": "built_collection", - "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.1.1" - }, - "built_value": { - "dependency": "direct main", - "description": { - "name": "built_value", - "sha256": "fedde275e0a6b798c3296963c5cd224e3e1b55d0e478d5b7e65e6b540f363a0e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.9.1" - }, - "checked_yaml": { - "dependency": "direct dev", - "description": { - "name": "checked_yaml", - "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.3" - }, - "cli_config": { - "dependency": "direct main", - "description": { - "name": "cli_config", - "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "clock": { - "dependency": "direct main", - "description": { - "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "collection": { - "dependency": "direct dev", - "description": { - "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.18.0" - }, - "completion": { - "dependency": "direct main", - "description": { - "name": "completion", - "sha256": "f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.1" - }, - "convert": { - "dependency": "direct main", - "description": { - "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.1" - }, - "coverage": { - "dependency": "direct main", - "description": { - "name": "coverage", - "sha256": "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.7.2" - }, - "crypto": { - "dependency": "direct main", - "description": { - "name": "crypto", - "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.3" - }, - "csslib": { - "dependency": "direct main", - "description": { - "name": "csslib", - "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "dap": { - "dependency": "direct main", - "description": { - "name": "dap", - "sha256": "fb7c8a64857d90bedf5c51954b83bee9304b607bcb8a03a89ec37afbf2d683a7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "dds": { - "dependency": "direct main", - "description": { - "name": "dds", - "sha256": "6228ad1e591ee9c54f7f0de3d679d328fb15a7f8d20984a02db2430c3e83816f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.4.0" - }, - "dds_service_extensions": { - "dependency": "direct main", - "description": { - "name": "dds_service_extensions", - "sha256": "299ebf18d340693a7705a56aa2cc2d41df4081a6496b43b04163406496cea6d3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.7.0" - }, - "devtools_shared": { - "dependency": "direct main", - "description": { - "name": "devtools_shared", - "sha256": "8d3452f1ca40d8bbe77db4851dd6f08ea12fc17624c037bfc355587cb8b321be", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.1.0" - }, - "dtd": { - "dependency": "direct main", - "description": { - "name": "dtd", - "sha256": "0d4a51ab223090d2d6b86477f414052db78cad1b2de020619f454a2a39369fec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "dwds": { - "dependency": "direct main", - "description": { - "name": "dwds", - "sha256": "5e7e6d645447ccccd3931340d6e6676608aebc0d64a9a28f370e3b2f4e4eea8a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "23.3.0" - }, - "extension_discovery": { - "dependency": "direct main", - "description": { - "name": "extension_discovery", - "sha256": "20735622d0763865f9d94c3ecdce4441174530870760253e9d364fb4f3da8688", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "fake_async": { - "dependency": "direct main", - "description": { - "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.1" - }, - "ffi": { - "dependency": "direct main", - "description": { - "name": "ffi", - "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "file": { - "dependency": "direct main", - "description": { - "name": "file", - "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.0" - }, - "file_testing": { - "dependency": "direct dev", - "description": { - "name": "file_testing", - "sha256": "0aaadb4025bd350403f4308ad6c4cea953278d9407814b8342558e4946840fb5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, - "fixnum": { - "dependency": "direct main", - "description": { - "name": "fixnum", - "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "flutter_template_images": { - "dependency": "direct main", - "description": { - "name": "flutter_template_images", - "sha256": "fd3e55af73c577b9e3f88d4080d3e366cb5c8ef3fbd50b94dfeca56bb0235df6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.2.0" - }, - "frontend_server_client": { - "dependency": "direct main", - "description": { - "name": "frontend_server_client", - "sha256": "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.0" - }, - "glob": { - "dependency": "direct main", - "description": { - "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "graphs": { - "dependency": "direct main", - "description": { - "name": "graphs", - "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.1" - }, - "html": { - "dependency": "direct main", - "description": { - "name": "html", - "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.15.4" - }, - "http": { - "dependency": "direct main", - "description": { - "name": "http", - "sha256": "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.13.6" - }, - "http_multi_server": { - "dependency": "direct main", - "description": { - "name": "http_multi_server", - "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.1" - }, - "http_parser": { - "dependency": "direct main", - "description": { - "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.2" - }, - "intl": { - "dependency": "direct main", - "description": { - "name": "intl", - "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.19.0" - }, - "io": { - "dependency": "direct main", - "description": { - "name": "io", - "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "js": { - "dependency": "direct dev", - "description": { - "name": "js", - "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.1" - }, - "json_annotation": { - "dependency": "direct dev", - "description": { - "name": "json_annotation", - "sha256": "b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.8.1" - }, - "json_rpc_2": { - "dependency": "direct main", - "description": { - "name": "json_rpc_2", - "sha256": "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "logging": { - "dependency": "direct main", - "description": { - "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "matcher": { - "dependency": "direct main", - "description": { - "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.12.16+1" - }, - "meta": { - "dependency": "direct main", - "description": { - "name": "meta", - "sha256": "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.12.0" - }, - "mime": { - "dependency": "direct main", - "description": { - "name": "mime", - "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.5" - }, - "multicast_dns": { - "dependency": "direct main", - "description": { - "name": "multicast_dns", - "sha256": "316cc47a958d4bd3c67bd238fe8b44fdfb6133bad89cb191c0c3bd3edb14e296", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.2+6" - }, - "mustache_template": { - "dependency": "direct main", - "description": { - "name": "mustache_template", - "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "native_assets_builder": { - "dependency": "direct main", - "description": { - "name": "native_assets_builder", - "sha256": "32beacac1b465c63554eee65e5f1379bd0c7b98f5dcf8a9ac86f014ce450a832", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.1" - }, - "native_assets_cli": { - "dependency": "direct main", - "description": { - "name": "native_assets_cli", - "sha256": "aa257d7c8d2e4bee8339a077d0ddef97f01b28fadb7a379074142782928ab1c3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.3" - }, - "native_stack_traces": { - "dependency": "direct main", - "description": { - "name": "native_stack_traces", - "sha256": "c797830b9910d13b0f4e70ddef15cde034214fe3bdb8092c4ea5ffad2f74013f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.6" - }, - "node_preamble": { - "dependency": "direct dev", - "description": { - "name": "node_preamble", - "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "package_config": { - "dependency": "direct main", - "description": { - "name": "package_config", - "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "path": { - "dependency": "direct main", - "description": { - "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.9.0" - }, - "petitparser": { - "dependency": "direct main", - "description": { - "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.2" - }, - "platform": { - "dependency": "direct main", - "description": { - "name": "platform", - "sha256": "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.4" - }, - "pool": { - "dependency": "direct main", - "description": { - "name": "pool", - "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.1" - }, - "process": { - "dependency": "direct main", - "description": { - "name": "process", - "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.0.2" - }, - "pub_semver": { - "dependency": "direct main", - "description": { - "name": "pub_semver", - "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.4" - }, - "pubspec_parse": { - "dependency": "direct dev", - "description": { - "name": "pubspec_parse", - "sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.3" - }, - "shelf": { - "dependency": "direct main", - "description": { - "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.1" - }, - "shelf_packages_handler": { - "dependency": "direct main", - "description": { - "name": "shelf_packages_handler", - "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "shelf_proxy": { - "dependency": "direct main", - "description": { - "name": "shelf_proxy", - "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "shelf_static": { - "dependency": "direct main", - "description": { - "name": "shelf_static", - "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2" - }, - "shelf_web_socket": { - "dependency": "direct main", - "description": { - "name": "shelf_web_socket", - "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "source_map_stack_trace": { - "dependency": "direct main", - "description": { - "name": "source_map_stack_trace", - "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "source_maps": { - "dependency": "direct main", - "description": { - "name": "source_maps", - "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.12" - }, - "source_span": { - "dependency": "direct main", - "description": { - "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.10.0" - }, - "sse": { - "dependency": "direct main", - "description": { - "name": "sse", - "sha256": "fdce3a4ac3ae1c01083d05ded0bcdb7e02857ca2323823548e9e76d2f61638f0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.5" - }, - "stack_trace": { - "dependency": "direct main", - "description": { - "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.11.1" - }, - "standard_message_codec": { - "dependency": "direct main", - "description": { - "name": "standard_message_codec", - "sha256": "fc7dd712d191b7e33196a0ecf354c4573492bb95995e7166cb6f73b047f9cae0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.1+4" - }, - "stream_channel": { - "dependency": "direct main", - "description": { - "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "string_scanner": { - "dependency": "direct main", - "description": { - "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "sync_http": { - "dependency": "direct main", - "description": { - "name": "sync_http", - "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.1" - }, - "term_glyph": { - "dependency": "direct main", - "description": { - "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "test": { - "dependency": "direct dev", - "description": { - "name": "test", - "sha256": "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.25.2" - }, - "test_api": { - "dependency": "direct main", - "description": { - "name": "test_api", - "sha256": "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.0" - }, - "test_core": { - "dependency": "direct main", - "description": { - "name": "test_core", - "sha256": "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.0" - }, - "typed_data": { - "dependency": "direct main", - "description": { - "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.2" - }, - "unified_analytics": { - "dependency": "direct main", - "description": { - "name": "unified_analytics", - "sha256": "57f594f2eff970a74e43aedc9bdec8eb8e3d3c860da8e9e6bcdf7594a07dba6b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.8.8+1" - }, - "usage": { - "dependency": "direct main", - "description": { - "name": "usage", - "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.1" - }, - "uuid": { - "dependency": "direct main", - "description": { - "name": "uuid", - "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.7" - }, - "vm_service": { - "dependency": "direct main", - "description": { - "name": "vm_service", - "sha256": "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "14.2.1" - }, - "vm_service_interface": { - "dependency": "direct main", - "description": { - "name": "vm_service_interface", - "sha256": "28c7c2c2531d94f827cb9ab5f4eacd5864013b559a302b50566b1fab1d9fb1bb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.1" - }, - "vm_snapshot_analysis": { - "dependency": "direct main", - "description": { - "name": "vm_snapshot_analysis", - "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.6" - }, - "watcher": { - "dependency": "direct main", - "description": { - "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "web": { - "dependency": "direct main", - "description": { - "name": "web", - "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.1" - }, - "web_socket_channel": { - "dependency": "direct main", - "description": { - "name": "web_socket_channel", - "sha256": "1d8e795e2a8b3730c41b8a98a2dff2e0fb57ae6f0764a1c46ec5915387d257b2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.4" - }, - "webdriver": { - "dependency": "direct main", - "description": { - "name": "webdriver", - "sha256": "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.3" - }, - "webkit_inspection_protocol": { - "dependency": "direct main", - "description": { - "name": "webkit_inspection_protocol", - "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "xml": { - "dependency": "direct main", - "description": { - "name": "xml", - "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.5.0" - }, - "yaml": { - "dependency": "direct main", - "description": { - "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.2" - }, - "yaml_edit": { - "dependency": "direct main", - "description": { - "name": "yaml_edit", - "sha256": "c566f4f804215d84a7a2c377667f546c6033d5b34b4f9e60dfb09d17c4e97826", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.0" - } - }, - "sdks": { - "dart": ">=3.3.0 <4.0.0" - } - } -} diff --git a/pkgs/development/compilers/flutter/versions/3_22/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/versions/3_22/patches/deregister-pub-dependencies-artifact.patch deleted file mode 100644 index 01e34c6d292c..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_22/patches/deregister-pub-dependencies-artifact.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart -index 252021cf78..e50ef0885d 100644 ---- a/packages/flutter_tools/lib/src/flutter_cache.dart -+++ b/packages/flutter_tools/lib/src/flutter_cache.dart -@@ -51,14 +51,6 @@ class FlutterCache extends Cache { - registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform)); - } - registerArtifact(FontSubsetArtifacts(this, platform: platform)); -- registerArtifact(PubDependencies( -- logger: logger, -- // flutter root and pub must be lazily initialized to avoid accessing -- // before the version is determined. -- flutterRoot: () => Cache.flutterRoot!, -- pub: () => pub, -- projectFactory: projectFactory, -- )); - } - } - \ No newline at end of file diff --git a/pkgs/development/compilers/flutter/versions/3_22/patches/disable-auto-update-shared.patch b/pkgs/development/compilers/flutter/versions/3_22/patches/disable-auto-update-shared.patch deleted file mode 100644 index 961b41f7327c..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_22/patches/disable-auto-update-shared.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index 75d9d3013e..657ad3cb78 100644 ---- a/bin/internal/shared.sh -+++ b/bin/internal/shared.sh -@@ -245,7 +245,7 @@ function shared::execute() { - # and will corrupt each others' downloads. - # - # SHARED_NAME itself is prepared by the caller script. -- upgrade_flutter 7< "$SHARED_NAME" -+ # upgrade_flutter 7< "$SHARED_NAME" - - BIN_NAME="$(basename "$PROG_NAME")" - case "$BIN_NAME" in diff --git a/pkgs/development/compilers/flutter/versions/3_22/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_22/patches/disable-auto-update.patch deleted file mode 100644 index 05960c01b737..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_22/patches/disable-auto-update.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart -index b7e624b4e2..edfdde118b 100644 ---- a/packages/flutter_tools/lib/src/runner/flutter_command.dart -+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart -@@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and - - // Populate the cache. We call this before pub get below so that the - // sky_engine package is available in the flutter cache for pub to find. -- if (shouldUpdateCache) { -+ if (false) { - // First always update universal artifacts, as some of these (e.g. - // ios-deploy on macOS) are required to determine `requiredArtifacts`. - final bool offline; -diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 5d6d78639f..90a4dfa555 100644 ---- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - globals.flutterUsage.suppressAnalytics = true; - } - -- globals.flutterVersion.ensureVersionFile(); - final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; - final bool ci = await globals.botDetector.isRunningOnBot; - final bool redirectedCompletion = !globals.stdio.hasTerminal && -@@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false; - final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag; - -- if (topLevelResults.command?.name != 'upgrade' && -- (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { -- await globals.flutterVersion.checkFlutterVersionFreshness(); -- } -- - // See if the user specified a specific device. - final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; - if (specifiedDeviceId != null) { diff --git a/pkgs/development/compilers/flutter/versions/3_23/data.json b/pkgs/development/compilers/flutter/versions/3_23/data.json deleted file mode 100644 index ab570ec0f879..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_23/data.json +++ /dev/null @@ -1,1036 +0,0 @@ -{ - "version": "3.23.0-0.1.pre", - "engineVersion": "bb10c5466638e963479ba5e64e601e42d1a43447", - "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=", - "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", - "channel": "beta", - "engineHashes": { - "aarch64-linux": { - "aarch64-linux": "sha256-H+UEIEY3UwBBJePSuwsFWQIGuuYzPuX543Me3YplD14=", - "x86_64-linux": "sha256-H+UEIEY3UwBBJePSuwsFWQIGuuYzPuX543Me3YplD14=" - }, - "x86_64-linux": { - "aarch64-linux": "sha256-KJbjRfxC2S8JWeo1eTHObvumOjAVc/24jEvOu4znnAY=", - "x86_64-linux": "sha256-KJbjRfxC2S8JWeo1eTHObvumOjAVc/24jEvOu4znnAY=" - } - }, - "dartVersion": "3.5.0-180.3.beta", - "dartHash": { - "x86_64-linux": "sha256-DXGyUTu9I602lLnDz9BKLfHEAeaMKtbZjxgmPPSTEv0=", - "aarch64-linux": "sha256-WFTHw5V6zWrpF7bx5wOQNOMJe+yn1j4rnfRSkW7hN9c=", - "x86_64-darwin": "sha256-nUFd3jMj1Totc2WPSToLvtSVNjmhKKWEXwzSKo1yT1w=", - "aarch64-darwin": "sha256-O5HYmZVveYGktks7we4uht9ZyaWJli5dSC22lrVqi58=" - }, - "flutterHash": "sha256-OFDPPoLvKG+H4Jylc6/NvvEe5g5I/lo4ViYNIUrgQXw=", - "artifactHashes": { - "android": { - "aarch64-darwin": "sha256-UWZ6/XGOoTjfoENRs2f6ZbTcke76ieme4MnTqKVKYXo=", - "aarch64-linux": "sha256-orYFnnwdiN0jKTff34moVkBmAc2TWNz053mp0IVehmk=", - "x86_64-darwin": "sha256-UWZ6/XGOoTjfoENRs2f6ZbTcke76ieme4MnTqKVKYXo=", - "x86_64-linux": "sha256-orYFnnwdiN0jKTff34moVkBmAc2TWNz053mp0IVehmk=" - }, - "fuchsia": { - "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" - }, - "ios": { - "aarch64-darwin": "sha256-lAo3yua8IbGiaVLt0JqDtehKROnibx60HtaBLupvILI=", - "aarch64-linux": "sha256-lAo3yua8IbGiaVLt0JqDtehKROnibx60HtaBLupvILI=", - "x86_64-darwin": "sha256-lAo3yua8IbGiaVLt0JqDtehKROnibx60HtaBLupvILI=", - "x86_64-linux": "sha256-lAo3yua8IbGiaVLt0JqDtehKROnibx60HtaBLupvILI=" - }, - "linux": { - "aarch64-darwin": "sha256-2d3gPOT2kBgHeTXOFOdEOAHkbv7ctXx51rtX497FEmU=", - "aarch64-linux": "sha256-2d3gPOT2kBgHeTXOFOdEOAHkbv7ctXx51rtX497FEmU=", - "x86_64-darwin": "sha256-LcEITSWg5VdUs9nXRu+mPGxxWqAuRRSbt9RCDeBa+74=", - "x86_64-linux": "sha256-LcEITSWg5VdUs9nXRu+mPGxxWqAuRRSbt9RCDeBa+74=" - }, - "macos": { - "aarch64-darwin": "sha256-b6ETaOTHSU58yLsMorKKhOOA7DkD+RtQ3DIqAJhSDjs=", - "aarch64-linux": "sha256-b6ETaOTHSU58yLsMorKKhOOA7DkD+RtQ3DIqAJhSDjs=", - "x86_64-darwin": "sha256-b6ETaOTHSU58yLsMorKKhOOA7DkD+RtQ3DIqAJhSDjs=", - "x86_64-linux": "sha256-b6ETaOTHSU58yLsMorKKhOOA7DkD+RtQ3DIqAJhSDjs=" - }, - "universal": { - "aarch64-darwin": "sha256-umn+onoRSmfuoL+ls/68xhCo34mgD1xMdMjUstmMC74=", - "aarch64-linux": "sha256-IKGrSAweOTwgesVt2PjUvYeTkpeSDRqXTeZWwd6ikvk=", - "x86_64-darwin": "sha256-C7/NtLOpFwyvUMBk7imz0Ovj/AjJ7vf2v6Sd2PZujiA=", - "x86_64-linux": "sha256-3W/S7/K30xJC6mA9S2n1rgD7lhUvz2ZDSKq7k/uRi2A=" - }, - "web": { - "aarch64-darwin": "sha256-dyT9Cj33MmZdOhQwVuqkrxYjWeZxMXE35BKkRHjSKtQ=", - "aarch64-linux": "sha256-dyT9Cj33MmZdOhQwVuqkrxYjWeZxMXE35BKkRHjSKtQ=", - "x86_64-darwin": "sha256-dyT9Cj33MmZdOhQwVuqkrxYjWeZxMXE35BKkRHjSKtQ=", - "x86_64-linux": "sha256-dyT9Cj33MmZdOhQwVuqkrxYjWeZxMXE35BKkRHjSKtQ=" - }, - "windows": { - "x86_64-darwin": "sha256-0V63HjDy3mqNmGKM/5VVSibg8k7JtSaJ5RXXgk1XltQ=", - "x86_64-linux": "sha256-0V63HjDy3mqNmGKM/5VVSibg8k7JtSaJ5RXXgk1XltQ=" - } - }, - "pubspecLock": { - "packages": { - "_fe_analyzer_shared": { - "dependency": "direct main", - "description": { - "name": "_fe_analyzer_shared", - "sha256": "5aaf60d96c4cd00fe7f21594b5ad6a1b699c80a27420f8a837f4d68473ef09e3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "68.0.0" - }, - "_macros": { - "dependency": "transitive", - "description": "dart", - "source": "sdk", - "version": "0.1.5" - }, - "analyzer": { - "dependency": "direct main", - "description": { - "name": "analyzer", - "sha256": "21f1d3720fd1c70316399d5e2bccaebb415c434592d778cce8acb967b8578808", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.5.0" - }, - "archive": { - "dependency": "direct main", - "description": { - "name": "archive", - "sha256": "80e5141fafcb3361653ce308776cfd7d45e6e9fbb429e14eec571382c0c5fecb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.3.2" - }, - "args": { - "dependency": "direct main", - "description": { - "name": "args", - "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.5.0" - }, - "async": { - "dependency": "direct main", - "description": { - "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.11.0" - }, - "boolean_selector": { - "dependency": "direct main", - "description": { - "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "browser_launcher": { - "dependency": "direct main", - "description": { - "name": "browser_launcher", - "sha256": "6ee4c6b1f68a42e769ef6e663c4f56708522f7bce9d2ab6e308a37b612ffa4ec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "built_collection": { - "dependency": "direct main", - "description": { - "name": "built_collection", - "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.1.1" - }, - "built_value": { - "dependency": "direct main", - "description": { - "name": "built_value", - "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.9.2" - }, - "checked_yaml": { - "dependency": "direct dev", - "description": { - "name": "checked_yaml", - "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.3" - }, - "cli_config": { - "dependency": "direct main", - "description": { - "name": "cli_config", - "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "clock": { - "dependency": "direct main", - "description": { - "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "collection": { - "dependency": "direct dev", - "description": { - "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.18.0" - }, - "completion": { - "dependency": "direct main", - "description": { - "name": "completion", - "sha256": "f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.1" - }, - "convert": { - "dependency": "direct main", - "description": { - "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.1" - }, - "coverage": { - "dependency": "direct main", - "description": { - "name": "coverage", - "sha256": "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.8.0" - }, - "crypto": { - "dependency": "direct main", - "description": { - "name": "crypto", - "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.3" - }, - "csslib": { - "dependency": "direct main", - "description": { - "name": "csslib", - "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "dap": { - "dependency": "direct main", - "description": { - "name": "dap", - "sha256": "fb7c8a64857d90bedf5c51954b83bee9304b607bcb8a03a89ec37afbf2d683a7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "dds": { - "dependency": "direct main", - "description": { - "name": "dds", - "sha256": "cf3868c2223864529d6e5aa0c07ce9ba0016b9d0e8cb67480c0eb810a42f56bd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.2.1" - }, - "dds_service_extensions": { - "dependency": "direct main", - "description": { - "name": "dds_service_extensions", - "sha256": "390ae1d0128bb43ffe11f8e3c6cd3a481c1920492d1026883d379cee50bdf1a2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "devtools_shared": { - "dependency": "direct main", - "description": { - "name": "devtools_shared", - "sha256": "fbe1657c88dd476a70116e33b0d19f8a23b35fd6db93eab9f01fa32cc21a0c49", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "10.0.0-dev.1" - }, - "dtd": { - "dependency": "direct main", - "description": { - "name": "dtd", - "sha256": "58ac5c2d628e575dbcdfda44a698cd4c1212663e27fe5f8ced37aea85faa0d30", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.0" - }, - "dwds": { - "dependency": "direct main", - "description": { - "name": "dwds", - "sha256": "61ebaabb04d779d040b47d3b4d0b3963449ced0920fb8efd81ca6d5e51ccfc1a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "24.0.0" - }, - "extension_discovery": { - "dependency": "direct main", - "description": { - "name": "extension_discovery", - "sha256": "20735622d0763865f9d94c3ecdce4441174530870760253e9d364fb4f3da8688", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "fake_async": { - "dependency": "direct main", - "description": { - "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.1" - }, - "ffi": { - "dependency": "direct main", - "description": { - "name": "ffi", - "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "file": { - "dependency": "direct main", - "description": { - "name": "file", - "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.0" - }, - "file_testing": { - "dependency": "direct dev", - "description": { - "name": "file_testing", - "sha256": "0aaadb4025bd350403f4308ad6c4cea953278d9407814b8342558e4946840fb5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, - "fixnum": { - "dependency": "direct main", - "description": { - "name": "fixnum", - "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "flutter_template_images": { - "dependency": "direct main", - "description": { - "name": "flutter_template_images", - "sha256": "fd3e55af73c577b9e3f88d4080d3e366cb5c8ef3fbd50b94dfeca56bb0235df6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.2.0" - }, - "frontend_server_client": { - "dependency": "direct main", - "description": { - "name": "frontend_server_client", - "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.0" - }, - "glob": { - "dependency": "direct main", - "description": { - "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "graphs": { - "dependency": "direct main", - "description": { - "name": "graphs", - "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.1" - }, - "html": { - "dependency": "direct main", - "description": { - "name": "html", - "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.15.4" - }, - "http": { - "dependency": "direct main", - "description": { - "name": "http", - "sha256": "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.13.6" - }, - "http_multi_server": { - "dependency": "direct main", - "description": { - "name": "http_multi_server", - "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.1" - }, - "http_parser": { - "dependency": "direct main", - "description": { - "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.2" - }, - "intl": { - "dependency": "direct main", - "description": { - "name": "intl", - "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.19.0" - }, - "io": { - "dependency": "direct main", - "description": { - "name": "io", - "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "js": { - "dependency": "direct dev", - "description": { - "name": "js", - "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.1" - }, - "json_annotation": { - "dependency": "direct dev", - "description": { - "name": "json_annotation", - "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.9.0" - }, - "json_rpc_2": { - "dependency": "direct main", - "description": { - "name": "json_rpc_2", - "sha256": "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "logging": { - "dependency": "direct main", - "description": { - "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "macros": { - "dependency": "transitive", - "description": { - "name": "macros", - "sha256": "a8403c89b36483b4cbf9f1fcd24562f483cb34a5c9bf101cf2b0d8a083cf1239", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.0-main.5" - }, - "matcher": { - "dependency": "direct main", - "description": { - "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.12.16+1" - }, - "meta": { - "dependency": "direct main", - "description": { - "name": "meta", - "sha256": "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.14.0" - }, - "mime": { - "dependency": "direct main", - "description": { - "name": "mime", - "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.5" - }, - "multicast_dns": { - "dependency": "direct main", - "description": { - "name": "multicast_dns", - "sha256": "316cc47a958d4bd3c67bd238fe8b44fdfb6133bad89cb191c0c3bd3edb14e296", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.2+6" - }, - "mustache_template": { - "dependency": "direct main", - "description": { - "name": "mustache_template", - "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "native_assets_builder": { - "dependency": "direct main", - "description": { - "name": "native_assets_builder", - "sha256": "e6612ad01cbc3c4d1b00a1a42aa25aa567950ab10ae1f95721574923540f3bd8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.0" - }, - "native_assets_cli": { - "dependency": "direct main", - "description": { - "name": "native_assets_cli", - "sha256": "f54ddc4a3f8cff1d8d63723b4938902da7586a5a47fe3c1bfa226eb80223f32e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.0" - }, - "native_stack_traces": { - "dependency": "direct main", - "description": { - "name": "native_stack_traces", - "sha256": "64d2f4bcf3b69326fb9bc91b4dd3a06f94bb5bbc3a65e25ae6467ace0b34bfd3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.7" - }, - "node_preamble": { - "dependency": "direct dev", - "description": { - "name": "node_preamble", - "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "package_config": { - "dependency": "direct main", - "description": { - "name": "package_config", - "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "path": { - "dependency": "direct main", - "description": { - "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.9.0" - }, - "petitparser": { - "dependency": "direct main", - "description": { - "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.2" - }, - "platform": { - "dependency": "direct main", - "description": { - "name": "platform", - "sha256": "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.4" - }, - "pool": { - "dependency": "direct main", - "description": { - "name": "pool", - "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.1" - }, - "process": { - "dependency": "direct main", - "description": { - "name": "process", - "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.0.2" - }, - "pub_semver": { - "dependency": "direct main", - "description": { - "name": "pub_semver", - "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.4" - }, - "pubspec_parse": { - "dependency": "direct dev", - "description": { - "name": "pubspec_parse", - "sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.3" - }, - "shelf": { - "dependency": "direct main", - "description": { - "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.1" - }, - "shelf_packages_handler": { - "dependency": "direct main", - "description": { - "name": "shelf_packages_handler", - "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "shelf_proxy": { - "dependency": "direct main", - "description": { - "name": "shelf_proxy", - "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "shelf_static": { - "dependency": "direct main", - "description": { - "name": "shelf_static", - "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2" - }, - "shelf_web_socket": { - "dependency": "direct main", - "description": { - "name": "shelf_web_socket", - "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "source_map_stack_trace": { - "dependency": "direct main", - "description": { - "name": "source_map_stack_trace", - "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "source_maps": { - "dependency": "direct main", - "description": { - "name": "source_maps", - "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.12" - }, - "source_span": { - "dependency": "direct main", - "description": { - "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.10.0" - }, - "sse": { - "dependency": "direct main", - "description": { - "name": "sse", - "sha256": "fdce3a4ac3ae1c01083d05ded0bcdb7e02857ca2323823548e9e76d2f61638f0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.5" - }, - "stack_trace": { - "dependency": "direct main", - "description": { - "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.11.1" - }, - "standard_message_codec": { - "dependency": "direct main", - "description": { - "name": "standard_message_codec", - "sha256": "fc7dd712d191b7e33196a0ecf354c4573492bb95995e7166cb6f73b047f9cae0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.1+4" - }, - "stream_channel": { - "dependency": "direct main", - "description": { - "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "string_scanner": { - "dependency": "direct main", - "description": { - "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "sync_http": { - "dependency": "direct main", - "description": { - "name": "sync_http", - "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.1" - }, - "term_glyph": { - "dependency": "direct main", - "description": { - "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "test": { - "dependency": "direct dev", - "description": { - "name": "test", - "sha256": "d11b55850c68c1f6c0cf00eabded4e66c4043feaf6c0d7ce4a36785137df6331", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.25.5" - }, - "test_api": { - "dependency": "direct main", - "description": { - "name": "test_api", - "sha256": "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.1" - }, - "test_core": { - "dependency": "direct main", - "description": { - "name": "test_core", - "sha256": "4d070a6bc36c1c4e89f20d353bfd71dc30cdf2bd0e14349090af360a029ab292", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.2" - }, - "typed_data": { - "dependency": "direct main", - "description": { - "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.2" - }, - "unified_analytics": { - "dependency": "direct main", - "description": { - "name": "unified_analytics", - "sha256": "0271998bc95be272accda218841af6dfc7bb4ef666f6c21dd73d6807c2dfff0e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.1.0" - }, - "usage": { - "dependency": "direct main", - "description": { - "name": "usage", - "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.1" - }, - "uuid": { - "dependency": "direct main", - "description": { - "name": "uuid", - "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.7" - }, - "vm_service": { - "dependency": "direct main", - "description": { - "name": "vm_service", - "sha256": "7475cb4dd713d57b6f7464c0e13f06da0d535d8b2067e188962a59bac2cf280b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "14.2.2" - }, - "vm_service_interface": { - "dependency": "direct main", - "description": { - "name": "vm_service_interface", - "sha256": "f827453d9a3f8ceae04e389810da26f9b67636bdd13aa2dd9405b110c4daf59c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "vm_snapshot_analysis": { - "dependency": "direct main", - "description": { - "name": "vm_snapshot_analysis", - "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.6" - }, - "watcher": { - "dependency": "direct main", - "description": { - "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "web": { - "dependency": "direct main", - "description": { - "name": "web", - "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.1" - }, - "web_socket_channel": { - "dependency": "direct main", - "description": { - "name": "web_socket_channel", - "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.5" - }, - "webdriver": { - "dependency": "direct main", - "description": { - "name": "webdriver", - "sha256": "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.3" - }, - "webkit_inspection_protocol": { - "dependency": "direct main", - "description": { - "name": "webkit_inspection_protocol", - "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "xml": { - "dependency": "direct main", - "description": { - "name": "xml", - "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.5.0" - }, - "yaml": { - "dependency": "direct main", - "description": { - "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.2" - }, - "yaml_edit": { - "dependency": "direct main", - "description": { - "name": "yaml_edit", - "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.1" - } - }, - "sdks": { - "dart": ">=3.4.0-282.1.beta <4.0.0" - } - } -} diff --git a/pkgs/development/compilers/flutter/versions/3_23/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/versions/3_23/patches/deregister-pub-dependencies-artifact.patch deleted file mode 100644 index 01e34c6d292c..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_23/patches/deregister-pub-dependencies-artifact.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart -index 252021cf78..e50ef0885d 100644 ---- a/packages/flutter_tools/lib/src/flutter_cache.dart -+++ b/packages/flutter_tools/lib/src/flutter_cache.dart -@@ -51,14 +51,6 @@ class FlutterCache extends Cache { - registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform)); - } - registerArtifact(FontSubsetArtifacts(this, platform: platform)); -- registerArtifact(PubDependencies( -- logger: logger, -- // flutter root and pub must be lazily initialized to avoid accessing -- // before the version is determined. -- flutterRoot: () => Cache.flutterRoot!, -- pub: () => pub, -- projectFactory: projectFactory, -- )); - } - } - \ No newline at end of file diff --git a/pkgs/development/compilers/flutter/versions/3_23/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_23/patches/disable-auto-update.patch deleted file mode 100644 index 05960c01b737..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_23/patches/disable-auto-update.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart -index b7e624b4e2..edfdde118b 100644 ---- a/packages/flutter_tools/lib/src/runner/flutter_command.dart -+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart -@@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and - - // Populate the cache. We call this before pub get below so that the - // sky_engine package is available in the flutter cache for pub to find. -- if (shouldUpdateCache) { -+ if (false) { - // First always update universal artifacts, as some of these (e.g. - // ios-deploy on macOS) are required to determine `requiredArtifacts`. - final bool offline; -diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 5d6d78639f..90a4dfa555 100644 ---- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - globals.flutterUsage.suppressAnalytics = true; - } - -- globals.flutterVersion.ensureVersionFile(); - final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; - final bool ci = await globals.botDetector.isRunningOnBot; - final bool redirectedCompletion = !globals.stdio.hasTerminal && -@@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false; - final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag; - -- if (topLevelResults.command?.name != 'upgrade' && -- (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { -- await globals.flutterVersion.checkFlutterVersionFreshness(); -- } -- - // See if the user specified a specific device. - final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; - if (specifiedDeviceId != null) { diff --git a/pkgs/development/compilers/flutter/versions/3_24/data.json b/pkgs/development/compilers/flutter/versions/3_24/data.json index 2386379e4346..114e3e88686e 100644 --- a/pkgs/development/compilers/flutter/versions/3_24/data.json +++ b/pkgs/development/compilers/flutter/versions/3_24/data.json @@ -1,33 +1,33 @@ { - "version": "3.24.1", - "engineVersion": "c9b9d5780da342eb3f0f5e439a7db06f7d112575", + "version": "3.24.4", + "engineVersion": "db49896cf25ceabc44096d5f088d86414e05a7aa", "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=", "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", "channel": "stable", "engineHashes": { "aarch64-linux": { - "aarch64-linux": "sha256-+ot7+/DT18xZSysGqQ2v1hQOTbzO7Gr9zFeZPnrEy64=", - "x86_64-linux": "sha256-+ot7+/DT18xZSysGqQ2v1hQOTbzO7Gr9zFeZPnrEy64=" + "aarch64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU=", + "x86_64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU=" }, "x86_64-linux": { - "aarch64-linux": "sha256-hgKC9sBlP/82tPBTF7WMgNc/sc/qrymxiss8ux85XNU=", - "x86_64-linux": "sha256-hgKC9sBlP/82tPBTF7WMgNc/sc/qrymxiss8ux85XNU=" + "aarch64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU=", + "x86_64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU=" } }, - "dartVersion": "3.5.1", + "dartVersion": "3.5.4", "dartHash": { - "x86_64-linux": "sha256-dmi3KxcCfqmBvqp6BTMaeiAEayRpQfctSeHaucaZCaM=", - "aarch64-linux": "sha256-OoQYMsw/36lM9Sza+g9n6sJ+G2SmMtR+W3YrjyeOg/Q=", - "x86_64-darwin": "sha256-+OkDE+eEov5CZb08mVm2XhARu0x8O0X0XRWnMFYEr5o=", - "aarch64-darwin": "sha256-cMb7/EaHzSX0WorUuCOLEtBcYS8jyWNuviLhkYrWiOI=" + "x86_64-linux": "sha256-jHyCMOkrd8DEq/IBqCMTqJg9uFkcoAwHiJBFNUHENZY=", + "aarch64-linux": "sha256-fFHpWvwKYBC4fbKTMwfhemu4RCdyAqj+cIJgcoE1P30=", + "x86_64-darwin": "sha256-9BJL3FjwmPbJw2pdiXH0EjPqjaYavzxt6ohyNKAeyOg=", + "aarch64-darwin": "sha256-tebVH1N2VtPnyecH6wYyptkE0xjINpPv/mvKgaucBHk=" }, - "flutterHash": "sha256-Y/a8gab8YCEWa8G45a9H3r2ulgqUqjqDJbb2GR4iegQ=", + "flutterHash": "sha256-ykR2ul5JWEvopTMqXvRCAfqZ8ZlirNu0txVczWc/Nvg=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-0X224oHqrx+t5v/73TGiL1Z/3fcMnEhSyDVZ3rLQ5Dc=", - "aarch64-linux": "sha256-2MI9Fwf/anWfBunTxtG9DlyAdLe3iXWvl/ghkHTPMaw=", - "x86_64-darwin": "sha256-0X224oHqrx+t5v/73TGiL1Z/3fcMnEhSyDVZ3rLQ5Dc=", - "x86_64-linux": "sha256-2MI9Fwf/anWfBunTxtG9DlyAdLe3iXWvl/ghkHTPMaw=" + "aarch64-darwin": "sha256-LlTVOf+8AixZ/W5J+dlagdldwZTE7D2aA3tWYi3te+8=", + "aarch64-linux": "sha256-XfsBmIjmPzU+VNJvqu6uXOcKUwfUPXXoL2hUPso3DNo=", + "x86_64-darwin": "sha256-LlTVOf+8AixZ/W5J+dlagdldwZTE7D2aA3tWYi3te+8=", + "x86_64-linux": "sha256-XfsBmIjmPzU+VNJvqu6uXOcKUwfUPXXoL2hUPso3DNo=" }, "fuchsia": { "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", @@ -36,38 +36,38 @@ "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" }, "ios": { - "aarch64-darwin": "sha256-JpEm6rxkiNVUZkvQpy7QhUNTamG274Tggh50wG/980M=", - "aarch64-linux": "sha256-JpEm6rxkiNVUZkvQpy7QhUNTamG274Tggh50wG/980M=", - "x86_64-darwin": "sha256-JpEm6rxkiNVUZkvQpy7QhUNTamG274Tggh50wG/980M=", - "x86_64-linux": "sha256-JpEm6rxkiNVUZkvQpy7QhUNTamG274Tggh50wG/980M=" + "aarch64-darwin": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=", + "aarch64-linux": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=", + "x86_64-darwin": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=", + "x86_64-linux": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=" }, "linux": { - "aarch64-darwin": "sha256-Xdbu9U1IxakBZt5uE9wg4V5FBsMOnAf8rgFe7fxqvYo=", - "aarch64-linux": "sha256-Xdbu9U1IxakBZt5uE9wg4V5FBsMOnAf8rgFe7fxqvYo=", - "x86_64-darwin": "sha256-hYPVRKCorPPlA1vEFNzEvBjsM8WJmrFBpDA9MZyaEy8=", - "x86_64-linux": "sha256-hYPVRKCorPPlA1vEFNzEvBjsM8WJmrFBpDA9MZyaEy8=" + "aarch64-darwin": "sha256-876g3jlrzaAiVN8zYbQe2B2eCXi7gygQNNZH+NSH6IU=", + "aarch64-linux": "sha256-876g3jlrzaAiVN8zYbQe2B2eCXi7gygQNNZH+NSH6IU=", + "x86_64-darwin": "sha256-zbyMRvUGIGj1Zk/U8xC/bewKAtWssWnAvQFj3wb8XcM=", + "x86_64-linux": "sha256-zbyMRvUGIGj1Zk/U8xC/bewKAtWssWnAvQFj3wb8XcM=" }, "macos": { - "aarch64-darwin": "sha256-KizzQKgKTJszSzPehIRJvxUuJ+rQHx00R27mvsBik7c=", - "aarch64-linux": "sha256-KizzQKgKTJszSzPehIRJvxUuJ+rQHx00R27mvsBik7c=", - "x86_64-darwin": "sha256-KizzQKgKTJszSzPehIRJvxUuJ+rQHx00R27mvsBik7c=", - "x86_64-linux": "sha256-KizzQKgKTJszSzPehIRJvxUuJ+rQHx00R27mvsBik7c=" + "aarch64-darwin": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=", + "aarch64-linux": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=", + "x86_64-darwin": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=", + "x86_64-linux": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=" }, "universal": { - "aarch64-darwin": "sha256-KTcQ2G531xTcxYxnhk5w+CSIsR9TQMxpP6EcNwBnJsE=", - "aarch64-linux": "sha256-At9+kymeYRqUpJXbzuEhbMRWaM3aFS0FhrESYYjre0U=", - "x86_64-darwin": "sha256-27TQMUlexqdiXfE5iDl6DPlCnSY0pAmhGDrne4SCXBM=", - "x86_64-linux": "sha256-qPhyn49fMto0EiHFMbARdWSjdRZvvV66GNlaQc087eY=" + "aarch64-darwin": "sha256-SVrhfvGunkEKraIapt2PcNr4VzWI9d5DYMwkE82hKC8=", + "aarch64-linux": "sha256-N4/BCd8JTXqMdfX65IhKlZo7EK88t0I47QVoqdlOg7s=", + "x86_64-darwin": "sha256-GdBinxPZHgYZdmHvtcT9+qPGadZKqWTOIHJcIJwN2rU=", + "x86_64-linux": "sha256-a/AMUZC3n4e/TAquu076vXq+4cuODYJyvIrayTw4o5U=" }, "web": { - "aarch64-darwin": "sha256-z6RjD56OVppribVXhbbPaRvjy+qU8PXyCg4yF0L0rUE=", - "aarch64-linux": "sha256-z6RjD56OVppribVXhbbPaRvjy+qU8PXyCg4yF0L0rUE=", - "x86_64-darwin": "sha256-z6RjD56OVppribVXhbbPaRvjy+qU8PXyCg4yF0L0rUE=", - "x86_64-linux": "sha256-z6RjD56OVppribVXhbbPaRvjy+qU8PXyCg4yF0L0rUE=" + "aarch64-darwin": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=", + "aarch64-linux": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=", + "x86_64-darwin": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=", + "x86_64-linux": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=" }, "windows": { - "x86_64-darwin": "sha256-+ZgOS8HK0S5T/wDJZcYM4ZtmvJwB2anyyp0Td0/w934=", - "x86_64-linux": "sha256-+ZgOS8HK0S5T/wDJZcYM4ZtmvJwB2anyyp0Td0/w934=" + "x86_64-darwin": "sha256-EvESJuNqDpnXw3RuEM11tq5k+DGF3Ytm4fqw1WT9dbI=", + "x86_64-linux": "sha256-EvESJuNqDpnXw3RuEM11tq5k+DGF3Ytm4fqw1WT9dbI=" } }, "pubspecLock": { @@ -272,11 +272,11 @@ "dependency": "direct main", "description": { "name": "dds", - "sha256": "14dcd48de0c83e98528d6da555de03c29d52b6711a82eb8c5495d41a110becec", + "sha256": "f3bca60b6b7d2b005268a1a579c82e38bec3d85cc85c332a872fe623c7ba94d7", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.4+1" + "version": "4.2.4+2" }, "dds_service_extensions": { "dependency": "direct main", diff --git a/pkgs/development/compilers/flutter/versions/3_26/data.json b/pkgs/development/compilers/flutter/versions/3_26/data.json new file mode 100644 index 000000000000..8dc7dd1cce41 --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_26/data.json @@ -0,0 +1,1056 @@ +{ + "version": "3.26.0-0.1.pre", + "engineVersion": "059e4e6d8ff6de39c29441c53e949bfb0bf17972", + "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=", + "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", + "channel": "beta", + "engineHashes": { + "aarch64-linux": { + "aarch64-linux": "sha256-cDXCGikGuPWxMZZ0HWcnbS7Dt22no9wwbh4wei7w8Bw=", + "x86_64-linux": "sha256-cDXCGikGuPWxMZZ0HWcnbS7Dt22no9wwbh4wei7w8Bw=" + }, + "x86_64-linux": { + "aarch64-linux": "sha256-cDXCGikGuPWxMZZ0HWcnbS7Dt22no9wwbh4wei7w8Bw=", + "x86_64-linux": "sha256-cDXCGikGuPWxMZZ0HWcnbS7Dt22no9wwbh4wei7w8Bw=" + } + }, + "dartVersion": "3.6.0-216.1.beta", + "dartHash": { + "x86_64-linux": "sha256-Vvdx4Bi7a/ySrxAv3UejlmmbNyKzdDr9RCS9tVGscDQ=", + "aarch64-linux": "sha256-SHqk1bm/5+ixOA5RHuToHQDN/NrNKZIrkkaBh9Cvl/I=", + "x86_64-darwin": "sha256-dbw0+OtjYkdRCgLDP+oNcOUgR5C8gC12NdftNAk7x0Q=", + "aarch64-darwin": "sha256-XOpBwyrMqIKutXgLEjGuta/3yhK+DpoSChNVXc9MMYA=" + }, + "flutterHash": "sha256-4YXm/MbhQsifJYpeUjmP8h6sm7pWrjBSpbCTV9p659o=", + "artifactHashes": { + "android": { + "aarch64-darwin": "sha256-CmjEq9T5gNgNKp8mik6HwVAsAfdWXBK2nHwL28L08xk=", + "aarch64-linux": "sha256-sucpfdtDzNMmCpWOZGVp48uNSrj221fOROI8huRs8Xc=", + "x86_64-darwin": "sha256-CmjEq9T5gNgNKp8mik6HwVAsAfdWXBK2nHwL28L08xk=", + "x86_64-linux": "sha256-sucpfdtDzNMmCpWOZGVp48uNSrj221fOROI8huRs8Xc=" + }, + "fuchsia": { + "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", + "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", + "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", + "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" + }, + "ios": { + "aarch64-darwin": "sha256-kRgyKtnMs7xefe+XmCoYbO7sa7Dz1o0ltcRdiDvSeik=", + "aarch64-linux": "sha256-kRgyKtnMs7xefe+XmCoYbO7sa7Dz1o0ltcRdiDvSeik=", + "x86_64-darwin": "sha256-kRgyKtnMs7xefe+XmCoYbO7sa7Dz1o0ltcRdiDvSeik=", + "x86_64-linux": "sha256-kRgyKtnMs7xefe+XmCoYbO7sa7Dz1o0ltcRdiDvSeik=" + }, + "linux": { + "aarch64-darwin": "sha256-tnvQp4Vdthqwgt1bFRpZVJOuTX752yJE91yJNpwSOp4=", + "aarch64-linux": "sha256-tnvQp4Vdthqwgt1bFRpZVJOuTX752yJE91yJNpwSOp4=", + "x86_64-darwin": "sha256-vIfHgLif151Ymtu/aFtwHZTk28H2feHd9cOedUmSWXY=", + "x86_64-linux": "sha256-vIfHgLif151Ymtu/aFtwHZTk28H2feHd9cOedUmSWXY=" + }, + "macos": { + "aarch64-darwin": "sha256-/4R3Wlcs6ksMkTTZJ/YzEgWWCQJBKlnWr+PNCtcL3oc=", + "aarch64-linux": "sha256-/4R3Wlcs6ksMkTTZJ/YzEgWWCQJBKlnWr+PNCtcL3oc=", + "x86_64-darwin": "sha256-/4R3Wlcs6ksMkTTZJ/YzEgWWCQJBKlnWr+PNCtcL3oc=", + "x86_64-linux": "sha256-/4R3Wlcs6ksMkTTZJ/YzEgWWCQJBKlnWr+PNCtcL3oc=" + }, + "universal": { + "aarch64-darwin": "sha256-M2Fuqfgq79+FilJ5vU0Iarn0cpV3+4AxuxFEc3fwm+4=", + "aarch64-linux": "sha256-NqlNboNjLFAeuLHu6lNnMnrEb902nwIV1b/DNfrr3h8=", + "x86_64-darwin": "sha256-tlGwnwAov1eBe54mD9Q6D86qIEBkHBODJs5SVJyP5M0=", + "x86_64-linux": "sha256-0lxLRRQq+bRDPXyxEtZVGtzzqhrcsTYx01jeFX3ejLc=" + }, + "web": { + "aarch64-darwin": "sha256-fVOuJCTciHWv+HRFtSgn8zrexspBe+MUnc/cZlOeoqM=", + "aarch64-linux": "sha256-fVOuJCTciHWv+HRFtSgn8zrexspBe+MUnc/cZlOeoqM=", + "x86_64-darwin": "sha256-fVOuJCTciHWv+HRFtSgn8zrexspBe+MUnc/cZlOeoqM=", + "x86_64-linux": "sha256-fVOuJCTciHWv+HRFtSgn8zrexspBe+MUnc/cZlOeoqM=" + }, + "windows": { + "x86_64-darwin": "sha256-mwbk0VwxsbnMjy8trtjgZZ96jF3QuQJDcc0VSs6mQxI=", + "x86_64-linux": "sha256-mwbk0VwxsbnMjy8trtjgZZ96jF3QuQJDcc0VSs6mQxI=" + } + }, + "pubspecLock": { + "packages": { + "_fe_analyzer_shared": { + "dependency": "direct main", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "73.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.2" + }, + "analyzer": { + "dependency": "direct main", + "description": { + "name": "analyzer", + "sha256": "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.8.0" + }, + "archive": { + "dependency": "direct main", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "direct main", + "description": { + "name": "args", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "async": { + "dependency": "direct main", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "boolean_selector": { + "dependency": "direct main", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "browser_launcher": { + "dependency": "direct main", + "description": { + "name": "browser_launcher", + "sha256": "54a2da4d152c34760b87cbd4a9fe8a563379487e57bfcd1b387be394dfa91734", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "built_collection": { + "dependency": "direct main", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "direct main", + "description": { + "name": "built_value", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.2" + }, + "checked_yaml": { + "dependency": "direct dev", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_config": { + "dependency": "direct main", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "clock": { + "dependency": "direct main", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "collection": { + "dependency": "direct dev", + "description": { + "name": "collection", + "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.0" + }, + "completion": { + "dependency": "direct main", + "description": { + "name": "completion", + "sha256": "f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "convert": { + "dependency": "direct main", + "description": { + "name": "convert", + "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "coverage": { + "dependency": "direct main", + "description": { + "name": "coverage", + "sha256": "7b594a150942e0d3be99cd45a1d0b5caff27ba5a27f292ed8e8d904ba3f167b5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "crypto": { + "dependency": "direct main", + "description": { + "name": "crypto", + "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "csslib": { + "dependency": "direct main", + "description": { + "name": "csslib", + "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "dap": { + "dependency": "direct main", + "description": { + "name": "dap", + "sha256": "c0e53b52c9529d901329045afc4c5acb04304a28acde4b54ab0a08a93da546aa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "dds": { + "dependency": "direct main", + "description": { + "name": "dds", + "sha256": "263f8831bfe57136fd4c07cf87df9b3f65457438b8b4d237e1b1d603c6d1cdbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.6" + }, + "dds_service_extensions": { + "dependency": "direct main", + "description": { + "name": "dds_service_extensions", + "sha256": "390ae1d0128bb43ffe11f8e3c6cd3a481c1920492d1026883d379cee50bdf1a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "devtools_shared": { + "dependency": "direct main", + "description": { + "name": "devtools_shared", + "sha256": "72369878105eccd563547afbad97407a2431b96bd4c04a1d6da75cb068437f50", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.2" + }, + "dtd": { + "dependency": "direct main", + "description": { + "name": "dtd", + "sha256": "6e4e508c0d03e12e2c96f21faa0e5acc191f9431ecd02adb8daee64dbfae6b86", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "dwds": { + "dependency": "direct main", + "description": { + "name": "dwds", + "sha256": "d0cf9d18511df6b397c40527f3fd8ddb47b7efcc501e703dd94f13cabaf82ffc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "24.1.0" + }, + "extension_discovery": { + "dependency": "direct main", + "description": { + "name": "extension_discovery", + "sha256": "20735622d0763865f9d94c3ecdce4441174530870760253e9d364fb4f3da8688", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "fake_async": { + "dependency": "direct main", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "ffi": { + "dependency": "direct main", + "description": { + "name": "ffi", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "file": { + "dependency": "direct main", + "description": { + "name": "file", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "file_testing": { + "dependency": "direct dev", + "description": { + "name": "file_testing", + "sha256": "0aaadb4025bd350403f4308ad6c4cea953278d9407814b8342558e4946840fb5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "fixnum": { + "dependency": "direct main", + "description": { + "name": "fixnum", + "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "flutter_template_images": { + "dependency": "direct main", + "description": { + "name": "flutter_template_images", + "sha256": "fd3e55af73c577b9e3f88d4080d3e366cb5c8ef3fbd50b94dfeca56bb0235df6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "frontend_server_client": { + "dependency": "direct main", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "glob": { + "dependency": "direct main", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "graphs": { + "dependency": "direct main", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "html": { + "dependency": "direct main", + "description": { + "name": "html", + "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.4" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "http_multi_server": { + "dependency": "direct main", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "direct main", + "description": { + "name": "http_parser", + "sha256": "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "direct main", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "js": { + "dependency": "direct main", + "description": { + "name": "js", + "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.1" + }, + "json_annotation": { + "dependency": "direct dev", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "json_rpc_2": { + "dependency": "direct main", + "description": { + "name": "json_rpc_2", + "sha256": "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "logging": { + "dependency": "direct main", + "description": { + "name": "logging", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2-main.4" + }, + "matcher": { + "dependency": "direct main", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "meta": { + "dependency": "direct main", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "mime": { + "dependency": "direct main", + "description": { + "name": "mime", + "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.6" + }, + "multicast_dns": { + "dependency": "direct main", + "description": { + "name": "multicast_dns", + "sha256": "982c4cc4cda5f98dd477bddfd623e8e4bd1014e7dbf9e7b05052e14a5b550b99", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.2+7" + }, + "mustache_template": { + "dependency": "direct main", + "description": { + "name": "mustache_template", + "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "native_assets_builder": { + "dependency": "direct main", + "description": { + "name": "native_assets_builder", + "sha256": "3368f3eda23d59e98c8eadeafe609feb3bf6c342e5885796d6eceadc3d4581f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.2" + }, + "native_assets_cli": { + "dependency": "direct main", + "description": { + "name": "native_assets_cli", + "sha256": "1ff032c0ca050391c4c5107485f1a26e0e95cee18d1fdb2b7bdbb990efd3c188", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.3" + }, + "native_stack_traces": { + "dependency": "direct main", + "description": { + "name": "native_stack_traces", + "sha256": "8ba566c10ea781491c203876b04b9bdcf19dfbe17b9e486869f20eaae0ee470f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.0" + }, + "node_preamble": { + "dependency": "direct main", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "package_config": { + "dependency": "direct main", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "petitparser": { + "dependency": "direct main", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "platform": { + "dependency": "direct main", + "description": { + "name": "platform", + "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.5" + }, + "pool": { + "dependency": "direct main", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "process": { + "dependency": "direct main", + "description": { + "name": "process", + "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.2" + }, + "pub_semver": { + "dependency": "direct main", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "pubspec_parse": { + "dependency": "direct dev", + "description": { + "name": "pubspec_parse", + "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "shelf": { + "dependency": "direct main", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_packages_handler": { + "dependency": "direct main", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_proxy": { + "dependency": "direct main", + "description": { + "name": "shelf_proxy", + "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "shelf_static": { + "dependency": "direct main", + "description": { + "name": "shelf_static", + "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "shelf_web_socket": { + "dependency": "direct main", + "description": { + "name": "shelf_web_socket", + "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "source_map_stack_trace": { + "dependency": "direct main", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "direct main", + "description": { + "name": "source_maps", + "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.12" + }, + "source_span": { + "dependency": "direct main", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "sprintf": { + "dependency": "direct main", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "sse": { + "dependency": "direct main", + "description": { + "name": "sse", + "sha256": "111a05843ea9035042975744fe61d5e8b95bc4d38656dbafc5532da77a0bb89a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.6" + }, + "stack_trace": { + "dependency": "direct main", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "standard_message_codec": { + "dependency": "direct main", + "description": { + "name": "standard_message_codec", + "sha256": "fc7dd712d191b7e33196a0ecf354c4573492bb95995e7166cb6f73b047f9cae0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.1+4" + }, + "stream_channel": { + "dependency": "direct main", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "string_scanner": { + "dependency": "direct main", + "description": { + "name": "string_scanner", + "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "sync_http": { + "dependency": "direct main", + "description": { + "name": "sync_http", + "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "term_glyph": { + "dependency": "direct main", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test": { + "dependency": "direct main", + "description": { + "name": "test", + "sha256": "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.25.8" + }, + "test_api": { + "dependency": "direct main", + "description": { + "name": "test_api", + "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.3" + }, + "test_core": { + "dependency": "direct main", + "description": { + "name": "test_core", + "sha256": "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.5" + }, + "typed_data": { + "dependency": "direct main", + "description": { + "name": "typed_data", + "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "unified_analytics": { + "dependency": "direct main", + "description": { + "name": "unified_analytics", + "sha256": "916215af2dc2f54a204c6bfbc645ec401b6a150048764814379f42e09b557d2d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.2" + }, + "usage": { + "dependency": "direct main", + "description": { + "name": "usage", + "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "uuid": { + "dependency": "direct main", + "description": { + "name": "uuid", + "sha256": "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.4.2" + }, + "vm_service": { + "dependency": "direct main", + "description": { + "name": "vm_service", + "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.5" + }, + "vm_service_interface": { + "dependency": "direct main", + "description": { + "name": "vm_service_interface", + "sha256": "f827453d9a3f8ceae04e389810da26f9b67636bdd13aa2dd9405b110c4daf59c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "vm_snapshot_analysis": { + "dependency": "direct main", + "description": { + "name": "vm_snapshot_analysis", + "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.6" + }, + "watcher": { + "dependency": "direct main", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web": { + "dependency": "direct main", + "description": { + "name": "web", + "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "web_socket": { + "dependency": "direct main", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "web_socket_channel": { + "dependency": "direct main", + "description": { + "name": "web_socket_channel", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "webdriver": { + "dependency": "direct main", + "description": { + "name": "webdriver", + "sha256": "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "webkit_inspection_protocol": { + "dependency": "direct main", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "xml": { + "dependency": "direct main", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "direct main", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "yaml_edit": { + "dependency": "direct main", + "description": { + "name": "yaml_edit", + "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + } + }, + "sdks": { + "dart": ">=3.4.3 <4.0.0" + } + } +} diff --git a/pkgs/development/compilers/flutter/versions/3_13/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/versions/3_26/patches/deregister-pub-dependencies-artifact.patch index 01e34c6d292c..01e34c6d292c 100644 --- a/pkgs/development/compilers/flutter/versions/3_13/patches/deregister-pub-dependencies-artifact.patch +++ b/pkgs/development/compilers/flutter/versions/3_26/patches/deregister-pub-dependencies-artifact.patch diff --git a/pkgs/development/compilers/flutter/versions/3_26/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_26/patches/disable-auto-update.patch new file mode 100644 index 000000000000..2ad292efd222 --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_26/patches/disable-auto-update.patch @@ -0,0 +1,30 @@ +diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart +index e4e474ab6e..5548599802 100644 +--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart ++++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart +@@ -1693,7 +1693,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and + + // Populate the cache. We call this before pub get below so that the + // sky_engine package is available in the flutter cache for pub to find. +- if (shouldUpdateCache) { ++ if (false) { + // First always update universal artifacts, as some of these (e.g. + // ios-deploy on macOS) are required to determine `requiredArtifacts`. + final bool offline; +diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +index 50783f8435..db94062840 100644 +--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart ++++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +@@ -377,11 +377,7 @@ class FlutterCommandRunner extends CommandRunner<void> { + globals.analytics.suppressTelemetry(); + } + +- globals.flutterVersion.ensureVersionFile(); + final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; +- if (await _shouldCheckForUpdates(topLevelResults, topLevelMachineFlag: machineFlag)) { +- await globals.flutterVersion.checkFlutterVersionFreshness(); +- } + + // See if the user specified a specific device. + final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; + diff --git a/pkgs/development/compilers/flutter/versions/3_26/patches/fix-ios-build-xcode-backend-sh.patch b/pkgs/development/compilers/flutter/versions/3_26/patches/fix-ios-build-xcode-backend-sh.patch new file mode 100644 index 000000000000..825d40fc6176 --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_26/patches/fix-ios-build-xcode-backend-sh.patch @@ -0,0 +1,69 @@ +From 6df275df3b8694daf16302b407520e3b1dee6724 Mon Sep 17 00:00:00 2001 +From: Philip Hayes <philiphayes9@gmail.com> +Date: Thu, 12 Sep 2024 13:23:00 -0700 +Subject: [PATCH] fix: cleanup xcode_backend.sh to fix iOS build w/ + `NixOS/nixpkgs` flutter + +This patch cleans up `xcode_backend.sh`. It now effectively just runs +`exec $FLUTTER_ROOT/bin/dart ./xcode_backend.dart`. + +The previous `xcode_backend.sh` tries to discover `$FLUTTER_ROOT` from +argv[0], even though its presence is already guaranteed (the wrapped +`xcode_backend.dart` also relies on this env). + +When using nixpkgs flutter, the flutter SDK directory is composed of several +layers, joined together using symlinks (called a `symlinkJoin`). Without this +patch, the auto-discover traverses the symlinks into the wrong layer, and so it +uses an "unwrapped" `dart` command instead of a "wrapped" dart that sets some +important envs/flags (like `$FLUTTER_ROOT`). + +Using the "unwrapped" dart then manifests in this error when compiling, since +it doesn't see the ios build-support artifacts: + +``` +$ flutter run -d iphone +Running Xcode build... +Xcode build done. 6.4s +Failed to build iOS app +Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "/<nix-store>/XXXX-flutter-3.24.1-unwrapped/bin/cache/artifacts". +``` +--- + packages/flutter_tools/bin/xcode_backend.sh | 25 ++++----------------- + 1 file changed, 4 insertions(+), 21 deletions(-) + +diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh +index 2889d7c8e4..48b9d06c6e 100755 +--- a/packages/flutter_tools/bin/xcode_backend.sh ++++ b/packages/flutter_tools/bin/xcode_backend.sh +@@ -6,24 +6,7 @@ + # exit on error, or usage of unset var + set -euo pipefail + +-# Needed because if it is set, cd may print the path it changed to. +-unset CDPATH +- +-function follow_links() ( +- cd -P "$(dirname -- "$1")" +- file="$PWD/$(basename -- "$1")" +- while [[ -h "$file" ]]; do +- cd -P "$(dirname -- "$file")" +- file="$(readlink -- "$file")" +- cd -P "$(dirname -- "$file")" +- file="$PWD/$(basename -- "$file")" +- done +- echo "$file" +-) +- +-PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")" +-BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" +-FLUTTER_ROOT="$BIN_DIR/../../.." +-DART="$FLUTTER_ROOT/bin/dart" +- +-"$DART" "$BIN_DIR/xcode_backend.dart" "$@" ++# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT. ++dart="${FLUTTER_ROOT}/bin/dart" ++xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart" ++exec "${dart}" "${xcode_backend_dart}" "$@" +-- +2.46.0 + diff --git a/pkgs/development/compilers/flutter/versions/3_22/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_26/patches/gradle-flutter-tools-wrapper.patch index de6080efbba8..de6080efbba8 100644 --- a/pkgs/development/compilers/flutter/versions/3_22/patches/gradle-flutter-tools-wrapper.patch +++ b/pkgs/development/compilers/flutter/versions/3_26/patches/gradle-flutter-tools-wrapper.patch diff --git a/pkgs/development/compilers/flutter/versions/3_27/data.json b/pkgs/development/compilers/flutter/versions/3_27/data.json new file mode 100644 index 000000000000..04e89fdfdc05 --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_27/data.json @@ -0,0 +1,1056 @@ +{ + "version": "3.27.0-0.1.pre", + "engineVersion": "af0f0d559c8a87d912a20971bbd84afc80a54b0f", + "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=", + "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", + "channel": "beta", + "engineHashes": { + "aarch64-linux": { + "aarch64-linux": "sha256-xEUUengFzRbQhFB7jxTBd8eTMWUhyBTTKyT/ObuyD/o=", + "x86_64-linux": "sha256-xEUUengFzRbQhFB7jxTBd8eTMWUhyBTTKyT/ObuyD/o=" + }, + "x86_64-linux": { + "aarch64-linux": "sha256-xEUUengFzRbQhFB7jxTBd8eTMWUhyBTTKyT/ObuyD/o=", + "x86_64-linux": "sha256-xEUUengFzRbQhFB7jxTBd8eTMWUhyBTTKyT/ObuyD/o=" + } + }, + "dartVersion": "3.6.0-334.3.beta", + "dartHash": { + "x86_64-linux": "sha256-xErMxL9HK+MSq++DcSiV95TInMPvKkc9tqQzzMRPYDU=", + "aarch64-linux": "sha256-1grsqBcTmfRlMMTB1rWHVVyzZS2RLA10AADkrV4kk9I=", + "x86_64-darwin": "sha256-4YwpUjyFXTk6/h5OMbOKwd0gTEX0CmHo0TByVs0milA=", + "aarch64-darwin": "sha256-bp2tSs+JDSj3xqurc2NOOfmhbq7u/meFbA7VZPNAyZ8=" + }, + "flutterHash": "sha256-M9zETok2sIJP8V8QlvbQdobhnM0QM6OHiHF5mwUosB4=", + "artifactHashes": { + "android": { + "aarch64-darwin": "sha256-U29WM+8wPYmBifPWXS4TNdZM2ORsFzhV73B82RAH2TU=", + "aarch64-linux": "sha256-ABHHLnhJIqm4mT9FLMaMjJzecDgh6rLUJpVIuVqfUZg=", + "x86_64-darwin": "sha256-U29WM+8wPYmBifPWXS4TNdZM2ORsFzhV73B82RAH2TU=", + "x86_64-linux": "sha256-ABHHLnhJIqm4mT9FLMaMjJzecDgh6rLUJpVIuVqfUZg=" + }, + "fuchsia": { + "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", + "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", + "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", + "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" + }, + "ios": { + "aarch64-darwin": "sha256-7faP4+NeYI79nUjts0UPcmWBI4R/CtGOSdhbozrMvYg=", + "aarch64-linux": "sha256-7faP4+NeYI79nUjts0UPcmWBI4R/CtGOSdhbozrMvYg=", + "x86_64-darwin": "sha256-7faP4+NeYI79nUjts0UPcmWBI4R/CtGOSdhbozrMvYg=", + "x86_64-linux": "sha256-7faP4+NeYI79nUjts0UPcmWBI4R/CtGOSdhbozrMvYg=" + }, + "linux": { + "aarch64-darwin": "sha256-bKyDwhYmbpcOa8Uk68+VP1KNpsbDPFqA95TeO/0oiNk=", + "aarch64-linux": "sha256-bKyDwhYmbpcOa8Uk68+VP1KNpsbDPFqA95TeO/0oiNk=", + "x86_64-darwin": "sha256-BCGsqIRYtAACYoBsLlV7m5J1P+M8Kyl9tUNj2jql/q4=", + "x86_64-linux": "sha256-BCGsqIRYtAACYoBsLlV7m5J1P+M8Kyl9tUNj2jql/q4=" + }, + "macos": { + "aarch64-darwin": "sha256-vYzob2BxI2Ol/H/K6/D8y9mx07PnDzbaZvZe/ukkVqk=", + "aarch64-linux": "sha256-vYzob2BxI2Ol/H/K6/D8y9mx07PnDzbaZvZe/ukkVqk=", + "x86_64-darwin": "sha256-vYzob2BxI2Ol/H/K6/D8y9mx07PnDzbaZvZe/ukkVqk=", + "x86_64-linux": "sha256-vYzob2BxI2Ol/H/K6/D8y9mx07PnDzbaZvZe/ukkVqk=" + }, + "universal": { + "aarch64-darwin": "sha256-s6v1V/Xjt8OZgbjQLrSx+1NTKG9YpTpydQxtvmu3Bo8=", + "aarch64-linux": "sha256-KmwJH7uDLbdGQQsUhdTjjwuGB39cX7db5PncSQVbJ5U=", + "x86_64-darwin": "sha256-iL7+1bwMolQWWWLuXxfnBJWayEGk/KtDnXh+oHpBaZg=", + "x86_64-linux": "sha256-0oE3278pTid3n6zVXVxXV+nEzffCs2R1vzS61c76P5g=" + }, + "web": { + "aarch64-darwin": "sha256-jpT7q3iHqM0mXRNRgKeLJMA9P5c3P8Qg2m5EwnjtlKg=", + "aarch64-linux": "sha256-jpT7q3iHqM0mXRNRgKeLJMA9P5c3P8Qg2m5EwnjtlKg=", + "x86_64-darwin": "sha256-jpT7q3iHqM0mXRNRgKeLJMA9P5c3P8Qg2m5EwnjtlKg=", + "x86_64-linux": "sha256-jpT7q3iHqM0mXRNRgKeLJMA9P5c3P8Qg2m5EwnjtlKg=" + }, + "windows": { + "x86_64-darwin": "sha256-LJxwZd/lDtrIMfLrMgG+/KOIAlGpW+b/EebMIngIq3w=", + "x86_64-linux": "sha256-LJxwZd/lDtrIMfLrMgG+/KOIAlGpW+b/EebMIngIq3w=" + } + }, + "pubspecLock": { + "packages": { + "_fe_analyzer_shared": { + "dependency": "direct main", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "f6dbf021f4b214d85c79822912c5fcd142a2c4869f01222ad371bc51f9f1c356", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "74.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.3" + }, + "analyzer": { + "dependency": "direct main", + "description": { + "name": "analyzer", + "sha256": "f7e8caf82f2d3190881d81012606effdf8a38e6c1ab9e30947149733065f817c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.9.0" + }, + "archive": { + "dependency": "direct main", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "direct main", + "description": { + "name": "args", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "async": { + "dependency": "direct main", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "boolean_selector": { + "dependency": "direct main", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "browser_launcher": { + "dependency": "direct main", + "description": { + "name": "browser_launcher", + "sha256": "54a2da4d152c34760b87cbd4a9fe8a563379487e57bfcd1b387be394dfa91734", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "built_collection": { + "dependency": "direct main", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "direct main", + "description": { + "name": "built_value", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.2" + }, + "checked_yaml": { + "dependency": "direct dev", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_config": { + "dependency": "direct main", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "clock": { + "dependency": "direct main", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "collection": { + "dependency": "direct dev", + "description": { + "name": "collection", + "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.0" + }, + "completion": { + "dependency": "direct main", + "description": { + "name": "completion", + "sha256": "f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "convert": { + "dependency": "direct main", + "description": { + "name": "convert", + "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "coverage": { + "dependency": "direct main", + "description": { + "name": "coverage", + "sha256": "c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.2" + }, + "crypto": { + "dependency": "direct main", + "description": { + "name": "crypto", + "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "csslib": { + "dependency": "direct main", + "description": { + "name": "csslib", + "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "dap": { + "dependency": "direct main", + "description": { + "name": "dap", + "sha256": "c0e53b52c9529d901329045afc4c5acb04304a28acde4b54ab0a08a93da546aa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "dds": { + "dependency": "direct main", + "description": { + "name": "dds", + "sha256": "c90723eb1f1402429c57f717550ce5af80288d74a27c45ccbe754a0e3e038f95", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.7" + }, + "dds_service_extensions": { + "dependency": "direct main", + "description": { + "name": "dds_service_extensions", + "sha256": "390ae1d0128bb43ffe11f8e3c6cd3a481c1920492d1026883d379cee50bdf1a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "devtools_shared": { + "dependency": "direct main", + "description": { + "name": "devtools_shared", + "sha256": "72369878105eccd563547afbad97407a2431b96bd4c04a1d6da75cb068437f50", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.2" + }, + "dtd": { + "dependency": "direct main", + "description": { + "name": "dtd", + "sha256": "6e4e508c0d03e12e2c96f21faa0e5acc191f9431ecd02adb8daee64dbfae6b86", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "dwds": { + "dependency": "direct main", + "description": { + "name": "dwds", + "sha256": "d0cf9d18511df6b397c40527f3fd8ddb47b7efcc501e703dd94f13cabaf82ffc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "24.1.0" + }, + "extension_discovery": { + "dependency": "direct main", + "description": { + "name": "extension_discovery", + "sha256": "de1fce715ab013cdfb00befc3bdf0914bea5e409c3a567b7f8f144bc061611a7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "fake_async": { + "dependency": "direct main", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "ffi": { + "dependency": "direct main", + "description": { + "name": "ffi", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "file": { + "dependency": "direct main", + "description": { + "name": "file", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "file_testing": { + "dependency": "direct dev", + "description": { + "name": "file_testing", + "sha256": "0aaadb4025bd350403f4308ad6c4cea953278d9407814b8342558e4946840fb5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "fixnum": { + "dependency": "direct main", + "description": { + "name": "fixnum", + "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "flutter_template_images": { + "dependency": "direct main", + "description": { + "name": "flutter_template_images", + "sha256": "fd3e55af73c577b9e3f88d4080d3e366cb5c8ef3fbd50b94dfeca56bb0235df6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "frontend_server_client": { + "dependency": "direct main", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "glob": { + "dependency": "direct main", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "graphs": { + "dependency": "direct main", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "html": { + "dependency": "direct main", + "description": { + "name": "html", + "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.4" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "http_multi_server": { + "dependency": "direct main", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "direct main", + "description": { + "name": "http_parser", + "sha256": "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "direct main", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "js": { + "dependency": "direct main", + "description": { + "name": "js", + "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.1" + }, + "json_annotation": { + "dependency": "direct dev", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "json_rpc_2": { + "dependency": "direct main", + "description": { + "name": "json_rpc_2", + "sha256": "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "logging": { + "dependency": "direct main", + "description": { + "name": "logging", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3-main.0" + }, + "matcher": { + "dependency": "direct main", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "meta": { + "dependency": "direct main", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "mime": { + "dependency": "direct main", + "description": { + "name": "mime", + "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.6" + }, + "multicast_dns": { + "dependency": "direct main", + "description": { + "name": "multicast_dns", + "sha256": "982c4cc4cda5f98dd477bddfd623e8e4bd1014e7dbf9e7b05052e14a5b550b99", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.2+7" + }, + "mustache_template": { + "dependency": "direct main", + "description": { + "name": "mustache_template", + "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "native_assets_builder": { + "dependency": "direct main", + "description": { + "name": "native_assets_builder", + "sha256": "ad76e66cc1ca7aa922d682651aee2663cd80e6ba483a346d13a8c40f604ebfd9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.3" + }, + "native_assets_cli": { + "dependency": "direct main", + "description": { + "name": "native_assets_cli", + "sha256": "db902509468ec2a6c6d11fa9ce02805ede280e8dbfb5f0014ef3de8483cadfce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.0" + }, + "native_stack_traces": { + "dependency": "direct main", + "description": { + "name": "native_stack_traces", + "sha256": "8ba566c10ea781491c203876b04b9bdcf19dfbe17b9e486869f20eaae0ee470f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.0" + }, + "node_preamble": { + "dependency": "direct main", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "package_config": { + "dependency": "direct main", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "petitparser": { + "dependency": "direct main", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "platform": { + "dependency": "direct main", + "description": { + "name": "platform", + "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.5" + }, + "pool": { + "dependency": "direct main", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "process": { + "dependency": "direct main", + "description": { + "name": "process", + "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.2" + }, + "pub_semver": { + "dependency": "direct main", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "pubspec_parse": { + "dependency": "direct dev", + "description": { + "name": "pubspec_parse", + "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "shelf": { + "dependency": "direct main", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_packages_handler": { + "dependency": "direct main", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_proxy": { + "dependency": "direct main", + "description": { + "name": "shelf_proxy", + "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "shelf_static": { + "dependency": "direct main", + "description": { + "name": "shelf_static", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "shelf_web_socket": { + "dependency": "direct main", + "description": { + "name": "shelf_web_socket", + "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "source_map_stack_trace": { + "dependency": "direct main", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "direct main", + "description": { + "name": "source_maps", + "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.12" + }, + "source_span": { + "dependency": "direct main", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "sprintf": { + "dependency": "direct main", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "sse": { + "dependency": "direct main", + "description": { + "name": "sse", + "sha256": "111a05843ea9035042975744fe61d5e8b95bc4d38656dbafc5532da77a0bb89a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.6" + }, + "stack_trace": { + "dependency": "direct main", + "description": { + "name": "stack_trace", + "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.0" + }, + "standard_message_codec": { + "dependency": "direct main", + "description": { + "name": "standard_message_codec", + "sha256": "fc7dd712d191b7e33196a0ecf354c4573492bb95995e7166cb6f73b047f9cae0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.1+4" + }, + "stream_channel": { + "dependency": "direct main", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "string_scanner": { + "dependency": "direct main", + "description": { + "name": "string_scanner", + "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "sync_http": { + "dependency": "direct main", + "description": { + "name": "sync_http", + "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "term_glyph": { + "dependency": "direct main", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test": { + "dependency": "direct main", + "description": { + "name": "test", + "sha256": "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.25.8" + }, + "test_api": { + "dependency": "direct main", + "description": { + "name": "test_api", + "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.3" + }, + "test_core": { + "dependency": "direct main", + "description": { + "name": "test_core", + "sha256": "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.5" + }, + "typed_data": { + "dependency": "direct main", + "description": { + "name": "typed_data", + "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "unified_analytics": { + "dependency": "direct main", + "description": { + "name": "unified_analytics", + "sha256": "9f3c68cb30faa6d05b920498d2af79eace00fef0bae9beba9f3cda84fdbe46df", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.4" + }, + "usage": { + "dependency": "direct main", + "description": { + "name": "usage", + "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "uuid": { + "dependency": "direct main", + "description": { + "name": "uuid", + "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.1" + }, + "vm_service": { + "dependency": "direct main", + "description": { + "name": "vm_service", + "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.3.0" + }, + "vm_service_interface": { + "dependency": "direct main", + "description": { + "name": "vm_service_interface", + "sha256": "f827453d9a3f8ceae04e389810da26f9b67636bdd13aa2dd9405b110c4daf59c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "vm_snapshot_analysis": { + "dependency": "direct main", + "description": { + "name": "vm_snapshot_analysis", + "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.6" + }, + "watcher": { + "dependency": "direct main", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web": { + "dependency": "direct main", + "description": { + "name": "web", + "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web_socket": { + "dependency": "direct main", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "web_socket_channel": { + "dependency": "direct main", + "description": { + "name": "web_socket_channel", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "webdriver": { + "dependency": "direct main", + "description": { + "name": "webdriver", + "sha256": "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.4" + }, + "webkit_inspection_protocol": { + "dependency": "direct main", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "xml": { + "dependency": "direct main", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "direct main", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "yaml_edit": { + "dependency": "direct main", + "description": { + "name": "yaml_edit", + "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + } + }, + "sdks": { + "dart": ">=3.4.3 <4.0.0" + } + } +} diff --git a/pkgs/development/compilers/flutter/versions/3_16/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/deregister-pub-dependencies-artifact.patch index 01e34c6d292c..01e34c6d292c 100644 --- a/pkgs/development/compilers/flutter/versions/3_16/patches/deregister-pub-dependencies-artifact.patch +++ b/pkgs/development/compilers/flutter/versions/3_27/patches/deregister-pub-dependencies-artifact.patch diff --git a/pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch new file mode 100644 index 000000000000..2ad292efd222 --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch @@ -0,0 +1,30 @@ +diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart +index e4e474ab6e..5548599802 100644 +--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart ++++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart +@@ -1693,7 +1693,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and + + // Populate the cache. We call this before pub get below so that the + // sky_engine package is available in the flutter cache for pub to find. +- if (shouldUpdateCache) { ++ if (false) { + // First always update universal artifacts, as some of these (e.g. + // ios-deploy on macOS) are required to determine `requiredArtifacts`. + final bool offline; +diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +index 50783f8435..db94062840 100644 +--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart ++++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +@@ -377,11 +377,7 @@ class FlutterCommandRunner extends CommandRunner<void> { + globals.analytics.suppressTelemetry(); + } + +- globals.flutterVersion.ensureVersionFile(); + final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; +- if (await _shouldCheckForUpdates(topLevelResults, topLevelMachineFlag: machineFlag)) { +- await globals.flutterVersion.checkFlutterVersionFreshness(); +- } + + // See if the user specified a specific device. + final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; + diff --git a/pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch new file mode 100644 index 000000000000..825d40fc6176 --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch @@ -0,0 +1,69 @@ +From 6df275df3b8694daf16302b407520e3b1dee6724 Mon Sep 17 00:00:00 2001 +From: Philip Hayes <philiphayes9@gmail.com> +Date: Thu, 12 Sep 2024 13:23:00 -0700 +Subject: [PATCH] fix: cleanup xcode_backend.sh to fix iOS build w/ + `NixOS/nixpkgs` flutter + +This patch cleans up `xcode_backend.sh`. It now effectively just runs +`exec $FLUTTER_ROOT/bin/dart ./xcode_backend.dart`. + +The previous `xcode_backend.sh` tries to discover `$FLUTTER_ROOT` from +argv[0], even though its presence is already guaranteed (the wrapped +`xcode_backend.dart` also relies on this env). + +When using nixpkgs flutter, the flutter SDK directory is composed of several +layers, joined together using symlinks (called a `symlinkJoin`). Without this +patch, the auto-discover traverses the symlinks into the wrong layer, and so it +uses an "unwrapped" `dart` command instead of a "wrapped" dart that sets some +important envs/flags (like `$FLUTTER_ROOT`). + +Using the "unwrapped" dart then manifests in this error when compiling, since +it doesn't see the ios build-support artifacts: + +``` +$ flutter run -d iphone +Running Xcode build... +Xcode build done. 6.4s +Failed to build iOS app +Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "/<nix-store>/XXXX-flutter-3.24.1-unwrapped/bin/cache/artifacts". +``` +--- + packages/flutter_tools/bin/xcode_backend.sh | 25 ++++----------------- + 1 file changed, 4 insertions(+), 21 deletions(-) + +diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh +index 2889d7c8e4..48b9d06c6e 100755 +--- a/packages/flutter_tools/bin/xcode_backend.sh ++++ b/packages/flutter_tools/bin/xcode_backend.sh +@@ -6,24 +6,7 @@ + # exit on error, or usage of unset var + set -euo pipefail + +-# Needed because if it is set, cd may print the path it changed to. +-unset CDPATH +- +-function follow_links() ( +- cd -P "$(dirname -- "$1")" +- file="$PWD/$(basename -- "$1")" +- while [[ -h "$file" ]]; do +- cd -P "$(dirname -- "$file")" +- file="$(readlink -- "$file")" +- cd -P "$(dirname -- "$file")" +- file="$PWD/$(basename -- "$file")" +- done +- echo "$file" +-) +- +-PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")" +-BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" +-FLUTTER_ROOT="$BIN_DIR/../../.." +-DART="$FLUTTER_ROOT/bin/dart" +- +-"$DART" "$BIN_DIR/xcode_backend.dart" "$@" ++# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT. ++dart="${FLUTTER_ROOT}/bin/dart" ++xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart" ++exec "${dart}" "${xcode_backend_dart}" "$@" +-- +2.46.0 + diff --git a/pkgs/development/compilers/flutter/versions/3_23/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/gradle-flutter-tools-wrapper.patch index de6080efbba8..de6080efbba8 100644 --- a/pkgs/development/compilers/flutter/versions/3_23/patches/gradle-flutter-tools-wrapper.patch +++ b/pkgs/development/compilers/flutter/versions/3_27/patches/gradle-flutter-tools-wrapper.patch diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index 2c1b1ea125c8..9b4123b0e7d9 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -146,7 +146,8 @@ in '' + lib.optionalString (flutter ? engine && flutter.engine.meta.available) '' --set-default FLUTTER_ENGINE "${flutter.engine}" \ --add-flags "--local-engine-host ${flutter.engine.outName}" \ - '' + '' --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \ + '' + '' + --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \ --suffix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \ --suffix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \ --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCxxFlags)}' \ diff --git a/pkgs/development/compilers/flux/default.nix b/pkgs/development/compilers/flux/default.nix deleted file mode 100644 index 6b5620774d3b..000000000000 --- a/pkgs/development/compilers/flux/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config }: - -stdenv.mkDerivation rec { - pname = "flux"; - version = "2013-09-20"; - - src = fetchFromGitHub { - owner = "deniskropp"; - repo = pname; - rev = "e45758aa9384b9740ff021ea952399fd113eb0e9"; - sha256 = "11f3ypg0sdq5kj69zgz6kih1yrzgm48r16spyvzwvlswng147410"; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - meta = with lib; { - description = "Interface description language used by DirectFB"; - mainProgram = "fluxcomp"; - homepage = "https://github.com/deniskropp/flux"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix index e4c8a2358fc8..6f8acae7f916 100644 --- a/pkgs/development/compilers/fpc/binary.nix +++ b/pkgs/development/compilers/fpc/binary.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.aarch64-linux.tar"; sha256 = "b39470f9b6b5b82f50fc8680a5da37d2834f2129c65c24c5628a80894d565451"; } - else if stdenv.isDarwin then + else if stdenv.hostPlatform.isDarwin then fetchurl { url = "mirror://sourceforge/project/freepascal/Mac%20OS%20X/${version}/fpc-${version}.intelarm64-macosx.dmg"; sha256 = "05d4510c8c887e3c68de20272abf62171aa5b2ef1eba6bce25e4c0bc41ba8b7d"; diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index 3c9eb60d57c7..70f3b60efb8d 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ startFPC gawk ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreFoundation ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # Patch paths for linux systems. Other platforms will need their own patches. patches = [ ./mark-paths.patch # mark paths for later substitution in postPatch - ] ++ lib.optional stdenv.isAarch64 (fetchpatch { + ] ++ lib.optional stdenv.hostPlatform.isAarch64 (fetchpatch { # backport upstream patch for aarch64 glibc 2.34 url = "https://gitlab.com/freepascal.org/fpc/source/-/commit/a20a7e3497bccf3415bf47ccc55f133eb9d6d6a0.patch"; hash = "sha256-xKTBwuOxOwX9KCazQbBNLhMXCqkuJgIFvlXewHY63GM="; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; NIX_LDFLAGS = lib.optionalString - stdenv.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); + stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); makeFlags = [ "NOGDB=1" "FPC=${startFPC}/bin/fpc" ]; diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index ba2eeada5e46..4cd1dd9ab2f0 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { LCL_PLATFORM = if withQt then "qt5" else "gtk2"; NIX_LDFLAGS = lib.concatStringsSep " " ([ - "-L${stdenv.cc.cc.lib}/lib" + "-L${lib.getLib stdenv.cc.cc}/lib" "-lX11" "-lXext" "-lXi" diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix deleted file mode 100644 index d141c6f5d4c5..000000000000 --- a/pkgs/development/compilers/fsharp/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -# Temporarily avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it - -{ lib, stdenv, fetchFromGitHub, mono, pkg-config, dotnetbuildhelpers, autoconf, automake, which }: - -stdenv.mkDerivation rec { - pname = "fsharp"; - version = "4.0.1.1"; - - src = fetchFromGitHub { - owner = "fsharp"; - repo = "fsharp"; - rev = version; - sha256 = "sha256-dgTEM2aL8lVjVMuW0+HLc+TUA39IiuBv/RfHYNURh5s="; - }; - - nativeBuildInputs = [ pkg-config autoconf automake ]; - buildInputs = [ mono dotnetbuildhelpers which ]; - - configurePhase = '' - sed -i '988d' src/FSharpSource.targets - substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "${stdenv.shell}" - ./autogen.sh --prefix $out - ''; - - # Make sure the executables use the right mono binary, - # and set up some symlinks for backwards compatibility. - postInstall = '' - substituteInPlace $out/bin/fsharpc --replace " mono " " ${mono}/bin/mono " - substituteInPlace $out/bin/fsharpi --replace " mono " " ${mono}/bin/mono " - substituteInPlace $out/bin/fsharpiAnyCpu --replace " mono " " ${mono}/bin/mono " - ln -s $out/bin/fsharpc $out/bin/fsc - ln -s $out/bin/fsharpi $out/bin/fsi - for dll in "$out/lib/mono/4.5"/FSharp*.dll - do - create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll" - done - ''; - - # To fix this error when running: - # The file "/nix/store/path/whatever.exe" is an not a valid CIL image - dontStrip = true; - - meta = { - description = "Functional CLI language"; - homepage = "https://fsharp.org/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ thoughtpolice raskin ]; - platforms = with lib.platforms; unix; - }; -} diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index 05d92d434faf..78c98fe50f21 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -78,9 +78,9 @@ gccStdenv.mkDerivation rec { ] ++ gambit-params.extraOptions # TODO: pick an appropriate architecture to optimize on on x86-64? # https://gcc.gnu.org/onlinedocs/gcc-4.8.4/gcc/i386-and-x86-64-Options.html#i386-and-x86-64-Options - # ++ lib.optional pkgs.stdenv.isx86_64 "--enable-march=core-avx2" + # ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "--enable-march=core-avx2" # Do not enable poll on darwin due to https://github.com/gambit/gambit/issues/498 - ++ lib.optional (!gccStdenv.isDarwin) "--enable-poll"; + ++ lib.optional (!gccStdenv.hostPlatform.isDarwin) "--enable-poll"; configurePhase = '' export CC=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc \ @@ -97,7 +97,7 @@ gccStdenv.mkDerivation rec { # OS-specific paths are hardcoded in ./configure substituteInPlace config.status \ - ${lib.optionalString (gccStdenv.isDarwin && !gambit-params.stable) + ${lib.optionalString (gccStdenv.hostPlatform.isDarwin && !gambit-params.stable) ''--replace "/usr/local/opt/openssl@1.1" "${lib.getLib openssl}"''} \ --replace "/usr/local/opt/openssl" "${lib.getLib openssl}" diff --git a/pkgs/development/compilers/gavrasm/default.nix b/pkgs/development/compilers/gavrasm/default.nix deleted file mode 100644 index d77ff0b8e6aa..000000000000 --- a/pkgs/development/compilers/gavrasm/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchzip, fpc , lang ? "en" } : - -assert lib.assertOneOf "lang" lang ["cn" "de" "en" "fr" "tr"]; - -stdenv.mkDerivation rec { - pname = "gavrasm"; - version = "5.4"; - flatVersion = lib.strings.replaceStrings ["."] [""] version; - - src = fetchzip { - url = "http://www.avr-asm-tutorial.net/gavrasm/v${flatVersion}/gavrasm_sources_lin_${flatVersion}.zip"; - sha256 = "sha256-uTalb8Wzn2RAoUKZx9RZFCX+V9HUEtUnJ4eSltFumh0="; - stripRoot=false; - }; - - nativeBuildInputs = [ fpc ]; - - configurePhase = '' - runHook preConfigure - cp gavrlang_${lang}.pas gavrlang.pas - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - fpc gavrasm.pas - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - cp gavrasm $out/bin - mkdir -p $out/doc - cp instr.asm $out/doc - cp ReadMe.Txt $out/doc - cp LiesMich.Txt $out/doc - runHook postInstall - ''; - - meta = with lib; { - homepage = "http://www.avr-asm-tutorial.net/gavrasm/"; - description = "AVR Assembler for ATMEL AVR-Processors"; - license = licenses.unfree; - maintainers = with maintainers; [ mafo ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/compilers/gbforth/default.nix b/pkgs/development/compilers/gbforth/default.nix deleted file mode 100644 index 22c559a97350..000000000000 --- a/pkgs/development/compilers/gbforth/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, makeWrapper -, gforth -}: - -stdenv.mkDerivation { - pname = "gbforth"; - version = "unstable-2023-03-02"; - - src = fetchFromGitHub { - owner = "ams-hackers"; - repo = "gbforth"; - rev = "428fcf5054fe301e90ac74b1d920ee3ecc375b5b"; - hash = "sha256-v1bdwT15Wg1VKpo74Cc3tsTl1uOKvKdlHWtbZkJ/qbA="; - }; - - nativeBuildInputs = [ - makeWrapper - ]; - - dontBuild = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gbforth $out/bin - cp -r lib shared src gbforth.fs $out/share/gbforth/ - makeWrapper ${gforth}/bin/gforth $out/bin/gbforth \ - --set GBFORTH_PATH $out/share/gbforth/lib \ - --add-flags $out/share/gbforth/gbforth.fs - runHook postInstall - ''; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/gbforth examples/simon/simon.fs - runHook postInstallCheck - ''; - - meta = with lib; { - homepage = "https://gbforth.org/"; - description = "Forth-based Game Boy development kit"; - mainProgram = "gbforth"; - longDescription = '' - A Forth-based Game Boy development kit. - It features a Forth-based assembler, a cross-compiler with support for - lazy code generation and a library of useful words. - ''; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ fgaz ]; - }; -} diff --git a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix deleted file mode 100644 index ad690cb26fa2..000000000000 --- a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ncurses5 -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "10.3.1"; - release = "10.3-2021.10"; - - suffix = { - aarch64-linux = "aarch64-linux"; - x86_64-darwin = "mac"; - x86_64-linux = "x86_64-linux"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${release}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; - sha256 = { - aarch64-linux = "020j8gkzc0i0b74vz98gvngnwjm5222j1gk5nswfk6587krba1gn"; - x86_64-darwin = "0fr8pki2g4bfk1rk90dzwql37d0b71ngzs9zyx0g2jainan3sqgv"; - x86_64-linux = "18y92vpl22hf74yqdvmpw8adrkl92s4crzzs6avm05md37qb9nwp"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = with maintainers; [ prusnak prtzl ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix b/pkgs/development/compilers/gcc-arm-embedded/11/default.nix deleted file mode 100644 index 4ed1ac9b99b0..000000000000 --- a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ncurses5 -, python39 -, libxcrypt-legacy -, runtimeShell -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "11.3.rel1"; - - platform = { - aarch64-linux = "aarch64"; - x86_64-darwin = "darwin-x86_64"; - x86_64-linux = "x86_64"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; - sha256 = { - aarch64-linux = "0pmm5r0k5mxd5drbn2s8a7qkm8c4fi8j5y31c70yrp0qs08kqwbc"; - x86_64-darwin = "1kr9kd9p2xk84fa99zf3gz5lkww2i9spqkjigjwakfkzbva56qw2"; - x86_64-linux = "08b1w1zmj4z80k59zmlc1bf34lg8d7z65fwvp5ir2pb1d1zxh86l"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python39 libxcrypt-legacy ]} "$f" || true - done - ''; - - postFixup = '' - mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped - cat <<EOF > $out/bin/arm-none-eabi-gdb - #!${runtimeShell} - export PYTHONPATH=${python39}/lib/python3.9 - export PYTHONHOME=${python39.interpreter} - exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" - EOF - chmod +x $out/bin/arm-none-eabi-gdb - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix deleted file mode 100644 index 0407cfa71e09..000000000000 --- a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ncurses5 -, python39 -, libxcrypt-legacy -, runtimeShell -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "12.3.rel1"; - - platform = { - aarch64-darwin = "darwin-arm64"; - aarch64-linux = "aarch64"; - x86_64-darwin = "darwin-x86_64"; - x86_64-linux = "x86_64"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; - sha256 = { - aarch64-darwin = "sha256-Oy7uC99xwbvrPDt0JPv3vZ1cPw9aOkp4FZyeOtIZ570="; - aarch64-linux = "sha256-FMBIfVdT9gcdJOVoiB98fmf4DdgxZd7FFks3MTlK9DE="; - x86_64-darwin = "sha256-5u2L+TD62c4z4SCrkLNpV7H3efzKpt5snKmliYLAQpE="; - x86_64-linux = "sha256-EqKBVkQxjrzOr4S+q7Zl0JJLbnniEEhFLFMxpWMyswk="; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python39 libxcrypt-legacy ]} "$f" || true - done - ''; - - postFixup = '' - mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped - cat <<EOF > $out/bin/arm-none-eabi-gdb - #!${runtimeShell} - export PYTHONPATH=${python39}/lib/python3.9 - export PYTHONHOME=${python39.interpreter} - exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" - EOF - chmod +x $out/bin/arm-none-eabi-gdb - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = with maintainers; [ prusnak prtzl ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/development/compilers/gcc-arm-embedded/13/default.nix b/pkgs/development/compilers/gcc-arm-embedded/13/default.nix deleted file mode 100644 index f3870205a66f..000000000000 --- a/pkgs/development/compilers/gcc-arm-embedded/13/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ncurses5 -, python39 -, libxcrypt-legacy -, runtimeShell -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "13.3.rel1"; - - platform = { - aarch64-darwin = "darwin-arm64"; - aarch64-linux = "aarch64"; - x86_64-darwin = "darwin-x86_64"; - x86_64-linux = "x86_64"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; - # hashes obtained from location ${url}.sha256asc - sha256 = { - aarch64-darwin = "fb6921db95d345dc7e5e487dd43b745e3a5b4d5c0c7ca4f707347148760317b4"; - aarch64-linux = "c8824bffd057afce2259f7618254e840715f33523a3d4e4294f471208f976764"; - x86_64-darwin = "1ab00742d1ed0926e6f227df39d767f8efab46f5250505c29cb81f548222d794"; - x86_64-linux = "95c011cee430e64dd6087c75c800f04b9c49832cc1000127a92a97f9c8d83af4"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python39 libxcrypt-legacy ]} "$f" || true - done - ''; - - postFixup = '' - mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped - cat <<EOF > $out/bin/arm-none-eabi-gdb - #!${runtimeShell} - export PYTHONPATH=${python39}/lib/python3.9 - export PYTHONHOME=${python39.interpreter} - exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" - EOF - chmod +x $out/bin/arm-none-eabi-gdb - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = with maintainers; [ prusnak prtzl ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix deleted file mode 100644 index d805c24e002c..000000000000 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ncurses5 -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "6.3.1"; - release = "6-2017-q2-update"; - subdir = "6-2017q2"; - - suffix = { - x86_64-darwin = "mac"; - x86_64-linux = "linux"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; - sha256 = { - x86_64-darwin = "0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; - x86_64-linux = "1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix deleted file mode 100644 index 13d8c12f52ce..000000000000 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ncurses5 -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "7.3.1"; - release = "7-2018-q2-update"; - subdir = "7-2018q2"; - - suffix = { - x86_64-darwin = "mac"; - x86_64-linux = "linux"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; - sha256 = { - x86_64-darwin = "0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61"; - x86_64-linux = "0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix deleted file mode 100644 index a6448baa7919..000000000000 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ncurses5 -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "8.3.1"; - release = "8-2019-q3-update"; - subdir = "8-2019q3/RC1.1"; - - suffix = { - x86_64-darwin = "mac"; - x86_64-linux = "linux"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; - sha256 = { - x86_64-darwin = "fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085"; - x86_64-linux = "b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix deleted file mode 100644 index 4c2b34b0c5b7..000000000000 --- a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ncurses5 -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "9.3.1"; - release = "9-2020-q2-update"; - subdir = "9-2020q2"; - - suffix = { - aarch64-linux = "aarch64-linux"; - x86_64-darwin = "mac"; - x86_64-linux = "x86_64-linux"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; - sha256 = { - aarch64-linux = "1b5q2y710hy7lddj8vj3zl54gfl74j30kx3hk3i81zrcbv16ah8z"; - x86_64-darwin = "1ils9z16wrvglh72m428y5irmd36biq79yj86756whib8izbifdv"; - x86_64-linux = "07zi2yr5gvhpbij5pnj49zswb9g2gw7zqp4xwwniqmq477h2xp2s"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/development/compilers/gcc/all.nix b/pkgs/development/compilers/gcc/all.nix index 232241989b9a..5d5abb82c3eb 100644 --- a/pkgs/development/compilers/gcc/all.nix +++ b/pkgs/development/compilers/gcc/all.nix @@ -24,7 +24,7 @@ let profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then args.libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; - isl = if stdenv.isDarwin then null + isl = if stdenv.hostPlatform.isDarwin then null else if atLeast "9" then isl_0_20 else /* atLeast "7" */ isl_0_17; } // lib.optionalAttrs (!(atLeast "9")) { diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index 8e087623879d..874a43a75f82 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -7,13 +7,6 @@ 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.versionOlder version "10"; in originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { @@ -27,20 +20,11 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { if test "$staticCompiler" = "1"; then EXTRA_LDFLAGS="-static" - ${ - 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 + elif test "''${NIX_DONT_SET_RPATH-}" != "1"; then + EXTRA_LDFLAGS="-Wl,-rpath,''${!outputLib}/lib" + else + EXTRA_LDFLAGS="" + fi # GCC interprets empty paths as ".", which we don't want. if test -z "''${CPATH-}"; then unset CPATH; fi @@ -74,24 +58,14 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { extraLDFlags=("-L/usr/lib64" "-L/usr/lib") libc_libdir="/usr/lib" fi - ${ - 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 -a prefixExtraLDFlags=() + prefixExtraLDFlags=("-L$libc_libdir") + nixDontSetRpathVar=NIX_DONT_SET_RPATH''${post} + if test "''${!nixDontSetRpathVar-}" != "1"; then + prefixExtraLDFlags+=("-rpath" "$libc_libdir") + fi + extraLDFlags=("''${prefixExtraLDFlags[@]}" "''${extraLDFlags[@]}") + for i in "''${extraLDFlags[@]}"; do declare -g EXTRA_LDFLAGS''${post}+=" -Wl,$i" done done @@ -302,7 +276,7 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { fi # Get rid of some "fixed" header files - rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h} + rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h,pthread.h} # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. for i in $out/bin/*-gcc*; do diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 104851930213..25d4f1f53bae 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -5,7 +5,7 @@ , threadsCross , version -, binutils, gmp, mpfr, libmpc, isl +, apple-sdk, binutils, gmp, mpfr, libmpc, isl , enableLTO , enableMultilib @@ -112,7 +112,11 @@ let ] ++ lib.optionals (!withoutTargetLibc) [ (if libcCross == null - then "--with-native-system-header-dir=${lib.getDev stdenv.cc.libc}/include" + then ( + # GCC will search for the headers relative to SDKROOT on Darwin, so it will find them in the store. + if targetPlatform.isDarwin then "--with-native-system-header-dir=/usr/include" + else "--with-native-system-header-dir=${lib.getDev stdenv.cc.libc}/include" + ) else "--with-native-system-header-dir=${lib.getDev libcCross}${libcCross.incdir or "/include"}") # gcc builds for cross-compilers (build != host) or cross-built # gcc (host != target) always apply the offset prefix to disentangle @@ -132,7 +136,8 @@ let # # We pick "/" path to effectively avoid sysroot offset and make it work # as a native case. - "--with-build-sysroot=/" + # Darwin requires using the SDK as the sysroot for `SDKROOT` to work correctly. + "--with-build-sysroot=${if targetPlatform.isDarwin then apple-sdk.sdkroot else "/"}" # Same with the stdlibc++ headers embedded in the gcc output "--with-gxx-include-dir=${placeholder "out"}/include/c++/${version}/" ] diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index f7e2e06bb79a..40a0484d5c50 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -34,6 +34,7 @@ , nukeReferences , callPackage , majorMinorVersion +, apple-sdk , cctools , darwin }: @@ -105,6 +106,7 @@ let ; # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc${majorVersion}.cc.override)" | jq '.[]' --raw-output' inherit + apple-sdk binutils buildPackages cargo @@ -224,7 +226,8 @@ pipe ((callFile ./common/builder.nix {}) ({ libc = if libcCross != null then libcCross else stdenv.cc.libc; in ( - '' echo "fixing the {GLIBC,UCLIBC,MUSL}_DYNAMIC_LINKER macros..." + '' + echo "fixing the {GLIBC,UCLIBC,MUSL}_DYNAMIC_LINKER macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h do grep -q _DYNAMIC_LINKER "$header" || continue diff --git a/pkgs/development/compilers/gcc/patches/11/libgcc-aarch64-darwin-detection.patch b/pkgs/development/compilers/gcc/patches/11/libgcc-aarch64-darwin-detection.patch deleted file mode 100644 index 08dbfec6b249..000000000000 --- a/pkgs/development/compilers/gcc/patches/11/libgcc-aarch64-darwin-detection.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -u a/libgcc/config.host b/libgcc/config.host ---- a/libgcc/config.host 2023-11-05 11:01:55.778638446 -0500 -+++ b/libgcc/config.host 2023-11-05 11:07:29.405103979 -0500 -@@ -227,7 +227,7 @@ - tmake_file="$tmake_file t-slibgcc-darwin" - # newer toolsets produce warnings when building for unsupported versions. - case ${host} in -- *-*-darwin1[89]* | *-*-darwin2* ) -+ *-*-darwin1[89]* | *-*-darwin2* | aarch64*-*-darwin*) - tmake_file="t-darwin-min-8 $tmake_file" - ;; - *-*-darwin9* | *-*-darwin1[0-7]*) -diff -ur a/libgcc/config/t-darwin-rpath b/libgcc/config/t-darwin-rpath ---- a/libgcc/config/t-darwin-rpath 2023-11-05 11:34:18.691150009 -0500 -+++ b/libgcc/config/t-darwin-rpath 2023-11-05 11:50:36.968920904 -0500 -@@ -2,4 +2,4 @@ - SHLIB_RPATH = @rpath - - # Which does not work for Darwin < 9 --HOST_LIBGCC2_CFLAGS += -mmacosx-version-min=10.5 -+SHLIB_LOADER_PATH = -Wl,-rpath,@loader_path diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index b226975ef034..c25771a93723 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -120,16 +120,16 @@ in ## Darwin # Fixes detection of Darwin on x86_64-darwin. Otherwise, GCC uses a deployment target of 10.5, which crashes ld64. -++ optional (atLeast14 && stdenv.isDarwin && stdenv.isx86_64) ../patches/14/libgcc-darwin-detection.patch +++ optional (atLeast14 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ../patches/14/libgcc-darwin-detection.patch # Fix detection of bootstrap compiler Ada support (cctools as) on Nix Darwin -++ optional (atLeast12 && stdenv.isDarwin && langAda) ./ada-cctools-as-detection-configure.patch +++ optional (atLeast12 && stdenv.hostPlatform.isDarwin && langAda) ./ada-cctools-as-detection-configure.patch # Remove CoreServices on Darwin, as it is only needed for macOS SDK 14+ -++ optional (atLeast14 && stdenv.isDarwin && langAda) ../patches/14/gcc-darwin-remove-coreservices.patch +++ optional (atLeast14 && stdenv.hostPlatform.isDarwin && langAda) ../patches/14/gcc-darwin-remove-coreservices.patch # Use absolute path in GNAT dylib install names on Darwin -++ optionals (stdenv.isDarwin && langAda) ({ +++ optionals (stdenv.hostPlatform.isDarwin && langAda) ({ "14" = [ ../patches/14/gnat-darwin-dylib-install-name-14.patch ]; "13" = [ ./gnat-darwin-dylib-install-name-13.patch ]; "12" = [ ./gnat-darwin-dylib-install-name.patch ]; @@ -137,7 +137,7 @@ in # We only apply this patch when building a native toolchain for aarch64-darwin, as it breaks building # a foreign one: https://github.com/iains/gcc-12-branch/issues/18 -++ optionals (stdenv.isDarwin && stdenv.isAarch64 && buildPlatform == hostPlatform && hostPlatform == targetPlatform) ({ +++ optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && buildPlatform == hostPlatform && hostPlatform == targetPlatform) ({ "14" = [ (fetchpatch { # There are no upstream release tags in https://github.com/iains/gcc-14-branch. # 04696df09633baf97cdbbdd6e9929b9d472161d3 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-14.2.0 @@ -157,9 +157,9 @@ in }) ]; "11" = [ (fetchpatch { # There are no upstream release tags in https://github.com/iains/gcc-11-branch. - # ff4bf32 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.4.0 - url = "https://github.com/iains/gcc-11-branch/compare/ff4bf326d03e750a8d4905ea49425fe7d15a04b8..gcc-11.4-darwin-r0.diff"; - hash = "sha256-6prPgR2eGVJs7vKd6iM1eZsEPCD1ShzLns2Z+29vlt4="; + # 5cc4c42a0d4de08715c2eef8715ad5b2e92a23b6 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.5.0 + url = "https://github.com/iains/gcc-11-branch/compare/5cc4c42a0d4de08715c2eef8715ad5b2e92a23b6..gcc-11.5-darwin-r0.diff"; + hash = "sha256-7lH+GkgkrE6nOp9PMdIoqlQNWK31s6oW+lDt1LIkadE="; }) ]; "10" = [ (fetchpatch { # There are no upstream release tags in https://github.com/iains/gcc-10-branch. @@ -170,7 +170,7 @@ in }.${majorVersion} or []) # Work around newer AvailabilityInternal.h when building older versions of GCC. -++ optionals (stdenv.isDarwin) ({ +++ optionals (stdenv.hostPlatform.isDarwin) ({ "9" = [ ../patches/9/AvailabilityInternal.h-fixincludes.patch ]; "8" = [ ../patches/8/AvailabilityInternal.h-fixincludes.patch ]; "7" = [ ../patches/7/AvailabilityInternal.h-fixincludes.patch ]; @@ -201,9 +201,6 @@ in ## gcc 11.0 and older ############################################################################## -# libgcc’s `configure` script misdetects aarch64-darwin, resulting in an invalid deployment target. -++ optional (is11 && stdenv.isDarwin && stdenv.isAarch64) ./11/libgcc-aarch64-darwin-detection.patch - # openjdk build fails without this on -march=opteron; is upstream in gcc12 ++ optionals (is11) [ ./11/gcc-issue-103910.patch ] diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index c71ea137eadc..5ed7339c31be 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { ./install.sh (cd $out/bin ; ln -s ../gerbil/bin/* .) runHook postInstall - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' libgerbil="$(realpath "$out/gerbil/lib/libgerbil.so")" install_name_tool -id "$libgerbil" "$libgerbil" ''; diff --git a/pkgs/development/compilers/gforth/boot-forth.nix b/pkgs/development/compilers/gforth/boot-forth.nix deleted file mode 100644 index 657847164bb0..000000000000 --- a/pkgs/development/compilers/gforth/boot-forth.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl, m4 }: - -let - version = "0.7.3"; -in -stdenv.mkDerivation { - pname = "gforth-boot"; - inherit version; - src = fetchurl { - url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz"; - sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig"; - }; - - buildInputs = [ m4 ]; - - configureFlags = lib.optionals stdenv.isDarwin [ "--build=x86_64-apple-darwin" ]; - - meta = { - description = "Forth implementation of the GNU project (outdated version used to bootstrap)"; - homepage = "https://www.gnu.org/software/gforth/"; - license = lib.licenses.gpl3; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix deleted file mode 100644 index 56d89fd628f2..000000000000 --- a/pkgs/development/compilers/gforth/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, callPackage -, autoreconfHook, texinfo, libffi -}: - -let - swig = callPackage ./swig.nix { }; - bootForth = callPackage ./boot-forth.nix { }; - lispDir = "${placeholder "out"}/share/emacs/site-lisp"; -in stdenv.mkDerivation rec { - - pname = "gforth"; - version = "0.7.9_20230518"; - - src = fetchFromGitHub { - owner = "forthy42"; - repo = "gforth"; - rev = version; - hash = "sha256-rXtmmENBt9RMdLPq8GDyndh4+CYnCmz6NYpe3kH5OwU="; - }; - - nativeBuildInputs = [ - autoreconfHook texinfo bootForth swig - ]; - buildInputs = [ - libffi - ]; - - passthru = { inherit bootForth; }; - - configureFlags = [ - "--with-lispdir=${lispDir}" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - "--build=x86_64-apple-darwin" - ]; - - preConfigure = '' - mkdir -p ${lispDir} - ''; - - meta = { - description = "Forth implementation of the GNU project"; - homepage = "https://github.com/forthy42/gforth"; - license = lib.licenses.gpl3; - broken = stdenv.isDarwin && stdenv.isAarch64; # segfault when running ./gforthmi - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/gforth/swig.nix b/pkgs/development/compilers/gforth/swig.nix deleted file mode 100644 index 84cdaee6a36a..000000000000 --- a/pkgs/development/compilers/gforth/swig.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - swig, - pcre, - fetchFromGitHub, -}: - -## for updating to SWIG 4, see -## https://github.com/GeraldWodni/swig/pull/6 -(swig.overrideAttrs (old: { - version = "3.0.9-forth"; - src = fetchFromGitHub { - owner = "GeraldWodni"; - repo = "swig"; - rev = "a45b807e5f9d8ca1a43649c8265d2741a393862a"; - sha256 = "sha256-6nOOPFGFNaQInEkul0ZAh+ks9n3wqCQ6/tbduvG/To0="; - }; - configureFlags = old.configureFlags ++ [ "--enable-forth" ]; -})).override - { pcre2 = pcre; } diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix index a4602c9a645c..20ad72462401 100644 --- a/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -199,7 +199,7 @@ stdenv.mkDerivation rec { # 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 ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.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. @@ -245,14 +245,14 @@ 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.hostPlatform.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 '' + '' + lib.optionalString stdenv.hostPlatform.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 @@ -274,7 +274,7 @@ stdenv.mkDerivation rec { '' find . -name integer-gmp.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' find . -name base.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; '' + @@ -285,7 +285,7 @@ stdenv.mkDerivation rec { -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; '' + # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' find . -type f -executable -exec patchelf \ --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; '' + @@ -314,7 +314,7 @@ stdenv.mkDerivation rec { "--with-gmp-includes=${lib.getDev gmp}/include" # Note `--with-gmp-libraries` does nothing for GHC bindists: # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 - ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" # From: https://github.com/NixOS/nixpkgs/pull/43369/commits ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; @@ -349,7 +349,7 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - postFixup = lib.optionalString stdenv.isLinux + postFixup = lib.optionalString stdenv.hostPlatform.isLinux (if stdenv.hostPlatform.isAarch64 then # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs # are 2 directories deep from $out/lib, so pooling symlinks there makes @@ -377,7 +377,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p fi done - '') + lib.optionalString stdenv.isDarwin '' + '') + lib.optionalString stdenv.hostPlatform.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isScript $exe && continue diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index 6b26f2fb8517..03e4facd0198 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -32,7 +32,9 @@ , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform -, enableProfiledLibs ? true + # Exceeds Hydra output limit (at the time of writing ~3GB) when cross compiled to riscv64. + # A riscv64 cross-compiler fits into the limit comfortably. +, enableProfiledLibs ? !stdenv.hostPlatform.isRiscV64 , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. @@ -202,7 +204,10 @@ let (lib.optionalString enableIntegerSimple "-integer-simple") ]; - libffi_name = if stdenv.isDarwin && stdenv.isAarch64 then "libffi" else "libffi_3_3"; + libffi_name = + if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 + then "libffi" + else "libffi_3_3"; # These libraries are library dependencies of the standard libraries bundled # by GHC (core libs) users will link their compiled artifacts again. Thus, @@ -293,7 +298,21 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/8f7dd5710b80906ea7a3e15b7bb56a883a49fed8.patch"; hash = "sha256-C636Nq2U8YOG/av7XQmG3L1rU0bmC9/7m7Hty5pm5+s="; }) - ] ++ lib.optionals stdenv.isDarwin [ + + # Backport part of <https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7111> to 8.10.7 + # The change we are interested in is that Cabal no longer sets include-dirs + # for the GHCi library delegating to the system search path or (in our case) + # cc-wrapper. Without this patch, the target libffi ends up in there (which + # we provide via --with-ffi-includes) which breaks bootstrapping e.g. when + # cross compiling GHC. Without include-dirs, cc-wrapper and splicing will + # correctly pick the suitable libffi out of the build environment. + (fetchpatch { + name = "ghci-no-libffi-include.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/b2721819f391ab49871271283f32df54810c4387.patch"; + sha256 = "1rmv3132xhxbka97v0rx7r6larx5f5nnvs4mgm9q3rmgpjyd1vf9"; + includes = [ "libraries/ghci/ghci.cabal.in" ]; + }) + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Make Block.h compile with c++ compilers. Remove with the next release (fetchpatch { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; @@ -359,9 +378,9 @@ stdenv.mkDerivation (rec { echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 @@ -431,7 +450,7 @@ stdenv.mkDerivation (rec { perl autoreconfHook autoconf automake m4 python3 bootPkgs.alex bootPkgs.happy bootPkgs.hscolour bootPkgs.ghc-settings-edit - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index d66f47b661a5..eef0cba9f00b 100644 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -26,7 +26,7 @@ let libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; - glibcDynLinker = assert stdenv.isLinux; + glibcDynLinker = assert stdenv.hostPlatform.isLinux; if stdenv.hostPlatform.libc == "glibc" then # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild. ''"$(cat $NIX_CC/nix-support/dynamic-linker)"'' @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { postUnpack = # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib # during linking - lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.hostPlatform.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 @@ -110,15 +110,15 @@ stdenv.mkDerivation rec { '' find . -name integer-gmp.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' find . -name base.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; '' + # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' find . -type f -perm -0100 \ -exec patchelf \ - --replace-needed libncurses${lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ + --replace-needed libncurses${lib.optionalString stdenv.hostPlatform.is64bit "w"}.so.5 libncurses.so \ ${ # This isn't required for x86_64-linux where we use ncurses6 lib.optionalString (!useNcurses6) "--replace-needed libtinfo.so libtinfo.so.5" } \ @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { "--with-gmp-includes=${lib.getDev gmp}/include" # Note `--with-gmp-libraries` does nothing for GHC bindists: # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 - ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; # No building is necessary, but calling make without flags ironically @@ -160,14 +160,14 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for p in $(find "$out" -type f -executable); do if isELF "$p"; then echo "Patchelfing $p" patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p fi done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isScript $exe && continue diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix index 920b63ce4eab..e8c6d83ea82f 100644 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -222,7 +222,7 @@ 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.hostPlatform.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 @@ -247,7 +247,7 @@ stdenv.mkDerivation rec { # we need to modify the package db directly for hadrian bindists find . -name 'ghc-bignum*.conf' \ -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib gmpUsed}/lib' -i {} \; - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # we need to modify the package db directly for hadrian bindists # (all darwin bindists are hadrian-based for 9.2.2) find . -name 'base*.conf' \ @@ -266,7 +266,7 @@ stdenv.mkDerivation rec { -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; '' + # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' find . -type f -executable -exec patchelf \ --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; ''; @@ -281,7 +281,7 @@ stdenv.mkDerivation rec { "--with-gmp-includes=${lib.getDev gmpUsed}/include" # Note `--with-gmp-libraries` does nothing for GHC bindists: # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 - ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" # From: https://github.com/NixOS/nixpkgs/pull/43369/commits ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; @@ -316,7 +316,7 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - postFixup = lib.optionalString (stdenv.isLinux && !(binDistUsed.isStatic or false)) + postFixup = lib.optionalString (stdenv.hostPlatform.isLinux && !(binDistUsed.isStatic or false)) (if stdenv.hostPlatform.isAarch64 then # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs # are 2 directories deep from $out/lib, so pooling symlinks there makes @@ -344,7 +344,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p fi done - '') + lib.optionalString stdenv.isDarwin '' + '') + lib.optionalString stdenv.hostPlatform.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isScript $exe && continue diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix index d67e9f47ac48..6d8f195bb9d3 100644 --- a/pkgs/development/compilers/ghc/9.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix @@ -218,7 +218,7 @@ 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.hostPlatform.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 @@ -235,7 +235,7 @@ stdenv.mkDerivation rec { -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib gmpUsed}/lib' -i {} \; '' # Similar for iconv and libffi on darwin - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' find . -name 'base*.conf' \ -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib libiconv}/lib' -i {} \; @@ -252,7 +252,7 @@ stdenv.mkDerivation rec { -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; '' + # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' find . -type f -executable -exec patchelf \ --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; ''; @@ -267,7 +267,7 @@ stdenv.mkDerivation rec { configurePlatforms = [ ]; configureFlags = - lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" # From: https://github.com/NixOS/nixpkgs/pull/43369/commits ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; @@ -308,7 +308,7 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - postFixup = lib.optionalString (stdenv.isLinux && !(binDistUsed.isStatic or false)) + postFixup = lib.optionalString (stdenv.hostPlatform.isLinux && !(binDistUsed.isStatic or false)) (if stdenv.hostPlatform.isAarch64 then # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs # are 2 directories deep from $out/lib, so pooling symlinks there makes @@ -336,7 +336,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p fi done - '') + lib.optionalString stdenv.isDarwin '' + '') + lib.optionalString stdenv.hostPlatform.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isMachO $exe || continue diff --git a/pkgs/development/compilers/ghc/9.8.3.nix b/pkgs/development/compilers/ghc/9.8.3.nix new file mode 100644 index 000000000000..ce77308f9212 --- /dev/null +++ b/pkgs/development/compilers/ghc/9.8.3.nix @@ -0,0 +1,4 @@ +import ./common-hadrian.nix rec { + version = "9.8.3"; + sha256 = "99e40d729ec8831a633b75fd85d65dd10e31a0133dec9d198d686a273679ab70"; +} diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index b5eeb2012bdb..7bb2135779a4 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -10,6 +10,7 @@ { lib , stdenv +, stdenvNoCC , pkgsBuildTarget , pkgsHostTarget , buildPackages @@ -59,7 +60,9 @@ , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform -, enableProfiledLibs ? true + # Exceeds Hydra output limit (at the time of writing ~3GB) when cross compiled to riscv64. + # A riscv64 cross-compiler fits into the limit comfortably. +, enableProfiledLibs ? !stdenv.hostPlatform.isRiscV64 , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. @@ -166,10 +169,11 @@ patches = let - # Disable haddock generating pretty source listings to stay under 3GB on aarch64-linux enableHyperlinkedSource = - lib.versionAtLeast version "9.8" || - !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux); + # Disable haddock generating pretty source listings to stay under 3GB on aarch64-linux + !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) + # 9.8 and 9.10 don't run into this problem for some reason + || (lib.versionAtLeast version "9.8" && lib.versionOlder version "9.11"); in [ # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 @@ -204,18 +208,24 @@ then ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch else ./Cabal-3.12-paths-fix-cycle-aarch64-darwin.patch) ] - # Prevents passing --hyperlinked-source to haddock. This is a custom - # workaround as we wait for this to be configurable via userSettings or - # similar. https://gitlab.haskell.org/ghc/ghc/-/issues/23625 + # Prevents passing --hyperlinked-source to haddock. Note that this can + # be configured via a user defined flavour now. Unfortunately, it is + # impossible to import an existing flavour in UserSettings, so patching + # the defaults is actually simpler and less maintenance intensive + # compared to keeping an entire flavour definition in sync with upstream + # manually. See also https://gitlab.haskell.org/ghc/ghc/-/issues/23625 ++ lib.optionals (!enableHyperlinkedSource) [ - # TODO(@sternenseemann): Doesn't apply for GHC >= 9.8 - ../../tools/haskell/hadrian/disable-hyperlinked-source.patch + (if lib.versionOlder version "9.8" + then ../../tools/haskell/hadrian/disable-hyperlinked-source-pre-9.8.patch + else ../../tools/haskell/hadrian/disable-hyperlinked-source-extra-args.patch) ] # Incorrect bounds on Cabal in hadrian # https://gitlab.haskell.org/ghc/ghc/-/issues/24100 ++ lib.optionals (lib.elem version [ "9.8.1" "9.8.2" ]) [ ../../tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch ]; + + stdenv = stdenvNoCC; } # GHC's build system hadrian built from the GHC-to-build's source tree @@ -440,11 +450,11 @@ stdenv.mkDerivation ({ else "${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" }" '' + - lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' + lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") '' export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 @@ -554,7 +564,7 @@ stdenv.mkDerivation ({ python3 # Tool used to update GHC's settings file in postInstall bootPkgs.ghc-settings-edit - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index a26336ac6fe8..7593a175c77c 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -35,7 +35,9 @@ , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform -, enableProfiledLibs ? true + # Exceeds Hydra output limit (at the time of writing ~3GB) when cross compiled to riscv64. + # A riscv64 cross-compiler fits into the limit comfortably. +, enableProfiledLibs ? !stdenv.hostPlatform.isRiscV64 , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. @@ -363,13 +365,13 @@ stdenv.mkDerivation (rec { '' + lib.optionalString (lib.versionOlder version "9.2" || lib.versionAtLeast version "9.4") '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") '' export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast version "9.2") '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "9.2") '' # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 export XATTR=${lib.getBin xattr}/bin/xattr @@ -445,11 +447,11 @@ stdenv.mkDerivation (rec { perl autoconf automake m4 python3 bootPkgs.alex bootPkgs.happy bootPkgs.hscolour bootPkgs.ghc-settings-edit - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx - ] ++ lib.optionals (stdenv.isDarwin && lib.versions.majorMinor version == "9.0") [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versions.majorMinor version == "9.0") [ # TODO(@sternenseemann): backport addition of XATTR env var like # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6447 xattr diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 73808dc431a9..10554c4cb48a 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,11 +1,5 @@ import ./common-hadrian.nix { - version = "9.11.20240410"; - rev = "1b1a92bd25c3f7249cf922c5dbf4415d2de44a36"; - sha256 = "sha256-2HdhxhVrKn8c/ZOGYoYThqXpod2OPiGXgH+mAV69Ip0="; - # The STM benchmark contains chanbench.hs and ChanBench.hs causing a hash - # mismatch on case insensitive filesystems. See also - # https://gitlab.haskell.org/ghc/packages/stm/-/issues/2 - postFetch = '' - rm -rf "$out/libraries/stm/bench" - ''; + version = "9.13.20241031"; + rev = "0b11cdc022ce33d089db95b2b2e7c1f4bb326d37"; + sha256 = "0kqnpcgv49ricbr950lffs8gx7jrcg6anzc0qvwy5pb518w0d37i"; } diff --git a/pkgs/development/compilers/ghcjs/8.10/default.nix b/pkgs/development/compilers/ghcjs/8.10/default.nix index 9a648f838406..aea58c62b6d1 100644 --- a/pkgs/development/compilers/ghcjs/8.10/default.nix +++ b/pkgs/development/compilers/ghcjs/8.10/default.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation { xorg.lndir gmp pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc # https://github.com/ghcjs/ghcjs/issues/663 ]; dontConfigure = true; diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 075088306de6..a8454ba56f3b 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -5,6 +5,7 @@ , git , pkg-config , openssl +, erlang , Security , nix-update-script , SystemConfiguration @@ -12,21 +13,21 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-buMnbBg+/vHXzbBuMPuV8AfdUmYA9J6WTXP7Oqrdo34="; + hash = "sha256-4/NDZGq62M0tdWerIkmoYS0WHC06AV8c9vlo/6FhsAo="; }; nativeBuildInputs = [ git pkg-config ]; - buildInputs = [ openssl ] ++ - lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + buildInputs = [ openssl erlang ] ++ + lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-0Vtf9UXLPW5HuqNIAGNyqIXCMTITdG7PuFdw4H4v6a4="; + cargoHash = "sha256-B8tCVkubP04gAHKQC0idR5AjpVHG/kCXvPCfwKCuaSo="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix deleted file mode 100644 index 9d67dde87c2d..000000000000 --- a/pkgs/development/compilers/glslang/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, bison -, cmake -, jq -, python3 -, spirv-headers -, spirv-tools -}: -stdenv.mkDerivation rec { - pname = "glslang"; - version = "14.3.0"; - - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "glslang"; - rev = version; - hash = "sha256-slKBFq6NyWHQmJq/YR3LmbGnHyZgRg0hej90tZDOGzA="; - }; - - outputs = [ "bin" "out" "dev" ]; - - # These get set at all-packages, keep onto them for child drvs - passthru = { - spirv-tools = spirv-tools; - spirv-headers = spirv-headers; - }; - - nativeBuildInputs = [ cmake python3 bison jq ]; - - postPatch = '' - cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools - ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers - ''; - - # This is a dirty fix for lib/cmake/SPIRVTargets.cmake:51 which includes this directory - postInstall = '' - mkdir -p $dev/include/External - moveToOutput lib/pkgconfig "''${!outputDev}" - moveToOutput lib/cmake "''${!outputDev}" - ''; - - # Fix the paths in .pc, even though it's unclear if these .pc are really useful. - postFixup = '' - substituteInPlace $dev/lib/pkgconfig/*.pc \ - --replace-fail '=''${prefix}//' '=/' \ - --replace-fail "includedir=$dev/$dev" "includedir=$dev" - - # add a symlink for backwards compatibility - ln -s $bin/bin/glslang $bin/bin/glslangValidator - ''; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Khronos reference front-end for GLSL and ESSL"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [ maintainers.ralith ]; - }; -} diff --git a/pkgs/development/compilers/gmqcc/default.nix b/pkgs/development/compilers/gmqcc/default.nix deleted file mode 100644 index ec39f8744f58..000000000000 --- a/pkgs/development/compilers/gmqcc/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "gmqcc"; - version = "0-unstable-2023-05-05"; - - src = fetchFromGitHub { - owner = "graphitemaster"; - repo = "gmqcc"; - rev = "2fe0af00e78d55edecd7ca7ee1808c4ea946b05f"; - hash = "sha256-AyuwsUIt+P/D4ABuIXGJxpp0TMAbnDg+R2iNMy6WjRw="; - }; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - install -m755 gmqcc $out/bin - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://graphitemaster.github.io/gmqcc/"; - description = "Modern QuakeC compiler"; - mainProgram = "gmqcc"; - longDescription = '' - For an enduring period of time the options for a decent compiler for - the Quake C programming language were confined to a specific compiler - known as QCC. Attempts were made to extend and improve upon the design - of QCC, but many foreseen the consequences of building on a broken - foundation. The solution was obvious, a new compiler; one born from - the NIH realm of sarcastic wit. - We welcome you. You won't find a better Quake C compiler. - ''; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ necrophcodr ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/compilers/gnostic/default.nix b/pkgs/development/compilers/gnostic/default.nix deleted file mode 100644 index e6c2b665c215..000000000000 --- a/pkgs/development/compilers/gnostic/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "gnostic"; - version = "0.7.0"; - - src = fetchFromGitHub { - owner = "google"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Wpe+rK4XMfMZYhR1xTEr0nsEjRGkSDA7aiLeBbGcRpA="; - }; - - vendorHash = "sha256-Wyv5czvD3IwE236vlAdq8I/DnhPXxdbwZtUhun+97x4="; - - # some tests are broken and others require network access - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/google/gnostic"; - description = "Compiler for APIs described by the OpenAPI Specification with plugins for code generation and other API support tasks"; - changelog = "https://github.com/google/gnostic/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ urandom ]; - }; -} diff --git a/pkgs/development/compilers/gnu-cim/default.nix b/pkgs/development/compilers/gnu-cim/default.nix deleted file mode 100644 index bf5b93c712fc..000000000000 --- a/pkgs/development/compilers/gnu-cim/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchurl -}: - -stdenv.mkDerivation rec { - pname = "gnu-cim"; - version = "5.1"; - - outputs = ["out" "lib" "man" "info"]; - - src = fetchurl { - url = "mirror://gnu/cim/cim-${version}.tar.gz"; - hash = "sha256-uQcXtm7EAFA73WnlN+i38+ip0QbDupoIoErlc2mgaak="; - }; - - postPatch = '' - for fname in lib/{simulation,simset}.c; do - substituteInPlace "$fname" \ - --replace-fail \ - '#include "../../lib/cim.h"' \ - '#include "../lib/cim.h"' - done - ''; - - env.CFLAGS = lib.optionalString stdenv.cc.isClang "-Wno-return-type -Wno-error=implicit-function-declaration -Wno-error=implicit-int"; - - doCheck = true; - - meta = with lib; { - description = "GNU compiler for the programming language Simula"; - longDescription = '' - GNU Cim is a compiler for the programming language Simula. - It offers a class concept, separate compilation with full type checking, - interface to external C routines, an application package for process - simulation and a coroutine concept. Commonly used with the Demos for - discrete event modelling. - ''; - homepage = "https://www.gnu.org/software/cim/"; - license = licenses.gpl2; - platforms = platforms.all; - badPlatforms = [ "aarch64-darwin" ]; - maintainers = with maintainers; [ pbsds ]; - }; -} diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix deleted file mode 100644 index 8f419a189e82..000000000000 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, go-jsonnet }: - -buildGoModule rec { - pname = "go-jsonnet"; - version = "0.20.0"; - - src = fetchFromGitHub { - owner = "google"; - repo = pname; - rev = "v${version}"; - hash = "sha256-P69tguBrFF/CSCOfHjCfBT5710oJdhZDh3kMCbc32eE="; - }; - - vendorHash = "sha256-j1fTOUpLx34TgzW94A/BctLrg9XoTtb3cBizhVJoEEI="; - - subPackages = [ "cmd/jsonnet*" ]; - - passthru.tests.version = testers.testVersion { - package = go-jsonnet; - version = "v${version}"; - }; - - meta = with lib; { - description = "Implementation of Jsonnet in pure Go"; - homepage = "https://github.com/google/go-jsonnet"; - license = licenses.asl20; - maintainers = with maintainers; [ nshalman aaronjheng ]; - mainProgram = "jsonnet"; - }; -} diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix deleted file mode 100644 index 7c8f1fbd9cde..000000000000 --- a/pkgs/development/compilers/go/1.21.nix +++ /dev/null @@ -1,189 +0,0 @@ -{ lib -, stdenv -, fetchurl -, tzdata -, substituteAll -, iana-etc -, Security -, Foundation -, xcbuild -, mailcap -, buildPackages -, pkgsBuildTarget -, threadsCross -, testers -, skopeo -, buildGo121Module -}: - -let - goBootstrap = buildPackages.callPackage ./bootstrap121.nix { }; - - skopeoTest = skopeo.override { buildGoModule = buildGo121Module; }; - - goarch = platform: { - "aarch64" = "arm64"; - "arm" = "arm"; - "armv5tel" = "arm"; - "armv6l" = "arm"; - "armv7l" = "arm"; - "i686" = "386"; - "mips" = "mips"; - "mips64el" = "mips64le"; - "mipsel" = "mipsle"; - "powerpc64" = "ppc64"; - "powerpc64le" = "ppc64le"; - "riscv64" = "riscv64"; - "s390x" = "s390x"; - "x86_64" = "amd64"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); - - # We need a target compiler which is still runnable at build time, - # to handle the cross-building case where build != host == target - targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; - - isCross = stdenv.buildPlatform != stdenv.targetPlatform; -in -stdenv.mkDerivation (finalAttrs: { - pname = "go"; - version = "1.21.13"; - - src = fetchurl { - url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-cfsxYGod5I0SnVkehxemPgxVZf+6CaJOqfiZoTIUw00="; - }; - - strictDeps = true; - buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ]; - - depsBuildTarget = lib.optional isCross targetCC; - - depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package; - - postPatch = '' - patchShebangs . - ''; - - patches = [ - (substituteAll { - src = ./iana-etc-1.17.patch; - iana = iana-etc; - }) - # Patch the mimetype database location which is missing on NixOS. - # but also allow static binaries built with NixOS to run outside nix - (substituteAll { - src = ./mailcap-1.17.patch; - inherit mailcap; - }) - # prepend the nix path to the zoneinfo files but also leave the original value for static binaries - # that run outside a nix server - (substituteAll { - src = ./tzdata-1.19.patch; - inherit tzdata; - }) - ./remove-tools-1.11.patch - ./go_no_vendor_checks-1.21.patch - ]; - - GOOS = stdenv.targetPlatform.parsed.kernel.name; - GOARCH = goarch stdenv.targetPlatform; - # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. - # Go will nevertheless build a for host system that we will copy over in - # the install phase. - GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; - GOHOSTARCH = goarch stdenv.buildPlatform; - - # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those - # to be different from CC/CXX - CC_FOR_TARGET = - if isCross then - "${targetCC}/bin/${targetCC.targetPrefix}cc" - else - null; - CXX_FOR_TARGET = - if isCross then - "${targetCC}/bin/${targetCC.targetPrefix}c++" - else - null; - - GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); - GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; - - buildPhase = '' - runHook preBuild - export GOCACHE=$TMPDIR/go-cache - # this is compiled into the binary - export GOROOT_FINAL=$out/share/go - - export PATH=$(pwd)/bin:$PATH - - ${lib.optionalString isCross '' - # Independent from host/target, CC should produce code for the building system. - # We only set it when cross-compiling. - export CC=${buildPackages.stdenv.cc}/bin/cc - ''} - ulimit -a - - pushd src - ./make.bash - popd - runHook postBuild - ''; - - preInstall = '' - # Contains the wrong perl shebang when cross compiling, - # since it is not used for anything we can deleted as well. - rm src/regexp/syntax/make_perl_groups.pl - '' + (if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then '' - mv bin/*_*/* bin - rmdir bin/*_* - ${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) '' - rm -rf pkg/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} pkg/tool/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} - ''} - '' else lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) '' - rm -rf bin/*_* - ${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) '' - rm -rf pkg/${finalAttrs.GOOS}_${finalAttrs.GOARCH} pkg/tool/${finalAttrs.GOOS}_${finalAttrs.GOARCH} - ''} - ''); - - installPhase = '' - runHook preInstall - mkdir -p $GOROOT_FINAL - cp -a bin pkg src lib misc api doc go.env $GOROOT_FINAL - mkdir -p $out/bin - ln -s $GOROOT_FINAL/bin/* $out/bin - runHook postInstall - ''; - - disallowedReferences = [ goBootstrap ]; - - passthru = { - inherit goBootstrap skopeoTest; - tests = { - skopeo = testers.testVersion { package = skopeoTest; }; - version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "go version"; - version = "go${finalAttrs.version}"; - }; - }; - }; - - meta = with lib; { - changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor finalAttrs.version}"; - description = "Go Programming language"; - homepage = "https://go.dev/"; - license = licenses.bsd3; - maintainers = teams.golang.members; - 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 4060a6cf6975..4bb68cb2d3e8 100644 --- a/pkgs/development/compilers/go/1.22.nix +++ b/pkgs/development/compilers/go/1.22.nix @@ -4,8 +4,7 @@ , tzdata , substituteAll , iana-etc -, Security -, Foundation +, apple-sdk_11 , xcbuild , mailcap , buildPackages @@ -47,19 +46,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.22.7"; + version = "1.22.9"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-ZkMth9heDPrD7f/mN9WTD8Td9XkzE/4R5KDzMwI8h58="; + hash = "sha256-6Bo2L1Gu4hJXIrAY5GcU5qBVoZVCg0FMD5N+c3AT2yI="; }; strictDeps = true; buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ]; + depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ apple-sdk_11 xcbuild ]; depsBuildTarget = lib.optional isCross targetCC; diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index d4486ff319e4..14a80eae8046 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -4,8 +4,7 @@ , tzdata , substituteAll , iana-etc -, Security -, Foundation +, apple-sdk_11 , xcbuild , mailcap , buildPackages @@ -47,19 +46,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.23.1"; + version = "1.23.3"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-buROKYN50Ual5aprHFtdX10KM2XqvdcHQebiE0DsOw0="; + hash = "sha256-jWp3MySHVXxq+iQhExtQ+D20rjxXnDvHLmcO4faWhZk="; }; strictDeps = true; buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ]; + depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ apple-sdk_11 xcbuild ]; depsBuildTarget = lib.optional isCross targetCC; diff --git a/pkgs/development/compilers/go/go_no_vendor_checks-1.21.patch b/pkgs/development/compilers/go/go_no_vendor_checks-1.21.patch deleted file mode 100644 index 1adbf46398c5..000000000000 --- a/pkgs/development/compilers/go/go_no_vendor_checks-1.21.patch +++ /dev/null @@ -1,23 +0,0 @@ -Starting from go1.14, go verifes that vendor/modules.txt matches the requirements -and replacements listed in the main module go.mod file, and it is a hard failure if -vendor/modules.txt is missing. - -Relax module consistency checks and switch back to pre go1.14 behaviour if -vendor/modules.txt is missing regardless of go version requirement in go.mod. - -This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 -See https://github.com/golang/go/issues/37948 for discussion. - -diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go -index ffc79bb93f..2d0311975d 100644 ---- a/src/cmd/go/internal/modload/vendor.go -+++ b/src/cmd/go/internal/modload/vendor.go -@@ -144,7 +144,7 @@ func checkVendorConsistency(index *modFileIndex, modFile *modfile.File) { - readVendorList(MainModules.mustGetSingleMainModule()) - - pre114 := false -- if gover.Compare(index.goVersion, "1.14") < 0 { -+ if gover.Compare(index.goVersion, "1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { - // Go versions before 1.14 did not include enough information in - // vendor/modules.txt to check for consistency. - // If we know that we're on an earlier version, relax the consistency check. diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix deleted file mode 100644 index 6868ca9f8d8f..000000000000 --- a/pkgs/development/compilers/gprolog/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "gprolog"; - version = "1.5.0"; - - src = fetchurl { - urls = [ - "mirror://gnu/gprolog/gprolog-${version}.tar.gz" - "http://www.gprolog.org/gprolog-${version}.tar.gz" - ]; - sha256 = "sha256-ZwZCtDwPqifr1olh77F+vnB2iPkbaAlWbd1gYTlRLAE="; - }; - - hardeningDisable = lib.optional stdenv.isi686 "pic"; - - patchPhase = '' - sed -i -e "s|/tmp/make.log|$TMPDIR/make.log|g" src/Pl2Wam/check_boot - ''; - - preConfigure = '' - cd src - configureFlagsArray=( - "--with-install-dir=$out" - "--without-links-dir" - "--with-examples-dir=$out/share/gprolog-${version}/examples" - "--with-doc-dir=$out/share/gprolog-${version}/doc" - ) - ''; - - postInstall = '' - mv -v $out/[A-Z]* $out/gprolog.ico $out/share/gprolog-${version}/ - ''; - - doCheck = true; - - meta = { - homepage = "https://www.gnu.org/software/gprolog/"; - description = "GNU Prolog, a free Prolog compiler with constraint solving over finite domains"; - license = lib.licenses.lgpl3Plus; - - longDescription = '' - GNU Prolog is a free Prolog compiler with constraint solving - over finite domains developed by Daniel Diaz. - - GNU Prolog accepts Prolog+constraint programs and produces - native binaries (like gcc does from a C source). The obtained - executable is then stand-alone. The size of this executable can - be quite small since GNU Prolog can avoid to link the code of - most unused built-in predicates. The performances of GNU Prolog - are very encouraging (comparable to commercial systems). - - Beside the native-code compilation, GNU Prolog offers a - classical interactive interpreter (top-level) with a debugger. - - The Prolog part conforms to the ISO standard for Prolog with - many extensions very useful in practice (global variables, OS - interface, sockets,...). - - GNU Prolog also includes an efficient constraint solver over - Finite Domains (FD). This opens contraint logic programming to - the user combining the power of constraint programming to the - declarativity of logic programming. - ''; - - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 83d60202a4fc..6db4e4312f29 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -18,12 +18,12 @@ , zlib # extra params , extraCLibs ? [ ] -, gtkSupport ? stdenv.isLinux +, gtkSupport ? stdenv.hostPlatform.isLinux , useMusl ? false , ... } @ args: -assert useMusl -> stdenv.isLinux; +assert useMusl -> stdenv.hostPlatform.isLinux; let extraArgs = builtins.removeAttrs args [ "lib" @@ -51,7 +51,7 @@ let "meta" ]; - cLibs = lib.optionals stdenv.isLinux ( + cLibs = lib.optionals stdenv.hostPlatform.isLinux ( [ glibc zlib.static ] ++ lib.optionals (!useMusl) [ glibc.static ] ++ lib.optionals useMusl [ musl ] @@ -86,7 +86,7 @@ let # # We therefor use --strip-components=1 vs 3 depending on the platform. tar xf "$src" -C "$out" --strip-components=${ - if stdenv.isLinux then "1" else "3" + if stdenv.hostPlatform.isLinux then "1" else "3" } # Sanity check @@ -104,15 +104,15 @@ let dontStrip = true; nativeBuildInputs = [ unzip makeWrapper ] - ++ lib.optional stdenv.isLinux autoPatchelfHook; + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; propagatedBuildInputs = [ setJavaClassPath zlib ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk_11_0.frameworks.Foundation; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk_11_0.frameworks.Foundation; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig - stdenv.cc.cc.lib # libstdc++.so.6 + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 xorg.libX11 xorg.libXext xorg.libXi @@ -120,23 +120,46 @@ let xorg.libXtst ]; - postInstall = '' - # jni.h expects jni_md.h to be in the header search path. - ln -sf $out/include/linux/*_md.h $out/include/ - - # copy-paste openjdk's preFixup - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat > $out/nix-support/setup-hook << EOF - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi - EOF - - wrapProgram $out/bin/native-image \ - --prefix PATH : ${binPath} \ - ${toString (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs)} - ''; - - preFixup = lib.optionalString (stdenv.isLinux) '' + postInstall = + let + cLibsAsFlags = (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs); + preservedNixVariables = [ + "-ELOCALE_ARCHIVE" + "-ENIX_BINTOOLS" + "-ENIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}" + "-ENIX_BUILD_CORES" + "-ENIX_BUILD_TOP" + "-ENIX_CC" + "-ENIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}" + "-ENIX_CFLAGS_COMPILE" + "-ENIX_HARDENING_ENABLE" + "-ENIX_LDFLAGS" + ]; + preservedNixVariablesAsFlags = (map (f: "--add-flags '${f}'") preservedNixVariables); + in + '' + # jni.h expects jni_md.h to be in the header search path. + ln -sf $out/include/linux/*_md.h $out/include/ + + mkdir -p $out/share + # move files in $out like LICENSE.txt + find $out/ -maxdepth 1 -type f -exec mv {} $out/share \; + # symbolic link to $out/lib/svm/LICENSE_NATIVEIMAGE.txt + rm -f $out/LICENSE_NATIVEIMAGE.txt + + # copy-paste openjdk's preFixup + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat > $out/nix-support/setup-hook << EOF + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi + EOF + + wrapProgram $out/bin/native-image \ + --prefix PATH : ${binPath} \ + ${toString (cLibsAsFlags ++ preservedNixVariablesAsFlags)} + ''; + + preFixup = lib.optionalString (stdenv.hostPlatform.isLinux) '' for bin in $(find "$out/bin" -executable -type f); do wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" done @@ -147,7 +170,7 @@ let runHook preInstallCheck ${# broken in darwin - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' echo "Testing Jshell" echo '1 + 1' | $out/bin/jshell ''} @@ -165,21 +188,19 @@ let echo "Testing GraalVM" $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' - extraNativeImageArgs="$(export -p | sed -n 's/^declare -x \([^=]\+\)=.*$/ -E\1/p' | tr -d \\n)" - echo "Ahead-Of-Time compilation" - $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces -march=compatibility $extraNativeImageArgs HelloWorld + $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces -march=compatibility HelloWorld ./helloworld | fgrep 'Hello World' ${# -H:+StaticExecutableWithDynamicLibC is only available in Linux - lib.optionalString (stdenv.isLinux && !useMusl) '' + lib.optionalString (stdenv.hostPlatform.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' ''} ${# --static is only available in Linux - lib.optionalString (stdenv.isLinux && useMusl) '' + lib.optionalString (stdenv.hostPlatform.isLinux && useMusl) '' echo "Ahead-Of-Time compilation with --static and --libc=musl" $out/bin/native-image $extraNativeImageArgs -march=compatibility --libc=musl --static HelloWorld ./helloworld | fgrep 'Hello World' diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix index 907441ff68c4..39b4136698c7 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix @@ -33,15 +33,15 @@ stdenv.mkDerivation ({ pname = product; nativeBuildInputs = [ makeWrapper ] - ++ lib.optional stdenv.isLinux autoPatchelfHook + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook ++ extraNativeBuildInputs; buildInputs = [ - stdenv.cc.cc.lib # libstdc++.so.6 + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 zlib libxcrypt-legacy # libcrypt.so.1 (default is .2 now) ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation ++ extraBuildInputs; unpackPhase = '' diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index bfc9c729689c..c546d65ef02c 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -5,7 +5,7 @@ lib.makeScope pkgs.newScope (self: { stdenv = - if pkgs.stdenv.isDarwin then + if pkgs.stdenv.hostPlatform.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; diff --git a/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix b/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix index 95e9c56fc23c..da971347652e 100644 --- a/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix @@ -17,7 +17,7 @@ graalvmCEPackages.buildGraalvmProduct { openssl ]; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/lib/mri/openssl.so \ --replace-needed libssl.so.10 libssl.so \ --replace-needed libcrypto.so.10 libcrypto.so @@ -31,7 +31,7 @@ graalvmCEPackages.buildGraalvmProduct { export LC_ALL=C $out/bin/ruby -e 'puts(1 + 1)' ${# broken in darwin with sandbox enabled - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' echo '1 + 1' | $out/bin/irb ''} ''; diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 738ecc81a156..19d24f47da47 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -1,59 +1,64 @@ -{ stdenv -, llvmPackages -, lib -, fetchFromGitHub -, cmake -, libffi -, libpng -, libjpeg -, mesa -, libGL -, eigen -, openblas -, blas -, lapack +{ + stdenv, + llvmPackages, + lib, + fetchFromGitHub, + cmake, + flatbuffers, + libffi, + libpng, + libjpeg, + mesa, + libGL, + eigen, + openblas, + blas, + lapack, + pythonSupport ? false, + python3Packages ? null, }: assert blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation rec { pname = "halide"; - version = "16.0.0"; + version = "18.0.0"; src = fetchFromGitHub { owner = "halide"; repo = "Halide"; rev = "v${version}"; - sha256 = "sha256-lJQrXkJgBmGb/QMSxwuPkkHOSgEDowLWzIolp1km2Y8="; + hash = "sha256-BPalUh9EgdCqVaWC1HoreyyRcPQc4QMIYnLrRoNDDCI="; }; - postPatch = '' - # See https://github.com/halide/Halide/issues/7785 - substituteInPlace 'src/runtime/HalideRuntime.h' \ - --replace '#if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__) - #define HALIDE_CPP_COMPILER_HAS_FLOAT16' \ - '#if defined(__x86_64__) || defined(__i386__) - #define HALIDE_CPP_COMPILER_HAS_FLOAT16' - '' - # Note: on x86_64-darwin, clang fails to find AvailabilityVersions.h, so we remove it. - # Halide uses AvailabilityVersions.h and TargetConditionals.h to determine whether - # ::aligned_alloc is available. For us, it isn't. - + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' - substituteInPlace 'src/runtime/HalideBuffer.h' \ - --replace '#ifdef __APPLE__ - #include <AvailabilityVersions.h> - #include <TargetConditionals.h> - #endif' \ - ' ' \ - --replace 'TARGET_OS_OSX && (__MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_15)' \ - '1' \ - --replace 'TARGET_OS_IPHONE && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_14_0)' \ - '0' - ''; + postPatch = + '' + # See https://github.com/halide/Halide/issues/7785 + substituteInPlace 'src/runtime/HalideRuntime.h' \ + --replace '#if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__) + #define HALIDE_CPP_COMPILER_HAS_FLOAT16' \ + '#if defined(__x86_64__) || defined(__i386__) + #define HALIDE_CPP_COMPILER_HAS_FLOAT16' + '' + # Note: on x86_64-darwin, clang fails to find AvailabilityVersions.h, so we remove it. + # Halide uses AvailabilityVersions.h and TargetConditionals.h to determine whether + # ::aligned_alloc is available. For us, it isn't. + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' + substituteInPlace 'src/runtime/HalideBuffer.h' \ + --replace '#ifdef __APPLE__ + #include <AvailabilityVersions.h> + #include <TargetConditionals.h> + #endif' \ + ' ' \ + --replace 'TARGET_OS_OSX && (__MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_15)' \ + '1' \ + --replace 'TARGET_OS_IPHONE && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_14_0)' \ + '0' + ''; cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" - "-DWITH_PYTHON_BINDINGS=OFF" + "-DWITH_PYTHON_BINDINGS=${if pythonSupport then "ON" else "OFF"}" "-DTARGET_WEBASSEMBLY=OFF" # Disable performance tests since they may fail on busy machines "-DWITH_TEST_PERFORMANCE=OFF" @@ -61,41 +66,79 @@ stdenv.mkDerivation rec { # v16 release (See https://github.com/halide/Halide/commit/09c5d1d19ec8e6280ccbc01a8a12decfb27226ba) # These tests also fail to compile on Darwin because of some missing command line options... "-DWITH_TEST_FUZZ=OFF" + # Disable FetchContent for flatbuffers and use the version from nixpkgs instead + "-DFLATBUFFERS_USE_FETCHCONTENT=OFF" + "-DPYBIND11_USE_FETCHCONTENT=OFF" ]; doCheck = true; - # Note: disable mullapudi2016_fibonacci because it requires too much - # parallelism for remote builders - preCheck = '' - checkFlagsArray+=("ARGS=-E 'mullapudi2016_fibonacci'") + preCheck = + let + disabledTests = lib.strings.concatStringsSep "|" [ + # Requires too much parallelism for remote builders. + "mullapudi2016_fibonacci" + # Take too long---we don't want to run these in CI. + "adams2019_test_apps_autoscheduler" + "anderson2021_test_apps_autoscheduler" + "correctness_cross_compilation" + "correctness_simd_op_check_hvx" + ]; + in + '' + checkFlagsArray+=("ARGS=-E '${disabledTests}'") + ''; + + postInstall = lib.optionalString pythonSupport '' + mkdir -p $out/${builtins.dirOf python3Packages.python.sitePackages} + mv -v $out/lib/python3/site-packages $out/${python3Packages.python.sitePackages} + rmdir $out/lib/python3/ ''; # Note: only openblas and not atlas part of this Nix expression # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix # to get a hint howto setup atlas instead of openblas - buildInputs = [ - llvmPackages.llvm - llvmPackages.lld - llvmPackages.openmp - llvmPackages.libclang - libffi - libpng - libjpeg - eigen - openblas - ] ++ lib.optionals (!stdenv.isDarwin) [ - mesa - libGL - ]; + buildInputs = + [ + llvmPackages.llvm + llvmPackages.lld + llvmPackages.openmp + llvmPackages.libclang + libffi + libpng + libjpeg + eigen + openblas + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + mesa + libGL + ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = + [ + cmake + flatbuffers + ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pybind11 + ]; + + propagatedBuildInputs = lib.optionals pythonSupport [ + python3Packages.numpy + python3Packages.imageio + ]; meta = with lib; { description = "C++ based language for image processing and computational photography"; homepage = "https://halide-lang.org"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ ck3d atila twesterhout ]; + maintainers = with maintainers; [ + ck3d + atila + twesterhout + ]; }; } diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 78e5770cc68e..4613b90113ef 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -65,7 +65,7 @@ let ] ++ (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 + ++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.hostPlatform.isDarwin) Security ++ ocamlDependencies version; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/hop/default.nix b/pkgs/development/compilers/hop/default.nix deleted file mode 100644 index 0c1f2a09e123..000000000000 --- a/pkgs/development/compilers/hop/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, bigloo }: - -# Compute the “release” version of bigloo (before the first dash, if any) -let bigloo-release = - let inherit (lib) head splitString; in - head (splitString "-" (builtins.parseDrvName bigloo.name).version) -; in - -stdenv.mkDerivation rec { - pname = "hop"; - version = "3.4.4"; - src = fetchurl { - url = "ftp://ftp-sop.inria.fr/indes/fp/Hop/hop-${version}.tar.gz"; - sha256 = "sha256-GzXh4HC+SFFoUi7SMqu36iYRPAJ6tMnOHd+he6n9k1I="; - }; - - postPatch = '' - substituteInPlace configure --replace "(os-tmp)" '(getenv "TMPDIR")' - ''; - - buildInputs = [ bigloo ]; - - configureFlags = [ - "--bigloo=${bigloo}/bin/bigloo" - "--bigloolibdir=${bigloo}/lib/bigloo/${bigloo-release}/" - ]; - - meta = with lib; { - description = "Multi-tier programming language for the Web 2.0 and the so-called diffuse Web"; - homepage = "http://hop.inria.fr/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ vbgl ]; - }; -} diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index 8f628246c649..57031f673d3e 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -4,5 +4,7 @@ idris2Api = callPackage ./idris2-api.nix { }; idris2Lsp = callPackage ./idris2-lsp.nix { }; + pack = callPackage ./pack.nix { }; + buildIdris = callPackage ./build-idris.nix { }; } diff --git a/pkgs/development/compilers/idris2/idris2.nix b/pkgs/development/compilers/idris2/idris2.nix index 2d5ec9a28368..6f39eea61868 100644 --- a/pkgs/development/compilers/idris2/idris2.nix +++ b/pkgs/development/compilers/idris2/idris2.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { makeWrapper clang platformChez - ] ++ lib.optionals stdenv.isDarwin [ zsh ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ]; buildInputs = [ platformChez gmp @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { patchShebangs --build tests ''; - makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional stdenv.isDarwin "OS="; + makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional stdenv.hostPlatform.isDarwin "OS="; # The name of the main executable of pkgs.chez is `scheme` buildFlags = [ diff --git a/pkgs/development/compilers/idris2/pack.nix b/pkgs/development/compilers/idris2/pack.nix new file mode 100644 index 000000000000..7e65a3f73a77 --- /dev/null +++ b/pkgs/development/compilers/idris2/pack.nix @@ -0,0 +1,55 @@ +{ + lib, + idris2Packages, + fetchFromGitHub, +}: +let + inherit (idris2Packages) idris2Api buildIdris; + toml = buildIdris { + ipkgName = "toml"; + version = "2022-05-05"; + src = fetchFromGitHub { + owner = "cuddlefishie"; + repo = "toml-idr"; + rev = "b4f5a4bd874fa32f20d02311a62a1910dc48123f"; + hash = "sha256-+bqfCE6m0aJ+S65urT+zQLuZUtUkC1qcuSsefML/fAE="; + }; + idrisLibraries = [ ]; + }; + filepath = buildIdris { + ipkgName = "filepath"; + version = "2023-12-04"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-filepath"; + rev = "eac02d51b631633f32330c788bcebeb24221fa09"; + hash = "sha256-noylxQvT2h50H0xmAiwe/cI6vz5gkbOhSD7mXuhJGfU="; + }; + idrisLibraries = [ ]; + }; + packPkg = buildIdris { + ipkgName = "pack"; + version = "2024-02-07"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-pack"; + rev = "305123401a28a57b02f750c589c35af628b2a5eb"; + hash = "sha256-IPAkwe6fEYWT3mpyKKkUPU0qFJX9gGIM1f7OeNWyB9w="; + }; + idrisLibraries = [ + idris2Api + toml + filepath + ]; + + meta = { + description = "An Idris2 Package Manager with Curated Package Collections"; + mainProgram = "pack"; + homepage = "https://github.com/stefan-hoeck/idris2-pack"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mattpolzin ]; + inherit (idris2Packages.idris2.meta) platforms; + }; + }; +in +packPkg.executable diff --git a/pkgs/development/compilers/idris2/tests.nix b/pkgs/development/compilers/idris2/tests.nix index bb5cd140c90c..b4193286d49c 100644 --- a/pkgs/development/compilers/idris2/tests.nix +++ b/pkgs/development/compilers/idris2/tests.nix @@ -28,7 +28,7 @@ let # is not the case with pure nix environments. Thus, we need to include zsh # when we build for darwin in tests. While this is impure, this is also what # we find in real darwin hosts. - nativeBuildInputs = lib.optionals stdenv.isDarwin [ zsh ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ zsh ]; } '' set -eo pipefail diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix deleted file mode 100644 index cb464e3484c2..000000000000 --- a/pkgs/development/compilers/inform7/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchzip, coreutils, perl, gnutar, gzip }: -let - version = "6M62"; -in stdenv.mkDerivation { - pname = "inform7"; - inherit version; - buildInputs = [ perl coreutils gnutar gzip ]; - src = fetchzip { - url = "http://inform7.com/download/content/6M62/I7_6M62_Linux_all.tar.gz"; - sha256 = "0bk0pfymvsn1g8ci0pfdw7dgrlzb232a8pc67y2xk6zgpf3m41vj"; - }; - preConfigure = "touch Makefile.PL"; - buildPhase = ""; - installPhase = '' - mkdir -p $out - pushd $src - ./install-inform7.sh --prefix $out - popd - - substituteInPlace "$out/bin/i7" \ - --replace "/usr/bin/perl" "${perl}/bin/perl" - ''; - - meta = with lib; { - description = "Design system for interactive fiction"; - mainProgram = "i7"; - homepage = "http://inform7.com/"; - license = licenses.artistic2; - maintainers = with maintainers; [ mbbx6spp ]; - platforms = platforms.unix; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); - }; -} diff --git a/pkgs/development/compilers/inklecate/default.nix b/pkgs/development/compilers/inklecate/default.nix deleted file mode 100644 index 52c278a1bd30..000000000000 --- a/pkgs/development/compilers/inklecate/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, buildDotnetModule -, dotnetCorePackages -, fetchFromGitHub -}: - -buildDotnetModule rec { - pname = "inklecate"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "inkle"; - repo = "ink"; - rev = "v${version}"; - hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA=="; - }; - - buildInputs = [ stdenv.cc.cc.lib ]; - - projectFile = "inklecate/inklecate.csproj"; - nugetDeps = ./deps.nix; - executables = [ "inklecate" ]; - - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; - - meta = with lib; { - description = "Compiler for ink, inkle's scripting language"; - mainProgram = "inklecate"; - longDescription = '' - Inklecate is a command-line compiler for ink, inkle's open source - scripting language for writing interactive narrative - ''; - homepage = "https://www.inklestudios.com/ink/"; - downloadPage = "https://github.com/inkle/ink/"; - license = licenses.mit; - platforms = platforms.unix; - badPlatforms = platforms.aarch64; - maintainers = with maintainers; [ shreerammodi ]; - }; -} diff --git a/pkgs/development/compilers/inklecate/deps.nix b/pkgs/development/compilers/inklecate/deps.nix deleted file mode 100644 index f3a17967e25c..000000000000 --- a/pkgs/development/compilers/inklecate/deps.nix +++ /dev/null @@ -1,5 +0,0 @@ -# This file was automatically generated by passthru.fetch-deps. -# Please dont edit it manually, your changes might get overwritten! - -{ fetchNuGet }: [ -] diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix deleted file mode 100644 index ef3ff5ff4565..000000000000 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, bash -, cmake -, runCommandLocal -, bison -, flex -, intel-compute-runtime -, llvmPackages_14 -, opencl-clang -, python3 -, spirv-tools -, spirv-headers -, spirv-llvm-translator - -, buildWithPatches ? true -}: - -let - vc_intrinsics_src = fetchFromGitHub { - owner = "intel"; - repo = "vc-intrinsics"; - rev = "v0.19.0"; - hash = "sha256-vOK7xfOR+aDpdGd8oOFLJc1Ct1S5BCJmLN6Ubn5wlkQ="; - }; - - inherit (llvmPackages_14) lld llvm; - inherit (if buildWithPatches then opencl-clang else llvmPackages_14) clang libclang; - spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; }; -in - -stdenv.mkDerivation rec { - pname = "intel-graphics-compiler"; - version = "1.0.17384.11"; - - src = fetchFromGitHub { - owner = "intel"; - repo = "intel-graphics-compiler"; - rev = "igc-${version}"; - hash = "sha256-O4uMaPauRv2aMgM2B7XdzCcjI5JghsjX5XbkeloLyck="; - }; - - postPatch = '' - substituteInPlace IGC/AdaptorOCL/igc-opencl.pc.in \ - --replace-fail '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \ - --replace-fail '/@CMAKE_INSTALL_LIBDIR@' "/lib" - - chmod +x IGC/Scripts/igc_create_linker_script.sh - patchShebangs --build IGC/Scripts/igc_create_linker_script.sh - ''; - - nativeBuildInputs = [ bash bison cmake flex (python3.withPackages (ps : with ps; [ mako pyyaml ])) ]; - - buildInputs = [ lld llvm spirv-headers spirv-llvm-translator' spirv-tools ]; - - strictDeps = true; - - # testing is done via intel-compute-runtime - doCheck = false; - - # Handholding the braindead build script - # cmake requires an absolute path - prebuilds = runCommandLocal "igc-cclang-prebuilds" { } '' - mkdir $out - ln -s ${clang}/bin/clang $out/ - ln -s ${opencl-clang}/lib/* $out/ - ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c.h $out/ - ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c-base.h $out/ - ''; - - cmakeFlags = [ - "-DVC_INTRINSICS_SRC=${vc_intrinsics_src}" - "-DCCLANG_BUILD_PREBUILDS=ON" - "-DCCLANG_BUILD_PREBUILDS_DIR=${prebuilds}" - "-DIGC_OPTION__SPIRV_TOOLS_MODE=Prebuilds" - "-DIGC_OPTION__VC_INTRINSICS_MODE=Source" - "-Wno-dev" - ]; - - passthru.tests = { - inherit intel-compute-runtime; - }; - - meta = with lib; { - description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware"; - homepage = "https://github.com/intel/intel-graphics-compiler"; - changelog = "https://github.com/intel/intel-graphics-compiler/releases/tag/${src.rev}"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index b8c48c5c6a01..c98712f5d964 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub -, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode, tbb +, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, tbb # the default test target is sse4, but that is not supported by all Hydra agents -, testedTargets ? if stdenv.isAarch64 || stdenv.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ] +, testedTargets ? if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ] }: stdenv.mkDerivation rec { pname = "ispc"; - version = "1.24.0"; + version = "1.25.3"; dontFixCmake = true; # https://github.com/NixOS/nixpkgs/pull/232522#issuecomment-2133803566 @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-1Ns8w34fXgYrSu3XE89uowjaVoW3MOgKYV1Jb/XRj1Q="; + sha256 = "sha256-baTJNfhOSYfJJnrutkW06AIMXpVP3eBpEes0GSI1yGY="; }; - nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ]; + nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ]; buildInputs = with llvmPackages; [ libllvm libclang openmp ncurses @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { echo "================================" echo (cd ../ - PATH=${llvmPackages.clang}/bin:$PATH python run_tests.py -t $target --non-interactive --verbose --file=test_output.log + PATH=${llvmPackages.clang}/bin:$PATH python scripts/run_tests.py -t $target --non-interactive --verbose --file=test_output.log fgrep -q "No new fails" test_output.log || exit 1) done ''; @@ -61,10 +61,8 @@ stdenv.mkDerivation rec { "-DCLANGPP_EXECUTABLE=${llvmPackages.clang}/bin/clang++" "-DISPC_INCLUDE_EXAMPLES=OFF" "-DISPC_INCLUDE_UTILS=OFF" - ("-DARM_ENABLED=" + (if stdenv.isAarch64 || stdenv.isAarch32 then "TRUE" else "FALSE")) - ("-DX86_ENABLED=" + (if stdenv.isx86_64 || stdenv.isx86_32 then "TRUE" else "FALSE")) - ] ++ lib.lists.optionals stdenv.isDarwin [ - "-DISPC_MACOS_SDK_PATH=${xcode}/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" + ("-DARM_ENABLED=" + (if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then "TRUE" else "FALSE")) + ("-DX86_ENABLED=" + (if stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isx86_32 then "TRUE" else "FALSE")) ]; meta = with lib; { diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix deleted file mode 100644 index a19dd7cfb603..000000000000 --- a/pkgs/development/compilers/jasmin-compiler/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, lib, fetchurl, ocamlPackages, mpfr, ppl }: - -stdenv.mkDerivation rec { - pname = "jasmin-compiler"; - 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-jE1LSL/fW7RKE5GeVzYtw4aFxtzTiz7IasD5YwDm4HE="; - }; - - sourceRoot = "jasmin-compiler-v${version}/compiler"; - - nativeBuildInputs = with ocamlPackages; [ ocaml findlib dune_3 menhir camlidl cmdliner ]; - - buildInputs = [ - mpfr - ppl - ] ++ (with ocamlPackages; [ - apron - yojson - ]); - - propagatedBuildInputs = with ocamlPackages; [ - angstrom - batteries - menhirLib - zarith - ]; - - outputs = [ "bin" "lib" "out" ]; - - installPhase = '' - runHook preInstall - dune build @install - dune install --prefix=$bin --libdir=$out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib - mkdir -p $lib/lib/jasmin/easycrypt - cp ../eclib/*.ec $lib/lib/jasmin/easycrypt - runHook postInstall - ''; - - meta = { - description = "Workbench for high-assurance and high-speed cryptography"; - homepage = "https://github.com/jasmin-lang/jasmin/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.vbgl ]; - mainProgram = "jasminc"; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/jasmin/default.nix b/pkgs/development/compilers/jasmin/default.nix deleted file mode 100644 index e10109979f32..000000000000 --- a/pkgs/development/compilers/jasmin/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, stdenv -, fetchurl -, unzip -, ant -, jdk8 -, makeWrapper -, stripJavaArchivesHook -, callPackage -}: - -let - jdk = jdk8; - jre = jdk8.jre; - -in stdenv.mkDerivation (finalAttrs: { - pname = "jasmin"; - version = "2.4"; - - src = fetchurl { - url = "mirror://sourceforge/jasmin/jasmin-${finalAttrs.version}.zip"; - hash = "sha256-6qEMaM7Gggb9EC6exxE3OezNeQEIoblabow+k/IORJ0="; - }; - - nativeBuildInputs = [ - unzip - ant - jdk - makeWrapper - stripJavaArchivesHook - ]; - - buildPhase = '' - runHook preBuild - ant all - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -Dm644 jasmin.jar $out/share/java/jasmin.jar - makeWrapper ${jre}/bin/java $out/bin/jasmin \ - --add-flags "-jar $out/share/java/jasmin.jar" - - runHook postInstall - ''; - - passthru.tests = { - minimal-module = callPackage ./test-assemble-hello-world {}; - }; - - meta = with lib; { - description = "Assembler for the Java Virtual Machine"; - downloadPage = "https://sourceforge.net/projects/jasmin/files/latest/download"; - homepage = "https://jasmin.sourceforge.net/"; - license = licenses.bsd3; - mainProgram = "jasmin"; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j b/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j deleted file mode 100644 index 564e6c8a9aa2..000000000000 --- a/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j +++ /dev/null @@ -1,31 +0,0 @@ -.class public HelloWorld -.super java/lang/Object - -; -; standard initializer (calls java.lang.Object's initializer) -; -.method public <init>()V - aload_0 - invokenonvirtual java/lang/Object/<init>()V - return -.end method - -; -; main() - prints out Hello World -; -.method public static main([Ljava/lang/String;)V - .limit stack 2 ; up to two items can be pushed - - ; push System.out onto the stack - getstatic java/lang/System/out Ljava/io/PrintStream; - - ; push a string onto the stack - ldc "Hello World!" - - ; call the PrintStream.println() method. - invokevirtual java/io/PrintStream/println(Ljava/lang/String;)V - - ; done - return -.end method - diff --git a/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix b/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix deleted file mode 100644 index 1840edffa779..000000000000 --- a/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, jasmin, jre }: - -stdenv.mkDerivation { - name = "jasmin-test-assemble-hello-world"; - meta.timeout = 60; - buildCommand = '' - ${jasmin}/bin/jasmin ${./HelloWorld.j} - ${jre}/bin/java HelloWorld | grep "Hello World" - touch $out - ''; -} - diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/pkgs/development/compilers/javacard-devkit/default.nix deleted file mode 100644 index c9e9b34e6ee0..000000000000 --- a/pkgs/development/compilers/javacard-devkit/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, stdenv, requireFile, unzip, makeWrapper, oraclejdk8, autoPatchelfHook -, pcsclite -}: - -stdenv.mkDerivation rec { - pname = "javacard-devkit"; - version = "2.2.2"; - uscoreVersion = builtins.replaceStrings ["."] ["_"] version; - - src = requireFile { - name = "java_card_kit-${uscoreVersion}-linux.zip"; - url = "http://www.oracle.com/technetwork/java/javasebusiness/downloads/" - + "java-archive-downloads-javame-419430.html#java_card_kit-2.2.2-oth-JPR"; - sha256 = "1rzkw8izqq73ifvyp937wnjjc40a40drc4zsm0l1s6jyv3d7agb2"; - }; - - nativeBuildInputs = [ unzip oraclejdk8 makeWrapper autoPatchelfHook ]; - buildInputs = [ pcsclite ]; - - zipPrefix = "java_card_kit-${uscoreVersion}"; - - sourceRoot = "."; - unpackCmd = '' - unzip -p "$curSrc" "$zipPrefix/$zipPrefix-rr-bin-linux-do.zip" | jar x - ''; - - installPhase = '' - mkdir -p "$out/share/$pname" - cp -rt "$out/share/$pname" api_export_files - cp -rt "$out" lib - - for i in bin/*; do - case "$i" in - *.so) install -vD "$i" "$out/libexec/$pname/$(basename "$i")";; - *) target="$out/bin/$(basename "$i")" - install -vD "$i" "$target" - sed -i -e 's|^$JAVA_HOME/bin/java|''${JAVA:-$JAVA_HOME/bin/java}|' "$target" - wrapProgram "$target" \ - --set JAVA_HOME "$JAVA_HOME" \ - --prefix CLASSPATH : "$out/share/$pname/api_export_files" - ;; - esac - done - - makeWrapper "$JAVA_HOME/bin/javac" "$out/bin/javacardc" \ - --prefix CLASSPATH : "$out/lib/api.jar" - ''; - - meta = { - description = "Official development kit by Oracle for programming for the Java Card platform"; - longDescription = '' - This Java Card SDK is the official SDK made available by Oracle for programming for the Java Card platform. - - Instructions for usage: - - First, compile your '.java' (NixOS-specific: you should not need to set the class path -- if you need, it's a bug): - javacardc -source 1.5 -target 1.5 [MyJavaFile].java - Then, test with 'jcwde' (NixOS-specific: you can change the java version used to run jcwde with eg. JAVA=jdb): - CLASSPATH=. jcwde [MyJcwdeConfig].app & sleep 1 && apdutool [MyApdus].apdu - Finally, convert the '.class' file into a '.cap': - converter -applet [AppletAID] [MyApplet] [myPackage] [PackageAID] [Version] - For more details, please refer to the documentation by Oracle - ''; - homepage = "https://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.ekleog ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/compilers/jetbrains-jdk/17.nix b/pkgs/development/compilers/jetbrains-jdk/17.nix index 76d4079baafb..a868a441ba4c 100644 --- a/pkgs/development/compilers/jetbrains-jdk/17.nix +++ b/pkgs/development/compilers/jetbrains-jdk/17.nix @@ -147,7 +147,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { inherit (openjdk17.meta) license platforms mainProgram; maintainers = with maintainers; [ edwtjo ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; passthru = oldAttrs.passthru // { diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 59a6704e3103..77ac8e904d47 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -147,7 +147,7 @@ jdk.overrideAttrs (oldAttrs: rec { inherit (jdk.meta) license platforms mainProgram; maintainers = with maintainers; [ edwtjo ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; passthru = oldAttrs.passthru // { diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix index 537133524a2c..9cda4fc51623 100644 --- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix +++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix @@ -45,7 +45,7 @@ , thrift }: -assert !stdenv.isDarwin; +assert !stdenv.hostPlatform.isDarwin; # I can't test darwin let diff --git a/pkgs/development/compilers/jrsonnet/Cargo.lock b/pkgs/development/compilers/jrsonnet/Cargo.lock deleted file mode 100644 index 941503289d9a..000000000000 --- a/pkgs/development/compilers/jrsonnet/Cargo.lock +++ /dev/null @@ -1,551 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "annotate-snippets" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c96c3d1062ea7101741480185a6a1275eab01cbe8b20e378d1311bc056d2e08" -dependencies = [ - "unicode-width", - "yansi-term", -] - -[[package]] -name = "anyhow" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "base64" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "cc" -version = "1.0.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" - -[[package]] -name = "clap" -version = "3.0.0-beta.2" -source = "git+https://github.com/clap-rs/clap?rev=f0c5ea5e1503de5c8e74d8c047a799cf51498e83#f0c5ea5e1503de5c8e74d8c047a799cf51498e83" -dependencies = [ - "atty", - "bitflags", - "clap_derive", - "indexmap", - "lazy_static", - "os_str_bytes", - "strsim", - "termcolor", - "textwrap", - "vec_map", -] - -[[package]] -name = "clap_derive" -version = "3.0.0-beta.2" -source = "git+https://github.com/clap-rs/clap?rev=f0c5ea5e1503de5c8e74d8c047a799cf51498e83#f0c5ea5e1503de5c8e74d8c047a799cf51498e83" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_generate" -version = "3.0.0-beta.2" -source = "git+https://github.com/clap-rs/clap?rev=f0c5ea5e1503de5c8e74d8c047a799cf51498e83#f0c5ea5e1503de5c8e74d8c047a799cf51498e83" -dependencies = [ - "clap", -] - -[[package]] -name = "hashbrown" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" - -[[package]] -name = "heck" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" -dependencies = [ - "libc", -] - -[[package]] -name = "indexmap" -version = "1.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "itoa" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" - -[[package]] -name = "jrsonnet" -version = "0.4.2" -dependencies = [ - "clap", - "clap_generate", - "jrsonnet-cli", - "jrsonnet-evaluator", - "jrsonnet-parser", - "mimallocator", - "thiserror", -] - -[[package]] -name = "jrsonnet-cli" -version = "0.4.2" -dependencies = [ - "clap", - "jrsonnet-evaluator", - "jrsonnet-gc", - "jrsonnet-parser", -] - -[[package]] -name = "jrsonnet-evaluator" -version = "0.4.2" -dependencies = [ - "annotate-snippets", - "anyhow", - "base64", - "bincode", - "jrsonnet-gc", - "jrsonnet-interner", - "jrsonnet-parser", - "jrsonnet-stdlib", - "jrsonnet-types", - "md5", - "pathdiff", - "rustc-hash", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "jrsonnet-gc" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68da8bc2f00117b1373bb8877af03b1d391e4c4800e6585d7279e5b99c919dde" -dependencies = [ - "jrsonnet-gc-derive", -] - -[[package]] -name = "jrsonnet-gc-derive" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcba9c387b64b054f06cc4d724905296e21edeeb7506847f3299117a2d92d12" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "jrsonnet-interner" -version = "0.4.2" -dependencies = [ - "jrsonnet-gc", - "rustc-hash", - "serde", -] - -[[package]] -name = "jrsonnet-parser" -version = "0.4.2" -dependencies = [ - "jrsonnet-gc", - "jrsonnet-interner", - "jrsonnet-stdlib", - "peg", - "serde", - "unescape", -] - -[[package]] -name = "jrsonnet-stdlib" -version = "0.4.2" - -[[package]] -name = "jrsonnet-types" -version = "0.4.2" -dependencies = [ - "jrsonnet-gc", - "peg", -] - -[[package]] -name = "jsonnet" -version = "0.4.2" -dependencies = [ - "jrsonnet-evaluator", - "jrsonnet-gc", - "jrsonnet-parser", -] - -[[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.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" - -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - -[[package]] -name = "mimalloc-sys" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa3cefb626f6ae3d0b2f71c5378c89d2b1d4d7bc246b0ca9a7ee61a4daad291" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "mimallocator" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d44fe4ebf6b538fcf39d9975c2b90bb3232d1ba8e8bffeacd004f27b20c577a" -dependencies = [ - "mimalloc-sys", -] - -[[package]] -name = "os_str_bytes" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e293568965aea261bdf010db17df7030e3c9a275c415d51d6112f7cf9b7af012" - -[[package]] -name = "pathdiff" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877630b3de15c0b64cc52f659345724fbf6bdad9bd9566699fc53688f3c34a34" - -[[package]] -name = "peg" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c0b841ea54f523f7aa556956fbd293bcbe06f2e67d2eb732b7278aaf1d166a" -dependencies = [ - "peg-macros", - "peg-runtime", -] - -[[package]] -name = "peg-macros" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aa52829b8decbef693af90202711348ab001456803ba2a98eb4ec8fb70844c" -dependencies = [ - "peg-runtime", - "proc-macro2", - "quote", -] - -[[package]] -name = "peg-runtime" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c719dcf55f09a3a7e764c6649ab594c18a177e3599c467983cdf644bfc0a4088" - -[[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", - "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-macro2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quote" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "serde" -version = "1.0.125" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.125" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "1.0.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad184cc9470f9117b2ac6817bfe297307418819ba40552f9b3846f05c33d5373" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "synstructure" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "unicode-xid", -] - -[[package]] -name = "termcolor" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "unescape" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e" - -[[package]] -name = "unicode-segmentation" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[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 = "yansi-term" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" -dependencies = [ - "winapi", -] diff --git a/pkgs/development/compilers/jrsonnet/default.nix b/pkgs/development/compilers/jrsonnet/default.nix deleted file mode 100644 index 2031c006de6f..000000000000 --- a/pkgs/development/compilers/jrsonnet/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv }: - -rustPlatform.buildRustPackage rec { - pname = "jrsonnet"; - version = "0.4.2"; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "CertainLach"; - repo = "jrsonnet"; - sha256 = "sha256-OX+iJJ3vdCsWWr8x31psV9Vne6xWDZnJc83NbJqMK1A="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "clap-3.0.0-beta.2" = "sha256-BaLzm2JZEicktfsCIXQipHtEKlEv2lBktfvHP58rjeM="; - }; - }; - - nativeBuildInputs = [ installShellFiles ]; - - # skip flaky tests - checkFlags = [ - "--skip=tests::native_ext" - ]; - - 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) - installShellCompletion --cmd jsonnet \ - --$shell <($out/bin/jrsonnet --generate $shell /dev/null | sed s/jrsonnet/jsonnet/g) - done - ''; - - meta = with lib; { - description = "Purely-functional configuration language that helps you define JSON data"; - homepage = "https://github.com/CertainLach/jrsonnet"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda lach ]; - }; -} diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix deleted file mode 100644 index 8e723cdb8211..000000000000 --- a/pkgs/development/compilers/jsonnet/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, lib, jekyll, cmake, fetchFromGitHub, gtest }: - -stdenv.mkDerivation rec { - pname = "jsonnet"; - version = "0.20.0"; - outputs = [ "out" "doc" ]; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "google"; - repo = "jsonnet"; - sha256 = "sha256-FtVJE9alEl56Uik+nCpJMV5DMVVmRCnE1xMAiWdK39Y="; - }; - - nativeBuildInputs = [ jekyll cmake ]; - buildInputs = [ gtest ]; - - cmakeFlags = [ - "-DUSE_SYSTEM_GTEST=ON" - "-DBUILD_STATIC_LIBS=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}" - ] ++ lib.optionals (!stdenv.isDarwin) [ - "-DBUILD_SHARED_BINARIES=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - ]; - - # https://github.com/google/jsonnet/issues/778 - patches = [ - ./fix-cpp-unresolved-symbols.patch - ]; - - enableParallelBuilding = true; - - # Upstream writes documentation in html, not in markdown/rst, so no - # other output formats, sorry. - postBuild = '' - jekyll build --source ../doc --destination ./html - ''; - - postInstall = '' - mkdir -p $out/share/doc/jsonnet - cp -r ./html $out/share/doc/jsonnet - ''; - - meta = { - description = "Purely-functional configuration language that helps you define JSON data"; - maintainers = with lib.maintainers; [ benley copumpkin ]; - license = lib.licenses.asl20; - homepage = "https://github.com/google/jsonnet"; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/compilers/jsonnet/fix-cpp-unresolved-symbols.patch b/pkgs/development/compilers/jsonnet/fix-cpp-unresolved-symbols.patch deleted file mode 100644 index dc4cdcf2ea1b..000000000000 --- a/pkgs/development/compilers/jsonnet/fix-cpp-unresolved-symbols.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt -index 3a52458..872e6c6 100644 ---- a/cpp/CMakeLists.txt -+++ b/cpp/CMakeLists.txt -@@ -10,6 +10,7 @@ set(LIBJSONNETPP_SOURCE - - add_library(libjsonnet++ SHARED ${LIBJSONNETPP_HEADERS} ${LIBJSONNETPP_SOURCE}) - add_dependencies(libjsonnet++ jsonnet) -+target_link_libraries(libjsonnet++ libjsonnet) - # target_link_libraries(libjsonnet libjsonnet) - - # CMake prepends CMAKE_SHARED_LIBRARY_PREFIX to shared libraries, so without diff --git a/pkgs/development/compilers/julia/1.6-bin.nix b/pkgs/development/compilers/julia/1.6-bin.nix deleted file mode 100644 index dea8a140ee5f..000000000000 --- a/pkgs/development/compilers/julia/1.6-bin.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ autoPatchelfHook, fetchurl, lib, stdenv }: - -stdenv.mkDerivation rec { - pname = "julia-bin"; - version = "1.6.7"; - - src = { - x86_64-linux = fetchurl { - url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "sha256-bEUi1ZXky80AFXrEWKcviuwBdXBT0gc/mdqjnkQrKjY="; - }; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - # Julia’s source files are in different locations for source and binary - # releases. Thus we temporarily create a symlink to allow us to share patches - # with source releases. - prePatch = '' - ln -s share/julia/test - ''; - patches = [ - # Source release Nix patch(es) relevant for binary releases as well. - ./patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch - ]; - postPatch = '' - # Revert symlink hack. - rm test - - # Julia fails to pick up our Certification Authority root certificates, but - # it provides its own so we can simply disable the test. Patching in the - # dynamic path to ours require us to rebuild the Julia system image. - substituteInPlace share/julia/stdlib/v${lib.versions.majorMinor version}/NetworkOptions/test/runtests.jl \ - --replace '@test ca_roots_path() != bundled_ca_roots()' \ - '@test_skip ca_roots_path() != bundled_ca_roots()' - ''; - - nativeBuildInputs = [ autoPatchelfHook ]; - - installPhase = '' - runHook preInstall - cp -r . $out - runHook postInstall - ''; - - # Breaks backtraces, etc. - dontStrip = true; - - doInstallCheck = true; - preInstallCheck = '' - # Some tests require read/write access to $HOME. - export HOME="$TMPDIR" - ''; - installCheckPhase = '' - runHook preInstallCheck - # Command lifted from `test/Makefile`. - $out/bin/julia \ - --check-bounds=yes \ - --startup-file=no \ - --depwarn=error \ - $out/share/julia/test/runtests.jl - runHook postInstallCheck - ''; - - meta = { - description = "High-level, high-performance, dynamic language for technical computing"; - homepage = "https://julialang.org"; - # Bundled and linked with various GPL code, although Julia itself is MIT. - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ raskin thomasjm ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "julia"; - }; -} diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index becbd64ea55b..6a805b5ccb83 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -12,7 +12,6 @@ let in { - julia_16-bin = wrapJulia (callPackage ./1.6-bin.nix { }); julia_19-bin = wrapJulia (callPackage (import ./generic-bin.nix { version = "1.9.4"; @@ -39,6 +38,17 @@ in }; }) { }); + julia_111-bin = wrapJulia (callPackage + (import ./generic-bin.nix { + version = "1.11.1"; + sha256 = { + x86_64-linux = "cca8d13dc4507e4f62a129322293313ee574f300d4df9e7db30b7b41c5f8a8f3"; + aarch64-linux = "bd623ef3801c5a56103464d349c7901d5cc034405ad289332c67f1e8ecc05840"; + x86_64-darwin = "59885de9310788c1ed12f41e7d2c2f05eabd314888cd105d299837b76a4a7240"; + aarch64-darwin = "e09d13e1c6c98452e91e698220688dd784ec8e5367e9e6443099c5f9aa2add78"; + }; + }) + { }); julia_19 = wrapJulia (callPackage (import ./generic.nix { version = "1.9.4"; @@ -57,4 +67,13 @@ in ]; }) { }); + julia_111 = wrapJulia (callPackage + (import ./generic.nix { + version = "1.11.1"; + hash = "sha256-pJuATeboagP+Jsc/WIUeruH/JD1yBPK1rk28XB3CdY0="; + patches = [ + ./patches/1.11/0002-skip-failing-and-flaky-tests.patch + ]; + }) + { }); } diff --git a/pkgs/development/compilers/julia/generic-bin.nix b/pkgs/development/compilers/julia/generic-bin.nix index 09a8c2bce3bf..a7d7f127d5e4 100644 --- a/pkgs/development/compilers/julia/generic-bin.nix +++ b/pkgs/development/compilers/julia/generic-bin.nix @@ -24,14 +24,19 @@ let "REPL" # Test flaky "ccall" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals (lib.versionAtLeast version "1.11") [ + # Test flaky + # https://github.com/JuliaLang/julia/issues/54280 + "loading" + "cmdlineargs" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Test flaky on ofborg "FileWatching" # Test requires pbcopy "InteractiveUtils" # Test requires network access "Sockets" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # Test Failed at $out/share/julia/stdlib/v1.8/LinearAlgebra/test/blas.jl:702 "LinearAlgebra/blas" # Test Failed at $out/share/julia/test/misc.jl:724 @@ -71,7 +76,7 @@ stdenv.mkDerivation { '@test_skip ca_roots_path() != bundled_ca_roots()' ''; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook # https://github.com/JuliaLang/julia/blob/v1.9.0/NEWS.md#external-dependencies stdenv.cc.cc diff --git a/pkgs/development/compilers/julia/generic.nix b/pkgs/development/compilers/julia/generic.nix index e3360137ca74..16f7bbce0759 100644 --- a/pkgs/development/compilers/julia/generic.nix +++ b/pkgs/development/compilers/julia/generic.nix @@ -9,12 +9,14 @@ , which , python3 , gfortran +, cacert , cmake , perl , gnum4 , openssl , libxml2 , zlib +, buildPackages }: stdenv.mkDerivation rec { @@ -42,21 +44,27 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 zlib + ] ++ lib.optionals (lib.versionAtLeast version "1.11") [ + cacert ]; dontUseCmakeConfigure = true; postPatch = '' patchShebangs . + '' + lib.optionalString (lib.versionAtLeast version "1.11") '' + substituteInPlace deps/curl.mk \ + --replace-fail 'cd $(dir $<) && $(TAR) jxf $(notdir $<)' \ + 'cd $(dir $<) && $(TAR) jxf $(notdir $<) && sed -i "s|/usr/bin/env perl|${lib.getExe buildPackages.perl}|" curl-$(CURL_VER)/scripts/cd2nroff' ''; makeFlags = [ "prefix=$(out)" "USE_BINARYBUILDER=0" - ] ++ lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ # https://github.com/JuliaCI/julia-buildkite/blob/main/utilities/build_envs.sh "JULIA_CPU_TARGET=generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1);x86-64-v4,-rdrnd,base(1)" - ] ++ lib.optionals stdenv.isAarch64 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "JULIA_CPU_TARGET=generic;cortex-a57;thunderx2t99;carmel,clone_all;apple-m1,base(3);neoverse-512tvb,base(3)" ]; diff --git a/pkgs/development/compilers/julia/patches/1.11/0002-skip-failing-and-flaky-tests.patch b/pkgs/development/compilers/julia/patches/1.11/0002-skip-failing-and-flaky-tests.patch new file mode 100644 index 000000000000..3577e6e71e15 --- /dev/null +++ b/pkgs/development/compilers/julia/patches/1.11/0002-skip-failing-and-flaky-tests.patch @@ -0,0 +1,25 @@ +From 9da2f2596db9f4f1a61825d82d9b8c3f3b2e99aa Mon Sep 17 00:00:00 2001 +From: Nick Cao <nickcao@nichi.co> +Date: Wed, 10 Jan 2024 20:58:20 -0500 +Subject: [PATCH 2/2] skip failing and flaky tests + +--- + test/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/Makefile b/test/Makefile +index 88dbe5b2b4..a2a7a55e20 100644 +--- a/test/Makefile ++++ b/test/Makefile +@@ -28,7 +28,7 @@ default: + + $(TESTS): + @cd $(SRCDIR) && \ +- $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl $@) ++ $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl --skip NetworkOptions REPL channels FileWatching ccall loading cmdlineargs $@) + + $(addprefix revise-, $(TESTS)): revise-% : + @cd $(SRCDIR) && \ +-- +2.43.0 + diff --git a/pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch b/pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch deleted file mode 100644 index 243a9cfd76ae..000000000000 --- a/pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 44c2c979c4f2222567ce65f506cf47fb87482348 Mon Sep 17 00:00:00 2001 -From: Pontus Stenetorp <pontus@stenetorp.se> -Date: Thu, 8 Apr 2021 04:37:44 +0000 -Subject: [PATCH 5/6] nix: Enable parallel unit tests for sandbox - -Disabled by default due to lack of networking in the Nix sandbox. This -greatly speeds up the build process on a multi-core system. ---- - test/runtests.jl | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/test/runtests.jl b/test/runtests.jl -index 2f9cd058bb..2f8c19fa32 100644 ---- a/test/runtests.jl -+++ b/test/runtests.jl -@@ -83,8 +83,9 @@ prepend!(tests, linalg_tests) - import LinearAlgebra - cd(@__DIR__) do - n = 1 -- if net_on -- n = min(Sys.CPU_THREADS, length(tests)) -+ if net_on || haskey(ENV, "NIX_BUILD_CORES") -+ x = haskey(ENV, "NIX_BUILD_CORES") ? parse(Int, ENV["NIX_BUILD_CORES"]) : Sys.CPU_THREADS -+ n = min(x, Sys.CPU_THREADS, length(tests)) - n > 1 && addprocs_with_testenv(n) - LinearAlgebra.BLAS.set_num_threads(1) - end --- -2.29.3 - diff --git a/pkgs/development/compilers/juniper/default.nix b/pkgs/development/compilers/juniper/default.nix deleted file mode 100644 index e6a737fb4ebc..000000000000 --- a/pkgs/development/compilers/juniper/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildDotnetModule, - dotnetCorePackages, -}: - -buildDotnetModule rec { - pname = "juniper"; - version = "4.0.0"; - - src = fetchFromGitHub { - owner = "calebh"; - repo = "Juniper"; - rev = "286050d6be5606db0973feda556d8fbc48b4566c"; - hash = "sha256-b+aDDz46Hxgt+Oh2fNMiXFfXhuy16mzauousQGq9+dg="; - }; - - projectFile = "Juniper/Juniper.fsproj"; - nugetDeps = ./deps.nix; - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_8_0; - - meta = { - description = "Functional reactive programming language for programming Arduino"; - longDescription = '' - The purpose of Juniper is to provide a functional reactive programming - platform for designing Arduino projects. FRP's high-level approach to - timing-based events fits naturally with Arduino, with which programming - almost entirely revolves around reacting to realtime events. Juniper - transpiles to Arduino C++, which is then compiled to an Arduino - executable. - ''; - homepage = "https://www.juniper-lang.org/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AlexSKaye ]; - mainProgram = "Juniper"; - inherit (dotnet-sdk.meta) platforms; - }; -} diff --git a/pkgs/development/compilers/juniper/deps.nix b/pkgs/development/compilers/juniper/deps.nix deleted file mode 100644 index e25ea7b0bbf3..000000000000 --- a/pkgs/development/compilers/juniper/deps.nix +++ /dev/null @@ -1,203 +0,0 @@ -{ fetchNuGet }: -[ - (fetchNuGet { - pname = "FParsec"; - version = "1.1.1"; - sha256 = "01s3zrxl9kfx0264wy0m555pfx0s0z165n4fvpgx63jlqwbd8m04"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "8.0.5"; - sha256 = "1m9gp68z0wyv0xxr4aqc1c2v6v8grml3jxkiqabddn46d6gsisqh"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "8.0.5"; - sha256 = "15vadqfi0w7sdq0rh35rb9ph4h4qbal2i5m5ifabbfwjp7348z9c"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Targets"; - version = "1.1.0"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; - }) - (fetchNuGet { - pname = "QuikGraph"; - version = "2.5.0"; - sha256 = "0xjg7pxmmz5a1mmsxlpgbl6la4wrrjmpdijhjwqi42v88yqr4gd7"; - }) - (fetchNuGet { - pname = "runtime.any.System.Globalization"; - version = "4.3.0"; - sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; - }) - (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.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.Text.Encoding"; - version = "4.3.0"; - sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; - }) - (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.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.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.Private.Uri"; - version = "4.3.0"; - sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; - }) - (fetchNuGet { - pname = "runtime.unix.System.Runtime.Extensions"; - version = "4.3.0"; - sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; - }) - (fetchNuGet { - pname = "Symbolism"; - version = "1.0.4"; - sha256 = "0da9g424x043bbd4pbgj7rsnpyvlbfmvxkyny7b3xd9smjx3dpr5"; - }) - (fetchNuGet { - pname = "System.Globalization"; - version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) - (fetchNuGet { - pname = "System.IO"; - version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; - }) - (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.Primitives"; - version = "4.3.0"; - sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; - }) - (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.Numerics"; - version = "4.3.0"; - sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; - }) - (fetchNuGet { - pname = "System.Text.Encoding"; - version = "4.3.0"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; - }) - (fetchNuGet { - pname = "System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; - }) -] diff --git a/pkgs/development/compilers/kaitai-struct-compiler/default.nix b/pkgs/development/compilers/kaitai-struct-compiler/default.nix deleted file mode 100644 index 2fd4fba11e3b..000000000000 --- a/pkgs/development/compilers/kaitai-struct-compiler/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenv -, fetchzip -, openjdk8 -, makeWrapper -}: - - -stdenv.mkDerivation rec { - pname = "kaitai-struct-compiler"; - version = "0.10"; - - src = fetchzip { - url = "https://github.com/kaitai-io/kaitai_struct_compiler/releases/download/${version}/kaitai-struct-compiler-${version}.zip"; - sha256 = "sha256-oY1OiEq619kLmQPMRQ4sjuBnTXgJ2WfvsEj1JrxUGPA="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - install -D $src/bin/kaitai-struct-compiler $out/bin/kaitai-struct-compiler - ln -s $out/bin/kaitai-struct-compiler $out/bin/ksc - cp -R $src/lib $out/lib - wrapProgram $out/bin/kaitai-struct-compiler --prefix PATH : ${lib.makeBinPath [ openjdk8 ] } - ''; - - meta = with lib; { - homepage = "https://github.com/kaitai-io/kaitai_struct_compiler"; - description = - "Compiler to generate binary data parsers in C++ / C# / Go / Java / JavaScript / Lua / Perl / PHP / Python / Ruby "; - license = licenses.gpl3Only; - maintainers = with maintainers; [ qubasa ]; - platforms = platforms.unix; - }; -} - diff --git a/pkgs/development/compilers/kind2/default.nix b/pkgs/development/compilers/kind2/default.nix index 617f86880363..a5a8585d020e 100644 --- a/pkgs/development/compilers/kind2/default.nix +++ b/pkgs/development/compilers/kind2/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-KzoEh/kMKsHx9K3t1/uQZ7fdsZEM+v8UOft8JjEB1Zw="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; diff --git a/pkgs/development/compilers/lesscpy/default.nix b/pkgs/development/compilers/lesscpy/default.nix deleted file mode 100644 index 493fdc08f812..000000000000 --- a/pkgs/development/compilers/lesscpy/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, python3Packages, fetchPypi }: - -python3Packages.buildPythonApplication rec { - pname = "lesscpy"; - version = "0.15.1"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-EEXRepj2iGRsp1jf8lTm6cA3RWSOBRoIGwOVw7d8gkw="; - }; - - checkInputs = with python3Packages; [ pytestCheckHook ]; - pythonImportsCheck = [ "lesscpy" ]; - propagatedBuildInputs = with python3Packages; [ ply six ]; - - doCheck = false; # Really weird test failures (`nix-build-python2.css not found`) - - meta = with lib; { - description = "Python LESS Compiler"; - mainProgram = "lesscpy"; - homepage = "https://github.com/lesscpy/lesscpy"; - license = licenses.mit; - maintainers = with maintainers; [ s1341 ]; - }; -} diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 8a76de022283..b472eb921cfa 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -113,7 +113,7 @@ ocamlPackages.buildDunePackage rec { seqes stdint tezt - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/compilers/lingua-franca/default.nix b/pkgs/development/compilers/lingua-franca/default.nix deleted file mode 100644 index f989a5e9d6be..000000000000 --- a/pkgs/development/compilers/lingua-franca/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchzip, jdk17_headless }: - -stdenv.mkDerivation rec { - pname = "lfc"; - version = "0.4.0"; - - src = fetchzip { - url = "https://github.com/lf-lang/lingua-franca/releases/download/v${version}/lf-cli-${version}.zip"; - sha256 = "sha256-LrAm77iPUlqVfRdYy2bZ4mim7DHIr5JxPdbrgxokGvc="; - }; - - buildInputs = [ jdk17_headless ]; - - _JAVA_HOME = "${jdk17_headless}/"; - - postPatch = '' - substituteInPlace bin/lfc \ - --replace 'base=`dirname $(dirname ''${abs_path})`' "base='$out'" \ - --replace "run_lfc_with_args" "${jdk17_headless}/bin/java -jar $out/lib/jars/org.lflang.lfc-${version}-all.jar" - ''; - - installPhase = '' - cp -r ./ $out/ - chmod +x $out/bin/lfc - ''; - - meta = with lib; { - description = "Polyglot coordination language"; - longDescription = '' - Lingua Franca (LF) is a polyglot coordination language for concurrent - and possibly time-sensitive applications ranging from low-level - embedded code to distributed cloud and edge applications. - ''; - homepage = "https://github.com/lf-lang/lingua-franca"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ revol-xut ]; - }; -} diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/7-12-codesign.patch b/pkgs/development/compilers/llvm/12/compiler-rt/codesign.patch index 3cc12b94b200..3cc12b94b200 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/7-12-codesign.patch +++ b/pkgs/development/compilers/llvm/12/compiler-rt/codesign.patch diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix deleted file mode 100644 index 4e2754def4de..000000000000 --- a/pkgs/development/compilers/llvm/12/default.nix +++ /dev/null @@ -1,445 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv -, 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 -# 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 -# 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: - -let - candidate = ""; # empty or "rcN" - dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; - - metadata = rec { - release_version = "12.0.1"; - version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs - inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; - fetch = name: sha256: fetchurl { - url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${metadata.version}/${name}-${metadata.release_version}${candidate}.src.tar.xz"; - inherit sha256; - }; - clang-tools-extra_src = fetch "clang-tools-extra" "1r9a4fdz9ci58b5z2inwvm4z4cdp6scrivnaw05dggkxz7yrwrb5"; - }; - - inherit (metadata) fetch; - - - 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 - ''; - 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 ../common/llvm { - src = fetch "llvm" "1pzx9zrmd7r3481sbhwvkms68fwhffpp4mmz45dgrkjpyl2q96kx"; - polly_src = fetch "polly" "1yfm9ixda4a2sx7ak5vswijx4ydk5lv1c1xh39xmd2kh299y4m12"; - 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 - # Fix llvm being miscompiled by some gccs. See llvm/llvm-project#49955 - # Fix llvm being miscompiled by some gccs. See https://github.com/llvm/llvm-project/issues/49955 - ./llvm/fix-llvm-issue-49955.patch - - ./llvm/gnu-install-dirs.patch - # On older CPUs (e.g. Hydra/wendy) we'd be getting an error in this test. - (fetchpatch { - name = "uops-CMOV16rm-noreg.diff"; - url = "https://github.com/llvm/llvm-project/commit/9e9f991ac033.diff"; - sha256 = "sha256:12s8vr6ibri8b48h2z38f3afhwam10arfiqfy4yg37bmc054p5hi"; - 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 { - src = fetch "clang" "0px4gl27az6cdz6adds89qzdwb1cqpjsfvrldbz9qvpmphrj34bf"; - patches = [ - ./clang/purity.patch - # https://reviews.llvm.org/D51899 - ./clang/gnu-install-dirs.patch - (substituteAll { - src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${tools.libllvm.lib}/lib"; - }) - ]; - }; - - clang-unwrapped = tools.libclang; - - # disabled until recommonmark supports sphinx 3 - #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 - }); - - # disabled until recommonmark supports sphinx 3 - # 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 { - src = fetch "lld" "0qg3fgc7wj34hdkqn21y03zcmsdd01szhhm1hfki63iifrm3y2v9"; - patches = [ - ./lld/gnu-install-dirs.patch - ]; - inherit (libraries) libunwind; - }; - - lldb = callPackage ../common/lldb.nix { - src = fetch "lldb" "0g3pj1m3chafavpr35r9fynm85y2hdyla6klj0h28khxs2613i78"; - 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 - ]; - }; - - # 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; - }; - - 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-no-libc - ]; - extraBuildCommands = '' - 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; - }; - - clangNoLibcWithBasicRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ - targetLlvmLibraries.compiler-rt-no-libc - ]; - extraBuildCommands = '' - echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags - echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommandsBasicRt cc; - }; - - clangNoLibcNoRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ ]; - extraBuildCommands = '' - echo "-nostartfiles" >> $out/nix-support/cc-cflags - '' + 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; - bintools = bintools'; - extraPackages = [ ]; - 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 (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 - ./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 - ../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 - ]; - 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"; - patches = [ - ../common/compiler-rt/7-12-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 - ../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 - ]; - 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 = - # 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; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - libcxx = callPackage ../common/libcxx { - src = fetchFromGitHub { - owner = "llvm"; - repo = "llvm-project"; - rev = "refs/tags/llvmorg-${metadata.version}"; - sparseCheckout = [ - "libcxx" - "libcxxabi" - "llvm/cmake" - "llvm/utils" - "runtimes" - ]; - hash = "sha256-etxgXIdWxMTmbZ83Hsc0w6Jt5OSQSUEPVEWqLkHsNBY="; - }; - 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.clangWithLibcAndBasicRt; - }; - - libunwind = callPackage ../common/libunwind { - src = fetch "libunwind" "192ww6n81lj2mb9pj4043z79jp3cf58a9c2qrxjwm5c3a64n1shb"; - patches = [ - ./libunwind/gnu-install-dirs.patch - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt; - }; - - openmp = callPackage ../common/openmp { - src = fetch "openmp" "14dh0r6h2xh747ffgnsl4z08h0ri04azi9vf79cbz7ma1r27kzk0"; - 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/common/compiler-rt/armv6-scudo-libatomic.patch b/pkgs/development/compilers/llvm/14/compiler-rt/armv6-scudo-libatomic.patch index 13b67eb2a41c..13b67eb2a41c 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/armv6-scudo-libatomic.patch +++ b/pkgs/development/compilers/llvm/14/compiler-rt/armv6-scudo-libatomic.patch diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/armv6-scudo-libatomic.patch b/pkgs/development/compilers/llvm/15/compiler-rt/armv6-scudo-libatomic.patch new file mode 100644 index 000000000000..c4da700fea63 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/compiler-rt/armv6-scudo-libatomic.patch @@ -0,0 +1,65 @@ +From a56bb19a9dc303a50ef12d83cd24c2395bf81076 Mon Sep 17 00:00:00 2001 +From: Ben Wolsieffer <benwolsieffer@gmail.com> +Date: Wed, 7 Dec 2022 21:25:46 -0500 +Subject: [PATCH] [scudo][standalone] Use CheckAtomic to decide to link to + libatomic + +Standalone scudo uses the atomic operation builtin functions, which require +linking to libatomic on some platforms. Currently, this is done in an ad-hoc +manner. MIPS platforms always link to libatomic, and the tests are always linked +to it as well. libatomic is required on base ARMv6 (but not ARMv6K), but it is +currently not linked, causing the build to fail. + +This patch replaces this ad-hoc logic with the CheckAtomic CMake module already +used in other parts of LLVM. The CheckAtomic module checks whether std::atomic +requires libatomic, which is not strictly the same as checking the atomic +builtins, but should have the same results as far as I know. If this is +problematic, a custom version of CheckAtomic could be used to specifically test +the builtins. +--- + compiler-rt/lib/scudo/standalone/CMakeLists.txt | 7 +++++++ + compiler-rt/lib/scudo/standalone/tests/CMakeLists.txt | 4 +--- + 2 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/lib/scudo/standalone/CMakeLists.txt b/lib/scudo/standalone/CMakeLists.txt +index ae5c354768c8..eb27374ca520 100644 +--- a/lib/scudo/standalone/CMakeLists.txt ++++ b/lib/scudo/standalone/CMakeLists.txt +@@ -1,5 +1,8 @@ + add_compiler_rt_component(scudo_standalone) + ++include(DetermineGCCCompatible) ++include(CheckAtomic) ++ + include_directories(../.. include) + + set(SCUDO_CFLAGS) +@@ -34,6 +37,10 @@ list(APPEND SCUDO_LINK_FLAGS -Wl,-z,defs,-z,now,-z,relro) + + list(APPEND SCUDO_LINK_FLAGS -ffunction-sections -fdata-sections -Wl,--gc-sections) + ++if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB) ++ list(APPEND SCUDO_LINK_FLAGS -latomic) ++endif() ++ + # We don't use the C++ standard library, so avoid including it by mistake. + append_list_if(COMPILER_RT_HAS_NOSTDLIBXX_FLAG -nostdlib++ SCUDO_LINK_FLAGS) + append_list_if(CXX_SUPPORTS_UNWINDLIB_NONE_FLAG --unwindlib=none SCUDO_LINK_FLAGS) +diff --git a/lib/scudo/standalone/tests/CMakeLists.txt b/lib/scudo/standalone/tests/CMakeLists.txt +index 8200cd2588b3..73b3e9403c35 100644 +--- a/lib/scudo/standalone/tests/CMakeLists.txt ++++ b/lib/scudo/standalone/tests/CMakeLists.txt +@@ -39,9 +39,7 @@ set(SCUDO_UNITTEST_LINK_FLAGS + ${COMPILER_RT_UNWINDER_LINK_LIBS} + ${SANITIZER_TEST_CXX_LIBRARIES}) + list(APPEND SCUDO_UNITTEST_LINK_FLAGS -pthread -no-pie) +-# Linking against libatomic is required with some compilers +-check_library_exists(atomic __atomic_load_8 "" COMPILER_RT_HAS_LIBATOMIC) +-if (COMPILER_RT_HAS_LIBATOMIC) ++if (HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB) + list(APPEND SCUDO_UNITTEST_LINK_FLAGS -latomic) + endif() + +-- +2.38.1 + diff --git a/pkgs/development/compilers/llvm/19/clang/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/19/clang/gnu-install-dirs.patch index b8c1c110cf22..30fdf2c56d5b 100644 --- a/pkgs/development/compilers/llvm/19/clang/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/19/clang/gnu-install-dirs.patch @@ -46,7 +46,7 @@ index 3aca22c0b..3115353e3 100644 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 lib/libscanbuild + DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild" COMPONENT scan-build-py) endforeach() @@ -55,7 +55,7 @@ index 3aca22c0b..3115353e3 100644 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 lib/libscanbuild/resources + DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources" COMPONENT scan-build-py) endforeach() @@ -64,7 +64,7 @@ index 3aca22c0b..3115353e3 100644 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 lib/libear + DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear" COMPONENT scan-build-py) endforeach() diff --git a/pkgs/development/compilers/llvm/19/compiler-rt/armv6-scudo-libatomic.patch b/pkgs/development/compilers/llvm/19/compiler-rt/armv6-scudo-libatomic.patch new file mode 100644 index 000000000000..6f8528cfa31f --- /dev/null +++ b/pkgs/development/compilers/llvm/19/compiler-rt/armv6-scudo-libatomic.patch @@ -0,0 +1,62 @@ +From a56bb19a9dc303a50ef12d83cd24c2395bf81076 Mon Sep 17 00:00:00 2001 +From: Ben Wolsieffer <benwolsieffer@gmail.com> +Date: Wed, 7 Dec 2022 21:25:46 -0500 +Subject: [PATCH] [scudo][standalone] Use CheckAtomic to decide to link to + libatomic + +Standalone scudo uses the atomic operation builtin functions, which require +linking to libatomic on some platforms. Currently, this is done in an ad-hoc +manner. MIPS platforms always link to libatomic, and the tests are always linked +to it as well. libatomic is required on base ARMv6 (but not ARMv6K), but it is +currently not linked, causing the build to fail. + +This patch replaces this ad-hoc logic with the CheckAtomic CMake module already +used in other parts of LLVM. The CheckAtomic module checks whether std::atomic +requires libatomic, which is not strictly the same as checking the atomic +builtins, but should have the same results as far as I know. If this is +problematic, a custom version of CheckAtomic could be used to specifically test +the builtins. +--- + compiler-rt/lib/scudo/standalone/CMakeLists.txt | 7 +++++++ + compiler-rt/lib/scudo/standalone/tests/CMakeLists.txt | 4 +--- + 2 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/lib/scudo/standalone/CMakeLists.txt b/lib/scudo/standalone/CMakeLists.txt +index dc700cec9bec..671dc7046604 100644 +--- a/lib/scudo/standalone/CMakeLists.txt ++++ b/lib/scudo/standalone/CMakeLists.txt +@@ -1,5 +1,8 @@ + add_compiler_rt_component(scudo_standalone) + ++include(DetermineGCCCompatible) ++include(CheckAtomic) ++ + include_directories(../.. include) + + set(SCUDO_CFLAGS) +@@ -39,6 +42,10 @@ list(APPEND SCUDO_LINK_FLAGS -Wl,-z,defs,-z,now,-z,relro) + + list(APPEND SCUDO_LINK_FLAGS -ffunction-sections -fdata-sections -Wl,--gc-sections) + ++if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB) ++ list(APPEND SCUDO_LINK_FLAGS -latomic) ++endif() ++ + # We don't use the C++ standard library, so avoid including it by mistake. + append_list_if(COMPILER_RT_HAS_NOSTDLIBXX_FLAG -nostdlib++ SCUDO_LINK_FLAGS) + append_list_if(CXX_SUPPORTS_UNWINDLIB_NONE_FLAG --unwindlib=none SCUDO_LINK_FLAGS) +diff --git a/lib/scudo/standalone/tests/CMakeLists.txt b/lib/scudo/standalone/tests/CMakeLists.txt +index a85eb737dba0..a23cf4d494f6 100644 +--- a/lib/scudo/standalone/tests/CMakeLists.txt ++++ b/lib/scudo/standalone/tests/CMakeLists.txt +@@ -47,7 +47,7 @@ set(SCUDO_UNITTEST_LINK_FLAGS + ${SANITIZER_TEST_CXX_LIBRARIES}) + list(APPEND SCUDO_UNITTEST_LINK_FLAGS -pthread -no-pie) + +-append_list_if(COMPILER_RT_HAS_LIBATOMIC -latomic SCUDO_UNITTEST_LINK_FLAGS) ++append_list_if((HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB) -latomic SCUDO_UNITTEST_LINK_FLAGS) + + set(SCUDO_TEST_HEADERS + scudo_unit_test.h +2.38.1 + diff --git a/pkgs/development/compilers/llvm/19/libclc/use-default-paths.patch b/pkgs/development/compilers/llvm/19/libclc/use-default-paths.patch new file mode 100644 index 000000000000..09079242eeac --- /dev/null +++ b/pkgs/development/compilers/llvm/19/libclc/use-default-paths.patch @@ -0,0 +1,31 @@ +From e8b910246d0c7c3d9fff994f71c6f8a48ec09a50 Mon Sep 17 00:00:00 2001 +From: Tristan Ross <tristan.ross@midstall.com> +Date: Sat, 24 Aug 2024 19:56:24 -0700 +Subject: [PATCH] [libclc] use default paths with find_program when possible + +--- + libclc/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 02bb859ae8590b..6bcd8ae52a5794 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -55,7 +55,7 @@ if( LIBCLC_STANDALONE_BUILD OR CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DI + # Import required tools + if( NOT EXISTS ${LIBCLC_CUSTOM_LLVM_TOOLS_BINARY_DIR} ) + foreach( tool IN ITEMS clang llvm-as llvm-link opt ) +- find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH ) ++ find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} ) + set( ${tool}_exe ${LLVM_TOOL_${tool}} ) + set( ${tool}_target ) + endforeach() +@@ -104,7 +104,7 @@ foreach( tool IN ITEMS clang opt llvm-as llvm-link ) + endforeach() + + # llvm-spirv is an optional dependency, used to build spirv-* targets. +-find_program( LLVM_SPIRV llvm-spirv PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH ) ++find_program( LLVM_SPIRV llvm-spirv PATHS ${LLVM_TOOLS_BINARY_DIR} ) + + if( LLVM_SPIRV ) + add_executable( libclc::llvm-spirv IMPORTED GLOBAL ) diff --git a/pkgs/development/compilers/llvm/common/bolt/default.nix b/pkgs/development/compilers/llvm/common/bolt/default.nix index 9d6385ae74b3..d62841b48d0a 100644 --- a/pkgs/development/compilers/llvm/common/bolt/default.nix +++ b/pkgs/development/compilers/llvm/common/bolt/default.nix @@ -3,6 +3,7 @@ stdenv, llvm_meta, monorepoSrc, + release_version, runCommand, cmake, libxml2, @@ -20,16 +21,22 @@ stdenv.mkDerivation (finalAttrs: { 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" + src = runCommand "bolt-src-${finalAttrs.version}" { } ( + '' + mkdir $out + '' + + lib.optionalString (lib.versionAtLeast release_version "14") '' + 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 - ''; + # 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"; diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix index 9ef1a3a3c644..44e13c48fd4b 100644 --- a/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/pkgs/development/compilers/llvm/common/clang/default.nix @@ -16,7 +16,6 @@ , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false -, clang-tools-extra_src ? null , devExtraCmakeFlags ? [] }: @@ -24,20 +23,21 @@ let pname = "clang"; src' = if monorepoSrc != null then - runCommand "${pname}-src-${version}" {} '' + runCommand "${pname}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" cp -r ${monorepoSrc}/clang-tools-extra "$out" - '' else src; + '') else src; self = stdenv.mkDerivation (finalAttrs: rec { inherit pname version patches; src = src'; - sourceRoot = if lib.versionOlder release_version "13" then null - else "${src.name}/${pname}"; + sourceRoot = "${src.name}/${pname}"; nativeBuildInputs = [ cmake ] ++ (lib.optional (lib.versionAtLeast release_version "15") ninja) @@ -70,21 +70,19 @@ 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.optionals (stdenv.targetPlatform.useLLVM or false) [ - "-DCLANG_DEFAULT_CXX_STDLIB=ON" - ] ++ devExtraCmakeFlags; + ]) ++ lib.optional (lib.versionAtLeast release_version "20") "-DLLVM_DIR=${libllvm.dev}/lib/cmake/llvm" + ++ devExtraCmakeFlags; postPatch = '' # Make sure clang passes the correct location of libLTO to ld64 substituteInPlace lib/Driver/ToolChains/Darwin.cpp \ --replace-fail 'StringRef P = llvm::sys::path::parent_path(D.Dir);' 'StringRef P = "${lib.getLib libllvm}";' - '' + (if lib.versionOlder release_version "13" then '' - sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ - -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ - lib/Driver/ToolChains/*.cpp - '' else '' (cd tools && ln -s ../../clang-tools-extra extra) - '') + lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString (lib.versionOlder release_version "13") '' + substituteInPlace tools/extra/clangd/quality/CompletionModel.cmake \ + --replace ' ''${CMAKE_SOURCE_DIR}/../clang-tools-extra' ' ''${CMAKE_SOURCE_DIR}/tools/extra' + '' + + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp ''; @@ -132,8 +130,10 @@ let mkdir -p $dev/bin '' + (if lib.versionOlder release_version "15" then '' cp bin/clang-tblgen $dev/bin - '' else '' + '' else if lib.versionOlder release_version "20" then '' cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen,clang-pseudo-gen} $dev/bin + '' else '' + cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen} $dev/bin ''); passthru = { @@ -208,18 +208,7 @@ let ''; } else { ninjaFlags = [ "docs-clang-man" ]; - })) // (lib.optionalAttrs (clang-tools-extra_src != null) { inherit clang-tools-extra_src; }) - // (lib.optionalAttrs (lib.versionOlder release_version "13") { - unpackPhase = '' - unpackFile $src - mv clang-* clang - sourceRoot=$PWD/clang - unpackFile ${clang-tools-extra_src} - mv clang-tools-extra-* $sourceRoot/tools/extra - substituteInPlace $sourceRoot/tools/extra/clangd/quality/CompletionModel.cmake \ - --replace ' ''${CMAKE_SOURCE_DIR}/../clang-tools-extra' ' ''${CMAKE_SOURCE_DIR}/tools/extra' - ''; - }) + })) // (lib.optionalAttrs (lib.versionAtLeast release_version "15") { env = lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform && !stdenv.hostPlatform.useLLVM) { # The following warning is triggered with (at least) gcc >= diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index e43ff09931b8..9ec3a2ddcbd6 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -7,10 +7,11 @@ , src ? null , monorepoSrc ? null , runCommand +, apple-sdk +, apple-sdk_10_13 , cmake , ninja , python3 -, xcbuild , libllvm , libcxx , linuxHeaders @@ -40,18 +41,28 @@ let # 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; - noSanitizers = !haveLibc || bareMetal || isMusl || isDarwinStatic; + inherit (stdenv.hostPlatform) isMusl isAarch64 isWindows; + noSanitizers = !haveLibc || bareMetal || isMusl || isDarwinStatic || isWindows; baseName = "compiler-rt"; pname = baseName + lib.optionalString (haveLibc) "-libc"; + # Sanitizers require 10.13 or newer. Instead of disabling them for most x86_64-darwin users, + # build them with a newer SDK and the default (10.12) deployment target. + apple-sdk' = + if lib.versionOlder (lib.getVersion apple-sdk) "10.13" then + apple-sdk_10_13.override { enableBootstrap = true; } + else + apple-sdk.override { enableBootstrap = true; }; + src' = if monorepoSrc != null then - runCommand "${baseName}-src-${version}" {} '' + runCommand "${baseName}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${baseName} "$out" - '' else src; + '') else src; preConfigure = lib.optionalString (!haveLibc) '' cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding") @@ -62,27 +73,33 @@ stdenv.mkDerivation ({ inherit pname version patches; src = src'; - sourceRoot = if lib.versionOlder release_version "13" then null - else "${src'.name}/${baseName}"; + sourceRoot = "${src'.name}/${baseName}"; nativeBuildInputs = [ cmake ] ++ (lib.optional (lib.versionAtLeast release_version "15") ninja) - ++ [ python3 libllvm.dev ] - ++ lib.optional stdenv.isDarwin xcbuild.xcrun; + ++ [ python3 libllvm.dev ]; buildInputs = lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders - ++ lib.optional (stdenv.hostPlatform.isFreeBSD) freebsd.include; - - env.NIX_CFLAGS_COMPILE = toString ([ - "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" - ] ++ lib.optionals (!haveLibc) [ - # The compiler got stricter about this, and there is a usellvm patch below - # which patches out the assert include causing an implicit definition of - # assert. It would be nicer to understand why compiler-rt thinks it should - # be able to #include <assert.h> in the first place; perhaps it's in the - # wrong, or perhaps there is a way to provide an assert.h. - "-Wno-error=implicit-function-declaration" - ]); + ++ lib.optional (stdenv.hostPlatform.isFreeBSD) freebsd.include + # Adding the bootstrap SDK to `buildInputs` on static builds propagates it, breaking `xcrun`. + # This can be removed once the minimum SDK >10.12 on x86_64-darwin. + ++ lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isStatic) [ apple-sdk' ]; + + env = { + NIX_CFLAGS_COMPILE = toString ([ + "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" + ] ++ lib.optionals (!haveLibc) [ + # The compiler got stricter about this, and there is a usellvm patch below + # which patches out the assert include causing an implicit definition of + # assert. It would be nicer to understand why compiler-rt thinks it should + # be able to #include <assert.h> in the first place; perhaps it's in the + # wrong, or perhaps there is a way to provide an assert.h. + "-Wno-error=implicit-function-declaration" + ]); + } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin) { + # Work around clang’s trying to invoke unprefixed-ld on Darwin when `-target` is passed. + NIX_CFLAGS_LINK = "--ld-path=${stdenv.cc.bintools}/bin/${stdenv.cc.targetPrefix}ld"; + }; cmakeFlags = [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" @@ -125,33 +142,30 @@ stdenv.mkDerivation ({ "-DCOMPILER_RT_OS_DIR=baremetal" ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) (lib.optionals (lib.versionAtLeast release_version "16") [ "-DCMAKE_LIPO=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}lipo" + ] ++ lib.optionals (!haveLibcxx) [ + # Darwin fails to detect that the compiler supports the `-g` flag when there is no libc++ during the + # compiler-rt bootstrap, which prevents compiler-rt from building. The `-g` flag is required by the + # Darwin support, so force it to be enabled during the first stage of the compiler-rt bootstrap. + "-DCOMPILER_RT_HAS_G_FLAG=ON" ] ++ [ - "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON" + "-DDARWIN_macosx_CACHED_SYSROOT=${apple-sdk'.sdkroot}" + "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=${lib.versions.majorMinor (lib.getVersion apple-sdk)}" "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}" + "-DSANITIZER_MIN_OSX_VERSION=${stdenv.hostPlatform.darwinMinVersion}" ] ++ lib.optionals (lib.versionAtLeast release_version "15") [ # `COMPILER_RT_DEFAULT_TARGET_ONLY` does not apply to Darwin: # https://github.com/llvm/llvm-project/blob/27ef42bec80b6c010b7b3729ed0528619521a690/compiler-rt/cmake/base-config-ix.cmake#L153 "-DCOMPILER_RT_ENABLE_IOS=OFF" - ]) ++ lib.optionals (lib.versionAtLeast version "19" && stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ - "-DSANITIZER_MIN_OSX_VERSION=10.10" - ] ++ lib.optionals (noSanitizers && lib.versionAtLeast release_version "19") [ + ]) ++ lib.optionals (noSanitizers && lib.versionAtLeast release_version "19") [ "-DCOMPILER_RT_BUILD_CTX_PROFILE=OFF" ] ++ devExtraCmakeFlags; outputs = [ "out" "dev" ]; - # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks - # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra - # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd - # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by - # a flag and turn the flag off during the stdenv build. - postPatch = lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace cmake/builtin-config-ix.cmake \ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace cmake/config-ix.cmake \ - --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + lib.optionalString (!haveLibc) ((lib.optionalString (lib.versionAtLeast release_version "18") '' substituteInPlace lib/builtins/aarch64/sme-libc-routines.c \ --replace "<stdlib.h>" "<stddef.h>" @@ -173,6 +187,13 @@ stdenv.mkDerivation ({ substituteInPlace ../libcxx/utils/merge_archives.py \ --replace-fail "import distutils.spawn" "from shutil import which as find_executable" \ --replace-fail "distutils.spawn." "" + '' + lib.optionalString (lib.versionAtLeast release_version "19") + # codesign in sigtool doesn't support the various options used by the build + # and is present in the bootstrap-tools. Removing find_program prevents the + # build from trying to use it and failing. + '' + substituteInPlace cmake/Modules/AddCompilerRT.cmake \ + --replace-fail 'find_program(CODESIGN codesign)' "" ''; # Hack around weird upsream RPATH bug diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 689ea9f7cb7b..fa1f61bfd5d1 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -88,13 +88,8 @@ let } { after = "19"; - before = "20"; path = ../19; } - { - after = "20"; - path = ../git; - } ]; "clang/purity.patch" = [ { @@ -195,6 +190,21 @@ let path = ../12; } ]; + "compiler-rt/armv6-scudo-libatomic.patch" = [ + { + after = "19"; + path = ../19; + } + { + after = "15"; + before = "19"; + path = ../15; + } + { + before = "15"; + path = ../14; + } + ]; "compiler-rt/armv7l.patch" = [ { before = "15"; @@ -284,6 +294,12 @@ let path = ../14; } ]; + "libclc/use-default-paths.patch" = [ + { + after = "19"; + path = ../19; + } + ]; }; constraints = patches."${p}" or null; @@ -330,13 +346,7 @@ let 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. - ); + callPackage = newScope (tools // args // metadata); clangVersion = if (lib.versionOlder metadata.release_version "16") then metadata.release_version @@ -345,7 +355,7 @@ let mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${clangVersion}/include" "$rsrc" + ln -s "${lib.getLib cc}/lib/clang/${clangVersion}/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; mkExtraBuildCommandsBasicRt = @@ -370,6 +380,17 @@ let libllvm = callPackage ./llvm { patches = lib.optional (lib.versionOlder metadata.release_version "14") ./llvm/llvm-config-link-static.patch + ++ lib.optionals (lib.versions.major metadata.release_version == "12") [ + (metadata.getVersionFile "llvm/fix-llvm-issue-49955.patch") + + # On older CPUs (e.g. Hydra/wendy) we'd be getting an error in this test. + (fetchpatch { + name = "uops-CMOV16rm-noreg.diff"; + url = "https://github.com/llvm/llvm-project/commit/9e9f991ac033.diff"; + sha256 = "sha256:12s8vr6ibri8b48h2z38f3afhwam10arfiqfy4yg37bmc054p5hi"; + stripLen = 1; + }) + ] ++ [ (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 @@ -433,7 +454,7 @@ let hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; } ) - ++ lib.optionals (lib.versions.major metadata.release_version == "13") [ + ++ lib.optionals (lib.versionOlder metadata.release_version "14") [ # Backport gcc-13 fixes with missing includes. (fetchpatch { name = "signals-gcc-13.patch"; @@ -483,7 +504,18 @@ let stripLen = 1; hash = "sha256-fqw5gTSEOGs3kAguR4tINFG7Xja1RAje+q67HJt2nGg="; }) - ]; + ] + ++ + lib.optionals + (lib.versionAtLeast metadata.release_version "17" && lib.versionOlder metadata.release_version "19") + [ + # Fixes test-suite on glibc 2.40 (https://github.com/llvm/llvm-project/pull/100804) + (fetchpatch2 { + url = "https://github.com/llvm/llvm-project/commit/1e8df9e85a1ff213e5868bd822877695f27504ad.patch"; + hash = "sha256-EX+PYGicK73lsL/J0kSZ4S5y1/NHIclBddhsnV6NPPI="; + stripLen = 1; + }) + ]; pollyPatches = [ (metadata.getVersionFile "llvm/gnu-install-dirs-polly.patch") ] ++ lib.optional (lib.versionAtLeast metadata.release_version "15") @@ -508,8 +540,24 @@ let # mis-compilation in firefox. # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454 (metadata.getVersionFile "clang/revert-malloc-alignment-assumption.patch") + # This patch prevents global system header directories from + # leaking through on non‐NixOS Linux. However, on macOS, the + # SDK path is used as the sysroot, and forcing `-nostdlibinc` + # breaks `-isysroot` with an unwrapped compiler. As macOS has + # no `/usr/include`, there’s essentially no risk to skipping + # the patch there. It’s possible that Homebrew headers in + # `/usr/local/include` might leak through to unwrapped + # compilers being used without an SDK set or something, but + # it hopefully shouldn’t matter. + # + # TODO: Figure out a better solution to this whole problem so + # that we won’t have to choose between breaking unwrapped + # compilers breaking libclang when we can do Linux‐to‐Darwin + # cross‐compilation again. + ++ lib.optional ( + !args.stdenv.hostPlatform.isDarwin || !args.stdenv.targetPlatform.isDarwin + ) ./clang/add-nostdlibinc-flag.patch ++ [ - ./clang/add-nostdlibinc-flag.patch (substituteAll { src = if (lib.versionOlder metadata.release_version "16") then @@ -519,6 +567,29 @@ let libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ] + # Backport version logic from Clang 16. This is needed by the following patch. + ++ lib.optional (lib.versions.major metadata.release_version == "15") (fetchpatch { + name = "clang-darwin-Use-consistent-version-define-stringifying-logic.patch"; + url = "https://github.com/llvm/llvm-project/commit/60a33ded751c86fff9ac1c4bdd2b341fbe4b0649.patch?full_index=1"; + includes = [ "lib/Basic/Targets/OSTargets.cpp" ]; + stripLen = 1; + hash = "sha256-YVTSg5eZLz3po2AUczPNXCK26JA3CuTh6Iqp7hAAKIs="; + }) + # Backport `__ENVIRONMENT_OS_VERSION_MIN_REQUIRED__` support from Clang 17. + # This is needed by newer SDKs (14+). + ++ + lib.optional + ( + lib.versionAtLeast (lib.versions.major metadata.release_version) "15" + && lib.versionOlder (lib.versions.major metadata.release_version) "17" + ) + (fetchpatch { + name = "clang-darwin-An-OS-version-preprocessor-define.patch"; + url = "https://github.com/llvm/llvm-project/commit/c8e2dd8c6f490b68e41fe663b44535a8a21dfeab.patch?full_index=1"; + includes = [ "lib/Basic/Targets/OSTargets.cpp" ]; + stripLen = 1; + hash = "sha256-Vs32kql7N6qtLqc12FtZHURcbenA7+N3E/nRRX3jdig="; + }) ++ 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"; @@ -605,7 +676,7 @@ let { substituteAll, libclang }: (substituteAll { src = metadata.getVersionFile "lldb/resource-dir.patch"; - clangLibDir = "${libclang.lib}/lib"; + clangLibDir = "${lib.getLib libclang}/lib"; }).overrideAttrs (_: _: { name = "resource-dir.patch"; }) ) { }; @@ -653,8 +724,12 @@ let # # See here for some context: # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 + # + # Patch is applied for >= 14 as the versions below are broken anyways. ++ lib.optional ( - stdenv.targetPlatform.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0" + lib.versionAtLeast metadata.release_version "14" + && 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") { @@ -730,12 +805,9 @@ let && 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" - ); + nixSupport.cc-ldflags = lib.optionals ( + !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD + ) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; } ); @@ -746,16 +818,20 @@ let bintools = bintools'; extraPackages = [ targetLlvmLibraries.compiler-rt-no-libc ] - ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ - targetLlvmLibraries.libunwind - ]; + ++ lib.optionals + ( + !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin + ) + [ + 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) '' + + lib.optionalString (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isDarwin) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags '' @@ -776,7 +852,7 @@ let "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" ] ++ lib.optional ( - !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD + !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin ) "--unwindlib=libunwind" ++ lib.optional ( !stdenv.targetPlatform.isWasm @@ -785,7 +861,7 @@ let ) "-lunwind" ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; nixSupport.cc-ldflags = lib.optionals ( - !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD + !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin ) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; } ); @@ -902,6 +978,10 @@ let url = "https://github.com/llvm/llvm-project/commit/abc2eae68290c453e1899a94eccc4ed5ea3b69c1.patch"; hash = "sha256-oxCxOjhi5BhNBEraWalEwa1rS3Mx9CuQgRVZ2hrbd7M="; }) + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5909979869edca359bcbca74042c2939d900680e.patch"; + hash = "sha256-l4rQHYbblEADBXaZIdqTG0sZzH4fEQvYiqhLYNZDMa8="; + }) ]; }; } @@ -927,7 +1007,10 @@ let (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" + lib.versions.major metadata.release_version == "12" + || ( + 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 @@ -935,13 +1018,15 @@ let (metadata.getVersionFile "compiler-rt/normalize-var.patch") ] ++ - lib.optional (lib.versionOlder metadata.release_version "18") + lib.optional + (lib.versionAtLeast metadata.release_version "13" && 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 + # TODO: make unconditional and remove in <15 section below. Causes rebuilds. + ++ lib.optionals (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 @@ -952,9 +1037,20 @@ let # Fix build on armv6l ./compiler-rt/armv6-mcr-dmb.patch ./compiler-rt/armv6-sync-ops-no-thumb.patch + ] + ++ + lib.optionals + (lib.versionAtLeast metadata.release_version "13" && lib.versionOlder metadata.release_version "18") + [ + # Fix build on armv6l + ./compiler-rt/armv6-scudo-no-yield.patch + ] + ++ [ + # Fix build on armv6l ./compiler-rt/armv6-no-ldrexd-strexd.patch - ./compiler-rt/armv6-scudo-no-yield.patch - ./compiler-rt/armv6-scudo-libatomic.patch + ] + ++ lib.optionals (lib.versionAtLeast metadata.release_version "13") [ + (metadata.getVersionFile "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"; @@ -967,14 +1063,11 @@ let let # temp rename to avoid infinite recursion stdenv = - if args.stdenv.hostPlatform.useLLVM or false then + # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling. + if args.stdenv.hostPlatform.isDarwin then + overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx + else 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 @@ -993,10 +1086,10 @@ let patches = compiler-rtPatches; doFakeLibgcc = stdenv.hostPlatform.useLLVM or false; stdenv = - if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform then - stdenv + # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling. + if stdenv.hostPlatform.isDarwin then + overrideCC darwin.bootstrapStdenv buildLlvmTools.clangNoLibcNoRt else - # TODO: make this branch unconditional next rebuild overrideCC stdenv buildLlvmTools.clangNoLibcNoRt; }; @@ -1058,7 +1151,7 @@ let lib.optional ( lib.versions.major metadata.release_version == "17" - && stdenv.isDarwin + && stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13" ) # https://github.com/llvm/llvm-project/issues/64226 @@ -1073,12 +1166,16 @@ let lib.optional ( lib.versionAtLeast metadata.release_version "18" - && stdenv.isDarwin + && stdenv.hostPlatform.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; + stdenv = + if stdenv.hostPlatform.isDarwin then + overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRt + else + overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt; } // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") { # TODO: remove this, causes LLVM 13 packages rebuild. diff --git a/pkgs/development/compilers/llvm/common/libclc.nix b/pkgs/development/compilers/llvm/common/libclc.nix index 4c2081e693c1..d20e6877019b 100644 --- a/pkgs/development/compilers/llvm/common/libclc.nix +++ b/pkgs/development/compilers/llvm/common/libclc.nix @@ -1,42 +1,95 @@ -{ lib, stdenv, version, runCommand, monorepoSrc, llvm, buildPackages, buildLlvmTools, ninja, cmake, python3 }: +{ + lib, + stdenv, + version, + runCommand, + monorepoSrc, + llvm, + buildPackages, + buildLlvmTools, + ninja, + cmake, + python3, + release_version, + getVersionFile, +}: +let + spirv-llvm-translator = buildPackages.spirv-llvm-translator.override { + inherit (buildLlvmTools) llvm; + }; + # The build requires an unwrapped clang but wrapped clang++ thus we need to + # split the unwrapped clang out to prevent the build from finding the + # unwrapped clang++ + clang-only = runCommand "clang-only" { } '' + mkdir -p "$out"/bin + ln -s "${lib.getExe' buildLlvmTools.clang.cc "clang"}" "$out"/bin + ''; +in stdenv.mkDerivation rec { pname = "libclc"; inherit version; - src = runCommand "${pname}-src-${version}" {} '' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/${pname} "$out" - ''; + src = runCommand "${pname}-src-${version}" { } ( + '' + mkdir -p "$out" + '' + + lib.optionalString (lib.versionAtLeast release_version "14") '' + cp -r ${monorepoSrc}/cmake "$out" + '' + + '' + cp -r ${monorepoSrc}/${pname} "$out" + '' + ); sourceRoot = "${src.name}/${pname}"; - outputs = [ "out" "dev" ]; - - patches = [ - ./libclc/libclc-gnu-install-dirs.patch + outputs = [ + "out" + "dev" ]; + patches = + [ ./libclc/libclc-gnu-install-dirs.patch ] + # LLVM 19 changes how host tools are looked up. + # Need to remove NO_DEFAULT_PATH and the PATHS arguments for find_program + # so CMake can actually find the tools in nativeBuildInputs. + # https://github.com/llvm/llvm-project/pull/105969 + ++ lib.optional (lib.versionAtLeast release_version "19") ( + getVersionFile "libclc/use-default-paths.patch" + ); + # cmake expects all required binaries to be in the same place, so it will not be able to find clang without the patch - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_CLANG clang PATHS "${buildLlvmTools.clang.cc}/bin" NO_DEFAULT_PATH )' \ - --replace 'find_program( LLVM_AS llvm-as PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_AS llvm-as PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ - --replace 'find_program( LLVM_LINK llvm-link PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_LINK llvm-link PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ - --replace 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_OPT opt PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ - --replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_SPIRV llvm-spirv PATHS "${buildPackages.spirv-llvm-translator.override { inherit (buildLlvmTools) llvm; }}/bin" NO_DEFAULT_PATH )' - '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - substituteInPlace CMakeLists.txt \ - --replace 'COMMAND prepare_builtins' 'COMMAND ${buildLlvmTools.libclc.dev}/bin/prepare_builtins' - ''; + postPatch = + lib.optionalString (lib.versionOlder release_version "19") '' + substituteInPlace CMakeLists.txt \ + --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ + 'find_program( LLVM_CLANG clang PATHS "${buildLlvmTools.clang.cc}/bin" NO_DEFAULT_PATH )' \ + --replace 'find_program( LLVM_AS llvm-as PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ + 'find_program( LLVM_AS llvm-as PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ + --replace 'find_program( LLVM_LINK llvm-link PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ + 'find_program( LLVM_LINK llvm-link PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ + --replace 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ + 'find_program( LLVM_OPT opt PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ + --replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ + 'find_program( LLVM_SPIRV llvm-spirv PATHS "${spirv-llvm-translator}/bin" NO_DEFAULT_PATH )' + '' + + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + substituteInPlace CMakeLists.txt \ + --replace 'COMMAND prepare_builtins' 'COMMAND ${buildLlvmTools.libclc.dev}/bin/prepare_builtins' + ''; - nativeBuildInputs = [ cmake ninja python3 ]; + nativeBuildInputs = + [ + cmake + ninja + python3 + ] + ++ lib.optional (lib.versionAtLeast release_version "19") [ + clang-only + buildLlvmTools.llvm + spirv-llvm-translator + ]; buildInputs = [ llvm ]; strictDeps = true; diff --git a/pkgs/development/compilers/llvm/common/libcxx/default.nix b/pkgs/development/compilers/llvm/common/libcxx/default.nix index 2893d012151d..c0d1ab02da85 100644 --- a/pkgs/development/compilers/llvm/common/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/common/libcxx/default.nix @@ -61,7 +61,8 @@ let ]) ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXXABI_ENABLE_THREADS=OFF" "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" - ] ++ lib.optionals (!enableShared) [ + ] ++ lib.optionals (!enableShared || stdenv.hostPlatform.isWindows) [ + # Required on Windows due to https://github.com/llvm/llvm-project/issues/55245 "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; @@ -91,6 +92,9 @@ let "-DLIBCXX_ENABLE_THREADS=OFF" "-DLIBCXX_ENABLE_FILESYSTEM=OFF" "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" + ] ++ lib.optionals stdenv.hostPlatform.isWindows [ + # https://github.com/llvm/llvm-project/issues/55245 + "-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON" ] ++ lib.optionals (!enableShared) [ "-DLIBCXX_ENABLE_SHARED=OFF" ] ++ lib.optionals (cxxabi != null && cxxabi.libName == "cxxrt") [ @@ -99,9 +103,13 @@ let cmakeFlags = [ "-DLLVM_ENABLE_RUNTIMES=${lib.concatStringsSep ";" runtimes}" + ] ++ lib.optionals ( + stdenv.hostPlatform.isWasm + || (lib.versions.major release_version == "12" && stdenv.hostPlatform.isDarwin) + ) [ + "-DCMAKE_CXX_COMPILER_WORKS=ON" ] ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DCMAKE_C_COMPILER_WORKS=ON" - "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DUNIX=ON" # Required otherwise libc++ fails to detect the correct linker ] ++ cxxCMakeFlags ++ lib.optionals (cxxabi == null) cxxabiCMakeFlags @@ -121,7 +129,7 @@ stdenv.mkDerivation (rec { ''; nativeBuildInputs = [ cmake ninja python3 ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames ++ lib.optional (cxxabi != null) lndir; buildInputs = [ cxxabi ] diff --git a/pkgs/development/compilers/llvm/common/libunwind/default.nix b/pkgs/development/compilers/llvm/common/libunwind/default.nix index 77854ddfcc5d..4f1fa0107c14 100644 --- a/pkgs/development/compilers/llvm/common/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/common/libunwind/default.nix @@ -19,7 +19,9 @@ let src' = if monorepoSrc != null then runCommand "${pname}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" mkdir -p "$out/libcxx" cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" @@ -33,11 +35,6 @@ let hasPatches = builtins.length patches > 0; - postUnpack = lib.optionalString (lib.versions.major release_version == "12") '' - ln -s ${libcxx.src}/libcxx . - ln -s ${libcxx.src}/llvm . - ''; - prePatch = lib.optionalString (lib.versionAtLeast release_version "15" && (hasPatches || lib.versionOlder release_version "18")) '' cd ../${pname} chmod -R u+w . @@ -58,8 +55,8 @@ stdenv.mkDerivation (rec { src = src'; sourceRoot = - if lib.versionOlder release_version "13" then null - else if lib.versionAtLeast release_version "15" then "${src.name}/runtimes" + if lib.versionAtLeast release_version "15" + then "${src.name}/runtimes" else "${src.name}/${pname}"; outputs = [ "out" "dev" ]; @@ -70,6 +67,9 @@ stdenv.mkDerivation (rec { cmakeFlags = lib.optional (lib.versionAtLeast release_version "15") "-DLLVM_ENABLE_RUNTIMES=libunwind" ++ lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF" + ++ lib.optionals (lib.versions.major release_version == "12" && stdenv.hostPlatform.isDarwin) [ + "-DCMAKE_CXX_COMPILER_WORKS=ON" + ] ++ devExtraCmakeFlags; meta = llvm_meta // { @@ -83,7 +83,6 @@ stdenv.mkDerivation (rec { dependency of other runtimes. ''; }; -} // (if postUnpack != "" then { inherit postUnpack; } else {}) - // (if (lib.versionAtLeast release_version "15") then { inherit postInstall; } else {}) +} // (if (lib.versionAtLeast release_version "15") then { inherit postInstall; } else {}) // (if prePatch != "" then { inherit prePatch; } else {}) // (if postPatch != "" then { inherit postPatch; } else {})) diff --git a/pkgs/development/compilers/llvm/common/lld/default.nix b/pkgs/development/compilers/llvm/common/lld/default.nix index 2c87d4cfa96f..4008f2076d73 100644 --- a/pkgs/development/compilers/llvm/common/lld/default.nix +++ b/pkgs/development/compilers/llvm/common/lld/default.nix @@ -6,7 +6,6 @@ , buildLlvmTools , monorepoSrc ? null , src ? null -, libunwind ? null , runCommand , cmake , ninja @@ -19,21 +18,18 @@ let pname = "lld"; src' = if monorepoSrc != null then - runCommand "lld-src-${version}" {} '' + runCommand "lld-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" mkdir -p "$out/libunwind" cp -r ${monorepoSrc}/libunwind/include "$out/libunwind" mkdir -p "$out/llvm" - '' else src; + '') else src; - postPatch = lib.optionalString (lib.versions.major release_version == "12") '' - substituteInPlace MachO/CMakeLists.txt --replace \ - '(''${LLVM_MAIN_SRC_DIR}/' '(' - mkdir -p libunwind/include - tar -xf "${libunwind.src}" --wildcards -C libunwind/include --strip-components=2 "libunwind-*/include/" - '' + lib.optionalString (lib.versions.major release_version == "13" && stdenv.isDarwin) '' + postPatch = lib.optionalString (lib.versionOlder release_version "14") '' substituteInPlace MachO/CMakeLists.txt --replace \ '(''${LLVM_MAIN_SRC_DIR}/' '(../' ''; @@ -43,9 +39,7 @@ stdenv.mkDerivation (rec { src = src'; - sourceRoot = - if lib.versionOlder release_version "13" then null - else "${src.name}/${pname}"; + sourceRoot = "${src.name}/${pname}"; nativeBuildInputs = [ cmake ] ++ lib.optional (lib.versionAtLeast release_version "15") ninja; buildInputs = [ libllvm libxml2 ]; @@ -75,4 +69,4 @@ stdenv.mkDerivation (rec { of several different linkers. ''; }; -} // (if (postPatch == "" && lib.versions.major release_version != "13") then {} else { inherit postPatch; })) +} // (lib.optionalAttrs (postPatch != "") { inherit postPatch; })) diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix index d174570c1f34..1e2233790738 100644 --- a/pkgs/development/compilers/llvm/common/lldb.nix +++ b/pkgs/development/compilers/llvm/common/lldb.nix @@ -24,6 +24,8 @@ , patches ? [ ] , enableManpages ? false , devExtraCmakeFlags ? [ ] +, apple-sdk_11 +, darwinMinVersionHook , ... }: @@ -32,7 +34,9 @@ let if monorepoSrc != null then runCommand "lldb-src-${version}" { } ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/lldb "$out" '' + lib.optionalString (lib.versionAtLeast release_version "19" && enableManpages) '' mkdir -p "$out/llvm" @@ -54,7 +58,7 @@ stdenv.mkDerivation (rec { # 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" ]; + outputs = [ "out" "dev" ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "lib" ]; sourceRoot = lib.optional (lib.versionAtLeast release_version "13") "${src.name}/${pname}"; @@ -87,34 +91,17 @@ stdenv.mkDerivation (rec { # libclang into the rpath of the lldb executables. By putting it into # buildInputs cc-wrapper will set up rpath correctly for us. (lib.getLib libclang) - ] ++ lib.optionals stdenv.isDarwin [ - darwin.libobjc - darwin.apple_sdk.libs.xpc - darwin.apple_sdk.frameworks.Foundation + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.bootstrap_cmds - darwin.apple_sdk.frameworks.Carbon - darwin.apple_sdk.frameworks.Cocoa ] - # The older libSystem used on x86_64 macOS is missing the - # `<bsm/audit_session.h>` header which `lldb` uses. - # - # We copy this header over from macOS 10.12 SDK. - # - # See here for context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional + ++ lib.optionals ( stdenv.targetPlatform.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0" - && (lib.versionAtLeast release_version "15") - ) - ( - runCommand "bsm-audit-session-header" { } '' - install -Dm444 \ - "${lib.getDev darwin.apple_sdk.sdk}/include/bsm/audit_session.h" \ - "$out/include/bsm/audit_session.h" - '' - ); + ) [ + apple-sdk_11 + (darwinMinVersionHook "10.15") + ]; hardeningDisable = [ "format" ]; @@ -123,12 +110,12 @@ stdenv.mkDerivation (rec { "-DLLVM_ENABLE_RTTI=OFF" "-DClang_DIR=${lib.getDev libclang}/lib/cmake" "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic ] ++ lib.optionals (lib.versionAtLeast release_version "17") [ - "-DCLANG_RESOURCE_DIR=../../../../${libclang.lib}" + "-DCLANG_RESOURCE_DIR=../../../../${lib.getLib libclang}" ] ++ lib.optionals enableManpages ([ "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index e39ba171373f..be106b3db295 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -4,7 +4,6 @@ , pkgsBuildBuild , pollyPatches ? [] , patches ? [] -, polly_src ? null , src ? null , monorepoSrc ? null , runCommand @@ -17,6 +16,7 @@ # TODO: Can this memory corruption bug still occur? # <https://github.com/llvm/llvm-project/issues/61350> , enableGoldPlugin ? libbfd.hasPluginAPI +, ld64 , libbfd , libpfm , libxml2 @@ -28,13 +28,13 @@ , sysctl , buildLlvmTools , debugVersion ? false -, doCheck ? !stdenv.isAarch32 && (if lib.versionOlder release_version "15" then stdenv.isLinux else true) - && (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) +, doCheck ? !stdenv.hostPlatform.isAarch32 && (if lib.versionOlder release_version "15" then stdenv.hostPlatform.isLinux else true) + && (!stdenv.hostPlatform.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) && !(stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isBigEndian) && (stdenv.hostPlatform == stdenv.buildPlatform) , enableManpages ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic -, enablePFM ? stdenv.isLinux /* PFM only supports Linux */ +, enablePFM ? stdenv.hostPlatform.isLinux /* PFM only supports Linux */ # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 # broken for the armv7l builder && !stdenv.hostPlatform.isAarch @@ -46,6 +46,11 @@ let inherit (lib) optional optionals optionalString; + # Is there a better way to do this? Darwin wants to disable tests in the first + # LLVM rebuild, but overriding doesn’t work when building libc++, libc++abi, + # and libunwind. It also wants to disable LTO in the first rebuild. + isDarwinBootstrap = lib.getName stdenv == "bootstrap-stage-xclang-stdenv-darwin"; + # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = lib.concatStringsSep "." (lib.take 1 (lib.splitString "." release_version)); @@ -66,7 +71,7 @@ let # # So, we "manually" assemble one python derivation for the package to depend # on, taking into account whether checks are enabled or not: - python = if doCheck then + python = if doCheck && !isDarwinBootstrap then # Note that we _explicitly_ ask for a python interpreter for our host # platform here; the splicing that would ordinarily take care of this for # us does not seem to work once we use `withPackages`. @@ -77,11 +82,15 @@ let pname = "llvm"; + # TODO: simplify versionAtLeast condition for cmake and third-party via rebuild src' = if monorepoSrc != null then runCommand "${pname}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/third-party "$out" '' + lib.optionalString enablePolly '' chmod u+w "$out/${pname}/tools" @@ -91,14 +100,13 @@ let patches' = patches ++ lib.optionals enablePolly pollyPatches; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation (finalAttrs: { inherit pname version; src = src'; patches = patches'; - sourceRoot = if lib.versionOlder release_version "13" then null - else "${src.name}/${pname}"; + sourceRoot = "${finalAttrs.src.name}/${pname}"; outputs = [ "out" "lib" "dev" "python" ]; @@ -126,7 +134,7 @@ stdenv.mkDerivation (rec { propagatedBuildInputs = (lib.optional (lib.versionAtLeast release_version "14" || stdenv.buildPlatform == stdenv.hostPlatform) ncurses) ++ [ zlib ]; - postPatch = optionalString stdenv.isDarwin ('' + postPatch = optionalString stdenv.hostPlatform.isDarwin ('' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" @@ -167,7 +175,7 @@ stdenv.mkDerivation (rec { --replace "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure" ''))) + # dup of above patch with different conditions - optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "15") (optionalString (lib.versionOlder release_version "16") '' + optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "15") (optionalString (lib.versionOlder release_version "16") '' substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" @@ -267,7 +275,7 @@ stdenv.mkDerivation (rec { # It seems to reference /usr/local/lib/libfile.a, which is clearly a problem. # 2. This test fails for the same reason it fails on MacOS, but the fix is # not trivial to apply. - optionalString stdenv.isFreeBSD '' + optionalString stdenv.hostPlatform.isFreeBSD '' rm test/tools/llvm-libtool-darwin/L-and-l.test rm test/ExecutionEngine/Interpreter/intrinsics.ll '' + '' @@ -319,7 +327,7 @@ stdenv.mkDerivation (rec { ''; # E.g. Mesa uses the build-id as a cache key (see #93946): - LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; + LDFLAGS = optionalString (enableSharedLibraries && !stdenv.hostPlatform.isDarwin) "-Wl,--build-id=sha1"; cmakeBuildType = if debugVersion then "Debug" else "Release"; @@ -342,13 +350,13 @@ stdenv.mkDerivation (rec { ]; in flagsForLlvmConfig ++ [ "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" + "-DLLVM_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" (lib.cmakeBool "LLVM_ENABLE_TERMINFO" enableTerminfo) - ] ++ optionals (!doCheck) [ + ] ++ optionals (!finalAttrs.finalPackage.doCheck) [ "-DLLVM_INCLUDE_TESTS=OFF" ] ++ optionals stdenv.hostPlatform.isStatic [ # Disables building of shared libs, -fPIC is still injected by cc-wrapper @@ -367,7 +375,7 @@ stdenv.mkDerivation (rec { "-DSPHINX_WARNINGS_AS_ERRORS=OFF" ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ @@ -416,10 +424,10 @@ stdenv.mkDerivation (rec { substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")' '') - + optionalString (stdenv.isDarwin && enableSharedLibraries && lib.versionOlder release_version "18") '' + + optionalString (stdenv.hostPlatform.isDarwin && enableSharedLibraries && lib.versionOlder release_version "18") '' ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib '' - + optionalString (stdenv.isDarwin && enableSharedLibraries) '' + + optionalString (stdenv.hostPlatform.isDarwin && enableSharedLibraries) '' ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) (if stdenv.buildPlatform.canExecute stdenv.hostPlatform then '' @@ -428,7 +436,7 @@ stdenv.mkDerivation (rec { cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''); - inherit doCheck; + doCheck = !isDarwinBootstrap && doCheck; checkTarget = "check-all"; @@ -483,19 +491,8 @@ stdenv.mkDerivation (rec { postPatch = null; postInstall = null; -})) // lib.optionalAttrs (lib.versionOlder release_version "13") { - inherit polly_src; - - unpackPhase = '' - unpackFile $src - mv llvm-${release_version}* llvm - sourceRoot=$PWD/llvm - '' + optionalString enablePolly '' - unpackFile $polly_src - mv polly-* $sourceRoot/tools/polly - ''; -} // lib.optionalAttrs (lib.versionAtLeast release_version "13") { - nativeCheckInputs = [ which ] ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast release_version "15") sysctl; +})) // lib.optionalAttrs (lib.versionAtLeast release_version "13") { + nativeCheckInputs = [ which ] ++ lib.optional (stdenv.hostPlatform.isDarwin && lib.versionAtLeast release_version "15") sysctl; } // lib.optionalAttrs (lib.versionOlder release_version "15") { # hacky fix: created binaries need to be run before installation preBuild = '' diff --git a/pkgs/development/compilers/llvm/common/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix index 3ef689b7fefe..9c3c71c3b705 100644 --- a/pkgs/development/compilers/llvm/common/mlir/default.nix +++ b/pkgs/development/compilers/llvm/common/mlir/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , llvm_meta +, release_version , buildLlvmTools , monorepoSrc , runCommand @@ -9,7 +10,7 @@ , libxml2 , libllvm , version -, doCheck ? (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) +, doCheck ? (!stdenv.hostPlatform.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) , devExtraCmakeFlags ? [] }: @@ -18,14 +19,16 @@ stdenv.mkDerivation rec { inherit version doCheck; # Blank llvm dir just so relative path works - src = runCommand "${pname}-src-${version}" { } '' + src = runCommand "${pname}-src-${version}" { } ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/mlir "$out" cp -r ${monorepoSrc}/third-party "$out/third-party" mkdir -p "$out/llvm" - ''; + ''); sourceRoot = "${src.name}/mlir"; diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index 57c6de07c784..1fe089938f03 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -21,20 +21,20 @@ let pname = "openmp"; src' = if monorepoSrc != null then - runCommand "${pname}-src-${version}" {} '' + runCommand "${pname}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" - '' else src; + '') else src; in stdenv.mkDerivation (rec { inherit pname version patches; src = src'; - sourceRoot = - if lib.versionOlder release_version "13" then null - else "${src.name}/${pname}"; + sourceRoot = "${src.name}/${pname}"; outputs = [ "out" ] ++ lib.optionals (lib.versionAtLeast release_version "14") [ "dev" ]; diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 2d0ffd4740f8..726b54a9d66e 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -22,17 +22,18 @@ }@packageSetArgs: let versions = { + "12.0.1".officialRelease.sha256 = "08s5w2db9imb2yaqsvxs6pg21csi1cf6wa35rf8x6q07mam7j8qv"; "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-rc3".officialRelease.sha256 = "sha256-SRonSpXt1pH6Xk+rQZk9mrfMdvYIvOImwUfMUu3sBgs="; + "19.1.3".officialRelease.sha256 = "sha256-NUx01eJNsYMlk+8mtlf10isIqhK8zBmqaOTjuFqMNRQ="; "20.0.0-git".gitRelease = { - rev = "48498ec7a4ded9f1bf813051abdc54c3e5b66fa7"; - rev-version = "20.0.0-unstable-2024-09-16"; - sha256 = "sha256-kybEr4T6vA4F9wtWdFf0QagVYU3tUvaXiSzPsxBkVUI="; + rev = "0e8555d4dbfdfeddc01dc2ecf9a9b6e804f7b645"; + rev-version = "20.0.0-unstable-2024-10-07"; + sha256 = "sha256-Rn8TkTUJKGFZ7uM1RiFOHIDTfpwEhLDpDh1zxVtTYG8="; }; } // llvmVersions; diff --git a/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch deleted file mode 100644 index 30fdf2c56d5b..000000000000 --- a/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch +++ /dev/null @@ -1,71 +0,0 @@ -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/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/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/libear -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear" - COMPONENT scan-build-py) - endforeach() - diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix index 645e7019aa73..2ebe573cf513 100644 --- a/pkgs/development/compilers/lobster/default.nix +++ b/pkgs/development/compilers/lobster/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ cmake ]; - buildInputs = if stdenv.isDarwin + buildInputs = if stdenv.hostPlatform.isDarwin then [ CoreFoundation Cocoa @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix {}; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://strlen.com/lobster/"; description = "Lobster programming language"; mainProgram = "lobster"; diff --git a/pkgs/development/compilers/lunarml/default.nix b/pkgs/development/compilers/lunarml/default.nix deleted file mode 100644 index 406589e05f44..000000000000 --- a/pkgs/development/compilers/lunarml/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, fetchFromGitHub -, stdenvNoCC -, mlton -, lua5_3 -}: - -let - version = "0.2.0"; -in -stdenvNoCC.mkDerivation { - inherit version; - - pname = "lunarml"; - - src = fetchFromGitHub { - owner = "minoki"; - repo = "LunarML"; - rev = "refs/tags/v${version}"; - hash = "sha256-w0DWvFegAdpJTab60cDLA+tketmMYeKApx1rCNr27i4="; - }; - - outputs = [ "out" "doc" ]; - - nativeBuildInputs = [ - mlton - ]; - - nativeCheckInputs = [ - lua5_3 - ]; - - postBuild = '' - make -C thirdparty install - ''; - - doCheck = true; - - installPhase = '' - runHook preInstall - - mkdir -p $doc/lunarml $out/{bin,lib} - cp -r bin $out - cp -r lib $out - cp -r example $doc/lunarml - - runHook postInstall - ''; - - meta = { - description = "Standard ML compiler that produces Lua/JavaScript"; - mainProgram = "lunarml"; - homepage = "https://github.com/minoki/LunarML"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ toastal ratsclub ]; - platforms = mlton.meta.platforms; - }; -} diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix deleted file mode 100644 index d344ff4b726e..000000000000 --- a/pkgs/development/compilers/manticore/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }: - -let - rev = "7376cb20ba5285a6b076a73c821e4743809c1d9d"; -in stdenv.mkDerivation { - pname = "manticore"; - version = "2019.12.03"; - - src = fetchFromGitHub { - owner = "ManticoreProject"; - repo = "manticore"; - sha256 = "17h3ar7d6145dyrm006r3gd5frk3v4apjk383n78dh4vlniv1ay2"; - inherit rev; - }; - - enableParallelBuilding = false; - - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ coreutils smlnj ]; - - autoreconfFlags = [ "-Iconfig" "-vfi" ]; - - unpackPhase = '' - mkdir -p $out - cd $out - unpackFile $src - mv source repo_checkout - cd repo_checkout - chmod u+w . -R - ''; - - postPatch = '' - patchShebangs . - substituteInPlace configure.ac --replace 'MANTICORE_ROOT=`pwd`' 'MANTICORE_ROOT=$out/repo_checkout' - ''; - - preInstall = "mkdir -p $out/bin"; - - meta = { - description = "Parallel, pure variant of Standard ML"; - mainProgram = "pmlc"; - - longDescription = '' - Manticore is a high-level parallel programming language aimed at - general-purpose applications running on multi-core - processors. Manticore supports parallelism at multiple levels: - explicit concurrency and coarse-grain parallelism via CML-style - constructs and fine-grain parallelism via various light-weight - notations, such as parallel tuple expressions and NESL/Nepal-style - parallel array comprehensions. - ''; - - homepage = "http://manticore.cs.uchicago.edu/"; - }; -} diff --git a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix deleted file mode 100644 index 195f0c0e36f8..000000000000 --- a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "meta-build-env"; - version = "0.1"; - - src = fetchurl { - url = "http://www.meta-environment.org/releases/meta-build-env-${version}.tar.gz"; - sha256 = "1imn1gaan4fv73v8w3k3lgyjzkcn7bdp69k6hlz0vqdg17ysd1x3"; - }; - - meta = { - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix deleted file mode 100644 index d630082c76fb..000000000000 --- a/pkgs/development/compilers/microscheme/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, unixtools }: - -stdenv.mkDerivation rec { - pname = "microscheme"; - version = "0.9.3"; - - src = fetchFromGitHub { - owner = "ryansuchocki"; - repo = "microscheme"; - rev = "v${version}"; - sha256 = "5qTWsBCfj5DCZ3f9W1bdo6WAc1DZqVxg8D7pwC95duQ="; - }; - - postPatch = '' - substituteInPlace makefile --replace gcc ${stdenv.cc.targetPrefix}cc - ''; - - nativeBuildInputs = [ makeWrapper unixtools.xxd ]; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - meta = with lib; { - homepage = "https://ryansuchocki.github.io/microscheme/"; - description = "Scheme subset for Atmel microcontrollers"; - mainProgram = "microscheme"; - longDescription = '' - Microscheme is a Scheme subset/variant designed for Atmel - microcontrollers, especially as found on Arduino boards. - ''; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ ardumont ]; - }; -} diff --git a/pkgs/development/compilers/minimacy/default.nix b/pkgs/development/compilers/minimacy/default.nix deleted file mode 100644 index ae4da0d5b027..000000000000 --- a/pkgs/development/compilers/minimacy/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib -, stdenv -, alsa-lib -, fetchFromGitHub -, libGL -, libGLU -, libX11 -, libXext -, makeBinaryWrapper -}: - -stdenv.mkDerivation rec { - pname = "minimacy"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "ambermind"; - repo = pname; - rev = version; - hash = "sha256-uA+4dnhOnv7qRE7nqew8a14DGaQblsMY2uBZ+iyLtFU="; - }; - - nativeBuildInputs = [ makeBinaryWrapper ]; - - buildInputs = [ libGL libGLU ] ++ lib.optionals stdenv.isLinux [ alsa-lib libX11 libXext ]; - - enableParallelBuilding = true; - - env.NIX_CFLAGS_COMPILE = "-Wno-unused-result"; - - preBuild = '' - pushd ${if stdenv.isDarwin then "macos/cmdline" else "unix"} - ''; - - # TODO: build graphic version for darwin - buildFlags = (if stdenv.isDarwin then [ "nox" ] else [ "all" ]) ++ [ "CC=${stdenv.cc.targetPrefix}cc" ]; - - postBuild = '' - popd - ''; - - doCheck = true; - - checkPhase = '' - runHook preCheck - - bin/${if stdenv.isDarwin then "minimacyMac" else "minimacy"} system/demo/demo.fun.mandelbrot.mcy - - runHook postCheck - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib/minimacy - cp -r {README.md,LICENSE,system,rom,topLevel.mcy} $out/lib/minimacy - install bin/minimacy* -Dt $out/bin - - runHook postInstall - ''; - - postFixup = '' - for prog in $out/bin/minimacy*; - do wrapProgram $prog \ - --set MINIMACY $out/lib/minimacy - done - ''; - - meta = { - description = "Open-source minimalist computing technology"; - longDescription = '' - Minimacy is an open-source minimalist computation system based on the principle "Less is more". - It is designed and programmed by Sylvain Huet. - ''; - maintainers = with lib.maintainers; [ jboy ]; - homepage = "https://minimacy.net"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - }; -} diff --git a/pkgs/development/compilers/miranda/default.nix b/pkgs/development/compilers/miranda/default.nix deleted file mode 100644 index 8385f5063db9..000000000000 --- a/pkgs/development/compilers/miranda/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ stdenv, lib, fetchzip, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "miranda"; - version = "2.066"; - - # The build generates object files (`.x`) from module files (`.m`). - # To be able to invalidate object file, it contains the `mtime` - # of the corresponding module file at the time of the build. - # When a file is installed to Nix store its `mtime` is set to `1`, - # so the `mtime` field in the object file would no longer match - # and Miranda would try to regenerate it at the runtime, - # even though it is up to date. - # Using `fetchzip` will make all the source files have `mtime=1` - # from the start so this mismatch cannot occur. - src = fetchzip { - url = "https://www.cs.kent.ac.uk/people/staff/dat/miranda/src/mira-${builtins.replaceStrings [ "." ] [ "" ] version}-src.tgz"; - sha256 = "KE/FTL9YW9l7VBAgkFZlqgSM1Bt/BXT6GkkONtyKJjQ="; - }; - - patches = [ - # Allow passing `PREFIX` to makeFlags. - # Sent upstream on 2020-10-10. - (fetchpatch { - name = "fix-makefile-variables.patch"; - url = "https://github.com/jtojnar/miranda/commit/be62d2150725a4c314aa7e3e1e75a165c90be65d.patch"; - sha256 = "0r8nnr7iyzp1a3w3n6y1xi0ralqhm1ifp75yhyj3h1g229vk51a6"; - }) - - # Create the installation directories. - # Sent upstream on 2020-10-10. - (fetchpatch { - name = "add-mkdirs-makefile.patch"; - url = "https://github.com/jtojnar/miranda/commit/048754606625975d5358e946549c41ae7b5d3428.patch"; - sha256 = "1n8xv679i7s789km2dxxrs2pphyyi7vr7rhafqvmkcdmhmxk9h2a"; - }) - - # Use correct installation path for finding the library. - # Sent upstream on 2020-10-10. - (fetchpatch { - name = "c-path-fixes.patch"; - url = "https://github.com/jtojnar/miranda/commit/aea0a118a802a0da6029b781f7cfd388224263cf.patch"; - sha256 = "1z3giv8fzc35a23ga9ahz9d1fbvya67kavnb8h4rv2icbzr5j5gd"; - }) - - # Make build reproducible. - # Sent upstream on 2020-10-10. - (fetchpatch { - name = "deterministic-build.patch"; - url = "https://github.com/jtojnar/miranda/commit/daf8abb8f30ec1cca21698e3fc355578b9f7c571.patch"; - sha256 = "TC/YrHrMzdlwicJ3oJ/TjwhkufmV3ypemgyqhMmVut4="; - }) - ]; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: types.o:(.bss+0x11b0): multiple definition of `current_file'; y.tab.o:(.bss+0x70): first defined here - env.NIX_CFLAGS_COMPILE = toString ([ - "-fcommon" - ] ++ lib.optionals stdenv.cc.isClang [ - "-Wno-error=int-conversion" - ]); - - makeFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - "CFLAGS=-O2" - "PREFIX=${placeholder "out"}" - ]; - - enableParallelBuilding = true; - - postPatch = '' - patchShebangs quotehostinfo - substituteInPlace Makefile --replace strip '${stdenv.cc.targetPrefix}strip' - ''; - - meta = with lib; { - description = "Compiler for Miranda -- a pure, non-strict, polymorphic, higher order functional programming language"; - homepage = "https://www.cs.kent.ac.uk/people/staff/dat/miranda/"; - license = licenses.bsd2; - maintainers = with maintainers; [ siraben ]; - platforms = platforms.all; - mainProgram = "mira"; - }; -} diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 1abbac512aa7..9b110b0a8b04 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -15,9 +15,9 @@ let version = "12.1"; - bootstrapFromC = ! ((stdenv.isLinux && stdenv.isAarch64) || stdenv.isx86_64); + bootstrapFromC = ! ((stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isx86_64); - arch = if stdenv.isLinux && stdenv.isAarch64 then + arch = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64 then "-aarch64le" else "-x86-64"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { # leads to more efficient code than when building the tarball that contains # generated C code instead of those binaries. src = - if stdenv.isLinux && stdenv.isAarch64 + if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64 then fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-aarch64le.tar.gz"; sha256 = "12ra9bc93x8g07impbd8jr6djjzwpb9qvh9zhxvvrba3332zx3vh"; @@ -93,13 +93,13 @@ stdenv.mkDerivation { meta = with lib; { description = "MIT/GNU Scheme, a native code Scheme compiler"; - longDescription = - '' MIT/GNU Scheme is an implementation of the Scheme programming - language, providing an interpreter, compiler, source-code debugger, - integrated Emacs-like editor, and a large runtime library. MIT/GNU - Scheme is best suited to programming large applications with a rapid - development cycle. - ''; + longDescription = '' + MIT/GNU Scheme is an implementation of the Scheme programming + language, providing an interpreter, compiler, source-code debugger, + integrated Emacs-like editor, and a large runtime library. MIT/GNU + Scheme is best suited to programming large applications with a rapid + development cycle. + ''; homepage = "https://www.gnu.org/software/mit-scheme/"; diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index 0b95f3e9b2a6..d5e297ae26ef 100644 --- a/pkgs/development/compilers/mkcl/default.nix +++ b/pkgs/development/compilers/mkcl/default.nix @@ -39,14 +39,16 @@ stdenv.mkDerivation rec { ]; # tinycc configure flags copied from the tinycc derivation. - postConfigure = ''( - cd contrib/tinycc - ./configure --cc=cc \ - --elfinterp=$(< $NIX_CC/nix-support/dynamic-linker) \ - --crtprefix=${lib.getLib stdenv.cc.libc}/lib \ - --sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include \ - --libpaths=${lib.getLib stdenv.cc.libc}/lib - )''; + postConfigure = '' + ( + cd contrib/tinycc; + ./configure --cc=cc \ + --elfinterp=$(< $NIX_CC/nix-support/dynamic-linker) \ + --crtprefix=${lib.getLib stdenv.cc.libc}/lib \ + --sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include \ + --libpaths=${lib.getLib stdenv.cc.libc}/lib + ) + ''; postInstall = '' wrapProgram $out/bin/mkcl --prefix PATH : "${gcc}/bin" @@ -55,7 +57,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "ANSI Common Lisp Implementation"; homepage = "https://common-lisp.net/project/mkcl/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/compilers/mlkit/default.nix b/pkgs/development/compilers/mlkit/default.nix deleted file mode 100644 index c4dfa85b70c1..000000000000 --- a/pkgs/development/compilers/mlkit/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, mlton }: - -stdenv.mkDerivation rec { - pname = "mlkit"; - version = "4.7.11"; - - src = fetchFromGitHub { - owner = "melsman"; - repo = "mlkit"; - rev = "v${version}"; - sha256 = "sha256-awjinXegc8jLd6OAB8QLDoXnotZhKbyfMWckp2U3MjA="; - }; - - nativeBuildInputs = [ autoreconfHook mlton ]; - - buildFlags = [ "mlkit" "mlkit_libs" ]; - - doCheck = true; - - checkPhase = '' - runHook preCheck - echo ==== Running MLKit test suite: test ==== - make -C test_dev test - echo ==== Running MLKit test suite: test_prof ==== - make -C test_dev test_prof - runHook postCheck - ''; - - meta = with lib; { - description = "Standard ML Compiler and Toolkit"; - homepage = "https://elsman.com/mlkit/"; - changelog = "https://github.com/melsman/mlkit/blob/v${version}/NEWS.md"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ athas ]; - }; -} diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix index 98b4aeda5516..90285bf08982 100644 --- a/pkgs/development/compilers/mlton/20130715.nix +++ b/pkgs/development/compilers/mlton/20130715.nix @@ -3,7 +3,7 @@ let version = "20130715"; - usr_prefix = if stdenv.isDarwin then "usr/local" else "usr"; + usr_prefix = if stdenv.hostPlatform.isDarwin then "usr/local" else "usr"; dynamic_linker = stdenv.cc.bintools.dynamicLinker; in @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { sourceRoot = "${pname}-${version}"; buildInputs = [ gmp ]; - nativeBuildInputs = lib.optional stdenv.isLinux patchelf; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux patchelf; makeFlags = [ "all-no-docs" ]; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { substituteInPlace $(pwd)/../${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $(pwd)/../${usr_prefix}/lib/mlton '' + lib.optionalString stdenv.cc.isClang '' sed -i "s_ patch -s -p0 <gdtoa.hide-public-fns.patch_ patch -s -p0 <gdtoa.hide-public-fns.patch\n\tsed -i 's|printf(emptyfmt|printf(\"\"|g' ./gdtoa/arithchk.c_" ./runtime/Makefile - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's|XCFLAGS += -I/usr/local/include -I/sw/include -I/opt/local/include||' ./runtime/Makefile ''; @@ -79,13 +79,13 @@ stdenv.mkDerivation rec { # So the builder runs the binary compiler with gmp. export LD_LIBRARY_PATH=${gmp.out}/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # Patch ELF interpreter. patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile for e in mllex mlyacc ; do patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/bin/$e done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Patch libgmp linking install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mlyacc diff --git a/pkgs/development/compilers/mlton/20180207-binary.nix b/pkgs/development/compilers/mlton/20180207-binary.nix index 4846b58bf26b..2384122d70b6 100644 --- a/pkgs/development/compilers/mlton/20180207-binary.nix +++ b/pkgs/development/compilers/mlton/20180207-binary.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { throw "Architecture not supported"; buildInputs = [ gmp ]; - nativeBuildInputs = lib.optional stdenv.isLinux patchelf; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux patchelf; buildPhase = '' make update \ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { make install PREFIX=$out ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-interpreter ${dynamic-linker} $out/lib/mlton/mlton-compile patchelf --set-rpath ${gmp}/lib $out/lib/mlton/mlton-compile @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter ${dynamic-linker} $out/bin/$e patchelf --set-rpath ${gmp}/lib $out/bin/$e done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change \ /opt/local/lib/libgmp.10.dylib \ ${gmp}/lib/libgmp.10.dylib \ diff --git a/pkgs/development/compilers/mlton/20210117-binary.nix b/pkgs/development/compilers/mlton/20210117-binary.nix index d4e55d47b94c..40e9482ba1fb 100644 --- a/pkgs/development/compilers/mlton/20210117-binary.nix +++ b/pkgs/development/compilers/mlton/20210117-binary.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { throw "Architecture not supported"; buildInputs = [ gmp ]; - nativeBuildInputs = lib.optional stdenv.isLinux patchelf; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux patchelf; buildPhase = '' make update \ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { make install PREFIX=$out ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-interpreter ${dynamic-linker} $out/lib/mlton/mlton-compile patchelf --set-rpath ${gmp}/lib $out/lib/mlton/mlton-compile @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter ${dynamic-linker} $out/bin/$e patchelf --set-rpath ${gmp}/lib $out/bin/$e done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change \ /opt/local/lib/libgmp.10.dylib \ ${gmp}/lib/libgmp.10.dylib \ diff --git a/pkgs/development/compilers/mono/4.nix b/pkgs/development/compilers/mono/4.nix index 0b283d4f1778..8664cb3f7283 100644 --- a/pkgs/development/compilers/mono/4.nix +++ b/pkgs/development/compilers/mono/4.nix @@ -5,5 +5,5 @@ callPackage ./generic.nix ({ version = "4.8.1.0"; sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq"; enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65600645 - extraPatches = lib.optionals stdenv.isLinux [ ./mono4-glibc.patch ]; + extraPatches = lib.optionals stdenv.hostPlatform.isLinux [ ./mono4-glibc.patch ]; }) diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 42c519e5021c..44fb05329030 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ncurses zlib bash - ] ++ lib.optionals stdenv.isDarwin [ Foundation libobjc ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation libobjc ]; configureFlags = [ "--x-includes=${libX11.dev}/include" @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { meta = with lib; { # Per nixpkgs#151720 the build failures for aarch64-darwin are fixed since 6.12.0.129 - broken = stdenv.isDarwin && stdenv.isAarch64 && lib.versionOlder version "6.12.0.129"; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && lib.versionOlder version "6.12.0.129"; homepage = "https://mono-project.com/"; description = "Cross platform, open source .NET development framework"; platforms = with platforms; darwin ++ linux; diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index c69a4021677e..a9b21845f46a 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ perl groff libxml2 python2 libffi ] ++ lib.optional stdenv.isLinux valgrind; + buildInputs = [ perl groff libxml2 python2 libffi ] ++ lib.optional stdenv.hostPlatform.isLinux valgrind; propagatedBuildInputs = [ ncurses zlib ]; diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/development/compilers/mosml/default.nix deleted file mode 100644 index 26ce0365a6cd..000000000000 --- a/pkgs/development/compilers/mosml/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gmp, perl }: - -stdenv.mkDerivation rec { - pname = "mosml"; - version = "2.10.1"; - - buildInputs = [ gmp perl ]; - - makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; - - src = fetchFromGitHub { - owner = "kfl"; - repo = "mosml"; - rev = "ver-${version}"; - sha256 = "sha256-GK39WvM7NNhoC5f0Wjy4/5VWT+Rbh2qo+W71hWrbPso="; - }; - - setSourceRoot = ''export sourceRoot="$(echo */src)"''; - - # MosML needs a specific RPATH entry pointing to $(out)/lib (added - # by the build system), which patchelf will remove. - dontPatchELF = true; - - meta = with lib; { - description = "Light-weight implementation of Standard ML"; - longDescription = '' - Moscow ML is a light-weight implementation of Standard ML (SML), a strict - functional language used in teaching and research. - ''; - homepage = "https://mosml.org/"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ vaibhavsagar ]; - }; -} diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix index 8b66cbce688b..b82253d2b493 100644 --- a/pkgs/development/compilers/mozart/default.nix +++ b/pkgs/development/compilers/mozart/default.nix @@ -76,7 +76,7 @@ in stdenv.mkDerivation rec { homepage = "https://mozart.github.io"; platforms = platforms.all; # Trace/BPT trap: 5 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix deleted file mode 100644 index 0fc1af2d6676..000000000000 --- a/pkgs/development/compilers/mruby/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, ruby, rake, fetchFromGitHub, testers }: - -stdenv.mkDerivation (finalAttrs: { - pname = "mruby"; - version = "3.3.0"; - - src = fetchFromGitHub { - owner = "mruby"; - repo = "mruby"; - rev = finalAttrs.version; - sha256 = "sha256-rCoEC1ioX6bOocPoPi+Lsn4PM8gY0DjKja1/MJvJ1n8="; - }; - - nativeBuildInputs = [ rake ]; - - nativeCheckInputs = [ ruby ]; - - # Necessary so it uses `gcc` instead of `ld` for linking. - # https://github.com/mruby/mruby/blob/e502fd88b988b0a8d9f31b928eb322eae269c45a/tasks/toolchains/gcc.rake#L30 - preBuild = "unset LD"; - - installPhase = '' - mkdir $out - cp -R include build/host/{bin,lib} $out - ''; - - doCheck = true; - - checkTarget = "test"; - - passthru.tests = { - version = testers.testVersion { - package = finalAttrs.finalPackage; - }; - }; - - meta = with lib; { - description = "Embeddable implementation of the Ruby language"; - homepage = "https://mruby.org"; - maintainers = with maintainers; [ nicknovitski ]; - license = licenses.mit; - platforms = platforms.all; - mainProgram = "mruby"; - }; -}) diff --git a/pkgs/development/compilers/muonlang/default.nix b/pkgs/development/compilers/muonlang/default.nix deleted file mode 100644 index aef02bca970d..000000000000 --- a/pkgs/development/compilers/muonlang/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "muon"; - version = "2019-11-27"; - - src = fetchFromGitHub { - owner = "nickmqb"; - repo = pname; - rev = "6d3a5054ae75b0e5a0ae633cf8cbc3e2a054f8b3"; - sha256 = "1sb1i08421jxlx791g8nh4l239syaj730hagkzc159g0z65614zz"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildPhase = '' - mkdir -p $out/bin $out/share/mu - cp -r lib $out/share/mu - ${stdenv.cc.targetPrefix}cc -o $out/bin/mu-unwrapped bootstrap/mu64.c - ''; - - installPhase = '' - makeWrapper $out/bin/mu-unwrapped $out/bin/mu \ - --add-flags $out/share/mu/lib/core.mu - ''; - - meta = with lib; { - description = "Modern low-level programming language"; - homepage = "https://github.com/nickmqb/muon"; - license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/myrddin/default.nix b/pkgs/development/compilers/myrddin/default.nix deleted file mode 100644 index b682b1e0ac54..000000000000 --- a/pkgs/development/compilers/myrddin/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, bison -, binutils -, makeWrapper -}: - -stdenv.mkDerivation rec { - pname = "myrddin"; - version = "0.3.1"; - - src = fetchFromGitHub { - repo = "mc"; - owner = "oridb"; - rev = "r${version}"; - sha256 = "7ImjiG/rIKGPHq3Vh/mftY7pqw/vfOxD3LJeT87HmCk="; - }; - - nativeBuildInputs = [ - bison - pkg-config - makeWrapper - ]; - - postPatch = '' - substituteInPlace mk/c.mk \ - --replace "-Werror" "" - ''; - - buildPhase = '' - make bootstrap -j$NIX_BUILD_CORES - make -j$NIX_BUILD_CORES - ''; - - postInstall = '' - for b in $out/bin/*; do - wrapProgram $b --prefix PATH : $out/bin:${lib.makeBinPath [ binutils ]} - done - ''; - - checkPhase = '' - make check - ''; - - doCheck = true; - - meta = with lib; { - description = "Systems language that is both powerful and fun to use"; - homepage = "https://myrlang.org/"; - license = licenses.mit; - maintainers = with maintainers; [ luc65r ]; - platforms = platforms.all; - # darwin: never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/myrddin.x86_64-darwin - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; - }; -} diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix deleted file mode 100644 index e839c21fca2b..000000000000 --- a/pkgs/development/compilers/nasm/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchurl -, perl -, gitUpdater -}: - -stdenv.mkDerivation rec { - pname = "nasm"; - version = "2.16.03"; - - src = fetchurl { - url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-FBKhx2C70F2wJrbA0WV6/9ZjHNCmPN229zzG1KphYUg="; - }; - - nativeBuildInputs = [ perl ]; - - enableParallelBuilding = true; - - doCheck = true; - - checkPhase = '' - runHook preCheck - - make golden - make test - - runHook postCheck - ''; - - passthru.updateScript = gitUpdater { - url = "https://github.com/netwide-assembler/nasm.git"; - rev-prefix = "nasm-"; - ignoredVersions = "rc.*"; - }; - - meta = with lib; { - homepage = "https://www.nasm.us/"; - description = "80x86 and x86-64 assembler designed for portability and modularity"; - platforms = platforms.unix; - maintainers = with maintainers; [ pSub willibutz ]; - license = licenses.bsd2; - }; -} diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix deleted file mode 100644 index a0c888674016..000000000000 --- a/pkgs/development/compilers/neko/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, boehmgc, zlib, sqlite, pcre, cmake, pkg-config -, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls_2, openssl, pkgs, gtk2, libpthreadstubs -}: - -stdenv.mkDerivation rec { - pname = "neko"; - version = "2.3.0"; - - src = fetchFromGitHub { - owner = "HaxeFoundation"; - repo = "neko"; - rev = "v${lib.replaceStrings [ "." ] [ "-" ] version}"; - sha256 = "19rc59cx7qqhcqlb0znwbnwbg04c1yq6xmvrwm1xi46k3vxa957g"; - }; - - patches = [ - # https://github.com/HaxeFoundation/neko/pull/224 - (fetchpatch { - url = "https://github.com/HaxeFoundation/neko/commit/ff5da9b0e96cc0eabc44ad2c10b7a92623ba49ee.patch"; - sha256 = "sha256-isM7QGPiyXgT2zpIGd+r12vKg7I1rOWYTTWxuECafro="; - }) - ]; - - nativeBuildInputs = [ cmake pkg-config git ]; - buildInputs = - [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil - libmysqlclient mbedtls_2 openssl libpthreadstubs ] - ++ lib.optional stdenv.isLinux gtk2 - ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security - pkgs.darwin.apple_sdk.frameworks.Carbon]; - cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ]; - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; - - installCheckPhase = '' - bin/neko bin/test.n - ''; - - # Called from tools/test.neko line 2 - # Uncaught exception - Segmentation fault - doInstallCheck = !stdenv.isDarwin; - dontPatchELF = true; - dontStrip = true; - - meta = with lib; { - description = "High-level dynamically typed programming language"; - homepage = "https://nekovm.org"; - license = [ - # list based on https://github.com/HaxeFoundation/neko/blob/v2-3-0/LICENSE - licenses.gpl2Plus # nekoc, nekoml - licenses.lgpl21Plus # mysql.ndll - licenses.bsd3 # regexp.ndll - licenses.zlib # zlib.ndll - licenses.asl20 # mod_neko, mod_tora, mbedTLS - licenses.mit # overall, other libs - "https://github.com/HaxeFoundation/neko/blob/v2-3-0/LICENSE#L24-L40" # boehm gc - ]; - maintainers = [ maintainers.marcweber maintainers.locallycompact ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/compilers/nim/NIM_CONFIG_DIR.patch b/pkgs/development/compilers/nim/NIM_CONFIG_DIR.patch deleted file mode 100644 index 61e05b791cf8..000000000000 --- a/pkgs/development/compilers/nim/NIM_CONFIG_DIR.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/compiler/nimconf.nim b/compiler/nimconf.nim -index a470179bd..73cfa1a23 100644 ---- a/compiler/nimconf.nim -+++ b/compiler/nimconf.nim -@@ -225,10 +225,15 @@ proc getUserConfigPath*(filename: RelativeFile): AbsoluteFile = - proc getSystemConfigPath*(conf: ConfigRef; filename: RelativeFile): AbsoluteFile = - # try standard configuration file (installation did not distribute files - # the UNIX way) -- let p = getPrefixDir(conf) -- result = p / RelativeDir"config" / filename -+ let -+ prefix = getPrefixDir(conf) -+ env = getEnv("NIM_CONFIG_PATH") -+ if env != "": -+ result = env.toAbsoluteDir / filename -+ else: -+ result = prefix / RelativeDir"config" / filename - when defined(unix): -- if not fileExists(result): result = p / RelativeDir"etc/nim" / filename -+ if not fileExists(result): result = prefix / RelativeDir"etc/nim" / filename - if not fileExists(result): result = AbsoluteDir"/etc/nim" / filename - - proc loadConfigs*(cfg: RelativeFile; cache: IdentCache; conf: ConfigRef) = diff --git a/pkgs/development/compilers/nim/build-nim-package.nix b/pkgs/development/compilers/nim/build-nim-package.nix deleted file mode 100644 index 2bff3bf8cc85..000000000000 --- a/pkgs/development/compilers/nim/build-nim-package.nix +++ /dev/null @@ -1,136 +0,0 @@ -{ lib -, buildPackages -, callPackage -, stdenv -, nim1 -, nim2 -, nim_builder -, defaultNimVersion ? 2 -, nimOverrides -, buildNimPackage -}: - -let - baseAttrs = { - strictDeps = true; - enableParallelBuilding = true; - doCheck = true; - configurePhase = '' - runHook preConfigure - export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS - nim_builder --phase:configure - runHook postConfigure - ''; - buildPhase = '' - runHook preBuild - nim_builder --phase:build - runHook postBuild - ''; - checkPhase = '' - runHook preCheck - nim_builder --phase:check - runHook postCheck - ''; - installPhase = '' - runHook preInstall - nim_builder --phase:install - runHook postInstall - ''; - meta = { inherit (nim2.meta) maintainers platforms; }; - }; - - fodFromLockEntry = - let - methods = { - fetchzip = { url, sha256, ... }: - buildPackages.fetchzip { - name = "source"; - inherit url sha256; - }; - git = { fetchSubmodules, leaveDotGit, rev, sha256, url, ... }: - buildPackages.fetchgit { - inherit fetchSubmodules leaveDotGit rev sha256 url; - }; - }; - in - attrs@{ method, ... }: - let fod = methods.${method} attrs; - in ''--path:"${fod.outPath}/${attrs.srcDir}"''; - - asFunc = x: if builtins.isFunction x then x else (_: x); - -in -buildNimPackageArgs: -let - composition = finalAttrs: - let - postPkg = baseAttrs - // (asFunc ((asFunc buildNimPackageArgs) finalAttrs)) baseAttrs; - - lockAttrs = - lib.attrsets.optionalAttrs (builtins.hasAttr "lockFile" postPkg) - (builtins.fromJSON (builtins.readFile postPkg.lockFile)); - - lockDepends = lockAttrs.depends or [ ]; - - lockFileNimFlags = map fodFromLockEntry lockDepends; - - postNimOverrides = builtins.foldl' ( - prevAttrs: - { packages, ... }@lockAttrs: - builtins.foldl' ( - prevAttrs: name: - if (builtins.hasAttr name nimOverrides) then - (prevAttrs // (nimOverrides.${name} lockAttrs prevAttrs)) - else - prevAttrs - ) prevAttrs packages - ) postPkg lockDepends; - - finalOverride = - { depsBuildBuild ? [ ] - , nativeBuildInputs ? [ ] - , nimFlags ? [ ] - , requiredNimVersion ? defaultNimVersion - , passthru ? { } - , ... - }: - (if requiredNimVersion == 1 then { - depsBuildBuild = [ nim_builder ] ++ depsBuildBuild; - nativeBuildInputs = [ nim1 ] ++ nativeBuildInputs; - } else if requiredNimVersion == 2 then { - depsBuildBuild = [ nim_builder ] ++ depsBuildBuild; - nativeBuildInputs = [ nim2 ] ++ nativeBuildInputs; - } else - throw - "requiredNimVersion ${toString requiredNimVersion} is not valid") // { - nimFlags = lockFileNimFlags ++ nimFlags; - passthru = passthru // { - # allow overriding the result of buildNimPackageArgs before this composition is applied - # this allows overriding the lockFile for packages built using buildNimPackage - # this is adapted from mkDerivationExtensible in stdenv.mkDerivation - overrideNimAttrs = f0: - let - f = self: super: - let x = f0 super; - in - if builtins.isFunction x - then f0 self super - else x; - in - buildNimPackage - (self: - let super = (asFunc ((asFunc buildNimPackageArgs) self)) baseAttrs; - in - super // (if builtins.isFunction f0 || f0?__functor then f self super else f0)); - }; - }; - - attrs = postNimOverrides // finalOverride postNimOverrides; - in - lib.trivial.warnIf (builtins.hasAttr "nimBinOnly" attrs) - "the nimBinOnly attribute is deprecated for buildNimPackage" - attrs; - -in -stdenv.mkDerivation composition diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix deleted file mode 100644 index 4655cb03ad7b..000000000000 --- a/pkgs/development/compilers/nim/default.nix +++ /dev/null @@ -1,321 +0,0 @@ -# https://nim-lang.github.io/Nim/packaging.html -# https://nim-lang.org/docs/nimc.html - -{ lib, callPackage, buildPackages, stdenv, fetchurl, fetchgit -, makeWrapper, openssl, pcre, readline, boehmgc, sqlite, Security -, nim-unwrapped-2, nim-unwrapped-1, nim }: - -let - parseCpu = platform: - with platform; - # Derive a Nim CPU identifier - if isAarch32 then - "arm" - else if isAarch64 then - "arm64" - else if isAlpha then - "alpha" - else if isAvr then - "avr" - else if isMips && is32bit then - "mips" - else if isMips && is64bit then - "mips64" - else if isMsp430 then - "msp430" - else if isPower && is32bit then - "powerpc" - else if isPower && is64bit then - "powerpc64" - else if isRiscV && is64bit then - "riscv64" - else if isSparc then - "sparc" - else if isx86_32 then - "i386" - else if isx86_64 then - "amd64" - else - abort "no Nim CPU support known for ${config}"; - - parseOs = platform: - with platform; - # Derive a Nim OS identifier - if isAndroid then - "Android" - else if isDarwin then - "MacOSX" - else if isFreeBSD then - "FreeBSD" - else if isGenode then - "Genode" - else if isLinux then - "Linux" - else if isNetBSD then - "NetBSD" - else if isNone then - "Standalone" - else if isOpenBSD then - "OpenBSD" - else if isWindows then - "Windows" - else if isiOS then - "iOS" - else - abort "no Nim OS support known for ${config}"; - - parsePlatform = p: { - cpu = parseCpu p; - os = parseOs p; - }; - - nimHost = parsePlatform stdenv.hostPlatform; - nimTarget = parsePlatform stdenv.targetPlatform; - -in { - - nim-unwrapped-2 = stdenv.mkDerivation (finalAttrs: { - pname = "nim-unwrapped"; - version = "2.0.8"; - strictDeps = true; - - src = fetchurl { - url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-VwLahEcA0xKdtzFwtcYGrb37h+grgWwNkRB+ogpl3xY="; - }; - - buildInputs = [ boehmgc openssl pcre readline sqlite ] - ++ lib.optional stdenv.isDarwin Security; - - patches = [ - ./NIM_CONFIG_DIR.patch - # Override compiler configuration via an environmental variable - - ./nixbuild.patch - # Load libraries at runtime by absolute path - - ./extra-mangling.patch - # Mangle store paths of modules to prevent runtime dependence. - - ./openssl.patch - # dlopen is widely used by Python, Ruby, Perl, ... what you're really telling me here is that your OS is fundamentally broken. That might be news for you, but it isn't for me. - ]; - - configurePhase = let - bootstrapCompiler = stdenv.mkDerivation { - pname = "nim-bootstrap"; - inherit (finalAttrs) version src preBuild; - enableParallelBuilding = true; - installPhase = '' - runHook preInstall - install -Dt $out/bin bin/nim - runHook postInstall - ''; - }; - in '' - runHook preConfigure - cp ${bootstrapCompiler}/bin/nim bin/ - echo 'define:nixbuild' >> config/nim.cfg - runHook postConfigure - ''; - - kochArgs = [ - "--cpu:${nimHost.cpu}" - "--os:${nimHost.os}" - "-d:release" - "-d:useGnuReadline" - ] ++ lib.optional (stdenv.isDarwin || stdenv.isLinux) "-d:nativeStacktrace"; - - preBuild = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' - substituteInPlace makefile \ - --replace "aarch64" "arm64" - ''; - - buildPhase = '' - runHook preBuild - local HOME=$TMPDIR - ./bin/nim c --parallelBuild:$NIX_BUILD_CORES koch - ./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES - ./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES - ./bin/nim js -d:release tools/dochack/dochack.nim - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -Dt $out/bin bin/* - ln -sf $out/nim/bin/nim $out/bin/nim - ln -sf $out/nim/lib $out/lib - ./install.sh $out - cp -a tools dist $out/nim/ - runHook postInstall - ''; - - meta = with lib; { - description = "Statically typed, imperative programming language"; - homepage = "https://nim-lang.org/"; - license = licenses.mit; - mainProgram = "nim"; - maintainers = with maintainers; [ ehmry ]; - }; - }); - - nim-unwrapped-1 = nim-unwrapped-2.overrideAttrs (finalAttrs: prevAttrs: { - version = "1.6.20"; - src = fetchurl { - url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-/+0EdQTR/K9hDw3Xzz4Ce+kaKSsMnFEWFQTC87mE/7k="; - }; - - patches = [ - ./NIM_CONFIG_DIR.patch - # Override compiler configuration via an environmental variable - - ./nixbuild.patch - # Load libraries at runtime by absolute path - - ./extra-mangling.patch - # Mangle store paths of modules to prevent runtime dependence. - ] ++ lib.optional (!stdenv.hostPlatform.isWindows) ./toLocation.patch; - }); - -} // (let - wrapNim = { nim', patches }: - let targetPlatformConfig = stdenv.targetPlatform.config; - in stdenv.mkDerivation (finalAttrs: { - name = "${targetPlatformConfig}-nim-wrapper-${nim'.version}"; - inherit (nim') version; - preferLocalBuild = true; - strictDeps = true; - - nativeBuildInputs = [ makeWrapper ]; - - # Needed for any nim package that uses the standard library's - # 'std/sysrand' module. - depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security; - - inherit patches; - - unpackPhase = '' - runHook preUnpack - tar xf ${nim'.src} nim-$version/config - cd nim-$version - runHook postUnpack - ''; - - dontConfigure = true; - - buildPhase = - # Configure the Nim compiler to use $CC and $CXX as backends - # The compiler is configured by two configuration files, each with - # a different DSL. The order of evaluation matters and that order - # is not documented, so duplicate the configuration across both files. - '' - runHook preBuild - cat >> config/config.nims << WTF - - switch("os", "${nimTarget.os}") - switch("cpu", "${nimTarget.cpu}") - switch("define", "nixbuild") - - # Configure the compiler using the $CC set by Nix at build time - import strutils - let cc = getEnv"CC" - if cc.contains("gcc"): - switch("cc", "gcc") - elif cc.contains("clang"): - switch("cc", "clang") - WTF - - mv config/nim.cfg config/nim.cfg.old - cat > config/nim.cfg << WTF - os = "${nimTarget.os}" - cpu = "${nimTarget.cpu}" - define:"nixbuild" - WTF - - cat >> config/nim.cfg < config/nim.cfg.old - rm config/nim.cfg.old - - cat >> config/nim.cfg << WTF - - clang.cpp.exe %= "\$CXX" - clang.cpp.linkerexe %= "\$CXX" - clang.exe %= "\$CC" - clang.linkerexe %= "\$CC" - gcc.cpp.exe %= "\$CXX" - gcc.cpp.linkerexe %= "\$CXX" - gcc.exe %= "\$CC" - gcc.linkerexe %= "\$CC" - WTF - - runHook postBuild - ''; - - wrapperArgs = lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ - "--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${ - placeholder "out" - }/bin" - # Used by nim-gdb - - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl pcre ]}" - # These libraries may be referred to by the standard library. - # This is broken for cross-compilation because the package - # set will be shifted back by nativeBuildInputs. - - "--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim" - # Use the custom configuration - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/etc - - cp -r config $out/etc/nim - - for binpath in ${nim'}/bin/nim?*; do - local binname=`basename $binpath` - makeWrapper \ - $binpath $out/bin/${targetPlatformConfig}-$binname \ - $wrapperArgs - ln -s $out/bin/${targetPlatformConfig}-$binname $out/bin/$binname - done - - makeWrapper \ - ${nim'}/nim/bin/nim $out/bin/${targetPlatformConfig}-nim \ - --set-default CC $(command -v $CC) \ - --set-default CXX $(command -v $CXX) \ - $wrapperArgs - ln -s $out/bin/${targetPlatformConfig}-nim $out/bin/nim - - makeWrapper \ - ${nim'}/bin/testament $out/bin/${targetPlatformConfig}-testament \ - $wrapperArgs - ln -s $out/bin/${targetPlatformConfig}-testament $out/bin/testament - - '' + '' - runHook postInstall - ''; - - passthru = { nim = nim'; }; - - meta = nim'.meta // { - description = nim'.meta.description - + " (${targetPlatformConfig} wrapper)"; - platforms = with lib.platforms; unix ++ genode ++ windows; - }; - }); -in { - - nim2 = wrapNim { - nim' = buildPackages.nim-unwrapped-2; - patches = [ ./nim2.cfg.patch ]; - }; - - nim1 = wrapNim { - nim' = buildPackages.nim-unwrapped-1; - patches = [ ./nim.cfg.patch ]; - }; - -}) diff --git a/pkgs/development/compilers/nim/extra-mangling.patch b/pkgs/development/compilers/nim/extra-mangling.patch deleted file mode 100644 index b68f7033994d..000000000000 --- a/pkgs/development/compilers/nim/extra-mangling.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/compiler/modulepaths.nim b/compiler/modulepaths.nim -index e80ea3fa6..8ecf27a85 100644 ---- a/compiler/modulepaths.nim -+++ b/compiler/modulepaths.nim -@@ -70,6 +70,13 @@ proc checkModuleName*(conf: ConfigRef; n: PNode; doLocalError=true): FileIndex = - else: - result = fileInfoIdx(conf, fullPath) - -+proc rot13(result: var string) = -+ for i, c in result: -+ case c -+ of 'a'..'m', 'A'..'M': result[i] = char(c.uint8 + 13) -+ of 'n'..'z', 'N'..'Z': result[i] = char(c.uint8 - 13) -+ else: discard -+ - proc mangleModuleName*(conf: ConfigRef; path: AbsoluteFile): string = - ## Mangle a relative module path to avoid path and symbol collisions. - ## -@@ -78,9 +85,11 @@ proc mangleModuleName*(conf: ConfigRef; path: AbsoluteFile): string = - ## - ## Example: - ## `foo-#head/../bar` becomes `@foo-@hhead@s..@sbar` -- "@m" & relativeTo(path, conf.projectPath).string.multiReplace( -+ result = "@m" & relativeTo(path, conf.projectPath).string.multiReplace( - {$os.DirSep: "@s", $os.AltSep: "@s", "#": "@h", "@": "@@", ":": "@c"}) -+ rot13(result) - - proc demangleModuleName*(path: string): string = - ## Demangle a relative module path. - result = path.multiReplace({"@@": "@", "@h": "#", "@s": "/", "@m": "", "@c": ":"}) -+ rot13(result) -diff --git a/compiler/msgs.nim b/compiler/msgs.nim -index 3f386cc61..054f7f647 100644 ---- a/compiler/msgs.nim -+++ b/compiler/msgs.nim -@@ -659,8 +659,10 @@ proc uniqueModuleName*(conf: ConfigRef; fid: FileIndex): string = - for i in 0..<trunc: - let c = rel[i] - case c -- of 'a'..'z': -- result.add c -+ of 'a'..'m': -+ result.add char(c.uint8 + 13) -+ of 'n'..'z': -+ result.add char(c.uint8 - 13) - of {os.DirSep, os.AltSep}: - result.add 'Z' # because it looks a bit like '/' - of '.': diff --git a/pkgs/development/compilers/nim/nim.cfg.patch b/pkgs/development/compilers/nim/nim.cfg.patch deleted file mode 100644 index 7195132e52f6..000000000000 --- a/pkgs/development/compilers/nim/nim.cfg.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/config/nim.cfg b/config/nim.cfg -index 3b964d124..850ed0ed9 100644 ---- a/config/nim.cfg -+++ b/config/nim.cfg -@@ -8,26 +8,12 @@ - # Environment variables can be accessed like so: - # gcc.path %= "$CC_PATH" - --cc = gcc -- - # additional options always passed to the compiler: - --parallel_build: "0" # 0 to auto-detect number of processors - - hint[LineTooLong]=off - #hint[XDeclaredButNotUsed]=off - --# Examples of how to setup a cross-compiler: -- --# Cross-compiling for Raspberry Pi. --# (This compiler is available in gcc-arm-linux-gnueabihf package on Ubuntu) --arm.linux.gcc.exe = "arm-linux-gnueabihf-gcc" --arm.linux.gcc.linkerexe = "arm-linux-gnueabihf-gcc" -- --# For OpenWRT, you will also need to adjust PATH to point to your toolchain. --mips.linux.gcc.exe = "mips-openwrt-linux-gcc" --mips.linux.gcc.linkerexe = "mips-openwrt-linux-gcc" -- -- - path="$lib/deprecated/core" - path="$lib/deprecated/pure" - path="$lib/pure/collections" diff --git a/pkgs/development/compilers/nim/nim2.cfg.patch b/pkgs/development/compilers/nim/nim2.cfg.patch deleted file mode 100644 index ef23d3a84623..000000000000 --- a/pkgs/development/compilers/nim/nim2.cfg.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/config/nim.cfg b/config/nim.cfg -index 1470de780..8a12f741a 100644 ---- a/config/nim.cfg -+++ b/config/nim.cfg -@@ -9,8 +9,6 @@ - # Environment variables can be accessed like so: - # gcc.path %= "$CC_PATH" - --cc = gcc -- - # additional options always passed to the compiler: - --parallel_build: "0" # 0 to auto-detect number of processors - -@@ -22,27 +20,6 @@ cc = gcc - - threads:on - --# Examples of how to setup a cross-compiler: --# Nim can target architectures and OSes different than the local host --# Syntax: <arch>.<os>.gcc.exe = "<compiler executable>" --# <arch>.<os>.gcc.linkerexe = "<linker executable>" -- --# ARM e.g. Raspberry Pi 2: gcc-arm-linux-gnueabihf package on Debian/Ubuntu --arm.linux.gcc.exe = "arm-linux-gnueabihf-gcc" --arm.linux.gcc.linkerexe = "arm-linux-gnueabihf-gcc" --# ARM64/aarch64 e.g. Raspberry Pi 3: gcc-aarch64-linux-gnu package on Debian/Ubuntu --arm64.linux.gcc.exe = "aarch64-linux-gnu-gcc" --arm64.linux.gcc.linkerexe = "aarch64-linux-gnu-gcc" --# RISC-V: gcc-riscv64-linux-gnu package on Debian/Ubuntu --riscv32.linux.gcc.exe = "riscv64-linux-gnu-gcc" --riscv32.linux.gcc.linkerexe = "riscv64-linux-gnu-gcc" --riscv64.linux.gcc.exe = "riscv64-linux-gnu-gcc" --riscv64.linux.gcc.linkerexe = "riscv64-linux-gnu-gcc" -- --# For OpenWRT, you will also need to adjust PATH to point to your toolchain. --mips.linux.gcc.exe = "mips-openwrt-linux-gcc" --mips.linux.gcc.linkerexe = "mips-openwrt-linux-gcc" -- - - path="$lib/deprecated/core" - path="$lib/deprecated/pure" diff --git a/pkgs/development/compilers/nim/nixbuild.patch b/pkgs/development/compilers/nim/nixbuild.patch deleted file mode 100644 index 59e54ca780c6..000000000000 --- a/pkgs/development/compilers/nim/nixbuild.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/lib/pure/dynlib.nim b/lib/pure/dynlib.nim -index f31ae94dd..debed9c07 100644 ---- a/lib/pure/dynlib.nim -+++ b/lib/pure/dynlib.nim -@@ -56,6 +56,9 @@ - - import strutils - -+when defined(nixbuild) and not defined(windows): -+ import os -+ - type - LibHandle* = pointer ## a handle to a dynamically loaded library - -@@ -95,6 +98,25 @@ proc libCandidates*(s: string, dest: var seq[string]) = - libCandidates(prefix & middle & suffix, dest) - else: - add(dest, s) -+ 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. -+ # -+ # During Nix/NixOS packaging the line "define:nixbuild" -+ # should be appended to the ../../config/nim.cfg file -+ # to enable this behavior by default. -+ # -+ var libDirs = split(getEnv("LD_LIBRARY_PATH"), ':') -+ for flag in split(replace(getEnv("NIX_LDFLAGS"), "\\ ", " ")): -+ if flag.startsWith("-L"): -+ libDirs.add(flag[2..flag.high]) -+ for lib in dest: -+ for dir in libDirs: -+ let abs = dir / lib -+ if existsFile(abs): -+ dest = @[abs] -+ return - - proc loadLibPattern*(pattern: string, globalSymbols = false): LibHandle = - ## loads a library with name matching `pattern`, similar to what `dlimport` diff --git a/pkgs/development/compilers/nim/openssl.patch b/pkgs/development/compilers/nim/openssl.patch deleted file mode 100644 index 8cbc2a4cf26e..000000000000 --- a/pkgs/development/compilers/nim/openssl.patch +++ /dev/null @@ -1,458 +0,0 @@ -commit 9d7d15533d52971601b738335c40a4f01353c369 -Author: Emery Hemingway <ehmry@posteo.net> -Date: 2023-09-30 11:11:05 +0100 - - Do not load openssl with dlopen - -diff --git a/lib/wrappers/openssl.nim b/lib/wrappers/openssl.nim -index e659746ee..dfb2d3cf2 100644 ---- a/lib/wrappers/openssl.nim -+++ b/lib/wrappers/openssl.nim -@@ -105,8 +105,11 @@ else: - - import dynlib - --{.pragma: lcrypto, cdecl, dynlib: DLLUtilName, importc.} --{.pragma: lssl, cdecl, dynlib: DLLSSLName, importc.} -+{.passL: "-lcrypto".} -+{.passL: "-lssl".} -+ -+{.pragma: lcrypto, cdecl, importc.} -+{.pragma: lssl, cdecl, importc.} - - type - SslStruct {.final, pure.} = object -@@ -274,7 +277,7 @@ const - BIO_C_DO_STATE_MACHINE = 101 - BIO_C_GET_SSL = 110 - --proc TLSv1_method*(): PSSL_METHOD{.cdecl, dynlib: DLLSSLName, importc.} -+proc TLSv1_method*(): PSSL_METHOD{.cdecl, importc.} - - # TLS_method(), TLS_server_method(), TLS_client_method() are introduced in 1.1.0 - # and support SSLv3, TLSv1, TLSv1.1 and TLSv1.2 -@@ -286,26 +289,26 @@ when useStaticLink: - # Static linking - - when defined(openssl10): -- proc SSL_library_init*(): cint {.cdecl, dynlib: DLLSSLName, importc, discardable.} -- proc SSL_load_error_strings*() {.cdecl, dynlib: DLLSSLName, importc.} -- proc SSLv23_method*(): PSSL_METHOD {.cdecl, dynlib: DLLSSLName, importc.} -- proc SSLeay(): culong {.cdecl, dynlib: DLLUtilName, importc.} -+ proc SSL_library_init*(): cint {.cdecl, importc, discardable.} -+ proc SSL_load_error_strings*() {.cdecl, importc.} -+ proc SSLv23_method*(): PSSL_METHOD {.cdecl, importc.} -+ proc SSLeay(): culong {.cdecl, importc.} - - proc getOpenSSLVersion*(): culong = - SSLeay() - -- proc ERR_load_BIO_strings*() {.cdecl, dynlib: DLLUtilName, importc.} -+ proc ERR_load_BIO_strings*() {.cdecl, gimportc.} - else: -- proc OPENSSL_init_ssl*(opts: uint64, settings: uint8): cint {.cdecl, dynlib: DLLSSLName, importc, discardable.} -+ proc OPENSSL_init_ssl*(opts: uint64, settings: uint8): cint {.cdecl, gimportc, discardable.} - proc SSL_library_init*(): cint {.discardable.} = - ## Initialize SSL using OPENSSL_init_ssl for OpenSSL >= 1.1.0 - return OPENSSL_init_ssl(0.uint64, 0.uint8) - -- proc TLS_method*(): PSSL_METHOD {.cdecl, dynlib: DLLSSLName, importc.} -+ proc TLS_method*(): PSSL_METHOD {.cdecl, gimportc.} - proc SSLv23_method*(): PSSL_METHOD = - TLS_method() - -- proc OpenSSL_version_num(): culong {.cdecl, dynlib: DLLUtilName, importc.} -+ proc OpenSSL_version_num(): culong {.cdecl, gimportc.} - - proc getOpenSSLVersion*(): culong = - ## Return OpenSSL version as unsigned long -@@ -321,19 +324,19 @@ when useStaticLink: - discard - - when defined(libressl) or defined(openssl10): -- proc SSL_state(ssl: SslPtr): cint {.cdecl, dynlib: DLLSSLName, importc.} -+ proc SSL_state(ssl: SslPtr): cint {.cdecl, gimportc.} - proc SSL_in_init*(ssl: SslPtr): cint {.inline.} = - SSL_state(ssl) and SSL_ST_INIT - else: -- proc SSL_in_init*(ssl: SslPtr): cint {.cdecl, dynlib: DLLSSLName, importc.} -- proc SSL_CTX_set_ciphersuites*(ctx: SslCtx, str: cstring): cint {.cdecl, dynlib: DLLSSLName, importc.} -+ proc SSL_in_init*(ssl: SslPtr): cint {.cdecl, gimportc.} -+ proc SSL_CTX_set_ciphersuites*(ctx: SslCtx, str: cstring): cint {.cdecl, importc.} - - template OpenSSL_add_all_algorithms*() = discard - -- proc SSLv23_client_method*(): PSSL_METHOD {.cdecl, dynlib: DLLSSLName, importc.} -- proc SSLv2_method*(): PSSL_METHOD {.cdecl, dynlib: DLLSSLName, importc.} -- proc SSLv3_method*(): PSSL_METHOD {.cdecl, dynlib: DLLSSLName, importc.} -- proc CRYPTO_set_mem_functions(a,b,c: pointer){.cdecl, dynlib: DLLUtilName, importc.} -+ proc SSLv23_client_method*(): PSSL_METHOD {.cdecl, importc.} -+ proc SSLv2_method*(): PSSL_METHOD {.cdecl, importc.} -+ proc SSLv3_method*(): PSSL_METHOD {.cdecl, importc.} -+ proc CRYPTO_set_mem_functions(a,b,c: pointer){.cdecl, gimportc.} - - else: - # Here we're trying to stay compatible between openssl versions. Some -@@ -472,54 +475,52 @@ else: - theProc = cast[typeof(theProc)](sslSymThrows("SSL_CTX_set_ciphersuites")) - result = theProc(ctx, str) - --proc SSL_new*(context: SslCtx): SslPtr{.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_free*(ssl: SslPtr){.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_get_SSL_CTX*(ssl: SslPtr): SslCtx {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_set_SSL_CTX*(ssl: SslPtr, ctx: SslCtx): SslCtx {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_CTX_set_session_id_context*(context: SslCtx, sid_ctx: string, sid_ctx_len: int){.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_get0_verified_chain*(ssl: SslPtr): PSTACK {.cdecl, dynlib: DLLSSLName, -+proc SSL_new*(context: SslCtx): SslPtr{.cdecl, importc.} -+proc SSL_free*(ssl: SslPtr){.cdecl, importc.} -+proc SSL_get_SSL_CTX*(ssl: SslPtr): SslCtx {.cdecl, importc.} -+proc SSL_set_SSL_CTX*(ssl: SslPtr, ctx: SslCtx): SslCtx {.cdecl, importc.} -+proc SSL_CTX_set_session_id_context*(context: SslCtx, sid_ctx: string, sid_ctx_len: int){.cdecl, importc.} -+proc SSL_get0_verified_chain*(ssl: SslPtr): PSTACK {.cdecl, - importc.} - proc SSL_CTX_new*(meth: PSSL_METHOD): SslCtx{.cdecl, -- dynlib: DLLSSLName, importc.} -+ importc.} - proc SSL_CTX_load_verify_locations*(ctx: SslCtx, CAfile: cstring, -- CApath: cstring): cint{.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_CTX_free*(arg0: SslCtx){.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_CTX_set_verify*(s: SslCtx, mode: int, cb: proc (a: int, b: pointer): int {.cdecl.}){.cdecl, dynlib: DLLSSLName, importc.} -+ CApath: cstring): cint{.cdecl, importc.} -+proc SSL_CTX_free*(arg0: SslCtx){.cdecl, importc.} -+proc SSL_CTX_set_verify*(s: SslCtx, mode: int, cb: proc (a: int, b: pointer): int {.cdecl.}){.cdecl, importc.} - proc SSL_get_verify_result*(ssl: SslPtr): int{.cdecl, -- dynlib: DLLSSLName, importc.} -+ importc.} - --proc SSL_CTX_set_cipher_list*(s: SslCtx, ciphers: cstring): cint{.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_CTX_use_certificate_file*(ctx: SslCtx, filename: cstring, typ: cint): cint{. -- stdcall, dynlib: DLLSSLName, importc.} --proc SSL_CTX_use_certificate_chain_file*(ctx: SslCtx, filename: cstring): cint{. -- stdcall, dynlib: DLLSSLName, importc.} -+proc SSL_CTX_set_cipher_list*(s: SslCtx, ciphers: cstring): cint{.cdecl, importc.} -+proc SSL_CTX_use_certificate_file*(ctx: SslCtx, filename: cstring, typ: cint): cint{.stdcall, importc.} -+proc SSL_CTX_use_certificate_chain_file*(ctx: SslCtx, filename: cstring): cint{.stdcall, importc.} - proc SSL_CTX_use_PrivateKey_file*(ctx: SslCtx, -- filename: cstring, typ: cint): cint{.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_CTX_check_private_key*(ctx: SslCtx): cint{.cdecl, dynlib: DLLSSLName, -+ filename: cstring, typ: cint): cint{.cdecl, importc.} -+proc SSL_CTX_check_private_key*(ctx: SslCtx): cint{.cdecl, - importc.} - --proc SSL_CTX_get_ex_new_index*(argl: clong, argp: pointer, new_func: pointer, dup_func: pointer, free_func: pointer): cint {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_CTX_set_ex_data*(ssl: SslCtx, idx: cint, arg: pointer): cint {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_CTX_get_ex_data*(ssl: SslCtx, idx: cint): pointer {.cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_CTX_get_ex_new_index*(argl: clong, argp: pointer, new_func: pointer, dup_func: pointer, free_func: pointer): cint {.cdecl, importc.} -+proc SSL_CTX_set_ex_data*(ssl: SslCtx, idx: cint, arg: pointer): cint {.cdecl, importc.} -+proc SSL_CTX_get_ex_data*(ssl: SslCtx, idx: cint): pointer {.cdecl, importc.} - --proc SSL_set_fd*(ssl: SslPtr, fd: SocketHandle): cint{.cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_set_fd*(ssl: SslPtr, fd: SocketHandle): cint{.cdecl, importc.} - --proc SSL_shutdown*(ssl: SslPtr): cint{.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_set_shutdown*(ssl: SslPtr, mode: cint) {.cdecl, dynlib: DLLSSLName, importc: "SSL_set_shutdown".} --proc SSL_get_shutdown*(ssl: SslPtr): cint {.cdecl, dynlib: DLLSSLName, importc: "SSL_get_shutdown".} --proc SSL_connect*(ssl: SslPtr): cint{.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_read*(ssl: SslPtr, buf: pointer, num: int): cint{.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_write*(ssl: SslPtr, buf: cstring, num: int): cint{.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_get_error*(s: SslPtr, ret_code: cint): cint{.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_accept*(ssl: SslPtr): cint{.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_pending*(ssl: SslPtr): cint{.cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_shutdown*(ssl: SslPtr): cint{.cdecl, importc.} -+proc SSL_set_shutdown*(ssl: SslPtr, mode: cint) {.cdecl, importc: "SSL_set_shutdown".} -+proc SSL_get_shutdown*(ssl: SslPtr): cint {.cdecl, importc: "SSL_get_shutdown".} -+proc SSL_connect*(ssl: SslPtr): cint{.cdecl, importc.} -+proc SSL_read*(ssl: SslPtr, buf: pointer, num: int): cint{.cdecl, importc.} -+proc SSL_write*(ssl: SslPtr, buf: cstring, num: int): cint{.cdecl, importc.} -+proc SSL_get_error*(s: SslPtr, ret_code: cint): cint{.cdecl, importc.} -+proc SSL_accept*(ssl: SslPtr): cint{.cdecl, importc.} -+proc SSL_pending*(ssl: SslPtr): cint{.cdecl, importc.} - - proc BIO_new_mem_buf*(data: pointer, len: cint): BIO{.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc BIO_new_ssl_connect*(ctx: SslCtx): BIO{.cdecl, -- dynlib: DLLSSLName, importc.} -+ importc.} - proc BIO_ctrl*(bio: BIO, cmd: cint, larg: int, arg: cstring): int{.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc BIO_get_ssl*(bio: BIO, ssl: ptr SslPtr): int = - return BIO_ctrl(bio, BIO_C_GET_SSL, 0, cast[cstring](ssl)) - proc BIO_set_conn_hostname*(bio: BIO, name: cstring): int = -@@ -529,30 +530,30 @@ proc BIO_do_handshake*(bio: BIO): int = - proc BIO_do_connect*(bio: BIO): int = - return BIO_do_handshake(bio) - --proc BIO_read*(b: BIO, data: cstring, length: cint): cint{.cdecl, dynlib: DLLUtilName, importc.} --proc BIO_write*(b: BIO, data: cstring, length: cint): cint{.cdecl, dynlib: DLLUtilName, importc.} -+proc BIO_read*(b: BIO, data: cstring, length: cint): cint{.cdecl, importc.} -+proc BIO_write*(b: BIO, data: cstring, length: cint): cint{.cdecl, importc.} - --proc BIO_free*(b: BIO): cint{.cdecl, dynlib: DLLUtilName, importc.} -+proc BIO_free*(b: BIO): cint{.cdecl, importc.} - --proc ERR_print_errors_fp*(fp: File){.cdecl, dynlib: DLLUtilName, importc.} -+proc ERR_print_errors_fp*(fp: File){.cdecl, importc.} - - proc ERR_error_string*(e: culong, buf: cstring): cstring{.cdecl, -- dynlib: DLLUtilName, importc.} --proc ERR_get_error*(): culong{.cdecl, dynlib: DLLUtilName, importc.} --proc ERR_peek_last_error*(): culong{.cdecl, dynlib: DLLUtilName, importc.} -+ importc.} -+proc ERR_get_error*(): culong{.cdecl, importc.} -+proc ERR_peek_last_error*(): culong{.cdecl, importc.} - --proc OPENSSL_config*(configName: cstring){.cdecl, dynlib: DLLUtilName, importc.} -+proc OPENSSL_config*(configName: cstring){.cdecl, importc.} - --proc OPENSSL_sk_num*(stack: PSTACK): int {.cdecl, dynlib: DLLSSLName, importc.} -+proc OPENSSL_sk_num*(stack: PSTACK): int {.cdecl, importc.} - - proc OPENSSL_sk_value*(stack: PSTACK, index: int): pointer {.cdecl, -- dynlib: DLLSSLName, importc.} -+ importc.} - - proc d2i_X509*(px: ptr PX509, i: ptr ptr uint8, len: cint): PX509 {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - - proc i2d_X509*(cert: PX509; o: ptr ptr uint8): cint {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - - proc d2i_X509*(b: string): PX509 = - ## decode DER/BER bytestring into X.509 certificate struct -@@ -591,24 +592,21 @@ else: - proc CRYPTO_malloc_init*() = - discard - --proc SSL_CTX_ctrl*(ctx: SslCtx, cmd: cint, larg: clong, parg: pointer): clong{. -- cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_CTX_ctrl*(ctx: SslCtx, cmd: cint, larg: clong, parg: pointer): clong{.cdecl, importc.} - --proc SSL_CTX_callback_ctrl(ctx: SslCtx, typ: cint, fp: PFunction): int{. -- cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_CTX_callback_ctrl(ctx: SslCtx, typ: cint, fp: PFunction): int{.cdecl, importc.} - - proc SSLCTXSetMode*(ctx: SslCtx, mode: int): int = - result = SSL_CTX_ctrl(ctx, SSL_CTRL_MODE, clong mode, nil) - --proc SSL_ctrl*(ssl: SslPtr, cmd: cint, larg: int, parg: pointer): int{. -- cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_ctrl*(ssl: SslPtr, cmd: cint, larg: int, parg: pointer): int{.cdecl, importc.} - - proc SSL_set_tlsext_host_name*(ssl: SslPtr, name: cstring): int = - ## Set the SNI server name extension to be used in a client hello. - ## Returns 1 if SNI was set, 0 if current SSL configuration doesn't support SNI. - result = SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name, name) - --proc SSL_get_servername*(ssl: SslPtr, typ: cint = TLSEXT_NAMETYPE_host_name): cstring {.cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_get_servername*(ssl: SslPtr, typ: cint = TLSEXT_NAMETYPE_host_name): cstring {.cdecl, importc.} - ## Retrieve the server name requested in the client hello. This can be used - ## in the callback set in `SSL_CTX_set_tlsext_servername_callback` to - ## implement virtual hosting. May return `nil`. -@@ -635,16 +633,16 @@ type - PskServerCallback* = proc (ssl: SslPtr; - identity: cstring; psk: ptr uint8; max_psk_len: cint): cuint {.cdecl.} - --proc SSL_CTX_set_psk_client_callback*(ctx: SslCtx; callback: PskClientCallback) {.cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_CTX_set_psk_client_callback*(ctx: SslCtx; callback: PskClientCallback) {.cdecl, importc.} - ## Set callback called when OpenSSL needs PSK (for client). - --proc SSL_CTX_set_psk_server_callback*(ctx: SslCtx; callback: PskServerCallback) {.cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_CTX_set_psk_server_callback*(ctx: SslCtx; callback: PskServerCallback) {.cdecl, importc.} - ## Set callback called when OpenSSL needs PSK (for server). - --proc SSL_CTX_use_psk_identity_hint*(ctx: SslCtx; hint: cstring): cint {.cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_CTX_use_psk_identity_hint*(ctx: SslCtx; hint: cstring): cint {.cdecl, importc.} - ## Set PSK identity hint to use. - --proc SSL_get_psk_identity*(ssl: SslPtr): cstring {.cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_get_psk_identity*(ssl: SslPtr): cstring {.cdecl, importc.} - ## Get PSK identity. - - proc SSL_CTX_set_ecdh_auto*(ctx: SslCtx, onoff: cint): cint {.inline.} = -@@ -656,62 +654,62 @@ proc SSL_CTX_set_ecdh_auto*(ctx: SslCtx, onoff: cint): cint {.inline.} = - else: - result = 1 - --proc bioNew*(b: PBIO_METHOD): BIO{.cdecl, dynlib: DLLUtilName, importc: "BIO_new".} --proc bioFreeAll*(b: BIO){.cdecl, dynlib: DLLUtilName, importc: "BIO_free_all".} --proc bioSMem*(): PBIO_METHOD{.cdecl, dynlib: DLLUtilName, importc: "BIO_s_mem".} --proc bioCtrlPending*(b: BIO): cint{.cdecl, dynlib: DLLUtilName, importc: "BIO_ctrl_pending".} -+proc bioNew*(b: PBIO_METHOD): BIO{.cdecl, importc: "BIO_new".} -+proc bioFreeAll*(b: BIO){.cdecl, importc: "BIO_free_all".} -+proc bioSMem*(): PBIO_METHOD{.cdecl, importc: "BIO_s_mem".} -+proc bioCtrlPending*(b: BIO): cint{.cdecl, importc: "BIO_ctrl_pending".} - proc bioRead*(b: BIO, Buf: cstring, length: cint): cint{.cdecl, -- dynlib: DLLUtilName, importc: "BIO_read".} -+ importc: "BIO_read".} - proc bioWrite*(b: BIO, Buf: cstring, length: cint): cint{.cdecl, -- dynlib: DLLUtilName, importc: "BIO_write".} -+ importc: "BIO_write".} - - proc sslSetConnectState*(s: SslPtr) {.cdecl, -- dynlib: DLLSSLName, importc: "SSL_set_connect_state".} -+ importc: "SSL_set_connect_state".} - proc sslSetAcceptState*(s: SslPtr) {.cdecl, -- dynlib: DLLSSLName, importc: "SSL_set_accept_state".} -+ importc: "SSL_set_accept_state".} - - proc sslRead*(ssl: SslPtr, buf: cstring, num: cint): cint{.cdecl, -- dynlib: DLLSSLName, importc: "SSL_read".} -+ importc: "SSL_read".} - proc sslPeek*(ssl: SslPtr, buf: cstring, num: cint): cint{.cdecl, -- dynlib: DLLSSLName, importc: "SSL_peek".} -+ importc: "SSL_peek".} - proc sslWrite*(ssl: SslPtr, buf: cstring, num: cint): cint{.cdecl, -- dynlib: DLLSSLName, importc: "SSL_write".} -+ importc: "SSL_write".} - - proc sslSetBio*(ssl: SslPtr, rbio, wbio: BIO) {.cdecl, -- dynlib: DLLSSLName, importc: "SSL_set_bio".} -+ importc: "SSL_set_bio".} - - proc sslDoHandshake*(ssl: SslPtr): cint {.cdecl, -- dynlib: DLLSSLName, importc: "SSL_do_handshake".} -+ importc: "SSL_do_handshake".} - - --proc ErrClearError*(){.cdecl, dynlib: DLLUtilName, importc: "ERR_clear_error".} --proc ErrFreeStrings*(){.cdecl, dynlib: DLLUtilName, importc: "ERR_free_strings".} --proc ErrRemoveState*(pid: cint){.cdecl, dynlib: DLLUtilName, importc: "ERR_remove_state".} -+proc ErrClearError*(){.cdecl, importc: "ERR_clear_error".} -+proc ErrFreeStrings*(){.cdecl, importc: "ERR_free_strings".} -+proc ErrRemoveState*(pid: cint){.cdecl, importc: "ERR_remove_state".} - - proc PEM_read_bio_RSA_PUBKEY*(bp: BIO, x: ptr PRSA, pw: pem_password_cb, u: pointer): PRSA {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc PEM_read_RSA_PUBKEY*(fp: pointer; x: ptr PRSA; cb: pem_password_cb, u: pointer): PRSA {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc RSA_verify*(kind: cint, origMsg: pointer, origMsgLen: cuint, signature: pointer, -- signatureLen: cuint, rsa: PRSA): cint {.cdecl, dynlib: DLLUtilName, importc.} -+ signatureLen: cuint, rsa: PRSA): cint {.cdecl, importc.} - proc PEM_read_RSAPrivateKey*(fp: pointer; x: ptr PRSA; cb: pem_password_cb, u: pointer): PRSA {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc PEM_read_RSAPublicKey*(fp: pointer; x: ptr PRSA; cb: pem_password_cb, u: pointer): PRSA {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc PEM_read_bio_RSAPublicKey*(bp: BIO, x: ptr PRSA, cb: pem_password_cb, u: pointer): PRSA {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc PEM_read_bio_RSAPrivateKey*(bp: BIO, x: ptr PRSA, cb: pem_password_cb, u: pointer): PRSA {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc RSA_private_encrypt*(flen: cint, fr: ptr uint8, to: ptr uint8, rsa: PRSA, padding: PaddingType): cint {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc RSA_public_encrypt*(flen: cint, fr: ptr uint8, to: ptr uint8, rsa: PRSA, padding: PaddingType): cint {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc RSA_private_decrypt*(flen: cint, fr: ptr uint8, to: ptr uint8, rsa: PRSA, padding: PaddingType): cint {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc RSA_public_decrypt*(flen: cint, fr: ptr uint8, to: ptr uint8, rsa: PRSA, padding: PaddingType): cint {.cdecl, -- dynlib: DLLUtilName, importc.} --proc RSA_free*(rsa: PRSA) {.cdecl, dynlib: DLLUtilName, importc.} --proc RSA_size*(rsa: PRSA): cint {.cdecl, dynlib: DLLUtilName, importc.} -+ importc.} -+proc RSA_free*(rsa: PRSA) {.cdecl, importc.} -+proc RSA_size*(rsa: PRSA): cint {.cdecl, importc.} - - # sha types - proc EVP_md_null*(): EVP_MD {.lcrypto.} -@@ -753,9 +751,9 @@ when defined(macosx) or defined(windows): - proc EVP_MD_CTX_cleanup*(ctx: EVP_MD_CTX): cint {.lcrypto.} - else: - # some times you will need this instead: -- proc EVP_MD_CTX_create*(): EVP_MD_CTX {.cdecl, importc: "EVP_MD_CTX_new", dynlib: DLLUtilName.} -- proc EVP_MD_CTX_destroy*(ctx: EVP_MD_CTX) {.cdecl, importc: "EVP_MD_CTX_free", dynlib: DLLUtilName.} -- proc EVP_MD_CTX_cleanup*(ctx: EVP_MD_CTX): cint {.cdecl, importc: "EVP_MD_CTX_cleanup", dynlib: DLLUtilName.} -+ proc EVP_MD_CTX_create*(): EVP_MD_CTX {.cdecl, importc: "EVP_MD_CTX_new".} -+ proc EVP_MD_CTX_destroy*(ctx: EVP_MD_CTX) {.cdecl, importc: "EVP_MD_CTX_free".} -+ proc EVP_MD_CTX_cleanup*(ctx: EVP_MD_CTX): cint {.cdecl, importc: "EVP_MD_CTX_cleanup".} - - # <openssl/md5.h> - type -@@ -770,7 +768,7 @@ type - data: array[MD5_LBLOCK, MD5_LONG] - num: cuint - --{.push callconv:cdecl, dynlib:DLLUtilName.} -+{.push callconv:cdecl.} - proc md5_Init*(c: var MD5_CTX): cint{.importc: "MD5_Init".} - proc md5_Update*(c: var MD5_CTX; data: pointer; len: csize_t): cint{.importc: "MD5_Update".} - proc md5_Final*(md: cstring; c: var MD5_CTX): cint{.importc: "MD5_Final".} -@@ -835,11 +833,11 @@ when not defined(nimDisableCertificateValidation) and not defined(windows): - # SSL_get_peer_certificate removed in 3.0 - # SSL_get1_peer_certificate added in 3.0 - when useOpenssl3: -- proc SSL_get1_peer_certificate*(ssl: SslCtx): PX509 {.cdecl, dynlib: DLLSSLName, importc.} -+ proc SSL_get1_peer_certificate*(ssl: SslCtx): PX509 {.cdecl, importc.} - proc SSL_get_peer_certificate*(ssl: SslCtx): PX509 = - SSL_get1_peer_certificate(ssl) - elif useStaticLink: -- proc SSL_get_peer_certificate*(ssl: SslCtx): PX509 {.cdecl, dynlib: DLLSSLName, importc.} -+ proc SSL_get_peer_certificate*(ssl: SslCtx): PX509 {.cdecl, importc.} - else: - proc SSL_get_peer_certificate*(ssl: SslCtx): PX509 = - let methodSym = sslSymNullable("SSL_get_peer_certificate", "SSL_get1_peer_certificate") -@@ -848,26 +846,24 @@ when not defined(nimDisableCertificateValidation) and not defined(windows): - let method2Proc = cast[proc(ssl: SslCtx): PX509 {.cdecl, gcsafe, raises: [].}](methodSym) - return method2Proc(ssl) - -- proc X509_get_subject_name*(a: PX509): PX509_NAME{.cdecl, dynlib: DLLSSLName, importc.} -+ proc X509_get_subject_name*(a: PX509): PX509_NAME{.cdecl, importc.} - -- proc X509_get_issuer_name*(a: PX509): PX509_NAME{.cdecl, dynlib: DLLUtilName, importc.} -+ proc X509_get_issuer_name*(a: PX509): PX509_NAME{.cdecl, importc.} - -- proc X509_NAME_oneline*(a: PX509_NAME, buf: cstring, size: cint): cstring {. -- cdecl, dynlib:DLLSSLName, importc.} -+ proc X509_NAME_oneline*(a: PX509_NAME, buf: cstring, size: cint): cstring {.cdecl, importc.} - -- proc X509_NAME_get_text_by_NID*(subject:cstring, NID: cint, buf: cstring, size: cint): cint{. -- cdecl, dynlib:DLLSSLName, importc.} -+ proc X509_NAME_get_text_by_NID*(subject:cstring, NID: cint, buf: cstring, size: cint): cint{.cdecl, importc.} - -- proc X509_check_host*(cert: PX509, name: cstring, namelen: cint, flags:cuint, peername: cstring): cint {.cdecl, dynlib: DLLSSLName, importc.} -+ proc X509_check_host*(cert: PX509, name: cstring, namelen: cint, flags:cuint, peername: cstring): cint {.cdecl, importc.} - -- proc X509_free*(cert: PX509) {.cdecl, dynlib: DLLSSLName, importc.} -+ proc X509_free*(cert: PX509) {.cdecl, importc.} - - # Certificates store - - type PX509_STORE* = SslPtr - type PX509_OBJECT* = SslPtr - -- {.push callconv:cdecl, dynlib:DLLUtilName, importc.} -+ {.push callconv:cdecl, importc.} - - proc X509_OBJECT_new*(): PX509_OBJECT - proc X509_OBJECT_free*(a: PX509_OBJECT) -@@ -897,12 +893,12 @@ when not defined(nimDisableCertificateValidation) and not defined(windows): - # Available in at least OpenSSL 1.1.1 and later, not sure if earlier - # --Iced Quinn - --proc SSL_CTX_set_alpn_protos*(ctx: SslCtx; protos: cstring; protos_len: cuint): cint {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_set_alpn_protos*(ssl: SslPtr; protos: cstring; protos_len: cuint): cint {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_CTX_set_alpn_select_cb*(ctx: SslCtx; cb: proc(ssl: SslPtr; out_proto: ptr cstring; outlen: cstring; in_proto: cstring; inlen: cuint; arg: pointer): cint {.cdecl.}; arg: pointer): cint {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_get0_alpn_selected*(ssl: SslPtr; data: ptr cstring; len: ptr cuint) {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_CTX_set_next_protos_advertised_cb*(ctx: SslCtx; cb: proc(ssl: SslPtr; out_proto: ptr cstring; outlen: ptr cuint; arg: pointer): cint {.cdecl.}; arg: pointer) {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_CTX_set_next_proto_select_cb*(ctx: SslCtx; cb: proc(s: SslPtr; out_proto: cstring; outlen: cstring; in_proto: cstring; inlen: cuint; arg: pointer): cint {.cdecl.}; arg: pointer) {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_select_next_proto*(out_proto: ptr cstring; outlen: cstring; server: cstring; server_len: cuint; client: cstring; client_len: cuint): cint {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_get0_next_proto_negotiated*(s: SslPtr; data: ptr cstring; len: ptr cuint) {.cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_CTX_set_alpn_protos*(ctx: SslCtx; protos: cstring; protos_len: cuint): cint {.cdecl, importc.} -+proc SSL_set_alpn_protos*(ssl: SslPtr; protos: cstring; protos_len: cuint): cint {.cdecl, importc.} -+proc SSL_CTX_set_alpn_select_cb*(ctx: SslCtx; cb: proc(ssl: SslPtr; out_proto: ptr cstring; outlen: cstring; in_proto: cstring; inlen: cuint; arg: pointer): cint {.cdecl.}; arg: pointer): cint {.cdecl, importc.} -+proc SSL_get0_alpn_selected*(ssl: SslPtr; data: ptr cstring; len: ptr cuint) {.cdecl, importc.} -+proc SSL_CTX_set_next_protos_advertised_cb*(ctx: SslCtx; cb: proc(ssl: SslPtr; out_proto: ptr cstring; outlen: ptr cuint; arg: pointer): cint {.cdecl.}; arg: pointer) {.cdecl, importc.} -+proc SSL_CTX_set_next_proto_select_cb*(ctx: SslCtx; cb: proc(s: SslPtr; out_proto: cstring; outlen: cstring; in_proto: cstring; inlen: cuint; arg: pointer): cint {.cdecl.}; arg: pointer) {.cdecl, importc.} -+proc SSL_select_next_proto*(out_proto: ptr cstring; outlen: cstring; server: cstring; server_len: cuint; client: cstring; client_len: cuint): cint {.cdecl, importc.} -+proc SSL_get0_next_proto_negotiated*(s: SslPtr; data: ptr cstring; len: ptr cuint) {.cdecl, importc.} - diff --git a/pkgs/development/compilers/nim/toLocation.patch b/pkgs/development/compilers/nim/toLocation.patch deleted file mode 100644 index a3db46044049..000000000000 --- a/pkgs/development/compilers/nim/toLocation.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/lib/std/private/miscdollars.nim b/lib/std/private/miscdollars.nim -index 840fedf54..6c3436308 100644 ---- a/lib/std/private/miscdollars.nim -+++ b/lib/std/private/miscdollars.nim -@@ -6,9 +6,8 @@ template toLocation*(result: var string, file: string | cstring, line: int, col: - # it can be done in a single place. - result.add file - if line > 0: -- result.add "(" -+ result.add ":" - addInt(result, line) - if col > 0: -- result.add ", " -+ result.add ":" - addInt(result, col) -- result.add ")" diff --git a/pkgs/development/compilers/nqc/default.nix b/pkgs/development/compilers/nqc/default.nix deleted file mode 100644 index a7d6cb5f2cdd..000000000000 --- a/pkgs/development/compilers/nqc/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "nqc"; - version = "3.1.r6"; - - src = fetchurl { - url = "https://bricxcc.sourceforge.net/nqc/release/nqc-${version}.tgz"; - sha256 = "sha256-v9XmVPY5r3pYjP3vTSK9Xvz/9UexClbOvr3ljvK/52Y="; - }; - - sourceRoot = "."; - - patches = [ - ./nqc-unistd.patch - (fetchpatch { - url = "https://sourceforge.net/p/bricxcc/patches/_discuss/thread/00b427dc/b84b/attachment/nqc-01-Linux_usb_and_tcp.diff"; - sha256 = "sha256-UZmmhhhfLAUus36TOBhiDQ8KUeEdYhGHVFwqKqDIqII="; - }) - ]; - - makeFlags = [ "PREFIX=$(out)" ]; - - dontConfigure = true; - - meta = with lib; { - homepage = "https://bricxcc.sourceforge.net/nqc/"; - description = "Programming language for several LEGO MINDSTORMS products including the RCX, CyberMaster, and Scout"; - platforms = platforms.linux; - license = licenses.mpl10; - maintainers = with maintainers; [ christophcharles ]; - }; -} diff --git a/pkgs/development/compilers/nqc/nqc-unistd.patch b/pkgs/development/compilers/nqc/nqc-unistd.patch deleted file mode 100644 index 7abf37f93ca7..000000000000 --- a/pkgs/development/compilers/nqc/nqc-unistd.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ruN nqc-3.1.r6-old/compiler/lexer.cpp nqc-3.1.r6-new/compiler/lexer.cpp ---- nqc-3.1.r6-old/compiler/lexer.cpp 2007-06-06 20:19:10.000000000 +0200 -+++ nqc-3.1.r6-new/compiler/lexer.cpp 2022-10-13 07:57:08.247213954 +0200 -@@ -11,6 +11,7 @@ - #define YY_FLEX_MINOR_VERSION 5 - - #include <stdio.h> -+#include <unistd.h> - - #if defined(__MWERKS__) && !__MACH__ && !YY_NEVER_INTERACTIVE - #include <unix.h> diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix deleted file mode 100644 index d6d4fdd44810..000000000000 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - version = "3.1"; - - date = "April2012"; - - pname = "nvidia-cg-toolkit"; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86_64.tgz"; - sha256 = "e8ff01e6cc38d1b3fd56a083f5860737dbd2f319a39037528fb1a74a89ae9878"; - } - else if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86.tgz"; - sha256 = "cef3591e436f528852db0e8c145d3842f920e0c89bcfb219c466797cb7b18879"; - } - else throw "nvidia-cg-toolkit does not support platform ${stdenv.hostPlatform.system}"; - - installPhase = '' - for b in cgc cgfxcat cginfo - do - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux*.so.? "bin/$b" - done - # FIXME: cgfxcat and cginfo need more patchelf - mkdir -p "$out/bin/" - cp -v bin/* "$out/bin/" - mkdir -p "$out/include/" - cp -v -r include/Cg/ "$out/include/" - mkdir -p "$out/lib/" - [ "$system" == "x86_64-linux" ] && cp -v lib64/* "$out/lib/" - [ "$system" == "i686-linux" ] && cp -v lib/* "$out/lib/" - mkdir -p "$out/share/doc/$name/" - cp -v -r local/Cg/* "$out/share/doc/$name/" - ''; - - meta = { - homepage = "https://developer.nvidia.com/cg-toolkit"; - license = lib.licenses.unfreeRedistributable; - }; -} diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index e4a4ed0f9580..c9b94abd2964 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, fetchpatch, ncurses, libX11 }: let - useX11 = !stdenv.isAarch32 && !stdenv.isMips; - useNativeCompilers = !stdenv.isMips; + useX11 = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isMips; + useNativeCompilers = !stdenv.hostPlatform.isMips; inherit (lib) optional optionals optionalString; in diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix index 5279fc7481b6..b3bf5038702f 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { branch = baseOcamlBranch; platforms = with platforms; linux ++ darwin; - broken = stdenv.isAarch64 || stdenv.isMips; + broken = stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isMips; longDescription = '' A simple extension of OCaml with the primitive type of code values, and diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index af07074eba1b..38795426bea2 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -3,7 +3,7 @@ let versionNoPatch = "${toString major_version}.${toString minor_version}"; version = "${versionNoPatch}.${toString patch_version}"; - safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips || stdenv.hostPlatform.isStatic); + safeX11 = stdenv: !(stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isMips || stdenv.hostPlatform.isStatic); in { lib, stdenv, fetchurl, ncurses, buildEnv, libunwind, fetchpatch @@ -30,7 +30,7 @@ let in let - useNativeCompilers = !stdenv.isMips; + useNativeCompilers = !stdenv.hostPlatform.isMips; inherit (lib) optional optionals optionalString strings concatStrings; pname = concatStrings [ "ocaml" (optionalString aflSupport "+afl") @@ -84,7 +84,7 @@ stdenv.mkDerivation (args // { # `aarch64-apple-darwin-clang` while using assembler. However, such binary # does not exist. So, disable these configure flags on `aarch64-darwin`. # See #144785 for details. - configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08" && !(stdenv.isDarwin && stdenv.isAarch64)) [ "host" "target" ]; + configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08" && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) [ "host" "target" ]; # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie" ++ lib.optional (lib.versionAtLeast version "5.0" && stdenv.cc.isClang) "strictoverflow" @@ -105,7 +105,9 @@ stdenv.mkDerivation (args // { # sequential order among them as a single rule. makefile = ./Makefile.nixpkgs; buildFlags = if useNativeCompilers - then ["nixpkgs_world_bootstrap_world_opt"] + then [(if lib.versionOlder version "5.2" + then "nixpkgs_world_bootstrap_world_opt" + else "defaultentry")] else ["nixpkgs_world"]; buildInputs = optional (lib.versionOlder version "4.07") ncurses ++ optionals useX11 [ libX11 xorgproto ]; @@ -114,7 +116,7 @@ stdenv.mkDerivation (args // { preConfigure = optionalString (lib.versionOlder version "4.04") '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang - '' + optionalString (stdenv.isDarwin) '' + '' + optionalString (stdenv.hostPlatform.isDarwin) '' # Do what upstream does by default now: https://github.com/ocaml/ocaml/pull/10176 # This is required for aarch64-darwin, everything else works as is. AS="${stdenv.cc}/bin/cc -c" ASPP="${stdenv.cc}/bin/cc -c" @@ -157,7 +159,7 @@ stdenv.mkDerivation (args // { ''; platforms = with platforms; linux ++ darwin; - broken = stdenv.isAarch64 && lib.versionOlder version (if stdenv.isDarwin then "4.10" else "4.02"); + broken = stdenv.hostPlatform.isAarch64 && lib.versionOlder version (if stdenv.hostPlatform.isDarwin then "4.10" else "4.02"); }; }) diff --git a/pkgs/development/compilers/open-watcom/bin.nix b/pkgs/development/compilers/open-watcom/bin.nix index 1f8079908999..5e7805a31b30 100644 --- a/pkgs/development/compilers/open-watcom/bin.nix +++ b/pkgs/development/compilers/open-watcom/bin.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }: +{ lib, stdenvNoCC, fetchurl, qemu, writeScript, writeScriptBin, ncurses, bash, coreutils, unixtools }: let @@ -48,41 +48,6 @@ let exec ${wrapLegacyBinary} "$TARGET-unwrapped" "$TARGET" ''; - # Do a scripted installation of OpenWatcom with its original installer. - # - # If maintaining this expect script turns out to be too much of a - # hassle, we can switch to just using `unzip' on the installer and - # the correct file permissions manually. - performInstall = writeScriptBin "performInstall" '' - #!${expect}/bin/expect -f - - spawn [lindex $argv 0] - - # Wait for button saying "I agree" with escape sequences. - expect "gree" - - # Navigate to "I Agree!" and hit enter. - send "\t\t\n" - - expect "Install Open Watcom" - - # Where do we want to install to. - send "$env(out)\n" - - expect "will be installed" - - # Select Full Installation, Next - send "fn" - - expect "Setup will now copy" - - # Next - send "n" - - expect "completed successfully" - send "\n" - ''; - in stdenvNoCC.mkDerivation rec { pname = "${passthru.prettyName}-unwrapped"; @@ -93,7 +58,7 @@ stdenvNoCC.mkDerivation rec { sha256 = "1wzkvc6ija0cjj5mcyjng5b7hnnc5axidz030c0jh05pgvi4nj7p"; }; - nativeBuildInputs = [ wrapInPlace performInstall ]; + nativeBuildInputs = [ wrapInPlace unixtools.script ]; dontUnpack = true; dontConfigure = true; @@ -104,7 +69,9 @@ stdenvNoCC.mkDerivation rec { ''; installPhase = '' - performInstall ./install-bin-unwrapped + # Command line options to do an unattended install are documented in + # https://github.com/open-watcom/open-watcom-v2/blob/master/bld/setupgui/setup.txt + script -c "./install-bin-unwrapped -dDstDir=$out -dFullInstall=1 -i" for e in $(find $out/binl -type f -executable); do echo "Wrapping $e" diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index ddd62872d451..8ad74c00ec87 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "${passthru.prettyName}-unwrapped"; # nixpkgs-update: no auto update - version = "0-unstable-2024-05-14"; + version = "0-unstable-2024-10-13"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "d3733a7fca1d02ad91b58b377ecb38e1293889db"; - hash = "sha256-gDrmm7hd07lv0KhkP7Bys5qCuCCH+t/XvlftCYlCyI8="; + rev = "f0a6465832643ba08b7f94fb814c552804fb395b"; + hash = "sha256-rT3z0KrkCZ78SbsK2CEHfvJa1TEnRH2kwhzZhi8fZDo="; }; postPatch = '' diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix deleted file mode 100644 index 089e8411210c..000000000000 --- a/pkgs/development/compilers/openjdk/11.nix +++ /dev/null @@ -1,181 +0,0 @@ -{ stdenv, lib, 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, openjdk11-bootstrap -, setJavaClassPath -, headless ? false -, enableJavaFX ? false, openjfx -, enableGtk ? true, gtk3, glib -}: - -let - major = "11"; - minor = "0"; - update = "23"; - build = "9"; - - # 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}.${minor}.${update}+${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jdk${major}u"; - rev = "jdk-${version}"; - sha256 = "sha256-6y6wge8ZuSKBpb5QNihvAlD4Pv/0d3AQCPOkxUm/sJk="; - }; - - 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 && enableGtk) [ - gtk3 glib - ]; - - patches = [ - ./fix-java-home-jdk10.patch - ./read-truststore-from-env-jdk10.patch - ./currency-date-range-jdk10.patch - ./increase-javadoc-heap.patch - ./fix-library-path-jdk11.patch - - # 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 && enableGtk) [ - ./swing-use-gtk-jdk10.patch - ]; - - preConfigure = '' - chmod +x configure - substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" - ''; - - configureFlags = [ - "--with-boot-jdk=${openjdk-bootstrap.home}" - "--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" - "--disable-warnings-as-errors" - ] - # 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; - - # Workaround for - # `cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]` - # when building jtreg - env.NIX_CFLAGS_COMPILE = "-Wformat"; - - NIX_LDFLAGS = toString (lib.optionals (!headless) [ - "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGtk) [ - "-lgtk-3" "-lgio-2.0" - ]); - - # -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" ]; - - 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; - - passthru = { - architecture = ""; - home = "${openjdk}/lib/openjdk"; - inherit gtk3; - }; - }; -in openjdk diff --git a/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch b/pkgs/development/compilers/openjdk/11/patches/currency-date-range-jdk10.patch index e058eff07466..e058eff07466 100644 --- a/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch +++ b/pkgs/development/compilers/openjdk/11/patches/currency-date-range-jdk10.patch diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch b/pkgs/development/compilers/openjdk/11/patches/fix-java-home-jdk10.patch index c037fde29722..c037fde29722 100644 --- a/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch +++ b/pkgs/development/compilers/openjdk/11/patches/fix-java-home-jdk10.patch diff --git a/pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch b/pkgs/development/compilers/openjdk/11/patches/fix-library-path-jdk11.patch index ce30edb7f1d9..ce30edb7f1d9 100644 --- a/pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch +++ b/pkgs/development/compilers/openjdk/11/patches/fix-library-path-jdk11.patch diff --git a/pkgs/development/compilers/openjdk/increase-javadoc-heap.patch b/pkgs/development/compilers/openjdk/11/patches/increase-javadoc-heap.patch index 6a1b253f9132..6a1b253f9132 100644 --- a/pkgs/development/compilers/openjdk/increase-javadoc-heap.patch +++ b/pkgs/development/compilers/openjdk/11/patches/increase-javadoc-heap.patch diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch b/pkgs/development/compilers/openjdk/11/patches/read-truststore-from-env-jdk10.patch index 6203064f5c06..6203064f5c06 100644 --- a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch +++ b/pkgs/development/compilers/openjdk/11/patches/read-truststore-from-env-jdk10.patch diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch b/pkgs/development/compilers/openjdk/11/patches/swing-use-gtk-jdk10.patch index b9258c500db4..b9258c500db4 100644 --- a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch +++ b/pkgs/development/compilers/openjdk/11/patches/swing-use-gtk-jdk10.patch diff --git a/pkgs/development/compilers/openjdk/11/source.json b/pkgs/development/compilers/openjdk/11/source.json new file mode 100644 index 000000000000..68080694d667 --- /dev/null +++ b/pkgs/development/compilers/openjdk/11/source.json @@ -0,0 +1,6 @@ +{ + "hash": "sha256-HqFm4qESB5T4Y1FLgfHZxURi7l7NkLzx2w8GzmB1jSY=", + "owner": "openjdk", + "repo": "jdk11u", + "rev": "refs/tags/jdk-11.0.25+9" +} diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix deleted file mode 100644 index d0c954d1b023..000000000000 --- a/pkgs/development/compilers/openjdk/17.nix +++ /dev/null @@ -1,209 +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, openjdk17-bootstrap -, setJavaClassPath -, headless ? false -, enableJavaFX ? false, openjfx -, enableGtk ? true, gtk3, glib -}: - -let - version = { - feature = "17"; - interim = ".0.11"; - build = "9"; - }; - - # when building a headless jdk, also bootstrap it with a headless jdk - openjdk-bootstrap = openjdk17-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-aO4iSc9MklW/4q9U86WEfiiWnlq6iZSbxzq2fbsqd0A="; - }; - - 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 && enableGtk) [ - gtk3 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-jdk17.patch - ./fix-library-path-jdk17.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. - (fetchurl { - url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c"; - sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo="; - }) - - # 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="; - }) - - # 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 - ]; - - 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.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; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - NIX_LDFLAGS = toString (lib.optionals (!headless) [ - "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGtk) [ - "-lgtk-3" "-lgio-2.0" - ]); - - # -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/17/patches/fix-library-path-jdk17.patch b/pkgs/development/compilers/openjdk/17/patches/fix-library-path-jdk17.patch new file mode 100644 index 000000000000..71d96631ef89 --- /dev/null +++ b/pkgs/development/compilers/openjdk/17/patches/fix-library-path-jdk17.patch @@ -0,0 +1,61 @@ +diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp +index 7c951cee51..bcc61ff43d 100644 +--- a/src/hotspot/os/linux/os_linux.cpp ++++ b/src/hotspot/os/linux/os_linux.cpp +@@ -416,18 +416,8 @@ + // 1: ... + // ... + // 7: The default directories, normally /lib and /usr/lib. +-#ifndef OVERRIDE_LIBPATH +- #if defined(_LP64) +- #define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib" +- #else +- #define DEFAULT_LIBPATH "/lib:/usr/lib" +- #endif +-#else +- #define DEFAULT_LIBPATH OVERRIDE_LIBPATH +-#endif + + // Base path of extensions installed on the system. +-#define SYS_EXT_DIR "/usr/java/packages" + #define EXTENSIONS_DIR "/lib/ext" + + // Buffer that fits several snprintfs. +@@ -435,7 +425,7 @@ + // by the nulls included by the sizeof operator. + const size_t bufsize = + MAX2((size_t)MAXPATHLEN, // For dll_dir & friends. +- (size_t)MAXPATHLEN + sizeof(EXTENSIONS_DIR) + sizeof(SYS_EXT_DIR) + sizeof(EXTENSIONS_DIR)); // extensions dir ++ (size_t)MAXPATHLEN + sizeof(EXTENSIONS_DIR) + sizeof(EXTENSIONS_DIR)); // extensions dir + char *buf = NEW_C_HEAP_ARRAY(char, bufsize, mtInternal); + + // sysclasspath, java_home, dll_dir +@@ -482,24 +472,20 @@ + // should always exist (until the legacy problem cited above is + // addressed). + const char *v = ::getenv("LD_LIBRARY_PATH"); +- const char *v_colon = ":"; +- if (v == NULL) { v = ""; v_colon = ""; } +- // That's +1 for the colon and +1 for the trailing '\0'. +- size_t pathsize = strlen(v) + 1 + sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1; ++ if (v == NULL) { v = ""; } ++ size_t pathsize = strlen(v) + 1; + char *ld_library_path = NEW_C_HEAP_ARRAY(char, pathsize, mtInternal); +- os::snprintf_checked(ld_library_path, pathsize, "%s%s" SYS_EXT_DIR "/lib:" DEFAULT_LIBPATH, v, v_colon); ++ os::snprintf_checked(ld_library_path, pathsize, "%s", v); + Arguments::set_library_path(ld_library_path); + FREE_C_HEAP_ARRAY(char, ld_library_path); + } + + // Extensions directories. +- os::snprintf_checked(buf, bufsize, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home()); ++ os::snprintf_checked(buf, bufsize, "%s" EXTENSIONS_DIR, Arguments::get_java_home()); + Arguments::set_ext_dirs(buf); + + FREE_C_HEAP_ARRAY(char, buf); + +-#undef DEFAULT_LIBPATH +-#undef SYS_EXT_DIR + #undef EXTENSIONS_DIR + } + diff --git a/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk17.patch b/pkgs/development/compilers/openjdk/17/patches/ignore-LegalNoticeFilePlugin-jdk17.patch index 3bb610ee35c0..3bb610ee35c0 100644 --- a/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk17.patch +++ b/pkgs/development/compilers/openjdk/17/patches/ignore-LegalNoticeFilePlugin-jdk17.patch diff --git a/pkgs/development/compilers/openjdk/increase-javadoc-heap-jdk13.patch b/pkgs/development/compilers/openjdk/17/patches/increase-javadoc-heap-jdk13.patch index 6e48db6ac3b9..6e48db6ac3b9 100644 --- a/pkgs/development/compilers/openjdk/increase-javadoc-heap-jdk13.patch +++ b/pkgs/development/compilers/openjdk/17/patches/increase-javadoc-heap-jdk13.patch diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk13.patch b/pkgs/development/compilers/openjdk/17/patches/swing-use-gtk-jdk13.patch index 8a1b9b6149bb..8a1b9b6149bb 100644 --- a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk13.patch +++ b/pkgs/development/compilers/openjdk/17/patches/swing-use-gtk-jdk13.patch diff --git a/pkgs/development/compilers/openjdk/17/source.json b/pkgs/development/compilers/openjdk/17/source.json new file mode 100644 index 000000000000..c372853e70e0 --- /dev/null +++ b/pkgs/development/compilers/openjdk/17/source.json @@ -0,0 +1,6 @@ +{ + "hash": "sha256-wHJlCmaE8titkfcWb2WboqemekPBn3JWc4bGyWskmoY=", + "owner": "openjdk", + "repo": "jdk17u", + "rev": "refs/tags/jdk-17.0.13+11" +} diff --git a/pkgs/development/compilers/openjdk/21.nix b/pkgs/development/compilers/openjdk/21.nix deleted file mode 100644 index 9c403fb2755d..000000000000 --- a/pkgs/development/compilers/openjdk/21.nix +++ /dev/null @@ -1,195 +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, openjdk21-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 -, enableGtk ? true, gtk3, glib -}: - -let - version = { - feature = "21"; - interim = ".0.3"; - build = "9"; - }; - - # when building a headless jdk, also bootstrap it with a headless jdk - openjdk-bootstrap = openjdk21-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-zRN16lrc5gtDlTVIQJRRx103w/VbRkatCLeEc9AXWPE="; - }; - - 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 && enableGtk) [ - gtk3 glib - ]; - - patches = [ - ./fix-java-home-jdk21.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"; - }) - - # 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 && enableGtk) [ - ./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.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; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - NIX_LDFLAGS = toString (lib.optionals (!headless) [ - "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGtk) [ - "-lgtk-3" "-lgio-2.0" - ]); - - # -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/fix-java-home-jdk21.patch b/pkgs/development/compilers/openjdk/21/patches/fix-java-home-jdk21.patch index ede201ed1ada..ede201ed1ada 100644 --- a/pkgs/development/compilers/openjdk/fix-java-home-jdk21.patch +++ b/pkgs/development/compilers/openjdk/21/patches/fix-java-home-jdk21.patch diff --git a/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk18.patch b/pkgs/development/compilers/openjdk/21/patches/ignore-LegalNoticeFilePlugin-jdk18.patch index cda93580efb1..cda93580efb1 100644 --- a/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk18.patch +++ b/pkgs/development/compilers/openjdk/21/patches/ignore-LegalNoticeFilePlugin-jdk18.patch diff --git a/pkgs/development/compilers/openjdk/21/source.json b/pkgs/development/compilers/openjdk/21/source.json new file mode 100644 index 000000000000..9808423ccff1 --- /dev/null +++ b/pkgs/development/compilers/openjdk/21/source.json @@ -0,0 +1,6 @@ +{ + "hash": "sha256-H28Hp1SzANkrgnC6xdkiSEcRK6bm8BcT/lbJDEUvRYY=", + "owner": "openjdk", + "repo": "jdk21u", + "rev": "refs/tags/jdk-21.0.5+11" +} diff --git a/pkgs/development/compilers/openjdk/22.nix b/pkgs/development/compilers/openjdk/22.nix deleted file mode 100644 index b022e492e3f9..000000000000 --- a/pkgs/development/compilers/openjdk/22.nix +++ /dev/null @@ -1,284 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, fetchFromGitHub -, 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 -, openjdk22-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 -, enableGtk ? true -, gtk3 -, glib -, writeShellScript -, versionCheckHook -}: - -let - - # Java version format: - # $FEATURE.$INTERIM.$UPDATE.$PATCH - # See - # https://openjdk.org/jeps/223 - # https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/lang/Runtime.Version.html - featureVersion = "22"; - info = builtins.getAttr featureVersion (lib.importJSON ./info.json); - version = info.version; - - # when building a headless jdk, also bootstrap it with a headless jdk - openjdk-bootstrap = openjdk22-bootstrap.override { gtkSupport = !headless; }; -in - -stdenv.mkDerivation (finalAttrs: { - pname = "openjdk" + lib.optionalString headless "-headless"; - inherit version; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = info.repo; - rev = "jdk-${version}"; - hash = info.hash; - }; - - 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 && enableGtk) [ - gtk3 - glib - ]; - - patches = [ - ./fix-java-home-jdk21.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"; - }) - - # 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 && enableGtk) [ - ./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" ]; - - - # https://openjdk.org/groups/build/doc/building.html - configureFlags = [ - "--with-boot-jdk=${openjdk-bootstrap.home}" - "--with-version-string=${version}" - "--with-vendor-version-string=(nix)" - "--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.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; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - NIX_LDFLAGS = toString (lib.optionals (!headless) [ - "-lfontconfig" - "-lcups" - "-lXinerama" - "-lXrandr" - "-lmagic" - ] ++ lib.optionals (!headless && enableGtk) [ - "-lgtk-3" - "-lgio-2.0" - ]); - - # -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 = __curPos; - meta = import ./meta.nix lib featureVersion; - - nativeInstallCheckInputs = [ - versionCheckHook - ]; - versionCheckProgram = "${placeholder "out"}/bin/java"; - - doInstallCheck = true; - - passthru = { - updateScript = - let - java-json = fetchurl { - url = "https://search.maven.org/remotecontent?filepath=org/json/json/20240303/json-20240303.jar"; - hash = "sha256-PPbNaJLjLitMHDng9S9SSKL1s3ZG/fu3mma0a2GEFO0="; - }; - in - writeShellScript "update-java" '' - ${finalAttrs.finalPackage}/bin/java \ - -cp ${java-json} \ - ${./JavaUpdater.java} \ - 22 pkgs/development/compilers/openjdk/info.json - ''; - - home = "${finalAttrs.finalPackage}/lib/openjdk"; - - inherit gtk3; - }; -}) diff --git a/pkgs/development/compilers/openjdk/23/source.json b/pkgs/development/compilers/openjdk/23/source.json new file mode 100644 index 000000000000..d56aeb591498 --- /dev/null +++ b/pkgs/development/compilers/openjdk/23/source.json @@ -0,0 +1,6 @@ +{ + "hash": "sha256-Sl0aEtndzlyuwMtcjOeDe2CVls89ONzicP5IXhAU2FA=", + "owner": "openjdk", + "repo": "jdk23u", + "rev": "refs/tags/jdk-23.0.1+11" +} diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix deleted file mode 100644 index b77b058e2cac..000000000000 --- a/pkgs/development/compilers/openjdk/8.nix +++ /dev/null @@ -1,230 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, lndir, bash, cpio, file, which, unzip, zip -, cups, freetype, alsa-lib, cacert, perl, liberation_ttf, fontconfig, zlib -, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr -, libjpeg, giflib -, openjdk8-bootstrap -, setJavaClassPath -, headless ? false -, enableGtk ? true, gtk2, glib -}: - -let - - /** - * The JRE libraries are in directories that depend on the CPU. - */ - architecture = { - i686-linux = "i386"; - x86_64-linux = "amd64"; - aarch64-linux = "aarch64"; - powerpc64le-linux = "ppc64le"; - }.${stdenv.system} or (throw "Unsupported platform ${stdenv.system}"); - - update = "412"; - build = "ga"; - - # when building a headless jdk, also bootstrap it with a headless jdk - openjdk-bootstrap = openjdk8-bootstrap.override { gtkSupport = !headless; }; - - openjdk8 = stdenv.mkDerivation rec { - pname = "openjdk" + lib.optionalString headless "-headless"; - version = "8u${update}-${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jdk8u"; - rev = "jdk${version}"; - sha256 = "sha256-o+H5n5p6JG1giJj9OADgMbQPaoKMzLMFquKH536SHhM="; - }; - outputs = [ "out" "jre" ]; - - nativeBuildInputs = [ pkg-config lndir unzip ]; - buildInputs = [ - 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 && enableGtk) [ - gtk2 glib - ]; - - patches = [ - ./fix-java-home-jdk8.patch - ./read-truststore-from-env-jdk8.patch - ./currency-date-range-jdk8.patch - ./fix-library-path-jdk8.patch - ] ++ lib.optionals (!headless && enableGtk) [ - ./swing-use-gtk-jdk8.patch - ]; - - # Hotspot cares about the host(!) version otherwise - DISABLE_HOTSPOT_OS_VERSION_CHECK = "ok"; - - preConfigure = '' - chmod +x configure - substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" - substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "${stdenv.shell}" - substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path" - ''; - - configureFlags = [ - "--with-boot-jdk=${openjdk-bootstrap.home}" - "--with-update-version=${update}" - "--with-build-number=${build}" - "--with-milestone=fcs" - "--enable-unlimited-crypto" - "--with-native-debug-symbols=internal" - "--disable-freetype-bundling" - "--with-zlib=system" - "--with-giflib=system" - "--with-stdc++lib=dynamic" - ] ++ lib.optional headless "--disable-headful"; - - separateDebugInfo = true; - - env.NIX_CFLAGS_COMPILE = toString ([ - # glibc 2.24 deprecated readdir_r so we need this - # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html - "-Wno-error=deprecated-declarations" - ] ++ lib.optionals stdenv.cc.isGNU [ - # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 - # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 - "-fno-lifetime-dse" - "-fno-delete-null-pointer-checks" - "-std=gnu++98" - "-Wno-error" - ]); - - NIX_LDFLAGS= toString (lib.optionals (!headless) [ - "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGtk) [ - "-lgtk-x11-2.0" "-lgio-2.0" - ]); - - # -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" ]; - - doCheck = false; # fails with "No rule to make target 'y'." - - installPhase = '' - mkdir -p $out/lib - - mv build/*/images/j2sdk-image $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 $out/lib/openjdk/sample - ${lib.optionalString headless '' - rm $out/lib/openjdk/jre/lib/${architecture}/{libjsound,libjsoundalsa,libsplashscreen,libawt*,libfontmanager}.so - rm $out/lib/openjdk/jre/bin/policytool - rm $out/lib/openjdk/bin/{policytool,appletviewer} - ''} - - # Move the JRE to a separate output - mkdir -p $jre/lib/openjdk - mv $out/lib/openjdk/jre $jre/lib/openjdk/jre - mkdir $out/lib/openjdk/jre - lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre - - # Make sure cmm/*.pf are not symlinks: - # https://youtrack.jetbrains.com/issue/IDEA-147272 - rm -rf $out/lib/openjdk/jre/lib/cmm - ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm - - # Setup fallback fonts - ${lib.optionalString (!headless) '' - mkdir -p $jre/lib/openjdk/jre/lib/fonts - ln -s ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback - ''} - - # Remove duplicate binaries. - for i in $(cd $out/lib/openjdk/bin && echo *); do - if [ "$i" = java ]; then continue; fi - if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then - ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i - fi - done - - # Generate certificates. - ( - cd $jre/lib/openjdk/jre/lib/security - rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt - ) - - ln -s $out/lib/openjdk/bin $out/bin - ln -s $jre/lib/openjdk/jre/bin $jre/bin - ln -s $jre/lib/openjdk/jre $out/jre - ''; - - propagatedBuildInputs = [ setJavaClassPath ]; - - preFixup = '' - # Propagate the setJavaClassPath setup hook from the JRE so that - # any package that depends on the JRE has $CLASSPATH set up - # properly. - mkdir -p $jre/nix-support - printWords ${setJavaClassPath} > $jre/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 = [ openjdk8-bootstrap ]; - - meta = with lib; { - homepage = "http://openjdk.java.net/"; - license = licenses.gpl2; - description = "Open-source Java Development Kit"; - 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 = { - inherit architecture; - home = "${openjdk8}/lib/openjdk"; - inherit gtk2; - }; - }; -in openjdk8 diff --git a/pkgs/development/compilers/openjdk/generate-cacerts.pl b/pkgs/development/compilers/openjdk/8/generate-cacerts.pl index 3bdd42f7274f..3bdd42f7274f 100644 --- a/pkgs/development/compilers/openjdk/generate-cacerts.pl +++ b/pkgs/development/compilers/openjdk/8/generate-cacerts.pl diff --git a/pkgs/development/compilers/openjdk/currency-date-range-jdk8.patch b/pkgs/development/compilers/openjdk/8/patches/currency-date-range-jdk8.patch index 2ff0fcc3d411..2ff0fcc3d411 100644 --- a/pkgs/development/compilers/openjdk/currency-date-range-jdk8.patch +++ b/pkgs/development/compilers/openjdk/8/patches/currency-date-range-jdk8.patch diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch b/pkgs/development/compilers/openjdk/8/patches/fix-java-home-jdk8.patch index 6189412c999c..6189412c999c 100644 --- a/pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch +++ b/pkgs/development/compilers/openjdk/8/patches/fix-java-home-jdk8.patch diff --git a/pkgs/development/compilers/openjdk/fix-library-path-jdk8.patch b/pkgs/development/compilers/openjdk/8/patches/fix-library-path-jdk8.patch index 3780e95ea5b6..3780e95ea5b6 100644 --- a/pkgs/development/compilers/openjdk/fix-library-path-jdk8.patch +++ b/pkgs/development/compilers/openjdk/8/patches/fix-library-path-jdk8.patch diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch b/pkgs/development/compilers/openjdk/8/patches/read-truststore-from-env-jdk8.patch index 08cf554a18fe..08cf554a18fe 100644 --- a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch +++ b/pkgs/development/compilers/openjdk/8/patches/read-truststore-from-env-jdk8.patch diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk8.patch b/pkgs/development/compilers/openjdk/8/patches/swing-use-gtk-jdk8.patch index 9538aade6726..9538aade6726 100644 --- a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk8.patch +++ b/pkgs/development/compilers/openjdk/8/patches/swing-use-gtk-jdk8.patch diff --git a/pkgs/development/compilers/openjdk/8/source.json b/pkgs/development/compilers/openjdk/8/source.json new file mode 100644 index 000000000000..6cedef5ccb7b --- /dev/null +++ b/pkgs/development/compilers/openjdk/8/source.json @@ -0,0 +1,6 @@ +{ + "hash": "sha256-48DyJXD7D28LFa+4ONeMgSddqrCLn6FLwEGWGeP4upM=", + "owner": "openjdk", + "repo": "jdk8u", + "rev": "refs/tags/jdk8u432-b06" +} diff --git a/pkgs/development/compilers/openjdk/JavaUpdater.java b/pkgs/development/compilers/openjdk/JavaUpdater.java deleted file mode 100644 index 32dddf2fabc7..000000000000 --- a/pkgs/development/compilers/openjdk/JavaUpdater.java +++ /dev/null @@ -1,181 +0,0 @@ -import org.json.JSONArray; -import org.json.JSONObject; - -import java.io.IOException; -import java.io.PrintWriter; -import java.net.URI; -import java.net.http.*; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.*; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import java.util.stream.StreamSupport; - -public class JavaUpdater { - - record GitHubResult(Optional<String> latestVersion, Optional<String> next) { - } - - record JsonInfo(String repo, String version, String hash) { - public JsonInfo(JSONObject json) { - this(json.getString("repo"), json.getString("version"), json.getString("hash")); - } - - public String toJsonString(String featureVersion) { - return """ - \s "%s": { - \s "version": "%s", - \s "repo": "%s", - \s "hash": "%s" - \s }\ - """.formatted(featureVersion, version, repo, hash); - } - } - - // Parses the GitHub Link header - public static Optional<String> getNextLink(HttpHeaders headers) { - var linkHeader = headers.map().get("Link"); - if (linkHeader == null || linkHeader.isEmpty()) return null; - - var links = linkHeader.getFirst(); - var linksRegex = Pattern.compile("<(.+)>;\\s*rel=\"next\""); - return Pattern.compile(",") - .splitAsStream(links) - .map(x -> linksRegex.matcher(x).results() - .map(g -> g.group(1)) - .findFirst() - ) - .filter(Optional::isPresent) - .map(Optional::orElseThrow) - .findFirst(); - } - - // HTTP request helper, sets GITHUB_TOKEN if present - private static HttpRequest NewGithubRequest(String url) { - var token = System.getenv().get("GITHUB_TOKEN"); - var builder = HttpRequest.newBuilder() - .uri(URI.create(url)); - if (token != null) - builder.setHeader("Authorization", "Bearer " + token); - return builder.build(); - } - - private static GitHubResult getLatestTag(String url) { - var request = NewGithubRequest(url); - - var response = - HttpClient.newHttpClient().sendAsync(request, HttpResponse.BodyHandlers.ofString()) - .join(); - - var json = new JSONArray(response.body()); - - Optional<String> version = StreamSupport.stream(json.spliterator(), false) - .map(JSONObject.class::cast) - .map(x -> x.getString("name").replaceFirst("jdk-", "")) - .filter(x -> x.contains("-ga")) - .max(Comparator.comparing(Runtime.Version::parse)); - - return new GitHubResult(version, getNextLink(response.headers())); - } - - public String findNewerVersion() { - var url = Optional.of("https://api.github.com/repos/openjdk/" + getRepo() + "/tags?per_page=100"); - String version = getCurrentVersion(); - do { - GitHubResult response = getLatestTag(url.orElseThrow()); - if (response.latestVersion.isPresent() && response.latestVersion.orElseThrow().equals(version)) { - return null; - } - - String latestVersion = Stream.of(version, response.latestVersion.orElse(version)) - .max(Comparator.comparing(Runtime.Version::parse)).orElseThrow(); - - if (latestVersion != version) - return latestVersion; - - url = response.next; - } while (url.isPresent()); - return null; - } - - - private static String prettyPrint(JSONObject json) { - - Iterable<String> iterable = () -> json.keys(); - - return StreamSupport - .stream(iterable.spliterator(), false) - .sorted(Comparator.reverseOrder()) - .map(majorVersion -> (new JsonInfo(json.getJSONObject(majorVersion))).toJsonString(majorVersion)) - .collect( - Collectors.joining(",\n", "{\n", "\n}") - ); - } - - public void updateJsonInfo(String newVersion) { - try { - JSONObject json = getJsonInfo(); - var info = json.getJSONObject(featureNumber); - info.put("version", newVersion); - info.put("hash", nixHash(newVersion)); - - try (PrintWriter out = new PrintWriter(infoJsonPath)) { - out.println(prettyPrint(json)); - } - - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - private String nixHash(String version) { - try { - var process = new ProcessBuilder("nix", "flake", "prefetch", - "--extra-experimental-features", "'nix-command flakes'", - "--json", "github:openjdk/" + getRepo() + "/jdk-" + version).start(); - - var json = new JSONObject(new String(process.getInputStream().readAllBytes())); - process.waitFor(); - return json.getString("hash"); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - private final String featureNumber; - private final String infoJsonPath; - private final JSONObject jsonInfo; - - public String getCurrentVersion() { - return this.jsonInfo.getJSONObject(this.featureNumber).getString("version"); - } - - public String getRepo() { - return this.jsonInfo.getJSONObject(this.featureNumber).getString("repo"); - } - - public JSONObject getJsonInfo() { - try { - String infoStr = Files.readString(Path.of(this.infoJsonPath)); - return new JSONObject(infoStr); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - public JavaUpdater(String featureNumber, String infoJsonPath) { - this.featureNumber = featureNumber; - this.infoJsonPath = infoJsonPath; - this.jsonInfo = getJsonInfo(); - } - - public static void main(String[] args) { - var updater = new JavaUpdater(args[0], args[1]); - String newerVersion = updater.findNewerVersion(); - if (newerVersion != null) { - updater.updateJsonInfo(newerVersion); - } - } -} diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix deleted file mode 100644 index e58888cc9ed8..000000000000 --- a/pkgs/development/compilers/openjdk/bootstrap.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv -, runCommand, fetchurl, zlib - -, version -}: - -assert stdenv.hostPlatform.libc == "glibc"; - -let - fetchboot = version: arch: sha256: fetchurl { - name = "openjdk${version}-bootstrap-${arch}-linux.tar.xz"; - url = "http://tarballs.nixos.org/openjdk/2018-03-31/${version}/${arch}-linux.tar.xz"; - inherit sha256; - }; - - src = if stdenv.hostPlatform.system == "x86_64-linux" then - (if version == "10" then fetchboot "10" "x86_64" "08085fsxc1qhqiv3yi38w8lrg3vm7s0m2yvnwr1c92v019806yq2" - else if version == "8" then fetchboot "8" "x86_64" "18zqx6jhm3lizn9hh6ryyqc9dz3i96pwaz8f6nxfllk70qi5gvks" - else throw "No bootstrap jdk for version ${version}") - else if stdenv.hostPlatform.system == "i686-linux" then - (if version == "10" then fetchboot "10" "i686" "1blb9gyzp8gfyggxvggqgpcgfcyi00ndnnskipwgdm031qva94p7" - else if version == "8" then fetchboot "8" "i686" "1yx04xh8bqz7amg12d13rw5vwa008rav59mxjw1b9s6ynkvfgqq9" - else throw "No bootstrap for version") - else throw "No bootstrap jdk for system ${stdenv.hostPlatform.system}"; - - bootstrap = runCommand "openjdk-bootstrap" { - passthru.home = "${bootstrap}/lib/openjdk"; - } '' - tar xvf ${src} - mv openjdk-bootstrap $out - - LIBDIRS="$(find $out -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':')" - - find "$out" -type f -print0 | while IFS= read -r -d "" elf; do - isELF "$elf" || continue - patchelf --set-interpreter $(cat "${stdenv.cc}/nix-support/dynamic-linker") "$elf" || true - patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${zlib}/lib:$LIBDIRS" "$elf" || true - done - ''; -in bootstrap diff --git a/pkgs/development/compilers/openjdk/fix-glibc-2.34.patch b/pkgs/development/compilers/openjdk/fix-glibc-2.34.patch deleted file mode 100644 index 7bf8b2b16744..000000000000 --- a/pkgs/development/compilers/openjdk/fix-glibc-2.34.patch +++ /dev/null @@ -1,24 +0,0 @@ -Taken from https://build.opensuse.org/package/view_file/Java:Factory/java-15-openjdk/openjdk-glibc234.patch - ---- openjdk/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c 2021-04-09 11:36:58.000000000 +0200 -+++ openjdk/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c 2021-08-26 15:42:52.326232581 +0200 -@@ -67,8 +67,17 @@ - longjmp(context, 1); - } - -+static char* altstack = NULL; -+ - void set_signal_handler() { -- static char altstack[SIGSTKSZ]; -+ if (altstack == NULL) { -+ // Dynamically allocated in case SIGSTKSZ is not constant -+ altstack = malloc(SIGSTKSZ); -+ if (altstack == NULL) { -+ fprintf(stderr, "Test ERROR. Unable to malloc altstack space\n"); -+ exit(7); -+ } -+ } - - stack_t ss = { - .ss_size = SIGSTKSZ, - diff --git a/pkgs/development/compilers/openjdk/fix-library-path-jdk17.patch b/pkgs/development/compilers/openjdk/fix-library-path-jdk17.patch deleted file mode 100644 index 4c38aca2b48a..000000000000 --- a/pkgs/development/compilers/openjdk/fix-library-path-jdk17.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/src/hotspot/os/linux/os_linux.cpp -+++ b/src/hotspot/os/linux/os_linux.cpp -@@ -412,18 +412,8 @@ void os::init_system_properties_values() { - // 1: ... - // ... - // 7: The default directories, normally /lib and /usr/lib. --#ifndef OVERRIDE_LIBPATH -- #if defined(_LP64) -- #define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib" -- #else -- #define DEFAULT_LIBPATH "/lib:/usr/lib" -- #endif --#else -- #define DEFAULT_LIBPATH OVERRIDE_LIBPATH --#endif - - // Base path of extensions installed on the system. --#define SYS_EXT_DIR "/usr/java/packages" - #define EXTENSIONS_DIR "/lib/ext" - - // Buffer that fits several sprintfs. -@@ -431,7 +421,7 @@ void os::init_system_properties_values() { - // by the nulls included by the sizeof operator. - const size_t bufsize = - MAX2((size_t)MAXPATHLEN, // For dll_dir & friends. -- (size_t)MAXPATHLEN + sizeof(EXTENSIONS_DIR) + sizeof(SYS_EXT_DIR) + sizeof(EXTENSIONS_DIR)); // extensions dir -+ (size_t)MAXPATHLEN + sizeof(EXTENSIONS_DIR) + sizeof(EXTENSIONS_DIR)); // extensions dir - char *buf = NEW_C_HEAP_ARRAY(char, bufsize, mtInternal); - - // sysclasspath, java_home, dll_dir -@@ -478,26 +468,22 @@ void os::init_system_properties_values() { - // should always exist (until the legacy problem cited above is - // addressed). - const char *v = ::getenv("LD_LIBRARY_PATH"); -- const char *v_colon = ":"; -- if (v == NULL) { v = ""; v_colon = ""; } -+ if (v == NULL) { v = ""; } - // That's +1 for the colon and +1 for the trailing '\0'. - char *ld_library_path = NEW_C_HEAP_ARRAY(char, -- strlen(v) + 1 + -- sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1, -+ strlen(v) + 1, - mtInternal); -- sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib:" DEFAULT_LIBPATH, v, v_colon); -+ sprintf(ld_library_path, "%s", v); - Arguments::set_library_path(ld_library_path); - FREE_C_HEAP_ARRAY(char, ld_library_path); - } - - // Extensions directories. -- sprintf(buf, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home()); -+ sprintf(buf, "%s" EXTENSIONS_DIR, Arguments::get_java_home()); - Arguments::set_ext_dirs(buf); - - FREE_C_HEAP_ARRAY(char, buf); - --#undef DEFAULT_LIBPATH --#undef SYS_EXT_DIR - #undef EXTENSIONS_DIR - } \ No newline at end of file diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix new file mode 100644 index 000000000000..b18e9679c107 --- /dev/null +++ b/pkgs/development/compilers/openjdk/generic.nix @@ -0,0 +1,668 @@ +{ + featureVersion, + + lib, + stdenv, + + fetchurl, + fetchpatch, + + buildPackages, + pkg-config, + autoconf, + lndir, + unzip, + ensureNewerSourcesForZipFilesHook, + + cpio, + file, + which, + zip, + perl, + zlib, + cups, + freetype, + harfbuzz, + alsa-lib, + libjpeg, + giflib, + libpng, + lcms2, + libX11, + libICE, + libXext, + libXrender, + libXtst, + libXt, + libXi, + libXinerama, + libXcursor, + libXrandr, + fontconfig, + + setJavaClassPath, + + versionCheckHook, + + bash, + liberation_ttf, + cacert, + + nixpkgs-openjdk-updater, + + # TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages + # which should be fixable, this is a no-rebuild workaround for GHC. + headless ? lib.versionAtLeast featureVersion "21" && stdenv.targetPlatform.isGhcjs, + + enableJavaFX ? false, + openjfx17, + openjfx21, + openjfx23, + openjfx_jdk ? + { + "17" = openjfx17; + "21" = openjfx21; + "23" = openjfx23; + } + .${featureVersion} or (throw "JavaFX is not supported on OpenJDK ${featureVersion}"), + + enableGtk ? true, + gtk3, + gtk2, + glib, + + temurin-bin-8, + temurin-bin-11, + temurin-bin-17, + temurin-bin-21, + temurin-bin-23, + jdk-bootstrap ? + { + "8" = temurin-bin-8.__spliced.buildBuild or temurin-bin-8; + "11" = temurin-bin-11.__spliced.buildBuild or temurin-bin-11; + "17" = temurin-bin-17.__spliced.buildBuild or temurin-bin-17; + "21" = temurin-bin-21.__spliced.buildBuild or temurin-bin-21; + "23" = temurin-bin-23.__spliced.buildBuild or temurin-bin-23; + } + .${featureVersion}, +}: + +let + sourceFile = ./. + "/${featureVersion}/source.json"; + source = nixpkgs-openjdk-updater.openjdkSource { + inherit sourceFile; + featureVersionPrefix = tagPrefix + featureVersion; + }; + + atLeast11 = lib.versionAtLeast featureVersion "11"; + atLeast17 = lib.versionAtLeast featureVersion "17"; + atLeast21 = lib.versionAtLeast featureVersion "21"; + atLeast23 = lib.versionAtLeast featureVersion "23"; + + tagPrefix = if atLeast11 then "jdk-" else "jdk"; + version = lib.removePrefix "refs/tags/${tagPrefix}" source.src.rev; + versionSplit = builtins.match (if atLeast11 then "(.+)+(.+)" else "(.+)-b(.+)") version; + versionBuild = lib.elemAt versionSplit 1; + + # The JRE 8 libraries are in directories that depend on the CPU. + architecture = + if atLeast11 then + "" + else + { + i686-linux = "i386"; + x86_64-linux = "amd64"; + aarch64-linux = "aarch64"; + powerpc64le-linux = "ppc64le"; + } + .${stdenv.system} or (throw "Unsupported platform ${stdenv.system}"); + + jdk-bootstrap' = jdk-bootstrap.override { + # when building a headless jdk, also bootstrap it with a headless jdk + gtkSupport = !headless; + }; +in + +assert lib.assertMsg (lib.pathExists sourceFile) + "OpenJDK ${featureVersion} is not a supported version"; + +stdenv.mkDerivation (finalAttrs: { + pname = "openjdk" + lib.optionalString headless "-headless"; + inherit version; + + outputs = + [ + "out" + ] + ++ lib.optionals (!atLeast11) [ + "jre" + ]; + + inherit (source) src; + + patches = + [ + ( + if atLeast21 then + ./21/patches/fix-java-home-jdk21.patch + else if atLeast11 then + ./11/patches/fix-java-home-jdk10.patch + else + ./8/patches/fix-java-home-jdk8.patch + ) + ( + if atLeast11 then + ./11/patches/read-truststore-from-env-jdk10.patch + else + ./8/patches/read-truststore-from-env-jdk8.patch + ) + ] + ++ lib.optionals (!atLeast23) [ + ( + if atLeast11 then + ./11/patches/currency-date-range-jdk10.patch + else + ./8/patches/currency-date-range-jdk8.patch + ) + ] + ++ lib.optionals atLeast11 [ + ( + if atLeast17 then + ./17/patches/increase-javadoc-heap-jdk13.patch + else + ./11/patches/increase-javadoc-heap.patch + ) + ] + ++ lib.optionals atLeast17 [ + ( + if atLeast21 then + ./21/patches/ignore-LegalNoticeFilePlugin-jdk18.patch + else + ./17/patches/ignore-LegalNoticeFilePlugin-jdk17.patch + ) + ] + ++ lib.optionals (!atLeast21) [ + ( + if atLeast17 then + ./17/patches/fix-library-path-jdk17.patch + else if atLeast11 then + ./11/patches/fix-library-path-jdk11.patch + else + ./8/patches/fix-library-path-jdk8.patch + ) + ] + ++ lib.optionals (atLeast17 && !atLeast23) [ + # -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 (featureVersion == "17") [ + # Patch borrowed from Alpine to fix build errors with musl libc and recent gcc. + # This is applied anywhere to prevent patchrot. + (fetchurl { + url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c"; + sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo="; + }) + ] + ++ lib.optionals atLeast11 [ + # 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 && enableGtk) [ + ( + if atLeast17 then + ./17/patches/swing-use-gtk-jdk13.patch + else if atLeast11 then + ./11/patches/swing-use-gtk-jdk10.patch + else + ./8/patches/swing-use-gtk-jdk8.patch + ) + ]; + + strictDeps = true; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + nativeBuildInputs = + [ + pkg-config + ] + ++ lib.optionals atLeast11 [ + autoconf + ] + ++ lib.optionals (!atLeast11) [ + lndir + # Certificates generated using perl in `installPhase` + perl + ] + ++ [ + unzip + zip + which + # Probably for BUILD_CC but not sure, not in closure. + zlib + ] + ++ lib.optionals atLeast21 [ + ensureNewerSourcesForZipFilesHook + ]; + + buildInputs = + [ + # TODO: Many of these should likely be in `nativeBuildInputs`. + cpio + # `-lmagic` in NIX_LDFLAGS + file + cups + freetype + ] + ++ lib.optionals (atLeast11 && !atLeast21) [ + harfbuzz + ] + ++ [ + alsa-lib + libjpeg + giflib + ] + ++ lib.optionals atLeast11 [ + libpng + zlib # duplicate + lcms2 + ] + ++ [ + libX11 + libICE + ] + ++ lib.optionals (!atLeast11) [ + libXext + ] + ++ [ + libXrender + ] + ++ lib.optionals atLeast11 [ + libXext + ] + ++ [ + libXtst + libXt + libXtst # duplicate + libXi + libXinerama + libXcursor + libXrandr + fontconfig + ] + ++ lib.optionals (!headless && enableGtk) [ + (if atLeast11 then gtk3 else gtk2) + glib + ]; + + propagatedBuildInputs = lib.optionals (!atLeast11) [ setJavaClassPath ]; + + nativeInstallCheckInputs = lib.optionals atLeast23 [ + versionCheckHook + ]; + + # 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 + ${if atLeast17 then "configurePlatforms" else null} = [ + "build" + "host" + ]; + + # https://openjdk.org/groups/build/doc/building.html + configureFlags = + [ + "--with-boot-jdk=${jdk-bootstrap'.home}" + # https://github.com/openjdk/jdk/blob/471f112bca715d04304cbe35c6ed63df8c7b7fee/make/autoconf/util_paths.m4#L315 + # Ignoring value of READELF from the environment. Use command line variables instead. + "READELF=${stdenv.cc.targetPrefix}readelf" + "AR=${stdenv.cc.targetPrefix}ar" + "STRIP=${stdenv.cc.targetPrefix}strip" + "NM=${stdenv.cc.targetPrefix}nm" + "OBJDUMP=${stdenv.cc.targetPrefix}objdump" + "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" + ] + ++ ( + if atLeast23 then + [ + "--with-version-string=${version}" + "--with-vendor-version-string=(nix)" + ] + else if atLeast11 then + lib.optionals atLeast17 [ + "--with-version-build=${versionBuild}" + "--with-version-opt=nixos" + ] + ++ [ + "--with-version-pre=" + ] + else + [ + "--with-update-version=${lib.removePrefix "${featureVersion}u" (lib.elemAt versionSplit 0)}" + "--with-build-number=${versionBuild}" + "--with-milestone=fcs" + ] + ) + ++ [ + "--enable-unlimited-crypto" + "--with-native-debug-symbols=internal" + ] + ++ lib.optionals (!atLeast21) ( + if atLeast11 then + [ + "--with-freetype=system" + "--with-harfbuzz=system" + ] + else + [ + "--disable-freetype-bundling" + ] + ) + ++ ( + if atLeast11 then + [ + "--with-libjpeg=system" + "--with-giflib=system" + "--with-libpng=system" + "--with-zlib=system" + "--with-lcms=system" + ] + else + [ + "--with-zlib=system" + "--with-giflib=system" + ] + ) + ++ [ + "--with-stdc++lib=dynamic" + ] + ++ lib.optionals (featureVersion == "11") [ + "--disable-warnings-as-errors" + ] + # OpenJDK 11 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 (atLeast11 && 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++" + ] + # This probably shouldn’t apply to OpenJDK 21; see + # b7e68243306833845cbf92e2ea1e0cf782481a51 which removed it for + # versions 15 through 20. + ++ lib.optional ( + (featureVersion == "11" || featureVersion == "21") && stdenv.hostPlatform.isx86_64 + ) "--with-jvm-features=zgc" + ++ lib.optional headless (if atLeast11 then "--enable-headless-only" else "--disable-headful") + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx_jdk}"; + + buildFlags = if atLeast17 then [ "images" ] else [ "all" ]; + + separateDebugInfo = true; + + # -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; + + env = + { + NIX_CFLAGS_COMPILE = + if atLeast17 then + "-Wno-error" + else if atLeast11 then + # Workaround for + # `cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]` + # when building jtreg + "-Wformat" + else + lib.concatStringsSep " " ( + [ + # glibc 2.24 deprecated readdir_r so we need this + # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html + "-Wno-error=deprecated-declarations" + ] + ++ lib.optionals stdenv.cc.isGNU [ + # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 + # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 + "-fno-lifetime-dse" + "-fno-delete-null-pointer-checks" + "-std=gnu++98" + "-Wno-error" + ] + ); + + NIX_LDFLAGS = lib.concatStringsSep " " ( + lib.optionals (!headless) [ + "-lfontconfig" + "-lcups" + "-lXinerama" + "-lXrandr" + "-lmagic" + ] + ++ lib.optionals (!headless && enableGtk) [ + (if atLeast11 then "-lgtk-3" else "-lgtk-x11-2.0") + "-lgio-2.0" + ] + ); + } + // lib.optionalAttrs (!atLeast11) { + # OpenJDK 8 Hotspot cares about the host(!) version otherwise + DISABLE_HOTSPOT_OS_VERSION_CHECK = "ok"; + }; + + ${if atLeast23 then "versionCheckProgram" else null} = "${placeholder "out"}/bin/java"; + + ${if !atLeast11 then "doCheck" else null} = false; # fails with "No rule to make target 'y'." + + doInstallCheck = atLeast23; + + ${if atLeast17 then "postPatch" else null} = '' + chmod +x configure + patchShebangs --build configure + ''; + + ${if !atLeast17 then "preConfigure" else null} = + '' + chmod +x configure + substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" + '' + + lib.optionalString (!atLeast11) '' + substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "${stdenv.shell}" + substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path" + ''; + + installPhase = + '' + mkdir -p $out/lib + + mv build/*/images/${if atLeast11 then "jdk" else "j2sdk-image"} $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 + '' + + lib.optionalString atLeast17 '' + + # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081) + '' + + lib.optionalString atLeast11 '' + 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 (!atLeast11) " $out/lib/openjdk/sample"} + ${lib.optionalString headless ( + if atLeast11 then + '' + rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so + '' + else + '' + rm $out/lib/openjdk/jre/lib/${architecture}/{libjsound,libjsoundalsa,libsplashscreen,libawt*,libfontmanager}.so + rm $out/lib/openjdk/jre/bin/policytool + rm $out/lib/openjdk/bin/{policytool,appletviewer} + '' + )} + '' + + lib.optionalString (!atLeast11) '' + + # Move the JRE to a separate output + mkdir -p $jre/lib/openjdk + mv $out/lib/openjdk/jre $jre/lib/openjdk/jre + mkdir $out/lib/openjdk/jre + lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre + + # Make sure cmm/*.pf are not symlinks: + # https://youtrack.jetbrains.com/issue/IDEA-147272 + rm -rf $out/lib/openjdk/jre/lib/cmm + ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm + + # Setup fallback fonts + ${lib.optionalString (!headless) '' + mkdir -p $jre/lib/openjdk/jre/lib/fonts + ln -s ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback + ''} + + # Remove duplicate binaries. + for i in $(cd $out/lib/openjdk/bin && echo *); do + if [ "$i" = java ]; then continue; fi + if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then + ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i + fi + done + + # Generate certificates. + ( + cd $jre/lib/openjdk/jre/lib/security + rm cacerts + perl ${./8/generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt + ) + '' + + '' + + ln -s $out/lib/openjdk/bin $out/bin + '' + + lib.optionalString (!atLeast11) '' + ln -s $jre/lib/openjdk/jre/bin $jre/bin + ln -s $jre/lib/openjdk/jre $out/jre + ''; + + preFixup = + ( + if atLeast11 then + '' + # 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 + '' + else + '' + # Propagate the setJavaClassPath setup hook from the JRE so that + # any package that depends on the JRE has $CLASSPATH set up + # properly. + mkdir -p $jre/nix-support + printWords ${setJavaClassPath} > $jre/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 {} \+ | ${ + if atLeast17 then "sort -u" else "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 + ''; + + # TODO: The OpenJDK 8 derivation got this wrong. + disallowedReferences = [ + (if atLeast11 then jdk-bootstrap' else jdk-bootstrap) + ]; + + passthru = + { + home = "${finalAttrs.finalPackage}/lib/openjdk"; + inherit jdk-bootstrap; + inherit (source) updateScript; + } + // (if atLeast11 then { inherit gtk3; } else { inherit gtk2; }) + // lib.optionalAttrs (!atLeast23) { + inherit architecture; + }; + + meta = { + description = "Open-source Java Development Kit"; + homepage = "https://openjdk.java.net/"; + license = lib.licenses.gpl2Only; + maintainers = + with lib.maintainers; + [ + edwtjo + infinidoge + ] + ++ lib.teams.java.members; + mainProgram = "java"; + platforms = + [ + "i686-linux" + "x86_64-linux" + "aarch64-linux" + ] + ++ lib.optionals atLeast11 [ + "armv7l-linux" + "armv6l-linux" + "powerpc64le-linux" + ] + ++ lib.optionals atLeast17 [ + "riscv64-linux" + ]; + # OpenJDK 8 was 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 = !atLeast11 && stdenv.hostPlatform.isMusl; + }; +}) diff --git a/pkgs/development/compilers/openjdk/info.json b/pkgs/development/compilers/openjdk/info.json deleted file mode 100644 index d55f95f799ae..000000000000 --- a/pkgs/development/compilers/openjdk/info.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "22": { - "version": "22.0.2-ga", - "repo": "jdk22u", - "hash": "sha256-Zo1LOumkt9zTaPqbDcRL8lVJMqVle0QqzThtIz0JRNo=" - }, - "21": { - "version": "21.0.3-ga", - "repo": "jdk21u", - "hash": "sha256-zRN16lrc5gtDlTVIQJRRx103w/VbRkatCLeEc9AXWPE=" - } -} diff --git a/pkgs/development/compilers/openjdk/make-bootstrap.nix b/pkgs/development/compilers/openjdk/make-bootstrap.nix deleted file mode 100644 index aac54417e2a8..000000000000 --- a/pkgs/development/compilers/openjdk/make-bootstrap.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ runCommand, openjdk, nukeReferences }: - -runCommand "${openjdk.name}-bootstrap.tar.xz" {} '' - mkdir -pv openjdk-bootstrap/lib - - # Do a deep copy of the openjdk - cp -vrL ${openjdk.home} openjdk-bootstrap/lib - - # Includes are needed for building the native jvm - cp -vrL ${openjdk}/include openjdk-bootstrap - - # The binaries are actually stored in the openjdk lib - ln -sv lib/openjdk/bin openjdk-bootstrap/bin - find . -name libjli.so - (cd openjdk-bootstrap/lib; find . -name libjli.so -exec ln -sfv {} libjli.so \;) - - chmod -R +w openjdk-bootstrap - - # Remove components we don't need - find openjdk-bootstrap -name \*.diz -exec rm {} \; - find openjdk-bootstrap -name \*.ttf -exec rm {} \; - find openjdk-bootstrap -name \*.gif -exec rm {} \; - find openjdk-bootstrap -name src.zip -exec rm {} \; - rm -rf openjdk-bootstrap/lib/openjdk/jre/bin - - # Remove all of the references to the native nix store - find openjdk-bootstrap -print0 | xargs -0 ${nukeReferences}/bin/nuke-refs - - # Create the output tarball - tar cv openjdk-bootstrap | xz > $out -'' diff --git a/pkgs/development/compilers/openjdk/meta.nix b/pkgs/development/compilers/openjdk/meta.nix deleted file mode 100644 index 04ed684eefab..000000000000 --- a/pkgs/development/compilers/openjdk/meta.nix +++ /dev/null @@ -1,11 +0,0 @@ -lib: version: with lib; { - homepage = "https://openjdk.java.net/"; - license = licenses.gpl2Only; - description = "Open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo infinidoge ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" "powerpc64le-linux" ]; - mainProgram = "java"; - knownVulnerabilities = optionals (builtins.elem (versions.major version) [ "12" "13" "14" "15" "16" "18" "19" "20" ]) [ - "This OpenJDK version has reached its end of life." - ]; -} diff --git a/pkgs/development/compilers/openjdk/openjfx/11/default.nix b/pkgs/development/compilers/openjdk/openjfx/11/default.nix deleted file mode 100644 index dcce1a2de6fc..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/11/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ stdenv, lib, pkgs, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_7-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 - ../backport-ffmpeg-7-support-jfx11.patch - ]; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7-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 deleted file mode 100644 index 7c8167124430..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/11/deps.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "!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/17/default.nix b/pkgs/development/compilers/openjdk/openjfx/17/default.nix deleted file mode 100644 index de0f50dab7c7..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/17/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ stdenv, lib, pkgs, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 -, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib -, ffmpeg_7-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 - ../backport-ffmpeg-7-support-jfx11.patch - ]; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7-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 deleted file mode 100644 index a9fa40a91be1..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/17/deps.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "!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/21/default.nix b/pkgs/development/compilers/openjdk/openjfx/21/default.nix deleted file mode 100644 index 5eed503cad11..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/21/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ stdenv, lib, pkgs, fetchFromGitHub, writeText -, openjdk21_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst -, libXxf86vm, glib, alsa-lib, ffmpeg_7, 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="; - }; - - patches = [ - ../backport-ffmpeg-7-support-jfx21.patch - ]; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7 ]; - 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 deleted file mode 100644 index ec1816339f40..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/21/deps.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "!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/default.nix b/pkgs/development/compilers/openjdk/openjfx/22/default.nix deleted file mode 100644 index a64cecb8c9b5..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/22/default.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ stdenv -, lib -, pkgs -, fetchFromGitHub -, fetchpatch2 -, writeText -, openjdk21_headless -, gradle -, pkg-config -, perl -, cmake -, gperf -, gtk2 -, gtk3 -, libXtst -, libXxf86vm -, glib -, alsa-lib -, ffmpeg_7 -, python3 -, ruby -, withMedia ? true -, withWebKit ? false -}: - -let - pname = "openjfx-modular-sdk"; - major = "22"; - update = ".0.2"; - 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-7Q9nZ2p3KfQPt1A2ULwk64OU/5/ghEkcsf9ECD6Ln2g="; - }; - - patches = [ - # 8338701: Provide media support for libavcodec version 61 - # <https://github.com/openjdk/jfx/pull/1552> - (fetchpatch2 { - url = "https://github.com/openjdk/jfx/commit/6115b396bacf62f39dcaa93c7c0adcd60b428b8c.patch?full_index=1"; - hash = "sha256-6EES4qsumFgXePZSDEetJC1Li65zquz3UjwRbq/6YJM="; - }) - ]; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7 ]; - 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 deleted file mode 100644 index a5b5a76852bf..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/22/deps.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "!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-74-2/icu4c-74_2-data-bin-l": { - "zip": "sha256-Ks2xuYIigECWPRg7LdnTISUsYT4PTbIT1LvBBBfN5Wk=" - } - }, - "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 deleted file mode 100644 index 2d75ecb9562a..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-6-support-jfx11.patch +++ /dev/null @@ -1,70 +0,0 @@ -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/openjfx/backport-ffmpeg-7-support-jfx11.patch b/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx11.patch deleted file mode 100644 index edd49ddf4a99..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx11.patch +++ /dev/null @@ -1,155 +0,0 @@ -Backported from <https://github.com/openjdk/jfx/pull/1552>. - -Original author: Alexander Matveev <alexander.matveev@oracle.com> - -diff --git a/build.gradle b/build.gradle -index d1ae3b401f..848a385f36 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -3343,6 +3343,7 @@ - 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" -+ media name: "ffmpeg-7.0.2", ext: "tar.gz" - } - implementation project(":base") - implementation project(":graphics") -@@ -3689,8 +3690,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", "6.0" ] -- project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60" ] -+ project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0", "7.0.2" ] -+ project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60", "7.0.2" : "61" ] - - libav.versions.each { version -> - def libavDir = "${libav.basedir}/ffmpeg-${version}" -@@ -3770,7 +3771,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", "60" ] -+ project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60", "61" ] - - 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 b05bb68341..2add519ed4 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 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -126,6 +126,7 @@ - dependencies.add("avplugin-ffmpeg-58"); - dependencies.add("avplugin-ffmpeg-59"); - dependencies.add("avplugin-ffmpeg-60"); -+ dependencies.add("avplugin-ffmpeg-61"); - } - 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 ee64e4bafd..0204db4250 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, 60 }; -+static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60, 61 }; - - /* - * Callback passed to dl_iterate_phdr(): finds the path of -diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h -index bb93df5f96..a09b954714 100644 ---- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h -+++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -50,5 +50,14 @@ - // Do not call avcodec_register_all() and av_register_all() - // Not required since 58 and removed in 59 - #define NO_REGISTER_ALL (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,0,0)) -+ -+// Do not use reordered_opaque to pass PTS. Use AVPacket.pts/AVFrame.pts instead. -+// reordered_opaque is removed since 61. -+#define NO_REORDERED_OPAQUE (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0)) -+ -+// Use AVCodecContext.frame_num instead of AVCodecContext.frame_number. They same -+// except frame_num is 64-bit and frame_number is 32-bit. Since 61. -+#define USE_FRAME_NUM (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0)) -+ - #endif /* AVDEFINES_H */ - -diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c -index fe1f96b9cb..9179ef8b68 100644 ---- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c -+++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c -@@ -397,10 +397,17 @@ - if (av_new_packet(&decoder->packet, info.size) == 0) - { - memcpy(decoder->packet.data, info.data, info.size); -+#if NO_REORDERED_OPAQUE -+ if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) -+ decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf); -+ else -+ decoder->packet.pts = AV_NOPTS_VALUE; -+#else // NO_REORDERED_OPAQUE - if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) - base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf); - else - base->context->reordered_opaque = AV_NOPTS_VALUE; -+#endif // NO_REORDERED_OPAQUE - #if USE_SEND_RECEIVE - num_dec = avcodec_send_packet(base->context, &decoder->packet); - if (num_dec == 0) -@@ -432,10 +439,17 @@ - av_init_packet(&decoder->packet); - decoder->packet.data = info.data; - decoder->packet.size = info.size; -+#if NO_REORDERED_OPAQUE -+ if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) -+ decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf); -+ else -+ decoder->packet.pts = AV_NOPTS_VALUE; -+#else // NO_REORDERED_OPAQUE - if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) - base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf); - else - base->context->reordered_opaque = AV_NOPTS_VALUE; -+#endif // NO_REORDERED_OPAQUE - - #if USE_SEND_RECEIVE - num_dec = avcodec_send_packet(base->context, &decoder->packet); -@@ -480,10 +494,20 @@ - } - else - { -+#if USE_FRAME_NUM -+ GST_BUFFER_OFFSET(outbuf) = base->context->frame_num; -+#else // USE_FRAME_NUM - GST_BUFFER_OFFSET(outbuf) = base->context->frame_number; -+#endif // USE_FRAME_NUM -+#if NO_REORDERED_OPAQUE -+ if (base->frame->pts != AV_NOPTS_VALUE) -+ { -+ GST_BUFFER_TIMESTAMP(outbuf) = base->frame->pts; -+#else // NO_REORDERED_OPAQUE - if (base->frame->reordered_opaque != AV_NOPTS_VALUE) - { - GST_BUFFER_TIMESTAMP(outbuf) = base->frame->reordered_opaque; -+#endif // NO_REORDERED_OPAQUE - GST_BUFFER_DURATION(outbuf) = GST_BUFFER_DURATION(buf); // Duration for video usually same - } - diff --git a/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx21.patch b/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx21.patch deleted file mode 100644 index 3e746b0cab8f..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx21.patch +++ /dev/null @@ -1,213 +0,0 @@ -Backported from <https://github.com/openjdk/jfx/pull/1552>. - -Original author: Alexander Matveev <alexander.matveev@oracle.com> - -diff --git a/build.gradle b/build.gradle -index f9dbc53076..77856226a6 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -2946,6 +2946,7 @@ - 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" -+ media name: "ffmpeg-7.0.2", ext: "tar.gz" - } - implementation project(":base") - implementation project(":graphics") -@@ -3292,8 +3293,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", "6.0" ] -- project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60" ] -+ project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0", "7.0.2" ] -+ project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60", "7.0.2" : "61" ] - - libav.versions.each { version -> - def libavDir = "${libav.basedir}/ffmpeg-${version}" -@@ -3373,7 +3374,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", "60" ] -+ project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60", "61" ] - - project.ext.libav.versions.each { version -> - def libavDir = "${project.ext.libav.basedir}-${version}" -diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml -index 887b9d100c..a10610b0f5 100644 ---- a/gradle/verification-metadata.xml -+++ b/gradle/verification-metadata.xml -@@ -28,6 +28,11 @@ - <sha256 value="f4ccf961403752c93961927715f524576d1f4dd02cd76d8c76aed3bbe6686656" origin="Generated by Gradle"/> - </artifact> - </component> -+ <component group="" name="ffmpeg-7.0.2" version=""> -+ <artifact name="ffmpeg-7.0.2-.tar.gz"> -+ <sha256 value="1233b3a93dd7517cc3c56b72a67f64041c044848d981e3deff4bebffa25f1054" origin="Generated by Gradle"/> -+ </artifact> -+ </component> - <component group="" name="icu4c-73_1-data-bin-l" version=""> - <artifact name="icu4c-73_1-data-bin-l-.zip"> - <sha256 value="4038298ee02a0c38917185ef8ff4ebde9c8b552c777fd03e4df6c6b4b1825e20" origin="Generated by Gradle"/> -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 097004bd17..0c2ae1ddbc 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 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -127,6 +127,7 @@ - dependencies.add("avplugin-ffmpeg-58"); - dependencies.add("avplugin-ffmpeg-59"); - dependencies.add("avplugin-ffmpeg-60"); -+ dependencies.add("avplugin-ffmpeg-61"); - } - if (PlatformUtil.isMac()) { - 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 22c8be9300..38bae197fe 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, 60 }; -+static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60, 61 }; - - /* - * Callback passed to dl_iterate_phdr(): finds the path of -diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h -index 60fa7b631c..f49ad56e1e 100644 ---- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h -+++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -53,5 +53,13 @@ - // Not required since 58 and removed in 59 - #define NO_REGISTER_ALL (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,0,0)) - -+// Do not use reordered_opaque to pass PTS. Use AVPacket.pts/AVFrame.pts instead. -+// reordered_opaque is removed since 61. -+#define NO_REORDERED_OPAQUE (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0)) -+ -+// Use AVCodecContext.frame_num instead of AVCodecContext.frame_number. They same -+// except frame_num is 64-bit and frame_number is 32-bit. Since 61. -+#define USE_FRAME_NUM (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0)) -+ - #endif /* AVDEFINES_H */ - -diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c -index c9fa787e63..8a5cd78f2d 100644 ---- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c -+++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c -@@ -554,7 +554,11 @@ - if (ret < 0) - return FALSE; - -+#if NO_REORDERED_OPAQUE -+ decoder->dest_frame->pts = base->frame->pts; -+#else // NO_REORDERED_OPAQUE - decoder->dest_frame->reordered_opaque = base->frame->reordered_opaque; -+#endif // NO_REORDERED_OPAQUE - - return TRUE; - } -@@ -679,7 +683,7 @@ - GstMapInfo info2; - gboolean unmap_buf = FALSE; - gboolean set_frame_values = TRUE; -- int64_t reordered_opaque = AV_NOPTS_VALUE; -+ int64_t pts = AV_NOPTS_VALUE; - unsigned int out_buf_size = 0; - gboolean copy_error = FALSE; - uint8_t* data0 = NULL; -@@ -711,10 +715,17 @@ - if (av_new_packet(&decoder->packet, info.size) == 0) - { - memcpy(decoder->packet.data, info.data, info.size); -+#if NO_REORDERED_OPAQUE -+ if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) -+ decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf); -+ else -+ decoder->packet.pts = AV_NOPTS_VALUE; -+#else // NO_REORDERED_OPAQUE - if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) - base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf); - else - base->context->reordered_opaque = AV_NOPTS_VALUE; -+#endif // NO_REORDERED_OPAQUE - #if USE_SEND_RECEIVE - num_dec = avcodec_send_packet(base->context, &decoder->packet); - if (num_dec == 0) -@@ -746,10 +757,17 @@ - av_init_packet(&decoder->packet); - decoder->packet.data = info.data; - decoder->packet.size = info.size; -+#if NO_REORDERED_OPAQUE -+ if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) -+ decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf); -+ else -+ decoder->packet.pts = AV_NOPTS_VALUE; -+#else // NO_REORDERED_OPAQUE - if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) - base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf); - else - base->context->reordered_opaque = AV_NOPTS_VALUE; -+#endif // NO_REORDERED_OPAQUE - - #if USE_SEND_RECEIVE - num_dec = avcodec_send_packet(base->context, &decoder->packet); -@@ -796,7 +814,11 @@ - goto _exit; - } - -- reordered_opaque = decoder->dest_frame->reordered_opaque; -+#if NO_REORDERED_OPAQUE -+ pts = decoder->dest_frame->pts; -+#else // NO_REORDERED_OPAQUE -+ pts = decoder->dest_frame->reordered_opaque; -+#endif // NO_REORDERED_OPAQUE - data0 = decoder->dest_frame->data[0]; - data1 = decoder->dest_frame->data[1]; - data2 = decoder->dest_frame->data[2]; -@@ -806,7 +828,11 @@ - - if (set_frame_values) - { -- reordered_opaque = base->frame->reordered_opaque; -+#if NO_REORDERED_OPAQUE -+ pts = base->frame->pts; -+#else // NO_REORDERED_OPAQUE -+ pts = base->frame->reordered_opaque; -+#endif // NO_REORDERED_OPAQUE - data0 = base->frame->data[0]; - data1 = base->frame->data[1]; - data2 = base->frame->data[2]; -@@ -825,10 +851,14 @@ - } - else - { -+#if USE_FRAME_NUM -+ GST_BUFFER_OFFSET(outbuf) = base->context->frame_num; -+#else // USE_FRAME_NUM - GST_BUFFER_OFFSET(outbuf) = base->context->frame_number; -- if (reordered_opaque != AV_NOPTS_VALUE) -+#endif // USE_FRAME_NUM -+ if (pts != AV_NOPTS_VALUE) - { -- GST_BUFFER_TIMESTAMP(outbuf) = reordered_opaque; -+ GST_BUFFER_TIMESTAMP(outbuf) = pts; - GST_BUFFER_DURATION(outbuf) = GST_BUFFER_DURATION(buf); // Duration for video usually same - } - diff --git a/pkgs/development/compilers/opensmalltalk-vm/default.nix b/pkgs/development/compilers/opensmalltalk-vm/default.nix index ef238ebaf306..3ac761b42319 100644 --- a/pkgs/development/compilers/opensmalltalk-vm/default.nix +++ b/pkgs/development/compilers/opensmalltalk-vm/default.nix @@ -118,10 +118,12 @@ let platformDir = "linux64ARMv8"; vmName = "squeak.cog.spur"; scriptName = "squeak"; - configureFlagsArray = ''( - CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -DCOGMTVM=0 -DDUAL_MAPPED_CODE_ZONE=1" - LIBS="-lrt" - )''; + configureFlagsArray = '' + ( + CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -DCOGMTVM=0 -DDUAL_MAPPED_CODE_ZONE=1" + LIBS="-lrt" + ) + ''; configureFlags = [ "--with-vmversion=5.0" "--with-src=src/spur64.cog" @@ -134,9 +136,11 @@ let platformDir = "linux64ARMv8"; vmName = "squeak.stack.spur"; scriptName = "squeak"; - configureFlagsArray = ''( - CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -D__ARM_ARCH_ISA_A64 -DARM64 -D__arm__ -D__arm64__ -D__aarch64__" - )''; + configureFlagsArray = '' + ( + CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -D__ARM_ARCH_ISA_A64 -DARM64 -D__arm__ -D__arm64__ -D__aarch64__" + ) + ''; configureFlags = [ "--with-vmversion=5.0" "--with-src=src/spur64.stack" @@ -151,9 +155,11 @@ let platformDir = "linux64x64"; vmName = "newspeak.cog.spur"; scriptName = "newspeak"; - configureFlagsArray = ''( - CFLAGS="-DNDEBUG -DDEBUGVM=0" - )''; + configureFlagsArray = '' + ( + CFLAGS="-DNDEBUG -DDEBUGVM=0" + ) + ''; configureFlags = [ "--with-vmversion=5.0" "--with-src=src/spur64.cog.newspeak" @@ -166,9 +172,11 @@ let platformDir = "linux64x64"; vmName = "squeak.cog.spur"; scriptName = "squeak"; - configureFlagsArray = ''( - CFLAGS="-DNDEBUG -DDEBUGVM=0 -DCOGMTVM=0" - )''; + configureFlagsArray = '' + ( + CFLAGS="-DNDEBUG -DDEBUGVM=0 -DCOGMTVM=0" + ) + ''; configureFlags = [ "--with-vmversion=5.0" "--with-src=src/spur64.cog" diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/development/compilers/openspin/default.nix deleted file mode 100644 index 5bf0ff64d354..000000000000 --- a/pkgs/development/compilers/openspin/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation { - pname = "openspin"; - version = "unstable-2018-10-02"; - - src = fetchFromGitHub { - owner = "parallaxinc"; - repo = "OpenSpin"; - rev = "f3a587ed3e4f6a50b3c8d2022bbec5676afecedb"; - sha256 = "1knkbzdanb60cwp7mggymkhd0167lh2sb1c00d1vhw7s0s1rj96n"; - }; - - installPhase = '' - mkdir -p $out/bin - mv build/openspin $out/bin/openspin - ''; - - meta = with lib; { - description = "Compiler for SPIN/PASM languages for Parallax Propeller MCU"; - mainProgram = "openspin"; - homepage = "https://github.com/parallaxinc/OpenSpin"; - license = licenses.mit; - maintainers = [ maintainers.redvers ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh deleted file mode 100644 index 459bfce50988..000000000000 --- a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh +++ /dev/null @@ -1,60 +0,0 @@ -source $stdenv/setup - -echo "Unpacking distribution" -unzip ${src} || true - -# set the dynamic linker of unpack200, necessary for construct script -echo "patching unpack200" -patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200 - -echo "constructing JDK and JRE installations" -if test -z "$installjdk"; then - sh ${construct} . tmp-linux-jdk tmp-linux-jre - mkdir -p $out - cp -R tmp-linux-jre/* $out -else - sh ${construct} . $out tmp-linux-jre -fi - -echo "removing files at top level of installation" -for file in $out/* -do - if test -f $file ; then - rm $file - fi -done -rm -rf $out/docs - -# construct the rpath -rpath= -for i in $libraries; do - rpath=$rpath${rpath:+:}$i/lib -done - -if test -z "$installjdk"; then - jrePath=$out -else - jrePath=$out/jre -fi - -if test -n "$jce"; then - unzip $jce - cp -v jce/*.jar $jrePath/lib/security -fi - -rpath=$rpath${rpath:+:}$jrePath/lib/$architecture/jli - -# set all the dynamic linkers -find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$rpath" {} \; - -find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; - -if test -z "$pluginSupport"; then - rm -f $out/bin/javaws -fi - -mkdir $jrePath/lib/$architecture/plugins -ln -s $jrePath/lib/$architecture/libnpjp2.so $jrePath/lib/$architecture/plugins - diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix deleted file mode 100644 index d03419e96570..000000000000 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ /dev/null @@ -1,190 +0,0 @@ -{ productVersion -, patchVersion -, sha256 -, jceName -, sha256JCE -}: - -{ swingSupport ? true -, lib, stdenv -, requireFile -, makeWrapper -, unzip -, file -, xorg ? null -, installjdk ? true -, pluginSupport ? true -, installjce ? false -, config -, glib -, libxml2 -, ffmpeg -, libxslt -, libGL -, freetype -, fontconfig -, gtk2 -, pango -, cairo -, alsa-lib -, atk -, gdk-pixbuf -, setJavaClassPath -}: - -assert swingSupport -> xorg != null; - -let - - /** - * The JRE libraries are in directories that depend on the CPU. - */ - architecture = { - i686-linux = "i386"; - x86_64-linux = "amd64"; - armv7l-linux = "arm"; - aarch64-linux = "aarch64"; - }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); - - jce = - if installjce then - requireFile { - name = jceName; - url = "http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"; - sha256 = sha256JCE; - } - else - ""; - - rSubPaths = [ - "lib/${architecture}/jli" - "lib/${architecture}/server" - "lib/${architecture}/xawt" - "lib/${architecture}" - ]; - -in - -let result = stdenv.mkDerivation rec { - pname = if installjdk then "oraclejdk" else "oraclejre" + lib.optionalString pluginSupport "-with-plugin"; - version = "${productVersion}u${patchVersion}"; - - src = - let - platformName = { - i686-linux = "linux-i586"; - x86_64-linux = "linux-x64"; - armv7l-linux = "linux-arm32-vfp-hflt"; - aarch64-linux = "linux-aarch64"; - }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); - in requireFile { - name = "jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz"; - url = "http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"; - sha256 = sha256.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); - }; - - nativeBuildInputs = [ file makeWrapper ] - ++ lib.optional installjce unzip; - - # See: https://github.com/NixOS/patchelf/issues/10 - dontStrip = 1; - - installPhase = '' - cd .. - - if test -z "$installjdk"; then - mv $sourceRoot/jre $out - else - mv $sourceRoot $out - fi - - shopt -s extglob - for file in $out/!(*src.zip) - do - if test -f $file ; then - rm $file - fi - done - - if test -n "$installjdk"; then - for file in $out/jre/* - do - if test -f $file ; then - rm $file - fi - done - fi - - if test -z "$installjdk"; then - jrePath=$out - else - jrePath=$out/jre - fi - - if test -n "${jce}"; then - unzip ${jce} - cp -v UnlimitedJCEPolicy*/*.jar $jrePath/lib/security - fi - - if test -z "$pluginSupport"; then - rm -f $out/bin/javaws - if test -n "$installjdk"; then - rm -f $out/jre/bin/javaws - fi - fi - - mkdir $jrePath/lib/${architecture}/plugins - ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins - - 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 - ''; - - postFixup = '' - rpath+="''${rpath:+:}${lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}" - - # set all the dynamic linkers - find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$rpath" {} \; - - find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; - - # Oracle Java Mission Control needs to know where libgtk-x11 and related is - if test -n "$installjdk" -a -x $out/bin/jmc; then - wrapProgram "$out/bin/jmc" \ - --suffix-each LD_LIBRARY_PATH ':' "$rpath" - fi - ''; - - inherit installjdk pluginSupport; - - /** - * libXt is only needed on amd64 - */ - libraries = - [stdenv.cc.libc glib libxml2 ffmpeg libxslt libGL xorg.libXxf86vm alsa-lib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ - lib.optionals swingSupport [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc]; - - rpath = lib.strings.makeLibraryPath libraries; - - passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; - - passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package - - passthru.home = result; - - passthru.architecture = architecture; - - meta = with lib; { - license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms - mainProgram = "java"; - }; - -}; in result diff --git a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix b/pkgs/development/compilers/oraclejdk/jdk11-linux.nix deleted file mode 100644 index a232b796a068..000000000000 --- a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, stdenv -, requireFile -, xorg -, zlib -, freetype -, alsa-lib -, setJavaClassPath -}: - -let result = stdenv.mkDerivation rec { - pname = "oraclejdk"; - version = "11.0.10"; - - src = requireFile { - name = "jdk-${version}_linux-x64_bin.tar.gz"; - url = "https://www.oracle.com/java/technologies/javase-jdk11-downloads.html"; - sha256 = "94bd34f85ee38d3ef59e5289ec7450b9443b924c55625661fffe66b03f2c8de2"; - }; - - installPhase = '' - mv ../$sourceRoot $out - - 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 - ''; - - postFixup = '' - rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsa-lib]}" - - for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true - patchelf --set-rpath "$rpath" "$f" || true - done - - for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do - if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi - done - ''; - - passthru.jre = result; - passthru.home = result; - - dontStrip = true; # See: https://github.com/NixOS/patchelf/issues/10 - - meta = with lib; { - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - }; -}; in result diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix deleted file mode 100644 index 206df75b9ebf..000000000000 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ /dev/null @@ -1,10 +0,0 @@ -import ./jdk-linux-base.nix { - productVersion = "8"; - patchVersion = "281"; - sha256.i686-linux = "/yEY5O6MYNyjS5YSGZtgydb8th6jHQLNvI9tNPIh3+0="; - sha256.x86_64-linux = "hejH2nJIx0UPsQVWeniEHQlzWXhQd2wkpSf+sC7z5YY="; - sha256.armv7l-linux = "oXbW8hZxesDqwV79ANB4SdnS71O51ZApKbQhqq4i/EM="; - sha256.aarch64-linux = "oFH3TeIzVsFk6IZcDEHVDVJC7dSbGcwhdUH/WUXSNDM="; - jceName = "jce_policy-8.zip"; - sha256JCE = "19n5wadargg3v8x76r7ayag6p2xz1bwhrgdzjs9f4i6fvxz9jr4w"; -} diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix deleted file mode 100644 index 18b99d5ba69a..000000000000 --- a/pkgs/development/compilers/orc/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, file -, docbook_xsl -, gtk-doc ? null -, buildDevDoc ? gtk-doc != null - -# for passthru.tests -, gnuradio -, gst_all_1 -, qt6 -, vips - -}: let - inherit (lib) optional optionals; -in stdenv.mkDerivation rec { - pname = "orc"; - version = "0.4.39"; - - src = fetchurl { - url = "https://gstreamer.freedesktop.org/src/orc/${pname}-${version}.tar.xz"; - sha256 = "sha256-M+0jh/Sbgl+hucOwBy4F8lkUG4lUdK0IWuURQ9MEDMA="; - }; - - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' - # This benchmark times out on Hydra.nixos.org - sed -i '/memcpy_speed/d' testsuite/meson.build - ''; - - outputs = [ "out" "dev" ] - ++ optional buildDevDoc "devdoc" - ; - outputBin = "dev"; # compilation tools - - mesonFlags = - optionals (!buildDevDoc) [ "-Dgtk_doc=disabled" ] - ; - - nativeBuildInputs = [ meson ninja ] - ++ optionals buildDevDoc [ gtk-doc file docbook_xsl ] - ; - - # https://gitlab.freedesktop.org/gstreamer/orc/-/issues/41 - doCheck = !(stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12"); - - passthru.tests = { - inherit (gst_all_1) gst-plugins-good gst-plugins-bad gst-plugins-ugly; - inherit gnuradio vips; - qt6-qtmultimedia = qt6.qtmultimedia; - }; - - meta = with lib; { - description = "Oil Runtime Compiler"; - homepage = "https://gstreamer.freedesktop.org/projects/orc.html"; - changelog = "https://cgit.freedesktop.org/gstreamer/orc/plain/RELEASE?h=${version}"; - # The source code implementing the Marsenne Twister algorithm is licensed - # under the 3-clause BSD license. The rest is 2-clause BSD license. - license = with licenses; [ bsd3 bsd2 ]; - platforms = platforms.unix; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index b7ad7537c7e1..f485998d1cfa 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "openshadinglanguage"; - version = "1.13.10.0"; + version = "1.13.11.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenShadingLanguage"; rev = "v${version}"; - hash = "sha256-tjfg9cGbfL0D+KcxtWgQF6gY9sCjxEjyGNxFZyPhJ/U="; + hash = "sha256-E/LUTtT0ZU0SBuwtJPA0FznvOuc2a3aJn2/n3ru5l0s="; }; cmakeFlags = [ @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { python3.pkgs.pybind11 util-linux # needed just for hexdump zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libxml2 ]; diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix deleted file mode 100644 index 86b7242c31dd..000000000000 --- a/pkgs/development/compilers/owl-lisp/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, which }: - -stdenv.mkDerivation rec { - pname = "owl-lisp"; - version = "0.2.2"; - - src = fetchFromGitLab { - owner = "owl-lisp"; - repo = "owl"; - rev = "v${version}"; - hash = "sha256-GfvOkYLo8fgAvGuUa59hDy+sWJSwyntwqMO8TAK/lUo="; - }; - - nativeBuildInputs = [ which ]; - - makeFlags = [ "PREFIX=${placeholder "out"}" "CC=${stdenv.cc.targetPrefix}cc" ]; - - # tests are run as part of the compilation process - doCheck = false; - - meta = with lib; { - description = "Functional Scheme for world domination"; - homepage = "https://gitlab.com/owl-lisp/owl"; - license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/compilers/paco/default.nix b/pkgs/development/compilers/paco/default.nix deleted file mode 100644 index 8fa27994ec3d..000000000000 --- a/pkgs/development/compilers/paco/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: - -buildGoModule rec { - pname = "paco"; - version = "1.0"; - - src = fetchFromGitHub { - owner = "pacolang"; - repo = "paco"; - rev = "v${version}"; - hash = "sha256-sCU7cjmsUTrhf/7Lm3wBPKwk80SAhCfc4lrCBggspw8="; - }; - - vendorHash = "sha256-J0TKp1df5IWq3Irlzf1lvhWlXnP//MsVqs9M8TtEraw="; - - patches = [ - # Set correct package path in go.mod - (fetchpatch { - url = "https://github.com/pacolang/paco/pull/1/commits/886f0407e94418d34c7e062c6857834aea3c99ac.patch"; - hash = "sha256-HRNJSyWz1OY+kCV+eaRJbaDXkH4n1NaMpFxCuEhocK4="; - }) - ]; - - subPackages = [ "." ]; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Simple compiled programming language"; - mainProgram = "paco"; - homepage = "https://github.com/pacolang/paco"; - license = licenses.mit; - maintainers = with maintainers; [ hugolgst ]; - }; -} diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 768d125cfff4..625bab0cab31 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -1,32 +1,43 @@ -{ lib, stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, fetchpatch2, makeWrapper , haskellPackages, haskell -, which, swiProlog, rlwrap, tk +, which, swi-prolog, rlwrap, tk , curl, git, unzip, gnutar, coreutils, sqlite }: let pname = "pakcs"; - version = "3.6.0"; + version = "3.7.2"; # Don't switch to "Current release" without a reason, because its # source updates without version bump. Prefer last from "Older releases" instead. src = fetchurl { url = "https://www.informatik.uni-kiel.de/~pakcs/download/pakcs-${version}-src.tar.gz"; - hash = "sha256-1r6jEY3eEGESKcAepiziVbxpIvQLtCS6l0trBU3SGGo="; + hash = "sha256-ZfQUgFqmPPCeDx/T5G/JdvYDq/7XbvsgxPcEX4y9HZ4="; }; curry-frontend = (haskellPackages.override { overrides = self: super: { - curry-frontend = haskell.lib.compose.overrideCabal (drv: { - inherit src; - postUnpack = "sourceRoot+=/frontend"; - }) (super.callPackage ./curry-frontend.nix { }); + curry-frontend = lib.pipe (super.callPackage ./curry-frontend.nix { }) + [ haskell.lib.doJailbreak + (haskell.lib.compose.overrideCabal (drv: { + inherit src; + postUnpack = "sourceRoot+=/frontend"; + })) + (haskell.lib.compose.appendPatch + # mtl 2.3 compatibility has been fixed upstream but it's not in + # the release yet + (fetchpatch2 { + name = "fix-mtl-2.3.patch"; + url = "https://git.ps.informatik.uni-kiel.de/curry/curry-frontend/-/commit/3b26d2826141fee676da07939c2929a049279b70.diff"; + hash = "sha256-R3XjoUzAwTvDoUEAIIjmrSh2r4RHMqe00RMIs+7jFPY="; + })) + ]; }; }).curry-frontend; in stdenv.mkDerivation { inherit pname version src; - buildInputs = [ swiProlog ]; + buildInputs = [ swi-prolog ]; nativeBuildInputs = [ which makeWrapper ]; makeFlags = [ diff --git a/pkgs/development/compilers/passerine/default.nix b/pkgs/development/compilers/passerine/default.nix deleted file mode 100644 index 990d6ff078b2..000000000000 --- a/pkgs/development/compilers/passerine/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "passerine"; - version = "0.9.3"; - - src = fetchFromGitHub { - owner = "vrtbl"; - repo = "passerine"; - rev = "v${version}"; - hash = "sha256-TrbcULIJ9+DgQ4QsLYD5okxHoIusGJDw1PqJQwq1zu0="; - }; - - cargoHash = "sha256-A+sOT0rloAktDdVXe2HEPK25euh9T7c0rXybZmZpqC0="; - - meta = with lib; { - description = "Small extensible programming language designed for concise expression with little code"; - mainProgram = "passerine"; - homepage = "https://www.passerine.io/"; - license = licenses.mit; - maintainers = with maintainers; [ siraben ]; - }; -} diff --git a/pkgs/development/compilers/picat/default.nix b/pkgs/development/compilers/picat/default.nix deleted file mode 100644 index 04c80884670d..000000000000 --- a/pkgs/development/compilers/picat/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchurl, zlib }: - -let - ARCH = { - x86_64-linux = "linux64"; - aarch64-linux = "linux64"; - x86_64-cygwin = "cygwin64"; - x86_64-darwin = "mac64"; - aarch64-darwin = "mac64"; - }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); -in -stdenv.mkDerivation { - pname = "picat"; - version = "3.6#8"; - - src = fetchurl { - url = "http://picat-lang.org/download/picat368_src.tar.gz"; - hash = "sha256-eJxF5atvJq3fhFltcQCGTP/sgUmfsfCohUgm3x2U1n0="; - }; - - buildInputs = [ zlib ]; - - inherit ARCH; - - hardeningDisable = [ "format" ]; - enableParallelBuilding = true; - - buildPhase = '' - cd emu - make -j $NIX_BUILD_CORES -f Makefile.$ARCH - ''; - installPhase = '' - mkdir -p $out/bin $out/share - cp picat $out/bin/ - cp -r ../doc $out/share/doc - cp -r ../exs $out/share/examples - ''; - - meta = with lib; { - description = "Logic-based programming language"; - mainProgram = "picat"; - homepage = "http://picat-lang.org/"; - license = licenses.mpl20; - platforms = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-cygwin" - "x86_64-darwin" - "aarch64-darwin" - ]; - maintainers = with maintainers; [ earldouglas thoughtpolice ]; - }; -} diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix index bcd52380701a..ee841882833c 100644 --- a/pkgs/development/compilers/polyml/5.6.nix +++ b/pkgs/development/compilers/polyml/5.6.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { pname = "polyml"; inherit version; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ ''; @@ -20,7 +20,7 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook; src = fetchurl { url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz"; diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix index f48377e0e0ac..471e8b2fd9f1 100644 --- a/pkgs/development/compilers/polyml/5.7.nix +++ b/pkgs/development/compilers/polyml/5.7.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "polyml"; version = "5.7.1"; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ ''; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ libffi gmp ]; - nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook; configureFlags = [ "--enable-shared" @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { platforms = with platforms; (linux ++ darwin); maintainers = with maintainers; [ maggesi ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index c82a88bb2793..067bdd018f27 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-72wm8dt+Id59A5058mVE5P9TkXW5/LZRthZoxUustVA="; }; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ ''; buildInputs = [ libffi gmp ]; - nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook; configureFlags = [ "--enable-shared" diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index b10739ca3363..1b3b24b0abea 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (rec { }; nativeBuildInputs = [ cmake makeWrapper which python3 ] - ++ lib.optionals (stdenv.isDarwin) [ cctools ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ cctools ]; buildInputs = [ libxml2 z3 ]; # Sandbox disallows network access, so disabling problematic networking tests @@ -53,7 +53,7 @@ stdenv.mkDerivation (rec { hash = "sha256-/FWBSxZESwj/QvdNK5BI2EfonT64DP1eGBZR4O8uJww="; }; }) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (substituteAll { src = ./fix-darwin-build.patch; libSystem = darwin.Libsystem; @@ -85,21 +85,22 @@ stdenv.mkDerivation (rec { makeFlags = [ "PONYC_VERSION=${version}" "prefix=${placeholder "out"}" - ] ++ lib.optionals stdenv.isDarwin ([ "bits=64" ] ++ lib.optional (!lto) "lto=no"); + ] ++ lib.optionals stdenv.hostPlatform.isDarwin ([ "bits=64" ] ++ lib.optional (!lto) "lto=no"); env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ]; # make: *** [Makefile:222: test-full-programs-release] Killed: 9 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; - installPhase = "make config=release prefix=$out " - + lib.optionalString stdenv.isDarwin ("bits=64 " + (lib.optionalString (!lto) "lto=no ")) - + '' install + installPhase = '' + make config=release prefix=$out ${ + lib.optionalString stdenv.hostPlatform.isDarwin ("bits=64 " + (lib.optionalString (!lto) "lto=no ")) + } install wrapProgram $out/bin/ponyc \ - --prefix PATH ":" "${stdenv.cc}/bin" \ - --set-default CC "$CC" \ - --prefix PONYPATH : "${lib.makeLibraryPath [ pcre2 openssl (placeholder "out") ]}" - ''; + --prefix PATH ":" "${stdenv.cc}/bin" \ + --set-default CC "$CC" \ + --prefix PONYPATH : "${lib.makeLibraryPath [ pcre2 openssl (placeholder "out") ]}" + ''; # Stripping breaks linking for ponyc dontStrip = true; diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix deleted file mode 100644 index f0664df84dfe..000000000000 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -# Based on https://github.com/justinwoo/easy-purescript-nix/blob/master/psc-package-simple.nix -{ stdenv, lib, fetchurl, gmp, zlib, libiconv, darwin, installShellFiles }: - -let - dynamic-linker = stdenv.cc.bintools.dynamicLinker; - -in -stdenv.mkDerivation rec { - pname = "psc-package-simple"; - - version = "0.6.2"; - - src = if stdenv.isDarwin - then fetchurl { - url = "https://github.com/purescript/psc-package/releases/download/v0.6.2/macos.tar.gz"; - sha256 = "17dh3bc5b6ahfyx0pi6n9qnrhsyi83qdynnca6k1kamxwjimpcq1"; - } - else fetchurl { - url = "https://github.com/purescript/psc-package/releases/download/v0.6.2/linux64.tar.gz"; - sha256 = "1zvay9q3xj6yd76w6qyb9la4jaj9zvpf4dp78xcznfqbnbhm1a54"; - }; - - buildInputs = [ gmp zlib ]; - nativeBuildInputs = [ installShellFiles ]; - - libPath = lib.makeLibraryPath buildInputs; - - dontStrip = true; - - installPhase = '' - mkdir -p $out/bin - - PSC_PACKAGE=$out/bin/psc-package - - install -D -m555 -T psc-package $PSC_PACKAGE - chmod u+w $PSC_PACKAGE - '' + lib.optionalString stdenv.isDarwin '' - install_name_tool \ - -change /usr/lib/libSystem.B.dylib ${darwin.Libsystem}/lib/libSystem.B.dylib \ - -change /usr/lib/libiconv.2.dylib ${libiconv}/libiconv.2.dylib \ - $PSC_PACKAGE - '' + lib.optionalString (!stdenv.isDarwin) '' - patchelf --interpreter ${dynamic-linker} --set-rpath ${libPath} $PSC_PACKAGE - '' + '' - chmod u-w $PSC_PACKAGE - - installShellCompletion --cmd psc-package \ - --bash <($PSC_PACKAGE --bash-completion-script $PSC_PACKAGE) \ - --fish <($PSC_PACKAGE --fish-completion-script $PSC_PACKAGE) \ - --zsh <($PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE) - ''; - - meta = with lib; { - description = "Package manager for PureScript based on package sets"; - mainProgram = "psc-package"; - license = licenses.bsd3; - maintainers = [ ]; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 61a8c3a5c5bd..8f88fed052ee 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -7,7 +7,7 @@ let dynamic-linker = stdenv.cc.bintools.dynamicLinker; patchelf = libPath : - lib.optionalString (!stdenv.isDarwin) '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' chmod u+w $PURS patchelf --interpreter ${dynamic-linker} --set-rpath ${libPath} $PURS chmod u-w $PURS diff --git a/pkgs/development/compilers/qbe/001-dont-hardcode-tmp.patch b/pkgs/development/compilers/qbe/001-dont-hardcode-tmp.patch deleted file mode 100644 index 556dc5aab2a6..000000000000 --- a/pkgs/development/compilers/qbe/001-dont-hardcode-tmp.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/minic/mcc b/minic/mcc -index 492947e..5258aac 100755 ---- a/minic/mcc -+++ b/minic/mcc -@@ -31,9 +31,9 @@ then - fi - - --$DIR/minic < $file > /tmp/minic.ssa && --$QBE < /tmp/minic.ssa > /tmp/minic.s && --cc /tmp/minic.s $flags -+$DIR/minic < $file > ${TMPDIR:-/tmp}/minic.ssa && -+$QBE < ${TMPDIR:-/tmp}/minic.ssa > ${TMPDIR:-/tmp}/minic.s && -+cc ${TMPDIR:-/tmp}/minic.s $flags - - if test $? -ne 0 - then -diff --git a/tools/cra.sh b/tools/cra.sh -index 5988267..57a4b34 100755 ---- a/tools/cra.sh -+++ b/tools/cra.sh -@@ -2,7 +2,7 @@ - - DIR=`cd $(dirname "$0"); pwd` - QBE=$DIR/../qbe --BUGF=/tmp/bug.id -+BUGF=${TMPDIR:-/tmp}/bug.id - FIND=$1 - FIND=${FIND:-afl-find} - -diff --git a/tools/test.sh b/tools/test.sh -index 23c6663..fb36222 100755 ---- a/tools/test.sh -+++ b/tools/test.sh -@@ -4,7 +4,7 @@ dir=`dirname "$0"` - bin=$dir/../qbe - binref=$dir/../qbe.ref - --tmp=/tmp/qbe.zzzz -+tmp=${TMPDIR:-/tmp}/qbe.zzzz - - drv=$tmp.c - asm=$tmp.s diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix deleted file mode 100644 index f37de57b535e..000000000000 --- a/pkgs/development/compilers/qbe/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchzip -, callPackage -}: -stdenv.mkDerivation (finalAttrs: { - pname = "qbe"; - version = "1.2"; - - src = fetchzip { - url = "https://c9x.me/compile/release/qbe-${finalAttrs.version}.tar.xz"; - hash = "sha256-UgtJnZF/YtD54OBy9HzGRAEHx5tC9Wo2YcUidGwrv+s="; - }; - - makeFlags = [ - "PREFIX=$(out)" - "CC=${stdenv.cc.targetPrefix}cc" - ]; - - doCheck = true; - - enableParallelBuilding = true; - - patches = [ - # Use "${TMPDIR:-/tmp}" instead of the latter directly - # see <https://lists.sr.ht/~mpu/qbe/patches/49613> - ./001-dont-hardcode-tmp.patch - ]; - - passthru = { - tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix { }; - }; - - meta = with lib; { - homepage = "https://c9x.me/compile/"; - description = "Small compiler backend written in C"; - maintainers = with maintainers; [ fgaz ]; - license = licenses.mit; - platforms = platforms.all; - mainProgram = "qbe"; - }; -}) diff --git a/pkgs/development/compilers/qbe/test-can-run-hello-world.nix b/pkgs/development/compilers/qbe/test-can-run-hello-world.nix deleted file mode 100644 index 5192bb881f34..000000000000 --- a/pkgs/development/compilers/qbe/test-can-run-hello-world.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv -, writeText -, qbe -}: - -# The hello world program available at https://c9x.me/compile/ -let helloWorld = writeText "hello-world.ssa" '' - function w $add(w %a, w %b) { # Define a function add - @start - %c =w add %a, %b # Adds the 2 arguments - ret %c # Return the result - } - export function w $main() { # Main function - @start - %r =w call $add(w 1, w 1) # Call add(1, 1) - call $printf(l $fmt, w %r, ...) # Show the result - ret 0 - } - data $fmt = { b "One and one make %d!\n", b 0 } -''; - -in stdenv.mkDerivation { - name = "qbe-test-can-run-hello-world"; - meta.timeout = 10; - buildCommand = '' - ${qbe}/bin/qbe -o asm.s ${helloWorld} - cc -o out asm.s - ./out | grep 'One and one make 2!' - touch $out - ''; -} - diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 19eec9d5db40..99c0b6a99a25 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-reason"; - version = "3.12.0"; + version = "3.13.0"; src = fetchurl { url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz"; - hash = "sha256-Y9lQr/viA3AaPUwHaidQtWIRuucBfNj1naUI77CaGv4="; + hash = "sha256-3yVEYGvIJKZwguIBGCbnoc3nrwzLW6RX6Tf+AYw85+Q="; }; strictDeps = true; diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix deleted file mode 100644 index 872dcae2e132..000000000000 --- a/pkgs/development/compilers/rgbds/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{lib, stdenv, fetchFromGitHub, bison, flex, pkg-config, libpng}: - -stdenv.mkDerivation rec { - pname = "rgbds"; - version = "0.8.0"; - src = fetchFromGitHub { - owner = "gbdev"; - repo = "rgbds"; - rev = "v${version}"; - hash = "sha256-rSPYnbZjCoAKJBNCJCKsLBenolOzS78Zm850BJ8mKhA="; - }; - nativeBuildInputs = [ bison flex pkg-config ]; - buildInputs = [ libpng ]; - postPatch = '' - patchShebangs --host src/bison.sh - ''; - installFlags = [ "PREFIX=${placeholder "out"}" ]; - - meta = with lib; { - homepage = "https://rgbds.gbdev.io/"; - description = "Free assembler/linker package for the Game Boy and Game Boy Color"; - license = licenses.mit; - longDescription = - ''RGBDS (Rednex Game Boy Development System) is a free assembler/linker package for the Game Boy and Game Boy Color. It consists of: - - - rgbasm (assembler) - - rgblink (linker) - - rgbfix (checksum/header fixer) - - rgbgfx (PNG‐to‐Game Boy graphics converter) - - This is a fork of the original RGBDS which aims to make the programs more like other UNIX tools. - ''; - maintainers = with maintainers; [ matthewbauer NieDzejkob ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/roslyn/default.nix b/pkgs/development/compilers/roslyn/default.nix deleted file mode 100644 index 6ab2799f46c4..000000000000 --- a/pkgs/development/compilers/roslyn/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib -, fetchFromGitHub -, mono -, buildDotnetModule -, dotnetCorePackages -, unzip -}: - -buildDotnetModule rec { - pname = "roslyn"; - version = "4.2.0"; - - src = fetchFromGitHub { - owner = "dotnet"; - repo = "roslyn"; - rev = "v${version}"; - hash = "sha256-4iXabFp0LqJ8TXOrqeD+oTAocg6ZTIfijfX3s3fMJuI="; - }; - - dotnet-sdk = dotnetCorePackages.sdk_6_0; - - projectFile = [ "src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj" ]; - - nugetDeps = ./deps.nix; - - dontDotnetFixup = true; - - nativeBuildInputs = [ unzip ]; - - postPatch = '' - sed -i 's/latestPatch/latestFeature/' global.json - ''; - - buildPhase = '' - runHook preBuild - - dotnet msbuild -v:m -t:pack \ - -p:Configuration=Release \ - -p:RepositoryUrl="${meta.homepage}" \ - -p:RepositoryCommit="v${version}" \ - src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj - - runHook postBuild - ''; - - installPhase = '' - pkg="$out/lib/dotnet/microsoft.net.compilers.toolset/${version}" - mkdir -p "$out/bin" "$pkg" - - unzip -q artifacts/packages/Release/Shipping/Microsoft.Net.Compilers.Toolset.${version}-dev.nupkg \ - -d "$pkg" - # nupkg has 0 permissions for a bunch of things - chmod -R +rw "$pkg" - - makeWrapper ${mono}/bin/mono $out/bin/csc \ - --add-flags "$pkg/tasks/net472/csc.exe" - makeWrapper ${mono}/bin/mono $out/bin/vbc \ - --add-flags "$pkg/tasks/net472/vbc.exe" - ''; - - meta = with lib; { - description = ".NET C# and Visual Basic compiler"; - homepage = "https://github.com/dotnet/roslyn"; - mainProgram = "csc"; - license = licenses.mit; - maintainers = with maintainers; [ corngood ]; - }; -} diff --git a/pkgs/development/compilers/roslyn/deps.nix b/pkgs/development/compilers/roslyn/deps.nix deleted file mode 100644 index 9362f8aab133..000000000000 --- a/pkgs/development/compilers/roslyn/deps.nix +++ /dev/null @@ -1,175 +0,0 @@ -# This file was automatically generated by passthru.fetch-deps. -# Please dont edit it manually, your changes might get overwritten! - -{ fetchNuGet }: [ - (fetchNuGet { pname = "dotnet-format"; version = "6.2.315104"; sha256 = "0b802r9xbxibds3dj57ywzl377kyi2h4cmy1iajp82kqbd4707cl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/dotnet-format/6.2.315104/dotnet-format.6.2.315104.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/3.1.10/microsoft.aspnetcore.app.ref.3.1.10.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "3.1.32"; sha256 = "00ha2sl4gvqv68mbrsizd6ngqy0vv6vamngzjxr338k1w7a276dx"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-arm64/3.1.32/microsoft.aspnetcore.app.runtime.linux-arm64.3.1.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.32"; sha256 = "0ywz63q8vrdp25ix2j9b7h2jp5grc68hqfl64c6lqk26q9xwhp9r"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-x64/3.1.32/microsoft.aspnetcore.app.runtime.linux-x64.3.1.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "3.1.32"; sha256 = "1crk54a1wvj76s9gnh46pi7wk8ryympm9xh2jq4s4rpp329fqgic"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/3.1.32/microsoft.aspnetcore.app.runtime.osx-x64.3.1.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "16.5.0"; sha256 = "1xgr02r7s9i6s70n237hss4yi9zicssia3zd2ny6s8vyxb7jpdyb"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/16.5.0/microsoft.build.framework.16.5.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "16.5.0"; sha256 = "08mpdcnjbjpsggfzb3plpmjg1jhx2j4zslm8m2p3icnrpw8swxz4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/16.5.0/microsoft.build.tasks.core.16.5.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.2.0-beta-22167-02"; sha256 = "1zb5vhlc9kzqbw22hg84hakhqms0aa7ghy585229hsf278rfh2sy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.tasks.git/1.2.0-beta-22167-02/microsoft.build.tasks.git.1.2.0-beta-22167-02.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "16.5.0"; sha256 = "127l700qqky1nfrljncrpk7y4f0qi0811kpk2j87659nnv81bxs7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/16.5.0/microsoft.build.utilities.core.16.5.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/3.3.3/microsoft.codeanalysis.analyzers.3.3.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.4-beta1.22160.2"; sha256 = "1g95w9jbwg74f04dif3wbdbcigrx5rwv1ng4g102970l1lbx898b"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49e5305d-d845-4a14-9d69-6f5dbfb9570c/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/3.3.4-beta1.22160.2/microsoft.codeanalysis.bannedapianalyzers.3.3.4-beta1.22160.2.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/3.8.0/microsoft.codeanalysis.common.3.8.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "6.0.0-rc1.21366.2"; sha256 = "18svr40y7c0gv68hv9g9fzd9f8hm7bqwygrwvax3i8cajbfwmzp4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.codeanalysis.netanalyzers/6.0.0-rc1.21366.2/microsoft.codeanalysis.netanalyzers.6.0.0-rc1.21366.2.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers"; version = "3.3.4-beta1.22160.2"; sha256 = "01jaajr4qmc70dwixzrxyh638wkf5s33hm0km4lwrw4n5j1xivp1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/e31c6eea-0277-49f3-8194-142be67a9f72/nuget/v3/flat2/microsoft.codeanalysis.performancesensitiveanalyzers/3.3.4-beta1.22160.2/microsoft.codeanalysis.performancesensitiveanalyzers.3.3.4-beta1.22160.2.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.PublicApiAnalyzers"; version = "3.3.4-beta1.22160.2"; sha256 = "0ih091ls51x5k9q998g14pfy4r3g1ygvzihj1gkrl79wydn7b0n3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49e5305d-d845-4a14-9d69-6f5dbfb9570c/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.3.4-beta1.22160.2/microsoft.codeanalysis.publicapianalyzers.3.3.4-beta1.22160.2.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.csharp/4.7.0/microsoft.csharp.4.7.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.DiaSymReader.Native"; version = "17.0.0-beta1.21524.1"; sha256 = "0gash3xgzvcb78w2xqv003l0cld199zpfilnjbagwbr5ikdh6f3s"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diasymreader.native/17.0.0-beta1.21524.1/microsoft.diasymreader.native.17.0.0-beta1.21524.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.DotNet.Arcade.Sdk"; version = "7.0.0-beta.22171.2"; sha256 = "15y26skavivkwhnpfa984if3cnpnllbbwbdsjiyfdcalp32fhmjq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/7.0.0-beta.22171.2/microsoft.dotnet.arcade.sdk.7.0.0-beta.22171.2.nupkg"; }) - (fetchNuGet { pname = "Microsoft.DotNet.XliffTasks"; version = "1.0.0-beta.22169.1"; sha256 = "12fcin3d4m0lawla9fflz9f2qispzgvzf1mwkpscmlk5lnvb0riw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/1.0.0-beta.22169.1/microsoft.dotnet.xlifftasks.1.0.0-beta.22169.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Net.Compilers.Toolset"; version = "4.2.0-1.final"; sha256 = "02zas22hj29gv2w7h74q786i0cvxffgwqai21ri0zj41nb2hwhyq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.compilers.toolset/4.2.0-1.final/microsoft.net.compilers.toolset.4.2.0-1.final.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "3.1.32"; sha256 = "1zygp70xrk5zggs3q4a6yc6jfdwzcsjjsapqpwn6qyx35m69b72p"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/3.1.32/microsoft.netcore.app.host.linux-arm64.3.1.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.32"; sha256 = "08sar3s7j6z1q5prjmz2jrbsq5ms81mrsi1c1zbfrkplkfjpld3a"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.32/microsoft.netcore.app.host.linux-x64.3.1.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.32"; sha256 = "186gjn8sbhp4z6pq8fw4g8nqk9dwyaplwvdz2y3fbbvg36lggsh0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-x64/3.1.32/microsoft.netcore.app.host.osx-x64.3.1.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/3.1.0/microsoft.netcore.app.ref.3.1.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "3.1.32"; sha256 = "13pcn74z1swz73s72zjl07f118j35wacnzgk7kbjqn83nwgqdgvq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-arm64/3.1.32/microsoft.netcore.app.runtime.linux-arm64.3.1.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.32"; sha256 = "0mmc57dl8plrspdxwb7209wz29vhiwqds4nfbdfws7zg35yy70c7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-x64/3.1.32/microsoft.netcore.app.runtime.linux-x64.3.1.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "3.1.32"; sha256 = "06bk39zcv27cwshjsxfg5d6wzkkzdhfk08sipdc7mr1s8pk7ihi1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-x64/3.1.32/microsoft.netcore.app.runtime.osx-x64.3.1.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.1.1/microsoft.netcore.platforms.1.1.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/5.0.0/microsoft.netcore.platforms.5.0.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.2"; sha256 = "0i42rn8xmvhn08799manpym06kpw89qy9080myyy2ngy565pqh0a"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies/1.0.2/microsoft.netframework.referenceassemblies.1.0.2.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.2"; sha256 = "1dny43jksy6dm9zrkdm8j80gb25w6wdvjlxnphj7ngf0fbg3dd2c"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies.net472/1.0.2/microsoft.netframework.referenceassemblies.net472.1.0.2.nupkg"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.AzureRepos.Git"; version = "1.2.0-beta-22167-02"; sha256 = "1mqzajvp0xa8smhilrakp9nr18r2lbqgn0jb79443srvjf93f6sl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.sourcelink.azurerepos.git/1.2.0-beta-22167-02/microsoft.sourcelink.azurerepos.git.1.2.0-beta-22167-02.nupkg"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.2.0-beta-22167-02"; sha256 = "1s4x6syw1vfs0wrlyjvf5n7xiqgqnyv9cmmnaxzmx41f7zydirj6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.sourcelink.common/1.2.0-beta-22167-02/microsoft.sourcelink.common.1.2.0-beta-22167-02.nupkg"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.2.0-beta-22167-02"; sha256 = "0zwc5sxvcz26rcyirrbd55cnz1v7s0njlj91jk3rdjxw6aw2bgnr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.sourcelink.github/1.2.0-beta-22167-02/microsoft.sourcelink.github.1.2.0-beta-22167-02.nupkg"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "1.16.30"; sha256 = "14022lx03vdcqlvbbdmbsxg5pqfx1rfq2jywxlyaz9v68cvsb0g4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/1.16.30/microsoft.visualstudio.setup.configuration.interop.1.16.30.nupkg"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.2.20-alpha"; sha256 = "199690hc75yb01npwjwb7mdch0syrczcxyx6mphm1hn2cm108qax"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.2.20-alpha/microsoft.visualstudio.threading.analyzers.17.2.20-alpha.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.registry/4.3.0/microsoft.win32.registry.4.3.0.nupkg"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg"; }) - (fetchNuGet { pname = "PowerShell"; version = "7.0.0"; sha256 = "13jhnbh12rcmdrkmlxq45ard03lmfq7bg14xg7k108jlpnpsr1la"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/powershell/7.0.0/powershell.7.0.0.nupkg"; }) - (fetchNuGet { pname = "RichCodeNav.EnvVarDump"; version = "0.1.1643-alpha"; sha256 = "1pp1608xizvv0h9q01bqy7isd3yzb3lxb2yp27j4k25xsvw460vg"; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/58ca65bb-e6c1-4210-88ac-fa55c1cd7877/nuget/v3/flat2/richcodenav.envvardump/0.1.1643-alpha/richcodenav.envvardump.0.1.1643-alpha.nupkg"; }) - (fetchNuGet { pname = "Roslyn.Diagnostics.Analyzers"; version = "3.3.4-beta1.22160.2"; sha256 = "0rr7q46vc5lbywm3mf4ld1kjkg9w7fbmkkyka0bi8idrfib7kn0i"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49e5305d-d845-4a14-9d69-6f5dbfb9570c/nuget/v3/flat2/roslyn.diagnostics.analyzers/3.3.4-beta1.22160.2/roslyn.diagnostics.analyzers.3.3.4-beta1.22160.2.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.diagnostics.tracing/4.3.0/runtime.any.system.diagnostics.tracing.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.globalization/4.3.0/runtime.any.system.globalization.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.globalization.calendars/4.3.0/runtime.any.system.globalization.calendars.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.io/4.3.0/runtime.any.system.io.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.reflection/4.3.0/runtime.any.system.reflection.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.reflection.primitives/4.3.0/runtime.any.system.reflection.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.resources.resourcemanager/4.3.0/runtime.any.system.resources.resourcemanager.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime/4.3.0/runtime.any.system.runtime.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime.handles/4.3.0/runtime.any.system.runtime.handles.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime.interopservices/4.3.0/runtime.any.system.runtime.interopservices.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.text.encoding/4.3.0/runtime.any.system.text.encoding.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.text.encoding.extensions/4.3.0/runtime.any.system.text.encoding.extensions.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.threading.tasks/4.3.0/runtime.any.system.threading.tasks.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.net.http/4.3.0/runtime.native.system.net.http.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography.apple/4.3.0/runtime.native.system.security.cryptography.apple.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography.openssl/4.3.2/runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.microsoft.win32.primitives/4.3.0/runtime.unix.microsoft.win32.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.diagnostics.debug/4.3.0/runtime.unix.system.diagnostics.debug.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.io.filesystem/4.3.0/runtime.unix.system.io.filesystem.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.net.primitives/4.3.0/runtime.unix.system.net.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.private.uri/4.3.0/runtime.unix.system.private.uri.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.runtime.extensions/4.3.0/runtime.unix.system.runtime.extensions.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.3.0/system.buffers.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.5.1/system.buffers.4.5.1.nupkg"; }) - (fetchNuGet { pname = "System.CodeDom"; version = "4.4.0"; sha256 = "1zgbafm5p380r50ap5iddp11kzhr9khrf2pnai6k593wjar74p1g"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.codedom/4.4.0/system.codedom.4.4.0.nupkg"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.0.11/system.collections.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.3.0/system.collections.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.concurrent/4.0.12/system.collections.concurrent.4.0.12.nupkg"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.concurrent/4.3.0/system.collections.concurrent.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/1.5.0/system.collections.immutable.1.5.0.nupkg"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.diagnosticsource/4.3.0/system.diagnostics.diagnosticsource.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.1.0/system.diagnostics.tracing.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.0.11/system.globalization.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.3.0/system.globalization.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization.calendars/4.3.0/system.globalization.calendars.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization.extensions/4.3.0/system.globalization.extensions.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.1.0/system.io.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.3.0/system.io.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.IO.Pipes.AccessControl"; version = "5.0.0"; sha256 = "0jl5b95cy8biivi1kdn2wi0gy2m1a0gyj8fy88djybrg2705c8fz"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipes.accesscontrol/5.0.0/system.io.pipes.accesscontrol.5.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.1.0/system.linq.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.3.0/system.linq.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Linq.Parallel"; version = "4.0.1"; sha256 = "0i33x9f4h3yq26yvv6xnq4b0v51rl5z8v1bm7vk972h5lvf4apad"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq.parallel/4.0.1/system.linq.parallel.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.5.4/system.memory.4.5.4.nupkg"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.http/4.3.4/system.net.http.4.3.4.nupkg"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.uri/4.3.0/system.private.uri.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.1.0/system.reflection.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.3.0/system.reflection.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/1.6.0/system.reflection.metadata.1.6.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/5.0.0/system.reflection.metadata.5.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Resources.Extensions"; version = "4.6.0"; sha256 = "0inch9jgchgmsg3xjivbhh9mpin40mhdd8dgf4i1p3g42i0hzc0j"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.extensions/4.6.0/system.resources.extensions.4.6.0.nupkg"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Resources.Writer"; version = "4.0.0"; sha256 = "07hp218kjdcvpl27djspnixgnacbp9apma61zz3wsca9fx5g3lmv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.writer/4.0.0/system.resources.writer.4.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.1.0/system.runtime.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.3.0/system.runtime.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/4.7.1/system.runtime.compilerservices.unsafe.4.7.1.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/6.0.0/system.runtime.compilerservices.unsafe.6.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; sha256 = "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.loader/4.3.0/system.runtime.loader.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.numerics/4.3.0/system.runtime.numerics.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.serialization.primitives/4.1.1/system.runtime.serialization.primitives.4.1.1.nupkg"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/5.0.0/system.security.accesscontrol.5.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.algorithms/4.3.0/system.security.cryptography.algorithms.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.cng/4.3.0/system.security.cryptography.cng.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.csp/4.3.0/system.security.cryptography.csp.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.encoding/4.3.0/system.security.cryptography.encoding.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.openssl/4.3.0/system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.primitives/4.3.0/system.security.cryptography.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.x509certificates/4.3.0/system.security.cryptography.x509certificates.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/5.0.0/system.security.principal.windows.5.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.0.1"; sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.5.1/system.text.encoding.codepages.4.5.1.nupkg"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/6.0.0/system.text.encoding.codepages.6.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.0.11/system.threading.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.3.0/system.threading.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "4.9.0"; sha256 = "1g6s9pjg4z8iy98df60y9a01imdqy59zd767vz74rrng78jl2dk5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.dataflow/4.9.0/system.threading.tasks.dataflow.4.9.0.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Thread"; version = "4.0.0"; sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.thread/4.0.0/system.threading.thread.4.0.0.nupkg"; }) -] diff --git a/pkgs/development/compilers/rust/1_80.nix b/pkgs/development/compilers/rust/1_80.nix deleted file mode 100644 index 4c2efcc367f4..000000000000 --- a/pkgs/development/compilers/rust/1_80.nix +++ /dev/null @@ -1,138 +0,0 @@ -# New rust versions should first go to staging. -# Things to check after updating: -# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: -# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github -# This testing can be also done by other volunteers as part of the pull -# request review, in case platforms cannot be covered. -# 2. The LLVM version used for building should match with rust upstream. -# Check the version number in the src/llvm-project git submodule in: -# https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules -# 3. Firefox and Thunderbird should still build on x86_64-linux. - -{ - stdenv, - lib, - newScope, - callPackage, - CoreFoundation, - Security, - SystemConfiguration, - pkgsBuildTarget, - pkgsBuildBuild, - pkgsBuildHost, - pkgsTargetTarget, - makeRustPlatform, - wrapRustcWith, - llvmPackages_18, - llvm_18, - wrapCCWith, - overrideCC, -}@args: -let - llvmSharedFor = - pkgSet: - pkgSet.llvmPackages_18.libllvm.override ( - { - enableSharedLibraries = true; - } - // lib.optionalAttrs (stdenv.targetPlatform.useLLVM or false) { - # Force LLVM to compile using clang + LLVM libs when targeting pkgsLLVM - stdenv = pkgSet.stdenv.override { - allowedRequisites = null; - cc = pkgSet.llvmPackages_18.clangUseLLVM; - }; - } - ); -in -import ./default.nix - { - rustcVersion = "1.80.1"; - rustcSha256 = "sha256-LAuPZDlC3LgQy8xQ8pJWSxtuRNtdX0UJEVOZbfldLcQ="; - - llvmSharedForBuild = llvmSharedFor pkgsBuildBuild; - llvmSharedForHost = llvmSharedFor pkgsBuildHost; - llvmSharedForTarget = llvmSharedFor pkgsBuildTarget; - - # For use at runtime - llvmShared = llvmSharedFor { inherit llvmPackages_18 stdenv; }; - - # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox - llvmPackages = - if (stdenv.targetPlatform.useLLVM or false) then - callPackage ( - { - pkgs, - bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc, - bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools, - }: - let - llvmPackages = llvmPackages_18; - - setStdenv = - pkg: - pkg.override { - stdenv = stdenv.override { - allowedRequisites = null; - cc = llvmPackages.clangUseLLVM; - }; - }; - in - rec { - inherit (llvmPackages) bintools; - - libunwind = setStdenv llvmPackages.libunwind; - llvm = setStdenv llvmPackages.llvm; - - libcxx = llvmPackages.libcxx.override { - stdenv = stdenv.override { - allowedRequisites = null; - cc = llvmPackages.clangNoLibcxx; - hostPlatform = stdenv.hostPlatform // { - useLLVM = !stdenv.isDarwin; - }; - }; - inherit libunwind; - }; - - clangUseLLVM = llvmPackages.clangUseLLVM.override { inherit libcxx; }; - - stdenv = overrideCC args.stdenv clangUseLLVM; - } - ) { } - else - llvmPackages_18; - - # Note: the version MUST be one version prior to the version we're - # building - bootstrapVersion = "1.79.0"; - - # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` - bootstrapHashes = { - i686-unknown-linux-gnu = "0a1e371809446cd77dba7abce2afb4efac8d8b2e63483cfe19f1c98bf9ab7855"; - x86_64-unknown-linux-gnu = "628efa8ef0658a7c4199883ee132281f19931448d3cfee4ecfd768898fe74c18"; - x86_64-unknown-linux-musl = "2e4b0e40d027e2b31a40163986b4c04dfd0bce41c706a99f2e82ba473a4383de"; - arm-unknown-linux-gnueabihf = "ce8d8d296277a06e0d2f63a21a0586717e09be3df28c0d1a04bc2c6f85eecc15"; - armv7-unknown-linux-gnueabihf = "31968f88b22058e384dfb3cdf3efe7f60c03481d790300fcffc420d5ba3851f2"; - aarch64-unknown-linux-gnu = "f7d3b31581331b54af97cf3162e65b8c26c8aa14d42f71c1ce9adc1078ef54e5"; - aarch64-unknown-linux-musl = "f8100c806754cd21600ded26546467a1a242db9b9ab8a6a666656e3cc4edfa52"; - x86_64-apple-darwin = "62f018aad30bafa0ef8bff0ed60d5d45e6cadc799769aad9d945509203e9f921"; - aarch64-apple-darwin = "e70a9362975b94df7dbc6e2ed5ceab4254dd32f72ba497ff4a70440ace3f729f"; - powerpc64le-unknown-linux-gnu = "9865eeebb5bb20006367d3148d9116576499ec958d847e22b645f008a1bc4170"; - riscv64gc-unknown-linux-gnu = "c8d38e600ef4dea8b375df2d08153393816ffd3dcab18e4d081ddc19e28b5a40"; - s390x-unknown-linux-gnu = "1e9f1b27ce47d831108e1d1bb6ef7ab86f95bedfea843318292f821142fe1f6c"; - x86_64-unknown-freebsd = "3c8005f488b8dda0fc6d47928868200852106cac2b568934ae9a2e5c89d3a50d"; - }; - - selectRustPackage = pkgs: pkgs.rust_1_80; - - rustcPatches = [ ]; - } - - ( - builtins.removeAttrs args [ - "llvmPackages_18" - "llvm_18" - "wrapCCWith" - "overrideCC" - ] - ) diff --git a/pkgs/development/compilers/rust/1_82.nix b/pkgs/development/compilers/rust/1_82.nix new file mode 100644 index 000000000000..9d1281352ee1 --- /dev/null +++ b/pkgs/development/compilers/rust/1_82.nix @@ -0,0 +1,149 @@ +# New rust versions should first go to staging. +# Things to check after updating: +# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: +# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github +# This testing can be also done by other volunteers as part of the pull +# request review, in case platforms cannot be covered. +# 2. The LLVM version used for building should match with rust upstream. +# Check the version number in the src/llvm-project git submodule in: +# https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules +# 3. Firefox and Thunderbird should still build on x86_64-linux. + +{ + stdenv, + lib, + newScope, + callPackage, + CoreFoundation, + Security, + SystemConfiguration, + pkgsBuildTarget, + pkgsBuildBuild, + pkgsBuildHost, + pkgsHostTarget, + pkgsTargetTarget, + makeRustPlatform, + wrapRustcWith, + llvmPackages_18, + llvm_18, + wrapCCWith, + overrideCC, + fetchpatch, +}@args: +let + llvmSharedFor = + pkgSet: + pkgSet.llvmPackages_18.libllvm.override ( + { + enableSharedLibraries = true; + } + // lib.optionalAttrs (stdenv.targetPlatform.useLLVM or false) { + # Force LLVM to compile using clang + LLVM libs when targeting pkgsLLVM + stdenv = pkgSet.stdenv.override { + allowedRequisites = null; + cc = pkgSet.pkgsBuildHost.llvmPackages_18.clangUseLLVM; + }; + } + ); +in +import ./default.nix + { + rustcVersion = "1.82.0"; + rustcSha256 = "fFP0UJ7aGE4XTvprp9XutYZYVobOjt78eBorEafPUSo="; + + llvmSharedForBuild = llvmSharedFor pkgsBuildBuild; + llvmSharedForHost = llvmSharedFor pkgsBuildHost; + llvmSharedForTarget = llvmSharedFor pkgsBuildTarget; + + # For use at runtime + llvmShared = llvmSharedFor pkgsHostTarget; + + # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox + llvmPackages = + if (stdenv.targetPlatform.useLLVM or false) then + callPackage ( + { + pkgs, + bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc, + bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools, + }: + let + llvmPackages = llvmPackages_18; + + setStdenv = + pkg: + pkg.override { + stdenv = stdenv.override { + allowedRequisites = null; + cc = pkgsBuildHost.llvmPackages_18.clangUseLLVM; + }; + }; + in + rec { + inherit (llvmPackages) bintools; + + libunwind = setStdenv llvmPackages.libunwind; + llvm = setStdenv llvmPackages.llvm; + + libcxx = llvmPackages.libcxx.override { + stdenv = stdenv.override { + allowedRequisites = null; + cc = pkgsBuildHost.llvmPackages_18.clangNoLibcxx; + hostPlatform = stdenv.hostPlatform // { + useLLVM = !stdenv.hostPlatform.isDarwin; + }; + }; + inherit libunwind; + }; + + clangUseLLVM = llvmPackages.clangUseLLVM.override { inherit libcxx; }; + + stdenv = overrideCC args.stdenv clangUseLLVM; + } + ) { } + else + llvmPackages_18; + + # Note: the version MUST be the same version that we are building. Upstream + # ensures that each released compiler can compile itself: + # https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363 + bootstrapVersion = "1.82.0"; + + # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` + bootstrapHashes = { + i686-unknown-linux-gnu = "77b261fb3d9efa7fe39e87c024987495e03b647b6cb23a66b8e69aeb12a8be61"; + x86_64-unknown-linux-gnu = "0265c08ae997c4de965048a244605fb1f24a600bbe35047b811c638b8fcf676b"; + x86_64-unknown-linux-musl = "9dd781c64f71c1d3f854b0937eb751f19e8ebac1110e68e08b94223ad9b022ba"; + arm-unknown-linux-gnueabihf = "d6a2857d0ab8880c3bc691607b10b68fb2750eae35144e035a9a5eeef820b740"; + armv7-unknown-linux-gnueabihf = "eff9939c4b98c6ad91a759fa1a2ebdd81b4d05e47ac523218bf9d7093226589b"; + aarch64-unknown-linux-gnu = "d7db04fce65b5f73282941f3f1df5893be9810af17eb7c65b2e614461fe31a48"; + aarch64-unknown-linux-musl = "f061eabf0324805637c1e89e7d936365f705be1359699efbda59b637dbe9715f"; + x86_64-apple-darwin = "b1a289cabc523f259f65116a41374ac159d72fbbf6c373bd5e545c8e835ceb6a"; + aarch64-apple-darwin = "49b6d36b308addcfd21ae56c94957688338ba7b8985bff57fc626c8e1b32f62c"; + powerpc64le-unknown-linux-gnu = "44f3a1e70be33f91927ae8d89a11843a79b8b6124d62a9ddd9030a5275ebc923"; + riscv64gc-unknown-linux-gnu = "a72e8aa3fff374061ff90ada317a8d170c2a15eb079ddc828c97189179d3eebd"; + s390x-unknown-linux-gnu = "63760886a9b2de6cb38f75a236db358939d904e205e1e2bc9d96cec69e00ae83"; + x86_64-unknown-freebsd = "f7b51943dbed0af3387e3269c1767fee916fb22b8e7897b3594bf5e422403137"; + }; + + selectRustPackage = pkgs: pkgs.rust_1_82; + + rustcPatches = [ + (fetchpatch { + name = "fix-fastCross.patch"; + url = "https://github.com/rust-lang/rust/commit/c15469a7fec811d1a4f69ff26e18c6f383df41d2.patch"; + hash = "sha256-lFc48AMoGf4LCP65IsXS5rEB9eYacTP8ADftQkj8zkg="; + }) + ]; + } + + ( + builtins.removeAttrs args [ + "llvmPackages_18" + "llvm_18" + "wrapCCWith" + "overrideCC" + "fetchpatch" + "pkgsHostTarget" + ] + ) diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index 10e944515df7..df3b8f729f7f 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -33,11 +33,11 @@ rec { license = [ licenses.mit licenses.asl20 ]; }; - nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook; + nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook; buildInputs = [ bash ] - ++ lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) gcc.cc.lib - ++ lib.optional (!stdenv.isDarwin) zlib - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) gcc.cc.lib + ++ lib.optional (!stdenv.hostPlatform.isDarwin) zlib + ++ lib.optional stdenv.hostPlatform.isDarwin Security; postPatch = '' patchShebangs . @@ -61,6 +61,37 @@ rec { dontStrip = true; setupHooks = ./setup-hook.sh; + + passthru = rec { + tier1TargetPlatforms = [ + # Platforms with host tools from + # https://doc.rust-lang.org/nightly/rustc/platform-support.html + "x86_64-darwin" "i686-darwin" "aarch64-darwin" + "i686-freebsd" "x86_64-freebsd" + "x86_64-solaris" + "aarch64-linux" "armv6l-linux" "armv7l-linux" "i686-linux" + "loongarch64-linux" "powerpc64-linux" "powerpc64le-linux" + "riscv64-linux" "s390x-linux" "x86_64-linux" + "aarch64-netbsd" "armv7l-netbsd" "i686-netbsd" "powerpc-netbsd" + "x86_64-netbsd" + "i686-openbsd" "x86_64-openbsd" + "i686-windows" "x86_64-windows" + ]; + targetPlatforms = tier1TargetPlatforms ++ [ + # Platforms without host tools from + # https://doc.rust-lang.org/nightly/rustc/platform-support.html + "armv7a-darwin" + "armv5tel-linux" "armv7a-linux" "m68k-linux" "mips-linux" + "mips64-linux" "mipsel-linux" "mips64el-linux" "riscv32-linux" + "armv6l-netbsd" "mipsel-netbsd" "riscv64-netbsd" + "x86_64-redox" + "wasm32-wasi" + ]; + badTargetPlatforms = [ + # Rust is currently unable to target the n32 ABI + lib.systems.inspect.patterns.isMips64n32 + ]; + }; }; rustc = wrapRustc rustc-unwrapped; @@ -80,10 +111,10 @@ rec { }; nativeBuildInputs = [ makeWrapper ] - ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook; buildInputs = [ bash ] - ++ lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) gcc.cc.lib - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) gcc.cc.lib + ++ lib.optional stdenv.hostPlatform.isDarwin Security; postPatch = '' patchShebangs . diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 9a12537f3e32..6ece7c304fc5 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage.override { zlib ]; buildInputs = [ file curl python3 openssl zlib ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; # cargo uses git-rs which is made for a version of libgit2 from recent master that # is not compatible with the current version in nixpkgs. diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index 640ea7908e25..6a233ffe1852 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage { dontUpdateAutotoolsGnuConfigScripts = true; buildInputs = [ rustc.llvm ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; # fixes: error: the option `Z` is only accepted on the nightly compiler RUSTC_BOOTSTRAP = 1; @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage { # # [0]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/src/bootstrap/builder.rs#L1543 # [1]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/compiler/rustc_codegen_ssa/src/back/linker.rs#L323-L331 - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/clippy-driver" install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/cargo-clippy" ''; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 1b8a3dbfba6b..0e999407c9d0 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -68,13 +68,13 @@ in stdenv.mkDerivation (finalAttrs: { # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' # This doesn't apply to cross-building for FreeBSD because the host # uses libstdc++, but the target (used for building std) uses libc++ - optional (stdenv.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD && !useLLVM) + optional (stdenv.hostPlatform.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD && !useLLVM) "--push-state --as-needed -lstdc++ --pop-state" - ++ optional (stdenv.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD && useLLVM) + ++ optional (stdenv.hostPlatform.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD && useLLVM) "--push-state --as-needed -L${llvmPackages.libcxx}/lib -lc++ -lc++abi -lLLVM-${lib.versions.major llvmPackages.llvm.version} --pop-state" - ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++ -lc++abi" - ++ optional stdenv.isFreeBSD "-rpath ${llvmPackages.libunwind}/lib" - ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost.lib}/lib"); + ++ optional (stdenv.hostPlatform.isDarwin && !withBundledLLVM) "-lc++ -lc++abi" + ++ optional stdenv.hostPlatform.isFreeBSD "-rpath ${llvmPackages.libunwind}/lib" + ++ optional stdenv.hostPlatform.isDarwin "-rpath ${llvmSharedForHost.lib}/lib"); # Increase codegen units to introduce parallelism within the compiler. RUSTFLAGS = "-Ccodegen-units=10"; @@ -109,6 +109,9 @@ in stdenv.mkDerivation (finalAttrs: { "--tools=rustc,rustdoc,rust-analyzer-proc-macro-srv" "--enable-rpath" "--enable-vendor" + # For Nixpkgs it makes more sense to use stdenv's linker than + # letting rustc build its own. + "--disable-lld" "--build=${stdenv.buildPlatform.rust.rustcTargetSpec}" "--host=${stdenv.hostPlatform.rust.rustcTargetSpec}" # std is built for all platforms in --target. @@ -166,10 +169,10 @@ in stdenv.mkDerivation (finalAttrs: { "${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}" ] ++ optionals stdenv.targetPlatform.rust.isNoStdTarget [ "--disable-docs" - ] ++ optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # https://github.com/rust-lang/rust/issues/92173 "--set rust.jemalloc" - ] ++ optionals useLLVM [ + ] ++ optionals (useLLVM && !stdenv.targetPlatform.isFreeBSD) [ # https://github.com/NixOS/nixpkgs/issues/311930 "--llvm-libunwind=${if withBundledLLVM then "in-tree" else "system"}" "--enable-use-libcxx" @@ -224,19 +227,19 @@ in stdenv.mkDerivation (finalAttrs: { # Useful debugging parameter # export VERBOSE=1 - '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' # See https://github.com/jemalloc/jemalloc/issues/1997 # Using a value of 48 should work on both emulated and native x86_64-darwin. export JEMALLOC_SYS_WITH_LG_VADDR=48 '' + lib.optionalString (!(finalAttrs.src.passthru.isReleaseTarball or false)) '' mkdir .cargo - cat > .cargo/config <<\EOF + cat > .cargo/config.toml <<\EOF [source.crates-io] replace-with = "vendored-sources" [source.vendored-sources] directory = "vendor" EOF - '' + lib.optionalString (stdenv.isFreeBSD) '' + '' + lib.optionalString (stdenv.hostPlatform.isFreeBSD) '' # lzma-sys bundles an old version of xz that doesn't build # on modern FreeBSD, use the system one instead substituteInPlace src/bootstrap/src/core/build_steps/tool.rs \ @@ -257,9 +260,9 @@ in stdenv.mkDerivation (finalAttrs: { ++ optionals fastCross [ lndir makeWrapper ]; buildInputs = [ openssl ] - ++ optionals stdenv.isDarwin [ libiconv Security zlib ] + ++ optionals stdenv.hostPlatform.isDarwin [ libiconv Security zlib ] ++ optional (!withBundledLLVM) llvmShared.lib - ++ optional (useLLVM && !withBundledLLVM) [ + ++ optional (useLLVM && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD) [ llvmPackages.libunwind # Hack which is used upstream https://github.com/gentoo/gentoo/blob/master/dev-lang/rust/rust-1.78.0.ebuild#L284 (runCommandLocal "libunwind-libgcc" {} '' @@ -303,6 +306,7 @@ in stdenv.mkDerivation (finalAttrs: { passthru = { llvm = llvmShared; inherit llvmPackages; + inherit (rustc) tier1TargetPlatforms targetPlatforms badTargetPlatforms; tests = { inherit fd ripgrep wezterm; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit firefox thunderbird; }; @@ -313,19 +317,9 @@ in stdenv.mkDerivation (finalAttrs: { description = "Safe, concurrent, practical language"; maintainers = with maintainers; [ havvy ] ++ teams.rust.members; license = [ licenses.mit licenses.asl20 ]; - platforms = [ - # Platforms with host tools from - # https://doc.rust-lang.org/nightly/rustc/platform-support.html - "x86_64-darwin" "i686-darwin" "aarch64-darwin" - "i686-freebsd" "x86_64-freebsd" - "x86_64-solaris" - "aarch64-linux" "armv6l-linux" "armv7l-linux" "i686-linux" - "loongarch64-linux" "powerpc64-linux" "powerpc64le-linux" - "riscv64-linux" "s390x-linux" "x86_64-linux" - "aarch64-netbsd" "armv7l-netbsd" "i686-netbsd" "powerpc-netbsd" - "x86_64-netbsd" - "i686-openbsd" "x86_64-openbsd" - "i686-windows" "x86_64-windows" - ]; + platforms = rustc.tier1TargetPlatforms; + # If rustc can't target a platform, we also can't build rustc for + # that platform. + badPlatforms = rustc.badTargetPlatforms; }; }) diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index ab58a172a6b2..42c71513151a 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ rustc.llvm - ] ++ lib.optional stdenv.isDarwin Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; # rustfmt uses the rustc_driver and std private libraries, and Rust's build process forces them to have # an install name of `@rpath/...` [0] [1] instead of the standard on macOS, which is an absolute path @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { # # [0]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/src/bootstrap/builder.rs#L1543 # [1]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/compiler/rustc_codegen_ssa/src/back/linker.rs#L323-L331 - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/rustfmt" install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/git-rustfmt" ''; diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/development/compilers/sagittarius-scheme/default.nix deleted file mode 100644 index 0b4cc240694c..000000000000 --- a/pkgs/development/compilers/sagittarius-scheme/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib, stdenv -, fetchurl -, cmake -, pkg-config -, libffi -, boehmgc -, openssl -, zlib -, odbcSupport ? !stdenv.isDarwin -, libiodbc -}: - -let platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" - else if (stdenv.isLinux or stdenv.isBSD) then "LD_LIBRARY_PATH" - else throw "unsupported platform"; -in -stdenv.mkDerivation rec { - pname = "sagittarius-scheme"; - version = "0.9.11"; - src = fetchurl { - url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz"; - hash = "sha256-LIF1EW8sMBMKycQnVAXk+5iEpKmRHMmzBILAg2tjk8c="; - }; - preBuild = '' - # since we lack rpath during build, need to explicitly add build path - # to LD_LIBRARY_PATH so we can load libsagittarius.so as required to - # build extensions - export ${platformLdLibraryPath}="$(pwd)/build" - ''; - nativeBuildInputs = [ pkg-config cmake ]; - - buildInputs = [ libffi boehmgc openssl zlib ] ++ lib.optional odbcSupport libiodbc; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ - "-Wno-error=int-conversion" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - # error: '__builtin_ia32_aeskeygenassist128' needs target feature aes - "-maes" - ]); - - meta = with lib; { - description = "R6RS/R7RS Scheme system"; - longDescription = '' - Sagittarius Scheme is a free Scheme implementation supporting - R6RS/R7RS specification. - - Features: - - - Builtin CLOS. - - Common Lisp like reader macro. - - Cryptographic libraries. - - Customisable cipher and hash algorithm. - - Custom codec mechanism. - - CL like keyword lambda syntax (taken from Gauche). - - Constant definition form. (define-constant form). - - Builtin regular expression - - mostly works O(n) - - Replaceable reader - ''; - homepage = "https://bitbucket.org/ktakashi/sagittarius-scheme"; - license = licenses.bsd2; - platforms = platforms.all; - maintainers = with maintainers; [ abbe ]; - }; -} diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index d796b24e1d7e..6f9b75c1183c 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { --add-flags "--core $out/share/sbcl/sbcl.core" ''; - postFixup = lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isLinux) '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl ''; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 5cc21ada71a1..34632bf4b50d 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -10,14 +10,17 @@ let versionMap = { + # Necessary for Nyxt "2.4.6" = { sha256 = "sha256-pImQeELa4JoXJtYphb96VmcKrqLz7KH7cCO8pnw/MJE="; }; - "2.4.7" = { - sha256 = "sha256-aFRNJQNjWs0BXVNMzJsq6faJltQptakGP9Iv8JJQEdI="; + # By unofficial and very loose convention we keep the latest version of + # SBCL, and the previous one in case someone quickly needs to roll back. + "2.4.9" = { + sha256 = "sha256-mXDk68XWlD3GTXyh9S2bXNn8lM75TSMyE9eOx182BeI="; }; - "2.4.8" = { - sha256 = "sha256-/G7NzFOOgKFKmY1TDMw4SkF5D09Pxs1//oyxJqZ3aUw="; + "2.4.10" = { + sha256 = "sha256-zus5a2nSkT7uBIQcKva+ylw0LOFGTD/j5FPy3hDF4vg="; }; }; # Collection of pre-built SBCL binaries for platforms that need them for @@ -167,7 +170,7 @@ stdenv.mkDerivation (self: { lib.optional self.threadSupport "sb-thread" ++ lib.optional self.linkableRuntime "sb-linkable-runtime" ++ lib.optional self.coreCompression "sb-core-compression" ++ - lib.optional stdenv.isAarch32 "arm" ++ + lib.optional stdenv.hostPlatform.isAarch32 "arm" ++ lib.optional self.markRegionGC "mark-region-gc"; disableFeatures = diff --git a/pkgs/development/compilers/scala/bare.nix b/pkgs/development/compilers/scala/bare.nix index bbbb573f2f5a..2588e3fd5aaf 100644 --- a/pkgs/development/compilers/scala/bare.nix +++ b/pkgs/development/compilers/scala/bare.nix @@ -1,15 +1,25 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre, ncurses }: +{ + lib, + stdenv, + fetchurl, + makeWrapper, + jre, + ncurses, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.3.3"; pname = "scala-bare"; src = fetchurl { - url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz"; + url = "https://github.com/scala/scala3/releases/download/${finalAttrs.version}/scala3-${finalAttrs.version}.tar.gz"; hash = "sha256-61lAETEvqkEqr5pbDltFkh+Qvp+EnCDilXN9X67NFNE="; }; - propagatedBuildInputs = [ jre ncurses.dev ] ; + propagatedBuildInputs = [ + jre + ncurses.dev + ]; nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -20,23 +30,25 @@ stdenv.mkDerivation rec { # Use preFixup instead of fixupPhase # because we want the default fixupPhase as well preFixup = '' - bin_files=$(find $out/bin -type f ! -name common) - for f in $bin_files ; do - wrapProgram $f --set JAVA_HOME ${jre} --prefix PATH : '${ncurses.dev}/bin' - done + bin_files=$(find $out/bin -type f ! -name "*common*" ! -name "scala-cli.jar") + for f in $bin_files ; do + wrapProgram $f --set JAVA_HOME ${jre} --prefix PATH : '${ncurses.dev}/bin' + done ''; meta = with lib; { - description = "Research platform for new language concepts and compiler technologies for Scala"; - longDescription = '' - Dotty is a platform to try out new language concepts and compiler technologies for Scala. - The focus is mainly on simplification. We remove extraneous syntax (e.g. no XML literals), - and try to boil down Scala’s types into a smaller set of more fundamental constructs. - The theory behind these constructs is researched in DOT, a calculus for dependent object types. - ''; - homepage = "http://dotty.epfl.ch/"; - license = licenses.bsd3; + description = "The Scala 3 compiler, also known as Dotty"; + homepage = "https://scala-lang.org/"; + license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ karolchmist virusdave kashw2 ]; + mainProgram = "scala"; + maintainers = with maintainers; [ + karolchmist + virusdave + kashw2 + natsukagami + hamzaremmal + dottybot + ]; }; -} +}) diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 2ad68ffec3b3..8d27707dff7f 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,8 +1,19 @@ -{ stdenv, fetchurl, makeWrapper, jre, callPackage }: +{ + stdenv, + fetchurl, + makeWrapper, + jre, + callPackage, +}: let bare = callPackage ./bare.nix { - inherit stdenv fetchurl makeWrapper jre; + inherit + stdenv + fetchurl + makeWrapper + jre + ; }; in @@ -21,4 +32,7 @@ stdenv.mkDerivation { ''; inherit (bare) meta; -} // { inherit bare; } +} +// { + inherit bare; +} diff --git a/pkgs/development/compilers/scryer-prolog/Cargo.lock b/pkgs/development/compilers/scryer-prolog/Cargo.lock deleted file mode 100644 index 315f61a73402..000000000000 --- a/pkgs/development/compilers/scryer-prolog/Cargo.lock +++ /dev/null @@ -1,3058 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" -dependencies = [ - "memchr", -] - -[[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 = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "assert_cmd" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c98233c6673d8601ab23e77eb38f999c51100d46c5703b17288c57fddf3a1ffe" -dependencies = [ - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" - -[[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.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[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 = "blake2" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330" -dependencies = [ - "byte-tools", - "crypto-mac", - "digest 0.8.1", - "opaque-debug", -] - -[[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 = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array 0.12.4", -] - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array 0.14.7", -] - -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata 0.1.10", -] - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[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.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "wasm-bindgen", - "windows-targets", -] - -[[package]] -name = "clipboard-win" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" -dependencies = [ - "error-code", - "str-buf", - "winapi", -] - -[[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if", - "wasm-bindgen", -] - -[[package]] -name = "console_log" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8aed40e4edbf4d3b4431ab260b63fdc40f5780a4766824329ea0f1eefe3c0f" -dependencies = [ - "log", - "web-sys", -] - -[[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 = "cpu-time" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e393a7668fe1fad3075085b86c781883000b4ede868f43627b34a87c8b7ded" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "cpufeatures" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" -dependencies = [ - "libc", -] - -[[package]] -name = "crossterm" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ebde6a9dd5e331cd6c6f48253254d117642c31653baa475e394657c59c1f7d" -dependencies = [ - "bitflags 1.3.2", - "crossterm_winapi", - "libc", - "mio 0.7.14", - "parking_lot 0.11.2", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6966607622438301997d3dac0d2f6e9a90c68bb6bc1785ea98456ab93c0507" -dependencies = [ - "winapi", -] - -[[package]] -name = "crrl" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b083214486dae00f49a2f21f32fc8bbc333d6048601bc89203a8ab92bfa691f0" -dependencies = [ - "blake2 0.10.6", - "rand_core", - "sha2", - "sha3 0.10.8", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array 0.14.7", - "typenum", -] - -[[package]] -name = "crypto-mac" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" -dependencies = [ - "generic-array 0.12.4", - "subtle 1.0.0", -] - -[[package]] -name = "ctrlc" -version = "3.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf" -dependencies = [ - "nix 0.27.1", - "windows-sys", -] - -[[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.0", - "lock_api", - "once_cell", - "parking_lot_core 0.9.8", -] - -[[package]] -name = "dashu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b669b1473cc6b33aba72ab3ddfe1055ff8fc28accd85130c412c2cd922a7c4e" -dependencies = [ - "dashu-base", - "dashu-float", - "dashu-int", - "dashu-macros", - "dashu-ratio", -] - -[[package]] -name = "dashu-base" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e183fc153511989674ede304b5592c74683393ca09cf20391898c28d6ba04264" - -[[package]] -name = "dashu-float" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7696675af30ae057b1629d27b153bbafb06461826b7d0ef1858d06b801f355f" -dependencies = [ - "dashu-base", - "dashu-int", - "num-modular", - "num-order", - "static_assertions", -] - -[[package]] -name = "dashu-int" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc257a884b3e8c9a1a577ff7226dcb4d6bda0ff96dfa76975e2c9d7205e3b8ea" -dependencies = [ - "cfg-if", - "dashu-base", - "num-modular", - "num-order", - "static_assertions", -] - -[[package]] -name = "dashu-macros" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496c319e615b86b21d6b0ea9e2f96a4f5fb2eb4178293b04a51ffc30a6c3f54" -dependencies = [ - "dashu-base", - "dashu-float", - "dashu-int", - "dashu-ratio", - "proc-macro2", - "quote", -] - -[[package]] -name = "dashu-ratio" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0f73f0ad6cbc94f52306455603e307b065af83bc61101968d53b6870127a05" -dependencies = [ - "dashu-base", - "dashu-float", - "dashu-int", - "num-modular", - "num-order", -] - -[[package]] -name = "derive_deref" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcdbcee2d9941369faba772587a565f4f534e42cb8d17e5295871de730163b2b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array 0.12.4", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer 0.10.4", - "crypto-common", - "subtle 2.5.0", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "divrem" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc9f8914dcb99891bdfee82536bbff8d9aa612b0dbe83872afbc66902bdec0b9" - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "endian-type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" - -[[package]] -name = "errno" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", -] - -[[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 = "error-code" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] - -[[package]] -name = "fastrand" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" - -[[package]] -name = "fd-lock" -version = "3.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" -dependencies = [ - "cfg-if", - "rustix", - "windows-sys", -] - -[[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.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[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-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "generic-array" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" -dependencies = [ - "typenum", -] - -[[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.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" - -[[package]] -name = "git-version" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b0decc02f4636b9ccad390dcbe77b722a77efedfa393caf8379a51d5c61899" -dependencies = [ - "git-version-macro", - "proc-macro-hack", -] - -[[package]] -name = "git-version-macro" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "h2" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[package]] -name = "headers" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" -dependencies = [ - "base64 0.21.4", - "bytes", - "headers-core", - "http", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "home" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" -dependencies = [ - "windows-sys", -] - -[[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 = "html5ever" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" -dependencies = [ - "log", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -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 = "hyper" -version = "0.14.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2 0.4.9", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" -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.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -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", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ipnet" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[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 = "keccak" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" -dependencies = [ - "cpufeatures", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lexical" -version = "5.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f404a90a744e32e8be729034fc33b90cf2a56418fbf594d69aa3c0214ad414e5" -dependencies = [ - "cfg-if", - "lexical-core", -] - -[[package]] -name = "lexical-core" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" -dependencies = [ - "arrayvec", - "bitflags 1.3.2", - "cfg-if", - "ryu", - "static_assertions", -] - -[[package]] -name = "libc" -version = "0.2.148" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" - -[[package]] -name = "libffi" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce826c243048e3d5cec441799724de52e2d42f820468431fc3fceee2341871e2" -dependencies = [ - "libc", - "libffi-sys", -] - -[[package]] -name = "libffi-sys" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36115160c57e8529781b4183c2bb51fdc1f6d6d1ed345591d84be7703befb3c" -dependencies = [ - "cc", -] - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" - -[[package]] -name = "lock_api" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] -name = "markup5ever" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" -dependencies = [ - "log", - "phf 0.10.1", - "phf_codegen", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "markup5ever_rcdom" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9521dd6750f8e80ee6c53d65e2e4656d7de37064f3a7a5d2d11d05df93839c2" -dependencies = [ - "html5ever", - "markup5ever", - "tendril", - "xml5ever", -] - -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "memchr" -version = "2.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" - -[[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 = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.7.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi", -] - -[[package]] -name = "mio" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" -dependencies = [ - "libc", - "wasi", - "windows-sys", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] - -[[package]] -name = "modular-bitfield" -version = "0.11.2" -source = "git+https://github.com/mthom/modular-bitfield#213535c684af277563678179d8496f11b84a283f" -dependencies = [ - "modular-bitfield-impl", - "static_assertions", -] - -[[package]] -name = "modular-bitfield-impl" -version = "0.11.2" -source = "git+https://github.com/mthom/modular-bitfield#213535c684af277563678179d8496f11b84a283f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "multer" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" -dependencies = [ - "bytes", - "encoding_rs", - "futures-util", - "http", - "httparse", - "log", - "memchr", - "mime", - "spin 0.9.8", - "version_check", -] - -[[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 = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nibble_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec", -] - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", -] - -[[package]] -name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.4.0", - "cfg-if", - "libc", -] - -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - -[[package]] -name = "num-modular" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17bb261bf36fa7d83f4c294f834e91256769097b3cb505d44831e0a179ac647f" - -[[package]] -name = "num-order" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537b596b97c40fcf8056d153049eb22f481c17ebce72a513ec9286e4986d1bb6" -dependencies = [ - "num-modular", -] - -[[package]] -name = "num-traits" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" -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 = "object" -version = "0.32.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - -[[package]] -name = "openssl" -version = "0.10.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" -dependencies = [ - "bitflags 2.4.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.37", -] - -[[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.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "ordered-float" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" -dependencies = [ - "num-traits", -] - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.8", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.3.5", - "smallvec", - "windows-targets", -] - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "phf" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ac8b67553a7ca9457ce0e526948cad581819238f4a9d1ea74545851fa24f37" -dependencies = [ - "phf_macros", - "phf_shared 0.9.0", - "proc-macro-hack", -] - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", -] - -[[package]] -name = "phf_codegen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - -[[package]] -name = "phf_generator" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d43f3220d96e0080cc9ea234978ccd80d904eafb17be31bb0f76daaea6493082" -dependencies = [ - "phf_shared 0.9.0", - "rand", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b706f5936eb50ed880ae3009395b43ed19db5bff2ebd459c95e7bf013a89ab86" -dependencies = [ - "phf_generator 0.9.1", - "phf_shared 0.9.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "phf_shared" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a68318426de33640f02be62b4ae8eb1261be2efbc337b60c54d845bf4484e0d9" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[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 = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "predicates" -version = "2.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" -dependencies = [ - "difflib", - "itertools", - "predicates-core", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[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.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.7.0" -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", -] - -[[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 = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall 0.2.16", - "thiserror", -] - -[[package]] -name = "ref_thread_local" -version = "0.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d813022b2e00774a48eaf43caaa3c20b45f040ba8cbf398e2e8911a06668dbe6" - -[[package]] -name = "regex" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.3.3", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - -[[package]] -name = "regex-automata" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" - -[[package]] -name = "reqwest" -version = "0.11.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" -dependencies = [ - "base64 0.21.4", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[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 0.5.2", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "ring-wasi" -version = "0.16.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db1418b2535ed5e71a9fc73d3fede8596792fd7cb4b4a0f8ecf412cfddaaedd4" -dependencies = [ - "cc", - "getrandom", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "ripemd160" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad5112e0dbbb87577bfbc56c42450235e3012ce336e29c5befd7807bd626da4a" -dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "opaque-debug", -] - -[[package]] -name = "roxmltree" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5001f134077069d87f77c8b9452b690df2445f7a43f1c7ca4a1af8dd505789d" -dependencies = [ - "xmlparser", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustix" -version = "0.38.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" -dependencies = [ - "base64 0.21.4", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "rustyline" -version = "12.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" -dependencies = [ - "bitflags 2.4.0", - "cfg-if", - "clipboard-win", - "fd-lock", - "home", - "libc", - "log", - "memchr", - "nix 0.26.4", - "radix_trie", - "scopeguard", - "unicode-segmentation", - "unicode-width", - "utf8parse", - "winapi", -] - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[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.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "scryer-prolog" -version = "0.9.3" -dependencies = [ - "assert_cmd", - "base64 0.12.3", - "bit-set", - "bitvec", - "blake2 0.8.1", - "bytes", - "chrono", - "console_error_panic_hook", - "console_log", - "cpu-time", - "crossterm", - "crrl", - "ctrlc", - "dashu", - "derive_deref", - "dirs-next", - "divrem", - "futures", - "fxhash", - "getrandom", - "git-version", - "hostname", - "indexmap", - "lazy_static", - "lexical", - "libc", - "libffi", - "libloading", - "maplit", - "modular-bitfield", - "native-tls", - "num-order", - "ordered-float", - "phf 0.9.0", - "predicates-core", - "proc-macro2", - "quote", - "rand", - "ref_thread_local", - "regex", - "reqwest", - "ring", - "ring-wasi", - "ripemd160", - "roxmltree", - "rustyline", - "ryu", - "select", - "serde-wasm-bindgen", - "serial_test", - "sha3 0.8.2", - "smallvec", - "static_assertions", - "strum", - "strum_macros", - "syn 2.0.37", - "to-syn-value", - "to-syn-value_derive", - "tokio", - "walkdir", - "warp", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "select" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f9da09dc3f4dfdb6374cbffff7a2cffcec316874d4429899eefdc97b3b94dcd" -dependencies = [ - "bit-set", - "html5ever", - "markup5ever_rcdom", -] - -[[package]] -name = "serde" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-wasm-bindgen" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - -[[package]] -name = "serde_derive" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "serde_json" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" -dependencies = [ - "itoa", - "ryu", - "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 = "serial_test" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" -dependencies = [ - "dashmap", - "futures", - "lazy_static", - "log", - "parking_lot 0.12.1", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha2" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha3" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd26bc0e7a2e3a7c959bc494caf58b72ee0c71d67704e9520f736ca7e4853ecf" -dependencies = [ - "block-buffer 0.7.3", - "byte-tools", - "digest 0.8.1", - "keccak", - "opaque-debug", -] - -[[package]] -name = "sha3" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" -dependencies = [ - "digest 0.10.7", - "keccak", -] - -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio 0.7.14", - "signal-hook", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[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.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" -dependencies = [ - "libc", - "windows-sys", -] - -[[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" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot 0.12.1", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "strum" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb" - -[[package]] -name = "strum_macros" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - -[[package]] -name = "subtle" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[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.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "tempfile" -version = "3.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys", -] - -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "thiserror" -version = "1.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[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 = "to-syn-value" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfcc684f2ceaec3b4e8689657c9e0944b07bf5e34563e0bd758c4d42c05c82ed" -dependencies = [ - "syn 2.0.37", - "to-syn-value_derive", -] - -[[package]] -name = "to-syn-value_derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfffda778de8443144ff3b042ddf14e8bc5445f0fd9fe937c3d252535dc9212" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "tokio" -version = "1.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio 0.8.8", - "num_cpus", - "parking_lot 0.12.1", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.4", - "tokio-macros", - "windows-sys", -] - -[[package]] -name = "tokio-macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[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.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls", - "tokio", - "webpki", -] - -[[package]] -name = "tokio-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite", -] - -[[package]] -name = "tokio-util" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[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", - "log", - "pin-project-lite", - "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 = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "tungstenite" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" -dependencies = [ - "base64 0.13.1", - "byteorder", - "bytes", - "http", - "httparse", - "log", - "rand", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[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.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[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.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "url" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[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 = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "warp" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba431ef570df1287f7f8b07e376491ad54f84d26ac473489427231e1718e1f69" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "headers", - "http", - "hyper", - "log", - "mime", - "mime_guess", - "multer", - "percent-encoding", - "pin-project", - "rustls-pemfile", - "scoped-tls", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-rustls", - "tokio-stream", - "tokio-tungstenite", - "tokio-util", - "tower-service", - "tracing", -] - -[[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.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.37", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[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.37", - "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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e" -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-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" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[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_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[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_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[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_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys", -] - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "xml5ever" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650" -dependencies = [ - "log", - "mac", - "markup5ever", -] - -[[package]] -name = "xmlparser" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" diff --git a/pkgs/development/compilers/scryer-prolog/default.nix b/pkgs/development/compilers/scryer-prolog/default.nix deleted file mode 100644 index 245d48d1a595..000000000000 --- a/pkgs/development/compilers/scryer-prolog/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, openssl -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "scryer-prolog"; - version = "0.9.4"; - - src = fetchFromGitHub { - owner = "mthom"; - repo = "scryer-prolog"; - rev = "v${version}"; - hash = "sha256-0c0MsjrHRitg+5VEHB9/iSuiqcPztF+2inDZa9fQpwU="; - }; - - cargoHash = "sha256-q8s6HAJhKnMhsgZk5plR+ar3CpLKNqjrD14roDWLwfo="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - CARGO_FEATURE_USE_SYSTEM_LIBS = true; - - meta = with lib; { - description = "Modern Prolog implementation written mostly in Rust"; - mainProgram = "scryer-prolog"; - homepage = "https://github.com/mthom/scryer-prolog"; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ malbarbo wkral ]; - }; -} diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix deleted file mode 100644 index 670986b3ffc5..000000000000 --- a/pkgs/development/compilers/serpent/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, ... }: - -stdenv.mkDerivation { - pname = "serpent"; - - # I can't find any version numbers, so we're just using the date - # of the last commit. - version = "2016-03-05"; - - src = fetchFromGitHub { - owner = "ethereum"; - repo = "serpent"; - rev = "51ee60857fe53c871fa916ef66fc1b4255bb9433"; - sha256 = "1bns9wgn5i1ahj19qx7v1wwdy8ca3q3pigxwznm5nywsw7s7lqxs"; - }; - - postPatch = '' - substituteInPlace Makefile --replace 'g++' '${stdenv.cc.targetPrefix}c++' - ''; - - installPhase = '' - mkdir -p $out/bin - mv serpent $out/bin - ''; - - meta = with lib; { - description = "Compiler for the Serpent language for Ethereum"; - mainProgram = "serpent"; - longDescription = '' - Serpent is one of the high-level programming languages used to - write Ethereum contracts. The language, as suggested by its name, - is designed to be very similar to Python; it is intended to be - maximally clean and simple, combining many of the efficiency - benefits of a low-level language with ease-of-use in programming - style, and at the same time adding special domain-specific - features for contract programming. - ''; - homepage = "https://github.com/ethereum/wiki/wiki/Serpent"; - license = with licenses; [ wtfpl ]; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 968a3014fa40..97c50cde91e7 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake python3 ] - ++ lib.optionals stdenv.isDarwin [ cctools ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; postInstall = '' moveToOutput "lib/*.a" $static diff --git a/pkgs/development/compilers/silice/default.nix b/pkgs/development/compilers/silice/default.nix deleted file mode 100644 index 4dfc83f9944b..000000000000 --- a/pkgs/development/compilers/silice/default.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ stdenv, fetchFromGitHub, lib -, cmake, pkg-config, openjdk -, libuuid, python3 -, glfw -, yosys, nextpnr, verilator -, dfu-util, icestorm, trellis -, unstableGitUpdater -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "silice"; - version = "0-unstable-2024-07-22"; - - src = fetchFromGitHub { - owner = "sylefeb"; - repo = "silice"; - rev = "8f56349f8b143d5a4b9686b1782f1ae66e011be4"; - hash = "sha256-1y2q41XyQLxjUkWKh8Ky/t3uaQXkm0IgMk9r06vKcRg="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - cmake - pkg-config - openjdk - glfw - ]; - buildInputs = [ - libuuid - ]; - propagatedBuildInputs = [ - (python3.withPackages (p: [ - p.edalize - p.termcolor - ])) - ]; - - postPatch = '' - patchShebangs antlr/antlr.sh - # use nixpkgs version - rm -r python/pybind11 - ''; - - 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 = [ - silice - yosys - nextpnr - verilator - dfu-util - icestorm - trellis - ]; - src = "${silice.src}/projects"; - sourceRoot = "projects/${project}"; - buildPhase = '' - 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 - [[ $target != Makefile* ]] || continue - done - ''; - }; - in { - # a selection of test projects that build with the FPGA tools in - # nixpkgs - audio_sdcard_streamer = testProject "audio_sdcard_streamer"; - bram_interface = testProject "bram_interface"; - blinky = testProject "blinky"; - pipeline_sort = testProject "pipeline_sort"; - }; - - passthru.updateScript = unstableGitUpdater { }; - - meta = { - description = "Open source language that simplifies prototyping and writing algorithms on FPGA architectures"; - homepage = "https://github.com/sylefeb/Silice"; - license = lib.licenses.bsd2; - mainProgram = "silice"; - maintainers = with lib.maintainers; [ - astro - pbsds - ]; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/development/compilers/sjasmplus/default.nix b/pkgs/development/compilers/sjasmplus/default.nix deleted file mode 100644 index b9c6a4b171ea..000000000000 --- a/pkgs/development/compilers/sjasmplus/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "sjasmplus"; - version = "1.18.3"; - - src = fetchFromGitHub { - owner = "z00m128"; - repo = "sjasmplus"; - rev = "v${version}"; - sha256 = "sha256-+FvNYfJ5I91RfuJTiOPhj5KW8HoOq8OgnnpFEgefSGc="; - }; - - buildFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - "CXX=${stdenv.cc.targetPrefix}c++" - ]; - - installPhase = '' - runHook preInstall - install -D sjasmplus $out/bin/sjasmplus - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://z00m128.github.io/sjasmplus/"; - description = "Z80 assembly language cross compiler. It is based on the SjASM source code by Sjoerd Mastijn"; - mainProgram = "sjasmplus"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ electrified ]; - }; -} diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index 26efb81e1686..17a43f50f7cd 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -1,61 +1,49 @@ { lib, stdenv, fetchurl, Libsystem }: let - version = "110.95"; + version = "110.99.6.1"; baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}"; - arch = if stdenv.is64bit + arch = if stdenv.hostPlatform.is64bit then "64" else "32"; boot32 = { url = "${baseurl}/boot.x86-unix.tgz"; - sha256 = "07bcrvjphyin1ygjbymcqhd1mbfk4hff82wmxcllh77lr28l5dxf"; }; + hash = "sha256-2yBY0wGZ8B1jYC5os9SfH6eKJoWlQ4rAclBC3Pnacoc="; }; boot64 = { url = "${baseurl}/boot.amd64-unix.tgz"; - sha256 = "1zn96a83kb6bn6228yfjsvb58m2qxw9k4j3qz0p9c8za479w4ch6"; }; + hash = "sha256-kUabK03MdSYVRWhWKl3kS32SExUYpM3MtLU0mCxhiaQ="; }; - bootBinary = if stdenv.is64bit + bootBinary = if stdenv.hostPlatform.is64bit then boot64 else boot32; sources = map fetchurl [ bootBinary - { url = "${baseurl}/config.tgz"; sha256 = "09srqxkxl86iaz6l6dz83c1apsac0pxpfq6b74i6l0nfl261jibw"; } - { url = "${baseurl}/cm.tgz"; sha256 = "0gh8inrb07z597axw8qipwyx52m8nac5d5r0rvgzvdnnjg9nr9zy"; } - { url = "${baseurl}/compiler.tgz"; sha256 = "1kk6jwzyc261l5nii3n8rwccmgvcj1mg5fgycfsfsiyyy1v8xfx7"; } - { url = "${baseurl}/runtime.tgz"; sha256 = "17i069h5cv411sgzx3ynlf4v3wlrxiba9bwy1b0x0cyhs879kppc"; } - { url = "${baseurl}/system.tgz"; sha256 = "0s8ij3wfxpjrmrwxrgrirfxjj8vkda6l32j88al5q1ic3ncwc58s"; } - { url = "${baseurl}/MLRISC.tgz"; sha256 = "1v2d3gjxrcgc95x5glqcw0nfp13aapkcw03fyi70m3k1yc61izmz"; } - { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "04i11ki8v9s7yz3lg6b0djhi03zzkzav0b5cr81ypxlkmf4hh6bp"; } - { url = "${baseurl}/old-basis.tgz"; sha256 = "1ryqpy0n7c9gd995ndmjvaci74f95nr8n1jjgm28yd1sn7hnavhi"; } - { url = "${baseurl}/ckit.tgz"; sha256 = "18mcs3j8c5gq9cmck7r175am60blaznqmhzyir622yfc8fpw1map"; } - { url = "${baseurl}/nlffi.tgz"; sha256 = "16mrl5aqbgsgljxa3z8kj5max9drddml34bq7rn1i78594jfvkwk"; } - { url = "${baseurl}/cml.tgz"; sha256 = "00x784nv1pi6534k3vva26i9qx84cvw242vgwbs5020zkm6gvrmn"; } - { url = "${baseurl}/eXene.tgz"; sha256 = "143825h36v6z77kwvrvpszgwnhmjs3yldb18i9z4lwkqfb4kn7f7"; } - { url = "${baseurl}/ml-lpt.tgz"; sha256 = "17ly9h9ry8r94dx6lkas6w2cxknwkpma4z9pj8rgzmd3w6qm7j1z"; } - { url = "${baseurl}/ml-lex.tgz"; sha256 = "1ja3l2kiq17754c58mwdiqi25f7ax0cji2wk0vq4872iwwxc22px"; } - { url = "${baseurl}/ml-yacc.tgz"; sha256 = "1m48nkwvw87yg39sjihlw8na5m34bzz3d4zpfbjaj2f75fkjy3jf"; } - { url = "${baseurl}/ml-burg.tgz"; sha256 = "13nbvbah7bn8gjm4gi41m412vpl69wd6d3x3wzbb6xpia9vm4z4j"; } - { url = "${baseurl}/pgraph.tgz"; sha256 = "1aizkl8avz01kx221xy5z7a1a1b5xqn2hrk66wr8d0iav2nh5c98"; } - { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "1c80xgck9sb2rm554nfg4f5mpjkdbrwkcx88pj120056225l10vx"; } - { url = "${baseurl}/heap2asm.tgz"; sha256 = "1n68drd7as5dy20ccfvgd9cmnhfpfvz7g3f0gc8kpaqaz3vpy36g"; } - { url = "${baseurl}/smlnj-c.tgz"; sha256 = "1b6svh2kk5211rq73fdwx3sf80d2rshf0dmkkrq5mw4852nzqz3p"; } - { url = "${baseurl}/doc.tgz"; sha256 = "021yzhy9maypq4ahz0d0qpr601spndg583fn9mapv6rl42kwhjq6"; } - { url = "${baseurl}/asdl.tgz"; sha256 = "0nqavqcbidwnphbbwjrxhpy8glbyad51wy0cpqimbsw3sgns0zkd"; } + { url = "${baseurl}/config.tgz"; hash = "sha256-9BJPpa/xouqi3j39WsfzlRys4z1yxTdbYttHF5VwCVw="; } + { url = "${baseurl}/cm.tgz"; hash = "sha256-A3crC5EWX4kEB6olwdaObglQgkBBNqcBSCi/pQR5Wdw="; } + { url = "${baseurl}/compiler.tgz"; hash = "sha256-cTgkc5opaEXskdzt5yYsdjyF5m9846t2SyEiwY6W3HU="; } + { url = "${baseurl}/runtime.tgz"; hash = "sha256-JiNzfuZnp1eWQPNZBb9SPmQXtwgknpoGl+38iqUU3W4="; } + { url = "${baseurl}/system.tgz"; hash = "sha256-HUn8YCxlLe6+e5H9oMJjIoG23GBF3thMlHEkSGLZTus="; } + { url = "${baseurl}/MLRISC.tgz"; hash = "sha256-MPNpYhrbsIbVEOzJ7GIEQCm/7F/Jnxj0UXS7FeTp+7o="; } + { url = "${baseurl}/smlnj-lib.tgz"; hash = "sha256-1tp5waPl7MCWS4kIUFm/woQeeRfCjkpgSxHpGb+ymTM="; } + { url = "${baseurl}/old-basis.tgz"; hash = "sha256-I6DJRfIx+09ynFKXZ63dDWRpv0pEljWciAarK/EhQ/s="; } + { url = "${baseurl}/ckit.tgz"; hash = "sha256-vi6dSZISL+KWkpp/jxLPCNBno+qTYThvbExZ5R5L7Wc="; } + { url = "${baseurl}/nlffi.tgz"; hash = "sha256-WfYmX7dhrBqtE4juDVNyjuFtsJ1H+B7rJY2BXJYtKNM="; } + { url = "${baseurl}/cml.tgz"; hash = "sha256-5rZzp5IUj/xZX0fyeoNMohyTz1ifdY6Anu/Hg0spDQw="; } + { url = "${baseurl}/eXene.tgz"; hash = "sha256-c5QnjAQTtlBgYE6DGFMNDbu9ILSEVZgzs/u0bIowfHc="; } + { url = "${baseurl}/ml-lpt.tgz"; hash = "sha256-aRYFTEEl4td7LQ0LhsXGLtJ/ptwCDV1m9GeDtM7+vlo="; } + { url = "${baseurl}/ml-lex.tgz"; hash = "sha256-ZwO3xQUDaD2f7Tsro6kkahT7vSN1JvQbLkwY/m7xSIs="; } + { url = "${baseurl}/ml-yacc.tgz"; hash = "sha256-DBR4xmKiSA5on7+YDz7Zr8qBA6aD1fS64+g69ukSprc="; } + { url = "${baseurl}/ml-burg.tgz"; hash = "sha256-4ruWhGjxny97eUD9Gk4FakqEZzNHwJp7uSa97ET20p0="; } + { url = "${baseurl}/pgraph.tgz"; hash = "sha256-kDyaAMB6Pt3CdAna+V8aLfTx8Tj6a5vPfuSxtpga08w="; } + { url = "${baseurl}/trace-debug-profile.tgz"; hash = "sha256-AD9KWsskRkjTFYiRCIm0qj02sIBHG6HtBM5wKMBqeXY="; } + { url = "${baseurl}/heap2asm.tgz"; hash = "sha256-OHNPMErNoLpYuatgbgYlU/mMB4JXQ4aA50WZ2BHtt3I="; } + { url = "${baseurl}/smlnj-c.tgz"; hash = "sha256-Vure6h0TKqne5+5MJBX9cRkBgmrJ/kKVLUzrIIiH7lE="; } + { url = "${baseurl}/doc.tgz"; hash = "sha256-PliWxCffISPrAO7Zan33recFLRmGoqZLKHOzSEP0PEk="; } + { url = "${baseurl}/asdl.tgz"; hash = "sha256-O6/g20/hsMTG3CvMA59btjG+4UdUbGhMHkizESKJDEA="; } ]; in stdenv.mkDerivation { pname = "smlnj"; - inherit version; - - inherit sources; - - patchPhase = '' - sed -i '/PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh - echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl - patch --verbose config/_heap2exec ${./heap2exec.diff} - '' + lib.optionalString stdenv.isDarwin '' - # Locate standard headers like <unistd.h> - substituteInPlace base/runtime/config/gen-posix-names.sh \ - --replace "\$SDK_PATH/usr" "${Libsystem}" - ''; + inherit version sources; unpackPhase = '' for s in $sources; do @@ -67,6 +55,15 @@ in stdenv.mkDerivation { ./config/unpack $TMP runtime ''; + patchPhase = '' + sed -i '/^PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh + echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl + '' + lib.optionalString stdenv.isDarwin '' + # Locate standard headers like <unistd.h> + substituteInPlace base/runtime/config/gen-posix-names.sh \ + --replace "\$SDK_PATH/usr" "${Libsystem}" + ''; + buildPhase = '' ./config/install.sh -default ${arch} ''; @@ -81,14 +78,14 @@ in stdenv.mkDerivation { done ''; - meta = with lib; { + meta = { description = "Standard ML of New Jersey, a compiler"; homepage = "http://smlnj.org"; - license = licenses.bsd3; + license = lib.licenses.bsd3; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with lib.maintainers; [ skyesoss thoughtpolice ]; mainProgram = "sml"; # never built on x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/development/compilers/smlnj/heap2exec.diff b/pkgs/development/compilers/smlnj/heap2exec.diff deleted file mode 100644 index ef21a8e7f072..000000000000 --- a/pkgs/development/compilers/smlnj/heap2exec.diff +++ /dev/null @@ -1,9 +0,0 @@ -@@ -35,7 +35,7 @@ - BIN_DIR=${SMLNJ_HOME}/bin - fi - --ARCH_N_OPSYS=`"$BIN_DIR/.arch-n-opsys $SIZE_OPT"` -+ARCH_N_OPSYS=`$BIN_DIR/.arch-n-opsys $SIZE_OPT` - if [ "$?" != "0" ]; then - die "unable to determine architecture/operating system" - fi diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix deleted file mode 100644 index 2147d59ffd93..000000000000 --- a/pkgs/development/compilers/solc/default.nix +++ /dev/null @@ -1,133 +0,0 @@ -{ lib, gccStdenv, fetchzip -, pkgs -, boost -, cmake -, coreutils -, jq -, ncurses -, python3 -, z3Support ? true -, z3_4_11 ? null -, cvc4Support ? gccStdenv.isLinux -, cvc4 ? null -, cln ? null -, gmp ? null -}: - -# compiling source/libsmtutil/CVC4Interface.cpp breaks on clang on Darwin, -# general commandline tests fail at abiencoderv2_no_warning/ on clang on NixOS -let z3 = z3_4_11; in - -assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.11.0"; -assert cvc4Support -> cvc4 != null && cln != null && gmp != null; - -let - jsoncppVersion = "1.9.3"; - jsoncppUrl = "https://github.com/open-source-parsers/jsoncpp/archive/${jsoncppVersion}.tar.gz"; - jsoncpp = fetchzip { - url = jsoncppUrl; - sha256 = "1vbhi503rgwarf275ajfdb8vpdcbn1f7917wjkf8jghqwb1c24lq"; - }; - - range3Version = "0.12.0"; - range3Url = "https://github.com/ericniebler/range-v3/archive/${range3Version}.tar.gz"; - range3 = fetchzip { - url = range3Url; - sha256 = "sha256-bRSX91+ROqG1C3nB9HSQaKgLzOHEFy9mrD2WW3PRBWU="; - }; - - fmtlibVersion = "8.0.1"; - fmtlibUrl = "https://github.com/fmtlib/fmt/archive/${fmtlibVersion}.tar.gz"; - fmtlib = fetchzip { - url = fmtlibUrl; - sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw"; - }; - - pname = "solc"; - version = "0.8.21"; - meta = with lib; { - description = "Compiler for Ethereum smart contract language Solidity"; - homepage = "https://github.com/ethereum/solidity"; - license = licenses.gpl3; - maintainers = with maintainers; [ dbrock akru lionello sifmelcara ]; - }; - - solc = if gccStdenv.isLinux then gccStdenv.mkDerivation rec { - inherit pname version meta; - - # upstream suggests avoid using archive generated by github - src = fetchzip { - url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz"; - sha256 = "sha256-6EeRmxAmb1nCQ2FTNtWfQ7HCH0g9nJXC3jnhV0KEOwk="; - }; - - postPatch = '' - substituteInPlace cmake/jsoncpp.cmake \ - --replace "${jsoncppUrl}" ${jsoncpp} - substituteInPlace cmake/range-v3.cmake \ - --replace "${range3Url}" ${range3} - substituteInPlace cmake/fmtlib.cmake \ - --replace "${fmtlibUrl}" ${fmtlib} - ''; - - cmakeFlags = [ - "-DBoost_USE_STATIC_LIBS=OFF" - - ] ++ (if z3Support then [ - "-DSTRICT_Z3_VERSION=OFF" - ] else [ - "-DUSE_Z3=OFF" - ]) ++ lib.optionals (!cvc4Support) [ - "-DUSE_CVC4=OFF" - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ] - ++ lib.optionals z3Support [ z3 ] - ++ lib.optionals cvc4Support [ cvc4 cln gmp ]; - nativeCheckInputs = [ jq ncurses (python3.withPackages (ps: with ps; [ colorama deepdiff devtools docopt docutils requests sphinx tabulate z3-solver ])) ]; # contextlib2 glob2 textwrap3 traceback2 urllib3 - - # tests take 60+ minutes to complete, only run as part of passthru tests - doCheck = false; - - checkPhase = '' - pushd .. - # IPC tests need aleth avaliable, so we disable it - sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh - for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh ./test/*.py; do - patchShebangs "$i" - done - ## TODO: reenable tests below after adding evmone and hera and their dependencies to nixpkgs - #TERM=xterm ./scripts/tests.sh ${lib.optionalString z3Support "--no-smt"} - popd - ''; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/solc --version > /dev/null - ''; - - passthru.tests = { - solcWithTests = solc.overrideAttrs (attrs: { doCheck = true; }); - }; - } else gccStdenv.mkDerivation rec { - inherit pname version meta; - - src = pkgs.fetchurl { - url = "https://github.com/ethereum/solidity/releases/download/v${version}/solc-macos"; - sha256 = "sha256-GdBldJ+wjL/097RShKxVhTBjhl9q6GIeTe+l2Ti5pQI="; - }; - dontUnpack = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp ${src} $out/bin/solc - chmod +x $out/bin/solc - - runHook postInstall - ''; - }; -in - solc diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix deleted file mode 100644 index b851ac2c1403..000000000000 --- a/pkgs/development/compilers/souffle/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, bash-completion, perl, ncurses, zlib, sqlite, libffi -, mcpp, cmake, bison, flex, doxygen, graphviz -, makeWrapper, python3, callPackage -}: - - -let - toolsPath = lib.makeBinPath [ mcpp python3 ]; -in -stdenv.mkDerivation rec { - pname = "souffle"; - version = "2.4.1"; - - src = fetchFromGitHub { - owner = "souffle-lang"; - repo = "souffle"; - rev = version; - sha256 = "sha256-U3/1iNOLFzuXiBsVDAc5AXnK4F982Uifp18jjFNUv2o="; - }; - - 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 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? - propagatedBuildInputs = [ ncurses zlib sqlite libffi ]; - - cmakeFlags = [ "-DSOUFFLE_GIT=OFF" ]; - - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; - }; - - postInstall = '' - 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 markusscherer ]; - license = licenses.upl; - }; -} diff --git a/pkgs/development/compilers/souffle/includes.patch b/pkgs/development/compilers/souffle/includes.patch deleted file mode 100644 index 3e37641a6cab..000000000000 --- a/pkgs/development/compilers/souffle/includes.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 82b4fa489dae..000000000000 --- a/pkgs/development/compilers/souffle/tests.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ 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/souffle/threads.patch b/pkgs/development/compilers/souffle/threads.patch deleted file mode 100644 index cf23baa1550d..000000000000 --- a/pkgs/development/compilers/souffle/threads.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 73d5c3c84..e4b0dbfd1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -104,13 +104,6 @@ option(SOUFFLE_CUSTOM_GETOPTLONG "Enable/Disable custom getopt_long implementati - cmake_dependent_option(SOUFFLE_USE_LIBCPP "Link to libc++ instead of libstdc++" ON - "CMAKE_CXX_COMPILER_ID STREQUAL Clang" OFF) - --# Using Clang? Likely want to use `lld` too. --if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld") -- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld") -- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld") --endif() -- - # Add aditional modules to CMake - set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) - -@@ -247,7 +240,11 @@ endif() - # pthreads - # -------------------------------------------------- - set(THREADS_PREFER_PTHREAD_FLAG ON) --find_package(Threads REQUIRED) -+set(CMAKE_THREAD_LIBS_INIT "-lpthread") -+set(CMAKE_HAVE_THREADS_LIBRARY 1) -+set(CMAKE_USE_WIN32_THREADS_INIT 0) -+set(CMAKE_USE_PTHREADS_INIT 1) -+set(THREADS_PREFER_PTHREAD_FLAG ON) - - # -------------------------------------------------- - # OpenMP diff --git a/pkgs/development/compilers/spasm-ng/default.nix b/pkgs/development/compilers/spasm-ng/default.nix deleted file mode 100644 index fac19ce6cd32..000000000000 --- a/pkgs/development/compilers/spasm-ng/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, gmp, gcc, openssl, zlib }: - -stdenv.mkDerivation rec { - pname = "spasm-ng"; - - version = "unstable-2022-07-05"; - - src = fetchFromGitHub { - owner = "alberthdev"; - repo = "spasm-ng"; - rev = "5f0786d38f064835be674d4b7df42969967bb73c"; - sha256 = "sha256-j7Z3oI+J0wZF4EG5OMMjuDe2o69KKGuJvfyHNPTLrXM="; - }; - - # GCC is needed for Darwin - nativeBuildInputs = [ makeWrapper gcc ]; - buildInputs = [ gmp openssl zlib ]; - - enableParallelBuilding = true; - - installPhase = '' - runHook preInstall - - install -Dm755 spasm -t $out/bin - install -Dm555 inc/*.inc -t $out/include - - runHook postInstall - ''; - - postFixup = '' - wrapProgram $out/bin/spasm --add-flags "-I $out/include" - ''; - - meta = with lib; { - homepage = "https://github.com/alberthdev/spasm-ng"; - description = "Z80 assembler with extra features to support development for TI calculators"; - mainProgram = "spasm"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ siraben ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix deleted file mode 100644 index 20adaf5f559b..000000000000 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, pkg-config -, lit -, llvm -, spirv-headers -, spirv-tools -}: - -let - llvmMajor = lib.versions.major llvm.version; - isROCm = lib.hasPrefix "rocm" llvm.pname; - - # ROCm, if actively updated will always be at the latest version - branch = - if llvmMajor == "18" then rec { - version = "18.1.0"; - rev = "v${version}"; - hash = "sha256-64guZiuO7VpaX01wNIjV7cnjEAe6ineMdY44S6sA33k="; - } else if llvmMajor == "17" || isROCm then rec { - version = "17.0.0"; - rev = "v${version}"; - hash = "sha256-Rzm5Py9IPFtS9G7kME+uSwZ/0gPGW6MlL35ZWk4LfHM="; - } else if llvmMajor == "16" then rec { - version = "16.0.0"; - rev = "v${version}"; - hash = "sha256-EUabcYqSjXshbPmcs1DRLvCSL1nd9rEdpqELBrItCW8="; - } else if llvmMajor == "15" then rec { - version = "15.0.0"; - rev = "v${version}"; - hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI="; - } else if llvmMajor == "14" then { - version = "14.0.0+unstable-2024-07-15"; - rev = "2823e7052b7999c10fff63bc8089e5aa205716f4"; - hash = "sha256-8/4B74hYge6WiH7PzRGEgE3W7f9IkQ4VMmfkWKYA/l4="; - } else if llvmMajor == "11" then { - version = "11.0.0+unstable-2022-05-04"; - rev = "4ef524240833abfeee1c5b9fff6b1bd53f4806b3"; # 267 commits ahead of v11.0.0 - hash = "sha256-NoIoa20+2sH41rEnr8lsMhtfesrtdPINiXtUnxYVm8s="; - } else throw "Incompatible LLVM version."; -in -stdenv.mkDerivation { - pname = "SPIRV-LLVM-Translator"; - inherit (branch) version; - - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "SPIRV-LLVM-Translator"; - inherit (branch) rev hash; - }; - - patches = lib.optionals (llvmMajor == "18") [ - # Fixes build after SPV_INTEL_maximum_registers breaking change - # TODO: remove on next spirv-headers release - (fetchpatch { - url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/d970c9126c033ebcbb7187bc705eae2e54726b74.patch"; - revert = true; - hash = "sha256-71sJuGqVjTcB549eIiCO0LoqAgxkdEHCoxh8Pd/Qzz8="; - }) - ] ++ lib.optionals (lib.versionAtLeast llvmMajor "15" && lib.versionOlder llvmMajor "18") [ - # Fixes build after spirv-headers breaking change - (fetchpatch { - url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/0166a0fb86dc6c0e8903436bbc3a89bc3273ebc0.patch"; - excludes = ["spirv-headers-tag.conf"]; - hash = "sha256-17JJG8eCFVphElY5fVT/79hj0bByWxo8mVp1ZNjQk/M="; - }) - ] ++ lib.optionals (llvmMajor == "16") [ - # Fixes builds that link against external LLVM dynamic library - (fetchpatch { - url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/f3b9b604d7eda18d0d1029d94a6eebd33aa3a3fe.patch"; - hash = "sha256-opDjyZcy7O4wcSfm/A51NCIiDyIvbcmbv9ns1njdJbc="; - }) - ] ++ lib.optionals (llvmMajor == "14") [ - (fetchpatch { - # tries to install llvm-spirv into llvm nix store path - url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/cce9a2f130070d799000cac42fe24789d2b777ab.patch"; - revert = true; - hash = "sha256-GbFacttZRDCgA0jkUoFA4/B3EDn3etweKvM09OwICJ8="; - }) - ]; - - nativeBuildInputs = [ pkg-config cmake ] - ++ (if isROCm then [ llvm ] else [ llvm.dev ]); - - buildInputs = [ spirv-headers spirv-tools ] - ++ lib.optionals (!isROCm) [ llvm ]; - - nativeCheckInputs = [ lit ]; - - cmakeFlags = [ - "-DLLVM_INCLUDE_TESTS=ON" - "-DLLVM_DIR=${(if isROCm then llvm else llvm.dev)}" - "-DBUILD_SHARED_LIBS=YES" - "-DLLVM_SPIRV_BUILD_EXTERNAL=YES" - # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ] ++ lib.optional (llvmMajor != "11") "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}"; - - # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist - doCheck = false; - - makeFlags = [ "all" "llvm-spirv" ]; - - postInstall = '' - install -D tools/llvm-spirv/llvm-spirv $out/bin/llvm-spirv - '' + lib.optionalString stdenv.isDarwin '' - install_name_tool $out/bin/llvm-spirv \ - -change @rpath/libLLVMSPIRVLib.dylib $out/lib/libLLVMSPIRVLib.dylib - ''; - - meta = with lib; { - homepage = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator"; - description = "Tool and a library for bi-directional translation between SPIR-V and LLVM IR"; - mainProgram = "llvm-spirv"; - license = licenses.ncsa; - platforms = platforms.unix; - maintainers = with maintainers; [ gloaming ]; - }; -} diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix deleted file mode 100644 index 245ebdb0c6cb..000000000000 --- a/pkgs/development/compilers/stalin/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ fetchurl, lib, stdenv, ncompress, libX11 }: - -stdenv.mkDerivation rec { - pname = "stalin"; - version = "0.11"; - - src = fetchurl { - url = "ftp://ftp.ecn.purdue.edu/qobi/stalin.tar.Z"; - sha256 = "0lz8riccpigdixwf6dswwva6s4kxaz3dzxhkqhcxgwmffy30vw8s"; - }; - - buildInputs = [ ncompress libX11 ]; - - buildPhase = "./build "; - - installPhase = '' - mkdir -p "$out/bin" - cp stalin "$out/bin" - - mkdir -p "$out/man/man1" - cp stalin.1 "$out/man/man1" - - mkdir -p "$out/share/emacs/site-lisp" - cp stalin.el "$out/share/emacs/site-lisp" - - mkdir -p "$out/doc/stalin-${version}" - cp README "$out/doc/stalin-${version}" - - mkdir -p "$out/share/stalin-${version}/include" - cp "include/"* "$out/share/stalin-${version}/include" - - substituteInPlace "$out/bin/stalin" \ - --replace "$PWD/include/stalin" "$out/share/stalin-${version}/include/stalin" - substituteInPlace "$out/bin/stalin" \ - --replace "$PWD/include" "$out/share/stalin-${version}/include" - ''; - - meta = { - homepage = "http://www.ece.purdue.edu/~qobi/software.html"; - license = lib.licenses.gpl2Plus; - description = "Optimizing Scheme compiler"; - - maintainers = [ ]; - platforms = ["i686-linux"]; # doesn't want to work on 64-bit platforms - }; -} diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 628e69eb5bc9..9336adb1cd76 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -54,7 +54,7 @@ # url = "https://raw.githubusercontent.com/samer--/prolog/master/typedef/release/typedef-0.1.9.tgz"; # sha256 = "056nqjn01g18fb1b2qivv9s7hb4azk24nx2d4kvkbmm1k91f44p3"; # }; -# swiProlog = pkgs.swiProlog.override { extraPacks = map (dep-path: "'file://${dep-path}'") [ +# swi-prolog = pkgs.swi-prolog.override { extraPacks = map (dep-path: "'file://${dep-path}'") [ # julian delay list_util typedef # ]; }; , extraPacks ? [] @@ -63,7 +63,7 @@ let # minorVersion is even for stable, odd for unstable - version = "9.2.6"; + version = "9.2.7"; # 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. @@ -71,10 +71,10 @@ let 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/extra-pack\"), silent(true), interactive(false)])." -t "halt." - ''; - withGui' = withGui && !stdenv.isDarwin; + packInstall = swiplPath: pack: '' + ${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/extra-pack\"), silent(true), interactive(false), git(false)])." -t "halt." + ''; + withGui' = withGui && !stdenv.hostPlatform.isDarwin; optionalDependencies = [] ++ (lib.optional withDb db) ++ (lib.optional withJava jdk) @@ -85,7 +85,7 @@ let ++ (lib.optionals withGui' [ libXt libXext libXpm libXft libXinerama libjpeg libSM freetype fontconfig ]) - ++ (lib.optional stdenv.isDarwin Security) + ++ (lib.optional stdenv.hostPlatform.isDarwin Security) ++ extraLibraries'; in stdenv.mkDerivation { @@ -99,7 +99,7 @@ stdenv.mkDerivation { owner = "SWI-Prolog"; repo = "swipl"; rev = "V${version}"; - hash = "sha256-FgEn+Ht45++GFpfcdaJ5In5x+NyIOopSlSAs+t7sPDE="; + hash = "sha256-O9ogltcbBST111FA85jEVW6jGOLJSt/5PeBABtMu2Ws="; fetchSubmodules = true; }; @@ -126,8 +126,8 @@ stdenv.mkDerivation { 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++"}" + "-DSWIPL_CC=${if stdenv.hostPlatform.isDarwin then "clang" else "gcc"}" + "-DSWIPL_CXX=${if stdenv.hostPlatform.isDarwin then "clang++" else "g++"}" ]; preInstall = '' diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index d3e2017958fd..8e8cf798db4f 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -6,7 +6,7 @@ , coreutils , gnugrep , perl -, ninja +, ninja_1_11 , pkg-config , clang , bintools @@ -30,38 +30,29 @@ # Darwin-specific , substituteAll , fixDarwinDylibNames -, runCommandLocal , xcbuild , cctools # libtool , sigtool , DarwinTools -, CoreServices -, Foundation -, Combine -, MacOSX-SDK -, CLTools_Executables +, apple-sdk_13 +, darwinMinVersionHook }: let + apple-sdk_swift = apple-sdk_13; # Use the SDK that was available when Swift shipped. + + deploymentVersion = + if lib.versionOlder (targetPlatform.darwinMinVersion or "0") "10.15" then + "10.15" + else + targetPlatform.darwinMinVersion; + python3 = python3Packages.python.withPackages (p: [ p.setuptools ]); # python 3.12 compat. inherit (stdenv) hostPlatform targetPlatform; sources = callPackage ../sources.nix { }; - # Tools invoked by swift at run-time. - runtimeDeps = lib.optionals stdenv.isDarwin [ - # libtool is used for static linking. This is part of cctools, but adding - # that as a build input puts an unwrapped linker in PATH, and breaks - # builds. This small derivation exposes just libtool. - # NOTE: The same applies to swift-driver, but that is currently always - # invoked via the old `swift` / `swiftc`. May change in the future. - (runCommandLocal "libtool" { } '' - mkdir -p $out/bin - ln -s ${cctools}/bin/libtool $out/bin/libtool - '') - ]; - # There are apparently multiple naming conventions on Darwin. Swift uses the # xcrun naming convention. See `configure_sdk_darwin` calls in CMake files. swiftOs = if targetPlatform.isDarwin @@ -78,7 +69,7 @@ let else targetPlatform.parsed.kernel.name; # Apple Silicon uses a different CPU name in the target triple. - swiftArch = if stdenv.isDarwin && stdenv.isAarch64 then "arm64" + swiftArch = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then "arm64" else targetPlatform.parsed.cpu.name; # On Darwin, a `.swiftmodule` is a subdirectory in `lib/swift/<OS>`, @@ -109,7 +100,7 @@ let "toolchain-tools" "toolchain-dev-tools" "license" - (if stdenv.isDarwin then "sourcekit-xpc-service" else "sourcekit-inproc") + (if stdenv.hostPlatform.isDarwin then "sourcekit-xpc-service" else "sourcekit-inproc") "swift-remote-mirror" "swift-remote-mirror-headers" ]; @@ -158,7 +149,9 @@ let # NOTE: @prog@ needs to be filled elsewhere. }; swiftWrapper = runCommand "swift-wrapper.sh" wrapperParams '' - substituteAll '${../wrapper/wrapper.sh}' "$out" + # Make empty to avoid adding the SDK’s modules in the bootstrap wrapper. Otherwise, the SDK conflicts with the + # shims the wrapper tries to build. + darwinMinVersion="" substituteAll '${../wrapper/wrapper.sh}' "$out" ''; makeSwiftcWrapper = writeShellScriptBin "nix-swift-make-swift-wrapper" '' set -euo pipefail @@ -179,15 +172,32 @@ let name = "apple-swift-core"; dontUnpack = true; + buildInputs = [ apple-sdk_swift ]; + installPhase = '' mkdir -p $out/lib/swift cp -r \ - "${MacOSX-SDK}/usr/lib/swift/Swift.swiftmodule" \ - "${MacOSX-SDK}/usr/lib/swift/libswiftCore.tbd" \ + "$SDKROOT/usr/lib/swift/Swift.swiftmodule" \ + "$SDKROOT/usr/lib/swift/CoreFoundation.swiftmodule" \ + "$SDKROOT/usr/lib/swift/Dispatch.swiftmodule" \ + "$SDKROOT/usr/lib/swift/ObjectiveC.swiftmodule" \ + "$SDKROOT/usr/lib/swift/libswiftCore.tbd" \ + "$SDKROOT/usr/lib/swift/libswiftCoreFoundation.tbd" \ + "$SDKROOT/usr/lib/swift/libswiftDispatch.tbd" \ + "$SDKROOT/usr/lib/swift/libswiftFoundation.tbd" \ + "$SDKROOT/usr/lib/swift/libswiftObjectiveC.tbd" \ $out/lib/swift/ ''; }; + # https://github.com/NixOS/nixpkgs/issues/327836 + # Fail to build with ninja 1.12 when NIX_BUILD_CORES is low (Hydra or Github Actions). + # Can reproduce using `nix --option cores 2 build -f . swiftPackages.swift-unwrapped`. + # Until we find out the exact cause, follow [swift upstream][1], pin ninja to version + # 1.11.1. + # [1]: https://github.com/swiftlang/swift/pull/72989 + ninja = ninja_1_11; + in stdenv.mkDerivation { pname = "swift"; inherit (sources) version; @@ -205,11 +215,12 @@ in stdenv.mkDerivation { makeClangWrapper makeSwiftcWrapper ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild sigtool # codesign DarwinTools # sw_vers fixDarwinDylibNames + cctools.libtool ]; buildInputs = [ @@ -218,15 +229,20 @@ in stdenv.mkDerivation { swig libxml2 ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libuuid ] - ++ lib.optionals stdenv.isDarwin [ - CoreServices - Foundation - Combine + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_swift + (darwinMinVersionHook deploymentVersion) ]; + # Will effectively be `buildInputs` when swift is put in `nativeBuildInputs`. + depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ + apple-sdk_swift + (darwinMinVersionHook deploymentVersion) + ]; + # This is a partial reimplementation of our setup hook. Because we reuse # the Swift wrapper for the Swift build itself, we need to do some of the # same preparation. @@ -262,7 +278,7 @@ in stdenv.mkDerivation { ${copySource "swift-experimental-string-processing"} ${copySource "swift-syntax"} ${lib.optionalString - (!stdenv.isDarwin) + (!stdenv.hostPlatform.isDarwin) (copySource "swift-corelibs-libdispatch")} chmod -R u+w . @@ -272,7 +288,7 @@ in stdenv.mkDerivation { # Just patch all the things for now, we can focus this later. # TODO: eliminate use of env. find -type f -print0 | xargs -0 sed -i \ - ${lib.optionalString stdenv.isDarwin + ${lib.optionalString stdenv.hostPlatform.isDarwin "-e 's|/usr/libexec/PlistBuddy|${xcbuild}/bin/PlistBuddy|g'"} \ -e 's|/usr/bin/env|${coreutils}/bin/env|g' \ -e 's|/usr/bin/make|${gnumake}/bin/make|g' \ @@ -345,7 +361,7 @@ in stdenv.mkDerivation { hash = "sha256-nkRPWx8gNvYr7mlvEUiOAb1rTrf+skCZjAydJVUHrcI="; }} - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace llvm-project/clang/lib/Driver/ToolChains/Linux.cpp \ --replace 'SysRoot + "/lib' '"${glibc}/lib" "' \ --replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "' \ @@ -384,7 +400,7 @@ in stdenv.mkDerivation { patchShebangs . - ${lib.optionalString (!stdenv.isDarwin) '' + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # NOTE: This interferes with ABI stability on Darwin, which uses the system # libraries in the hardcoded path /usr/lib/swift. fixCmakeFiles . @@ -392,16 +408,13 @@ 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.isAarch64 "zerocallusedregs"; + hardeningDisable = lib.optional stdenv.hostPlatform.isAarch64 "zerocallusedregs"; configurePhase = '' export SWIFT_SOURCE_ROOT="$PWD" mkdir -p ../build cd ../build export SWIFT_BUILD_ROOT="$PWD" - - # Most builds set a target, but LLDB doesn't. Harmless on non-Darwin. - export MACOSX_DEPLOYMENT_TARGET=10.15 ''; # These steps are derived from doing a normal build with. @@ -451,15 +464,11 @@ in stdenv.mkDerivation { " buildProject llvm llvm-project/llvm - '' + lib.optionalString stdenv.isDarwin '' - # Add appleSwiftCore to the search paths. We can't simply add it to - # buildInputs, because it is potentially an older stdlib than the one we're - # building. We have to remove it again after the main Swift build, or later - # build steps may fail. (Specific case: Concurrency backdeploy uses the - # Sendable protocol, which appears to not be present in the macOS 11 SDK.) + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Add appleSwiftCore to the search paths. Adding the whole SDK results in build failures. OLD_NIX_SWIFTFLAGS_COMPILE="$NIX_SWIFTFLAGS_COMPILE" OLD_NIX_LDFLAGS="$NIX_LDFLAGS" - export NIX_SWIFTFLAGS_COMPILE+=" -I ${appleSwiftCore}/lib/swift" + export NIX_SWIFTFLAGS_COMPILE=" -I ${appleSwiftCore}/lib/swift" export NIX_LDFLAGS+=" -L ${appleSwiftCore}/lib/swift" '' + '' @@ -477,7 +486,7 @@ in stdenv.mkDerivation { # Fixed in: https://github.com/apple/swift/commit/84083afef1de5931904d5c815d53856cdb3fb232 cmakeFlags=" -GNinja - -DBOOTSTRAPPING_MODE=BOOTSTRAPPING${lib.optionalString stdenv.isDarwin "-WITH-HOSTLIBS"} + -DBOOTSTRAPPING_MODE=BOOTSTRAPPING${lib.optionalString stdenv.hostPlatform.isDarwin "-WITH-HOSTLIBS"} -DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=ON -DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY=ON -DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED=ON @@ -490,11 +499,12 @@ in stdenv.mkDerivation { -DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE=$SWIFT_SOURCE_ROOT/swift-syntax -DSWIFT_PATH_TO_STRING_PROCESSING_SOURCE=$SWIFT_SOURCE_ROOT/swift-experimental-string-processing -DSWIFT_INSTALL_COMPONENTS=${lib.concatStringsSep ";" swiftInstallComponents} - -DSWIFT_STDLIB_ENABLE_OBJC_INTEROP=${if stdenv.isDarwin then "ON" else "OFF"} + -DSWIFT_STDLIB_ENABLE_OBJC_INTEROP=${if stdenv.hostPlatform.isDarwin then "ON" else "OFF"} + -DSWIFT_DARWIN_DEPLOYMENT_VERSION_OSX=${deploymentVersion} " buildProject swift - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Restore search paths to remove appleSwiftCore. export NIX_SWIFTFLAGS_COMPILE="$OLD_NIX_SWIFTFLAGS_COMPILE" export NIX_LDFLAGS="$OLD_NIX_LDFLAGS" @@ -506,12 +516,6 @@ in stdenv.mkDerivation { # which requires a special signature. # # CMAKE_BUILD_WITH_INSTALL_NAME_DIR ensures we don't use rpath on Darwin. - # - # NOTE: On Darwin, we only want ncurses in the linker search path, because - # headers are part of libsystem. Adding its headers to the search path - # causes strange mixing and errors. Note that libedit propagates ncurses, - # so we add both manually here, instead of relying on setup hooks. - # TODO: Find a better way to prevent this conflict. cmakeFlags=" -GNinja -DLLDB_SWIFTC=$SWIFT_BUILD_ROOT/swift/bin/swiftc @@ -526,18 +530,18 @@ in stdenv.mkDerivation { -DLLDB_ENABLE_LUA=OFF -DLLDB_INCLUDE_TESTS=OFF -DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' -DLLDB_USE_SYSTEM_DEBUGSERVER=ON ''} - -DLibEdit_INCLUDE_DIRS=${libedit.dev}/include - -DLibEdit_LIBRARIES=${libedit}/lib/libedit${stdenv.hostPlatform.extensions.sharedLibrary} - -DCURSES_INCLUDE_DIRS=${if stdenv.isDarwin then "/var/empty" else ncurses.dev}/include - -DCURSES_LIBRARIES=${ncurses}/lib/libncurses${stdenv.hostPlatform.extensions.sharedLibrary} - -DPANEL_LIBRARIES=${ncurses}/lib/libpanel${stdenv.hostPlatform.extensions.sharedLibrary} + -DLibEdit_INCLUDE_DIRS=${lib.getInclude libedit}/include + -DLibEdit_LIBRARIES=${lib.getLib libedit}/lib/libedit${stdenv.hostPlatform.extensions.sharedLibrary} + -DCURSES_INCLUDE_DIRS=${lib.getInclude ncurses}/include + -DCURSES_LIBRARIES=${lib.getLib ncurses}/lib/libncurses${stdenv.hostPlatform.extensions.sharedLibrary} + -DPANEL_LIBRARIES=${lib.getLib ncurses}/lib/libpanel${stdenv.hostPlatform.extensions.sharedLibrary} "; buildProject lldb llvm-project/lldb - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' # Need to do a standalone build of concurrency for Darwin back deployment. # Based on: utils/swift_build_support/swift_build_support/products/backdeployconcurrency.py cmakeFlags=" @@ -586,7 +590,7 @@ in stdenv.mkDerivation { -DSWIFT_DEST_ROOT=$out -DSWIFT_HOST_VARIANT_SDK=OSX - -DSWIFT_DARWIN_DEPLOYMENT_VERSION_OSX=10.15 + -DSWIFT_DARWIN_DEPLOYMENT_VERSION_OSX=${deploymentVersion} -DSWIFT_DARWIN_DEPLOYMENT_VERSION_IOS=13.0 -DSWIFT_DARWIN_DEPLOYMENT_VERSION_MACCATALYST=13.0 -DSWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS=13.0 @@ -641,7 +645,7 @@ in stdenv.mkDerivation { cd $SWIFT_BUILD_ROOT/swift ninjaInstallPhase - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' cd $SWIFT_BUILD_ROOT/swift-concurrency-backdeploy installTargets=install-back-deployment ninjaInstallPhase @@ -668,21 +672,15 @@ in stdenv.mkDerivation { # just copying the 3 symlinks inside to smaller closures. mkdir $lib/lib/swift/clang cp -P ${clang}/resource-root/* $lib/lib/swift/clang/ - - ${lib.optionalString stdenv.isDarwin '' - # Install required library for ObjC interop. - # TODO: Is there no source code for this available? - cp -r ${CLTools_Executables}/usr/lib/arc $out/lib/arc - ''} ''; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' # This is cheesy, but helps the patchelf hook remove /build from RPATH. cd $SWIFT_BUILD_ROOT/.. mv build buildx ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' # These libraries need to use the system install name. The official SDK # does the same (as opposed to using rpath). Presumably, they are part of # the stable ABI. Not using the system libraries at run-time is known to @@ -713,7 +711,10 @@ in stdenv.mkDerivation { done wrapProgram $out/bin/swift-frontend \ - --prefix PATH : ${lib.makeBinPath runtimeDeps} + --prefix PATH : ${lib.makeBinPath [ cctools.libtool ]} + + # Needs to be propagated by the compiler not by its dev output. + moveToOutput nix-support/propagated-target-target-deps "$out" ''; passthru = { diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index e55465e952d5..3ddd48399b1a 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -5,6 +5,7 @@ , llvmPackages , llvmPackages_15 , overrideCC +, overrideLibcxx }: let @@ -15,7 +16,11 @@ let callPackage = newScope self; # Current versions of Swift on Darwin require macOS SDK 10.15 at least. - # Re-export this so we can rely on the minimum Swift SDK elsewhere. + # The Swift compiler propagates the 13.3 SDK and a 10.15 deployment target. + # Packages that need a newer version can add it to their build inputs + # to use it (as normal). + + # This SDK is included for compatibility with existing packages. apple_sdk = pkgs.darwin.apple_sdk_11_0; # Swift builds its own Clang for internal use. We wrap that clang with a @@ -24,43 +29,24 @@ let # we'll often run into compilation errors. # # The following selects the correct Clang version, matching the version - # used in Swift, and applies the same libc overrides as `apple_sdk.stdenv`. - clang = if pkgs.stdenv.isDarwin - then - swiftLlvmPackages.clang.override rec { - libc = apple_sdk.Libsystem; - bintools = pkgs.bintools.override { inherit libc; }; - # Ensure that Swift’s internal clang uses the same libc++ and libc++abi as the - # default Darwin stdenv. Using the default libc++ avoids issues (such as crashes) - # that can happen when a Swift application dynamically links different versions - # of libc++ and libc++abi than libraries it links are using. - inherit (llvmPackages) libcxx; - } - else - swiftLlvmPackages.clang; + # used in Swift. + inherit (swiftLlvmPackages) clang; # Overrides that create a useful environment for swift packages, allowing - # packaging with `swiftPackages.callPackage`. These are similar to - # `apple_sdk_11_0.callPackage`, with our clang on top. + # packaging with `swiftPackages.callPackage`. inherit (clang) bintools; - stdenv = overrideCC pkgs.stdenv clang; - darwin = pkgs.darwin.overrideScope (_: prev: { - inherit apple_sdk; - inherit (apple_sdk) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security; - CF = apple_sdk.CoreFoundation // { __attrsFailEvaluation = true; }; - __attrsFailEvaluation = true; - }); - xcodebuild = pkgs.xcbuild.override { - inherit (apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; - inherit stdenv; - sdkVer = "10.15"; - }; - xcbuild = xcodebuild; + stdenv = + let + stdenv' = overrideCC pkgs.stdenv clang; + in + # Ensure that Swift’s internal clang uses the same libc++ and libc++abi as the + # default clang’s stdenv. Using the default libc++ avoids issues (such as crashes) + # that can happen when a Swift application dynamically links different versions + # of libc++ and libc++abi than libraries it links are using. + if stdenv'.cc.libcxx != null then overrideLibcxx stdenv' else stdenv'; swift-unwrapped = callPackage ./compiler { inherit (darwin) DarwinTools sigtool; - inherit (apple_sdk) MacOSX-SDK CLTools_Executables; - inherit (apple_sdk.frameworks) CoreServices Foundation Combine; }; swiftNoSwiftDriver = callPackage ./wrapper { @@ -68,12 +54,12 @@ let useSwiftDriver = false; }; - Dispatch = if stdenv.isDarwin - then null # part of libsystem + Dispatch = if stdenv.hostPlatform.isDarwin + then null # part of apple-sdk else callPackage ./libdispatch { swift = swiftNoSwiftDriver; }; - Foundation = if stdenv.isDarwin - then apple_sdk.frameworks.Foundation + Foundation = if stdenv.hostPlatform.isDarwin + then null # part of apple-sdk else callPackage ./foundation { swift = swiftNoSwiftDriver; }; # TODO: Apple distributes a binary XCTest with Xcode, but it is not part of diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix index f0c08a41e43e..2d1cd6dd0440 100644 --- a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix +++ b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix @@ -21,7 +21,7 @@ let # are part of libsystem. Adding its headers to the search path causes strange # mixing and errors. # TODO: Find a better way to prevent this conflict. - ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; + ncursesInput = if stdenv.hostPlatform.isDarwin then ncurses.out else ncurses; in stdenv.mkDerivation { pname = "sourcekit-lsp"; @@ -35,7 +35,7 @@ stdenv.mkDerivation { XCTest sqlite ncursesInput - ] ++ lib.optionals stdenv.isDarwin [ CryptoKit LocalAuthentication ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CryptoKit LocalAuthentication ]; configurePhase = generated.configure + '' swiftpmMakeMutable indexstore-db diff --git a/pkgs/development/compilers/swift/swift-docc/default.nix b/pkgs/development/compilers/swift/swift-docc/default.nix index 2645f07aa4ec..13595882241b 100644 --- a/pkgs/development/compilers/swift/swift-docc/default.nix +++ b/pkgs/development/compilers/swift/swift-docc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ swift swiftpm ]; buildInputs = [ Foundation XCTest ] - ++ lib.optionals stdenv.isDarwin [ CryptoKit LocalAuthentication ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CryptoKit LocalAuthentication ]; configurePhase = generated.configure; diff --git a/pkgs/development/compilers/swift/swift-driver/default.nix b/pkgs/development/compilers/swift/swift-driver/default.nix index ca2b88046c86..03c7898fe112 100644 --- a/pkgs/development/compilers/swift/swift-driver/default.nix +++ b/pkgs/development/compilers/swift/swift-driver/default.nix @@ -19,7 +19,7 @@ let # are part of libsystem. Adding its headers to the search path causes strange # mixing and errors. # TODO: Find a better way to prevent this conflict. - ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; + ncursesInput = if stdenv.hostPlatform.isDarwin then ncurses.out else ncurses; in stdenv.mkDerivation { pname = "swift-driver"; diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix index 712bc01777a5..48718527965c 100644 --- a/pkgs/development/compilers/swift/swiftpm/default.nix +++ b/pkgs/development/compilers/swift/swiftpm/default.nix @@ -17,6 +17,7 @@ , makeWrapper , DarwinTools # sw_vers , cctools # vtool +, darwinMinVersionHook , xcbuild , CryptoKit , LocalAuthentication @@ -81,7 +82,7 @@ let # Tools invoked by swiftpm at run-time. runtimeDeps = [ git ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun # These tools are part of cctools, but adding that as a build input puts # an unwrapped linker in PATH, and breaks builds. This small derivation @@ -99,13 +100,13 @@ let mkBootstrapDerivation = attrs: stdenv.mkDerivation (attrs // { nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ cmake ninja swift ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; buildInputs = (attrs.buildInputs or [ ]) ++ [ Foundation ]; postPatch = (attrs.postPatch or "") - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # On Darwin only, Swift uses arm64 as cpu arch. if [ -e cmake/modules/SwiftSupport.cmake ]; then substituteInPlace cmake/modules/SwiftSupport.cmake \ @@ -113,15 +114,8 @@ let fi ''; - preConfigure = (attrs.preConfigure or "") - + '' - # Builds often don't set a target, and our default minimum macOS deployment - # target on x86_64-darwin is too low. Harmless on non-Darwin. - export MACOSX_DEPLOYMENT_TARGET=10.15.4 - ''; - postInstall = (attrs.postInstall or "") - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # The install name of libraries is incorrectly set to lib/ (via our # CMake setup hook) instead of lib/swift/. This'd be easily fixed by # fixDarwinDylibNames, but some builds create libraries that reference @@ -149,7 +143,7 @@ let # are part of libsystem. Adding its headers to the search path causes strange # mixing and errors. # TODO: Find a better way to prevent this conflict. - ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; + ncursesInput = if stdenv.hostPlatform.isDarwin then ncurses.out else ncurses; # Derivations for bootstrapping dependencies using CMake. # This is based on the `swiftpm/Utilities/bootstrap` script. @@ -168,7 +162,7 @@ let src = generated.sources.swift-system; postInstall = cmakeGlue.SwiftSystem - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # The cmake rules apparently only use the Darwin install convention. # Fix up the installation so the module can be found on non-Darwin. mkdir -p $out/${swiftStaticModuleSubdir} @@ -188,7 +182,7 @@ let ''; postInstall = cmakeGlue.SwiftCollections - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # The cmake rules apparently only use the Darwin install convention. # Fix up the installation so the module can be found on non-Darwin. mkdir -p $out/${swiftStaticModuleSubdir} @@ -245,7 +239,7 @@ let ]; postInstall = cmakeGlue.ArgumentParser - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' # Fix rpath so ArgumentParserToolInfo can be found. patchelf --add-rpath "$out/lib/swift/${swiftOs}" \ $out/lib/swift/${swiftOs}/libArgumentParser.so @@ -266,7 +260,7 @@ let name = "llbuild"; src = generated.sources.swift-llbuild; - nativeBuildInputs = lib.optional stdenv.isDarwin xcbuild; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin xcbuild; buildInputs = [ ncursesInput sqlite ]; patches = [ @@ -362,7 +356,7 @@ let swift-driver swift-system swift-tools-support-core - ]; + ] ++ lib.optionals stdenv.isDarwin [ (darwinMinVersionHook "10.15.4") ]; cmakeFlags = [ "-DUSE_CMAKE_INSTALL=ON" @@ -389,10 +383,10 @@ in stdenv.mkDerivation (commonAttrs // { sqlite XCTest ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CryptoKit LocalAuthentication - ]; + ] ++ lib.optionals stdenv.isDarwin [ (darwinMinVersionHook "10.15.4") ]; configurePhase = generated.configure + '' # Functionality provided by Xcode XCTest, but not available in @@ -411,9 +405,6 @@ in stdenv.mkDerivation (commonAttrs // { ''; buildPhase = '' - # Required to link with swift-corelibs-xctest on Darwin. - export SWIFTTSC_MACOS_DEPLOYMENT_TARGET=10.12 - TERM=dumb swift-build -c release ''; diff --git a/pkgs/development/compilers/swift/swiftpm/setup-hook.sh b/pkgs/development/compilers/swift/swiftpm/setup-hook.sh index 160fbb1ccca3..260d874ebfd7 100644 --- a/pkgs/development/compilers/swift/swiftpm/setup-hook.sh +++ b/pkgs/development/compilers/swift/swiftpm/setup-hook.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash + # Build using 'swift-build'. swiftpmBuildPhase() { runHook preBuild @@ -8,10 +10,10 @@ swiftpmBuildPhase() { fi local flagsArray=( - -j $buildCores + -j "$buildCores" -c "${swiftpmBuildConfig-release}" - $swiftpmFlags "${swiftpmFlagsArray[@]}" ) + concatTo flagsArray swiftpmFlags swiftpmFlagsArray echoCmd 'build flags' "${flagsArray[@]}" TERM=dumb swift-build "${flagsArray[@]}" @@ -33,10 +35,10 @@ swiftpmCheckPhase() { fi local flagsArray=( - -j $buildCores + -j "$buildCores" -c "${swiftpmBuildConfig-release}" - $swiftpmFlags "${swiftpmFlagsArray[@]}" ) + concatTo flagsArray swiftpmFlags swiftpmFlagsArray echoCmd 'check flags' "${flagsArray[@]}" TERM=dumb swift-test "${flagsArray[@]}" @@ -53,8 +55,8 @@ fi swiftpmBinPath() { local flagsArray=( -c "${swiftpmBuildConfig-release}" - $swiftpmFlags "${swiftpmFlagsArray[@]}" ) + concatTo flagsArray swiftpmFlags swiftpmFlagsArray swift-build --show-bin-path "${flagsArray[@]}" } diff --git a/pkgs/development/compilers/swift/wrapper/default.nix b/pkgs/development/compilers/swift/wrapper/default.nix index 0c7e0f8cbcf8..2bf8ef60ebf3 100644 --- a/pkgs/development/compilers/swift/wrapper/default.nix +++ b/pkgs/development/compilers/swift/wrapper/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation (swift._wrapperParams // { swiftStaticModuleSubdir swiftStaticLibSubdir; swiftDriver = lib.optionalString useSwiftDriver "${swift-driver}/bin/swift-driver"; + env.darwinMinVersion = lib.optionalString stdenv.targetPlatform.isDarwin ( + stdenv.targetPlatform.darwinMinVersion + ); + passAsFile = [ "buildCommand" ]; buildCommand = '' mkdir -p $out/bin $out/nix-support @@ -48,6 +52,13 @@ stdenv.mkDerivation (swift._wrapperParams // { ln -s ${swift.lib}/lib $out/lib substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook + + # Propagate any propagated inputs from the unwrapped Swift compiler, if any. + if [ -e "$swift/nix-support" ]; then + for input in "$swift/nix-support/"*propagated*; do + cp "$input" "$out/nix-support/$(basename "$input")" + done + fi ''; passthru = { diff --git a/pkgs/development/compilers/swift/wrapper/wrapper.sh b/pkgs/development/compilers/swift/wrapper/wrapper.sh index 5cd5d8da8819..3079bb182b1a 100644 --- a/pkgs/development/compilers/swift/wrapper/wrapper.sh +++ b/pkgs/development/compilers/swift/wrapper/wrapper.sh @@ -156,6 +156,14 @@ if [ -z "${NIX_CC_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then source $cc_wrapper/nix-support/add-flags.sh fi +# Only add darwin min version flag and set up `DEVELOPER_DIR` if a default darwin min version is set, +# which is a signal that we're targeting darwin. (Copied from add-flags in libc but tailored for Swift). +if [ "@darwinMinVersion@" ]; then + # Make sure the wrapped Swift compiler can find the overlays in the SDK. + NIX_SWIFTFLAGS_COMPILE+=" -I $SDKROOT/usr/lib/swift" + NIX_LDFLAGS_@suffixSalt@+=" -L $SDKROOT/usr/lib/swift" +fi + if [[ "$isCxx" = 1 ]]; then if [[ "$cxxInclude" = 1 ]]; then NIX_CFLAGS_COMPILE_@suffixSalt@+=" $NIX_CXXSTDLIB_COMPILE_@suffixSalt@" diff --git a/pkgs/development/compilers/swift/xctest/default.nix b/pkgs/development/compilers/swift/xctest/default.nix index d50d11706cbd..f6f4cdacaed1 100644 --- a/pkgs/development/compilers/swift/xctest/default.nix +++ b/pkgs/development/compilers/swift/xctest/default.nix @@ -19,10 +19,10 @@ in stdenv.mkDerivation { outputs = [ "out" ]; nativeBuildInputs = [ cmake ninja swift ] - ++ lib.optional stdenv.isDarwin DarwinTools; # sw_vers + ++ lib.optional stdenv.hostPlatform.isDarwin DarwinTools; # sw_vers buildInputs = [ Foundation ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # On Darwin only, Swift uses arm64 as cpu arch. substituteInPlace cmake/modules/SwiftSupport.cmake \ --replace '"aarch64" PARENT_SCOPE' '"arm64" PARENT_SCOPE' @@ -34,9 +34,9 @@ in stdenv.mkDerivation { export MACOSX_DEPLOYMENT_TARGET=10.12 ''; - cmakeFlags = lib.optional stdenv.isDarwin "-DUSE_FOUNDATION_FRAMEWORK=ON"; + cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DUSE_FOUNDATION_FRAMEWORK=ON"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' # Darwin normally uses the Xcode version of XCTest. Installing # swift-corelibs-xctest is probably not officially supported, but we have # no alternative. Fix up the installation here. diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index adeca0b73326..a5c5d6f9ffb8 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, 17, 21, 22) +feature_versions = (8, 11, 17, 21, 23) oses = ("mac", "linux", "alpine-linux") types = ("jre", "jdk") impls = ("hotspot",) diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix index 886c92ba2e38..836b282b0e49 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix @@ -69,7 +69,7 @@ let sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ]; description = "${brand-name}, prebuilt OpenJDK binary"; platforms = builtins.map (arch: arch + "-darwin") providedCpuTypes; # some inherit jre.meta.platforms - maintainers = with maintainers; [ taku0 ]; + maintainers = with maintainers; [ taku0 ] ++ lib.teams.java.members; inherit knownVulnerabilities; mainProgram = "java"; }; diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix index 6f591a7e86f5..8363905118f8 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix @@ -19,6 +19,6 @@ in jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; - jdk-22 = common { sourcePerArch = sources.jdk.openjdk22; }; - jre-22 = common { sourcePerArch = sources.jre.openjdk22; }; + jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; }; + jre-23 = common { sourcePerArch = sources.jre.openjdk23; }; } diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix index 9da96aee8d5a..b166d3c0738b 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix @@ -59,14 +59,14 @@ let alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig freetype - stdenv.cc.cc.lib # libstdc++.so.6 + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 xorg.libX11 xorg.libXext xorg.libXi xorg.libXrender xorg.libXtst zlib - ] ++ lib.optional stdenv.isAarch32 libffi; + ] ++ lib.optional stdenv.hostPlatform.isAarch32 libffi; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; @@ -127,7 +127,7 @@ let sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ]; description = "${brand-name}, prebuilt OpenJDK binary"; platforms = builtins.map (arch: arch + "-linux") providedCpuTypes; # some inherit jre.meta.platforms - maintainers = with maintainers; [ taku0 ]; + maintainers = with maintainers; [ taku0 ] ++ lib.teams.java.members; inherit knownVulnerabilities; mainProgram = "java"; }; diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/pkgs/development/compilers/temurin-bin/jdk-linux.nix index e05c5d40ae08..2c633f150fdb 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix @@ -20,6 +20,6 @@ in jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; - jdk-22 = common { sourcePerArch = sources.jdk.openjdk22; }; - jre-22 = common { sourcePerArch = sources.jre.openjdk22; }; + jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; }; + jre-23 = common { sourcePerArch = sources.jre.openjdk23; }; } diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index 23d7305ea774..9443eb45f401 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -6,102 +6,62 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "b45c467be52fe11ffd9bf69b3a035068134b305053874de4f3b3c5e5e1419659", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" - } - }, - "openjdk16": { - "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" + "build": "8", + "sha256": "ae988c72eeb2d78bb729a3387601ce0ea84305734ebdbe95d276f39952a8e019", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" } }, "openjdk17": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "839326b5b4b3e4ac2edc3b685c8ab550f9b6d267eddf966323c801cb21e3e018", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - } - }, - "openjdk18": { - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "1", - "sha256": "478c8f56dec7378ed8c687e8d7d0fbf729973c62c497cfc8cf58bd621849d764", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_x64_alpine-linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - } - }, - "openjdk19": { - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { "build": "7", - "sha256": "e2d971400ad2db25ad43ea6fa2058b269c0236e3977986dcdee2097da301beb2", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_alpine-linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" - } - }, - "openjdk20": { - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "b03aced4b7a1c49bc00297e35e45480fd03818862b93e17e1551a3b721e89306", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_x64_alpine-linux_hotspot_20.0.2_9.tar.gz", - "version": "20.0.2" + "sha256": "6d274a292a717a6f8d00a3ed0695497405c5c634c27fec1692dd13784f6ff6fa", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" } }, "openjdk21": { "aarch64": { - "build": "9", - "sha256": "0f68a9122054149861f6ce9d1b1c176bbe30dd76b36b74c916ba897c12e9d970", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" + "build": "7", + "sha256": "849c6d5a62a1f3dc2a3d2d7be07ffda089d35b862f6160b2a288c0408c2d8be8", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "8e861638bf6b08c6d5837de6dc929930550928ec5fcc81b9fa7e8296afd0f9c0", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" + "build": "7", + "sha256": "8fa232fc9de5a861c1a6b0cbdc861d0b0a2bdbdd27da53d991802a460a7f0973", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" } }, - "openjdk22": { + "openjdk23": { "aarch64": { - "build": "8", - "sha256": "86a7b47c9277f2fd063ec910616b3676d86553ab7d23aa3bd365e51a57be1dc5", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_aarch64_alpine-linux_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "7e842c9b8a44a5a21d83a3e38ae3b141cfbdb429dde70ff264d3da4bff44e1c7", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23_37.tar.gz", + "version": "23.0.0" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "d226e44b3513942db855df9a8737d848f64069848970d4cfd35ee3c38f2525c1", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_x64_alpine-linux_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "bff4c78f30d8d173e622bf2f40c36113df47337fc6d1ee5105ed2459841165aa", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_x64_alpine-linux_hotspot_23_37.tar.gz", + "version": "23.0.0" } }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "409091665e5f8cf678938bbbc0d377122ef8bad7b1c97a0f809da054db956e51", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "525a7731331cad502b9293ccb4ac2b13e85516736e98a57cb27c2767005188e1", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" } } }, @@ -110,92 +70,62 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "6972a6251bc88d6fbb64a188557cf165f1c415ded550d2a280bbcbc4272caff1", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "0ac795729cc11f47323a71713eac2a5b22d4615fd9b66c8766f964c03fb6e160", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" } }, "openjdk17": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "b5dffd0be08c464d9c3903e2947508c1a5c21804ea1cff5556991a2a47d617d8", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - } - }, - "openjdk18": { - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "1", - "sha256": "ad23309a82e690f769037b1e6417022f588702d214da533289f116bba0f61f4e", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_x64_alpine-linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - } - }, - "openjdk19": { - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { "build": "7", - "sha256": "6c0ce0ead2e7ce3e0f06b9578447499c8bd0509306c95fcd81dbecb634228933", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_x64_alpine-linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" - } - }, - "openjdk20": { - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "53b34747a3c042a4cccb2b8b78fba3330b105bc523f0861237baa9143dc39115", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_x64_alpine-linux_hotspot_20.0.2_9.tar.gz", - "version": "20.0.2" + "sha256": "63bae276cc322532b451ae7473127c92a75db16cc95473577f133cd09349822a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" } }, "openjdk21": { "aarch64": { - "build": "9", - "sha256": "54e8618da373258654fe788d509f087d3612de9e080eb6831601069dbc8a4b2b", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" + "build": "7", + "sha256": "f9410264235861deaf30f97bec80870cf3bc38b1d8e57d897d8bb1f706ae6705", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "b3e7170deab11a7089fe8e14f9f398424fd86db085f745dad212f6cfc4121df6", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" + "build": "7", + "sha256": "0dfd0ebab44d777f65bceaff7f79e8e0b9deb74a5eb166922483f1864bcf2052", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" } }, - "openjdk22": { + "openjdk23": { "aarch64": { - "build": "8", - "sha256": "6cac56dde6793d887deea101cfff283dc5f285e1118c21cbd1c4cb69f1072e55", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_aarch64_alpine-linux_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "858aa6b255164e535e2fd6cc8dfbf129327a9126ebb9e8f24115c2089efd36f3", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_aarch64_alpine-linux_hotspot_23_37.tar.gz", + "version": "23.0.0" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "e7c26ad00e3ded356b8c4b20b184ccf5bd63ccdccabde8d4a892389f178f1d5b", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_x64_alpine-linux_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "7acbc972b0dd84ca10ec6f192b20e76445a22f4c5558e1657ff393e4868e9343", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_x64_alpine-linux_hotspot_23_37.tar.gz", + "version": "23.0.0" } }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "c82962d7378d1fd415db594fce6ec047939e9fab5301fa4407cd7faea9ea7e31", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "9a7a939638b9cdaa8e1a119b8f21bfdd4cb2390b8a47cc27ccf9effc90f4b437", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" } } } @@ -204,546 +134,332 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "9", - "sha256": "e00476a7be3c4adfa9b3d55d30768967fd246a8352e518894e183fa444d4d3ce", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "04e21301fedc76841fb03929ac6cacfbbda30b5693acfd515a8f34d4a0cdeb28", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" }, "armv6l": { - "build": "9", - "sha256": "8077edc07a57d846c3d11286a7caf05ed6ca6d6c1234bf0e03611f18e187f075", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "9d14a076d1440161ab4c9736644e8e9f4719eb8e9f44c03470640960c3cd5e00", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" }, "armv7l": { - "build": "9", - "sha256": "8077edc07a57d846c3d11286a7caf05ed6ca6d6c1234bf0e03611f18e187f075", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "9d14a076d1440161ab4c9736644e8e9f4719eb8e9f44c03470640960c3cd5e00", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" }, "packageType": "jdk", "powerpc64le": { - "build": "9", - "sha256": "f56068bb64c6bf858894f75c2bc261f54db32932422eb07527f36ae40046e9a0", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "4dfdc498938a159c592a2f094576f09c94999e17327c1f5ff81794694992054d", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" }, "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "23e47ea7a3015be3240f21185fd902adebdcf76530757c9b482c7eb5bd3417c2", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "0e71a01563a5c7b9988a168b0c4ce720a6dff966b3c27bb29d1ded461ff71d0e", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" } }, - "openjdk16": { + "openjdk17": { "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" + "sha256": "8257de06bf37f0c8f19f8d542e2ab5a4e17db3ca5f29d041bd0b02ab265db021", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" }, "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" + "sha256": "ce7873ebf40ed0eb1089941ead4d3af79a205b1264f3162860d26ae957572b74", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" }, "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" + "sha256": "ce7873ebf40ed0eb1089941ead4d3af79a205b1264f3162860d26ae957572b74", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" }, "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" - } - }, - "openjdk17": { - "aarch64": { - "build": "9", - "sha256": "a900acf3ae56b000afc35468a083b6d6fd695abec87a8abdb02743d5c72f6d6d", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - }, - "armv6l": { - "build": "9", - "sha256": "9b5c375ed7ce654083c6c1137d8daadebaf8657650576115f0deafab00d0f1d7", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_arm_linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - }, - "armv7l": { - "build": "9", - "sha256": "9b5c375ed7ce654083c6c1137d8daadebaf8657650576115f0deafab00d0f1d7", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_arm_linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "9", - "sha256": "44bdd662c3b832cfe0b808362866b8d7a700dd60e6e39716dee97211d35c230f", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - }, - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "aa7fb6bb342319d227a838af5c363bfa1b4a670c209372f9e6585bd79da6220c", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" + "sha256": "c97988e5a99b8ae0c47ba330b0883398c7433312db0051d8c5ff97911bae1605", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" }, "riscv64": { "build": "7", "sha256": "d024c100eba4709970716ddcac757ba5e3122a8ff9c6f539ff8bac5b47f51f3a", "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.12_7.tar.gz", "version": "17.0.12" - } - }, - "openjdk18": { - "aarch64": { - "build": "1", - "sha256": "262be608e266fd76d7496af83b2832be853c3aaf7460d6a4da198cd40db74553", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_aarch64_linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - }, - "armv6l": { - "build": "1", - "sha256": "4cd49b92d13847bfad7b3bf635cca349e2c89c7641748c5288bc40d612cdbbd6", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_arm_linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - }, - "armv7l": { - "build": "1", - "sha256": "4cd49b92d13847bfad7b3bf635cca349e2c89c7641748c5288bc40d612cdbbd6", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_arm_linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "1", - "sha256": "030261a2189a8f773fda543a85ab9beb4c430bf81ca5be37cf6cb970b5ccbb03", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_ppc64le_linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" }, "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "7d6beba8cfc0a8347f278f7414351191a95a707d46b6586e9a786f2669af0f8b", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_x64_linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" + "build": "7", + "sha256": "9d4dd339bf7e6a9dcba8347661603b74c61ab2a5083ae67bf76da6285da8a778", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" } }, - "openjdk19": { + "openjdk21": { "aarch64": { "build": "7", - "sha256": "1c4be9aa173cb0deb0d215643d9509c8900e5497290b29eee4bee335fa57984f", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_aarch64_linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" - }, - "armv6l": { - "build": "7", - "sha256": "6a51cb3868b5a3b81848a0d276267230ff3f8639f20ba9ae9ef1d386440bf1fd", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_arm_linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" - }, - "armv7l": { - "build": "7", - "sha256": "6a51cb3868b5a3b81848a0d276267230ff3f8639f20ba9ae9ef1d386440bf1fd", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_arm_linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" + "sha256": "d768eecddd7a515711659e02caef8516b7b7177fa34880a56398fd9822593a79", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" }, "packageType": "jdk", "powerpc64le": { "build": "7", - "sha256": "173d1256dfb9d13d309b5390e6bdf72d143b512201b0868f9d349d5ed3d64072", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_ppc64le_linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" + "sha256": "c208cd0fb90560644a90f928667d2f53bfe408c957a5e36206585ad874427761", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" }, - "vmType": "hotspot", - "x86_64": { + "riscv64": { "build": "7", - "sha256": "3a3ba7a3f8c3a5999e2c91ea1dca843435a0d1c43737bd2f6822b2f02fc52165", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" - } - }, - "openjdk20": { - "aarch64": { - "build": "9", - "sha256": "b475bcc23db0bd618c815bb8f11d8e084dc58288ea3bcdf4e7f389ed41c89f56", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.gz", - "version": "20.0.2" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "36", - "sha256": "45dde71faf8cbb78fab3c976894259655c8d3de827347f23e0ebe5710921dded", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20%2B36/OpenJDK20U-jdk_ppc64le_linux_hotspot_20_36.tar.gz", - "version": "20.0.0" - }, - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "3d91842e9c172967ac397076523249d05a82ead51b0006838f5f0315ad52222c", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.gz", - "version": "20.0.2" - } - }, - "openjdk21": { - "aarch64": { - "build": "9", - "sha256": "7d3ab0e8eba95bd682cfda8041c6cb6fa21e09d0d9131316fd7c96c78969de31", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "9", - "sha256": "9a1079d7f0fc72951fdc9a0029e49a15f6ba114683aee626f882ee2c761f1d57", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" + "sha256": "b04fd7f52d18268a935f1a7144dae802b25db600ec97156ddd46b3100cbd13da", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" }, "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "fffa52c22d797b715a962e6c8d11ec7d79b90dd819b5bc51d62137ea4b22a340", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" - }, - "riscv64": { "build": "7", - "sha256": "b04fd7f52d18268a935f1a7144dae802b25db600ec97156ddd46b3100cbd13da", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.4_7.tar.gz", + "sha256": "51fb4d03a4429c39d397d3a03a779077159317616550e4e71624c9843083e7b9", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_linux_hotspot_21.0.4_7.tar.gz", "version": "21.0.4" } }, - "openjdk22": { + "openjdk23": { "aarch64": { - "build": "8", - "sha256": "d8488fa1e4e8c1e318cef4c0fc3842a7f15a4cf52b27054663bb94471f54b3fa", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_aarch64_linux_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "e8043d1bd9c4f42c5cf7883aca1fc3ef6bcccf4a664f378818ac0fd4fb987b7e", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_aarch64_linux_hotspot_23_37.tar.gz", + "version": "23.0.0" }, "packageType": "jdk", "powerpc64le": { - "build": "8", - "sha256": "4113606ba65044a3cbd7678e1c0d41881d24a2441c8ab8b658b4ac58da624de5", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_ppc64le_linux_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "4d3b0609c783dea1f6a899bfc8c84b4000d1f48f39e2489d70050bbf2c7f7d9c", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_ppc64le_linux_hotspot_23_37.tar.gz", + "version": "23.0.0" + }, + "riscv64": { + "build": "37", + "sha256": "d401699a92469de7bfb72909c1d11019537a0a2c21af01a8dce1831f09ef5165", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_riscv64_linux_hotspot_23_37.tar.gz", + "version": "23.0.0" }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "e59c6bf801cc023a1ea78eceb5e6756277f1564cd0a421ea984efe6cb96cfcf8", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_x64_linux_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" - }, - "riscv64": { - "build": "9", - "sha256": "830a0d006c2dae95c0855aa70e193dba637831b491ccd67333322dea31bcf389", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_riscv64_linux_hotspot_22.0.2_9.tar.gz", - "version": "22.0.2" + "build": "37", + "sha256": "630c4f3870056e7e005736ec1edc34ee63a9b45e2027582c52f53a9bf44314b8", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_x64_linux_hotspot_23_37.tar.gz", + "version": "23.0.0" } }, "openjdk8": { "aarch64": { - "build": "8", - "sha256": "3504d748a93f23cac8c060bd33231bd51e90dcb620f38dadc6239b6cd2a5011c", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "af98a839ec238106078bd360af9e405dc6665c05ee837178ed13b92193681923", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_aarch64_linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" }, "armv6l": { - "build": "8", - "sha256": "be4aff6fa7bf6515f16f93dcaf9fdc61853fe1ef0d25b08a1bb1cf6e3d047391", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_arm_linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "5bd0203b2b09b033e3a762299a4975939d7571b433eab8b59340cc966102bef1", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_arm_linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" }, "armv7l": { - "build": "8", - "sha256": "be4aff6fa7bf6515f16f93dcaf9fdc61853fe1ef0d25b08a1bb1cf6e3d047391", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_arm_linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "5bd0203b2b09b033e3a762299a4975939d7571b433eab8b59340cc966102bef1", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_arm_linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" }, "packageType": "jdk", "powerpc64le": { - "build": "8", - "sha256": "6b7ed7996788075e182dd33349288346240fbce540e50fd77aecfc309a5ada19", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "78fbd7b01204cdf90bcb3f9fe6a8e9432bdaa75776fa333aa9cbcb5a79de34cd", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "b9884a96f78543276a6399c3eb8c2fd8a80e6b432ea50e87d3d12d495d1d2808", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "4c6056f6167fae73ace7c3080b78940be5c87d54f5b08894b3517eed1cbb2c06", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "9", - "sha256": "7290ace47a030d89ea023c28e7aa555c9da72b4194f73b39ec9d058011bf06dd", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "1fe97cdaad47d7d108f329c6e4560b46748ef7f2948a1027812ade0bbc2a3597", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" }, "armv6l": { - "build": "9", - "sha256": "025f994549708f7291ce3b0fa7c41f7e78ec3af3eae3f85fffe9c5fa4a54889f", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "bf893085627c6ec484e63aa1290276b23bcfee547459da6b0432ae9c5c1be22a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" }, "armv7l": { - "build": "9", - "sha256": "025f994549708f7291ce3b0fa7c41f7e78ec3af3eae3f85fffe9c5fa4a54889f", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "bf893085627c6ec484e63aa1290276b23bcfee547459da6b0432ae9c5c1be22a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" }, "packageType": "jre", "powerpc64le": { - "build": "9", - "sha256": "3b3fbd324620fd914bd8462e292124493fcf846fd69195c4b9a231131dc68d5f", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "8ee351314182df93fbad96139bb74b97814944d66197896e388404a1ecfa06b3", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" }, "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "786a72296189ba8e43999532aa73730d87ec1fce558eb3c4e98b611b423375e3", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "e0c1938093da3780e4494d366a4e6b75584dde8d46a19acea6691ae11df4cda5", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" } }, "openjdk17": { "aarch64": { - "build": "9", - "sha256": "ccfa23c25790475c84df983cc5f729b94c04d9ea9863912deb15c6266782cf16", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" + "build": "7", + "sha256": "9dfe4c56463690ae67d22268980d8861eb46b907d7914f8f2e6fc7b25778c8ec", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" }, "armv6l": { - "build": "9", - "sha256": "2e06401aa3aa7a825d73a6af8e9462449b1a86e7705b793dc8ec90423b602ee2", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_arm_linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" + "build": "7", + "sha256": "f093094abe0cb2bb5a255d8180810030321073520541f289926c4682eda76136", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" }, "armv7l": { - "build": "9", - "sha256": "2e06401aa3aa7a825d73a6af8e9462449b1a86e7705b793dc8ec90423b602ee2", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_arm_linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" + "build": "7", + "sha256": "f093094abe0cb2bb5a255d8180810030321073520541f289926c4682eda76136", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" }, "packageType": "jre", "powerpc64le": { - "build": "9", - "sha256": "884b5cb817e50010b4d0a3252afb6a80db18995af19bbd16a37348b2c37949bc", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - }, - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "bcb1b7b8ad68c93093f09b591b7cb17161d39891f7d29d33a586f5a328603707", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" + "build": "7", + "sha256": "2759c48e1e56117871b04c851af18b92b6992cf67590f602949b96c3cff15c73", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" }, "riscv64": { "build": "7", "sha256": "2d1ed42918305a1a0754a6e1e9294c7d4d7fda4bff6dba7bc5682037d860dbc9", "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.12_7.tar.gz", "version": "17.0.12" - } - }, - "openjdk18": { - "aarch64": { - "build": "1", - "sha256": "e11e00438c2f6f79f86ff1ca2b015913b0e16bd9491953a082d5c786402cb50a", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_aarch64_linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - }, - "armv6l": { - "build": "1", - "sha256": "0ae7281fa883de0d39a75b39bfbbcec1d2a5f8ed8691af12226962ce1a761cd7", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_arm_linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - }, - "armv7l": { - "build": "1", - "sha256": "0ae7281fa883de0d39a75b39bfbbcec1d2a5f8ed8691af12226962ce1a761cd7", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_arm_linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - }, - "packageType": "jre", - "powerpc64le": { - "build": "1", - "sha256": "2298504c99b4c15f620f70415215e481766d2b2f784d066206eed8c583922f8f", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_ppc64le_linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" }, "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "74f602ab5abaa554859a5e92a65e5bb6e23c2d4165228299c7f54ed56dbc5959", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_x64_linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" + "build": "7", + "sha256": "0e8088d7a3a7496faba7ac8787db09dc0264c2bc6f568ea8024fd775a783e13c", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" } }, - "openjdk19": { + "openjdk21": { "aarch64": { "build": "7", - "sha256": "3653f9e5ad21e4744e5a655e243fba2895651029bee23f3d2366d5debc41a736", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_aarch64_linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" - }, - "armv6l": { - "build": "7", - "sha256": "d4588e8c01ca60da2ceed68b7d43d2fd9ec3350b93043f0dabd0eb6cb03cb23d", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_arm_linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" - }, - "armv7l": { - "build": "7", - "sha256": "d4588e8c01ca60da2ceed68b7d43d2fd9ec3350b93043f0dabd0eb6cb03cb23d", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_arm_linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" + "sha256": "58845ce4275f3ec74fba075597c8216bb201773da036c4703be8b7b7b457355d", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" }, "packageType": "jre", "powerpc64le": { "build": "7", - "sha256": "a30203431c7c21602227d39368c5af6e7abd19000d6da5562de7f3f5c57cbad5", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_ppc64le_linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" + "sha256": "46cf93653e2b553fb1c91760cfe2ff20999ba358d648d2df69e5948784768440", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" }, - "vmType": "hotspot", - "x86_64": { + "riscv64": { "build": "7", - "sha256": "7386e10c74f00a4382be0540bc0494854804ad79427d8a50ac77a4c7208ff348", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_x64_linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" - } - }, - "openjdk20": { - "aarch64": { - "build": "9", - "sha256": "63a730d5a3b6d21d31f7cba15dc44b019a8a4d8652e13acec45040f98584112c", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_aarch64_linux_hotspot_20.0.2_9.tar.gz", - "version": "20.0.2" - }, - "packageType": "jre", - "powerpc64le": { - "build": "36", - "sha256": "a1c5a16d5a438ce7da4563cd51ff6778cdf62331c00a3096ab2388a916e076d2", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20%2B36/OpenJDK20U-jre_ppc64le_linux_hotspot_20_36.tar.gz", - "version": "20.0.0" - }, - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "e3592e86290c192804d9c6b5035d42cc32cf04141d1c0b9d1ecb67739826c8c5", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_x64_linux_hotspot_20.0.2_9.tar.gz", - "version": "20.0.2" - } - }, - "openjdk21": { - "aarch64": { - "build": "9", - "sha256": "c7c31bc6f5ab4c4b6f4559e11c2fa9541ae6757ab8da6dd85c29163913bd9238", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" - }, - "packageType": "jre", - "powerpc64le": { - "build": "9", - "sha256": "aa628c6accc9d075b7b0f2bff6487f8ca0b8f057af31842a85fc8b363e1e10f3", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" + "sha256": "bf814344429f53d11f8aace14d326e2580ea6e66dd81b109c79160bd41735237", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" }, "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "f1af100c4afca2035f446967323230150cfe5872b5a664d98c86963e5c066e0d", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_linux_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" - }, - "riscv64": { "build": "7", - "sha256": "bf814344429f53d11f8aace14d326e2580ea6e66dd81b109c79160bd41735237", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.4_7.tar.gz", + "sha256": "d3affbb011ca6c722948f6345d15eba09bded33f9947d4d67e09723e2518c12a", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_linux_hotspot_21.0.4_7.tar.gz", "version": "21.0.4" } }, - "openjdk22": { + "openjdk23": { "aarch64": { - "build": "8", - "sha256": "8e5996a2bbae2da9797cff5a62cb2080965e08fd66de24673b29a8e481ec769e", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_aarch64_linux_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "ec45f4f9a4a98d8a0af24b508ca84a411ea88fac8abb8ad2cfca85cb3902ab5d", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_aarch64_linux_hotspot_23_37.tar.gz", + "version": "23.0.0" }, "packageType": "jre", "powerpc64le": { - "build": "8", - "sha256": "7df4a10fab324181a6c9e8b1e2a45042b8d30490f0fdb937a536f6cd17c907ef", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_ppc64le_linux_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "9120876c35b904ac041c5a021330a6f11d4e6c7537ce28bdbb7170b944673435", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_ppc64le_linux_hotspot_23_37.tar.gz", + "version": "23.0.0" + }, + "riscv64": { + "build": "37", + "sha256": "ca32d942ef5357fb948604cd8aea5c597130cf7fdf6ddee267b4aa99406ee471", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_riscv64_linux_hotspot_23_37.tar.gz", + "version": "23.0.0" }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "154dbc7975cf765c59bdaa1e693d6c8b009635c9a182d6d6d9f0cfbec5317b4c", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_x64_linux_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" - }, - "riscv64": { - "build": "9", - "sha256": "81aacc0ae75e65846e6207edf41b8c5927673eba5588eebc5ba8076ca9a6041c", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_riscv64_linux_hotspot_22.0.2_9.tar.gz", - "version": "22.0.2" + "build": "37", + "sha256": "9c3c3d42ffb2603b328b7154fc9eb449ef87488b3cbeb24a497d46677c7fd44d", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_x64_linux_hotspot_23_37.tar.gz", + "version": "23.0.0" } }, "openjdk8": { "aarch64": { - "build": "8", - "sha256": "17550a6a4ddf71ac81ba8f276467bc58f036c123c0f1bafcafd69f70e3e49cf5", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_aarch64_linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "8fbefff2c578f73d95118d830347589ddc9aa84510200a5a5001901c2dea4810", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_aarch64_linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" }, "armv6l": { - "build": "8", - "sha256": "1a6b470ac83b241223447a1e6cb55c4a8f78af0146b9387e9842625041226654", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_arm_linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "13bdefdeae6f18bc9c87bba18c853b8b12c5442ce07ff0a3956ce28776d695ff", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_arm_linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" }, "armv7l": { - "build": "8", - "sha256": "1a6b470ac83b241223447a1e6cb55c4a8f78af0146b9387e9842625041226654", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_arm_linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "13bdefdeae6f18bc9c87bba18c853b8b12c5442ce07ff0a3956ce28776d695ff", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_arm_linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" }, "packageType": "jre", "powerpc64le": { - "build": "8", - "sha256": "d3157230c01b320e47ad6df650e83b15f8f76294d0df9f1c03867d07fe2883c9", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "2991edbedee448c0f1edf131beca84b415dac64ea97365b9bfd85bc2f39893bb", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_ppc64le_linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "a8d994332a2ff15d48bf04405c3b2f6bd331a928dd96639b15e62891f7172363", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_x64_linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "0ac516cc1eadffb4cd3cfc9736a33d58ea6a396bf85729036c973482f7c063d9", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" } } } @@ -752,258 +468,152 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "9", - "sha256": "49122443bdeab2c9f468bd400f58f85a9ea462846faa79084fd6fd786d9b492d", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "8bcbb98e293fb3c4d5cae3539f240ed478fae85962311fccd4c628ebad3a90e4", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "4dbd21d9a0311d321f5886eda50c3086026ed61d02e1a85f7b8c2e9ad557bf03", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" - } - }, - "openjdk16": { - "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" + "build": "8", + "sha256": "07a1be21f45f0951db05516e57602c414295c51a920f7e9b6ddeaa325d619b28", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_mac_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" } }, "openjdk17": { "aarch64": { - "build": "9", - "sha256": "09a162c58dd801f7cfacd87e99703ed11fb439adc71cfa14ceb2d3194eaca01c", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - }, - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "f8b96724618f4df557c47f11048d1084e98ed3eb87f0dbd5b84f768a80c3348e", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_mac_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - } - }, - "openjdk18": { - "aarch64": { - "build": "1", - "sha256": "c5ec423f52d8f3aa632941f29fd289f2e31dce5fe6f3abed9b72bd374f54cd41", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_aarch64_mac_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - }, - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "1", - "sha256": "2ed916b0c9d197a6bf71b76e84d94125023c2609e0a9b22c64553eff5c9c29c1", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_x64_mac_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - } - }, - "openjdk19": { - "aarch64": { "build": "7", - "sha256": "c419330cc8d6b9974d3bf1937f8f0e747c34c469afd5c546831d35aa19e03d49", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_aarch64_mac_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" + "sha256": "d7910b1acaeb290c5c5da21811d2b2b8635f806612a2d6e8d1953b2f77580f78", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { "build": "7", - "sha256": "f59d4157b3b53a35e72db283659d47f14aecae0ff5936d5f8078000504299da6", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_mac_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" - } - }, - "openjdk20": { - "aarch64": { - "build": "9", - "sha256": "6ef42b63581c0265c5a6b734e203bb922ee720571a8de46532ecca50a804c596", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_aarch64_mac_hotspot_20.0.2_9.tar.gz", - "version": "20.0.2" - }, - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "bdeb37322a7c9292434e417d4db9f5debd7477cf413335d3a653a4e5e50a2473", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_x64_mac_hotspot_20.0.2_9.tar.gz", - "version": "20.0.2" + "sha256": "d5230eeec88739aa7133e4c8635bbd4ab226708c12deaafa13cf26b02bc8e8c4", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" } }, "openjdk21": { "aarch64": { - "build": "9", - "sha256": "b6be6a9568be83695ec6b7cb977f4902f7be47d74494c290bc2a5c3c951e254f", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" + "build": "7", + "sha256": "dcf69a21601d9b1b25454bbad4f0f32784bb42cdbe4063492e15a851b74cb61e", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "f777103aab94330d14a29bd99f3a26d60abbab8e2c375cec9602746096721a7c", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_mac_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" + "build": "7", + "sha256": "e368e5de7111aa88e6bbabeff6f4c040772b57fb279cc4e197b51654085bbc18", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_mac_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" } }, - "openjdk22": { + "openjdk23": { "aarch64": { - "build": "8", - "sha256": "80d6fa75e87280202ae7660139870fe50f07fca9dc6c4fbd3f2837cbd70ec902", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_aarch64_mac_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "411934ca9ede95671afc1e7e1d9c8912c43247c7e4fba97730f20c0875287d44", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_aarch64_mac_hotspot_23_37.tar.gz", + "version": "23.0.0" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "9445952d4487451af024a9a3f56373df76fbd928d9ff9186988aa27be2e4f10c", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_x64_mac_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "0b4b14f7cb44cab89083fb72beafa6d4f12ee6722bf682e5dd026dab12cc8d23", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_x64_mac_hotspot_23_37.tar.gz", + "version": "23.0.0" } }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "fd62491f7634c1cbed7557d6b21db7ef4818fbc0e63e678110d9d92cbea4ad8c", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "14e93cac142c4e7734aab53d1e9f44ef2851cf1cc4657918abccdf99e78c8bad", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05.1/OpenJDK8U-jdk_x64_mac_hotspot_8u422b05.tar.gz", + "version": "8.0.422" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "9", - "sha256": "8ecc59f0bda845717cecbc6025c4c7fcc26d6ffe48824b8f7a5db024216c5fb4", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "809c13c1c3abefe09c8396b18d6dd64837f30bf7bda7cbe317c6567bcd161d7a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "9855769dddc3f3b5a1fb530ce953025b1f7b3fac861628849b417676b1310b1f", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "764d30489541ae088d2d0a75d46524ec35797dcdbe4a11b6bfbaee7957d8f77e", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_mac_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" } }, "openjdk17": { "aarch64": { - "build": "9", - "sha256": "003d3e0a65a2f0633b8bfed42be133724b490acb323c174c708d3a446d5fc660", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - }, - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "232c40bebd6ddbb673862e86e7e6e09bcfe399e5a53c8a6b77bf1ceab8edefd0", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_x64_mac_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - } - }, - "openjdk18": { - "aarch64": { - "build": "1", - "sha256": "071f073efb9550838bc02e429ef972f9450b477360f803dd1cf19096ca41182e", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_aarch64_mac_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - }, - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "1", - "sha256": "3629e3dc9dbab7ed13070fbea3a827030acdd62afa557496e88a6d01f9300474", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_x64_mac_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - } - }, - "openjdk19": { - "aarch64": { "build": "7", - "sha256": "1cd53e60478912fe5f2095313821e90c4926e74ff60a4aa9d99fc2ec912411c1", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_aarch64_mac_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" + "sha256": "5c1cb2cbd2ef3f2b529e2733d0ab55381e10c4c3607f4d62f2bf12f0942198bf", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { "build": "7", - "sha256": "33a37be7a5d7a6003595eeee6d09e47abfa1a1065a4da9a6f592b4b09cfcea19", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_x64_mac_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" - } - }, - "openjdk20": { - "aarch64": { - "build": "9", - "sha256": "81b475ab029ab224b2c711ccdfa9c25e0300539faad342a4ceefd33772fb38b4", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_aarch64_mac_hotspot_20.0.2_9.tar.gz", - "version": "20.0.2" - }, - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "565d62faac325c098670705fb26a5cc3d4af0a25e86444ddd643f779ad2a3417", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_x64_mac_hotspot_20.0.2_9.tar.gz", - "version": "20.0.2" + "sha256": "331aceddc402263c5e47529234965927573ead684ea2b7a0358fbb6c279c1510", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" } }, "openjdk21": { "aarch64": { - "build": "9", - "sha256": "8df56361b834c4681ef304ae9dc8406ce3d79c8572d2d6c2fefcbea55be7d86b", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" + "build": "7", + "sha256": "14b39c00ec0ec6e0c465f784261449d0a1c4256b3b15c63c222397ccb31758aa", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "d7fc89c196ed03deb8a98f6599e1b2e78859ec8ec752142549cd3710f3e1a025", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_mac_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" + "build": "7", + "sha256": "f67f17413d012672da11163dd73600e0d92eef6f6ff27c6ae25523bd9df74222", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_mac_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" } }, - "openjdk22": { + "openjdk23": { "aarch64": { - "build": "8", - "sha256": "73a8a0270534db7b4760399f41c573fd1cff5f86f4e68b08988afee0df814889", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_aarch64_mac_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "2c96b006080906951fb0ddae8e23ca3ef2bd327b77cac84b4302b8d84c7014f5", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_aarch64_mac_hotspot_23_37.tar.gz", + "version": "23.0.0" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "d21e84edc1d7cc58fc04bcd9a214b71bf85e8ea348f8659197be3383afcb2b9a", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_x64_mac_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "1f41755494c45a8a88dfed926251f478544c0e51a71a011314fc282e915f804f", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_x64_mac_hotspot_23_37.tar.gz", + "version": "23.0.0" } }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "1237e4f4238211d9137eec838e5d7cabdc9d93d41001cf41f6de3a4eb90884ef", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_x64_mac_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "814a1e262c10cb3f056adbdb20396564fe9ea0f039a863bae6b648f7680b30cc", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05.1/OpenJDK8U-jre_x64_mac_hotspot_8u422b05.tar.gz", + "version": "8.0.422" } } } diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 1d50d6e23ddb..4193ab53164c 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -45,8 +45,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ llvmMerged ncurses libffi libxml2 ] ++ lib.optionals enableCUDA [ cuda ] - ++ lib.optional (!stdenv.isDarwin) libpfm - ++ lib.optionals stdenv.isDarwin [ libobjc Cocoa Foundation ]; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) libpfm + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc Cocoa Foundation ]; cmakeFlags = let resourceDir = "${llvmMerged}/lib/clang/" + ( @@ -100,6 +100,6 @@ in stdenv.mkDerivation rec { # never built on aarch64-darwin since first introduction in nixpkgs # Linux Aarch64 broken above LLVM11 # https://github.com/terralang/terra/issues/597 - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index b36eb44229d1..65eea0a48e46 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { builtins.match "^[0-9]\\.+[0-9]+\\.[0-9]+" version != null; in '' ${ - if stdenv.isDarwin && ! versionIsClean finalAttrs.version + if stdenv.hostPlatform.isDarwin && ! versionIsClean finalAttrs.version then "echo 'not overwriting VERSION since it would upset ld'" else "echo ${finalAttrs.version} > VERSION" } @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { checkTarget = "test"; # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10142.html - preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + preCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' rm tests/tests2/{108,114}* ''; @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ joachifm AndersonTorres ]; platforms = lib.platforms.unix; # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10199.html - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; }) # TODO: more multiple outputs diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index a32e516633a8..339a2abb7fa5 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -28,13 +28,13 @@ in buildGoModule rec { pname = "tinygo"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "tinygo-org"; repo = "tinygo"; rev = "v${version}"; - hash = "sha256-YqjMk7EF/fyOhsMLcG56FGHfOZSdaFhUbiiHk+SXajY="; + hash = "sha256-jntixwHGg9buWQuu9I47DHUxK1xJbDRHxRMEwKoOhHo="; fetchSubmodules = true; # The public hydra server on `hydra.nixos.org` is configured with # `max_output_size` of 3GB. The purpose of this `postFetch` step @@ -45,7 +45,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-cTqrvh0w3KQg3P1lCfAez0kqAMBJHQbqS3sx8uqGvEs="; + vendorHash = "sha256-aY1gX++Dc5/G6VFXnP7sBdekk2IKHlenOC0erlB/Quw="; patches = [ ./0001-GNUmakefile.patch @@ -54,7 +54,7 @@ buildGoModule rec { nativeCheckInputs = [ binaryen ]; nativeBuildInputs = [ makeWrapper lld ]; buildInputs = [ llvm clang.cc ] - ++ lib.optionals stdenv.isDarwin [ xar ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xar ]; doCheck = (stdenv.buildPlatform.canExecute stdenv.hostPlatform); inherit tinygoTests; @@ -112,7 +112,7 @@ buildGoModule rec { # GDB upstream does not support ARM darwin runtimeDeps = [ go clang.cc lld avrdude openocd binaryen ] - ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ gdb ]; + ++ lib.optionals (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) [ gdb ]; installPhase = '' runHook preInstall diff --git a/pkgs/development/compilers/tvm/default.nix b/pkgs/development/compilers/tvm/default.nix deleted file mode 100644 index 45579ad8f16a..000000000000 --- a/pkgs/development/compilers/tvm/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "tvm"; - version = "0.17.0"; - - src = fetchFromGitHub { - owner = "apache"; - repo = "incubator-tvm"; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-5Jr+xubQoASNgy/UR/K5pvzMs4szP9LidFOLs3h+KSY="; - }; - - nativeBuildInputs = [ cmake ]; - # TVM CMake build uses some sources in the project's ./src/target/opt/ - # directory which errneously gets mangled by the eager `fixCmakeFiles` - # function in Nix's CMake setup-hook.sh to ./src/target/var/empty/, - # which then breaks the build. Toggling this flag instructs Nix to - # not mangle the legitimate use of the opt/ folder. - dontFixCmake = true; - - meta = with lib; { - homepage = "https://tvm.apache.org/"; - description = "End to End Deep Learning Compiler Stack for CPUs, GPUs and accelerators"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ adelbertc ]; - }; -} diff --git a/pkgs/development/compilers/typescript/default.nix b/pkgs/development/compilers/typescript/default.nix deleted file mode 100644 index 513f8a99180f..000000000000 --- a/pkgs/development/compilers/typescript/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, buildNpmPackage, fetchFromGitHub, testers, typescript }: - -buildNpmPackage rec { - pname = "typescript"; - version = "5.6.2"; - - src = fetchFromGitHub { - owner = "microsoft"; - repo = "TypeScript"; - rev = "v${version}"; - hash = "sha256-aomoO/1E7zdhRNTCKqbA7ktor03zjg5HZXPxhH8iris="; - }; - - patches = [ - ./disable-dprint-dstBundler.patch - ]; - - npmDepsHash = "sha256-I44XhQzUsbf6Q4r2o40l9qBU8FMRZuYhb7dLVvFDyJc="; - - passthru.tests = { - version = testers.testVersion { - package = typescript; - }; - }; - - meta = with lib; { - description = "Superset of JavaScript that compiles to clean JavaScript output"; - homepage = "https://www.typescriptlang.org/"; - changelog = "https://github.com/microsoft/TypeScript/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = [ ]; - mainProgram = "tsc"; - }; -} diff --git a/pkgs/development/compilers/typescript/disable-dprint-dstBundler.patch b/pkgs/development/compilers/typescript/disable-dprint-dstBundler.patch deleted file mode 100644 index 95ccf411a93e..000000000000 --- a/pkgs/development/compilers/typescript/disable-dprint-dstBundler.patch +++ /dev/null @@ -1,15 +0,0 @@ -Disable dprint on dstBundler - -dprint fails on sandbox, because it requires internet access to install its -plugins. - ---- a/scripts/dtsBundler.mjs -+++ b/scripts/dtsBundler.mjs -@@ -430,5 +430,5 @@ - return result.replace(/\r\n/g, "\n"); - } - --fs.writeFileSync(output, dprint(publicContents)); --fs.writeFileSync(internalOutput, dprint(internalContents)); -+fs.writeFileSync(output, publicContents); -+fs.writeFileSync(internalOutput, internalContents); diff --git a/pkgs/development/compilers/uasm/default.nix b/pkgs/development/compilers/uasm/default.nix deleted file mode 100644 index 21d9a2bf5d48..000000000000 --- a/pkgs/development/compilers/uasm/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, testers -, uasm -}: - -stdenv.mkDerivation rec { - pname = "uasm"; - version = "2.56.2"; - - src = fetchFromGitHub { - owner = "Terraspace"; - repo = pname; - # Specifying only the tag results in the following error during download: - # the given path has multiple possibilities: #<Git::Ref:0x00007f618689c378>, #<Git::Ref:0x00007f618689c1e8> - # Probably because upstream has both a tag and a branch with the same name - rev = "refs/tags/v${version}"; - hash = "sha256-QiRBscY6zefeLDDVhS/+j9yIJ+5QhgkDQh1CLl/CslM="; - }; - - patches = [ - (fetchpatch { - name = "fix-v2_55-compilation-on-macos.patch"; - url = "https://github.com/Terraspace/UASM/commit/b50c430cc3083c7f32e288a9f64fe1cafb03091d.patch"; - sha256 = "sha256-FGFB282LSEKtGD1cIRH+Qi5bye5Gx4xb0Ty4J03xjCU"; - }) - ]; - - enableParallelBuilding = true; - - makefile = - if stdenv.isDarwin then - "ClangOSX64.mak" - else - "gccLinux64.mak"; - - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - - installPhase = '' - runHook preInstall - - install -Dt "$out/bin" -m0755 GccUnixR/uasm - install -Dt "$out/share/doc/${pname}" -m0644 {Readme,History}.txt Doc/* - - runHook postInstall - ''; - - passthru.tests.version = testers.testVersion { - package = uasm; - command = "uasm -h"; - version = "v${version}"; - }; - - meta = with lib; { - homepage = "https://www.terraspace.co.uk/uasm.html"; - description = "Free MASM-compatible assembler based on JWasm"; - mainProgram = "uasm"; - platforms = platforms.unix; - maintainers = with maintainers; [ thiagokokada ]; - license = licenses.watcom; - }; -} diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix deleted file mode 100644 index 2dd2b7a15897..000000000000 --- a/pkgs/development/compilers/unison/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, autoPatchelfHook -, fetchurl -, gmp -, less -, makeWrapper -, libb2 -, ncurses6 -, openssl -, stdenv -, zlib -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "unison-code-manager"; - version = "0.5.26"; - - src = if stdenv.isDarwin then - fetchurl { - url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; - hash = "sha256-RF2Q5sCxT9F3IGM/8UP6bEe9sOjtpMVYHREuAPOzh8g="; - } - else - fetchurl { - url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; - hash = "sha256-t0rc1f4PfjHRu/tzoW8sJ/6R0KBbYQPiWHqsIaqc+SY="; - }; - - # The tarball is just the prebuilt binary, in the archive root. - sourceRoot = "."; - dontBuild = true; - dontConfigure = true; - - nativeBuildInputs = [ makeWrapper ] - ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook; - buildInputs = lib.optionals (!stdenv.isDarwin) [ gmp ncurses6 zlib ]; - - installPhase = '' - mkdir -p $out/{bin,lib} - mv runtime $out/lib/runtime - mv ui $out/ui - mv unison $out/unison - makeWrapper $out/unison/unison $out/bin/ucm \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libb2 openssl ]} \ - --prefix PATH ":" "${lib.makeBinPath [ less ]}" \ - --add-flags "--runtime-path $out/lib/runtime/bin/unison-runtime" \ - --set UCM_WEB_UI "$out/ui" - ''; - - meta = with lib; { - description = "Modern, statically-typed purely functional language"; - homepage = "https://unisonweb.org/"; - license = with licenses; [ mit bsd3 ]; - mainProgram = "ucm"; - maintainers = with maintainers; [ ceedubs sellout virusdave ]; - platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -}) diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/development/compilers/urn/default.nix deleted file mode 100644 index 87e28d9672da..000000000000 --- a/pkgs/development/compilers/urn/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, buildEnv, makeWrapper, lua, luajit, readline -, useLuaJit ? false -, extraLibraries ? [] -}: - -let - version = "0.7.2"; - # Build a sort of "union package" with all the native dependencies we - # have: Lua (or LuaJIT), readline, etc. Then, we can depend on this - # and refer to ${urn-rt} instead of ${lua}, ${readline}, etc. - urn-rt = buildEnv { - name = "urn-rt-${version}"; - ignoreCollisions = true; - paths = if useLuaJit then - [ luajit readline ] - else - [ lua ]; - }; - - inherit (lib) optionalString concatMapStringsSep; -in - -stdenv.mkDerivation { - pname = "urn${optionalString (extraLibraries != []) "-with-libraries"}"; - inherit version; - - src = fetchFromGitLab { - owner = "urn"; - repo = "urn"; - rev = "v${version}"; - sha256 = "0nclr3d8ap0y5cg36i7g4ggdqci6m5q27y9f26b57km8p266kcpy"; - }; - - nativeBuildInputs = [ makeWrapper ]; - # Any packages that depend on the compiler have a transitive - # dependency on the Urn runtime support. - propagatedBuildInputs = [ urn-rt ]; - - makeFlags = ["-B"]; - - installPhase = '' - mkdir -p $out/bin $out/lib - install -m 0755 bin/urn.lua $out/bin/urn - cp -r lib $out/lib/urn - wrapProgram $out/bin/urn \ - --add-flags "-i $out/lib/urn --prelude $out/lib/urn/prelude.lisp" \ - --add-flags "${concatMapStringsSep " " (x: "-i ${x.libraryPath}") extraLibraries}" \ - --prefix PATH : ${urn-rt}/bin/ \ - --prefix LD_LIBRARY_PATH : ${urn-rt}/lib/ - ''; - - meta = with lib; { - homepage = "https://urn-lang.com"; - description = "Yet another Lisp variant which compiles to Lua"; - mainProgram = "urn"; - license = licenses.bsd3; - maintainers = with maintainers; [ CrazedProgrammer ]; - platforms = platforms.all; - }; - - passthru = { - inherit urn-rt; - }; -} diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 1b880b61a05a..96b995d64b6c 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -50,7 +50,7 @@ let nativeBuildInputs = [ pkg-config flex bison libxslt gobject-introspection - ] ++ lib.optional (stdenv.isDarwin) expat + ] ++ lib.optional (stdenv.hostPlatform.isDarwin) expat ++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ vala ] ++ extraNativeBuildInputs; diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix deleted file mode 100644 index a0acfd263474..000000000000 --- a/pkgs/development/compilers/vlang/default.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, makeWrapper, upx, boehmgc, xorg, binaryen, darwin }: - -let - version = "0.4.4"; - ptraceSubstitution = '' - #include <sys/types.h> - #include <sys/ptrace.h> - ''; - # vc is the V compiler's source translated to C (needed for boostrap). - # So we fix its rev to correspond to the V version. - vc = stdenv.mkDerivation { - pname = "v.c"; - version = "0.4.4"; - src = fetchFromGitHub { - owner = "vlang"; - repo = "vc"; - rev = "66eb8eae253d31fa5622e35a69580d9ad8efcccb"; - hash = "sha256-YGlzr0Qq7+NtrnbaFPBuclzjOZBOnTe3BOhsuwdsQ5c="; - }; - - # patch the ptrace reference for darwin - installPhase = lib.optionalString stdenv.isDarwin '' - substituteInPlace v.c \ - --replace "#include <sys/ptrace.h>" "${ptraceSubstitution}" - '' + '' - mkdir -p $out - cp v.c $out/ - ''; - }; - # Required for vdoc. - markdown = fetchFromGitHub { - owner = "vlang"; - repo = "markdown"; - rev = "0c280130cb7ec410b7d21810d1247956c15b72fc"; - hash = "sha256-Fmhkrg9DBiWxInostNp+WfA3V5GgEIs5+KIYrqZosqY="; - }; - boehmgcStatic = boehmgc.override { - enableStatic = true; - }; -in -stdenv.mkDerivation { - pname = "vlang"; - inherit version; - - src = fetchFromGitHub { - owner = "vlang"; - repo = "v"; - rev = version; - hash = "sha256-Aqecw8K+igHx5R34lQiWtdNfeGn+umcjcS4w0vXgpLM="; - }; - - propagatedBuildInputs = [ glfw freetype openssl ] - ++ lib.optional stdenv.hostPlatform.isUnix upx; - - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ - binaryen - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ] ++ lib.optionals stdenv.isLinux [ - xorg.libX11 - xorg.libXau - xorg.libXdmcp - xorg.xorgproto - ]; - - makeFlags = [ - "local=1" - ]; - - env.VC = vc; - - preBuild = '' - export HOME=$(mktemp -d) - mkdir -p ./thirdparty/tcc/lib - cp -r ${boehmgcStatic}/lib/* ./thirdparty/tcc/lib - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,lib,share} - cp -r examples $out/share - cp -r {cmd,vlib,thirdparty} $out/lib - cp v $out/lib - ln -s $out/lib/v $out/bin/v - wrapProgram $out/bin/v --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} - - mkdir -p $HOME/.vmodules; - ln -sf ${markdown} $HOME/.vmodules/markdown - $out/lib/v -v build-tools - $out/lib/v -v $out/lib/cmd/tools/vdoc - $out/lib/v -v $out/lib/cmd/tools/vast - $out/lib/v -v $out/lib/cmd/tools/vvet - $out/lib/v -v $out/lib/cmd/tools/vcreate - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://vlang.io/"; - description = "Simple, fast, safe, compiled language for developing maintainable software"; - license = licenses.mit; - maintainers = with maintainers; [ Madouura delta231 ]; - mainProgram = "v"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/wcc/default.nix b/pkgs/development/compilers/wcc/default.nix deleted file mode 100644 index 644e9ad646a8..000000000000 --- a/pkgs/development/compilers/wcc/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }: - -stdenv.mkDerivation { - pname = "wcc-unstable"; - version = "2018-04-05"; - - src = fetchFromGitHub { - owner = "endrazine"; - repo = "wcc"; - rev = "f141963ff193d7e1931d41acde36d20d7221e74f"; - sha256 = "1f0w869x0176n5nsq7m70r344gv5qvfmk7b58syc0jls8ghmjvb4"; - fetchSubmodules = true; - }; - - buildInputs = [ capstone libbfd libelf libiberty readline ]; - - postPatch = '' - sed -i src/wsh/include/libwitch/wsh.h src/wsh/scripts/INDEX \ - -e "s#/usr/share/wcc#$out/share/wcc#" - - sed -i -e '/stropts.h>/d' src/wsh/include/libwitch/wsh.h - ''; - - installFlags = [ "DESTDIR=$(out)" ]; - - preInstall = '' - mkdir -p $out/usr/bin - ''; - - postInstall = '' - mv $out/usr/* $out - rmdir $out/usr - mkdir -p $out/share/man/man1 - cp doc/manpages/*.1 $out/share/man/man1/ - ''; - - preFixup = '' - # Let patchShebangs rewrite shebangs with wsh. - PATH+=:$out/bin - ''; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://github.com/endrazine/wcc"; - description = "Witchcraft compiler collection: tools to convert and script ELF files"; - license = licenses.mit; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ orivej ]; - }; -} diff --git a/pkgs/development/compilers/wla-dx/default.nix b/pkgs/development/compilers/wla-dx/default.nix deleted file mode 100644 index b80b460d4def..000000000000 --- a/pkgs/development/compilers/wla-dx/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{lib, stdenv, fetchFromGitHub, cmake}: - -stdenv.mkDerivation rec { - pname = "wla-dx"; - version = "9.11"; - - src = fetchFromGitHub { - owner = "vhelin"; - repo = "wla-dx"; - rev = "v${version}-fix"; - sha256 = "0sz1vqafl7ii3z1710sk0ilvczv8pb4b6lkmg9pr7hqj3kaxndii"; - }; - - installPhase = '' - mkdir -p $out/bin - install binaries/* $out/bin - ''; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - homepage = "https://www.villehelin.com/wla.html"; - description = "Yet Another GB-Z80/Z80/6502/65C02/6510/65816/HUC6280/SPC-700 Multi Platform Cross Assembler Package"; - license = licenses.gpl2; - maintainers = with maintainers; [ matthewbauer ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix deleted file mode 100644 index db7d9b05b7fb..000000000000 --- a/pkgs/development/compilers/yap/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, readline, gmp, zlib }: - -stdenv.mkDerivation rec { - version = "6.3.3"; - pname = "yap"; - - src = fetchurl { - url = "https://www.dcc.fc.up.pt/~vsc/Yap/${pname}-${version}.tar.gz"; - sha256 = "0y7sjwimadqsvgx9daz28c9mxcx9n1znxklih9xg16k6n54v9qxf"; - }; - - buildInputs = [ readline gmp zlib ]; - - configureFlags = [ "--enable-tabling=yes" ]; - - # -fcommon: workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: libYap.a(pl-dtoa.o):/build/yap-6.3.3/H/pl-yap.h:230: multiple definition of `ATOM_'; - # libYap.a(pl-buffer.o):/build/yap-6.3.3/H/pl-yap.h:230: first defined here - env.NIX_CFLAGS_COMPILE = "-fpermissive -fcommon"; - - meta = { - # the linux 32 bit build fails. - broken = (stdenv.isLinux && stdenv.isAarch64) || !stdenv.is64bit; - homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/"; - description = "ISO-compatible high-performance Prolog compiler"; - license = lib.licenses.artistic2; - - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix deleted file mode 100644 index 58b8252729a7..000000000000 --- a/pkgs/development/compilers/yasm/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{lib, stdenv, fetchurl, buildPackages}: - -stdenv.mkDerivation rec { - pname = "yasm"; - version = "1.3.0"; - - src = fetchurl { - url = "https://www.tortall.net/projects/yasm/releases/yasm-${version}.tar.gz"; - sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix"; - }; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - meta = with lib; { - homepage = "http://www.tortall.net/projects/yasm/"; - description = "Complete rewrite of the NASM assembler"; - license = licenses.bsd2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 43e941824fa7..617e6b862fb5 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -75,13 +75,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.45"; + version = "0.47"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-NF4NQ7mCfARuMsMTJVBbJk39puJ8+D41woYEPgthfUI="; + hash = "sha256-9u9aAPTZyt9vzZwryor3GRCGzs/mu2/XtM0XzV7uHfk="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' diff --git a/pkgs/development/compilers/yosys/plugins/synlig.nix b/pkgs/development/compilers/yosys/plugins/synlig.nix index 0cfaac22122f..079c22aedbce 100644 --- a/pkgs/development/compilers/yosys/plugins/synlig.nix +++ b/pkgs/development/compilers/yosys/plugins/synlig.nix @@ -87,5 +87,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.asl20; maintainers = with maintainers; [ hzeller ]; platforms = platforms.all; + broken = versionAtLeast yosys.version "0.47"; }; }) diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix deleted file mode 100644 index ea5582375abd..000000000000 --- a/pkgs/development/compilers/z88dk/default.nix +++ /dev/null @@ -1,199 +0,0 @@ -{ - fetchFromGitHub, - lib, - stdenv, - unzip, - libxml2, - gmp, - m4, - uthash, - which, - pkg-config, - perl, - perlPackages, - fetchurl, -}: - -let - # Perl packages used by this project. - # TODO: put these into global perl-packages.nix once this is submitted. - ObjectTinyRW = perlPackages.buildPerlPackage { - pname = "Object-Tiny-RW"; - version = "1.07"; - src = fetchurl { - url = "mirror://cpan/authors/id/S/SC/SCHWIGON/object-tiny-rw/Object-Tiny-RW-1.07.tar.gz"; - hash = "sha256-NbQIy9d4ZcMnRJJApPBSej+W6e/aJ8rkb5E7rD7GVgs="; - }; - meta = { - description = "A date object with as little code as possible (and rw accessors)"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - - IteratorSimple = perlPackages.buildPerlPackage { - pname = "Iterator-Simple"; - version = "0.07"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MICHAEL/Iterator-Simple-0.07.tar.gz"; - hash = "sha256-y1dNBju0gcj7nLV4GkZFiWqg4e5xW6lHz3ZvH/Tp60Q="; - }; - meta = { - description = "Simple iterator and utilities"; - license = with lib.licenses; [ artistic1 gpl2Only ]; - }; - }; - - IteratorSimpleLookahead = perlPackages.buildPerlPackage { - pname = "Iterator-Simple-Lookahead"; - version = "0.09"; - src = fetchurl { - url = "mirror://cpan/authors/id/P/PS/PSCUST/Iterator-Simple-Lookahead-0.09.tar.gz"; - hash = "sha256-FmPE1xdU8LAXS21+H4DJaQ87qDi4Q4UkLawsUAqseZw="; - }; - propagatedBuildInputs = [ IteratorSimple ] ++ (with perlPackages; [ - ClassAccessor - ]); - meta = { - description = "Simple iterator with lookahead and unget"; - license = with lib.licenses; [ artistic1 gpl2Only ]; - }; - }; - - AsmPreproc = perlPackages.buildPerlPackage { - pname = "Asm-Preproc"; - version = "1.03"; - src = fetchurl { - url = "mirror://cpan/authors/id/P/PS/PSCUST/Asm-Preproc-1.03.tar.gz"; - hash = "sha256-pVTpIqGxZpBxZlAbXuGDapuOxsp3uM/AM5dKUxlej1M="; - }; - propagatedBuildInputs = [ - IteratorSimple - IteratorSimpleLookahead - ] ++ (with perlPackages; [ - TextTemplate - DataDump - FileSlurp - ]); - meta = { - description = "Preprocessor to be called from an assembler"; - license = with lib.licenses; [ artistic1 gpl2Only ]; - }; - }; - - CPUZ80Assembler = perlPackages.buildPerlPackage { - pname = "CPU-Z80-Assembler"; - version = "2.25"; - src = fetchurl { - url = "mirror://cpan/authors/id/P/PS/PSCUST/CPU-Z80-Assembler-2.25.tar.gz"; - hash = "sha256-cJ8Fl2KZw9/bnBDUzFuwwdw9x23OUvcftk78kw7abdU="; - }; - buildInputs = [ AsmPreproc ] ++ (with perlPackages; [ - CaptureTiny - RegexpTrie - PathTiny - ClassAccessor - ]); - meta = { - description = "Functions to assemble a set of Z80 assembly instructions"; - license = with lib.licenses; [ artistic1 gpl2Only ]; - }; - }; -in -stdenv.mkDerivation (finalAttrs: { - pname = "z88dk"; - version = "2.3"; - - src = fetchFromGitHub { - owner = "z88dk"; - repo = "z88dk"; - rev = "v${finalAttrs.version}"; - hash = "sha256-CHTORgK6FYIO6n+cvTUX4huY2Ek5FuHrs40QN5NZX44="; - fetchSubmodules = true; - }; - - postPatch = '' - # we dont rely on build.sh : - export PATH="$PWD/bin:$PATH" # needed to have zcc in testsuite - export ZCCCFG=$PWD/lib/config/ - - # we don't want to build zsdcc since it required network (svn) - # we test in checkPhase - substituteInPlace Makefile \ - --replace 'testsuite bin/z88dk-lib$(EXESUFFIX)' 'bin/z88dk-lib$(EXESUFFIX)'\ - --replace 'ALL_EXT = bin/zsdcc$(EXESUFFIX)' 'ALL_EXT =' - - # rc2014.lib not created, making corresponding tests fail. Comment out. - substituteInPlace test/suites/make.config \ - --replace 'zcc +rc2014' '#zcc +rc2014' \ - --replace '@$(MACHINE) -pc 0x9000' '#@$(MACHINE) -pc 0x9000' - - # The following tests don't pass. - rm src/z80asm/t/issue_0341.t - rm src/z80asm/t/z80asm_lib.t - ''; - - # Parallel building is not working yet with the upstream Makefiles. - # Explicitly switch this off for now. - enableParallelBuilding = false; - - doCheck = true; - checkPhase = '' - # Need to build libs first, Makefile deps not fully defined - make libs $makeFlags - make testsuite $makeFlags - make -k test $makeFlags - ''; - - short_rev = builtins.substring 0 7 finalAttrs.src.rev; - makeFlags = [ - "git_rev=${finalAttrs.short_rev}" - "version=${finalAttrs.version}" - "PREFIX=$(out)" - "git_count=0" - ]; - - nativeBuildInputs = [ - which - unzip - m4 - perl - pkg-config - - # Local perl packages - AsmPreproc - CPUZ80Assembler - ObjectTinyRW - ] ++ (with perlPackages; [ - CaptureTiny - DataHexDump - ModernPerl - PathTiny - RegexpCommon - TestHexDifferences - TextDiff - RegexpTrie - ]); - - buildInputs = [ - libxml2 - uthash - gmp - ]; - - preInstall = '' - mkdir -p $out/{bin,share} - ''; - - installTargets = [ - "libs" - "install" - ]; - - meta = with lib; { - homepage = "https://www.z88dk.org"; - description = "z80 Development Kit"; - license = licenses.clArtistic; - maintainers = [ maintainers.siraben ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/compilers/zasm/default.nix b/pkgs/development/compilers/zasm/default.nix deleted file mode 100644 index bd98622edf3f..000000000000 --- a/pkgs/development/compilers/zasm/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, zlib }: -let - libs-src = fetchFromGitHub { - owner = "megatokio"; - repo = "Libraries"; - # 2021-02-02 - rev = "c5cb3ed512c677db6f33e2d3539dfbb6e547030b"; - sha256 = "sha256-GiplhZf640uScVdKL6E/fegOgtC9SE1xgBqcX86XADk="; - }; -in -stdenv.mkDerivation rec { - pname = "zasm"; - version = "4.4.7"; - - src = fetchFromGitHub { - owner = "megatokio"; - repo = "zasm"; - rev = version; - sha256 = "sha256-Zbno8kmzss1H2FjwzHB4U7UXxa6oDfsPV80MVVFfM68="; - postFetch = '' - # remove folder containing files with weird names (causes the hash to turn out differently under macOS vs. Linux) - rm -rv $out/Test - ''; - }; - - buildInputs = [ zlib ]; - - configurePhase = '' - ln -sf ${libs-src} Libraries - ''; - - makeFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - "CXX=${stdenv.cc.targetPrefix}c++" - "LINK=${stdenv.cc.targetPrefix}c++" - "STRIP=${stdenv.cc.targetPrefix}strip" - ]; - - installPhase = '' - install -Dm755 -t $out/bin zasm - ''; - - meta = with lib; { - description = "Z80 / 8080 / Z180 assembler (for unix-style OS)"; - mainProgram = "zasm"; - homepage = "https://k1.spdns.de/Develop/Projects/zasm/Distributions/"; - license = licenses.bsd2; - maintainers = [ maintainers.turbomack ]; - platforms = platforms.unix; - badPlatforms = platforms.aarch64; - }; -} diff --git a/pkgs/development/compilers/zig/0.12/default.nix b/pkgs/development/compilers/zig/0.12/default.nix index 1a730d4c0ce7..f359140df234 100644 --- a/pkgs/development/compilers/zig/0.12/default.nix +++ b/pkgs/development/compilers/zig/0.12/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { # /System/Library/CoreServices/.SystemVersionPlatform.plist to determine the # OS version. This causes the build to fail during stage 3 with # OSVersionDetectionFail when the sandbox is enabled. - __impureHostDeps = lib.optionals stdenv.isDarwin [ + __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ "/System/Library/CoreServices/.SystemVersionPlatform.plist" "/System/Library/CoreServices/SystemVersion.plist" ]; diff --git a/pkgs/development/compilers/zig/0.13/default.nix b/pkgs/development/compilers/zig/0.13/default.nix index 43093c822f02..8ec68f20260f 100644 --- a/pkgs/development/compilers/zig/0.13/default.nix +++ b/pkgs/development/compilers/zig/0.13/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { # /System/Library/CoreServices/.SystemVersionPlatform.plist to determine the # OS version. This causes the build to fail during stage 3 with # OSVersionDetectionFail when the sandbox is enabled. - __impureHostDeps = lib.optionals stdenv.isDarwin [ + __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ "/System/Library/CoreServices/.SystemVersionPlatform.plist" "/System/Library/CoreServices/SystemVersion.plist" ]; diff --git a/pkgs/development/compilers/zig/cc.nix b/pkgs/development/compilers/zig/cc.nix index dc94e918814d..115a71ca4900 100644 --- a/pkgs/development/compilers/zig/cc.nix +++ b/pkgs/development/compilers/zig/cc.nix @@ -3,7 +3,7 @@ wrapCCWith, makeWrapper, runCommand, - targetPlatform, + stdenv, targetPackages, zig, }: @@ -34,9 +34,9 @@ wrapCCWith { nixSupport.cc-cflags = [ "-target" - "${targetPlatform.parsed.cpu.name}-${targetPlatform.parsed.kernel.name}-${targetPlatform.parsed.abi.name}" + "${stdenv.targetPlatform.parsed.cpu.name}-${stdenv.targetPlatform.parsed.kernel.name}-${stdenv.targetPlatform.parsed.abi.name}" ] ++ lib.optional ( - targetPlatform.isLinux && !(targetPackages.isStatic or false) + stdenv.targetPlatform.isLinux && !(targetPackages.isStatic or false) ) "-Wl,-dynamic-linker=${targetPackages.stdenv.cc.bintools.dynamicLinker}"; } diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix index cde1a61e3583..3da36c083bd3 100644 --- a/pkgs/development/compilers/zig/generic.nix +++ b/pkgs/development/compilers/zig/generic.nix @@ -41,12 +41,14 @@ stdenv.mkDerivation (finalAttrs: { # /System/Library/CoreServices/.SystemVersionPlatform.plist to determine the # OS version. This causes the build to fail during stage 3 with # OSVersionDetectionFail when the sandbox is enabled. - __impureHostDeps = lib.optionals stdenv.isDarwin [ + __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ "/System/Library/CoreServices/.SystemVersionPlatform.plist" "/System/Library/CoreServices/SystemVersion.plist" ]; - env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache"; + preBuild = '' + export ZIG_GLOBAL_CACHE_DIR="$TMPDIR/zig-cache"; + ''; # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't # work in Nix's sandbox. Use env from our coreutils instead. @@ -55,14 +57,14 @@ stdenv.mkDerivation (finalAttrs: { --replace "/usr/bin/env" "${coreutils}/bin/env" '' else '' substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \ - --replace "/usr/bin/env" "${coreutils}/bin/env" + --replace-fail "/usr/bin/env" "${coreutils}/bin/env" ''; doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck - $out/bin/zig test --cache-dir "$TMPDIR/zig-test-cache" -I $src/test $src/test/behavior.zig + $out/bin/zig test -I $src/test $src/test/behavior.zig runHook postInstallCheck ''; diff --git a/pkgs/development/compilers/zulu/11.nix b/pkgs/development/compilers/zulu/11.nix index afe33634820c..ce4d15629b81 100644 --- a/pkgs/development/compilers/zulu/11.nix +++ b/pkgs/development/compilers/zulu/11.nix @@ -8,35 +8,35 @@ callPackage ./common.nix ({ # Note that the latest build may differ by platform dists = { x86_64-linux = { - zuluVersion = "11.70.15"; - jdkVersion = "11.0.22"; + zuluVersion = "11.74.15"; + jdkVersion = "11.0.24"; hash = - if enableJavaFX then "sha256-FxTHgng7/oDY3n3qy8j1ztbpBQeoGcEBJbEXqaE4Zr4=" - else "sha256-V41ZRrJtkle3joKhwoID5bvWkN5I4gFjmbEnTD7no8U="; + if enableJavaFX then "sha256-eP2BCD77uRmukd48+pDlIlhos9RjL9VYx8tpQdq2uNo=" + else "sha256-p6rA5pqZv2Sho+yW8IFJrAaaW72q766SLuOnRl/ZGLM="; }; aarch64-linux = { - zuluVersion = "11.70.15"; - jdkVersion = "11.0.22"; + zuluVersion = "11.74.15"; + jdkVersion = "11.0.24"; hash = - if enableJavaFX then throw "JavaFX is not available for aarch64-linux" - else "sha256-u6XWMXAArUhMMb6j3KFOhkIxpVYR1oYLF0Wde7/tI0k="; + if enableJavaFX then "sha256-nAUjPk9gktO0UJk7gAKygq+ztSJY5wk+EoG1LgJidJ8=" + else "sha256-T0c+YwfEZcA3iJmBriyzxBM2SECcczG25XVApIlgM+E="; }; x86_64-darwin = { - zuluVersion = "11.70.15"; - jdkVersion = "11.0.22"; + zuluVersion = "11.74.15"; + jdkVersion = "11.0.24"; hash = - if enableJavaFX then "sha256-JkJZwk+D28wHWqwUoLo7WW5ypwTrT5biSoP+70YI3eQ=" - else "sha256-ca/ttkPe2tbcm1ruguDgPsxKWbEdKcICsKCDXaup9N4="; + if enableJavaFX then "sha256-hanQw2FWbqsmGR1WixbM0BNWGeXmS2vt9tbaaEY7D1c=" + else "sha256-CH6pVui0PInHMt+AJOE0T2hrAmEcLFRJvmR4KZuanaw="; }; aarch64-darwin = { - zuluVersion = "11.70.15"; - jdkVersion = "11.0.22"; + zuluVersion = "11.74.15"; + jdkVersion = "11.0.24"; hash = - if enableJavaFX then "sha256-bAgH4lCxPvvFOeif5gI2aoLt1aC4EXPzb2YmiS9bQsU=" - else "sha256-PWQOF+P9djZarjAJaE3I0tuI1E4H/9584VN04BMzmvM="; + if enableJavaFX then "sha256-WbzpfPgoT3CTazKBnI1Fg+q+YQP6MwCWkon6VOeLZsA=" + else "sha256-+KxFgHbBDxN1O3NCAzqqBztxXveYAjrPFVuoFL/2dRQ="; }; }; } // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/development/compilers/zulu/17.nix b/pkgs/development/compilers/zulu/17.nix index 74e00df88c68..3e94e824d55d 100644 --- a/pkgs/development/compilers/zulu/17.nix +++ b/pkgs/development/compilers/zulu/17.nix @@ -8,35 +8,35 @@ callPackage ./common.nix ({ # Note that the latest build may differ by platform dists = { x86_64-linux = { - zuluVersion = "17.48.15"; - jdkVersion = "17.0.10"; + zuluVersion = "17.52.17"; + jdkVersion = "17.0.12"; hash = - if enableJavaFX then "sha256-YvuD/n84+DARPm+38TxIUB727SIhASFo+WX9+PtJqyw=" - else "sha256-VyhNob2G1Tq/WCKT0g0Y//f+JD2hWgj6QU9idfvUj+I="; + if enableJavaFX then "sha256-qKpkvk7/IEnlOJoy7An0AVGUXWkWeuuiQzqKKE/+Ec4=" + else "sha256-JCRcjQzkkV2G5wsoi13psbTHjxCtuw5rqT4pEAOarRk="; }; aarch64-linux = { - zuluVersion = "17.48.15"; - jdkVersion = "17.0.10"; + zuluVersion = "17.52.17"; + jdkVersion = "17.0.12"; hash = - if enableJavaFX then throw "JavaFX is not available for aarch64-linux" - else "sha256-9OZl8ruaLvjdpg42fC3IM5mC/9lmshCppNfUuz/Sf8E="; + if enableJavaFX then "sha256-mpTM/43oyDsOnoZM8AW1Z7EFTznnPAnYoC+T6csc8Fw=" + else "sha256-uIz2D5WjqySy5lobuvWp3kFTGsBKhXzT56QgCGyXwSY="; }; x86_64-darwin = { - zuluVersion = "17.48.15"; - jdkVersion = "17.0.10"; + zuluVersion = "17.52.17"; + jdkVersion = "17.0.12"; hash = - if enableJavaFX then "sha256-VOIcFtjQiYsA4AiP1TCa0Q76Ew5FdeJCICwsYGU+Dnw=" - else "sha256-huSKGvOnrEUAiE2MJbdHWtF2saeLGaQkZllXzDo8o+g="; + if enableJavaFX then "sha256-jb1oPmRzlYUMONovdsHowlC44X3/PFZ8KilxSsR924U=" + else "sha256-8VlGFUhCn3NE2A42xi69KzZqu0RoGOV1ZYj8oaqCnTc="; }; aarch64-darwin = { - zuluVersion = "17.48.15"; - jdkVersion = "17.0.10"; + zuluVersion = "17.52.17"; + jdkVersion = "17.0.12"; hash = - if enableJavaFX then "sha256-fxBDhHMeL5IP4eRw9ykXrRRh7Nl9DnvDB1YLaQwFHLg=" - else "sha256-kuEiHSkb4WFtPB3m0A968LPZw7Wl0sKquhbzDF8vQS8="; + if enableJavaFX then "sha256-rEILTKTpX8DEoOGhlrhbxpcCyF2+QrjW92h0ox9ezp0=" + else "sha256-RZ3hNQQFE+spTT9lFHLjmkolSkpHDg2Hvro6xi7uNww="; }; }; } // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/development/compilers/zulu/21.nix b/pkgs/development/compilers/zulu/21.nix index db2d3a397871..9e86e0bc748b 100644 --- a/pkgs/development/compilers/zulu/21.nix +++ b/pkgs/development/compilers/zulu/21.nix @@ -8,35 +8,35 @@ callPackage ./common.nix ({ # Note that the latest build may differ by platform dists = { x86_64-linux = { - zuluVersion = "21.32.17"; - jdkVersion = "21.0.2"; + zuluVersion = "21.36.17"; + jdkVersion = "21.0.4"; hash = - if enableJavaFX then "sha256-CEM2lMjyZLWS1tBcS1tBTUxBwAyzW3vrpRWFVVSFVGY=" - else "sha256-Wtcw++5rtJv/8QvznoQ5LnKNiRA9NHSn5d7w/RNLMAo="; + if enableJavaFX then "sha256-Q2bdM0/a2t5aBRCIzXBlhXamf8N7wdSUsK5VhaU9DcY=" + else "sha256-MY0MLtPIdvt+oslSlFzc997PtSZMpRrs4VnmNaxT1UQ="; }; aarch64-linux = { - zuluVersion = "21.32.17"; - jdkVersion = "21.0.2"; + zuluVersion = "21.36.17"; + jdkVersion = "21.0.4"; hash = - if enableJavaFX then throw "JavaFX is not available for aarch64-linux" - else "sha256-zn3xr11EqfRVYXxLiJFEP74+Syacd32Lgu1m93Fnz+A="; + if enableJavaFX then "sha256-BzNEcDrQo5yOWnEsJxw9JfXYdZGN6/wxnTDB0qC1i/0=" + else "sha256-2jwtfbM2cLz2ZTJEGut/M9zw0ifI2v5841zuZ/aCnEw="; }; x86_64-darwin = { - zuluVersion = "21.32.17"; - jdkVersion = "21.0.2"; + zuluVersion = "21.36.17"; + jdkVersion = "21.0.4"; hash = - if enableJavaFX then "sha256-CbEKa9Z/ItFqVM4BqsWXyRf5ejQZXPK8OqkULr9Cpqk=" - else "sha256-Otj+KI61fZdcJ4auRToDaqRuR6sqw9gVOOuuKlTTwCU="; + if enableJavaFX then "sha256-H3gM2XCCcuUxlAEzX6IO7Cp6NtH85PYHlH54k5XvNAc=" + else "sha256-XOdaaiR8cCm3TEynz29g/SstaM4eiVb7RI0phDFrX+o="; }; aarch64-darwin = { - zuluVersion = "21.32.17"; - jdkVersion = "21.0.2"; + zuluVersion = "21.36.17"; + jdkVersion = "21.0.4"; hash = - if enableJavaFX then "sha256-PK+cafgQsnK6acuQxun4IUiyYHQJsBfUawwfGV8OCfQ=" - else "sha256-6CYFFt6LYGYUIqcl8d8sNu+Ij2+zU5NWawDnMl2z0E4="; + if enableJavaFX then "sha256-lLAb8MABo95A5WcayBLNvsBSdVFptnO4EmhX2gjo6r8=" + else "sha256-vCdQ+BoWbMbpwwroqrpU8lOoyOydjPwEpVX+IHEse/8="; }; }; } // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/development/compilers/zulu/22.nix b/pkgs/development/compilers/zulu/22.nix deleted file mode 100644 index 93891d6511c7..000000000000 --- a/pkgs/development/compilers/zulu/22.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ callPackage -, enableJavaFX ? false -, ... -}@args: - -callPackage ./common.nix ({ - # Details from https://www.azul.com/downloads/?version=java-22-lts&package=jdk - # Note that the latest build may differ by platform - dists = { - x86_64-linux = { - zuluVersion = "22.28.91"; - jdkVersion = "22.0.0"; - hash = - if enableJavaFX then "sha256-+qUrZ+GlspSP3RLTAbgEtFm0B0fzX/VD1WUl6mk2c/0=" - else "sha256-HvMiODsz+puu1xtxG2RRXH/PWCk91PGNZ7UcOd9orqQ="; - }; - - aarch64-linux = { - zuluVersion = "22.28.91"; - jdkVersion = "22.0.0"; - hash = - if enableJavaFX then throw "JavaFX is not available for aarch64-linux" - else "sha256-3RLNNEbMk5wAZsQmbQj/jpx9iTL/yr9N3wL4t7m6c+s="; - }; - - x86_64-darwin = { - zuluVersion = "22.28.91"; - jdkVersion = "22.0.0"; - hash = - if enableJavaFX then "sha256-QkFwbc2YFEWb5rddhH4a+zmtsrXxUBSuS8yg9qUb728=" - else "sha256-Y6PSNQjHRXukwux2sVbvpTIqT+Cg+KeG1C0iSEwyKZw="; - }; - - aarch64-darwin = { - zuluVersion = "22.28.91"; - jdkVersion = "22.0.0"; - hash = - if enableJavaFX then "sha256-256UP6MtUReQYqCKVt0ThN9BVDyKLAMXQTdpcDB9t24=" - else "sha256-o0VkWB4+PzBmNNWy+FZlyjTgukBTe6owfydb3YNfEE0="; - }; - }; -} // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/development/compilers/zulu/23.nix b/pkgs/development/compilers/zulu/23.nix new file mode 100644 index 000000000000..3208944f981f --- /dev/null +++ b/pkgs/development/compilers/zulu/23.nix @@ -0,0 +1,42 @@ +{ callPackage +, enableJavaFX ? false +, ... +}@args: + +callPackage ./common.nix ({ + # Details from https://www.azul.com/downloads/?version=java-23-lts&package=jdk + # Note that the latest build may differ by platform + dists = { + x86_64-linux = { + zuluVersion = "23.28.85"; + jdkVersion = "23.0.0"; + hash = + if enableJavaFX then "sha256-HEQ0lxHsoyHG+ZWIlWsbkqMf/rauARafzWoiElRwekA=" + else "sha256-a1YPqBMaWkoruNFoSckLyx00LCOZNsowlSn2L3XCDJA="; + }; + + aarch64-linux = { + zuluVersion = "23.28.85"; + jdkVersion = "23.0.0"; + hash = + if enableJavaFX then throw "JavaFX is not available for aarch64-linux" + else "sha256-/i+ch7BMAwMQ1C4e3shp9BHuQ67vVXfmIK1YKs7L24M="; + }; + + x86_64-darwin = { + zuluVersion = "23.28.85"; + jdkVersion = "23.0.0"; + hash = + if enableJavaFX then "sha256-1/YmLWA/men8jMjnhkZVMf2irf6Tc/5x7UECxqKJcL4=" + else "sha256-rEr8M3KF9Z95gV8sHqi5lQD2RJjtssZx8Q8goy6danw="; + }; + + aarch64-darwin = { + zuluVersion = "23.28.85"; + jdkVersion = "23.0.0"; + hash = + if enableJavaFX then "sha256-TumPJoHmvklMlcpF4PFY/Arcdc5fkX5z0xeIuNFxluQ=" + else "sha256-gFvfJL0RQgIOATLTMdfa+fStUCrdHYC3rxy0j5eNVDc="; + }; + }; +} // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index 05411149da68..175519bb8ab4 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -8,35 +8,35 @@ callPackage ./common.nix ({ # Note that the latest build may differ by platform dists = { x86_64-linux = { - zuluVersion = "8.76.0.17"; - jdkVersion = "8.0.402"; + zuluVersion = "8.80.0.17"; + jdkVersion = "8.0.422"; hash = - if enableJavaFX then "sha256-29aDAu8WVYQFSpMUFq4gG64BBz/ei/VDMg72xrpB9w4=" - else "sha256-34DI6O7T8iqDHsX63S3xk+BKDu8IHRRWNvtxpsnUJEk="; + if enableJavaFX then "sha256-Ls2sHCtP9htBIDwq5fNDRA3/bGN0bzaMp6nNkjU1zx8=" + else "sha256-YNxnNOFvTc0S3jt4F3UREi2196W7wSBmwieNJl7qamo="; }; aarch64-linux = { - zuluVersion = "8.74.0.17"; - jdkVersion = "8.0.392"; + zuluVersion = "8.80.0.17"; + jdkVersion = "8.0.422"; hash = - if enableJavaFX then throw "JavaFX is not available for aarch64-linux" - else "sha256-xESdKEmfkiE657X/xclwsJR5M+P72BpWErtAcYMcK0Y="; + if enableJavaFX then "sha256-aVBleFrj4OpUJh82rM8XQGy9SzGqjaeOBo20nAbtpJo=" + else "sha256-C5ebWtKAyKexOuEf4yM1y5tQZ2ICxREObwvMrcz5TXE="; }; x86_64-darwin = { - zuluVersion = "8.76.0.17"; - jdkVersion = "8.0.402"; + zuluVersion = "8.80.0.17"; + jdkVersion = "8.0.422"; hash = - if enableJavaFX then "sha256-oqFpKeWwfiXr3oX78LGvAyDGAAS2GON2gAm6fHGH7Ow=" - else "sha256-edZqDEsydQCDEwC1ZCDF/MjWVTnuQNWcKR2k/RjaIEI="; + if enableJavaFX then "sha256-7NB0OH194nZdpIGyX8gLxJzjJdi2UIxmGsGI5M0yqJ4=" + else "sha256-vyB1Fepnpwsi9KjwFjEF+YbiCgmqZcirZu0zmRAp8PA="; }; aarch64-darwin = { - zuluVersion = "8.76.0.17"; - jdkVersion = "8.0.402"; + zuluVersion = "8.80.0.17"; + jdkVersion = "8.0.422"; hash = - if enableJavaFX then "sha256-UCWRXCz4v381IWzWPDYzwJwbhsmZOYxKPLGJBQGjPmc=" - else "sha256-0VPlOuNB39gDnU+pK0DGTSUjTHTtYoxaRg3YD2LyLXg="; + if enableJavaFX then "sha256-JuQkY923tizx5HQo4WC3YCk75a4qHJYNRFKpZ8XES58=" + else "sha256-Q/hU2ICVwmJehrXmACm4/X48ULTqM6WSc55JDVgkBvM="; }; }; } // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/development/compilers/zulu/common.nix b/pkgs/development/compilers/zulu/common.nix index c9056236ea6a..6b20c71c5438 100644 --- a/pkgs/development/compilers/zulu/common.nix +++ b/pkgs/development/compilers/zulu/common.nix @@ -16,7 +16,7 @@ # runtime dependencies , cups # runtime dependencies for GTK+ Look and Feel -, gtkSupport ? stdenv.isLinux +, gtkSupport ? stdenv.hostPlatform.isLinux , cairo , glib , gtk2 @@ -48,7 +48,7 @@ let gtk3 ] ++ lib.optionals (gtkSupport && lib.versionOlder dist.jdkVersion "17") [ gtk2 - ] ++ lib.optionals (stdenv.isLinux && enableJavaFX) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && enableJavaFX) [ ffmpeg.lib ]; @@ -75,12 +75,12 @@ let nativeBuildInputs = [ unzip - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook makeWrapper ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig freetype @@ -92,9 +92,9 @@ let xorg.libXtst xorg.libXxf86vm zlib - ] ++ lib.optionals (stdenv.isLinux && enableJavaFX) runtimeDependencies; + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && enableJavaFX) runtimeDependencies; - autoPatchelfIgnoreMissingDeps = if (stdenv.isLinux && enableJavaFX) then [ + autoPatchelfIgnoreMissingDeps = if (stdenv.hostPlatform.isLinux && enableJavaFX) then [ "libavcodec*.so.*" "libavformat*.so.*" ] else null; @@ -126,7 +126,7 @@ let cat <<EOF >> $out/nix-support/setup-hook if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi EOF - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # 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 @@ -138,14 +138,14 @@ let done '' # FIXME: move all of the above to installPhase. - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' find "$out" -name libfontmanager.so -exec \ patchelf --add-needed libfontconfig.so {} \; ''; # fixupPhase is moving the man to share/man which breaks it because it's a # relative symlink. - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -nsf ../zulu-${lib.versions.major version}.jdk/Contents/Home/man $out/share/man ''; @@ -155,15 +155,16 @@ let home = jdk; }; - meta = (import ../openjdk/meta.nix lib version) // { + meta = { description = "Certified builds of OpenJDK"; longDescription = '' Certified builds of OpenJDK that can be deployed across multiple operating systems, containers, hypervisors and Cloud platforms. ''; homepage = "https://www.azul.com/products/zulu/"; + license = lib.licenses.gpl2Only; mainProgram = "java"; - maintainers = [ ]; + maintainers = [ ] ++ lib.teams.java.members; platforms = builtins.attrNames dists; sourceProvenance = with lib.sourceTypes; [ binaryBytecode binaryNativeCode ]; }; diff --git a/pkgs/development/coq-modules/ExtLib/default.nix b/pkgs/development/coq-modules/ExtLib/default.nix new file mode 100644 index 000000000000..398185396f3a --- /dev/null +++ b/pkgs/development/coq-modules/ExtLib/default.nix @@ -0,0 +1,39 @@ +{ lib, mkCoqDerivation, coq, version ? null }: + +mkCoqDerivation rec { + pname = "coq-ext-lib"; + inherit version; + defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.14" "8.20"; out = "0.12.2"; } + { case = range "8.11" "8.19"; out = "0.12.0"; } + { case = range "8.8" "8.16"; out = "0.11.6"; } + { case = range "8.8" "8.14"; out = "0.11.4"; } + { case = range "8.8" "8.13"; out = "0.11.3"; } + { case = "8.7"; out = "0.9.7"; } + { case = "8.6"; out = "0.9.5"; } + { case = "8.5"; out = "0.9.4"; } + ] null; + release."0.12.2".sha256 = "sha256-lSTlbpkSuAY6B9cqofXSlDk2VchtqfZpRQ0+y/BAbEY="; + release."0.12.1".sha256 = "sha256-YIHyiRUHPy/LGM2DMTRKRwP7j6OSBYKpu6wO2mZOubo="; + release."0.12.0".sha256 = "sha256-9szpnWoS83bDc+iLqElfgz0LNRo9hSRQwUFIgpTca4c="; + release."0.11.8".sha256 = "sha256-uUBKJb7XjRnyb7rCisZrDcaDdsp1Bv1lXDIU3Ce8e5k="; + release."0.11.7".sha256 = "sha256-HkxUny0mxDDT4VouBBh8btwxGZgsb459kBufTLLnuEY="; + release."0.11.6".sha256 = "0w6iyrdszz7zc8kaybhy3mwjain2d2f83q79xfd5di0hgdayh7q7"; + release."0.11.4".sha256 = "0yp8mhrhkc498nblvhq1x4j6i9aiidkjza4wzvrkp9p8rgx5g5y3"; + release."0.11.3".sha256 = "1w99nzpk72lffxis97k235axss5lmzhy5z3lga2i0si95mbpil42"; + release."0.11.2".sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; + release."0.10.3".sha256 = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb"; + release."0.11.1".sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; + release."0.10.2".sha256 = "1b150rc5bmz9l518r4m3vwcrcnnkkn9q5lrwygkh0a7mckgg2k9f"; + release."0.10.1".sha256 = "0r1vspad8fb8bry3zliiz4hfj4w1iib1l2gm115a94m6zbiksd95"; + release."0.10.0".sha256 = "1kxi5bmjwi5zqlqgkyzhhxwgcih7wf60cyw9398k2qjkmi186r4a"; + release."0.9.7".sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; + release."0.9.5".sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; + release."0.9.4".sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; + releaseRev = v: "v${v}"; + + meta = { + description = "Collection of theories and plugins that may be useful in other Coq developments"; + maintainers = with lib.maintainers; [ jwiegley ptival ]; + }; +} diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/pkgs/development/coq-modules/HoTT/default.nix index 6bc8ad9bb180..8652520b4a40 100644 --- a/pkgs/development/coq-modules/HoTT/default.nix +++ b/pkgs/development/coq-modules/HoTT/default.nix @@ -6,7 +6,7 @@ mkCoqDerivation { owner = "HoTT"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.19"; out = coq.coq-version; } + { case = range "8.14" "8.20"; out = coq.coq-version; } ] null; releaseRev = v: "V${v}"; release."8.14".sha256 = "sha256-7kXk2pmYsTNodHA+Qts3BoMsewvzmCbYvxw9Sgwyvq0="; @@ -15,6 +15,7 @@ mkCoqDerivation { release."8.17".sha256 = "sha256-GjTUpzL9UzJm4C2ilCaYEufLG3hcj7rJPc5Op+OMal8="; release."8.18".sha256 = "sha256-URoUoQOsG0432wg9i6pTRomWQZ+ewutq2+V29TBrVzc="; release."8.19".sha256 = "sha256-igG3mhR6uPXV+SCtPH9PBw/eAtTFFry6HPT5ypWj3tQ="; + release."8.20".sha256 = "sha256-XHAvomi0of11j4x5gpTgD5Mw53eF1FpnCyBvdbV3g6I="; # versions of HoTT for Coq 8.17 and onwards will use dune # opam-name = if lib.versions.isLe "8.17" coq.coq-version then "coq-hott" else null; diff --git a/pkgs/development/coq-modules/ITree/default.nix b/pkgs/development/coq-modules/ITree/default.nix index 693b1b260c1e..78d788b96295 100644 --- a/pkgs/development/coq-modules/ITree/default.nix +++ b/pkgs/development/coq-modules/ITree/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, version ? null , paco, coq-ext-lib }: +{ lib, mkCoqDerivation, coq, version ? null , paco, ExtLib }: mkCoqDerivation rec { pname = "InteractionTrees"; @@ -15,7 +15,7 @@ mkCoqDerivation rec { release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm"; release."3.2.0".sha256 = "sha256-10ckCAqSQ0I3CZKlSllI1obOgWVxDagTd7eyhrl1xpE="; releaseRev = v: "${v}"; - propagatedBuildInputs = [ coq-ext-lib paco ]; + propagatedBuildInputs = [ ExtLib paco ]; meta = { description = "Library for Representing Recursive and Impure Programs in Coq"; maintainers = with lib.maintainers; [ larsr ]; diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index d9a0182c2659..16f4eedb5cca 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io, version ? null }: +{ lib, mkCoqDerivation, coq, ssreflect, ExtLib, simple-io, version ? null }: let recent = lib.versions.isGe "8.7" coq.coq-version || coq.coq-version == "dev"; in (mkCoqDerivation { @@ -47,7 +47,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version || coq.coq-version == "dev" mlPlugin = true; nativeBuildInputs = lib.optional recent coq.ocamlPackages.ocamlbuild; propagatedBuildInputs = [ ssreflect ] - ++ lib.optionals recent [ coq-ext-lib simple-io ]; + ++ lib.optionals recent [ ExtLib simple-io ]; extraInstallFlags = [ "-f Makefile.coq" ]; enableParallelBuilding = false; diff --git a/pkgs/development/coq-modules/RustExtraction/default.nix b/pkgs/development/coq-modules/RustExtraction/default.nix new file mode 100644 index 000000000000..4aaa96e77f85 --- /dev/null +++ b/pkgs/development/coq-modules/RustExtraction/default.nix @@ -0,0 +1,57 @@ +{ + lib, + mkCoqDerivation, + which, + coq, + metacoq, + version ? null, +}: + +with lib; +mkCoqDerivation { + pname = "RustExtraction"; + repo = "coq-rust-extraction"; + owner = "AU-COBRA"; + domain = "github.com"; + + inherit version; + defaultVersion = + with versions; + switch + [ + coq.coq-version + metacoq.version + ] + [ + { + cases = [ + (range "8.17" "8.19") + (range "1.3.1" "1.3.2") + ]; + out = "0.1.0"; + } + ] + null; + + release."0.1.0".sha256 = "+Of/DP2Vjsa7ASKswjlvqqhcmDhC9WrozridedNZQkY="; + + releaseRev = v: "v${v}"; + + propagatedBuildInputs = [ + coq.ocamlPackages.findlib + metacoq + ]; + + postPatch = '' + patchShebangs ./process_extraction.sh + patchShebangs ./tests/process-extraction-examples.sh + ''; + + mlPlugin = true; + + meta = { + description = "A framework for extracting Coq programs to Rust"; + maintainers = with maintainers; [ _4ever2 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 28a08f0039f7..a8edc6931a3d 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -29,7 +29,7 @@ compcert = mkCoqDerivation { releaseRev = v: "v${v}"; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.14" "8.19"; out = "3.14"; } + { case = range "8.14" "8.20"; out = "3.14"; } { case = isEq "8.13" ; out = "3.10"; } { case = isEq "8.12" ; out = "3.9"; } { case = range "8.8" "8.11"; out = "3.8"; } @@ -201,13 +201,18 @@ patched_compcert = compcert.overrideAttrs (o: }) ]; } - { cases = [ (isEq "8.19") (isEq "3.14") ]; + { cases = [ (range "8.19" "8.20") (isEq "3.14") ]; out = [ # Support for Coq 8.19.2 (fetchpatch { url = "https://github.com/AbsInt/CompCert/commit/8fcfb7d2a6e9ba44003ccab0dfcc894982779af1.patch"; hash = "sha256-m/kcnDBBPWFriipuGvKZUqLQU8/W1uqw8j4qfCwnTZk="; }) + # Support for Coq 8.20.0 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/20a5b48758bf8ac18e4c420df67017b371efc237.patch"; + hash = "sha256-TJ87CvLiAv1absGnPsTXsD/HQwKgS82loUTcosulyso="; + }) ]; } ] []; diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index c9db564c1941..eacafcbe3809 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -10,6 +10,7 @@ let { case = "8.16"; out = { version = "1.17.0"; };} { case = "8.17"; out = { version = "1.17.0"; };} { case = "8.18"; out = { version = "1.18.1"; };} + { case = "8.19"; out = { version = "1.18.1"; };} { case = "8.20"; out = { version = "1.19.2"; };} ] {} ); in (mkCoqDerivation { diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix deleted file mode 100644 index 4ec805e8f028..000000000000 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, mkCoqDerivation, coq, version ? null }: - -mkCoqDerivation rec { - pname = "coq-ext-lib"; - owner = "coq-ext-lib"; - inherit version; - defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.20"; out = "0.12.1"; } - { case = range "8.11" "8.19"; out = "0.12.0"; } - { case = range "8.8" "8.16"; out = "0.11.6"; } - { case = range "8.8" "8.14"; out = "0.11.4"; } - { case = range "8.8" "8.13"; out = "0.11.3"; } - { case = "8.7"; out = "0.9.7"; } - { case = "8.6"; out = "0.9.5"; } - { case = "8.5"; out = "0.9.4"; } - ] null; - release."0.12.1".sha256 = "sha256-YIHyiRUHPy/LGM2DMTRKRwP7j6OSBYKpu6wO2mZOubo="; - release."0.12.0".sha256 = "sha256-9szpnWoS83bDc+iLqElfgz0LNRo9hSRQwUFIgpTca4c="; - release."0.11.8".sha256 = "sha256-uUBKJb7XjRnyb7rCisZrDcaDdsp1Bv1lXDIU3Ce8e5k="; - release."0.11.7".sha256 = "sha256-HkxUny0mxDDT4VouBBh8btwxGZgsb459kBufTLLnuEY="; - release."0.11.6".sha256 = "0w6iyrdszz7zc8kaybhy3mwjain2d2f83q79xfd5di0hgdayh7q7"; - release."0.11.4".sha256 = "0yp8mhrhkc498nblvhq1x4j6i9aiidkjza4wzvrkp9p8rgx5g5y3"; - release."0.11.3".sha256 = "1w99nzpk72lffxis97k235axss5lmzhy5z3lga2i0si95mbpil42"; - release."0.11.2".sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; - release."0.10.3".sha256 = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb"; - release."0.11.1".sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; - release."0.10.2".sha256 = "1b150rc5bmz9l518r4m3vwcrcnnkkn9q5lrwygkh0a7mckgg2k9f"; - release."0.10.1".sha256 = "0r1vspad8fb8bry3zliiz4hfj4w1iib1l2gm115a94m6zbiksd95"; - release."0.10.0".sha256 = "1kxi5bmjwi5zqlqgkyzhhxwgcih7wf60cyw9398k2qjkmi186r4a"; - release."0.9.7".sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; - release."0.9.5".sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; - release."0.9.4".sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; - releaseRev = v: "v${v}"; - - meta = { - description = "Collection of theories and plugins that may be useful in other Coq developments"; - maintainers = with lib.maintainers; [ jwiegley ptival ]; - }; -} diff --git a/pkgs/development/coq-modules/coq-lsp/default.nix b/pkgs/development/coq-modules/coq-lsp/default.nix index ee33c1a148b5..d9ddb25636fd 100644 --- a/pkgs/development/coq-modules/coq-lsp/default.nix +++ b/pkgs/development/coq-modules/coq-lsp/default.nix @@ -8,18 +8,18 @@ useDune = true; release."0.1.8+8.16".sha256 = "sha256-dEEAK5IXGjHB8D/fYJRQG/oCotoXJuWLxXB0GQlY2eo="; - release."0.1.9+8.17".sha256 = "sha256-BCsVRKSE9txeKgDfTsu7hQ6MebC+dX2AAqDF9iL7bYE="; - release."0.2.0+8.18".sha256 = "sha256-OByBB1CLmj2N0AEieBXLVvP6OLGqi0HXra2jE9k3hXU="; - release."0.2.0+8.19".sha256 = "sha256-G/UurWHxR2VzjClZCDHYcz7wAQAaYZt+DsADSXMybdk="; - release."0.2.0+8.20".sha256 = "sha256-+KRiYK+YCHC4R6/yDenRI8SqZiZ29X24xlDzegbPfrw="; + release."0.2.2+8.17".sha256 = "sha256-dWPAwePbfTf2t+ydSd1Cnr2kKTDbvedmxm2+Z6F5zuM="; + release."0.2.2+8.18".sha256 = "sha256-0J/XaSvhnKHRlcWfG1xbUOyN4LDtK1SEahE9kpV7GK4="; + release."0.2.2+8.19".sha256 = "sha256-E2zO2SOU3nmTFf1yA1gefyIWTViUGNTTJ4r6fZYl6UY="; + release."0.2.2+8.20".sha256 = "sha256-9yHisA3YJ/KuolU53qcQAjuSIAZPY+4rnkWV9dpLc6c="; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isEq "8.16"; out = "0.1.8+8.16"; } - { case = isEq "8.17"; out = "0.1.9+8.17"; } - { case = isEq "8.18"; out = "0.2.0+8.18"; } - { case = isEq "8.19"; out = "0.2.0+8.19"; } - { case = isEq "8.20"; out = "0.2.0+8.20"; } + { case = isEq "8.17"; out = "0.2.2+8.17"; } + { case = isEq "8.18"; out = "0.2.2+8.18"; } + { case = isEq "8.19"; out = "0.2.2+8.19"; } + { case = isEq "8.20"; out = "0.2.2+8.20"; } ] null; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/coq-modules/coqide/default.nix b/pkgs/development/coq-modules/coqide/default.nix index fcc0e2a81dd4..bf76a81e5d71 100644 --- a/pkgs/development/coq-modules/coqide/default.nix +++ b/pkgs/development/coq-modules/coqide/default.nix @@ -43,14 +43,16 @@ mkCoqDerivation rec { runHook postInstall ''; - desktopItems = makeDesktopItem { - name = "coqide"; - exec = "coqide"; - icon = "coq"; - desktopName = "CoqIDE"; - comment = "Graphical interface for the Coq proof assistant"; - categories = [ "Development" "Science" "Math" "IDE" "GTK" ]; - }; + desktopItems = [ + (makeDesktopItem { + name = "coqide"; + exec = "coqide"; + icon = "coq"; + desktopName = "CoqIDE"; + comment = "Graphical interface for the Coq proof assistant"; + categories = [ "Development" "Science" "Math" "IDE" "GTK" ]; + }) + ]; meta = with lib; { homepage = "https://coq.inria.fr"; diff --git a/pkgs/development/coq-modules/coqutil/default.nix b/pkgs/development/coq-modules/coqutil/default.nix new file mode 100644 index 000000000000..ceac4b17b4c6 --- /dev/null +++ b/pkgs/development/coq-modules/coqutil/default.nix @@ -0,0 +1,30 @@ +{ + coq, + findutils, + lib, + mkCoqDerivation, + version ? null, +}: + +mkCoqDerivation { + pname = "coqutil"; + owner = "mit-plv"; + + inherit version; + defaultVersion = with lib.versions; lib.switch coq.version [ + { case = range "8.18" "8.20"; out = "0.0.6"; } + { case = range "8.17" "8.20"; out = "0.0.5"; } + ] null; + + releaseRev = v: "v${v}"; + release."0.0.6".sha256 = "sha256-c/ddrj0ahuaj9Zu7YBqK7Q0ur+LK7Fgaa//nxQpQcm4="; + release."0.0.5".sha256 = "sha256-vkZIAAr82GNuCGlCVRgSCj/nqIdD8FITBiX1a8fybqw="; + + nativeBuildInputs = [ findutils ]; + + meta = { + description = "Coq library for tactics, basic definitions, sets, maps"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ stepbrobd ]; + }; +} diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index a39e8a99509c..a8e925e98f04 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -6,6 +6,7 @@ mkCoqDerivation rec { owner = "iris"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.19" "8.20"; out = "4.3.0"; } { case = range "8.18" "8.19"; out = "4.2.0"; } { case = range "8.16" "8.18"; out = "4.1.0"; } { case = range "8.13" "8.17"; out = "4.0.0"; } @@ -13,6 +14,7 @@ mkCoqDerivation rec { { case = range "8.11" "8.13"; out = "3.4.0"; } { case = range "8.9" "8.10"; out = "3.3.0"; } ] null; + release."4.3.0".sha256 = "sha256-3qhjiFI+A3I3fD8rFfJL5Hek77wScfn/FNNbDyGqA1k="; release."4.2.0".sha256 = "sha256-HuiHIe+5letgr1NN1biZZFq0qlWUbFmoVI7Q91+UIfM="; release."4.1.0".sha256 = "sha256-nTZUeZOXiH7HsfGbMKDE7vGrNVCkbMaWxdMWUcTUNlo="; release."4.0.0".sha256 = "sha256-Jc9TmgGvkiDaz9IOoExyeryU1E+Q37GN24NIM397/Gg="; diff --git a/pkgs/development/coq-modules/json/default.nix b/pkgs/development/coq-modules/json/default.nix index 6638c8b211db..f30c238aafd0 100644 --- a/pkgs/development/coq-modules/json/default.nix +++ b/pkgs/development/coq-modules/json/default.nix @@ -1,6 +1,6 @@ { lib, mkCoqDerivation, coq, parsec, MenhirLib, version ? null }: -mkCoqDerivation { +(mkCoqDerivation { pname = "json"; owner = "liyishuai"; repo = "coq-json"; @@ -8,19 +8,23 @@ mkCoqDerivation { defaultVersion = let inherit (lib.versions) range; in lib.switch coq.coq-version [ + { case = range "8.14" "8.20"; out = "0.2.0"; } { case = range "8.14" "8.20"; out = "0.1.3"; } ] null; release = { + "0.2.0".sha256 = "sha256-qDRTgWLUvu4x3/d3BDcqo2I4W5ZmLyRiwuY/Tm/FuKA="; "0.1.3".sha256 = "sha256-lElAzW4IuX+BB6ngDjlyKn0MytLRfbhQanB+Lct/WR0="; }; releaseRev = v: "v${v}"; propagatedBuildInputs = [ parsec MenhirLib coq.ocamlPackages.menhir ]; - buildFlags = [ "MENHIRFLAGS=--coq" "MENHIRFLAGS+=--coq-no-version-check" ]; + useDuneifVersion = v: lib.versions.isGe "0.2.0" v || v == "dev"; meta = { description = "From JSON to Coq, and vice versa."; license = lib.licenses.bsd3; }; -} +}).overrideAttrs (o: lib.optionalAttrs (o.version != null + && lib.versions.isLt "0.2.0" o.version) + { buildFlags = [ "MENHIRFLAGS=--coq" "MENHIRFLAGS+=--coq-no-version-check" ]; }) diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index afbd3bd8046b..58c51c150e37 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -9,6 +9,8 @@ let repo = "analysis"; owner = "math-comp"; + release."1.5.0".sha256 = "sha256-EWogrkr5TC5F9HjQJwO3bl4P8mij8U7thUGJNNI+k88="; + release."1.4.0".sha256 = "sha256-eDggeuEU0fMK7D5FbxvLkbAgpLw5lwL/Rl0eLXAnJeg="; release."1.2.0".sha256 = "sha256-w6BivDM4dF4Iv4rUTy++2feweNtMAJxgGExPfYGhXxo="; release."1.1.0".sha256 = "sha256-wl4kZf4mh9zbFfGcqaFEgWRyp0Bj511F505mYodpS6o="; release."1.0.0".sha256 = "sha256-KiXyaWB4zQ3NuXadq4BSWfoN1cIo1xiLVSN6nW03tC4="; @@ -32,6 +34,7 @@ let defaultVersion = let inherit (lib.versions) range; in lib.switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.19" "8.20") (range "2.1.0" "2.2.0") ]; out = "1.5.0"; } { cases = [ (range "8.17" "8.20") (range "2.0.0" "2.2.0") ]; out = "1.1.0"; } { cases = [ (range "8.17" "8.19") (range "1.17.0" "1.19.0") ]; out = "0.7.0"; } { cases = [ (range "8.17" "8.18") (range "1.15.0" "1.18.0") ]; out = "0.6.7"; } @@ -48,14 +51,27 @@ let ] null; # list of analysis packages sorted by dependency order - packages = [ "classical" "analysis" ]; + packages = { + "classical" = []; + "reals" = [ "classical" ]; + "experimental-reals" = [ "reals" ]; + "analysis" = [ "reals" ]; + "reals-stdlib" = [ "reals" ]; + "analysis-stdlib" = [ "analysis" "reals-stdlib" ]; + }; mathcomp_ = package: let classical-deps = [ mathcomp.algebra mathcomp-finmap ]; + experimental-reals-deps = [ mathcomp-bigenough ]; analysis-deps = [ mathcomp.field mathcomp-bigenough ]; - intra-deps = lib.optionals (package != "single") (map mathcomp_ (lib.head (lib.splitList (lib.pred.equal package) packages))); - pkgpath = if package == "single" then "." - else if package == "analysis" then "theories" else "${package}"; + intra-deps = lib.optionals (package != "single") (map mathcomp_ packages.${package}); + pkgpath = lib.switch package [ + { case = "single"; out = "."; } + { case = "analysis"; out = "theories"; } + { case = "experimental-reals"; out = "experimental_reals"; } + { case = "reals-stdlib"; out = "reals_stdlib"; } + { case = "analysis-stdlib"; out = "analysis_stdlib"; } + ] package; pname = if package == "single" then "mathcomp-analysis-single" else "mathcomp-${package}"; derivation = mkCoqDerivation ({ @@ -66,6 +82,7 @@ let propagatedBuildInputs = intra-deps ++ lib.optionals (lib.elem package [ "classical" "single" ]) classical-deps + ++ lib.optionals (lib.elem package [ "experimental-reals" "single" ]) experimental-reals-deps ++ lib.optionals (lib.elem package [ "analysis" "single" ]) analysis-deps; preBuild = '' @@ -78,7 +95,7 @@ let license = lib.licenses.cecill-c; }; - passthru = lib.genAttrs packages mathcomp_; + passthru = lib.mapAttrs (package: deps: mathcomp_ package) packages; }); # split packages didn't exist before 0.6, so bulding nothing in that case patched-derivation1 = derivation.overrideAttrs (o: @@ -91,7 +108,13 @@ let o.version != null && o.version != "dev" && lib.versions.isLt "0.6" o.version) { preBuild = ""; } ); - patched-derivation = patched-derivation2.overrideAttrs (o: + # only packages classical and analysis existed before 1.7, so bulding nothing in that case + patched-derivation3 = patched-derivation2.overrideAttrs (o: + lib.optionalAttrs (o.pname != null && o.pname != "mathcomp-classical" && o.pname != "mathcomp-analysis" && + o.version != null && o.version != "dev" && lib.versions.isLt "1.7" o.version) + { preBuild = ""; buildPhase = "echo doing nothing"; installPhase = "echo doing nothing"; } + ); + patched-derivation = patched-derivation3.overrideAttrs (o: lib.optionalAttrs (o.version != null && (o.version == "dev" || lib.versions.isGe "0.3.4" o.version)) { diff --git a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix index f4a2387ee8cc..ba42a24720c6 100644 --- a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix +++ b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix @@ -1,4 +1,4 @@ -{ coq, mkCoqDerivation, mathcomp-analysis, mathcomp-algebra-tactics, lib, version ? null }: +{ coq, mkCoqDerivation, mathcomp-analysis, mathcomp-algebra-tactics, interval, lib, version ? null }: (mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; @@ -7,11 +7,15 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp-analysis.version] [ + { cases = [ (range "8.18" "8.20") (isGe "1.5") ]; out = "0.7.3"; } + { cases = [ (range "8.18" "8.19") (isGe "1.2") ]; out = "0.7.2"; } { cases = [ (range "8.17" "8.19") (isGe "1.0") ]; out = "0.7.1"; } { cases = [ (isGe "8.17") (range "0.6.6" "0.7.0") ]; out = "0.6.1"; } { cases = [ (range "8.17" "8.18") (range "0.6.0" "0.6.7") ]; out = "0.5.2"; } { cases = [ (range "8.15" "8.16") (range "0.5.4" "0.6.5") ]; out = "0.5.1"; } ] null; + release."0.7.3".sha256 = "sha256-7+qPtE1KfDmo9ZsQtWMzoR2MYnFpTjFHK/yZYVm+GxA="; + release."0.7.2".sha256 = "sha256-dekrdVmuTcqXXmKhIb831EKtMhbPrXHJZhzmGb9rdRo="; release."0.7.1".sha256 = "sha256-/4Elb35SmscG6EjEcHYDo+AmWrpBUlygZL0WhaD+fcY="; release."0.6.1".sha256 = "sha256-tFB5lrwRPIlHkP+ebgcJwu03Cc9yVaOINOAo8Bf2LT4="; release."0.5.1".sha256 = "sha256-yBBl5l+V+dggsg5KM59Yo9CULKog/xxE8vrW+ZRnX7Y="; @@ -25,5 +29,7 @@ }; }).overrideAttrs (o: { propagatedBuildInputs = o.propagatedBuildInputs - ++ lib.optional (lib.versions.isGe "0.6.1" o.version || o.version == "dev") mathcomp-algebra-tactics; + ++ lib.optional (lib.versions.isGe "0.6.1" o.version || o.version == "dev") mathcomp-algebra-tactics + ++ lib.optional (lib.versions.isGe "0.7.2" o.version || o.version == "dev") interval + ; }) diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix index c79261aa174f..9452ac977b6f 100644 --- a/pkgs/development/coq-modules/metacoq/default.nix +++ b/pkgs/development/coq-modules/metacoq/default.nix @@ -38,15 +38,28 @@ let }; releaseRev = v: "v${v}"; - # list of core metacoq packages sorted by dependency order - 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" ]; + # list of core metacoq packages and their dependencies + packages = { + "utils" = []; + "common" = [ "utils" ]; + "template-coq" = [ "common" ]; + "pcuic" = if (lib.versionAtLeast coq.coq-version "8.17" || coq.coq-version == "dev") + then [ "common" ] + else [ "template-coq" ]; + "safechecker" = [ "pcuic" ]; + "template-pcuic" = [ "template-coq" "pcuic" ]; + "erasure" = [ "safechecker" "template-pcuic" ]; + "quotation" = [ "template-coq" "pcuic" "template-pcuic" ]; + "safechecker-plugin" = [ "template-pcuic" "safechecker" ]; + "erasure-plugin" = [ "template-pcuic" "erasure" ]; + "translations" = [ "template-coq" ]; + "all" = [ "safechecker-plugin" "erasure-plugin" "translations" "quotation" ]; + }; template-coq = metacoq_ "template-coq"; metacoq_ = package: let - metacoq-deps = lib.optionals (package != "single") (map metacoq_ (lib.head (lib.splitList (lib.pred.equal package) packages))); + metacoq-deps = lib.optionals (package != "single") (map metacoq_ packages.${package}); pkgpath = if package == "single" then "./" else "./${package}"; pname = if package == "all" then "metacoq" else "metacoq-${package}"; pkgallMake = '' @@ -81,7 +94,7 @@ let configurePhase = lib.optionalString (package == "all") pkgallMake + '' touch ${pkgpath}/metacoq-config - '' + lib.optionalString (lib.elem package ["safechecker" "erasure" "template-pcuic" "quotation" "safechecker-plugin" "erasure-plugin"]) '' + '' + lib.optionalString (lib.elem package ["erasure" "template-pcuic" "quotation" "safechecker-plugin" "erasure-plugin" "translations"]) '' echo "-I ${template-coq}/lib/coq/${coq.coq-version}/user-contrib/MetaCoq/Template/" > ${pkgpath}/metacoq-config '' + lib.optionalString (package == "single") '' ./configure.sh local @@ -97,7 +110,7 @@ let maintainers = with lib.maintainers; [ cohencyril ]; }; } // lib.optionalAttrs (package != "single") - { passthru = lib.genAttrs packages metacoq_; }) + { passthru = lib.mapAttrs (package: deps: metacoq_ package) packages; }) ).overrideAttrs (o: let requiresOcamlStdlibShims = lib.versionAtLeast o.version "1.0-8.16" || (o.version == "dev" && (lib.versionAtLeast coq.coq-version "8.16" || coq.coq-version == "dev")) ; @@ -105,6 +118,14 @@ let { propagatedBuildInputs = o.propagatedBuildInputs ++ lib.optional requiresOcamlStdlibShims coq.ocamlPackages.stdlib-shims; }); - in derivation; + # utils, common, template-pcuic, quotation, safechecker-plugin, and erasure-plugin + # packages didn't exist before 1.2, so bulding nothing in that case + patched-derivation = derivation.overrideAttrs (o: + lib.optionalAttrs (o.pname != null && + lib.elem package [ "utils" "common" "template-pcuic" "quotation" "safechecker-plugin" "erasure-plugin" ] && + o.version != null && o.version != "dev" && lib.versions.isLt "1.2" o.version) + { patchPhase = ""; configurePhase = ""; preBuild = ""; buildPhase = "echo doing nothing"; installPhase = "echo doing nothing"; } + ); + in patched-derivation; in metacoq_ (if single then "single" else "all") diff --git a/pkgs/development/coq-modules/parsec/default.nix b/pkgs/development/coq-modules/parsec/default.nix index 9b5d827eecd5..b66baa5358ce 100644 --- a/pkgs/development/coq-modules/parsec/default.nix +++ b/pkgs/development/coq-modules/parsec/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, ceres, coq-ext-lib, version ? null }: +{ lib, mkCoqDerivation, coq, ceres, ExtLib, version ? null }: mkCoqDerivation { @@ -6,19 +6,23 @@ mkCoqDerivation { repo = "coq-parsec"; owner = "liyishuai"; - propagatedBuildInputs = [ ceres coq-ext-lib ]; + propagatedBuildInputs = [ ceres ExtLib ]; releaseRev = (v: "v${v}"); inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ + { case = range "8.14" "8.20"; out = "0.2.0"; } { case = range "8.14" "8.20"; out = "0.1.2"; } { case = range "8.12" "8.16"; out = "0.1.1"; } { case = range "8.12" "8.13"; out = "0.1.0"; } ] null; + release."0.2.0".sha256 = "sha256-hM6LVFQ2VQ42QeHu8Ex+oz1VvJUr+g8/nZN+bYHEljQ="; release."0.1.2".sha256 = "sha256-QN0h1CsX86DQBDsluXLtNUvMh3r60/0iDSbYam67AhA="; release."0.1.1".sha256 = "sha256:1c0l18s68pzd4c8i3jimh2yz0pqm4g38pca4bm7fr18r8xmqf189"; release."0.1.0".sha256 = "sha256:01avfcqirz2b9wjzi9iywbhz9szybpnnj3672dgkfsimyg9jgnsr"; + useDuneifVersion = v: lib.versions.isGe "0.2.0" v || v == "dev"; + meta = with lib; { description = "Library for serialization to S-expressions"; license = licenses.bsd3; diff --git a/pkgs/development/coq-modules/relation-algebra/default.nix b/pkgs/development/coq-modules/relation-algebra/default.nix index bd9c78f78a76..35c26573a82d 100644 --- a/pkgs/development/coq-modules/relation-algebra/default.nix +++ b/pkgs/development/coq-modules/relation-algebra/default.nix @@ -5,10 +5,12 @@ mkCoqDerivation { owner = "damien-pous"; releaseRev = v: - if lib.versions.isGe "1.7.6" v + if lib.versions.range "1.7.6" "1.7.9" v then "v.${v}" else "v${v}"; + release."1.7.11".sha256 = "sha256-ZOV0lUdduSabW9Qsz70clkO7QK/NK2STaHqBWcXb7nI="; + release."1.7.10".sha256 = "sha256-h738L+dybhmWZwTSLJrhv+sB+cIbj0+62Zcy9BH5sVo="; release."1.7.9".sha256 = "sha256-1WzAZyj6q7s0u/9r7lahzxTl8612EA540l9wpm7TYEg="; release."1.7.8".sha256 = "sha256-RITFd3G5TjY+rFzW073Ao1AGU+u6OGQyQeGHVodAXnA="; release."1.7.7".sha256 = "sha256:1dff3id6nypl2alhk9rcifj3dab0j78dym05blc525lawsmc26l2"; @@ -21,6 +23,8 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = isEq "8.20"; out = "1.7.11"; } + { case = range "8.18" "8.19"; out = "1.7.10"; } { case = isEq "8.17"; out = "1.7.9"; } { case = isEq "8.16"; out = "1.7.8"; } { case = isEq "8.15"; out = "1.7.7"; } diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix index e3fa7036a866..1c96922b2efd 100644 --- a/pkgs/development/coq-modules/simple-io/default.nix +++ b/pkgs/development/coq-modules/simple-io/default.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, mkCoqDerivation, coq, coq-ext-lib, version ? null }: +{ lib, callPackage, mkCoqDerivation, coq, ExtLib, version ? null }: (mkCoqDerivation { pname = "simple-io"; @@ -16,7 +16,7 @@ release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax"; mlPlugin = true; nativeBuildInputs = [ coq.ocamlPackages.cppo ]; - propagatedBuildInputs = [ coq-ext-lib ] + propagatedBuildInputs = [ ExtLib ] ++ (with coq.ocamlPackages; [ ocaml findlib ocamlbuild ]); doCheck = true; diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 1215acaed5a1..509aac763b16 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -6,6 +6,7 @@ mkCoqDerivation rec { domain = "gitlab.mpi-sws.org"; owner = "iris"; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.19" "8.20"; out = "1.11.0"; } { case = range "8.18" "8.19"; out = "1.10.0"; } { case = range "8.16" "8.18"; out = "1.9.0"; } { case = range "8.13" "8.17"; out = "1.8.0"; } @@ -13,6 +14,7 @@ mkCoqDerivation rec { { case = range "8.11" "8.13"; out = "1.5.0"; } { case = range "8.8" "8.10"; out = "1.4.0"; } ] null; + release."1.11.0".sha256 = "sha256-yqnkaA5gUdZBJZ3JnvPYh11vKQRl0BAnior1yGowG7k="; release."1.10.0".sha256 = "sha256-bfynevIKxAltvt76lsqVxBmifFkzEhyX8lRgTKxr21I="; release."1.9.0".sha256 = "sha256-OXeB+XhdyzWMp5Karsz8obp0rTeMKrtG7fu/tmc9aeI="; release."1.8.0".sha256 = "sha256-VkIGBPHevHeHCo/Q759Q7y9WyhSF/4SMht4cOPuAXHU="; diff --git a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix index f5d1c250cfca..43d2bece88c9 100644 --- a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix +++ b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix @@ -36,6 +36,7 @@ let cuSPARSE, cuSOLVER, cuFFT, cuRAND, NPP and nvJPEG. ''; license = lib.licenses.bsd3; + platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ obsidian-systems-maintenance ] ++ lib.teams.cuda.members; }; }; diff --git a/pkgs/development/cuda-modules/cuda-samples/generic.nix b/pkgs/development/cuda-modules/cuda-samples/generic.nix index ed9c57f3d00c..97e05957d3ed 100644 --- a/pkgs/development/cuda-modules/cuda-samples/generic.nix +++ b/pkgs/development/cuda-modules/cuda-samples/generic.nix @@ -73,6 +73,7 @@ backendStdenv.mkDerivation (finalAttrs: { description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit"; # CUDA itself is proprietary, but these sample apps are not. license = lib.licenses.bsd3; + platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ obsidian-systems-maintenance ] ++ lib.teams.cuda.members; }; }) diff --git a/pkgs/development/cuda-modules/generic-builders/manifest.nix b/pkgs/development/cuda-modules/generic-builders/manifest.nix index eccc7c2d216f..26f4f1b972ae 100644 --- a/pkgs/development/cuda-modules/generic-builders/manifest.nix +++ b/pkgs/development/cuda-modules/generic-builders/manifest.nix @@ -215,7 +215,7 @@ backendStdenv.mkDerivation (finalAttrs: { # one that is compatible with the rest of nixpkgs, even when # nvcc forces us to use an older gcc # NB: We don't actually know if this is the right thing to do - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; # Picked up by autoPatchelf diff --git a/pkgs/development/cuda-modules/setup-hooks/setup-cuda-hook.sh b/pkgs/development/cuda-modules/setup-hooks/setup-cuda-hook.sh index 6e57c7b1072e..7799d72873a0 100644 --- a/pkgs/development/cuda-modules/setup-hooks/setup-cuda-hook.sh +++ b/pkgs/development/cuda-modules/setup-hooks/setup-cuda-hook.sh @@ -54,7 +54,8 @@ setupCUDAToolkit_ROOT() { fi done - export cmakeFlags+=" -DCUDAToolkit_INCLUDE_DIR=$CUDAToolkit_INCLUDE_DIR -DCUDAToolkit_ROOT=$CUDAToolkit_ROOT" + appendToVar cmakeFlags "-DCUDAToolkit_INCLUDE_DIR=$CUDAToolkit_INCLUDE_DIR" + appendToVar cmakeFlags "-DCUDAToolkit_ROOT=$CUDAToolkit_ROOT" } preConfigureHooks+=(setupCUDAToolkit_ROOT) @@ -72,8 +73,8 @@ setupCUDAToolkitCompilers() { # https://cmake.org/cmake/help/latest/envvar/CUDAHOSTCXX.html # https://cmake.org/cmake/help/latest/variable/CMAKE_CUDA_HOST_COMPILER.html - export cmakeFlags+=" -DCUDA_HOST_COMPILER=@ccFullPath@" - export cmakeFlags+=" -DCMAKE_CUDA_HOST_COMPILER=@ccFullPath@" + appendToVar cmakeFlags "-DCUDA_HOST_COMPILER=@ccFullPath@" + appendToVar cmakeFlags "-DCMAKE_CUDA_HOST_COMPILER=@ccFullPath@" # For non-CMake projects: # We prepend --compiler-bindir to nvcc flags. @@ -85,7 +86,7 @@ setupCUDAToolkitCompilers() { export CUDAHOSTCXX="@ccFullPath@"; fi - export NVCC_PREPEND_FLAGS+=" --compiler-bindir=@ccRoot@/bin" + appendToVar NVCC_PREPEND_FLAGS "--compiler-bindir=@ccRoot@/bin" # NOTE: We set -Xfatbin=-compress-all, which reduces the size of the compiled # binaries. If binaries grow over 2GB, they will fail to link. This is a problem for us, as @@ -94,7 +95,7 @@ setupCUDAToolkitCompilers() { # # @SomeoneSerge: original comment was made by @ConnorBaker in .../cudatoolkit/common.nix if [[ -z "${dontCompressFatbin-}" ]]; then - export NVCC_PREPEND_FLAGS+=" -Xfatbin=-compress-all" + appendToVar NVCC_PREPEND_FLAGS "-Xfatbin=-compress-all" fi } preConfigureHooks+=(setupCUDAToolkitCompilers) diff --git a/pkgs/development/cuda-modules/tensorrt/fixup.nix b/pkgs/development/cuda-modules/tensorrt/fixup.nix index 0d52c91320c4..aab6d8f32079 100644 --- a/pkgs/development/cuda-modules/tensorrt/fixup.nix +++ b/pkgs/development/cuda-modules/tensorrt/fixup.nix @@ -65,7 +65,7 @@ finalAttrs: prevAttrs: { # We need to look inside the extracted output to get the files we need. sourceRoot = "TensorRT-${finalAttrs.version}"; - buildInputs = prevAttrs.buildInputs ++ [ finalAttrs.passthru.cudnn.lib ]; + buildInputs = prevAttrs.buildInputs ++ [ (finalAttrs.passthru.cudnn.lib or null) ]; preInstall = (prevAttrs.preInstall or "") diff --git a/pkgs/development/cuda-modules/tensorrt/releases.nix b/pkgs/development/cuda-modules/tensorrt/releases.nix index 976f8fab115b..e8c75b6ccdee 100644 --- a/pkgs/development/cuda-modules/tensorrt/releases.nix +++ b/pkgs/development/cuda-modules/tensorrt/releases.nix @@ -137,7 +137,7 @@ version = "10.3.0.26"; minCudaVersion = "12.0"; maxCudaVersion = "12.5"; - cudnnVersion = "8.9"; + cudnnVersion = "9.3"; filename = "TensorRT-10.3.0.26.Linux.x86_64-gnu.cuda-12.5.tar.gz"; hash = "sha256-rf8c1avl2HATgGFyNR5Y/QJOW/D8YdSe9LhM047ZkIE="; } diff --git a/pkgs/development/cuda-modules/tests/opencv-and-torch/default.nix b/pkgs/development/cuda-modules/tests/opencv-and-torch/default.nix new file mode 100644 index 000000000000..442bfb8a2dd0 --- /dev/null +++ b/pkgs/development/cuda-modules/tests/opencv-and-torch/default.nix @@ -0,0 +1,81 @@ +{ + cudaPackages, + lib, + writeGpuTestPython, + # Configuration flags + openCVFirst, + useOpenCVDefaultCuda, + useTorchDefaultCuda, +}: +let + inherit (lib.strings) optionalString; + + openCVBlock = '' + + import cv2 + print("OpenCV version:", cv2.__version__) + + # Ensure OpenCV can access the GPU. + assert cv2.cuda.getCudaEnabledDeviceCount() > 0, "No CUDA devices found for OpenCV" + print("OpenCV CUDA device:", cv2.cuda.printCudaDeviceInfo(cv2.cuda.getDevice())) + + # Ensure OpenCV can access the GPU. + print(cv2.getBuildInformation()) + + a = cv2.cuda.GpuMat(size=(256, 256), type=cv2.CV_32S, s=1) + b = cv2.cuda.GpuMat(size=(256, 256), type=cv2.CV_32S, s=1) + c = int(cv2.cuda.sum(cv2.cuda.add(a, b))[0]) # OpenCV returns a Scalar float object. + + assert c == 2 * 256 * 256, f"Expected {2 * 256 * 256} OpenCV, got {c}" + + ''; + + torchBlock = '' + + import torch + print("Torch version:", torch.__version__) + + # Set up the GPU. + torch.cuda.init() + # Ensure the GPU is available. + assert torch.cuda.is_available(), "CUDA is not available to Torch" + print("Torch CUDA device:", torch.cuda.get_device_properties(torch.cuda.current_device())) + + a = torch.ones(256, 256, dtype=torch.int32).cuda() + b = torch.ones(256, 256, dtype=torch.int32).cuda() + c = (a + b).sum().item() + assert c == 2 * 256 * 256, f"Expected {2 * 256 * 256} for Torch, got {c}" + + ''; + + content = if openCVFirst then openCVBlock + torchBlock else torchBlock + openCVBlock; + + torchName = "torch" + optionalString useTorchDefaultCuda "-with-default-cuda"; + openCVName = "opencv4" + optionalString useOpenCVDefaultCuda "-with-default-cuda"; +in +# TODO: Ensure the expected CUDA libraries are loaded. +# TODO: Ensure GPU access works as expected. +writeGpuTestPython { + name = if openCVFirst then "${openCVName}-then-${torchName}" else "${torchName}-then-${openCVName}"; + libraries = + # NOTE: These are purposefully in this order. + pythonPackages: + let + effectiveOpenCV = pythonPackages.opencv4.override (prevAttrs: { + cudaPackages = if useOpenCVDefaultCuda then prevAttrs.cudaPackages else cudaPackages; + }); + effectiveTorch = pythonPackages.torchWithCuda.override (prevAttrs: { + cudaPackages = if useTorchDefaultCuda then prevAttrs.cudaPackages else cudaPackages; + }); + in + if openCVFirst then + [ + effectiveOpenCV + effectiveTorch + ] + else + [ + effectiveTorch + effectiveOpenCV + ]; +} content diff --git a/pkgs/development/embedded/arduino/arduino-ci/default.nix b/pkgs/development/embedded/arduino/arduino-ci/default.nix deleted file mode 100644 index b711f814fd78..000000000000 --- a/pkgs/development/embedded/arduino/arduino-ci/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, arduino-cli, ruby, python3 }: - -let - - runtimePath = lib.makeBinPath [ - arduino-cli - python3 # required by the esp8266 core - ]; - -in -stdenv.mkDerivation rec { - pname = "arduino-ci"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "pololu"; - repo = "arduino-ci"; - rev = "v${version}"; - sha256 = "sha256-9RbBxgwsSQ7oGGKr1Vsn9Ug9AsacoRgvQgd9jbRQ034="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - install $src/ci.rb $out/bin/arduino-ci - - runHook postInstall - ''; - - fixupPhase = '' - substituteInPlace $out/bin/arduino-ci --replace "/usr/bin/env nix-shell" "${ruby}/bin/ruby" - wrapProgram $out/bin/arduino-ci --prefix PATH ":" "${runtimePath}" - ''; - - meta = with lib; { - description = "CI for Arduino Libraries"; - mainProgram = "arduino-ci"; - homepage = src.meta.homepage; - license = licenses.mit; - maintainers = with maintainers; [ ryantm ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/embedded/arduino/arduino-language-server/default.nix b/pkgs/development/embedded/arduino/arduino-language-server/default.nix deleted file mode 100644 index 6c0a2885b433..000000000000 --- a/pkgs/development/embedded/arduino/arduino-language-server/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "arduino-language-server"; - version = "0.7.6"; - - src = fetchFromGitHub { - owner = "arduino"; - repo = "arduino-language-server"; - rev = "refs/tags/${version}"; - hash = "sha256-PmPGhbB1HqxZRK+f28SdZNh4HhE0oseYsdJuEAAk90I="; - }; - - subPackages = [ "." ]; - - vendorHash = "sha256-tS6OmH757VDdViPHJAJAftQu+Y1YozE7gXkt5anDlT0="; - - doCheck = false; - - ldflags = [ - "-s" - "-w" - "-X github.com/arduino/arduino-language-server/version.versionString=${version}" - "-X github.com/arduino/arduino-language-server/version.commit=unknown" - ] ++ lib.optionals stdenv.isLinux [ - "-extldflags '-static'" - ]; - - meta = with lib; { - description = "Arduino Language Server based on Clangd to Arduino code autocompletion"; - mainProgram = "arduino-language-server"; - homepage = "https://github.com/arduino/arduino-language-server"; - changelog = "https://github.com/arduino/arduino-language-server/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ BattleCh1cken ]; - }; -} diff --git a/pkgs/development/embedded/arduino/arduino-mk/default.nix b/pkgs/development/embedded/arduino/arduino-mk/default.nix deleted file mode 100644 index d5f506038ca6..000000000000 --- a/pkgs/development/embedded/arduino/arduino-mk/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages, installShellFiles }: - -stdenv.mkDerivation rec { - version = "1.6.0"; - pname = "arduino-mk"; - - src = fetchFromGitHub { - owner = "sudar"; - repo = "Arduino-Makefile"; - rev = version; - sha256 = "0flpl97d2231gp51n3y4qvf3y1l8xzafi1sgpwc305vwc2h4dl2x"; - }; - - nativeBuildInputs = [ python3Packages.wrapPython installShellFiles ]; - propagatedBuildInputs = with python3Packages; [ pyserial ]; - installPhase = '' - mkdir $out - cp -rT $src $out - installManPage *.1 - ''; - postFixupPhase = '' - wrapPythonPrograms - ''; - - meta = with lib; { - description = "Makefile for Arduino sketches"; - homepage = "https://github.com/sudar/Arduino-Makefile"; - license = licenses.lgpl21; - maintainers = [ maintainers.eyjhb ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/embedded/arduino/arduinoOTA/default.nix b/pkgs/development/embedded/arduino/arduinoOTA/default.nix deleted file mode 100644 index 0ae263ec6e9c..000000000000 --- a/pkgs/development/embedded/arduino/arduinoOTA/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, nix-update-script -}: -buildGoModule rec { - pname = "arduinoOTA"; - version = "1.4.1"; - - src = fetchFromGitHub { - owner = "arduino"; - repo = pname; - rev = version; - hash = "sha256-HaNMkeV/PDEotYp8+rUKFaBxGbZO8qA99Yp2sa6glz8="; - }; - - vendorHash = null; - - postPatch = '' - substituteInPlace version/version.go \ - --replace 'versionString = ""' 'versionString = "${version}"' - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - homepage = "https://github.com/arduino/arduinoOTA"; - description = "Tool for uploading programs to Arduino boards over a network"; - mainProgram = "arduinoOTA"; - license = licenses.gpl3; - maintainers = with maintainers; [ poelzi ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix deleted file mode 100644 index 29edb66f9f5f..000000000000 --- a/pkgs/development/embedded/avrdude/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, callPackage, stdenv, fetchFromGitHub, cmake, bison, flex, pkg-config, libusb1, elfutils -, libftdi1, readline, hidapi, libserialport, libusb-compat-0_1 -# Documentation building doesn't work on Darwin. It fails with: -# Undefined subroutine &Locale::Messages::dgettext called in ... texi2html -# -# https://github.com/NixOS/nixpkgs/issues/224761 -, docSupport ? (!stdenv.hostPlatform.isDarwin), texliveMedium, texinfo, texi2html, unixtools }: - -let - useElfutils = lib.meta.availableOn stdenv.hostPlatform elfutils; -in - -stdenv.mkDerivation (finalAttrs: { - pname = "avrdude"; - version = "8.0"; - - src = fetchFromGitHub { - owner = "avrdudes"; - repo = "avrdude"; - rev = "v${finalAttrs.version}"; - sha256 = "w58HVCvKuWpGJwllupbj7ndeq4iE9LPs/IjFSUN0DOU="; - }; - - nativeBuildInputs = [ cmake bison flex pkg-config ] ++ lib.optionals docSupport [ - unixtools.more - texliveMedium - texinfo - texi2html - ]; - - buildInputs = [ - (if useElfutils then elfutils else finalAttrs.finalPackage.passthru.libelf) - hidapi - libusb1 - libftdi1 - libserialport - readline - libusb-compat-0_1 - ]; - - postPatch = lib.optionalString (!useElfutils) '' - # vendored libelf is a static library - sed -i "s/PREFERRED_LIBELF elf/PREFERRED_LIBELF libelf.a elf/" CMakeLists.txt - ''; - - # Not used: - # -DHAVE_LINUXGPIO=ON because it's incompatible with libgpiod 2.x - cmakeFlags = lib.optionals docSupport [ "-DBUILD_DOC=ON" ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DHAVE_LINUXSPI=ON" "-DHAVE_PARPORT=ON" ]; - - passthru = { - # Vendored and mutated copy of libelf for avrdudes use. - # Produces a static library only. - libelf = callPackage ./libelf.nix { }; - }; - - meta = with lib; { - description = "Command-line tool for programming Atmel AVR microcontrollers"; - mainProgram = "avrdude"; - longDescription = '' - AVRDUDE (AVR Downloader/UploaDEr) is an utility to - download/upload/manipulate the ROM and EEPROM contents of AVR - microcontrollers using the in-system programming technique (ISP). - ''; - homepage = "https://www.nongnu.org/avrdude/"; - license = licenses.gpl2Plus; - platforms = with platforms; linux ++ darwin; - maintainers = [ maintainers.bjornfor ]; - }; -}) diff --git a/pkgs/development/embedded/avrdude/libelf.nix b/pkgs/development/embedded/avrdude/libelf.nix deleted file mode 100644 index bd7b7be7066a..000000000000 --- a/pkgs/development/embedded/avrdude/libelf.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - stdenv, - cmake, - fetchFromGitHub, -}: - -stdenv.mkDerivation { - pname = "libelf"; - version = "0.8.13-unstable-2023-01-14"; - - src = fetchFromGitHub { - owner = "avrdudes"; - repo = "libelf"; - rev = "0c55bfe1d3020a20bddf6ce57c0d9d98ccb12586"; - hash = "sha256-jz7Ef0Eg673IJVZvVNklY40s13LCuMVAc7FGrRI7scQ="; - }; - - nativeBuildInputs = [ cmake ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/lib - cp liblibelf.a $out/lib/libelf.a - cp -r $src/include $out/include - runHook postInstall - ''; - - meta = { - description = "ELF object file access library (vendored by avrdudes)"; - homepage = "https://github.com/avrdudes/libelf"; - license = lib.licenses.lgpl2Plus; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.bjornfor ]; - }; -} diff --git a/pkgs/development/embedded/blackmagic/default.nix b/pkgs/development/embedded/blackmagic/default.nix deleted file mode 100644 index bb09ade35f2f..000000000000 --- a/pkgs/development/embedded/blackmagic/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv, lib -, fetchFromGitHub -, gcc-arm-embedded -, pkg-config -, python3 -, hidapi -, libftdi1 -, libusb1 -}: - -stdenv.mkDerivation rec { - pname = "blackmagic"; - version = "1.8.2"; - # `git describe --always` - firmwareVersion = "v${version}"; - - src = fetchFromGitHub { - owner = "blacksphere"; - repo = "blackmagic"; - rev = firmwareVersion; - hash = "sha256-NGzoohmpVwGOncr9AvHYANMf/oEskjmTXYj/Kdx2RwM="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - gcc-arm-embedded - pkg-config - python3 - ]; - - buildInputs = [ - hidapi - libftdi1 - libusb1 - ]; - - strictDeps = true; - - postPatch = '' - # Prevent calling out to `git' to generate a version number: - substituteInPlace src/Makefile \ - --replace '$(shell git describe --always --dirty)' '${firmwareVersion}' - - # Fix scripts that generate headers: - for f in $(find scripts libopencm3/scripts -type f); do - patchShebangs "$f" - done - ''; - - buildPhase = '' - runHook preBuild - ${stdenv.shell} ${./helper.sh} - runHook postBuild - ''; - - dontInstall = true; - - enableParallelBuilding = true; - - meta = with lib; { - description = "In-application debugger for ARM Cortex microcontrollers"; - mainProgram = "blackmagic"; - longDescription = '' - The Black Magic Probe is a modern, in-application debugging tool - for embedded microprocessors. It allows you to see what is going - on "inside" an application running on an embedded microprocessor - while it executes. - - This package builds the firmware for all supported platforms, - placing them in separate directories under the firmware - directory. It also places the FTDI version of the blackmagic - executable in the bin directory. - ''; - homepage = "https://github.com/blacksphere/blackmagic"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ pjones sorki ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/embedded/blackmagic/helper.sh b/pkgs/development/embedded/blackmagic/helper.sh deleted file mode 100755 index 77f84ef890d4..000000000000 --- a/pkgs/development/embedded/blackmagic/helper.sh +++ /dev/null @@ -1,51 +0,0 @@ -################################################################################ -# Build all of the platforms manually since the `all_platforms' target -# doesn't preserve all of the build outputs and overrides CFLAGS. -set -e -set -u - -################################################################################ -# Prevent a warning from shellcheck: -out=${out:-/tmp} - -################################################################################ -export MAKEFLAGS="\ - ${enableParallelBuilding:+-j${NIX_BUILD_CORES}}" - -################################################################################ -PRODUCTS="blackmagic.bin blackmagic.hex blackmagic_dfu.bin blackmagic_dfu.hex" - -################################################################################ -make_platform() { - echo "Building for hardware platform $1" - - make clean - make PROBE_HOST="$1" - - if [ "$1" = "hosted" ]; then - install -m 0555 blackmagic "$out/bin" - fi - - for f in $PRODUCTS; do - if [ -r "$f" ]; then - mkdir -p "$out/firmware/$1" - install -m 0444 "$f" "$out/firmware/$1" - fi - done - -} - -################################################################################ -# Start by building libopencm3: -make -C libopencm3 - -################################################################################ -# And now all of the platforms: -cd src - -mkdir -p "$out/bin" - -for platform in platforms/*/Makefile.inc; do - probe=$(basename "$(dirname "$platform")") - make_platform "$probe" -done diff --git a/pkgs/development/embedded/blisp/default.nix b/pkgs/development/embedded/blisp/default.nix index ba1f42a90b0d..b6add8db9b8a 100644 --- a/pkgs/development/embedded/blisp/default.nix +++ b/pkgs/development/embedded/blisp/default.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ argtable libserialport - ] ++ lib.optional stdenv.isDarwin IOKit; + ] ++ lib.optional stdenv.hostPlatform.isDarwin IOKit; cmakeFlags = [ "-DBLISP_BUILD_CLI=ON" "-DBLISP_USE_SYSTEM_LIBRARIES=ON" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=implicit-function-declaration"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-error=implicit-function-declaration"; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/development/embedded/bossa/default.nix b/pkgs/development/embedded/bossa/default.nix index 3f55ccdd2e8b..f50b91ddbb09 100644 --- a/pkgs/development/embedded/bossa/default.nix +++ b/pkgs/development/embedded/bossa/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { wxGTK32 libX11 readline - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/pkgs/development/embedded/cc-tool/default.nix b/pkgs/development/embedded/cc-tool/default.nix deleted file mode 100644 index 5d8e671b6fcd..000000000000 --- a/pkgs/development/embedded/cc-tool/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, autoreconfHook -, boost -, libusb1 -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "cc-tool"; - version = "unstable-2020-05-19"; - - src = fetchFromGitHub { - owner = "dashesy"; - repo = pname; - rev = "19e707eafaaddee8b996ad27a9f3e1aafcb900d2"; - hash = "sha256:1f78j498fdd36xbci57jkgh25gq14g3b6xmp76imdpar0jkpyljv"; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ boost libusb1 ]; - - postPatch = '' - substituteInPlace udev/90-cc-debugger.rules \ - --replace 'MODE="0666"' 'MODE="0660", GROUP="plugdev", TAG+="uaccess"' - ''; - - postInstall = '' - install -D udev/90-cc-debugger.rules $out/lib/udev/rules.d/90-cc-debugger.rules - ''; - - meta = with lib; { - description = "Command line tool for the Texas Instruments CC Debugger"; - mainProgram = "cc-tool"; - longDescription = '' - cc-tool provides support for Texas Instruments CC Debugger - ''; - homepage = "https://github.com/dashesy/cc-tool"; - license = licenses.gpl2; - platforms = with platforms; linux ++ darwin; - maintainers = [ maintainers.CRTified ]; - }; -} diff --git a/pkgs/development/embedded/easypdkprog/default.nix b/pkgs/development/embedded/easypdkprog/default.nix deleted file mode 100644 index 28f06db9f35d..000000000000 --- a/pkgs/development/embedded/easypdkprog/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, lib, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "easypdkprog"; - version = "1.3"; - - src = fetchFromGitHub { - owner = "free-pdk"; - repo = "easy-pdk-programmer-software"; - rev = version; - sha256 = "0hc3gdmn6l01z63hzzwdhbdyy288gh5v219bsfm8fb1498vpnd6f"; - }; - - installPhase = '' - install -Dm755 -t $out/bin easypdkprog - '' + lib.optionalString stdenv.isLinux '' - install -Dm644 -t $out/etc/udev/rules.d Linux_udevrules/70-stm32vcp.rules - ''; - - meta = with lib; { - description = "Read, write and execute programs on PADAUK microcontroller"; - mainProgram = "easypdkprog"; - homepage = "https://github.com/free-pdk/easy-pdk-programmer-software"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ david-sawatzke ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/embedded/edl/default.nix b/pkgs/development/embedded/edl/default.nix deleted file mode 100644 index 570fda02d8e5..000000000000 --- a/pkgs/development/embedded/edl/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - python3Packages, - unstableGitUpdater, -}: - -python3Packages.buildPythonPackage { - pname = "edl"; - version = "3.52.1-unstable-2024-08-27"; - - src = fetchFromGitHub { - owner = "bkerler"; - repo = "edl"; - rev = "d2c585e4ccc066895b71ca9014c1ebb5af316e07"; - fetchSubmodules = true; - hash = "sha256-hQturda+iDmH5DVP1CjG526wcggdzTSrW2jqrEzLXtY="; - }; - - propagatedBuildInputs = with python3Packages; [ - pyusb - pyserial - docopt - pylzma - pycryptodome - lxml - colorama - 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 - ''; - - passthru.updateScript = unstableGitUpdater { }; - - meta = with lib; { - homepage = "https://github.com/bkerler/edl"; - description = "Qualcomm EDL tool (Sahara / Firehose / Diag)"; - license = licenses.mit; - maintainers = with maintainers; [ - lorenz - xddxdd - ]; - # Case-sensitive files in 'Loader' submodule - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/development/embedded/elf2uf2-rs/default.nix b/pkgs/development/embedded/elf2uf2-rs/default.nix index b3091df1e3f6..239ffbbeb96b 100644 --- a/pkgs/development/embedded/elf2uf2-rs/default.nix +++ b/pkgs/development/embedded/elf2uf2-rs/default.nix @@ -13,8 +13,8 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = lib.optional stdenv.isLinux udev - ++ lib.optionals stdenv.isDarwin [ + buildInputs = lib.optional stdenv.hostPlatform.isLinux udev + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation DiskArbitration Foundation diff --git a/pkgs/development/embedded/fpga/ecpdap/default.nix b/pkgs/development/embedded/fpga/ecpdap/default.nix index ef1ba75c45b1..1dfc54e9c3c6 100644 --- a/pkgs/development/embedded/fpga/ecpdap/default.nix +++ b/pkgs/development/embedded/fpga/ecpdap/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ] - ++ lib.optional stdenv.isDarwin AppKit; + ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; postInstall = '' mkdir -p $out/etc/udev/rules.d @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/adamgreig/ecpdap"; license = licenses.asl20; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; }; } diff --git a/pkgs/development/embedded/fpga/fujprog/default.nix b/pkgs/development/embedded/fpga/fujprog/default.nix index 69c23f2a71cd..bdac1033053a 100644 --- a/pkgs/development/embedded/fpga/fujprog/default.nix +++ b/pkgs/development/embedded/fpga/fujprog/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ libftdi1 libusb-compat-0_1 - ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; meta = with lib; { description = "JTAG programmer for the ULX3S and ULX2S open hardware FPGA development boards"; diff --git a/pkgs/development/embedded/fpga/icestorm/default.nix b/pkgs/development/embedded/fpga/icestorm/default.nix deleted file mode 100644 index f6f7e46db56c..000000000000 --- a/pkgs/development/embedded/fpga/icestorm/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, pkg-config, libftdi1 -, python3, pypy3 - -# PyPy yields large improvements in build time and runtime performance, and -# IceStorm isn't intended to be used as a library other than by the nextpnr -# build process (which is also sped up by using PyPy), so we use it by default. -# See 18839e1 for more details. -# -# FIXME(aseipp, 3/1/2021): pypy seems a bit busted since stdenv upgrade to gcc -# 10/binutils 2.34, so short-circuit this for now in passthru below (done so -# that downstream overrides can't re-enable pypy and break their build somehow) -, usePyPy ? stdenv.hostPlatform.system == "x86_64-linux" -}: - -stdenv.mkDerivation rec { - pname = "icestorm"; - version = "2020.12.04"; - - passthru = rec { - pythonPkg = if (false && usePyPy) then pypy3 else python3; - pythonInterp = pythonPkg.interpreter; - }; - - src = fetchFromGitHub { - owner = "YosysHQ"; - repo = "icestorm"; - rev = "7afc64b480212c9ac2ce7cb1622731a69a7d212c"; - sha256 = "0vxhqs2fampglg3xlfwb35229iv96kvlwp1gyxrdrmlpznhkqdrk"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ passthru.pythonPkg libftdi1 ]; - makeFlags = [ "PREFIX=$(out)" ]; - - enableParallelBuilding = true; - - # fix icebox_vlog chipdb path. icestorm issue: - # https://github.com/cliffordwolf/icestorm/issues/125 - # - # also, fix up the path to the chosen Python interpreter. for pypy-compatible - # platforms, it offers significant performance improvements. - patchPhase = '' - substituteInPlace ./icebox/icebox_vlog.py \ - --replace /usr/local/share "$out/share" - - for x in icefuzz/Makefile icebox/Makefile icetime/Makefile; do - substituteInPlace "$x" --replace python3 "${passthru.pythonInterp}" - done - - for x in $(find . -type f -iname '*.py'); do - substituteInPlace "$x" \ - --replace '/usr/bin/env python3' '${passthru.pythonInterp}' - done - ''; - - meta = { - description = "Documentation and tools for Lattice iCE40 FPGAs"; - longDescription = '' - Project IceStorm aims at reverse engineering and - documenting the bitstream format of Lattice iCE40 - FPGAs and providing simple tools for analyzing and - creating bitstream files. - ''; - homepage = "https://github.com/YosysHQ/icestorm/"; - license = lib.licenses.isc; - maintainers = with lib.maintainers; [ shell thoughtpolice ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/embedded/fpga/lattice-diamond/default.nix b/pkgs/development/embedded/fpga/lattice-diamond/default.nix deleted file mode 100644 index f80261720cf6..000000000000 --- a/pkgs/development/embedded/fpga/lattice-diamond/default.nix +++ /dev/null @@ -1,120 +0,0 @@ -{ lib, stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, - freetype, fontconfig, xorg, libusb-compat-0_1, coreutils }: - -stdenv.mkDerivation { - pname = "diamond"; - version = "3.10"; - - nativeBuildInputs = [ rpmextract patchelf makeWrapper file ]; - - src = requireFile { - name = "diamond_3_10-base_x64-111-2-x86_64-linux.rpm"; - url = "http://www.latticesemi.com/view_document?document_id=52180"; - sha256 = "ec0b370cf8bd55831eeed7c5eadcabacbd6e63ac657c20209d672119a07a5c0f"; - }; - - buildCommand = '' - origprefix=usr/local/diamond/3.10_x64 - prefix=diamond - - echo "Unpacking $src..." - rpmextract $src - - # Move $pwd/usr/local/diamond/VERS to $out/diamond, cd. - mkdir -p $out/$prefix - rmdir $out/$prefix - mv $origprefix $out/$prefix - - cd $out - - # Extract all tarballs. - for tb in \ - cae_library/cae_library.tar.gz \ - embedded_source/embedded_source.tar.gz \ - ispfpga/ispfpga.tar.gz \ - synpbase/synpbase.tar.gz \ - tcltk/tcltk.tar.gz \ - bin/bin.tar.gz \ - examples/examples.tar.gz \ - data/data.tar.gz ; do - - echo "Extracting tarball $prefix/$tb" - cd $out/$prefix/$(dirname $tb) - tar xf $(basename $tb) - rm $(basename $tb) - done - - # Patch shebangs in start scripts . - cd $out/$prefix/bin/lin64 - for tool in \ - programmer \ - pgrcmd \ - diamond_env \ - powercal \ - model300 \ - update \ - diamond \ - debugger \ - ddtcmd \ - cableserver \ - revealrva \ - ipexpress \ - fileutility \ - diamond ; do - - echo "Patching script $prefix/bin/lin64/$tool..." - patchShebangs $tool - done - - # Patch executable ELFs. - for path in bin/lin64 ispfpga/bin/lin64 synpbase/linux_a_64 synpbase/linux_a_64/mbin; do - cd $out/$prefix/$path - for f in *; do - if ! file $f | grep -q "ELF 64-bit LSB executable" ; then - continue - fi - echo "Patching ELF $prefix/$path/$f..." - # We force RPATH otherwise libraries from LD_LIBRARY_PATH (which the - # tools mangle by themselves) will not be able to find their - # dependencies from nix. - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$libPath:$out/$prefix/bin/lin64:$out/$prefix/ispfpga/bin/lin64" \ - --force-rpath \ - $f - done - done - - # Patch absolute /usr/bin/id path in script - sed -i -e "s#/usr/bin/id#${coreutils}/bin/id#" $out/$prefix/synpbase/bin/config/platform_set - - # Remove 32-bit libz. - rm $out/$prefix/bin/lin64/libz.{so,so.1} - - # Make wrappers. The purpose of these is just to call the target program - # using its absolute path - otherwise, it will crash. - mkdir -p bin - for tool in diamond pnmainc ddtcmd ; do - makeWrapper $out/$prefix/bin/lin64/$tool $out/bin/$tool - done - ''; - - libPath = lib.makeLibraryPath [ - glib zlib freetype fontconfig - xorg.libSM xorg.libICE xorg.libXrender xorg.libXext xorg.libX11 xorg.libXt - libusb-compat-0_1 - ]; - - meta = { - description = "Vendor development tools for Lattice FPGA devices"; - longDescription = '' - Lattice Diamond software is the leading-edge software design environment - for cost- sensitive, low-power Lattice FPGA architectures. It is the - next-generation replacement for ispLEVER. - ''; - homepage = "https://www.latticesemi.com/latticediamond"; - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ q3k ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/embedded/fpga/openfpgaloader/default.nix b/pkgs/development/embedded/fpga/openfpgaloader/default.nix deleted file mode 100644 index 2a84bfdc8c9a..000000000000 --- a/pkgs/development/embedded/fpga/openfpgaloader/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - cmake -, fetchFromGitHub -, hidapi -, lib -, libftdi1 -, libusb1 -, pkg-config -, stdenv -, udev -, zlib -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "openfpgaloader"; - version = "0.12.1"; - - src = fetchFromGitHub { - owner = "trabucayre"; - repo = "openFPGALoader"; - rev = "v${finalAttrs.version}"; - hash = "sha256-iJSTiOcW15q3mWmMhe5wmO11cu2xfAI9zCsoB33ujWQ="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - hidapi - libftdi1 - libusb1 - zlib - ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform udev) [ - udev - ]; - - meta = { - description = "Universal utility for programming FPGAs"; - mainProgram = "openFPGALoader"; - homepage = "https://github.com/trabucayre/openFPGALoader"; - license = lib.licenses.agpl3Only; - maintainers = [ ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/development/embedded/fpga/tinyprog/default.nix b/pkgs/development/embedded/fpga/tinyprog/default.nix deleted file mode 100644 index 0e962d2f2a2b..000000000000 --- a/pkgs/development/embedded/fpga/tinyprog/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, python3Packages -, fetchFromGitHub -}: - -with python3Packages; buildPythonApplication rec { - pname = "tinyprog"; - # `python setup.py --version` from repo checkout - version = "1.0.24.dev114+g${lib.substring 0 7 src.rev}"; - - src = fetchFromGitHub { - owner = "tinyfpga"; - repo = "TinyFPGA-Bootloader"; - rev = "97f6353540bf7c0d27f5612f202b48f41da75299"; - sha256 = "0zbrvvb957z2lwbfd39ixqdsnd2w4wfjirwkqdrqm27bjz308731"; - }; - - sourceRoot = "${src.name}/programmer"; - - propagatedBuildInputs = [ - pyserial - jsonmerge - intelhex - tqdm - six - packaging - setuptools - pyusb - ]; - - nativeBuildInputs = [ setuptools-scm ]; - - meta = with lib; { - homepage = "https://github.com/tinyfpga/TinyFPGA-Bootloader/tree/master/programmer"; - description = "Programmer for FPGA boards using the TinyFPGA USB Bootloader"; - mainProgram = "tinyprog"; - maintainers = [ ]; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/embedded/fpga/trellis/default.nix b/pkgs/development/embedded/fpga/trellis/default.nix deleted file mode 100644 index b652f57fa81a..000000000000 --- a/pkgs/development/embedded/fpga/trellis/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python3, boost, cmake }: - -let - rev = "488f4e71073062de314c55a037ede7cf03a3324c"; - # git describe --tags - realVersion = "1.2.1-14-g${builtins.substring 0 7 rev}"; - - main_src = fetchFromGitHub { - owner = "YosysHQ"; - repo = "prjtrellis"; - inherit rev; - hash = "sha256-Blbu+0rlM/3izbF0XCvkNpSAND0IclWEwK7anzyrpvw="; - name = "trellis"; - }; - - database_src = fetchFromGitHub { - owner = "YosysHQ"; - repo = "prjtrellis-db"; - rev = "35d900a94ff0db152679a67bf6e4fbf40ebc34aa"; - hash = "sha256-r6viR8y9ZjURGNbsa0/YY8lzy9kGzjuu408ntxwpqm0="; - name = "trellis-database"; - }; - -in stdenv.mkDerivation rec { - pname = "trellis"; - version = "unstable-2022-09-14"; - - srcs = [ main_src database_src ]; - sourceRoot = main_src.name; - - buildInputs = [ boost ]; - nativeBuildInputs = [ cmake python3 ]; - cmakeFlags = [ - "-DCURRENT_GIT_VERSION=${realVersion}" - # TODO: should this be in stdenv instead? - "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share" - ]; - - preConfigure = '' - rmdir database && ln -sfv ${database_src} ./database - - cd libtrellis - ''; - - postInstall = lib.optionalString stdenv.isDarwin '' - for f in $out/bin/* ; do - install_name_tool -change "$out/lib/libtrellis.dylib" "$out/lib/trellis/libtrellis.dylib" "$f" - done - ''; - - doInstallCheck = true; - - installCheckPhase = '' - $out/bin/ecppack $out/share/trellis/misc/basecfgs/empty_lfe5u-85f.config /tmp/test.bin - ''; - - meta = with lib; { - description = "Documentation and bitstream tools for Lattice ECP5 FPGAs"; - longDescription = '' - Project Trellis documents the Lattice ECP5 architecture - to enable development of open-source tools. Its goal is - to provide sufficient information to develop a free and - open Verilog to bitstream toolchain for these devices. - ''; - homepage = "https://github.com/YosysHQ/prjtrellis"; - license = licenses.isc; - maintainers = with maintainers; [ q3k thoughtpolice rowanG077 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/embedded/gputils/default.nix b/pkgs/development/embedded/gputils/default.nix deleted file mode 100644 index 8050368e0a95..000000000000 --- a/pkgs/development/embedded/gputils/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "gputils"; - version = "1.5.2"; - - src = fetchurl { - url = "mirror://sourceforge/gputils/${pname}-${version}.tar.bz2"; - sha256 = "sha256-j7iCCzHXwffHdhQcyzxPBvQK+RXaY3QSjXUtHu463fI="; - }; - - meta = with lib; { - homepage = "https://gputils.sourceforge.io"; - description = "Collection of tools for the Microchip (TM) PIC microcontrollers. It includes gpasm, gplink, and gplib"; - license = licenses.gpl2; - maintainers = with maintainers; [ yorickvp ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/embedded/jtag-remote-server/default.nix b/pkgs/development/embedded/jtag-remote-server/default.nix deleted file mode 100644 index 7f29d1bfbeb9..000000000000 --- a/pkgs/development/embedded/jtag-remote-server/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub, lib, cmake, pkg-config, libftdi1 }: - -stdenv.mkDerivation rec { - pname = "jtag-remote-server"; - version = "1.2"; - - src = fetchFromGitHub { - owner = "jiegec"; - repo = pname; - rev = "v${version}"; - hash = "sha256-qtgO0BO2hvWi/E2RzGTTuQynKbh7/OLeoLcm60dqro8="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libftdi1 ]; - - meta = with lib; { - description = "Remote JTAG server for remote debugging"; - mainProgram = "jtag-remote-server"; - homepage = "https://github.com/jiegec/jtag-remote-server"; - license = licenses.mit; - maintainers = with maintainers; [ nickcao ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/embedded/nmrpflash/default.nix b/pkgs/development/embedded/nmrpflash/default.nix deleted file mode 100644 index 67e45ebcae5a..000000000000 --- a/pkgs/development/embedded/nmrpflash/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ fetchFromGitHub -, lib -, libnl -, libpcap -, pkg-config -, stdenv -}: -stdenv.mkDerivation rec { - pname = "nmrpflash"; - version = "0.9.22"; - - src = fetchFromGitHub { - owner = "jclehner"; - repo = "nmrpflash"; - rev = "v${version}"; - hash = "sha256-gr/7tZYnuXFvfIUh2MmtgSbFoELTomQ4h05y/WFDhjo="; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libnl libpcap ]; - - PREFIX = "${placeholder "out"}"; - STANDALONE_VERSION = version; - - preInstall = '' - mkdir -p $out/bin - ''; - - meta = with lib; { - description = "Netgear Unbrick Utility"; - homepage = "https://github.com/jclehner/nmrpflash"; - license = licenses.gpl3; - maintainers = with maintainers; [ dadada ]; - mainProgram = "nmrpflash"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/embedded/openocd/default.nix b/pkgs/development/embedded/openocd/default.nix deleted file mode 100644 index 366d1ed832c2..000000000000 --- a/pkgs/development/embedded/openocd/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv -, lib -, fetchurl -, pkg-config -, hidapi -, tcl -, jimtcl -, libjaylink -, libusb1 -, libgpiod_1 - -, enableFtdi ? true, libftdi1 - -# 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"; - src = fetchurl { - url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ryVHiL6Yhh8r2RA/5uYKd07Jaow3R0Tu+Rl/YEMHWvo="; - }; - - nativeBuildInputs = [ pkg-config tcl ]; - - 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" - "--enable-jtag_vpi" - "--enable-remote-bitbang" - (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 - ; - - enableParallelBuilding = true; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ - "-Wno-error=cpp" - "-Wno-error=strict-prototypes" # fixes build failure with hidapi 0.10.0 - ]); - - postInstall = lib.optionalString stdenv.isLinux '' - mkdir -p "$out/etc/udev/rules.d" - rules="$out/share/openocd/contrib/60-openocd.rules" - if [ ! -f "$rules" ]; then - echo "$rules is missing, must update the Nix file." - exit 1 - fi - ln -s "$rules" "$out/etc/udev/rules.d/" - ''; - - meta = with lib; { - description = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing"; - mainProgram = "openocd"; - longDescription = '' - OpenOCD provides on-chip programming and debugging support with a layered - architecture of JTAG interface and TAP support, debug target support - (e.g. ARM, MIPS), and flash chip drivers (e.g. CFI, NAND, etc.). Several - network interfaces are available for interactiving with OpenOCD: HTTP, - telnet, TCL, and GDB. The GDB server enables OpenOCD to function as a - "remote target" for source-level debugging of embedded systems using the - GNU GDB program. - ''; - homepage = "https://openocd.sourceforge.net/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ bjornfor prusnak ]; - platforms = platforms.unix ++ platforms.windows; - }; -} diff --git a/pkgs/development/embedded/orbuculum/default.nix b/pkgs/development/embedded/orbuculum/default.nix deleted file mode 100644 index e6a69e22be2d..000000000000 --- a/pkgs/development/embedded/orbuculum/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, czmq -, libusb1 -, ncurses -, SDL2 -}: - -stdenv.mkDerivation rec { - pname = "orbuculum"; - version = "2.1.0"; - - src = fetchFromGitHub { - owner = "orbcode"; - repo = pname; - rev = "V${version}"; - sha256 = "sha256-Ohcc8739W/EmDjOYhcMgzEPVhzbWrUYgsPLdy4qzxhY="; - }; - - prePatch = '' - substituteInPlace meson.build --replace \ - "/etc/udev/rules.d" "$out/etc/udev/rules.d" - ''; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - czmq - libusb1 - ncurses - SDL2 - ]; - - installFlags = [ - "INSTALL_ROOT=$(out)/" - ]; - - postInstall = '' - mkdir -p $out/etc/udev/rules.d/ - cp $src/Support/60-orbcode.rules $out/etc/udev/rules.d/ - ''; - - meta = with lib; { - description = "Cortex M SWO SWV Demux and Postprocess for the ORBTrace"; - homepage = "https://orbcode.org"; - changelog = "https://github.com/orbcode/orbuculum/blob/V${version}/CHANGES.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ newam ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index 6890a2b1b35e..eb20e0f6a3e7 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -79,7 +79,7 @@ with python3Packages; buildPythonApplication rec { uvicorn wsproto zeroconf - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ chardet ]; diff --git a/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/pkgs/development/embedded/stm32/stm32cubemx/default.nix deleted file mode 100644 index 6d58322767d3..000000000000 --- a/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ fdupes -, buildFHSEnv -, fetchzip -, icoutils -, imagemagick -, jdk17 -, lib -, makeDesktopItem -, stdenvNoCC -}: - -let - iconame = "STM32CubeMX"; - package = stdenvNoCC.mkDerivation rec { - pname = "stm32cubemx"; - version = "6.11.1"; - - src = fetchzip { - url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip"; - hash = "sha256-By9T43GLM1J63TkRi3kl05h1RflBorU1QHgYOrXQ9N0="; - stripRoot = false; - }; - - nativeBuildInputs = [ fdupes icoutils imagemagick ]; - desktopItem = makeDesktopItem { - name = "STM32CubeMX"; - exec = "stm32cubemx"; - desktopName = "STM32CubeMX"; - categories = [ "Development" ]; - icon = "stm32cubemx"; - comment = meta.description; - terminal = false; - startupNotify = false; - mimeTypes = [ - "x-scheme-handler/sgnl" - "x-scheme-handler/signalcaptcha" - ]; - }; - - buildCommand = '' - mkdir -p $out/{bin,opt/STM32CubeMX,share/applications} - - cp -r $src/MX/. $out/opt/STM32CubeMX/ - chmod +rx $out/opt/STM32CubeMX/STM32CubeMX - - cat << EOF > $out/bin/${pname} - #!${stdenvNoCC.shell} - ${jdk17}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX - EOF - chmod +x $out/bin/${pname} - - icotool --extract $out/opt/STM32CubeMX/help/${iconame}.ico - fdupes -dN . > /dev/null - ls - for size in 16 24 32 48 64 128 256; do - mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps - if [ $size -eq 256 ]; then - mv ${iconame}_*_"$size"x"$size"x32.png \ - $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png - else - convert -resize "$size"x"$size" ${iconame}_*_256x256x32.png \ - $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png - fi - done; - - cp ${desktopItem}/share/applications/*.desktop $out/share/applications - ''; - - meta = with lib; { - description = "A graphical tool for configuring STM32 microcontrollers and microprocessors"; - longDescription = '' - A graphical tool that allows a very easy configuration of STM32 - microcontrollers and microprocessors, as well as the generation of the - corresponding initialization C code for the Arm® Cortex®-M core or a - partial Linux® Device Tree for Arm® Cortex®-A core), through a - step-by-step process. - ''; - homepage = "https://www.st.com/en/development-tools/stm32cubemx.html"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.unfree; - maintainers = with maintainers; [ angaz wucke13 ]; - platforms = [ "x86_64-linux" ]; - }; - }; - in - buildFHSEnv { - inherit (package) pname version meta; - runScript = "${package.outPath}/bin/stm32cubemx"; - targetPkgs = pkgs: - with pkgs; [ - alsa-lib - at-spi2-atk - cairo - cups - dbus - expat - glib - gtk3 - libdrm - libGL - libudev0-shim - libxkbcommon - mesa - nspr - nss - pango - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - ]; -} diff --git a/pkgs/development/embedded/stm32/stm32flash/default.nix b/pkgs/development/embedded/stm32/stm32flash/default.nix deleted file mode 100644 index fd9703fed4cf..000000000000 --- a/pkgs/development/embedded/stm32/stm32flash/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "stm32flash"; - version = "0.7"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-xMnNi+x52mOxEdFXE+9cws2UfeykEdNdbjBl4ifcQUo="; - }; - - buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - - installPhase = '' - # Manually copy, make install copies to /usr/local/bin - mkdir -pv $out/bin/ - cp stm32flash $out/bin/ - ''; - - meta = with lib; { - description = "Open source flash program for the STM32 ARM processors using the ST bootloader"; - mainProgram = "stm32flash"; - homepage = "https://sourceforge.net/projects/stm32flash/"; - license = lib.licenses.gpl2; - platforms = platforms.all; # Should work on all platforms - maintainers = with maintainers; [ elitak ]; - }; -} diff --git a/pkgs/development/embedded/stm8/stm8flash/default.nix b/pkgs/development/embedded/stm8/stm8flash/default.nix deleted file mode 100644 index a34be169816d..000000000000 --- a/pkgs/development/embedded/stm8/stm8flash/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libusb1, pkg-config }: - -stdenv.mkDerivation rec { - pname = "stm8flash"; - version = "2022-03-27"; - - src = fetchFromGitHub { - owner = "vdudouyt"; - repo = "stm8flash"; - rev = "23305ce5adbb509c5cb668df31b0fd6c8759639c"; - sha256 = "sha256-fFoC2EKSmYyW2lqrdAh5A2WEtUMCenKse2ySJdNHu6w="; - }; - - strictDeps = true; - enableParallelBuilding = true; - - # NOTE: _FORTIFY_SOURCE requires compiling with optimization (-O) - env.NIX_CFLAGS_COMPILE = "-O"; - - preBuild = '' - export DESTDIR=$out; - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 ]; - - meta = with lib; { - homepage = "https://github.com/vdudouyt/stm8flash"; - description = "Tool for flashing STM8 MCUs via ST-LINK (V1 and V2)"; - mainProgram = "stm8flash"; - maintainers = with maintainers; [ pkharvey ]; - license = licenses.gpl2; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/embedded/teensy-cmake-macros/default.nix b/pkgs/development/embedded/teensy-cmake-macros/default.nix deleted file mode 100644 index 7254becdbce7..000000000000 --- a/pkgs/development/embedded/teensy-cmake-macros/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, callPackage -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "teensy-cmake-macros"; - version = "unstable-2023-04-15"; - - src = fetchFromGitHub { - owner = "newdigate"; - repo = "teensy-cmake-macros"; - rev = "dc401ed23e6e13a9db3cd2a65f611a4738df3b0e"; - hash = "sha256-E+BOlsCJtOScr3B5GSv1WM6rFv6cFYvm/iJ893fsmXM="; - }; - - propagatedBuildInputs = [ cmake pkg-config ]; - - passthru = { - hook = callPackage ./hook.nix { - teensy-cmake-macros = finalAttrs.finalPackage; - }; - }; - - meta = with lib; { - description = "CMake macros for building teensy projects"; - platforms = platforms.all; - homepage = "https://github.com/newdigate/teensy-cmake-macros"; - license = licenses.mit; - maintainers = [ maintainers.michaeldonovan ]; - }; -}) diff --git a/pkgs/development/embedded/teensy-cmake-macros/hook.nix b/pkgs/development/embedded/teensy-cmake-macros/hook.nix deleted file mode 100644 index 55f9aec729f5..000000000000 --- a/pkgs/development/embedded/teensy-cmake-macros/hook.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ makeSetupHook -, teensy-cmake-macros -}: - -makeSetupHook { - name = "teensy-cmake-macros-hook"; - - propagatedBuildInputs = [ teensy-cmake-macros ]; - - passthru = { inherit teensy-cmake-macros; }; - - meta = { - description = "Setup hook for teensy-cmake-macros"; - inherit (teensy-cmake-macros.meta) maintainers platforms broken; - }; -} ./setup-hook.sh diff --git a/pkgs/development/embedded/teensy-cmake-macros/setup-hook.sh b/pkgs/development/embedded/teensy-cmake-macros/setup-hook.sh deleted file mode 100644 index 71026eedcf65..000000000000 --- a/pkgs/development/embedded/teensy-cmake-macros/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -teensyCMakeMacrosEnvHook() { - cmakeFlagsArray+=(-DCMAKE_MODULE_PATH=@out@/lib/cmake) -} - -addEnvHooks "$targetOffset" teensyCMakeMacrosEnvHook diff --git a/pkgs/development/embedded/teensy-loader-cli/default.nix b/pkgs/development/embedded/teensy-loader-cli/default.nix deleted file mode 100644 index 19f7051f0a30..000000000000 --- a/pkgs/development/embedded/teensy-loader-cli/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, go-md2man -, installShellFiles -, libusb-compat-0_1 -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "teensy-loader-cli"; - version = "2.3"; - - src = fetchFromGitHub { - owner = "PaulStoffregen"; - repo = "teensy_loader_cli"; - rev = finalAttrs.version; - sha256 = "sha256-NYqCNWO/nHEuNc9eOzsUqJEHJtZ3XaNz1VYNbeuqEk8="; - }; - - nativeBuildInputs = [ - go-md2man - installShellFiles - ]; - - buildInputs = [ - libusb-compat-0_1 - ]; - - installPhase = '' - runHook preInstall - - install -Dm555 teensy_loader_cli $out/bin/teensy-loader-cli - install -Dm444 -t $out/share/doc/teensy-loader-cli *.md *.txt - go-md2man -in README.md -out teensy-loader-cli.1 - installManPage *.1 - - runHook postInstall - ''; - - meta = with lib; { - description = "Firmware uploader for the Teensy microcontroller boards"; - mainProgram = "teensy-loader-cli"; - homepage = "https://www.pjrc.com/teensy/"; - license = licenses.gpl3Only; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/embedded/uisp/default.nix b/pkgs/development/embedded/uisp/default.nix deleted file mode 100644 index d086781fb1c4..000000000000 --- a/pkgs/development/embedded/uisp/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "uisp"; - version = "20050207"; - - src = fetchurl { - url = "https://savannah.nongnu.org/download/uisp/uisp-${version}.tar.gz"; - sha256 = "1bncxp5yxh9r1yrp04vvhfiva8livi1pwic7v8xj99q09zrwahvw"; - }; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - meta = { - description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers"; - mainProgram = "uisp"; - license = lib.licenses.gpl2; - homepage = "https://savannah.nongnu.org/projects/uisp"; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/embedded/wch-isp/default.nix b/pkgs/development/embedded/wch-isp/default.nix deleted file mode 100644 index 3021c875f08b..000000000000 --- a/pkgs/development/embedded/wch-isp/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromSourcehut, pkg-config, libusb1 }: - -stdenv.mkDerivation rec { - pname = "wch-isp"; - version = "0.4.1"; - - src = fetchFromSourcehut { - owner = "~jmaselbas"; - repo = pname; - rev = "v${version}"; - hash = "sha256-JB7cvZPzRhYJ8T3QJkguHOzZFrLOft5rRz0F0sVav/k="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 ]; - - installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; - installTargets = [ "install" "install-rules" ]; - - meta = { - description = "Firmware programmer for WCH microcontrollers over USB"; - mainProgram = "wch-isp"; - license = lib.licenses.gpl2Only; - homepage = "https://git.sr.ht/~jmaselbas/wch-isp"; - maintainers = with lib.maintainers; [ lesuisse ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/embedded/xc3sprog/default.nix b/pkgs/development/embedded/xc3sprog/default.nix deleted file mode 100644 index fa9ceffafbbb..000000000000 --- a/pkgs/development/embedded/xc3sprog/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchsvn, cmake, libusb-compat-0_1, libftdi }: - -# The xc3sprog project doesn't seem to make proper releases, they only put out -# prebuilt binary subversion snapshots on sourceforge. - -stdenv.mkDerivation rec { - version = "787"; - pname = "xc3sprog"; - - src = fetchsvn { - url = "https://svn.code.sf.net/p/xc3sprog/code/trunk"; - sha256 = "1rfhms3i7375kdlg0sdg5k52ix3xv5llj2dr30vamyg7pk74y8rx"; - rev = version; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libusb-compat-0_1 libftdi ]; - - cmakeFlags = [ - # file RPATH_CHANGE could not write new RPATH - "-DCMAKE_SKIP_BUILD_RPATH=ON" - # fix build with gcc 11+ - "-DCMAKE_CXX_STANDARD=14" - ]; - - meta = with lib; { - description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG"; - homepage = "https://xc3sprog.sourceforge.net/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/development/emilua-plugins/beast/default.nix b/pkgs/development/emilua-plugins/beast/default.nix index 245170cae710..9b28bed49ac3 100644 --- a/pkgs/development/emilua-plugins/beast/default.nix +++ b/pkgs/development/emilua-plugins/beast/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (self: { pname = "emilua_beast"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitLab { owner = "emilua"; repo = "beast"; rev = "v${self.version}"; - hash = "sha256-HvfEigHJTZelPvHFk22PWxkTFEajHJXfiCndxXHVgq8="; + hash = "sha256-8pHL0ut221LvFwb/o1GuLV3gIDw5LSeqxqIa9eaQjXY="; }; buildInputs = [ diff --git a/pkgs/development/emilua-plugins/bech32/default.nix b/pkgs/development/emilua-plugins/bech32/default.nix new file mode 100644 index 000000000000..338913764b66 --- /dev/null +++ b/pkgs/development/emilua-plugins/bech32/default.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + meson, + ninja, + fetchFromGitLab, + gperf, + gawk, + gitUpdater, + pkg-config, + boost, + luajit_openresty, + asciidoctor, + emilua, + liburing, + openssl, + fmt, + cmake, + range-v3, +}: + +stdenv.mkDerivation rec { + pname = "emilua-bech32"; + version = "1.1.0"; + + src = fetchFromGitLab { + owner = "emilua"; + repo = "bech32"; + rev = "v${version}"; + hash = "sha256-f4KFL2RV+fAVJrgaAQWKuLwlN440j9vBbiyk5fHrwiE="; + }; + + buildInputs = [ + emilua + liburing + fmt + range-v3 + luajit_openresty + openssl + boost + ]; + + nativeBuildInputs = [ + gperf + gawk + pkg-config + asciidoctor + meson + ninja + cmake + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = with lib; { + description = "Bech32 codec for Emilua"; + homepage = "https://emilua.org/"; + license = licenses.mit; + maintainers = with maintainers; [ manipuladordedados ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/emilua-plugins/qt6/default.nix b/pkgs/development/emilua-plugins/qt6/default.nix index e8245200eccc..db8eaeeecb49 100644 --- a/pkgs/development/emilua-plugins/qt6/default.nix +++ b/pkgs/development/emilua-plugins/qt6/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "emilua-qt6"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitLab { owner = "emilua"; repo = "qt6"; rev = "v${version}"; - hash = "sha256-azMnM17HQMzC0ExgWurQzbR3fX9EwBRSu4kVTm3U2Ic="; + hash = "sha256-tSVJTEPLQ5z1OPtyNiu71AZcVmgzD7oWhDI8ccctGOQ="; }; buildInputs = with qt6Packages; [ diff --git a/pkgs/development/emilua-plugins/tdlib/default.nix b/pkgs/development/emilua-plugins/tdlib/default.nix new file mode 100644 index 000000000000..96c33efee197 --- /dev/null +++ b/pkgs/development/emilua-plugins/tdlib/default.nix @@ -0,0 +1,84 @@ +{ + lib, + stdenv, + fetchFromGitLab, + fetchFromGitHub, + gperf, + gawk, + gitUpdater, + pkg-config, + boost, + luajit_openresty, + asciidoctor, + emilua, + liburing, + openssl, + cmake, + fmt, + zlib, +}: + +let + td-wrap = fetchFromGitHub { + owner = "tdlib"; + repo = "td"; + rev = "4041ecb535802ba1c55fcd11adf5d3ada41c2be7"; + hash = "sha256-/TaPYy+FUOVhyocDZ13zwR07xbzp6g8c6xvAGVFLQvk="; + }; + + trial-circular-wrap = fetchFromGitHub { + owner = "breese"; + repo = "trial.protocol"; + rev = "79149f604a49b8dfec57857ca28aaf508069b669"; + hash = "sha256-Xd8bX3z9PZWU17N9R95HXdj6qo9at5FBL/+PTVaJgkw="; + }; +in +stdenv.mkDerivation rec { + pname = "emilua-tdlib"; + version = "1.0.3"; + + src = fetchFromGitLab { + owner = "emilua"; + repo = "tdlib"; + rev = "v${version}"; + hash = "sha256-14jg71m1za+WW0PP9cg1XniCupl9/RXqeEP1SE+62Ng="; + fetchSubmodules = true; + }; + + buildInputs = [ + emilua + liburing + fmt + luajit_openresty + openssl + boost + td-wrap + trial-circular-wrap + ]; + + nativeBuildInputs = [ + gperf + gawk + pkg-config + asciidoctor + cmake + zlib + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-warn 'pkg_get_variable(EMILUA_PLUGINSDIR emilua pluginsdir)' 'set(EMILUA_PLUGINSDIR "${"$"}{CMAKE_INSTALL_PREFIX}/${emilua.sitePackages}")' + ''; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = with lib; { + description = "Telegram Database Library bindings for Emilua"; + homepage = "https://emilua.org/"; + license = licenses.mit; + maintainers = with maintainers; [ manipuladordedados ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/emilua-plugins/this-thread/default.nix b/pkgs/development/emilua-plugins/this-thread/default.nix new file mode 100644 index 000000000000..1430359d133c --- /dev/null +++ b/pkgs/development/emilua-plugins/this-thread/default.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + meson, + ninja, + fetchFromGitLab, + gperf, + gawk, + gitUpdater, + pkg-config, + boost, + luajit_openresty, + asciidoctor, + emilua, + liburing, + openssl, + fmt, +}: + +stdenv.mkDerivation rec { + pname = "emilua-this-thread"; + version = "1.0.0"; + + src = fetchFromGitLab { + owner = "emilua"; + repo = "this-thread"; + rev = "v${version}"; + hash = "sha256-JmAe69heZ406LE2aaSxQXJYu/iv1cS90KHecQJYoiKQ="; + }; + + buildInputs = [ + emilua + liburing + fmt + luajit_openresty + openssl + boost + ]; + + nativeBuildInputs = [ + gperf + gawk + pkg-config + asciidoctor + meson + ninja + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = with lib; { + description = "Access C++'s this_thread from Lua"; + homepage = "https://emilua.org/"; + license = licenses.mit; + maintainers = with maintainers; [ manipuladordedados ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/gnuradio-modules/ais/default.nix b/pkgs/development/gnuradio-modules/ais/default.nix index 66a6e82fff8b..a86fce043d97 100644 --- a/pkgs/development/gnuradio-modules/ais/default.nix +++ b/pkgs/development/gnuradio-modules/ais/default.nix @@ -60,7 +60,7 @@ mkDerivation rec { 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; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ mog ]; }; } diff --git a/pkgs/development/gnuradio-modules/grnet/default.nix b/pkgs/development/gnuradio-modules/grnet/default.nix index 77390e52340b..7fb8d10997e1 100644 --- a/pkgs/development/gnuradio-modules/grnet/default.nix +++ b/pkgs/development/gnuradio-modules/grnet/default.nix @@ -8,7 +8,7 @@ , boost , logLib , python -, swig +, swig3 , mpir , gmp , doxygen @@ -78,7 +78,7 @@ mkDerivation { pybind11 numpy ] else [ - swig + swig3 thrift python.pkgs.thrift ]); diff --git a/pkgs/development/gnuradio-modules/gsm/default.nix b/pkgs/development/gnuradio-modules/gsm/default.nix index 9f184b7be7fb..af7a018f4798 100644 --- a/pkgs/development/gnuradio-modules/gsm/default.nix +++ b/pkgs/development/gnuradio-modules/gsm/default.nix @@ -4,7 +4,7 @@ , cmake , pkg-config , cppunit -, swig +, swig3 , boost , logLib , python @@ -27,7 +27,7 @@ mkDerivation { nativeBuildInputs = [ cmake pkg-config - swig + swig3 python ]; diff --git a/pkgs/development/gnuradio-modules/limesdr/default.nix b/pkgs/development/gnuradio-modules/limesdr/default.nix index 62db654270b9..27c846c44af5 100644 --- a/pkgs/development/gnuradio-modules/limesdr/default.nix +++ b/pkgs/development/gnuradio-modules/limesdr/default.nix @@ -5,7 +5,7 @@ , thrift , cmake , pkg-config -, swig +, swig3 , python , logLib , mpir @@ -38,7 +38,7 @@ in mkDerivation { nativeBuildInputs = [ cmake pkg-config - swig + swig3 python ]; buildInputs = [ diff --git a/pkgs/development/gnuradio-modules/nacl/default.nix b/pkgs/development/gnuradio-modules/nacl/default.nix index 0900ca943b97..34cd04aff4ea 100644 --- a/pkgs/development/gnuradio-modules/nacl/default.nix +++ b/pkgs/development/gnuradio-modules/nacl/default.nix @@ -4,7 +4,7 @@ , cmake , pkg-config , cppunit -, swig +, swig3 , boost , logLib , python @@ -26,7 +26,7 @@ mkDerivation { nativeBuildInputs = [ cmake pkg-config - swig + swig3 python ]; diff --git a/pkgs/development/gnuradio-modules/osmosdr/default.nix b/pkgs/development/gnuradio-modules/osmosdr/default.nix index dbf7513cacc1..aae85f02ab74 100644 --- a/pkgs/development/gnuradio-modules/osmosdr/default.nix +++ b/pkgs/development/gnuradio-modules/osmosdr/default.nix @@ -14,7 +14,7 @@ , thrift , fftwFloat , python -, swig +, swig3 , uhd , icu , airspy @@ -71,7 +71,7 @@ in mkDerivation { ] ++ lib.optionals (gnuradio.hasFeature "python-support") [ python.pkgs.numpy python.pkgs.pybind11 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.Security ]; @@ -85,7 +85,7 @@ in mkDerivation { nativeBuildInputs = [ cmake pkg-config - swig + swig3 ] ++ lib.optionals (gnuradio.hasFeature "python-support") [ (if (gnuradio.versionAttr.major == "3.7") then python.pkgs.cheetah diff --git a/pkgs/development/gnuradio-modules/rds/default.nix b/pkgs/development/gnuradio-modules/rds/default.nix index 9a6f2ccbbad4..5b9a20042cb9 100644 --- a/pkgs/development/gnuradio-modules/rds/default.nix +++ b/pkgs/development/gnuradio-modules/rds/default.nix @@ -4,7 +4,7 @@ , gnuradio , cmake , pkg-config -, swig +, swig3 , python , logLib , mpir @@ -50,7 +50,7 @@ in mkDerivation { nativeBuildInputs = [ cmake pkg-config - swig + swig3 python ]; diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix deleted file mode 100644 index 3ed308de46b1..000000000000 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, stdenv -, fetchurl -, cairo -, expat -, guile -, guile-lib -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "guile-cairo"; - version = "1.11.2"; - - src = fetchurl { - url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-YjLU3Cxb2dMxE5s7AfQ0PD4fucp4mDYaaZIGcwlBoHs="; - }; - - nativeBuildInputs = [ - pkg-config - ]; - buildInputs = [ - cairo - expat - guile - ]; - - enableParallelBuilding = true; - - doCheck = false; # Cannot find unit-test module from guile-lib - nativeCheckInputs = [ guile-lib ]; - - meta = with lib; { - homepage = "https://www.nongnu.org/guile-cairo/"; - description = "Cairo bindings for GNU Guile"; - longDescription = '' - Guile-Cairo wraps the Cairo graphics library for Guile Scheme. - - Guile-Cairo is complete, wrapping almost all of the Cairo API. It is API - stable, providing a firm base on which to do graphics work. Finally, and - importantly, it is pleasant to use. You get a powerful and well - maintained graphics library with all of the benefits of Scheme: memory - management, exceptions, macros, and a dynamic programming environment. - ''; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ vyp ]; - platforms = guile.meta.platforms; - }; -} diff --git a/pkgs/development/guile-modules/guile-commonmark/default.nix b/pkgs/development/guile-modules/guile-commonmark/default.nix deleted file mode 100644 index c103635d37af..000000000000 --- a/pkgs/development/guile-modules/guile-commonmark/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, guile -, pkg-config -, texinfo -}: - -stdenv.mkDerivation { - pname = "guile-commonmark"; - version = "unstable-2020-04-30"; - - src = fetchFromGitHub { - owner = "OrangeShark"; - repo = "guile-commonmark"; - rev = "538ffea25ca69d9f3ee17033534ba03cc27ba468"; - hash = "sha256-9cA7iQ/GGEx+HwsdAxKC3IssqkT/Yg8ZxaiIprS5VuI="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - texinfo # for makeinfo - ]; - buildInputs = [ - guile - ]; - - # https://github.com/OrangeShark/guile-commonmark/issues/20 - doCheck = false; - - makeFlags = [ - "GUILE_AUTO_COMPILE=0" - ]; - - meta = with lib; { - homepage = "https://github.com/OrangeShark/guile-commonmark"; - description = "Implementation of CommonMark for Guile"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = guile.meta.platforms; - }; -} diff --git a/pkgs/development/guile-modules/guile-config/default.nix b/pkgs/development/guile-modules/guile-config/default.nix deleted file mode 100644 index d0fe7be0c87e..000000000000 --- a/pkgs/development/guile-modules/guile-config/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, texinfo, guile }: - -stdenv.mkDerivation rec { - pname = "guile-config"; - version = "0.5.1"; - - src = fetchFromGitLab { - owner = "a-sassmannshausen"; - repo = "guile-config"; - rev = version; - hash = "sha256-n4ukGCyIx5G1ITfKSqS6FGJ6dnDBsyxXKSFNi81E4Gg="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; - - buildInputs = [ guile ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = with lib; { - description = "Configuration management library for GNU Guile"; - homepage = "https://gitlab.com/a-sassmannshausen/guile-config"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ sikmir ]; - platforms = guile.meta.platforms; - }; -} diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/development/guile-modules/guile-fibers/default.nix deleted file mode 100644 index c5b9b07a6124..000000000000 --- a/pkgs/development/guile-modules/guile-fibers/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, guile -, libevent -, pkg-config -, texinfo -}: - -stdenv.mkDerivation rec { - pname = "guile-fibers"; - version = "1.3.1"; - - src = fetchFromGitHub { - owner = "wingo"; - repo = "fibers"; - rev = "v${version}"; - hash = "sha256-jJKA5JEHsmqQ/IKb1aNmOtoVaGKNjcgTKyo5VCiJbXM="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - autoreconfHook - guile - pkg-config - texinfo # for makeinfo - ]; - - buildInputs = [ - guile - libevent - ]; - - makeFlags = [ - "GUILE_AUTO_COMPILE=0" - ]; - - meta = with lib; { - homepage = "https://github.com/wingo/fibers"; - description = "Concurrent ML-like concurrency for Guile"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ vyp ]; - platforms = guile.meta.platforms; - }; -} diff --git a/pkgs/development/guile-modules/guile-gcrypt/default.nix b/pkgs/development/guile-modules/guile-gcrypt/default.nix deleted file mode 100644 index ff31b009da31..000000000000 --- a/pkgs/development/guile-modules/guile-gcrypt/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, fetchFromGitea -, guile -, libgcrypt -, autoreconfHook -, pkg-config -, texinfo -}: - -stdenv.mkDerivation rec { - pname = "guile-gcrypt"; - version = "0.4.0"; - - src = fetchFromGitea { - domain = "notabug.org"; - owner = "cwebber"; - repo = "guile-gcrypt"; - rev = "v${version}"; - hash = "sha256-vbm31EsOJiMeTs2tu5KPXckxPcAQbi3/PGJ5EHCC5VQ="; - }; - - strictDeps = true; - nativeBuildInputs = [ - autoreconfHook guile libgcrypt pkg-config texinfo - ]; - buildInputs = [ - guile - ]; - propagatedBuildInputs = [ - libgcrypt - ]; - makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; - doCheck = true; - - # In procedure bytevector-u8-ref: Argument 2 out of range - dontStrip = stdenv.isDarwin; - - meta = with lib; { - description = "Bindings to Libgcrypt for GNU Guile"; - homepage = "https://notabug.org/cwebber/guile-gcrypt"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ethancedwards8 ]; - platforms = guile.meta.platforms; - }; -} diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix deleted file mode 100644 index b91d13a63745..000000000000 --- a/pkgs/development/guile-modules/guile-git/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, guile -, libgit2 -, scheme-bytestructures -, autoreconfHook -, pkg-config -, texinfo -}: - -stdenv.mkDerivation rec { - pname = "guile-git"; - version = "0.8.0"; - - src = fetchFromGitLab { - owner = "guile-git"; - repo = pname; - rev = "v${version}"; - hash = "sha256-EZ2uGyk1K2YCl/U7EzTKri6CEe8CGDRy4pNRVjp7ZZY="; - }; - - strictDeps = true; - nativeBuildInputs = [ - autoreconfHook guile pkg-config texinfo - ]; - buildInputs = [ - guile - ]; - propagatedBuildInputs = [ - libgit2 scheme-bytestructures - ]; - doCheck = !stdenv.isDarwin; - makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; - - enableParallelBuilding = true; - - # Skipping proxy tests since it requires network access. - postConfigure = '' - sed -i -e '94i (test-skip 1)' ./tests/proxy.scm - ''; - - meta = with lib; { - description = "Bindings to Libgit2 for GNU Guile"; - homepage = "https://gitlab.com/guile-git/guile-git"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ethancedwards8 ]; - platforms = guile.meta.platforms; - }; -} diff --git a/pkgs/development/guile-modules/guile-gnutls/default.nix b/pkgs/development/guile-modules/guile-gnutls/default.nix deleted file mode 100644 index 952d2558d050..000000000000 --- a/pkgs/development/guile-modules/guile-gnutls/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, fetchurl -, buildPackages -, gnutls -, guile -, libtool -, pkg-config -, texinfo -}: - -stdenv.mkDerivation rec { - pname = "guile-gnutls"; - version = "4.0.0"; - - src = fetchurl { - url = "mirror://gnu/gnutls/guile-gnutls-${version}.tar.gz"; - hash = "sha256-W0y5JgMgduw0a7XAvA0CMflo/g9WWRPMFpNLt5Ovsjk="; - }; - - strictDeps = true; - - depsBuildBuild = [ - buildPackages.stdenv.cc - ]; - - nativeBuildInputs = [ - gnutls - guile - libtool - texinfo - pkg-config - ]; - - buildInputs = [ - gnutls - guile - ]; - - configureFlags = [ - "--with-guile-site-dir=${builtins.placeholder "out"}/${guile.siteDir}" - "--with-guile-site-ccache-dir=${builtins.placeholder "out"}/${guile.siteCcacheDir}" - "--with-guile-extension-dir=${builtins.placeholder "out"}/lib/guile/${guile.effectiveVersion}/extensions" - ]; - - meta = with lib; { - homepage = "https://gitlab.com/gnutls/guile/"; - description = "Guile bindings for GnuTLS library"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ foo-dogsquared ]; - platforms = guile.meta.platforms; - }; -} diff --git a/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/development/guile-modules/guile-json/default.nix deleted file mode 100644 index cb34e22e6237..000000000000 --- a/pkgs/development/guile-modules/guile-json/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, stdenv -, fetchurl -, guile -, texinfo -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "guile-json"; - version = "4.7.3"; - - src = fetchurl { - url = "mirror://savannah/guile-json/${pname}-${version}.tar.gz"; - sha256 = "sha256-OLoEjtKdEvBbMsWy+3pReVxEi0HkA6Kxty/wA1gX84g="; - }; - - strictDeps = true; - nativeBuildInputs = [ - guile pkg-config texinfo - ]; - buildInputs = [ - guile - ]; - doCheck = true; - makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; - - meta = with lib; { - description = "JSON Bindings for GNU Guile"; - homepage = "https://savannah.nongnu.org/projects/guile-json"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ethancedwards8 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix deleted file mode 100644 index 1e5ddbd49143..000000000000 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, fetchurl -, autoreconfHook -, guile -, pkg-config -, texinfo -}: - -stdenv.mkDerivation rec { - pname = "guile-lib"; - version = "0.2.8.1"; - - src = fetchurl { - url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-E3TC2Dnmoz0ZDNHavZx/h3U/g4T1W4ZvPhQhVcIrSbE="; - }; - - strictDeps = true; - nativeBuildInputs = [ - autoreconfHook - guile - pkg-config - ]; - buildInputs = [ - guile - texinfo - ]; - - postPatch = '' - substituteInPlace configure.ac \ - --replace 'SITEDIR="$datadir/guile-lib"' 'SITEDIR=$datadir/guile/site/$GUILE_EFFECTIVE_VERSION' \ - --replace 'SITECCACHEDIR="$libdir/guile-lib/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"' 'SITECCACHEDIR="$libdir/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"' - ''; - - makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; - - doCheck = !stdenv.isDarwin; - - preCheck = '' - # Make `libgcc_s.so' visible for `pthread_cancel'. - export LD_LIBRARY_PATH=\ - "$(dirname $(echo ${stdenv.cc.cc.lib}/lib*/libgcc_s.so))''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - ''; - - meta = with lib; { - homepage = "https://www.nongnu.org/guile-lib/"; - description = "Collection of useful Guile Scheme modules"; - longDescription = '' - guile-lib is intended as an accumulation place for pure-scheme Guile - modules, allowing for people to cooperate integrating their generic Guile - modules into a coherent library. Think "a down-scaled, limited-scope CPAN - for Guile". - ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ vyp foo-dogsquared ]; - platforms = guile.meta.platforms; - }; -} diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix deleted file mode 100644 index e20da1d9f98c..000000000000 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, guile -, libffi -, ncurses -}: - -stdenv.mkDerivation rec { - pname = "guile-ncurses"; - version = "3.1"; - - src = fetchurl { - url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-7onozq/Kud0O8/wazJsQ9NIbpLJW0ynYQtYYPmP41zM="; - }; - - nativeBuildInputs = [ - pkg-config - ]; - buildInputs = [ - guile - libffi - ncurses - ]; - - configureFlags = [ - "--with-gnu-filesystem-hierarchy" - ]; - - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; - - postFixup = '' - for f in $out/${guile.siteDir}/ncurses/**.scm; do \ - substituteInPlace $f \ - --replace "libguile-ncurses" "$out/lib/guile/${guile.effectiveVersion}/libguile-ncurses"; \ - done - ''; - - # XXX: 1 of 65 tests failed. - doCheck = false; - - meta = with lib; { - homepage = "https://www.gnu.org/software/guile-ncurses/"; - description = "Scheme interface to the NCurses libraries"; - mainProgram = "guile-ncurses-shell"; - longDescription = '' - GNU Guile-Ncurses is a library for the Guile Scheme interpreter that - provides functions for creating text user interfaces. The text user - interface functionality is built on the ncurses libraries: curses, form, - panel, and menu. - ''; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ vyp ]; - platforms = guile.meta.platforms; - }; -} diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/development/guile-modules/guile-opengl/default.nix deleted file mode 100644 index efbb23cf71f5..000000000000 --- a/pkgs/development/guile-modules/guile-opengl/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, stdenv -, fetchurl -, guile -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "guile-opengl"; - version = "0.2.0"; - - src = fetchurl { - url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-uPCH7CiCPQmfuELDupQQS7BPqecIFmSHpHGYnhwXbGU="; - }; - - nativeBuildInputs = [ - pkg-config - guile - ]; - - meta = with lib; { - homepage = "https://www.gnu.org/software/guile-opengl/"; - description = "Guile bindings for the OpenGL graphics API"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ vyp ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix deleted file mode 100644 index 2a9d20f9aefa..000000000000 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, stdenv -, fetchurl -, gperf -, guile -, guile-lib -, libffi -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "guile-reader"; - version = "0.6.3"; - - src = fetchurl { - url = "http://download.savannah.nongnu.org/releases/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-OMK0ROrbuMDKt42QpE7D6/9CvUEMW4SpEBjO5+tk0rs="; - }; - - nativeBuildInputs = [ - pkg-config - ]; - buildInputs = [ - gperf - guile - guile-lib - libffi - ]; - - env = { - GUILE_SITE = "${guile-lib}/${guile.siteDir}"; - } // lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; - - configureFlags = [ "--with-guilemoduledir=$(out)/${guile.siteDir}" ]; - - meta = with lib; { - homepage = "https://www.nongnu.org/guile-reader/"; - description = "Simple framework for building readers for GNU Guile"; - longDescription = '' - Guile-Reader is a simple framework for building readers for GNU Guile. - - The idea is to make it easy to build procedures that extend Guile's read - procedure. Readers supporting various syntax variants can easily be - written, possibly by re-using existing "token readers" of a standard - Scheme readers. For example, it is used to implement Skribilo's - R5RS-derived document syntax. - ''; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = guile.meta.platforms; - }; -} diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix deleted file mode 100644 index 0ae8424b597d..000000000000 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, stdenv -, fetchurl -, SDL2 -, SDL2_image -, SDL2_mixer -, SDL2_ttf -, guile -, libtool -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "guile-sdl2"; - version = "0.8.0"; - - src = fetchurl { - url = "https://files.dthompson.us/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-V/XrpFrqOxS5mAphtIt2e3ewflK+HdLFEqOmix98p+w="; - }; - - nativeBuildInputs = [ - pkg-config - libtool - ]; - buildInputs = [ - SDL2 - SDL2_image - SDL2_mixer - SDL2_ttf - guile - ]; - - configureFlags = [ - "--with-libsdl2-image-prefix=${SDL2_image}" - "--with-libsdl2-mixer-prefix=${SDL2_mixer}" - "--with-libsdl2-prefix=${SDL2}" - "--with-libsdl2-ttf-prefix=${SDL2_ttf}" - ]; - - makeFlags = [ - "GUILE_AUTO_COMPILE=0" - ]; - - meta = with lib; { - homepage = "https://dthompson.us/projects/guile-sdl2.html"; - description = "Bindings to SDL2 for GNU Guile"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ seppeljordan vyp ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/guile-modules/guile-ssh/default.nix b/pkgs/development/guile-modules/guile-ssh/default.nix deleted file mode 100644 index a1928c78ce75..000000000000 --- a/pkgs/development/guile-modules/guile-ssh/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, guile -, libssh -, autoreconfHook -, pkg-config -, texinfo -, which -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "guile-ssh"; - version = "0.16.3"; - - src = fetchFromGitHub { - owner = "artyom-poptsov"; - repo = "guile-ssh"; - rev = "v${finalAttrs.version}"; - hash = "sha256-P29U88QrCjoyl/wdTPZbiMoykd/v6ul6CW/IJn9UAyw="; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/artyom-poptsov/guile-ssh/pull/31/commits/38636c978f257d5228cd065837becabf5da16854.patch"; - hash = "sha256-J+TDgdjihKoEjhbeH+BzqrHhjpVlGdscRj3L/GAFgKg="; - }) - ]; - - strictDeps = true; - - nativeBuildInputs = [ - autoreconfHook - guile - pkg-config - texinfo - which - ]; - - buildInputs = [ - guile - ]; - - propagatedBuildInputs = [ - libssh - ]; - - enableParallelBuilding = true; - - # FAIL: server-client.scm - doCheck = !stdenv.isDarwin; - - postInstall = '' - mv $out/bin/*.scm $out/share/guile-ssh - rmdir $out/bin - ''; - - meta = with lib; { - description = "Bindings to Libssh for GNU Guile"; - homepage = "https://github.com/artyom-poptsov/guile-ssh"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ethancedwards8 foo-dogsquared ]; - platforms = guile.meta.platforms; - }; -}) diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix deleted file mode 100644 index 2102e395d0b3..000000000000 --- a/pkgs/development/guile-modules/guile-xcb/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, guile -, pkg-config -, texinfo -}: - -stdenv.mkDerivation rec { - pname = "guile-xcb"; - version = "unstable-2017-05-29"; - - src = fetchFromGitHub { - owner = "mwitmer"; - repo = pname; - rev = "db7d5a393cc37a56f66541b3f33938b40c6f35b3"; - hash = "sha256-zbIsEIPwNJ1YXMZTDw2DfzufC+IZWfcWgZHbuv7bhJs="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - buildInputs = [ - guile - texinfo - ]; - - configureFlags = [ - "--with-guile-site-dir=$(out)/${guile.siteDir}" - "--with-guile-site-ccache-dir=$(out)/${guile.siteCcacheDir}" - ]; - - makeFlags = [ - "GUILE_AUTO_COMPILE=0" - ]; - - meta = with lib; { - homepage = "https://github.com/mwitmer/guile-xcb"; - description = "XCB bindings for Guile"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ vyp ]; - platforms = guile.meta.platforms; - }; -} diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 55894a0ea2a9..3e925417d644 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2024-05-20"; + version = "unstable-2024-10-17"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/79b73778680e2ae27302dce430beee302299f496.tar.gz"; - sha256 = "0xjrnf9x1f4jl4bsxc6kv5q7rsbn3vs0ddidj9qf6mzzzqxq14p3"; + url = "https://github.com/NixOS/cabal2nix/archive/b8eb82f8bc907b42dfb463cab62e49fbe2fff997.tar.gz"; + sha256 = "1fxqigr002ssgz1l62rc7k04q4q0hwcl2wqy7l2shylxqf7yfcd6"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 00b300a664d6..20fd8fa23035 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -22,20 +22,16 @@ self: super: { # enable list-transformer, jailbreaking is necessary until next release >0.13.0: https://github.com/ivanperez-keera/dunai/issues/427 dunai = doJailbreak (addBuildDepend self.list-transformer (enableCabalFlag "list-transformer" super.dunai)); - # Make sure that Cabal 3.10.* can be built as-is - Cabal_3_10_3_0 = doDistribute (super.Cabal_3_10_3_0.override ({ + # Make sure that Cabal_* can be built as-is + Cabal_3_10_3_0 = doDistribute (super.Cabal_3_10_3_0.override { Cabal-syntax = self.Cabal-syntax_3_10_3_0; - } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { - # Use process core package when possible - process = self.process_1_6_22_0; - })); - - Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override ({ + }); + 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_22_0; - })); + }); + Cabal_3_14_0_0 = doDistribute (super.Cabal_3_14_0_0.override { + Cabal-syntax = self.Cabal-syntax_3_14_0_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 @@ -106,20 +102,33 @@ self: super: { ####################################### # 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 - # its Setup.hs, and therefor declares a Cabal dependency, but does - # not actually use it as a build dependency. - # That means ghc-paths can just use the ghc included Cabal version, - # without causing package-db incoherence and we should do that because - # 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; }; - }))); + haskell-language-server = + lib.pipe + (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 + # its Setup.hs, and therefor declares a Cabal dependency, but does + # not actually use it as a build dependency. + # That means ghc-paths can just use the ghc included Cabal version, + # without causing package-db incoherence and we should do that because + # 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; }; + })) + [ + doJailbreak + dontCheck + ]; + hls-plugin-api = doJailbreak super.hls-plugin-api; - ghcide = doJailbreak super.ghcide; + ghcide = doJailbreak (appendPatch (pkgs.fetchpatch { + name = "ghcide-ghc-9.8.3.patch"; + url = "https://github.com/haskell/haskell-language-server/commit/6d0a6f220226fe6c1cb5b6533177deb55e755b0b.patch"; + sha256 = "1jwxldar9qzkg2z6vsx8f2yih3vkf4yjk9p3mryv0azn929qn3h1"; + stripLen = 1; + excludes = [ "cabal.project" ]; + }) 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); @@ -366,15 +375,6 @@ self: super: { ] super.threadscope); - # http2 also overridden in all-packages.nix for mailctl. - # twain is currently only used by mailctl, so the .overrideScope shouldn't - # negatively affect any other packages, at least currently... - # https://github.com/alexmingoia/twain/issues/5 - twain = super.twain.overrideScope (self: _: { - http2 = self.http2_3_0_3; - warp = self.warp_3_3_30; - }); - # The latest release on hackage has an upper bound on containers which # breaks the build, though it works with the version of containers present # and the upper bound doesn't exist in code anymore: @@ -394,7 +394,7 @@ self: super: { numerals-base = dontCheck (doJailbreak super.numerals-base); # This test keeps being aborted because it runs too quietly for too long - Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; + Lazy-Pbkdf2 = if pkgs.stdenv.hostPlatform.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; # check requires mysql server mysql-simple = dontCheck super.mysql-simple; @@ -411,7 +411,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 = "0j037sis64gnrll7ajg48cvzzvxqsrhj7vnhiwcqv8wbmbfv0avn"; + sha256 = "sha256-hPZTcl3kWeUnSVYOE1W+FDwR3LYg6gaJfEBIY6VSfxY="; # 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 @@ -461,31 +461,33 @@ self: super: { # Manually maintained cachix-api = overrideCabal (drv: { - version = "1.7.4"; + version = "1.7.5"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.7.4"; - sha256 = "sha256-lHy5kgx6J8uD+16SO47dPrbob98sh+W1tf4ceSqPVK4="; + rev = "v1.7.5"; + sha256 = "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs="; }; postUnpack = "sourceRoot=$sourceRoot/cachix-api"; }) super.cachix-api; cachix = (overrideCabal (drv: { - version = "1.7.4"; + version = "1.7.5"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.7.4"; - sha256 = "sha256-lHy5kgx6J8uD+16SO47dPrbob98sh+W1tf4ceSqPVK4="; + rev = "v1.7.5"; + sha256 = "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs="; }; postUnpack = "sourceRoot=$sourceRoot/cachix"; }) (lib.pipe (super.cachix.override { nix = self.hercules-ci-cnix-store.nixPackage; + hnix-store-core = self.hnix-store-core_0_8_0_0; }) [ (addBuildTool self.hercules-ci-cnix-store.nixPackage) (addBuildTool pkgs.buildPackages.pkg-config) + (addBuildDepend self.hnix-store-nar) ] )); @@ -600,6 +602,10 @@ self: super: { # Too strict bounds on algebraic-graphs # https://github.com/haskell-nix/hnix-store/issues/180 hnix-store-core_0_6_1_0 = doJailbreak super.hnix-store-core_0_6_1_0; + + # 2024-09-27: dependent-sum-template pinned to 0.1.1.1, however 0.2.0.1+ required + hnix-store-core_0_8_0_0 = super.hnix-store-core_0_8_0_0.override { dependent-sum-template = self.dependent-sum-template_0_2_0_1; }; + # 2023-12-11: Needs older core hnix-store-remote = super.hnix-store-remote.override { hnix-store-core = self.hnix-store-core_0_6_1_0; }; @@ -718,7 +724,6 @@ self: super: { nats-queue = dontCheck super.nats-queue; netpbm = dontCheck super.netpbm; network = dontCheck super.network; - network_2_6_3_1 = dontCheck super.network_2_6_3_1; # package is missing files for test network-dbus = dontCheck super.network-dbus; notcpp = dontCheck super.notcpp; ntp-control = dontCheck super.ntp-control; @@ -908,12 +913,12 @@ self: super: { Cabal-ide-backend = dontCheck super.Cabal-ide-backend; # This package can't be built on non-Windows systems. - Win32 = overrideCabal (drv: { broken = !pkgs.stdenv.isCygwin; }) super.Win32; + Win32 = overrideCabal (drv: { broken = !pkgs.stdenv.hostPlatform.isCygwin; }) super.Win32; inline-c-win32 = dontDistribute super.inline-c-win32; Southpaw = dontDistribute super.Southpaw; # https://ghc.haskell.org/trac/ghc/ticket/9825 - vimus = overrideCabal (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; }) super.vimus; + vimus = overrideCabal (drv: { broken = pkgs.stdenv.hostPlatform.isLinux && pkgs.stdenv.hostPlatform.isi686; }) super.vimus; # https://github.com/kazu-yamamoto/logger/issues/42 logger = dontCheck super.logger; @@ -1264,7 +1269,6 @@ self: super: { stack = super.stack.overrideScope (lself: lsuper: { # stack-3.1.1 requires the latest versions of these libraries - pantry = lself.pantry_0_10_0; tar = lself.tar_0_6_3_0; # Upstream stack-3.1.1 is compiled with hpack-0.37.0, and we make sure to @@ -1805,10 +1809,6 @@ self: super: { # tests seem to require a different version of hspec-core hspec-contrib = dontCheck super.hspec-contrib; - # github.com/ucsd-progsys/liquidhaskell/issues/1729 - liquidhaskell-boot = super.liquidhaskell-boot.override { Diff = self.Diff_0_3_4; }; - Diff_0_3_4 = dontCheck super.Diff_0_3_4; - # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox. domain-auth = dontCheck super.domain-auth; @@ -1859,6 +1859,12 @@ self: super: { # 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; + # 2024-09-18: transformers <0.5 https://github.com/reflex-frp/reflex-gloss/issues/6 + reflex-gloss = assert super.reflex-gloss.version == "0.2"; doJailbreak super.reflex-gloss; + + # 2024-09-18: primitive <0.8 https://gitlab.com/Kritzefitz/reflex-gi-gtk/-/merge_requests/20 + reflex-gi-gtk = assert super.reflex-gi-gtk.version == "0.2.0.1"; doJailbreak super.reflex-gi-gtk; + # Due to tests restricting base in 0.8.0.0 release http-media = doJailbreak super.http-media; @@ -1908,9 +1914,8 @@ self: super: { sha256 = "sha256-kFV6CcwKdMq+qSgyc+eIApnaycq5A++pEEVr2A9xvts="; }) super.pipes-aeson; - # Needs bytestring 0.11 - # https://github.com/Gabriella439/Haskell-Pipes-HTTP-Library/pull/17 - pipes-http = doJailbreak super.pipes-http; + # 2024-09-18: transformers <0.6 https://github.com/Gabriella439/Haskell-Pipes-Extras-Library/pull/19 + pipes-extras = assert super.pipes-extras.version == "1.0.15"; doJailbreak super.pipes-extras; moto-postgresql = appendPatches [ # https://gitlab.com/k0001/moto/-/merge_requests/3 @@ -2052,7 +2057,7 @@ self: super: { # Requests latest versions of crypton-connection and tls darcs = super.darcs.overrideScope (self: super: { - crypton-connection = self.crypton-connection_0_4_1; + crypton-connection = self.crypton-connection_0_4_2; tls = self.tls_2_0_6; }); @@ -2103,12 +2108,6 @@ self: super: { # https://github.com/serokell/haskell-crypto/issues/25 crypto-sodium = dontCheck super.crypto-sodium; - taskell = super.taskell.override { - # Does not support brick >= 1.0 - # https://github.com/smallhadroncollider/taskell/issues/125 - brick = self.brick_0_70_1; - }; - # Polyfill for GHCs from the integer-simple days that don't bundle ghc-bignum ghc-bignum = super.ghc-bignum or self.mkDerivation { pname = "ghc-bignum"; @@ -2214,17 +2213,6 @@ self: super: { revision = null; } super.llvm-hs-pure); - # * Fix build failure by picking patch from 8.5, we need - # this version of sbv for petrinizer - # * Pin version of crackNum that still exposes its library - sbv_7_13 = appendPatch (fetchpatch { - url = "https://github.com/LeventErkok/sbv/commit/57014b9c7c67dd9b63619a996e2c66e32c33c958.patch"; - sha256 = "10npa8nh2413n6p6qld795qfkbld08icm02bspmk93y0kabpgmgm"; - }) - (super.sbv_7_13.override { - crackNum = self.crackNum_2_4; - }); - # Too strict bounds on dimensional # https://github.com/enomsg/science-constants-dimensional/pull/1 science-constants-dimensional = doJailbreak super.science-constants-dimensional; @@ -2233,17 +2221,23 @@ self: super: { # https://github.com/merijn/paramtree/issues/4 paramtree = dontCheck super.paramtree; - # Too strict version bounds on haskell-gi - # https://github.com/owickstrom/gi-gtk-declarative/issues/100 - gi-gtk-declarative = doJailbreak super.gi-gtk-declarative; + # 2024-09-18: Make compatible with haskell-gi 0.26.10 + # https://github.com/owickstrom/gi-gtk-declarative/pull/118 + gi-gtk-declarative = overrideCabal (drv: assert drv.version == "0.7.1"; { + jailbreak = true; + postPatch = '' + sed -i '1 i {-# LANGUAGE FlexibleContexts #-}' \ + src/GI/Gtk/Declarative/Widget/Conversions.hs + ''; + }) super.gi-gtk-declarative; gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple; 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_8; - gi-gdk_4_0_8 = doDistribute super.gi-gdk_4_0_8; + gi-gdk_4 = self.gi-gdk_4_0_9; + gi-gdk_4_0_9 = doDistribute super.gi-gdk_4_0_9; # GSK is only used for GTK 4. gi-gsk = super.gi-gsk.override { gi-gdk = self.gi-gdk_4; @@ -2273,44 +2267,6 @@ self: super: { # Too strict bound on hspec (<2.11) utf8-light = doJailbreak super.utf8-light; - large-hashable = lib.pipe (super.large-hashable.override { - # https://github.com/factisresearch/large-hashable/commit/5ec9d2c7233fc4445303564047c992b693e1155c - utf8-light = null; - }) [ - # 2022-03-21: use version from git which supports GHC 9.{0,2} and aeson 2.0 - (assert super.large-hashable.version == "0.1.0.4"; overrideSrc { - version = "unstable-2022-06-10"; - src = pkgs.fetchFromGitHub { - owner = "factisresearch"; - repo = "large-hashable"; - rev = "4d149c828c185bcf05556d1660f79ff1aec7eaa1"; - sha256 = "141349qcw3m93jw95jcha9rsg2y8sn5ca5j59cv8xmci38k2nam0"; - }; - }) - # Provide newly added dependencies - (overrideCabal (drv: { - libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [ - self.cryptonite - self.memory - ]; - testHaskellDepends = drv.testHaskellDepends or [] ++ [ - self.inspection-testing - ]; - })) - # https://github.com/factisresearch/large-hashable/issues/24 - (overrideCabal (drv: { - testFlags = drv.testFlags or [] ++ [ - "-n" "^Data.LargeHashable.Tests.Inspection:genericSumGetsOptimized$" - ]; - })) - # https://github.com/factisresearch/large-hashable/issues/25 - # Currently broken with text >= 2.0 - (overrideCabal (lib.optionalAttrs (lib.versionAtLeast self.ghc.version "9.4") { - broken = true; - hydraPlatforms = []; - })) - ]; - # BSON defaults to requiring network instead of network-bsd which is # required nowadays: https://github.com/mongodb-haskell/bson/issues/26 bson = appendConfigureFlag "-f-_old_network" (super.bson.override { @@ -2525,9 +2481,12 @@ self: super: { # 2024-03-02: base <=4.18.0.0 https://github.com/srid/url-slug/pull/2 url-slug = doJailbreak super.url-slug; - glirc = doJailbreak (super.glirc.override { - vty = self.vty_5_35_1; - }); + glirc = super.glirc.override { + vty = self.vty_6_2; + vty-unix = super.vty-unix.override { + vty = self.vty_6_2; + }; + }; # Too strict bounds on text and tls # https://github.com/barrucadu/irc-conduit/issues/54 @@ -2833,18 +2792,32 @@ self: super: { 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 ]) - # 2022-12-02: Too strict bounds: https://github.com/PostgREST/postgrest/issues/2580 + # 2022-12-02: Too strict bounds. doJailbreak # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275 (overrideSrc rec { - version = "12.0.2"; + version = "12.0.3"; src = pkgs.fetchFromGitHub { owner = "PostgREST"; repo = "postgrest"; rev = "v${version}"; - hash = "sha256-fpGeL8R6hziEtIgHUMfWLF7JAjo3FDYQw3xPSeQH+to="; + hash = "sha256-peXM5/K034Phcy5vNhc5AT3/9oGXohVogFN9gRsSosY="; }; }) + # 2024-11-03: Needed for the patch below. Can be dropped after updating to 12.2+. + (appendPatches [ + (fetchpatch { + url = "https://github.com/PostgREST/postgrest/commit/d311fb17c46ad2ab9064c7aba1954d3500ef0e54.patch"; + hash = "sha256-O/bBm93V6GIPSB5dwhNUFgX3vXA01LPJapZQoeJmbIU="; + }) + ]) + # 2024-11-03: Fixes build on aarch64-darwin. Can be removed after updating to 13+. + (appendPatches [ + (fetchpatch { + url = "https://github.com/PostgREST/postgrest/commit/c045b261c4f7d2c2514e858120950be6b3ddfba8.patch"; + hash = "sha256-6SeteL5sb+/K1y3f9XL7yNzXDdD1KQp91RNP4kutSLE="; + }) + ]) ]; # Too strict bounds on hspec < 2.11 @@ -2924,7 +2897,7 @@ self: super: { }) super.kmonad; 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; + ghc-lib-parser = self.ghc-lib-parser_9_10_1_20241103; }); # 2024-03-17: broken @@ -2936,13 +2909,6 @@ self: super: { hash = "sha256-zugyUpEq/iVkxghrvguL95+lJDEpE8MLvZivken0p24="; }) super.nix-serve-ng; - # Needs a matching version of ipython-kernel and a - # ghc-syntax-highlighter compatible with a newer ghc-lib-parser it - # transitively pulls in - ihaskell = super.ihaskell.overrideScope (self: super: { - ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0; - }); - # 2024-01-24: support optparse-applicative 0.18 niv = appendPatches [ (fetchpatch { @@ -3025,7 +2991,7 @@ self: super: { cornelis = dontCheck super.cornelis; lzma = doJailbreak (super.lzma.overrideScope (self: super: { - tasty = super.tasty_1_5; + tasty = super.tasty_1_5_2; })); # Fixes build on some platforms: https://github.com/obsidiansystems/commutative-semigroups/pull/18 diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 3159f3b31536..1c432ce3c937 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -300,6 +300,13 @@ self: super: ({ __darwinAllowLocalNetworking = true; }); + # network requires `IP_RECVTOS`, which was added in 10.15. + network = + if lib.versionOlder (lib.getVersion pkgs.apple-sdk) "10.15" then + addBuildDepend pkgs.apple-sdk_10_15 super.network + else + super.network; + foldl = overrideCabal (drv: { postPatch = '' # This comment has been inserted, so the derivation hash changes, forcing @@ -324,6 +331,10 @@ self: super: ({ # Tests fail on macOS https://github.com/mrkkrp/zip/issues/112 zip = dontCheck super.zip; + snap = super.snap.overrideAttrs (drv: { + __darwinAllowLocalNetworking = true; + }); + warp = super.warp.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; }); @@ -356,7 +367,7 @@ self: super: ({ ''; }) super.di-core; -} // lib.optionalAttrs pkgs.stdenv.isAarch64 { # aarch64-darwin +} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 { # aarch64-darwin # Workarounds for justStaticExecutables on aarch64-darwin. Since dead code # elimination barely works on aarch64-darwin, any package that has a @@ -426,7 +437,7 @@ self: super: ({ rivet-adaptor-postgresql = dontCheck super.rivet-adaptor-postgresql; tmp-proc-postgres = dontCheck super.tmp-proc-postgres; -} // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin +} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isx86_64 { # x86_64-darwin # tests appear to be failing to link or something: # https://hydra.nixos.org/build/174540882/nixlog/9 diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 4272012f27a3..6fd85c971e23 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -86,10 +86,6 @@ self: super: { # cabal2spec needs a recent version of Cabal cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; }); - # https://github.com/pikajude/stylish-cabal/issues/12 - stylish-cabal = doDistribute (markUnbroken (super.stylish-cabal.override { haddock-library = self.haddock-library_1_7_0; })); - haddock-library_1_7_0 = dontCheck super.haddock-library_1_7_0; - # ghc versions prior to 8.8.x needs additional dependency to compile successfully. ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser super.ghc-lib-parser-ex; @@ -99,8 +95,6 @@ self: super: { # vector 0.12.2 indroduced doctest checks that don’t work on older compilers vector = dontCheck super.vector; - mmorph = super.mmorph_1_1_3; - # https://github.com/haskellari/time-compat/issues/23 time-compat = dontCheck super.time-compat; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index 972cbc4c7e03..848d753b73b5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -61,30 +61,31 @@ self: super: { # Upgrade to accommodate new core library versions, where the authors have # already made the relevant changes. aeson = doDistribute self.aeson_2_2_3_0; - apply-refact = doDistribute self.apply-refact_0_14_0_0; attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0; - auto-update = super.auto-update_0_2_1; + auto-update = super.auto-update_0_2_2; + dependent-sum-template = doJailbreak self.dependent-sum-template_0_2_0_1; # template-haskell < 2.22 extensions = doDistribute self.extensions_0_1_0_2; fourmolu = doDistribute self.fourmolu_0_16_2_0; hashable = doDistribute self.hashable_1_4_7_0; integer-conversion = doDistribute self.integer-conversion_0_1_1; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_10_1_20240511; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_10_1_20241103; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_10_0_0; - http2 = super.http2_5_3_4; + http2 = self.http2_5_3_5; lens = doDistribute self.lens_5_3_2; lukko = doDistribute self.lukko_0_1_2; network-control = super.network-control_0_1_3; network-run = super.network-run_0_4_0; ormolu = doDistribute self.ormolu_0_7_7_0; primitive = doDistribute (dontCheck self.primitive_0_9_0_0); # tests introduce a recursive dependency via hspec - quickcheck-instances = doDistribute self.quickcheck-instances_0_3_31; + quickcheck-instances = doDistribute self.quickcheck-instances_0_3_32; rebase = doDistribute self.rebase_1_21_1; rerebase = doDistribute self.rerebase_1_21_1; scientific = doDistribute self.scientific_0_3_8_0; semirings = doDistribute self.semirings_0_7; - time-manager = super.time-manager_0_1_0; + time-manager = super.time-manager_0_1_1; th-abstraction = doDistribute self.th-abstraction_0_7_0_0; uuid-types = doDistribute self.uuid-types_1_0_6; + warp = pkgs.haskell.lib.dontCheck super.warp_3_4_4; # test suite assumes it can freely call curl # A given major version of ghc-exactprint only supports one version of GHC. ghc-exactprint = doDistribute self.ghc-exactprint_1_9_0_0; @@ -112,12 +113,11 @@ self: super: { bitvec = doJailbreak super.bitvec; # primitive <0.9 - apply-refact_0_14_0_0 = doJailbreak super.apply-refact_0_14_0_0; # ghc-exactprint <1.9 - retrie = doJailbreak super.retrie; # base <4.20, ghc<9.9, ghc-exactprint<1.9 - hashable_1_4_7_0 = doJailbreak super.hashable_1_4_7_0; # relax bounds for QuickCheck, tasty, and tasty-quickcheck hashable_1_5_0_0 = doJailbreak super.hashable_1_5_0_0; # relax bounds for QuickCheck, tasty, and tasty-quickcheck + broadcast-chan = doJailbreak super.broadcast-chan; # base <4.19 https://github.com/merijn/broadcast-chan/pull/19 + # # Test suite issues # @@ -128,7 +128,6 @@ self: super: { primitive-unlifted = dontCheck super.primitive-unlifted; # doesn't compile with primitive ==0.9.* bsb-http-chunked = pkgs.haskell.lib.dontCheck super.bsb-http-chunked; # https://github.com/sjakobi/bsb-http-chunked/issues/45 hinotify = pkgs.haskell.lib.dontCheck super.hinotify; # https://github.com/kolmodin/hinotify/issues/38 - warp = pkgs.haskell.lib.dontCheck super.warp_3_4_1; # test suite assumes it can freely call curl haskell-language-server = disableCabalFlag "retrie" (disableCabalFlag "hlint" (disableCabalFlag "stylishhaskel" (super.haskell-language-server.override {stylish-haskell = null;retrie = null;apply-refact=null;hlint = null;}))); 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 7e89ea668e02..b748fae413da 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -4,7 +4,7 @@ with haskellLib; let inherit (pkgs.stdenv.hostPlatform) isDarwin; - + inherit (pkgs) lib; in self: super: { @@ -54,14 +54,15 @@ self: super: { # Version upgrades # th-abstraction = doDistribute self.th-abstraction_0_7_0_0; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_2_20240223; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_3_20241103; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2; - ghc-lib = doDistribute self.ghc-lib_9_8_2_20240223; + ghc-lib = doDistribute self.ghc-lib_9_8_3_20241103; megaparsec = doDistribute self.megaparsec_9_6_1; # 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; + dependent-sum-template = self.dependent-sum-template_0_2_0_1; # template-haskell < 2.22 xmonad = doDistribute self.xmonad_0_18_0; apply-refact = self.apply-refact_0_14_0_0; ormolu = self.ormolu_0_7_4_0; @@ -94,7 +95,6 @@ self: super: { # blaze-svg = doJailbreak super.blaze-svg; # base <4.19 commutative-semigroups = doJailbreak super.commutative-semigroups; # base < 4.19 - dependent-sum-template = doJailbreak super.dependent-sum-template_0_2_0_1; # template-haskell < 2.21 diagrams-lib = doJailbreak super.diagrams-lib; # base <4.19, text <2.1 diagrams-postscript = doJailbreak super.diagrams-postscript; # base <4.19, bytestring <0.12 diagrams-svg = doJailbreak super.diagrams-svg; # base <4.19, text <2.1 @@ -118,6 +118,7 @@ self: super: { string-random = doJailbreak super.string-random; # text >=1.2.2.1 && <2.1 inflections = doJailbreak super.inflections; # text >=0.2 && <2.1 universe-some = doJailbreak super.universe-some; # th-abstraction < 0.7 + broadcast-chan = doJailbreak super.broadcast-chan; # base <4.19 https://github.com/merijn/broadcast-chan/pull/19 # # Test suite issues @@ -134,15 +135,9 @@ self: super: { # 2023-12-23: It needs this to build under ghc-9.6.3. # A factor of 100 is insufficent, 200 seems seems to work. hip = appendConfigureFlag "--ghc-options=-fsimpl-tick-factor=200" super.hip; - - # Loosen bounds - patch = appendPatch (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/patch/commit/91fed138483a7bf2b098d45b9e5cc36191776320.patch"; - sha256 = "sha256-/KLfIshia88lU5G/hA7ild7+a2mqc7qgSa9AEBqEqkQ="; - }) super.patch; - reflex = appendPatch (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/reflex/commit/0ac53ca3eab2649dd3f3edc585e10af8d13b28cd.patch"; - sha256 = "sha256-umjwgdSKebJdRrXjwHhsi8HBqotx1vFibY9ttLkyT/0="; - }) super.reflex; - +} +// lib.optionalAttrs (lib.versionAtLeast super.ghc.version "9.8.3") { + # Breakage related to GHC 9.8.3 / deepseq 1.5.1.0 + # https://github.com/typeable/generic-arbitrary/issues/18 + generic-arbitrary = dontCheck super.generic-arbitrary; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index f354cf1433f8..a34c5110db85 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -84,6 +84,7 @@ broken-packages: - aeson-flat # failure in job https://hydra.nixos.org/build/233220787 at 2023-09-02 - aeson-flatten # failure in job https://hydra.nixos.org/build/233242954 at 2023-09-02 - aeson-flowtyped # failure in job https://hydra.nixos.org/build/233245878 at 2023-09-02 + - aeson-generic-default # failure in job https://hydra.nixos.org/build/276370826 at 2024-11-06 - aeson-generics-typescript # failure in job https://hydra.nixos.org/build/245703304 at 2024-01-07 - aeson-injector # failure in job https://hydra.nixos.org/build/233200351 at 2023-09-02 - aeson-json-ast # failure in job https://hydra.nixos.org/build/233249406 at 2023-09-02 @@ -158,6 +159,7 @@ broken-packages: - amqp-conduit # failure in job https://hydra.nixos.org/build/233228080 at 2023-09-02 - amqp-worker # failure in job https://hydra.nixos.org/build/236675859 at 2023-10-04 - analyze # failure in job https://hydra.nixos.org/build/233251441 at 2023-09-02 + - anansi # failure in job https://hydra.nixos.org/build/273451545 at 2024-10-01 - anansi-pandoc # failure in job https://hydra.nixos.org/build/233252389 at 2023-09-02 - android-activity # failure in job https://hydra.nixos.org/build/233203400 at 2023-09-02 - android # failure in job https://hydra.nixos.org/build/233222148 at 2023-09-02 @@ -611,6 +613,7 @@ broken-packages: - cabal2ebuild # failure in job https://hydra.nixos.org/build/233221248 at 2023-09-02 - cabal2ghci # failure in job https://hydra.nixos.org/build/233233018 at 2023-09-02 - cabal2json # failure in job https://hydra.nixos.org/build/233196099 at 2023-09-02 + - cabal-add # failure in job https://hydra.nixos.org/build/273461296 at 2024-10-01 - cabal-audit # failure in job https://hydra.nixos.org/build/233193414 at 2023-09-02 - cabal-auto-expose # failure in job https://hydra.nixos.org/build/233195440 at 2023-09-02 - cabal-build-programs # failure in job https://hydra.nixos.org/build/257091363 at 2024-04-27 @@ -799,7 +802,13 @@ broken-packages: - clanki # failure in job https://hydra.nixos.org/build/233196970 at 2023-09-02 - clarifai # failure in job https://hydra.nixos.org/build/233229480 at 2023-09-02 - CLASE # failure in job https://hydra.nixos.org/build/233234459 at 2023-09-02 + - clashilator # failure in job https://hydra.nixos.org/build/273442437 at 2024-10-01 + - clash-multisignal # failure in job https://hydra.nixos.org/build/273463331 at 2024-10-01 + - clash-prelude-quickcheck # failure in job https://hydra.nixos.org/build/273453747 at 2024-10-01 - Clash-Royale-Hack-Cheats # failure in job https://hydra.nixos.org/build/233216034 at 2023-09-02 + - clash-systemverilog # failure in job https://hydra.nixos.org/build/273453889 at 2024-10-01 + - clash-verilog # failure in job https://hydra.nixos.org/build/273466517 at 2024-10-01 + - clash-vhdl # failure in job https://hydra.nixos.org/build/273460098 at 2024-10-01 - ClasshSS # failure in job https://hydra.nixos.org/build/255688076 at 2024-04-16 - ClassLaws # failure in job https://hydra.nixos.org/build/233243019 at 2023-09-02 - classy-effects-base # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237233636 at 2023-10-21 @@ -1216,7 +1225,6 @@ broken-packages: - dead-code-detection # failure in job https://hydra.nixos.org/build/233205957 at 2023-09-02 - Deadpan-DDP # failure in job https://hydra.nixos.org/build/233221990 at 2023-09-02 - dead-simple-json # failure in job https://hydra.nixos.org/build/233204301 at 2023-09-02 - - dear-imgui # failure in job https://hydra.nixos.org/build/233238246 at 2023-09-02 - debugger-hs # failure in job https://hydra.nixos.org/build/233206302 at 2023-09-02 - debug-me # failure in job https://hydra.nixos.org/build/233213991 at 2023-09-02 - debug-trace-file # failure in job https://hydra.nixos.org/build/233231840 at 2023-09-02 @@ -1327,6 +1335,7 @@ broken-packages: - directory-ospath-streaming # failure in job https://hydra.nixos.org/build/233240003 at 2023-09-02 - direct-plugins # failure in job https://hydra.nixos.org/build/233211547 at 2023-09-02 - direm # failure in job https://hydra.nixos.org/build/233211496 at 2023-09-02 + - dirstream # failure in job https://hydra.nixos.org/build/273442606 at 2024-10-01 - disco # failure in job https://hydra.nixos.org/build/233212298 at 2023-09-02 - discordian-calendar # failure in job https://hydra.nixos.org/build/233218124 at 2023-09-02 - discord-types # failure in job https://hydra.nixos.org/build/233251778 at 2023-09-02 @@ -1835,6 +1844,7 @@ broken-packages: - fraxl # failure in job https://hydra.nixos.org/build/233219345 at 2023-09-02 - freckle-kafka # failure in job https://hydra.nixos.org/build/269673466 at 2024-08-19 - freddy # failure in job https://hydra.nixos.org/build/233208999 at 2023-09-02 + - free-alacarte # failure in job https://hydra.nixos.org/build/275141793 at 2024-10-21 - 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 @@ -1929,7 +1939,6 @@ broken-packages: - gearhash # failure in job https://hydra.nixos.org/build/252728216 at 2024-03-16 - gelatin # failure in job https://hydra.nixos.org/build/233249394 at 2023-09-02 - gemcap # failure in job https://hydra.nixos.org/build/233202506 at 2023-09-02 - - gemini-server # failure in job https://hydra.nixos.org/build/252717988 at 2024-03-16 - gemmula-altera # failure in job https://hydra.nixos.org/build/252721416 at 2024-03-16 - gemstone # failure in job https://hydra.nixos.org/build/233202246 at 2023-09-02 - gender # failure in job https://hydra.nixos.org/build/233235712 at 2023-09-02 @@ -2044,7 +2053,6 @@ broken-packages: - gi-gio-hs-list-model # failure in job https://hydra.nixos.org/build/233241640 at 2023-09-02 - gi-gstapp # failure in job https://hydra.nixos.org/build/253686159 at 2024-03-31 - gi-gsttag # failure in job https://hydra.nixos.org/build/233197576 at 2023-09-02 - - gi-gtk-declarative # failure in job https://hydra.nixos.org/build/233217494 at 2023-09-02 - 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 @@ -2152,6 +2160,7 @@ broken-packages: - graph-matchings # failure in job https://hydra.nixos.org/build/233245821 at 2023-09-02 - graphmod-plugin # failure in job https://hydra.nixos.org/build/233192543 at 2023-09-02 - graphql-api # failure in job https://hydra.nixos.org/build/233254333 at 2023-09-02 + - graphql-spice # failure in job https://hydra.nixos.org/build/276376899 at 2024-11-06 - graphql-utils # failure in job https://hydra.nixos.org/build/233221340 at 2023-09-02 - graphql-w-persistent # failure in job https://hydra.nixos.org/build/233228956 at 2023-09-02 - graph-rewriting # failure in job https://hydra.nixos.org/build/233191278 at 2023-09-02 @@ -2312,6 +2321,7 @@ broken-packages: - HarmTrace-Base # failure in job https://hydra.nixos.org/build/233213843 at 2023-09-02 - haroonga # failure in job https://hydra.nixos.org/build/233226376 at 2023-09-02 - harp # failure in job https://hydra.nixos.org/build/252730015 at 2024-03-16 + - harpie # failure in job https://hydra.nixos.org/build/275138146 at 2024-10-21 - harpy # failure in job https://hydra.nixos.org/build/233225779 at 2023-09-02 - harvest-api # failure in job https://hydra.nixos.org/build/233213054 at 2023-09-02 - hasbolt-extras # failure in job https://hydra.nixos.org/build/233211734 at 2023-09-02 @@ -2789,6 +2799,7 @@ broken-packages: - hs2ps # failure in job https://hydra.nixos.org/build/233258362 at 2023-09-02 - hsakamai # failure in job https://hydra.nixos.org/build/252722933 at 2024-03-16 - hsaml2 # failure in job https://hydra.nixos.org/build/233252618 at 2023-09-02 + - hs-asapo # failure in job https://hydra.nixos.org/build/273456994 at 2024-10-01 - hsautogui # failure in job https://hydra.nixos.org/build/253687662 at 2024-03-31 - hsay # failure in job https://hydra.nixos.org/build/233218925 at 2023-09-02 - hsbc # failure in job https://hydra.nixos.org/build/233206310 at 2023-09-02 @@ -2900,6 +2911,7 @@ broken-packages: - hssqlppp # failure in job https://hydra.nixos.org/build/233216888 at 2023-09-02 - HsSVN # failure in job https://hydra.nixos.org/build/233213151 at 2023-09-02 - hs-tags # failure in job https://hydra.nixos.org/build/233258358 at 2023-09-02 + - hs-tango # failure in job https://hydra.nixos.org/build/276377558 at 2024-11-06 - hstatsd # failure in job https://hydra.nixos.org/build/233232363 at 2023-09-02 - hstats # failure in job https://hydra.nixos.org/build/233239963 at 2023-09-02 - hs-term-emulator # failure in job https://hydra.nixos.org/build/233252262 at 2023-09-02 @@ -3059,6 +3071,7 @@ broken-packages: - ieee-utils # failure in job https://hydra.nixos.org/build/233224430 at 2023-09-02 - iexcloud # failure in job https://hydra.nixos.org/build/233224874 at 2023-09-02 - ifcxt # failure in job https://hydra.nixos.org/build/233196911 at 2023-09-02 + - if-instance # failure in job https://hydra.nixos.org/build/276378643 at 2024-11-06 - IFS # failure in job https://hydra.nixos.org/build/233246865 at 2023-09-02 - ige # failure in job https://hydra.nixos.org/build/233224389 at 2023-09-02 - ig # failure in job https://hydra.nixos.org/build/233203872 at 2023-09-02 @@ -3176,7 +3189,6 @@ broken-packages: - ip-quoter # failure in job https://hydra.nixos.org/build/233234581 at 2023-09-02 - iptables-helpers # failure in job https://hydra.nixos.org/build/233198949 at 2023-09-02 - IPv6DB # failure in job https://hydra.nixos.org/build/233199983 at 2023-09-02 - - irc-core # failure in job https://hydra.nixos.org/build/233242138 at 2023-09-02 - irc-dcc # failure in job https://hydra.nixos.org/build/233230181 at 2023-09-02 - Irc # failure in job https://hydra.nixos.org/build/233230852 at 2023-09-02 - irc-fun-types # failure in job https://hydra.nixos.org/build/233255910 at 2023-09-02 @@ -3280,6 +3292,7 @@ broken-packages: - json-syntax # failure in job https://hydra.nixos.org/build/233250639 at 2023-09-02 - json-to-haskell # failure in job https://hydra.nixos.org/build/252711573 at 2024-03-16 - json-tools # failure in job https://hydra.nixos.org/build/233247019 at 2023-09-02 + - json-to-type # failure in job https://hydra.nixos.org/build/275143966 at 2024-10-21 - json-tracer # failure in job https://hydra.nixos.org/build/233196632 at 2023-09-02 - jsontsv # failure in job https://hydra.nixos.org/build/233234129 at 2023-09-02 - jsonxlsx # failure in job https://hydra.nixos.org/build/233201772 at 2023-09-02 @@ -3329,6 +3342,7 @@ broken-packages: - keenser # failure in job https://hydra.nixos.org/build/233200021 at 2023-09-02 - keera-hails-reactivevalues # failure in job https://hydra.nixos.org/build/233258391 at 2023-09-02 - keid-render-basic # failure in job https://hydra.nixos.org/build/233258215 at 2023-09-02 + - keid-ui-dearimgui # failure in job https://hydra.nixos.org/build/275828030 at 2024-10-21 - keiretsu # failure in job https://hydra.nixos.org/build/233195563 at 2023-09-02 - kempe # failure in job https://hydra.nixos.org/build/233221290 at 2023-09-02 - kesha # failure in job https://hydra.nixos.org/build/233215581 at 2023-09-02 @@ -3408,7 +3422,6 @@ broken-packages: - language-elm # failure in job https://hydra.nixos.org/build/233214012 at 2023-09-02 - language-fortran # failure in job https://hydra.nixos.org/build/233205480 at 2023-09-02 - language-gcl # failure in job https://hydra.nixos.org/build/233218957 at 2023-09-02 - - language-gemini # failure in job https://hydra.nixos.org/build/233211812 at 2023-09-02 - language-go # failure in job https://hydra.nixos.org/build/233194866 at 2023-09-02 - language-guess # failure in job https://hydra.nixos.org/build/233257420 at 2023-09-02 - language-hcl # failure in job https://hydra.nixos.org/build/233212998 at 2023-09-02 @@ -3798,6 +3811,7 @@ broken-packages: - microbase # failure in job https://hydra.nixos.org/build/233204368 at 2023-09-02 - microformats2-parser # failure in job https://hydra.nixos.org/build/233238485 at 2023-09-02 - microgroove # failure in job https://hydra.nixos.org/build/233196933 at 2023-09-02 + - MicroHs # failure in job https://hydra.nixos.org/build/276379260 at 2024-11-06 - microlens-each # failure in job https://hydra.nixos.org/build/233253621 at 2023-09-02 - microlens-process # failure in job https://hydra.nixos.org/build/233190805 at 2023-09-02 - microlens-pro # failure in job https://hydra.nixos.org/build/252733422 at 2024-03-16 @@ -3821,6 +3835,7 @@ broken-packages: - minicurl # failure in job https://hydra.nixos.org/build/252710787 at 2024-03-16 - miniforth # failure in job https://hydra.nixos.org/build/233220853 at 2023-09-02 - minilens # failure in job https://hydra.nixos.org/build/233191347 at 2023-09-02 + - minion-openapi3 # failure in job https://hydra.nixos.org/build/275140771 at 2024-10-21 - minions # failure in job https://hydra.nixos.org/build/233246840 at 2023-09-02 - miniplex # failure in job https://hydra.nixos.org/build/233241976 at 2023-09-02 - ministg # failure in job https://hydra.nixos.org/build/233214109 at 2023-09-02 @@ -3848,6 +3863,7 @@ broken-packages: - mmzk-typeid # failure in job https://hydra.nixos.org/build/233258612 at 2023-09-02 - Mobile-Legends-Hack-Cheats # failure in job https://hydra.nixos.org/build/233194849 at 2023-09-02 - mockazo # failure in job https://hydra.nixos.org/build/233234923 at 2023-09-02 + - mockcat # failure in job https://hydra.nixos.org/build/275146693 at 2024-10-21 - mock-httpd # failure in job https://hydra.nixos.org/build/233191481 at 2023-09-02 - mock-time # failure in job https://hydra.nixos.org/build/252737870 at 2024-03-16 - modbus-tcp # failure in job https://hydra.nixos.org/build/233230661 at 2023-09-02 @@ -4216,6 +4232,7 @@ broken-packages: - 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 - old-version # failure in job https://hydra.nixos.org/build/233198538 at 2023-09-02 + - ollama-haskell # failure in job https://hydra.nixos.org/build/276371507 at 2024-11-06 - om-actor # failure in job https://hydra.nixos.org/build/233231027 at 2023-09-02 - omaketex # failure in job https://hydra.nixos.org/build/233202599 at 2023-09-02 - ombra # failure in job https://hydra.nixos.org/build/233192387 at 2023-09-02 @@ -4429,6 +4446,7 @@ broken-packages: - partial-records # failure in job https://hydra.nixos.org/build/233205143 at 2023-09-02 - partial-semigroup-hedgehog # failure in job https://hydra.nixos.org/build/252731350 at 2024-03-16 - partly # failure in job https://hydra.nixos.org/build/233229003 at 2023-09-02 + - paseto # failure in job https://hydra.nixos.org/build/275145626 at 2024-10-21 - passage # failure in job https://hydra.nixos.org/build/233192945 at 2023-09-02 - passman-core # failure in job https://hydra.nixos.org/build/233217997 at 2023-09-02 - passman # failure in job https://hydra.nixos.org/build/233234939 at 2023-09-02 @@ -4517,16 +4535,19 @@ broken-packages: - phasechange # failure in job https://hydra.nixos.org/build/233254293 at 2023-09-02 - phaser # failure in job https://hydra.nixos.org/build/233250604 at 2023-09-02 - phkdf # failure in job https://hydra.nixos.org/build/255669790 at 2024-04-16 + - phladiprelio-general-datatype # failure in job https://hydra.nixos.org/build/275139962 at 2024-10-21 - phoityne # failure in job https://hydra.nixos.org/build/233195238 at 2023-09-02 - phoityne-vscode # failure in job https://hydra.nixos.org/build/233190938 at 2023-09-02 - phone-metadata # failure in job https://hydra.nixos.org/build/233256096 at 2023-09-02 - phone-numbers # failure in job https://hydra.nixos.org/build/233217584 at 2023-09-02 - phone-push # failure in job https://hydra.nixos.org/build/233246934 at 2023-09-02 - phonetic-languages-constaints # failure in job https://hydra.nixos.org/build/233232580 at 2023-09-02 + - phonetic-languages-phonetics-basics # failure in job https://hydra.nixos.org/build/275143090 at 2024-10-21 - phonetic-languages-simplified-generalized-examples-array # failure in job https://hydra.nixos.org/build/233245242 at 2023-09-02 - phonetic-languages-simplified-generalized-properties-array # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237248983 at 2023-10-21 - phonetic-languages-simplified-properties-array # failure in job https://hydra.nixos.org/build/233195530 at 2023-09-02 - phonetic-languages-simplified-properties-array-old # failure in job https://hydra.nixos.org/build/233258258 at 2023-09-02 + - phonetic-languages-ukrainian-array # failure in job https://hydra.nixos.org/build/275138098 at 2024-10-21 - phonetic-languages-vector # failure in job https://hydra.nixos.org/build/233258156 at 2023-09-02 - photoname # failure in job https://hydra.nixos.org/build/252736965 at 2024-03-16 - phraskell # failure in job https://hydra.nixos.org/build/233202906 at 2023-09-02 @@ -4561,7 +4582,6 @@ broken-packages: - pipes-cereal # failure in job https://hydra.nixos.org/build/233195413 at 2023-09-02 - pipes-core # failure in job https://hydra.nixos.org/build/233213024 at 2023-09-02 - pipes-errors # failure in job https://hydra.nixos.org/build/233214912 at 2023-09-02 - - pipes-extras # failure in job https://hydra.nixos.org/build/252732291 at 2024-03-16 - pipes-interleave # failure in job https://hydra.nixos.org/build/233247428 at 2023-09-02 - pipes-io # failure in job https://hydra.nixos.org/build/233243253 at 2023-09-02 - pipes-kafka # failure in job https://hydra.nixos.org/build/252727228 at 2024-03-16 @@ -4642,6 +4662,7 @@ broken-packages: - polyglot # failure in job https://hydra.nixos.org/build/233218267 at 2023-09-02 - polynom # failure in job https://hydra.nixos.org/build/233237353 at 2023-09-02 - polynomial # failure in job https://hydra.nixos.org/build/233242131 at 2023-09-02 + - polysemy-blockfrost # failure in job https://hydra.nixos.org/build/275144296 at 2024-10-21 - polysemy-keyed-state # failure in job https://hydra.nixos.org/build/233224142 at 2023-09-02 - polysemy-kvstore # failure in job https://hydra.nixos.org/build/233229745 at 2023-09-02 - polysemy-managed # failure in job https://hydra.nixos.org/build/233221190 at 2023-09-02 @@ -4716,6 +4737,8 @@ broken-packages: - powermate # failure in job https://hydra.nixos.org/build/233224977 at 2023-09-02 - powerpc # failure in job https://hydra.nixos.org/build/233217983 at 2023-09-02 - powerqueue-levelmem # failure in job https://hydra.nixos.org/build/233232882 at 2023-09-02 + - ppad-sha256 # failure in job https://hydra.nixos.org/build/276377736 at 2024-11-06 + - ppad-sha512 # failure in job https://hydra.nixos.org/build/276375868 at 2024-11-06 - pprecord # failure in job https://hydra.nixos.org/build/233198838 at 2023-09-02 - PPrinter # failure in job https://hydra.nixos.org/build/233253160 at 2023-09-02 - pqc # failure in job https://hydra.nixos.org/build/233217425 at 2023-09-02 @@ -4807,6 +4830,7 @@ broken-packages: - proof-assistant-bot # failure in job https://hydra.nixos.org/build/234974688 at 2023-09-13 - proof-combinators # failure in job https://hydra.nixos.org/build/233210521 at 2023-09-02 - PropaFP # failure in job https://hydra.nixos.org/build/233206496 at 2023-09-02 + - propeller # failure in job https://hydra.nixos.org/build/273449652 at 2024-10-01 - Proper # failure in job https://hydra.nixos.org/build/233194417 at 2023-09-02 - properties # failure in job https://hydra.nixos.org/build/233240862 at 2023-09-02 - property-list # failure in job https://hydra.nixos.org/build/233254907 at 2023-09-02 @@ -5018,11 +5042,8 @@ broken-packages: - reflex-dom-svg # failure in job https://hydra.nixos.org/build/233193544 at 2023-09-02 - reflex-external-ref # failure in job https://hydra.nixos.org/build/233215834 at 2023-09-02 - reflex-gadt-api # failure in job https://hydra.nixos.org/build/260124380 at 2024-05-19 - - reflex-gi-gtk # failure in job https://hydra.nixos.org/build/253683412 at 2024-03-31 - - reflex-gloss # failure in job https://hydra.nixos.org/build/234457448 at 2023-09-13 - reflex-jsx # failure in job https://hydra.nixos.org/build/233207137 at 2023-09-02 - reflex-orphans # failure in job https://hydra.nixos.org/build/233249128 at 2023-09-02 - - reflex-sdl2 # failure in job https://hydra.nixos.org/build/233233947 at 2023-09-02 - reflex-test-host # failure in job https://hydra.nixos.org/build/233220665 at 2023-09-02 - reflex-transformers # failure in job https://hydra.nixos.org/build/233243647 at 2023-09-02 - ref-mtl # failure in job https://hydra.nixos.org/build/233260152 at 2023-09-02 @@ -5498,6 +5519,7 @@ broken-packages: - sint # failure in job https://hydra.nixos.org/build/233238431 at 2023-09-02 - siphash # failure in job https://hydra.nixos.org/build/233199344 at 2023-09-02 - sitepipe # failure in job https://hydra.nixos.org/build/233201989 at 2023-09-02 + - si-timers # failure in job https://hydra.nixos.org/build/273467737 at 2024-10-01 - sixfiguregroup # failure in job https://hydra.nixos.org/build/233252141 at 2023-09-02 - sixty-five-oh-two # failure in job https://hydra.nixos.org/build/252714578 at 2024-03-16 - sized-grid # failure in job https://hydra.nixos.org/build/233239056 at 2023-09-02 @@ -5781,7 +5803,9 @@ 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-mvar # failure in job https://hydra.nixos.org/build/273459853 at 2024-10-01 - strict-optics # failure in job https://hydra.nixos.org/build/267983907 at 2024-07-31 + - strict-stm # failure in job https://hydra.nixos.org/build/273449297 at 2024-10-01 - 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 @@ -5931,6 +5955,7 @@ broken-packages: - tasty-auto # failure in job https://hydra.nixos.org/build/233220008 at 2023-09-02 - tasty-checklist # failure in job https://hydra.nixos.org/build/252710481 at 2024-03-16 - tasty-fail-fast # failure in job https://hydra.nixos.org/build/233200040 at 2023-09-02 + - tasty-flaky # failure in job https://hydra.nixos.org/build/275140265 at 2024-10-21 - tasty-grading-system # failure in job https://hydra.nixos.org/build/236673021 at 2023-10-04 - tasty-hedgehog-coverage # failure in job https://hydra.nixos.org/build/233231332 at 2023-09-02 - tasty-mgolden # failure in job https://hydra.nixos.org/build/233248196 at 2023-09-02 @@ -6092,6 +6117,7 @@ broken-packages: - tiger # failure in job https://hydra.nixos.org/build/233249333 at 2023-09-02 - TigerHash # failure in job https://hydra.nixos.org/build/233208162 at 2023-09-02 - tightrope # failure in job https://hydra.nixos.org/build/233215237 at 2023-09-02 + - tiktoken # failure in job https://hydra.nixos.org/build/273448419 at 2024-10-01 - tikzsd # failure in job https://hydra.nixos.org/build/233224431 at 2023-09-02 - timecalc # failure in job https://hydra.nixos.org/build/233207970 at 2023-09-02 - time-extras # failure in job https://hydra.nixos.org/build/233204030 at 2023-09-02 @@ -6259,6 +6285,7 @@ broken-packages: - typed-process-effectful # failure in job https://hydra.nixos.org/build/236684332 at 2023-10-04 - typedquery # failure in job https://hydra.nixos.org/build/233215307 at 2023-09-02 - typed-session # failure in job https://hydra.nixos.org/build/270089993 at 2024-08-31 + - typed-session-state-algorithm # failure in job https://hydra.nixos.org/build/273462641 at 2024-10-01 - typed-spreadsheet # failure in job https://hydra.nixos.org/build/233248967 at 2023-09-02 - typed-time # failure in job https://hydra.nixos.org/build/233246930 at 2023-09-02 - typed-wire # failure in job https://hydra.nixos.org/build/233237626 at 2023-09-02 @@ -6268,6 +6295,7 @@ 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/276367145 at 2024-11-06 - 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 @@ -6306,6 +6334,7 @@ broken-packages: - uhttpc # failure in job https://hydra.nixos.org/build/233232481 at 2023-09-02 - ui-command # failure in job https://hydra.nixos.org/build/233223762 at 2023-09-02 - ukrainian-phonetics-basic-array-bytestring # failure in job https://hydra.nixos.org/build/233228787 at 2023-09-02 + - ukrainian-phonetics-basic-array # failure in job https://hydra.nixos.org/build/275136298 at 2024-10-21 - unac-bindings # failure in job https://hydra.nixos.org/build/236686523 at 2023-10-04 - unamb-custom # failure in job https://hydra.nixos.org/build/233197458 at 2023-09-02 - unbeliever # failure in job https://hydra.nixos.org/build/233221256 at 2023-09-02 @@ -6315,6 +6344,7 @@ broken-packages: - unboxed # failure in job https://hydra.nixos.org/build/233219555 at 2023-09-02 - unboxed-references # failure in job https://hydra.nixos.org/build/233192713 at 2023-09-02 - unbreak # failure in job https://hydra.nixos.org/build/233242560 at 2023-09-02 + - uncertain # failure in job https://hydra.nixos.org/build/273461304 at 2024-10-01 - unescaping-print # failure in job https://hydra.nixos.org/build/252736030 at 2024-03-16 - unfix-binders # failure in job https://hydra.nixos.org/build/233259262 at 2023-09-02 - unfoldable # failure in job https://hydra.nixos.org/build/252721990 at 2024-03-16 @@ -6484,7 +6514,6 @@ broken-packages: - visibility # failure in job https://hydra.nixos.org/build/233206672 at 2023-09-02 - visual-prof # failure in job https://hydra.nixos.org/build/233250080 at 2023-09-02 - vitrea # failure in job https://hydra.nixos.org/build/233252038 at 2023-09-02 - - vivid # failure in job https://hydra.nixos.org/build/252716916 at 2024-03-16 - vk-aws-route53 # failure in job https://hydra.nixos.org/build/233250126 at 2023-09-02 - VKHS # failure in job https://hydra.nixos.org/build/233246557 at 2023-09-02 - vowpal-utils # failure in job https://hydra.nixos.org/build/233251505 at 2023-09-02 @@ -6815,10 +6844,14 @@ broken-packages: - yesod-vend # failure in job https://hydra.nixos.org/build/233227545 at 2023-09-02 - YFrob # failure in job https://hydra.nixos.org/build/233197612 at 2023-09-02 - yggdrasil # failure in job https://hydra.nixos.org/build/233229923 at 2023-09-02 + - yggdrasil-schema # failure in job https://hydra.nixos.org/build/275135174 at 2024-10-21 - yhccore # failure in job https://hydra.nixos.org/build/233199669 at 2023-09-02 - yhseq # failure in job https://hydra.nixos.org/build/233191724 at 2023-09-02 - yices # failure in job https://hydra.nixos.org/build/233242137 at 2023-09-02 - - yi-language # failure in job https://hydra.nixos.org/build/233217570 at 2023-09-02 + - yi-contrib # failure in job https://hydra.nixos.org/build/276370855 at 2024-11-06 + - yi-monokai # failure in job https://hydra.nixos.org/build/276375617 at 2024-11-06 + - yi-solarized # failure in job https://hydra.nixos.org/build/276380211 at 2024-11-06 + - yi-spolsky # failure in job https://hydra.nixos.org/build/276371008 at 2024-11-06 - yoctoparsec # failure in job https://hydra.nixos.org/build/233192019 at 2023-09-02 - yoda # failure in job https://hydra.nixos.org/build/233200530 at 2023-09-02 - Yogurt # failure in job https://hydra.nixos.org/build/233212103 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 15bb0c421782..2645894d885d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -36,32 +36,22 @@ default-package-overrides: - hnix-store-remote < 0.7 # 2024-09-12: match xmonad 0.17.* from Stackage LTS - xmonad-contrib < 0.18.1 - + # 2024-11-01: no release version of http2/3 supports http-semantics >= 0.3.0 at the moment + - http-semantics < 0.3.0 extra-packages: - - Cabal-syntax == 3.6.* # Dummy package that ensures packages depending on Cabal-syntax can work for Cabal < 3.8 - Cabal == 3.2.* # Used for packages needing newer Cabal on ghc 8.6 and 8.8 - - Cabal == 3.6.* # used for packages needing newer Cabal on ghc 8.10 and 9.0 + - Cabal-syntax == 3.6.* # Dummy package that ensures packages depending on Cabal-syntax can work for Cabal < 3.8 - Cabal-syntax == 3.8.* # version required for ormolu and fourmolu on ghc 9.2 and 9.0 - - Cabal-syntax == 3.10.* # version required for cabal-install and other packages - - Cabal == 3.10.* # version required for cabal-install and other packages - - directory == 1.3.7.* # required to build cabal-install 3.10.* with GHC 9.2 - - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 + - Cabal-syntax == 3.10.* + - Cabal == 3.10.* + - Cabal == 3.12.* # version required for cabal-install and other packages + - Cabal-syntax == 3.12.* # version required for cabal-install and other packages - aeson < 2 # required by pantry-0.5.2 - apply-refact == 0.9.* # 2022-12-12: needed for GHC < 9.2 - apply-refact == 0.11.* # 2023-02-02: needed for hls-hlint-plugin on GHC 9.2 - attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now - - base16-bytestring < 1 # required for cabal-install etc. - - basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10 - - brick == 0.70.* # 2022-08-13: needed by taskell - - brittany == 0.13.1.2 # 2022-09-20: needed for hls on ghc 8.8 - - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses - - dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20 - - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 - - doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.* - - foundation < 0.0.29 # 2022-08-30: last version to support GHC < 8.10 - ghc-api-compat == 8.10.7 # 2022-02-17: preserve for GHC 8.10.7 - - ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4 - ghc-exactprint == 0.6.* # 2022-12-12: needed for GHC < 9.2 - ghc-exactprint == 1.5.* # 2023-03-30: needed for GHC == 9.2 - ghc-exactprint == 1.6.* # 2023-03-30: needed for GHC == 9.4 @@ -73,36 +63,23 @@ extra-packages: - ghc-lib-parser == 9.8.* # 2024-05-19: preserve for GHC 9.8 - ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 8.10, 9.0 - ghc-lib-parser-ex == 9.8.* # 2024-05-19: preserve for GHC 9.8 - - ghc-syntax-highlighter == 0.0.10.* # 2023-11-20: - - gi-soup == 2.4.28 # 2023-04-05: the last version to support libsoup-2.4 (and thus be compatible with our other gi- packages) - - haddock == 2.23.* # required on GHC < 8.10.x - - haddock-api == 2.23.* # required on GHC < 8.10.x - - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 - happy == 1.19.12 # for ghcjs - hashable == 1.4.7.0 # allows GHC 9.10 - - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - ansi-wl-pprint >= 0.6 && < 0.7 # 2024-03-23: required for ghcjs - - 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 - hspec-megaparsec == 2.2.0 # 2023-11-18: Latest version compatible with ghc 9.0, needed for HLS - hspec-meta < 2.8 # 2022-12-07: Needed for elmPackages.elm / hspec-discover - - hspec-golden == 0.1.* # 2022-04-07: Needed for elm-format - - http2 < 3.3 # 2023-08-24: Needed for twain <https://github.com/alexmingoia/twain/issues/5> - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 - language-docker == 11.0.0 # required by hadolint 2.12.0, 2022-11-16 - language-javascript == 0.7.0.0 # required by purescript - - 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.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 @@ -110,14 +87,8 @@ extra-packages: - 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 - - 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 - text == 2.0.2 # 2023-09-14: Needed for elm (which is currently on ghc-8.10) - - th-abstraction < 0.6 # 2023-09-11: needed for aeson-2.2.0.0 - - vty == 5.35.1 # 2022-07-08: needed for glirc-2.39.0.1 - - warp < 3.3.31 # 2024-03-20: for twain, which requires http2 3.0.3 - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 - weeder == 2.4.* # 2023-02-02: preserve for GHC 9.2.* @@ -136,6 +107,8 @@ extra-packages: - 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 + - extensions == 0.1.0.2 # 2024-10-20: for GHC 9.10/Cabal 3.12 + - network-run == 0.4.0 # 2024-10-20: for GHC 9.10/network == 3.1.* package-maintainers: abbradar: @@ -196,6 +169,11 @@ package-maintainers: - hnix - hnix-store-core - hnix-store-remote + artem: + - BNFC-meta + - alex-meta + - happy-meta + - vector-hashtables arturcygan: - hevm athas: @@ -207,6 +185,7 @@ package-maintainers: bdesham: - pinboard-notes-backup cdepillabout: + - cloudy - password - password-instances - pretty-simple @@ -221,6 +200,7 @@ package-maintainers: - patat - svgcairo danielrolls: + - aws-spend-summary - byte-count-reader - shellify - specup @@ -244,16 +224,6 @@ package-maintainers: - tlynx - xmonad - xmonad-contrib - expipiplus1: - - VulkanMemoryAllocator - - autoapply - - exact-real - - language-c - - orbits - - update-nix-fetchgit - - vector-sized - - vulkan - - vulkan-utils erictapen: - hakyll evenbrenden: @@ -672,6 +642,8 @@ package-maintainers: - minio-hs - smtp-mail - pdftotext + wolfgangwalther: + - postgrest unsupported-platforms: Allure: [ platforms.darwin ] @@ -739,10 +711,7 @@ unsupported-platforms: mpi-hs-cereal: [ aarch64-linux, platforms.darwin ] mpi-hs-store: [ aarch64-linux, platforms.darwin ] mplayer-spot: [ aarch64-linux, platforms.darwin ] - monomer: [ platforms.darwin ] # depends on mesa - monomer-hagrid: [ platforms.darwin ] # depends on mesa mptcp-pm: [ platforms.darwin ] - nanovg: [ platforms.darwin ] # depends on mesa netlink: [ platforms.darwin ] network-unexceptional: [ platforms.darwin ] # depends on posix-api notifications-tray-icon: [ platforms.darwin ] # depends on gi-dbusmenu @@ -760,7 +729,6 @@ unsupported-platforms: reactive-balsa: [ platforms.darwin ] # depends on alsa-core reflex-dom-fragment-shader-canvas: [ platforms.darwin, aarch64-linux ] reflex-localize-dom: [ platforms.darwin, aarch64-linux ] - rsi-break: [ platforms.darwin ] # depends on monomer rtlsdr: [ platforms.darwin ] rubberband: [ platforms.darwin ] SDL-mixer: [ platforms.darwin ] # depends on mesa @@ -853,8 +821,6 @@ supported-platforms: midi-alsa: [ platforms.linux ] # alsa-core only supported on linux midisurface: [ platforms.linux ] # alsa-core only supported on linux OrderedBits: [ platforms.x86 ] # lacks implementations for non-x86: https://github.com/choener/OrderedBits/blob/401cbbe933b1635aa33e8e9b29a4a570b0a8f044/lib/Data/Bits/Ordered.hs#L316 - password: [ platforms.x86 ] # uses scrypt, which requries x86 - password-instances: [ platforms.x86 ] # uses scrypt, which requries x86 reactivity: [ platforms.windows ] reflex-libtelnet: [ platforms.linux ] # pkgs.libtelnet only supports linux scat: [ platforms.x86 ] # uses scrypt, which requries x86 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 4384b2254f46..c3893c4516b4 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.33 +# Stackage LTS 22.40 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -16,7 +16,7 @@ default-package-overrides: - adjunctions ==4.4.2 - adler32 ==0.1.2.0 - aern2-mp ==0.2.15.1 - - aern2-real ==0.2.15 + - aern2-real ==0.2.15.1 - aeson ==2.1.2.1 - aeson-attoparsec ==0.0.0 - aeson-casing ==0.2.0.0 @@ -30,7 +30,7 @@ default-package-overrides: - aeson-pretty ==0.8.10 - aeson-qq ==0.8.4 - aeson-schemas ==1.4.2.1 - - aeson-typescript ==0.6.3.0 + - aeson-typescript ==0.6.4.0 - aeson-unqualified-ast ==1.0.0.3 - aeson-value-parser ==0.19.7.2 - aeson-warning-parser ==0.1.1 @@ -38,7 +38,7 @@ default-package-overrides: - aeson-yaml ==1.1.0.1 - agda2lagda ==0.2023.6.9 - agreeing ==0.2.2.0 - - alarmclock ==0.7.0.6 + - alarmclock ==0.7.0.7 - alex ==3.4.0.1 - alex-meta ==0.3.0.13 - alex-tools ==0.6.1 @@ -397,7 +397,7 @@ default-package-overrides: - atom-conduit ==0.9.0.1 - atomic-counter ==0.1.2.1 - atomic-primops ==0.8.8 - - atomic-write ==0.2.0.7 + - atomic-write ==0.2.1.0 - attoparsec ==0.14.4 - attoparsec-aeson ==2.1.0.0 - attoparsec-base64 ==0.0.0 @@ -428,7 +428,7 @@ default-package-overrides: - aws-xray-client-wai ==0.1.0.2 - backprop ==0.2.6.5 - backtracking ==0.1.0 - - bank-holidays-england ==0.2.0.9 + - bank-holidays-england ==0.2.0.11 - barbies ==2.0.5.0 - barrier ==0.1.1 - base16 ==1.0 @@ -454,7 +454,7 @@ default-package-overrides: - bcp47 ==0.2.0.6 - bcp47-orphans ==0.1.0.6 - bcrypt ==0.0.11 - - beam-core ==0.10.1.0 + - beam-core ==0.10.3.0 - bech32 ==1.1.7 - bech32-th ==1.1.7 - benchpress ==0.2.2.23 @@ -480,7 +480,7 @@ default-package-overrides: - binary-shared ==0.8.3 - binary-tagged ==0.3.1 - bindings-DSL ==1.0.25 - - bindings-GLFW ==3.3.9.1 + - bindings-GLFW ==3.3.9.2 - bindings-libzip ==1.0.1 - bindings-uname ==0.1 - BiobaseEnsembl ==0.2.0.1 @@ -508,6 +508,8 @@ default-package-overrides: - blaze-textual ==0.2.3.1 - bloodhound ==0.21.0.0 - bloomfilter ==2.0.1.2 + - bluefin ==0.0.10.0 + - bluefin-internal ==0.0.10.0 - bm ==0.2.0.0 - bmp ==1.2.6.4 - bnb-staking-csvs ==0.2.2.0 @@ -527,7 +529,7 @@ default-package-overrides: - bounded-qsem ==0.1.0.2 - bounded-queue ==1.0.0 - boundingboxes ==0.2.3 - - box ==0.9.3.1 + - box ==0.9.3.2 - boxes ==0.1.5 - breakpoint ==0.1.4.0 - brick ==2.1.1 @@ -552,7 +554,7 @@ default-package-overrides: - bv-sized ==1.0.5 - byteable ==0.1.1 - bytebuild ==0.3.16.2 - - byte-count-reader ==0.10.1.11 + - byte-count-reader ==0.10.1.12 - bytedump ==1.0 - bytehash ==0.1.1.0 - byte-order ==0.1.3.1 @@ -563,11 +565,11 @@ default-package-overrides: - bytesmith ==0.3.11.1 - bytestring-builder ==0.10.8.2.0 - bytestring-conversion ==0.3.2 - - bytestring-lexing ==0.5.0.12 + - bytestring-lexing ==0.5.0.14 - bytestring-strict-builder ==0.4.5.7 - bytestring-to-vector ==0.3.0.1 - bytestring-tree-builder ==0.2.7.12 - - bytestring-trie ==0.2.7.3 + - bytestring-trie ==0.2.7.5 - bz2 ==1.0.1.2 - bzip2-clib ==1.0.8 - bzlib ==0.5.2.0 @@ -575,9 +577,9 @@ default-package-overrides: - c14n ==0.1.0.3 - c2hs ==0.28.8 - cabal2spec ==2.7.1 - - cabal-appimage ==0.4.0.4 + - cabal-appimage ==0.4.0.5 - cabal-clean ==0.2.20230609 - - cabal-debian ==5.2.3 + - cabal-debian ==5.2.4 - cabal-doctest ==1.0.10 - cabal-file ==0.1.1 - cabal-plan ==0.7.3.0 @@ -627,7 +629,7 @@ default-package-overrides: - Chart-cairo ==1.9.4.1 - Chart-diagrams ==1.9.5.1 - chart-svg ==0.5.2.0 - - ChasingBottoms ==1.3.1.14 + - ChasingBottoms ==1.3.1.15 - check-email ==1.0.2 - checkers ==0.6.0 - checksum ==0.0.0.1 @@ -683,14 +685,14 @@ default-package-overrides: - comfort-fftw ==0.0.0.1 - comfort-glpk ==0.1 - comfort-graph ==0.0.4 - - commonmark ==0.2.6 + - commonmark ==0.2.6.1 - commonmark-extensions ==0.2.5.5 - - commonmark-pandoc ==0.2.2.1 + - commonmark-pandoc ==0.2.2.2 - commutative ==0.0.2 - commutative-semigroups ==0.1.1.0 - comonad ==5.0.8 - compact ==0.2.0.0 - - compactmap ==0.1.4.4 + - compactmap ==0.1.4.5 - companion ==0.1.0 - compdata ==0.13.1 - compensated ==0.8.3 @@ -705,7 +707,7 @@ default-package-overrides: - composite-xstep ==0.1.0.0 - composition ==1.0.2.2 - composition-extra ==2.1.0 - - composition-prelude ==3.0.0.2 + - composition-prelude ==3.0.1.0 - concise ==0.1.0.1 - concurrency ==1.11.0.3 - concurrent-extra ==0.7.0.12 @@ -713,7 +715,7 @@ default-package-overrides: - concurrent-split ==0.0.1.1 - concurrent-supply ==0.1.8 - cond ==0.5.1 - - conduit ==1.3.5 + - conduit ==1.3.6 - conduit-aeson ==0.1.1.0 - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.3 @@ -743,7 +745,7 @@ default-package-overrides: - control-bool ==0.2.1 - control-dsl ==0.2.1.3 - control-monad-free ==0.6.2 - - control-monad-omega ==0.3.2 + - control-monad-omega ==0.3.3 - convertible ==1.1.1.1 - cookie ==0.4.6 - copilot ==3.19.1 @@ -770,8 +772,8 @@ default-package-overrides: - crackNum ==3.4 - crc32c ==0.1.0 - credential-store ==0.1.2 - - criterion ==1.6.3.0 - - criterion-measurement ==0.2.2.0 + - criterion ==1.6.4.0 + - criterion-measurement ==0.2.3.0 - crypto-api ==0.13.3 - crypto-api-tests ==0.3 - crypto-cipher-tests ==0.0.11 @@ -824,14 +826,14 @@ default-package-overrides: - data-bword ==0.1.0.2 - data-checked ==0.3 - data-clist ==0.2 - - data-default ==0.7.1.1 - - data-default-class ==0.1.2.0 - - data-default-instances-base ==0.1.0.1 + - data-default ==0.7.1.2 + - data-default-class ==0.1.2.2 + - data-default-instances-base ==0.1.0.3 - data-default-instances-bytestring ==0.0.1 - data-default-instances-case-insensitive ==0.0.1 - data-default-instances-containers ==0.0.1 - - data-default-instances-dlist ==0.0.1 - - data-default-instances-old-locale ==0.0.1 + - data-default-instances-dlist ==0.0.1.2 + - data-default-instances-old-locale ==0.0.1.2 - data-default-instances-unordered-containers ==0.0.1 - data-default-instances-vector ==0.0.1 - data-diverse ==4.7.1.0 @@ -852,7 +854,7 @@ default-package-overrides: - data-or ==1.0.0.7 - data-ordlist ==0.4.7.0 - data-ref ==0.1 - - data-reify ==0.6.3 + - data-reify ==0.6.4 - data-serializer ==0.3.5 - data-sketches ==0.3.1.0 - data-sketches-core ==0.1.0.0 @@ -901,7 +903,7 @@ default-package-overrides: - diagrams-postscript ==1.5.1.1 - diagrams-rasterific ==1.4.2.3 - diagrams-solve ==0.1.3 - - diagrams-svg ==1.4.3.1 + - diagrams-svg ==1.4.3.2 - dice ==0.1.1 - di-core ==1.0.4 - dictionary-sharing ==0.1.0.0 @@ -922,7 +924,7 @@ default-package-overrides: - discrimination ==0.5 - disk-free-space ==0.1.0.1 - distributed-closure ==0.5.0.0 - - distributed-static ==0.3.10 + - distributed-static ==0.3.11 - distribution-opensuse ==1.1.4 - distributive ==0.6.2.1 - diversity ==0.8.1.0 @@ -934,7 +936,7 @@ default-package-overrides: - dns ==4.2.0 - dockerfile ==0.2.0 - doclayout ==0.4.0.1 - - doctemplates ==0.11 + - doctemplates ==0.11.0.1 - doctest ==0.22.6 - doctest-discover ==0.2.0.0 - doctest-driver-gen ==0.3.0.8 @@ -985,11 +987,11 @@ default-package-overrides: - egison-pattern-src ==0.2.1.2 - either ==5.0.2 - either-unwrap ==1.1 - - ekg-core ==0.1.1.7 + - ekg-core ==0.1.1.8 - elerea ==2.9.0 - elf ==0.31 - eliminators ==0.9.3 - - elm-bridge ==0.8.3 + - elm-bridge ==0.8.4 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - elm-street ==0.2.2.1 @@ -1000,12 +1002,12 @@ default-package-overrides: - elynx-tools ==0.7.2.2 - elynx-tree ==0.7.2.2 - emacs-module ==0.2.1 - - email-validate ==2.3.2.20 + - email-validate ==2.3.2.21 - emojis ==0.1.4.1 - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 - entropy ==0.4.1.10 - - enummapset ==0.7.2.0 + - enummapset ==0.7.3.0 - enumset ==0.1 - enum-subset-generate ==0.1.0.1 - enum-text ==0.5.3.0 @@ -1026,7 +1028,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.5 - - esqueleto ==3.5.11.2 + - esqueleto ==3.5.13.0 - event-list ==0.1.3 - every ==0.0.1 - evm-opcodes ==0.1.2 @@ -1048,7 +1050,7 @@ default-package-overrides: - exp-pairs ==0.2.1.0 - express ==1.0.16 - extended-reals ==0.2.4.0 - - extensible ==0.9 + - extensible ==0.9.1 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 - extra ==1.7.16 @@ -1057,7 +1059,7 @@ default-package-overrides: - extrapolate ==0.4.6 - fail ==4.9.0.0 - FailT ==0.1.2.0 - - fakedata ==1.0.3 + - fakedata ==1.0.5 - fakedata-parser ==0.1.0.0 - fakedata-quickcheck ==0.2.0 - fakefs ==0.3.0.2 @@ -1066,20 +1068,19 @@ default-package-overrides: - falsify ==0.2.0 - fasta ==0.10.4.2 - fast-digits ==0.3.2.0 - - fast-logger ==3.2.3 + - fast-logger ==3.2.4 - fast-math ==1.0.2 - - fast-myers-diff ==0.0.0 + - fast-myers-diff ==0.0.1 - fb ==2.1.1.1 - fcf-family ==0.2.0.1 - fclabels ==2.0.5.1 - fdo-notify ==0.3.1 - feature-flags ==0.1.0.1 - - fedora-dists ==2.1.1 - - fedora-haskell-tools ==1.1 + - fedora-releases ==0.1.0 - FenwickTree ==0.1.2.1 - fft ==0.1.8.7 - fftw-ffi ==0.1 - - fgl ==5.8.2.0 + - fgl ==5.8.3.0 - fgl-arbitrary ==0.2.0.6 - fields-json ==0.4.0.0 - file-embed ==0.0.16.0 @@ -1123,8 +1124,8 @@ default-package-overrides: - focus ==1.0.3.2 - focuslist ==0.1.1.0 - foldable1-classes-compat ==0.1 - - fold-debounce ==0.2.0.11 - - foldl ==1.4.16 + - fold-debounce ==0.2.0.14 + - foldl ==1.4.17 - folds ==0.7.8 - FontyFruity ==0.5.3.5 - force-layout ==0.4.0.6 @@ -1132,7 +1133,7 @@ default-package-overrides: - ForestStructures ==0.0.1.1 - forkable-monad ==0.2.0.3 - forma ==1.2.0 - - formatn ==0.3.0.1 + - formatn ==0.3.1.0 - format-numbers ==0.1.0.1 - formatting ==7.2.0 - foundation ==0.0.30 @@ -1154,7 +1155,7 @@ default-package-overrides: - funcmp ==1.9 - function-builder ==0.3.0.1 - functor-classes-compat ==2.0.0.2 - - fused-effects ==1.1.2.2 + - fused-effects ==1.1.2.3 - fusion-plugin ==0.2.7 - fusion-plugin-types ==0.1.0 - fuzzcheck ==0.1.1 @@ -1170,7 +1171,7 @@ default-package-overrides: - generically ==0.1.1 - generic-arbitrary ==1.0.1 - generic-constraints ==1.1.1.1 - - generic-data ==1.1.0.0 + - generic-data ==1.1.0.1 - generic-data-surgery ==0.3.0.0 - generic-deriving ==1.14.5 - generic-functor ==1.1.0.0 @@ -1188,7 +1189,7 @@ default-package-overrides: - genvalidity-appendful ==0.1.0.0 - genvalidity-bytestring ==1.0.0.1 - genvalidity-case-insensitive ==0.0.0.1 - - genvalidity-containers ==1.0.0.1 + - genvalidity-containers ==1.0.0.2 - genvalidity-criterion ==1.1.0.0 - genvalidity-hspec ==1.0.0.3 - genvalidity-hspec-aeson ==1.0.0.0 @@ -1253,13 +1254,13 @@ default-package-overrides: - gi-gdk ==3.0.29 - gi-gdkpixbuf ==2.0.32 - gi-gdkx11 ==3.0.16 - - gi-gio ==2.0.34 + - gi-gio ==2.0.35 - 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-gtk-hs ==0.3.17 - gi-gtksource ==3.0.29 - gi-harfbuzz ==0.0.10 - gi-javascriptcore ==4.0.28 @@ -1283,7 +1284,7 @@ default-package-overrides: - gl ==0.9 - glabrous ==2.0.6.3 - glasso ==0.1.0 - - GLFW-b ==3.3.9.0 + - GLFW-b ==3.3.9.1 - glib ==0.13.11.0 - glib-stopgap ==0.1.0.0 - Glob ==0.10.2 @@ -1296,7 +1297,7 @@ default-package-overrides: - GLUT ==2.7.0.16 - gmail-simple ==0.1.0.6 - gnuplot ==0.5.7 - - goldplate ==0.2.1.1 + - goldplate ==0.2.2.1 - google-isbn ==1.0.3 - gopher-proxy ==0.1.1.3 - gpolyline ==0.1.0.1 @@ -1323,7 +1324,7 @@ default-package-overrides: - hackage-security ==0.6.2.4 - haddock-library ==1.11.0 - haha ==0.3.1.1 - - hakyll ==4.16.2.2 + - hakyll ==4.16.3.0 - hakyllbars ==1.0.1.0 - hal ==1.0.1 - half ==0.3.1 @@ -1343,12 +1344,12 @@ default-package-overrides: - hashing ==0.1.1.0 - hashmap ==1.3.3 - hashtables ==1.3.1 - - haskell-gi ==0.26.10 - - haskell-gi-base ==0.26.6 + - haskell-gi ==0.26.12 + - haskell-gi-base ==0.26.8 - haskell-gi-overloading ==1.0 - - haskell-lexer ==1.1.1 + - haskell-lexer ==1.1.2 - HaskellNet ==0.6.1.2 - - haskell-src ==1.0.4 + - haskell-src ==1.0.4.1 - haskell-src-exts ==1.23.1 - haskell-src-exts-simple ==1.23.0.0 - haskell-src-exts-util ==0.2.5 @@ -1397,7 +1398,7 @@ default-package-overrides: - heterocephalus ==1.0.5.7 - hetzner ==0.6.0.0 - hex ==0.2.0 - - hexml ==0.3.4 + - hexml ==0.3.5 - hexml-lens ==0.2.2 - hexpat ==0.20.13 - hex-text ==0.1.0.9 @@ -1405,7 +1406,7 @@ default-package-overrides: - hfsevents ==0.1.7 - hgal ==2.0.0.3 - hidapi ==0.1.8 - - hi-file-parser ==0.1.6.0 + - hi-file-parser ==0.1.7.0 - hindent ==6.1.1 - hinfo ==0.0.3.0 - hinotify ==0.4.1 @@ -1444,7 +1445,7 @@ default-package-overrides: - hostname-validate ==1.0.0 - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - - hp2pretty ==0.10 + - hp2pretty ==0.10.1 - hpack ==0.36.1 - hpc-codecov ==0.5.0.0 - hpc-lcov ==1.1.2 @@ -1476,7 +1477,7 @@ default-package-overrides: - hslua-classes ==2.3.1 - hslua-cli ==1.4.3 - hslua-core ==2.3.2 - - hslua-list ==1.1.1 + - hslua-list ==1.1.4 - hslua-marshalling ==2.3.1 - hslua-module-doclayout ==1.1.1.2 - hslua-module-path ==1.1.1 @@ -1490,7 +1491,7 @@ default-package-overrides: - hslua-typing ==0.1.1 - hsndfile ==0.8.0 - hsndfile-vector ==0.5.2 - - HsOpenSSL ==0.11.7.7 + - HsOpenSSL ==0.11.7.8 - HsOpenSSL-x509-system ==0.1.0.4 - hspec ==2.11.9 - hspec-api ==2.11.9 @@ -1539,9 +1540,9 @@ default-package-overrides: - http-client-openssl ==0.3.3 - http-client-overrides ==0.1.1.0 - http-client-restricted ==0.1.0 - - http-client-tls ==0.3.6.3 + - http-client-tls ==0.3.6.4 - http-common ==0.8.3.4 - - http-conduit ==2.3.8.3 + - http-conduit ==2.3.9.1 - http-date ==0.0.11 - http-directory ==0.1.10 - http-download ==0.2.1.0 @@ -1656,7 +1657,7 @@ default-package-overrides: - io-streams-haproxy ==1.0.1.0 - ip ==1.7.8 - ip6addr ==1.0.4 - - iproute ==1.7.14 + - iproute ==1.7.15 - IPv6Addr ==2.0.6 - ipynb ==0.2 - ipython-kernel ==0.11.0.0 @@ -1668,7 +1669,7 @@ default-package-overrides: - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - isocline ==1.0.9 - - isomorphism-class ==0.1.0.12 + - isomorphism-class ==0.1.1 - ixset-typed ==0.5.1.0 - ixset-typed-binary-instance ==0.1.0.2 - ixset-typed-hashable-instance ==0.1.0.2 @@ -1691,7 +1692,7 @@ default-package-overrides: - jsonifier ==0.2.1.3 - jsonpath ==0.3.0.0 - json-rpc ==1.0.4 - - json-stream ==0.4.5.3 + - json-stream ==0.4.6.0 - JuicyPixels ==3.3.9 - JuicyPixels-extra ==0.6.0 - JuicyPixels-scale-dct ==0.1.2 @@ -1699,15 +1700,15 @@ default-package-overrides: - justified-containers ==0.3.0.0 - jwt ==0.11.0 - kan-extensions ==5.2.6 - - kansas-comet ==0.4.2 - - katip ==0.8.8.0 + - kansas-comet ==0.4.3 + - katip ==0.8.8.2 - katip-logstash ==0.1.0.2 - katip-wai ==0.1.2.4 - kazura-queue ==0.1.0.4 - kdt ==0.2.6 - keep-alive ==0.2.1.0 - keter ==2.1.5 - - keycode ==0.2.2 + - keycode ==0.2.3 - keyed-vals ==0.2.3.1 - keyed-vals-hspec-tests ==0.2.3.1 - keyed-vals-mem ==0.2.3.1 @@ -1731,7 +1732,7 @@ default-package-overrides: - LambdaHack ==0.11.0.1 - lame ==0.2.2 - language-avro ==0.1.4.0 - - language-c ==0.9.3 + - language-c ==0.9.4 - language-c99 ==0.2.0 - language-c99-simple ==0.3.0 - language-c99-util ==0.2.0 @@ -1781,7 +1782,7 @@ default-package-overrides: - liboath-hs ==0.0.1.2 - libyaml ==0.1.4 - libyaml-clib ==0.2.5 - - lifted-async ==0.10.2.5 + - lifted-async ==0.10.2.6 - lifted-base ==0.2.3.12 - lift-generics ==0.2.1 - lift-type ==0.1.2.0 @@ -1827,7 +1828,7 @@ default-package-overrides: - lpeg ==1.0.4 - LPFP-core ==1.1.1 - lrucache ==1.2.0.1 - - lua ==2.3.2 + - lua ==2.3.3 - lua-arbitrary ==1.0.1.1 - lucid2 ==0.0.20240424 - lucid ==2.11.20230408 @@ -1853,7 +1854,7 @@ default-package-overrides: - markdown-unlit ==0.6.0 - markov-chain ==0.0.3.4 - markov-chain-usage-model ==0.0.0 - - markup-parse ==0.1.1 + - markup-parse ==0.1.1.1 - mason ==0.2.6 - massiv ==1.0.4.0 - massiv-io ==1.0.0.1 @@ -1872,7 +1873,7 @@ default-package-overrides: - matrix-static ==0.3 - maximal-cliques ==0.1.1 - mbox-utility ==0.0.3.1 - - mcmc ==0.8.2.0 + - mcmc ==0.8.3.1 - mcmc-types ==1.0.3 - median-stream ==0.7.0.0 - med-module ==0.1.3 @@ -1920,7 +1921,7 @@ default-package-overrides: - min-max-pqueue ==0.1.0.2 - mintty ==0.1.4 - misfortune ==0.1.2.1 - - miso ==1.8.4.0 + - miso ==1.8.5.0 - missing-foreign ==0.1.1 - MissingH ==1.6.0.1 - mixed-types-num ==0.5.12 @@ -1960,7 +1961,7 @@ default-package-overrides: - monad-par-extras ==0.3.3 - monad-peel ==0.3 - MonadPrompt ==1.0.0.5 - - MonadRandom ==0.6 + - MonadRandom ==0.6.1 - monad-resumption ==0.1.4.0 - monad-schedule ==0.1.2.2 - monad-st ==0.2.4.1 @@ -1973,7 +1974,7 @@ default-package-overrides: - monoid-subclasses ==1.2.5.1 - monoid-transformer ==0.0.4 - monomer ==1.6.0.1 - - mono-traversable ==1.0.17.0 + - mono-traversable ==1.0.20.0 - mono-traversable-instances ==0.1.1.0 - mono-traversable-keys ==0.3.0 - more-containers ==0.2.2.2 @@ -2009,14 +2010,14 @@ default-package-overrides: - mx-state-codes ==1.0.0.0 - myers-diff ==0.3.0.0 - mysql ==0.2.1 - - mysql-haskell ==1.1.5 + - mysql-haskell ==1.1.6 - mysql-haskell-nem ==0.1.0.0 - mysql-json-table ==0.1.4.0 - mysql-simple ==0.4.9 - n2o ==0.11.1 - n2o-nitro ==0.11.2 - nagios-check ==0.3.2 - - named ==0.3.0.1 + - named ==0.3.0.2 - names-th ==0.3.0.1 - nano-erl ==0.1.0.1 - nanospec ==0.2.2 @@ -2025,7 +2026,7 @@ default-package-overrides: - natural-arithmetic ==0.1.4.0 - natural-induction ==0.2.0.0 - natural-sort ==0.1.2 - - natural-transformation ==0.4 + - natural-transformation ==0.4.1 - ndjson-conduit ==0.1.0.5 - neat-interpolation ==0.5.1.4 - netcode-io ==0.0.3 @@ -2050,7 +2051,7 @@ default-package-overrides: - network-multicast ==0.3.2 - network-run ==0.2.8 - network-simple ==0.4.5 - - network-transport ==0.5.7 + - network-transport ==0.5.8 - network-uri ==2.6.4.2 - network-wait ==0.2.0.0 - newtype ==0.2.2.0 @@ -2099,7 +2100,7 @@ default-package-overrides: - ofx ==0.4.4.0 - old-locale ==1.0.0.7 - old-time ==1.1.0.4 - - om-elm ==2.0.0.6 + - om-elm ==2.0.0.7 - once ==0.4 - one-liner ==2.1 - one-liner-instances ==0.1.3.0 @@ -2153,7 +2154,7 @@ 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.1 + - pandoc-lua-marshal ==0.2.9 - pandoc-plot ==1.8.0 - pandoc-server ==0.1.0.5 - pandoc-throw ==0.1.0.0 @@ -2164,7 +2165,7 @@ default-package-overrides: - parallel ==3.2.2.0 - parallel-io ==0.3.5 - parameterized ==0.5.0.0 - - parameterized-utils ==2.1.8.0 + - parameterized-utils ==2.1.9.0 - park-bench ==0.1.1.0 - parseargs ==0.2.0.9 - parsec-class ==1.0.1.0 @@ -2173,7 +2174,7 @@ default-package-overrides: - ParsecTools ==0.0.2.0 - parser-combinators ==1.3.0 - parser-combinators-tests ==1.3.0 - - parsers ==0.12.11 + - parsers ==0.12.12 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.3.0 - partialord ==0.0.2 @@ -2214,11 +2215,11 @@ default-package-overrides: - perfect-hash-generator ==1.0.0 - persistable-record ==0.6.0.6 - persistable-types-HDBC-pg ==0.0.3.5 - - persistent ==2.14.6.2 + - persistent ==2.14.6.3 - persistent-discover ==0.1.0.7 - persistent-iproute ==0.2.5 - persistent-lens ==1.0.0 - - persistent-mongoDB ==2.13.0.1 + - persistent-mongoDB ==2.13.1.0 - persistent-mtl ==0.5.1 - persistent-mysql ==2.13.1.5 - persistent-pagination ==0.1.1.2 @@ -2261,7 +2262,7 @@ default-package-overrides: - plaid ==0.1.0.4 - plotlyhs ==0.2.3 - Plural ==0.0.2 - - pointed ==5.0.4 + - pointed ==5.0.5 - pointedlist ==0.6.1 - pointless-fun ==1.1.0.8 - poll ==0.0.0.2 @@ -2317,7 +2318,7 @@ default-package-overrides: - primes ==0.2.1.0 - primitive ==0.8.0.0 - primitive-addr ==0.1.0.3 - - primitive-extras ==0.10.2 + - primitive-extras ==0.10.2.1 - primitive-offset ==0.2.0.1 - primitive-serial ==0.1 - primitive-unaligned ==0.1.1.2 @@ -2356,14 +2357,14 @@ default-package-overrides: - pureMD5 ==2.1.4 - purescript-bridge ==0.15.0.0 - purview ==0.2.0.2 - - pusher-http-haskell ==2.1.0.17 + - pusher-http-haskell ==2.1.0.18 - pvar ==1.0.0.0 - pwstore-fast ==2.4.4 - PyF ==0.11.3.0 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.1.0 - - qrcode-core ==0.9.9 - - qrcode-juicypixels ==0.8.5 + - qrcode-core ==0.9.10 + - qrcode-juicypixels ==0.8.6 - quaalude ==0.0.0.1 - quadratic-irrational ==0.1.1 - QuasiText ==0.1.2.6 @@ -2403,7 +2404,7 @@ default-package-overrides: - Ranged-sets ==0.4.0 - ranges ==0.2.4 - range-set-list ==0.1.3.1 - - rank1dynamic ==0.4.1 + - rank1dynamic ==0.4.2 - rank2classes ==1.5.3.1 - Rasterific ==0.7.5.4 - rasterific-svg ==0.3.3.2 @@ -2464,7 +2465,7 @@ default-package-overrides: - relational-record ==0.2.2.0 - relational-schemas ==0.1.8.1 - reliable-io ==0.0.2 - - relude ==1.2.1.0 + - relude ==1.2.2.0 - renderable ==0.2.0.1 - replace-attoparsec ==1.5.0.0 - replace-megaparsec ==1.5.0.1 @@ -2477,7 +2478,7 @@ default-package-overrides: - resolv ==0.2.0.2 - resource-pool ==0.4.0.0 - resourcet ==1.3.0 - - rest-rewrite ==0.4.3 + - rest-rewrite ==0.4.4 - result ==0.2.6.0 - retry ==0.9.3.1 - rex ==0.6.2 @@ -2511,7 +2512,7 @@ default-package-overrides: - runmemo ==1.0.0.1 - run-st ==0.1.3.3 - rvar ==0.3.0.2 - - rzk ==0.7.4 + - rzk ==0.7.5 - s3-signer ==0.5.0.0 - safe ==0.3.21 - safe-coloured-text ==0.2.0.2 @@ -2535,7 +2536,7 @@ default-package-overrides: - sampling ==0.3.5 - sandi ==0.5 - sandwich ==0.2.2.0 - - sandwich-hedgehog ==0.1.3.0 + - sandwich-hedgehog ==0.1.3.1 - sandwich-quickcheck ==0.1.0.7 - sandwich-slack ==0.1.2.0 - sandwich-webdriver ==0.2.3.1 @@ -2574,41 +2575,41 @@ default-package-overrides: - seqalign ==0.2.0.4 - seqid ==0.6.3 - seqid-streams ==0.7.2 - - sequence-formats ==1.8.1.0 + - sequence-formats ==1.8.1.1 - sequenceTools ==1.5.3.1 - serialise ==0.2.6.1 - - servant ==0.20.1 - - servant-auth ==0.4.1.0 - - servant-auth-client ==0.4.1.1 - - servant-auth-docs ==0.2.10.1 - - servant-auth-server ==0.4.8.0 - - servant-auth-swagger ==0.2.10.2 + - servant ==0.20.2 + - servant-auth ==0.4.2.0 + - servant-auth-client ==0.4.2.0 + - servant-auth-docs ==0.2.11.0 + - servant-auth-server ==0.4.9.0 + - servant-auth-swagger ==0.2.11.0 - servant-blaze ==0.9.1 - servant-checked-exceptions ==2.2.0.1 - servant-checked-exceptions-core ==2.2.0.1 - - servant-client ==0.20 - - servant-client-core ==0.20 - - servant-conduit ==0.16 - - servant-docs ==0.13 + - servant-client ==0.20.2 + - servant-client-core ==0.20.2 + - servant-conduit ==0.16.1 + - servant-docs ==0.13.1 - servant-elm ==0.7.3 - servant-exceptions ==0.2.1 - servant-exceptions-server ==0.2.1 - - servant-foreign ==0.16 - - servant-http-streams ==0.20 + - servant-foreign ==0.16.1 + - servant-http-streams ==0.20.2 - servant-JuicyPixels ==0.3.1.1 - servant-lucid ==0.9.0.6 - - servant-machines ==0.16 + - servant-machines ==0.16.1 - servant-multipart ==0.12.1 - servant-multipart-api ==0.12.1 - servant-multipart-client ==0.12.2 - servant-openapi3 ==2.0.1.6 - - servant-pipes ==0.16 + - servant-pipes ==0.16.1 - servant-rate-limit ==0.2.0.0 - servant-rawm ==1.0.0.0 - - servant-server ==0.20 - - servant-static-th ==1.0.0.0 + - servant-server ==0.20.2 + - servant-static-th ==1.0.0.1 - servant-subscriber ==0.7.0.0 - - servant-swagger ==1.2 + - servant-swagger ==1.2.1 - servant-swagger-ui ==0.3.5.5.0.0 - servant-swagger-ui-core ==0.3.5 - servant-swagger-ui-redoc ==0.3.4.1.22.3 @@ -2635,8 +2636,8 @@ default-package-overrides: - shared-memory ==0.2.0.1 - shell-conduit ==5.0.0 - shell-escape ==0.2.0 - - shellify ==0.11.0.1 - - shellmet ==0.0.4.1 + - shellify ==0.11.0.4 + - shellmet ==0.0.5.0 - shelltestrunner ==1.10 - shell-utility ==0.1 - shellwords ==0.1.3.1 @@ -2671,13 +2672,13 @@ default-package-overrides: - singletons-th ==3.2 - Sit ==0.2023.8.3 - sitemap-gen ==0.1.0.0 - - size-based ==0.1.3.2 + - size-based ==0.1.3.3 - sized ==1.1.0.2 - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 - - skylighting ==0.14.2 - - skylighting-core ==0.14.2 + - skylighting ==0.14.3 + - skylighting-core ==0.14.3 - skylighting-format-ansi ==0.1 - skylighting-format-blaze-html ==0.1.1.2 - skylighting-format-context ==0.1.0.2 @@ -2733,7 +2734,7 @@ default-package-overrides: - statestack ==0.3.1.1 - StateVar ==1.2.2 - stateWriter ==0.4.0 - - static-bytes ==0.1.0 + - static-bytes ==0.1.1 - static-canvas ==0.2.0.3 - static-text ==0.2.0.7 - statistics ==0.16.2.1 @@ -2762,7 +2763,7 @@ default-package-overrides: - Stream ==0.4.7.2 - streaming ==0.2.4.0 - streaming-attoparsec ==1.0.0.1 - - streaming-bytestring ==0.3.2 + - streaming-bytestring ==0.3.3 - streaming-commons ==0.2.2.6 - streaming-wai ==0.1.1 - streamly ==0.10.1 @@ -2818,7 +2819,7 @@ default-package-overrides: - sydtest-rabbitmq ==0.1.0.0 - sydtest-servant ==0.2.0.2 - sydtest-typed-process ==0.0.0.0 - - sydtest-wai ==0.2.0.1 + - sydtest-wai ==0.2.0.2 - sydtest-webdriver ==0.0.0.1 - sydtest-webdriver-screenshot ==0.0.0.2 - sydtest-webdriver-yesod ==0.0.0.1 @@ -2914,7 +2915,7 @@ 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.4 + - text-builder-dev ==0.3.5 - text-builder-linear ==0.1.3 - text-conversions ==0.3.1.1 - text-format ==0.3.2.1 @@ -2931,7 +2932,7 @@ default-package-overrides: - text-rope ==0.2 - text-short ==0.1.6 - text-show ==3.10.5 - - text-show-instances ==3.9.8 + - text-show-instances ==3.9.9 - text-zipper ==0.13 - tfp ==1.0.2 - tf-random ==0.5 @@ -2949,10 +2950,10 @@ default-package-overrides: - th-expand-syns ==0.4.11.0 - th-extras ==0.0.0.8 - th-lego ==0.3.0.3 - - th-lift ==0.8.4 + - th-lift ==0.8.5 - th-lift-instances ==0.1.20 - th-nowq ==0.1.0.5 - - th-orphans ==0.13.14 + - th-orphans ==0.13.15 - th-printf ==0.8 - thread-hierarchy ==0.3.0.2 - thread-local-storage ==0.2 @@ -3033,7 +3034,7 @@ default-package-overrides: - twitter-types ==0.11.0 - twitter-types-lens ==0.11.0 - typecheck-plugin-nat-simple ==0.1.0.9 - - typed-process ==0.2.11.1 + - typed-process ==0.2.12.0 - typed-uuid ==0.2.0.0 - type-equality ==1.0.1 - type-errors ==0.2.0.2 @@ -3094,10 +3095,10 @@ default-package-overrides: - universe-instances-extended ==1.1.3 - universe-reverse-instances ==1.1.1 - universe-some ==1.2.1 - - universum ==1.8.2.1 - - unix-bytestring ==0.4.0.1 - - unix-compat ==0.7.2 - - unix-time ==0.4.15 + - universum ==1.8.2.2 + - unix-bytestring ==0.4.0.2 + - unix-compat ==0.7.3 + - unix-time ==0.4.16 - unjson ==0.15.4 - unliftio ==0.2.25.0 - unliftio-core ==0.2.1.0 @@ -3127,7 +3128,7 @@ default-package-overrides: - validity-aeson ==0.2.0.5 - validity-bytestring ==0.4.1.1 - validity-case-insensitive ==0.0.0.0 - - validity-containers ==0.5.0.4 + - validity-containers ==0.5.0.5 - validity-network-uri ==0.0.0.1 - validity-path ==0.4.0.1 - validity-persistent ==0.0.0.0 @@ -3207,7 +3208,7 @@ default-package-overrides: - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - warp ==3.3.31 - - warp-tls ==3.4.6 + - warp-tls ==3.4.7 - wave ==0.2.1 - wcwidth ==0.0.2 - webdriver ==0.12.0.0 @@ -3218,14 +3219,14 @@ default-package-overrides: - websockets ==0.12.7.3 - websockets-simple ==0.2.0 - websockets-snap ==0.10.3.1 - - weigh ==0.0.17 + - weigh ==0.0.18 - welford-online-mean-variance ==0.2.0.0 - what4 ==1.5.1 - wide-word ==0.1.6.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==1.2.1.1 - - withdependencies ==0.3.0 + - witch ==1.2.2.0 + - withdependencies ==0.3.1 - witherable ==0.4.2 - within ==0.2.0.1 - with-location ==0.1.0 @@ -3282,7 +3283,7 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.11.2 - yaml-unscrambler ==0.1.0.19 - - Yampa ==0.14.10 + - Yampa ==0.14.11 - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 @@ -3293,7 +3294,7 @@ default-package-overrides: - yesod-core ==1.6.26.0 - yesod-eventsource ==1.6.0.1 - yesod-fb ==0.6.1 - - yesod-form ==1.7.6 + - yesod-form ==1.7.9 - yesod-form-bootstrap4 ==3.0.1.1 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.2 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index de9e5924c785..7d3699af9eb5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -483,6 +483,7 @@ dont-distribute-packages: - ampersand - amqp-streamly - analyze-client + - anansi-hscolour - anatomy - animate-example - animate-frames @@ -731,6 +732,7 @@ dont-distribute-packages: - cabal-cargs - cabal-fix - cabal-query + - cabal-scaffold - cabal-test - cabal2arch - cabalmdvrpm @@ -800,7 +802,7 @@ dont-distribute-packages: - chart-cli - chart-svg - chart-svg-various - - chart-svg_0_6_1_0 + - chart-svg_0_7_0_0 - chart-unit - chassis - chatty @@ -963,14 +965,14 @@ dont-distribute-packages: - copilot-cbmc - copilot-frp-sketch - copilot-language - - copilot-language_3_20 + - copilot-language_4_0 - copilot-libraries - - copilot-libraries_3_20 + - copilot-libraries_4_0 - copilot-sbv - copilot-theorem - - copilot-theorem_3_20 + - copilot-theorem_4_0 - copilot-verifier - - copilot_3_20 + - copilot_4_0 - corenlp-parser - coroutine-enumerator - coroutine-iteratee @@ -987,7 +989,7 @@ dont-distribute-packages: - cqrs-test - cqrs-testkit - crackNum - - crackNum_3_12 + - crackNum_3_14 - craft - craftwerk-cairo - craftwerk-gtk @@ -1111,6 +1113,7 @@ dont-distribute-packages: - devtools - dewdrop - dfinity-radix-tree + - dhall-lex - dhall-secret - dia-functions - diagrams-reflex @@ -1160,7 +1163,7 @@ dont-distribute-packages: - distribution-plot - dixi - dl-fedora - - dl-fedora_1_1 + - dl-fedora_1_2 - dmenu-pkill - dmenu-pmount - dmenu-search @@ -1467,8 +1470,6 @@ dont-distribute-packages: - gelatin-gl - gelatin-sdl2 - gelatin-shaders - - gemini-router - - gemini-textboard - gencheck - generic-accessors - generic-override-aeson @@ -1499,7 +1500,6 @@ dont-distribute-packages: - gi-cairo-again - gi-ges - gi-gstpbutils - - gi-gtk-declarative-app-simple - git-config - git-fmt - git-gpush @@ -1509,6 +1509,7 @@ dont-distribute-packages: - gitdo - github-data - github-webhook-handler-snap + - github-workflow-commands - gitlib-cross - gitlib-s3 - gitson @@ -1519,7 +1520,6 @@ dont-distribute-packages: - glazier-react - glazier-react-examples - glazier-react-widget - - glirc - global - global-config - glome-hs @@ -1794,6 +1794,7 @@ dont-distribute-packages: - gtk2hs-cast-gtksourceview2 - gtkimageview - gtkrsync + - gtvm-hs - guarded-rewriting - guess-combinator - h3spec @@ -1821,7 +1822,6 @@ dont-distribute-packages: - hackage2twitter - hackmanager - haddock - - haddock_2_23_1 - haddocset - hadoop-tools - haggis @@ -1866,6 +1866,7 @@ dont-distribute-packages: - hark - harmony - haroonga-httpd + - harpie-numhask - has-th - hasbolt - hascat @@ -2013,7 +2014,6 @@ dont-distribute-packages: - hedgehog-gen-json - hedis-pile - heftia - - heftia-effects - heist-aeson - helic - helics @@ -2152,6 +2152,7 @@ dont-distribute-packages: - hs-pkpass - hs-profunctors - hs-sdl-term-emulator + - hs2ats - hs2dot - hsbackup - hsbencher-codespeed @@ -2173,6 +2174,7 @@ dont-distribute-packages: - hsinspect-lsp - hslogstash - hsparql + - hspec-dirstream - hspec-expectations-pretty - hspec-pg-transact - hspec-setup @@ -2321,6 +2323,7 @@ dont-distribute-packages: - introduction-test - intset - invertible-hlist + - io-classes-mtl - ion - ipatch - ipc @@ -2435,7 +2438,6 @@ dont-distribute-packages: - keera-hails-reactivelenses - keera-posture - keid-resource-gltf - - keid-ui-dearimgui - kerry - kevin - key-vault @@ -2458,6 +2460,7 @@ dont-distribute-packages: - kubernetes-client - kure-your-boilerplate - kurita + - kvitable_1_1_0_1 - laborantin-hs - labsat - labyrinth @@ -2484,6 +2487,7 @@ dont-distribute-packages: - landlock - lang - language-Modula2 + - language-ats - language-boogie - language-ecmascript-analysis - language-eiffel @@ -2494,6 +2498,7 @@ dont-distribute-packages: - language-python-colour - language-qux - language-spelling + - large-anon - lat - latex-formulae-hakyll - latex-formulae-pandoc @@ -3024,6 +3029,7 @@ dont-distribute-packages: - perdure - perf - perf-analysis + - perf_0_13_0_0 - perfecthash - periodic-client - periodic-client-exe @@ -3045,6 +3051,10 @@ dont-distribute-packages: - peyotls - peyotls-codec - pg-entity + - phladiprelio-general-shared + - phladiprelio-general-simple + - phladiprelio-ukrainian-shared + - phladiprelio-ukrainian-simple - phonetic-languages-common - phonetic-languages-constraints - phonetic-languages-examples @@ -3154,6 +3164,8 @@ dont-distribute-packages: - potoki-hasql - potoki-zlib - powerqueue-sqs + - ppad-hmac-drbg + - ppad-secp256k1 - pqueue-mtl - practice-room - pred-set @@ -3282,6 +3294,7 @@ dont-distribute-packages: - rasa-ext-vim - rascal - raw-feldspar + - rawlock - rawr - razom-text-util - rbr @@ -3371,6 +3384,7 @@ dont-distribute-packages: - reserve - resin - resource-pool-catchio + - resource-registry - resource-simple - respond - rest-client @@ -3541,7 +3555,6 @@ dont-distribute-packages: - serv - serv-wai - servant-aeson-generics-typescript - - servant-auth-client_0_4_2_0 - servant-auth-hmac - servant-auth-token - servant-auth-token-acid @@ -3805,7 +3818,7 @@ dont-distribute-packages: - sydtest-webdriver-screenshot_0_1_0_0 - sydtest-webdriver-yesod - sydtest-yesod - - sydtest_0_17_0_0 + - sydtest_0_18_0_0 - sylvia - symantic-atom - symantic-http-demo @@ -4006,6 +4019,7 @@ dont-distribute-packages: - ukrainian-phonetics-basic - unagi-bloomfilter - unbound + - unbound-generics-unify - unbound-kind-generics - unfoldable-restricted - uni-events @@ -4164,7 +4178,7 @@ dont-distribute-packages: - werewolf-slack - wgpu-hs - what4 - - what4_1_6 + - what4_1_6_2 - wheb-mongo - wheb-redis - wheb-strapped @@ -4281,25 +4295,6 @@ dont-distribute-packages: - yesod-routes-typescript - yesod-session-redis - yesod-worker - - yi - - yi-contrib - - yi-core - - yi-dynamic-configuration - - yi-emacs-colours - - yi-frontend-pango - - yi-frontend-vty - - yi-fuzzy-open - - yi-ireader - - yi-keymap-cua - - yi-keymap-emacs - - yi-keymap-vim - - yi-misc-modes - - yi-mode-haskell - - yi-mode-javascript - - yi-monokai - - yi-snippet - - yi-solarized - - yi-spolsky - yjftp - yjftp-libs - yoko diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 8477d68dfaf5..cee1e089cf60 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -113,6 +113,35 @@ self: super: builtins.intersectAttrs super { '' + drv.preCheck or ""; }) super.agda2lagda; + # - Disable scrypt support since the library used only works on x86 due to SSE2: + # https://github.com/informatikr/scrypt/issues/8 + # - Use crypton as the encryption backend. That override becomes obsolete with + # 3.1.* since cabal2nix picks crypton by default then. + password = + let + scryptSupported = pkgs.stdenv.hostPlatform.isx86; + in + + lib.pipe + (super.password.override ({ + cryptonite = self.crypton; + } // lib.optionalAttrs (!scryptSupported) { + scrypt = null; + })) + ([ + (enableCabalFlag "crypton") + (disableCabalFlag "cryptonite") + # https://github.com/cdepillabout/password/pull/84 + (appendPatch ./patches/password-3.0.4.0-scrypt-conditional.patch) + (overrideCabal (drv: { + # patch doesn't apply otherwise because of revisions + prePatch = drv.prePatch or "" + '' + ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal + ''; + })) + ] ++ lib.optionals (!scryptSupported) [ + (disableCabalFlag "scrypt") + ]); audacity = enableCabalFlag "buildExamples" (overrideCabal (drv: { executableHaskellDepends = [self.optparse-applicative self.soxlib]; @@ -156,6 +185,11 @@ self: super: builtins.intersectAttrs super { ''; }) super.nvvm; + # Doesn't declare LLVM dependency, needs llvm-config + llvm-codegen = addBuildTools [ + pkgs.llvmPackages_17.llvm.dev # for native llvm-config + ] super.llvm-codegen; + # hledger* overrides inherit ( let @@ -188,27 +222,27 @@ self: super: builtins.intersectAttrs super { hledger-web = installHledgerExtraFiles "" (hledgerWebTestFix super.hledger-web); hledger-ui = installHledgerExtraFiles "" super.hledger-ui; - hledger_1_34 = installHledgerExtraFiles "embeddedfiles" - (doDistribute (super.hledger_1_34.override { - hledger-lib = self.hledger-lib_1_34; + hledger_1_40 = installHledgerExtraFiles "embeddedfiles" + (doDistribute (super.hledger_1_40.override { + hledger-lib = self.hledger-lib_1_40; })); - hledger-ui_1_34 = installHledgerExtraFiles "" - (doDistribute (super.hledger-ui_1_34.override { - hledger = self.hledger_1_34; - hledger-lib = self.hledger-lib_1_34; + hledger-ui_1_40 = installHledgerExtraFiles "" + (doDistribute (super.hledger-ui_1_40.override { + hledger = self.hledger_1_40; + hledger-lib = self.hledger-lib_1_40; })); - hledger-web_1_34 = installHledgerExtraFiles "" (hledgerWebTestFix - (doDistribute (super.hledger-web_1_34.override { - hledger = self.hledger_1_34; - hledger-lib = self.hledger-lib_1_34; + hledger-web_1_40 = installHledgerExtraFiles "" (hledgerWebTestFix + (doDistribute (super.hledger-web_1_40.override { + hledger = self.hledger_1_40; + hledger-lib = self.hledger-lib_1_40; }))); } ) hledger hledger-web hledger-ui - hledger_1_34 - hledger-ui_1_34 - hledger-web_1_34 + hledger_1_40 + hledger-ui_1_40 + hledger-web_1_40 ; cufft = overrideCabal (drv: { @@ -300,7 +334,7 @@ self: super: builtins.intersectAttrs super { [ (disableHardening ["fortify"]) (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools) ] ++ - ( if pkgs.stdenv.isDarwin then [(appendConfigureFlag "-fhave-quartz-gtk")] else [] ) + ( if pkgs.stdenv.hostPlatform.isDarwin then [(appendConfigureFlag "-fhave-quartz-gtk")] else [] ) ); gtksourceview2 = addPkgconfigDepend pkgs.gtk2 super.gtksourceview2; gtk-traymanager = addPkgconfigDepend pkgs.gtk3 super.gtk-traymanager; @@ -376,9 +410,11 @@ self: super: builtins.intersectAttrs super { mustache = dontCheck super.mustache; arch-web = dontCheck super.arch-web; + # Tries accessing the GitHub API + github-app-token = dontCheck super.github-app-token; + # The curl executable is required for withApplication tests. 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" @@ -429,6 +465,7 @@ self: super: builtins.intersectAttrs super { shellify = enableSeparateBinOutput super.shellify; specup = enableSeparateBinOutput super.specup; + aws-spend-summary = enableSeparateBinOutput super.aws-spend-summary; # Test suite wants to connect to $DISPLAY. bindings-GLFW = dontCheck super.bindings-GLFW; @@ -520,7 +557,7 @@ self: super: builtins.intersectAttrs super { "--extra-include-dirs=${pkgs.cwiid}/include" "--extra-include-dirs=${pkgs.bluez.dev}/include" ]; - prePatch = '' sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal" ''; + prePatch = ''sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal"''; }) super.hcwiid; # cabal2nix doesn't pick up some of the dependencies. @@ -585,7 +622,7 @@ self: super: builtins.intersectAttrs super { # # Additional note: nixpkgs' freeglut and macOS's OpenGL implementation do not cooperate, # so disable this on Darwin only - ${if pkgs.stdenv.isDarwin then null else "GLUT"} = overrideCabal (drv: { + ${if pkgs.stdenv.hostPlatform.isDarwin then null else "GLUT"} = overrideCabal (drv: { pkg-configDepends = drv.pkg-configDepends or [] ++ [ pkgs.freeglut ]; @@ -823,9 +860,9 @@ self: super: builtins.intersectAttrs super { # https://git-annex.branchable.com/git-annex-shell/ passthru.shellPath = "/bin/git-annex-shell"; }) (super.git-annex.override { - dbus = if pkgs.stdenv.isLinux then self.dbus else null; - fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; - hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; + dbus = if pkgs.stdenv.hostPlatform.isLinux then self.dbus else null; + fdo-notify = if pkgs.stdenv.hostPlatform.isLinux then self.fdo-notify else null; + hinotify = if pkgs.stdenv.hostPlatform.isLinux then self.hinotify else self.fsnotify; }); # The test suite has undeclared dependencies on git. @@ -1117,6 +1154,22 @@ self: super: builtins.intersectAttrs super { (dontCheckIf (!pkgs.postgresql.doCheck)) ]; + cloudy = + pkgs.lib.pipe + super.cloudy + [ + # The code-path that generates the optparse-applicative completions uses + # the HOME directory, so that must be set in order to generate completions. + # https://github.com/cdepillabout/cloudy/issues/10 + ( overrideCabal (oldAttrs: { + postInstall = '' + export HOME=$TMPDIR + '' + (oldAttrs.postInstall or ""); + }) + ) + (self.generateOptparseApplicativeCompletions ["cloudy"]) + ]; + # Wants running postgresql database accessible over ip, so postgresqlTestHook # won't work (or would need to patch test suite). domaindriven-core = dontCheck super.domaindriven-core; @@ -1368,11 +1421,12 @@ self: super: builtins.intersectAttrs super { gi-javascriptcore gi-webkit2webextension gi-gtk_4_0_9 - gi-gdk_4_0_8 + gi-gdk_4_0_9 gi-gsk gi-adwaita sdl2-ttf sdl2 + dear-imgui ; webkit2gtk3-javascriptcore = lib.pipe super.webkit2gtk3-javascriptcore [ @@ -1394,7 +1448,7 @@ self: super: builtins.intersectAttrs super { mpiImpl = pkgs.mpi.pname; disableUnused = with builtins; map disableCabalFlag (filter (n: n != mpiImpl) validMpi); in lib.pipe - (super.mpi-hs_0_7_3_0.override { ompi = pkgs.mpi; }) + (super.mpi-hs_0_7_3_1.override { ompi = pkgs.mpi; }) ( [ (addTestToolDepends [ pkgs.openssh pkgs.mpiCheckPhaseHook ]) ] ++ disableUnused ++ lib.optional (builtins.elem mpiImpl validMpi) (enableCabalFlag mpiImpl) @@ -1431,4 +1485,9 @@ self: super: builtins.intersectAttrs super { "--skip=/Cabal.Paths/paths" ]; }) super.doctest; + + # tracked upstream: https://github.com/snapframework/openssl-streams/pull/11 + # certificate used only 1024 Bit RSA key and SHA-1, which is not allowed in OpenSSL 3.1+ + # security level 2 + openssl-streams = appendPatch ./patches/openssl-streams-cert.patch super.openssl-streams; } diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 23dc5054a854..14afa3dfe6b4 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -34,6 +34,8 @@ in , version, revision ? null , sha256 ? null , src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; } +, sourceRoot ? null +, setSourceRoot ? null , buildDepends ? [], setupHaskellDepends ? [], libraryHaskellDepends ? [], executableHaskellDepends ? [] , buildTarget ? "" , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? [] @@ -53,7 +55,7 @@ in # TODO enable shared libs for cross-compiling , enableSharedExecutables ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic && (ghc.enableShared or false) -, enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin +, enableDeadCodeElimination ? (!stdenv.hostPlatform.isDarwin) # TODO: use -dead_strip for darwin # Disabling this for ghcjs prevents this crash: https://gitlab.haskell.org/ghc/ghc/-/issues/23235 , enableStaticLibraries ? !(stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isWasm || stdenv.hostPlatform.isGhcjs) , enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows @@ -242,8 +244,8 @@ let "--with-gcc=$CC" # Clang won't work without that extra information. ] ++ [ "--package-db=$packageConfDir" - (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/${ghcLibdir}/${pname}-${version}") - (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") + (optionalString (enableSharedExecutables && stdenv.hostPlatform.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/${ghcLibdir}/${pname}-${version}") + (optionalString (enableSharedExecutables && stdenv.hostPlatform.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding (makeGhcOptions [ "-j$NIX_BUILD_CORES" "+RTS" "-A64M" "-RTS" ])) (optionalString useCpphs ("--with-cpphs=${cpphs}/bin/cpphs " + (makeGhcOptions [ "-cpp" "-pgmP${cpphs}/bin/cpphs" "-optP--cpp" ]))) (enableFeature enableLibraryProfiling "library-profiling") @@ -501,7 +503,7 @@ stdenv.mkDerivation ({ # the `$out/lib/links` directory to read-only when the build is done after the # dist directory has already been exported, which triggers an unnecessary # rebuild of modules included in the exported dist directory. - + (optionalString (stdenv.isDarwin && (enableSharedLibraries || enableSharedExecutables) && !enableSeparateIntermediatesOutput) '' + + (optionalString (stdenv.hostPlatform.isDarwin && (enableSharedLibraries || enableSharedExecutables) && !enableSeparateIntermediatesOutput) '' # Work around a limit in the macOS Sierra linker on the number of paths # referenced by any one dynamic library: # @@ -825,6 +827,8 @@ stdenv.mkDerivation ({ ; } +// optionalAttrs (args ? sourceRoot) { inherit sourceRoot; } +// optionalAttrs (args ? setSourceRoot) { inherit setSourceRoot; } // optionalAttrs (args ? preCompileBuildDriver) { inherit preCompileBuildDriver; } // optionalAttrs (args ? postCompileBuildDriver) { inherit postCompileBuildDriver; } // optionalAttrs (args ? preUnpack) { inherit preUnpack; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 46071ca84040..8115c6c15383 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -820,8 +820,10 @@ self: { }: mkDerivation { pname = "Agda"; - version = "2.7.0"; - sha256 = "005rsk46b7rl516n58cfzg5aqzqwb1gkz7wpz2lqg0qlrlw0jyh0"; + version = "2.7.0.1"; + sha256 = "13pn0mbxyfy04fcdl68l2m36b40hwk8iwpkqdfad3xsf9l5ddxil"; + revision = "2"; + editedCabalFile = "1v1nfzn3dxvdzrc7310jl29vf4yp40hhnkkbw6d9y8n14grn7lrp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -1170,8 +1172,8 @@ self: { }: mkDerivation { pname = "AsyncRattus"; - version = "0.2.0.1"; - sha256 = "0ay2j22x0awmlqvskwzslv637jqac5byf0pkmy4ymfmgkhpay9sn"; + version = "0.2.0.2"; + sha256 = "07m3iksjqs5zkm4vxjjlmamhj7lq3hal4yxsmv2zci0bq2ak7qs7"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base containers ghc ghc-boot hashtables simple-affine-space @@ -1369,6 +1371,7 @@ self: { ]; description = "Deriving Parsers and Quasi-Quoters from BNF Grammars"; license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.artem ]; }) {}; "BPS" = callPackage @@ -2886,19 +2889,19 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_6_3_0" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers + "Cabal_3_10_3_0" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal-syntax, containers , deepseq, directory, filepath, mtl, parsec, pretty, process, text , time, transformers, unix }: mkDerivation { pname = "Cabal"; - version = "3.6.3.0"; - sha256 = "0xxbciinap6938jldj16009s4rqjdd9dbbjvnjzgzs58sj4gx89g"; + version = "3.10.3.0"; + sha256 = "1imjq2zqm967j0lk3kzi4gyp9a35vlym31p7k7vmaxbdc9k7qzyb"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory filepath - mtl parsec pretty process text time transformers unix + array base bytestring Cabal-syntax containers deepseq directory + filepath mtl parsec pretty process text time transformers unix ]; doCheck = false; description = "A framework for packaging Haskell software"; @@ -2906,19 +2909,19 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_10_3_0" = callPackage + "Cabal_3_12_1_0" = callPackage ({ mkDerivation, array, base, bytestring, Cabal-syntax, containers - , deepseq, directory, filepath, mtl, parsec, pretty, process, text - , time, transformers, unix + , deepseq, directory, filepath, mtl, parsec, pretty, process, time + , transformers, unix }: mkDerivation { pname = "Cabal"; - version = "3.10.3.0"; - sha256 = "1imjq2zqm967j0lk3kzi4gyp9a35vlym31p7k7vmaxbdc9k7qzyb"; + version = "3.12.1.0"; + sha256 = "1lmnmp1ag9lwaxks66ba26mi4q10afnl0a82nj1fv27bnjzz8hkn"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base bytestring Cabal-syntax containers deepseq directory - filepath mtl parsec pretty process text time transformers unix + filepath mtl parsec pretty process time transformers unix ]; doCheck = false; description = "A framework for packaging Haskell software"; @@ -2926,15 +2929,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_12_1_0" = callPackage + "Cabal_3_14_0_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.1.0"; - sha256 = "1lmnmp1ag9lwaxks66ba26mi4q10afnl0a82nj1fv27bnjzz8hkn"; + version = "3.14.0.0"; + sha256 = "0pfvw4r4xdnis34k4pz987283g2r5gv3akxnfp7s3jgxffd7nm94"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base bytestring Cabal-syntax containers deepseq directory @@ -3042,6 +3045,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "Cabal-syntax_3_14_0_0" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, filepath, mtl, parsec, pretty, text, time + , transformers + }: + mkDerivation { + pname = "Cabal-syntax"; + version = "3.14.0.0"; + sha256 = "0c9gwm9za13zvrwbq2lgzfcw6r42r2pwc424qk3vjnv4kazrni5x"; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + mtl parsec pretty text time transformers + ]; + libraryToolDepends = [ alex ]; + description = "A library for working with .cabal files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "CabalSearch" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, HDBC , HDBC-sqlite3, process, unix @@ -3205,6 +3227,8 @@ self: { pname = "Chart"; version = "1.9.5"; sha256 = "0nyzdag9p56vknrphdnqjsf19fmw9abs81avdm2vjgh9cnw2y7hc"; + revision = "1"; + editedCabalFile = "0gi758fccq3674sxzs5qcdlyjivh78lzin5k4cb15d3gscjakkhk"; libraryHaskellDepends = [ array base colour data-default-class lens mtl old-locale operational time vector @@ -3221,6 +3245,8 @@ self: { pname = "Chart-cairo"; version = "1.9.4.1"; sha256 = "0x10l9y38bscx88n849k9ybn7axp4j9hlivc1jv9wwvv4gqw5jr7"; + revision = "1"; + editedCabalFile = "193liy309yb9dnlfzfrc2kis0g8mj6ni1pqfr4kpn860r1m5gr5b"; libraryHaskellDepends = [ array base cairo Chart colour data-default-class lens mtl old-locale operational time @@ -3239,6 +3265,8 @@ self: { pname = "Chart-diagrams"; version = "1.9.5.1"; sha256 = "1pk2fsmjl2dsabzpdwk3190nw0nwy581c4qsl93npx764qcxkp7q"; + revision = "1"; + editedCabalFile = "0s2c4qrmy21y7cmsq24g67fw1q5vsspda8bz2ybp6117crnzw817"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-markup bytestring Chart colour containers @@ -3351,28 +3379,10 @@ self: { }: mkDerivation { pname = "ChasingBottoms"; - version = "1.3.1.14"; - sha256 = "0rmpi7n0b9spvx84645z2zcnnvg75s40zl05c8iigzciyjax3v5y"; - revision = "1"; - editedCabalFile = "12ndnigvq4bhw65ia2ahy741krph0p1w50d8q9irw3ggaic9ijry"; - libraryHaskellDepends = [ - base containers mtl QuickCheck random syb - ]; - testHaskellDepends = [ - array base containers mtl QuickCheck random syb - ]; - description = "For testing partial and infinite values"; - license = lib.licenses.mit; - }) {}; - - "ChasingBottoms_1_3_1_15" = callPackage - ({ mkDerivation, array, base, containers, mtl, QuickCheck, random - , syb - }: - mkDerivation { - pname = "ChasingBottoms"; version = "1.3.1.15"; sha256 = "0if8h6xq10y1xa90cwmx2jkxjn9628rzs8y6fsjmpjdcvcyr5wnj"; + revision = "1"; + editedCabalFile = "1h3c5dhaqkpmc7cvivigadfkjkjjriahzcpdw8qg62fl44gbkmh2"; libraryHaskellDepends = [ base containers mtl QuickCheck random syb ]; @@ -3381,7 +3391,6 @@ self: { ]; description = "For testing partial and infinite values"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "CheatSheet" = callPackage @@ -4843,24 +4852,6 @@ self: { broken = true; }) {}; - "Diff_0_3_4" = callPackage - ({ mkDerivation, array, base, directory, pretty, process - , QuickCheck, test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "Diff"; - version = "0.3.4"; - sha256 = "0bqcdvhxx8dmqc3793m6axg813wv9ldz2j37f1wygbbrbbndmdvp"; - libraryHaskellDepends = [ array base pretty ]; - testHaskellDepends = [ - array base directory pretty process QuickCheck test-framework - test-framework-quickcheck2 - ]; - description = "O(ND) diff algorithm in haskell"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "Diff" = callPackage ({ mkDerivation, array, base, directory, pretty, process , QuickCheck, test-framework, test-framework-quickcheck2 @@ -4878,16 +4869,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "Diff_0_5" = callPackage + "Diff_1_0_1_1" = callPackage ({ mkDerivation, array, base, directory, pretty, process , QuickCheck, test-framework, test-framework-quickcheck2 }: mkDerivation { pname = "Diff"; - version = "0.5"; - sha256 = "0la5npl3zglzbsnlbksp0s6khb79cm6hbdxhy29sd3xivzg89k03"; - revision = "1"; - editedCabalFile = "1fxg0ibi80dq68draxfh1p0n4mkmyn7gm0b51jwpkq6rx8p9g2lw"; + version = "1.0.1.1"; + sha256 = "060ksa6ql4v6gjdjhrd4q1kr9qs7hz48pacan8gq6baa7xvc5m6v"; libraryHaskellDepends = [ array base pretty ]; testHaskellDepends = [ array base directory pretty process QuickCheck test-framework @@ -5898,8 +5887,8 @@ self: { pname = "Euterpea"; version = "2.0.7"; sha256 = "0kxdilxzg0dgz1684csbyfv4cifh9d92ac6pwp6dnrcwwpwskiw8"; - revision = "1"; - editedCabalFile = "1fdkjivbrp9q5vwiprjhpnpl9bir1qdiybc2hm52i016x3rx51d8"; + revision = "2"; + editedCabalFile = "05z8vn26yr8hl2dh23g80fpxj8s90hdaajjfnpblrkzhczz7317s"; libraryHaskellDepends = [ array arrows base bytestring containers deepseq ghc-prim HCodecs heap PortMidi random stm @@ -7130,8 +7119,8 @@ self: { }: mkDerivation { pname = "GLFW-b"; - version = "3.3.9.0"; - sha256 = "12n75mh0szw43y1fqsf95cbwvqy9gmmq7h3lii7gs02mv45fysrc"; + version = "3.3.9.1"; + sha256 = "0slj4a12y8n3api71kshfnhnqxd4zaf020lm1050bq0jsx35pja6"; libraryHaskellDepends = [ array base bindings-GLFW deepseq ]; testHaskellDepends = [ array base bindings-GLFW deepseq HUnit test-framework @@ -10796,8 +10785,8 @@ self: { ({ mkDerivation, array, base, containers, random }: mkDerivation { pname = "HaskellForMaths"; - version = "0.4.9"; - sha256 = "1jgim9g0jbv6k31aalq0yps843jmfx74k53lnd1p79kgad7670rz"; + version = "0.4.10"; + sha256 = "0ydaw5xwck2l9xzlqrdf3qv7p5s6dqd131q3mx6g0wpqpkjjic4q"; libraryHaskellDepends = [ array base containers random ]; description = "Combinatorics, group theory, commutative algebra, non-commutative algebra"; license = lib.licenses.bsd3; @@ -11516,20 +11505,6 @@ self: { ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.7.7"; - sha256 = "0aza9w7ny1aangaspg4wkzhy0s26ngvfdq4zrd24iha1d9qh4nq8"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring network time ]; - librarySystemDepends = [ openssl ]; - testHaskellDepends = [ base bytestring ]; - description = "Partial OpenSSL binding for Haskell"; - license = lib.licenses.publicDomain; - }) {inherit (pkgs) openssl;}; - - "HsOpenSSL_0_11_7_8" = callPackage - ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: - mkDerivation { - pname = "HsOpenSSL"; version = "0.11.7.8"; sha256 = "0y46ygdyi195d2ns74gbyabwrvnh5w10xqxdd6jrw43f70jsa5xw"; setupHaskellDepends = [ base Cabal ]; @@ -11538,7 +11513,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Partial OpenSSL binding for Haskell"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) openssl;}; "HsOpenSSL-x509-system" = callPackage @@ -11829,8 +11803,8 @@ self: { }: mkDerivation { pname = "I1M"; - version = "0.1.0"; - sha256 = "0a5bh9hlsn6hmdqinc47hxlav1isv9jh2i4x3zfyfp4y4xrp2h93"; + version = "0.2.2"; + sha256 = "1p8rv0rhjyjjic03zzjp7qw1j3p5nz4if5ib9w1l0frlrybqb1s8"; libraryHaskellDepends = [ array base QuickCheck ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Code for the Haskell course taught at the University of Seville"; @@ -11961,8 +11935,8 @@ self: { }: mkDerivation { pname = "IPv6DB"; - version = "0.3.3.3"; - sha256 = "1f376a5zc0q20s2jp4z00hxj9h0ngp7k2bgx53g328hf3qyq676z"; + version = "0.3.3.4"; + sha256 = "1mkf2fqlg2n9q3l3p8rxdcmb7k281lz37x6hiry1wvxbn92d4pja"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -13022,6 +12996,8 @@ self: { pname = "LPFP"; version = "1.1.4"; sha256 = "1g86ajibry5ssz3nqnqvnd0w6psyr9gl6wsp6ijaa6r6y1izw1fa"; + revision = "1"; + editedCabalFile = "10k4c0dpjxsnh0c27i1slqhlkn3s81x6xbz54qjm97kkw75fs1zn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -13043,6 +13019,8 @@ self: { pname = "LPFP-core"; version = "1.1.1"; sha256 = "030n95g1hq2ikawbwifgqzjfdg2y6hyl8vpvybg7ha36hb6vafn1"; + revision = "1"; + editedCabalFile = "1zxnd65apf1ris333d1dkp9aw62qmf9if1vh2invnnhjzl7aq2hz"; libraryHaskellDepends = [ base containers ]; description = "Code for the book Learn Physics with Functional Programming"; license = lib.licenses.bsd3; @@ -13989,10 +13967,8 @@ self: { }: mkDerivation { pname = "MIP"; - version = "0.1.1.0"; - sha256 = "03gzwg0hzgij9hpxxfsrdxx2cknfy9fr9h1w1na04bmzpai1sl40"; - revision = "2"; - editedCabalFile = "03kjzsyd3sy9iipdnac5ddpkq6v1cfpj0wh00r3yvcjgrk99ycip"; + version = "0.1.2.0"; + sha256 = "0klbcqzi7iq0fffci9mq98smx0wksij4cfmg09v7k37dhs958mgd"; libraryHaskellDepends = [ base bytestring bytestring-encoding case-insensitive containers data-default-class extended-reals filepath intern lattices @@ -14112,6 +14088,18 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "Mantissa" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "Mantissa"; + version = "0.1.0.0"; + sha256 = "1xi8pc9gz6j1bvz77mgfh6xw39dbxb6hjrfqj3kx5d702j1y8b9l"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "Reals in the interval [0,1), as machine words"; + license = lib.licenses.bsd3; + }) {}; + "Map" = callPackage ({ mkDerivation, base, containers, either-both, filtrable , smallcheck, tasty, tasty-smallcheck, util @@ -14367,8 +14355,8 @@ self: { ({ mkDerivation, base, directory, process }: mkDerivation { pname = "MicroCabal"; - version = "0.2.0.0"; - sha256 = "1i5y0xkq0ac74yrjmk9s2vjlgbiscz0d6b1kll42mbk6adkfd02x"; + version = "0.2.1.1"; + sha256 = "0yln9inja3m624qqpslws8jxk4x27v0yy7pc7p7915c15lxnpy68"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory process ]; @@ -14383,17 +14371,19 @@ self: { }: mkDerivation { pname = "MicroHs"; - version = "0.9.17.0"; - sha256 = "00dvbpdpbx1dh44rixsw16gb748bdxiizdivnl3i4v9826hfx8x0"; + version = "0.10.4.0"; + sha256 = "15c4kwkbnz894zvcvdj035k6lcjj8rh9rjm6l7cwirqk2q5nk6pm"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ base deepseq directory ghc-prim haskeline process text time ]; - description = "A compiler for Haskell"; + description = "A small compiler for Haskell"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; mainProgram = "mhs"; + broken = true; }) {}; "MicrosoftTranslator" = callPackage @@ -14681,10 +14671,8 @@ self: { }: mkDerivation { pname = "MonadRandom"; - version = "0.6"; - sha256 = "0i6h9s2iqj71q06i9al3s2akmdjjx16h015qb81nhgjwi4q8cf69"; - revision = "4"; - editedCabalFile = "0hz8l2yx9p5qwis7lxsnk7n3zss00hw3rxphhj6ih56ppjv7d6h3"; + version = "0.6.1"; + sha256 = "09v56xbp4l0qpv8l18289p4xmjjh56q07crj9h5801fiji8zz4w8"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -15276,6 +15264,8 @@ self: { pname = "NanoID"; version = "3.4.0.2"; sha256 = "1dddc7aakhrj65kdspj8ashfdfl894ybqf7iwy94l344ikldfkaj"; + revision = "2"; + editedCabalFile = "0yb2bkc0mdywmn1px7i4fpfa6n37fj1fgdzsl3bmcbw9w26qikxc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -16897,8 +16887,8 @@ self: { ({ mkDerivation, base, containers, diagrams-lib, hspec }: mkDerivation { pname = "PenroseKiteDart"; - version = "1.0.0"; - sha256 = "068r77shs4j5vhwdzwwxq0c3ajx0nhrm8apdb8j2h5kb0s3yav5y"; + version = "1.1.0"; + sha256 = "0m1wigw2n2cp1cgbj615xrzqq81yaaprdrfnpd7qilnzijrp0biq"; libraryHaskellDepends = [ base containers diagrams-lib ]; testHaskellDepends = [ base containers diagrams-lib hspec ]; benchmarkHaskellDepends = [ base containers diagrams-lib ]; @@ -18088,14 +18078,24 @@ self: { }) {}; "RandomDotOrg" = callPackage - ({ mkDerivation, base, HTTP-Simple, network }: + ({ mkDerivation, aeson, base, binary, bytestring, http-client + , http-client-tls, http-media, servant, servant-client + , servant-client-core, servant-jsonrpc, servant-jsonrpc-client + , text, time, unordered-containers, uuid-types + }: mkDerivation { pname = "RandomDotOrg"; - version = "0.2.1"; - sha256 = "0rfarn424wsvvwvi7b1qzvzc63dxfqmlyrfd0hdcvmgkq5h2iy4c"; - libraryHaskellDepends = [ base HTTP-Simple network ]; - description = "Interface to random.org"; - license = lib.licenses.publicDomain; + version = "1.0"; + sha256 = "10a4vh3n308i628v58s6wb5yn3vhpb4d989bmd4vvyv39xv92sj6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring http-client http-client-tls http-media + servant servant-client servant-client-core servant-jsonrpc + servant-jsonrpc-client text time unordered-containers uuid-types + ]; + description = "Haskell bindings to the RANDOM.ORG Core API"; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19059,6 +19059,8 @@ self: { pname = "SVGFonts"; version = "1.8.0.1"; sha256 = "0r3z7i7x56qvhyc51jlq084c1biy9xn72nm19mw116gx49rm32k9"; + revision = "2"; + editedCabalFile = "1kk7hbsd0aard9457y674rw5yvailfap1jzmvmvzmfi4ripwqxag"; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base blaze-markup blaze-svg bytestring cereal @@ -20043,6 +20045,8 @@ self: { pname = "Sit"; version = "0.2023.8.3"; sha256 = "1psmfgh1bklx52az1097n23nzfjnab002dcqrq140jqhnpfw7ynr"; + revision = "1"; + editedCabalFile = "0f2dwl2p9xms7qxsnsf18hmywvlsz96gb6zdzc2nmcr367vqkkcd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -20344,6 +20348,8 @@ self: { pname = "Spintax"; version = "0.3.6.1"; sha256 = "066pks24c4501i86hgll3bygqkgyag7n2src19k0x9gc05p130wr"; + revision = "1"; + editedCabalFile = "1946q9361nzsp4aa6jxv36g96nhgb7isv3wpcrnvvk4r2w0jvlmp"; libraryHaskellDepends = [ attoparsec base extra mtl mwc-random text ]; @@ -20930,6 +20936,29 @@ self: { broken = true; }) {}; + "THSH" = callPackage + ({ mkDerivation, base, extra, filepath, ghc, parsec, process, PyF + , split, template-haskell, temporary, text, transformers + }: + mkDerivation { + pname = "THSH"; + version = "0.0.0.5"; + sha256 = "0hfc3f68w5n55k5gnlf6ip76j3b7yvirb81k373w8vq4rgqf447s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath ghc parsec process PyF template-haskell temporary + text transformers + ]; + executableHaskellDepends = [ + base extra filepath ghc process PyF split template-haskell + ]; + testHaskellDepends = [ base ghc PyF template-haskell ]; + description = "A \"noDSL\" approach to mixing shell scripting with Haskell programs using Template Haskell"; + license = lib.licenses.mit; + mainProgram = "thsh"; + }) {}; + "TLT" = callPackage ({ mkDerivation, ansi-terminal, base, free, mtl, resourcet , STMonadTrans, transformers @@ -22274,7 +22303,6 @@ self: { badPlatforms = [ "i686-linux" "armv7l-linux" ] ++ lib.platforms.darwin; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "WAVE" = callPackage @@ -22624,19 +22652,20 @@ self: { "WidgetRattus" = callPackage ({ mkDerivation, base, Cabal, containers, ghc, ghc-boot, hashtables - , simple-affine-space, template-haskell, text, transformers + , monomer, simple-affine-space, template-haskell, text + , transformers }: mkDerivation { pname = "WidgetRattus"; - version = "0.2"; - sha256 = "0i54i5krl10ivmv9rm3aqi02zkqcwjid71iwdm2pjld6z2ls2z4y"; + version = "0.3"; + sha256 = "144fkaxw2v00ynsp9s52r6dpfagfmngh9mrc77ynl2vvyf99zlm7"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ - base containers ghc ghc-boot hashtables simple-affine-space - template-haskell transformers + base containers ghc ghc-boot hashtables monomer simple-affine-space + template-haskell text transformers ]; testHaskellDepends = [ base containers text ]; - description = "An asynchronous modal FRP language"; + description = "An asynchronous modal FRP language for GUI programming"; license = lib.licenses.bsd3; }) {}; @@ -23373,8 +23402,8 @@ self: { }: mkDerivation { pname = "Yampa"; - version = "0.14.10"; - sha256 = "1la2v70pzjmvw4j0v5sacb6vxclby86jx68jq6czzxyrl8ydijzc"; + version = "0.14.11"; + sha256 = "1pz1s0vb2h62zggbj6y6c3qhx7008758zq9gds347qv1hwg82jn9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25422,8 +25451,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "acquire"; - version = "0.3.5"; - sha256 = "1xxr94rnywg7mnf6fq9gbvakglnr1qbyjgvclrsrifjmzmdpbr9p"; + version = "0.3.6"; + sha256 = "1k704606ykjkgiapgaxp058rnaanr5fv977l4hj49b5ck4ghd9hh"; libraryHaskellDepends = [ base mtl transformers ]; description = "Abstraction over management of resources"; license = lib.licenses.mit; @@ -26026,14 +26055,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "aern2-mp_0_2_16_1" = callPackage + ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec + , integer-logarithms, mixed-types-num, QuickCheck, reflection + , regex-tdfa, template-haskell + }: + mkDerivation { + pname = "aern2-mp"; + version = "0.2.16.1"; + sha256 = "0y0043ckrg1cx1kpf18jk9nmav2h3bp1w4ywwnbwq2abqf3kmd1p"; + libraryHaskellDepends = [ + base cdar-mBound collect-errors deepseq hspec integer-logarithms + mixed-types-num QuickCheck reflection regex-tdfa template-haskell + ]; + testHaskellDepends = [ + base cdar-mBound collect-errors deepseq hspec integer-logarithms + mixed-types-num QuickCheck reflection regex-tdfa template-haskell + ]; + description = "Multi-precision ball (interval) arithmetic"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aern2-real" = callPackage ({ mkDerivation, aern2-mp, base, collect-errors, hspec , integer-logarithms, mixed-types-num, QuickCheck }: mkDerivation { pname = "aern2-real"; - version = "0.2.15"; - sha256 = "0r3b2m728dwsyj5qcy7pczmbvcnb7712jj830pssy2065d1ws2rx"; + version = "0.2.15.1"; + sha256 = "0vil86s8cmigdk8wss0kxa74p4bw6f56lmxi9x0gm62xnj63awvg"; libraryHaskellDepends = [ aern2-mp base collect-errors hspec integer-logarithms mixed-types-num QuickCheck @@ -26046,6 +26097,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "aern2-real_0_2_16_1" = callPackage + ({ mkDerivation, aern2-mp, base, collect-errors, hspec + , integer-logarithms, mixed-types-num, QuickCheck + }: + mkDerivation { + pname = "aern2-real"; + version = "0.2.16.1"; + sha256 = "00g504rqvr3z5a8asnhr6c9xrhd6wjqzcscgik1qj2wvxfls32f6"; + libraryHaskellDepends = [ + aern2-mp base collect-errors hspec integer-logarithms + mixed-types-num QuickCheck + ]; + testHaskellDepends = [ + aern2-mp base collect-errors hspec integer-logarithms + mixed-types-num QuickCheck + ]; + description = "Real numbers as convergent sequences of intervals"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson_1_5_6_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat , base-compat-batteries, base-orphans, base16-bytestring @@ -26590,6 +26662,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson-generic-default" = callPackage + ({ mkDerivation, aeson, base, data-default, tasty, tasty-hunit + , text + }: + mkDerivation { + pname = "aeson-generic-default"; + version = "0.1.1.0"; + sha256 = "0al9xd9mdxffvpx0mb3rll68gmizwknh3g6ixfnvxx62anb47w2p"; + libraryHaskellDepends = [ aeson base data-default text ]; + testHaskellDepends = [ + aeson base data-default tasty tasty-hunit text + ]; + description = "Type-level default fields for aeson Generic FromJSON parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "aeson-generics-typescript" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, hspec, process, QuickCheck, random, split @@ -27112,8 +27202,8 @@ self: { }: mkDerivation { pname = "aeson-typescript"; - version = "0.6.3.0"; - sha256 = "1bmhjl10adms07l2fg7qpjr3qsqdbwdfmj5psh6vi5s13w0sjxz9"; + version = "0.6.4.0"; + sha256 = "0xhh2xdg1axpwaigq1g200a516j3w7g5lrk0adin2nsafidc66zx"; libraryHaskellDepends = [ aeson base bytestring containers mtl string-interpolate template-haskell text th-abstraction transformers @@ -27350,6 +27440,32 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "aftovolio" = callPackage + ({ mkDerivation, async, base, cli-arguments, containers, deepseq + , directory, intermediate-structures, lists-flines, minmax + , mmsyn2-array, monoid-insertleft, quantizer, rev-scientific + , rhythmic-sequences + }: + mkDerivation { + pname = "aftovolio"; + version = "0.4.0.0"; + sha256 = "0gf86va0x7ni169w4swcr1m5qf115i925pckbw342m7md3k8a6rv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base cli-arguments containers deepseq directory + intermediate-structures lists-flines minmax mmsyn2-array + monoid-insertleft quantizer rev-scientific rhythmic-sequences + ]; + executableHaskellDepends = [ + async base cli-arguments containers deepseq directory + intermediate-structures lists-flines minmax mmsyn2-array + monoid-insertleft quantizer rev-scientific rhythmic-sequences + ]; + description = "An AFTOVolio implementation for creating texts with special phonetic / prosodic properties"; + license = lib.licenses.mit; + }) {}; + "afv" = callPackage ({ mkDerivation, base, bytestring, directory, language-c, mtl , process, yices @@ -27505,18 +27621,20 @@ self: { "agda2hs" = callPackage ({ mkDerivation, aeson, Agda, base, bytestring, containers, deepseq - , directory, filepath, haskell-src-exts, mtl, syb, text - , unordered-containers, yaml + , directory, filepath, haskell-src-exts, monad-control, mtl, syb + , text, transformers, unordered-containers, yaml }: mkDerivation { pname = "agda2hs"; - version = "1.2"; - sha256 = "0xd9ngvymr1wix1hhf6i3qm2sc1n2zgf6gpc2ss4plhbaw60idpx"; + version = "1.3"; + sha256 = "0vifmyqyhsjib3yqdxj59qlxh22wmbz7vbj1z0axwfpvy5mhvidk"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson Agda base bytestring containers deepseq directory filepath - haskell-src-exts mtl syb text unordered-containers yaml + haskell-src-exts monad-control mtl syb text transformers + unordered-containers yaml ]; description = "Compiling Agda code to readable Haskell"; license = lib.licenses.bsd3; @@ -28085,19 +28203,20 @@ self: { }) {inherit (pkgs) openal;}; "alarmclock" = callPackage - ({ mkDerivation, async, base, clock, hspec, stm, time - , unbounded-delays + ({ mkDerivation, async, base, clock, hspec, hspec-discover, stm + , time, unbounded-delays }: mkDerivation { pname = "alarmclock"; - version = "0.7.0.6"; - sha256 = "02fkmdhhzdmjkz68l9gayk99b21kvm47ksaflqlqsw3yiy8zq2ss"; + version = "0.7.0.7"; + sha256 = "18f4y7g7iv7mvwbjgn6vf668qc9n0sig4q0qlh5l34bkvmzkp3pz"; libraryHaskellDepends = [ async base clock stm time unbounded-delays ]; testHaskellDepends = [ async base clock hspec stm time unbounded-delays ]; + testToolDepends = [ hspec-discover ]; description = "Wake up and perform an action at a certain time"; license = lib.licenses.bsd3; }) {}; @@ -28205,6 +28324,7 @@ self: { libraryToolDepends = [ alex happy ]; description = "Quasi-quoter for Alex lexers"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.artem ]; }) {}; "alex-prelude" = callPackage @@ -28227,8 +28347,8 @@ self: { pname = "alex-tools"; version = "0.6.1"; sha256 = "1nh8qbsv4sn6gxc7j8cbp2pb85cajilzhp8rchlwnk7bv8lzf8ji"; - revision = "2"; - editedCabalFile = "1ykm6ycxahwjkjdadcifay94c4mmp9lp3mgrca1150cvv0ff30f8"; + revision = "3"; + editedCabalFile = "020l3qsm10jag2lblcfr7anissn2gi2p9nagwcs8am56siv14n0h"; libraryHaskellDepends = [ base bytestring deepseq template-haskell text ]; @@ -28263,8 +28383,8 @@ self: { }: mkDerivation { pname = "alfred-margaret"; - version = "2.1.0.0"; - sha256 = "1k4qmj15wlk7mdmi2nv3a3wyykf4fgjsdkjpvzkwd26zd3aasl9c"; + version = "2.1.0.2"; + sha256 = "1pn15w5avqlsy4yj6n08kgvqq7l24p1vz3daq7djjvqxlrkgcmnx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -28729,6 +28849,8 @@ self: { pname = "align-audio"; version = "0.0.0.1"; sha256 = "1r1660igj6bmzhccw30vj0wsz7jjkd5k0vbr4nrcbpcwkxllshnb"; + revision = "1"; + editedCabalFile = "1cqxzanhz71lgivffxddq95ay0vaxfpjl3b0zpzbcw3filfkqihy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36311,7 +36433,7 @@ self: { mainProgram = "amqp-builder"; }) {}; - "amqp_0_23_0" = callPackage + "amqp_0_24_0" = callPackage ({ mkDerivation, base, binary, bytestring, clock, containers , crypton-connection, data-binary-ieee754, data-default-class , hspec, hspec-expectations, monad-control, network, network-uri @@ -36319,8 +36441,8 @@ self: { }: mkDerivation { pname = "amqp"; - version = "0.23.0"; - sha256 = "0cp0hg4fmqxhzah67hgbwrrm2m7pn64y88chqk5vjhfa19km2np8"; + version = "0.24.0"; + sha256 = "0swrh5dh9hwp8m15x4hiplm89ls19bpmir44wnffzgz7v8rxh1mx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36529,7 +36651,9 @@ self: { ]; description = "Simple literate programming preprocessor"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "anansi"; + broken = true; }) {}; "anansi-hscolour" = callPackage @@ -36545,6 +36669,7 @@ self: { ]; description = "Colorized looms for Anansi"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; }) {}; "anansi-pandoc" = callPackage @@ -36977,14 +37102,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "annotated-exception_0_3_0_1" = callPackage + "annotated-exception_0_3_0_2" = callPackage ({ mkDerivation, base, containers, hspec, hspec-discover , safe-exceptions, text, unliftio-core }: mkDerivation { pname = "annotated-exception"; - version = "0.3.0.1"; - sha256 = "09lgqzx5g7wnfpj9a8zn10s8v919psxrzzg50vllryaqxxkfmj4a"; + version = "0.3.0.2"; + sha256 = "1xsyq28hkf7ngkq9v5ga958d2fqbmshc9gl8lzms6vknr64gaqr7"; libraryHaskellDepends = [ base containers safe-exceptions text unliftio-core ]; @@ -37199,8 +37324,8 @@ self: { pname = "ansigraph"; version = "0.3.0.5"; sha256 = "03ks75ik0jyfz55iz3gcccxgg73v1dw2nn0myl40c2rc31mwz39f"; - revision = "1"; - editedCabalFile = "047pnpd9sviia1wxx9czidz2in6jq7jgbln7l6dy2j157vyqi93k"; + revision = "2"; + editedCabalFile = "0kq3dijahr4yxp13v3v5d5v0v3zswkxh8idx5hyv0yp9d1czqars"; libraryHaskellDepends = [ ansi-terminal base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Terminal-based graphing via ANSI and Unicode"; @@ -38755,8 +38880,8 @@ self: { }: mkDerivation { pname = "apple"; - version = "0.2.0.0"; - sha256 = "0si1yqwplmxggfd4gifakk9hy2fwycgb4m6vhmzwpx08gjwdls08"; + version = "0.3.0.0"; + sha256 = "09vhpv00xaavfjq3wx4361mhfi92mbhcvqcwvb55aad9dd6x4x63"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -38778,7 +38903,7 @@ self: { ]; testToolDepends = [ cpphs ]; benchmarkHaskellDepends = [ - base bytestring criterion erf hypergeometric statistics + base bytestring criterion deepseq erf hypergeometric statistics ]; doHaddock = false; description = "Apple array language compiler"; @@ -39101,6 +39226,8 @@ self: { pname = "apportionment"; version = "0.0.0.4"; sha256 = "12b4jlh3k3da1w5lw8z83qgvn0ys85xwvdqylm5kwfi2i1i72256"; + revision = "1"; + editedCabalFile = "051cznvkni4gl0715q9mxi07p39xq3vzlnzmaazrxvh74nnzlcqf"; libraryHaskellDepends = [ base containers utility-ht ]; testHaskellDepends = [ base doctest-exitcode-stdio doctest-lib QuickCheck @@ -39559,10 +39686,8 @@ self: { }: mkDerivation { pname = "arch-web"; - version = "0.2"; - sha256 = "0axyb62pjgh1l60qx6z8mppiq5gam3g6c9wfbrww8wl7f2kamwrp"; - revision = "1"; - editedCabalFile = "1msmx8w3m2aypigramyiwqz77vzx8r6ssyp0p35ndb03mzmrry3p"; + version = "0.3.1"; + sha256 = "1z8zfl0dskp7i0h5kgrw1nh94sxrmmfdpaykdjqiingn9dqnsmqm"; libraryHaskellDepends = [ aeson base deriving-aeson exceptions http-client http-client-tls http-types lens mtl servant servant-client servant-client-core text @@ -39863,20 +39988,21 @@ self: { "argon" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal - , containers, directory, docopt, filepath, ghc, ghc-paths - , ghc-syb-utils, hlint, hspec, lens-simple, pipes, pipes-bytestring - , pipes-files, pipes-group, pipes-safe, QuickCheck, syb + , containers, directory, dirstream, docopt, filepath, ghc, ghc-boot + , ghc-paths, ghc-syb-utils, hlint, hspec, lens-simple, pipes + , pipes-bytestring, pipes-group, pipes-safe, QuickCheck, syb + , system-filepath }: mkDerivation { pname = "argon"; - version = "0.4.1.0"; - sha256 = "1sjv8zablab38wl9xir2hkkk997as7ryb57dqnyr6i4a26p50g6r"; + version = "0.4.2.0"; + sha256 = "1cx0j4396m0bczzk0zzn5i2wjmny43da8s2bhr7a3ghj8kg0dhw7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring Cabal containers directory ghc - ghc-paths ghc-syb-utils lens-simple pipes pipes-bytestring - pipes-files pipes-group pipes-safe syb + aeson ansi-terminal base bytestring Cabal containers directory + dirstream filepath ghc ghc-boot ghc-paths ghc-syb-utils lens-simple + pipes pipes-bytestring pipes-group pipes-safe syb system-filepath ]; executableHaskellDepends = [ base docopt pipes pipes-safe ]; testHaskellDepends = [ @@ -40250,12 +40376,14 @@ self: { broken = true; }) {inherit (pkgs) arpack;}; - "array_0_5_7_0" = callPackage + "array_0_5_8_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "array"; - version = "0.5.7.0"; - sha256 = "155ka0ax0z0niwgy68cnrh3zd75a5xw1i6wvaaqk0sszgxqr6myh"; + version = "0.5.8.0"; + sha256 = "0sz6cm7p8n7kh8xyn0lpl7g6g744r57v9c2d827ng3b0mkb2s0is"; + revision = "1"; + editedCabalFile = "0j8lbxf3wliz3cal5zp9bh0ifisn0kncadg98fnlav5ls8rmby8n"; libraryHaskellDepends = [ base ]; description = "Mutable and immutable arrays"; license = lib.licenses.bsd3; @@ -41649,8 +41777,8 @@ self: { pname = "async"; version = "2.2.5"; sha256 = "1xqnixmcxbird7rxl124bn5swpyyxxx2jxpdsbx2l8drp8z4f60q"; - revision = "2"; - editedCabalFile = "0ddz3q3b478ahz8q0b3ni2b3ikw1sjc2p89j1p530670m3xnm7ng"; + revision = "3"; + editedCabalFile = "0fvnk4rz1d2j4n5pww17qy0km0blv2gqycnbjlyrg6kjcmhqqr5p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -42212,18 +42340,19 @@ self: { "atomic-write" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hspec - , temporary, text, unix-compat + , hspec-discover, temporary, text, unix-compat }: mkDerivation { pname = "atomic-write"; - version = "0.2.0.7"; - sha256 = "03cn3ii74h0w3g4h78xsx9v2sn58r3qsr2dbdwq340xwhiwcgxdm"; + version = "0.2.1.0"; + sha256 = "0fdmh8rk5mvc356gi31d4lh49cgqafg364wc34i05q9zlx2fvka4"; libraryHaskellDepends = [ base bytestring directory filepath temporary text unix-compat ]; testHaskellDepends = [ base bytestring filepath hspec temporary text unix-compat ]; + testToolDepends = [ hspec-discover ]; description = "Atomically write to a file"; license = lib.licenses.mit; }) {}; @@ -43301,14 +43430,14 @@ self: { license = lib.licenses.mit; }) {}; - "auto-update_0_2_1" = callPackage + "auto-update_0_2_2" = callPackage ({ mkDerivation, base, exceptions, hspec, hspec-discover, HUnit , retry }: mkDerivation { pname = "auto-update"; - version = "0.2.1"; - sha256 = "19rpplsvakhw91iszddjsk2bfhj5w26715yz0ld71xpcnwdi8ym5"; + version = "0.2.2"; + sha256 = "1x93p1qylbll32sxwwmad5nb8q5p0z0zma9ymrxpz17zy80rqq59"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base exceptions hspec HUnit retry ]; testToolDepends = [ hspec-discover ]; @@ -43334,7 +43463,6 @@ self: { description = "Template Haskell to automatically pass values to functions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "autodocodec" = callPackage @@ -43380,8 +43508,8 @@ self: { }: mkDerivation { pname = "autodocodec-nix"; - version = "0.0.1.4"; - sha256 = "1awfc6gvmqs5gz0vb6gihs3f8csrqhk1b8yni21np72y2j29pzfw"; + version = "0.0.1.5"; + sha256 = "0lfp0li2hjqad4pw27cyhzsy17frg0i1a6v6irihl362ymk8dj22"; libraryHaskellDepends = [ aeson autodocodec base containers scientific text unordered-containers vector @@ -44960,6 +45088,31 @@ self: { license = lib.licenses.mit; }) {}; + "aws-spend-summary" = callPackage + ({ mkDerivation, amazonka, amazonka-core, amazonka-s3 + , ansi-terminal, base, bytestring, cassava, conduit, containers + , data-default, http-types, lens, optparse-applicative, text, time + , timelens, vector, zlib + }: + mkDerivation { + pname = "aws-spend-summary"; + version = "0.1.0.0"; + sha256 = "0maspcjm53ncd2004h2xp6yr6c6gz9qv15wkx0c49r4wl6iaaqm1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + amazonka amazonka-core amazonka-s3 ansi-terminal base bytestring + cassava conduit containers data-default http-types lens text time + timelens vector zlib + ]; + executableHaskellDepends = [ + base data-default optparse-applicative text + ]; + description = "Extract recent daily AWS costs"; + license = lib.licenses.gpl2Only; + mainProgram = "aws-spend-summary"; + }) {}; + "aws-transcribe-ws" = callPackage ({ mkDerivation, aeson, am-test, async, base, base16-bytestring , binary, bytestring, crc, cryptohash-sha256, lens, stm, text, time @@ -45040,6 +45193,31 @@ self: { license = lib.licenses.mit; }) {}; + "awsspendsummary" = callPackage + ({ mkDerivation, amazonka, amazonka-core, amazonka-s3 + , ansi-terminal, base, bytestring, cassava, conduit, containers + , data-default, http-types, lens, optparse-applicative, text, time + , timelens, vector, zlib + }: + mkDerivation { + pname = "awsspendsummary"; + version = "0.1.0.1"; + sha256 = "19qxmah2s11nn303p896f0b7bf8n26myh5wpv0frbapzgslp1jvv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + amazonka amazonka-core amazonka-s3 ansi-terminal base bytestring + cassava conduit containers data-default http-types lens text time + timelens vector zlib + ]; + executableHaskellDepends = [ + base data-default optparse-applicative text + ]; + description = "Extract recent daily AWS costs"; + license = lib.licenses.gpl2Only; + mainProgram = "awsspendsummary"; + }) {}; + "axel" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers , directory, extra, filepath, freer-simple, ghcid, hashable @@ -45884,13 +46062,16 @@ self: { }) {}; "bank-holidays-england" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, time }: + ({ mkDerivation, base, containers, hspec, hspec-discover + , QuickCheck, time + }: mkDerivation { pname = "bank-holidays-england"; - version = "0.2.0.9"; - sha256 = "1iyyp76mfdiniszim6mi5ls5a2d3nm0fkrkz9v1y0r2gx1d1y3zx"; + version = "0.2.0.11"; + sha256 = "1ffilswdvh7khklyqxqbf7rxf9wzf1ly4dc8j5wli3a0w2bnjd19"; libraryHaskellDepends = [ base containers time ]; testHaskellDepends = [ base containers hspec QuickCheck time ]; + testToolDepends = [ hspec-discover ]; description = "Calculation of bank holidays in England and Wales"; license = lib.licenses.bsd3; }) {}; @@ -46335,8 +46516,8 @@ self: { pname = "base16"; version = "1.0"; sha256 = "1plwc4yrkvd5j6y09fjvyzhr05mzhzwz6z41fyb60y0bj5j66dl6"; - revision = "1"; - editedCabalFile = "00r0j3l3af912b33mlsr5a48rr0l31gh34cmj8jf247c4a332rlk"; + revision = "2"; + editedCabalFile = "1dcb8m73xj2dfb8xbz731l91nm2jz532v971rsfm0kkid5ap9bvl"; libraryHaskellDepends = [ base bytestring deepseq primitive text text-short ]; @@ -46352,21 +46533,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "base16-bytestring_0_1_1_7" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim }: - mkDerivation { - pname = "base16-bytestring"; - version = "0.1.1.7"; - sha256 = "1fk9zvkx005sy4adbyil86svnqhgrvmczmf16ajhzj2wkmkqjmjj"; - revision = "3"; - editedCabalFile = "1lrxqhbjsml0q1ahpcx7p0xjy6bj1m6qzjwmv841r5r8jrm2a880"; - libraryHaskellDepends = [ base bytestring ghc-prim ]; - testHaskellDepends = [ base bytestring ]; - description = "Fast base16 (hex) encoding and decoding for ByteStrings"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "base16-bytestring" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, HUnit , QuickCheck, test-framework, test-framework-hunit @@ -46777,20 +46943,6 @@ self: { broken = true; }) {}; - "basement_0_0_14" = callPackage - ({ mkDerivation, base, ghc-prim }: - mkDerivation { - pname = "basement"; - version = "0.0.14"; - sha256 = "01kk3z0c48c2jhni8ba165zxzm4sljy18r97cad1yd897qjsy2mv"; - revision = "2"; - editedCabalFile = "16q5ilgblwhdhwxq8p76dp3c3gm55b6scgswx863zpjyca5avaif"; - libraryHaskellDepends = [ base ghc-prim ]; - description = "Foundation scrap box of array & string"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "basement" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -47247,8 +47399,8 @@ self: { pname = "battleship-combinatorics"; version = "0.0.1"; sha256 = "0pr1vcq69ndkln5jd6kxd0gn8jvc8n7aiqanxsrqnjpx4kkixph4"; - revision = "1"; - editedCabalFile = "0fw9dyylyvhsbzyslbm0r5k3l3sxbxmh0rq3cy8hkw204gm9x844"; + revision = "2"; + editedCabalFile = "0z2zqmdv5icamkfhpjnjnf88r21151k3pcqij6x0885m8s1y840p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47664,10 +47816,8 @@ self: { }: mkDerivation { pname = "beam-core"; - version = "0.10.1.0"; - sha256 = "0h1kr653wd00m5pypj4ia8d1ni6m2qrzqqqh19hnd8wz1n0pfd1h"; - revision = "1"; - editedCabalFile = "0sjc2zyy9f5r3qg4yxl1dq0c4ybvqvgh64vy078507sl8jxxl7v7"; + version = "0.10.3.0"; + sha256 = "1q3f95xjyinr6g9yxq1w32agp9n6q152b6mfpmabpv0l74c9mmhm"; libraryHaskellDepends = [ aeson base bytestring containers dlist free ghc-prim hashable microlens mtl network-uri scientific tagged text time vector @@ -47688,10 +47838,8 @@ self: { }: mkDerivation { pname = "beam-migrate"; - version = "0.5.2.1"; - sha256 = "16gl39cpj7gvb82i41h18606n6k40hi8lfyyw1x0dq73xs2ldfyc"; - revision = "1"; - editedCabalFile = "0cc0pbll3w08c3birv8isfvn8a6yd0i837gmkl12lh0gvshqph82"; + version = "0.5.3.1"; + sha256 = "0qx1nh5vvncgr4ixnraaahwp879v8wgn2lhixgzndk6zrs3y4a21"; libraryHaskellDepends = [ aeson base beam-core bytestring containers deepseq dependent-map dependent-sum free ghc-prim hashable haskell-src-exts microlens mtl @@ -47743,15 +47891,13 @@ self: { , bytestring, case-insensitive, conduit, free, hashable , haskell-src-exts, hedgehog, lifted-base, monad-control, mtl , network-uri, postgresql-libpq, postgresql-simple, scientific - , tagged, tasty, tasty-hunit, text, time, tmp-postgres + , tagged, tasty, tasty-hunit, testcontainers, text, time , transformers-base, unordered-containers, uuid, uuid-types, vector }: mkDerivation { pname = "beam-postgres"; - version = "0.5.3.1"; - sha256 = "19gagw9r2wfy398calkcnilsgl89sjpy8vj9bdswg390mw15m41n"; - revision = "2"; - editedCabalFile = "11f3jxljrfa4rva21r561w7vxafv63wmmsa9cq8bydcp3gzlgr4p"; + version = "0.5.4.1"; + sha256 = "0rxf275y89xh8if2w2my75fgy34vzc85lv4viyirgd0y26n9d0kc"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring case-insensitive conduit free hashable haskell-src-exts lifted-base @@ -47761,7 +47907,7 @@ self: { ]; testHaskellDepends = [ aeson base beam-core beam-migrate bytestring hedgehog - postgresql-simple tasty tasty-hunit text tmp-postgres uuid vector + postgresql-simple tasty tasty-hunit testcontainers text uuid vector ]; description = "Connection layer between beam and postgres"; license = lib.licenses.mit; @@ -47848,8 +47994,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.14.10"; - sha256 = "0fyjrwb3f7sqs1bbiga98h6bylgvmqfpqg59p07lhv4hrrgmx8ff"; + version = "0.14.11"; + sha256 = "13f9x9kavnkbg29mrp2zddvx5vqdyp6ias5a822hmlzqfzp5c1hy"; libraryHaskellDepends = [ base deepseq dunai mtl random simple-affine-space transformers ]; @@ -48152,6 +48298,22 @@ self: { mainProgram = "example"; }) {}; + "benchpress_0_2_2_24" = callPackage + ({ mkDerivation, base, bytestring, mtl, time }: + mkDerivation { + pname = "benchpress"; + version = "0.2.2.24"; + sha256 = "0ymx8b5v44nd6vskdpa6g1397l76s9qx6hxpklw9ilsg6hcilgsa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl time ]; + executableHaskellDepends = [ base bytestring time ]; + description = "Micro-benchmarking with detailed statistics"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "example"; + }) {}; + "bencode" = callPackage ({ mkDerivation, base, binary, bytestring, containers, hspec , parsec, QuickCheck, transformers, transformers-compat @@ -49717,8 +49879,8 @@ self: { }: mkDerivation { pname = "bindings-GLFW"; - version = "3.3.9.1"; - sha256 = "0j0vka9i2b8nl3xyfx3wzhhyyx0zqd4gxd25rrna5k0wvnqk27w5"; + version = "3.3.9.2"; + sha256 = "1ydlxnxgh2m9xlsizimchdf8iyr78w9dx8165ni0cwi1szw8955x"; libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ libGL libX11 libXcursor libXext libXfixes libXi libXinerama @@ -50528,34 +50690,35 @@ self: { "binrep" = callPackage ({ mkDerivation, base, bytestring, bytezap, deepseq, defun-core , flatparse, gauge, generic-data-functions, generic-random - , generic-type-asserts, generic-type-functions, hspec + , generic-type-asserts, generic-type-functions, ghc-bignum, hspec , hspec-discover, parser-combinators, QuickCheck - , quickcheck-instances, refined1, strongweak, text, text-icu - , type-level-bytestrings + , quickcheck-instances, rerefined, strongweak, text + , text-builder-linear, text-icu, type-level-bytestrings + , type-level-show }: mkDerivation { pname = "binrep"; - version = "0.8.0"; - sha256 = "1bsncrkxixp28ffmm2dgfpai3nv8cq0db3fdy11y6gi7rri7g8cj"; + version = "1.0.0"; + sha256 = "1m81r00b8wh1sz6y5jk0vgpj7ljp1fafb5zggc77zy77fak7fc7b"; libraryHaskellDepends = [ base bytestring bytezap deepseq defun-core flatparse generic-data-functions generic-type-asserts generic-type-functions - parser-combinators refined1 strongweak text text-icu - type-level-bytestrings + ghc-bignum parser-combinators rerefined strongweak text + text-builder-linear text-icu type-level-bytestrings type-level-show ]; testHaskellDepends = [ base bytestring bytezap deepseq defun-core flatparse generic-data-functions generic-random generic-type-asserts - generic-type-functions hspec parser-combinators QuickCheck - quickcheck-instances refined1 strongweak text text-icu - type-level-bytestrings + generic-type-functions ghc-bignum hspec parser-combinators + QuickCheck quickcheck-instances rerefined strongweak text + text-builder-linear text-icu type-level-bytestrings type-level-show ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base bytestring bytezap deepseq defun-core flatparse gauge generic-data-functions generic-type-asserts generic-type-functions - parser-combinators refined1 strongweak text text-icu - type-level-bytestrings + ghc-bignum parser-combinators rerefined strongweak text + text-builder-linear text-icu type-level-bytestrings type-level-show ]; description = "Encode precise binary representations directly in types"; license = lib.licenses.mit; @@ -51908,8 +52071,8 @@ self: { pname = "bitwise"; version = "1.0.0.1"; sha256 = "03xyzdkyb99gvm9g5chl07rqbnm7qrxba7wgmrfmal0rkwm0ibkn"; - revision = "9"; - editedCabalFile = "1xc1p66ykfz59v4dh84pg4fzdlmibix68qn1cn33k04xrlyfnnl0"; + revision = "10"; + editedCabalFile = "07m37y6g4lr9idjr88q92khla4zddkgvxlq097ilahdapxfhb9m9"; libraryHaskellDepends = [ array base bytestring ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ array base bytestring criterion ]; @@ -52199,8 +52362,8 @@ self: { pname = "blank-canvas"; version = "0.7.4"; sha256 = "1qm0ms3jk8m5zv81lh3pn5n04afyq7bpn9lc137ddmm9blnkzndi"; - revision = "4"; - editedCabalFile = "0a74klkqfy2d9q7chvxwf0n2778wqgdw320rr7ivixlz6bjbwpqg"; + revision = "5"; + editedCabalFile = "0ijknbbczq3x9i8b1vyx0ivla5ijdp4zxri8hcgpkv0fi3l0xrs4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -52817,8 +52980,8 @@ self: { }: mkDerivation { pname = "blockfrost-api"; - version = "0.11.0.0"; - sha256 = "1lqbpjzvz5rc3bkfgk09mgz6p99cxy19yx2azyshb37xxiaj8www"; + version = "0.12.1.0"; + sha256 = "0v3v42qlwiq9vmxb7n9y0sx6fpj58l367a28mrhjkagj3skh1m08"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deriving-aeson lens safe-money servant servant-docs servant-multipart-api @@ -52841,8 +53004,8 @@ self: { }: mkDerivation { pname = "blockfrost-client"; - version = "0.8.0.1"; - sha256 = "19qziw3n75ilrhdgi982dwcz29dmfp4wzbrz99p2b1lfd0ir10lj"; + version = "0.9.1.0"; + sha256 = "14pgfkpp3k1vnci718w7hcn4wmj81lbwdw14kmixb31haqajvn6n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52981,30 +53144,32 @@ self: { license = lib.licenses.bsd3; }) {}; - "bloodhound_0_22_0_0" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers - , errors, exceptions, generic-random, hashable, hspec, http-client - , http-types, microlens, microlens-aeson, mtl, network-uri + "bloodhound_0_23_0_0" = callPackage + ({ mkDerivation, aeson, aeson-optics, base, blaze-builder + , bytestring, containers, doctest, errors, exceptions + , generic-random, hashable, hspec, hspec-discover, http-client + , http-types, microlens, mtl, network-uri, optics, optics-core , pretty-simple, QuickCheck, quickcheck-properties, scientific - , semigroups, semver, temporary, text, time, transformers - , unix-compat, unordered-containers, vector + , template-haskell, temporary, text, time, unix-compat + , unordered-containers, vector, versions }: mkDerivation { pname = "bloodhound"; - version = "0.22.0.0"; - sha256 = "0w96zrv2rrhwiahf2x619l2ivqrj5jnih5ck216wrnzj6axlh9j4"; + version = "0.23.0.0"; + sha256 = "0rbvjjjjdx86sg3pi04isb46ifip0m9kmrk9pyn3b49xng5nfk85"; libraryHaskellDepends = [ aeson base blaze-builder bytestring containers exceptions hashable - http-client http-types mtl network-uri scientific semigroups semver - text time transformers unordered-containers vector + http-client http-types mtl network-uri optics-core scientific + template-haskell text time unordered-containers vector versions ]; testHaskellDepends = [ - aeson base blaze-builder bytestring containers errors exceptions - generic-random hashable hspec http-client http-types microlens - microlens-aeson mtl network-uri pretty-simple QuickCheck - quickcheck-properties scientific semigroups semver temporary text - time transformers unix-compat unordered-containers vector + aeson aeson-optics base bytestring containers doctest errors + exceptions generic-random hspec hspec-discover http-client + http-types microlens mtl optics pretty-simple QuickCheck + quickcheck-properties temporary text time unix-compat vector + versions ]; + testToolDepends = [ hspec-discover ]; description = "Elasticsearch client library for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -53235,10 +53400,8 @@ self: { ({ mkDerivation, bluefin-internal }: mkDerivation { pname = "bluefin"; - version = "0.0.7.0"; - sha256 = "1nr6kcckhz3k7nfzavjf24c655ccin0fnyxl238asic01h1d1bny"; - revision = "1"; - editedCabalFile = "1z6y9m8ikhy1h9hjvb3dccpqb567svzavl42i9s74aiybz3gs2gv"; + version = "0.0.10.0"; + sha256 = "06s6nd2b1f7cxk84rnqqaw95wy3ib4an2k8na7hk8ibi68a44mfp"; libraryHaskellDepends = [ bluefin-internal ]; description = "The Bluefin effect system"; license = lib.licenses.mit; @@ -53269,8 +53432,8 @@ self: { }: mkDerivation { pname = "bluefin-internal"; - version = "0.0.7.0"; - sha256 = "1p6fz1nd4976ibb23ni8fdrp9i47m29gfq9v77rlp6biqappjakv"; + version = "0.0.10.0"; + sha256 = "1rhlsn8189cfwhlzmwbrzlk1bcd3a797nv8jwxxb8qd9x34g87zh"; libraryHaskellDepends = [ async base monad-control transformers transformers-base unliftio-core @@ -54623,18 +54786,19 @@ self: { "box" = callPackage ({ mkDerivation, async, base, bytestring, containers, contravariant - , dlist, exceptions, kan-extensions, mtl, profunctors - , semigroupoids, stm, text, time + , dlist, doctest-parallel, exceptions, kan-extensions, mtl + , profunctors, semigroupoids, stm, text, time }: mkDerivation { pname = "box"; - version = "0.9.3.1"; - sha256 = "09mqz1ifq9sbq2h5wqy0lfvlc3v9m2nsw2f7gdss93qx8bz5cxmy"; + version = "0.9.3.2"; + sha256 = "0x2h5d6jgmv4nwsl955xb89q0f1fclsg5hjn7fyyja3z8w9qnf39"; libraryHaskellDepends = [ async base bytestring containers contravariant dlist exceptions kan-extensions mtl profunctors semigroupoids stm text time ]; - description = "A profunctor effect system"; + testHaskellDepends = [ base doctest-parallel ]; + description = "A profunctor effect system?"; license = lib.licenses.bsd3; }) {}; @@ -54652,13 +54816,14 @@ self: { }) {}; "box-socket" = callPackage - ({ mkDerivation, async, base, box, bytestring, network-simple - , optparse-applicative, profunctors, text, websockets + ({ mkDerivation, async, base, box, bytestring, doctest-parallel + , network-simple, optparse-applicative, profunctors, text + , websockets }: mkDerivation { pname = "box-socket"; - version = "0.5.1.0"; - sha256 = "0bm3csgz72fv41pilbwn0f2dx9gplin7qxi5i8mrwflaix156sy5"; + version = "0.5.2.0"; + sha256 = "13a8dclvf7m5j0a9gvmla8pr78qqrqnbqz8nc8js2yzp215p5qip"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54666,6 +54831,7 @@ self: { websockets ]; executableHaskellDepends = [ base optparse-applicative ]; + testHaskellDepends = [ base doctest-parallel ]; description = "Box websockets"; license = lib.licenses.bsd3; mainProgram = "box-socket"; @@ -54831,14 +54997,16 @@ self: { "brassica" = callPackage ({ mkDerivation, aeson, attoparsec-aeson, base, bytestring, conduit , conduit-extra, containers, criterion, deepseq, fast-myers-diff - , file-embed, megaparsec, mtl, optparse-applicative, parallel - , parser-combinators, split, tasty, tasty-golden, text - , transformers, utf8-string, vector + , file-embed, megaparsec, mtl, optparse-applicative, pandoc + , pandoc-types, parallel, parser-combinators, split, tasty + , tasty-golden, text, transformers, utf8-string, vector }: mkDerivation { pname = "brassica"; - version = "0.3.0"; - sha256 = "10ydb5w79y1jqa34mzrdl7s8ns29w1vxplv55ik51mkayclfgx3n"; + version = "1.0.0"; + sha256 = "04nrfc448m0kz73rwnvb6c0h9mhh55vjxxls6ddyq80avypsgb57"; + revision = "1"; + editedCabalFile = "1vqakf9jh6hrbicbrpwsv3fjqwi0mngnvrwg58xaaqhb4h18kzj4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54850,8 +55018,8 @@ self: { deepseq optparse-applicative parallel text ]; testHaskellDepends = [ - base bytestring conduit tasty tasty-golden text transformers - utf8-string + base bytestring conduit pandoc pandoc-types tasty tasty-golden text + transformers utf8-string ]; benchmarkHaskellDepends = [ base criterion file-embed parallel text @@ -54951,33 +55119,6 @@ self: { broken = true; }) {}; - "brick_0_70_1" = callPackage - ({ mkDerivation, base, bytestring, config-ini, containers - , contravariant, data-clist, deepseq, directory, dlist, exceptions - , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm - , template-haskell, text, text-zipper, transformers, unix, vector - , vty, word-wrap - }: - mkDerivation { - pname = "brick"; - version = "0.70.1"; - sha256 = "18i1i06ll6pklzaazcl2bzbi3w5zdn43l9wvkclhfcmddjy19lp4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring config-ini containers contravariant data-clist - deepseq directory dlist exceptions filepath microlens microlens-mtl - microlens-th stm template-haskell text text-zipper transformers - unix vector vty word-wrap - ]; - testHaskellDepends = [ - base containers microlens QuickCheck vector - ]; - description = "A declarative terminal user interface library"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "brick" = callPackage ({ mkDerivation, base, bimap, bytestring, config-ini, containers , data-clist, deepseq, directory, exceptions, filepath, microlens @@ -55004,7 +55145,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "brick_2_4" = callPackage + "brick_2_5" = callPackage ({ mkDerivation, base, bimap, bytestring, config-ini, containers , data-clist, deepseq, directory, exceptions, filepath, microlens , microlens-mtl, microlens-th, mtl, QuickCheck, stm @@ -55013,8 +55154,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "2.4"; - sha256 = "124l7yay5q5dxmpf48a4m8b7fnkwpv0shsy78qjpw5fdvqf9xkvz"; + version = "2.5"; + sha256 = "03m539ksp607gsz9pha4dmpm064x6l5da4gphmcch8if18q7bji8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55091,8 +55232,8 @@ self: { ({ mkDerivation, base, brick, containers, microlens, vector }: mkDerivation { pname = "brick-list-skip"; - version = "0.1.1.13"; - sha256 = "1n5mp9ikqmlckqywbvb1ry24j927qim3bw8bkw84w72yhlrxsmfc"; + version = "0.1.1.15"; + sha256 = "1x3wbvswxcz3agd2dlp4cmi247lsdl7ppllj2szpr474yr3gjshc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vector ]; @@ -55146,8 +55287,8 @@ self: { }: mkDerivation { pname = "brick-tabular-list"; - version = "2.2.0.11"; - sha256 = "0vikqrrhb94m6xg0k67j626gahx4iiwwywimlsqh96lvs5l07y9l"; + version = "2.2.0.13"; + sha256 = "0a583s7bln9hk37m9fhr4z7hhqyp8sdy4qn9yxbb227psjdx01jf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55303,41 +55444,6 @@ self: { broken = true; }) {}; - "brittany_0_13_1_2" = callPackage - ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs - , containers, czipwith, data-tree-print, deepseq, directory, extra - , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec - , monad-memo, mtl, multistate, parsec, pretty, random, safe - , semigroups, strict, syb, text, transformers, uniplate, unsafe - , yaml - }: - mkDerivation { - pname = "brittany"; - version = "0.13.1.2"; - sha256 = "1pa8qgsild3zl56sdmbsllka64k05jk2p16ij3bdla4rbfw96z5g"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base butcher bytestring cmdargs containers czipwith - data-tree-print deepseq directory extra filepath ghc ghc-boot-th - ghc-exactprint ghc-paths monad-memo mtl multistate pretty random - safe semigroups strict syb text transformers uniplate unsafe yaml - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - aeson base butcher bytestring cmdargs containers czipwith - data-tree-print deepseq directory extra filepath ghc ghc-boot-th - ghc-exactprint ghc-paths hspec monad-memo mtl multistate parsec - pretty safe semigroups strict syb text transformers uniplate unsafe - yaml - ]; - description = "Haskell source code formatter"; - license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; - mainProgram = "brittany"; - broken = true; - }) {}; - "brittany" = callPackage ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs , containers, czipwith, data-tree-print, deepseq, directory, extra @@ -56952,8 +57058,8 @@ self: { }: mkDerivation { pname = "byte-count-reader"; - version = "0.10.1.11"; - sha256 = "1mi0560rcajp9q83y6vsw7ld1n429jdsmswassnyhh1z4hs6ihv7"; + version = "0.10.1.12"; + sha256 = "0bzks15c2s2xiv95v7fyzsndyiinp9ar8ajcalxs68zpwmbpzk3h"; libraryHaskellDepends = [ base extra parsec parsec-numbers text ]; testHaskellDepends = [ base extra hspec parsec parsec-numbers text @@ -57079,6 +57185,8 @@ self: { pname = "bytehash"; version = "0.1.1.2"; sha256 = "1vj08viavj5finkwq6hmljhf31q80akfiqxxiw7q4awpcgbgbwdc"; + revision = "1"; + editedCabalFile = "1vga0y6nlhir3q24vmhzl0n9py19r7prciyqsizpcszplmrymr0l"; libraryHaskellDepends = [ base byteslice bytestring containers entropy primitive primitive-unlifted transformers @@ -57497,24 +57605,6 @@ self: { }: mkDerivation { 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 - ]; - description = "Efficiently parse and produce common integral and fractional numbers"; - license = lib.licenses.bsd3; - }) {}; - - "bytestring-lexing_0_5_0_14" = callPackage - ({ mkDerivation, base, bytestring, tasty, tasty-quickcheck - , tasty-smallcheck - }: - mkDerivation { - pname = "bytestring-lexing"; version = "0.5.0.14"; sha256 = "10r12gsms3bmakxfsqg24l7v87lq4hxgz3g8c3mz8wdcd5bds4l0"; libraryHaskellDepends = [ base bytestring ]; @@ -57523,7 +57613,6 @@ self: { ]; description = "Efficiently parse and produce common integral and fractional numbers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bytestring-mmap" = callPackage @@ -57742,27 +57831,6 @@ self: { }: mkDerivation { pname = "bytestring-trie"; - version = "0.2.7.3"; - sha256 = "0cxhsczvfn0cxh4mmhv70rskrc023gy0gl57xiggbf64ng5c60f7"; - libraryHaskellDepends = [ base binary bytestring deepseq ]; - testHaskellDepends = [ - base binary bytestring deepseq QuickCheck smallcheck tasty - tasty-hunit tasty-quickcheck tasty-smallcheck - ]; - benchmarkHaskellDepends = [ - base binary bytestring criterion deepseq QuickCheck - ]; - description = "An efficient finite map from bytestrings to values"; - license = lib.licenses.bsd3; - }) {}; - - "bytestring-trie_0_2_7_5" = callPackage - ({ mkDerivation, base, binary, bytestring, criterion, deepseq - , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck - , tasty-smallcheck - }: - mkDerivation { - pname = "bytestring-trie"; version = "0.2.7.5"; sha256 = "02z15mqn7rlpa6w41mwibhm3v33p03dp3mdv1b3q4s1jkn63lw2d"; libraryHaskellDepends = [ base binary bytestring deepseq ]; @@ -57775,7 +57843,6 @@ self: { ]; description = "An efficient finite map from bytestrings to values"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bytestring-typenats" = callPackage @@ -57878,8 +57945,8 @@ self: { }: mkDerivation { pname = "bytezap"; - version = "1.3.1"; - sha256 = "1d7icd2wxbmraw3qf4vmxlvc6pnl3c9z0ilm39f013sb5i9vsz5x"; + version = "1.6.0"; + sha256 = "1vavs3n1dlp37pc613m2n3427b9mc91nxw8wj27la45pzdx2k808"; libraryHaskellDepends = [ base bytestring defun-core generic-type-functions primitive text type-level-bytestrings @@ -58343,6 +58410,8 @@ self: { pname = "cabal-add"; version = "0.1"; sha256 = "1szbi0z8yf98641rwnj856gcfsvvflxwrfxraxy6rl60m7i0mab1"; + revision = "1"; + editedCabalFile = "0zwinjbnw4a191c951wwavbh6x6f300l0kgv53fiffxfn66x9w6f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58357,30 +58426,20 @@ self: { ]; description = "Extend Cabal build-depends from the command line"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "cabal-add"; + broken = true; }) {}; "cabal-appimage" = callPackage ({ mkDerivation, base, Cabal, filepath }: mkDerivation { pname = "cabal-appimage"; - version = "0.4.0.4"; - sha256 = "02d1cdhcqk4mpx0wy9rxfr9wsh1a7pjjdq5l1p2r5l5f0rnhkrbs"; - libraryHaskellDepends = [ base Cabal filepath ]; - description = "Cabal support for creating AppImage applications"; - license = lib.licenses.agpl3Only; - }) {}; - - "cabal-appimage_0_4_0_5" = callPackage - ({ mkDerivation, base, Cabal, filepath }: - mkDerivation { - pname = "cabal-appimage"; version = "0.4.0.5"; sha256 = "0ir952hdpyf62xc799fq22qmj7n09cbc0v3jldlr40iv0200isr2"; libraryHaskellDepends = [ base Cabal filepath ]; description = "Cabal support for creating AppImage applications"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "cabal-audit" = callPackage @@ -58424,8 +58483,8 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "2.5.0"; - sha256 = "0ddd6yc9ii7ibw7263aq455hwk50ggij28ycjvfi9p4cl6npp1f9"; + version = "2.6.0"; + sha256 = "0y4xj4irhppwsg3ljy6yzscfjdj7gh2prsiia51y8ma6gm87sjsy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58522,8 +58581,8 @@ self: { }: mkDerivation { pname = "cabal-cargs"; - version = "1.5.0"; - sha256 = "0dmhxrg8d7ajhfg85s7p6py9fywqbrnbd5z9i6mbh3f6cyc9hqak"; + version = "1.6.0"; + sha256 = "1kn21l5w838db558nijblar6i3z5jkh12d6l1yccxmd70lrb39vv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58609,8 +58668,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "5.2.3"; - sha256 = "0gj6w5r07bmij41flx7rw4ad0qjl2fmbxp9jrdkl8k33b045lfc7"; + version = "5.2.4"; + sha256 = "02pwpdzq8lk9yk6d4zpw62v1yd3ccn3r88gz3l0z51mk17ifym44"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58780,14 +58839,15 @@ self: { "cabal-fix" = callPackage ({ mkDerivation, algebraic-graphs, base, bytestring, Cabal-syntax - , containers, directory, dotparse, filepath, flatparse - , optics-extra, optparse-applicative, pretty, pretty-simple - , string-interpolate, tar, text, these, tree-diff, vector + , containers, directory, doctest-parallel, dotparse, filepath + , flatparse, optics-extra, optparse-applicative, pretty + , pretty-simple, string-interpolate, tar, text, these, tree-diff + , vector }: mkDerivation { pname = "cabal-fix"; - version = "0.0.0.2"; - sha256 = "050003nvqc0x44jik7x5gsljqsrandpsl77xkqbhrh3xglw8cydb"; + version = "0.1.0.0"; + sha256 = "09q9nzxybkrqg96ys45jpq37ar5dgdvxc3yacfngk3kzxcw3ykms"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58799,6 +58859,7 @@ self: { base bytestring directory filepath optparse-applicative pretty-simple text tree-diff ]; + testHaskellDepends = [ base doctest-parallel ]; description = "Fix for cabal files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -58981,6 +59042,8 @@ self: { pname = "cabal-hoogle"; version = "3.10.0.0"; sha256 = "0plvb2xg112brxq3ribwhpq8wfmdr43bn8yfcazvy86d6h2bgyyn"; + revision = "1"; + editedCabalFile = "0hkknwh6cbd61hxvariphrkyr9n3lgw3qzdq82gk1w0rqj14yhd4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59192,8 +59255,8 @@ self: { }: mkDerivation { pname = "cabal-lenses"; - version = "0.14.0"; - sha256 = "0ab6j4svnchw741spi1b4zsdiwr7hvl141dn30ggqq6lkn32icwm"; + version = "0.15.0"; + sha256 = "0m8p6pb92iqdaad319d4x09fmlhjvwhrfj81z7s0qnmfm77597af"; libraryHaskellDepends = [ base Cabal lens strict system-fileio system-filepath text transformers unordered-containers @@ -59452,6 +59515,8 @@ self: { pname = "cabal-rpm"; version = "2.2.1"; sha256 = "0dsbnnvzss0flknf1c2fq85y9a4d26nbrlnrh2xcyfwh2mz20c9d"; + revision = "1"; + editedCabalFile = "1ad0j7qykd5wbn1gdfrkbc50s707h3p0ll8nfqv0if8q1bck3w8l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -59465,6 +59530,39 @@ self: { mainProgram = "cabal-rpm"; }) {}; + "cabal-scaffold" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, case-insensitive, conduit, containers, dlist + , exceptions, foldable1-classes-compat, foldl, generic-lens + , githash, http-conduit, http-types, lens, lens-aeson, mustache + , optparse-applicative, path, path-io, project-template + , regex-applicative-text, replace-attoparsec, rio, rio-orphans + , safe-exceptions, streaming, streaming-attoparsec + , streaming-bytestring, strict, template-haskell, text, time + , transformers, unordered-containers, yaml + }: + mkDerivation { + pname = "cabal-scaffold"; + version = "0.1.0.0"; + sha256 = "0wmy4083ajrw5y5jyi46xw08hsrmbj9fzzwsi7wkcq5wwffcfxlp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring case-insensitive + conduit containers dlist exceptions foldable1-classes-compat foldl + generic-lens githash http-conduit http-types lens lens-aeson + mustache optparse-applicative path path-io project-template + regex-applicative-text replace-attoparsec rio rio-orphans + safe-exceptions streaming streaming-attoparsec streaming-bytestring + strict template-haskell text time transformers unordered-containers + yaml + ]; + executableHaskellDepends = [ base ]; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "cabal-scaffold"; + }) {}; + "cabal-scripts" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -59822,6 +59920,8 @@ self: { pname = "cabal2spec"; version = "2.7.1"; sha256 = "0w1f7ga7nz4112x9k4g75nxpcwvcdfif0bfzk3fg8bghzijf12bd"; + revision = "1"; + editedCabalFile = "0kz3d4nq4z4mdk9pzbzzxvnac0krc0gyzm470hnjcrd06xwsjk46"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal filepath time ]; @@ -60147,21 +60247,22 @@ self: { , conduit-concurrent-map, conduit-extra, conduit-zstd, containers , crypton, deepseq, dhall, directory, ed25519, either, exceptions , extra, filepath, fsnotify, generic-lens, hercules-ci-cnix-store - , here, hnix-store-core, hspec, hspec-discover, http-client - , http-client-tls, http-conduit, http-types, immortal, inline-c-cpp - , katip, lukko, lzma-conduit, megaparsec, memory, microlens, netrc - , network, nix, nix-narinfo, optparse-applicative, pretty-terminal - , prettyprinter, process, protolude, resourcet, retry - , safe-exceptions, servant, servant-auth, servant-auth-client - , servant-client, servant-client-core, servant-conduit, stm - , stm-chans, stm-conduit, systemd, temporary, text, time - , transformers, unix, unliftio, unliftio-core, unordered-containers - , uri-bytestring, uuid, vector, versions, websockets, wuss + , here, hnix-store-core, hnix-store-nar, hspec, hspec-discover + , http-client, http-client-tls, http-conduit, http-types, immortal + , inline-c-cpp, katip, lukko, lzma-conduit, megaparsec, memory + , microlens, netrc, network, nix, nix-narinfo, optparse-applicative + , pretty-terminal, prettyprinter, process, protolude, resourcet + , retry, safe-exceptions, servant, servant-auth + , servant-auth-client, servant-client, servant-client-core + , servant-conduit, stm, stm-chans, stm-conduit, systemd, temporary + , text, time, transformers, unix, unliftio, unliftio-core + , unordered-containers, uri-bytestring, uuid, vector, versions + , websockets, wuss }: mkDerivation { pname = "cachix"; - version = "1.7.4"; - sha256 = "1bz80b9cfhib2j0bkxsxwvp8zzf1bfvzpwin1fb8lfw9nm9mz915"; + version = "1.7.5"; + sha256 = "0f9lp7drhiadn8blcf1m4hxmv3zj1ah9n0w6s9v5ad1zp1lgcd0y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60170,15 +60271,15 @@ self: { concurrent-extra conduit conduit-concurrent-map conduit-extra conduit-zstd containers crypton deepseq dhall directory ed25519 either exceptions extra filepath fsnotify generic-lens - hercules-ci-cnix-store here hnix-store-core http-client - http-client-tls http-conduit http-types immortal inline-c-cpp katip - lukko lzma-conduit megaparsec memory microlens netrc network - nix-narinfo optparse-applicative pretty-terminal prettyprinter - process protolude resourcet retry safe-exceptions servant - servant-auth servant-auth-client servant-client servant-conduit stm - stm-chans stm-conduit systemd temporary text time transformers unix - unliftio unliftio-core unordered-containers uri-bytestring uuid - vector versions websockets wuss + hercules-ci-cnix-store here hnix-store-core hnix-store-nar + http-client http-client-tls http-conduit http-types immortal + inline-c-cpp katip lukko lzma-conduit megaparsec memory microlens + netrc network nix-narinfo optparse-applicative pretty-terminal + prettyprinter process protolude resourcet retry safe-exceptions + servant servant-auth servant-auth-client servant-client + servant-conduit stm stm-chans stm-conduit systemd temporary text + time transformers unix unliftio unliftio-core unordered-containers + uri-bytestring uuid vector versions websockets wuss ]; libraryPkgconfigDepends = [ nix ]; executableHaskellDepends = [ @@ -60187,8 +60288,8 @@ self: { ]; testHaskellDepends = [ aeson async base bytestring cachix-api containers dhall directory - extra here hspec protolude retry servant-auth-client - servant-client-core stm temporary time versions + extra hercules-ci-cnix-store here hspec protolude retry + servant-auth-client servant-client-core stm temporary time versions ]; testToolDepends = [ hspec-discover ]; description = "Command-line client for Nix binary cache hosting https://cachix.org"; @@ -60197,18 +60298,18 @@ self: { }) {inherit (pkgs) nix;}; "cachix-api" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, conduit - , cryptonite, deriving-aeson, exceptions, hspec, hspec-discover - , http-media, jose, memory, nix-narinfo, protolude, resourcet - , safe-exceptions, servant, servant-auth, stm-chans, swagger2, text - , time, unordered-containers, uuid, websockets + ({ mkDerivation, aeson, async, base, bytestring, conduit, crypton + , deriving-aeson, exceptions, hspec, hspec-discover, http-media + , jose, memory, nix-narinfo, protolude, resourcet, safe-exceptions + , servant, servant-auth, stm-chans, swagger2, text, time + , unordered-containers, uuid, websockets }: mkDerivation { pname = "cachix-api"; - version = "1.7.4"; - sha256 = "0f19mxmas71mwj487jizwfmlfpp5c5jwhjk5j8w4kz3xc434irqy"; + version = "1.7.5"; + sha256 = "03iq1kwy2jnbpf2c2v0hs9s44sd2w92srrrcb61jm00ws7qnh5sw"; libraryHaskellDepends = [ - aeson async base bytestring conduit cryptonite deriving-aeson + aeson async base bytestring conduit crypton deriving-aeson exceptions http-media jose memory nix-narinfo protolude resourcet safe-exceptions servant servant-auth stm-chans swagger2 text time unordered-containers uuid websockets @@ -60542,8 +60643,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.12.0.0"; - sha256 = "00vdj70n5s05xx7yq4d28nbp9vncrdc4a9k3502xslkh6kj7zva2"; + version = "0.12.1.0"; + sha256 = "0ccwrnymkd96ca85n097iw9x5pnirc3ccmalyl1w507c56ph3jb4"; libraryHaskellDepends = [ aeson aeson-optics async base bytestring calamity-commands colour concurrent-extra containers crypton-connection crypton-x509-system @@ -60662,6 +60763,8 @@ self: { pname = "calendar-recycling"; version = "0.0.0.1"; sha256 = "0afmnii65axpqk3x50wj1d17942m1kyhwka3bn78ylxy9z7rrlwc"; + revision = "1"; + editedCabalFile = "0dp0gylbwsrrszg5nw7x38xhilmn0vgn79zl9bam024nb528x7m1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -60750,6 +60853,8 @@ self: { pname = "call-alloy"; version = "0.5.0.1"; sha256 = "0c34yd6l0650qk760mmgsfgmwvhqhs43nzm7nhzkps5z1p966wmc"; + revision = "2"; + editedCabalFile = "0hgy6daai4i0y5rz4350dzwz4wrwlyrr5d2c7k8d6hc4d8dlhqvm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async base bytestring containers directory exceptions extra @@ -60794,6 +60899,8 @@ self: { pname = "call-plantuml"; version = "0.0.1.3"; sha256 = "0g6k5ajfdnhdni2ml31mhlgdvpkdnjsdyrppj15q8v964h68cjxk"; + revision = "1"; + editedCabalFile = "1qxk5p0i44sjxd4jbgpzrcfc9xqmj86q6d52fwz32qbc76v4rl1q"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async base bytestring filepath process ]; testHaskellDepends = [ @@ -62446,6 +62553,8 @@ self: { pname = "cassava-th"; version = "0.1.0.0"; sha256 = "1vq64yl6g3knk0vl1100q4w2hiz5pxharx1c6kf3xflcc2252cxh"; + revision = "1"; + editedCabalFile = "1z1rqg1xgsq1y14wv3r3hc621xm0080jkn55xnnx6clw14f3i82k"; libraryHaskellDepends = [ base bytestring cassava template-haskell text vector ]; @@ -64263,20 +64372,20 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "chart-svg_0_6_1_0" = callPackage - ({ mkDerivation, adjunctions, attoparsec, base, bytestring, Color - , containers, cubicbezier, doctest-parallel, flatparse, foldl - , formatn, markup-parse, mtl, numhask, numhask-array, numhask-space - , optics-core, random, string-interpolate, text, time + "chart-svg_0_7_0_0" = callPackage + ({ mkDerivation, base, bytestring, Color, containers, cubicbezier + , doctest-parallel, flatparse, formatn, harpie, markup-parse, mtl + , numhask, numhask-space, optics-core, random, string-interpolate + , text, time }: mkDerivation { pname = "chart-svg"; - version = "0.6.1.0"; - sha256 = "05z9raqqjnq0wvlknkl2z2g20hxal6nnz7g8p0fqplggv52f53vd"; + version = "0.7.0.0"; + sha256 = "1v1dhvn4rgv191byvr5dvaxifd48hskpqvv3kzpsq40ii7hqyj4m"; libraryHaskellDepends = [ - adjunctions attoparsec base bytestring Color containers cubicbezier - flatparse foldl formatn markup-parse mtl numhask numhask-array - numhask-space optics-core random string-interpolate text time + base bytestring Color containers cubicbezier flatparse formatn + harpie markup-parse mtl numhask numhask-space optics-core random + string-interpolate text time ]; testHaskellDepends = [ base doctest-parallel ]; description = "Charting library targetting SVGs"; @@ -64800,8 +64909,8 @@ self: { }: mkDerivation { pname = "chessIO"; - version = "0.9.3.1"; - sha256 = "1jq8x1mjjy89mfdrksdaiyqyhn7wvxnl3is36kacyck58l0sc738"; + version = "0.9.5.0"; + sha256 = "1yva5hx7623l7f0am99kvpcjk924vklipjw4jb2pryi79wgvyqys"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65658,27 +65767,28 @@ self: { }) {}; "cimple" = callPackage - ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, base - , bytestring, containers, data-fix, extra, file-embed, filepath - , groom, happy, hspec, hspec-discover, monad-parallel, mtl - , QuickCheck, split, text, transformers-compat + ({ mkDerivation, aeson, alex, array, base, bytestring, containers + , data-fix, extra, file-embed, filepath, groom, happy, hspec + , hspec-discover, monad-parallel, mtl, prettyprinter + , prettyprinter-ansi-terminal, QuickCheck, split, text + , transformers-compat }: mkDerivation { pname = "cimple"; - version = "0.0.21"; - sha256 = "1ffqbnsbcza7bfgbbsilyhvifyg3g9j5wpkgmawlw76c5rkk3a7c"; + version = "0.0.22"; + sha256 = "0dp62wqcrdf16mrs10ij59y2ncrbm3nplp3h8qszmq4csiq8scfi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint array base bytestring containers data-fix - file-embed filepath monad-parallel mtl split text - transformers-compat + aeson array base bytestring containers data-fix file-embed filepath + monad-parallel mtl prettyprinter prettyprinter-ansi-terminal split + text transformers-compat ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base bytestring groom text ]; testHaskellDepends = [ - ansi-wl-pprint base data-fix extra hspec QuickCheck text - transformers-compat + base data-fix extra hspec prettyprinter prettyprinter-ansi-terminal + QuickCheck text transformers-compat ]; testToolDepends = [ hspec-discover ]; description = "Simple C-like programming language"; @@ -66128,6 +66238,8 @@ self: { pname = "citeproc"; version = "0.8.1.1"; sha256 = "0hgkxgd1wmyrryv2ahavia6r5z9331i9557mnblq922lkdi0bs2g"; + revision = "1"; + editedCabalFile = "091gm0cbjsqvad3fhd2fx4bgsylv3gfakq3fhki3z40aywri8992"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66612,6 +66724,8 @@ self: { base clash-prelude deepseq ghc-typelits-knownnat QuickCheck ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "clash-prelude" = callPackage @@ -66681,6 +66795,8 @@ self: { libraryHaskellDepends = [ base clash-prelude QuickCheck ]; description = "QuickCheck instances for various types in the CλaSH Prelude"; license = "unknown"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "clash-shake" = callPackage @@ -66717,6 +66833,8 @@ self: { ]; description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "clash-verilog" = callPackage @@ -66734,6 +66852,8 @@ self: { ]; description = "CAES Language for Synchronous Hardware - Verilog backend"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "clash-vhdl" = callPackage @@ -66751,6 +66871,8 @@ self: { ]; description = "CAES Language for Synchronous Hardware - VHDL backend"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "clashilator" = callPackage @@ -66774,7 +66896,9 @@ self: { ]; description = "Automated Clash to Verilator bridge"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "clashilator"; + broken = true; }) {}; "classify" = callPackage @@ -67589,8 +67713,8 @@ self: { pname = "cli-extras"; version = "0.2.1.0"; sha256 = "1lg0ssbh2qhjjc31ins29ddy4lkzwxhlm3r9vcy1jk8al5aqa03f"; - revision = "1"; - editedCabalFile = "0fcybjf8zqzzjzfc5205plzphzk7z5v9p8nadqq7lp7m10ggjasc"; + revision = "2"; + editedCabalFile = "1x2wwph80zw9010cb9vhna9j4z5js1r1c3z5xxw3996z5x0s13jc"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring containers exceptions io-streams lens logging-effect monad-logger monad-loops mtl process @@ -67609,6 +67733,8 @@ self: { pname = "cli-git"; version = "0.2.0.1"; sha256 = "09i3v77xhdfsmvq7c10plxnqmq2wn8gxc16za4h96s7pnvn8bppv"; + revision = "1"; + editedCabalFile = "0rcl9n3mqry9mdc413zbbzz0vhk03khbgipc9nljlbyk5w2ihqsc"; libraryHaskellDepends = [ base cli-extras containers data-default exceptions lens logging-effect megaparsec mtl text which @@ -67626,8 +67752,8 @@ self: { pname = "cli-nix"; version = "0.2.0.0"; sha256 = "02350jvbgapxn14zx0knzyxmdlrq2yk460wiw9p8aq860f299bzh"; - revision = "1"; - editedCabalFile = "1plh0js8lnl2xw3dv5z57ap8g4c9j2n1bzskn993fpgafqlw5mcb"; + revision = "2"; + editedCabalFile = "0bg07ix77bd5yz6m2y2dcaqbgby5s2d5p0dzp4kgmg4fsw011mnm"; libraryHaskellDepends = [ base cli-extras data-default exceptions lens logging-effect mtl text which @@ -68236,6 +68362,39 @@ self: { license = lib.licenses.mit; }) {}; + "cloudy" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-doctest + , containers, deepseq, directory, doctest, file-embed, filepath + , from-sum, http-api-data, http-client-tls, http-media, network + , network-bsd, optparse-applicative, parsec, pretty-simple, process + , QuickCheck, random, servant, servant-client, servant-client-core + , sqlite-simple, tasty, tasty-hunit, template-haskell, text, time + , unix, uuid, yaml + }: + mkDerivation { + pname = "cloudy"; + version = "0.1.0.1"; + sha256 = "0vx3bf4vlybpy452mzn9swgclxfa7flnn0x0gj2vlcn14cdbh27w"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq directory file-embed + filepath from-sum http-api-data http-client-tls http-media network + network-bsd optparse-applicative parsec pretty-simple process + random servant servant-client servant-client-core sqlite-simple + text time unix uuid yaml + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest QuickCheck tasty tasty-hunit template-haskell + ]; + description = "CLI tool to easily spin up and control compute instances in various cloud environments"; + license = lib.licenses.bsd3; + mainProgram = "cloudy"; + maintainers = [ lib.maintainers.cdepillabout ]; + }) {}; + "cloudyfs" = callPackage ({ mkDerivation, base, bytestring, containers, convertible , datetime, filepath, HFuse, HTTP, regex-base, regex-tdfa, tagsoup @@ -69826,6 +69985,8 @@ self: { pname = "coinor-clp"; version = "0.0.0.2"; sha256 = "0bcwpzmsmf9s8nn7vkwfynjb75x1x8x6bpffmrs55yqc6rvdsn32"; + revision = "1"; + editedCabalFile = "011nb1ig1k123223q3glrdxfxf9jy4k2n12rm6fgfh8q0xlr1ri2"; libraryHaskellDepends = [ base comfort-array deepseq linear-programming non-empty QuickCheck transformers utility-ht @@ -70118,8 +70279,8 @@ self: { pname = "colonnade"; version = "1.2.0.2"; sha256 = "1asjx71gp26a15v7g3p8bfddb5nnzky6672c35xx35hq73mhykr4"; - revision = "6"; - editedCabalFile = "1ny5nbrf5nic2xsilz7xg44y2bcviki6gs4rmg6ydfk5v291qfgn"; + revision = "7"; + editedCabalFile = "043fv0vr7m04lrcnh5561wn62qda4wkjvsakj6db5zjhwbmwm3qy"; libraryHaskellDepends = [ base bytestring contravariant profunctors semigroups text vector ]; @@ -70749,8 +70910,8 @@ self: { pname = "comfort-glpk"; version = "0.1"; sha256 = "06396jgbaxvm2gwksra6gjwqczsvdlif9lal46a8q5sc5cyhcpx1"; - revision = "1"; - editedCabalFile = "0hd4i7s68kfky7l6mdka4p144x4h7fbl619ikwq8fg3fdljvihmq"; + revision = "2"; + editedCabalFile = "0gklb3jxb038bf657gqv37wlibvvr1yy3bdg7zvfvx81s203ja7h"; libraryHaskellDepends = [ base comfort-array deepseq glpk-headers linear-programming non-empty transformers utility-ht @@ -70819,6 +70980,21 @@ self: { license = "unknown"; }) {}; + "comma-and" = callPackage + ({ mkDerivation, base, data-default-class, hspec, hspec-discover + , QuickCheck + }: + mkDerivation { + pname = "comma-and"; + version = "0.2.0.0"; + sha256 = "10q50gxibzm5ph37i2kgmyg38n6n36dm82qifn8q10c777v3x17x"; + libraryHaskellDepends = [ base data-default-class ]; + testHaskellDepends = [ base data-default-class hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Join text together with commas, and \"and\""; + license = lib.licenses.bsd3; + }) {}; + "command" = callPackage ({ mkDerivation, base, deepseq, process }: mkDerivation { @@ -70930,8 +71106,8 @@ self: { }: mkDerivation { pname = "commonmark"; - version = "0.2.6"; - sha256 = "0k0wkvlqbcv7iml9pa56pic4z417qydck22r4kbw51zixkj6rrp7"; + version = "0.2.6.1"; + sha256 = "0wwh0smqdmyb1qa992d0jva24yml4lxmmwr3av3c8s0xh3z7vkpv"; libraryHaskellDepends = [ base bytestring containers parsec text transformers unicode-data unicode-transforms @@ -70993,8 +71169,8 @@ self: { }: mkDerivation { pname = "commonmark-pandoc"; - version = "0.2.2.1"; - sha256 = "1kbs165li9fcizzivlb9ajsh9livc7vq8s903g5n829fpwayp431"; + version = "0.2.2.2"; + sha256 = "0lbs0gjxa02gsm08n65fqglpsi5h2gd5nh0k2nzm01xsqs304h76"; libraryHaskellDepends = [ base commonmark commonmark-extensions pandoc-types text ]; @@ -71416,8 +71592,8 @@ self: { ({ mkDerivation, base, containers, hspec, QuickCheck, vector }: mkDerivation { pname = "compactmap"; - version = "0.1.4.4"; - sha256 = "0ipa92sidhj154mslis6s33sn55x2n6kqqfnd9qgxlns0srsr75n"; + version = "0.1.4.5"; + sha256 = "1xa4wa4qjd7yjghkaakpgrz9kw4iyy0zlc9cpajyysaxdq4k7czf"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base containers hspec QuickCheck ]; description = "A read-only memory-efficient key-value store"; @@ -72206,8 +72382,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "3.0.0.2"; - sha256 = "151inlk43m96pnasc6llsjh8vxyc9b1i7xdgf1sp5p5072bzq305"; + version = "3.0.1.0"; + sha256 = "068wpnviarwf3q0g8zy9sfgjarz7v73vdfapg3ji8n3xdcb24iwg"; libraryHaskellDepends = [ base ]; description = "Higher-order function combinators"; license = lib.licenses.bsd3; @@ -72975,8 +73151,8 @@ self: { pname = "concurrent-utilities"; version = "0.2.0.2"; sha256 = "1phc9a90nvx6dk741hmg3w5m9y8ra5a7zsgmzw173ibaapr2yhqi"; - revision = "2"; - editedCabalFile = "1jf0sx6yq557aspa3wm12hkc64pmfnc39kbc5wsa2k7ksash3k15"; + revision = "3"; + editedCabalFile = "1s10s1fawbm805kdk33q8q9bhqgghimxg4hni301zj17v2wxzsir"; libraryHaskellDepends = [ base ]; description = "More utilities and broad-used datastructures for concurrency"; license = lib.licenses.bsd3; @@ -73139,32 +73315,6 @@ self: { }: mkDerivation { pname = "conduit"; - version = "1.3.5"; - sha256 = "0bbq3hr0y4hyia8dbqibfpg5q5zr2ici5hngv38y6hycxvhd7c1b"; - libraryHaskellDepends = [ - base bytestring directory exceptions filepath mono-traversable mtl - primitive resourcet text transformers unix unliftio-core vector - ]; - testHaskellDepends = [ - base bytestring containers directory exceptions filepath hspec - mono-traversable mtl QuickCheck resourcet safe silently split text - transformers unliftio vector - ]; - benchmarkHaskellDepends = [ - base containers deepseq gauge hspec mwc-random transformers vector - ]; - description = "Streaming data processing library"; - license = lib.licenses.mit; - }) {}; - - "conduit_1_3_6" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , exceptions, filepath, gauge, hspec, mono-traversable, mtl - , mwc-random, primitive, QuickCheck, resourcet, safe, silently - , split, text, transformers, unix, unliftio, unliftio-core, vector - }: - mkDerivation { - pname = "conduit"; version = "1.3.6"; sha256 = "13aivqg5js60yvcbpbl7fgrxa5z2wswrmjjlm1bhrcj2qx49mrik"; libraryHaskellDepends = [ @@ -73181,7 +73331,6 @@ self: { ]; description = "Streaming data processing library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "conduit-aeson" = callPackage @@ -74132,8 +74281,8 @@ self: { pname = "config-value"; version = "0.8.3"; sha256 = "0pkcwxg91wali7986k03d7q940hb078hlsxfknqhkp2spr3d1f3w"; - revision = "6"; - editedCabalFile = "0l4yw8g1f7isr2nj6s4awfm37b4j5pz2pn0wnzwdbain3az4d51v"; + revision = "8"; + editedCabalFile = "1sfj9c77y7j5y5l7vsix4v94hmi5lajm1v5lgvwvcl7y063h0p2r"; libraryHaskellDepends = [ array base containers pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; @@ -75780,12 +75929,14 @@ self: { }) {}; "control-monad-omega" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, tasty, tasty-bench, tasty-quickcheck }: mkDerivation { pname = "control-monad-omega"; - version = "0.3.2"; - sha256 = "1zx92zyvv10w61rzwhn1d4kggzmi9hggsyjcdav424280x31wb7n"; + version = "0.3.3"; + sha256 = "0f90q6mxxb8szqvw93pypbbf4nicj1w5n9sqs4434b6cp55665z6"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base tasty-bench ]; description = "A breadth-first list monad"; license = lib.licenses.publicDomain; }) {}; @@ -76178,15 +76329,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "copilot_3_20" = callPackage + "copilot_4_0" = 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"; + version = "4.0"; + sha256 = "1vkwrrsl2xlga5imv2w54k71bl8i1qxz53d6frwpnv64hq0g8lrz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76200,21 +76351,21 @@ self: { }) {}; "copilot-bluespec" = callPackage - ({ mkDerivation, base, copilot-core, directory, filepath, HUnit - , ieee754, language-bluespec, pretty, process, QuickCheck, random - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , unix + ({ mkDerivation, base, copilot-core, directory, extra, filepath + , HUnit, ieee754, language-bluespec, pretty, process, QuickCheck + , random, test-framework, test-framework-hunit + , test-framework-quickcheck2, unix }: mkDerivation { pname = "copilot-bluespec"; - version = "3.20"; - sha256 = "0nss9cnhl8dvjnfgkfvhryiib74c5fg6wlfpivrphrbv6jj5pd78"; + version = "4.0"; + sha256 = "1255x4bfwsv305gw0crwm64n32znbzg3g07rly66j56p6dil9dw6"; libraryHaskellDepends = [ base copilot-core directory filepath language-bluespec pretty ]; testHaskellDepends = [ - base copilot-core directory HUnit ieee754 pretty process QuickCheck - random test-framework test-framework-hunit + base copilot-core directory extra HUnit ieee754 pretty process + QuickCheck random test-framework test-framework-hunit test-framework-quickcheck2 unix ]; description = "A compiler for Copilot targeting FPGAs"; @@ -76247,7 +76398,7 @@ self: { broken = true; }) {}; - "copilot-c99_3_20" = callPackage + "copilot-c99_4_0" = callPackage ({ mkDerivation, base, copilot-core, directory, filepath, HUnit , language-c99, language-c99-simple, mtl, pretty, process , QuickCheck, random, test-framework, test-framework-hunit @@ -76255,8 +76406,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.20"; - sha256 = "0vb4hh72y2l4fwh9p13xj2wf1p8wrssmv9zikz91mpiszcmcl5s4"; + version = "4.0"; + sha256 = "1gnkcwqamc63fw64d5vcjxsffjhgz627p0rs4lnjn2wpqj23ms3b"; libraryHaskellDepends = [ base copilot-core directory filepath language-c99 language-c99-simple mtl pretty @@ -76305,14 +76456,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "copilot-core_3_20" = callPackage + "copilot-core_4_0" = callPackage ({ mkDerivation, base, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "copilot-core"; - version = "3.20"; - sha256 = "0ndd6xngcgifk7gklf1r9rzyxvdqxn1zp24wg59wn63l3vqlmrg5"; + version = "4.0"; + sha256 = "0gwl08ib42if8lrwkhd81vpx46yqbl2k1qwwf3ar90b6pnhczyhk"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -76358,14 +76509,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "copilot-interpreter_3_20" = callPackage + "copilot-interpreter_4_0" = callPackage ({ mkDerivation, base, copilot-core, copilot-prettyprinter, pretty , QuickCheck, test-framework, test-framework-quickcheck2 }: mkDerivation { pname = "copilot-interpreter"; - version = "3.20"; - sha256 = "11lxrghfhw3n1nz3rjmrahslnl10cywaafmaf6w32mzwbz5hlix9"; + version = "4.0"; + sha256 = "16ylwz3zplzrgz1z0894022ikmh9zywqsjhczayl65gi4aphi925"; libraryHaskellDepends = [ base copilot-core pretty ]; testHaskellDepends = [ base copilot-core copilot-prettyprinter pretty QuickCheck @@ -76399,7 +76550,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "copilot-language_3_20" = callPackage + "copilot-language_4_0" = callPackage ({ mkDerivation, array, base, containers, copilot-core , copilot-interpreter, copilot-theorem, data-reify, HUnit, mtl , pretty, QuickCheck, test-framework, test-framework-hunit @@ -76407,8 +76558,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "3.20"; - sha256 = "12ihidjin19y72ajyn1in4cnqk63v2ifhsb312y3l9biwqlbqd0l"; + version = "4.0"; + sha256 = "1mkf3p5arwdjxwyjflisdmc1xdz0x5p6iarh544ngpwks72j6j7d"; libraryHaskellDepends = [ array base containers copilot-core copilot-interpreter copilot-theorem data-reify mtl @@ -76443,15 +76594,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "copilot-libraries_3_20" = callPackage + "copilot-libraries_4_0" = 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"; + version = "4.0"; + sha256 = "0zgw4pg0kdq5c4xqpf51wpkxj1sxhyif71j103kdc4ca1wwqhjbr"; libraryHaskellDepends = [ base containers copilot-language mtl parsec ]; @@ -76475,12 +76626,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "copilot-prettyprinter_3_20" = callPackage + "copilot-prettyprinter_4_0" = callPackage ({ mkDerivation, base, copilot-core, pretty }: mkDerivation { pname = "copilot-prettyprinter"; - version = "3.20"; - sha256 = "13kxhismy1ajqzwv4da8qn96xhpx8pnbgbcd7zn35j8fmidfbrmz"; + version = "4.0"; + sha256 = "17vw8h6c0x1x7giwkzqrg2sndw9qp7ninh6lcydzlcn77ma9i0z2"; libraryHaskellDepends = [ base copilot-core pretty ]; description = "A prettyprinter of Copilot Specifications"; license = lib.licenses.bsd3; @@ -76528,7 +76679,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "copilot-theorem_3_20" = callPackage + "copilot-theorem_4_0" = callPackage ({ mkDerivation, base, bimap, bv-sized, containers, copilot-core , copilot-prettyprinter, data-default, directory, libBF, mtl, panic , parameterized-utils, parsec, pretty, process, QuickCheck, random @@ -76537,8 +76688,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "3.20"; - sha256 = "1d9ivlqyknmlic5v2spl4ak72cf3mk35ljx9sbrps4rxchij807a"; + version = "4.0"; + sha256 = "149irgw76s2cfv8491ys8i1gmad23z2c5vjiklgmz0h25b49aix3"; libraryHaskellDepends = [ base bimap bv-sized containers copilot-core copilot-prettyprinter data-default directory libBF mtl panic parameterized-utils parsec @@ -76565,8 +76716,8 @@ self: { }: mkDerivation { pname = "copilot-verifier"; - version = "3.20"; - sha256 = "0dszrayv3i7cvwdnllqnp3xlmnqy836fb0mghf8q6x9r6c8vi91s"; + version = "4.0"; + sha256 = "00ahja1qdvnmr7ddl13b1m9l21k8qqmkr44ml2vpwb7i7l4h65z1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77892,22 +78043,6 @@ self: { broken = true; }) {crack = null;}; - "crackNum_2_4" = callPackage - ({ mkDerivation, array, base, FloatingHex }: - mkDerivation { - pname = "crackNum"; - version = "2.4"; - sha256 = "1fa9rlknmilc8rnm7yvmjrbc9jydpvk30gj7lq79nqbifig6229a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ array base FloatingHex ]; - executableHaskellDepends = [ array base FloatingHex ]; - description = "Crack various integer, floating-point data formats"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "crackNum"; - }) {}; - "crackNum" = callPackage ({ mkDerivation, base, directory, filepath, libBF, process, sbv , tasty, tasty-golden @@ -77927,14 +78062,14 @@ self: { mainProgram = "crackNum"; }) {}; - "crackNum_3_12" = callPackage + "crackNum_3_14" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, ghc, libBF , process, sbv, tasty, tasty-golden }: mkDerivation { pname = "crackNum"; - version = "3.12"; - sha256 = "1d1hn24c9xdnb19h8c0nakq7825q0gv4b4pxbf8cpwjsspb155wm"; + version = "3.14"; + sha256 = "03k2inklgilnqf57h7py3h9mr0zg8wb7fagv8lb0pjxzw02c4qms"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -78469,10 +78604,8 @@ self: { }: mkDerivation { pname = "criterion"; - version = "1.6.3.0"; - sha256 = "18lvvsgd9wwffmq00hqspjqk71njaw9ia6j5n930rpvab7i125y3"; - revision = "1"; - editedCabalFile = "1576v10909fxizrjzszfj6h8r0j3vlsxpnm5ldarihv8xmnikyb2"; + version = "1.6.4.0"; + sha256 = "0l9gxar759nskhm7gskr3j08bw8515amw6rr4n3zx3978dxg8aq6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -78548,8 +78681,8 @@ self: { }: mkDerivation { pname = "criterion-measurement"; - version = "0.2.2.0"; - sha256 = "1kcy8n80kinf8ypan25q61ah99h8v9xrcm6fimp46ky0civ8c089"; + version = "0.2.3.0"; + sha256 = "1qnzgkmjlv3m6zr8l3dfnc1b5jy2fyjxb7s1qzhdcww4bsixqxfc"; libraryHaskellDepends = [ aeson base base-compat binary containers deepseq ghc-prim vector ]; @@ -78779,6 +78912,8 @@ self: { pname = "crucible"; version = "0.7.1"; sha256 = "1c9a8km88ngxghn35f6wnaddm534ixmz1iciyn0whl0xmp27f4zv"; + revision = "1"; + editedCabalFile = "1zixmd0qg2x4pg996safdpq3njrd9qafm9w1bh27j1pqbarl9m0i"; libraryHaskellDepends = [ async base bimap bv-sized containers exceptions fgl hashable json lens mtl panic parameterized-utils prettyprinter template-haskell @@ -78806,6 +78941,8 @@ self: { pname = "crucible-llvm"; version = "0.7"; sha256 = "0v4d3c971w6acka4s1lg9iai55ghk054hkkka5jbinyhhymmaf0k"; + revision = "1"; + editedCabalFile = "11h69y7s8smlrir6gvxijpg3k4laafznypw5786vsrkhvxr91mxk"; libraryHaskellDepends = [ attoparsec base bv-sized bytestring containers crucible crucible-symio extra itanium-abi lens llvm-pretty mtl @@ -79375,8 +79512,8 @@ self: { }: mkDerivation { pname = "crypto-token"; - version = "0.1.1"; - sha256 = "1x5xfrdi9y207fvk266wc2b6gj9mzvgsi6sy2zsqg6k8acf61vfc"; + version = "0.1.2"; + sha256 = "18xphlvn6wzyi6lqrvm5vic97pkcbiph1938p5l1mb22rj5215zm"; libraryHaskellDepends = [ array base bytestring crypton memory network-byte-order ]; @@ -79716,15 +79853,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "crypton_1_0_0" = callPackage + "crypton_1_0_1" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, gauge , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit , tasty-kat, tasty-quickcheck }: mkDerivation { pname = "crypton"; - version = "1.0.0"; - sha256 = "1q1kv37hv8cl6hykvssbd4hsd0zj8a562q42jr2gwk59lnwklhcx"; + version = "1.0.1"; + sha256 = "19674xqf6zp17g4qwlz1m3dzdsl05s1frb2drxb77iccfhabnhli"; libraryHaskellDepends = [ base basement bytestring deepseq ghc-prim integer-gmp memory ]; @@ -79780,21 +79917,21 @@ self: { license = lib.licenses.bsd3; }) {}; - "crypton-connection_0_4_1" = callPackage + "crypton-connection_0_4_2" = callPackage ({ mkDerivation, base, basement, bytestring, containers , crypton-x509, crypton-x509-store, crypton-x509-system - , crypton-x509-validation, data-default-class, network, socks, tls + , crypton-x509-validation, data-default, network, socks, tls }: mkDerivation { pname = "crypton-connection"; - version = "0.4.1"; - sha256 = "0s1n1rqp2dmc55sr42nsw2j9k3cs7lgx90bcfi5ckq0jh3mkyy4n"; + version = "0.4.2"; + sha256 = "1d57xnx6lc6p25lb964mv47lss8d29fd4g7rvrakndbs3h3jvh76"; libraryHaskellDepends = [ base basement bytestring containers crypton-x509 crypton-x509-store - crypton-x509-system crypton-x509-validation data-default-class - network socks tls + crypton-x509-system crypton-x509-validation data-default network + socks tls ]; - description = "Simple and easy network connections API"; + description = "Simple and easy network connection API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -79880,6 +80017,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "crypton-x509-validation_1_6_13" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring + , containers, crypton, crypton-x509, crypton-x509-store + , data-default, hourglass, memory, mtl, pem, tasty, tasty-hunit + }: + mkDerivation { + pname = "crypton-x509-validation"; + version = "1.6.13"; + sha256 = "1m8mri0ix09s484im2nd0xw0h1fyzmhjakvxd7q1gdqxa4jm69si"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base bytestring containers crypton + crypton-x509 crypton-x509-store data-default hourglass memory mtl + pem + ]; + testHaskellDepends = [ + asn1-encoding asn1-types base bytestring crypton crypton-x509 + crypton-x509-store data-default hourglass memory tasty tasty-hunit + ]; + description = "X.509 Certificate and CRL validation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "cryptonite" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, gauge , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit @@ -80369,27 +80529,21 @@ self: { "csv-conduit" = callPackage ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring , conduit, conduit-extra, containers, data-default, directory - , exceptions, ghc-prim, HUnit, mmorph, monad-control, mtl - , ordered-containers, primitive, resourcet, semigroups - , test-framework, test-framework-hunit, text, transformers - , unordered-containers, vector + , exceptions, HUnit, ordered-containers, primitive, resourcet + , test-framework, test-framework-hunit, text, transformers, vector }: mkDerivation { pname = "csv-conduit"; - version = "0.7.3.0"; - sha256 = "1xh11h4qibjcv8b0rk5mwdzww183kpjqzl3x22rbfryjvrp0n07w"; - revision = "1"; - editedCabalFile = "18dad4w8i2jma39flmzrjpxjvnkzcb8fnhxm67rl9iv3b6ip86ng"; + version = "1.0.1.0"; + sha256 = "0qlw5hhsrfpw972ryp3mr895q77d6p1g2q1z7jl7hf1xz7ba0c1r"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring conduit - conduit-extra containers data-default exceptions ghc-prim mmorph - monad-control mtl ordered-containers primitive resourcet semigroups - text transformers unordered-containers vector + conduit-extra containers data-default exceptions ordered-containers + primitive resourcet text transformers vector ]; testHaskellDepends = [ - base bytestring conduit containers directory HUnit mtl - ordered-containers primitive test-framework test-framework-hunit - text transformers vector + base bytestring conduit containers directory HUnit + ordered-containers test-framework test-framework-hunit text vector ]; description = "A flexible, fast, conduit-based CSV parser library for Haskell"; license = lib.licenses.bsd3; @@ -81384,7 +81538,7 @@ self: { hydraPlatforms = lib.platforms.none; mainProgram = "cut-the-crap"; broken = true; - }) {pocketsphinx = null; sphinxbase = null;}; + }) {inherit (pkgs) pocketsphinx; sphinxbase = null;}; "cutter" = callPackage ({ mkDerivation, base, bytestring, explicit-exception, spreadsheet @@ -81940,36 +82094,33 @@ self: { "darcs" = callPackage ({ mkDerivation, array, async, attoparsec, base, base16-bytestring , binary, bytestring, Cabal, cmdargs, conduit, constraints - , containers, crypton-connection, cryptonite, data-default-class - , data-ordlist, directory, exceptions, fgl, filepath, FindBin - , hashable, haskeline, html, http-client-tls, http-conduit + , containers, cryptonite, data-ordlist, directory, exceptions, fgl + , filepath, FindBin, hashable, haskeline, html, 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 - , safe, stm, strict-identity, system-fileio, system-filepath, tar - , temporary, terminal-size, terminfo, test-framework - , test-framework-hunit, test-framework-leancheck - , test-framework-quickcheck2, text, time, tls, transformers - , transformers-base, unix, unix-compat, utf8-string, vector - , zip-archive, zlib + , safe, stm, system-fileio, system-filepath, tar, temporary + , terminal-size, terminfo, test-framework, test-framework-hunit + , test-framework-leancheck, test-framework-quickcheck2, text, time + , tls, transformers, transformers-base, unix, unix-compat + , utf8-string, vector, zip-archive, zlib }: mkDerivation { pname = "darcs"; - version = "2.18.3"; - sha256 = "16p6z21xiz8p3acj21wbkzr1flv5wsj17l16sa3l7gksj9idiaql"; + version = "2.18.4"; + sha256 = "0f034hnrw15i8zz160hl81sr0kja2a7ji5ygkf68yp3q5xpjgg7l"; 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 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 + 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 tar + temporary terminal-size terminfo text time tls transformers unix + unix-compat utf8-string vector zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -82738,33 +82889,59 @@ self: { }) {}; "data-default" = callPackage - ({ mkDerivation, base, data-default-class + ({ mkDerivation, base, containers, data-default-class , data-default-instances-containers, data-default-instances-dlist - , data-default-instances-old-locale + , data-default-instances-old-locale, mtl, old-locale }: mkDerivation { pname = "data-default"; - version = "0.7.1.1"; - sha256 = "04d5n8ybmcxba9qb6h389w9zfq1lvj81b82jh6maqp6pkhkmvydh"; + version = "0.7.1.2"; + sha256 = "0kzq84bflmfhzc7650wykjamwq8zsxm9q2c1s7nfbgig5xyizkjc"; libraryHaskellDepends = [ base data-default-class data-default-instances-containers data-default-instances-dlist data-default-instances-old-locale ]; + testHaskellDepends = [ base containers mtl old-locale ]; description = "A class for types with a default value"; license = lib.licenses.bsd3; }) {}; + "data-default_0_8_0_0" = callPackage + ({ mkDerivation, base, containers, mtl }: + mkDerivation { + pname = "data-default"; + version = "0.8.0.0"; + sha256 = "0cfxfbgsxxla1hr59rnm1cljb6i18rbp8yq7f0bfwvwpi4q0xwi3"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers mtl ]; + description = "A class for types with a default value"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "data-default-class" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "data-default-class"; - version = "0.1.2.0"; - sha256 = "0miyjz8d4jyvqf2vp60lyfbnflx6cj2k8apmm9ly1hq0y0iv80ag"; + version = "0.1.2.2"; + sha256 = "1qxfyxdddl0rzigp81p36i1dgddw2yhqskyz8ngkcy6zbq0w407l"; libraryHaskellDepends = [ base ]; description = "A class for types with a default value"; license = lib.licenses.bsd3; }) {}; + "data-default-class_0_2_0_0" = callPackage + ({ mkDerivation, data-default }: + mkDerivation { + pname = "data-default-class"; + version = "0.2.0.0"; + sha256 = "1d6m12yv5vjciwbig484jrv9qpy7v762k51rpalcimhbzg231r8a"; + libraryHaskellDepends = [ data-default ]; + description = "A class for types with a default value (compatibility shim)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "data-default-extra" = callPackage ({ mkDerivation, base, data-default-class , data-default-instances-bytestring @@ -82817,8 +82994,8 @@ self: { ({ mkDerivation, base, data-default-class }: mkDerivation { pname = "data-default-instances-base"; - version = "0.1.0.1"; - sha256 = "0ym1sw3ssdzzifxxhh76qlv8kkmb2iclc158incv1dklyr9y8kw4"; + version = "0.1.0.3"; + sha256 = "1cslj2bywl4w58f6wr4knk7zj6v8v7rykjxq9ddy8vzbydns1bn8"; libraryHaskellDepends = [ base data-default-class ]; description = "Default instances for types in base"; license = lib.licenses.bsd3; @@ -82861,12 +83038,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "data-default-instances-containers_0_1_0_3" = callPackage + ({ mkDerivation, base, containers, data-default-class }: + mkDerivation { + pname = "data-default-instances-containers"; + version = "0.1.0.3"; + sha256 = "0awk655khqc1cqfc2kcxkcxqpa90l882cz89f2gip6v31vyzmpdr"; + libraryHaskellDepends = [ base containers data-default-class ]; + description = "Default instances for types in containers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "data-default-instances-dlist" = callPackage ({ mkDerivation, base, data-default-class, dlist }: mkDerivation { pname = "data-default-instances-dlist"; - version = "0.0.1"; - sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x"; + version = "0.0.1.2"; + sha256 = "02wy7rq6d5z2hpxdw6vwnb1bri5bz9yrw5hnc1i7l0x5q68g3gg0"; libraryHaskellDepends = [ base data-default-class dlist ]; description = "Default instances for types in dlist"; license = lib.licenses.bsd3; @@ -82889,8 +83078,8 @@ self: { ({ mkDerivation, base, data-default-class, old-locale }: mkDerivation { pname = "data-default-instances-old-locale"; - version = "0.0.1"; - sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0"; + version = "0.0.1.2"; + sha256 = "0vxqr7hmp1vxjv08lmrf15x4p6s7l44qz1c834a8dds807zri03h"; libraryHaskellDepends = [ base data-default-class old-locale ]; description = "Default instances for types in old-locale"; license = lib.licenses.bsd3; @@ -83035,16 +83224,16 @@ self: { "data-effects" = callPackage ({ mkDerivation, base, data-default, data-effects-core - , data-effects-th, lens, tasty, tasty-discover, tasty-hunit, text - , these, time + , data-effects-th, infinite-list, lens, tasty, tasty-discover + , tasty-hunit, text, these, time }: mkDerivation { pname = "data-effects"; - version = "0.1.1.0"; - sha256 = "0ypwb4618hjsvsdrwb1xbdq427g1bfc5dm9xibjbm2yrami16qr2"; + version = "0.3.0.1"; + sha256 = "0xglskzbh7hfl48hx4674ci4p0k8wk9kj2gcw2skpi39pqy2qiwm"; libraryHaskellDepends = [ - base data-default data-effects-core data-effects-th lens text these - time + base data-default data-effects-core data-effects-th infinite-list + lens text these time ]; testHaskellDepends = [ base tasty tasty-hunit ]; testToolDepends = [ tasty-discover ]; @@ -83059,8 +83248,8 @@ self: { }: mkDerivation { pname = "data-effects-core"; - version = "0.1.0.0"; - sha256 = "1sz3wnna9h6211lc9pbvgf6wjr6csqzpl2q2jz8z3s4hky0m32jg"; + version = "0.2.0.0"; + sha256 = "1cxagw2h0987k3s1h3wbhqsydjk0yvz4nda5d6yvz2w3jlm1fnqg"; libraryHaskellDepends = [ base compdata mtl ]; testHaskellDepends = [ base tasty tasty-hunit ]; testToolDepends = [ tasty-discover ]; @@ -83078,8 +83267,10 @@ self: { }: mkDerivation { pname = "data-effects-th"; - version = "0.1.1.0"; - sha256 = "0xs8n5f6v3dani9j2rpl75d8bx02295aimy0fh714qqwg1cmiml6"; + version = "0.2.0.0"; + sha256 = "0b6hwhh7hc7b81xsm1khrjda737gjwg0q48c8v9ai48q5nsnb646"; + revision = "2"; + editedCabalFile = "1zrl8m2w1hlpdhagbhrmq2slf22yfn1am3kw8v68nh2lqp2v9b0x"; libraryHaskellDepends = [ base containers data-default data-effects-core either extra formatting infinite-list lens mtl template-haskell text @@ -83090,18 +83281,18 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Template Haskell utilities for the data-effects library"; - license = lib.licenses.mpl20; + license = "MPL-2.0 AND BSD-3-Clause"; hydraPlatforms = lib.platforms.none; }) {}; "data-elevator" = callPackage - ({ mkDerivation, base, hspec }: + ({ mkDerivation, base, hspec, inspection-testing, primitive }: mkDerivation { pname = "data-elevator"; - version = "0.1.0.2"; - sha256 = "109vff7i8jrz3n6748hj8vf1x4a8r91d2p1cwmcgs0rad536zl0m"; + version = "0.2"; + sha256 = "0fvj6bd86vdxmfwq36pcj810mbl3wc0lipw50ddzdcypsixr21gq"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base hspec inspection-testing primitive ]; description = "Coerce between unlifted boxed and lifted types"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -83904,21 +84095,19 @@ self: { }) {}; "data-reify" = callPackage - ({ mkDerivation, base, base-compat, containers, hashable, hspec - , hspec-discover, unordered-containers + ({ mkDerivation, base, containers, hashable, hspec, hspec-discover + , unordered-containers }: mkDerivation { pname = "data-reify"; - version = "0.6.3"; - sha256 = "1sacbil9xn1n2085wpa0dq7ikf1wvh2kkddnvmwsp22ssx059h55"; - revision = "3"; - editedCabalFile = "0mr1926a4jniy16lsj8a3s8irxlihi0j9vnbpzggfxidxys6z93w"; + version = "0.6.4"; + sha256 = "1b2pahnsjckki3kmp4vn9sfqa1199n4hag6ikqlfvf8v2snjxlqj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers hashable unordered-containers ]; - testHaskellDepends = [ base base-compat hspec ]; + testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; description = "Reify a recursive data structure into an explicit graph"; license = lib.licenses.bsd3; @@ -85127,17 +85316,17 @@ self: { license = lib.licenses.asl20; }) {}; - "dbus_1_3_6" = callPackage + "dbus_1_3_9" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers - , criterion, deepseq, directory, exceptions, extra, filepath, lens - , network, parsec, process, QuickCheck, random, resourcet, split - , tasty, tasty-hunit, tasty-quickcheck, template-haskell, temporary - , text, th-lift, transformers, unix, vector, xml-conduit, xml-types + , deepseq, directory, exceptions, extra, filepath, lens, network + , parsec, process, QuickCheck, random, resourcet, split, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text + , th-lift, transformers, unix, vector, xml-conduit, xml-types }: mkDerivation { pname = "dbus"; - version = "1.3.6"; - sha256 = "1hz2qz9lsqs00c2xcdf9p32mg3ycq5p25g859xys9wwqcxvspcq6"; + version = "1.3.9"; + sha256 = "0n0ajk2cyv02kfwh9zs7xg84hiyhaqnw1z5a0jc8z9c1in3p9vm0"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -85148,7 +85337,6 @@ self: { parsec process QuickCheck random resourcet tasty tasty-hunit tasty-quickcheck temporary text transformers unix vector ]; - benchmarkHaskellDepends = [ base criterion ]; doCheck = false; description = "A client library for the D-Bus IPC system"; license = lib.licenses.asl20; @@ -85719,8 +85907,8 @@ self: { }: mkDerivation { pname = "dear-imgui"; - version = "2.3.0"; - sha256 = "0dq1k2v57b2fvrmsxmkr02zyia3bndq2xl6c4avyn6jpr2pfak4l"; + version = "2.3.1"; + sha256 = "0pj973isqpnrg8zd4w5z50abd90cd4dnhdpy5i5ai8k24ak5mkp1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85733,8 +85921,6 @@ self: { doHaddock = false; description = "Haskell bindings for Dear ImGui"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) SDL2; inherit (pkgs) glew;}; "debian" = callPackage @@ -86278,14 +86464,14 @@ self: { mainProgram = "deeplearning_demonstration"; }) {}; - "deepseq_1_5_0_0" = callPackage - ({ mkDerivation, array, base, ghc-prim }: + "deepseq_1_5_1_0" = callPackage + ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "deepseq"; - version = "1.5.0.0"; - sha256 = "12w6zflnkgn757psx1ips3fh3yxscil5x0jil6gir3dj9279mwd0"; - libraryHaskellDepends = [ array base ghc-prim ]; - testHaskellDepends = [ array base ghc-prim ]; + version = "1.5.1.0"; + sha256 = "0yz1b3c4fpa1pknwd64fba37wbr7mxzawd0han2ifq70mgiqfkiz"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base ghc-prim ]; description = "Deep evaluation of data structures"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -86404,8 +86590,8 @@ self: { pname = "defaultable-map"; version = "1.0.2"; sha256 = "0s70fwnh6r41hlr7hzv5rwiw8m0rrlj8v1bar09fq3gzqmhrpbqw"; - revision = "1"; - editedCabalFile = "15m4cl51g2nn6v3my7c4awnqvrqyvain08l8kr5yqqjmll8bwbvl"; + revision = "2"; + editedCabalFile = "0dncpans6gwzpfx71lq36hf8viqw5f50vhh91k116lkgnxc5fzn9"; libraryHaskellDepends = [ base containers deepseq semigroupoids ]; description = "Applicative maps"; license = lib.licenses.bsd3; @@ -87132,21 +87318,6 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "dependent-map_0_2_4_0" = callPackage - ({ mkDerivation, base, containers, dependent-sum }: - mkDerivation { - pname = "dependent-map"; - version = "0.2.4.0"; - sha256 = "0il2naf6gdkvkhscvqd8kg9v911vdhqp9h10z5546mninnyrdcsx"; - revision = "1"; - editedCabalFile = "0a5f35d1sgfq1cl1r5bgb5pwfjniiycxiif4ycxglaizp8g5rlr1"; - libraryHaskellDepends = [ base containers dependent-sum ]; - description = "Dependent finite maps (partial dependent products)"; - license = "unknown"; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.alexfmpe ]; - }) {}; - "dependent-map" = callPackage ({ mkDerivation, base, constraints-extras, containers , dependent-sum @@ -87173,6 +87344,8 @@ self: { pname = "dependent-monoidal-map"; version = "0.1.1.4"; sha256 = "1cgk0dlag557krddaivbqkc3qp4crsspa53wkqx5mpgv6jaiq7dg"; + revision = "1"; + editedCabalFile = "0qm6b15ljxdpnyihz6ip932spbgz0kgkgqpif961599l35l1ajg9"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum dependent-sum-aeson-orphans @@ -87194,21 +87367,6 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "dependent-sum_0_4" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "dependent-sum"; - version = "0.4"; - sha256 = "07hs9s78wiybwjwkal2yq65hdavq0gg1h2ld7wbph61s2nsfrpm8"; - revision = "1"; - editedCabalFile = "01l176qjk728kyjbmwanjw2avx14bkrr34ncs5daxrifw6wq00w7"; - libraryHaskellDepends = [ base ]; - description = "Dependent sum type"; - license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.alexfmpe ]; - }) {}; - "dependent-sum" = callPackage ({ mkDerivation, base, constraints-extras, some }: mkDerivation { @@ -87231,8 +87389,8 @@ self: { pname = "dependent-sum-aeson-orphans"; version = "0.3.1.1"; sha256 = "0d2255gxsamp19hl23m076ds2j08ny95swrk9r3njjfjrwkd4zbq"; - revision = "1"; - editedCabalFile = "023f0h3pifgjrv8qr7cka86iykpzw1c4vcx1kjsi8m9brl78hh1h"; + revision = "2"; + editedCabalFile = "1w50zxcngacgaq534dza7p1h37nkshmh9nhcaxlwkia2mr26fiv5"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum some @@ -87516,8 +87674,8 @@ self: { ({ mkDerivation, base, hspec, template-haskell, th-abstraction }: mkDerivation { pname = "derive-has-field"; - version = "0.0.1.2"; - sha256 = "03w0qvs7adgwc676gk0q36bm9s7f7b709siy4dh0y27qblcjb6a4"; + version = "0.0.1.4"; + sha256 = "19mbgv53sc4j200affnsig9g9qz9cn7xp7v3qc1l4cc93pgyf3m9"; libraryHaskellDepends = [ base template-haskell th-abstraction ]; testHaskellDepends = [ base hspec template-haskell th-abstraction @@ -87928,21 +88086,21 @@ self: { }) {}; "desktop-portal" = callPackage - ({ mkDerivation, base, binary, bytestring, containers - , data-default-class, dbus, directory, filepath, hspec - , hspec-discover, hspec-expectations, modern-uri, network, process - , random, temporary, text, unix + ({ mkDerivation, base, binary, bytestring, containers, data-default + , dbus, directory, filepath, hspec, hspec-discover + , hspec-expectations, modern-uri, network, process, random + , temporary, text, unix }: mkDerivation { pname = "desktop-portal"; - version = "0.6.0.0"; - sha256 = "18cgwz8cgsj1vjhk4rgv4lakqbnrrb5pspkpg5lnkc9kq7953d1g"; + version = "0.7.0.0"; + sha256 = "1j30lqriib7nh4p0qydav11xy17n32y8b9802vlmw4zw8rw84ivx"; libraryHaskellDepends = [ - base binary bytestring containers data-default-class dbus directory + base binary bytestring containers data-default dbus directory filepath modern-uri network random text unix ]; testHaskellDepends = [ - base binary bytestring containers data-default-class dbus directory + base binary bytestring containers data-default dbus directory filepath hspec hspec-expectations modern-uri network process random temporary text unix ]; @@ -88308,6 +88466,8 @@ self: { pname = "dhall"; version = "1.42.1"; sha256 = "0n4773s7l9sfqi00fnh4h92mpifbh0m6vsvpghg834c0jx2gm36f"; + revision = "1"; + editedCabalFile = "04q42qhfc346ml0vxrxwcxrwn0j4wrbbi8ll17ml2pkgr28krdnh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -88378,8 +88538,8 @@ self: { pname = "dhall-bash"; version = "1.0.41"; sha256 = "09jz39lnahjzp4f7mfkc68gkb1whqi3v781wqp4w1nrdq8b97sra"; - revision = "1"; - editedCabalFile = "0l324739f5x9d48c0lfrn5is19hsc2cnh0psswsnzyy4chsw87fg"; + revision = "2"; + editedCabalFile = "1lvm16gc3anyrs167kcvgdn6dh8ygxwjsgf87p3c0ldmnxlvp13j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88426,6 +88586,8 @@ self: { pname = "dhall-csv"; version = "1.0.4"; sha256 = "1kmrkjc2r5l1q2hc2xq83c25zrfm7w4av0jc06ilxklf4i1kvy4b"; + revision = "1"; + editedCabalFile = "10kmbhaly9z95614x3jfmqkswa249dlmr302wng0dpmw1mxqzz2a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88458,8 +88620,8 @@ self: { pname = "dhall-docs"; version = "1.0.11"; sha256 = "0i9czz2p2kv5mw7mnbpqq9nl86aqyp4z0yy115q3nfasl5ys6jlq"; - revision = "1"; - editedCabalFile = "04i3v73hgyq57a6010wkd7xhmafy8xxc5vsl9km2r3wqy7505fj9"; + revision = "2"; + editedCabalFile = "0wsi3nslijmf0p7j3k7j1g3zzj6y31d0vyqhr74856v4k3757p4a"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -88527,8 +88689,8 @@ self: { pname = "dhall-json"; version = "1.7.12"; sha256 = "1ynm347ccqgh2jmnq9mwj3mc3zd81pwqja5ivdwxkjw08d1wsj6a"; - revision = "2"; - editedCabalFile = "0yii9bknd19l65z56zlsxsf4kzbnhygr9dl6bkzy991qsp8155yy"; + revision = "3"; + editedCabalFile = "1v21yb69aa6hzg6rhwhi6x61nrk35bbhl8pw1dikbw73s95c9f0j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88565,6 +88727,7 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Lexer for the Dhall language"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "dhall-lsp-server" = callPackage @@ -88579,6 +88742,8 @@ self: { pname = "dhall-lsp-server"; version = "1.1.3"; sha256 = "1vcdjsqd0falcx48fa58qilnwh70h6cinxbkh2rfmlhvfgmramc8"; + revision = "1"; + editedCabalFile = "07x2q58dzr7qn116rx12wpi3jsgz3f5rpxmilk0x1zj1jiwznyxg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88608,8 +88773,8 @@ self: { pname = "dhall-nix"; version = "1.1.26"; sha256 = "1xgmmfp6bi3mnd9l335ks6xcgpfy2s2kgpcygi7i7p41f795zgma"; - revision = "1"; - editedCabalFile = "1bjy0ngvlg9a6b1bsms894qr23axqzg4xgjb1d0hmdyrvkhniwxq"; + revision = "2"; + editedCabalFile = "06ixc19hp4n78cg0jlg74gdbz5ngni2a6w8768i946s7sglgcfa3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88635,8 +88800,8 @@ self: { pname = "dhall-nixpkgs"; version = "1.0.10"; sha256 = "09p1zfssqab3p3x3ngidfkf31kk5kvcx8krjiyf18vmq9fn75mm5"; - revision = "1"; - editedCabalFile = "19dj1npbcib00zxhiphqg1icbwx9m3qbhcgbp7bciarymy3cqxc3"; + revision = "2"; + editedCabalFile = "0hk6ndmaf8fcmvi9m414a8pl6q6ykqd1mng8pcmak5b184b61961"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -88660,8 +88825,8 @@ self: { pname = "dhall-openapi"; version = "1.0.6"; sha256 = "0jx905x17lfwb316hx6mwiwr647688nwwcikv5iadv2qr9s04yc9"; - revision = "1"; - editedCabalFile = "1xzzrgjajpr49bi6lpi2hys9la9646mi4f8wp3md5fim305l19pb"; + revision = "2"; + editedCabalFile = "0bda2n7yfjxb98kj497v5vy9xgwc4l5i6imp53c7gxvbf2fnjlnc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88813,8 +88978,8 @@ self: { pname = "dhall-toml"; version = "1.0.3"; sha256 = "0d99msfbd9dxhjh2bc5bnzwn4c5n4viv3q0n4p1mx2rw67jyra80"; - revision = "1"; - editedCabalFile = "1v0ibk5zr1nifxvy445xph3w134dmcxki5wnw63nrf2vdn7zjby5"; + revision = "2"; + editedCabalFile = "1vl04lq1fgxcdf1p97wbbwx1rl4lijvxiihg62vwz18v193fxfr2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88840,8 +89005,8 @@ self: { pname = "dhall-yaml"; version = "1.2.12"; sha256 = "1sh802maai9vxfrjd0w4k9cv4pklhkxid1s5xdbagywcaqdhk272"; - revision = "2"; - editedCabalFile = "1wbfyi950kpy1ppd1dq465y9amjc47bvzwjiffsbp8azq5j45bx6"; + revision = "3"; + editedCabalFile = "05dl461p5acqn9mlw08mvk3vspgk79k34v6m1wag0g7f3b34c5w4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89180,8 +89345,8 @@ self: { pname = "diagrams-builder"; version = "0.8.0.6"; sha256 = "17yi5dmcxx4sgk3wha386zbv9h69pwq72j8i21vmfh35brxhs9f4"; - revision = "1"; - editedCabalFile = "1w9bjc6zizp779rk4frfmffzlv4vq4sljdcvql9ma5qy679phiyr"; + revision = "2"; + editedCabalFile = "1mkxn0r6wmxyvdhwly1a6j0z4j234mfv7aimirwl7jmcv55lwbs4"; configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; isLibrary = true; isExecutable = true; @@ -89221,6 +89386,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "diagrams-cairo_1_4_3" = callPackage + ({ mkDerivation, array, base, bytestring, cairo, colour, containers + , data-default, diagrams-core, diagrams-lib, filepath, hashable + , JuicyPixels, lens, mtl, optparse-applicative, pango, split + , statestack, transformers, unix, vector + }: + mkDerivation { + pname = "diagrams-cairo"; + version = "1.4.3"; + sha256 = "0irj7jigi9dfprjilndyx0kwg7vjpbhrsxhlsqc8n1sy1b4s2aha"; + libraryHaskellDepends = [ + array base bytestring cairo colour containers data-default + diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl + optparse-applicative pango split statestack transformers unix + vector + ]; + description = "Cairo backend for diagrams drawing EDSL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "diagrams-canvas" = callPackage ({ mkDerivation, base, blank-canvas, cmdargs, containers , data-default-class, diagrams-core, diagrams-lib, lens, mtl @@ -89230,8 +89416,8 @@ self: { pname = "diagrams-canvas"; version = "1.4.1.2"; sha256 = "165iwjvx17ym5qsrxsj7va4kmmifg8nay1qq7mbyp3crvfvkfgv2"; - revision = "1"; - editedCabalFile = "1cj3ckny5xgsr624d1zc4z9kdfw9lfpc4vfzza9nn3jzy3px8z7l"; + revision = "2"; + editedCabalFile = "1hmbcr20pwdfd26xr9dx6gdcmzsw1p7k8avgjcvqa4n9p8ykcrqp"; libraryHaskellDepends = [ base blank-canvas cmdargs containers data-default-class diagrams-core diagrams-lib lens mtl NumInstances @@ -89241,6 +89427,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "diagrams-canvas_1_4_2" = callPackage + ({ mkDerivation, base, blank-canvas, cmdargs, containers + , data-default, diagrams-core, diagrams-lib, lens, mtl + , NumInstances, optparse-applicative, statestack, text + }: + mkDerivation { + pname = "diagrams-canvas"; + version = "1.4.2"; + sha256 = "0ns1xmgcjqig7qld7r77rbcrk779cmzj7xfqj6a7sbdci3in2dgm"; + libraryHaskellDepends = [ + base blank-canvas cmdargs containers data-default diagrams-core + diagrams-lib lens mtl NumInstances optparse-applicative statestack + text + ]; + description = "HTML5 canvas backend for diagrams drawing EDSL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "diagrams-contrib" = callPackage ({ mkDerivation, base, circle-packing, colour, containers , cubicbezier, data-default, data-default-class, diagrams-core @@ -89253,8 +89458,8 @@ self: { pname = "diagrams-contrib"; version = "1.4.5.1"; sha256 = "0whp2p9m7pcb2sgyr8rvhf518f18w5i0vxziganw7qj6ijn9kdyb"; - revision = "1"; - editedCabalFile = "08bqpgqcsbiqq1zc07sy6n5k5nyhf63hsrds759fqbr6hb9zwxsx"; + revision = "2"; + editedCabalFile = "000ybzwi9cj7p6j21xhkby1sg13ph55qmc6j05cw8j5n1a6c1mv5"; libraryHaskellDepends = [ base circle-packing colour containers cubicbezier data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -89269,6 +89474,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "diagrams-contrib_1_4_6" = callPackage + ({ mkDerivation, base, circle-packing, colour, containers + , cubicbezier, data-default, diagrams-core, diagrams-lib + , diagrams-solve, force-layout, hashable, HUnit, lens, linear + , mfsolve, MonadRandom, monoid-extras, mtl, mtl-compat, parsec + , QuickCheck, random, semigroups, split, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "diagrams-contrib"; + version = "1.4.6"; + sha256 = "1x5z361xmqfa503brmf0zwyq3lldm9kgixx90v14s4dsz52my46k"; + libraryHaskellDepends = [ + base circle-packing colour containers cubicbezier data-default + diagrams-core diagrams-lib diagrams-solve force-layout hashable + lens linear mfsolve MonadRandom monoid-extras mtl mtl-compat parsec + random semigroups split text + ]; + testHaskellDepends = [ + base containers diagrams-lib HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + description = "Collection of user contributions to diagrams EDSL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "diagrams-core" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive , dual-tree, lens, linear, monoid-extras, mtl, profunctors @@ -89299,6 +89531,8 @@ self: { pname = "diagrams-gi-cairo"; version = "1.4.2"; sha256 = "0k6fw1vvqa4pra4czd90n7i7h1vf6hn08a4jip1xbqkf57d89bn6"; + revision = "1"; + editedCabalFile = "1r1ph8nc7xgh3by63dsamkvhi6bvw1bgvhnc8f664iiziaj9p08a"; libraryHaskellDepends = [ array base bytestring colour containers diagrams-core diagrams-lib filepath gi-cairo gi-cairo-connector gi-cairo-render gi-pango @@ -89319,8 +89553,8 @@ self: { pname = "diagrams-graphviz"; version = "1.4.1.1"; sha256 = "0lscrxd682jvyrl5bj4dxp7593qwyis01sl0p4jm2jfn335wdq40"; - revision = "5"; - editedCabalFile = "11kl8sgm3g722wqf734adh5lkhrbpm9cryj19g7zipjg9lgns9q6"; + revision = "6"; + editedCabalFile = "1h0y3dv8707yvk1g0hmyb6knzahyzyxqmabkih4wyq5cz1zjmh1n"; libraryHaskellDepends = [ base containers diagrams-lib fgl graphviz split ]; @@ -89423,8 +89657,8 @@ self: { }: mkDerivation { pname = "diagrams-input"; - version = "0.1.3"; - sha256 = "1ia8anpmzgdz4087m75x7pcb2hmfs2jilgxlchrcc1vk417z5a6l"; + version = "0.1.4"; + sha256 = "0xmywrx8mc12jzynym9d8aw026agwphygf6n4jmd1mvw9vs0270d"; libraryHaskellDepends = [ attoparsec base base64-bytestring blaze-builder blaze-markup bytestring colour conduit conduit-extra containers css-text @@ -89469,6 +89703,38 @@ self: { license = lib.licenses.bsd3; }) {}; + "diagrams-lib_1_4_7" = callPackage + ({ mkDerivation, active, adjunctions, array, base, bytestring + , cereal, colour, containers, criterion, data-default, deepseq + , diagrams-core, diagrams-solve, directory, distributive, dual-tree + , exceptions, fail, filepath, fingertree, fsnotify, hashable + , intervals, JuicyPixels, lens, linear, monoid-extras, mtl + , numeric-extras, optparse-applicative, process, profunctors + , QuickCheck, semigroups, tagged, tasty, tasty-hunit + , tasty-quickcheck, text, transformers, unordered-containers + }: + mkDerivation { + pname = "diagrams-lib"; + version = "1.4.7"; + sha256 = "164czhsn149981glqyzvixv2q8hwd15klav9djhvbssw6r2lsfj2"; + libraryHaskellDepends = [ + active adjunctions array base bytestring cereal colour containers + data-default diagrams-core diagrams-solve directory distributive + dual-tree exceptions fail filepath fingertree fsnotify hashable + intervals JuicyPixels lens linear monoid-extras mtl + optparse-applicative process profunctors semigroups tagged text + transformers unordered-containers + ]; + testHaskellDepends = [ + base deepseq diagrams-solve distributive lens numeric-extras + QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion diagrams-core ]; + description = "Embedded domain-specific language for declarative graphics"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "diagrams-pandoc" = callPackage ({ mkDerivation, base, bytestring, diagrams-builder, diagrams-cairo , diagrams-core, diagrams-lib, diagrams-svg, directory, filepath @@ -89528,8 +89794,8 @@ self: { pname = "diagrams-pgf"; version = "1.4.2.1"; sha256 = "1778sjjvggq5ks73489y76f4z0cvzkn9ixn176fm8kf8swaf82ja"; - revision = "1"; - editedCabalFile = "0j2hkmhkbqywsc4vkpn2jvh37hdw1lwphlfvid1f90ayq2npc6p0"; + revision = "2"; + editedCabalFile = "1ri4jyw2cxcypcayp9w1wrv4ms2p28zjz80129x9f72mkf3ds6gk"; libraryHaskellDepends = [ base bytestring bytestring-builder colour containers diagrams-core diagrams-lib directory filepath hashable JuicyPixels mtl @@ -89559,6 +89825,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "diagrams-postscript_1_5_2" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , diagrams-core, diagrams-lib, hashable, lens, monoid-extras, mtl + , semigroups, split, statestack + }: + mkDerivation { + pname = "diagrams-postscript"; + version = "1.5.2"; + sha256 = "08kqhnd5r60kisjraypwjfcri1v4f32rf14js413871pgic4rhy5"; + libraryHaskellDepends = [ + base bytestring containers data-default diagrams-core diagrams-lib + hashable lens monoid-extras mtl semigroups split statestack + ]; + description = "Postscript backend for diagrams drawing EDSL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "diagrams-qrcode" = callPackage ({ mkDerivation, array, base, colour, diagrams-core, diagrams-lib }: @@ -89597,6 +89881,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "diagrams-rasterific_1_4_3" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , diagrams-core, diagrams-lib, file-embed, filepath, FontyFruity + , hashable, JuicyPixels, lens, mtl, optparse-applicative + , Rasterific + }: + mkDerivation { + pname = "diagrams-rasterific"; + version = "1.4.3"; + sha256 = "1m7d9mjyydzb74vq1w3irazx334ygqvjhcql3akw62c9f6kckdq8"; + libraryHaskellDepends = [ + base bytestring containers data-default diagrams-core diagrams-lib + file-embed filepath FontyFruity hashable JuicyPixels lens mtl + optparse-applicative Rasterific + ]; + testHaskellDepends = [ base diagrams-core diagrams-lib ]; + description = "Rasterific backend for diagrams"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "diagrams-reflex" = callPackage ({ mkDerivation, base, colour, containers, diagrams-core , diagrams-lib, lens, monoid-extras, mtl, reflex, reflex-dom @@ -89658,27 +89963,6 @@ self: { }: mkDerivation { pname = "diagrams-svg"; - version = "1.4.3.1"; - sha256 = "002lgmq78c6rsvds9bgm6m4w8j6qpg260mc52hf97wj6m050l237"; - revision = "7"; - editedCabalFile = "1njcpdk5amymnlp8dq6r8cgj3gm0rqhhi68jywqc5zcscmr77l2m"; - libraryHaskellDepends = [ - base base64-bytestring bytestring colour containers diagrams-core - diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl - optparse-applicative semigroups split svg-builder text - ]; - description = "SVG backend for diagrams drawing EDSL"; - license = lib.licenses.bsd3; - }) {}; - - "diagrams-svg_1_4_3_2" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, colour - , containers, diagrams-core, diagrams-lib, filepath, hashable - , JuicyPixels, lens, monoid-extras, mtl, optparse-applicative - , semigroups, split, svg-builder, text - }: - mkDerivation { - pname = "diagrams-svg"; version = "1.4.3.2"; sha256 = "06syqgwprbzrmjylbw9rn7f4vz6fzbw0g0052mnzs92w5ddhkivg"; libraryHaskellDepends = [ @@ -89688,7 +89972,6 @@ self: { ]; description = "SVG backend for diagrams drawing EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "diagrams-tikz" = callPackage @@ -89991,8 +90274,8 @@ self: { pname = "diff-loc"; version = "0.1.0.0"; sha256 = "08sbxkf804bq3lwr9s1k1vigq7yrdjgicrj114zi14cdi4168k3x"; - revision = "2"; - editedCabalFile = "1wqbrgp1dxvcwlc04l4rx9g2pkjl1spvrlhkfrzm5xkra33fsnqy"; + revision = "3"; + editedCabalFile = "0msy6gqch9nz5dr1hddwvyq57kf0l8c0dybsl6d2f3109f60rsrn"; libraryHaskellDepends = [ base fingertree show-combinators ]; description = "Map file locations across diffs"; license = lib.licenses.mit; @@ -90527,6 +90810,8 @@ self: { pname = "dimensional"; version = "1.5"; sha256 = "16d50vlln11hq894y8qxrg4cricz1459dg14z0wc1fzfiydxb6ns"; + revision = "1"; + editedCabalFile = "1149vwz3ywi2kkblsl8ayhca4ibwn76zdc5g6l18j8b03hvf3yzg"; libraryHaskellDepends = [ base deepseq exact-pi ieee754 numtype-dk vector ]; @@ -90539,14 +90824,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "dimensional_1_6" = callPackage + "dimensional_1_6_1" = callPackage ({ mkDerivation, base, criterion, deepseq, exact-pi, hspec , hspec-discover, ieee754, numtype-dk, QuickCheck, vector }: mkDerivation { pname = "dimensional"; - version = "1.6"; - sha256 = "05ikvdpl9j94alyf3r9fwfwn354z4gifbhp1fasspmd9s0bhi7wl"; + version = "1.6.1"; + sha256 = "1alys6kxhs0cbadk0sgs0k5whyn62klpf08b5n1kny7qpq3rhaq4"; libraryHaskellDepends = [ base deepseq exact-pi ieee754 numtype-dk vector ]; @@ -90922,28 +91207,15 @@ self: { broken = true; }) {}; - "directory_1_3_7_1" = callPackage - ({ mkDerivation, base, filepath, time, unix }: - mkDerivation { - pname = "directory"; - version = "1.3.7.1"; - sha256 = "1z8frwbr0kdk47x3xasq7ifzcrwl7ryh1aqgf202xv4cakb8a9yw"; - revision = "2"; - editedCabalFile = "142wr326wma17cjmdh8z02rwxc76712bky1f46vqr33g1wdsqyxj"; - libraryHaskellDepends = [ base filepath time unix ]; - testHaskellDepends = [ base filepath time unix ]; - description = "Platform-agnostic library for filesystem operations"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - - "directory_1_3_8_5" = callPackage - ({ mkDerivation, base, filepath, time, unix }: + "directory_1_3_9_0" = callPackage + ({ mkDerivation, base, file-io, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.8.5"; - sha256 = "0s57dq5l02b9z3h17slw3yg73mzdx15pzj02xg91avpwvmafsr78"; - libraryHaskellDepends = [ base filepath time unix ]; + version = "1.3.9.0"; + sha256 = "1k34iqdkh9d5vjd7wihhjjc6388hfbh7sjwp3msziibz2534i8i0"; + revision = "1"; + editedCabalFile = "05xr3df321hb7rnsbad8bgm1jqi7bzpmi54mja9xg2vknxxi7414"; + libraryHaskellDepends = [ base file-io filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; license = lib.licenses.bsd3; @@ -91142,7 +91414,9 @@ self: { ]; description = "Easily stream directory contents in constant memory"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Gabriella439 ]; + broken = true; }) {}; "dirtree" = callPackage @@ -91278,8 +91552,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.17.0"; - sha256 = "0xmfrv50h07sz3hcv96j6nih00gmd0jk6w4d8bprnds2hdzjxsj0"; + version = "1.17.1"; + sha256 = "1lw1n8m297ad0rcbn48ysg85l35sg5bh3gwbnm2698cd051b4yad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91507,8 +91781,8 @@ self: { pname = "discrimination"; version = "0.5"; sha256 = "1qq7fs1dsfqgf4969gksqcp3swcx0wbzdh66a89fv78k6y94g0pc"; - revision = "3"; - editedCabalFile = "1i3mkza18y2dxj03zn9419rh7jgpkg1kq97blhjrcw5174p9p3c6"; + revision = "4"; + editedCabalFile = "1m4sv7mdqdm5xx5khbyq0il3dn5isg575vgn1akb283l2jkz4v1g"; libraryHaskellDepends = [ array base containers contravariant deepseq ghc-bignum ghc-prim hashable primitive promises transformers @@ -91795,10 +92069,10 @@ self: { }: mkDerivation { pname = "distributed-process"; - version = "0.7.6"; - sha256 = "0kfgz8nrg8pdnw56msdkdlc1y894giz6jmgss6gxmhrr929rsnlz"; - revision = "3"; - editedCabalFile = "0fnanh4yl1z7v8bqlj8q3r0cgbpllv1md9l1hhi73alpn5fmdwc7"; + version = "0.7.7"; + sha256 = "03ki3p9hanwlgsd4yii2v2hyw736pbj7839yqbl2ja66vkgfhajw"; + revision = "1"; + editedCabalFile = "1xrbhcn1l46zv25snlxdchyiy7ijb03pyzndqdwz885dkqapwvd4"; libraryHaskellDepends = [ base binary bytestring containers data-accessor deepseq distributed-static exceptions hashable mtl network-transport random @@ -91816,14 +92090,14 @@ self: { ({ mkDerivation, ansi-terminal, base, binary, containers , data-accessor, deepseq, distributed-process , distributed-process-systest, exceptions, fingertree, hashable - , mtl, network, network-transport, network-transport-tcp, rematch - , stm, test-framework, test-framework-hunit, time, transformers + , mtl, network, network-transport, network-transport-tcp, stm + , test-framework, test-framework-hunit, time, transformers , unordered-containers }: mkDerivation { pname = "distributed-process-async"; - version = "0.2.7"; - sha256 = "138gjlsw5r6nsm609kq25wg1nxad34ag9ysa4m0f5rbf8fb0mmm6"; + version = "0.2.10"; + sha256 = "1j0rscip4gyr3aw6br07w3wx5wvm8fd1mgknknhf77zx7vc9cspk"; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process exceptions fingertree hashable mtl stm time transformers @@ -91832,8 +92106,8 @@ self: { testHaskellDepends = [ ansi-terminal base binary deepseq distributed-process distributed-process-systest exceptions network network-transport - network-transport-tcp rematch stm test-framework - test-framework-hunit transformers + network-transport-tcp stm test-framework test-framework-hunit + transformers ]; description = "Cloud Haskell Async API"; license = lib.licenses.bsd3; @@ -91868,14 +92142,13 @@ self: { , distributed-process, distributed-process-async , distributed-process-extras, distributed-process-systest , exceptions, fingertree, ghc-prim, hashable, HUnit, mtl, network - , network-transport, network-transport-tcp, rematch, stm - , test-framework, test-framework-hunit, time, transformers - , unordered-containers + , network-transport, network-transport-tcp, stm, test-framework + , test-framework-hunit, time, transformers, unordered-containers }: mkDerivation { pname = "distributed-process-client-server"; - version = "0.2.5.1"; - sha256 = "15wd3nb68igg7izjb1zzcdcgsh8a9akhfw41arzdp7xcwp6prxy7"; + version = "0.2.7.1"; + sha256 = "1kr4l88q4mh8pv68rjj5nnc5ccivq175vrzk6s6dllyn3hs7wxfi"; libraryHaskellDepends = [ base binary containers deepseq distributed-process distributed-process-async distributed-process-extras exceptions @@ -91885,7 +92158,7 @@ self: { ansi-terminal base binary containers deepseq distributed-process distributed-process-async distributed-process-extras distributed-process-systest exceptions fingertree ghc-prim HUnit - mtl network network-transport network-transport-tcp rematch stm + mtl network network-transport network-transport-tcp stm test-framework test-framework-hunit transformers ]; description = "The Cloud Haskell Application Platform"; @@ -91913,19 +92186,17 @@ self: { ({ mkDerivation, ansi-terminal, base, binary, bytestring , containers, data-accessor, deepseq, distributed-process , distributed-process-client-server, distributed-process-extras - , distributed-process-supervisor, distributed-process-tests + , distributed-process-supervisor, distributed-process-systest , distributed-static, fingertree, ghc-prim, hashable, HUnit, mtl , network, network-transport, network-transport-tcp, QuickCheck - , rematch, stm, test-framework, test-framework-hunit + , stm, test-framework, test-framework-hunit , test-framework-quickcheck2, time, transformers , unordered-containers }: mkDerivation { pname = "distributed-process-execution"; - version = "0.1.2.2"; - sha256 = "1dgpvgip2ji36jfrmxp818b2mz1fvh77l4l64m3ayljf75mwmgwz"; - revision = "2"; - editedCabalFile = "18kq0ldz2lci5f2dx98m67gch7539yj7fyaxrqjgk0h2dsc7klfg"; + version = "0.1.4.1"; + sha256 = "0n1ylgwb5yvli0shpckfvxf9nhb5cf21c1kh0r21wh49k8v5ppvg"; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process distributed-process-client-server distributed-process-extras @@ -91935,9 +92206,9 @@ self: { testHaskellDepends = [ ansi-terminal base binary bytestring containers data-accessor deepseq distributed-process distributed-process-extras - distributed-process-tests distributed-static fingertree ghc-prim + distributed-process-systest distributed-static fingertree ghc-prim hashable HUnit mtl network network-transport network-transport-tcp - QuickCheck rematch stm test-framework test-framework-hunit + QuickCheck stm test-framework test-framework-hunit test-framework-quickcheck2 time transformers unordered-containers ]; description = "Execution Framework for The Cloud Haskell Application Platform"; @@ -91950,15 +92221,14 @@ self: { , containers, data-accessor, deepseq, distributed-process , distributed-process-systest, distributed-static, exceptions , fingertree, ghc-prim, hashable, HUnit, mtl, network - , network-transport, network-transport-tcp, QuickCheck, rematch - , stm, test-framework, test-framework-hunit - , test-framework-quickcheck2, time, transformers - , unordered-containers + , network-transport, network-transport-tcp, QuickCheck, stm + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , time, transformers, unordered-containers }: mkDerivation { pname = "distributed-process-extras"; - version = "0.3.5"; - sha256 = "0yva1ydm34fjvzn1z3jfb436d1m3d54fzs3kxqzgsf1nwxpz25rk"; + version = "0.3.8"; + sha256 = "076lsgdh5dfs6c7rfbs83c1cpxcy9i410i8knp5b82cxbbi8c3xy"; libraryHaskellDepends = [ base binary containers deepseq distributed-process exceptions fingertree hashable mtl stm time transformers unordered-containers @@ -91967,7 +92237,7 @@ self: { ansi-terminal base binary bytestring containers data-accessor deepseq distributed-process distributed-process-systest distributed-static fingertree ghc-prim hashable HUnit mtl network - network-transport network-transport-tcp QuickCheck rematch stm + network-transport network-transport-tcp QuickCheck stm test-framework test-framework-hunit test-framework-quickcheck2 time transformers unordered-containers ]; @@ -92146,8 +92416,8 @@ self: { }: mkDerivation { pname = "distributed-process-simplelocalnet"; - version = "0.3.1"; - sha256 = "06p7cynv7z4h62srzq99fi5v23v66g93k77wb6xiv0va83nqa0xr"; + version = "0.3.2"; + sha256 = "11d3268na8fdx5v55fhgw3d5lnclmhgrqf29j7x3kpsi1ynn9a3z"; libraryHaskellDepends = [ base binary bytestring containers data-accessor distributed-process exceptions network network-multicast network-transport @@ -92162,31 +92432,28 @@ self: { }) {}; "distributed-process-supervisor" = callPackage - ({ mkDerivation, ansi-terminal, base, binary, bytestring - , containers, data-accessor, deepseq, distributed-process + ({ mkDerivation, base, binary, bytestring, containers + , data-accessor, deepseq, distributed-process , distributed-process-client-server, distributed-process-extras - , distributed-static, exceptions, fingertree, ghc-prim, hashable - , HUnit, mtl, network, network-transport, network-transport-tcp - , random, rematch, stm, test-framework, test-framework-hunit, time - , transformers, unordered-containers + , distributed-static, exceptions, hashable, HUnit + , network-transport, network-transport-tcp, random, stm + , test-framework, test-framework-hunit, time }: mkDerivation { pname = "distributed-process-supervisor"; - version = "0.2.1"; - sha256 = "1cawbyz0nnx0kad1pqi1815nvdcvsap68j5a4ksdg8h8rlkvm05q"; + version = "0.2.3"; + sha256 = "0138kp1xhzhwhy13hx537hrsvckqy8v2jbicwzgkgcj67sgivbvw"; libraryHaskellDepends = [ - base binary bytestring containers data-accessor deepseq - distributed-process distributed-process-client-server - distributed-process-extras distributed-static exceptions fingertree - hashable mtl stm time transformers unordered-containers + base binary containers data-accessor deepseq distributed-process + distributed-process-client-server distributed-process-extras + distributed-static exceptions hashable time ]; testHaskellDepends = [ - ansi-terminal base binary bytestring containers data-accessor - deepseq distributed-process distributed-process-client-server - distributed-process-extras distributed-static exceptions fingertree - ghc-prim hashable HUnit mtl network network-transport - network-transport-tcp random rematch stm test-framework - test-framework-hunit time transformers unordered-containers + base binary bytestring deepseq distributed-process + distributed-process-client-server distributed-process-extras + distributed-static exceptions HUnit network-transport + network-transport-tcp random stm test-framework + test-framework-hunit ]; description = "Supervisors for The Cloud Haskell Application Platform"; license = lib.licenses.bsd3; @@ -92195,18 +92462,18 @@ self: { "distributed-process-systest" = callPackage ({ mkDerivation, ansi-terminal, base, binary, bytestring - , distributed-process, distributed-static, HUnit, network - , network-transport, random, rematch, stm, test-framework + , distributed-process, distributed-static, exceptions, HUnit + , network, network-transport, random, stm, test-framework , test-framework-hunit }: mkDerivation { pname = "distributed-process-systest"; - version = "0.1.1"; - sha256 = "13hi9swkjk0mgj7by810hgnf985mxngf9sxdskn3a9k6l16l6wx1"; + version = "0.4.1"; + sha256 = "1jqjqkdwjq3jvjqgpdrx4v5f8p09kigvhk3c8359na59cv9a8dwj"; libraryHaskellDepends = [ ansi-terminal base binary bytestring distributed-process - distributed-static HUnit network network-transport random rematch - stm test-framework test-framework-hunit + distributed-static exceptions HUnit network network-transport + random stm test-framework test-framework-hunit ]; description = "Cloud Haskell Test Support"; license = lib.licenses.bsd3; @@ -92254,16 +92521,16 @@ self: { ({ mkDerivation, ansi-terminal, base, binary, bytestring , distributed-process, distributed-static, exceptions, HUnit , network, network-transport, network-transport-inmemory, random - , rematch, stm, test-framework, test-framework-hunit + , setenv, stm, test-framework, test-framework-hunit }: mkDerivation { pname = "distributed-process-tests"; - version = "0.5.0"; - sha256 = "01rpq0hgmvx7703xdx8x0ycfkbj7bpp3yqfxgzm8xy20d98cf9z7"; + version = "0.5.1"; + sha256 = "0mp4a51555sjx4nakyv0cxc5srbhx5av1697n9gs28n2wzmm93q0"; libraryHaskellDepends = [ ansi-terminal base binary bytestring distributed-process distributed-static exceptions HUnit network network-transport - random rematch stm test-framework test-framework-hunit + random setenv stm test-framework test-framework-hunit ]; testHaskellDepends = [ base network network-transport network-transport-inmemory @@ -92309,8 +92576,10 @@ self: { }: mkDerivation { pname = "distributed-static"; - version = "0.3.10"; - sha256 = "1nkgs2rw1wk2rfr8xnpgk0ir9dkqv8b4bw78rrn6pmy7mg26mi6r"; + version = "0.3.11"; + sha256 = "0h9psda6bc8sq1gc8rdkgljs4hh4973bhsg9bzgvwqx26rdwvs7h"; + revision = "1"; + editedCabalFile = "1ifq0rls8rp8p1xmynzb7rx5vmqwi6jxb65lmv0z244d2b35d3x3"; libraryHaskellDepends = [ base binary bytestring containers deepseq rank1dynamic ]; @@ -92580,8 +92849,8 @@ self: { }: mkDerivation { pname = "djot"; - version = "0.1.2.1"; - sha256 = "1lkfbxhzfcqpv0nj6kkbfhlskxb85ql72z3w1ivcw3prxs3skaza"; + version = "0.1.2.2"; + sha256 = "17fqnzacnnraij9lwca25761sn5gaxjd42vnpmd397fdzd5dm6fh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92625,7 +92894,7 @@ self: { mainProgram = "dl-fedora"; }) {}; - "dl-fedora_1_1" = callPackage + "dl-fedora_1_2_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 @@ -92633,8 +92902,8 @@ self: { }: mkDerivation { pname = "dl-fedora"; - version = "1.1"; - sha256 = "0mc0sdc6l2aq1vzz8lqxq9v88350rsv15xqn0q7mg1n255xbiclh"; + version = "1.2.1"; + sha256 = "1pd6wzr9nsvplb200c2bk8gyhv89lcgc2df86rfzklb6z68dqy7z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93384,6 +93653,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "doclayout_0_5" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, emojis, mtl + , safe, tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "doclayout"; + version = "0.5"; + sha256 = "15i4mz93lvli2hwny1jrw7pq00xwjldm2xdxwlhsgpnr8l142c5h"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base containers emojis mtl safe text ]; + testHaskellDepends = [ + base emojis mtl tasty tasty-golden tasty-hunit tasty-quickcheck + text + ]; + benchmarkHaskellDepends = [ + base criterion deepseq emojis mtl text + ]; + description = "A prettyprinting library for laying out text documents"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "docopt" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers , HUnit, parsec, split, template-haskell, text @@ -93453,8 +93744,8 @@ self: { }: mkDerivation { pname = "doctemplates"; - version = "0.11"; - sha256 = "0ssld40km4nf0r8fxgj9w0z8yfy8yiyyfcgxarhwx60f0dzhq270"; + version = "0.11.0.1"; + sha256 = "1ysmd7dl12gh4a1ci9g6qfwz2836dqb22g5l5q9941dac4c4al0i"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers doclayout filepath mtl parsec safe scientific @@ -93471,37 +93762,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "doctest_0_18_2" = callPackage - ({ mkDerivation, base, base-compat, code-page, deepseq, directory - , exceptions, filepath, ghc, ghc-paths, hspec, hspec-core, HUnit - , mockery, process, QuickCheck, setenv, silently, stringbuilder - , syb, transformers - }: - mkDerivation { - pname = "doctest"; - version = "0.18.2"; - sha256 = "0c48dpxa8i3q5xh2shd2p2xxhrsy7wdil6dg4mayr3lkk1dlwbfp"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat code-page deepseq directory exceptions filepath - ghc ghc-paths process syb transformers - ]; - executableHaskellDepends = [ - base base-compat code-page deepseq directory exceptions filepath - ghc ghc-paths process syb transformers - ]; - testHaskellDepends = [ - base base-compat code-page deepseq directory exceptions filepath - ghc ghc-paths hspec hspec-core HUnit mockery process QuickCheck - setenv silently stringbuilder syb transformers - ]; - description = "Test interactive Haskell examples"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - mainProgram = "doctest"; - }) {}; - "doctest" = callPackage ({ mkDerivation, base, code-page, containers, deepseq, directory , exceptions, filepath, ghc, ghc-paths, hspec, hspec-core @@ -93530,7 +93790,7 @@ self: { mainProgram = "doctest"; }) {}; - "doctest_0_22_9" = callPackage + "doctest_0_23_0" = callPackage ({ mkDerivation, base, code-page, containers, deepseq, directory , exceptions, filepath, ghc, ghc-paths, hspec, hspec-core , hspec-discover, HUnit, mockery, process, QuickCheck, silently @@ -93538,8 +93798,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.22.9"; - sha256 = "182952jr58hz83ckmbc33nwx9ndad808d8cn9z0ay7ds6p11i46s"; + version = "0.23.0"; + sha256 = "1jh38pj6rbsli4ba6jvnrg9dm2di18i7g9706nnfm0xc9ckhfs90"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94208,24 +94468,25 @@ self: { , case-insensitive, containers, dormouse-uri, hedgehog, hspec , hspec-discover, hspec-hedgehog, http-api-data, http-client , http-client-tls, http-types, mtl, safe-exceptions, scientific - , streamly, streamly-bytestring, template-haskell, text, vector + , streamly, streamly-bytestring, streamly-core, template-haskell + , text, vector }: mkDerivation { pname = "dormouse-client"; - version = "0.2.1.0"; - sha256 = "09qkmlgfq0p2d7amil9af6zbd3p2ayhziv8sr152zim4g0v2nmmk"; + version = "0.3.0.0"; + sha256 = "07vn6przka6ffa1kab1f1yrkqdxhg3bzjggv9pf5lslf0i94zza9"; libraryHaskellDepends = [ aeson attoparsec base bytestring case-insensitive containers dormouse-uri http-api-data http-client http-client-tls http-types - mtl safe-exceptions streamly streamly-bytestring template-haskell - text + mtl safe-exceptions streamly streamly-bytestring streamly-core + template-haskell text ]; testHaskellDepends = [ aeson attoparsec base bytestring case-insensitive containers dormouse-uri hedgehog hspec hspec-discover hspec-hedgehog http-api-data http-client http-client-tls http-types mtl safe-exceptions scientific streamly streamly-bytestring - template-haskell text vector + streamly-core template-haskell text vector ]; testToolDepends = [ hspec-discover ]; description = "Simple, type-safe and testable HTTP client"; @@ -94241,8 +94502,8 @@ self: { }: mkDerivation { pname = "dormouse-uri"; - version = "0.2.0.0"; - sha256 = "1b19167xprw9f4ivpfl0sdk2gs2ai6jxk25wyy7xlvzq2fn5q6sd"; + version = "0.3.0.0"; + sha256 = "1z6c4n2zrrxakj82w6hghn1srg8clnps7kng9j2rf9s6iqxqwhfz"; libraryHaskellDepends = [ attoparsec base bytestring case-insensitive containers http-types safe-exceptions template-haskell text @@ -94445,18 +94706,20 @@ self: { "dotparse" = callPackage ({ mkDerivation, algebraic-graphs, base, bytestring, chart-svg - , containers, flatparse, numhask-space, optics-core, process-extras - , string-interpolate, template-haskell, text, these + , containers, doctest-parallel, flatparse, numhask-space + , optics-core, process-extras, string-interpolate, template-haskell + , text, these }: mkDerivation { pname = "dotparse"; - version = "0.1.0.0"; - sha256 = "06knlrrb2ma57d5rnv2xdqp7avdbcbnd5m6pk45953lmhz217ls6"; + version = "0.1.1.0"; + sha256 = "14829jdzb3vc3485y7hbri77giv2sbg8x4cyrc0pwk5cj8xb0yzf"; libraryHaskellDepends = [ algebraic-graphs base bytestring chart-svg containers flatparse numhask-space optics-core process-extras string-interpolate template-haskell text these ]; + testHaskellDepends = [ base doctest-parallel ]; description = "dot language parsing and printing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -95460,6 +95723,8 @@ self: { pname = "dsp"; version = "0.2.5.2"; sha256 = "0inar9c0n4x0li9c7krr17qv7zc49162wchhyn6ix7adni8j92z0"; + revision = "1"; + editedCabalFile = "06lrjxcsyviifpw398za544r5wqfjlx3h206g1lmjmcqj0ph1n5q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers random ]; @@ -95631,8 +95896,8 @@ self: { pname = "dual-game"; version = "0.1.0.1"; sha256 = "1w69d7d2xbpi82n41gq08qdmldh834ka7qwvy159vsac556wwcfg"; - revision = "8"; - editedCabalFile = "1c4m2nwmnrjs8rinfa9p9vynmdr56i5ggydgnjs3d8szpbbbbrml"; + revision = "9"; + editedCabalFile = "140svi4r35rji7br3bcrcb7rgwkbzvrsc2nx1xml17sf8d3clj4r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95849,8 +96114,8 @@ self: { }: mkDerivation { pname = "dunai"; - version = "0.13.1"; - sha256 = "1hamj3yv6v0rdr06889iidhzpz6jbskq3bc5gbf45gzvq7bvcds7"; + version = "0.13.2"; + sha256 = "0x12hx51p5vfgscys40p8a9nnfj8d5rf5ynp436jzry6pzi0i6ab"; libraryHaskellDepends = [ base MonadRandom simple-affine-space transformers transformers-base ]; @@ -95881,8 +96146,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.13.1"; - sha256 = "0hm5c9n890cxnw0pp62vqlw7yqmrzy2xb0inhbzcjm49i5gacfdq"; + version = "0.13.2"; + sha256 = "0z9rgirz7las2qrvagiiihgz03ds7dgbbmwk32mkz4paz339lkbg"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -97822,6 +98087,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful_2_5_0_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , effectful-core, exceptions, lifted-base, primitive, process + , safe-exceptions, stm, strict-mutable-base, tasty, tasty-bench + , tasty-hunit, text, time, unix, unliftio + }: + mkDerivation { + pname = "effectful"; + version = "2.5.0.0"; + sha256 = "1fv228n3cvbqhbvdrnix2wqr96zzvgav1dp5rkynpm12jjwknqkp"; + libraryHaskellDepends = [ + async base bytestring directory effectful-core process stm + strict-mutable-base time unliftio + ]; + testHaskellDepends = [ + base containers effectful-core exceptions lifted-base primitive + safe-exceptions strict-mutable-base tasty tasty-hunit unliftio + ]; + benchmarkHaskellDepends = [ + async base tasty-bench text unix unliftio + ]; + description = "An easy to use, performant extensible effects library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-core" = callPackage ({ mkDerivation, base, containers, exceptions, monad-control , primitive, transformers-base, unliftio-core @@ -97838,6 +98129,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful-core_2_5_0_0" = callPackage + ({ mkDerivation, base, containers, deepseq, exceptions + , monad-control, primitive, strict-mutable-base, transformers-base + , unliftio-core + }: + mkDerivation { + pname = "effectful-core"; + version = "2.5.0.0"; + sha256 = "1fjk92pwpxapjkq8zzv36j071nq1g9lys78jwg8f4q68g3f7rlzr"; + libraryHaskellDepends = [ + base containers deepseq exceptions monad-control primitive + strict-mutable-base transformers-base unliftio-core + ]; + description = "An easy to use, performant extensible effects library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-plugin" = callPackage ({ mkDerivation, base, containers, effectful-core, ghc }: mkDerivation { @@ -97850,6 +98159,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful-plugin_1_1_0_4" = callPackage + ({ mkDerivation, base, containers, effectful-core, ghc }: + mkDerivation { + pname = "effectful-plugin"; + version = "1.1.0.4"; + sha256 = "0c401ni8ajig5da4dgkk2xbajbkzghrjll8ccfh7pbbiknf7si7j"; + libraryHaskellDepends = [ base containers effectful-core ghc ]; + testHaskellDepends = [ base effectful-core ]; + description = "A GHC plugin for improving disambiguation of effects"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-st" = callPackage ({ mkDerivation, base, effectful-core, primitive }: mkDerivation { @@ -97882,14 +98204,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "effectful-th_1_0_0_2" = callPackage + "effectful-th_1_0_0_3" = callPackage ({ mkDerivation, base, containers, effectful-core, exceptions , template-haskell, th-abstraction }: mkDerivation { pname = "effectful-th"; - version = "1.0.0.2"; - sha256 = "14zj43wc3lz7aac0qcyzkxw2fbpgvp8b7wgk035ipcj7cfl25bhk"; + version = "1.0.0.3"; + sha256 = "0dzjy054n4zcrnnnj50yxxqicv50mfmzhgcqzhz4n6ap8v88ykiv"; libraryHaskellDepends = [ base containers effectful-core exceptions template-haskell th-abstraction @@ -98420,10 +98742,8 @@ self: { }: mkDerivation { pname = "ekg"; - version = "0.4.1.0"; - sha256 = "03dgsgf67clk4wqrk69jqfh0ap406k0hgz257j0f5kixpws42ahp"; - revision = "1"; - editedCabalFile = "0frwz3jyxj0laaanzq39p74lzgq6cjxzhky51fkwa63qmlv5qfda"; + version = "0.4.1.1"; + sha256 = "19dv4rcdbdahx7kwv1qfxwpifqx3z5psl1kvrwy6ic34x8qfk59c"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring ekg-core ekg-json filepath network snap-core @@ -98490,17 +98810,13 @@ self: { }) {}; "ekg-core" = callPackage - ({ mkDerivation, base, containers, ghc-prim, text - , unordered-containers - }: + ({ mkDerivation, base, containers, text, unordered-containers }: mkDerivation { pname = "ekg-core"; - version = "0.1.1.7"; - sha256 = "04nv6iwzrb63fs97ixb0amj8p6zhabg3ggbrg4nbkq7xjhmkz0a5"; - revision = "4"; - editedCabalFile = "1fzjwckb6h6m5n1k9kj63fy2wpjn1mz9xajiri4aqyzlg1wv619c"; + version = "0.1.1.8"; + sha256 = "028c3g1fz0rfxpfn98wxxmklnxx3szwvjxl9n9ls2w011vqslvia"; libraryHaskellDepends = [ - base containers ghc-prim text unordered-containers + base containers text unordered-containers ]; benchmarkHaskellDepends = [ base ]; description = "Tracking of system metrics"; @@ -98565,10 +98881,8 @@ self: { }: mkDerivation { pname = "ekg-json"; - version = "0.1.1.0"; - sha256 = "0wwzv2hfznd19385imajcarj0c42c3zczg3hlh39afy5k71hgvpp"; - revision = "1"; - editedCabalFile = "0zwmllpmczf9h6y8fagzinxin321z0fyxiyxlyw191i8zp57m579"; + version = "0.1.1.1"; + sha256 = "1mngxy3zhrgfpzi060l4v6x65la7vplbd5z04cvna2m759cn5q2i"; libraryHaskellDepends = [ aeson base ekg-core text unordered-containers ]; @@ -98662,8 +98976,8 @@ self: { }: mkDerivation { pname = "ekg-statsd"; - version = "0.2.6.0"; - sha256 = "19d7bydhc1ghcadip8mw3bshj05xvrc44z3p6fxsvf498zdcxgi9"; + version = "0.2.6.1"; + sha256 = "10svmfns5s3xa4j5a295zdaxn56scmplgch8avraimf3y10spd98"; libraryHaskellDepends = [ base bytestring ekg-core network text time unordered-containers ]; @@ -98865,6 +99179,8 @@ self: { pname = "eliminators"; version = "0.9.5"; sha256 = "17pl2mg9bpagzkw50mydls883bj4mm7glmgnm59r57prky9h55gs"; + revision = "1"; + editedCabalFile = "0dzyskd0av2rdq9bk0y0d2605a65p9xailbbchvmaqjvqf4cqvpm"; libraryHaskellDepends = [ base extra singleton-nats singletons-base template-haskell text th-abstraction th-desugar @@ -98937,8 +99253,8 @@ self: { }: mkDerivation { pname = "elm-bridge"; - version = "0.8.3"; - sha256 = "0rcpcal9b4i293smgry74wznz15b6vga31l00z3h4vll96r62g9s"; + version = "0.8.4"; + sha256 = "1f16inr64xhsb2h9gbqlr1a38j3xqsw33v2xlr7k33yr2plss12y"; libraryHaskellDepends = [ aeson base template-haskell ]; testHaskellDepends = [ aeson base containers hspec QuickCheck text @@ -99330,23 +99646,21 @@ self: { "elm2nix" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, async, base, binary - , bytestring, containers, data-default, directory, filepath, here - , mtl, optparse-applicative, process, req, text, transformers - , unordered-containers + , bytestring, containers, here, optparse-applicative, process, text + , transformers, unordered-containers }: mkDerivation { pname = "elm2nix"; - version = "0.3.1"; - sha256 = "05jnn1wwarq877azw5ba222gcs4g3zijxq7lr2i21088kbl2wcg9"; + version = "0.4.0"; + sha256 = "0cdfpcbxancw52mavpv9993lbjshcfv07cjzabdghncn3j3g6q1k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base binary bytestring containers data-default - directory filepath here mtl process req text transformers - unordered-containers + aeson async base binary bytestring containers here process text + transformers unordered-containers ]; executableHaskellDepends = [ - ansi-wl-pprint base directory here optparse-applicative + ansi-wl-pprint base here optparse-applicative ]; testHaskellDepends = [ base ]; description = "Turn your Elm project into buildable Nix project"; @@ -99478,6 +99792,26 @@ self: { maintainers = [ lib.maintainers.dschrempf ]; }) {}; + "elynx_0_8_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, elynx-tools + , optparse-applicative, slynx, tlynx + }: + mkDerivation { + pname = "elynx"; + version = "0.8.0.0"; + sha256 = "13w6bxh16fw1shmcc73xlilsq2lyfpf6049mbm9xhrxb0b8az4l5"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring elynx-tools optparse-applicative slynx tlynx + ]; + description = "Validate and (optionally) redo ELynx analyses"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "elynx"; + maintainers = [ lib.maintainers.dschrempf ]; + }) {}; + "elynx-markov" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, containers , elynx-seq, elynx-tools, hmatrix, hspec, integration @@ -99500,6 +99834,29 @@ self: { maintainers = [ lib.maintainers.dschrempf ]; }) {}; + "elynx-markov_0_8_0_0" = callPackage + ({ mkDerivation, async, attoparsec, base, bytestring, containers + , elynx-seq, elynx-tools, hmatrix, hspec, integration + , math-functions, mwc-random, random, statistics, vector + }: + mkDerivation { + pname = "elynx-markov"; + version = "0.8.0.0"; + sha256 = "1j9k751zz6fg84pymcrwa5ica7d2rnmxb0512a9gqxdjsfzynmaf"; + libraryHaskellDepends = [ + async attoparsec base bytestring containers elynx-seq hmatrix + integration math-functions mwc-random random statistics vector + ]; + testHaskellDepends = [ + base containers elynx-tools hmatrix hspec random vector + ]; + benchmarkHaskellDepends = [ base ]; + description = "Simulate molecular sequences along trees"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.dschrempf ]; + }) {}; + "elynx-nexus" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { @@ -99513,6 +99870,20 @@ self: { maintainers = [ lib.maintainers.dschrempf ]; }) {}; + "elynx-nexus_0_8_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, hspec }: + mkDerivation { + pname = "elynx-nexus"; + version = "0.8.0.0"; + sha256 = "0074273y4v2xlk62ncayhfmhm0x6hqkyqvisdzjd1i0bm4cbqdvd"; + libraryHaskellDepends = [ attoparsec base bytestring ]; + testHaskellDepends = [ base hspec ]; + description = "Import and export Nexus files"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.dschrempf ]; + }) {}; + "elynx-seq" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , elynx-tools, hspec, matrices, parallel, primitive, random, vector @@ -99534,6 +99905,28 @@ self: { maintainers = [ lib.maintainers.dschrempf ]; }) {}; + "elynx-seq_0_8_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , elynx-tools, hspec, matrices, parallel, primitive, random, vector + , vector-th-unbox, word8 + }: + mkDerivation { + pname = "elynx-seq"; + version = "0.8.0.0"; + sha256 = "10g7f3jdx4jcggcb4qrw98nac08f7fqzdg0445h0wiiilpykw0kk"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers matrices parallel + primitive random vector vector-th-unbox word8 + ]; + testHaskellDepends = [ + base bytestring elynx-tools hspec matrices vector + ]; + description = "Handle molecular sequences"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.dschrempf ]; + }) {}; + "elynx-tools" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, cryptohash-sha256, directory, hmatrix @@ -99554,6 +99947,27 @@ self: { maintainers = [ lib.maintainers.dschrempf ]; }) {}; + "elynx-tools_0_8_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, cryptohash-sha256, directory, hmatrix + , optparse-applicative, random, template-haskell, time + , transformers, zlib + }: + mkDerivation { + pname = "elynx-tools"; + version = "0.8.0.0"; + sha256 = "02fysd2gljnj14mk93mnrfxdx7cxlalvzmwckwnqi3d2a1d5ddc4"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring + cryptohash-sha256 directory hmatrix optparse-applicative random + template-haskell time transformers zlib + ]; + description = "Tools for ELynx"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.dschrempf ]; + }) {}; + "elynx-tree" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad , containers, criterion, data-default, data-default-class, deepseq @@ -99774,8 +100188,8 @@ self: { }: mkDerivation { pname = "email-validate"; - version = "2.3.2.20"; - sha256 = "0k92hb8nn35ggp1lnqzp1s57znmhnabml217f41zdv8y1khfh3fc"; + version = "2.3.2.21"; + sha256 = "132ijz65csl1ki32nhw3d95x9vzl3lc22z2zhivv1yqh30lfpfgq"; libraryHaskellDepends = [ attoparsec base bytestring template-haskell ]; @@ -100740,10 +101154,8 @@ self: { }: mkDerivation { pname = "enummapset"; - version = "0.7.2.0"; - sha256 = "00n6nifk5hlp85mv0g68jpx9w19hx1cxqhbf7pqlm5m5f99y29m2"; - revision = "1"; - editedCabalFile = "14l25k5jy8lvc936cja46b1zfgmmd9yk1rqqrnznv2xl7xdj8725"; + version = "0.7.3.0"; + sha256 = "0w3hvypj14j7k8kfzrahyv7v35yj60jjyjv4klvnbw05a10hbj3l"; libraryHaskellDepends = [ aeson base containers deepseq ]; testHaskellDepends = [ aeson array base containers deepseq ghc-prim HUnit QuickCheck @@ -100965,8 +101377,8 @@ self: { }: mkDerivation { pname = "eo-phi-normalizer"; - version = "1.0.0"; - sha256 = "01952w59d4w0d0d4nk7lydjz75w6b1qsh662grd3z44ahd3zhyy7"; + version = "1.1.0"; + sha256 = "1xzi0dgk9fac2v1g1g0i5cq19kq97crmq0903bx3m2cn22v4la40"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal process PyF ]; @@ -101363,26 +101775,26 @@ self: { "erebos" = callPackage ({ mkDerivation, async, base, binary, bytestring, c2hs, clock - , containers, cryptonite, deepseq, directory, filepath, fsnotify + , containers, crypton, deepseq, directory, filepath, fsnotify , hashable, hashtables, haskeline, iproute, libpjproject, memory , mtl, network, process, stm, template-haskell, text, time , transformers, unix, uuid, zlib }: mkDerivation { pname = "erebos"; - version = "0.1.6"; - sha256 = "153akrq6541k5m0gwhdw6bgk83b9pj3gdmzi0gafgypp0lhrg1f2"; + version = "0.1.7"; + sha256 = "0kcvnh3car18qj9hgg3j85b4fir2zy7i4dp3qbfck32qddf5i1z7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base binary bytestring clock containers cryptonite deepseq + async base binary bytestring clock containers crypton deepseq directory filepath fsnotify hashable hashtables iproute memory mtl network stm text time unix uuid zlib ]; libraryPkgconfigDepends = [ libpjproject ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ - base bytestring cryptonite directory haskeline mtl network process + base bytestring crypton directory haskeline mtl network process template-haskell text time transformers uuid ]; description = "Decentralized messaging and synchronization"; @@ -101815,8 +102227,8 @@ self: { pname = "ersatz"; version = "0.5"; sha256 = "1fzaany3mzzmizfzdglwqni3q842ip5z86apgdla2ynhq0hlmh3m"; - revision = "1"; - editedCabalFile = "0mg4bip6ngviyriyx3d0d588h5mm8a985gdhijd6y98yd86krb43"; + revision = "2"; + editedCabalFile = "0z56cmxs98iw15nmq2ajw57w4p8zrwz7kcgqsr27716rkpnspy4f"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -102055,8 +102467,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.5.11.2"; - sha256 = "0k78rsf98nzbc4ycf3jgari358g661v3rgg6sxm6dch0q70dhaj5"; + version = "3.5.13.0"; + sha256 = "01sp5g61kk6k3fzzdb9sx4sf8iqhncv5sg3hiw8hjp7xv6wc7341"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged template-haskell text time @@ -102187,23 +102599,25 @@ self: { "essence-of-live-coding" = callPackage ({ mkDerivation, base, containers, foreign-store, HUnit, mmorph - , mtl, QuickCheck, syb, test-framework, test-framework-hunit - , test-framework-quickcheck2, time, transformers, vector-sized + , mtl, profunctors, QuickCheck, selective, syb, test-framework + , test-framework-hunit, test-framework-quickcheck2, time + , transformers, vector-sized }: mkDerivation { pname = "essence-of-live-coding"; - version = "0.2.7"; - sha256 = "1vg10x8radvr8ysqfzf1cngp2hnqy8g139x07pwqwycj9zwwnbl4"; + version = "0.2.8"; + sha256 = "04q3lkvingfjbkqb5jw79qzm3vd2rwnghnd4xyh31mliqnxphnfr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers foreign-store mmorph syb time transformers - vector-sized + base containers foreign-store mmorph profunctors selective syb time + transformers vector-sized ]; executableHaskellDepends = [ base transformers ]; testHaskellDepends = [ - base containers HUnit mtl QuickCheck syb test-framework + base containers HUnit mtl QuickCheck selective syb test-framework test-framework-hunit test-framework-quickcheck2 transformers + vector-sized ]; description = "General purpose live coding framework"; license = lib.licenses.bsd3; @@ -102218,8 +102632,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-PortMidi"; - version = "0.2.7"; - sha256 = "1qqswld88yvqa1z8h9rdxqqvjikhkdb67xp2sph6xb231k9710qy"; + version = "0.2.8"; + sha256 = "1pwi44ykcshm3jf3sbm3x8w2idk3rkf5k6mfk9vkvhizbnk6rwhx"; libraryHaskellDepends = [ base essence-of-live-coding PortMidi transformers ]; @@ -102235,8 +102649,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-gloss"; - version = "0.2.7"; - sha256 = "0iv5wgzfxy1k80dh6c6hrzh4jcjy3ak4l3l004jm3wpfm7fm0lmx"; + version = "0.2.8"; + sha256 = "1c14m2032lfc4apfynj815z74cp8f9wr9m3cfsbs554yxard7drh"; libraryHaskellDepends = [ base essence-of-live-coding foreign-store gloss syb transformers ]; @@ -102272,8 +102686,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-pulse"; - version = "0.2.7"; - sha256 = "0bmnc7901zgak223kfm29md0w5fd9lfv4dxc8c27cdcrdqnqfc2p"; + version = "0.2.8"; + sha256 = "1ybs72cbk35yqvjc26safab41hmmbza7ssxwqlqs0f070xn3w7p7"; libraryHaskellDepends = [ base essence-of-live-coding foreign-store pulse-simple transformers ]; @@ -102309,8 +102723,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-quickcheck"; - version = "0.2.7"; - sha256 = "0jn5bz7xq8jmlkhrrbn5mj3ywh8288gpx43n8fkjzmzdk233kbvp"; + version = "0.2.8"; + sha256 = "1k6va9srxp91dp2dbrav44nd3wlkpb34lb8hz6xjs0mcpynx7nr4"; libraryHaskellDepends = [ base boltzmann-samplers essence-of-live-coding QuickCheck syb transformers @@ -102325,8 +102739,8 @@ self: { ({ mkDerivation, base, essence-of-live-coding, vivid }: mkDerivation { pname = "essence-of-live-coding-vivid"; - version = "0.2.7"; - sha256 = "03j5kmp824s8b2x1n8dp86lh7ac8ccxh54dg0sx7v98j9lflbcqq"; + version = "0.2.8"; + sha256 = "0rjfgfhr1wfy77asrqcnh6830wwl372kxwz5nxmk9v217gfc51w2"; libraryHaskellDepends = [ base essence-of-live-coding vivid ]; description = "General purpose live coding framework - vivid backend"; license = lib.licenses.bsd3; @@ -102339,8 +102753,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-warp"; - version = "0.2.7"; - sha256 = "1zykg5qik61xr4ri6d9r04w5rj7wm0wqmnzm6nipwpixal3gdxqa"; + version = "0.2.8"; + sha256 = "1562vw03zqpzzn9v9yss6xs9vfly9glg7j2im9cllivfzngw5fas"; libraryHaskellDepends = [ base essence-of-live-coding http-types wai warp ]; @@ -103556,6 +103970,31 @@ self: { license = lib.licenses.mit; }) {}; + "evm-opcodes_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, data-dword + , hedgehog, hspec, tasty, tasty-bench, tasty-discover + , tasty-hedgehog, tasty-hspec, text + }: + mkDerivation { + pname = "evm-opcodes"; + version = "0.2.0"; + sha256 = "1s5vwdway724b0c41jwiaaqg1pllnhghjydplifbhhdfv63gkrw0"; + libraryHaskellDepends = [ + base bytestring cereal containers data-dword text + ]; + testHaskellDepends = [ + base bytestring cereal containers data-dword hedgehog hspec tasty + tasty-discover tasty-hedgehog tasty-hspec text + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base bytestring cereal containers data-dword tasty-bench text + ]; + description = "Opcode types for Ethereum Virtual Machine (EVM)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "evoke" = callPackage ({ mkDerivation, aeson, base, ghc, HUnit, insert-ordered-containers , lens, QuickCheck, swagger2, text @@ -103689,7 +104128,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Exact real arithmetic"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "exact-real-positional" = callPackage @@ -103866,17 +104304,15 @@ self: { broken = true; }) {}; - "exceptions_0_10_8" = callPackage + "exceptions_0_10_9" = callPackage ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell , test-framework, test-framework-hunit, test-framework-quickcheck2 , transformers }: mkDerivation { pname = "exceptions"; - version = "0.10.8"; - sha256 = "125mgcw94x7d47ps0lkiq0g2hzzfjkmcq3gfkbi7w78az0sdjq4d"; - revision = "1"; - editedCabalFile = "0rxaahjp8zmp3xhdvvfgkb9qz1j9vsjgr9gz2jxnq69nbnrxj7y3"; + version = "0.10.9"; + sha256 = "0h5y2rqg7kz4ic59n5i7619766mzfpqcdill3l712nihs3q2nk4v"; libraryHaskellDepends = [ base mtl stm template-haskell transformers ]; @@ -104439,16 +104875,14 @@ self: { license = "BSD-2-Clause-Patent"; }) {}; - "exon_1_7_0_0" = callPackage + "exon_1_7_1_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 = "2"; - editedCabalFile = "1a0a2lyg75xbnq31k3jkx3ngkr3h4islbjvblp5r0zvwn4q25mj8"; + version = "1.7.1.0"; + sha256 = "0rsgcaakhpwbgy83jwn8g2hf276wfw0akq6hld9ck5zs0k74dzfa"; libraryHaskellDepends = [ base ghc incipit-base parsec template-haskell ]; @@ -104612,8 +105046,8 @@ self: { pname = "expiring-cache-map"; version = "0.0.6.1"; sha256 = "1fb47hsn06ybn2yzw7r6pjkmvvfpbdx7wjhbpxcywilbjyac4fqf"; - revision = "1"; - editedCabalFile = "1k5wqilafxp3ksqb7qy90cwipk0db568f15amn3mnf9krc1qjabg"; + revision = "2"; + editedCabalFile = "1lg38r5i6wdi39561g6kpdcdkhr34idkvh8n128gc7dz2a9irycl"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -105066,10 +105500,8 @@ self: { }: mkDerivation { pname = "extensible"; - version = "0.9"; - sha256 = "06zmc71r4cqglkv3av38djbkakvw9zxc3901xi2h65fwxn4npvnc"; - revision = "2"; - editedCabalFile = "19d0w4ifmjlkw7i36ah9xqcy3b9na7hcjnvj6grk5iqnlmkz6six"; + version = "0.9.1"; + sha256 = "1kp407jnfl0p086x06s43b30gvq9haixf3r8q2sz90v6gdzbjmvb"; libraryHaskellDepends = [ aeson base bytestring cassava comonad constraints deepseq ghc-prim hashable incremental membership prettyprinter primitive profunctors @@ -105281,6 +105713,35 @@ self: { mainProgram = "extensions"; }) {}; + "extensions_0_1_0_3" = callPackage + ({ mkDerivation, base, bytestring, Cabal, colourista, containers + , directory, filepath, ghc-boot-th, hedgehog, hspec, hspec-hedgehog + , optparse-applicative, parsec, text + }: + mkDerivation { + pname = "extensions"; + version = "0.1.0.3"; + sha256 = "1fks1yfdk0zjc1vccj3nr6li09j64cq6b6x9s5mi8qrsv5igbzlm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers directory filepath ghc-boot-th + parsec text + ]; + executableHaskellDepends = [ + base colourista containers directory filepath optparse-applicative + text + ]; + testHaskellDepends = [ + base bytestring containers ghc-boot-th hedgehog hspec + hspec-hedgehog text + ]; + description = "Parse Haskell Language Extensions"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + mainProgram = "extensions"; + }) {}; + "external-sort" = callPackage ({ mkDerivation, base, binary, bytestring, EdisonAPI, EdisonCore }: mkDerivation { @@ -105332,8 +105793,8 @@ self: { }: mkDerivation { pname = "extism-pdk"; - version = "1.0.0.1"; - sha256 = "0gsc1ygrylgq85cbnj4chxikqx0gv7g10nzgmciwkimby94sl64r"; + version = "1.2.0.0"; + sha256 = "1ph4c2l22mhdn8053shsh2spq5wdgvi7zw279ay9ffhhwkyan654"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105355,6 +105816,26 @@ self: { pname = "extra"; version = "1.7.16"; sha256 = "0w3wwwnf96ax70lrb0fkfich7b23kvk112j9rzr72b0bqd1ns315"; + revision = "1"; + editedCabalFile = "0xb2xd6qw664rz0d1pa7g4cd58ixqfhpxh7q6gz9lhc10afqw62g"; + libraryHaskellDepends = [ + base clock directory filepath process time unix + ]; + testHaskellDepends = [ + base directory filepath QuickCheck quickcheck-instances unix + ]; + description = "Extra functions I use"; + license = lib.licenses.bsd3; + }) {}; + + "extra_1_8" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, quickcheck-instances, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.8"; + sha256 = "18c9ad7wjf6q4yp0sagxhwyjpm9frw9kk27ih2x0nmjhmrgcx91g"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -105363,6 +105844,7 @@ self: { ]; description = "Extra functions I use"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "extra-data-yj" = callPackage @@ -105744,6 +106226,8 @@ self: { pname = "failure"; version = "0.2.0.3"; sha256 = "0jimc2x46zq7wnmzfbnqi67jl8yhbvr0fa65ljlc9p3fns9mca3p"; + revision = "1"; + editedCabalFile = "0lnvh6slp057kl0sjn14iab8y3cpic60lhbmn9502zryp7by23ky"; libraryHaskellDepends = [ base transformers ]; description = "A simple type class for success/failure computations. (deprecated)"; license = lib.licenses.bsd3; @@ -105840,8 +106324,8 @@ self: { }: mkDerivation { pname = "fakedata"; - version = "1.0.3"; - sha256 = "12sldxpn14zx5zwblw28k593rdqz50d246rz8j3zj41ljmnbwj4i"; + version = "1.0.5"; + sha256 = "179j2r6ws6ngmwsswkmpas4ij5jywlvhk0rhbk8rn3vxc3yj7gnr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson attoparsec base bytestring containers directory exceptions @@ -106203,8 +106687,8 @@ self: { }: mkDerivation { pname = "fast-logger"; - version = "3.2.3"; - sha256 = "0af4228rnv2g3fgw00vx85fh0ngi092bx54awx1cd1jjkmpdyn73"; + version = "3.2.4"; + sha256 = "1fxh94qk24c7mki0049zc0h5g0cyn78fp54bgxczqcba6lqknx9r"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath stm text unix-compat unix-time @@ -106216,6 +106700,27 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; }) {}; + "fast-logger_3_2_5" = 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.5"; + sha256 = "0cddv18k0n1hdbjf0szqq7pl5r0h4srzxy8pmr66a4pc1w410lii"; + 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; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sternenseemann ]; + }) {}; + "fast-math" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -106239,12 +106744,12 @@ self: { }) {}; "fast-myers-diff" = callPackage - ({ mkDerivation, base, dlist, hspec, text, vector }: + ({ mkDerivation, base, deepseq, dlist, hspec, text, vector }: mkDerivation { pname = "fast-myers-diff"; - version = "0.0.0"; - sha256 = "0biyv3x889c536dcb9ylglidlpi32v861586yhsjszshmpj38iz3"; - libraryHaskellDepends = [ base dlist text vector ]; + version = "0.0.1"; + sha256 = "12flhvdjhkw0iyrcwzjnqkiml698hgv203kl76qy778n59x9hvp7"; + libraryHaskellDepends = [ base deepseq dlist text vector ]; testHaskellDepends = [ base hspec text vector ]; description = "A fast implementation of the Myers diff algorithm"; license = lib.licenses.mit; @@ -106920,8 +107425,8 @@ self: { pname = "fcf-base"; version = "0.1.0.0"; sha256 = "19jrcpj496bpchv8fw30vd5b5w3sj1qkzmh5jlahyvz5wsppzwsq"; - revision = "1"; - editedCabalFile = "0j71pgy6cp6jadyx8726daa91j795y9p3r3w0x3jvffpnlk9aibp"; + revision = "2"; + editedCabalFile = "0vmw1srmzl3c3j4pdnaa2lvkcvlya2kccp4j33ayscmlnx29fqn3"; libraryHaskellDepends = [ base fcf-family ]; testHaskellDepends = [ base fcf-family ]; description = "Family-of-families instances for base"; @@ -106982,6 +107487,8 @@ self: { pname = "fcf-family"; version = "0.2.0.1"; sha256 = "0dgbzin82da8a8j0xm9ijkaj5ifk2ca0cx02x5glr07qzzhpa9k5"; + revision = "1"; + editedCabalFile = "1ay0an8smfw4q2yrvfs6n1fc61lgnp0ky66d0d6swc8lv5ds9rda"; libraryHaskellDepends = [ base containers first-class-families template-haskell ]; @@ -107247,8 +107754,8 @@ self: { }: mkDerivation { pname = "fedora-composes"; - version = "0.2"; - sha256 = "1q8k41gsrf77dwv4a1kbvh0l949ashph8n08fv0n3b8xys4nl59x"; + version = "0.2.1"; + sha256 = "0y8cmjmdab3rnjvddxnsjyc28hcqv52a7c2f5505vxw0wz0x57bx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -107360,8 +107867,8 @@ self: { }: mkDerivation { pname = "fedora-repoquery"; - version = "0.7"; - sha256 = "1jpnmfm1pj4d078941hapd7ww975cy032d8jdkbparnv847nvd2n"; + version = "0.7.1"; + sha256 = "1jz8v914s7janr6xyk6sf2c0fxfw2c5d7shc08ks62qlvg8qbs8c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -108167,8 +108674,8 @@ self: { }: mkDerivation { pname = "fgl"; - version = "5.8.2.0"; - sha256 = "1dn3x3rmdlglg1kbvx7vndkm66lvvyd23awwd0qzplzi43vhrks4"; + version = "5.8.3.0"; + sha256 = "1hb3mgqqz67qwfw2893bslj4mkhs4g0y51c6zpc6r2h6caqibjm4"; libraryHaskellDepends = [ array base containers deepseq transformers ]; @@ -108585,8 +109092,8 @@ self: { }: mkDerivation { pname = "filecache"; - version = "0.5.1"; - sha256 = "0nsq25gj0yyjx27hrpwpxvx0sfh4n36rhdx4lxy3drn70746spgq"; + version = "0.5.2"; + sha256 = "1h7l5r5dlb793in1jqfic4j5rbvp0xj9hr2a34h17lbmp7fs5k0r"; libraryHaskellDepends = [ base containers directory exceptions filepath fsnotify mtl stm strict-base-types time @@ -110217,8 +110724,8 @@ self: { pname = "flac"; version = "0.2.1"; sha256 = "0ca41lyl21x9nrlnj5df4fbhycpsmfrl6fsd8pmza2wklx8zlv9d"; - revision = "2"; - editedCabalFile = "1byq496k06whqxdiaa7s3f4hh8mbawm6i0a9pgkbj239y14c3qpj"; + revision = "3"; + editedCabalFile = "1s1x9dzzryccpsdyaqhivz5awlwrwqhmkfnvv58wpxqyjcc236jp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory exceptions filepath mtl text @@ -111600,16 +112107,14 @@ self: { }) {}; "fold-debounce" = callPackage - ({ mkDerivation, base, data-default-class, hspec, hspec-discover - , stm, stm-delay, time + ({ mkDerivation, base, data-default, hspec, hspec-discover, stm + , stm-delay, time }: mkDerivation { pname = "fold-debounce"; - version = "0.2.0.11"; - sha256 = "1i5lbzw2y43ppxk0kaqjap0dxyxpx5vqsvqxb2wqfkm3z8v63cy8"; - libraryHaskellDepends = [ - base data-default-class stm stm-delay time - ]; + version = "0.2.0.14"; + sha256 = "1qdfbgk120ck1a50r2993438qgrwqz33yag4yw8f51yvqzx8v0xc"; + libraryHaskellDepends = [ base data-default stm stm-delay time ]; testHaskellDepends = [ base hspec stm time ]; testToolDepends = [ hspec-discover ]; description = "Fold multiple events that happen in a given period of time"; @@ -111695,30 +112200,6 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.4.16"; - sha256 = "18bbhz0bjxb30ni9m9nm4aj8klakkd2fbjaymg8j3f0kdki3isj9"; - revision = "1"; - editedCabalFile = "1p628vf9s2ypblfsc5i1vb9xchy6big5nggcqns9xznncvpp23zc"; - libraryHaskellDepends = [ - base bytestring comonad containers contravariant hashable primitive - profunctors random semigroupoids text transformers - unordered-containers vector - ]; - testHaskellDepends = [ base doctest ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "Composable, streaming, and efficient left folds"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.Gabriella439 ]; - }) {}; - - "foldl_1_4_17" = callPackage - ({ mkDerivation, base, bytestring, comonad, containers - , contravariant, criterion, doctest, hashable, primitive - , profunctors, random, semigroupoids, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "foldl"; version = "1.4.17"; sha256 = "1bk02j6niyw39279cf1im62lzd3gz8dc9qa7kgplz3fyb4chswgm"; libraryHaskellDepends = [ @@ -111730,7 +112211,6 @@ self: { benchmarkHaskellDepends = [ base criterion profunctors ]; description = "Composable, streaming, and efficient left folds"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Gabriella439 ]; }) {}; @@ -112139,6 +112619,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "force-layout_0_4_1" = callPackage + ({ mkDerivation, base, containers, data-default, lens, linear }: + mkDerivation { + pname = "force-layout"; + version = "0.4.1"; + sha256 = "0mas3v19mhzcb4rdn6033rmnbw36y3yw240q2cbpr6z4rfk1wxqq"; + libraryHaskellDepends = [ + base containers data-default lens linear + ]; + description = "Simple force-directed layout"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fordo" = callPackage ({ mkDerivation, base, process, transformers }: mkDerivation { @@ -112410,12 +112904,15 @@ self: { }) {}; "formatn" = callPackage - ({ mkDerivation, base, containers, QuickCheck, text }: + ({ mkDerivation, base, containers, doctest-parallel, QuickCheck + , text + }: mkDerivation { pname = "formatn"; - version = "0.3.0.1"; - sha256 = "1w1isqk9mxrzl0sfj10kqfr2z8wkxvx5dmacig4k415cbaf4dqs3"; - libraryHaskellDepends = [ base containers QuickCheck text ]; + version = "0.3.1.0"; + sha256 = "0xh78ckdsih2p984qr170f6l4yfz5fnq7xni6gjzapcilfxzvky9"; + libraryHaskellDepends = [ base containers text ]; + testHaskellDepends = [ base doctest-parallel QuickCheck ]; description = "Formatting of doubles"; license = lib.licenses.bsd3; }) {}; @@ -112625,8 +113122,8 @@ self: { }: mkDerivation { pname = "fortran-src"; - version = "0.15.1"; - sha256 = "0h3wq3i18hy3w06dzk4l1w5vf3vzx24lyjznrplkbya6kc5y4kpp"; + version = "0.16.3"; + sha256 = "153zalj2d50w7gazsnc2i0530x1l12w5ppwn86q92xp5j56kij96"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112812,20 +113309,6 @@ self: { mainProgram = "foscam-sort"; }) {}; - "foundation_0_0_28" = callPackage - ({ mkDerivation, base, basement, gauge, ghc-prim }: - mkDerivation { - pname = "foundation"; - version = "0.0.28"; - sha256 = "06hsh40qwmy2nfkrd9m8lfhi6arziixdw9pn379m6a7cga2vjcnh"; - libraryHaskellDepends = [ base basement ghc-prim ]; - testHaskellDepends = [ base basement ]; - benchmarkHaskellDepends = [ base basement gauge ]; - description = "Alternative prelude with batteries and no dependencies"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "foundation" = callPackage ({ mkDerivation, base, basement, gauge, ghc-prim }: mkDerivation { @@ -113349,46 +113832,47 @@ self: { , autodocodec-openapi3, base, bcp47, Blammo, Blammo-wai, bugsnag , bytestring, case-insensitive, cassava, conduit, conduit-extra , containers, cookie, datadog, doctest, ekg-core, exceptions, extra - , faktory, freckle-env, freckle-http, freckle-otel, Glob, hashable - , hs-opentelemetry-api, hs-opentelemetry-instrumentation-persistent + , faktory, freckle-env, freckle-exception, freckle-http + , freckle-otel, freckle-prelude, Glob, 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-types, immortal, lens, monad-control - , monad-logger-aeson, monad-validate, MonadRandom, mtl - , nonempty-containers, openapi3, path-pieces, persistent - , persistent-postgresql, postgresql-simple, primitive, QuickCheck - , resource-pool, resourcet, safe, scientist, semigroupoids - , template-haskell, text, time, transformers, transformers-base - , typed-process, unliftio, unordered-containers, vector, wai - , wai-extra, yaml, yesod-core, yesod-test + , http-client, http-types, HUnit, immortal, lens, monad-control + , monad-validate, MonadRandom, mtl, nonempty-containers, openapi3 + , path-pieces, persistent, persistent-postgresql, postgresql-simple + , primitive, QuickCheck, resource-pool, resourcet, scientist + , semigroupoids, servant-server, template-haskell, text, time + , transformers, transformers-base, typed-process, unliftio + , unordered-containers, vector, wai, wai-extra, yaml, yesod-core + , yesod-test }: mkDerivation { pname = "freckle-app"; - version = "1.20.0.1"; - sha256 = "1lzs43japwnkn4gaxamnsjchimc2v2w8fkjb90j1jjvw1dnnaj8h"; + version = "1.20.3.0"; + sha256 = "0if5ijphbin6ff0krfhy7bpjambw4zf8ccg459caiff3qc97rlcy"; libraryHaskellDepends = [ aeson annotated-exception autodocodec autodocodec-openapi3 base bcp47 Blammo Blammo-wai bugsnag bytestring case-insensitive cassava conduit conduit-extra containers cookie datadog doctest ekg-core - exceptions extra faktory freckle-env freckle-http freckle-otel Glob - hashable hs-opentelemetry-api + exceptions extra faktory freckle-env freckle-exception freckle-http + freckle-otel freckle-prelude Glob 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-types immortal lens monad-control - monad-logger-aeson monad-validate MonadRandom mtl - nonempty-containers openapi3 path-pieces persistent - persistent-postgresql postgresql-simple primitive QuickCheck - resource-pool resourcet safe scientist semigroupoids - template-haskell text time transformers transformers-base - typed-process unliftio unordered-containers vector wai wai-extra - yaml yesod-core yesod-test + http-client http-types HUnit immortal lens monad-control + monad-validate MonadRandom mtl nonempty-containers openapi3 + path-pieces persistent persistent-postgresql postgresql-simple + primitive QuickCheck resource-pool resourcet scientist + semigroupoids servant-server template-haskell text time + transformers transformers-base typed-process unliftio + unordered-containers vector wai wai-extra yaml yesod-core + yesod-test ]; testHaskellDepends = [ - aeson async base Blammo bugsnag bytestring cassava conduit - hs-opentelemetry-api hspec http-types monad-validate - nonempty-containers postgresql-simple QuickCheck vector wai - wai-extra + aeson annotated-exception async base Blammo bugsnag bytestring + cassava conduit hs-opentelemetry-api hspec http-types HUnit + monad-validate nonempty-containers path-pieces persistent + postgresql-simple QuickCheck servant-server vector wai wai-extra ]; description = "Haskell application toolkit used at Freckle"; license = lib.licenses.mit; @@ -113592,14 +114076,21 @@ self: { }) {}; "free-alacarte" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, containers, hspec, QuickCheck, relude, tasty + , tasty-hspec, text, time + }: mkDerivation { pname = "free-alacarte"; - version = "1.0.0.2"; - sha256 = "1zshviy7a1apyg6v24qmf65dg2jh6c7ix0vpp1xi6ahkhcqbsnip"; + version = "1.0.0.8"; + sha256 = "1il7ihn81g2341bx07pjjmjzyrxl3n9n70bg6qdxdgjs0w9b6b78"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers hspec QuickCheck relude tasty tasty-hspec text time + ]; description = "Free monads based on intuitions from the Data types à la Carte"; - license = lib.licenses.gpl3Only; + license = lib.licenses.lgpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "free-algebras" = callPackage @@ -113698,18 +114189,19 @@ self: { "free-foil" = callPackage ({ mkDerivation, array, base, bifunctors, containers, deepseq - , doctest-parallel, template-haskell, text + , doctest-parallel, kind-generics, template-haskell, text }: mkDerivation { pname = "free-foil"; - version = "0.1.0"; - sha256 = "0a0mpacwpyj46p79l3imwazp7a3hlm1bwjh5v1x7sk93kyb8d9fg"; + version = "0.2.0"; + sha256 = "19b9bda5vwc9zqj5f555l2c5nvs31l7ja3yp8xw8lqihfjkk8gp8"; libraryHaskellDepends = [ - array base bifunctors containers deepseq template-haskell text + array base bifunctors containers deepseq kind-generics + template-haskell text ]; testHaskellDepends = [ array base bifunctors containers deepseq doctest-parallel - template-haskell text + kind-generics template-haskell text ]; description = "Efficient Type-Safe Capture-Avoiding Substitution for Free (Scoped Monads)"; license = lib.licenses.bsd3; @@ -114370,15 +114862,15 @@ self: { "fresnel" = callPackage ({ mkDerivation, ansi-terminal, base, containers, fused-effects - , hashable, profunctors, QuickCheck, template-haskell, transformers - , unordered-containers + , hashable, profunctors, QuickCheck, semigroupoids + , template-haskell, transformers, unordered-containers }: mkDerivation { pname = "fresnel"; - version = "0.0.0.3"; - sha256 = "1gimnk2f3b183xfr33lp52mwhr9q8hbpp72hgqir48phawkicrca"; + version = "0.1.0.1"; + sha256 = "02d8d4m4msx7hxmp337zig07cvq7sci31f9x429w19bj43sp9j7g"; libraryHaskellDepends = [ - base containers hashable profunctors transformers + base containers hashable profunctors semigroupoids transformers unordered-containers ]; testHaskellDepends = [ @@ -114395,8 +114887,8 @@ self: { ({ mkDerivation, base, fresnel, fused-effects }: mkDerivation { pname = "fresnel-fused-effects"; - version = "0.0.0.0"; - sha256 = "1img08a29q1s5zydk9hkggsq874hvqj44f0vjmxdr36j5r72v4kz"; + version = "0.0.0.1"; + sha256 = "00608jnm2p2r8c1b9p6khrxwgs29cclax24pbslx4xqv1fghgl4y"; libraryHaskellDepends = [ base fresnel fused-effects ]; description = "fresnel/fused-effects integration"; license = lib.licenses.bsd3; @@ -114743,8 +115235,8 @@ self: { }: mkDerivation { pname = "fs-api"; - version = "0.3.0.0"; - sha256 = "1l8rs0r6vbjb06qb5cd2qc9b8lb4cd0n159907q5s5zvm9nfgmd1"; + version = "0.3.0.1"; + sha256 = "0yjfldwmxqg4fgcymyb9bb9axwsfsnldnxxfmk54spkmiab8kr49"; libraryHaskellDepends = [ base bytestring containers deepseq digest directory filepath io-classes primitive safe-wild-cards text unix unix-bytestring @@ -114775,21 +115267,22 @@ self: { ({ mkDerivation, base, base16-bytestring, bifunctors, bytestring , containers, fs-api, generics-sop, io-classes, mtl, pretty-show , primitive, QuickCheck, quickcheck-state-machine, random - , safe-wild-cards, strict-stm, tasty, tasty-hunit, tasty-quickcheck - , temporary, text + , safe-wild-cards, tasty, tasty-hunit, tasty-quickcheck, temporary + , text }: mkDerivation { pname = "fs-sim"; - version = "0.3.0.0"; - sha256 = "0wphs3i5f400i313qgii0z76mk3xqvzr5swnmhyc67kcl50l807q"; + version = "0.3.0.1"; + sha256 = "1r094vpwpmq3956zs2yqvpliz0aq0wb71pnw566kcxm1rvv91wjr"; libraryHaskellDepends = [ base base16-bytestring bytestring containers fs-api io-classes mtl - primitive QuickCheck safe-wild-cards strict-stm text + primitive QuickCheck safe-wild-cards text ]; testHaskellDepends = [ base bifunctors bytestring containers fs-api generics-sop - pretty-show primitive QuickCheck quickcheck-state-machine random - strict-stm tasty tasty-hunit tasty-quickcheck temporary text + io-classes pretty-show primitive QuickCheck + quickcheck-state-machine random tasty tasty-hunit tasty-quickcheck + temporary text ]; description = "Simulated file systems"; license = lib.licenses.asl20; @@ -114871,6 +115364,8 @@ self: { pname = "fsnotify"; version = "0.4.1.0"; sha256 = "1vzpx91n2qml0628zq1c0bwnz7d4bal4vwl52hyil60shx5gnc6i"; + revision = "1"; + editedCabalFile = "1r8q07d5232lfxsdx9i1kfwlmr2kirz8g9k18ahz054pvwggs9y6"; libraryHaskellDepends = [ async base bytestring containers directory filepath hinotify monad-control safe-exceptions text time unix unix-compat @@ -115053,6 +115548,8 @@ self: { pname = "ftp-client"; version = "0.5.1.6"; sha256 = "0xlrmzngdzg8h7lcb6kaz1zcm3kd1rdax4xs0h048iz7f78q18dg"; + revision = "1"; + editedCabalFile = "14pdfmm796mv3qd5y2rq8pj429v31w1d3dlxgyvypjmjh07v87gf"; libraryHaskellDepends = [ attoparsec base bytestring containers crypton-connection data-default-class exceptions network transformers @@ -115608,13 +116105,15 @@ self: { }: mkDerivation { pname = "functor-monad"; - version = "0.1.1.0"; - sha256 = "027g26wr9lsasgrfw641i6zpvv23w7489d7wbljxnp6fnkfhxn30"; + version = "0.1.1.1"; + sha256 = "0rjc6ziwvvvlzhf50dx9zml75i647rzd5g4g3bf7nl0q51r4z063"; libraryHaskellDepends = [ adjunctions auto-lift-classes base bifunctors comonad day-comonoid free free-applicative-t kan-extensions transformers ]; - testHaskellDepends = [ base free transformers ]; + testHaskellDepends = [ + base comonad free kan-extensions transformers + ]; description = "FFunctor: functors on (the usual) Functors"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -115854,28 +116353,6 @@ self: { }: mkDerivation { pname = "fused-effects"; - version = "1.1.2.2"; - sha256 = "00m1lnn8zsb6iniyjmmbgiz7kd5c5kl7rxqqxlc2dkb4hpyrm4v5"; - revision = "1"; - editedCabalFile = "0ckc63n04kjlk4m3zjz0ynsc0b4rvz6ikpxcrbx8p9lj132ck6d7"; - libraryHaskellDepends = [ base transformers unliftio-core ]; - testHaskellDepends = [ - base containers hedgehog hedgehog-fn inspection-testing - transformers - ]; - testToolDepends = [ markdown-unlit ]; - benchmarkHaskellDepends = [ base tasty-bench transformers ]; - description = "A fast, flexible, fused effect system"; - license = lib.licenses.bsd3; - }) {}; - - "fused-effects_1_1_2_3" = callPackage - ({ mkDerivation, base, containers, hedgehog, hedgehog-fn - , inspection-testing, markdown-unlit, tasty-bench, transformers - , unliftio-core - }: - mkDerivation { - pname = "fused-effects"; version = "1.1.2.3"; sha256 = "0z0gwkb3rw9jpa3zxz5w3fc0x54xww0p5wzp4f0xdargjy1jhmk0"; libraryHaskellDepends = [ base transformers unliftio-core ]; @@ -115887,7 +116364,6 @@ self: { benchmarkHaskellDepends = [ base tasty-bench transformers ]; description = "A fast, flexible, fused effect system"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fused-effects-exceptions" = callPackage @@ -115958,8 +116434,8 @@ self: { ({ mkDerivation, base, fused-effects, random, transformers }: mkDerivation { pname = "fused-effects-random"; - version = "1.1.0.0"; - sha256 = "0krcyx4hhvkxh0rbfwxb52xgb4rl45dflyx3aw8xryp6wn9my770"; + version = "1.1.0.1"; + sha256 = "1s259n2iq96rqhzh1vg9m0cpqyfh0ljjgrzw62b4ixm9c39vvw5n"; libraryHaskellDepends = [ base fused-effects random transformers ]; description = "Random number generation for fused-effects"; license = lib.licenses.bsd3; @@ -116098,8 +116574,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.21"; - sha256 = "1qhidm4vlpqh99mk6nn0kx95wbfhkkjy0dfcfvblkp03ckg0qbhm"; + version = "0.25.23"; + sha256 = "1yd1j5qv4rfijjxv48m0qq7y9r0qn31zliafgbmqs2i9ik5gg6sz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116134,8 +116610,8 @@ self: { }: mkDerivation { pname = "futhark-data"; - version = "1.1.0.1"; - sha256 = "1i1npxiij2crgc5vbyqd9j786yh8a6gkshiys1cjwlzj30hm95n3"; + version = "1.1.1.0"; + sha256 = "010q8mbyy320vw785phczmdjdv55w5i7mdd6q04949lzfzxi3w0f"; libraryHaskellDepends = [ base binary bytestring bytestring-to-vector containers half megaparsec mtl scientific text vector vector-binary-instances @@ -116171,8 +116647,8 @@ self: { }: mkDerivation { pname = "futhark-server"; - version = "1.2.2.1"; - sha256 = "0g8n1gkl4y2a65z1idx58b1ls2g4jf0pwjhnc3w5wffq9mpwliaq"; + version = "1.2.3.0"; + sha256 = "12gih73pvy54k4fs7s690b40cfhrvgzahhw3n571pi73ia86mljb"; libraryHaskellDepends = [ base binary bytestring directory futhark-data mtl process temporary text @@ -117707,7 +118183,6 @@ self: { ]; description = "A simple Happstack-style Gemini router"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "gemini-server" = callPackage @@ -117726,8 +118201,6 @@ self: { ]; description = "A lightweight server for the Gemini protocol"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gemini-textboard" = callPackage @@ -117750,7 +118223,6 @@ self: { ]; description = "A barebones textboard for the Gemini protocol"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "gemini-textboard"; }) {}; @@ -118086,19 +118558,16 @@ self: { }) {}; "generic-data" = callPackage - ({ mkDerivation, ap-normalize, base, base-orphans, contravariant - , deepseq, generic-lens, ghc-boot-th, one-liner, show-combinators - , tasty, tasty-bench, tasty-hunit + ({ mkDerivation, ap-normalize, base, base-orphans, deepseq + , generic-lens, ghc-boot-th, one-liner, show-combinators, tasty + , tasty-bench, tasty-hunit }: mkDerivation { pname = "generic-data"; - version = "1.1.0.0"; - sha256 = "1jxwkc475v0h1i5g5zyjq0x66fqvixdc99a7m8w3cpxkk56vqb5i"; - revision = "2"; - editedCabalFile = "187qabhjmymg18i7424s90f7nwx17hlpcr5i53ximwyd9z6i9ify"; + version = "1.1.0.1"; + sha256 = "0cbng88jsx5f34jrhj2c83jg9r0d7q4xj6vb2as97mgrdmy054nk"; libraryHaskellDepends = [ - ap-normalize base base-orphans contravariant ghc-boot-th - show-combinators + ap-normalize base base-orphans ghc-boot-th show-combinators ]; testHaskellDepends = [ base generic-lens one-liner show-combinators tasty tasty-hunit @@ -118652,8 +119121,8 @@ self: { pname = "generically"; version = "0.1.1"; sha256 = "1ks3pi6mpma83xffplz8vmimyhvzpnhmcgvk3bvl3c64pqva9i84"; - revision = "3"; - editedCabalFile = "1hl8690xqb6af5i5jn5s55s29hpx9fq1ghdnxi5l1li2q25666qv"; + revision = "4"; + editedCabalFile = "0bj5vhnrggf9ka89z628hcxx1g3r00lv2rrrjv3dfbaqbj7jfr1z"; libraryHaskellDepends = [ base ]; description = "Generically newtype to use with DerivingVia"; license = lib.licenses.bsd3; @@ -119140,8 +119609,8 @@ self: { }: mkDerivation { pname = "genvalidity-containers"; - version = "1.0.0.1"; - sha256 = "155ri2ncwcjx2gl3mimfkafqdf33mzkk1188dk97wbzg0rpq69ip"; + version = "1.0.0.2"; + sha256 = "1087c37r829drixvs6cnl7irxph35nspims4ig20dqxg3g0zpx54"; libraryHaskellDepends = [ base containers genvalidity QuickCheck validity validity-containers ]; @@ -120250,22 +120719,6 @@ self: { hydraPlatforms = lib.platforms.none; }) {deriveConstants = null; genprimopcode = null;}; - "ghc-api-compat_8_6" = callPackage - ({ mkDerivation, ghc }: - mkDerivation { - pname = "ghc-api-compat"; - version = "8.6"; - sha256 = "1pxnb5qrf9fz7ghy68xvpdc44fh2kz3f9i5cn66ch7k0ah8j2w3s"; - revision = "1"; - editedCabalFile = "01i6h8358n148nzjx6k774d2i2hm6dhgpx162ppkmwmim17f3zyn"; - libraryHaskellDepends = [ ghc ]; - doHaddock = false; - description = "GHC-API compatibility helpers"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - "ghc-api-compat_8_10_7" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -121156,7 +121609,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib_9_8_2_20240223" = callPackage + "ghc-lib_9_8_3_20241103" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts @@ -121164,8 +121617,10 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.8.2.20240223"; - sha256 = "12lmk3ipd1pyiwzmnb0zgbw86yy7mhsy530dnackwidg3ww07nia"; + version = "9.8.3.20241103"; + sha256 = "0cf14rw1kkvs7f5smhjrsxxs3rhcqlsfgb99cmv2dlvcma3h1k95"; + revision = "1"; + editedCabalFile = "1xjibygf7kjl8b17vsapg1mmlj226z38svd1kfz1b3qpn17j3mcd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121178,7 +121633,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib_9_10_1_20240511" = callPackage + "ghc-lib_9_10_1_20241103" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts @@ -121186,8 +121641,10 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.10.1.20240511"; - sha256 = "1z8xpzkwp2abb8azhjsnmq0cyyvvc3xqm5dgs7vmrfj3yq72j6ys"; + version = "9.10.1.20241103"; + sha256 = "1wzjzfh3cvbmq957plngq41cwi1x63z8f5n5j69xpqkdf64z517g"; + revision = "2"; + editedCabalFile = "1nb61mg0p39258gqwgwh6wc35mdxcps5afwccgiqa3k22rfjdhbg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121241,15 +121698,17 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser_9_8_2_20240223" = callPackage + "ghc-lib-parser_9_8_3_20241103" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.8.2.20240223"; - sha256 = "05k5grbh3s0ywm8y6cp9hqfj4bbq0nh1bx1ysgfv88df5hgg47r9"; + version = "9.8.3.20241103"; + sha256 = "0cp1s6z0jm0pk6p2zlpklwqyh4wkh42cjxkgjdkl9wqnf1cnn444"; + revision = "1"; + editedCabalFile = "0ih4spj54606cj280cr3icl8d5imgipk1ydbajc9pd9vaqh2kg5c"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121262,15 +121721,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib-parser_9_10_1_20240511" = callPackage + "ghc-lib-parser_9_10_1_20241103" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.10.1.20240511"; - sha256 = "0fgissqfbgx5ra6gvfywxn76q16v5i97riaxqs1l9pa3zrfdzl9p"; + version = "9.10.1.20241103"; + sha256 = "17q8h8xaa7rn384zq3x7br93mi9g6gwqzp01bh99929qk0mvrsil"; + revision = "2"; + editedCabalFile = "02w33rvb6vfx7am6w0ri4if4m3lk1zf60mw4ibazzqgl4rbkf7im"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121540,14 +122001,26 @@ self: { license = lib.licenses.mit; }) {}; + "ghc-parser_0_2_7_0" = callPackage + ({ mkDerivation, base, ghc }: + mkDerivation { + pname = "ghc-parser"; + version = "0.2.7.0"; + sha256 = "08m1jb093pkmbj7km7xclq6f1jz20v313ih9b4fydis974i8pv3h"; + libraryHaskellDepends = [ base ghc ]; + description = "Haskell source parser from GHC"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-paths" = callPackage ({ mkDerivation, base, Cabal, directory }: mkDerivation { pname = "ghc-paths"; version = "0.1.0.12"; sha256 = "1164w9pqnf7rjm05mmfjznz7rrn415blrkk1kjc0gjvks1vfdjvf"; - revision = "6"; - editedCabalFile = "13j23fnlh18zqh5m4y8b5skhavq9kjx2jl6kyxvmfcmdi3q4nwjf"; + revision = "7"; + editedCabalFile = "0irq8j1bz5z3da1g4xd3dp392hwi2xn1cjsrdiqyp4srjlyg2532"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; description = "Knowledge of GHC's installation directories"; @@ -122029,6 +122502,8 @@ self: { pname = "ghc-tags-pipes"; version = "0.1.1.0"; sha256 = "1ajgqhnch20zfrslmng3hbmn3p9hcsd3d6b02yq6qv8rlxrl9nxn"; + revision = "1"; + editedCabalFile = "0r40shzvq4ps4nhp4yhw76wnkm07k711gqzdbrilig4vv0r82x89"; libraryHaskellDepends = [ attoparsec base bytestring ghc-tags-core mtl pipes pipes-attoparsec pipes-bytestring text @@ -122063,8 +122538,8 @@ self: { ({ mkDerivation, base, containers, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.11.0.0"; - sha256 = "0k0hr9l3w3xf60var20by5xp0wqfcwv8x4lfcag94f9bn60cnvra"; + version = "0.13.0.0"; + sha256 = "1gwr31z1rxgxr3jmcyp8bqbm29nr095m876cfh1ljxchd7i9n2n3"; libraryHaskellDepends = [ base containers ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; @@ -122680,8 +123155,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-javascript"; - version = "0.9.9.2"; - sha256 = "19011y6rnaa6mcch64gxpi1gzv6yp8ma2nxi6k6wp6myyfia57wh"; + version = "0.9.9.3"; + sha256 = "1k62w5czg544ias8q2kvhp8qnlafzisgx1p0gq8d2kh662w99kcg"; description = "DOM library using JSFFI and GHCJS"; license = lib.licenses.mit; platforms = [ "javascript-ghcjs" ]; @@ -123339,7 +123814,7 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; - "gi-gdk_4_0_8" = callPackage + "gi-gdk_4_0_9" = 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 @@ -123347,8 +123822,8 @@ self: { }: mkDerivation { pname = "gi-gdk"; - version = "4.0.8"; - sha256 = "1izl25parszwm9nayn0w9zvmic9bsfcfl1jiasnj11pmzzllyryc"; + version = "4.0.9"; + sha256 = "0c43wxbq4g41j107gnh8gyxjsws223p7kkm46hihjvs8pcxrab94"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi @@ -123486,8 +123961,8 @@ self: { }: mkDerivation { pname = "gi-gio"; - version = "2.0.34"; - sha256 = "0y01d4758lx6qchwgvqzjwgj00r3fqwpwxjm80wq7gdh0nnwwaz3"; + version = "2.0.35"; + sha256 = "07b4gg1wbb5mz63xpvjjdbdp0z9wci5jckr1gr0qxrizyc3vv2vi"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -123858,8 +124333,6 @@ self: { ]; description = "Declarative GTK+ programming in Haskell"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gi-gtk-declarative-app-simple" = callPackage @@ -123881,7 +124354,6 @@ self: { ]; description = "Declarative GTK+ programming in Haskell in the style of Pux"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "gi-gtk-hs" = callPackage @@ -123891,8 +124363,8 @@ self: { }: mkDerivation { pname = "gi-gtk-hs"; - version = "0.3.16"; - sha256 = "1zdkxhvy4i99p6qcrc53qlxv71vh05w9xd0j1qh20aci05n1nnha"; + version = "0.3.17"; + sha256 = "022g7xlwli8rbasxgafpp2j6ybk5iyk1hlwlg7nph361k3c0l7p6"; libraryHaskellDepends = [ base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gtk haskell-gi-base mtl text transformers @@ -124093,7 +124565,7 @@ self: { "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading - , text, transformers, webkitgtk + , text, transformers, webkitgtk_4_0 }: mkDerivation { pname = "gi-javascriptcore"; @@ -124104,16 +124576,16 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; description = "JavaScriptCore bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "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 + , text, transformers, webkitgtk_6_0 }: mkDerivation { pname = "gi-javascriptcore"; @@ -124124,12 +124596,12 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ javascriptcoregtk ]; + libraryPkgconfigDepends = [ webkitgtk_6_0 ]; description = "JavaScriptCore bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; - }) {javascriptcoregtk = null;}; + }) {inherit (pkgs) webkitgtk_6_0;}; "gi-json" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -124322,8 +124794,8 @@ self: { }: mkDerivation { pname = "gi-secret"; - version = "0.0.18"; - sha256 = "0z4knqmhcicqnmamzibl1xwarjl7y1da0127jg7s1n7a780dgnd5"; + version = "0.0.19"; + sha256 = "0070li67sl96cbqvywig532a00aqlc7spbf94v8bkj5qy7fph9nz"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -124336,28 +124808,6 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) libsecret;}; - "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 - }: - mkDerivation { - pname = "gi-soup"; - version = "2.4.28"; - sha256 = "157yvfwhyvl58va533n0hz509204aszxqspd62x92b6mlf5fxyqk"; - 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; - hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) libsoup;}; - "gi-soup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -124468,13 +124918,13 @@ self: { description = "WebKit bindings"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) webkitgtk;}; + }) {webkitgtk = null;}; "gi-webkit2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers, webkitgtk + , haskell-gi-overloading, text, transformers, webkitgtk_4_0 }: mkDerivation { pname = "gi-webkit2"; @@ -124489,17 +124939,17 @@ self: { gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; description = "WebKit2 bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk , gi-gio, gi-gobject, gi-gtk, gi-javascriptcore, gi-soup , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers, webkitgtk + , transformers, webkitgtk_4_0 }: mkDerivation { pname = "gi-webkit2webextension"; @@ -124514,13 +124964,13 @@ self: { gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; description = "WebKit2-WebExtension bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "gi-webkitwebprocessextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk @@ -124944,8 +125394,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20240831"; - sha256 = "1ly9iirr0669i5aq3k1lf60sg5z3p08kn4jnvnjcx0l114b67q3j"; + version = "10.20241031"; + sha256 = "14wjj9y1g9nkz6wnvadypvjnfs2z8gbvh3sk4lqkw8780pnaz3hc"; configureFlags = [ "-fassistant" "-f-benchmark" "-fcrypton" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fpairing" "-fproduction" "-ftorrentparser" @@ -125229,6 +125679,27 @@ self: { mainProgram = "git-mediate"; }) {}; + "git-mediate_1_1_0" = callPackage + ({ mkDerivation, ansi-terminal, base, base-compat, containers, Diff + , directory, filepath, generic-data, mtl, optparse-applicative + , process, split, unix-compat + }: + mkDerivation { + pname = "git-mediate"; + version = "1.1.0"; + sha256 = "090i7ghxihmn8zb0phaaw8xmkqy62rwr4awskh2rc1njpg6s29kq"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal base base-compat containers Diff directory filepath + generic-data mtl optparse-applicative process split unix-compat + ]; + description = "Tool to help resolving git conflicts"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "git-mediate"; + }) {}; + "git-monitor" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , gitlib, gitlib-libgit2, lifted-async, logging, old-locale @@ -125480,8 +125951,8 @@ self: { pname = "github"; version = "0.29"; sha256 = "1hki9lvf5vcq980ky98vwc7rh86rgf3z8pvqfgpb6jinc7jylcpx"; - revision = "5"; - editedCabalFile = "094n02zbpvy3fpc1rss88ja7gq40ds8dp990bwsw73wrpgip67zg"; + revision = "6"; + editedCabalFile = "0ylwq4jzsng513pi98b3hxnn9lbjvjv5sgq1r7kfbd8nxgdcrbmw"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics @@ -125498,6 +125969,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "github-app-token" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, dotenv, hspec + , http-conduit, http-types, jwt, markdown-unlit + , monoidal-containers, path, semigroups, text, time, unliftio + }: + mkDerivation { + pname = "github-app-token"; + version = "0.0.3.0"; + sha256 = "0w5fk6dms063qma11dib4spfmgbzs8nabjp8cdlgwlx9lvwnax3z"; + libraryHaskellDepends = [ + aeson base bytestring http-conduit http-types jwt + monoidal-containers path semigroups text time unliftio + ]; + testHaskellDepends = [ + aeson base bytestring directory dotenv hspec http-conduit + http-types markdown-unlit text time unliftio + ]; + testToolDepends = [ markdown-unlit ]; + description = "Generate an installation access token for a GitHub App"; + license = lib.licenses.mit; + }) {}; + "github-backup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , exceptions, filepath, git, github, hslogger, IfElse, mtl, network @@ -125764,6 +126257,26 @@ self: { license = lib.licenses.mit; }) {}; + "github-workflow-commands" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec + , hspec-junit-formatter, lens, markdown-unlit, MonadRandom, text + }: + mkDerivation { + pname = "github-workflow-commands"; + version = "0.0.1.0"; + sha256 = "19w1q7ak2prlnmv0npgczmr2f76v16lgl9xnm88xvgijjcn3g52y"; + libraryHaskellDepends = [ + base bytestring containers lens MonadRandom text + ]; + testHaskellDepends = [ + base hspec hspec-junit-formatter lens markdown-unlit + ]; + testToolDepends = [ markdown-unlit ]; + description = "GitHub Actions workflow commands"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "githud" = callPackage ({ mkDerivation, base, bytestring, daemons, data-default, directory , filelock, mtl, network, parsec, process, tasty, tasty-hunit @@ -125873,17 +126386,18 @@ self: { ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring , 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 + , transformers, tree-diff, unix-compat, unordered-containers + , vector }: mkDerivation { pname = "gitlab-haskell"; - version = "1.0.1.0"; - sha256 = "0xl9xbxfwvpzcvk9hr0549ki404r1ninrrg15nvpyj8blksgdmp8"; + version = "1.0.2.2"; + sha256 = "11pck9gqlnjp7759kdy3qk3xq6wcnj6acyxgdhx40190d1h3sid9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring crypton-connection data-default-class http-client http-conduit http-types mtl temporary text time - transformers unix + transformers unix-compat ]; testHaskellDepends = [ aeson ansi-wl-pprint base bytestring tasty tasty-hunit text @@ -126598,7 +127112,6 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Console IRC client"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; mainProgram = "glirc"; }) {}; @@ -127362,22 +127875,21 @@ self: { }) {}; "gnome-keyring" = callPackage - ({ mkDerivation, base, bytestring, c2hs, gnome-keyring - , libgnome-keyring, text, time + ({ mkDerivation, base, bytestring, c2hs, libgnome-keyring, text + , time }: mkDerivation { pname = "gnome-keyring"; version = "0.3.1.1"; sha256 = "044bbgy8cssi1jc8wwb0kvxpw6d7pwxackkzvw7p9r8ybmgv4d0b"; libraryHaskellDepends = [ base bytestring text time ]; - librarySystemDepends = [ gnome-keyring ]; + librarySystemDepends = [ libgnome-keyring ]; libraryPkgconfigDepends = [ libgnome-keyring ]; libraryToolDepends = [ c2hs ]; description = "Bindings for libgnome-keyring"; license = lib.licenses.gpl3Only; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) gnome-keyring; - inherit (pkgs) libgnome-keyring;}; + }) {inherit (pkgs) libgnome-keyring;}; "gnomevfs" = callPackage ({ mkDerivation, array, base, containers, glib, gnome-vfs @@ -127479,8 +127991,8 @@ self: { }: mkDerivation { pname = "gnutls"; - version = "0.3"; - sha256 = "1v8haxpj2pfx3fjbjfp16r9488l9gj7ih26g978ampb5nwnq3gry"; + version = "0.3.1"; + sha256 = "0yjs39v0dzygfw00fzsjmcfgvv9vk44aqhkshn54ddnhvpdqx76p"; libraryHaskellDepends = [ base bytestring transformers unexceptionalio-trans ]; @@ -130030,18 +130542,17 @@ self: { }: mkDerivation { pname = "goldplate"; - version = "0.2.1.1"; - sha256 = "1cisak5ng6v0iq24djyg4jp87diay02m0k2saac49saxmk29jsr6"; - revision = "6"; - editedCabalFile = "1572x5xh8qja14qfv4whlj7zl7gwp5cyhmzdnbi44fnv4hr27l9d"; - isLibrary = false; + version = "0.2.2.1"; + sha256 = "09z937azq3n736gn1sgdy7bxw4nvgsrqicgxdh7x79qng7ks035w"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ aeson aeson-pretty async base bytestring Diff directory filepath Glob optparse-applicative process regex-pcre-builtin text unordered-containers ]; - testHaskellDepends = [ base process ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ aeson base bytestring process ]; description = "A lightweight golden test runner"; license = lib.licenses.asl20; mainProgram = "goldplate"; @@ -130176,8 +130687,8 @@ self: { }: mkDerivation { pname = "google-maps-geocoding"; - version = "0.7.0.2"; - sha256 = "1y05vlfn1wrzb6hcfg2wrlwbcz63xr7w6mqb2zq86yww5i1xpkvx"; + version = "0.7.0.3"; + sha256 = "0cj1bkffgn6nrbk3xnplb5v6qsccfhzljvdp0hrvvb5hwh0wd5m9"; libraryHaskellDepends = [ aeson base google-static-maps http-client servant servant-client text @@ -130310,8 +130821,8 @@ self: { }: mkDerivation { pname = "google-static-maps"; - version = "0.7.0.2"; - sha256 = "05dcy6vswh4b5cz4pf0aa3x1fwzv6q35xfv80978ncp6hpzvb1d1"; + version = "0.7.0.3"; + sha256 = "11zmjyz7j41zi7h88gvjzfnky502f81079xnpsx71xhk1nm4b71x"; libraryHaskellDepends = [ aeson base base64-bytestring bytedump bytestring cryptonite double-conversion http-client JuicyPixels memory network-uri @@ -130868,6 +131379,80 @@ self: { mainProgram = "gps2htmlReport"; }) {}; + "gpu-vulkan" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , gpu-vulkan-middle, hetero-parameter-list + , hetero-parameter-list-with-typelevel-tools, language-spir-v + , mono-traversable, stm, storable-hetero-list, storable-peek-poke + , template-haskell, temporary, text, time, tools-yj + , typelevel-tools-yj + }: + mkDerivation { + pname = "gpu-vulkan"; + version = "0.1.0.137"; + sha256 = "19710jmnan0avp4wcs3rkp4mn248k9ifl7ribzclmxp90qzgrj4s"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers data-default gpu-vulkan-middle + hetero-parameter-list hetero-parameter-list-with-typelevel-tools + language-spir-v mono-traversable stm storable-hetero-list + storable-peek-poke template-haskell temporary text time tools-yj + typelevel-tools-yj + ]; + testHaskellDepends = [ + base bytestring containers data-default gpu-vulkan-middle + hetero-parameter-list hetero-parameter-list-with-typelevel-tools + language-spir-v mono-traversable stm storable-hetero-list + storable-peek-poke template-haskell temporary text time tools-yj + typelevel-tools-yj + ]; + description = "Vulkan library"; + license = lib.licenses.bsd3; + }) {}; + + "gpu-vulkan-core" = callPackage + ({ mkDerivation, base, c-enum, c-struct, nowdoc, text, vulkan }: + mkDerivation { + pname = "gpu-vulkan-core"; + version = "0.1.0.8"; + sha256 = "1539ara1achh8anhgyijlrmipsxsm6n7plsr4181g3rvljadp9m7"; + libraryHaskellDepends = [ base c-enum c-struct nowdoc text ]; + libraryPkgconfigDepends = [ vulkan ]; + testHaskellDepends = [ base c-enum c-struct nowdoc text ]; + description = "Thin wrapper for Vulkan API"; + license = lib.licenses.bsd3; + }) {vulkan = null;}; + + "gpu-vulkan-middle" = callPackage + ({ mkDerivation, base, bytestring, c-enum, containers, data-default + , exception-hierarchy, gpu-vulkan-core, hetero-parameter-list + , language-spir-v, mtl, mtl-misc-yj, ranged-list, stm + , storable-hetero-list, storable-peek-poke, template-haskell, text + , text-misc-yj, typelevel-tools-yj, union-color, uuid + }: + mkDerivation { + pname = "gpu-vulkan-middle"; + version = "0.1.0.54"; + sha256 = "0j2g9gc9k8zpjcr9vf6s52yn53q6hks6p2i7csw2qbhy257vqnxc"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring c-enum containers data-default exception-hierarchy + gpu-vulkan-core hetero-parameter-list language-spir-v mtl + mtl-misc-yj ranged-list stm storable-hetero-list storable-peek-poke + template-haskell text text-misc-yj typelevel-tools-yj union-color + uuid + ]; + testHaskellDepends = [ + base bytestring c-enum containers data-default exception-hierarchy + gpu-vulkan-core hetero-parameter-list language-spir-v mtl + mtl-misc-yj ranged-list stm storable-hetero-list storable-peek-poke + template-haskell text text-misc-yj typelevel-tools-yj union-color + uuid + ]; + description = "Medium wrapper for Vulkan API"; + license = lib.licenses.bsd3; + }) {}; + "gpx-conduit" = callPackage ({ mkDerivation, attoparsec, base, conduit, filepath, monad-control , old-locale, text, time, void, xml-conduit, xml-types @@ -131713,7 +132298,7 @@ self: { license = "MPL-2.0 AND BSD-3-Clause"; }) {}; - "graphql_1_3_0_0" = callPackage + "graphql_1_4_0_0" = callPackage ({ mkDerivation, base, conduit, containers, exceptions, hspec , hspec-discover, hspec-expectations, hspec-megaparsec, megaparsec , parser-combinators, QuickCheck, template-haskell, text @@ -131721,8 +132306,8 @@ self: { }: mkDerivation { pname = "graphql"; - version = "1.3.0.0"; - sha256 = "0clzpnwvy9h71jn2ik0jxghlr7344hgwlxgff0h2imr7mq532adv"; + version = "1.4.0.0"; + sha256 = "1dlaniarjd184qp56sfnldmzxjjn2gyqhyvbjd07l7rl5baskd7d"; libraryHaskellDepends = [ base conduit containers exceptions megaparsec parser-combinators template-haskell text transformers unordered-containers vector @@ -131807,8 +132392,10 @@ self: { }: mkDerivation { pname = "graphql-spice"; - version = "1.0.3.0"; - sha256 = "1jzrhbpxswi4znalwswjh43pwcysw7nzj6d1xa446xc3w8azs3ic"; + version = "1.0.4.0"; + sha256 = "182kjz5zky5z1wdg92823hhyprc13yfai0jlg6lx1cih83rwz3h5"; + revision = "1"; + editedCabalFile = "0i2fc7kw12hib03b781xw50ggwvrqj1ij9y622aaaiz5habjmd1b"; libraryHaskellDepends = [ aeson base conduit containers exceptions graphql hspec-expectations megaparsec scientific template-haskell text time transformers @@ -131820,6 +132407,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "GraphQL with batteries"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "graphql-utils" = callPackage @@ -132244,8 +132833,8 @@ self: { }: mkDerivation { pname = "greskell"; - version = "2.0.3.0"; - sha256 = "17njclgkdawnm7hyjv12f2bar93ak9nysfx82igvb6qdp0213a91"; + version = "2.0.3.2"; + sha256 = "1vyszhrzmqbhisskcrlglpkrizz1mj8kxkdwcpwpg24v6bd65g72"; libraryHaskellDepends = [ aeson base exceptions greskell-core hashable semigroups text transformers unordered-containers vector @@ -132267,8 +132856,8 @@ self: { }: mkDerivation { pname = "greskell-core"; - version = "1.0.0.1"; - sha256 = "1pjsx1cjm18k2x0h2b80y7qv666c2w5w2gz49qi0vdhx1kgrnzvr"; + version = "1.0.0.3"; + sha256 = "1qwd2afiaqyrjbdk3c06l2y4rnvzk734n74lkb2c7ms2njgginbn"; libraryHaskellDepends = [ aeson base bytestring containers hashable scientific semigroups text unordered-containers uuid vector @@ -132291,8 +132880,8 @@ self: { }: mkDerivation { pname = "greskell-websocket"; - version = "1.0.0.1"; - sha256 = "1r9bs5aswh4kxsmwylpizp2b9xiwljic5h18k6qr9i2hgmpshqcn"; + version = "1.0.0.2"; + sha256 = "0liqgmkgivryyrgvc8k76qz62r5x482838rm4jg3diigp1mq2kxj"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring greskell-core hashtables safe-exceptions stm text unordered-containers uuid @@ -133818,6 +134407,32 @@ self: { broken = true; }) {inherit (pkgs) gtksourceview3;}; + "gtvm-hs" = callPackage + ({ mkDerivation, aeson, base, binrep, bytestring, containers + , exceptions, generic-data-functions, mtl, optparse-applicative + , path, polysemy, rerefined, strongweak, symparsec, text, yaml + }: + mkDerivation { + pname = "gtvm-hs"; + version = "1.0.0"; + sha256 = "05ghp2fadfmr7qsdvz2xj0wlg620l4h2fazwdfkv55126q7n190i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binrep containers exceptions generic-data-functions mtl + path polysemy strongweak symparsec text yaml + ]; + executableHaskellDepends = [ + aeson base binrep bytestring containers exceptions + generic-data-functions mtl optparse-applicative path polysemy + rerefined strongweak symparsec text yaml + ]; + description = "Various tools for reversing and using assets from Golden Time: Vivid Memories"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "gtvm-hs"; + }) {}; + "guarded-allocation" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -134067,8 +134682,8 @@ self: { }: mkDerivation { pname = "h-raylib"; - version = "5.5.0.0"; - sha256 = "063sjmk48nrp27qajipcc2br0nfxa6206gybdpxngbs66vz4kgc1"; + version = "5.5.2.1"; + sha256 = "11jrlghfl9xyssrs4yjcaay825ank1v5sgsys9i4kamrnjpnvagf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -134444,7 +135059,7 @@ self: { ({ mkDerivation, aeson, asn1-encoding, attoparsec, base , base16-bytestring, bifunctors, binary, binary-conduit, bytestring , bz2, conduit, conduit-extra, containers, criterion - , crypto-cipher-types, cryptonite, errors, hashable + , crypto-cipher-types, crypton, errors, hashable , incremental-parser, ixset-typed, lens, memory, monad-loops , nettle, network-uri, openpgp-asciiarmor, prettyprinter , QuickCheck, quickcheck-instances, resourcet, split, tasty @@ -134453,12 +135068,12 @@ self: { }: mkDerivation { pname = "hOpenPGP"; - version = "2.9.8"; - sha256 = "1ibd9hah5y2qqpmfv5dk9iys3fnixw9blp855mjhfwpikgn3xypq"; + version = "2.10.0"; + sha256 = "1k8c4qwkn4nb9kz3zmlpkjdrmzygk9dc2fms8k8rgqlnz7l61ch5"; libraryHaskellDepends = [ aeson asn1-encoding attoparsec base base16-bytestring bifunctors binary binary-conduit bytestring bz2 conduit conduit-extra - containers crypto-cipher-types cryptonite errors hashable + containers crypto-cipher-types crypton errors hashable incremental-parser ixset-typed lens memory monad-loops nettle network-uri openpgp-asciiarmor prettyprinter resourcet split text time time-locale-compat transformers unliftio-core @@ -134467,7 +135082,7 @@ self: { testHaskellDepends = [ aeson attoparsec base base16-bytestring bifunctors binary binary-conduit bytestring bz2 conduit conduit-extra containers - crypto-cipher-types cryptonite errors hashable incremental-parser + crypto-cipher-types crypton errors hashable incremental-parser ixset-typed lens memory monad-loops nettle network-uri prettyprinter QuickCheck quickcheck-instances resourcet split tasty tasty-hunit tasty-quickcheck text time time-locale-compat @@ -134476,7 +135091,7 @@ self: { benchmarkHaskellDepends = [ aeson attoparsec base base16-bytestring bifunctors binary binary-conduit bytestring bz2 conduit conduit-extra containers - criterion crypto-cipher-types cryptonite errors hashable + criterion crypto-cipher-types crypton errors hashable incremental-parser ixset-typed lens memory monad-loops nettle network-uri prettyprinter resourcet split text time time-locale-compat transformers unliftio-core unordered-containers @@ -135474,8 +136089,8 @@ self: { pname = "hackage-security"; version = "0.6.2.6"; sha256 = "0sfvd5y9v01bjsxsrf446ldcqf56arzr94jk2zsvj49yddbn2hif"; - revision = "3"; - editedCabalFile = "04prkqrqfdynf7l5p9zdy802gp78cizc1ljskqn8qq3yzcj3x13n"; + revision = "4"; + editedCabalFile = "0d7znfvp5b2fqck7bcrhh8a2y21az1bryf0c8gp21j1crrq1lcd7"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal Cabal-syntax containers cryptohash-sha256 directory ed25519 @@ -135783,22 +136398,6 @@ self: { broken = true; }) {}; - "haddock_2_23_1" = callPackage - ({ mkDerivation, base, filepath, haddock-api, haddock-test }: - mkDerivation { - pname = "haddock"; - version = "2.23.1"; - sha256 = "129lwai4609f910h7yhmmm1rbqzjla9rcg5dpzqihydsjyw5ii1s"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ base haddock-api ]; - testHaskellDepends = [ base filepath haddock-test ]; - description = "A documentation-generation tool for Haskell libraries"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "haddock"; - }) {}; - "haddock" = callPackage ({ mkDerivation, base, filepath, haddock-api, haddock-test }: mkDerivation { @@ -135815,32 +136414,6 @@ self: { mainProgram = "haddock"; }) {}; - "haddock-api_2_23_1" = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , directory, filepath, ghc, ghc-boot, ghc-paths, haddock-library - , hspec, hspec-discover, QuickCheck, transformers, xhtml - }: - mkDerivation { - pname = "haddock-api"; - version = "2.23.1"; - sha256 = "14dl17ajlr8354rmc49w4fsqxmrn0dl7wps3r4iipms5nhj5bm3d"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base bytestring containers deepseq directory filepath ghc - ghc-boot ghc-paths haddock-library transformers xhtml - ]; - testHaskellDepends = [ - array base bytestring containers deepseq directory filepath ghc - ghc-boot ghc-paths haddock-library hspec QuickCheck transformers - xhtml - ]; - testToolDepends = [ hspec-discover ]; - description = "A documentation-generation tool for Haskell libraries"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - "haddock-api" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , directory, exceptions, filepath, ghc, ghc-boot, ghc-boot-th @@ -135901,27 +136474,6 @@ self: { broken = true; }) {}; - "haddock-library_1_7_0" = callPackage - ({ mkDerivation, base, base-compat, bytestring, containers, deepseq - , hspec, hspec-discover, parsec, QuickCheck, text, transformers - }: - mkDerivation { - pname = "haddock-library"; - version = "1.7.0"; - sha256 = "04fhcjk0pvsaqvsgp2w06cv2qvshq1xs1bwc157q4lmkgr57khp7"; - libraryHaskellDepends = [ - base bytestring containers parsec text transformers - ]; - testHaskellDepends = [ - base base-compat bytestring containers deepseq hspec parsec - QuickCheck text transformers - ]; - testToolDepends = [ hspec-discover ]; - description = "Library exposing some functionality of Haddock"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "haddock-library" = callPackage ({ mkDerivation, base, base-compat, containers, deepseq, directory , filepath, hspec, hspec-discover, optparse-applicative, parsec @@ -136526,10 +137078,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.16.2.2"; - sha256 = "0hnqf4xxgf1qgk262qvq0b0mx51jfv67y2kn6ca8jsp43dxy9941"; - revision = "1"; - editedCabalFile = "10ifx60yb8fi9y8xmqb446nzgqs5r0jh0cbrwkm2iy8valb8z63x"; + version = "4.16.3.0"; + sha256 = "1m6kr9ph3ja3y2b6j1i2rk349v8ikqwjjj1z0my6p5ld77abz8qk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -136744,8 +137294,8 @@ self: { pname = "hakyll-convert"; version = "0.3.0.5"; sha256 = "0xnv0dxfajk4jl0d1a33cjpca21wnrvvm1194jxar58gqp9i0hr5"; - revision = "1"; - editedCabalFile = "168838k3w1aixhd7rq21yrdvrrsp6va4zxmmqkn0j3fhn3fm6a4r"; + revision = "2"; + editedCabalFile = "0lmjwkwaj3kmg8mfll4bf0mj7xnrgqw36qqi0pn6xmgyrdy1nhds"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138612,15 +139162,13 @@ self: { }) {}; "happstack-static-routing" = callPackage - ({ mkDerivation, base, containers, happstack-server, list-tries - , transformers - }: + ({ mkDerivation, base, containers, happstack-server, list-tries }: mkDerivation { pname = "happstack-static-routing"; - version = "0.7.0.0"; - sha256 = "0k2rdn2bvqmmnf46xqmczaaq6l0vx5mm7c2q5mr9kjr1g9gq53gh"; + version = "0.7.0.1"; + sha256 = "050zdxx1fp7yi1dfp3ls5cmqd435bqnj9ian77yi1sbdlk558a0a"; libraryHaskellDepends = [ - base containers happstack-server list-tries transformers + base containers happstack-server list-tries ]; description = "Support for static URL routing with overlap detection for Happstack"; license = lib.licenses.bsd3; @@ -138710,6 +139258,23 @@ self: { mainProgram = "happy"; }) {}; + "happy_2_1_2" = callPackage + ({ mkDerivation, array, base, containers, happy-lib, mtl, process + }: + mkDerivation { + pname = "happy"; + version = "2.1.2"; + sha256 = "0d8cpm1h7hnap55a7lv7k0cprg80cm1ryqwm8qbq2wxiwkjnap3p"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ array base containers happy-lib mtl ]; + testHaskellDepends = [ base process ]; + description = "Happy is a parser generator for Haskell"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + mainProgram = "happy"; + }) {}; + "happy-arbitrary" = callPackage ({ mkDerivation, aeson, alex, array, base, bytestring, containers , data-fix, extra, file-embed, groom, happy, hspec, hspec-discover @@ -138763,6 +139328,19 @@ self: { broken = true; }) {}; + "happy-lib" = callPackage + ({ mkDerivation, array, base, containers, mtl, transformers }: + mkDerivation { + pname = "happy-lib"; + version = "2.1.2"; + sha256 = "1nj94l70y34k8k7hlhh7vrh2sl0n23rs2fbhpb10dms95cs94hih"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ array base containers mtl transformers ]; + doHaddock = false; + description = "Happy is a parser generator for Haskell implemented using this library"; + license = lib.licenses.bsd2; + }) {}; + "happy-meta" = callPackage ({ mkDerivation, array, base, containers, fail, happy , haskell-src-meta, mtl, template-haskell @@ -138777,6 +139355,7 @@ self: { libraryToolDepends = [ happy ]; description = "Quasi-quoter for Happy parsers"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.artem ]; }) {}; "happybara" = callPackage @@ -139085,6 +139664,43 @@ self: { broken = true; }) {}; + "harpie" = callPackage + ({ mkDerivation, adjunctions, base, distributive, doctest-parallel + , first-class-families, prettyprinter, QuickCheck + , quickcheck-instances, random, vector, vector-algorithms + }: + mkDerivation { + pname = "harpie"; + version = "0.1.1.0"; + sha256 = "18f49jjkf3zf20bmd9rfan768wlkaggikr1r6px354mfkfs8nb36"; + libraryHaskellDepends = [ + adjunctions base distributive first-class-families prettyprinter + QuickCheck quickcheck-instances random vector vector-algorithms + ]; + testHaskellDepends = [ base doctest-parallel ]; + description = "Haskell array programming"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "harpie-numhask" = callPackage + ({ mkDerivation, adjunctions, base, doctest-parallel + , first-class-families, harpie, numhask, prettyprinter + }: + mkDerivation { + pname = "harpie-numhask"; + version = "0.1.0.1"; + sha256 = "1688gkwabg3ijnqq65j3nwrwdx2r6qb38dpchkm6wckycpy7i8f2"; + libraryHaskellDepends = [ + adjunctions base first-class-families harpie numhask + ]; + testHaskellDepends = [ base doctest-parallel prettyprinter ]; + description = "numhask shim for harpie"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "harpy" = callPackage ({ mkDerivation, array, base, containers, disassembler, mtl, parsec , pretty, template-haskell @@ -139287,8 +139903,8 @@ self: { }: mkDerivation { pname = "hascard"; - version = "0.6.0.1"; - sha256 = "1fw5vmlbj4mp1q2a4rkhwmbi1iqf6yz4zcn44z9ffn1him1k1zsk"; + version = "0.6.0.2"; + sha256 = "0k1x373033cbs811i8f8gv2yy4rljp1vs2h0jv6rl91fwjvkhcin"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139485,6 +140101,22 @@ self: { mainProgram = "hash-addressed"; }) {}; + "hash-cons" = callPackage + ({ mkDerivation, async, base, hashable, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "hash-cons"; + version = "0.2.0.0"; + sha256 = "0dyg0xx8bxmh97p58bd8znlxjbld54af7q6blrsmaqqfvv4amxhn"; + libraryHaskellDepends = [ base hashable ]; + testHaskellDepends = [ + async base hashable tasty tasty-hunit tasty-quickcheck + ]; + description = "Opportunistic hash-consing data structure"; + license = lib.licenses.bsd3; + }) {}; + "hash-store" = callPackage ({ mkDerivation, base, base16-bytestring, blake2, bytestring , directory, filepath @@ -139696,6 +140328,8 @@ self: { pname = "hashed-storage"; version = "0.5.11"; sha256 = "0s8mnayxlvwrrii2l63b372yi5g08br6gpbgz2256d8y128mwjvk"; + revision = "1"; + editedCabalFile = "05jbnj9mijyai8g1ppkk5v52f4cvybkpki4wcqkm4nlgddyy0lx2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140909,8 +141543,8 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.26.10"; - sha256 = "1njgrs1rqngw128z8dvc69l3v9bpr4apa153anmg1cjv8ji91rqm"; + version = "0.26.12"; + sha256 = "0qq2c5s7w0vaa01rpwv02qjrr1sd618vy2k25l55nb0hxzf9z3zi"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal attoparsec base bytestring Cabal containers directory @@ -140927,8 +141561,8 @@ self: { ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.26.6"; - sha256 = "101ksx4nfacl2k3pf75iycvyk5yrjsp5jmqj0368sk7v5ppdw669"; + version = "0.26.8"; + sha256 = "19sp8yi9inxq7vqw6zpf2rlk56algxajkf8gyl0iqbx95kb4x1bb"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; @@ -141148,8 +141782,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "haskell-lexer"; - version = "1.1.1"; - sha256 = "0jgkv1api3w7i9j5z01h7qdx2i9cp93h54hp9hj1bw9hk9bdmvn8"; + version = "1.1.2"; + sha256 = "07b8vij3x90px9zm3zmfy55f8zja8wcy8m0kpbpa94gdzxmmpagk"; libraryHaskellDepends = [ base ]; description = "A fully compliant Haskell 98 lexer"; license = lib.licenses.mit; @@ -141697,10 +142331,8 @@ self: { ({ mkDerivation, array, base, happy, pretty, syb }: mkDerivation { pname = "haskell-src"; - version = "1.0.4"; - sha256 = "1spkhv83hy5v1lxs44l3w53vk8zj7gnx42c40hrkj4fcz6apdiwb"; - revision = "1"; - editedCabalFile = "0dfjzq0sxxcalqxygp2svx4890qx8b4amad0xldwy1f4xrp3lsnb"; + version = "1.0.4.1"; + sha256 = "1fgg7wriwan4bfgmwan8q8mryrcdcikksjr26a9fpi7csccbwhv0"; libraryHaskellDepends = [ array base pretty syb ]; libraryToolDepends = [ happy ]; description = "Support for manipulating Haskell source code"; @@ -143466,8 +144098,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "1.5.12"; - sha256 = "19v7bwy3c3xwvsgxnch8p68fw67h0yy89sppjwhbndk2f5avshgq"; + version = "1.5.13"; + sha256 = "1bkwv3f494kqz9a7mmry831mfp3dkhz1zv209lgnl5k8kgf6a22z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144371,18 +145003,19 @@ self: { "hasmtlib" = callPackage ({ mkDerivation, array, attoparsec, base, bitvec, bytestring , containers, data-default, dependent-map, finite-typelits, lens - , mtl, smtlib-backends, smtlib-backends-process, some, text - , unordered-containers, utf8-string, vector-sized + , lifted-base, monad-control, mtl, smtlib-backends + , smtlib-backends-process, some, text, unordered-containers + , utf8-string, vector-sized }: mkDerivation { pname = "hasmtlib"; - version = "2.6.1"; - sha256 = "004dic90jsf65z6y8zv0ik3bb9ln1zw5b42kgdm5a4cg97q02fy2"; + version = "2.7.1"; + sha256 = "0bp183vdhc93sb8nhph3mvcl3v6f7x7hkqbj6ihmrgv2ipvykha1"; libraryHaskellDepends = [ array attoparsec base bitvec bytestring containers data-default - dependent-map finite-typelits lens mtl smtlib-backends - smtlib-backends-process some text unordered-containers utf8-string - vector-sized + dependent-map finite-typelits lens lifted-base monad-control mtl + smtlib-backends smtlib-backends-process some text + unordered-containers utf8-string vector-sized ]; description = "A monad for interfacing with external SMT solvers"; license = lib.licenses.gpl3Only; @@ -144396,8 +145029,8 @@ self: { }: mkDerivation { pname = "haspara"; - version = "0.0.0.8"; - sha256 = "1yvzzkv0hbki5a5rp6md2kllrslafb26lkz4i9hfydllxqgrm0is"; + version = "0.0.0.10"; + sha256 = "0b80519m7g2iww89wj1vs6hz9sfkv8iv904si9wl83f0adh7r99w"; libraryHaskellDepends = [ aeson base containers data-default exceptions hashable megaparsec mtl refined safe-decimal scientific template-haskell text time @@ -144465,7 +145098,7 @@ self: { license = lib.licenses.mit; }) {}; - "hasql_1_8_0_2" = callPackage + "hasql_1_8_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , bytestring-strict-builder, contravariant, contravariant-extras , criterion, dlist, hashable, hashtables, hspec, hspec-discover @@ -144476,8 +145109,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1.8.0.2"; - sha256 = "0dgvbvvkn7d5khz5p97ndbw6j72zram986yn6m519ng3c30d51q9"; + version = "1.8.1.1"; + sha256 = "11k4c4rm77j575nzvizmb0ym1zzjrhbrflayzlb7yjkvjn4m2hww"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-strict-builder contravariant dlist hashable hashtables iproute mtl @@ -144759,8 +145392,8 @@ self: { pname = "hasql-listen-notify"; version = "0.1.0.1"; sha256 = "00pcbps2hdjd3i1xxsfgai81hgzc24cpj8n1iqg4xf7pd2c6cps4"; - revision = "2"; - editedCabalFile = "0lhn9axmzn9ps5s919yxhzl4fj35m0n1jizl8flbz2mn062z5w26"; + revision = "3"; + editedCabalFile = "1kln7wzfagcv7nq4a9lkgbc2dc2qxsxc47f8m45afra39grq9mw7"; libraryHaskellDepends = [ base bytestring hasql mtl postgresql-libpq text ]; @@ -144827,14 +145460,14 @@ self: { mainProgram = "hasql-notifications"; }) {}; - "hasql-notifications_0_2_3_0" = callPackage + "hasql-notifications_0_2_3_1" = callPackage ({ mkDerivation, base, bytestring, hasql, hasql-pool, hspec , postgresql-libpq, QuickCheck, text }: mkDerivation { pname = "hasql-notifications"; - version = "0.2.3.0"; - sha256 = "1wr6wgsmgkk834mzadgvpdfj9w9nap262kzaiadhvgy58ffapc4y"; + version = "0.2.3.1"; + sha256 = "1xjnf37b9b4r4q635dgzbfm44vpypppba02s3vjpd2d9krvs0yav"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145216,8 +145849,8 @@ self: { }: mkDerivation { pname = "hasql-transaction-io"; - version = "0.2.7.0"; - sha256 = "1z7xi1akm4cd2gzgmihv62mza253n4qxfbvcgd7117zb8mvyn6mz"; + version = "0.2.8.0"; + sha256 = "13zrr0shici3cpx0slhsb0qrvxj5sd5zr1dfnvg32gwkg91nqvgb"; libraryHaskellDepends = [ base bytestring bytestring-tree-builder exceptions hasql mtl resourcet safe-exceptions transformers unliftio-core @@ -145254,8 +145887,8 @@ self: { }: mkDerivation { pname = "hasqlator-mysql"; - version = "0.2.0"; - sha256 = "1dl72axgr6jaz9m243krys9x2svsrc7rnanc4pfvjx9w5648j3mq"; + version = "0.2.1"; + sha256 = "02hkkv2f0zck15dfmdrfr6vw9ma4xifv4jmz5crkyvmr68jw6n4d"; libraryHaskellDepends = [ aeson base binary bytestring containers dlist io-streams megaparsec mtl mysql-haskell optics-core pretty-simple prettyprinter @@ -146823,8 +147456,8 @@ self: { }: mkDerivation { pname = "hdf5"; - version = "1.8.12"; - sha256 = "07hcb2hld6wh5d8av77rzj1pr3gj5xpnk4364ks7xr38hx6lmiz3"; + version = "1.8.13"; + sha256 = "1xi2y1f2z19j12f8ggakvwji9y0v56q45c5mlg27ds0aih4y2rmz"; libraryHaskellDepends = [ base bindings-DSL bytestring libffi lifted-base monad-control primitive tagged transformers vector @@ -147659,8 +148292,8 @@ self: { pname = "hedgehog-classes"; version = "0.2.5.4"; sha256 = "0z9ik5asddc2pnz430jsi1pyahkh6jy36ng0vwm7ywcq7cvhcvlz"; - revision = "3"; - editedCabalFile = "1fgvv1bmipai8dh8vin92lzi642n5c8vynmvi3wfi4mynlacm5zb"; + revision = "5"; + editedCabalFile = "19jxkb9dszkvch4cd30n4nsp36p86xdbgqbliqv836m2qwayjmyp"; libraryHaskellDepends = [ aeson base binary comonad containers hedgehog pretty-show primitive semirings silently transformers vector wl-pprint-annotated @@ -148046,8 +148679,8 @@ self: { pname = "hedn"; version = "0.3.0.4"; sha256 = "06js9mcif99k8bfyrsynlg1w5rjygydk5l0qhlrk6pa5v288a7wv"; - revision = "2"; - editedCabalFile = "1ws1l3nkjqlkiy0l1kj4gw8hfz6sqi070i6k8828x4364126njd9"; + revision = "3"; + editedCabalFile = "0yaxvs2ywl1scpp2hjqlivhbxgd7qmn5ilzx8hzz59q1z9x075v4"; libraryHaskellDepends = [ base containers deepseq deriving-compat megaparsec parser-combinators prettyprinter scientific template-haskell text @@ -148068,8 +148701,8 @@ self: { pname = "hedn-functor"; version = "0.1.0.0"; sha256 = "1s90az6akimfq6jwiyicns7v34ryp8riymj0ski1sl4ljjm4r4fi"; - revision = "2"; - editedCabalFile = "188w6bm6l235afsidhidcc166b2rv1xmmh1d0jxrdc69z2wdxiyy"; + revision = "3"; + editedCabalFile = "1yzg11lri9i52rw8a462j7xwazb8kbc0j8q3c2c6igzibmdmc1mb"; libraryHaskellDepends = [ base containers hedn recursion-schemes text vector ]; @@ -148096,56 +148729,62 @@ self: { }) {}; "heftia" = callPackage - ({ mkDerivation, base, constraints, data-effects, extensible, free - , kan-extensions, membership, mtl, singletons-base, singletons-th - , tasty, tasty-discover, tasty-hunit, transformers - , transformers-base, unliftio + ({ mkDerivation, base, data-effects, mtl, tasty, tasty-discover + , tasty-hunit, unliftio }: mkDerivation { pname = "heftia"; - version = "0.3.0.0"; - sha256 = "1brmn77ihnx2a7w64ikw9n8ym4gkaw7zkz5ycrc5dfzsl9ai220s"; - libraryHaskellDepends = [ - base constraints data-effects extensible free kan-extensions - membership mtl singletons-base singletons-th transformers - transformers-base unliftio - ]; + version = "0.5.0.0"; + sha256 = "0y906qlpz903gk08gvgzav02adhxqz561aqy9jbrpn5wh3jqshrn"; + libraryHaskellDepends = [ base data-effects mtl unliftio ]; testHaskellDepends = [ base tasty tasty-hunit ]; testToolDepends = [ tasty-discover ]; - description = "higher-order effects done right"; + description = "higher-order algebraic effects done right"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; }) {}; "heftia-effects" = callPackage - ({ mkDerivation, base, containers, data-effects, extensible, extra - , free, ghc-typelits-knownnat, heftia, hspec, mtl, tasty - , tasty-discover, tasty-hspec, text, time, transformers - , unbounded-delays, unliftio + ({ mkDerivation, base, bytestring, co-log-core, containers + , data-effects, eff, effectful, eveff, extra, filepath + , freer-simple, fused-effects, ghc-typelits-knownnat, heftia, hspec + , logict, mpeff, mtl, polysemy, process, tasty, tasty-bench + , tasty-discover, tasty-hspec, text, time, unbounded-delays + , unliftio }: mkDerivation { pname = "heftia-effects"; - version = "0.3.0.0"; - sha256 = "00lgnsnyn0rwhgnzfdq6kq5wxcs3w6d6awcj65kikhp9ysnv0j5n"; + version = "0.5.0.0"; + sha256 = "0bhjj3hhvhid4vk1vfzgqpy2wpb725nwlgkc5xqy6y1ihqkf65r5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-effects extensible extra free - ghc-typelits-knownnat heftia mtl time transformers unbounded-delays + base bytestring co-log-core containers data-effects + ghc-typelits-knownnat heftia process text time unbounded-delays unliftio ]; executableHaskellDepends = [ - base data-effects extra ghc-typelits-knownnat heftia text time + base bytestring co-log-core containers data-effects extra filepath + ghc-typelits-knownnat heftia process text time unbounded-delays + unliftio ]; testHaskellDepends = [ - base data-effects ghc-typelits-knownnat heftia hspec tasty - tasty-hspec unliftio + base bytestring co-log-core containers data-effects + ghc-typelits-knownnat heftia hspec process tasty tasty-hspec text + time unbounded-delays unliftio ]; testToolDepends = [ tasty-discover ]; - description = "higher-order effects done right"; + benchmarkHaskellDepends = [ + base bytestring co-log-core containers data-effects eff effectful + eveff freer-simple fused-effects ghc-typelits-knownnat heftia + logict mpeff mtl polysemy process tasty-bench text time + unbounded-delays unliftio + ]; + description = "higher-order algebraic effects done right"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - }) {}; + broken = true; + }) {eff = null;}; "hegg" = callPackage ({ mkDerivation, base, containers, deepseq, tasty, tasty-bench @@ -148357,6 +148996,8 @@ self: { pname = "helf"; version = "1.0.20240318"; sha256 = "0rmjfbai6k6kzynzm5skz4ska0awb012m4ykqhh47sd28vs9spk1"; + revision = "1"; + editedCabalFile = "151jk61357vydckahj0rhphph0yn8qm243p3rzvqi27w65969lyy"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -148773,8 +149414,8 @@ self: { }: mkDerivation { pname = "heptapod"; - version = "1.0.0.0"; - sha256 = "0a25m30q0blsmylj2k8qjnp4nkx06fyxdn73p3cbp15y5l128i2h"; + version = "1.1.0.0"; + sha256 = "0s7fq0rh0aax7rfqd49li64n9kw86l8i75mzrkqrpd945xb3zkn9"; libraryHaskellDepends = [ base bytestring entropy time uuid-types ]; @@ -149426,6 +150067,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "hetero-parameter-list" = callPackage + ({ mkDerivation, base, data-default, template-haskell }: + mkDerivation { + pname = "hetero-parameter-list"; + version = "0.1.0.19"; + sha256 = "0lbjpk29kvmbrxji68x4f50bmfrwx9v5z28hsm47xihwb1xv2mih"; + libraryHaskellDepends = [ base data-default template-haskell ]; + testHaskellDepends = [ base data-default template-haskell ]; + description = "hetero list with parameter list"; + license = lib.licenses.bsd3; + }) {}; + + "hetero-parameter-list-with-typelevel-tools" = callPackage + ({ mkDerivation, base, hetero-parameter-list, template-haskell + , typelevel-tools-yj + }: + mkDerivation { + pname = "hetero-parameter-list-with-typelevel-tools"; + version = "0.1.0.1"; + sha256 = "03glr22wjr0xpsdsvpzdgqi8cqpzf7481nih1i4m3ma6gn6p4i08"; + libraryHaskellDepends = [ + base hetero-parameter-list template-haskell typelevel-tools-yj + ]; + testHaskellDepends = [ + base hetero-parameter-list template-haskell typelevel-tools-yj + ]; + description = "Hetero parameter list with type level tools"; + license = lib.licenses.bsd3; + }) {}; + "hetero-zip" = callPackage ({ mkDerivation, base, infinite-list }: mkDerivation { @@ -149739,25 +150410,12 @@ self: { ({ mkDerivation, base, bytestring, extra }: mkDerivation { pname = "hexml"; - version = "0.3.4"; - sha256 = "0amy5gjk1sqj5dq8a8gp7d3z9wfhcflhxkssijnklnfn5s002x4k"; - libraryHaskellDepends = [ base bytestring extra ]; - testHaskellDepends = [ base bytestring ]; - description = "XML subset DOM parser"; - license = lib.licenses.bsd3; - }) {}; - - "hexml_0_3_5" = callPackage - ({ mkDerivation, base, bytestring, extra }: - mkDerivation { - pname = "hexml"; version = "0.3.5"; sha256 = "15mjy6cxihh4bwdi0mh2vawqimpylzvl0jnpxwgalg96dsnj30a1"; libraryHaskellDepends = [ base bytestring extra ]; testHaskellDepends = [ base bytestring ]; description = "XML subset DOM parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hexml-lens" = callPackage @@ -149790,8 +150448,8 @@ self: { pname = "hexpat"; version = "0.20.13"; sha256 = "1l9zfp69r3xaxi2znjwpcrx7xckcqvaahv2c0qgkqq61a7ka1qa6"; - revision = "2"; - editedCabalFile = "1c3v93rmddyvsjpnc7lyhjhv4rki7rl6s3x2rm449vhc4i8ykhcg"; + revision = "3"; + editedCabalFile = "1y5dxv4pc408di2v7dx4cn9fy987ihahqws1qka1qkwc99dmqbkc"; libraryHaskellDepends = [ base bytestring containers deepseq List text transformers utf8-string @@ -150348,6 +151006,8 @@ self: { pname = "hgal"; version = "2.0.0.3"; sha256 = "0sla6djvppgrir0kc0h3d558kcrxsk85xi0i7ganragy9vkkr0qx"; + revision = "1"; + editedCabalFile = "1dn493c2ll9sdqhj4dy721gd4pgv9win2s89lqnbfmkkidq34134"; libraryHaskellDepends = [ array base containers mtl ]; testHaskellDepends = [ array base containers extra mtl old-time QuickCheck random @@ -150926,8 +151586,8 @@ self: { }: mkDerivation { pname = "hi-file-parser"; - version = "0.1.6.0"; - sha256 = "1b13lbgmdb50fw3jkbvj2wq19zmklhxam7rfn7k8bqra2z4kbp2r"; + version = "0.1.7.0"; + sha256 = "1rss6j85kj33jfp14qlafqlcbld6ibhhki2rjkdsz8ilchq32hqq"; libraryHaskellDepends = [ base binary bytestring mtl rio text vector ]; @@ -151092,8 +151752,8 @@ self: { pname = "hie-bios"; version = "0.14.0"; sha256 = "1caszgj3x3l13q6w26snx49yqyzjfgiik4403gl3mfalkrgbvk2g"; - revision = "1"; - editedCabalFile = "1g9gagj12jpazrq9zwq8vwv5saf23gqjgcvzcg81q7s4bn115l72"; + revision = "2"; + editedCabalFile = "0an5jy6hqa7v7r4s2lgzcb5sl7jlx5slncf73s4vyplx7qskjcah"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151652,6 +152312,8 @@ self: { pname = "highs-lp"; version = "0.0"; sha256 = "1fx9llq1pfy4ngx99d3i39kkp1pv07wn8qm92abyrmw06qci938r"; + revision = "1"; + editedCabalFile = "0zcg1bf4byiy1y39w13pajdl23r5bd9m3rafrv16rsixnqkldk9v"; libraryHaskellDepends = [ base comfort-array deepseq guarded-allocation linear-programming non-empty QuickCheck storable-record transformers utility-ht @@ -151802,6 +152464,51 @@ self: { mainProgram = "hindent"; }) {}; + "hindent_6_2_0" = callPackage + ({ mkDerivation, async, base, bytestring, Cabal, containers + , criterion, deepseq, Diff, directory, exceptions, filepath + , ghc-lib-parser, ghc-lib-parser-ex, hspec, monad-loops, mtl + , optparse-applicative, path, path-io, regex-tdfa, split, syb + , transformers, unicode-show, utf8-string, yaml + }: + mkDerivation { + pname = "hindent"; + version = "6.2.0"; + sha256 = "05bpsp11cka1l6gmbvsp0fgya8ydx2lh38d3wgq309jf2vmri800"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + async base bytestring Cabal containers deepseq directory exceptions + filepath ghc-lib-parser ghc-lib-parser-ex monad-loops mtl + optparse-applicative path path-io regex-tdfa split syb transformers + unicode-show utf8-string yaml + ]; + executableHaskellDepends = [ + async base bytestring Cabal containers directory exceptions + filepath ghc-lib-parser ghc-lib-parser-ex monad-loops mtl + optparse-applicative path path-io regex-tdfa split syb transformers + unicode-show utf8-string yaml + ]; + testHaskellDepends = [ + async base bytestring Cabal containers Diff directory exceptions + filepath ghc-lib-parser ghc-lib-parser-ex hspec monad-loops mtl + optparse-applicative path path-io regex-tdfa split syb transformers + unicode-show utf8-string yaml + ]; + benchmarkHaskellDepends = [ + async base bytestring Cabal containers criterion deepseq directory + exceptions filepath ghc-lib-parser ghc-lib-parser-ex monad-loops + mtl optparse-applicative path path-io regex-tdfa split syb + transformers unicode-show utf8-string yaml + ]; + doHaddock = false; + description = "Extensible Haskell pretty printer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hindent"; + }) {}; + "hindley-milner" = callPackage ({ mkDerivation, base, containers, data-fix, hspec, mtl , transformers @@ -151972,21 +152679,6 @@ self: { maintainers = [ lib.maintainers.poscat ]; }) {}; - "hinotify_0_3_9" = callPackage - ({ mkDerivation, async, base, containers, directory, unix }: - mkDerivation { - pname = "hinotify"; - version = "0.3.9"; - sha256 = "16fzql0s34my9k1ib4rdjf9fhhijkmmbrvi148f865m51160wj7j"; - revision = "1"; - editedCabalFile = "0df5pak0586626k3ryzg2lb26ys562l3i94jr9vpa0krs8iia209"; - libraryHaskellDepends = [ async base containers directory unix ]; - testHaskellDepends = [ base directory ]; - description = "Haskell binding to inotify"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "hinotify" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , unix @@ -152094,6 +152786,8 @@ self: { pname = "hint"; version = "0.9.0.8"; sha256 = "19xvi3g35983vhvq467d8gxx23zq7zbd4d6awh2ijb84vgbff7zf"; + revision = "1"; + editedCabalFile = "0f5dwazh10drd9xcqg16p0ja8v7bl0j5k8rgkdnp7b70nhzhk6gb"; libraryHaskellDepends = [ base containers directory exceptions filepath ghc ghc-boot ghc-paths random temporary transformers unix @@ -153201,7 +153895,7 @@ self: { ]; }) {}; - "hledger_1_34" = callPackage + "hledger_1_40" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, data-default, Decimal, Diff, directory, extra , filepath, githash, hashable, haskeline, hledger-lib, lucid @@ -153212,8 +153906,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.34"; - sha256 = "08ygx4aavimxzmyvb9303xds455vs72jvkbrj41nca8357118j3z"; + version = "1.40"; + sha256 = "189lbp9dmg9kxik5zg7nk6jm8h5p8hpq1z01zsj8c29x8b8md7b7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153385,8 +154079,8 @@ self: { pname = "hledger-iadd"; version = "1.3.21"; sha256 = "00x0vbfp08kqs1nbknndk9h56hcidf6xnrk0ldz45dvjrmgcv3w2"; - revision = "1"; - editedCabalFile = "1jx773cqq676yvzibp7nzdpmas8i7ahx8j6kfc1sfipk37vz2q0g"; + revision = "2"; + editedCabalFile = "1fzwkbknyi003ysrmlqpdd6qq6bnqdgyznj7jzk0fx7dx5zrqrkm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153418,8 +154112,8 @@ self: { pname = "hledger-interest"; version = "1.6.6"; sha256 = "0hklpg9sgghrcvkrgz7kfr8jc6kwsv8zzpbbg0c3idhbdxwg74d8"; - revision = "4"; - editedCabalFile = "0b1dvr9kyzhm8zf60xvqf2hkad8w6m14fr2prm0fry8lq79gc515"; + revision = "5"; + editedCabalFile = "0gqvjqz05ww3rxvkxg8qhqfnbvqgcbj30705aw39y5mzr2yll0gl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -153491,36 +154185,36 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "hledger-lib_1_34" = callPackage + "hledger-lib_1_40" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base , base-compat, blaze-markup, bytestring, call-stack, cassava , cassava-megaparsec, cmdargs, colour, containers, data-default , Decimal, deepseq, directory, doclayout, doctest, extra - , file-embed, filepath, Glob, hashtables, megaparsec, microlens - , microlens-th, mtl, pager, parser-combinators, pretty-simple - , regex-tdfa, safe, tabular, tasty, tasty-hunit, template-haskell - , terminal-size, text, text-ansi, time, timeit, transformers - , uglymemo, unordered-containers, utf8-string + , file-embed, filepath, Glob, hashtables, lucid, megaparsec + , microlens, microlens-th, mtl, pager, parser-combinators + , pretty-simple, regex-tdfa, safe, tabular, tasty, tasty-hunit + , template-haskell, terminal-size, text, text-ansi, time, timeit + , transformers, uglymemo, unordered-containers, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.34"; - sha256 = "0789zyz5lbd67mphr8qq8wryni6dkf3759ah9fb7cm2wr5wwvd85"; + version = "1.40"; + sha256 = "05kap7kgjlh3y7j6ld0jqih21ad7acxd9cv18h0gb7kbwn7qm8vi"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs colour containers data-default Decimal deepseq directory - doclayout extra file-embed filepath Glob hashtables megaparsec - microlens microlens-th mtl pager parser-combinators pretty-simple - regex-tdfa safe tabular tasty tasty-hunit template-haskell - terminal-size text text-ansi time timeit transformers uglymemo - unordered-containers utf8-string + doclayout extra file-embed filepath Glob hashtables lucid + megaparsec microlens microlens-th mtl pager parser-combinators + pretty-simple regex-tdfa safe tabular tasty tasty-hunit + template-haskell terminal-size text text-ansi time timeit + transformers uglymemo unordered-containers utf8-string ]; testHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs colour containers data-default Decimal deepseq directory - doclayout doctest extra file-embed filepath Glob hashtables + doclayout doctest extra file-embed filepath Glob hashtables lucid megaparsec microlens microlens-th mtl pager parser-combinators pretty-simple regex-tdfa safe tabular tasty tasty-hunit template-haskell terminal-size text text-ansi time timeit @@ -153609,7 +154303,7 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hledger-ui_1_34" = callPackage + "hledger-ui_1_40" = callPackage ({ mkDerivation, ansi-terminal, async, base, brick, cmdargs , containers, data-default, directory, doclayout, extra, filepath , fsnotify, githash, hledger, hledger-lib, megaparsec, microlens @@ -153618,10 +154312,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.34"; - sha256 = "0w80bl6m98hsjzdpj5vjd768qs32vf8vdqzg6srh2z3pl36pjiki"; - revision = "1"; - editedCabalFile = "09ipwnyswhgx3jg9fp5b22qwk8xph9h80806l73s4rzk9h6nhh7x"; + version = "1.40"; + sha256 = "0rvijrnmkc21nllqcbkn6fh51ifp1n1p8qgmckfp5pngqg40vvnz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153696,7 +154388,7 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hledger-web_1_34" = callPackage + "hledger-web_1_40" = callPackage ({ mkDerivation, aeson, base, base64, blaze-html, blaze-markup , bytestring, case-insensitive, clientsession, cmdargs, conduit , conduit-extra, containers, data-default, Decimal, directory @@ -153709,8 +154401,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.34"; - sha256 = "1h39gjpdddnyryig4713pq9ipixzavr0mb7wlmzr5sbzqmnshbds"; + version = "1.40"; + sha256 = "1dsvsgdan7f8zc0z9x4zri2q6ccajvqpjpv18zj488ihknshiwgq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153833,34 +154525,6 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) libsass;}; - "hlint_3_2_8" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs - , containers, cpphs, data-default, directory, extra, file-embed - , filepath, filepattern, ghc-lib-parser, ghc-lib-parser-ex - , hscolour, process, refact, text, transformers, uniplate - , unordered-containers, utf8-string, vector, yaml - }: - mkDerivation { - pname = "hlint"; - version = "3.2.8"; - sha256 = "14nvq71kn1lhqx02r69f949p33rhxi466fwmxj9g0wd5191jawrs"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-terminal base bytestring cmdargs containers cpphs - data-default directory extra file-embed filepath filepattern - ghc-lib-parser ghc-lib-parser-ex hscolour process refact text - transformers uniplate unordered-containers utf8-string vector yaml - ]; - executableHaskellDepends = [ base ]; - description = "Source code suggestions"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "hlint"; - maintainers = [ lib.maintainers.maralorn ]; - }) {}; - "hlint_3_4_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, data-default, deriving-aeson, directory, extra @@ -155538,8 +156202,8 @@ self: { }: mkDerivation { pname = "hmp3-ng"; - version = "2.14.3"; - sha256 = "02bcxzpmjm6kqcvx7036055chbyfyhi6pl4xrrxwwmkp85fh0apb"; + version = "2.15.0"; + sha256 = "12h06yzp3jiswfy95bryppc352wfkn666c17bd4g00v7k3qnda6p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155889,8 +156553,8 @@ self: { }: mkDerivation { pname = "hnix-store-nar"; - version = "0.1.0.0"; - sha256 = "1kr8hmycb29sv646a3f3lpl0zzng9dg3nix7n0yfrfapycqd04cg"; + version = "0.1.1.0"; + sha256 = "16g03bvgdmpmzvq1acsayfq4b9xh7cgf41xn9bqjl0w72var67qp"; libraryHaskellDepends = [ algebraic-graphs base bytestring case-insensitive cereal containers directory filepath lifted-base monad-control mtl text unix @@ -157398,7 +158062,7 @@ self: { "hopenpgp-tools" = callPackage ({ mkDerivation, aeson, alex, array, base, base16-bytestring , binary, binary-conduit, bytestring, conduit, conduit-extra - , containers, cryptonite, directory, errors, fgl, graphviz, happy + , containers, crypton, directory, errors, fgl, graphviz, happy , hOpenPGP, http-client, http-client-tls, http-types, ixset-typed , lens, memory, monad-loops, mtl, openpgp-asciiarmor , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal @@ -157407,13 +158071,13 @@ self: { }: mkDerivation { pname = "hopenpgp-tools"; - version = "0.23.8"; - sha256 = "009l8c4zzbmh8q8x9f7zj21ysvma03ksxdknjfcb7z189mafb2qm"; + version = "0.23.10"; + sha256 = "0aaf0k26i5zjnijhnyng7jyhx6qdq2fdzq4idlmj3va386rfm2as"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson array base base16-bytestring binary binary-conduit bytestring - conduit conduit-extra containers cryptonite directory errors fgl + conduit conduit-extra containers crypton directory errors fgl graphviz hOpenPGP http-client http-client-tls http-types ixset-typed lens memory monad-loops mtl openpgp-asciiarmor optparse-applicative prettyprinter prettyprinter-ansi-terminal @@ -158145,8 +158809,8 @@ self: { }: mkDerivation { pname = "hp2pretty"; - version = "0.10"; - sha256 = "1irm8mvcib39r8imdx7y7jisp162i0rwk8w3irs2j746c8vhyv12"; + version = "0.10.1"; + sha256 = "1wx3vxrx8qp85wfhpvv5vjxd45hmgy8m807m62b32ydxpw8mm89k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -158158,48 +158822,6 @@ self: { mainProgram = "hp2pretty"; }) {}; - "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 - , infer-license, interpolate, mockery, mtl, pretty, QuickCheck - , scientific, template-haskell, temporary, text, transformers - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "hpack"; - version = "0.36.0"; - sha256 = "0ypaagr7a5bvziybbzr3b4lixs3dv6fdkjj3lq7h71z51wd4xpm0"; - revision = "1"; - editedCabalFile = "1zh5rsf38xmwp7lf80iifrhnkl80lri4xzlhz2n5df3vc0dqzya8"; - 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"; - }) {}; - "hpack" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, crypton, deepseq, directory, filepath, Glob, hspec @@ -159559,6 +160181,8 @@ self: { benchmarkHaskellDepends = [ base optparse-applicative text time ]; description = "Haskell bindings for ASAP:O"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {libasapo-consumer = null; libasapo-producer = null;}; "hs-aws-lambda" = callPackage @@ -160562,8 +161186,8 @@ self: { pname = "hs-php-session"; version = "0.0.9.3"; sha256 = "1xwdikiqy2dxyzr6wx51wy51vifsvshblx7kkhfqd7izjf87ww8f"; - revision = "1"; - editedCabalFile = "1dj1r73v31bd2091pqvrg7vdc3lgjh373ynxn49dlhqmyw45kiw8"; + revision = "2"; + editedCabalFile = "00c8grlybwb22r5rqw82lmplgr3njkpij8ns1rx0caz2g6xr91xb"; libraryHaskellDepends = [ base bytestring ]; description = "PHP session and values serialization"; license = lib.licenses.bsd3; @@ -160843,6 +161467,25 @@ self: { broken = true; }) {}; + "hs-tango" = callPackage + ({ mkDerivation, base, derive-storable, http-media, lucid2, servant + , servant-server, tango, text, unliftio, warp + }: + mkDerivation { + pname = "hs-tango"; + version = "2.0.0"; + sha256 = "1d78icf12k7zj1v4gnms8ddfj1ji6kzcx0r1jws4cri0y4rzwdlk"; + libraryHaskellDepends = [ base derive-storable text unliftio ]; + libraryPkgconfigDepends = [ tango ]; + benchmarkHaskellDepends = [ + base http-media lucid2 servant servant-server text warp + ]; + description = "Bindings to the Tango Controls system"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) tango;}; + "hs-term-emulator" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring , containers, criterion, hspec, hspec-discover, lens, text, vector @@ -161003,6 +161646,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Create ATS types from Haskell types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hs2ats"; }) {}; @@ -161400,8 +162044,8 @@ self: { pname = "hsc2hs"; version = "0.68.10"; sha256 = "0xpgbi6pssnizazz54583c50cz4axq3h78g03q4sfb7yi3bk8kkg"; - revision = "2"; - editedCabalFile = "099303623kck9pv6x0q2dzvwb3w39v5dazn3wryafcnwc1n8prv0"; + revision = "3"; + editedCabalFile = "0ndpgzmq2h2kv7xr9iaf957jnnykbjpd6vlii0n2rkahfckjaqr7"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -163059,8 +163703,8 @@ self: { ({ mkDerivation, base, bytestring, hslua-core, tasty, tasty-lua }: mkDerivation { pname = "hslua-list"; - version = "1.1.1"; - sha256 = "0p70rvvpkq598qpmyccyv6v44rh2glrl8l6vhk7kmy5k4g5gi39n"; + version = "1.1.4"; + sha256 = "0lyrk95nnsdwi3zfaf4blvih49002wy5hxjj7l49ryc93padkvyk"; libraryHaskellDepends = [ base bytestring hslua-core ]; testHaskellDepends = [ base hslua-core tasty tasty-lua ]; description = "Opinionated, but extensible Lua list type"; @@ -163096,12 +163740,31 @@ self: { pname = "hslua-module-doclayout"; version = "1.1.1.2"; sha256 = "1bgs6p20maqdwmqjv8nqsmlk63sjhb54icqs7d1kxsk8k9hh65qg"; + revision = "1"; + editedCabalFile = "0nxb6hm71v9lk9622z4kf30aasdr3m6b13maq8zd496i45msi4v4"; + libraryHaskellDepends = [ base doclayout hslua text ]; + testHaskellDepends = [ + base doclayout hslua tasty tasty-hunit tasty-lua text + ]; + description = "Lua module wrapping Text.DocLayout."; + license = lib.licenses.mit; + }) {}; + + "hslua-module-doclayout_1_2_0" = callPackage + ({ mkDerivation, base, doclayout, hslua, tasty, tasty-hunit + , tasty-lua, text + }: + mkDerivation { + pname = "hslua-module-doclayout"; + version = "1.2.0"; + sha256 = "1x3znkdz1l8p8gsvazz85936p107xscsaah1ac3padyiswhair1j"; libraryHaskellDepends = [ base doclayout hslua text ]; testHaskellDepends = [ base doclayout hslua tasty tasty-hunit tasty-lua text ]; description = "Lua module wrapping Text.DocLayout."; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hslua-module-path" = callPackage @@ -163825,6 +164488,7 @@ self: { testHaskellDepends = [ base hspec ]; description = "Helper functions to simplify adding integration tests"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hspec-discover_2_7_10" = callPackage @@ -164007,25 +164671,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "hspec-golden_0_1_0_3" = callPackage - ({ mkDerivation, base, directory, hspec, hspec-core - , optparse-applicative, silently - }: - mkDerivation { - pname = "hspec-golden"; - version = "0.1.0.3"; - sha256 = "1d5ab34n0f1wk1q86qlb7x2b49abzzh08jh7j52nbrvnxld2j64l"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base directory hspec-core ]; - executableHaskellDepends = [ base directory optparse-applicative ]; - testHaskellDepends = [ base directory hspec hspec-core silently ]; - description = "Golden tests for hspec"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - mainProgram = "hgold"; - }) {}; - "hspec-golden" = callPackage ({ mkDerivation, ansi-terminal, base, directory, filepath, hspec , hspec-core, hspec-discover, optparse-applicative, silently @@ -164306,8 +164951,8 @@ self: { }: mkDerivation { pname = "hspec-need-env"; - version = "0.1.0.10"; - sha256 = "13ms7ifdszwgmvvv1lbyqs53l86li0k639f3f9blfkz3lk3qx2kn"; + version = "0.1.0.11"; + sha256 = "1hsrrpp3dq47sr7khdd2cliyhwhiinjhkzg612nqxcz0whs00sgh"; libraryHaskellDepends = [ base hspec-core hspec-expectations ]; testHaskellDepends = [ base hspec hspec-core setenv transformers ]; testToolDepends = [ hspec-discover ]; @@ -165199,10 +165844,8 @@ self: { }: mkDerivation { pname = "hstar"; - version = "0.1.0.6"; - sha256 = "0fcb37yi81059r2nqmq1809q5mdx8q2fyvs7b9fsj3j2fqmgnai6"; - revision = "2"; - editedCabalFile = "0ncj58a8rkwkwlcv50q5i6c9szss0kp0gbx8z38ycx1fhniig5qv"; + version = "0.1.0.7"; + sha256 = "00y5napbsbxdi3yjl9sj23zncqmxhnvdjppc2pwzj53xynpa4x94"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -166163,8 +166806,8 @@ self: { ({ mkDerivation, base, http-api-data, text }: mkDerivation { pname = "htmx"; - version = "0.1.0.1"; - sha256 = "06wnjhjgimggfhl2510lxwabqr5hdzb7yqlbmv9mi01c50q6idam"; + version = "0.1.0.2"; + sha256 = "1nc3v9gc3xvjj25djzhr5kii7cxf17mwshdipx2d2b95sngmp6yq"; libraryHaskellDepends = [ base http-api-data text ]; description = "Use htmx with various haskell libraries"; license = lib.licenses.mit; @@ -166176,8 +166819,8 @@ self: { ({ mkDerivation, base, htmx, lucid2, text }: mkDerivation { pname = "htmx-lucid"; - version = "0.2.0.0"; - sha256 = "1ilr1xarmavzfcy53asazk64gkww7wsjsmz0jyrbr4qj076dqj36"; + version = "0.2.0.1"; + sha256 = "0746z1y7w4x2qnraii23z5r1swdwdx07lz6ymjm1z3ia1m6zfz78"; libraryHaskellDepends = [ base htmx lucid2 text ]; description = "Use htmx with lucid"; license = lib.licenses.mit; @@ -166188,8 +166831,8 @@ self: { ({ mkDerivation, base, htmx, htmx-lucid, lucid2, servant, text }: mkDerivation { pname = "htmx-servant"; - version = "0.2.0.1"; - sha256 = "0vwj3d34ada0iskjr4k7a75x6hf750b71acjphnwddpqf233mfla"; + version = "0.2.0.2"; + sha256 = "0v6y6rpb5cwx7mbkkri8yqzikpfqzznblix3i1vag9crfydd8nq5"; libraryHaskellDepends = [ base htmx htmx-lucid lucid2 servant text ]; @@ -166751,8 +167394,8 @@ self: { }: mkDerivation { pname = "http-client-rustls"; - version = "0.0.1.0"; - sha256 = "1yx93cfvn8zqvsrl2bg6zv12acvmbz2d66wyhb7w53jib7gwzk8z"; + version = "0.0.2.0"; + sha256 = "03cl1nbbdjqnmk6yrzxf8sj8nr9zdkm5byvz300pp5ixgvvmnl05"; libraryHaskellDepends = [ base bytestring http-client network resourcet rustls text ]; @@ -166802,18 +167445,18 @@ self: { "http-client-tls" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers - , crypton, crypton-connection, data-default-class, exceptions - , gauge, hspec, http-client, http-types, memory, network - , network-uri, text, tls, transformers + , crypton, crypton-connection, data-default, exceptions, gauge + , hspec, http-client, http-types, memory, network, network-uri + , text, tls, transformers }: mkDerivation { pname = "http-client-tls"; - version = "0.3.6.3"; - sha256 = "15chmlnq0nk2kxhk65r9xdjkzl94k0axcml89a5qkdiffwyzrp1q"; + version = "0.3.6.4"; + sha256 = "18qqzif376hv5lqv1c7sp4b90mq5cyfhybip472j9fcaxrph0mkp"; libraryHaskellDepends = [ base bytestring case-insensitive containers crypton - crypton-connection data-default-class exceptions http-client - http-types memory network network-uri text tls transformers + crypton-connection data-default exceptions http-client http-types + memory network network-uri text tls transformers ]; testHaskellDepends = [ base crypton-connection hspec http-client http-types @@ -166862,46 +167505,16 @@ self: { "http-conduit" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base , blaze-builder, bytestring, case-insensitive, conduit - , conduit-extra, cookie, crypton-connection, data-default-class - , hspec, http-client, http-client-tls, http-types, HUnit, mtl - , network, resourcet, streaming-commons, temporary, text, time, tls - , transformers, unliftio, unliftio-core, utf8-string, wai - , wai-conduit, warp, warp-tls - }: - mkDerivation { - pname = "http-conduit"; - version = "2.3.8.3"; - sha256 = "1x6pvpcjndxm26plk29v5nfz19rnci4fjzbamidpjaidi990jlba"; - libraryHaskellDepends = [ - aeson attoparsec attoparsec-aeson base bytestring conduit - conduit-extra http-client http-client-tls http-types mtl resourcet - transformers unliftio-core - ]; - testHaskellDepends = [ - aeson attoparsec-aeson base blaze-builder bytestring - case-insensitive conduit conduit-extra cookie crypton-connection - data-default-class hspec http-client http-types HUnit network - resourcet streaming-commons temporary text time tls transformers - unliftio utf8-string wai wai-conduit warp warp-tls - ]; - doCheck = false; - description = "HTTP client package with conduit interface and HTTPS support"; - license = lib.licenses.bsd3; - }) {}; - - "http-conduit_2_3_9" = callPackage - ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base - , blaze-builder, bytestring, case-insensitive, conduit - , conduit-extra, cookie, crypton-connection, data-default-class - , hspec, http-client, http-client-tls, http-types, HUnit, mtl - , network, resourcet, streaming-commons, temporary, text, time, tls + , conduit-extra, cookie, crypton-connection, data-default, hspec + , http-client, http-client-tls, http-types, HUnit, mtl, network + , resourcet, streaming-commons, temporary, text, time, tls , transformers, unliftio, unliftio-core, utf8-string, wai , wai-conduit, warp, warp-tls }: mkDerivation { pname = "http-conduit"; - version = "2.3.9"; - sha256 = "0mg9l71lcilgc5mfc6syw71hqk17jc7f880s63zrwvfxnhc2cvi9"; + version = "2.3.9.1"; + sha256 = "1bs12v0vh4ik87imfp4xrvpyr3kb3dm4m8y8h1djlcyjxhans10k"; libraryHaskellDepends = [ aeson attoparsec attoparsec-aeson base bytestring conduit conduit-extra http-client http-client-tls http-types mtl resourcet @@ -166910,14 +167523,13 @@ self: { testHaskellDepends = [ aeson attoparsec-aeson base blaze-builder bytestring case-insensitive conduit conduit-extra cookie crypton-connection - data-default-class hspec http-client http-types HUnit network - resourcet streaming-commons temporary text time tls transformers - unliftio utf8-string wai wai-conduit warp warp-tls + data-default hspec http-client http-types HUnit network resourcet + streaming-commons temporary text time tls transformers unliftio + utf8-string wai wai-conduit warp warp-tls ]; doCheck = false; description = "HTTP client package with conduit interface and HTTPS support"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "http-conduit-browser" = callPackage @@ -167576,6 +168188,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "http-semantics_0_3_0" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive + , http-types, network, network-byte-order, time-manager + , utf8-string + }: + mkDerivation { + pname = "http-semantics"; + version = "0.3.0"; + sha256 = "0kviffsmvggzpbwxnqxshjq3w3yz5v367l5fywq9zcmzrc5ykklw"; + libraryHaskellDepends = [ + array base bytestring case-insensitive http-types network + network-byte-order time-manager utf8-string + ]; + description = "HTTP senmatics libarry"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "http-server" = callPackage ({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix , url, utf8-string @@ -167729,41 +168359,6 @@ self: { broken = true; }) {}; - "http2_3_0_3" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, async, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, filepath, gauge, Glob, heaps, hspec - , hspec-discover, http-types, mwc-random, network - , network-byte-order, network-run, psqueues, stm, text - , time-manager, typed-process, unix-time, unordered-containers - , vector - }: - mkDerivation { - pname = "http2"; - version = "3.0.3"; - sha256 = "1kv99i3pnnx31xndlkaczrpd2j5mvzbqlfz1kaw6cwlwkdnl5bhv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array async base bytestring case-insensitive containers http-types - network network-byte-order psqueues stm time-manager unix-time - ]; - testHaskellDepends = [ - aeson aeson-pretty async base base16-bytestring bytestring - cryptonite directory filepath Glob hspec http-types network - network-byte-order network-run text typed-process - unordered-containers vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - array base bytestring case-insensitive containers gauge heaps - mwc-random network-byte-order psqueues stm - ]; - description = "HTTP/2 library"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "http2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, bytestring, case-insensitive, containers @@ -167797,36 +168392,36 @@ self: { license = lib.licenses.bsd3; }) {}; - "http2_5_3_4" = callPackage + "http2_5_3_5" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, bytestring, case-insensitive, containers , criterion, crypton, directory, filepath, Glob, hspec , hspec-discover, http-semantics, http-types, iproute, network , network-byte-order, network-control, network-run, random, stm - , text, time-manager, typed-process, unix-time, unliftio + , text, time-manager, typed-process, unix-time , unordered-containers, utf8-string, vector }: mkDerivation { pname = "http2"; - version = "5.3.4"; - sha256 = "006l2asgkcgdiyknl363n3wfdmaxbqnnf9kls4ljqxvc677l2jj3"; + version = "5.3.5"; + sha256 = "0zfcfm59yd0i2d9mlcaig3jjc4hsgqzbvjkkl3yiydcx2nk53a3m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array async base bytestring case-insensitive containers http-semantics http-types iproute network network-byte-order - network-control stm time-manager unix-time unliftio utf8-string + network-control stm time-manager unix-time utf8-string ]; testHaskellDepends = [ aeson aeson-pretty async base base16-bytestring bytestring crypton directory filepath Glob hspec http-semantics http-types network - network-byte-order network-run random text typed-process unliftio + network-byte-order network-run random text typed-process unordered-containers vector ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ array base bytestring case-insensitive containers criterion - network-byte-order stm unliftio + network-byte-order stm ]; description = "HTTP/2 library"; license = lib.licenses.bsd3; @@ -167948,20 +168543,19 @@ self: { "http2-tls" = callPackage ({ mkDerivation, base, bytestring, crypton-x509-store - , crypton-x509-validation, data-default-class, http2, network - , network-control, network-run, recv, time-manager, tls, unliftio - , utf8-string + , crypton-x509-validation, http2, network, network-control + , network-run, recv, time-manager, tls, utf8-string }: mkDerivation { pname = "http2-tls"; - version = "0.4.2"; - sha256 = "0fqdad7lrw7m942xl3k0yipm2qr48j3qd14a9a6m87dv2rypsqg4"; + version = "0.4.4"; + sha256 = "0l7nplayw4l8rw13ic12l3czcdb0nvf5snxa4q851jgfbl35agv4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring crypton-x509-store crypton-x509-validation - data-default-class http2 network network-control network-run recv - time-manager tls unliftio utf8-string + base bytestring crypton-x509-store crypton-x509-validation http2 + network network-control network-run recv time-manager tls + utf8-string ]; description = "Library for HTTP/2 over TLS"; license = lib.licenses.bsd3; @@ -167974,23 +168568,23 @@ self: { , bytestring, case-insensitive, conduit, conduit-extra, containers , crypton, hspec, hspec-discover, http-semantics, http-types, http2 , iproute, network, network-byte-order, quic, QuickCheck, sockaddr - , stm, time-manager, tls, unliftio + , stm, time-manager, tls }: mkDerivation { pname = "http3"; - version = "0.0.18"; - sha256 = "1wmh13irvsfkbzmg1xh5p68xqhvs21hr9dk3dk845xdn269vxidq"; + version = "0.0.19"; + sha256 = "0vdxxsmgfzjwlhph9p2biiyw14l90kpwv04h8c0q55xxfg8plkgf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array async base bytestring case-insensitive containers http-semantics http-types http2 network network-byte-order quic - sockaddr stm time-manager unliftio + sockaddr stm time-manager ]; testHaskellDepends = [ - attoparsec base base16-bytestring bytestring conduit conduit-extra - crypton hspec http-semantics http-types http2 iproute network quic - QuickCheck stm tls unliftio + async attoparsec base base16-bytestring bytestring conduit + conduit-extra crypton hspec http-semantics http-types http2 iproute + network quic QuickCheck stm tls ]; testToolDepends = [ hspec-discover ]; description = "HTTP/3 library"; @@ -169625,8 +170219,8 @@ self: { }: mkDerivation { pname = "hw-kafka-avro"; - version = "6.0.1"; - sha256 = "1910yzn569x9iicd8c8ykkq3p5vz3py6d4j0pvwqy1h07xp528sk"; + version = "6.0.2"; + sha256 = "13lrmpglh31srd74a1ch68g723x08wns9sapmlckm1bzs6jj7s06"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169816,27 +170410,27 @@ self: { "hw-polysemy" = callPackage ({ mkDerivation, aeson, aeson-pretty, amazonka-s3, async, base , binary, 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 + , filepath, generic-lens, ghc-prim, http-conduit, hw-prelude, lens + , microlens, mtl, network, polysemy, polysemy-log, polysemy-plugin + , polysemy-time, prettyprinter, process, resourcet, stm, tasty + , tasty-discover, tasty-hedgehog, temporary, testcontainers, text + , time, transformers, ulid, unliftio, yaml }: mkDerivation { pname = "hw-polysemy"; - version = "0.2.14.2"; - sha256 = "08cllz3vm444yzvds9b5057l235gs5ardy9x9fbkagdryids6afp"; + version = "0.3.0.2"; + sha256 = "0pmzlv7vff2n8lak4hwc0gzlfnh5ja51ss3wr2lbzq2chy5f9n5i"; libraryHaskellDepends = [ aeson aeson-pretty async base binary 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 + hw-prelude lens microlens mtl network polysemy polysemy-log + polysemy-plugin polysemy-time prettyprinter process resourcet stm + temporary testcontainers text time transformers ulid unliftio yaml ]; testHaskellDepends = [ - amazonka-s3 base filepath generic-lens lens polysemy polysemy-log - polysemy-plugin tasty tasty-discover tasty-hedgehog testcontainers - text + amazonka-s3 base filepath generic-lens hw-prelude lens polysemy + polysemy-log polysemy-plugin tasty tasty-discover tasty-hedgehog + testcontainers text ]; testToolDepends = [ tasty-discover ]; doHaddock = false; @@ -169845,6 +170439,23 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "hw-prelude" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, contravariant + , directory, filepath, generic-lens, microlens, network, process + , resourcet, text, unliftio + }: + mkDerivation { + pname = "hw-prelude"; + version = "0.0.0.3"; + sha256 = "0z15ms53y4j4flzwh0x4683dmnadpyrzdirdbjgcs0mrppqk5az5"; + libraryHaskellDepends = [ + aeson async base bytestring contravariant directory filepath + generic-lens microlens network process resourcet text unliftio + ]; + description = "Opinionated prelude library"; + license = lib.licenses.asl20; + }) {}; + "hw-prim" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, directory , doctest, doctest-discover, exceptions, ghc-prim, hedgehog, hspec @@ -170852,21 +171463,21 @@ self: { "hydra" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , directory, filepath, hspec, hspec-discover, HsYAML, HUnit + , directory, filepath, hspec, hspec-discover, HsYAML, HUnit, mtl , QuickCheck, scientific, split, text, vector }: mkDerivation { pname = "hydra"; - version = "0.5.1"; - sha256 = "0jg4dailiw0h8img3syhkxdzdlh3z11lya5azaqf0ki5kwh349n8"; + version = "0.8.0"; + sha256 = "1zbr11xabk4va286084wxyx49fmc3xc3wqfrx4h80mwqx9w5gr8b"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring containers directory filepath - HsYAML scientific split text vector + HsYAML mtl scientific split text vector ]; testHaskellDepends = [ aeson aeson-pretty base bytestring containers directory filepath - hspec hspec-discover HsYAML HUnit QuickCheck scientific split text - vector + hspec hspec-discover HsYAML HUnit mtl QuickCheck scientific split + text vector ]; testToolDepends = [ hspec-discover ]; description = "Type-aware transformations for data and programs"; @@ -171341,8 +171952,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "hypergeometric"; - version = "0.1.4.0"; - sha256 = "153j8ml8gqgmgzd6aybwcwvrnafgz54myl42l293mj64kcc1yc9r"; + version = "0.1.5.1"; + sha256 = "1ylirwvbn1npc0c1cq5a1hf9z58nxihmijzxd8jil1ag46f0c3mh"; libraryHaskellDepends = [ base ]; description = "Hypergeometric functions"; license = lib.licenses.agpl3Only; @@ -171761,17 +172372,18 @@ self: { "iCalendar" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring - , case-insensitive, containers, data-default, mime, mtl, network + , case-insensitive, containers, data-default, mime, mtl , network-uri, old-locale, parsec, text, time }: mkDerivation { pname = "iCalendar"; - version = "0.4.0.5"; - sha256 = "1s1pnwbp6bnsyswrw4vz8hr33jrfd4xs8vnpvrh57a75jdskgsn0"; + version = "0.4.1.0"; + sha256 = "1nh2gdmm1kd8dlflxwzdqg9xdylqblb7xhnhpl143j1wfcnd1cn4"; + revision = "2"; + editedCabalFile = "1410vr0dlmnc1g7h780nwigdk2wpnhyg47a1rfn55d2qgs8lk93r"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive containers - data-default mime mtl network network-uri old-locale parsec text - time + data-default mime mtl network-uri old-locale parsec text time ]; description = "iCalendar data types, parser, and printer"; license = lib.licenses.bsd3; @@ -172491,6 +173103,8 @@ self: { doHaddock = false; description = "Branch on whether a constraint is satisfied"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ifcxt" = callPackage @@ -172698,7 +173312,7 @@ self: { mainProgram = "ihaskell"; }) {}; - "ihaskell_0_11_0_0" = callPackage + "ihaskell_0_12_0_0" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring , cmdargs, containers, directory, exceptions, filepath, ghc , ghc-boot, ghc-parser, ghc-paths, ghc-syntax-highlighter @@ -172709,8 +173323,8 @@ self: { }: mkDerivation { pname = "ihaskell"; - version = "0.11.0.0"; - sha256 = "1mjjsmjvapkmj69qzp9sskgxi04fymacvy0la7lr1rcrl9z5x5hd"; + version = "0.12.0.0"; + sha256 = "0syydbzws1gb9xsrfxwxsczskywm91mr7m6qljqhh2vwi1x4v0ch"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -173395,18 +174009,19 @@ self: { "imm" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, atom-conduit, base , beam-core, beam-sqlite, blaze-html, blaze-markup, bytestring - , chronos, co-log, conduit, containers, dhall, directory, filepath - , http-client, http-types, microlens, mime-mail, monad-time - , optparse-applicative, parsec, parsers, pipes, pipes-bytestring - , pipes-http, prettyprinter, prettyprinter-ansi-terminal, refined - , relude, rss-conduit, safe, safe-exceptions, sqlite-simple, stm - , stm-chans, streamly, text, time, timerep, typed-process - , typerep-map, uri-bytestring, xml-conduit, xml-types + , chronos, conduit, containers, dhall, directory, fast-logger + , filepath, http-client, http-types, microlens, mime-mail + , monad-time, optparse-applicative, parsec, parsers, pipes + , pipes-bytestring, pipes-http, prettyprinter + , prettyprinter-ansi-terminal, refined, relude, req, rss-conduit + , safe, safe-exceptions, sqlite-simple, stm, stm-chans, streamly + , streamly-core, text, time, timerep, typed-process, uri-bytestring + , xml-conduit, xml-types }: mkDerivation { pname = "imm"; - version = "2.1.1.0"; - sha256 = "1w3kypakf8zqz8r44r9bx0z5v4wxvhnf446jzarawn9fg7yigcqn"; + version = "2.1.3.0"; + sha256 = "02m8jylzj0lwfcs51c99kfbabblb2r3ds4whrqr1sg8yhm4w8lhc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -173419,12 +174034,12 @@ self: { ]; executableHaskellDepends = [ aeson async base beam-core beam-sqlite blaze-html blaze-markup - bytestring chronos co-log conduit containers dhall directory + bytestring chronos conduit containers dhall directory fast-logger filepath http-types microlens mime-mail monad-time optparse-applicative pipes pipes-bytestring pipes-http - prettyprinter prettyprinter-ansi-terminal refined relude safe - safe-exceptions sqlite-simple stm stm-chans streamly text time - typed-process typerep-map uri-bytestring xml-conduit xml-types + prettyprinter prettyprinter-ansi-terminal refined relude req safe + safe-exceptions sqlite-simple stm stm-chans streamly streamly-core + text time typed-process uri-bytestring xml-conduit xml-types ]; description = "Execute arbitrary actions for each item from RSS/Atom feeds"; license = lib.licenses.cc0; @@ -174009,14 +174624,16 @@ self: { license = "BSD-2-Clause-Patent"; }) {}; - "incipit-base_0_6_0_0" = callPackage + "incipit-base_0_6_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-default, stm , text }: mkDerivation { pname = "incipit-base"; - version = "0.6.0.0"; - sha256 = "15mmnixl4ny32h5aflqcq8kv37zhddhqwixa53mkz6ksrrdkpsxc"; + version = "0.6.1.0"; + sha256 = "1vlvwhgn4wfb6gaw1rld1qa1b54dvsymri0mf9x737faah0arhpy"; + revision = "1"; + editedCabalFile = "0gg499hfbi7fs7pffh00md4wdz2bcpm3wg2cqrb3kyr16y6nri1j"; libraryHaskellDepends = [ base bytestring containers data-default stm text ]; @@ -174038,12 +174655,12 @@ self: { license = "BSD-2-Clause-Patent"; }) {}; - "incipit-core_0_6_0_0" = callPackage + "incipit-core_0_6_1_0" = callPackage ({ mkDerivation, base, incipit-base, polysemy }: mkDerivation { pname = "incipit-core"; - version = "0.6.0.0"; - sha256 = "103fxzx6riyx5scfw340gj5dldxia7zw1i0xk5bkfbn1p5fw3sf4"; + version = "0.6.1.0"; + sha256 = "19m4pvrv6fyxj7ilns3ipfjhibmhgcrjz376djadbqb8fzxba2xb"; libraryHaskellDepends = [ base incipit-base polysemy ]; description = "A Prelude for Polysemy"; license = "BSD-2-Clause-Patent"; @@ -175445,8 +176062,8 @@ self: { pname = "inspection-testing"; version = "0.5.0.3"; sha256 = "1kh6lrcdyfnj0c8fqrllb21hfmnlsrllw6jkkg4hya0f9lqf4mgi"; - revision = "2"; - editedCabalFile = "01qs82sldkjvyjkdf2r96g4n480d2dwrncrlzl6k49b4py9hfdll"; + revision = "3"; + editedCabalFile = "1b66i5h8vbj3d3dn99wy6sffppfz8iywpwwdivxnxvn645crywa8"; libraryHaskellDepends = [ base containers ghc mtl template-haskell transformers ]; @@ -175785,8 +176402,8 @@ self: { }: mkDerivation { pname = "int-like"; - version = "0.1.2"; - sha256 = "09874k3ria5nwb6rv2z3hgfxcm5hynvb2qgbyr7i09nwj4021hgq"; + version = "0.1.3"; + sha256 = "0rp22jdrgsl5ka087cjr3h6qvjs516rajd5cdxxjh154ymj5kzxz"; libraryHaskellDepends = [ algebraic-graphs base containers deepseq hashable ]; @@ -176233,8 +176850,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "intermediate-structures"; - version = "0.1.1.0"; - sha256 = "1jx9zhb1gwj79v6wh7536awqfnym1a3px9shcjrzz9br37ybiw8v"; + version = "0.1.2.0"; + sha256 = "1wf6g0a1pz6xiixqnkrdjlb2xr4ck2vab9vd0w6kp0pbhqc6qysp"; libraryHaskellDepends = [ base ]; description = "Some simple functions to deal with transformations from structures to other ones, basically lists"; license = lib.licenses.mit; @@ -176461,6 +177078,8 @@ self: { pname = "interpolation"; version = "0.1.1.2"; sha256 = "0y61hwm4xfa1wna4xk61c5p3b3z8i589lz6cxkk2pbaifydccxy0"; + revision = "1"; + editedCabalFile = "179papjalxxl2nsmcv95xz9kjdha148ljyz4syr581f1fn5vklzd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base utility-ht ]; @@ -176591,8 +177210,8 @@ self: { ({ mkDerivation, base, hedgehog, transformers }: mkDerivation { pname = "interval-functor"; - version = "0.0.0.0"; - sha256 = "0fkpqav61s47mjvfkhbg2hrx6p78v3jrs6vjj75aixccfg4k8n43"; + version = "0.0.0.1"; + sha256 = "0nvv9axfin3lmcbq0d5vhzd00gpz5hy2rczhz69jrvxm7wg0y0wi"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base hedgehog ]; description = "Intervals of functors"; @@ -176918,6 +177537,8 @@ self: { pname = "invertible-grammar"; version = "0.1.3.5"; sha256 = "01g4lf31hgv8dqabmabkp6zld6v2l3a2mv9wcgyfxghfrd6dspdw"; + revision = "1"; + editedCabalFile = "04xlxfqhyapb2wzzzfvzk6pr11w4rfqyi1axvsk1mxlrihyvl6yy"; libraryHaskellDepends = [ base bifunctors containers mtl prettyprinter profunctors semigroups tagged template-haskell text transformers @@ -177049,6 +177670,19 @@ self: { libraryHaskellDepends = [ array base io-classes mtl si-timers ]; description = "Experimental MTL instances for io-classes"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + + "io-embed" = callPackage + ({ mkDerivation, base, bytestring, hspec, template-haskell }: + mkDerivation { + pname = "io-embed"; + version = "0.1.0.1"; + sha256 = "0k50rkvak2647w43k083ib1yr845hmlh9wppgjg0fdyvqzxk45vb"; + libraryHaskellDepends = [ base bytestring hspec template-haskell ]; + testHaskellDepends = [ base bytestring hspec template-haskell ]; + description = "Use Template Haskell to embed the result of an IO computation"; + license = lib.licenses.bsd3; }) {}; "io-machine" = callPackage @@ -177622,8 +178256,8 @@ self: { }: mkDerivation { pname = "iproute"; - version = "1.7.14"; - sha256 = "0kvbddh7h5fg5makk0j9hx7wa8si6xmq3rg10w2bv3rwwnsbgw4k"; + version = "1.7.15"; + sha256 = "19abgdk9pk6n8qmvfcpqp282dgbn1mxmg5fsla4xryg6w2kk38qq"; libraryHaskellDepends = [ appar base byteorder bytestring containers network ]; @@ -177823,8 +178457,6 @@ self: { testHaskellDepends = [ base hashable HUnit text ]; description = "IRC core library for glirc"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "irc-ctcp" = callPackage @@ -178398,8 +179030,8 @@ self: { }: mkDerivation { pname = "isomorphism-class"; - version = "0.1.0.12"; - sha256 = "1ffcjf2lic1mvvxfrfi0cc9qnz5qh73yjd3dsaq5p0h0amp8gppr"; + version = "0.1.1"; + sha256 = "1hq78k8msarpxlzdf5rmv6spkbbr2kvp4jjrp2klixzr3hd2ybnk"; libraryHaskellDepends = [ base bytestring containers hashable primitive text unordered-containers vector @@ -179312,8 +179944,8 @@ self: { }: mkDerivation { pname = "jacinda"; - version = "3.1.1.1"; - sha256 = "0jbssi0xq7y153avnd7c9qwnlnaiqdn7kznipi9c03rhax3yxdl1"; + version = "3.2.0.1"; + sha256 = "0d5snl6m9ij81qvsbm949lyh7dwrsvfb725hy87jnigmgkyxzjls"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -179323,7 +179955,9 @@ self: { text transformers vector ]; libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base optparse-applicative text ]; + executableHaskellDepends = [ + base directory optparse-applicative text + ]; testHaskellDepends = [ base bytestring tasty tasty-hunit text ]; benchmarkHaskellDepends = [ base criterion deepseq silently text ]; doHaddock = false; @@ -179890,8 +180524,8 @@ self: { pname = "javelin"; version = "0.1.2.0"; sha256 = "12xzs05dkkbn93yh1f5l7m64j3rifcz9qnd5nqqd62cj6nic10xl"; - revision = "1"; - editedCabalFile = "03pdxr80s9ah2yv3kxs76r1dz0j75zvcaylskm203c3cqg1f7scx"; + revision = "2"; + editedCabalFile = "11aizybgmbvmpjax3lsa99c1jib09sgg85g5xpws7qfggmrwj0h0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181003,6 +181637,18 @@ self: { ]; }) {}; + "jsaddle-wasm" = callPackage + ({ mkDerivation, base, bytestring, jsaddle }: + mkDerivation { + pname = "jsaddle-wasm"; + version = "0.0.1.0"; + sha256 = "1cv0a2nw3y429qa0hb9fv4ddhggf3w8wqawkv3gs981f7np0sg2s"; + libraryHaskellDepends = [ base bytestring jsaddle ]; + doHaddock = false; + description = "Run JSaddle JSM with the GHC WASM backend"; + license = lib.licenses.cc0; + }) {}; + "jsaddle-webkit2gtk" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, gi-gio , gi-glib, gi-gtk, gi-javascriptcore, gi-webkit2, haskell-gi-base @@ -181791,10 +182437,8 @@ self: { }: mkDerivation { pname = "json-sop"; - version = "0.2.2"; - sha256 = "17smxridqmbj1ic2b25kv1byr07lw6phqa1jx98a5yccflwhvmq4"; - revision = "1"; - editedCabalFile = "0k5cxbqf062f2slqq57vm4qr32kd3xa8kn9zmvl06iwwb2fd6zjf"; + version = "0.2.3"; + sha256 = "1yfa6fpc968pyy403dxq9ipk4k2xl16pjdimm0n8bn7766ihcszb"; libraryHaskellDepends = [ aeson base generics-sop lens-sop tagged text time transformers unordered-containers vector @@ -181813,8 +182457,8 @@ self: { }: mkDerivation { pname = "json-spec"; - version = "0.5.0.1"; - sha256 = "19kbipnr0v5pg95bvjc2j8wznyri9i0mb2ldx5zp9a1x5kmifwm7"; + version = "1.1.0.0"; + sha256 = "1mv0k9z1zqhklq6pqpx73b9f5wlcqnl0hj5h4n5i2qq6w2bwpi1g"; libraryHaskellDepends = [ aeson base containers scientific text time vector ]; @@ -181834,8 +182478,8 @@ self: { }: mkDerivation { pname = "json-spec-elm"; - version = "0.4.0.3"; - sha256 = "13gwqcgi08wc0zjx5vd5sx83rqp2nlh6wiyzh8idagv4f3xnm174"; + version = "0.4.0.5"; + sha256 = "17gna98c9x3zf7pc3yc1908si1v5l7vy5avrpc2gkdwnjaq6daq6"; libraryHaskellDepends = [ base bound containers elm-syntax json-spec mtl text ]; @@ -181853,8 +182497,8 @@ self: { }: mkDerivation { pname = "json-spec-elm-servant"; - version = "0.4.1.1"; - sha256 = "0g81dzs512rmgzk6h817d04sdacbdhd19j2qkmihlj6xzjd3gmbf"; + version = "0.4.2.2"; + sha256 = "1l2ykpjb8xv80sb7y08al3yxxvix8a55r5cg7f0sqyfkamyvqh8i"; libraryHaskellDepends = [ base bound containers directory elm-syntax filepath http-types json-spec json-spec-elm mtl prettyprinter process servant text @@ -181876,8 +182520,8 @@ self: { }: mkDerivation { pname = "json-spec-openapi"; - version = "0.3.1.1"; - sha256 = "1dq93wscynxzkknwwad7alvi6n7908j7nzzgz7q5753wbxwqj5yp"; + version = "1.0.0.0"; + sha256 = "1ail9zydaq68iiyha8gnc0z4gf8ra9kmn11p6x3ammv66mw9vpsr"; libraryHaskellDepends = [ aeson base insert-ordered-containers json-spec lens openapi3 text ]; @@ -181913,8 +182557,8 @@ self: { }: mkDerivation { pname = "json-stream"; - version = "0.4.5.3"; - sha256 = "0jysj25x98kw5326a0n08bygm70yc4l1y9ajyf1bca8003m5smvx"; + version = "0.4.6.0"; + sha256 = "0w59673565sjhcal7rk69v79fz5hal4fr8xj9jg3w7n3z5f849ym"; libraryHaskellDepends = [ aeson base bytestring containers primitive scientific text unordered-containers vector @@ -181994,6 +182638,43 @@ self: { broken = true; }) {}; + "json-to-type" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , directory, filepath, GenericPretty, hashable, lens, mtl + , optparse-applicative, pretty, process, QuickCheck + , run-haskell-module, scientific, smallcheck, template-haskell + , text, uniplate, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "json-to-type"; + version = "4.0.1"; + sha256 = "0hpki40mvmc3hla3y9hw1w5mfk96ickgm6lmyrnc79n272i7ygm5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers data-default filepath GenericPretty hashable + lens mtl pretty process QuickCheck run-haskell-module scientific + smallcheck template-haskell text uniplate unordered-containers + vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers filepath GenericPretty hashable + lens mtl optparse-applicative pretty process scientific + template-haskell text uniplate unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath GenericPretty + hashable lens mtl optparse-applicative pretty process QuickCheck + scientific smallcheck template-haskell text uniplate + unordered-containers vector + ]; + description = "Automatic type declaration for JSON input data"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "json-to-type"; + broken = true; + }) {}; + "json-togo" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-trans, base , bytestring, scientific, text, transformers, unordered-containers @@ -182349,6 +183030,8 @@ self: { pname = "jsonpath"; version = "0.3.0.0"; sha256 = "10a2wbkhdg2x61qpfvb4cl89plhvwy5nc5qqqs5jnll7kg4cabyi"; + revision = "1"; + editedCabalFile = "0k13cdhcpkh605i5pgb0vbg9q0xkq8gjm2pja4kfij4z41ila9ix"; libraryHaskellDepends = [ aeson base megaparsec scientific text unordered-containers vector ]; @@ -182408,8 +183091,8 @@ self: { }: mkDerivation { pname = "jsonrpc-tinyclient"; - version = "1.0.0.0"; - sha256 = "02xhijk3rk4c9yqh1ghs8gvi1r7fwbxba0h21nb23545wflg0bz9"; + version = "1.0.1.0"; + sha256 = "1rhfhyjzfazwvzw7xf3f5xccnd7p4wx9n9avbbrjwj2bzvlfn9b8"; libraryHaskellDepends = [ aeson base bytestring exceptions http-client http-client-tls mtl random text websockets @@ -183310,10 +183993,8 @@ self: { }: mkDerivation { pname = "kansas-comet"; - version = "0.4.2"; - sha256 = "01g30ck1nhj8qwz475mvwvmd8nc1yqxl5qi84c957gp116kig2v7"; - revision = "3"; - editedCabalFile = "00wy4v9xdnp4801qww61gpqfshnbymmh4571rs56lq2f1apzifgv"; + version = "0.4.3"; + sha256 = "0c4nm5ns5acg73biysww8jam1v4kj1k9rk96bl6ad5g2nria7hlp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -183499,42 +184180,6 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.8.8.0"; - sha256 = "0p8xxbjfw7jcsbxdvypn3594f44wf6qizyrzmg1vvscqchqfaykl"; - libraryHaskellDepends = [ - aeson async auto-update base bytestring containers either hostname - microlens microlens-th monad-control mtl old-locale resourcet - safe-exceptions scientific semigroups stm string-conv - template-haskell text time transformers transformers-base - transformers-compat unix unliftio-core unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers directory microlens - quickcheck-instances regex-tdfa safe-exceptions stm tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - time time-locale-compat unordered-containers - ]; - benchmarkHaskellDepends = [ - aeson async base blaze-builder criterion deepseq directory filepath - safe-exceptions text time transformers unix - ]; - description = "A structured logging framework"; - license = lib.licenses.bsd3; - }) {}; - - "katip_0_8_8_2" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , bytestring, containers, criterion, deepseq, directory, either - , filepath, hostname, microlens, microlens-th, monad-control, mtl - , old-locale, quickcheck-instances, regex-tdfa, resourcet - , safe-exceptions, scientific, semigroups, stm, string-conv, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell - , text, time, time-locale-compat, transformers, transformers-base - , transformers-compat, unix, unliftio-core, unordered-containers - , vector - }: - mkDerivation { - pname = "katip"; version = "0.8.8.2"; sha256 = "12g0i1ndzzkgf0qgkxx525d742mkfnsdwb9rhi6z8jn5hc38sps4"; libraryHaskellDepends = [ @@ -183556,7 +184201,6 @@ self: { ]; description = "A structured logging framework"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "katip-datadog" = callPackage @@ -183794,6 +184438,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "katip-wai_0_2_0_0" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, case-insensitive + , clock, containers, hspec, hspec-discover, http-client, http-types + , katip, network, stm, text, time, uuid, wai, warp + }: + mkDerivation { + pname = "katip-wai"; + version = "0.2.0.0"; + sha256 = "0n5p0sh961lsj86anx2bpnhhbcaf7y9kvhchqkd18aaw5s899yr3"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive clock containers http-types + katip network text time 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; + hydraPlatforms = lib.platforms.none; + }) {}; + "katt" = callPackage ({ mkDerivation, aeson, base, bytestring, ConfigFile, containers , directory, errors, filepath, lens, mtl, parsec, text, url, wreq @@ -184512,25 +185179,23 @@ self: { , cryptohash-md5, derive-storable, derive-storable-plugin , file-embed, foldl, geomancy, geomancy-layout, GLFW-b, ktx-codec , neat-interpolation, optparse-applicative, optparse-simple - , resourcet, rio, rio-app, serialise, spirv-reflect-ffi + , resourcet, rio, rio-app, serialise, spirv-enum, spirv-reflect-ffi , spirv-reflect-types, StateVar, tagged, template-haskell, text , transformers, unagi-chan, unliftio, vector, vulkan, vulkan-utils , VulkanMemoryAllocator, zstd }: mkDerivation { pname = "keid-core"; - version = "0.1.9.0"; - sha256 = "0gx8hgn52a3hsirna09zn3j8amplp6kp5r8y4wzdr1fz03abas7d"; - revision = "1"; - editedCabalFile = "0wk745437iyyd247q3b8kgdqnysbzcsikbf60cvf3x2ycs8hlb4m"; + version = "0.1.9.1"; + sha256 = "0chyw6l1vzjdgn5mwfp39g2fhsxqs61xyxva2apvbk1xj8qm955g"; libraryHaskellDepends = [ base binary bytestring containers cryptohash-md5 derive-storable derive-storable-plugin file-embed foldl geomancy geomancy-layout GLFW-b ktx-codec neat-interpolation optparse-applicative - optparse-simple resourcet rio rio-app serialise spirv-reflect-ffi - spirv-reflect-types StateVar tagged template-haskell text - transformers unagi-chan unliftio vector vulkan vulkan-utils - VulkanMemoryAllocator zstd + optparse-simple resourcet rio rio-app serialise spirv-enum + spirv-reflect-ffi spirv-reflect-types StateVar tagged + template-haskell text transformers unagi-chan unliftio vector + vulkan vulkan-utils VulkanMemoryAllocator zstd ]; description = "Core parts of Keid engine"; license = lib.licenses.bsd3; @@ -184543,8 +185208,8 @@ self: { }: mkDerivation { pname = "keid-frp-banana"; - version = "0.1.2.0"; - sha256 = "1yaj6mjwqwa99v74bkn42r06l8gxw7cfydwyi013jfgxrjk0kn4l"; + version = "0.1.2.1"; + sha256 = "1zjw8ckzylwxyz8l5s2z62h2s5cpbcasrdbl94gvcx2mrwx1a4yw"; libraryHaskellDepends = [ base geomancy geomancy-layout keid-core reactive-banana resourcet rio these vulkan @@ -184635,8 +185300,8 @@ self: { }: mkDerivation { pname = "keid-ui-dearimgui"; - version = "0.1.3.0"; - sha256 = "07l35z43524gsp65nc7ipg93hdz1ssfd8mm3ifw7qpgc829vp9vl"; + version = "0.1.3.1"; + sha256 = "196w7mwj6wr95p88ij1zadz4908ivrqx5nwgrkc6hqybc4pa7ygh"; libraryHaskellDepends = [ base binary bytestring dear-imgui GLFW-b keid-core resourcet rio rio-app unliftio vector vulkan vulkan-utils VulkanMemoryAllocator @@ -184645,6 +185310,7 @@ self: { license = lib.licenses.bsd3; platforms = [ "x86_64-linux" ]; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "keiretsu" = callPackage @@ -184794,7 +185460,7 @@ self: { mainProgram = "keter"; }) {}; - "keter_2_1_7" = callPackage + "keter_2_1_8" = callPackage ({ mkDerivation, aeson, array, async, attoparsec, base , blaze-builder, bytestring, case-insensitive, conduit , conduit-extra, containers, directory, fast-logger, filepath @@ -184808,8 +185474,8 @@ self: { }: mkDerivation { pname = "keter"; - version = "2.1.7"; - sha256 = "16chqiyqp3cjyf9ci6zkbgngynf0q6jrkw6nzjc6m6s20sr07j1r"; + version = "2.1.8"; + sha256 = "1ba10cd5iiv1ignra11k30cfip3p8sw382735vvigc6gbj6h45wk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184839,11 +185505,12 @@ self: { ({ mkDerivation, aeson, base, containers, HUnit, text }: mkDerivation { pname = "keuringsdienst"; - version = "1.0.0.5"; - sha256 = "1n44yr8r0gassyidr7ika4p421295a8c1z66m0dkm2aqw82hcim3"; + version = "1.0.2.0"; + sha256 = "156z9wxm62s70y83a51lxpjy3c2x0skq2p3jdjdkpwgqa0i7m7yr"; libraryHaskellDepends = [ aeson base containers text ]; testHaskellDepends = [ aeson base containers HUnit text ]; - license = lib.licenses.gpl3Only; + description = "Data validation in Haskell that is composable, made easy and clean"; + license = lib.licenses.lgpl3Only; }) {}; "kevin" = callPackage @@ -184957,10 +185624,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "keycode"; - version = "0.2.2"; - sha256 = "046k8d1h5wwadf5z4pppjkc3g7v2zxlzb06s1xgixc42y5y41yan"; - revision = "11"; - editedCabalFile = "0il646ra0nb0fy1310im1y82w9gh08j6vwi7hw7kpxy1h9q6jp4j"; + version = "0.2.3"; + sha256 = "1zq02yd7ldbyk7zpgq9bj37y52ckzyyrad2yi48amh7dzym1sbj2"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -185617,10 +186282,8 @@ self: { }: mkDerivation { pname = "kmonad"; - version = "0.4.2"; - sha256 = "1d9l16b9srxkkpj61fbz06gxz3y200yn146sdv7h2bbxnjdswia2"; - revision = "2"; - editedCabalFile = "1djchj9c64p0fy3ahzkx3z9wg9dg7pjya3mb6z3wmhjvym8iavvv"; + version = "0.4.3"; + sha256 = "1wd55wx24sbgyq5laibmgn1agdq69333s9j7n44hs47a7hfxdvlv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185628,7 +186291,7 @@ self: { template-haskell time unix unliftio ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base hspec rio ]; testToolDepends = [ hspec-discover ]; description = "Advanced keyboard remapping utility"; license = lib.licenses.mit; @@ -185947,8 +186610,8 @@ self: { }: mkDerivation { pname = "kontrakcja-templates"; - version = "0.12"; - sha256 = "1asmsk3d4wqmiqsxnhaknmnrplrwq6cx6p7n7859rl6x7ac0fjg0"; + version = "0.12.0.1"; + sha256 = "0606qgrhnxm7a4fzh3jy0074vc61c95svfprq4p7i0i8n66v11h9"; libraryHaskellDepends = [ base containers directory exceptions HStringTemplate html json monad-control mtl time transformers transformers-base @@ -186403,6 +187066,25 @@ self: { license = lib.licenses.isc; }) {}; + "kvitable_1_1_0_1" = callPackage + ({ mkDerivation, base, containers, html-parse, lucid, microlens + , named-text, sayable, tasty, tasty-hunit, template-haskell, text + }: + mkDerivation { + pname = "kvitable"; + version = "1.1.0.1"; + sha256 = "1zb2s4fkcsa097x1ch02j6z5k1ya733f74rrs85hcrr8vm1hdgc0"; + libraryHaskellDepends = [ + base containers lucid microlens named-text sayable text + ]; + testHaskellDepends = [ + base html-parse microlens tasty tasty-hunit template-haskell text + ]; + description = "Key/Value Indexed Table container and formatting library"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + }) {}; + "kyotocabinet" = callPackage ({ mkDerivation, base, bytestring, cereal, kyotocabinet }: mkDerivation { @@ -187562,8 +188244,8 @@ self: { pname = "lame"; version = "0.2.2"; sha256 = "0zfjiyabzzkg9mdy8ynf9sa89zcdpvynzhph7svyjxw6a6h0i0mg"; - revision = "1"; - editedCabalFile = "1d12xrg7whm83v60dq01r961svp8dn212qwy108wh8z5v5hvfryp"; + revision = "2"; + editedCabalFile = "11797lagzb5i24b7h0m50k1lxqldlykqyj1f8aka0jzh7a340xlx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring directory exceptions filepath text wave @@ -187751,6 +188433,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Parser and pretty-printer for ATS"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "language-avro" = callPackage @@ -187832,8 +188515,8 @@ self: { }: mkDerivation { pname = "language-c"; - version = "0.9.3"; - sha256 = "0lz2djw7zs8wnp23amqqxdyin3jgbjfh2dr2sr1v0kqpqav3yw81"; + version = "0.9.4"; + sha256 = "0cv2hqg4miajspwndn15s37nkra27bffqm4vv2gkk79nr86k9v31"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath mtl pretty process @@ -187842,7 +188525,6 @@ self: { testHaskellDepends = [ base directory filepath process ]; description = "Analysis and generation of C code"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "language-c-comments" = callPackage @@ -188294,8 +188976,6 @@ self: { testHaskellDepends = [ base hedgehog hspec hspec-hedgehog text ]; description = "Datatypes and parsing/printing functions to represent the Gemini markup language"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "language-glsl" = callPackage @@ -188990,6 +189670,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "language-spir-v" = callPackage + ({ mkDerivation, base, bytestring, c-enum, nowdoc, shaderc + , template-haskell + }: + mkDerivation { + pname = "language-spir-v"; + version = "0.1.0.1"; + sha256 = "034hidvwyl2yzh8wxfaydnsrfbgs12pim3hv33whdvpqzvy4aqlm"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring c-enum nowdoc template-haskell + ]; + libraryPkgconfigDepends = [ shaderc ]; + testHaskellDepends = [ + base bytestring c-enum nowdoc template-haskell + ]; + description = "Data type for SPIR-V"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) shaderc;}; + "language-sqlite" = callPackage ({ mkDerivation, array, base, bytestring, containers, mtl , template-haskell, utf8-string @@ -189239,8 +189939,8 @@ self: { pname = "lapack-ffi-tools"; version = "0.1.3.1"; sha256 = "1mf41wcbxkgiv71c3jjwhsdg9d7qpa88qsifpa5vgplpx2v1p6ya"; - revision = "2"; - editedCabalFile = "1jz2kiy64vbxazhy4bsfcnwd14kqc7g9vk7v6yyw0p0zlhqfzfv5"; + revision = "3"; + editedCabalFile = "19xnq84gw4937zhmj2h8nlrlsikni7qjdm2dbljl1qv68cjs3gjz"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -189299,6 +189999,7 @@ self: { ]; description = "Scalable anonymous records"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "large-anon-testsuite-fourmolu-preprocessor"; }) {}; @@ -189325,30 +190026,32 @@ self: { "large-hashable" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, byteable, bytes - , bytestring, cereal, containers, cryptohash, deepseq, hashable - , HTF, QuickCheck, safecopy, scientific, strict, template-haskell - , text, time, transformers, unordered-containers, utf8-light - , vector, void + , bytestring, cereal, containers, cpphs, criterion, cryptohash + , cryptonite, deepseq, hashable, HTF, inspection-testing, memory + , QuickCheck, safecopy, scientific, strict, template-haskell, text + , time, transformers, unordered-containers, vector, void }: mkDerivation { pname = "large-hashable"; - version = "0.1.0.4"; - sha256 = "13k2k8rqbk40whzn4hpa92ypws2c1gh5fb4zh0diy5m0kxfk9hz9"; - revision = "1"; - editedCabalFile = "1xfl265ryvrjra2nsjvlcmwgilbnxhp8pwxy54wi1ada645nwgbr"; + version = "0.1.1.0"; + sha256 = "0i7xk128c1hp1bw50n4wpbdyd6paqbl6vmnknyymkaaga07g5ba0"; libraryHaskellDepends = [ - aeson base base16-bytestring bytes bytestring containers scientific - strict template-haskell text time transformers unordered-containers - utf8-light vector void + aeson base base16-bytestring bytes bytestring containers cryptonite + memory scientific strict template-haskell text time transformers + unordered-containers vector void ]; + libraryToolDepends = [ cpphs ]; testHaskellDepends = [ - aeson base bytes bytestring containers hashable HTF QuickCheck - scientific strict text time unordered-containers vector + aeson base bytes bytestring containers hashable HTF + inspection-testing QuickCheck scientific strict text time + unordered-containers vector ]; + testToolDepends = [ cpphs ]; benchmarkHaskellDepends = [ - base base16-bytestring byteable bytes bytestring cereal cryptohash - deepseq safecopy text transformers + base base16-bytestring byteable bytes bytestring cereal criterion + cryptohash deepseq safecopy text transformers ]; + benchmarkToolDepends = [ cpphs ]; description = "Efficiently hash (large) Haskell values"; license = lib.licenses.bsd3; badPlatforms = [ "aarch64-linux" ]; @@ -189356,22 +190059,22 @@ self: { }) {}; "large-records" = callPackage - ({ mkDerivation, base, containers, generic-deriving, ghc + ({ mkDerivation, base, containers, generic-deriving, ghc, ghc-prim , large-generics, mtl, newtype, primitive, record-dot-preprocessor , record-hasfield, syb, tasty, tasty-hunit, template-haskell , transformers }: mkDerivation { pname = "large-records"; - version = "0.4.1"; - sha256 = "0z0k8r4im1rzykwgk8wgyy8zv1wcb06fmikgir09bxhymg0fzpw8"; + version = "0.4.2"; + sha256 = "1z61v8vi3ax2pjw0d4k3vznbiziwflgraralrkxv12s3s3kq0pm5"; libraryHaskellDepends = [ base containers ghc large-generics mtl primitive record-dot-preprocessor record-hasfield syb template-haskell transformers ]; testHaskellDepends = [ - base generic-deriving large-generics mtl newtype + base generic-deriving ghc-prim large-generics mtl newtype record-dot-preprocessor record-hasfield tasty tasty-hunit template-haskell transformers ]; @@ -189479,6 +190182,8 @@ self: { pname = "latex"; version = "0.1.0.4"; sha256 = "10m0l0wlrkkl474sdmi7cl6w6kqyqzcp05h7jdacxhzbxyf8nahw"; + revision = "1"; + editedCabalFile = "0ryjw2rsw979b9i7i23b6qf4y192za09f1yhi49czgsf4184sccb"; libraryHaskellDepends = [ base containers utility-ht ]; description = "Parse, format and process LaTeX files"; license = lib.licenses.bsd3; @@ -189642,6 +190347,31 @@ self: { mainProgram = "latex-svg-filter"; }) {}; + "lathe" = callPackage + ({ mkDerivation, base, bytestring, hspec, primitive, random, text + }: + mkDerivation { + pname = "lathe"; + version = "0.1.0.0"; + sha256 = "11ni01fma7rgd16gng8iipd4gqg0aqsmwgxgp0ni1sr02y9yg36c"; + libraryHaskellDepends = [ base bytestring primitive text ]; + testHaskellDepends = [ base bytestring hspec primitive random ]; + description = "Pure incremental byte parser"; + license = lib.licenses.bsd3; + }) {}; + + "lathe-time" = callPackage + ({ mkDerivation, base, bytestring, hspec, lathe, time }: + mkDerivation { + pname = "lathe-time"; + version = "0.1.0.0"; + sha256 = "0w75dlprdd1ppsl3g7kkky6c27wb5l7rm9vg355vmxkxlij7mp83"; + libraryHaskellDepends = [ base bytestring lathe time ]; + testHaskellDepends = [ base bytestring hspec lathe time ]; + description = "lathe + time"; + license = lib.licenses.bsd3; + }) {}; + "lattices" = callPackage ({ mkDerivation, base, containers, deepseq, hashable , integer-logarithms, QuickCheck, quickcheck-instances, tagged @@ -189678,8 +190408,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "4.1.0"; - sha256 = "072ppl47rdvcsliij7swdhzlskq30xdwvj5ag2a7060ax5pv23v2"; + version = "4.3.0"; + sha256 = "0prsix4w6x3413pix2971nlwd1pnz6s8w91wq12wcbvyv6lvlb03"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash exceptions extra generic-lens hashtables http-client @@ -191135,25 +191865,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "lens-aeson_1_1_3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, lens - , scientific, text, unordered-containers, vector - }: - mkDerivation { - pname = "lens-aeson"; - version = "1.1.3"; - sha256 = "05jyn6rn0anhgfmk754gmmpcy5jv3ki213z4v243n9jvdjdlg7ms"; - revision = "1"; - editedCabalFile = "0l1hkkpp4blkhmbpswl6lqww6wpfm327f8knq1lskhnisbnfmj2j"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring lens scientific text - unordered-containers vector - ]; - description = "Law-abiding lenses for aeson"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "lens-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, lens, scientific, text , text-short, unordered-containers, vector @@ -191441,8 +192152,8 @@ self: { pname = "lens-sop"; version = "0.3.0"; sha256 = "145yplksxyk15fyhjssjy5f4z18h1d8bgf25pb1vqdfr10rnffi1"; - revision = "1"; - editedCabalFile = "0gnjfk3na3pk3zm2bppmic7adfpaic051wf6hlfyaysg4acwpxvm"; + revision = "2"; + editedCabalFile = "1qrcpp7wwin7gsbd8r0g7mx4a45wg6sjpl85v6l8dd056s7a9w16"; libraryHaskellDepends = [ base generics-sop optics-core transformers ]; @@ -191663,6 +192374,39 @@ self: { maintainers = [ lib.maintainers.rvl ]; }) {}; + "lentil_1_5_7_0" = callPackage + ({ mkDerivation, base, bytestring, csv, deepseq, directory, dlist + , filemanip, filepath, hspec, hspec-discover, megaparsec, mtl + , natural-sort, optparse-applicative, prettyprinter + , prettyprinter-ansi-terminal, regex-tdfa, semigroups + , terminal-progress-bar, text + }: + mkDerivation { + pname = "lentil"; + version = "1.5.7.0"; + sha256 = "1xd68cfpq78w778j36d6hxsbi7cjdbsaab6ay0ian4b5a0qwnpic"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring csv deepseq directory dlist filemanip filepath + megaparsec mtl natural-sort optparse-applicative prettyprinter + prettyprinter-ansi-terminal regex-tdfa semigroups + terminal-progress-bar text + ]; + testHaskellDepends = [ + base bytestring csv deepseq directory dlist filemanip filepath + hspec megaparsec mtl natural-sort optparse-applicative + prettyprinter prettyprinter-ansi-terminal regex-tdfa semigroups + terminal-progress-bar text + ]; + testToolDepends = [ hspec-discover ]; + description = "frugal issue tracker"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "lentil"; + maintainers = [ lib.maintainers.rvl ]; + }) {}; + "lenz" = callPackage ({ mkDerivation, base, base-unicode-symbols, hs-functors , transformers @@ -192804,28 +193548,30 @@ self: { "librarian" = callPackage ({ mkDerivation, base, containers, dhall, directory, easy-file - , Glob, hspec, hspec-core, hspec-discover, optparse-applicative - , pretty-show, regexpr, temporary + , either, Glob, hspec, hspec-core, hspec-discover + , optparse-applicative, pretty-show, regexpr, temporary, text, time }: mkDerivation { pname = "librarian"; - version = "0.1.0.0"; - sha256 = "0w3g6dq4kalniaxspj6zs4ghn9dyazkjga2vad4zb9cwr8i9vh2w"; + version = "0.1.0.1"; + sha256 = "16q7pfxklf29k2l644mjiff9jkfkjdb1zcqv0f6aynl15xvwc72v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers dhall directory easy-file Glob pretty-show regexpr + base containers directory easy-file Glob pretty-show regexpr time + ]; + executableHaskellDepends = [ + base dhall directory either optparse-applicative text time ]; - executableHaskellDepends = [ base dhall optparse-applicative ]; testHaskellDepends = [ base containers directory easy-file Glob hspec hspec-core - hspec-discover temporary + hspec-discover temporary time ]; testToolDepends = [ hspec-discover ]; description = "Move/rename according a set of rules"; license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; - mainProgram = "librarian"; + mainProgram = "librarian-exe"; }) {}; "librato" = callPackage @@ -192994,8 +193740,8 @@ self: { ({ mkDerivation, base, libsodium }: mkDerivation { pname = "libsodium-bindings"; - version = "0.0.1.1"; - sha256 = "0gfksw47rl13a3mhyzawhxrcp9ia6g85m5v59pp85jci0bgs7bda"; + version = "0.0.2.0"; + sha256 = "12zg8ckvv8qhdmw6pdwfyif23y6iw5hgwcyhb4hlhfk8q7qv2av3"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ libsodium ]; description = "FFI bindings to libsodium"; @@ -193459,6 +194205,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "lift-generics_0_3" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover + , mtl, template-haskell, th-compat, th-lift-instances + }: + mkDerivation { + pname = "lift-generics"; + version = "0.3"; + sha256 = "1walsrpschxg2bqw925z6cr24cznrcq04bb37azvwdcfrbl19r7a"; + libraryHaskellDepends = [ + base ghc-prim template-haskell th-compat + ]; + testHaskellDepends = [ + base containers hspec mtl template-haskell th-compat + th-lift-instances + ]; + testToolDepends = [ hspec-discover ]; + description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lift-read-show" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -193489,10 +194256,10 @@ self: { }: mkDerivation { pname = "lifted-async"; - version = "0.10.2.5"; - sha256 = "1lhyjv32plqs0r2gi7ca8b527z5qas7xgjkh680lqwi0l81xd80n"; + version = "0.10.2.6"; + sha256 = "1sh11zpmmxbkf00j6k0k858yhxpn7fckvw3d5yynkw263pz1hrzn"; revision = "1"; - editedCabalFile = "18z12n6v3n810qp7hxanixwhznphpw69jz9ahwxfknww51dj2jx0"; + editedCabalFile = "0i1m2ia4cdm1kak6n8jl0ln015frdcsil2xw1gvamdci7zqq587k"; libraryHaskellDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -193505,6 +194272,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "lifted-async_0_10_2_7" = callPackage + ({ mkDerivation, async, base, constraints, deepseq, HUnit + , lifted-base, monad-control, mtl, tasty, tasty-bench + , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base + }: + mkDerivation { + pname = "lifted-async"; + version = "0.10.2.7"; + sha256 = "0m9xzlj9hrbs0j4sak2jdvm13l66mpr2k99xcv7rhy8wfssvz0f2"; + libraryHaskellDepends = [ + async base constraints lifted-base monad-control transformers-base + ]; + testHaskellDepends = [ + async base HUnit lifted-base monad-control mtl tasty + tasty-expected-failure tasty-hunit tasty-th + ]; + benchmarkHaskellDepends = [ async base deepseq tasty-bench ]; + description = "Run lifted IO operations asynchronously and wait for their results"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lifted-base" = callPackage ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel , test-framework, test-framework-hunit, transformers @@ -193630,6 +194419,8 @@ self: { pname = "lifx-lan"; version = "0.8.3"; sha256 = "0077wdyrfz20lrd55lzv3bd1ab9cckppkm1gyzp1g23b8xwdayz5"; + revision = "1"; + editedCabalFile = "04956hhmg3cng3q4q26pbqy0lcrn5cv6wb57philixjsl4jlzrgp"; libraryHaskellDepends = [ ansi-terminal base binary bytestring colour composition containers extra monad-loops mtl network random safe text time transformers @@ -194173,6 +194964,8 @@ self: { pname = "linear-circuit"; version = "0.1.0.4"; sha256 = "0pyja29w1vrsi8vi65qdbc3c1vajiqgf5gff2zqh368k3hd4zpi4"; + revision = "1"; + editedCabalFile = "0gcz827i0jd9cnswrai36isdrga0y8vdlyb4nn2xjcpzy6zz6bfd"; libraryHaskellDepends = [ base comfort-array comfort-graph containers lapack netlib-ffi transformers utility-ht @@ -195685,8 +196478,8 @@ self: { }: mkDerivation { pname = "list-tries"; - version = "0.6.7"; - sha256 = "110y66kkbi6m55b3ba7p1r25xnf6n59yz2kdp4qf6s8c7a5i0wzh"; + version = "0.6.7.1"; + sha256 = "1wg247946hn79l4z7h35j304b867fs55b43l19jhkhqi86k4q5y2"; libraryHaskellDepends = [ base binary containers dlist ]; testHaskellDepends = [ base binary ChasingBottoms HUnit QuickCheck template-haskell @@ -195984,6 +196777,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "little-logger_3_0_0" = callPackage + ({ mkDerivation, base, directory, monad-logger, mtl, optics, tasty + , tasty-hunit, temporary, text, unliftio-core + }: + mkDerivation { + pname = "little-logger"; + version = "3.0.0"; + sha256 = "1ckhkv6pj0sbjs7kn11jb8x5v4ilm8rx51mmi84zyzmxfkrpamwf"; + libraryHaskellDepends = [ + base monad-logger mtl optics text unliftio-core + ]; + testHaskellDepends = [ + base directory monad-logger mtl optics tasty tasty-hunit temporary + text unliftio-core + ]; + description = "Basic logging based on monad-logger"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "little-rio" = callPackage ({ mkDerivation, base, exceptions, little-logger, microlens, mtl , primitive, resourcet, unliftio-core @@ -196000,6 +196813,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "little-rio_3_0_0" = callPackage + ({ mkDerivation, base, exceptions, little-logger, mtl, optics + , primitive, resourcet, unliftio-core + }: + mkDerivation { + pname = "little-rio"; + version = "3.0.0"; + sha256 = "1jkpcwsxrg142jb58vqhchnlhz7x7krr8hf3grycgxrzw2hnw10j"; + libraryHaskellDepends = [ + base exceptions little-logger mtl optics primitive resourcet + unliftio-core + ]; + description = "When you need just the RIO monad"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "live-sequencer" = callPackage ({ mkDerivation, alsa-core, alsa-seq, base, bytestring, cgi , concurrent-split, containers, data-accessor @@ -196191,6 +197021,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "llvm-codegen" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, dlist + , ghc-prim, hspec, hspec-hedgehog, mmorph, mtl, neat-interpolation + , text, text-builder-linear + }: + mkDerivation { + pname = "llvm-codegen"; + version = "0.1.0.0"; + sha256 = "1iqrfkyhqdw7mvpl86jrccl6iqmdp64mmzmhlc4bp59cbxifb0zz"; + setupHaskellDepends = [ base Cabal containers ]; + libraryHaskellDepends = [ + base bytestring containers dlist ghc-prim mmorph mtl text + text-builder-linear + ]; + testHaskellDepends = [ + base bytestring containers dlist ghc-prim hspec hspec-hedgehog + mmorph mtl neat-interpolation text text-builder-linear + ]; + description = "A DSL for LLVM IR code generation based on llvm-hs"; + license = lib.licenses.bsd3; + }) {}; + "llvm-data-interop" = callPackage ({ mkDerivation, array, base, bytestring, c2hs, containers , data-default, deepseq, dwarf, hashable, hashtables @@ -196531,6 +197383,8 @@ self: { pname = "llvm-pretty"; version = "0.12.1.0"; sha256 = "113avpn33gyh65yd0bbfwni044ih5vcbnv8l43siy8a4asp0xfwi"; + revision = "1"; + editedCabalFile = "0b7k8br3m9jb3zsh983zb7a2x85jn1z2dxxisc7jhjzvhb3xd9my"; libraryHaskellDepends = [ base containers microlens microlens-th monadLib parsec pretty syb template-haskell th-abstraction @@ -197646,10 +198500,8 @@ self: { }: mkDerivation { pname = "logic-TPTP"; - version = "0.5.0.0"; - sha256 = "0sqzf332c7zdwkdi1346dxljrdammiz1vc332j85487nb0ypnxwi"; - revision = "4"; - editedCabalFile = "012aqairsbxqrl0ak5i11wqr1rcdpwi5m4f5nww8glxi3jglnnyb"; + version = "0.5.1.0"; + sha256 = "1s3r85zw5ci5mg9rrik351xxi5k8cszlpdanwpxyrinjd3y6j01i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198286,8 +199138,8 @@ self: { }: mkDerivation { pname = "looper"; - version = "0.3.0.0"; - sha256 = "01ap0kscxq90zl9rdmgmlfh1dky95r7fmnivzic045ck57bshl2n"; + version = "0.3.0.1"; + sha256 = "0kcy4pr7z6ppqgnxbssp597qyjgcm25pdhbhzxjp0n205nywiz11"; libraryHaskellDepends = [ base opt-env-conf text time unliftio ]; testHaskellDepends = [ base opt-env-conf opt-env-conf-test sydtest unliftio @@ -198611,6 +199463,8 @@ self: { pname = "lrucache"; version = "1.2.0.1"; sha256 = "11avhnjnb89rvn2s41jhh5r40zgp7r6kb5c0hcfiibpabqvv46pw"; + revision = "1"; + editedCabalFile = "0v2wc5k2knvv5knbarzspmbzf657r52jyjm9kf6r4ylsmi9cbq0k"; libraryHaskellDepends = [ base containers contravariant ]; description = "a simple, pure LRU cache"; license = lib.licenses.bsd3; @@ -199159,20 +200013,6 @@ self: { ({ mkDerivation, base, lua5_4, tasty, tasty-hunit }: mkDerivation { pname = "lua"; - version = "2.3.2"; - sha256 = "0c9pq728ipcgmmxw58ab9p0lgcqqb2gf8dlscvgg52pb3q4qqamf"; - configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; - libraryHaskellDepends = [ base ]; - librarySystemDepends = [ lua5_4 ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - description = "Lua, an embeddable scripting language"; - license = lib.licenses.mit; - }) {inherit (pkgs) lua5_4;}; - - "lua_2_3_3" = callPackage - ({ mkDerivation, base, lua5_4, tasty, tasty-hunit }: - mkDerivation { - pname = "lua"; version = "2.3.3"; sha256 = "0xvhfq8ms5wbchrscxaqf4a9panfnzgz5xdlg86790nydab2kals"; configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; @@ -199181,7 +200021,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "Lua, an embeddable scripting language"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) lua5_4;}; "lua-arbitrary" = callPackage @@ -199291,8 +200130,8 @@ self: { pname = "lucid"; version = "2.11.20230408"; sha256 = "07a41xkql96hkp9jawlaxn0lflvjf8a2djb45k3b3ig9zs82j48g"; - revision = "1"; - editedCabalFile = "1gb3b79xf4jp0xvk2anlvpvac6gqcfpffylkwki19lrx6jbd8fqs"; + revision = "2"; + editedCabalFile = "13hfdk1xj1fi0fd9crylvvzfr52z79j941im654jv50a3667lxfj"; libraryHaskellDepends = [ base blaze-builder bytestring containers hashable mmorph mtl text transformers @@ -199458,6 +200297,8 @@ self: { pname = "lucid2"; version = "0.0.20240424"; sha256 = "1ccpcbq84y53dxna700rfn6gaxn6xywqfdn27xpvbrl79w5x5p1j"; + revision = "1"; + editedCabalFile = "0xggpzcbzrbnd7f0rbjcsri914wwwy8qh256wrq41jswsrb00bkp"; libraryHaskellDepends = [ base bytestring containers mtl text transformers ]; @@ -199620,8 +200461,8 @@ self: { pname = "lumberjack"; version = "1.0.3.0"; sha256 = "05a4gvc47448crb0yn0fwi3y9bwdqlmnch839hljwpyamqvqwi8q"; - revision = "1"; - editedCabalFile = "1dj6mw8jbxczmqxwyiqqqz7lsi4586bbgv16m4ji14zmm84z2ad3"; + revision = "2"; + editedCabalFile = "1szaa11cdmdb8i2hpj0hl8cpwhkbk7s2iwq0hpck75as0xiqk36z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199750,8 +200591,8 @@ self: { pname = "lvmlib"; version = "1.1"; sha256 = "1lr2qr817mb8qb7b3wvry9jpj3wjphj5s60rn3dyqibx8gny36bg"; - revision = "1"; - editedCabalFile = "0bhgq85nsmyr14lmv1jihacsijsn48smfjymgc4myd6pvaa2f84k"; + revision = "2"; + editedCabalFile = "1zy8lh3a4gjfxglhyd561608jdxd1v8hgjwp8mi3hszj7i2ylkym"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200195,22 +201036,22 @@ self: { "macaroon-shop" = callPackage ({ mkDerivation, base, bytes, bytestring, cereal, containers - , cryptonite, hedgehog, memory, saltine, transformers + , crypton, hedgehog, memory, saltine, transformers }: mkDerivation { pname = "macaroon-shop"; - version = "0.1.0.0"; - sha256 = "087b83l3bdx1mk79bxqcwckbjdz7idi0m73dcrjiv5b4q5rjr8rs"; + version = "0.1.0.1"; + sha256 = "1d03s3mj9h582amlvgz648ygc9g9bzj5ri668kk5pkif6wbr138d"; libraryHaskellDepends = [ - base bytes bytestring cereal containers cryptonite memory saltine + base bytes bytestring cereal containers crypton memory saltine transformers ]; testHaskellDepends = [ - base bytes bytestring cereal containers cryptonite hedgehog memory + base bytes bytestring cereal containers crypton hedgehog memory saltine transformers ]; description = "A toolkit for working with macaroons"; - license = lib.licenses.isc; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202237,25 +203078,21 @@ self: { }) {}; "markup-parse" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, flatparse - , html-parse, optparse-applicative, perf, string-interpolate, tasty - , tasty-golden, text, these, tree-diff + ({ mkDerivation, base, bytestring, containers, deepseq + , doctest-parallel, flatparse, string-interpolate, tasty + , tasty-golden, these, tree-diff }: mkDerivation { pname = "markup-parse"; - version = "0.1.1"; - sha256 = "1ybmppxd4hpqjr2lnb1x9jk96fkd8snq6l2p0fzpr7q6bq09wx0a"; - revision = "1"; - editedCabalFile = "1p9hba5fcfbv9qm4aqg9hn5bamw6slyr1sxz5pzg3hnj1c8npzl6"; + version = "0.1.1.1"; + sha256 = "0k9ga485l7nvhny0kqjb6s4q407a1mnfpcsy90892qgj42dkkdb4"; libraryHaskellDepends = [ base bytestring containers deepseq flatparse string-interpolate tasty tasty-golden these tree-diff ]; testHaskellDepends = [ - base bytestring string-interpolate tasty tasty-golden tree-diff - ]; - benchmarkHaskellDepends = [ - base bytestring flatparse html-parse optparse-applicative perf text + base bytestring doctest-parallel string-interpolate tasty + tasty-golden tree-diff ]; description = "A markup parser"; license = lib.licenses.bsd3; @@ -202743,6 +203580,8 @@ self: { pname = "matchable-th"; version = "0.2"; sha256 = "1v2r38r59wk699nsql3mw7z83gm1snvnci146ply34za7i42zp54"; + revision = "1"; + editedCabalFile = "17mdf8bsq9s2w4bl76zink0k55my43a3702f0zfxgqy5p2b09pkw"; libraryHaskellDepends = [ base bifunctors matchable template-haskell th-abstraction ]; @@ -203742,8 +204581,8 @@ self: { }: mkDerivation { pname = "mcmc"; - version = "0.8.2.0"; - sha256 = "0ms2v86wam1gl5ibhs8pl8rqxxbp2zlr3pv7vfbbp6vgjw2i4x7h"; + version = "0.8.3.1"; + sha256 = "1x0r4ph3vc5aamd1pbpbx39l8cih0nmm7pl3ywkl8hmbgzmmkami"; libraryHaskellDepends = [ ad aeson async base bytestring circular containers covariance directory dirichlet hmatrix log-domain math-functions microlens @@ -203933,16 +204772,16 @@ self: { "mealy" = callPackage ({ mkDerivation, adjunctions, base, containers, doctest-parallel - , mwc-probability, numhask, numhask-array, primitive, profunctors - , tdigest, text, vector, vector-algorithms + , harpie, harpie-numhask, mwc-probability, numhask, primitive + , profunctors, tdigest, text, vector, vector-algorithms }: mkDerivation { pname = "mealy"; - version = "0.4.5.0"; - sha256 = "1lyqskr9pddhdm0i8ncykz9gvbjxhfac3y49cvm6vziy3wmxd6ji"; + version = "0.5.0.0"; + sha256 = "0cijjmi3wqi7z3vbhm0ya8va9397rlkr3wkri6kf94qqr1vimgxy"; libraryHaskellDepends = [ - adjunctions base containers mwc-probability numhask numhask-array - primitive profunctors tdigest text vector vector-algorithms + adjunctions base containers harpie harpie-numhask mwc-probability + numhask primitive profunctors tdigest text vector vector-algorithms ]; testHaskellDepends = [ base doctest-parallel ]; description = "Mealy machines for processing time-series and ordered data"; @@ -204933,8 +205772,8 @@ self: { }: mkDerivation { pname = "memory-hexstring"; - version = "1.0.0.0"; - sha256 = "1sm7jj75mv8p7f33h619zm10xbzyjg1jds87cg36mrj8hfb32q48"; + version = "1.0.1.0"; + sha256 = "0jwkikrv3pkhvxhq2bm675hiivx18m2p89x5irn3hn6mz85p08hq"; libraryHaskellDepends = [ aeson base bytestring memory scale template-haskell text ]; @@ -204960,6 +205799,25 @@ self: { broken = true; }) {}; + "mempack" = callPackage + ({ mkDerivation, base, binary, bytestring, cereal, criterion, FailT + , flat, hspec, mtl, QuickCheck, random, serialise, store, text + }: + mkDerivation { + pname = "mempack"; + version = "0.1.0.0"; + sha256 = "1ay2d0ag2gsqh2j0pgq34fk6lqdb09g01mh510p9g787l89mx7hy"; + libraryHaskellDepends = [ base bytestring FailT mtl text ]; + testHaskellDepends = [ + base bytestring FailT hspec mtl QuickCheck random + ]; + benchmarkHaskellDepends = [ + base binary bytestring cereal criterion flat serialise store + ]; + description = "Short description"; + license = lib.licenses.bsd3; + }) {}; + "memscript" = callPackage ({ mkDerivation, base, haskeline, transformers }: mkDerivation { @@ -206340,8 +207198,8 @@ self: { pname = "midi-music-box"; version = "0.0.1.2"; sha256 = "0rnjwis6y0lnyfjxnxqk3zsh78ylccq5v21avb97vybmj0pld1l9"; - revision = "3"; - editedCabalFile = "0yh1mqpsw12dci8fgw124jbz5588v5vxdzggrn67x1pd4wvjmr8k"; + revision = "4"; + editedCabalFile = "1lpgd33852in97g89q53qd6xag29nzmp281xnh31rdppjr7zadhc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -206586,13 +207444,13 @@ self: { , bytestring, case-insensitive, conduit, conduit-extra, directory , filepath, hspec, http-client, http-date, http-types, network , old-locale, parsec, resourcet, split, streaming-commons, text - , time, time-manager, transformers, unix, unix-time, unliftio + , time, time-manager, transformers, unix, unix-time , unordered-containers, wai, wai-app-file-cgi, wai-logger, warp }: mkDerivation { pname = "mighttpd2"; - version = "4.0.7"; - sha256 = "09cjfip6gkqrhr0dwvk5k88ygi80ikvx0ykvmdp2f6np149prfr8"; + version = "4.0.8"; + sha256 = "0yqj3m7y493bzjmx1ycyid4s40h11l46w8lv1783drlw7wpakmya"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -206600,7 +207458,7 @@ self: { array async auto-update base byteorder bytestring case-insensitive conduit conduit-extra directory filepath http-date http-types network parsec resourcet split streaming-commons text unix - unix-time unliftio unordered-containers wai wai-app-file-cgi warp + unix-time unordered-containers wai wai-app-file-cgi warp ]; executableHaskellDepends = [ base bytestring conduit-extra directory filepath http-client @@ -206986,8 +207844,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mini"; - version = "1.4.0.0"; - sha256 = "0l94dfs2i18yvxi8insl5627wdpm523bygkbc5rg8c38gzrqja6q"; + version = "1.4.1.0"; + sha256 = "1jlvr88w038p6a9ssljjpf5jdr9b9008rdwibzqcbs1x5sxmf2xw"; libraryHaskellDepends = [ base ]; description = "Minimal essentials"; license = lib.licenses.mit; @@ -207238,6 +208096,120 @@ self: { maintainers = [ lib.maintainers.mpscholten ]; }) {}; + "minion" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring + , case-insensitive, containers, exceptions, filepath, http-api-data + , http-media, http-types, string-conversions, text, transformers + , wai, warp + }: + mkDerivation { + pname = "minion"; + version = "0.1.0.1"; + sha256 = "1mfrcs7v6r9ws3dhpac3g4zhcnr2ylp9mcncsas17wg21jlhzqfb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring binary bytestring case-insensitive + containers exceptions filepath http-api-data http-media http-types + string-conversions text transformers wai + ]; + executableHaskellDepends = [ base warp ]; + description = "A Haskell introspectable web router"; + license = lib.licenses.mit; + }) {}; + + "minion-conduit" = callPackage + ({ mkDerivation, base, binary, bytestring, conduit, http-types + , minion, text, wai, warp + }: + mkDerivation { + pname = "minion-conduit"; + version = "0.1.0.0"; + sha256 = "06g30mqiajrn39lch9c4phm0zai6ni9hbnbq741mgbggkyszxqvs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring conduit http-types minion text wai + ]; + executableHaskellDepends = [ base warp ]; + description = "Minion conduit support"; + license = lib.licenses.mit; + mainProgram = "minion-conduit-example"; + }) {}; + + "minion-htmx" = callPackage + ({ mkDerivation, base, bytestring, http-types, minion, text }: + mkDerivation { + pname = "minion-htmx"; + version = "0.1.0.0"; + sha256 = "11zgxfplizkvbrrakx678xj49xyckbjqgb6iz4jrrjjls148ffp4"; + libraryHaskellDepends = [ base bytestring http-types minion text ]; + description = "Minion HTMX support"; + license = lib.licenses.mit; + }) {}; + + "minion-jwt" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-types, jose, minion + , mtl, text, time, transformers, wai, warp + }: + mkDerivation { + pname = "minion-jwt"; + version = "0.1.0.0"; + sha256 = "1f9gfrwachf4ibmvj2129vpzl6qaxn5lbhsf2y0yydj63k5wc7mb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring http-types jose minion mtl text time + transformers wai + ]; + executableHaskellDepends = [ base warp ]; + description = "Minion JWT support"; + license = lib.licenses.mit; + mainProgram = "minion-jwt-example"; + }) {}; + + "minion-openapi3" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , case-insensitive, directory, file-embed-lzma, filepath + , http-api-data, http-types, insert-ordered-containers, lens + , minion, openapi3, template-haskell, text + }: + mkDerivation { + pname = "minion-openapi3"; + version = "0.1.0.1"; + sha256 = "1vc1cmmf1sspdfcbxk1d1807rggiridyhvvsh27j0z34n3p9whih"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring case-insensitive + directory file-embed-lzma filepath http-api-data http-types + insert-ordered-containers lens minion openapi3 template-haskell + text + ]; + description = "Minion openapi3 support"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "minion-wai-extra" = callPackage + ({ mkDerivation, base, binary, bytestring, http-media, http-types + , minion, resourcet, string-conversions, text, transformers, wai + , wai-extra, warp + }: + mkDerivation { + pname = "minion-wai-extra"; + version = "0.1.0.0"; + sha256 = "0mi6kqha1k4ln0l7kcl373mn4r5f80y1ih3s1a6y8k7y87rcx3c8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring http-media http-types minion resourcet + string-conversions text transformers wai wai-extra + ]; + executableHaskellDepends = [ base warp ]; + description = "Minion wrappers for wai-extra"; + license = lib.licenses.mit; + }) {}; + "minions" = callPackage ({ mkDerivation, ansi-terminal, base, MissingH, process, time }: mkDerivation { @@ -207664,8 +208636,8 @@ self: { }: mkDerivation { pname = "miso"; - version = "1.8.4.0"; - sha256 = "113gm3rqc17aa3s2hxzdm3q78c7jlf728lqggl5khya1kh2i3yl2"; + version = "1.8.5.0"; + sha256 = "0lbr1hwaidsscrqp3p6p3rr5q1mxfg3f7bb62x974jll3lisxlyb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207694,8 +208666,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "miso-examples"; - version = "1.8.4.0"; - sha256 = "0z0q0pxkihdhjpm516xxdy3igbx23pfpn7jnjbvf2v054vjq2rmg"; + version = "1.8.5.0"; + sha256 = "0v7n1wibv4r4kn2n29np6p6rs00z6v9zfdgxi2ja38nqgc7aky7l"; isLibrary = false; isExecutable = true; description = "A tasty Haskell front-end framework"; @@ -207800,17 +208772,19 @@ self: { "mit-3qvpPyAi6mH" = callPackage ({ mkDerivation, base, base64, containers, directory, ki - , optparse-applicative, parsec, process, stm, text, text-ansi, unix + , optparse-applicative, parsec, process, stm, text, text-ansi + , text-builder-linear, unconditional-jump, unix }: mkDerivation { pname = "mit-3qvpPyAi6mH"; - version = "11"; - sha256 = "0p5v2spwd8rz5h5zclbr7wq5m4qvsihvp91p52d2vd3jdd6xaszx"; + version = "12"; + sha256 = "0lvn4fal9my2gngcic6kx5xq3sdsl63xm9b6bnsy23ww10zkxdp3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base64 containers directory ki optparse-applicative parsec - process stm text text-ansi unix + process stm text text-ansi text-builder-linear unconditional-jump + unix ]; executableHaskellDepends = [ base ]; description = "A git wrapper with a streamlined UX"; @@ -207897,6 +208871,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "mixed-types-num_0_6_2" = callPackage + ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck + , QuickCheck, smallcheck, template-haskell + }: + mkDerivation { + pname = "mixed-types-num"; + version = "0.6.2"; + sha256 = "0nrbvnvzrfpxrxgg6mnd3jadhhx390cffqz1zrvcw9b2qzdk6i6b"; + libraryHaskellDepends = [ + base collect-errors hspec hspec-smallcheck QuickCheck smallcheck + template-haskell + ]; + testHaskellDepends = [ + base collect-errors hspec hspec-smallcheck QuickCheck smallcheck + ]; + description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mixpanel-client" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, hspec , hspec-discover, http-client, http-client-tls, markdown-unlit @@ -208050,6 +209044,8 @@ self: { pname = "mmark"; version = "0.0.8.0"; sha256 = "05wzjyqh4605g2y3lhcqrjh4qzj4fv8xg5baf3xi0x6ararrwjgr"; + revision = "1"; + editedCabalFile = "13d46lpf5b1kj6b1g89gb1s91h87njz3k69mp39nsfhwq19ygibf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers deepseq dlist email-validate @@ -208109,21 +209105,6 @@ self: { maintainers = [ lib.maintainers.mpscholten ]; }) {}; - "mmorph_1_1_3" = callPackage - ({ mkDerivation, base, mtl, transformers, transformers-compat }: - mkDerivation { - pname = "mmorph"; - version = "1.1.3"; - sha256 = "0rfsy9n9mlinpmqi2s17fhc67fzma2ig5fbmh6m5m830canzf8vr"; - libraryHaskellDepends = [ - base mtl transformers transformers-compat - ]; - description = "Monad morphisms"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.Gabriella439 ]; - }) {}; - "mmorph" = callPackage ({ mkDerivation, base, mtl, transformers, transformers-compat }: mkDerivation { @@ -208442,18 +209423,19 @@ self: { "mmzk-typeid" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring, containers - , entropy, hashable, hspec, random, text, time, uuid, uuid-types + , entropy, hashable, hint, hspec, random, text, time, uuid + , uuid-types }: mkDerivation { pname = "mmzk-typeid"; - version = "0.7.0.0"; - sha256 = "139wn08imnasz40v8hlcjm4fmkxwq9lr0xbcl1kqnxqph8yfmmwa"; + version = "0.7.0.1"; + sha256 = "1c2mybdgnn9nzvk2php5i3xid3cm1ws7zrcsg4ngy2a60057pwbz"; libraryHaskellDepends = [ aeson array base binary bytestring entropy hashable random text time uuid uuid-types ]; testHaskellDepends = [ - aeson array base binary bytestring containers entropy hashable + aeson array base binary bytestring containers entropy hashable hint hspec random text time uuid uuid-types ]; description = "A TypeID and UUIDv7 implementation for Haskell"; @@ -208580,15 +209562,23 @@ self: { }) {}; "mockcat" = callPackage - ({ mkDerivation, base, hspec, mtl, template-haskell, text }: + ({ mkDerivation, base, hspec, mtl, template-haskell, text + , transformers + }: mkDerivation { pname = "mockcat"; - version = "0.3.1.0"; - sha256 = "1akg2r96qxqpis3m0xrnaxi26c0nvwr91f3yczai0pzhrp6887g4"; - libraryHaskellDepends = [ base mtl template-haskell text ]; - testHaskellDepends = [ base hspec mtl template-haskell text ]; + version = "0.5.1.0"; + sha256 = "08z3v6wvm42hgjsl5diqmv4m8j6idxnwy37w9fph8i22a2kf5hn8"; + libraryHaskellDepends = [ + base mtl template-haskell text transformers + ]; + testHaskellDepends = [ + base hspec mtl template-haskell text transformers + ]; description = "Mock library for test in Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mockery" = callPackage @@ -211165,14 +212155,14 @@ self: { "mono-traversable" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, foldl - , gauge, hashable, hspec, HUnit, mwc-random, QuickCheck, split - , text, transformers, unordered-containers, vector - , vector-algorithms + , gauge, hashable, hspec, hspec-discover, HUnit, mwc-random + , QuickCheck, split, text, transformers, unordered-containers + , vector, vector-algorithms }: mkDerivation { pname = "mono-traversable"; - version = "1.0.17.0"; - sha256 = "0byk9hc2yh95hnhlx1r7h7i42h4dnlm3kwqksb9kaqxwc2wgkn15"; + version = "1.0.20.0"; + sha256 = "0i9mz79nhsci3ichqzwnqq3llip7vblk4q98b3ydmcll7jayl8g6"; libraryHaskellDepends = [ base bytestring containers hashable split text transformers unordered-containers vector vector-algorithms @@ -211181,6 +212171,7 @@ self: { base bytestring containers foldl hspec HUnit QuickCheck text transformers unordered-containers vector ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base bytestring containers deepseq gauge mwc-random text vector ]; @@ -211448,8 +212439,8 @@ self: { }: mkDerivation { pname = "monoidmap"; - version = "0.0.1.5"; - sha256 = "18698w7ibyjj3xbzfxh58djdrgi4dg1524g47n9pws8m04kgah2l"; + version = "0.0.1.6"; + sha256 = "15p32jm7pl7vpda65nyps9lbw0i32z9lp8zn3yg87480dab2jsqa"; libraryHaskellDepends = [ base containers deepseq groups monoid-subclasses nonempty-containers nothunks @@ -211538,27 +212529,26 @@ self: { ]; description = "A GUI library for writing native Haskell applications"; license = lib.licenses.bsd3; - badPlatforms = lib.platforms.darwin; mainProgram = "dev-test-app"; }) {inherit (pkgs) glew;}; "monomer-flatpak-example" = callPackage ({ mkDerivation, async, base, bytestring, c2hs, containers - , data-default-class, dbus, desktop-portal, directory, file-io - , filepath, libpipewire, libspa, modern-uri, monomer - , monomer-hagrid, random, text + , data-default, dbus, desktop-portal, directory, file-io, filepath + , libpipewire, libspa, modern-uri, monomer, monomer-hagrid, random + , text }: mkDerivation { pname = "monomer-flatpak-example"; - version = "0.0.15.6"; - sha256 = "1pzijzrr410yclc7b7hqrbggczj7jl39mm4z6iymvza46mj969pw"; + version = "0.0.16.0"; + sha256 = "1a4kzy96b9rpl8r87im3whl3j59xbs8iqcjn208d0r0yvkmfqd30"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - async base bytestring containers data-default-class dbus - desktop-portal directory file-io filepath modern-uri monomer - monomer-hagrid random text + async base bytestring containers data-default dbus desktop-portal + directory file-io filepath modern-uri monomer monomer-hagrid random + text ]; executablePkgconfigDepends = [ libpipewire libspa ]; executableToolDepends = [ c2hs ]; @@ -211569,27 +212559,25 @@ self: { }) {libpipewire = null; libspa = null;}; "monomer-hagrid" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default - , data-default-class, hspec, hspec-discover, lens, monomer, mtl - , stm, text + ({ mkDerivation, base, bytestring, containers, data-default, hspec + , hspec-discover, lens, monomer, mtl, stm, text }: mkDerivation { pname = "monomer-hagrid"; - version = "0.3.2.0"; - sha256 = "1vdc26pcn4f1qpk9iakxkkaqg0h1h1dx7s5jxfd7n9j91454ccpp"; + version = "0.4.0.0"; + sha256 = "0bjy5sjfi3lh9fpxk31vppp4kihxfnxqnk0x7yvsdcpy9gcrjl6g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-default-class lens monomer text + base containers data-default lens monomer text ]; testHaskellDepends = [ - base bytestring containers data-default data-default-class hspec - lens monomer mtl stm text + base bytestring containers data-default hspec lens monomer mtl stm + text ]; testToolDepends = [ hspec-discover ]; description = "A datagrid widget for the Monomer library"; license = lib.licenses.mit; - badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212894,11 +213882,13 @@ self: { }: mkDerivation { pname = "mpd-current-json"; - version = "1.3.2.0"; - sha256 = "04kwmfjc28y2j0wfgcf9m7qfh7vwa2cvzfsy2hpplyg5ji2ds11a"; + version = "2.1.0.0"; + sha256 = "0ici761fvhcl82gnsrzmab529rfwx990qv6qappk4wqvn0d1dvm2"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ aeson base libmpd ]; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring libmpd + ]; executableHaskellDepends = [ aeson aeson-pretty base bytestring libmpd optparse-applicative ]; @@ -212970,12 +213960,12 @@ self: { maintainers = [ lib.maintainers.sheepforce ]; }) {inherit (pkgs) mpich;}; - "mpi-hs_0_7_3_0" = callPackage + "mpi-hs_0_7_3_1" = callPackage ({ mkDerivation, base, bytestring, c2hs, monad-loops, ompi }: mkDerivation { pname = "mpi-hs"; - version = "0.7.3.0"; - sha256 = "1q6jb3sm8jspw9zas5iggvzr6w0zmcbr2qqw4q4j96hrfpjgj798"; + version = "0.7.3.1"; + sha256 = "1f4jdk5wysi54skz2jpzh83v5xi4gqa0q3r89l1adlz4m5i90l70"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring monad-loops ]; @@ -213928,6 +214918,22 @@ self: { broken = true; }) {}; + "mtl-misc-yj" = callPackage + ({ mkDerivation, base, mtl, try-monads-tf-misc-yj }: + mkDerivation { + pname = "mtl-misc-yj"; + version = "0.1.0.2"; + sha256 = "1gyygnqgqklh133z57wr3dvqc885fmdxbivlaxrf3p41wh5ywwg4"; + revision = "1"; + editedCabalFile = "1bra354gjnfx67czl0mr7hzyhwrxj71x5pcxn9m6sh5mcf5zpkm7"; + libraryHaskellDepends = [ base mtl ]; + testHaskellDepends = [ base mtl try-monads-tf-misc-yj ]; + description = "tribial tools about mtl"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {try-monads-tf-misc-yj = null;}; + "mtl-prelude" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -216416,8 +217422,8 @@ self: { }: mkDerivation { pname = "mysql-haskell"; - version = "1.1.5"; - sha256 = "06q07wahvghbalx9dm6dqmrmljlqjzqs46fbmmlp2f2ijz36m024"; + version = "1.1.6"; + sha256 = "1dzin4xk5d6dn1grqh6dagmcwj2q1rycxfsi2l23kbapm26a7m0b"; libraryHaskellDepends = [ base binary blaze-textual bytestring bytestring-lexing crypton crypton-x509 crypton-x509-store crypton-x509-system @@ -216936,10 +217942,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "named"; - version = "0.3.0.1"; - sha256 = "0dnp4qbhn6ci2dlp230gpq8c5z26wb2liani1myc598g2b3c2qij"; - revision = "5"; - editedCabalFile = "0yhv6qxdjsip5sd3z2gvwhjfq2n3l9qx6n990xfm4mz0dn935v1f"; + version = "0.3.0.2"; + sha256 = "0glm7kfkim2k94xim0cdbyqpwgw22gwghwv0fzj0i3i70r4id3bv"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Named parameters (keyword arguments) for Haskell"; @@ -217073,8 +218077,8 @@ self: { }: mkDerivation { pname = "named-text"; - version = "1.2.0.0"; - sha256 = "017snabd25b06zgzdagpribqk3mbgd4y4npjf2d6vwzfi5mlcs4z"; + version = "1.2.1.0"; + sha256 = "079nlyhvwdbihlbxdskk8ny4kia7jz7fnw29y2jp576b4470zrgl"; libraryHaskellDepends = [ aeson base deepseq hashable prettyprinter sayable text ]; @@ -217357,7 +218361,6 @@ self: { testHaskellDepends = [ base containers hspec inline-c QuickCheck ]; description = "Haskell bindings for nanovg"; license = lib.licenses.isc; - badPlatforms = lib.platforms.darwin; }) {inherit (pkgs) freetype; inherit (pkgs) glew; inherit (pkgs) libGL; inherit (pkgs) libGLU; inherit (pkgs.xorg) libX11;}; @@ -217716,10 +218719,8 @@ self: { }: mkDerivation { pname = "natural-transformation"; - version = "0.4"; - sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma"; - revision = "12"; - editedCabalFile = "0nlyhp29s2c93d1rflrw4wkzpp98i9zr11fca2vd6z31yc7dg5pg"; + version = "0.4.1"; + sha256 = "1mx4m6dy6fm56xyhm6xjavv4q3188r2xnrnqgvmqf9a5m678yskf"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers quickcheck-instances tasty tasty-quickcheck @@ -218987,25 +219988,6 @@ self: { broken = true; }) {}; - "network_2_6_3_1" = callPackage - ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework - , test-framework-hunit, unix - }: - mkDerivation { - pname = "network"; - version = "2.6.3.1"; - sha256 = "1rl2gl37cf4k0ddsq93q15fwdz1l25nhl4w205krbh7d5dg5y12p"; - revision = "1"; - editedCabalFile = "1mfwybinwdfb05pvlg3hkiql4pazp9rp1agz777ijj44njkgn416"; - libraryHaskellDepends = [ base bytestring unix ]; - testHaskellDepends = [ - base bytestring doctest HUnit test-framework test-framework-hunit - ]; - description = "Low-level networking interface"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "network" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, hspec , hspec-discover, HUnit, QuickCheck, temporary @@ -219025,14 +220007,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "network_3_2_2_0" = callPackage + "network_3_2_5_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, hspec , hspec-discover, HUnit, QuickCheck, stm, temporary }: mkDerivation { pname = "network"; - version = "3.2.2.0"; - sha256 = "033zcj1ibrw49h4rbkhbznyz0na25zyaihh2m35wqlkgji3lkc7g"; + version = "3.2.5.0"; + sha256 = "1ijcdfvznr8diarzj525gcfnjc1r7dqlxr16mbwibvzlj5w4f0ym"; libraryHaskellDepends = [ base bytestring deepseq directory stm ]; testHaskellDepends = [ base bytestring directory hspec HUnit QuickCheck temporary @@ -219772,6 +220754,18 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "network-run_0_4_1" = callPackage + ({ mkDerivation, base, bytestring, network, time-manager }: + mkDerivation { + pname = "network-run"; + version = "0.4.1"; + sha256 = "1yl2y910s7b4a31anifl5agba88fwgn4k7958k56nk37hjwj0aq8"; + 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 { @@ -219948,10 +220942,10 @@ self: { }: mkDerivation { pname = "network-transport"; - version = "0.5.7"; - sha256 = "163n3dl56vrmw4pdq66lb80ybjh58lqr85j69hpqwr24c46gjqk7"; + version = "0.5.8"; + sha256 = "141qsnxmj2iaclnimilygi4wrxn9hymjf1g7dq32hgswp60yzklx"; revision = "1"; - editedCabalFile = "1z9k8i5j01ajhashmy1kkwq6bqcwvi48j6d3n57i4bglfdz8s31z"; + editedCabalFile = "0nf7jxr7xcdx7rslqrpn4b4k5x35s3j9i2wvzgz0mg6mfdifllp2"; libraryHaskellDepends = [ base binary bytestring deepseq hashable transformers ]; @@ -220003,8 +220997,8 @@ self: { }: mkDerivation { pname = "network-transport-inmemory"; - version = "0.5.4"; - sha256 = "0557xhsswlypnxfvw5x3add29dai29ybi1g129mzkz0pi1wddxiq"; + version = "0.5.41"; + sha256 = "1h3fi1qyybjbr7ph4l2j0p8hgypk9j3jarr1c6365mr73m9wbwji"; libraryHaskellDepends = [ base bytestring containers data-accessor network-transport stm ]; @@ -220022,8 +221016,8 @@ self: { }: mkDerivation { pname = "network-transport-tcp"; - version = "0.8.4"; - sha256 = "141l1i8knh0b8wspq0zf2530z89bziiv13zw2s36drxg6inq6rcl"; + version = "0.8.5"; + sha256 = "1ppdi8j4whg86mplq3nkz8ll7d927drzj238bj9d1ym9izbprjjj"; libraryHaskellDepends = [ async base bytestring containers data-accessor network network-transport uuid @@ -220041,8 +221035,10 @@ self: { }: mkDerivation { pname = "network-transport-tests"; - version = "0.3.2"; - sha256 = "1w3cxiap0p8kgxs4jghvhfzpa6bazpha4s6zgabd80cw3gcmf5lf"; + version = "0.3.3"; + sha256 = "1x6gqv09nhqf2ynk3wx308gnwd2qqx7v54vsrlxn27vhajc105jl"; + revision = "1"; + editedCabalFile = "0xly8snwsks44cgkbprf9j9sz5rbkx37gqvb9f77bhs7wwgz22cp"; libraryHaskellDepends = [ ansi-terminal base bytestring containers mtl network-transport random @@ -220864,8 +221860,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "1.2.4.1"; - sha256 = "120jk2d2yip9vd4r0s9b7z7ykh67i921svspn2kc7v5vwx95xn3w"; + version = "1.2.6.1"; + sha256 = "1xvhmvlcs10ibn0i2hrphp168gkygsxkbzbdmzp72pn8lhnjsgvd"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export template-haskell ]; @@ -220876,19 +221872,20 @@ self: { "ngx-export-tools-extra" = callPackage ({ mkDerivation, aeson, array, async, base, base64, binary , bytestring, case-insensitive, containers, ede - , enclosed-exceptions, http-client, http-client-brread-timeout - , http-client-tls, http-types, network, ngx-export - , ngx-export-tools, pcre-heavy, pcre-light, prettyprinter, resolv - , safe, safe-exceptions, snap-core, snap-server, template-haskell - , text, time, trifecta, unordered-containers + , enclosed-exceptions, hashable, http-client + , http-client-brread-timeout, http-client-tls, http-types, network + , ngx-export, ngx-export-tools, pcre-heavy, pcre-light + , prettyprinter, resolv, safe, safe-exceptions, snap-core + , snap-server, template-haskell, text, time, trifecta + , unordered-containers }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "1.2.9.1"; - sha256 = "0mafzhc6lnari85ng2iw025nhyvwsqkaamxf6jlkkm45k9zsa59y"; + version = "1.2.11"; + sha256 = "0aj78jb6vl4vl50z8qz2hjrid36wgrnfsgcmqsxm4pg1ph7bqkd0"; libraryHaskellDepends = [ aeson array async base base64 binary bytestring case-insensitive - containers ede enclosed-exceptions http-client + containers ede enclosed-exceptions hashable http-client http-client-brread-timeout http-client-tls http-types network ngx-export ngx-export-tools pcre-heavy pcre-light prettyprinter resolv safe safe-exceptions snap-core snap-server template-haskell @@ -221201,6 +222198,8 @@ self: { pname = "nix-derivation"; version = "1.1.3"; sha256 = "11drhg3zjhwbvdw25k0icvbkcpqilx0m9qw60k7snfaz1iadfkdb"; + revision = "1"; + editedCabalFile = "1w84h665dls927g1zwzyfp91jyk97dy0ccii8m07y1prp007ccxa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221456,8 +222455,8 @@ self: { }: mkDerivation { pname = "nix-tree"; - version = "0.4.1"; - sha256 = "1w8fg872fw40r346vkkqffahplmyly792ygcbqq0czapwhl0wbvv"; + version = "0.5.0"; + sha256 = "0gjmmnkizqb5pzzr13a1bzs0smch353nvhwplcp04kwcdgm22axd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -221793,8 +222792,8 @@ self: { ({ mkDerivation, base, Cabal, cabal-doctest, doctest, ghc }: mkDerivation { pname = "no-recursion"; - version = "0.1.2.0"; - sha256 = "1asf13irq2py0pjd20l8kncxjj1mv0di9kbsjj0czpj51nqvmsvf"; + version = "0.1.2.2"; + sha256 = "0vdj0j29xlynv2n1z9gqk7yxh3kfynpyvj59kmpkbg8z3qhcrcg3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base ghc ]; testHaskellDepends = [ base doctest ]; @@ -222112,8 +223111,8 @@ self: { pname = "non-empty"; version = "0.3.5"; sha256 = "0xnxisshns862l5khb70i6pkzc9l95j33vkqlk046xl6galcxdvd"; - revision = "1"; - editedCabalFile = "15rjy9al76b001qd5nyzfpadxwhhsla02q50pm8d5p1a9y4z0vzp"; + revision = "2"; + editedCabalFile = "1zppyd9xf3wrdawcf92blv7ncf5p0jria8ki72k2ydj56097knpx"; libraryHaskellDepends = [ base containers deepseq QuickCheck utility-ht ]; @@ -223059,23 +224058,27 @@ self: { }) {}; "nri-redis" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, conduit, hedis - , nri-env-parser, nri-observability, nri-prelude, resourcet - , safe-exceptions, text, unordered-containers, uuid + ({ mkDerivation, aeson, async, base, bytestring, conduit + , containers, cryptohash-sha1, haskell-src-meta, hedis, megaparsec + , modern-uri, nri-env-parser, nri-observability, nri-prelude + , pcre-light, resourcet, safe-exceptions, template-haskell, text + , unordered-containers, uuid }: mkDerivation { pname = "nri-redis"; - version = "0.1.0.4"; - sha256 = "1ws5j8r4ny8dhw2bf2zqvq42ab9h44ly562cjrl6ha5mlk78mvpq"; + version = "0.2.0.2"; + sha256 = "0hp8sbf7pvnplzg13n42xfp169japknm3z0szzspg2khi5fgwk86"; libraryHaskellDepends = [ - aeson async base bytestring conduit hedis nri-env-parser - nri-observability nri-prelude resourcet safe-exceptions text - unordered-containers uuid + aeson async base bytestring conduit containers cryptohash-sha1 + haskell-src-meta hedis megaparsec modern-uri nri-env-parser + nri-observability nri-prelude pcre-light resourcet safe-exceptions + template-haskell text unordered-containers uuid ]; testHaskellDepends = [ - aeson async base bytestring conduit hedis nri-env-parser - nri-observability nri-prelude resourcet safe-exceptions text - unordered-containers uuid + aeson async base bytestring conduit containers cryptohash-sha1 + haskell-src-meta hedis megaparsec modern-uri nri-env-parser + nri-observability nri-prelude pcre-light resourcet safe-exceptions + template-haskell text unordered-containers uuid ]; description = "An intuitive hedis wrapper library"; license = lib.licenses.bsd3; @@ -223766,13 +224769,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "numhask_0_12_0_3" = callPackage - ({ mkDerivation, base, QuickCheck }: + "numhask_0_12_1_0" = callPackage + ({ mkDerivation, base, doctest-parallel, QuickCheck }: mkDerivation { pname = "numhask"; - version = "0.12.0.3"; - sha256 = "0rxh2avhfb2m5ss8b70k7dv3scla9ki7a8d73hnqlcfp7vjwm9qk"; - libraryHaskellDepends = [ base QuickCheck ]; + version = "0.12.1.0"; + sha256 = "1709f96j4jk81cqadb2lngr35j7jv7rixjx1i7qcccqr80dxhbq6"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest-parallel QuickCheck ]; description = "A numeric class hierarchy"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -224972,8 +225976,8 @@ self: { }: mkDerivation { pname = "oeis2"; - version = "1.0.8"; - sha256 = "1bimn9jq8nw152jgb4la1cczz6c9ij8hf2xjg59z6inq4ssgyjl9"; + version = "1.0.9"; + sha256 = "15wijk3dhncjwwmizqj9q1i32bjcidgy9lv2pq0bf2iqccyqc9nc"; libraryHaskellDepends = [ aeson base containers http-conduit lens lens-aeson text vector ]; @@ -225019,8 +226023,8 @@ self: { }: mkDerivation { pname = "ogma-cli"; - version = "1.4.0"; - sha256 = "096p2xx99d00p0qnrclnwdb4dq5wp1i2idz7wj1g7ccz3h26rm2z"; + version = "1.4.1"; + sha256 = "1r9yj862azfg4xngp0ghr9i6zawdaw4gkqb4nl6dpalsc7w0lx8w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ogma-core optparse-applicative ]; @@ -225034,21 +226038,21 @@ self: { }) {}; "ogma-core" = callPackage - ({ mkDerivation, aeson, base, bytestring, filepath, HUnit, IfElse - , mtl, ogma-extra, ogma-language-c, ogma-language-cocospec + ({ mkDerivation, aeson, base, bytestring, filepath, HUnit, mtl + , ogma-extra, ogma-language-c, ogma-language-cocospec , ogma-language-copilot, ogma-language-jsonspec, ogma-language-smv , ogma-spec, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2 }: mkDerivation { pname = "ogma-core"; - version = "1.4.0"; - sha256 = "03bbdqq69jqxfdaihykxxds4vcfvc6bydwkyz8zsanvsi5ifwza5"; + version = "1.4.1"; + sha256 = "1g2696iip5sshwgpf9rq769ivqrxc5km1rq0b2q50y91qfh583c9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring filepath IfElse mtl ogma-extra - ogma-language-c ogma-language-cocospec ogma-language-copilot - ogma-language-jsonspec ogma-language-smv ogma-spec + aeson base bytestring filepath mtl ogma-extra ogma-language-c + ogma-language-cocospec ogma-language-copilot ogma-language-jsonspec + ogma-language-smv ogma-spec ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -225065,8 +226069,8 @@ self: { }: mkDerivation { pname = "ogma-extra"; - version = "1.4.0"; - sha256 = "1lg9xph8hsb9jfxvyka6hqb9n9ijw4da29girjf6y16cf7ras3j0"; + version = "1.4.1"; + sha256 = "0mipcd5pyi0qxcsb0nhcb57rz7c64m2d36jq08sfvnfa161nhkx9"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ]; @@ -225083,8 +226087,8 @@ self: { }: mkDerivation { pname = "ogma-language-c"; - version = "1.4.0"; - sha256 = "0bvsm9d65akrv67n9l9j0j0b6bpxddhj2fgzp4jrjw07dcqsfwpi"; + version = "1.4.1"; + sha256 = "0pnpafz2zmzylq7gzgpzx9358h2lfy3hhpz5wz0fiihh8rfakjgd"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -225102,8 +226106,8 @@ self: { }: mkDerivation { pname = "ogma-language-cocospec"; - version = "1.4.0"; - sha256 = "1n2i2zxcci5ys0z00h28ndqyl7ay0i200y5krxnarwy5b28xcjnf"; + version = "1.4.1"; + sha256 = "16j2pqjymr03xkjc5fy2c0hp6c21j557c86ymhlmisy4hkd18195"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -225119,8 +226123,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ogma-language-copilot"; - version = "1.4.0"; - sha256 = "16ybs7c1404c1hsmrimqs9lx0m5d24kvqjd99ljmk4vw4hb686if"; + version = "1.4.1"; + sha256 = "0v2nw4mk891faayhvww2qjlrxfcqsgy2ha9zagaby2mfb5q1avh9"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints"; license = "unknown"; @@ -225174,8 +226178,8 @@ self: { }: mkDerivation { pname = "ogma-language-jsonspec"; - version = "1.4.0"; - sha256 = "0xrdnbsdm2a06r3n7i19bb9dcgssgb9fcly5c7rx7p4744lli3as"; + version = "1.4.1"; + sha256 = "1bl4ypyj3q6xy1dnfpywbii51521vf5la19jmy82scql9vs9y8rm"; libraryHaskellDepends = [ aeson base bytestring jsonpath megaparsec ogma-spec text ]; @@ -225191,8 +226195,8 @@ self: { }: mkDerivation { pname = "ogma-language-smv"; - version = "1.4.0"; - sha256 = "1f2afvxdjgkgdc64w0f455fb4r9w43nbsjjm4q2s4lhqhrf7qqa9"; + version = "1.4.1"; + sha256 = "0jwsqamnqnvy2id1js61a2xkxr5vj6w5xlpfqh0m1qqsgp2qg5kw"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -225208,8 +226212,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ogma-spec"; - version = "1.4.0"; - sha256 = "01lgymsrvkh75jjssxbn5wzw3d51fpc27ngf6pfmrkbd7fx39287"; + version = "1.4.1"; + sha256 = "0a0fdx1hpvncyaxsalknkwv8ms2a0p9giazgpkrikr4p14rb771k"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: JSON Frontend"; license = "unknown"; @@ -225400,6 +226404,27 @@ self: { broken = true; }) {}; + "ollama-haskell" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client, http-types + , silently, tasty, tasty-hunit, text, time + }: + mkDerivation { + pname = "ollama-haskell"; + version = "0.1.0.3"; + sha256 = "0fgh0c6vccdary0lp3prjn1xspq1i2bbzzsxxsnfpp002qlkz2wx"; + libraryHaskellDepends = [ + aeson base bytestring http-client http-types text time + ]; + testHaskellDepends = [ + aeson base bytestring http-client http-types silently tasty + tasty-hunit text time + ]; + description = "Haskell bindings for ollama"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "olwrapper" = callPackage ({ mkDerivation, base, bytestring, fay, fay-jquery, fay-text, lens , mtl, snap, snap-core, snap-loader-dynamic, snap-loader-static @@ -225465,25 +226490,6 @@ self: { }: mkDerivation { pname = "om-elm"; - version = "2.0.0.6"; - sha256 = "1gjrnrl3gvjg85ldgih7zi4sv53vrfl28jymn4z70xnpna7lvph9"; - libraryHaskellDepends = [ - base bytestring Cabal containers directory http-types safe - safe-exceptions template-haskell text unix wai - ]; - description = "Haskell utilities for building embedded Elm programs"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "om-elm_2_0_0_7" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, directory - , http-types, safe, safe-exceptions, template-haskell, text, unix - , wai - }: - mkDerivation { - pname = "om-elm"; version = "2.0.0.7"; sha256 = "0xf775929s76galzqfaq2zx0ks1wkcfqzqi3a1z3zg6w4fswiw67"; libraryHaskellDepends = [ @@ -225881,8 +226887,8 @@ self: { ({ mkDerivation, aeson, base, text }: mkDerivation { pname = "one-line-aeson-text"; - version = "0.1.0.5"; - sha256 = "10ngmv4xbz5w4fpgprrii6n74syia824sysja7ajyv27v6zfbihf"; + version = "0.1.0.6"; + sha256 = "145nnqb2hyhj8fiizkdka33728riw1xqy0i7wsvqhiqq2mhwhm6q"; libraryHaskellDepends = [ aeson base text ]; testHaskellDepends = [ aeson base text ]; description = "Pretty-printing short Aeson values as text"; @@ -225931,6 +226937,8 @@ self: { pname = "one-time-password"; version = "3.0.0.0"; sha256 = "0yark6agy421mk7zblzy4vpccbd1i53gpiysa0a7s9sh0szy4bql"; + revision = "3"; + editedCabalFile = "0dbck4bw97w1ci6yjgvgzzgbpr9xlnc8kghndigipxxy77sx5nqg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -226170,6 +227178,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "opaleye_0_10_4_0" = 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-types, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.10.4.0"; + sha256 = "16sj1kim44g93cnxkw26hp203ib7pkyzscalk5rfnlz409s1jhp9"; + 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-types void + ]; + testHaskellDepends = [ + aeson base bytestring containers contravariant dotenv hspec + hspec-discover multiset postgresql-simple product-profunctors + profunctors QuickCheck semigroups text time time-compat + transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -227291,8 +228329,8 @@ self: { }: mkDerivation { pname = "opentelemetry-plugin"; - version = "1.1.0"; - sha256 = "1lkfgkpbw340nh09dw53y4jv19plb6y19sbyb0fqpnf5g3zchmx0"; + version = "1.1.1"; + sha256 = "1sp6bzy0is704x18522b2kmbbsw3nbfz9x69rvidmpz0x52cpwbg"; libraryHaskellDepends = [ base bytestring containers ghc hs-opentelemetry-api hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk mwc-random stm @@ -227883,8 +228921,8 @@ self: { }: mkDerivation { pname = "opt-env-conf"; - version = "0.5.0.1"; - sha256 = "1x0zb436yrcvihr6g7g7gz2w0nhlbv3nqgf0rmaa3clp72a272rk"; + version = "0.8.0.0"; + sha256 = "0wfayv1k0xxl033knm4fjfc77ffijvh75xpg0g5f0bvc5i7kvgyc"; libraryHaskellDepends = [ aeson autodocodec autodocodec-nix autodocodec-schema autodocodec-yaml base containers hashable mtl path path-io @@ -228462,7 +229500,6 @@ self: { ]; description = "Types and functions for Kepler orbits"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "orc" = callPackage @@ -229056,8 +230093,8 @@ self: { pname = "ormolu"; version = "0.7.4.0"; sha256 = "1s7a9crjhbsmjkdvpv8ycygpiikv96s96p3lmjik4pb3q7idir2z"; - revision = "1"; - editedCabalFile = "0cr96kxx13l6vjmgx3jan0xcr7zn68gnihfqsdz6fi7jbd34jhzl"; + revision = "4"; + editedCabalFile = "1wk0yp9xh4g08p07nf1skpjqn8dy2kmza3zvj34gs70sycngkwj2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229675,8 +230712,8 @@ self: { ({ mkDerivation, base, containers, pa-prelude }: mkDerivation { pname = "pa-error-tree"; - version = "0.1.0.0"; - sha256 = "0ffnz0642kqkjancq5smjal6ap59p4jc8c8zr0qhv7wdbs83sbgq"; + version = "0.1.1.0"; + sha256 = "0qp63q5jcal4vd31lhyiz0vb5nmrjv9n2pxw0jl2avnpmbhsg7kd"; libraryHaskellDepends = [ base containers pa-prelude ]; description = "Collect a tree of errors and pretty-print"; license = lib.licenses.bsd3; @@ -229689,8 +230726,8 @@ self: { }: mkDerivation { pname = "pa-field-parser"; - version = "0.3.0.0"; - sha256 = "0myd5zcxz7cx731a9ymqnny34k2gjav7x7053f358r5dymmjp32j"; + version = "0.3.1.0"; + sha256 = "1wh4pki488id333kvd5k1zmr7pv2dxb2461w9bvmp6x0311hwkmb"; libraryHaskellDepends = [ aeson aeson-better-errors attoparsec base case-insensitive containers pa-error-tree pa-prelude scientific semigroupoids @@ -229702,18 +230739,18 @@ self: { "pa-json" = callPackage ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty, base - , base64-bytestring, bytestring, containers, pa-error-tree - , pa-field-parser, pa-label, pa-prelude, scientific, text, time - , vector + , base64-bytestring, bytestring, containers, mono-traversable + , pa-error-tree, pa-field-parser, pa-label, pa-prelude, scientific + , text, time, vector }: mkDerivation { pname = "pa-json"; - version = "0.3.0.0"; - sha256 = "0fwjv244kbbc9zixf64654fwdykk8h4qc7iv7w7l08bywmjrgrs5"; + version = "0.4.0.0"; + sha256 = "19h8irg3lyaa5ilgk3f7w0bfa9fvcamh79z6faqchnc5lhb7akgw"; libraryHaskellDepends = [ aeson aeson-better-errors aeson-pretty base base64-bytestring - bytestring containers pa-error-tree pa-field-parser pa-label - pa-prelude scientific text time vector + bytestring containers mono-traversable pa-error-tree + pa-field-parser pa-label pa-prelude scientific text time vector ]; description = "Our JSON parsers/encoders"; license = lib.licenses.bsd3; @@ -229723,8 +230760,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "pa-label"; - version = "0.1.1.0"; - sha256 = "10v107ck2c9vq09qcmh652f0w33c68xfbn1fcg042mh41j8860dl"; + version = "0.1.2.0"; + sha256 = "03y2cn6yy06xcpnjs5zc8hd8iba4k44wrrncl7ksplg8j3iank1x"; libraryHaskellDepends = [ base ]; description = "Labels, and labelled tuples and enums (GHC >9.2)"; license = lib.licenses.bsd3; @@ -229732,17 +230769,17 @@ self: { "pa-prelude" = callPackage ({ mkDerivation, base, bytestring, containers, error, exceptions - , mtl, profunctors, PyF, scientific, semigroupoids + , foldl, ghc-boot, mtl, profunctors, PyF, scientific, semigroupoids , template-haskell, text, these, validation-selective, vector }: mkDerivation { pname = "pa-prelude"; - version = "0.2.0.0"; - sha256 = "00gkyypa17ic2s019jmrxwjaylnfryn6nlg20ky1iip935y5y0b8"; + version = "0.3.0.0"; + sha256 = "0x4z94l62c7vgm0ya7bddxhzih07fb1kkjl0j0f6k64a42w67w00"; libraryHaskellDepends = [ - base bytestring containers error exceptions mtl profunctors PyF - scientific semigroupoids template-haskell text these - validation-selective vector + base bytestring containers error exceptions foldl ghc-boot mtl + profunctors PyF scientific semigroupoids template-haskell text + these validation-selective vector ]; description = "The Possehl Analytics Prelude"; license = lib.licenses.bsd3; @@ -230459,8 +231496,8 @@ self: { pname = "palette"; version = "0.3.0.3"; sha256 = "11d3011j680nhd0r2b29fhirld2vijwynwbgv8i5v1q7lgrb92az"; - revision = "1"; - editedCabalFile = "01fjw8i5m7d4zml2rd7nwpdlnxwasdfxglm3shgpk004gfk7lw1i"; + revision = "2"; + editedCabalFile = "1kc2va4x50lrgril36vc3dm5j42464m675jbadw7p31hg4vriqc3"; libraryHaskellDepends = [ array base colour containers MonadRandom ]; @@ -230591,39 +231628,39 @@ self: { ]; }) {}; - "pandoc_3_3" = callPackage + "pandoc_3_5" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions - , commonmark-pandoc, containers, crypton-connection + , commonmark-pandoc, containers, crypton, crypton-connection , crypton-x509-system, data-default, deepseq, Diff, directory, djot , doclayout, doctemplates, emojis, exceptions, file-embed, filepath , Glob, gridtables, haddock-library, http-client, http-client-tls , http-types, ipynb, jira-wiki-markup, JuicyPixels, mime-types, mtl , network, network-uri, pandoc-types, parsec, pretty, pretty-show - , process, random, safe, scientific, SHA, skylighting - , skylighting-core, split, syb, tagsoup, tasty, tasty-bench - , tasty-golden, tasty-hunit, tasty-quickcheck, temporary, texmath - , text, text-conversions, time, tls, typst, unicode-collation + , process, random, safe, scientific, skylighting, skylighting-core + , split, syb, tagsoup, tasty, tasty-bench, tasty-golden + , tasty-hunit, tasty-quickcheck, temporary, texmath, text + , text-conversions, time, tls, typst, unicode-collation , unicode-transforms, unix, vector, xml, xml-conduit, xml-types , yaml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "3.3"; - sha256 = "1vf6syw75ijdwig5b8nry65qwdl90wi4d9rxmpgkdvqbxs0y3fk2"; + version = "3.5"; + sha256 = "0p23nfdx8xb60g2xplpfh3084i04gi3hy88s8864i8mq5i5ajpql"; configureFlags = [ "-f-trypandoc" ]; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty array attoparsec base base64-bytestring binary blaze-html blaze-markup bytestring case-insensitive citeproc commonmark commonmark-extensions commonmark-pandoc containers - crypton-connection crypton-x509-system data-default deepseq + crypton crypton-connection crypton-x509-system data-default deepseq directory djot doclayout doctemplates emojis exceptions file-embed filepath Glob gridtables haddock-library http-client http-client-tls http-types ipynb jira-wiki-markup JuicyPixels mime-types mtl network network-uri pandoc-types parsec pretty - pretty-show process random safe scientific SHA skylighting + pretty-show process random safe scientific skylighting skylighting-core split syb tagsoup temporary texmath text text-conversions time tls typst unicode-collation unicode-transforms unix vector xml xml-conduit xml-types yaml @@ -230733,14 +231770,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "pandoc-cli_3_3" = callPackage + "pandoc-cli_3_5" = callPackage ({ mkDerivation, base, hslua-cli, pandoc, pandoc-lua-engine , pandoc-server, safe, temporary, text, wai-extra, warp }: mkDerivation { pname = "pandoc-cli"; - version = "3.3"; - sha256 = "1nalsmf7j6gab05mql80l3n7i675ghf05n93jji5k4pvby45nria"; + version = "3.5"; + sha256 = "0q6zhwgzipfcy36fsdnq5mkqq25kirscvfb347n3drmc2lnw5lmr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -230780,10 +231817,10 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.17.1"; - sha256 = "0md7i54rnvgn0yll7mwhi124nak0pfmpga34vnd996r6fgmnq5fb"; - revision = "2"; - editedCabalFile = "00x3nqlrp872wq2alaahkiv34ifj36bs2ql0n4vn2h19wlg1f578"; + version = "0.3.18.0"; + sha256 = "01kj17rf53kshfw7dd1875xi6s43b84hr7dvbfbhsb1c10pvdwac"; + revision = "1"; + editedCabalFile = "014brzc3r46b93hi4wzlyx9qf9qcf1js5qvpwk5rvzqpvazjglkj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -231121,25 +232158,25 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "pandoc-lua-engine_0_3_1" = callPackage + "pandoc-lua-engine_0_3_3" = callPackage ({ mkDerivation, aeson, base, bytestring, citeproc, containers - , data-default, directory, doclayout, doctemplates, exceptions - , filepath, hslua, hslua-module-doclayout, hslua-module-path - , hslua-module-system, hslua-module-text, hslua-module-version - , hslua-module-zip, hslua-repl, lpeg, mtl, pandoc - , pandoc-lua-marshal, pandoc-types, parsec, SHA, tasty + , crypton, data-default, directory, doclayout, doctemplates + , exceptions, filepath, hslua, hslua-module-doclayout + , hslua-module-path, hslua-module-system, hslua-module-text + , hslua-module-version, hslua-module-zip, hslua-repl, lpeg, mtl + , pandoc, pandoc-lua-marshal, pandoc-types, parsec, tasty , tasty-golden, tasty-hunit, tasty-lua, text }: mkDerivation { pname = "pandoc-lua-engine"; - version = "0.3.1"; - sha256 = "1k2r7l3a970zink3dnw5xrgfn9sy9ysqa6j2mz2l631v5qsg075q"; + version = "0.3.3"; + sha256 = "0jzddmg2qnbdv83hrfmxhfibp8p1mm9j32vxm89kg6fbx688n5hw"; libraryHaskellDepends = [ - aeson base bytestring citeproc containers data-default doclayout - doctemplates exceptions hslua hslua-module-doclayout + aeson base bytestring citeproc containers crypton data-default + doclayout doctemplates exceptions hslua hslua-module-doclayout hslua-module-path hslua-module-system hslua-module-text hslua-module-version hslua-module-zip hslua-repl lpeg mtl pandoc - pandoc-lua-marshal pandoc-types parsec SHA text + pandoc-lua-marshal pandoc-types parsec text ]; testHaskellDepends = [ base bytestring data-default directory exceptions filepath hslua @@ -231157,8 +232194,8 @@ self: { }: mkDerivation { pname = "pandoc-lua-marshal"; - version = "0.2.7.1"; - sha256 = "1yg1hv2xaw2yr036xc6bp2dd0dr4kw1g6ss9a8ahxs8kd670myxw"; + version = "0.2.9"; + sha256 = "04qqjh1f1dp912j5fgvj6sd3ky5cf0hngr0bl37178yikr3mm2k1"; libraryHaskellDepends = [ aeson base bytestring containers exceptions hslua hslua-list hslua-marshalling pandoc-types safe text @@ -231281,6 +232318,38 @@ self: { mainProgram = "pandoc-plot"; }) {}; + "pandoc-plot_1_9_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , directory, filepath, gitrev, hashable, hspec-expectations + , lifted-async, lifted-base, mtl, optparse-applicative, pandoc + , pandoc-types, shakespeare, tagsoup, tasty, tasty-hspec + , tasty-hunit, template-haskell, text, typed-process, yaml + }: + mkDerivation { + pname = "pandoc-plot"; + version = "1.9.1"; + sha256 = "0d6lknjnlzg4a7sx311kpdi94yq7fp19lhvwbsf7rvc3ykx0hjm3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable lifted-async lifted-base mtl pandoc pandoc-types + shakespeare tagsoup template-haskell text typed-process yaml + ]; + executableHaskellDepends = [ + base directory filepath gitrev optparse-applicative pandoc + pandoc-types template-haskell text typed-process + ]; + testHaskellDepends = [ + base containers directory filepath hspec-expectations pandoc-types + tasty tasty-hspec tasty-hunit text + ]; + description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "pandoc-plot"; + }) {}; + "pandoc-pyplot" = callPackage ({ mkDerivation, base, containers, data-default-class, deepseq , directory, filepath, hashable, hspec, hspec-expectations, mtl @@ -231362,7 +232431,7 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "pandoc-server_0_1_0_7" = callPackage + "pandoc-server_0_1_0_9" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, data-default, doctemplates, pandoc, pandoc-types , servant-server, skylighting, text, unicode-collation, wai @@ -231370,8 +232439,8 @@ self: { }: mkDerivation { pname = "pandoc-server"; - version = "0.1.0.7"; - sha256 = "1nrcb1r4gjgpw2vgz32dn7h1qinx1lxnlbq7cf1wggm86ac7jz3a"; + version = "0.1.0.9"; + sha256 = "1bdfd0lq0vdrr8rvjxin6j011jg4kn210zzpz2lixvc8wfcw66w8"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring containers data-default doctemplates pandoc pandoc-types servant-server skylighting text @@ -231523,8 +232592,8 @@ self: { }: mkDerivation { pname = "pandoc-vimhl"; - version = "0.3.2.0"; - sha256 = "0ssq2ckcnnbp4mig9h788lyk164zb5rj2byqmk5vv10y86zbp3nr"; + version = "0.3.2.1"; + sha256 = "0ngc1p0vss6i5s9k5lsk9wf92z3di8qv6n1bgb923lnvs567lwk0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -231811,8 +232880,8 @@ self: { pname = "pantry"; version = "0.10.0"; sha256 = "1f0ck7j82km4sy1ia2iqv9aqkdr3p2h8sarbksrsx2dq68552xym"; - revision = "1"; - editedCabalFile = "1kz5glyqd86g8jg9n7cvgmamw0kw4fq2wsf7fd5hgjf4fhbs2scd"; + revision = "2"; + editedCabalFile = "1v2d03rzrj0gmilx2qa1c0y1srzjh96xq02sd7qarc2kjw4rjgyi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232508,10 +233577,8 @@ self: { }: mkDerivation { pname = "parameterized-utils"; - version = "2.1.8.0"; - sha256 = "026lrdnw5rjvny380rmrzpwhmcfgp551whbk0mnx2y2q6ij0sjfm"; - revision = "2"; - editedCabalFile = "1kk13926s885fxss2hz6h438k526s8agnhg8v199qam862f16yhh"; + version = "2.1.9.0"; + sha256 = "15yn958adkivyg7qbbbi20ja8smcdjyslkk3mxswl0r0bfgz2y70"; libraryHaskellDepends = [ base base-orphans constraints containers deepseq ghc-prim hashable hashtables indexed-traversable lens mtl profunctors @@ -233270,20 +234337,17 @@ self: { }) {}; "parsers" = callPackage - ({ mkDerivation, attoparsec, base, base-orphans, binary, bytestring - , charset, containers, mtl, parsec, QuickCheck - , quickcheck-instances, scientific, text, transformers - , unordered-containers + ({ mkDerivation, attoparsec, base, binary, bytestring, charset + , containers, mtl, parsec, QuickCheck, quickcheck-instances + , scientific, text, transformers, unordered-containers }: mkDerivation { pname = "parsers"; - version = "0.12.11"; - sha256 = "068k7fm0s13z0jkkffc149cqcxnzpk1m066lp4ccdfcb41km1zwi"; - revision = "2"; - editedCabalFile = "1wx06q6hkib00brrf4rpvbgrcipjmb1g3xhwdqjhkh31skhlimii"; + version = "0.12.12"; + sha256 = "1g16qrhacjzfcja2wn5936xz9bwqs80xxmj189d2lwwyga5m77nx"; libraryHaskellDepends = [ - attoparsec base base-orphans binary charset containers mtl parsec - scientific text transformers unordered-containers + attoparsec base binary charset containers mtl parsec scientific + text transformers unordered-containers ]; testHaskellDepends = [ attoparsec base bytestring parsec QuickCheck quickcheck-instances @@ -233654,6 +234718,30 @@ self: { broken = true; }) {}; + "paseto" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring + , basement, binary, bytestring, containers, crypton, deepseq + , hedgehog, memory, mtl, parsec, text, time, transformers-except + }: + mkDerivation { + pname = "paseto"; + version = "0.1.1.1"; + sha256 = "0z3dvcqz7jibz2cgjwami78sf4cpgi39cd16c5hlvali0fj99pqd"; + libraryHaskellDepends = [ + aeson base base16-bytestring base64-bytestring basement binary + bytestring containers crypton deepseq memory mtl parsec text time + transformers-except + ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring containers crypton hedgehog + memory mtl text time transformers-except + ]; + description = "Platform-Agnostic Security Tokens"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "passage" = callPackage ({ mkDerivation, array, base, containers, directory, filepath , GraphSCC, monadLib, mwc-random, pretty, primitive, process @@ -233777,7 +234865,32 @@ self: { ]; description = "Hashing and checking of passwords"; license = lib.licenses.bsd3; - platforms = lib.platforms.x86; + maintainers = [ lib.maintainers.cdepillabout ]; + }) {}; + + "password_3_1_0_0" = callPackage + ({ mkDerivation, base, base-compat, base64, bytestring, Cabal + , cabal-doctest, crypton, doctest, memory, password-types + , QuickCheck, quickcheck-instances, scrypt, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text + }: + mkDerivation { + pname = "password"; + version = "3.1.0.0"; + sha256 = "0rmcmp9bwa4nqma1pphjga2bmd5axw3579v6i1sh5yih1cfqzi2q"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base64 bytestring crypton memory password-types + template-haskell text + ]; + testHaskellDepends = [ + base base-compat base64 bytestring crypton doctest memory + password-types QuickCheck quickcheck-instances scrypt tasty + tasty-hunit tasty-quickcheck template-haskell text + ]; + description = "Hashing and checking of passwords"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.cdepillabout ]; }) {}; @@ -233802,7 +234915,6 @@ self: { ]; description = "typeclass instances for password package"; license = lib.licenses.bsd3; - platforms = lib.platforms.x86; maintainers = [ lib.maintainers.cdepillabout ]; }) {}; @@ -233920,28 +235032,29 @@ self: { "patat" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, async, base , base64-bytestring, bytestring, colour, containers, directory - , filepath, mtl, network, network-uri, optparse-applicative, pandoc - , pandoc-types, process, QuickCheck, random, skylighting, tasty - , tasty-hunit, tasty-quickcheck, terminal-size, text, time - , unordered-containers, vector, wcwidth, yaml + , filepath, goldplate, hashable, mtl, network, network-uri + , optparse-applicative, pandoc, pandoc-types, process, QuickCheck + , random, skylighting, tasty, tasty-hunit, tasty-quickcheck + , terminal-size, text, time, unordered-containers, vector, wcwidth + , yaml }: mkDerivation { pname = "patat"; - version = "0.12.0.0"; - sha256 = "0a903f34y1a3aipff2c4zl86smxgi8agbawkgdd6ac7px4zdz4sv"; + version = "0.13.0.0"; + sha256 = "02w6g22012kx098x757609nwwxk50nry2lc1lfxjrp6fsrz5c1nb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint async base base64-bytestring - bytestring colour containers directory filepath mtl network - network-uri optparse-applicative pandoc pandoc-types process random - skylighting terminal-size text time unordered-containers vector - wcwidth yaml + bytestring colour containers directory filepath hashable mtl + network network-uri optparse-applicative pandoc pandoc-types + process random skylighting terminal-size text time + unordered-containers vector wcwidth yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - ansi-terminal base directory pandoc QuickCheck tasty tasty-hunit - tasty-quickcheck text + ansi-terminal base directory goldplate pandoc QuickCheck tasty + tasty-hunit tasty-quickcheck text ]; description = "Terminal-based presentations using Pandoc"; license = lib.licenses.gpl2Only; @@ -233957,8 +235070,8 @@ self: { }: mkDerivation { pname = "patch"; - version = "0.0.8.2"; - sha256 = "15r2sjlpvp22iwd7qa1lqdq7n8nvqv2klvzrlm3phqq3j5n5x5y5"; + version = "0.0.8.3"; + sha256 = "0x7n18wq7mcy0rd9b5jvxynn800xk9wwa4idfa370v8c9vypvq0c"; libraryHaskellDepends = [ base commutative-semigroups constraints-extras containers dependent-map dependent-sum indexed-traversable lens @@ -234032,29 +235145,6 @@ self: { broken = true; }) {}; - "path_0_9_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions - , filepath, genvalidity, genvalidity-hspec, genvalidity-property - , hashable, hspec, mtl, QuickCheck, template-haskell, text - , validity - }: - mkDerivation { - pname = "path"; - version = "0.9.0"; - sha256 = "14h811rrydpiwi1rdi5wmcdlcq2qjld3iv92p4czqf08a7lxaz4g"; - libraryHaskellDepends = [ - aeson base deepseq exceptions filepath hashable template-haskell - text - ]; - testHaskellDepends = [ - aeson base bytestring filepath genvalidity genvalidity-hspec - genvalidity-property hspec mtl QuickCheck template-haskell validity - ]; - description = "Support for well-typed paths"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "path" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions , filepath, genvalidity, genvalidity-hspec, genvalidity-property @@ -234347,6 +235437,8 @@ self: { pname = "pathtype"; version = "0.8.1.3"; sha256 = "0wik0dpqd0bjwpsjwgqzn6cghrjkh5rbv5ggkyj50savh30y9mkj"; + revision = "1"; + editedCabalFile = "1c3qzn30dkfl92i0c67wlr9c8nx75vh02r5w12rr4m0icx3mdc44"; libraryHaskellDepends = [ base deepseq directory doctest-exitcode-stdio QuickCheck semigroups tagged time transformers utility-ht @@ -235775,6 +236867,31 @@ self: { mainProgram = "perf-explore"; }) {}; + "perf_0_13_0_0" = callPackage + ({ mkDerivation, base, clock, containers, deepseq, formatn, mtl + , numhask-space, optparse-applicative, recursion-schemes, text + , vector + }: + mkDerivation { + pname = "perf"; + version = "0.13.0.0"; + sha256 = "0xqwg42cl9f1s9niyc2r9py75w26bp7rlax04ifjjbbq5y9aw2gb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base clock containers deepseq formatn mtl numhask-space + optparse-applicative recursion-schemes text vector + ]; + executableHaskellDepends = [ + base clock containers deepseq formatn mtl optparse-applicative text + ]; + benchmarkHaskellDepends = [ base ]; + description = "Performance methods and monad"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "perf-explore"; + }) {}; + "perf-analysis" = callPackage ({ mkDerivation, base, containers, deepseq, optparse-generic, perf , protolude, readme-lhs, scientific, tdigest, text, text-format @@ -236227,44 +237344,6 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.14.6.2"; - sha256 = "1i76jnq6vv8qc1xcp5jg5n0033q8s5fhrja1f4v606q7jz9fiilg"; - libraryHaskellDepends = [ - aeson attoparsec attoparsec-aeson base base64-bytestring blaze-html - bytestring conduit containers deepseq fast-logger http-api-data - lift-type monad-logger mtl path-pieces resource-pool resourcet - scientific silently template-haskell text th-lift-instances time - transformers unliftio unliftio-core unordered-containers vault - vector - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers deepseq fast-logger hspec http-api-data - monad-logger mtl path-pieces QuickCheck quickcheck-instances - resource-pool resourcet scientific shakespeare silently - template-haskell text th-lift-instances time transformers unliftio - unliftio-core unordered-containers vector - ]; - benchmarkHaskellDepends = [ - base criterion deepseq file-embed template-haskell text - ]; - description = "Type-safe, multi-backend data serialization"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.psibi ]; - }) {}; - - "persistent_2_14_6_3" = callPackage - ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base - , base64-bytestring, blaze-html, bytestring, conduit, containers - , criterion, deepseq, fast-logger, file-embed, hspec, http-api-data - , lift-type, monad-logger, mtl, path-pieces, QuickCheck - , quickcheck-instances, resource-pool, resourcet, scientific - , shakespeare, silently, template-haskell, text, th-lift-instances - , time, transformers, unliftio, unliftio-core, unordered-containers - , vault, vector - }: - mkDerivation { - pname = "persistent"; version = "2.14.6.3"; sha256 = "1nqmd1ml1s4cm9hwfz9cz5qj4i9zm8ip69gmgysfgbs0h64f7w2d"; libraryHaskellDepends = [ @@ -236288,7 +237367,6 @@ self: { ]; description = "Type-safe, multi-backend data serialization"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.psibi ]; }) {}; @@ -236392,8 +237470,8 @@ self: { }: mkDerivation { pname = "persistent-documentation"; - version = "0.1.0.4"; - sha256 = "0ib56hz4q83knw6lqdbfcflnpwd0x8381p67yibmnbyn9p5b6r1q"; + version = "0.1.0.5"; + sha256 = "032mfnsz5kpy1022gc2w9y0g4fjhqwq07zb2r8arjdhzzhbirwk2"; libraryHaskellDepends = [ base containers mtl persistent template-haskell text ]; @@ -236594,10 +237672,8 @@ self: { }: mkDerivation { pname = "persistent-mongoDB"; - version = "2.13.0.1"; - sha256 = "1ck74kpzkz623c43qb8r1cjq8chi2p721vx95zrpciz8jm496235"; - revision = "4"; - editedCabalFile = "01zfwp8jyr65sc3mijv1a8x0zs4csmr71nn6ksr9d18p3lpd9zz8"; + version = "2.13.1.0"; + sha256 = "08zal5arbclq6z05i5nz31yqiny2vgj0ky94bqff1jp72ly32rp3"; libraryHaskellDepends = [ aeson base bson bytestring cereal conduit http-api-data mongoDB network path-pieces persistent resource-pool resourcet text time @@ -236625,6 +237701,8 @@ self: { pname = "persistent-mtl"; version = "0.5.1"; sha256 = "13sz2j3g5vyvfhs97xzmzcb5a83lg4wlzmqnbmwg6l419jpj23fq"; + revision = "1"; + editedCabalFile = "0frfp7hifii11sk85j44rbd4ic0inp2gzzpfdylkbrbpfw32s54d"; libraryHaskellDepends = [ base conduit containers exceptions monad-logger mtl persistent resource-pool resourcet text transformers unliftio unliftio-core @@ -237326,6 +238404,8 @@ self: { pname = "pg-entity"; version = "0.0.4.4"; sha256 = "0xbsys4h6p84m3vh076v5cjrmf2v9yl8d44zaknfxbjc8ssfbmh2"; + revision = "5"; + editedCabalFile = "1dawp5f6pha1z96bkx34whpqik20azx6aizcv8xrmj0ai6vvkhik"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -237765,6 +238845,8 @@ self: { libraryHaskellDepends = [ base containers quantizer ]; description = "Extended functionality of PhLADiPreLiO"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "phladiprelio-general-shared" = callPackage @@ -237778,6 +238860,7 @@ self: { ]; description = "A shared by different general implementations of the PhLADiPreLiO functionality"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phladiprelio-general-simple" = callPackage @@ -237806,6 +238889,7 @@ self: { ]; description = "A generalized functionality of PhLADiPreLiO for different languages that uses hash algorithms"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phladiprelio-rhythmicity-shared" = callPackage @@ -237844,6 +238928,7 @@ self: { ]; description = "A shared by different Ukrainian implementations of the PhLADiPreLiO functionality"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phladiprelio-ukrainian-simple" = callPackage @@ -237884,6 +238969,7 @@ self: { ]; description = "A PhLADiPreLiO implementation for Ukrainian that uses hashes and asynchronous concurrency"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "phladiprelioUkr"; }) {}; @@ -238161,7 +239247,9 @@ self: { ]; description = "A library for working with generalized phonetic languages usage"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "pldPL"; + broken = true; }) {}; "phonetic-languages-plus" = callPackage @@ -238552,7 +239640,9 @@ self: { ]; description = "Prepares Ukrainian text to be used as a PhLADiPreLiO text"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "unconcatUkr"; + broken = true; }) {}; "phonetic-languages-vector" = callPackage @@ -239876,17 +240966,15 @@ self: { pname = "pipes-extras"; version = "1.0.15"; sha256 = "1cyb05bv5xkarab3090ikpjiqm79lr46n3nalplliz8jr4x67a82"; - revision = "8"; - editedCabalFile = "1lh58slrw21gm799zp963k34ypcqhxz36j15qzhh1nh5zazasq8m"; + revision = "9"; + editedCabalFile = "00wd0vp60dma62mxxxaj1njcsyz9pazy2j3zpvfppr7zphckhq6p"; libraryHaskellDepends = [ base foldl lens pipes transformers ]; testHaskellDepends = [ base HUnit pipes test-framework test-framework-hunit transformers ]; description = "Extra utilities for pipes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Gabriella439 ]; - broken = true; }) {}; "pipes-fastx" = callPackage @@ -240900,6 +241988,18 @@ self: { mainProgram = "place-cursor-at"; }) {inherit (pkgs.xorg) libXinerama;}; + "placeholder" = callPackage + ({ mkDerivation, base, filepath, ghc-prim, tasty, tasty-hunit }: + mkDerivation { + pname = "placeholder"; + version = "0"; + sha256 = "0b6irf7nhr2p5w2wh4fvwaa8ajh45vdnnpqwrwxz7ladfmfbw2r9"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base filepath ghc-prim tasty tasty-hunit ]; + description = "placeholder definitions for TODO and unimplemented"; + license = "(BSD-2-Clause OR Apache-2.0)"; + }) {}; + "placeholders" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -241893,19 +242993,17 @@ self: { "pointed" = callPackage ({ mkDerivation, base, comonad, containers, data-default-class - , hashable, kan-extensions, semigroupoids, semigroups, stm, tagged + , hashable, kan-extensions, semigroupoids, stm, tagged , transformers, transformers-compat, unordered-containers }: mkDerivation { pname = "pointed"; - version = "5.0.4"; - sha256 = "1mv06x2hscs220w4acm5jwg96vi4faky6ir9hnljfry3n2r2xix3"; - revision = "3"; - editedCabalFile = "070yfc5b8rww0zyvpf7jfd0k30p53wdr8mdn289afmfjk1p69kx6"; + version = "5.0.5"; + sha256 = "1wbfpd978pnkrbi05sf0yj6f50flxr9vl5m85xv3y22hzg6rb7gr"; libraryHaskellDepends = [ base comonad containers data-default-class hashable kan-extensions - semigroupoids semigroups stm tagged transformers - transformers-compat unordered-containers + semigroupoids stm tagged transformers transformers-compat + unordered-containers ]; description = "Pointed and copointed data"; license = lib.licenses.bsd3; @@ -241943,6 +243041,8 @@ self: { pname = "pointfree"; version = "1.1.1.12"; sha256 = "0mrrdmslcdk2ld8g78i00jwidn765w3l7la0qdlawc2lc17w2ili"; + revision = "1"; + editedCabalFile = "1nl2rbkg4dl5ljg77fazg88xs496hx1q7vj3b9wiqvf96g9j2lyf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -242330,8 +243430,8 @@ self: { ({ mkDerivation, attoparsec, base, containers, ghc, text }: mkDerivation { pname = "pollock"; - version = "0.1.0.1"; - sha256 = "0ac33p84bizw2b2dndx3jlpwmfd707xcfd7d96ai6if04db43rzr"; + version = "0.1.0.2"; + sha256 = "112knjwg24mq9gigh3jmnhn3mgv51kawy0k8b7ys856429zpbflk"; libraryHaskellDepends = [ attoparsec base containers ghc text ]; description = "Functionality to help examine Haddock information of a module"; license = lib.licenses.mit; @@ -242594,6 +243694,8 @@ self: { pname = "polysemy"; version = "1.9.2.0"; sha256 = "1qwy6a59jdlzc2y7f422yvlwvd9spsgbbpm2r7jcasgxiwq3fkr0"; + revision = "1"; + editedCabalFile = "0cfnh4alps028rsn2n1kji0rdld84qf2ah10b8d036mlmbz4vsy0"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ async base containers first-class-families mtl stm syb @@ -242696,6 +243798,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Polysemy wrapper around the Blockfrost client"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polysemy-check" = callPackage @@ -243144,6 +244248,8 @@ self: { pname = "polysemy-plugin"; version = "0.4.5.2"; sha256 = "1inl8wk36fyc6m1fp8pyxmrc82bmznr5f1zasfmxj9q5xxbig87f"; + revision = "1"; + editedCabalFile = "1ng4wxna498jrx2y5aa7r00h563846hqmbvj51bhrp4ndqdmkdwk"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers ghc ghc-tcplugins-extra polysemy syb transformers @@ -245681,6 +246787,7 @@ self: { description = "REST API for any Postgres database"; license = lib.licenses.mit; mainProgram = "postgrest"; + maintainers = [ lib.maintainers.wolfgangwalther ]; }) {}; "postgrest-ws" = callPackage @@ -246090,6 +247197,90 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ppad-hmac-drbg" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring + , criterion, ppad-sha256, ppad-sha512, primitive, tasty + , tasty-hunit + }: + mkDerivation { + pname = "ppad-hmac-drbg"; + version = "0.1.1"; + sha256 = "0wqkl3bk2yzyz4ldzx8njf9qawwfcr9ya3alpmdqid68bldagxl7"; + libraryHaskellDepends = [ base bytestring primitive ]; + testHaskellDepends = [ + attoparsec base base16-bytestring bytestring ppad-sha256 + ppad-sha512 tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ + base bytestring criterion ppad-sha256 + ]; + description = "HMAC-based deterministic random bit generator"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "ppad-secp256k1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, criterion, deepseq, ppad-hmac-drbg, ppad-sha256 + , tasty, tasty-hunit, text + }: + mkDerivation { + pname = "ppad-secp256k1"; + version = "0.1.0"; + sha256 = "16a25c4l7bkv8sjjj0nf7i0ml6kvgvr9bajsgqx8aapbnamk6894"; + libraryHaskellDepends = [ + base bytestring ppad-hmac-drbg ppad-sha256 + ]; + testHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring tasty + tasty-hunit text + ]; + benchmarkHaskellDepends = [ + base base16-bytestring bytestring criterion deepseq + ]; + description = "Schnorr signatures & ECDSA on the elliptic curve secp256k1"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "ppad-sha256" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , criterion, SHA, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "ppad-sha256"; + version = "0.2.1"; + sha256 = "0l33nmpp26d9mha8cr2r4p8b1xp2211rdm1gd9rk6lfg1vzw7a1f"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base bytestring criterion SHA ]; + description = "The SHA-256 and HMAC-SHA256 algorithms"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "ppad-sha512" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , criterion, SHA, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "ppad-sha512"; + version = "0.1.1"; + sha256 = "0hm4z1samk203p7m2qwfg58mcadmybc987plg31rwf29s0z63yvy"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base bytestring criterion SHA ]; + description = "The SHA-512 and HMAC-SHA512 algorithms"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ppm" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -246387,12 +247578,17 @@ self: { }) {}; "predicate-transformers" = callPackage - ({ mkDerivation, adjunctions, base, deepseq, lens, mtl }: + ({ mkDerivation, adjunctions, base, deepseq, pretty-simple + , prettyprinter, recover-rtti, text + }: mkDerivation { pname = "predicate-transformers"; - version = "0.15.0.0"; - sha256 = "0kjmdbm0a7c2vik0hansvkri7c9zp5cfazgk00r65syflsgfk91s"; - libraryHaskellDepends = [ adjunctions base deepseq lens mtl ]; + version = "0.17.0.0"; + sha256 = "0ifqa30w96jm5l9834qcga6ml2vyyk9ywd0ij7is0jf4gp1rdw5c"; + libraryHaskellDepends = [ + adjunctions base deepseq pretty-simple prettyprinter recover-rtti + text + ]; description = "A library for writing predicates and transformations over predicates in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -247227,17 +248423,18 @@ self: { "prettychart" = callPackage ({ mkDerivation, async, base, box, bytestring, chart-svg - , containers, markup-parse, numhask-space, optics-core, text, time - , web-rep + , containers, doctest-parallel, markup-parse, numhask-space + , optics-core, text, time, web-rep }: mkDerivation { pname = "prettychart"; - version = "0.2.0.0"; - sha256 = "1mpbn9i9h3g374nn6v7h664rypcxwbq3l94bxxmwy6jzpp8hzz0q"; + version = "0.2.2.0"; + sha256 = "1mj20bhpjn7gf7kb123zmn27bfpk1zncqqg606xmdcyx225m43al"; libraryHaskellDepends = [ async base box bytestring chart-svg containers markup-parse numhask-space optics-core text time web-rep ]; + testHaskellDepends = [ base doctest-parallel ]; description = "Pretty print charts from ghci"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -247391,8 +248588,8 @@ self: { pname = "prettyprinter-graphviz"; version = "1.1.0.0"; sha256 = "1lqf296jr2jfg86apn729payq2rkk95pdidl7n62xx4bniax7fvm"; - revision = "1"; - editedCabalFile = "1q8mp6rzb9l6jm8bc902si99ns2nw3vzimqvzwhxbkxf4ljdzqwq"; + revision = "2"; + editedCabalFile = "0rrh7rkwv3rbd974ylwvsm8wdjk40i7sp95vjqq49zm68l3h6094"; libraryHaskellDepends = [ base graphviz prettyprinter text ]; description = "A prettyprinter backend for graphviz"; license = lib.licenses.bsd3; @@ -247422,10 +248619,8 @@ self: { ({ mkDerivation, base, lucid, prettyprinter, text }: mkDerivation { pname = "prettyprinter-lucid"; - version = "0.1.0.1"; - sha256 = "0m8dbxzs22zbahpr6r1frlfqyw581wyg92vswm3gi2qqpj406djh"; - revision = "3"; - editedCabalFile = "01ngq4fx3d5xpy0kxfragajjp746dhighsvmcyjwyb65w1z8fflq"; + version = "0.2.0.1"; + sha256 = "1kmbqywn15djxsxb98qrrn9cfdpvmq8x4h29fzdx76bsv5zrlvvk"; libraryHaskellDepends = [ base lucid prettyprinter text ]; description = "A prettyprinter backend for lucid"; license = lib.licenses.bsd3; @@ -247695,8 +248890,8 @@ self: { pname = "primitive"; version = "0.9.0.0"; sha256 = "1iwr176mx2xc96vgvzlby8z8s9d4vhbj266n89hp6kf9j794nvb9"; - revision = "1"; - editedCabalFile = "0g6rsz6hbpyfwbai04gmxil7wfcs1nd0xxcycvqwfn9mkr0ca21f"; + revision = "2"; + editedCabalFile = "0nc7cd9921bzf31k48pnmx3k2bfaxakgv3jchn4215qzzx7by86y"; libraryHaskellDepends = [ base deepseq template-haskell transformers ]; @@ -247799,8 +248994,8 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.10.2"; - sha256 = "0z7xgd42dg5dq2ikjdbxjq39acv98s0p0sk3fincapw9vnxicnqy"; + version = "0.10.2.1"; + sha256 = "0h3q5zr0k3rns1mq4y56d2ji477h1kjqsv6hp3bbs0yfzkjjk5z2"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive primitive-unlifted profunctors vector @@ -248007,6 +249202,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "primitive-unlifted_2_2_0_0" = callPackage + ({ mkDerivation, array, base, bytestring, primitive, QuickCheck + , quickcheck-classes-base, stm, tasty, tasty-quickcheck, text-short + }: + mkDerivation { + pname = "primitive-unlifted"; + version = "2.2.0.0"; + sha256 = "06r10v5dp1a4zpvv8ffmjab8bjsn5gmkx7irr02xwahwb8q4dv69"; + libraryHaskellDepends = [ + array base bytestring primitive text-short + ]; + testHaskellDepends = [ + base primitive QuickCheck quickcheck-classes-base stm tasty + tasty-quickcheck + ]; + description = "Primitive GHC types with unlifted types inside"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "primula-board" = callPackage ({ mkDerivation, base, ConfigFile, containers, directory, happstack , happstack-helpers, happstack-server, happstack-state, hsp @@ -248380,6 +249595,8 @@ self: { pname = "probability"; version = "0.2.8"; sha256 = "06vaq2wsy63vnsprpz0921v5mdqnhp58h1ly721lwrxyd8lg57hg"; + revision = "1"; + editedCabalFile = "15aj8y5yc1xmmvz1sd9kyaf3vbxzc9xw3wkhk5d3a9yqfn2cy2k5"; libraryHaskellDepends = [ base containers random transformers utility-ht ]; @@ -248444,12 +249661,12 @@ self: { license = lib.licenses.mit; }) {}; - "process_1_6_22_0" = callPackage + "process_1_6_25_0" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, unix }: mkDerivation { pname = "process"; - version = "1.6.22.0"; - sha256 = "1yv8pk2g8d5wrw3306ar76fzgd6iyra9ci0syjl0b4pmwxff41ps"; + version = "1.6.25.0"; + sha256 = "0rbfwyz2418nw15fb5a8l1f8vsyzcz4wjakpx49b259rdibf0vs9"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; description = "Process libraries"; license = lib.licenses.bsd3; @@ -249731,8 +250948,8 @@ self: { }: mkDerivation { pname = "prop-unit"; - version = "0.1.2"; - sha256 = "0gs93yhfm2mc5x6j2khcmrxf1la84hy0gyixmcxwdvy675lx06p4"; + version = "0.1.3"; + sha256 = "0wiqdmlbxq4792lw3gm99fngbb5jyhwimqf4fb757aqm1jmi9h7b"; libraryHaskellDepends = [ base hedgehog tasty tasty-hedgehog ]; testHaskellDepends = [ base hedgehog tasty tasty-hedgehog tasty-hunit @@ -249769,6 +250986,8 @@ self: { testHaskellDepends = [ base containers ]; description = "A Propagator Library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "propellor" = callPackage @@ -249838,6 +251057,22 @@ self: { broken = true; }) {}; + "property-matchers" = callPackage + ({ mkDerivation, adjunctions, base, deepseq, pretty-simple + , prettyprinter, recover-rtti, text + }: + mkDerivation { + pname = "property-matchers"; + version = "0.1.0.0"; + sha256 = "1c35mgppmlgv00x46p43l58dgrjc2pjxwfsaq4lkqq14dwpb7anj"; + libraryHaskellDepends = [ + adjunctions base deepseq pretty-simple prettyprinter recover-rtti + text + ]; + description = "A library for tests, based on transforming and writing properties"; + license = lib.licenses.bsd3; + }) {}; + "proplang" = callPackage ({ mkDerivation, base, glade, glib, gtk }: mkDerivation { @@ -249869,8 +251104,8 @@ self: { pname = "proquint"; version = "0.1.0.0"; sha256 = "04hhvrrclyav0nhk6zqp9s58vxad8ndi6yw851qprd6h7wr57wg5"; - revision = "1"; - editedCabalFile = "1p3s3jpck7w9h5qxqp9w59mmf6yr9bgx339l1m01f6yjq720a6l6"; + revision = "2"; + editedCabalFile = "1bhc2cz76fi3rrn36nrgzi531f3p18k3n7q5mp1xyjz3vv0b2h2d"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Proquints: Identifiers that are Readable, Spellable, and Pronounceable"; @@ -251457,6 +252692,26 @@ self: { broken = true; }) {}; + "pure-noise" = callPackage + ({ mkDerivation, base, deepseq, mwc-random, tasty, tasty-bench + , tasty-discover, tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "pure-noise"; + version = "0.1.0.1"; + sha256 = "116w6scl7kranx567jhnrir9sh0ysjzs45gfhk970q0pzbkgnj1l"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ + base tasty tasty-discover tasty-hunit tasty-quickcheck vector + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base deepseq mwc-random tasty tasty-bench vector + ]; + description = "Performant, modern noise generation for Haskell with minimal dependencies. Based on FastNoiseLite."; + license = lib.licenses.bsd3; + }) {}; + "pure-priority-queue" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -252097,15 +253352,15 @@ self: { "pusher-http-haskell" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, hashable, hspec, http-client, http-client-tls + , crypton, hashable, hspec, http-client, http-client-tls , http-types, memory, QuickCheck, text, time, unordered-containers }: mkDerivation { pname = "pusher-http-haskell"; - version = "2.1.0.17"; - sha256 = "1fmnhx9hlxajdbyq71v28b0sc7phgx2h7spi2s5viihpnxzwp3rk"; + version = "2.1.0.18"; + sha256 = "08wc8agnxfalixc7d4zlwsh3swanyfgg74180lm4v5i2q6s5jxy4"; libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hashable + aeson base base16-bytestring bytestring crypton hashable http-client http-client-tls http-types memory text time unordered-containers ]; @@ -252116,6 +253371,28 @@ self: { license = lib.licenses.mit; }) {}; + "pusher-http-haskell_2_1_0_19" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , crypton, hashable, hspec, http-client, http-client-tls + , http-types, memory, QuickCheck, text, time, unordered-containers + }: + mkDerivation { + pname = "pusher-http-haskell"; + version = "2.1.0.19"; + sha256 = "1zhypjxi3n0zn7l8mkdw17zvm2fsflk8cfnx1bsh0fd5b6a2xj49"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring crypton hashable + http-client http-client-tls http-types memory text time + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec QuickCheck text unordered-containers + ]; + description = "Haskell client library for the Pusher Channels HTTP API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "pusher-ws" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , hashable, http-conduit, lens, lens-aeson, network, scientific @@ -252759,6 +254036,23 @@ self: { mainProgram = "qnap-decrypt"; }) {}; + "qq-bytes" = callPackage + ({ mkDerivation, base, bytestring, hedgehog, tasty, tasty-discover + , tasty-hedgehog, tasty-hunit, template-haskell + }: + mkDerivation { + pname = "qq-bytes"; + version = "1.0.0.0"; + sha256 = "0b5fkysx2pfn0kyn433gizcrjwy354rx067fvn22l8ag6i6clp5z"; + libraryHaskellDepends = [ base bytestring template-haskell ]; + testHaskellDepends = [ + base bytestring hedgehog tasty tasty-hedgehog tasty-hunit + ]; + testToolDepends = [ tasty-discover ]; + description = "QuasiQuoter for byte sequence"; + license = lib.licenses.asl20; + }) {}; + "qq-literals" = callPackage ({ mkDerivation, base, network-uri, template-haskell }: mkDerivation { @@ -252852,8 +254146,8 @@ self: { }: mkDerivation { pname = "qrcode-core"; - version = "0.9.9"; - sha256 = "1bahj10gflc8i9wml8gkis50xwsj7vxf9zyj9b1zvlmld2qnlndw"; + version = "0.9.10"; + sha256 = "117xsv0p2l6nwbl0a7qwip1cnix4x6gljl12w11pzrqmvrhgilx2"; libraryHaskellDepends = [ base binary bytestring case-insensitive containers dlist primitive text vector @@ -252868,8 +254162,8 @@ self: { }: mkDerivation { pname = "qrcode-juicypixels"; - version = "0.8.5"; - sha256 = "0qgcdi77iyx04w2rx48nzk8lm9x368h9m4a468zcibn50cp4ynbg"; + version = "0.8.6"; + sha256 = "0i17wcv570x4a9cg0cdkzz4g86jwgfx68sg62bbvw7zwyc00bpma"; libraryHaskellDepends = [ base base64-bytestring bytestring JuicyPixels qrcode-core text vector @@ -253154,8 +254448,8 @@ self: { }: mkDerivation { pname = "quantizer"; - version = "0.3.1.0"; - sha256 = "1pd3cqz73nvdf9i7fg11q1yjm699n11shxan60iv2v57q6kryjw4"; + version = "0.4.0.0"; + sha256 = "1hbxkl5hl88wrbd8jsx3sh7nb9in5rsd3f2cd43qxmpvda62m8rb"; libraryHaskellDepends = [ base minmax monoid-insertleft uniqueness-periods-vector-stats ]; @@ -253496,29 +254790,26 @@ self: { "quic" = callPackage ({ mkDerivation, array, async, base, base16-bytestring, bytestring , containers, crypto-token, crypton, crypton-x509 - , crypton-x509-system, data-default-class, fast-logger, filepath - , hspec, hspec-discover, iproute, memory, network - , network-byte-order, network-control, QuickCheck, random - , serialise, stm, tls, unix-time, unliftio, unliftio-core + , crypton-x509-system, data-default, fast-logger, filepath, hspec + , hspec-discover, iproute, memory, network, network-byte-order + , network-control, QuickCheck, random, serialise, stm, tls + , unix-time }: mkDerivation { pname = "quic"; - version = "0.2.2"; - sha256 = "0bx6bccnfrqm7593mwi1c52pmb2dimxp3pllc6m818bgwrkii61w"; - revision = "2"; - editedCabalFile = "1mkqx0kadpd99d4izkqg7wm86ffvxr0xvz3p424563dx4k1c2apk"; + version = "0.2.4"; + sha256 = "0gy3fhfwb1gn3807w4n05cwqhq8f1kgjgcy77y3amg88m23ydlm9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base base16-bytestring bytestring containers crypto-token - crypton crypton-x509 crypton-x509-system data-default-class + array async base base16-bytestring bytestring containers + crypto-token crypton crypton-x509 crypton-x509-system data-default fast-logger filepath iproute memory network network-byte-order - network-control random serialise stm tls unix-time unliftio - unliftio-core + network-control random serialise stm tls unix-time ]; testHaskellDepends = [ async base base16-bytestring bytestring containers crypton hspec - network QuickCheck tls unix-time unliftio + network QuickCheck tls unix-time ]; testToolDepends = [ hspec-discover ]; description = "QUIC"; @@ -253796,7 +255087,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "quickcheck-instances_0_3_31" = callPackage + "quickcheck-instances_0_3_32" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive , containers, data-fix, hashable, integer-logarithms, old-time , OneTuple, primitive, QuickCheck, scientific, splitmix, strict @@ -253805,10 +255096,8 @@ self: { }: mkDerivation { pname = "quickcheck-instances"; - version = "0.3.31"; - sha256 = "0bsfh6fwc8h3jzkqrqk56rm6iphrmlrp80pa2z1gs79mz4d7w64v"; - revision = "2"; - editedCabalFile = "1zigggr5i4ikmc34p97x5md1nvpgkwvnvky7saxxsi5w3s3g3zqz"; + version = "0.3.32"; + sha256 = "10zz62j1jplk392c90hkg9mfk8piyp5ify94jp3rld722phg5xa8"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable integer-logarithms old-time OneTuple primitive QuickCheck @@ -253942,8 +255231,8 @@ self: { }: mkDerivation { pname = "quickcheck-quid"; - version = "0.0.1.4"; - sha256 = "1s1pqqs0v22vigq913v7qjqx95xmfrfg46khiac5qp982swz9vnv"; + version = "0.0.1.6"; + sha256 = "1vm8654n4s0ylqssihwkv5w7gg9ml6ks8cbvbdfvcff7xmc38yrv"; libraryHaskellDepends = [ base containers deepseq extra hashable QuickCheck text ]; @@ -254095,7 +255384,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "quickcheck-state-machine_0_10_0" = callPackage + "quickcheck-state-machine_0_10_1" = callPackage ({ mkDerivation, array, base, base-compat, bifunctors, bytestring , containers, directory, doctest, exceptions, filelock, filepath , generics-sop, graphviz, hashable, hashtables, http-client @@ -254109,8 +255398,8 @@ self: { }: mkDerivation { pname = "quickcheck-state-machine"; - version = "0.10.0"; - sha256 = "09xm7lc24ps4il2x5gbl01643zp5j26ps6r2jxw05n8859flp4lq"; + version = "0.10.1"; + sha256 = "03ignyi3db1hciwjk03xvwd1ls53sszm4j3398vdw97s53d5li7l"; libraryHaskellDepends = [ base base-compat bytestring containers directory exceptions filepath generics-sop graphviz MemoTrie mtl pretty pretty-show @@ -254913,6 +256202,22 @@ self: { broken = true; }) {}; + "r-tree" = callPackage + ({ mkDerivation, base, deepseq, hspec, random, tasty-bench, weigh + }: + mkDerivation { + pname = "r-tree"; + version = "1.0.0.0"; + sha256 = "1p8wc66wvxrqcw9akgzmzzf88hrm69s0ma87zxyp1h1pirbn3s9j"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base deepseq hspec random ]; + benchmarkHaskellDepends = [ + base deepseq random tasty-bench weigh + ]; + description = "R-/R*-trees"; + license = lib.licenses.mit; + }) {}; + "r3x-haskell-sdk" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring , case-insensitive, containers, cookie, http-types, mtl, regex-pcre @@ -255091,8 +256396,8 @@ self: { }: mkDerivation { pname = "radix-tree"; - version = "1.0.0.1"; - sha256 = "0jzr4zhznxh45pivsa6falk4pbcizm7bx1kfb108a8bx00i4s885"; + version = "1.1.0.0"; + sha256 = "17ncmiq82vw5ybgfp0zcv98b03qxpsa20jap54462j9gm6c870nv"; libraryHaskellDepends = [ base bytestring deepseq primitive template-haskell text ]; @@ -256089,8 +257394,8 @@ self: { }: mkDerivation { pname = "rank1dynamic"; - version = "0.4.1"; - sha256 = "19x2w44f31589vf4s428m7g3dz75qykr7mv599rf3gls4zjx781r"; + version = "0.4.2"; + sha256 = "15v36c1h19gr1a9klz4qyzyizak2r8pnbybb5xl8nyaz0ib0hgf6"; libraryHaskellDepends = [ base binary ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -256601,14 +257906,14 @@ self: { broken = true; }) {}; - "rattletrap_13_0_3" = callPackage + "rattletrap_14_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , containers, filepath, http-client, http-client-tls, text }: mkDerivation { pname = "rattletrap"; - version = "13.0.3"; - sha256 = "0rs1hskmx13ahcqg6dxx46nc0pijc14d8bikjsdm1y17z2wzidcm"; + version = "14.0.0"; + sha256 = "1dl1p379mnyz1d6w7mzm2fqpdfxz8qcffpr3nmy2jbyfmxajdw1m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -256709,6 +258014,26 @@ self: { license = lib.licenses.asl20; }) {}; + "rawlock" = callPackage + ({ mkDerivation, base, io-classes, io-sim, mtl, nothunks + , QuickCheck, strict-mvar, strict-stm, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "rawlock"; + version = "0.1.0.0"; + sha256 = "07nh83k9xc1iszd2glh0nm8phblm67nazybxq7pgq7c89fgv3v0w"; + libraryHaskellDepends = [ + base io-classes nothunks strict-mvar strict-stm + ]; + testHaskellDepends = [ + base io-classes io-sim mtl QuickCheck strict-stm tasty + tasty-quickcheck + ]; + description = "A writer-biased RAW lock"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "rawr" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, ghc-datasize , ghc-prim, lens, tasty, tasty-hunit, template-haskell @@ -257006,29 +258331,29 @@ self: { ({ mkDerivation, aeson, aeson-pretty, amazonka, amazonka-core , amazonka-rds, amazonka-rds-data, amazonka-secretsmanager, base , base64-bytestring, bytestring, contravariant, generic-lens - , hedgehog, hedgehog-extras, http-client, hw-polysemy, microlens - , mtl, optparse-applicative, polysemy-log, polysemy-plugin - , polysemy-time, resourcet, stm, tasty, tasty-discover - , tasty-hedgehog, testcontainers, text, time, transformers, ulid - , uuid + , hedgehog, hedgehog-extras, http-client, hw-polysemy, hw-prelude + , microlens, mtl, optparse-applicative, polysemy-log + , polysemy-plugin, polysemy-time, resourcet, stm, tasty + , tasty-discover, tasty-hedgehog, testcontainers, text, time + , transformers, ulid, uuid }: mkDerivation { pname = "rds-data"; - version = "0.0.0.2"; - sha256 = "1gfqxffl7fncmwriyrc328imkv98vwls4jdva5klgaw3gwrq1l2x"; + version = "0.1.0.0"; + sha256 = "1ilphv9pff2ixd4rphir6j3lc41m0jngk0f4byb4v991xjr6ldz8"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-rds amazonka-rds-data amazonka-secretsmanager base base64-bytestring bytestring - contravariant generic-lens hw-polysemy microlens mtl polysemy-log - polysemy-plugin text time transformers ulid uuid + contravariant generic-lens hw-polysemy hw-prelude microlens mtl + polysemy-log polysemy-plugin text time transformers ulid uuid ]; executableHaskellDepends = [ aeson amazonka amazonka-rds-data base bytestring generic-lens - hedgehog http-client hw-polysemy microlens optparse-applicative - polysemy-log polysemy-plugin polysemy-time resourcet stm - testcontainers text time ulid uuid + hedgehog http-client hw-polysemy hw-prelude microlens + optparse-applicative polysemy-log polysemy-plugin polysemy-time + resourcet stm testcontainers text time ulid uuid ]; testHaskellDepends = [ aeson aeson-pretty amazonka amazonka-core amazonka-rds @@ -257262,8 +258587,8 @@ self: { pname = "reactive-balsa"; version = "0.4.0.1"; sha256 = "1fhn7bxfrwaa5xb2ckfy2v4aw5cdzclayprjr40zg09s77qxclc1"; - revision = "1"; - editedCabalFile = "1lfq84fgq41bych8k4avrzc04lbyl974q7y5z5wd9h9h3sz0i4wa"; + revision = "2"; + editedCabalFile = "1l5mvm1b4y8r1r6lg7h2imrfzl4y1jcc23cjm5bpcrci46n0z006"; libraryHaskellDepends = [ alsa-core alsa-seq base containers data-accessor data-accessor-transformers event-list extensible-exceptions midi @@ -257311,8 +258636,8 @@ self: { }: mkDerivation { pname = "reactive-banana-automation"; - version = "0.5.6"; - sha256 = "161blkyhkff3z0blbrmrwmclhac481njn9ikb3x4ax0yfa1lpsvq"; + version = "0.5.7"; + sha256 = "1wj790yahgham9llbw3c642lmi9nliy4bx48d3pws3i6hpvvi7k7"; libraryHaskellDepends = [ base reactive-banana stm time transformers ]; @@ -257490,6 +258815,8 @@ self: { pname = "reactive-jack"; version = "0.4.1.2"; sha256 = "1ckm95dr3y14bh73nxapm9rl39bz1lpxmclgcnd9n2mkn0b1q54w"; + revision = "1"; + editedCabalFile = "045aivc9nivky6pgfwdfyffglg6v3i1zv5alk9abj5jmrz6d3pyw"; libraryHaskellDepends = [ base containers data-accessor event-list explicit-exception extensible-exceptions jack midi non-negative random @@ -257511,8 +258838,8 @@ self: { pname = "reactive-midyim"; version = "0.4.1.1"; sha256 = "1hsa7d79mf7r36grl9i41x84kg3s9j5gj2fy40mb1mhvr221pi9v"; - revision = "1"; - editedCabalFile = "0bfaylhq9nkx4ay6rx18n7df9illw8gfpv21yxgcyi43yb00560w"; + revision = "2"; + editedCabalFile = "131mg8w6dcjzlmrhr8pmlbk2x4qfnza3chik4ylfzi90bqc147gx"; libraryHaskellDepends = [ base containers data-accessor data-accessor-transformers event-list midi non-negative random reactive-banana-bunch semigroups @@ -257849,8 +259176,8 @@ self: { ({ mkDerivation, base, extra, mtl, primes, QuickCheck, random }: mkDerivation { pname = "real-dice"; - version = "0.1.0.3"; - sha256 = "1yrcvacxw0gl87lfw566k1hdf71nm2nrnw9ijqfc25y7fsb1qk2w"; + version = "0.1.0.4"; + sha256 = "1ibyp3zhfassg1yhfjnn636mbcbd6b7n42y2pzcnsmhjs8n78j2a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl primes ]; @@ -258064,6 +259391,8 @@ self: { pname = "rec-def"; version = "0.2.2"; sha256 = "0hrca7v3visyppzzszilydhmrpkwc7hmhm0ld8ha2dd9ijvgrd22"; + revision = "1"; + editedCabalFile = "015ibrylnsmz55syn32dvl40d5n5c0pwk6llk0b36k2ak5ls2s1f"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base concurrency containers dejafu doctest QuickCheck random tasty @@ -258102,18 +259431,26 @@ self: { }) {}; "recommender-als" = callPackage - ({ mkDerivation, base, containers, data-default-class, hmatrix - , parallel, random, vector + ({ mkDerivation, base, bytestring, cassava, containers + , data-default-class, hmatrix, optparse-applicative, parallel + , random, text, vector }: mkDerivation { pname = "recommender-als"; - version = "0.2.1.1"; - sha256 = "0qc91hn42mc2pmljb836chdas1jzsrqbg44cjylx31y0y72dmhdq"; + version = "0.2.2.0"; + sha256 = "19as4cd5p2y174zxn5rksa5hza5l667wkk9r40ny3lwmrgkng905"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers data-default-class hmatrix parallel random vector ]; + executableHaskellDepends = [ + base bytestring cassava containers data-default-class + optparse-applicative text vector + ]; description = "Recommendations using alternating least squares algorithm"; license = lib.licenses.bsd3; + mainProgram = "movielens"; }) {}; "record" = callPackage @@ -259228,8 +260565,8 @@ self: { }: mkDerivation { pname = "reflex"; - version = "0.9.3.0"; - sha256 = "1hhh3ca0pcrnrzbn83vb7wzp6iq45vabzgchwh6b6b0mr3ckqrlk"; + version = "0.9.3.1"; + sha256 = "04vgr8a98k5iqc0lc8asvh785pn9fzhx1v8vl6ghq6k5hy9mgigq"; libraryHaskellDepends = [ base bifunctors commutative-semigroups comonad constraints constraints-extras containers data-default dependent-map @@ -259727,9 +261064,7 @@ self: { ]; description = "Helper functions to use reflex with gi-gtk"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; mainProgram = "reflex-gi-gtk-example"; - broken = true; }) {}; "reflex-gloss" = callPackage @@ -259745,8 +261080,6 @@ self: { ]; description = "An reflex interface for gloss"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reflex-gloss-scene" = callPackage @@ -259947,9 +261280,7 @@ self: { executableHaskellDepends = [ base mtl reflex ]; description = "SDL2 and reflex FRP"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "reflex-sdl2-exe"; - broken = true; }) {}; "reflex-test-host" = callPackage @@ -261728,6 +263059,32 @@ self: { broken = true; }) {}; + "relocant" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, crypton, directory + , envparse, filepath, hspec, memory, optparse-applicative + , postgresql-simple, process, random, temporary, text, time + }: + mkDerivation { + pname = "relocant"; + version = "1.0.0"; + sha256 = "1iazymf953msr6d7dn99slw12wmnivnx5nfzjbq8h4f84ybwmvr6"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath process ]; + libraryHaskellDepends = [ + aeson base bytestring crypton directory envparse filepath memory + optparse-applicative postgresql-simple process text time + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring filepath hspec postgresql-simple random temporary + text + ]; + description = "A PostgreSQL migration CLI tool and library"; + license = lib.licenses.bsd2; + mainProgram = "relocant"; + }) {}; + "reloto" = callPackage ({ mkDerivation, base, containers, QuickCheck, tasty , tasty-quickcheck, text, transformers @@ -261751,10 +263108,8 @@ self: { }: mkDerivation { pname = "relude"; - version = "1.2.1.0"; - sha256 = "09fp8n2z6nz2yqkn8pgq56s6d971b4mgcaldkhc0ih3bz9dp8kvq"; - revision = "3"; - editedCabalFile = "1y4qgr64d02cqn46l8cqqwmzkkbd3v2w040b41z5inagbwbr50r8"; + version = "1.2.2.0"; + sha256 = "0ikp23nbzrxfalpsk6n8yg3byh43f8hp156wpxx45yc297gmgpil"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable mtl stm text transformers unordered-containers @@ -262665,7 +264020,7 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "req_3_13_3" = callPackage + "req_3_13_4" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder , bytestring, case-insensitive, containers, crypton-connection , data-default-class, exceptions, hspec, hspec-core, hspec-discover @@ -262676,8 +264031,10 @@ self: { }: mkDerivation { pname = "req"; - version = "3.13.3"; - sha256 = "162hqajwdnkpl0hylkzf33jxh68nyq1bnsyp3wi6h394phrgniy3"; + version = "3.13.4"; + sha256 = "0s80kl29b7d35v044yvkfa6ja40k4sm3wh26qpnscqzv2n6w8zzk"; + revision = "1"; + editedCabalFile = "0hjqbxmvvrw7bslq98kyyiqgl6d70cddddx8g0g6b1f3ffd1vw9n"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -262919,15 +264276,20 @@ self: { "rerefined" = callPackage ({ mkDerivation, base, mono-traversable, QuickCheck , template-haskell, text, text-builder-linear, type-level-show + , type-spec }: mkDerivation { pname = "rerefined"; - version = "0.5.1"; - sha256 = "0n775yxclxpnw0nf6g0ai6pdmckvw5v8rw03fss51mq1y9xw8dcg"; + version = "0.8.0"; + sha256 = "1w6p7sfl5mcq37cqlyfk3zzfb3sbw12idhdnk97jbrn0psms12rk"; libraryHaskellDepends = [ base mono-traversable QuickCheck template-haskell text text-builder-linear type-level-show ]; + testHaskellDepends = [ + base mono-traversable QuickCheck template-haskell text + text-builder-linear type-level-show type-spec + ]; description = "Refinement types, again"; license = lib.licenses.mit; maintainers = [ lib.maintainers.raehik ]; @@ -263064,8 +264426,8 @@ self: { pname = "resolv"; version = "0.2.0.2"; sha256 = "0jz798kliih4lb16s9bjk7sa9034x1qhyrr8z9sp6ahkz4yjh3c8"; - revision = "3"; - editedCabalFile = "0i9h81lrl0gdk6i1yrg2kqdx89fzr0wb29b6p7g2y3bnnmd2cs28"; + revision = "4"; + editedCabalFile = "0xr36sf4ivlxvhsfxj51zbm1pjgs4j5xby6pzjfyrl74c89nw69y"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; @@ -263226,6 +264588,28 @@ self: { broken = true; }) {}; + "resource-registry" = callPackage + ({ mkDerivation, base, bimap, containers, generics-sop, io-classes + , mtl, nothunks, QuickCheck, quickcheck-state-machine, si-timers + , strict-mvar, strict-stm, tasty, tasty-quickcheck, tree-diff + }: + mkDerivation { + pname = "resource-registry"; + version = "0.1.0.0"; + sha256 = "0mkx8hf6k0117c15kq3cyqgxbfwjjk0yywp5xf6svdi5g2xpkg5p"; + libraryHaskellDepends = [ + base bimap containers io-classes mtl nothunks strict-stm + ]; + testHaskellDepends = [ + base containers generics-sop io-classes mtl QuickCheck + quickcheck-state-machine si-timers strict-mvar strict-stm tasty + tasty-quickcheck tree-diff + ]; + description = "Track allocated resources"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "resource-simple" = callPackage ({ mkDerivation, base, containers, monad-control, monad-fork , mtl-evil-instances, transformers, transformers-base @@ -263474,32 +264858,6 @@ self: { }: mkDerivation { pname = "rest-rewrite"; - version = "0.4.3"; - sha256 = "0rvqagskkibwadqdkfqqjp0vrdxfn1hnb6g27ps7h160knygaa1d"; - revision = "1"; - editedCabalFile = "0m0m3brlxx945lrr34wpmn5jgzdpw9ck0qxj23s8av4rlh1a9hx1"; - libraryHaskellDepends = [ - base containers hashable monad-loops mtl parsec process QuickCheck - text time unordered-containers - ]; - testHaskellDepends = [ - base containers hashable mtl QuickCheck text time - unordered-containers - ]; - testSystemDepends = [ graphviz z3 ]; - doHaddock = false; - description = "Rewriting library with online termination checking"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.tbidne ]; - }) {inherit (pkgs) graphviz; inherit (pkgs) z3;}; - - "rest-rewrite_0_4_4" = callPackage - ({ mkDerivation, base, containers, graphviz, hashable, monad-loops - , mtl, parsec, process, QuickCheck, text, time - , unordered-containers, z3 - }: - mkDerivation { - pname = "rest-rewrite"; version = "0.4.4"; sha256 = "03jn5wclljkfdj1nvzbs5jvgsh343g1qr864pivgmxbc5ngrdk91"; libraryHaskellDepends = [ @@ -263514,7 +264872,6 @@ self: { doHaddock = false; description = "Rewriting library with online termination checking"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.tbidne ]; }) {inherit (pkgs) graphviz; inherit (pkgs) z3;}; @@ -264997,8 +266354,8 @@ self: { }: mkDerivation { pname = "ring-buffer"; - version = "0.4"; - sha256 = "14h1rzxzk9qzr6bimxng8nhxydngx92x75p1mrjfwbwi17bbwgby"; + version = "0.4.1"; + sha256 = "0j5ysm2aliq06cic2y21587lcighagih9vc48dr7z4mvrfym4yz7"; libraryHaskellDepends = [ base exceptions mtl primitive vector ]; testHaskellDepends = [ base HUnit QuickCheck vector ]; description = "A concurrent, mutable ring-buffer"; @@ -265679,8 +267036,8 @@ self: { }: mkDerivation { pname = "robots-txt"; - version = "0.4.1.7"; - sha256 = "0krmqznkkrq16bf78hs98ck6793nl68sn6lb5dv6skn8f10pzyfg"; + version = "0.4.1.8"; + sha256 = "0f6s07zdzjjhx4vk2khrh6y2mhfgjxlg3y3l07riiy171qzp9gkd"; libraryHaskellDepends = [ attoparsec base bytestring old-locale time ]; @@ -266212,6 +267569,63 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ronn" = callPackage + ({ mkDerivation, base, filepath, hspec, hspec-golden, text }: + mkDerivation { + pname = "ronn"; + version = "1.1.1.0"; + sha256 = "0hrahajjmgfb93z2csyqjzbywv74z0c8yaagq5pbhasmrha2jg2i"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base filepath hspec hspec-golden text ]; + description = "Describe and render Ronn documentation"; + license = lib.licenses.agpl3Only; + }) {}; + + "ronn-envparse" = callPackage + ({ mkDerivation, base, envparse, hspec, ronn, ronn-test }: + mkDerivation { + pname = "ronn-envparse"; + version = "1.0.1.0"; + sha256 = "00vl088d5c64ds9gz979s07zhz65290px4vij7zg4l9hsxhnbnnr"; + libraryHaskellDepends = [ base envparse ronn ]; + testHaskellDepends = [ base envparse hspec ronn-test ]; + description = "Produce Ronn from OptEnvConf"; + license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {ronn-test = null;}; + + "ronn-opt-env-conf" = callPackage + ({ mkDerivation, base, hspec, opt-env-conf, ronn, ronn-test, text + }: + mkDerivation { + pname = "ronn-opt-env-conf"; + version = "1.0.1.0"; + sha256 = "0s2myfg84d3ki0ls816xvllw2dinyzn7gy7ckk6zgc56jckrbs3y"; + libraryHaskellDepends = [ base opt-env-conf ronn text ]; + testHaskellDepends = [ base hspec opt-env-conf ronn-test ]; + description = "Produce Ronn from OptEnvConf"; + license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {ronn-test = null;}; + + "ronn-optparse-applicative" = callPackage + ({ mkDerivation, base, hspec, optparse-applicative, ronn, ronn-test + , text + }: + mkDerivation { + pname = "ronn-optparse-applicative"; + version = "1.0.1.0"; + sha256 = "1l8hsdlb2j3c4q1lmz7kxp16z9vky83gai5kl8jqcb6n7is9c5m2"; + libraryHaskellDepends = [ base optparse-applicative ronn text ]; + testHaskellDepends = [ base hspec optparse-applicative ronn-test ]; + description = "Produce Ronn from OptEnvConf"; + license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {ronn-test = null;}; + "roots" = callPackage ({ mkDerivation, base, tagged }: mkDerivation { @@ -267092,7 +268506,6 @@ self: { testHaskellDepends = [ base ]; description = "Let your mind know that your hands need a rest!"; license = lib.licenses.bsd2; - badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267629,16 +269042,17 @@ self: { "rustls" = callPackage ({ mkDerivation, async, base, bytestring, containers - , derive-storable, directory, filepath, hedgehog, network, process - , resourcet, rustls, stm, tasty, tasty-hedgehog, tasty-hunit - , temporary, text, transformers + , derive-storable, directory, filepath, hedgehog, mtl, network + , process, resourcet, rustls, stm, tasty, tasty-hedgehog + , tasty-hunit, temporary, text, transformers }: mkDerivation { pname = "rustls"; - version = "0.1.0.0"; - sha256 = "19gv5cc0c3mnl40h5z1qnxrdhshiikmpmlyljv27jx2vk4i4vqib"; + version = "0.2.0.0"; + sha256 = "1scgp17hfmnzfccpaqih0smq3v34n217wsc5p7xdqgyhxwsj1bqg"; libraryHaskellDepends = [ - base bytestring derive-storable network resourcet text transformers + base bytestring containers derive-storable mtl network resourcet + text transformers ]; librarySystemDepends = [ rustls ]; testHaskellDepends = [ @@ -267749,43 +269163,6 @@ self: { }: mkDerivation { pname = "rzk"; - version = "0.7.4"; - sha256 = "1n7dk24pbllr1xxr3klqxh5nq2pcjchygdr0xvhd2yla7w5hjhv5"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal process ]; - libraryHaskellDepends = [ - aeson array base bifunctors bytestring co-log-core - data-default-class directory filepath Glob lens lsp lsp-types mtl - stm template-haskell text yaml - ]; - libraryToolDepends = [ alex BNFC happy ]; - executableHaskellDepends = [ - array base bifunctors bytestring directory Glob mtl - optparse-generic template-haskell text with-utf8 yaml - ]; - executableToolDepends = [ alex BNFC happy ]; - testHaskellDepends = [ - array base bifunctors bytestring directory doctest Glob hspec - hspec-discover mtl QuickCheck template-haskell text yaml - ]; - testToolDepends = [ alex BNFC happy hspec-discover ]; - description = "An experimental proof assistant for synthetic ∞-categories"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "rzk"; - broken = true; - }) {}; - - "rzk_0_7_5" = callPackage - ({ mkDerivation, aeson, alex, array, base, bifunctors, BNFC - , bytestring, Cabal, co-log-core, data-default-class, directory - , doctest, filepath, Glob, happy, hspec, hspec-discover, lens, lsp - , lsp-types, mtl, optparse-generic, process, QuickCheck, stm - , template-haskell, text, with-utf8, yaml - }: - mkDerivation { - pname = "rzk"; version = "0.7.5"; sha256 = "0x9485rs2hc51jfaczcmx89jn2nnppfnrk717xc559rzb64s2sgk"; isLibrary = true; @@ -268283,6 +269660,31 @@ self: { license = lib.licenses.mit; }) {}; + "safe-json_1_2_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist + , hashable, quickcheck-instances, scientific, tasty, tasty-hunit + , tasty-quickcheck, temporary, text, time, unordered-containers + , uuid, uuid-types, vector + }: + mkDerivation { + pname = "safe-json"; + version = "1.2.0.2"; + sha256 = "1zl0f3y1kih1y3i6376rkizd9kfklqxf7lnj3aipn5ph935lljrz"; + libraryHaskellDepends = [ + aeson base bytestring containers dlist hashable scientific tasty + tasty-hunit tasty-quickcheck text time unordered-containers + uuid-types vector + ]; + testHaskellDepends = [ + aeson base bytestring containers dlist hashable + quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck + temporary text time unordered-containers uuid uuid-types vector + ]; + description = "Automatic JSON format versioning"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "safe-lazy-io" = callPackage ({ mkDerivation, base, extensible-exceptions, parallel, strict-io }: @@ -269287,22 +270689,97 @@ self: { license = lib.licenses.bsd3; }) {}; + "sandwich_0_3_0_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, brick + , bytestring, colour, containers, deepseq, directory, exceptions + , filepath, free, haskell-src-exts, microlens, microlens-th + , monad-control, monad-logger, mtl, optparse-applicative + , pretty-show, process, retry, safe, stm, string-interpolate + , template-haskell, text, time, transformers, transformers-base + , unix, unliftio, unliftio-core, vector, vty, vty-crossplatform + }: + mkDerivation { + pname = "sandwich"; + version = "0.3.0.0"; + sha256 = "1krxfk7skys70n8cjpvw5khhk6xlw6l5gra9vvgqqxpcjdnbb1y4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + deepseq directory exceptions filepath free haskell-src-exts + microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process retry safe stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio unliftio-core vector vty + vty-crossplatform + ]; + executableHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + deepseq directory exceptions filepath free haskell-src-exts + microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process retry safe stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio unliftio-core vector vty + vty-crossplatform + ]; + testHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + deepseq directory exceptions filepath free haskell-src-exts + microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process retry safe stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio unliftio-core vector vty + vty-crossplatform + ]; + description = "Yet another test framework for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "sandwich-contexts" = callPackage + ({ mkDerivation, aeson, base, conduit, conduit-extra, containers + , crypton-connection, data-default, exceptions, filepath, HTTP + , http-client, http-conduit, http-types, monad-logger, mtl, network + , postgresql-simple, process, random, relude, retry, safe, sandwich + , streaming-commons, string-interpolate, temporary, text, time + , transformers, unix-compat, unliftio, unliftio-core, vector + }: + mkDerivation { + pname = "sandwich-contexts"; + version = "0.3.0.0"; + sha256 = "0qmp7ag57im3a9mq6z1qkzbn1qqjnq8w9y8qinqlxzn9iwq6skg9"; + libraryHaskellDepends = [ + aeson base conduit conduit-extra containers crypton-connection + data-default exceptions filepath HTTP http-client http-conduit + http-types monad-logger mtl network process random relude retry + safe sandwich streaming-commons string-interpolate temporary text + time transformers unix-compat unliftio unliftio-core vector + ]; + testHaskellDepends = [ + base filepath postgresql-simple relude sandwich string-interpolate + unliftio + ]; + testToolDepends = [ sandwich ]; + description = "Contexts for the Sandwich test library"; + license = lib.licenses.bsd3; + }) {}; + "sandwich-hedgehog" = callPackage - ({ mkDerivation, base, free, hedgehog, monad-control, mtl - , safe-exceptions, sandwich, string-interpolate, text, time, vty + ({ mkDerivation, base, exceptions, free, hedgehog, sandwich + , string-interpolate, text, time, unliftio, vty , wl-pprint-annotated }: mkDerivation { pname = "sandwich-hedgehog"; - version = "0.1.3.0"; - sha256 = "0wf16y9a8savdviyr29dpji9ij26zcn3jrsf297ywrlbd00n7g1h"; + version = "0.1.3.1"; + sha256 = "0pidk7xlgdm9sad9zskqbmyhn0mlmz6vyygg4vfr2cqbnfkms502"; libraryHaskellDepends = [ - base free hedgehog monad-control mtl safe-exceptions sandwich - string-interpolate text time vty wl-pprint-annotated + base exceptions free hedgehog sandwich string-interpolate text time + unliftio vty wl-pprint-annotated ]; testHaskellDepends = [ - base free hedgehog monad-control mtl safe-exceptions sandwich - string-interpolate text time vty wl-pprint-annotated + base exceptions free hedgehog sandwich string-interpolate text time + unliftio vty wl-pprint-annotated ]; description = "Sandwich integration with Hedgehog"; license = lib.licenses.bsd3; @@ -269403,6 +270880,40 @@ self: { mainProgram = "sandwich-webdriver-exe"; }) {}; + "sandwich-webdriver_0_3_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , directory, exceptions, filepath, http-client, http-client-tls + , http-conduit, microlens, microlens-aeson, monad-control + , monad-logger, mtl, network, process, random, regex-tdfa, retry + , safe, sandwich, sandwich-contexts, string-interpolate, temporary + , text, time, transformers, unix, unliftio, unliftio-core + , unordered-containers, vector, webdriver + }: + mkDerivation { + pname = "sandwich-webdriver"; + version = "0.3.0.0"; + sha256 = "1s4j2i91csn1wplw1vnz7s8kin5v580a7m98yfas8p7nlm9bihp4"; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory exceptions + filepath http-client http-client-tls http-conduit microlens + microlens-aeson monad-control monad-logger mtl network process + random regex-tdfa retry safe sandwich sandwich-contexts + string-interpolate temporary text time transformers unix unliftio + unliftio-core unordered-containers vector webdriver + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory exceptions + filepath http-client http-client-tls http-conduit microlens + microlens-aeson monad-control monad-logger mtl network process + random regex-tdfa retry safe sandwich sandwich-contexts + string-interpolate text time transformers unix unliftio + unliftio-core unordered-containers vector webdriver + ]; + description = "Sandwich integration with Selenium WebDriver"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sarasvati" = callPackage ({ mkDerivation, base, deepseq, portaudio }: mkDerivation { @@ -269792,8 +271303,8 @@ self: { }: mkDerivation { pname = "sayable"; - version = "1.2.4.0"; - sha256 = "0hqcpcgzwv4q7vxdhnf3lffhlnrr4ykpz330n1ip0qnys483yz8r"; + version = "1.2.5.0"; + sha256 = "05jf2423l85vwc98fxib9ahlq9w4zhan4912jmfk86gvhsd35hls"; libraryHaskellDepends = [ base bytestring containers exceptions prettyprinter template-haskell text th-abstraction @@ -269833,7 +271344,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_6_1_0" = callPackage + "sbp_6_2_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -269842,8 +271353,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "6.1.0"; - sha256 = "1ihnsxil3f1fccm6zf3daiw12qblmxmrpfs6spqnh2jfyxgmrmkx"; + version = "6.2.1"; + sha256 = "0cq2a62ipkbqmrryync5jqmlgyx5pgkrknk3lpcwmv1l1f9l9dgr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -269882,37 +271393,6 @@ self: { mainProgram = "sbp2udp"; }) {}; - "sbv_7_13" = callPackage - ({ mkDerivation, array, async, base, bytestring, containers - , crackNum, deepseq, directory, doctest, filepath, generic-deriving - , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb - , tasty, tasty-golden, tasty-hunit, tasty-quickcheck - , template-haskell, time, z3 - }: - mkDerivation { - pname = "sbv"; - version = "7.13"; - sha256 = "0bk400swnb4s98c5p71ml1px6jndaiqhf5dj7zmnliyplqcgpfik"; - revision = "1"; - editedCabalFile = "0gn00bgvy9v4wiica7psrzmxbbp0fiiknrxmdy55z9k2ycpvw7la"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array async base containers crackNum deepseq directory filepath - generic-deriving ghc mtl pretty process QuickCheck random syb - template-haskell time - ]; - testHaskellDepends = [ - base bytestring containers crackNum directory doctest filepath Glob - hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit - tasty-quickcheck template-haskell - ]; - testSystemDepends = [ z3 ]; - description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {inherit (pkgs) z3;}; - "sbv" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, directory, filepath, libBF, mtl, pretty, process @@ -269946,7 +271426,7 @@ self: { broken = true; }) {inherit (pkgs) z3;}; - "sbv_10_12" = callPackage + "sbv_11_0" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, directory, filepath, libBF, mtl, pretty, process , QuickCheck, random, syb, tasty, tasty-bench, tasty-golden @@ -269955,8 +271435,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "10.12"; - sha256 = "1siavgsc0a25rl4x22jcff2d9h1bqif4vm1nymz6niglbqnnrsv8"; + version = "11.0"; + sha256 = "1pdyy3mrhyrqacs7snn4dc9drawqij28svn8qlqxx0wr1bwx86gp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers deepseq directory filepath libBF mtl @@ -270138,8 +271618,8 @@ self: { }: mkDerivation { pname = "scale"; - version = "1.0.0.0"; - sha256 = "1c1khgy83402lqfqdvq5amf9pgn5a6m4m5zmqkkw6iw0wbjw7p3a"; + version = "1.0.1.0"; + sha256 = "19cnzd316qbzxdjgia35l1yay1qpc6x10sgpfbv58yr4z65s01rx"; libraryHaskellDepends = [ base bitvec bytestring cereal data-default generics-sop memory template-haskell text vector @@ -272730,8 +274210,8 @@ self: { }: mkDerivation { pname = "sel"; - version = "0.0.1.0"; - sha256 = "0md8xdd7jci3jdq1l5acjfxgaz2ahiwz6c7cwam06x5kp0h1nik1"; + version = "0.0.2.0"; + sha256 = "0gidvbkcjgyq47gh2p19iawv8jcs7ajvih4mk6pwwbkjs8iybpx4"; libraryHaskellDepends = [ base base16 bytestring libsodium-bindings text text-display ]; @@ -273247,8 +274727,8 @@ self: { }: mkDerivation { pname = "semilattices"; - version = "0.0.0.7"; - sha256 = "1m9sqm4nq8d8rraqfqfwbn91412aqqq4gg9754lnq9crns75df11"; + version = "0.0.0.8"; + sha256 = "05dmnszyxssbjzw6f7qwq3slzd913afn562f2rnc54q9719xyybn"; libraryHaskellDepends = [ base containers unordered-containers ]; testHaskellDepends = [ base doctest QuickCheck quickcheck-instances @@ -273819,8 +275299,8 @@ self: { }: mkDerivation { pname = "sequence-formats"; - version = "1.8.1.0"; - sha256 = "105kxxczmdq6k2mnfsr5k6ixnlcllkhk9w70c5jcf96wz4gm6ydz"; + version = "1.8.1.1"; + sha256 = "09k7iqi1cjynxvdqihg6p98isx9i7z3xiw5h9gll5d2hyz040vya"; libraryHaskellDepends = [ attoparsec base bytestring containers errors exceptions foldl lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe @@ -273834,24 +275314,24 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "sequence-formats_1_8_1_1" = callPackage + "sequence-formats_1_9_0_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, errors , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec - , pipes-bytestring, pipes-safe, pipes-zlib, tasty, tasty-hunit - , transformers, vector + , pipes-bytestring, pipes-safe, pipes-zlib, streaming-commons + , tasty, tasty-hunit, transformers, vector }: mkDerivation { pname = "sequence-formats"; - version = "1.8.1.1"; - sha256 = "09k7iqi1cjynxvdqihg6p98isx9i7z3xiw5h9gll5d2hyz040vya"; + version = "1.9.0.0"; + sha256 = "06zv7qwmdyk35hgam34h8dp69hm936h4n53zz13cdac1kws9m5dg"; libraryHaskellDepends = [ attoparsec base bytestring containers errors exceptions foldl lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe - pipes-zlib transformers vector + pipes-zlib streaming-commons transformers vector ]; testHaskellDepends = [ - base bytestring containers foldl hspec pipes pipes-safe tasty - tasty-hunit transformers vector + base bytestring containers foldl hspec pipes pipes-safe pipes-zlib + tasty tasty-hunit transformers vector ]; description = "A package with basic parsing utilities for several Bioinformatic data formats"; license = lib.licenses.gpl3Only; @@ -273924,6 +275404,8 @@ self: { pname = "sequitur"; version = "0.2.0.0"; sha256 = "1k38xkhyika7aamzrkalc7kbz0v832amj4gxxs9l6si9v19ja185"; + revision = "1"; + editedCabalFile = "1l5jz58wxr5a20pjg842x931w195ab50n4w0jrbppchc836080fi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -274225,35 +275707,6 @@ self: { }) {}; "servant" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors - , bytestring, case-insensitive, constraints, deepseq, hspec - , hspec-discover, http-api-data, http-media, http-types, mmorph - , mtl, network-uri, QuickCheck, quickcheck-instances - , singleton-bool, sop-core, string-conversions, tagged, text - , transformers, vault - }: - mkDerivation { - pname = "servant"; - version = "0.20.1"; - sha256 = "1s8vapj8qb8l5snjzxd63d9rvxwa1vw6g77cg8nynrzzppwp7xwl"; - revision = "5"; - editedCabalFile = "1lp44k8vsjwscjc5palvr930pznrm40adqksm3jcmhjsq63xmmji"; - libraryHaskellDepends = [ - aeson attoparsec base base-compat bifunctors bytestring - case-insensitive constraints deepseq http-api-data http-media - http-types mmorph mtl network-uri QuickCheck singleton-bool - sop-core string-conversions tagged text transformers vault - ]; - testHaskellDepends = [ - aeson base base-compat bytestring hspec http-media mtl QuickCheck - quickcheck-instances string-conversions text transformers - ]; - testToolDepends = [ hspec-discover ]; - description = "A family of combinators for defining webservices APIs"; - license = lib.licenses.bsd3; - }) {}; - - "servant_0_20_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring , case-insensitive, constraints, containers, deepseq, hspec , hspec-discover, http-api-data, http-media, http-types, mmorph @@ -274277,7 +275730,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A family of combinators for defining webservices APIs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-JuicyPixels" = callPackage @@ -274384,23 +275836,6 @@ self: { }: mkDerivation { pname = "servant-auth"; - version = "0.4.1.0"; - sha256 = "08ggnlknhzdpf49zjm1qpzm12gckss7yr8chmzm6h6ycigz77ndd"; - revision = "9"; - editedCabalFile = "0vdci6ckk0qq48wpsxqm09azb2fap6av2vnafzkyhfj8knk49jyh"; - libraryHaskellDepends = [ - aeson base containers jose lens servant text unordered-containers - ]; - description = "Authentication combinators for servant"; - license = lib.licenses.bsd3; - }) {}; - - "servant-auth_0_4_2_0" = callPackage - ({ mkDerivation, aeson, base, containers, jose, lens, servant, text - , unordered-containers - }: - mkDerivation { - pname = "servant-auth"; version = "0.4.2.0"; sha256 = "0h71v9n3vd1ca9kav2b6w53wnk950hxlgp3hcnhyk7yd9aph4nwx"; libraryHaskellDepends = [ @@ -274408,7 +275843,6 @@ self: { ]; description = "Authentication combinators for servant"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-auth-client" = callPackage @@ -274420,32 +275854,6 @@ self: { }: mkDerivation { pname = "servant-auth-client"; - version = "0.4.1.1"; - sha256 = "1fs00p15hz2lqspby2xg6h0zxmlljm6wgi0wk73a4gavyg26dgqq"; - revision = "5"; - editedCabalFile = "1dbq1451jj49hbjfrdhr47k3rpwj825rbvj3f79w75rzyl3hyg75"; - libraryHaskellDepends = [ - base bytestring containers servant servant-auth servant-client-core - ]; - testHaskellDepends = [ - aeson base bytestring hspec http-client http-types jose QuickCheck - servant servant-auth servant-auth-server servant-client - servant-server time transformers wai warp - ]; - testToolDepends = [ hspec-discover ]; - description = "servant-client/servant-auth compatibility"; - license = lib.licenses.bsd3; - }) {}; - - "servant-auth-client_0_4_2_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hspec - , hspec-discover, http-client, http-types, jose, QuickCheck - , servant, servant-auth, servant-auth-server, servant-client - , servant-client-core, servant-server, time, transformers, wai - , warp - }: - mkDerivation { - pname = "servant-auth-client"; version = "0.4.2.0"; sha256 = "1pvqiygnwnkj6y4mi03qnpjlp305cjmpzp7nrqmc2p6qwnl2l4q9"; libraryHaskellDepends = [ @@ -274459,7 +275867,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "servant-client/servant-auth compatibility"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-auth-cookie" = callPackage @@ -274501,30 +275908,6 @@ self: { }: mkDerivation { pname = "servant-auth-docs"; - version = "0.2.10.1"; - sha256 = "03dnh6x0y34npmv9w2f3hc9r1brlzf2rki6c6ngvwb3dvichhykv"; - revision = "3"; - editedCabalFile = "12irngkv4irmjkmarnpyfknq9iwz9xigcgldmg6y9sscjjv7xh7r"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base lens servant servant-auth servant-docs - ]; - testHaskellDepends = [ - base doctest hspec lens QuickCheck servant servant-auth - servant-docs template-haskell text - ]; - testToolDepends = [ hspec-discover ]; - description = "servant-docs/servant-auth compatibility"; - license = lib.licenses.bsd3; - }) {}; - - "servant-auth-docs_0_2_11_0" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec - , hspec-discover, lens, QuickCheck, servant, servant-auth - , servant-docs, template-haskell, text - }: - mkDerivation { - pname = "servant-auth-docs"; version = "0.2.11.0"; sha256 = "127w2ggii2vqs60cnd5ir4azyrxnm7mhfydi156liykk2v8jkkaj"; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -274538,7 +275921,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "servant-docs/servant-auth compatibility"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-auth-hmac" = callPackage @@ -274588,38 +275970,6 @@ self: { }: mkDerivation { pname = "servant-auth-server"; - version = "0.4.8.0"; - sha256 = "0drny9m2js619pkxxa1mxji5x4r46kpv3qnmswyrb3kc0ck5c2af"; - revision = "6"; - editedCabalFile = "0rvb6jwjmkdrbc2q92si19arf5gi80x3m1g67354bncdaa81n81z"; - libraryHaskellDepends = [ - aeson base base64-bytestring blaze-builder bytestring - case-insensitive cookie data-default-class entropy http-types jose - lens memory monad-time mtl servant servant-auth servant-server - tagged text time unordered-containers wai - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive hspec http-client http-types - jose lens lens-aeson mtl QuickCheck servant servant-auth - servant-server text time transformers wai warp wreq - ]; - testToolDepends = [ hspec-discover markdown-unlit ]; - description = "servant-server/servant-auth compatibility"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "servant-auth-server_0_4_9_0" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder - , bytestring, case-insensitive, cookie, data-default-class, entropy - , hspec, hspec-discover, http-client, http-types, jose, lens - , lens-aeson, markdown-unlit, memory, monad-time, mtl, QuickCheck - , servant, servant-auth, servant-server, tagged, text, time - , transformers, unordered-containers, wai, warp, wreq - }: - mkDerivation { - pname = "servant-auth-server"; version = "0.4.9.0"; sha256 = "0fhk2z9n9ax4g7iisdgcd87wgj9wvazhl86kjh364gsj1g8a5y99"; libraryHaskellDepends = [ @@ -274646,28 +275996,6 @@ self: { }: mkDerivation { pname = "servant-auth-swagger"; - version = "0.2.10.2"; - sha256 = "0f4sn0xlsq8lcnyj0q978bamfav6jmfkkccrg2k5l7rndif4nmwg"; - revision = "3"; - editedCabalFile = "0cvs7qwjdbr1f6n49pwjkq1cmkhya658207cmi8b70ghm5wvqfgi"; - libraryHaskellDepends = [ - base lens servant servant-auth servant-swagger swagger2 text - ]; - testHaskellDepends = [ - base hspec lens QuickCheck servant servant-auth servant-swagger - swagger2 text - ]; - testToolDepends = [ hspec-discover ]; - description = "servant-swagger/servant-auth compatibility"; - license = lib.licenses.bsd3; - }) {}; - - "servant-auth-swagger_0_2_11_0" = callPackage - ({ mkDerivation, base, hspec, hspec-discover, lens, QuickCheck - , servant, servant-auth, servant-swagger, swagger2, text - }: - mkDerivation { - pname = "servant-auth-swagger"; version = "0.2.11.0"; sha256 = "1h5ckkai4qxz9c2a62l2lv0ss8az5j1lwyzs4g652zffrgx9qk28"; libraryHaskellDepends = [ @@ -274680,7 +276008,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "servant-swagger/servant-auth compatibility"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-auth-token" = callPackage @@ -274989,38 +276316,6 @@ self: { , kan-extensions, markdown-unlit, monad-control, mtl, network , QuickCheck, semigroupoids, servant, servant-client-core , servant-server, sop-core, stm, text, time, transformers - , transformers-base, transformers-compat, wai, warp - }: - mkDerivation { - pname = "servant-client"; - version = "0.20"; - sha256 = "0xmjqc54yq5akhw5ydbx5k0c1pnrryma8nczwyzvwx4vazrk0pbn"; - revision = "6"; - editedCabalFile = "0a2ix2r0fwdjfpd74sbgksiadzp1x8l5dm66k0g51dvj0v64njcn"; - libraryHaskellDepends = [ - base base-compat bytestring containers deepseq exceptions - http-client http-media http-types kan-extensions monad-control mtl - semigroupoids servant servant-client-core stm text time - transformers transformers-base transformers-compat - ]; - testHaskellDepends = [ - aeson base base-compat bytestring entropy hspec http-api-data - http-client http-types HUnit kan-extensions markdown-unlit mtl - network QuickCheck servant servant-client-core servant-server - sop-core stm text transformers transformers-compat wai warp - ]; - testToolDepends = [ hspec-discover markdown-unlit ]; - description = "Automatic derivation of querying functions for servant"; - license = lib.licenses.bsd3; - }) {}; - - "servant-client_0_20_2" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring, containers - , deepseq, entropy, exceptions, hspec, hspec-discover - , http-api-data, http-client, http-media, http-types, HUnit - , kan-extensions, markdown-unlit, monad-control, mtl, network - , QuickCheck, semigroupoids, servant, servant-client-core - , servant-server, sop-core, stm, text, time, transformers , transformers-base, wai, warp }: mkDerivation { @@ -275042,7 +276337,6 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "Automatic derivation of querying functions for servant"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-client-core" = callPackage @@ -275050,31 +276344,6 @@ self: { , bytestring, constraints, containers, deepseq, exceptions, free , hspec, hspec-discover, http-media, http-types, network-uri , QuickCheck, safe, servant, sop-core, template-haskell, text - , transformers - }: - mkDerivation { - pname = "servant-client-core"; - version = "0.20"; - sha256 = "012bdf3c44bqzb0ycns4pcxb0zidqqn7lpzz9316kiwy0wb4jx56"; - revision = "4"; - editedCabalFile = "10zypw7b7p3b3hb293ik44n45c9s875jnr919ramfx3bpiqchb5g"; - libraryHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring constraints - containers deepseq exceptions free http-media http-types - network-uri safe servant sop-core template-haskell text - transformers - ]; - testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ]; - testToolDepends = [ hspec-discover ]; - description = "Core functionality and class for client function generation for servant APIs"; - license = lib.licenses.bsd3; - }) {}; - - "servant-client-core_0_20_2" = callPackage - ({ mkDerivation, aeson, base, base-compat, base64-bytestring - , bytestring, constraints, containers, deepseq, exceptions, free - , hspec, hspec-discover, http-media, http-types, network-uri - , QuickCheck, safe, servant, sop-core, template-haskell, text }: mkDerivation { pname = "servant-client-core"; @@ -275089,7 +276358,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Core functionality and class for client function generation for servant APIs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-client-js" = callPackage @@ -275168,28 +276436,6 @@ self: { }: mkDerivation { pname = "servant-conduit"; - version = "0.16"; - sha256 = "037vqqq5k2jm6s7gg2shb6iyvjfblsr41ifjpryfxmsib669vs9f"; - revision = "2"; - editedCabalFile = "0vxil0jr3iv4a9bf1rvy7qpbmffic1ga8drm6yl6csd64n4a3jvn"; - libraryHaskellDepends = [ - base bytestring conduit mtl resourcet servant unliftio-core - ]; - testHaskellDepends = [ - base base-compat bytestring conduit http-client http-media - resourcet servant servant-client servant-server wai warp - ]; - description = "Servant Stream support for conduit"; - license = lib.licenses.bsd3; - }) {}; - - "servant-conduit_0_16_1" = callPackage - ({ mkDerivation, base, base-compat, bytestring, conduit - , http-client, http-media, mtl, resourcet, servant, servant-client - , servant-server, unliftio-core, wai, warp - }: - mkDerivation { - pname = "servant-conduit"; version = "0.16.1"; sha256 = "0qxddrkqbglb1ifrcjg8bx86in0na3pmsvgb5q5486bzzsximl48"; libraryHaskellDepends = [ @@ -275201,7 +276447,6 @@ self: { ]; description = "Servant Stream support for conduit"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-csharp" = callPackage @@ -275294,37 +276539,6 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.13"; - sha256 = "0i91my86bcnn0jckf2qlfyx1zfbg8w6959v7iim60s3mdx9yjp67"; - revision = "4"; - editedCabalFile = "16m0glwz8x4k8cjp14jz9gq68q30wmz37qx39f3b4qrh3924hnsm"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base base-compat bytestring case-insensitive - hashable http-media http-types lens servant string-conversions text - universe-base unordered-containers - ]; - executableHaskellDepends = [ - aeson base lens servant string-conversions text - ]; - testHaskellDepends = [ - aeson base base-compat lens servant string-conversions tasty - tasty-golden tasty-hunit transformers - ]; - description = "generate API docs for your servant webservice"; - license = lib.licenses.bsd3; - mainProgram = "greet-docs"; - }) {}; - - "servant-docs_0_13_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring - , case-insensitive, hashable, http-media, http-types, lens, servant - , string-conversions, tasty, tasty-golden, tasty-hunit, text - , transformers, universe-base, unordered-containers - }: - mkDerivation { - pname = "servant-docs"; version = "0.13.1"; sha256 = "1gdv5yrdqfsb4am8rn9fj7gl4f1nswlcbqnp6kc33j5z0mv35z4y"; isLibrary = true; @@ -275343,7 +276557,6 @@ self: { ]; description = "generate API docs for your servant webservice"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "greet-docs"; }) {}; @@ -275467,19 +276680,15 @@ self: { }) {}; "servant-event-stream" = callPackage - ({ mkDerivation, base, binary, http-media, lens, pipes - , servant-foreign, servant-js, servant-pipes, servant-server, text - , wai-extra + ({ mkDerivation, base, bytestring, http-media, lens + , servant-foreign, servant-server, text }: mkDerivation { pname = "servant-event-stream"; - version = "0.2.1.0"; - sha256 = "1bs4gjw7xaai5hxcv0dy7fmvx26ysmcqnaly5vriwkz45k1rhlj9"; - revision = "2"; - editedCabalFile = "1s6si9php8im45yh0r9slgw7sz8c0jk2i4c93a5qbjr0mzz9k2va"; + version = "0.3.0.1"; + sha256 = "1nd9v3dmpnqwj63psm6zikgcd635fc80a7bhn0azzlgi551s5kf2"; libraryHaskellDepends = [ - base binary http-media lens pipes servant-foreign servant-js - servant-pipes servant-server text wai-extra + base bytestring http-media lens servant-foreign servant-server text ]; testHaskellDepends = [ base ]; description = "Servant support for Server-Sent events"; @@ -275571,25 +276780,6 @@ self: { }: mkDerivation { pname = "servant-foreign"; - version = "0.16"; - sha256 = "15pir0x7dcyjmw71g4w00qgvcxyvhbkywzc3bvvaaprk5bjb3bmv"; - revision = "4"; - editedCabalFile = "0nm2nkivil7yh66syvw1a41g1lif75h7wc07rh9bnl7ncqfvdnal"; - libraryHaskellDepends = [ - base base-compat http-types lens servant text - ]; - testHaskellDepends = [ base hspec servant ]; - testToolDepends = [ hspec-discover ]; - description = "Helpers for generating clients for servant APIs in any programming language"; - license = lib.licenses.bsd3; - }) {}; - - "servant-foreign_0_16_1" = callPackage - ({ mkDerivation, base, base-compat, hspec, hspec-discover - , http-types, lens, servant, text - }: - mkDerivation { - pname = "servant-foreign"; version = "0.16.1"; sha256 = "15a5cfiihmav7yq6nfp5f365649q054nk02hpf3lsaw8alpbivpp"; libraryHaskellDepends = [ @@ -275599,7 +276789,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Helpers for generating clients for servant APIs in any programming language"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-gdp" = callPackage @@ -275698,6 +276887,21 @@ self: { broken = true; }) {}; + "servant-hateoas" = callPackage + ({ mkDerivation, aeson, base, http-media, servant, servant-server + }: + mkDerivation { + pname = "servant-hateoas"; + version = "0.2.1"; + sha256 = "0yw72zi2jgmm7vdfivkiajzp35pr72vmcjwnlsvz9plabk3lb1m5"; + libraryHaskellDepends = [ + aeson base http-media servant servant-server + ]; + testHaskellDepends = [ base ]; + description = "HATEOAS extension for servant"; + license = lib.licenses.bsd3; + }) {}; + "servant-haxl-client" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , deepseq, either, exceptions, hashable, haxl, hspec, http-client @@ -275735,8 +276939,8 @@ self: { }: mkDerivation { pname = "servant-hmac-auth"; - version = "0.1.6"; - sha256 = "19w7kg39mzrzir8l0qism3zqjgln7wa02zzbdk9swwnfcja8xm1h"; + version = "0.1.7"; + sha256 = "1fj7fjnanmdc92v9xcn1p47w3bav36bl2ck1w1r3s52w8znw1d6v"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive containers cryptonite http-client http-types memory mtl servant servant-client @@ -275781,42 +276985,6 @@ self: { }: mkDerivation { pname = "servant-http-streams"; - version = "0.20"; - sha256 = "1pakvvw8m7dkwf8zfrh2gan1hs5zp4mgnn4bp0wiy49mc3zzlxwi"; - revision = "6"; - editedCabalFile = "0sq87z14wijr0dv0yclbz9k7g4plfjq8bqcn5wi7wq0h3ak7fzzg"; - libraryHaskellDepends = [ - base base-compat bytestring case-insensitive containers deepseq - exceptions http-common http-media http-streams http-types - io-streams kan-extensions monad-control mtl semigroupoids servant - servant-client-core text time transformers transformers-base - transformers-compat - ]; - testHaskellDepends = [ - aeson base base-compat bytestring deepseq entropy hspec - http-api-data http-streams http-types HUnit kan-extensions - markdown-unlit mtl network QuickCheck servant servant-client-core - servant-server stm text transformers transformers-compat wai warp - ]; - testToolDepends = [ hspec-discover markdown-unlit ]; - description = "Automatic derivation of querying functions for servant"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "servant-http-streams_0_20_2" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring - , case-insensitive, containers, deepseq, entropy, exceptions, hspec - , hspec-discover, http-api-data, http-common, http-media - , http-streams, http-types, HUnit, io-streams, kan-extensions - , markdown-unlit, monad-control, mtl, network, QuickCheck - , semigroupoids, servant, servant-client-core, servant-server, stm - , text, time, transformers, transformers-base, transformers-compat - , wai, warp - }: - mkDerivation { - pname = "servant-http-streams"; version = "0.20.2"; sha256 = "029i6rqmj6q5fn32vimr92rwgfb0c5l5cm19ncrw48nh78pgp0zm"; libraryHaskellDepends = [ @@ -275933,10 +277101,8 @@ self: { ({ mkDerivation, aeson, base, http-media, servant, text }: mkDerivation { pname = "servant-jsonrpc"; - version = "1.1.1"; - sha256 = "0x5anjs6r7xgd2aqvs3fw4jr9yjz92a7pwa5ydpz63ijw2784j9z"; - revision = "1"; - editedCabalFile = "013m5rxs6cl75lhkj4p81jwsrmpywcd1cf7pkxq4kblg3in8bgy0"; + version = "1.2.0"; + sha256 = "1w92snxlypdf9qhm2bmbig864k67iz5avz98pw1yk9q2jggnd7ha"; libraryHaskellDepends = [ aeson base http-media servant text ]; description = "JSON-RPC messages and endpoints"; license = lib.licenses.bsd3; @@ -275950,10 +277116,8 @@ self: { }: mkDerivation { pname = "servant-jsonrpc-client"; - version = "1.1.0"; - sha256 = "0d18qajwpq6np0a61i5qm1z7iwvqrmgixg627diwr1xh4ws1ij8d"; - revision = "2"; - editedCabalFile = "0khfc661yxsnv2vrxcqfj892r3w2ngx3n8mngmrywl0217wh2s87"; + version = "1.2.0"; + sha256 = "1vws0nga5hv5fzlipf1xdr2pj08jjpvpzjlr1q992gsr8q4xm7kn"; libraryHaskellDepends = [ aeson base servant servant-client-core servant-jsonrpc ]; @@ -275968,8 +277132,8 @@ self: { }: mkDerivation { pname = "servant-jsonrpc-server"; - version = "2.1.2"; - sha256 = "0gbmpv1j4za01vwrygngbcs1pzjbfmc043yy57rq0yzvbcm1bmh7"; + version = "2.2.0"; + sha256 = "0ayga850zvkkl85lmmmlpxi4kpw1ny8irdb7ky5ssmrix8slkqx1"; libraryHaskellDepends = [ aeson base containers servant servant-jsonrpc servant-server ]; @@ -276048,26 +277212,6 @@ self: { }: mkDerivation { pname = "servant-machines"; - version = "0.16"; - sha256 = "0c2cz96m9lbzr318i4vpy55y37xagh7sf1g0hvxbsvwhnzqa4532"; - revision = "2"; - editedCabalFile = "0nrrrh73bryg9xh025zdmk1kdmnm0kzrisbyhxrmqc514ayzkrr8"; - libraryHaskellDepends = [ base bytestring machines mtl servant ]; - testHaskellDepends = [ - base base-compat bytestring http-client http-media machines servant - servant-client servant-server wai warp - ]; - description = "Servant Stream support for machines"; - license = lib.licenses.bsd3; - }) {}; - - "servant-machines_0_16_1" = callPackage - ({ mkDerivation, base, base-compat, bytestring, http-client - , http-media, machines, mtl, servant, servant-client - , servant-server, wai, warp - }: - mkDerivation { - pname = "servant-machines"; version = "0.16.1"; sha256 = "0qhy99bx9lv35jpz5k19391z2ph91a7yp8z3ffcsc6lj4gd5nnak"; libraryHaskellDepends = [ base bytestring machines mtl servant ]; @@ -276077,7 +277221,6 @@ self: { ]; description = "Servant Stream support for machines"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-match" = callPackage @@ -276411,29 +277554,6 @@ self: { }: mkDerivation { pname = "servant-pipes"; - version = "0.16"; - sha256 = "00n2rmv4aar49247is2sgy58nal64lv05zci9lhkbgmmmi1hqd10"; - revision = "2"; - editedCabalFile = "1xm1mi12qmwwxy3yqm6ys37q33f8hvq2sqyrvqw9rilkiqs2w8yr"; - libraryHaskellDepends = [ - base bytestring monad-control mtl pipes pipes-safe servant - ]; - testHaskellDepends = [ - base base-compat bytestring http-client http-media pipes - pipes-bytestring pipes-safe servant servant-client servant-server - wai warp - ]; - description = "Servant Stream support for pipes"; - license = lib.licenses.bsd3; - }) {}; - - "servant-pipes_0_16_1" = callPackage - ({ mkDerivation, base, base-compat, bytestring, http-client - , http-media, monad-control, mtl, pipes, pipes-bytestring - , pipes-safe, servant, servant-client, servant-server, wai, warp - }: - mkDerivation { - pname = "servant-pipes"; version = "0.16.1"; sha256 = "0n5l2dwnp0p8gjnz05rqiwxbn0qvngkrlc76ywvampvp1m4kbmhl"; libraryHaskellDepends = [ @@ -276446,7 +277566,6 @@ self: { ]; description = "Servant Stream support for pipes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-polysemy" = callPackage @@ -276983,46 +278102,6 @@ self: { ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, constraints, containers, directory, exceptions , filepath, hspec, hspec-discover, hspec-wai, http-api-data - , http-media, http-types, monad-control, mtl, network, network-uri - , QuickCheck, resourcet, safe, servant, should-not-typecheck - , sop-core, string-conversions, tagged, temporary, text - , transformers, transformers-base, transformers-compat, wai - , wai-app-static, wai-extra, warp, word8 - }: - mkDerivation { - pname = "servant-server"; - version = "0.20"; - sha256 = "1gp8pslk2sspi5vzrl1nimndpif7jhgzlffi2mzf1ap1bdwgxchk"; - revision = "6"; - editedCabalFile = "1n70k1n65lyqx4lhbmg1gw5mfl584smlyaxzrllmp9flh50z64nf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat base64-bytestring bytestring constraints - containers exceptions filepath http-api-data http-media http-types - monad-control mtl network network-uri resourcet servant sop-core - string-conversions tagged text transformers transformers-base wai - wai-app-static word8 - ]; - executableHaskellDepends = [ - aeson base base-compat servant text wai warp - ]; - testHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring directory hspec - hspec-wai http-types mtl QuickCheck resourcet safe servant - should-not-typecheck sop-core string-conversions temporary text - transformers transformers-compat wai wai-extra - ]; - testToolDepends = [ hspec-discover ]; - description = "A family of combinators for defining webservices APIs and serving them"; - license = lib.licenses.bsd3; - mainProgram = "greet"; - }) {}; - - "servant-server_0_20_2" = callPackage - ({ mkDerivation, aeson, base, base-compat, base64-bytestring - , bytestring, constraints, containers, directory, exceptions - , filepath, hspec, hspec-discover, hspec-wai, http-api-data , http-media, http-types, monad-control, mtl, network, resourcet , safe, servant, should-not-typecheck, sop-core, tagged, temporary , text, transformers, transformers-base, wai, wai-app-static @@ -277051,7 +278130,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A family of combinators for defining webservices APIs and serving them"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "greet"; }) {}; @@ -277163,14 +278241,14 @@ self: { "servant-static-th" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers - , directory, doctest, filepath, Glob, hspec-wai, http-media - , semigroups, servant, servant-blaze, servant-server, tasty - , tasty-hspec, tasty-hunit, template-haskell, text, wai + , directory, filepath, hspec, hspec-wai, http-media, semigroups + , servant, servant-blaze, servant-server, tasty, tasty-hspec + , tasty-hunit, template-haskell, text, wai }: mkDerivation { pname = "servant-static-th"; - version = "1.0.0.0"; - sha256 = "1iky6bk92vzhsw31hfdhgclr4nq1kmic6w9mwd5fzjhbs5vcmm15"; + version = "1.0.0.1"; + sha256 = "0pxzv2v5wlf906lxk778m3jvb2ax46x5z122x32a9a0n0s8pppik"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -277179,9 +278257,9 @@ self: { text ]; testHaskellDepends = [ - base blaze-html bytestring directory doctest filepath Glob - hspec-wai servant servant-blaze servant-server tasty tasty-hspec - tasty-hunit wai + base blaze-html bytestring directory filepath hspec hspec-wai + servant servant-blaze servant-server tasty tasty-hspec tasty-hunit + wai ]; description = "Embed a directory of static files in your Servant server"; license = lib.licenses.bsd3; @@ -277339,36 +278417,6 @@ self: { }: mkDerivation { pname = "servant-swagger"; - version = "1.2"; - sha256 = "1dim4vlsd9zcz3ra0qwvb4hlbj0iarxygz78ksw8nbvqgbym3zjh"; - revision = "4"; - editedCabalFile = "0qvd4p0g8djj67g7c4nh2y9z4x6k778y3037w2m4622412fvyyfv"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson aeson-pretty base base-compat bytestring hspec http-media - insert-ordered-containers lens QuickCheck servant singleton-bool - swagger2 text unordered-containers - ]; - testHaskellDepends = [ - aeson base base-compat directory doctest filepath hspec lens - lens-aeson QuickCheck servant swagger2 template-haskell text time - utf8-string vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API."; - license = lib.licenses.bsd3; - }) {}; - - "servant-swagger_1_2_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring - , Cabal, cabal-doctest, directory, doctest, filepath, hspec - , hspec-discover, http-media, insert-ordered-containers, lens - , lens-aeson, QuickCheck, servant, singleton-bool, swagger2 - , template-haskell, text, time, unordered-containers, utf8-string - , vector - }: - mkDerivation { - pname = "servant-swagger"; version = "1.2.1"; sha256 = "18cvybmmp8cp8scpb7hncgn8jra8v82mby1bibysn6xbjy5pqlxq"; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -277385,7 +278433,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API."; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-swagger-tags" = callPackage @@ -278016,8 +279063,8 @@ self: { }: mkDerivation { pname = "serversession-backend-persistent"; - version = "2.0.2"; - sha256 = "19jsswwc38514fqg2asshsvx1x3zx930887k63my4dmidyvvqmwd"; + version = "2.0.3"; + sha256 = "1f6zpxi16frs6jn1dx2kzk0cacw549pg2id2z6vqxkc5fw98iswq"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cereal path-pieces persistent serversession tagged text time transformers @@ -278643,8 +279690,8 @@ self: { }: mkDerivation { pname = "sexpresso"; - version = "1.2.4.0"; - sha256 = "1lpr6kl79kcfxxmnr7hkr2rxk51y599dj4303f1dw7i0vlbm7rfb"; + version = "1.2.5.0"; + sha256 = "1r89d6r6hbby9k4rl21m1hqbyf74lg065xp62r682xmfcczix3hm"; libraryHaskellDepends = [ base bifunctors containers megaparsec recursion-schemes text ]; @@ -278758,8 +279805,8 @@ self: { }: mkDerivation { pname = "sgf"; - version = "0.1.3.2"; - sha256 = "051w1sswj1k2br011q0g6zzvkvwxahkgfn4cpkkrdwz8xm1jb9al"; + version = "0.1.3.3"; + sha256 = "0wxmyv00gphyd7alq79g4vvdkdsmp204pcx300vqvgf6b6ydn1an"; libraryHaskellDepends = [ base containers encoding extensible-exceptions mtl parsec split time transformers @@ -279949,8 +280996,8 @@ self: { }: mkDerivation { pname = "shellify"; - version = "0.11.0.1"; - sha256 = "1ighr9py1c2njiwdzb4fy0rlz7k8zb51la5mr8ciwh7r8zkmi0gv"; + version = "0.11.0.4"; + sha256 = "1q0fjdsw76507f0abx6vcqhm1khsx8rd4d1nnipfpj4vsp5w1dbc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -279965,6 +281012,30 @@ self: { maintainers = [ lib.maintainers.danielrolls ]; }) {}; + "shellify_0_11_0_5" = callPackage + ({ mkDerivation, base, containers, data-default, directory, extra + , hspec, hspec-core, HStringTemplate, mtl, raw-strings-qq, shake + , text, unordered-containers + }: + mkDerivation { + pname = "shellify"; + version = "0.11.0.5"; + sha256 = "0anxcifp15wgk7wji6ks9dcvfzy14q0bwkf6ixx6j42rmbs6fssz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-default directory extra HStringTemplate mtl + raw-strings-qq shake text unordered-containers + ]; + executableHaskellDepends = [ base raw-strings-qq text ]; + testHaskellDepends = [ base hspec hspec-core raw-strings-qq text ]; + description = "A tool for generating shell.nix files"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + mainProgram = "nix-shellify"; + maintainers = [ lib.maintainers.danielrolls ]; + }) {}; + "shellish" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, mtl , process, strict, time, unix-compat @@ -280023,10 +281094,8 @@ self: { }: mkDerivation { pname = "shellmet"; - version = "0.0.4.1"; - sha256 = "0jd05bazny7y25jnminal5wv30kxg6pzchswxpw5yac027qjagd0"; - revision = "1"; - editedCabalFile = "1ivpa3nrbp8qjam99m6dblhakc8gml1hhhigsmb708ndsyqfqa2i"; + version = "0.0.5.0"; + sha256 = "1yqz8nlhjbi5ngl548j4gy07m6dbvxfykj5y2gm4vviwvx0kgmz4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process text ]; @@ -280087,6 +281156,19 @@ self: { license = lib.licenses.mit; }) {}; + "shellwords_0_1_3_2" = callPackage + ({ mkDerivation, base, hspec, megaparsec, text }: + mkDerivation { + pname = "shellwords"; + version = "0.1.3.2"; + sha256 = "1x0yb53qkckxli8sm5ck82c7lccp6kl79sk5mcxizb13a6ikw542"; + libraryHaskellDepends = [ base megaparsec text ]; + testHaskellDepends = [ base hspec megaparsec ]; + description = "Parse strings into words, like a shell would"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "shelly" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib @@ -280754,6 +281836,8 @@ self: { testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "timers using SI units (seconds)"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sibe" = callPackage @@ -280913,8 +281997,8 @@ self: { pname = "sign"; version = "0.4.4"; sha256 = "1z9csfbl5h4cprvykszn81xncsry7fama2y3gbgnqr7mq15qziq7"; - revision = "2"; - editedCabalFile = "1si2x4ip4lqh9zj249f1rsslzxxj94arww63bqaha2zkg25sfykz"; + revision = "3"; + editedCabalFile = "1yrpjv01zhshi0ri3kn8sclvyry85raxgfggxqg9pab73vqwfz79"; libraryHaskellDepends = [ base containers deepseq hashable lattices universe-base ]; @@ -282076,22 +283160,23 @@ self: { }) {}; "simple-sql-parser" = callPackage - ({ mkDerivation, base, containers, megaparsec, mtl - , parser-combinators, prettyprinter, tasty, tasty-hunit, text + ({ mkDerivation, base, containers, filepath, hspec + , hspec-expectations, hspec-golden, hspec-megaparsec, megaparsec + , mtl, parser-combinators, pretty-show, prettyprinter + , raw-strings-qq, text }: mkDerivation { pname = "simple-sql-parser"; - version = "0.7.1"; - sha256 = "0jzmc5ian4y2jpng8c5xqf8igx5h186nw131vh6vq76nyzxxbx87"; - isLibrary = true; - isExecutable = true; + version = "0.8.0"; + sha256 = "01mymjr3gbdpkd660vz2v024b8jvzbzwqznmdxf3j2xpbmy36svw"; libraryHaskellDepends = [ base containers megaparsec mtl parser-combinators prettyprinter text ]; testHaskellDepends = [ - base containers megaparsec mtl parser-combinators prettyprinter - tasty tasty-hunit text + base containers filepath hspec hspec-expectations hspec-golden + hspec-megaparsec megaparsec mtl parser-combinators pretty-show + prettyprinter raw-strings-qq text ]; description = "A parser for SQL"; license = lib.licenses.bsd3; @@ -282821,6 +283906,21 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "singletons-default" = callPackage + ({ mkDerivation, base, data-default-class, singletons + , singletons-base + }: + mkDerivation { + pname = "singletons-default"; + version = "0.1.0.7"; + sha256 = "1rdz61hvv95l33rdv1afhrfjwdpznwik2d4q1z7wl6c8h6dl2wx1"; + libraryHaskellDepends = [ + base data-default-class singletons singletons-base + ]; + description = "An optional type with type level default"; + license = lib.licenses.bsd3; + }) {}; + "singletons-presburger" = callPackage ({ mkDerivation, base, ghc, ghc-typelits-presburger, mtl , reflection, singletons, singletons-base @@ -283156,10 +284256,8 @@ self: { }: mkDerivation { pname = "size-based"; - version = "0.1.3.2"; - sha256 = "1qh2apjkv0m6hi668wq4g7gb75hwhpydv8c5gxn3sgm3cmjscl42"; - revision = "1"; - editedCabalFile = "1h4ig2pqw5spg5mdgwd73q4banvk3kyk7q76pkhy8n0mnwpa51ck"; + version = "0.1.3.3"; + sha256 = "1xc31iy57v9hm97hhr26ws2wwsf56gczwnq7q8ckiy5pgw6fmr1g"; libraryHaskellDepends = [ base dictionary-sharing template-haskell testing-type-modifiers ]; @@ -283651,8 +284749,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.14.2"; - sha256 = "1xbjmxpcqhnfjhma3bq539y3a3jnry75qrfw7d113gvrwsx39njl"; + version = "0.14.3"; + sha256 = "025b9qvah2qi2lff97m9hjnz8808c49sbzg3215s6524arhciv59"; configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; @@ -283678,8 +284776,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.14.2"; - sha256 = "0ja6pjkz49p9r6h0lajf2nfq55sbmda57n1v7jbw1xzh3fcdvqrn"; + version = "0.14.3"; + sha256 = "02y4vzakmdk24k3dysdh7wzrb597cmxzppxxlw3jd2lbyqw7yzlm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -284404,6 +285502,31 @@ self: { maintainers = [ lib.maintainers.dschrempf ]; }) {}; + "slynx_0_8_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix + , matrices, optparse-applicative, random, statistics, text + , transformers, vector + }: + mkDerivation { + pname = "slynx"; + version = "0.8.0.0"; + sha256 = "1rhp6bkkcqiw8ab82znspdlwrmmm18ksgw3976iqakar04d8yybi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers elynx-markov elynx-seq + elynx-tools elynx-tree hmatrix matrices optparse-applicative random + statistics text transformers vector + ]; + executableHaskellDepends = [ base ]; + description = "Handle molecular sequences"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "slynx"; + maintainers = [ lib.maintainers.dschrempf ]; + }) {}; + "small-bytearray-builder" = callPackage ({ mkDerivation, base, bytebuild, byteslice }: mkDerivation { @@ -285206,6 +286329,8 @@ self: { pname = "smtp-mail"; version = "0.5.0.0"; sha256 = "1slmv6k47aqlnms1gjfvsjs1zw8fymvwb7j8nxpjkm554dxqzbcj"; + revision = "1"; + editedCabalFile = "0mjbrjgr7r42a9f45x4zg1zwij1v20d50x1p4g1s17v49s57hyg3"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring bytestring crypton crypton-connection data-default-class filepath memory mime-mail @@ -285259,8 +286384,8 @@ self: { }: mkDerivation { pname = "smtpbz"; - version = "1.0.1"; - sha256 = "1zxcr4md1r9dlg14a3b6ywqnir6jx95qsffwv2f08k2mkifm82w3"; + version = "1.1.0"; + sha256 = "04fr5w139bvi3wdx7ynxkgmb5z34a7wpa4znrhh6vjq2hykxi4nk"; libraryHaskellDepends = [ aeson base bytestring http-conduit http-types text ]; @@ -287881,8 +289006,8 @@ self: { pname = "sound-collage"; version = "0.2.1"; sha256 = "09g63b3k0l30z3lxmcz0zpggqqhnr7m01wh2vpm5v561rbnl8rsi"; - revision = "2"; - editedCabalFile = "0csr699dvsvyf90rcks43naiy5biv1awqj0ah4y8vnkyz261n8l5"; + revision = "3"; + editedCabalFile = "09slv6fqrkbhr1jn7h8xs0cxhdaq3r6cy1xar3vp8dil4hc6v3j8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -288020,6 +289145,8 @@ self: { pname = "sox"; version = "0.2.3.2"; sha256 = "1ys6xm08gr3pvyrial2z1b3gvyd44b9510dpp4ifxqf882igkjgb"; + revision = "1"; + editedCabalFile = "1ncmbclz44grdvhx8lgizsp8g8sm97q6vs50sfiwxh1aqwjys7kd"; libraryHaskellDepends = [ base containers explicit-exception extensible-exceptions process sample-frame semigroups transformers unix utility-ht @@ -288841,13 +289968,14 @@ self: { }) {}; "specup" = callPackage - ({ mkDerivation, base, bytestring, extra, hspec, hspec-core - , megaparsec, optparse-applicative, stache, text, yaml + ({ mkDerivation, base, bytestring, directory, extra, hspec + , hspec-core, megaparsec, optparse-applicative, process, stache + , text, yaml }: mkDerivation { pname = "specup"; - version = "0.2.0.1"; - sha256 = "054v8qffs9wwl6vnfxmjv0753bchvsjibbvcs8fnnmy8si5hk80h"; + version = "0.2.0.3"; + sha256 = "141y6m3l4m39jmdfprk9lksrcgzld1clw5sg6pqw14vry7icq9j8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -288856,7 +289984,9 @@ self: { executableHaskellDepends = [ base bytestring optparse-applicative text ]; - testHaskellDepends = [ base bytestring hspec hspec-core text ]; + testHaskellDepends = [ + base bytestring directory extra hspec hspec-core process text + ]; description = "Manage the application of templates to custom yaml"; license = lib.licenses.gpl2Only; mainProgram = "specup"; @@ -289133,15 +290263,16 @@ self: { }) {}; "spirv-reflect-ffi" = callPackage - ({ mkDerivation, base, bytestring, c2hs, spirv-reflect-types, text - , vector + ({ mkDerivation, base, bytestring, c2hs, spirv-enum + , spirv-reflect-types, text, vector, vector-algorithms }: mkDerivation { pname = "spirv-reflect-ffi"; - version = "0.2"; - sha256 = "1pz2nlc4l6clmwwqmn95lfa50ii0524grfxs1c3ycbd8qi16n6q4"; + version = "0.3"; + sha256 = "1fh7xwqlc9diz3v4byz5iknndf5hm83mzb7awcn012ac55d3gz3x"; libraryHaskellDepends = [ - base bytestring spirv-reflect-types text vector + base bytestring spirv-enum spirv-reflect-types text vector + vector-algorithms ]; libraryToolDepends = [ c2hs ]; description = "C-library loader for spirv-reflect tool"; @@ -289149,26 +290280,26 @@ self: { }) {}; "spirv-reflect-types" = callPackage - ({ mkDerivation, base, containers, text, vector }: + ({ mkDerivation, base, containers, spirv-enum, text, vector }: mkDerivation { pname = "spirv-reflect-types"; - version = "0.2"; - sha256 = "0j002p01kgk3avzvq7p391k7bll74fxg01mqlbk4mjyc7plvz87a"; - libraryHaskellDepends = [ base containers text vector ]; + version = "0.3"; + sha256 = "0sg46268a52qkhql50rm3rkgikg8ygrxhxb4qhrx09xpqqngxhzz"; + libraryHaskellDepends = [ base containers spirv-enum text vector ]; description = "Data types from spirv-reflect tool"; license = lib.licenses.bsd3; }) {}; "spirv-reflect-yaml" = callPackage - ({ mkDerivation, base, bytestring, HsYAML, spirv-reflect-types - , text, vector + ({ mkDerivation, base, bytestring, HsYAML, spirv-enum + , spirv-reflect-types, text, vector }: mkDerivation { pname = "spirv-reflect-yaml"; - version = "0.2"; - sha256 = "0zgr0mfwxf485ka706y67h6vjp6d307fwirfff87gsh0lip7199b"; + version = "0.3"; + sha256 = "1bi1c6ykzs6pbls7r21ipx29dinn7m9lqn94lwf7j2c901nk53s1"; libraryHaskellDepends = [ - base bytestring HsYAML spirv-reflect-types text vector + base bytestring HsYAML spirv-enum spirv-reflect-types text vector ]; description = "YAML loader for spirv-reflect tool"; license = lib.licenses.bsd3; @@ -289997,8 +291128,8 @@ self: { }: mkDerivation { pname = "sqlite-easy"; - version = "1.1.0.0"; - sha256 = "12x89y3hsy51ydb8lnawws9cbqyj9x98mk3pwm5pc62pcwy947yi"; + version = "1.1.0.1"; + sha256 = "04f83krzb5a806dszhhnyhrxpvh6qr00579cq6h4bhz6bk54ivrz"; libraryHaskellDepends = [ base bytestring direct-sqlite migrant-core mtl resource-pool text unliftio-core @@ -290764,8 +291895,8 @@ self: { pname = "stache"; version = "2.3.4"; sha256 = "0kgiyxws2kir8q8zrqkzmk103y7hl6nksxl70f6fy8m9fqkjga51"; - revision = "2"; - editedCabalFile = "107iijpd6jzdnbxd8pm2kyj57645h1ax1ynzb3dfsq0akhnmsgx6"; + revision = "3"; + editedCabalFile = "1x7kgp6496jd62pz7d7yf4q1l55fd344cwjfpalxpawc769xgvg4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -290808,6 +291939,8 @@ self: { pname = "stack"; version = "3.1.1"; sha256 = "0iax7ncga64mgkbiy0psjrd603kz8k8m67f718xl4vpyn3m03by4"; + revision = "1"; + editedCabalFile = "18a7ggbvs90d452njdwscmxjg56axk4az0w3c8shisfg0ykd1x6g"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -290889,15 +292022,15 @@ self: { mainProgram = "stack-all"; }) {}; - "stack-all_0_6_3" = callPackage + "stack-all_0_6_4" = callPackage ({ mkDerivation, aeson, base, cached-json-file, config-ini , directory, extra, filepath, http-query, process, simple-cmd , simple-cmd-args, text, yaml }: mkDerivation { pname = "stack-all"; - version = "0.6.3"; - sha256 = "14cqjaz8rc59sfy1px7a7bbv82dnrnaawf64q731ipl51smi0662"; + version = "0.6.4"; + sha256 = "1yvzglvaalk537fza2nhzjacm7aanrnwsz0grg00ln0a06hb8wcb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -291686,13 +292819,13 @@ self: { , hspec-expectations-lifted, hspec-golden, http-types, lens , lens-aeson, monad-logger, mtl, optparse-applicative, QuickCheck , resourcet, rio, semigroups, text, text-metrics, time - , transformers, typed-process, unliftio, unordered-containers, uuid - , yaml + , transformers, typed-process, unix, unliftio, unordered-containers + , uuid, yaml }: mkDerivation { pname = "stackctl"; - version = "1.7.0.0"; - sha256 = "1v0c2kzkwkd85hq4ffr4pm438lxa5ylg2amcxhz6y6fc8853ihcv"; + version = "1.7.2.0"; + sha256 = "1wpm5bklwxsy8kqk3r4srd50b66jbky0v4wyzqpyjkdh0qn080w8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -291702,7 +292835,7 @@ self: { containers envparse errors exceptions extra filepath Glob lens lens-aeson monad-logger mtl optparse-applicative QuickCheck resourcet rio semigroups text text-metrics time transformers - typed-process unliftio unordered-containers uuid yaml + typed-process unix unliftio unordered-containers uuid yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -292190,8 +293323,8 @@ self: { }: mkDerivation { pname = "static-bytes"; - version = "0.1.0"; - sha256 = "00lai18b7wzyy08l6na0lnzpzlwsld7iqfcz2r0l6qbxmdmm3hsx"; + version = "0.1.1"; + sha256 = "14a0ww31y54hsvv2qf1wchpvzbsnxjjwgm13h9ysc3fclkwa0ba9"; libraryHaskellDepends = [ base bytestring memory primitive rio vector ]; @@ -293539,6 +294672,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "storable-hetero-list" = callPackage + ({ mkDerivation, base, hetero-parameter-list, storable-peek-poke }: + mkDerivation { + pname = "storable-hetero-list"; + version = "0.1.0.4"; + sha256 = "12d32lwr4apnv8m5c2kh4n1zmka2vgcigziih4ndcal4m0sh1niz"; + libraryHaskellDepends = [ + base hetero-parameter-list storable-peek-poke + ]; + testHaskellDepends = [ + base hetero-parameter-list storable-peek-poke + ]; + description = "about Storable and Hetero list"; + license = lib.licenses.bsd3; + }) {}; + "storable-offset" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -293552,6 +294701,20 @@ self: { broken = true; }) {}; + "storable-peek-poke" = callPackage + ({ mkDerivation, base, typelevel-tools-yj }: + mkDerivation { + pname = "storable-peek-poke"; + version = "0.1.0.1"; + sha256 = "1irarnv968qqmsvgvzp8xw994j267qirnj1sj57fr34z40ck3nbb"; + revision = "1"; + editedCabalFile = "18lxyryk05m4s94977g8irxiwnsp06llp962w5nh0rpsazdrhm4r"; + libraryHaskellDepends = [ base typelevel-tools-yj ]; + testHaskellDepends = [ base typelevel-tools-yj ]; + description = "class Sizable, Peek and Poke"; + license = lib.licenses.bsd3; + }) {}; + "storable-record" = callPackage ({ mkDerivation, base, QuickCheck, semigroups, transformers , utility-ht @@ -293664,6 +294827,8 @@ self: { pname = "store"; version = "0.7.18"; sha256 = "1qvfh7j1k8gfkllbvln5kfi45n59690yfkzdlazmajji8d8mp8z0"; + revision = "1"; + editedCabalFile = "1wqsr9hx5fxjhqhshffv2x4ahzr07gl2s3bbjipkms43yshrl5ab"; libraryHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors bytestring containers contravariant cryptohash-sha1 deepseq @@ -294134,8 +295299,8 @@ self: { }: mkDerivation { pname = "streaming-bytestring"; - version = "0.3.2"; - sha256 = "0rxsxm0an21d2wrngg61vdz7lqcigi7fs96n8003yfcnah63qnw8"; + version = "0.3.3"; + sha256 = "15v1r8fw2w9a6ivg3f83pqfs9q5ik27vjbk2wvpd8vlmw210idnv"; libraryHaskellDepends = [ base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet streaming transformers transformers-base @@ -294481,19 +295646,20 @@ self: { }) {}; "streaming-utils" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client - , http-client-tls, json-stream, mtl, network, network-simple, pipes - , resourcet, streaming, streaming-bytestring, streaming-commons - , transformers, zlib + ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base + , bytestring, http-client, http-client-tls, json-stream, mtl + , network, network-simple, pipes, resourcet, streaming + , streaming-bytestring, streaming-commons, transformers, zlib }: mkDerivation { pname = "streaming-utils"; - version = "0.2.5.0"; - sha256 = "1zaq0vk4bzn27w56nxx56fij9cxk7pz5vf2xvglxkj6xip1w63fz"; + version = "0.2.6.0"; + sha256 = "0dpd58fpib9g6chfqkfj29v691gi7mq4czwapwhfjsmmd6rghb01"; libraryHaskellDepends = [ - aeson attoparsec base bytestring http-client http-client-tls - json-stream mtl network network-simple pipes resourcet streaming - streaming-bytestring streaming-commons transformers + aeson attoparsec attoparsec-aeson base bytestring http-client + http-client-tls json-stream mtl network network-simple pipes + resourcet streaming streaming-bytestring streaming-commons + transformers ]; libraryPkgconfigDepends = [ zlib ]; description = "http, attoparsec, pipes and other utilities for the streaming libraries"; @@ -294545,8 +295711,8 @@ self: { pname = "streamly"; version = "0.10.1"; sha256 = "1iyvrhjlvfww5jmwdfx58pr5xi9jzv5h22g0nvnhgnrnxhm86sxn"; - revision = "3"; - editedCabalFile = "1g4jv5gq9bn9mb97zqh2g27l77i1ik8qznzv2lc217kylhmnm2gh"; + revision = "4"; + editedCabalFile = "1zd101rz87b9292cazb57qyhm7jy3ia69f80jqw9wjy69bhyihpf"; libraryHaskellDepends = [ atomic-primops base containers deepseq directory exceptions hashable heaps lockfree-queue monad-control mtl network @@ -294559,20 +295725,24 @@ self: { }) {}; "streamly-archive" = callPackage - ({ mkDerivation, archive, base, bytestring, cryptonite, directory - , filepath, QuickCheck, streamly, streamly-core, tar, tasty - , tasty-hunit, tasty-quickcheck, temporary, zlib + ({ mkDerivation, archive, async, base, bytestring, containers + , cryptonite, directory, filepath, QuickCheck, split, streamly + , streamly-core, tar, tasty, tasty-hunit, tasty-quickcheck + , temporary, zlib }: mkDerivation { pname = "streamly-archive"; - version = "0.2.0"; - sha256 = "0sjshmvndrysbfpj0w05khpga2qsb375iqpfwl6d822vaaxsykq2"; + version = "0.3.0"; + sha256 = "1azjv8lsy4mp9brz6zdfls4srxr8zl3ki80d50k7ikzxhv117sp1"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base bytestring streamly streamly-core ]; + libraryHaskellDepends = [ + base bytestring containers streamly streamly-core + ]; librarySystemDepends = [ archive ]; testHaskellDepends = [ - base bytestring cryptonite directory filepath QuickCheck streamly - streamly-core tar tasty tasty-hunit tasty-quickcheck temporary zlib + async base bytestring containers cryptonite directory filepath + QuickCheck split streamly streamly-core tar tasty tasty-hunit + tasty-quickcheck temporary zlib ]; testSystemDepends = [ archive ]; description = "Stream data from archives using the streamly library"; @@ -294660,6 +295830,8 @@ self: { pname = "streamly-core"; version = "0.2.2"; sha256 = "10ymikc81grisamk663qkdv8rm32bxfa3p7vi86crq77xhypg56a"; + revision = "1"; + editedCabalFile = "0ygr5wnv6acwg2lcyrrq75gn23bis8k0vdxd2v765bw0yd3aqibj"; libraryHaskellDepends = [ base containers directory exceptions filepath fusion-plugin-types ghc-bignum ghc-prim heaps monad-control template-haskell @@ -294700,6 +295872,8 @@ self: { pname = "streamly-fsnotify"; version = "2.1.0.2"; sha256 = "1firr8rbdi39qpwj7d5p8bzavsr37cy9jwgd93yss708msx3n0cl"; + revision = "1"; + editedCabalFile = "0mk5f6i3lk6napip8rkkny97yn5y1acq44wzpsjfnnw1w4sv50f2"; libraryHaskellDepends = [ base exceptions filepath fsnotify semirings streamly streamly-core text time @@ -294711,21 +295885,24 @@ self: { }) {}; "streamly-lmdb" = callPackage - ({ mkDerivation, async, base, bytestring, directory, lmdb - , QuickCheck, streamly, streamly-core, tasty, tasty-quickcheck - , temporary + ({ mkDerivation, async, base, bytestring, cereal, containers + , directory, lifted-base, lmdb, monad-control, mtl, QuickCheck + , random, safe-exceptions, stm, streamly, streamly-core, tasty + , tasty-hunit, tasty-quickcheck, temporary, transformers, vector }: mkDerivation { pname = "streamly-lmdb"; - version = "0.7.0"; - sha256 = "1hr3zpvvnazxss12nqys000vcgvbni3c7zl14pi3j838dsw72qwi"; + version = "0.8.0"; + sha256 = "1yi3nfkv8jd3wl4hap4zcxs760ff61a0yxqvqz0jv0f0164czjkp"; libraryHaskellDepends = [ - async base bytestring streamly streamly-core + base bytestring containers directory lifted-base monad-control + safe-exceptions stm streamly streamly-core ]; librarySystemDepends = [ lmdb ]; testHaskellDepends = [ - async base bytestring directory QuickCheck streamly streamly-core - tasty tasty-quickcheck temporary + async base bytestring cereal containers directory mtl QuickCheck + random streamly streamly-core tasty tasty-hunit tasty-quickcheck + temporary transformers vector ]; testSystemDepends = [ lmdb ]; description = "Stream data to or from LMDB databases using the streamly library"; @@ -295226,10 +296403,8 @@ self: { ({ mkDerivation, base, deepseq }: mkDerivation { pname = "strict-mutable-base"; - version = "1.0.0.0"; - sha256 = "06d46902d79ryg7yy2zc973mgjdr3rc2i486xs6f8lhnrlwq9v3n"; - revision = "1"; - editedCabalFile = "1nqhm00lr9ashsjd38dwax2mn228kqjqshqx39plsjnf25kri5xq"; + version = "1.1.0.0"; + sha256 = "1zwh7v8v0vkxg7kv7zjpxp40iyfqwj6kix05f2k32faav0kx3qzz"; libraryHaskellDepends = [ base deepseq ]; description = "Strict variants of mutable data types from base"; license = lib.licenses.bsd3; @@ -295249,6 +296424,8 @@ self: { ]; description = "Strict MVars for IO and IOSim"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "strict-optics" = callPackage @@ -295273,6 +296450,8 @@ self: { libraryHaskellDepends = [ array base io-classes stm ]; description = "Strict STM interface polymorphic over stm implementation"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "strict-tuple" = callPackage @@ -295505,6 +296684,8 @@ self: { pname = "string-interpolate"; version = "0.3.4.0"; sha256 = "13hb3spabggr6gsn9xhwpwldjvpl2l7z4lgssis82c40n108b0w8"; + revision = "1"; + editedCabalFile = "164afgw0mxnyx5vjwshxphzkw1c4wqm93f3r89rwa5f3w93js7d2"; libraryHaskellDepends = [ base bytestring haskell-src-exts haskell-src-meta split template-haskell text text-conversions utf8-string @@ -295668,17 +296849,18 @@ self: { }) {}; "string-variants" = callPackage - ({ mkDerivation, aeson, base, bytestring, hedgehog, hspec - , hspec-discover, hspec-hedgehog, HUnit, mono-traversable - , QuickCheck, refined, string-conversions, template-haskell, text + ({ mkDerivation, aeson, base, bytestring, deepseq, hashable + , hedgehog, hspec, hspec-discover, hspec-hedgehog, HUnit + , mono-traversable, QuickCheck, refined, string-conversions + , template-haskell, text }: mkDerivation { pname = "string-variants"; - version = "0.3.1.0"; - sha256 = "137ri01lss5ppji7zml50p7sxnd8sfgxc2ka0hn7ki07idaznhwk"; + version = "0.3.1.1"; + sha256 = "11fym4b4qzyylmpgfbdw8v9mcpyya0zmzp2nsyn33a53ljig39g8"; libraryHaskellDepends = [ - aeson base bytestring mono-traversable QuickCheck refined - string-conversions template-haskell text + aeson base bytestring deepseq hashable mono-traversable QuickCheck + refined string-conversions template-haskell text ]; testHaskellDepends = [ aeson base hedgehog hspec hspec-hedgehog HUnit template-haskell @@ -296156,8 +297338,8 @@ self: { }: mkDerivation { pname = "strongweak"; - version = "0.8.0"; - sha256 = "1nws2lkbjfr11jx5ns8qmmik63n158n4abdb1bgmkzkby8621f08"; + version = "0.11.0"; + sha256 = "0bzx25pwc2mg92f72lj32g78yn5gx8pl8341cxbv3j0ysim1fhfj"; libraryHaskellDepends = [ base rerefined text text-builder-linear vector vector-sized ]; @@ -298011,8 +299193,8 @@ self: { }: mkDerivation { pname = "svgone"; - version = "0.2.0.1"; - sha256 = "0gfi744l0060gs0cdgy7mfd9j6axivkjqbb9ayqa81v7mqrj9nzf"; + version = "0.2.0.2"; + sha256 = "0ifwsarp8kzr87lr9fivh6c3bc3ijvhb5h5ps9b7sgpc0qh57pk7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -298617,21 +299799,21 @@ self: { license = "unknown"; }) {}; - "sydtest_0_17_0_0" = callPackage + "sydtest_0_18_0_1" = callPackage ({ mkDerivation, async, autodocodec, base, bytestring, containers - , dlist, fast-myers-diff, filepath, MonadRandom, mtl, opt-env-conf - , path, path-io, pretty-show, QuickCheck, quickcheck-io, random - , random-shuffle, safe, safe-coloured-text + , deepseq, dlist, fast-myers-diff, filepath, MonadRandom, mtl + , opt-env-conf, path, path-io, pretty-show, QuickCheck + , quickcheck-io, random, random-shuffle, safe, safe-coloured-text , safe-coloured-text-terminfo, stm, svg-builder, text, vector }: mkDerivation { pname = "sydtest"; - version = "0.17.0.0"; - sha256 = "1l8ji5qny7wq6n10ys1mxclqbzk54g3fsdi99pjb9sigd99s550n"; + version = "0.18.0.1"; + sha256 = "1lzmm6s4z3w4ny0r9a0g40agzkz2vdzf9c91zxkjrmbmbbh6lj8l"; libraryHaskellDepends = [ - async autodocodec base bytestring containers dlist fast-myers-diff - filepath MonadRandom mtl opt-env-conf path path-io pretty-show - QuickCheck quickcheck-io random random-shuffle safe + async autodocodec base bytestring containers deepseq dlist + fast-myers-diff filepath MonadRandom mtl opt-env-conf path path-io + pretty-show QuickCheck quickcheck-io random random-shuffle safe safe-coloured-text safe-coloured-text-terminfo stm svg-builder text vector ]; @@ -298658,14 +299840,14 @@ self: { license = "unknown"; }) {}; - "sydtest-aeson_0_2_0_0" = callPackage + "sydtest-aeson_0_2_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq , directory, path, path-io, sydtest, sydtest-discover, text }: mkDerivation { pname = "sydtest-aeson"; - version = "0.2.0.0"; - sha256 = "14acwqaxb3dizpqa6xz7wpnb2qssyfzqh4g3g7dxdbk04sypz34h"; + version = "0.2.0.1"; + sha256 = "0qxbsbrz1vyafg7wx2yappzqj821dr86cafx34rx15zbyrbkmpvz"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq path path-io sydtest text @@ -298790,6 +299972,25 @@ self: { broken = true; }) {}; + "sydtest-hspec_0_4_0_3" = callPackage + ({ mkDerivation, base, hspec, hspec-core, mtl, QuickCheck, stm + , sydtest, sydtest-discover + }: + mkDerivation { + pname = "sydtest-hspec"; + version = "0.4.0.3"; + sha256 = "1vnc6b8vswqbpz6l2rgx4r8k658wzdmv4ca601rfy03539n98nzl"; + libraryHaskellDepends = [ + base hspec-core mtl QuickCheck stm sydtest + ]; + testHaskellDepends = [ base hspec stm sydtest ]; + testToolDepends = [ sydtest-discover ]; + description = "An Hspec companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "sydtest-mongo" = callPackage ({ mkDerivation, base, binary, bson, bytestring, mongoDB, network , path, path-io, port-utils, process, sydtest, sydtest-discover @@ -298811,15 +300012,15 @@ self: { broken = true; }) {}; - "sydtest-mongo_0_1_0_0" = callPackage + "sydtest-mongo_0_2_0_0" = callPackage ({ mkDerivation, base, binary, bson, bytestring, mongoDB, network , path, path-io, port-utils, process, sydtest, sydtest-process , text, yaml }: mkDerivation { pname = "sydtest-mongo"; - version = "0.1.0.0"; - sha256 = "1wqhqyg513mh8vxc2ddsxd04iywlz3gwgx35zawgldi215zdfnqi"; + version = "0.2.0.0"; + sha256 = "0sca6m2k03dss7qvfhm0km4x7karg9dck61qhv3gjr42i9145hib"; libraryHaskellDepends = [ base binary bson bytestring mongoDB network path path-io port-utils process sydtest sydtest-process text yaml @@ -298979,8 +300180,8 @@ self: { }: mkDerivation { pname = "sydtest-wai"; - version = "0.2.0.1"; - sha256 = "0fmgn8g9ka275qkanzrlqr4wqwjcq2a99yvkh4jz53vspyiml78q"; + version = "0.2.0.2"; + sha256 = "03nm64vfpvb54m2ngsgwrprgw00ysxiwbb332yvk5w0rb1p4bfg1"; libraryHaskellDepends = [ base bytestring case-insensitive http-client http-types mtl network sydtest text time wai warp @@ -300729,8 +301930,8 @@ self: { }: mkDerivation { pname = "systranything"; - version = "0.1.0.0"; - sha256 = "1p6y9hvkn12n1dwnkwij2qjjdvhzqwq9sxqmlzrkclbmkmivcanj"; + version = "0.1.1.0"; + sha256 = "0d41zlfxb3gvhii3fgr4wb1gsids0l7594xdahq5s23wcapaif6b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -301045,43 +302246,45 @@ self: { ({ mkDerivation, aeson, ansi-terminal, base, broadcast-chan , bytestring, conduit, containers, data-default, dbus , dbus-hslogger, directory, dyre, either, enclosed-exceptions - , filepath, gi-cairo, gi-cairo-connector, gi-cairo-render, gi-gdk + , filepath, gi-cairo-connector, gi-cairo-render, gi-gdk , gi-gdkpixbuf, gi-gdkx11, gi-glib, gi-gtk, gi-gtk-hs, gi-pango - , gtk-sni-tray, gtk-strut, gtk3, haskell-gi, haskell-gi-base - , hslogger, HStringTemplate, http-client, http-client-tls - , http-conduit, http-types, multimap, old-locale + , gtk-sni-tray, gtk-strut, gtk3, haskell-gi-base, hslogger, hspec + , hspec-core, hspec-discover, hspec-golden, HStringTemplate + , http-client, http-client-tls, http-conduit, http-types, multimap , optparse-applicative, parsec, process, rate-limit, regex-compat , safe, scotty, split, status-notifier-item, stm, template-haskell - , text, time, time-locale-compat, time-units, transformers - , transformers-base, tuple, unix, utf8-string, X11, xdg-basedir + , temporary, text, time, time-locale-compat, time-units + , transformers, tuple, unix, utf8-string, X11, xdg-basedir , xdg-desktop-entry, xml, xml-helpers, xmonad }: mkDerivation { pname = "taffybar"; - version = "4.0.2"; - sha256 = "1w1lsz8bk4xq4dzsfi2yf3x036a8y6b14jpil74c1xbicjc74gmg"; + version = "4.0.3"; + sha256 = "107hajq6y3hb9n80zncc8qi74dn6qqp7mic4xagnmah82sk1k5x9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal base broadcast-chan bytestring conduit containers data-default dbus dbus-hslogger directory dyre either - enclosed-exceptions filepath gi-cairo gi-cairo-connector - gi-cairo-render gi-gdk gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk - gi-gtk-hs gi-pango gtk-sni-tray gtk-strut haskell-gi - haskell-gi-base hslogger HStringTemplate http-client - http-client-tls http-conduit http-types multimap old-locale parsec + enclosed-exceptions filepath gi-cairo-connector gi-cairo-render + gi-gdk gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk gi-gtk-hs gi-pango + gtk-sni-tray gtk-strut haskell-gi-base hslogger HStringTemplate + http-client http-client-tls http-conduit http-types multimap parsec process rate-limit regex-compat safe scotty split status-notifier-item stm template-haskell text time - time-locale-compat time-units transformers transformers-base tuple - unix utf8-string X11 xdg-basedir xdg-desktop-entry xml xml-helpers - xmonad + time-locale-compat time-units transformers tuple unix utf8-string + X11 xdg-basedir xdg-desktop-entry xml xml-helpers xmonad ]; libraryPkgconfigDepends = [ gtk3 ]; executableHaskellDepends = [ base data-default directory hslogger optparse-applicative ]; executablePkgconfigDepends = [ gtk3 ]; + testHaskellDepends = [ + base directory filepath hspec hspec-core hspec-golden temporary + ]; + testToolDepends = [ hspec-discover ]; description = "A desktop bar similar to xmobar, but with more GUI"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; @@ -302527,16 +303730,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "tasty_1_5" = callPackage + "tasty_1_5_2" = 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.2"; + sha256 = "0dxp65vm2nfal7nhiznm26yrcq5xj6qkpzjixf2j5gmr9x2v173j"; libraryHaskellDepends = [ ansi-terminal base containers optparse-applicative stm tagged transformers unix @@ -302739,8 +303940,8 @@ self: { ({ mkDerivation, base, containers, filepath, hpc, tasty }: mkDerivation { pname = "tasty-coverage"; - version = "0.1.3.0"; - sha256 = "00yzx1qw4bcdpa55ldjk2f284z2i46xlp8l6a9jpwcxndwv48raa"; + version = "0.1.4.0"; + sha256 = "0jj7lx44vsvwhkvpxmsf2lc8i0yks6d9c28hqnhrmqp53vamqp23"; libraryHaskellDepends = [ base containers filepath hpc tasty ]; description = "Ingredient for tasty which generates per-test coverage reports"; license = lib.licenses.bsd3; @@ -302822,6 +304023,22 @@ self: { broken = true; }) {}; + "tasty-flaky" = callPackage + ({ mkDerivation, base, retry, tagged, tasty, tasty-hunit }: + mkDerivation { + pname = "tasty-flaky"; + version = "0.1.0.0"; + sha256 = "1p0lvfics2p98jhg46m1gl7lrpq73v1waxplvib77pl5q9ymlk87"; + revision = "1"; + editedCabalFile = "0kdx020wypr226q9syn1wiq3a7szyzy66khfzh3ssr290r0sknci"; + libraryHaskellDepends = [ base retry tagged tasty ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Handle flaky Tasty-based tests"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "tasty-focus" = callPackage ({ mkDerivation, base, tagged, tasty, tasty-expected-failure , tasty-hunit @@ -302953,25 +304170,6 @@ self: { license = lib.licenses.mit; }) {}; - "tasty-hspec_1_1_6" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty - , tasty-quickcheck, tasty-smallcheck - }: - mkDerivation { - pname = "tasty-hspec"; - version = "1.1.6"; - sha256 = "02s82ijs2ringqxsqbm7m3vcy5brmwxa617azxv0v2phi3rdkjvl"; - revision = "1"; - editedCabalFile = "0za15rg0szacxq9yfxxjzddr77ai7ng5827a20pj9dr5anjlnajj"; - libraryHaskellDepends = [ - base hspec hspec-core QuickCheck tasty tasty-quickcheck - tasty-smallcheck - ]; - description = "Hspec support for the Tasty test framework"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "tasty-hspec" = callPackage ({ mkDerivation, base, hspec, hspec-api, hspec-core, QuickCheck , tasty, tasty-quickcheck, tasty-smallcheck @@ -303491,6 +304689,31 @@ self: { license = lib.licenses.isc; }) {}; + "tasty-sugar_2_2_2_0" = callPackage + ({ mkDerivation, base, containers, directory, filemanip, filepath + , hedgehog, kvitable, logict, microlens, mtl, optparse-applicative + , parallel, pretty-show, prettyprinter, raw-strings-qq, tasty + , tasty-hedgehog, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "tasty-sugar"; + version = "2.2.2.0"; + sha256 = "1ac9ciqlrq25ipqnjssk3288gnpsi6y9ia8s0f3d6dvcv73593rb"; + libraryHaskellDepends = [ + base containers directory filemanip filepath kvitable logict + microlens mtl optparse-applicative parallel prettyprinter tasty + text + ]; + testHaskellDepends = [ + base filepath hedgehog logict pretty-show prettyprinter + raw-strings-qq tasty tasty-hedgehog tasty-hunit text transformers + ]; + doHaddock = false; + description = "Tests defined by Search Using Golden Answer References"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-tap" = callPackage ({ mkDerivation, base, containers, directory, stm, tasty , tasty-golden, tasty-hunit @@ -304278,8 +305501,8 @@ self: { }: mkDerivation { pname = "telegram-bot-api"; - version = "7.4"; - sha256 = "0pbp14dg4qdf3vl93f46l6q1gdprkfvhfgi5ll3kln66z2bs40fq"; + version = "7.4.2"; + sha256 = "0ckl3b1hcdv93wa764rgkv4kpzv52dy1rf61k6w8iha6619rh9m1"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring cron filepath hashable http-api-data http-client http-client-tls monad-control mtl @@ -304302,8 +305525,10 @@ self: { }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.14.2"; - sha256 = "10jwvx6m8zqzicfy3iyc9igxlnzyd8h320280q9s53420gzfpdf4"; + version = "0.14.3"; + sha256 = "0h7cpa5zbhz9y362djxznl2q1s0mj1ci6fg071i21fbk1fkjsmhf"; + revision = "2"; + editedCabalFile = "1qkx0vyx4y07khwk5vf0kx735q0s3x5f4rggrdb7dy96dfpsvaz3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -304413,6 +305638,31 @@ self: { broken = true; }) {}; + "telescope" = callPackage + ({ mkDerivation, base, binary, byte-order, bytestring, casing + , conduit, containers, effectful, exceptions, fits-parse, libyaml + , massiv, megaparsec, resourcet-effectful, scientific, skeletest + , text, time + }: + mkDerivation { + pname = "telescope"; + version = "0.2.0"; + sha256 = "0ax9sk5910zi09wnyxc9zn4sf54bsvyycsj8faxrgf840wpw990f"; + libraryHaskellDepends = [ + base binary byte-order bytestring casing conduit effectful + exceptions fits-parse libyaml massiv megaparsec resourcet-effectful + scientific text time + ]; + testHaskellDepends = [ + base binary byte-order bytestring casing conduit containers + effectful exceptions fits-parse libyaml massiv megaparsec + resourcet-effectful scientific skeletest text time + ]; + testToolDepends = [ skeletest ]; + description = "Astronomical Observations (FITS, ASDF, WCS, etc)"; + license = lib.licenses.bsd3; + }) {}; + "teleshell" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hashable, network , pipes, primitive, QuickCheck, split, tasty, tasty-hunit @@ -304711,14 +305961,14 @@ self: { "templatise" = callPackage ({ mkDerivation, base, bytestring, Cabal-syntax, directory , exceptions, extra, filepath, hspec, http-client, http-conduit - , MissingH, monad-logger, mtl, network-uri, optparse-applicative - , parsec, process, regex-tdfa, tasty, tasty-golden, tasty-hspec - , temporary, text, time + , 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.6.0"; - sha256 = "07dp87h0hn77ccg8acnfpki1yvxx4h1h6nqdjfxwc0kwji1svzia"; + version = "0.1.7.0"; + sha256 = "127gi12sisi3xpqp8wp0bl8vvxdbgdy3cw9mvcg7qqzmkhz914x2"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -304729,9 +305979,9 @@ self: { ]; executableHaskellDepends = [ base optparse-applicative ]; testHaskellDepends = [ - base bytestring Cabal-syntax directory filepath hspec MissingH - monad-logger mtl network-uri optparse-applicative process tasty - tasty-golden tasty-hspec temporary text time + base bytestring Cabal-syntax directory filepath hspec 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."; @@ -305297,8 +306547,8 @@ self: { ({ mkDerivation, base, mtl, QuickCheck, random, random-shuffle }: mkDerivation { pname = "tensort"; - version = "1.0.1.2"; - sha256 = "1hg647gjx24g38vnnkg61i9i42dinf27j3rr80wqm6wrkl7jzxvd"; + version = "1.0.1.3"; + sha256 = "0xl99n3d2v202j0jc8vydzjkyshnlym9fkzdgn2p9sfbqq652y29"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl random random-shuffle ]; @@ -305743,8 +306993,8 @@ self: { }: mkDerivation { pname = "tesla"; - version = "0.7.4.0"; - sha256 = "0zzybsb711x2bxbj99j507b6x7jhmxlhl690w9zzxzyk87pahkjv"; + version = "0.7.5.0"; + sha256 = "0vrims4lx6kg9rfq9d1v35vlj51lgpv3a4gdd7i8dk99sqqa9dyw"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring casing containers cryptonite exceptions finite-typelits generic-deriving http-client @@ -306552,15 +307802,15 @@ self: { license = lib.licenses.gpl2Only; }) {}; - "texmath_0_12_8_9" = callPackage + "texmath_0_12_8_11" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pandoc-types, parsec, pretty-show, split, syb, tagged, tasty , tasty-golden, text, typst-symbols, xml }: mkDerivation { pname = "texmath"; - version = "0.12.8.9"; - sha256 = "0qm68ib9immfykf5p7jkk3l8h4ifss8ys7k8ppzaaygagc4s8zpw"; + version = "0.12.8.11"; + sha256 = "0yyxr5bdl1shsp3ir9d9a2hwah3cz6p3pvak27k4fvk1idisds7z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -306583,10 +307833,8 @@ self: { }: mkDerivation { pname = "texrunner"; - version = "0.0.1.3"; - sha256 = "0lck7b6gw217jabgz2sa3r32i7yxm35hx32jn0s86dbckc2xqili"; - revision = "1"; - editedCabalFile = "1z719yygpzr8lsdvyldq1dca7lffll4wlbv7mkm7phyks6zfdn1m"; + version = "0.0.2"; + sha256 = "1y6nixdinki8iq2nwwppx5kh24w0kap0x7n3kjhmvbrqjpy03pmv"; libraryHaskellDepends = [ attoparsec base bytestring directory filepath io-streams mtl process semigroups temporary @@ -306630,7 +307878,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "text_2_1_1" = callPackage + "text_2_1_2" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, QuickCheck , system-cxx-std-lib, tasty, tasty-bench, tasty-hunit @@ -306639,16 +307887,14 @@ self: { }: mkDerivation { pname = "text"; - version = "2.1.1"; - sha256 = "1azy4kzy23nhck4mxfrqdd754z8nbwpxqdgdfqjdgx45nalds374"; - revision = "1"; - editedCabalFile = "0zg8nlri1lhhyhzwl38xsil23j4xgc47ycjk0jl0f1jx0n8zphvq"; + version = "2.1.2"; + sha256 = "1dmcrvgavan5r5h4w0rjcmjii3l1rglr03wi4nd8xlw7jbshr9l4"; libraryHaskellDepends = [ array base binary bytestring deepseq ghc-prim system-cxx-std-lib template-haskell ]; testHaskellDepends = [ - base bytestring deepseq directory ghc-prim QuickCheck tasty + base binary bytestring deepseq directory ghc-prim QuickCheck tasty tasty-hunit tasty-inspection-testing tasty-quickcheck template-haskell transformers ]; @@ -306764,8 +308010,8 @@ self: { }: mkDerivation { pname = "text-builder-dev"; - version = "0.3.4.4"; - sha256 = "13n6dp385xhm7f533lr4nivhgwai2pdslz7b3ywq7m0dv249p6l9"; + version = "0.3.5"; + sha256 = "1mg503a73jl5bpjp7npqadq1lj0sfc1krpqw1s4zybfn70n49vah"; libraryHaskellDepends = [ base bytestring deferred-folds isomorphism-class QuickCheck quickcheck-instances split text time transformers @@ -307212,6 +308458,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-metrics_0_3_3" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, hspec + , primitive, QuickCheck, text, vector, weigh + }: + mkDerivation { + pname = "text-metrics"; + version = "0.3.3"; + sha256 = "0gl5xxagdgs32m5xh58zlgwnysg0i19m31gg2lpm58x9d1bal81k"; + libraryHaskellDepends = [ base containers primitive text vector ]; + testHaskellDepends = [ base hspec QuickCheck text ]; + benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; + description = "Calculate various string metrics efficiently"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "text-misc-yj" = callPackage + ({ mkDerivation, base, mtl-misc-yj, text, try-text-misc-yj }: + mkDerivation { + pname = "text-misc-yj"; + version = "0.1.0.1"; + sha256 = "1i7mkdz8kpbzyhkzjija2bzr35jr3f51v3a849px65f5jfx2sazb"; + libraryHaskellDepends = [ base mtl-misc-yj text ]; + testHaskellDepends = [ base mtl-misc-yj text try-text-misc-yj ]; + description = "tribial tools about text"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {try-text-misc-yj = null;}; + "text-normal" = callPackage ({ mkDerivation, base, deepseq, hspec, QuickCheck , quickcheck-instances, text, text-icu @@ -307499,6 +308775,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-show_3_11" = callPackage + ({ mkDerivation, array, base, base-compat-batteries, base-orphans + , bifunctors, bytestring, containers, criterion, deepseq + , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec + , hspec-discover, QuickCheck, quickcheck-instances + , template-haskell, text, th-abstraction, transformers + , transformers-compat + }: + mkDerivation { + pname = "text-show"; + version = "3.11"; + sha256 = "1hp8bw5cmppdwqjvnmv7h38rckvdpxrzgcvbllgvf4zm9ns6dsr8"; + libraryHaskellDepends = [ + array base base-compat-batteries bifunctors bytestring containers + ghc-boot-th ghc-prim template-haskell text th-abstraction + transformers transformers-compat + ]; + testHaskellDepends = [ + array base base-compat-batteries base-orphans bytestring + deriving-compat generic-deriving ghc-prim hspec QuickCheck + quickcheck-instances template-haskell text transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; + description = "Efficient conversion of values into Text"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-show-instances" = callPackage ({ mkDerivation, aeson, base, base-compat, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -307511,10 +308817,8 @@ self: { }: mkDerivation { pname = "text-show-instances"; - version = "3.9.8"; - sha256 = "13h2nfbmqzll9glifi7n9dkmaxks72w8ciwzwk106iygzpbrnw3c"; - revision = "1"; - editedCabalFile = "17nzy1wr318m90bdmj37rrzwsfhri28azgaqrvpl5igllc4d0480"; + version = "3.9.9"; + sha256 = "0ip2ym2v3rh5bi6mjfxpzrbvbrpqyi2ccaf4kfg5sy0k0yv3nrhm"; libraryHaskellDepends = [ aeson base base-compat bifunctors binary containers directory ghc-boot-th haskeline hpc nonempty-vector old-locale old-time @@ -307536,6 +308840,42 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-show-instances_3_9_10" = callPackage + ({ mkDerivation, aeson, base, base-compat, bifunctors, binary + , containers, directory, generic-deriving, ghc-boot-th, ghc-prim + , haskeline, hpc, hspec, hspec-discover, nonempty-vector + , old-locale, old-time, pretty, QuickCheck, quickcheck-instances + , random, scientific, semigroups, tagged, template-haskell + , terminfo, text, text-short, text-show, th-orphans, time + , transformers, transformers-compat, unix, unordered-containers + , uuid-types, vector, xhtml + }: + mkDerivation { + pname = "text-show-instances"; + version = "3.9.10"; + sha256 = "09cb391gi0hgkjk4ap4d83vg13lczrghmb9db96a4ckw1bp9pbc1"; + libraryHaskellDepends = [ + aeson base base-compat bifunctors binary containers directory + ghc-boot-th haskeline hpc nonempty-vector old-locale old-time + pretty random scientific semigroups tagged template-haskell + terminfo text text-short text-show time transformers unix + unordered-containers uuid-types vector xhtml + ]; + testHaskellDepends = [ + aeson base base-compat bifunctors binary containers directory + generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec + nonempty-vector old-locale old-time pretty QuickCheck + quickcheck-instances random scientific tagged template-haskell + terminfo text-short text-show th-orphans time transformers + transformers-compat unix unordered-containers uuid-types vector + xhtml + ]; + testToolDepends = [ hspec-discover ]; + description = "Additional instances for text-show"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-stream-decode" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text }: @@ -308358,10 +309698,8 @@ self: { }: mkDerivation { pname = "th-lift"; - version = "0.8.4"; - sha256 = "06x6njyn6p6shwj5n1znq017vwalr867ziwbwzimz9jbilipgigr"; - revision = "2"; - editedCabalFile = "1cwc4q408b9pina7069hi8v3m9nqa5c6sm8lamr5ssialiwchcig"; + version = "0.8.5"; + sha256 = "0xhivxk89y76jkgm636d1qan3ssgiqk2g23abzdfgpq29s6mm739"; libraryHaskellDepends = [ base ghc-prim template-haskell th-abstraction ]; @@ -308408,10 +309746,8 @@ self: { }: mkDerivation { pname = "th-orphans"; - version = "0.13.14"; - sha256 = "0z07qcbbsj2b3j9p1qr4jvlpa7qgjfjvymkjd6vbizka1wd2mnwx"; - revision = "3"; - editedCabalFile = "19gh8f082ia27ch7xjj41vwlp7234sv545hhb3kcwkmw9brc67aj"; + version = "0.13.15"; + sha256 = "1gayl4afrl9swqhb12z5z84zl8vx684xj90s9h57029a72vjrl0k"; libraryHaskellDepends = [ base mtl template-haskell th-compat th-lift th-reify-many ]; @@ -309484,7 +310820,7 @@ self: { , gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens , mime-types, mtl, network, process, random, scientific, split , tasty, tasty-quickcheck, text, transformers, unordered-containers - , utf8-string, vector, webkitgtk, xdg-basedir, xmonad + , utf8-string, vector, webkitgtk_4_0, xdg-basedir, xmonad , xmonad-contrib }: mkDerivation { @@ -309503,7 +310839,7 @@ self: { mime-types mtl network process random scientific split text transformers unordered-containers utf8-string vector xdg-basedir ]; - executablePkgconfigDepends = [ gtk3 webkitgtk ]; + executablePkgconfigDepends = [ gtk3 webkitgtk_4_0 ]; testHaskellDepends = [ aeson base bytestring containers dbus directory filepath gi-gdk gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens @@ -309516,7 +310852,7 @@ self: { hydraPlatforms = lib.platforms.none; mainProgram = "tianbar"; broken = true; - }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk_4_0;}; "tibetan-utils" = callPackage ({ mkDerivation, base, composition-prelude, hspec, hspec-megaparsec @@ -309838,6 +311174,8 @@ self: { ]; description = "Haskell implementation of tiktoken"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tikzsd" = callPackage @@ -310139,13 +311477,13 @@ self: { license = lib.licenses.mit; }) {}; - "time-manager_0_1_0" = callPackage - ({ mkDerivation, auto-update, base, unliftio }: + "time-manager_0_1_1" = callPackage + ({ mkDerivation, auto-update, base }: mkDerivation { pname = "time-manager"; - version = "0.1.0"; - sha256 = "1r2wgi160nkky220bdwknld1ymfpq4541pzbhmkna670r1ahzcb2"; - libraryHaskellDepends = [ auto-update base unliftio ]; + version = "0.1.1"; + sha256 = "0c623xpfd5zahs2d2v7hggd53c5p1h4pii6182by6d06w60496cq"; + libraryHaskellDepends = [ auto-update base ]; description = "Scalable timer"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -311022,12 +312360,14 @@ self: { }) {}; "tinyapp" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, brick, mtl, vty }: mkDerivation { pname = "tinyapp"; - version = "0.1.0.2"; - sha256 = "1xsh0fv5zmcpgcm5xq3xap5fx9y1v8z14pdqa9xsy7v509g4c8l1"; - libraryHaskellDepends = [ base ]; + version = "0.2.0.0"; + sha256 = "0phi8q1nsbjyrkzm2w0mxh1y5bl3byzdfdp1ib1qsslc5p3z20x5"; + revision = "2"; + editedCabalFile = "1sk4sp28mlh3cx9gjxslcdy3w78v64lil277il6sdf8y6h2bwsa3"; + libraryHaskellDepends = [ base brick mtl vty ]; testHaskellDepends = [ base ]; description = "Library to build tiny apps in Haskell"; license = lib.licenses.mit; @@ -311564,29 +312904,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "tls_2_1_0" = callPackage + "tls_2_1_4" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base , base16-bytestring, bytestring, cereal, crypton, crypton-x509 - , crypton-x509-store, crypton-x509-validation, data-default-class + , crypton-x509-store, crypton-x509-validation, data-default , hourglass, hspec, hspec-discover, memory, mtl, network , QuickCheck, serialise, transformers, unix-time }: mkDerivation { pname = "tls"; - version = "2.1.0"; - sha256 = "1i84j49gb1dgyqf4rwdrnjp47rynmyavh05dkijbj82qdcxjmb6v"; + version = "2.1.4"; + sha256 = "1bs3xjy9nza7yd7yrhzf10zqrg7krd6z87fqcbb2qcz4b34rc8x9"; 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 + crypton-x509-validation data-default 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 + crypton-x509-validation data-default hourglass hspec QuickCheck + serialise ]; testToolDepends = [ hspec-discover ]; description = "TLS protocol native implementation"; @@ -311652,14 +312992,16 @@ self: { license = lib.licenses.bsd3; }) {}; - "tls-session-manager_0_0_6" = callPackage + "tls-session-manager_0_0_7" = callPackage ({ mkDerivation, auto-update, base, basement, bytestring, clock , crypto-token, memory, psqueues, serialise, tls }: mkDerivation { pname = "tls-session-manager"; - version = "0.0.6"; - sha256 = "019b8d54nmmrqxf6nw4si0cym7hjmd2safq848hzihimgjp41caz"; + version = "0.0.7"; + sha256 = "0n88cnwcaz86izp0x004pbjm2nnr1x6lc75kjc26j9m4k9h266nc"; + revision = "1"; + editedCabalFile = "16ipngf44pbzf9xdvh6khkjrjz860nd48f5lrzbi5dnbjhcd6vi2"; libraryHaskellDepends = [ auto-update base basement bytestring clock crypto-token memory psqueues serialise tls @@ -311694,6 +313036,31 @@ self: { maintainers = [ lib.maintainers.dschrempf ]; }) {}; + "tlynx_0_8_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , comonad, containers, data-default, elynx-tools, elynx-tree + , gnuplot, optparse-applicative, parallel, random, statistics, text + , transformers, vector + }: + mkDerivation { + pname = "tlynx"; + version = "0.8.0.0"; + sha256 = "144jr0wiww76x4k053bshs88cicpnqyz43ya6m8kmg77m5n6fpvy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring comonad containers + data-default elynx-tools elynx-tree gnuplot optparse-applicative + parallel random statistics text transformers vector + ]; + executableHaskellDepends = [ base ]; + description = "Handle phylogenetic trees"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "tlynx"; + maintainers = [ lib.maintainers.dschrempf ]; + }) {}; + "tmapchan" = callPackage ({ mkDerivation, base, containers, hashable, stm , unordered-containers @@ -311792,7 +313159,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "tmp-proc_0_7_1_0" = callPackage + "tmp-proc_0_7_2_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 @@ -311801,8 +313168,8 @@ self: { }: mkDerivation { pname = "tmp-proc"; - version = "0.7.1.0"; - sha256 = "0l7grkyl0n1h6nbhfi8ivn3wxdkjzhhwfnbxrlbvf2pbiidgj6bc"; + version = "0.7.2.0"; + sha256 = "0yyjxm5d2qyhrfjvh7zq8300fqmlykjx1xn91r0kca1j4hy9i785"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -311901,14 +313268,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "tmp-proc-rabbitmq_0_7_0_1" = callPackage + "tmp-proc-rabbitmq_0_7_2_0" = callPackage ({ mkDerivation, amqp, base, bytestring, hspec, hspec-tmp-proc , text, tmp-proc }: mkDerivation { pname = "tmp-proc-rabbitmq"; - version = "0.7.0.1"; - sha256 = "1jxymiffs8822rxh4fcpiblnd9k40s53p7sx3ny1nf9a3qvh82nf"; + version = "0.7.2.0"; + sha256 = "1m6mdvsv0gd0qqrqikwl2bqz61i14w3zay7z2547vzsbdxb3mfkk"; libraryHaskellDepends = [ amqp base bytestring text tmp-proc ]; testHaskellDepends = [ amqp base bytestring hspec hspec-tmp-proc text tmp-proc @@ -312868,6 +314235,24 @@ self: { broken = true; }) {}; + "tools-yj" = callPackage + ({ mkDerivation, base, containers, data-default, mono-traversable + , stm, text + }: + mkDerivation { + pname = "tools-yj"; + version = "0.1.0.19"; + sha256 = "0zm1alj3a95mbgxmc41c6y35az75fsfc2q0g6f17rn7zbwhmk18v"; + libraryHaskellDepends = [ + base containers data-default mono-traversable stm text + ]; + testHaskellDepends = [ + base containers data-default mono-traversable stm text + ]; + description = "Tribial tools"; + license = lib.licenses.bsd3; + }) {}; + "toolshed" = callPackage ({ mkDerivation, array, base, containers, data-default, deepseq , directory, extra, filepath, HUnit, QuickCheck, random @@ -313802,12 +315187,12 @@ self: { mainProgram = "Benchmark"; }) {}; - "transformers_0_6_1_1" = callPackage + "transformers_0_6_1_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "transformers"; - version = "0.6.1.1"; - sha256 = "09fpjawkixgm3xpas89wkpkn1jfpxz035crnp97if2hh1y759ll1"; + version = "0.6.1.2"; + sha256 = "1db1gr4dkz1gi5q3fvqlv83qg5r5x89cmk8y9affa3n433xmrn1z"; libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; license = lib.licenses.bsd3; @@ -314484,7 +315869,7 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "tree-diff_0_3_1" = callPackage + "tree-diff_0_3_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base , bytestring, containers, criterion, deepseq, Diff, hashable , parsec, parsers, pretty, primitive, QuickCheck, scientific @@ -314494,10 +315879,8 @@ self: { }: mkDerivation { pname = "tree-diff"; - version = "0.3.1"; - sha256 = "0ixv5122yz6p6a0vfjn5hgp81bs6dx6x3q731cwjyx03dr9lzicb"; - revision = "1"; - editedCabalFile = "1ga0xnyv24fgjiifypq95l7nhlm86swqscakfm98kxqi91gbzr5y"; + version = "0.3.2"; + sha256 = "067lf9fw0lk9pay6di6scc00sfg9p0n2avxs0wsqlyin9xc9h18v"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base bytestring containers deepseq hashable parsec parsers pretty primitive QuickCheck @@ -314730,8 +316113,8 @@ self: { ({ mkDerivation, base, containers, doctest, mtl }: mkDerivation { pname = "tree-traversals"; - version = "0.1.2.0"; - sha256 = "1l31l43dv7gkv35qfh7vf6v9ar864s4kilki2nwniipdfbyrmjwd"; + version = "0.1.3.0"; + sha256 = "0dbdqf7rrv3x4vsinxfhzf9bv28pndxsmjramw5m67ipqyw9hcxs"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest mtl ]; description = "Functions and newtype wrappers for traversing Trees"; @@ -316225,8 +317608,8 @@ self: { }: mkDerivation { pname = "twain"; - version = "2.1.2.0"; - sha256 = "1hkzp2g671dagmv1qznkf3mw3l2mslckg7h0a8x8633h6i3j6br0"; + version = "2.2.0.1"; + sha256 = "1ypx89sz9gswn3696y13l6yzvn6wf8rq8ybfcl51ls7773cdkqf3"; libraryHaskellDepends = [ aeson base bytestring case-insensitive cookie either exceptions http-types http2 text time transformers vault wai wai-extra @@ -316875,6 +318258,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "twobitreader" = callPackage + ({ mkDerivation, base, bytestring, directory, mmap + , optparse-applicative, primitive, unordered-containers, zlib + }: + mkDerivation { + pname = "twobitreader"; + version = "1.0"; + sha256 = "1ri51q8jfmbkcpbd84mdnvgc168fcz56rkj9xzrd87g2sp1b7850"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring mmap primitive unordered-containers + ]; + executableHaskellDepends = [ + base bytestring directory optparse-applicative zlib + ]; + description = "reader for the 2bit file format"; + license = lib.licenses.bsd3; + mainProgram = "twobit"; + }) {}; + "tx" = callPackage ({ mkDerivation, base, bytestring, cereal, safecopy, stm , transformers @@ -318075,27 +319479,6 @@ self: { }: mkDerivation { pname = "typed-process"; - version = "0.2.11.1"; - sha256 = "0j21v5ijnxkpwn9hng6achjypr1hnpfxkmjfvqssq6ynj6hdvifm"; - libraryHaskellDepends = [ - async base bytestring process stm transformers unliftio-core - ]; - testHaskellDepends = [ - async base base64-bytestring bytestring hspec process stm temporary - transformers unliftio-core - ]; - testToolDepends = [ hspec-discover ]; - description = "Run external processes, with strong typing of streams"; - license = lib.licenses.mit; - }) {}; - - "typed-process_0_2_12_0" = callPackage - ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec - , hspec-discover, process, stm, temporary, transformers - , unliftio-core - }: - mkDerivation { - pname = "typed-process"; version = "0.2.12.0"; sha256 = "1q8v2vn1p2sygjym4aamfv53hyabq081aryf807p5pjix0x3vvjc"; libraryHaskellDepends = [ @@ -318108,29 +319491,43 @@ self: { testToolDepends = [ hspec-discover ]; description = "Run external processes, with strong typing of streams"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "typed-process-effectful" = callPackage - ({ mkDerivation, base, bytestring, effectful, effectful-core, tasty - , tasty-hunit, typed-process + ({ mkDerivation, base, bytestring, effectful, tasty, tasty-hunit + , typed-process }: mkDerivation { pname = "typed-process-effectful"; - version = "1.0.0.2"; - sha256 = "172d04jbvwiy96ggminzlg63skh4gwnbzia90hb67si2zbh8slyd"; + version = "1.0.0.3"; + sha256 = "07vsi991x9aflbk5pza1y20y9pg3zpnqjdj9c7brwv75m9yjasw5"; libraryHaskellDepends = [ - base bytestring effectful effectful-core typed-process - ]; - testHaskellDepends = [ - base effectful effectful-core tasty tasty-hunit + base bytestring effectful typed-process ]; + testHaskellDepends = [ base effectful tasty tasty-hunit ]; description = "A binding of the typed-process library for the effectful effect system"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; }) {}; + "typed-range" = callPackage + ({ mkDerivation, base, Cabal, free, optics-core, parsec, QuickCheck + , random, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "typed-range"; + version = "0.1.0.1"; + sha256 = "154khj9y9d8q11q3q3n6scfb9ilcnibmfz5vkwnqjq3sagnb2m3z"; + libraryHaskellDepends = [ base free optics-core parsec ]; + testHaskellDepends = [ + base Cabal free optics-core parsec QuickCheck random test-framework + test-framework-quickcheck2 + ]; + description = "An efficient and versatile typed range library"; + license = lib.licenses.mit; + }) {}; + "typed-session" = callPackage ({ mkDerivation, base, containers, fused-effects , fused-effects-random, io-classes, io-sim, random @@ -318138,8 +319535,8 @@ self: { }: mkDerivation { pname = "typed-session"; - version = "0.2.0.1"; - sha256 = "1xi0ys8hhqa2jkdwm0a6r92lwcl4lqcnvi61yqci9vc41rpcazhj"; + version = "0.3.0.1"; + sha256 = "1qaas8lp1yyvj2rg8hgfj1hwbnk8z6mav008ajqv6zzmqbdnk8x6"; libraryHaskellDepends = [ base containers io-classes template-haskell typed-session-state-algorithm @@ -318160,8 +319557,8 @@ self: { }: mkDerivation { pname = "typed-session-state-algorithm"; - version = "0.4.2.1"; - sha256 = "0gzzqg0jcnlbm0v4zmbjl379qzwmb93hg1ph8ibp55zxr98chk4z"; + version = "0.5.0.0"; + sha256 = "0mi40ab1xnz4al9f787ydwaz8y8qjq4i0x2sij08jv2i5l7dlr0x"; libraryHaskellDepends = [ base containers fused-effects megaparsec parser-combinators prettyprinter @@ -318169,6 +319566,8 @@ self: { testHaskellDepends = [ base raw-strings-qq ]; description = "Automatically generate status for typed-session"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "typed-spreadsheet" = callPackage @@ -318348,6 +319747,8 @@ self: { 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 @@ -318404,13 +319805,28 @@ self: { broken = true; }) {}; + "typelevel-tools-yj" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "typelevel-tools-yj"; + version = "0.1.0.7"; + sha256 = "187if2gk1q31cnfrdih9zw7yij6cwkmfb32bsprz9jqvwvgfixak"; + revision = "1"; + editedCabalFile = "102zdd247wja46m159smpbnfmmqk4wd9dk0g5zsycrfsnxzvz28b"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base template-haskell ]; + description = "type level tools"; + license = lib.licenses.bsd3; + }) {}; + "typelits-printf" = callPackage - ({ mkDerivation, base, symbols, text }: + ({ mkDerivation, base, hspec, text }: mkDerivation { pname = "typelits-printf"; - version = "0.2.0.0"; - sha256 = "1a2ahf8imbk8zff2i7cfag2irax8qdd4r6vb00hil34i67p980ij"; - libraryHaskellDepends = [ base symbols text ]; + version = "0.3.0.0"; + sha256 = "1m02plqcqfd2bxfwdkdyc4dvimlga691jiqcswyd05lrs7p2dyid"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base hspec ]; description = "Type-safe printf from parsing GHC TypeLits Symbol"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -318533,8 +319949,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.11.0.1"; - sha256 = "15zyjckgyk30v2753pfrvnvqhfdrpv39mc7vbfv66igcg7r9scm1"; + version = "0.11.1.1"; + sha256 = "0zg4wwp5asnzz0n2yhrqb825dldr57m1j6w0l3sdxsi4jmibs4bj"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist template-haskell text th-data-compat th-strict-compat transformers @@ -318747,7 +320163,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "typst_0_5_0_5" = callPackage + "typst_0_6" = callPackage ({ mkDerivation, aeson, array, base, bytestring, cassava , containers, directory, filepath, mtl, ordered-containers, parsec , pretty, pretty-show, regex-tdfa, scientific, tasty, tasty-golden @@ -318755,8 +320171,8 @@ self: { }: mkDerivation { pname = "typst"; - version = "0.5.0.5"; - sha256 = "0515z5hi4w89h5dd7bl54zq28k5jzr4r3xnz4k6q2cnahx3b9pa9"; + version = "0.6"; + sha256 = "092pdx7qkrvxb0gz316aylgayzlkc3scw8dj5jkf4riq8gc3h7x1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -318786,12 +320202,12 @@ self: { license = lib.licenses.mit; }) {}; - "typst-symbols_0_1_6" = callPackage + "typst-symbols_0_1_7" = callPackage ({ mkDerivation, base, text }: mkDerivation { pname = "typst-symbols"; - version = "0.1.6"; - sha256 = "17a2grflk67vs68b2pxygvk7p50rj9fb3ri7fcwa19j9jnhg4zwl"; + version = "0.1.7"; + sha256 = "1f158pjvkbx05aj0nv4qwlz2h7a811v9r7nlhnp54vws4h4rdvnz"; libraryHaskellDepends = [ base text ]; description = "Symbol and emoji lookup for typst language"; license = lib.licenses.mit; @@ -318830,8 +320246,8 @@ self: { pname = "tz"; version = "0.1.3.6"; sha256 = "1vqnfk656i6j3j1bf9lc36adziv52x1b2ccq6afp8cka1nay2mcd"; - revision = "6"; - editedCabalFile = "0za67vc1lvadrl6r287cmkkz7cnharm1yhsyin8qbn9xlm5r8ci0"; + revision = "7"; + editedCabalFile = "0awsb34hf2r6j0qkl0b087hdwcig33cmnfjwrl5w3mj35ligffja"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector @@ -319381,6 +320797,8 @@ self: { ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ukrainian-phonetics-basic-array-bytestring" = callPackage @@ -319634,6 +321052,21 @@ self: { broken = true; }) {}; + "unbound-generics-unify" = callPackage + ({ mkDerivation, base, containers, transformers, unbound-generics + }: + mkDerivation { + pname = "unbound-generics-unify"; + version = "0.1.1"; + sha256 = "1khf5n7c57d92mh5hqw2ahnwzs8bijw529aq768kd8kki0qhrxc9"; + libraryHaskellDepends = [ + base containers transformers unbound-generics + ]; + description = "Unification based on unbound-generics"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "unbound-kind-generics" = callPackage ({ mkDerivation, base, kind-generics, kind-generics-th , unbound-generics @@ -319797,14 +321230,51 @@ self: { }: mkDerivation { pname = "uncertain"; - version = "0.4.0.0"; - sha256 = "1v7q6ajyqx3m06w2iy6dxkbfk6f3878zmii892k4m5a0hzi82x0c"; + version = "0.4.0.1"; + sha256 = "16c7x256p4ymmj80yzd7wvgiapysxzpil81vbydwh1vcxijyxjw3"; libraryHaskellDepends = [ ad base base-compat containers free mwc-random primitive transformers ]; description = "Manipulating numbers with inherent experimental/measurement uncertainty"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "unclogging" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, chronos + , colourista, fused-effects, kan-extensions, tasty, tasty-hunit + , template-haskell, text, unliftio + }: + mkDerivation { + pname = "unclogging"; + version = "0.1.0.3"; + sha256 = "1iy5aacr19xcabs0q2a2vqc43lsaxayy8avw0wbnkqnb5y7cjm5c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring chronos colourista fused-effects + kan-extensions template-haskell text unliftio + ]; + executableHaskellDepends = [ aeson async base unliftio ]; + testHaskellDepends = [ + aeson base fused-effects tasty tasty-hunit unliftio + ]; + description = "a library which implements easy, concurrent and pretty logging"; + license = lib.licenses.agpl3Plus; + mainProgram = "unclogging"; + }) {}; + + "unconditional-jump" = callPackage + ({ mkDerivation, base, int-supply }: + mkDerivation { + pname = "unconditional-jump"; + version = "1.0.0"; + sha256 = "1nmzqph0wchzr2cq7009d9xfchryb0nis74mcj7nbkz42r14k570"; + libraryHaskellDepends = [ base int-supply ]; + description = "Unconditional jumps"; + license = lib.licenses.bsd3; }) {}; "unconstrained" = callPackage @@ -320131,8 +321601,8 @@ self: { pname = "unicode-data"; version = "0.6.0"; sha256 = "0iwr096kwvjmx32a2drzz5hlam5sy0ca2m15ih33r8imhlb371xj"; - revision = "1"; - editedCabalFile = "0ijgkzh73x1fhjwr0zv9bg69s5ff95gdxv9acd4kpwa8nd9nvzsn"; + revision = "2"; + editedCabalFile = "1y592fjr7i0416nzxr8g91apm8ff9gls5lwr16bc7zsh9hdyahja"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base deepseq tasty tasty-bench ]; @@ -320671,8 +322141,8 @@ self: { pname = "union"; version = "0.1.2"; sha256 = "1i4fvlwkw1wx64a6l8342aqfqsdq7fqa4p24g3i5gn5704lxrsb3"; - revision = "8"; - editedCabalFile = "0rm4nm47arflmbqngzq9ajri8f43wgplzrk9qfvjm6ag12vnjrl5"; + revision = "9"; + editedCabalFile = "11h6qk4gnnlprrgi9cnpcbklwqnjsvk97h9gbp7ka4ib78xgxr84"; libraryHaskellDepends = [ base deepseq hashable profunctors tagged vinyl ]; @@ -320888,8 +322358,8 @@ self: { pname = "unique-logic-tf"; version = "0.5.1"; sha256 = "0a2hjkm7kwfnqyscxxdw2r2cq3gsydv5ny91vpxxd3paknqqr0cb"; - revision = "2"; - editedCabalFile = "1508h3mn28ks1g31l1hs4gf2fib4ihylb0wrzin52krs7kkbcnvn"; + revision = "3"; + editedCabalFile = "18ksx28w58g0mdnsk0sr57n76r48dbig4dk4cks3kjzhgbix4wd2"; libraryHaskellDepends = [ base containers data-ref semigroups transformers utility-ht ]; @@ -321514,15 +322984,15 @@ self: { }) {}; "universum" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, gauge - , ghc-prim, hashable, hedgehog, microlens, microlens-mtl, mtl + ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim + , hashable, hedgehog, microlens, microlens-mtl, mtl , safe-exceptions, stm, tasty, tasty-discover, tasty-hedgehog, text , transformers, unordered-containers, utf8-string, vector }: mkDerivation { pname = "universum"; - version = "1.8.2.1"; - sha256 = "06kv2p7792r4d7nsq1wx7vw5jy72fjacc2jwmkqfanaaapdr27q9"; + version = "1.8.2.2"; + sha256 = "0h8ckr60gm5wxly5zyij9avzmlzljp21njd1k9j13nj5z23i1idp"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text transformers @@ -321532,9 +323002,6 @@ self: { base bytestring hedgehog tasty tasty-hedgehog text ]; testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ - base containers gauge text unordered-containers - ]; description = "Custom prelude used in Serokell"; license = lib.licenses.mit; }) {}; @@ -321560,25 +323027,11 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { 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; - }) {}; - - "unix-bytestring_0_4_0_2" = callPackage - ({ mkDerivation, base, bytestring }: - mkDerivation { - pname = "unix-bytestring"; version = "0.4.0.2"; sha256 = "0pmkd5cvq3knsyl5izxpxs44axrf943xv4pwa1x20wmsg30fqmd2"; libraryHaskellDepends = [ base bytestring ]; description = "Unix/Posix-specific functions for ByteStrings"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "unix-compat" = callPackage @@ -321587,8 +323040,8 @@ self: { }: mkDerivation { pname = "unix-compat"; - version = "0.7.2"; - sha256 = "02v9lr7i7m3nrd8wkg2psdm41i7vc0mzaqks89ds05lv9qsjqf2q"; + version = "0.7.3"; + sha256 = "11qxh9l2kqx4pqphbbmcbmc9bb2mifnjmzlcbkak5mjj163sskvs"; libraryHaskellDepends = [ base unix ]; testHaskellDepends = [ base directory extra hspec HUnit monad-parallel temporary @@ -321725,8 +323178,8 @@ self: { }: mkDerivation { pname = "unix-time"; - version = "0.4.15"; - sha256 = "0rkjjwbw4s1k13f0syy409yiqj7v9x8ghi209j3lxkh1xq9caq17"; + version = "0.4.16"; + sha256 = "1s9qws7z2z9d9ayljz98zdlsja3zvrbcb00n4arzwi3kdl9agqmc"; libraryHaskellDepends = [ base binary bytestring old-time ]; testHaskellDepends = [ base bytestring hspec old-locale old-time QuickCheck @@ -322004,6 +323457,8 @@ self: { pname = "unlit"; version = "0.4.0.0"; sha256 = "05am6mngvwj3a4mnwf1x3wbb2fvh3lj9jc5cvbmi269zhkjcv7j8"; + revision = "2"; + editedCabalFile = "0nqvrb9mjv77nx3gky576lf5ah1iwn1sjwwpy9a9za6pvz8dzjvv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory text ]; @@ -322535,9 +323990,7 @@ self: { description = "A program to update fetchgit values in Nix expressions"; license = lib.licenses.bsd3; mainProgram = "update-nix-fetchgit"; - maintainers = [ - lib.maintainers.expipiplus1 lib.maintainers.sorki - ]; + maintainers = [ lib.maintainers.sorki ]; }) {}; "update-repos" = callPackage @@ -323656,8 +325109,8 @@ self: { }: mkDerivation { pname = "utxorpc"; - version = "0.0.9.0"; - sha256 = "1n86awygbq0gf9bl35hhsx0wxwnyk63ydxkz6i93dbbp22lfnmgc"; + version = "0.0.11.0"; + sha256 = "1bnkhm21g67x1jr7lwybg5yj5n34jlhkf5j2fqzczdfggv4z6vnq"; libraryHaskellDepends = [ base proto-lens proto-lens-protobuf-types proto-lens-runtime ]; @@ -324676,8 +326129,8 @@ self: { ({ mkDerivation, base, containers, validity }: mkDerivation { pname = "validity-containers"; - version = "0.5.0.4"; - sha256 = "1qw5p60dr54d2wh49y6x33hbks4d74m8pr5zygblzk0y70warqld"; + version = "0.5.0.5"; + sha256 = "0bvvfvbi98p16n9xmyfvb9qypp3r3kwqdqrni6fd19cjmvyg9g2p"; libraryHaskellDepends = [ base containers validity ]; description = "Validity instances for containers"; license = lib.licenses.mit; @@ -325516,8 +326969,8 @@ self: { pname = "vector"; version = "0.13.1.0"; sha256 = "1vpcxn0zkhmvksz373iz66bv42f358jv3zqg390vk2mbkqkp5wk3"; - revision = "1"; - editedCabalFile = "03fpy8vnjyk7hw6sci361pmb05jl5z05yb08yjv5wxqxnp7jq0xw"; + revision = "2"; + editedCabalFile = "0ii5bzccaw632sjz9avbasmfabxc82w9vrn6lala9x9d1dyllmn8"; libraryHaskellDepends = [ base deepseq primitive vector-stream ]; testHaskellDepends = [ base base-orphans doctest HUnit primitive QuickCheck random tasty @@ -325529,6 +326982,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "vector_0_13_2_0" = callPackage + ({ mkDerivation, base, base-orphans, deepseq, doctest, primitive + , QuickCheck, random, tasty, tasty-bench, tasty-hunit + , tasty-inspection-testing, tasty-quickcheck, template-haskell + , transformers, vector-stream + }: + mkDerivation { + pname = "vector"; + version = "0.13.2.0"; + sha256 = "08y4j6nii17wc3fs3d2za0yifd3gqf73g8zyqdnsry6bhv3h7wi8"; + libraryHaskellDepends = [ + base deepseq primitive random tasty vector-stream + ]; + testHaskellDepends = [ + base base-orphans doctest primitive QuickCheck random tasty + tasty-hunit tasty-inspection-testing tasty-quickcheck + template-haskell transformers + ]; + benchmarkHaskellDepends = [ base random tasty tasty-bench ]; + doHaddock = false; + description = "Efficient Arrays"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vector-algorithms" = callPackage ({ mkDerivation, base, bitvec, bytestring, containers, mwc-random , primitive, QuickCheck, vector @@ -325813,6 +327291,7 @@ self: { ]; description = "Efficient vector-based mutable hashtables implementation"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.artem ]; }) {}; "vector-heterogenous" = callPackage @@ -325968,7 +327447,6 @@ self: { ]; description = "Size tagged vectors"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "vector-sized_1_6_1" = callPackage @@ -325988,7 +327466,6 @@ self: { description = "Size tagged vectors"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "vector-space" = callPackage @@ -326110,8 +327587,8 @@ self: { pname = "vector-stream"; version = "0.1.0.1"; sha256 = "0z5z88flyassdpgga412qci6brr9gyljbx875wd479fy9crhgxfh"; - revision = "1"; - editedCabalFile = "17sa7mq3maphzgwdjwxr1q9dm92gz4hcbyk0d3hkayqxswp9x9hn"; + revision = "2"; + editedCabalFile = "0lcsvwlpipdiafw7w6lf2mqfg5b8fmh2jrrs3s6j7hsjm09vs3id"; libraryHaskellDepends = [ base ghc-prim ]; description = "Efficient Streams"; license = lib.licenses.bsd3; @@ -327251,8 +328728,8 @@ self: { }: mkDerivation { pname = "vivid"; - version = "0.5.2.0"; - sha256 = "1p4x6q2ks259xzigj31f8bz3562k07dzj77a9bnhl934sl85hz6q"; + version = "0.5.2.1"; + sha256 = "006y380fva59xr5wv6vn802wxssd91fgvfvb3g65zscv8dhb0z5d"; libraryHaskellDepends = [ base binary bytestring cereal containers directory filepath hashable MonadRandom mtl network process random random-shuffle @@ -327261,8 +328738,6 @@ self: { ]; description = "Sound synthesis with SuperCollider"; license = "GPL"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vivid-osc" = callPackage @@ -327619,44 +329094,6 @@ self: { broken = true; }) {inherit (pkgs) vte;}; - "vty_5_35_1" = callPackage - ({ mkDerivation, ansi-terminal, base, binary, blaze-builder - , bytestring, Cabal, containers, deepseq, directory, filepath - , hashable, HUnit, microlens, microlens-mtl, microlens-th, mtl - , parallel, parsec, QuickCheck, quickcheck-assertions, random - , smallcheck, stm, string-qq, terminfo, test-framework - , test-framework-hunit, test-framework-smallcheck, text - , transformers, unix, utf8-string, vector - }: - mkDerivation { - pname = "vty"; - version = "5.35.1"; - sha256 = "062dpz8fxrnggzpl041zpbph0xj56jki98ajm2s78dldg5vy0c9k"; - revision = "1"; - editedCabalFile = "1zqcvgqhcij92241g20zn3c3a4033biid3f3cqg05q1ygrmznxb5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base binary blaze-builder bytestring containers - deepseq directory filepath hashable microlens microlens-mtl - microlens-th mtl parallel parsec stm terminfo text transformers - unix utf8-string vector - ]; - executableHaskellDepends = [ - base containers directory filepath microlens microlens-mtl mtl - ]; - testHaskellDepends = [ - base blaze-builder bytestring Cabal containers deepseq HUnit - microlens microlens-mtl mtl QuickCheck quickcheck-assertions random - smallcheck stm string-qq terminfo test-framework - test-framework-hunit test-framework-smallcheck text unix - utf8-string vector - ]; - description = "A simple terminal UI library"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "vty" = callPackage ({ mkDerivation, base, binary, blaze-builder, bytestring, deepseq , directory, filepath, microlens, microlens-mtl, microlens-th, mtl @@ -327845,7 +329282,6 @@ self: { badPlatforms = [ "i686-linux" "armv7l-linux" ] ++ lib.platforms.darwin; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {vulkan = null;}; "vulkan-api" = callPackage @@ -327879,7 +329315,6 @@ self: { description = "Utils for the vulkan package"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "waargonaut" = callPackage @@ -328315,6 +329750,38 @@ self: { license = lib.licenses.mit; }) {}; + "wai-extra_3_1_17" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , bytestring, call-stack, case-insensitive, containers, cookie + , data-default, 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.17"; + sha256 = "0jq1vr3sc4gbcan0w9mzvrj6p20m825zb1y4bq1yjccka146xmn7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring bytestring call-stack + case-insensitive containers cookie data-default 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; + hydraPlatforms = lib.platforms.none; + }) {}; + "wai-feature-flags" = callPackage ({ mkDerivation, aeson, base, bytestring, splitmix, text , unordered-containers, wai, warp @@ -328662,6 +330129,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "wai-logger_2_5_0" = callPackage + ({ mkDerivation, base, byteorder, bytestring, fast-logger + , http-types, network, wai + }: + mkDerivation { + pname = "wai-logger"; + version = "2.5.0"; + sha256 = "1171qfz6wlmq69virwvlg79j4smk6sqhdvrdpnisr50zdc3x7ysw"; + libraryHaskellDepends = [ + base byteorder bytestring fast-logger http-types network wai + ]; + description = "A logging system for WAI"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "wai-logger-buffered" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , http-types, time, wai, warp @@ -329069,6 +330552,39 @@ self: { broken = true; }) {}; + "wai-middleware-delegate_0_2_0_0" = callPackage + ({ mkDerivation, async, base, blaze-builder, bytestring + , bytestring-lexing, case-insensitive, conduit, conduit-extra + , crypton-connection, data-default, directory, filepath, hspec + , hspec-tmp-proc, http-client, http-client-tls, http-types + , mustache, network, random, resourcet, streaming-commons + , temporary, test-certs, text, tmp-proc, unix, vault, wai + , wai-conduit, warp, warp-tls + }: + mkDerivation { + pname = "wai-middleware-delegate"; + version = "0.2.0.0"; + sha256 = "1jcbyrvfq7r9nfw9zmazl9nlc5z6dgxdrmjlyiqm25c4bdkkzqaa"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + async base blaze-builder bytestring case-insensitive conduit + conduit-extra http-client http-client-tls http-types + streaming-commons text wai wai-conduit + ]; + testHaskellDepends = [ + async base blaze-builder bytestring bytestring-lexing + case-insensitive conduit conduit-extra crypton-connection + data-default directory filepath hspec hspec-tmp-proc http-client + http-client-tls http-types mustache network random resourcet + temporary test-certs text tmp-proc unix vault wai wai-conduit warp + warp-tls + ]; + description = "WAI middleware that delegates handling of requests"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "wai-middleware-etag" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash , filepath, http-date, http-types, unix-compat @@ -329371,6 +330887,8 @@ self: { pname = "wai-middleware-throttle"; version = "0.3.0.1"; sha256 = "0mpw7b56k1a89kzwa3v4c4ff66m0py9s9p2jan2zhp8k3b8862jq"; + revision = "1"; + editedCabalFile = "1d6zyjpvjm03vsmi04n9zdmaxlq5by326lyf0xlvh05562jnvrqc"; libraryHaskellDepends = [ base bytestring bytestring-builder cache clock containers hashable http-types mtl network safe-exceptions stm text token-bucket @@ -330229,42 +331747,6 @@ self: { broken = true; }) {}; - "warp_3_3_30" = callPackage - ({ mkDerivation, array, auto-update, base, bsb-http-chunked - , bytestring, case-insensitive, containers, crypton-x509, directory - , gauge, ghc-prim, hashable, hspec, hspec-discover, http-client - , http-date, http-types, http2, iproute, network, process - , QuickCheck, recv, simple-sendfile, stm, streaming-commons, text - , time-manager, unix, unliftio, vault, wai, word8 - }: - mkDerivation { - pname = "warp"; - version = "3.3.30"; - sha256 = "1i5fnvc9n7w013asj7ckpfb59ybbvhif4d6f4g5jwwad50jmlbpg"; - libraryHaskellDepends = [ - array auto-update base bsb-http-chunked bytestring case-insensitive - containers crypton-x509 ghc-prim hashable http-date http-types - http2 iproute network recv simple-sendfile stm streaming-commons - text time-manager unix unliftio vault wai word8 - ]; - testHaskellDepends = [ - array auto-update base bsb-http-chunked bytestring case-insensitive - containers crypton-x509 directory ghc-prim hashable hspec - http-client http-date http-types http2 iproute network process - QuickCheck recv simple-sendfile stm streaming-commons text - time-manager unix unliftio vault wai word8 - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - auto-update base bytestring containers crypton-x509 gauge hashable - http-date http-types network recv time-manager unix unliftio - ]; - description = "A fast, light-weight web server for WAI applications"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.alexfmpe ]; - }) {}; - "warp" = callPackage ({ mkDerivation, array, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, crypton-x509, directory @@ -330300,38 +331782,36 @@ self: { maintainers = [ lib.maintainers.alexfmpe ]; }) {}; - "warp_3_4_1" = callPackage - ({ mkDerivation, array, auto-update, base, bsb-http-chunked - , bytestring, case-insensitive, containers, crypton-x509, directory - , gauge, ghc-prim, hashable, hspec, hspec-discover, http-client + "warp_3_4_4" = callPackage + ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked + , bytestring, case-insensitive, containers, criterion, crypton-x509 + , directory, ghc-prim, hashable, hspec, hspec-discover, http-client , http-date, http-types, http2, iproute, network, process , QuickCheck, recv, simple-sendfile, stm, streaming-commons, text - , time-manager, unix, unliftio, vault, wai, word8 + , time-manager, unix, vault, wai, word8 }: mkDerivation { pname = "warp"; - version = "3.4.1"; - sha256 = "0f4cs9qb3cpagryijzw46r5y5bd2srvb4b3phffydj5aim253jfp"; - revision = "1"; - editedCabalFile = "08jsdv1858cdmsraf489zmv4y0zpd47fr0qnwqd27acjnavpcwf7"; + version = "3.4.4"; + sha256 = "1a842yn4lq9kszcj6pnfjrdd2kfbdx8zzsn8jrv0l9s1bfz3cwmv"; libraryHaskellDepends = [ - array auto-update base bsb-http-chunked bytestring case-insensitive - containers crypton-x509 ghc-prim hashable http-date http-types - http2 iproute network recv simple-sendfile stm streaming-commons - text time-manager unix unliftio vault wai word8 + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers crypton-x509 ghc-prim hashable + http-date http-types http2 iproute network recv simple-sendfile stm + streaming-commons text time-manager unix vault wai word8 ]; testHaskellDepends = [ - array auto-update base bsb-http-chunked bytestring case-insensitive - containers crypton-x509 directory ghc-prim hashable hspec - http-client http-date http-types http2 iproute network process - QuickCheck recv simple-sendfile stm streaming-commons text - time-manager unix unliftio vault wai word8 + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers crypton-x509 directory ghc-prim + hashable hspec http-client http-date http-types http2 iproute + network process QuickCheck recv simple-sendfile stm + streaming-commons text time-manager unix vault wai word8 ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ array auto-update base bytestring case-insensitive containers - crypton-x509 gauge ghc-prim hashable http-date http-types network - recv streaming-commons text time-manager unix unliftio vault wai + criterion crypton-x509 ghc-prim hashable http-date http-types + network recv streaming-commons text time-manager unix vault wai word8 ]; description = "A fast, light-weight web server for WAI applications"; @@ -330383,8 +331863,8 @@ self: { }: mkDerivation { pname = "warp-quic"; - version = "0.0.1"; - sha256 = "06q91zca4xndq6da5h43h6nh8m04akgksjs1avb2chscraqqnaj6"; + version = "0.0.2"; + sha256 = "1hb9xv5v7l1iwhv7qgm9y3prrjkpvcd5snmw6xc9wsk3fr82xl1r"; libraryHaskellDepends = [ base bytestring http3 network quic tls wai warp ]; @@ -330442,8 +331922,8 @@ self: { }: mkDerivation { pname = "warp-tls"; - version = "3.4.6"; - sha256 = "0m5k2n7sdyb1g1r6ddwv2k75jgrhxwcgn3dbj42d1kjwvpiq03j8"; + version = "3.4.7"; + sha256 = "0lc8abjqs7j52qnfsaljjngxxzxja6d3bk4q796ahcikk10id1cf"; libraryHaskellDepends = [ base bytestring data-default-class network recv streaming-commons tls tls-session-manager unliftio wai warp @@ -330452,6 +331932,23 @@ self: { license = lib.licenses.mit; }) {}; + "warp-tls_3_4_11" = callPackage + ({ mkDerivation, base, bytestring, network, recv, streaming-commons + , tls, tls-session-manager, wai, warp + }: + mkDerivation { + pname = "warp-tls"; + version = "3.4.11"; + sha256 = "1sld1xxhya85gg7gz1nznpi98rh5jwp4w0d64qcqw0dsjswhmpr3"; + libraryHaskellDepends = [ + base bytestring network recv streaming-commons tls + tls-session-manager wai warp + ]; + description = "HTTP over TLS support for Warp via the TLS package"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "warp-tls-uid" = callPackage ({ mkDerivation, base, bytestring, data-default, network , streaming-commons, tls, unix, wai, warp, warp-tls, x509 @@ -331000,15 +332497,16 @@ self: { "web-rep" = callPackage ({ mkDerivation, async, base, bifunctors, box, box-socket - , bytestring, flatparse, markup-parse, mtl, optics-core - , optics-extra, optparse-applicative, profunctors, scotty - , string-interpolate, text, transformers, unordered-containers - , wai-middleware-static, wai-websockets, websockets + , bytestring, doctest-parallel, flatparse, markup-parse, mtl + , optics-core, optics-extra, optparse-applicative, profunctors + , scotty, string-interpolate, text, transformers + , unordered-containers, wai-middleware-static, wai-websockets + , websockets }: mkDerivation { pname = "web-rep"; - version = "0.12.1.0"; - sha256 = "0hiqmivic82plziwa2fvc3rfz1h60f8i7vcb6hw65pfrz1aswk6n"; + version = "0.12.3.0"; + sha256 = "10k2fm7g1p54v6gnn045vgc8p58xal17vxin9ah11xqr0dddk7sa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -331020,6 +332518,7 @@ self: { executableHaskellDepends = [ base box markup-parse optics-core optparse-applicative ]; + testHaskellDepends = [ base doctest-parallel ]; description = "representations of a web page"; license = lib.licenses.bsd3; mainProgram = "web-rep-example"; @@ -331206,20 +332705,20 @@ self: { "web-view" = callPackage ({ mkDerivation, base, bytestring, casing, containers - , effectful-core, file-embed, http-types, string-interpolate - , sydtest, sydtest-discover, text + , effectful-core, file-embed, html-entities, http-types + , string-interpolate, sydtest, sydtest-discover, text }: mkDerivation { pname = "web-view"; - version = "0.4.0"; - sha256 = "1dy9qpscj1r6g35n11qyk7fd4nkhbxp0ism8cqhgm2gwmhc2yn56"; + version = "0.5.0"; + sha256 = "007iz283s31n9dhxvw1sz7nh5fn9h4hifc6wkcnm6zwzyr5mknl7"; libraryHaskellDepends = [ base bytestring casing containers effectful-core file-embed - http-types string-interpolate text + html-entities http-types string-interpolate text ]; testHaskellDepends = [ base bytestring casing containers effectful-core file-embed - http-types string-interpolate sydtest text + html-entities http-types string-interpolate sydtest text ]; testToolDepends = [ sydtest-discover ]; description = "Type-safe HTML and CSS with intuitive layouts and composable styles"; @@ -331233,8 +332732,8 @@ self: { }: mkDerivation { pname = "web3"; - version = "1.0.0.0"; - sha256 = "0bnamwvdxl3i1p8bflnhaxxpn0bqcnf174gwplqjkxdc9pzfhiig"; + version = "1.0.1.0"; + sha256 = "09l820lmgyvfpiqc57qx1kc355lxjalb4ijbk4dv0qi8px9pasvz"; libraryHaskellDepends = [ base web3-ethereum web3-polkadot web3-provider ]; @@ -331249,8 +332748,8 @@ self: { }: mkDerivation { pname = "web3-bignum"; - version = "1.0.0.0"; - sha256 = "140qv8y6b63by81z0k5by8vqr7x0gc106a67r35qbhdfmbhv71n0"; + version = "1.0.1.0"; + sha256 = "1h0r9sw9i7p9k91rl461nx1hss8s1s8i9iwilmp2dy0k4f50rzps"; libraryHaskellDepends = [ base cereal memory memory-hexstring scale wide-word ]; @@ -331265,20 +332764,20 @@ self: { }) {}; "web3-crypto" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, cryptonite + ({ mkDerivation, aeson, base, bytestring, containers, crypton , hspec, hspec-contrib, hspec-discover, hspec-expectations, memory , memory-hexstring, text, uuid-types, vector }: mkDerivation { pname = "web3-crypto"; - version = "1.0.0.0"; - sha256 = "16ygvnkxcalh7a0h7l1bj5gyir79gihcwzzqk31qibvd1r17mwd6"; + version = "1.0.1.0"; + sha256 = "0p5bg9riai1z6wsii4q1i5135v7lcbdgspkhwvacy57w7yda3kda"; libraryHaskellDepends = [ - aeson base bytestring containers cryptonite memory memory-hexstring + aeson base bytestring containers crypton memory memory-hexstring text uuid-types vector ]; testHaskellDepends = [ - aeson base bytestring containers cryptonite hspec hspec-contrib + aeson base bytestring containers crypton hspec hspec-contrib hspec-discover hspec-expectations memory memory-hexstring text uuid-types vector ]; @@ -331289,30 +332788,30 @@ self: { }) {}; "web3-ethereum" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, exceptions - , generics-sop, hspec, hspec-contrib, hspec-discover - , hspec-expectations, jsonrpc-tinyclient, machines, memory - , memory-hexstring, microlens, microlens-aeson, mtl, OneTuple - , relapse, tagged, template-haskell, text, transformers, vinyl - , web3-crypto, web3-solidity + ({ mkDerivation, aeson, aeson-casing, base, bytestring + , data-default, exceptions, generics-sop, hspec, hspec-contrib + , hspec-discover, hspec-expectations, jsonrpc-tinyclient, machines + , memory, memory-hexstring, microlens, microlens-aeson, mtl + , OneTuple, relapse, tagged, template-haskell, text, transformers + , vinyl, web3-crypto, web3-solidity }: mkDerivation { pname = "web3-ethereum"; - version = "1.0.0.0"; - sha256 = "1vsvxhl6w6hjiv6b61sn8f2bnj6p55b4qyvblrfpk60k7pqq774c"; + version = "1.0.1.0"; + sha256 = "1cd69g5wp7faq9hz1kvwp15y3v0wc3h5cpq0vbdbbaq8q7xg09yy"; libraryHaskellDepends = [ - aeson base bytestring data-default exceptions generics-sop + aeson aeson-casing base bytestring data-default exceptions + generics-sop jsonrpc-tinyclient machines memory memory-hexstring + microlens microlens-aeson mtl OneTuple relapse tagged + template-haskell text transformers vinyl web3-crypto web3-solidity + ]; + testHaskellDepends = [ + aeson aeson-casing base bytestring data-default exceptions + generics-sop hspec hspec-contrib hspec-discover hspec-expectations jsonrpc-tinyclient machines memory memory-hexstring microlens microlens-aeson mtl OneTuple relapse tagged template-haskell text transformers vinyl web3-crypto web3-solidity ]; - testHaskellDepends = [ - aeson base bytestring data-default exceptions generics-sop hspec - hspec-contrib hspec-discover hspec-expectations jsonrpc-tinyclient - machines memory memory-hexstring microlens microlens-aeson mtl - OneTuple relapse tagged template-haskell text transformers vinyl - web3-crypto web3-solidity - ]; testToolDepends = [ hspec-discover ]; description = "Ethereum support for Haskell Web3 library"; license = lib.licenses.asl20; @@ -331339,29 +332838,29 @@ self: { }) {}; "web3-polkadot" = callPackage - ({ mkDerivation, aeson, animalcase, base, base58-bytestring - , bytestring, containers, cryptonite, generics-sop, hspec - , hspec-contrib, hspec-discover, hspec-expectations - , hspec-expectations-json, jsonrpc-tinyclient, memory - , memory-hexstring, microlens, microlens-mtl, microlens-th, mtl - , parsec, scale, text, web3-bignum, web3-crypto + ({ mkDerivation, aeson, base, base58-bytestring, bytestring, cases + , containers, crypton, generics-sop, hspec, hspec-contrib + , hspec-discover, hspec-expectations, hspec-expectations-json + , jsonrpc-tinyclient, memory, memory-hexstring, microlens + , microlens-mtl, microlens-th, mtl, parsec, scale, text + , web3-bignum, web3-crypto }: mkDerivation { pname = "web3-polkadot"; - version = "1.0.0.0"; - sha256 = "0sx9lj7px6m5ag4bk4imllh4bmy7kfgkfy1zb9hqjkdmjwn2i2w5"; + version = "1.0.1.0"; + sha256 = "13bqv3npvqd93dqk7bxaqqfrzrn0q2ndsnlsc4awx0x5vssw0hdj"; libraryHaskellDepends = [ - aeson animalcase base base58-bytestring bytestring containers - cryptonite generics-sop jsonrpc-tinyclient memory memory-hexstring - microlens microlens-mtl microlens-th mtl parsec scale text - web3-bignum web3-crypto + aeson base base58-bytestring bytestring cases containers crypton + generics-sop jsonrpc-tinyclient memory memory-hexstring microlens + microlens-mtl microlens-th mtl parsec scale text web3-bignum + web3-crypto ]; testHaskellDepends = [ - aeson animalcase base base58-bytestring bytestring containers - cryptonite generics-sop hspec hspec-contrib hspec-discover - hspec-expectations hspec-expectations-json jsonrpc-tinyclient - memory memory-hexstring microlens microlens-mtl microlens-th mtl - parsec scale text web3-bignum web3-crypto + aeson base base58-bytestring bytestring cases containers crypton + generics-sop hspec hspec-contrib hspec-discover hspec-expectations + hspec-expectations-json jsonrpc-tinyclient memory memory-hexstring + microlens microlens-mtl microlens-th mtl parsec scale text + web3-bignum web3-crypto ]; testToolDepends = [ hspec-discover ]; description = "Polkadot support for Haskell Web3 library"; @@ -331375,8 +332874,8 @@ self: { }: mkDerivation { pname = "web3-provider"; - version = "1.0.0.0"; - sha256 = "03c892xj7yxwbb4r1vpqzwgsf4fyk9389rqivpr6bwklnx9230ic"; + version = "1.0.1.0"; + sha256 = "1nmqsdcxh4cgdw0bpfaf9d64cnlwgg7qms66dfd3givwfb5bsb0d"; libraryHaskellDepends = [ async base data-default exceptions http-client jsonrpc-tinyclient mtl network text transformers websockets @@ -331394,8 +332893,8 @@ self: { }: mkDerivation { pname = "web3-solidity"; - version = "1.0.0.0"; - sha256 = "1n5jf9vdxps8sxcaa3k2a4m3qn5w3kphvvn7f4jy0dh0zkr7i5nm"; + version = "1.0.1.0"; + sha256 = "1gy7w0cqxk2nzd5p1cncwv60ldm2g81ydyfmj0640h2h0v4d8r9k"; libraryHaskellDepends = [ aeson base basement bytestring cereal data-default generics-sop memory memory-hexstring microlens OneTuple parsec tagged @@ -331728,8 +333227,8 @@ self: { }: mkDerivation { pname = "webdriver-wrapper"; - version = "0.2.0.0"; - sha256 = "0dirnaxab9ddaa5jbqn0bhqlmh8x311vmq0il8xh0r3df5cvmgcg"; + version = "0.2.0.1"; + sha256 = "1dvd2649vapwd8qcfv6arsi119rffbb89mzcpdcwdf827x243sci"; libraryHaskellDepends = [ aeson async base bytestring directory extra filepath http-conduit http-types process process-extras retry string-interpolate tar text @@ -332023,18 +333522,18 @@ self: { }) {webkit = null;}; "webkit2gtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk_4_0 }: mkDerivation { pname = "webkit2gtk3-javascriptcore"; version = "0.14.4.6"; sha256 = "06g9ik2pzv761bj5kas17jxh6wxks3dd4vvrimliybs5s5b61b24"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; description = "JavaScriptCore FFI from webkitgtk"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib @@ -332056,7 +333555,7 @@ self: { license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) webkitgtk;}; + }) {webkitgtk = null;}; "webkitgtk3-javascriptcore" = callPackage ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: @@ -332070,7 +333569,7 @@ self: { description = "JavaScriptCore FFI from webkitgtk"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) webkitgtk;}; + }) {webkitgtk = null;}; "webmention" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, either @@ -332239,8 +333738,8 @@ self: { pname = "websockets"; version = "0.13.0.0"; sha256 = "1da95b71akggyikbxdmja3gcaqrz8sp6ri5jrsyavc2ickvi9y4s"; - revision = "2"; - editedCabalFile = "1wnj6c9vzgnmidxcy6jpv19b73qvnx4irxbqsncd688px7f7766m"; + revision = "3"; + editedCabalFile = "00mw56z595lgmm0q5pvvr8l14gymsism13m0zm59pxmzk62qvp49"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -332573,15 +334072,15 @@ self: { }) {}; "weigh" = callPackage - ({ mkDerivation, base, criterion-measurement, deepseq, ghc, mtl - , process, split, temporary + ({ mkDerivation, base, criterion-measurement, deepseq, mtl, process + , split, temporary }: mkDerivation { pname = "weigh"; - version = "0.0.17"; - sha256 = "1wp8r6mpj4cqy2mx7vxpav05qks2xj8y93rhzf9qhmvdr6r8acb2"; + version = "0.0.18"; + sha256 = "0bzix1dzq8ndhfxzpsm2sdjssdd0vzy7psj7gkg0rnvbcgf2w1nl"; libraryHaskellDepends = [ - base criterion-measurement deepseq ghc mtl process split temporary + base criterion-measurement deepseq mtl process split temporary ]; testHaskellDepends = [ base deepseq ]; description = "Measure allocations of a Haskell functions/values"; @@ -332818,7 +334317,7 @@ self: { mainProgram = "quickstart"; }) {}; - "what4_1_6" = callPackage + "what4_1_6_2" = callPackage ({ mkDerivation, async, attoparsec, base, bifunctors, bimap , BoundedChan, bv-sized, bytestring, concurrent-extra, config-value , containers, contravariant, deepseq, deriving-compat, directory @@ -332834,8 +334333,8 @@ self: { }: mkDerivation { pname = "what4"; - version = "1.6"; - sha256 = "123p9h1fajwf5brv9qbs9kx7w7wwrl6md0arpjsj7klrz14qnn5j"; + version = "1.6.2"; + sha256 = "1qvlm4ib40f0y3gcxljx6vrsx8wcqsgnky2231a7y3wr121r2ffz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -332905,6 +334404,8 @@ self: { pname = "wherefrom-compat"; version = "0.2.0.0"; sha256 = "0sy2kyp0sz0vkirlxvyc1s5szhx1f6a8zn0sysl2vbgk0yis3b0d"; + revision = "1"; + editedCabalFile = "1nz7qnhlcg2z8wm85ix1npj4aapdvdps77k1bbw6d5jk6i1rp18w"; libraryHaskellDepends = [ base ghc-heap ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "A compatibility layer for GHC's 'wherefrom' function"; @@ -332919,6 +334420,8 @@ self: { pname = "which"; version = "0.2.0.2"; sha256 = "08w398rm86slizy3fqb1rfd926zycajfnzx0sa1awrnbh2kjfx6m"; + revision = "1"; + editedCabalFile = "1nr7bjggjallp1kxaq2675mqa35w5h228agxkkmw8y4kssikp7wg"; libraryHaskellDepends = [ base shelly template-haskell text ]; description = "Determine the full path to an executable"; license = lib.licenses.bsd3; @@ -333171,8 +334674,8 @@ self: { }: mkDerivation { pname = "wikimusic-api-spec"; - version = "1.2.0.0"; - sha256 = "11jfj3z3b47hc3dfm7zfxxdgspzm0yisc0ihrplnjb9rrc0vva9b"; + version = "1.2.1.2"; + sha256 = "12b44xwav5m4vkm8lvsza7p50dg05x9d062xcgswp14p9myb4g6i"; libraryHaskellDepends = [ aeson base bytestring directory filepath keys mtl openapi3 relude servant servant-openapi3 servant-rate-limit servant-server text @@ -333258,8 +334761,8 @@ self: { }: mkDerivation { pname = "wild-bind"; - version = "0.1.2.9"; - sha256 = "1jnknyf3lwc0bk50llpqh3mpvn78h36f6h359z9sbwacxpsr8526"; + version = "0.1.2.10"; + sha256 = "1dav43i4cz0dag0qqm6cmisbkazp9jf0qaczsh3p5542rzla4bkg"; libraryHaskellDepends = [ base containers semigroups text transformers ]; @@ -333279,8 +334782,8 @@ self: { }: mkDerivation { pname = "wild-bind-indicator"; - version = "1.0.0.1"; - sha256 = "0r9850zk2gmx492palbam6nl5ym9ml5lpgx0c1jyvpbn3caqgxas"; + version = "1.0.0.2"; + sha256 = "0bkwzn7b7j9npxzcdng53zmrlgzc6z072yr3prn6yq8pxrqr1wfz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async base containers gi-gdk gi-glib gi-gtk text transformers @@ -333297,8 +334800,8 @@ self: { }: mkDerivation { pname = "wild-bind-task-x11"; - version = "0.2.0.3"; - sha256 = "1agrwh4sgajyqs655p5ppz2vamp6xf5h5sckqb83zzjvn8i293dk"; + version = "0.2.0.4"; + sha256 = "0yv8w5sfcxjkhb4i5lnnpq89sd0dnbbq2jgcp5sazmvf465v7wls"; libraryHaskellDepends = [ base text transformers wild-bind wild-bind-indicator wild-bind-x11 ]; @@ -333315,8 +334818,8 @@ self: { }: mkDerivation { pname = "wild-bind-x11"; - version = "0.2.0.15"; - sha256 = "14yxm16cqmmrx6sag8xjnwzwhcyqbmpx0vhslny2r0b5bmnjn2dn"; + version = "0.2.0.16"; + sha256 = "183rrdpqg0hkikwgckk415x1i98k8la19p2lgjzcihikj7xm6h26"; libraryHaskellDepends = [ base containers fold-debounce mtl semigroups stm text transformers wild-bind X11 @@ -333405,6 +334908,8 @@ self: { pname = "window-utils"; version = "0.2.2.0"; sha256 = "08s9rjpc2idrb5mgrnbwj2d0m8aj33g4v9djyvrkqnq5jb8mbzrz"; + revision = "1"; + editedCabalFile = "154cqir749zr19vap4zxm1dfj6ylz6p7rpqm0n0kmg2vl05ksimv"; libraryHaskellDepends = [ base bytestring JuicyPixels text vector X11 ]; @@ -333605,8 +335110,8 @@ self: { }: mkDerivation { pname = "witch"; - version = "1.2.1.1"; - sha256 = "0zllz1wg2jpldjnyjkswrshs3agr8bbqnb6agv4avfgvffpj0rw1"; + version = "1.2.2.0"; + sha256 = "0wsy6fd75famn40vhj4ziygqai20szz17x9c4ddz073az4kig4d6"; libraryHaskellDepends = [ base bytestring containers tagged template-haskell text time ]; @@ -333695,17 +335200,16 @@ self: { }) {}; "withdependencies" = callPackage - ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl - , profunctors + ({ mkDerivation, base, conduit, containers, hspec, mtl, profunctors }: mkDerivation { pname = "withdependencies"; - version = "0.3.0"; - sha256 = "1hjld3ndafnaxwx1c6s88dc3bimbc5vwfdf6lcsq22apzh1gmdm6"; + version = "0.3.1"; + sha256 = "0nqxws8r9a5x6ka22d4cfjxj54yfk82dpjyi8a0nnp2i0wpbxgyi"; libraryHaskellDepends = [ base conduit containers mtl profunctors ]; - testHaskellDepends = [ base conduit hspec HUnit mtl ]; + testHaskellDepends = [ base conduit hspec mtl ]; description = "Run computations that depend on one or more elements in a stream"; license = lib.licenses.gpl3Only; }) {}; @@ -333833,8 +335337,8 @@ self: { pname = "wizards"; version = "1.0.3"; sha256 = "1clvbd1ckhvy29qrbmpkn7bya7300fq6znnps23nn3nxyrxhsr85"; - revision = "2"; - editedCabalFile = "0bnqz6slm3hr98ihhlkmivcd12bda6lf0j7l6dfdz30fl4xqpijl"; + revision = "3"; + editedCabalFile = "0ra3vbxiasm7277zyxpvqpij2nf4lgc1rsv91b00cpp3bs4rhxyb"; libraryHaskellDepends = [ base containers control-monad-free haskeline mtl transformers ]; @@ -334848,6 +336352,8 @@ self: { pname = "wraxml"; version = "0.5"; sha256 = "1zzslycz4hzg2l3pma0yfwdnqf08cw14b1ac5lzjm4z548bhzg0h"; + revision = "1"; + editedCabalFile = "0y0j420isc9cm1f2hl87fy33181w12cx0mn4m40ik8dld0npgbha"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -334971,6 +336477,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "wreq-effectful" = callPackage + ({ mkDerivation, base, bytestring, effectful-core, http-client + , wreq + }: + mkDerivation { + pname = "wreq-effectful"; + version = "0.1.0.1"; + sha256 = "1sxqvdc0h4y767blmznb4ld0bq25aanbnrwy2wvk23rm8c7vf0w9"; + revision = "1"; + editedCabalFile = "0dvrypqffj4cmy1qvygy9r6d6iwj3d9fka063bbkgm0ri3bsc40y"; + libraryHaskellDepends = [ + base bytestring effectful-core http-client wreq + ]; + testHaskellDepends = [ base ]; + description = "Adaptation of the wreq library for the effectful ecosystem"; + license = lib.licenses.mit; + }) {}; + "wreq-helper" = callPackage ({ mkDerivation, aeson, aeson-result, base, bytestring, http-client , text @@ -336556,6 +338080,8 @@ self: { pname = "xls"; version = "0.1.3"; sha256 = "1qjkmcy41yj5izcj24jjwj1jvlg4cfg4g96zgc3jv4rfyr1n1892"; + revision = "1"; + editedCabalFile = "05xjv2l4i39fi4mhcr7w1wkl0a3lc7n40mnh3fq645hfik63nd62"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -336742,6 +338268,31 @@ self: { license = lib.licenses.mit; }) {}; + "xml-conduit_1_9_1_4" = callPackage + ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup + , bytestring, Cabal, cabal-doctest, conduit, conduit-extra + , containers, data-default, deepseq, doctest, hspec, HUnit + , resourcet, text, transformers, xml-types + }: + mkDerivation { + pname = "xml-conduit"; + version = "1.9.1.4"; + sha256 = "0kfz8ddn1l20q41623dxjlmqjyn1i5pzj5a33pipml5z201hv6q4"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + attoparsec base blaze-html blaze-markup bytestring conduit + conduit-extra containers data-default deepseq resourcet text + transformers xml-types + ]; + testHaskellDepends = [ + base blaze-markup bytestring conduit conduit-extra containers + doctest hspec HUnit resourcet text transformers xml-types + ]; + description = "Pure-Haskell utilities for dealing with XML with the conduit package"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "xml-conduit-decode" = callPackage ({ mkDerivation, base, bifunctors, data-default, lens, semigroups , tasty, tasty-hunit, text, time, xml-conduit, xml-types @@ -338396,6 +339947,18 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "xtea" = callPackage + ({ mkDerivation, base, binary, bytestring, hedgehog }: + mkDerivation { + pname = "xtea"; + version = "0.1.0.0"; + sha256 = "02h75vmww3jhij49acjbhh1bp0kknvxxvy4iiizf9rw97zsawr0j"; + libraryHaskellDepends = [ base binary bytestring ]; + testHaskellDepends = [ base bytestring hedgehog ]; + description = "XTEA (eXtended Tiny Encryption Algorithm)"; + license = lib.licenses.mit; + }) {}; + "xtest" = callPackage ({ mkDerivation, base, libXtst, X11 }: mkDerivation { @@ -339369,8 +340932,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.14.10"; - sha256 = "0as6k36cq8w1p8nqjlnlc8ji45slynxg4aj3p6ping177lw5232h"; + version = "0.14.11"; + sha256 = "11lwp60b11fkkasqflvslp489jrlg9l2x3wlzasikymy729lkrij"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -339644,19 +341207,17 @@ self: { "yaya" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, comonad, doctest - , either, foldable1-classes-compat, free, kan-extensions, lens - , profunctors, strict, template-haskell, th-abstraction - , transformers + , either, free, kan-extensions, lens, profunctors, strict + , template-haskell, th-abstraction, transformers }: mkDerivation { pname = "yaya"; - version = "0.6.2.0"; - sha256 = "1k6w1c89s7c416xjxm23mllcm68l8ya6m7jw2ml9axwsns27kx98"; + version = "0.6.2.2"; + sha256 = "0b6sd8rdp6qys45s2lps0nhmqbs9x63axmhh3k71y81lmzyq1cax"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base comonad either foldable1-classes-compat free kan-extensions - lens profunctors strict template-haskell th-abstraction - transformers + base comonad either free kan-extensions lens profunctors strict + template-haskell th-abstraction transformers ]; testHaskellDepends = [ base doctest ]; description = "Total recursion schemes"; @@ -339671,8 +341232,8 @@ self: { }: mkDerivation { pname = "yaya-containers"; - version = "0.1.2.0"; - sha256 = "03rfpzsrjimlp40s5pbn2fd5v4cby529nhmsh9xna7n8xf6jmm05"; + version = "0.1.2.1"; + sha256 = "17akwh7inlcnizhx600ydf5j6fgbl25cnwm2fr2f6rlabkxvraki"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers yaya ]; testHaskellDepends = [ base doctest ]; @@ -339687,8 +341248,8 @@ self: { }: mkDerivation { pname = "yaya-hedgehog"; - version = "0.3.0.2"; - sha256 = "1kyqbqp84whi9jsygk7x2vhja76h45fk75k7bgh9jwjqfj83zy7s"; + version = "0.3.0.3"; + sha256 = "1adqxgpgarwka93h9xzx6443vj6b0nx4cyrh3dp38zcq2c7xji2v"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base deriving-compat hedgehog yaya ]; testHaskellDepends = [ @@ -339701,14 +341262,14 @@ self: { "yaya-quickcheck" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, doctest, QuickCheck - , splitmix, yaya + , yaya }: mkDerivation { pname = "yaya-quickcheck"; - version = "0.2.0.1"; - sha256 = "0ncnp0m93fyjn9vqp8s0vbvra3v6nin8sh5jr58rv1r5538hkyr5"; + version = "0.2.0.2"; + sha256 = "13c8zyv83sik5ms2p49850jrpvhmr4wacz27ib79pbgp2lh538n9"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base QuickCheck splitmix yaya ]; + libraryHaskellDepends = [ base QuickCheck yaya ]; testHaskellDepends = [ base doctest ]; description = "QuickCheck testing support for the Yaya recursion scheme library"; license = lib.licenses.agpl3Plus; @@ -339735,15 +341296,15 @@ self: { }) {}; "yaya-unsafe" = callPackage - ({ mkDerivation, base, bifunctors, Cabal, cabal-doctest, comonad - , doctest, free, hedgehog, lens, yaya, yaya-hedgehog + ({ mkDerivation, base, Cabal, cabal-doctest, comonad, doctest, free + , hedgehog, lens, yaya, yaya-hedgehog }: mkDerivation { pname = "yaya-unsafe"; - version = "0.4.1.1"; - sha256 = "0s3fna5b0g5jxbndzmqsy9bqz8b4ry7p88kspnzv8shrq271mmmk"; + version = "0.4.1.2"; + sha256 = "0n4c2zf6ds2y4433j44hi890rwjchd09qfrdx2s61vis28xqyc1k"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base bifunctors comonad free lens yaya ]; + libraryHaskellDepends = [ base comonad free lens yaya ]; testHaskellDepends = [ base doctest hedgehog yaya yaya-hedgehog ]; description = "Non-total extensions to the Yaya recursion scheme library"; license = lib.licenses.agpl3Plus; @@ -340442,7 +342003,7 @@ self: { license = lib.licenses.mit; }) {}; - "yesod-auth-oauth2_0_7_3_0" = callPackage + "yesod-auth-oauth2_0_7_4_0" = callPackage ({ mkDerivation, aeson, base, bytestring, crypton, errors, hoauth2 , hspec, http-client, http-conduit, http-types, memory, microlens , mtl, safe-exceptions, text, transformers, unliftio @@ -340450,8 +342011,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.7.3.0"; - sha256 = "162fr9lpcqgni6pm2d9y1a2frc234xipl5kllxkncwnnf748g234"; + version = "0.7.4.0"; + sha256 = "0s74q7scwkxc678b7j2i24c7cd3jkx34w3m0r6pbvsc0ifj2lm6x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -341042,8 +342603,8 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.7.6"; - sha256 = "1bskmz2d1nn192qirldrdfkhbqzjlq5wi7wlj8rcl4pnh5jxvqd8"; + version = "1.7.9"; + sha256 = "1s59d3ccf76dmi43ivcfzbah9b0y18i9c3gv66dmcwy5f6wqhd52"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html blaze-markup byteable bytestring containers data-default email-validate @@ -342096,6 +343657,34 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-test_1_6_19" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, case-insensitive, conduit, containers + , cookie, 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 + }: + mkDerivation { + pname = "yesod-test"; + version = "1.6.19"; + sha256 = "0snq06yps28lkxfc1mhsvbv2kq0h0mi16zjdfrahm4zaz8axkqka"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + bytestring case-insensitive conduit containers cookie hspec-core + html-conduit http-types HUnit memory mtl network pretty-show text + time transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers cookie hspec html-conduit http-types + HUnit text unliftio unliftio-core wai wai-extra xml-conduit + yesod-core yesod-form + ]; + description = "integration testing for WAI/Yesod Applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test @@ -342297,6 +343886,31 @@ self: { broken = true; }) {}; + "yggdrasil-schema" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , directory, filepath, hspec, keys, mtl, neat-interpolation, optics + , optparse-applicative, QuickCheck, random, relude, sqlite-simple + , tasty, tasty-hspec, text, time, uuid + }: + mkDerivation { + pname = "yggdrasil-schema"; + version = "1.0.0.5"; + sha256 = "0d83cymxcx9n9fcaqybcfmv074zs0sgm7a99jzc1qp6kz2jqqjwy"; + libraryHaskellDepends = [ + aeson async base bytestring containers directory filepath keys mtl + neat-interpolation optics optparse-applicative random relude + sqlite-simple text time uuid + ]; + testHaskellDepends = [ + aeson async base bytestring containers directory filepath hspec + keys mtl neat-interpolation optics optparse-applicative QuickCheck + random relude sqlite-simple tasty tasty-hspec text time uuid + ]; + license = lib.licenses.lgpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "yhccore" = callPackage ({ mkDerivation, base, containers, mtl, pretty, uniplate }: mkDerivation { @@ -342333,25 +343947,25 @@ self: { "yi" = callPackage ({ mkDerivation, base, microlens-platform, mtl - , optparse-applicative, yi-core, yi-frontend-vty, yi-keymap-emacs - , yi-keymap-vim, yi-misc-modes, yi-mode-haskell, yi-mode-javascript - , yi-rope + , optparse-applicative, yi-core, yi-frontend-pango, yi-frontend-vty + , yi-keymap-emacs, yi-keymap-vim, yi-misc-modes, yi-mode-haskell + , yi-mode-javascript, yi-rope }: mkDerivation { pname = "yi"; - version = "0.19.0"; - sha256 = "1m383r5gx3r9l0mh88gcv3rjnr1ig9rivwg2qz963xqjyhr8y2ni"; + version = "0.19.3"; + sha256 = "0lhrq34wjl58cxki3a2sbck620ak2zpkcxqbxqdffd4g2bjrpkdl"; configureFlags = [ "-fpango" "-fvty" ]; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ base microlens-platform mtl optparse-applicative yi-core - yi-frontend-vty yi-keymap-emacs yi-keymap-vim yi-misc-modes - yi-mode-haskell yi-mode-javascript yi-rope + yi-frontend-pango yi-frontend-vty yi-keymap-emacs yi-keymap-vim + yi-misc-modes yi-mode-haskell yi-mode-javascript yi-rope ]; description = "Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; mainProgram = "yi"; }) {}; @@ -342372,6 +343986,7 @@ self: { description = "Add-ons to Yi, the Haskell-Scriptable Editor"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yi-core" = callPackage @@ -342386,8 +344001,8 @@ self: { }: mkDerivation { pname = "yi-core"; - version = "0.19.3"; - sha256 = "0l0rqvgm1i43x2q4cwdxwy9bmpvgw0wxmcij31yyx2py01ws863i"; + version = "0.19.4"; + sha256 = "0gahw4cxzk9vfx2cnf63vgpcbn874aandml844z3jj6w4v78vbps"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-default directory dlist dynamic-state exceptions filepath hashable ListLike @@ -342402,7 +344017,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq yi-rope ]; description = "Yi editor core library"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-dynamic-configuration" = callPackage @@ -342419,7 +344033,6 @@ self: { ]; description = "Dynamic configuration support for Yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-emacs-colours" = callPackage @@ -342431,7 +344044,6 @@ self: { libraryHaskellDepends = [ base containers split yi-language ]; description = "Simple mapping from colour names used in emacs to Color"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-frontend-pango" = callPackage @@ -342441,8 +344053,8 @@ self: { }: mkDerivation { pname = "yi-frontend-pango"; - version = "0.19.1"; - sha256 = "1ijvgxfbwnfpij3qajsci8hllb8n1p3iwd2n1wcp029kwpjhgzk9"; + version = "0.19.2"; + sha256 = "1rghdvcf22rwkjq1p8jdrwlsixy5fi9yclbzfwgyrchzqbrv9nqy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers filepath glib gtk microlens-platform mtl @@ -342451,25 +344063,23 @@ self: { ]; description = "Pango frontend for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-frontend-vty" = callPackage ({ mkDerivation, base, containers, data-default, dlist - , microlens-platform, pointedlist, stm, text, vty, yi-core - , yi-language, yi-rope + , microlens-platform, pointedlist, stm, text, vty + , vty-crossplatform, yi-core, yi-language, yi-rope }: mkDerivation { pname = "yi-frontend-vty"; - version = "0.19.0"; - sha256 = "1vdpfqmvig16jissmra1p9zc42fs4kf2bxspy23bf8mihfr99ays"; + version = "0.19.1"; + sha256 = "1n73vvyzwl1f94z1gwr2pacw0hnm2gqcqwbji3qps301802337vs"; libraryHaskellDepends = [ base containers data-default dlist microlens-platform pointedlist - stm text vty yi-core yi-language yi-rope + stm text vty vty-crossplatform yi-core yi-language yi-rope ]; description = "Vty frontend for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-fuzzy-open" = callPackage @@ -342488,7 +344098,6 @@ self: { ]; description = "Fuzzy open plugin for yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-gtk" = callPackage @@ -342516,7 +344125,6 @@ self: { ]; description = "Yi editor incremental reader"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-keymap-cua" = callPackage @@ -342532,7 +344140,6 @@ self: { ]; description = "Cua keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-keymap-emacs" = callPackage @@ -342552,7 +344159,6 @@ self: { ]; description = "Emacs keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-keymap-vim" = callPackage @@ -342581,20 +344187,19 @@ self: { ]; description = "Vim keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-language" = callPackage ({ mkDerivation, alex, array, base, binary, containers - , data-default, hashable, microlens-platform, oo-prototypes + , data-default, hashable, hspec, microlens-platform, oo-prototypes , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec , tasty-quickcheck, template-haskell, transformers-base , unordered-containers }: mkDerivation { pname = "yi-language"; - version = "0.19.0"; - sha256 = "18r875casrk66ck8q9p1r0c4cfjjgyd5l3gxldr95rqdjci3c09z"; + version = "0.19.2"; + sha256 = "050g61jjhby02shj12cdjsdz6z8cj3432k3qs1q2fi67pppfa5pn"; libraryHaskellDepends = [ array base binary containers data-default hashable microlens-platform oo-prototypes pointedlist regex-base regex-tdfa @@ -342602,15 +344207,13 @@ self: { ]; libraryToolDepends = [ alex ]; testHaskellDepends = [ - array base binary containers data-default hashable + array base binary containers data-default hashable hspec microlens-platform pointedlist regex-base regex-tdfa tasty tasty-hspec tasty-quickcheck template-haskell transformers-base unordered-containers ]; description = "Collection of language-related Yi libraries"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-misc-modes" = callPackage @@ -342619,8 +344222,8 @@ self: { }: mkDerivation { pname = "yi-misc-modes"; - version = "0.19.0"; - sha256 = "1g65mfafrq5dzcrcapisvyvs5frwjmy50zfkxrv0wfsdcfapkn7s"; + version = "0.19.1"; + sha256 = "1j0rq3495ywac5yk5ar7c77jfahi8rm3ivf25wdw0kbfc764bs95"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -342628,7 +344231,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor miscellaneous modes"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-mode-haskell" = callPackage @@ -342637,8 +344239,8 @@ self: { }: mkDerivation { pname = "yi-mode-haskell"; - version = "0.19.0"; - sha256 = "1hnwxqzaqg7zyfr7rd3l0la5hc8f4px4d0y78kq3xpy4pzx3yr8y"; + version = "0.19.1"; + sha256 = "1hhf98gvwfl8y51jkab1nxvm8ma1h19qjqzc7nvmjb9mz9c4clzw"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -342646,7 +344248,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor haskell mode"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-mode-javascript" = callPackage @@ -342656,10 +344257,8 @@ self: { }: mkDerivation { pname = "yi-mode-javascript"; - version = "0.19.0"; - sha256 = "1zgx36kagalna8lk60i0djn6mvl6ki55x4kc7mzq2mgzcs292zq1"; - revision = "1"; - editedCabalFile = "09hdiy51i9piyh6889hzjhna8g9hlblrzgzkl8x6rc6pl12dg3wc"; + version = "0.19.1"; + sha256 = "0d1ishhv6sfk0q711rbapr5srf28n7rrf0m5kjd382r13266wr3a"; libraryHaskellDepends = [ array base binary data-default dlist filepath microlens-platform mtl text yi-core yi-language yi-rope @@ -342667,7 +344266,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor javascript mode"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-monokai" = callPackage @@ -342680,6 +344278,7 @@ self: { description = "Monokai colour theme for the Yi text editor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yi-rope" = callPackage @@ -342719,7 +344318,6 @@ self: { ]; description = "Snippet support for yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-solarized" = callPackage @@ -342732,6 +344330,7 @@ self: { description = "Solarized colour theme for the Yi text editor"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yi-spolsky" = callPackage @@ -342744,6 +344343,7 @@ self: { description = "Spolsky colour theme for the Yi text editor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yi-vty" = callPackage @@ -342825,6 +344425,23 @@ self: { mainProgram = "yiyd"; }) {}; + "yj-sandbox" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "yj-sandbox"; + version = "0.1.0.0"; + sha256 = "1nb0aidix6fpk73wsj0fhnyslnh57w63bd10mw9x430sc1v7j2cb"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base template-haskell ]; + executableHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base template-haskell ]; + description = "try hackage"; + license = lib.licenses.bsd3; + mainProgram = "yj-sandbox-exe"; + }) {}; + "yjftp" = callPackage ({ mkDerivation, base, directory, ftphs, haskeline, hsConfigure , mtl, process, unix @@ -344146,6 +345763,8 @@ self: { pname = "zip"; version = "2.1.0"; sha256 = "1rbrayns2q34b0cp9b6zl3k600lbgck1c214rmvmywkhmms07slm"; + revision = "1"; + editedCabalFile = "1gm82c27fvgsincz0gi3c23w2lmlb5k3shnmncwdk6c3zyc4wjz0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix index 3661c74d499a..cbefc44bb01d 100644 --- a/pkgs/development/haskell-modules/lib/compose.nix +++ b/pkgs/development/haskell-modules/lib/compose.nix @@ -466,7 +466,7 @@ rec { which is cross aware instead. */ generateOptparseApplicativeCompletions = commands: pkg: - lib.warnIf (lib.isInOldestRelease 2211) "haskellLib.generateOptparseApplicativeCompletions is deprecated in favor of haskellPackages.generateOptparseApplicativeCompletions. Please change ${pkg.name} to use the latter and make sure it uses its matching haskell.packages set!" + lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2211) "haskellLib.generateOptparseApplicativeCompletions is deprecated in favor of haskellPackages.generateOptparseApplicativeCompletions. Please change ${pkg.name} to use the latter and make sure it uses its matching haskell.packages set!" (pkgs.lib.foldr __generateOptparseApplicativeCompletion pkg commands); /* @@ -475,7 +475,7 @@ rec { which is cross aware instead. */ generateOptparseApplicativeCompletion = command: pkg: - lib.warnIf (lib.isInOldestRelease 2211) "haskellLib.generateOptparseApplicativeCompletion is deprecated in favor of haskellPackages.generateOptparseApplicativeCompletions (plural!). Please change ${pkg.name} to use the latter and make sure it uses its matching haskell.packages set!" + lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2211) "haskellLib.generateOptparseApplicativeCompletion is deprecated in favor of haskellPackages.generateOptparseApplicativeCompletions (plural!). Please change ${pkg.name} to use the latter and make sure it uses its matching haskell.packages set!" (__generateOptparseApplicativeCompletion command pkg); # Don't fail at configure time if there are multiple versions of the diff --git a/pkgs/development/haskell-modules/patches/openssl-streams-cert.patch b/pkgs/development/haskell-modules/patches/openssl-streams-cert.patch new file mode 100644 index 000000000000..2a668e6d14d8 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/openssl-streams-cert.patch @@ -0,0 +1,137 @@ +From ae9f8db059b6093092f6bd5155d55557c0892a4e Mon Sep 17 00:00:00 2001 +From: Markus Theil <theil.markus@gmail.com> +Date: Sat, 5 Oct 2024 11:44:45 +0200 +Subject: [PATCH] regenerate test certificate to work with OpenSSL security + level 2 + +Signed-off-by: Markus Theil <theil.markus@gmail.com> +--- + test/cert.pem | 43 ++++++++++++++++++++++++--------- + test/key.pem | 67 +++++++++++++++++++++++++++++++++++++++------------ + 2 files changed, 83 insertions(+), 27 deletions(-) + +diff --git a/test/cert.pem b/test/cert.pem +index 13a87f5..a9dd418 100644 +--- a/test/cert.pem ++++ b/test/cert.pem +@@ -1,14 +1,33 @@ + -----BEGIN CERTIFICATE----- +-MIICOzCCAaQCCQChUcwtek3F7DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJD +-SDEPMA0GA1UECAwGWnVyaWNoMQ8wDQYDVQQHDAZadXJpY2gxFzAVBgNVBAoMDlNu +-YXAgRnJhbWV3b3JrMRgwFgYDVQQDDA9HcmVnb3J5IENvbGxpbnMwHhcNMTAxMjEx +-MTk1MjA0WhcNMzgwNDI3MTk1MjA0WjBiMQswCQYDVQQGEwJDSDEPMA0GA1UECAwG +-WnVyaWNoMQ8wDQYDVQQHDAZadXJpY2gxFzAVBgNVBAoMDlNuYXAgRnJhbWV3b3Jr +-MRgwFgYDVQQDDA9HcmVnb3J5IENvbGxpbnMwgZ8wDQYJKoZIhvcNAQEBBQADgY0A +-MIGJAoGBAMcWrmVJ0xn3JcKf+b8Y+Bs+rRacodl/R+N7UJXTyfkByB7bzN6VR2h8 +-oRYJu7DhETs/w4o/Af9vNwsJBJVovcbV6FAAbl45TMDq2QZVtPwwTDi8R52QbRIR +-WBxge3aHeMUz1hV32iMzGPVe4jKSaO2KcbVOFphwc8VmA59GvShfAgMBAAEwDQYJ +-KoZIhvcNAQEFBQADgYEAXsRchaVlL4RP5V+r1npL7n4W3Ge2O7F+fQ2dX6tNyqeo +-tMAdc6wYahg3m+PejWASVCh0vVEjBx2WYOMRPsmk/DYLUi4UwZYPrvZtbfSbMrD+ +-mYmZhqCDM4316qAg5OwcTON3+VZXMwbXCVM+vUCvZIw4xh6ywNjvuQjCzy7oKMg= ++MIIFpTCCA42gAwIBAgIUJuFs2fMmpGUlm+CT7l6v2LdnpeEwDQYJKoZIhvcNAQEL ++BQAwYjELMAkGA1UEBhMCQ0gxDzANBgNVBAgMBlp1cmljaDEPMA0GA1UEBwwGWnVy ++aWNoMRcwFQYDVQQKDA5TbmFwIEZyYW1ld29yazEYMBYGA1UEAwwPR3JlZ29yeSBD ++b2xsaW5zMB4XDTI0MTAwNTA5NDM1NFoXDTQ0MDkzMDA5NDM1NFowYjELMAkGA1UE ++BhMCQ0gxDzANBgNVBAgMBlp1cmljaDEPMA0GA1UEBwwGWnVyaWNoMRcwFQYDVQQK ++DA5TbmFwIEZyYW1ld29yazEYMBYGA1UEAwwPR3JlZ29yeSBDb2xsaW5zMIICIjAN ++BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA26OMdBRG9IybxVYY49z5xp4adabK ++QKMgBctSbY9+AXQ8dR0mPswQRMNG0upQyJJPTFXUBvKr2N2K00XbWIMifwhCfkBo ++9/JsOuQLNH1Dc627/amx9fuRrJJBnVUOZ9YOg9ytjaItXQ0rngv+lz8EH8IL8SB5 ++AQJr+MRRNr5JD44+/+au3oyL3eoDkb/MT3y2dyUCX7Kuk49h5iiTsPDp6DLQLxl2 ++YegJNh67qrw0gBSjhB0s0Yv7EqVeKTNEx89SkIdOSXh+S3Sf1foAU0Aq3v0a6aIh ++MLrN5Fo3TjQbhF9mlRjYZOM7HbrZsz7X6t77y9Ac4lgFWhbrCdtKFnwP3X1qHAou ++jfzwmnC7Z7h7rzoS0opjE29UcuOPaA7Jw/rbl3SpAab1UVVhOdMxvkJ+gshdJT8W ++uAoovhuyhtimM7l4vkwPqSD5y+h+zNiW5Lx1H1kAsyHeQ8zOI/wnuW4VjvhUb/Q+ ++LZWXmzEBZdGXZloj11py6B3b83atHU+R2LZQnDhnjU15JBG7WN7/anExz3Q7rRfs ++oYHa5qoV+sol53VIJDj+6nsJGfbr1WAonLxDOc8B3E7uu6fGSLeoTZj+hKCZhhsD ++1jnlGG1skpYqf+ECXgq8TGlFRjn6ae3Z7Tq/UFu0a+cbsHHBSUwKG17mtaaqbDeY ++8kWUWNDKtUSewb0CAwEAAaNTMFEwHQYDVR0OBBYEFDj0ry4aPDK4/pbxzbLdUrtN ++4EuXMB8GA1UdIwQYMBaAFDj0ry4aPDK4/pbxzbLdUrtN4EuXMA8GA1UdEwEB/wQF ++MAMBAf8wDQYJKoZIhvcNAQELBQADggIBACct1UKUYYORYcjV96HuPVQSN00iLLUj ++C2QWfF2rF6sToX46oEHfwtIpBT3kATB2G8Ltt5OBohek0eLpGIaJyMYlhiRb6ubz ++O8jcgD2d0FKEBAIEYK+UvuKakWKY3C72zNzL89KOkCqS5o8dYXhMtxPi/ncAdyUa ++jIKHhZx1gYIkaYRVgnnLk4NrpIH3WZmwGj5y/k8ha4vvbfg4pf04FAWliqmD+30E ++qyF0GtxhVN7ZffEn610i9DCsxQet5DiThlZMB9gSZK0VqvTdaKR7qmAohEe5mKBr ++/MbERm8E36B1sW3uGTJLu/irFZtoez2IYNBJaatkKjk3bv+cHKV3E/VTKMMKFtLS ++poLtaAZpuLr4Lg1RS1dCU2f6NaNYuKl30ROAf8ro++8Rnn1WMVc+8x3EhyMJzJYT +++NLnB+8PnoOj2jkc0lY+AqbwSREIivRoN1frbqHfsyZc8Mkds1FUCHLun77LMBVi ++HwmG1frnJ6X9actf1sQqXSqD0URenqTpZSu8YKAkhH3oaKm5I0IyYUeynCk1ck8G ++PyiRk2sj4II7nrzZOCJSJsgDweZdqoul3qKki4V/4+sMgmsAIHJYy/nCwl1HThQ8 ++XY15cF3dnf1bcly1ooj7bL4DrPuG1oWpzDIlIkJ+ZTsPrKK3/Vy2pUkklKowmq3w ++qHcAZ2oKVR1s + -----END CERTIFICATE----- +diff --git a/test/key.pem b/test/key.pem +index 3db6603..ef99b04 100644 +--- a/test/key.pem ++++ b/test/key.pem +@@ -1,15 +1,52 @@ +------BEGIN RSA PRIVATE KEY----- +-MIICXgIBAAKBgQDHFq5lSdMZ9yXCn/m/GPgbPq0WnKHZf0fje1CV08n5Acge28ze +-lUdofKEWCbuw4RE7P8OKPwH/bzcLCQSVaL3G1ehQAG5eOUzA6tkGVbT8MEw4vEed +-kG0SEVgcYHt2h3jFM9YVd9ojMxj1XuIykmjtinG1ThaYcHPFZgOfRr0oXwIDAQAB +-AoGBAIr+p9UpfIvFRASkYd3sFdQXpwqBYnIR7ePBBVsFWR5TAx+gP2ErAYbOdDyJ +-oRN1nu0psGBFaySlxd0bd6rETLFXMWbA0uDJcqASrlsOhsbhgPH7aExYfAi7eX8h +-FAwD//j2E1sS6WvNWu0YANKR2yrM9R0vcbt0GF7hlmyV7lhRAkEA+6DCI6nfbdvR +-jkvaxzOdC9jY/eBI9a4BbyjPLUSlTuQsGrp6s0Sj1LOQscItzqkPSutugM3f1dlG +-lqq31/fnqQJBAMqMOknRBlOZY8DBfCorvNXAjIenoqlqE1D4yTL+tE5C3zEyvTcF +-jPAaX220vf1OkL1bX4jKUxx8uXIqiYND9McCQQCWoWWWc9qMqUqJJF+TYBJjRSyg +-zeLfL4ssQAHF15Id5/l/BqLtLenlKpkz0EobrJi7ALTl5lhYa/kVuJzVbFIBAkEA +-shE17U9mUHi5yexQTILHMORmp5wo1Of8s2ME/2ANBACmV4pT7ttiXHPTEY+kt90q +-Qk7iXlABYToFjuj2nABSYQJAO6W9P18mM2p6vkiBuNReW6VN/ftYqq5TLK3hXh2Q +-0d5v0eW9ce7CiQueH5kxq44EVVTIDiVLe2pk+BQIntMC8w== +------END RSA PRIVATE KEY----- ++-----BEGIN PRIVATE KEY----- ++MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDbo4x0FEb0jJvF ++Vhjj3PnGnhp1pspAoyAFy1Jtj34BdDx1HSY+zBBEw0bS6lDIkk9MVdQG8qvY3YrT ++RdtYgyJ/CEJ+QGj38mw65As0fUNzrbv9qbH1+5GskkGdVQ5n1g6D3K2Noi1dDSue ++C/6XPwQfwgvxIHkBAmv4xFE2vkkPjj7/5q7ejIvd6gORv8xPfLZ3JQJfsq6Tj2Hm ++KJOw8OnoMtAvGXZh6Ak2HruqvDSAFKOEHSzRi/sSpV4pM0THz1KQh05JeH5LdJ/V +++gBTQCre/RrpoiEwus3kWjdONBuEX2aVGNhk4zsdutmzPtfq3vvL0BziWAVaFusJ ++20oWfA/dfWocCi6N/PCacLtnuHuvOhLSimMTb1Ry449oDsnD+tuXdKkBpvVRVWE5 ++0zG+Qn6CyF0lPxa4Cii+G7KG2KYzuXi+TA+pIPnL6H7M2JbkvHUfWQCzId5DzM4j ++/Ce5bhWO+FRv9D4tlZebMQFl0ZdmWiPXWnLoHdvzdq0dT5HYtlCcOGeNTXkkEbtY ++3v9qcTHPdDutF+yhgdrmqhX6yiXndUgkOP7qewkZ9uvVYCicvEM5zwHcTu67p8ZI ++t6hNmP6EoJmGGwPWOeUYbWySlip/4QJeCrxMaUVGOfpp7dntOr9QW7Rr5xuwccFJ ++TAobXua1pqpsN5jyRZRY0Mq1RJ7BvQIDAQABAoICAAIB114rM5p3W31nmUV3Ju2J ++Uy6+kLbGVtv+skOP42P82DLuH9lEkPnT5VvhlM3pxQw/9OFVtTt/i3h9TlvGIln8 ++rRY4HU12G3DuqxSLzYKV30kvlGcDVB7lMkYkuW46VE/LrpFZXqaXoM2qXeVWHSye ++H8ZQbef+tJZlfY7YGSpUJOAT+gaiIa1sPqPwbQalRN9HXmNvVQLtCpppcK9rWt6K ++nQDv2mIFgRS2c1rEKrWomqBHNPo67YHg3YCtDYScRiyjHpRzeQdUVZlFa4cskl0P ++J+sOgSpPwWMZbkvKaZ2hfTpBFnSA6Bt63OjzWtKfFDgrWsw4Z4odz1WRJGGauM62 ++HwroFPCXCit2KCieu23hmsy+Bzh9kdKby8Y3IIdCkTxpslc8au5Psz9uETOXCRwG ++XrANA+OjIawNb3M6Lp3//F07V5eTdWNGrkCByfe0O6/tbnQXPnpqb4u39mnRDQgM ++O69TUCZNaHFQoN7cVJl6hMM6+i3ymMbNOk46hqiqe12KeO8iN/kp/GyGKEP0+H+K ++K2xniIYvm4s+1BE4klkU3S1TQhlZInYu5DFKtGb++n2+UfUlC6bLvA7aAh0K/yOC ++zECPZV8InyTwOaom/CHfWEnBUSEvqvaw/r1DNYqsRR8QSFzlNxx7rDwcEsfy0rJt ++0Ru9jSGCYBRR/EeBHY5JAoIBAQDvqF0K5k/WUIRdybygi22pkEcXbajC0s0Z7Wm/ ++/Uh2zOw2tDv2wfN26Jk9YvPFuZzkgTZSSHBtVHLaju8LXzIDtbD7990KyWKTm/QX ++ynm/Depp7HWbKVxgWAa0Q0DNUNl/vTGHtj9MDGYx798GzGfrQvIs50jBvjnw1QcN +++vkNkkEFTOc3XYKWdPMsqfUowgVC73aiK3Bq1g514F5hj6OPuiyAbrWluS0jsOLG ++fWGbo9Aw7PmAD8oCjrkpGslLuIVjw0j9Ro0o6iK8+5rzdyai5WsSRBeBsBw5N3pg ++OzDXiBm8mfu9TDk7O7ZXM9Jw/jrV5lGks+XHMsPm1Flrtx7pAoIBAQDqnbj1uwH/ ++Z1fd4+hVygXsHju77IoSx5mgSuXhDn+tl35IbUR0rgPNNLc/TVo4FHuJuKHdH3/G ++un9tYLfo/CCMZOMM/Tlh5ZSm1d9BCniCxlmbdXka5DXJ34TTAL2ssdwBagRmaj7n ++8o1EhOdqB+DszGoLWm2NUXPZOFCaMD30vjQ6xeY+YkePCsPpffr4YeTDtgsX7URE ++sTNfyAXtK5boQg1VkowlAP+EYqggnu10sOn3Hddxq2YHTi2cCDSSuctCfqyvfVea ++LudIh5pIfwxie8w09znMxKJhUij1duRcv+L9z/O+zjSW2gPPlvqgw7gcg3cCp1RM +++WGX9V2jPE+1AoIBAGL+echp0CqnwbV4AmmSjm7PQP5ldqNbLgt6rQb4Gbmw9hW2 ++p1pLTUUd2UapHCbdf/hHg2fDsmUG0BaFmippXSB5Ka06+lxdSVHNxqsZIOcRWXX9 ++jarVD+pgEgzeBuOIdP816EK1vjmsmX4hJlAJmRdt5Nk1hDE7YXWgmTRmKgA4HJGS ++7aNKBgoeLuCRJ8p5MnEutyNPrDUFTJ3WW0YTbi2Napp2oKPe9M1cYKA65FnE9ddv ++27PRUdFyoPtgrCuSAc9uuDSesupmpIjJqXzOB/CbsXmvFMKmO1JLH0qmyIsPFgp4 ++1Kqh1LYp+SzWJCQ2b5kxdSICiXSZ/J/ZsUI0NxkCggEBAKzYSd1vSod5ATjNoOsj ++DL3pgCRwnUA8oKeAxl7JqbKf+z8skNRNJyvU/HO8bw0FugW6ajVX8XDdEOfp61PP +++8KyyLtXCyFeW+eVhQaLykC+FGH9Z50yJ5Zz/4zb7OD/n4/DJT62Y2XKQd0K9Noe ++t8x8xFtc4XzNV0XewTL2+44FWsE57uhiy0lMqwyn7W9z3293/DBCcpsQ2UJlQEh8 ++Zo7xqpUyg+D3HUfQzwBJVbM0awnNiF2L4nzbUaq0ONcn3eE9Jceb1iAXEflTPYzP ++XLZpcgZLZN/AtchxGQ/N6WuTSo2m2HHnxMKmF0ymdDpgNpF7IQBpeifDSe0DrVqH ++IkkCggEBAKdRzi+vHk2sNAM+oRt6wnSxmVi38YhqQY3jB/BUKrmG9yeU/5NrLnLV ++UHEw8X+bAIaDXcjW8nH9l8mmCpWRv6Atk69KCAYCnyHkDmMjyEbFkG+VW1mJKeQD ++J7MA8QMwg8nW3t6GdyGNupLP65EIVaOd0+W27qzHOinWq/vlrJLi7DAk7ZxDbZxa ++YsE0Dy6oko0M0cN+NhgfsOE2/E9u3u+OfM7WqJjvKs7nPBh1mlSmGXB0srbsdF5X ++zSi2PxEM87K9FjhwdLRg1Wgq1hqK5xeFpvQETd5dCwrbPDnWd4H91jycquVQ29+f ++F3fTQNKQ93zJWtUhTUSPO2BzPnZh8UE= ++-----END PRIVATE KEY----- +-- +2.46.0 + diff --git a/pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch b/pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch new file mode 100644 index 000000000000..1e9cc4c65ded --- /dev/null +++ b/pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch @@ -0,0 +1,21 @@ +diff --git a/password/password.cabal b/password/password.cabal +index 506457e..8fa978b 100644 +--- a/password.cabal ++++ b/password.cabal +@@ -186,6 +186,8 @@ test-suite password-tasty + other-modules: + Scrypt + Data.Password.Scrypt ++ build-depends: ++ scrypt + ghc-options: + -threaded -O2 -rtsopts -with-rtsopts=-N + build-depends: +@@ -195,7 +197,6 @@ test-suite password-tasty + , bytestring + , memory + , quickcheck-instances +- , scrypt + , tasty + , tasty-hunit + , tasty-quickcheck diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 12fc8f228b7f..20a34aef75d4 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchFromGitHub, runCommandLocal, makeWrapper, substituteAll +{ lib, stdenv, callPackage, fetchFromGitHub, fetchpatch, runCommandLocal, makeWrapper, substituteAll , sbcl, bash, which, perl, hostname , openssl, glucose, minisat, abc-verifier, z3, python3 , certifyBooks ? true @@ -33,12 +33,25 @@ in stdenv.mkDerivation rec { # $IPASIR_SHARED_LIBRARY environment variable. libipasir = callPackage ./libipasirglucose4 { }; - patches = [(substituteAll { - src = ./0001-Fix-some-paths-for-Nix-build.patch; - libipasir = "${libipasir}/lib/${libipasir.libname}"; - libssl = "${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}"; - libcrypto = "${lib.getLib openssl}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}"; - })]; + patches = [ + (substituteAll { + src = ./0001-Fix-some-paths-for-Nix-build.patch; + libipasir = "${libipasir}/lib/${libipasir.libname}"; + libssl = "${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}"; + libcrypto = "${lib.getLib openssl}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + (fetchpatch { + name = "fix-fastnumio-on-newer-sbcl.patch"; + url = "https://github.com/acl2-devel/acl2-devel/commit/84f5a6cd4a1aaf204e8bae3eab4c21e8c061f469.patch"; + hash = "sha256-VA9giXZMb/Ob8ablxfbBAaZ2+2PGcv7WtooXwKDgT08="; + }) + ]; + + # We need the timestamps on the source tree to be stable for certification to + # work properly, so reset them here as necessary after patching + postPatch = '' + find . -type f -newer "$src" -execdir touch -r "$src" {} + + ''; nativeBuildInputs = lib.optional certifyBooks makeWrapper; @@ -112,7 +125,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Interpreter and a prover for a Lisp dialect"; + description = "Interpreter and prover for a Lisp dialect"; mainProgram = "acl2"; longDescription = '' ACL2 is a logic and programming language in which you can model computer diff --git a/pkgs/development/interpreters/alda/default.nix b/pkgs/development/interpreters/alda/default.nix deleted file mode 100644 index f9711c16a573..000000000000 --- a/pkgs/development/interpreters/alda/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre }: - -stdenv.mkDerivation rec { - pname = "alda"; - version = "2.2.3"; - - src_alda = fetchurl { - url = "https://alda-releases.nyc3.digitaloceanspaces.com/${version}/client/linux-amd64/alda"; - hash = "sha256-cyOAXQ3ITIgy4QusjdYBNmNIzB6BzfbQEypvJbkbvWo="; - }; - - src_player = fetchurl { - url = "https://alda-releases.nyc3.digitaloceanspaces.com/${version}/player/non-windows/alda-player"; - hash = "sha256-HsX0mNWrusL2FaK2oK8xhmr/ai+3ZiMmrJk7oS3b93g="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = - let - binPath = lib.makeBinPath [ jre ]; - in - '' - install -D $src_alda $out/bin/alda - install -D $src_player $out/bin/alda-player - - wrapProgram $out/bin/alda --prefix PATH : $out/bin:${binPath} - wrapProgram $out/bin/alda-player --prefix PATH : $out/bin:${binPath} - ''; - - meta = with lib; { - description = "Music programming language for musicians"; - homepage = "https://alda.io"; - license = licenses.epl10; - maintainers = [ maintainers.ericdallo ]; - platforms = jre.meta.platforms; - }; -} diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix deleted file mode 100644 index 24ac89eb4c5b..000000000000 --- a/pkgs/development/interpreters/angelscript/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchurl -, unzip -, cmake -}: - -stdenv.mkDerivation rec { - pname = "angelscript"; - version = "2.36.1"; - - src = fetchurl { - url = "https://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - sha256 = "sha256-WLt0mvnH44YwRwX05uYnrkHf4D4LanPD0NLgF8T8lI8="; - }; - - nativeBuildInputs = [ unzip cmake ]; - - preConfigure = '' - export ROOT=$PWD - cd angelscript/projects/cmake - ''; - - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; - - postInstall = '' - mkdir -p "$out/share/docs/angelscript" - cp -r $ROOT/docs/* "$out/share/docs/angelscript" - ''; - - meta = with lib; { - description = "Light-weight scripting library"; - license = licenses.zlib; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.all; - downloadPage = "https://www.angelcode.com/angelscript/downloads.html"; - homepage = "https://www.angelcode.com/angelscript/"; - }; -} diff --git a/pkgs/development/interpreters/anko/default.nix b/pkgs/development/interpreters/anko/default.nix deleted file mode 100644 index f88534e9ecf8..000000000000 --- a/pkgs/development/interpreters/anko/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "anko"; - version = "0.1.9"; - - src = fetchFromGitHub { - owner = "mattn"; - repo = "anko"; - rev = "v${version}"; - hash = "sha256-ZVNkQu5IxBx3f+FkUWc36EOEcY176wQJ2ravLPQAHAA="; - }; - - vendorHash = null; - - ldflags = [ "-s" "-w" ]; - - __darwinAllowLocalNetworking = true; - - meta = with lib; { - description = "Scriptable interpreter written in golang"; - homepage = "https://github.com/mattn/anko"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix index f4b51b37c480..f413c47b8169 100644 --- a/pkgs/development/interpreters/babashka/default.nix +++ b/pkgs/development/interpreters/babashka/default.nix @@ -9,11 +9,11 @@ let babashka-unwrapped = buildGraalvmNativeImage rec { pname = "babashka-unwrapped"; - version = "1.4.192"; + version = "1.12.194"; src = fetchurl { url = "https://github.com/babashka/babashka/releases/download/v${version}/babashka-${version}-standalone.jar"; - sha256 = "sha256-uVRk1/lfOXMSp3qOdeMoAFpwJaEBxF1MYtFOv364H7Y="; + sha256 = "sha256-Dx3AANMpmCPH8Zaz8/9FRNRRhcEPnZHXQje47udwwRQ="; }; graalvmDrv = graalvmCEPackages.graalvm-ce; @@ -37,6 +37,7 @@ let $out/bin/bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]' | fgrep '[1 2]' $out/bin/bb '(prn "bépo àê")' | fgrep 'bépo àê' $out/bin/bb '(:out (babashka.process/sh "echo" "ä"))' | fgrep 'ä' + $out/bin/bb '(into-array [:f])' ''; postInstall = '' diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix deleted file mode 100644 index 17d22a14cae5..000000000000 --- a/pkgs/development/interpreters/bats/default.nix +++ /dev/null @@ -1,242 +0,0 @@ -{ resholve -, lib -, stdenv -, fetchFromGitHub -, bash -, coreutils -, gnugrep -, ncurses -, findutils -, hostname -, parallel -, flock -, procps -, bats -, lsof -, callPackages -, symlinkJoin -, makeWrapper -, runCommand -, doInstallCheck ? true -# packages that use bats (for update testing) -, bash-preexec -, kikit -, locate-dominating-file -, packcc -}: - -resholve.mkDerivation rec { - pname = "bats"; - version = "1.11.0"; - - src = fetchFromGitHub { - owner = "bats-core"; - repo = "bats-core"; - rev = "v${version}"; - hash = "sha256-goHIhbBoCf1eb1N8xIHdVvAURofvLDgEDXofhDHrr7Y="; - }; - - patchPhase = '' - patchShebangs . - ''; - - installPhase = '' - ./install.sh $out - ''; - - solutions = { - bats = { - scripts = [ - "bin/bats" - "libexec/bats-core/*" - "lib/bats-core/*" - ]; - interpreter = "${bash}/bin/bash"; - inputs = [ - bash - coreutils - gnugrep - ncurses - findutils - hostname - parallel - flock - "lib/bats-core" - "libexec/bats-core" - procps - ]; - fake = { - external = [ - "greadlink" - "shlock" - ] ++ lib.optionals stdenv.isDarwin [ - "pkill" # procps doesn't supply this on darwin - ]; - }; - fix = { - "$BATS_ROOT" = [ "${placeholder "out"}" ]; - "$BATS_LIBDIR" = [ "lib" ]; - "$BATS_LIBEXEC" = [ "${placeholder "out"}/libexec/bats-core" ]; - }; - keep = { - "${placeholder "out"}/libexec/bats-core/bats" = true; - source = [ - "${placeholder "out"}/lib/bats-core/validator.bash" - "${placeholder "out"}/lib/bats-core/preprocessing.bash" - "$BATS_TEST_SOURCE" - "${placeholder "out"}/lib/bats-core/tracing.bash" - "${placeholder "out"}/lib/bats-core/test_functions.bash" - "$library_load_path" - "${placeholder "out"}/lib/bats-core/common.bash" - "${placeholder "out"}/lib/bats-core/semaphore.bash" - "${placeholder "out"}/lib/bats-core/formatter.bash" - "${placeholder "out"}/lib/bats-core/warnings.bash" - "$setup_suite_file" # via cli arg - ]; - "$interpolated_report_formatter" = true; - "$interpolated_formatter" = true; - "$pre_command" = true; - "$BATS_TEST_NAME" = true; - "${placeholder "out"}/libexec/bats-core/bats-exec-test" = true; - "$BATS_LINE_REFERENCE_FORMAT" = "comma_line"; - "$BATS_LOCKING_IMPLEMENTATION" = "${flock}/bin/flock"; - "$parallel_binary_name" = "${parallel}/bin/parallel"; - "${placeholder "out"}/libexec/bats-core/bats-preprocess" = true; - }; - execer = [ - /* - both blatant lies for expedience; these can certainly exec args - they may be safe here, because they may always run things that - are ultimately in libexec? - TODO: handle parallel and flock in binlore/resholve - */ - "cannot:${parallel}/bin/parallel" - "cannot:${flock}/bin/flock" - - "cannot:libexec/bats-core/bats-preprocess" - - # these do exec, but other internal files - "cannot:libexec/bats-core/bats-exec-file" - "cannot:libexec/bats-core/bats-exec-suite" - "cannot:libexec/bats-core/bats-gather-tests" - ] ++ lib.optionals (!stdenv.isDarwin) [ - # checked invocations for exec - "cannot:${procps}/bin/pkill" - ]; - }; - }; - - passthru.libraries = callPackages ./libraries.nix {}; - - passthru.withLibraries = selector: - symlinkJoin { - name = "bats-with-libraries-${bats.version}"; - - paths = [ - bats - ] ++ selector bats.libraries; - - nativeBuildInputs = [ - makeWrapper - ]; - - postBuild = '' - wrapProgram "$out/bin/bats" \ - --suffix BATS_LIB_PATH : "$out/share/bats" - ''; - }; - - passthru.tests = { - libraries = runCommand "${bats.name}-with-libraries-test" { - testScript = '' - setup() { - bats_load_library bats-support - bats_load_library bats-assert - bats_load_library bats-file - bats_load_library bats-detik/detik.bash - - bats_require_minimum_version 1.5.0 - - TEST_TEMP_DIR="$(temp_make --prefix 'nixpkgs-bats-test')" - } - - teardown() { - temp_del "$TEST_TEMP_DIR" - } - - @test echo_hi { - run -0 echo hi - assert_output "hi" - } - - @test cp_failure { - run ! cp - assert_line --index 0 "cp: missing file operand" - assert_line --index 1 "Try 'cp --help' for more information." - } - - @test file_exists { - echo "hi" > "$TEST_TEMP_DIR/hello.txt" - assert_file_exist "$TEST_TEMP_DIR/hello.txt" - run cat "$TEST_TEMP_DIR/hello.txt" - assert_output "hi" - } - ''; - passAsFile = [ "testScript" ]; - } '' - ${bats.withLibraries (p: [ p.bats-support p.bats-assert p.bats-file p.bats-detik ])}/bin/bats "$testScriptPath" - touch "$out" - ''; - - upstream = bats.unresholved.overrideAttrs (old: { - name = "${bats.name}-tests"; - dontInstall = true; # just need the build directory - nativeInstallCheckInputs = [ - ncurses - parallel # skips some tests if it can't detect - flock # skips some tests if it can't detect - procps - ] ++ lib.optionals stdenv.isDarwin [ lsof ]; - inherit doInstallCheck; - installCheckPhase = '' - # TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows - sed -i '/test works even if PATH is reset/a skip "disabled for nix build"' test/bats.bats - - # skip tests that assume bats `install.sh` will be in BATS_ROOT - rm test/root.bats - - '' + (lib.optionalString stdenv.hostPlatform.isDarwin '' - # skip new timeout tests which are failing on macOS for unclear reasons - # This might relate to procps not having a pkill? - rm test/timeout.bats - '') + '' - - # test generates file with absolute shebang dynamically - substituteInPlace test/install.bats --replace \ - "/usr/bin/env bash" "${bash}/bin/bash" - - ${bats}/bin/bats test - touch $out - ''; - }); - - # to see when updates would break things, include packages - # that use nixpkgs' bats for testing (as long as they - # aren't massive builds) - inherit bash-preexec locate-dominating-file packcc; - resholve = resholve.tests.cli; - } // lib.optionalAttrs (!stdenv.isDarwin) { - # TODO: kikit's kicad dependency is marked broken on darwin atm - # may be able to fold this up if that resolves. - inherit kikit; - }; - - meta = with lib; { - homepage = "https://github.com/bats-core/bats-core"; - description = "Bash Automated Testing System"; - mainProgram = "bats"; - maintainers = with maintainers; [ abathur ]; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/interpreters/bats/libraries.nix b/pkgs/development/interpreters/bats/libraries.nix deleted file mode 100644 index b780bce13fd0..000000000000 --- a/pkgs/development/interpreters/bats/libraries.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: { - bats-assert = stdenv.mkDerivation (finalAttrs: { - pname = "bats-assert"; - version = "2.1.0"; - src = fetchFromGitHub { - owner = "bats-core"; - repo = "bats-assert"; - rev = "v${finalAttrs.version}"; - hash = "sha256-opgyrkqTwtnn/lUjMebbLfS/3sbI2axSusWd5i/5wm4="; - }; - dontBuild = true; - installPhase = '' - runHook preInstall - mkdir -p "$out/share/bats/bats-assert" - cp load.bash "$out/share/bats/bats-assert" - cp -r src "$out/share/bats/bats-assert" - runHook postInstall - ''; - meta = { - description = "Common assertions for Bats"; - platforms = lib.platforms.all; - homepage = "https://github.com/bats-core/bats-assert"; - license = lib.licenses.cc0; - maintainers = with lib.maintainers; [ brokenpip3 ]; - }; - }); - - bats-file = stdenv.mkDerivation (finalAttrs: { - pname = "bats-file"; - version = "0.4.0"; - src = fetchFromGitHub { - owner = "bats-core"; - repo = "bats-file"; - rev = "v${finalAttrs.version}"; - hash = "sha256-NJzpu1fGAw8zxRKFU2awiFM2Z3Va5WONAD2Nusgrf4o="; - }; - dontBuild = true; - installPhase = '' - runHook preInstall - mkdir -p "$out/share/bats/bats-file" - cp load.bash "$out/share/bats/bats-file" - cp -r src "$out/share/bats/bats-file" - runHook postInstall - ''; - meta = { - description = "Common filesystem assertions for Bats"; - platforms = lib.platforms.all; - homepage = "https://github.com/bats-core/bats-file"; - license = lib.licenses.cc0; - maintainers = with lib.maintainers; [ brokenpip3 ]; - }; - }); - - bats-detik = stdenv.mkDerivation (finalAttrs: { - pname = "bats-detik"; - version = "1.3.2"; - src = fetchFromGitHub { - owner = "bats-core"; - repo = "bats-detik"; - rev = "v${finalAttrs.version}"; - hash = "sha256-f8PN+VsUdUXrR9JiQgVuYDy2QgOtaxE8tkkxOUF0uC4="; - }; - dontBuild = true; - installPhase = '' - runHook preInstall - mkdir -p "$out/share/bats/bats-detik" - cp -r lib/* "$out/share/bats/bats-detik" - runHook postInstall - ''; - meta = { - description = "Library to ease e2e tests of applications in K8s environments"; - platforms = lib.platforms.all; - homepage = "https://github.com/bats-core/bats-detik"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ brokenpip3 ]; - }; - }); - - bats-support = stdenv.mkDerivation (finalAttrs: { - pname = "bats-support"; - version = "0.3.0"; - src = fetchFromGitHub { - owner = "bats-core"; - repo = "bats-support"; - rev = "v${finalAttrs.version}"; - hash = "sha256-4N7XJS5XOKxMCXNC7ef9halhRpg79kUqDuRnKcrxoeo="; - }; - dontBuild = true; - installPhase = '' - runHook preInstall - mkdir -p "$out/share/bats/bats-support" - cp load.bash "$out/share/bats/bats-support" - cp -r src "$out/share/bats/bats-support" - runHook postInstall - ''; - meta = { - description = "Supporting library for Bats test helpers"; - platforms = lib.platforms.all; - homepage = "https://github.com/bats-core/bats-support"; - license = lib.licenses.cc0; - maintainers = with lib.maintainers; [ brokenpip3 ]; - }; - }); -} diff --git a/pkgs/development/interpreters/bic/default.nix b/pkgs/development/interpreters/bic/default.nix deleted file mode 100644 index 669cb4f723ac..000000000000 --- a/pkgs/development/interpreters/bic/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, readline -, autoreconfHook -, autoconf-archive -, gmp -, flex -, bison -}: - -stdenv.mkDerivation rec { - pname = "bic"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "hexagonal-sun"; - repo = pname; - rev = "v${version}"; - sha256 = "1ws46h1ngzk14dspmsggj9535yl04v9wh8v4gb234n34rdkdsyyw"; - }; - - buildInputs = [ readline gmp ]; - nativeBuildInputs = [ - autoreconfHook - autoconf-archive - bison - flex - ]; - - meta = with lib; { - description = "C interpreter and API explorer"; - mainProgram = "bic"; - longDescription = '' - bic This a project that allows developers to explore and test C-APIs using a - read eval print loop, also known as a REPL. - ''; - license = with licenses; [ gpl2Plus ]; - homepage = "https://github.com/hexagonal-sun/bic"; - platforms = platforms.unix; - maintainers = with maintainers; [ hexagonal-sun ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; - }; -} diff --git a/pkgs/development/interpreters/boron/default.nix b/pkgs/development/interpreters/boron/default.nix deleted file mode 100644 index e6570c2e8919..000000000000 --- a/pkgs/development/interpreters/boron/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenv -, fetchurl -, zlib -}: - -stdenv.mkDerivation rec { - pname = "boron"; - version = "2.1.0"; - - src = fetchurl { - url = "https://sourceforge.net/projects/urlan/files/Boron/boron-${version}.tar.gz"; - sha256 = "sha256-50HKcK2hQpe9k9RIoVa/N5krTRKlW9AsGYTmHITx7Nc="; - }; - - # this is not a standard Autotools-like `configure` script - dontAddPrefix = true; - - preConfigure = '' - patchShebangs configure - ''; - - configureFlags = [ "--thread" ]; - - makeFlags = [ "DESTDIR=$(out)" ]; - - buildInputs = [ - zlib - ]; - - installTargets = [ "install" "install-dev" ]; - - doCheck = true; - - checkPhase = '' - patchShebangs . - make -C test - ''; - - meta = with lib; { - homepage = "https://urlan.sourceforge.net/boron/"; - description = "Scripting language and C library useful for building DSLs"; - mainProgram = "boron"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ mausch ]; - }; -} - diff --git a/pkgs/development/interpreters/bqn/cbqn/sources.nix b/pkgs/development/interpreters/bqn/cbqn/sources.nix index 3b9ca78533e3..48470c50e1ba 100644 --- a/pkgs/development/interpreters/bqn/cbqn/sources.nix +++ b/pkgs/development/interpreters/bqn/cbqn/sources.nix @@ -10,13 +10,13 @@ cbqn = let self = { pname = "cbqn"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "dzaima"; repo = "CBQN"; rev = "v${self.version}"; - hash = "sha256-TUK0HrJ1IyiVi9Y3S1IrK/d4/EZxdRdWyxsAwj79KEc="; + hash = "sha256-vmd7CX0jgozysmjKK0p5GM4Qd3vY71q1kcKwfr+6fkw="; }; }; in @@ -24,13 +24,13 @@ cbqn-bytecode = { pname = "cbqn-bytecode"; - version = "0-unstable-2024-05-22"; + version = "0-unstable-2024-09-15"; src = fetchFromGitHub { owner = "dzaima"; repo = "cbqnBytecode"; - rev = "c5674783c11d7569e5a4d166600ffcde2409331d"; - hash = "sha256-y7gqHzUxVUUVryutlq3Upuso8r3ZRSyF7ydMg1OVlwA="; + rev = "c7d83937710889591bad3525077afc30a21e5148"; + hash = "sha256-bEHyiJusddBuTk7MZX1NGvkj66WeOJv5qxBQV6Uhs1E="; }; }; @@ -48,13 +48,13 @@ singeli = { pname = "singeli"; - version = "0-unstable-2024-02-26"; + version = "0-unstable-2024-09-29"; src = fetchFromGitHub { owner = "mlochbaum"; repo = "Singeli"; - rev = "ce6ef5d06d35777f0016bbfe0c6c1cf6a9c1b48e"; - hash = "sha256-dDoWoq4LYMD2CKyPxXDAwoeH2E+f0FDyvngtWPEr67w="; + rev = "b43f3999b0c5a40b43ceee258fbe6bb8245d06af"; + hash = "sha256-tf5mYIV368Y2cgYJ0U4OZQxuN6kldHUKi9oSjAHbA4Y="; }; }; } diff --git a/pkgs/development/interpreters/bwbasic/default.nix b/pkgs/development/interpreters/bwbasic/default.nix deleted file mode 100644 index 7265a5165d9e..000000000000 --- a/pkgs/development/interpreters/bwbasic/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - gccStdenv, - dos2unix, - fetchurl, - unzip, -}: - -gccStdenv.mkDerivation (finalAttrs: { - pname = "bwbasic"; - version = "3.20"; - - src = fetchurl { - url = "mirror://sourceforge/project/bwbasic/bwbasic/version%20${finalAttrs.version}/bwbasic-${finalAttrs.version}.zip"; - hash = "sha256-7hju+rftka0a1QzKsz6wOMSr11NZXhmYKJCGfygjOfE="; - }; - - nativeBuildInputs = [ - dos2unix - unzip - ]; - - unpackPhase = '' - unzip $src - ''; - - postPatch = '' - dos2unix configure - patchShebangs configure - chmod +x configure - ''; - - hardeningDisable = [ "format" ]; - - preInstall = '' - mkdir -p $out/bin - ''; - - meta = { - description = "Bywater BASIC Interpreter"; - mainProgram = "bwbasic"; - license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ irenes ]; - platforms = lib.platforms.all; - homepage = "https://sourceforge.net/projects/bwbasic/"; - }; -}) diff --git a/pkgs/development/interpreters/cel-go/default.nix b/pkgs/development/interpreters/cel-go/default.nix deleted file mode 100644 index 3da3e1be2d62..000000000000 --- a/pkgs/development/interpreters/cel-go/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "cel-go"; - version = "0.21.0"; - - src = fetchFromGitHub { - owner = "google"; - repo = "cel-go"; - rev = "v${version}"; - hash = "sha256-t451e3Pkkt4pmBvS0DBSHOVg7P8ipJd28XyiQ6P/QIQ="; - }; - - modRoot = "repl"; - - vendorHash = "sha256-t/GEbpnqpLQ79ETqS9TAgy+2z9FoifAmkHbfKUxDBZA="; - - subPackages = [ - "main" - ]; - - ldflags = [ "-s" "-w" ]; - - postInstall = '' - mv $out/bin/{main,cel-go} - ''; - - meta = with lib; { - description = "Fast, portable, non-Turing complete expression evaluation with gradual typing"; - mainProgram = "cel-go"; - homepage = "https://github.com/google/cel-go"; - changelog = "https://github.com/google/cel-go/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix deleted file mode 100644 index f73631ff8d3b..000000000000 --- a/pkgs/development/interpreters/ceptre/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, mlton }: - -stdenv.mkDerivation { - pname = "ceptre"; - version = "unstable-2016-11-27"; - - src = fetchFromGitHub { - owner = "chrisamaphone"; - repo = "interactive-lp"; - rev = "e436fda2ccd44e9c9d226feced9d204311deacf5"; - hash = "sha256-COYrE9O/Y1/ZBNHNakBwrUVklCuk144RF9bjwa3rl5w="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ mlton ]; - - installPhase = '' - mkdir -p $out/bin - cp ceptre $out/bin - ''; - - meta = with lib; { - description = "Linear logic programming language for modeling generative interactive systems"; - mainProgram = "ceptre"; - homepage = "https://github.com/chrisamaphone/interactive-lp"; - maintainers = with maintainers; [ pSub ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/interpreters/cg3/default.nix b/pkgs/development/interpreters/cg3/default.nix deleted file mode 100644 index 8aa0d412c1cf..000000000000 --- a/pkgs/development/interpreters/cg3/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, runCommand -, dieHook -, cmake -, icu -, boost -}: - -let cg3 = stdenv.mkDerivation rec { - pname = "cg3"; - version = "1.3.9"; - - src = fetchFromGitHub { - owner = "GrammarSoft"; - repo = "${pname}"; - rev = "v${version}"; - sha256 = "sha256-TiEhhk90w5GibGZ4yalIf+4qLA8NoU6+GIPN6QNTz2A="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - icu - boost - ]; - - doCheck = true; - - postFixup = '' - substituteInPlace "$out"/lib/pkgconfig/cg3.pc \ - --replace '=''${prefix}//' '=/' - ''; - - passthru.tests.minimal = runCommand "${pname}-test" { - buildInputs = [ - cg3 - dieHook - ]; - } '' - echo 'DELIMITERS = "."; ADD (tag) (*);' >grammar.cg3 - printf '"<a>"\n\t"a" tag\n\n' >want.txt - printf '"<a>"\n\t"a"\n\n' | vislcg3 -g grammar.cg3 >got.txt - diff -s want.txt got.txt || die "Grammar application did not produce expected parse" - touch $out - ''; - - - # TODO, consider optionals: - # - Enable tcmalloc unless darwin? - # - Enable python bindings? - - meta = with lib; { - homepage = "https://github.com/GrammarSoft/cg3"; - description = "Constraint Grammar interpreter, compiler and applicator vislcg3"; - maintainers = with maintainers; [ unhammer ]; - license = licenses.gpl3Plus; - platforms = platforms.all; - }; -}; - -in - cg3 diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix deleted file mode 100644 index b220ed834029..000000000000 --- a/pkgs/development/interpreters/chibi/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper }: - -stdenv.mkDerivation rec { - version = "0.11"; - pname = "chibi-scheme"; - - src = fetchFromGitHub { - owner = "ashinn"; - repo = "chibi-scheme"; - rev = version; - sha256 = "sha256-i+xiaYwM7a+0T824VSuh7UUNI6HV9KpqzQPE1WAZ+As="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - make install PREFIX="$out" - ''; - - fixupPhase = '' - wrapProgram "$out/bin/chibi-scheme" \ - --prefix CHIBI_MODULE_PATH : "$out/share/chibi:$out/lib/chibi" \ - ${lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib"} - - for f in chibi-doc chibi-ffi snow-chibi; do - substituteInPlace "$out/bin/$f" \ - --replace "/usr/bin/env chibi-scheme" "$out/bin/chibi-scheme" - done - ''; - - meta = { - homepage = "https://github.com/ashinn/chibi-scheme"; - description = "Small Footprint Scheme for use as a C Extension Language"; - platforms = lib.platforms.all; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.DerGuteMoritz ]; - }; -} diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix deleted file mode 100644 index f1cbd213b871..000000000000 --- a/pkgs/development/interpreters/cling/default.nix +++ /dev/null @@ -1,194 +0,0 @@ -{ cmake -, fetchFromGitHub -, git -, lib -, libffi -, llvmPackages_13 -, makeWrapper -, ncurses -, python3 -, zlib - -# *NOT* from LLVM 9! -# The compiler used to compile Cling may affect the runtime include and lib -# directories it expects to be run with. Cling builds against (a fork of) Clang, -# so we prefer to use Clang as the compiler as well for consistency. -# It would be cleanest to use LLVM 9's clang, but it errors. So, we use a later -# version of Clang to compile, but we check out the Cling fork of Clang 9 to -# build Cling against. -, clangStdenv - -# For runtime C++ standard library -, gcc-unwrapped - -# Build with debug symbols -, debug ? false - -# Build with libc++ (LLVM) rather than stdlibc++ (GCC). -# This is experimental and not all features work. -, useLLVMLibcxx ? clangStdenv.isDarwin -}: - -let - stdenv = clangStdenv; - - # The patched clang lives in the LLVM megarepo - clangSrc = fetchFromGitHub { - owner = "root-project"; - repo = "llvm-project"; - # cling-llvm13 branch - rev = "3610201fbe0352a63efb5cb45f4ea4987702c735"; - sha256 = "sha256-Cb7BvV7yobG+mkaYe7zD2KcnPvm8/vmVATNWssklXyk="; - sparseCheckout = ["clang"]; - }; - - unwrapped = stdenv.mkDerivation rec { - pname = "cling-unwrapped"; - version = "1.0"; - - src = "${clangSrc}/clang"; - - clingSrc = fetchFromGitHub { - owner = "root-project"; - repo = "cling"; - rev = "v${version}"; - sha256 = "sha256-Ye8EINzt+dyNvUIRydACXzb/xEPLm0YSkz08Xxw3xp4="; - }; - - prePatch = '' - echo "add_llvm_external_project(cling)" >> tools/CMakeLists.txt - - cp -r $clingSrc tools/cling - chmod -R a+w tools/cling - ''; - - patches = [ - ./no-clang-cpp.patch - ]; - - nativeBuildInputs = [ python3 git cmake ]; - buildInputs = [ libffi ncurses zlib ]; - - strictDeps = true; - - cmakeFlags = [ - "-DLLVM_BINARY_DIR=${llvmPackages_13.llvm.out}" - "-DLLVM_CONFIG=${llvmPackages_13.llvm.dev}/bin/llvm-config" - "-DLLVM_LIBRARY_DIR=${llvmPackages_13.llvm.lib}/lib" - "-DLLVM_MAIN_INCLUDE_DIR=${llvmPackages_13.llvm.dev}/include" - "-DLLVM_TABLEGEN_EXE=${llvmPackages_13.llvm.out}/bin/llvm-tblgen" - "-DLLVM_TOOLS_BINARY_DIR=${llvmPackages_13.llvm.out}/bin" - "-DLLVM_BUILD_TOOLS=Off" - "-DLLVM_TOOL_CLING_BUILD=ON" - - "-DLLVM_TARGETS_TO_BUILD=host;NVPTX" - "-DLLVM_ENABLE_RTTI=ON" - - # Setting -DCLING_INCLUDE_TESTS=ON causes the cling/tools targets to be built; - # see cling/tools/CMakeLists.txt - "-DCLING_INCLUDE_TESTS=ON" - "-DCLANG-TOOLS=OFF" - ] ++ lib.optionals debug [ - "-DCMAKE_BUILD_TYPE=Debug" - ] ++ lib.optionals useLLVMLibcxx [ - "-DLLVM_ENABLE_LIBCXX=ON" - "-DLLVM_ENABLE_LIBCXXABI=ON" - ]; - - CPPFLAGS = if useLLVMLibcxx then [ "-stdlib=libc++" ] else []; - - postInstall = lib.optionalString (!stdenv.isDarwin) '' - mkdir -p $out/share/Jupyter - cp -r /build/clang/tools/cling/tools/Jupyter/kernel $out/share/Jupyter - ''; - - dontStrip = debug; - - meta = with lib; { - description = "Interactive C++ Interpreter"; - mainProgram = "cling"; - homepage = "https://root.cern/cling/"; - license = with licenses; [ lgpl21 ncsa ]; - maintainers = with maintainers; [ thomasjm ]; - platforms = platforms.unix; - }; - }; - - # Runtime flags for the C++ standard library - cxxFlags = if useLLVMLibcxx then [ - "-I" "${lib.getDev llvmPackages_13.libcxx}/include/c++/v1" - "-L" "${llvmPackages_13.libcxx}/lib" - "-l" "${llvmPackages_13.libcxx}/lib/libc++${stdenv.hostPlatform.extensions.sharedLibrary}" - ] else [ - "-I" "${gcc-unwrapped}/include/c++/${gcc-unwrapped.version}" - "-I" "${gcc-unwrapped}/include/c++/${gcc-unwrapped.version}/${stdenv.hostPlatform.config}" - ]; - - # The flags passed to the wrapped cling should - # a) prevent it from searching for system include files and libs, and - # b) provide it with the include files and libs it needs (C and C++ standard library plus - # its own stuff) - - # These are also exposed as cling.flags because it's handy to be able to pass them to tools - # that wrap Cling, particularly Jupyter kernels such as xeus-cling and the built-in - # jupyter-cling-kernel, which use Cling as a library. - # Thus, if you're packaging a Jupyter kernel, you either need to pass these flags as extra - # args to xcpp (for xeus-cling) or put them in the environment variable CLING_OPTS - # (for jupyter-cling-kernel). - flags = [ - "-nostdinc" - "-nostdinc++" - - "-resource-dir" "${llvmPackages_13.llvm.lib}/lib" - - "-isystem" "${lib.getLib unwrapped}/lib/clang/${llvmPackages_13.clang.version}/include" - ] - ++ cxxFlags - ++ [ - # System libc - "-isystem" "${lib.getDev stdenv.cc.libc}/include" - - # cling includes - "-isystem" "${lib.getDev unwrapped}/include" - ]; - -in - -stdenv.mkDerivation { - pname = "cling"; - version = unwrapped.version; - - nativeBuildInputs = [ makeWrapper ]; - inherit unwrapped flags; - inherit (unwrapped) meta; - - dontUnpack = true; - dontConfigure = true; - - buildPhase = '' - runHook preBuild - - makeWrapper $unwrapped/bin/cling $out/bin/cling \ - --add-flags "$flags" - - runHook postBuild - ''; - - doCheck = true; - checkPhase = '' - runHook preCheck - - output=$($out/bin/cling <<EOF - #include <iostream> - std::cout << "hello world" << std::endl - EOF - ) - - echo "$output" | grep -q "Type C++ code and press enter to run it" - echo "$output" | grep -q "hello world" - - runHook postCheck - ''; - - dontInstall = true; -} diff --git a/pkgs/development/interpreters/cling/no-clang-cpp.patch b/pkgs/development/interpreters/cling/no-clang-cpp.patch deleted file mode 100644 index 6048037cee84..000000000000 --- a/pkgs/development/interpreters/cling/no-clang-cpp.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt -index 590d708d83..340ae529d4 100644 ---- a/tools/driver/CMakeLists.txt -+++ b/tools/driver/CMakeLists.txt -@@ -63,7 +63,7 @@ endif() - add_dependencies(clang clang-resource-headers) - - if(NOT CLANG_LINKS_TO_CREATE) -- set(CLANG_LINKS_TO_CREATE clang++ clang-cl clang-cpp) -+ set(CLANG_LINKS_TO_CREATE clang++ clang-cl) - endif() - - foreach(link ${CLANG_LINKS_TO_CREATE}) diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix deleted file mode 100644 index c5c4d4321ce1..000000000000 --- a/pkgs/development/interpreters/clips/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - version = "6.4.1"; - pname = "clips"; - - src = fetchurl { - url = "mirror://sourceforge/clipsrules/CLIPS/${version}/clips_core_source_${ - builtins.replaceStrings [ "." ] [ "" ] version - }.tar.gz"; - hash = "sha256-qk87uLFZZL9HNPNlyVh+Mplr3dP1C/z1O5UVS+rnbuM="; - }; - - postPatch = '' - substituteInPlace core/makefile --replace 'gcc' '${stdenv.cc.targetPrefix}cc' - ''; - - makeFlags = [ "-C" "core" ]; - - installPhase = '' - runHook preInstall - install -D -t $out/bin core/clips - install -D -t $out/lib core/libclips.a - install -D -t $out/include core/*.h - runHook postInstall - ''; - - meta = with lib; { - description = "Tool for Building Expert Systems"; - mainProgram = "clips"; - homepage = "http://www.clipsrules.net/"; - longDescription = '' - Developed at NASA's Johnson Space Center from 1985 to 1996, - CLIPS is a rule-based programming language useful for creating - expert systems and other programs where a heuristic solution is - easier to implement and maintain than an algorithmic solution. - ''; - license = licenses.publicDomain; - maintainers = [ maintainers.league ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index f6218ef8f3b2..c0f0e2c5c2f8 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -33,7 +33,7 @@ "pcre" "rawsock" ] - ++ lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ "bindings/glibc" "zlib" ] ++ lib.optional x11Support "clx/new-clx" }: @@ -41,7 +41,7 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null && libXpm != null && xorgproto != null && libXext != null); let - ffcallAvailable = stdenv.isLinux && (libffcall != null); + ffcallAvailable = stdenv.hostPlatform.isLinux && (libffcall != null); # Some modules need autoreconf called in their directory. shouldReconfModule = name: name != "asdf"; in @@ -85,7 +85,7 @@ stdenv.mkDerivation { find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i ''; - preConfigure = lib.optionalString stdenv.isDarwin ('' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ('' ( cd src autoreconf -f -i -I m4 -I glm4 @@ -121,7 +121,7 @@ stdenv.mkDerivation { (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full'' + lib.concatMapStrings (x: " " + x) withModules); - env.NIX_CFLAGS_COMPILE = "-O0 -falign-functions=${if stdenv.is64bit then "8" else "4"}"; + env.NIX_CFLAGS_COMPILE = "-O0 -falign-functions=${if stdenv.hostPlatform.is64bit then "8" else "4"}"; meta = { description = "ANSI Common Lisp Implementation"; diff --git a/pkgs/development/interpreters/cyber/default.nix b/pkgs/development/interpreters/cyber/default.nix deleted file mode 100644 index 2ef863de5dfa..000000000000 --- a/pkgs/development/interpreters/cyber/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, zig_0_11 -}: - -stdenv.mkDerivation rec { - pname = "cyber"; - version = "unstable-2023-09-19"; - - src = fetchFromGitHub { - owner = "fubark"; - repo = "cyber"; - rev = "f95cd189cf090d26542a87b1d2ced461e75fa1a7"; - hash = "sha256-ctEd8doXMKq3L9/T+jOcWqlBQN0pVhsu9DjBXsg/u/4="; - }; - - nativeBuildInputs = [ - zig_0_11.hook - ]; - - zigBuildFlags = [ - "cli" - ]; - - env = { - COMMIT = lib.substring 0 7 src.rev; - }; - - meta = with lib; { - description = "Fast, efficient, and concurrent scripting language"; - mainProgram = "cyber"; - homepage = "https://github.com/fubark/cyber"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - inherit (zig_0_11.meta) platforms; - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/development/interpreters/cyclone/default.nix b/pkgs/development/interpreters/cyclone/default.nix deleted file mode 100644 index 643ee3a63216..000000000000 --- a/pkgs/development/interpreters/cyclone/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libck, cctools }: - -let - version = "0.34.0"; - bootstrap = stdenv.mkDerivation { - pname = "cyclone-bootstrap"; - inherit version; - - src = fetchFromGitHub { - owner = "justinethier"; - repo = "cyclone-bootstrap"; - rev = "v${version}"; - sha256 = "sha256-kJBPb0Ej32HveY/vdGpH2gyxSwq8Xq7muneFIw3Y7hM="; - }; - - enableParallelBuilding = true; - - nativeBuildInputs = lib.optionals stdenv.isDarwin [ cctools ]; - - buildInputs = [ libck ]; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - }; -in -stdenv.mkDerivation { - pname = "cyclone"; - inherit version; - - src = fetchFromGitHub { - owner = "justinethier"; - repo = "cyclone"; - rev = "v${version}"; - sha256 = "sha256-4U/uOTbFpPTC9BmO6Wkhy4PY8UCFVt5eHSGqrOlKT/U="; - }; - - enableParallelBuilding = true; - - nativeBuildInputs = [ bootstrap ] - ++ lib.optionals stdenv.isDarwin [ cctools ]; - - buildInputs = [ libck ]; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - meta = with lib; { - homepage = "https://justinethier.github.io/cyclone/"; - description = "Brand-new compiler that allows practical application development using R7RS Scheme"; - license = licenses.mit; - maintainers = with maintainers; [ siraben ]; - }; -} diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix deleted file mode 100644 index 8e33a5013ff5..000000000000 --- a/pkgs/development/interpreters/duktape/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchurl, fixDarwinDylibNames, validatePkgConfig }: - -stdenv.mkDerivation (finalAttrs: { - pname = "duktape"; - version = "2.7.0"; - src = fetchurl { - url = "http://duktape.org/duktape-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-kPjS+otVZ8aJmDDd7ywD88J5YLEayiIvoXqnrGE8KJA="; - }; - - # https://github.com/svaarala/duktape/issues/2464 - LDFLAGS = [ "-lm" ]; - - nativeBuildInputs = [ validatePkgConfig ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; - - buildPhase = '' - make -f Makefile.sharedlibrary - make -f Makefile.cmdline - ''; - - installPhase = '' - install -d $out/bin - install -m755 duk $out/bin/ - install -d $out/lib/pkgconfig - install -d $out/include - make -f Makefile.sharedlibrary install INSTALL_PREFIX=$out - substituteAll ${./duktape.pc.in} $out/lib/pkgconfig/duktape.pc - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Embeddable Javascript engine, with a focus on portability and compact footprint"; - homepage = "https://duktape.org/"; - downloadPage = "https://duktape.org/download.html"; - license = licenses.mit; - maintainers = [ maintainers.fgaz ]; - mainProgram = "duk"; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/interpreters/duktape/duktape.pc.in b/pkgs/development/interpreters/duktape/duktape.pc.in deleted file mode 100644 index d34edb320e2e..000000000000 --- a/pkgs/development/interpreters/duktape/duktape.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@out@ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: duktape -Description: An embeddable Javascript engine, with a focus on portability and compact footprint -Version: @version@ -Libs: -L${libdir} -lduktape -Cflags: -I${includedir} diff --git a/pkgs/development/interpreters/dzaima-apl/default.nix b/pkgs/development/interpreters/dzaima-apl/default.nix index 75e49ed602df..a607fb0fefe4 100644 --- a/pkgs/development/interpreters/dzaima-apl/default.nix +++ b/pkgs/development/interpreters/dzaima-apl/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; inherit (jdk.meta) platforms; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dapl-native.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dapl-native.x86_64-darwin }; } # TODO: Processing app diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix deleted file mode 100644 index 998efe0c790e..000000000000 --- a/pkgs/development/interpreters/eff/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, fetchFromGitHub, ocamlPackages }: - -let - inherit (ocamlPackages) buildDunePackage js_of_ocaml menhir; -in - -buildDunePackage rec { - pname = "eff"; - version = "5.1"; - - src = fetchFromGitHub { - owner = "matijapretnar"; - repo = "eff"; - rev = "v${version}"; - hash = "sha256-0U61y41CA0YaoNk9Hsj7j6eb2V6Ku3MAjW9lMEimiC0="; - }; - - nativeBuildInputs = [ menhir ]; - - buildInputs = [ js_of_ocaml ]; - - doCheck = true; - - meta = with lib; { - homepage = "https://www.eff-lang.org"; - description = "Functional programming language based on algebraic effects and their handlers"; - mainProgram = "eff"; - longDescription = '' - Eff is a functional language with handlers of not only exceptions, - but also of other computational effects such as state or I/O. With - handlers, you can simply implement transactions, redirections, - backtracking, multi-threading, and much more... - ''; - license = licenses.bsd2; - maintainers = [ maintainers.jirkamarsik ]; - }; -} diff --git a/pkgs/development/interpreters/erlang/25.nix b/pkgs/development/interpreters/erlang/25.nix index 2a5f82d6b8f3..d1c6e0aff3c9 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.13"; - sha256 = "sha256-ZBk6oOT0vFY66ttyn4G2zy7Ur5bDKkxPzlTsZPaiosc="; + version = "25.3.2.15"; + sha256 = "sha256-y1QZZ+W5jkAygTRtXVu6FyG4I98SGXXourDfPPlEfg8="; } diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix index f5fa3522c3ed..e7c256d1de78 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.1"; - sha256 = "sha256-oxOynBFW++igiJtIv1ZjoMgtmumgnsWgwyVx4buhxCo="; + version = "26.2.5.4"; + sha256 = "sha256-fvpSvsr7wWgFKa8vODVz4RUn8JKe8NuT9sjvau38B+Y="; } diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix index bf392920d555..91845a1bc28a 100644 --- a/pkgs/development/interpreters/erlang/27.nix +++ b/pkgs/development/interpreters/erlang/27.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "27.0.1"; - sha256 = "sha256-Lp6J9eq6RXDi0RRjeVO/CIa4h/m7/fwOp/y0u0sTdFQ="; + version = "27.1.2"; + sha256 = "sha256-urHJMPo9XG+sIBuCaWvEhAcykGxlVSdKKem7vCiMjcg="; } diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index b5502a036247..2b363d4a06e6 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -74,7 +74,7 @@ , meta ? { } }: -assert wxSupport -> (if stdenv.isDarwin +assert wxSupport -> (if stdenv.hostPlatform.isDarwin then wxGTK != null else libGL != null && libGLU != null && wxGTK != null && xorg != null); @@ -84,7 +84,7 @@ assert ex_docSupport -> ex_doc != null; let inherit (lib) optional optionals optionalAttrs optionalString; - wxPackages2 = if stdenv.isDarwin then [ wxGTK ] else wxPackages; + wxPackages2 = if stdenv.hostPlatform.isDarwin then [ wxGTK ] else wxPackages; in stdenv.mkDerivation ({ @@ -98,6 +98,8 @@ stdenv.mkDerivation ({ inherit src version; + LANG = "C.UTF-8"; + nativeBuildInputs = [ autoconf makeWrapper perl gnum4 libxslt libxml2 ]; buildInputs = [ ncurses opensslPackage ] @@ -105,7 +107,7 @@ stdenv.mkDerivation ({ ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages ++ optional systemdSupport systemd - ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ AGL Carbon Cocoa WebKit ]); + ++ optionals stdenv.hostPlatform.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ AGL Carbon Cocoa WebKit ]); debugInfo = enableDebugInfo; @@ -148,9 +150,9 @@ stdenv.mkDerivation ({ ++ optional odbcSupport "--with-odbc=${unixODBC}" ++ optional wxSupport "--enable-wx" ++ optional systemdSupport "--enable-systemd" - ++ optional stdenv.isDarwin "--enable-darwin-64bit" + ++ optional stdenv.hostPlatform.isDarwin "--enable-darwin-64bit" # make[3]: *** [yecc.beam] Segmentation fault: 11 - ++ optional (stdenv.isDarwin && stdenv.isx86_64) "--disable-jit" + ++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "--disable-jit" ++ configureFlags; # install-docs will generate and install manpages and html docs diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 6d64e76b816c..a95e45fc6536 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; nativeBuildInputs = [ pkg-config makeWrapper cmake ]; - buildInputs = lib.optionals stdenv.isDarwin + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreServices Security ]; checkFlags = [ diff --git a/pkgs/development/interpreters/expr/default.nix b/pkgs/development/interpreters/expr/default.nix deleted file mode 100644 index 33dce18738e9..000000000000 --- a/pkgs/development/interpreters/expr/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "expr"; - version = "1.16.9"; - - src = fetchFromGitHub { - owner = "antonmedv"; - repo = "expr"; - rev = "v${version}"; - hash = "sha256-AyFL+XHxitueAadx1M/xWqeittDCQ/hzsE/fUzt75yI="; - }; - - sourceRoot = "${src.name}/repl"; - - vendorHash = "sha256-FiXxplt4w7M0cZz46kdjYuKHailW2cnLOj0jkA9w1RM="; - - ldflags = [ "-s" "-w" ]; - - postInstall = '' - mv $out/bin/{repl,expr} - ''; - - meta = with lib; { - description = "Expression language and expression evaluation for Go"; - homepage = "https://github.com/antonmedv/expr"; - changelog = "https://github.com/antonmedv/expr/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "expr"; - }; -} diff --git a/pkgs/development/interpreters/femtolisp/default.nix b/pkgs/development/interpreters/femtolisp/default.nix deleted file mode 100644 index 7bf0ea7c7540..000000000000 --- a/pkgs/development/interpreters/femtolisp/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchFromSourcehut -, unstableGitUpdater -}: - -stdenv.mkDerivation { - pname = "femtolisp"; - version = "0-unstable-2024-06-18"; - - src = fetchFromSourcehut { - owner = "~ft"; - repo = "femtolisp"; - rev = "ee58f398fec62d3096b0e01da51a3969ed37a32d"; - hash = "sha256-pfPD9TNLmrqhvJS/aVVmziMVApsiU5v1nAMqU+Kduzw="; - }; - - strictDeps = true; - - enableParallelBuilding = true; - - installPhase = '' - runHook preInstall - - install -Dm755 -t $out/bin/ flisp - - runHook postInstall - ''; - - passthru.updateScript = unstableGitUpdater { }; - - meta = { - description = "Compact interpreter for a minimal lisp/scheme dialect"; - homepage = "https://git.sr.ht/~ft/femtolisp"; - license = with lib.licenses; [ mit bsd3 ]; - maintainers = with lib.maintainers; [ moody ]; - broken = stdenv.isDarwin; - platforms = lib.platforms.unix; - mainProgram = "flisp"; - }; -} diff --git a/pkgs/development/interpreters/gauche/boot.nix b/pkgs/development/interpreters/gauche/boot.nix index 497ebba15557..04b69b524067 100644 --- a/pkgs/development/interpreters/gauche/boot.nix +++ b/pkgs/development/interpreters/gauche/boot.nix @@ -10,6 +10,7 @@ zlib, mbedtls, cacert, + darwin, }: stdenv.mkDerivation rec { @@ -28,14 +29,18 @@ stdenv.mkDerivation rec { texinfo ]; - buildInputs = [ - libiconv - gdbm - openssl - zlib - mbedtls - cacert - ]; + buildInputs = + [ + libiconv + gdbm + openssl + zlib + mbedtls + cacert + ] + ++ lib.optionals (stdenv.isDarwin) [ + darwin.apple_sdk_11_0.frameworks.CoreServices + ]; postPatch = '' patchShebangs . diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index 62903de6bb8b..3fb736ff7e38 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { zlib mbedtls cacert - ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; autoreconfPhase = '' ./DIST gen diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix deleted file mode 100644 index 85e86de1d6b2..000000000000 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchurl, readline, gettext, ncurses }: - -stdenv.mkDerivation rec { - pname = "gnu-apl"; - version = "1.9"; - - src = fetchurl { - url = "mirror://gnu/apl/apl-${version}.tar.gz"; - sha256 = "sha256-KRhn8bGTdpOrtXvn2aN2GLA3bj4nCVdIVKe75Suyjrg="; - }; - - buildInputs = [ readline gettext ncurses ]; - - env.NIX_CFLAGS_COMPILE = toString ((lib.optionals stdenv.cc.isGNU [ - # Needed with GCC 8 - "-Wno-error=int-in-bool-context" - "-Wno-error=class-memaccess" - "-Wno-error=restrict" - "-Wno-error=format-truncation" - # Needed with GCC 10 - "-Wno-error=maybe-uninitialized" - # Needed with GCC 11 - "-Wno-error=misleading-indentation" - # Needed with GCC 12 - "-Wno-error=nonnull" - "-Wno-error=stringop-overflow" - "-Wno-error=use-after-free" - ]) ++ lib.optional stdenv.cc.isClang "-Wno-error=null-dereference"); - - patchPhase = lib.optionalString stdenv.isDarwin '' - substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h" - ''; - - postInstall = '' - cp -r support-files/ $out/share/doc/ - find $out/share/doc/support-files -name 'Makefile*' -delete - ''; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "Free interpreter for the APL programming language"; - homepage = "https://www.gnu.org/software/apl/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.kovirobi ]; - platforms = with platforms; linux ++ darwin; - mainProgram = "apl"; - - longDescription = '' - GNU APL is a free interpreter for the programming language APL, with an - (almost) complete implementation of ISO standard 13751 aka. Programming - Language APL, Extended. GNU APL was written and is being maintained by - Jürgen Sauermann. - ''; - }; -} diff --git a/pkgs/development/interpreters/gnudatalanguage/default.nix b/pkgs/development/interpreters/gnudatalanguage/default.nix index 41f15afbee30..d9acb974df88 100644 --- a/pkgs/development/interpreters/gnudatalanguage/default.nix +++ b/pkgs/development/interpreters/gnudatalanguage/default.nix @@ -24,16 +24,16 @@ , libgeotiff , libjpeg # eccodes is broken on darwin -, enableGRIB ? stdenv.isLinux +, enableGRIB ? stdenv.hostPlatform.isLinux , eccodes -, enableGLPK ? stdenv.isLinux +, enableGLPK ? stdenv.hostPlatform.isLinux , glpk # We enable it in hdf4 and use libtirpc as a dependency here from the passthru # of hdf4 -, enableLibtirpc ? stdenv.isLinux +, enableLibtirpc ? stdenv.hostPlatform.isLinux , libtirpc , python3 -, enableMPI ? (stdenv.isLinux || stdenv.isDarwin) +, enableMPI ? (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) # Choose MPICH over OpenMPI because it currently builds on AArch and Darwin , mpi # Unfree optional dependency for hdf4 and hdf5 @@ -57,11 +57,11 @@ , plplot-forced ? null # wxWidgets is preferred over X11 for this project but we only have it on Linux # and Darwin. -, enableWX ? (stdenv.isLinux || stdenv.isDarwin) +, enableWX ? (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) , wxGTK32 , Cocoa # X11: OFF by default for platform consistency. Use X where WX is not available -, enableXWin ? (!stdenv.isLinux && !stdenv.isDarwin) +, enableXWin ? (!stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin) }: let @@ -146,7 +146,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableGRIB eccodes ++ lib.optional enableGLPK glpk ++ lib.optional enableWX wxGTK32 - ++ lib.optional (enableWX && stdenv.isDarwin) Cocoa + ++ lib.optional (enableWX && stdenv.hostPlatform.isDarwin) Cocoa ++ lib.optional enableMPI mpi ++ lib.optional enableLibtirpc hdf4-custom.libtirpc ++ lib.optional enableSzip szip; @@ -172,7 +172,7 @@ stdenv.mkDerivation rec { # Tests are failing on Hydra: # ./src/common/dpycmn.cpp(137): assert ""IsOk()"" failed in GetClientArea(): invalid wxDisplay object - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; # Opt-out unstable tests # https://github.com/gnudatalanguage/gdl/issues/482 diff --git a/pkgs/development/interpreters/gpython/default.nix b/pkgs/development/interpreters/gpython/default.nix deleted file mode 100644 index 731c40a32d17..000000000000 --- a/pkgs/development/interpreters/gpython/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, testers -, gpython -}: - -buildGoModule rec { - pname = "gpython"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "go-python"; - repo = "gpython"; - rev = "v${version}"; - hash = "sha256-xqwq27u41Jgoh7t9UDyatuBQswr+h3xio5AV/npncHc="; - }; - - vendorHash = "sha256-NXPllEhootdB8m5Wvfy8MW899oQnjWAQj7yCC2oDvqE="; - - subPackages = [ - "." - ]; - - ldflags = [ - "-s" - "-w" - "-X=main.version=${version}" - "-X=main.commit=${src.rev}" - "-X=main.date=1970-01-01" - ]; - - passthru.tests = { - version = testers.testVersion { - package = gpython; - command = "gpython < /dev/null"; - }; - }; - - meta = with lib; { - description = "Python interpreter written in Go"; - mainProgram = "gpython"; - homepage = "https://github.com/go-python/gpython"; - changelog = "https://github.com/go-python/gpython/releases/tag/${src.rev}"; - license = licenses.bsd3; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix deleted file mode 100644 index ba597c6e7135..000000000000 --- a/pkgs/development/interpreters/groovy/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - unzip, - which, - makeWrapper, - installShellFiles, - jdk, - copyDesktopItems, - makeDesktopItem, -}: - -# at runtime, need jdk - -stdenv.mkDerivation rec { - pname = "groovy"; - version = "4.0.22"; - - src = fetchurl { - url = "mirror://apache/groovy/${version}/distribution/apache-groovy-binary-${version}.zip"; - sha256 = "sha256-2Ro93+NThx1MJlbT0KBcgovD/zbp1J29vsE9zZjwWHc="; - }; - - nativeBuildInputs = [ - makeWrapper - unzip - installShellFiles - copyDesktopItems - ]; - - desktopItems = [ - (makeDesktopItem { - name = "groovy"; - desktopName = "Groovy Console"; - exec = "groovyConsole"; - icon = "groovy"; - comment = meta.description; - terminal = false; - startupNotify = false; - categories = [ "Development" ]; - }) - ]; - - installPhase = '' - runHook preInstall - - rm bin/*.bat - - mkdir -p $out - mkdir -p $out/share/doc/groovy - - #Install icons - mkdir -p $out/share/icons - mv bin/groovy.ico $out/share/icons/ - - #Install Completion - for p in grape groovy{,doc,c,sh,Console}; do - installShellCompletion --cmd $p --bash bin/''${p}_completion - done - rm bin/*_completion - - mv {bin,conf,grooid,lib} $out - mv {licenses,LICENSE,NOTICE} $out/share/doc/groovy - - sed -i 's#which#${which}/bin/which#g' $out/bin/startGroovy - - for p in grape java2groovy groovy{,doc,c,sh,Console}; do - wrapProgram $out/bin/$p \ - --set JAVA_HOME "${jdk}" \ - --prefix PATH ":" "${jdk}/bin" - done - - runHook postInstall - ''; - - meta = with lib; { - description = "Agile dynamic language for the Java Platform"; - homepage = "http://groovy-lang.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ pSub ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix deleted file mode 100644 index d97c94fbd885..000000000000 --- a/pkgs/development/interpreters/gtk-server/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenv -, fetchurl -, glib -, gtk3 -, libffcall -, pkg-config -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "gtk-server"; - version = "2.4.6"; - - src = fetchurl { - url = "https://www.gtk-server.org/stable/gtk-server-${version}.tar.gz"; - sha256 = "sha256-sFL3y068oXDKgkEUcNnGVsNSPBdI1NzpsqdYJfmOQoA="; - }; - - preConfigure = '' - cd src - ''; - - nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; - buildInputs = [ libffcall glib gtk3 ]; - - configureOptions = [ "--with-gtk3" ]; - - meta = with lib; { - homepage = "http://www.gtk-server.org/"; - description = "gtk-server for interpreted GUI programming"; - license = licenses.gpl2Plus; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index 57ff88025690..510834df4046 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -79,7 +79,7 @@ builder rec { sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v"; })] ++ (lib.optional (coverageAnalysis != null) ./gcov-file-name.patch) - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./filter-mkostemp-darwin.patch (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch"; @@ -92,11 +92,11 @@ builder rec { # don't have "libgcc_s.so.1" on darwin LDFLAGS = lib.optionalString - (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s"; + (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s"; configureFlags = [ "--with-libreadline-prefix" - ] ++ lib.optionals stdenv.isSunOS [ + ] ++ lib.optionals stdenv.hostPlatform.isSunOS [ # Make sure the right <gmp.h> is found, and not the incompatible # /usr/include/mp.h from OpenSolaris. See # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> @@ -159,7 +159,7 @@ builder rec { // -(lib.optionalAttrs (!stdenv.isLinux) { +(lib.optionalAttrs (!stdenv.hostPlatform.isLinux) { # Work around <https://bugs.gnu.org/14201>. SHELL = stdenv.shell; CONFIG_SHELL = stdenv.shell; diff --git a/pkgs/development/interpreters/guile/2.2.nix b/pkgs/development/interpreters/guile/2.2.nix index 9dd102012068..6c75540dae0c 100644 --- a/pkgs/development/interpreters/guile/2.2.nix +++ b/pkgs/development/interpreters/guile/2.2.nix @@ -73,7 +73,7 @@ builder rec { # Read the header of the patch to more info ./eai_system.patch ] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch - ++ lib.optional stdenv.isDarwin + ++ lib.optional stdenv.hostPlatform.isDarwin (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch"; sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207"; @@ -88,7 +88,7 @@ builder rec { configureFlags = [ "--with-libreadline-prefix=${lib.getDev readline}" - ] ++ lib.optionals stdenv.isSunOS [ + ] ++ lib.optionals stdenv.hostPlatform.isSunOS [ # Make sure the right <gmp.h> is found, and not the incompatible # /usr/include/mp.h from OpenSolaris. See # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index f7797a7c8ad2..1eeda97b0f8b 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -49,7 +49,7 @@ builder rec { libtool libunistring readline - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcrypt ]; propagatedBuildInputs = [ @@ -62,7 +62,7 @@ builder rec { # flags, see below. libtool libunistring - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcrypt ]; @@ -75,7 +75,7 @@ builder rec { patches = [ ./eai_system.patch ] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch - ++ lib.optional stdenv.isDarwin + ++ lib.optional stdenv.hostPlatform.isDarwin (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch"; sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207"; @@ -90,7 +90,7 @@ builder rec { configureFlags = [ "--with-libreadline-prefix=${lib.getDev readline}" - ] ++ lib.optionals stdenv.isSunOS [ + ] ++ lib.optionals stdenv.hostPlatform.isSunOS [ # Make sure the right <gmp.h> is found, and not the incompatible # /usr/include/mp.h from OpenSolaris. See # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> @@ -105,7 +105,7 @@ builder rec { ] # At least on x86_64-darwin '-flto' autodetection is not correct: # https://github.com/NixOS/nixpkgs/pull/160051#issuecomment-1046193028 - ++ lib.optional (stdenv.isDarwin) "--disable-lto"; + ++ lib.optional (stdenv.hostPlatform.isDarwin) "--disable-lto"; postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" @@ -129,7 +129,7 @@ builder rec { doInstallCheck = doCheck; # In procedure bytevector-u8-ref: Argument 2 out of range - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; setupHook = ./setup-hook-3.0.sh; diff --git a/pkgs/development/interpreters/hashlink/default.nix b/pkgs/development/interpreters/hashlink/default.nix deleted file mode 100644 index f017e1a43c86..000000000000 --- a/pkgs/development/interpreters/hashlink/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, libGL -, libGLU -, libpng -, libjpeg_turbo -, libuv -, libvorbis -, mbedtls_2 -, openal -, pcre -, SDL2 -, sqlite -, getconf -}: - -stdenv.mkDerivation rec { - pname = "hashlink"; - version = "1.13"; - - src = fetchFromGitHub { - owner = "HaxeFoundation"; - repo = "hashlink"; - rev = version; - sha256 = "lpHW0JWxbLtOBns3By56ZBn47CZsDzwOFBuW9MlERrE="; - }; - - makeFlags = [ "PREFIX=$(out)" ]; - - buildInputs = [ - libGL - libGLU - libjpeg_turbo - libpng - libuv - libvorbis - mbedtls_2 - openal - pcre - SDL2 - sqlite - ]; - - nativeBuildInputs = [ getconf ]; - - # append default installPhase with library install for haxe - postInstall = let - haxelibPath = "$out/lib/haxe/hashlink/${lib.replaceStrings [ "." ] [ "," ] version}"; - in '' - mkdir -p "${haxelibPath}" - echo -n "${version}" > "${haxelibPath}/../.current" - cp -r other/haxelib/* "${haxelibPath}" - ''; - - postFixup = lib.optionalString stdenv.isDarwin '' - install_name_tool -change libhl.dylib $out/lib/libhl.dylib $out/bin/hl - ''; - - meta = with lib; { - description = "Virtual machine for Haxe"; - mainProgram = "hl"; - homepage = "https://hashlink.haxe.org/"; - license = licenses.mit; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ iblech locallycompact logo ]; - }; -} diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/development/interpreters/hugs/default.nix deleted file mode 100644 index d8ee5726ef33..000000000000 --- a/pkgs/development/interpreters/hugs/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchurl, bison }: - -stdenv.mkDerivation rec { - pname = "hugs98"; - version = "2006-09"; - - src = fetchurl { - url = "https://www.haskell.org/hugs/downloads/${version}/hugs98-Sep2006.tar.gz"; - sha256 = "1dj65c39zpy6qqvvrwns2hzj6ipnd4ih655xj7kgyk2nfdvd5x1w"; - }; - - patches = - [ (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/hsbase_inline.patch?h=hugs"; - name = "hsbase_inline.patch"; - sha256 = "1h0sp16d17hlm6gj7zdbgwrjwi2l4q02m8p0wd60dp4gn9i9js0v"; - }) - ]; - - nativeBuildInputs = [ bison ]; - - postUnpack = "find -type f -exec sed -i 's@/bin/cp@cp@' {} +"; - - preConfigure = "unset STRIP"; - - configureFlags = [ - "--enable-char-encoding=utf8" # require that the UTF-8 encoding is always used - "--disable-path-canonicalization" - "--disable-timer" # evaluation timing (for benchmarking Hugs) - "--disable-profiling" # heap profiler - "--disable-stack-dumps" # stack dump on stack overflow - "--enable-large-banner" # multiline startup banner - "--disable-internal-prims" # experimental primitives to access Hugs's innards - "--disable-debug" # include C debugging information (for debugging Hugs) - "--disable-tag" # runtime tag checking (for debugging Hugs) - "--disable-lint" # "lint" flags (for debugging Hugs) - "--disable-only98" # build Hugs to understand Haskell 98 only - "--enable-ffi" - "--enable-pthreads" # build Hugs using POSIX threads C library - ]; - - meta = with lib; { - broken = stdenv.isDarwin; - mainProgram = "hugs"; - homepage = "https://www.haskell.org/hugs"; - description = "Haskell interpreter"; - maintainers = with maintainers; [ joachifm ]; - license = licenses.bsd3; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix deleted file mode 100644 index e5c486ed8de2..000000000000 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, libX11 -, libXt -, withGraphics ? true -}: - -stdenv.mkDerivation rec { - pname = "icon-lang"; - version = "unstable-2020-02-05"; - src = fetchFromGitHub { - owner = "gtownsend"; - repo = "icon"; - rev = "829cff33de4a21546fb269de3ef5acd7b4f0c0c7"; - sha256 = "1lj2f13pbaajcy4v3744bz46rghhw5sv4dwwfnzhsllbj5gnjsv2"; - }; - - buildInputs = lib.optionals withGraphics [ libX11 libXt ]; - - configurePhase = - let - target = if withGraphics then "X-Configure" else "Configure"; - platform = - if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "macintosh" - else if stdenv.isBSD then "bsd" - else if stdenv.isCygwin then "cygwin" - else if stdenv.isSunOS then "solaris" - else throw "unsupported system"; - in - "make ${target} name=${platform}"; - - installPhase = '' - make Install dest=$out - rm $out/README - mkdir -p $out/share/doc - mv $out/doc $out/share/doc/icon - ''; - - meta = with lib; { - description = "Very high level general-purpose programming language"; - 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 deleted file mode 100644 index 0d522055d9ad..000000000000 --- a/pkgs/development/interpreters/io/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, sqlite, gmp, libffi, cairo, - ncurses, freetype, libGLU, libGL, libpng, libtiff, libjpeg, readline, libsndfile, - libxml2, libglut, libsamplerate, pcre, libevent, libedit, yajl, - python3, openssl, glfw, pkg-config, libpthreadstubs, libXdmcp, libmemcached -}: - -stdenv.mkDerivation { - pname = "io"; - version = "2017.09.06"; - src = fetchFromGitHub { - owner = "stevedekorte"; - repo = "io"; - rev = "b8a18fc199758ed09cd2f199a9bc821f6821072a"; - sha256 = "07rg1zrz6i6ghp11cm14w7bbaaa1s8sb0y5i7gr2sds0ijlpq223"; - }; - - patches = [ - (fetchpatch { - name = "check-for-sysctl-h.patch"; - url = "https://github.com/IoLanguage/io/pull/446/commits/9f3e4d87b6d4c1bf583134d55d1cf92d3464c49f.patch"; - sha256 = "9f06073ac17f26c2ef6298143bdd1babe7783c228f9667622aa6c91bb7ec7fa0"; - }) - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - zlib sqlite gmp libffi cairo ncurses freetype - libGLU libGL libpng libtiff libjpeg readline libsndfile libxml2 - libglut libsamplerate pcre libevent libedit yajl - glfw openssl libpthreadstubs libXdmcp - libmemcached python3 - ]; - - preConfigure = '' - # The Addon generation (AsyncRequest and a others checked) seems to have - # trouble with building on Virtual machines. Disabling them until it - # can be fully investigated. - sed -ie \ - "s/add_subdirectory(addons)/#add_subdirectory(addons)/g" \ - CMakeLists.txt - # Bind Libs STATIC to avoid a segfault when relinking - sed -i 's/basekit SHARED/basekit STATIC/' libs/basekit/CMakeLists.txt - sed -i 's/garbagecollector SHARED/garbagecollector STATIC/' libs/garbagecollector/CMakeLists.txt - sed -i 's/coroutine SHARED/coroutine STATIC/' libs/coroutine/CMakeLists.txt - ''; - - doInstallCheck = true; - - installCheckPhase = '' - $out/bin/io - $out/bin/io_static - ''; - - # for gcc5; c11 inline semantics breaks the build - env.NIX_CFLAGS_COMPILE = "-fgnu89-inline"; - - meta = with lib; { - description = "Io programming language"; - homepage = "https://iolanguage.org/"; - license = licenses.bsd3; - - maintainers = with maintainers; [ - raskin - maggesi - ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/interpreters/ivy/default.nix b/pkgs/development/interpreters/ivy/default.nix deleted file mode 100644 index 18fad7b6738c..000000000000 --- a/pkgs/development/interpreters/ivy/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "ivy"; - version = "0.3.4"; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "robpike"; - repo = "ivy"; - hash = "sha256-/Q929ZXv3F6MZ+FdWKfbThNDT3JpvQw7WLGnbmitdOg="; - }; - - vendorHash = null; - - subPackages = [ "." ]; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - homepage = "https://github.com/robpike/ivy"; - description = "ivy, an APL-like calculator"; - mainProgram = "ivy"; - license = licenses.bsd3; - maintainers = with maintainers; [ smasher164 ]; - }; -} diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 34388c8c033b..b171005ca281 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -9,19 +9,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "janet"; - version = "1.35.2"; + version = "1.36.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = "janet"; rev = "v${finalAttrs.version}"; - hash = "sha256-iqexxlBFM4ffxDsOdKMRJs/ufhKV0jvzqgZ3tH9S/k0="; + hash = "sha256-lAasSRQwqkc86jobSejLFGAiaCu+EM+2sc92Kc2KxMs="; }; postPatch = '' substituteInPlace janet.1 \ --replace /usr/local/ $out/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # error: Socket is not connected substituteInPlace meson.build \ --replace "'test/suite-ev.janet'," "" diff --git a/pkgs/development/interpreters/jelly/default.nix b/pkgs/development/interpreters/jelly/default.nix deleted file mode 100644 index 0964e08125f2..000000000000 --- a/pkgs/development/interpreters/jelly/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, python3Packages, fetchFromGitHub }: - -python3Packages.buildPythonApplication { - pname = "jelly"; - version = "0.1.31"; - - src = fetchFromGitHub { - owner = "DennisMitchell"; - repo = "jellylanguage"; - rev = "70c9fd93ab009c05dc396f8cc091f72b212fb188"; - sha256 = "1rpclqagvigp5qhvgnjavvy463f1drshnc1mfxm6z7ygzs0l0yz6"; - }; - - propagatedBuildInputs = [ python3Packages.sympy ]; - - # checks are disabled because jelly has no tests, and the default is to run - # the output binary with no arguments, which exits with status 1 and causes - # the build to fail - doCheck = false; - - meta = with lib; { - description = "Recreational programming language inspired by J"; - mainProgram = "jelly"; - homepage = "https://github.com/DennisMitchell/jellylanguage"; - license = licenses.mit; - maintainers = [ maintainers.tckmn ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix deleted file mode 100644 index 2215fcaa06f3..000000000000 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub - -, asciidoc -, pkg-config -, inetutils -, tcl - -, sqlite -, readline -, SDL -, SDL_gfx -, openssl - -, SDLSupport ? true -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "jimtcl"; - version = "0.82"; - - src = fetchFromGitHub { - owner = "msteveb"; - repo = "jimtcl"; - rev = finalAttrs.version; - sha256 = "sha256-CDjjrxpoTbLESAbCiCjQ8+E/oJP87gDv9SedQOzH3QY="; - }; - - nativeBuildInputs = [ - pkg-config - asciidoc - tcl - ]; - - buildInputs = [ - sqlite - readline - openssl - ] ++ (lib.optionals SDLSupport [ - SDL - SDL_gfx - ]); - - configureFlags = [ - "--shared" - "--with-ext=oo" - "--with-ext=tree" - "--with-ext=binary" - "--with-ext=sqlite3" - "--with-ext=readline" - "--with-ext=json" - "--enable-utf8" - "--ipv6" - ] ++ (lib.optional SDLSupport "--with-ext=sdl"); - - enableParallelBuilding = true; - - doCheck = true; - preCheck = '' - # test exec2-3.2 fails depending on platform or sandboxing (?) - rm tests/exec2.test - # requires internet access - rm tests/ssl.test - # test fails due to timing in some environments - # https://github.com/msteveb/jimtcl/issues/282 - rm tests/timer.test - ''; - - # test posix-1.6 needs the "hostname" command - nativeCheckInputs = [ inetutils ]; - - meta = { - description = "Open source small-footprint implementation of the Tcl programming language"; - homepage = "http://jim.tcl.tk/"; - license = lib.licenses.bsd2; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ dbohdan fgaz ]; - }; -}) diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix deleted file mode 100644 index aa0d2ebe593d..000000000000 --- a/pkgs/development/interpreters/joker/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "joker"; - version = "1.4.0"; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "candid82"; - repo = "joker"; - sha256 = "sha256-Y7FaW3V80mXp3l87srTLyhF45MlNH7QUZ5hrTudPtDU="; - }; - - vendorHash = "sha256-t/28kTJVgVoe7DgGzNgA1sYKoA6oNC46AeJSrW/JetU="; - - doCheck = false; - - preBuild = '' - go generate ./... - ''; - - subPackages = [ "." ]; - - meta = with lib; { - homepage = "https://github.com/candid82/joker"; - description = "Small Clojure interpreter and linter written in Go"; - mainProgram = "joker"; - license = licenses.epl10; - maintainers = with maintainers; [ andrestylianos ]; - }; -} diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix deleted file mode 100644 index 157ad76e6f8a..000000000000 --- a/pkgs/development/interpreters/jython/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre }: - -stdenv.mkDerivation rec { - pname = "jython"; - - version = "2.7.3"; - - src = fetchurl { - url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${version}/jython-standalone-${version}.jar"; - sha256 = "sha256-2n89gpsUi8+oawWdyWTjqFVv7bAhCWyNsH4wxm+qubQ="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - dontUnpack = true; - - installPhase = '' - mkdir -pv $out/bin - cp $src $out/jython.jar - makeWrapper ${jre}/bin/java $out/bin/jython --add-flags "-jar $out/jython.jar" - ''; - - meta = { - description = "Python interpreter written in Java"; - mainProgram = "jython"; - homepage = "https://jython.org/"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.psfl; - platforms = jre.meta.platforms; - }; -} diff --git a/pkgs/development/interpreters/kamilalisp/default.nix b/pkgs/development/interpreters/kamilalisp/default.nix deleted file mode 100644 index 5b4d392d62f7..000000000000 --- a/pkgs/development/interpreters/kamilalisp/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchurl -, jre -, makeWrapper -}: - -stdenv.mkDerivation rec { - pname = "kamilalisp"; - version = "0.3.0.1"; - - src = fetchurl { - url = "https://github.com/kspalaiologos/kamilalisp/releases/download/v${version}/kamilalisp-${version}.jar"; - hash = "sha256-SW0U483eHptkYw+yJV/2cImfK3uEjkl8ma54yeagF6s="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -pv $out/share/java $out/bin - cp ${src} $out/share/java/kamilalisp-${version}.jar - makeWrapper ${jre}/bin/java $out/bin/kamilalisp \ - --add-flags "-jar $out/share/java/kamilalisp-${version}.jar" \ - --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=on' \ - --set _JAVA_AWT_WM_NONREPARENTING 1 - ''; - - meta = { - homepage = "https://github.com/kspalaiologos/kamilalisp"; - description = "Functional, flexible, and concise Lisp"; - mainProgram = "kamilalisp"; - license = lib.licenses.gpl3Plus; - inherit (jre.meta) platforms; - maintainers = with lib.maintainers; [ cafkafk ]; - sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; - }; -} diff --git a/pkgs/development/interpreters/kerf/default.nix b/pkgs/development/interpreters/kerf/default.nix index d019743bfb4d..e11a683082ed 100644 --- a/pkgs/development/interpreters/kerf/default.nix +++ b/pkgs/development/interpreters/kerf/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/src"; buildInputs = [ libedit zlib ncurses ] - ++ lib.optionals stdenv.isDarwin ([ + ++ lib.optionals stdenv.hostPlatform.isDarwin ([ Accelerate - ] ++ lib.optionals stdenv.isx86_64 /* && isDarwin */ [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 /* && isDarwin */ [ CoreGraphics CoreVideo ]); @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "implicit-function-declaration" "gnu-variable-sized-type-not-at-end" "unused-result" - ] ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]); + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-fcommon" ]); patchPhase = '' substituteInPlace ./Makefile \ @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { # aarch64-linux seems hopeless, with over 2,000 warnings # generated? - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix deleted file mode 100644 index 22351510b9f4..000000000000 --- a/pkgs/development/interpreters/kona/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "kona"; - version = "20211225"; - - src = fetchFromGitHub { - owner = "kevinlawler"; - repo = "kona"; - rev = "Win64-${version}"; - sha256 = "sha256-m3a9conyKN0qHSSAG8zAb3kx8ir+7dqgxm1XGjCQcfk="; - }; - - makeFlags = [ "PREFIX=$(out)" ]; - preInstall = ''mkdir -p "$out/bin"''; - - meta = with lib; { - description = "Interpreter of K, APL-like programming language"; - homepage = "https://github.com/kevinlawler/kona/"; - maintainers = with maintainers; [ raskin ]; - mainProgram = "k"; - platforms = platforms.all; - license = licenses.isc; - }; -} diff --git a/pkgs/development/interpreters/lambda-lisp/default.nix b/pkgs/development/interpreters/lambda-lisp/default.nix deleted file mode 100644 index 7140f9521c8a..000000000000 --- a/pkgs/development/interpreters/lambda-lisp/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -# Lambda Lisp has several backends, here we are using -# the blc one. Ideally, this should be made into several -# packages such as lambda-lisp-blc, lambda-lisp-lazyk, -# lambda-lisp-clamb, etc. - -{ lib -, gccStdenv -, fetchFromGitHub -, fetchurl -, runtimeShell -}: - -let - stdenv = gccStdenv; - s = import ./sources.nix { inherit fetchurl fetchFromGitHub; }; -in -stdenv.mkDerivation rec { - pname = "lambda-lisp-blc"; - version = s.lambdaLispVersion; - src = s.src; - flatSrc = s.flatSrc; - blcSrc = s.blcSrc; - - installPhase = '' - runHook preInstall - - mkdir -p ./build - cp $blcSrc ./build/Blc.S - cp $flatSrc ./build/flat.lds - cd build; - cat Blc.S | sed -e 's/#define.*TERMS.*//' > Blc.ext.S; - $CC -c -DTERMS=50000000 -o Blc.o Blc.ext.S - ld.bfd -o Blc Blc.o -T flat.lds - cd ..; - mv build/Blc ./bin - install -D -t $out/bin bin/Blc - install -D -t $out/lib bin/lambdalisp.blc - - cd build; - $CC ../tools/asc2bin.c -O2 -o asc2bin; - cd ..; - mv build/asc2bin ./bin; - chmod 755 ./bin/asc2bin; - install -D -t $out/bin bin/asc2bin - - echo -e "#!${runtimeShell}\n( cat $out/lib/lambdalisp.blc | $out/bin/asc2bin; cat ) | $out/bin/Blc" > lambda-lisp-blc - chmod +x lambda-lisp-blc - - install -D -t $out/bin lambda-lisp-blc - runHook postInstall - ''; - - doInstallCheck = true; - - installCheckPhase = '' - runHook preInstallCheck - - a=$(echo "(* (+ 1 2 3 4 5 6 7 8 9 10) 12020569 (- 2 5))" | $out/bin/lambda-lisp-blc | tr -d "> "); - test $a == -1983393885 - - runHook postInstallCheck - ''; - - meta = with lib; { - description = "Lisp interpreter written in untyped lambda calculus"; - homepage = "https://github.com/woodrush/lambdalisp"; - longDescription = '' - LambdaLisp is a Lisp interpreter written as a closed untyped lambda calculus term. - It is written as a lambda calculus term LambdaLisp = λx. ... which takes a string - x as an input and returns a string as an output. The input x is the Lisp program - and the user's standard input, and the output is the standard output. Characters - are encoded into lambda term representations of natural numbers using the Church - encoding, and strings are encoded as a list of characters with lists expressed as - lambdas in the Mogensen-Scott encoding, so the entire computation process solely - consists of the beta-reduction of lambda terms, without introducing any - non-lambda-type object. - ''; - license = licenses.mit; - maintainers = with maintainers; [ cafkafk ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/interpreters/lambda-lisp/sources.nix b/pkgs/development/interpreters/lambda-lisp/sources.nix deleted file mode 100644 index 8dbda01b4e27..000000000000 --- a/pkgs/development/interpreters/lambda-lisp/sources.nix +++ /dev/null @@ -1,50 +0,0 @@ -let - lambdaLispVersion = "2022-08-18"; - blcVersion = "2"; - # Archive of "https://justine.lol/lambda/"; - justineLolArchive = "https://web.archive.org/web/20230614065521if_/https://justine.lol/lambda/"; -in -{ fetchFromGitHub, fetchurl }: { - inherit blcVersion; - inherit lambdaLispVersion; - - src = fetchFromGitHub { - owner = "woodrush"; - repo = "lambdalisp"; - rev = "2119cffed1ab2005f08ab3cfca92028270f08725"; - hash = "sha256-ml2xQ8s8sux+6GwTw8mID3PEOcH6hn8tyc/UI5tFaO0="; - }; - - uniCSrc = fetchFromGitHub { - owner = "tromp"; - repo = "tromp.github.io"; - rev = "b4de12e566c1fb0fa3f3babe89bac885f4c966a4"; - hash = "sha256-JmbqQp2kkkkkkkkSWQmG3uBxdgyIu4r2Ch8bBGyQ4H4="; - }; - - # needed later - clambSrc = fetchFromGitHub { - owner = "irori"; - repo = "clamb"; - rev = "44c1208697f394e22857195be5ea73bfdd48ebd1"; - hash = "sha256-1lGg2NBoxAKDCSnnPn19r/hwBC5paAKUnlcsUv3dpNY="; - }; - - # needed later - lazykSrc = fetchFromGitHub { - owner = "irori"; - repo = "lazyk"; - rev = "5edb0b834d0af5f7413c484eb3795d47ec2e3894"; - hash = "sha256-1lGg2NBoxAKDCSnnPn19r/hwBC5paAKUnlcsUv3dpNY="; - }; - - blcSrc = fetchurl { - url = "${justineLolArchive}Blc.S?v=${blcVersion}"; - hash = "sha256-qt7vDtn9WvDoBaLESCyyscA0u74914e8ZKhLiUAN52A="; - }; - - flatSrc = fetchurl { - url = "${justineLolArchive}flat.lds"; - hash = "sha256-HxX+10rV86zPv+UtF+n72obtz3DosWLMIab+uskxIjA="; - }; -} diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index 7f1e5ccb7313..30ce00d44e61 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -86,7 +86,7 @@ rec { makeWrapper = makeBinaryWrapper; inherit passthruFun; - patches = lib.optional stdenv.isDarwin ./5.4.darwin.patch; + patches = lib.optional stdenv.hostPlatform.isDarwin ./5.4.darwin.patch; }; lua5_4_compat = lua5_4.override({ @@ -102,7 +102,7 @@ rec { inherit passthruFun; patches = - lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ]; + lib.optionals stdenv.hostPlatform.isDarwin [ ./5.2.darwin.patch ]; }; lua5_3_compat = lua5_3.override({ @@ -119,7 +119,7 @@ rec { inherit passthruFun; patches = [ ./CVE-2022-28805.patch - ] ++ lib.optional stdenv.isDarwin ./5.2.darwin.patch; + ] ++ lib.optional stdenv.hostPlatform.isDarwin ./5.2.darwin.patch; }; lua5_2_compat = lua5_2.override({ @@ -134,7 +134,7 @@ rec { hash = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"; makeWrapper = makeBinaryWrapper; inherit passthruFun; - patches = (lib.optional stdenv.isDarwin ./5.1.darwin.patch) + patches = (lib.optional stdenv.hostPlatform.isDarwin ./5.1.darwin.patch) ++ [ ./CVE-2014-5461.patch ]; }; diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 497307d57b3f..082fa879e2f7 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -25,12 +25,12 @@ stdenv.mkDerivation (finalAttrs: luaversion = lib.versions.majorMinor finalAttrs.version; - plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux" - else if (stdenv.isLinux && lib.versionAtLeast self.luaversion "5.4") then "linux-readline" - else if stdenv.isDarwin then "macosx" + plat = if (stdenv.hostPlatform.isLinux && lib.versionOlder self.luaversion "5.4") then "linux" + else if (stdenv.hostPlatform.isLinux && lib.versionAtLeast self.luaversion "5.4") then "linux-readline" + else if stdenv.hostPlatform.isDarwin then "macosx" else if stdenv.hostPlatform.isMinGW then "mingw" - else if stdenv.isFreeBSD then "freebsd" - else if stdenv.isSunOS then "solaris" + else if stdenv.hostPlatform.isFreeBSD then "freebsd" + else if stdenv.hostPlatform.isSunOS then "solaris" else if stdenv.hostPlatform.isBSD then "bsd" else if stdenv.hostPlatform.isUnix then "posix" else "generic"; @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: # abort if patching didn't work grep $out src/luaconf.h - '' + lib.optionalString (!stdenv.isDarwin && !staticOnly) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin && !staticOnly) '' # Add a target for a shared library to the Makefile. sed -e '1s/^/LUA_SO = liblua.so/' \ -e 's/ALL_T *= */&$(LUA_SO) /' \ @@ -96,10 +96,10 @@ stdenv.mkDerivation (finalAttrs: makeFlagsArray+=(CFLAGS='-O2 -fPIC${lib.optionalString compat compatFlags} $(${ if lib.versionAtLeast luaversion "5.2" then "SYSCFLAGS" else "MYCFLAGS"})' ) - makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.cc.targetPrefix}ar rcu'"}) + makeFlagsArray+=(${lib.optionalString stdenv.hostPlatform.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.cc.targetPrefix}ar rcu'"}) installFlagsArray=( TO_BIN="lua luac" INSTALL_DATA='cp -d' \ - TO_LIB="${if stdenv.isDarwin then "liblua.${finalAttrs.version}.dylib" + TO_LIB="${if stdenv.hostPlatform.isDarwin then "liblua.${finalAttrs.version}.dylib" else ("liblua.a" + lib.optionalString (!staticOnly) " liblua.so liblua.so.${luaversion} liblua.so.${finalAttrs.version}" )}" ) runHook postConfigure @@ -169,6 +169,7 @@ stdenv.mkDerivation (finalAttrs: management with incremental garbage collection, making it ideal for configuration, scripting, and rapid prototyping. ''; + mainProgram = "lua"; license = lib.licenses.mit; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index f5e25b6261bc..22574dd2b389 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -58,7 +58,7 @@ let # TODO support also other build architectures. The ideal way would be to use # stdenv_32bit but that doesn't work due to host platform mismatch: # https://github.com/NixOS/nixpkgs/issues/212494 - buildStdenv = if buildPackages.stdenv.isx86_64 && stdenv.is32bit + buildStdenv = if buildPackages.stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.is32bit then buildPackages.pkgsi686Linux.buildPackages.stdenv else buildPackages.stdenv; diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix deleted file mode 100644 index 3a500745fa55..000000000000 --- a/pkgs/development/interpreters/luau/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gitUpdater, llvmPackages }: - -stdenv.mkDerivation rec { - pname = "luau"; - version = "0.621"; - - src = fetchFromGitHub { - owner = "luau-lang"; - repo = "luau"; - rev = version; - hash = "sha256-bkuYYGYcnMwQDK81ZH+74hA4XaQfVFMWvAKpy+ODCak="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.libunwind ]; - - installPhase = '' - runHook preInstall - - install -Dm755 -t $out/bin luau - install -Dm755 -t $out/bin luau-analyze - install -Dm755 -t $out/bin luau-compile - - runHook postInstall - ''; - - doCheck = true; - - checkPhase = '' - runHook preCheck - - ./Luau.UnitTest - ./Luau.Conformance - - runHook postCheck - ''; - - passthru.updateScript = gitUpdater { }; - - meta = with lib; { - description = "Fast, small, safe, gradually typed embeddable scripting language derived from Lua"; - homepage = "https://luau-lang.org/"; - changelog = "https://github.com/luau-lang/luau/releases/tag/${version}"; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ ]; - mainProgram = "luau"; - }; -} diff --git a/pkgs/development/interpreters/lunatic/default.nix b/pkgs/development/interpreters/lunatic/default.nix deleted file mode 100644 index 4ad07f6a1e33..000000000000 --- a/pkgs/development/interpreters/lunatic/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, openssl -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "lunatic"; - version = "0.13.2"; - - src = fetchFromGitHub { - owner = "lunatic-solutions"; - repo = pname; - rev = "v${version}"; - hash = "sha256-uMMssZaPDZn3bOtQIho+GvUCPmzRllv7eJ+SJuKaYtg="; - }; - - cargoHash = "sha256-ALjlQsxmZVREyi3ZGMJMv/38kkMjYh+hTSr/0avYJVs="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - checkFlags = [ - # requires simd support which is not always available on hydra - "--skip=state::tests::import_filter_signature_matches" - ]; - - meta = with lib; { - description = "Erlang inspired runtime for WebAssembly"; - homepage = "https://lunatic.solutions"; - changelog = "https://github.com/lunatic-solutions/lunatic/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/interpreters/lune/default.nix b/pkgs/development/interpreters/lune/default.nix deleted file mode 100644 index 3d84ac9ba521..000000000000 --- a/pkgs/development/interpreters/lune/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, pkg-config -, darwin -, cmake -}: - -let - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; -in -rustPlatform.buildRustPackage rec { - pname = "lune"; - version = "0.8.8"; - - src = fetchFromGitHub { - owner = "filiptibell"; - repo = "lune"; - rev = "v${version}"; - hash = "sha256-/+a1gJ1rGrmKCcVqLs1YgzE43RpIitYeN2Woo4V+snQ="; - fetchSubmodules = true; - }; - - cargoHash = "sha256-ScM2eAqmBFjiZ3azm0O+YcnxOdCC8mlQrQde4vKMeTQ="; - - nativeBuildInputs = [ - pkg-config - cmake # required for libz-ng-sys - ]; - - buildInputs = lib.optionals stdenv.isDarwin [ - Security - SystemConfiguration - ]; - - # error: linker `aarch64-linux-gnu-gcc` not found - postPatch = '' - rm .cargo/config.toml - ''; - - checkFlags = [ - # require internet access - "--skip=tests::net_socket_basic" - "--skip=tests::net_request_codes" - "--skip=tests::net_request_compression" - "--skip=tests::net_request_methods" - "--skip=tests::net_request_query" - "--skip=tests::net_request_redirect" - "--skip=tests::net_socket_wss" - "--skip=tests::net_socket_wss_rw" - "--skip=tests::roblox_instance_custom_async" - "--skip=tests::serde_json_decode" - - # uses root as the CWD - "--skip=tests::process_spawn_cwd" - ]; - - meta = with lib; { - description = "Standalone Luau script runtime"; - mainProgram = "lune"; - homepage = "https://github.com/lune-org/lune"; - changelog = "https://github.com/lune-org/lune/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ lammermann ]; - # note: Undefined symbols for architecture x86_64 - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix deleted file mode 100644 index f8d4e98c90b2..000000000000 --- a/pkgs/development/interpreters/maude/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, makeWrapper, flex, bison, ncurses, buddy, tecla -, libsigsegv, gmpxx, cln, yices -# passthru.tests -, tamarin-prover -}: - -let - version = "3.3.1"; -in - -stdenv.mkDerivation { - pname = "maude"; - inherit version; - - src = fetchurl { - url = "https://github.com/SRI-CSL/Maude/archive/refs/tags/Maude${version}.tar.gz"; - sha256 = "ueM8qi3fLogWT8bA+ZyBnd9Zr9oOKuoiu2YpG6o5J1E="; - }; - - nativeBuildInputs = [ flex bison unzip makeWrapper ]; - buildInputs = [ - ncurses buddy tecla gmpxx libsigsegv cln yices - ]; - - hardeningDisable = [ "stackprotector" ] ++ - lib.optionals stdenv.isi686 [ "pic" "fortify" ]; - - # Fix for glibc-2.34, see - # https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-lang/maude/maude-3.1-r1.ebuild?id=f021cc6cfa1e35eb9c59955830f1fd89bfcb26b4 - configureFlags = [ "--without-libsigsegv" ]; - - # Certain tests (in particular, Misc/fileTest) expect us to build in a subdirectory - # We'll use the directory Opt/ as suggested in INSTALL - preConfigure = '' - mkdir Opt; cd Opt - configureFlagsArray=( - --datadir="$out/share/maude" - TECLA_LIBS="-ltecla -lncursesw" - LIBS="-lcln" - CFLAGS="-O3" CXXFLAGS="-O3" - ) - ''; - configureScript = "../configure"; - - doCheck = true; - - postInstall = '' - for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done - ''; - - passthru.tests = { - # tamarin-prover only supports specific versions of maude explicitly - inherit tamarin-prover; - }; - - enableParallelBuilding = true; - - meta = { - homepage = "http://maude.cs.illinois.edu/"; - description = "High-level specification language"; - mainProgram = "maude"; - license = lib.licenses.gpl2Plus; - - longDescription = '' - Maude is a high-performance reflective language and system - supporting both equational and rewriting logic specification and - programming for a wide range of applications. Maude has been - influenced in important ways by the OBJ3 language, which can be - regarded as an equational logic sublanguage. Besides supporting - equational specification and programming, Maude also supports - rewriting logic computation. - ''; - - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.peti ]; - }; -} diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix deleted file mode 100644 index 3d36b8501f10..000000000000 --- a/pkgs/development/interpreters/metamath/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "metamath"; - version = "0.198"; - - nativeBuildInputs = [ autoreconfHook ]; - - src = fetchFromGitHub { - owner = "metamath"; - repo = "metamath-exe"; - rev = "v${version}"; - sha256 = "sha256-Cg1dgz+uphDlGhKH3mTywtAccWinC5+pwNv4TB3YAnI="; - }; - - meta = with lib; { - description = "Interpreter for the metamath proof language"; - mainProgram = "metamath"; - longDescription = '' - The metamath program is an ASCII-based ANSI C program with a command-line - interface. It was used (along with mmj2) to build and verify the proofs - in the Metamath Proof Explorer, and it generated its web pages. The *.mm - ASCII databases (set.mm and others) are also included in this derivation. - ''; - homepage = "https://us.metamath.org"; - downloadPage = "https://us.metamath.org/#downloads"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.taneb ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/development/interpreters/micropython/default.nix deleted file mode 100644 index 98ef61f82195..000000000000 --- a/pkgs/development/interpreters/micropython/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, python3 -, libffi -, readline -}: - -stdenv.mkDerivation rec { - pname = "micropython"; - version = "1.23.0"; - - src = fetchFromGitHub { - owner = "micropython"; - repo = "micropython"; - rev = "v${version}"; - hash = "sha256-coUFIepbCRuz+766E7VCTQLm0oWB1CTO20ATriC86dc="; - fetchSubmodules = true; - - # remove unused libaries from rp2 port's SDK. we leave this and the other - # ports around for users who want to override makeFlags flags to build them. - # https://github.com/micropython/micropython/blob/a61c446c0b34e82aeb54b9770250d267656f2b7f/ports/rp2/CMakeLists.txt#L17-L22 - # - # shrinks uncompressed NAR by ~2.4G (though it is still large). there - # doesn't seem to be a way to avoid fetching them in the first place. - postFetch = '' - rm -rf $out/lib/pico-sdk/lib/{tinyusb,lwip,btstack} - ''; - }; - - - nativeBuildInputs = [ pkg-config python3 ]; - - buildInputs = [ libffi readline ]; - - makeFlags = [ "-C" "ports/unix" ]; # also builds mpy-cross - - enableParallelBuilding = true; - - doCheck = true; - - __darwinAllowLocalNetworking = true; # needed for select_poll_eintr test - - skippedTests = " -e select_poll_fd" - + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) " -e ffi_callback -e float_parse -e float_parse_doubleproc" - + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) " -e float_parse" - ; - - checkPhase = '' - runHook preCheck - pushd tests - ${python3.interpreter} ./run-tests.py ${skippedTests} - popd - runHook postCheck - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -Dm755 ports/unix/build-standard/micropython -t $out/bin - install -Dm755 mpy-cross/build/mpy-cross -t $out/bin - runHook postInstall - ''; - - meta = with lib; { - description = "Lean and efficient Python implementation for microcontrollers and constrained systems"; - homepage = "https://micropython.org"; - platforms = platforms.unix; - license = licenses.mit; - maintainers = with maintainers; [ prusnak sgo ]; - }; -} diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix deleted file mode 100644 index 225146b33fe7..000000000000 --- a/pkgs/development/interpreters/mujs/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fixDarwinDylibNames -, readline -, gitUpdater -}: - -stdenv.mkDerivation rec { - pname = "mujs"; - version = "1.3.5"; - - src = fetchurl { - url = "https://mujs.com/downloads/mujs-${version}.tar.gz"; - hash = "sha256-eKMRrkIkQAd0ywnvW6omM8JpcVE/i5MdMiSg64WxPgs="; - }; - - buildInputs = [ readline ]; - - nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; - - makeFlags = [ "prefix=$(out)" ]; - - installFlags = [ "install-shared" ]; - - passthru.updateScript = gitUpdater { - # No nicer place to track releases - url = "git://git.ghostscript.com/mujs.git"; - }; - - meta = with lib; { - homepage = "https://mujs.com/"; - description = "Lightweight, embeddable Javascript interpreter"; - platforms = platforms.unix; - maintainers = with maintainers; [ pSub ]; - license = licenses.isc; - }; -} diff --git a/pkgs/development/interpreters/nelua/default.nix b/pkgs/development/interpreters/nelua/default.nix deleted file mode 100644 index 2022141daf37..000000000000 --- a/pkgs/development/interpreters/nelua/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, luaPackages, unstableGitUpdater }: - -stdenv.mkDerivation rec { - pname = "nelua"; - version = "0-unstable-2024-08-04"; - - src = fetchFromGitHub { - owner = "edubart"; - repo = "nelua-lang"; - rev = "38c2d9ca14c992ddcd73f4067af8c6f37c550979"; - hash = "sha256-mpKGD9YP+D+1ySq+8lyRjXwptWL+uBG/p37bHDBoTJ8="; - }; - - postPatch = '' - substituteInPlace lualib/nelua/version.lua \ - --replace "NELUA_GIT_HASH = nil" "NELUA_GIT_HASH = '${src.rev}'" \ - --replace "NELUA_GIT_DATE = nil" "NELUA_GIT_DATE = '${lib.removePrefix "0-unstable-" version}'" - ''; - - makeFlags = [ "PREFIX=$(out)" ]; - - nativeCheckInputs = [ luaPackages.luacheck ]; - - doCheck = true; - - passthru.updateScript = unstableGitUpdater { - # no releases, only stale "latest" tag - hardcodeZeroVersion = true; - }; - - meta = with lib; { - description = "Minimal, efficient, statically-typed and meta-programmable systems programming language heavily inspired by Lua, which compiles to C and native code"; - homepage = "https://nelua.io/"; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/interpreters/nextflow/default.nix b/pkgs/development/interpreters/nextflow/default.nix deleted file mode 100644 index ed07f175b653..000000000000 --- a/pkgs/development/interpreters/nextflow/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib -, stdenv -, fetchurl -, makeWrapper -, openjdk17 -, wget -, which -, gnused -, gawk -, coreutils -, buildFHSEnv -}: - -let - nextflow = -stdenv.mkDerivation rec { - pname = "nextflow"; - version = "22.10.6"; - - src = fetchurl { - url = "https://github.com/nextflow-io/nextflow/releases/download/v${version}/nextflow-${version}-all"; - hash = "sha256-zeYsKxWRnzr0W6CD+yjoAXwCN/AbN5P4HhH1oftnrjY="; - }; - - nativeBuildInputs = [ - makeWrapper - openjdk17 - wget - which - gnused - gawk - coreutils - ]; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - install -Dm755 $src $out/bin/nextflow - - runHook postInstall - ''; - - postFixup = '' - wrapProgram $out/bin/nextflow \ - --prefix PATH : ${lib.makeBinPath nativeBuildInputs} \ - --set JAVA_HOME ${openjdk17.home} - ''; - - meta = with lib; { - description = "DSL for data-driven computational pipelines"; - longDescription = '' - Nextflow is a bioinformatics workflow manager that enables the development of portable and reproducible workflows. - - It supports deploying workflows on a variety of execution platforms including local, HPC schedulers, AWS Batch, Google Cloud Life Sciences, and Kubernetes. - - Additionally, it provides support for manage your workflow dependencies through built-in support for Conda, Docker, Singularity, and Modules. - ''; - homepage = "https://www.nextflow.io/"; - changelog = "https://github.com/nextflow-io/nextflow/releases"; - license = licenses.asl20; - maintainers = with maintainers; [ Etjean edmundmiller ]; - mainProgram = "nextflow"; - platforms = platforms.unix; - }; -}; -in -if stdenv.isLinux then - buildFHSEnv - { - name = "nextflow"; - targetPkgs = pkgs: [ nextflow ]; - runScript = "nextflow"; - } -else nextflow diff --git a/pkgs/development/interpreters/ngn-k/default.nix b/pkgs/development/interpreters/ngn-k/default.nix deleted file mode 100644 index 76ff50b64b9e..000000000000 --- a/pkgs/development/interpreters/ngn-k/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib -, stdenv -, stdenvNoLibs -, fetchFromGitea -, runtimeShell -, doCheck ? withLibc && stdenv.hostPlatform == stdenv.buildPlatform -, withLibc ? true -}: - -let - # k itself can be compiled with -ffreestanding, but tests require a libc; - # if we want to build k-libc we need a libc obviously - useStdenv = if withLibc || doCheck then stdenv else stdenvNoLibs; -in - -useStdenv.mkDerivation { - pname = "ngn-k"; - version = "unstable-2022-11-28"; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "ngn"; - repo = "k"; - rev = "e5138f182a8ced07dd240e3fe58274130842a85d"; - sha256 = "1pn416znrdndb8iccprzx4zicmsx8c6i9dm3wq5z3jg8nan53p69"; - }; - - patches = [ - ./repl-license-path.patch - ]; - - postPatch = '' - patchShebangs --build a19/a.sh a20/a.sh a21/a.sh dy/a.sh e/a.sh - - # don't use hardcoded /bin/sh - for f in repl.k repl-bg.k m.c;do - substituteInPlace "$f" --replace "/bin/sh" "${runtimeShell}" - done - ''; - - makeFlags = [ "-e" ]; - buildFlags = [ - (if withLibc then "k-libc" else "k") - "libk.so" - ]; - checkTarget = "t"; - inherit doCheck; - - outputs = [ "out" "dev" "lib" ]; - - # TODO(@sternenseemann): package bulgarian translation - installPhase = '' - runHook preInstall - install -Dm755 k "$out/bin/k" - install -Dm755 repl.k "$out/bin/k-repl" - install -Dm755 libk.so "$lib/lib/libk.so" - install -Dm644 k.h "$dev/include/k.h" - install -Dm644 LICENSE -t "$out/share/ngn-k" - substituteInPlace "$out/bin/k-repl" --replace "#!k" "#!$out/bin/k" - runHook postInstall - ''; - - meta = { - description = "Simple fast vector programming language"; - homepage = "https://codeberg.org/ngn/k"; - license = lib.licenses.agpl3Only; - maintainers = [ lib.maintainers.sternenseemann ]; - platforms = [ "x86_64-linux" "x86_64-freebsd" ]; - }; -} diff --git a/pkgs/development/interpreters/ngn-k/repl-license-path.patch b/pkgs/development/interpreters/ngn-k/repl-license-path.patch deleted file mode 100644 index 17b998db187e..000000000000 --- a/pkgs/development/interpreters/ngn-k/repl-license-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/repl.k b/repl.k -index 4c023467..10414162 100755 ---- a/repl.k -+++ b/repl.k -@@ -2,7 +2,7 @@ - `1:"ngn/k, (c) 2019-2022 ngn, GNU AGPLv3. type \\ for more info\n" - \d repl - `1:prompt:," " /use 0x0720 for emacs integration --cmds:(,"a")!{`1:1:joinpath[dirname`argv 0]"LICENSE";} -+cmds:(,"a")!{`1:1:joinpath[dirname`argv 0]"../share/ngn-k/LICENSE";} - dirname:{$[#x:"/"/-1_"/"\x;x;,"."]} - joinpath:{$[x~,".";y;"/"~*|x;x,y;x,"/",y]} - fmt:{$[x~(::);"";(`A~@x)&1<#x;"(",("\n "/`k'x),")\n";`k[x],"\n"]} diff --git a/pkgs/development/interpreters/oak/default.nix b/pkgs/development/interpreters/oak/default.nix deleted file mode 100644 index 3e5d952a1d49..000000000000 --- a/pkgs/development/interpreters/oak/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "oak"; - version = "0.3"; - - src = fetchFromGitHub { - owner = "thesephist"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-DK5n8xK57CQiukyBt9+CFK1j8+nphP//T2jTXq64VH8="; - }; - - vendorHash = "sha256-iQtb3zNa57nB6x4InVPw7FCmW7XPw5yuz0OcfASXPD8="; - - meta = with lib; { - description = "Expressive, simple, dynamic programming language"; - mainProgram = "oak"; - homepage = "https://oaklang.org/"; - license = licenses.mit; - maintainers = with maintainers; [ tejasag ]; - }; -} diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 8bf1c43d1239..72895919383d 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -136,9 +136,9 @@ in stdenv.mkDerivation (finalAttrs: { libsForQt5.qscintilla ] ++ lib.optionals (enableJava) [ jdk - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL libGLU libX11 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Accelerate darwin.apple_sdk.frameworks.Cocoa @@ -153,12 +153,12 @@ in stdenv.mkDerivation (finalAttrs: { libsForQt5.qttools ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; enableParallelBuilding = true; # Fix linker error on Darwin (see https://trac.macports.org/ticket/61865) - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lobjc"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lobjc"; # See https://savannah.gnu.org/bugs/?50339 F77_INTEGER_8_FLAG = lib.optionalString use64BitIdx "-fdefault-integer-8"; @@ -168,9 +168,9 @@ in stdenv.mkDerivation (finalAttrs: { "--with-lapack=lapack" (if use64BitIdx then "--enable-64" else "--disable-64") ] - ++ lib.optionals stdenv.isDarwin [ "--enable-link-all-dependencies" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-link-all-dependencies" ] ++ lib.optionals enableReadline [ "--enable-readline" ] - ++ lib.optionals stdenv.isDarwin [ "--with-x=no" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-x=no" ] ++ lib.optionals enableQt [ "--with-qt=5" ] ; diff --git a/pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh b/pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh index 64e87d68246f..fb808485a36a 100644 --- a/pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh +++ b/pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh @@ -13,5 +13,5 @@ octaveWriteRequiredOctavePackagesPhase() { # Yes its a bit long... if [ -z "${dontWriteRequiredOctavePackagesPhase-}" ]; then echo "Using octaveWriteRequiredOctavePackagesPhase" - preDistPhases+=" octaveWriteRequiredOctavePackagesPhase" + appendToVar preDistPhases octaveWriteRequiredOctavePackagesPhase fi diff --git a/pkgs/development/interpreters/octave/hooks/write-required-octave-packages-hook.sh b/pkgs/development/interpreters/octave/hooks/write-required-octave-packages-hook.sh index 032ea398ac56..6c5de6e4fc4f 100644 --- a/pkgs/development/interpreters/octave/hooks/write-required-octave-packages-hook.sh +++ b/pkgs/development/interpreters/octave/hooks/write-required-octave-packages-hook.sh @@ -13,5 +13,5 @@ writeRequiredOctavePackagesPhase() { # Yes its a bit long... if [ -z "${dontWriteRequiredOctavePackagesPhase-}" ]; then echo "Using writeRequiredOctavePackagesPhase" - preDistPhases+=" writeRequiredOctavePackagesPhase" + appendToVar preDistPhases writeRequiredOctavePackagesPhase fi diff --git a/pkgs/development/interpreters/perl/cross540.patch b/pkgs/development/interpreters/perl/cross540.patch new file mode 100644 index 000000000000..0736c16d4f45 --- /dev/null +++ b/pkgs/development/interpreters/perl/cross540.patch @@ -0,0 +1,224 @@ +From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de> +Date: Mon, 10 Apr 2023 22:12:24 +0200 +Subject: [PATCH] miniperl compatible modules + +CPAN::Meta +ExtUtils::MakeMaker +JSON::PP +Data::Dumper + +Updated for perl v5.40.0 by marcus@means.no + +--- + + # safe if given an unblessed reference +diff --git a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm b/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm +index 746abd63bc..c55d7cd2d0 100644 +--- a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm ++++ b/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm +@@ -1,6 +1,7 @@ + use 5.008001; # sane UTF-8 support + use strict; + use warnings; ++no warnings 'experimental::builtin'; + package CPAN::Meta::YAML; # git description: v1.68-2-gcc5324e + # XXX-INGY is 5.8.1 too old/broken for utf8? + # XXX-XDG Lancaster consensus was that it was sufficient until +@@ -650,27 +651,29 @@ sub _dump_string { + join '', map { "$_\n" } @lines; + } + +-sub _has_internal_string_value { ++# taken from cpan/JSON-PP/lib/JSON/PP.pm ++sub _looks_like_number { + my $value = shift; +- my $b_obj = B::svref_2object(\$value); # for round trip problem +- return $b_obj->FLAGS & B::SVf_POK(); ++ no warnings 'numeric'; ++ # if the utf8 flag is on, it almost certainly started as a string ++ return if utf8::is_utf8($value); ++ # detect numbers ++ # string & "" -> "" ++ # number & "" -> 0 (with warning) ++ # nan and inf can detect as numbers, so check with * 0 ++ return unless length((my $dummy = "") & $value); ++ return unless 0 + $value eq $value; ++ return 1 if $value * 0 == 0; ++ return -1; # inf/nan + } + + sub _dump_scalar { + my $string = $_[1]; + my $is_key = $_[2]; +- # Check this before checking length or it winds up looking like a string! +- my $has_string_flag = _has_internal_string_value($string); + return '~' unless defined $string; + return "''" unless length $string; +- if (Scalar::Util::looks_like_number($string)) { +- # keys and values that have been used as strings get quoted +- if ( $is_key || $has_string_flag ) { +- return qq['$string']; +- } +- else { +- return $string; +- } ++ if (_looks_like_number($string)) { ++ return qq['$string']; + } + if ( $string =~ /[\x00-\x09\x0b-\x0d\x0e-\x1f\x7f-\x9f\'\n]/ ) { + $string =~ s/\\/\\\\/g; +@@ -800,9 +803,6 @@ sub errstr { + # Helper functions. Possibly not needed. + + +-# Use to detect nv or iv +-use B; +- + # XXX-INGY Is flock CPAN::Meta::YAML's responsibility? + # Some platforms can't flock :-( + # XXX-XDG I think it is. When reading and writing files, we ought +@@ -822,35 +822,8 @@ sub _can_flock { + } + } + +- +-# XXX-INGY Is this core in 5.8.1? Can we remove this? +-# XXX-XDG Scalar::Util 1.18 didn't land until 5.8.8, so we need this +-##################################################################### +-# Use Scalar::Util if possible, otherwise emulate it +- +-use Scalar::Util (); + BEGIN { +- local $@; +- if ( eval { Scalar::Util->VERSION(1.18); } ) { +- *refaddr = *Scalar::Util::refaddr; +- } +- else { +- eval <<'END_PERL'; +-# Scalar::Util failed to load or too old +-sub refaddr { +- my $pkg = ref($_[0]) or return undef; +- if ( !! UNIVERSAL::can($_[0], 'can') ) { +- bless $_[0], 'Scalar::Util::Fake'; +- } else { +- $pkg = undef; +- } +- "$_[0]" =~ /0x(\w+)/; +- my $i = do { no warnings 'portable'; hex $1 }; +- bless $_[0], $pkg if defined $pkg; +- $i; +-} +-END_PERL +- } ++ *refaddr = *builtin::refaddr; + } + + delete $CPAN::Meta::YAML::{refaddr}; +diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm +index 3604eae402..991f69d275 100644 +--- a/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm ++++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm +@@ -1,12 +1,13 @@ + use strict; + use warnings; ++no warnings 'experimental::builtin'; + + package CPAN::Meta::Merge; + + our $VERSION = '2.150010'; + + use Carp qw/croak/; +-use Scalar::Util qw/blessed/; ++use builtin qw/blessed/; + use CPAN::Meta::Converter 2.141170; + + sub _is_identical { +diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm +index d4e93fd8a5..809da68d02 100644 +--- a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm ++++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm +@@ -1,6 +1,7 @@ + use 5.006; + use strict; + use warnings; ++no warnings 'experimental::builtin'; + package CPAN::Meta::Prereqs; + + our $VERSION = '2.150010'; +@@ -14,7 +15,6 @@ our $VERSION = '2.150010'; + #pod =cut + + use Carp qw(confess); +-use Scalar::Util qw(blessed); + use CPAN::Meta::Requirements 2.121; + + #pod =method new +@@ -168,7 +168,12 @@ sub types_in { + sub with_merged_prereqs { + my ($self, $other) = @_; + +- my @other = blessed($other) ? $other : @$other; ++ eval 'require Scalar::Util'; ++ my @other = unless($@){ ++ Scalar::Util::blessed($other) ? $other : @$other; ++ }else{ ++ builtin::blessed($other) ? $other : @$other; ++ } + + my @prereq_objs = ($self, @other); + +diff --git a/cpan/JSON-PP/lib/JSON/PP.pm b/cpan/JSON-PP/lib/JSON/PP.pm +index fc8fcbc8f0..cda7b90c65 100644 +--- a/cpan/JSON-PP/lib/JSON/PP.pm ++++ b/cpan/JSON-PP/lib/JSON/PP.pm +@@ -4,6 +4,7 @@ package JSON::PP; + + use 5.008; + use strict; ++no warnings 'experimental::builtin'; + + use Exporter (); + BEGIN { our @ISA = ('Exporter') } +diff --git a/dist/Data-Dumper/Dumper.pm b/dist/Data-Dumper/Dumper.pm +index bb6d3caedb..0c2fde4743 100644 +--- a/dist/Data-Dumper/Dumper.pm ++++ b/dist/Data-Dumper/Dumper.pm +@@ -11,6 +11,7 @@ package Data::Dumper; + + use strict; + use warnings; ++no warnings 'experimental::builtin'; + + #$| = 1; + +@@ -125,8 +126,7 @@ sub new { + # Packed numeric addresses take less memory. Plus pack is faster than sprintf + + sub format_refaddr { +- require Scalar::Util; +- pack "J", Scalar::Util::refaddr(shift); ++ pack "J", builtin::refaddr(shift); + }; + + # +@@ -282,9 +282,8 @@ sub _dump { + warn "WARNING(Freezer method call failed): $@" if $@; + } + +- require Scalar::Util; +- my $realpack = Scalar::Util::blessed($val); +- my $realtype = $realpack ? Scalar::Util::reftype($val) : ref $val; ++ my $realpack = builtin::blessed($val); ++ my $realtype = $realpack ? builtin::reftype($val) : ref $val; + $id = format_refaddr($val); + + # Note: By this point $name is always defined and of non-zero length. +@@ -576,7 +575,7 @@ sub _dump { + # here generates a different result. So there are actually "three" different + # implementations of Data::Dumper (kind of sort of) but we only test two. + elsif (!defined &_vstring +- and ref $ref eq 'VSTRING' || eval{Scalar::Util::isvstring($val)}) { ++ and ref $ref eq 'VSTRING') { + $out .= sprintf "v%vd", $val; + } + # \d here would treat "1\x{660}" as a safe decimal number diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 76a51dc8cb3e..8fd99172be10 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -55,18 +55,18 @@ let in rec { # Maint version - perl536 = callPackage ./interpreter.nix { - self = perl536; - version = "5.36.3"; - sha256 = "sha256-8qGtiBFjkaF2Ji3ULfxS7yKvtA9MDpgQ8V1WHm8ccmo="; - inherit passthruFun; - }; - - # Maint version perl538 = callPackage ./interpreter.nix { self = perl538; version = "5.38.2"; sha256 = "sha256-oKMVNEUet7g8fWWUpJdUOlTUiLyQygD140diV39AZV4="; inherit passthruFun; }; + + # Maint version + perl540 = callPackage ./interpreter.nix { + self = perl540; + version = "5.40.0"; + sha256 = "sha256-x0A0jzVzljJ6l5XT6DI7r9D+ilx4NfwcuroMyN/nFh8="; + inherit passthruFun; + }; } diff --git a/pkgs/development/interpreters/perl/fix-build-with-only-C-locale-5.40.0.patch b/pkgs/development/interpreters/perl/fix-build-with-only-C-locale-5.40.0.patch new file mode 100644 index 000000000000..9f9e1e96f619 --- /dev/null +++ b/pkgs/development/interpreters/perl/fix-build-with-only-C-locale-5.40.0.patch @@ -0,0 +1,57 @@ +From bd0ab509f890a6638bd5033ef58526f8c74f7e4b Mon Sep 17 00:00:00 2001 +From: Andrei Horodniceanu <a.horodniceanu@proton.me> +Date: Wed, 4 Sep 2024 12:46:44 +0300 +Subject: [PATCH] locale.c: Fix compilation on platforms with only a C locale + +Signed-off-by: Andrei Horodniceanu <a.horodniceanu@proton.me> +--- + AUTHORS | 1 + + locale.c | 16 ++++++++++++++++ + 2 files changed, 17 insertions(+) + +diff --git a/AUTHORS b/AUTHORS +index b2e0bf2043a9..b196b93bda13 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -103,6 +103,7 @@ Andreas König <a.koenig@mind.de> + Andreas Marienborg <andreas.marienborg@gmail.com> + Andreas Schwab <schwab@suse.de> + Andreas Voegele <andreas@andreasvoegele.com> ++Andrei Horodniceanu <a.horodniceanu@proton.me> + Andrei Yelistratov <andrew@sundale.net> + Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru> + Andrew Bettison <andrewb@zip.com.au> +diff --git a/locale.c b/locale.c +index 168b94914318..d764b4b3c11e 100644 +--- a/locale.c ++++ b/locale.c +@@ -8963,6 +8963,7 @@ Perl_init_i18nl10n(pTHX_ int printwarn) + * categories into our internal indices. */ + if (map_LC_ALL_position_to_index[0] == LC_ALL_INDEX_) { + ++# ifdef PERL_LC_ALL_CATEGORY_POSITIONS_INIT + /* Use this array, initialized by a config.h constant */ + int lc_all_category_positions[] = PERL_LC_ALL_CATEGORY_POSITIONS_INIT; + STATIC_ASSERT_STMT( C_ARRAY_LENGTH(lc_all_category_positions) +@@ -8975,6 +8976,21 @@ Perl_init_i18nl10n(pTHX_ int printwarn) + map_LC_ALL_position_to_index[i] = + get_category_index(lc_all_category_positions[i]); + } ++# else ++ /* It is possible for both PERL_LC_ALL_USES_NAME_VALUE_PAIRS and ++ * PERL_LC_ALL_CATEGORY_POSITIONS_INIT not to be defined, e.g. on ++ * systems with only a C locale during ./Configure. Assume that this ++ * can only happen as part of some sort of bootstrapping so allow ++ * compilation to succeed by ignoring correctness. ++ */ ++ for (unsigned int i = 0; ++ i < C_ARRAY_LENGTH(map_LC_ALL_position_to_index); ++ i++) ++ { ++ map_LC_ALL_position_to_index[i] = 0; ++ } ++# endif ++ + } + + LOCALE_UNLOCK; diff --git a/pkgs/development/interpreters/perl/http-tiny-verify-ssl-by-default.patch b/pkgs/development/interpreters/perl/http-tiny-verify-ssl-by-default.patch deleted file mode 100644 index 59248061513d..000000000000 --- a/pkgs/development/interpreters/perl/http-tiny-verify-ssl-by-default.patch +++ /dev/null @@ -1,79 +0,0 @@ -Patch for HTTP::Tiny that defaults verify_SSL to 1 - -Based on proposed Debian patch by Dominic Hargreaves: -https://salsa.debian.org/perl-team/interpreter/perl/-/commit/1490431e40e22052f75a0b3449f1f53cbd27ba92 - - -diff --git a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm -index 5803e4599..88ba51461 100644 ---- a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm -+++ b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm -@@ -40,7 +40,7 @@ sub _croak { require Carp; Carp::croak(@_) } - #pod * C<timeout> — Request timeout in seconds (default is 60) If a socket open, - #pod read or write takes longer than the timeout, an exception is thrown. - #pod * C<verify_SSL> — A boolean that indicates whether to validate the SSL --#pod certificate of an C<https> — connection (default is false) -+#pod certificate of an C<https> — connection (default is true) - #pod * C<SSL_options> — A hashref of C<SSL_*> — options to pass through to - #pod L<IO::Socket::SSL> - #pod -@@ -112,7 +112,7 @@ sub new { - max_redirect => 5, - timeout => defined $args{timeout} ? $args{timeout} : 60, - keep_alive => 1, -- verify_SSL => $args{verify_SSL} || $args{verify_ssl} || 0, # no verification by default -+ verify_SSL => $args{verify_SSL} // $args{verify_ssl} // 1, # verification by default - no_proxy => $ENV{no_proxy}, - }; - -@@ -1038,7 +1038,7 @@ sub new { - timeout => 60, - max_line_size => 16384, - max_header_lines => 64, -- verify_SSL => 0, -+ verify_SSL => 1, - SSL_options => {}, - %args - }, $class; -@@ -1765,7 +1765,7 @@ C<timeout> — Request timeout in seconds (default is 60) If a socket open, read - - =item * - --C<verify_SSL> — A boolean that indicates whether to validate the SSL certificate of an C<https> — connection (default is false) -+C<verify_SSL> — A boolean that indicates whether to validate the SSL certificate of an C<https> — connection (default is true) - - =item * - -@@ -2035,7 +2035,7 @@ Verification of server identity - - =back - --B<By default, HTTP::Tiny does not verify server identity>. -+B<By default, HTTP::Tiny in NixOS verifies server identity>. - - Server identity verification is controversial and potentially tricky because it - depends on a (usually paid) third-party Certificate Authority (CA) trust model -@@ -2043,16 +2043,14 @@ to validate a certificate as legitimate. This discriminates against servers - with self-signed certificates or certificates signed by free, community-driven - CA's such as L<CAcert.org|http://cacert.org>. - --By default, HTTP::Tiny does not make any assumptions about your trust model, --threat level or risk tolerance. It just aims to give you an encrypted channel --when you need one. -- - Setting the C<verify_SSL> attribute to a true value will make HTTP::Tiny verify - that an SSL connection has a valid SSL certificate corresponding to the host - name of the connection and that the SSL certificate has been verified by a CA. - Assuming you trust the CA, this will protect against a L<man-in-the-middle --attack|http://en.wikipedia.org/wiki/Man-in-the-middle_attack>. If you are --concerned about security, you should enable this option. -+attack|http://en.wikipedia.org/wiki/Man-in-the-middle_attack>. -+ -+If you are not concerned about security, and this default in NixOS causes -+problems, you should disable this option. - - Certificate verification requires a file containing trusted CA certificates. - --- - - diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix index 2afdcded3db4..d23eb7355d6a 100644 --- a/pkgs/development/interpreters/perl/interpreter.nix +++ b/pkgs/development/interpreters/perl/interpreter.nix @@ -28,7 +28,7 @@ assert (enableCrypt -> (libxcrypt != null)); let - crossCompiling = stdenv.buildPlatform != stdenv.hostPlatform; + crossCompiling = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr"; libcInc = lib.getDev libc; libcLib = lib.getLib libc; @@ -58,21 +58,22 @@ stdenv.mkDerivation (rec { # the libxcrypt port has been installed. # # Without libxcrypt, Perl will still find FreeBSD's crypt functions. - propagatedBuildInputs = lib.optional (enableCrypt && !stdenv.isFreeBSD) libxcrypt; + propagatedBuildInputs = lib.optional (enableCrypt && !stdenv.hostPlatform.isFreeBSD) libxcrypt; disallowedReferences = [ stdenv.cc ]; - patches = - # Enable TLS/SSL verification in HTTP::Tiny by default - lib.optional (lib.versionOlder version "5.38.0") ./http-tiny-verify-ssl-by-default.patch - + patches = [] # Do not look in /usr etc. for dependencies. - ++ lib.optional (lib.versionOlder version "5.38.0") ./no-sys-dirs-5.31.patch - ++ lib.optional (lib.versionAtLeast version "5.38.0") ./no-sys-dirs-5.38.0.patch + ++ lib.optional ((lib.versions.majorMinor version) == "5.38") ./no-sys-dirs-5.38.0.patch + ++ lib.optional ((lib.versions.majorMinor version) == "5.40") ./no-sys-dirs-5.40.0.patch + + # Fix compilation on platforms with only a C locale: https://github.com/Perl/perl5/pull/22569 + ++ lib.optional (version == "5.40.0") ./fix-build-with-only-C-locale-5.40.0.patch - ++ lib.optional stdenv.isSunOS ./ld-shared.patch - ++ lib.optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ] - ++ lib.optional crossCompiling ./cross.patch; + ++ lib.optional stdenv.hostPlatform.isSunOS ./ld-shared.patch + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ] + ++ lib.optional (crossCompiling && (lib.versionAtLeast version "5.40.0")) ./cross540.patch + ++ lib.optional (crossCompiling && (lib.versionOlder version "5.40.0")) ./cross.patch; # This is not done for native builds because pwd may need to come from # bootstrap tools when building bootstrap perl. @@ -97,26 +98,39 @@ stdenv.mkDerivation (rec { # Miniperl needs -lm. perl needs -lrt. configureFlags = (if crossCompiling - then [ "-Dlibpth=\"\"" "-Dglibpth=\"\"" "-Ddefault_inc_excludes_dot" ] - else [ "-de" "-Dcc=cc" ]) + then [ + "-Dlibpth=\"\"" + "-Dglibpth=\"\"" + "-Ddefault_inc_excludes_dot" + ] + else ([ + "-de" + "-Dprefix=${placeholder "out"}" + "-Dman1dir=${placeholder "out"}/share/man/man1" + "-Dman3dir=${placeholder "out"}/share/man/man3" + ] ++ + (if (stdenv.cc.targetPrefix != "") + then [ + "-Dcc=${stdenv.cc.targetPrefix}cc" + "-Dnm=${stdenv.cc.targetPrefix}nm" + "-Dar=${stdenv.cc.targetPrefix}ar" + ] + else [ + "-Dcc=cc" + "-Duseshrplib" + ]))) ++ [ "-Uinstallusrbinperl" "-Dinstallstyle=lib/perl5" - ] ++ lib.optional (!crossCompiling) "-Duseshrplib" ++ [ "-Dlocincpth=${libcInc}/include" "-Dloclibpth=${libcLib}/lib" ] + ++ lib.optional stdenv.hostPlatform.isStatic "-Uusedl" ++ lib.optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ] - ++ lib.optional stdenv.isSunOS "-Dcc=gcc" + ++ lib.optional stdenv.hostPlatform.isSunOS "-Dcc=gcc" ++ lib.optional enableThreading "-Dusethreads" ++ lib.optional (!enableCrypt) "-A clear:d_crypt_r" - ++ lib.optional stdenv.hostPlatform.isStatic "--all-static" - ++ lib.optionals (!crossCompiling) [ - "-Dprefix=${placeholder "out"}" - "-Dman1dir=${placeholder "out"}/share/man/man1" - "-Dman3dir=${placeholder "out"}/share/man/man3" - ] - ++ lib.optionals (stdenv.isFreeBSD && crossCompiling && enableCrypt) [ + ++ lib.optionals (stdenv.hostPlatform.isFreeBSD && crossCompiling && enableCrypt) [ # https://github.com/Perl/perl5/issues/22295 # configure cannot figure out that we have crypt automatically, but we really do "-Dd_crypt" @@ -124,11 +138,17 @@ stdenv.mkDerivation (rec { configureScript = lib.optionalString (!crossCompiling) "${stdenv.shell} ./Configure"; + # !canExecute cross uses miniperl which doesn't have this + postConfigure = lib.optionalString (!crossCompiling && stdenv.cc.targetPrefix != "") '' + substituteInPlace Makefile \ + --replace-fail "AR = ar" "AR = ${stdenv.cc.targetPrefix}ar" + ''; + dontAddStaticConfigureFlags = true; dontAddPrefix = !crossCompiling; - enableParallelBuilding = !crossCompiling; + enableParallelBuilding = false; # perl includes the build date, the uname of the build system and the # username of the build user in some files. @@ -156,8 +176,12 @@ stdenv.mkDerivation (rec { OLD_ZLIB = False GZIP_OS_CODE = AUTO_DETECT USE_ZLIB_NG = False + '' + lib.optionalString (lib.versionAtLeast version "5.40.0") '' + ZLIB_INCLUDE = ${zlib.dev}/include + ZLIB_LIB = ${zlib.out}/lib + '' + '' EOF - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" '' + lib.optionalString (!enableThreading) '' # We need to do this because the bootstrap doesn't have a static libpthread @@ -240,15 +264,15 @@ stdenv.mkDerivation (rec { priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` mainProgram = "perl"; }; -} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "84db4c71ae3d3b01fb2966cd15a060a7be334710"; # Nov 29, 2023 +} // lib.optionalAttrs crossCompiling rec { + crossVersion = "1.6"; perl-cross-src = fetchFromGitHub { name = "perl-cross-${crossVersion}"; owner = "arsv"; repo = "perl-cross"; rev = crossVersion; - sha256 = "sha256-1Zqw4sy/lD2nah0Z8rAE11tSpq1Ym9nBbatDczR+mxs="; + sha256 = "sha256-TVDLxw8ctl64LSfLfB4/WLYlSTO31GssSzmdVfqkBmg="; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.31.patch b/pkgs/development/interpreters/perl/no-sys-dirs-5.31.patch deleted file mode 100644 index 62dce0e25b94..000000000000 --- a/pkgs/development/interpreters/perl/no-sys-dirs-5.31.patch +++ /dev/null @@ -1,254 +0,0 @@ -diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure ---- perl-5.20.0-orig/Configure 2014-05-26 15:34:18.000000000 +0200 -+++ perl-5.20.0/Configure 2014-06-25 10:43:35.368285986 +0200 -@@ -106,15 +106,7 @@ - fi - - : Proper PATH setting --paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' --paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" --paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" --paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" --paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" --paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" --paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" --paths="$paths /sbin /usr/sbin /usr/libexec" --paths="$paths /system/gnu_library/bin" -+paths='' - - for p in $paths - do -@@ -1337,8 +1329,7 @@ - archname='' - : Possible local include directories to search. - : Set locincpth to "" in a hint file to defeat local include searches. --locincpth="/usr/local/include /opt/local/include /usr/gnu/include" --locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" -+locincpth="" - : - : no include file wanted by default - inclwanted='' -@@ -1349,17 +1340,12 @@ - - libnames='' - : change the next line if compiling for Xenix/286 on Xenix/386 --xlibpth='/usr/lib/386 /lib/386' -+xlibpth='' - : Possible local library directories to search. --loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" --loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" -+loclibpth="" - - : general looking path for locating libraries --glibpth="/lib /usr/lib $xlibpth" --glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" --test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" --test -f /shlib/libc.so && glibpth="/shlib $glibpth" --test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" -+glibpth="" - - : Private path used by Configure to find libraries. Its value - : is prepended to libpth. This variable takes care of special -@@ -1391,8 +1377,6 @@ - libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" - : We probably want to search /usr/shlib before most other libraries. - : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. --glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` --glibpth="/usr/shlib $glibpth" - : Do not use vfork unless overridden by a hint file. - usevfork=false - -@@ -2446,7 +2430,6 @@ - zip - " - pth=`echo $PATH | sed -e "s/$p_/ /g"` --pth="$pth $sysroot/lib $sysroot/usr/lib" - for file in $loclist; do - eval xxx=\$$file - case "$xxx" in -@@ -4936,7 +4919,7 @@ - : Set private lib path - case "$plibpth" in - '') if ./mips; then -- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib" -+ plibpth="$incpath/usr/lib" - fi;; - esac - case "$libpth" in -@@ -8600,13 +8583,8 @@ - echo " " - case "$sysman" in - '') -- syspath='/usr/share/man/man1 /usr/man/man1' -- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" -- syspath="$syspath /usr/man/u_man/man1" -- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" -- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" -- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" -- sysman=`./loc . /usr/man/man1 $syspath` -+ syspath='' -+ sysman='' - ;; - esac - if $test -d "$sysman"; then -@@ -19900,9 +19878,10 @@ - case "$full_ar" in - '') full_ar=$ar ;; - esac -+full_ar=ar - - : Store the full pathname to the sed program for use in the C program --full_sed=$sed -+full_sed=sed - - : see what type gids are declared as in the kernel - echo " " -Only in perl-5.20.0/: Configure.orig -diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL ---- perl-5.20.0-orig/ext/Errno/Errno_pm.PL 2014-05-26 15:34:20.000000000 +0200 -+++ perl-5.20.0/ext/Errno/Errno_pm.PL 2014-06-25 10:31:24.317970047 +0200 -@@ -134,12 +126,7 @@ - if ($dep =~ /(\S+errno\.h)/) { - $file{$1} = 1; - } -- } elsif ($^O eq 'linux' && -- $Config{gccversion} ne '' && -- $Config{gccversion} !~ /intel/i && -- # might be using, say, Intel's icc -- $linux_errno_h -- ) { -+ } elsif (0) { - $file{$linux_errno_h} = 1; - } elsif ($^O eq 'haiku') { - # hidden in a special place -Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig -diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh ---- perl-5.20.0-orig/hints/freebsd.sh 2014-01-31 22:55:51.000000000 +0100 -+++ perl-5.20.0/hints/freebsd.sh 2014-06-25 10:25:53.263964680 +0200 -@@ -119,21 +119,21 @@ - objformat=`/usr/bin/objformat` - if [ x$objformat = xaout ]; then - if [ -e /usr/lib/aout ]; then -- libpth="/usr/lib/aout /usr/local/lib /usr/lib" -- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" -+ libpth="" -+ glibpth="" - fi - lddlflags='-Bshareable' - else -- libpth="/usr/lib /usr/local/lib" -- glibpth="/usr/lib /usr/local/lib" -+ libpth="" -+ glibpth="" - ldflags="-Wl,-E " - lddlflags="-shared " - fi - cccdlflags='-DPIC -fPIC' - ;; - *) -- libpth="/usr/lib /usr/local/lib" -- glibpth="/usr/lib /usr/local/lib" -+ libpth="" -+ glibpth="" - ldflags="-Wl,-E " - lddlflags="-shared " - cccdlflags='-DPIC -fPIC' -diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh ---- perl-5.20.0-orig/hints/linux.sh 2014-05-26 15:34:20.000000000 +0200 -+++ perl-5.20.0/hints/linux.sh 2014-06-25 10:33:47.354883843 +0200 -@@ -150,28 +150,6 @@ case "$optimize" in - ;; - esac - --# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries --# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us --# where to look. We don't want gcc's own libraries, however, so we --# filter those out. --# This could be conditional on Unbuntu, but other distributions may --# follow suit, and this scheme seems to work even on rather old gcc's. --# This unconditionally uses gcc because even if the user is using another --# compiler, we still need to find the math library and friends, and I don't --# know how other compilers will cope with that situation. --# Morever, if the user has their own gcc earlier in $PATH than the system gcc, --# we don't want its libraries. So we try to prefer the system gcc --# Still, as an escape hatch, allow Configure command line overrides to --# plibpth to bypass this check. --if [ -x /usr/bin/gcc ] ; then -- gcc=/usr/bin/gcc --# clang also provides -print-search-dirs --elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then -- gcc=${cc:-cc} --else -- gcc=gcc --fi -- - case "$plibpth" in - '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | - cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'` -@@ -208,32 +186,6 @@ case "$usequadmath" in - ;; - esac - --case "$libc" in --'') --# If you have glibc, then report the version for ./myconfig bug reporting. --# (Configure doesn't need to know the specific version since it just uses --# gcc to load the library for all tests.) --# We don't use __GLIBC__ and __GLIBC_MINOR__ because they --# are insufficiently precise to distinguish things like --# libc-2.0.6 and libc-2.0.7. -- for p in $plibpth -- do -- for trylib in libc.so.6 libc.so -- do -- if $test -e $p/$trylib; then -- libc=`ls -l $p/$trylib | awk '{print $NF}'` -- if $test "X$libc" != X; then -- break -- fi -- fi -- done -- if $test "X$libc" != X; then -- break -- fi -- done -- ;; --esac -- - if ${sh:-/bin/sh} -c exit; then - echo '' - echo 'You appear to have a working bash. Good.' -@@ -311,33 +263,6 @@ sparc*) - ;; - esac - --# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than --# true libraries. The scripts cause binding against static --# version of -lgdbm which is a bad idea. So if we have 'nm' --# make sure it can read the file --# NI-S 2003/08/07 --case "$nm" in -- '') ;; -- *) -- for p in $plibpth -- do -- if $test -r $p/libndbm.so; then -- if $nm $p/libndbm.so >/dev/null 2>&1 ; then -- echo 'Your shared -lndbm seems to be a real library.' -- _libndbm_real=1 -- break -- fi -- fi -- done -- if $test "X$_libndbm_real" = X; then -- echo 'Your shared -lndbm is not a real library.' -- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` -- shift -- libswanted="$*" -- fi -- ;; --esac -- - # Linux on Synology. - if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then - # Tested on Synology DS213 and DS413 diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.40.0.patch b/pkgs/development/interpreters/perl/no-sys-dirs-5.40.0.patch new file mode 100644 index 000000000000..cf4894b337ab --- /dev/null +++ b/pkgs/development/interpreters/perl/no-sys-dirs-5.40.0.patch @@ -0,0 +1,237 @@ +diff --git a/Configure b/Configure +index 4da7088bff..1a86e0a77d 100755 +--- a/Configure ++++ b/Configure +@@ -108,15 +108,7 @@ if test -d c:/. || ( uname -a | grep -i 'os\(/\|\)2' 2>&1 ) 2>&1 >/dev/null ; th + fi + + : Proper PATH setting +-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' +-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" +-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" +-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" +-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" +-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" +-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" +-paths="$paths /sbin /usr/sbin /usr/libexec" +-paths="$paths /system/gnu_library/bin" ++paths='' + + for p in $paths + do +@@ -1459,8 +1451,7 @@ groupstype='' + i_whoami='' + : Possible local include directories to search. + : Set locincpth to "" in a hint file to defeat local include searches. +-locincpth="/usr/local/include /opt/local/include /usr/gnu/include" +-locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" ++locincpth="" + : + : no include file wanted by default + inclwanted='' +@@ -1474,19 +1465,12 @@ DEBUGGING='' + archobjs='' + libnames='' + : change the next line if compiling for Xenix/286 on Xenix/386 +-xlibpth='/usr/lib/386 /lib/386' ++xlibpth='' + : Possible local library directories to search. +-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" +-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" ++loclibpth="" + + : general looking path for locating libraries +-glibpth="/lib /usr/lib $xlibpth" +-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" +-test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" +-test -f /shlib/libc.so && glibpth="/shlib $glibpth" +-test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" +- +-: Private path used by Configure to find libraries. Its value ++glibpth="" + : is prepended to libpth. This variable takes care of special + : machines, like the mips. Usually, it should be empty. + plibpth='' +@@ -1519,8 +1503,6 @@ libswanted="cl pthread socket bind inet ndbm gdbm dbm db malloc dl ld" + libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD" + : We probably want to search /usr/shlib before most other libraries. + : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. +-glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` +-glibpth="/usr/shlib $glibpth" + : Do not use vfork unless overridden by a hint file. + usevfork=false + +@@ -2585,7 +2567,6 @@ uname + zip + " + pth=`echo $PATH | sed -e "s/$p_/ /g"` +-pth="$pth $sysroot/lib $sysroot/usr/lib" + for file in $loclist; do + eval xxx=\$$file + case "$xxx" in +@@ -5032,7 +5013,7 @@ esac + : Set private lib path + case "$plibpth" in + '') if ./mips; then +- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib" ++ plibpth="$incpath/usr/lib" + fi;; + esac + case "$libpth" in +@@ -8869,13 +8850,8 @@ esac + echo " " + case "$sysman" in + '') +- syspath='/usr/share/man/man1 /usr/man/man1' +- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" +- syspath="$syspath /usr/man/u_man/man1" +- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" +- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" +- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" +- sysman=`./loc . /usr/man/man1 $syspath` ++ syspath='' ++ sysman='' + ;; + esac + if $test -d "$sysman"; then +@@ -21740,9 +21716,10 @@ $rm_try tryp + case "$full_ar" in + '') full_ar=$ar ;; + esac ++full_ar=ar + + : Store the full pathname to the sed program for use in the C program +-full_sed=$sed ++full_sed=sed + + : see what type gids are declared as in the kernel + echo " " +diff --git a/hints/freebsd.sh b/hints/freebsd.sh +index 70bb90ee95..6580219c17 100644 +--- a/hints/freebsd.sh ++++ b/hints/freebsd.sh +@@ -127,21 +127,21 @@ case "$osvers" in + objformat=`/usr/bin/objformat` + if [ x$objformat = xaout ]; then + if [ -e /usr/lib/aout ]; then +- libpth="/usr/lib/aout /usr/local/lib /usr/lib" +- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" ++ libpth="" ++ glibpth="" + fi + lddlflags='-Bshareable' + else +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + fi + cccdlflags='-DPIC -fPIC' + ;; + *) +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + cccdlflags='-DPIC -fPIC' +diff --git a/hints/linux.sh b/hints/linux.sh +index 83ba0c5c97..d7b6ce04fe 100644 +--- a/hints/linux.sh ++++ b/hints/linux.sh +@@ -176,27 +176,6 @@ case "$optimize" in + ;; + esac + +-# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries +-# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us +-# where to look. We don't want gcc's own libraries, however, so we +-# filter those out. +-# This could be conditional on Ubuntu, but other distributions may +-# follow suit, and this scheme seems to work even on rather old gcc's. +-# This unconditionally uses gcc because even if the user is using another +-# compiler, we still need to find the math library and friends, and I don't +-# know how other compilers will cope with that situation. +-# Morever, if the user has their own gcc earlier in $PATH than the system gcc, +-# we don't want its libraries. So we try to prefer the system gcc +-# Still, as an escape hatch, allow Configure command line overrides to +-# plibpth to bypass this check. +-if [ -x /usr/bin/gcc ] ; then +- gcc=/usr/bin/gcc +-# clang also provides -print-search-dirs +-elif ${cc:-cc} --version 2>/dev/null | grep -q -e '^clang version' -e ' clang version'; then +- gcc=${cc:-cc} +-else +- gcc=gcc +-fi + + case "$plibpth" in + '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | +@@ -234,31 +213,6 @@ case "$usequadmath" in + ;; + esac + +-case "$libc" in +-'') +-# If you have glibc, then report the version for ./myconfig bug reporting. +-# (Configure doesn't need to know the specific version since it just uses +-# gcc to load the library for all tests.) +-# We don't use __GLIBC__ and __GLIBC_MINOR__ because they +-# are insufficiently precise to distinguish things like +-# libc-2.0.6 and libc-2.0.7. +- for p in $plibpth +- do +- for trylib in libc.so.6 libc.so +- do +- if $test -e $p/$trylib; then +- libc=`ls -l $p/$trylib | awk '{print $NF}'` +- if $test "X$libc" != X; then +- break +- fi +- fi +- done +- if $test "X$libc" != X; then +- break +- fi +- done +- ;; +-esac + + if ${sh:-/bin/sh} -c exit; then + echo '' +@@ -337,32 +291,6 @@ sparc*) + ;; + esac + +-# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than +-# true libraries. The scripts cause binding against static +-# version of -lgdbm which is a bad idea. So if we have 'nm' +-# make sure it can read the file +-# NI-S 2003/08/07 +-case "$nm" in +- '') ;; +- *) +- for p in $plibpth +- do +- if $test -r $p/libndbm.so; then +- if $nm $p/libndbm.so >/dev/null 2>&1 ; then +- echo 'Your shared -lndbm seems to be a real library.' +- _libndbm_real=1 +- break +- fi +- fi +- done +- if $test "X$_libndbm_real" = X; then +- echo 'Your shared -lndbm is not a real library.' +- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` +- shift +- libswanted="$*" +- fi +- ;; +-esac + + # Linux on Synology. + if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 204bf316e842..adf8fbfe5981 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix ((removeAttrs _args [ "fetchpatch" ]) // { - version = "8.1.29"; - hash = "sha256-h6YDEyY/L1M/GA5xknLKXkfNmITU7DyTcgGY6v+uCCc="; + version = "8.1.30"; + hash = "sha256-yxYl5axJuRA3R34+d2e7BiQ0OXGuuZL0eRthivVx0j4="; extraPatches = [ # Fix build with libxml2 2.12+. # Patch from https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 @@ -21,10 +21,13 @@ let }) # Backport of PHP_LIBXML_IGNORE_DEPRECATIONS_START and PHP_LIBXML_IGNORE_DEPRECATIONS_END # Required for libxml2 2.13 compatibility patch. - ./php81-fix-libxml2-2.13-compatibility.patch + (fetchpatch { + url = "https://github.com/php/php-src/commit/e2d97314ab342d434e778cd00a2f34e4bdb07664.patch"; + hash = "sha256-w0hyYUgbRGpvIBfWeDTSEUGpiJdyrtNjKy+Fn1vyAO0="; + }) # Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch. (fetchpatch { - url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch"; + url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch"; hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY="; }) ]; diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index a119dec0ca4e..e1b8d2201e57 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.23"; - hash = "sha256-98kM2no8HeAfO/t7Rp1S3snrovO4MyCDYAT5wu7K4ms="; + version = "8.2.25"; + hash = "sha256-B7QcXpbGDAllEORfAvgYQU0RvdDV2htoQN26K6colAE="; }); 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 bb314d4e854d..43dbc2ce033d 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.11"; - hash = "sha256-ZkDiRVCAqJrcQdTle7BPjCv7fuxif+GZr5c7/zTX8O4="; + version = "8.3.13"; + hash = "sha256-x3kcguGlVMyvhKQLpxzBQXupr2f7Wzl4CDf9fH628SQ="; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix index 3c1f17048c37..e5abb6760978 100644 --- a/pkgs/development/interpreters/php/8.4.nix +++ b/pkgs/development/interpreters/php/8.4.nix @@ -4,10 +4,10 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.4.0beta3"; + version = "8.4.0RC4"; phpSrc = fetchurl { - url = "https://downloads.php.net/~calvinb/php-8.4.0beta3.tar.xz"; - hash = "sha256-aTgUCmS3tdV304Ag05DZObLKTQ8XgpNIfHARbhpZUAw="; + url = "https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz"; + hash = "sha256-s/ihnYRfSqVlAV/4YZZAfrUzKE60NlrFlT9edK5h3LA="; }; } ); diff --git a/pkgs/development/interpreters/php/fix-paths-php84.patch b/pkgs/development/interpreters/php/fix-paths-php84.patch index 294d13569af7..12a392bc973c 100644 --- a/pkgs/development/interpreters/php/fix-paths-php84.patch +++ b/pkgs/development/interpreters/php/fix-paths-php84.patch @@ -13,15 +13,16 @@ index e46acf0928..ee8e5a88f8 100644 AS_VAR_IF([GETTEXT_DIR],, [AC_MSG_ERROR([Cannot locate header file libintl.h])]) -diff -ru a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 ---- a/sapi/apache2handler/config.m4 2018-11-07 15:35:23.000000000 +0000 -+++ b/sapi/apache2handler/config.m4 2018-11-27 00:32:28.000000000 +0000 -@@ -66,7 +66,7 @@ - AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) - fi +diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 +index e335721f19..a5087e1320 100644 +--- a/sapi/apache2handler/config.m4 ++++ b/sapi/apache2handler/config.m4 +@@ -68,7 +68,7 @@ if test "$PHP_APXS2" != "no"; then + AS_VERSION_COMPARE([$APACHE_VERSION], [2.4.0], + [AC_MSG_ERROR([Please note that Apache version >= 2.4 is required])]) -- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` +- APXS_LIBEXECDIR='$(INSTALL_ROOT)'$($APXS -q LIBEXECDIR) + APXS_LIBEXECDIR="$prefix/modules" - if test -z `$APXS -q SYSCONFDIR`; then + if test -z $($APXS -q SYSCONFDIR); then INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 458804e2e51d..13e10103f54f 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -58,7 +58,7 @@ let , zendSignalsSupport ? true , zendMaxExecutionTimersSupport ? false , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd - , valgrindSupport ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind + , valgrindSupport ? !stdenv.hostPlatform.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind , ztsSupport ? apxs2Support }@args: @@ -213,7 +213,7 @@ let enableParallelBuilding = true; nativeBuildInputs = [ autoconf automake bison flex libtool pkg-config re2c ] - ++ lib.optional stdenv.isDarwin xcbuild; + ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild; buildInputs = # PCRE extension @@ -285,7 +285,7 @@ let if [ -f "scripts/dev/genfiles" ]; then ./scripts/dev/genfiles fi - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace-fail "-lstdc++" "-lc++" ''; diff --git a/pkgs/development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch b/pkgs/development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch deleted file mode 100644 index b4624676ee29..000000000000 --- a/pkgs/development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h -index a1011f0b17..7a7622c482 100644 ---- a/ext/libxml/php_libxml.h -+++ b/ext/libxml/php_libxml.h -@@ -119,6 +119,23 @@ PHP_LIBXML_API void php_libxml_shutdown(void); - ZEND_TSRMLS_CACHE_EXTERN() - #endif - -+#if defined(__clang__) -+# define PHP_LIBXML_IGNORE_DEPRECATIONS_START \ -+ _Pragma("clang diagnostic push") \ -+ _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") -+# define PHP_LIBXML_IGNORE_DEPRECATIONS_END \ -+ _Pragma("clang diagnostic pop") -+#elif defined(__GNUC__) -+# define PHP_LIBXML_IGNORE_DEPRECATIONS_START \ -+ _Pragma("GCC diagnostic push") \ -+ _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") -+# define PHP_LIBXML_IGNORE_DEPRECATIONS_END \ -+ _Pragma("GCC diagnostic pop") -+#else -+# define PHP_LIBXML_IGNORE_DEPRECATIONS_START -+# define PHP_LIBXML_IGNORE_DEPRECATIONS_END -+#endif -+ - /* Other extension may override the global state options, these global options - * are copied initially to ctxt->options. Set the options to a known good value. - * See libxml2 globals.c and parserInternals.c. diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix deleted file mode 100644 index d27efe1f2b82..000000000000 --- a/pkgs/development/interpreters/picoc/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, readline }: - -stdenv.mkDerivation { - pname = "picoc"; - version = "2.1-unstable-2018-06-05"; - - src = fetchFromGitLab { - owner = "zsaleeba"; - repo = "picoc"; - rev = "dc85a51e9211cfb644f0a85ea9546e15dc1141c3"; - hash = "sha256-yWPRbJLT09E7pqqs9E2k48ECoRR2nhcgTgK5pumkrxo="; - }; - - buildInputs = [ readline ]; - - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ - "-Wno-error=implicit-function-declaration" - ]); - - enableParallelBuilding = true; - - # Tests are currently broken on i686 see - # https://hydra.nixos.org/build/24003763/nixlog/1 - doCheck = !stdenv.isi686 && !stdenv.isAarch64; - checkTarget = "test"; - - installPhase = '' - runHook preInstall - - install -Dm755 picoc $out/bin/picoc - - mkdir -p $out/include - install -m644 *.h $out/include - - runHook postInstall - ''; - - meta = with lib; { - description = "Very small C interpreter for scripting"; - mainProgram = "picoc"; - longDescription = '' - PicoC is a very small C interpreter for scripting. It was originally - written as a script language for a UAV's on-board flight system. It's - also very suitable for other robotic, embedded and non-embedded - applications. The core C source code is around 3500 lines of code. It's - not intended to be a complete implementation of ISO C but it has all the - essentials. When compiled it only takes a few k of code space and is also - very sparing of data space. This means it can work well in small embedded - devices. - ''; - homepage = "https://gitlab.com/zsaleeba/picoc"; - downloadPage = "https://code.google.com/p/picoc/downloads/list"; - license = licenses.bsd3; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix deleted file mode 100644 index c751746ec645..000000000000 --- a/pkgs/development/interpreters/picolisp/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - clang, - fetchurl, - lib, - libffi, - llvm, - makeWrapper, - openssl, - pkg-config, - readline, - stdenv -}: - -stdenv.mkDerivation { - pname = "PicoLisp"; - version = "24.3.30"; - src = fetchurl { - url = "https://www.software-lab.de/picoLisp-24.3.tgz"; - sha256 = "sha256-FB43DAjHBFgxdysoLzBXLxii52a2CCh1skZP/RTzfdc="; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ clang libffi llvm openssl pkg-config readline ]; - sourceRoot = ''pil21''; - buildPhase = '' - cd src - make - ''; - - installPhase = '' - cd .. - mkdir -p "$out/lib" "$out/bin" "$out/man" - cp -r . "$out/lib/picolisp/" - ln -s "$out/lib/picolisp/bin/picolisp" "$out/bin/picolisp" - ln -s "$out/lib/picolisp/bin/pil" "$out/bin/pil" - ln -s "$out/lib/picolisp/man/man1/pil.1" "$out/man/pil.1" - ln -s "$out/lib/picolisp/man/man1/picolisp.1" "$out/man/picolisp.1" - substituteInPlace $out/bin/pil --replace /usr $out - ''; - - meta = with lib; { - description = "Pragmatic programming language"; - homepage = "https://picolisp.com/"; - license = licenses.mit; - maintainers = with maintainers; [ nat-418 ]; - platforms = platforms.all; - }; -} - diff --git a/pkgs/development/interpreters/python-cosmopolitan/default.nix b/pkgs/development/interpreters/python-cosmopolitan/default.nix deleted file mode 100644 index a513c097fbcb..000000000000 --- a/pkgs/development/interpreters/python-cosmopolitan/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, cosmopolitan, unzip, bintools-unwrapped }: - -stdenv.mkDerivation rec { - pname = "python-cosmopolitan"; - version = "3.6.14"; - - src = cosmopolitan.dist; - - nativeBuildInputs = [ bintools-unwrapped unzip ]; - - # slashes are significant because upstream uses o/$(MODE)/foo.o - buildFlags = [ "o//third_party/python" ]; - checkTarget = "o//third_party/python/test"; - enableParallelBuilding = true; - - doCheck = true; - dontConfigure = true; - dontFixup = true; - - installPhase = '' - runHook preInstall - install o/third_party/python/*.com -Dt $out/bin - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://justine.lol/cosmopolitan/"; - description = "Actually Portable Python using Cosmopolitan"; - platforms = platforms.x86_64; - badPlatforms = platforms.darwin; - license = licenses.isc; - maintainers = teams.cosmopolitan.members; - mainProgram = "python.com"; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index af9bbc47475b..7e926d682810 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -8,10 +8,10 @@ , openssl , readline , sqlite -, tcl ? null, tk ? null, tix ? null, libX11 ? null, x11Support ? false +, tcl ? null, tk ? null, tclPackages, libX11 ? null, x11Support ? false , zlib , self -, configd, coreutils +, coreutils , autoreconfHook , python-setup-hook # Some proprietary libs assume UCS2 unicode, especially on darwin :( @@ -137,14 +137,10 @@ let revert = true; hash = "sha256-Lp5fGlcfJJ6p6vKmcLckJiAA2AZz4prjFE0aMEJxotw="; }) - ] ++ lib.optionals (x11Support && stdenv.isDarwin) [ + ] ++ lib.optionals (x11Support && stdenv.hostPlatform.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch - ] ++ lib.optionals stdenv.isDarwin [ - # Fix darwin build https://bugs.python.org/issue34027 - ../3.7/darwin-libutil.patch - - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # Disable the use of ldconfig in ctypes.util.find_library (since # ldconfig doesn't work on NixOS), and don't use @@ -188,7 +184,7 @@ let for i in Lib/plat-*/regen; do substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/ done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' substituteInPlace Lib/multiprocessing/__init__.py \ --replace 'os.popen(comm)' 'os.popen("${coreutils}/bin/nproc")' @@ -205,7 +201,7 @@ let "--enable-unicode=ucs${toString ucsEncoding}" ] ++ lib.optionals stdenv.hostPlatform.isCygwin [ "ac_cv_func_bind_textdomain_codeset=yes" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-toolbox-glue" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "PYTHON_FOR_BUILD=${lib.getBin buildPackages.python}/bin/python" @@ -239,8 +235,7 @@ let buildInputs = lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ [ bzip2 openssl zlib libffi expat db gdbm ncurses sqlite readline ] - ++ lib.optionals x11Support [ tcl tk libX11 ] - ++ lib.optional (stdenv.isDarwin && configd != null) configd; + ++ lib.optionals x11Support [ tcl tk libX11 ]; nativeBuildInputs = [ autoreconfHook ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) @@ -264,7 +259,7 @@ in with passthru; stdenv.mkDerivation ({ inherit src patches buildInputs nativeBuildInputs preConfigure configureFlags; - LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + LDFLAGS = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-lgcc_s"; inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.targetPlatform.system == "x86_64-darwin") "-msse2" @@ -273,8 +268,8 @@ in with passthru; stdenv.mkDerivation ({ setupHook = python-setup-hook sitePackages; - postPatch = lib.optionalString (x11Support && (tix != null)) '' - substituteInPlace "Lib/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" + postPatch = lib.optionalString (x11Support && ((tclPackages.tix or null) != null)) '' + substituteInPlace "Lib/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'" ''; postInstall = diff --git a/pkgs/development/interpreters/python/cpython/3.11/darwin-libutil.patch b/pkgs/development/interpreters/python/cpython/3.11/darwin-libutil.patch deleted file mode 100644 index 92b846be0002..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.11/darwin-libutil.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 40229bce0f..3cc604930e 100644 ---- a/Modules/posixmodule.c -+++ b/Modules/posixmodule.c -@@ -7258,7 +7258,7 @@ os_sched_getaffinity_impl(PyObject *module, pid_t pid) - #ifdef HAVE_UTMP_H - #include <utmp.h> - #endif /* HAVE_UTMP_H */ --#elif defined(HAVE_LIBUTIL_H) -+#elif defined(HAVE_LIBUTIL_H) && !defined(__APPLE__) - #include <libutil.h> - #elif defined(HAVE_UTIL_H) - #include <util.h> diff --git a/pkgs/development/interpreters/python/cpython/3.14/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.14/no-ldconfig.patch new file mode 100644 index 000000000000..5d176dd38de7 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.14/no-ldconfig.patch @@ -0,0 +1,40 @@ +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index 117bf06cb01..ff50cb083bd 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -280,34 +280,7 @@ def find_library(name, is64 = False): + else: + + def _findSoname_ldconfig(name): +- import struct +- if struct.calcsize('l') == 4: +- machine = os.uname().machine + '-32' +- else: +- machine = os.uname().machine + '-64' +- mach_map = { +- 'x86_64-64': 'libc6,x86-64', +- 'ppc64-64': 'libc6,64bit', +- 'sparc64-64': 'libc6,64bit', +- 's390x-64': 'libc6,64bit', +- 'ia64-64': 'libc6,IA-64', +- } +- abi_type = mach_map.get(machine, 'libc6') +- +- # XXX assuming GLIBC's ldconfig (with option -p) +- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s' +- regex = os.fsencode(regex % (re.escape(name), abi_type)) +- try: +- with subprocess.Popen(['/sbin/ldconfig', '-p'], +- stdin=subprocess.DEVNULL, +- stderr=subprocess.DEVNULL, +- stdout=subprocess.PIPE, +- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: +- res = re.search(regex, p.stdout.read()) +- if res: +- return os.fsdecode(res.group(1)) +- except OSError: +- pass ++ return None + + def _findLib_ld(name): + # See issue #9998 for why this is needed diff --git a/pkgs/development/interpreters/python/cpython/3.7/darwin-libutil.patch b/pkgs/development/interpreters/python/cpython/3.7/darwin-libutil.patch deleted file mode 100644 index 51e3cb6d7f11..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.7/darwin-libutil.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index c3682b4..16826c6 100644 ---- a/Modules/posixmodule.c -+++ b/Modules/posixmodule.c -@@ -5880,15 +5880,13 @@ error: - #if defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) || defined(HAVE_DEV_PTMX) - #ifdef HAVE_PTY_H - #include <pty.h> --#else -+#endif - #ifdef HAVE_LIBUTIL_H - #include <libutil.h> --#else -+#endif - #ifdef HAVE_UTIL_H - #include <util.h> --#endif /* HAVE_UTIL_H */ --#endif /* HAVE_LIBUTIL_H */ --#endif /* HAVE_PTY_H */ -+#endif - #ifdef HAVE_STROPTS_H - #include <stropts.h> - #endif diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 56e0be3ea59c..20c7c0c145ef 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -25,7 +25,7 @@ # platform-specific dependencies , bash -, configd +, apple-sdk_11 , darwin , windows @@ -35,7 +35,7 @@ , tzdata , withGdbm ? !stdenv.hostPlatform.isWindows, gdbm , withReadline ? !stdenv.hostPlatform.isWindows, readline -, x11Support ? false, tcl, tk, tix, libX11, xorgproto +, x11Support ? false, tcl, tk, tclPackages, libX11, xorgproto # splicing/cross , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" @@ -70,7 +70,7 @@ , enableNoSemanticInterposition ? true # enabling LTO on 32bit arch causes downstream packages to fail when linking -, enableLTO ? stdenv.isDarwin || (stdenv.is64bit && stdenv.isLinux) +, enableLTO ? stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.is64bit && stdenv.hostPlatform.isLinux) # enable asserts to ensure the build remains reproducible , reproducibleBuild ? false @@ -95,7 +95,7 @@ assert x11Support -> tcl != null assert bluezSupport -> bluez != null; -assert lib.assertMsg (enableFramework -> stdenv.isDarwin) +assert lib.assertMsg (enableFramework -> stdenv.hostPlatform.isDarwin) "Framework builds are only supported on Darwin."; assert lib.assertMsg (reproducibleBuild -> stripBytecode) @@ -152,7 +152,7 @@ let nativeBuildInputs = [ nukeReferences - ] ++ optionals (!stdenv.isDarwin) [ + ] ++ optionals (!stdenv.hostPlatform.isDarwin) [ autoconf-archive # needed for AX_CHECK_COMPILE_FLAG autoreconfHook pkg-config @@ -178,11 +178,12 @@ let bluez ] ++ optionals enableFramework [ darwin.apple_sdk.frameworks.Cocoa + ] ++ optionals stdenv.hostPlatform.isDarwin [ + # Work around for ld64 crashes on x86_64-darwin. Remove once 11.0 becomes the default. + apple-sdk_11 ] ++ optionals stdenv.hostPlatform.isMinGW [ windows.dlfcn windows.mingw_w64_pthreads - ] ++ optionals stdenv.isDarwin [ - configd ] ++ optionals tzdataSupport [ tzdata ] ++ optionals withGdbm [ @@ -207,81 +208,29 @@ let inherit hash; }; - # The CPython interpreter contains a _sysconfigdata_<platform specific suffix> - # module that is imported by the sysconfig and distutils.sysconfig modules. - # The sysconfigdata module is generated at build time and contains settings - # required for building Python extension modules, such as include paths and - # other compiler flags. By default, the sysconfigdata module is loaded from - # the currently running interpreter (ie. the build platform interpreter), but - # when cross-compiling we want to load it from the host platform interpreter. - # This can be done using the _PYTHON_SYSCONFIGDATA_NAME environment variable. - # The _PYTHON_HOST_PLATFORM variable also needs to be set to get the correct - # platform suffix on extension modules. The correct values for these variables - # are not documented, and must be derived from the configure script (see links - # below). - sysconfigdataHook = with stdenv.hostPlatform; with passthru; let - machdep = if isWindows then "win32" else parsed.kernel.name; # win32 is added by Fedora’s patch - - # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L428 - # The configure script uses "arm" as the CPU name for all 32-bit ARM - # variants when cross-compiling, but native builds include the version - # suffix, so we do the same. - pythonHostPlatform = let - cpu = { - # According to PEP600, Python's name for the Power PC - # architecture is "ppc", not "powerpc". Without the Rosetta - # Stone below, the PEP600 requirement that "${ARCH} matches - # the return value from distutils.util.get_platform()" fails. - # https://peps.python.org/pep-0600/ - powerpc = "ppc"; - powerpcle = "ppcle"; - powerpc64 = "ppc64"; - powerpc64le = "ppc64le"; - }.${parsed.cpu.name} or parsed.cpu.name; - in "${machdep}-${cpu}"; - - # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L724 - multiarchCpu = - if isAarch32 then - if parsed.cpu.significantByte.name == "littleEndian" then "arm" else "armeb" - else if isx86_32 then "i386" - else parsed.cpu.name; - - pythonAbiName = let - # python's build doesn't match the nixpkgs abi in some cases. - # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L724 - nixpkgsPythonAbiMappings = { - "gnuabielfv2" = "gnu"; - "muslabielfv2" = "musl"; - }; - pythonAbi = nixpkgsPythonAbiMappings.${parsed.abi.name} or parsed.abi.name; - in - # Python <3.11 doesn't distinguish musl and glibc and always prefixes with "gnu" - if versionOlder version "3.11" then - replaceStrings [ "musl" ] [ "gnu" ] pythonAbi - else - pythonAbi; - - multiarch = - if isDarwin then "darwin" - else if isFreeBSD then "" - else if isWindows then "" - else "${multiarchCpu}-${machdep}-${pythonAbiName}"; - - abiFlags = optionalString isPy37 "m"; - - # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L78 - pythonSysconfigdataName = "_sysconfigdata_${abiFlags}_${machdep}_${multiarch}"; - in '' - sysconfigdataHook() { - if [ "$1" = '${placeholder "out"}' ]; then - export _PYTHON_HOST_PLATFORM='${pythonHostPlatform}' - export _PYTHON_SYSCONFIGDATA_NAME='${pythonSysconfigdataName}' - fi - } - - addEnvHooks "$hostOffset" sysconfigdataHook - ''; + # win32 is added by Fedora’s patch + machdep = if stdenv.hostPlatform.isWindows then + "win32" + else + stdenv.hostPlatform.parsed.kernel.name; + + # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L428 + # The configure script uses "arm" as the CPU name for all 32-bit ARM + # variants when cross-compiling, but native builds include the version + # suffix, so we do the same. + pythonHostPlatform = let + cpu = { + # According to PEP600, Python's name for the Power PC + # architecture is "ppc", not "powerpc". Without the Rosetta + # Stone below, the PEP600 requirement that "${ARCH} matches + # the return value from distutils.util.get_platform()" fails. + # https://peps.python.org/pep-0600/ + powerpc = "ppc"; + powerpcle = "ppcle"; + powerpc64 = "ppc64"; + powerpc64le = "ppc64le"; + }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name; + in "${machdep}-${cpu}"; execSuffix = stdenv.hostPlatform.extensions.executable; in with passthru; stdenv.mkDerivation (finalAttrs: { @@ -293,9 +242,9 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { bash # only required for patchShebangs ] ++ buildInputs; - prePatch = optionalString stdenv.isDarwin '' + prePatch = optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace-fail '`/usr/bin/arch`' '"i386"' - '' + optionalString (pythonOlder "3.9" && stdenv.isDarwin && x11Support) '' + '' + optionalString (pythonOlder "3.9" && stdenv.hostPlatform.isDarwin && x11Support) '' # Broken on >= 3.9; replaced with ./3.9/darwin-tcl-tk.patch substituteInPlace setup.py --replace-fail /Library/Frameworks /no-such-path ''; @@ -307,7 +256,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { # (since it will do a futile invocation of gcc (!) to find # libuuid, slowing down program startup a lot). noldconfigPatch - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.isFreeBSD) [ + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isFreeBSD) [ # Cross compilation only supports a limited number of "known good" # configurations. If you're reading this and it's been a long time # since this diff, consider submitting this patch upstream! @@ -322,12 +271,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { ] ++ optionals mimetypesSupport [ # Make the mimetypes module refer to the right file ./mimetypes.patch - ] ++ optionals (pythonAtLeast "3.7" && pythonOlder "3.11") [ - # Fix darwin build https://bugs.python.org/issue34027 - ./3.7/darwin-libutil.patch - ] ++ optionals (pythonAtLeast "3.11") [ - ./3.11/darwin-libutil.patch - ] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.isDarwin) [ + ] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.hostPlatform.isDarwin) [ # Stop checking for TCL/TK in global macOS locations ./3.9/darwin-tcl-tk.patch ] ++ optionals (hasDistutilsCxxPatch && pythonOlder "3.12") [ @@ -375,16 +319,16 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { '' + optionalString mimetypesSupport '' substituteInPlace Lib/mimetypes.py \ --replace-fail "@mime-types@" "${mailcap}" - '' + optionalString (pythonOlder "3.13" && x11Support && (tix != null)) '' + '' + optionalString (pythonOlder "3.13" && x11Support && ((tclPackages.tix or null) != null)) '' substituteInPlace "Lib/tkinter/tix.py" --replace-fail \ "os.environ.get('TIX_LIBRARY')" \ - "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" + "os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'" ''; env = { CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs); LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs); - LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"}"; + LIBS = "${optionalString (!stdenv.hostPlatform.isDarwin) "-lcrypt"}"; NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) ({ "glibc" = "-lgcc_s"; "musl" = "-lgcc_eh"; @@ -414,9 +358,6 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { (enableFeature enableGIL "gil") ] ++ optionals enableOptimizations [ "--enable-optimizations" - ] ++ optionals (stdenv.isDarwin && configd == null) [ - # Make conditional on Darwin for now to avoid causing Linux rebuilds. - "py_cv_module__scproxy=n/a" ] ++ optionals (sqlite != null) [ "--enable-loadable-sqlite-extensions" ] ++ optionals (libxcrypt != null) [ @@ -467,16 +408,16 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { for path in /usr /sw /opt /pkg; do substituteInPlace ./setup.py --replace-warn $path /no-such-path done - '' + optionalString stdenv.isDarwin '' + '' + optionalString stdenv.hostPlatform.isDarwin '' # Override the auto-detection in setup.py, which assumes a universal build - export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.isAarch64 then "uint128" else "x64"} + export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.hostPlatform.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") '' + --replace-fail 'libmpdec_machine=universal' 'libmpdec_machine=${if stdenv.hostPlatform.isAarch64 then "uint128" else "x64"}' + '' + optionalString (stdenv.hostPlatform.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" '' + optionalString stdenv.hostPlatform.isMusl '' @@ -612,8 +553,31 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { # Add CPython specific setup-hook that configures distutils.sysconfig to # always load sysconfigdata from host Python. postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - cat << "EOF" >> "$out/nix-support/setup-hook" - ${sysconfigdataHook} + # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L78 + sysconfigdataName="$(make --eval $'print-sysconfigdata-name: + \t@echo _sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) ' print-sysconfigdata-name)" + + # The CPython interpreter contains a _sysconfigdata_<platform specific suffix> + # module that is imported by the sysconfig and distutils.sysconfig modules. + # The sysconfigdata module is generated at build time and contains settings + # required for building Python extension modules, such as include paths and + # other compiler flags. By default, the sysconfigdata module is loaded from + # the currently running interpreter (ie. the build platform interpreter), but + # when cross-compiling we want to load it from the host platform interpreter. + # This can be done using the _PYTHON_SYSCONFIGDATA_NAME environment variable. + # The _PYTHON_HOST_PLATFORM variable also needs to be set to get the correct + # platform suffix on extension modules. The correct values for these variables + # are not documented, and must be derived from the configure script (see links + # below). + cat <<EOF >> "$out/nix-support/setup-hook" + sysconfigdataHook() { + if [ "\$1" = '$out' ]; then + export _PYTHON_HOST_PLATFORM='${pythonHostPlatform}' + export _PYTHON_SYSCONFIGDATA_NAME='$sysconfigdataName' + fi + } + + addEnvHooks "\$hostOffset" sysconfigdataHook EOF ''; @@ -686,5 +650,6 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { pkgConfigModules = [ "python3" ]; platforms = platforms.linux ++ platforms.darwin ++ platforms.windows ++ platforms.freebsd; mainProgram = executable; + maintainers = lib.teams.python.members; }; }) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index e70816a90eee..7f0c8ce68110 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -20,10 +20,10 @@ sourceVersion = { major = "3"; minor = "12"; - patch = "5"; + patch = "7"; suffix = ""; }; - hash = "sha256-+oouEsXmILCfU+ZbzYdVDS5aHi4Ev4upkdzFUROHY5c="; + hash = "sha256-JIh7kuKv1KKsYCQZrUtZY3L2esmwdxkPRZq6OQ+vVVA="; }; }; @@ -38,7 +38,6 @@ in { suffix = ".8"; # ActiveState's Python 2 extended support }; hash = "sha256-HUOzu3uJbtd+3GbmGD35KOk/CDlwL4S7hi9jJGRFiqI="; - inherit (darwin) configd; inherit passthruFun; }; @@ -51,7 +50,6 @@ in { suffix = ""; }; hash = "sha256-aygSee/YUpTS1pk+FzmDpXRkwBM5Vvu7VTbslka+rww="; - inherit (darwin) configd; inherit passthruFun; }; @@ -64,7 +62,6 @@ in { suffix = ""; }; hash = "sha256-qrCVCBdzUXJgGHmHLZN8HkkopXxAmuAjaew9kdzOvnk="; - inherit (darwin) configd; inherit passthruFun; }; @@ -73,17 +70,15 @@ in { sourceVersion = { major = "3"; minor = "11"; - patch = "9"; + patch = "10"; suffix = ""; }; - hash = "sha256-mx6JZSP8UQaREmyGRAbZNgo9Hphqy9pZzaV7Wr2kW4c="; - inherit (darwin) configd; + hash = "sha256-B6Q1bpEpAOYaFcsJSaBsSgUBLiE+zWtOhND2equ+43I="; inherit passthruFun; }; python312 = callPackage ./cpython ({ self = __splicedPackages.python312; - inherit (darwin) configd; inherit passthruFun; } // sources.python312); @@ -93,10 +88,21 @@ in { major = "3"; minor = "13"; patch = "0"; - suffix = "rc2"; + suffix = ""; + }; + hash = "sha256-CG3liC48sxDU3KSEV1IuLkgBjs1D2pzfgn9qB1nvsH0="; + inherit passthruFun; + }; + + python314 = callPackage ./cpython { + self = __splicedPackages.python314; + sourceVersion = { + major = "3"; + minor = "14"; + patch = "0"; + suffix = "a1"; }; - hash = "sha256-1g6LfBDeT3HS3/r3x76O+lTcHlMv6THbuE5fYlcJ4jc="; - inherit (darwin) configd; + hash = "sha256-PkZLDLt1NeLbNCYv0ZoKOT0OYr4PQ7FRPtmDebBU6tQ="; inherit passthruFun; }; # Minimal versions of Python (built without optional dependencies) @@ -109,7 +115,6 @@ in { readline = null; ncurses = null; gdbm = null; - configd = null; sqlite = null; tzdata = null; libffi = libffiBoot; # without test suite @@ -139,11 +144,9 @@ in { hash = "sha256-3WHYjaJ0ws4s7HdmfUo9+aZSvMUOJvkJkdTdCvZrzPQ="; pythonVersion = "2.7"; - db = db.override { dbmSupport = !stdenv.isDarwin; }; + db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; }; python = __splicedPackages.pythonInterpreters.pypy27_prebuilt; inherit passthruFun; - inherit (darwin) libunwind; - inherit (darwin.apple_sdk.frameworks) Security; }; pypy39 = callPackage ./pypy { @@ -156,11 +159,9 @@ in { hash = "sha256-56IEbH5sJfw4aru1Ey6Sp8wkkeOTVpmpRstdy7NCwqo="; pythonVersion = "3.9"; - db = db.override { dbmSupport = !stdenv.isDarwin; }; + db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; }; python = __splicedPackages.pypy27; inherit passthruFun; - inherit (darwin) libunwind; - inherit (darwin.apple_sdk.frameworks) Security; }; pypy310 = __splicedPackages.pypy39.override { diff --git a/pkgs/development/interpreters/python/hooks/conda-install-hook.sh b/pkgs/development/interpreters/python/hooks/conda-install-hook.sh index af9ed60a038d..437ca46ff97c 100644 --- a/pkgs/development/interpreters/python/hooks/conda-install-hook.sh +++ b/pkgs/development/interpreters/python/hooks/conda-install-hook.sh @@ -1,7 +1,7 @@ # Setup hook to use in case a conda binary package is installed echo "Sourcing conda install hook" -condaInstallPhase(){ +condaInstallPhase() { echo "Executing condaInstallPhase" runHook preInstall @@ -10,11 +10,11 @@ condaInstallPhase(){ # or multiple top level directories. siteDir=@pythonSitePackages@ if [ -e ./site-packages ]; then - mkdir -p $out/$siteDir - cp -r ./site-packages/* $out/$siteDir + mkdir -p $out/$siteDir + cp -r ./site-packages/* $out/$siteDir else - cp -r . $out - rm $out/env-vars + cp -r . $out + rm $out/env-vars fi runHook postInstall diff --git a/pkgs/development/interpreters/python/hooks/conda-unpack-hook.sh b/pkgs/development/interpreters/python/hooks/conda-unpack-hook.sh index 6204c13b7221..b9d13fe1ee10 100644 --- a/pkgs/development/interpreters/python/hooks/conda-unpack-hook.sh +++ b/pkgs/development/interpreters/python/hooks/conda-unpack-hook.sh @@ -1,7 +1,7 @@ # Setup hook to use in case a conda binary package is fetched echo "Sourcing conda unpack hook" -condaUnpackPhase(){ +condaUnpackPhase() { echo "Executing condaUnpackPhase" runHook preUnpack diff --git a/pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh b/pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh index c8ed3dee83ba..25d099bfc5ef 100644 --- a/pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh +++ b/pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh @@ -1,13 +1,13 @@ # Setup hook to use in case an egg is fetched echo "Sourcing egg setup hook" -eggUnpackPhase(){ +eggUnpackPhase() { echo "Executing eggUnpackPhase" runHook preUnpack cp "$src" "$(stripHash "$src")" -# runHook postUnpack # Calls find...? + # runHook postUnpack # Calls find...? echo "Finished executing eggUnpackPhase" } diff --git a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh index 9de4c7d1dd0d..430951bac7c9 100644 --- a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh @@ -1,22 +1,27 @@ # Setup hook to use for pip projects -echo "Sourcing pip-build-hook" +# shellcheck shell=bash -declare -a pipBuildFlags +echo "Sourcing pip-build-hook" pipBuildPhase() { echo "Executing pipBuildPhase" runHook preBuild mkdir -p dist + + local -a flagsArray=( + --verbose + --no-index + --no-deps + --no-clean + --no-build-isolation + --wheel-dir dist + ) + concatTo flagsArray pipBuildFlags + echo "Creating a wheel..." - @pythonInterpreter@ -m pip wheel \ - --verbose \ - --no-index \ - --no-deps \ - --no-clean \ - --no-build-isolation \ - --wheel-dir dist \ - $pipBuildFlags . + echoCmd 'pip build flags' "${flagsArray[@]}" + @pythonInterpreter@ -m pip wheel "${flagsArray[@]}" . echo "Finished creating a wheel..." runHook postBuild @@ -29,12 +34,12 @@ pipShellHook() { # Long-term setup.py should be dropped. if [ -e pyproject.toml ]; then - tmp_path=$(mktemp -d) - export PATH="$tmp_path/bin:$PATH" - export PYTHONPATH="$tmp_path/@pythonSitePackages@:$PYTHONPATH" - mkdir -p "$tmp_path/@pythonSitePackages@" - @pythonInterpreter@ -m pip install -e . --prefix "$tmp_path" \ - --no-build-isolation >&2 + tmp_path=$(mktemp -d) + export PATH="$tmp_path/bin:$PATH" + export PYTHONPATH="$tmp_path/@pythonSitePackages@:$PYTHONPATH" + mkdir -p "$tmp_path/@pythonSitePackages@" + @pythonInterpreter@ -m pip install -e . --prefix "$tmp_path" \ + --no-build-isolation >&2 fi runHook postShellHook diff --git a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh index a4f08b8b14cb..0f718a6c4bb8 100644 --- a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh @@ -1,17 +1,27 @@ # Setup hook for pip. -echo "Sourcing pip-install-hook" +# shellcheck shell=bash -declare -a pipInstallFlags +echo "Sourcing pip-install-hook" pipInstallPhase() { echo "Executing pipInstallPhase" runHook preInstall + # shellcheck disable=SC2154 mkdir -p "$out/@pythonSitePackages@" export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH" + local -a flagsArray=( + --no-index + --no-warn-script-location + --prefix="$out" + --no-cache + ) + concatTo flagsArray pipInstallFlags + pushd dist || return 1 - @pythonInterpreter@ -m pip install ./*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache $pipInstallFlags + echoCmd 'pip install flags' "${flagsArray[@]}" + @pythonInterpreter@ -m pip install ./*.whl "${flagsArray[@]}" popd || return 1 runHook postInstall diff --git a/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix b/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix index 4153c21ca4f9..f862429d3987 100644 --- a/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix +++ b/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix @@ -10,9 +10,9 @@ ''; # the source of the example project projectSource = runCommand "my-project-source" {} '' - mkdir -p $out/src + mkdir -p $out/src/my_project cp ${pyprojectToml} $out/pyproject.toml - touch $out/src/__init__.py + touch $out/src/my_project/__init__.py ''; in # this build must never triger conflicts @@ -20,11 +20,13 @@ pname = "dont-propagate-conflicting-deps"; version = "0.0.0"; src = projectSource; - format = "pyproject"; - propagatedBuildInputs = [ + pyproject = true; + dependencies = [ # At least one dependency of `build` should be included here to # keep the test meaningful (mkConflict pythonOnBuildForHost.pkgs.tomli) + ]; + build-system = [ # setuptools is also needed to build the example project pythonOnBuildForHost.pkgs.setuptools ]; diff --git a/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh b/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh index dd49d935bcee..88472b468688 100644 --- a/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh @@ -1,12 +1,22 @@ # Setup hook to use for pypa/build projects +# shellcheck shell=bash + echo "Sourcing pypa-build-hook" pypaBuildPhase() { echo "Executing pypaBuildPhase" runHook preBuild + local -a flagsArray=( + --no-isolation + --outdir dist/ + --wheel + ) + concatTo flagsArray pypaBuildFlags + echo "Creating a wheel..." - @build@/bin/pyproject-build --no-isolation --outdir dist/ --wheel $pypaBuildFlags + echoCmd 'pypa build flags' "${flagsArray[@]}" + @build@/bin/pyproject-build "${flagsArray[@]}" echo "Finished creating a wheel..." runHook postBuild diff --git a/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh b/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh index 2d925742daa7..f6d60be35d21 100644 --- a/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh @@ -5,14 +5,14 @@ pypaInstallPhase() { echo "Executing pypaInstallPhase" runHook preInstall - pushd dist > /dev/null + pushd dist >/dev/null for wheel in *.whl; do @pythonInterpreter@ -m installer --prefix "$out" "$wheel" echo "Successfully installed $wheel" done - popd > /dev/null + popd >/dev/null export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH" diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh index 06694e79e492..fd61fd14043d 100644 --- a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh @@ -18,11 +18,11 @@ function _concatSep { echo "$result" } -function _pytestComputeDisabledTestsString () { +function _pytestComputeDisabledTestsString() { declare -a tests local tests=($1) local prefix="not " - prefixed=( "${tests[@]/#/$prefix}" ) + prefixed=("${tests[@]/#/$prefix}") result=$(_concatSep "and" prefixed) echo "$result" } @@ -35,7 +35,7 @@ function pytestCheckPhase() { args=" -m pytest" if [ -n "$disabledTests" ]; then disabledTestsString=$(_pytestComputeDisabledTestsString "${disabledTests[@]}") - args+=" -k \""$disabledTestsString"\"" + args+=" -k \""$disabledTestsString"\"" fi if [ -n "${disabledTestPaths-}" ]; then @@ -43,11 +43,11 @@ function pytestCheckPhase() { fi for path in ${disabledTestPaths[@]}; do - if [ ! -e "$path" ]; then - echo "Disabled tests path \"$path\" does not exist. Aborting" - exit 1 - fi - args+=" --ignore=\"$path\"" + if [ ! -e "$path" ]; then + echo "Disabled tests path \"$path\" does not exist. Aborting" + exit 1 + fi + args+=" --ignore=\"$path\"" done args+=" ${pytestFlagsArray[@]}" eval "@pythonCheckInterpreter@ $args" @@ -58,5 +58,5 @@ function pytestCheckPhase() { if [ -z "${dontUsePytestCheck-}" ] && [ -z "${installCheckPhase-}" ]; then echo "Using pytestCheckPhase" - preDistPhases+=" pytestCheckPhase" + appendToVar preDistPhases pytestCheckPhase fi diff --git a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh index 0abcad3c42f2..6ba3d7f65cb4 100644 --- a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh @@ -6,5 +6,5 @@ pythonCatchConflictsPhase() { } if [ -z "${dontUsePythonCatchConflicts-}" ]; then - preDistPhases+=" pythonCatchConflictsPhase" + appendToVar preDistPhases pythonCatchConflictsPhase fi diff --git a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh index b65d6e745247..c3c758d6a902 100644 --- a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh @@ -1,22 +1,28 @@ +# shellcheck shell=bash + # Setup hook for checking whether Python imports succeed echo "Sourcing python-imports-check-hook.sh" -pythonImportsCheckPhase () { +pythonImportsCheckPhase() { echo "Executing pythonImportsCheckPhase" - if [ -n "$pythonImportsCheck" ]; then - echo "Check whether the following modules can be imported: $pythonImportsCheck" - pythonImportsCheckOutput=$out - if [ -n "$python" ]; then + if [[ -n "${pythonImportsCheck[*]-}" ]]; then + echo "Check whether the following modules can be imported: ${pythonImportsCheck[*]}" + # shellcheck disable=SC2154 + pythonImportsCheckOutput="$out" + if [[ -n "${python-}" ]]; then echo "Using python specific output \$python for imports check" pythonImportsCheckOutput=$python fi export PYTHONPATH="$pythonImportsCheckOutput/@pythonSitePackages@:$PYTHONPATH" - ( cd $pythonImportsCheckOutput && eval "@pythonCheckInterpreter@ -c 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ[\"pythonImportsCheck\"].split()))'" ) + # Python modules and namespaces names are Python identifiers, which must not contain spaces. + # See https://docs.python.org/3/reference/lexical_analysis.html + # shellcheck disable=SC2048,SC2086 + (cd "$pythonImportsCheckOutput" && @pythonCheckInterpreter@ -c 'import sys; import importlib; list(map(lambda mod: importlib.import_module(mod), sys.argv[1:]))' ${pythonImportsCheck[*]}) fi } -if [ -z "${dontUsePythonImportsCheck-}" ]; then +if [[ -z "${dontUsePythonImportsCheck-}" ]]; then echo "Using pythonImportsCheckPhase" - preDistPhases+=" pythonImportsCheckPhase" + appendToVar preDistPhases pythonImportsCheckPhase fi diff --git a/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh b/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh index 37479d9d4111..add56f5b6413 100644 --- a/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh @@ -1,20 +1,26 @@ # Clean up __init__.py's found in namespace directories +# shellcheck shell=bash + echo "Sourcing python-namespaces-hook" pythonNamespacesHook() { echo "Executing pythonNamespacesHook" - for namespace in ${pythonNamespaces[@]}; do + # Python namespaces names are Python identifiers, which must not contain spaces. + # See https://docs.python.org/3/reference/lexical_analysis.html + # shellcheck disable=SC2048 + for namespace in ${pythonNamespaces[*]-}; do echo "Enforcing PEP420 namespace: ${namespace}" # split namespace into segments. "azure.mgmt" -> "azure mgmt" - IFS='.' read -ra pathSegments <<< $namespace + IFS='.' read -ra pathSegments <<<"$namespace" + # shellcheck disable=SC2154 constructedPath=$out/@pythonSitePackages@ # Need to remove the __init__.py at each namespace level # E.g `azure/__init__.py` and `azure/mgmt/__init__.py` # The __pycache__ entry also needs to be removed - for pathSegment in ${pathSegments[@]}; do + for pathSegment in "${pathSegments[@]}"; do constructedPath=${constructedPath}/${pathSegment} pathToRemove=${constructedPath}/__init__.py pycachePath=${constructedPath}/__pycache__/ @@ -30,9 +36,9 @@ pythonNamespacesHook() { # event of a "meta-package" package, which will just install # other packages, but not produce anything in site-packages # besides meta information - if [ -d "${constructedPath}/../" -a -z ${dontRemovePth-} ]; then + if [[ -d "${constructedPath}/../" ]] && [[ -z "${dontRemovePth-}" ]]; then # .pth files are located in the parent directory of a module - @findutils@/bin/find ${constructedPath}/../ -name '*-nspkg.pth' -exec rm -v "{}" + + @findutils@/bin/find "${constructedPath}/../" -name '*-nspkg.pth' -exec rm -v "{}" + fi # remove __pycache__/ entry, can be interpreter specific. E.g. __init__.cpython-38.pyc @@ -46,7 +52,6 @@ pythonNamespacesHook() { echo "Finished executing pythonNamespacesHook" } -if [ -z "${dontUsePythonNamespacesHook-}" -a -n "${pythonNamespaces-}" ]; then +if [[ -z "${dontUsePythonNamespacesHook-}" ]] && [[ -n "${pythonNamespaces-}" ]]; then postFixupHooks+=(pythonNamespacesHook) fi - diff --git a/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh b/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh index 83b79d01fa40..be54b546cadb 100644 --- a/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh @@ -1,9 +1,12 @@ # Setup hook for storing dist folder (wheels/sdists) in a separate output +# shellcheck shell=bash + echo "Sourcing python-catch-conflicts-hook.sh" pythonOutputDistPhase() { echo "Executing pythonOutputDistPhase" if [[ -d dist ]]; then + # shellcheck disable=SC2154 mv "dist" "$dist" else cat >&2 <<EOF @@ -21,4 +24,4 @@ EOF echo "Finished executing pythonOutputDistPhase" } -preFixupPhases+=" pythonOutputDistPhase" +appendToVar preFixupPhases pythonOutputDistPhase diff --git a/pkgs/development/interpreters/python/hooks/python-recompile-bytecode-hook.sh b/pkgs/development/interpreters/python/hooks/python-recompile-bytecode-hook.sh index 649d0c17ea0c..b64a44b650b3 100644 --- a/pkgs/development/interpreters/python/hooks/python-recompile-bytecode-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-recompile-bytecode-hook.sh @@ -6,7 +6,7 @@ echo "Sourcing python-recompile-bytecode-hook.sh" # Note this effectively duplicates `python-remove-bin-bytecode`, but long-term # this hook should be removed again. -pythonRecompileBytecodePhase () { +pythonRecompileBytecodePhase() { # TODO: consider other outputs than $out items="$(find "$out" -name "@bytecodeName@")" @@ -20,5 +20,5 @@ pythonRecompileBytecodePhase () { } if [ -z "${dontUsePythonRecompileBytecode-}" ]; then - postPhases+=" pythonRecompileBytecodePhase" + appendToVar postPhases pythonRecompileBytecodePhase fi 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 7fd1b52a04bf..9b5bd6f37ca9 100644 --- a/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh @@ -42,13 +42,14 @@ _pythonRelaxDeps() { local -r metadata_file="$1" - if [[ -z "${pythonRelaxDeps:-}" ]] || [[ "$pythonRelaxDeps" == 0 ]]; then + if [[ -z "${pythonRelaxDeps[*]-}" ]] || [[ "$pythonRelaxDeps" == 0 ]]; then return elif [[ "$pythonRelaxDeps" == 1 ]]; then sed -i "$metadata_file" -r \ -e 's/(Requires-Dist: [a-zA-Z0-9_.-]+\s*(\[[^]]+\])?)[^;]*(;.*)?/\1\3/' else - for dep in $pythonRelaxDeps; do + # shellcheck disable=SC2048 + for dep in ${pythonRelaxDeps[*]}; do sed -i "$metadata_file" -r \ -e "s/(Requires-Dist: $dep\s*(\[[^]]+\])?)[^;]*(;.*)?/\1\3/i" done @@ -58,13 +59,14 @@ _pythonRelaxDeps() { _pythonRemoveDeps() { local -r metadata_file="$1" - if [[ -z "${pythonRemoveDeps:-}" ]] || [[ "$pythonRemoveDeps" == 0 ]]; then + if [[ -z "${pythonRemoveDeps[*]-}" ]] || [[ "$pythonRemoveDeps" == 0 ]]; then return elif [[ "$pythonRemoveDeps" == 1 ]]; then sed -i "$metadata_file" \ -e '/Requires-Dist:.*/d' else - for dep in $pythonRemoveDeps; do + # shellcheck disable=SC2048 + for dep in ${pythonRemoveDeps[*]-}; do sed -i "$metadata_file" \ -e "/Requires-Dist: $dep/d" done @@ -86,11 +88,14 @@ pythonRelaxDepsHook() { rm -rf "$wheel" # Using no quotes on purpose since we need to expand the glob from `$metadata_file` + # shellcheck disable=SC2086 _pythonRelaxDeps $metadata_file + # shellcheck disable=SC2086 _pythonRemoveDeps $metadata_file - if (( "${NIX_DEBUG:-0}" >= 1 )); then + if (("${NIX_DEBUG:-0}" >= 1)); then echo "pythonRelaxDepsHook: resulting METADATA for '$wheel':" + # shellcheck disable=SC2086 cat $metadata_file fi diff --git a/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh b/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh index 1180694294db..7e49251306e8 100644 --- a/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh @@ -5,13 +5,13 @@ echo "Sourcing python-remove-bin-bytecode-hook.sh" # It may happen there are executables with a .py extension for which # bytecode is generated. This hook removes that bytecode. -pythonRemoveBinBytecodePhase () { +pythonRemoveBinBytecodePhase() { if [ -d "$out/bin" ]; then - rm -rf "$out/bin/__pycache__" # Python 3 - find "$out/bin" -type f -name "*.pyc" -delete # Python 2 + rm -rf "$out/bin/__pycache__" # Python 3 + find "$out/bin" -type f -name "*.pyc" -delete # Python 2 fi } if [ -z "${dontUsePythonRemoveBinBytecode-}" ]; then - preDistPhases+=" pythonRemoveBinBytecodePhase" + appendToVar preDistPhases pythonRemoveBinBytecodePhase fi diff --git a/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh b/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh index ad9e3c07cf24..43c991b74469 100644 --- a/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh @@ -1,11 +1,14 @@ # Clean up top-level tests directory in site-package installation. +# shellcheck shell=bash + echo "Sourcing python-remove-tests-dir-hook" pythonRemoveTestsDir() { echo "Executing pythonRemoveTestsDir" - rm -rf $out/@pythonSitePackages@/tests - rm -rf $out/@pythonSitePackages@/test + # shellcheck disable=SC2154 + rm -rf "$out/@pythonSitePackages@/tests" + rm -rf "$out/@pythonSitePackages@/test" echo "Finished executing pythonRemoveTestsDir" } diff --git a/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.sh b/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.sh index 43a2f9b88745..dc888262ea0d 100644 --- a/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.sh @@ -16,5 +16,5 @@ pythonRuntimeDepsCheckHook() { if [ -z "${dontCheckRuntimeDeps-}" ]; then echo "Using pythonRuntimeDepsCheckHook" - preInstallPhases+=" pythonRuntimeDepsCheckHook" + appendToVar preInstallPhases pythonRuntimeDepsCheckHook fi diff --git a/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh index 917c19ef9b31..5a0916f8acc4 100644 --- a/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh +++ b/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash + echo "Sourcing setuptools-rust-hook" setuptoolsRustSetup() { diff --git a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh index 0307e83d9479..6825b5f4db04 100644 --- a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh +++ b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh @@ -9,15 +9,15 @@ buildSphinxPhase() { local __sphinxRoot="" runHook preBuildSphinx - if [[ -n "${sphinxRoot:-}" ]] ; then # explicit root - if ! [[ -f "${sphinxRoot}/conf.py" ]] ; then + if [[ -n "${sphinxRoot:-}" ]]; then # explicit root + if ! [[ -f "${sphinxRoot}/conf.py" ]]; then echo 2>&1 "$sphinxRoot/conf.py: no such file" exit 1 fi __sphinxRoot=$sphinxRoot else - for candidate in doc docs doc/source docs/source ; do - if [[ -f "$candidate/conf.py" ]] ; then + for candidate in doc docs doc/source docs/source; do + if [[ -f "$candidate/conf.py" ]]; then echo "Sphinx documentation found in $candidate" __sphinxRoot=$candidate break @@ -25,7 +25,7 @@ buildSphinxPhase() { done fi - if [[ -z "${__sphinxRoot}" ]] ; then + if [[ -z "${__sphinxRoot}" ]]; then echo 2>&1 "Sphinx documentation not found, use 'sphinxRoot' variable" exit 1 fi @@ -69,4 +69,4 @@ installSphinxPhase() { runHook postInstallSphinx } -preDistPhases+=" buildSphinxPhase installSphinxPhase" +appendToVar preDistPhases buildSphinxPhase installSphinxPhase diff --git a/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh b/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh index f4bd34747730..64ecb13cbc71 100644 --- a/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh @@ -13,5 +13,5 @@ unittestCheckPhase() { if [ -z "${dontUseUnittestCheck-}" ] && [ -z "${installCheckPhase-}" ]; then echo "Using unittestCheckPhase" - preDistPhases+=" unittestCheckPhase" + appendToVar preDistPhases unittestCheckPhase fi diff --git a/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh b/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh index 1fcc0bbd4b13..958bfe98ee69 100644 --- a/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh +++ b/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh @@ -3,14 +3,14 @@ venvShellHook() { runHook preShellHook if [ -d "${venvDir}" ]; then - echo "Skipping venv creation, '${venvDir}' already exists" - source "${venvDir}/bin/activate" + echo "Skipping venv creation, '${venvDir}' already exists" + source "${venvDir}/bin/activate" else - echo "Creating new venv environment in path: '${venvDir}'" - @pythonInterpreter@ -m venv "${venvDir}" + echo "Creating new venv environment in path: '${venvDir}'" + @pythonInterpreter@ -m venv "${venvDir}" - source "${venvDir}/bin/activate" - runHook postVenvCreation + source "${venvDir}/bin/activate" + runHook postVenvCreation fi runHook postShellHook diff --git a/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh b/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh index fca808a933ba..d15ec0412c25 100644 --- a/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh +++ b/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh @@ -1,14 +1,14 @@ # Setup hook to use in case a wheel is fetched echo "Sourcing wheel setup hook" -wheelUnpackPhase(){ +wheelUnpackPhase() { echo "Executing wheelUnpackPhase" runHook preUnpack mkdir -p dist cp "$src" "dist/$(stripHash "$src")" -# runHook postUnpack # Calls find...? + # runHook postUnpack # Calls find...? echo "Finished executing wheelUnpackPhase" } diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index d75fea0eaef1..2337b2eaa7c7 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -61,7 +61,7 @@ let cleanAttrs = lib.flip removeAttrs [ "disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "pyproject" "format" - "disabledTestPaths" "outputs" "stdenv" + "disabledTestPaths" "disabledTests" "pytestFlagsArray" "unittestFlagsArray" "outputs" "stdenv" "dependencies" "optional-dependencies" "build-system" ]; @@ -215,23 +215,6 @@ let isSetuptoolsDependency = isSetuptoolsDependency' (attrs.pname or null); - passthru = - attrs.passthru or { } - // { - updateScript = let - filename = head (splitString ":" self.meta.position); - in attrs.passthru.updateScript or [ update-python-libraries filename ]; - } - // optionalAttrs (dependencies != []) { - inherit dependencies; - } - // optionalAttrs (optional-dependencies != {}) { - inherit optional-dependencies; - } - // optionalAttrs (build-system != []) { - inherit build-system; - }; - # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. self = toPythonModule (stdenv.mkDerivation ((cleanAttrs attrs) // { @@ -307,7 +290,7 @@ let inherit strictDeps; - LANG = "${if python.stdenv.isDarwin then "en_US" else "C"}.UTF-8"; + LANG = "${if python.stdenv.hostPlatform.isDarwin then "en_US" else "C"}.UTF-8"; # Python packages don't have a checkPhase, only an installCheckPhase doCheck = false; @@ -324,7 +307,21 @@ let outputs = outputs ++ optional withDistOutput "dist"; - inherit passthru; + passthru = attrs.passthru or { } + // { + updateScript = let + filename = head (splitString ":" self.meta.position); + in attrs.passthru.updateScript or [ update-python-libraries filename ]; + } + // optionalAttrs (dependencies != []) { + inherit dependencies; + } + // optionalAttrs (optional-dependencies != {}) { + inherit optional-dependencies; + } + // optionalAttrs (build-system != []) { + inherit build-system; + }; meta = { # default to python's platforms @@ -335,11 +332,21 @@ let # If given use the specified checkPhase, otherwise use the setup hook. # Longer-term we should get rid of `checkPhase` and use `installCheckPhase`. installCheckPhase = attrs.checkPhase; - } // optionalAttrs (disabledTestPaths != []) { + } // optionalAttrs (attrs.doCheck or true) ( + optionalAttrs (disabledTestPaths != []) { disabledTestPaths = escapeShellArgs disabledTestPaths; - })); + } // optionalAttrs (attrs ? disabledTests) { + # `escapeShellArgs` should be used as well as `disabledTestPaths`, + # but some packages rely on existing raw strings. + disabledTests = attrs.disabledTests; + } // optionalAttrs (attrs ? pytestFlagsArray) { + pytestFlagsArray = attrs.pytestFlagsArray; + } // optionalAttrs (attrs ? unittestFlagsArray) { + unittestFlagsArray = attrs.unittestFlagsArray; + } + ))); in extendDerivation (disabled -> throw "${name} not supported for interpreter ${python.executable}") - passthru + { } self diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix index b06433113b6b..dc2f3c7dc17c 100644 --- a/pkgs/development/interpreters/python/passthrufun.nix +++ b/pkgs/development/interpreters/python/passthrufun.nix @@ -93,7 +93,7 @@ in rec { inherit hasDistutilsCxxPatch; # Remove after 24.11 is released. pythonForBuild = - lib.warnIf (lib.isInOldestRelease 2311) "`pythonForBuild` (from `python*`) has been renamed to `pythonOnBuildForHost`" + lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2311) "`pythonForBuild` (from `python*`) has been renamed to `pythonOnBuildForHost`" pythonOnBuildForHost_overridden; pythonOnBuildForHost = pythonOnBuildForHost_overridden; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 0380c29e9e75..795bceede768 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, substituteAll, fetchurl , zlibSupport ? true, zlib -, bzip2, pkg-config, libffi, libunwind, Security -, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, libX11 +, bzip2, pkg-config, libffi +, sqlite, openssl, ncurses, python, expat, tcl, tk, tclPackages, libX11 , gdbm, db, xz, python-setup-hook , optimizationLevel ? "jit", boehmgc # For the Python package set @@ -63,8 +63,6 @@ in with passthru; stdenv.mkDerivation rec { zlib ] ++ lib.optionals (lib.any (l: l == optimizationLevel) [ "0" "1" "2" "3"]) [ boehmgc - ] ++ lib.optionals stdenv.isDarwin [ - libunwind Security ]; # Remove bootstrap python from closure @@ -98,7 +96,7 @@ in with passthru; stdenv.mkDerivation rec { --replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES" substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" \ - --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" + --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'" ''; buildPhase = '' @@ -132,9 +130,9 @@ in with passthru; stdenv.mkDerivation rec { runHook postInstall ''; - preFixup = lib.optionalString (stdenv.isDarwin) '' + preFixup = lib.optionalString (stdenv.hostPlatform.isDarwin) '' install_name_tool -change @rpath/lib${executable}-c.dylib $out/lib/lib${executable}-c.dylib $out/bin/${executable} - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' mkdir -p $out/${executable}-c/pypy/bin mv $out/bin/${executable} $out/${executable}-c/pypy/bin/${executable} ln -s $out/${executable}-c/pypy/bin/${executable} $out/bin/${executable} diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 4b47c642eca4..95e392bc37b7 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -71,15 +71,15 @@ in with passthru; stdenv.mkDerivation { sqlite zlib stdenv.cc.cc.libgcc or null - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ tcl-8_5 tk-8_5 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ tcl-8_6 tk-8_6 ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; installPhase = '' runHook preInstall @@ -88,7 +88,7 @@ in with passthru; stdenv.mkDerivation { echo "Moving files to $out" mv -t $out bin include lib mv $out/bin/libpypy*-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' rm $out/bin/*.debug ''} @@ -101,12 +101,12 @@ in with passthru; stdenv.mkDerivation { runHook postInstall ''; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' find $out/{lib,lib_pypy*} -name "*.so" \ -exec patchelf \ --replace-needed libtinfow.so.6 libncursesw.so.6 \ --replace-needed libgdbm.so.4 libgdbm_compat.so.4 {} \; - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool \ -change \ @rpath/lib${libPrefix}-c.dylib \ @@ -119,12 +119,12 @@ in with passthru; stdenv.mkDerivation { $out/bin/${libPrefix} install_name_tool \ -change \ - /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \ + /opt/homebrew${lib.optionalString stdenv.hostPlatform.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \ ${tcl-8_6}/lib/libtcl8.6.dylib \ $out/lib/${libPrefix}/_tkinter/*.so install_name_tool \ -change \ - /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \ + /opt/homebrew${lib.optionalString stdenv.hostPlatform.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \ ${tk-8_6}/lib/libtk8.6.dylib \ $out/lib/${libPrefix}/_tkinter/*.so ''; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index 37a06f9f61ed..0d7e2d131abc 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -71,15 +71,15 @@ in with passthru; stdenv.mkDerivation { sqlite zlib stdenv.cc.cc.libgcc or null - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ tcl-8_5 tk-8_5 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ tcl-8_6 tk-8_6 ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; installPhase = '' runHook preInstall @@ -88,7 +88,7 @@ in with passthru; stdenv.mkDerivation { echo "Moving files to $out" mv -t $out bin include lib-python lib_pypy site-packages mv $out/bin/libpypy*-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' mv lib/libffi.so.6* $out/lib/ rm $out/bin/*.debug ''} @@ -102,12 +102,12 @@ in with passthru; stdenv.mkDerivation { runHook postInstall ''; - preFixup = lib.optionalString (stdenv.isLinux) '' + preFixup = lib.optionalString (stdenv.hostPlatform.isLinux) '' find $out/{lib,lib_pypy*} -name "*.so" \ -exec patchelf \ --replace-needed libtinfow.so.6 libncursesw.so.6 \ --replace-needed libgdbm.so.4 libgdbm_compat.so.4 {} \; - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' install_name_tool \ -change \ @rpath/lib${executable}-c.dylib \ @@ -115,12 +115,12 @@ in with passthru; stdenv.mkDerivation { $out/bin/${executable} install_name_tool \ -change \ - /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \ + /opt/homebrew${lib.optionalString stdenv.hostPlatform.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \ ${tcl-8_6}/lib/libtcl8.6.dylib \ $out/lib_pypy/_tkinter/*.so install_name_tool \ -change \ - /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \ + /opt/homebrew${lib.optionalString stdenv.hostPlatform.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \ ${tk-8_6}/lib/libtk8.6.dylib \ $out/lib_pypy/_tkinter/*.so ''; diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index 9fad8e56d5d4..1b10b44fb243 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -37,15 +37,15 @@ let else ./python2/mk-python-derivation.nix; - buildPythonPackage = makeOverridablePythonPackage (lib.makeOverridable (callPackage mkPythonDerivation { + buildPythonPackage = makeOverridablePythonPackage (callPackage mkPythonDerivation { inherit namePrefix; # We want Python libraries to be named like e.g. "python3.6-${name}" inherit toPythonModule; # Libraries provide modules - })); + }); - buildPythonApplication = makeOverridablePythonPackage (lib.makeOverridable (callPackage mkPythonDerivation { + buildPythonApplication = makeOverridablePythonPackage (callPackage mkPythonDerivation { namePrefix = ""; # Python applications should not have any prefix toPythonModule = x: x; # Application does not provide modules. - })); + }); # Check whether a derivation provides a Python module. hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix index 0fb6a5d57f22..427c94241070 100644 --- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix @@ -204,7 +204,7 @@ let inherit strictDeps; - LANG = "${if python.stdenv.isDarwin then "en_US" else "C"}.UTF-8"; + LANG = "${if python.stdenv.hostPlatform.isDarwin then "en_US" else "C"}.UTF-8"; # Python packages don't have a checkPhase, only an installCheckPhase doCheck = false; diff --git a/pkgs/development/interpreters/python/rustpython/Cargo.lock b/pkgs/development/interpreters/python/rustpython/Cargo.lock index 01118ff8a98e..5fcb773d8461 100644 --- a/pkgs/development/interpreters/python/rustpython/Cargo.lock +++ b/pkgs/development/interpreters/python/rustpython/Cargo.lock @@ -497,11 +497,10 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ - "cfg-if", "crossbeam-utils", ] @@ -1056,6 +1055,16 @@ dependencies = [ ] [[package]] +name = "junction" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca39ef0d69b18e6a2fd14c2f0a1d593200f4a4ed949b240b5917ab51fac754cb" +dependencies = [ + "scopeguard", + "winapi", +] + +[[package]] name = "keccak" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1139,9 +1148,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.25.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" dependencies = [ "cc", "pkg-config", @@ -1155,7 +1164,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" dependencies = [ "cc", - "libc", "pkg-config", "vcpkg", ] @@ -1493,9 +1501,9 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "openssl" -version = "0.10.62" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ "bitflags 2.5.0", "cfg-if", @@ -1534,9 +1542,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.98" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -1965,9 +1973,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ "bitflags 2.5.0", "errno", @@ -1978,7 +1986,7 @@ dependencies = [ [[package]] name = "rustpython" -version = "0.3.1" +version = "0.4.0" dependencies = [ "atty", "cfg-if", @@ -2001,8 +2009,9 @@ dependencies = [ [[package]] name = "rustpython-ast" -version = "0.3.1" -source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cdaf8ee5c1473b993b398c174641d3aa9da847af36e8d5eb8291930b72f31a5" dependencies = [ "is-macro", "malachite-bigint", @@ -2013,7 +2022,7 @@ dependencies = [ [[package]] name = "rustpython-codegen" -version = "0.3.1" +version = "0.4.0" dependencies = [ "ahash", "bitflags 2.5.0", @@ -2031,7 +2040,7 @@ dependencies = [ [[package]] name = "rustpython-common" -version = "0.3.1" +version = "0.4.0" dependencies = [ "ascii", "bitflags 2.5.0", @@ -2053,11 +2062,12 @@ dependencies = [ "siphasher", "volatile", "widestring", + "windows-sys 0.52.0", ] [[package]] name = "rustpython-compiler" -version = "0.3.1" +version = "0.4.0" dependencies = [ "rustpython-codegen", "rustpython-compiler-core", @@ -2066,7 +2076,7 @@ dependencies = [ [[package]] name = "rustpython-compiler-core" -version = "0.3.1" +version = "0.4.0" dependencies = [ "bitflags 2.5.0", "itertools 0.11.0", @@ -2079,7 +2089,7 @@ dependencies = [ [[package]] name = "rustpython-derive" -version = "0.3.1" +version = "0.4.0" dependencies = [ "rustpython-compiler", "rustpython-derive-impl", @@ -2088,7 +2098,7 @@ dependencies = [ [[package]] name = "rustpython-derive-impl" -version = "0.3.1" +version = "0.4.0" dependencies = [ "itertools 0.11.0", "maplit", @@ -2113,8 +2123,9 @@ dependencies = [ [[package]] name = "rustpython-format" -version = "0.3.1" -source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0389039b132ad8e350552d771270ccd03186985696764bcee2239694e7839942" dependencies = [ "bitflags 2.5.0", "itertools 0.11.0", @@ -2125,7 +2136,7 @@ dependencies = [ [[package]] name = "rustpython-jit" -version = "0.3.1" +version = "0.4.0" dependencies = [ "approx", "cranelift", @@ -2140,8 +2151,9 @@ dependencies = [ [[package]] name = "rustpython-literal" -version = "0.3.1" -source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8304be3cae00232a1721a911033e55877ca3810215f66798e964a2d8d22281d" dependencies = [ "hexf-parse", "is-macro", @@ -2152,8 +2164,9 @@ dependencies = [ [[package]] name = "rustpython-parser" -version = "0.3.1" -source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "868f724daac0caf9bd36d38caf45819905193a901e8f1c983345a68e18fb2abb" dependencies = [ "anyhow", "is-macro", @@ -2175,8 +2188,9 @@ dependencies = [ [[package]] name = "rustpython-parser-core" -version = "0.3.1" -source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b6c12fa273825edc7bccd9a734f0ad5ba4b8a2f4da5ff7efe946f066d0f4ad" dependencies = [ "is-macro", "memchr", @@ -2185,8 +2199,9 @@ dependencies = [ [[package]] name = "rustpython-parser-vendored" -version = "0.3.1" -source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04fcea49a4630a3a5d940f4d514dc4f575ed63c14c3e3ed07146634aed7f67a6" dependencies = [ "memchr", "once_cell", @@ -2194,7 +2209,7 @@ dependencies = [ [[package]] name = "rustpython-pylib" -version = "0.3.1" +version = "0.4.0" dependencies = [ "glob", "rustpython-compiler-core", @@ -2203,7 +2218,7 @@ dependencies = [ [[package]] name = "rustpython-sre_engine" -version = "0.3.1" +version = "0.4.0" dependencies = [ "bitflags 2.5.0", "num_enum", @@ -2212,7 +2227,7 @@ dependencies = [ [[package]] name = "rustpython-stdlib" -version = "0.3.1" +version = "0.4.0" dependencies = [ "adler32", "ahash", @@ -2231,7 +2246,9 @@ dependencies = [ "foreign-types-shared", "gethostname", "hex", + "indexmap 2.2.6", "itertools 0.11.0", + "junction", "libc", "libsqlite3-sys", "libz-sys", @@ -2266,6 +2283,7 @@ dependencies = [ "socket2", "system-configuration", "termios", + "thread_local", "ucd", "unic-char-property", "unic-normal", @@ -2284,7 +2302,7 @@ dependencies = [ [[package]] name = "rustpython-vm" -version = "0.3.1" +version = "0.4.0" dependencies = [ "ahash", "ascii", @@ -2305,6 +2323,7 @@ dependencies = [ "indexmap 2.2.6", "is-macro", "itertools 0.11.0", + "junction", "libc", "log", "malachite-bigint", @@ -2360,7 +2379,7 @@ dependencies = [ [[package]] name = "rustpython_wasm" -version = "0.3.1" +version = "0.4.0" dependencies = [ "console_error_panic_hook", "js-sys", @@ -2557,12 +2576,12 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2735,22 +2754,6 @@ dependencies = [ ] [[package]] -name = "time" -version = "0.3.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" -dependencies = [ - "serde", - "time-core", -] - -[[package]] -name = "time-core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" - -[[package]] name = "timsort" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2989,9 +2992,9 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "unicode_names2" -version = "1.1.0" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b2c0942619ae1797f999a0ce7efc6c09592ad30e68e16cdbfdcd48a98c3579" +checksum = "addeebf294df7922a1164f729fb27ebbbcea99cc32b3bf08afab62757f707677" dependencies = [ "phf", "unicode_names2_generator", @@ -2999,15 +3002,14 @@ dependencies = [ [[package]] name = "unicode_names2_generator" -version = "1.1.0" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d0d66ab60be9799a70f8eb227ea43da7dcc47561dd9102cbadacfe0930113f7" +checksum = "f444b8bba042fe3c1251ffaca35c603f2dc2ccc08d595c65a8c4f76f3e8426c0" dependencies = [ "getopts", "log", "phf_codegen", "rand", - "time", ] [[package]] @@ -3088,9 +3090,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3098,16 +3100,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.32", "wasm-bindgen-shared", ] @@ -3125,9 +3127,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3135,22 +3137,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.32", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" diff --git a/pkgs/development/interpreters/python/rustpython/default.nix b/pkgs/development/interpreters/python/rustpython/default.nix index febb7f5cfa24..b63afe38148e 100644 --- a/pkgs/development/interpreters/python/rustpython/default.nix +++ b/pkgs/development/interpreters/python/rustpython/default.nix @@ -8,19 +8,18 @@ rustPlatform.buildRustPackage rec { pname = "rustpython"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "RustPython"; repo = "RustPython"; rev = "refs/tags/${version}"; - hash = "sha256-AtIaWwE1pEIP1SJN9dYgHRP1GX4LTmetIPztHbsBXto="; + hash = "sha256-BYYqvPJu/eFJ9lt07A0p7pd8pGFccUe/okFqGEObhY4="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "rustpython-ast-0.3.1" = "sha256-dT0x4E8k/FcSP/q0uwwBWniT1n9HGmFF/HV6hAE6bGU="; "rustpython-doc-0.3.0" = "sha256-34ERuLFKzUD9Xmf1zlafe42GLWZfUlw17ejf/NN6yH4="; }; }; @@ -28,7 +27,7 @@ rustPlatform.buildRustPackage rec { # freeze the stdlib into the rustpython binary cargoBuildFlags = [ "--features=freeze-stdlib" ]; - buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ SystemConfiguration ]; nativeCheckInputs = [ python3 ]; @@ -41,6 +40,6 @@ rustPlatform.buildRustPackage rec { # "_utimensat", referenced from: # rustpython_vm::function::builtin::IntoPyNativeFn::into_func::... in # rustpython-10386d81555652a7.rustpython_vm-f0b5bedfcf056d0b.rustpython_vm.7926b68e665728ca-cgu.08.rcgu.o.rcgu.o - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 99bc38890c6a..ba96f708257d 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -38,7 +38,7 @@ let is_nixenv = "False"; is_virtualenv = "False"; }; - } // lib.optionalAttrs (!python.isPyPy && !stdenv.isDarwin) { + } // lib.optionalAttrs (!python.isPyPy && !stdenv.hostPlatform.isDarwin) { # Use virtualenv from a Nix env. # Fails on darwin with # virtualenv: error: argument dest: the destination . is not write-able at /nix/store @@ -75,7 +75,7 @@ let is_virtualenv = "False"; }; - } // lib.optionalAttrs (python.pythonAtLeast "3.8") { + } // { # Venv built using Python Nix environment (python.buildEnv) # TODO: Cannot create venv from a nix env # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1. @@ -105,22 +105,24 @@ let # Integration tests involving the package set. # All PyPy package builds are broken at the moment - integrationTests = lib.optionalAttrs (!python.isPyPy) ( - lib.optionalAttrs (python.isPy3k && !stdenv.isDarwin) { # darwin has no split-debug - cpython-gdb = callPackage ./tests/test_cpython_gdb { - interpreter = python; - }; - } // lib.optionalAttrs (python.pythonAtLeast "3.7") { - # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages - nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { - interpreter = python; - }; - # Make sure tkinter is importable. See https://github.com/NixOS/nixpkgs/issues/238990 - tkinter = callPackage ./tests/test_tkinter { - interpreter = python; - }; - } - ); + integrationTests = lib.optionalAttrs (!python.isPyPy) ({ + # Make sure tkinter is importable. See https://github.com/NixOS/nixpkgs/issues/238990 + tkinter = callPackage ./tests/test_tkinter { + interpreter = python; + }; + } // lib.optionalAttrs (python.isPy3k && python.pythonOlder "3.13" && !stdenv.hostPlatform.isDarwin) { # darwin has no split-debug + # fails on python3.13 + cpython-gdb = callPackage ./tests/test_cpython_gdb { + interpreter = python; + }; + } // lib.optionalAttrs (python.isPy3k && python.pythonOlder "3.13") { + # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages + # mypy does not yet support python3.13 + # https://github.com/python/mypy/issues/17264 + nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { + interpreter = python; + }; + }); # Test editable package support editableTests = let @@ -222,7 +224,7 @@ let } ) {}; pythonWithRequests = requests.pythonModule.withPackages (ps: [ requests ]); - in lib.optionalAttrs (python.isPy3k && stdenv.isLinux) + in lib.optionalAttrs (python.isPy3k && stdenv.hostPlatform.isLinux) { condaExamplePackage = runCommand "import-requests" {} '' ${pythonWithRequests.interpreter} -c "import requests" > $out diff --git a/pkgs/development/interpreters/python/update-python-libraries/default.nix b/pkgs/development/interpreters/python/update-python-libraries/default.nix deleted file mode 100644 index f7dfdf0a8b45..000000000000 --- a/pkgs/development/interpreters/python/update-python-libraries/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ python3, runCommand, git, nix, nix-prefetch-git }: - -runCommand "update-python-libraries" { - buildInputs = [ - nix - nix-prefetch-git - (python3.withPackages(ps: with ps; [ packaging requests toolz ])) - git - ]; -} '' - cp ${./update-python-libraries.py} $out - patchShebangs $out - substituteInPlace $out --replace 'GIT = "git"' 'GIT = "${git}/bin/git"' -'' 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 deleted file mode 100755 index dd6dcb2c70ad..000000000000 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ /dev/null @@ -1,617 +0,0 @@ -#!/usr/bin/env python3 - -""" -Update a Python package expression by passing in the `.nix` file, or the directory containing it. -You can pass in multiple files or paths. - -You'll likely want to use -`` - $ ./update-python-libraries ../../pkgs/development/python-modules/**/default.nix -`` -to update all non-pinned libraries in that folder. -""" - -import argparse -import collections -import json -import logging -import os -import re -import subprocess -from concurrent.futures import ThreadPoolExecutor as Pool -from typing import Any, Optional - -import requests -from packaging.specifiers import SpecifierSet -from packaging.version import InvalidVersion -from packaging.version import Version as _Version - -INDEX = "https://pypi.io/pypi" -"""url of PyPI""" - -EXTENSIONS = ["tar.gz", "tar.bz2", "tar", "zip", ".whl"] -"""Permitted file extensions. These are evaluated from left to right and the first occurance is returned.""" - -PRERELEASES = False - -BULK_UPDATE = False - -GIT = "git" - -NIXPKGS_ROOT = ( - subprocess.check_output(["git", "rev-parse", "--show-toplevel"]) - .decode("utf-8") - .strip() -) - -logging.basicConfig(level=logging.INFO) - - -class Version(_Version, collections.abc.Sequence): - def __init__(self, version): - super().__init__(version) - # We cannot use `str(Version(0.04.21))` because that becomes `0.4.21` - # https://github.com/avian2/unidecode/issues/13#issuecomment-354538882 - self.raw_version = version - - def __getitem__(self, i): - return self._version.release[i] - - def __len__(self): - return len(self._version.release) - - def __iter__(self): - yield from self._version.release - - -def _get_values(attribute, text): - """Match attribute in text and return all matches. - - :returns: List of matches. - """ - regex = rf'{re.escape(attribute)}\s+=\s+"(.*)";' - regex = re.compile(regex) - values = regex.findall(text) - return values - - -def _get_attr_value(attr_path: str) -> Optional[Any]: - try: - response = subprocess.check_output( - [ - "nix", - "--extra-experimental-features", - "nix-command", - "eval", - "-f", - f"{NIXPKGS_ROOT}/default.nix", - "--json", - f"{attr_path}", - ], - stderr=subprocess.DEVNULL, - ) - return json.loads(response.decode()) - except (subprocess.CalledProcessError, ValueError): - return None - - -def _get_unique_value(attribute, text): - """Match attribute in text and return unique match. - - :returns: Single match. - """ - values = _get_values(attribute, text) - n = len(values) - if n > 1: - raise ValueError("found too many values for {}".format(attribute)) - elif n == 1: - return values[0] - else: - raise ValueError("no value found for {}".format(attribute)) - - -def _get_line_and_value(attribute, text, value=None): - """Match attribute in text. Return the line and the value of the attribute.""" - if value is None: - regex = rf"({re.escape(attribute)}\s+=\s+\"(.*)\";)" - else: - regex = rf"({re.escape(attribute)}\s+=\s+\"({re.escape(value)})\";)" - regex = re.compile(regex) - results = regex.findall(text) - n = len(results) - if n > 1: - raise ValueError("found too many values for {}".format(attribute)) - elif n == 1: - return results[0] - else: - raise ValueError("no value found for {}".format(attribute)) - - -def _replace_value(attribute, value, text, oldvalue=None): - """Search and replace value of attribute in text.""" - if oldvalue is None: - old_line, old_value = _get_line_and_value(attribute, text) - else: - old_line, old_value = _get_line_and_value(attribute, text, oldvalue) - new_line = old_line.replace(old_value, value) - new_text = text.replace(old_line, new_line) - return new_text - - -def _fetch_page(url): - r = requests.get(url) - if r.status_code == requests.codes.ok: - return r.json() - else: - raise ValueError("request for {} failed".format(url)) - - -def _fetch_github(url): - headers = {} - token = os.environ.get("GITHUB_API_TOKEN") - if token: - headers["Authorization"] = f"token {token}" - r = requests.get(url, headers=headers) - - if r.status_code == requests.codes.ok: - return r.json() - else: - raise ValueError("request for {} failed".format(url)) - - -def _hash_to_sri(algorithm, value): - """Convert a hash to its SRI representation""" - return ( - subprocess.check_output( - [ - "nix", - "--extra-experimental-features", - "nix-command", - "hash", - "to-sri", - "--type", - algorithm, - value, - ] - ) - .decode() - .strip() - ) - - -def _skip_bulk_update(attr_name: str) -> bool: - return bool(_get_attr_value(f"{attr_name}.skipBulkUpdate")) - - -SEMVER = { - "major": 0, - "minor": 1, - "patch": 2, -} - - -def _determine_latest_version(current_version, target, versions): - """Determine latest version, given `target`.""" - current_version = Version(current_version) - - def _parse_versions(versions): - for v in versions: - try: - yield Version(v) - except InvalidVersion: - pass - - versions = _parse_versions(versions) - - index = SEMVER[target] - - ceiling = list(current_version[0:index]) - if len(ceiling) == 0: - ceiling = None - else: - ceiling[-1] += 1 - ceiling = Version(".".join(map(str, ceiling))) - - # We do not want prereleases - versions = SpecifierSet(prereleases=PRERELEASES).filter(versions) - - if ceiling is not None: - versions = SpecifierSet(f"<{ceiling}").filter(versions) - - return (max(sorted(versions))).raw_version - - -def _get_latest_version_pypi(attr_path, package, extension, current_version, target): - """Get latest version and hash from PyPI.""" - url = "{}/{}/json".format(INDEX, package) - json = _fetch_page(url) - - versions = { - version - for version, releases in json["releases"].items() - if not all(release["yanked"] for release in releases) - } - version = _determine_latest_version(current_version, target, versions) - - try: - releases = json["releases"][version] - except KeyError as e: - raise KeyError( - "Could not find version {} for {}".format(version, package) - ) from e - for release in releases: - if release["filename"].endswith(extension): - # TODO: In case of wheel we need to do further checks! - sha256 = release["digests"]["sha256"] - break - else: - sha256 = None - return version, sha256, None - - -def _get_latest_version_github(attr_path, package, extension, current_version, target): - def strip_prefix(tag): - return re.sub("^[^0-9]*", "", tag) - - def get_prefix(string): - matches = re.findall(r"^([^0-9]*)", string) - return next(iter(matches), "") - - try: - homepage = subprocess.check_output( - [ - "nix", - "--extra-experimental-features", - "nix-command", - "eval", - "-f", - f"{NIXPKGS_ROOT}/default.nix", - "--raw", - f"{attr_path}.src.meta.homepage", - ] - ).decode("utf-8") - except Exception as e: - raise ValueError(f"Unable to determine homepage: {e}") - owner_repo = homepage[len("https://github.com/") :] # remove prefix - owner, repo = owner_repo.split("/") - - url = f"https://api.github.com/repos/{owner}/{repo}/releases" - all_releases = _fetch_github(url) - releases = list(filter(lambda x: not x["prerelease"], all_releases)) - - if len(releases) == 0: - raise ValueError(f"{homepage} does not contain any stable releases") - - versions = map(lambda x: strip_prefix(x["tag_name"]), releases) - version = _determine_latest_version(current_version, target, versions) - - release = next(filter(lambda x: strip_prefix(x["tag_name"]) == version, releases)) - prefix = get_prefix(release["tag_name"]) - - 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", - f"https://github.com/{owner}/{repo}.git", - "--hash", - algorithm, - "--rev", - f"refs/tags/{release['tag_name']}", - ] - cmd.extend(git_fetcher_args) - response = subprocess.check_output(cmd) - document = json.loads(response.decode()) - hash = _hash_to_sri(algorithm, document[algorithm]) - else: - try: - hash = ( - subprocess.check_output( - [ - "nix-prefetch-url", - "--type", - "sha256", - "--unpack", - f"{release['tarball_url']}", - ], - stderr=subprocess.DEVNULL, - ) - .decode("utf-8") - .strip() - ) - except (subprocess.CalledProcessError, UnicodeError): - # this may fail if they have both a branch and a tag of the same name, attempt tag name - tag_url = str(release["tarball_url"]).replace( - "tarball", "tarball/refs/tags" - ) - try: - hash = ( - subprocess.check_output( - ["nix-prefetch-url", "--type", "sha256", "--unpack", tag_url], - stderr=subprocess.DEVNULL, - ) - .decode("utf-8") - .strip() - ) - except subprocess.CalledProcessError: - raise ValueError("nix-prefetch-url failed") - - return version, hash, prefix - - -FETCHERS = { - "fetchFromGitHub": _get_latest_version_github, - "fetchPypi": _get_latest_version_pypi, - "fetchurl": _get_latest_version_pypi, -} - - -DEFAULT_SETUPTOOLS_EXTENSION = "tar.gz" - - -FORMATS = { - "setuptools": DEFAULT_SETUPTOOLS_EXTENSION, - "wheel": "whl", - "pyproject": "tar.gz", - "flit": "tar.gz", -} - - -def _determine_fetcher(text): - # Count occurrences of fetchers. - nfetchers = sum( - text.count("src = {}".format(fetcher)) for fetcher in FETCHERS.keys() - ) - if nfetchers == 0: - raise ValueError("no fetcher.") - elif nfetchers > 1: - raise ValueError("multiple fetchers.") - else: - # Then we check which fetcher to use. - for fetcher in FETCHERS.keys(): - if "src = {}".format(fetcher) in text: - return fetcher - - -def _determine_extension(text, fetcher): - """Determine what extension is used in the expression. - - If we use: - - fetchPypi, we check if format is specified. - - fetchurl, we determine the extension from the url. - - fetchFromGitHub we simply use `.tar.gz`. - """ - if fetcher == "fetchPypi": - try: - src_format = _get_unique_value("format", text) - except ValueError: - src_format = None # format was not given - - try: - extension = _get_unique_value("extension", text) - except ValueError: - extension = None # extension was not given - - if extension is None: - if src_format is None: - src_format = "setuptools" - elif src_format == "other": - raise ValueError("Don't know how to update a format='other' package.") - extension = FORMATS[src_format] - - elif fetcher == "fetchurl": - url = _get_unique_value("url", text) - extension = os.path.splitext(url)[1] - if "pypi" not in url: - raise ValueError("url does not point to PyPI.") - - elif fetcher == "fetchFromGitHub": - extension = "tar.gz" - - return extension - - -def _update_package(path, target): - # Read the expression - with open(path, "r") as f: - text = f.read() - - # Determine pname. Many files have more than one pname - pnames = _get_values("pname", text) - - # Determine version. - version = _get_unique_value("version", text) - - # First we check how many fetchers are mentioned. - fetcher = _determine_fetcher(text) - - extension = _determine_extension(text, fetcher) - - # Attempt a fetch using each pname, e.g. backports-zoneinfo vs backports.zoneinfo - successful_fetch = False - for pname in pnames: - # when invoked as an updateScript, UPDATE_NIX_ATTR_PATH will be set - # this allows us to work with packages which live outside of python-modules - attr_path = os.environ.get("UPDATE_NIX_ATTR_PATH", f"python3Packages.{pname}") - - if BULK_UPDATE and _skip_bulk_update(attr_path): - raise ValueError(f"Bulk update skipped for {pname}") - elif _get_attr_value(f"{attr_path}.cargoDeps") is not None: - raise ValueError(f"Cargo dependencies are unsupported, skipping {pname}") - try: - new_version, new_sha256, prefix = FETCHERS[fetcher]( - attr_path, pname, extension, version, target - ) - successful_fetch = True - break - except ValueError: - continue - - if not successful_fetch: - raise ValueError(f"Unable to find correct package using these pnames: {pnames}") - - if new_version == version: - logging.info("Path {}: no update available for {}.".format(path, pname)) - return False - elif Version(new_version) <= Version(version): - raise ValueError("downgrade for {}.".format(pname)) - if not new_sha256: - raise ValueError("no file available for {}.".format(pname)) - - text = _replace_value("version", new_version, text) - - # hashes from pypi are 16-bit encoded sha256's, normalize it to sri to avoid merge conflicts - # sri hashes have been the default format since nix 2.4+ - sri_hash = _hash_to_sri("sha256", new_sha256) - - # retrieve the old output hash for a more precise match - if old_hash := _get_attr_value(f"{attr_path}.src.outputHash"): - # fetchers can specify a sha256, or a sri hash - try: - text = _replace_value("hash", sri_hash, text, old_hash) - except ValueError: - text = _replace_value("sha256", sri_hash, text, old_hash) - else: - raise ValueError(f"Unable to retrieve old hash for {pname}") - - if fetcher == "fetchFromGitHub": - # in the case of fetchFromGitHub, it's common to see `rev = version;` or `rev = "v${version}";` - # in which no string value is meant to be substituted. However, we can just overwrite the previous value. - regex = r"(rev\s+=\s+[^;]*;)" - regex = re.compile(regex) - matches = regex.findall(text) - n = len(matches) - - if n == 0: - raise ValueError("Unable to find rev value for {}.".format(pname)) - else: - # forcefully rewrite rev, incase tagging conventions changed for a release - match = matches[0] - text = text.replace(match, f'rev = "refs/tags/{prefix}${{version}}";') - # incase there's no prefix, just rewrite without interpolation - text = text.replace('"${version}";', "version;") - - with open(path, "w") as f: - f.write(text) - - logging.info( - "Path {}: updated {} from {} to {}".format( - path, pname, version, new_version - ) - ) - - result = { - "path": path, - "target": target, - "pname": pname, - "old_version": version, - "new_version": new_version, - #'fetcher' : fetcher, - } - - return result - - -def _update(path, target): - # We need to read and modify a Nix expression. - if os.path.isdir(path): - path = os.path.join(path, "default.nix") - - # If a default.nix does not exist, we quit. - if not os.path.isfile(path): - logging.info("Path {}: does not exist.".format(path)) - return False - - # If file is not a Nix expression, we quit. - if not path.endswith(".nix"): - logging.info("Path {}: does not end with `.nix`.".format(path)) - return False - - try: - return _update_package(path, target) - except ValueError as e: - logging.warning("Path {}: {}".format(path, e)) - return False - - -def _commit(path, pname, old_version, new_version, pkgs_prefix="python: ", **kwargs): - """Commit result.""" - - msg = f"{pkgs_prefix}{pname}: {old_version} -> {new_version}" - - if changelog := _get_attr_value(f"{pkgs_prefix}{pname}.meta.changelog"): - msg += f"\n\n{changelog}" - - try: - subprocess.check_call([GIT, "add", path]) - subprocess.check_call([GIT, "commit", "-m", msg]) - except subprocess.CalledProcessError as e: - subprocess.check_call([GIT, "checkout", path]) - raise subprocess.CalledProcessError(f"Could not commit {path}") from e - - return True - - -def main(): - epilog = """ -environment variables: - GITHUB_API_TOKEN\tGitHub API token used when updating github packages - """ - parser = argparse.ArgumentParser( - formatter_class=argparse.RawDescriptionHelpFormatter, epilog=epilog - ) - parser.add_argument("package", type=str, nargs="+") - parser.add_argument("--target", type=str, choices=SEMVER.keys(), default="major") - parser.add_argument( - "--commit", action="store_true", help="Create a commit for each package update" - ) - parser.add_argument( - "--use-pkgs-prefix", - action="store_true", - help="Use python3Packages.${pname}: instead of python: ${pname}: when making commits", - ) - - args = parser.parse_args() - target = args.target - - packages = list(map(os.path.abspath, args.package)) - - if len(packages) > 1: - global BULK_UPDATE - BULK_UPDATE = True - - logging.info("Updating packages...") - - # Use threads to update packages concurrently - with Pool() as p: - results = list(filter(bool, p.map(lambda pkg: _update(pkg, target), packages))) - - logging.info("Finished updating packages.") - - commit_options = {} - if args.use_pkgs_prefix: - logging.info("Using python3Packages. prefix for commits") - commit_options["pkgs_prefix"] = "python3Packages." - - # Commits are created sequentially. - if args.commit: - logging.info("Committing updates...") - # list forces evaluation - list(map(lambda x: _commit(**x, **commit_options), results)) - logging.info("Finished committing updates") - - count = len(results) - logging.info("{} package(s) updated".format(count)) - - -if __name__ == "__main__": - main() diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 6f06b31b56a6..4a16416374ff 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -56,7 +56,7 @@ let readline sqlite ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL libGLU ] @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { FONTCONFIG_FILE = fontsConf; LD_LIBRARY_PATH = libPath; NIX_LDFLAGS = lib.concatStringsSep " " [ - (lib.optionalString (stdenv.cc.isGNU && !stdenv.isDarwin) "-lgcc_s") + (lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isDarwin) "-lgcc_s") ]; nativeBuildInputs = [ @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { gtk3 ncurses ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreFoundation ]; @@ -141,15 +141,15 @@ stdenv.mkDerivation rec { cd src/build '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${libPath}) gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive") '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' gappsWrapperArgs+=("--prefix" "DYLD_LIBRARY_PATH" ":" ${libPath}) ''; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' # Cannot set DYLD_LIBRARY_PATH as an attr of this drv, becasue dynamic # linker environment variables like this are purged. # See: https://apple.stackexchange.com/a/212954/167199 @@ -163,14 +163,14 @@ stdenv.mkDerivation rec { export DYLD_FALLBACK_LIBRARY_PATH="${libPath}" ''; - shared = if stdenv.isDarwin then "dylib" else "shared"; + shared = if stdenv.hostPlatform.isDarwin then "dylib" else "shared"; configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] ++ lib.optionals disableDocs [ "--disable-docs" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-strip" "--enable-xonx" ]; @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Programmable programming language"; diff --git a/pkgs/development/interpreters/racket/racket_7_9.nix b/pkgs/development/interpreters/racket/racket_7_9.nix index 91f7654fcad2..c82d232e11a4 100644 --- a/pkgs/development/interpreters/racket/racket_7_9.nix +++ b/pkgs/development/interpreters/racket/racket_7_9.nix @@ -76,8 +76,8 @@ stdenv.mkDerivation rec { FONTCONFIG_FILE = fontsConf; LD_LIBRARY_PATH = libPath; NIX_LDFLAGS = lib.concatStringsSep " " [ - (lib.optionalString (stdenv.cc.isGNU && !stdenv.isDarwin) "-lgcc_s") - (lib.optionalString stdenv.isDarwin "-framework CoreFoundation") + (lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isDarwin) "-lgcc_s") + (lib.optionalString stdenv.hostPlatform.isDarwin "-framework CoreFoundation") ]; nativeBuildInputs = [ @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk3 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreFoundation ]; @@ -110,14 +110,14 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${LD_LIBRARY_PATH}) ''; - shared = if stdenv.isDarwin then "dylib" else "shared"; + shared = if stdenv.hostPlatform.isDarwin then "dylib" else "shared"; configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] ++ lib.optionals disableDocs [ "--disable-docs" ] - ++ lib.optionals stdenv.isDarwin [ "--enable-xonx" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-xonx" ]; configureScript = "../configure"; @@ -145,6 +145,6 @@ stdenv.mkDerivation rec { "x86_64-linux" "aarch64-linux" ]; - broken = stdenv.isDarwin; # No support yet for setting FFI lookup path + broken = stdenv.hostPlatform.isDarwin; # No support yet for setting FFI lookup path }; } diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index e4b0da036233..5537f13041d7 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Configure.pl \ --replace '`/usr/bin/arch`' '"${stdenv.hostPlatform.darwinArch}"' \ --replace '/usr/bin/arch' "$(type -P true)" \ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { --replace '`sw_vers -productVersion`' '"11.0"' ''; - buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; + buildInputs = [ perl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ApplicationServices ]; doCheck = false; # MoarVM does not come with its own test suite configureScript = "${perl}/bin/perl ./Configure.pl"; diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 542164aeebf4..4e0976c5ebb1 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.2"; + version = "0.22.4"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${finalAttrs.version}"; - hash = "sha256-uMVfBptiCungO+XJMlwV2Fhs2jgVNDOqUFqgJPV5RhM="; + hash = "sha256-blreXcpKvatu5Vo5YViIz5Yv2OAsQgs/SGEI2rABDoc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix deleted file mode 100644 index 2ddebe96e8a7..000000000000 --- a/pkgs/development/interpreters/rascal/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, jdk }: - -stdenv.mkDerivation rec { - pname = "rascal"; - version = "0.33.8"; - - src = fetchurl { - url = "https://update.rascal-mpl.org/console/${pname}-${version}.jar"; - sha256 = "sha256-8m7+ME0mu9LEMzklkz1CZ9s7ZCMjoA5oreICFSpb4S8="; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk ]; - - dontUnpack = true; - - installPhase = - '' - mkdir -p $out/bin - makeWrapper ${jdk}/bin/java $out/bin/rascal \ - --add-flags "-jar ${src}" \ - ''; - - meta = { - homepage = "https://www.rascal-mpl.org/"; - description = "Command-line REPL for the Rascal metaprogramming language"; - mainProgram = "rascal"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.epl10; - maintainers = [ ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix deleted file mode 100644 index 676ecb721cc4..000000000000 --- a/pkgs/development/interpreters/red/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ lib, stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }: - -stdenv.mkDerivation rec { - pname = "red"; - version = "0.6.4"; - src = fetchFromGitHub { - rev = "755eb943ccea9e78c2cab0f20b313a52404355cb"; - owner = "red"; - repo = "red"; - sha256 = "sha256:045rrg9666zczgrwyyyglivzdzja103s52b0fzj7hqmr1fz68q37"; - }; - - rebol = fetchurl { - url = "http://www.rebol.com/downloads/v278/rebol-core-278-4-2.tar.gz"; - sha256 = "1c1v0pyhf3d8z98qc93a5zmx0bbl0qq5lr8mbkdgygqsq2bv2xbz"; - }; - - buildInputs = [ pkgsi686Linux.curl stdenv_32bit ]; - - r2 = "./rebol/releases/rebol-core/rebol"; - - configurePhase = '' - # Download rebol - mkdir rebol/ - tar -xzvf ${rebol} -C rebol/ - patchelf --set-interpreter \ - ${stdenv_32bit.cc.libc.out}/lib/32/ld-linux.so.2 \ - ${r2} - ''; - - buildPhase = '' - # Do tests - #${r2} -qw run-all.r - - # Build test - ${r2} -qw red.r tests/hello.red - - # Compiling the Red console... - ${r2} -qw red.r -r environment/console/CLI/console.red - - # Generating docs... - cd docs - ../${r2} -qw makedoc2.r red-system-specs.txt - ../${r2} -qw makedoc2.r red-system-quick-test.txt - cd ../ - ''; - - installPhase = '' - mkdir $out - - # Install - install -d $out/opt/red - find quick-test -type f -executable -print0 | xargs -0 rm - cp -R * $out/opt/red/ - rm -rf $out/opt/red/rebol - install -Dm755 console $out/bin/red - install -Dm644 BSD-3-License.txt \ - $out/share/licenses/${pname}-${version}/BSD-3-License.txt - install -Dm644 BSL-License.txt \ - $out/share/licenses/${pname}-${version}/BSL-License.txt - install -Dm644 docs/red-system-quick-test.html \ - $out/share/doc/${pname}-${version}/red-system-quick-test.html - install -Dm644 docs/red-system-specs.html \ - $out/share/doc/${pname}-${version}/red-system-specs.html - - # PathElf - patchelf --set-interpreter \ - ${stdenv_32bit.cc.libc.out}/lib/32/ld-linux.so.2 \ - $out/opt/red/console - patchelf --set-rpath ${pkgsi686Linux.curl.out}/lib \ - $out/opt/red/console - patchelf --set-interpreter \ - ${stdenv_32bit.cc.libc.out}/lib/32/ld-linux.so.2 \ - $out/bin/red - patchelf --set-rpath ${pkgsi686Linux.curl.out}/lib \ - $out/bin/red - - ''; - - meta = with lib; { - description = '' - New programming language strongly inspired by Rebol, but with a - broader field of usage thanks to its native-code compiler, from system - programming to high-level scripting, while providing modern support for - concurrency and multi-core CPUs - ''; - mainProgram = "red"; - maintainers = with maintainers; [ uralbash ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - license = licenses.bsd3; - homepage = "https://www.red-lang.org/"; - }; -} diff --git a/pkgs/development/interpreters/risor/default.nix b/pkgs/development/interpreters/risor/default.nix deleted file mode 100644 index c16eebf1e626..000000000000 --- a/pkgs/development/interpreters/risor/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, testers -, risor -}: - -buildGoModule rec { - pname = "risor"; - version = "1.6.0"; - - src = fetchFromGitHub { - owner = "risor-io"; - repo = "risor"; - rev = "v${version}"; - hash = "sha256-IUmkb23Fx+bjzXrXWfKPOo0HFt7HjtjQoCRtH77HGBg="; - }; - - proxyVendor = true; - vendorHash = "sha256-+XYwFYbvZvk0TWoRtCKQIzbQeznQkolB+NFqUiZMkpA="; - - subPackages = [ - "cmd/risor" - ]; - - ldflags = [ - "-s" - "-w" - "-X=main.version=${version}" - ]; - - passthru.tests = { - version = testers.testVersion { - package = risor; - command = "risor version"; - }; - }; - - meta = with lib; { - description = "Fast and flexible scripting for Go developers and DevOps"; - mainProgram = "risor"; - homepage = "https://github.com/risor-io/risor"; - changelog = "https://github.com/risor-io/risor/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; - }; -} - diff --git a/pkgs/development/interpreters/rlci/default.nix b/pkgs/development/interpreters/rlci/default.nix deleted file mode 100644 index 01c9e491b11f..000000000000 --- a/pkgs/development/interpreters/rlci/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "rlci"; - version = "1.1.2"; - - src = fetchFromGitHub { - owner = "orsinium-labs"; - repo = "rlci"; - rev = version; - hash = "sha256-+Hd1Ymm2LKnHUKoUlfN6D6pwebxgwJQHgqwMHXXtP6Y="; - }; - - cargoHash = "sha256-7Q6WSEiVLzRsyHNECbPhWN9prrN0A/nSJDtZWi09zzg="; - - meta = with lib; { - description = "Lambda calculus interpreter"; - mainProgram = "rlci"; - homepage = "https://github.com/orsinium-labs/rlci"; - changelog = "https://github.com/orsinium-labs/rlci/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 596c778c0ff5..4dece3870ae6 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -78,7 +78,7 @@ let nativeBuildInputs = [ autoreconfHook bison removeReferencesTo ] ++ (op docSupport groff) - ++ (ops (dtraceSupport && stdenv.isLinux) [ systemtap libsystemtap ]) + ++ (ops (dtraceSupport && stdenv.hostPlatform.isLinux) [ systemtap libsystemtap ]) ++ ops yjitSupport [ rustPlatform.cargoSetupHook cargo rustc ] ++ op useBaseRuby baseRuby; buildInputs = [ autoconf ] @@ -92,8 +92,8 @@ let # support is not enabled, so add readline to the build inputs if curses # support is disabled (if it's enabled, we already have it) and we're # running on darwin - ++ op (!cursesSupport && stdenv.isDarwin) readline - ++ ops stdenv.isDarwin [ libiconv libobjc libunwind Foundation ]; + ++ op (!cursesSupport && stdenv.hostPlatform.isDarwin) readline + ++ ops stdenv.hostPlatform.isDarwin [ libiconv libobjc libunwind Foundation ]; propagatedBuildInputs = op jemallocSupport jemalloc; enableParallelBuilding = true; @@ -156,7 +156,7 @@ let # overrides that by enabling `-O2` which is the minimum optimization # needed for `_FORTIFY_SOURCE`. ] ++ lib.optional stdenv.cc.isGNU "CFLAGS=-O3" ++ [ - ] ++ ops stdenv.isDarwin [ + ] ++ ops stdenv.hostPlatform.isDarwin [ # on darwin, we have /usr/include/tk.h -- so the configure script detects # that tk is installed "--with-out-ext=tk" @@ -216,7 +216,7 @@ let for makefile in $extMakefiles; do make -C "$(dirname "$makefile")" distclean done - find "$out/${finalAttrs.passthru.gemPath}" \( -name gem_make.out -o -name mkmf.log \) -delete + find "$out/${finalAttrs.passthru.gemPath}" \( -name gem_make.out -o -name mkmf.log -o -name exts.mk \) -delete # Bundler tries to create this directory mkdir -p $out/nix-support cat > $out/nix-support/setup-hook <<EOF @@ -307,15 +307,20 @@ in { }; ruby_3_2 = generic { - version = rubyVersion "3" "2" "4" ""; - hash = "sha256-xys8XDBILcoYsPhoyQdfP0fYFo6vYm1OaCzltZyFhpI="; + version = rubyVersion "3" "2" "5" ""; + hash = "sha256-7wYQtJj2D7XP13tRrbPBD0yo7ZoXy4fGHlvqMUrDShY="; cargoHash = "sha256-6du7RJo0DH+eYMOoh3L31F3aqfR5+iG1iKauSV1uNcQ="; }; ruby_3_3 = generic { - version = rubyVersion "3" "3" "4" ""; - hash = "sha256-/mow+X1U4Cl2jy3fSSNpnEFs28Om6W2z4tVxbH25ajQ="; + version = rubyVersion "3" "3" "5" ""; + hash = "sha256-N4GjUEIiwvJstLnrnBoS2/SUTTZs4kqf+M+Z7LznUZY="; cargoHash = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk="; }; + ruby_3_4 = generic { + version = rubyVersion "3" "4" "0" "preview2"; + hash = "sha256-RDzX7FSt5HhryXTOn11J8XKmD47chLWXt/4r0qlLg3E="; + cargoHash = "sha256-kdfNY8wVmSRR+cwEDYge/HDPRvdTNKLk/BhgqQeelOg="; + }; } 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 deleted file mode 100644 index 91f221e19680..000000000000 --- a/pkgs/development/interpreters/ruby/rubygems/0004-delete-binstub-lock-file.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 9fbfdb59fb07..9c56917ef5f2 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -7,18 +7,17 @@ stdenv.mkDerivation rec { pname = "rubygems"; - version = "3.5.16"; + version = "3.5.22"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - hash = "sha256-f9EN6eXpMzIbYrjxGUJWrmRwO6JUHKuR7DEkSgGNkBI="; + hash = "sha256-IpyOOTpBLpnWoP4qIvuY99Li15zbxI5ajcym+po1bIc="; }; 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 = '' diff --git a/pkgs/development/interpreters/rune/default.nix b/pkgs/development/interpreters/rune/default.nix deleted file mode 100644 index f4dc8ef1f745..000000000000 --- a/pkgs/development/interpreters/rune/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "rune"; - version = "0.13.4"; - - src = fetchCrate { - pname = "rune-cli"; - inherit version; - hash = "sha256-+2eXTkn9yOMhvS8cFwAorLBNIPvIRwsPOsGCl3gtRSE="; - }; - - cargoHash = "sha256-yMqxd7PlpEEVS0jJwProaVjKUsU5TuebGTMrWiMFsM8="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - env = { - RUNE_VERSION = version; - }; - - meta = with lib; { - description = "Interpreter for the Rune Language, an embeddable dynamic programming language for Rust"; - homepage = "https://rune-rs.github.io/"; - changelog = "https://github.com/rune-rs/rune/releases/tag/${version}"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "rune"; - }; -} diff --git a/pkgs/development/interpreters/s9fes/default.nix b/pkgs/development/interpreters/s9fes/default.nix deleted file mode 100644 index 4107b28e1cf9..000000000000 --- a/pkgs/development/interpreters/s9fes/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, lib, fetchurl, ncurses, buildPackages }: - -let - isCrossCompiling = stdenv.hostPlatform != stdenv.buildPlatform; -in - -stdenv.mkDerivation rec { - pname = "s9fes"; - version = "20181205"; - - src = fetchurl { - url = "https://www.t3x.org/s9fes/s9fes-${version}.tgz"; - sha256 = "sha256-Lp/akaDy3q4FmIE6x0fj9ae/SOD7tdsmzy2xdcCh13o="; - }; - - # Fix cross-compilation - postPatch = '' - substituteInPlace Makefile \ - --replace 'ar q' '${stdenv.cc.targetPrefix}ar q' \ - --replace 'strip' '${stdenv.cc.targetPrefix}strip' - ${lib.optionalString isCrossCompiling "substituteInPlace Makefile --replace ./s9 '${buildPackages.s9fes}/bin/s9'"} - ''; - - buildInputs = [ ncurses ]; - preBuild = '' - makeFlagsArray+=(CFLAGS="-O2 -std=c89") - ''; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=$(out)" ]; - - enableParallelBuilding = true; - # ...-bash-5.2-p15/bin/bash: line 1: ...-s9fes-20181205/bin/s9help: No such file or directory - # make: *** [Makefile:157: install-util] Error 1 - enableParallelInstalling = false; - - meta = with lib; { - description = "Scheme 9 From Empty Space, an interpreter for R4RS Scheme"; - homepage = "http://www.t3x.org/s9fes/index.html"; - license = licenses.publicDomain; - maintainers = with maintainers; [ siraben ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/development/interpreters/scheme48/default.nix deleted file mode 100644 index 82bd58469bd3..000000000000 --- a/pkgs/development/interpreters/scheme48/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "scheme48"; - version = "1.9.2"; - - src = fetchurl { - url = "https://s48.org/${version}/scheme48-${version}.tgz"; - sha256 = "1x4xfm3lyz2piqcw1h01vbs1iq89zq7wrsfjgh3fxnlm1slj2jcw"; - }; - - # Make more reproducible by removing build user and date. - postPatch = '' - substituteInPlace build/build-usual-image --replace '"(made by $USER on $date)"' '""' - ''; - - # Silence warnings related to use of implicitly declared library functions and implicit ints. - # TODO: Remove and/or fix with patches the next time this package is updated. - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=implicit-function-declaration" - "-Wno-error=implicit-int" - ]; - }; - - meta = with lib; { - homepage = "https://s48.org/"; - description = "Scheme 48 interpreter for R5RS"; - platforms = platforms.unix; - license = licenses.bsd3; - maintainers = [ maintainers.siraben ]; - }; -} diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix deleted file mode 100644 index 35fec3d2a2b5..000000000000 --- a/pkgs/development/interpreters/scsh/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, scheme48, unstableGitUpdater }: - -stdenv.mkDerivation { - pname = "scsh"; - version = "0.7-unstable-2024-03-09"; - - src = fetchFromGitHub { - owner = "scheme"; - repo = "scsh"; - rev = "6770db21b08edd907d1c9bd962297ff55664e3fe"; - hash = "sha256-U95Rc/Ks5AytB5UwbzQLI3/Sj4TYybrp8/45fu9krSU="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ scheme48 ]; - configureFlags = [ "--with-scheme48=${scheme48}" ]; - - passthru.updateScript = unstableGitUpdater { }; - - meta = with lib; { - description = "Scheme shell"; - homepage = "http://www.scsh.net/"; - license = licenses.bsd3; - maintainers = with maintainers; [ joachifm ]; - platforms = with platforms; unix; - mainProgram = "scsh"; - }; -} diff --git a/pkgs/development/interpreters/shen-sbcl/default.nix b/pkgs/development/interpreters/shen-sbcl/default.nix deleted file mode 100644 index 538f5e7f1356..000000000000 --- a/pkgs/development/interpreters/shen-sbcl/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchurl -, shen-sources -, sbcl -}: - -stdenv.mkDerivation rec { - pname = "shen-sbcl"; - version = "3.0.3"; - - src = fetchurl { - url = "https://github.com/Shen-Language/shen-cl/releases/download/v${version}/shen-cl-v${version}-sources.tar.gz"; - sha256 = "0mc10jlrxqi337m6ngwbr547zi4qgk69g1flz5dsddjy5x41j0yz"; - }; - - nativeBuildInputs = [ sbcl ]; - - preBuild = '' - ln -s ${shen-sources} kernel - ''; - - buildFlags = [ "build-sbcl" ]; - - checkTarget = "test-sbcl"; - - doCheck = true; - - installPhase = '' - install -m755 -D bin/sbcl/shen $out/bin/shen-sbcl - ''; - - meta = with lib; { - homepage = "https://shenlanguage.org"; - description = "Port of Shen running on Steel Bank Common Lisp"; - changelog = "https://github.com/Shen-Language/shen-cl/raw/v${version}/CHANGELOG.md"; - platforms = sbcl.meta.platforms; - maintainers = with maintainers; [ bsima ]; - broken = true; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/interpreters/shen-sources/default.nix b/pkgs/development/interpreters/shen-sources/default.nix deleted file mode 100644 index 99e72fbea112..000000000000 --- a/pkgs/development/interpreters/shen-sources/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, stdenv -, fetchurl -}: - -stdenv.mkDerivation rec { - pname = "shen-sources"; - version = "22.4"; - - src = fetchurl { - url = "https://github.com/Shen-Language/shen-sources/releases/download/shen-${version}/ShenOSKernel-${version}.tar.gz"; - sha256 = "1wlyh4rbzr615iykq1s779jvq28812rb4dascx1kzpakhw8z0260"; - }; - - dontBuild = true; - - installPhase = '' - mkdir -p $out - cp . $out -R - ''; - - meta = with lib; { - homepage = "https://shenlanguage.org"; - description = "Source code for the Shen Language"; - changelog = "https://github.com/Shen-Language/shen-sources/raw/shen-${version}/CHANGELOG.md"; - platforms = platforms.all; - maintainers = with maintainers; [ bsima ]; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/interpreters/snobol4/default.nix b/pkgs/development/interpreters/snobol4/default.nix deleted file mode 100644 index 2d276e6a0362..000000000000 --- a/pkgs/development/interpreters/snobol4/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, fetchurl -, stdenv -, bzip2 -, gdbm -, gnum4 -, gzip -, libffi -, openssl -, readline -, sqlite -, tcl -, xz -, zlib -}: - -stdenv.mkDerivation rec { - pname = "snobol4"; - version = "2.3.2"; - - src = fetchurl { - urls = [ - "https://ftp.regressive.org/snobol4/snobol4-${version}.tar.gz" - # fallback for when the current version is moved to the old folder - "https://ftp.regressive.org/snobol4/old/snobol4-${version}.tar.gz" - ]; - hash = "sha256-QeMB6d0YDXARfWTzaU+d1U+e2QmjajJYfIvthatorBU="; - }; - - outputs = [ "out" "man" "doc" ]; - - # gzip used by Makefile to compress man pages - nativeBuildInputs = [ gnum4 gzip ]; - # enable all features (undocumented, based on manual review of configure script) - buildInputs = [ bzip2 libffi openssl readline sqlite tcl xz zlib ] - # ndbm compat library - ++ lib.optional stdenv.isLinux gdbm; - configureFlags = lib.optional (tcl != null) "--with-tcl=${tcl}/lib/tclConfig.sh"; - - # INSTALL says "parallel make will fail" - enableParallelBuilding = false; - - patches = [ ./fix-paths.patch ]; - - # configure does not support --sbindir and the likes (as introduced by multiple-outputs.sh) - # so man, doc outputs must be handled manually - preConfigurePhases = [ "prePreConfigurePhase" ]; - prePreConfigurePhase = '' - preConfigureHooks="''${preConfigureHooks//_multioutConfig/}" - prependToVar configureFlags --mandir="$man"/share/man - ''; - - meta = with lib; { - description = "Macro Implementation of SNOBOL4 in C"; - longDescription = '' - An open source port of Macro SNOBOL4 (The original Bell Telephone Labs implementation, written in SIL macros) by Phil Budne. - Supports full SNOBOL4 language plus SPITBOL, [Blocks](https://www.regressive.org/snobol4/blocks/) and other extensions. - ''; - homepage = "https://www.regressive.org/snobol4/csnobol4/"; - license = licenses.bsd2; - platforms = platforms.all; - maintainers = with maintainers; [ xworld21 ]; - }; -} diff --git a/pkgs/development/interpreters/snobol4/fix-paths.patch b/pkgs/development/interpreters/snobol4/fix-paths.patch deleted file mode 100644 index d8b424ed3af6..000000000000 --- a/pkgs/development/interpreters/snobol4/fix-paths.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/configure -+++ b/configure -@@ -327,9 +327,9 @@ - SNOLIB_LOCAL="$SNOLIB/local" - SNOLIB_DOC="$SNOLIB" - # XXX use $PREFIX/include/snobol4 ??? --INCLUDE_DIR="$SNOLIB/include" -+INCLUDE_DIR="$PREFIX"/include/snolib4 - --DOC_DIR="$PREFIX/share/doc/snobol4-$VERSION" -+DOC_DIR="$doc/share/doc/snobol4-$VERSION" - - echo 'BINDIR=$(DESTDIR)'"$BINDIR" >> $CONFIG_M4 - echo 'MANDIR=$(DESTDIR)'"$MANDIR" >> $CONFIG_M4 -@@ -2110,7 +2110,7 @@ - # IRIX /sbin/install - - # should always find ./install-sh --for DIR in /usr/bin /usr/ucb /usr/local/bin /bin .; do -+for DIR in `echo $PATH | tr ':' ' '`; do - for INSTALL in install ginstall scoinst install-sh; do - IPATH=$DIR/$INSTALL - if [ -d $IPATH ]; then diff --git a/pkgs/development/interpreters/sollya/default.nix b/pkgs/development/interpreters/sollya/default.nix deleted file mode 100644 index 2b741aec29ab..000000000000 --- a/pkgs/development/interpreters/sollya/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, stdenv -, fetchurl -, gmp -, mpfr -, mpfi -, libxml2 -, fplll -}: - -stdenv.mkDerivation rec { - pname = "sollya"; - version = "8.0"; - - src = fetchurl { - url = "https://www.sollya.org/releases/sollya-${version}/sollya-${version}.tar.gz"; - sha256 = "sha256-WNc0+aL8jmczwR+W0t+aslvvJNccQBIw4p8KEzmoEZI="; - }; - - buildInputs = [ gmp mpfr mpfi libxml2 fplll ]; - - doCheck = true; - - meta = with lib; { - description = "Tool environment for safe floating-point code development"; - mainProgram = "sollya"; - homepage = "https://www.sollya.org/"; - license = licenses.cecill-c; - platforms = platforms.unix; - maintainers = with maintainers; [ wegank ]; - }; -} diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index cc1d3923fef9..5feca82f6cf1 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: rec { ] ++ lib.optionals (lib.versionOlder version "91") [ autoconf213 yasm # to buid icu? seems weird - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: rec { nspr readline zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc libiconv ]; @@ -213,7 +213,7 @@ stdenv.mkDerivation (finalAttrs: rec { homepage = "https://spidermonkey.dev/"; license = licenses.mpl20; # TODO: MPL/GPL/LGPL tri-license for 78. maintainers = with maintainers; [ abbradar lostnet catap ]; - broken = stdenv.isDarwin && versionAtLeast version "115"; # Requires SDK 13.3 (see #242666). + broken = stdenv.hostPlatform.isDarwin && versionAtLeast version "115"; # Requires SDK 13.3 (see #242666). platforms = platforms.unix; }; }) diff --git a/pkgs/development/interpreters/starlark-rust/default.nix b/pkgs/development/interpreters/starlark-rust/default.nix deleted file mode 100644 index 499114b3f258..000000000000 --- a/pkgs/development/interpreters/starlark-rust/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -}: - -rustPlatform.buildRustPackage rec { - pname = "starlark-rust"; - version = "0.12.0"; - - src = fetchCrate { - pname = "starlark_bin"; - inherit version; - hash = "sha256-3+/kEuCb0TYFQ9bS6M13OYN23DWr2DkBRWvhAn8TW5w="; - }; - - cargoHash = "sha256-60JXCBXsXei0INP0rozWqFU8dKZovJ9mn5ns87ziUac="; - - meta = with lib; { - description = "Rust implementation of the Starlark language"; - homepage = "https://github.com/facebook/starlark-rust"; - changelog = "https://github.com/facebook/starlark-rust/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "starlark"; - }; -} diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 7eb0de6f689f..eeca83414a6c 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -26,11 +26,11 @@ mkDerivation rec { strictDeps = true; - nativeBuildInputs = [ cmake pkg-config qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools ] + ++ lib.optionals useSCEL [ emacs ]; buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ] - ++ lib.optional (!stdenv.isDarwin) alsa-lib - ++ lib.optional useSCEL emacs; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/development/interpreters/tcl/8.6.nix b/pkgs/development/interpreters/tcl/8.6.nix index 0edd47e83d6c..9da653b2f761 100644 --- a/pkgs/development/interpreters/tcl/8.6.nix +++ b/pkgs/development/interpreters/tcl/8.6.nix @@ -2,12 +2,12 @@ callPackage ./generic.nix (args // rec { release = "8.6"; - version = "${release}.13"; + version = "${release}.15"; # Note: when updating, the hash in pkgs/development/libraries/tk/8.6.nix must also be updated! src = fetchurl { url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; - sha256 = "sha256-Q6H650EvYf8R3iz9BdKM/Dpzdi81SkF8YjcKVOLK8GY="; + sha256 = "sha256-hh4Vl1Py4vvW7BSEEDcVsL5WvjNXUiuFjTy7X4k//vE="; }; }) diff --git a/pkgs/development/interpreters/tcl/9.0.nix b/pkgs/development/interpreters/tcl/9.0.nix new file mode 100644 index 000000000000..48a9570675a1 --- /dev/null +++ b/pkgs/development/interpreters/tcl/9.0.nix @@ -0,0 +1,16 @@ +{ callPackage, fetchzip, ... }@args: + +callPackage ./generic.nix ( + args + // rec { + release = "9.0"; + version = "${release}.0"; + + # Note: when updating, the hash in pkgs/development/libraries/tk/9.0.nix must also be updated! + + src = fetchzip { + url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; + sha256 = "sha256-QaPSY6kfxyc3x+2ptzEmN2puZ0gSFSeeNjPuxsVKXYE="; + }; + } +) diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 63eafd9c3e81..7746034c357d 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, callPackage, makeSetupHook, runCommand -, tzdata +, tzdata, zip, zlib # Version specific stuff , release, version, src @@ -24,19 +24,41 @@ let --replace "/usr/local/etc/zoneinfo" "" ''; + nativeBuildInputs = lib.optionals (lib.versionAtLeast version "9.0") [ + # Only used to detect the presence of zlib. Could be replaced with a stub. + zip + ]; + + buildInputs = lib.optionals (lib.versionAtLeast version "9.0") [ + zlib + ]; + preConfigure = '' cd unix ''; - configureFlags = [ + # Note: pre-9.0 flags are temporarily interspersed to avoid a mass rebuild. + configureFlags = lib.optionals (lib.versionOlder version "9.0") [ "--enable-threads" + ] ++ [ # Note: using $out instead of $man to prevent a runtime dependency on $man. "--mandir=${placeholder "out"}/share/man" + ] ++ lib.optionals (lib.versionOlder version "9.0") [ "--enable-man-symlinks" # Don't install tzdata because NixOS already has a more up-to-date copy. "--with-tzdata=no" + ] ++ lib.optionals (lib.versionAtLeast version "9.0") [ + # By default, tcl libraries get zipped and embedded into libtcl*.so, + # which gets `zipfs mount`ed at runtime. This is fragile (for example + # stripping the .so removes the zip trailer), so we install them as + # traditional files. + # This might make tcl slower to start from slower storage on cold cache, + # however according to my benchmarks on fast storage and warm cache + # tcl built with --disable-zipfs actually starts in half the time. + "--disable-zipfs" + ] ++ [ "tcl_cv_strtod_unbroken=ok" - ] ++ lib.optional stdenv.is64bit "--enable-64bit"; + ] ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit"; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/tclreadline/default.nix b/pkgs/development/interpreters/tclreadline/default.nix deleted file mode 100644 index de671bab5739..000000000000 --- a/pkgs/development/interpreters/tclreadline/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, automake -, autoconf -, libtool -, readline -, tcl -, tk -}: - -tcl.mkTclDerivation rec { - pname = "tclreadline"; - version = "2.3.8"; - - src = fetchFromGitHub { - owner = "flightaware"; - repo = "tclreadline"; - rev = "v${version}"; - sha256 = "18jl56p0hwgynxpvr0v7b5mvvzc1m64fn61c0957bgb45mc250yq"; - }; - - nativeBuildInputs = [ - automake - autoconf - libtool - ]; - buildInputs = [ - readline - tk - ]; - - preConfigure = "NOCONFIGURE=1 ./autogen.sh"; - - configureFlags = [ - "--enable-tclshrl" - "--enable-wishrl" - "--with-tk=${tk}/lib" - "--with-readline-includes=${readline.dev}/include/readline" - "--with-libtool=${libtool}" - ]; - - # The provided makefile leaves a wrong reference to /build/ in RPATH, - # so we fix it after checking that everything is also present in $out - preFixup = lib.optionalString stdenv.isLinux '' - needed_libraries=$(ls .libs | grep '\.\(so\|la\)$') - for lib in $needed_libraries; do - if ! ls $out/lib | grep "$lib"; then - echo "$lib was not installed correctly" - exit 1 - fi - done - for executable in $out/bin/{wishrl,tclshrl}; do - patchelf --set-rpath \ - "$(patchelf --print-rpath "$executable" | sed "s@$builddir/.libs@$out/lib@")" \ - "$executable" - done - ''; - - meta = with lib; { - description = "GNU readline for interactive tcl shells"; - homepage = "https://github.com/flightaware/tclreadline"; - license = licenses.bsd3; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/interpreters/tinyscheme/01-remove-macOS-main.patch b/pkgs/development/interpreters/tinyscheme/01-remove-macOS-main.patch deleted file mode 100644 index 3fedec98f383..000000000000 --- a/pkgs/development/interpreters/tinyscheme/01-remove-macOS-main.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/scheme.c b/scheme.c -index 6186ef0..5a43592 100644 ---- a/scheme.c -+++ b/scheme.c -@@ -4949,19 +4949,7 @@ pointer scheme_eval(scheme *sc, pointer obj) - - #if STANDALONE - --#if defined(__APPLE__) && !defined (OSX) --int main() --{ -- extern MacTS_main(int argc, char **argv); -- char** argv; -- int argc = ccommand(&argv); -- MacTS_main(argc,argv); -- return 0; --} --int MacTS_main(int argc, char **argv) { --#else - int main(int argc, char **argv) { --#endif - scheme sc; - FILE *fin; - char *file_name=InitFile; diff --git a/pkgs/development/interpreters/tinyscheme/02-use-toolchain-env-vars.patch b/pkgs/development/interpreters/tinyscheme/02-use-toolchain-env-vars.patch deleted file mode 100644 index f23ad8d02ef5..000000000000 --- a/pkgs/development/interpreters/tinyscheme/02-use-toolchain-env-vars.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/makefile b/makefile -index aeb2fcd..4c111a1 100644 ---- a/makefile -+++ b/makefile -@@ -18,7 +18,7 @@ - #AR= echo - - # Unix, generally --CC = gcc -fpic -pedantic -+CC := $(CC) -fpic -pedantic - DEBUG=-g -Wall -Wno-char-subscripts -O - Osuf=o - SOsuf=so -@@ -27,10 +27,10 @@ EXE_EXT= - LIBPREFIX=lib - OUT = -o $@ - RM= -rm -f --AR= ar crs -+AR := $(AR) crs - - # Linux --LD = gcc -+LD := $(CC) - LDFLAGS = -shared - DEBUG=-g -Wno-char-subscripts -O - SYS_LIBS= -ldl -lm diff --git a/pkgs/development/interpreters/tinyscheme/03-macOS-SOsuf.patch b/pkgs/development/interpreters/tinyscheme/03-macOS-SOsuf.patch deleted file mode 100644 index 479ff369b80b..000000000000 --- a/pkgs/development/interpreters/tinyscheme/03-macOS-SOsuf.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/makefile b/makefile -index 4c111a1..8d9e02e 100644 ---- a/makefile -+++ b/makefile -@@ -21,7 +21,7 @@ - CC := $(CC) -fpic -pedantic - DEBUG=-g -Wall -Wno-char-subscripts -O - Osuf=o --SOsuf=so -+SOsuf=dylib - LIBsuf=a - EXE_EXT= - LIBPREFIX=lib diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/development/interpreters/tinyscheme/default.nix deleted file mode 100644 index e22f74c40599..000000000000 --- a/pkgs/development/interpreters/tinyscheme/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, stdenv -, fetchurl -, dos2unix -, runCommand -, tinyscheme -}: - -stdenv.mkDerivation rec { - pname = "tinyscheme"; - version = "1.42"; - - src = fetchurl { - url = "mirror://sourceforge/tinyscheme/${pname}-${version}.tar.gz"; - sha256 = "sha256-F7Cxv/0i89SdWDPiKhILM5A50s/aC0bW/FHdLwG0B60="; - }; - - nativeBuildInputs = [ dos2unix ]; - - prePatch = "dos2unix makefile"; - patches = [ - # The alternate macOS main makes use of `ccommand` which seems to be - # `MetroWerks CodeWarrier` specific: - # https://ptgmedia.pearsoncmg.com/imprint_downloads/informit/downloads/9780201703535/macfix.html - # - # In any case, this is not needed to build on macOS. - ./01-remove-macOS-main.patch - - # We want to have the makefile pick up $CC, etc. so that we don't have - # to unnecessarily tie this package to the GCC stdenv. - ./02-use-toolchain-env-vars.patch - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # On macOS the library suffix is .dylib: - ./03-macOS-SOsuf.patch - ]; - postPatch = '' - substituteInPlace scheme.c --replace "init.scm" "$out/lib/init.scm" - ''; - - installPhase = '' - mkdir -p $out/bin $out/lib - cp init.scm $out/lib - cp libtinyscheme* $out/lib - cp scheme $out/bin/tinyscheme - ''; - - passthru.tests = { - # Checks that the program can run and exit: - simple = runCommand "${pname}-simple-test" {} '' - ${tinyscheme}/bin/tinyscheme <<<"(quit 0)" - echo "success" > $out - ''; - fileIo = runCommand "${pname}-file-io-test" {} '' - ${tinyscheme}/bin/tinyscheme <<EOF - (call-with-output-file "$out" - (lambda (p) - (begin - (write "success!" p) - (newline p) - ))) - EOF - ''; - helpText = runCommand "${pname}-help-text-test" {} '' - ${tinyscheme}/bin/tinyscheme '-?' | tee > $out || : - [[ "$(cat $out)" =~ ^Usage: ]] - ''; - }; - - meta = with lib; { - description = "Lightweight Scheme implementation"; - longDescription = '' - TinyScheme is a lightweight Scheme interpreter that implements as large a - subset of R5RS as was possible without getting very large and complicated. - ''; - homepage = "https://tinyscheme.sourceforge.net/"; - changelog = "https://tinyscheme.sourceforge.net/CHANGES"; - license = licenses.bsdOriginal; - mainProgram = "tinyscheme"; - maintainers = [ maintainers.ebzzry ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix deleted file mode 100644 index f0a45495d70d..000000000000 --- a/pkgs/development/interpreters/unicon-lang/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, libX11, libXt, libnsl, libxcrypt }: - -stdenv.mkDerivation { - pname = "unicon-lang"; - version = "11.7"; - src = fetchurl { - url = "http://unicon.org/dist/uni-2-4-2010.zip"; - sha256 = "1g9l2dfp99dqih2ir2limqfjgagh3v9aqly6x0l3qavx3qkkwf61"; - }; - nativeBuildInputs = [ unzip ]; - buildInputs = [ libnsl libX11 libXt libxcrypt ]; - - hardeningDisable = [ "fortify" ]; - - sourceRoot = "."; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: ../common/ipp.o:(.bss+0x0): multiple definition of `lpath'; tglobals.o:(.bss+0x30): first defined here - # TODO: remove the workaround once upstream releases version past: - # https://sourceforge.net/p/unicon/unicon/ci/b1a65230233f3825d055aee913b4fdcf178a0eaf/ - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - configurePhase = '' - case "$(uname -a | sed 's/ /_/g')" in - Darwin*Version_9*i386) sys=intel_macos;; - Linux*x86_64*) sys=amd64_linux;; - Linux*i686*) sys=intel_linux;; - *) sys=unknown;; - esac - echo "all: ; echo" > uni/3d/makefile - make X-Configure name=$sys - ''; - - buildPhase = '' - make Unicon - ''; - - installPhase = '' - mkdir -p $out/ - cp -r bin $out/ - ''; - - meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); - description = "Very high level, goal-directed, object-oriented, general purpose applications language"; - 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 e5b9b904a061..f8c5814df92e 100644 --- a/pkgs/development/interpreters/wamr/default.nix +++ b/pkgs/development/interpreters/wamr/default.nix @@ -6,25 +6,25 @@ stdenv.mkDerivation (finalAttrs: { pname = "wamr"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasm-micro-runtime"; rev = "WAMR-${finalAttrs.version}"; - hash = "sha256-/DQ+dZ3VoijL7FdgRgPg3H7whhXhjIzjhCaqpjPYw4k="; + hash = "sha256-Rhn26TRyjkR30+zyosfooOGjhvG+ztYtJVQlRfzWEFo="; }; nativeBuildInputs = [ cmake ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinSdkVersion}" ]; sourceRoot = let - platform = if stdenv.isLinux then + platform = if stdenv.hostPlatform.isLinux then "linux" - else if stdenv.isDarwin then + else if stdenv.hostPlatform.isDarwin then "darwin" else throw "unsupported platform"; in "${finalAttrs.src.name}/product-mini/platforms/${platform}"; diff --git a/pkgs/development/interpreters/wasm3/default.nix b/pkgs/development/interpreters/wasm3/default.nix deleted file mode 100644 index ab7ed45dcc71..000000000000 --- a/pkgs/development/interpreters/wasm3/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, cmake, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "wasm3"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "wasm3"; - repo = "wasm3"; - rev = "v${version}"; - sha256 = "07zzmk776j8ydyxhrnnjiscbhhmz182a62r6aix6kfk5kq2cwia2"; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DBUILD_WASI=simple" - ]; - - installPhase = '' - runHook preInstall - install -Dm755 wasm3 -t $out/bin - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/wasm3/wasm3"; - description = "Fastest WebAssembly interpreter, and the most universal runtime"; - platforms = platforms.all; - maintainers = with maintainers; [ malbarbo ]; - license = licenses.mit; - knownVulnerabilities = [ - # wasm3 expects all wasm code to be pre-validated, any users - # should be aware that running unvalidated wasm will potentially - # lead to RCE until upstream have added a builtin validator - "CVE-2022-39974" - "CVE-2022-34529" - "CVE-2022-28990" - "CVE-2022-28966" - "CVE-2021-45947" - "CVE-2021-45946" - "CVE-2021-45929" - "CVE-2021-38592" - ]; - }; -} diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index 2256851c3d2f..46b687557920 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -1,29 +1,26 @@ -{ stdenv -, lib -, rustPlatform -, fetchFromGitHub -, llvmPackages -, libffi -, libxml2 -, CoreFoundation -, SystemConfiguration -, Security -, withLLVM ? !stdenv.isDarwin -, withSinglepass ? !(stdenv.isDarwin && stdenv.isx86_64) +{ + lib, + rustPlatform, + fetchFromGitHub, + llvmPackages, + libffi, + libxml2, + withLLVM ? true, + withSinglepass ? true, }: rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "4.3.5"; + version = "5.0.1"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hEhU3o/SLHWV9zmgCtW+7K/2ev+oGAnrZmlyNtoeSV4="; + hash = "sha256-tfAGPBc36o5/XtVZ8IW6SFr+iWOkFzVTfe9jI4PpuA0="; }; - cargoHash = "sha256-xyR5pnwMGE5K4o7X0Q2JEervSgR5LK1vqpOa3Mm6xkU="; + cargoHash = "sha256-zvQJpAjZNfa54se2xaRPWCWoCWsWw1btaHYrWlyUIZY="; nativeBuildInputs = [ rustPlatform.bindgenHook @@ -33,10 +30,6 @@ rustPlatform.buildRustPackage rec { llvmPackages.llvm libffi libxml2 - ] ++ lib.optionals stdenv.isDarwin [ - CoreFoundation - SystemConfiguration - Security ]; # check references to `compiler_features` in Makefile on update @@ -46,18 +39,21 @@ rustPlatform.buildRustPackage rec { "static-artifact-create" "wasmer-artifact-load" "static-artifact-load" - ] - ++ lib.optional withLLVM "llvm" - ++ lib.optional withSinglepass "singlepass"; + ] ++ lib.optional withLLVM "llvm" ++ lib.optional withSinglepass "singlepass"; - cargoBuildFlags = [ "--manifest-path" "lib/cli/Cargo.toml" "--bin" "wasmer" ]; + cargoBuildFlags = [ + "--manifest-path" + "lib/cli/Cargo.toml" + "--bin" + "wasmer" + ]; - env.LLVM_SYS_150_PREFIX = lib.optionalString withLLVM llvmPackages.llvm.dev; + env.LLVM_SYS_180_PREFIX = lib.optionalString withLLVM llvmPackages.llvm.dev; # Tests are failing due to `Cannot allocate memory` and other reasons doCheck = false; - meta = with lib; { + meta = { description = "Universal WebAssembly Runtime"; mainProgram = "wasmer"; longDescription = '' @@ -67,7 +63,12 @@ rustPlatform.buildRustPackage rec { x86 and ARM devices. ''; homepage = "https://wasmer.io/"; - license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne shamilton nickcao ]; + license = lib.licenses.mit; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ + Br1ght0ne + shamilton + nickcao + ]; }; } diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 8bcb83677b38..691f017ec646 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,24 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "24.0.0"; + version = "26.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-pR6yjJf0szjB73+vqXT4d8P9WD+SIOkEOe4Wl6EgIqQ="; + hash = "sha256-Q7f35Y3ZZ7BHLwmdsa0I5gtlNMObscVD/3jKrVetGnA="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-bZtBEmzmu63wNlGhYvN0gYKkLPxzBHZ1iO16BMPD3tE="; + cargoHash = "sha256-kaE+LoqnWPZcM9H5FM7SRPRq2J78yrL5zWdV2klVLDU="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # rustfmt is brought into scope to fix the following # warning: cranelift-codegen@0.108.0: @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { install -d -m0755 $dev/include/wasmtime install -m0644 $src/crates/c-api/include/*.h $dev/include install -m0644 $src/crates/c-api/include/wasmtime/*.h $dev/include/wasmtime - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id \ $dev/lib/libwasmtime.dylib \ $dev/lib/libwasmtime.dylib diff --git a/pkgs/development/interpreters/wazero/default.nix b/pkgs/development/interpreters/wazero/default.nix deleted file mode 100644 index efeb1e7f9a21..000000000000 --- a/pkgs/development/interpreters/wazero/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, testers -, wazero -}: - -buildGoModule rec { - pname = "wazero"; - version = "1.8.0"; - - src = fetchFromGitHub { - owner = "tetratelabs"; - repo = "wazero"; - rev = "v${version}"; - hash = "sha256-m8dv8r1iJGM6RSPDhJk6KM7sHy3YorvsXUACsSb9bCU="; - }; - - vendorHash = null; - - subPackages = [ - "cmd/wazero" - ]; - - ldflags = [ - "-s" - "-w" - "-X=github.com/tetratelabs/wazero/internal/version.version=${version}" - ]; - - checkFlags = [ - # fails when version is specified - "-skip=TestCompile|TestRun" - ]; - - passthru.tests = { - version = testers.testVersion { - package = wazero; - command = "wazero version"; - }; - }; - - meta = with lib; { - description = "Zero dependency WebAssembly runtime for Go developers"; - homepage = "https://github.com/tetratelabs/wazero"; - changelog = "https://github.com/tetratelabs/wazero/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "wazero"; - }; -} diff --git a/pkgs/development/interpreters/yaegi/default.nix b/pkgs/development/interpreters/yaegi/default.nix deleted file mode 100644 index 1721417e7ec9..000000000000 --- a/pkgs/development/interpreters/yaegi/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, testers -, yaegi -}: - -buildGoModule rec { - pname = "yaegi"; - version = "0.16.1"; - - src = fetchFromGitHub { - owner = "traefik"; - repo = "yaegi"; - rev = "v${version}"; - hash = "sha256-jpLx2z65KeCPC4AQgFmUUphmmiT4EeHwrYn3/rD4Rzg="; - }; - - vendorHash = null; - - subPackages = [ - "cmd/yaegi" - ]; - - ldflags = [ - "-s" - "-w" - "-X=main.version=${version}" - ]; - - passthru.tests = { - version = testers.testVersion { - package = yaegi; - command = "yaegi version"; - }; - }; - - meta = with lib; { - description = "Go interpreter"; - mainProgram = "yaegi"; - homepage = "https://github.com/traefik/yaegi"; - changelog = "https://github.com/traefik/yaegi/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/interpreters/zuo/default.nix b/pkgs/development/interpreters/zuo/default.nix deleted file mode 100644 index 9bfb925586c4..000000000000 --- a/pkgs/development/interpreters/zuo/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "zuo"; - version = "1.9"; - - src = fetchFromGitHub { - owner = "racket"; - repo = "zuo"; - rev = "v${version}"; - hash = "sha256-F7ba/4VVVhNDK/wqk+kgJKYxETS2pR9ZiDh0O0aOWn0="; - }; - - doCheck = true; - - meta = with lib; { - description = "Tiny Racket for Scripting"; - mainProgram = "zuo"; - homepage = "https://github.com/racket/zuo"; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/java-modules/jna/default.nix b/pkgs/development/java-modules/jna/default.nix deleted file mode 100644 index ac9590da85de..000000000000 --- a/pkgs/development/java-modules/jna/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, ant, jdk, stripJavaArchivesHook }: - -stdenv.mkDerivation (finalAttrs: { - pname = "jna"; - version = "5.14.0"; - - src = fetchFromGitHub { - owner = "java-native-access"; - repo = "jna"; - rev = finalAttrs.version; - hash = "sha256-a5l9khKLWfvTHv53utfbw344/UNQOnIU93+wZNQ0ji4="; - }; - - nativeBuildInputs = [ ant jdk stripJavaArchivesHook ]; - - buildPhase = '' - runHook preBuild - rm -r dist # remove prebuilt files - ant dist - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -Dm444 -t $out/share/java dist/jna{,-platform}.jar - runHook postInstall - ''; - - meta = with lib; { - changelog = "https://github.com/java-native-access/jna/blob/${finalAttrs.version}/CHANGES.md"; - description = "Java Native Access"; - homepage = "https://github.com/java-native-access/jna"; - license = with licenses; [ lgpl21 asl20 ]; - maintainers = with maintainers; [ nagy ]; - platforms = platforms.linux ++ platforms.darwin; - }; -}) diff --git a/pkgs/development/java-modules/liquibase_redshift_extension/default.nix b/pkgs/development/java-modules/liquibase_redshift_extension/default.nix deleted file mode 100644 index ba15086ae0ab..000000000000 --- a/pkgs/development/java-modules/liquibase_redshift_extension/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchMavenArtifact }: - -stdenv.mkDerivation rec { - pname = "liquibase-redshift-extension"; - version = "4.8.0"; - - src = fetchMavenArtifact { - artifactId = "liquibase-redshift"; - groupId = "org.liquibase.ext"; - sha256 = "sha256-jZdDKAC4Cvmkih8VH84Z3Q8BzsqGO55Uefr8vOlbDAk="; - inherit version; - }; - - installPhase = '' - runHook preInstall - install -m444 -D $src/share/java/liquibase-redshift-${version}.jar $out/share/java/liquibase-redshift.jar - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/liquibase/liquibase-redshift/"; - description = "Amazon Redshift extension for Liquibase"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ sir4ur0n ]; - }; -} diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix deleted file mode 100644 index f1e93e352eb8..000000000000 --- a/pkgs/development/java-modules/postgresql_jdbc/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchMavenArtifact }: - -stdenv.mkDerivation rec { - pname = "postgresql-jdbc"; - version = "42.6.1"; - - src = fetchMavenArtifact { - artifactId = "postgresql"; - groupId = "org.postgresql"; - hash = "sha256-ywd0/X0JsjniHp0Es3RKQId7/0Y6jVjD9AfPfZdsNVc="; - inherit version; - }; - - installPhase = '' - runHook preInstall - install -m444 -D $src/share/java/*postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://jdbc.postgresql.org/"; - changelog = "https://github.com/pgjdbc/pgjdbc/releases/tag/REL${version}"; - description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; - license = licenses.bsd2; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/java-modules/redshift_jdbc/default.nix b/pkgs/development/java-modules/redshift_jdbc/default.nix deleted file mode 100644 index ab15b136e14c..000000000000 --- a/pkgs/development/java-modules/redshift_jdbc/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchMavenArtifact }: - -stdenv.mkDerivation rec { - pname = "redshift-jdbc"; - version = "2.1.0.3"; - - src = fetchMavenArtifact { - artifactId = "redshift-jdbc42"; - groupId = "com.amazon.redshift"; - sha256 = "sha256-TO/JXh/pZ7tUZGfHqkzgZx18gLnISvnPVyGavzFv6vo="; - inherit version; - }; - - installPhase = '' - runHook preInstall - install -m444 -D $src/share/java/redshift-jdbc42-${version}.jar $out/share/java/redshift-jdbc42.jar - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/aws/amazon-redshift-jdbc-driver/"; - description = - "JDBC 4.2 driver for Amazon Redshift allowing Java programs to connect to a Redshift database"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ sir4ur0n ]; - }; -} diff --git a/pkgs/development/julia-modules/package-closure.nix b/pkgs/development/julia-modules/package-closure.nix index bb0b08b33e41..8bc9e2774d81 100644 --- a/pkgs/development/julia-modules/package-closure.nix +++ b/pkgs/development/julia-modules/package-closure.nix @@ -10,131 +10,6 @@ }: let - # The specific package resolution code depends on the Julia version - # These are pretty similar and could be combined to reduce duplication - resolveCode = if lib.versionOlder julia.version "1.7" then resolveCode1_6 else resolveCode1_8; - - resolveCode1_6 = '' - import Pkg.API: check_package_name - import Pkg.Types: Context!, PRESERVE_NONE, manifest_info, project_deps_resolve!, registry_resolve!, stdlib_resolve!, ensure_resolved - import Pkg.Operations: _resolve, assert_can_add, is_dep, update_package_add - - foreach(pkg -> check_package_name(pkg.name, :add), pkgs) - pkgs = deepcopy(pkgs) # deepcopy for avoid mutating PackageSpec members - Context!(ctx) - - project_deps_resolve!(ctx, pkgs) - registry_resolve!(ctx, pkgs) - stdlib_resolve!(pkgs) - ensure_resolved(ctx, pkgs, registry=true) - - assert_can_add(ctx, pkgs) - - for (i, pkg) in pairs(pkgs) - entry = manifest_info(ctx, pkg.uuid) - pkgs[i] = update_package_add(ctx, pkg, entry, is_dep(ctx, pkg)) - end - - foreach(pkg -> ctx.env.project.deps[pkg.name] = pkg.uuid, pkgs) - - pkgs, deps_map = _resolve(ctx, pkgs, PRESERVE_NONE) -''; - - resolveCode1_8 = '' - import Pkg.API: handle_package_input! - import Pkg.Types: PRESERVE_NONE, UUID, VersionSpec, project_deps_resolve!, registry_resolve!, stdlib_resolve!, ensure_resolved - import Pkg.Operations: _resolve, assert_can_add, update_package_add - import TOML - - foreach(handle_package_input!, pkgs) - - # The handle_package_input! call above clears pkg.path, so we have to apply package overrides after - overrides = Dict{String, String}(${builtins.concatStringsSep ", " (lib.mapAttrsToList (name: path: ''"${name}" => "${path}"'') packageOverrides)}) - println("Package overrides: ") - println(overrides) - for pkg in pkgs - if pkg.name in keys(overrides) - pkg.path = overrides[pkg.name] - - # Try to read the UUID from $(pkg.path)/Project.toml. If successful, put the package into ctx.env.project.deps. - # This is necessary for the ensure_resolved call below to succeed, and will allow us to use an override even - # if it does not appear in the registry. - # See https://github.com/NixOS/nixpkgs/issues/279853 - project_toml = joinpath(pkg.path, "Project.toml") - if isfile(project_toml) - toml_data = TOML.parsefile(project_toml) - if haskey(toml_data, "uuid") - ctx.env.project.deps[pkg.name] = UUID(toml_data["uuid"]) - end - end - end - end - - project_deps_resolve!(ctx.env, pkgs) - registry_resolve!(ctx.registries, pkgs) - stdlib_resolve!(pkgs) - ensure_resolved(ctx, ctx.env.manifest, pkgs, registry=true) - - assert_can_add(ctx, pkgs) - - for (i, pkg) in pairs(pkgs) - entry = Pkg.Types.manifest_info(ctx.env.manifest, pkg.uuid) - is_dep = any(uuid -> uuid == pkg.uuid, [uuid for (name, uuid) in ctx.env.project.deps]) - pkgs[i] = update_package_add(ctx, pkg, entry, is_dep) - end - - foreach(pkg -> ctx.env.project.deps[pkg.name] = pkg.uuid, pkgs) - - # Save the original pkgs for later. We might need to augment it with the weak dependencies - orig_pkgs = pkgs - - pkgs, deps_map = _resolve(ctx.io, ctx.env, ctx.registries, pkgs, PRESERVE_NONE, ctx.julia_version) - - if VERSION >= VersionNumber("1.9") - while true - # Check for weak dependencies, which appear on the RHS of the deps_map but not in pkgs. - # Build up weak_name_to_uuid - uuid_to_name = Dict() - for pkg in pkgs - uuid_to_name[pkg.uuid] = pkg.name - end - weak_name_to_uuid = Dict() - for (uuid, deps) in pairs(deps_map) - for (dep_name, dep_uuid) in pairs(deps) - if !haskey(uuid_to_name, dep_uuid) - weak_name_to_uuid[dep_name] = dep_uuid - end - end - end - - if isempty(weak_name_to_uuid) - break - end - - # We have nontrivial weak dependencies, so add each one to the initial pkgs and then re-run _resolve - println("Found weak dependencies: $(keys(weak_name_to_uuid))") - - orig_uuids = Set([pkg.uuid for pkg in orig_pkgs]) - - for (name, uuid) in pairs(weak_name_to_uuid) - if uuid in orig_uuids - continue - end - - pkg = PackageSpec(name, uuid) - - push!(orig_uuids, uuid) - push!(orig_pkgs, pkg) - ctx.env.project.deps[name] = uuid - entry = Pkg.Types.manifest_info(ctx.env.manifest, uuid) - orig_pkgs[length(orig_pkgs)] = update_package_add(ctx, pkg, entry, false) - end - - global pkgs, deps_map = _resolve(ctx.io, ctx.env, ctx.registries, orig_pkgs, PRESERVE_NONE, ctx.julia_version) - end - end - ''; - juliaExpression = packageNames: '' import Pkg Pkg.Registry.add(Pkg.RegistrySpec(path="${augmentedRegistry}")) @@ -144,7 +19,7 @@ let input = ${lib.generators.toJSON {} packageNames} if isfile("extra_package_names.txt") - append!(input, readlines("extra_package_names.txt")) + append!(input, readlines("extra_package_names.txt")) end input = unique(input) @@ -155,20 +30,21 @@ let ctx = Context() - ${resolveCode} + overrides = Dict{String, String}(${builtins.concatStringsSep ", " (lib.mapAttrsToList (name: path: ''"${name}" => "${path}"'') packageOverrides)}) + ${builtins.readFile ./resolve_packages.jl} open(ENV["out"], "w") do io - for spec in pkgs - println(io, "- name: " * spec.name) - println(io, " uuid: " * string(spec.uuid)) - println(io, " version: " * string(spec.version)) - if endswith(spec.name, "_jll") && haskey(deps_map, spec.uuid) - println(io, " depends_on: ") - for (dep_name, dep_uuid) in pairs(deps_map[spec.uuid]) - println(io, " \"$(dep_name)\": \"$(dep_uuid)\"") - end + for spec in pkgs + println(io, "- name: " * spec.name) + println(io, " uuid: " * string(spec.uuid)) + println(io, " version: " * string(spec.version)) + if endswith(spec.name, "_jll") && haskey(deps_map, spec.uuid) + println(io, " depends_on: ") + for (dep_name, dep_uuid) in pairs(deps_map[spec.uuid]) + println(io, " \"$(dep_name)\": \"$(dep_uuid)\"") + end + end end - end end ''; in diff --git a/pkgs/development/julia-modules/resolve_packages.jl b/pkgs/development/julia-modules/resolve_packages.jl new file mode 100644 index 000000000000..fce60035d5f5 --- /dev/null +++ b/pkgs/development/julia-modules/resolve_packages.jl @@ -0,0 +1,99 @@ +import Pkg.API: handle_package_input! +import Pkg.Types: PRESERVE_NONE, UUID, VersionSpec, project_deps_resolve!, registry_resolve!, stdlib_resolve!, ensure_resolved +import Pkg.Operations: _resolve, assert_can_add, update_package_add +import TOML + +foreach(handle_package_input!, pkgs) + +# The handle_package_input! call above clears pkg.path, so we have to apply package overrides after +println("Package overrides: ") +println(overrides) +for pkg in pkgs + if pkg.name in keys(overrides) + pkg.path = overrides[pkg.name] + + # Try to read the UUID from $(pkg.path)/Project.toml. If successful, put the package into ctx.env.project.deps. + # This is necessary for the ensure_resolved call below to succeed, and will allow us to use an override even + # if it does not appear in the registry. + # See https://github.com/NixOS/nixpkgs/issues/279853 + project_toml = joinpath(pkg.path, "Project.toml") + if isfile(project_toml) + toml_data = TOML.parsefile(project_toml) + if haskey(toml_data, "uuid") + ctx.env.project.deps[pkg.name] = UUID(toml_data["uuid"]) + end + end + end +end + +project_deps_resolve!(ctx.env, pkgs) +registry_resolve!(ctx.registries, pkgs) +stdlib_resolve!(pkgs) +ensure_resolved(ctx, ctx.env.manifest, pkgs, registry=true) + +assert_can_add(ctx, pkgs) + +for (i, pkg) in pairs(pkgs) + entry = Pkg.Types.manifest_info(ctx.env.manifest, pkg.uuid) + is_dep = any(uuid -> uuid == pkg.uuid, [uuid for (name, uuid) in ctx.env.project.deps]) + if VERSION >= VersionNumber("1.11") + pkgs[i] = update_package_add(ctx, pkg, entry, nothing, nothing, is_dep) + else + pkgs[i] = update_package_add(ctx, pkg, entry, is_dep) + end +end + +foreach(pkg -> ctx.env.project.deps[pkg.name] = pkg.uuid, pkgs) + +# Save the original pkgs for later. We might need to augment it with the weak dependencies +orig_pkgs = pkgs + +pkgs, deps_map = _resolve(ctx.io, ctx.env, ctx.registries, pkgs, PRESERVE_NONE, ctx.julia_version) + +if VERSION >= VersionNumber("1.9") + while true + # Check for weak dependencies, which appear on the RHS of the deps_map but not in pkgs. + # Build up weak_name_to_uuid + uuid_to_name = Dict() + for pkg in pkgs + uuid_to_name[pkg.uuid] = pkg.name + end + weak_name_to_uuid = Dict() + for (uuid, deps) in pairs(deps_map) + for (dep_name, dep_uuid) in pairs(deps) + if !haskey(uuid_to_name, dep_uuid) + weak_name_to_uuid[dep_name] = dep_uuid + end + end + end + + if isempty(weak_name_to_uuid) + break + end + + # We have nontrivial weak dependencies, so add each one to the initial pkgs and then re-run _resolve + println("Found weak dependencies: $(keys(weak_name_to_uuid))") + + orig_uuids = Set([pkg.uuid for pkg in orig_pkgs]) + + for (name, uuid) in pairs(weak_name_to_uuid) + if uuid in orig_uuids + continue + end + + pkg = PackageSpec(name, uuid) + + push!(orig_uuids, uuid) + push!(orig_pkgs, pkg) + ctx.env.project.deps[name] = uuid + entry = Pkg.Types.manifest_info(ctx.env.manifest, uuid) + if VERSION >= VersionNumber("1.11") + orig_pkgs[length(orig_pkgs)] = update_package_add(ctx, pkg, entry, nothing, nothing, false) + else + orig_pkgs[length(orig_pkgs)] = update_package_add(ctx, pkg, entry, false) + end + end + + global pkgs, deps_map = _resolve(ctx.io, ctx.env, ctx.registries, orig_pkgs, PRESERVE_NONE, ctx.julia_version) + end +end diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix deleted file mode 100644 index 6c1eeff94118..000000000000 --- a/pkgs/development/libraries/AntTweakBar/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, xorg, libGLU, libGL }: - -stdenv.mkDerivation rec { - pname = "AntTweakBar"; - version = "1.16"; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ xorg.libX11 libGLU libGL ]; - - src = fetchurl { - url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_${lib.replaceStrings ["."] [""] version}.zip"; - sha256 = "0z3frxpzf54cjs07m6kg09p7nljhr7140f4pznwi7srwq4cvgkpv"; - }; - - postPatch = "cd src"; - installPhase = '' - mkdir -p $out/lib/ - cp ../lib/{libAntTweakBar.so,libAntTweakBar.so.1,libAntTweakBar.a} $out/lib/ - cp -r ../include $out/ - ''; - - meta = { - description = "Add a light/intuitive GUI to OpenGL applications"; - longDescription = '' - A small and easy-to-use C/C++ library that allows to quickly add a light - and intuitive graphical user interface into graphic applications based on OpenGL - (compatibility and core profiles), DirectX 9, DirectX 10 or DirectX 11 - to interactively tweak parameters on-screen - ''; - homepage = "https://anttweakbar.sourceforge.net/"; - license = lib.licenses.zlib; - maintainers = [ lib.maintainers.razvan ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index e7d26606f271..3c0ba58041a4 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { url = "https://github.com/CGAL/cgal/releases/download/v${version}/CGAL-${version}.tar.xz"; - hash = "sha256-zbFefuMeBmNYnTEHp5mIo3t7FxnfPSTyBYVF0bzdWDc="; + hash = "sha256-RY9g346PHy/a2TyPJOGqj0sJXMYaFPrIG5BoDXMGpC4="; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/pkgs/development/libraries/LAStools/default.nix b/pkgs/development/libraries/LAStools/default.nix deleted file mode 100644 index 8a34168484eb..000000000000 --- a/pkgs/development/libraries/LAStools/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "LAStools"; - version = "2.0.3"; - - src = fetchFromGitHub { - owner = "LAStools"; - repo = "LAStools"; - rev = "v${version}"; - sha256 = "sha256-IyZjM8YvIVB0VPNuEhmHHw7EuKw5RanB2qhCnBD1fRY="; - }; - - patches = [ - ./drop-64-suffix.patch # necessary to prevent '64' from being appended to the names of the executables - ]; - - hardeningDisable = [ - "format" - ]; - - nativeBuildInputs = [ - cmake - ]; - - meta = with lib; { - description = "Software for rapid LiDAR processing"; - homepage = "http://lastools.org/"; - license = licenses.unfree; - maintainers = with maintainers; teams.geospatial.members ++ [ stephenwithph ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/LAStools/drop-64-suffix.patch b/pkgs/development/libraries/LAStools/drop-64-suffix.patch deleted file mode 100644 index 2090baeb3b2b..000000000000 --- a/pkgs/development/libraries/LAStools/drop-64-suffix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -32,6 +32,6 @@ endforeach(TARGET) - foreach(TARGET ${ALL_TARGETS}) - target_link_libraries(${TARGET} LASlib) - set_target_properties(${TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin64) -- set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${TARGET}64) -+ set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${TARGET}) - install(TARGETS ${TARGET} RUNTIME DESTINATION bin) - endforeach(TARGET) --- -2.28.0 - diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 3b423e79ed13..9e319154717b 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -8,7 +8,7 @@ libGLSupported ? lib.elem stdenv.hostPlatform.system mesa.meta.platforms, openglSupport ? libGLSupported, libGL, - alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + alsaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, alsa-lib, x11Support ? !stdenv.hostPlatform.isWindows && !stdenv.hostPlatform.isAndroid, libX11, @@ -21,7 +21,7 @@ libXext, libXxf86vm, libXrandr, - waylandSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + waylandSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, wayland, wayland-protocols, wayland-scanner, @@ -29,17 +29,18 @@ libdrm, mesa, libxkbcommon, - dbusSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + dbusSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, dbus, - udevSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + udevSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, udev, ibusSupport ? false, ibus, - libdecorSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + libdecorSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, libdecor, - pipewireSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + pipewireSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, pipewire, # NOTE: must be built with SDL2 without pipewire support - pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid, + pulseaudioSupport ? + config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, libpulseaudio, AudioUnit, Cocoa, @@ -112,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { dlopenPropagatedBuildInputs = [ ] # Propagated for #include <GLES/gl.h> in SDL_opengles.h. - ++ lib.optional (openglSupport && !stdenv.isDarwin) libGL + ++ lib.optional (openglSupport && !stdenv.hostPlatform.isDarwin) libGL # Propagated for #include <X11/Xlib.h> and <X11/Xatom.h> in SDL_syswm.h. ++ lib.optionals x11Support [ libX11 ]; @@ -153,7 +154,7 @@ stdenv.mkDerivation (finalAttrs: { ++ finalAttrs.dlopenBuildInputs ++ lib.optional ibusSupport ibus ++ lib.optionals waylandSupport [ wayland-protocols ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioUnit Cocoa CoreAudio @@ -169,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!x11Support) "--without-x" ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib" ++ lib.optional stdenv.hostPlatform.isWindows "--disable-video-opengles" - ++ lib.optional stdenv.isDarwin "--disable-sdltest"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-sdltest"; # We remove libtool .la files when static libs are requested, # because they make the builds of downstream libs like `SDL_tff` diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix deleted file mode 100644 index 83237060312f..000000000000 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, stdenv -, fetchurl -, imake -, gccmakedep -, bison -, flex -, pkg-config -, libXext -, libXmu -, libXpm -, libXp -, libXt -, xorgproto -}: - -stdenv.mkDerivation rec { - pname = "Xaw3d"; - version = "1.6.6"; - - src = fetchurl { - url = "https://www.x.org/releases/individual/lib/libXaw3d-${version}.tar.xz"; - sha256 = "sha256-pBw+NxNa1hax8ou95wACr788tZow3zQUH4KdMurchkY="; - }; - dontUseImakeConfigure = true; - nativeBuildInputs = [ pkg-config bison flex imake gccmakedep ]; - buildInputs = [ libXext libXpm libXp ]; - propagatedBuildInputs = [ libXmu libXt xorgproto ]; - - meta = with lib; { - description = "3D widget set based on the Athena Widget set"; - platforms = lib.platforms.unix; - license = licenses.mit; - }; -} diff --git a/pkgs/development/libraries/aalib/clang.patch b/pkgs/development/libraries/aalib/clang.patch deleted file mode 100644 index 5f8fa80f387d..000000000000 --- a/pkgs/development/libraries/aalib/clang.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -ur a/configure b/configure ---- a/configure 2001-04-26 10:44:54.000000000 -0400 -+++ b/configure 2023-10-21 23:19:52.941161475 -0400 -@@ -1005,7 +1005,7 @@ - #line 1006 "configure" - #include "confdefs.h" - --main(){return(0);} -+int main(){return(0);} - EOF - if { (eval echo configure:1011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes -diff -ur a/src/aafire.c b/src/aafire.c ---- a/src/aafire.c 2001-04-26 11:30:03.000000000 -0400 -+++ b/src/aafire.c 2023-10-21 23:46:54.478750904 -0400 -@@ -1,3 +1,4 @@ -+#include <stdlib.h> - #include <stdio.h> - #include "aalib.h" - -diff -ur a/src/aainfo.c b/src/aainfo.c ---- a/src/aainfo.c 2001-04-26 10:37:31.000000000 -0400 -+++ b/src/aainfo.c 2023-10-21 23:31:54.141133353 -0400 -@@ -1,4 +1,4 @@ -- -+#include <stdlib.h> - #include "aalib.h" - #include "aaint.h" - int main(int argc, char **argv) -diff -ur a/src/aakbdreg.c b/src/aakbdreg.c ---- a/src/aakbdreg.c 2023-10-21 23:19:00.787207960 -0400 -+++ b/src/aakbdreg.c 2023-10-21 23:23:49.667253541 -0400 -@@ -1,4 +1,5 @@ - #include <malloc.h> -+#include <string.h> - #include "config.h" - #include "aalib.h" - #include "aaint.h" -diff -ur a/src/aamoureg.c b/src/aamoureg.c ---- a/src/aamoureg.c 2023-10-21 23:19:00.787725591 -0400 -+++ b/src/aamoureg.c 2023-10-21 23:26:51.821477807 -0400 -@@ -1,4 +1,5 @@ - #include <malloc.h> -+#include <string.h> - #include "config.h" - #include "aalib.h" - #include "aaint.h" -diff -ur a/src/aaregist.c b/src/aaregist.c ---- a/src/aaregist.c 2023-10-21 23:19:00.788130179 -0400 -+++ b/src/aaregist.c 2023-10-21 23:19:38.929729034 -0400 -@@ -1,4 +1,5 @@ - #include <malloc.h> -+#include <string.h> - #include "config.h" - #include "aalib.h" - #include "aaint.h" -diff -ur a/src/aasavefont.c b/src/aasavefont.c ---- a/src/aasavefont.c 2001-04-26 10:37:31.000000000 -0400 -+++ b/src/aasavefont.c 2023-10-21 23:51:09.216521714 -0400 -@@ -1,3 +1,5 @@ -+#include <stdlib.h> -+#include <stdio.h> - #include "aalib.h" - int main(int argc, char **argv) - { -diff -ur a/src/aatest.c b/src/aatest.c ---- a/src/aatest.c 2001-04-26 10:37:31.000000000 -0400 -+++ b/src/aatest.c 2023-10-21 23:43:16.758422704 -0400 -@@ -1,3 +1,5 @@ -+#include <stdlib.h> -+#include <string.h> - #include "aalib.h" - int main(int argc, char **argv) - { diff --git a/pkgs/development/libraries/aalib/darwin.patch b/pkgs/development/libraries/aalib/darwin.patch deleted file mode 100644 index 94b548b35c16..000000000000 --- a/pkgs/development/libraries/aalib/darwin.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff --git a/src/aaedit.c b/src/aaedit.c -index 09534d2..2ea52f9 100644 ---- a/src/aaedit.c -+++ b/src/aaedit.c -@@ -1,6 +1,6 @@ - #include <string.h> - #include <ctype.h> --#include <malloc.h> -+#include <stdlib.h> - #include "aalib.h" - #include "aaint.h" - static void aa_editdisplay(struct aa_edit *e) - -diff --git a/src/aakbdreg.c b/src/aakbdreg.c -index def65fe..f4f8efb 100644 ---- a/src/aakbdreg.c -+++ b/src/aakbdreg.c -@@ -1,4 +1,4 @@ --#include <malloc.h> -+#include <stdlib.h> - #include <string.h> - #include "config.h" - #include "aalib.h" -diff --git a/src/aalib.c b/src/aalib.c -index 11fecc8..e3063b4 100644 ---- a/src/aalib.c -+++ b/src/aalib.c -@@ -1,6 +1,6 @@ - #include <stdio.h> - #include <string.h> --#include <malloc.h> -+#include <stdlib.h> - #include "aalib.h" - #include "aaint.h" - -diff --git a/src/aamoureg.c b/src/aamoureg.c -index 0380828..bb55fe3 100644 ---- a/src/aamoureg.c -+++ b/src/aamoureg.c -@@ -1,4 +1,4 @@ --#include <malloc.h> -+#include <stdlib.h> - #include <string.h> - #include "config.h" - #include "aalib.h" -diff --git a/src/aarec.c b/src/aarec.c -index 70f4ebc..ee43e8a 100644 ---- a/src/aarec.c -+++ b/src/aarec.c -@@ -1,5 +1,5 @@ - #include <string.h> --#include <malloc.h> -+#include <stdlib.h> - #include "aalib.h" - #include "aaint.h" - aa_linkedlist *aa_kbdrecommended = NULL, *aa_mouserecommended = NULL, -diff --git a/src/aaregist.c b/src/aaregist.c -index 54abec0..765155e 100644 ---- a/src/aaregist.c -+++ b/src/aaregist.c -@@ -1,4 +1,4 @@ --#include <malloc.h> -+#include <stdlib.h> - #include <string.h> - #include "config.h" - #include "aalib.h" -diff --git a/src/aax.c b/src/aax.c -index adcbd82..36e3294 100644 ---- a/src/aax.c -+++ b/src/aax.c -@@ -1,4 +1,3 @@ --#include <malloc.h> - #include <stdlib.h> - #include <string.h> - #include <stdio.h> -diff --git a/src/aaxkbd.c b/src/aaxkbd.c -index 30d5903..da2248d 100644 ---- a/src/aaxkbd.c -+++ b/src/aaxkbd.c -@@ -1,4 +1,3 @@ --#include <malloc.h> - #include <stdlib.h> - #include <string.h> - #include <stdio.h> -diff --git a/src/aaxmouse.c b/src/aaxmouse.c -index 9935b03..7e725ad 100644 ---- a/src/aaxmouse.c -+++ b/src/aaxmouse.c -@@ -1,4 +1,3 @@ --#include <malloc.h> - #include <stdlib.h> - #include <string.h> - #include <stdio.h> -diff --git a/aalib.m4 b/aalib.m4 -index c40b8db..991fbda 100644 ---- a/aalib.m4 -+++ b/aalib.m4 -@@ -9,7 +9,7 @@ - dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) - dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS - dnl --AC_DEFUN(AM_PATH_AALIB, -+AC_DEFUN([AM_PATH_AALIB], - [dnl - dnl Get the cflags and libraries from the aalib-config script - dnl diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix deleted file mode 100644 index 903364ea27f6..000000000000 --- a/pkgs/development/libraries/aalib/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{lib, stdenv, fetchurl, ncurses, automake}: - -stdenv.mkDerivation rec { - pname = "aalib"; - version = "1.4rc5"; - - src = fetchurl { - url = "mirror://sourceforge/aa-project/aalib-${version}.tar.gz"; - sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv"; - }; - - outputs = [ "bin" "dev" "out" "man" "info" ]; - setOutputFlags = false; # Doesn't support all the flags - - patches = [ ./clang.patch ] # Fix implicit `int` on `main` error with newer versions of clang - ++ lib.optionals stdenv.isDarwin [ ./darwin.patch ]; - - # The fuloong2f is not supported by aalib still - preConfigure = '' - cp ${automake}/share/automake*/config.{sub,guess} . - configureFlagsArray+=( - "--bindir=$bin/bin" - "--includedir=$dev/include" - "--libdir=$out/lib" - ) - ''; - - buildInputs = [ ncurses ]; - - configureFlags = [ "--without-x" "--with-ncurses=${ncurses.dev}" ]; - - postInstall = '' - mkdir -p $dev/bin - mv $bin/bin/aalib-config $dev/bin/aalib-config - substituteInPlace $out/lib/libaa.la --replace "${ncurses.dev}/lib" "${ncurses.out}/lib" - ''; - - meta = { - description = "ASCII art graphics library"; - platforms = lib.platforms.unix; - license = lib.licenses.lgpl2; - }; -} diff --git a/pkgs/development/libraries/abseil-cpp/202103.nix b/pkgs/development/libraries/abseil-cpp/202103.nix index 04af3153719a..ec43a98c0497 100644 --- a/pkgs/development/libraries/abseil-cpp/202103.nix +++ b/pkgs/development/libraries/abseil-cpp/202103.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { url = "https://github.com/abseil/abseil-cpp/commit/808bc202fc13e85a7948db0d7fb58f0f051200b1.patch"; sha256 = "sha256-ayY/aV/xWOdEyFSDqV7B5WDGvZ0ASr/aeBeYwP5RZVc="; }) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages # that require a different SDK other than the default one. ./cmake-core-foundation.patch @@ -59,5 +59,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.all; maintainers = [ maintainers.andersk ]; + # Requires LFS64 APIs. 202401 and later are fine. + broken = stdenv.hostPlatform.isMusl; }; } diff --git a/pkgs/development/libraries/abseil-cpp/202301.nix b/pkgs/development/libraries/abseil-cpp/202301.nix index 62d98d77a38f..0280a183e869 100644 --- a/pkgs/development/libraries/abseil-cpp/202301.nix +++ b/pkgs/development/libraries/abseil-cpp/202301.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-7C/QIXYRyUyNVVE0tqmv8b5g/uWc58iBI5jzdtddQ+U="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages # that require a different SDK other than the default one. ./cmake-core-foundation.patch @@ -44,5 +44,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.asl20; platforms = platforms.all; maintainers = [ maintainers.andersk ]; + # Requires LFS64 APIs. 202401 and later are fine. + broken = stdenv.hostPlatform.isMusl; }; }) diff --git a/pkgs/development/libraries/abseil-cpp/202407.nix b/pkgs/development/libraries/abseil-cpp/202407.nix index 49e18c271e64..51056ff86d9d 100644 --- a/pkgs/development/libraries/abseil-cpp/202407.nix +++ b/pkgs/development/libraries/abseil-cpp/202407.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , gtest , static ? stdenv.hostPlatform.isStatic @@ -18,6 +19,23 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-51jpDhdZ0n+KLmxh8KVaTz53pZAB0dHjmILFX+OLud4="; }; + patches = [ + # Don't match -Wnon-virtual-dtor in the "flags are needed to suppress + # Needed to cleanly apply the #1738 fix below. + # https://github.com/abseil/abseil-cpp/issues/1737 + (fetchpatch { + url = "https://github.com/abseil/abseil-cpp/commit/9cb5e5d15c142e5cc43a2c1db87c8e4e5b6d38a5.patch"; + hash = "sha256-PTNmNJMk42Omwek0ackl4PjxifDP/+GaUitS60l+VB0="; + }) + + # Fix shell option group handling in pkgconfig files + # https://github.com/abseil/abseil-cpp/pull/1738 + (fetchpatch { + url = "https://github.com/abseil/abseil-cpp/commit/bd0c9c58cac4463d96b574de3097422bb78215a8.patch"; + hash = "sha256-fB9pvkyNBXoDKLrVaNwliqrWEPTa2Y6OJMe2xgl5IBc="; + }) + ]; + cmakeFlags = [ "-DABSL_BUILD_TEST_HELPERS=ON" "-DABSL_USE_EXTERNAL_GOOGLETEST=ON" diff --git a/pkgs/development/libraries/accounts-qml-module/default.nix b/pkgs/development/libraries/accounts-qml-module/default.nix index 858f9c0d57b8..2ac4663652f9 100644 --- a/pkgs/development/libraries/accounts-qml-module/default.nix +++ b/pkgs/development/libraries/accounts-qml-module/default.nix @@ -1,19 +1,22 @@ -{ stdenv -, lib -, fetchFromGitLab -, accounts-qt -, dbus-test-runner -, pkg-config -, qmake -, qtbase -, qtdeclarative -, signond -, xvfb-run +{ + stdenv, + lib, + fetchFromGitLab, + unstableGitUpdater, + accounts-qt, + dbus-test-runner, + pkg-config, + qmake, + qtbase, + qtdeclarative, + qttools, + signond, + xvfb-run, }: stdenv.mkDerivation (finalAttrs: { pname = "accounts-qml-module"; - version = "0.7-unstable-2022-10-28"; + version = "0.7-unstable-2023-10-28"; src = fetchFromGitLab { owner = "accounts-sso"; @@ -22,17 +25,28 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ZpnkZauowLPBnO3DDDtG/x07XoQGVNqEF8AQB5TZK84="; }; - postPatch = '' - substituteInPlace src/src.pro \ - --replace '$$[QT_INSTALL_BINS]/qmlplugindump' 'qmlplugindump' \ - --replace '$$[QT_INSTALL_QML]' '${placeholder "out"}/${qtbase.qtQmlPrefix}' + outputs = [ + "out" + "doc" + ]; - # Don't install test binary - sed -i tests/tst_plugin.pro \ - -e '/TARGET = tst_plugin/a INSTALLS -= target' - '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' - sed -i accounts-qml-module.pro -e '/tests/d' - ''; + postPatch = + '' + substituteInPlace src/src.pro \ + --replace '$$[QT_INSTALL_BINS]/qmlplugindump' 'qmlplugindump' \ + --replace '$$[QT_INSTALL_QML]' '${placeholder "out"}/${qtbase.qtQmlPrefix}' + + # Find qdoc + substituteInPlace doc/doc.pri \ + --replace-fail 'QDOC = $$[QT_INSTALL_BINS]/qdoc' 'QDOC = qdoc' + + # Don't install test binary + sed -i tests/tst_plugin.pro \ + -e '/TARGET = tst_plugin/a INSTALLS -= target' + '' + + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' + sed -i accounts-qml-module.pro -e '/tests/d' + ''; # QMake can't find Qt modules in buildInputs strictDeps = false; @@ -41,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config qmake qtdeclarative # qmlplugindump + qttools # qdoc ]; buildInputs = [ @@ -57,11 +72,6 @@ stdenv.mkDerivation (finalAttrs: { dontWrapQtApps = true; - qmakeFlags = [ - # Needs qdoc, https://github.com/NixOS/nixpkgs/pull/245379 - "CONFIG+=no_docs" - ]; - postConfigure = '' make qmake_all ''; @@ -78,11 +88,19 @@ stdenv.mkDerivation (finalAttrs: { export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} ''; - meta = with lib; { + postFixup = '' + moveToOutput share/accounts-qml-module/doc $doc + ''; + + passthru.updateScript = unstableGitUpdater { + tagPrefix = "VERSION_"; + }; + + meta = { description = "QML bindings for libaccounts-qt + libsignon-qt"; homepage = "https://gitlab.com/accounts-sso/accounts-qml-module"; - license = licenses.lgpl21Only; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.linux; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ OPNA2608 ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch b/pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch deleted file mode 100644 index 23e1de95fdff..000000000000 --- a/pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 6f172007452b39bfda5062fc29ea5382671ac16e Mon Sep 17 00:00:00 2001 -From: Alexander Ried <ried@mytum.de> -Date: Thu, 26 May 2016 19:54:21 +0200 -Subject: [PATCH] Disable methods that change files in /etc - -Only if environment variable NIXOS_USERS_PURE is set. ---- - src/daemon.c | 10 ++++++++++ - src/user.c | 35 +++++++++++++++++++++++++++++++++++ - 2 files changed, 45 insertions(+) - -diff --git a/src/daemon.c b/src/daemon.c -index 861430f..aefaf2d 100644 ---- a/src/daemon.c -+++ b/src/daemon.c -@@ -1378,6 +1378,11 @@ daemon_create_user (AccountsAccounts *accounts, - const gchar *real_name, - gint account_type) - { -+ if (getenv("NIXOS_USERS_PURE")) { -+ throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers"); -+ return; -+ } -+ - Daemon *daemon = (Daemon *) accounts; - CreateUserData *data; - -@@ -1581,6 +1586,11 @@ daemon_delete_user (AccountsAccounts *accounts, - gint64 uid, - gboolean remove_files) - { -+ if (getenv("NIXOS_USERS_PURE")) { -+ throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers"); -+ return; -+ } -+ - Daemon *daemon = (Daemon *) accounts; - DeleteUserData *data; - -diff --git a/src/user.c b/src/user.c -index 28170db..df947a1 100644 ---- a/src/user.c -+++ b/src/user.c -@@ -1216,6 +1216,11 @@ user_set_real_name (AccountsUser *auser, - GDBusMethodInvocation *context, - const gchar *real_name) - { -+ if (getenv("NIXOS_USERS_PURE")) { -+ throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers"); -+ return; -+ } -+ - User *user = (User *) auser; - int uid; - const gchar *action_id; -@@ -1293,6 +1298,11 @@ user_set_user_name (AccountsUser *auser, - GDBusMethodInvocation *context, - const gchar *user_name) - { -+ if (getenv("NIXOS_USERS_PURE")) { -+ throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers"); -+ return; -+ } -+ - User *user = (User *) auser; - - daemon_local_check_auth (user->daemon, -@@ -1945,6 +1955,11 @@ user_set_home_directory (AccountsUser *auser, - GDBusMethodInvocation *context, - const gchar *home_dir) - { -+ if (getenv("NIXOS_USERS_PURE")) { -+ throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers"); -+ return; -+ } -+ - User *user = (User *) auser; - - daemon_local_check_auth (user->daemon, -@@ -2000,6 +2015,11 @@ user_set_shell (AccountsUser *auser, - GDBusMethodInvocation *context, - const gchar *shell) - { -+ if (getenv("NIXOS_USERS_PURE")) { -+ throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers"); -+ return; -+ } -+ - User *user = (User *) auser; - - daemon_local_check_auth (user->daemon, -@@ -2249,6 +2269,11 @@ user_set_locked (AccountsUser *auser, - GDBusMethodInvocation *context, - gboolean locked) - { -+ if (getenv("NIXOS_USERS_PURE")) { -+ throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers"); -+ return; -+ } -+ - User *user = (User *) auser; - - daemon_local_check_auth (user->daemon, -@@ -2457,6 +2482,11 @@ user_set_password_mode (AccountsUser *auser, - GDBusMethodInvocation *context, - gint mode) - { -+ if (getenv("NIXOS_USERS_PURE")) { -+ throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers"); -+ return; -+ } -+ - User *user = (User *) auser; - const gchar *action_id; - gint uid; -@@ -2550,6 +2580,11 @@ user_set_password (AccountsUser *auser, - const gchar *password, - const gchar *hint) - { -+ if (getenv("NIXOS_USERS_PURE")) { -+ throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers"); -+ return; -+ } -+ - User *user = (User *) auser; - gchar **data; - const gchar *action_id; diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix deleted file mode 100644 index 1a5f03f635bc..000000000000 --- a/pkgs/development/libraries/accountsservice/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ lib -, stdenv -, fetchurl -, substituteAll -, pkg-config -, glib -, shadow -, gobject-introspection -, polkit -, systemd -, coreutils -, meson -, mesonEmulatorHook -, dbus -, ninja -, python3 -, vala -, gettext -, libxcrypt -}: - -stdenv.mkDerivation rec { - pname = "accountsservice"; - version = "23.13.9"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; - sha256 = "rdpM3q4k+gmS598///nv+nCQvjrCM6Pt/fadWpybkk8="; - }; - - patches = [ - # Hardcode dependency paths. - (substituteAll { - src = ./fix-paths.patch; - inherit shadow coreutils; - }) - - # Do not try to create directories in /var, that will not work in Nix sandbox. - ./no-create-dirs.patch - - # Disable mutating D-Bus methods with immutable /etc. - ./Disable-methods-that-change-files-in-etc.patch - - # Do not ignore third-party (e.g Pantheon) extensions not matching FHS path scheme. - # Fixes https://github.com/NixOS/nixpkgs/issues/72396 - ./drop-prefix-check-extensions.patch - - # Detect DM type from config file. - # `readlink display-manager.service` won't return any of the candidates. - ./get-dm-type-from-config.patch - ]; - - nativeBuildInputs = [ - gettext - gobject-introspection - meson - ninja - pkg-config - python3 - vala - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - # meson.build:88:2: ERROR: Can not run test applications in this cross environment. - mesonEmulatorHook - ]; - - buildInputs = [ - dbus - gettext - glib - polkit - systemd - libxcrypt - ]; - - mesonFlags = [ - "-Dadmin_group=wheel" - "-Dlocalstatedir=/var" - "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" - ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - meta = with lib; { - description = "D-Bus interface for user account query and manipulation"; - homepage = "https://www.freedesktop.org/wiki/Software/AccountsService"; - license = licenses.gpl3Plus; - maintainers = teams.freedesktop.members ++ (with maintainers; [ pSub ]); - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch b/pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch deleted file mode 100644 index d4b7eac1cb31..000000000000 --- a/pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/extensions.c b/src/extensions.c -index 354f476..8d020a6 100644 ---- a/src/extensions.c -+++ b/src/extensions.c -@@ -122,15 +122,7 @@ daemon_read_extension_directory (GHashTable *ifaces, - continue; - } - -- /* Ensure it looks like "../../dbus-1/interfaces/${name}" */ -- const gchar * const prefix = "../../dbus-1/interfaces/"; -- if (g_str_has_prefix (symlink, prefix) && g_str_equal (symlink + strlen (prefix), name)) { -- daemon_read_extension_file (ifaces, filename); -- } else { -- g_warning ("Found accounts service vendor extension symlink %s, but it must be exactly " -- "equal to '../../dbus-1/interfaces/%s' for forwards-compatibility reasons.", -- filename, name); -- } -+ daemon_read_extension_file (ifaces, filename); - } - - g_dir_close (dir); diff --git a/pkgs/development/libraries/accountsservice/fix-paths.patch b/pkgs/development/libraries/accountsservice/fix-paths.patch deleted file mode 100644 index d4b48e882e53..000000000000 --- a/pkgs/development/libraries/accountsservice/fix-paths.patch +++ /dev/null @@ -1,143 +0,0 @@ -diff --git a/src/daemon.c b/src/daemon.c -index aa9d050..861430f 100644 ---- a/src/daemon.c -+++ b/src/daemon.c -@@ -1319,7 +1319,7 @@ daemon_create_user_authorized_cb (Daemon *daemon, - - sys_log (context, "create user '%s'", cd->user_name); - -- argv[0] = "/usr/sbin/useradd"; -+ argv[0] = "@shadow@/bin/useradd"; - argv[1] = "-m"; - argv[2] = "-c"; - argv[3] = cd->real_name; -@@ -1552,7 +1552,7 @@ daemon_delete_user_authorized_cb (Daemon *daemon, - } - free (resolved_homedir); - -- argv[0] = "/usr/sbin/userdel"; -+ argv[0] = "@shadow@/bin/userdel"; - if (ud->remove_files) { - argv[1] = "-f"; - argv[2] = "-r"; -diff --git a/src/user.c b/src/user.c -index 917d427..28170db 100644 ---- a/src/user.c -+++ b/src/user.c -@@ -1193,7 +1193,7 @@ user_change_real_name_authorized_cb (Daemon *daemon, - new_gecos = g_strdup (name); - } - -- argv[0] = "/usr/sbin/usermod"; -+ argv[0] = "@shadow@/bin/usermod"; - argv[1] = "-c"; - argv[2] = new_gecos; - argv[3] = "--"; -@@ -1267,7 +1267,7 @@ user_change_user_name_authorized_cb (Daemon *daemon, - accounts_user_get_uid (ACCOUNTS_USER (user)), - name); - -- argv[0] = "/usr/sbin/usermod"; -+ argv[0] = "@shadow@/bin/usermod"; - argv[1] = "-l"; - argv[2] = name; - argv[3] = "--"; -@@ -1718,7 +1718,7 @@ user_set_password_expiration_policy_authorized_cb (Daemon *daemon - accounts_user_get_uid (ACCOUNTS_USER (user))); - - g_object_freeze_notify (G_OBJECT (user)); -- argv[0] = "/usr/bin/chage"; -+ argv[0] = "@shadow@/bin/chage"; - argv[1] = "-m"; - argv[2] = pwd_expiration->min_days_between_changes; - argv[3] = "-M"; -@@ -1806,7 +1806,7 @@ user_set_user_expiration_policy_authorized_cb (Daemon *daemon, - } else { - expiration_time = g_strdup ("-1"); - } -- argv[0] = "/usr/bin/chage"; -+ argv[0] = "@shadow@/bin/chage"; - argv[1] = "-E"; - argv[2] = expiration_time; - argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); -@@ -1919,7 +1919,7 @@ user_change_home_dir_authorized_cb (Daemon *daemon, - accounts_user_get_uid (ACCOUNTS_USER (user)), - home_dir); - -- argv[0] = "/usr/sbin/usermod"; -+ argv[0] = "@shadow@/bin/usermod"; - argv[1] = "-m"; - argv[2] = "-d"; - argv[3] = home_dir; -@@ -1977,7 +1977,7 @@ user_change_shell_authorized_cb (Daemon *daemon, - accounts_user_get_uid (ACCOUNTS_USER (user)), - shell); - -- argv[0] = "/usr/sbin/usermod"; -+ argv[0] = "@shadow@/bin/usermod"; - argv[1] = "-s"; - argv[2] = shell; - argv[3] = "--"; -@@ -2120,7 +2120,7 @@ user_change_icon_file_authorized_cb (Daemon *daemon, - return; - } - -- argv[0] = "/bin/cat"; -+ argv[0] = "@coreutils@/bin/cat"; - argv[1] = filename; - argv[2] = NULL; - -@@ -2201,7 +2201,7 @@ user_change_locked_authorized_cb (Daemon *daemon, - locked ? "locking" : "unlocking", - accounts_user_get_user_name (ACCOUNTS_USER (user)), - accounts_user_get_uid (ACCOUNTS_USER (user))); -- argv[0] = "/usr/sbin/usermod"; -+ argv[0] = "@shadow@/bin/usermod"; - argv[1] = locked ? "-L" : "-U"; - argv[2] = "--"; - argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); -@@ -2328,7 +2328,7 @@ user_change_account_type_authorized_cb (Daemon *daemon, - - g_free (groups); - -- argv[0] = "/usr/sbin/usermod"; -+ argv[0] = "@shadow@/bin/usermod"; - argv[1] = "-G"; - argv[2] = str->str; - argv[3] = "--"; -@@ -2396,7 +2396,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, - - if (mode == PASSWORD_MODE_SET_AT_LOGIN || - mode == PASSWORD_MODE_NONE) { -- argv[0] = "/usr/bin/passwd"; -+ argv[0] = "/run/wrappers/bin/passwd"; - argv[1] = "-d"; - argv[2] = "--"; - argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); -@@ -2408,7 +2408,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, - } - - if (mode == PASSWORD_MODE_SET_AT_LOGIN) { -- argv[0] = "/usr/bin/chage"; -+ argv[0] = "@shadow@/bin/chage"; - argv[1] = "-d"; - argv[2] = "0"; - argv[3] = "--"; -@@ -2428,7 +2428,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, - */ - accounts_user_set_locked (ACCOUNTS_USER (user), FALSE); - } else if (accounts_user_get_locked (ACCOUNTS_USER (user))) { -- argv[0] = "/usr/sbin/usermod"; -+ argv[0] = "@shadow@/bin/usermod"; - argv[1] = "-U"; - argv[2] = "--"; - argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); -@@ -2505,7 +2505,7 @@ user_change_password_authorized_cb (Daemon *daemon, - - g_autoptr (GError) error = NULL; - g_autoptr (GSubprocess) process = NULL; -- const char *argv[] = { "/usr/sbin/chpasswd", "-e", NULL }; -+ const char *argv[] = { "@shadow@/bin/chpasswd", "-e", NULL }; - - sys_log (context, - "set password and hint of user '%s' (%" G_GUINT64_FORMAT ")", diff --git a/pkgs/development/libraries/accountsservice/get-dm-type-from-config.patch b/pkgs/development/libraries/accountsservice/get-dm-type-from-config.patch deleted file mode 100644 index 3d4398ab303a..000000000000 --- a/pkgs/development/libraries/accountsservice/get-dm-type-from-config.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/daemon.c b/src/daemon.c -index aefaf2d..7c004d0 100644 ---- a/src/daemon.c -+++ b/src/daemon.c -@@ -193,9 +193,9 @@ get_current_system_dm_type (void) - basename = g_file_get_basename (file); - g_object_unref (file); - -- if (g_strcmp0 (basename, "lightdm.service") == 0) -+ if (g_file_test (PATH_LIGHTDM_CONF, G_FILE_TEST_EXISTS)) - return DISPLAY_MANAGER_TYPE_LIGHTDM; -- else if (g_strcmp0 (basename, "gdm.service") == 0) -+ else if (g_file_test (PATH_GDM_CUSTOM, G_FILE_TEST_EXISTS)) - return DISPLAY_MANAGER_TYPE_GDM; - } diff --git a/pkgs/development/libraries/accountsservice/no-create-dirs.patch b/pkgs/development/libraries/accountsservice/no-create-dirs.patch deleted file mode 100644 index 9fbba4599c9f..000000000000 --- a/pkgs/development/libraries/accountsservice/no-create-dirs.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/meson_post_install.py b/meson_post_install.py -index d8c3dd1..620f714 100644 ---- a/meson_post_install.py -+++ b/meson_post_install.py -@@ -9,9 +9,9 @@ - # FIXME: meson will not track the creation of these directories - # https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39 - dst_dirs = [ -- (os.path.join(localstatedir, 'lib'), 0o755), -- (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775), -- (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700), -+ # (os.path.join(localstatedir, 'lib'), 0o755), -+ # (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775), -+ # (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700), - ] - - for (dst_dir, dst_dir_mode) in dst_dirs: diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix deleted file mode 100644 index 01041c858623..000000000000 --- a/pkgs/development/libraries/ace/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libtool, perl }: - -stdenv.mkDerivation rec { - pname = "ace"; - version = "7.0.11"; - - src = fetchurl { - url = "https://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "sha256-r+LRiu/u1qMcbrjkSr8ErnemX6zvhgvc5cLWu8AQhww="; - }; - - enableParallelBuilding = true; - - nativeBuildInputs = [ pkg-config libtool ]; - buildInputs = [ perl ]; - - env.NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=format-security" - ]; - - postPatch = '' - patchShebangs ./MPC/prj_install.pl - ''; - - preConfigure = '' - export INSTALL_PREFIX=$out - export ACE_ROOT=$(pwd) - export LD_LIBRARY_PATH="$ACE_ROOT/ace:$ACE_ROOT/lib" - echo '#include "ace/config-linux.h"' > ace/config.h - echo 'include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU'\ - > include/makeinclude/platform_macros.GNU - ''; - - meta = with lib; { - homepage = "https://www.dre.vanderbilt.edu/~schmidt/ACE.html"; - description = "ADAPTIVE Communication Environment"; - mainProgram = "ace_gperf"; - license = licenses.doc; - maintainers = with maintainers; [ nico202 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix deleted file mode 100644 index 60de8957d088..000000000000 --- a/pkgs/development/libraries/adns/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, lib, fetchurl, gnum4, gitUpdater }: - -stdenv.mkDerivation rec { - pname = "adns"; - 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" - ]; - hash = "sha256-cTizeJt1Br1oP0UdT32FMHepGAO3s12G7GZ/D5zUAc0="; - }; - - nativeBuildInputs = [ gnum4 ]; - - configureFlags = lib.optional stdenv.hostPlatform.isStatic "--disable-dynamic"; - - preConfigure = - lib.optionalString stdenv.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure"; - - # Autogenerated headers miss interdependencies in Makefile, fail parallel build: - # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51329 - enableParallelBuilding = false; - - # https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01347.html for details. - doCheck = false; - - postInstall = let suffix = lib.versions.majorMinor version; - in lib.optionalString stdenv.isDarwin '' - install_name_tool -id $out/lib/libadns.so.${suffix} $out/lib/libadns.so.${suffix} - ''; - - # darwin executables fail, but I don't want to fail the 100-500 packages depending on this lib - doInstallCheck = !stdenv.isDarwin; - installCheckPhase = '' - set -eo pipefail - - for prog in $out/bin/*; do - $prog --help > /dev/null && echo $(basename $prog) shows usage - 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"; - license = licenses.lgpl2; - - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/adslib/default.nix b/pkgs/development/libraries/adslib/default.nix deleted file mode 100644 index 49b54960b7e6..000000000000 --- a/pkgs/development/libraries/adslib/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "adslib"; - version = "unstable-2020-08-28"; - - src = fetchFromGitHub { - owner = "stlehmann"; - repo = "ADS"; - rev = "c457b60d61d73325837ca50be2cc997c4792d481"; - sha256 = "11r86xa8fr4z957hd0abn8x7182nz30a198d02y7gzpbhpi3z43k"; - }; - - installPhase = '' - mkdir -p $out/lib - cp adslib.so $out/lib/adslib.so - ''; - - meta = with lib; { - description = "Beckhoff protocol to communicate with TwinCAT devices"; - homepage = "https://github.com/stlehmann/ADS"; - license = licenses.mit; - maintainers = with maintainers; [ jamiemagee ]; - }; -} diff --git a/pkgs/development/libraries/aemu/LFS64.patch b/pkgs/development/libraries/aemu/LFS64.patch deleted file mode 100644 index e1d06d8073ef..000000000000 --- a/pkgs/development/libraries/aemu/LFS64.patch +++ /dev/null @@ -1,98 +0,0 @@ -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 deleted file mode 100644 index 0a2f6fa8b8b2..000000000000 --- a/pkgs/development/libraries/aemu/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitiles, cmake, darwin }: - -stdenv.mkDerivation { - pname = "aemu"; - version = "0.1.2"; - - src = fetchFromGitiles { - url = "https://android.googlesource.com/platform/hardware/google/aemu"; - rev = "07ccc3ded3357e67e39104f18f35feaf8b3b6a0e"; - 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 - ]; - - cmakeFlags = [ - "-DAEMU_COMMON_GEN_PKGCONFIG=ON" - "-DAEMU_COMMON_BUILD_CONFIG=gfxstream" - # "-DENABLE_VKCEREAL_TESTS=OFF" - ]; - - meta = with lib; { - homepage = "https://android.googlesource.com/platform/hardware/google/aemu"; - description = "Android emulation utilities library"; - maintainers = with maintainers; [ qyliss ]; - # The BSD license comes from host-common/VpxFrameParser.cpp, which - # incorporates some code from libvpx, which uses the 3-clause BSD license. - license = with licenses; [ asl20 mit bsd3 ]; - # See base/include/aemu/base/synchronization/Lock.h - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - }; -} diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix deleted file mode 100644 index e82c3c8dfe77..000000000000 --- a/pkgs/development/libraries/afflib/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, zlib, curl, expat, fuse, openssl -, autoreconfHook, python3, libiconv -}: - -stdenv.mkDerivation rec { - version = "3.7.20"; - pname = "afflib"; - - src = fetchFromGitHub { - owner = "sshock"; - repo = "AFFLIBv3"; - rev = "v${version}"; - sha256 = "sha256-xkqBfTftzn+rgeuoaKfHP7vQmy4VZuaCq8VFlfZTUE4="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ zlib curl expat openssl python3 ] - ++ lib.optionals (with stdenv; isLinux || isDarwin) [ fuse ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; - - meta = { - homepage = "http://afflib.sourceforge.net/"; - description = "Advanced forensic format library"; - platforms = lib.platforms.unix; - license = lib.licenses.bsdOriginal; - maintainers = [ lib.maintainers.raskin ]; - downloadPage = "https://github.com/sshock/AFFLIBv3/tags"; - }; -} diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix deleted file mode 100644 index 8dd01cc4eabe..000000000000 --- a/pkgs/development/libraries/aften/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, cmake }: - -stdenv.mkDerivation rec { - pname = "aften"; - version = "0.0.8"; - src = fetchurl { - url = "mirror://sourceforge/aften/${pname}-${version}.tar.bz2"; - sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47"; - }; - - patches = [ - # Add fallback for missing SIMD functions on ARM - # Source https://github.com/Homebrew/homebrew-core/blob/cad412c7fb4b64925f821fcc9ac5f16a2c40f32d/Formula/aften.rb - ./simd-fallback.patch - ]; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DSHARED=ON" ]; - - meta = with lib; { - description = "Audio encoder which generates compressed audio streams based on ATSC A/52 specification"; - homepage = "https://aften.sourceforge.net/"; - license = licenses.lgpl21Only; - platforms = platforms.unix; - maintainers = with maintainers; [ emilytrau ]; - }; -} diff --git a/pkgs/development/libraries/aften/simd-fallback.patch b/pkgs/development/libraries/aften/simd-fallback.patch deleted file mode 100644 index cdc961a7f5df..000000000000 --- a/pkgs/development/libraries/aften/simd-fallback.patch +++ /dev/null @@ -1,25 +0,0 @@ -From dca9c03930d669233258c114e914a01f7c0aeb05 Mon Sep 17 00:00:00 2001 -From: jbr79 <jbr79@ef0d8562-5c19-0410-972e-841db63a069c> -Date: Wed, 24 Sep 2008 22:02:59 +0000 -Subject: [PATCH] add fallback function for apply_simd_restrictions() on - non-x86/ppc - -git-svn-id: https://aften.svn.sourceforge.net/svnroot/aften@766 ef0d8562-5c19-0410-972e-841db63a069c ---- - libaften/cpu_caps.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libaften/cpu_caps.h b/libaften/cpu_caps.h -index b7c6159..4db11f7 100644 ---- a/libaften/cpu_caps.h -+++ b/libaften/cpu_caps.h -@@ -26,6 +26,7 @@ - #include "ppc_cpu_caps.h" - #else - static inline void cpu_caps_detect(void){} -+static inline void apply_simd_restrictions(AftenSimdInstructions *simd_instructions){} - #endif - - #endif /* CPU_CAPS_H */ --- -2.24.3 (Apple Git-128) \ No newline at end of file diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index 2b0a2c63aca5..02f0eb327077 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.1.1-rc2"; + version = "2.1.1"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - hash = "sha256-F/LwPRzorkIoGsObB9m/hNpRBIJFy/GuaEotq0CQMH4="; + hash = "sha256-4HfwNAkIhk1yC/oSxZ30xilzUM5/22nzbUSqTjcW5Ng="; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index bfa7449b04c6..ac3f9ca951fd 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype SDL - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ]; @@ -33,13 +33,16 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - (lib.strings.enableFeature stdenv.isLinux "platform") + (lib.enableFeature stdenv.hostPlatform.isLinux "platform") + (lib.enableFeature (!stdenv.hostPlatform.isDarwin) "sdltest") "--enable-examples=no" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--x-includes=${lib.getDev libX11}/include" "--x-libraries=${lib.getLib libX11}/lib" ]; + NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + # libtool --tag=CXX --mode=link g++ -g -O2 libexamples.la ../src/platform/X11/libaggplatformX11.la ../src/libagg.la -o alpha_mask2 alpha_mask2.o # libtool: error: cannot find the library 'libexamples.la' enableParallelBuilding = false; diff --git a/pkgs/development/libraries/aixlog/default.nix b/pkgs/development/libraries/aixlog/default.nix deleted file mode 100644 index 282b62702c75..000000000000 --- a/pkgs/development/libraries/aixlog/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -}: - -stdenvNoCC.mkDerivation rec { - pname = "aixlog"; - version = "1.5.0"; - - src = fetchFromGitHub { - owner = "badaix"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Xhle7SODRZlHT3798mYIzBi1Mqjz8ai74/UnbVWetiY="; - }; - - dontConfigure = true; - dontBuild = true; - dontFixup = true; - - installPhase = '' - runHook preInstall - - install -Dm644 $src/include/aixlog.hpp $out/include/aixlog.hpp - - runHook postInstall - ''; - - meta = with lib; { - description = "Header-only C++ logging library"; - homepage = "https://github.com/badaix/aixlog"; - changelog = "https://github.com/badaix/aixlog/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ azahi ]; - }; -} diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 800cee267f4a..efe5a38c6263 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alembic"; - version = "1.8.6"; + version = "1.8.7"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = version; - sha256 = "sha256-MND1GtnIGUtRrtyUX1eR9UoGGtuTPtVEIIET3QQ6blA="; + sha256 = "sha256-PuVN5Ytls58G2BmwCHUHiMQ0rolH98Hlw/pp7cvpiAg="; }; # note: out is unused (but required for outputDoc anyway) diff --git a/pkgs/development/libraries/alglib/default.nix b/pkgs/development/libraries/alglib/default.nix deleted file mode 100644 index 1bd2ad6fe3e1..000000000000 --- a/pkgs/development/libraries/alglib/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, clang }: - -stdenv.mkDerivation rec { - pname = "alglib3"; - version = "4.02.0"; - - src = fetchurl { - url = "https://www.alglib.net/translator/re/alglib-${version}.cpp.gpl.tgz"; - sha256 = "sha256-U7/ukBXdwC8GkpevFfSfbgbiyOf7CkDv0PUAL8BnAag="; - }; - - nativeBuildInputs = [ - cmake - clang - ]; - - patches = [ - ./patch-alglib-CMakeLists.patch - ]; - - meta = with lib; { - description = "Numerical analysis and data processing library"; - homepage = "https://www.alglib.net/"; - license = lib.licenses.gpl2Plus; - maintainers = [ maintainers.paperdigits ]; - longDescription = '' - ALGLIB is a cross-platform numerical analysis and data processing library. It supports several programming languages (C++, C#, Delphi) and several operating systems (Windows and POSIX, including Linux). ALGLIB features include: - - * Data analysis (classification/regression, statistics) - * Optimization and nonlinear solvers - * Interpolation and linear/nonlinear least-squares fitting - * Linear algebra (direct algorithms, EVD/SVD), direct and iterative linear solvers - * Fast Fourier Transform and many other algorithms - ''; - }; -} diff --git a/pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch b/pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch deleted file mode 100644 index b91a0c0aefd6..000000000000 --- a/pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- /dev/null -+++ b/CMakeLists.txt -@@ -0,0 +1,20 @@ -+cmake_minimum_required(VERSION 2.8) -+ -+project(alglib3 CXX) -+ -+file(GLOB_RECURSE sources src/*.cpp) -+file(GLOB_RECURSE headers src/*.h) -+ -+add_library(${PROJECT_NAME} STATIC ${sources} ${headers}) -+ -+install( -+ TARGETS ${PROJECT_NAME} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+) -+ -+install( -+ FILES ${headers} -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/alglib -+) diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 94dd96dae0e7..ee337673ee07 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { physfs texinfo zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libpthreadstubs libpulseaudio diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix deleted file mode 100644 index a367b765874b..000000000000 --- a/pkgs/development/libraries/alure/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, openal }: - -stdenv.mkDerivation rec { - pname = "alure"; - version = "1.2"; - - src = fetchurl { - url = "http://kcat.strangesoft.net/alure-releases/alure-${version}.tar.bz2"; - sha256 = "0w8gsyqki21s1qb2s5ac1kj08i6nc937c0rr08xbw9w9wvd6lpj6"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ openal ]; - - meta = with lib; { - description = "Utility library to help manage common tasks with OpenAL applications"; - homepage = "https://github.com/kcat/alure"; - license = licenses.mit; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/alure2/default.nix b/pkgs/development/libraries/alure2/default.nix deleted file mode 100644 index f18a2a3434e1..000000000000 --- a/pkgs/development/libraries/alure2/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openal, libvorbis, opusfile, libsndfile }: - -stdenv.mkDerivation rec { - pname = "alure2"; - version = "unstable-2020-02-06"; - - src = fetchFromGitHub { - owner = "kcat"; - repo = "alure"; - rev = "50f92fe528e77da82197fd947d1cf9b0a82a0c7d"; - sha256 = "1gmc1yfhwaj6lik0vn7zv8y23i05f4rw25v2jg34n856jcs02svx"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ openal libvorbis opusfile libsndfile ]; - - meta = with lib; { - description = "Utility library for OpenAL, providing a C++ API and managing common tasks that include file loading, caching, and streaming"; - homepage = "https://github.com/kcat/alure"; - license = licenses.zlib; - platforms = platforms.linux; - maintainers = with maintainers; [ McSinyx ]; - }; -} diff --git a/pkgs/development/libraries/amf-headers/default.nix b/pkgs/development/libraries/amf-headers/default.nix deleted file mode 100644 index 04f2e6c1385b..000000000000 --- a/pkgs/development/libraries/amf-headers/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "amf-headers"; - version = "1.4.34"; - - src = fetchFromGitHub { - owner = "GPUOpen-LibrariesAndSDKs"; - repo = "AMF"; - rev = "v${version}"; - sha256 = "sha256-AASoThCzyFharXrprUalOMufz/DDtzlc97q/dQk7B6Y="; - }; - - installPhase = '' - mkdir -p $out/include/AMF - cp -r amf/public/include/* $out/include/AMF - ''; - - meta = with lib; { - description = "Headers for The Advanced Media Framework (AMF)"; - homepage = "https://github.com/GPUOpen-LibrariesAndSDKs/AMF"; - license = licenses.mit; - maintainers = with maintainers; [ devusb ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/aml/default.nix b/pkgs/development/libraries/aml/default.nix deleted file mode 100644 index 1a6900d298c6..000000000000 --- a/pkgs/development/libraries/aml/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja }: - -stdenv.mkDerivation rec { - pname = "aml"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "any1"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-BX+MRqvnwwLPhz22m0gfJ2EkW31KQEi/YTgOCMcQk2Q="; - }; - - nativeBuildInputs = [ meson pkg-config ninja ]; - - meta = with lib; { - description = "Another main loop"; - inherit (src.meta) homepage; - license = licenses.isc; - platforms = platforms.unix; - maintainers = with maintainers; [ primeos ]; - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix deleted file mode 100644 index 4e325932b5e8..000000000000 --- a/pkgs/development/libraries/amrnb/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{lib, stdenv, fetchurl, unzip}: - -stdenv.mkDerivation { - pname = "amrnb"; - version = "11.0.0.0"; - srcAmr = fetchurl { - url = "https://www.3gpp.org/ftp/Specs/latest/Rel-11/26_series/26104-b00.zip"; - sha256 = "1wf8ih0hk7w20vdlnw7jb7w73v15hbxgbvmq4wq7h2ghn0j8ppr3"; - }; - - src = fetchurl { - url = "http://www.penguin.cz/~utx/ftp/amr/amrnb-11.0.0.0.tar.bz2"; - sha256 = "1qgiw02n2a6r32pimnd97v2jkvnw449xrqmaxiivjy2jcr5h141q"; - }; - - nativeBuildInputs = [ unzip ]; - - configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ]; - - postConfigure = '' - cp $srcAmr 26104-b00.zip - ''; - - meta = { - homepage = "http://www.penguin.cz/~utx/amr"; - description = "AMR Narrow-Band Codec"; - # The wrapper code is free, but not the libraries from 3gpp. - # It's a source code reference implementation with patents and licenses on - # some countries, not redistributable. - license = lib.licenses.unfree; - }; -} diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix deleted file mode 100644 index 81938bb4cba7..000000000000 --- a/pkgs/development/libraries/amrwb/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - pname = "amrwb"; - version = "11.0.0.0"; - - srcAmr = fetchurl { - url = "http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-b00.zip"; - sha256 = "1v4zhs6f1mf1xkrzhljh05890in0rpr5d5pcak9h4igxhd2c91f8"; - }; - - src = fetchurl { - url = "http://www.penguin.cz/~utx/ftp/amr/amrwb-${version}.tar.bz2"; - sha256 = "1p6m9nd08mv525w14py9qzs9zwsa5i3vxf5bgcmcvc408jqmkbsw"; - }; - - nativeBuildInputs = [ unzip ]; - - configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ]; - - postConfigure = '' - cp $srcAmr 26204-b00.zip - ''; - - meta = { - homepage = "http://www.penguin.cz/~utx/amr"; - description = "AMR Wide-Band Codec"; - # The wrapper code is free, but not the libraries from 3gpp. - # It's a source code reference implementation with patents and licenses on - # some countries, not redistributable. - license = lib.licenses.unfree; - }; -} diff --git a/pkgs/development/libraries/antic/default.nix b/pkgs/development/libraries/antic/default.nix deleted file mode 100644 index 3534b40122f1..000000000000 --- a/pkgs/development/libraries/antic/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, mpir -, gmp -, mpfr -, flint -}: - -stdenv.mkDerivation rec { - pname = "antic"; - version = "0.2.5"; - - src = fetchFromGitHub { - owner = "flintlib"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-bQ2VvCS+lGro5qxs+qBz3RpUenxQTmTr+lm9BFZWYts="; - }; - - buildInputs = [ mpir gmp mpfr flint ]; - - configureFlags = [ - "--with-gmp=${gmp}" - "--with-mpir=${mpir}" - "--with-mpfr=${mpfr}" - "--with-flint=${flint}" - ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = with lib; { - description = "Algebraic number theory library"; - homepage = "https://github.com/flintlib/antic"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ smasher164 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix deleted file mode 100644 index 5543c12ac9ed..000000000000 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "apache-activemq"; - version = "6.1.2"; - - src = fetchurl { - sha256 = "sha256-EJZWrGvXICxp+eDzrX5BPnl/ZuUMO7utKgaS2c4IBQ0="; - url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; - }; - - installPhase = '' - mkdir -p $out - mv * $out/ - for j in `find $out/lib -name "*.jar"`; do - cp="''${cp:+"$cp:"}$j"; - done - echo "CLASSPATH=$cp" > $out/lib/classpath.env - ''; - - meta = { - homepage = "https://activemq.apache.org/"; - description = "Messaging and Integration Patterns server written in Java"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - }; - -} diff --git a/pkgs/development/libraries/appindicator-sharp/default.nix b/pkgs/development/libraries/appindicator-sharp/default.nix deleted file mode 100644 index 3062074f4cd7..000000000000 --- a/pkgs/development/libraries/appindicator-sharp/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - autoreconfHook, - fetchFromGitHub, - lib, - libappindicator, - mono, - gtk-sharp-3_0, - pkg-config, - stdenv, -}: - -stdenv.mkDerivation rec { - pname = "appindicator-sharp"; - version = "5a79cde93da6d68a4b1373f1ce5796c3c5fe1b37"; - - src = fetchFromGitHub { - owner = "stsundermann"; - repo = "appindicator-sharp"; - rev = version; - sha256 = "sha256:1i0vqbp05l29f5v9ygp7flm4s05pcnn5ivl578mxmhb51s7ncw6l"; - }; - - nativeBuildInputs = [ - autoreconfHook - mono - pkg-config - ]; - - buildInputs = [ - gtk-sharp-3_0 - libappindicator - ]; - - ac_cv_path_MDOC = "no"; - installFlags = ["GAPIXMLDIR=/tmp/gapixml"]; - - meta = { - description = "Bindings for appindicator using gobject-introspection"; - homepage = "https://github.com/stsundermann/appindicator-sharp"; - license = lib.licenses.lgpl3Only; - maintainers = with lib.maintainers; [ kevincox ]; - }; -} diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix deleted file mode 100644 index 7b3e4516bf6b..000000000000 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, substituteAll -, docbook_xml_dtd_42 -, docbook_xsl -, fontconfig -, freetype -, gdk-pixbuf -, gettext -, glib -, gobject-introspection -, gperf -, gtk-doc -, gtk3 -, json-glib -, libarchive -, curl -, libuuid -, libxslt -, meson -, ninja -, pkg-config -, pngquant -}: -stdenv.mkDerivation rec { - pname = "appstream-glib"; - version = "0.8.2"; - - outputs = [ "out" "dev" "man" "installedTests" ]; - outputBin = "dev"; - - src = fetchFromGitHub { - owner = "hughsie"; - repo = "appstream-glib"; - rev = "${lib.replaceStrings ["-"] ["_"] pname}_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-3QFiOJ38talA0GGL++n+DaA/AN7l4LOZQ7BJV6o8ius="; - }; - - nativeBuildInputs = [ - docbook_xml_dtd_42 - docbook_xsl - gettext - gobject-introspection - gperf - gtk-doc - libxslt - meson - ninja - pkg-config - ]; - - buildInputs = [ - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - json-glib - libarchive - curl - libuuid - ]; - - propagatedBuildInputs = [ - glib - gdk-pixbuf - ]; - - patches = [ - (substituteAll { - src = ./paths.patch; - pngquant = "${pngquant}/bin/pngquant"; - }) - ]; - - mesonFlags = [ - "-Drpm=false" - "-Dstemmer=false" - "-Ddep11=false" - ]; - - doCheck = false; # fails at least 1 test - - postInstall = '' - moveToOutput "share/installed-tests" "$installedTests" - ''; - - meta = with lib; { - description = "Objects and helper methods to read and write AppStream metadata"; - homepage = "https://people.freedesktop.org/~hughsient/appstream-glib/"; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ matthewbauer ]; - }; -} diff --git a/pkgs/development/libraries/appstream-glib/paths.patch b/pkgs/development/libraries/appstream-glib/paths.patch deleted file mode 100644 index 5c6396988a17..000000000000 --- a/pkgs/development/libraries/appstream-glib/paths.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libappstream-builder/asb-utils.c -+++ b/libappstream-builder/asb-utils.c -@@ -294,7 +294,7 @@ - { - g_autofree gchar *standard_error = NULL; - gint exit_status = 0; -- const gchar *argv[] = { "/usr/bin/pngquant", "--skip-if-larger", -+ const gchar *argv[] = { "@pngquant@", "--skip-if-larger", - "--strip", "--ext", ".png", - "--force", "--speed", "1", filename, NULL }; - if (!g_file_test (argv[0], G_FILE_TEST_IS_EXECUTABLE)) diff --git a/pkgs/development/libraries/apr-util/clang-bdb.patch b/pkgs/development/libraries/apr-util/clang-bdb.patch deleted file mode 100644 index 02e9c8378c63..000000000000 --- a/pkgs/development/libraries/apr-util/clang-bdb.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur a/build/dbm.m4 b/build/dbm.m4 ---- a/build/dbm.m4 2013-11-23 13:00:53.000000000 -0500 -+++ b/build/dbm.m4 2023-10-22 20:16:37.764571446 -0400 -@@ -235,7 +235,7 @@ - #include <stdlib.h> - #include <stdio.h> - #include <$apu_try_berkeley_db_header> --main () -+int main () - { - int major, minor, patch; - diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix deleted file mode 100644 index 9490ff1fb6a3..000000000000 --- a/pkgs/development/libraries/apr-util/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, apr, expat, gnused -, sslSupport ? true, openssl -, bdbSupport ? true, db -, ldapSupport ? !stdenv.isCygwin, openldap -, libiconv, libxcrypt -, cyrus_sasl, autoreconfHook -}: - -assert sslSupport -> openssl != null; -assert bdbSupport -> db != null; -assert ldapSupport -> openldap != null; - -stdenv.mkDerivation rec { - pname = "apr-util"; - version = "1.6.3"; - - src = fetchurl { - url = "mirror://apache/apr/${pname}-${version}.tar.bz2"; - sha256 = "sha256-pBB243EHRjJsOUUEKZStmk/KwM4Cd92P6gdv7DyXcrU="; - }; - - patches = [ - ./fix-libxcrypt-build.patch - # Fix incorrect Berkeley DB detection with newer versions of clang due to implicit `int` on main errors. - ./clang-bdb.patch - ] ++ lib.optional stdenv.isFreeBSD ./include-static-dependencies.patch; - - NIX_CFLAGS_LINK = [ "-lcrypt" ]; - - outputs = [ "out" "dev" ]; - outputBin = "dev"; - - nativeBuildInputs = [ makeWrapper autoreconfHook ]; - - configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ] - ++ lib.optional (!stdenv.isCygwin) "--with-crypto" - ++ lib.optional sslSupport "--with-openssl=${openssl.dev}" - ++ lib.optional bdbSupport "--with-berkeley-db=${db.dev}" - ++ lib.optional ldapSupport "--with-ldap=ldap" - ++ lib.optionals stdenv.isCygwin - [ "--without-pgsql" "--without-sqlite2" "--without-sqlite3" - "--without-freetds" "--without-berkeley-db" "--without-crypto" ] - ; - - postConfigure = '' - echo '#define APR_HAVE_CRYPT_H 1' >> confdefs.h - '' + - # For some reason, db version 6.9 is selected when cross-compiling. - # It's unclear as to why, it requires someone with more autotools / configure knowledge to go deeper into that. - # Always replacing the link flag with a generic link flag seems to help though, so let's do that for now. - lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - substituteInPlace Makefile \ - --replace "-ldb-6.9" "-ldb" - substituteInPlace apu-1-config \ - --replace "-ldb-6.9" "-ldb" - ''; - - propagatedBuildInputs = [ apr expat libiconv libxcrypt ] - ++ lib.optional sslSupport openssl - ++ lib.optional bdbSupport db - ++ lib.optional ldapSupport openldap - ++ lib.optional stdenv.isFreeBSD cyrus_sasl; - - postInstall = '' - for f in $out/lib/*.la $out/lib/apr-util-1/*.la $dev/bin/apu-1-config; do - substituteInPlace $f \ - --replace "${expat.dev}/lib" "${expat.out}/lib" \ - --replace "${db.dev}/lib" "${db.out}/lib" \ - --replace "${openssl.dev}/lib" "${lib.getLib openssl}/lib" - done - - # Give apr1 access to sed for runtime invocations. - wrapProgram $dev/bin/apu-1-config --prefix PATH : "${gnused}/bin" - ''; - - enableParallelBuilding = true; - - passthru = { - inherit sslSupport bdbSupport ldapSupport; - }; - - meta = with lib; { - homepage = "https://apr.apache.org/"; - description = "Companion library to APR, the Apache Portable Runtime"; - mainProgram = "apu-1-config"; - maintainers = [ ]; - platforms = platforms.unix; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/libraries/apr-util/fix-libxcrypt-build.patch b/pkgs/development/libraries/apr-util/fix-libxcrypt-build.patch deleted file mode 100644 index 2994e5de0f78..000000000000 --- a/pkgs/development/libraries/apr-util/fix-libxcrypt-build.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/crypto/apr_passwd.c b/crypto/apr_passwd.c -index c961de2..a397f27 100644 ---- a/crypto/apr_passwd.c -+++ b/crypto/apr_passwd.c -@@ -24,9 +24,7 @@ - #if APR_HAVE_STRING_H - #include <string.h> - #endif --#if APR_HAVE_CRYPT_H - #include <crypt.h> --#endif - #if APR_HAVE_UNISTD_H - #include <unistd.h> - #endif diff --git a/pkgs/development/libraries/apr-util/include-static-dependencies.patch b/pkgs/development/libraries/apr-util/include-static-dependencies.patch deleted file mode 100644 index 1813c7217810..000000000000 --- a/pkgs/development/libraries/apr-util/include-static-dependencies.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/build/apu-conf.m4 b/build/apu-conf.m4 -index 8943f10..aa44305 100644 ---- a/build/apu-conf.m4 -+++ b/build/apu-conf.m4 -@@ -279,6 +279,7 @@ AC_ARG_WITH(ldap,[ --with-ldap=library ldap library to use], - APU_FIND_LDAPLIB("ldap", "-llber -lresolv -lsocket -lnsl") - APU_FIND_LDAPLIB("ldap", "-ldl -lpthread") - else -+ APU_FIND_LDAPLIB($LIBLDAP, "-llber -lcrypto -lssl -lsasl2") - APU_FIND_LDAPLIB($LIBLDAP) - APU_FIND_LDAPLIB($LIBLDAP, "-lresolv") - APU_FIND_LDAPLIB($LIBLDAP, "-lresolv -lsocket -lnsl") diff --git a/pkgs/development/libraries/aptdec/default.nix b/pkgs/development/libraries/aptdec/default.nix deleted file mode 100644 index 2c3c9b3bdfd7..000000000000 --- a/pkgs/development/libraries/aptdec/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, libpng -, libsndfile -}: - -stdenv.mkDerivation rec { - pname = "aptdec"; - version = "1.8.0"; - - src = fetchFromGitHub { - owner = "Xerbo"; - repo = "aptdec"; - rev = "v${version}"; - hash = "sha256-5Pr2PlCPSEIWnThJXKcQEudmxhLJC2sVa9BfAOEKHB4="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libpng libsndfile ]; - - meta = with lib; { - description = "NOAA APT satellite imagery decoding library"; - mainProgram = "aptdec"; - homepage = "https://github.com/Xerbo/aptdec"; - license = licenses.gpl2; - maintainers = with maintainers; [ alexwinter ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/aqbanking/sources.nix b/pkgs/development/libraries/aqbanking/sources.nix index 61632662122d..aff1447c9fdd 100644 --- a/pkgs/development/libraries/aqbanking/sources.nix +++ b/pkgs/development/libraries/aqbanking/sources.nix @@ -1,9 +1,9 @@ { # https://www.aquamaniac.de/rdm/projects/gwenhywfar/files gwenhywfar = { - version = "5.10.1"; - hash = "sha256-ovYKnd5don5X4OXvX4kx9JXB1UGtkKhB4rYjFWVUcWA="; - releaseId = "465"; + version = "5.11.2beta"; + hash = "sha256-5/KxLAktb1mPKeJVsLAD2YrBeWyFtzpXCJDb8tzzWyQ="; + releaseId = "518"; }; # https://www.aquamaniac.de/rdm/projects/libchipcard/files @@ -15,8 +15,8 @@ # https://www.aquamaniac.de/rdm/projects/aqbanking/files aqbanking = { - version = "6.5.4"; - hash = "sha256-DRbOrnbwcY5GZjj0VHqLFJJ/HY2YMiB5zWSBrd4wrJk="; - releaseId = "499"; + version = "6.5.12beta"; + hash = "sha256-TH6+eEiULmOciB1Mqo4vjgF9JbF4BW+llrTjS6BtctY="; + releaseId = "526"; }; } diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix deleted file mode 100644 index deeed9ebc9cd..000000000000 --- a/pkgs/development/libraries/aravis/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, gi-docgen -, glib -, libxml2 -, gobject-introspection - -, enableGstPlugin ? true -, enableViewer ? true -, gst_all_1 -, gtk3 -, wrapGAppsHook3 - -, enableUsb ? true -, libusb1 - -, enablePacketSocket ? true -, enableFastHeartbeat ? false -}: - -assert enableGstPlugin -> gst_all_1 != null; -assert enableViewer -> enableGstPlugin; -assert enableViewer -> gtk3 != null; -assert enableViewer -> wrapGAppsHook3 != null; - -stdenv.mkDerivation rec { - pname = "aravis"; - version = "0.8.33"; - - src = fetchFromGitHub { - owner = "AravisProject"; - repo = pname; - rev = version; - sha256 = "sha256-D6zcTCaFJxJ2VhhsgEFu5+3Xx1MJov4ryrtA0VkjZlY="; - }; - - outputs = [ "bin" "dev" "out" "lib" ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gi-docgen - gobject-introspection - ] ++ lib.optional enableViewer wrapGAppsHook3; - - buildInputs = - [ glib libxml2 ] - ++ lib.optional enableUsb libusb1 - ++ lib.optionals (enableViewer || enableGstPlugin) (with gst_all_1; [ gstreamer gst-plugins-base (gst-plugins-good.override { gtkSupport = true; }) gst-plugins-bad ]) - ++ lib.optionals (enableViewer) [ gtk3 ]; - - mesonFlags = [ - ] ++ lib.optional enableFastHeartbeat "-Dfast-heartbeat=enabled" - ++ lib.optional (!enableGstPlugin) "-Dgst-plugin=disabled" - ++ lib.optional (!enableViewer) "-Dviewer=disabled" - ++ lib.optional (!enableUsb) "-Dviewer=disabled" - ++ lib.optional (!enablePacketSocket) "-Dpacket-socket=disabled"; - - doCheck = true; - - meta = { - description = "Library for video acquisition using GenICam cameras"; - longDescription = '' - Implements the gigabit ethernet and USB3 protocols used by industrial cameras. - ''; - # the documentation is the best working homepage that's not the Github repo - homepage = "https://aravisproject.github.io/docs/aravis-0.8"; - license = lib.licenses.lgpl2; - maintainers = with lib.maintainers; [ tpw_rules ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix deleted file mode 100644 index 87072265abb2..000000000000 --- a/pkgs/development/libraries/arb/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, mpir -, gmp -, mpfr -, flint -}: - -stdenv.mkDerivation rec { - pname = "arb"; - version = "2.23.0"; - - src = fetchFromGitHub { - owner = "fredrik-johansson"; - repo = pname; - rev = version; - sha256 = "sha256-dt9PZ3Xfn60rhmnxYo7CEzNTEUN/wMVAXe8U5PzUO9U="; - }; - - buildInputs = [ mpir gmp mpfr flint ]; - - configureFlags = [ - "--with-gmp=${gmp}" - "--with-mpir=${mpir}" - "--with-mpfr=${mpfr}" - "--with-flint=${flint}" - ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = with lib; { - description = "Library for arbitrary-precision interval arithmetic"; - homepage = "https://arblib.org/"; - license = licenses.lgpl21Plus; - maintainers = teams.sage.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix deleted file mode 100644 index f4fc2101e72b..000000000000 --- a/pkgs/development/libraries/argp-standalone/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja }: - -stdenv.mkDerivation rec { - pname = "argp-standalone"; - version = "1.5.0"; - - src = fetchFromGitHub { - owner = "argp-standalone"; - repo = "argp-standalone"; - rev = version; - sha256 = "jWnoWVnUVDQlsC9ru7oB9PdtZuyCCNqGnMqF/f2m0ZY="; - }; - - nativeBuildInputs = [ meson ninja ]; - - doCheck = true; - - meta = with lib; { - homepage = "https://github.com/argp-standalone/argp-standalone"; - description = "Standalone version of arguments parsing functions from Glibc"; - platforms = platforms.unix; - maintainers = with maintainers; [ amar1729 ]; - license = licenses.lgpl21Plus; - }; -} diff --git a/pkgs/development/libraries/argparse/default.nix b/pkgs/development/libraries/argparse/default.nix deleted file mode 100644 index 3b10b70e2040..000000000000 --- a/pkgs/development/libraries/argparse/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "argparse"; - version = "3.1"; - - src = fetchFromGitHub { - owner = "p-ranav"; - repo = "argparse"; - rev = "v${version}"; - sha256 = "sha256-JH9t/e/6RaSz+3LjmuNBYOy5gJT3zA+Vz4CxuwEXlvA="; - }; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace '$'{CMAKE_INSTALL_LIBDIR_ARCHIND} '$'{CMAKE_INSTALL_LIBDIR} - substituteInPlace packaging/pkgconfig.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - - nativeBuildInputs = [ - cmake - ]; - - meta = with lib; { - description = "Argument Parser for Modern C++"; - homepage = "https://github.com/p-ranav/argparse"; - maintainers = with maintainers; [ _2gn ]; - platforms = platforms.unix; - license = licenses.mit; - }; -} diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/development/libraries/arguments/default.nix deleted file mode 100644 index 524e00dc5a76..000000000000 --- a/pkgs/development/libraries/arguments/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "arguments"; - version = "unstable-2015-11-30"; - - owner = "BIC-MNI"; - - src = fetchFromGitHub { - inherit owner; - repo = pname; - rev = "b3aad97f6b6892cb8733455d0d448649a48fa108"; - sha256 = "1ar8lm1w1jflz3vdmjr5c4x6y7rscvrj78b8gmrv79y95qrgzv6s"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ ]; - - #cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" ]; - - doCheck = false; - # internal_volume_io.h: No such file or directory - - meta = with lib; { - homepage = "https://github.com/${owner}/${pname}"; - description = "Library for argument handling for MINC programs"; - maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.gpl2Plus; - }; -} diff --git a/pkgs/development/libraries/aribb25/default.nix b/pkgs/development/libraries/aribb25/default.nix index 743850c5fdc3..2a0601a8875e 100644 --- a/pkgs/development/libraries/aribb25/default.nix +++ b/pkgs/development/libraries/aribb25/default.nix @@ -1,12 +1,12 @@ -{ stdenv -, lib -, fetchFromGitLab -, fetchpatch -, autoreconfHook -, pkg-config -, pcsclite -, PCSC -, xcbuild +{ + stdenv, + lib, + fetchFromGitLab, + fetchpatch, + autoreconfHook, + pkg-config, + pcsclite, + PCSC, }: stdenv.mkDerivation rec { @@ -26,26 +26,30 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config - ] ++ lib.optional stdenv.isDarwin xcbuild; - buildInputs = if stdenv.isDarwin then [ PCSC ] else [ pcsclite ]; - - patches = let - url = commit: "https://code.videolan.org/videolan/${pname}/-/commit/${commit}.diff"; - in [ - (fetchpatch { - name = "make-cli-pipes-work-1.patch"; - url = url "0425184dbf3fdaf59854af5f530da88b2196a57b"; - sha256 = "0ysm2jivpnqxz71vw1102616qxww2gx005i0c5lhi6jbajqsa1cd"; - }) - (fetchpatch { - name = "make-cli-pipes-work-2.patch"; - url = url "cebabeab2bda065dca1c9f033b42d391be866d86"; - sha256 = "1283kqv1r4rbaba0sv2hphkhcxgjkmh8ndlcd24fhx43nn63hd28"; - }) ]; - buildFlags = - lib.optional stdenv.isDarwin "pcsclite_CFLAGS=-I${PCSC}/Library/Frameworks/PCSC.framework/Headers"; + buildInputs = + lib.optionals stdenv.hostPlatform.isDarwin [ PCSC ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-deprecated-non-prototype"; + + patches = + let + url = commit: "https://code.videolan.org/videolan/${pname}/-/commit/${commit}.diff"; + in + [ + (fetchpatch { + name = "make-cli-pipes-work-1.patch"; + url = url "0425184dbf3fdaf59854af5f530da88b2196a57b"; + sha256 = "0ysm2jivpnqxz71vw1102616qxww2gx005i0c5lhi6jbajqsa1cd"; + }) + (fetchpatch { + name = "make-cli-pipes-work-2.patch"; + url = url "cebabeab2bda065dca1c9f033b42d391be866d86"; + sha256 = "1283kqv1r4rbaba0sv2hphkhcxgjkmh8ndlcd24fhx43nn63hd28"; + }) + ]; meta = with lib; { description = "Sample implementation of the ARIB STD-B25 standard"; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix deleted file mode 100644 index 1e06af6cf931..000000000000 --- a/pkgs/development/libraries/armadillo/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, blas, lapack, superlu, hdf5 }: - -stdenv.mkDerivation rec { - pname = "armadillo"; - version = "14.0.0"; - - src = fetchurl { - url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-ijWGszJ35tvDyPJ/T/9SIxwsb3YUGRwZDGb7m3i6mLU="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ blas lapack superlu hdf5 ]; - - cmakeFlags = [ - "-DLAPACK_LIBRARY=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" - "-DDETECT_HDF5=ON" - ]; - - patches = [ ./use-unix-config-on-OS-X.patch ]; - - meta = with lib; { - description = "C++ linear algebra library"; - homepage = "https://arma.sourceforge.net"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ juliendehos knedlsepp ]; - }; -} diff --git a/pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch b/pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch deleted file mode 100644 index a1442d141193..000000000000 --- a/pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -152,6 +152,7 @@ message(STATUS "DETECT_HDF5 = ${DETECT_HDF5}" ) - - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake_aux/Modules/") - -+set(APPLE false) - if(APPLE) - - set(ARMA_OS macos) diff --git a/pkgs/development/libraries/arpa2common/default.nix b/pkgs/development/libraries/arpa2common/default.nix deleted file mode 100644 index 77f9694e69a9..000000000000 --- a/pkgs/development/libraries/arpa2common/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - fetchpatch, - cmake, - - arpa2cm, - doxygen, - e2fsprogs, - graphviz, - libsodium, - lmdb, - openssl, - pkg-config, - ragel, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "arpa2common"; - version = "2.6.2"; - - src = fetchFromGitLab { - owner = "arpa2"; - repo = "arpa2common"; - rev = "v${finalAttrs.version}"; - hash = "sha256-eWfWaO6URCK2FWQ+NYAoeCONkovgsVDPSRQVCGFnW3s="; - }; - - patches = [ - (fetchpatch { - url = "https://gitlab.com/arpa2/arpa2common/-/commit/13ea82df60b87a5367db00a8c6f3502e8ecb7298.patch"; - hash = "sha256-V9Dhr6PeArqXnuXmFuDjcirlGl7xovq7VQZsrbbMFSk="; - }) - ]; - - nativeBuildInputs = [ - cmake - arpa2cm - doxygen - graphviz - pkg-config - ]; - - propagatedBuildInputs = [ - e2fsprogs - libsodium - lmdb - openssl - ragel - ]; - - meta = { - changelog = "https://gitlab.com/arpa2/arpa2common/-/blob/v${finalAttrs.version}/CHANGES"; - description = "ARPA2 ID and ACL libraries and other core data structures for ARPA2"; - longDescription = '' - The ARPA2 Common Library package offers elementary services that can - benefit many software packages. They are designed to be easy to - include, with a minimum of dependencies. At the same time, they were - designed with the InternetWide Architecture in mind, thus helping to - liberate users. - ''; - homepage = "https://gitlab.com/arpa2/arpa2common"; - license = with lib.licenses; [ - bsd2 - cc-by-sa-40 - cc0 - isc - ]; - maintainers = with lib.maintainers; [ fufexan ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix index 5ea144ef9bc3..eb928f99e88a 100644 --- a/pkgs/development/libraries/arrayfire/default.nix +++ b/pkgs/development/libraries/arrayfire/default.nix @@ -29,7 +29,7 @@ , cpuSupport ? true , cudaSupport ? config.cudaSupport # OpenCL needs mesa which is broken on Darwin -, openclSupport ? !stdenv.isDarwin +, openclSupport ? !stdenv.hostPlatform.isDarwin # This argument lets one run CUDA & OpenCL tests on non-NixOS systems by # telling Nix where to find the drivers. If you know the version of the # Nvidia driver that is installed on your system, you can do: diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix index cb9f1eb30246..44dd9e056874 100644 --- a/pkgs/development/libraries/asio/generic.nix +++ b/pkgs/development/libraries/asio/generic.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { homepage = "http://asio.sourceforge.net/"; description = "Cross-platform C++ library for network and low-level I/O programming"; license = licenses.boost; - broken = stdenv.isDarwin && lib.versionOlder version "1.16.1"; + broken = stdenv.hostPlatform.isDarwin && lib.versionOlder version "1.16.1"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/asmjit/default.nix b/pkgs/development/libraries/asmjit/default.nix deleted file mode 100644 index 7edc7c666a9c..000000000000 --- a/pkgs/development/libraries/asmjit/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv -, fetchFromGitHub -, cmake -, ninja -, lib -}: - -stdenv.mkDerivation { - pname = "asmjit"; - version = "unstable-2023-04-28"; - - src = fetchFromGitHub { - owner = "asmjit"; - repo = "asmjit"; - rev = "3577608cab0bc509f856ebf6e41b2f9d9f71acc4"; - hash = "sha256-EIfSruaM2Z64XOYAeEaf/wFy6/7UO6Sth487R1Q0yhI="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - strictDeps = true; - - meta = with lib; { - description = "Machine code generation for C++"; - longDescription = '' - AsmJit is a lightweight library for machine code generation written in - C++ language. It can generate machine code for X86, X86_64, and AArch64 - architectures and supports baseline instructions and all recent - extensions. - ''; - homepage = "https://asmjit.com/"; - license = licenses.zlib; - maintainers = with maintainers; [ nikstur ]; - }; -} diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix deleted file mode 100644 index 45eef22e69fb..000000000000 --- a/pkgs/development/libraries/assimp/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, boost -, zlib -}: - -stdenv.mkDerivation rec { - pname = "assimp"; - version = "5.4.3"; - outputs = [ "out" "lib" "dev" ]; - - src = fetchFromGitHub { - owner = "assimp"; - repo = "assimp"; - rev = "v${version}"; - hash = "sha256-sOYhYHBz3Tg+pi1OIJ1mGmsjEc6dPO6nFH0aolfpLRA="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost zlib ]; - - cmakeFlags = [ "-DASSIMP_BUILD_ASSIMP_TOOLS=ON" ]; - - env.NIX_CFLAGS_COMPILE = toString ([ - # Needed with GCC 12 - "-Wno-error=array-bounds" - ]); - - meta = with lib; { - description = "Library to import various 3D model formats"; - mainProgram = "assimp"; - homepage = "https://www.assimp.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ ehmry ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix deleted file mode 100644 index 4ca364ad9f8d..000000000000 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, gobject-introspection -, buildPackages -, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages -, gsettings-desktop-schemas -, makeWrapper -, dbus -, glib -, dconf -, libX11 -, libxml2 -, libXtst -, libXi -, libXext -, gnome -, systemd -, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd -}: - -stdenv.mkDerivation rec { - pname = "at-spi2-core"; - version = "2.52.0"; - - outputs = [ "out" "dev" ]; - separateDebugInfo = true; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-CsP8gyDI0B+hR8Jyun+gOAY4nGsD08QG0II+MONf9as="; - }; - - nativeBuildInputs = [ - glib - meson - ninja - pkg-config - makeWrapper - ] ++ lib.optionals withIntrospection [ - gobject-introspection - ]; - - buildInputs = [ - libX11 - libxml2 - # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case - libXtst - libXi - # libXext is a transitive dependency of libXi - libXext - ] ++ lib.optionals systemdSupport [ - # libsystemd is a needed for dbus-broker support - systemd - ]; - - # In atspi-2.pc dbus-1 glib-2.0 - # In atk.pc gobject-2.0 - propagatedBuildInputs = [ - dbus - glib - ]; - - # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?" - doCheck = false; - - mesonFlags = [ - # Provide dbus-daemon fallback when it is not already running when - # at-spi2-bus-launcher is executed. This allows us to avoid - # including the entire dbus closure in libraries linked with - # the at-spi2-core libraries. - "-Ddbus_daemon=/run/current-system/sw/bin/dbus-daemon" - ] ++ lib.optionals systemdSupport [ - # Same as the above, but for dbus-broker - "-Ddbus_broker=/run/current-system/sw/bin/dbus-broker-launch" - ] ++ lib.optionals (!systemdSupport) [ - "-Duse_systemd=false" - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - postFixup = '' - # Cannot use wrapGAppsHook'due to a dependency cycle - wrapProgram $out/libexec/at-spi-bus-launcher \ - --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} - ''; - - meta = with lib; { - description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; - homepage = "https://gitlab.gnome.org/GNOME/at-spi2-core"; - license = licenses.lgpl21Plus; - maintainers = teams.gnome.members ++ (with maintainers; [ raskin ]); - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index eb8f0d1c3b97..dfc8a5cdb82b 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext ]; + patches = [ ./musl.patch ]; + postPatch = '' for script in install-sh include/install-sh; do patchShebangs $script diff --git a/pkgs/development/libraries/attr/musl.patch b/pkgs/development/libraries/attr/musl.patch new file mode 100644 index 000000000000..818161f15243 --- /dev/null +++ b/pkgs/development/libraries/attr/musl.patch @@ -0,0 +1,27 @@ +From 8a80d895dfd779373363c3a4b62ecce5a549efb2 Mon Sep 17 00:00:00 2001 +From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me> +Date: Sat, 30 Mar 2024 10:17:10 +0100 +Subject: tools/attr.c: Add missing libgen.h include for basename(3) + +Fixes compilation issue with musl and modern C99 compilers. + +See: https://bugs.gentoo.org/926294 +--- + tools/attr.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/attr.c b/tools/attr.c +index f12e4af..6a3c1e9 100644 +--- a/tools/attr.c ++++ b/tools/attr.c +@@ -28,6 +28,7 @@ + #include <errno.h> + #include <string.h> + #include <locale.h> ++#include <libgen.h> + + #include <attr/attributes.h> + +-- +cgit v1.1 + diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix deleted file mode 100644 index 6aba488f2457..000000000000 --- a/pkgs/development/libraries/aubio/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, alsa-lib, fftw, libjack2, libsamplerate -, libsndfile, pkg-config, python311, wafHook -}: - -stdenv.mkDerivation rec { - pname = "aubio"; - version = "0.4.9"; - - src = fetchurl { - url = "https://aubio.org/pub/aubio-${version}.tar.bz2"; - sha256 = "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl"; - }; - - nativeBuildInputs = [ pkg-config python311 wafHook ]; - buildInputs = [ alsa-lib fftw libjack2 libsamplerate libsndfile ]; - - strictDeps = true; - wafFlags = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--disable-tests"; - - postPatch = '' - # U was removed in python 3.11 because it had no effect - substituteInPlace waflib/*.py \ - --replace "m='rU" "m='r" \ - --replace "'rU'" "'r'" - ''; - - meta = with lib; { - description = "Library for audio labelling"; - homepage = "https://aubio.org/"; - license = licenses.gpl2; - maintainers = with maintainers; [ marcweber fpletz ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/audiality2/default.nix b/pkgs/development/libraries/audiality2/default.nix deleted file mode 100644 index 9dfc216a2269..000000000000 --- a/pkgs/development/libraries/audiality2/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, pkg-config -# The two audio backends: -, SDL2 -, jack2 -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "audiality2"; - version = "1.9.4"; - - src = fetchFromGitHub { - owner = "olofson"; - repo = "audiality2"; - rev = "v${finalAttrs.version}"; - sha256 = "0ipqna7a9mxqm0fl9ggwhbc7i9yxz3jfyi0w3dymjp40v7jw1n20"; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - SDL2 - jack2 - ]; - - meta = with lib; { - description = "Realtime scripted modular audio engine for video games and musical applications"; - mainProgram = "a2play"; - homepage = "http://audiality.org"; - license = licenses.zlib; - platforms = platforms.all; - maintainers = with maintainers; [ fgaz ]; - }; -}) diff --git a/pkgs/development/libraries/audio/cubeb/default.nix b/pkgs/development/libraries/audio/cubeb/default.nix index dd7033b1910e..478e8478382a 100644 --- a/pkgs/development/libraries/audio/cubeb/default.nix +++ b/pkgs/development/libraries/audio/cubeb/default.nix @@ -9,10 +9,10 @@ , AudioUnit , CoreAudio , CoreServices -, lazyLoad ? !stdenv.isDarwin +, lazyLoad ? !stdenv.hostPlatform.isDarwin }: -assert lib.assertMsg (stdenv.isDarwin -> !lazyLoad) "cubeb: lazyLoad is inert on Darwin"; +assert lib.assertMsg (stdenv.hostPlatform.isDarwin -> !lazyLoad) "cubeb: lazyLoad is inert on Darwin"; let backendLibs = [ @@ -39,7 +39,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ speexdsp ] ++ ( - if stdenv.isDarwin then [ AudioUnit CoreAudio CoreServices ] + if stdenv.hostPlatform.isDarwin then [ AudioUnit CoreAudio CoreServices ] else backendLibs ); diff --git a/pkgs/development/libraries/audio/game-music-emu/default.nix b/pkgs/development/libraries/audio/game-music-emu/default.nix deleted file mode 100644 index 94b8d1cbc375..000000000000 --- a/pkgs/development/libraries/audio/game-music-emu/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, removeReferencesTo, zlib }: - -stdenv.mkDerivation rec { - version = "0.6.3"; - pname = "game-music-emu"; - - src = fetchurl { - url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.xz"; - sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb"; - }; - cmakeFlags = [ "-DENABLE_UBSAN=OFF" ]; - nativeBuildInputs = [ cmake removeReferencesTo ]; - buildInputs = [ zlib ]; - - # It used to reference it, in the past, but thanks to the postFixup hook, now - # it doesn't. - disallowedReferences = [ stdenv.cc.cc ]; - - postFixup = lib.optionalString stdenv.isLinux '' - remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/lib/libgme.so)" - ''; - - meta = with lib; { - homepage = "https://bitbucket.org/mpyne/game-music-emu/wiki/Home"; - description = "Collection of video game music file emulators"; - license = licenses.lgpl21Plus; - platforms = platforms.all; - maintainers = with maintainers; [ luc65r ]; - }; -} diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index a8648a1a1c7b..364ba305d5c1 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -2,31 +2,63 @@ # Upstream changes files in-place, to update: # 1. Check latest version at http://www.un4seen.com/ -# 2. Update `version`s and `sha256` sums. +# 2. Update `version`s and `hash` sums. # See also http://www.un4seen.com/forum/?topic=18614.0 +# Internet Archive used due to upstream URLs being unstable + let allBass = { bass = { h = "bass.h"; - version = "2.4.15"; + version = "2.4.17"; so = { - i686_linux = "libbass.so"; - x86_64-linux = "x64/libbass.so"; + i686_linux = "libs/x86/libbass.so"; + x86_64-linux = "libs/x86_64/libbass.so"; + armv7l-linux = "libs/armhf/libbass.so"; + aarch64-linux = "libs/aarch64/libbass.so"; }; - urlpath = "bass24-linux.zip"; - sha256 = "1lmysxfhy727zskavml3ibg5w876ir88923bm17c21s59w5lh7l8"; + url = "https://web.archive.org/web/20240501180538/http://www.un4seen.com/files/bass24-linux.zip"; + hash = "sha256-/JAlvtZtnzuzZjWy3n1WT8Q5ZVLO0BJJAJT7/dELS3o="; }; bass_fx = { h = "C/bass_fx.h"; version = "2.4.12.1"; so = { - i686_linux = "libbass_fx.so"; - x86_64-linux = "x64/libbass_fx.so"; + i686_linux = "libs/x86/libbass_fx.so"; + x86_64-linux = "libs/x86_64/libbass_fx.so"; + armv7l-linux = "libs/armhf/libbass_fx.so"; + aarch64-linux = "libs/aarch64/libbass_fx.so"; + }; + url = "https://web.archive.org/web/20240926184106/https://www.un4seen.com/files/z/0/bass_fx24-linux.zip"; + hash = "sha256-Hul2ELwnaDV8TDRMDXoFisle31GATDkf3PdkR2K9QTs="; + }; + + bassmidi = { + h = "bassmidi.h"; + version = "2.4.15.3"; + so = { + i686_linux = "libs/x86/libbassmidi.so"; + x86_64-linux = "libs/x86_64/libbassmidi.so"; + armv7l-linux = "libs/armhf/libbassmidi.so"; + aarch64-linux = "libs/aarch64/libbassmidi.so"; }; - urlpath = "z/0/bass_fx24-linux.zip"; - sha256 = "1q0g74z7iyhxqps5b3gnnbic8v2jji1r0mkvais57lsx8y21sbin"; + url = "https://web.archive.org/web/20240501180447/http://www.un4seen.com/files/bassmidi24-linux.zip"; + hash = "sha256-HrF1chhGk32bKN3jwal44Tz/ENGe/zORsrLPeGAv1OE="; + }; + + bassmix = { + h = "bassmix.h"; + version = "2.4.12"; + so = { + i686_linux = "libs/x86/libbassmix.so"; + x86_64-linux = "libs/x86_64/libbassmix.so"; + armv7l-linux = "libs/armhf/libbassmix.so"; + aarch64-linux = "libs/aarch64/libbassmix.so"; + }; + url = "https://web.archive.org/web/20240930183631/https://www.un4seen.com/files/bassmix24-linux.zip"; + hash = "sha256-oxxBhsjeLvUodg2SOMDH4wUy5na3nxLTqYkB+iXbOgA="; }; }; @@ -35,9 +67,9 @@ let inherit (bass) version; src = fetchurl { - url = "https://www.un4seen.com/files/${bass.urlpath}"; - inherit (bass) sha256; + inherit (bass) hash url; }; + unpackCmd = '' mkdir out ${unzip}/bin/unzip $curSrc -d out @@ -60,8 +92,7 @@ let homepage = "https://www.un4seen.com/"; license = licenses.unfreeRedistributable; platforms = builtins.attrNames bass.so; - # until upstream has stable URLs, this package is prone to always being broken - broken = true; + maintainers = with maintainers; [ jacekpoz ]; }; }; diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix deleted file mode 100644 index fa390eaaa588..000000000000 --- a/pkgs/development/libraries/audio/libbs2b/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libsndfile }: - -stdenv.mkDerivation rec { - pname = "libbs2b"; - version = "3.1.0"; - - src = fetchurl { - url = "mirror://sourceforge/bs2b/${pname}-${version}.tar.bz2"; - sha256 = "0vz442kkjn2h0dlxppzi4m5zx8qfyrivq581n06xzvnyxi5rg6a7"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libsndfile ]; - - configureFlags = [ - # Required for cross-compilation. - # Prevents linking error with 'undefined reference to rpl_malloc'. - # I think it's safe to assume that most libcs will properly handle - # realloc(NULL, size) and treat it like malloc(size). - "ac_cv_func_malloc_0_nonnull=yes" - ]; - hardeningDisable = [ "format" ]; - - meta = { - homepage = "https://bs2b.sourceforge.net/"; - description = "Bauer stereophonic-to-binaural DSP library"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/audio/libinstpatch/default.nix b/pkgs/development/libraries/audio/libinstpatch/default.nix deleted file mode 100644 index 670dee26b2bf..000000000000 --- a/pkgs/development/libraries/audio/libinstpatch/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glib, libsndfile }: - -stdenv.mkDerivation rec { - pname = "libinstpatch"; - version = "1.1.6"; - - src = fetchFromGitHub { - owner = "swami"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-OU6/slrPDgzn9tvXZJKSWbcFbpS/EAsOi52FtjeYdvA="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - propagatedBuildInputs = [ glib libsndfile ]; # Both are needed for includes. - - cmakeFlags = [ - "-DLIB_SUFFIX=" # Install in $out/lib. - ]; - - meta = with lib; { - homepage = "http://www.swamiproject.org/"; - description = "MIDI instrument patch files support library"; - license = licenses.lgpl21; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/audio/libkeyfinder/default.nix b/pkgs/development/libraries/audio/libkeyfinder/default.nix deleted file mode 100644 index d6f16f65df5d..000000000000 --- a/pkgs/development/libraries/audio/libkeyfinder/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, fftw, catch2_3 }: - -stdenv.mkDerivation rec { - pname = "libkeyfinder"; - version = "2.2.8"; - - src = fetchFromGitHub { - owner = "mixxxdj"; - repo = "libkeyfinder"; - rev = version; - hash = "sha256-Et8u5j/ke9u2bwHFriPCCBiXkPel37gwx+kwuViAr4o="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ fftw ]; - - nativeCheckInputs = [ catch2_3 ]; - - doCheck = true; - - meta = with lib; { - description = "Musical key detection for digital audio (C++ library)"; - homepage = "https://mixxxdj.github.io/libkeyfinder/"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix deleted file mode 100644 index 5125d4c76eba..000000000000 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, zlib }: - -stdenv.mkDerivation rec { - pname = "libmysofa"; - version = "1.3.2"; - - src = fetchFromGitHub { - owner = "hoene"; - repo = "libmysofa"; - rev = "v${version}"; - hash = "sha256-eXMGwa6lOtKoUCcHR9BM2S3NWAZkGyZzF3FAjYaWTvg="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib ]; - - cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCODE_COVERAGE=OFF" ]; - - meta = with lib; { - description = "Reader for AES SOFA files to get better HRTFs"; - homepage = "https://github.com/hoene/libmysofa"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix b/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix deleted file mode 100644 index 50495d163359..000000000000 --- a/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv -, lib -, fetchurl -, autoreconfHook -, pkg-config -, libopenmpt -}: - -stdenv.mkDerivation rec { - pname = "libopenmpt-modplug"; - version = "0.8.9.0-openmpt1"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "https://lib.openmpt.org/files/libopenmpt-modplug/libopenmpt-modplug-${version}.tar.gz"; - sha256 = "sha256-7M4aDuz9sLWCTKuJwnDc5ZWWKVosF8KwQyFez018T/c="; - }; - - enableParallelBuilding = true; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ - libopenmpt - ]; - - configureFlags = [ - "--enable-libmodplug" - ]; - - meta = with lib; { - description = "Libmodplug emulation layer based on libopenmpt"; - homepage = "https://lib.openmpt.org/libopenmpt/"; - license = licenses.bsd3; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix index a08b93a9b0e5..327ce1100c88 100644 --- a/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -10,19 +10,19 @@ , portaudio , libsndfile , flac -, usePulseAudio ? config.pulseaudio or stdenv.isLinux +, usePulseAudio ? config.pulseaudio or stdenv.hostPlatform.isLinux , libpulseaudio }: stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.7.9"; + version = "0.7.11"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - hash = "sha256-A4bpGNddeX551bFO3QhHFl2LNZ6YEe9XZSwKNWot/PQ="; + hash = "sha256-U6eYuMbi4faV6K0F6ToMG1MZnlqpmBg3xBaWs3BSB2c="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix deleted file mode 100644 index c8d33508672e..000000000000 --- a/pkgs/development/libraries/audio/libsmf/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, glib, pkg-config }: - -stdenv.mkDerivation rec { - version = "1.3"; - pname = "libsmf"; - - src = fetchFromGitHub { - owner = "stump"; - repo = "libsmf"; - rev = "libsmf-${version}"; - sha256 = "sha256-OJXJkXvbM2GQNInZXU2ldObquKHhqkdu1zqUDnVZN0Y="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ glib ]; - - meta = with lib; { - description = "C library for reading and writing Standard MIDI Files"; - homepage = "https://github.com/stump/libsmf"; - license = licenses.bsd2; - maintainers = [ ]; - mainProgram = "smfsh"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/audio/libspecbleach/default.nix b/pkgs/development/libraries/audio/libspecbleach/default.nix deleted file mode 100644 index b1065561e1c6..000000000000 --- a/pkgs/development/libraries/audio/libspecbleach/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, fftwFloat}: - -stdenv.mkDerivation rec { - pname = "libspecbleach"; - version = "0.1.6"; - - src = fetchFromGitHub { - owner = "lucianodato"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Tw5nrGVAeoiMH00efJwcU+QLmKDZZTXHQPSV9x789TM="; - }; - - nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ - fftwFloat - ]; - - meta = with lib; { - description = "C library for audio noise reduction"; - homepage = "https://github.com/lucianodato/libspecbleach"; - license = licenses.lgpl2; - maintainers = [ maintainers.magnetophon ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix deleted file mode 100644 index fdd50d8af937..000000000000 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, stdenv -, fetchurl -, lv2 -, meson -, ninja -, pkg-config -, python3 -, libsndfile -, serd -, sord -, sratom -, gitUpdater - -# test derivations -, pipewire -}: - -stdenv.mkDerivation rec { - pname = "lilv"; - version = "0.24.24"; - - outputs = [ "out" "dev" "man" ]; - - src = fetchurl { - url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; - hash = "sha256-a7a+n4hQQXbQZC8S3oCbK54txVYhporbjH7bma76u08="; - }; - - nativeBuildInputs = [ meson ninja pkg-config python3 ]; - buildInputs = [ libsndfile serd sord sratom ]; - propagatedBuildInputs = [ lv2 ]; - - mesonFlags = [ - "-Ddocs=disabled" - # Tests require building a shared library. - (lib.mesonEnable "tests" (!stdenv.hostPlatform.isStatic)) - ]; - - passthru = { - tests = { - inherit pipewire; - }; - updateScript = gitUpdater { - url = "https://gitlab.com/lv2/lilv.git"; - rev-prefix = "v"; - }; - }; - - meta = with lib; { - homepage = "http://drobilla.net/software/lilv"; - description = "C library to make the use of LV2 plugins"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix deleted file mode 100644 index 8391c93cc594..000000000000 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja - -, pipewire -, gitUpdater -}: - -stdenv.mkDerivation rec { - pname = "lv2"; - version = "1.18.10"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "https://lv2plug.in/spec/${pname}-${version}.tar.xz"; - hash = "sha256-eMUbzyG1Tli7Yymsy7Ta4Dsu15tSD5oB5zS9neUwlT8="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - meson - ninja - ]; - - buildInputs = [ ]; - - mesonFlags = [ - # install validators to $dev - "--bindir=${placeholder "dev"}/bin" - - # These are just example plugins. They pull in outdated gtk-2 - # dependency and many other things. Upstream would like to - # eventually move them of the project: - # https://gitlab.com/lv2/lv2/-/issues/57#note_1096060029 - "-Dplugins=disabled" - # Pulls in spell checkers among other things. - "-Dtests=disabled" - # Avoid heavyweight python dependencies. - "-Ddocs=disabled" - ] ++ lib.optionals stdenv.isDarwin [ - "-Dlv2dir=${placeholder "out"}/lib/lv2" - ]; - - passthru = { - tests = { - inherit pipewire; - }; - updateScript = gitUpdater { - # No nicer place to find latest release. - url = "https://gitlab.com/lv2/lv2.git"; - rev-prefix = "v"; - }; - }; - - meta = with lib; { - homepage = "https://lv2plug.in"; - description = "Plugin standard for audio systems"; - mainProgram = "lv2_validate"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix deleted file mode 100644 index 54c76e5bc60c..000000000000 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, boost, gtkmm2, lv2, pkg-config, python3, wafHook }: - -stdenv.mkDerivation rec { - pname = "lvtk"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "lvtk"; - repo = "lvtk"; - rev = version; - sha256 = "sha256-6IoyhBig3Nvc4Y8F0w8b1up6sn8O2RmoUVaBQ//+Aaw="; - }; - - nativeBuildInputs = [ pkg-config python3 wafHook ]; - buildInputs = [ boost gtkmm2 lv2 ]; - - enableParallelBuilding = true; - - postPatch = '' - # Fix including the boost libraries during linking - sed -i '/target[ ]*= "ttl2c"/ ilib=["boost_system"],' tools/wscript_build - - # don't use bundled waf - rm waf - - # remove (useless) python2 based print - sed -e '/print/d' -i wscript - ''; - - wafConfigureFlags = [ - "--boost-includes=${boost.dev}/include" - "--boost-libs=${boost.out}/lib" - ]; - - meta = with lib; { - description = "Set C++ wrappers around the LV2 C API"; - mainProgram = "ttl2c"; - homepage = "https://lvtk.org/"; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/audio/mbelib/default.nix b/pkgs/development/libraries/audio/mbelib/default.nix deleted file mode 100644 index d2c9d28f208c..000000000000 --- a/pkgs/development/libraries/audio/mbelib/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "mbelib"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "szechyjs"; - repo = "mbelib"; - rev = "v${version}"; - sha256 = "0v6b7nf8fgxy7vzgcwffqyql5zhldrz30c88k1ylbjp78hwh4rif"; - }; - - nativeBuildInputs = [ cmake ]; - - doCheck = true; - - meta = with lib; { - description = "P25 Phase 1 and ProVoice vocoder"; - homepage = "https://github.com/szechyjs/mbelib"; - license = licenses.isc; - platforms = platforms.unix; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix deleted file mode 100644 index 4ad3ba33cb5c..000000000000 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python3, wafHook }: - -stdenv.mkDerivation rec { - pname = "ntk"; - version = "1.3.1001"; - src = fetchFromGitHub { - owner = "linuxaudio"; - repo = "ntk"; - rev = "v${version}"; - sha256 = "sha256-NyEdg6e+9CI9V+TIgdpPyH1ei+Vq8pUxD3wPzWY5fEU="; - }; - - nativeBuildInputs = [ pkg-config wafHook ]; - buildInputs = [ - 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; - homepage = "http://non.tuxfamily.org/"; - license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ magnetophon nico202 ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/audio/qm-dsp/default.nix b/pkgs/development/libraries/audio/qm-dsp/default.nix deleted file mode 100644 index 2201f02c62e8..000000000000 --- a/pkgs/development/libraries/audio/qm-dsp/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, fetchpatch -, kissfft -}: - -stdenv.mkDerivation rec { - pname = "qm-dsp"; - version = "1.7.1"; - - src = fetchFromGitHub { - owner = "c4dm"; - repo = pname; - rev = "v${version}"; - sha256 = "1vkb1xr2hjcaw88gig7rknlwsx01lm0w94d2z0rk5vz9ih4fslvv"; - }; - - patches = [ - # Make installable - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/qm-dsp/raw/6eb385e2f970c4150f9c8eba73b558318475ed15/f/qm-dsp-install.patch"; - sha256 = "071g30p17ya0pknzqa950pb93vrgp2024ray8axn22c44gvy147c"; - }) - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/qm-dsp/raw/6eb385e2f970c4150f9c8eba73b558318475ed15/f/qm-dsp-flags.patch"; - sha256 = "127n6j5bsp94kf2m1zqfvkf4iqk1h5f7w778bk7w02vi45nm4x6q"; - postFetch = '' - sed -i 's~/Makefile~/build/linux/Makefile.linux32~g' "$out" - ''; - }) - ]; - - buildInputs = [ - kissfft - ]; - - makefile = "build/linux/Makefile.linux32"; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - "LIBDIR=${placeholder "out"}/lib" - ]; - - postInstall = '' - mv $out/include/qm-dsp/* $out/include - rmdir $out/include/qm-dsp - ''; - - env.NIX_CFLAGS_COMPILE = "-I${lib.getInclude kissfft}/include/kissfft"; - - meta = with lib; { - description = "C++ library of functions for DSP and Music Informatics purposes"; - homepage = "https://code.soundsoftware.ac.uk/projects/qm-dsp"; - license = licenses.gpl2Plus; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix deleted file mode 100644 index 19853fd885f9..000000000000 --- a/pkgs/development/libraries/audio/raul/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - meson, - ninja, -}: - -stdenv.mkDerivation { - pname = "raul"; - version = "2.0.0-unstable-2024-07-04"; - - src = fetchFromGitLab { - owner = "drobilla"; - repo = "raul"; - rev = "9097952a918f8330a5db9039ad390fc2457f841d"; - hash = "sha256-k+EU3ROVJyjJPAtNxPmRXp9DALpUHzohCLL6Xe3NUxk="; - }; - - nativeBuildInputs = [ - meson - ninja - ]; - - strictDeps = true; - - meta = { - description = "C++ utility library primarily aimed at audio/musical applications"; - homepage = "http://drobilla.net/software/raul"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ t4ccer ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/audio/roc-toolkit/default.nix b/pkgs/development/libraries/audio/roc-toolkit/default.nix deleted file mode 100644 index 6c579774e4bf..000000000000 --- a/pkgs/development/libraries/audio/roc-toolkit/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ stdenv, - lib, - fetchFromGitHub, - scons, - ragel, - gengetopt, - pkg-config, - libuv, - openfecSupport ? true, - openfec, - speexdsp, - libunwindSupport ? lib.meta.availableOn stdenv.hostPlatform libunwind, - libunwind, - pulseaudioSupport ? true, - libpulseaudio, - opensslSupport ? true, - openssl, - soxSupport ? true, - sox, - libsndfileSupport ? true, - libsndfile -}: - -stdenv.mkDerivation rec { - pname = "roc-toolkit"; - version = "0.4.0"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "roc-streaming"; - repo = "roc-toolkit"; - rev = "v${version}"; - hash = "sha256-53irDq803dTg0YqtC1SOXmYNGypSMAEK+9HJ65pR5PA="; - }; - - nativeBuildInputs = [ - scons - ragel - gengetopt - pkg-config - ]; - - propagatedBuildInputs = [ - libuv - speexdsp - ] ++ lib.optional openfecSupport openfec - ++ lib.optional libunwindSupport libunwind - ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optional opensslSupport openssl - ++ lib.optional soxSupport sox - ++ lib.optional libsndfileSupport libsndfile; - - sconsFlags = lib.optionals (!stdenv.hostPlatform.isDarwin) - [ "--build=${stdenv.buildPlatform.config}" - "--host=${stdenv.hostPlatform.config}" ] ++ - [ "--prefix=${placeholder "out"}" ] ++ - lib.optional (!opensslSupport) "--disable-openssl" ++ - lib.optional (!soxSupport) "--disable-sox" ++ - lib.optional (!libunwindSupport) "--disable-libunwind" ++ - lib.optional (!pulseaudioSupport) "--disable-pulseaudio" ++ - lib.optional (!libsndfileSupport) "--disable-sndfile" ++ - (if (!openfecSupport) - then ["--disable-openfec"] - else [ "--with-libraries=${openfec}/lib" - "--with-openfec-includes=${openfec.dev}/include" ]); - - meta = with lib; { - description = "Roc is a toolkit for real-time audio streaming over the network"; - homepage = "https://github.com/roc-streaming/roc-toolkit"; - license = licenses.mpl20; - maintainers = with maintainers; [ bgamari ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix deleted file mode 100644 index 8f793b359886..000000000000 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib -, stdenv -, fetchurl -, lv2 -, meson -, ninja -, pkg-config -, serd -, sord -, writeScript -}: - -stdenv.mkDerivation rec { - pname = "sratom"; - version = "0.6.16"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; - hash = "sha256-ccFXmRGD5T0FVTk7tCccdcm19dq3Sl7yLyCLsi3jIsQ="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - lv2 - serd - sord - ]; - - postPatch = '' - patchShebangs --build scripts/dox_to_sphinx.py - ''; - - mesonFlags = [ - "-Ddocs=disabled" - ]; - - passthru = { - updateScript = writeScript "update-sratom" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl pcre common-updater-scripts - - set -eu -o pipefail - - # Expect the text in format of 'download.drobilla.net/sratom-0.30.16.tar.xz">' - new_version="$(curl -s https://drobilla.net/category/sratom/ | - pcregrep -o1 'download.drobilla.net/sratom-([0-9.]+).tar.xz' | - head -n1)" - update-source-version ${pname} "$new_version" - ''; - }; - - meta = with lib; { - homepage = "https://drobilla.net/software/sratom"; - description = "Library for serialising LV2 atoms to/from RDF"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 350adc8a4583..a3bf187dd9c2 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -7,6 +7,10 @@ pkg-config, meson, ninja, + sphinxygen, + doxygen, + sphinx, + python3Packages, # runtime lv2, @@ -18,7 +22,7 @@ gtk3, withQt5 ? true, qt5, - withX11 ? !stdenv.isDarwin, + withX11 ? !stdenv.hostPlatform.isDarwin, }: let @@ -40,11 +44,13 @@ stdenv.mkDerivation rec { meson ninja pkg-config + sphinxygen + doxygen + sphinx + python3Packages.sphinx-lv2-theme ]; mesonFlags = [ - # docs require sphinxygen - (mesonEnable "docs" false) (mesonEnable "gtk2" withGtk2) (mesonEnable "gtk3" withGtk3) (mesonEnable "qt5" withQt5) diff --git a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix deleted file mode 100644 index a483f7023d04..000000000000 --- a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -# set VAMP_PATH ? -# plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses) - -{ lib, stdenv, fetchFromGitHub, pkg-config, libsndfile }: - -stdenv.mkDerivation rec { - pname = "vamp-plugin-sdk"; - version = "2.10"; - - src = fetchFromGitHub { - owner = "vamp-plugins"; - repo = "vamp-plugin-sdk"; - rev = "vamp-plugin-sdk-v${version}"; - hash = "sha256-5jNA6WmeIOVjkEMZXB5ijxyfJT88alVndBif6dnUFdI="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libsndfile ]; - - # build is susceptible to race conditions: https://github.com/vamp-plugins/vamp-plugin-sdk/issues/12 - enableParallelBuilding = false; - makeFlags = [ - "AR:=$(AR)" - "RANLIB:=$(RANLIB)" - ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-o test"; - - meta = with lib; { - description = "Audio processing plugin system for plugins that extract descriptive information from audio data"; - homepage = "https://vamp-plugins.org/"; - license = licenses.bsd3; - maintainers = [ maintainers.marcweber ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix deleted file mode 100644 index 64113993f1ea..000000000000 --- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv, fetchurl , alsa-lib, }: - -stdenv.mkDerivation rec { - pname = "zita-alsa-pcmi"; - version = "0.6.1"; - src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "sha256-iil6zj16R0Ex7T+jIQacExM3eFtWojfW8WjIXueW1Ww="; - }; - - buildInputs = [ alsa-lib ]; - - buildPhase = '' - cd source - make PREFIX="$out" - - # create lib link for building apps - ln -s libzita-alsa-pcmi.so.$version libzita-alsa-pcmi.so - - # apps - cd ../apps - CXXFLAGS+=" -I../source" \ - LDFLAGS+=" -L../source" \ - make PREFIX="$out" - ''; - - installPhase = '' - mkdir "$out" - mkdir "$out/lib" - mkdir "$out/include" - mkdir "$out/bin" - - cd ../source - - # source - install -Dm755 libzita-alsa-pcmi.so.$version \ - "$out/lib/libzita-alsa-pcmi.so.$version" - - # link - ln -s libzita-alsa-pcmi.so.$version \ - "$out/lib/libzita-alsa-pcmi.so" - ln -s libzita-alsa-pcmi.so.$version \ - "$out/lib/libzita-alsa-pcmi.so.0" - - # header - install -Dm644 zita-alsa-pcmi.h \ - "$out/include/zita-alsa-pcmi.h" - - # apps - install -Dm755 ../apps/alsa_delay \ - "$out/bin/alsa_delay" - install -Dm755 ../apps/alsa_loopback \ - "$out/bin/alsa_loopback" - ''; - - meta = { - description = "Successor of clalsadrv, provides easy access to ALSA PCM devices"; - version = version; - homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.magnetophon ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix deleted file mode 100644 index 3b77bf549ca6..000000000000 --- a/pkgs/development/libraries/audio/zita-convolver/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, fftwFloat }: - -stdenv.mkDerivation rec { - pname = "zita-convolver"; - version = "4.0.3"; - src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "0prji66p86z2bzminywkwchr5bfgxcg2i8y803pydd1hzf2198cs"; - }; - - buildInputs = [ fftwFloat ]; - - patchPhase = '' - cd source - sed -e "s@ldconfig@@" -i Makefile - ''; - - makeFlags = [ - "PREFIX=$(out)" - "SUFFIX=" - ]; - - postInstall = '' - # create lib link for building apps - ln -s $out/lib/libzita-convolver.so.${version} $out/lib/libzita-convolver.so.${lib.versions.major version} - ''; - - meta = { - description = "Convolution library by Fons Adriaensen"; - version = version; - homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.magnetophon ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix deleted file mode 100644 index 70054134767a..000000000000 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "zita-resampler"; - version = "1.8.0"; - - src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "sha256-5XRPI8VN0Vs/eDpoe9h57uKmkKRUWhW0nEzwN6pGSqI="; - }; - - makeFlags = [ - "PREFIX=$(out)" - "SUFFIX=" - ]; - - postPatch = '' - cd source - substituteInPlace Makefile \ - --replace 'ldconfig' "" - '' + lib.optionalString (!stdenv.hostPlatform.isx86_64) '' - substituteInPlace Makefile \ - --replace '-DENABLE_SSE2' "" - ''; - - fixupPhase = '' - ln -s $out/lib/libzita-resampler.so.$version $out/lib/libzita-resampler.so.1 - ''; - - meta = { - description = "Resample library by Fons Adriaensen"; - version = version; - homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.magnetophon ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/audio/zix/default.nix b/pkgs/development/libraries/audio/zix/default.nix deleted file mode 100644 index f2824fa79390..000000000000 --- a/pkgs/development/libraries/audio/zix/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, fetchpatch -, meson -, ninja -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "zix"; - version = "0.4.2"; - - src = fetchFromGitLab { - owner = "drobilla"; - repo = pname; - rev = "v${version}"; - hash = "sha256-nMm3Mdqc4ncCae8SoyGxZYURzmXLNcp1GjsSExfB6x4="; - }; - - patches = [ - # clang-16 support on Darwin: - # https://gitlab.com/drobilla/zix/-/issues/3 - (fetchpatch { - name = "darwin-sync.patch"; - url = "https://gitlab.com/drobilla/zix/-/commit/a6f804073de1f1e626464a9dd0a169fd3f69fdff.patch"; - hash = "sha256-ZkDPjtUzIyqnYarQR+7aCj7S/gSngbd6d75aRT+h7Ww="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - mesonFlags = [ - "-Dbenchmarks=disabled" - "-Ddocs=disabled" - ]; - - doCheck = true; - - meta = with lib; { - description = "Lightweight C99 portability and data structure library"; - homepage = "https://gitlab.com/drobilla/zix"; - changelog = "https://gitlab.com/drobilla/zix/-/blob/${src.rev}/NEWS"; - license = licenses.isc; - platforms = platforms.unix; - maintainers = with maintainers; [ yuu ]; - }; -} diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index f9974e2ca253..3a65f2535b7c 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { version = "0.3.6"; buildInputs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices AudioUnit ]; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 95f82d8def2b..3e9be1f5fc71 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -141,7 +141,7 @@ stdenv.mkDerivation rec { expat libiconv libevent - ] ++ lib.optionals stdenv.isFreeBSD [ + ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ libpcap ] ++ lib.optionals gtk3Support [ gtk3 @@ -171,7 +171,7 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=no" ] ++ lib.optionals withLibdnssdCompat [ "--enable-compat-libdns_sd" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # autoipd won't build on darwin "--disable-autoipd" ]; @@ -183,7 +183,7 @@ stdenv.mkDerivation rec { "sysconfdir=${placeholder "out"}/etc" ]; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i '20 i\ #define __APPLE_USE_RFC_2292' \ avahi-core/socket.c diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix deleted file mode 100644 index d8735e0b9143..000000000000 --- a/pkgs/development/libraries/avro-c++/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, cmake -, boost -, python3 -}: - -stdenv.mkDerivation rec { - pname = "avro-c++"; - version = "1.11.3"; - - src = fetchurl { - url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz"; - hash = "sha256-+6JCrvd+yBnQdWH8upN1FyGVbejQyujh8vMAtUszG64="; - }; - patches = [ - # This patch fixes boost compatibility and can be removed when - # upgrading beyond 1.11.3 https://github.com/apache/avro/pull/1920 - (fetchpatch { - name = "fix-boost-compatibility.patch"; - url = "https://github.com/apache/avro/commit/016323828f147f185d03f50d2223a2f50bfafce1.patch"; - hash = "sha256-hP/5J2JzSplMvg8EjEk98Vim8DfTyZ4hZ/WGiVwvM1A="; - }) - ]; - patchFlags = [ "-p3" ]; - - nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ boost ]; - - preConfigure = '' - substituteInPlace test/SchemaTests.cc --replace "BOOST_CHECKPOINT" "BOOST_TEST_CHECKPOINT" - substituteInPlace test/buffertest.cc --replace "BOOST_MESSAGE" "BOOST_TEST_MESSAGE" - ''; - - meta = { - description = "C++ library which implements parts of the Avro Specification"; - mainProgram = "avrogencpp"; - homepage = "https://avro.apache.org/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ rasendubi ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix deleted file mode 100644 index a62d0449b385..000000000000 --- a/pkgs/development/libraries/avro-c/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, cmake, fetchurl, pkg-config, jansson, snappy, xz, zlib }: - -stdenv.mkDerivation rec { - pname = "avro-c"; - version = "1.11.3"; - - src = fetchurl { - url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; - sha256 = "sha256-chfKrPt9XzRhF2ZHOmbC4nm8e/rxuimMfwSzsvulc2U="; - }; - - postPatch = '' - patchShebangs . - ''; - - nativeBuildInputs = [ pkg-config cmake ]; - - buildInputs = [ jansson snappy xz zlib ]; - - meta = with lib; { - description = "C library which implements parts of the Avro Specification"; - homepage = "https://avro.apache.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ lblasc ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix deleted file mode 100644 index 70aa863a7ce2..000000000000 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, aws-c-cal -, aws-c-common -, aws-c-compression -, aws-c-http -, aws-c-io -, aws-c-sdkutils -, cmake -, nix -, s2n-tls -}: - -stdenv.mkDerivation rec { - pname = "aws-c-auth"; - version = "0.7.26"; - - src = fetchFromGitHub { - owner = "awslabs"; - repo = "aws-c-auth"; - rev = "v${version}"; - hash = "sha256-02dy2xgMGWkLf+HyBztbkCcazfZNAMwpJPU2gGBPokY="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - aws-c-cal - aws-c-common - aws-c-compression - aws-c-http - aws-c-io - s2n-tls - ]; - - propagatedBuildInputs = [ - aws-c-sdkutils - ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - ]; - - passthru.tests = { - inherit nix; - }; - - meta = with lib; { - description = "C99 library implementation of AWS client-side authentication"; - homepage = "https://github.com/awslabs/aws-c-auth"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ r-burns ]; - }; -} diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix deleted file mode 100644 index 8166497efa50..000000000000 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, nix -}: - -stdenv.mkDerivation rec { - pname = "aws-c-common"; - version = "0.9.27"; - - src = fetchFromGitHub { - owner = "awslabs"; - repo = pname; - rev = "v${version}"; - hash = "sha256-VbF+R2LB5M2luOoQ/HsAOqk/ujHSW4QJC0OTzNnu9PM="; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - ] ++ lib.optionals stdenv.hostPlatform.isRiscV [ - "-DCMAKE_C_FLAGS=-fasynchronous-unwind-tables" - ]; - - # aws-c-common misuses cmake modules, so we need - # to manually add a MODULE_PATH to its consumers - setupHook = ./setup-hook.sh; - - # Prevent the execution of tests known to be flaky. - preCheck = let - ignoreTests = [ - "promise_test_multiple_waiters" - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - "sba_metrics" # https://github.com/awslabs/aws-c-common/issues/839 - ]; - in '' - cat <<EOW >CTestCustom.cmake - SET(CTEST_CUSTOM_TESTS_IGNORE ${toString ignoreTests}) - EOW - ''; - - doCheck = true; - - passthru.tests = { - inherit nix; - }; - - meta = with lib; { - description = "AWS SDK for C common core"; - homepage = "https://github.com/awslabs/aws-c-common"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ orivej r-burns ]; - }; -} diff --git a/pkgs/development/libraries/aws-c-common/setup-hook.sh b/pkgs/development/libraries/aws-c-common/setup-hook.sh deleted file mode 100644 index 174933621f00..000000000000 --- a/pkgs/development/libraries/aws-c-common/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addAwsCCommonModuleDir() { - prependToVar cmakeFlags "-DCMAKE_MODULE_PATH=@out@/lib/cmake" -} - -postHooks+=(addAwsCCommonModuleDir) diff --git a/pkgs/development/libraries/aws-c-compression/default.nix b/pkgs/development/libraries/aws-c-compression/default.nix deleted file mode 100644 index cb115f531f50..000000000000 --- a/pkgs/development/libraries/aws-c-compression/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, aws-c-common -, cmake -, nix -}: - -stdenv.mkDerivation rec { - pname = "aws-c-compression"; - version = "0.2.19"; - - src = fetchFromGitHub { - owner = "awslabs"; - repo = "aws-c-compression"; - rev = "v${version}"; - sha256 = "sha256-Zr1C47YaTkMlG7r2WtAkxRfjZRuBKeTXzNIGspdLap4="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - aws-c-common - ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - ]; - - passthru.tests = { - inherit nix; - }; - - meta = with lib; { - description = "C99 implementation of huffman encoding/decoding"; - homepage = "https://github.com/awslabs/aws-c-compression"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ r-burns ]; - }; -} diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix deleted file mode 100644 index 9b568b372141..000000000000 --- a/pkgs/development/libraries/aws-c-event-stream/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, aws-c-io, aws-checksums, nix, s2n-tls, libexecinfo }: - -stdenv.mkDerivation rec { - pname = "aws-c-event-stream"; - version = "0.4.3"; - - src = fetchFromGitHub { - owner = "awslabs"; - repo = pname; - rev = "v${version}"; - hash = "sha256-xLgPFy+wFtUe3GawICrAHyji+mkfxC2jw7lsL+p7pl4="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ aws-c-cal aws-c-common aws-c-io aws-checksums s2n-tls ] - ++ lib.optional stdenv.hostPlatform.isMusl libexecinfo; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS:BOOL=ON" - ]; - - passthru.tests = { - inherit nix; - }; - - meta = with lib; { - description = "C99 implementation of the vnd.amazon.eventstream content-type"; - homepage = "https://github.com/awslabs/aws-c-event-stream"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ orivej ]; - }; -} diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix deleted file mode 100644 index ac35fd5d57b0..000000000000 --- a/pkgs/development/libraries/aws-c-http/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, aws-c-cal -, aws-c-common -, aws-c-compression -, aws-c-io -, cmake -, nix -, s2n-tls -}: - -stdenv.mkDerivation rec { - pname = "aws-c-http"; - version = "0.8.2"; - - src = fetchFromGitHub { - owner = "awslabs"; - repo = "aws-c-http"; - rev = "v${version}"; - hash = "sha256-86auAZGoaYIpoTVlB9uC+nKMNt1QRNor+/68B5D36r8="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - aws-c-cal - aws-c-common - aws-c-compression - aws-c-io - s2n-tls - ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - ]; - - passthru.tests = { - inherit nix; - }; - - meta = with lib; { - description = "C99 implementation of the HTTP/1.1 and HTTP/2 specifications"; - homepage = "https://github.com/awslabs/aws-c-http"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ r-burns ]; - }; -} diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/development/libraries/aws-c-mqtt/default.nix deleted file mode 100644 index 829dc76dce93..000000000000 --- a/pkgs/development/libraries/aws-c-mqtt/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, aws-c-cal -, aws-c-common -, aws-c-compression -, aws-c-http -, aws-c-io -, cmake -, nix -, s2n-tls -}: - -stdenv.mkDerivation rec { - pname = "aws-c-mqtt"; - version = "0.10.4"; - - src = fetchFromGitHub { - owner = "awslabs"; - repo = "aws-c-mqtt"; - rev = "v${version}"; - hash = "sha256-i+ssZzHC8MPfyOaRqvjq0z7w772BJqIA6BwntW1fRek="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - aws-c-cal - aws-c-common - aws-c-compression - aws-c-http - aws-c-io - s2n-tls - ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - ]; - - passthru.tests = { - inherit nix; - }; - - meta = with lib; { - description = "C99 implementation of the MQTT 3.1.1 specification"; - homepage = "https://github.com/awslabs/aws-c-mqtt"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ r-burns ]; - }; -} diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix deleted file mode 100644 index 5c834da72cc4..000000000000 --- a/pkgs/development/libraries/aws-c-s3/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, aws-c-auth -, aws-c-cal -, aws-c-common -, aws-c-compression -, aws-c-http -, aws-c-io -, aws-checksums -, cmake -, nix -, s2n-tls -}: - -stdenv.mkDerivation rec { - pname = "aws-c-s3"; - version = "0.6.0"; - - src = fetchFromGitHub { - owner = "awslabs"; - repo = "aws-c-s3"; - rev = "v${version}"; - hash = "sha256-qPVITirqhExIeayh6AWEyAXPlkUtk7gkIcmT/IpNisw="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - aws-c-auth - aws-c-cal - aws-c-common - aws-c-compression - aws-c-http - aws-c-io - aws-checksums - s2n-tls - ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - ]; - - passthru.tests = { - inherit nix; - }; - - meta = with lib; { - description = "C99 library implementation for communicating with the S3 service"; - homepage = "https://github.com/awslabs/aws-c-s3"; - license = licenses.asl20; - maintainers = with maintainers; [ r-burns ]; - mainProgram = "s3"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/aws-c-sdkutils/default.nix b/pkgs/development/libraries/aws-c-sdkutils/default.nix deleted file mode 100644 index dc5dc02f6242..000000000000 --- a/pkgs/development/libraries/aws-c-sdkutils/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, aws-c-common -, cmake -, nix -}: - -stdenv.mkDerivation rec { - pname = "aws-c-sdkutils"; - version = "0.1.16"; - - src = fetchFromGitHub { - owner = "awslabs"; - repo = "aws-c-sdkutils"; - rev = "v${version}"; - hash = "sha256-ih7U2uP5FrBx6or1Rp/k+HWDE6evEZyNM//wsPxH9Qo="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - aws-c-common - ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - ]; - - doCheck = true; - - passthru.tests = { - inherit nix; - }; - - meta = with lib; { - description = "AWS SDK utility library"; - homepage = "https://github.com/awslabs/aws-c-sdkutils"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ r-burns ]; - }; -} diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix deleted file mode 100644 index f0a9a0cf665f..000000000000 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, aws-c-common, nix }: - -stdenv.mkDerivation rec { - pname = "aws-checksums"; - version = "0.1.18"; - - src = fetchFromGitHub { - owner = "awslabs"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-EhIVa8/IK4evGt4vYECunLpxrCMSOsr1RZ/8hFbRi9M="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ aws-c-common ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - ]; - - passthru.tests = { - inherit nix; - }; - - meta = with lib; { - description = "HW accelerated CRC32c and CRC32"; - homepage = "https://github.com/awslabs/aws-checksums"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ orivej ]; - }; -} diff --git a/pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch b/pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch deleted file mode 100644 index 2b06ce0aec63..000000000000 --- a/pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch +++ /dev/null @@ -1,59 +0,0 @@ -From fd3f3a28e7fce7fe4e10ed2d7edc4bfda8ab27df Mon Sep 17 00:00:00 2001 -From: Jan Tojnar <jtojnar@gmail.com> -Date: Sun, 9 Jan 2022 01:57:18 +0100 -Subject: [PATCH] build: Make includedir properly overrideable - -This is required by some package managers like Nix. ---- - CMakeLists.txt | 22 +++++++++++++--------- - 1 file changed, 13 insertions(+), 9 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ec6d172..6514c23 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -49,6 +49,10 @@ if(${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64") - set(FIND_LIBRARY_USE_LIB64_PATHS true) - endif() - -+if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR) -+ set(CMAKE_INSTALL_INCLUDEDIR "include") -+endif() -+ - if(NOT CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 11) - endif() -@@ -307,7 +311,7 @@ endif() - target_include_directories(${PROJECT_NAME} PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> - $<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}> -- $<INSTALL_INTERFACE:include>) -+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) - - aws_use_package(aws-c-http) - aws_use_package(aws-c-mqtt) -@@ -324,14 +328,14 @@ aws_add_sanitizers(${PROJECT_NAME}) - - target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS}) - --install(FILES ${AWS_CRT_HEADERS} DESTINATION "include/aws/crt" COMPONENT Development) --install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "include/aws/crt/auth" COMPONENT Development) --install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "include/aws/crt/crypto" COMPONENT Development) --install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "include/aws/crt/io" COMPONENT Development) --install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "include/aws/iot" COMPONENT Development) --install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "include/aws/crt/mqtt" COMPONENT Development) --install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "include/aws/crt/http" COMPONENT Development) --install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "include/aws/crt/endpoints" COMPONENT Development) -+install(FILES ${AWS_CRT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt" COMPONENT Development) -+install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/auth" COMPONENT Development) -+install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/crypto" COMPONENT Development) -+install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/io" COMPONENT Development) -+install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/iot" COMPONENT Development) -+install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/mqtt" COMPONENT Development) -+install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/http" COMPONENT Development) -+install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/endpoints" COMPONENT Development) - - install( - TARGETS ${PROJECT_NAME} --- -2.42.0 diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/development/libraries/aws-crt-cpp/default.nix deleted file mode 100644 index 534314443e4f..000000000000 --- a/pkgs/development/libraries/aws-crt-cpp/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, aws-c-auth -, aws-c-cal -, aws-c-common -, aws-c-compression -, aws-c-event-stream -, aws-c-http -, aws-c-io -, aws-c-mqtt -, aws-c-s3 -, aws-checksums -, cmake -, s2n-tls -, nix -}: - -stdenv.mkDerivation rec { - pname = "aws-crt-cpp"; - version = "0.26.12"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "awslabs"; - repo = "aws-crt-cpp"; - rev = "v${version}"; - sha256 = "sha256-mVihmcl24gFLnF3A/qLSvr2npOotMlBH7TqU5vOwI9g="; - }; - - patches = [ - # Correct include path for split outputs. - # https://github.com/awslabs/aws-crt-cpp/pull/325 - ./0001-build-Make-includedir-properly-overrideable.patch - ]; - - postPatch = '' - substituteInPlace CMakeLists.txt --replace '-Werror' "" - ''; - - nativeBuildInputs = [ - cmake - ]; - - propagatedBuildInputs = [ - aws-c-auth - aws-c-cal - aws-c-common - aws-c-compression - aws-c-event-stream - aws-c-http - aws-c-io - aws-c-mqtt - aws-c-s3 - aws-checksums - s2n-tls - ]; - - cmakeFlags = [ - "-DBUILD_DEPS=OFF" - "-DBUILD_SHARED_LIBS=ON" - ]; - - postInstall = '' - # Prevent dependency cycle. - moveToOutput lib/aws-crt-cpp/cmake "$dev" - ''; - - passthru.tests = { - inherit nix; - }; - - meta = with lib; { - description = "C++ wrapper around the aws-c-* libraries"; - homepage = "https://github.com/awslabs/aws-crt-cpp"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ r-burns ]; - }; -} diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 631c5a90faf5..6e549526a14c 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { rm tests/aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp # TestRandomURLMultiThreaded fails rm tests/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp - '' + lib.optionalString stdenv.isi686 '' + '' + lib.optionalString stdenv.hostPlatform.isi686 '' # EPSILON is exceeded rm tests/aws-cpp-sdk-core-tests/aws/client/AdaptiveRetryStrategyTest.cpp ''; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl openssl zlib - ] ++ lib.optionals (stdenv.isDarwin && + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && ((builtins.elem "text-to-speech" apis) || (builtins.elem "*" apis))) [ CoreAudio AudioToolbox ]; diff --git a/pkgs/development/libraries/azmq/default.nix b/pkgs/development/libraries/azmq/default.nix deleted file mode 100644 index 7317c51aabde..000000000000 --- a/pkgs/development/libraries/azmq/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, boost -, cmake -, ninja -, zeromq -, catch2 -}: - -stdenv.mkDerivation { - pname = "azmq"; - version = "unstable-2023-03-23"; - - src = fetchFromGitHub { - owner = "zeromq"; - repo = "azmq"; - rev = "2c1adac46bced4eb74ed9be7c74563bb113eaacf"; - hash = "sha256-4o1CHlg9kociIL6QN/kU2cojPvFRhtjFmKIAz0dapUM="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - boost - catch2 - zeromq - ]; - - # Broken for some reason on this platform. - doCheck = !(stdenv.isAarch64 && stdenv.isLinux); - - meta = with lib; { - homepage = "https://github.com/zeromq/azmq"; - license = licenses.boost; - description = "C++ language binding library integrating ZeroMQ with Boost Asio"; - maintainers = with maintainers; [ azahi ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix deleted file mode 100644 index 0806364a7f67..000000000000 --- a/pkgs/development/libraries/babl/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, pkg-config -, gi-docgen -, gobject-introspection -, lcms2 -, vala -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "babl"; - version = "0.1.108"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor finalAttrs.version}/babl-${finalAttrs.version}.tar.xz"; - hash = "sha256-Jt7+neqresTQ4HbKtJwqDW69DfDDH9IJklpfB+3uFHU="; - }; - - patches = [ - # Allow overriding path to dev output that will be hardcoded e.g. in pkg-config file. - ./dev-prefix.patch - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gi-docgen - gobject-introspection - vala - ]; - - buildInputs = [ - lcms2 - ]; - - 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 = '' - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput "share/doc" "$devdoc" - ''; - - meta = with lib; { - description = "Image pixel format conversion library"; - mainProgram = "babl"; - homepage = "https://gegl.org/babl/"; - 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/babl/dev-prefix.patch b/pkgs/development/libraries/babl/dev-prefix.patch deleted file mode 100644 index 9dab6c6a9ad4..000000000000 --- a/pkgs/development/libraries/babl/dev-prefix.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/meson.build b/meson.build -index 2350a1f..56f015d 100644 ---- a/meson.build -+++ b/meson.build -@@ -551,7 +551,7 @@ pkgconfig.generate( - variables: [ - 'datadir=${prefix}/share', - 'pluginsdir=${libdir}/@0@'.format(lib_name), -- 'girdir=${datadir}/gir-1.0', -+ 'girdir=@0@/share/gir-1.0'.format(get_option('prefix-dev')), - 'typelibdir=${libdir}/girepository-1.0', - ], - uninstalled_variables: [ -diff --git a/meson_options.txt b/meson_options.txt -index f9d558c..3cac593 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -9,6 +9,11 @@ option('enable-gir', - choices: ['auto', 'true', 'false'], - description: 'gobject introspection .gir generation' - ) -+option('prefix-dev', -+ type: 'string', -+ value: '', -+ description: 'Like prefix but for dev output of the package' -+) - option('enable-vapi', - type: 'boolean', - value: 'true', diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/pkgs/development/libraries/backward-cpp/default.nix deleted file mode 100644 index 1cea8079024c..000000000000 --- a/pkgs/development/libraries/backward-cpp/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, lib, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "backward"; - version = "1.6"; - - src = fetchFromGitHub { - owner = "bombela"; - repo = "backward-cpp"; - rev = "v${version}"; - sha256 = "sha256-2k5PjwFxgA/2XPqJrPHxgSInM61FBEcieppBx+MAUKw="; - }; - - installPhase = '' - runHook preInstall - - mkdir -p $out/include - cp backward.hpp $out/include - - runHook postInstall - ''; - - meta = with lib; { - description = "Beautiful stack trace pretty printer for C++"; - homepage = "https://github.com/bombela/backward-cpp"; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix deleted file mode 100644 index ce9a3d118973..000000000000 --- a/pkgs/development/libraries/bamf/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ stdenv -, lib -, autoreconfHook -, gitUpdater -, gnome-common -, which -, fetchgit -, libgtop -, libwnck -, glib -, vala -, pkg-config -, libstartup_notification -, gobject-introspection -, gtk-doc -, docbook_xsl -, xorgserver -, dbus -, python3 -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "bamf"; - version = "0.5.6"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchgit { - url = "https://git.launchpad.net/~unity-team/bamf"; - rev = version; - sha256 = "7U+2GcuDjPU8quZjkd8bLADGlG++tl6wSo0mUQkjAXQ="; - }; - - nativeBuildInputs = [ - (python3.withPackages (ps: with ps; [ lxml ])) # Tests - autoreconfHook - dbus - docbook_xsl - gnome-common - gobject-introspection - gtk-doc - pkg-config - vala - which - wrapGAppsHook3 - xorgserver - ]; - - buildInputs = [ - glib - libgtop - libstartup_notification - libwnck - ]; - - # Fix hard-coded path - # https://bugs.launchpad.net/bamf/+bug/1780557 - postPatch = '' - substituteInPlace data/Makefile.am \ - --replace '/usr/lib/systemd/user' '@prefix@/lib/systemd/user' - ''; - - configureFlags = [ - "--enable-gtk-doc" - "--enable-headless-tests" - ]; - - # Fix paths - makeFlags = [ - "INTROSPECTION_GIRDIR=${placeholder "dev"}/share/gir-1.0/" - "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0" - ]; - - # TODO: Requires /etc/machine-id - doCheck = false; - - # Ignore deprecation errors - env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - - passthru.updateScript = gitUpdater { - ignoredVersions = ".ubuntu.*"; - }; - - meta = with lib; { - description = "Application matching framework"; - longDescription = '' - Removes the headache of applications matching - into a simple DBus daemon and c wrapper library. - ''; - homepage = "https://launchpad.net/bamf"; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ davidak ] ++ teams.pantheon.members; - }; -} diff --git a/pkgs/development/libraries/bash/bash-preexec/default.nix b/pkgs/development/libraries/bash/bash-preexec/default.nix deleted file mode 100644 index 166b73b1daf6..000000000000 --- a/pkgs/development/libraries/bash/bash-preexec/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenvNoCC, lib, fetchFromGitHub, bats }: - -let version = "0.5.0"; -in stdenvNoCC.mkDerivation { - pname = "bash-preexec"; - inherit version; - - src = fetchFromGitHub { - owner = "rcaloras"; - repo = "bash-preexec"; - rev = version; - sha256 = "sha256-+FU5n7EkY78X5nUiW3WN9+6Bf6oiPjsG2MSRCleooFs="; - }; - - nativeCheckInputs = [ bats ]; - - dontConfigure = true; - doCheck = true; - dontBuild = true; - - patchPhase = '' - # Needed since the tests expect that HISTCONTROL is set. - sed -i '/setup()/a HISTCONTROL=""' test/bash-preexec.bats - - # Skip tests failing with Bats 1.5.0. - # See https://github.com/rcaloras/bash-preexec/issues/121 - sed -i '/^@test.*IFS/,/^}/d' test/bash-preexec.bats - ''; - - checkPhase = '' - bats test - ''; - - installPhase = '' - install -Dm755 $src/bash-preexec.sh $out/share/bash/bash-preexec.sh - ''; - - meta = with lib; { - description = "preexec and precmd functions for Bash just like Zsh"; - license = licenses.mit; - homepage = "https://github.com/rcaloras/bash-preexec"; - maintainers = [ maintainers.hawkw maintainers.rycee ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/bc-decaf/default.nix b/pkgs/development/libraries/bc-decaf/default.nix deleted file mode 100644 index 162eb8a4dd25..000000000000 --- a/pkgs/development/libraries/bc-decaf/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ cmake -, fetchFromGitLab -, lib -, python3 -, stdenv -}: - -stdenv.mkDerivation rec { - pname = "bc-decaf"; - version = "unstable-2022-07-20"; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - python3 - ]; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - group = "BC"; - owner = "public/external"; - repo = "decaf"; - rev = "876ddb4d465c94f97beba1be450e8538d866cc5d"; - sha256 = "sha256-QFOAgLiPbG2ZdwKoCOrVD5/sPq9IH4rtAWnnk/rZWcs="; - }; - - # Do not build static libraries and do not enable -Werror - cmakeFlags = [ "-DENABLE_STATIC=NO" "-DENABLE_STRICT=NO" ]; - - meta = with lib; { - description = "Elliptic curve library supporting Ed448-Goldilocks and Curve25519. Belledonne Communications' fork for Linphone"; - homepage = "https://gitlab.linphone.org/BC/public/bctoolbox"; - license = licenses.mit; - maintainers = with maintainers; [ thibaultlemaire ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/bcg729/default.nix b/pkgs/development/libraries/bcg729/default.nix deleted file mode 100644 index ff5840b8373f..000000000000 --- a/pkgs/development/libraries/bcg729/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv -, fetchFromGitLab -, cmake -}: - -stdenv.mkDerivation rec { - pname = "bcg729"; - version = "1.1.1"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = pname; - rev = version; - sha256 = "1hal6b3w6f8y5r1wa0xzj8sj2jjndypaxyw62q50p63garp2h739"; - }; - - nativeBuildInputs = [ cmake ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} - ''; - - meta = with lib; { - description = "Opensource implementation of both encoder and decoder of the ITU G729 Annex A/B speech codec"; - homepage = "https://linphone.org/technical-corner/bcg729"; - changelog = "https://gitlab.linphone.org/BC/public/bcg729/raw/${version}/NEWS"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ c0bw3b ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix deleted file mode 100644 index 1da254093b1b..000000000000 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ bcunit -, cmake -, bc-decaf -, fetchFromGitLab -, mbedtls_2 -, lib -, stdenv -}: - -stdenv.mkDerivation rec { - pname = "bctoolbox"; - version = "5.2.109"; - - nativeBuildInputs = [ - cmake - ]; - buildInputs = [ - # Made by BC - bcunit - - # Vendored by BC - bc-decaf - - mbedtls_2 - ]; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = pname; - rev = version; - hash = "sha256-OwwSGzMFwR2ajUUgAy7ea/Q2pWxn3DO72W7ukcjBJnU="; - }; - - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" "-DENABLE_STRICT=NO" ]; - - strictDeps = true; - - meta = with lib; { - description = "Utilities library for Linphone"; - mainProgram = "bctoolbox_tester"; - homepage = "https://gitlab.linphone.org/BC/public/bctoolbox"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ raskin jluttine ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/bearssl/default.nix b/pkgs/development/libraries/bearssl/default.nix deleted file mode 100644 index 7301f8c889ce..000000000000 --- a/pkgs/development/libraries/bearssl/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "bearssl"; - version = "0.6"; - - src = fetchurl { - url = "https://www.bearssl.org/bearssl-${version}.tar.gz"; - sha256 = "057zhgy9w4y8z2996r0pq5k2k39lpvmmvz4df8db8qa9f6hvn1b7"; - }; - - outputs = [ "bin" "lib" "dev" "out" ]; - - enableParallelBuilding = true; - - makeFlags = [ - "AR=${stdenv.cc.targetPrefix}ar" - "CC=${stdenv.cc.targetPrefix}cc" - "LD=${stdenv.cc.targetPrefix}cc" - "LDDLL=${stdenv.cc.targetPrefix}cc" - ] ++ lib.optional stdenv.hostPlatform.isStatic "DLL=no"; - - installPhase = '' - runHook preInstall - install -D build/brssl $bin/brssl - install -D build/testcrypto $bin/testcrypto - install -Dm644 -t $lib/lib build/libbearssl.* - install -Dm644 -t $dev/include inc/*.h - touch $out - runHook postInstall - ''; - - meta = { - homepage = "https://www.bearssl.org/"; - description = "Implementation of the SSL/TLS protocol written in C"; - longDescription = '' - BearSSL is an implementation of the SSL/TLS protocol (RFC 5246) - written in C. It aims at offering the following features: - - * Be correct and secure. In particular, insecure protocol versions and - choices of algorithms are not supported, by design; cryptographic - algorithm implementations are constant-time by default. - - * Be small, both in RAM and code footprint. For instance, a minimal - server implementation may fit in about 20 kilobytes of compiled code - and 25 kilobytes of RAM. - - * Be highly portable. BearSSL targets not only “big” operating systems - like Linux and Windows, but also small embedded systems and even - special contexts like bootstrap code. - - * Be feature-rich and extensible. SSL/TLS has many defined cipher - suites and extensions; BearSSL should implement most of them, and - allow extra algorithm implementations to be added afterwards, - possibly from third parties. - ''; - license = lib.licenses.mit; - platforms = lib.platforms.all; - maintainers = [ ]; - }; - -} diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/development/libraries/beecrypt/default.nix deleted file mode 100644 index f6c61254c101..000000000000 --- a/pkgs/development/libraries/beecrypt/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{lib, stdenv, fetchurl, m4}: - -stdenv.mkDerivation rec { - pname = "beecrypt"; - version = "4.2.1"; - - src = fetchurl { - url = "mirror://sourceforge/beecrypt/beecrypt-${version}.tar.gz"; - sha256 = "0pf5k1c4nsj77jfq5ip0ra1gzx2q47xaa0s008fnn6hd11b1yvr8"; - }; - buildInputs = [ m4 ]; - configureFlags = [ "--disable-optimized" "--enable-static" ]; - - meta = { - platforms = lib.platforms.linux; - license = lib.licenses.lgpl2; - }; -} diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix deleted file mode 100644 index cb16a3fe0fd8..000000000000 --- a/pkgs/development/libraries/belcard/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ bctoolbox -, belr -, cmake -, fetchFromGitLab -, lib -, stdenv -}: - -stdenv.mkDerivation rec { - pname = "belcard"; - version = "5.2.98"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = pname; - rev = version; - sha256 = "sha256-pRNJ1bDS2v0Cn+6cxMeFa0JQ27UZR6kCI9P6gQ5W2GA="; - }; - - buildInputs = [ bctoolbox belr ]; - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DENABLE_STATIC=NO" # Do not build static libraries - "-DENABLE_UNIT_TESTS=NO" # Do not build test executables - ]; - - meta = with lib; { - description = "C++ library to manipulate VCard standard format. Part of the Linphone project"; - homepage = "https://gitlab.linphone.org/BC/public/belcard"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix deleted file mode 100644 index efc62bc9a5a1..000000000000 --- a/pkgs/development/libraries/belle-sip/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ bctoolbox -, belr -, cmake -, fetchFromGitLab -, lib -, libantlr3c -, mbedtls_2 -, stdenv -, zlib -}: - -stdenv.mkDerivation rec { - pname = "belle-sip"; - version = "5.2.98"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = pname; - rev = version; - hash = "sha256-PZnAB+LOlwkiJO0ICqYqn0TgqQY2KdUbgGJRFSzGxdE="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ zlib ]; - - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - - env.NIX_CFLAGS_COMPILE = toString ([ - "-Wno-error=cast-function-type" - "-Wno-error=deprecated-declarations" - "-Wno-error=format-truncation" - "-Wno-error=stringop-overflow" - ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ - # Needed with GCC 12 but problematic with some old GCCs and probably clang - "-Wno-error=use-after-free" - ]); - - propagatedBuildInputs = [ libantlr3c mbedtls_2 bctoolbox belr ]; - - meta = with lib; { - homepage = "https://linphone.org/technical-corner/belle-sip"; - description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers. Part of the Linphone project"; - mainProgram = "belle_sip_tester"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix deleted file mode 100644 index 95517eabed26..000000000000 --- a/pkgs/development/libraries/belr/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ bctoolbox -, cmake -, fetchFromGitLab -, lib -, stdenv -}: - -stdenv.mkDerivation rec { - pname = "belr"; - version = "5.2.98"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = pname; - rev = version; - hash = "sha256-4keVUAsTs1DAhOfV71VD28I0PEHnyvW95blplY690LY="; - }; - - buildInputs = [ bctoolbox ]; - nativeBuildInputs = [ cmake ]; - - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - - meta = with lib; { - description = "Belledonne Communications' language recognition library. Part of the Linphone project"; - homepage = "https://gitlab.linphone.org/BC/public/belr"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/development/libraries/bencode/default.nix b/pkgs/development/libraries/bencode/default.nix deleted file mode 100644 index 1dc68be26052..000000000000 --- a/pkgs/development/libraries/bencode/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, catch2 -, cmake -, expected-lite -, fmt -, gsl-lite -, ninja -}: - -stdenv.mkDerivation rec { - pname = "bencode"; - version = "1.0.1"; - - src = fetchFromGitHub { - owner = "fbdtemme"; - repo = "bencode"; - rev = version; - hash = "sha256-zpxvADZfYTUdlNLMZJSCanPL40EGl9BBCxR7oDhvOTw="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - catch2 - expected-lite - fmt - gsl-lite - ]; - - postPatch = '' - # Disable a test that requires an internet connection. - substituteInPlace tests/CMakeLists.txt \ - --replace "add_subdirectory(cmake_fetch_content)" "" - ''; - - doCheck = true; - - postInstall = '' - rm -rf $out/lib64 - ''; - - meta = with lib; { - description = "Header-only C++20 bencode serialization/deserialization library"; - homepage = "https://github.com/fbdtemme/bencode"; - changelog = "https://github.com/fbdtemme/bencode/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ azahi ]; - platforms = platforms.unix; - # Broken because the default stdenv on these targets doesn't support C++20. - broken = with stdenv; isDarwin || (isLinux && isAarch64); - }; -} diff --git a/pkgs/development/libraries/bencodetools/default.nix b/pkgs/development/libraries/bencodetools/default.nix deleted file mode 100644 index 0a9694367340..000000000000 --- a/pkgs/development/libraries/bencodetools/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv -, lib -, fetchFromGitLab -, python3 -}: - -stdenv.mkDerivation rec { - pname = "bencodetools"; - version = "unstable-2022-05-11"; - - src = fetchFromGitLab { - owner = "heikkiorsila"; - repo = "bencodetools"; - rev = "384d78d297a561dddbbd0f4632f0c74c0db41577"; - sha256 = "1d699q9r33hkmmqkbh92ax54mcdf9smscmc0dza2gp4srkhr83qm"; - }; - - postPatch = '' - patchShebangs configure - substituteInPlace configure \ - --replace 'python_install_option=""' 'python_install_option="--prefix=$out"' - ''; - - enableParallelBuilding = true; - - nativeBuildInputs = [ - python3 - ]; - - # installCheck instead of check due to -install_name'd library on Darwin - doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform; - installCheckTarget = "check"; - - meta = with lib; { - description = "Collection of tools for manipulating bencoded data"; - homepage = "https://gitlab.com/heikkiorsila/bencodetools"; - license = licenses.bsd2; - maintainers = with maintainers; [ OPNA2608 ]; - mainProgram = "bencat"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/blaze/default.nix b/pkgs/development/libraries/blaze/default.nix deleted file mode 100644 index d52176518da9..000000000000 --- a/pkgs/development/libraries/blaze/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, stdenv -, fetchFromBitbucket -, cmake -, blas -, lapack-reference -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "blaze"; - version = "3.8.2"; - - src = fetchFromBitbucket { - owner = "blaze-lib"; - repo = "blaze"; - rev = "v${finalAttrs.version}"; - hash = "sha256-Jl9ZWFqBvLgQwCoMNX3g7z02yc7oYx+d6mbyLBzBJOs="; - }; - - strictDeps = true; - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - blas - lapack-reference - ]; - - meta = with lib; { - description = "high performance C++ math library"; - homepage = "https://bitbucket.org/blaze-lib/blaze"; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ Madouura ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix deleted file mode 100644 index d48669845485..000000000000 --- a/pkgs/development/libraries/blitz/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch -, cmake -, pkg-config -, gfortran -, texinfo -, python3 -, boost - # Select SIMD alignment width (in bytes) for vectorization. -, simdWidth ? 1 - # Pad arrays to simdWidth by default? - # Note: Only useful if simdWidth > 1 -, enablePadding ? false - # Activate serialization through Boost.Serialize? -, enableSerialization ? true - # Activate test-suite? - # WARNING: Some of the tests require up to 1700MB of memory to compile. -, doCheck ? true -}: - -let - inherit (lib) optional optionals; -in -stdenv.mkDerivation rec { - pname = "blitz++"; - version = "1.0.2"; - - src = fetchFromGitHub { - owner = "blitzpp"; - repo = "blitz"; - rev = version; - hash = "sha256-wZDg+4lCd9iHvxuQQE/qs58NorkxZ0+mf+8PKQ57CDE="; - }; - - patches = [ - # https://github.com/blitzpp/blitz/pull/180 - (fetchpatch { - name = "use-cmake-install-full-dir.patch"; - url = "https://github.com/blitzpp/blitz/commit/020f1d768c7fa3265cec244dc28f3dc8572719c5.patch"; - hash = "sha256-8hYFNyWrejjIWPN/HzIOphD4Aq6Soe0FFUBmwV4tpWQ="; - }) - ]; - - nativeBuildInputs = [ - cmake - pkg-config - python3 - texinfo - ]; - - buildInputs = [ gfortran texinfo boost ]; - - cmakeFlags = optional enablePadding "-DARRAY_LENGTH_PADDING=ON" - ++ optional enableSerialization "-DENABLE_SERIALISATION=ON" - ++ optional stdenv.is64bit "-DBZ_FULLY64BIT=ON"; - # FIXME ++ optional doCheck "-DBUILD_TESTING=ON"; - - # skip broken library name detection - ax_boost_user_serialization_lib = lib.optionalString stdenv.isDarwin "boost_serialization"; - - enableParallelBuilding = true; - - inherit doCheck; - - meta = with lib; { - description = "Fast multi-dimensional array library for C++"; - homepage = "https://sourceforge.net/projects/blitz/"; - license = with licenses; [ artistic2 /* or */ bsd3 /* or */ lgpl3Plus ]; - platforms = platforms.unix; - maintainers = with maintainers; [ ToxicFrog ]; - longDescription = '' - Blitz++ is a C++ class library for scientific computing which provides - performance on par with Fortran 77/90. It uses template techniques to - achieve high performance. Blitz++ provides dense arrays and vectors, - random number generators, and small vectors (useful for representing - multicomponent or vector fields). - ''; - }; -} diff --git a/pkgs/development/libraries/blst/default.nix b/pkgs/development/libraries/blst/default.nix deleted file mode 100644 index 2bf2e2c614e7..000000000000 --- a/pkgs/development/libraries/blst/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ stdenv, lib, fetchFromGitHub }: - -stdenv.mkDerivation ( finalAttrs: { - pname = "blst"; - version = "0.3.13"; - - src = fetchFromGitHub { - owner = "supranational"; - repo = "blst"; - rev = "v${finalAttrs.version}"; - hash = "sha256-+Ae2cCVVEXnV/ftVOApxDcXM3COf/4DXXd1AOuGS5uc="; - }; - - buildPhase = '' - runHook preBuild - - ./build.sh ${lib.optionalString stdenv.hostPlatform.isWindows "flavour=mingw64"} - ./build.sh -shared ${lib.optionalString stdenv.hostPlatform.isWindows "flavour=mingw64"} - - runHook postBuild - ''; - installPhase = '' - runHook preInstall - - mkdir -p $out/{lib,include} - for lib in libblst.{a,so,dylib}; do - if [ -f $lib ]; then - cp $lib $out/lib/ - fi - done - cp bindings/{blst.h,blst_aux.h} $out/include - - for lib in blst.dll; do - if [ -f $lib ]; then - mkdir -p $out/bin - cp $lib $out/bin/ - fi - done - - mkdir -p $out/lib/pkgconfig - cat <<EOF > $out/lib/pkgconfig/libblst.pc - prefix=$out - exec_prefix=''\\''${prefix} - libdir=''\\''${exec_prefix}/lib - includedir=''\\''${prefix}/include - - Name: libblst - Description: ${finalAttrs.meta.description} - URL: ${finalAttrs.meta.homepage} - Version: ${finalAttrs.version} - - Cflags: -I''\\''${includedir} - Libs: -L''\\''${libdir} -lblst - Libs.private: - EOF - - runHook postInstall - ''; - - # ensure we have the right install id set. Otherwise the library - # wouldn't be found during install. The alternative would be to work - # lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libblst.dylib"; - # into the setup.sh - postFixup = lib.optionalString stdenv.isDarwin '' - install_name_tool -id $out/lib/libblst.dylib $out/lib/libblst.dylib - ''; - - doCheck = true; - - meta = with lib; { - description = "Multilingual BLS12-381 signature library"; - homepage = "https://github.com/supranational/blst"; - license = licenses.isc; - maintainers = with maintainers; [ iquerejeta yvan-sraka ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/libraries/boca/default.nix b/pkgs/development/libraries/boca/default.nix deleted file mode 100644 index f0a1f3bc6a77..000000000000 --- a/pkgs/development/libraries/boca/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config - -, expat -, libcdio -, libcdio-paranoia -, libpulseaudio -, smooth -, uriparser -, zlib -}: - -stdenv.mkDerivation rec { - pname = "BoCA"; - version = "1.0.7"; - - src = fetchFromGitHub { - owner = "enzo1982"; - repo = "boca"; - rev = "v${version}"; - sha256 = "sha256-HIYUMFj5yiEC+liZLMXD9otPyoEb1sxHlECTYtYXc2I="; - }; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - expat - libcdio - libcdio-paranoia - libpulseaudio - smooth - uriparser - zlib - ]; - - makeFlags = [ - "prefix=$(out)" - ]; - - meta = with lib; { - description = "Component library used by the fre:ac audio converter"; - license = licenses.gpl2Plus; - homepage = "https://github.com/enzo1982/boca"; - maintainers = with maintainers; [ shamilton ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix deleted file mode 100644 index c54cffb52851..000000000000 --- a/pkgs/development/libraries/boolstuff/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config }: -stdenv.mkDerivation rec { - pname = "boolstuff"; - version = "0.1.17"; - - src = fetchurl { - url = "http://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz"; - hash = "sha256-WPFUoTUofigPxTRo6vUbVTEVWMeEPDWszCA05toOX0I="; - }; - - nativeBuildInputs = [ pkg-config ]; - - meta = { - description = "Library for operations on boolean expression binary trees"; - homepage = "http://perso.b2b2c.ca/~sarrazip/dev/boolstuff.html"; - license = "GPL"; - maintainers = [ lib.maintainers.marcweber ]; - mainProgram = "booldnf"; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/boost-ext/boost-sml/default.nix b/pkgs/development/libraries/boost-ext/boost-sml/default.nix deleted file mode 100644 index 7987629b60d3..000000000000 --- a/pkgs/development/libraries/boost-ext/boost-sml/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv -, lib -, cmake -, fetchFromGitHub -, boost -}: - -stdenv.mkDerivation rec { - pname = "boost-sml"; - version = "1.1.11"; - - src = fetchFromGitHub { - owner = "boost-ext"; - repo = "sml"; - rev = "v${version}"; - hash = "sha256-/eR/B8rE+mh5zDPjx1kS9nVJf1rCeHP04QDavh6z6fM="; - }; - - buildInputs = [ boost ]; - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DSML_BUILD_BENCHMARKS=OFF" - "-DSML_BUILD_EXAMPLES=OFF" - "-DSML_BUILD_TESTS=ON" - "-DSML_USE_EXCEPTIONS=ON" - ]; - - doCheck = true; - - meta = with lib; { - description = "Header only state machine library with no dependencies"; - homepage = "https://github.com/boost-ext/sml"; - license = licenses.boost; - maintainers = with maintainers; [ prtzl ]; - platforms = platforms.all; - }; -} - diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 4362bdcb6dab..94ee8c236423 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -52,7 +52,7 @@ let # To avoid library name collisions layout = if taggedLayout then "tagged" else "system"; - needUserConfig = stdenv.hostPlatform != stdenv.buildPlatform || useMpi || (stdenv.isDarwin && enableShared); + needUserConfig = stdenv.hostPlatform != stdenv.buildPlatform || useMpi || (stdenv.hostPlatform.isDarwin && enableShared); b2Args = lib.concatStringsSep " " ([ "--includedir=$dev/include" @@ -107,7 +107,7 @@ stdenv.mkDerivation { patchFlags = []; patches = patches - ++ lib.optional stdenv.isDarwin ./darwin-no-system-python.patch + ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-no-system-python.patch ++ [ ./cmake-paths-173.patch ] ++ lib.optional (version == "1.77.0") (fetchpatch { url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; @@ -177,10 +177,12 @@ stdenv.mkDerivation { # On darwin we need to add the `$out/lib` to the libraries' rpath explicitly, # otherwise the dynamic linker is unable to resolve the reference to @rpath # when the boost libraries want to load each other at runtime. - + lib.optionalString (stdenv.isDarwin && enableShared) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && enableShared) '' cat << EOF >> user-config.jam using clang-darwin : : ${stdenv.cc.targetPrefix}c++ : <linkflags>"-rpath $out/lib/" + <archiver>$AR + <ranlib>$RANLIB ; EOF '' @@ -214,7 +216,7 @@ stdenv.mkDerivation { ''; env = { - NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin "-headerpad_max_install_names"; + NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names"; # copyPkgconfigItems will substitute these in the pkg-config file includedir = "${placeholder "dev"}/include"; libdir = "${placeholder "out"}/lib"; diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix deleted file mode 100644 index dab559afdace..000000000000 --- a/pkgs/development/libraries/bootil/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, premake4 -}: - -stdenv.mkDerivation { - pname = "bootil"; - version = "unstable-2019-11-18"; - - src = fetchFromGitHub { - owner = "garrynewman"; - repo = "bootil"; - rev = "beb4cec8ad29533965491b767b177dc549e62d23"; - sha256 = "1njdj6nvmwf7j2fwqbyvd1cf5l52797vk2wnsliylqdzqcjmfpij"; - }; - - # Avoid guessing where files end up. Just use current directory. - postPatch = '' - substituteInPlace projects/premake4.lua \ - --replace 'location ( os.get() .. "/" .. _ACTION )' 'location ( ".." )' - substituteInPlace projects/bootil.lua \ - --replace 'targetdir ( "../lib/" .. os.get() .. "/" .. _ACTION )' 'targetdir ( ".." )' - ''; - - nativeBuildInputs = [ premake4 ]; - - premakefile = "projects/premake4.lua"; - - installPhase = '' - install -D libbootil_static.a $out/lib/libbootil_static.a - cp -r include $out - ''; - - meta = with lib; { - description = "Garry Newman's personal utility library"; - homepage = "https://github.com/garrynewman/bootil"; - # License unsure - see https://github.com/garrynewman/bootil/issues/21 - license = licenses.free; - maintainers = with maintainers; [ abigailbuccaneer ]; - # Build uses `-msse` and `-mfpmath=sse` - platforms = platforms.all; - badPlatforms = [ "aarch64-linux" ]; - }; -} diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix deleted file mode 100644 index 9bb0967bd5c6..000000000000 --- a/pkgs/development/libraries/boringssl/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, stdenv -, fetchgit -, cmake -, ninja -, perl -, buildGoModule -}: - -# reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md -buildGoModule { - pname = "boringssl"; - version = "unstable-2024-02-15"; - - src = fetchgit { - url = "https://boringssl.googlesource.com/boringssl"; - rev = "5a1a5fbdb865fa58f1da0fd8bf6426f801ea37ac"; - hash = "sha256-nu+5TeWEAVLGhTE15kxmTWZxo0V2elNUy67gdaU3Y+I="; - }; - - nativeBuildInputs = [ cmake ninja perl ]; - - vendorHash = "sha256-074bgtoBRS3SOxLrwZbBdK1jFpdCvF6tRtU1CkrhoDY="; - proxyVendor = true; - - # hack to get both go and cmake configure phase - # (if we use postConfigure then cmake will loop runHook postConfigure) - preBuild = '' - cmakeConfigurePhase - '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - export GOARCH=$(go env GOHOSTARCH) - ''; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ - # Needed with GCC 12 but breaks on darwin (with clang) - "-Wno-error=stringop-overflow" - ]); - - buildPhase = '' - ninjaBuildPhase - ''; - - # CMAKE_OSX_ARCHITECTURES is set to x86_64 by Nix, but it confuses boringssl on aarch64-linux. - cmakeFlags = [ "-GNinja" ] ++ lib.optionals (stdenv.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ]; - - installPhase = '' - mkdir -p $bin/bin $dev $out/lib - - mv tool/bssl $bin/bin - - mv ssl/libssl.a $out/lib - mv crypto/libcrypto.a $out/lib - mv decrepit/libdecrepit.a $out/lib - - mv ../include $dev - ''; - - outputs = [ "out" "bin" "dev" ]; - - meta = with lib; { - description = "Free TLS/SSL implementation"; - mainProgram = "bssl"; - homepage = "https://boringssl.googlesource.com"; - maintainers = [ maintainers.thoughtpolice ]; - license = with licenses; [ openssl isc mit bsd3 ]; - }; -} diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index 81c38c2d982b..8d11ee2b7937 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -6,6 +6,7 @@ docutils, bzip2, zlib, + jitterentropy, darwin, static ? stdenv.hostPlatform.isStatic, # generates static libraries *only* }: @@ -50,13 +51,16 @@ let bzip2 zlib ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ CoreServices Security ] - ); + ) + ++ lib.optionals (lib.versionAtLeast version "3.6.0") [ + jitterentropy + ]; buildTargets = [ "cli" ] @@ -81,6 +85,9 @@ let ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "--cpu=aarch64" + ] + ++ lib.optionals (lib.versionAtLeast version "3.6.0") [ + "--enable-modules=jitter_rng" ]; configurePhase = '' @@ -117,8 +124,8 @@ let in { botan3 = common { - version = "3.5.0"; - hash = "sha256-Z+ja4cokaNkN5OYByH1fMf9JKzjoq4vL0C3fcQTtip8="; + version = "3.6.1"; + hash = "sha256-fLhXXYjSMsdxdHadf54ku0REQWBYWYbuvWbnScuakIk="; # this patch fixes build errors on MacOS with SDK 10.12, recheck to remove this again patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./botan3-macos.patch ]; }; diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index a445a0c53315..acc2d96caf4a 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { libXrandr xorgproto libXi - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa Kernel OpenGL ]; diff --git a/pkgs/development/libraries/boxfort/default.nix b/pkgs/development/libraries/boxfort/default.nix deleted file mode 100644 index 855f86a3c36f..000000000000 --- a/pkgs/development/libraries/boxfort/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, python3Packages }: - -stdenv.mkDerivation rec { - pname = "boxfort"; - version = "0.1.4"; - - src = fetchFromGitHub { - owner = "Snaipe"; - repo = "BoxFort"; - rev = "v${version}"; - sha256 = "jmtWTOkOlqVZ7tFya3IrQjr714Y8TzAVY5Cq+RzDuRs="; - }; - - nativeBuildInputs = [ meson ninja ]; - - preConfigure = '' - patchShebangs ci/isdir.py - ''; - - nativeCheckInputs = with python3Packages; [ cram ]; - - doCheck = true; - - outputs = [ "dev" "out" ]; - - meta = with lib; { - description = "Convenient & cross-platform sandboxing C library"; - homepage = "https://github.com/Snaipe/BoxFort"; - license = licenses.mit; - maintainers = with maintainers; [ thesola10 Yumasi ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/development/libraries/brigand/default.nix deleted file mode 100644 index 3c0778de1d30..000000000000 --- a/pkgs/development/libraries/brigand/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation { - pname = "brigand"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "edouarda"; - repo = "brigand"; - rev = "4db9f665b4ece31b51aaf35b499b2c8e5811efa3"; - sha256 = "14b8r3s24zq0l3addy3irzxs5cyqn3763y5s310lmzzswgj1v7r4"; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Instant compile time C++ 11 metaprogramming library"; - longDescription = '' - Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library. - Everything you were doing with Boost.MPL can be done with Brigand. And if that's not the case, open an issue!''; - homepage = "https://github.com/edouarda/brigand"; - license = licenses.boost; - maintainers = with maintainers; [ pmiddend ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/brunsli/default.nix b/pkgs/development/libraries/brunsli/default.nix deleted file mode 100644 index 03c9b02f7f9f..000000000000 --- a/pkgs/development/libraries/brunsli/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, brotli -}: - -stdenv.mkDerivation rec { - pname = "brunsli"; - version = "0.1"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "google"; - repo = "brunsli"; - rev = "v${version}"; - hash = "sha256-ZcrRz2xSoRepgG8KZYY/JzgONerItW0e6mH1PYsko98="; - }; - - patches = [ - # unvendor brotli - (fetchpatch { - url = "https://cgit.freebsd.org/ports/plain/graphics/brunsli/files/patch-CMakeLists.txt"; - extraPrefix = ""; - hash = "sha256-/WPOG9OcEDj9ObBSXEM8Luq4Rix+PS2MvsYyHhK5mns="; - }) - (fetchpatch { - url = "https://cgit.freebsd.org/ports/plain/graphics/brunsli/files/patch-brunsli.cmake"; - extraPrefix = ""; - hash = "sha256-+HXA9Tin+l2St7rRUEBM0AfhAjSoFxz8UX7hsg12aFg="; - }) - ]; - - postPatch = '' - rm -r third_party - '' + lib.optionalString stdenv.isDarwin '' - rm -r build - ''; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - brotli - ]; - - meta = { - description = "Lossless JPEG repacking library"; - homepage = "https://github.com/google/brunsli"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix deleted file mode 100644 index eb9d146291d9..000000000000 --- a/pkgs/development/libraries/buddy/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, bison }: - -stdenv.mkDerivation rec { - pname = "buddy"; - version = "2.4"; - - src = fetchurl { - url = "mirror://sourceforge/buddy/${pname}-${version}.tar.gz"; - sha256 = "0dl86l9xkl33wnkz684xa9axhcxx2zzi4q5lii0axnb9lsk81pyk"; - }; - - buildInputs = [ bison ]; - patches = [ ./gcc-4.3.3-fixes.patch ]; - configureFlags = [ "CFLAGS=-O3" "CXXFLAGS=-O3" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=register"; - NIX_LDFLAGS = "-lm"; - doCheck = true; - - meta = { - homepage = "https://sourceforge.net/projects/buddy/"; - description = "Binary decision diagram package"; - license = "as-is"; - - platforms = lib.platforms.unix; # Once had cygwin problems - }; -} diff --git a/pkgs/development/libraries/buddy/gcc-4.3.3-fixes.patch b/pkgs/development/libraries/buddy/gcc-4.3.3-fixes.patch deleted file mode 100644 index 2e7efd1c4666..000000000000 --- a/pkgs/development/libraries/buddy/gcc-4.3.3-fixes.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -uwr buddy-2.4.orig/examples/bddcalc/parser.yxx buddy-2.4/examples/bddcalc/parser.yxx ---- buddy-2.4.orig/examples/bddcalc/parser.yxx 2009-07-02 17:12:48.000000000 +0200 -+++ buddy-2.4/examples/bddcalc/parser.yxx 2009-07-02 17:18:36.000000000 +0200 -@@ -7,6 +7,7 @@ - - %{ - #include <string> -+#include <cstdlib> - #include <stdarg.h> - #include <fstream> - #include <getopt.h> -diff -uwr buddy-2.4.orig/src/bddtest.cxx buddy-2.4/src/bddtest.cxx ---- buddy-2.4.orig/src/bddtest.cxx 2009-07-02 17:12:48.000000000 +0200 -+++ buddy-2.4/src/bddtest.cxx 2009-07-02 17:14:05.000000000 +0200 -@@ -28,6 +28,7 @@ - ========================================================================*/ - - #include <string> -+#include <cstdlib> - #include "bdd.h" - #include "bvec.h" - diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 5ba9186dcac9..4a161423c7d3 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL libglut ] - ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL libglut ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa OpenGL ]; postPatch = '' substituteInPlace examples/ThirdPartyLibs/Gwen/CMakeLists.txt \ --replace "-DGLEW_STATIC" "-DGLEW_STATIC -Wno-narrowing" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt ''; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" "-DINSTALL_EXTRA_LIBS=ON" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DOPENGL_FOUND=true" "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework" "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework" diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix index c5f6f3a436d2..bcc963f5b466 100644 --- a/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL libglut ] - ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL libglut ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa OpenGL ]; patches = [ ./gwen-narrowing.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt ''; @@ -32,7 +32,7 @@ stdenv.mkDerivation { "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" "-DINSTALL_EXTRA_LIBS=ON" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DOPENGL_FOUND=true" "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework" "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework" @@ -53,6 +53,6 @@ stdenv.mkDerivation { platforms = platforms.unix; # /tmp/nix-build-bullet-2019-03-27.drv-0/source/src/Bullet3Common/b3Vector3.h:297:7: error: argument value 10880 is outside the valid range [0, 255] [-Wargument-outside-range] # y = b3_splat_ps(y, 0x80); - broken = (stdenv.isDarwin && stdenv.isx86_64); + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); }; } diff --git a/pkgs/development/libraries/bulletml/default.nix b/pkgs/development/libraries/bulletml/default.nix deleted file mode 100644 index 8d562b58e24a..000000000000 --- a/pkgs/development/libraries/bulletml/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib, stdenv, fetchpatch, fetchurl, bison, perl }: - -let - version = "0.0.6"; - debianRevision = "7"; - debianPatch = patchname: hash: fetchpatch { - name = "${patchname}.patch"; - url = "https://sources.debian.org/data/main/b/bulletml/${version}-${debianRevision}/debian/patches/${patchname}.patch"; - sha256 = hash; - }; - - lib_src = fetchurl { - url = "http://shinh.skr.jp/libbulletml/libbulletml-${version}.tar.bz2"; - sha256 = "0yda0zgj2ydgkmby5676f5iiawabxadzh5p7bmy42998sp9g6dvw"; - }; - - cpp_src = fetchurl { - url = "http://shinh.skr.jp/d/d_cpp.tar.bz2"; - sha256 = "1ly9qmbb8q9nyadmdap1gmxs3vkniqgchlv2hw7riansz4gg1agh"; - }; -in - -stdenv.mkDerivation { - pname = "bulletml"; - inherit version; - - srcs = [ lib_src cpp_src ]; - - postUnpack = "mv d_cpp bulletml/"; - sourceRoot = "bulletml"; - - patches = [ - (debianPatch "fixes" "0cnr968n0h50fjmjijx7idsa2pg2pv5cwy6nvfbkx9z8w2zf0mkl") - (debianPatch "bulletml_d" "03d1dgln3gkiw019pxn3gwgjkmvzisq8kp3n6fpn38yfwh4fp4hv") - (debianPatch "d_cpp" "04g9c7c89w7cgrxw75mcbdhzxqmz1716li49mhl98znakchrlb9h") - (debianPatch "warnings" "18px79x4drvm6dy6w6js53nzlyvha7qaxhz5a99b97pyk3qc7i9g") - (debianPatch "makefile" "0z6yxanxmarx0s08gh12pk2wfqjk8g797wmfcqczdv1i6xc7nqzp") - (debianPatch "includes" "1n11j5695hs9pspslf748w2cq5d78s6bwhyl476wp6gcq6jw20bw") - ]; - - makeFlags = [ - "-C src" - ]; - nativeBuildInputs = [ bison perl ]; - hardeningDisable = [ "format" ]; - - installPhase = '' - install -D -m 644 src/bulletml.d "$out"/include/d/bulletml.d - install -d "$out"/include/bulletml/tinyxml - install -m 644 src/*.h "$out"/include/bulletml - install -m 644 src/tinyxml/tinyxml.h "$out"/include/bulletml/tinyxml - cp -r src/boost $out/include/boost - - install -d "$out"/lib - install -m 644 src/libbulletml.{a,so}* "$out"/lib - - install -D -m 644 README "$out"/share/doc/libbulletml/README.jp - install -m 644 README.en "$out"/share/doc/libbulletml - install -m 644 README.bulletml "$out"/share/doc/libbulletml - install -D -m 644 README "$out"/share/licenses/libbulletml/README.jp - install -m 644 README.en "$out"/share/licenses/libbulletml - ''; - - meta = with lib; { - description = "C++ library to handle BulletML easily"; - longDescription = '' - BulletML is the Bullet Markup Language. BulletML can describe the barrage - of bullets in shooting games. - ''; - homepage = "http://www.asahi-net.or.jp/~cs8k-cyu/bulletml/index_e.html"; - license = licenses.bsd3; - maintainers = with maintainers; [ fgaz ]; - # See https://github.com/NixOS/nixpkgs/pull/35482 - # for some attempts in getting it to build on darwin - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix deleted file mode 100644 index 9c1b8ac81cf0..000000000000 --- a/pkgs/development/libraries/bwidget/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, fetchurl, tcl, tk }: - -tcl.mkTclDerivation rec { - pname = "bwidget"; - version = "1.9.16"; - - src = fetchurl { - url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; - sha256 = "sha256-v+ADY3S4QpPSNiCn9t2oZXGBPQx63+2YPB8zflzoGuA="; - }; - - dontBuild = true; - propagatedBuildInputs = [ tk ]; - - installPhase = '' - mkdir -p "$out/lib/bwidget${version}" - cp -R *.tcl lang images "$out/lib/bwidget${version}" - ''; - - meta = { - homepage = "https://sourceforge.net/projects/tcllib"; - description = "High-level widget set for Tcl/Tk"; - maintainers = with lib.maintainers; [ agbrooks ]; - license = lib.licenses.tcltk; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix deleted file mode 100644 index 966190a65567..000000000000 --- a/pkgs/development/libraries/bzrtp/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ bctoolbox -, cmake -, fetchFromGitLab -, sqlite -, lib -, stdenv -}: - -stdenv.mkDerivation rec { - pname = "bzrtp"; - version = "5.2.111"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = pname; - rev = version; - hash = "sha256-sLvvQhJ9uVt/dx57xs9ftY/ETi46xmyGDH8372zpqj8="; - }; - - buildInputs = [ bctoolbox sqlite ]; - nativeBuildInputs = [ cmake ]; - - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=stringop-overflow" - "-Wno-error=unused-parameter" - ]; - - meta = with lib; { - description = "Opensource implementation of ZRTP keys exchange protocol. Part of the Linphone project"; - homepage = "https://gitlab.linphone.org/BC/public/bzrtp"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix deleted file mode 100644 index 854032d56157..000000000000 --- a/pkgs/development/libraries/caf/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssl }: - -stdenv.mkDerivation rec { - pname = "actor-framework"; - version = "1.0.1"; - - src = fetchFromGitHub { - owner = "actor-framework"; - repo = "actor-framework"; - rev = version; - hash = "sha256-ANtqGFctgOAynDiZS9tmWRASVpB2RqRTG7JSXZIDmP8="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ openssl ]; - - cmakeFlags = [ - "-DCAF_ENABLE_EXAMPLES:BOOL=OFF" - ]; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; - - doCheck = !stdenv.isDarwin; - checkTarget = "test"; - - meta = with lib; { - description = "Open source implementation of the actor model in C++"; - homepage = "http://actor-framework.org/"; - license = licenses.bsd3; - platforms = platforms.unix; - changelog = "https://github.com/actor-framework/actor-framework/raw/${version}/CHANGELOG.md"; - maintainers = with maintainers; [ bobakker tobim ]; - }; -} diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix deleted file mode 100644 index 28809ade8ae4..000000000000 --- a/pkgs/development/libraries/cairo/default.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ lib, stdenv, fetchurl, gtk-doc, meson, ninja, pkg-config, python3 -, docbook_xsl, fontconfig, freetype, libpng, pixman, zlib -, x11Support? !stdenv.isDarwin || true, libXext, libXrender -, gobjectSupport ? true, glib -, xcbSupport ? x11Support, libxcb -, darwin -, testers -}: - -let - inherit (lib) optional optionals; -in stdenv.mkDerivation (finalAttrs: let - inherit (finalAttrs) pname version; -in { - pname = "cairo"; - version = "1.18.0"; - - src = fetchurl { - url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz"; - hash = "sha256-JDoHNrl4oz3uKfnMp1IXM7eKZbVBggb+970cPUzxC2Q="; - }; - - outputs = [ "out" "dev" "devdoc" ]; - outputBin = "dev"; # very small - separateDebugInfo = true; - - nativeBuildInputs = [ - gtk-doc - meson - ninja - pkg-config - python3 - ]; - - buildInputs = [ - docbook_xsl - ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - CoreGraphics - CoreText - ApplicationServices - Carbon - ]); - - propagatedBuildInputs = [ fontconfig freetype pixman libpng zlib ] - ++ optionals x11Support [ libXext libXrender ] - ++ optionals xcbSupport [ libxcb ] - ++ optional gobjectSupport glib - ; # TODO: maybe liblzo but what would it be for here? - - mesonFlags = [ - "-Dgtk_doc=true" - - # error: #error config.h must be included before this header - "-Dsymbol-lookup=disabled" - - # Only used in tests, causes a dependency cycle - "-Dspectre=disabled" - - (lib.mesonEnable "glib" gobjectSupport) - (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck) - (lib.mesonEnable "xlib" x11Support) - (lib.mesonEnable "xcb" xcbSupport) - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - "--cross-file=${builtins.toFile "cross-file.conf" '' - [properties] - ipc_rmid_deferred_release = ${ - { - linux = "true"; - freebsd = "true"; - netbsd = "false"; - }.${stdenv.hostPlatform.parsed.kernel.name} or - (throw "Unknown value for ipc_rmid_deferred_release") - } - ''}" - ]; - - preConfigure = '' - patchShebangs version.py - ''; - - enableParallelBuilding = true; - - doCheck = false; # fails - - postInstall = '' - # Work around broken `Requires.private' that prevents Freetype - # `-I' flags to be propagated. - sed -i "$out/lib/pkgconfig/cairo.pc" \ - -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype.dev}/include/freetype2 -I${freetype.dev}/include|g' - '' + lib.optionalString stdenv.isDarwin glib.flattenInclude; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = with lib; { - description = "2D graphics library with support for multiple output devices"; - mainProgram = "cairo-trace"; - longDescription = '' - Cairo is a 2D graphics library with support for multiple output - devices. Currently supported output targets include the X - Window System, XCB, Quartz, Win32, image buffers, PostScript, - PDF, and SVG file output. - - Cairo is designed to produce consistent output on all output - media while taking advantage of display hardware acceleration - when available (e.g., through the X Render Extension). - ''; - homepage = "http://cairographics.org/"; - license = with licenses; [ lgpl2Plus mpl10 ]; - pkgConfigModules = [ - "cairo-pdf" - "cairo-ps" - "cairo-svg" - ] ++ lib.optional gobjectSupport "cairo-gobject"; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/libraries/cairomm/1.16.nix b/pkgs/development/libraries/cairomm/1.16.nix index 83428f0fef9b..cd561d009187 100644 --- a/pkgs/development/libraries/cairomm/1.16.nix +++ b/pkgs/development/libraries/cairomm/1.16.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost # for tests fontconfig - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ]; # Tests fail on Darwin, possibly because of sandboxing. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "C++ bindings for the Cairo vector graphics library"; diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 957cfa26ac73..382770e144f5 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost # for tests fontconfig - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "-Dbuild-tests=true" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "C++ bindings for the Cairo vector graphics library"; diff --git a/pkgs/development/libraries/calcium/default.nix b/pkgs/development/libraries/calcium/default.nix deleted file mode 100644 index 03e27e1fce15..000000000000 --- a/pkgs/development/libraries/calcium/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, mpir -, gmp -, mpfr -, flint -, arb -, antic -}: - -stdenv.mkDerivation rec { - pname = "calcium"; - version = "0.4.1"; - - src = fetchFromGitHub { - owner = "fredrik-johansson"; - repo = pname; - rev = version; - sha256 = "sha256-Ony2FGMnWyNqD7adGeiDtysHNZ4ClMvQ1ijVPSHJmyc="; - }; - - buildInputs = [ mpir gmp mpfr flint arb antic ]; - - configureFlags = [ - "--with-gmp=${gmp}" - "--with-mpir=${mpir}" - "--with-mpfr=${mpfr}" - "--with-flint=${flint}" - "--with-arb=${arb}" - "--with-antic=${antic}" - ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "C library for exact computation with real and complex numbers"; - homepage = "https://fredrikj.net/calcium/"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ smasher164 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix deleted file mode 100644 index 4e96d6a6b993..000000000000 --- a/pkgs/development/libraries/capnproto/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, openssl -, zlib -}: - -stdenv.mkDerivation rec { - pname = "capnproto"; - version = "1.0.2"; - - # release tarballs are missing some ekam rules - src = fetchFromGitHub { - owner = "capnproto"; - repo = "capnproto"; - rev = "v${version}"; - sha256 = "sha256-LVdkqVBTeh8JZ1McdVNtRcnFVwEJRNjt0JV2l7RkuO8="; - }; - - nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ openssl zlib ]; - - meta = with lib; { - homepage = "https://capnproto.org/"; - description = "Cap'n Proto cerealization protocol"; - longDescription = '' - Cap’n Proto is an insanely fast data interchange format and - capability-based RPC system. Think JSON, except binary. Or think Protocol - Buffers, except faster. - ''; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/capstone/4.nix b/pkgs/development/libraries/capstone/4.nix index dd31e9feaf62..836bb47568c3 100644 --- a/pkgs/development/libraries/capstone/4.nix +++ b/pkgs/development/libraries/capstone/4.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index b78b007bc597..9342000c864b 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -7,20 +7,22 @@ stdenv.mkDerivation rec { pname = "capstone"; - version = "5.0.1"; + version = "5.0.3"; src = fetchFromGitHub { owner = "capstone-engine"; repo = "capstone"; rev = version; - sha256 = "sha256-kKmL5sae9ruWGu1gas1mel9qM52qQOD+zLj8cRE3isg="; + hash = "sha256-LZ10czBn5oaKMHQ8xguC6VZa7wvEgPRu6oWt/22QaDs="; }; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + ] ++ lib.optionals stdenv.isDarwin [ (lib.cmakeBool "CAPSTONE_BUILD_MACOS_THIN" true) ]; nativeBuildInputs = [ cmake - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; diff --git a/pkgs/development/libraries/caroline/default.nix b/pkgs/development/libraries/caroline/default.nix deleted file mode 100644 index 6b94df2f64a1..000000000000 --- a/pkgs/development/libraries/caroline/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, vala, meson, ninja, pkg-config, glib, libgee, gtk3 }: - -stdenv.mkDerivation rec { - pname = "caroline"; - version = "0.3.1"; - - src = fetchFromGitHub { - owner = "dcharles525"; - repo = pname; - rev = version; - hash = "sha256-v423h9EC/h6B9VABhkvmYcyYXKPpvqhI8O7ZjbO637k"; - }; - - nativeBuildInputs = [ - vala - meson - ninja - pkg-config - ]; - - buildInputs = [ - glib - libgee - gtk3 - ]; - - meta = with lib; { - description = " A simple Cairo Chart Library for GTK and Vala"; - homepage = "https://github.com/dcharles525/Caroline"; - maintainers = with maintainers; [ grindhold ]; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/catboost/default.nix b/pkgs/development/libraries/catboost/default.nix deleted file mode 100644 index 3824cf046b95..000000000000 --- a/pkgs/development/libraries/catboost/default.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ lib -, config -, fetchFromGitHub -, cmake -, cctools -, libiconv -, llvmPackages -, ninja -, openssl -, python3Packages -, ragel -, yasm -, zlib -, cudaSupport ? config.cudaSupport -, cudaPackages ? {} -, llvmPackages_12 -, pythonSupport ? false -}: -let - inherit (llvmPackages) stdenv; -in - -stdenv.mkDerivation (finalAttrs: { - pname = "catboost"; - version = "1.2.5"; - - src = fetchFromGitHub { - owner = "catboost"; - repo = "catboost"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-2dfCCCa0LheytkLRbYuBd25M320f1kbhBWKIVjslor0="; - }; - - patches = [ - ./remove-conan.patch - ]; - - postPatch = '' - substituteInPlace cmake/common.cmake \ - --replace-fail "\''${RAGEL_BIN}" "${ragel}/bin/ragel" \ - --replace-fail "\''${YASM_BIN}" "${yasm}/bin/yasm" - - shopt -s globstar - for cmakelists in **/CMakeLists.*; do - sed -i "s/OpenSSL::OpenSSL/OpenSSL::SSL/g" $cmakelists - ${lib.optionalString (lib.versionOlder cudaPackages.cudaVersion "11.8") '' - sed -i 's/-gencode=arch=compute_89,code=sm_89//g' $cmakelists - sed -i 's/-gencode=arch=compute_90,code=sm_90//g' $cmakelists - ''} - done - ''; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - cmake - llvmPackages.bintools - ninja - (python3Packages.python.withPackages (ps: with ps; [ six ])) - ragel - yasm - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools - ] ++ lib.optionals cudaSupport (with cudaPackages; [ - cuda_nvcc - ]); - - buildInputs = [ - openssl - zlib - ] ++ lib.optionals stdenv.isDarwin [ - libiconv - ] ++ lib.optionals cudaSupport (with cudaPackages; [ - cuda_cudart - cuda_cccl - libcublas - ]); - - env = { - # catboost requires clang 14+ for build, but does clang 12 for cuda build. - # after bumping the default version of llvm, check for compatibility with the cuda backend and pin it. - # see https://catboost.ai/en/docs/installation/build-environment-setup-for-cmake#compilers,-linkers-and-related-tools - CUDAHOSTCXX = lib.optionalString cudaSupport "${llvmPackages_12.stdenv.cc}/bin/cc"; - NIX_CFLAGS_LINK = lib.optionalString stdenv.isLinux "-fuse-ld=lld"; - NIX_LDFLAGS = "-lc -lm"; - }; - - cmakeFlags = [ - (lib.cmakeFeature "CMAKE_BINARY_DIR" "$out") - (lib.cmakeBool "CMAKE_POSITION_INDEPENDENT_CODE" true) - (lib.cmakeFeature "CATBOOST_COMPONENTS" "app;libs${lib.optionalString pythonSupport ";python-package"}") - (lib.cmakeBool "HAVE_CUDA" cudaSupport) - ]; - - installPhase = '' - runHook preInstall - - mkdir $dev - cp -r catboost $dev - install -Dm555 catboost/app/catboost -t $out/bin - install -Dm444 catboost/libs/model_interface/static/lib/libmodel_interface-static-lib.a -t $out/lib - install -Dm444 catboost/libs/model_interface/libcatboostmodel${stdenv.hostPlatform.extensions.sharedLibrary} -t $out/lib - install -Dm444 catboost/libs/train_interface/libcatboost${stdenv.hostPlatform.extensions.sharedLibrary} -t $out/lib - - runHook postInstall - ''; - - meta = with lib; { - description = "High-performance library for gradient boosting on decision trees"; - longDescription = '' - A fast, scalable, high performance Gradient Boosting on Decision Trees - library, used for ranking, classification, regression and other machine - learning tasks for Python, R, Java, C++. Supports computation on CPU and GPU. - ''; - license = licenses.asl20; - platforms = platforms.unix; - homepage = "https://catboost.ai"; - maintainers = with maintainers; [ PlushBeaver natsukium ]; - mainProgram = "catboost"; - }; -}) diff --git a/pkgs/development/libraries/catboost/remove-conan.patch b/pkgs/development/libraries/catboost/remove-conan.patch deleted file mode 100644 index 44411ad4160b..000000000000 --- a/pkgs/development/libraries/catboost/remove-conan.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ed6c53b220..5c6fb8f157 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -29,7 +29,6 @@ include(cmake/global_flags.cmake) - include(cmake/global_vars.cmake) - include(cmake/archive.cmake) - include(cmake/common.cmake) --include(cmake/conan.cmake) - include(cmake/cuda.cmake) - include(cmake/cython.cmake) - include(cmake/fbs.cmake) -@@ -38,21 +37,6 @@ include(cmake/recursive_library.cmake) - include(cmake/shared_libs.cmake) - include(cmake/swig.cmake) - --if (CMAKE_CROSSCOMPILING) -- include(${PROJECT_BINARY_DIR}/conan_paths.cmake) --else() -- conan_cmake_autodetect(settings) -- conan_cmake_install( -- PATH_OR_REFERENCE ${PROJECT_SOURCE_DIR} -- INSTALL_FOLDER ${PROJECT_BINARY_DIR} -- BUILD missing -- REMOTE conancenter -- SETTINGS ${settings} -- ENV "CONAN_CMAKE_GENERATOR=${CMAKE_GENERATOR}" -- CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}" -- ) --endif() -- - if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-x86_64.txt) - elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND HAVE_CUDA) diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix deleted file mode 100644 index e17bbbaf4b76..000000000000 --- a/pkgs/development/libraries/catch/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: - -stdenv.mkDerivation rec { - pname = "catch"; - version = "1.12.2"; - - src = fetchFromGitHub { - owner = "catchorg"; - repo = "Catch"; - rev = "v${version}"; - sha256 = "1gdp5wm8khn02g2miz381llw3191k7309qj8s3jd6sasj01rhf23"; - }; - - nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DUSE_CPP14=ON" ]; - - patches = [ - # https://github.com/catchorg/Catch2/pull/2151 - (fetchpatch { - url = "https://github.com/catchorg/Catch2/commit/bb6d08323f23a39eb65dd86671e68f4f5d3f2d6c.patch"; - sha256 = "1vhbzx84nrhhf9zlbl6h5zmg3r5w5v833ihlswsysb9wp2i4isc5"; - }) - - # Fix glibc-2.34 build - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/catch1/raw/23276476148a657e7a45ade547f858cbf965a33a/f/catch1-sigstksz.patch"; - sha256 = "sha256-XSsI3iDEZCUSbozlYWC0y/LZ7qr/5zwACpn1jHKD0yU="; - }) - ]; - - doCheck = true; - checkTarget = "test"; - - meta = with lib; { - description = "Multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; - homepage = "http://catch-lib.net"; - license = licenses.boost; - maintainers = with maintainers; [ edwtjo knedlsepp ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/development/libraries/catch2/3.nix index 5985ec519ae4..b005dc3f8116 100644 --- a/pkgs/development/libraries/catch2/3.nix +++ b/pkgs/development/libraries/catch2/3.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "3.7.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - hash = "sha256-U9hv6DaqN5eCMcAQdfFPqWpsbqDFxRQixELSGbNlc0g="; + hash = "sha256-Zt53Qtry99RAheeh7V24Csg/aMW25DT/3CN/h+BaeoM="; }; nativeBuildInputs = [ @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCATCH_DEVELOPMENT_BUILD=ON" "-DCATCH_BUILD_TESTING=${if doCheck then "ON" else "OFF"}" - ] ++ lib.optionals (stdenv.isDarwin && doCheck) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && doCheck) [ # test has a faulty path normalization technique that won't work in # our darwin build environment https://github.com/catchorg/Catch2/issues/1691 "-DCMAKE_CTEST_ARGUMENTS=-E;ApprovalTests" ]; - env = lib.optionalAttrs stdenv.isx86_32 { + env = lib.optionalAttrs stdenv.hostPlatform.isx86_32 { # Tests fail on x86_32 if compiled with x87 floats: https://github.com/catchorg/Catch2/issues/2796 NIX_CFLAGS_COMPILE = "-msse2 -mfpmath=sse"; } // lib.optionalAttrs (stdenv.hostPlatform.isRiscV || stdenv.hostPlatform.isAarch32) { diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix deleted file mode 100644 index 5fa86a9589d4..000000000000 --- a/pkgs/development/libraries/ccrtp/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, ucommon, openssl, libgcrypt }: - -stdenv.mkDerivation rec { - pname = "ccrtp"; - version = "2.1.2"; - - src = fetchurl { - url = "mirror://gnu/ccrtp/ccrtp-${version}.tar.gz"; - sha256 = "17ili8l7zqbbkzr1rcy4hlnazkf50mds41wg6n7bfdsx3c7cldgh"; - }; - - nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ ucommon openssl libgcrypt ]; - - configureFlags = [ - "--disable-demos" - ]; - - doCheck = true; - - meta = { - description = "Implementation of the IETF real-time transport protocol (RTP)"; - homepage = "https://www.gnu.org/software/ccrtp/"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ marcweber ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/cctag/default.nix b/pkgs/development/libraries/cctag/default.nix index 238821b6af91..8b37633acfcb 100644 --- a/pkgs/development/libraries/cctag/default.nix +++ b/pkgs/development/libraries/cctag/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; # Tests are broken on Darwin (linking issue) - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Detection of CCTag markers made up of concentric circles"; diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix index c0f8a58a18d9..4ad0bf6b8034 100644 --- a/pkgs/development/libraries/cctz/default.nix +++ b/pkgs/development/libraries/cctz/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - buildInputs = lib.optional stdenv.isDarwin Foundation; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Foundation; installTargets = [ "install_hdrs" ] ++ lib.optional (!stdenv.hostPlatform.isStatic) "install_shared_lib" ++ lib.optional stdenv.hostPlatform.isStatic "install_lib"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so ''; diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix deleted file mode 100644 index a170a0f92449..000000000000 --- a/pkgs/development/libraries/cddlib/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, gmp -, autoreconfHook -, texliveSmall -}: - -stdenv.mkDerivation rec { - pname = "cddlib"; - version = "0.94m"; - src = fetchFromGitHub { - owner = "cddlib"; - repo = "cddlib"; - rev = version; - sha256 = "09s8323h5w9j6mpl1yc6lm770dkskfxd2ayyafkcjllmnncxzfa0"; - }; - buildInputs = [gmp]; - nativeBuildInputs = [ - autoreconfHook - texliveSmall # for building the documentation - ]; - # No actual checks yet (2018-05-05), but maybe one day. - # Requested here: https://github.com/cddlib/cddlib/issues/25 - doCheck = true; - meta = with lib; { - description = "Implementation of the Double Description Method for generating all vertices of a convex polyhedron"; - license = licenses.gpl2Plus; - maintainers = teams.sage.members; - platforms = platforms.unix; - homepage = "https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html"; - }; -} diff --git a/pkgs/development/libraries/cdo/default.nix b/pkgs/development/libraries/cdo/default.nix deleted file mode 100644 index 3de126d111ef..000000000000 --- a/pkgs/development/libraries/cdo/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchurl, curl, hdf5, netcdf, eccodes, python3 -, # build, install and link to a CDI library [default=no] - enable_cdi_lib ? false -, # build a completely statically linked CDO binary - enable_all_static ? stdenv.hostPlatform.isStatic -, # Use CXX as default compiler [default=no] - enable_cxx ? false -}: - -stdenv.mkDerivation rec { - pname = "cdo"; - version = "2.4.2"; - - # Dependencies - buildInputs = [ curl netcdf hdf5 python3 ]; - - src = fetchurl { - url = "https://code.mpimet.mpg.de/attachments/download/29481/${pname}-${version}.tar.gz"; - sha256 = "sha256-TfH+K4+S9Uwn6585nt+rQNkyIAWmcyyhUk71wWJ6xOc="; - }; - - configureFlags = [ - "--with-netcdf=${netcdf}" - "--with-hdf5=${hdf5}" - "--with-eccodes=${eccodes}" - ] - ++ lib.optional enable_cdi_lib "--enable-cdi-lib" - ++ lib.optional enable_all_static "--enable-all-static" - ++ lib.optional enable_cxx "--enable-cxx"; - - # address error: 'TARGET_OS_MACCATALYST' is not defined, - # evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] - # we don't want to appear to be a catalyst build; - # we are a TARGET_OS_MAC - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DTARGET_OS_MACCATALYST=0"; - - meta = with lib; { - description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data"; - mainProgram = "cdo"; - longDescription = '' - Supported data formats are GRIB 1/2, netCDF 3/4, SERVICE, EXTRA and IEG. - There are more than 600 operators available. - ''; - homepage = "https://code.mpimet.mpg.de/projects/cdo/"; - license = licenses.bsd3; - maintainers = [ maintainers.ltavard ]; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix deleted file mode 100644 index af52aabca79b..000000000000 --- a/pkgs/development/libraries/cegui/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, ogre -, freetype -, boost -, expat -, darwin -, libiconv -, unstableGitUpdater -}: - -stdenv.mkDerivation { - pname = "cegui"; - version = "0-unstable-2023-03-18"; - - src = fetchFromGitHub { - owner = "paroj"; - repo = "cegui"; - rev = "186ce900e293b98f2721c11930248a8de54aa338"; - hash = "sha256-RJ4MnxklcuxC+ZYEbfma5RDc2aeJ95LuTwNk+FnEhdo="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - ogre - freetype - boost - expat - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.Foundation - libiconv - ]; - - cmakeFlags = [ - "-DCEGUI_OPTION_DEFAULT_IMAGECODEC=OgreRenderer-0" - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ - "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" - ]; - - passthru.updateScript = unstableGitUpdater { - branch = "v0"; - # The above branch is separate from the branch with the latest tags, so the updater doesn't pick them up - # This is what would be used to handle upstream's format, if it was able to see the tags - # tagConverter = writeShellScript "cegui-tag-converter.sh" '' - # sed -e 's/^v//g' -e 's/-/./g' - # ''; - hardcodeZeroVersion = true; - }; - - meta = with lib; { - homepage = "http://cegui.org.uk/"; - description = "C++ Library for creating GUIs"; - mainProgram = "CEGUISampleFramework-0.9999"; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix deleted file mode 100644 index 3ad9c33bb3cf..000000000000 --- a/pkgs/development/libraries/cglm/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "cglm"; - version = "0.9.4"; - - src = fetchFromGitHub { - owner = "recp"; - repo = "cglm"; - rev = "v${version}"; - sha256 = "sha256-VQgnc3DSZoY1ounc9fj3Mju52noI0JZ7ck8FqWpEgY8="; - }; - - nativeBuildInputs = [ cmake ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ - --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} - ''; - - meta = with lib; { - homepage = "https://github.com/recp/cglm"; - description = "Highly Optimized Graphics Math (glm) for C"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix deleted file mode 100644 index 6c536ec57671..000000000000 --- a/pkgs/development/libraries/cgui/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, texinfo, allegro, perl, libX11 }: - -stdenv.mkDerivation rec { - pname = "cgui"; - version="2.1.0"; - - src = fetchurl { - url = "mirror://sourceforge/project/cgui/${version}/${pname}-${version}.tar.gz"; - sha256 = "1pp1hvidpilq37skkmbgba4lvzi01rasy04y0cnas9ck0canv00s"; - }; - - buildInputs = [ texinfo allegro perl libX11 ]; - - configurePhase = '' - sh fix.sh unix - ''; - - hardeningDisable = [ "format" ]; - - makeFlags = [ "SYSTEM_DIR=$(out)" ]; - - meta = with lib; { - description = "Multiplatform basic GUI library"; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; - license = licenses.free; - }; -} diff --git a/pkgs/development/libraries/charls/default.nix b/pkgs/development/libraries/charls/default.nix deleted file mode 100644 index f8591dc92bca..000000000000 --- a/pkgs/development/libraries/charls/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "charls"; - version = "2.4.2"; - - src = fetchFromGitHub { - owner = "team-charls"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-c1wrk6JLcAH7TFPwjARlggaKXrAsLWyUQF/3WHlqoqg="; - }; - - postPatch = '' - substituteInPlace src/charls-template.pc \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; - - # note this only runs some basic tests, not the full test suite, - # but the recommended `charlstest -unittest` fails with an inscrutable C++ IO error - doCheck = true; - - meta = with lib; { - homepage = "https://github.com/team-charls/charls"; - description = "JPEG-LS library implementation in C++"; - maintainers = with maintainers; [ bcdarwin ]; - license = licenses.bsd3; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 14b4e549264b..82aca7c4ec01 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -17,19 +17,19 @@ stdenv.mkDerivation rec { # Test can randomly fail: https://hydra.nixos.org/build/7243912 doCheck = false; - buildInputs = lib.optional stdenv.isDarwin CoreServices; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreServices; meta = with lib; { description = "Unit testing framework for C"; - longDescription = - '' Check is a unit testing framework for C. It features a simple - interface for defining unit tests, putting little in the way of the - developer. Tests are run in a separate address space, so Check can - catch both assertion failures and code errors that cause - segmentation faults or other signals. The output from unit tests - can be used within source code editors and IDEs. - ''; + longDescription = '' + Check is a unit testing framework for C. It features a simple + interface for defining unit tests, putting little in the way of the + developer. Tests are run in a separate address space, so Check can + catch both assertion failures and code errors that cause + segmentation faults or other signals. The output from unit tests + can be used within source code editors and IDEs. + ''; homepage = "https://libcheck.github.io/check/"; diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix deleted file mode 100644 index a0b34f0aa30f..000000000000 --- a/pkgs/development/libraries/chipmunk/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, libglut, libGLU, libGL, glfw2, glew, libX11, xorgproto -, libXi, libXmu, fetchpatch, libXrandr -}: - -stdenv.mkDerivation rec { - pname = "chipmunk"; - majorVersion = "7"; - version = "${majorVersion}.0.3"; - - src = fetchurl { - url = "https://chipmunk-physics.net/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz"; - sha256 = "06j9cfxsyrrnyvl7hsf55ac5mgff939mmijliampphlizyg0r2q4"; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/slembcke/Chipmunk2D/commit/9a051e6fb970c7afe09ce2d564c163b81df050a8.patch"; - sha256 = "0ps8bjba1k544vcdx5w0qk7gcjq94yfigxf67j50s63yf70k2n70"; - }) - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = - [ libglut libGLU libGL glfw2 glew libX11 xorgproto libXi libXmu libXrandr ]; - - postInstall = '' - mkdir -p $out/bin - cp demo/chipmunk_demos $out/bin - ''; - - meta = with lib; { - description = "Fast and lightweight 2D game physics library"; - mainProgram = "chipmunk_demos"; - homepage = "http://chipmunk2d.net/"; - license = licenses.mit; - platforms = platforms.unix; # supports Windows and MacOS as well, but those require more work - }; -} diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix deleted file mode 100644 index df65e78ff51f..000000000000 --- a/pkgs/development/libraries/chmlib/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "chmlib"; - version = "0.40a"; - - src = fetchFromGitHub { - owner = "jedwing"; - repo = "CHMLib"; - rev = "2bef8d063ec7d88a8de6fd9f0513ea42ac0fa21f"; - sha256 = "1hah0nw0l05npva2r35ywwd0kzyiiz4vamghm6d71h8170iva6m9"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - meta = with lib; { - homepage = "http://www.jedrea.com/chmlib"; - license = licenses.lgpl2; - description = "Library for dealing with Microsoft ITSS/CHM format files"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix deleted file mode 100644 index 934a4b04a96b..000000000000 --- a/pkgs/development/libraries/chromaprint/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, fetchpatch2 -, cmake -, ninja -, ffmpeg_7 -, darwin -, zlib -}: - -stdenv.mkDerivation rec { - pname = "chromaprint"; - version = "1.5.1"; - - src = fetchurl { - url = "https://github.com/acoustid/chromaprint/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-oarY+juLGLeNN1Wzdn+v+au2ckLgG0eOyaZOGQ8zXhw="; - }; - - patches = [ - # Use FFmpeg 5.x - # https://github.com/acoustid/chromaprint/pull/120 - (fetchpatch { - url = "https://github.com/acoustid/chromaprint/commit/8ccad6937177b1b92e40ab8f4447ea27bac009a7.patch"; - hash = "sha256-yO2iWmU9s2p0uJfwIdmk3jZ5HXBIQZ/NyOqG+Y5EHdg="; - excludes = [ "package/build.sh" ]; - }) - # ffmpeg5 fix for issue #122 - # https://github.com/acoustid/chromaprint/pull/125 - (fetchpatch { - url = "https://github.com/acoustid/chromaprint/commit/aa67c95b9e486884a6d3ee8b0c91207d8c2b0551.patch"; - hash = "sha256-dLY8FBzBqJehAofE924ayZK0HA/aKiuFhEFxL7dg6rY="; - }) - # Fix for FFmpeg 7 - (fetchpatch2 { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/chromaprint/-/raw/74ae4c7faea2114f2d70a57755f714e348476d28/ffmpeg-7.patch"; - hash = "sha256-io+dzhDNlz+2hWhNfsyePKLQjiUvSzbv10lHVKumTEk="; - }) - ]; - - nativeBuildInputs = [ cmake ninja ]; - - buildInputs = [ ffmpeg_7 ] ++ lib.optionals stdenv.isDarwin - (with darwin.apple_sdk.frameworks; [ Accelerate CoreGraphics CoreVideo zlib ]); - - cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; - - meta = with lib; { - homepage = "https://acoustid.org/chromaprint"; - description = "AcoustID audio fingerprinting library"; - mainProgram = "fpcalc"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/cista/default.nix b/pkgs/development/libraries/cista/default.nix deleted file mode 100644 index 7bc5590feddb..000000000000 --- a/pkgs/development/libraries/cista/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, -}: - -stdenv.mkDerivation rec { - pname = "cista"; - version = "0.15"; - - src = fetchFromGitHub { - owner = "felixguendling"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-+DcxnckoXVSc+gXt21fxKkx4J1khLsQPuxYH9CBRrfE="; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DCISTA_INSTALL=ON" ]; - - meta = with lib; { - homepage = "https://cista.rocks"; - description = "Simple, high-performance, zero-copy C++ serialization & reflection library"; - license = licenses.mit; - maintainers = [ maintainers.sigmanificient ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/civetweb/default.nix b/pkgs/development/libraries/civetweb/default.nix deleted file mode 100644 index f6fe616957d6..000000000000 --- a/pkgs/development/libraries/civetweb/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "civetweb"; - version = "1.15"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Qh6BGPk7a01YzCeX42+Og9M+fjXRs7kzNUCyT4mYab4="; - }; - - outputs = [ "out" "dev" ]; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - ]; - - # The existence of the "build" script causes `mkdir -p build` to fail: - # mkdir: cannot create directory 'build': File exists - preConfigure = '' - rm build - ''; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DCIVETWEB_ENABLE_CXX=ON" - "-DCIVETWEB_ENABLE_IPV6=ON" - - # The civetweb unit tests rely on downloading their fork of libcheck. - "-DCIVETWEB_BUILD_TESTING=OFF" - ]; - - meta = { - description = "Embedded C/C++ web server"; - mainProgram = "civetweb"; - homepage = "https://github.com/civetweb/civetweb"; - license = [ lib.licenses.mit ]; - }; -} diff --git a/pkgs/development/libraries/cjose/default.nix b/pkgs/development/libraries/cjose/default.nix deleted file mode 100644 index 3b0d448a3530..000000000000 --- a/pkgs/development/libraries/cjose/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, autoreconfHook -, pkg-config -, doxygen -, check -, jansson -, openssl -}: - -stdenv.mkDerivation rec { - pname = "cjose"; - version = "0.6.2.2"; - - src = fetchFromGitHub { - owner = "zmartzone"; - repo = "cjose"; - rev = "v${version}"; - sha256 = "sha256-vDvCxMpgCdteGvNxy2HCNRaxbhxOuTadL0nM2wkFHtk="; - }; - - patches = [ - # avoid using empty prototypes; support Clang 15 and XCode 14.3 - https://github.com/OpenIDC/cjose/pull/19 - (fetchpatch { - url = "https://github.com/OpenIDC/cjose/commit/63e90cf464d6a470e26886435e8d7d96a66747f6.patch"; - hash = "sha256-+C5AIejb9InOGiOgUNfuP89J18O71rnq1pXyroxEDFQ="; - }) - ]; - - nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; - buildInputs = [ jansson openssl ]; - nativeCheckInputs = [ check ]; - - configureFlags = [ - "--with-jansson=${jansson}" - "--with-openssl=${openssl.dev}" - ]; - - meta = with lib; { - homepage = "https://github.com/zmartzone/cjose"; - changelog = "https://github.com/zmartzone/cjose/blob/${version}/CHANGELOG.md"; - description = "C library for Javascript Object Signing and Encryption. This is a maintained fork of the original project"; - license = licenses.mit; - maintainers = with maintainers; [ midchildan ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/cjson/default.nix b/pkgs/development/libraries/cjson/default.nix deleted file mode 100644 index 38be1c30cd46..000000000000 --- a/pkgs/development/libraries/cjson/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "cjson"; - version = "1.7.18"; - - src = fetchFromGitHub { - owner = "DaveGamble"; - repo = "cJSON"; - rev = "v${version}"; - sha256 = "sha256-UgUWc/+Zie2QNijxKK5GFe4Ypk97EidG8nTiiHhn5Ys="; - }; - - nativeBuildInputs = [ cmake ]; - - # cJSON actually uses C99 standard, not C89 - # https://github.com/DaveGamble/cJSON/issues/275 - postPatch = '' - substituteInPlace CMakeLists.txt --replace -std=c89 -std=c99 - ''; - - meta = with lib; { - homepage = "https://github.com/DaveGamble/cJSON"; - description = "Ultralightweight JSON parser in ANSI C"; - license = licenses.mit; - maintainers = [ maintainers.matthiasbeyer ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix deleted file mode 100644 index 1f98635f15dd..000000000000 --- a/pkgs/development/libraries/cl/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }: - -stdenv.mkDerivation rec { - version = "1.2.4"; - pname = "cl"; - - src = fetchFromGitHub { - owner = "tonyrog"; - repo = "cl"; - rev = "cl-${version}"; - sha256 = "1gwkjl305a0231hz3k0w448dsgbgdriaq764sizs5qfn59nzvinz"; - }; - - # https://github.com/tonyrog/cl/issues/39 - postPatch = '' - substituteInPlace c_src/Makefile \ - --replace "-m64" "" - ''; - - buildInputs = [ erlang rebar opencl-headers ocl-icd ]; - - buildPhase = '' - rebar compile - ''; - - # 'cp' line taken from Arch recipe - # https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/erlang-sdl - installPhase = '' - DIR=$out/lib/erlang/lib/${pname}-${version} - mkdir -p $DIR - cp -ruv c_src doc ebin include priv src $DIR - ''; - - meta = with lib; { - homepage = "https://github.com/tonyrog/cl"; - description = "OpenCL binding for Erlang"; - license = licenses.mit; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/clanlib/default.nix b/pkgs/development/libraries/clanlib/default.nix deleted file mode 100644 index 6369128d5a05..000000000000 --- a/pkgs/development/libraries/clanlib/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - autoreconfHook, - libGL, - libpng, - pkg-config, - xorg, - freetype, - fontconfig, - alsa-lib, - libXrender, -}: - -stdenv.mkDerivation rec { - pname = "clanlib"; - version = "4.1.0"; - - src = fetchFromGitHub { - repo = "ClanLib"; - owner = "sphair"; - rev = "v${version}"; - 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 - xorg.xorgproto - freetype - fontconfig - alsa-lib - libXrender - ]; - - meta = { - homepage = "https://github.com/sphair/ClanLib"; - description = "Cross platform toolkit library with a primary focus on game creation"; - 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/clap/default.nix b/pkgs/development/libraries/clap/default.nix deleted file mode 100644 index 1fc6d5a2d420..000000000000 --- a/pkgs/development/libraries/clap/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "clap"; - version = "1.2.1"; - - src = fetchFromGitHub { - owner = "free-audio"; - repo = "clap"; - rev = finalAttrs.version; - hash = "sha256-3VDl6hMSRFrMtYeiUMoZhJf0wkMxVs9ZELKJqLGYJ+g="; - }; - - postPatch = '' - substituteInPlace clap.pc.in \ - --replace '$'"{prefix}/@CMAKE_INSTALL_INCLUDEDIR@" '@CMAKE_INSTALL_FULL_INCLUDEDIR@' - ''; - - nativeBuildInputs = [ cmake ]; - - passthru.tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; - - meta = with lib; { - description = "Clever Audio Plugin API interface headers"; - homepage = "https://cleveraudio.org/"; - pkgConfigModules = [ "clap" ]; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ ris ]; - }; -}) diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix deleted file mode 100644 index bbe342d98198..000000000000 --- a/pkgs/development/libraries/classads/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pcre }: - -stdenv.mkDerivation rec { - pname = "classads"; - version = "1.0.10"; - - src = fetchurl { - url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz"; - sha256 = "1czgj53gnfkq3ncwlsrwnr4y91wgz35sbicgkp4npfrajqizxqnd"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ pcre ]; - - configureFlags = [ - "--enable-namespace" "--enable-flexible-member" - ]; - - # error: use of undeclared identifier 'finite'; did you mean 'isfinite'? - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite"; - - meta = { - homepage = "http://www.cs.wisc.edu/condor/classad/"; - description = "Classified Advertisements library provides a generic means for matching resources"; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/clfft/default.nix b/pkgs/development/libraries/clfft/default.nix deleted file mode 100644 index 824449b0fafc..000000000000 --- a/pkgs/development/libraries/clfft/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost, opencl-clhpp, ocl-icd, darwin }: - -let - inherit (darwin.apple_sdk.frameworks) OpenCL; -in -stdenv.mkDerivation rec { - pname = "clfft"; - version = "2.12.2"; - - src = fetchFromGitHub { - owner = "clMathLibraries"; - repo = "clFFT"; - rev = "v${version}"; - hash = "sha256-yp7u6qhpPYQpBw3d+VLg0GgMyZONVII8BsBCEoRZm4w="; - }; - - sourceRoot = "${src.name}/src"; - - postPatch = '' - sed -i '/-m64/d;/-m32/d' CMakeLists.txt - ''; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ fftw fftwFloat boost ] - ++ lib.optionals stdenv.isLinux [ opencl-clhpp ocl-icd ] - ++ lib.optionals stdenv.isDarwin [ OpenCL ]; - - # https://github.com/clMathLibraries/clFFT/issues/237 - CXXFLAGS = "-std=c++98"; - - meta = with lib; { - description = "Library containing FFT functions written in OpenCL"; - longDescription = '' - clFFT is a software library containing FFT functions written in OpenCL. - In addition to GPU devices, the library also supports running on CPU devices to facilitate debugging and heterogeneous programming. - ''; - license = licenses.asl20; - homepage = "http://clmathlibraries.github.io/clFFT/"; - platforms = platforms.unix; - maintainers = with maintainers; [ chessai ]; - }; -} diff --git a/pkgs/development/libraries/clipp/clipp.pc b/pkgs/development/libraries/clipp/clipp.pc deleted file mode 100644 index 38c07e5ba162..000000000000 --- a/pkgs/development/libraries/clipp/clipp.pc +++ /dev/null @@ -1,9 +0,0 @@ -prefix=@out@ -includedir=${prefix}/include - -Name: @pname@ -Description: Easy to use, powerful and expressive command line argument \ -handling for C++11/14/17 -URL: https://github.com/muellan/clipp -Version: @version@ -Cflags: -I${includedir} diff --git a/pkgs/development/libraries/clipp/default.nix b/pkgs/development/libraries/clipp/default.nix deleted file mode 100644 index 12b393e597d4..000000000000 --- a/pkgs/development/libraries/clipp/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "clipp"; - version = "1.2.3"; - - src = fetchFromGitHub { - owner = "muellan"; - repo = pname; - rev = "v${version}"; - sha256 = "0rq80ba2krwzvcg4r2g1al88453c7lz6ziri2s1ygv8inp9r775s"; - }; - - installPhase = '' - mkdir -p $out/share/pkgconfig - cp -r include $out/ - substitute ${./clipp.pc} $out/share/pkgconfig/clipp.pc \ - --subst-var out \ - --subst-var pname \ - --subst-var version - ''; - - meta = with lib; { - description = "Easy to use, powerful and expressive command line argument handling for C++11/14/17"; - homepage = "https://github.com/muellan/clipp"; - license = licenses.mit; - maintainers = with maintainers; [ xbreak ]; - platforms = with platforms; all; - }; -} diff --git a/pkgs/development/libraries/clipper/default.nix b/pkgs/development/libraries/clipper/default.nix deleted file mode 100644 index 8dc649b6b5fe..000000000000 --- a/pkgs/development/libraries/clipper/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, ninja, unzip }: - -stdenv.mkDerivation rec { - version = "6.4.2"; - pname = "Clipper"; - src = fetchurl { - url = "mirror://sourceforge/polyclipping/clipper_ver${version}.zip"; - sha256 = "09q6jc5k7p9y5d75qr2na5d1gm0wly5cjnffh127r04l47c20hx1"; - }; - - sourceRoot = "cpp"; - - nativeBuildInputs = [ cmake ninja unzip ]; - - meta = with lib; { - description = "Polygon and line clipping and offsetting library (C++, C#, Delphi)"; - longDescription = '' - The Clipper library performs line & polygon clipping - intersection, union, difference & exclusive-or, - and line & polygon offsetting. The library is based on Vatti's clipping algorithm. - ''; - homepage = "https://sourceforge.net/projects/polyclipping"; - license = licenses.boost; - maintainers = with maintainers; [ mpickering ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix deleted file mode 100644 index ae3ed853a026..000000000000 --- a/pkgs/development/libraries/cln/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, gccStdenv, fetchurl, gmp }: - -gccStdenv.mkDerivation rec { - pname = "cln"; - version = "1.3.7"; - - src = fetchurl { - url = "${meta.homepage}${pname}-${version}.tar.bz2"; - sha256 = "sha256-fH7YR0lYM35N9btX6lF2rQNlAEy7mLYhdlvEYGoQ2Gs="; - }; - - buildInputs = [ gmp ]; - - meta = with lib; { - description = "C/C++ library for numbers, a part of GiNaC"; - mainProgram = "pi"; - homepage = "https://www.ginac.de/CLN/"; - license = licenses.gpl2; - platforms = platforms.unix; # Once had cygwin problems - }; -} diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index d6049d284513..6fc4ac289677 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # required for darwin and linux-musl ./pthread-include.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./fix-darwin.patch # see https://bugs.gentoo.org/869170 @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ]; # see https://github.com/macports/macports-ports/commit/236d43f2450c6be52dc42fd3a2bbabbaa5136201 - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/shared/CMakeLists.txt --replace 'fstati64;_fstati64;fstat64;fstat;_fstat' 'fstat;_fstat' substituteInPlace src/shared/CMakeLists.txt --replace 'stati64;_stati64;stat64;stat;_stat' 'stat;_stat' ''; diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix deleted file mode 100644 index 7800e82ff27a..000000000000 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ fetchurl -, lib -, stdenv -, pkg-config -, meson -, ninja -, gobject-introspection -, clutter -, gtk3 -, gnome -}: - -let - pname = "clutter-gtk"; - version = "1.8.4"; -in - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j"; - }; - - outputs = [ "out" "dev" ]; - - propagatedBuildInputs = [ clutter gtk3 ]; - nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ]; - - postPatch = '' - # ld: malformed 32-bit x.y.z version number: =1 - substituteInPlace meson.build \ - --replace "host_system == 'darwin'" "false" - ''; - - postBuild = "rm -rf $out/share/gtk-doc"; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = { - description = "Clutter-GTK"; - homepage = "http://www.clutter-project.org/"; - license = lib.licenses.lgpl2Plus; - maintainers = [ ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix deleted file mode 100644 index d6720eb181f4..000000000000 --- a/pkgs/development/libraries/clutter/default.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, libGLU -, libGL -, libX11 -, libXext -, libXfixes -, libXdamage -, libXcomposite -, libXi -, libxcb -, cogl -, pango -, atk -, json-glib -, gobject-introspection -, gtk3 -, gnome -, libinput -, libgudev -, libxkbcommon -}: - -let - pname = "clutter"; - version = "1.26.4"; -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1rn4cd1an6a9dfda884aqpcwcgq8dgydpqvb19nmagw4b70zlj4b"; - }; - - outputs = [ "out" "dev" ]; - - buildInputs = [ gtk3 ]; - nativeBuildInputs = [ pkg-config gobject-introspection ]; - propagatedBuildInputs = [ - cogl - pango - atk - json-glib - gobject-introspection - ] ++ lib.optionals (!stdenv.isDarwin) [ - libX11 - libGL - libGLU - libXext - libXfixes - libXdamage - libXcomposite - libXi - libxcb - libinput - libgudev - libxkbcommon - ]; - - configureFlags = [ - "--enable-introspection" # needed by muffin AFAIK - ] ++ lib.optionals stdenv.isDarwin [ - "--without-x" - "--enable-x11-backend=no" - "--enable-quartz-backend=yes" - ]; - - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; - - #doCheck = true; # no tests possible without a display - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = { - description = "Library for creating fast, dynamic graphical user interfaces"; - - longDescription = - '' Clutter is free software library for creating fast, compelling, - portable, and dynamic graphical user interfaces. It is a core part - of MeeGo, and is supported by the open source community. Its - development is sponsored by Intel. - - Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use - on mobile and embedded platforms), but wraps an easy to use, - efficient, flexible API around GL's complexity. - - Clutter enforces no particular user interface style, but provides a - rich, generic foundation for higher-level toolkits tailored to - specific needs. - ''; - - license = lib.licenses.lgpl2Plus; - homepage = "http://www.clutter-project.org/"; - - maintainers = [ ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/cm256cc/default.nix b/pkgs/development/libraries/cm256cc/default.nix deleted file mode 100644 index 0e8b03aa7236..000000000000 --- a/pkgs/development/libraries/cm256cc/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost } : - -stdenv.mkDerivation rec { - pname = "cm256cc"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "f4exb"; - repo = "cm256cc"; - rev = "v${version}"; - sha256 = "sha256-T7ZUVVYGdzAialse//MoqWCVNBpbZvzWMAKc0cw7O9k="; - }; - - patches = [ - # Pull fix pending upstream inclusion for gcc-13 support: - # https://github.com/f4exb/cm256cc/pull/18 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/f4exb/cm256cc/commit/a7f142bcdae8be1c646d67176ba0ba0f7e8dcd68.patch"; - hash = "sha256-J7bm44sqnGsdPhJxQrE8LDxZ6tkTzLslHQnnKmtgrtM="; - }) - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ]; - - # https://github.com/f4exb/cm256cc/issues/16 - postPatch = '' - substituteInPlace libcm256cc.pc.in \ - --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ - ''; - - meta = with lib; { - description = "Fast GF(256) Cauchy MDS Block Erasure Codec in C++"; - homepage = "https://github.com/f4exb/cm256cc"; - platforms = platforms.unix; - maintainers = with maintainers; [ alkeryn ]; - license = licenses.gpl3; - }; -} diff --git a/pkgs/development/libraries/cmark-gfm/default.nix b/pkgs/development/libraries/cmark-gfm/default.nix deleted file mode 100644 index 75ff3acdb947..000000000000 --- a/pkgs/development/libraries/cmark-gfm/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { - pname = "cmark-gfm"; - version = "0.29.0.gfm.13"; - - src = fetchFromGitHub { - owner = "github"; - repo = "cmark-gfm"; - rev = version; - sha256 = "sha256-HiSGtRsSbW03R6aKoMVVFOLrwP5aXtpeXUC/bE5M/qo="; - }; - - nativeBuildInputs = [ cmake ]; - - doCheck = true; - - meta = with lib; { - description = "GitHub's fork of cmark, a CommonMark parsing and rendering library and program in C"; - mainProgram = "cmark-gfm"; - homepage = "https://github.com/github/cmark-gfm"; - changelog = "https://github.com/github/cmark-gfm/raw/${version}/changelog.txt"; - maintainers = with maintainers; [ cyplo ]; - platforms = platforms.unix; - license = licenses.bsd2; - }; -} diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix deleted file mode 100644 index a118ecf1adda..000000000000 --- a/pkgs/development/libraries/cmark/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "cmark"; - version = "0.31.1"; - - src = fetchFromGitHub { - owner = "commonmark"; - repo = pname; - rev = version; - sha256 = "sha256-+JLw7zCjjozjq1RhRQGFqHj/MTUTq3t7A0V3T2U2PQk="; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = - # Link the executable with the shared library on system with shared libraries. - lib.optional (!stdenv.hostPlatform.isStatic) "-DCMARK_STATIC=OFF" - # Do not attempt to build .so library on static platform. - ++ lib.optional stdenv.hostPlatform.isStatic "-DCMARK_SHARED=OFF"; - - doCheck = true; - - preCheck = let - lib_path = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else "LD_LIBRARY_PATH"; - in '' - export ${lib_path}=$(readlink -f ./src) - ''; - - meta = with lib; { - description = "CommonMark parsing and rendering library and program in C"; - mainProgram = "cmark"; - homepage = "https://github.com/commonmark/cmark"; - changelog = "https://github.com/commonmark/cmark/raw/${version}/changelog.txt"; - maintainers = [ maintainers.michelk ]; - platforms = platforms.all; - license = licenses.bsd2; - }; -} diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix deleted file mode 100644 index 20782c8499cb..000000000000 --- a/pkgs/development/libraries/cminpack/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, stdenv -, cmake -, darwin -, fetchFromGitHub -, withBlas ? true, blas -}: - -stdenv.mkDerivation rec { - pname = "cminpack"; - version = "1.3.8"; - - src = fetchFromGitHub { - owner = "devernay"; - repo = "cminpack"; - rev = "v${version}"; - hash = "sha256-eFJ43cHbSbWld+gPpMaNiBy1X5TIcN9aVxjh8PxvVDU="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = lib.optionals withBlas [ - blas - ] ++ lib.optionals (withBlas && stdenv.isDarwin) [ - darwin.apple_sdk.frameworks.Accelerate - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.CoreVideo - ]; - - cmakeFlags = [ - "-DUSE_BLAS=${if withBlas then "ON" else "OFF"}" - "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - ]; - - meta = { - description = "Software for solving nonlinear equations and nonlinear least squares problems"; - homepage = "http://devernay.free.fr/hacks/cminpack/"; - changelog = "https://github.com/devernay/cminpack/blob/v${version}/README.md#history"; - license = lib.licenses.bsd3; - platforms = lib.platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/development/libraries/cmocka/default.nix deleted file mode 100644 index 9a7ea037785b..000000000000 --- a/pkgs/development/libraries/cmocka/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ fetchurl, lib, stdenv, cmake }: - -stdenv.mkDerivation rec { - pname = "cmocka"; - majorVersion = "1.1"; - version = "${majorVersion}.7"; - - src = fetchurl { - url = "https://cmocka.org/files/${majorVersion}/cmocka-${version}.tar.xz"; - sha256 = "sha256-gQVw6wuNZIBDMfgrKf9Hx5DOnNaxY+mNR6SAcEfsrYI="; - }; - - patches = [ - ./uintptr_t.patch - ]; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = lib.optional doCheck "-DUNIT_TESTING=ON" - ++ lib.optional stdenv.hostPlatform.isStatic "-DBUILD_SHARED_LIBS=OFF"; - - doCheck = true; - - meta = with lib; { - description = "Lightweight library to simplify and generalize unit tests for C"; - longDescription = '' - There are a variety of C unit testing frameworks available however - many of them are fairly complex and require the latest compiler - technology. Some development requires the use of old compilers which - makes it difficult to use some unit testing frameworks. In addition - many unit testing frameworks assume the code being tested is an - application or module that is targeted to the same platform that will - ultimately execute the test. Because of this assumption many - frameworks require the inclusion of standard C library headers in the - code module being tested which may collide with the custom or - incomplete implementation of the C library utilized by the code under - test. - - Cmocka only requires a test application is linked with the standard C - library which minimizes conflicts with standard C library headers. - Also, CMocka tries to avoid the use of some of the newer features of - C compilers. - - This results in CMocka being a relatively small library that can be - used to test a variety of exotic code. If a developer wishes to - simply test an application with the latest compiler then other unit - testing frameworks may be preferable. - - This is the successor of Google's Cmockery. - ''; - homepage = "https://cmocka.org/"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ kragniz rasendubi ]; - }; -} diff --git a/pkgs/development/libraries/cmocka/uintptr_t.patch b/pkgs/development/libraries/cmocka/uintptr_t.patch deleted file mode 100644 index ac69560d1c99..000000000000 --- a/pkgs/development/libraries/cmocka/uintptr_t.patch +++ /dev/null @@ -1,16 +0,0 @@ -Resolve messy situation with uintptr_t and stdint.h - -Platforms common in nixpkgs will have stdint.h - thereby we avoid problems -that seem complicated to avoid. References: -https://gitlab.com/cmocka/cmocka/-/issues/38#note_1286565655 -https://git.alpinelinux.org/aports/plain/main/cmocka/musl_uintptr.patch?id=6a15dd0d0ba9cc354a621fb359ca5e315ff2eabd - -It isn't easy, as 1.1.6 codebase is missing stdint.h includes on many places, -and HAVE_UINTPTR_T from cmake also wouldn't get on all places it needs to. ---- a/include/cmocka.h -+++ b/include/cmocka.h -@@ -18,2 +18,4 @@ - #define CMOCKA_H_ -+#include <stdint.h> -+#define HAVE_UINTPTR_T 1 - diff --git a/pkgs/development/libraries/cmrt/default.nix b/pkgs/development/libraries/cmrt/default.nix deleted file mode 100644 index 87c692b42cea..000000000000 --- a/pkgs/development/libraries/cmrt/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libdrm, libva }: - -stdenv.mkDerivation rec { - pname = "cmrt"; - version = "1.0.6"; - - src = fetchFromGitHub { - owner = "intel"; - repo = "cmrt"; - rev = version; - sha256 = "sha256-W6MQI41J9CKeM1eILCkvmW34cbCC8YeEF2mE+Ci8o7s="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - buildInputs = [ libdrm libva ]; - - meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); - homepage = "https://01.org/linuxmedia"; - description = "Intel C for Media Runtime"; - longDescription = "Media GPU kernel manager for Intel G45 & HD Graphics family"; - license = licenses.mit; - maintainers = with maintainers; [ tadfisher ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix deleted file mode 100644 index 308db170bc32..000000000000 --- a/pkgs/development/libraries/codec2/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, freedvSupport ? false -, lpcnetfreedv -}: - -stdenv.mkDerivation rec { - pname = "codec2"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "drowe67"; - repo = "codec2"; - rev = "${version}"; - hash = "sha256-69Mp4o3MgV98Fqfai4txv5jQw2WpoPuoWcwHsNAFPQM="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = lib.optionals freedvSupport [ - lpcnetfreedv - ]; - - postInstall = '' - install -Dm0755 src/{c2enc,c2sim,freedv_rx,freedv_tx,cohpsk_*,fdmdv_*,fsk_*,ldpc_*,ofdm_*} -t $out/bin/ - ''; - - # Swap keyword order to satisfy SWIG parser - postFixup = '' - sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $out/include/$pname/freedv_api.h - ''; - - cmakeFlags = [ - # RPATH of binary /nix/store/.../bin/freedv_rx contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ] ++ lib.optionals freedvSupport [ - "-DLPCNET=ON" - ]; - - meta = with lib; { - description = "Speech codec designed for communications quality speech at low data rates"; - homepage = "https://www.rowetel.com/codec2.html"; - license = licenses.lgpl21Only; - platforms = platforms.unix; - maintainers = with maintainers; [ markuskowa ]; - }; -} diff --git a/pkgs/development/libraries/coeurl/default.nix b/pkgs/development/libraries/coeurl/default.nix deleted file mode 100644 index 580cd488c9fd..000000000000 --- a/pkgs/development/libraries/coeurl/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, fetchpatch -, ninja -, pkg-config -, meson -, libevent -, curl -, spdlog -}: - -stdenv.mkDerivation rec { - pname = "coeurl"; - version = "0.3.0"; - - src = fetchFromGitLab { - domain = "nheko.im"; - owner = "nheko-reborn"; - repo = pname; - rev = "v${version}"; - hash = "sha256-sN+YSddUOdnJLcnHyWdjNm1PpxCwnkwiqSvyrwUrg6w="; - }; - patches = [ - # Fix compatibility issues with curl > 7.85, see: - # https://nheko.im/nheko-reborn/coeurl/-/commit/d926893007c353fbc149d8538a5762ca8384273a - # PATCH CAN BE REMOVED AFTER 0.3.0 - (fetchpatch { - url = "https://nheko.im/nheko-reborn/coeurl/-/commit/d926893007c353fbc149d8538a5762ca8384273a.patch"; - hash = "sha256-hOBk7riuVI7k7qe/SMq3XJnFzyZ0gB9kVG7dKvWOsPY="; - }) - # Fix error when building with fmt >= 10, see: - # https://nheko.im/nheko-reborn/coeurl/-/commit/831e2ee8e9cf08ea1ee9736cde8370f9d0312abc - # PATCH CAN BE REMOVED AFTER 0.3.0 - (fetchpatch { - url = "https://nheko.im/nheko-reborn/coeurl/-/commit/831e2ee8e9cf08ea1ee9736cde8370f9d0312abc.patch"; - hash = "sha256-a52Id7Nm3Mmmwv7eL58j6xovjlkpAO4KahVM/Q3H65w="; - }) - ]; - postPatch = '' - substituteInPlace subprojects/curl.wrap --replace '[provides]' '[provide]' - ''; - - nativeBuildInputs = [ ninja pkg-config meson ]; - - buildInputs = [ libevent curl spdlog ]; - - meta = with lib; { - description = "Simple async wrapper around CURL for C++"; - homepage = "https://nheko.im/nheko-reborn/coeurl"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ rnhmjoj ]; - }; -} diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index b233113e951f..db34dc1669b1 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-introspection" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "--enable-kms-egl-platform" "--enable-wayland-egl-platform" "--enable-wayland-egl-server" @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { # Force linking against libGL. # Otherwise, it tries to load it from the runtime library path. "LIBS=-lGL" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-glx" "--without-x" ] ++ lib.optionals gstreamerSupport [ @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { glib gdk-pixbuf gobject-introspection - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland mesa libGL @@ -82,10 +82,10 @@ stdenv.mkDerivation rec { ]; buildInputs = lib.optionals pangoSupport [ pango cairo harfbuzz ] - ++ lib.optionals stdenv.isDarwin [ OpenGL ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenGL ]; env = { - COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.isDarwin && pangoSupport) [ + COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.hostPlatform.isDarwin && pangoSupport) [ "-I${pango.dev}/include/pango-1.0" "-I${cairo.dev}/include/cairo" "-I${harfbuzz.dev}/include/harfbuzz" diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix deleted file mode 100644 index 3261a848e3a6..000000000000 --- a/pkgs/development/libraries/coin3d/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, boost -, cmake -, libGL -, libGLU -, libX11 -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "coin"; - version = "4.0.3"; - - src = fetchFromGitHub { - owner = "coin3d"; - repo = "coin"; - rev = "v${finalAttrs.version}"; - hash = "sha256-dUFmcUOdNc3ZFtr+Hnh3Q3OY/JA/WxmiRJiU2RFSSus="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - boost - libGL - libGLU - ] ++ lib.optional stdenv.isLinux libX11; - - cmakeFlags = [ "-DCOIN_USE_CPACK=OFF" ]; - - meta = with lib; { - homepage = "https://github.com/coin3d/coin"; - description = "High-level, retained-mode toolkit for effective 3D graphics development"; - mainProgram = "coin-config"; - license = licenses.bsd3; - maintainers = with maintainers; [ gebner ]; - platforms = platforms.linux ++ platforms.darwin; - }; -}) diff --git a/pkgs/development/libraries/comedilib/default.nix b/pkgs/development/libraries/comedilib/default.nix deleted file mode 100644 index 95de887242bf..000000000000 --- a/pkgs/development/libraries/comedilib/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, autoreconfHook -, flex -, bison -, xmlto -, docbook_xsl -, docbook_xml_dtd_44 -, swig -, perl -, python3 -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "comedilib"; - version = "0.12.0"; - - src = fetchFromGitHub { - owner = "Linux-Comedi"; - repo = "comedilib"; - rev = "r${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; - sha256 = "0kfs2dw62vjz8j7fgsxq6ky8r8kca726gyklbm6kljvgfh47lyfw"; - }; - - nativeBuildInputs = [ - autoreconfHook - flex - bison - swig - xmlto - docbook_xml_dtd_44 - docbook_xsl - python3 - perl - ]; - - preConfigure = '' - patchShebangs --build doc/mkref doc/mkdr perl/Comedi.pm - ''; - - configureFlags = [ - "--with-udev-hotplug=${placeholder "out"}/lib" - "--sysconfdir=${placeholder "out"}/etc" - ]; - - outputs = [ "out" "dev" "man" "doc" ]; - - meta = with lib; { - description = "Linux Control and Measurement Device Interface Library"; - homepage = "https://github.com/Linux-Comedi/comedilib"; - license = licenses.lgpl21; - maintainers = [ maintainers.doronbehar ]; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/development/libraries/console-bridge/default.nix b/pkgs/development/libraries/console-bridge/default.nix deleted file mode 100644 index f02ac839a3e0..000000000000 --- a/pkgs/development/libraries/console-bridge/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, validatePkgConfig }: - -stdenv.mkDerivation rec { - pname = "console-bridge"; - version = "1.0.2"; - - src = fetchFromGitHub { - owner = "ros"; - repo = "console_bridge"; - rev = version; - sha256 = "sha256-M3GocT0hodw3Sc2NHcFDiPVZ1XN7BqIUuYLW8OaXMqM="; - }; - - nativeBuildInputs = [ cmake validatePkgConfig ]; - - meta = with lib; { - description = "ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages"; - homepage = "https://github.com/ros/console_bridge"; - license = licenses.bsd3; - maintainers = with maintainers; [ lopsided98 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/coordgenlibs/default.nix b/pkgs/development/libraries/coordgenlibs/default.nix deleted file mode 100644 index 4febe03ef04d..000000000000 --- a/pkgs/development/libraries/coordgenlibs/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ fetchFromGitHub -, lib -, stdenv -, boost -, zlib -, cmake -, maeparser -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "coordgenlibs"; - version = "3.0.2"; - - src = fetchFromGitHub { - owner = "schrodinger"; - repo = "coordgenlibs"; - rev = "v${finalAttrs.version}"; - hash = "sha256-casFPNbPv9mkKpzfBENW7INClypuCO1L7clLGBXvSvI="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost zlib maeparser ]; - - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-unused-but-set-variable"; - }; - - doCheck = true; - - meta = with lib; { - description = "Schrodinger-developed 2D Coordinate Generation"; - homepage = "https://github.com/schrodinger/coordgenlibs"; - changelog = "https://github.com/schrodinger/coordgenlibs/releases/tag/${finalAttrs.version}"; - maintainers = [ maintainers.rmcgibbo ]; - license = licenses.bsd3; - }; -}) diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix deleted file mode 100644 index 0b34bd05c7dc..000000000000 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }: - -stdenv.mkDerivation rec { - pname = "cpp-hocon"; - version = "0.3.0"; - - src = fetchFromGitHub { - sha256 = "0b24anpwkmvbsn5klnr58vxksw00ci9pjhwzx7a61kplyhsaiydw"; - rev = version; - repo = "cpp-hocon"; - owner = "puppetlabs"; - }; - - postPatch = '' - sed -i -e '/add_subdirectory(tests)/d' lib/CMakeLists.txt - ''; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ boost curl leatherman ]; - - meta = with lib; { - inherit (src.meta) homepage; - description = "C++ port of the Typesafe Config library"; - license = licenses.asl20; - maintainers = [ maintainers.womfoo ]; - platforms = platforms.unix; - }; - -} diff --git a/pkgs/development/libraries/cpp-ipfs-http-client/default.nix b/pkgs/development/libraries/cpp-ipfs-http-client/default.nix deleted file mode 100644 index d44eed5e76f0..000000000000 --- a/pkgs/development/libraries/cpp-ipfs-http-client/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }: - -stdenv.mkDerivation { - pname = "cpp-ipfs-http-client"; - version = "unstable-2022-01-30"; - - src = fetchFromGitHub { - owner = "vasild"; - repo = "cpp-ipfs-http-client"; - rev = "3cdfa7fc6326e49fc81b3c7ca43ce83bdccef6d9"; - sha256 = "sha256-/oyafnk4SbrvoCh90wkZXNBjknMKA6EEUoEGo/amLUo="; - }; - - patches = [ ./unvendor-nlohmann-json.patch ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace '# Fetch "JSON for Modern C++"' "include_directories(${nlohmann_json}/include)" - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ curl ]; - propagatedBuildInputs = [ nlohmann_json ]; - - env.NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=range-loop-construct" - # Needed with GCC 12 - "-Wno-error=deprecated-declarations" - ]; - - meta = with lib; { - description = "IPFS C++ API client library"; - homepage = "https://github.com/vasild/cpp-ipfs-http-client"; - license = licenses.mit; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - }; -} diff --git a/pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch b/pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch deleted file mode 100644 index e21b4e9a7a71..000000000000 --- a/pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- source/CMakeLists.txt -+++ source/CMakeLists.txt -@@ -56,11 +56,6 @@ target_include_directories(${IPFS_API_LIBNAME} - ) - - # Fetch "JSON for Modern C++" --include(FetchContent) --message(STATUS "Fetching nlohmann/JSON") --# Retrieve Nlohmann JSON --FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.10.5/json.tar.xz) --FetchContent_MakeAvailable(json) - - # libcurl requires additional libs only for static Windows builds - if(WIN32) -@@ -71,12 +66,11 @@ set_target_properties(${IPFS_API_LIBNAME} PROPERTIES - SOVERSION ${PROJECT_VERSION_MAJOR} - VERSION ${PROJECT_VERSION} - ) --target_link_libraries(${IPFS_API_LIBNAME} ${CURL_LIBRARIES} ${WINDOWS_CURL_LIBS} nlohmann_json::nlohmann_json) -+target_link_libraries(${IPFS_API_LIBNAME} ${CURL_LIBRARIES} ${WINDOWS_CURL_LIBS}) - if(NOT DISABLE_INSTALL) - install(TARGETS ${IPFS_API_LIBNAME} DESTINATION lib) - install(FILES include/ipfs/client.h DESTINATION include/ipfs) - install(FILES include/ipfs/http/transport.h DESTINATION include/ipfs/http) -- install(FILES ${json_SOURCE_DIR}/include/nlohmann/json.hpp DESTINATION include/nlohmann) - endif() - # Tests, use "CTEST_OUTPUT_ON_FAILURE=1 make test" to see output from failed tests diff --git a/pkgs/development/libraries/cpp-jwt/default.nix b/pkgs/development/libraries/cpp-jwt/default.nix deleted file mode 100644 index a9295629bf20..000000000000 --- a/pkgs/development/libraries/cpp-jwt/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssl, gtest, nlohmann_json }: - -stdenv.mkDerivation rec { - pname = "cpp-jwt"; - version = "1.4"; - - src = fetchFromGitHub { - owner = "arun11299"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-5hVsFanTCT/uLLXrnb2kMvmL6qs9RXVkvxdWaT6m4mk="; - }; - - # fix reported version - patches = [ ./fix-version.patch ]; - - cmakeFlags = [ - "-DCPP_JWT_USE_VENDORED_NLOHMANN_JSON=OFF" - "-DCPP_JWT_BUILD_EXAMPLES=OFF" - ]; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ gtest openssl nlohmann_json ]; - - doCheck = true; - - strictDeps = true; - - meta = { - description = "JSON Web Token library for C++"; - homepage = "https://github.com/arun11299/cpp-jwt"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fpletz ]; - }; -} diff --git a/pkgs/development/libraries/cpp-jwt/fix-version.patch b/pkgs/development/libraries/cpp-jwt/fix-version.patch deleted file mode 100644 index d04525e15464..000000000000 --- a/pkgs/development/libraries/cpp-jwt/fix-version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2f35431..f08eb22 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - cmake_minimum_required(VERSION 3.5.0) --project(cpp-jwt VERSION 1.2.0) -+project(cpp-jwt VERSION 1.4.0) - - option(CPP_JWT_BUILD_EXAMPLES "build examples" ON) - option(CPP_JWT_BUILD_TESTS "build tests" ON) - \ No newline at end of file diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix deleted file mode 100644 index af57944a453d..000000000000 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, openssl }: - -stdenv.mkDerivation rec { - pname = "cpp-netlib"; - version = "0.13.0-final"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "${pname}-${version}"; - sha256 = "18782sz7aggsl66b4mmi1i0ijwa76iww337fi9sygnplz2hs03a3"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost openssl ]; - - cmakeFlags = [ - "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" - # fatal error: 'boost/asio/stream_socket_service.hpp' file not found - "-DCPP-NETLIB_BUILD_EXAMPLES=OFF" - "-DCPP-NETLIB_BUILD_TESTS=OFF" - ]; - - # Most tests make network GET requests to various websites - doCheck = false; - - meta = with lib; { - description = "Collection of open-source libraries for high level network programming"; - homepage = "https://cpp-netlib.org"; - license = licenses.boost; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix deleted file mode 100644 index d2fbecf8e61b..000000000000 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, cppunit -, libiconv -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "cpp-utilities"; - version = "5.26.1"; - - src = fetchFromGitHub { - owner = "Martchus"; - repo = "cpp-utilities"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-ft8gusZ6We3nEAOwccGrUidxpO5tdWR5VNDQ/r5l2P8="; - }; - - nativeBuildInputs = [ cmake ]; - nativeCheckInputs = [ cppunit ]; - buildInputs = lib.optionals stdenv.isDarwin [ - libiconv # needed on Darwin, see https://github.com/Martchus/cpp-utilities/issues/4 - ]; - - cmakeFlags = ["-DBUILD_SHARED_LIBS=ON"]; - - # Otherwise, tests fail since the resulting shared object libc++utilities.so is only available in PWD of the make files - preCheck = '' - checkFlagsArray+=( - "LD_LIBRARY_PATH=$PWD" - ) - ''; - # tests fail on Darwin - doCheck = !stdenv.isDarwin; - - meta = with lib; { - homepage = "https://github.com/Martchus/cpp-utilities"; - description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ doronbehar ]; - platforms = platforms.linux ++ platforms.darwin; - }; -}) diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix deleted file mode 100644 index 86aa687aaa71..000000000000 --- a/pkgs/development/libraries/cppcms/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, pcre, zlib, python3, openssl }: - -stdenv.mkDerivation rec { - pname = "cppcms"; - version = "2.0.0.beta2"; - - src = fetchurl { - url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2"; - sha256 = "sha256-aXAxx9FB/dIVxr5QkLZuIQamO7PlLwnugSDo78bAiiE="; - }; - - nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ pcre zlib openssl ]; - - strictDeps = true; - - cmakeFlags = [ - "--no-warn-unused-cli" - ]; - - meta = with lib; { - homepage = "http://cppcms.com"; - description = "High Performance C++ Web Framework"; - platforms = platforms.linux; - license = licenses.mit; - maintainers = [ maintainers.juliendehos ]; - }; -} diff --git a/pkgs/development/libraries/cppcodec/default.nix b/pkgs/development/libraries/cppcodec/default.nix deleted file mode 100644 index 99a8eda1477c..000000000000 --- a/pkgs/development/libraries/cppcodec/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "cppcodec"; - version = "0.2"; - - src = fetchFromGitHub { - owner = "tplgy"; - repo = "cppcodec"; - rev = "v${finalAttrs.version}"; - hash = "sha256-k4EACtDOSkTXezTeFtVdM1EVJjvGga/IQSrvDzhyaXw="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Header-only C++11 library for encode/decode functions as in RFC 4648"; - longDescription = '' - Header-only C++11 library to encode/decode base64, base64url, base32, - base32hex and hex (a.k.a. base16) as specified in RFC 4648, plus - Crockford's base32. - ''; - homepage = "https://github.com/tplgy/cppcodec"; - license = licenses.mit; - maintainers = with maintainers; [ panicgh raitobezarius ]; - }; -}) diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix deleted file mode 100644 index b71a6c073031..000000000000 --- a/pkgs/development/libraries/cppdb/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, sqlite, libmysqlclient, postgresql, unixODBC }: - -stdenv.mkDerivation rec { - pname = "cppdb"; - version = "0.3.1"; - - src = fetchurl { - url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2"; - sha256 = "0blr1casmxickic84dxzfmn3lm7wrsl4aa2abvpq93rdfddfy3nn"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ sqlite libmysqlclient postgresql unixODBC ]; - - cmakeFlags = [ "--no-warn-unused-cli" ]; - env.NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; - - meta = with lib; { - homepage = "http://cppcms.com/sql/cppdb/"; - description = "C++ Connectivity library that supports MySQL, PostgreSQL, Sqlite3 databases and generic ODBC drivers"; - platforms = platforms.linux ; - license = licenses.boost; - maintainers = [ maintainers.juliendehos ]; - }; -} diff --git a/pkgs/development/libraries/cpptest/default.nix b/pkgs/development/libraries/cpptest/default.nix deleted file mode 100644 index a3558e0ef493..000000000000 --- a/pkgs/development/libraries/cpptest/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "cpptest"; - version = "2.0.0"; - - src = fetchurl { - url = "mirror://sourceforge/project/cpptest/cpptest/cpptest-${version}/cpptest-${version}.tar.gz"; - sha256 = "0lpy3f2fjx1srh02myanlp6zfi497whlldcrnij39ghfhm0arcnm"; - }; - - meta = with lib; { - homepage = "http://cpptest.sourceforge.net/"; - description = "Simple C++ unit testing framework"; - maintainers = with maintainers; [ bosu ]; - license = lib.licenses.lgpl3; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/cpptoml/default.nix b/pkgs/development/libraries/cpptoml/default.nix deleted file mode 100644 index 888af1c18631..000000000000 --- a/pkgs/development/libraries/cpptoml/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libcxxCmakeModule ? false }: - -stdenv.mkDerivation rec { - pname = "cpptoml"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "skystrife"; - repo = "cpptoml"; - rev = "fededad7169e538ca47e11a9ee9251bc361a9a65"; - sha256 = "0zlgdlk9nsskmr8xc2ajm6mn1x5wz82ssx9w88s02icz71mcihrx"; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - # If this package is built with clang it will attempt to - # use libcxx via the Cmake find_package interface. - # The default libcxx stdenv in llvmPackages doesn't provide - # this and so will fail. - "-DENABLE_LIBCXX=${if libcxxCmakeModule then "ON" else "OFF"}" - "-DCPPTOML_BUILD_EXAMPLES=OFF" - ]; - - meta = with lib; { - description = "C++ TOML configuration library"; - homepage = "https://github.com/skystrife/cpptoml"; - license = licenses.mit; - maintainers = with maintainers; [ photex ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix deleted file mode 100644 index 73c96de4ff24..000000000000 --- a/pkgs/development/libraries/cppunit/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "cppunit"; - version = "1.15.1"; - - src = fetchurl { - url = "https://dev-www.libreoffice.org/src/${pname}-${version}.tar.gz"; - sha256 = "19qpqzy66bq76wcyadmi3zahk5v1ll2kig1nvg96zx9padkcdic9"; - }; - - # Avoid blanket -Werror to evade build failures on less - # tested compilers. - configureFlags = [ "--disable-werror" ]; - - meta = with lib; { - homepage = "https://freedesktop.org/wiki/Software/cppunit/"; - description = "C++ unit testing framework"; - mainProgram = "DllPlugInTester"; - license = licenses.lgpl21; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/cpputest/default.nix b/pkgs/development/libraries/cpputest/default.nix deleted file mode 100644 index 39bed6025232..000000000000 --- a/pkgs/development/libraries/cpputest/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "cpputest"; - version = "4.0"; - - src = fetchurl { - url = "https://github.com/cpputest/cpputest/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1xslavlb1974y5xvs8n1j9zkk05dlw8imy4saasrjlmibl895ii1"; - }; - - meta = with lib; { - homepage = "https://cpputest.github.io/"; - description = "Unit testing and mocking framework for C/C++"; - platforms = platforms.all; - license = licenses.bsd3; - maintainers = [ maintainers.juliendehos ]; - }; -} diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix deleted file mode 100644 index eb3f03d57e40..000000000000 --- a/pkgs/development/libraries/cppzmq/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, zeromq }: - -stdenv.mkDerivation rec { - pname = "cppzmq"; - version = "4.10.0"; - - src = fetchFromGitHub { - owner = "zeromq"; - repo = "cppzmq"; - rev = "v${version}"; - sha256 = "sha256-HTdaV1cLbwGYuikS9EAVvAOdLmCoWlvVXlpYsUwY5IA="; - }; - - nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ zeromq ]; - - cmakeFlags = [ - # Tests try to download googletest at compile time; there is no option - # to use a system one and no simple way to download it beforehand. - "-DCPPZMQ_BUILD_TESTS=OFF" - ]; - - meta = with lib; { - homepage = "https://github.com/zeromq/cppzmq"; - license = licenses.bsd2; - description = "C++ binding for 0MQ"; - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix deleted file mode 100644 index 2ccb2988305e..000000000000 --- a/pkgs/development/libraries/cracklib/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -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-JDLo/bSLIijC2DUl+8Q704i2zgw5cxL6t68wvuivPpY="; -}) ] -}: - -stdenv.mkDerivation rec { - pname = "cracklib"; - inherit version; - - src = fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - 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 ]; - - postPatch = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' - chmod +x util/cracklib-format - patchShebangs util - - '' + '' - ln -vs ${toString lists} dicts/ - ''; - - postInstall = '' - make dict-local - ''; - doInstallCheck = true; - installCheckTarget = "test"; - - meta = with lib; { - homepage = "https://github.com/cracklib/cracklib"; - description = "Library for checking the strength of passwords"; - license = licenses.lgpl21; # Different license for the wordlist: http://www.openwall.com/wordlists - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/development/libraries/crc32c/default.nix deleted file mode 100644 index 3b27601bcbfd..000000000000 --- a/pkgs/development/libraries/crc32c/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, gflags -, staticOnly ? stdenv.hostPlatform.isStatic -}: - -stdenv.mkDerivation rec { - pname = "crc32c"; - version = "1.1.2"; - - src = fetchFromGitHub { - owner = "google"; - repo = "crc32c"; - rev = version; - sha256 = "0c383p7vkfq9rblww6mqxz8sygycyl27rr0j3bzb8l8ga71710ii"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ gflags ]; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc"; - - cmakeFlags = [ - "-DCRC32C_INSTALL=1" - "-DCRC32C_BUILD_TESTS=1" - "-DCRC32C_BUILD_BENCHMARKS=0" - "-DCRC32C_USE_GLOG=0" - "-DINSTALL_GTEST=0" - "-DBUILD_SHARED_LIBS=${if staticOnly then "0" else "1"}" - ]; - - doCheck = false; - doInstallCheck = true; - - installCheckPhase = '' - runHook preInstallCheck - - ctest - - runHook postInstallCheck - ''; - - postFixup = '' - # fix bogus include paths - for f in $(find $out/lib/cmake -name '*.cmake'); do - substituteInPlace "$f" --replace "\''${_IMPORT_PREFIX}/$out/include" "\''${_IMPORT_PREFIX}/include" - done - ''; - - meta = with lib; { - homepage = "https://github.com/google/crc32c"; - description = "CRC32C implementation with support for CPU-specific acceleration instructions"; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ cpcloud ]; - }; -} diff --git a/pkgs/development/libraries/crcpp/default.nix b/pkgs/development/libraries/crcpp/default.nix deleted file mode 100644 index 6162d8935be3..000000000000 --- a/pkgs/development/libraries/crcpp/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "crcpp"; - version = "1.2.0.0"; - - src = fetchFromGitHub { - owner = "d-bahr"; - repo = "CRCpp"; - rev = "release-${version}"; - sha256 = "sha256-OY8MF8fwr6k+ZSA/p1U+9GnTFoMSnUZxKVez+mda2tA="; - }; - - nativeBuildInputs = [ cmake ]; - - doCheck = true; - - meta = with lib; { - homepage = "https://github.com/d-bahr/CRCpp"; - changelog = "https://github.com/d-bahr/CRCpp/releases/tag/release-${version}"; - description = "Easy to use and fast C++ CRC library"; - platforms = platforms.all; - maintainers = [ ]; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix deleted file mode 100644 index d85843a54f7c..000000000000 --- a/pkgs/development/libraries/cre2/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, - libtool, pkg-config, re2, texinfo }: - -stdenv.mkDerivation rec { - pname = "cre2"; - version = "0.3.6"; - - src = fetchFromGitHub { - owner = "marcomaggi"; - repo = pname; - rev = "v${version}"; - sha256 = "1h9jwn6z8kjf4agla85b5xf7gfkdwncp0mfd8zwk98jkm8y2qx9q"; - }; - - nativeBuildInputs = [ - autoreconfHook - libtool - pkg-config - ]; - buildInputs = [ re2 texinfo ]; - - NIX_LDFLAGS="-lre2 -lpthread"; - - configureFlags = [ - "--enable-maintainer-mode" - ]; - - meta = with lib; { - homepage = "http://marcomaggi.github.io/docs/cre2.html"; - description = "C Wrapper for RE2"; - license = licenses.bsd3; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/croaring/default.nix b/pkgs/development/libraries/croaring/default.nix deleted file mode 100644 index 88643c00195a..000000000000 --- a/pkgs/development/libraries/croaring/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "croaring"; - version = "2.0.3"; - - src = fetchFromGitHub { - owner = "RoaringBitmap"; - repo = "CRoaring"; - rev = "v${version}"; - hash = "sha256-WaFyJ/6zstJ05e3vfrwhaZKQsjRAEvVTs688Hw0fr94="; - }; - - # roaring.pc.in cannot handle absolute CMAKE_INSTALL_*DIRs, nor - # overridden CMAKE_INSTALL_FULL_*DIRs. With Nix, they are guaranteed - # to be absolute so the following patch suffices (see #144170). - patches = [ ./fix-pkg-config.patch ]; - - nativeBuildInputs = [ cmake ]; - - doCheck = true; - - preConfigure = '' - mkdir -p dependencies/.cache - ln -s ${fetchFromGitHub { - owner = "clibs"; - repo = "cmocka"; - rev = "f5e2cd7"; - hash = "sha256-Oq0nFsZhl8IF7kQN/LgUq8VBy+P7gO98ep/siy5A7Js="; - }} dependencies/.cache/cmocka - ''; - - meta = with lib; { - description = "Compressed bitset library for C and C++"; - homepage = "https://roaringbitmap.org/"; - license = with licenses; [ asl20 mit ]; - maintainers = [ maintainers.orivej ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/croaring/fix-pkg-config.patch b/pkgs/development/libraries/croaring/fix-pkg-config.patch deleted file mode 100644 index f5cfcf308cf8..000000000000 --- a/pkgs/development/libraries/croaring/fix-pkg-config.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/roaring.pc.in b/roaring.pc.in -index e3b2391..c29adc3 100644 ---- a/roaring.pc.in -+++ b/roaring.pc.in -@@ -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: roaring - Description: Roaring bitmap implementation in C diff --git a/pkgs/development/libraries/crossguid/default.nix b/pkgs/development/libraries/crossguid/default.nix deleted file mode 100644 index c4c015d92481..000000000000 --- a/pkgs/development/libraries/crossguid/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, libuuid, unstableGitUpdater }: - -stdenv.mkDerivation rec { - pname = "crossguid"; - version = "0.2.2-unstable-2019-05-29"; - - src = fetchFromGitHub { - owner = "graeme-hill"; - repo = pname; - rev = "ca1bf4b810e2d188d04cb6286f957008ee1b7681"; - hash = "sha256-37tKPDo4lukl/aaDWWSQYfsBNEnDjE7t6OnEZjBhcvQ="; - }; - - patches = [ - # Fix the build against gcc-13: - # https://github.com/graeme-hill/crossguid/pull/67 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/graeme-hill/crossguid/commit/1eb9bea38c320b2b588635cffceaaa2a8d434780.patch"; - hash = "sha256-0qKZUeuNfc3gt+aFeaTt+IexO391GCdjS+9PVJmBKV4="; - }) - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional stdenv.isLinux libuuid; - - passthru.updateScript = unstableGitUpdater { - tagPrefix = "v"; - }; - - meta = with lib; { - description = "Lightweight cross platform C++ GUID/UUID library"; - license = licenses.mit; - homepage = "https://github.com/graeme-hill/crossguid"; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix deleted file mode 100644 index 741e9677f710..000000000000 --- a/pkgs/development/libraries/crypto++/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, enableStatic ? stdenv.hostPlatform.isStatic -, enableShared ? !enableStatic -# Multi-threading with OpenMP is disabled by default -# more info on https://www.cryptopp.com/wiki/OpenMP -, withOpenMP ? false -, llvmPackages -}: - -stdenv.mkDerivation rec { - pname = "crypto++"; - version = "8.9.0"; - underscoredVersion = lib.strings.replaceStrings ["."] ["_"] version; - - src = fetchFromGitHub { - owner = "weidai11"; - repo = "cryptopp"; - rev = "CRYPTOPP_${underscoredVersion}"; - hash = "sha256-HV+afSFkiXdy840JbHBTR8lLL0GMwsN3QdwaoQmicpQ="; - }; - - outputs = [ "out" "dev" ]; - - postPatch = '' - substituteInPlace GNUmakefile \ - --replace "AR = /usr/bin/libtool" "AR = ar" \ - --replace "ARFLAGS = -static -o" "ARFLAGS = -cru" - ''; - - buildInputs = lib.optionals (stdenv.cc.isClang && withOpenMP) [ llvmPackages.openmp ]; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - buildFlags = - lib.optional enableStatic "static" - ++ lib.optional enableShared "shared" - ++ [ "libcryptopp.pc" ]; - - enableParallelBuilding = true; - hardeningDisable = [ "fortify" ]; - CXXFLAGS = lib.optionals (withOpenMP) [ "-fopenmp" ]; - - doCheck = true; - - # always built for checks but install static lib only when necessary - preInstall = lib.optionalString (!enableStatic) "rm -f libcryptopp.a"; - - installTargets = [ "install-lib" ]; - installFlags = [ "LDCONF=true" ]; - - meta = with lib; { - description = "Free C++ class library of cryptographic schemes"; - homepage = "https://cryptopp.com/"; - changelog = [ - "https://raw.githubusercontent.com/weidai11/cryptopp/CRYPTOPP_${underscoredVersion}/History.txt" - "https://github.com/weidai11/cryptopp/releases/tag/CRYPTOPP_${underscoredVersion}" - ]; - license = with licenses; [ boost publicDomain ]; - platforms = platforms.all; - maintainers = with maintainers; [ c0bw3b ]; - }; -} diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix deleted file mode 100644 index 397d5186a1c4..000000000000 --- a/pkgs/development/libraries/csfml/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, sfml }: - -stdenv.mkDerivation rec { - pname = "csfml"; - version = "2.5.2"; - src = fetchFromGitHub { - owner = "SFML"; - repo = "CSFML"; - rev = version; - sha256 = "sha256-A5C/4SnxUX7mW1wkPWJWX3dwMhrJ79DkBuZ7UYzTOqE="; - }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ sfml ]; - cmakeFlags = [ "-DCMAKE_MODULE_PATH=${sfml}/share/SFML/cmake/Modules/" ]; - - meta = with lib; { - homepage = "https://www.sfml-dev.org/"; - description = "Simple and fast multimedia library"; - longDescription = '' - SFML is a simple, fast, cross-platform and object-oriented multimedia API. - It provides access to windowing, graphics, audio and network. - It is written in C++, and has bindings for various languages such as C, .Net, Ruby, Python. - ''; - license = licenses.zlib; - maintainers = [ maintainers.jpdoyle ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix deleted file mode 100644 index ad8e192c0a7a..000000000000 --- a/pkgs/development/libraries/ctpl/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, glib }: - -stdenv.mkDerivation rec { - pname = "ctpl"; - version = "0.3.5"; - - src = fetchurl { - url = "https://download.tuxfamily.org/ctpl/releases/ctpl-${version}.tar.gz"; - sha256 = "sha256-IRCPx1Z+0hbe6kWRrb/s6OiLH0uxynfDdACSBkTXVr4="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib ]; - - meta = with lib; { - homepage = "http://ctpl.tuxfamily.org/"; - description = "Template engine library written in C"; - mainProgram = "ctpl"; - platforms = platforms.linux; - maintainers = [ ]; - license = licenses.gpl3Plus; - }; -} diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix deleted file mode 100644 index 2d3b07e5e01f..000000000000 --- a/pkgs/development/libraries/ctpp2/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, cmake }: - -stdenv.mkDerivation rec { - pname = "ctpp2"; - version = "2.8.3"; - - src = fetchurl { - url = "https://ctpp.havoc.ru/download/${pname}-${version}.tar.gz"; - sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8"; - }; - - nativeBuildInputs = [ cmake ]; - - patchPhase = '' - # include <unistd.h> to fix undefined getcwd - sed -ie 's/<stdlib.h>/<stdlib.h>\n#include <unistd.h>/' src/CTPP2FileSourceLoader.cpp - ''; - - cmakeFlags = [ - # RPATH of binary /nix/store/.../bin/ctpp2json contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ]; - - doCheck = false; # fails - - meta = with lib; { - description = "High performance templating engine"; - homepage = "https://ctpp.havoc.ru/"; - maintainers = [ maintainers.robbinch ]; - platforms = platforms.linux; - license = licenses.bsd2; - }; -} diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix index 4668404f9794..6d287b869ff3 100644 --- a/pkgs/development/libraries/ctranslate2/default.nix +++ b/pkgs/development/libraries/ctranslate2/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "ctranslate2"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; rev = "v${version}"; - hash = "sha256-E/ulk+Oo1zEP+sCKMZuMVSoO0MDjQ2opTflSwLmCJMw="; + hash = "sha256-2Znrt+TiQf/9YI1HYAikDfqbekAghOvxKoC05S18scQ="; fetchSubmodules = true; }; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "-DWITH_RUY=${cmakeBool withRuy}" "-DWITH_MKL=${cmakeBool withMkl}" ] - ++ lib.optional stdenv.isDarwin "-DWITH_ACCELERATE=ON"; + ++ lib.optional stdenv.hostPlatform.isDarwin "-DWITH_ACCELERATE=ON"; buildInputs = lib.optionals withMkl [ mkl @@ -67,10 +67,10 @@ stdenv.mkDerivation rec { oneDNN ] ++ lib.optionals withOpenblas [ openblas - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp darwin.apple_sdk.frameworks.Accelerate - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ darwin.apple_sdk.frameworks.CoreGraphics darwin.apple_sdk.frameworks.CoreVideo ]; diff --git a/pkgs/development/libraries/ctre/default.nix b/pkgs/development/libraries/ctre/default.nix deleted file mode 100644 index e35e2d1244c6..000000000000 --- a/pkgs/development/libraries/ctre/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "ctre"; - version = "3.9.0"; - - src = fetchFromGitHub { - owner = "hanickadot"; - repo = "compile-time-regular-expressions"; - rev = "v${version}"; - hash = "sha256-Fmx8eKo4UHSYQa5RL70VmaogQj+ILVA1gfpaVE8+MlQ="; - }; - - nativeBuildInputs = [ cmake ]; - - postPatch = '' - substituteInPlace packaging/pkgconfig.pc.in \ - --replace "\''${prefix}/" "" - ''; - - dontBuild = true; - - meta = with lib; { - description = "Fast compile-time regular expressions library"; - longDescription = '' - Fast compile-time regular expressions with support for - matching/searching/capturing during compile-time or runtime. - ''; - license = licenses.asl20; - homepage = "https://compile-time.re"; - maintainers = with maintainers; [ azahi ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/ctypes_sh/default.nix b/pkgs/development/libraries/ctypes_sh/default.nix deleted file mode 100644 index 44f71982062c..000000000000 --- a/pkgs/development/libraries/ctypes_sh/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, autoreconfHook, pkg-config -, zlib, libffi, elfutils, libdwarf -}: - -stdenv.mkDerivation rec { - pname = "ctypes.sh"; - version = "1.2"; - - src = fetchFromGitHub { - owner = "taviso"; - repo = pname; - rev = "v${version}"; - sha256 = "1wafyfhwd7nf7xdici0djpwgykizaz7jlarn0r1b4spnpjx1zbx4"; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ zlib libffi elfutils libdwarf ]; - - meta = with lib; { - description = "Foreign function interface for bash"; - mainProgram = "ctypes.sh"; - homepage = "https://github.com/taviso/ctypes.sh"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/cudd/cudd.patch b/pkgs/development/libraries/cudd/cudd.patch deleted file mode 100644 index 152fa30997f9..000000000000 --- a/pkgs/development/libraries/cudd/cudd.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 45f216a..39c3c82 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -3,6 +3,9 @@ ACLOCAL_AMFLAGS = -I m4 - include_HEADERS = cudd/cudd.h - if DDDMP - include_HEADERS += dddmp/dddmp.h -+include_HEADERS += util/util.h -+include_HEADERS += config.h -+include_HEADERS += mtr/mtr.h - endif - if OBJ - include_HEADERS += cplusplus/cuddObj.hh diff --git a/pkgs/development/libraries/cudd/default.nix b/pkgs/development/libraries/cudd/default.nix deleted file mode 100644 index 4e8cf59fbffd..000000000000 --- a/pkgs/development/libraries/cudd/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "cudd"; - version = "3.0.0"; - - src = fetchurl { - url = "https://davidkebo.com/source/cudd_versions/cudd-3.0.0.tar.gz"; - sha256 = "0sgbgv7ljfr0lwwwrb9wsnav7mw7jmr3k8mygwza15icass6dsdq"; - }; - - configureFlags = [ - "--enable-dddmp" - "--enable-obj" - ]; - - patches = [ - ./cudd.patch - ]; - - nativeBuildInputs = [ autoreconfHook ]; - - meta = with lib; { - homepage = "https://davidkebo.com/cudd"; - description = "Binary Decision Diagram (BDD) library"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ chessai ]; - }; -} diff --git a/pkgs/development/libraries/curlpp/default.nix b/pkgs/development/libraries/curlpp/default.nix deleted file mode 100644 index c8fe78d0462f..000000000000 --- a/pkgs/development/libraries/curlpp/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl }: - -stdenv.mkDerivation rec { - pname = "curlpp"; - version = "0.8.1"; - src = fetchFromGitHub { - owner = "jpbarrette"; - repo = "curlpp"; - rev = "v${version}"; - sha256 = "1b0ylnnrhdax4kwjq64r1fk0i24n5ss6zfzf4hxwgslny01xiwrk"; - }; - - buildInputs = [ curl ]; - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - homepage = "https://www.curlpp.org/"; - description = "C++ wrapper around libcURL"; - mainProgram = "curlpp-config"; - license = licenses.mit; - maintainers = with maintainers; [ CrazedProgrammer ]; - }; -} diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/development/libraries/cutee/default.nix deleted file mode 100644 index eb5f51cbcfeb..000000000000 --- a/pkgs/development/libraries/cutee/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "cutee"; - version = "0.4.2"; - - src = fetchurl { - url = "http://www.codesink.org/download/${pname}-${version}.tar.gz"; - sha256 = "18bzvhzx8k24mpcim5669n3wg9hd0sfsxj8zjpbr24hywrlppgc2"; - }; - - buildFlags = [ "cutee" ]; - - installPhase = '' - mkdir -p $out/bin - cp cutee $out/bin - ''; - - meta = with lib; { - description = "C++ Unit Testing Easy Environment"; - mainProgram = "cutee"; - homepage = "https://www.codesink.org/cutee_unit_testing.html"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ leenaars]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix deleted file mode 100644 index d8c472870c43..000000000000 --- a/pkgs/development/libraries/cwiid/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, bison -, flex -, bluez -, pkg-config -, gtk2 -}: - -stdenv.mkDerivation rec { - pname = "cwiid"; - version = "unstable-2010-02-21"; - - src = fetchFromGitHub { - owner = "abstrakraft"; - repo = "cwiid"; - rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82"; - sha256 = "0qdb0x757k76nfj32xc2nrrdqd9jlwgg63vfn02l2iznnzahxp0h"; - }; - - hardeningDisable = [ "format" ]; - - configureFlags = [ "--without-python" ]; - - prePatch = '' - sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in - ''; - - patches = [ - ./fix-ar.diff - ]; - - buildInputs = [ - bluez - gtk2 - ]; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - bison - flex - ]; - - NIX_LDFLAGS = "-lbluetooth"; - - postInstall = '' - # Some programs (for example, cabal-install) have problems with the double 0 - sed -i -e "s/0.6.00/0.6.0/" $out/lib/pkgconfig/cwiid.pc - ''; - - meta = with lib; { - description = "Linux Nintendo Wiimote interface"; - homepage = "http://cwiid.org"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ bennofs ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/cwiid/fix-ar.diff b/pkgs/development/libraries/cwiid/fix-ar.diff deleted file mode 100644 index 8ca4b885a0a3..000000000000 --- a/pkgs/development/libraries/cwiid/fix-ar.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/common/include/lib.mak.in b/common/include/lib.mak.in -index 3afbb14..b8df9d9 100644 ---- a/common/include/lib.mak.in -+++ b/common/include/lib.mak.in -@@ -22,7 +22,7 @@ static: $(STATIC_LIB) - shared: $(SHARED_LIB) - - $(STATIC_LIB): $(OBJECTS) -- ar rcs $(STATIC_LIB) $(OBJECTS) -+ $(AR) rcs $(STATIC_LIB) $(OBJECTS) - - $(SHARED_LIB): $(OBJECTS) - $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $(SHARED_LIB) \ -diff --git a/configure.ac b/configure.ac -index 82ca3e1..0a78283 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -15,6 +15,8 @@ if test "$YACC" != "bison -y"; then - AC_MSG_ERROR([bison not found]) - fi - -+AC_CHECK_TOOL([AR], [ar], [:]) -+ - AC_ARG_WITH( - [python], - [AS_HELP_STRING([--without-python],[compile without python support])], diff --git a/pkgs/development/libraries/cxx-prettyprint/default.nix b/pkgs/development/libraries/cxx-prettyprint/default.nix deleted file mode 100644 index f632fca714cf..000000000000 --- a/pkgs/development/libraries/cxx-prettyprint/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "cxx-prettyprint-unstable"; - version = "2016-04-30"; - rev = "9ab26d228f2960f50b38ad37fe0159b7381f7533"; - - src = fetchFromGitHub { - owner = "louisdx"; - repo = "cxx-prettyprint"; - inherit rev; - sha256 = "1bp25yw8fb0mi432f72ihfxfj887gi36b36fpv677gawm786l7p1"; - }; - - installPhase = '' - mkdir -p "$out/include" - cp prettyprint.hpp "$out/include" - ''; - - meta = with lib; { - description = "Header only C++ library for pretty printing standard containers"; - homepage = "https://github.com/louisdx/cxx-prettyprint"; - license = lib.licenses.boost; - platforms = platforms.all; - - # This is a header-only library, no point in hydra building it: - hydraPlatforms = []; - }; -} diff --git a/pkgs/development/libraries/cxx-rs/Cargo.lock b/pkgs/development/libraries/cxx-rs/Cargo.lock deleted file mode 100644 index 157563e60f94..000000000000 --- a/pkgs/development/libraries/cxx-rs/Cargo.lock +++ /dev/null @@ -1,427 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "cc" -version = "1.0.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" -dependencies = [ - "jobserver", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clang-ast" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52a6edb6daf3175c637a7c78e46cde7729af8d07d43f36935680a88fd55c0f1c" -dependencies = [ - "serde", -] - -[[package]] -name = "clap" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa91278560fc226a5d9d736cc21e485ff9aad47d26b8ffe1f54cba868b684b9f" -dependencies = [ - "bitflags", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_lex" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "cxx" -version = "1.0.94" -dependencies = [ - "cc", - "cxx-build", - "cxx-gen", - "cxx-test-suite", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", - "rustversion", - "trybuild", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -dependencies = [ - "cc", - "codespan-reporting", - "cxx", - "cxx-gen", - "once_cell", - "pkg-config", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.15", -] - -[[package]] -name = "cxx-gen" -version = "0.7.94" -dependencies = [ - "codespan-reporting", - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "cxx-test-suite" -version = "0.0.0" -dependencies = [ - "cxx", - "cxx-build", - "cxxbridge-flags", -] - -[[package]] -name = "cxxbridge-cmd" -version = "1.0.94" -dependencies = [ - "clap", - "codespan-reporting", - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -dependencies = [ - "clang-ast", - "cxx", - "flate2", - "memmap", - "proc-macro2", - "quote", - "serde", - "serde_json", - "syn 2.0.15", -] - -[[package]] -name = "demo" -version = "0.0.0" -dependencies = [ - "cxx", - "cxx-build", -] - -[[package]] -name = "dissimilar" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd5f0c7e4bd266b8ab2550e6238d2e74977c23c15536ac7be45e9c95e2e3fbbb" - -[[package]] -name = "flate2" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "itoa" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" - -[[package]] -name = "jobserver" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" -dependencies = [ - "libc", -] - -[[package]] -name = "libc" -version = "0.2.139" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" - -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] -name = "memmap" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "once_cell" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" - -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[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 = "quote" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rustversion" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" - -[[package]] -name = "ryu" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" - -[[package]] -name = "scratch" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" - -[[package]] -name = "serde" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "serde_json" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" -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 = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "toml" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" -dependencies = [ - "serde", -] - -[[package]] -name = "trybuild" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1212c215a87a183687a7cc7065901b1a98da6b37277d51a1b5faedbb4efd4f3" -dependencies = [ - "dissimilar", - "glob", - "once_cell", - "serde", - "serde_derive", - "serde_json", - "termcolor", - "toml", -] - -[[package]] -name = "unicode-ident" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/development/libraries/cxx-rs/default.nix b/pkgs/development/libraries/cxx-rs/default.nix deleted file mode 100644 index a2864fbb89df..000000000000 --- a/pkgs/development/libraries/cxx-rs/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ cxx-rs, fetchFromGitHub, lib, rustPlatform, testers }: - -rustPlatform.buildRustPackage rec { - pname = "cxx-rs"; - version = "1.0.94"; - - src = fetchFromGitHub { - owner = "dtolnay"; - repo = "cxx"; - rev = version; - sha256 = "sha256-h6TmQyxhoOhaAWBZr9rRPCf0BE2QMBIYm5uTVKD2paE="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - }; - - postPatch = '' - cp ${./Cargo.lock} Cargo.lock - ''; - - cargoBuildFlags = [ - "--workspace" - "--exclude=demo" - ]; - - postBuild = '' - cargo doc --release - ''; - - cargoTestFlags = [ "--workspace" ]; - - outputs = [ "out" "doc" "dev" ]; - - postInstall = '' - mkdir -p $doc - cp -r ./target/doc/* $doc - - mkdir -p $dev/include/rust - install -D -m 0644 ./include/cxx.h $dev/include/rust - ''; - - passthru.tests.version = testers.testVersion { - package = cxx-rs; - command = "cxxbridge --version"; - }; - - meta = with lib; { - description = "Safe FFI between Rust and C++"; - mainProgram = "cxxbridge"; - homepage = "https://github.com/dtolnay/cxx"; - license = licenses.mit; - maintainers = with maintainers; [ centromere ]; - }; -} diff --git a/pkgs/development/libraries/cxxopts/default.nix b/pkgs/development/libraries/cxxopts/default.nix deleted file mode 100644 index 89276c7a0b44..000000000000 --- a/pkgs/development/libraries/cxxopts/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, icu -, pkg-config -, enableUnicodeHelp ? true -}: - -stdenv.mkDerivation rec { - pname = "cxxopts"; - version = "3.2.1"; - - src = fetchFromGitHub { - owner = "jarro2783"; - repo = "cxxopts"; - rev = "v${version}"; - sha256 = "sha256-aOF3owz7SIV4trJY0PnMtIcwqoUpDbB3tNxZcsl9dzM="; - }; - - buildInputs = lib.optionals enableUnicodeHelp [ icu.dev ]; - cmakeFlags = [ "-DCXXOPTS_BUILD_EXAMPLES=OFF" ] - ++ lib.optional enableUnicodeHelp "-DCXXOPTS_USE_UNICODE_HELP=TRUE"; - nativeBuildInputs = [ cmake ] ++ lib.optionals enableUnicodeHelp [ pkg-config ]; - - doCheck = true; - - # Conflict on case-insensitive filesystems. - dontUseCmakeBuildDir = true; - - # https://github.com/jarro2783/cxxopts/issues/332 - postPatch = '' - substituteInPlace packaging/pkgconfig.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - - meta = with lib; { - homepage = "https://github.com/jarro2783/cxxopts"; - description = "Lightweight C++ GNU-style option parser library"; - license = licenses.mit; - maintainers = [ maintainers.spease ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix deleted file mode 100644 index 8682c8ba8196..000000000000 --- a/pkgs/development/libraries/cxxtools/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, tzdata -, autoreconfHook -, openssl -}: - -stdenv.mkDerivation rec { - pname = "cxxtools"; - version = "3.0"; - - src = fetchFromGitHub { - owner = "maekitalo"; - repo = "cxxtools"; - rev = "V${version}"; - hash = "sha256-AiMVmtvI20nyv/nuHHxGH4xFnlc9AagVkKlnRlaYCPM="; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/maekitalo/cxxtools/commit/b773c01fc13d2ae67abc0839888e383be23562fd.patch"; - hash = "sha256-9yRkD+vMRhc4n/Xh6SKtmllBrmfDx3IBVOtHQV6s7Tw="; - }) - (fetchpatch { - url = "https://github.com/maekitalo/cxxtools/commit/6e1439a108ce3892428e95f341f2d23ae32a590e.patch"; - hash = "sha256-ZnlbdWBjL9lEtNLEF/ZPa0IzvJ7i4xWI4GbY8KeA6A4="; - }) - ]; - - postPatch = '' - substituteInPlace src/tz.cpp \ - --replace '::getenv("TZDIR")' '"${tzdata}/share/zoneinfo"' - ''; - - nativeBuildInputs = [ - autoreconfHook - ]; - - buildInputs = [ - openssl - ]; - - enableParallelBuilding = true; - - meta = { - homepage = "http://www.tntnet.org/cxxtools.html"; - description = "Comprehensive C++ class library for Unix and Linux"; - platforms = lib.platforms.linux; - license = lib.licenses.lgpl21; - maintainers = [ lib.maintainers.juliendehos ]; - }; -} diff --git a/pkgs/development/libraries/cyclonedds/0001-Use-full-path-in-pkgconfig.patch b/pkgs/development/libraries/cyclonedds/0001-Use-full-path-in-pkgconfig.patch deleted file mode 100644 index 5d41552df37c..000000000000 --- a/pkgs/development/libraries/cyclonedds/0001-Use-full-path-in-pkgconfig.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4534f88f676d9a07a227aed7b56255dd84d2b906 Mon Sep 17 00:00:00 2001 -From: Pascal Bach <pascal.bach@nextrem.ch> -Date: Mon, 3 Oct 2022 22:57:34 +0200 -Subject: [PATCH] Use full path in pkgconfig - -Signed-off-by: Pascal Bach <pascal.bach@nextrem.ch> ---- - PkgConfig.pc.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/PkgConfig.pc.in b/PkgConfig.pc.in -index 381e2343..93860ff0 100644 ---- a/PkgConfig.pc.in -+++ b/PkgConfig.pc.in -@@ -1,6 +1,6 @@ - prefix=@CMAKE_INSTALL_PREFIX@ --includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ --libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ - - Name: @PROJECT_NAME@ - Description: Eclipse Cyclone DDS library --- -2.37.3 - diff --git a/pkgs/development/libraries/cyclonedds/default.nix b/pkgs/development/libraries/cyclonedds/default.nix deleted file mode 100644 index bdea4b68138a..000000000000 --- a/pkgs/development/libraries/cyclonedds/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "cyclonedds"; - version = "0.10.5"; - - src = fetchFromGitHub { - owner = "eclipse-cyclonedds"; - repo = "cyclonedds"; - rev = version; - sha256 = "sha256-MQVUZ7PkxauoPpfxlhhAtsKztMe9tcZOpOzshuz/eb8="; - }; - - patches = [ - ./0001-Use-full-path-in-pkgconfig.patch - ]; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Eclipse Cyclone DDS project"; - homepage = "https://cyclonedds.io/"; - license = with licenses; [ epl20 ]; - maintainers = with maintainers; [ bachp ]; - }; -} diff --git a/pkgs/development/libraries/cyrus-sasl-xoauth2/default.nix b/pkgs/development/libraries/cyrus-sasl-xoauth2/default.nix deleted file mode 100644 index bc81574a0cdf..000000000000 --- a/pkgs/development/libraries/cyrus-sasl-xoauth2/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, libtool, automake, cyrus_sasl }: - -stdenv.mkDerivation rec { - pname = "cyrus-sasl-xoauth2"; - version = "0.2"; - - src = fetchFromGitHub { - owner = "moriyoshi"; - repo = "cyrus-sasl-xoauth2"; - rev = "v${version}"; - sha256 = "sha256-lI8uKtVxrziQ8q/Ss+QTgg1xTObZUTAzjL3MYmtwyd8="; - }; - - nativeBuildInputs = [ autoconf libtool automake ]; - - buildInputs = [ cyrus_sasl ]; - - preConfigure = "./autogen.sh"; - - configureFlags = [ - "--with-cyrus-sasl=${placeholder "out"}" - ]; - - meta = with lib; { - homepage = "https://github.com/moriyoshi/cyrus-sasl-xoauth2"; - description = "XOAUTH2 mechanism plugin for cyrus-sasl"; - platforms = platforms.unix; - license = licenses.mit; - maintainers = with lib.maintainers; [ wentasah ]; - }; -} diff --git a/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch b/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch deleted file mode 100644 index f0376792e002..000000000000 --- a/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/m4/sasl2.m4 b/m4/sasl2.m4 -index 098c853a..91d98def 100644 ---- a/m4/sasl2.m4 -+++ b/m4/sasl2.m4 -@@ -350,7 +350,7 @@ int main(void) - - return (!have_spnego); // 0 = success, 1 = failure - } --],[ac_cv_gssapi_supports_spnego=yes],[ac_cv_gssapi_supports_spnego=no]) -+],[ac_cv_gssapi_supports_spnego=yes],[ac_cv_gssapi_supports_spnego=no],[ac_cv_gssapi_supports_spnego=no]) - LIBS="$cmu_save_LIBS" - ]) - AS_IF([test "$ac_cv_gssapi_supports_spnego" = yes],[ diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix deleted file mode 100644 index 0b151bfc719a..000000000000 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, openssl, openldap, libkrb5, db, gettext -, pam, libxcrypt, fixDarwinDylibNames, autoreconfHook, enableLdap ? false -, buildPackages, pruneLibtoolFiles, nixosTests }: - -stdenv.mkDerivation rec { - pname = "cyrus-sasl"; - version = "2.1.28"; - - src = fetchurl { - urls = - [ "https://github.com/cyrusimap/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz" - "http://www.cyrusimap.org/releases/${pname}-${version}.tar.gz" - "http://www.cyrusimap.org/releases/old/${pname}-${version}.tar.gz" - ]; - sha256 = "sha256-fM/Gq9Ae1nwaCSSzU+Um8bdmsh9C1FYu5jWo6/xbs4w="; - }; - - patches = [ - # Fix cross-compilation - ./cyrus-sasl-ac-try-run-fix.patch - # make compatible with openssl3. can probably be dropped with any release after 2.1.28 - (fetchpatch { - url = "https://github.com/cyrusimap/cyrus-sasl/compare/cb549ef71c5bb646fe583697ebdcaba93267a237...dfaa62392e7caecc6ecf0097b4d73738ec4fc0a8.patch"; - hash = "sha256-pc0cZqj1QoxDqgd/j/5q3vWONEPrTm4Pr6MzHlfjRCc="; - }) - ]; - - outputs = [ "bin" "dev" "out" "man" "devdoc" ]; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ autoreconfHook pruneLibtoolFiles ] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = - [ openssl db gettext libkrb5 libxcrypt ] - ++ lib.optional enableLdap openldap - ++ lib.optional stdenv.isLinux pam; - - configureFlags = [ - "--with-openssl=${openssl.dev}" - "--with-plugindir=${placeholder "out"}/lib/sasl2" - "--with-saslauthd=/run/saslauthd" - "--enable-login" - "--enable-shared" - ] ++ lib.optional enableLdap "--with-ldap=${openldap.dev}" - ++ lib.optionals (stdenv.targetPlatform.useLLVM or false) [ - "--disable-sample" - "CFLAGS=-DTIME_WITH_SYS_TIME" - ]; - - installFlags = lib.optionals stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ]; - - passthru.tests = { - inherit (nixosTests) parsedmarc postfix; - }; - - meta = with lib; { - homepage = "https://www.cyrusimap.org/sasl"; - description = "Library for adding authentication support to connection-based protocols"; - platforms = platforms.unix; - license = licenses.bsdOriginal; - }; -} diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/default.nix deleted file mode 100644 index db2b99c96650..000000000000 --- a/pkgs/development/libraries/czmq/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, zeromq }: - -stdenv.mkDerivation rec { - version = "4.2.1"; - pname = "czmq"; - - src = fetchurl { - url = "https://github.com/zeromq/czmq/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-XXIKIEwqWGRdb3ZDrxXVY6cS2tmMnTLB7ZEzd9qmrDk="; - }; - - # Needs to be propagated for the .pc file to work - propagatedBuildInputs = [ zeromq ]; - - meta = with lib; { - homepage = "http://czmq.zeromq.org/"; - description = "High-level C Binding for ZeroMQ"; - mainProgram = "zmakecert"; - license = licenses.mpl20; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/dab_lib/default.nix b/pkgs/development/libraries/dab_lib/default.nix deleted file mode 100644 index 82d591abc139..000000000000 --- a/pkgs/development/libraries/dab_lib/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, faad2, fftwFloat, zlib -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dab_lib"; - version = "unstable-2023-03-02"; - - src = fetchFromGitHub { - owner = "JvanKatwijk"; - repo = "dab-cmdline"; - rev = "d615e2ba085f91dc7764cc28dfc4c9df49ee1a93"; - hash = "sha256-KSkOg0a5iq+13kClQqj+TaEP/PsLUrm8bMmiJEAZ+C4="; - }; - - sourceRoot = "${finalAttrs.src.name}/library"; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ faad2 fftwFloat zlib ]; - - meta = with lib; { - description = "DAB/DAB+ decoding library"; - homepage = "https://github.com/JvanKatwijk/dab-cmdline"; - license = licenses.gpl2; - maintainers = with maintainers; [ alexwinter ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix deleted file mode 100644 index d0b77e2477c9..000000000000 --- a/pkgs/development/libraries/dav1d/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, nasm -, pkg-config -, xxHash -, withTools ? false # "dav1d" binary -, withExamples ? false -, SDL2 # "dav1dplay" binary -, useVulkan ? false -, libplacebo -, vulkan-loader -, vulkan-headers - - # for passthru.tests -, ffmpeg -, gdal -, handbrake -, libavif -, libheif -}: - -assert useVulkan -> withExamples; - -stdenv.mkDerivation rec { - pname = "dav1d"; - version = "1.4.3"; - - src = fetchFromGitHub { - owner = "videolan"; - repo = pname; - rev = version; - hash = "sha256-uudtA9ZpGIpw1yfCzbywFyH7EWYHuXfE6pBb2eksx1g="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ meson ninja nasm pkg-config ]; - # TODO: doxygen (currently only HTML and not build by default). - buildInputs = [ xxHash ] - ++ lib.optional withExamples SDL2 - ++ lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ]; - - mesonFlags = [ - "-Denable_tools=${lib.boolToString withTools}" - "-Denable_examples=${lib.boolToString withExamples}" - ]; - - doCheck = true; - - passthru.tests = { - inherit - ffmpeg - gdal - handbrake - libavif - libheif; - }; - - meta = with lib; { - description = "Cross-platform AV1 decoder focused on speed and correctness"; - longDescription = '' - The goal of this project is to provide a decoder for most platforms, and - achieve the highest speed possible to overcome the temporary lack of AV1 - hardware decoder. It supports all features from AV1, including all - subsampling and bit-depth parameters. - ''; - inherit (src.meta) homepage; - changelog = "https://code.videolan.org/videolan/dav1d/-/tags/${version}"; - # More technical: https://code.videolan.org/videolan/dav1d/blob/${version}/NEWS - license = licenses.bsd2; - platforms = platforms.unix ++ platforms.windows; - maintainers = with maintainers; [ primeos ]; - }; -} diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index d715c1ffc8b1..936aed633a44 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (rec { (if compat185 then "--enable-compat185" else "--disable-compat185") ] ++ lib.optional dbmSupport "--enable-dbm" - ++ lib.optional stdenv.isFreeBSD "--with-pic"; + ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic"; preConfigure = '' cd build_unix diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix deleted file mode 100644 index 95dbdce239c7..000000000000 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, dbus, glib, pkg-config, expat }: - -stdenv.mkDerivation rec { - pname = "dbus-cplusplus"; - version = "0.9.0"; - - src = fetchurl { - url = "mirror://sourceforge/dbus-cplusplus/dbus-c%2B%2B/0.9.0/libdbus-c%2B%2B-0.9.0.tar.gz"; - name = "${pname}-${version}.tar.gz"; - sha256 = "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw"; - }; - - patches = [ - (fetchurl { - name = "gcc-4.7.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/" - + "dbus-c++/files/dbus-c++-0.9.0-gcc-4.7.patch"; - sha256 = "0rwcz9pvc13b3yfr0lkifnfz0vb5q6dg240bzgf37ni4s8rpc72g"; - }) - (fetchpatch { - name = "writechar.patch"; # since gcc7 - url = "https://src.fedoraproject.org/rpms/dbus-c++/raw/9f515ace0594c8b2b9f0d41ffe71bc5b78d30eee/f/dbus-c++-writechar.patch"; - sha256 = "1kkg4gbpm4hp87l25zw2a3r9c58g7vvgzcqgiman734i66zsbb9l"; - }) - (fetchpatch { - name = "threading.patch"; # since gcc7 - url = "https://src.fedoraproject.org/rpms/dbus-c++/raw/9f515ace0594c8b2b9f0d41ffe71bc5b78d30eee/f/dbus-c++-threading.patch"; - sha256 = "1h362anx3wyxm5lq0v8girmip1jmkdbijrmbrq7k5pp47zkhwwrq"; - }) - (fetchpatch { - name = "template-operators.patch"; # since gcc12 - url = "https://src.fedoraproject.org/rpms/dbus-c++/raw/9f515ace0594c8b2b9f0d41ffe71bc5b78d30eee/f/dbus-c++-template-operators.patch"; - hash = "sha256-B8S7z/YH2YEQgaRsBJBBVTx8vHQhHW7z171TZmogpL8="; - }) - (fetchpatch { - name = "0001-src-eventloop.cpp-use-portable-method-for-initializi.patch"; - url = "https://github.com/openembedded/meta-openembedded/raw/119e75e48dbf0539b4e440417901458ffff79b38/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0001-src-eventloop.cpp-use-portable-method-for-initializi.patch"; - hash = "sha256-GJWvp5F26c88OCGLrFcXaqUl2FMSDCluppMrRQO3rzc="; - }) - (fetchpatch { - name = "0002-tools-generate_proxy.cpp-avoid-possibly-undefined-ui.patch"; - url = "https://github.com/openembedded/meta-openembedded/raw/119e75e48dbf0539b4e440417901458ffff79b38/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0002-tools-generate_proxy.cpp-avoid-possibly-undefined-ui.patch"; - hash = "sha256-P9JuG/6k5L6NTiAGH9JRfNcwpNVOV29RQC6fTj0fKZE="; - }) - (fetchpatch { - name = "0003-Fixed-undefined-ssize_t-for-clang-3.8.0-on-FreeBSD.patch"; - url = "https://github.com/openembedded/meta-openembedded/raw/119e75e48dbf0539b4e440417901458ffff79b38/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0003-Fixed-undefined-ssize_t-for-clang-3.8.0-on-FreeBSD.patch"; - hash = "sha256-/RCpDvaLIw0kmuBvUGbfnVEvgTKjIQWcSKWheCfgSmM="; - }) - ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dbus glib expat ]; - - configureFlags = [ - "--disable-ecore" - "--disable-tests" - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - "--disable-examples" - ]; - - meta = with lib; { - homepage = "https://dbus-cplusplus.sourceforge.net"; - description = "C++ API for D-BUS"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix deleted file mode 100644 index b2946872fbbd..000000000000 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, buildPackages -, pkg-config, expat, gettext, libiconv, dbus, glib -}: - -stdenv.mkDerivation rec { - pname = "dbus-glib"; - version = "0.112"; - - src = fetchurl { - url = "${meta.homepage}/releases/dbus-glib/dbus-glib-${version}.tar.gz"; - sha256 = "sha256-fVUNzN/NKG4ziVUBgp7Zce62XGFOc6rbSgiu73GbFDo="; - }; - - outputs = [ "out" "dev" "devdoc" ]; - outputBin = "dev"; - - nativeBuildInputs = [ pkg-config gettext glib ]; - - buildInputs = [ expat libiconv ]; - - propagatedBuildInputs = [ dbus glib ]; - - configureFlags = [ "--exec-prefix=${placeholder "dev"}" ] ++ - lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) - "--with-dbus-binding-tool=${buildPackages.dbus-glib.dev}/bin/dbus-binding-tool"; - - doCheck = false; - - passthru = { inherit dbus glib; }; - - meta = { - homepage = "https://dbus.freedesktop.org"; - license = with lib.licenses; [ afl21 gpl2Plus ]; - description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism"; - mainProgram = "dbus-binding-tool"; - maintainers = [ ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index cb5fe9e4fbd3..017c83c5b11d 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -13,7 +13,7 @@ , xmlto , autoreconfHook , autoconf-archive -, x11Support ? (stdenv.isLinux || stdenv.isDarwin) +, x11Support ? (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) , xorg }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-uh8h0r2dM52i1KqHgMCd8y/qh5mLc9ok9Jq53x42pQ8="; }; - patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; + patches = lib.optional stdenv.hostPlatform.isSunOS ./implement-getgrouplist.patch; postPatch = '' substituteInPlace bus/Makefile.am \ @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { libICE libSM ]) ++ lib.optional enableSystemd systemdMinimal - ++ lib.optionals stdenv.isLinux [ audit libapparmor ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ audit libapparmor ]; # ToDo: optional selinux? __darwinAllowLocalNetworking = true; @@ -84,10 +84,10 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" ] ++ lib.optional (!x11Support) "--without-x" - ++ lib.optionals stdenv.isLinux [ "--enable-apparmor" "--enable-libaudit" ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-apparmor" "--enable-libaudit" ] ++ lib.optionals enableSystemd [ "SYSTEMCTL=${systemdMinimal}/bin/systemctl" ]; - NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed"; + NIX_CFLAGS_LINK = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-Wl,--as-needed"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/dbxml/cxx11.patch b/pkgs/development/libraries/dbxml/cxx11.patch deleted file mode 100644 index f264515c7d67..000000000000 --- a/pkgs/development/libraries/dbxml/cxx11.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -urN dbxml-6.1.4.orig/dbxml/src/dbxml/nodeStore/NsUpdate.cpp dbxml-6.1.4/dbxml/src/dbxml/nodeStore/NsUpdate.cpp ---- dbxml-6.1.4.orig/dbxml/src/dbxml/nodeStore/NsUpdate.cpp 2017-05-01 16:05:29.000000000 +0100 -+++ dbxml-6.1.4/dbxml/src/dbxml/nodeStore/NsUpdate.cpp 2017-09-04 11:50:20.000000000 +0100 -@@ -1359,21 +1359,13 @@ - void NsUpdate::attributeRemoved(const DbXmlNodeImpl &node) - { - string key = makeKey(node); --#if defined(_MSC_VER) && (_MSC_VER>1600) - attrMap_.insert(make_pair(key,node.getIndex())); --#else -- attrMap_.insert(make_pair<const std::string, int>(key,node.getIndex())); --#endif - } - - void NsUpdate::textRemoved(const DbXmlNodeImpl &node) - { - string key = makeKey(node); --#if defined(_MSC_VER) && (_MSC_VER>1600) - textDeleteMap_.insert(make_pair(key,node.getIndex())); --#else -- textDeleteMap_.insert(make_pair<const std::string, int>(key,node.getIndex())); --#endif - } - - void NsUpdate::textRemoved(int index, const NsNid &nid, -@@ -1381,21 +1373,13 @@ - const std::string &cname) - { - string key = makeKey(nid, did, cname); --#if defined(_MSC_VER) && (_MSC_VER>1600) - textDeleteMap_.insert(make_pair(key,index)); --#else -- textDeleteMap_.insert(make_pair<const std::string, int>(key,index)); --#endif - } - - void NsUpdate::textInserted(int index, const DbXmlNodeImpl &node) - { - string key = makeKey(node); --#if defined(_MSC_VER) && (_MSC_VER>1600) - textInsertMap_.insert(make_pair(key,index)); --#else -- textInsertMap_.insert(make_pair<const std::string, int>(key,index)); --#endif - } - - void NsUpdate::textInserted(int index, const NsNid &nid, -@@ -1403,11 +1387,7 @@ - const std::string &cname) - { - string key = makeKey(nid, did, cname); --#if defined(_MSC_VER) && (_MSC_VER>1600) - textInsertMap_.insert(make_pair(key,index)); --#else -- textInsertMap_.insert(make_pair<const std::string, int>(key,index)); --#endif - } - - // diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/development/libraries/dbxml/default.nix deleted file mode 100644 index 207904b96cdc..000000000000 --- a/pkgs/development/libraries/dbxml/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchurl, db62, xercesc, xqilla }: - -stdenv.mkDerivation rec { - pname = "dbxml"; - version = "6.1.4"; - - src = fetchurl { - url = "http://download.oracle.com/berkeley-db/${pname}-${version}.tar.gz"; - sha256 = "a8fc8f5e0c3b6e42741fa4dfc3b878c982ff8f5e5f14843f6a7e20d22e64251a"; - }; - - outputs = [ "bin" "dev" "out" ]; - - patches = [ - ./cxx11.patch - ./incorrect-optimization.patch - ]; - - buildInputs = [ - xercesc xqilla - ]; - - propagatedBuildInputs = [ - db62 - ]; - - configureFlags = [ - "--with-berkeleydb=${db62.out}" - "--with-xerces=${xercesc}" - "--with-xqilla=${xqilla}" - # code uses register storage specifier - "CXXFLAGS=-std=c++14" - ]; - - preConfigure = '' - cd dbxml - ''; - - meta = with lib; { - homepage = "https://www.oracle.com/database/berkeley-db/xml.html"; - description = "Embeddable XML database based on Berkeley DB"; - license = licenses.agpl3Only; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/dbxml/incorrect-optimization.patch b/pkgs/development/libraries/dbxml/incorrect-optimization.patch deleted file mode 100644 index 630dc972e188..000000000000 --- a/pkgs/development/libraries/dbxml/incorrect-optimization.patch +++ /dev/null @@ -1,34 +0,0 @@ -Patch provided by Lauren Foutz. See: -https://community.oracle.com/thread/4093422 - ---- dbxml-6.1.4-orig/dbxml/src/dbxml/query/ParentOfChildJoinQP.cpp -+++ dbxml-6.1.4/dbxml/src/dbxml/query/ParentOfChildJoinQP.cpp -@@ -139,28 +139,16 @@ bool ParentOfChildIterator::doJoin(Dynam - - // Invarient 4: When ancestorStack_ is empty we can output the - // buffered results_, since any more results will come after them in - // document order. - - while(true) { - context->testInterrupt(); - -- /* -- * If current parent's node level already be larger than -- * childen's, abandon current parent and move to next one. -- */ -- if (parents_ != NULL && -- parents_->getNodeLevel() > children_->getNodeLevel()) { -- if(!parents_->next(context)) { -- delete parents_; -- parents_ = 0; -- } -- } -- - int cmp = parents_ == 0 ? -1 : isDescendantOf(children_, parents_, /*orSelf*/false); - if(cmp < 0) { - if(!ancestorStack_.empty()) { - // We've found the closest ancestor - is it a parent? - if(ancestorStack_.back()->getNodeLevel() == (children_->getNodeLevel() - 1)) { - // Maintain invarient 3 - if(results_.empty() || NodeInfo::compare(results_.back(), ancestorStack_.back()) < 0) - results_.push_back(ancestorStack_.back()); diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/development/libraries/dclib/default.nix deleted file mode 100644 index 05ea7db2cacc..000000000000 --- a/pkgs/development/libraries/dclib/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{lib, stdenv, fetchurl, libxml2, openssl, bzip2}: - -stdenv.mkDerivation rec { - pname = "dclib"; - version = "0.3.7"; - - src = fetchurl { - url = "ftp://ftp.debian.nl/pub/freebsd/ports/distfiles/dclib-${version}.tar.bz2"; - sha256 = "02jdzm5hqzs1dv2rd596vgpcjaapm55pqqapz5m94l30v4q72rfc"; - }; - - buildInputs = [libxml2 openssl bzip2]; - - meta = with lib; { - description = "Peer-to-Peer file sharing client"; - homepage = "http://dcgui.berlios.de"; - platforms = platforms.linux; - license = [ licenses.openssl licenses.gpl2 ]; - }; -} diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix deleted file mode 100644 index ac2664a1c9f9..000000000000 --- a/pkgs/development/libraries/dclxvi/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation { - pname = "dclxvi"; - version = "unstable-2013-01-27"; - - src = fetchFromGitHub { - owner = "agl"; - repo = "dclxvi"; - rev = "74009d58f2305be3b95d88717619bde8ecbdd9a2"; - sha256 = "1kx4h8iv7yb30c6zjmj8zs9x12vxhi0jwkiwxsxj9swf6bww6p1g"; - }; - - buildFlags = [ "libdclxvipairing.so" ]; - - patchPhase = '' - substituteInPlace Makefile \ - --replace "gcc" "cc" - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile \ - --replace "-soname=libdclxvipairing.so" "-install_name,libdclxvipairing.so" - ''; - - installPhase = '' - mkdir -p $out/{include,lib} - find . -name \*.h -exec cp {} $out/include \; - find . -name \*.so -exec cp {} $out/lib \; - ''; - - meta = with lib; { - homepage = "https://github.com/agl/dclxvi"; - description = "Naehrig, Niederhagen and Schwabe's pairings code, massaged into a shared library"; - platforms = platforms.x86_64; - license = licenses.publicDomain; - }; -} diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix deleted file mode 100644 index 0dddcb5d6482..000000000000 --- a/pkgs/development/libraries/dconf/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ lib, stdenv -, fetchurl -, meson -, mesonEmulatorHook -, ninja -, python3 -, vala -, libxslt -, pkg-config -, glib -, bash-completion -, dbus -, gnome -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_42 -, nixosTests -, withDocs ? true -}: - -stdenv.mkDerivation rec { - pname = "dconf"; - version = "0.40.0"; - - outputs = [ "out" "lib" "dev" ] - ++ lib.optional withDocs "devdoc"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0cs5nayg080y8pb9b7qccm1ni8wkicdmqp1jsgc22110r6j24zyg"; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - python3 - libxslt - glib - docbook-xsl-nons - docbook_xml_dtd_42 - gtk-doc - ] ++ lib.optionals (withDocs && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook # gtkdoc invokes the host binary to produce documentation - ]; - - - buildInputs = [ - glib - bash-completion - dbus - vala - ]; - - mesonFlags = [ - "--sysconfdir=/etc" - "-Dgtk_doc=${lib.boolToString withDocs}" - ]; - - nativeCheckInputs = [ - dbus # for dbus-daemon - ]; - - doCheck = !stdenv.isAarch32 && !stdenv.isAarch64 && !stdenv.isDarwin; - - postPatch = '' - chmod +x meson_post_install.py tests/test-dconf.py - patchShebangs meson_post_install.py - patchShebangs tests/test-dconf.py - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - tests = { inherit (nixosTests) dconf; }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/dconf"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; - maintainers = teams.gnome.members; - mainProgram = "dconf"; - }; -} diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix deleted file mode 100644 index be6a2da6566c..000000000000 --- a/pkgs/development/libraries/directfb/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch -, autoreconfHook, perl, pkg-config, flux, zlib -, libjpeg, freetype, libpng, giflib -, enableX11 ? true, xorg -, enableSDL ? true, SDL }: - -stdenv.mkDerivation rec { - pname = "directfb"; - version = "1.7.7"; - - src = fetchFromGitHub { - owner = "deniskropp"; - repo = "DirectFB"; - rev = "DIRECTFB_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0bs3yzb7hy3mgydrj8ycg7pllrd2b6j0gxj596inyr7ihssr3i0y"; - }; - - patches = [ - # Fixes build in "davinci" with glibc >= 2.28 - # The "davinci" module is only enabled on 32-bit arm. - # https://github.com/deniskropp/DirectFB/pull/17 - (fetchpatch { - url = "https://github.com/deniskropp/DirectFB/commit/3a236241bbec3f15b012b6f0dbe94353d8094557.patch"; - sha256 = "0rj3gv0zlb225sqjz04p4yagy4xacf3210aa8vra8i1f0fv0w4kw"; - }) - - # Fixes for build of `pkgsMusl.directfb`; applied everywhere to prevent patchrot - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/community/directfb/0001-directfb-fix-musl-compile.patch?id=f8158258493fc0c3eb5de2302e40f4bc44ecfb09"; - sha256 = "sha256-hmwzbaXu30ZkAqUn1NmvtlJkM6ctddKcO4hxh+1LSS4="; - }) - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/community/directfb/0002-Fix-musl-PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP-comp.patch?id=f8158258493fc0c3eb5de2302e40f4bc44ecfb09"; - sha256 = "sha256-j3+mcP6hV9LKuba1GOdcM1cZfmXuJtRgx4vE484jIns="; - }) - # This uses POSIX basename() while directfb expects GNU - # basename(), but the POSIX behaviour of modifying the input - # should be fine since directfb never uses the buffer afterwards. - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/community/directfb/fix-missing-basename.patch?id=bc049ae1bcf9ef3f66cd12a6fbb7ac4e917764b1"; - hash = "sha256-BX/C8+nh2fovHx8vKXFqKzBtfiTKUcW2BUCsaDIhodc="; - }) - ]; - - postPatch = '' - # https://github.com/deniskropp/DirectFB/blob/master/src/core/Makefile.am#L15 - # BUILDTIME is embedded in the result - # if switching to cmake then a similar substitution has to be done - substituteInPlace src/core/Makefile.am \ - --replace '`date -u "+%Y-%m-%d %H:%M"`' "`date -u \"+%Y-%m-%d %H:%M\" --date="@''${SOURCE_DATE_EPOCH}"`" - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - # Specifically patch out two drivers that have build errors with musl libc, - # while leaving the rest of the default selection enabled - substituteInPlace configure.in \ - --replace checkfor_lirc={yes,no} \ - --replace checkfor_matrox={yes,no} - ''; - - nativeBuildInputs = [ autoreconfHook perl pkg-config flux ]; - - buildInputs = [ zlib libjpeg freetype giflib libpng ] - ++ lib.optional enableSDL SDL - ++ lib.optionals enableX11 (with xorg; [ - xorgproto libX11 libXext - libXrender - ]); - - NIX_LDFLAGS = "-lgcc_s"; - - configureFlags = [ - "--enable-sdl" - "--enable-zlib" - "--with-gfxdrivers=all" - "--enable-devmem" - "--enable-fbdev" - "--enable-mmx" - "--enable-sse" - "--with-software" - ] - ++ lib.optional (!stdenv.hostPlatform.isMusl) "--with-smooth-scaling" - ++ lib.optional enableX11 "--enable-x11" - ; - - # Disable parallel building as parallel builds fail due to incomplete - # depends between autogenerated CoreSlave.h and it's include sites: - # CC prealloc_surface_pool_bridge.lo - # prealloc_surface_pool_bridge.c:41:10: - # fatal error: core/CoreSlave.h: No such file or directory - # - # Dependencies are specified manually in src/core/Makefile.am. Instead - # of fixing them one by one locally let's disable parallel builds until - # upstream fixes them. - enableParallelBuilding = false; - - meta = with lib; { - description = "Graphics and input library designed with embedded systems in mind"; - longDescription = '' - DirectFB is a thin library that provides hardware graphics acceleration, - input device handling and abstraction, integrated windowing system with - support for translucent windows and multiple display layers, not only on - top of the Linux Framebuffer Device. It is a complete hardware - abstraction layer with software fallbacks for every graphics operation - that is not supported by the underlying hardware. DirectFB adds graphical - power to embedded systems and sets a new standard for graphics under - Linux. - ''; - homepage = "https://github.com/deniskropp/DirectFB"; - license = licenses.lgpl21; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/development/libraries/directx-headers/default.nix b/pkgs/development/libraries/directx-headers/default.nix deleted file mode 100644 index 061d18d15016..000000000000 --- a/pkgs/development/libraries/directx-headers/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja }: -stdenv.mkDerivation rec { - pname = "directx-headers"; - version = "1.614.0"; - - src = fetchFromGitHub { - owner = "microsoft"; - repo = "DirectX-Headers"; - rev = "v${version}"; - hash = "sha256-0LaN9D3cKVacMJhZCe9oxDPHpd1jdCAV0ImG2rSgnxc="; - }; - - nativeBuildInputs = [ meson ninja ]; - - # tests require WSL2 - mesonFlags = [ "-Dbuild-test=false" ]; - - meta = with lib; { - description = "Official D3D12 headers from Microsoft"; - homepage = "https://github.com/microsoft/DirectX-Headers"; - license = licenses.mit; - maintainers = with maintainers; [ k900 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/discord-rpc/default.nix b/pkgs/development/libraries/discord-rpc/default.nix index f0c60e9506d5..05837c823c56 100644 --- a/pkgs/development/libraries/discord-rpc/default.nix +++ b/pkgs/development/libraries/discord-rpc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ rapidjson - ] ++ lib.optional stdenv.isDarwin AppKit; + ] ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; cmakeFlags = [ "-DBUILD_SHARED_LIBS=true" diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix deleted file mode 100644 index 4cdd66ba9cfe..000000000000 --- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv -, lib -, meson -, ninja -, pkg-config -, fetchFromGitHub -, fetchpatch -, dleyna-core -, glib -}: - -stdenv.mkDerivation rec { - pname = "dleyna-connector-dbus"; - version = "0.4.1"; - - src = fetchFromGitHub { - owner = "phako"; - repo = pname; - rev = "v${version}"; - sha256 = "WDmymia9MD3BRU6BOCzCIMrz9V0ACRzmEGqjbbuUmlA="; - }; - - patches = [ - # Fix build with meson 1.2. We use the gentoo patch intead of the - # usptream one because the latter only applies on the libsoup_3 based - # merged dLeyna project. - # https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6 - (fetchpatch { - url = "https://github.com/gentoo/gentoo/raw/4a0982b49a1d94aa785b05d9b7d256c26c499910/net-libs/dleyna-connector-dbus/files/meson-1.2.0.patch"; - sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - dleyna-core - glib - ]; - - meta = with lib; { - description = "D-Bus API for the dLeyna services"; - homepage = "https://github.com/phako/dleyna-connector-dbus"; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - license = licenses.lgpl21Only; - }; -} diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix deleted file mode 100644 index c9bbae74611e..000000000000 --- a/pkgs/development/libraries/dleyna-core/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, meson -, ninja -, pkg-config -, gupnp -}: - -stdenv.mkDerivation rec { - pname = "dleyna-core"; - version = "0.7.0"; - - outputs = [ "out" "dev" ]; - - setupHook = ./setup-hook.sh; - - src = fetchFromGitHub { - owner = "phako"; - repo = pname; - rev = "v${version}"; - sha256 = "i4L9+iyAdBNtgImbD54jkjYL5hvzeZ2OaAyFrcFmuG0="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - propagatedBuildInputs = [ - gupnp - ]; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ - "-Wno-error=implicit-function-declaration" - "-Wno-error=int-conversion" - ]); - - meta = with lib; { - description = "Library of utility functions that are used by the higher level dLeyna"; - homepage = "https://github.com/phako/dleyna-core"; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - license = licenses.lgpl21Only; - }; -} diff --git a/pkgs/development/libraries/dleyna-core/setup-hook.sh b/pkgs/development/libraries/dleyna-core/setup-hook.sh deleted file mode 100644 index 287ad4dc1897..000000000000 --- a/pkgs/development/libraries/dleyna-core/setup-hook.sh +++ /dev/null @@ -1,8 +0,0 @@ -addDleynaConnectorPath () { - if test -d "$1/lib/dleyna-1.0/connectors" - then - export DLEYNA_CONNECTOR_PATH="${DLEYNA_CONNECTOR_PATH-}${DLEYNA_CONNECTOR_PATH:+:}$1/lib/dleyna-1.0/connectors" - fi -} - -addEnvHooks "$targetOffset" addDleynaConnectorPath diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix deleted file mode 100644 index 61574df27c19..000000000000 --- a/pkgs/development/libraries/dleyna-renderer/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch -, meson -, ninja -, pkg-config -, dleyna-connector-dbus -, dleyna-core -, gssdp -, gupnp -, gupnp-av -, gupnp-dlna -, libsoup -, makeWrapper -, docbook-xsl-nons -, libxslt -}: - -stdenv.mkDerivation rec { - pname = "dleyna-renderer"; - version = "0.7.2"; - - src = fetchFromGitHub { - owner = "phako"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-bGasT3XCa7QHV3D7z59TSHoqWksNSIgaO0z9zYfHHuw="; - }; - - patches = [ - # Fix build with meson 1.2. We use the gentoo patch intead of the - # usptream one because the latter only applies on the libsoup_3 based - # merged dLeyna project. - # https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6 - (fetchpatch { - url = "https://github.com/gentoo/gentoo/raw/2ebe20ff4cda180cc248d31a021107d08ecf39d9/net-libs/dleyna-renderer/files/meson-1.2.0.patch"; - sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - makeWrapper - - # manpage - docbook-xsl-nons - libxslt # for xsltproc - ]; - - buildInputs = [ - dleyna-core - dleyna-connector-dbus # runtime dependency to be picked up to DLEYNA_CONNECTOR_PATH - gssdp - gupnp - gupnp-av - gupnp-dlna - libsoup - ]; - - preFixup = '' - wrapProgram "$out/libexec/dleyna-renderer-service" \ - --set DLEYNA_CONNECTOR_PATH "$DLEYNA_CONNECTOR_PATH" - ''; - - meta = with lib; { - description = "Library to discover and manipulate Digital Media Renderers"; - homepage = "https://github.com/phako/dleyna-renderer"; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - license = licenses.lgpl21Only; - }; -} diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix deleted file mode 100644 index cec03d84c649..000000000000 --- a/pkgs/development/libraries/dleyna-server/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch -, meson -, ninja -, makeWrapper -, pkg-config -, dleyna-core -, dleyna-connector-dbus -, gssdp -, gupnp -, gupnp-av -, gupnp-dlna -, libsoup -}: - -stdenv.mkDerivation rec { - pname = "dleyna-server"; - version = "0.7.2"; - - src = fetchFromGitHub { - owner = "phako"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-jlF9Lr/NG+Fsy/bB7aLb7xOLqel8GueJK5luo9rsDME="; - }; - - patches = [ - # Fix build with meson 1.2. We use the gentoo patch intead of the - # usptream one because the latter only applies on the libsoup_3 based - # merged dLeyna project. - # https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6 - (fetchpatch { - url = "https://github.com/gentoo/gentoo/raw/2e3a1f4f7a1ef0c3e387389142785d98b5834e60/net-misc/dleyna-server/files/meson-1.2.0.patch"; - sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - makeWrapper - ]; - - buildInputs = [ - dleyna-core - dleyna-connector-dbus # runtime dependency to be picked up to DLEYNA_CONNECTOR_PATH - gssdp - gupnp - gupnp-av - gupnp-dlna - libsoup - ]; - - preFixup = '' - wrapProgram "$out/libexec/dleyna-server-service" \ - --set DLEYNA_CONNECTOR_PATH "$DLEYNA_CONNECTOR_PATH" - ''; - - meta = with lib; { - description = "Library to discover, browse and manipulate Digital Media Servers"; - homepage = "https://github.com/phako/dleyna-server"; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - license = licenses.lgpl21Only; - }; -} diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix deleted file mode 100644 index 8d85fc3325e2..000000000000 --- a/pkgs/development/libraries/dlib/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, libpng -, libjpeg -, libwebp -, blas -, lapack -, config -, guiSupport ? false -, libX11 -, enableShared ? !stdenv.hostPlatform.isStatic # dlib has a build system that forces the user to choose between either shared or static libraries. See https://github.com/davisking/dlib/issues/923#issuecomment-2175865174 -, sse4Support ? stdenv.hostPlatform.sse4_1Support -, avxSupport ? stdenv.hostPlatform.avxSupport -, cudaSupport ? config.cudaSupport -, cudaPackages -}@inputs: -(if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv).mkDerivation rec { - pname = "dlib"; - version = "19.24.6"; - - src = fetchFromGitHub { - owner = "davisking"; - repo = "dlib"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-BpE7ZrtiiaDqwy1G4IHOQBJMr6sAadFbRxsdObs1SIY="; - }; - - postPatch = '' - rm -rf dlib/external - ''; - - cmakeFlags = [ - (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared) - (lib.cmakeBool "USE_SSE4_INSTRUCTIONS" sse4Support) - (lib.cmakeBool "USE_AVX_INSTRUCTIONS" avxSupport) - (lib.cmakeBool "DLIB_USE_CUDA" cudaSupport) - ] ++ lib.optionals cudaSupport [ - (lib.cmakeFeature "DLIB_USE_CUDA_COMPUTE_CAPABILITIES" (builtins.concatStringsSep "," (with cudaPackages.flags; map dropDot cudaCapabilities))) - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ] ++ lib.optionals cudaSupport (with cudaPackages; [ - cuda_nvcc - ]); - - buildInputs = [ - libpng - libjpeg - libwebp - blas - lapack - ] - ++ lib.optionals guiSupport [ libX11 ] - ++ lib.optionals cudaSupport (with cudaPackages; [ - cuda_cudart - cuda_nvcc - libcublas - libcurand - libcusolver - cudnn - cuda_cccl - ]); - - passthru = { - inherit - cudaSupport cudaPackages - sse4Support avxSupport; - }; - - meta = with lib; { - description = "General purpose cross-platform C++ machine learning library"; - homepage = "http://www.dlib.net"; - license = licenses.boost; - maintainers = with maintainers; [ christopherpoole ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix deleted file mode 100644 index 2e37e073fb65..000000000000 --- a/pkgs/development/libraries/docopt_cpp/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, python3 }: - -stdenv.mkDerivation rec { - version = "0.6.3"; - pname = "docopt.cpp"; - - src = fetchFromGitHub { - owner = "docopt"; - repo = "docopt.cpp"; - rev = "v${version}"; - sha256 = "0cz3vv7g5snfbsqcf3q8bmd6kv5qp84gj3avwkn4vl00krw13bl7"; - }; - - patches = [ - (fetchpatch { - name = "python3-for-tests"; - url = "https://github.com/docopt/docopt.cpp/commit/b3d909dc952ab102a4ad5a1541a41736f35b92ba.patch"; - hash = "sha256-JJR09pbn3QhYaZAIAjs+pe28+g1VfgHUKspWorHzr8o="; - }) - ]; - - nativeBuildInputs = [ cmake python3 ]; - - cmakeFlags = ["-DWITH_TESTS=ON"]; - - strictDeps = true; - - doCheck = true; - - postPatch = '' - substituteInPlace docopt.pc.in \ - --replace "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" \ - "@CMAKE_INSTALL_LIBDIR@" - ''; - - checkPhase = "python ./run_tests"; - - meta = with lib; { - description = "C++11 port of docopt"; - homepage = "https://github.com/docopt/docopt.cpp"; - license = with licenses; [ mit boost ]; - platforms = platforms.all; - maintainers = with maintainers; [ knedlsepp ]; - }; -} diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix deleted file mode 100644 index 1ce085544492..000000000000 --- a/pkgs/development/libraries/doctest/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: - -stdenv.mkDerivation rec { - pname = "doctest"; - version = "2.4.11"; - - src = fetchFromGitHub { - owner = "doctest"; - repo = "doctest"; - rev = "v${version}"; - sha256 = "sha256-hotO6QVpPn8unYTaQHFgi40A3oLUd++I3aTe293e4Aw="; - }; - - patches = [ - # Suppress unsafe buffer usage warnings with clang 16, which are treated as errors due to `-Werror`. - # https://github.com//doctest/doctest/pull/768 - (fetchpatch { - url = "https://github.com/doctest/doctest/commit/9336c9bd86e3fc2e0c36456cad8be3b4e8829a22.patch"; - hash = "sha256-ZFCVk5qvgfixRm7ZFr7hyNCSEvrT6nB01G/CBshq53o="; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - doCheck = true; - - meta = with lib; { - homepage = "https://github.com/doctest/doctest"; - description = "Fastest feature-rich C++11/14/17/20 single-header testing framework"; - platforms = platforms.all; - license = licenses.mit; - maintainers = with maintainers; [ davidtwco ]; - }; -} diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix deleted file mode 100644 index 389ce72a6846..000000000000 --- a/pkgs/development/libraries/dotconf/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ fetchFromGitHub, lib, stdenv, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "dotconf"; - version = "1.4.1"; - - src = fetchFromGitHub { - owner = "williamh"; - repo = "dotconf"; - rev = "v${version}"; - sha256 = "sha256-6Du26Ffz08DLGg6uIiPi8Sgjf691MM2kn0qXe3oFeTw="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ]; - - meta = with lib; { - description = "Configuration parser library"; - maintainers = with maintainers; [ pSub ]; - homepage = "https://github.com/williamh/dotconf"; - license = licenses.lgpl21Plus; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix deleted file mode 100644 index 212b854c1e33..000000000000 --- a/pkgs/development/libraries/double-conversion/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, enableStatic ? stdenv.hostPlatform.isStatic }: - -stdenv.mkDerivation rec { - pname = "double-conversion"; - version = "3.3.0"; - - src = fetchFromGitHub { - owner = "google"; - repo = "double-conversion"; - rev = "v${version}"; - sha256 = "sha256-DkMoHHoHwV4p40IINEqEPzKsCa0LHrJAFw2Yftw7zHo="; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = lib.optional (! enableStatic) "-DBUILD_SHARED_LIBS=ON"; - - # Case sensitivity issue - preConfigure = lib.optionalString stdenv.isDarwin '' - rm BUILD - ''; - - meta = with lib; { - description = "Binary-decimal and decimal-binary routines for IEEE doubles"; - homepage = "https://github.com/google/double-conversion"; - license = licenses.bsd3; - platforms = platforms.unix ++ platforms.windows; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix deleted file mode 100644 index 4ef75a9ee469..000000000000 --- a/pkgs/development/libraries/dqlite/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv -, raft-canonical, sqlite, lxd-lts }: - -stdenv.mkDerivation rec { - pname = "dqlite"; - version = "1.16.7"; - - src = fetchFromGitHub { - owner = "canonical"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-XQvJO4sFKRKDVdtoXP2Ue80otDC0Ry6EB1Z0shetuhw="; - }; - - nativeBuildInputs = [ autoreconfHook file pkg-config ]; - buildInputs = [ - libuv - raft-canonical.dev - sqlite - ]; - - enableParallelBuilding = true; - - # tests fail - doCheck = false; - - outputs = [ "dev" "out" ]; - - passthru.tests = { - inherit lxd-lts; - }; - - meta = with lib; { - description = '' - Expose a SQLite database over the network and replicate it across a - cluster of peers - ''; - homepage = "https://dqlite.io/"; - license = licenses.asl20; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix deleted file mode 100644 index 63f387db9046..000000000000 --- a/pkgs/development/libraries/drogon/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, lib -# optional but of negligible size -, openssl, brotli, c-ares -# optional databases -, sqliteSupport ? true, sqlite -, postgresSupport ? false, postgresql -, redisSupport ? false, hiredis -, mysqlSupport ? false, libmysqlclient, mariadb }: - -stdenv.mkDerivation (finalAttrs: { - pname = "drogon"; - version = "1.9.4"; - - src = fetchFromGitHub { - owner = "drogonframework"; - repo = "drogon"; - rev = "v${finalAttrs.version}"; - hash = "sha256-P6blu3EIBzmK1zikFPiV+tvFLfiQhK+cRdClQOhcBSU="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DBUILD_TESTING=${if finalAttrs.finalPackage.doInstallCheck then "ON" else "OFF"}" - "-DBUILD_EXAMPLES=OFF" - ]; - - propagatedBuildInputs = [ - jsoncpp - libossp_uuid - zlib - openssl - brotli - c-ares - ] ++ lib.optional sqliteSupport sqlite - ++ lib.optional postgresSupport postgresql - ++ lib.optional redisSupport hiredis - # drogon uses mariadb for mysql (see https://github.com/drogonframework/drogon/wiki/ENG-02-Installation#Library-Dependencies) - ++ lib.optionals mysqlSupport [ libmysqlclient mariadb ]; - - patches = [ - # this part of the test would normally fail because it attempts to configure a CMake project that uses find_package on itself - # this patch makes drogon and trantor visible to the test - ./fix_find_package.patch - ]; - - # modifying PATH here makes drogon_ctl visible to the test - installCheckPhase = '' - ( - cd .. - PATH=$PATH:$out/bin $SHELL test.sh - ) - ''; - - # this excludes you, pkgsStatic (cmake wants to run built binaries - # in the buildPhase) - doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform; - - meta = with lib; { - homepage = "https://github.com/drogonframework/drogon"; - description = "C++14/17 based HTTP web application framework"; - license = licenses.mit; - maintainers = with maintainers; [ urlordjames ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/libraries/drogon/fix_find_package.patch b/pkgs/development/libraries/drogon/fix_find_package.patch deleted file mode 100644 index b76dbfe48830..000000000000 --- a/pkgs/development/libraries/drogon/fix_find_package.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test.sh b/test.sh -index f017b9a..027031e 100755 ---- a/test.sh -+++ b/test.sh -@@ -135,7 +135,7 @@ if [ $os = "windows" ]; then - conan install $src_dir -s compiler="Visual Studio" -s compiler.version=16 -sbuild_type=Debug -g cmake_paths - cmake_gen="$cmake_gen -DCMAKE_TOOLCHAIN_FILE=conan_paths.cmake -DCMAKE_INSTALL_PREFIX=$src_dir/install" - fi --cmake .. $cmake_gen -+cmake .. $cmake_gen -DDrogon_DIR=$out/lib/cmake/Drogon -DTrantor_DIR=$out/lib/cmake/Trantor - - if [ $? -ne 0 ]; then - echo "Failed to run CMake for example project" diff --git a/pkgs/development/libraries/dsdcc/default.nix b/pkgs/development/libraries/dsdcc/default.nix deleted file mode 100644 index 9397c747e667..000000000000 --- a/pkgs/development/libraries/dsdcc/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, mbelib -, serialdv -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dsdcc"; - version = "1.9.5"; - - src = fetchFromGitHub { - owner = "f4exb"; - repo = "dsdcc"; - rev = "v${finalAttrs.version}"; - hash = "sha256-DMCk29O2Lmt2tjo6j5e4ZdZeDL3ZFUh66Sm6TGrIaeU="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - mbelib - serialdv - ]; - - cmakeFlags = [ - "-DUSE_MBELIB=ON" - ]; - - postFixup = '' - substituteInPlace "$out"/lib/pkgconfig/libdsdcc.pc \ - --replace '=''${exec_prefix}//' '=/' - ''; - - meta = { - description = "Digital Speech Decoder (DSD) rewritten as a C++ library"; - homepage = "https://github.com/f4exb/dsdcc"; - license = lib.licenses.gpl3; - mainProgram = "dsdccx"; - maintainers = with lib.maintainers; [ alexwinter ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix deleted file mode 100644 index b3dad8e2018b..000000000000 --- a/pkgs/development/libraries/dssi/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, ladspaH, libjack2, liblo, alsa-lib, libX11, libsndfile, libSM -, libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "dssi"; - version = "1.1.1"; - - src = fetchurl { - url = "mirror://sourceforge/project/dssi/dssi/${version}/${pname}-${version}.tar.gz"; - sha256 = "0kl1hzhb7cykzkrqcqgq1dk4xcgrcxv0jja251aq4z4l783jpj7j"; - }; - - nativeBuildInputs = [ autoconf automake pkg-config ]; - buildInputs = - [ ladspaH libjack2 liblo alsa-lib libX11 libsndfile libSM - libsamplerate libtool xorgproto libICE - ]; - - meta = with lib; { - description = "Plugin SDK for virtual instruments"; - maintainers = with maintainers; - [ - raskin - ]; - platforms = platforms.linux; - license = licenses.lgpl21; - downloadPage = "https://sourceforge.net/projects/dssi/files/dssi/"; - }; -} diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index c222b117fff9..94a24f21ac9b 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -45,11 +45,6 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_UNITTESTS=ON" ]; - postInstall = '' - mkdir -p $lib - mv $out/lib $lib - ''; - doInstallCheck = true; installCheckPhase = @@ -98,12 +93,20 @@ stdenv.mkDerivation (finalAttrs: { # wants http connection "test/sql/copy/csv/recursive_query_csv.test" "test/sql/copy/csv/test_mixed_lines.test" - ] ++ lib.optionals stdenv.isAarch64 [ + "test/parquet/parquet_long_string_stats.test" + "test/sql/attach/attach_remote.test" + "test/sql/copy/csv/test_sniff_httpfs.test" + "test/sql/httpfs/internal_issue_2490.test" + # fails with incorrect result + # Upstream issue https://github.com/duckdb/duckdb/issues/14294 + "test/sql/copy/file_size_bytes.test" + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test/sql/aggregate/aggregates/test_kurtosis.test" "test/sql/aggregate/aggregates/test_skewness.test" "test/sql/function/list/aggregates/skewness.test" + "test/sql/aggregate/aggregates/histogram_table_function.test" ]); - LD_LIBRARY_PATH = lib.optionalString stdenv.isDarwin "DY" + "LD_LIBRARY_PATH"; + LD_LIBRARY_PATH = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; in '' runHook preInstallCheck diff --git a/pkgs/development/libraries/duckdb/versions.json b/pkgs/development/libraries/duckdb/versions.json index 8ae8b4bc57d2..1797b9b0b095 100644 --- a/pkgs/development/libraries/duckdb/versions.json +++ b/pkgs/development/libraries/duckdb/versions.json @@ -1,5 +1,5 @@ { - "version": "1.0.0", - "rev": "1f98600c2cf8722a6d2f2d805bb4af5e701319fc", - "hash": "sha256-bzFxWv8+Ac8vZLd2OWJyu4T0/0dc7wykdOORMpx92Ic=" + "version": "1.1.2", + "rev": "f680b7d08f56183391b581077d4baf589e1cc8bd", + "hash": "sha256-JoGGnlu2aioO6XbeUZDe23AHSBxciLSEKBWRedPuXjI=" } diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix deleted file mode 100644 index 75841b5d0d71..000000000000 --- a/pkgs/development/libraries/dyncall/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "dyncall"; - version = "1.4"; - - src = fetchurl { - url = "https://www.dyncall.org/r${version}/dyncall-${version}.tar.gz"; - # https://www.dyncall.org/r1.4/SHA256 - sha256 = "sha256-FEN9u+87bckkg/ZQfq+CWrl5ZKie7K6Ms0emvsnDKq4="; - }; - - # XXX: broken tests, failures masked, lets avoid crashing a bunch for now :) - doCheck = false; - - # install bits not automatically installed - postInstall = '' - # install cmake modules to make using dyncall easier - # This is essentially what -DINSTALL_CMAKE_MODULES=ON if using cmake build - # We don't use the cmake-based build since it installs different set of headers - # (mostly fewer headers, but installs dyncall_alloc_wx.h "instead" dyncall_alloc.h) - # and we'd have to patch the cmake module installation to not use CMAKE_ROOT anyway :). - install -D -t $out/lib/cmake ./buildsys/cmake/Modules/Find*.cmake - - # manpages are nice, install them - # doing this is in the project's "ToDo", so check this when updating! - install -D -t $out/share/man/man3 ./*/*.3 - ''; - - meta = with lib; { - description = "Highly dynamic multi-platform foreign function call interface library"; - homepage = "https://www.dyncall.org"; - license = licenses.isc; - maintainers = with maintainers; [ dtzWill ]; - }; -} diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix deleted file mode 100644 index 0923d2b450bc..000000000000 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -# To use this package with a CMake and pkg-config build: -# pkg_check_modules(EASYLOGGINGPP REQUIRED easyloggingpp) -# add_executable(main src/main.cpp ${EASYLOGGINGPP_PREFIX}/include/easylogging++.cc) -{ lib, stdenv, fetchFromGitHub, cmake, gtest }: -stdenv.mkDerivation rec { - pname = "easyloggingpp"; - version = "9.97.1"; - src = fetchFromGitHub { - owner = "amrayn"; - repo = "easyloggingpp"; - rev = "v${version}"; - sha256 = "sha256-R4NdwsUywgJoK5E/OdZXFds6iBKOsMa0E+2PDdQbV6E="; - }; - - nativeBuildInputs = [cmake]; - buildInputs = [gtest]; - cmakeFlags = [ "-Dtest=ON" ]; - env.NIX_CFLAGS_COMPILE = "-std=c++14" + - lib.optionalString stdenv.isLinux " -pthread"; - postInstall = '' - mkdir -p $out/include - cp ../src/easylogging++.cc $out/include - ''; - meta = { - description = "C++ logging library"; - homepage = "https://github.com/amrayn/easyloggingpp"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [acowley]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix deleted file mode 100644 index 0c886a265b63..000000000000 --- a/pkgs/development/libraries/eclib/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv -, fetchurl -, autoreconfHook -, pari -, ntl -, gmp -# "FLINT is optional and only used for one part of sparse matrix reduction, -# which is used in the modular symbol code but not mwrank or other elliptic -# curve programs." -- https://github.com/JohnCremona/eclib/blob/master/README -, withFlint ? false, flint ? null -}: - -assert withFlint -> flint != null; - -stdenv.mkDerivation rec { - pname = "eclib"; - version = "20240408"; # upgrade might break the sage interface - # sage tests to run: - # src/sage/interfaces/mwrank.py - # src/sage/libs/eclib - # ping @timokau for more info - src = fetchurl { - # all releases for this project appear on its GitHub releases page - # by definition! other distros sometimes update whenever they see - # a version bump in configure.ac or a new tag (and this might show - # up on repology). however, a version bump or a new tag may not - # represent a new release, and a new release might not be tagged. - # - # see https://github.com/JohnCremona/eclib/issues/64#issuecomment-789788561 - # for upstream's explanation of the above - url = "https://github.com/JohnCremona/eclib/releases/download/v${version}/eclib-${version}.tar.bz2"; - sha256 = "sha256-O6kI4gGd5T/LoUFEnKpvqC8DYFv4O/nagJLfU4ravnw="; - }; - buildInputs = [ - pari - ntl - gmp - ] ++ lib.optionals withFlint [ - flint - ]; - nativeBuildInputs = [ - autoreconfHook - ]; - doCheck = true; - meta = with lib; { - description = "Elliptic curve tools"; - homepage = "https://github.com/JohnCremona/eclib"; - license = licenses.gpl2Plus; - maintainers = teams.sage.members; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/edencommon/default.nix b/pkgs/development/libraries/edencommon/default.nix index fa10344826af..ce26bc6f7125 100644 --- a/pkgs/development/libraries/edencommon/default.nix +++ b/pkgs/development/libraries/edencommon/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-1z4QicS98juv4bUEbHBkCjVJHEhnoJyLYp4zMHmDbMg="; }; - patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # Test discovery timeout is bizarrely flaky on `x86_64-darwin` ./increase-test-discovery-timeout.patch ]; nativeBuildInputs = [ cmake ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix deleted file mode 100644 index 95776d885f06..000000000000 --- a/pkgs/development/libraries/editline/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, nix-update-script, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "editline"; - version = "1.17.1"; - src = fetchFromGitHub { - owner = "troglobit"; - repo = "editline"; - rev = version; - sha256 = "sha256-0FeDUVCUahbweH24nfaZwa7j7lSfZh1TnQK7KYqO+3g="; - }; - - patches = [ - (fetchpatch { - name = "fix-for-home-end-in-tmux.patch"; - url = "https://github.com/troglobit/editline/commit/265c1fb6a0b99bedb157dc7c320f2c9629136518.patch"; - sha256 = "sha256-9fhQH0hT8BcykGzOUoT18HBtWjjoXnePSGDJQp8GH30="; - }) - - # Pending autoconf-2.72 upstream support: - # https://github.com/troglobit/editline/pull/64 - (fetchpatch { - name = "autoconf-2.72.patch"; - url = "https://github.com/troglobit/editline/commit/f444a316f5178b8e20fe31e7b2d979e651da077e.patch"; - hash = "sha256-m3jExTkPvE+ZBwHzf/A+ugzzfbLmeWYn726l7Po7f10="; - }) - ]; - - configureFlags = [ (lib.enableFeature true "sigstop") ]; - - nativeBuildInputs = [ autoreconfHook ]; - - outputs = [ "out" "dev" "man" "doc" ]; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - homepage = "https://troglobit.com/projects/editline/"; - description = "Readline() replacement for UNIX without termcap (ncurses)"; - license = licenses.bsdOriginal; - 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 deleted file mode 100644 index 8955dba436a5..000000000000 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, eglexternalplatform -, pkg-config -, meson -, ninja -, wayland-scanner -, libGL -, libX11 -, libdrm -, wayland -, wayland-protocols -}: - -stdenv.mkDerivation rec { - pname = "egl-wayland"; - version = "1.1.16"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "Nvidia"; - repo = pname; - rev = version; - hash = "sha256-hX1pMz0X5ABNRsa3Q7W26hNeEaEMnnFb7ID+k6H8Nwg="; - }; - - postPatch = '' - # Declares an includedir but doesn't install any headers - # CMake's `pkg_check_modules(NAME wayland-eglstream IMPORTED_TARGET)` considers this an error - sed -i -e '/includedir/d' wayland-eglstream.pc.in - ''; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - wayland-scanner - ]; - - buildInputs = [ - libGL - libX11 - libdrm - wayland - wayland-protocols - ]; - - propagatedBuildInputs = [ - eglexternalplatform - ]; - - meta = with lib; { - description = "EGLStream-based Wayland external platform"; - homepage = "https://github.com/NVIDIA/egl-wayland/"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ hedning ]; - }; -} diff --git a/pkgs/development/libraries/eglexternalplatform/default.nix b/pkgs/development/libraries/eglexternalplatform/default.nix deleted file mode 100644 index 50e276372274..000000000000 --- a/pkgs/development/libraries/eglexternalplatform/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenvNoCC -, lib -, fetchFromGitHub -}: - -stdenvNoCC.mkDerivation rec { - pname = "eglexternalplatform"; - version = "1.1"; - - src = fetchFromGitHub { - owner = "Nvidia"; - repo = "eglexternalplatform"; - rev = "7c8f8e2218e46b1a4aa9538520919747f1184d86"; - sha256 = "0lr5s2xa1zn220ghmbsiwgmx77l156wk54c7hybia0xpr9yr2nhb"; - }; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/include/ - cp interface/* $out/include/ - - substituteInPlace eglexternalplatform.pc \ - --replace "/usr/include/EGL" "$out/include" - install -Dm644 {.,$out/share/pkgconfig}/eglexternalplatform.pc - - runHook postInstall - ''; - - meta = with lib; { - description = "EGL External Platform interface"; - homepage = "https://github.com/NVIDIA/eglexternalplatform"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ hedning ]; - }; -} diff --git a/pkgs/development/libraries/elf-header/default.nix b/pkgs/development/libraries/elf-header/default.nix deleted file mode 100644 index 4953251d4af6..000000000000 --- a/pkgs/development/libraries/elf-header/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenvNoCC, lib, glibc, musl }: - -let - libc = - if stdenvNoCC.targetPlatform.isMusl - then musl - else glibc; - headerPath = - if stdenvNoCC.targetPlatform.isMusl - then "musl-${libc.version}/include/elf.h" - else "glibc-${libc.version}/elf/elf.h"; -in - -stdenvNoCC.mkDerivation { - pname = "elf-header"; - inherit (libc) version; - - src = null; - - dontUnpack = true; - - dontBuild = true; - - installPhase = '' - mkdir -p "$out/include"; - tar -xf \ - ${lib.escapeShellArg libc.src} \ - ${lib.escapeShellArg headerPath} \ - --to-stdout \ - | sed -e '/features\.h/d' \ - > "$out/include/elf.h" - ''; - - meta = libc.meta // { - outputsToInstall = [ "out" ]; - description = "Datastructures of ELF according to the target platform's libc"; - longDescription = '' - The Executable and Linkable Format (ELF, formerly named Extensible Linking - Format), is usually defined in a header like this. - ''; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.ericson2314 ]; - }; -} diff --git a/pkgs/development/libraries/elfio/default.nix b/pkgs/development/libraries/elfio/default.nix deleted file mode 100644 index 13bdbe735d63..000000000000 --- a/pkgs/development/libraries/elfio/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, boost -}: - -stdenv.mkDerivation rec { - pname = "elfio"; - version = "3.10"; - - src = fetchFromGitHub { - owner = "serge1"; - repo = "elfio"; - rev = "Release_${version}"; - sha256 = "sha256-DuZhkiHXdCplRiOy1Gsu7voVPdCbFt+4qFqlOeOeWQw="; - }; - - nativeBuildInputs = [ cmake ]; - - nativeCheckInputs = [ boost ]; - - cmakeFlags = [ "-DELFIO_BUILD_TESTS=ON" ]; - - doCheck = true; - - meta = with lib; { - description = "Header-only C++ library for reading and generating files in the ELF binary format"; - homepage = "https://github.com/serge1/ELFIO"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ prusnak ]; - }; -} diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix deleted file mode 100644 index f13b1a167e23..000000000000 --- a/pkgs/development/libraries/elpa/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, mpiCheckPhaseHook -, perl, mpi, blas, lapack, scalapack, openssh -# CPU optimizations -, avxSupport ? stdenv.hostPlatform.avxSupport -, avx2Support ? stdenv.hostPlatform.avx2Support -, avx512Support ? stdenv.hostPlatform.avx512Support -, config -# Enable NIVIA GPU support -# Note, that this needs to be built on a system with a GPU -# present for the tests to succeed. -, enableCuda ? config.cudaSupport -# type of GPU architecture -, nvidiaArch ? "sm_60" -, cudaPackages -} : - -assert blas.isILP64 == lapack.isILP64; -assert blas.isILP64 == scalapack.isILP64; - -stdenv.mkDerivation rec { - pname = "elpa"; - 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-nK9Bo+YA4vb0zhkxvVQYUXna3pwXFVbQybQbvGlA8vY="; - }; - - patches = [ - # Use a plain name for the pkg-config file - ./pkg-config.patch - ]; - - postPatch = '' - patchShebangs ./fdep/fortran_dependencies.pl - patchShebangs ./test-driver - - # Fix the test script generator - substituteInPlace Makefile.am --replace '#!/bin/bash' '#!${stdenv.shell}' - ''; - - outputs = [ "out" "doc" "man" "dev" ]; - - nativeBuildInputs = [ autoreconfHook perl ] - ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]; - - buildInputs = [ mpi blas lapack scalapack ] - ++ lib.optionals enableCuda [ - cudaPackages.cuda_cudart - cudaPackages.libcublas - ]; - - preConfigure = '' - export FC="mpifort" - export CC="mpicc" - export CXX="mpicxx" - export CPP="cpp" - - # These need to be set for configure to succeed - export FCFLAGS="${lib.optionalString stdenv.hostPlatform.isx86_64 "-msse3 " - + lib.optionalString avxSupport "-mavx " - + lib.optionalString avx2Support "-mavx2 -mfma " - + lib.optionalString avx512Support "-mavx512"}" - - export CFLAGS=$FCFLAGS - ''; - - configureFlags = [ - "--with-mpi" - "--enable-openmp" - "--without-threading-support-check-during-build" - ] ++ lib.optional blas.isILP64 "--enable-64bit-integer-math-support" - ++ lib.optional (!avxSupport) "--disable-avx" - ++ lib.optional (!avx2Support) "--disable-avx2" - ++ lib.optional (!avx512Support) "--disable-avx512" - ++ lib.optional (!stdenv.hostPlatform.isx86_64) "--disable-sse" - ++ lib.optional (!stdenv.hostPlatform.isx86_64) "--disable-sse-assembly" - ++ lib.optional stdenv.hostPlatform.isx86_64 "--enable-sse-assembly" - ++ lib.optionals enableCuda [ "--enable-nvidia-gpu" "--with-NVIDIA-GPU-compute-capability=${nvidiaArch}" ]; - - enableParallelBuilding = true; - - doCheck = !enableCuda; - - nativeCheckInputs = [ mpiCheckPhaseHook openssh ]; - preCheck = '' - #patchShebangs ./ - - # Run dual threaded - export OMP_NUM_THREADS=2 - - # Reduce test problem sizes - export TEST_FLAGS="1500 50 16" - ''; - - meta = with lib; { - description = "Eigenvalue Solvers for Petaflop-Applications"; - homepage = "https://elpa.mpcdf.mpg.de/"; - license = licenses.lgpl3Only; - platforms = platforms.linux; - maintainers = [ maintainers.markuskowa ]; - }; -} diff --git a/pkgs/development/libraries/elpa/pkg-config.patch b/pkgs/development/libraries/elpa/pkg-config.patch deleted file mode 100644 index 2fc1399483c6..000000000000 --- a/pkgs/development/libraries/elpa/pkg-config.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 0aa533a..da5d1f7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2336,7 +2336,7 @@ if test x"$have_loop_blocking" = x"yes"; then - fi - - AC_SUBST([SUFFIX]) --AC_SUBST([PKG_CONFIG_FILE],[elpa${SUFFIX}.pc]) -+AC_SUBST([PKG_CONFIG_FILE],[elpa.pc]) - - AC_CONFIG_FILES([ - Makefile diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index b53be3ae7cf5..f45ea3dc7d3d 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ispc pkg-config cmake ]; buildInputs = [ tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ] - ++ lib.optionals stdenv.isDarwin [ glib ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ glib ]; meta = with lib; { description = "High performance ray tracing kernels from Intel"; diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 69cab2ca5b61..dbd7cefacb67 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -14,12 +14,12 @@ , withAspell ? true , withHunspell ? true , withNuspell ? true -, withAppleSpell ? stdenv.isDarwin +, withAppleSpell ? stdenv.hostPlatform.isDarwin , Cocoa }: -assert withAppleSpell -> stdenv.isDarwin; +assert withAppleSpell -> stdenv.hostPlatform.isDarwin; stdenv.mkDerivation rec { pname = "enchant"; diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix deleted file mode 100644 index f9583a097a6a..000000000000 --- a/pkgs/development/libraries/enet/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "enet"; - version = "1.3.18"; - - src = fetchurl { - url = "http://enet.bespin.org/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-KooMU2DWi7T80R8uTEfGmXbo0shbEJ3X1gsRgaT4XTY="; - }; - - meta = { - homepage = "http://enet.bespin.org/"; - description = "Simple and robust network communication layer on top of UDP"; - license = lib.licenses.mit; - maintainers = [ ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix deleted file mode 100644 index ae2e8f0263d4..000000000000 --- a/pkgs/development/libraries/entt/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { - pname = "entt"; - version = "3.13.2"; - - src = fetchFromGitHub { - owner = "skypjack"; - repo = "entt"; - rev = "v${version}"; - hash = "sha256-botX9T9KEXbctI1hUOt983y2rtWDeXyTonGYpJ6eGr8="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - homepage = "https://github.com/skypjack/entt"; - description = "Header-only, tiny and easy to use library for game programming and much more written in modern C++"; - maintainers = with maintainers; [ twey ]; - platforms = platforms.all; - license = licenses.mit; - }; -} diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix deleted file mode 100644 index adc9649b4d90..000000000000 --- a/pkgs/development/libraries/ethash/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gbenchmark, gtest }: - -stdenv.mkDerivation rec { - pname = "ethash"; - version = "1.0.1"; - - src = - fetchFromGitHub { - owner = "chfast"; - repo = "ethash"; - rev = "v${version}"; - sha256 = "sha256-BjgfWDn72P4NJhzq0ySW8bvZI3AQB9jOaRqFIeCfJ8k="; - }; - - nativeBuildInputs = [ - cmake - ]; - - nativeCheckInputs = [ - gbenchmark - gtest - ]; - - #preConfigure = '' - # sed -i 's/GTest::main//' test/unittests/CMakeLists.txt - # cat test/unittests/CMakeLists.txt - # ln -sfv ${gtest.src}/googletest gtest - #''; - - # NOTE: disabling tests due to gtest issue - cmakeFlags = [ - "-DHUNTER_ENABLED=OFF" - "-DETHASH_BUILD_TESTS=OFF" - #"-Dbenchmark_DIR=${gbenchmark}/lib/cmake/benchmark" - #"-DGTest_DIR=${gtest.dev}/lib/cmake/GTest" - #"-DGTest_DIR=${gtest.src}/googletest" - #"-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake" - ]; - - meta = with lib; { - description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto"; - homepage = "https://github.com/ethereum/ethash"; - platforms = platforms.unix; - maintainers = [ ]; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix deleted file mode 100644 index b5b4bc556f69..000000000000 --- a/pkgs/development/libraries/eventlog/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "eventlog"; - version = "0.2.13"; - - src = fetchFromGitHub { - owner = "balabit"; - repo = "eventlog"; - rev = "a5c19163ba131f79452c6dfe4e31c2b4ce4be741"; - sha256 = "0a2za3hs7wzy14z7mfgldy1r9xdlqv97yli9wlm8xldr0amsx869"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - meta = with lib; { - description = "Syslog event logger library"; - longDescription = '' - The EventLog library aims to be a replacement of the simple syslog() API - provided on UNIX systems. The major difference between EventLog and - syslog is that EventLog tries to add structure to messages. - - Where you had a simple non-structrured string in syslog() you have a - combination of description and tag/value pairs. - ''; - homepage = "https://www.balabit.com/support/community/products/"; - license = licenses.bsd3; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix deleted file mode 100644 index 96d8d1db7a9a..000000000000 --- a/pkgs/development/libraries/exempi/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, expat, zlib, boost, libiconv, darwin }: - -stdenv.mkDerivation rec { - pname = "exempi"; - version = "2.6.5"; - - src = fetchurl { - url = "https://libopenraw.freedesktop.org/download/${pname}-${version}.tar.bz2"; - sha256 = "sha256-6fmj1Cv/c7XrD3fsIs0BY8PiGUnMQUrR8ZoEZd3kH/4="; - }; - - configureFlags = [ - "--with-boost=${boost.dev}" - ] ++ lib.optionals (!doCheck) [ - "--enable-unittest=no" - ]; - - buildInputs = [ expat zlib boost ] - ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ]; - - doCheck = stdenv.isLinux && stdenv.is64bit; - dontDisableStatic = doCheck; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Implementation of XMP (Adobe's Extensible Metadata Platform)"; - mainProgram = "exempi"; - homepage = "https://libopenraw.freedesktop.org/exempi/"; - platforms = platforms.linux ++ platforms.darwin; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix deleted file mode 100644 index 1591b8021501..000000000000 --- a/pkgs/development/libraries/exiv2/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, doxygen -, gettext -, graphviz -, libxslt -, removeReferencesTo -, libiconv -, brotli -, expat -, inih -, zlib -, libxml2 -, python3 -, which -}: - -stdenv.mkDerivation rec { - pname = "exiv2"; - version = "0.28.3"; - - outputs = [ "out" "lib" "dev" "doc" "man" ]; - - src = fetchFromGitHub { - owner = "exiv2"; - repo = "exiv2"; - rev = "v${version}"; - hash = "sha256-KD3kkIQXPcjCVZZrmbn93xYbJ8ryG0mLFbkO5AVqnTw="; - }; - - nativeBuildInputs = [ - cmake - doxygen - gettext - graphviz - libxslt - removeReferencesTo - ]; - - buildInputs = lib.optionals stdenv.isDarwin [ - libiconv - ]; - - propagatedBuildInputs = [ - brotli - expat - inih - zlib - ]; - - nativeCheckInputs = [ - libxml2.bin - python3 - which - ]; - - cmakeFlags = [ - "-DEXIV2_ENABLE_NLS=ON" - "-DEXIV2_BUILD_DOC=ON" - "-DEXIV2_ENABLE_BMFF=ON" - ]; - - buildFlags = [ - "all" - "doc" - ]; - - doCheck = true; - - preCheck = '' - patchShebangs ../test/ - mkdir ../test/tmp - '' + lib.optionalString stdenv.hostPlatform.isAarch32 '' - # Fix tests on arm - # https://github.com/Exiv2/exiv2/issues/933 - rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py - '' + lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib - export LC_ALL=C - - # disable tests that requires loopback networking - substituteInPlace ../tests/bash_tests/testcases.py \ - --replace "def io_test(self):" "def io_disabled(self):" - ''; - - preFixup = '' - remove-references-to -t ${stdenv.cc.cc} $lib/lib/*.so.*.*.* $out/bin/exiv2 - ''; - - disallowedReferences = [ stdenv.cc.cc ]; - - # causes redefinition of _FORTIFY_SOURCE - hardeningDisable = [ "fortify3" ]; - - meta = with lib; { - homepage = "https://exiv2.org"; - description = "Library and command-line utility to manage image metadata"; - mainProgram = "exiv2"; - platforms = platforms.all; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ wegank ]; - }; -} diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix deleted file mode 100644 index 10d390bd678d..000000000000 --- a/pkgs/development/libraries/exosip/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, fetchurl, libosip, openssl, pkg-config }: - -stdenv.mkDerivation rec { - pname = "libexosip2"; - version = "5.3.0"; - - src = fetchurl { - url = "mirror://savannah/exosip/${pname}-${version}.tar.gz"; - sha256 = "sha256-W3gjmGQx6lztyfCV1pZKzpZvCTsq59CwhAR4i/zrycI="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libosip openssl ]; - - meta = with lib; { - license = licenses.gpl2Plus; - description = "Library that hides the complexity of using the SIP protocol"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix deleted file mode 100644 index bb97ca8728e0..000000000000 --- a/pkgs/development/libraries/expat/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ lib -, stdenv -, fetchurl -, updateAutotoolsGnuConfigScriptsHook -# for passthru.tests -, python3 -, perlPackages -, haskellPackages -, luaPackages -, ocamlPackages -, testers -}: - -# 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. - -let - version = "2.6.2"; - tag = "R_${lib.replaceStrings ["."] ["_"] version}"; -in -stdenv.mkDerivation (finalAttrs: { - pname = "expat"; - inherit version; - - src = fetchurl { - url = with finalAttrs; "https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz"; - hash = "sha256-7hS0xdiQixvsN62TdgfqsYPU2YBqCK3uRyw8MSHSc2Q="; - }; - - strictDeps = true; - nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; - - outputs = [ "out" "dev" ]; # TODO: fix referrers - outputBin = "dev"; - - enableParallelBuilding = true; - - configureFlags = lib.optional stdenv.isFreeBSD "--with-pic"; - - outputMan = "dev"; # tiny page for a dev tool - - doCheck = true; # not cross; - - preCheck = '' - patchShebangs ./run.sh ./test-driver-wrapper.sh - ''; - - # CMake files incorrectly calculate library path from dev prefix - # https://github.com/libexpat/libexpat/issues/501 - postFixup = '' - substituteInPlace $dev/lib/cmake/expat-${finalAttrs.version}/expat-noconfig.cmake \ - --replace "$"'{_IMPORT_PREFIX}' $out - ''; - - passthru.tests = { - inherit python3; - inherit (python3.pkgs) xmltodict; - inherit (haskellPackages) hexpat; - inherit (perlPackages) XMLSAXExpat XMLParser; - inherit (luaPackages) luaexpat; - inherit (ocamlPackages) ocaml_expat; - pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - }; - }; - - meta = with lib; { - changelog = "https://github.com/libexpat/libexpat/blob/${tag}/expat/Changes"; - homepage = "https://libexpat.github.io/"; - description = "Stream-oriented XML parser library written in C"; - mainProgram = "xmlwf"; - platforms = platforms.all; - license = licenses.mit; # expat version - pkgConfigModules = [ "expat" ]; - }; -}) diff --git a/pkgs/development/libraries/expected-lite/default.nix b/pkgs/development/libraries/expected-lite/default.nix deleted file mode 100644 index a0d5d1a509b9..000000000000 --- a/pkgs/development/libraries/expected-lite/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, ninja -}: - -stdenv.mkDerivation rec { - pname = "expected-lite"; - version = "0.8.0"; - - src = fetchFromGitHub { - owner = "martinmoene"; - repo = "expected-lite"; - rev = "v${version}"; - hash = "sha256-8Lf+R7wC7f2YliXqhR6pwVVSLZ6qheu7YOV5jHc0Cjc="; - }; - - nativeBuildInputs = [ cmake ninja ]; - - doCheck = true; - - meta = with lib; { - description = '' - Expected objects in C++11 and later in a single-file header-only library - ''; - homepage = "https://github.com/martinmoene/expected-lite"; - changelog = "https://github.com/martinmoene/expected-lite/blob/${src.rev}/CHANGES.txt"; - license = licenses.boost; - maintainers = with maintainers; [ azahi ]; - }; -} diff --git a/pkgs/development/libraries/exprtk/default.nix b/pkgs/development/libraries/exprtk/default.nix deleted file mode 100644 index 90fe883a2766..000000000000 --- a/pkgs/development/libraries/exprtk/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "exprtk"; - version = "0.0.2"; - - src = fetchFromGitHub { - owner = "ArashPartow"; - repo = pname; - rev = version; - hash = "sha256-ZV5nS6wEbKfzXhfXEtVlkwaEtxpTOYQaGlaxKx3FIvE="; - }; - - dontBuild = true; - - installPhase = '' - runHook preInstall - install -Dm644 exprtk.hpp "$out/include/exprtk.hpp" - runHook postInstall - ''; - - meta = with lib; { - description = "C++ Mathematical Expression Toolkit Library"; - homepage = "https://www.partow.net/programming/exprtk/index.html"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix deleted file mode 100644 index c1dba7c34bda..000000000000 --- a/pkgs/development/libraries/faac/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook -, mp4v2Support ? true, mp4v2 -, drmSupport ? false # Digital Radio Mondiale -}: - -stdenv.mkDerivation rec { - pname = "faac"; - version = "1.30"; - - src = fetchurl { - url = "mirror://sourceforge/faac/${pname}-${builtins.replaceStrings ["."] ["_"] version}.tar.gz"; - sha256 = "1lmj0dib3mjp84jhxc5ddvydkzzhb0gfrdh3ikcidjlcb378ghxd"; - }; - - configureFlags = lib.optional mp4v2Support "--with-external-mp4v2" - ++ lib.optional drmSupport "--enable-drm"; - - hardeningDisable = [ "format" ]; - - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = lib.optional mp4v2Support mp4v2; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Open source MPEG-4 and MPEG-2 AAC encoder"; - homepage = "https://github.com/knik0/faac"; - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ codyopel ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix deleted file mode 100644 index c4b236786057..000000000000 --- a/pkgs/development/libraries/faad2/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{lib -, stdenv -, fetchFromGitHub -, cmake - -# for passthru.tests -, gst_all_1 -, mpd -, ocamlPackages -, vlc -}: - -stdenv.mkDerivation rec { - pname = "faad2"; - version = "2.11.1"; - - src = fetchFromGitHub { - owner = "knik0"; - repo = "faad2"; - rev = version; - hash = "sha256-E6oe7yjYy1SJo8xQkyUk1sSucKDMPxwUFVSAyrf4Pd8="; - }; - - outputs = [ "out" "dev" "man" ]; - - nativeBuildInputs = [ cmake ]; - - passthru.tests = { - inherit mpd vlc; - inherit (gst_all_1) gst-plugins-bad; - ocaml-faad = ocamlPackages.faad; - }; - - meta = with lib; { - description = "Open source MPEG-4 and MPEG-2 AAC decoder"; - homepage = "https://sourceforge.net/projects/faac/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ codyopel ]; - mainProgram = "faad"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix deleted file mode 100644 index 3e1045ab852b..000000000000 --- a/pkgs/development/libraries/farbfeld/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, file, libpng, libjpeg }: - -stdenv.mkDerivation rec { - pname = "farbfeld"; - version = "4"; - - src = fetchurl { - url = "https://dl.suckless.org/farbfeld/farbfeld-${version}.tar.gz"; - sha256 = "0ap7rcngffhdd57jw9j22arzkbrhwh0zpxhwbdfwl8fixlhmkpy7"; - }; - - buildInputs = [ libpng libjpeg ]; - nativeBuildInputs = [ makeWrapper ]; - - makeFlags = [ "CC:=$(CC)" ]; - - installFlags = [ "PREFIX=$(out)" ]; - postInstall = '' - wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin" - ''; - - meta = with lib; { - description = "Suckless image format with conversion tools"; - homepage = "https://tools.suckless.org/farbfeld/"; - license = licenses.isc; - platforms = platforms.unix; - maintainers = with maintainers; [ pSub ]; - }; -} diff --git a/pkgs/development/libraries/fast-cpp-csv-parser/default.nix b/pkgs/development/libraries/fast-cpp-csv-parser/default.nix deleted file mode 100644 index a30aacee26e5..000000000000 --- a/pkgs/development/libraries/fast-cpp-csv-parser/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "fast-cpp-csv-parser"; - version = "2021-01-03"; - - src = fetchFromGitHub { - owner = "ben-strasser"; - repo = pname; - rev = "75600d0b77448e6c410893830df0aec1dbacf8e3"; - sha256 = "04kalwgsr8khqr1j5j13vzwaml268c5dvc9wfcwfs13wp3snqwf2"; - }; - - installPhase = '' - mkdir -p $out/lib/pkgconfig $out/include - cp -r *.h $out/include/ - substituteAll ${./fast-cpp-csv-parser.pc.in} $out/lib/pkgconfig/fast-cpp-csv-parser.pc - ''; - - meta = with lib; { - description = "Small, easy-to-use and fast header-only library for reading comma separated value (CSV) files"; - homepage = "https://github.com/ben-strasser/fast-cpp-csv-parser"; - license = licenses.bsd3; - maintainers = with maintainers; [ bhipple ]; - }; -} diff --git a/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in b/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in deleted file mode 100644 index 4a8e57d20ffc..000000000000 --- a/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in +++ /dev/null @@ -1,8 +0,0 @@ -prefix=@out@ -includedir=${prefix}/include - -Name: fast-cpp-csv-parser -Description: Fast header-only library for reading CSV files -URL: https://github.com/ben-strasser/fast-cpp-csv-parser -Version: @version@ -Cflags: -isystem${includedir} diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix deleted file mode 100644 index 1e8791f10419..000000000000 --- a/pkgs/development/libraries/fastjson/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -}: - -stdenv.mkDerivation rec { - pname = "fastjson"; - version = "1.2304.0"; - - src = fetchFromGitHub { - owner = "rsyslog"; - repo = "libfastjson"; - rev = "refs/tags/v${version}"; - hash = "sha256-WnM6lQjHz0n5BwWWZoDBavURokcaROXJW46RZen9vj4="; - }; - - nativeBuildInputs = [ - autoreconfHook - ]; - - meta = with lib; { - description = "Fast json library for C"; - homepage = "https://github.com/rsyslog/libfastjson"; - license = licenses.mit; - maintainers = with maintainers; [ nequissimus ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/libraries/fastpbkdf2/default.nix b/pkgs/development/libraries/fastpbkdf2/default.nix deleted file mode 100644 index 226d4d1a9e11..000000000000 --- a/pkgs/development/libraries/fastpbkdf2/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, openssl }: - -stdenv.mkDerivation rec { - pname = "fastpbkdf2"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "ctz"; - repo = "fastpbkdf2"; - rev = "v${version}"; - sha256 = "09ax0h4ik3vhvp3s98lic93l3g9f4v1jkr5k6z4g1lvm7s3lrha2"; - }; - - buildInputs = [ openssl ]; - - preBuild = '' - makeFlagsArray=(CFLAGS="-std=c99 -O3 -g") - ''; - - installPhase = '' - mkdir -p $out/{lib,include/fastpbkdf2} - cp *.a $out/lib - cp fastpbkdf2.h $out/include/fastpbkdf2 - ''; - - meta = with lib; { - description = "Fast PBKDF2-HMAC-{SHA1,SHA256,SHA512} implementation in C"; - homepage = "https://github.com/ctz/fastpbkdf2"; - license = licenses.cc0; - maintainers = with maintainers; [ ledif ]; - }; -} diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix deleted file mode 100644 index db62a88d7868..000000000000 --- a/pkgs/development/libraries/faudio/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, SDL2}: - -#TODO: tests - -stdenv.mkDerivation rec { - pname = "faudio"; - version = "24.09"; - - src = fetchFromGitHub { - owner = "FNA-XNA"; - repo = "FAudio"; - rev = version; - sha256 = "sha256-qojDXGFSn865dbHwhyGiHyyGKHIMI82ai4NyXgjAxD0="; - }; - - nativeBuildInputs = [cmake]; - - buildInputs = [ SDL2 ]; - - meta = with lib; { - description = "XAudio reimplementation focusing to develop a fully accurate DirectX audio library"; - homepage = "https://github.com/FNA-XNA/FAudio"; - changelog = "https://github.com/FNA-XNA/FAudio/releases/tag/${version}"; - license = licenses.zlib; - platforms = platforms.linux; - maintainers = [ maintainers.marius851000 ]; - }; -} diff --git a/pkgs/development/libraries/fb303/default.nix b/pkgs/development/libraries/fb303/default.nix index 059e666027a0..659497d690f6 100644 --- a/pkgs/development/libraries/fb303/default.nix +++ b/pkgs/development/libraries/fb303/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DPYTHON_EXTENSIONS=OFF" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; diff --git a/pkgs/development/libraries/fbjni/default.nix b/pkgs/development/libraries/fbjni/default.nix deleted file mode 100644 index aaab456ab6a5..000000000000 --- a/pkgs/development/libraries/fbjni/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, fetchpatch -, jdk_headless -, gtest -}: - -stdenv.mkDerivation rec { - pname = "fbjni"; - version = "0.5.1"; - - src = fetchFromGitHub { - owner = "facebookincubator"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-97KqfFWtR3VJe2s0D60L3dsIDm4kMa0hpkKoZSAEoVY="; - }; - - patches = [ - # Upstram fix for builds on GCC 13. Should be removable with next release after 0.5.1 - (fetchpatch { - name = "add-cstdint-include.patch"; - url = "https://github.com/facebookincubator/fbjni/commit/59461eff6c7881d58e958287481e1f1cd99e08d3.patch"; - hash = "sha256-r27C+ODTCZdd1tEz3cevnNNyZlrRhq1jOzwnIYlkglM="; - }) - - # Part of https://github.com/facebookincubator/fbjni/pull/76 - # fix cmake file installation directory - (fetchpatch { - url = "https://github.com/facebookincubator/fbjni/commit/ab02e60b5da28647bfcc864b0bb1b9a90504cdb1.patch"; - sha256 = "sha256-/h6kosulRH/ZAU2u0zRSaNDK39jsnFt9TaSxyBllZqM="; - }) - - # install headers - (fetchpatch { - url = "https://github.com/facebookincubator/fbjni/commit/74e125caa9a815244f1e6bd08eaba57d015378b4.patch"; - sha256 = "sha256-hQS35D69GD3ewV4zzPG+LO7jk7ncCj2CYDbLJ6SnpqE="; - }) - ]; - - nativeBuildInputs = [ - cmake - jdk_headless - ]; - - buildInputs = [ - gtest - ]; - - cmakeFlags = [ - "-DJAVA_HOME=${jdk_headless.passthru.home}" - ]; - - meta = with lib; { - description = "Library designed to simplify the usage of the Java Native Interface"; - homepage = "https://github.com/facebookincubator/fbjni"; - license = licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/fbthrift/default.nix b/pkgs/development/libraries/fbthrift/default.nix index 5ac08f2c6cc3..04bce085c088 100644 --- a/pkgs/development/libraries/fbthrift/default.nix +++ b/pkgs/development/libraries/fbthrift/default.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if stdenv.isDarwin then "OFF" else "ON"}" - ] ++ lib.optionals stdenv.isDarwin [ + "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isDarwin then "OFF" else "ON"}" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix deleted file mode 100644 index ec8c9962125e..000000000000 --- a/pkgs/development/libraries/fcft/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv, lib, fetchFromGitea, fetchpatch, pkg-config, meson, ninja, scdoc -, freetype, fontconfig, nanosvg, pixman, tllist, check -# Text shaping methods to enable, empty list disables all text shaping. -# See `availableShapingTypes` or upstream meson_options.txt for available types. -, withShapingTypes ? [ "grapheme" "run" ] -, harfbuzz, utf8proc -, fcft # for passthru.tests -}: - -let - # Needs to be reflect upstream meson_options.txt - availableShapingTypes = [ - "grapheme" - "run" - ]; -in - -stdenv.mkDerivation rec { - pname = "fcft"; - version = "3.1.8"; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "dnkl"; - repo = "fcft"; - rev = version; - hash = "sha256-Wgm2QdW4rg573soF/8HhDmlyN4S2cA0VWOejow464gU="; - }; - - patches = [ - (fetchpatch { - name = "system-nanosvg.patch"; - url = "https://codeberg.org/dnkl/fcft/commit/5cee776e1d7f1bdb0df383c3dd798831a6fe4fa0.patch"; - excludes = [ "CHANGELOG.md" ]; - hash = "sha256-yRBtKCKT/Oih66/OQqt4GPg3GfHmhiLM8mlLEWYYRC0="; - }) - ]; - - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ pkg-config meson ninja scdoc ]; - buildInputs = [ freetype fontconfig nanosvg pixman tllist ] - ++ lib.optionals (withShapingTypes != []) [ harfbuzz ] - ++ lib.optionals (builtins.elem "run" withShapingTypes) [ utf8proc ]; - nativeCheckInputs = [ check ]; - - mesonBuildType = "release"; - mesonFlags = [ - (lib.mesonEnable "system-nanosvg" true) - ] ++ builtins.map (t: - lib.mesonEnable "${t}-shaping" (lib.elem t withShapingTypes) - ) availableShapingTypes; - - doCheck = true; - - outputs = [ "out" "doc" "man" ]; - - passthru.tests = { - noShaping = fcft.override { withShapingTypes = []; }; - onlyGraphemeShaping = fcft.override { withShapingTypes = [ "grapheme" ]; }; - }; - - meta = with lib; { - homepage = "https://codeberg.org/dnkl/fcft"; - changelog = "https://codeberg.org/dnkl/fcft/releases/tag/${version}"; - description = "Simple library for font loading and glyph rasterization"; - maintainers = with maintainers; [ - fionera - sternenseemann - ]; - license = with licenses; [ mit zlib ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/development/libraries/fcl/default.nix b/pkgs/development/libraries/fcl/default.nix deleted file mode 100644 index 0c6790db9f70..000000000000 --- a/pkgs/development/libraries/fcl/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, eigen, libccd, octomap }: - -stdenv.mkDerivation rec { - pname = "fcl"; - version = "0.7.0"; - - src = fetchFromGitHub { - owner = "flexible-collision-library"; - repo = pname; - rev = version; - sha256 = "0f5lhg6f9np7w16s6wz4mb349bycil1irk8z8ylfjwllxi4n6x7a"; - }; - - nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ eigen libccd octomap ]; - - outputs = [ "out" "dev" ]; - - meta = with lib; { - description = "Flexible Collision Library"; - longDescription = '' - FCL is a library for performing three types of proximity queries on a - pair of geometric models composed of triangles. - ''; - homepage = "https://github.com/flexible-collision-library/fcl"; - license = licenses.bsd3; - maintainers = with maintainers; [ lopsided98 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix deleted file mode 100644 index 1a82a9289a61..000000000000 --- a/pkgs/development/libraries/fcppt/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, catch2 }: -stdenv.mkDerivation rec { - pname = "fcppt"; - version = "4.2.1"; - - src = fetchFromGitHub { - owner = "freundlich"; - repo = "fcppt"; - rev = version; - sha256 = "1pcmi2ck12nanw1rnwf8lmyx85iq20897k6daxx3hw5f23j1kxv6"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost catch2 ]; - - cmakeFlags = [ - "-DENABLE_BOOST=true" - "-DENABLE_EXAMPLES=true" - "-DENABLE_CATCH=true" - "-DENABLE_TEST=true" - ]; - - meta = with lib; { - description = "Freundlich's C++ toolkit"; - longDescription = '' - Freundlich's C++ Toolkit (fcppt) is a collection of libraries focusing on - improving general C++ code by providing better types, a strong focus on - C++11 (non-conforming compilers are mostly not supported) and functional - programming (which is both efficient and syntactically affordable in - C++11). - ''; - homepage = "https://fcppt.org"; - license = licenses.boost; - maintainers = with maintainers; [ pmiddend ]; - platforms = [ "x86_64-linux" "x86_64-windows" ]; - }; -} diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix deleted file mode 100644 index 8f8611ccf6a1..000000000000 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, stdenv -, fetchurl -, exampleSupport ? false # Example encoding program -}: - -stdenv.mkDerivation rec { - pname = "fdk-aac"; - version = "2.0.3"; - - src = fetchurl { - url = "mirror://sourceforge/opencore-amr/fdk-aac/${pname}-${version}.tar.gz"; - sha256 = "sha256-gptrie7zgkCc2mhX/YKvhPq7Y0F7CO3p6npVP4Ect54="; - }; - - outputs = [ "out" "dev" ]; - - enableParallelBuilding = true; - - configureFlags = lib.optional exampleSupport "--enable-example"; - - meta = with lib; { - description = "High-quality implementation of the AAC codec from Android"; - homepage = "https://sourceforge.net/projects/opencore-amr/"; - license = licenses.fraunhofer-fdk; - maintainers = with maintainers; [ codyopel ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix deleted file mode 100644 index 65c29f9319ce..000000000000 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, givaro, pkg-config, blas, lapack -, gmpxx -}: - -assert (!blas.isILP64) && (!lapack.isILP64); - -stdenv.mkDerivation rec { - pname = "fflas-ffpack"; - version = "2.5.0"; - - src = fetchFromGitHub { - owner = "linbox-team"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Eztc2jUyKRVUiZkYEh+IFHkDuPIy+Gx3ZW/MsuOVaMc="; - }; - - nativeCheckInputs = [ - gmpxx - ]; - - enableParallelBuilding = true; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ] ++ lib.optionals doCheck nativeCheckInputs; - - buildInputs = [ givaro blas lapack ]; - - configureFlags = [ - "--with-blas-libs=-lcblas" - "--with-lapack-libs=-llapacke" - "--without-archnative" - ] ++ lib.optionals stdenv.isx86_64 [ - # disable SIMD instructions (which are enabled *when available* by default) - # for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284) - "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" - "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" - "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41" - "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42" - "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx" - "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2" - "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512f" - "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512dq" - "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512vl" - "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma" - "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4" - ]; - doCheck = true; - - meta = with lib; { - description = "Finite Field Linear Algebra Subroutines"; - mainProgram = "fflas-ffpack-config"; - license = licenses.lgpl21Plus; - maintainers = teams.sage.members; - platforms = platforms.unix; - homepage = "https://linbox-team.github.io/fflas-ffpack/"; - }; -} 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 deleted file mode 100644 index 60004b1766ca..000000000000 --- a/pkgs/development/libraries/ffmpeg/0001-avfoundation.m-macOS-SDK-10.12-compatibility.patch +++ /dev/null @@ -1,25 +0,0 @@ -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/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index f6a6403435e8..d07551608a54 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -1,19 +1,16 @@ -{ callPackage, darwin }: +{ + callPackage, + darwin, + cudaPackages, +}: let mkFFmpeg = initArgs: ffmpegVariant: callPackage ./generic.nix ( { - inherit (darwin.apple_sdk.frameworks) - Accelerate - AppKit - AudioToolbox - AVFoundation - CoreImage - VideoToolbox - ; inherit (darwin) xcode; + inherit (cudaPackages) cuda_cudart cuda_nvcc libnpp; } // (initArgs // { inherit ffmpegVariant; }) ); @@ -29,8 +26,8 @@ let }; v7 = { - version = "7.0.2"; - hash = "sha256-6bcTxMt0rH/Nso3X7zhrFNkkmWYtxsbUqVQKh25R1Fs="; + version = "7.1"; + hash = "sha256-erTkv156VskhYEJWjpWFvHjmcr2hr6qgUi28Ho8NFYk="; }; in @@ -50,11 +47,17 @@ rec { ffmpeg_7-headless = mkFFmpeg v7 "headless"; ffmpeg_7-full = mkFFmpeg v7 "full"; - # Please make sure this is updated to the latest version on the next major - # update to ffmpeg - # Packages which use ffmpeg as a library, should pin to the relevant major - # version number which the upstream support. - ffmpeg = ffmpeg_6; - ffmpeg-headless = ffmpeg_6-headless; - ffmpeg-full = ffmpeg_6-full; + # Please make sure this is updated to new major versions once they + # build and work on all the major platforms. If absolutely necessary + # due to severe breaking changes, the bump can wait a little bit to + # give the most proactive users time to migrate, but don’t hold off + # for too long. + # + # Packages which depend on FFmpeg should generally use these + # unversioned aliases to allow for quicker migration to new releases, + # but can pin one of the versioned variants if they do not work with + # the current default version. + ffmpeg = ffmpeg_7; + ffmpeg-headless = ffmpeg_7-headless; + ffmpeg-full = ffmpeg_7-full; } diff --git a/pkgs/development/libraries/ffmpeg/fix-fate-ffmpeg-spec-disposition-7.1.patch b/pkgs/development/libraries/ffmpeg/fix-fate-ffmpeg-spec-disposition-7.1.patch new file mode 100644 index 000000000000..998c4d97f617 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/fix-fate-ffmpeg-spec-disposition-7.1.patch @@ -0,0 +1,10 @@ +diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak +index 869376dd18..d9348ee837 100644 +--- a/tests/fate/ffmpeg.mak ++++ b/tests/fate/ffmpeg.mak +@@ -266,4 +266,4 @@ + + # test matching by stream disposition + fate-ffmpeg-spec-disposition: CMD = framecrc -i $(TARGET_SAMPLES)/mpegts/pmtchange.ts -map '0:disp:visual_impaired+descriptions:1' -c copy +-FATE_FFMPEG-$(call FRAMECRC, MPEGTS,,) += fate-ffmpeg-spec-disposition ++FATE_SAMPLES_FFMPEG-$(call FRAMECRC, MPEGTS,,) += fate-ffmpeg-spec-disposition diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 4e8226c1904a..eab578cf931f 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, removeReferencesTo, addDriverRunpath, pkg-config, perl, texinfo, texinfo6, yasm +{ lib, config, 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. @@ -33,28 +33,27 @@ , fetchpatch2 # Feature flags -, withAlsa ? withHeadlessDeps && stdenv.isLinux # Alsa in/output supporT +, withAlsa ? withHeadlessDeps && stdenv.hostPlatform.isLinux # Alsa in/output supporT , withAmf ? lib.meta.availableOn stdenv.hostPlatform amf # AMD Media Framework video encoding , withAom ? withHeadlessDeps # AV1 reference encoder -, withAppKit ? withHeadlessDeps && stdenv.isDarwin # Apple AppKit framework +, withAribb24 ? withFullDeps # ARIB text and caption decoding , withAribcaption ? withFullDeps && lib.versionAtLeast version "6.1" # ARIB STD-B24 Caption Decoder/Renderer , withAss ? withHeadlessDeps && stdenv.hostPlatform == stdenv.buildPlatform # (Advanced) SubStation Alpha subtitle rendering -, withAudioToolbox ? withHeadlessDeps && stdenv.isDarwin # Apple AudioToolbox -, withAvFoundation ? withHeadlessDeps && stdenv.isDarwin # Apple AVFoundation framework , withAvisynth ? withFullDeps # AviSynth script files reading , withBluray ? withFullDeps # BluRay reading , withBs2b ? withFullDeps # bs2b DSP library , withBzlib ? withHeadlessDeps , withCaca ? withFullDeps # Textual display (ASCII art) +, withCdio ? withFullDeps && withGPL # Audio CD grabbing , withCelt ? withHeadlessDeps # CELT decoder , withChromaprint ? withFullDeps # Audio fingerprinting , withCodec2 ? withFullDeps # codec2 en/decoding -, withCoreImage ? withHeadlessDeps && stdenv.isDarwin # Apple CoreImage framework , withCuda ? withFullDeps && withNvcodec , withCudaLLVM ? withFullDeps +, withCudaNVCC ? withFullDeps && withUnfree && config.cudaSupport , withCuvid ? withHeadlessDeps && withNvcodec , withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness) -, withDc1394 ? withFullDeps && !stdenv.isDarwin # IIDC-1394 grabbing (ieee 1394) +, withDc1394 ? withFullDeps && !stdenv.hostPlatform.isDarwin # IIDC-1394 grabbing (ieee 1394) , withDrm ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # libdrm support , withDvdnav ? withFullDeps && withGPL && lib.versionAtLeast version "7" # needed for DVD demuxing , withDvdread ? withFullDeps && withGPL && lib.versionAtLeast version "7" # needed for DVD demuxing @@ -71,38 +70,42 @@ , withHarfbuzz ? withHeadlessDeps && lib.versionAtLeast version "6.1" # Needed for drawtext filter , withIconv ? withHeadlessDeps , withIlbc ? withFullDeps # iLBC de/encoding -, withJack ? withFullDeps && !stdenv.isDarwin # Jack audio +, withJack ? withFullDeps && !stdenv.hostPlatform.isDarwin # Jack audio , withJxl ? withFullDeps && lib.versionAtLeast version "5" # JPEG XL de/encoding +, withKvazaar ? withFullDeps # HEVC encoding , withLadspa ? withFullDeps # LADSPA audio filtering +, withLc3 ? withFullDeps && lib.versionAtLeast version "7.1" # LC3 de/encoding +, withLcevcdec ? withFullDeps && lib.versionAtLeast version "7.1" # LCEVC decoding , 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 -, withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support +, withModplug ? withFullDeps && !stdenv.hostPlatform.isDarwin # ModPlug support , withMp3lame ? withHeadlessDeps # LAME MP3 encoder , withMysofa ? withFullDeps # HRTF support via SOFAlizer +, withNpp ? withFullDeps && withUnfree && config.cudaSupport # Nvidia Performance Primitives-based code , withNvdec ? withHeadlessDeps && withNvcodec , withNvenc ? withHeadlessDeps && withNvcodec -, withOgg ? withHeadlessDeps # Ogg container used by vorbis & theora , withOpenal ? withFullDeps # OpenAL 1.1 capture support , withOpencl ? withFullDeps , withOpencoreAmrnb ? withFullDeps && withVersion3 # AMR-NB de/encoder , withOpencoreAmrwb ? withFullDeps && withVersion3 # AMR-WB decoder -, withOpengl ? withFullDeps && !stdenv.isDarwin # OpenGL rendering +, withOpengl ? withFullDeps && !stdenv.hostPlatform.isDarwin # OpenGL rendering , withOpenh264 ? withFullDeps # H.264/AVC encoder , withOpenjpeg ? withHeadlessDeps # JPEG 2000 de/encoder , withOpenmpt ? withFullDeps # Tracked music files decoder , withOpus ? withHeadlessDeps # Opus de/encoder -, withPlacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library -, withPulse ? withSmallDeps && stdenv.isLinux # Pulseaudio input support +, withPlacebo ? withFullDeps && !stdenv.hostPlatform.isDarwin # libplacebo video processing library +, withPulse ? withSmallDeps && stdenv.hostPlatform.isLinux # Pulseaudio input support , withQrencode ? withFullDeps && lib.versionAtLeast version "7" # QR encode generation , withQuirc ? withFullDeps && lib.versionAtLeast version "7" # QR decoding , withRav1e ? withFullDeps # AV1 encoder (focused on speed and safety) +, withRist ? withHeadlessDeps # Reliable Internet Stream Transport (RIST) protocol , withRtmp ? withFullDeps # RTMP[E] support , withRubberband ? withFullDeps && withGPL # Rubberband filter -, withSamba ? withFullDeps && !stdenv.isDarwin && withGPLv3 # Samba protocol +, withSamba ? withFullDeps && !stdenv.hostPlatform.isDarwin && withGPLv3 # Samba protocol , withSdl2 ? withSmallDeps -, withShaderc ? withFullDeps && !stdenv.isDarwin && lib.versionAtLeast version "5.0" +, withShaderc ? withFullDeps && !stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "5.0" , withShine ? withFullDeps # Fixed-point MP3 encoding , withSnappy ? withFullDeps # Snappy compression, needed for hap encoding , withSoxr ? withHeadlessDeps # Resampling via soxr @@ -110,22 +113,22 @@ , withSrt ? withHeadlessDeps # Secure Reliable Transport (SRT) protocol , withSsh ? withHeadlessDeps # SFTP protocol , withSvg ? withFullDeps # SVG protocol -, withSvtav1 ? withHeadlessDeps && !stdenv.isAarch64 && !stdenv.hostPlatform.isMinGW # AV1 encoder/decoder (focused on speed and correctness) +, withSvtav1 ? withHeadlessDeps && !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isMinGW # AV1 encoder/decoder (focused on speed and correctness) , withTensorflow ? false # Tensorflow dnn backend support (Increases closure size by ~390 MiB) , withTheora ? withHeadlessDeps # Theora encoder , withTwolame ? withFullDeps # MP2 encoding -, withV4l2 ? withHeadlessDeps && stdenv.isLinux # Video 4 Linux support +, withV4l2 ? withHeadlessDeps && stdenv.hostPlatform.isLinux # Video 4 Linux support , withV4l2M2m ? withV4l2 , withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # Vaapi hardware acceleration , withVdpau ? withSmallDeps && !stdenv.hostPlatform.isMinGW # Vdpau hardware acceleration -, withVideoToolbox ? withHeadlessDeps && stdenv.isDarwin # Apple VideoToolbox -, withVidStab ? withFullDeps && withGPL # Video stabilization -, withVmaf ? withFullDeps && !stdenv.isAarch64 && lib.versionAtLeast version "5" # Netflix's VMAF (Video Multi-Method Assessment Fusion) +, withVidStab ? withHeadlessDeps && withGPL # Video stabilization +, withVmaf ? withFullDeps && !stdenv.hostPlatform.isAarch64 && lib.versionAtLeast version "5" # Netflix's VMAF (Video Multi-Method Assessment Fusion) , withVoAmrwbenc ? withFullDeps && withVersion3 # AMR-WB encoder , withVorbis ? withHeadlessDeps # Vorbis de/encoding, native encoder exists , withVpl ? false # Hardware acceleration via intel libvpl , withVpx ? withHeadlessDeps && stdenv.buildPlatform == stdenv.hostPlatform # VP8 & VP9 de/encoding -, withVulkan ? withSmallDeps && !stdenv.isDarwin +, withVulkan ? withSmallDeps && !stdenv.hostPlatform.isDarwin +, withVvenc ? withFullDeps && lib.versionAtLeast version "7.1" # H.266/VVC encoding , withWebp ? withHeadlessDeps # WebP encoder , withX264 ? withHeadlessDeps && withGPL # H.264/AVC encoder , withX265 ? withHeadlessDeps && withGPL # H.265/HEVC encoder @@ -134,14 +137,15 @@ , withXcbShape ? withFullDeps # X11 grabbing shape rendering , withXcbShm ? withFullDeps # X11 grabbing shm communication , withXcbxfixes ? withFullDeps # X11 grabbing mouse rendering -, 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 +, withXevd ? withFullDeps && lib.versionAtLeast version "7.1" && !xevd.meta.broken # MPEG-5 EVC decoding +, withXeve ? withFullDeps && lib.versionAtLeast version "7.1" && !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 , withZimg ? withHeadlessDeps , withZlib ? withHeadlessDeps , withZmq ? withFullDeps # Message passing +, withZvbi ? withFullDeps # Teletext support /* * Licensing options (yes some are listed twice, filters and such are not listed) @@ -224,6 +228,7 @@ , alsa-lib , amf , amf-headers +, aribb24 , avisynthplus , bzip2 , celt @@ -242,8 +247,10 @@ , gsm , harfbuzz , intel-media-sdk +, kvazaar , ladspaH , lame +, lcevcdec , lcms2 , libaom , libaribcaption @@ -251,6 +258,8 @@ , libbluray , libbs2b , libcaca +, libcdio +, libcdio-paranoia , libdc1394 , libdrm , libdvdnav @@ -261,15 +270,16 @@ , libilbc , libjack2 , libjxl +, liblc3 , libmodplug , libmysofa -, libogg , libopenmpt , libopus , libplacebo , libplacebo_5 , libpulseaudio , libraw1394 +, librist , librsvg , libssh , libtensorflow @@ -315,6 +325,7 @@ , vo-amrwbenc , vulkan-headers , vulkan-loader +, vvenc , x264 , x265 , xavs @@ -325,17 +336,19 @@ , zeromq4 , zimg , zlib +, zvbi /* - * Darwin frameworks + * Darwin */ -, Accelerate -, AppKit -, AudioToolbox -, AVFoundation -, CoreImage -, VideoToolbox +, apple-sdk_15 , xcode # unfree contains metalcc and metallib /* + * Cuda Packages + */ +, cuda_cudart +, cuda_nvcc +, libnpp +/* * Testing */ , testers @@ -451,16 +464,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-sqUUSOPTPLwu2h8GbAw4SfEf+0oWioz52BcpW1n4v3Y="; }) ] - ++ optionals (lib.versionAtLeast version "7.0" && lib.versionOlder version "7.0.1") [ - (fetchpatch2 { - # Will likely be obsolete in >7.0 - name = "fate_avoid_dependency_on_samples"; - 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 + ++ optionals (lib.versionAtLeast version "7.1") [ + ./fix-fate-ffmpeg-spec-disposition-7.1.patch # Expose a private API for Chromium / Qt WebEngine. (fetchpatch2 { @@ -554,24 +559,23 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withAlsa "alsa") (enableFeature withAmf "amf") (enableFeature withAom "libaom") - (enableFeature withAppKit "appkit") + (enableFeature withAribb24 "libaribb24") ] ++ optionals (versionAtLeast version "6.1") [ (enableFeature withAribcaption "libaribcaption") ] ++ [ (enableFeature withAss "libass") - (enableFeature withAudioToolbox "audiotoolbox") - (enableFeature withAvFoundation "avfoundation") (enableFeature withAvisynth "avisynth") (enableFeature withBluray "libbluray") (enableFeature withBs2b "libbs2b") (enableFeature withBzlib "bzlib") (enableFeature withCaca "libcaca") + (enableFeature withCdio "libcdio") (enableFeature withCelt "libcelt") (enableFeature withChromaprint "chromaprint") (enableFeature withCodec2 "libcodec2") - (enableFeature withCoreImage "coreimage") (enableFeature withCuda "cuda") (enableFeature withCudaLLVM "cuda-llvm") + (enableFeature withCudaNVCC "cuda-nvcc") (enableFeature withCuvid "cuvid") (enableFeature withDav1d "libdav1d") (enableFeature withDc1394 "libdc1394") @@ -600,7 +604,11 @@ stdenv.mkDerivation (finalAttrs: { ] ++ optionals (versionAtLeast finalAttrs.version "5.0") [ (enableFeature withJxl "libjxl") ] ++ [ + (enableFeature withKvazaar "libkvazaar") (enableFeature withLadspa "ladspa") + ] ++ optionals (versionAtLeast version "7.1") [ + (enableFeature withLc3 "liblc3") + (enableFeature withLcevcdec "liblcevc-dec") ] ++ optionals (versionAtLeast version "5.1") [ (enableFeature withLcms2 "lcms2") ] ++ [ @@ -612,6 +620,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withModplug "libmodplug") (enableFeature withMp3lame "libmp3lame") (enableFeature withMysofa "libmysofa") + (enableFeature withNpp "libnpp") (enableFeature withNvdec "nvdec") (enableFeature withNvenc "nvenc") (enableFeature withOpenal "openal") @@ -632,6 +641,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withQuirc "libquirc") ] ++ [ (enableFeature withRav1e "librav1e") + (enableFeature withRist "librist") (enableFeature withRtmp "librtmp") (enableFeature withRubberband "librubberband") (enableFeature withSamba "libsmbclient") @@ -657,13 +667,15 @@ stdenv.mkDerivation (finalAttrs: { ] ++ optionals (versionAtLeast version "6.0") [ (enableFeature withVpl "libvpl") ] ++ [ - (enableFeature withVideoToolbox "videotoolbox") (enableFeature withVidStab "libvidstab") # Actual min. version 2.0 (enableFeature withVmaf "libvmaf") (enableFeature withVoAmrwbenc "libvo-amrwbenc") (enableFeature withVorbis "libvorbis") (enableFeature withVpx "libvpx") (enableFeature withVulkan "vulkan") + ] ++ optionals (versionAtLeast version "7.1") [ + (enableFeature withVvenc "libvvenc") + ] ++ [ (enableFeature withWebp "libwebp") (enableFeature withX264 "libx264") (enableFeature withX265 "libx265") @@ -682,6 +694,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withZimg "libzimg") (enableFeature withZlib "zlib") (enableFeature withZmq "libzmq") + (enableFeature withZvbi "libzvbi") /* * Developer flags */ @@ -717,26 +730,27 @@ stdenv.mkDerivation (finalAttrs: { 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 ]; + ++ optionals withCudaLLVM [ clang ] + ++ optionals withCudaNVCC [ cuda_nvcc ]; buildInputs = [] + ++ optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ] ++ optionals withAlsa [ alsa-lib ] ++ optionals withAmf [ amf-headers ] ++ optionals withAom [ libaom ] - ++ optionals withAppKit [ AppKit ] + ++ optionals withAribb24 [ aribb24 ] ++ optionals withAribcaption [ libaribcaption ] ++ optionals withAss [ libass ] - ++ optionals withAudioToolbox [ AudioToolbox ] - ++ optionals withAvFoundation [ AVFoundation ] ++ optionals withAvisynth [ avisynthplus ] ++ optionals withBluray [ libbluray ] ++ optionals withBs2b [ libbs2b ] ++ optionals withBzlib [ bzip2 ] ++ optionals withCaca [ libcaca ] + ++ optionals withCdio [ libcdio libcdio-paranoia ] ++ optionals withCelt [ celt ] ++ optionals withChromaprint [ chromaprint ] ++ optionals withCodec2 [ codec2 ] - ++ optionals withCoreImage [ CoreImage ] + ++ optionals withCudaNVCC [ cuda_cudart cuda_nvcc ] ++ optionals withDav1d [ dav1d ] ++ optionals withDc1394 [ libdc1394 libraw1394 ] ++ optionals withDrm [ libdrm ] @@ -757,14 +771,17 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withIlbc [ libilbc ] ++ optionals withJack [ libjack2 ] ++ optionals withJxl [ libjxl ] + ++ optionals withKvazaar [ kvazaar ] ++ optionals withLadspa [ ladspaH ] + ++ optionals withLc3 [ liblc3 ] + ++ optionals withLcevcdec [ lcevcdec ] ++ optionals withLcms2 [ lcms2 ] ++ optionals withLzma [ xz ] ++ optionals withMfx [ intel-media-sdk ] ++ optionals withModplug [ libmodplug ] ++ optionals withMp3lame [ lame ] ++ optionals withMysofa [ libmysofa ] - ++ optionals withOgg [ libogg ] + ++ optionals withNpp [ libnpp cuda_cudart cuda_nvcc ] ++ optionals withOpenal [ openal ] ++ optionals withOpencl [ ocl-icd opencl-headers ] ++ optionals (withOpencoreAmrnb || withOpencoreAmrwb) [ opencore-amr ] @@ -778,8 +795,9 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withQrencode [ qrencode ] ++ optionals withQuirc [ quirc ] ++ optionals withRav1e [ rav1e ] + ++ optionals withRist [ librist ] ++ optionals withRtmp [ rtmpdump ] - ++ optionals withRubberband ([ rubberband ] ++ lib.optional stdenv.hostPlatform.isDarwin Accelerate) + ++ optionals withRubberband [ rubberband ] ++ optionals withSamba [ samba ] ++ optionals withSdl2 [ SDL2 ] ++ optionals withShaderc [ shaderc ] @@ -797,7 +815,6 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withV4l2 [ libv4l ] ++ optionals withVaapi [ (if withSmallDeps then libva else libva-minimal) ] ++ optionals withVdpau [ libvdpau ] - ++ optionals withVideoToolbox [ VideoToolbox ] ++ optionals withVidStab [ vid-stab ] ++ optionals withVmaf [ libvmaf ] ++ optionals withVoAmrwbenc [ vo-amrwbenc ] @@ -805,6 +822,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withVpl [ libvpl ] ++ optionals withVpx [ libvpx ] ++ optionals withVulkan [ vulkan-headers vulkan-loader ] + ++ optionals withVvenc [ vvenc ] ++ optionals withWebp [ libwebp ] ++ optionals withX264 [ x264 ] ++ optionals withX265 [ x265 ] @@ -818,16 +836,24 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withZimg [ zimg ] ++ optionals withZlib [ zlib ] ++ optionals withZmq [ zeromq4 ] + ++ optionals withZvbi [ zvbi ] ; buildFlags = [ "all" ] ++ optional buildQtFaststart "tools/qt-faststart"; # Build qt-faststart executable - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=incompatible-pointer-types" + "-Wno-error=int-conversion" + ]; + }; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # Fails with SIGABRT otherwise FIXME: Why? checkPhase = let - ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + ldLibraryPathEnv = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; libsToLink = [ ] ++ optional buildAvcodec "libavcodec" ++ optional buildAvdevice "libavdevice" @@ -856,7 +882,7 @@ stdenv.mkDerivation (finalAttrs: { # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found. # See the explanation in addDriverRunpath. - postFixup = optionalString (stdenv.isLinux && withLib) '' + postFixup = optionalString (stdenv.hostPlatform.isLinux && withLib) '' addDriverRunpath ${placeholder "lib"}/lib/libavcodec.so addDriverRunpath ${placeholder "lib"}/lib/libavutil.so '' diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix deleted file mode 100644 index ff1a8615ab79..000000000000 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - ffmpeg-headless, - libpng, - libjpeg, -}: - -stdenv.mkDerivation rec { - pname = "ffmpegthumbnailer"; - version = "unstable-2024-01-04"; - - src = fetchFromGitHub { - owner = "dirkvdb"; - repo = "ffmpegthumbnailer"; - rev = "1b5a77983240bcf00a4ef7702c07bcd8f4e5f97c"; - hash = "sha256-7SPRQMPgdvP7J3HCf7F1eXxZjUH5vCYZ9UOwTUFMLp0="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - ffmpeg-headless - libpng - libjpeg - ]; - - cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ]; - - # https://github.com/dirkvdb/ffmpegthumbnailer/issues/215 - postPatch = '' - substituteInPlace libffmpegthumbnailer.pc.in \ - --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ - ''; - - postInstall = '' - substituteInPlace $out/share/thumbnailers/ffmpegthumbnailer.thumbnailer \ - --replace-fail '=ffmpegthumbnailer' "=$out/bin/ffmpegthumbnailer" - ''; - - meta = with lib; { - description = "Lightweight video thumbnailer"; - longDescription = "FFmpegthumbnailer is a lightweight video - thumbnailer that can be used by file managers to create thumbnails - for your video files. The thumbnailer uses ffmpeg to decode frames - from the video files, so supported videoformats depend on the - configuration flags of ffmpeg. - This thumbnailer was designed to be as fast and lightweight as possible. - The only dependencies are ffmpeg and libpng/libjpeg. - "; - homepage = "https://github.com/dirkvdb/ffmpegthumbnailer"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.jagajaga ]; - platforms = platforms.unix; - mainProgram = "ffmpegthumbnailer"; - }; -} diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix deleted file mode 100644 index 6d5db4cdac5b..000000000000 --- a/pkgs/development/libraries/ffms/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config -, ffmpeg -, zlib -}: - -stdenv.mkDerivation rec { - pname = "ffms"; - version = "5.0"; - - src = fetchFromGitHub { - owner = "FFMS"; - repo = "ffms2"; - rev = version; - sha256 = "sha256-Ildl8hbKSFGh4MUBK+k8uYMDrOZD9NSMdPAWIIaGy4E="; - }; - - env.NIX_CFLAGS_COMPILE = "-fPIC"; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - preAutoreconf = '' - mkdir src/config - ''; - - buildInputs = [ - ffmpeg - zlib - ]; - - # ffms includes a built-in vapoursynth plugin, see: - # https://github.com/FFMS/ffms2#avisynth-and-vapoursynth-plugin - postInstall = '' - mkdir $out/lib/vapoursynth - ln -s $out/lib/libffms2.so $out/lib/vapoursynth/libffms2.so - ''; - - meta = with lib; { - homepage = "https://github.com/FFMS/ffms2"; - description = "FFmpeg based source library for easy frame accurate access"; - mainProgram = "ffmsindex"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix deleted file mode 100644 index 7c06a346e4bb..000000000000 --- a/pkgs/development/libraries/fftw/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ fetchurl -, fetchpatch -, stdenv -, lib -, gfortran -, perl -, llvmPackages -, precision ? "double" -, enableMpi ? false -, mpi -, withDoc ? stdenv.cc.isGNU -, testers -}: - -assert lib.elem precision [ "single" "double" "long-double" "quad-precision" ]; - -stdenv.mkDerivation (finalAttrs: { - pname = "fftw-${precision}"; - version = "3.3.10"; - - src = fetchurl { - urls = [ - "https://fftw.org/fftw-${finalAttrs.version}.tar.gz" - "ftp://ftp.fftw.org/pub/fftw/fftw-${finalAttrs.version}.tar.gz" - ]; - sha256 = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc="; - }; - - patches = [ - (fetchpatch { - name = "remove_missing_FFTW3LibraryDepends.patch"; - url = "https://github.com/FFTW/fftw3/pull/338/commits/f69fef7aa546d4477a2a3fd7f13fa8b2f6c54af7.patch"; - hash = "sha256-lzX9kAHDMY4A3Td8necXwYLcN6j8Wcegi3A7OIECKeU="; - }) - ]; - - outputs = [ "out" "dev" "man" ] - ++ lib.optional withDoc "info"; # it's dev-doc only - outputBin = "dev"; # fftw-wisdom - - nativeBuildInputs = [ gfortran ]; - - buildInputs = lib.optionals stdenv.cc.isClang [ - # TODO: This may mismatch the LLVM version sin the stdenv, see #79818. - llvmPackages.openmp - ] ++ lib.optional enableMpi mpi; - - configureFlags = [ - "--enable-shared" - "--enable-threads" - "--enable-openmp" - ] - - ++ lib.optional (precision != "double") "--enable-${precision}" - # https://www.fftw.org/fftw3_doc/SIMD-alignment-and-fftw_005fmalloc.html - # FFTW will try to detect at runtime whether the CPU supports these extensions - ++ lib.optional (stdenv.isx86_64 && (precision == "single" || precision == "double")) - "--enable-sse2 --enable-avx --enable-avx2 --enable-avx512 --enable-avx128-fma" - ++ lib.optional enableMpi "--enable-mpi" - # doc generation causes Fortran wrapper generation which hard-codes gcc - ++ lib.optional (!withDoc) "--disable-doc"; - - # fftw builds with -mtune=native by default - postPatch = '' - substituteInPlace configure --replace "-mtune=native" "-mtune=generic" - ''; - - enableParallelBuilding = true; - - nativeCheckInputs = [ perl ]; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = with lib; { - description = "Fastest Fourier Transform in the West library"; - homepage = "https://www.fftw.org/"; - license = licenses.gpl2Plus; - maintainers = [ ]; - pkgConfigModules = [ - { - "single" = "fftw3f"; - "double" = "fftw3"; - "long-double" = "fftw3l"; - "quad-precision" = "fftw3q"; - }.${precision} - ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix deleted file mode 100644 index 8b76c151b472..000000000000 --- a/pkgs/development/libraries/filter-audio/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "filter-audio"; - version = "0.0.1"; - - src = fetchFromGitHub { - owner = "irungentoo"; - repo ="filter_audio"; - rev = "v${version}"; - sha256 = "1dv4pram317c1w97cjsv9f6r8cdxhgri7ib0v364z08pk7r2avfn"; - }; - - doCheck = false; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = with lib; { - description = "Lightweight audio filtering library made from webrtc code"; - license = licenses.bsd3; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/fizz/default.nix b/pkgs/development/libraries/fizz/default.nix index cc7a249cf76f..4c38c54316b7 100644 --- a/pkgs/development/libraries/fizz/default.nix +++ b/pkgs/development/libraries/fizz/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-Wno-dev" (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix deleted file mode 100644 index 52d64f18e8e5..000000000000 --- a/pkgs/development/libraries/flann/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, cmake -, fetchFromGitHub -, fetchpatch -, lz4 -, pkg-config -, python3 -, stdenv -, unzip -, enablePython ? false -}: - -stdenv.mkDerivation rec { - pname = "flann"; - version = "1.9.1"; - - src = fetchFromGitHub { - owner = "flann-lib"; - repo = "flann"; - rev = version; - sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc"; - }; - - patches = [ - # Patch HDF5_INCLUDE_DIR -> HDF_INCLUDE_DIRS. - (fetchpatch { - url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0001-Updated-fix-cmake-hdf5.patch"; - sha256 = "yM1ONU4mu6lctttM5YcSTg8F344TNUJXwjxXLqzr5Pk="; - }) - # Patch no-source library workaround that breaks on CMake > 3.11. - (fetchpatch { - url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0001-src-cpp-fix-cmake-3.11-build.patch"; - sha256 = "REsBnbe6vlrZ+iCcw43kR5wy2o6q10RM73xjW5kBsr4="; - }) - ] ++ lib.optionals (!stdenv.cc.isClang) [ - # Avoid the bundled version of LZ4 and instead use the system one. - (fetchpatch { - url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0003-Use-system-version-of-liblz4.patch"; - sha256 = "xi+GyFn9PEjLgbJeAIEmsbp7ut9G9KIBkVulyT3nfsg="; - }) - # Fix LZ4 string separator issue, see: https://github.com/flann-lib/flann/pull/480 - (fetchpatch { - url = "https://github.com/flann-lib/flann/commit/25eb56ec78472bd419a121c6905095a793cf8992.patch"; - sha256 = "qt8h576Gn8uR7+T9u9bEBIRz6e6AoTKpa1JfdZVvW9s="; - }) - ] ++ lib.optionals stdenv.cc.isClang [ - # Fix build with Clang 16. - (fetchpatch { - url = "https://github.com/flann-lib/flann/commit/be80cefa69b314a3d9e1ab971715e84145863ebb.patch"; - hash = "sha256-4SUKzQCm0Sx8N43Z6ShuMbgbbe7q8b2Ibk3WgkB0qa4="; - }) - ]; - - cmakeFlags = [ - "-DBUILD_EXAMPLES:BOOL=OFF" - "-DBUILD_TESTS:BOOL=OFF" - "-DBUILD_MATLAB_BINDINGS:BOOL=OFF" - "-DBUILD_PYTHON_BINDINGS:BOOL=${if enablePython then "ON" else "OFF"}" - ]; - - nativeBuildInputs = [ - cmake - pkg-config - unzip - ]; - - # lz4 unbundling broken for llvm, use internal version - propagatedBuildInputs = lib.optional (!stdenv.cc.isClang) lz4; - - buildInputs = lib.optionals enablePython [ python3 ]; - - meta = { - homepage = "https://github.com/flann-lib/flann"; - license = lib.licenses.bsd3; - description = "Fast approximate nearest neighbor searches in high dimensional spaces"; - maintainers = [ ]; - platforms = with lib.platforms; linux ++ darwin; - }; -} diff --git a/pkgs/development/libraries/flatbuffers/23.nix b/pkgs/development/libraries/flatbuffers/23.nix index 5263694b0562..4e30c3dd37b6 100644 --- a/pkgs/development/libraries/flatbuffers/23.nix +++ b/pkgs/development/libraries/flatbuffers/23.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "-DFLATBUFFERS_OSX_BUILD_UNIVERSAL=OFF" ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; checkTarget = "test"; meta = with lib; { diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 00bb9cc8d187..58ea13a50b92 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "-DFLATBUFFERS_OSX_BUILD_UNIVERSAL=OFF" ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; checkTarget = "test"; meta = with lib; { diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/development/libraries/flatcc/default.nix deleted file mode 100644 index 888fd9f61288..000000000000 --- a/pkgs/development/libraries/flatcc/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -}: - -stdenv.mkDerivation rec { - pname = "flatcc"; - version = "0.6.1"; - - src = fetchFromGitHub { - owner = "dvidelabs"; - repo = "flatcc"; - rev = "v${version}"; - 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" - ]; - - meta = with lib; { - description = "FlatBuffers Compiler and Library in C for C"; - mainProgram = "flatcc"; - homepage = "https://github.com/dvidelabs/flatcc"; - license = [ licenses.asl20 ]; - maintainers = with maintainers; [ onny ]; - }; -} diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index f42e12f03bec..e2dcaadf5206 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -16,7 +16,7 @@ let generic = { version, - sha256, + hash, patches ? [ ], }: stdenv.mkDerivation { @@ -32,7 +32,7 @@ let owner = "fmtlib"; repo = "fmt"; rev = version; - inherit sha256; + inherit hash; }; inherit patches; @@ -70,21 +70,21 @@ in { fmt_8 = generic { version = "8.1.1"; - sha256 = "sha256-leb2800CwdZMJRWF5b1Y9ocK0jXpOX/nwo95icDf308="; + hash = "sha256-leb2800CwdZMJRWF5b1Y9ocK0jXpOX/nwo95icDf308="; }; fmt_9 = generic { version = "9.1.0"; - sha256 = "sha256-rP6ymyRc7LnKxUXwPpzhHOQvpJkpnRFOt2ctvUNlYI0="; + hash = "sha256-rP6ymyRc7LnKxUXwPpzhHOQvpJkpnRFOt2ctvUNlYI0="; }; fmt_10 = generic { version = "10.2.1"; - sha256 = "sha256-pEltGLAHLZ3xypD/Ur4dWPWJ9BGVXwqQyKcDWVmC3co="; + hash = "sha256-pEltGLAHLZ3xypD/Ur4dWPWJ9BGVXwqQyKcDWVmC3co="; }; fmt_11 = generic { - version = "11.0.1"; - sha256 = "sha256-EPidbZxCvysrL64AzbpJDowiNxqy4ii+qwSWAFwf/Ps="; + version = "11.0.2"; + hash = "sha256-IKNt4xUoVi750zBti5iJJcCk3zivTt7nU12RIf8pM+0="; }; } diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix deleted file mode 100644 index edbebdb1b8da..000000000000 --- a/pkgs/development/libraries/folks/default.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ stdenv -, lib -, fetchurl -, pkg-config -, meson -, ninja -, glib -, gnome -, gettext -, gobject-introspection -, vala -, sqlite -, dbus-glib -, dbus -, libgee -, evolution-data-server-gtk4 -, python3 -, readline -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, telepathy-glib -, telepathySupport ? false -}: - -# TODO: enable more folks backends - -stdenv.mkDerivation (finalAttrs: { - pname = "folks"; - version = "0.15.9"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/folks/${lib.versions.majorMinor finalAttrs.version}/folks-${finalAttrs.version}.tar.xz"; - hash = "sha256-IxGzc1XDUfM/Fj/cOUh0oioKBoLDGUk9bYpuQgcRQV8="; - }; - - nativeBuildInputs = [ - gettext - gobject-introspection - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - meson - ninja - pkg-config - vala - ] ++ lib.optionals telepathySupport [ - python3 - ]; - - buildInputs = [ - dbus-glib - evolution-data-server-gtk4 # UI part not needed, using gtk4 version to reduce system closure. - readline - ] ++ lib.optionals telepathySupport [ - telepathy-glib - ]; - - propagatedBuildInputs = [ - glib - libgee - sqlite - ]; - - nativeCheckInputs = [ - dbus - (python3.withPackages (pp: with pp; [ - python-dbusmock - # The following possibly need to be propagated by dbusmock - # if they are not optional - dbus-python - pygobject3 - ])) - ]; - - mesonFlags = [ - "-Ddocs=true" - "-Dtelepathy_backend=${lib.boolToString telepathySupport}" - "-Dtests=${lib.boolToString (finalAttrs.finalPackage.doCheck && stdenv.isLinux)}" - ]; - - # backends/eds/lib/libfolks-eds.so.26.0.0.p/edsf-persona-store.c:10697:4: - # error: call to undeclared function 'folks_persona_store_set_is_user_set_default'; - # ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration"; - - # Checks last re-enabled in https://github.com/NixOS/nixpkgs/pull/279843, but timeouts in tests still - # occur inconsistently - doCheck = false; - - mesonCheckFlags = [ - # Prevents e-d-s add-contacts-stress-test from timing out - "--timeout-multiplier" "4" - ]; - - postPatch = lib.optionalString telepathySupport '' - patchShebangs tests/tools/manager-file.py - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = "folks"; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - description = "Library that aggregates people from multiple sources to create metacontacts"; - homepage = "https://gitlab.gnome.org/GNOME/folks"; - license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 532fc4847715..8a601382f8ea 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -55,10 +55,10 @@ stdenv.mkDerivation rec { libunwind fmt_8 zstd - ] ++ lib.optional stdenv.isLinux jemalloc; + ] ++ lib.optional stdenv.hostPlatform.isLinux jemalloc; # jemalloc headers are required in include/folly/portability/Malloc.h - propagatedBuildInputs = lib.optional stdenv.isLinux jemalloc; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux jemalloc; env.NIX_CFLAGS_COMPILE = toString [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" "-fpermissive" ]; cmakeFlags = [ @@ -66,13 +66,13 @@ stdenv.mkDerivation rec { # temporary hack until folly builds work on aarch64, # see https://github.com/facebook/folly/issues/1880 - "-DCMAKE_LIBRARY_ARCHITECTURE=${if stdenv.isx86_64 then "x86_64" else "dummy"}" + "-DCMAKE_LIBRARY_ARCHITECTURE=${if stdenv.hostPlatform.isx86_64 then "x86_64" else "dummy"}" # ensure correct dirs in $dev/lib/pkgconfig/libfolly.pc # see https://github.com/NixOS/nixpkgs/issues/144170 "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_LIBDIR=lib" - ] ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13" ]; diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 83c5e3afc271..4f7f3c0fe1e9 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ expat - ] ++ lib.optional stdenv.isDarwin CoreFoundation; + ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreFoundation; propagatedBuildInputs = [ freetype diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix index ff0d95ba4451..669b66267f87 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix @@ -9,13 +9,13 @@ let fontconfig_ = fontconfig; in # nix user profile "~/.nix-profile/lib/X11/fonts" "~/.nix-profile/share/fonts" ] - ++ lib.optional stdenv.isDarwin "~/Library/Fonts" + ++ lib.optional stdenv.hostPlatform.isDarwin "~/Library/Fonts" ++ [ # FHS paths for non-NixOS platforms "/usr/share/fonts" "/usr/local/share/fonts" ] # darwin paths - ++ lib.optionals stdenv.isDarwin [ "/Library/Fonts" "/System/Library/Fonts" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "/Library/Fonts" "/System/Library/Fonts" ] # nix default profile ++ [ "/nix/var/nix/profiles/default/lib/X11/fonts" "/nix/var/nix/profiles/default/share/fonts" ] diff --git a/pkgs/development/libraries/forge/default.nix b/pkgs/development/libraries/forge/default.nix deleted file mode 100644 index 051038c74787..000000000000 --- a/pkgs/development/libraries/forge/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ boost -, cmake -, expat -, fetchFromGitHub -, fontconfig -, freeimage -, freetype -, glfw3 -, glm -, lib -, libGLU -, libGL -, mesa -, opencl-clhpp -, pkg-config -, stdenv -, SDL2 -}: - -stdenv.mkDerivation rec { - pname = "forge"; - version = "1.0.8"; - - src = fetchFromGitHub { - owner = "arrayfire"; - repo = pname; - rev = "v1.0.8"; - sha256 = "sha256-lSZAwcqAHiuZkpYcVfwvZCfNmEF3xGN9S/HuZQrGeKU="; - }; - glad = fetchFromGitHub { - owner = "arrayfire"; - repo = "glad"; - rev = "b94680aee5b8ce01ae1644c5f2661769366c765a"; - hash = "sha256-CrZy76gOGMpy9f1NuMK4tokZ57U//zYeNH5ZYY0SC2U="; - }; - - # This patch ensures that Forge does not try to fetch glad from GitHub and - # uses our sources that we've checked out via Nix. - patches = [ ./no-download-glad.patch ]; - - postPatch = '' - mkdir -p ./extern - cp -R --no-preserve=mode,ownership ${glad} ./extern/fg_glad-src - ln -s ${opencl-clhpp} ./extern/cl2hpp - ''; - - cmakeFlags = [ "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - boost.out - boost.dev - expat - fontconfig - freeimage - freetype - glfw3 - glm - libGL - libGLU - opencl-clhpp - SDL2 - mesa - ]; - - meta = with lib; { - description = "OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend"; - longDescription = '' - An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend. - The goal of Forge is to provide high performance OpenGL visualizations for C/C++ applications that use CUDA/OpenCL. - Forge uses OpenGL >=3.3 forward compatible contexts, so please make sure you have capable hardware before trying it out. - ''; - license = licenses.bsd3; - homepage = "https://arrayfire.com/"; - platforms = platforms.linux; - maintainers = with maintainers; [ chessai twesterhout ]; - }; -} diff --git a/pkgs/development/libraries/forge/no-download-glad.patch b/pkgs/development/libraries/forge/no-download-glad.patch deleted file mode 100644 index 0957be82a3b7..000000000000 --- a/pkgs/development/libraries/forge/no-download-glad.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeModules/ForgeConfigureDepsVars.cmake b/CMakeModules/ForgeConfigureDepsVars.cmake -index ee5c2fc..2f75181 100644 ---- a/CMakeModules/ForgeConfigureDepsVars.cmake -+++ b/CMakeModules/ForgeConfigureDepsVars.cmake -@@ -84,7 +84,7 @@ macro(fg_dep_check_and_populate dep_prefix) - URL ${fdcp_args_URI} - URL_HASH ${fdcp_args_REF} - DOWNLOAD_COMMAND \"\" -- UPDATE_DISCONNECTED ON -+ UPDATE_COMMAND \"\" - SOURCE_DIR "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src" - BINARY_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-build" - SUBBUILD_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild" -@@ -94,7 +94,7 @@ macro(fg_dep_check_and_populate dep_prefix) - QUIET - URL ${fdcp_args_URI} - DOWNLOAD_COMMAND \"\" -- UPDATE_DISCONNECTED ON -+ UPDATE_COMMAND \"\" - SOURCE_DIR "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src" - BINARY_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-build" - SUBBUILD_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild" -@@ -106,7 +106,7 @@ macro(fg_dep_check_and_populate dep_prefix) - GIT_REPOSITORY ${fdcp_args_URI} - GIT_TAG ${fdcp_args_REF} - DOWNLOAD_COMMAND \"\" -- UPDATE_DISCONNECTED ON -+ UPDATE_COMMAND \"\" - SOURCE_DIR "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src" - BINARY_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-build" - SUBBUILD_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild" diff --git a/pkgs/development/libraries/fortify-headers/default.nix b/pkgs/development/libraries/fortify-headers/default.nix deleted file mode 100644 index 1f418af7ae96..000000000000 --- a/pkgs/development/libraries/fortify-headers/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchurl -}: - -stdenv.mkDerivation { - pname = "fortify-headers"; - version = "1.1alpine3"; - - # upstream only accessible via git - unusable during bootstrap, hence - # extract from the alpine package - src = fetchurl { - url = "https://dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64/fortify-headers-1.1-r3.apk"; - name = "fortify-headers.tar.gz"; # ensure it's extracted as a .tar.gz - hash = "sha256-8A8JcKHIBgXpUuIP4zs3Q1yBs5jCGd5F3H2E8UN/S2g="; - }; - - patches = [ - ./wchar-imports-skip.patch - ./restore-macros.patch - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -r include/fortify $out/include - - runHook postInstall - ''; - - meta = { - description = "Standalone header-based fortify-source implementation"; - homepage = "https://git.2f30.org/fortify-headers"; - license = lib.licenses.bsd0; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ ris ]; - }; -} diff --git a/pkgs/development/libraries/fortify-headers/restore-macros.patch b/pkgs/development/libraries/fortify-headers/restore-macros.patch deleted file mode 100644 index f7d31a329e35..000000000000 --- a/pkgs/development/libraries/fortify-headers/restore-macros.patch +++ /dev/null @@ -1,283 +0,0 @@ -restore #undef'ed macro values after we're done - -some programs that define these miss them if removed - -push_macro and pop_macro pragmas allegedly well supported -by gcc, clang and msvc - ---- a/include/fortify/poll.h -+++ b/include/fortify/poll.h -@@ -29,6 +29,7 @@ __extension__ - extern "C" { - #endif - -+#pragma push_macro("poll") - #undef poll - - _FORTIFY_FN(poll) int poll(struct pollfd * _FORTIFY_POS0 __f, nfds_t __n, int __s) -@@ -40,6 +41,8 @@ _FORTIFY_FN(poll) int poll(struct pollfd * _FORTIFY_POS0 __f, nfds_t __n, int __ - return __orig_poll(__f, __n, __s); - } - -+#pragma pop_macro("poll") -+ - #ifdef __cplusplus - } - #endif ---- a/include/fortify/stdio.h -+++ b/include/fortify/stdio.h -@@ -29,12 +29,19 @@ __extension__ - extern "C" { - #endif - -+#pragma push_macro("fgets") - #undef fgets -+#pragma push_macro("fread") - #undef fread -+#pragma push_macro("fwrite") - #undef fwrite -+#pragma push_macro("vsprintf") - #undef vsprintf -+#pragma push_macro("vsnprintf") - #undef vsnprintf -+#pragma push_macro("snprintf") - #undef snprintf -+#pragma push_macro("sprintf") - #undef sprintf - - _FORTIFY_FN(fgets) char *fgets(char * _FORTIFY_POS0 __s, int __n, FILE *__f) -@@ -140,6 +147,14 @@ _FORTIFY_FN(sprintf) int sprintf(char *__s, const char *__f, ...) - #endif /* __has_builtin(__builtin_va_arg_pack) */ - #endif /* defined(__has_builtin) */ - -+#pragma pop_macro("fgets") -+#pragma pop_macro("fread") -+#pragma pop_macro("fwrite") -+#pragma pop_macro("vsprintf") -+#pragma pop_macro("vsnprintf") -+#pragma pop_macro("snprintf") -+#pragma pop_macro("sprintf") -+ - #ifdef __cplusplus - } - #endif ---- a/include/fortify/stdlib.h -+++ b/include/fortify/stdlib.h -@@ -38,7 +38,10 @@ extern "C" { - - /* FIXME clang */ - #if (defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)) && !defined(__clang__) -+ -+#pragma push_macro("realpath") - #undef realpath -+ - _FORTIFY_FN(realpath) char *realpath(const char *__p, char *__r) - { - #ifndef PATH_MAX -@@ -60,6 +63,9 @@ _FORTIFY_FN(realpath) char *realpath(const char *__p, char *__r) - return __orig_realpath(__p, __r); - #endif - } -+ -+#pragma pop_macro("realpath") -+ - #endif - - #ifdef __cplusplus ---- a/include/fortify/string.h -+++ b/include/fortify/string.h -@@ -29,12 +29,19 @@ __extension__ - extern "C" { - #endif - -+#pragma push_macro("memcpy") - #undef memcpy -+#pragma push_macro("memmove") - #undef memmove -+#pragma push_macro("memset") - #undef memset -+#pragma push_macro("strcat") - #undef strcat -+#pragma push_macro("strcpy") - #undef strcpy -+#pragma push_macro("strncat") - #undef strncat -+#pragma push_macro("strncpy") - #undef strncpy - - _FORTIFY_FN(memcpy) void *memcpy(void * _FORTIFY_POS0 __od, -@@ -183,6 +190,14 @@ _FORTIFY_FN(strlcpy) size_t strlcpy(char * _FORTIFY_POS0 __d, - } - #endif - -+#pragma pop_macro("memcpy") -+#pragma pop_macro("memmove") -+#pragma pop_macro("memset") -+#pragma pop_macro("strcat") -+#pragma pop_macro("strcpy") -+#pragma pop_macro("strncat") -+#pragma pop_macro("strncpy") -+ - #ifdef __cplusplus - } - #endif ---- a/include/fortify/strings.h -+++ b/include/fortify/strings.h -@@ -29,8 +29,12 @@ extern "C" { - #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_POSIX_SOURCE) \ - || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE+0 < 200809L) \ - || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE+0 < 700) -+ -+#pragma push_macro("bcopy") - #undef bcopy -+#pragma push_macro("bzero") - #undef bzero -+ - _FORTIFY_FN(bcopy) void bcopy(const void * _FORTIFY_POS0 __s, - void * _FORTIFY_POS0 __d, size_t __n) - { -@@ -52,6 +56,9 @@ _FORTIFY_FN(bzero) void bzero(void * _FORTIFY_POS0 __s, size_t __n) - } - #endif - -+#pragma pop_macro("bcopy") -+#pragma pop_macro("bzero") -+ - #ifdef __cplusplus - } - #endif ---- a/include/fortify/sys/socket.h -+++ b/include/fortify/sys/socket.h -@@ -29,9 +29,13 @@ __extension__ - extern "C" { - #endif - -+#pragma push_macro("recv") - #undef recv -+#pragma push_macro("recvfrom") - #undef recvfrom -+#pragma push_macro("send") - #undef send -+#pragma push_macro("sendto") - #undef sendto - - _FORTIFY_FN(recv) ssize_t recv(int __f, void * _FORTIFY_POS0 __s, size_t __n, -@@ -76,6 +80,11 @@ _FORTIFY_FN(sendto) ssize_t sendto(int __f, const void * _FORTIFY_POS0 __s, - return __orig_sendto(__f, __s, __n, __fl, __a, __l); - } - -+#pragma push_macro("recv") -+#pragma push_macro("recvfrom") -+#pragma push_macro("send") -+#pragma push_macro("sendto") -+ - #ifdef __cplusplus - } - #endif ---- a/include/fortify/unistd.h -+++ b/include/fortify/unistd.h -@@ -29,16 +29,27 @@ __extension__ - extern "C" { - #endif - -+#pragma push_macro("confstr") - #undef confstr -+#pragma push_macro("getcwd") - #undef getcwd -+#pragma push_macro("getgroups") - #undef getgroups -+#pragma push_macro("gethostname") - #undef gethostname -+#pragma push_macro("getlogin_r") - #undef getlogin_r -+#pragma push_macro("pread") - #undef pread -+#pragma push_macro("read") - #undef read -+#pragma push_macro("readlink") - #undef readlink -+#pragma push_macro("readlinkat") - #undef readlinkat -+#pragma push_macro("ttyname_r") - #undef ttyname_r -+#pragma push_macro("write") - #undef write - - _FORTIFY_FN(confstr) size_t confstr(int __n, char * _FORTIFY_POS0 __s, size_t __l) -@@ -158,6 +169,18 @@ _FORTIFY_FN(write) ssize_t write(int __f, const void * _FORTIFY_POS0 __s, - return __orig_write(__f, __s, __n); - } - -+#pragma pop_macro("confstr") -+#pragma pop_macro("getcwd") -+#pragma pop_macro("getgroups") -+#pragma pop_macro("gethostname") -+#pragma pop_macro("getlogin_r") -+#pragma pop_macro("pread") -+#pragma pop_macro("read") -+#pragma pop_macro("readlink") -+#pragma pop_macro("readlinkat") -+#pragma pop_macro("ttyname_r") -+#pragma pop_macro("write") -+ - #ifdef __cplusplus - } - #endif ---- a/include/fortify/wchar.h -+++ b/include/fortify/wchar.h -@@ -43,19 +43,33 @@ __extension__ - extern "C" { - #endif - -+#pragma push_macro("fgetws") - #undef fgetws -+#pragma push_macro("mbsrtowcs") - #undef mbsrtowcs -+#pragma push_macro("mbstowcs") - #undef mbstowcs -+#pragma push_macro("wcrtomb") - #undef wcrtomb -+#pragma push_macro("wcscat") - #undef wcscat -+#pragma push_macro("wcscpy") - #undef wcscpy -+#pragma push_macro("wcsncat") - #undef wcsncat -+#pragma push_macro("wcsncpy") - #undef wcsncpy -+#pragma push_macro("wcsrtombs") - #undef wcsrtombs -+#pragma push_macro("wcstombs") - #undef wcstombs -+#pragma push_macro("wctomb") - #undef wctomb -+#pragma push_macro("wmemcpy") - #undef wmemcpy -+#pragma push_macro("wmemmove") - #undef wmemmove -+#pragma push_macro("wmemset") - #undef wmemset - - _FORTIFY_FN(fgetws) wchar_t *fgetws(wchar_t * _FORTIFY_POS0 __s, -@@ -269,6 +283,21 @@ _FORTIFY_FN(wmemset) wchar_t *wmemset(wchar_t * _FORTIFY_POS0 __s, - return __orig_wmemset(__s, __c, __n); - } - -+#pragma pop_macro("fgetws") -+#pragma pop_macro("mbsrtowcs") -+#pragma pop_macro("mbstowcs") -+#pragma pop_macro("wcrtomb") -+#pragma pop_macro("wcscat") -+#pragma pop_macro("wcscpy") -+#pragma pop_macro("wcsncat") -+#pragma pop_macro("wcsncpy") -+#pragma pop_macro("wcsrtombs") -+#pragma pop_macro("wcstombs") -+#pragma pop_macro("wctomb") -+#pragma pop_macro("wmemcpy") -+#pragma pop_macro("wmemmove") -+#pragma pop_macro("wmemset") -+ - #ifdef __cplusplus - } - #endif diff --git a/pkgs/development/libraries/fortify-headers/wchar-imports-skip.patch b/pkgs/development/libraries/fortify-headers/wchar-imports-skip.patch deleted file mode 100644 index 255ceba9f099..000000000000 --- a/pkgs/development/libraries/fortify-headers/wchar-imports-skip.patch +++ /dev/null @@ -1,41 +0,0 @@ -wchar.h: only include other headers if _FORTIFY_SOURCE is enabled - -unexpectedly including other headers can cause problems with -sensitive/brittle code, particularly with alternative compilers -(clang) which are already operating on the margins of what's -supported/expected by some projects. - -having a way to almost entirely short-circuit these headers (by -disabling _FORTIFY_SOURCE) is therefore important. - ---- a/include/fortify/wchar.h -+++ b/include/fortify/wchar.h -@@ -20,21 +20,23 @@ - #if !defined(__cplusplus) && !defined(__clang__) - __extension__ - #endif --#include_next <limits.h> -+#include_next <wchar.h> -+ -+#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 -+ - #if !defined(__cplusplus) && !defined(__clang__) - __extension__ - #endif --#include_next <stdlib.h> -+#include_next <limits.h> - #if !defined(__cplusplus) && !defined(__clang__) - __extension__ - #endif --#include_next <string.h> -+#include_next <stdlib.h> - #if !defined(__cplusplus) && !defined(__clang__) - __extension__ - #endif --#include_next <wchar.h> -+#include_next <string.h> - --#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 - #include "fortify-headers.h" - - #ifdef __cplusplus diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 4ceb6261231e..e10d01d2c842 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr libXext libXft libGLU libGL libXfixes xinput - ] ++ lib.optional stdenv.isDarwin CoreServices; + ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices; doCheck = true; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; branch = "1.6"; description = "C++ based class library for building Graphical User Interfaces"; longDescription = '' diff --git a/pkgs/development/libraries/fpattern/default.nix b/pkgs/development/libraries/fpattern/default.nix deleted file mode 100644 index e1b75f025c89..000000000000 --- a/pkgs/development/libraries/fpattern/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, lib, fetchFromGitHub }: - -stdenv.mkDerivation (finalAttrs: { - version = "1.9"; - pname = "fpattern"; - - src = fetchFromGitHub { - owner = "Loadmaster"; - repo = "fpattern"; - rev = "v${finalAttrs.version}"; - hash = "sha256-/QvMQCmoocaXfDm3/c3IAPyfZqR6d7IiJ9UoFKZTpVI="; - }; - - installPhase = '' - runHook preInstall - mkdir -p $out/include - cp *.c *.h $out/include - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/Loadmaster/fpattern"; - description = "Filename pattern matching library functions for DOS, Windows, and Unix"; - license = licenses.mit; - maintainers = with maintainers; [ hughobrien ]; - platforms = with platforms; linux; - }; -}) diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix deleted file mode 100644 index e56ce1e68416..000000000000 --- a/pkgs/development/libraries/frame/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ enableX11 ? true -, lib, stdenv, fetchurl, pkg-config, xorg }: - -stdenv.mkDerivation rec { - pname = "frame"; - version = "2.5.0"; - src = fetchurl { - url = "https://launchpad.net/frame/trunk/v${version}/+download/${pname}-${version}.tar.xz"; - sha256 = "bc2a20cd3ac1e61fe0461bd3ee8cb250dbcc1fa511fad0686d267744e9c78f3a"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - stdenv - ] ++ lib.optionals enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi]; - - configureFlags = lib.optional enableX11 "--with-x11"; - - meta = { - homepage = "https://launchpad.net/frame"; - description = "Handles the buildup and synchronization of a set of simultaneous touches"; - mainProgram = "frame-test-x11"; - license = lib.licenses.gpl3; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/development/libraries/freealut/default.nix deleted file mode 100644 index dbae2b20b61c..000000000000 --- a/pkgs/development/libraries/freealut/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, darwin, fetchurl, openal -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "freealut"; - version = "1.1.0"; - - src = fetchurl { - url = "http://www.openal.org/openal_webstf/downloads/freealut-${finalAttrs.version}.tar.gz"; - sha256 = "0kzlil6112x2429nw6mycmif8y6bxr2cwjcvp18vh6s7g63ymlb0"; - }; - - buildInputs = [ openal - ] ++ lib.optional stdenv.isDarwin - darwin.apple_sdk.frameworks.OpenAL - ; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = { - homepage = "http://openal.org/"; - description = "Free implementation of OpenAL's ALUT standard"; - mainProgram = "freealut-config"; - license = lib.licenses.lgpl2; - pkgConfigModules = [ "freealut" ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix deleted file mode 100644 index c3a0fdb797f6..000000000000 --- a/pkgs/development/libraries/freeglut/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchurl, libICE, libXext, libXi, libXrandr, libXxf86vm, libGLX, libGLU, cmake -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "freeglut"; - version = "3.6.0"; - - src = fetchurl { - url = "mirror://sourceforge/freeglut/freeglut-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-nD1NZRb7+gKA7ck8d2mPtzA+RDwaqvN9Jp4yiKbD6lI="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libICE libXext libXi libXrandr libXxf86vm libGLU ]; - - cmakeFlags = lib.optionals stdenv.isDarwin [ - "-DOPENGL_INCLUDE_DIR=${libGLX.dev}/include" - "-DOPENGL_gl_LIBRARY:FILEPATH=${libGLX}/lib/libGL.dylib" - "-DOPENGL_glu_LIBRARY:FILEPATH=${libGLU}/lib/libGLU.dylib" - "-DFREEGLUT_BUILD_DEMOS:BOOL=OFF" - "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" - ]; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = with lib; { - description = "Create and manage windows containing OpenGL contexts"; - longDescription = '' - FreeGLUT is an open source alternative to the OpenGL Utility Toolkit - (GLUT) library. GLUT (and hence FreeGLUT) allows the user to create and - manage windows containing OpenGL contexts on a wide range of platforms - and also read the mouse, keyboard and joystick functions. FreeGLUT is - intended to be a full replacement for GLUT, and has only a few - differences. - ''; - homepage = "https://freeglut.sourceforge.net/"; - license = licenses.mit; - pkgConfigModules = [ "glut" ]; - platforms = platforms.all; - maintainers = [ maintainers.bjornfor ]; - }; -}) diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 20ced14ace6e..dd63935b23fd 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -30,22 +30,22 @@ stdenv.mkDerivation (finalAttrs: { --replace "pkg-config" "$PKG_CONFIG" substituteInPlace Makefile.gnu \ --replace "pkg-config" "$PKG_CONFIG" - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' # Upstream Makefile hardcodes i386 and x86_64 architectures only substituteInPlace Makefile.osx --replace "x86_64" "arm64" ''; nativeBuildInputs = [ pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools fixDarwinDylibNames - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; buildInputs = [ libtiff libtiff.dev_private libpng zlib libwebp libraw openexr openjpeg libjpeg libjpeg.dev_private jxrlib ]; - postBuild = lib.optionalString (!stdenv.isDarwin) '' + postBuild = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' make -f Makefile.fip ''; @@ -56,13 +56,13 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $INCDIR $INSTALLDIR '' # Workaround for Makefiles.osx not using ?= - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' makeFlagsArray+=( "INCDIR=$INCDIR" "INSTALLDIR=$INSTALLDIR" ) ''; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' make -f Makefile.fip install - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/lib/libfreeimage.3.dylib $out/lib/libfreeimage.dylib ''; diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index 4be38fbef062..f58785c1e1bd 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libusb1 libglut libGLU libGL libXi libXmu ] - ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ GLUT Cocoa ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix deleted file mode 100644 index fa86bc4a18c9..000000000000 --- a/pkgs/development/libraries/freetds/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config -, openssl -, odbcSupport ? true, unixODBC ? null }: - -assert odbcSupport -> unixODBC != null; - -# Work is in progress to move to cmake so revisit that later - -stdenv.mkDerivation rec { - pname = "freetds"; - version = "1.4.22"; - - src = fetchurl { - url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - hash = "sha256-qafyTwp6hxYX526MxuZVaueIBC8cAGGVZlUFSZsjNLE="; - }; - - buildInputs = [ - openssl - ] ++ lib.optional odbcSupport unixODBC; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - meta = with lib; { - description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; - homepage = "https://www.freetds.org"; - changelog = "https://github.com/FreeTDS/freetds/releases/tag/v${version}"; - license = licenses.lgpl2; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/freetts/default.nix b/pkgs/development/libraries/freetts/default.nix deleted file mode 100644 index 8f6fbad6d4d6..000000000000 --- a/pkgs/development/libraries/freetts/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, fetchzip -, ant -, jdk8 -, sharutils -, stripJavaArchivesHook -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "freetts"; - version = "1.2.2"; - - src = fetchzip { - url = "mirror://sourceforge/freetts/freetts-${finalAttrs.version}-src.zip"; - hash = "sha256-+bhM0ErEZVnmcz5CBqn/AeGaOhKnCjZzGeqgO/89wms="; - stripRoot = false; - }; - - nativeBuildInputs = [ - ant - jdk8 - sharutils - stripJavaArchivesHook - ]; - - sourceRoot = "${finalAttrs.src.name}/freetts-${finalAttrs.version}"; - - buildPhase = '' - runHook preBuild - - pushd lib - sed -i -e "s/more/cat/" jsapi.sh - echo y | sh jsapi.sh - popd - - ln -s . src - ant - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -Dm644 lib/*.jar -t $out/lib - runHook postInstall - ''; - - meta = { - description = "Text to speech system based on Festival written in Java"; - longDescription = '' - Text to speech system based on Festival written in Java. - Can be used in combination with KDE accessibility. - ''; - homepage = "http://freetts.sourceforge.net"; - license = lib.licenses.bsdOriginal; - maintainers = with lib.maintainers; [ sander ]; - sourceProvenance = with lib.sourceTypes; [ - fromSource - binaryBytecode # jsapi.jar is bundled in a self-extracting shell-script - ]; - }; -}) diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix deleted file mode 100644 index 8ff0005d0ff0..000000000000 --- a/pkgs/development/libraries/freetype/default.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ lib -, stdenv -, fetchurl -, buildPackages -, pkgsHostHost -, pkg-config -, which -, makeWrapper -, zlib -, bzip2 -, brotli -, libpng -, gnumake -, glib - -, # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering). - # LCD filtering is also known as ClearType and covered by several Microsoft patents. - # This option allows it to be disabled. See http://www.freetype.org/patents.html. - useEncumberedCode ? true - - # for passthru.tests -, cairo -, fontforge -, ghostscript -, graphicsmagick -, gtk3 -, harfbuzz -, imagemagick -, pango -, poppler -, python3 -, qt5 -, texmacs -, ttfautohint -, testers -}: - - -stdenv.mkDerivation (finalAttrs: { - pname = "freetype"; - version = "2.13.2"; - - src = let inherit (finalAttrs) pname version; in fetchurl { - url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-EpkcTlXFBt1/m3ZZM+Yv0r4uBtQhUF15UKEy5PG7SE0="; - }; - - propagatedBuildInputs = [ zlib bzip2 brotli libpng ]; # needed when linking against freetype - - # dependence on harfbuzz is looser than the reverse dependence - nativeBuildInputs = [ pkg-config which ] - ++ lib.optional (!stdenv.hostPlatform.isWindows) makeWrapper - # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. - ++ lib.optional (!stdenv.isLinux) gnumake; - - patches = [ - ./enable-table-validation.patch - ] ++ lib.optional useEncumberedCode ./enable-subpixel-rendering.patch; - - outputs = [ "out" "dev" ]; - - configureFlags = [ "--bindir=$(dev)/bin" "--enable-freetype-config" ]; - - # native compiler to generate building tool - CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc"; - - # The asm for armel is written with the 'asm' keyword. - CFLAGS = lib.optionalString stdenv.isAarch32 "-std=gnu99" - + lib.optionalString stdenv.hostPlatform.is32bit " -D_FILE_OFFSET_BITS=64"; - - enableParallelBuilding = true; - - doCheck = true; - - postInstall = glib.flattenInclude - # pkgsCross.mingwW64.pkg-config doesn't build - # makeWrapper doesn't cross-compile to windows #120726 - + '' - substituteInPlace $dev/bin/freetype-config \ - --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config} - '' + lib.optionalString (!stdenv.hostPlatform.isMinGW) '' - - wrapProgram "$dev/bin/freetype-config" \ - --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" - ''; - - passthru.tests = { - inherit - cairo - fontforge - ghostscript - graphicsmagick - gtk3 - harfbuzz - imagemagick - pango - poppler - texmacs - ttfautohint; - inherit (python3.pkgs) freetype-py; - inherit (qt5) qtbase; - pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - }; - - meta = with lib; { - description = "Font rendering engine"; - mainProgram = "freetype-config"; - longDescription = '' - FreeType is a portable and efficient library for rendering fonts. It - supports TrueType, Type 1, CFF fonts, and WOFF, PCF, FNT, BDF and PFR - fonts. It has a bytecode interpreter and has an automatic hinter called - autofit which can be used instead of hinting instructions included in - fonts. - ''; - homepage = "https://www.freetype.org/"; - changelog = "https://gitlab.freedesktop.org/freetype/freetype/-/raw/VER-${builtins.replaceStrings ["."] ["-"] finalAttrs.version}/docs/CHANGES"; - license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) - platforms = platforms.all; - pkgConfigModules = [ "freetype2" ]; - maintainers = with maintainers; [ ttuegel ]; - }; -}) diff --git a/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch b/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch deleted file mode 100644 index 6b3577eb4f02..000000000000 --- a/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: freetype-2.10.0/include/freetype/config/ftoption.h ---- a/include/freetype/config/ftoption.h -+++ b/include/freetype/config/ftoption.h -@@ -126,7 +126,7 @@ FT_BEGIN_HEADER - * macro is not defined, FreeType offers alternative LCD rendering - * technology that produces excellent output without LCD filtering. - */ --/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ -+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING - - - /************************************************************************** diff --git a/pkgs/development/libraries/freetype/enable-table-validation.patch b/pkgs/development/libraries/freetype/enable-table-validation.patch deleted file mode 100644 index bd964c3342d8..000000000000 --- a/pkgs/development/libraries/freetype/enable-table-validation.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: freetype-2.10.0/modules.cfg -=================================================================== ---- freetype-2.10.0.orig/modules.cfg -+++ freetype-2.10.0/modules.cfg -@@ -120,6 +120,6 @@ AUX_MODULES += cache - # TrueType GX/AAT table validation. Needs ftgxval.c below. - # --# AUX_MODULES += gxvalid -+AUX_MODULES += gxvalid - - # Support for streams compressed with gzip (files with suffix .gz). - # -@@ -143,6 +143,6 @@ AUX_MODULES += bzip2 - # OpenType table validation. Needs ftotval.c below. - # --# AUX_MODULES += otvalid -+AUX_MODULES += otvalid - - # Auxiliary PostScript driver component to share common code. - # diff --git a/pkgs/development/libraries/freexl/default.nix b/pkgs/development/libraries/freexl/default.nix deleted file mode 100644 index 74d4a646b074..000000000000 --- a/pkgs/development/libraries/freexl/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, stdenv -, fetchurl -, validatePkgConfig -, expat -, minizip -, zlib -, libiconv -}: - -stdenv.mkDerivation rec { - pname = "freexl"; - version = "2.0.0"; - - src = fetchurl { - url = "https://www.gaia-gis.it/gaia-sins/freexl-${version}.tar.gz"; - hash = "sha256-F2cF8d5Yq3we679cbeRqt2/Ni4VlCNvSj1ZI98bhp/A="; - }; - - nativeBuildInputs = [ validatePkgConfig ]; - - buildInputs = [ - expat - minizip - zlib - ] ++ lib.optional stdenv.isDarwin libiconv; - - enableParallelBuilding = true; - - doCheck = true; - - meta = with lib; { - description = "Library to extract valid data from within an Excel (.xls) spreadsheet"; - homepage = "https://www.gaia-gis.it/fossil/freexl"; - # They allow any of these - license = with licenses; [ gpl2Plus lgpl21Plus mpl11 ]; - platforms = platforms.unix; - maintainers = with maintainers; [ sikmir ]; - }; -} diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix deleted file mode 100644 index d05d8ddd5f4a..000000000000 --- a/pkgs/development/libraries/frei0r/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, config -, stdenv -, fetchFromGitHub -, cairo -, cmake -, opencv -, pcre -, pkg-config -, cudaSupport ? config.cudaSupport -, cudaPackages -}: - -stdenv.mkDerivation rec { - pname = "frei0r-plugins"; - version = "2.3.3"; - - src = fetchFromGitHub { - owner = "dyne"; - repo = "frei0r"; - rev = "v${version}"; - hash = "sha256-uKYCJD88TnrJTTnzCCietNt01QPeFW+hhnjcBNKUWsY="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ - cairo - opencv - pcre - ] ++ lib.optionals cudaSupport [ - cudaPackages.cuda_cudart - cudaPackages.cuda_nvcc - ]; - - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - for f in $out/lib/frei0r-1/*.so* ; do - ln -s $f "''${f%.*}.dylib" - done - ''; - - meta = with lib; { - homepage = "https://frei0r.dyne.org"; - description = "Minimalist, cross-platform, shared video plugins"; - license = licenses.gpl2Plus; - maintainers = [ ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix deleted file mode 100644 index f5d6bcc7df34..000000000000 --- a/pkgs/development/libraries/fribidi/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv -, buildPackages -, fetchurl -, meson -, ninja -, pkg-config -, fixDarwinDylibNames -, python3 -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "fribidi"; - version = "1.0.15"; - - outputs = [ "out" "dev" "devdoc" ]; - - # NOTE: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application. - src = fetchurl { - url = with finalAttrs; "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-C7x/9jO/ogiuMtfjac9afSDV0lV6CwZ8mqmLy/mWdYc="; - }; - - postPatch = '' - patchShebangs test - ''; - - nativeBuildInputs = [ meson ninja pkg-config ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - doCheck = true; - nativeCheckInputs = [ python3 ]; - - passthru.tests = { - pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - }; - }; - - meta = with lib; { - homepage = "https://github.com/fribidi/fribidi"; - description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)"; - mainProgram = "fribidi"; - license = licenses.lgpl21; - platforms = platforms.unix; - pkgConfigModules = [ "fribidi" ]; - }; -}) diff --git a/pkgs/development/libraries/frozen/default.nix b/pkgs/development/libraries/frozen/default.nix deleted file mode 100644 index 26c47617c1f6..000000000000 --- a/pkgs/development/libraries/frozen/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -}: - -stdenv.mkDerivation rec { - pname = "frozen"; - # pin to a newer release if frozen releases again, see cesanta/frozen#72 - version = "unstable-2021-02-23"; - - src = fetchFromGitHub { - owner = "cesanta"; - repo = "frozen"; - rev = "21f051e3abc2240d9a25b2add6629b38e963e102"; - hash = "sha256-BpuYK9fbWSpeF8iPT8ImrV3CKKaA5RQ2W0ZQ03TciR0="; - }; - - nativeBuildInputs = [ meson ninja ]; - - # frozen has a simple Makefile and a GN BUILD file as building scripts. - # Since it has only two source files, the best course of action to support - # cross compilation is to create a small meson.build file. - # Relevant upstream issue: https://github.com/cesanta/frozen/pull/71 - # We also remove the GN BUILD file to prevent conflicts on case-insesitive - # file systems. - preConfigure = '' - rm BUILD - cp ${./meson.build} meson.build - ''; - - meta = { - homepage = "https://github.com/cesanta/frozen"; - description = "Minimal JSON parser for C, targeted for embedded systems"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ thillux ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/frozen/meson.build b/pkgs/development/libraries/frozen/meson.build deleted file mode 100644 index 1db9546491ce..000000000000 --- a/pkgs/development/libraries/frozen/meson.build +++ /dev/null @@ -1,19 +0,0 @@ -project( - 'frozen', - 'c', - default_options: [ - 'c_args=-Wextra -fno-builtin -pedantic', - 'c_std=c99', - 'werror=true' - ], - license: 'Apache-2.0', - version: '20210223' -) - -library( - 'frozen', - 'frozen.c', - install: true -) - -install_headers('frozen.h') diff --git a/pkgs/development/libraries/frugally-deep/default.nix b/pkgs/development/libraries/frugally-deep/default.nix deleted file mode 100644 index f275ec5f02ba..000000000000 --- a/pkgs/development/libraries/frugally-deep/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, gitUpdater -, cmake -, functionalplus -, eigen -, nlohmann_json -, doctest -, python3Packages -, buildTests ? false # Needs tensorflow -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "frugally-deep"; - version = "0.15.24-p0"; - - src = fetchFromGitHub { - owner = "Dobiasd"; - repo = "frugally-deep"; - rev = "v${finalAttrs.version}"; - hash = "sha256-yg2SMsYOOSOgsdwIH1bU3iPM45z6c7WeIrgOddt3um4="; - }; - - nativeBuildInputs = [ - cmake - ] ++ lib.optionals buildTests [ - python3Packages.python - python3Packages.numpy - ]; - - buildInputs = lib.optionals buildTests [ - doctest - python3Packages.tensorflow - ]; - - propagatedBuildInputs = [ - functionalplus - eigen - nlohmann_json - ]; - - cmakeFlags = lib.optionals buildTests [ "-DFDEEP_BUILD_UNITTEST=ON" ]; - passthru.updateScript = gitUpdater; - - meta = with lib; { - description = "Header-only library for using Keras (TensorFlow) models in C++"; - homepage = "https://github.com/Dobiasd/frugally-deep"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/development/libraries/fstrcmp/cross.patch b/pkgs/development/libraries/fstrcmp/cross.patch deleted file mode 100644 index f794e3b91da6..000000000000 --- a/pkgs/development/libraries/fstrcmp/cross.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff '--color=auto' -ur fstrcmp-0.7-D001-old/configure.ac fstrcmp-0.7.D001/configure.ac ---- fstrcmp-0.7-D001-old/configure.ac 2014-03-04 19:13:45.000000000 -0500 -+++ fstrcmp-0.7.D001/configure.ac 2020-04-02 13:57:52.805154634 -0400 -@@ -32,6 +32,8 @@ - AC_OBJEXT - AC_EXEEXT - -+LT_INIT -+ - dnl @synopsis AC_ADD_CFLAGS - dnl - dnl Add the given option to CFLAGS, if it doesn't break the compiler -diff '--color=auto' -ur fstrcmp-0.7-D001-old/Makefile.in fstrcmp-0.7.D001/Makefile.in ---- fstrcmp-0.7-D001-old/Makefile.in 2014-03-04 19:13:45.000000000 -0500 -+++ fstrcmp-0.7.D001/Makefile.in 2020-04-02 13:57:12.355269595 -0400 -@@ -37,6 +37,8 @@ - srcdir = @srcdir@ - VPATH = @srcdir@ - -+top_builddir = $(srcdir) -+ - # - # the name of the install program to use - # diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/development/libraries/fstrcmp/default.nix deleted file mode 100644 index ab7f410eddf2..000000000000 --- a/pkgs/development/libraries/fstrcmp/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchzip, libtool, ghostscript, groff, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "fstrcmp"; - version = "0.7"; - - src = fetchzip { - url = "https://sourceforge.net/projects/fstrcmp/files/fstrcmp/${version}/fstrcmp-${version}.D001.tar.gz"; - sha256 = "0yg3y3k0wz50gmhgigfi2dx725w1gc8snb95ih7vpcnj6kabgz9a"; - }; - - patches = [ ./cross.patch ]; - - outputs = [ "out" "dev" "doc" "man" "devman" ]; - - nativeBuildInputs = [ libtool ghostscript groff autoreconfHook ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Make fuzzy comparisons of strings and byte arrays"; - mainProgram = "fstrcmp"; - longDescription = '' - The fstrcmp project provides a library that is used to make fuzzy - comparisons of strings and byte arrays, including multi-byte character - strings. - ''; - homepage = "https://fstrcmp.sourceforge.net/"; - downloadPage = "https://sourceforge.net/projects/fstrcmp/"; - license = licenses.gpl3; - maintainers = [ maintainers.sephalon ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix deleted file mode 100644 index 15daa7e5a959..000000000000 --- a/pkgs/development/libraries/fstrm/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libevent, openssl }: - -stdenv.mkDerivation rec { - pname = "fstrm"; - version = "0.6.1"; - - src = fetchFromGitHub { - owner = "farsightsec"; - repo = "fstrm"; - rev = "v${version}"; - sha256 = "sha256-/WFP2g3Vuf/qaY8pprY8XFAlpEE+0SJUlFNWfa+7ZlE="; - }; - - outputs = [ "bin" "out" "dev" ]; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libevent openssl ]; - - preBuild = '' - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -L${openssl}/lib" - ''; - - doCheck = true; - - meta = with lib; { - description = "Frame Streams implementation in C"; - homepage = "https://github.com/farsightsec/fstrm"; - license = licenses.asl20; - platforms = platforms.unix; - }; -} - diff --git a/pkgs/development/libraries/ftxui/default.nix b/pkgs/development/libraries/ftxui/default.nix deleted file mode 100644 index a911e5ba3736..000000000000 --- a/pkgs/development/libraries/ftxui/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, doxygen -, gbenchmark -, graphviz -, gtest -}: - -stdenv.mkDerivation rec { - pname = "ftxui"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "ArthurSonzogni"; - repo = "ftxui"; - rev = "v${version}"; - sha256 = "sha256-IF6G4wwQDksjK8nJxxAnxuCw2z2qvggCmRJ2rbg00+E="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - doxygen - graphviz - ]; - - checkInputs = [ - gtest - gbenchmark - ]; - - cmakeFlags = [ - "-DFTXUI_BUILD_EXAMPLES=OFF" - "-DFTXUI_BUILD_DOCS=ON" - "-DFTXUI_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" - ]; - - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - - meta = with lib; { - homepage = "https://github.com/ArthurSonzogni/FTXUI"; - changelog = "https://github.com/ArthurSonzogni/FTXUI/blob/v${version}/CHANGELOG.md"; - description = "Functional Terminal User Interface library for C++"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix deleted file mode 100644 index 1ee66e008fef..000000000000 --- a/pkgs/development/libraries/funambol/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }: - -stdenv.mkDerivation rec { - pname = "funambol-client-cpp"; - version = "9.0.0"; - - src = fetchurl { - url = "mirror://sourceforge/funambol/funambol-client-sdk-${version}.zip"; - sha256 = "1667gahz30i5r8kbv7w415z0hbgm6f6pln1137l5skapi1if6r73"; - }; - - postUnpack = ''sourceRoot+="/sdk/cpp/build/autotools"''; - - propagatedBuildInputs = [ zlib curl ]; - - nativeBuildInputs = [ autoreconfHook unzip ]; - - meta = with lib; { - description = "SyncML client sdk by Funambol project"; - homepage = "https://www.funambol.com"; - license = licenses.agpl3Only; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/functionalplus/default.nix b/pkgs/development/libraries/functionalplus/default.nix deleted file mode 100644 index e07fa8fec5f2..000000000000 --- a/pkgs/development/libraries/functionalplus/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "functionalplus"; - version = "0.2.25"; - - src = fetchFromGitHub { - owner = "Dobiasd"; - repo = "FunctionalPlus"; - rev = "v${version}"; - sha256 = "sha256-eKCOi5g8YdKgxaI/mLlqB2m1zwrU9DOSrQF+PW2DBBQ="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Functional Programming Library for C++"; - homepage = "https://github.com/Dobiasd/FunctionalPlus"; - license = licenses.boost; - platforms = platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/fuzzylite/default.nix b/pkgs/development/libraries/fuzzylite/default.nix deleted file mode 100644 index 82f11abe88e6..000000000000 --- a/pkgs/development/libraries/fuzzylite/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, ninja -, useFloat ? false -}: - -stdenv.mkDerivation rec { - pname = "fuzzylite"; - version = "6.0"; - - src = fetchFromGitHub { - owner = "fuzzylite"; - repo = "fuzzylite"; - rev = "v${version}"; - hash = "sha256-i1txeUE/ZSRggwLDtpS8dd4uuZfHX9w3zRH0gBgGXnk="; - }; - sourceRoot = "${src.name}/fuzzylite"; - - outputs = [ "out" "dev" ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "-Werror" "-Wno-error" - ''; - - nativeBuildInputs = [ - cmake - ninja - ]; - - cmakeFlags = [ - "-DFL_BUILD_TESTS:BOOL=OFF" - "-DFL_USE_FLOAT:BOOL=${if useFloat then "ON" else "OFF"}" - ]; - - meta = with lib; { - description = "Fuzzy logic control library in C++"; - mainProgram = "fuzzylite"; - homepage = "https://fuzzylite.com"; - changelog = "https://github.com/fuzzylite/fuzzylite/${src.rev}/release/CHANGELOG"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ azahi ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix index 7ff0c207060c..6f6560ea9f3f 100644 --- a/pkgs/development/libraries/g2o/default.nix +++ b/pkgs/development/libraries/g2o/default.nix @@ -28,7 +28,7 @@ mkDerivation rec { # Detection script is broken "-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer" "-DG2O_BUILD_EXAMPLES=OFF" - ] ++ lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ "-DDO_SSE_AUTODETECT=OFF" "-DDISABLE_SSE3=${ if stdenv.hostPlatform.sse3Support then "OFF" else "ON"}" "-DDISABLE_SSE4_1=${if stdenv.hostPlatform.sse4_1Support then "OFF" else "ON"}" @@ -43,6 +43,6 @@ mkDerivation rec { maintainers = with maintainers; [ lopsided98 ]; platforms = platforms.all; # fatal error: 'qglviewer.h' file not found - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/galario/default.nix b/pkgs/development/libraries/galario/default.nix deleted file mode 100644 index 8b54cfb7b879..000000000000 --- a/pkgs/development/libraries/galario/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ lib, stdenv -, fetchzip -, fetchFromGitHub -, cmake -, fftw -, fftwFloat -, enablePython ? false -, pythonPackages ? null -, llvmPackages -}: -let - # CMake recipes are needed to build galario - # Build process would usually download them - great-cmake-cookoff = fetchzip { - url = "https://github.com/UCL/GreatCMakeCookOff/archive/v2.1.9.tar.gz"; - sha256 = "1yd53b5gx38g6f44jmjk4lc4igs3p25z6616hfb7aq79ly01q0w2"; - }; -in -stdenv.mkDerivation rec { - pname = "galario"; - version = "1.2.2"; - - src = fetchFromGitHub { - owner = "mtazzari"; - repo = pname; - rev = "v${version}"; - sha256 = "0dw88ga50x3jwyfgcarn4azlhiarggvdg262hilm7rbrvlpyvha0"; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ fftw fftwFloat ] - ++ lib.optional enablePython pythonPackages.python - ++ lib.optional stdenv.isDarwin llvmPackages.openmp - ; - - propagatedBuildInputs = lib.optionals enablePython [ - pythonPackages.numpy - pythonPackages.cython - pythonPackages.pytest - ]; - - nativeCheckInputs = lib.optionals enablePython [ pythonPackages.scipy pythonPackages.pytest-cov ]; - - preConfigure = '' - mkdir -p build/external/src - cp -r ${great-cmake-cookoff} build/external/src/GreatCMakeCookOff - chmod -R 777 build/external/src/GreatCMakeCookOff - ''; - - preCheck = '' - ${if stdenv.isDarwin then "export DYLD_LIBRARY_PATH=$(pwd)/src/" else "export LD_LIBRARY_PATH=$(pwd)/src/"} - ${lib.optionalString enablePython "sed -i -e 's|^#!.*|#!${stdenv.shell}|' python/py.test.sh"} - ''; - - cmakeFlags = lib.optionals enablePython [ - # RPATH of binary /nix/store/.../lib/python3.10/site-packages/galario/double/libcommon.so contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ]; - - doCheck = true; - - postInstall = lib.optionalString (stdenv.isDarwin && enablePython) '' - install_name_tool -change libgalario.dylib $out/lib/libgalario.dylib $out/lib/python*/site-packages/galario/double/libcommon.so - install_name_tool -change libgalario_single.dylib $out/lib/libgalario_single.dylib $out/lib/python*/site-packages/galario/single/libcommon.so - ''; - - meta = with lib; { - description = "GPU Accelerated Library for Analysing Radio Interferometer Observations"; - longDescription = '' - Galario is a library that exploits the computing power of modern - graphic cards (GPUs) to accelerate the comparison of model - predictions to radio interferometer observations. Namely, it - speeds up the computation of the synthetic visibilities given a - model image (or an axisymmetric brightness profile) and their - comparison to the observations. - ''; - homepage = "https://mtazzari.github.io/galario/"; - license = licenses.lgpl3; - maintainers = [ maintainers.smaret ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix deleted file mode 100644 index 4c477421a7fd..000000000000 --- a/pkgs/development/libraries/ganv/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - graphviz, - gtk2, - gtkmm2, - meson, - ninja, - cmake, - pkg-config, -}: - -stdenv.mkDerivation { - pname = "ganv"; - version = "1.8.2-unstable-2024-07-04"; - - src = fetchFromGitLab { - owner = "drobilla"; - repo = "ganv"; - rev = "4d2e04dbcabd0b5d715ea7eeeb909f4088055763"; - hash = "sha256-DzODtYI8uwP65ck8Q90QEnjQbvPobepeQVgNZZjF+jk="; - }; - - nativeBuildInputs = [ - pkg-config - meson - ninja - cmake - ]; - - buildInputs = [ - gtk2 - gtkmm2 - graphviz - ]; - - strictDeps = true; - - # 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 = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ t4ccer ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/garmintools/default.nix b/pkgs/development/libraries/garmintools/default.nix deleted file mode 100644 index e183a24c8128..000000000000 --- a/pkgs/development/libraries/garmintools/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, stdenv, fetchurl, libusb-compat-0_1 }: -stdenv.mkDerivation rec { - pname = "garmintools"; - version = "0.10"; - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/garmintools/${pname}-${version}.tar.gz"; - sha256 = "1vjc8h0z4kx2h52yc3chxn3wh1krn234fg12sggbia9zjrzhpmgz"; - }; - buildInputs = [ libusb-compat-0_1 ]; - meta = { - description = "Provides the ability to communicate with the Garmin Forerunner 305 via the USB interface"; - homepage = "https://code.google.com/archive/p/garmintools/"; # community clone at https://github.com/ianmartin/garmintools - license = lib.licenses.gpl2; - maintainers = [ ]; - platforms = lib.platforms.unix; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; - }; -} diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix deleted file mode 100644 index bf60ec5e4297..000000000000 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gtest -, prometheus-cpp -}: - -stdenv.mkDerivation rec { - pname = "gbenchmark"; - version = "1.8.5"; - - src = fetchFromGitHub { - owner = "google"; - repo = "benchmark"; - rev = "v${version}"; - hash = "sha256-c46Xna/t21WKaFa7n4ieIacsrxJ+15uGNYWCUVuUhsI="; - }; - - nativeBuildInputs = [ cmake ]; - - postPatch = '' - cp -r ${gtest.src} googletest - chmod -R u+w googletest - - # https://github.com/google/benchmark/issues/1396 - substituteInPlace cmake/benchmark.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - - # Tests fail on 32-bit due to not enough precision - doCheck = stdenv.is64bit; - - passthru.tests = { - inherit prometheus-cpp; - }; - - meta = with lib; { - description = "Microbenchmark support library"; - homepage = "https://github.com/google/benchmark"; - license = licenses.asl20; - platforms = platforms.linux ++ platforms.darwin ++ platforms.freebsd; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix deleted file mode 100644 index 6136564e5412..000000000000 --- a/pkgs/development/libraries/gcab/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib, stdenv -, fetchurl -, gettext -, gobject-introspection -, gtk-doc -, docbook_xsl -, docbook_xml_dtd_43 -, pkg-config -, meson -, ninja -, vala -, glib -, zlib -, gnome -, nixosTests -}: - -stdenv.mkDerivation rec { - pname = "gcab"; - version = "1.6"; - - outputs = [ "bin" "out" "dev" "devdoc" "installedTests" ]; - - src = fetchurl { - url = "mirror://gnome/sources/gcab/${lib.versions.majorMinor version}/gcab-${version}.tar.xz"; - hash = "sha256-LwyWFVd8QSaQniUfneBibD7noVI3bBW1VE3xD8h+Vgs="; - }; - - patches = [ - # allow installing installed tests to a separate output - ./installed-tests-path.patch - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - vala - gettext - gobject-introspection - gtk-doc - docbook_xsl - docbook_xml_dtd_43 - ]; - - buildInputs = [ - glib - zlib - ]; - - # required by libgcab-1.0.pc - propagatedBuildInputs = [ - glib - ]; - - mesonFlags = [ - "-Dinstalled_tests=true" - "-Dinstalled_test_prefix=${placeholder "installedTests"}" - ]; - - doCheck = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; - }; - - tests = { - installedTests = nixosTests.installed-tests.gcab; - }; - }; - - meta = with lib; { - description = "GObject library to create cabinet files"; - mainProgram = "gcab"; - homepage = "https://gitlab.gnome.org/GNOME/gcab"; - license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gcab/installed-tests-path.patch b/pkgs/development/libraries/gcab/installed-tests-path.patch deleted file mode 100644 index ab3b6b3fae3f..000000000000 --- a/pkgs/development/libraries/gcab/installed-tests-path.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/meson_options.txt b/meson_options.txt -index c1b1da1..9b76022 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -4,3 +4,4 @@ - option('vapi', type : 'boolean', value : true, description: 'generate Vala bindings (requires introspection)') - option('tests', type : 'boolean', value : true, description : 'enable tests') - option('installed_tests', type : 'boolean', value : false, description : 'install tests for "as-installed" testing') -+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') -diff --git a/tests/meson.build b/tests/meson.build -index 1e46e2a..aa780d0 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -1,5 +1,5 @@ --installed_tests_metadir = join_paths(get_option('datadir'), 'installed-tests', 'libgcab-1.0') --installed_tests_execdir = join_paths(get_option('libexecdir'), 'installed-tests', 'libgcab-1.0') -+installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', 'libgcab-1.0') -+installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', 'libgcab-1.0') - installed_tests_enabled = get_option('installed_tests') - installed_tests_template_tap = files('template-tap.test.in') - abs_installed_tests_execdir = join_paths(get_option('prefix'), installed_tests_execdir) diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix index 48a034aebceb..455c84e5dc18 100644 --- a/pkgs/development/libraries/gcc/libstdc++/5.nix +++ b/pkgs/development/libraries/gcc/libstdc++/5.nix @@ -114,6 +114,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/libraries/gcr/4.nix b/pkgs/development/libraries/gcr/4.nix index dd860d0bc700..b99c5f9eaa49 100644 --- a/pkgs/development/libraries/gcr/4.nix +++ b/pkgs/development/libraries/gcr/4.nix @@ -22,6 +22,7 @@ , gnome , python3 , shared-mime-info +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd }: stdenv.mkDerivation rec { @@ -56,8 +57,9 @@ stdenv.mkDerivation rec { pango libsecret openssh - systemd gtk4 + ] ++ lib.optionals systemdSupport [ + systemd ]; propagatedBuildInputs = [ @@ -74,6 +76,7 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/140824 "-Dssh_agent=false" "-Dgpg_path=${lib.getBin gnupg}/bin/gpg" + (lib.mesonEnable "systemd" systemdSupport) ]; doCheck = false; # fails 21 out of 603 tests, needs dbus daemon diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 0a74d6122ee2..6b1a471d4aac 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "--enable-gd-formats" ] # -pthread gets passed to clang, causing warnings - ++ lib.optional stdenv.isDarwin "--enable-werror=no"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-werror=no"; nativeBuildInputs = [ autoconf automake pkg-config ]; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index cf2ff67acf41..7743f1e9e98d 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -2,9 +2,10 @@ , stdenv , callPackage , fetchFromGitHub +, fetchpatch , useMinimalFeatures ? false -, useTiledb ? (!useMinimalFeatures) && !(stdenv.isDarwin && stdenv.isx86_64) +, useTiledb ? (!useMinimalFeatures) && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) , useLibHEIF ? (!useMinimalFeatures) , useLibJXL ? (!useMinimalFeatures) , useMysql ? (!useMinimalFeatures) @@ -79,15 +80,27 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; - version = "3.9.2"; + version = "3.9.3"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-BXnpNfi9tUd6nnwYdstuOfGsFVif8kkmkW97X1UAgt8="; + hash = "sha256-8LY63s5vOVK0V37jQ60qFsaW/2D/13Xuy9/2OPLyTso="; }; + patches = [ + (fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/40c3212fe4ba93e5176df4cd8ae5e29e06bb6027.patch"; + sha256 = "sha256-D55iT6E/YdpSyfN7KUDTh1gdmIDLHXW4VC5d6D9B7ls="; + }) + (fetchpatch { + name = "arrow-18.patch"; + url = "https://github.com/OSGeo/gdal/commit/9a8c5c031404bbc81445291bad128bc13766cafa.patch"; + sha256 = "sha256-tF46DmF7ZReqY8ACTTPXohWLsRn8lVxhKF1s+r254KM="; + }) + ]; + nativeBuildInputs = [ bison cmake @@ -107,9 +120,9 @@ stdenv.mkDerivation (finalAttrs: { "-DMYSQL_LIBRARY=${lib.getLib libmysqlclient}/lib/${lib.optionalString (libmysqlclient.pname != "mysql") "mysql/"}libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary}" ] ++ lib.optionals finalAttrs.doInstallCheck [ "-DBUILD_TESTING=ON" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DCMAKE_SKIP_BUILD_RPATH=ON" # without, libgdal.so can't find libmariadb.so - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ] ++ lib.optionals (!useTiledb) [ "-DGDAL_USE_TILEDB=OFF" @@ -145,8 +158,8 @@ stdenv.mkDerivation (finalAttrs: { netCdfDeps = lib.optionals useNetCDF [ netcdf ]; armadilloDeps = lib.optionals useArmadillo [ armadillo ]; - darwinDeps = lib.optionals stdenv.isDarwin [ libiconv ]; - nonDarwinDeps = lib.optionals (!stdenv.isDarwin) ([ + darwinDeps = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + nonDarwinDeps = lib.optionals (!stdenv.hostPlatform.isDarwin) ([ # tests for formats enabled by these packages fail on macos openexr xercesc @@ -256,10 +269,13 @@ stdenv.mkDerivation (finalAttrs: { # failing with PROJ 9.3.1 # https://github.com/OSGeo/gdal/issues/8908 "test_osr_esri_28" - ] ++ lib.optionals (!stdenv.isx86_64) [ + # failing for unknown reason + # https://github.com/OSGeo/gdal/pull/10806#issuecomment-2362054085 + "test_ogr_gmlas_billion_laugh" + ] ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ # likely precision-related expecting x87 behaviour "test_jp2openjpeg_22" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # flaky on macos "test_rda_download_queue" ] ++ lib.optionals (lib.versionOlder proj.version "8") [ diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 33afe0ea7c54..ca099da02354 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -45,13 +45,13 @@ stdenv.mkDerivation rec { "-DGDCM_USE_VTK=ON" ] ++ lib.optionals enablePython [ "-DGDCM_WRAP_PYTHON:BOOL=ON" - "-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}" + "-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}/python_gdcm" ]; nativeBuildInputs = [ cmake pkg-config - ] ++ lib.optional stdenv.isDarwin DarwinTools; + ] ++ lib.optional stdenv.hostPlatform.isDarwin DarwinTools; buildInputs = [ expat @@ -60,12 +60,19 @@ stdenv.mkDerivation rec { zlib ] ++ lib.optionals enableVTK [ vtk - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Cocoa libiconv ] ++ lib.optionals enablePython [ swig python ]; + postInstall = lib.optionalString enablePython '' + substitute \ + ${./python_gdcm.egg-info} \ + $out/${python.sitePackages}/python_gdcm-${version}.egg-info \ + --subst-var-by GDCM_VER "${version}" + ''; + disabledTests = [ # require networking: "TestEcho" @@ -77,7 +84,9 @@ stdenv.mkDerivation rec { "TestSCUValidation" # errors because 3 classes not wrapped: "TestWrapPython" - ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + # AttributeError: module 'gdcm' has no attribute 'UIDGenerator_SetRoot'; maybe a wrapping regression: + "TestUIDGeneratorPython" + ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ "TestRescaler2" ]; diff --git a/pkgs/development/libraries/gdcm/python_gdcm.egg-info b/pkgs/development/libraries/gdcm/python_gdcm.egg-info new file mode 100644 index 000000000000..d0b2e21f091d --- /dev/null +++ b/pkgs/development/libraries/gdcm/python_gdcm.egg-info @@ -0,0 +1,5 @@ +Metadata-Version: 2.1 +Name: python-gdcm +Version: @GDCM_VER@ +Summary: C++ library for DICOM medical files wrapped for Python using SWIG +Platform: UNKNOWN diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 59760504f98e..b7ba12245362 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { # for man pages docutils - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ] ++ lib.optionals withIntrospection [ gi-docgen @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "bin" "$dev" moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # meson erroneously installs loaders with .dylib extension on Darwin. # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them. for f in $out/${finalAttrs.passthru.moduleDir}/*.dylib; do @@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # The fixDarwinDylibNames hook doesn't patch binaries. - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' for f in $out/bin/* $dev/bin/*; do install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f done @@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./setup-hook.sh; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix deleted file mode 100644 index 6e7e1e39b38d..000000000000 --- a/pkgs/development/libraries/gdl/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk3, gnome, intltool }: - -stdenv.mkDerivation rec { - pname = "gdl"; - version = "3.40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gdl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "NkHU/WadHhgYrv88+f+3iH/Fw2eFC3jCjHdeukq2pVU="; - }; - - nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ libxml2 gtk3 ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = "gdl"; - }; - }; - - meta = with lib; { - description = "Gnome docking library"; - homepage = "https://developer.gnome.org/gdl/"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/development/libraries/gdome2/default.nix deleted file mode 100644 index f71753b479d7..000000000000 --- a/pkgs/development/libraries/gdome2/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{lib, stdenv, fetchurl, pkg-config, glib, libxml2, gtk-doc}: - -let - pname = "gdome2"; - version = "0.8.1"; -in - -stdenv.mkDerivation { - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://gdome2.cs.unibo.it/tarball/${pname}-${version}.tar.gz"; - sha256 = "0hyms5s3hziajp3qbwdwqjc2xcyhb783damqg8wxjpwfxyi81fzl"; - }; - - hardeningDisable = [ "format" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib libxml2 gtk-doc ]; - propagatedBuildInputs = [glib libxml2]; - patches = [ - ./xml-document.patch - ./fno-common.patch - ]; - - meta = with lib; { - homepage = "http://gdome2.cs.unibo.it/"; - description = "DOM C library developed for the Gnome project"; - mainProgram = "gdome-config"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ prikhi roconnor ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gdome2/fno-common.patch b/pkgs/development/libraries/gdome2/fno-common.patch deleted file mode 100644 index f9dc93c48fcf..000000000000 --- a/pkgs/development/libraries/gdome2/fno-common.patch +++ /dev/null @@ -1,11 +0,0 @@ -On gcc-10 -fno-common is the default which forbids miltiple definitions. ---- a/libgdome/xpath/gdome-xpath-xpnsresolv.h -+++ b/libgdome/xpath/gdome-xpath-xpnsresolv.h -@@ -42,6 +42,6 @@ void gdome_xpath_xpnsresolv_ref (GdomeXPathNSResolver *self, GdomeException *exc - void gdome_xpath_xpnsresolv_unref (GdomeXPathNSResolver *self, GdomeException *exc); - GdomeDOMString * gdome_xpath_xpnsresolv_lookupNamespaceURI( GdomeXPathNSResolver *self, GdomeDOMString *prefix, GdomeException *exc); - --const GdomeXPathNSResolverVtab gdome_xpath_xpnsresolv_vtab; -+extern const GdomeXPathNSResolverVtab gdome_xpath_xpnsresolv_vtab; - - #endif /* GDOME_XPNSRESOLV_FILE */ diff --git a/pkgs/development/libraries/gdome2/xml-document.patch b/pkgs/development/libraries/gdome2/xml-document.patch deleted file mode 100644 index 7567d1049fc0..000000000000 --- a/pkgs/development/libraries/gdome2/xml-document.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libgdome/gdomecore/gdome-xml-documentt.c 2003-07-13 14:47:54.000000000 +0400 -+++ b/libgdome/gdomecore/gdome-xml-documentt.c 2013-07-02 14:09:18.304613703 +0400 -@@ -342,7 +342,7 @@ - } - xmlNodeDumpOutput (out_buff, NULL, (xmlNode *)is, 0, 0, NULL); - xmlOutputBufferFlush(out_buff); -- ret = g_strndup (out_buff->buffer->content, out_buff->buffer->use); -+ ret = g_strndup (xmlBufContent(out_buff), xmlBufUse(out_buff)); - (void)xmlOutputBufferClose(out_buff); - - return gdome_xml_str_mkref_own (ret); diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index addc4a9dbe44..95cdef473467 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { gexiv2 openexr suitesparse - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenCL ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { ''; # tests fail to connect to the com.apple.fonts daemon in sandboxed mode - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Graph-based image processing framework"; diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix deleted file mode 100644 index 17266481b27a..000000000000 --- a/pkgs/development/libraries/geis/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv, fetchurl -, pkg-config -, python3Packages -, wrapGAppsHook3 -, atk -, dbus -, evemu -, frame -, gdk-pixbuf -, gobject-introspection -, grail -, gtk3 -, xorg -, pango -, xorgserver -}: - - -stdenv.mkDerivation rec { - pname = "geis"; - version = "2.2.17"; - - src = fetchurl { - url = "https://launchpad.net/geis/trunk/${version}/+download/${pname}-${version}.tar.xz"; - sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a"; - }; - - env.NIX_CFLAGS_COMPILE = "-Wno-error=misleading-indentation -Wno-error=pointer-compare"; - - hardeningDisable = [ "format" ]; - - pythonPath = with python3Packages; - [ pygobject3 ]; - - nativeBuildInputs = [ pkg-config wrapGAppsHook3 python3Packages.wrapPython gobject-introspection ]; - buildInputs = [ atk dbus evemu frame gdk-pixbuf grail - gtk3 xorg.libX11 xorg.libXext xorg.libXi xorg.libXtst pango python3Packages.python xorgserver - ]; - - patchPhase = '' - substituteInPlace python/geis/geis_v2.py --replace \ - "ctypes.util.find_library(\"geis\")" "'$out/lib/libgeis.so'" - ''; - - preFixup = '' - buildPythonPath "$out $pythonPath" - gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH") - ''; - - meta = with lib; { - description = "Library for input gesture recognition"; - homepage = "https://launchpad.net/geis"; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/genann/default.nix b/pkgs/development/libraries/genann/default.nix deleted file mode 100644 index 3f79b7ecfc2b..000000000000 --- a/pkgs/development/libraries/genann/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "genann"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "codeplea"; - repo = "genann"; - rev = "v${version}"; - sha256 = "0z45ndpd4a64i6jayr4yxfcr5h87bsmhm7lfgnbp35pnfywiclmq"; - }; - - dontBuild = true; - doCheck = true; - - # Nix doesn't seem to recognize this by default. - checkPhase = '' - make check - ''; - - installPhase = '' - mkdir -p $out/include - cp ./genann.{h,c} $out/include - ''; - - meta = with lib; { - homepage = "https://github.com/codeplea/genann"; - description = "Simple neural network library in ANSI C"; - license = licenses.zlib; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index 8a895c36e865..9bd0633e3d1b 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.8.5"; + version = "2.8.9"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-J1fP3CtTLkUMZxzsbu3ZMbg4ag1NFvaI5AibFT7eZso="; + sha256 = "sha256-xW3I1OfL+AfbeKf/kwBdsZRoCsPPZ7oLMppeIepn/P0="; }; passthru = { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ openssl ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ openssl ]; meta = with lib; { description = "General Stream I/O"; diff --git a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch deleted file mode 100644 index 832ae945aa2c..000000000000 --- a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff --git i/data/meson.build w/data/meson.build -index 6ac2a11..73f433b 100644 ---- i/data/meson.build -+++ w/data/meson.build -@@ -1,6 +1,6 @@ - if get_option('enable-backend') - conf = configuration_data() -- conf.set('sysconfdir', sysconfdir) -+ conf.set('sysconfdir', sysconfdir_install) - - if get_option('demo-agent') - conf.set('demo_agent', 'geoclue-demo-agent;') -@@ -8,7 +8,7 @@ if get_option('enable-backend') - conf.set('demo_agent', '') - endif - -- conf_dir = join_paths(sysconfdir, 'geoclue') -+ conf_dir = join_paths(sysconfdir_install, 'geoclue') - configure_file(output: 'geoclue.conf', - input: 'geoclue.conf.in', - configuration: conf, -@@ -17,7 +17,7 @@ if get_option('enable-backend') - conf = configuration_data() - conf.set('libexecdir', libexecdir) - conf.set('dbus_srv_user', get_option('dbus-srv-user')) -- conf.set('sysconfdir', sysconfdir) -+ conf.set('sysconfdir', sysconfdir_install) - - confd_dir = join_paths(conf_dir, 'conf.d') - install_emptydir(confd_dir) -@@ -37,7 +37,7 @@ if get_option('enable-backend') - # DBus Service policy file - dbus_service_dir = get_option('dbus-sys-dir') - if dbus_service_dir == '' -- dbus_service_dir = join_paths(sysconfdir, 'dbus-1', 'system.d') -+ dbus_service_dir = join_paths(sysconfdir_install, 'dbus-1', 'system.d') - endif - configure_file(output: 'org.freedesktop.GeoClue2.conf', - input: 'org.freedesktop.GeoClue2.conf.in', -diff --git i/demo/meson.build w/demo/meson.build -index 1427fbe..2623f16 100644 ---- i/demo/meson.build -+++ w/demo/meson.build -@@ -54,7 +54,7 @@ if get_option('demo-agent') - install_dir: desktop_dir) - - # Also install in the autostart directory. -- autostart_dir = join_paths(sysconfdir, 'xdg', 'autostart') -+ autostart_dir = join_paths(sysconfdir_install, 'xdg', 'autostart') - meson.add_install_script('install-file.py', - desktop_file.full_path(), - autostart_dir) -diff --git i/meson.build w/meson.build -index 220ae2b..dbf6458 100644 ---- i/meson.build -+++ w/meson.build -@@ -12,7 +12,11 @@ gclue_api_version='2.0' - datadir = join_paths(get_option('prefix'), get_option('datadir')) - includedir = join_paths(get_option('prefix'), get_option('includedir')) - libexecdir = join_paths(get_option('prefix'), get_option('libexecdir')) --sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir')) -+if get_option('sysconfdir_install') != '' -+ sysconfdir_install = join_paths(get_option('prefix'), get_option('sysconfdir_install')) -+else -+ sysconfdir_install = get_option('sysconfdir') -+endif - localedir = join_paths(datadir, 'locale') - - header_dir = 'libgeoclue-' + gclue_api_version -@@ -29,7 +33,7 @@ conf.set_quoted('PACKAGE_URL', 'https://gitlab.freedesktop.org/geoclue/geoclue/w - conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/geoclue/geoclue/issues/new') - conf.set_quoted('TEST_SRCDIR', meson.project_source_root() + '/data/') - conf.set_quoted('LOCALEDIR', localedir) --conf.set_quoted('SYSCONFDIR', sysconfdir) -+conf.set_quoted('SYSCONFDIR', get_option('sysconfdir')) - conf.set_quoted('MOZILLA_API_KEY', get_option('mozilla-api-key')) - conf.set10('GCLUE_USE_3G_SOURCE', get_option('3g-source')) - conf.set10('GCLUE_USE_CDMA_SOURCE', get_option('cdma-source')) -diff --git i/meson_options.txt w/meson_options.txt -index 5b8c42d..945dfd5 100644 ---- i/meson_options.txt -+++ w/meson_options.txt -@@ -40,6 +40,9 @@ option('systemd-system-unit-dir', - option('dbus-srv-user', - type: 'string', value: 'root', - description: 'The user (existing) as which the service will run') -+option('sysconfdir_install', -+ type: 'string', value: '', -+ description: 'sysconfdir to use during installation') - option('mozilla-api-key', - type: 'string', value: 'geoclue', - description: 'Your API key for Mozilla Location Service') diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix deleted file mode 100644 index 3c6a40eeb5cb..000000000000 --- a/pkgs/development/libraries/geoclue/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, intltool -, meson -, mesonEmulatorHook -, ninja -, pkg-config -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_412 -, glib -, json-glib -, libsoup_3 -, libnotify -, gdk-pixbuf -, modemmanager -, avahi -, glib-networking -, python3 -, wrapGAppsHook3 -, gobject-introspection -, vala -, withDemoAgent ? false -}: - -stdenv.mkDerivation rec { - pname = "geoclue"; - version = "2.7.0"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "geoclue"; - repo = "geoclue"; - rev = version; - hash = "sha256-vzarUg4lBEXYkH+n9SY8SYr0gHUX94PSTDmKd957gyc="; - }; - - patches = [ - ./add-option-for-installation-sysconfdir.patch - ]; - - nativeBuildInputs = [ - pkg-config - intltool - meson - ninja - wrapGAppsHook3 - python3 - vala - gobject-introspection - # devdoc - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_412 - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ - glib - json-glib - libsoup_3 - avahi - ] ++ lib.optionals withDemoAgent [ - libnotify gdk-pixbuf - ] ++ lib.optionals (!stdenv.isDarwin) [ - modemmanager - ]; - - propagatedBuildInputs = [ - glib - glib-networking - ]; - - mesonFlags = [ - "-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system" - "-Ddemo-agent=${lib.boolToString withDemoAgent}" - "--sysconfdir=/etc" - "-Dsysconfdir_install=${placeholder "out"}/etc" - "-Dmozilla-api-key=5c28d1f4-9511-47ff-b11a-2bef80fc177c" - "-Ddbus-srv-user=geoclue" - "-Ddbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d" - ] ++ lib.optionals stdenv.isDarwin [ - "-D3g-source=false" - "-Dcdma-source=false" - "-Dmodem-gps-source=false" - "-Dnmea-source=false" - ]; - - postPatch = '' - chmod +x demo/install-file.py - patchShebangs demo/install-file.py - ''; - - meta = with lib; { - broken = stdenv.isDarwin && withDemoAgent; - description = "Geolocation framework and some data providers"; - homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"; - maintainers = with maintainers; [ raskin mimame ]; - platforms = with platforms; linux ++ darwin; - license = licenses.lgpl2Plus; - }; -} diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix deleted file mode 100644 index c33b2cd6d391..000000000000 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv -, lib -, fetchurl -, meson -, mesonEmulatorHook -, ninja -, pkg-config -, gettext -, gtk-doc -, docbook-xsl-nons -, gobject-introspection -, gnome -, libsoup -, json-glib -, glib -, nixosTests -}: - -stdenv.mkDerivation rec { - pname = "geocode-glib"; - version = "3.26.4"; - - outputs = [ "out" "dev" "devdoc" "installedTests" ]; - - src = fetchurl { - url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/geocode-glib-${version}.tar.xz"; - sha256 = "LZpoJtFYRwRJoXOHEiFZbaD4Pr3P+YuQxwSQiQVqN6o="; - }; - - patches = [ - ./installed-tests-path.patch - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - gtk-doc - docbook-xsl-nons - gobject-introspection - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ - glib - libsoup - json-glib - ]; - - mesonFlags = [ - "-Dsoup2=${lib.boolToString (lib.versionOlder libsoup.version "2.99")}" - "-Dinstalled_test_prefix=${placeholder "installedTests"}" - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - }; - tests = { - installed-tests = nixosTests.installed-tests.geocode-glib; - }; - }; - - meta = with lib; { - description = "Convenience library for the geocoding and reverse geocoding using Nominatim service"; - license = licenses.lgpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/geocode-glib/installed-tests-path.patch b/pkgs/development/libraries/geocode-glib/installed-tests-path.patch deleted file mode 100644 index e5f24abdddd1..000000000000 --- a/pkgs/development/libraries/geocode-glib/installed-tests-path.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/geocode-glib/tests/meson.build b/geocode-glib/tests/meson.build -index 5cd1fca..c2f9a9d 100644 ---- a/geocode-glib/tests/meson.build -+++ b/geocode-glib/tests/meson.build -@@ -1,5 +1,5 @@ --install_dir = get_option('prefix') / get_option('datadir') / 'installed-tests' / library_name --install_bindir = get_option('prefix') / get_option('libexecdir') / library_name -+install_dir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / library_name -+install_bindir = get_option('installed_test_prefix') / 'libexec' / library_name - - e = executable('geo-uri', - 'geo-uri.c', -diff --git a/meson_options.txt b/meson_options.txt -index 62b713d..1454416 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,6 +1,9 @@ - option('enable-installed-tests', - type: 'boolean', value: true, - description: 'Build & install test programs') -+option('installed_test_prefix', -+ type: 'string', value: '', -+ description: 'Prefix for installed tests') - option('enable-introspection', - type: 'boolean', value: true, - description: 'Whether to enable the introspection generation') diff --git a/pkgs/development/libraries/geogram/default.nix b/pkgs/development/libraries/geogram/default.nix deleted file mode 100644 index 619b5dfcdf57..000000000000 --- a/pkgs/development/libraries/geogram/default.nix +++ /dev/null @@ -1,128 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchFromGitHub - -, cmake -, doxygen -, zlib -, python3Packages -}: - -let - testdata = fetchFromGitHub { - owner = "BrunoLevy"; - repo = "geogram.data"; - rev = "43dd49054a78d9b3fb8ef729f48ab47a272c718c"; - hash = "sha256-F2Lyt4nEOczVYLz6WLny+YrsxNwREBGPkProN8NHFN4="; - }; -in -stdenv.mkDerivation rec { - pname = "geogram"; - version = "1.8.6"; - - src = fetchurl { - url = "https://github.com/BrunoLevy/geogram/releases/download/v${version}/geogram_${version}.tar.gz"; - hash = "sha256-Xqha5HVqD2Ao0z++RKcQdMZUmtMb5eZ1DMJEVrfNUzE="; - }; - - outputs = [ "bin" "lib" "dev" "doc" "out" ]; - - cmakeFlags = [ - # Triangle is unfree - "-DGEOGRAM_WITH_TRIANGLE=OFF" - - # Disable some extra features (feel free to create a PR if you need one of those) - - # If GEOGRAM_WITH_LEGACY_NUMERICS is enabled GeoGram will build its own version of - # ARPACK, CBLAS, CLAPACK, LIBF2C and SUPERLU - "-DGEOGRAM_WITH_LEGACY_NUMERICS=OFF" - - # Don't build Lua - "-DGEOGRAM_WITH_LUA=OFF" - - # Disable certain features requiring GLFW - "-DGEOGRAM_WITH_GRAPHICS=OFF" - - # NOTE: Options introduced by patch (see below) - "-DGEOGRAM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake" - "-DGEOGRAM_INSTALL_PKGCONFIG_DIR=${placeholder "dev"}/lib/pkgconfig" - ]; - - nativeBuildInputs = [ - cmake - doxygen - ]; - - buildInputs = [ - zlib - ]; - - patches = [ - # This patch replaces the bundled (outdated) zlib with our zlib - # Should be harmless, but if there are issues this patch can also be removed - # Also check https://github.com/BrunoLevy/geogram/issues/49 for progress - ./replace-bundled-zlib.patch - ]; - - postPatch = lib.optionalString stdenv.isAarch64 '' - substituteInPlace cmake/platforms/*/config.cmake \ - --replace "-m64" "" - ''; - - postBuild = '' - make doc-devkit-full - ''; - - nativeCheckInputs = [ - python3Packages.robotframework - ]; - - doCheck = true; - - checkPhase = - let - skippedTests = [ - # Failing tests as of version 1.8.3 - "FileConvert" - "Reconstruct" - "Remesh" - - # Skip slow RVD test - "RVD" - - # Flaky as of 1.8.5 (SIGSEGV, possibly a use-after-free) - "Delaunay" - ]; - in - '' - runHook preCheck - - ln -s ${testdata} ../tests/data - - source tests/testenv.sh - robot \ - ${lib.concatMapStringsSep " " (t: lib.escapeShellArg "--skip=${t}") skippedTests} \ - ../tests - - runHook postCheck - ''; - - meta = with lib; { - description = "Programming Library with Geometric Algorithms"; - longDescription = '' - Geogram contains the main results in Geometry Processing from the former ALICE Inria project, - that is, more than 30 research articles published in ACM SIGGRAPH, ACM Transactions on Graphics, - Symposium on Geometry Processing and Eurographics. - ''; - homepage = "https://github.com/BrunoLevy/geogram"; - license = licenses.bsd3; - - # Broken on aarch64-linux as of version 1.8.3 - # See https://github.com/BrunoLevy/geogram/issues/74 - broken = stdenv.isLinux && stdenv.isAarch64; - - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - maintainers = with maintainers; [ tmarkus ]; - }; -} diff --git a/pkgs/development/libraries/geogram/replace-bundled-zlib.patch b/pkgs/development/libraries/geogram/replace-bundled-zlib.patch deleted file mode 100644 index 3d19d66b0d2b..000000000000 --- a/pkgs/development/libraries/geogram/replace-bundled-zlib.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/src/lib/geogram/third_party/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100 -+++ b/src/lib/geogram/third_party/CMakeLists.txt 2023-03-09 20:46:16.740801862 +0100 -@@ -33,7 +33,6 @@ - aux_source_directories(SOURCES "Source Files\\LM6" LM7) - aux_source_directories(SOURCES "Source Files\\rply" rply) - aux_source_directories(SOURCES "Source Files\\shewchuk" shewchuk) --aux_source_directories(SOURCES "Source Files\\zlib" zlib) - aux_source_directories(SOURCES "Source Files\\PoissonRecon" PoissonRecon) - aux_source_directories(SOURCES "Source Files\\xatlas" xatlas) - ---- a/src/lib/geogram/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100 -+++ b/src/lib/geogram/CMakeLists.txt 2023-03-09 20:49:21.080059939 +0100 -@@ -70,6 +70,9 @@ - target_link_libraries(geogram psapi) - endif() - -+find_package(ZLIB REQUIRED) -+target_link_libraries(geogram ZLIB::ZLIB) -+ - # Install the library - install_devkit_targets(geogram) - ---- a/src/lib/geogram/basic/geofile.h 1970-01-01 01:00:01.000000000 +0100 -+++ b/src/lib/geogram/basic/geofile.h 2023-03-09 20:52:33.713329571 +0100 -@@ -44,7 +44,7 @@ - #include <geogram/basic/numeric.h> - #include <geogram/basic/memory.h> - #include <geogram/basic/string.h> --#include <geogram/third_party/zlib/zlib.h> -+#include <zlib.h> - - #include <stdexcept> - #include <fstream> ---- a/src/lib/geogram/third_party/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100 -+++ b/src/lib/geogram/third_party/CMakeLists.txt 2023-03-09 20:54:50.276520762 +0100 -@@ -60,8 +59,10 @@ - ${ANDROID_NDK}/sources/android/native_app_glue - ) - message(STATUS "building for Android") - endif() - -+find_package(ZLIB REQUIRED) -+target_link_libraries(geogram_third_party PUBLIC ZLIB::ZLIB) - - set_target_properties( - geogram_third_party PROPERTIES diff --git a/pkgs/development/libraries/geos/3.11.nix b/pkgs/development/libraries/geos/3.11.nix index fb3eccf997a1..32e1f39965d7 100644 --- a/pkgs/development/libraries/geos/3.11.nix +++ b/pkgs/development/libraries/geos/3.11.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; # https://github.com/libgeos/geos/issues/930 - cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + cmakeFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;unit-geom-Envelope" ]; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 849fe64634a5..2e63196b0420 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -9,17 +9,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "geos"; - version = "3.12.2"; + version = "3.13.0"; src = fetchurl { url = "https://download.osgeo.org/geos/geos-${finalAttrs.version}.tar.bz2"; - hash = "sha256-NMd3C/AJDuiEiK+Ydn0I53nxJPozQ34Kq+yKvUYJ/sY="; + hash = "sha256-R+yD/zNNZyueRCZpXxXabmNoJEIUlx+r84b/jvbfOeQ="; }; nativeBuildInputs = [ cmake ]; # https://github.com/libgeos/geos/issues/930 - cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + cmakeFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;unit-geom-Envelope" ]; diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix deleted file mode 100644 index 8617d7ddd2f2..000000000000 --- a/pkgs/development/libraries/getdata/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool }: -stdenv.mkDerivation rec { - pname = "getdata"; - version = "0.11.0"; - src = fetchFromGitHub { - owner = "ketiltrout"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-fuFakbkxDwDp6Z9VITPIB8NiYRSp98Ub1y5SC6W5S1E="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libtool ]; - - meta = with lib; { - description = "Reference implementation of the Dirfile Standards"; - license = licenses.lgpl21Plus; - platforms = platforms.all; - maintainers = [ maintainers.vbgl ]; - homepage = "https://getdata.sourceforge.net/"; - }; -} diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index 69d7f17dafe7..b85dc689d96c 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -62,7 +62,7 @@ in rec { nativeBuildInputs = [ cmake doxygen yq ]; buildInputs = [ getdns libyaml openssl systemd ] - ++ lib.optionals stdenv.isDarwin [ darwin.Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Security ]; postInstall = '' rm -r $out/share/doc diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index abb692aebc1e..2a69b5702172 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -19,13 +19,22 @@ stdenv.mkDerivation rec { # fix reproducibile output, in particular in the grub2 build # https://savannah.gnu.org/bugs/index.php?59658 ./0001-msginit-Do-not-use-POT-Creation-Date.patch - ]; + ] + # An accidental inclusion in https://marc.info/?l=glibc-alpha&m=150511271003225&w=2 + # resulted in a getcwd prototype to be added in when it isn't needed. + # Clang does not like this unless the "overridable" attribute was appied. + # Since we don't need to redeclare getcwd, we can just remove it. + # + # Issue: https://github.com/NixOS/nixpkgs/issues/348658 + # Fixed in https://github.com/autotools-mirror/gettext/commit/cb2c1486336462c8180f487221181ee798b0e73e + # Remove in 0.22.5 upgrade. + ++ lib.optional (stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin) ./fix-getcwd-clang.patch; outputs = [ "out" "man" "doc" "info" ]; hardeningDisable = [ "format" ]; - LDFLAGS = lib.optionalString stdenv.isSunOS "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec"; + LDFLAGS = lib.optionalString stdenv.hostPlatform.isSunOS "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec"; configureFlags = [ "--disable-csharp" @@ -56,7 +65,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals (!stdenv.hostPlatform.isMinGW) [ bash ] - ++ lib.optionals (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isCygwin) [ # HACK, see #10874 (and 14664) libiconv ]; @@ -102,6 +111,6 @@ stdenv.mkDerivation rec { }; } -// lib.optionalAttrs stdenv.isDarwin { +// lib.optionalAttrs stdenv.hostPlatform.isDarwin { makeFlags = [ "CFLAGS=-D_FORTIFY_SOURCE=0" ]; } diff --git a/pkgs/development/libraries/gettext/fix-getcwd-clang.patch b/pkgs/development/libraries/gettext/fix-getcwd-clang.patch new file mode 100644 index 000000000000..ae253b3cd0ec --- /dev/null +++ b/pkgs/development/libraries/gettext/fix-getcwd-clang.patch @@ -0,0 +1,63 @@ +From cb2c1486336462c8180f487221181ee798b0e73e Mon Sep 17 00:00:00 2001 +From: Bruno Haible <bruno@clisp.org> +Date: Thu, 9 Feb 2023 16:58:20 +0100 +Subject: [PATCH] Fix compilation errors with ISO C 23 compilers. + +* gettext-runtime/intl/dcigettext.c (getwd, getcwd): Assume a declaration in the +system header files. +* gettext-runtime/intl/gettextP.h (SWAP): Drop K&C compatibility. +--- + gettext-runtime/intl/dcigettext.c | 5 +---- + gettext-runtime/intl/gettextP.h | 7 +------ + 2 files changed, 2 insertions(+), 10 deletions(-) + +diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c +index e7cb9b962..666a624b0 100644 +--- a/gettext-runtime/intl/dcigettext.c ++++ b/gettext-runtime/intl/dcigettext.c +@@ -1,5 +1,5 @@ + /* Implementation of the internal dcigettext function. +- Copyright (C) 1995-2020 Free Software Foundation, Inc. ++ Copyright (C) 1995-2023 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by +@@ -139,13 +139,10 @@ extern int errno; + # define tfind __tfind + #else + # if !defined HAVE_GETCWD +-char *getwd (); + # define getcwd(buf, max) getwd (buf) + # else + # if VMS + # define getcwd(buf, max) (getcwd) (buf, max, 0) +-# else +-char *getcwd (); + # endif + # endif + # ifndef HAVE_STPCPY +diff --git a/gettext-runtime/intl/gettextP.h b/gettext-runtime/intl/gettextP.h +index bb00555ee..536e8bd43 100644 +--- a/gettext-runtime/intl/gettextP.h ++++ b/gettext-runtime/intl/gettextP.h +@@ -1,5 +1,5 @@ + /* Header describing internals of libintl library. +- Copyright (C) 1995-2020 Free Software Foundation, Inc. ++ Copyright (C) 1995-2023 Free Software Foundation, Inc. + Written by Ulrich Drepper <drepper@cygnus.com>, 1995. + + This program is free software: you can redistribute it and/or modify +@@ -113,12 +113,7 @@ extern char *libintl_dcigettext (const char *__domainname, + # define SWAP(i) bswap_32 (i) + #else + static inline nls_uint32 +-# ifdef __cplusplus + SWAP (nls_uint32 i) +-# else +-SWAP (i) +- nls_uint32 i; +-# endif + { + return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24); + } + diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix deleted file mode 100644 index c560a3fc10e9..000000000000 --- a/pkgs/development/libraries/gexiv2/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ stdenv -, lib -, fetchurl -, meson -, mesonEmulatorHook -, ninja -, pkg-config -, exiv2 -, glib -, gnome -, gobject-introspection -, vala -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, python3 -}: - -stdenv.mkDerivation rec { - pname = "gexiv2"; - version = "0.14.3"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "IeZNLFbpszPUT+8/KkslZT2SLEGazZcvqW+raVIX4sg="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - vala - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - (python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ])) - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ - glib - ]; - - propagatedBuildInputs = [ - exiv2 - ]; - - mesonFlags = [ - "-Dgtk_doc=true" - "-Dtests=true" - ]; - - doCheck = true; - - preCheck = let - libSuffix = if stdenv.isDarwin then "2.dylib" else "so.2"; - in '' - # Our gobject-introspection patches make the shared library paths absolute - # in the GIR files. When running unit tests, the library is not yet installed, - # though, so we need to replace the absolute path with a local one during build. - # We are using a symlink that will be overridden during installation. - mkdir -p $out/lib - ln -s $PWD/gexiv2/libgexiv2.${libSuffix} $out/lib/libgexiv2.${libSuffix} - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/gexiv2"; - description = "GObject wrapper around the Exiv2 photo metadata library"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix deleted file mode 100644 index 1b45be611281..000000000000 --- a/pkgs/development/libraries/gf2x/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv -, lib -, fetchFromGitLab -, fetchpatch -, autoreconfHook -, buildPackages -, optimize ? false # impure hardware optimizations -}: -stdenv.mkDerivation rec { - pname = "gf2x"; - version = "1.3.0"; - - src = fetchFromGitLab { - domain = "gitlab.inria.fr"; - owner = "gf2x"; - repo = pname; - rev = "${pname}-${version}"; - sha256 = "04g5jg0i4vz46b4w2dvbmahwzi3k6b8g515mfw7im1inc78s14id"; - }; - - patches = [ - (fetchpatch { - name = "gf2x-1.3.0-configure-clang16.patch"; - url = "https://gitlab.inria.fr/gf2x/gf2x/-/commit/a2f0fd388c12ca0b9f4525c6cfbc515418dcbaf8.diff"; - hash = "sha256-Aj2KzWZMR24S04IbPOBPwacCU4rEiB+FFWxtRuF50LA="; - }) - ]; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - nativeBuildInputs = [ - autoreconfHook - ]; - - # no actual checks present yet (as of 1.2), but can't hurt trying - # for an indirect test, run ntl's test suite - doCheck = true; - - configureFlags = lib.optionals (!optimize) [ - "--disable-hardware-specific-code" - ]; - - meta = with lib; { - description = "Routines for fast arithmetic in GF(2)[x]"; - homepage = "https://gitlab.inria.fr/gf2x/gf2x/"; - license = licenses.gpl2Plus; - maintainers = teams.sage.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix deleted file mode 100644 index b099a2dd10e3..000000000000 --- a/pkgs/development/libraries/gfbgraph/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv -, lib -, fetchurl -, pkg-config -, glib -, librest -, gnome-online-accounts -, gnome -, libsoup -, json-glib -, gobject-introspection -, gtk-doc -, docbook-xsl-nons -}: - -stdenv.mkDerivation rec { - pname = "gfbgraph"; - version = "0.2.5"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "nLOBs/eLoRNt+Xrz8G47EdzCqzOawI907aD4BX1mA+M="; - }; - - nativeBuildInputs = [ - pkg-config - gobject-introspection - gtk-doc - docbook-xsl-nons - ]; - - buildInputs = [ - glib - gnome-online-accounts - ]; - - propagatedBuildInputs = [ - libsoup - json-glib - librest - ]; - - configureFlags = [ - "--enable-introspection" - "--enable-gtk-doc" - ]; - - enableParallelBuilding = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/libgfbgraph"; - description = "GLib/GObject wrapper for the Facebook Graph API"; - maintainers = teams.gnome.members; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gflags/default.nix b/pkgs/development/libraries/gflags/default.nix deleted file mode 100644 index 19926fb1d6ff..000000000000 --- a/pkgs/development/libraries/gflags/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake -, enableShared ? !stdenv.hostPlatform.isStatic -}: - -stdenv.mkDerivation rec { - pname = "gflags"; - version = "2.2.2"; - - src = fetchFromGitHub { - owner = "gflags"; - repo = "gflags"; - rev = "v${version}"; - sha256 = "147i3md3nxkjlrccqg4mq1kyzc7yrhvqv5902iibc7znkvzdvlp0"; - }; - - nativeBuildInputs = [ cmake ]; - - # This isn't used by the build and breaks the CMake build on case-insensitive filesystems (e.g., on Darwin) - preConfigure = "rm BUILD"; - - cmakeFlags = [ - "-DGFLAGS_BUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" - "-DGFLAGS_BUILD_STATIC_LIBS=ON" - ]; - - doCheck = false; - - meta = with lib; { - description = "C++ library that implements commandline flags processing"; - mainProgram = "gflags_completions.sh"; - longDescription = '' - The gflags package contains a C++ library that implements commandline flags processing. - As such it's a replacement for getopt(). - It was owned by Google. google-gflags project has been renamed to gflags and maintained by new community. - ''; - homepage = "https://gflags.github.io/gflags/"; - license = licenses.bsd3; - maintainers = [ maintainers.linquize ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/gfxstream/default.nix b/pkgs/development/libraries/gfxstream/default.nix deleted file mode 100644 index e3164c95a4c6..000000000000 --- a/pkgs/development/libraries/gfxstream/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib, stdenv, fetchFromGitiles, fetchpatch, meson, ninja, pkg-config, python3 -, aemu, darwin, libdrm, libglvnd, vulkan-headers, vulkan-loader, xorg -}: - -stdenv.mkDerivation { - pname = "gfxstream"; - version = "0.1.2"; - - src = fetchFromGitiles { - url = "https://android.googlesource.com/platform/hardware/google/gfxstream"; - rev = "a29282666c0e2fdbb2c98cfe68a7c0677163ef91"; - hash = "sha256-IYXkaHZPEYIE9KW731GN6x6yRS+FYtP1zyHcaSofhIM="; - }; - - patches = [ - # Make libdrm an optional dependency, which is required to build on Darwin. - (fetchpatch { - url = "https://android.googlesource.com/platform/hardware/google/gfxstream/+/a8df2a3eb099b419a7b3638e68ea30b4cffb751b%5E%21/?format=TEXT"; - decode = "base64 -d"; - hash = "sha256-shjeNuxtQokscCGBKEUbOPKOWRELBAnHFNj3Y5w87Nw="; - }) - ]; - - # Ensure that meson can find an Objective-C compiler on Darwin. - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace meson.build \ - --replace-fail "project('gfxstream_backend', 'cpp', 'c'" "project('gfxstream_backend', 'cpp', 'c', 'objc'" - ''; - - nativeBuildInputs = [ meson ninja pkg-config python3 ]; - buildInputs = [ aemu libglvnd vulkan-headers vulkan-loader xorg.libX11 ] - ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libdrm) [ libdrm ] - ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.IOSurface - darwin.apple_sdk.frameworks.OpenGL - darwin.apple_sdk.frameworks.QuartzCore - ]; - - env = lib.optionalAttrs stdenv.isDarwin { - NIX_LDFLAGS = toString [ - "-framework Cocoa" - "-framework IOKit" - "-framework IOSurface" - "-framework OpenGL" - "-framework QuartzCore" - "-needed-lvulkan" - ]; - }; - - # dlopens libvulkan. - preConfigure = lib.optionalString (!stdenv.isDarwin) '' - mesonFlagsArray=(-Dcpp_link_args="-Wl,--push-state -Wl,--no-as-needed -lvulkan -Wl,--pop-state") - ''; - - meta = with lib; { - homepage = "https://android.googlesource.com/platform/hardware/google/gfxstream"; - description = "Graphics Streaming Kit"; - license = licenses.free; # https://android.googlesource.com/platform/hardware/google/gfxstream/+/refs/heads/main/LICENSE - maintainers = with maintainers; [ qyliss ]; - platforms = aemu.meta.platforms; - }; -} diff --git a/pkgs/development/libraries/ggz_base_libs/default.nix b/pkgs/development/libraries/ggz_base_libs/default.nix deleted file mode 100644 index 878f6bf97cff..000000000000 --- a/pkgs/development/libraries/ggz_base_libs/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, intltool, openssl, expat, libgcrypt }: - -stdenv.mkDerivation rec { - pname = "ggz-base-libs"; - version = "0.99.5"; - - src = fetchurl { - url = "http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/snapshots/ggz-base-libs-snapshot-${version}.tar.gz"; - sha256 = "1cw1vg0fbj36zyggnzidx9cbjwfc1yr4zqmsipxnvns7xa2awbdk"; - }; - - nativeBuildInputs = [ intltool ]; - buildInputs = [ openssl expat libgcrypt ]; - - patchPhase = '' - substituteInPlace configure \ - --replace "/usr/local/ssl/include" "${openssl.dev}/include" \ - --replace "/usr/local/ssl/lib" "${lib.getLib openssl}/lib" - ''; - - configureFlags = [ - "--with-tls" - ]; - - meta = with lib; { - description = "GGZ Gaming zone libraries"; - mainProgram = "ggz-config"; - maintainers = with maintainers; - [ - raskin - ]; - platforms = platforms.linux; - license = licenses.gpl2; - downloadPage = "http://www.ggzgamingzone.org/releases/"; - }; -} diff --git a/pkgs/development/libraries/ghc_filesystem/default.nix b/pkgs/development/libraries/ghc_filesystem/default.nix deleted file mode 100644 index 8dd65a90e534..000000000000 --- a/pkgs/development/libraries/ghc_filesystem/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, lib, cmake, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "filesystem"; - version = "1.5.12"; - - src = fetchFromGitHub { - owner = "gulrak"; - repo = "filesystem"; - rev = "v${version}"; - hash = "sha256-j4RE5Ach7C7Kef4+H9AHSXa2L8OVyJljDwBduKcC4eE="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "header-only single-file C++ std::filesystem compatible helper library"; - homepage = "https://github.com/gulrak/filesystem"; - license = licenses.mit; - maintainers = with maintainers; [ bbjubjub ]; - }; -} diff --git a/pkgs/development/libraries/giflib/CVE-2021-40633.patch b/pkgs/development/libraries/giflib/CVE-2021-40633.patch deleted file mode 100644 index 8a665bb1638b..000000000000 --- a/pkgs/development/libraries/giflib/CVE-2021-40633.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ccbc956432650734c91acb3fc88837f7b81267ff Mon Sep 17 00:00:00 2001 -From: "Eric S. Raymond" <esr@thyrsus.com> -Date: Wed, 21 Feb 2024 18:55:00 -0500 -Subject: [PATCH] Clean up memory better at end of run (CVE-2021-40633) - ---- - gif2rgb.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/gif2rgb.c b/gif2rgb.c -index d51226d..fc2e683 100644 ---- a/gif2rgb.c -+++ b/gif2rgb.c -@@ -517,6 +517,9 @@ static void GIF2RGB(int NumFiles, char *FileName, bool OneFileFlag, - DumpScreen2RGB(OutFileName, OneFileFlag, ColorMap, ScreenBuffer, - GifFile->SWidth, GifFile->SHeight); - -+ for (i = 0; i < GifFile->SHeight; i++) { -+ (void)free(ScreenBuffer[i]); -+ } - (void)free(ScreenBuffer); - - { --- -2.44.0 - diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix deleted file mode 100644 index cc5ef6f64369..000000000000 --- a/pkgs/development/libraries/giflib/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fixDarwinDylibNames -, pkgsStatic -}: - -stdenv.mkDerivation rec { - pname = "giflib"; - version = "5.2.2"; - - src = fetchurl { - url = "mirror://sourceforge/giflib/giflib-${version}.tar.gz"; - hash = "sha256-vn/70FfK3r4qoURUL9kMaDjGoIO16KkEi47jtmsp1fs="; - }; - - patches = [ - ./CVE-2021-40633.patch - ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ - # Build dll libraries. - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/001-mingw-build.patch?h=mingw-w64-giflib&id=b7311edf54824ac797c7916cd3ddc3a4b2368a19"; - hash = "sha256-bBx7lw7FWtxZJ+E9AAbKIpCGcJnS5lrGpjYcv/zBtKk="; - }) - - # Install executables. - ./mingw-install-exes.patch - ]; - - nativeBuildInputs = lib.optionals stdenv.isDarwin [ - fixDarwinDylibNames - ]; - - makeFlags = [ - "PREFIX=${builtins.placeholder "out"}" - ]; - - postPatch = '' - # we don't want to build HTML documentation - substituteInPlace doc/Makefile \ - --replace-fail "all: allhtml manpages" "all: manpages" - '' + lib.optionalString stdenv.hostPlatform.isStatic '' - # Upstream build system does not support NOT building shared libraries. - sed -i '/all:/ s/$(LIBGIFSO)//' Makefile - sed -i '/all:/ s/$(LIBUTILSO)//' Makefile - sed -i '/-m 755 $(LIBGIFSO)/ d' Makefile - sed -i '/ln -sf $(LIBGIFSOVER)/ d' Makefile - sed -i '/ln -sf $(LIBGIFSOMAJOR)/ d' Makefile - ''; - - passthru.tests = { - static = pkgsStatic.giflib; - }; - - meta = { - description = "Library for reading and writing gif images"; - homepage = "https://giflib.sourceforge.net/"; - platforms = lib.platforms.unix ++ lib.platforms.windows; - license = lib.licenses.mit; - maintainers = [ ]; - branch = "5.2"; - }; -} diff --git a/pkgs/development/libraries/giflib/mingw-install-exes.patch b/pkgs/development/libraries/giflib/mingw-install-exes.patch deleted file mode 100644 index 5ec3fdad7e65..000000000000 --- a/pkgs/development/libraries/giflib/mingw-install-exes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -92,7 +92,7 @@ - install: all install-bin install-include install-lib install-man - install-bin: $(INSTALLABLE) - $(INSTALL) -d "$(DESTDIR)$(BINDIR)" -- $(INSTALL) $^ "$(DESTDIR)$(BINDIR)" -+ $(INSTALL) $(^:=.exe) "$(DESTDIR)$(BINDIR)" - install-include: - $(INSTALL) -d "$(DESTDIR)$(INCDIR)" - $(INSTALL) -m 644 gif_lib.h "$(DESTDIR)$(INCDIR)" diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix deleted file mode 100644 index 91fbb86bd669..000000000000 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, which, pkg-config, mono, glib, gtk-sharp-2_0 }: - -stdenv.mkDerivation rec { - pname = "gio-sharp"; - version = "0.3"; - - src = fetchFromGitHub { - owner = "mono"; - repo = "gio-sharp"; - - rev = version; - sha256 = "13pc529pjabj7lq23dbndc26ssmg5wkhc7lfvwapm87j711m0zig"; - }; - - nativeBuildInputs = [ pkg-config autoconf automake which ]; - buildInputs = [ mono glib gtk-sharp-2_0 ]; - - dontStrip = true; - - prePatch = '' - ./autogen-2.22.sh - ''; - - meta = with lib; { - description = "GIO API bindings"; - homepage = "https://github.com/mono/gio-sharp"; - license = licenses.mit; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/git2-cpp/default.nix b/pkgs/development/libraries/git2-cpp/default.nix deleted file mode 100644 index 45750d0b24d4..000000000000 --- a/pkgs/development/libraries/git2-cpp/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "git2-cpp"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "ken-matsui"; - repo = "git2-cpp"; - rev = finalAttrs.version; - hash = "sha256-2jKSQW6dUCIKtl33paSTuZdYAaYdFnILx/Gxv/ghFiI="; - }; - - nativeBuildInputs = [ - cmake - ]; - - meta = with lib; { - homepage = "https://github.com/ken-matsui/git2-cpp"; - description = "libgit2 bindings for C++"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix; - }; -}) -# TODO [ ken-matsui ]: tests diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 44fe14396836..a77cc10e2e36 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-archnative" - ] ++ lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix deleted file mode 100644 index 604435cee510..000000000000 --- a/pkgs/development/libraries/gjs/default.nix +++ /dev/null @@ -1,153 +0,0 @@ -{ fetchurl -, lib -, stdenv -, meson -, mesonEmulatorHook -, ninja -, pkg-config -, gnome -, gtk3 -, atk -, gobject-introspection -, spidermonkey_115 -, pango -, cairo -, readline -, libsysprof-capture -, glib -, libxml2 -, dbus -, gdk-pixbuf -, harfbuzz -, makeWrapper -, which -, xvfb-run -, nixosTests -, installTests ? true -}: - -let - testDeps = [ - gtk3 atk pango.out gdk-pixbuf harfbuzz - ]; -in stdenv.mkDerivation (finalAttrs: { - pname = "gjs"; - version = "1.80.2"; - - outputs = [ "out" "dev" "installedTests" ]; - - src = fetchurl { - url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz"; - hash = "sha256-E145xaxZEJYjPlV8/ld9ZAk/UFRBHUfLLiFLrX1Bmb0="; - }; - - patches = [ - # Hard-code various paths - ./fix-paths.patch - - # Allow installing installed tests to a separate output. - ./installed-tests-path.patch - - # Disable introspection test in installed tests - # (minijasmine:1317): GLib-GIO-WARNING **: 17:33:39.556: Error creating IO channel for /proc/self/mountinfo: No such file or directory (g-io-error-quark, 1) - ./disable-introspection-test.patch - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - makeWrapper - which # for locale detection - libxml2 # for xml-stripblanks - dbus # for dbus-run-session - gobject-introspection - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ - cairo - readline - libsysprof-capture - spidermonkey_115 - ]; - - nativeCheckInputs = [ - xvfb-run - ] ++ testDeps; - - propagatedBuildInputs = [ - glib - ]; - - mesonFlags = [ - "-Dinstalled_test_prefix=${placeholder "installedTests"}" - ] ++ lib.optionals (!stdenv.isLinux || stdenv.hostPlatform.isMusl) [ - "-Dprofiler=disabled" - ]; - - doCheck = !stdenv.isDarwin; - - postPatch = '' - patchShebangs build/choose-tests-locale.sh - substituteInPlace installed-tests/debugger-test.sh --subst-var-by gjsConsole $out/bin/gjs-console - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - substituteInPlace installed-tests/js/meson.build \ - --replace "'Encoding'," "#'Encoding'," - ''; - - preCheck = '' - # Our gobject-introspection patches make the shared library paths absolute - # in the GIR files. When running tests, the library is not yet installed, - # though, so we need to replace the absolute path with a local one during build. - # We are using a symlink that will be overridden during installation. - mkdir -p $out/lib $installedTests/libexec/installed-tests/gjs - ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0 - ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/installed-tests/gjs/libgimarshallingtests.so - ln -s $PWD/installed-tests/js/libgjstesttools/libgjstesttools.so $installedTests/libexec/installed-tests/gjs/libgjstesttools.so - ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/installed-tests/gjs/libregress.so - ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/installed-tests/gjs/libwarnlib.so - ''; - - postInstall = '' - # TODO: make the glib setup hook handle moving the schemas in other outputs. - installedTestsSchemaDatadir="$installedTests/share/gsettings-schemas/gjs-${finalAttrs.version}" - mkdir -p "$installedTestsSchemaDatadir" - mv "$installedTests/share/glib-2.0" "$installedTestsSchemaDatadir" - ''; - - postFixup = lib.optionalString installTests '' - wrapProgram "$installedTests/libexec/installed-tests/gjs/minijasmine" \ - --prefix XDG_DATA_DIRS : "$installedTestsSchemaDatadir" \ - --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" testDeps}" - ''; - - checkPhase = '' - runHook preCheck - xvfb-run -s '-screen 0 800x600x24' \ - meson test --print-errorlogs - runHook postCheck - ''; - - separateDebugInfo = stdenv.isLinux; - - passthru = { - tests = { - installed-tests = nixosTests.installed-tests.gjs; - }; - - updateScript = gnome.updateScript { - packageName = "gjs"; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "JavaScript bindings for GNOME"; - homepage = "https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Home.md"; - license = licenses.lgpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/gjs/disable-introspection-test.patch b/pkgs/development/libraries/gjs/disable-introspection-test.patch deleted file mode 100644 index 1c438dd6b401..000000000000 --- a/pkgs/development/libraries/gjs/disable-introspection-test.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build -index 07759690..43c87c59 100644 ---- a/installed-tests/js/meson.build -+++ b/installed-tests/js/meson.build -@@ -123,7 +123,6 @@ jasmine_tests = [ - 'GTypeClass', - 'Importer', - 'Importer2', -- 'Introspection', - 'Lang', - 'LegacyByteArray', - 'LegacyClass', diff --git a/pkgs/development/libraries/gjs/fix-paths.patch b/pkgs/development/libraries/gjs/fix-paths.patch deleted file mode 100644 index 5ca5372ea947..000000000000 --- a/pkgs/development/libraries/gjs/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/installed-tests/debugger-test.sh b/installed-tests/debugger-test.sh -index 0d118490..54c5507e 100755 ---- a/installed-tests/debugger-test.sh -+++ b/installed-tests/debugger-test.sh -@@ -3,7 +3,7 @@ - if test "$GJS_USE_UNINSTALLED_FILES" = "1"; then - gjs="$TOP_BUILDDIR/gjs-console" - else -- gjs=gjs-console -+ gjs=@gjsConsole@ - fi - - echo 1..1 diff --git a/pkgs/development/libraries/gjs/installed-tests-path.patch b/pkgs/development/libraries/gjs/installed-tests-path.patch deleted file mode 100644 index 09cd8eaff434..000000000000 --- a/pkgs/development/libraries/gjs/installed-tests-path.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/installed-tests/meson.build b/installed-tests/meson.build -index 04c7910f..9647908c 100644 ---- a/installed-tests/meson.build -+++ b/installed-tests/meson.build -@@ -1,7 +1,7 @@ - ### Installed tests ############################################################ - --installed_tests_execdir = get_option('prefix') / get_option('libexecdir') / 'installed-tests' / meson.project_name() --installed_tests_metadir = abs_datadir / 'installed-tests' / meson.project_name() -+installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / meson.project_name() -+installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / meson.project_name() - - # Simple shell script tests # - -diff --git a/meson.build b/meson.build -index 9ab29475..42ffe07f 100644 ---- a/meson.build -+++ b/meson.build -@@ -557,7 +557,7 @@ install_data('installed-tests/extra/lsan.supp', - install_dir: get_option('datadir') / api_name / 'lsan') - - if get_option('installed_tests') -- schemadir = abs_datadir / 'glib-2.0' / 'schemas' -+ schemadir = get_option('installed_test_prefix') / 'share' / 'glib-2.0' / 'schemas' - install_data('installed-tests/js/org.gnome.GjsTest.gschema.xml', install_dir: schemadir) - meson.add_install_script('build/compile-gschemas.py', schemadir) - endif -diff --git a/meson_options.txt b/meson_options.txt -index 825ba77a..21f0323c 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -25,3 +25,5 @@ option('skip_gtk_tests', type: 'boolean', value: false, - description: 'Skip tests that need a display connection') - option('verbose_logs', type: 'boolean', value: false, - description: 'Enable extra log messages that may decrease performance (not allowed in release builds)') -+option('installed_test_prefix', type: 'string', value: '', -+ description: 'Prefix for installed tests') diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix deleted file mode 100644 index f1d67c8c8855..000000000000 --- a/pkgs/development/libraries/gl2ps/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, fetchurl -, cmake -, zlib -, libpng -, libGL -, libGLU -, libglut -, darwin -}: - -stdenv.mkDerivation rec { - pname = "gl2ps"; - version = "1.4.2"; - - src = fetchurl { - url = "http://geuz.org/gl2ps/src/${pname}-${version}.tgz"; - sha256 = "1sgzv547h7hrskb9qd0x5yp45kmhvibjwj2mfswv95lg070h074d"; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - zlib - libpng - ] ++ lib.optionals (!stdenv.isDarwin) [ - libGL - libGLU - libglut - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.OpenGL - ]; - - meta = with lib; { - homepage = "http://geuz.org/gl2ps"; - description = "OpenGL to PostScript printing library"; - platforms = platforms.all; - license = licenses.lgpl2; - maintainers = with maintainers; [ raskin twhitehead ]; - }; -} diff --git a/pkgs/development/libraries/gl3w/default.nix b/pkgs/development/libraries/gl3w/default.nix deleted file mode 100644 index c12ab1f22a8f..000000000000 --- a/pkgs/development/libraries/gl3w/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python3, cmake, libglvnd, libGLU, unstableGitUpdater }: - -stdenv.mkDerivation rec { - pname = "gl3w"; - version = "0-unstable-2023-10-10"; - - src = fetchFromGitHub { - owner = "skaslev"; - repo = pname; - rev = "3a33275633ce4be433332dc776e6a5b3bdea6506"; - hash = "sha256-kEm5QItpasSFJQ32YBHPpc+itz/nQ8bQMCavbOTGT/w="; - }; - - nativeBuildInputs = [ python3 cmake ]; - # gl3w installs a CMake config that when included expects to be able to - # build and link against both of these libraries - # (the gl3w generated C file gets compiled into the downstream target) - propagatedBuildInputs = [ libglvnd libGLU ]; - - dontUseCmakeBuildDir = true; - - # These files must be copied rather than linked since they are considered - # outputs for the custom command, and CMake expects to be able to touch them - preConfigure = '' - mkdir -p include/{GL,KHR} - cp ${libglvnd.dev}/include/GL/glcorearb.h include/GL/glcorearb.h - cp ${libglvnd.dev}/include/KHR/khrplatform.h include/KHR/khrplatform.h - ''; - - passthru.updateScript = unstableGitUpdater { }; - - meta = with lib; { - description = "Simple OpenGL core profile loading"; - homepage = "https://github.com/skaslev/gl3w"; - license = licenses.unlicense; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix deleted file mode 100644 index b19a890a2545..000000000000 --- a/pkgs/development/libraries/glbinding/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libGLU }: - -stdenv.mkDerivation rec { - pname = "glbinding"; - version = "3.3.0"; - - src = fetchFromGitHub { - owner = "cginternals"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-xmEXZ1ssXzrElqd6D1zooFxLEyspsF4Dau3d9+1/2yw="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libGLU ]; - - meta = with lib; { - homepage = "https://github.com/cginternals/glbinding/"; - description = "C++ binding for the OpenGL API, generated using the gl.xml specification"; - license = licenses.mit; - maintainers = [ maintainers.mt-caret ]; - }; -} diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix deleted file mode 100644 index f9ef65197bd5..000000000000 --- a/pkgs/development/libraries/gle/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{lib, stdenv, fetchurl, libglut, libX11, libXt, libXmu, libXi, libXext, libGL, libGLU}: -stdenv.mkDerivation rec { - pname = "gle"; - version = "3.1.0"; - buildInputs = [libGLU libGL libglut libX11 libXt libXmu libXi libXext]; - src = fetchurl { - urls = [ - "mirror://sourceforge/project/gle/gle/gle-${version}/gle-${version}.tar.gz" - "https://www.linas.org/gle/pub/gle-${version}.tar.gz" - ]; - sha256 = "09zs1di4dsssl9k322nzildvf41jwipbzhik9p43yb1bcfsp92nw"; - }; - meta = { - description = "Tubing and extrusion library"; - license = lib.licenses.gpl2 ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 5d8f155a5c61..a675eebaa342 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; - buildInputs = if stdenv.isDarwin then [ AGL ] else [ libXmu libXi libXext ]; - propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h + buildInputs = if stdenv.hostPlatform.isDarwin then [ AGL ] else [ libXmu libXi libXext ]; + propagatedBuildInputs = if stdenv.hostPlatform.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 5b774f58717c..8d68ad086764 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -8,7 +8,7 @@ , libXi , libXext , OpenGL -, enableEGL ? (!stdenv.isDarwin) +, enableEGL ? (!stdenv.hostPlatform.isDarwin) , testers , mesa }: @@ -40,8 +40,8 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ libXmu libXi libXext ]; - propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libXmu libXi libXext ]; + propagatedBuildInputs = if stdenv.hostPlatform.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h cmakeDir = "cmake"; cmakeFlags = [ diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix deleted file mode 100644 index d74acc063e5c..000000000000 --- a/pkgs/development/libraries/glib-networking/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ stdenv -, lib -, fetchurl -, substituteAll -, meson -, ninja -, nixosTests -, pkg-config -, glib -, gettext -, makeWrapper -, gnutls -, p11-kit -, libproxy -, gnome -, gsettings-desktop-schemas -, bash -}: - -stdenv.mkDerivation rec { - pname = "glib-networking"; - version = "2.80.0"; - - outputs = [ "out" "installedTests" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-2PTxqrITF5rjNRYXtZ2rXea8yeeFAh7uF4mY69S7Os8="; - }; - - patches = [ - (substituteAll { - src = ./hardcode-gsettings.patch; - gds_gsettings_path = glib.getSchemaPath gsettings-desktop-schemas; - }) - - ./installed-tests-path.patch - - # pkcs11 tests provide a relative path that gnutls of course isn't able to - # load, resulting in test failures - # https://gitlab.gnome.org/GNOME/glib-networking/-/blob/2.78.1/tls/tests/certificate.c#L926 - # https://gitlab.gnome.org/GNOME/glib-networking/-/blob/2.78.1/tls/tests/connection.c#L3380 - ./disable-pkcs11-tests.patch - ]; - - strictDeps = true; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - makeWrapper - glib # for gio-querymodules - ]; - - buildInputs = [ - glib - gnutls - p11-kit - libproxy - gsettings-desktop-schemas - bash # installed-tests shebangs - ]; - - doCheck = false; # tests need to access the certificates (among other things) - - mesonFlags = [ - "-Dinstalled_tests=true" - "-Dinstalled_test_prefix=${placeholder "installedTests"}" - ]; - - postFixup = '' - find "$installedTests/libexec" "$out/libexec" -type f -executable -print0 \ - | while IFS= read -r -d "" file; do - echo "Wrapping program '$file'" - wrapProgram "$file" --prefix GIO_EXTRA_MODULES : "$out/lib/gio/modules" - done - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - - tests = { - installedTests = nixosTests.installed-tests.glib-networking; - }; - }; - - meta = with lib; { - description = "Network-related giomodules for glib"; - homepage = "https://gitlab.gnome.org/GNOME/glib-networking"; - license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/glib-networking/disable-pkcs11-tests.patch b/pkgs/development/libraries/glib-networking/disable-pkcs11-tests.patch deleted file mode 100644 index 43a37878b56c..000000000000 --- a/pkgs/development/libraries/glib-networking/disable-pkcs11-tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index 0b3b8c0..7f6ce09 100644 ---- a/meson.build -+++ b/meson.build -@@ -86,7 +86,7 @@ if gnutls_dep.found() - backends += ['gnutls'] - # test-specific, maybe move to tls/tests - if cc.has_function('gnutls_pkcs11_init', prefix: '#include <gnutls/pkcs11.h>', dependencies: gnutls_dep) -- config_h.set10('HAVE_GNUTLS_PKCS11', true) -+ config_h.set10('HAVE_GNUTLS_PKCS11', false) - endif - endif - diff --git a/pkgs/development/libraries/glib-networking/hardcode-gsettings.patch b/pkgs/development/libraries/glib-networking/hardcode-gsettings.patch deleted file mode 100644 index 0a091b2344dc..000000000000 --- a/pkgs/development/libraries/glib-networking/hardcode-gsettings.patch +++ /dev/null @@ -1,341 +0,0 @@ -diff --git a/proxy/gnome/gproxyresolvergnome.c b/proxy/gnome/gproxyresolvergnome.c -index 50b63cd..4364116 100644 ---- a/proxy/gnome/gproxyresolvergnome.c -+++ b/proxy/gnome/gproxyresolvergnome.c -@@ -156,23 +156,79 @@ - - resolver->base_resolver = g_simple_proxy_resolver_new (NULL, NULL); - -- resolver->proxy_settings = g_settings_new (GNOME_PROXY_SETTINGS_SCHEMA); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ GNOME_PROXY_SETTINGS_SCHEMA, -+ FALSE); -+ resolver->proxy_settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_signal_connect (resolver->proxy_settings, "changed", - G_CALLBACK (gsettings_changed), resolver); -- resolver->http_settings = g_settings_get_child (resolver->proxy_settings, -- GNOME_PROXY_HTTP_CHILD_SCHEMA); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_HTTP_CHILD_SCHEMA, -+ FALSE); -+ resolver->http_settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_signal_connect (resolver->http_settings, "changed", - G_CALLBACK (gsettings_changed), resolver); -- resolver->https_settings = g_settings_get_child (resolver->proxy_settings, -- GNOME_PROXY_HTTPS_CHILD_SCHEMA); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_HTTPS_CHILD_SCHEMA, -+ FALSE); -+ resolver->https_settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_signal_connect (resolver->https_settings, "changed", - G_CALLBACK (gsettings_changed), resolver); -- resolver->ftp_settings = g_settings_get_child (resolver->proxy_settings, -- GNOME_PROXY_FTP_CHILD_SCHEMA); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_FTP_CHILD_SCHEMA, -+ FALSE); -+ resolver->ftp_settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_signal_connect (resolver->ftp_settings, "changed", - G_CALLBACK (gsettings_changed), resolver); -- resolver->socks_settings = g_settings_get_child (resolver->proxy_settings, -- GNOME_PROXY_SOCKS_CHILD_SCHEMA); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_SOCKS_CHILD_SCHEMA, -+ FALSE); -+ resolver->socks_settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_signal_connect (resolver->socks_settings, "changed", - G_CALLBACK (gsettings_changed), resolver); - -diff --git a/proxy/tests/gnome.c b/proxy/tests/gnome.c -index f76b094..54751e3 100644 ---- a/proxy/tests/gnome.c -+++ b/proxy/tests/gnome.c -@@ -55,26 +55,86 @@ - { - GSettings *settings, *child; - -- settings = g_settings_new (GNOME_PROXY_SETTINGS_SCHEMA); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ GNOME_PROXY_SETTINGS_SCHEMA, -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_settings_reset (settings, GNOME_PROXY_MODE_KEY); - g_settings_reset (settings, GNOME_PROXY_USE_SAME_PROXY_KEY); - -- child = g_settings_get_child (settings, GNOME_PROXY_HTTP_CHILD_SCHEMA); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_HTTP_CHILD_SCHEMA, -+ FALSE); -+ child = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_settings_reset (child, GNOME_PROXY_HTTP_HOST_KEY); - g_settings_reset (child, GNOME_PROXY_HTTP_PORT_KEY); - g_object_unref (child); - -- child = g_settings_get_child (settings, GNOME_PROXY_HTTPS_CHILD_SCHEMA); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_HTTPS_CHILD_SCHEMA, -+ FALSE); -+ child = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_settings_reset (child, GNOME_PROXY_HTTPS_HOST_KEY); - g_settings_reset (child, GNOME_PROXY_HTTPS_PORT_KEY); - g_object_unref (child); - -- child = g_settings_get_child (settings, GNOME_PROXY_FTP_CHILD_SCHEMA); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_FTP_CHILD_SCHEMA, -+ FALSE); -+ child = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_settings_reset (child, GNOME_PROXY_FTP_HOST_KEY); - g_settings_reset (child, GNOME_PROXY_FTP_PORT_KEY); - g_object_unref (child); - -- child = g_settings_get_child (settings, GNOME_PROXY_SOCKS_CHILD_SCHEMA); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_SOCKS_CHILD_SCHEMA, -+ FALSE); -+ child = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_settings_reset (child, GNOME_PROXY_SOCKS_HOST_KEY); - g_settings_reset (child, GNOME_PROXY_SOCKS_PORT_KEY); - g_object_unref (child); -@@ -88,21 +148,69 @@ - { - GSettings *settings, *child; - -- settings = g_settings_new (GNOME_PROXY_SETTINGS_SCHEMA); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ GNOME_PROXY_SETTINGS_SCHEMA, -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_settings_set_enum (settings, GNOME_PROXY_MODE_KEY, G_DESKTOP_PROXY_MODE_MANUAL); - g_settings_set_boolean (settings, GNOME_PROXY_USE_SAME_PROXY_KEY, TRUE); - -- child = g_settings_get_child (settings, GNOME_PROXY_HTTP_CHILD_SCHEMA); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_HTTP_CHILD_SCHEMA, -+ FALSE); -+ child = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_settings_set_string (child, GNOME_PROXY_HTTP_HOST_KEY, "proxy.example.com"); - g_settings_set_int (child, GNOME_PROXY_HTTP_PORT_KEY, 8080); - g_object_unref (child); - -- child = g_settings_get_child (settings, GNOME_PROXY_HTTPS_CHILD_SCHEMA); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_HTTPS_CHILD_SCHEMA, -+ FALSE); -+ child = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_settings_set_string (child, GNOME_PROXY_HTTPS_HOST_KEY, "proxy-s.example.com"); - g_settings_set_int (child, GNOME_PROXY_HTTPS_PORT_KEY, 7070); - g_object_unref (child); - -- child = g_settings_get_child (settings, GNOME_PROXY_FTP_CHILD_SCHEMA); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_FTP_CHILD_SCHEMA, -+ FALSE); -+ child = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_settings_set_string (child, GNOME_PROXY_FTP_HOST_KEY, "proxy-f.example.com"); - g_settings_set_int (child, GNOME_PROXY_FTP_PORT_KEY, 6060); - g_object_unref (child); -@@ -119,12 +227,36 @@ - GSettings *settings, *child; - const gchar *ignore_hosts[2] = { "127.0.0.1", NULL }; - -- settings = g_settings_new (GNOME_PROXY_SETTINGS_SCHEMA); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ GNOME_PROXY_SETTINGS_SCHEMA, -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_settings_set_enum (settings, GNOME_PROXY_MODE_KEY, G_DESKTOP_PROXY_MODE_MANUAL); - g_settings_set (settings, GNOME_PROXY_IGNORE_HOSTS_KEY, - "@as", g_variant_new_strv (ignore_hosts, -1)); - -- child = g_settings_get_child (settings, GNOME_PROXY_SOCKS_CHILD_SCHEMA); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_SOCKS_CHILD_SCHEMA, -+ FALSE); -+ child = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_settings_set_string (child, GNOME_PROXY_SOCKS_HOST_KEY, "proxy.example.com"); - g_settings_set_int (child, GNOME_PROXY_SOCKS_PORT_KEY, 1234); - g_object_unref (child); -@@ -139,12 +271,36 @@ - { - GSettings *settings, *http; - -- settings = g_settings_new (GNOME_PROXY_SETTINGS_SCHEMA); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ GNOME_PROXY_SETTINGS_SCHEMA, -+ FALSE); -+ settings = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_settings_set_enum (settings, GNOME_PROXY_MODE_KEY, G_DESKTOP_PROXY_MODE_MANUAL); - g_settings_set (settings, GNOME_PROXY_IGNORE_HOSTS_KEY, - "@as", g_variant_new_strv (ignore_hosts, n_ignore_hosts)); - -- http = g_settings_get_child (settings, GNOME_PROXY_HTTP_CHILD_SCHEMA); -+ { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; -+ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", -+ g_settings_schema_source_get_default(), -+ TRUE, NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_HTTP_CHILD_SCHEMA, -+ FALSE); -+ http = g_settings_new_full(schema, NULL, NULL); -+ g_settings_schema_source_unref(schema_source); -+ g_settings_schema_unref(schema); -+ } - g_settings_set_string (http, GNOME_PROXY_HTTP_HOST_KEY, "localhost"); - g_settings_set_int (http, GNOME_PROXY_HTTP_PORT_KEY, 8080); - diff --git a/pkgs/development/libraries/glib-networking/installed-tests-path.patch b/pkgs/development/libraries/glib-networking/installed-tests-path.patch deleted file mode 100644 index 549307cca39d..000000000000 --- a/pkgs/development/libraries/glib-networking/installed-tests-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/meson.build b/meson.build -index 01e18a9..5dbb2fc 100644 ---- a/meson.build -+++ b/meson.build -@@ -12,8 +12,8 @@ libdir = join_paths(prefix, get_option('libdir')) - libexecdir = join_paths(prefix, get_option('libexecdir')) - localedir = join_paths(prefix, get_option('localedir')) - --installed_tests_metadir = join_paths(datadir, 'installed-tests', meson.project_name()) --installed_tests_execdir = join_paths(libexecdir, 'installed-tests', meson.project_name()) -+installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name()) -+installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name()) - - cc = meson.get_compiler('c') - host_system = host_machine.system() -diff --git a/meson_options.txt b/meson_options.txt -index c566ccd..80f7c33 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -10,6 +10,7 @@ option('environment_proxy', type: 'feature', value: 'auto', description: 'suppor - option('libproxy', type: 'feature', value: 'auto', description: 'support for libproxy proxy configration') - option('gnome_proxy', type: 'feature', value: 'auto', description: 'support for GNOME desktop proxy configuration') - option('installed_tests', type: 'boolean', value: false, description: 'enable installed tests') -+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') - option('debug_logs', type: 'boolean', value: false, description: 'enable debug log messages (slow)') - - # Deprecated, use -Ddefault_library=static instead. diff --git a/pkgs/development/libraries/glib-testing/default.nix b/pkgs/development/libraries/glib-testing/default.nix deleted file mode 100644 index d77a5418a13e..000000000000 --- a/pkgs/development/libraries/glib-testing/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv -, fetchFromGitLab -, meson -, ninja -, pkg-config -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, glib -, nixosTests -}: - -stdenv.mkDerivation rec { - pname = "glib-testing"; - version = "0.1.1"; - - outputs = [ "out" "dev" "devdoc" "installedTests" ]; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "pwithnall"; - repo = "libglib-testing"; - rev = version; - sha256 = "U3epLDdLES7MA71z7Q1WXMjzySTFERWBU0u8poObbEo="; - }; - - patches = [ - # allow installing installed tests to a separate output - ./installed-tests-path.patch - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - ]; - - propagatedBuildInputs = [ - glib - ]; - - mesonFlags = [ - "-Dinstalled_tests=true" - "-Dinstalled_test_prefix=${placeholder "installedTests"}" - ]; - - passthru = { - tests = { - installedTests = nixosTests.installed-tests.glib-testing; - }; - }; - - meta = with lib; { - description = "Test library providing test harnesses and mock classes complementing the classes provided by GLib"; - homepage = "https://gitlab.gnome.org/pwithnall/libglib-testing"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/glib-testing/installed-tests-path.patch b/pkgs/development/libraries/glib-testing/installed-tests-path.patch deleted file mode 100644 index 37ee2a988899..000000000000 --- a/pkgs/development/libraries/glib-testing/installed-tests-path.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/libglib-testing/tests/meson.build b/libglib-testing/tests/meson.build -index 4789c63..2b8525d 100644 ---- a/libglib-testing/tests/meson.build -+++ b/libglib-testing/tests/meson.build -@@ -15,9 +15,9 @@ test_programs = [ - ['signal-logger', [], deps], - ] - --installed_tests_metadir = join_paths(datadir, 'installed-tests', -+installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', - 'libglib-testing-' + libglib_testing_api_version) --installed_tests_execdir = join_paths(libexecdir, 'installed-tests', -+installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', - 'libglib-testing-' + libglib_testing_api_version) - - foreach program: test_programs -@@ -48,4 +48,4 @@ foreach program: test_programs - exe, - env: envs, - ) --endforeach -\ No newline at end of file -+endforeach -diff --git a/meson_options.txt b/meson_options.txt -index e69263e..7cb1ee8 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -4,3 +4,4 @@ option( - value: false, - description: 'enable installed tests' - ) -+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 22df229d47cc..d12b1be1b5b4 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -2,7 +2,6 @@ , lib , stdenv , fetchurl -, fetchpatch , gettext , meson , ninja @@ -23,6 +22,8 @@ , makeHardcodeGsettingsPatch , testers , gobject-introspection +, libsystemtap +, libsysprof-capture , mesonEmulatorHook , withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages && @@ -30,22 +31,9 @@ stdenv.hostPlatform.isLittleEndian == stdenv.buildPlatform.isLittleEndian }: -assert stdenv.isLinux -> util-linuxMinimal != null; +assert stdenv.hostPlatform.isLinux -> util-linuxMinimal != null; let - # Some packages don't get "Cflags" from pkg-config correctly - # and then fail to build when directly including like <glib/...>. - # This is intended to be run in postInstall of any package - # which has $out/include/ containing just some disjunct directories. - flattenInclude = '' - for dir in "''${!outputInclude}"/include/*; do - cp -r "$dir"/* "''${!outputInclude}/include/" - rm -r "$dir" - ln -s . "$dir" - done - ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true - ''; - gobject-introspection' = buildPackages.gobject-introspection.override { propagateFullGlib = false; # Avoid introducing cairo, which enables gobjectSupport by default. @@ -57,24 +45,25 @@ let else if (stdenv.hostPlatform.extensions.library == ".a") then "2.0.a" else if (stdenv.hostPlatform.extensions.library == ".dll") then "2.0-0.dll" else "2.0-0.lib"; + + systemtap' = buildPackages.linuxPackages.systemtap.override { withStap = false; }; + withDtrace = + lib.meta.availableOn stdenv.buildPlatform systemtap' && + # dtrace support requires sys/sdt.h header + lib.meta.availableOn stdenv.hostPlatform libsystemtap; in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.80.4"; + version = "2.82.1"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - hash = "sha256-JOApxd/JtE5Fc2l63zMHipgnxIk4VVAEs7kJb6TqA08="; + hash = "sha256-R4Y0RAv1LuTsRCjVWHhzmMC+awQ8UhvrMIM0s9tEiaY="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./darwin-compilation.patch - # FIXME: remove when https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4088 is merged and is in the tagged release - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/glib/-/commit/9d0988ca62ee96e09aa76abbd65ff192cfce6858.patch"; - hash = "sha256-JrR3Ba6L+3M0Nt8DgHmPG8uKtx7hOgUp7np08ATIzjA="; - }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./quark_init_on_demand.patch ./gobject_init_on_demand.patch @@ -99,9 +88,12 @@ stdenv.mkDerivation (finalAttrs: { # GLib contains many binaries used for different purposes; # we will install them to different outputs: - # 1. Tools for desktop environment ($bin) + # 1. Tools for desktop environment and introspection ($bin) # * gapplication (non-darwin) # * gdbus + # * gi-compile-repository + # * gi-decompile-typelib + # * gi-inspect-typelib # * gio # * gio-launch-desktop (symlink to $out) # * gsettings @@ -126,9 +118,6 @@ stdenv.mkDerivation (finalAttrs: { # and by default meson installs in to $out/share/gdb/auto-load # which does not help ./gdb_script.patch - - # glib assumes that `RTLD_LOCAL` is defined to `0`, which is true on Linux and FreeBSD but not on Darwin. - ./gmodule-rtld_local.patch ]; outputs = [ "bin" "out" "dev" "devdoc" ]; @@ -137,15 +126,18 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ finalAttrs.setupHook + libsysprof-capture pcre2 ] ++ lib.optionals (!stdenv.hostPlatform.isWindows) [ bash gnum4 # install glib-gettextize and m4 macros for other apps to use ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals withDtrace [ + libsystemtap + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libselinux util-linuxMinimal # for libmount - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Carbon Cocoa CoreFoundation CoreServices Foundation ]); @@ -171,12 +163,17 @@ stdenv.mkDerivation (finalAttrs: { gobject-introspection' ] ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook + ] ++ lib.optionals withDtrace [ + systemtap' # for dtrace ]; propagatedBuildInputs = [ zlib libffi gettext libiconv ]; mesonFlags = [ + "-Dglib_debug=disabled" # https://gitlab.gnome.org/GNOME/glib/-/issues/3421#note_2206315 "-Ddocumentation=true" # gvariant specification can be built without gi-docgen + (lib.mesonEnable "dtrace" withDtrace) + (lib.mesonEnable "systemtap" withDtrace) # requires dtrace option to be enabled "-Dnls=enabled" "-Ddevbindir=${placeholder "dev"}/bin" (lib.mesonEnable "introspection" withIntrospection) @@ -185,7 +182,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dtests=${lib.boolToString (!stdenv.hostPlatform.isStatic)}" ] ++ lib.optionals (!lib.meta.availableOn stdenv.hostPlatform elfutils) [ "-Dlibelf=disabled" - ] ++ lib.optionals stdenv.isFreeBSD [ + ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ "-Db_lundef=false" "-Dxattr=false" ]; @@ -291,7 +288,7 @@ stdenv.mkDerivation (finalAttrs: { rm $out/lib/libglib-${librarySuffix} ''; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; passthru = rec { gioModuleDir = "lib/gio/modules"; @@ -306,7 +303,6 @@ stdenv.mkDerivation (finalAttrs: { pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; - inherit flattenInclude; updateScript = gnome.updateScript { packageName = "glib"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/glib/gmodule-rtld_local.patch b/pkgs/development/libraries/glib/gmodule-rtld_local.patch deleted file mode 100644 index abbf19d70b20..000000000000 --- a/pkgs/development/libraries/glib/gmodule-rtld_local.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c -index 6d1c5fab7..b21773bca 100644 ---- a/gmodule/gmodule-dl.c -+++ b/gmodule/gmodule-dl.c -@@ -136,7 +136,7 @@ _g_module_open (const gchar *file_name, - - lock_dlerror (); - handle = dlopen (file_name, -- (bind_local ? 0 : RTLD_GLOBAL) | (bind_lazy ? RTLD_LAZY : RTLD_NOW)); -+ (bind_local ? RTLD_LOCAL : RTLD_GLOBAL) | (bind_lazy ? RTLD_LAZY : RTLD_NOW)); - if (!handle) - { - const gchar *message = fetch_dlerror (TRUE); diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh index 8ead5510ec4f..9eabf8a679a9 100644 --- a/pkgs/development/libraries/glib/setup-hook.sh +++ b/pkgs/development/libraries/glib/setup-hook.sh @@ -12,7 +12,7 @@ addEnvHooks "$targetOffset" make_glib_find_gsettings_schemas glibPreInstallPhase() { makeFlagsArray+=("gsettingsschemadir=${!outputLib}/share/gsettings-schemas/$name/glib-2.0/schemas/") } -preInstallPhases+=" glibPreInstallPhase" +appendToVar preInstallPhases glibPreInstallPhase glibPreFixupPhase() { # Move gschemas in case the install flag didn't help diff --git a/pkgs/development/libraries/glib/split-dev-programs.patch b/pkgs/development/libraries/glib/split-dev-programs.patch index b32fccb8379f..078fc6a7f342 100644 --- a/pkgs/development/libraries/glib/split-dev-programs.patch +++ b/pkgs/development/libraries/glib/split-dev-programs.patch @@ -183,10 +183,10 @@ index 2129aaf8a..da8462428 100644 install_tag : 'bin-devel', dependencies : [libglib_dep, libgobject_dep]) -diff --git a/meson_options.txt b/meson_options.txt +diff --git a/meson.options b/meson.options index 69a2135bc..cfe14bb09 100644 ---- a/meson_options.txt -+++ b/meson_options.txt +--- a/meson.options ++++ b/meson.options @@ -4,6 +4,11 @@ option('runtime_libdir', description : 'install runtime libraries relative to libdir', deprecated: true) diff --git a/pkgs/development/libraries/glibc/2.39-master.patch b/pkgs/development/libraries/glibc/2.39-master.patch deleted file mode 100644 index 88e629981e3c..000000000000 --- a/pkgs/development/libraries/glibc/2.39-master.patch +++ /dev/null @@ -1,10857 +0,0 @@ -commit 6d1e3fb07b45e2e31e469b16cf21b24bccf8914c -Author: Andreas K. Hüttel <dilfridge@gentoo.org> -Date: Wed Jan 31 02:12:43 2024 +0100 - - Replace advisories directory - - Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> - -diff --git a/advisories/GLIBC-SA-2023-0001 b/advisories/GLIBC-SA-2023-0001 -deleted file mode 100644 -index 3d19c91b6a..0000000000 ---- a/advisories/GLIBC-SA-2023-0001 -+++ /dev/null -@@ -1,14 +0,0 @@ --printf: incorrect output for integers with thousands separator and width field -- --When the printf family of functions is called with a format specifier --that uses an <apostrophe> (enable grouping) and a minimum width --specifier, the resulting output could be larger than reasonably expected --by a caller that computed a tight bound on the buffer size. The --resulting larger than expected output could result in a buffer overflow --in the printf family of functions. -- --CVE-Id: CVE-2023-25139 --Public-Date: 2023-02-02 --Vulnerable-Commit: e88b9f0e5cc50cab57a299dc7efe1a4eb385161d (2.37) --Fix-Commit: c980549cc6a1c03c23cc2fe3e7b0fe626a0364b0 (2.38) --Fix-Commit: 07b9521fc6369d000216b96562ff7c0ed32a16c4 (2.37-4) -diff --git a/advisories/GLIBC-SA-2023-0002 b/advisories/GLIBC-SA-2023-0002 -deleted file mode 100644 -index 5122669a64..0000000000 ---- a/advisories/GLIBC-SA-2023-0002 -+++ /dev/null -@@ -1,15 +0,0 @@ --getaddrinfo: Stack read overflow in no-aaaa mode -- --If the system is configured in no-aaaa mode via /etc/resolv.conf, --getaddrinfo is called for the AF_UNSPEC address family, and a DNS --response is received over TCP that is larger than 2048 bytes, --getaddrinfo may potentially disclose stack contents via the returned --address data, or crash. -- --CVE-Id: CVE-2023-4527 --Public-Date: 2023-09-12 --Vulnerable-Commit: f282cdbe7f436c75864e5640a409a10485e9abb2 (2.36) --Fix-Commit: bd77dd7e73e3530203be1c52c8a29d08270cb25d (2.39) --Fix-Commit: 4ea972b7edd7e36610e8cde18bf7a8149d7bac4f (2.36-113) --Fix-Commit: b7529346025a130fee483d42178b5c118da971bb (2.37-38) --Fix-Commit: b25508dd774b617f99419bdc3cf2ace4560cd2d6 (2.38-19) -diff --git a/advisories/GLIBC-SA-2023-0003 b/advisories/GLIBC-SA-2023-0003 -deleted file mode 100644 -index d3aef80348..0000000000 ---- a/advisories/GLIBC-SA-2023-0003 -+++ /dev/null -@@ -1,15 +0,0 @@ --getaddrinfo: Potential use-after-free -- --When an NSS plugin only implements the _gethostbyname2_r and --_getcanonname_r callbacks, getaddrinfo could use memory that was freed --during buffer resizing, potentially causing a crash or read or write to --arbitrary memory. -- --CVE-Id: CVE-2023-4806 --Public-Date: 2023-09-12 --Fix-Commit: 973fe93a5675c42798b2161c6f29c01b0e243994 (2.39) --Fix-Commit: e09ee267c03e3150c2c9ba28625ab130705a485e (2.34-420) --Fix-Commit: e3ccb230a961b4797510e6a1f5f21fd9021853e7 (2.35-270) --Fix-Commit: a9728f798ec7f05454c95637ee6581afaa9b487d (2.36-115) --Fix-Commit: 6529a7466c935f36e9006b854d6f4e1d4876f942 (2.37-39) --Fix-Commit: 00ae4f10b504bc4564e9f22f00907093f1ab9338 (2.38-20) -diff --git a/advisories/GLIBC-SA-2023-0004 b/advisories/GLIBC-SA-2023-0004 -deleted file mode 100644 -index 5286a7aa54..0000000000 ---- a/advisories/GLIBC-SA-2023-0004 -+++ /dev/null -@@ -1,16 +0,0 @@ --tunables: local privilege escalation through buffer overflow -- --If a tunable of the form NAME=NAME=VAL is passed in the environment of a --setuid program and NAME is valid, it may result in a buffer overflow, --which could be exploited to achieve escalated privileges. This flaw was --introduced in glibc 2.34. -- --CVE-Id: CVE-2023-4911 --Public-Date: 2023-10-03 --Vulnerable-Commit: 2ed18c5b534d9e92fc006202a5af0df6b72e7aca (2.34) --Fix-Commit: 1056e5b4c3f2d90ed2b4a55f96add28da2f4c8fa (2.39) --Fix-Commit: dcc367f148bc92e7f3778a125f7a416b093964d9 (2.34-423) --Fix-Commit: c84018a05aec80f5ee6f682db0da1130b0196aef (2.35-274) --Fix-Commit: 22955ad85186ee05834e47e665056148ca07699c (2.36-118) --Fix-Commit: b4e23c75aea756b4bddc4abcf27a1c6dca8b6bd3 (2.37-45) --Fix-Commit: 750a45a783906a19591fb8ff6b7841470f1f5701 (2.38-27) -diff --git a/advisories/GLIBC-SA-2023-0005 b/advisories/GLIBC-SA-2023-0005 -deleted file mode 100644 -index cc4eb90b82..0000000000 ---- a/advisories/GLIBC-SA-2023-0005 -+++ /dev/null -@@ -1,18 +0,0 @@ --getaddrinfo: DoS due to memory leak -- --The fix for CVE-2023-4806 introduced a memory leak when an application --calls getaddrinfo for AF_INET6 with AI_CANONNAME, AI_ALL and AI_V4MAPPED --flags set. -- --CVE-Id: CVE-2023-5156 --Public-Date: 2023-09-25 --Vulnerable-Commit: e09ee267c03e3150c2c9ba28625ab130705a485e (2.34-420) --Vulnerable-Commit: e3ccb230a961b4797510e6a1f5f21fd9021853e7 (2.35-270) --Vulnerable-Commit: a9728f798ec7f05454c95637ee6581afaa9b487d (2.36-115) --Vulnerable-Commit: 6529a7466c935f36e9006b854d6f4e1d4876f942 (2.37-39) --Vulnerable-Commit: 00ae4f10b504bc4564e9f22f00907093f1ab9338 (2.38-20) --Fix-Commit: 8006457ab7e1cd556b919f477348a96fe88f2e49 (2.34-421) --Fix-Commit: 17092c0311f954e6f3c010f73ce3a78c24ac279a (2.35-272) --Fix-Commit: 856bac55f98dc840e7c27cfa82262b933385de90 (2.36-116) --Fix-Commit: 4473d1b87d04b25cdd0e0354814eeaa421328268 (2.37-42) --Fix-Commit: 5ee59ca371b99984232d7584fe2b1a758b4421d3 (2.38-24) -diff --git a/advisories/GLIBC-SA-2024-0001 b/advisories/GLIBC-SA-2024-0001 -deleted file mode 100644 -index 28931c75ae..0000000000 ---- a/advisories/GLIBC-SA-2024-0001 -+++ /dev/null -@@ -1,15 +0,0 @@ --syslog: Heap buffer overflow in __vsyslog_internal -- --__vsyslog_internal did not handle a case where printing a SYSLOG_HEADER --containing a long program name failed to update the required buffer --size, leading to the allocation and overflow of a too-small buffer on --the heap. -- --CVE-Id: CVE-2023-6246 --Public-Date: 2024-01-30 --Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37) --Fix-Commit: 6bd0e4efcc78f3c0115e5ea9739a1642807450da (2.39) --Fix-Commit: 23514c72b780f3da097ecf33a793b7ba9c2070d2 (2.38-42) --Fix-Commit: 97a4292aa4a2642e251472b878d0ec4c46a0e59a (2.37-57) --Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16) --Fix-Commit: d1a83b6767f68b3cb5b4b4ea2617254acd040c82 (2.36-126) -diff --git a/advisories/GLIBC-SA-2024-0002 b/advisories/GLIBC-SA-2024-0002 -deleted file mode 100644 -index 940bfcf2fc..0000000000 ---- a/advisories/GLIBC-SA-2024-0002 -+++ /dev/null -@@ -1,15 +0,0 @@ --syslog: Heap buffer overflow in __vsyslog_internal -- --__vsyslog_internal used the return value of snprintf/vsnprintf to --calculate buffer sizes for memory allocation. If these functions (for --any reason) failed and returned -1, the resulting buffer would be too --small to hold output. -- --CVE-Id: CVE-2023-6779 --Public-Date: 2024-01-30 --Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37) --Fix-Commit: 7e5a0c286da33159d47d0122007aac016f3e02cd (2.39) --Fix-Commit: d0338312aace5bbfef85e03055e1212dd0e49578 (2.38-43) --Fix-Commit: 67062eccd9a65d7fda9976a56aeaaf6c25a80214 (2.37-58) --Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16) --Fix-Commit: 2bc9d7c002bdac38b5c2a3f11b78e309d7765b83 (2.36-127) -diff --git a/advisories/GLIBC-SA-2024-0003 b/advisories/GLIBC-SA-2024-0003 -deleted file mode 100644 -index b43a5150ab..0000000000 ---- a/advisories/GLIBC-SA-2024-0003 -+++ /dev/null -@@ -1,13 +0,0 @@ --syslog: Integer overflow in __vsyslog_internal -- --__vsyslog_internal calculated a buffer size by adding two integers, but --did not first check if the addition would overflow. -- --CVE-Id: CVE-2023-6780 --Public-Date: 2024-01-30 --Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37) --Fix-Commit: ddf542da94caf97ff43cc2875c88749880b7259b (2.39) --Fix-Commit: d37c2b20a4787463d192b32041c3406c2bd91de0 (2.38-44) --Fix-Commit: 2b58cba076e912961ceaa5fa58588e4b10f791c0 (2.37-59) --Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16) --Fix-Commit: b9b7d6a27aa0632f334352fa400771115b3c69b7 (2.36-128) -diff --git a/advisories/README b/advisories/README -deleted file mode 100644 -index 94e68b1350..0000000000 ---- a/advisories/README -+++ /dev/null -@@ -1,73 +0,0 @@ --GNU C Library Security Advisory Format --====================================== -- --Security advisories in this directory follow a simple git commit log --format, with a heading and free-format description augmented with tags --to allow parsing key information. References to code changes are --specific to the glibc repository and follow a specific format: -- -- Tag-name: <commit-ref> (release-version) -- --The <commit-ref> indicates a specific commit in the repository. The --release-version indicates the publicly consumable release in which this --commit is known to exist. The release-version is derived from the --git-describe format, (i.e. stripped out from glibc-2.34.NNN-gxxxx) and --is of the form 2.34-NNN. If the -NNN suffix is absent, it means that --the change is in that release tarball, otherwise the change is on the --release/2.YY/master branch and not in any released tarball. -- --The following tags are currently being used: -- --CVE-Id: --This is the CVE-Id assigned under the CVE Program --(https://www.cve.org/). -- --Public-Date: --The date this issue became publicly known. -- --Vulnerable-Commit: --The commit that introduced this vulnerability. There could be multiple --entries, one for each release branch in the glibc repository; the --release-version portion of this tag should tell you which branch this is --on. -- --Fix-Commit: --The commit that fixed this vulnerability. There could be multiple --entries for each release branch in the glibc repository, indicating that --all of those commits contributed to fixing that issue in each of those --branches. -- --Adding an Advisory -------------------- -- --An advisory for a CVE needs to be added on the master branch in two steps: -- --1. Add the text of the advisory without any Fix-Commit tags along with -- the fix for the CVE. Add the Vulnerable-Commit tag, if applicable. -- The advisories directory does not exist in release branches, so keep -- the advisory text commit distinct from the code changes, to ease -- backports. Ask for the GLIBC-SA advisory number from the security -- team. -- --2. Finish all backports on release branches and then back on the msater -- branch, add all commit refs to the advisory using the Fix-Commit -- tags. Don't bother adding the release-version subscript since the -- next step will overwrite it. -- --3. Run the process-advisories.sh script in the scripts directory on the -- advisory: -- -- scripts/process-advisories.sh update GLIBC-SA-YYYY-NNNN -- -- (replace YYYY-NNNN with the actual advisory number). -- --4. Verify the updated advisory and push the result. -- --Getting a NEWS snippet from advisories ---------------------------------------- -- --Run: -- -- scripts/process-advisories.sh news -- --and copy the content into the NEWS file. - -commit 63295e4fda1f6dab4bf7442706fe303bf283036c -Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> -Date: Mon Feb 5 16:10:24 2024 +0000 - - arm: Remove wrong ldr from _dl_start_user (BZ 31339) - - The commit 49d877a80b29d3002887b084eec6676d9f5fec18 (arm: Remove - _dl_skip_args usage) removed the _SKIP_ARGS literal, which was - previously loader to r4 on loader _start. However, the cleanup did not - remove the following 'ldr r4, [sl, r4]' on _dl_start_user, used to check - to skip the arguments after ld self-relocations. - - In my testing, the kernel initially set r4 to 0, which makes the - ldr instruction just read the _GLOBAL_OFFSET_TABLE_. However, since r4 - is a callee-saved register; a different runtime might not zero - initialize it and thus trigger an invalid memory access. - - Checked on arm-linux-gnu. - - Reported-by: Adrian Ratiu <adrian.ratiu@collabora.com> - Reviewed-by: Szabolcs Nagy <szabolcs.nagy@arm.com> - (cherry picked from commit 1e25112dc0cb2515d27d8d178b1ecce778a9d37a) - -diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h -index b857bbc868..dd1a0f6b6e 100644 ---- a/sysdeps/arm/dl-machine.h -+++ b/sysdeps/arm/dl-machine.h -@@ -139,7 +139,6 @@ _start:\n\ - _dl_start_user:\n\ - adr r6, .L_GET_GOT\n\ - add sl, sl, r6\n\ -- ldr r4, [sl, r4]\n\ - @ save the entry point in another register\n\ - mov r6, r0\n\ - @ get the original arg count\n\ - -commit 312e159626b67fe11f39e83e222cf4348a3962f3 -Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> -Date: Thu Feb 1 14:29:53 2024 -0300 - - mips: FIx clone3 implementation (BZ 31325) - - For o32 we need to setup a minimal stack frame to allow cprestore - on __thread_start_clone3 (which instruct the linker to save the - gp for PIC). Also, there is no guarantee by kABI that $8 will be - preserved after syscall execution, so we need to save it on the - provided stack. - - Checked on mipsel-linux-gnu. - - Reported-by: Khem Raj <raj.khem@gmail.com> - Tested-by: Khem Raj <raj.khem@gmail.com> - (cherry picked from commit bbd248ac0d75efdef8fe61ea69b1fb25fb95b6e7) - -diff --git a/sysdeps/unix/sysv/linux/mips/clone3.S b/sysdeps/unix/sysv/linux/mips/clone3.S -index e9fec2fa47..481b8ae963 100644 ---- a/sysdeps/unix/sysv/linux/mips/clone3.S -+++ b/sysdeps/unix/sysv/linux/mips/clone3.S -@@ -37,11 +37,6 @@ - - .text - .set nomips16 --#if _MIPS_SIM == _ABIO32 --# define EXTRA_LOCALS 1 --#else --# define EXTRA_LOCALS 0 --#endif - #define FRAMESZ ((NARGSAVE*SZREG)+ALSZ)&ALMASK - GPOFF= FRAMESZ-(1*SZREG) - NESTED(__clone3, SZREG, sp) -@@ -68,8 +63,31 @@ NESTED(__clone3, SZREG, sp) - beqz a0, L(error) /* No NULL cl_args pointer. */ - beqz a2, L(error) /* No NULL function pointer. */ - -+#if _MIPS_SIM == _ABIO32 -+ /* Both stack and stack_size on clone_args are defined as uint64_t, and -+ there is no need to handle values larger than to 32 bits for o32. */ -+# if __BYTE_ORDER == __BIG_ENDIAN -+# define CL_STACKPOINTER_OFFSET 44 -+# define CL_STACKSIZE_OFFSET 52 -+# else -+# define CL_STACKPOINTER_OFFSET 40 -+# define CL_STACKSIZE_OFFSET 48 -+# endif -+ -+ /* For o32 we need to setup a minimal stack frame to allow cprestore -+ on __thread_start_clone3. Also there is no guarantee by kABI that -+ $8 will be preserved after syscall execution (so we need to save it -+ on the provided stack). */ -+ lw t0, CL_STACKPOINTER_OFFSET(a0) /* Load the stack pointer. */ -+ lw t1, CL_STACKSIZE_OFFSET(a0) /* Load the stack_size. */ -+ addiu t1, -32 /* Update the stack size. */ -+ addu t2, t1, t0 /* Calculate the thread stack. */ -+ sw a3, 0(t2) /* Save argument pointer. */ -+ sw t1, CL_STACKSIZE_OFFSET(a0) /* Save the new stack size. */ -+#else - move $8, a3 /* a3 is set to 0/1 for syscall success/error - while a4/$8 is returned unmodified. */ -+#endif - - /* Do the system call, the kernel expects: - v0: system call number -@@ -125,7 +143,11 @@ L(thread_start_clone3): - - /* Restore the arg for user's function. */ - move t9, a2 /* Function pointer. */ -+#if _MIPS_SIM == _ABIO32 -+ PTR_L a0, 0(sp) -+#else - move a0, $8 /* Argument pointer. */ -+#endif - - /* Call the user's function. */ - jal t9 - -commit d0724994de40934c552f1f68de89053848a44927 -Author: Xi Ruoyao <xry111@xry111.site> -Date: Thu Feb 22 21:26:55 2024 +0100 - - math: Update mips64 ulps - - Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> - (cherry picked from commit e2a65ecc4b30a797df7dc6529f09b712aa256029) - -diff --git a/sysdeps/mips/mips64/libm-test-ulps b/sysdeps/mips/mips64/libm-test-ulps -index 78969745b2..933aba4735 100644 ---- a/sysdeps/mips/mips64/libm-test-ulps -+++ b/sysdeps/mips/mips64/libm-test-ulps -@@ -1066,17 +1066,17 @@ double: 1 - ldouble: 1 - - Function: "j0": --double: 2 -+double: 3 - float: 9 - ldouble: 2 - - Function: "j0_downward": --double: 5 -+double: 6 - float: 9 - ldouble: 9 - - Function: "j0_towardzero": --double: 6 -+double: 7 - float: 9 - ldouble: 9 - -@@ -1146,6 +1146,7 @@ float: 6 - ldouble: 8 - - Function: "log": -+double: 1 - float: 1 - ldouble: 1 - - -commit e0910f1d3278f05439fb434ee528fc9be1b6bd5e -Author: Stefan Liebler <stli@linux.ibm.com> -Date: Thu Feb 22 15:03:27 2024 +0100 - - S390: Do not clobber r7 in clone [BZ #31402] - - Starting with commit e57d8fc97b90127de4ed3e3a9cdf663667580935 - "S390: Always use svc 0" - clone clobbers the call-saved register r7 in error case: - function or stack is NULL. - - This patch restores the saved registers also in the error case. - Furthermore the existing test misc/tst-clone is extended to check - all error cases and that clone does not clobber registers in this - error case. - - (cherry picked from commit 02782fd12849b6673cb5c2728cb750e8ec295aa3) - -diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/clone.S b/sysdeps/unix/sysv/linux/s390/s390-32/clone.S -index 4c882ef2ee..a7a863242c 100644 ---- a/sysdeps/unix/sysv/linux/s390/s390-32/clone.S -+++ b/sysdeps/unix/sysv/linux/s390/s390-32/clone.S -@@ -53,6 +53,7 @@ ENTRY(__clone) - br %r14 - error: - lhi %r2,-EINVAL -+ lm %r6,%r7,24(%r15) /* Load registers. */ - j SYSCALL_ERROR_LABEL - PSEUDO_END (__clone) - -diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/clone.S b/sysdeps/unix/sysv/linux/s390/s390-64/clone.S -index 4eb104be71..c552a6b8de 100644 ---- a/sysdeps/unix/sysv/linux/s390/s390-64/clone.S -+++ b/sysdeps/unix/sysv/linux/s390/s390-64/clone.S -@@ -54,6 +54,7 @@ ENTRY(__clone) - br %r14 - error: - lghi %r2,-EINVAL -+ lmg %r6,%r7,48(%r15) /* Restore registers. */ - jg SYSCALL_ERROR_LABEL - PSEUDO_END (__clone) - -diff --git a/sysdeps/unix/sysv/linux/tst-clone.c b/sysdeps/unix/sysv/linux/tst-clone.c -index 470676ab2b..2bc7124983 100644 ---- a/sysdeps/unix/sysv/linux/tst-clone.c -+++ b/sysdeps/unix/sysv/linux/tst-clone.c -@@ -16,12 +16,16 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --/* BZ #2386 */ -+/* BZ #2386, BZ #31402 */ - #include <errno.h> - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> - #include <sched.h> -+#include <stackinfo.h> /* For _STACK_GROWS_{UP,DOWN}. */ -+#include <support/check.h> -+ -+volatile unsigned v = 0xdeadbeef; - - int child_fn(void *arg) - { -@@ -30,22 +34,67 @@ int child_fn(void *arg) - } - - static int --do_test (void) -+__attribute__((noinline)) -+do_clone (int (*fn)(void *), void *stack) - { - int result; -+ unsigned int a = v; -+ unsigned int b = v; -+ unsigned int c = v; -+ unsigned int d = v; -+ unsigned int e = v; -+ unsigned int f = v; -+ unsigned int g = v; -+ unsigned int h = v; -+ unsigned int i = v; -+ unsigned int j = v; -+ unsigned int k = v; -+ unsigned int l = v; -+ unsigned int m = v; -+ unsigned int n = v; -+ unsigned int o = v; -+ -+ result = clone (fn, stack, 0, NULL); -+ -+ /* Check that clone does not clobber call-saved registers. */ -+ TEST_VERIFY (a == v && b == v && c == v && d == v && e == v && f == v -+ && g == v && h == v && i == v && j == v && k == v && l == v -+ && m == v && n == v && o == v); -+ -+ return result; -+} -+ -+static void -+__attribute__((noinline)) -+do_test_single (int (*fn)(void *), void *stack) -+{ -+ printf ("%s (fn=%p, stack=%p)\n", __FUNCTION__, fn, stack); -+ errno = 0; -+ -+ int result = do_clone (fn, stack); -+ -+ TEST_COMPARE (errno, EINVAL); -+ TEST_COMPARE (result, -1); -+} - -- result = clone (child_fn, NULL, 0, NULL); -+static int -+do_test (void) -+{ -+ char st[128 * 1024] __attribute__ ((aligned)); -+ void *stack = NULL; -+#if _STACK_GROWS_DOWN -+ stack = st + sizeof (st); -+#elif _STACK_GROWS_UP -+ stack = st; -+#else -+# error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP" -+#endif - -- if (errno != EINVAL || result != -1) -- { -- printf ("FAIL: clone()=%d (wanted -1) errno=%d (wanted %d)\n", -- result, errno, EINVAL); -- return 1; -- } -+ do_test_single (child_fn, NULL); -+ do_test_single (NULL, stack); -+ do_test_single (NULL, NULL); - -- puts ("All OK"); - return 0; - } - --#define TEST_FUNCTION do_test () --#include "../test-skeleton.c" -+#include <support/test-driver.c> - -commit 1b9c1a0047fb26a65a9b2a7b8cd977243f7d353c -Author: Jakub Jelinek <jakub@redhat.com> -Date: Wed Jan 31 19:17:27 2024 +0100 - - Use gcc __builtin_stdc_* builtins in stdbit.h if possible - - The following patch uses the GCC 14 __builtin_stdc_* builtins in stdbit.h - for the type-generic macros, so that when compiled with GCC 14 or later, - it supports not just 8/16/32/64-bit unsigned integers, but also 128-bit - (if target supports them) and unsigned _BitInt (any supported precision). - And so that the macros don't expand arguments multiple times and can be - evaluated in constant expressions. - - The new testcase is gcc's gcc/testsuite/gcc.dg/builtin-stdc-bit-1.c - adjusted to test stdbit.h and the type-generic macros in there instead - of the builtins and adjusted to use glibc test framework rather than - gcc style tests with __builtin_abort (). - - Signed-off-by: Jakub Jelinek <jakub@redhat.com> - Reviewed-by: Joseph Myers <josmyers@redhat.com> - (cherry picked from commit da89496337b97e6a2aaf1e81d55cf998f6db1070) - -diff --git a/manual/stdbit.texi b/manual/stdbit.texi -index fe41c671d8..6c75ed9a20 100644 ---- a/manual/stdbit.texi -+++ b/manual/stdbit.texi -@@ -32,7 +32,13 @@ and @code{unsigned long long int}. In addition, there is a - corresponding type-generic macro (not listed below), named the same as - the functions but without any suffix such as @samp{_uc}. The - type-generic macro can only be used with an argument of an unsigned --integer type with a width of 8, 16, 32 or 64 bits. -+integer type with a width of 8, 16, 32 or 64 bits, or when using -+a compiler with support for -+@uref{https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html,@code{__builtin_stdc_bit_ceil}}, -+etc.@:, built-in functions such as GCC 14.1 or later -+any unsigned integer type those built-in functions support. -+In GCC 14.1 that includes support for @code{unsigned __int128} and -+@code{unsigned _BitInt(@var{n})} if supported by the target. - - @deftypefun {unsigned int} stdc_leading_zeros_uc (unsigned char @var{x}) - @deftypefunx {unsigned int} stdc_leading_zeros_us (unsigned short @var{x}) -diff --git a/stdlib/Makefile b/stdlib/Makefile -index d587f054d1..9898cc5d8a 100644 ---- a/stdlib/Makefile -+++ b/stdlib/Makefile -@@ -308,6 +308,7 @@ tests := \ - tst-setcontext10 \ - tst-setcontext11 \ - tst-stdbit-Wconversion \ -+ tst-stdbit-builtins \ - tst-stdc_bit_ceil \ - tst-stdc_bit_floor \ - tst-stdc_bit_width \ -diff --git a/stdlib/stdbit.h b/stdlib/stdbit.h -index f334eb174d..2801590c63 100644 ---- a/stdlib/stdbit.h -+++ b/stdlib/stdbit.h -@@ -64,9 +64,13 @@ extern unsigned int stdc_leading_zeros_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_leading_zeros_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_leading_zeros(x) \ -+#if __glibc_has_builtin (__builtin_stdc_leading_zeros) -+# define stdc_leading_zeros(x) (__builtin_stdc_leading_zeros (x)) -+#else -+# define stdc_leading_zeros(x) \ - (stdc_leading_zeros_ull (x) \ - - (unsigned int) (8 * (sizeof (0ULL) - sizeof (x)))) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) - static __always_inline unsigned int -@@ -116,9 +120,13 @@ extern unsigned int stdc_leading_ones_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_leading_ones_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_leading_ones(x) \ -+#if __glibc_has_builtin (__builtin_stdc_leading_ones) -+# define stdc_leading_ones(x) (__builtin_stdc_leading_ones (x)) -+#else -+# define stdc_leading_ones(x) \ - (stdc_leading_ones_ull ((unsigned long long int) (x) \ - << 8 * (sizeof (0ULL) - sizeof (x)))) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) - static __always_inline unsigned int -@@ -168,11 +176,15 @@ extern unsigned int stdc_trailing_zeros_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_trailing_zeros_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_trailing_zeros(x) \ -+#if __glibc_has_builtin (__builtin_stdc_trailing_zeros) -+# define stdc_trailing_zeros(x) (__builtin_stdc_trailing_zeros (x)) -+#else -+# define stdc_trailing_zeros(x) \ - (sizeof (x) == 8 ? stdc_trailing_zeros_ull (x) \ - : sizeof (x) == 4 ? stdc_trailing_zeros_ui (x) \ - : sizeof (x) == 2 ? stdc_trailing_zeros_us (__pacify_uint16 (x)) \ - : stdc_trailing_zeros_uc (__pacify_uint8 (x))) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_ctzll) - static __always_inline unsigned int -@@ -222,7 +234,11 @@ extern unsigned int stdc_trailing_ones_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_trailing_ones_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_trailing_ones(x) (stdc_trailing_ones_ull (x)) -+#if __glibc_has_builtin (__builtin_stdc_trailing_ones) -+# define stdc_trailing_ones(x) (__builtin_stdc_trailing_ones (x)) -+#else -+# define stdc_trailing_ones(x) (stdc_trailing_ones_ull (x)) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_ctzll) - static __always_inline unsigned int -@@ -272,11 +288,15 @@ extern unsigned int stdc_first_leading_zero_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_first_leading_zero_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_first_leading_zero(x) \ -+#if __glibc_has_builtin (__builtin_stdc_first_leading_zero) -+# define stdc_first_leading_zero(x) (__builtin_stdc_first_leading_zero (x)) -+#else -+# define stdc_first_leading_zero(x) \ - (sizeof (x) == 8 ? stdc_first_leading_zero_ull (x) \ - : sizeof (x) == 4 ? stdc_first_leading_zero_ui (x) \ - : sizeof (x) == 2 ? stdc_first_leading_zero_us (__pacify_uint16 (x)) \ - : stdc_first_leading_zero_uc (__pacify_uint8 (x))) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) - static __always_inline unsigned int -@@ -326,11 +346,15 @@ extern unsigned int stdc_first_leading_one_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_first_leading_one_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_first_leading_one(x) \ -+#if __glibc_has_builtin (__builtin_stdc_first_leading_one) -+# define stdc_first_leading_one(x) (__builtin_stdc_first_leading_one (x)) -+#else -+# define stdc_first_leading_one(x) \ - (sizeof (x) == 8 ? stdc_first_leading_one_ull (x) \ - : sizeof (x) == 4 ? stdc_first_leading_one_ui (x) \ - : sizeof (x) == 2 ? stdc_first_leading_one_us (__pacify_uint16 (x)) \ - : stdc_first_leading_one_uc (__pacify_uint8 (x))) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) - static __always_inline unsigned int -@@ -380,11 +404,15 @@ extern unsigned int stdc_first_trailing_zero_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_first_trailing_zero_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_first_trailing_zero(x) \ -+#if __glibc_has_builtin (__builtin_stdc_first_trailing_zero) -+# define stdc_first_trailing_zero(x) (__builtin_stdc_first_trailing_zero (x)) -+#else -+# define stdc_first_trailing_zero(x) \ - (sizeof (x) == 8 ? stdc_first_trailing_zero_ull (x) \ - : sizeof (x) == 4 ? stdc_first_trailing_zero_ui (x) \ - : sizeof (x) == 2 ? stdc_first_trailing_zero_us (__pacify_uint16 (x)) \ - : stdc_first_trailing_zero_uc (__pacify_uint8 (x))) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_ctzll) - static __always_inline unsigned int -@@ -434,11 +462,15 @@ extern unsigned int stdc_first_trailing_one_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_first_trailing_one_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_first_trailing_one(x) \ -+#if __glibc_has_builtin (__builtin_stdc_first_trailing_one) -+# define stdc_first_trailing_one(x) (__builtin_stdc_first_trailing_one (x)) -+#else -+# define stdc_first_trailing_one(x) \ - (sizeof (x) == 8 ? stdc_first_trailing_one_ull (x) \ - : sizeof (x) == 4 ? stdc_first_trailing_one_ui (x) \ - : sizeof (x) == 2 ? stdc_first_trailing_one_us (__pacify_uint16 (x)) \ - : stdc_first_trailing_one_uc (__pacify_uint8 (x))) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_ctzll) - static __always_inline unsigned int -@@ -488,9 +520,13 @@ extern unsigned int stdc_count_zeros_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_count_zeros_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_count_zeros(x) \ -+#if __glibc_has_builtin (__builtin_stdc_count_zeros) -+# define stdc_count_zeros(x) (__builtin_stdc_count_zeros (x)) -+#else -+# define stdc_count_zeros(x) \ - (stdc_count_zeros_ull (x) \ - - (unsigned int) (8 * (sizeof (0ULL) - sizeof (x)))) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_popcountll) - static __always_inline unsigned int -@@ -540,7 +576,11 @@ extern unsigned int stdc_count_ones_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_count_ones_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_count_ones(x) (stdc_count_ones_ull (x)) -+#if __glibc_has_builtin (__builtin_stdc_count_ones) -+# define stdc_count_ones(x) (__builtin_stdc_count_ones (x)) -+#else -+# define stdc_count_ones(x) (stdc_count_ones_ull (x)) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_popcountll) - static __always_inline unsigned int -@@ -590,10 +630,14 @@ extern bool stdc_has_single_bit_ul (unsigned long int __x) - __extension__ - extern bool stdc_has_single_bit_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_has_single_bit(x) \ -+#if __glibc_has_builtin (__builtin_stdc_has_single_bit) -+# define stdc_has_single_bit(x) (__builtin_stdc_has_single_bit (x)) -+#else -+# define stdc_has_single_bit(x) \ - ((bool) (sizeof (x) <= sizeof (unsigned int) \ - ? stdc_has_single_bit_ui (x) \ - : stdc_has_single_bit_ull (x))) -+#endif - - static __always_inline bool - __hsb64_inline (uint64_t __x) -@@ -641,7 +685,11 @@ extern unsigned int stdc_bit_width_ul (unsigned long int __x) - __extension__ - extern unsigned int stdc_bit_width_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_bit_width(x) (stdc_bit_width_ull (x)) -+#if __glibc_has_builtin (__builtin_stdc_bit_width) -+# define stdc_bit_width(x) (__builtin_stdc_bit_width (x)) -+#else -+# define stdc_bit_width(x) (stdc_bit_width_ull (x)) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) - static __always_inline unsigned int -@@ -691,7 +739,11 @@ extern unsigned long int stdc_bit_floor_ul (unsigned long int __x) - __extension__ - extern unsigned long long int stdc_bit_floor_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_bit_floor(x) ((__typeof (x)) stdc_bit_floor_ull (x)) -+#if __glibc_has_builtin (__builtin_stdc_bit_floor) -+# define stdc_bit_floor(x) (__builtin_stdc_bit_floor (x)) -+#else -+# define stdc_bit_floor(x) ((__typeof (x)) stdc_bit_floor_ull (x)) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) - static __always_inline uint64_t -@@ -743,7 +795,11 @@ extern unsigned long int stdc_bit_ceil_ul (unsigned long int __x) - __extension__ - extern unsigned long long int stdc_bit_ceil_ull (unsigned long long int __x) - __THROW __attribute_const__; --#define stdc_bit_ceil(x) ((__typeof (x)) stdc_bit_ceil_ull (x)) -+#if __glibc_has_builtin (__builtin_stdc_bit_ceil) -+# define stdc_bit_ceil(x) (__builtin_stdc_bit_ceil (x)) -+#else -+# define stdc_bit_ceil(x) ((__typeof (x)) stdc_bit_ceil_ull (x)) -+#endif - - #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) - static __always_inline uint64_t -diff --git a/stdlib/tst-stdbit-builtins.c b/stdlib/tst-stdbit-builtins.c -new file mode 100644 -index 0000000000..536841ca8a ---- /dev/null -+++ b/stdlib/tst-stdbit-builtins.c -@@ -0,0 +1,778 @@ -+/* Test <stdbit.h> type-generic macros with compiler __builtin_stdc_* support. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <stdbit.h> -+#include <limits.h> -+#include <support/check.h> -+ -+#if __glibc_has_builtin (__builtin_stdc_leading_zeros) \ -+ && __glibc_has_builtin (__builtin_stdc_leading_ones) \ -+ && __glibc_has_builtin (__builtin_stdc_trailing_zeros) \ -+ && __glibc_has_builtin (__builtin_stdc_trailing_ones) \ -+ && __glibc_has_builtin (__builtin_stdc_first_leading_zero) \ -+ && __glibc_has_builtin (__builtin_stdc_first_leading_one) \ -+ && __glibc_has_builtin (__builtin_stdc_first_trailing_zero) \ -+ && __glibc_has_builtin (__builtin_stdc_first_trailing_one) \ -+ && __glibc_has_builtin (__builtin_stdc_count_zeros) \ -+ && __glibc_has_builtin (__builtin_stdc_count_ones) \ -+ && __glibc_has_builtin (__builtin_stdc_has_single_bit) \ -+ && __glibc_has_builtin (__builtin_stdc_bit_width) \ -+ && __glibc_has_builtin (__builtin_stdc_bit_floor) \ -+ && __glibc_has_builtin (__builtin_stdc_bit_ceil) -+ -+# if !defined (BITINT_MAXWIDTH) && defined (__BITINT_MAXWIDTH__) -+# define BITINT_MAXWIDTH __BITINT_MAXWIDTH__ -+# endif -+ -+typedef unsigned char uc; -+typedef unsigned short us; -+typedef unsigned int ui; -+typedef unsigned long int ul; -+typedef unsigned long long int ull; -+ -+# define expr_has_type(e, t) _Generic (e, default : 0, t : 1) -+ -+static int -+do_test (void) -+{ -+ TEST_COMPARE (stdc_leading_zeros ((uc) 0), CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_leading_zeros ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_leading_zeros ((us) 0), sizeof (short) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_leading_zeros ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_leading_zeros (0U), sizeof (int) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_leading_zeros (0U), ui), 1); -+ TEST_COMPARE (stdc_leading_zeros (0UL), sizeof (long int) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_leading_zeros (0UL), ui), 1); -+ TEST_COMPARE (stdc_leading_zeros (0ULL), sizeof (long long int) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_leading_zeros (0ULL), ui), 1); -+ TEST_COMPARE (stdc_leading_zeros ((uc) ~0U), 0); -+ TEST_COMPARE (stdc_leading_zeros ((us) ~0U), 0); -+ TEST_COMPARE (stdc_leading_zeros (~0U), 0); -+ TEST_COMPARE (stdc_leading_zeros (~0UL), 0); -+ TEST_COMPARE (stdc_leading_zeros (~0ULL), 0); -+ TEST_COMPARE (stdc_leading_zeros ((uc) 3), CHAR_BIT - 2); -+ TEST_COMPARE (stdc_leading_zeros ((us) 9), sizeof (short) * CHAR_BIT - 4); -+ TEST_COMPARE (stdc_leading_zeros (34U), sizeof (int) * CHAR_BIT - 6); -+ TEST_COMPARE (stdc_leading_zeros (130UL), sizeof (long int) * CHAR_BIT - 8); -+ TEST_COMPARE (stdc_leading_zeros (512ULL), -+ sizeof (long long int) * CHAR_BIT - 10); -+ TEST_COMPARE (stdc_leading_ones ((uc) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_leading_ones ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_leading_ones ((us) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_leading_ones ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_leading_ones (0U), 0); -+ TEST_COMPARE (expr_has_type (stdc_leading_ones (0U), ui), 1); -+ TEST_COMPARE (stdc_leading_ones (0UL), 0); -+ TEST_COMPARE (expr_has_type (stdc_leading_ones (0UL), ui), 1); -+ TEST_COMPARE (stdc_leading_ones (0ULL), 0); -+ TEST_COMPARE (expr_has_type (stdc_leading_ones (0ULL), ui), 1); -+ TEST_COMPARE (stdc_leading_ones ((uc) ~0U), CHAR_BIT); -+ TEST_COMPARE (stdc_leading_ones ((us) ~0U), sizeof (short) * CHAR_BIT); -+ TEST_COMPARE (stdc_leading_ones (~0U), sizeof (int) * CHAR_BIT); -+ TEST_COMPARE (stdc_leading_ones (~0UL), sizeof (long int) * CHAR_BIT); -+ TEST_COMPARE (stdc_leading_ones (~0ULL), sizeof (long long int) * CHAR_BIT); -+ TEST_COMPARE (stdc_leading_ones ((uc) ~3), CHAR_BIT - 2); -+ TEST_COMPARE (stdc_leading_ones ((us) ~9), sizeof (short) * CHAR_BIT - 4); -+ TEST_COMPARE (stdc_leading_ones (~34U), sizeof (int) * CHAR_BIT - 6); -+ TEST_COMPARE (stdc_leading_ones (~130UL), sizeof (long int) * CHAR_BIT - 8); -+ TEST_COMPARE (stdc_leading_ones (~512ULL), -+ sizeof (long long int) * CHAR_BIT - 10); -+ TEST_COMPARE (stdc_trailing_zeros ((uc) 0), CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_trailing_zeros ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_trailing_zeros ((us) 0), sizeof (short) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_trailing_zeros ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_trailing_zeros (0U), sizeof (int) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_trailing_zeros (0U), ui), 1); -+ TEST_COMPARE (stdc_trailing_zeros (0UL), sizeof (long int) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_trailing_zeros (0UL), ui), 1); -+ TEST_COMPARE (stdc_trailing_zeros (0ULL), sizeof (long long int) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_trailing_zeros (0ULL), ui), 1); -+ TEST_COMPARE (stdc_trailing_zeros ((uc) ~0U), 0); -+ TEST_COMPARE (stdc_trailing_zeros ((us) ~0U), 0); -+ TEST_COMPARE (stdc_trailing_zeros (~0U), 0); -+ TEST_COMPARE (stdc_trailing_zeros (~0UL), 0); -+ TEST_COMPARE (stdc_trailing_zeros (~0ULL), 0); -+ TEST_COMPARE (stdc_trailing_zeros ((uc) 2), 1); -+ TEST_COMPARE (stdc_trailing_zeros ((us) 24), 3); -+ TEST_COMPARE (stdc_trailing_zeros (32U), 5); -+ TEST_COMPARE (stdc_trailing_zeros (128UL), 7); -+ TEST_COMPARE (stdc_trailing_zeros (512ULL), 9); -+ TEST_COMPARE (stdc_trailing_ones ((uc) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_trailing_ones ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_trailing_ones ((us) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_trailing_ones ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_trailing_ones (0U), 0); -+ TEST_COMPARE (expr_has_type (stdc_trailing_ones (0U), ui), 1); -+ TEST_COMPARE (stdc_trailing_ones (0UL), 0); -+ TEST_COMPARE (expr_has_type (stdc_trailing_ones (0UL), ui), 1); -+ TEST_COMPARE (stdc_trailing_ones (0ULL), 0); -+ TEST_COMPARE (expr_has_type (stdc_trailing_ones (0ULL), ui), 1); -+ TEST_COMPARE (stdc_trailing_ones ((uc) ~0U), CHAR_BIT); -+ TEST_COMPARE (stdc_trailing_ones ((us) ~0U), sizeof (short) * CHAR_BIT); -+ TEST_COMPARE (stdc_trailing_ones (~0U), sizeof (int) * CHAR_BIT); -+ TEST_COMPARE (stdc_trailing_ones (~0UL), sizeof (long int) * CHAR_BIT); -+ TEST_COMPARE (stdc_trailing_ones (~0ULL), sizeof (long long int) * CHAR_BIT); -+ TEST_COMPARE (stdc_trailing_ones ((uc) 5), 1); -+ TEST_COMPARE (stdc_trailing_ones ((us) 15), 4); -+ TEST_COMPARE (stdc_trailing_ones (127U), 7); -+ TEST_COMPARE (stdc_trailing_ones (511UL), 9); -+ TEST_COMPARE (stdc_trailing_ones (~0ULL >> 2), -+ sizeof (long long int) * CHAR_BIT - 2); -+ TEST_COMPARE (stdc_first_leading_zero ((uc) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_zero ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_first_leading_zero ((us) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_zero ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_first_leading_zero (0U), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_zero (0U), ui), 1); -+ TEST_COMPARE (stdc_first_leading_zero (0UL), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_zero (0UL), ui), 1); -+ TEST_COMPARE (stdc_first_leading_zero (0ULL), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_zero (0ULL), ui), 1); -+ TEST_COMPARE (stdc_first_leading_zero ((uc) ~0U), 0); -+ TEST_COMPARE (stdc_first_leading_zero ((us) ~0U), 0); -+ TEST_COMPARE (stdc_first_leading_zero (~0U), 0); -+ TEST_COMPARE (stdc_first_leading_zero (~0UL), 0); -+ TEST_COMPARE (stdc_first_leading_zero (~0ULL), 0); -+ TEST_COMPARE (stdc_first_leading_zero ((uc) ~3U), CHAR_BIT - 1); -+ TEST_COMPARE (stdc_first_leading_zero ((us) ~15U), -+ sizeof (short) * CHAR_BIT - 3); -+ TEST_COMPARE (stdc_first_leading_zero (~63U), sizeof (int) * CHAR_BIT - 5); -+ TEST_COMPARE (stdc_first_leading_zero (~255UL), -+ sizeof (long int) * CHAR_BIT - 7); -+ TEST_COMPARE (stdc_first_leading_zero (~1023ULL), -+ sizeof (long long int) * CHAR_BIT - 9); -+ TEST_COMPARE (stdc_first_leading_one ((uc) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_one ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_first_leading_one ((us) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_one ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_first_leading_one (0U), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_one (0U), ui), 1); -+ TEST_COMPARE (stdc_first_leading_one (0UL), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_one (0UL), ui), 1); -+ TEST_COMPARE (stdc_first_leading_one (0ULL), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_one (0ULL), ui), 1); -+ TEST_COMPARE (stdc_first_leading_one ((uc) ~0U), 1); -+ TEST_COMPARE (stdc_first_leading_one ((us) ~0U), 1); -+ TEST_COMPARE (stdc_first_leading_one (~0U), 1); -+ TEST_COMPARE (stdc_first_leading_one (~0UL), 1); -+ TEST_COMPARE (stdc_first_leading_one (~0ULL), 1); -+ TEST_COMPARE (stdc_first_leading_one ((uc) 3), CHAR_BIT - 1); -+ TEST_COMPARE (stdc_first_leading_one ((us) 9), -+ sizeof (short) * CHAR_BIT - 3); -+ TEST_COMPARE (stdc_first_leading_one (34U), sizeof (int) * CHAR_BIT - 5); -+ TEST_COMPARE (stdc_first_leading_one (130UL), -+ sizeof (long int) * CHAR_BIT - 7); -+ TEST_COMPARE (stdc_first_leading_one (512ULL), -+ sizeof (long long int) * CHAR_BIT - 9); -+ TEST_COMPARE (stdc_first_trailing_zero ((uc) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_zero ((us) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_zero (0U), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero (0U), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_zero (0UL), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero (0UL), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_zero (0ULL), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero (0ULL), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_zero ((uc) ~0U), 0); -+ TEST_COMPARE (stdc_first_trailing_zero ((us) ~0U), 0); -+ TEST_COMPARE (stdc_first_trailing_zero (~0U), 0); -+ TEST_COMPARE (stdc_first_trailing_zero (~0UL), 0); -+ TEST_COMPARE (stdc_first_trailing_zero (~0ULL), 0); -+ TEST_COMPARE (stdc_first_trailing_zero ((uc) 2), 1); -+ TEST_COMPARE (stdc_first_trailing_zero ((us) 15), 5); -+ TEST_COMPARE (stdc_first_trailing_zero (63U), 7); -+ TEST_COMPARE (stdc_first_trailing_zero (128UL), 1); -+ TEST_COMPARE (stdc_first_trailing_zero (511ULL), 10); -+ TEST_COMPARE (stdc_first_trailing_one ((uc) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_one ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_one ((us) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_one ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_one (0U), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_one (0U), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_one (0UL), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_one (0UL), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_one (0ULL), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_one (0ULL), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_one ((uc) ~0U), 1); -+ TEST_COMPARE (stdc_first_trailing_one ((us) ~0U), 1); -+ TEST_COMPARE (stdc_first_trailing_one (~0U), 1); -+ TEST_COMPARE (stdc_first_trailing_one (~0UL), 1); -+ TEST_COMPARE (stdc_first_trailing_one (~0ULL), 1); -+ TEST_COMPARE (stdc_first_trailing_one ((uc) 4), 3); -+ TEST_COMPARE (stdc_first_trailing_one ((us) 96), 6); -+ TEST_COMPARE (stdc_first_trailing_one (127U), 1); -+ TEST_COMPARE (stdc_first_trailing_one (511UL), 1); -+ TEST_COMPARE (stdc_first_trailing_one (~0ULL << 12), 13); -+ TEST_COMPARE (stdc_count_zeros ((uc) 0), CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_count_zeros ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_count_zeros ((us) 0), sizeof (short) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_count_zeros ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_count_zeros (0U), sizeof (int) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_count_zeros (0U), ui), 1); -+ TEST_COMPARE (stdc_count_zeros (0UL), sizeof (long int) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_count_zeros (0UL), ui), 1); -+ TEST_COMPARE (stdc_count_zeros (0ULL), sizeof (long long int) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_count_zeros (0ULL), ui), 1); -+ TEST_COMPARE (stdc_count_zeros ((uc) ~0U), 0); -+ TEST_COMPARE (stdc_count_zeros ((us) ~0U), 0); -+ TEST_COMPARE (stdc_count_zeros (~0U), 0); -+ TEST_COMPARE (stdc_count_zeros (~0UL), 0); -+ TEST_COMPARE (stdc_count_zeros (~0ULL), 0); -+ TEST_COMPARE (stdc_count_zeros ((uc) 1U), CHAR_BIT - 1); -+ TEST_COMPARE (stdc_count_zeros ((us) 42), sizeof (short) * CHAR_BIT - 3); -+ TEST_COMPARE (stdc_count_zeros (291U), sizeof (int) * CHAR_BIT - 4); -+ TEST_COMPARE (stdc_count_zeros (~1315UL), 5); -+ TEST_COMPARE (stdc_count_zeros (3363ULL), -+ sizeof (long long int) * CHAR_BIT - 6); -+ TEST_COMPARE (stdc_count_ones ((uc) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_count_ones ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_count_ones ((us) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_count_ones ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_count_ones (0U), 0); -+ TEST_COMPARE (expr_has_type (stdc_count_ones (0U), ui), 1); -+ TEST_COMPARE (stdc_count_ones (0UL), 0); -+ TEST_COMPARE (expr_has_type (stdc_count_ones (0UL), ui), 1); -+ TEST_COMPARE (stdc_count_ones (0ULL), 0); -+ TEST_COMPARE (expr_has_type (stdc_count_ones (0ULL), ui), 1); -+ TEST_COMPARE (stdc_count_ones ((uc) ~0U), CHAR_BIT); -+ TEST_COMPARE (stdc_count_ones ((us) ~0U), sizeof (short) * CHAR_BIT); -+ TEST_COMPARE (stdc_count_ones (~0U), sizeof (int) * CHAR_BIT); -+ TEST_COMPARE (stdc_count_ones (~0UL), sizeof (long int) * CHAR_BIT); -+ TEST_COMPARE (stdc_count_ones (~0ULL), sizeof (long long int) * CHAR_BIT); -+ TEST_COMPARE (stdc_count_ones ((uc) ~1U), CHAR_BIT - 1); -+ TEST_COMPARE (stdc_count_ones ((us) ~42), sizeof (short) * CHAR_BIT - 3); -+ TEST_COMPARE (stdc_count_ones (~291U), sizeof (int) * CHAR_BIT - 4); -+ TEST_COMPARE (stdc_count_ones (1315UL), 5); -+ TEST_COMPARE (stdc_count_ones (~3363ULL), -+ sizeof (long long int) * CHAR_BIT - 6); -+ TEST_COMPARE (stdc_has_single_bit ((uc) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_has_single_bit ((uc) 0), _Bool), 1); -+ TEST_COMPARE (stdc_has_single_bit ((us) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_has_single_bit ((us) 0), _Bool), 1); -+ TEST_COMPARE (stdc_has_single_bit (0U), 0); -+ TEST_COMPARE (expr_has_type (stdc_has_single_bit (0U), _Bool), 1); -+ TEST_COMPARE (stdc_has_single_bit (0UL), 0); -+ TEST_COMPARE (expr_has_type (stdc_has_single_bit (0UL), _Bool), 1); -+ TEST_COMPARE (stdc_has_single_bit (0ULL), 0); -+ TEST_COMPARE (expr_has_type (stdc_has_single_bit (0ULL), _Bool), 1); -+ TEST_COMPARE (stdc_has_single_bit ((uc) 2), 1); -+ TEST_COMPARE (stdc_has_single_bit ((us) 8), 1); -+ TEST_COMPARE (stdc_has_single_bit (32U), 1); -+ TEST_COMPARE (stdc_has_single_bit (128UL), 1); -+ TEST_COMPARE (stdc_has_single_bit (512ULL), 1); -+ TEST_COMPARE (stdc_has_single_bit ((uc) 7), 0); -+ TEST_COMPARE (stdc_has_single_bit ((us) 96), 0); -+ TEST_COMPARE (stdc_has_single_bit (513U), 0); -+ TEST_COMPARE (stdc_has_single_bit (1022UL), 0); -+ TEST_COMPARE (stdc_has_single_bit (12ULL), 0); -+ TEST_COMPARE (stdc_bit_width ((uc) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_width ((uc) 0), ui), 1); -+ TEST_COMPARE (stdc_bit_width ((us) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_width ((us) 0), ui), 1); -+ TEST_COMPARE (stdc_bit_width (0U), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_width (0U), ui), 1); -+ TEST_COMPARE (stdc_bit_width (0UL), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_width (0UL), ui), 1); -+ TEST_COMPARE (stdc_bit_width (0ULL), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_width (0ULL), ui), 1); -+ TEST_COMPARE (stdc_bit_width ((uc) ~0U), CHAR_BIT); -+ TEST_COMPARE (stdc_bit_width ((us) ~0U), sizeof (short) * CHAR_BIT); -+ TEST_COMPARE (stdc_bit_width (~0U), sizeof (int) * CHAR_BIT); -+ TEST_COMPARE (stdc_bit_width (~0UL), sizeof (long int) * CHAR_BIT); -+ TEST_COMPARE (stdc_bit_width (~0ULL), sizeof (long long int) * CHAR_BIT); -+ TEST_COMPARE (stdc_bit_width ((uc) ((uc) ~0U >> 1)), CHAR_BIT - 1); -+ TEST_COMPARE (stdc_bit_width ((uc) 6), 3); -+ TEST_COMPARE (stdc_bit_width ((us) 12U), 4); -+ TEST_COMPARE (stdc_bit_width ((us) ((us) ~0U >> 5)), -+ sizeof (short) * CHAR_BIT - 5); -+ TEST_COMPARE (stdc_bit_width (137U), 8); -+ TEST_COMPARE (stdc_bit_width (269U), 9); -+ TEST_COMPARE (stdc_bit_width (39UL), 6); -+ TEST_COMPARE (stdc_bit_width (~0UL >> 2), sizeof (long int) * CHAR_BIT - 2); -+ TEST_COMPARE (stdc_bit_width (1023ULL), 10); -+ TEST_COMPARE (stdc_bit_width (1024ULL), 11); -+ TEST_COMPARE (stdc_bit_floor ((uc) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_floor ((uc) 0), uc), 1); -+ TEST_COMPARE (stdc_bit_floor ((us) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_floor ((us) 0), us), 1); -+ TEST_COMPARE (stdc_bit_floor (0U), 0U); -+ TEST_COMPARE (expr_has_type (stdc_bit_floor (0U), ui), 1); -+ TEST_COMPARE (stdc_bit_floor (0UL), 0UL); -+ TEST_COMPARE (expr_has_type (stdc_bit_floor (0UL), ul), 1); -+ TEST_COMPARE (stdc_bit_floor (0ULL), 0ULL); -+ TEST_COMPARE (expr_has_type (stdc_bit_floor (0ULL), ull), 1); -+ TEST_COMPARE (stdc_bit_floor ((uc) ~0U), (1U << (CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_floor ((us) ~0U), -+ (1U << (sizeof (short) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_floor (~0U), (1U << (sizeof (int) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_floor (~0UL), -+ (1UL << (sizeof (long int) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_floor (~0ULL), -+ (1ULL << (sizeof (long long int) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_floor ((uc) 4), 4); -+ TEST_COMPARE (stdc_bit_floor ((uc) 7), 4); -+ TEST_COMPARE (stdc_bit_floor ((us) 8U), 8); -+ TEST_COMPARE (stdc_bit_floor ((us) 31U), 16); -+ TEST_COMPARE (stdc_bit_floor (137U), 128U); -+ TEST_COMPARE (stdc_bit_floor (269U), 256U); -+ TEST_COMPARE (stdc_bit_floor (511UL), 256UL); -+ TEST_COMPARE (stdc_bit_floor (512UL), 512UL); -+ TEST_COMPARE (stdc_bit_floor (513UL), 512ULL); -+ TEST_COMPARE (stdc_bit_floor (1024ULL), 1024ULL); -+ TEST_COMPARE (stdc_bit_ceil ((uc) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_bit_ceil ((uc) 0), uc), 1); -+ TEST_COMPARE (stdc_bit_ceil ((us) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_bit_ceil ((us) 0), us), 1); -+ TEST_COMPARE (stdc_bit_ceil (0U), 1U); -+ TEST_COMPARE (expr_has_type (stdc_bit_ceil (0U), ui), 1); -+ TEST_COMPARE (stdc_bit_ceil (0UL), 1UL); -+ TEST_COMPARE (expr_has_type (stdc_bit_ceil (0UL), ul), 1); -+ TEST_COMPARE (stdc_bit_ceil (0ULL), 1ULL); -+ TEST_COMPARE (expr_has_type (stdc_bit_ceil (0ULL), ull), 1); -+ TEST_COMPARE (stdc_bit_ceil ((uc) ~0U), 0); -+ TEST_COMPARE (stdc_bit_ceil ((us) ~0U), 0); -+ TEST_COMPARE (stdc_bit_ceil (~0U), 0U); -+ TEST_COMPARE (stdc_bit_ceil (~0UL), 0UL); -+ TEST_COMPARE (stdc_bit_ceil (~0ULL), 0ULL); -+ TEST_COMPARE (stdc_bit_ceil ((uc) ((uc) ~0U >> 1)), (1U << (CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_ceil ((uc) ((uc) ~0U >> 1)), (1U << (CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_ceil ((us) ((us) ~0U >> 1)), -+ (1U << (sizeof (short) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_ceil ((us) ((us) ~0U >> 1)), -+ (1U << (sizeof (short) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_ceil (~0U >> 1), -+ (1U << (sizeof (int) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_ceil (1U << (sizeof (int) * CHAR_BIT - 1)), -+ (1U << (sizeof (int) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_ceil (~0UL >> 1), -+ (1UL << (sizeof (long int) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_ceil (~0UL >> 1), -+ (1UL << (sizeof (long int) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_ceil (1ULL -+ << (sizeof (long long int) * CHAR_BIT - 1)), -+ (1ULL << (sizeof (long long int) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_ceil (~0ULL >> 1), -+ (1ULL << (sizeof (long long int) * CHAR_BIT - 1))); -+ TEST_COMPARE (stdc_bit_ceil ((uc) 1), 1); -+ TEST_COMPARE (stdc_bit_ceil ((uc) 2), 2); -+ TEST_COMPARE (stdc_bit_ceil ((us) 3U), 4); -+ TEST_COMPARE (stdc_bit_ceil ((us) 4U), 4); -+ TEST_COMPARE (stdc_bit_ceil (5U), 8U); -+ TEST_COMPARE (stdc_bit_ceil (269U), 512U); -+ TEST_COMPARE (stdc_bit_ceil (511UL), 512UL); -+ TEST_COMPARE (stdc_bit_ceil (512UL), 512UL); -+ TEST_COMPARE (stdc_bit_ceil (513ULL), 1024ULL); -+ TEST_COMPARE (stdc_bit_ceil (1025ULL), 2048ULL); -+# ifdef __SIZEOF_INT128__ -+ TEST_COMPARE (stdc_leading_zeros ((unsigned __int128) 0), -+ sizeof (__int128) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_leading_zeros ((unsigned __int128) 0), ui), -+ 1); -+ TEST_COMPARE (stdc_leading_zeros (~(unsigned __int128) 0), 0); -+ TEST_COMPARE (stdc_leading_ones ((unsigned __int128) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_leading_ones ((unsigned __int128) 0), ui), -+ 1); -+ TEST_COMPARE (stdc_leading_ones (~(unsigned __int128) 0), -+ sizeof (__int128) * CHAR_BIT); -+ TEST_COMPARE (stdc_trailing_zeros ((unsigned __int128) 0), -+ sizeof (__int128) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_trailing_zeros ((unsigned __int128) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_trailing_zeros (~(unsigned __int128) 0), 0); -+ TEST_COMPARE (stdc_trailing_ones ((unsigned __int128) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_trailing_ones ((unsigned __int128) 0), ui), -+ 1); -+ TEST_COMPARE (stdc_trailing_ones (~(unsigned __int128) 0), -+ sizeof (__int128) * CHAR_BIT); -+ TEST_COMPARE (stdc_first_leading_zero ((unsigned __int128) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_zero ((unsigned __int128) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_first_leading_zero (~(unsigned __int128) 0), 0); -+ TEST_COMPARE (stdc_first_leading_one ((unsigned __int128) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_one ((unsigned __int128) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_first_leading_one (~(unsigned __int128) 0), 1); -+ TEST_COMPARE (stdc_first_trailing_zero ((unsigned __int128) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero ((unsigned __int128) -+ 0), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_zero (~(unsigned __int128) 0), 0); -+ TEST_COMPARE (stdc_first_trailing_one ((unsigned __int128) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_one ((unsigned __int128) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_first_trailing_one (~(unsigned __int128) 0), 1); -+ TEST_COMPARE (stdc_count_zeros ((unsigned __int128) 0), -+ sizeof (__int128) * CHAR_BIT); -+ TEST_COMPARE (expr_has_type (stdc_count_zeros ((unsigned __int128) 0), ui), -+ 1); -+ TEST_COMPARE (stdc_count_zeros (~(unsigned __int128) 0), 0); -+ TEST_COMPARE (stdc_count_ones ((unsigned __int128) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_count_ones ((unsigned __int128) 0), ui), -+ 1); -+ TEST_COMPARE (stdc_count_ones (~(unsigned __int128) 0), -+ sizeof (__int128) * CHAR_BIT); -+ TEST_COMPARE (stdc_has_single_bit ((unsigned __int128) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_has_single_bit ((unsigned __int128) 0), -+ _Bool), 1); -+ TEST_COMPARE (stdc_has_single_bit (~(unsigned __int128) 0), 0); -+ TEST_COMPARE (stdc_bit_width ((unsigned __int128) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_width ((unsigned __int128) 0), ui), 1); -+ TEST_COMPARE (stdc_bit_width (~(unsigned __int128) 0), -+ sizeof (__int128) * CHAR_BIT); -+ TEST_COMPARE (stdc_bit_floor ((unsigned __int128) 0) != 0, 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_floor ((unsigned __int128) 0), -+ unsigned __int128), 1); -+ TEST_COMPARE (stdc_bit_floor (~(unsigned __int128) 0) -+ != ((unsigned __int128) 1) << (sizeof (__int128) -+ * CHAR_BIT - 1), 0); -+ TEST_COMPARE (stdc_bit_ceil ((unsigned __int128) 0) != 1, 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_ceil ((unsigned __int128) 0), -+ unsigned __int128), 1); -+ TEST_COMPARE (stdc_bit_ceil ((unsigned __int128) 1) != 1, 0); -+ TEST_COMPARE (stdc_bit_ceil ((~(unsigned __int128) 0) >> 1) -+ != ((unsigned __int128) 1) << (sizeof (__int128) -+ * CHAR_BIT - 1), 0); -+ TEST_COMPARE (stdc_bit_ceil (~(unsigned __int128) 0) != 0, 0); -+# endif -+ uc a = 0; -+ TEST_COMPARE (stdc_bit_width (a++), 0); -+ TEST_COMPARE (a, 1); -+ ull b = 0; -+ TEST_COMPARE (stdc_bit_width (b++), 0); -+ TEST_COMPARE (b, 1); -+ TEST_COMPARE (stdc_bit_floor (a++), 1); -+ TEST_COMPARE (a, 2); -+ TEST_COMPARE (stdc_bit_floor (b++), 1); -+ TEST_COMPARE (b, 2); -+ TEST_COMPARE (stdc_bit_ceil (a++), 2); -+ TEST_COMPARE (a, 3); -+ TEST_COMPARE (stdc_bit_ceil (b++), 2); -+ TEST_COMPARE (b, 3); -+ TEST_COMPARE (stdc_leading_zeros (a++), CHAR_BIT - 2); -+ TEST_COMPARE (a, 4); -+ TEST_COMPARE (stdc_leading_zeros (b++), -+ sizeof (long long int) * CHAR_BIT - 2); -+ TEST_COMPARE (b, 4); -+ TEST_COMPARE (stdc_leading_ones (a++), 0); -+ TEST_COMPARE (a, 5); -+ TEST_COMPARE (stdc_leading_ones (b++), 0); -+ TEST_COMPARE (b, 5); -+ TEST_COMPARE (stdc_trailing_zeros (a++), 0); -+ TEST_COMPARE (a, 6); -+ TEST_COMPARE (stdc_trailing_zeros (b++), 0); -+ TEST_COMPARE (b, 6); -+ TEST_COMPARE (stdc_trailing_ones (a++), 0); -+ TEST_COMPARE (a, 7); -+ TEST_COMPARE (stdc_trailing_ones (b++), 0); -+ TEST_COMPARE (b, 7); -+ TEST_COMPARE (stdc_first_leading_zero (a++), 1); -+ TEST_COMPARE (a, 8); -+ TEST_COMPARE (stdc_first_leading_zero (b++), 1); -+ TEST_COMPARE (b, 8); -+ TEST_COMPARE (stdc_first_leading_one (a++), CHAR_BIT - 3); -+ TEST_COMPARE (a, 9); -+ TEST_COMPARE (stdc_first_leading_one (b++), -+ sizeof (long long int) * CHAR_BIT - 3); -+ TEST_COMPARE (b, 9); -+ TEST_COMPARE (stdc_first_trailing_zero (a++), 2); -+ TEST_COMPARE (a, 10); -+ TEST_COMPARE (stdc_first_trailing_zero (b++), 2); -+ TEST_COMPARE (b, 10); -+ TEST_COMPARE (stdc_first_trailing_one (a++), 2); -+ TEST_COMPARE (a, 11); -+ TEST_COMPARE (stdc_first_trailing_one (b++), 2); -+ TEST_COMPARE (b, 11); -+ TEST_COMPARE (stdc_count_zeros (a++), CHAR_BIT - 3); -+ TEST_COMPARE (a, 12); -+ TEST_COMPARE (stdc_count_zeros (b++), -+ sizeof (long long int) * CHAR_BIT - 3); -+ TEST_COMPARE (b, 12); -+ TEST_COMPARE (stdc_count_ones (a++), 2); -+ TEST_COMPARE (a, 13); -+ TEST_COMPARE (stdc_count_ones (b++), 2); -+ TEST_COMPARE (b, 13); -+ TEST_COMPARE (stdc_has_single_bit (a++), 0); -+ TEST_COMPARE (a, 14); -+ TEST_COMPARE (stdc_has_single_bit (b++), 0); -+ TEST_COMPARE (b, 14); -+# ifdef BITINT_MAXWIDTH -+# if BITINT_MAXWIDTH >= 64 -+ TEST_COMPARE (stdc_leading_zeros (0uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_leading_zeros (0uwb), ui), 1); -+ TEST_COMPARE (stdc_leading_zeros (1uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_leading_zeros (1uwb), ui), 1); -+ TEST_COMPARE (stdc_leading_ones (0uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_leading_ones (0uwb), ui), 1); -+ TEST_COMPARE (stdc_leading_ones (1uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_leading_ones (1uwb), ui), 1); -+ TEST_COMPARE (stdc_trailing_zeros (0uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_trailing_zeros (0uwb), ui), 1); -+ TEST_COMPARE (stdc_trailing_zeros (1uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_trailing_zeros (1uwb), ui), 1); -+ TEST_COMPARE (stdc_trailing_ones (0uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_trailing_ones (0uwb), ui), 1); -+ TEST_COMPARE (stdc_trailing_ones (1uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_trailing_ones (1uwb), ui), 1); -+ TEST_COMPARE (stdc_first_leading_zero (0uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_zero (0uwb), ui), 1); -+ TEST_COMPARE (stdc_first_leading_zero (1uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_zero (1uwb), ui), 1); -+ TEST_COMPARE (stdc_first_leading_one (0uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_one (0uwb), ui), 1); -+ TEST_COMPARE (stdc_first_leading_one (1uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_one (1uwb), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_zero (0uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero (0uwb), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_zero (1uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero (1uwb), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_one (0uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_one (0uwb), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_one (1uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_one (1uwb), ui), 1); -+ TEST_COMPARE (stdc_count_zeros (0uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_count_zeros (0uwb), ui), 1); -+ TEST_COMPARE (stdc_count_zeros (1uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_count_zeros (1uwb), ui), 1); -+ TEST_COMPARE (stdc_count_ones (0uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_count_ones (0uwb), ui), 1); -+ TEST_COMPARE (stdc_count_ones (1uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_count_ones (1uwb), ui), 1); -+ TEST_COMPARE (stdc_has_single_bit (0uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_has_single_bit (0uwb), _Bool), 1); -+ TEST_COMPARE (stdc_has_single_bit (1uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_has_single_bit (1uwb), _Bool), 1); -+ TEST_COMPARE (stdc_bit_width (0uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_width (0uwb), ui), 1); -+ TEST_COMPARE (stdc_bit_width (1uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_bit_width (1uwb), ui), 1); -+ TEST_COMPARE (stdc_bit_floor (0uwb), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_floor (0uwb), unsigned _BitInt(1)), 1); -+ TEST_COMPARE (stdc_bit_floor (1uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_bit_floor (1uwb), unsigned _BitInt(1)), 1); -+ TEST_COMPARE (stdc_bit_ceil (0uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_bit_ceil (0uwb), unsigned _BitInt(1)), 1); -+ TEST_COMPARE (stdc_bit_ceil (1uwb), 1); -+ TEST_COMPARE (expr_has_type (stdc_bit_ceil (1uwb), unsigned _BitInt(1)), 1); -+ unsigned _BitInt(1) c = 0; -+ TEST_COMPARE (stdc_bit_floor (c++), 0); -+ TEST_COMPARE (c, 1); -+ TEST_COMPARE (stdc_bit_floor (c++), 1); -+ TEST_COMPARE (c, 0); -+ TEST_COMPARE (stdc_bit_ceil (c++), 1); -+ TEST_COMPARE (c, 1); -+ TEST_COMPARE (stdc_bit_ceil (c++), 1); -+ TEST_COMPARE (c, 0); -+# endif -+# if BITINT_MAXWIDTH >= 512 -+ TEST_COMPARE (stdc_leading_zeros ((unsigned _BitInt(512)) 0), 512); -+ TEST_COMPARE (expr_has_type (stdc_leading_zeros ((unsigned _BitInt(512)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_leading_zeros ((unsigned _BitInt(373)) 0), 373); -+ TEST_COMPARE (expr_has_type (stdc_leading_zeros ((unsigned _BitInt(373)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_leading_zeros (~(unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (stdc_leading_zeros (~(unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (stdc_leading_zeros ((unsigned _BitInt(512)) 275), 512 - 9); -+ TEST_COMPARE (stdc_leading_zeros ((unsigned _BitInt(373)) 512), 373 - 10); -+ TEST_COMPARE (stdc_leading_ones ((unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_leading_ones ((unsigned _BitInt(512)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_leading_ones ((unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_leading_ones ((unsigned _BitInt(373)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_leading_ones (~(unsigned _BitInt(512)) 0), 512); -+ TEST_COMPARE (stdc_leading_ones (~(unsigned _BitInt(373)) 0), 373); -+ TEST_COMPARE (stdc_leading_ones (~(unsigned _BitInt(512)) 275), 512 - 9); -+ TEST_COMPARE (stdc_leading_ones (~(unsigned _BitInt(373)) 512), 373 - 10); -+ TEST_COMPARE (stdc_trailing_zeros ((unsigned _BitInt(512)) 0), 512); -+ TEST_COMPARE (expr_has_type (stdc_trailing_zeros ((unsigned _BitInt(512)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_trailing_zeros ((unsigned _BitInt(373)) 0), 373); -+ TEST_COMPARE (expr_has_type (stdc_trailing_zeros ((unsigned _BitInt(373)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_trailing_zeros (~(unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (stdc_trailing_zeros (~(unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (stdc_trailing_zeros ((unsigned _BitInt(512)) 256), 8); -+ TEST_COMPARE (stdc_trailing_zeros ((unsigned _BitInt(373)) 512), 9); -+ TEST_COMPARE (stdc_trailing_ones ((unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_trailing_ones ((unsigned _BitInt(512)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_trailing_ones ((unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_trailing_ones ((unsigned _BitInt(373)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_trailing_ones (~(unsigned _BitInt(512)) 0), 512); -+ TEST_COMPARE (stdc_trailing_ones (~(unsigned _BitInt(373)) 0), 373); -+ TEST_COMPARE (stdc_trailing_ones ((unsigned _BitInt(512)) 255), 8); -+ TEST_COMPARE (stdc_trailing_ones ((~(unsigned _BitInt(373)) 0) >> 2), -+ 373 - 2); -+ TEST_COMPARE (stdc_first_leading_zero ((unsigned _BitInt(512)) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_zero ((unsigned _BitInt(512)) -+ 0), ui), 1); -+ TEST_COMPARE (stdc_first_leading_zero ((unsigned _BitInt(373)) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_zero ((unsigned _BitInt(373)) -+ 0), ui), 1); -+ TEST_COMPARE (stdc_first_leading_zero (~(unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (stdc_first_leading_zero (~(unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (stdc_first_leading_zero (~(unsigned _BitInt(512)) 511), -+ 512 - 8); -+ TEST_COMPARE (stdc_first_leading_zero (~(unsigned _BitInt(373)) 1023), -+ 373 - 9); -+ TEST_COMPARE (stdc_first_leading_one ((unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_one ((unsigned _BitInt(512)) -+ 0), ui), 1); -+ TEST_COMPARE (stdc_first_leading_one ((unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_leading_one ((unsigned _BitInt(373)) -+ 0), ui), 1); -+ TEST_COMPARE (stdc_first_leading_one (~(unsigned _BitInt(512)) 0), 1); -+ TEST_COMPARE (stdc_first_leading_one (~(unsigned _BitInt(373)) 0), 1); -+ TEST_COMPARE (stdc_first_leading_one ((unsigned _BitInt(512)) 275), 512 - 8); -+ TEST_COMPARE (stdc_first_leading_one ((unsigned _BitInt(373)) 512), 373 - 9); -+ TEST_COMPARE (stdc_first_trailing_zero ((unsigned _BitInt(512)) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero ((unsigned -+ _BitInt(512)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_first_trailing_zero ((unsigned _BitInt(373)) 0), 1); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero ((unsigned -+ _BitInt(373)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_first_trailing_zero (~(unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (stdc_first_trailing_zero (~(unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (stdc_first_trailing_zero ((unsigned _BitInt(512)) 255), 9); -+ TEST_COMPARE (stdc_first_trailing_zero ((unsigned _BitInt(373)) 511), 10); -+ TEST_COMPARE (stdc_first_trailing_one ((unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_one ((unsigned _BitInt(512)) -+ 0), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_one ((unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_first_trailing_one ((unsigned _BitInt(373)) -+ 0), ui), 1); -+ TEST_COMPARE (stdc_first_trailing_one (~(unsigned _BitInt(512)) 0), 1); -+ TEST_COMPARE (stdc_first_trailing_one (~(unsigned _BitInt(373)) 0), 1); -+ TEST_COMPARE (stdc_first_trailing_one (((unsigned _BitInt(512)) 255) << 175), -+ 176); -+ TEST_COMPARE (stdc_first_trailing_one ((~(unsigned _BitInt(373)) 0) << 311), -+ 312); -+ TEST_COMPARE (stdc_count_zeros ((unsigned _BitInt(512)) 0), 512); -+ TEST_COMPARE (expr_has_type (stdc_count_zeros ((unsigned _BitInt(512)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_count_zeros ((unsigned _BitInt(373)) 0), 373); -+ TEST_COMPARE (expr_has_type (stdc_count_zeros ((unsigned _BitInt(373)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_count_zeros (~(unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (stdc_count_zeros (~(unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (stdc_count_zeros ((unsigned _BitInt(512)) 1315), 512 - 5); -+ TEST_COMPARE (stdc_count_zeros ((unsigned _BitInt(373)) 3363), 373 - 6); -+ TEST_COMPARE (stdc_count_ones ((unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_count_ones ((unsigned _BitInt(512)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_count_ones ((unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_count_ones ((unsigned _BitInt(373)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_count_ones (~(unsigned _BitInt(512)) 0), 512); -+ TEST_COMPARE (stdc_count_ones (~(unsigned _BitInt(373)) 0), 373); -+ TEST_COMPARE (stdc_count_ones (~(unsigned _BitInt(512)) 1315), 512 - 5); -+ TEST_COMPARE (stdc_count_ones (~(unsigned _BitInt(373)) 3363), 373 - 6); -+ TEST_COMPARE (stdc_has_single_bit ((unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_has_single_bit ((unsigned _BitInt(512)) 0), -+ _Bool), 1); -+ TEST_COMPARE (stdc_has_single_bit ((unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_has_single_bit ((unsigned _BitInt(373)) 0), -+ _Bool), 1); -+ TEST_COMPARE (stdc_has_single_bit (~(unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (stdc_has_single_bit (~(unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (stdc_has_single_bit (((unsigned _BitInt(512)) 1022) << 279), -+ 0); -+ TEST_COMPARE (stdc_has_single_bit (((unsigned _BitInt(373)) 12) << 305), 0); -+ TEST_COMPARE (stdc_bit_width ((unsigned _BitInt(512)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_width ((unsigned _BitInt(512)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_bit_width ((unsigned _BitInt(373)) 0), 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_width ((unsigned _BitInt(373)) 0), -+ ui), 1); -+ TEST_COMPARE (stdc_bit_width (~(unsigned _BitInt(512)) 0), 512); -+ TEST_COMPARE (stdc_bit_width (~(unsigned _BitInt(373)) 0), 373); -+ TEST_COMPARE (stdc_bit_width (((unsigned _BitInt(512)) 1023) << 405), -+ 405 + 10); -+ TEST_COMPARE (stdc_bit_width (((unsigned _BitInt(373)) 1024) << 242), -+ 242 + 11); -+ TEST_COMPARE (stdc_bit_floor ((unsigned _BitInt(512)) 0) != 0, 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_floor ((unsigned _BitInt(512)) 0), -+ unsigned _BitInt(512)), 1); -+ TEST_COMPARE (stdc_bit_floor ((unsigned _BitInt(373)) 0) != 0, 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_floor ((unsigned _BitInt(373)) 0), -+ unsigned _BitInt(373)), 1); -+ TEST_COMPARE (stdc_bit_floor (~(unsigned _BitInt(512)) 0) -+ != ((unsigned _BitInt(512)) 1) << (512 - 1), 0); -+ TEST_COMPARE (stdc_bit_floor (~(unsigned _BitInt(373)) 0) -+ != ((unsigned _BitInt(373)) 1) << (373 - 1), 0); -+ TEST_COMPARE (stdc_bit_floor (((unsigned _BitInt(512)) 511) << 405) -+ != (((unsigned _BitInt(512)) 256) << 405), 0); -+ TEST_COMPARE (stdc_bit_floor (((unsigned _BitInt(373)) 512) << 242) -+ != (((unsigned _BitInt(512)) 512) << 242), 0); -+ TEST_COMPARE (stdc_bit_ceil ((unsigned _BitInt(512)) 0) != 1, 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_ceil ((unsigned _BitInt(512)) 0), -+ unsigned _BitInt(512)), 1); -+ TEST_COMPARE (stdc_bit_ceil ((unsigned _BitInt(373)) 0) != 1, 0); -+ TEST_COMPARE (expr_has_type (stdc_bit_ceil ((unsigned _BitInt(373)) 0), -+ unsigned _BitInt(373)), 1); -+ TEST_COMPARE (stdc_bit_ceil (~(unsigned _BitInt(512)) 0) != 0, 0); -+ TEST_COMPARE (stdc_bit_ceil (~(unsigned _BitInt(373)) 0) != 0, 0); -+ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(512)) 1) << (512 - 1)) -+ != ((unsigned _BitInt(512)) 1) << (512 - 1), 0); -+ TEST_COMPARE (stdc_bit_ceil ((~(unsigned _BitInt(373)) 0) >> 1) -+ != ((unsigned _BitInt(373)) 1) << (373 - 1), 0); -+ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(512)) 512) << 405) -+ != (((unsigned _BitInt(512)) 512) << 405), 0); -+ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(373)) 513) << 242) -+ != (((unsigned _BitInt(512)) 1024) << 242), 0); -+ TEST_COMPARE (stdc_bit_floor ((unsigned _BitInt(BITINT_MAXWIDTH)) 0) != 0, -+ 0); -+ TEST_COMPARE (stdc_bit_floor (~(unsigned _BitInt(BITINT_MAXWIDTH)) 0) -+ != ((unsigned _BitInt(BITINT_MAXWIDTH)) 1) << (BITINT_MAXWIDTH -+ - 1), 0); -+ TEST_COMPARE (stdc_bit_floor (((unsigned _BitInt(BITINT_MAXWIDTH)) 511) -+ << 405) -+ != (((unsigned _BitInt(BITINT_MAXWIDTH)) 256) << 405), 0); -+ TEST_COMPARE (stdc_bit_floor (((unsigned _BitInt(BITINT_MAXWIDTH)) 512) -+ << 405) -+ != (((unsigned _BitInt(BITINT_MAXWIDTH)) 512) << 405), 0); -+ TEST_COMPARE (stdc_bit_ceil ((unsigned _BitInt(BITINT_MAXWIDTH)) 0) != 1, 0); -+ TEST_COMPARE (stdc_bit_ceil (~(unsigned _BitInt(BITINT_MAXWIDTH)) 0) != 0, -+ 0); -+ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(BITINT_MAXWIDTH)) 1) -+ << (BITINT_MAXWIDTH - 1)) -+ != ((unsigned _BitInt(BITINT_MAXWIDTH)) 1) << (BITINT_MAXWIDTH -+ - 1), 0); -+ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(BITINT_MAXWIDTH)) 512) -+ << 405) -+ != (((unsigned _BitInt(BITINT_MAXWIDTH)) 512) << 405), 0); -+ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(BITINT_MAXWIDTH)) 513) -+ << 405) -+ != (((unsigned _BitInt(BITINT_MAXWIDTH)) 1024) << 405), 0); -+# endif -+# endif -+ return 0; -+} -+#else -+static int -+do_test (void) -+{ -+ return 0; -+} -+#endif -+ -+#include <support/test-driver.c> - -commit 71fcdba577884627c3ee4e43beb915da752efb1f -Author: Florian Weimer <fweimer@redhat.com> -Date: Fri Mar 15 19:08:24 2024 +0100 - - linux: Use rseq area unconditionally in sched_getcpu (bug 31479) - - Originally, nptl/descr.h included <sys/rseq.h>, but we removed that - in commit 2c6b4b272e6b4d07303af25709051c3e96288f2d ("nptl: - Unconditionally use a 32-byte rseq area"). After that, it was - not ensured that the RSEQ_SIG macro was defined during sched_getcpu.c - compilation that provided a definition. This commit always checks - the rseq area for CPU number information before using the other - approaches. - - This adds an unnecessary (but well-predictable) branch on - architectures which do not define RSEQ_SIG, but its cost is small - compared to the system call. Most architectures that have vDSO - acceleration for getcpu also have rseq support. - - Fixes: 2c6b4b272e6b4d07303af25709051c3e96288f2d - Fixes: 1d350aa06091211863e41169729cee1bca39f72f - Reviewed-by: Arjun Shankar <arjun@redhat.com> - (cherry picked from commit 7a76f218677d149d8b7875b336722108239f7ee9) - -diff --git a/sysdeps/unix/sysv/linux/sched_getcpu.c b/sysdeps/unix/sysv/linux/sched_getcpu.c -index dfb884568d..72a3360550 100644 ---- a/sysdeps/unix/sysv/linux/sched_getcpu.c -+++ b/sysdeps/unix/sysv/linux/sched_getcpu.c -@@ -33,17 +33,9 @@ vsyscall_sched_getcpu (void) - return r == -1 ? r : cpu; - } - --#ifdef RSEQ_SIG - int - sched_getcpu (void) - { - int cpu_id = THREAD_GETMEM_VOLATILE (THREAD_SELF, rseq_area.cpu_id); - return __glibc_likely (cpu_id >= 0) ? cpu_id : vsyscall_sched_getcpu (); - } --#else /* RSEQ_SIG */ --int --sched_getcpu (void) --{ -- return vsyscall_sched_getcpu (); --} --#endif /* RSEQ_SIG */ - -commit ee7f4c54e19738c2c27d3846e1e9b3595c89221f -Author: Manjunath Matti <mmatti@linux.ibm.com> -Date: Tue Mar 19 15:29:48 2024 -0500 - - powerpc: Add HWCAP3/HWCAP4 data to TCB for Power Architecture. - - This patch adds a new feature for powerpc. In order to get faster - access to the HWCAP3/HWCAP4 masks, similar to HWCAP/HWCAP2 (i.e. for - implementing __builtin_cpu_supports() in GCC) without the overhead of - reading them from the auxiliary vector, we now reserve space for them - in the TCB. - - Suggested-by: Peter Bergner <bergner@linux.ibm.com> - Reviewed-by: Peter Bergner <bergner@linux.ibm.com> - (cherry picked from commit 3ab9b88e2ac91062b6d493fe32bd101a55006c6a) - -diff --git a/elf/dl-diagnostics.c b/elf/dl-diagnostics.c -index 7345ebc4e5..aaf67b87e8 100644 ---- a/elf/dl-diagnostics.c -+++ b/elf/dl-diagnostics.c -@@ -235,6 +235,8 @@ _dl_print_diagnostics (char **environ) - _dl_diagnostics_print_labeled_value ("dl_hwcap", GLRO (dl_hwcap)); - _dl_diagnostics_print_labeled_value ("dl_hwcap_important", HWCAP_IMPORTANT); - _dl_diagnostics_print_labeled_value ("dl_hwcap2", GLRO (dl_hwcap2)); -+ _dl_diagnostics_print_labeled_value ("dl_hwcap3", GLRO (dl_hwcap3)); -+ _dl_diagnostics_print_labeled_value ("dl_hwcap4", GLRO (dl_hwcap4)); - _dl_diagnostics_print_labeled_string - ("dl_hwcaps_subdirs", _dl_hwcaps_subdirs); - _dl_diagnostics_print_labeled_value -diff --git a/elf/dl-support.c b/elf/dl-support.c -index 2f502c8b0d..451932dd03 100644 ---- a/elf/dl-support.c -+++ b/elf/dl-support.c -@@ -158,6 +158,8 @@ const ElfW(Phdr) *_dl_phdr; - size_t _dl_phnum; - uint64_t _dl_hwcap; - uint64_t _dl_hwcap2; -+uint64_t _dl_hwcap3; -+uint64_t _dl_hwcap4; - - enum dso_sort_algorithm _dl_dso_sort_algo; - -diff --git a/elf/elf.h b/elf/elf.h -index 455731663c..1c394c64cd 100644 ---- a/elf/elf.h -+++ b/elf/elf.h -@@ -1234,6 +1234,10 @@ typedef struct - #define AT_RSEQ_FEATURE_SIZE 27 /* rseq supported feature size. */ - #define AT_RSEQ_ALIGN 28 /* rseq allocation alignment. */ - -+/* More machine-dependent hints about processor capabilities. */ -+#define AT_HWCAP3 29 /* extension of AT_HWCAP. */ -+#define AT_HWCAP4 30 /* extension of AT_HWCAP. */ -+ - #define AT_EXECFN 31 /* Filename of executable. */ - - /* Pointer to the global system page used for system calls and other -diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h -index 117c901ccc..50f58a60e3 100644 ---- a/sysdeps/generic/ldsodefs.h -+++ b/sysdeps/generic/ldsodefs.h -@@ -646,6 +646,8 @@ struct rtld_global_ro - /* Mask for more hardware capabilities that are available on some - platforms. */ - EXTERN uint64_t _dl_hwcap2; -+ EXTERN uint64_t _dl_hwcap3; -+ EXTERN uint64_t _dl_hwcap4; - - EXTERN enum dso_sort_algorithm _dl_dso_sort_algo; - -diff --git a/sysdeps/powerpc/dl-procinfo.c b/sysdeps/powerpc/dl-procinfo.c -index a76bb6e5b0..8cf00aa7e3 100644 ---- a/sysdeps/powerpc/dl-procinfo.c -+++ b/sysdeps/powerpc/dl-procinfo.c -@@ -38,6 +38,10 @@ - needed. - */ - -+/* The total number of available bits (including those prior to -+ _DL_HWCAP_FIRST). Some of these bits might not be used. */ -+#define _DL_HWCAP_COUNT 128 -+ - #ifndef PROCINFO_CLASS - # define PROCINFO_CLASS - #endif -@@ -61,7 +65,7 @@ PROCINFO_CLASS struct cpu_features _dl_powerpc_cpu_features - #if !defined PROCINFO_DECL && defined SHARED - ._dl_powerpc_cap_flags - #else --PROCINFO_CLASS const char _dl_powerpc_cap_flags[64][15] -+PROCINFO_CLASS const char _dl_powerpc_cap_flags[_DL_HWCAP_COUNT][15] - #endif - #ifndef PROCINFO_DECL - = { -diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h -index 68f4241095..f8cb343877 100644 ---- a/sysdeps/powerpc/dl-procinfo.h -+++ b/sysdeps/powerpc/dl-procinfo.h -@@ -22,16 +22,17 @@ - #include <ldsodefs.h> - #include <sysdep.h> /* This defines the PPC_FEATURE[2]_* macros. */ - --/* The total number of available bits (including those prior to -- _DL_HWCAP_FIRST). Some of these bits might not be used. */ --#define _DL_HWCAP_COUNT 64 -+/* Feature masks are all 32-bits in size. */ -+#define _DL_HWCAP_SIZE 32 - --/* Features started at bit 31 and decremented as new features were added. */ --#define _DL_HWCAP_LAST 31 -+/* AT_HWCAP2 feature strings follow the AT_HWCAP feature strings. */ -+#define _DL_HWCAP2_OFFSET _DL_HWCAP_SIZE - --/* AT_HWCAP2 features started at bit 31 and decremented as new features were -- added. HWCAP2 feature bits start at bit 0. */ --#define _DL_HWCAP2_LAST 31 -+/* AT_HWCAP3 feature strings follow the AT_HWCAP2 feature strings. */ -+#define _DL_HWCAP3_OFFSET (_DL_HWCAP2_OFFSET + _DL_HWCAP_SIZE) -+ -+/* AT_HWCAP4 feature strings follow the AT_HWCAP3 feature strings. */ -+#define _DL_HWCAP4_OFFSET (_DL_HWCAP3_OFFSET + _DL_HWCAP_SIZE) - - /* These bits influence library search. */ - #define HWCAP_IMPORTANT (PPC_FEATURE_HAS_ALTIVEC \ -@@ -187,21 +188,42 @@ _dl_procinfo (unsigned int type, unsigned long int word) - case AT_HWCAP: - _dl_printf ("AT_HWCAP: "); - -- for (int i = 0; i <= _DL_HWCAP_LAST; ++i) -+ for (int i = 0; i < _DL_HWCAP_SIZE; ++i) - if (word & (1 << i)) - _dl_printf (" %s", _dl_hwcap_string (i)); - break; - case AT_HWCAP2: - { -- unsigned int offset = _DL_HWCAP_LAST + 1; - - _dl_printf ("AT_HWCAP2: "); - -- /* We have to go through them all because the kernel added the -- AT_HWCAP2 features starting with the high bits. */ -- for (int i = 0; i <= _DL_HWCAP2_LAST; ++i) -- if (word & (1 << i)) -- _dl_printf (" %s", _dl_hwcap_string (offset + i)); -+ /* We have to go through them all because the kernel added the -+ AT_HWCAP2 features starting with the high bits. */ -+ for (int i = 0; i < _DL_HWCAP_SIZE; ++i) -+ if (word & (1 << i)) -+ _dl_printf (" %s", _dl_hwcap_string (_DL_HWCAP2_OFFSET + i)); -+ break; -+ } -+ case AT_HWCAP3: -+ { -+ _dl_printf ("AT_HWCAP3: "); -+ -+ /* We have to go through them all because the kernel added the -+ AT_HWCAP3 features starting with the high bits. */ -+ for (int i = 0; i < _DL_HWCAP_SIZE; ++i) -+ if (word & (1 << i)) -+ _dl_printf (" %s", _dl_hwcap_string (_DL_HWCAP3_OFFSET + i)); -+ break; -+ } -+ case AT_HWCAP4: -+ { -+ _dl_printf ("AT_HWCAP4: "); -+ -+ /* We have to go through them all because the kernel added the -+ AT_HWCAP4 features starting with the high bits. */ -+ for (int i = 0; i <= _DL_HWCAP_SIZE; ++i) -+ if (word & (1 << i)) -+ _dl_printf (" %s", _dl_hwcap_string (_DL_HWCAP4_OFFSET + i)); - break; - } - case AT_L1I_CACHEGEOMETRY: -diff --git a/sysdeps/powerpc/hwcapinfo.c b/sysdeps/powerpc/hwcapinfo.c -index 76344f285a..f6fede15a7 100644 ---- a/sysdeps/powerpc/hwcapinfo.c -+++ b/sysdeps/powerpc/hwcapinfo.c -@@ -31,7 +31,7 @@ void - __tcb_parse_hwcap_and_convert_at_platform (void) - { - -- uint64_t h1, h2; -+ uint64_t h1, h2, h3, h4; - - /* Read AT_PLATFORM string from auxv and convert it to a number. */ - __tcb.at_platform = _dl_string_platform (GLRO (dl_platform)); -@@ -39,6 +39,8 @@ __tcb_parse_hwcap_and_convert_at_platform (void) - /* Read HWCAP and HWCAP2 from auxv. */ - h1 = GLRO (dl_hwcap); - h2 = GLRO (dl_hwcap2); -+ h3 = GLRO (dl_hwcap3); -+ h4 = GLRO (dl_hwcap4); - - /* hwcap contains only the latest supported ISA, the code checks which is - and fills the previous supported ones. */ -@@ -64,13 +66,16 @@ __tcb_parse_hwcap_and_convert_at_platform (void) - else if (h1 & PPC_FEATURE_POWER5) - h1 |= PPC_FEATURE_POWER4; - -- uint64_t array_hwcaps[] = { h1, h2 }; -+ uint64_t array_hwcaps[] = { h1, h2, h3, h4 }; - init_cpu_features (&GLRO(dl_powerpc_cpu_features), array_hwcaps); - - /* Consolidate both HWCAP and HWCAP2 into a single doubleword so that - we can read both in a single load later. */ - __tcb.hwcap = (h1 << 32) | (h2 & 0xffffffff); -- __tcb.hwcap_extn = 0x0; -+ -+ /* Consolidate both HWCAP3 and HWCAP4 into a single doubleword so that -+ we can read both in a single load later. */ -+ __tcb.hwcap_extn = (h3 << 32) | (h4 & 0xffffffff); - - } - #if IS_IN (rtld) -diff --git a/sysdeps/unix/sysv/linux/dl-parse_auxv.h b/sysdeps/unix/sysv/linux/dl-parse_auxv.h -index e3d758b163..ea2a58ecb1 100644 ---- a/sysdeps/unix/sysv/linux/dl-parse_auxv.h -+++ b/sysdeps/unix/sysv/linux/dl-parse_auxv.h -@@ -47,6 +47,8 @@ void _dl_parse_auxv (ElfW(auxv_t) *av, dl_parse_auxv_t auxv_values) - GLRO(dl_platform) = (void *) auxv_values[AT_PLATFORM]; - GLRO(dl_hwcap) = auxv_values[AT_HWCAP]; - GLRO(dl_hwcap2) = auxv_values[AT_HWCAP2]; -+ GLRO(dl_hwcap3) = auxv_values[AT_HWCAP3]; -+ GLRO(dl_hwcap4) = auxv_values[AT_HWCAP4]; - GLRO(dl_clktck) = auxv_values[AT_CLKTCK]; - GLRO(dl_fpu_control) = auxv_values[AT_FPUCW]; - _dl_random = (void *) auxv_values[AT_RANDOM]; -diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c -index ad3692d738..e1b14e9eb3 100644 ---- a/sysdeps/unix/sysv/linux/dl-sysdep.c -+++ b/sysdeps/unix/sysv/linux/dl-sysdep.c -@@ -197,6 +197,8 @@ _dl_show_auxv (void) - [AT_SYSINFO_EHDR - 2] = { "SYSINFO_EHDR: 0x", hex }, - [AT_RANDOM - 2] = { "RANDOM: 0x", hex }, - [AT_HWCAP2 - 2] = { "HWCAP2: 0x", hex }, -+ [AT_HWCAP3 - 2] = { "HWCAP3: 0x", hex }, -+ [AT_HWCAP4 - 2] = { "HWCAP4: 0x", hex }, - [AT_MINSIGSTKSZ - 2] = { "MINSIGSTKSZ: ", dec }, - [AT_L1I_CACHESIZE - 2] = { "L1I_CACHESIZE: ", dec }, - [AT_L1I_CACHEGEOMETRY - 2] = { "L1I_CACHEGEOMETRY: 0x", hex }, -diff --git a/sysdeps/unix/sysv/linux/powerpc/cpu-features.c b/sysdeps/unix/sysv/linux/powerpc/cpu-features.c -index 8e8a5ec2ea..a947d62db6 100644 ---- a/sysdeps/unix/sysv/linux/powerpc/cpu-features.c -+++ b/sysdeps/unix/sysv/linux/powerpc/cpu-features.c -@@ -94,6 +94,8 @@ init_cpu_features (struct cpu_features *cpu_features, uint64_t hwcaps[]) - which are set by __tcb_parse_hwcap_and_convert_at_platform. */ - cpu_features->hwcap = hwcaps[0]; - cpu_features->hwcap2 = hwcaps[1]; -+ cpu_features->hwcap3 = hwcaps[2]; -+ cpu_features->hwcap4 = hwcaps[3]; - /* Default is to use aligned memory access on optimized function unless - tunables is enable, since for this case user can explicit disable - unaligned optimizations. */ -diff --git a/sysdeps/unix/sysv/linux/powerpc/cpu-features.h b/sysdeps/unix/sysv/linux/powerpc/cpu-features.h -index 1294f0b601..e9eb6a13c8 100644 ---- a/sysdeps/unix/sysv/linux/powerpc/cpu-features.h -+++ b/sysdeps/unix/sysv/linux/powerpc/cpu-features.h -@@ -26,6 +26,8 @@ struct cpu_features - bool use_cached_memopt; - unsigned long int hwcap; - unsigned long int hwcap2; -+ unsigned long int hwcap3; -+ unsigned long int hwcap4; - }; - - static const char hwcap_names[] = { -diff --git a/sysdeps/unix/sysv/linux/powerpc/libc-start.c b/sysdeps/unix/sysv/linux/powerpc/libc-start.c -index a4705daf1c..6a00cd88cd 100644 ---- a/sysdeps/unix/sysv/linux/powerpc/libc-start.c -+++ b/sysdeps/unix/sysv/linux/powerpc/libc-start.c -@@ -87,6 +87,12 @@ __libc_start_main_impl (int argc, char **argv, - case AT_HWCAP2: - _dl_hwcap2 = (unsigned long int) av->a_un.a_val; - break; -+ case AT_HWCAP3: -+ _dl_hwcap3 = (unsigned long int) av->a_un.a_val; -+ break; -+ case AT_HWCAP4: -+ _dl_hwcap4 = (unsigned long int) av->a_un.a_val; -+ break; - case AT_PLATFORM: - _dl_platform = (void *) av->a_un.a_val; - break; - -commit aad45c8ac30aa1072e54903ce6aead22702f244a -Author: Amrita H S <amritahs@linux.ibm.com> -Date: Tue Mar 19 19:08:47 2024 -0500 - - powerpc: Placeholder and infrastructure/build support to add Power11 related changes. - - The following three changes have been added to provide initial Power11 support. - 1. Add the directories to hold Power11 files. - 2. Add support to select Power11 libraries based on AT_PLATFORM. - 3. Let submachine=power11 be set automatically. - - Reviewed-by: Florian Weimer <fweimer@redhat.com> - Reviewed-by: Peter Bergner <bergner@linux.ibm.com> - (cherry picked from commit 1ea051145612f199d8716ecdf78b084b00b5a727) - -diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h -index f8cb343877..b36697ba44 100644 ---- a/sysdeps/powerpc/dl-procinfo.h -+++ b/sysdeps/powerpc/dl-procinfo.h -@@ -38,7 +38,7 @@ - #define HWCAP_IMPORTANT (PPC_FEATURE_HAS_ALTIVEC \ - + PPC_FEATURE_HAS_DFP) - --#define _DL_PLATFORMS_COUNT 16 -+#define _DL_PLATFORMS_COUNT 17 - - #define _DL_FIRST_PLATFORM 32 - /* Mask to filter out platforms. */ -@@ -62,6 +62,7 @@ - #define PPC_PLATFORM_POWER8 13 - #define PPC_PLATFORM_POWER9 14 - #define PPC_PLATFORM_POWER10 15 -+#define PPC_PLATFORM_POWER11 16 - - static inline const char * - __attribute__ ((unused)) -@@ -89,6 +90,11 @@ _dl_string_platform (const char *str) - ret = _DL_FIRST_PLATFORM + PPC_PLATFORM_POWER10; - str++; - } -+ else if (str[1] == '1') -+ { -+ ret = _DL_FIRST_PLATFORM + PPC_PLATFORM_POWER11; -+ str++; -+ } - else - return -1; - break; -diff --git a/sysdeps/powerpc/powerpc32/power11/Implies b/sysdeps/powerpc/powerpc32/power11/Implies -new file mode 100644 -index 0000000000..051cbe0f79 ---- /dev/null -+++ b/sysdeps/powerpc/powerpc32/power11/Implies -@@ -0,0 +1,2 @@ -+powerpc/powerpc32/power10/fpu -+powerpc/powerpc32/power10 -diff --git a/sysdeps/powerpc/powerpc32/power11/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc32/power11/fpu/multiarch/Implies -new file mode 100644 -index 0000000000..58edb2861d ---- /dev/null -+++ b/sysdeps/powerpc/powerpc32/power11/fpu/multiarch/Implies -@@ -0,0 +1 @@ -+powerpc/powerpc32/power10/fpu/multiarch -diff --git a/sysdeps/powerpc/powerpc32/power11/multiarch/Implies b/sysdeps/powerpc/powerpc32/power11/multiarch/Implies -new file mode 100644 -index 0000000000..c70f0428ba ---- /dev/null -+++ b/sysdeps/powerpc/powerpc32/power11/multiarch/Implies -@@ -0,0 +1 @@ -+powerpc/powerpc32/power10/multiarch -diff --git a/sysdeps/powerpc/powerpc64/be/power11/Implies b/sysdeps/powerpc/powerpc64/be/power11/Implies -new file mode 100644 -index 0000000000..de481d1c13 ---- /dev/null -+++ b/sysdeps/powerpc/powerpc64/be/power11/Implies -@@ -0,0 +1,2 @@ -+powerpc/powerpc64/be/power10/fpu -+powerpc/powerpc64/be/power10 -diff --git a/sysdeps/powerpc/powerpc64/be/power11/fpu/Implies b/sysdeps/powerpc/powerpc64/be/power11/fpu/Implies -new file mode 100644 -index 0000000000..dff0e13064 ---- /dev/null -+++ b/sysdeps/powerpc/powerpc64/be/power11/fpu/Implies -@@ -0,0 +1 @@ -+powerpc/powerpc64/be/power10/fpu -diff --git a/sysdeps/powerpc/powerpc64/be/power11/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power11/fpu/multiarch/Implies -new file mode 100644 -index 0000000000..c3f259e009 ---- /dev/null -+++ b/sysdeps/powerpc/powerpc64/be/power11/fpu/multiarch/Implies -@@ -0,0 +1 @@ -+powerpc/powerpc64/be/power10/fpu/multiarch -diff --git a/sysdeps/powerpc/powerpc64/be/power11/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power11/multiarch/Implies -new file mode 100644 -index 0000000000..9491a394c9 ---- /dev/null -+++ b/sysdeps/powerpc/powerpc64/be/power11/multiarch/Implies -@@ -0,0 +1 @@ -+powerpc/powerpc64/be/power10/multiarch -diff --git a/sysdeps/powerpc/powerpc64/le/power11/Implies b/sysdeps/powerpc/powerpc64/le/power11/Implies -new file mode 100644 -index 0000000000..e18182dcc1 ---- /dev/null -+++ b/sysdeps/powerpc/powerpc64/le/power11/Implies -@@ -0,0 +1,2 @@ -+powerpc/powerpc64/le/power10/fpu -+powerpc/powerpc64/le/power10 -diff --git a/sysdeps/powerpc/powerpc64/le/power11/fpu/Implies b/sysdeps/powerpc/powerpc64/le/power11/fpu/Implies -new file mode 100644 -index 0000000000..e41bd55684 ---- /dev/null -+++ b/sysdeps/powerpc/powerpc64/le/power11/fpu/Implies -@@ -0,0 +1 @@ -+powerpc/powerpc64/le/power10/fpu -diff --git a/sysdeps/powerpc/powerpc64/le/power11/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/le/power11/fpu/multiarch/Implies -new file mode 100644 -index 0000000000..c838d50931 ---- /dev/null -+++ b/sysdeps/powerpc/powerpc64/le/power11/fpu/multiarch/Implies -@@ -0,0 +1 @@ -+powerpc/powerpc64/le/power10/fpu/multiarch -diff --git a/sysdeps/powerpc/powerpc64/le/power11/multiarch/Implies b/sysdeps/powerpc/powerpc64/le/power11/multiarch/Implies -new file mode 100644 -index 0000000000..687248c3c2 ---- /dev/null -+++ b/sysdeps/powerpc/powerpc64/le/power11/multiarch/Implies -@@ -0,0 +1 @@ -+powerpc/powerpc64/le/power10/multiarch -diff --git a/sysdeps/powerpc/powerpc64/le/tst-glibc-hwcaps.c b/sysdeps/powerpc/powerpc64/le/tst-glibc-hwcaps.c -index 77465d9133..65d3e69303 100644 ---- a/sysdeps/powerpc/powerpc64/le/tst-glibc-hwcaps.c -+++ b/sysdeps/powerpc/powerpc64/le/tst-glibc-hwcaps.c -@@ -36,9 +36,11 @@ compute_level (void) - return 9; - if (strcmp (platform, "power10") == 0) - return 10; -+ if (strcmp (platform, "power11") == 0) -+ return 11; - printf ("warning: unrecognized AT_PLATFORM value: %s\n", platform); -- /* Assume that the new platform supports POWER10. */ -- return 10; -+ /* Assume that the new platform supports POWER11. */ -+ return 11; - } - - static int -diff --git a/sysdeps/powerpc/preconfigure b/sysdeps/powerpc/preconfigure -index 4de94089a3..9e5a07ab6d 100644 ---- a/sysdeps/powerpc/preconfigure -+++ b/sysdeps/powerpc/preconfigure -@@ -58,7 +58,7 @@ fi - - ;; - -- a2|970|power[4-9]|power5x|power6+|power10) -+ a2|970|power[4-9]|power5x|power6+|power10|power11) - submachine=${archcpu} - if test ${libc_cv_cc_submachine+y} - then : -diff --git a/sysdeps/powerpc/preconfigure.ac b/sysdeps/powerpc/preconfigure.ac -index 6c63bd8257..14b6dafd4a 100644 ---- a/sysdeps/powerpc/preconfigure.ac -+++ b/sysdeps/powerpc/preconfigure.ac -@@ -46,7 +46,7 @@ case "${machine}:${submachine}" in - AC_CACHE_VAL(libc_cv_cc_submachine,libc_cv_cc_submachine="") - ;; - -- a2|970|power[[4-9]]|power5x|power6+|power10) -+ a2|970|power[[4-9]]|power5x|power6+|power10|power11) - submachine=${archcpu} - AC_CACHE_VAL(libc_cv_cc_submachine,libc_cv_cc_submachine="") - ;; - -commit 983f34a1252de3ca6f2305c211d86530ea42010e -Author: caiyinyu <caiyinyu@loongson.cn> -Date: Mon Mar 11 16:07:48 2024 +0800 - - LoongArch: Correct {__ieee754, _}_scalb -> {__ieee754, _}_scalbf - -diff --git a/sysdeps/loongarch/fpu/e_scalbf.c b/sysdeps/loongarch/fpu/e_scalbf.c -index 9f05485236..7c0395fbb5 100644 ---- a/sysdeps/loongarch/fpu/e_scalbf.c -+++ b/sysdeps/loongarch/fpu/e_scalbf.c -@@ -57,4 +57,4 @@ __ieee754_scalbf (float x, float fn) - - return x; - } --libm_alias_finite (__ieee754_scalb, __scalb) -+libm_alias_finite (__ieee754_scalbf, __scalbf) - -commit 7fc8242bf87828c935ac5df5cafb9dc7ab635fd9 -Author: H.J. Lu <hjl.tools@gmail.com> -Date: Fri Feb 16 07:17:10 2024 -0800 - - x86-64: Save APX registers in ld.so trampoline - - Add APX registers to STATE_SAVE_MASK so that APX registers are saved in - ld.so trampoline. This fixes BZ #31371. - - Also update STATE_SAVE_OFFSET and STATE_SAVE_MASK for i386 which will - be used by i386 _dl_tlsdesc_dynamic. - Reviewed-by: Noah Goldstein <goldstein.w.n@gmail.com> - - (cherry picked from commit dfb05f8e704edac70db38c4c8ee700769d91a413) - -diff --git a/sysdeps/x86/sysdep.h b/sysdeps/x86/sysdep.h -index 85d0a8c943..837fd28734 100644 ---- a/sysdeps/x86/sysdep.h -+++ b/sysdeps/x86/sysdep.h -@@ -21,14 +21,54 @@ - - #include <sysdeps/generic/sysdep.h> - -+/* The extended state feature IDs in the state component bitmap. */ -+#define X86_XSTATE_X87_ID 0 -+#define X86_XSTATE_SSE_ID 1 -+#define X86_XSTATE_AVX_ID 2 -+#define X86_XSTATE_BNDREGS_ID 3 -+#define X86_XSTATE_BNDCFG_ID 4 -+#define X86_XSTATE_K_ID 5 -+#define X86_XSTATE_ZMM_H_ID 6 -+#define X86_XSTATE_ZMM_ID 7 -+#define X86_XSTATE_PKRU_ID 9 -+#define X86_XSTATE_TILECFG_ID 17 -+#define X86_XSTATE_TILEDATA_ID 18 -+#define X86_XSTATE_APX_F_ID 19 -+ -+#ifdef __x86_64__ - /* Offset for fxsave/xsave area used by _dl_runtime_resolve. Also need - space to preserve RCX, RDX, RSI, RDI, R8, R9 and RAX. It must be -- aligned to 16 bytes for fxsave and 64 bytes for xsave. */ --#define STATE_SAVE_OFFSET (8 * 7 + 8) -- --/* Save SSE, AVX, AVX512, mask and bound registers. */ --#define STATE_SAVE_MASK \ -- ((1 << 1) | (1 << 2) | (1 << 3) | (1 << 5) | (1 << 6) | (1 << 7)) -+ aligned to 16 bytes for fxsave and 64 bytes for xsave. -+ -+ NB: Is is non-zero because of the 128-byte red-zone. Some registers -+ are saved on stack without adjusting stack pointer first. When we -+ update stack pointer to allocate more space, we need to take the -+ red-zone into account. */ -+# define STATE_SAVE_OFFSET (8 * 7 + 8) -+ -+/* Save SSE, AVX, AVX512, mask, bound and APX registers. Bound and APX -+ registers are mutually exclusive. */ -+# define STATE_SAVE_MASK \ -+ ((1 << X86_XSTATE_SSE_ID) \ -+ | (1 << X86_XSTATE_AVX_ID) \ -+ | (1 << X86_XSTATE_BNDREGS_ID) \ -+ | (1 << X86_XSTATE_K_ID) \ -+ | (1 << X86_XSTATE_ZMM_H_ID) \ -+ | (1 << X86_XSTATE_ZMM_ID) \ -+ | (1 << X86_XSTATE_APX_F_ID)) -+#else -+/* Offset for fxsave/xsave area used by _dl_tlsdesc_dynamic. Since i386 -+ doesn't have red-zone, use 0 here. */ -+# define STATE_SAVE_OFFSET 0 -+ -+/* Save SSE, AVX, AXV512, mask and bound registers. */ -+# define STATE_SAVE_MASK \ -+ ((1 << X86_XSTATE_SSE_ID) \ -+ | (1 << X86_XSTATE_AVX_ID) \ -+ | (1 << X86_XSTATE_BNDREGS_ID) \ -+ | (1 << X86_XSTATE_K_ID) \ -+ | (1 << X86_XSTATE_ZMM_H_ID)) -+#endif - - /* Constants for bits in __x86_string_control: */ - - -commit a364304718725a31ab141936322855c76c73e35e -Author: H.J. Lu <hjl.tools@gmail.com> -Date: Mon Feb 26 06:37:03 2024 -0800 - - x86: Update _dl_tlsdesc_dynamic to preserve caller-saved registers - - Compiler generates the following instruction sequence for GNU2 dynamic - TLS access: - - leaq tls_var@TLSDESC(%rip), %rax - call *tls_var@TLSCALL(%rax) - - or - - leal tls_var@TLSDESC(%ebx), %eax - call *tls_var@TLSCALL(%eax) - - CALL instruction is transparent to compiler which assumes all registers, - except for EFLAGS and RAX/EAX, are unchanged after CALL. When - _dl_tlsdesc_dynamic is called, it calls __tls_get_addr on the slow - path. __tls_get_addr is a normal function which doesn't preserve any - caller-saved registers. _dl_tlsdesc_dynamic saved and restored integer - caller-saved registers, but didn't preserve any other caller-saved - registers. Add _dl_tlsdesc_dynamic IFUNC functions for FNSAVE, FXSAVE, - XSAVE and XSAVEC to save and restore all caller-saved registers. This - fixes BZ #31372. - - Add GLRO(dl_x86_64_runtime_resolve) with GLRO(dl_x86_tlsdesc_dynamic) - to optimize elf_machine_runtime_setup. - Reviewed-by: Noah Goldstein <goldstein.w.n@gmail.com> - - (cherry picked from commit 0aac205a814a8511e98d02b91a8dc908f1c53cde) - -diff --git a/elf/Makefile b/elf/Makefile -index 5d78b659ce..c5c37a9147 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -424,6 +424,7 @@ tests += \ - tst-glibc-hwcaps-prepend \ - tst-global1 \ - tst-global2 \ -+ tst-gnu2-tls2 \ - tst-initfinilazyfail \ - tst-initorder \ - tst-initorder2 \ -@@ -846,6 +847,9 @@ modules-names += \ - tst-filterobj-flt \ - tst-finilazyfailmod \ - tst-globalmod2 \ -+ tst-gnu2-tls2mod0 \ -+ tst-gnu2-tls2mod1 \ -+ tst-gnu2-tls2mod2 \ - tst-initlazyfailmod \ - tst-initorder2a \ - tst-initorder2b \ -@@ -3044,8 +3048,22 @@ $(objpfx)tst-tlsgap.out: \ - $(objpfx)tst-tlsgap-mod0.so \ - $(objpfx)tst-tlsgap-mod1.so \ - $(objpfx)tst-tlsgap-mod2.so -+ -+$(objpfx)tst-gnu2-tls2: $(shared-thread-library) -+$(objpfx)tst-gnu2-tls2.out: \ -+ $(objpfx)tst-gnu2-tls2mod0.so \ -+ $(objpfx)tst-gnu2-tls2mod1.so \ -+ $(objpfx)tst-gnu2-tls2mod2.so -+ - ifeq (yes,$(have-mtls-dialect-gnu2)) -+# This test fails if dl_tlsdesc_dynamic doesn't preserve all caller-saved -+# registers. See https://sourceware.org/bugzilla/show_bug.cgi?id=31372 -+test-xfail-tst-gnu2-tls2 = yes -+ - CFLAGS-tst-tlsgap-mod0.c += -mtls-dialect=gnu2 - CFLAGS-tst-tlsgap-mod1.c += -mtls-dialect=gnu2 - CFLAGS-tst-tlsgap-mod2.c += -mtls-dialect=gnu2 -+CFLAGS-tst-gnu2-tls2mod0.c += -mtls-dialect=gnu2 -+CFLAGS-tst-gnu2-tls2mod1.c += -mtls-dialect=gnu2 -+CFLAGS-tst-gnu2-tls2mod2.c += -mtls-dialect=gnu2 - endif -diff --git a/elf/tst-gnu2-tls2.c b/elf/tst-gnu2-tls2.c -new file mode 100644 -index 0000000000..7ac04d7f33 ---- /dev/null -+++ b/elf/tst-gnu2-tls2.c -@@ -0,0 +1,122 @@ -+/* Test TLSDESC relocation. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <http://www.gnu.org/licenses/>. */ -+ -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <dlfcn.h> -+#include <pthread.h> -+#include <support/xdlfcn.h> -+#include <support/xthread.h> -+#include <support/check.h> -+#include <support/test-driver.h> -+#include "tst-gnu2-tls2.h" -+ -+#ifndef IS_SUPPORTED -+# define IS_SUPPORTED() true -+#endif -+ -+/* An architecture can define it to clobber caller-saved registers in -+ malloc below to verify that the implicit TLSDESC call won't change -+ caller-saved registers. */ -+#ifndef PREPARE_MALLOC -+# define PREPARE_MALLOC() -+#endif -+ -+extern void * __libc_malloc (size_t); -+ -+size_t malloc_counter = 0; -+ -+void * -+malloc (size_t n) -+{ -+ PREPARE_MALLOC (); -+ malloc_counter++; -+ return __libc_malloc (n); -+} -+ -+static void *mod[3]; -+#ifndef MOD -+# define MOD(i) "tst-gnu2-tls2mod" #i ".so" -+#endif -+static const char *modname[3] = { MOD(0), MOD(1), MOD(2) }; -+#undef MOD -+ -+static void -+open_mod (int i) -+{ -+ mod[i] = xdlopen (modname[i], RTLD_LAZY); -+ printf ("open %s\n", modname[i]); -+} -+ -+static void -+close_mod (int i) -+{ -+ xdlclose (mod[i]); -+ mod[i] = NULL; -+ printf ("close %s\n", modname[i]); -+} -+ -+static void -+access_mod (int i, const char *sym) -+{ -+ struct tls var = { -1, -1, -1, -1 }; -+ struct tls *(*f) (struct tls *) = xdlsym (mod[i], sym); -+ /* Check that our malloc is called. */ -+ malloc_counter = 0; -+ struct tls *p = f (&var); -+ TEST_VERIFY (malloc_counter != 0); -+ printf ("access %s: %s() = %p\n", modname[i], sym, p); -+ TEST_VERIFY_EXIT (memcmp (p, &var, sizeof (var)) == 0); -+ ++(p->a); -+} -+ -+static void * -+start (void *arg) -+{ -+ /* The DTV generation is at the last dlopen of mod0 and the -+ entry for mod1 is NULL. */ -+ -+ open_mod (1); /* Reuse modid of mod1. Uses dynamic TLS. */ -+ -+ /* Force the slow path in GNU2 TLS descriptor call. */ -+ access_mod (1, "apply_tls"); -+ -+ return arg; -+} -+ -+static int -+do_test (void) -+{ -+ if (!IS_SUPPORTED ()) -+ return EXIT_UNSUPPORTED; -+ -+ open_mod (0); -+ open_mod (1); -+ open_mod (2); -+ close_mod (0); -+ close_mod (1); /* Create modid gap at mod1. */ -+ open_mod (0); /* Reuse modid of mod0, bump generation count. */ -+ -+ /* Create a thread where DTV of mod1 is NULL. */ -+ pthread_t t = xpthread_create (NULL, start, NULL); -+ xpthread_join (t); -+ return 0; -+} -+ -+#include <support/test-driver.c> -diff --git a/elf/tst-gnu2-tls2.h b/elf/tst-gnu2-tls2.h -new file mode 100644 -index 0000000000..77964a57a3 ---- /dev/null -+++ b/elf/tst-gnu2-tls2.h -@@ -0,0 +1,36 @@ -+/* Test TLSDESC relocation. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <stdint.h> -+ -+struct tls -+{ -+ int64_t a, b, c, d; -+}; -+ -+extern struct tls *apply_tls (struct tls *); -+ -+/* An architecture can define them to verify that clobber caller-saved -+ registers aren't changed by the implicit TLSDESC call. */ -+#ifndef BEFORE_TLSDESC_CALL -+# define BEFORE_TLSDESC_CALL() -+#endif -+ -+#ifndef AFTER_TLSDESC_CALL -+# define AFTER_TLSDESC_CALL() -+#endif -diff --git a/elf/tst-gnu2-tls2mod0.c b/elf/tst-gnu2-tls2mod0.c -new file mode 100644 -index 0000000000..45556a0e17 ---- /dev/null -+++ b/elf/tst-gnu2-tls2mod0.c -@@ -0,0 +1,31 @@ -+/* DSO used by tst-gnu2-tls2. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include "tst-gnu2-tls2.h" -+ -+__thread struct tls tls_var0 __attribute__ ((visibility ("hidden"))); -+ -+struct tls * -+apply_tls (struct tls *p) -+{ -+ BEFORE_TLSDESC_CALL (); -+ tls_var0 = *p; -+ struct tls *ret = &tls_var0; -+ AFTER_TLSDESC_CALL (); -+ return ret; -+} -diff --git a/elf/tst-gnu2-tls2mod1.c b/elf/tst-gnu2-tls2mod1.c -new file mode 100644 -index 0000000000..e10b9dbc0a ---- /dev/null -+++ b/elf/tst-gnu2-tls2mod1.c -@@ -0,0 +1,31 @@ -+/* DSO used by tst-gnu2-tls2. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include "tst-gnu2-tls2.h" -+ -+__thread struct tls tls_var1[100] __attribute__ ((visibility ("hidden"))); -+ -+struct tls * -+apply_tls (struct tls *p) -+{ -+ BEFORE_TLSDESC_CALL (); -+ tls_var1[1] = *p; -+ struct tls *ret = &tls_var1[1]; -+ AFTER_TLSDESC_CALL (); -+ return ret; -+} -diff --git a/elf/tst-gnu2-tls2mod2.c b/elf/tst-gnu2-tls2mod2.c -new file mode 100644 -index 0000000000..141af51e55 ---- /dev/null -+++ b/elf/tst-gnu2-tls2mod2.c -@@ -0,0 +1,31 @@ -+/* DSO used by tst-gnu2-tls2. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include "tst-gnu2-tls2.h" -+ -+__thread struct tls tls_var2 __attribute__ ((visibility ("hidden"))); -+ -+struct tls * -+apply_tls (struct tls *p) -+{ -+ BEFORE_TLSDESC_CALL (); -+ tls_var2 = *p; -+ struct tls *ret = &tls_var2; -+ AFTER_TLSDESC_CALL (); -+ return ret; -+} -diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h -index fc1ef96587..50d74fe6e9 100644 ---- a/sysdeps/i386/dl-machine.h -+++ b/sysdeps/i386/dl-machine.h -@@ -347,7 +347,7 @@ and creates an unsatisfiable circular dependency.\n", - { - td->arg = _dl_make_tlsdesc_dynamic - (sym_map, sym->st_value + (ElfW(Word))td->arg); -- td->entry = _dl_tlsdesc_dynamic; -+ td->entry = GLRO(dl_x86_tlsdesc_dynamic); - } - else - # endif -diff --git a/sysdeps/i386/dl-tlsdesc-dynamic.h b/sysdeps/i386/dl-tlsdesc-dynamic.h -new file mode 100644 -index 0000000000..3627028577 ---- /dev/null -+++ b/sysdeps/i386/dl-tlsdesc-dynamic.h -@@ -0,0 +1,190 @@ -+/* Thread-local storage handling in the ELF dynamic linker. i386 version. -+ Copyright (C) 2004-2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#undef REGISTER_SAVE_AREA -+ -+#if !defined USE_FNSAVE && (STATE_SAVE_ALIGNMENT % 16) != 0 -+# error STATE_SAVE_ALIGNMENT must be multiple of 16 -+#endif -+ -+#if DL_RUNTIME_RESOLVE_REALIGN_STACK -+# ifdef USE_FNSAVE -+# error USE_FNSAVE shouldn't be defined -+# endif -+# ifdef USE_FXSAVE -+/* Use fxsave to save all registers. */ -+# define REGISTER_SAVE_AREA 512 -+# endif -+#else -+# ifdef USE_FNSAVE -+/* Use fnsave to save x87 FPU stack registers. */ -+# define REGISTER_SAVE_AREA 108 -+# else -+# ifndef USE_FXSAVE -+# error USE_FXSAVE must be defined -+# endif -+/* Use fxsave to save all registers. Add 12 bytes to align the stack -+ to 16 bytes. */ -+# define REGISTER_SAVE_AREA (512 + 12) -+# endif -+#endif -+ -+ .hidden _dl_tlsdesc_dynamic -+ .global _dl_tlsdesc_dynamic -+ .type _dl_tlsdesc_dynamic,@function -+ -+ /* This function is used for symbols that need dynamic TLS. -+ -+ %eax points to the TLS descriptor, such that 0(%eax) points to -+ _dl_tlsdesc_dynamic itself, and 4(%eax) points to a struct -+ tlsdesc_dynamic_arg object. It must return in %eax the offset -+ between the thread pointer and the object denoted by the -+ argument, without clobbering any registers. -+ -+ The assembly code that follows is a rendition of the following -+ C code, hand-optimized a little bit. -+ -+ptrdiff_t -+__attribute__ ((__regparm__ (1))) -+_dl_tlsdesc_dynamic (struct tlsdesc *tdp) -+{ -+ struct tlsdesc_dynamic_arg *td = tdp->arg; -+ dtv_t *dtv = *(dtv_t **)((char *)__thread_pointer + DTV_OFFSET); -+ if (__builtin_expect (td->gen_count <= dtv[0].counter -+ && (dtv[td->tlsinfo.ti_module].pointer.val -+ != TLS_DTV_UNALLOCATED), -+ 1)) -+ return dtv[td->tlsinfo.ti_module].pointer.val + td->tlsinfo.ti_offset -+ - __thread_pointer; -+ -+ return ___tls_get_addr (&td->tlsinfo) - __thread_pointer; -+} -+*/ -+ cfi_startproc -+ .align 16 -+_dl_tlsdesc_dynamic: -+ /* Like all TLS resolvers, preserve call-clobbered registers. -+ We need two scratch regs anyway. */ -+ subl $32, %esp -+ cfi_adjust_cfa_offset (32) -+ movl %ecx, 20(%esp) -+ movl %edx, 24(%esp) -+ movl TLSDESC_ARG(%eax), %eax -+ movl %gs:DTV_OFFSET, %edx -+ movl TLSDESC_GEN_COUNT(%eax), %ecx -+ cmpl (%edx), %ecx -+ ja 2f -+ movl TLSDESC_MODID(%eax), %ecx -+ movl (%edx,%ecx,8), %edx -+ cmpl $-1, %edx -+ je 2f -+ movl TLSDESC_MODOFF(%eax), %eax -+ addl %edx, %eax -+1: -+ movl 20(%esp), %ecx -+ subl %gs:0, %eax -+ movl 24(%esp), %edx -+ addl $32, %esp -+ cfi_adjust_cfa_offset (-32) -+ ret -+ .p2align 4,,7 -+2: -+ cfi_adjust_cfa_offset (32) -+#if DL_RUNTIME_RESOLVE_REALIGN_STACK -+ movl %ebx, -28(%esp) -+ movl %esp, %ebx -+ cfi_def_cfa_register(%ebx) -+ and $-STATE_SAVE_ALIGNMENT, %esp -+#endif -+#ifdef REGISTER_SAVE_AREA -+ subl $REGISTER_SAVE_AREA, %esp -+# if !DL_RUNTIME_RESOLVE_REALIGN_STACK -+ cfi_adjust_cfa_offset(REGISTER_SAVE_AREA) -+# endif -+#else -+# if !DL_RUNTIME_RESOLVE_REALIGN_STACK -+# error DL_RUNTIME_RESOLVE_REALIGN_STACK must be true -+# endif -+ /* Allocate stack space of the required size to save the state. */ -+ LOAD_PIC_REG (cx) -+ subl RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET+XSAVE_STATE_SIZE_OFFSET+_rtld_local_ro@GOTOFF(%ecx), %esp -+#endif -+#ifdef USE_FNSAVE -+ fnsave (%esp) -+#elif defined USE_FXSAVE -+ fxsave (%esp) -+#else -+ /* Save the argument for ___tls_get_addr in EAX. */ -+ movl %eax, %ecx -+ movl $TLSDESC_CALL_STATE_SAVE_MASK, %eax -+ xorl %edx, %edx -+ /* Clear the XSAVE Header. */ -+# ifdef USE_XSAVE -+ movl %edx, (512)(%esp) -+ movl %edx, (512 + 4 * 1)(%esp) -+ movl %edx, (512 + 4 * 2)(%esp) -+ movl %edx, (512 + 4 * 3)(%esp) -+# endif -+ movl %edx, (512 + 4 * 4)(%esp) -+ movl %edx, (512 + 4 * 5)(%esp) -+ movl %edx, (512 + 4 * 6)(%esp) -+ movl %edx, (512 + 4 * 7)(%esp) -+ movl %edx, (512 + 4 * 8)(%esp) -+ movl %edx, (512 + 4 * 9)(%esp) -+ movl %edx, (512 + 4 * 10)(%esp) -+ movl %edx, (512 + 4 * 11)(%esp) -+ movl %edx, (512 + 4 * 12)(%esp) -+ movl %edx, (512 + 4 * 13)(%esp) -+ movl %edx, (512 + 4 * 14)(%esp) -+ movl %edx, (512 + 4 * 15)(%esp) -+# ifdef USE_XSAVE -+ xsave (%esp) -+# else -+ xsavec (%esp) -+# endif -+ /* Restore the argument for ___tls_get_addr in EAX. */ -+ movl %ecx, %eax -+#endif -+ call HIDDEN_JUMPTARGET (___tls_get_addr) -+ /* Get register content back. */ -+#ifdef USE_FNSAVE -+ frstor (%esp) -+#elif defined USE_FXSAVE -+ fxrstor (%esp) -+#else -+ /* Save and retore ___tls_get_addr return value stored in EAX. */ -+ movl %eax, %ecx -+ movl $TLSDESC_CALL_STATE_SAVE_MASK, %eax -+ xorl %edx, %edx -+ xrstor (%esp) -+ movl %ecx, %eax -+#endif -+#if DL_RUNTIME_RESOLVE_REALIGN_STACK -+ mov %ebx, %esp -+ cfi_def_cfa_register(%esp) -+ movl -28(%esp), %ebx -+ cfi_restore(%ebx) -+#else -+ addl $REGISTER_SAVE_AREA, %esp -+ cfi_adjust_cfa_offset(-REGISTER_SAVE_AREA) -+#endif -+ jmp 1b -+ cfi_endproc -+ .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic -+ -+#undef STATE_SAVE_ALIGNMENT -diff --git a/sysdeps/i386/dl-tlsdesc.S b/sysdeps/i386/dl-tlsdesc.S -index 90d93caa0c..f002feee56 100644 ---- a/sysdeps/i386/dl-tlsdesc.S -+++ b/sysdeps/i386/dl-tlsdesc.S -@@ -18,8 +18,27 @@ - - #include <sysdep.h> - #include <tls.h> -+#include <cpu-features-offsets.h> -+#include <features-offsets.h> - #include "tlsdesc.h" - -+#ifndef DL_STACK_ALIGNMENT -+/* Due to GCC bug: -+ -+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58066 -+ -+ __tls_get_addr may be called with 4-byte stack alignment. Although -+ this bug has been fixed in GCC 4.9.4, 5.3 and 6, we can't assume -+ that stack will be always aligned at 16 bytes. */ -+# define DL_STACK_ALIGNMENT 4 -+#endif -+ -+/* True if _dl_tlsdesc_dynamic should align stack for STATE_SAVE or align -+ stack to MINIMUM_ALIGNMENT bytes before calling ___tls_get_addr. */ -+#define DL_RUNTIME_RESOLVE_REALIGN_STACK \ -+ (STATE_SAVE_ALIGNMENT > DL_STACK_ALIGNMENT \ -+ || MINIMUM_ALIGNMENT > DL_STACK_ALIGNMENT) -+ - .text - - /* This function is used to compute the TP offset for symbols in -@@ -65,69 +84,35 @@ _dl_tlsdesc_undefweak: - .size _dl_tlsdesc_undefweak, .-_dl_tlsdesc_undefweak - - #ifdef SHARED -- .hidden _dl_tlsdesc_dynamic -- .global _dl_tlsdesc_dynamic -- .type _dl_tlsdesc_dynamic,@function -- -- /* This function is used for symbols that need dynamic TLS. -- -- %eax points to the TLS descriptor, such that 0(%eax) points to -- _dl_tlsdesc_dynamic itself, and 4(%eax) points to a struct -- tlsdesc_dynamic_arg object. It must return in %eax the offset -- between the thread pointer and the object denoted by the -- argument, without clobbering any registers. -- -- The assembly code that follows is a rendition of the following -- C code, hand-optimized a little bit. -- --ptrdiff_t --__attribute__ ((__regparm__ (1))) --_dl_tlsdesc_dynamic (struct tlsdesc *tdp) --{ -- struct tlsdesc_dynamic_arg *td = tdp->arg; -- dtv_t *dtv = *(dtv_t **)((char *)__thread_pointer + DTV_OFFSET); -- if (__builtin_expect (td->gen_count <= dtv[0].counter -- && (dtv[td->tlsinfo.ti_module].pointer.val -- != TLS_DTV_UNALLOCATED), -- 1)) -- return dtv[td->tlsinfo.ti_module].pointer.val + td->tlsinfo.ti_offset -- - __thread_pointer; -- -- return ___tls_get_addr (&td->tlsinfo) - __thread_pointer; --} --*/ -- cfi_startproc -- .align 16 --_dl_tlsdesc_dynamic: -- /* Like all TLS resolvers, preserve call-clobbered registers. -- We need two scratch regs anyway. */ -- subl $28, %esp -- cfi_adjust_cfa_offset (28) -- movl %ecx, 20(%esp) -- movl %edx, 24(%esp) -- movl TLSDESC_ARG(%eax), %eax -- movl %gs:DTV_OFFSET, %edx -- movl TLSDESC_GEN_COUNT(%eax), %ecx -- cmpl (%edx), %ecx -- ja .Lslow -- movl TLSDESC_MODID(%eax), %ecx -- movl (%edx,%ecx,8), %edx -- cmpl $-1, %edx -- je .Lslow -- movl TLSDESC_MODOFF(%eax), %eax -- addl %edx, %eax --.Lret: -- movl 20(%esp), %ecx -- subl %gs:0, %eax -- movl 24(%esp), %edx -- addl $28, %esp -- cfi_adjust_cfa_offset (-28) -- ret -- .p2align 4,,7 --.Lslow: -- cfi_adjust_cfa_offset (28) -- call HIDDEN_JUMPTARGET (___tls_get_addr) -- jmp .Lret -- cfi_endproc -- .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic -+# define USE_FNSAVE -+# define MINIMUM_ALIGNMENT 4 -+# define STATE_SAVE_ALIGNMENT 4 -+# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fnsave -+# include "dl-tlsdesc-dynamic.h" -+# undef _dl_tlsdesc_dynamic -+# undef MINIMUM_ALIGNMENT -+# undef USE_FNSAVE -+ -+# define MINIMUM_ALIGNMENT 16 -+ -+# define USE_FXSAVE -+# define STATE_SAVE_ALIGNMENT 16 -+# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fxsave -+# include "dl-tlsdesc-dynamic.h" -+# undef _dl_tlsdesc_dynamic -+# undef USE_FXSAVE -+ -+# define USE_XSAVE -+# define STATE_SAVE_ALIGNMENT 64 -+# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_xsave -+# include "dl-tlsdesc-dynamic.h" -+# undef _dl_tlsdesc_dynamic -+# undef USE_XSAVE -+ -+# define USE_XSAVEC -+# define STATE_SAVE_ALIGNMENT 64 -+# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_xsavec -+# include "dl-tlsdesc-dynamic.h" -+# undef _dl_tlsdesc_dynamic -+# undef USE_XSAVEC - #endif /* SHARED */ -diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile -index 4d50b327b5..992aabe43e 100644 ---- a/sysdeps/x86/Makefile -+++ b/sysdeps/x86/Makefile -@@ -1,5 +1,5 @@ - ifeq ($(subdir),csu) --gen-as-const-headers += cpu-features-offsets.sym -+gen-as-const-headers += cpu-features-offsets.sym features-offsets.sym - endif - - ifeq ($(subdir),elf) -@@ -86,6 +86,11 @@ endif - tst-ifunc-isa-2-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-SSE4_2,-AVX,-AVX2,-AVX512F - tst-ifunc-isa-2-static-ENV = $(tst-ifunc-isa-2-ENV) - tst-hwcap-tunables-ARGS = -- $(host-test-program-cmd) -+ -+CFLAGS-tst-gnu2-tls2.c += -msse -+CFLAGS-tst-gnu2-tls2mod0.c += -msse2 -mtune=haswell -+CFLAGS-tst-gnu2-tls2mod1.c += -msse2 -mtune=haswell -+CFLAGS-tst-gnu2-tls2mod2.c += -msse2 -mtune=haswell - endif - - ifeq ($(subdir),math) -diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c -index 25e6622a79..835113b42f 100644 ---- a/sysdeps/x86/cpu-features.c -+++ b/sysdeps/x86/cpu-features.c -@@ -27,8 +27,13 @@ - extern void TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *) - attribute_hidden; - --#if defined SHARED && defined __x86_64__ --# include <dl-plt-rewrite.h> -+#if defined SHARED -+extern void _dl_tlsdesc_dynamic_fxsave (void) attribute_hidden; -+extern void _dl_tlsdesc_dynamic_xsave (void) attribute_hidden; -+extern void _dl_tlsdesc_dynamic_xsavec (void) attribute_hidden; -+ -+# ifdef __x86_64__ -+# include <dl-plt-rewrite.h> - - static void - TUNABLE_CALLBACK (set_plt_rewrite) (tunable_val_t *valp) -@@ -47,6 +52,15 @@ TUNABLE_CALLBACK (set_plt_rewrite) (tunable_val_t *valp) - : plt_rewrite_jmp); - } - } -+# else -+extern void _dl_tlsdesc_dynamic_fnsave (void) attribute_hidden; -+# endif -+#endif -+ -+#ifdef __x86_64__ -+extern void _dl_runtime_resolve_fxsave (void) attribute_hidden; -+extern void _dl_runtime_resolve_xsave (void) attribute_hidden; -+extern void _dl_runtime_resolve_xsavec (void) attribute_hidden; - #endif - - #ifdef __LP64__ -@@ -1130,6 +1144,44 @@ no_cpuid: - TUNABLE_CALLBACK (set_x86_shstk)); - #endif - -+ if (GLRO(dl_x86_cpu_features).xsave_state_size != 0) -+ { -+ if (CPU_FEATURE_USABLE_P (cpu_features, XSAVEC)) -+ { -+#ifdef __x86_64__ -+ GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_xsavec; -+#endif -+#ifdef SHARED -+ GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_xsavec; -+#endif -+ } -+ else -+ { -+#ifdef __x86_64__ -+ GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_xsave; -+#endif -+#ifdef SHARED -+ GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_xsave; -+#endif -+ } -+ } -+ else -+ { -+#ifdef __x86_64__ -+ GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_fxsave; -+# ifdef SHARED -+ GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; -+# endif -+#else -+# ifdef SHARED -+ if (CPU_FEATURE_USABLE_P (cpu_features, FXSR)) -+ GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; -+ else -+ GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fnsave; -+# endif -+#endif -+ } -+ - #ifdef SHARED - # ifdef __x86_64__ - TUNABLE_GET (plt_rewrite, tunable_val_t *, -diff --git a/sysdeps/x86/dl-procinfo.c b/sysdeps/x86/dl-procinfo.c -index ee957b4d70..5920d4b320 100644 ---- a/sysdeps/x86/dl-procinfo.c -+++ b/sysdeps/x86/dl-procinfo.c -@@ -86,3 +86,19 @@ PROCINFO_CLASS const char _dl_x86_platforms[4][9] - #else - , - #endif -+ -+#if defined SHARED && !IS_IN (ldconfig) -+# if !defined PROCINFO_DECL -+ ._dl_x86_tlsdesc_dynamic -+# else -+PROCINFO_CLASS void * _dl_x86_tlsdesc_dynamic -+# endif -+# ifndef PROCINFO_DECL -+= NULL -+# endif -+# ifdef PROCINFO_DECL -+; -+# else -+, -+# endif -+#endif -diff --git a/sysdeps/x86_64/features-offsets.sym b/sysdeps/x86/features-offsets.sym -similarity index 89% -rename from sysdeps/x86_64/features-offsets.sym -rename to sysdeps/x86/features-offsets.sym -index 9e4be3393a..77e990c705 100644 ---- a/sysdeps/x86_64/features-offsets.sym -+++ b/sysdeps/x86/features-offsets.sym -@@ -3,4 +3,6 @@ - #include <ldsodefs.h> - - RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET offsetof (struct rtld_global_ro, _dl_x86_cpu_features) -+#ifdef __x86_64__ - RTLD_GLOBAL_DL_X86_FEATURE_1_OFFSET offsetof (struct rtld_global, _dl_x86_feature_1) -+#endif -diff --git a/sysdeps/x86/sysdep.h b/sysdeps/x86/sysdep.h -index 837fd28734..485cad9c02 100644 ---- a/sysdeps/x86/sysdep.h -+++ b/sysdeps/x86/sysdep.h -@@ -70,6 +70,12 @@ - | (1 << X86_XSTATE_ZMM_H_ID)) - #endif - -+/* States which should be saved for TLSDESC_CALL and TLS_DESC_CALL. -+ Compiler assumes that all registers, including x87 FPU stack registers, -+ are unchanged after CALL, except for EFLAGS and RAX/EAX. */ -+#define TLSDESC_CALL_STATE_SAVE_MASK \ -+ (STATE_SAVE_MASK | (1 << X86_XSTATE_X87_ID)) -+ - /* Constants for bits in __x86_string_control: */ - - /* Avoid short distance REP MOVSB. */ -diff --git a/sysdeps/x86/tst-gnu2-tls2.c b/sysdeps/x86/tst-gnu2-tls2.c -new file mode 100644 -index 0000000000..de900a423b ---- /dev/null -+++ b/sysdeps/x86/tst-gnu2-tls2.c -@@ -0,0 +1,20 @@ -+#ifndef __x86_64__ -+#include <sys/platform/x86.h> -+ -+#define IS_SUPPORTED() CPU_FEATURE_ACTIVE (SSE2) -+#endif -+ -+/* Clear XMM0...XMM7 */ -+#define PREPARE_MALLOC() \ -+{ \ -+ asm volatile ("xorps %%xmm0, %%xmm0" : : : "xmm0" ); \ -+ asm volatile ("xorps %%xmm1, %%xmm1" : : : "xmm1" ); \ -+ asm volatile ("xorps %%xmm2, %%xmm2" : : : "xmm2" ); \ -+ asm volatile ("xorps %%xmm3, %%xmm3" : : : "xmm3" ); \ -+ asm volatile ("xorps %%xmm4, %%xmm4" : : : "xmm4" ); \ -+ asm volatile ("xorps %%xmm5, %%xmm5" : : : "xmm5" ); \ -+ asm volatile ("xorps %%xmm6, %%xmm6" : : : "xmm6" ); \ -+ asm volatile ("xorps %%xmm7, %%xmm7" : : : "xmm7" ); \ -+} -+ -+#include <elf/tst-gnu2-tls2.c> -diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile -index 90f4ecfd26..e8babc9a4e 100644 ---- a/sysdeps/x86_64/Makefile -+++ b/sysdeps/x86_64/Makefile -@@ -10,7 +10,7 @@ LDFLAGS-rtld += -Wl,-z,nomark-plt - endif - - ifeq ($(subdir),csu) --gen-as-const-headers += features-offsets.sym link-defines.sym -+gen-as-const-headers += link-defines.sym - endif - - ifeq ($(subdir),gmon) -diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h -index 6d605d0d32..ff5d45f7cb 100644 ---- a/sysdeps/x86_64/dl-machine.h -+++ b/sysdeps/x86_64/dl-machine.h -@@ -71,9 +71,6 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], - int lazy, int profile) - { - Elf64_Addr *got; -- extern void _dl_runtime_resolve_fxsave (ElfW(Word)) attribute_hidden; -- extern void _dl_runtime_resolve_xsave (ElfW(Word)) attribute_hidden; -- extern void _dl_runtime_resolve_xsavec (ElfW(Word)) attribute_hidden; - extern void _dl_runtime_profile_sse (ElfW(Word)) attribute_hidden; - extern void _dl_runtime_profile_avx (ElfW(Word)) attribute_hidden; - extern void _dl_runtime_profile_avx512 (ElfW(Word)) attribute_hidden; -@@ -96,8 +93,6 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], - /* Identify this shared object. */ - *(ElfW(Addr) *) (got + 1) = (ElfW(Addr)) l; - -- const struct cpu_features* cpu_features = __get_cpu_features (); -- - #ifdef SHARED - /* The got[2] entry contains the address of a function which gets - called to get the address of a so far unresolved function and -@@ -107,6 +102,7 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], - end in this function. */ - if (__glibc_unlikely (profile)) - { -+ const struct cpu_features* cpu_features = __get_cpu_features (); - if (X86_ISA_CPU_FEATURE_USABLE_P (cpu_features, AVX512F)) - *(ElfW(Addr) *) (got + 2) = (ElfW(Addr)) &_dl_runtime_profile_avx512; - else if (X86_ISA_CPU_FEATURE_USABLE_P (cpu_features, AVX)) -@@ -126,15 +122,8 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], - /* This function will get called to fix up the GOT entry - indicated by the offset on the stack, and then jump to - the resolved address. */ -- if (MINIMUM_X86_ISA_LEVEL >= AVX_X86_ISA_LEVEL -- || GLRO(dl_x86_cpu_features).xsave_state_size != 0) -- *(ElfW(Addr) *) (got + 2) -- = (CPU_FEATURE_USABLE_P (cpu_features, XSAVEC) -- ? (ElfW(Addr)) &_dl_runtime_resolve_xsavec -- : (ElfW(Addr)) &_dl_runtime_resolve_xsave); -- else -- *(ElfW(Addr) *) (got + 2) -- = (ElfW(Addr)) &_dl_runtime_resolve_fxsave; -+ *(ElfW(Addr) *) (got + 2) -+ = (ElfW(Addr)) GLRO(dl_x86_64_runtime_resolve); - } - } - -@@ -383,7 +372,7 @@ and creates an unsatisfiable circular dependency.\n", - { - td->arg = _dl_make_tlsdesc_dynamic - (sym_map, sym->st_value + reloc->r_addend); -- td->entry = _dl_tlsdesc_dynamic; -+ td->entry = GLRO(dl_x86_tlsdesc_dynamic); - } - else - # endif -diff --git a/sysdeps/x86_64/dl-procinfo.c b/sysdeps/x86_64/dl-procinfo.c -index 4d1d790fbb..06637a8154 100644 ---- a/sysdeps/x86_64/dl-procinfo.c -+++ b/sysdeps/x86_64/dl-procinfo.c -@@ -41,5 +41,21 @@ - - #include <sysdeps/x86/dl-procinfo.c> - -+#if !IS_IN (ldconfig) -+# if !defined PROCINFO_DECL && defined SHARED -+ ._dl_x86_64_runtime_resolve -+# else -+PROCINFO_CLASS void * _dl_x86_64_runtime_resolve -+# endif -+# ifndef PROCINFO_DECL -+= NULL -+# endif -+# if !defined SHARED || defined PROCINFO_DECL -+; -+# else -+, -+# endif -+#endif -+ - #undef PROCINFO_DECL - #undef PROCINFO_CLASS -diff --git a/sysdeps/x86_64/dl-tlsdesc-dynamic.h b/sysdeps/x86_64/dl-tlsdesc-dynamic.h -new file mode 100644 -index 0000000000..0c2e8d5320 ---- /dev/null -+++ b/sysdeps/x86_64/dl-tlsdesc-dynamic.h -@@ -0,0 +1,166 @@ -+/* Thread-local storage handling in the ELF dynamic linker. x86_64 version. -+ Copyright (C) 2004-2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#ifndef SECTION -+# define SECTION(p) p -+#endif -+ -+#undef REGISTER_SAVE_AREA -+#undef LOCAL_STORAGE_AREA -+#undef BASE -+ -+#include "dl-trampoline-state.h" -+ -+ .section SECTION(.text),"ax",@progbits -+ -+ .hidden _dl_tlsdesc_dynamic -+ .global _dl_tlsdesc_dynamic -+ .type _dl_tlsdesc_dynamic,@function -+ -+ /* %rax points to the TLS descriptor, such that 0(%rax) points to -+ _dl_tlsdesc_dynamic itself, and 8(%rax) points to a struct -+ tlsdesc_dynamic_arg object. It must return in %rax the offset -+ between the thread pointer and the object denoted by the -+ argument, without clobbering any registers. -+ -+ The assembly code that follows is a rendition of the following -+ C code, hand-optimized a little bit. -+ -+ptrdiff_t -+_dl_tlsdesc_dynamic (register struct tlsdesc *tdp asm ("%rax")) -+{ -+ struct tlsdesc_dynamic_arg *td = tdp->arg; -+ dtv_t *dtv = *(dtv_t **)((char *)__thread_pointer + DTV_OFFSET); -+ if (__builtin_expect (td->gen_count <= dtv[0].counter -+ && (dtv[td->tlsinfo.ti_module].pointer.val -+ != TLS_DTV_UNALLOCATED), -+ 1)) -+ return dtv[td->tlsinfo.ti_module].pointer.val + td->tlsinfo.ti_offset -+ - __thread_pointer; -+ -+ return __tls_get_addr_internal (&td->tlsinfo) - __thread_pointer; -+} -+*/ -+ cfi_startproc -+ .align 16 -+_dl_tlsdesc_dynamic: -+ _CET_ENDBR -+ /* Preserve call-clobbered registers that we modify. -+ We need two scratch regs anyway. */ -+ movq %rsi, -16(%rsp) -+ mov %fs:DTV_OFFSET, %RSI_LP -+ movq %rdi, -8(%rsp) -+ movq TLSDESC_ARG(%rax), %rdi -+ movq (%rsi), %rax -+ cmpq %rax, TLSDESC_GEN_COUNT(%rdi) -+ ja 2f -+ movq TLSDESC_MODID(%rdi), %rax -+ salq $4, %rax -+ movq (%rax,%rsi), %rax -+ cmpq $-1, %rax -+ je 2f -+ addq TLSDESC_MODOFF(%rdi), %rax -+1: -+ movq -16(%rsp), %rsi -+ sub %fs:0, %RAX_LP -+ movq -8(%rsp), %rdi -+ ret -+2: -+#if DL_RUNTIME_RESOLVE_REALIGN_STACK -+ movq %rbx, -24(%rsp) -+ mov %RSP_LP, %RBX_LP -+ cfi_def_cfa_register(%rbx) -+ and $-STATE_SAVE_ALIGNMENT, %RSP_LP -+#endif -+#ifdef REGISTER_SAVE_AREA -+# if DL_RUNTIME_RESOLVE_REALIGN_STACK -+ /* STATE_SAVE_OFFSET has space for 8 integer registers. But we -+ need space for RCX, RDX, RSI, RDI, R8, R9, R10 and R11, plus -+ RBX above. */ -+ sub $(REGISTER_SAVE_AREA + STATE_SAVE_ALIGNMENT), %RSP_LP -+# else -+ sub $REGISTER_SAVE_AREA, %RSP_LP -+ cfi_adjust_cfa_offset(REGISTER_SAVE_AREA) -+# endif -+#else -+ /* Allocate stack space of the required size to save the state. */ -+ sub _rtld_local_ro+RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET+XSAVE_STATE_SIZE_OFFSET(%rip), %RSP_LP -+#endif -+ /* Besides rdi and rsi, saved above, save rcx, rdx, r8, r9, -+ r10 and r11. */ -+ movq %rcx, REGISTER_SAVE_RCX(%rsp) -+ movq %rdx, REGISTER_SAVE_RDX(%rsp) -+ movq %r8, REGISTER_SAVE_R8(%rsp) -+ movq %r9, REGISTER_SAVE_R9(%rsp) -+ movq %r10, REGISTER_SAVE_R10(%rsp) -+ movq %r11, REGISTER_SAVE_R11(%rsp) -+#ifdef USE_FXSAVE -+ fxsave STATE_SAVE_OFFSET(%rsp) -+#else -+ movl $TLSDESC_CALL_STATE_SAVE_MASK, %eax -+ xorl %edx, %edx -+ /* Clear the XSAVE Header. */ -+# ifdef USE_XSAVE -+ movq %rdx, (STATE_SAVE_OFFSET + 512)(%rsp) -+ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8)(%rsp) -+# endif -+ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 2)(%rsp) -+ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 3)(%rsp) -+ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 4)(%rsp) -+ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 5)(%rsp) -+ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 6)(%rsp) -+ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 7)(%rsp) -+# ifdef USE_XSAVE -+ xsave STATE_SAVE_OFFSET(%rsp) -+# else -+ xsavec STATE_SAVE_OFFSET(%rsp) -+# endif -+#endif -+ /* %rdi already points to the tlsinfo data structure. */ -+ call HIDDEN_JUMPTARGET (__tls_get_addr) -+ # Get register content back. -+#ifdef USE_FXSAVE -+ fxrstor STATE_SAVE_OFFSET(%rsp) -+#else -+ /* Save and retore __tls_get_addr return value stored in RAX. */ -+ mov %RAX_LP, %RCX_LP -+ movl $TLSDESC_CALL_STATE_SAVE_MASK, %eax -+ xorl %edx, %edx -+ xrstor STATE_SAVE_OFFSET(%rsp) -+ mov %RCX_LP, %RAX_LP -+#endif -+ movq REGISTER_SAVE_R11(%rsp), %r11 -+ movq REGISTER_SAVE_R10(%rsp), %r10 -+ movq REGISTER_SAVE_R9(%rsp), %r9 -+ movq REGISTER_SAVE_R8(%rsp), %r8 -+ movq REGISTER_SAVE_RDX(%rsp), %rdx -+ movq REGISTER_SAVE_RCX(%rsp), %rcx -+#if DL_RUNTIME_RESOLVE_REALIGN_STACK -+ mov %RBX_LP, %RSP_LP -+ cfi_def_cfa_register(%rsp) -+ movq -24(%rsp), %rbx -+ cfi_restore(%rbx) -+#else -+ add $REGISTER_SAVE_AREA, %RSP_LP -+ cfi_adjust_cfa_offset(-REGISTER_SAVE_AREA) -+#endif -+ jmp 1b -+ cfi_endproc -+ .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic -+ -+#undef STATE_SAVE_ALIGNMENT -diff --git a/sysdeps/x86_64/dl-tlsdesc.S b/sysdeps/x86_64/dl-tlsdesc.S -index f748af2ece..ea69f5223a 100644 ---- a/sysdeps/x86_64/dl-tlsdesc.S -+++ b/sysdeps/x86_64/dl-tlsdesc.S -@@ -18,7 +18,19 @@ - - #include <sysdep.h> - #include <tls.h> -+#include <cpu-features-offsets.h> -+#include <features-offsets.h> - #include "tlsdesc.h" -+#include "dl-trampoline-save.h" -+ -+/* Area on stack to save and restore registers used for parameter -+ passing when calling _dl_tlsdesc_dynamic. */ -+#define REGISTER_SAVE_RCX 0 -+#define REGISTER_SAVE_RDX (REGISTER_SAVE_RCX + 8) -+#define REGISTER_SAVE_R8 (REGISTER_SAVE_RDX + 8) -+#define REGISTER_SAVE_R9 (REGISTER_SAVE_R8 + 8) -+#define REGISTER_SAVE_R10 (REGISTER_SAVE_R9 + 8) -+#define REGISTER_SAVE_R11 (REGISTER_SAVE_R10 + 8) - - .text - -@@ -67,80 +79,24 @@ _dl_tlsdesc_undefweak: - .size _dl_tlsdesc_undefweak, .-_dl_tlsdesc_undefweak - - #ifdef SHARED -- .hidden _dl_tlsdesc_dynamic -- .global _dl_tlsdesc_dynamic -- .type _dl_tlsdesc_dynamic,@function -- -- /* %rax points to the TLS descriptor, such that 0(%rax) points to -- _dl_tlsdesc_dynamic itself, and 8(%rax) points to a struct -- tlsdesc_dynamic_arg object. It must return in %rax the offset -- between the thread pointer and the object denoted by the -- argument, without clobbering any registers. -- -- The assembly code that follows is a rendition of the following -- C code, hand-optimized a little bit. -- --ptrdiff_t --_dl_tlsdesc_dynamic (register struct tlsdesc *tdp asm ("%rax")) --{ -- struct tlsdesc_dynamic_arg *td = tdp->arg; -- dtv_t *dtv = *(dtv_t **)((char *)__thread_pointer + DTV_OFFSET); -- if (__builtin_expect (td->gen_count <= dtv[0].counter -- && (dtv[td->tlsinfo.ti_module].pointer.val -- != TLS_DTV_UNALLOCATED), -- 1)) -- return dtv[td->tlsinfo.ti_module].pointer.val + td->tlsinfo.ti_offset -- - __thread_pointer; -- -- return __tls_get_addr_internal (&td->tlsinfo) - __thread_pointer; --} --*/ -- cfi_startproc -- .align 16 --_dl_tlsdesc_dynamic: -- _CET_ENDBR -- /* Preserve call-clobbered registers that we modify. -- We need two scratch regs anyway. */ -- movq %rsi, -16(%rsp) -- mov %fs:DTV_OFFSET, %RSI_LP -- movq %rdi, -8(%rsp) -- movq TLSDESC_ARG(%rax), %rdi -- movq (%rsi), %rax -- cmpq %rax, TLSDESC_GEN_COUNT(%rdi) -- ja .Lslow -- movq TLSDESC_MODID(%rdi), %rax -- salq $4, %rax -- movq (%rax,%rsi), %rax -- cmpq $-1, %rax -- je .Lslow -- addq TLSDESC_MODOFF(%rdi), %rax --.Lret: -- movq -16(%rsp), %rsi -- sub %fs:0, %RAX_LP -- movq -8(%rsp), %rdi -- ret --.Lslow: -- /* Besides rdi and rsi, saved above, save rdx, rcx, r8, r9, -- r10 and r11. Also, align the stack, that's off by 8 bytes. */ -- subq $72, %rsp -- cfi_adjust_cfa_offset (72) -- movq %rdx, 8(%rsp) -- movq %rcx, 16(%rsp) -- movq %r8, 24(%rsp) -- movq %r9, 32(%rsp) -- movq %r10, 40(%rsp) -- movq %r11, 48(%rsp) -- /* %rdi already points to the tlsinfo data structure. */ -- call HIDDEN_JUMPTARGET (__tls_get_addr) -- movq 8(%rsp), %rdx -- movq 16(%rsp), %rcx -- movq 24(%rsp), %r8 -- movq 32(%rsp), %r9 -- movq 40(%rsp), %r10 -- movq 48(%rsp), %r11 -- addq $72, %rsp -- cfi_adjust_cfa_offset (-72) -- jmp .Lret -- cfi_endproc -- .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic -+# define USE_FXSAVE -+# define STATE_SAVE_ALIGNMENT 16 -+# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fxsave -+# include "dl-tlsdesc-dynamic.h" -+# undef _dl_tlsdesc_dynamic -+# undef USE_FXSAVE -+ -+# define USE_XSAVE -+# define STATE_SAVE_ALIGNMENT 64 -+# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_xsave -+# include "dl-tlsdesc-dynamic.h" -+# undef _dl_tlsdesc_dynamic -+# undef USE_XSAVE -+ -+# define USE_XSAVEC -+# define STATE_SAVE_ALIGNMENT 64 -+# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_xsavec -+# include "dl-tlsdesc-dynamic.h" -+# undef _dl_tlsdesc_dynamic -+# undef USE_XSAVEC - #endif /* SHARED */ -diff --git a/sysdeps/x86_64/dl-trampoline-save.h b/sysdeps/x86_64/dl-trampoline-save.h -new file mode 100644 -index 0000000000..84eac4a8ac ---- /dev/null -+++ b/sysdeps/x86_64/dl-trampoline-save.h -@@ -0,0 +1,34 @@ -+/* x86-64 PLT trampoline register save macros. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#ifndef DL_STACK_ALIGNMENT -+/* Due to GCC bug: -+ -+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58066 -+ -+ __tls_get_addr may be called with 8-byte stack alignment. Although -+ this bug has been fixed in GCC 4.9.4, 5.3 and 6, we can't assume -+ that stack will be always aligned at 16 bytes. */ -+# define DL_STACK_ALIGNMENT 8 -+#endif -+ -+/* True if _dl_runtime_resolve should align stack for STATE_SAVE or align -+ stack to 16 bytes before calling _dl_fixup. */ -+#define DL_RUNTIME_RESOLVE_REALIGN_STACK \ -+ (STATE_SAVE_ALIGNMENT > DL_STACK_ALIGNMENT \ -+ || 16 > DL_STACK_ALIGNMENT) -diff --git a/sysdeps/x86_64/dl-trampoline-state.h b/sysdeps/x86_64/dl-trampoline-state.h -new file mode 100644 -index 0000000000..575f120797 ---- /dev/null -+++ b/sysdeps/x86_64/dl-trampoline-state.h -@@ -0,0 +1,51 @@ -+/* x86-64 PLT dl-trampoline state macros. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#if (STATE_SAVE_ALIGNMENT % 16) != 0 -+# error STATE_SAVE_ALIGNMENT must be multiple of 16 -+#endif -+ -+#if (STATE_SAVE_OFFSET % STATE_SAVE_ALIGNMENT) != 0 -+# error STATE_SAVE_OFFSET must be multiple of STATE_SAVE_ALIGNMENT -+#endif -+ -+#if DL_RUNTIME_RESOLVE_REALIGN_STACK -+/* Local stack area before jumping to function address: RBX. */ -+# define LOCAL_STORAGE_AREA 8 -+# define BASE rbx -+# ifdef USE_FXSAVE -+/* Use fxsave to save XMM registers. */ -+# define REGISTER_SAVE_AREA (512 + STATE_SAVE_OFFSET) -+# if (REGISTER_SAVE_AREA % 16) != 0 -+# error REGISTER_SAVE_AREA must be multiple of 16 -+# endif -+# endif -+#else -+# ifndef USE_FXSAVE -+# error USE_FXSAVE must be defined -+# endif -+/* Use fxsave to save XMM registers. */ -+# define REGISTER_SAVE_AREA (512 + STATE_SAVE_OFFSET + 8) -+/* Local stack area before jumping to function address: All saved -+ registers. */ -+# define LOCAL_STORAGE_AREA REGISTER_SAVE_AREA -+# define BASE rsp -+# if (REGISTER_SAVE_AREA % 16) != 8 -+# error REGISTER_SAVE_AREA must be odd multiple of 8 -+# endif -+#endif -diff --git a/sysdeps/x86_64/dl-trampoline.S b/sysdeps/x86_64/dl-trampoline.S -index b2e7e0f69b..87c5137837 100644 ---- a/sysdeps/x86_64/dl-trampoline.S -+++ b/sysdeps/x86_64/dl-trampoline.S -@@ -22,25 +22,7 @@ - #include <features-offsets.h> - #include <link-defines.h> - #include <isa-level.h> -- --#ifndef DL_STACK_ALIGNMENT --/* Due to GCC bug: -- -- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58066 -- -- __tls_get_addr may be called with 8-byte stack alignment. Although -- this bug has been fixed in GCC 4.9.4, 5.3 and 6, we can't assume -- that stack will be always aligned at 16 bytes. We use unaligned -- 16-byte move to load and store SSE registers, which has no penalty -- on modern processors if stack is 16-byte aligned. */ --# define DL_STACK_ALIGNMENT 8 --#endif -- --/* True if _dl_runtime_resolve should align stack for STATE_SAVE or align -- stack to 16 bytes before calling _dl_fixup. */ --#define DL_RUNTIME_RESOLVE_REALIGN_STACK \ -- (STATE_SAVE_ALIGNMENT > DL_STACK_ALIGNMENT \ -- || 16 > DL_STACK_ALIGNMENT) -+#include "dl-trampoline-save.h" - - /* Area on stack to save and restore registers used for parameter - passing when calling _dl_fixup. */ -diff --git a/sysdeps/x86_64/dl-trampoline.h b/sysdeps/x86_64/dl-trampoline.h -index f55c6ea040..d9ccfb40d4 100644 ---- a/sysdeps/x86_64/dl-trampoline.h -+++ b/sysdeps/x86_64/dl-trampoline.h -@@ -27,39 +27,7 @@ - # undef LOCAL_STORAGE_AREA - # undef BASE - --# if (STATE_SAVE_ALIGNMENT % 16) != 0 --# error STATE_SAVE_ALIGNMENT must be multiple of 16 --# endif -- --# if (STATE_SAVE_OFFSET % STATE_SAVE_ALIGNMENT) != 0 --# error STATE_SAVE_OFFSET must be multiple of STATE_SAVE_ALIGNMENT --# endif -- --# if DL_RUNTIME_RESOLVE_REALIGN_STACK --/* Local stack area before jumping to function address: RBX. */ --# define LOCAL_STORAGE_AREA 8 --# define BASE rbx --# ifdef USE_FXSAVE --/* Use fxsave to save XMM registers. */ --# define REGISTER_SAVE_AREA (512 + STATE_SAVE_OFFSET) --# if (REGISTER_SAVE_AREA % 16) != 0 --# error REGISTER_SAVE_AREA must be multiple of 16 --# endif --# endif --# else --# ifndef USE_FXSAVE --# error USE_FXSAVE must be defined --# endif --/* Use fxsave to save XMM registers. */ --# define REGISTER_SAVE_AREA (512 + STATE_SAVE_OFFSET + 8) --/* Local stack area before jumping to function address: All saved -- registers. */ --# define LOCAL_STORAGE_AREA REGISTER_SAVE_AREA --# define BASE rsp --# if (REGISTER_SAVE_AREA % 16) != 8 --# error REGISTER_SAVE_AREA must be odd multiple of 8 --# endif --# endif -+# include "dl-trampoline-state.h" - - .globl _dl_runtime_resolve - .hidden _dl_runtime_resolve - -commit 853e915fdd6ae6c5f1a7a68d2594ec8dbfef1286 -Author: H.J. Lu <hjl.tools@gmail.com> -Date: Wed Feb 28 12:08:03 2024 -0800 - - x86-64: Update _dl_tlsdesc_dynamic to preserve AMX registers - - _dl_tlsdesc_dynamic should also preserve AMX registers which are - caller-saved. Add X86_XSTATE_TILECFG_ID and X86_XSTATE_TILEDATA_ID - to x86-64 TLSDESC_CALL_STATE_SAVE_MASK. Compute the AMX state size - and save it in xsave_state_full_size which is only used by - _dl_tlsdesc_dynamic_xsave and _dl_tlsdesc_dynamic_xsavec. This fixes - the AMX part of BZ #31372. Tested on AMX processor. - - AMX test is enabled only for compilers with the fix for - - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114098 - - GCC 14 and GCC 11/12/13 branches have the bug fix. - Reviewed-by: Sunil K Pandey <skpgkp2@gmail.com> - - (cherry picked from commit 9b7091415af47082664717210ac49d51551456ab) - -diff --git a/sysdeps/unix/sysv/linux/x86_64/Makefile b/sysdeps/unix/sysv/linux/x86_64/Makefile -index 4223feb95f..9a1e7aa646 100644 ---- a/sysdeps/unix/sysv/linux/x86_64/Makefile -+++ b/sysdeps/unix/sysv/linux/x86_64/Makefile -@@ -63,6 +63,33 @@ $(objpfx)libx86-64-isa-level%.os: $(..)/sysdeps/unix/sysv/linux/x86_64/x86-64-is - $(objpfx)libx86-64-isa-level.so: $(objpfx)libx86-64-isa-level-1.so - cp $< $@ - endif -+ -+ifeq (yes,$(have-mamx-tile)) -+tests += \ -+ tst-gnu2-tls2-amx \ -+# tests -+ -+modules-names += \ -+ tst-gnu2-tls2-amx-mod0 \ -+ tst-gnu2-tls2-amx-mod1 \ -+ tst-gnu2-tls2-amx-mod2 \ -+# modules-names -+ -+$(objpfx)tst-gnu2-tls2-amx: $(shared-thread-library) -+$(objpfx)tst-gnu2-tls2-amx.out: \ -+ $(objpfx)tst-gnu2-tls2-amx-mod0.so \ -+ $(objpfx)tst-gnu2-tls2-amx-mod1.so \ -+ $(objpfx)tst-gnu2-tls2-amx-mod2.so -+$(objpfx)tst-gnu2-tls2-amx-mod0.so: $(libsupport) -+$(objpfx)tst-gnu2-tls2-amx-mod1.so: $(libsupport) -+$(objpfx)tst-gnu2-tls2-amx-mod2.so: $(libsupport) -+ -+CFLAGS-tst-gnu2-tls2-amx.c += -mamx-tile -+CFLAGS-tst-gnu2-tls2-amx-mod0.c += -mamx-tile -mtls-dialect=gnu2 -+CFLAGS-tst-gnu2-tls2-amx-mod1.c += -mamx-tile -mtls-dialect=gnu2 -+CFLAGS-tst-gnu2-tls2-amx-mod2.c += -mamx-tile -mtls-dialect=gnu2 -+endif -+ - endif # $(subdir) == elf - - ifneq ($(enable-cet),no) -diff --git a/sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h b/sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h -index 2f511321ad..ef4631bf4b 100644 ---- a/sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h -+++ b/sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h -@@ -20,3 +20,8 @@ - # define ARCH_SHSTK_SHSTK 0x1 - # define ARCH_SHSTK_WRSS 0x2 - #endif -+ -+#ifndef ARCH_GET_XCOMP_PERM -+# define ARCH_GET_XCOMP_PERM 0x1022 -+# define ARCH_REQ_XCOMP_PERM 0x1023 -+#endif -diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod0.c b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod0.c -new file mode 100644 -index 0000000000..2e0c7b91b7 ---- /dev/null -+++ b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod0.c -@@ -0,0 +1,2 @@ -+#include "tst-gnu2-tls2-amx.h" -+#include <tst-gnu2-tls2mod0.c> -diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod1.c b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod1.c -new file mode 100644 -index 0000000000..b8a8ccf1c1 ---- /dev/null -+++ b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod1.c -@@ -0,0 +1,2 @@ -+#include "tst-gnu2-tls2-amx.h" -+#include <tst-gnu2-tls2mod1.c> -diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod2.c b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod2.c -new file mode 100644 -index 0000000000..cdf4a8f363 ---- /dev/null -+++ b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod2.c -@@ -0,0 +1,2 @@ -+#include "tst-gnu2-tls2-amx.h" -+#include <tst-gnu2-tls2mod2.c> -diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.c b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.c -new file mode 100644 -index 0000000000..ae4dd82556 ---- /dev/null -+++ b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.c -@@ -0,0 +1,83 @@ -+/* Test TLSDESC relocation with AMX. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <http://www.gnu.org/licenses/>. */ -+ -+#include <stdbool.h> -+#include <asm/prctl.h> -+#include <support/check.h> -+#include "tst-gnu2-tls2-amx.h" -+ -+extern int arch_prctl (int, ...); -+ -+#define X86_XSTATE_TILECFG_ID 17 -+#define X86_XSTATE_TILEDATA_ID 18 -+ -+/* Initialize tile config. */ -+__attribute__ ((noinline, noclone)) -+static void -+init_tile_config (__tilecfg *tileinfo) -+{ -+ int i; -+ tileinfo->palette_id = 1; -+ tileinfo->start_row = 0; -+ -+ tileinfo->colsb[0] = MAX_ROWS; -+ tileinfo->rows[0] = MAX_ROWS; -+ -+ for (i = 1; i < 4; ++i) -+ { -+ tileinfo->colsb[i] = MAX_COLS; -+ tileinfo->rows[i] = MAX_ROWS; -+ } -+ -+ _tile_loadconfig (tileinfo); -+} -+ -+static bool -+enable_amx (void) -+{ -+ uint64_t bitmask; -+ if (arch_prctl (ARCH_GET_XCOMP_PERM, &bitmask) != 0) -+ return false; -+ -+ if ((bitmask & (1 << X86_XSTATE_TILECFG_ID)) == 0) -+ return false; -+ -+ if (arch_prctl (ARCH_REQ_XCOMP_PERM, X86_XSTATE_TILEDATA_ID) != 0) -+ return false; -+ -+ /* Load tile configuration. */ -+ __tilecfg tile_data = { 0 }; -+ init_tile_config (&tile_data); -+ -+ return true; -+} -+ -+/* An architecture can define it to clobber caller-saved registers in -+ malloc below to verify that the implicit TLSDESC call won't change -+ caller-saved registers. */ -+static void -+clear_tile_register (void) -+{ -+ _tile_zero (2); -+} -+ -+#define MOD(i) "tst-gnu2-tls2-amx-mod" #i ".so" -+#define IS_SUPPORTED() enable_amx () -+#define PREPARE_MALLOC() clear_tile_register () -+ -+#include <elf/tst-gnu2-tls2.c> -diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.h b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.h -new file mode 100644 -index 0000000000..1845a3caba ---- /dev/null -+++ b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.h -@@ -0,0 +1,63 @@ -+/* Test TLSDESC relocation with AMX. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <http://www.gnu.org/licenses/>. */ -+ -+#include <stdint.h> -+#include <string.h> -+#include <x86intrin.h> -+#include <support/check.h> -+ -+#define MAX_ROWS 16 -+#define MAX_COLS 64 -+#define MAX 1024 -+#define STRIDE 64 -+ -+typedef struct __tile_config -+{ -+ uint8_t palette_id; -+ uint8_t start_row; -+ uint8_t reserved_0[14]; -+ uint16_t colsb[16]; -+ uint8_t rows[16]; -+} __tilecfg __attribute__ ((aligned (64))); -+ -+/* Initialize int8_t buffer */ -+static inline void -+init_buffer (int8_t *buf, int8_t value) -+{ -+ int rows, colsb, i, j; -+ rows = MAX_ROWS; -+ colsb = MAX_COLS; -+ -+ for (i = 0; i < rows; i++) -+ for (j = 0; j < colsb; j++) -+ buf[i * colsb + j] = value; -+} -+ -+#define BEFORE_TLSDESC_CALL() \ -+ int8_t src[MAX]; \ -+ int8_t res[MAX]; \ -+ /* Initialize src with data */ \ -+ init_buffer (src, 2); \ -+ /* Load tile rows from memory. */ \ -+ _tile_loadd (2, src, STRIDE); -+ -+#define AFTER_TLSDESC_CALL() \ -+ /* Store the tile data to memory. */ \ -+ _tile_stored (2, res, STRIDE); \ -+ _tile_release (); \ -+ TEST_VERIFY_EXIT (memcmp (src, res, sizeof (res)) == 0); -diff --git a/sysdeps/x86/cpu-features-offsets.sym b/sysdeps/x86/cpu-features-offsets.sym -index 6a8fd29813..21fc88d651 100644 ---- a/sysdeps/x86/cpu-features-offsets.sym -+++ b/sysdeps/x86/cpu-features-offsets.sym -@@ -3,3 +3,4 @@ - #include <ldsodefs.h> - - XSAVE_STATE_SIZE_OFFSET offsetof (struct cpu_features, xsave_state_size) -+XSAVE_STATE_FULL_SIZE_OFFSET offsetof (struct cpu_features, xsave_state_full_size) -diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c -index 835113b42f..d71e8d3d2e 100644 ---- a/sysdeps/x86/cpu-features.c -+++ b/sysdeps/x86/cpu-features.c -@@ -307,6 +307,8 @@ update_active (struct cpu_features *cpu_features) - __cpuid_count (0xd, 0, eax, ebx, ecx, edx); - if (ebx != 0) - { -+ /* NB: On AMX capable processors, ebx always includes AMX -+ states. */ - unsigned int xsave_state_full_size - = ALIGN_UP (ebx + STATE_SAVE_OFFSET, 64); - -@@ -320,6 +322,11 @@ update_active (struct cpu_features *cpu_features) - { - unsigned int xstate_comp_offsets[32]; - unsigned int xstate_comp_sizes[32]; -+#ifdef __x86_64__ -+ unsigned int xstate_amx_comp_offsets[32]; -+ unsigned int xstate_amx_comp_sizes[32]; -+ unsigned int amx_ecx; -+#endif - unsigned int i; - - xstate_comp_offsets[0] = 0; -@@ -327,16 +334,39 @@ update_active (struct cpu_features *cpu_features) - xstate_comp_offsets[2] = 576; - xstate_comp_sizes[0] = 160; - xstate_comp_sizes[1] = 256; -+#ifdef __x86_64__ -+ xstate_amx_comp_offsets[0] = 0; -+ xstate_amx_comp_offsets[1] = 160; -+ xstate_amx_comp_offsets[2] = 576; -+ xstate_amx_comp_sizes[0] = 160; -+ xstate_amx_comp_sizes[1] = 256; -+#endif - - for (i = 2; i < 32; i++) - { -- if ((STATE_SAVE_MASK & (1 << i)) != 0) -+ if ((FULL_STATE_SAVE_MASK & (1 << i)) != 0) - { - __cpuid_count (0xd, i, eax, ebx, ecx, edx); -- xstate_comp_sizes[i] = eax; -+#ifdef __x86_64__ -+ /* Include this in xsave_state_full_size. */ -+ amx_ecx = ecx; -+ xstate_amx_comp_sizes[i] = eax; -+ if ((AMX_STATE_SAVE_MASK & (1 << i)) != 0) -+ { -+ /* Exclude this from xsave_state_size. */ -+ ecx = 0; -+ xstate_comp_sizes[i] = 0; -+ } -+ else -+#endif -+ xstate_comp_sizes[i] = eax; - } - else - { -+#ifdef __x86_64__ -+ amx_ecx = 0; -+ xstate_amx_comp_sizes[i] = 0; -+#endif - ecx = 0; - xstate_comp_sizes[i] = 0; - } -@@ -349,6 +379,15 @@ update_active (struct cpu_features *cpu_features) - if ((ecx & (1 << 1)) != 0) - xstate_comp_offsets[i] - = ALIGN_UP (xstate_comp_offsets[i], 64); -+#ifdef __x86_64__ -+ xstate_amx_comp_offsets[i] -+ = (xstate_amx_comp_offsets[i - 1] -+ + xstate_amx_comp_sizes[i - 1]); -+ if ((amx_ecx & (1 << 1)) != 0) -+ xstate_amx_comp_offsets[i] -+ = ALIGN_UP (xstate_amx_comp_offsets[i], -+ 64); -+#endif - } - } - -@@ -357,6 +396,18 @@ update_active (struct cpu_features *cpu_features) - = xstate_comp_offsets[31] + xstate_comp_sizes[31]; - if (size) - { -+#ifdef __x86_64__ -+ unsigned int amx_size -+ = (xstate_amx_comp_offsets[31] -+ + xstate_amx_comp_sizes[31]); -+ amx_size = ALIGN_UP (amx_size + STATE_SAVE_OFFSET, -+ 64); -+ /* Set xsave_state_full_size to the compact AMX -+ state size for XSAVEC. NB: xsave_state_full_size -+ is only used in _dl_tlsdesc_dynamic_xsave and -+ _dl_tlsdesc_dynamic_xsavec. */ -+ cpu_features->xsave_state_full_size = amx_size; -+#endif - cpu_features->xsave_state_size - = ALIGN_UP (size + STATE_SAVE_OFFSET, 64); - CPU_FEATURE_SET (cpu_features, XSAVEC); -diff --git a/sysdeps/x86/include/cpu-features.h b/sysdeps/x86/include/cpu-features.h -index b9bf3115b6..cd7bd27cf3 100644 ---- a/sysdeps/x86/include/cpu-features.h -+++ b/sysdeps/x86/include/cpu-features.h -@@ -934,6 +934,8 @@ struct cpu_features - /* The full state size for XSAVE when XSAVEC is disabled by - - GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVEC -+ -+ and the AMX state size when XSAVEC is available. - */ - unsigned int xsave_state_full_size; - /* Data cache size for use in memory and string routines, typically -diff --git a/sysdeps/x86/sysdep.h b/sysdeps/x86/sysdep.h -index 485cad9c02..db8e576e91 100644 ---- a/sysdeps/x86/sysdep.h -+++ b/sysdeps/x86/sysdep.h -@@ -56,6 +56,14 @@ - | (1 << X86_XSTATE_ZMM_H_ID) \ - | (1 << X86_XSTATE_ZMM_ID) \ - | (1 << X86_XSTATE_APX_F_ID)) -+ -+/* AMX state mask. */ -+# define AMX_STATE_SAVE_MASK \ -+ ((1 << X86_XSTATE_TILECFG_ID) | (1 << X86_XSTATE_TILEDATA_ID)) -+ -+/* States to be included in xsave_state_full_size. */ -+# define FULL_STATE_SAVE_MASK \ -+ (STATE_SAVE_MASK | AMX_STATE_SAVE_MASK) - #else - /* Offset for fxsave/xsave area used by _dl_tlsdesc_dynamic. Since i386 - doesn't have red-zone, use 0 here. */ -@@ -68,13 +76,17 @@ - | (1 << X86_XSTATE_BNDREGS_ID) \ - | (1 << X86_XSTATE_K_ID) \ - | (1 << X86_XSTATE_ZMM_H_ID)) -+ -+/* States to be included in xsave_state_size. */ -+# define FULL_STATE_SAVE_MASK STATE_SAVE_MASK - #endif - - /* States which should be saved for TLSDESC_CALL and TLS_DESC_CALL. -- Compiler assumes that all registers, including x87 FPU stack registers, -- are unchanged after CALL, except for EFLAGS and RAX/EAX. */ -+ Compiler assumes that all registers, including AMX and x87 FPU -+ stack registers, are unchanged after CALL, except for EFLAGS and -+ RAX/EAX. */ - #define TLSDESC_CALL_STATE_SAVE_MASK \ -- (STATE_SAVE_MASK | (1 << X86_XSTATE_X87_ID)) -+ (FULL_STATE_SAVE_MASK | (1 << X86_XSTATE_X87_ID)) - - /* Constants for bits in __x86_string_control: */ - -diff --git a/sysdeps/x86_64/configure b/sysdeps/x86_64/configure -index 418cc4a9b8..04a534fa12 100755 ---- a/sysdeps/x86_64/configure -+++ b/sysdeps/x86_64/configure -@@ -134,6 +134,34 @@ fi - config_vars="$config_vars - enable-cet = $enable_cet" - -+# Check if -mamx-tile works properly. -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -mamx-tile works properly" >&5 -+printf %s "checking whether -mamx-tile works properly... " >&6; } -+if test ${libc_cv_x86_have_amx_tile+y} -+then : -+ printf %s "(cached) " >&6 -+else $as_nop -+ cat > conftest.c <<EOF -+#include <x86intrin.h> -+EOF -+ libc_cv_x86_have_amx_tile=no -+ if { ac_try='${CC-cc} -E $CFLAGS -mamx-tile conftest.c > conftest.i' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then -+ if grep -q __builtin_ia32_ldtilecfg conftest.i; then -+ libc_cv_x86_have_amx_tile=yes -+ fi -+ fi -+ rm -rf conftest* -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_x86_have_amx_tile" >&5 -+printf "%s\n" "$libc_cv_x86_have_amx_tile" >&6; } -+config_vars="$config_vars -+have-mamx-tile = $libc_cv_x86_have_amx_tile" -+ - test -n "$critic_missing" && as_fn_error $? " - *** $critic_missing" "$LINENO" 5 - -diff --git a/sysdeps/x86_64/configure.ac b/sysdeps/x86_64/configure.ac -index d1f803c02e..c714c47351 100644 ---- a/sysdeps/x86_64/configure.ac -+++ b/sysdeps/x86_64/configure.ac -@@ -61,5 +61,20 @@ elif test $enable_cet = permissive; then - fi - LIBC_CONFIG_VAR([enable-cet], [$enable_cet]) - -+# Check if -mamx-tile works properly. -+AC_CACHE_CHECK(whether -mamx-tile works properly, -+ libc_cv_x86_have_amx_tile, [dnl -+cat > conftest.c <<EOF -+#include <x86intrin.h> -+EOF -+ libc_cv_x86_have_amx_tile=no -+ if AC_TRY_COMMAND(${CC-cc} -E $CFLAGS -mamx-tile conftest.c > conftest.i); then -+ if grep -q __builtin_ia32_ldtilecfg conftest.i; then -+ libc_cv_x86_have_amx_tile=yes -+ fi -+ fi -+ rm -rf conftest*]) -+LIBC_CONFIG_VAR([have-mamx-tile], [$libc_cv_x86_have_amx_tile]) -+ - test -n "$critic_missing" && AC_MSG_ERROR([ - *** $critic_missing]) -diff --git a/sysdeps/x86_64/dl-tlsdesc-dynamic.h b/sysdeps/x86_64/dl-tlsdesc-dynamic.h -index 0c2e8d5320..9f02cfc3eb 100644 ---- a/sysdeps/x86_64/dl-tlsdesc-dynamic.h -+++ b/sysdeps/x86_64/dl-tlsdesc-dynamic.h -@@ -99,7 +99,7 @@ _dl_tlsdesc_dynamic: - # endif - #else - /* Allocate stack space of the required size to save the state. */ -- sub _rtld_local_ro+RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET+XSAVE_STATE_SIZE_OFFSET(%rip), %RSP_LP -+ sub _rtld_local_ro+RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET+XSAVE_STATE_FULL_SIZE_OFFSET(%rip), %RSP_LP - #endif - /* Besides rdi and rsi, saved above, save rcx, rdx, r8, r9, - r10 and r11. */ - -commit 354cabcb2634abe16da7a2ba5e648aac1204b58e -Author: H.J. Lu <hjl.tools@gmail.com> -Date: Mon Mar 18 06:40:16 2024 -0700 - - x86-64: Allocate state buffer space for RDI, RSI and RBX - - _dl_tlsdesc_dynamic preserves RDI, RSI and RBX before realigning stack. - After realigning stack, it saves RCX, RDX, R8, R9, R10 and R11. Define - TLSDESC_CALL_REGISTER_SAVE_AREA to allocate space for RDI, RSI and RBX - to avoid clobbering saved RDI, RSI and RBX values on stack by xsave to - STATE_SAVE_OFFSET(%rsp). - - +==================+<- stack frame start aligned at 8 or 16 bytes - | |<- RDI saved in the red zone - | |<- RSI saved in the red zone - | |<- RBX saved in the red zone - | |<- paddings for stack realignment of 64 bytes - |------------------|<- xsave buffer end aligned at 64 bytes - | |<- - | |<- - | |<- - |------------------|<- xsave buffer start at STATE_SAVE_OFFSET(%rsp) - | |<- 8-byte padding for 64-byte alignment - | |<- 8-byte padding for 64-byte alignment - | |<- R11 - | |<- R10 - | |<- R9 - | |<- R8 - | |<- RDX - | |<- RCX - +==================+<- RSP aligned at 64 bytes - - Define TLSDESC_CALL_REGISTER_SAVE_AREA, the total register save area size - for all integer registers by adding 24 to STATE_SAVE_OFFSET since RDI, RSI - and RBX are saved onto stack without adjusting stack pointer first, using - the red-zone. This fixes BZ #31501. - Reviewed-by: Sunil K Pandey <skpgkp2@gmail.com> - - (cherry picked from commit 717ebfa85c8240d32d0d19d86a484c31c55c9617) - -diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c -index d71e8d3d2e..6fe1b728c6 100644 ---- a/sysdeps/x86/cpu-features.c -+++ b/sysdeps/x86/cpu-features.c -@@ -310,7 +310,7 @@ update_active (struct cpu_features *cpu_features) - /* NB: On AMX capable processors, ebx always includes AMX - states. */ - unsigned int xsave_state_full_size -- = ALIGN_UP (ebx + STATE_SAVE_OFFSET, 64); -+ = ALIGN_UP (ebx + TLSDESC_CALL_REGISTER_SAVE_AREA, 64); - - cpu_features->xsave_state_size - = xsave_state_full_size; -@@ -400,8 +400,10 @@ update_active (struct cpu_features *cpu_features) - unsigned int amx_size - = (xstate_amx_comp_offsets[31] - + xstate_amx_comp_sizes[31]); -- amx_size = ALIGN_UP (amx_size + STATE_SAVE_OFFSET, -- 64); -+ amx_size -+ = ALIGN_UP ((amx_size -+ + TLSDESC_CALL_REGISTER_SAVE_AREA), -+ 64); - /* Set xsave_state_full_size to the compact AMX - state size for XSAVEC. NB: xsave_state_full_size - is only used in _dl_tlsdesc_dynamic_xsave and -@@ -409,7 +411,8 @@ update_active (struct cpu_features *cpu_features) - cpu_features->xsave_state_full_size = amx_size; - #endif - cpu_features->xsave_state_size -- = ALIGN_UP (size + STATE_SAVE_OFFSET, 64); -+ = ALIGN_UP (size + TLSDESC_CALL_REGISTER_SAVE_AREA, -+ 64); - CPU_FEATURE_SET (cpu_features, XSAVEC); - } - } -diff --git a/sysdeps/x86/sysdep.h b/sysdeps/x86/sysdep.h -index db8e576e91..7359149e17 100644 ---- a/sysdeps/x86/sysdep.h -+++ b/sysdeps/x86/sysdep.h -@@ -38,14 +38,59 @@ - #ifdef __x86_64__ - /* Offset for fxsave/xsave area used by _dl_runtime_resolve. Also need - space to preserve RCX, RDX, RSI, RDI, R8, R9 and RAX. It must be -- aligned to 16 bytes for fxsave and 64 bytes for xsave. -- -- NB: Is is non-zero because of the 128-byte red-zone. Some registers -- are saved on stack without adjusting stack pointer first. When we -- update stack pointer to allocate more space, we need to take the -- red-zone into account. */ -+ aligned to 16 bytes for fxsave and 64 bytes for xsave. It is non-zero -+ because MOV, instead of PUSH, is used to save registers onto stack. -+ -+ +==================+<- stack frame start aligned at 8 or 16 bytes -+ | |<- paddings for stack realignment of 64 bytes -+ |------------------|<- xsave buffer end aligned at 64 bytes -+ | |<- -+ | |<- -+ | |<- -+ |------------------|<- xsave buffer start at STATE_SAVE_OFFSET(%rsp) -+ | |<- 8-byte padding for 64-byte alignment -+ | |<- R9 -+ | |<- R8 -+ | |<- RDI -+ | |<- RSI -+ | |<- RDX -+ | |<- RCX -+ | |<- RAX -+ +==================+<- RSP aligned at 64 bytes -+ -+ */ - # define STATE_SAVE_OFFSET (8 * 7 + 8) - -+/* _dl_tlsdesc_dynamic preserves RDI, RSI and RBX before realigning -+ stack. After realigning stack, it saves RCX, RDX, R8, R9, R10 and -+ R11. Allocate space for RDI, RSI and RBX to avoid clobbering saved -+ RDI, RSI and RBX values on stack by xsave. -+ -+ +==================+<- stack frame start aligned at 8 or 16 bytes -+ | |<- RDI saved in the red zone -+ | |<- RSI saved in the red zone -+ | |<- RBX saved in the red zone -+ | |<- paddings for stack realignment of 64 bytes -+ |------------------|<- xsave buffer end aligned at 64 bytes -+ | |<- -+ | |<- -+ | |<- -+ |------------------|<- xsave buffer start at STATE_SAVE_OFFSET(%rsp) -+ | |<- 8-byte padding for 64-byte alignment -+ | |<- 8-byte padding for 64-byte alignment -+ | |<- R11 -+ | |<- R10 -+ | |<- R9 -+ | |<- R8 -+ | |<- RDX -+ | |<- RCX -+ +==================+<- RSP aligned at 64 bytes -+ -+ Define the total register save area size for all integer registers by -+ adding 24 to STATE_SAVE_OFFSET since RDI, RSI and RBX are saved onto -+ stack without adjusting stack pointer first, using the red-zone. */ -+# define TLSDESC_CALL_REGISTER_SAVE_AREA (STATE_SAVE_OFFSET + 24) -+ - /* Save SSE, AVX, AVX512, mask, bound and APX registers. Bound and APX - registers are mutually exclusive. */ - # define STATE_SAVE_MASK \ -@@ -66,8 +111,9 @@ - (STATE_SAVE_MASK | AMX_STATE_SAVE_MASK) - #else - /* Offset for fxsave/xsave area used by _dl_tlsdesc_dynamic. Since i386 -- doesn't have red-zone, use 0 here. */ -+ uses PUSH to save registers onto stack, use 0 here. */ - # define STATE_SAVE_OFFSET 0 -+# define TLSDESC_CALL_REGISTER_SAVE_AREA 0 - - /* Save SSE, AVX, AXV512, mask and bound registers. */ - # define STATE_SAVE_MASK \ -diff --git a/sysdeps/x86_64/tst-gnu2-tls2mod1.S b/sysdeps/x86_64/tst-gnu2-tls2mod1.S -new file mode 100644 -index 0000000000..1d636669ba ---- /dev/null -+++ b/sysdeps/x86_64/tst-gnu2-tls2mod1.S -@@ -0,0 +1,87 @@ -+/* Check if TLSDESC relocation preserves %rdi, %rsi and %rbx. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <http://www.gnu.org/licenses/>. */ -+ -+#include <sysdep.h> -+ -+/* On AVX512 machines, OFFSET == 40 caused _dl_tlsdesc_dynamic_xsavec -+ to clobber %rdi, %rsi and %rbx. On Intel AVX CPUs, the state size -+ is 960 bytes and this test didn't fail. It may be due to the unused -+ last 128 bytes. On AMD AVX CPUs, the state size is 832 bytes and -+ this test might fail without the fix. */ -+#ifndef OFFSET -+# define OFFSET 40 -+#endif -+ -+ .text -+ .p2align 4 -+ .globl apply_tls -+ .type apply_tls, @function -+apply_tls: -+ cfi_startproc -+ _CET_ENDBR -+ pushq %rbp -+ cfi_def_cfa_offset (16) -+ cfi_offset (6, -16) -+ movdqu (%RDI_LP), %xmm0 -+ lea tls_var1@TLSDESC(%rip), %RAX_LP -+ mov %RSP_LP, %RBP_LP -+ cfi_def_cfa_register (6) -+ /* Align stack to 64 bytes. */ -+ and $-64, %RSP_LP -+ sub $OFFSET, %RSP_LP -+ pushq %rbx -+ /* Set %ebx to 0xbadbeef. */ -+ movl $0xbadbeef, %ebx -+ movl $0xbadbeef, %esi -+ movq %rdi, saved_rdi(%rip) -+ movq %rsi, saved_rsi(%rip) -+ call *tls_var1@TLSCALL(%RAX_LP) -+ /* Check if _dl_tlsdesc_dynamic preserves %rdi, %rsi and %rbx. */ -+ cmpq saved_rdi(%rip), %rdi -+ jne L(hlt) -+ cmpq saved_rsi(%rip), %rsi -+ jne L(hlt) -+ cmpl $0xbadbeef, %ebx -+ jne L(hlt) -+ add %fs:0, %RAX_LP -+ movups %xmm0, 32(%RAX_LP) -+ movdqu 16(%RDI_LP), %xmm1 -+ mov %RAX_LP, %RBX_LP -+ movups %xmm1, 48(%RAX_LP) -+ lea 32(%RBX_LP), %RAX_LP -+ pop %rbx -+ leave -+ cfi_def_cfa (7, 8) -+ ret -+L(hlt): -+ hlt -+ cfi_endproc -+ .size apply_tls, .-apply_tls -+ .hidden tls_var1 -+ .globl tls_var1 -+ .section .tbss,"awT",@nobits -+ .align 16 -+ .type tls_var1, @object -+ .size tls_var1, 3200 -+tls_var1: -+ .zero 3200 -+ .local saved_rdi -+ .comm saved_rdi,8,8 -+ .local saved_rsi -+ .comm saved_rsi,8,8 -+ .section .note.GNU-stack,"",@progbits - -commit 15aebdbada54098787715448c94701f17033fc92 -Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> -Date: Tue Mar 12 13:21:18 2024 -0300 - - Ignore undefined symbols for -mtls-dialect=gnu2 - - So it does not fail for arm config that defaults to -mtp=soft (which - issues a call to __aeabi_read_tp). - Reviewed-by: H.J. Lu <hjl.tools@gmail.com> - - (cherry picked from commit 968b0ca9440040a2b31248a572891f0e55c1ab10) - -diff --git a/configure b/configure -index 59ff1e415d..117b48a421 100755 ---- a/configure -+++ b/configure -@@ -7020,7 +7020,7 @@ void foo (void) - } - EOF - if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=gnu2 -nostdlib -nostartfiles -- conftest.c -o conftest 1>&5' -+ -shared conftest.c -o conftest 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? -diff --git a/configure.ac b/configure.ac -index 65799e5685..19b88a47a5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1297,7 +1297,7 @@ void foo (void) - } - EOF - if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=gnu2 -nostdlib -nostartfiles -- conftest.c -o conftest 1>&AS_MESSAGE_LOG_FD]) -+ -shared conftest.c -o conftest 1>&AS_MESSAGE_LOG_FD]) - then - libc_cv_mtls_dialect_gnu2=yes - else - -commit a8ba52bde58c69f2b31da62ad2311f119adf6cb9 -Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> -Date: Tue Mar 12 13:21:19 2024 -0300 - - arm: Update _dl_tlsdesc_dynamic to preserve caller-saved registers (BZ 31372) - - ARM _dl_tlsdesc_dynamic slow path has two issues: - - * The ip/r12 is defined by AAPCS as a scratch register, and gcc is - used to save the stack pointer before on some function calls. So it - should also be saved/restored as well. It fixes the tst-gnu2-tls2. - - * None of the possible VFP registers are saved/restored. ARM has the - additional complexity to have different VFP bank sizes (depending of - VFP support by the chip). - - The tst-gnu2-tls2 test is extended to check for VFP registers, although - only for hardfp builds. Different than setcontext, _dl_tlsdesc_dynamic - does not have HWCAP_ARM_IWMMXT (I don't have a way to properly test - it and it is almost a decade since newer hardware was released). - - With this patch there is no need to mark tst-gnu2-tls2 as XFAIL. - - Checked on arm-linux-gnueabihf. - Reviewed-by: H.J. Lu <hjl.tools@gmail.com> - - (cherry picked from commit 64c7e344289ed085517c2227d8e3b06388242c13) - -diff --git a/config.h.in b/config.h.in -index 44a34072a4..4d33c63a84 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -141,6 +141,9 @@ - /* LOONGARCH floating-point ABI for ld.so. */ - #undef LOONGARCH_ABI_FRLEN - -+/* Define whether ARM used hard-float and support VFPvX-D32. */ -+#undef HAVE_ARM_PCS_VFP_D32 -+ - /* Linux specific: minimum supported kernel version. */ - #undef __LINUX_KERNEL_VERSION - -diff --git a/elf/Makefile b/elf/Makefile -index c5c37a9147..030db4d207 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -3056,10 +3056,6 @@ $(objpfx)tst-gnu2-tls2.out: \ - $(objpfx)tst-gnu2-tls2mod2.so - - ifeq (yes,$(have-mtls-dialect-gnu2)) --# This test fails if dl_tlsdesc_dynamic doesn't preserve all caller-saved --# registers. See https://sourceware.org/bugzilla/show_bug.cgi?id=31372 --test-xfail-tst-gnu2-tls2 = yes -- - CFLAGS-tst-tlsgap-mod0.c += -mtls-dialect=gnu2 - CFLAGS-tst-tlsgap-mod1.c += -mtls-dialect=gnu2 - CFLAGS-tst-tlsgap-mod2.c += -mtls-dialect=gnu2 -diff --git a/elf/tst-gnu2-tls2.h b/elf/tst-gnu2-tls2.h -index 77964a57a3..1ade8151e2 100644 ---- a/elf/tst-gnu2-tls2.h -+++ b/elf/tst-gnu2-tls2.h -@@ -27,6 +27,10 @@ extern struct tls *apply_tls (struct tls *); - - /* An architecture can define them to verify that clobber caller-saved - registers aren't changed by the implicit TLSDESC call. */ -+#ifndef INIT_TLSDESC_CALL -+# define INIT_TLSDESC_CALL() -+#endif -+ - #ifndef BEFORE_TLSDESC_CALL - # define BEFORE_TLSDESC_CALL() - #endif -diff --git a/elf/tst-gnu2-tls2mod0.c b/elf/tst-gnu2-tls2mod0.c -index 45556a0e17..3fe3c14277 100644 ---- a/elf/tst-gnu2-tls2mod0.c -+++ b/elf/tst-gnu2-tls2mod0.c -@@ -16,13 +16,14 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include "tst-gnu2-tls2.h" -+#include <tst-gnu2-tls2.h> - - __thread struct tls tls_var0 __attribute__ ((visibility ("hidden"))); - - struct tls * - apply_tls (struct tls *p) - { -+ INIT_TLSDESC_CALL (); - BEFORE_TLSDESC_CALL (); - tls_var0 = *p; - struct tls *ret = &tls_var0; -diff --git a/elf/tst-gnu2-tls2mod1.c b/elf/tst-gnu2-tls2mod1.c -index e10b9dbc0a..e210538468 100644 ---- a/elf/tst-gnu2-tls2mod1.c -+++ b/elf/tst-gnu2-tls2mod1.c -@@ -16,13 +16,14 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include "tst-gnu2-tls2.h" -+#include <tst-gnu2-tls2.h> - - __thread struct tls tls_var1[100] __attribute__ ((visibility ("hidden"))); - - struct tls * - apply_tls (struct tls *p) - { -+ INIT_TLSDESC_CALL (); - BEFORE_TLSDESC_CALL (); - tls_var1[1] = *p; - struct tls *ret = &tls_var1[1]; -diff --git a/elf/tst-gnu2-tls2mod2.c b/elf/tst-gnu2-tls2mod2.c -index 141af51e55..6d3031dc5f 100644 ---- a/elf/tst-gnu2-tls2mod2.c -+++ b/elf/tst-gnu2-tls2mod2.c -@@ -16,13 +16,14 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include "tst-gnu2-tls2.h" -+#include <tst-gnu2-tls2.h> - - __thread struct tls tls_var2 __attribute__ ((visibility ("hidden"))); - - struct tls * - apply_tls (struct tls *p) - { -+ INIT_TLSDESC_CALL (); - BEFORE_TLSDESC_CALL (); - tls_var2 = *p; - struct tls *ret = &tls_var2; -diff --git a/sysdeps/arm/configure b/sysdeps/arm/configure -index 35e2918922..4ef4d46cbd 100644 ---- a/sysdeps/arm/configure -+++ b/sysdeps/arm/configure -@@ -187,6 +187,38 @@ else - default-abi = soft" - fi - -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether VFP supports 32 registers" >&5 -+printf %s "checking whether VFP supports 32 registers... " >&6; } -+if test ${libc_cv_arm_pcs_vfp_d32+y} -+then : -+ printf %s "(cached) " >&6 -+else $as_nop -+ -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+void foo (void) -+{ -+ asm volatile ("vldr d16,=17" : : : "d16"); -+} -+ -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ libc_cv_arm_pcs_vfp_d32=yes -+else $as_nop -+ libc_cv_arm_pcs_vfp_d32=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_arm_pcs_vfp_d32" >&5 -+printf "%s\n" "$libc_cv_arm_pcs_vfp_d32" >&6; } -+if test "$libc_cv_arm_pcs_vfp_d32" = yes ; -+then -+ printf "%s\n" "#define HAVE_ARM_PCS_VFP_D32 1" >>confdefs.h -+ -+fi -+ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether PC-relative relocs in movw/movt work properly" >&5 - printf %s "checking whether PC-relative relocs in movw/movt work properly... " >&6; } - if test ${libc_cv_arm_pcrel_movw+y} -diff --git a/sysdeps/arm/configure.ac b/sysdeps/arm/configure.ac -index 5172e30bbe..cd00ddc9d9 100644 ---- a/sysdeps/arm/configure.ac -+++ b/sysdeps/arm/configure.ac -@@ -21,6 +21,21 @@ else - LIBC_CONFIG_VAR([default-abi], [soft]) - fi - -+AC_CACHE_CHECK([whether VFP supports 32 registers], -+ libc_cv_arm_pcs_vfp_d32, [ -+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ -+void foo (void) -+{ -+ asm volatile ("vldr d16,=17" : : : "d16"); -+} -+]])], -+ [libc_cv_arm_pcs_vfp_d32=yes], -+ [libc_cv_arm_pcs_vfp_d32=no])]) -+if test "$libc_cv_arm_pcs_vfp_d32" = yes ; -+then -+ AC_DEFINE(HAVE_ARM_PCS_VFP_D32) -+fi -+ - AC_CACHE_CHECK([whether PC-relative relocs in movw/movt work properly], - libc_cv_arm_pcrel_movw, [ - cat > conftest.s <<\EOF -diff --git a/sysdeps/arm/dl-tlsdesc.S b/sysdeps/arm/dl-tlsdesc.S -index 764c56e70f..ada106521d 100644 ---- a/sysdeps/arm/dl-tlsdesc.S -+++ b/sysdeps/arm/dl-tlsdesc.S -@@ -19,6 +19,7 @@ - #include <sysdep.h> - #include <arm-features.h> - #include <tls.h> -+#include <rtld-global-offsets.h> - #include "tlsdesc.h" - - .text -@@ -83,14 +84,20 @@ _dl_tlsdesc_dynamic(struct tlsdesc *tdp) - .align 2 - _dl_tlsdesc_dynamic: - /* Our calling convention is to clobber r0, r1 and the processor -- flags. All others that are modified must be saved */ -- eabi_save ({r2,r3,r4,lr}) -- push {r2,r3,r4,lr} -- cfi_adjust_cfa_offset (16) -+ flags. All others that are modified must be saved. r5 is -+ used as the hwcap value to avoid reload after __tls_get_addr -+ call. If required we will save the vector register on the slow -+ path. */ -+ eabi_save ({r2,r3,r4,r5,ip,lr}) -+ push {r2,r3,r4,r5,ip,lr} -+ cfi_adjust_cfa_offset (24) - cfi_rel_offset (r2,0) - cfi_rel_offset (r3,4) - cfi_rel_offset (r4,8) -- cfi_rel_offset (lr,12) -+ cfi_rel_offset (r5,12) -+ cfi_rel_offset (ip,16) -+ cfi_rel_offset (lr,20) -+ - ldr r1, [r0] /* td */ - GET_TLS (lr) - mov r4, r0 /* r4 = tp */ -@@ -113,22 +120,69 @@ _dl_tlsdesc_dynamic: - rsbne r0, r4, r3 - bne 2f - 1: mov r0, r1 -+ -+ /* Load the hwcap to check for vector support. */ -+ ldr r2, 3f -+ ldr r1, .Lrtld_global_ro -+0: add r2, pc, r2 -+ ldr r2, [r2, r1] -+ ldr r5, [r2, #RTLD_GLOBAL_RO_DL_HWCAP_OFFSET] -+ -+#ifdef __SOFTFP__ -+ tst r5, #HWCAP_ARM_VFP -+ beq .Lno_vfp -+#endif -+ -+ /* Store the VFP registers. Don't use VFP instructions directly -+ because this code is used in non-VFP multilibs. */ -+#define VFP_STACK_REQ (32*8 + 8) -+ sub sp, sp, VFP_STACK_REQ -+ cfi_adjust_cfa_offset (VFP_STACK_REQ) -+ mov r3, sp -+ .inst 0xeca30b20 /* vstmia r3!, {d0-d15} */ -+ tst r5, #HWCAP_ARM_VFPD32 -+ beq 4f -+ .inst 0xece30b20 /* vstmia r3!, {d16-d31} */ -+ /* Store the floating-point status register. */ -+4: .inst 0xeef12a10 /* vmrs r2, fpscr */ -+ str r2, [r3] -+.Lno_vfp: - bl __tls_get_addr - rsb r0, r4, r0 -+#ifdef __SOFTFP__ -+ tst r5, #HWCAP_ARM_VFP -+ beq 2f -+#endif -+ mov r3, sp -+ .inst 0xecb30b20 /* vldmia r3!, {d0-d15} */ -+ tst r5, #HWCAP_ARM_VFPD32 -+ beq 5f -+ .inst 0xecf30b20 /* vldmia r3!, {d16-d31} */ -+ ldr r4, [r3] -+5: .inst 0xeee14a10 /* vmsr fpscr, r4 */ -+ add sp, sp, VFP_STACK_REQ -+ cfi_adjust_cfa_offset (-VFP_STACK_REQ) -+ - 2: - #if ((defined (__ARM_ARCH_4T__) && defined (__THUMB_INTERWORK__)) \ - || defined (ARM_ALWAYS_BX)) -- pop {r2,r3,r4, lr} -- cfi_adjust_cfa_offset (-16) -+ pop {r2,r3,r4,r5,ip, lr} -+ cfi_adjust_cfa_offset (-20) - cfi_restore (lr) -+ cfi_restore (ip) -+ cfi_restore (r5) - cfi_restore (r4) - cfi_restore (r3) - cfi_restore (r2) - bx lr - #else -- pop {r2,r3,r4, pc} -+ pop {r2,r3,r4,r5,ip, pc} - #endif - eabi_fnend - cfi_endproc - .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic -+ -+3: .long _GLOBAL_OFFSET_TABLE_ - 0b - PC_OFS -+.Lrtld_global_ro: -+ .long C_SYMBOL_NAME(_rtld_global_ro)(GOT) - #endif /* SHARED */ -diff --git a/sysdeps/arm/tst-gnu2-tls2.h b/sysdeps/arm/tst-gnu2-tls2.h -new file mode 100644 -index 0000000000..e413ac21fb ---- /dev/null -+++ b/sysdeps/arm/tst-gnu2-tls2.h -@@ -0,0 +1,128 @@ -+/* Test TLSDESC relocation. ARM version. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <config.h> -+#include <sys/auxv.h> -+#include <string.h> -+#include <stdlib.h> -+#include <endian.h> -+ -+#ifndef __SOFTFP__ -+ -+# ifdef HAVE_ARM_PCS_VFP_D32 -+# define SAVE_VFP_D32 \ -+ asm volatile ("vldr d16,=17" : : : "d16"); \ -+ asm volatile ("vldr d17,=18" : : : "d17"); \ -+ asm volatile ("vldr d18,=19" : : : "d18"); \ -+ asm volatile ("vldr d19,=20" : : : "d19"); \ -+ asm volatile ("vldr d20,=21" : : : "d20"); \ -+ asm volatile ("vldr d21,=22" : : : "d21"); \ -+ asm volatile ("vldr d22,=23" : : : "d22"); \ -+ asm volatile ("vldr d23,=24" : : : "d23"); \ -+ asm volatile ("vldr d24,=25" : : : "d24"); \ -+ asm volatile ("vldr d25,=26" : : : "d25"); \ -+ asm volatile ("vldr d26,=27" : : : "d26"); \ -+ asm volatile ("vldr d27,=28" : : : "d27"); \ -+ asm volatile ("vldr d28,=29" : : : "d28"); \ -+ asm volatile ("vldr d29,=30" : : : "d29"); \ -+ asm volatile ("vldr d30,=31" : : : "d30"); \ -+ asm volatile ("vldr d31,=32" : : : "d31"); -+# else -+# define SAVE_VFP_D32 -+# endif -+ -+# define INIT_TLSDESC_CALL() \ -+ unsigned long hwcap = getauxval (AT_HWCAP) -+ -+/* Set each vector register to a value from 1 to 32 before the TLS access, -+ dump to memory after TLS access, and compare with the expected values. */ -+ -+# define BEFORE_TLSDESC_CALL() \ -+ if (hwcap & HWCAP_ARM_VFP) \ -+ { \ -+ asm volatile ("vldr d0,=1" : : : "d0"); \ -+ asm volatile ("vldr d1,=2" : : : "d1"); \ -+ asm volatile ("vldr d2,=3" : : : "d1"); \ -+ asm volatile ("vldr d3,=4" : : : "d3"); \ -+ asm volatile ("vldr d4,=5" : : : "d4"); \ -+ asm volatile ("vldr d5,=6" : : : "d5"); \ -+ asm volatile ("vldr d6,=7" : : : "d6"); \ -+ asm volatile ("vldr d7,=8" : : : "d7"); \ -+ asm volatile ("vldr d8,=9" : : : "d8"); \ -+ asm volatile ("vldr d9,=10" : : : "d9"); \ -+ asm volatile ("vldr d10,=11" : : : "d10"); \ -+ asm volatile ("vldr d11,=12" : : : "d11"); \ -+ asm volatile ("vldr d12,=13" : : : "d12"); \ -+ asm volatile ("vldr d13,=14" : : : "d13"); \ -+ asm volatile ("vldr d14,=15" : : : "d14"); \ -+ asm volatile ("vldr d15,=16" : : : "d15"); \ -+ } \ -+ if (hwcap & HWCAP_ARM_VFPD32) \ -+ { \ -+ SAVE_VFP_D32 \ -+ } -+ -+# define VFP_STACK_REQ (16*8) -+# if __BYTE_ORDER == __BIG_ENDIAN -+# define DISP 7 -+# else -+# define DISP 0 -+# endif -+ -+# ifdef HAVE_ARM_PCS_VFP_D32 -+# define CHECK_VFP_D32 \ -+ char vfp[VFP_STACK_REQ]; \ -+ asm volatile ("vstmia %0, {d16-d31}\n" \ -+ : \ -+ : "r" (vfp) \ -+ : "memory"); \ -+ \ -+ char expected[VFP_STACK_REQ] = { 0 }; \ -+ for (int i = 0; i < 16; ++i) \ -+ expected[i * 8 + DISP] = i + 17; \ -+ \ -+ if (memcmp (vfp, expected, VFP_STACK_REQ) != 0) \ -+ abort (); -+# else -+# define CHECK_VFP_D32 -+# endif -+ -+# define AFTER_TLSDESC_CALL() \ -+ if (hwcap & HWCAP_ARM_VFP) \ -+ { \ -+ char vfp[VFP_STACK_REQ]; \ -+ asm volatile ("vstmia %0, {d0-d15}\n" \ -+ : \ -+ : "r" (vfp) \ -+ : "memory"); \ -+ \ -+ char expected[VFP_STACK_REQ] = { 0 }; \ -+ for (int i = 0; i < 16; ++i) \ -+ expected[i * 8 + DISP] = i + 1; \ -+ \ -+ if (memcmp (vfp, expected, VFP_STACK_REQ) != 0) \ -+ abort (); \ -+ } \ -+ if (hwcap & HWCAP_ARM_VFPD32) \ -+ { \ -+ CHECK_VFP_D32 \ -+ } -+ -+#endif /* __SOFTFP__ */ -+ -+#include_next <tst-gnu2-tls2.h> - -commit aded2fc004e7ee85cf0b45b1382552d41e555a23 -Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> -Date: Tue Mar 12 13:21:20 2024 -0300 - - elf: Enable TLS descriptor tests on aarch64 - - The aarch64 uses 'trad' for traditional tls and 'desc' for tls - descriptors, but unlike other targets it defaults to 'desc'. The - gnutls2 configure check does not set aarch64 as an ABI that uses - TLS descriptors, which then disable somes stests. - - Also rename the internal machinery fron gnu2 to tls descriptors. - - Checked on aarch64-linux-gnu. - Reviewed-by: H.J. Lu <hjl.tools@gmail.com> - - (cherry picked from commit 3d53d18fc71c5d9ef4773b8bce04d54b80181926) - -diff --git a/configure b/configure -index 117b48a421..432e40a592 100755 ---- a/configure -+++ b/configure -@@ -653,7 +653,7 @@ LIBGD - libc_cv_cc_loop_to_function - libc_cv_cc_submachine - libc_cv_cc_nofma --libc_cv_mtls_dialect_gnu2 -+libc_cv_mtls_descriptor - libc_cv_has_glob_dat - libc_cv_fpie - libc_cv_z_execstack -@@ -4760,6 +4760,9 @@ libc_config_ok=no - # whether to use such directories. - with_fp_cond=1 - -+# A preconfigure script may define another name to TLS descriptor variant -+mtls_descriptor=gnu2 -+ - if frags=`ls -d $srcdir/sysdeps/*/preconfigure 2> /dev/null` - then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysdeps preconfigure fragments" >&5 -@@ -7006,9 +7009,9 @@ fi - printf "%s\n" "$libc_cv_has_glob_dat" >&6; } - - --{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -mtls-dialect=gnu2" >&5 --printf %s "checking for -mtls-dialect=gnu2... " >&6; } --if test ${libc_cv_mtls_dialect_gnu2+y} -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tls descriptor support" >&5 -+printf %s "checking for tls descriptor support... " >&6; } -+if test ${libc_cv_mtls_descriptor+y} - then : - printf %s "(cached) " >&6 - else $as_nop -@@ -7019,7 +7022,7 @@ void foo (void) - i = 10; - } - EOF --if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=gnu2 -nostdlib -nostartfiles -+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=$mtls_descriptor -nostdlib -nostartfiles - -shared conftest.c -o conftest 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 -@@ -7027,17 +7030,17 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=gnu2 -nostdlib -nost - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; } - then -- libc_cv_mtls_dialect_gnu2=yes -+ libc_cv_mtls_descriptor=$mtls_descriptor - else -- libc_cv_mtls_dialect_gnu2=no -+ libc_cv_mtls_descriptor=no - fi - rm -f conftest* - fi --{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_mtls_dialect_gnu2" >&5 --printf "%s\n" "$libc_cv_mtls_dialect_gnu2" >&6; } -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_mtls_descriptor" >&5 -+printf "%s\n" "$libc_cv_mtls_descriptor" >&6; } - - config_vars="$config_vars --have-mtls-dialect-gnu2 = $libc_cv_mtls_dialect_gnu2" -+have-mtls-descriptor = $libc_cv_mtls_descriptor" - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -Wno-ignored-attributes is required for aliases" >&5 - printf %s "checking if -Wno-ignored-attributes is required for aliases... " >&6; } -diff --git a/configure.ac b/configure.ac -index 19b88a47a5..bdc385d03c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -442,6 +442,9 @@ libc_config_ok=no - # whether to use such directories. - with_fp_cond=1 - -+# A preconfigure script may define another name to TLS descriptor variant -+mtls_descriptor=gnu2 -+ - dnl Let sysdeps/*/preconfigure act here. - LIBC_PRECONFIGURE([$srcdir], [for sysdeps]) - -@@ -1287,7 +1290,7 @@ fi - rm -f conftest*]) - AC_SUBST(libc_cv_has_glob_dat) - --AC_CACHE_CHECK([for -mtls-dialect=gnu2], libc_cv_mtls_dialect_gnu2, -+AC_CACHE_CHECK([for tls descriptor support], libc_cv_mtls_descriptor, - [dnl - cat > conftest.c <<EOF - __thread int i; -@@ -1296,16 +1299,16 @@ void foo (void) - i = 10; - } - EOF --if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=gnu2 -nostdlib -nostartfiles -+if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=$mtls_descriptor -nostdlib -nostartfiles - -shared conftest.c -o conftest 1>&AS_MESSAGE_LOG_FD]) - then -- libc_cv_mtls_dialect_gnu2=yes -+ libc_cv_mtls_descriptor=$mtls_descriptor - else -- libc_cv_mtls_dialect_gnu2=no -+ libc_cv_mtls_descriptor=no - fi - rm -f conftest*]) --AC_SUBST(libc_cv_mtls_dialect_gnu2) --LIBC_CONFIG_VAR([have-mtls-dialect-gnu2], [$libc_cv_mtls_dialect_gnu2]) -+AC_SUBST(libc_cv_mtls_descriptor) -+LIBC_CONFIG_VAR([have-mtls-descriptor], [$libc_cv_mtls_descriptor]) - - dnl clang emits an warning for a double alias redirection, to warn the - dnl original symbol is sed even when weak definition overrides it. -diff --git a/elf/Makefile b/elf/Makefile -index 030db4d207..69aa423c4b 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -999,13 +999,13 @@ modules-names-tests = $(filter-out ifuncmod% tst-tlsmod%,\ - # For +depfiles in Makerules. - extra-test-objs += tst-auditmod17.os - --ifeq (yes,$(have-mtls-dialect-gnu2)) -+ifneq (no,$(have-mtls-descriptor)) - tests += tst-gnu2-tls1 - modules-names += tst-gnu2-tls1mod - $(objpfx)tst-gnu2-tls1: $(objpfx)tst-gnu2-tls1mod.so - tst-gnu2-tls1mod.so-no-z-defs = yes --CFLAGS-tst-gnu2-tls1mod.c += -mtls-dialect=gnu2 --endif # $(have-mtls-dialect-gnu2) -+CFLAGS-tst-gnu2-tls1mod.c += -mtls-dialect=$(have-mtls-descriptor) -+endif # $(have-mtls-descriptor) - - ifeq (yes,$(have-protected-data)) - modules-names += tst-protected1moda tst-protected1modb -@@ -2972,11 +2972,11 @@ $(objpfx)tst-tls-allocation-failure-static-patched.out: \ - $(objpfx)tst-audit-tlsdesc: $(objpfx)tst-audit-tlsdesc-mod1.so \ - $(objpfx)tst-audit-tlsdesc-mod2.so \ - $(shared-thread-library) --ifeq (yes,$(have-mtls-dialect-gnu2)) -+ifneq (no,$(have-mtls-descriptor)) - # The test is valid for all TLS types, but we want to exercise GNU2 - # TLS if possible. --CFLAGS-tst-audit-tlsdesc-mod1.c += -mtls-dialect=gnu2 --CFLAGS-tst-audit-tlsdesc-mod2.c += -mtls-dialect=gnu2 -+CFLAGS-tst-audit-tlsdesc-mod1.c += -mtls-dialect=$(have-mtls-descriptor) -+CFLAGS-tst-audit-tlsdesc-mod2.c += -mtls-dialect=$(have-mtls-descriptor) - endif - $(objpfx)tst-audit-tlsdesc-dlopen: $(shared-thread-library) - $(objpfx)tst-audit-tlsdesc-dlopen.out: $(objpfx)tst-audit-tlsdesc-mod1.so \ -@@ -3055,11 +3055,11 @@ $(objpfx)tst-gnu2-tls2.out: \ - $(objpfx)tst-gnu2-tls2mod1.so \ - $(objpfx)tst-gnu2-tls2mod2.so - --ifeq (yes,$(have-mtls-dialect-gnu2)) --CFLAGS-tst-tlsgap-mod0.c += -mtls-dialect=gnu2 --CFLAGS-tst-tlsgap-mod1.c += -mtls-dialect=gnu2 --CFLAGS-tst-tlsgap-mod2.c += -mtls-dialect=gnu2 --CFLAGS-tst-gnu2-tls2mod0.c += -mtls-dialect=gnu2 --CFLAGS-tst-gnu2-tls2mod1.c += -mtls-dialect=gnu2 --CFLAGS-tst-gnu2-tls2mod2.c += -mtls-dialect=gnu2 -+ifneq (no,$(have-mtls-descriptor)) -+CFLAGS-tst-tlsgap-mod0.c += -mtls-dialect=$(have-mtls-descriptor) -+CFLAGS-tst-tlsgap-mod1.c += -mtls-dialect=$(have-mtls-descriptor) -+CFLAGS-tst-tlsgap-mod2.c += -mtls-dialect=$(have-mtls-descriptor) -+CFLAGS-tst-gnu2-tls2mod0.c += -mtls-dialect=$(have-mtls-descriptor) -+CFLAGS-tst-gnu2-tls2mod1.c += -mtls-dialect=$(have-mtls-descriptor) -+CFLAGS-tst-gnu2-tls2mod2.c += -mtls-dialect=$(have-mtls-descriptor) - endif -diff --git a/sysdeps/aarch64/preconfigure b/sysdeps/aarch64/preconfigure -index d9bd1f8558..19657b627b 100644 ---- a/sysdeps/aarch64/preconfigure -+++ b/sysdeps/aarch64/preconfigure -@@ -2,5 +2,6 @@ case "$machine" in - aarch64*) - base_machine=aarch64 - machine=aarch64 -+ mtls_descriptor=desc - ;; - esac -diff --git a/sysdeps/arm/Makefile b/sysdeps/arm/Makefile -index d5cea717a9..619474eca9 100644 ---- a/sysdeps/arm/Makefile -+++ b/sysdeps/arm/Makefile -@@ -13,15 +13,15 @@ $(objpfx)libgcc-stubs.a: $(objpfx)aeabi_unwind_cpp_pr1.os - lib-noranlib: $(objpfx)libgcc-stubs.a - - ifeq ($(build-shared),yes) --ifeq (yes,$(have-mtls-dialect-gnu2)) -+ifneq (no,$(have-mtls-descriptor)) - tests += tst-armtlsdescloc tst-armtlsdescextnow tst-armtlsdescextlazy - modules-names += tst-armtlsdesclocmod - modules-names += tst-armtlsdescextlazymod tst-armtlsdescextnowmod - CPPFLAGS-tst-armtlsdescextnowmod.c += -Dstatic= - CPPFLAGS-tst-armtlsdescextlazymod.c += -Dstatic= --CFLAGS-tst-armtlsdesclocmod.c += -mtls-dialect=gnu2 --CFLAGS-tst-armtlsdescextnowmod.c += -mtls-dialect=gnu2 --CFLAGS-tst-armtlsdescextlazymod.c += -mtls-dialect=gnu2 -+CFLAGS-tst-armtlsdesclocmod.c += -mtls-dialect=$(have-mtls-descriptor) -+CFLAGS-tst-armtlsdescextnowmod.c += -mtls-dialect=$(have-mtls-descriptor) -+CFLAGS-tst-armtlsdescextlazymod.c += -mtls-dialect=$(have-mtls-descriptor) - LDFLAGS-tst-armtlsdescextnowmod.so += -Wl,-z,now - tst-armtlsdescloc-ENV = LD_BIND_NOW=1 - tst-armtlsdescextnow-ENV = LD_BIND_NOW=1 - -commit 5a461f2949ded98d8211939f84988bc464c7b4fe -Author: Andreas Schwab <schwab@suse.de> -Date: Tue Mar 19 13:49:50 2024 +0100 - - Add tst-gnu2-tls2mod1 to test-internal-extras - - That allows sysdeps/x86_64/tst-gnu2-tls2mod1.S to use internal headers. - - Fixes: 717ebfa85c ("x86-64: Allocate state buffer space for RDI, RSI and RBX") - (cherry picked from commit fd7ee2e6c5eb49e4a630a9978b4d668bff6354ee) - -diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile -index e8babc9a4e..9d374a3299 100644 ---- a/sysdeps/x86_64/Makefile -+++ b/sysdeps/x86_64/Makefile -@@ -210,6 +210,8 @@ tst-plt-rewrite2-ENV = GLIBC_TUNABLES=glibc.cpu.plt_rewrite=2 - $(objpfx)tst-plt-rewrite2: $(objpfx)tst-plt-rewritemod2.so - endif - -+test-internal-extras += tst-gnu2-tls2mod1 -+ - endif # $(subdir) == elf - - ifeq ($(subdir),csu) - -commit aa4249266e9906c4bc833e4847f4d8feef59504f -Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> -Date: Thu Feb 8 10:08:38 2024 -0300 - - x86: Fix Zen3/Zen4 ERMS selection (BZ 30994) - - The REP MOVSB usage on memcpy/memmove does not show much performance - improvement on Zen3/Zen4 cores compared to the vectorized loops. Also, - as from BZ 30994, if the source is aligned and the destination is not - the performance can be 20x slower. - - The performance difference is noticeable with small buffer sizes, closer - to the lower bounds limits when memcpy/memmove starts to use ERMS. The - performance of REP MOVSB is similar to vectorized instruction on the - size limit (the L2 cache). Also, there is no drawback to multiple cores - sharing the cache. - - Checked on x86_64-linux-gnu on Zen3. - Reviewed-by: H.J. Lu <hjl.tools@gmail.com> - - (cherry picked from commit 0c0d39fe4aeb0f69b26e76337c5dfd5530d5d44e) - -diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h -index d5101615e3..f34d12846c 100644 ---- a/sysdeps/x86/dl-cacheinfo.h -+++ b/sysdeps/x86/dl-cacheinfo.h -@@ -791,7 +791,6 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - long int data = -1; - long int shared = -1; - long int shared_per_thread = -1; -- long int core = -1; - unsigned int threads = 0; - unsigned long int level1_icache_size = -1; - unsigned long int level1_icache_linesize = -1; -@@ -809,7 +808,6 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - if (cpu_features->basic.kind == arch_kind_intel) - { - data = handle_intel (_SC_LEVEL1_DCACHE_SIZE, cpu_features); -- core = handle_intel (_SC_LEVEL2_CACHE_SIZE, cpu_features); - shared = handle_intel (_SC_LEVEL3_CACHE_SIZE, cpu_features); - shared_per_thread = shared; - -@@ -822,7 +820,8 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - = handle_intel (_SC_LEVEL1_DCACHE_ASSOC, cpu_features); - level1_dcache_linesize - = handle_intel (_SC_LEVEL1_DCACHE_LINESIZE, cpu_features); -- level2_cache_size = core; -+ level2_cache_size -+ = handle_intel (_SC_LEVEL2_CACHE_SIZE, cpu_features); - level2_cache_assoc - = handle_intel (_SC_LEVEL2_CACHE_ASSOC, cpu_features); - level2_cache_linesize -@@ -835,12 +834,12 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - level4_cache_size - = handle_intel (_SC_LEVEL4_CACHE_SIZE, cpu_features); - -- get_common_cache_info (&shared, &shared_per_thread, &threads, core); -+ get_common_cache_info (&shared, &shared_per_thread, &threads, -+ level2_cache_size); - } - else if (cpu_features->basic.kind == arch_kind_zhaoxin) - { - data = handle_zhaoxin (_SC_LEVEL1_DCACHE_SIZE); -- core = handle_zhaoxin (_SC_LEVEL2_CACHE_SIZE); - shared = handle_zhaoxin (_SC_LEVEL3_CACHE_SIZE); - shared_per_thread = shared; - -@@ -849,19 +848,19 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - level1_dcache_size = data; - level1_dcache_assoc = handle_zhaoxin (_SC_LEVEL1_DCACHE_ASSOC); - level1_dcache_linesize = handle_zhaoxin (_SC_LEVEL1_DCACHE_LINESIZE); -- level2_cache_size = core; -+ level2_cache_size = handle_zhaoxin (_SC_LEVEL2_CACHE_SIZE); - level2_cache_assoc = handle_zhaoxin (_SC_LEVEL2_CACHE_ASSOC); - level2_cache_linesize = handle_zhaoxin (_SC_LEVEL2_CACHE_LINESIZE); - level3_cache_size = shared; - level3_cache_assoc = handle_zhaoxin (_SC_LEVEL3_CACHE_ASSOC); - level3_cache_linesize = handle_zhaoxin (_SC_LEVEL3_CACHE_LINESIZE); - -- get_common_cache_info (&shared, &shared_per_thread, &threads, core); -+ get_common_cache_info (&shared, &shared_per_thread, &threads, -+ level2_cache_size); - } - else if (cpu_features->basic.kind == arch_kind_amd) - { - data = handle_amd (_SC_LEVEL1_DCACHE_SIZE); -- core = handle_amd (_SC_LEVEL2_CACHE_SIZE); - shared = handle_amd (_SC_LEVEL3_CACHE_SIZE); - - level1_icache_size = handle_amd (_SC_LEVEL1_ICACHE_SIZE); -@@ -869,7 +868,7 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - level1_dcache_size = data; - level1_dcache_assoc = handle_amd (_SC_LEVEL1_DCACHE_ASSOC); - level1_dcache_linesize = handle_amd (_SC_LEVEL1_DCACHE_LINESIZE); -- level2_cache_size = core; -+ level2_cache_size = handle_amd (_SC_LEVEL2_CACHE_SIZE);; - level2_cache_assoc = handle_amd (_SC_LEVEL2_CACHE_ASSOC); - level2_cache_linesize = handle_amd (_SC_LEVEL2_CACHE_LINESIZE); - level3_cache_size = shared; -@@ -880,12 +879,12 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - if (shared <= 0) - { - /* No shared L3 cache. All we have is the L2 cache. */ -- shared = core; -+ shared = level2_cache_size; - } - else if (cpu_features->basic.family < 0x17) - { - /* Account for exclusive L2 and L3 caches. */ -- shared += core; -+ shared += level2_cache_size; - } - - shared_per_thread = shared; -@@ -987,6 +986,12 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - if (CPU_FEATURE_USABLE_P (cpu_features, FSRM)) - rep_movsb_threshold = 2112; - -+ /* For AMD CPUs that support ERMS (Zen3+), REP MOVSB is in a lot of -+ cases slower than the vectorized path (and for some alignments, -+ it is really slow, check BZ #30994). */ -+ if (cpu_features->basic.kind == arch_kind_amd) -+ rep_movsb_threshold = non_temporal_threshold; -+ - /* The default threshold to use Enhanced REP STOSB. */ - unsigned long int rep_stosb_threshold = 2048; - -@@ -1028,16 +1033,9 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - SIZE_MAX); - - unsigned long int rep_movsb_stop_threshold; -- /* ERMS feature is implemented from AMD Zen3 architecture and it is -- performing poorly for data above L2 cache size. Henceforth, adding -- an upper bound threshold parameter to limit the usage of Enhanced -- REP MOVSB operations and setting its value to L2 cache size. */ -- if (cpu_features->basic.kind == arch_kind_amd) -- rep_movsb_stop_threshold = core; - /* Setting the upper bound of ERMS to the computed value of -- non-temporal threshold for architectures other than AMD. */ -- else -- rep_movsb_stop_threshold = non_temporal_threshold; -+ non-temporal threshold for all architectures. */ -+ rep_movsb_stop_threshold = non_temporal_threshold; - - cpu_features->data_cache_size = data; - cpu_features->shared_cache_size = shared; - -commit 6484a92698039c4a7a510f0214e22d067b0d78b3 -Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> -Date: Thu Feb 8 10:08:39 2024 -0300 - - x86: Do not prefer ERMS for memset on Zen3+ - - For AMD Zen3+ architecture, the performance of the vectorized loop is - slightly better than ERMS. - - Checked on x86_64-linux-gnu on Zen3. - Reviewed-by: H.J. Lu <hjl.tools@gmail.com> - - (cherry picked from commit 272708884cb750f12f5c74a00e6620c19dc6d567) - -diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h -index f34d12846c..5a98f70364 100644 ---- a/sysdeps/x86/dl-cacheinfo.h -+++ b/sysdeps/x86/dl-cacheinfo.h -@@ -1021,6 +1021,11 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) - minimum value is fixed. */ - rep_stosb_threshold = TUNABLE_GET (x86_rep_stosb_threshold, - long int, NULL); -+ if (cpu_features->basic.kind == arch_kind_amd -+ && !TUNABLE_IS_INITIALIZED (x86_rep_stosb_threshold)) -+ /* For AMD Zen3+ architecture, the performance of the vectorized loop is -+ slightly better than ERMS. */ -+ rep_stosb_threshold = SIZE_MAX; - - TUNABLE_SET_WITH_BOUNDS (x86_data_cache_size, data, 0, SIZE_MAX); - TUNABLE_SET_WITH_BOUNDS (x86_shared_cache_size, shared, 0, SIZE_MAX); - -commit 5d070d12b3a52bc44dd1b71743abc4b6243862ae -Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> -Date: Thu Feb 8 10:08:40 2024 -0300 - - x86: Expand the comment on when REP STOSB is used on memset - - Reviewed-by: H.J. Lu <hjl.tools@gmail.com> - (cherry picked from commit 491e55beab7457ed310a4a47496f4a333c5d1032) - -diff --git a/sysdeps/x86_64/multiarch/memset-vec-unaligned-erms.S b/sysdeps/x86_64/multiarch/memset-vec-unaligned-erms.S -index 9984c3ca0f..97839a2248 100644 ---- a/sysdeps/x86_64/multiarch/memset-vec-unaligned-erms.S -+++ b/sysdeps/x86_64/multiarch/memset-vec-unaligned-erms.S -@@ -21,7 +21,9 @@ - 2. If size is less than VEC, use integer register stores. - 3. If size is from VEC_SIZE to 2 * VEC_SIZE, use 2 VEC stores. - 4. If size is from 2 * VEC_SIZE to 4 * VEC_SIZE, use 4 VEC stores. -- 5. If size is more to 4 * VEC_SIZE, align to 4 * VEC_SIZE with -+ 5. On machines ERMS feature, if size is greater or equal than -+ __x86_rep_stosb_threshold then REP STOSB will be used. -+ 6. If size is more to 4 * VEC_SIZE, align to 4 * VEC_SIZE with - 4 VEC stores and store 4 * VEC at a time until done. */ - - #include <sysdep.h> - -commit 31c7d69af59da0da80caa74b2ec6ae149013384d -Author: Florian Weimer <fweimer@redhat.com> -Date: Fri Feb 16 07:40:37 2024 +0100 - - i386: Use generic memrchr in libc (bug 31316) - - Before this change, we incorrectly used the SSE2 variant in the - implementation, without checking that the system actually supports - SSE2. - - Tested-by: Sam James <sam@gentoo.org> - (cherry picked from commit 0d9166c2245cad4ac520b337dee40c9a583872b6) - -diff --git a/sysdeps/i386/i686/multiarch/memrchr-c.c b/sysdeps/i386/i686/multiarch/memrchr-c.c -index ef7bbbe792..20bfdf3af3 100644 ---- a/sysdeps/i386/i686/multiarch/memrchr-c.c -+++ b/sysdeps/i386/i686/multiarch/memrchr-c.c -@@ -5,3 +5,4 @@ extern void *__memrchr_ia32 (const void *, int, size_t); - #endif - - #include "string/memrchr.c" -+strong_alias (__memrchr_ia32, __GI___memrchr) -diff --git a/sysdeps/i386/i686/multiarch/memrchr-sse2.S b/sysdeps/i386/i686/multiarch/memrchr-sse2.S -index d9dae04171..e123f87435 100644 ---- a/sysdeps/i386/i686/multiarch/memrchr-sse2.S -+++ b/sysdeps/i386/i686/multiarch/memrchr-sse2.S -@@ -720,5 +720,4 @@ L(ret_null): - ret - - END (__memrchr_sse2) --strong_alias (__memrchr_sse2, __GI___memrchr) - #endif - -commit b0e0a07018098c2c5927796be5681a298c312626 -Author: Joe Ramsay <Joe.Ramsay@arm.com> -Date: Tue Feb 20 16:44:13 2024 +0000 - - aarch64/fpu: Sync libmvec routines from 2.39 and before with AOR - - This includes a fix for big-endian in AdvSIMD log, some cosmetic - changes, and numerous small optimisations mainly around inlining and - using indexed variants of MLA intrinsics. - Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> - - (cherry picked from commit e302e1021391d13a9611ba3a910df128830bd19e) - -diff --git a/sysdeps/aarch64/fpu/acos_advsimd.c b/sysdeps/aarch64/fpu/acos_advsimd.c -index a8eabb5e71..0a86c9823a 100644 ---- a/sysdeps/aarch64/fpu/acos_advsimd.c -+++ b/sysdeps/aarch64/fpu/acos_advsimd.c -@@ -40,8 +40,8 @@ static const struct data - }; - - #define AllMask v_u64 (0xffffffffffffffff) --#define Oneu (0x3ff0000000000000) --#define Small (0x3e50000000000000) /* 2^-53. */ -+#define Oneu 0x3ff0000000000000 -+#define Small 0x3e50000000000000 /* 2^-53. */ - - #if WANT_SIMD_EXCEPT - static float64x2_t VPCS_ATTR NOINLINE -diff --git a/sysdeps/aarch64/fpu/asin_advsimd.c b/sysdeps/aarch64/fpu/asin_advsimd.c -index 141646e954..2de6eff407 100644 ---- a/sysdeps/aarch64/fpu/asin_advsimd.c -+++ b/sysdeps/aarch64/fpu/asin_advsimd.c -@@ -39,8 +39,8 @@ static const struct data - }; - - #define AllMask v_u64 (0xffffffffffffffff) --#define One (0x3ff0000000000000) --#define Small (0x3e50000000000000) /* 2^-12. */ -+#define One 0x3ff0000000000000 -+#define Small 0x3e50000000000000 /* 2^-12. */ - - #if WANT_SIMD_EXCEPT - static float64x2_t VPCS_ATTR NOINLINE -diff --git a/sysdeps/aarch64/fpu/atan2_sve.c b/sysdeps/aarch64/fpu/atan2_sve.c -index 09a4c559b8..04fa71fa37 100644 ---- a/sysdeps/aarch64/fpu/atan2_sve.c -+++ b/sysdeps/aarch64/fpu/atan2_sve.c -@@ -37,9 +37,6 @@ static const struct data - .pi_over_2 = 0x1.921fb54442d18p+0, - }; - --/* Useful constants. */ --#define SignMask sv_u64 (0x8000000000000000) -- - /* Special cases i.e. 0, infinity, nan (fall back to scalar calls). */ - static svfloat64_t NOINLINE - special_case (svfloat64_t y, svfloat64_t x, svfloat64_t ret, -@@ -72,14 +69,15 @@ svfloat64_t SV_NAME_D2 (atan2) (svfloat64_t y, svfloat64_t x, const svbool_t pg) - svbool_t cmp_y = zeroinfnan (iy, pg); - svbool_t cmp_xy = svorr_z (pg, cmp_x, cmp_y); - -- svuint64_t sign_x = svand_x (pg, ix, SignMask); -- svuint64_t sign_y = svand_x (pg, iy, SignMask); -- svuint64_t sign_xy = sveor_x (pg, sign_x, sign_y); -- - svfloat64_t ax = svabs_x (pg, x); - svfloat64_t ay = svabs_x (pg, y); -+ svuint64_t iax = svreinterpret_u64 (ax); -+ svuint64_t iay = svreinterpret_u64 (ay); -+ -+ svuint64_t sign_x = sveor_x (pg, ix, iax); -+ svuint64_t sign_y = sveor_x (pg, iy, iay); -+ svuint64_t sign_xy = sveor_x (pg, sign_x, sign_y); - -- svbool_t pred_xlt0 = svcmplt (pg, x, 0.0); - svbool_t pred_aygtax = svcmpgt (pg, ay, ax); - - /* Set up z for call to atan. */ -@@ -88,8 +86,9 @@ svfloat64_t SV_NAME_D2 (atan2) (svfloat64_t y, svfloat64_t x, const svbool_t pg) - svfloat64_t z = svdiv_x (pg, n, d); - - /* Work out the correct shift. */ -- svfloat64_t shift = svsel (pred_xlt0, sv_f64 (-2.0), sv_f64 (0.0)); -- shift = svsel (pred_aygtax, svadd_x (pg, shift, 1.0), shift); -+ svfloat64_t shift = svreinterpret_f64 (svlsr_x (pg, sign_x, 1)); -+ shift = svsel (pred_aygtax, sv_f64 (1.0), shift); -+ shift = svreinterpret_f64 (svorr_x (pg, sign_x, svreinterpret_u64 (shift))); - shift = svmul_x (pg, shift, data_ptr->pi_over_2); - - /* Use split Estrin scheme for P(z^2) with deg(P)=19. */ -@@ -109,10 +108,10 @@ svfloat64_t SV_NAME_D2 (atan2) (svfloat64_t y, svfloat64_t x, const svbool_t pg) - ret = svadd_m (pg, ret, shift); - - /* Account for the sign of x and y. */ -- ret = svreinterpret_f64 (sveor_x (pg, svreinterpret_u64 (ret), sign_xy)); -- - if (__glibc_unlikely (svptest_any (pg, cmp_xy))) -- return special_case (y, x, ret, cmp_xy); -- -- return ret; -+ return special_case ( -+ y, x, -+ svreinterpret_f64 (sveor_x (pg, svreinterpret_u64 (ret), sign_xy)), -+ cmp_xy); -+ return svreinterpret_f64 (sveor_x (pg, svreinterpret_u64 (ret), sign_xy)); - } -diff --git a/sysdeps/aarch64/fpu/atan2f_sve.c b/sysdeps/aarch64/fpu/atan2f_sve.c -index b92f83cdea..9ea197147c 100644 ---- a/sysdeps/aarch64/fpu/atan2f_sve.c -+++ b/sysdeps/aarch64/fpu/atan2f_sve.c -@@ -32,10 +32,8 @@ static const struct data - .pi_over_2 = 0x1.921fb6p+0f, - }; - --#define SignMask sv_u32 (0x80000000) -- - /* Special cases i.e. 0, infinity, nan (fall back to scalar calls). */ --static inline svfloat32_t -+static svfloat32_t NOINLINE - special_case (svfloat32_t y, svfloat32_t x, svfloat32_t ret, - const svbool_t cmp) - { -@@ -67,14 +65,15 @@ svfloat32_t SV_NAME_F2 (atan2) (svfloat32_t y, svfloat32_t x, const svbool_t pg) - svbool_t cmp_y = zeroinfnan (iy, pg); - svbool_t cmp_xy = svorr_z (pg, cmp_x, cmp_y); - -- svuint32_t sign_x = svand_x (pg, ix, SignMask); -- svuint32_t sign_y = svand_x (pg, iy, SignMask); -- svuint32_t sign_xy = sveor_x (pg, sign_x, sign_y); -- - svfloat32_t ax = svabs_x (pg, x); - svfloat32_t ay = svabs_x (pg, y); -+ svuint32_t iax = svreinterpret_u32 (ax); -+ svuint32_t iay = svreinterpret_u32 (ay); -+ -+ svuint32_t sign_x = sveor_x (pg, ix, iax); -+ svuint32_t sign_y = sveor_x (pg, iy, iay); -+ svuint32_t sign_xy = sveor_x (pg, sign_x, sign_y); - -- svbool_t pred_xlt0 = svcmplt (pg, x, 0.0); - svbool_t pred_aygtax = svcmpgt (pg, ay, ax); - - /* Set up z for call to atan. */ -@@ -83,11 +82,12 @@ svfloat32_t SV_NAME_F2 (atan2) (svfloat32_t y, svfloat32_t x, const svbool_t pg) - svfloat32_t z = svdiv_x (pg, n, d); - - /* Work out the correct shift. */ -- svfloat32_t shift = svsel (pred_xlt0, sv_f32 (-2.0), sv_f32 (0.0)); -- shift = svsel (pred_aygtax, svadd_x (pg, shift, 1.0), shift); -+ svfloat32_t shift = svreinterpret_f32 (svlsr_x (pg, sign_x, 1)); -+ shift = svsel (pred_aygtax, sv_f32 (1.0), shift); -+ shift = svreinterpret_f32 (svorr_x (pg, sign_x, svreinterpret_u32 (shift))); - shift = svmul_x (pg, shift, sv_f32 (data_ptr->pi_over_2)); - -- /* Use split Estrin scheme for P(z^2) with deg(P)=7. */ -+ /* Use pure Estrin scheme for P(z^2) with deg(P)=7. */ - svfloat32_t z2 = svmul_x (pg, z, z); - svfloat32_t z4 = svmul_x (pg, z2, z2); - svfloat32_t z8 = svmul_x (pg, z4, z4); -@@ -101,10 +101,12 @@ svfloat32_t SV_NAME_F2 (atan2) (svfloat32_t y, svfloat32_t x, const svbool_t pg) - ret = svadd_m (pg, ret, shift); - - /* Account for the sign of x and y. */ -- ret = svreinterpret_f32 (sveor_x (pg, svreinterpret_u32 (ret), sign_xy)); - - if (__glibc_unlikely (svptest_any (pg, cmp_xy))) -- return special_case (y, x, ret, cmp_xy); -+ return special_case ( -+ y, x, -+ svreinterpret_f32 (sveor_x (pg, svreinterpret_u32 (ret), sign_xy)), -+ cmp_xy); - -- return ret; -+ return svreinterpret_f32 (sveor_x (pg, svreinterpret_u32 (ret), sign_xy)); - } -diff --git a/sysdeps/aarch64/fpu/cos_advsimd.c b/sysdeps/aarch64/fpu/cos_advsimd.c -index 2897e8b909..3924c9ce44 100644 ---- a/sysdeps/aarch64/fpu/cos_advsimd.c -+++ b/sysdeps/aarch64/fpu/cos_advsimd.c -@@ -63,8 +63,7 @@ float64x2_t VPCS_ATTR V_NAME_D1 (cos) (float64x2_t x) - special-case handler later. */ - r = vbslq_f64 (cmp, v_f64 (1.0), r); - #else -- cmp = vcageq_f64 (d->range_val, x); -- cmp = vceqzq_u64 (cmp); /* cmp = ~cmp. */ -+ cmp = vcageq_f64 (x, d->range_val); - r = x; - #endif - -diff --git a/sysdeps/aarch64/fpu/cosf_advsimd.c b/sysdeps/aarch64/fpu/cosf_advsimd.c -index 60abc8dfcf..d0c285b03a 100644 ---- a/sysdeps/aarch64/fpu/cosf_advsimd.c -+++ b/sysdeps/aarch64/fpu/cosf_advsimd.c -@@ -64,8 +64,7 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (cos) (float32x4_t x) - special-case handler later. */ - r = vbslq_f32 (cmp, v_f32 (1.0f), r); - #else -- cmp = vcageq_f32 (d->range_val, x); -- cmp = vceqzq_u32 (cmp); /* cmp = ~cmp. */ -+ cmp = vcageq_f32 (x, d->range_val); - r = x; - #endif - -diff --git a/sysdeps/aarch64/fpu/exp10_advsimd.c b/sysdeps/aarch64/fpu/exp10_advsimd.c -index fe7149b191..eeb31ca839 100644 ---- a/sysdeps/aarch64/fpu/exp10_advsimd.c -+++ b/sysdeps/aarch64/fpu/exp10_advsimd.c -@@ -57,7 +57,7 @@ const static struct data - # define BigBound v_u64 (0x4070000000000000) /* asuint64 (0x1p8). */ - # define Thres v_u64 (0x2070000000000000) /* BigBound - TinyBound. */ - --static inline float64x2_t VPCS_ATTR -+static float64x2_t VPCS_ATTR NOINLINE - special_case (float64x2_t x, float64x2_t y, uint64x2_t cmp) - { - /* If fenv exceptions are to be triggered correctly, fall back to the scalar -@@ -72,7 +72,7 @@ special_case (float64x2_t x, float64x2_t y, uint64x2_t cmp) - # define SpecialBias1 v_u64 (0x7000000000000000) /* 0x1p769. */ - # define SpecialBias2 v_u64 (0x3010000000000000) /* 0x1p-254. */ - --static float64x2_t VPCS_ATTR NOINLINE -+static inline float64x2_t VPCS_ATTR - special_case (float64x2_t s, float64x2_t y, float64x2_t n, - const struct data *d) - { -diff --git a/sysdeps/aarch64/fpu/exp10f_advsimd.c b/sysdeps/aarch64/fpu/exp10f_advsimd.c -index 7ee0c90948..ab117b69da 100644 ---- a/sysdeps/aarch64/fpu/exp10f_advsimd.c -+++ b/sysdeps/aarch64/fpu/exp10f_advsimd.c -@@ -25,7 +25,8 @@ - static const struct data - { - float32x4_t poly[5]; -- float32x4_t shift, log10_2, log2_10_hi, log2_10_lo; -+ float32x4_t log10_2_and_inv, shift; -+ - #if !WANT_SIMD_EXCEPT - float32x4_t scale_thresh; - #endif -@@ -38,9 +39,9 @@ static const struct data - .poly = { V4 (0x1.26bb16p+1f), V4 (0x1.5350d2p+1f), V4 (0x1.04744ap+1f), - V4 (0x1.2d8176p+0f), V4 (0x1.12b41ap-1f) }, - .shift = V4 (0x1.8p23f), -- .log10_2 = V4 (0x1.a934fp+1), -- .log2_10_hi = V4 (0x1.344136p-2), -- .log2_10_lo = V4 (-0x1.ec10cp-27), -+ -+ /* Stores constants 1/log10(2), log10(2)_high, log10(2)_low, 0. */ -+ .log10_2_and_inv = { 0x1.a934fp+1, 0x1.344136p-2, -0x1.ec10cp-27, 0 }, - #if !WANT_SIMD_EXCEPT - .scale_thresh = V4 (ScaleBound) - #endif -@@ -98,24 +99,22 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (exp10) (float32x4_t x) - #if WANT_SIMD_EXCEPT - /* asuint(x) - TinyBound >= BigBound - TinyBound. */ - uint32x4_t cmp = vcgeq_u32 ( -- vsubq_u32 (vandq_u32 (vreinterpretq_u32_f32 (x), v_u32 (0x7fffffff)), -- TinyBound), -- Thres); -+ vsubq_u32 (vreinterpretq_u32_f32 (vabsq_f32 (x)), TinyBound), Thres); - float32x4_t xm = x; - /* If any lanes are special, mask them with 1 and retain a copy of x to allow - special case handler to fix special lanes later. This is only necessary if - fenv exceptions are to be triggered correctly. */ - if (__glibc_unlikely (v_any_u32 (cmp))) -- x = vbslq_f32 (cmp, v_f32 (1), x); -+ x = v_zerofy_f32 (x, cmp); - #endif - - /* exp10(x) = 2^n * 10^r = 2^n * (1 + poly (r)), - with poly(r) in [1/sqrt(2), sqrt(2)] and - x = r + n * log10 (2), with r in [-log10(2)/2, log10(2)/2]. */ -- float32x4_t z = vfmaq_f32 (d->shift, x, d->log10_2); -+ float32x4_t z = vfmaq_laneq_f32 (d->shift, x, d->log10_2_and_inv, 0); - float32x4_t n = vsubq_f32 (z, d->shift); -- float32x4_t r = vfmsq_f32 (x, n, d->log2_10_hi); -- r = vfmsq_f32 (r, n, d->log2_10_lo); -+ float32x4_t r = vfmsq_laneq_f32 (x, n, d->log10_2_and_inv, 1); -+ r = vfmsq_laneq_f32 (r, n, d->log10_2_and_inv, 2); - uint32x4_t e = vshlq_n_u32 (vreinterpretq_u32_f32 (z), 23); - - float32x4_t scale = vreinterpretq_f32_u32 (vaddq_u32 (e, ExponentBias)); -diff --git a/sysdeps/aarch64/fpu/exp2_advsimd.c b/sysdeps/aarch64/fpu/exp2_advsimd.c -index 391a93180c..ae1e63d503 100644 ---- a/sysdeps/aarch64/fpu/exp2_advsimd.c -+++ b/sysdeps/aarch64/fpu/exp2_advsimd.c -@@ -24,6 +24,7 @@ - #define IndexMask (N - 1) - #define BigBound 1022.0 - #define UOFlowBound 1280.0 -+#define TinyBound 0x2000000000000000 /* asuint64(0x1p-511). */ - - static const struct data - { -@@ -48,14 +49,13 @@ lookup_sbits (uint64x2_t i) - - #if WANT_SIMD_EXCEPT - --# define TinyBound 0x2000000000000000 /* asuint64(0x1p-511). */ - # define Thres 0x2080000000000000 /* asuint64(512.0) - TinyBound. */ - - /* Call scalar exp2 as a fallback. */ - static float64x2_t VPCS_ATTR NOINLINE --special_case (float64x2_t x) -+special_case (float64x2_t x, float64x2_t y, uint64x2_t is_special) - { -- return v_call_f64 (exp2, x, x, v_u64 (0xffffffffffffffff)); -+ return v_call_f64 (exp2, x, y, is_special); - } - - #else -@@ -65,7 +65,7 @@ special_case (float64x2_t x) - # define SpecialBias1 0x7000000000000000 /* 0x1p769. */ - # define SpecialBias2 0x3010000000000000 /* 0x1p-254. */ - --static float64x2_t VPCS_ATTR -+static inline float64x2_t VPCS_ATTR - special_case (float64x2_t s, float64x2_t y, float64x2_t n, - const struct data *d) - { -@@ -94,10 +94,10 @@ float64x2_t V_NAME_D1 (exp2) (float64x2_t x) - #if WANT_SIMD_EXCEPT - uint64x2_t ia = vreinterpretq_u64_f64 (vabsq_f64 (x)); - cmp = vcgeq_u64 (vsubq_u64 (ia, v_u64 (TinyBound)), v_u64 (Thres)); -- /* If any special case (inf, nan, small and large x) is detected, -- fall back to scalar for all lanes. */ -- if (__glibc_unlikely (v_any_u64 (cmp))) -- return special_case (x); -+ /* Mask special lanes and retain a copy of x for passing to special-case -+ handler. */ -+ float64x2_t xc = x; -+ x = v_zerofy_f64 (x, cmp); - #else - cmp = vcagtq_f64 (x, d->scale_big_bound); - #endif -@@ -120,9 +120,11 @@ float64x2_t V_NAME_D1 (exp2) (float64x2_t x) - float64x2_t y = v_pairwise_poly_3_f64 (r, r2, d->poly); - y = vmulq_f64 (r, y); - --#if !WANT_SIMD_EXCEPT - if (__glibc_unlikely (v_any_u64 (cmp))) -+#if !WANT_SIMD_EXCEPT - return special_case (s, y, n, d); -+#else -+ return special_case (xc, vfmaq_f64 (s, s, y), cmp); - #endif - return vfmaq_f64 (s, s, y); - } -diff --git a/sysdeps/aarch64/fpu/exp2f_sve.c b/sysdeps/aarch64/fpu/exp2f_sve.c -index 9a5a523a10..8a686e3e05 100644 ---- a/sysdeps/aarch64/fpu/exp2f_sve.c -+++ b/sysdeps/aarch64/fpu/exp2f_sve.c -@@ -20,6 +20,8 @@ - #include "sv_math.h" - #include "poly_sve_f32.h" - -+#define Thres 0x1.5d5e2ap+6f -+ - static const struct data - { - float poly[5]; -@@ -33,7 +35,7 @@ static const struct data - .shift = 0x1.903f8p17f, - /* Roughly 87.3. For x < -Thres, the result is subnormal and not handled - correctly by FEXPA. */ -- .thres = 0x1.5d5e2ap+6f, -+ .thres = Thres, - }; - - static svfloat32_t NOINLINE -diff --git a/sysdeps/aarch64/fpu/exp_advsimd.c b/sysdeps/aarch64/fpu/exp_advsimd.c -index fd215f1d2c..5e3a9a0d44 100644 ---- a/sysdeps/aarch64/fpu/exp_advsimd.c -+++ b/sysdeps/aarch64/fpu/exp_advsimd.c -@@ -54,7 +54,7 @@ const static volatile struct - # define BigBound v_u64 (0x4080000000000000) /* asuint64 (0x1p9). */ - # define SpecialBound v_u64 (0x2080000000000000) /* BigBound - TinyBound. */ - --static inline float64x2_t VPCS_ATTR -+static float64x2_t VPCS_ATTR NOINLINE - special_case (float64x2_t x, float64x2_t y, uint64x2_t cmp) - { - /* If fenv exceptions are to be triggered correctly, fall back to the scalar -@@ -69,7 +69,7 @@ special_case (float64x2_t x, float64x2_t y, uint64x2_t cmp) - # define SpecialBias1 v_u64 (0x7000000000000000) /* 0x1p769. */ - # define SpecialBias2 v_u64 (0x3010000000000000) /* 0x1p-254. */ - --static float64x2_t VPCS_ATTR NOINLINE -+static inline float64x2_t VPCS_ATTR - special_case (float64x2_t s, float64x2_t y, float64x2_t n) - { - /* 2^(n/N) may overflow, break it up into s1*s2. */ -diff --git a/sysdeps/aarch64/fpu/expm1_advsimd.c b/sysdeps/aarch64/fpu/expm1_advsimd.c -index 0b85bd06f3..3628398674 100644 ---- a/sysdeps/aarch64/fpu/expm1_advsimd.c -+++ b/sysdeps/aarch64/fpu/expm1_advsimd.c -@@ -23,7 +23,7 @@ - static const struct data - { - float64x2_t poly[11]; -- float64x2_t invln2, ln2_lo, ln2_hi, shift; -+ float64x2_t invln2, ln2, shift; - int64x2_t exponent_bias; - #if WANT_SIMD_EXCEPT - uint64x2_t thresh, tiny_bound; -@@ -38,8 +38,7 @@ static const struct data - V2 (0x1.71ddf82db5bb4p-19), V2 (0x1.27e517fc0d54bp-22), - V2 (0x1.af5eedae67435p-26), V2 (0x1.1f143d060a28ap-29) }, - .invln2 = V2 (0x1.71547652b82fep0), -- .ln2_hi = V2 (0x1.62e42fefa39efp-1), -- .ln2_lo = V2 (0x1.abc9e3b39803fp-56), -+ .ln2 = { 0x1.62e42fefa39efp-1, 0x1.abc9e3b39803fp-56 }, - .shift = V2 (0x1.8p52), - .exponent_bias = V2 (0x3ff0000000000000), - #if WANT_SIMD_EXCEPT -@@ -83,7 +82,7 @@ float64x2_t VPCS_ATTR V_NAME_D1 (expm1) (float64x2_t x) - x = v_zerofy_f64 (x, special); - #else - /* Large input, NaNs and Infs. */ -- uint64x2_t special = vceqzq_u64 (vcaltq_f64 (x, d->oflow_bound)); -+ uint64x2_t special = vcageq_f64 (x, d->oflow_bound); - #endif - - /* Reduce argument to smaller range: -@@ -93,8 +92,8 @@ float64x2_t VPCS_ATTR V_NAME_D1 (expm1) (float64x2_t x) - where 2^i is exact because i is an integer. */ - float64x2_t n = vsubq_f64 (vfmaq_f64 (d->shift, d->invln2, x), d->shift); - int64x2_t i = vcvtq_s64_f64 (n); -- float64x2_t f = vfmsq_f64 (x, n, d->ln2_hi); -- f = vfmsq_f64 (f, n, d->ln2_lo); -+ float64x2_t f = vfmsq_laneq_f64 (x, n, d->ln2, 0); -+ f = vfmsq_laneq_f64 (f, n, d->ln2, 1); - - /* Approximate expm1(f) using polynomial. - Taylor expansion for expm1(x) has the form: -diff --git a/sysdeps/aarch64/fpu/expm1f_advsimd.c b/sysdeps/aarch64/fpu/expm1f_advsimd.c -index 8d4c9a2193..93db200f61 100644 ---- a/sysdeps/aarch64/fpu/expm1f_advsimd.c -+++ b/sysdeps/aarch64/fpu/expm1f_advsimd.c -@@ -23,7 +23,8 @@ - static const struct data - { - float32x4_t poly[5]; -- float32x4_t invln2, ln2_lo, ln2_hi, shift; -+ float32x4_t invln2_and_ln2; -+ float32x4_t shift; - int32x4_t exponent_bias; - #if WANT_SIMD_EXCEPT - uint32x4_t thresh; -@@ -34,9 +35,8 @@ static const struct data - /* Generated using fpminimax with degree=5 in [-log(2)/2, log(2)/2]. */ - .poly = { V4 (0x1.fffffep-2), V4 (0x1.5554aep-3), V4 (0x1.555736p-5), - V4 (0x1.12287cp-7), V4 (0x1.6b55a2p-10) }, -- .invln2 = V4 (0x1.715476p+0f), -- .ln2_hi = V4 (0x1.62e4p-1f), -- .ln2_lo = V4 (0x1.7f7d1cp-20f), -+ /* Stores constants: invln2, ln2_hi, ln2_lo, 0. */ -+ .invln2_and_ln2 = { 0x1.715476p+0f, 0x1.62e4p-1f, 0x1.7f7d1cp-20f, 0 }, - .shift = V4 (0x1.8p23f), - .exponent_bias = V4 (0x3f800000), - #if !WANT_SIMD_EXCEPT -@@ -80,7 +80,7 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (expm1) (float32x4_t x) - x = v_zerofy_f32 (x, special); - #else - /* Handles very large values (+ve and -ve), +/-NaN, +/-Inf. */ -- uint32x4_t special = vceqzq_u32 (vcaltq_f32 (x, d->oflow_bound)); -+ uint32x4_t special = vcagtq_f32 (x, d->oflow_bound); - #endif - - /* Reduce argument to smaller range: -@@ -88,10 +88,11 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (expm1) (float32x4_t x) - and f = x - i * ln2, then f is in [-ln2/2, ln2/2]. - exp(x) - 1 = 2^i * (expm1(f) + 1) - 1 - where 2^i is exact because i is an integer. */ -- float32x4_t j = vsubq_f32 (vfmaq_f32 (d->shift, d->invln2, x), d->shift); -+ float32x4_t j = vsubq_f32 ( -+ vfmaq_laneq_f32 (d->shift, x, d->invln2_and_ln2, 0), d->shift); - int32x4_t i = vcvtq_s32_f32 (j); -- float32x4_t f = vfmsq_f32 (x, j, d->ln2_hi); -- f = vfmsq_f32 (f, j, d->ln2_lo); -+ float32x4_t f = vfmsq_laneq_f32 (x, j, d->invln2_and_ln2, 1); -+ f = vfmsq_laneq_f32 (f, j, d->invln2_and_ln2, 2); - - /* Approximate expm1(f) using polynomial. - Taylor expansion for expm1(x) has the form: -diff --git a/sysdeps/aarch64/fpu/log_advsimd.c b/sysdeps/aarch64/fpu/log_advsimd.c -index 067ae79613..21df61728c 100644 ---- a/sysdeps/aarch64/fpu/log_advsimd.c -+++ b/sysdeps/aarch64/fpu/log_advsimd.c -@@ -58,8 +58,13 @@ lookup (uint64x2_t i) - uint64_t i1 = (i[1] >> (52 - V_LOG_TABLE_BITS)) & IndexMask; - float64x2_t e0 = vld1q_f64 (&__v_log_data.table[i0].invc); - float64x2_t e1 = vld1q_f64 (&__v_log_data.table[i1].invc); -+#if __BYTE_ORDER == __LITTLE_ENDIAN - e.invc = vuzp1q_f64 (e0, e1); - e.logc = vuzp2q_f64 (e0, e1); -+#else -+ e.invc = vuzp1q_f64 (e1, e0); -+ e.logc = vuzp2q_f64 (e1, e0); -+#endif - return e; - } - -diff --git a/sysdeps/aarch64/fpu/sin_advsimd.c b/sysdeps/aarch64/fpu/sin_advsimd.c -index efce183e86..a0d9d3b819 100644 ---- a/sysdeps/aarch64/fpu/sin_advsimd.c -+++ b/sysdeps/aarch64/fpu/sin_advsimd.c -@@ -75,8 +75,7 @@ float64x2_t VPCS_ATTR V_NAME_D1 (sin) (float64x2_t x) - r = vbslq_f64 (cmp, vreinterpretq_f64_u64 (cmp), x); - #else - r = x; -- cmp = vcageq_f64 (d->range_val, x); -- cmp = vceqzq_u64 (cmp); /* cmp = ~cmp. */ -+ cmp = vcageq_f64 (x, d->range_val); - #endif - - /* n = rint(|x|/pi). */ -diff --git a/sysdeps/aarch64/fpu/sinf_advsimd.c b/sysdeps/aarch64/fpu/sinf_advsimd.c -index 60cf3f2ca1..375dfc3331 100644 ---- a/sysdeps/aarch64/fpu/sinf_advsimd.c -+++ b/sysdeps/aarch64/fpu/sinf_advsimd.c -@@ -67,8 +67,7 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (sin) (float32x4_t x) - r = vbslq_f32 (cmp, vreinterpretq_f32_u32 (cmp), x); - #else - r = x; -- cmp = vcageq_f32 (d->range_val, x); -- cmp = vceqzq_u32 (cmp); /* cmp = ~cmp. */ -+ cmp = vcageq_f32 (x, d->range_val); - #endif - - /* n = rint(|x|/pi) */ -diff --git a/sysdeps/aarch64/fpu/tan_advsimd.c b/sysdeps/aarch64/fpu/tan_advsimd.c -index d7e5ba7b1a..0459821ab2 100644 ---- a/sysdeps/aarch64/fpu/tan_advsimd.c -+++ b/sysdeps/aarch64/fpu/tan_advsimd.c -@@ -23,7 +23,7 @@ - static const struct data - { - float64x2_t poly[9]; -- float64x2_t half_pi_hi, half_pi_lo, two_over_pi, shift; -+ float64x2_t half_pi, two_over_pi, shift; - #if !WANT_SIMD_EXCEPT - float64x2_t range_val; - #endif -@@ -34,8 +34,7 @@ static const struct data - V2 (0x1.226e5e5ecdfa3p-7), V2 (0x1.d6c7ddbf87047p-9), - V2 (0x1.7ea75d05b583ep-10), V2 (0x1.289f22964a03cp-11), - V2 (0x1.4e4fd14147622p-12) }, -- .half_pi_hi = V2 (0x1.921fb54442d18p0), -- .half_pi_lo = V2 (0x1.1a62633145c07p-54), -+ .half_pi = { 0x1.921fb54442d18p0, 0x1.1a62633145c07p-54 }, - .two_over_pi = V2 (0x1.45f306dc9c883p-1), - .shift = V2 (0x1.8p52), - #if !WANT_SIMD_EXCEPT -@@ -56,15 +55,15 @@ special_case (float64x2_t x) - - /* Vector approximation for double-precision tan. - Maximum measured error is 3.48 ULP: -- __v_tan(0x1.4457047ef78d8p+20) got -0x1.f6ccd8ecf7dedp+37 -- want -0x1.f6ccd8ecf7deap+37. */ -+ _ZGVnN2v_tan(0x1.4457047ef78d8p+20) got -0x1.f6ccd8ecf7dedp+37 -+ want -0x1.f6ccd8ecf7deap+37. */ - float64x2_t VPCS_ATTR V_NAME_D1 (tan) (float64x2_t x) - { - const struct data *dat = ptr_barrier (&data); -- /* Our argument reduction cannot calculate q with sufficient accuracy for very -- large inputs. Fall back to scalar routine for all lanes if any are too -- large, or Inf/NaN. If fenv exceptions are expected, also fall back for tiny -- input to avoid underflow. */ -+ /* Our argument reduction cannot calculate q with sufficient accuracy for -+ very large inputs. Fall back to scalar routine for all lanes if any are -+ too large, or Inf/NaN. If fenv exceptions are expected, also fall back for -+ tiny input to avoid underflow. */ - #if WANT_SIMD_EXCEPT - uint64x2_t iax = vreinterpretq_u64_f64 (vabsq_f64 (x)); - /* iax - tiny_bound > range_val - tiny_bound. */ -@@ -82,8 +81,8 @@ float64x2_t VPCS_ATTR V_NAME_D1 (tan) (float64x2_t x) - /* Use q to reduce x to r in [-pi/4, pi/4], by: - r = x - q * pi/2, in extended precision. */ - float64x2_t r = x; -- r = vfmsq_f64 (r, q, dat->half_pi_hi); -- r = vfmsq_f64 (r, q, dat->half_pi_lo); -+ r = vfmsq_laneq_f64 (r, q, dat->half_pi, 0); -+ r = vfmsq_laneq_f64 (r, q, dat->half_pi, 1); - /* Further reduce r to [-pi/8, pi/8], to be reconstructed using double angle - formula. */ - r = vmulq_n_f64 (r, 0.5); -@@ -106,14 +105,15 @@ float64x2_t VPCS_ATTR V_NAME_D1 (tan) (float64x2_t x) - and reciprocity around pi/2: - tan(x) = 1 / (tan(pi/2 - x)) - to assemble result using change-of-sign and conditional selection of -- numerator/denominator, dependent on odd/even-ness of q (hence quadrant). */ -+ numerator/denominator, dependent on odd/even-ness of q (hence quadrant). -+ */ - float64x2_t n = vfmaq_f64 (v_f64 (-1), p, p); - float64x2_t d = vaddq_f64 (p, p); - - uint64x2_t no_recip = vtstq_u64 (vreinterpretq_u64_s64 (qi), v_u64 (1)); - - #if !WANT_SIMD_EXCEPT -- uint64x2_t special = vceqzq_u64 (vcaleq_f64 (x, dat->range_val)); -+ uint64x2_t special = vcageq_f64 (x, dat->range_val); - if (__glibc_unlikely (v_any_u64 (special))) - return special_case (x); - #endif -diff --git a/sysdeps/aarch64/fpu/tanf_advsimd.c b/sysdeps/aarch64/fpu/tanf_advsimd.c -index 1f16103f8a..5a7489390a 100644 ---- a/sysdeps/aarch64/fpu/tanf_advsimd.c -+++ b/sysdeps/aarch64/fpu/tanf_advsimd.c -@@ -23,7 +23,8 @@ - static const struct data - { - float32x4_t poly[6]; -- float32x4_t neg_half_pi_1, neg_half_pi_2, neg_half_pi_3, two_over_pi, shift; -+ float32x4_t pi_consts; -+ float32x4_t shift; - #if !WANT_SIMD_EXCEPT - float32x4_t range_val; - #endif -@@ -31,10 +32,9 @@ static const struct data - /* Coefficients generated using FPMinimax. */ - .poly = { V4 (0x1.55555p-2f), V4 (0x1.11166p-3f), V4 (0x1.b88a78p-5f), - V4 (0x1.7b5756p-6f), V4 (0x1.4ef4cep-8f), V4 (0x1.0e1e74p-7f) }, -- .neg_half_pi_1 = V4 (-0x1.921fb6p+0f), -- .neg_half_pi_2 = V4 (0x1.777a5cp-25f), -- .neg_half_pi_3 = V4 (0x1.ee59dap-50f), -- .two_over_pi = V4 (0x1.45f306p-1f), -+ /* Stores constants: (-pi/2)_high, (-pi/2)_mid, (-pi/2)_low, and 2/pi. */ -+ .pi_consts -+ = { -0x1.921fb6p+0f, 0x1.777a5cp-25f, 0x1.ee59dap-50f, 0x1.45f306p-1f }, - .shift = V4 (0x1.8p+23f), - #if !WANT_SIMD_EXCEPT - .range_val = V4 (0x1p15f), -@@ -58,10 +58,11 @@ eval_poly (float32x4_t z, const struct data *d) - { - float32x4_t z2 = vmulq_f32 (z, z); - #if WANT_SIMD_EXCEPT -- /* Tiny z (<= 0x1p-31) will underflow when calculating z^4. If fp exceptions -- are to be triggered correctly, sidestep this by fixing such lanes to 0. */ -+ /* Tiny z (<= 0x1p-31) will underflow when calculating z^4. -+ If fp exceptions are to be triggered correctly, -+ sidestep this by fixing such lanes to 0. */ - uint32x4_t will_uflow -- = vcleq_u32 (vreinterpretq_u32_f32 (vabsq_f32 (z)), TinyBound); -+ = vcleq_u32 (vreinterpretq_u32_f32 (vabsq_f32 (z)), TinyBound); - if (__glibc_unlikely (v_any_u32 (will_uflow))) - z2 = vbslq_f32 (will_uflow, v_f32 (0), z2); - #endif -@@ -94,16 +95,16 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (tan) (float32x4_t x) - #endif - - /* n = rint(x/(pi/2)). */ -- float32x4_t q = vfmaq_f32 (d->shift, d->two_over_pi, x); -+ float32x4_t q = vfmaq_laneq_f32 (d->shift, x, d->pi_consts, 3); - float32x4_t n = vsubq_f32 (q, d->shift); - /* Determine if x lives in an interval, where |tan(x)| grows to infinity. */ - uint32x4_t pred_alt = vtstq_u32 (vreinterpretq_u32_f32 (q), v_u32 (1)); - - /* r = x - n * (pi/2) (range reduction into -pi./4 .. pi/4). */ - float32x4_t r; -- r = vfmaq_f32 (x, d->neg_half_pi_1, n); -- r = vfmaq_f32 (r, d->neg_half_pi_2, n); -- r = vfmaq_f32 (r, d->neg_half_pi_3, n); -+ r = vfmaq_laneq_f32 (x, n, d->pi_consts, 0); -+ r = vfmaq_laneq_f32 (r, n, d->pi_consts, 1); -+ r = vfmaq_laneq_f32 (r, n, d->pi_consts, 2); - - /* If x lives in an interval, where |tan(x)| - - is finite, then use a polynomial approximation of the form - -commit 395a89f61e19fa916ae4cc93fc10d81a28ce3039 -Author: Szabolcs Nagy <szabolcs.nagy@arm.com> -Date: Wed Mar 13 14:34:14 2024 +0000 - - aarch64: fix check for SVE support in assembler - - Due to GCC bug 110901 -mcpu can override -march setting when compiling - asm code and thus a compiler targetting a specific cpu can fail the - configure check even when binutils gas supports SVE. - - The workaround is that explicit .arch directive overrides both -mcpu - and -march, and since that's what the actual SVE memcpy uses the - configure check should use that too even if the GCC issue is fixed - independently. - - Reviewed-by: Florian Weimer <fweimer@redhat.com> - (cherry picked from commit 73c26018ed0ecd9c807bb363cc2c2ab4aca66a82) - -diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure -old mode 100644 -new mode 100755 -index ca57edce47..9606137e8d ---- a/sysdeps/aarch64/configure -+++ b/sysdeps/aarch64/configure -@@ -325,9 +325,10 @@ then : - printf %s "(cached) " >&6 - else $as_nop - cat > conftest.s <<\EOF -- ptrue p0.b -+ .arch armv8.2-a+sve -+ ptrue p0.b - EOF --if { ac_try='${CC-cc} -c -march=armv8.2-a+sve conftest.s 1>&5' -+if { ac_try='${CC-cc} -c conftest.s 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? -diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac -index 27874eceb4..56d12d661d 100644 ---- a/sysdeps/aarch64/configure.ac -+++ b/sysdeps/aarch64/configure.ac -@@ -90,9 +90,10 @@ LIBC_CONFIG_VAR([aarch64-variant-pcs], [$libc_cv_aarch64_variant_pcs]) - # Check if asm support armv8.2-a+sve - AC_CACHE_CHECK([for SVE support in assembler], [libc_cv_aarch64_sve_asm], [dnl - cat > conftest.s <<\EOF -- ptrue p0.b -+ .arch armv8.2-a+sve -+ ptrue p0.b - EOF --if AC_TRY_COMMAND(${CC-cc} -c -march=armv8.2-a+sve conftest.s 1>&AS_MESSAGE_LOG_FD); then -+if AC_TRY_COMMAND(${CC-cc} -c conftest.s 1>&AS_MESSAGE_LOG_FD); then - libc_cv_aarch64_sve_asm=yes - else - libc_cv_aarch64_sve_asm=no - -commit 9d92452c70805a2e2dbbdb2b1ffc34bd86e1c8df -Author: Wilco Dijkstra <wilco.dijkstra@arm.com> -Date: Thu Mar 21 16:48:33 2024 +0000 - - AArch64: Check kernel version for SVE ifuncs - - Old Linux kernels disable SVE after every system call. Calling the - SVE-optimized memcpy afterwards will then cause a trap to reenable SVE. - As a result, applications with a high use of syscalls may run slower with - the SVE memcpy. This is true for kernels between 4.15.0 and before 6.2.0, - except for 5.14.0 which was patched. Avoid this by checking the kernel - version and selecting the SVE ifunc on modern kernels. - - Parse the kernel version reported by uname() into a 24-bit kernel.major.minor - value without calling any library functions. If uname() is not supported or - if the version format is not recognized, assume the kernel is modern. - - Tested-by: Florian Weimer <fweimer@redhat.com> - Reviewed-by: Szabolcs Nagy <szabolcs.nagy@arm.com> - (cherry picked from commit 2e94e2f5d2bf2de124c8ad7da85463355e54ccb2) - -diff --git a/sysdeps/aarch64/cpu-features.h b/sysdeps/aarch64/cpu-features.h -index 77a782422a..5f2da91ebb 100644 ---- a/sysdeps/aarch64/cpu-features.h -+++ b/sysdeps/aarch64/cpu-features.h -@@ -71,6 +71,7 @@ struct cpu_features - /* Currently, the GLIBC memory tagging tunable only defines 8 bits. */ - uint8_t mte_state; - bool sve; -+ bool prefer_sve_ifuncs; - bool mops; - }; - -diff --git a/sysdeps/aarch64/multiarch/init-arch.h b/sysdeps/aarch64/multiarch/init-arch.h -index c52860efb2..61dc40088f 100644 ---- a/sysdeps/aarch64/multiarch/init-arch.h -+++ b/sysdeps/aarch64/multiarch/init-arch.h -@@ -36,5 +36,7 @@ - MTE_ENABLED (); \ - bool __attribute__((unused)) sve = \ - GLRO(dl_aarch64_cpu_features).sve; \ -+ bool __attribute__((unused)) prefer_sve_ifuncs = \ -+ GLRO(dl_aarch64_cpu_features).prefer_sve_ifuncs; \ - bool __attribute__((unused)) mops = \ - GLRO(dl_aarch64_cpu_features).mops; -diff --git a/sysdeps/aarch64/multiarch/memcpy.c b/sysdeps/aarch64/multiarch/memcpy.c -index d12eccfca5..ce53567dab 100644 ---- a/sysdeps/aarch64/multiarch/memcpy.c -+++ b/sysdeps/aarch64/multiarch/memcpy.c -@@ -47,7 +47,7 @@ select_memcpy_ifunc (void) - { - if (IS_A64FX (midr)) - return __memcpy_a64fx; -- return __memcpy_sve; -+ return prefer_sve_ifuncs ? __memcpy_sve : __memcpy_generic; - } - - if (IS_THUNDERX (midr)) -diff --git a/sysdeps/aarch64/multiarch/memmove.c b/sysdeps/aarch64/multiarch/memmove.c -index 2081eeb4d4..fe95037be3 100644 ---- a/sysdeps/aarch64/multiarch/memmove.c -+++ b/sysdeps/aarch64/multiarch/memmove.c -@@ -47,7 +47,7 @@ select_memmove_ifunc (void) - { - if (IS_A64FX (midr)) - return __memmove_a64fx; -- return __memmove_sve; -+ return prefer_sve_ifuncs ? __memmove_sve : __memmove_generic; - } - - if (IS_THUNDERX (midr)) -diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c -index b1a3f673f0..c0b047bc0d 100644 ---- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c -+++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c -@@ -21,6 +21,7 @@ - #include <sys/auxv.h> - #include <elf/dl-hwcaps.h> - #include <sys/prctl.h> -+#include <sys/utsname.h> - #include <dl-tunables-parse.h> - - #define DCZID_DZP_MASK (1 << 4) -@@ -62,6 +63,46 @@ get_midr_from_mcpu (const struct tunable_str_t *mcpu) - return UINT64_MAX; - } - -+#if __LINUX_KERNEL_VERSION < 0x060200 -+ -+/* Return true if we prefer using SVE in string ifuncs. Old kernels disable -+ SVE after every system call which results in unnecessary traps if memcpy -+ uses SVE. This is true for kernels between 4.15.0 and before 6.2.0, except -+ for 5.14.0 which was patched. For these versions return false to avoid using -+ SVE ifuncs. -+ Parse the kernel version into a 24-bit kernel.major.minor value without -+ calling any library functions. If uname() is not supported or if the version -+ format is not recognized, assume the kernel is modern and return true. */ -+ -+static inline bool -+prefer_sve_ifuncs (void) -+{ -+ struct utsname buf; -+ const char *p = &buf.release[0]; -+ int kernel = 0; -+ int val; -+ -+ if (__uname (&buf) < 0) -+ return true; -+ -+ for (int shift = 16; shift >= 0; shift -= 8) -+ { -+ for (val = 0; *p >= '0' && *p <= '9'; p++) -+ val = val * 10 + *p - '0'; -+ kernel |= (val & 255) << shift; -+ if (*p++ != '.') -+ break; -+ } -+ -+ if (kernel >= 0x060200 || kernel == 0x050e00) -+ return true; -+ if (kernel >= 0x040f00) -+ return false; -+ return true; -+} -+ -+#endif -+ - static inline void - init_cpu_features (struct cpu_features *cpu_features) - { -@@ -126,6 +167,13 @@ init_cpu_features (struct cpu_features *cpu_features) - /* Check if SVE is supported. */ - cpu_features->sve = GLRO (dl_hwcap) & HWCAP_SVE; - -+ cpu_features->prefer_sve_ifuncs = cpu_features->sve; -+ -+#if __LINUX_KERNEL_VERSION < 0x060200 -+ if (cpu_features->sve) -+ cpu_features->prefer_sve_ifuncs = prefer_sve_ifuncs (); -+#endif -+ - /* Check if MOPS is supported. */ - cpu_features->mops = GLRO (dl_hwcap2) & HWCAP2_MOPS; - } - -commit 9883f4304cfb1558d0f1e6d9f48c4ab0a35355fe -Author: H.J. Lu <hjl.tools@gmail.com> -Date: Wed Feb 28 09:51:14 2024 -0800 - - x86-64: Don't use SSE resolvers for ISA level 3 or above - - When glibc is built with ISA level 3 or above enabled, SSE resolvers - aren't available and glibc fails to build: - - ld: .../elf/librtld.os: in function `init_cpu_features': - .../elf/../sysdeps/x86/cpu-features.c:1200:(.text+0x1445f): undefined reference to `_dl_runtime_resolve_fxsave' - ld: .../elf/librtld.os: relocation R_X86_64_PC32 against undefined hidden symbol `_dl_runtime_resolve_fxsave' can not be used when making a shared object - /usr/local/bin/ld: final link failed: bad value - - For ISA level 3 or above, don't use _dl_runtime_resolve_fxsave nor - _dl_tlsdesc_dynamic_fxsave. - - This fixes BZ #31429. - Reviewed-by: Noah Goldstein <goldstein.w.n@gmail.com> - - (cherry picked from commit befe2d3c4dec8be2cdd01a47132e47bdb7020922) - -diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c -index 6fe1b728c6..b8abe733ab 100644 ---- a/sysdeps/x86/cpu-features.c -+++ b/sysdeps/x86/cpu-features.c -@@ -18,6 +18,7 @@ - - #include <dl-hwcap.h> - #include <libc-pointer-arith.h> -+#include <isa-level.h> - #include <get-isa-level.h> - #include <cacheinfo.h> - #include <dl-cacheinfo.h> -@@ -1198,7 +1199,9 @@ no_cpuid: - TUNABLE_CALLBACK (set_x86_shstk)); - #endif - -+#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL - if (GLRO(dl_x86_cpu_features).xsave_state_size != 0) -+#endif - { - if (CPU_FEATURE_USABLE_P (cpu_features, XSAVEC)) - { -@@ -1219,22 +1222,24 @@ no_cpuid: - #endif - } - } -+#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL - else - { --#ifdef __x86_64__ -+# ifdef __x86_64__ - GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_fxsave; --# ifdef SHARED -+# ifdef SHARED - GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; --# endif --#else --# ifdef SHARED -+# endif -+# else -+# ifdef SHARED - if (CPU_FEATURE_USABLE_P (cpu_features, FXSR)) - GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; - else - GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fnsave; -+# endif - # endif --#endif - } -+#endif - - #ifdef SHARED - # ifdef __x86_64__ -diff --git a/sysdeps/x86_64/dl-tlsdesc.S b/sysdeps/x86_64/dl-tlsdesc.S -index ea69f5223a..057a10862a 100644 ---- a/sysdeps/x86_64/dl-tlsdesc.S -+++ b/sysdeps/x86_64/dl-tlsdesc.S -@@ -20,6 +20,7 @@ - #include <tls.h> - #include <cpu-features-offsets.h> - #include <features-offsets.h> -+#include <isa-level.h> - #include "tlsdesc.h" - #include "dl-trampoline-save.h" - -@@ -79,12 +80,14 @@ _dl_tlsdesc_undefweak: - .size _dl_tlsdesc_undefweak, .-_dl_tlsdesc_undefweak - - #ifdef SHARED --# define USE_FXSAVE --# define STATE_SAVE_ALIGNMENT 16 --# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fxsave --# include "dl-tlsdesc-dynamic.h" --# undef _dl_tlsdesc_dynamic --# undef USE_FXSAVE -+# if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL -+# define USE_FXSAVE -+# define STATE_SAVE_ALIGNMENT 16 -+# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fxsave -+# include "dl-tlsdesc-dynamic.h" -+# undef _dl_tlsdesc_dynamic -+# undef USE_FXSAVE -+# endif - - # define USE_XSAVE - # define STATE_SAVE_ALIGNMENT 64 - -commit 7b92f46f04c6cbce19d19ae1099628431858996c -Author: Sunil K Pandey <skpgkp2@gmail.com> -Date: Thu Feb 29 17:57:02 2024 -0800 - - x86-64: Simplify minimum ISA check ifdef conditional with if - - Replace minimum ISA check ifdef conditional with if. Since - MINIMUM_X86_ISA_LEVEL and AVX_X86_ISA_LEVEL are compile time constants, - compiler will perform constant folding optimization, getting same - results. - - Reviewed-by: H.J. Lu <hjl.tools@gmail.com> - (cherry picked from commit b6e3898194bbae78910bbe9cd086937014961e45) - -diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c -index b8abe733ab..3d7c2819d7 100644 ---- a/sysdeps/x86/cpu-features.c -+++ b/sysdeps/x86/cpu-features.c -@@ -1199,9 +1199,8 @@ no_cpuid: - TUNABLE_CALLBACK (set_x86_shstk)); - #endif - --#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL -- if (GLRO(dl_x86_cpu_features).xsave_state_size != 0) --#endif -+ if (MINIMUM_X86_ISA_LEVEL >= AVX_X86_ISA_LEVEL -+ || (GLRO(dl_x86_cpu_features).xsave_state_size != 0)) - { - if (CPU_FEATURE_USABLE_P (cpu_features, XSAVEC)) - { -@@ -1222,24 +1221,22 @@ no_cpuid: - #endif - } - } --#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL - else - { --# ifdef __x86_64__ -+#ifdef __x86_64__ - GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_fxsave; --# ifdef SHARED -+# ifdef SHARED - GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; --# endif --# else --# ifdef SHARED -+# endif -+#else -+# ifdef SHARED - if (CPU_FEATURE_USABLE_P (cpu_features, FXSR)) - GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; - else - GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fnsave; --# endif - # endif -- } - #endif -+ } - - #ifdef SHARED - # ifdef __x86_64__ - -commit edb9a76e3008725e9dc035d38a58e849a3bde0f1 -Author: Florian Weimer <fweimer@redhat.com> -Date: Sun Apr 14 08:24:51 2024 +0200 - - powerpc: Fix ld.so address determination for PCREL mode (bug 31640) - - This seems to have stopped working with some GCC 14 versions, - which clobber r2. With other compilers, the kernel-provided - r2 value is still available at this point. - - Reviewed-by: Peter Bergner <bergner@linux.ibm.com> - (cherry picked from commit 14e56bd4ce15ac2d1cc43f762eb2e6b83fec1afe) - -diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64/dl-machine.h -index c6682f3445..2b6f5d2b08 100644 ---- a/sysdeps/powerpc/powerpc64/dl-machine.h -+++ b/sysdeps/powerpc/powerpc64/dl-machine.h -@@ -78,6 +78,7 @@ elf_host_tolerates_class (const Elf64_Ehdr *ehdr) - static inline Elf64_Addr - elf_machine_load_address (void) __attribute__ ((const)); - -+#ifndef __PCREL__ - static inline Elf64_Addr - elf_machine_load_address (void) - { -@@ -105,6 +106,24 @@ elf_machine_dynamic (void) - /* Then subtract off the load address offset. */ - return runtime_dynamic - elf_machine_load_address() ; - } -+#else /* __PCREL__ */ -+/* In PCREL mode, r2 may have been clobbered. Rely on relative -+ relocations instead. */ -+ -+static inline ElfW(Addr) -+elf_machine_load_address (void) -+{ -+ extern const ElfW(Ehdr) __ehdr_start attribute_hidden; -+ return (ElfW(Addr)) &__ehdr_start; -+} -+ -+static inline ElfW(Addr) -+elf_machine_dynamic (void) -+{ -+ extern ElfW(Dyn) _DYNAMIC[] attribute_hidden; -+ return (ElfW(Addr)) _DYNAMIC - elf_machine_load_address (); -+} -+#endif /* __PCREL__ */ - - /* The PLT uses Elf64_Rela relocs. */ - #define elf_machine_relplt elf_machine_rela - -commit 04df8652eb1919da18d54b3dcd6db1675993d45d -Author: H.J. Lu <hjl.tools@gmail.com> -Date: Thu Feb 15 11:19:56 2024 -0800 - - Apply the Makefile sorting fix - - Apply the Makefile sorting fix generated by sort-makefile-lines.py. - - (cherry picked from commit ef7f4b1fef67430a8f3cfc77fa6aada2add851d7) - -diff --git a/sysdeps/loongarch/lp64/multiarch/Makefile b/sysdeps/loongarch/lp64/multiarch/Makefile -index fe863e1ba4..01762ef526 100644 ---- a/sysdeps/loongarch/lp64/multiarch/Makefile -+++ b/sysdeps/loongarch/lp64/multiarch/Makefile -@@ -1,52 +1,52 @@ - ifeq ($(subdir),string) - sysdep_routines += \ -- strlen-aligned \ -- strlen-lsx \ -- strlen-lasx \ -- strnlen-aligned \ -- strnlen-lsx \ -- strnlen-lasx \ -+ memchr-aligned \ -+ memchr-lasx \ -+ memchr-lsx \ -+ memcmp-aligned \ -+ memcmp-lasx \ -+ memcmp-lsx \ -+ memcpy-aligned \ -+ memcpy-unaligned \ -+ memmove-lasx \ -+ memmove-lsx \ -+ memmove-unaligned \ -+ memrchr-generic \ -+ memrchr-lasx \ -+ memrchr-lsx \ -+ memset-aligned \ -+ memset-lasx \ -+ memset-lsx \ -+ memset-unaligned \ -+ rawmemchr-aligned \ -+ rawmemchr-lasx \ -+ rawmemchr-lsx \ -+ stpcpy-aligned \ -+ stpcpy-lasx \ -+ stpcpy-lsx \ -+ stpcpy-unaligned \ - strchr-aligned \ -- strchr-lsx \ - strchr-lasx \ -- strrchr-aligned \ -- strrchr-lsx \ -- strrchr-lasx \ -+ strchr-lsx \ - strchrnul-aligned \ -- strchrnul-lsx \ - strchrnul-lasx \ -+ strchrnul-lsx \ - strcmp-aligned \ - strcmp-lsx \ -- strncmp-aligned \ -- strncmp-lsx \ - strcpy-aligned \ -- strcpy-unaligned \ -- strcpy-lsx \ - strcpy-lasx \ -- stpcpy-aligned \ -- stpcpy-unaligned \ -- stpcpy-lsx \ -- stpcpy-lasx \ -- memcpy-aligned \ -- memcpy-unaligned \ -- memmove-unaligned \ -- memmove-lsx \ -- memmove-lasx \ -- rawmemchr-aligned \ -- rawmemchr-lsx \ -- rawmemchr-lasx \ -- memchr-aligned \ -- memchr-lsx \ -- memchr-lasx \ -- memrchr-generic \ -- memrchr-lsx \ -- memrchr-lasx \ -- memset-aligned \ -- memset-unaligned \ -- memset-lsx \ -- memset-lasx \ -- memcmp-aligned \ -- memcmp-lsx \ -- memcmp-lasx \ -+ strcpy-lsx \ -+ strcpy-unaligned \ -+ strlen-aligned \ -+ strlen-lasx \ -+ strlen-lsx \ -+ strncmp-aligned \ -+ strncmp-lsx \ -+ strnlen-aligned \ -+ strnlen-lasx \ -+ strnlen-lsx \ -+ strrchr-aligned \ -+ strrchr-lasx \ -+ strrchr-lsx \ - # sysdep_routines - endif -diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile -index 992aabe43e..5311b594af 100644 ---- a/sysdeps/x86/Makefile -+++ b/sysdeps/x86/Makefile -@@ -15,18 +15,18 @@ CFLAGS-dl-get-cpu-features.os += $(rtld-early-cflags) - CFLAGS-get-cpuid-feature-leaf.o += $(no-stack-protector) - - tests += \ -- tst-get-cpu-features \ -- tst-get-cpu-features-static \ - tst-cpu-features-cpuinfo \ - tst-cpu-features-cpuinfo-static \ - tst-cpu-features-supports \ - tst-cpu-features-supports-static \ -+ tst-get-cpu-features \ -+ tst-get-cpu-features-static \ - tst-hwcap-tunables \ - # tests - tests-static += \ -- tst-get-cpu-features-static \ - tst-cpu-features-cpuinfo-static \ - tst-cpu-features-supports-static \ -+ tst-get-cpu-features-static \ - # tests-static - ifeq (yes,$(have-ifunc)) - ifeq (yes,$(have-gcc-ifunc)) -diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile -index 9d374a3299..0ede447405 100644 ---- a/sysdeps/x86_64/Makefile -+++ b/sysdeps/x86_64/Makefile -@@ -252,6 +252,10 @@ sysdep-dl-routines += dl-cet - - tests += \ - tst-cet-legacy-1 \ -+ tst-cet-legacy-10 \ -+ tst-cet-legacy-10-static \ -+ tst-cet-legacy-10a \ -+ tst-cet-legacy-10a-static \ - tst-cet-legacy-1a \ - tst-cet-legacy-2 \ - tst-cet-legacy-2a \ -@@ -263,15 +267,11 @@ tests += \ - tst-cet-legacy-8 \ - tst-cet-legacy-9 \ - tst-cet-legacy-9-static \ -- tst-cet-legacy-10 \ -- tst-cet-legacy-10-static \ -- tst-cet-legacy-10a \ -- tst-cet-legacy-10a-static \ - # tests - tests-static += \ -- tst-cet-legacy-9-static \ - tst-cet-legacy-10-static \ - tst-cet-legacy-10a-static \ -+ tst-cet-legacy-9-static \ - # tests-static - tst-cet-legacy-1a-ARGS = -- $(host-test-program-cmd) - -diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile -index ea81753b70..e1a490dd98 100644 ---- a/sysdeps/x86_64/fpu/multiarch/Makefile -+++ b/sysdeps/x86_64/fpu/multiarch/Makefile -@@ -4,10 +4,10 @@ libm-sysdep_routines += \ - s_ceilf-c \ - s_floor-c \ - s_floorf-c \ -- s_rint-c \ -- s_rintf-c \ - s_nearbyint-c \ - s_nearbyintf-c \ -+ s_rint-c \ -+ s_rintf-c \ - s_roundeven-c \ - s_roundevenf-c \ - s_trunc-c \ -@@ -21,10 +21,10 @@ libm-sysdep_routines += \ - s_floorf-sse4_1 \ - s_nearbyint-sse4_1 \ - s_nearbyintf-sse4_1 \ -- s_roundeven-sse4_1 \ -- s_roundevenf-sse4_1 \ - s_rint-sse4_1 \ - s_rintf-sse4_1 \ -+ s_roundeven-sse4_1 \ -+ s_roundevenf-sse4_1 \ - s_trunc-sse4_1 \ - s_truncf-sse4_1 \ - # libm-sysdep_routines -@@ -84,12 +84,12 @@ CFLAGS-s_cosf-fma.c = -mfma -mavx2 - CFLAGS-s_sincosf-fma.c = -mfma -mavx2 - - libm-sysdep_routines += \ -+ e_asin-fma4 \ -+ e_atan2-fma4 \ - e_exp-fma4 \ - e_log-fma4 \ - e_pow-fma4 \ -- e_asin-fma4 \ - s_atan-fma4 \ -- e_atan2-fma4 \ - s_sin-fma4 \ - s_sincos-fma4 \ - s_tan-fma4 \ -@@ -106,10 +106,10 @@ CFLAGS-s_tan-fma4.c = -mfma4 - CFLAGS-s_sincos-fma4.c = -mfma4 - - libm-sysdep_routines += \ -+ e_atan2-avx \ - e_exp-avx \ - e_log-avx \ - s_atan-avx \ -- e_atan2-avx \ - s_sin-avx \ - s_sincos-avx \ - s_tan-avx \ -diff --git a/sysdeps/x86_64/multiarch/Makefile b/sysdeps/x86_64/multiarch/Makefile -index e1e894c963..d3d2270394 100644 ---- a/sysdeps/x86_64/multiarch/Makefile -+++ b/sysdeps/x86_64/multiarch/Makefile -@@ -4,8 +4,8 @@ sysdep_routines += \ - memchr-avx2 \ - memchr-avx2-rtm \ - memchr-evex \ -- memchr-evex512 \ - memchr-evex-rtm \ -+ memchr-evex512 \ - memchr-sse2 \ - memcmp-avx2-movbe \ - memcmp-avx2-movbe-rtm \ -@@ -37,8 +37,8 @@ sysdep_routines += \ - rawmemchr-avx2 \ - rawmemchr-avx2-rtm \ - rawmemchr-evex \ -- rawmemchr-evex512 \ - rawmemchr-evex-rtm \ -+ rawmemchr-evex512 \ - rawmemchr-sse2 \ - stpcpy-avx2 \ - stpcpy-avx2-rtm \ - -commit 423099a03264ea28298f47355d7811b8efe03c97 -Author: Sunil K Pandey <skpgkp2@gmail.com> -Date: Tue Feb 13 12:23:14 2024 -0800 - - x86_64: Exclude SSE, AVX and FMA4 variants in libm multiarch - - When glibc is built with ISA level 3 or higher by default, the resulting - glibc binaries won't run on SSE or FMA4 processors. Exclude SSE, AVX and - FMA4 variants in libm multiarch when ISA level 3 or higher is enabled by - default. - - When glibc is built with ISA level 2 enabled by default, only keep SSE4.1 - variant. - - Fixes BZ 31335. - - NB: elf/tst-valgrind-smoke test fails with ISA level 4, because valgrind - doesn't support AVX512 instructions: - - https://bugs.kde.org/show_bug.cgi?id=383010 - - Reviewed-by: H.J. Lu <hjl.tools@gmail.com> - (cherry picked from commit 9f78a7c1d0963282608da836b840f0d5ae1c478e) - -diff --git a/sysdeps/x86/configure b/sysdeps/x86/configure -index 1f4c2d67fd..2a5421bb31 100644 ---- a/sysdeps/x86/configure -+++ b/sysdeps/x86/configure -@@ -98,6 +98,7 @@ printf "%s\n" "$libc_cv_have_x86_lahf_sahf" >&6; } - if test $libc_cv_have_x86_lahf_sahf = yes; then - printf "%s\n" "#define HAVE_X86_LAHF_SAHF 1" >>confdefs.h - -+ ISAFLAG="-DHAVE_X86_LAHF_SAHF" - fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MOVBE instruction support" >&5 - printf %s "checking for MOVBE instruction support... " >&6; } -@@ -120,9 +121,41 @@ printf "%s\n" "$libc_cv_have_x86_movbe" >&6; } - if test $libc_cv_have_x86_movbe = yes; then - printf "%s\n" "#define HAVE_X86_MOVBE 1" >>confdefs.h - -+ ISAFLAG="$ISAFLAG -DHAVE_X86_MOVBE" - fi -+ -+ # Check for ISA level support. -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ISA level support" >&5 -+printf %s "checking for ISA level support... " >&6; } -+if test ${libc_cv_have_x86_isa_level+y} -+then : -+ printf %s "(cached) " >&6 -+else $as_nop -+ cat > conftest.c <<EOF -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL >= 4 -+libc_cv_have_x86_isa_level=4 -+#elif MINIMUM_X86_ISA_LEVEL == 3 -+libc_cv_have_x86_isa_level=3 -+#elif MINIMUM_X86_ISA_LEVEL == 2 -+libc_cv_have_x86_isa_level=2 -+#else -+libc_cv_have_x86_isa_level=baseline -+#endif -+EOF -+ eval `${CC-cc} $CFLAGS $CPPFLAGS $ISAFLAG -I$srcdir -E conftest.c | grep libc_cv_have_x86_isa_level` -+ rm -rf conftest* -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_have_x86_isa_level" >&5 -+printf "%s\n" "$libc_cv_have_x86_isa_level" >&6; } -+else -+ libc_cv_have_x86_isa_level=baseline - fi - config_vars="$config_vars -+have-x86-isa-level = $libc_cv_have_x86_isa_level" -+config_vars="$config_vars -+x86-isa-level-3-or-above = 3 4" -+config_vars="$config_vars - enable-x86-isa-level = $libc_cv_include_x86_isa_level" - - printf "%s\n" "#define SUPPORT_STATIC_PIE 1" >>confdefs.h -diff --git a/sysdeps/x86/configure.ac b/sysdeps/x86/configure.ac -index 437a50623b..78ff7c8f41 100644 ---- a/sysdeps/x86/configure.ac -+++ b/sysdeps/x86/configure.ac -@@ -72,6 +72,7 @@ if test $libc_cv_include_x86_isa_level = yes; then - fi]) - if test $libc_cv_have_x86_lahf_sahf = yes; then - AC_DEFINE(HAVE_X86_LAHF_SAHF) -+ ISAFLAG="-DHAVE_X86_LAHF_SAHF" - fi - AC_CACHE_CHECK([for MOVBE instruction support], - libc_cv_have_x86_movbe, [dnl -@@ -81,8 +82,31 @@ if test $libc_cv_include_x86_isa_level = yes; then - fi]) - if test $libc_cv_have_x86_movbe = yes; then - AC_DEFINE(HAVE_X86_MOVBE) -+ ISAFLAG="$ISAFLAG -DHAVE_X86_MOVBE" - fi -+ -+ # Check for ISA level support. -+ AC_CACHE_CHECK([for ISA level support], -+ libc_cv_have_x86_isa_level, [dnl -+cat > conftest.c <<EOF -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL >= 4 -+libc_cv_have_x86_isa_level=4 -+#elif MINIMUM_X86_ISA_LEVEL == 3 -+libc_cv_have_x86_isa_level=3 -+#elif MINIMUM_X86_ISA_LEVEL == 2 -+libc_cv_have_x86_isa_level=2 -+#else -+libc_cv_have_x86_isa_level=baseline -+#endif -+EOF -+ eval `${CC-cc} $CFLAGS $CPPFLAGS $ISAFLAG -I$srcdir -E conftest.c | grep libc_cv_have_x86_isa_level` -+ rm -rf conftest*]) -+else -+ libc_cv_have_x86_isa_level=baseline - fi -+LIBC_CONFIG_VAR([have-x86-isa-level], [$libc_cv_have_x86_isa_level]) -+LIBC_CONFIG_VAR([x86-isa-level-3-or-above], [3 4]) - LIBC_CONFIG_VAR([enable-x86-isa-level], [$libc_cv_include_x86_isa_level]) - - dnl Static PIE is supported. -diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile -index e1a490dd98..6ddd50240c 100644 ---- a/sysdeps/x86_64/fpu/multiarch/Makefile -+++ b/sysdeps/x86_64/fpu/multiarch/Makefile -@@ -1,49 +1,4 @@ - ifeq ($(subdir),math) --libm-sysdep_routines += \ -- s_ceil-c \ -- s_ceilf-c \ -- s_floor-c \ -- s_floorf-c \ -- s_nearbyint-c \ -- s_nearbyintf-c \ -- s_rint-c \ -- s_rintf-c \ -- s_roundeven-c \ -- s_roundevenf-c \ -- s_trunc-c \ -- s_truncf-c \ --# libm-sysdep_routines -- --libm-sysdep_routines += \ -- s_ceil-sse4_1 \ -- s_ceilf-sse4_1 \ -- s_floor-sse4_1 \ -- s_floorf-sse4_1 \ -- s_nearbyint-sse4_1 \ -- s_nearbyintf-sse4_1 \ -- s_rint-sse4_1 \ -- s_rintf-sse4_1 \ -- s_roundeven-sse4_1 \ -- s_roundevenf-sse4_1 \ -- s_trunc-sse4_1 \ -- s_truncf-sse4_1 \ --# libm-sysdep_routines -- --libm-sysdep_routines += \ -- e_asin-fma \ -- e_atan2-fma \ -- e_exp-fma \ -- e_log-fma \ -- e_log2-fma \ -- e_pow-fma \ -- s_atan-fma \ -- s_expm1-fma \ -- s_log1p-fma \ -- s_sin-fma \ -- s_sincos-fma \ -- s_tan-fma \ --# libm-sysdep_routines -- - CFLAGS-e_asin-fma.c = -mfma -mavx2 - CFLAGS-e_atan2-fma.c = -mfma -mavx2 - CFLAGS-e_exp-fma.c = -mfma -mavx2 -@@ -57,23 +12,6 @@ CFLAGS-s_sin-fma.c = -mfma -mavx2 - CFLAGS-s_tan-fma.c = -mfma -mavx2 - CFLAGS-s_sincos-fma.c = -mfma -mavx2 - --libm-sysdep_routines += \ -- s_cosf-sse2 \ -- s_sincosf-sse2 \ -- s_sinf-sse2 \ --# libm-sysdep_routines -- --libm-sysdep_routines += \ -- e_exp2f-fma \ -- e_expf-fma \ -- e_log2f-fma \ -- e_logf-fma \ -- e_powf-fma \ -- s_cosf-fma \ -- s_sincosf-fma \ -- s_sinf-fma \ --# libm-sysdep_routines -- - CFLAGS-e_exp2f-fma.c = -mfma -mavx2 - CFLAGS-e_expf-fma.c = -mfma -mavx2 - CFLAGS-e_log2f-fma.c = -mfma -mavx2 -@@ -83,17 +21,93 @@ CFLAGS-s_sinf-fma.c = -mfma -mavx2 - CFLAGS-s_cosf-fma.c = -mfma -mavx2 - CFLAGS-s_sincosf-fma.c = -mfma -mavx2 - -+# Check if ISA level is 3 or above. -+ifneq (,$(filter $(have-x86-isa-level),$(x86-isa-level-3-or-above))) - libm-sysdep_routines += \ -+ s_ceil-avx \ -+ s_ceilf-avx \ -+ s_floor-avx \ -+ s_floorf-avx \ -+ s_nearbyint-avx \ -+ s_nearbyintf-avx \ -+ s_rint-avx \ -+ s_rintf-avx \ -+ s_roundeven-avx \ -+ s_roundevenf-avx \ -+ s_trunc-avx \ -+ s_truncf-avx \ -+# libm-sysdep_routines -+else -+libm-sysdep_routines += \ -+ e_asin-fma \ - e_asin-fma4 \ -+ e_atan2-avx \ -+ e_atan2-fma \ - e_atan2-fma4 \ -+ e_exp-avx \ -+ e_exp-fma \ - e_exp-fma4 \ -+ e_exp2f-fma \ -+ e_expf-fma \ -+ e_log-avx \ -+ e_log-fma \ - e_log-fma4 \ -+ e_log2-fma \ -+ e_log2f-fma \ -+ e_logf-fma \ -+ e_pow-fma \ - e_pow-fma4 \ -+ e_powf-fma \ -+ s_atan-avx \ -+ s_atan-fma \ - s_atan-fma4 \ -+ s_ceil-sse4_1 \ -+ s_ceilf-sse4_1 \ -+ s_cosf-fma \ -+ s_cosf-sse2 \ -+ s_expm1-fma \ -+ s_floor-sse4_1 \ -+ s_floorf-sse4_1 \ -+ s_log1p-fma \ -+ s_nearbyint-sse4_1 \ -+ s_nearbyintf-sse4_1 \ -+ s_rint-sse4_1 \ -+ s_rintf-sse4_1 \ -+ s_roundeven-sse4_1 \ -+ s_roundevenf-sse4_1 \ -+ s_sin-avx \ -+ s_sin-fma \ - s_sin-fma4 \ -+ s_sincos-avx \ -+ s_sincos-fma \ - s_sincos-fma4 \ -+ s_sincosf-fma \ -+ s_sincosf-sse2 \ -+ s_sinf-fma \ -+ s_sinf-sse2 \ -+ s_tan-avx \ -+ s_tan-fma \ - s_tan-fma4 \ -+ s_trunc-sse4_1 \ -+ s_truncf-sse4_1 \ - # libm-sysdep_routines -+ifeq ($(have-x86-isa-level),baseline) -+libm-sysdep_routines += \ -+ s_ceil-c \ -+ s_ceilf-c \ -+ s_floor-c \ -+ s_floorf-c \ -+ s_nearbyint-c \ -+ s_nearbyintf-c \ -+ s_rint-c \ -+ s_rintf-c \ -+ s_roundeven-c \ -+ s_roundevenf-c \ -+ s_trunc-c \ -+ s_truncf-c \ -+# libm-sysdep_routines -+endif -+endif - - CFLAGS-e_asin-fma4.c = -mfma4 - CFLAGS-e_atan2-fma4.c = -mfma4 -@@ -105,16 +119,6 @@ CFLAGS-s_sin-fma4.c = -mfma4 - CFLAGS-s_tan-fma4.c = -mfma4 - CFLAGS-s_sincos-fma4.c = -mfma4 - --libm-sysdep_routines += \ -- e_atan2-avx \ -- e_exp-avx \ -- e_log-avx \ -- s_atan-avx \ -- s_sin-avx \ -- s_sincos-avx \ -- s_tan-avx \ --# libm-sysdep_routines -- - CFLAGS-e_atan2-avx.c = -msse2avx -DSSE2AVX - CFLAGS-e_exp-avx.c = -msse2avx -DSSE2AVX - CFLAGS-e_log-avx.c = -msse2avx -DSSE2AVX -diff --git a/sysdeps/x86_64/fpu/multiarch/e_asin.c b/sysdeps/x86_64/fpu/multiarch/e_asin.c -index 2eaa6c2c04..d64fca2586 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_asin.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_asin.c -@@ -16,26 +16,29 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-finite.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include <libm-alias-finite.h> - - extern double __redirect_ieee754_asin (double); - extern double __redirect_ieee754_acos (double); - --#define SYMBOL_NAME ieee754_asin --#include "ifunc-fma4.h" -+# define SYMBOL_NAME ieee754_asin -+# include "ifunc-fma4.h" - - libc_ifunc_redirected (__redirect_ieee754_asin, __ieee754_asin, - IFUNC_SELECTOR ()); - libm_alias_finite (__ieee754_asin, __asin) - --#undef SYMBOL_NAME --#define SYMBOL_NAME ieee754_acos --#include "ifunc-fma4.h" -+# undef SYMBOL_NAME -+# define SYMBOL_NAME ieee754_acos -+# include "ifunc-fma4.h" - - libc_ifunc_redirected (__redirect_ieee754_acos, __ieee754_acos, - IFUNC_SELECTOR ()); - libm_alias_finite (__ieee754_acos, __acos) - --#define __ieee754_acos __ieee754_acos_sse2 --#define __ieee754_asin __ieee754_asin_sse2 -+# define __ieee754_acos __ieee754_acos_sse2 -+# define __ieee754_asin __ieee754_asin_sse2 -+#endif - #include <sysdeps/ieee754/dbl-64/e_asin.c> -diff --git a/sysdeps/x86_64/fpu/multiarch/e_atan2.c b/sysdeps/x86_64/fpu/multiarch/e_atan2.c -index 17ee4f3c36..8a86c14ded 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_atan2.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_atan2.c -@@ -16,16 +16,19 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-finite.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include <libm-alias-finite.h> - - extern double __redirect_ieee754_atan2 (double, double); - --#define SYMBOL_NAME ieee754_atan2 --#include "ifunc-avx-fma4.h" -+# define SYMBOL_NAME ieee754_atan2 -+# include "ifunc-avx-fma4.h" - - libc_ifunc_redirected (__redirect_ieee754_atan2, - __ieee754_atan2, IFUNC_SELECTOR ()); - libm_alias_finite (__ieee754_atan2, __atan2) - --#define __ieee754_atan2 __ieee754_atan2_sse2 -+# define __ieee754_atan2 __ieee754_atan2_sse2 -+#endif - #include <sysdeps/ieee754/dbl-64/e_atan2.c> -diff --git a/sysdeps/x86_64/fpu/multiarch/e_exp.c b/sysdeps/x86_64/fpu/multiarch/e_exp.c -index 406b7ebd44..d56329291a 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_exp.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_exp.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <math.h> --#include <libm-alias-finite.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include <math.h> -+# include <libm-alias-finite.h> - - extern double __redirect_ieee754_exp (double); - --#define SYMBOL_NAME ieee754_exp --#include "ifunc-avx-fma4.h" -+# define SYMBOL_NAME ieee754_exp -+# include "ifunc-avx-fma4.h" - - libc_ifunc_redirected (__redirect_ieee754_exp, __ieee754_exp, - IFUNC_SELECTOR ()); - libm_alias_finite (__ieee754_exp, __exp) - --#define __exp __ieee754_exp_sse2 -+# define __exp __ieee754_exp_sse2 -+#endif - #include <sysdeps/ieee754/dbl-64/e_exp.c> -diff --git a/sysdeps/x86_64/fpu/multiarch/e_exp2f.c b/sysdeps/x86_64/fpu/multiarch/e_exp2f.c -index 804fd6be85..06fe5028d6 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_exp2f.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_exp2f.c -@@ -16,25 +16,28 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-float.h> --#include <libm-alias-finite.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include <libm-alias-float.h> -+# include <libm-alias-finite.h> - - extern float __redirect_exp2f (float); - --#define SYMBOL_NAME exp2f --#include "ifunc-fma.h" -+# define SYMBOL_NAME exp2f -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_exp2f, __exp2f, IFUNC_SELECTOR ()); - --#ifdef SHARED -+# ifdef SHARED - versioned_symbol (libm, __ieee754_exp2f, exp2f, GLIBC_2_27); - libm_alias_float_other (__exp2, exp2) --#else -+# else - libm_alias_float (__exp2, exp2) --#endif -+# endif - - strong_alias (__exp2f, __ieee754_exp2f) - libm_alias_finite (__exp2f, __exp2f) - --#define __exp2f __exp2f_sse2 -+# define __exp2f __exp2f_sse2 -+#endif - #include <sysdeps/ieee754/flt-32/e_exp2f.c> -diff --git a/sysdeps/x86_64/fpu/multiarch/e_expf.c b/sysdeps/x86_64/fpu/multiarch/e_expf.c -index 4a7e2a5bce..19d767f636 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_expf.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_expf.c -@@ -16,28 +16,31 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-float.h> --#include <libm-alias-finite.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include <libm-alias-float.h> -+# include <libm-alias-finite.h> - - extern float __redirect_expf (float); - --#define SYMBOL_NAME expf --#include "ifunc-fma.h" -+# define SYMBOL_NAME expf -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_expf, __expf, IFUNC_SELECTOR ()); - --#ifdef SHARED -+# ifdef SHARED - __hidden_ver1 (__expf, __GI___expf, __redirect_expf) - __attribute__ ((visibility ("hidden"))); - - versioned_symbol (libm, __ieee754_expf, expf, GLIBC_2_27); - libm_alias_float_other (__exp, exp) --#else -+# else - libm_alias_float (__exp, exp) --#endif -+# endif - - strong_alias (__expf, __ieee754_expf) - libm_alias_finite (__expf, __expf) - --#define __expf __expf_sse2 -+# define __expf __expf_sse2 -+#endif - #include <sysdeps/ieee754/flt-32/e_expf.c> -diff --git a/sysdeps/x86_64/fpu/multiarch/e_log.c b/sysdeps/x86_64/fpu/multiarch/e_log.c -index 067fbf58c3..d80c1b1463 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_log.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_log.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <math.h> --#include <libm-alias-finite.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include <math.h> -+# include <libm-alias-finite.h> - - extern double __redirect_ieee754_log (double); - --#define SYMBOL_NAME ieee754_log --#include "ifunc-avx-fma4.h" -+# define SYMBOL_NAME ieee754_log -+# include "ifunc-avx-fma4.h" - - libc_ifunc_redirected (__redirect_ieee754_log, __ieee754_log, - IFUNC_SELECTOR ()); - libm_alias_finite (__ieee754_log, __log) - --#define __log __ieee754_log_sse2 -+# define __log __ieee754_log_sse2 -+#endif - #include <sysdeps/ieee754/dbl-64/e_log.c> -diff --git a/sysdeps/x86_64/fpu/multiarch/e_log2.c b/sysdeps/x86_64/fpu/multiarch/e_log2.c -index 9c57a2f6cc..9686782c09 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_log2.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_log2.c -@@ -16,28 +16,31 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-double.h> --#include <libm-alias-finite.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include <libm-alias-double.h> -+# include <libm-alias-finite.h> - - extern double __redirect_log2 (double); - --#define SYMBOL_NAME log2 --#include "ifunc-fma.h" -+# define SYMBOL_NAME log2 -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_log2, __log2, IFUNC_SELECTOR ()); - --#ifdef SHARED -+# ifdef SHARED - __hidden_ver1 (__log2, __GI___log2, __redirect_log2) - __attribute__ ((visibility ("hidden"))); - - versioned_symbol (libm, __ieee754_log2, log2, GLIBC_2_29); - libm_alias_double_other (__log2, log2) --#else -+# else - libm_alias_double (__log2, log2) --#endif -+# endif - - strong_alias (__log2, __ieee754_log2) - libm_alias_finite (__log2, __log2) - --#define __log2 __log2_sse2 -+# define __log2 __log2_sse2 -+#endif - #include <sysdeps/ieee754/dbl-64/e_log2.c> -diff --git a/sysdeps/x86_64/fpu/multiarch/e_log2f.c b/sysdeps/x86_64/fpu/multiarch/e_log2f.c -index 2b45c87f38..8ada46e11e 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_log2f.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_log2f.c -@@ -16,28 +16,31 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-float.h> --#include <libm-alias-finite.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include <libm-alias-float.h> -+# include <libm-alias-finite.h> - - extern float __redirect_log2f (float); - --#define SYMBOL_NAME log2f --#include "ifunc-fma.h" -+# define SYMBOL_NAME log2f -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_log2f, __log2f, IFUNC_SELECTOR ()); - --#ifdef SHARED -+# ifdef SHARED - __hidden_ver1 (__log2f, __GI___log2f, __redirect_log2f) - __attribute__ ((visibility ("hidden"))); - - versioned_symbol (libm, __ieee754_log2f, log2f, GLIBC_2_27); - libm_alias_float_other (__log2, log2) --#else -+# else - libm_alias_float (__log2, log2) --#endif -+# endif - - strong_alias (__log2f, __ieee754_log2f) - libm_alias_finite (__log2f, __log2f) - --#define __log2f __log2f_sse2 -+# define __log2f __log2f_sse2 -+#endif - #include <sysdeps/ieee754/flt-32/e_log2f.c> -diff --git a/sysdeps/x86_64/fpu/multiarch/e_logf.c b/sysdeps/x86_64/fpu/multiarch/e_logf.c -index 97e23c8fea..a3978d9a8e 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_logf.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_logf.c -@@ -16,28 +16,31 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-float.h> --#include <libm-alias-finite.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include <libm-alias-float.h> -+# include <libm-alias-finite.h> - - extern float __redirect_logf (float); - --#define SYMBOL_NAME logf --#include "ifunc-fma.h" -+# define SYMBOL_NAME logf -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_logf, __logf, IFUNC_SELECTOR ()); - --#ifdef SHARED -+# ifdef SHARED - __hidden_ver1 (__logf, __GI___logf, __redirect_logf) - __attribute__ ((visibility ("hidden"))); - - versioned_symbol (libm, __ieee754_logf, logf, GLIBC_2_27); - libm_alias_float_other (__log, log) --#else -+# else - libm_alias_float (__log, log) --#endif -+# endif - - strong_alias (__logf, __ieee754_logf) - libm_alias_finite (__logf, __logf) - --#define __logf __logf_sse2 -+# define __logf __logf_sse2 -+#endif - #include <sysdeps/ieee754/flt-32/e_logf.c> -diff --git a/sysdeps/x86_64/fpu/multiarch/e_pow.c b/sysdeps/x86_64/fpu/multiarch/e_pow.c -index 42618e7112..f8f17aff9f 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_pow.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_pow.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <math.h> --#include <libm-alias-finite.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include <math.h> -+# include <libm-alias-finite.h> - - extern double __redirect_ieee754_pow (double, double); - --#define SYMBOL_NAME ieee754_pow --#include "ifunc-fma4.h" -+# define SYMBOL_NAME ieee754_pow -+# include "ifunc-fma4.h" - - libc_ifunc_redirected (__redirect_ieee754_pow, - __ieee754_pow, IFUNC_SELECTOR ()); - libm_alias_finite (__ieee754_pow, __pow) - --#define __pow __ieee754_pow_sse2 -+# define __pow __ieee754_pow_sse2 -+#endif - #include <sysdeps/ieee754/dbl-64/e_pow.c> -diff --git a/sysdeps/x86_64/fpu/multiarch/e_powf.c b/sysdeps/x86_64/fpu/multiarch/e_powf.c -index 8e6ce13cc1..8b1a4c7d04 100644 ---- a/sysdeps/x86_64/fpu/multiarch/e_powf.c -+++ b/sysdeps/x86_64/fpu/multiarch/e_powf.c -@@ -16,31 +16,34 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-float.h> --#include <libm-alias-finite.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include <libm-alias-float.h> -+# include <libm-alias-finite.h> - --#define powf __redirect_powf --#define __DECL_SIMD___redirect_powf --#include <math.h> --#undef powf -+# define powf __redirect_powf -+# define __DECL_SIMD___redirect_powf -+# include <math.h> -+# undef powf - --#define SYMBOL_NAME powf --#include "ifunc-fma.h" -+# define SYMBOL_NAME powf -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_powf, __powf, IFUNC_SELECTOR ()); - --#ifdef SHARED -+# ifdef SHARED - __hidden_ver1 (__powf, __GI___powf, __redirect_powf) - __attribute__ ((visibility ("hidden"))); - - versioned_symbol (libm, __ieee754_powf, powf, GLIBC_2_27); - libm_alias_float_other (__pow, pow) --#else -+# else - libm_alias_float (__pow, pow) --#endif -+# endif - - strong_alias (__powf, __ieee754_powf) - libm_alias_finite (__powf, __powf) - --#define __powf __powf_sse2 -+# define __powf __powf_sse2 -+#endif - #include <sysdeps/ieee754/flt-32/e_powf.c> -diff --git a/sysdeps/x86_64/fpu/multiarch/s_atan.c b/sysdeps/x86_64/fpu/multiarch/s_atan.c -index 71bad096a9..4d2c6ce006 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_atan.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_atan.c -@@ -16,15 +16,18 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-double.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include <libm-alias-double.h> - - extern double __redirect_atan (double); - --#define SYMBOL_NAME atan --#include "ifunc-avx-fma4.h" -+# define SYMBOL_NAME atan -+# include "ifunc-avx-fma4.h" - - libc_ifunc_redirected (__redirect_atan, __atan, IFUNC_SELECTOR ()); - libm_alias_double (__atan, atan) - --#define __atan __atan_sse2 -+# define __atan __atan_sse2 -+#endif - #include <sysdeps/ieee754/dbl-64/s_atan.c> -diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-avx.S b/sysdeps/x86_64/fpu/multiarch/s_ceil-avx.S -new file mode 100644 -index 0000000000..e6c1106753 ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_ceil-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of ceil function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <sysdep.h> -+#include <libm-alias-double.h> -+ -+ .text -+ENTRY(__ceil) -+ vroundsd $10, %xmm0, %xmm0, %xmm0 -+ ret -+END(__ceil) -+ -+libm_alias_double (__ceil, ceil) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_ceil-sse4_1.S -index 64119011ad..dba756c38f 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_ceil-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_ceil-sse4_1.S -@@ -17,8 +17,20 @@ - - #include <sysdep.h> - -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include <libm-alias-double.h> -+# define __ceil_sse41 __ceil -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__ceil_sse41) - roundsd $10, %xmm0, %xmm0 - ret - END(__ceil_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_double (__ceil, ceil) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil.c b/sysdeps/x86_64/fpu/multiarch/s_ceil.c -index cc028addee..46c8e91e19 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_ceil.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_ceil.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#define NO_MATH_REDIRECT --#include <libm-alias-double.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# define NO_MATH_REDIRECT -+# include <libm-alias-double.h> - --#define ceil __redirect_ceil --#define __ceil __redirect___ceil --#include <math.h> --#undef ceil --#undef __ceil -+# define ceil __redirect_ceil -+# define __ceil __redirect___ceil -+# include <math.h> -+# undef ceil -+# undef __ceil - --#define SYMBOL_NAME ceil --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME ceil -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_ceil, __ceil, IFUNC_SELECTOR ()); - libm_alias_double (__ceil, ceil) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceilf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_ceilf-avx.S -new file mode 100644 -index 0000000000..b4d8ac0455 ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_ceilf-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of ceilf function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <sysdep.h> -+#include <libm-alias-float.h> -+ -+ .text -+ENTRY(__ceilf) -+ vroundss $10, %xmm0, %xmm0, %xmm0 -+ ret -+END(__ceilf) -+ -+libm_alias_float (__ceil, ceil) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceilf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_ceilf-sse4_1.S -index dd9a9f6b71..9abc87b91a 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_ceilf-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_ceilf-sse4_1.S -@@ -17,8 +17,20 @@ - - #include <sysdep.h> - -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include <libm-alias-float.h> -+# define __ceilf_sse41 __ceilf -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__ceilf_sse41) - roundss $10, %xmm0, %xmm0 - ret - END(__ceilf_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_float (__ceil, ceil) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceilf.c b/sysdeps/x86_64/fpu/multiarch/s_ceilf.c -index 97a0ca7d19..bb53108f73 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_ceilf.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_ceilf.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#define NO_MATH_REDIRECT --#include <libm-alias-float.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# define NO_MATH_REDIRECT -+# include <libm-alias-float.h> - --#define ceilf __redirect_ceilf --#define __ceilf __redirect___ceilf --#include <math.h> --#undef ceilf --#undef __ceilf -+# define ceilf __redirect_ceilf -+# define __ceilf __redirect___ceilf -+# include <math.h> -+# undef ceilf -+# undef __ceilf - --#define SYMBOL_NAME ceilf --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME ceilf -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_ceilf, __ceilf, IFUNC_SELECTOR ()); - libm_alias_float (__ceil, ceil) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_cosf.c b/sysdeps/x86_64/fpu/multiarch/s_cosf.c -index 2703c576df..8a02e04538 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_cosf.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_cosf.c -@@ -16,13 +16,18 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-float.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include <libm-alias-float.h> - - extern float __redirect_cosf (float); - --#define SYMBOL_NAME cosf --#include "ifunc-fma.h" -+# define SYMBOL_NAME cosf -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_cosf, __cosf, IFUNC_SELECTOR ()); - - libm_alias_float (__cos, cos) -+#else -+# include <sysdeps/ieee754/flt-32/s_cosf.c> -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_expm1.c b/sysdeps/x86_64/fpu/multiarch/s_expm1.c -index 8a2d69f9b2..d58ef3d8f5 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_expm1.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_expm1.c -@@ -16,21 +16,24 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-double.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include <libm-alias-double.h> - - extern double __redirect_expm1 (double); - --#define SYMBOL_NAME expm1 --#include "ifunc-fma.h" -+# define SYMBOL_NAME expm1 -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_expm1, __expm1, IFUNC_SELECTOR ()); - libm_alias_double (__expm1, expm1) - --#define __expm1 __expm1_sse2 -+# define __expm1 __expm1_sse2 - - /* NB: __expm1 may be expanded to __expm1_sse2 in the following - prototypes. */ - extern long double __expm1l (long double); - extern long double __expm1f128 (long double); - -+#endif - #include <sysdeps/ieee754/dbl-64/s_expm1.c> -diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-avx.S b/sysdeps/x86_64/fpu/multiarch/s_floor-avx.S -new file mode 100644 -index 0000000000..ff74b5a8bf ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_floor-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of floor function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <sysdep.h> -+#include <libm-alias-double.h> -+ -+ .text -+ENTRY(__floor) -+ vroundsd $9, %xmm0, %xmm0, %xmm0 -+ ret -+END(__floor) -+ -+libm_alias_double (__floor, floor) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_floor-sse4_1.S -index 2f7521f39f..c9b9b0639b 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_floor-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_floor-sse4_1.S -@@ -17,8 +17,20 @@ - - #include <sysdep.h> - -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include <libm-alias-double.h> -+# define __floor_sse41 __floor -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__floor_sse41) - roundsd $9, %xmm0, %xmm0 - ret - END(__floor_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_double (__floor, floor) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor.c b/sysdeps/x86_64/fpu/multiarch/s_floor.c -index 8cebd48e10..2c87dd0056 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_floor.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_floor.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#define NO_MATH_REDIRECT --#include <libm-alias-double.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# define NO_MATH_REDIRECT -+# include <libm-alias-double.h> - --#define floor __redirect_floor --#define __floor __redirect___floor --#include <math.h> --#undef floor --#undef __floor -+# define floor __redirect_floor -+# define __floor __redirect___floor -+# include <math.h> -+# undef floor -+# undef __floor - --#define SYMBOL_NAME floor --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME floor -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_floor, __floor, IFUNC_SELECTOR ()); - libm_alias_double (__floor, floor) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_floorf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_floorf-avx.S -new file mode 100644 -index 0000000000..c378baae8e ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_floorf-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of floorf function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <sysdep.h> -+#include <libm-alias-float.h> -+ -+ .text -+ENTRY(__floorf) -+ vroundss $9, %xmm0, %xmm0, %xmm0 -+ ret -+END(__floorf) -+ -+libm_alias_float (__floor, floor) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_floorf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_floorf-sse4_1.S -index 5f6020d27d..c2216899db 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_floorf-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_floorf-sse4_1.S -@@ -17,8 +17,20 @@ - - #include <sysdep.h> - -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include <libm-alias-float.h> -+# define __floorf_sse41 __floorf -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__floorf_sse41) - roundss $9, %xmm0, %xmm0 - ret - END(__floorf_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_float (__floor, floor) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_floorf.c b/sysdeps/x86_64/fpu/multiarch/s_floorf.c -index a14e18b03c..a277802b6d 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_floorf.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_floorf.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#define NO_MATH_REDIRECT --#include <libm-alias-float.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# define NO_MATH_REDIRECT -+# include <libm-alias-float.h> - --#define floorf __redirect_floorf --#define __floorf __redirect___floorf --#include <math.h> --#undef floorf --#undef __floorf -+# define floorf __redirect_floorf -+# define __floorf __redirect___floorf -+# include <math.h> -+# undef floorf -+# undef __floorf - --#define SYMBOL_NAME floorf --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME floorf -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_floorf, __floorf, IFUNC_SELECTOR ()); - libm_alias_float (__floor, floor) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_log1p.c b/sysdeps/x86_64/fpu/multiarch/s_log1p.c -index a8e1a3f21b..3fa1185d81 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_log1p.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_log1p.c -@@ -16,14 +16,17 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-double.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include <libm-alias-double.h> - - extern double __redirect_log1p (double); - --#define SYMBOL_NAME log1p --#include "ifunc-fma.h" -+# define SYMBOL_NAME log1p -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_log1p, __log1p, IFUNC_SELECTOR ()); - --#define __log1p __log1p_sse2 -+# define __log1p __log1p_sse2 -+#endif - #include <sysdeps/ieee754/dbl-64/s_log1p.c> -diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyint-avx.S b/sysdeps/x86_64/fpu/multiarch/s_nearbyint-avx.S -new file mode 100644 -index 0000000000..5bfdf73c28 ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyint-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of nearbyint function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <sysdep.h> -+#include <libm-alias-double.h> -+ -+ .text -+ENTRY(__nearbyint) -+ vroundsd $0xc, %xmm0, %xmm0, %xmm0 -+ ret -+END(__nearbyint) -+ -+libm_alias_double (__nearbyint, nearbyint) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyint-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_nearbyint-sse4_1.S -index 674f7eb40a..9d84410a1f 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_nearbyint-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyint-sse4_1.S -@@ -17,8 +17,20 @@ - - #include <sysdep.h> - -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include <libm-alias-double.h> -+# define __nearbyint_sse41 __nearbyint -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__nearbyint_sse41) - roundsd $0xc, %xmm0, %xmm0 - ret - END(__nearbyint_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_double (__nearbyint, nearbyint) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyint.c b/sysdeps/x86_64/fpu/multiarch/s_nearbyint.c -index 693e42dd4e..057a7ca60f 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_nearbyint.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyint.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-double.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# include <libm-alias-double.h> - --#define nearbyint __redirect_nearbyint --#define __nearbyint __redirect___nearbyint --#include <math.h> --#undef nearbyint --#undef __nearbyint -+# define nearbyint __redirect_nearbyint -+# define __nearbyint __redirect___nearbyint -+# include <math.h> -+# undef nearbyint -+# undef __nearbyint - --#define SYMBOL_NAME nearbyint --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME nearbyint -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_nearbyint, __nearbyint, - IFUNC_SELECTOR ()); - libm_alias_double (__nearbyint, nearbyint) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-avx.S -new file mode 100644 -index 0000000000..1dbaed0324 ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implmentation of nearbyintf function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <sysdep.h> -+#include <libm-alias-float.h> -+ -+ .text -+ENTRY(__nearbyintf) -+ vroundss $0xc, %xmm0, %xmm0, %xmm0 -+ ret -+END(__nearbyintf) -+ -+libm_alias_float (__nearbyint, nearbyint) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-sse4_1.S -index 5892bd7563..3cf35f92d6 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-sse4_1.S -@@ -17,8 +17,20 @@ - - #include <sysdep.h> - -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include <libm-alias-float.h> -+# define __nearbyintf_sse41 __nearbyintf -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__nearbyintf_sse41) - roundss $0xc, %xmm0, %xmm0 - ret - END(__nearbyintf_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_float (__nearbyint, nearbyint) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyintf.c b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf.c -index a0ac009f4b..41f374ba72 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_nearbyintf.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-float.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# include <libm-alias-float.h> - --#define nearbyintf __redirect_nearbyintf --#define __nearbyintf __redirect___nearbyintf --#include <math.h> --#undef nearbyintf --#undef __nearbyintf -+# define nearbyintf __redirect_nearbyintf -+# define __nearbyintf __redirect___nearbyintf -+# include <math.h> -+# undef nearbyintf -+# undef __nearbyintf - --#define SYMBOL_NAME nearbyintf --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME nearbyintf -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_nearbyintf, __nearbyintf, - IFUNC_SELECTOR ()); - libm_alias_float (__nearbyint, nearbyint) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_rint-avx.S b/sysdeps/x86_64/fpu/multiarch/s_rint-avx.S -new file mode 100644 -index 0000000000..2b403b331f ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_rint-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of rint function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <sysdep.h> -+#include <libm-alias-double.h> -+ -+ .text -+ENTRY(__rint) -+ vroundsd $4, %xmm0, %xmm0, %xmm0 -+ ret -+END(__rint) -+ -+libm_alias_double (__rint, rint) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_rint-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_rint-sse4_1.S -index 405372991b..8cd9cf759f 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_rint-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_rint-sse4_1.S -@@ -17,8 +17,20 @@ - - #include <sysdep.h> - -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include <libm-alias-double.h> -+# define __rint_sse41 __rint -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__rint_sse41) - roundsd $4, %xmm0, %xmm0 - ret - END(__rint_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_double (__rint, rint) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_rint.c b/sysdeps/x86_64/fpu/multiarch/s_rint.c -index 754c87e004..18623b7d99 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_rint.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_rint.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#define NO_MATH_REDIRECT --#include <libm-alias-double.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# define NO_MATH_REDIRECT -+# include <libm-alias-double.h> - --#define rint __redirect_rint --#define __rint __redirect___rint --#include <math.h> --#undef rint --#undef __rint -+# define rint __redirect_rint -+# define __rint __redirect___rint -+# include <math.h> -+# undef rint -+# undef __rint - --#define SYMBOL_NAME rint --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME rint -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_rint, __rint, IFUNC_SELECTOR ()); - libm_alias_double (__rint, rint) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_rintf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_rintf-avx.S -new file mode 100644 -index 0000000000..171c2867f4 ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_rintf-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of rintf function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <sysdep.h> -+#include <libm-alias-float.h> -+ -+ .text -+ENTRY(__rintf) -+ vroundss $4, %xmm0, %xmm0, %xmm0 -+ ret -+END(__rintf) -+ -+libm_alias_float (__rint, rint) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_rintf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_rintf-sse4_1.S -index 8ac67ce767..fc1e70f0c9 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_rintf-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_rintf-sse4_1.S -@@ -17,8 +17,20 @@ - - #include <sysdep.h> - -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include <libm-alias-float.h> -+# define __rintf_sse41 __rintf -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__rintf_sse41) - roundss $4, %xmm0, %xmm0 - ret - END(__rintf_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_float (__rint, rint) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_rintf.c b/sysdeps/x86_64/fpu/multiarch/s_rintf.c -index e9d6b7a5f2..e275368dec 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_rintf.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_rintf.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#define NO_MATH_REDIRECT --#include <libm-alias-float.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# define NO_MATH_REDIRECT -+# include <libm-alias-float.h> - --#define rintf __redirect_rintf --#define __rintf __redirect___rintf --#include <math.h> --#undef rintf --#undef __rintf -+# define rintf __redirect_rintf -+# define __rintf __redirect___rintf -+# include <math.h> -+# undef rintf -+# undef __rintf - --#define SYMBOL_NAME rintf --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME rintf -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_rintf, __rintf, IFUNC_SELECTOR ()); - libm_alias_float (__rint, rint) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundeven-avx.S b/sysdeps/x86_64/fpu/multiarch/s_roundeven-avx.S -new file mode 100644 -index 0000000000..576790355c ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_roundeven-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of roundeven function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <sysdep.h> -+#include <libm-alias-double.h> -+ -+ .text -+ENTRY(__roundeven) -+ vroundsd $8, %xmm0, %xmm0, %xmm0 -+ ret -+END(__roundeven) -+ -+libm_alias_double (__roundeven, roundeven) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundeven-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_roundeven-sse4_1.S -index 5ef102336b..f00be56c59 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_roundeven-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_roundeven-sse4_1.S -@@ -17,8 +17,20 @@ - - #include <sysdep.h> - -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include <libm-alias-double.h> -+# define __roundeven_sse41 __roundeven -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__roundeven_sse41) - roundsd $8, %xmm0, %xmm0 - ret - END(__roundeven_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_double (__roundeven, roundeven) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundeven.c b/sysdeps/x86_64/fpu/multiarch/s_roundeven.c -index 8737b32e26..139aad088f 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_roundeven.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_roundeven.c -@@ -16,16 +16,19 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-double.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# include <libm-alias-double.h> - --#define roundeven __redirect_roundeven --#define __roundeven __redirect___roundeven --#include <math.h> --#undef roundeven --#undef __roundeven -+# define roundeven __redirect_roundeven -+# define __roundeven __redirect___roundeven -+# include <math.h> -+# undef roundeven -+# undef __roundeven - --#define SYMBOL_NAME roundeven --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME roundeven -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_roundeven, __roundeven, IFUNC_SELECTOR ()); - libm_alias_double (__roundeven, roundeven) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundevenf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_roundevenf-avx.S -new file mode 100644 -index 0000000000..42c359f4cd ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_roundevenf-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of roundevenf function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <sysdep.h> -+#include <libm-alias-float.h> -+ -+ .text -+ENTRY(__roundevenf) -+ vroundss $8, %xmm0, %xmm0, %xmm0 -+ ret -+END(__roundevenf) -+ -+libm_alias_float (__roundeven, roundeven) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundevenf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_roundevenf-sse4_1.S -index 792c90ba07..6b148e4353 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_roundevenf-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_roundevenf-sse4_1.S -@@ -17,8 +17,20 @@ - - #include <sysdep.h> - -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include <libm-alias-float.h> -+# define __roundevenf_sse41 __roundevenf -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__roundevenf_sse41) - roundss $8, %xmm0, %xmm0 - ret - END(__roundevenf_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_float (__roundeven, roundeven) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundevenf.c b/sysdeps/x86_64/fpu/multiarch/s_roundevenf.c -index e96016a4d5..2fb090075d 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_roundevenf.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_roundevenf.c -@@ -16,16 +16,19 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-float.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# include <libm-alias-float.h> - --#define roundevenf __redirect_roundevenf --#define __roundevenf __redirect___roundevenf --#include <math.h> --#undef roundevenf --#undef __roundevenf -+# define roundevenf __redirect_roundevenf -+# define __roundevenf __redirect___roundevenf -+# include <math.h> -+# undef roundevenf -+# undef __roundevenf - --#define SYMBOL_NAME roundevenf --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME roundevenf -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_roundevenf, __roundevenf, IFUNC_SELECTOR ()); - libm_alias_float (__roundeven, roundeven) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c -index 355cc0092e..21e77943a3 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_sin.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_sin.c -@@ -16,24 +16,27 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-double.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include <libm-alias-double.h> - - extern double __redirect_sin (double); - extern double __redirect_cos (double); - --#define SYMBOL_NAME sin --#include "ifunc-avx-fma4.h" -+# define SYMBOL_NAME sin -+# include "ifunc-avx-fma4.h" - - libc_ifunc_redirected (__redirect_sin, __sin, IFUNC_SELECTOR ()); - libm_alias_double (__sin, sin) - --#undef SYMBOL_NAME --#define SYMBOL_NAME cos --#include "ifunc-avx-fma4.h" -+# undef SYMBOL_NAME -+# define SYMBOL_NAME cos -+# include "ifunc-avx-fma4.h" - - libc_ifunc_redirected (__redirect_cos, __cos, IFUNC_SELECTOR ()); - libm_alias_double (__cos, cos) - --#define __cos __cos_sse2 --#define __sin __sin_sse2 -+# define __cos __cos_sse2 -+# define __sin __sin_sse2 -+#endif - #include <sysdeps/ieee754/dbl-64/s_sin.c> -diff --git a/sysdeps/x86_64/fpu/multiarch/s_sincos.c b/sysdeps/x86_64/fpu/multiarch/s_sincos.c -index 70107e999c..b35757f8de 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_sincos.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_sincos.c -@@ -16,15 +16,18 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-double.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include <libm-alias-double.h> - - extern void __redirect_sincos (double, double *, double *); - --#define SYMBOL_NAME sincos --#include "ifunc-fma4.h" -+# define SYMBOL_NAME sincos -+# include "ifunc-fma4.h" - - libc_ifunc_redirected (__redirect_sincos, __sincos, IFUNC_SELECTOR ()); - libm_alias_double (__sincos, sincos) - --#define __sincos __sincos_sse2 -+# define __sincos __sincos_sse2 -+#endif - #include <sysdeps/ieee754/dbl-64/s_sincos.c> -diff --git a/sysdeps/x86_64/fpu/multiarch/s_sincosf.c b/sysdeps/x86_64/fpu/multiarch/s_sincosf.c -index 80bc028451..0ea9b40e84 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_sincosf.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_sincosf.c -@@ -16,13 +16,18 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-float.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include <libm-alias-float.h> - - extern void __redirect_sincosf (float, float *, float *); - --#define SYMBOL_NAME sincosf --#include "ifunc-fma.h" -+# define SYMBOL_NAME sincosf -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_sincosf, __sincosf, IFUNC_SELECTOR ()); - - libm_alias_float (__sincos, sincos) -+#else -+# include <sysdeps/ieee754/flt-32/s_sincosf.c> -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_sinf.c b/sysdeps/x86_64/fpu/multiarch/s_sinf.c -index a32b9e9550..c61624e3ee 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_sinf.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_sinf.c -@@ -16,13 +16,18 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-float.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include <libm-alias-float.h> - - extern float __redirect_sinf (float); - --#define SYMBOL_NAME sinf --#include "ifunc-fma.h" -+# define SYMBOL_NAME sinf -+# include "ifunc-fma.h" - - libc_ifunc_redirected (__redirect_sinf, __sinf, IFUNC_SELECTOR ()); - - libm_alias_float (__sin, sin) -+#else -+# include <sysdeps/ieee754/flt-32/s_sinf.c> -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c -index f9a2474a13..125d992ba1 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_tan.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_tan.c -@@ -16,15 +16,18 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#include <libm-alias-double.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL -+# include <libm-alias-double.h> - - extern double __redirect_tan (double); - --#define SYMBOL_NAME tan --#include "ifunc-avx-fma4.h" -+# define SYMBOL_NAME tan -+# include "ifunc-avx-fma4.h" - - libc_ifunc_redirected (__redirect_tan, __tan, IFUNC_SELECTOR ()); - libm_alias_double (__tan, tan) - --#define __tan __tan_sse2 -+# define __tan __tan_sse2 -+#endif - #include <sysdeps/ieee754/dbl-64/s_tan.c> -diff --git a/sysdeps/x86_64/fpu/multiarch/s_trunc-avx.S b/sysdeps/x86_64/fpu/multiarch/s_trunc-avx.S -new file mode 100644 -index 0000000000..b3e87e9606 ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_trunc-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of trunc function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <sysdep.h> -+#include <libm-alias-double.h> -+ -+ .text -+ENTRY(__trunc) -+ vroundsd $11, %xmm0, %xmm0, %xmm0 -+ ret -+END(__trunc) -+ -+libm_alias_double (__trunc, trunc) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_trunc-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_trunc-sse4_1.S -index b496a6ef49..2b79174eed 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_trunc-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_trunc-sse4_1.S -@@ -18,8 +18,20 @@ - - #include <sysdep.h> - -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include <libm-alias-double.h> -+# define __trunc_sse41 __trunc -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__trunc_sse41) - roundsd $11, %xmm0, %xmm0 - ret - END(__trunc_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_double (__trunc, trunc) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_trunc.c b/sysdeps/x86_64/fpu/multiarch/s_trunc.c -index 9bc9df8744..ea89c4f85d 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_trunc.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_trunc.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#define NO_MATH_REDIRECT --#include <libm-alias-double.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# define NO_MATH_REDIRECT -+# include <libm-alias-double.h> - --#define trunc __redirect_trunc --#define __trunc __redirect___trunc --#include <math.h> --#undef trunc --#undef __trunc -+# define trunc __redirect_trunc -+# define __trunc __redirect___trunc -+# include <math.h> -+# undef trunc -+# undef __trunc - --#define SYMBOL_NAME trunc --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME trunc -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_trunc, __trunc, IFUNC_SELECTOR ()); - libm_alias_double (__trunc, trunc) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_truncf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_truncf-avx.S -new file mode 100644 -index 0000000000..f31ac7d7f7 ---- /dev/null -+++ b/sysdeps/x86_64/fpu/multiarch/s_truncf-avx.S -@@ -0,0 +1,28 @@ -+/* AVX implementation of truncf function. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <sysdep.h> -+#include <libm-alias-float.h> -+ -+ .text -+ENTRY(__truncf) -+ vroundss $11, %xmm0, %xmm0, %xmm0 -+ ret -+END(__truncf) -+ -+libm_alias_float (__trunc, trunc) -diff --git a/sysdeps/x86_64/fpu/multiarch/s_truncf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_truncf-sse4_1.S -index 22e9a83307..60498b2cb2 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_truncf-sse4_1.S -+++ b/sysdeps/x86_64/fpu/multiarch/s_truncf-sse4_1.S -@@ -18,8 +18,20 @@ - - #include <sysdep.h> - -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+# include <libm-alias-float.h> -+# define __truncf_sse41 __truncf -+ .text -+#else - .section .text.sse4.1,"ax",@progbits -+#endif -+ - ENTRY(__truncf_sse41) - roundss $11, %xmm0, %xmm0 - ret - END(__truncf_sse41) -+ -+#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL -+libm_alias_float (__trunc, trunc) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/s_truncf.c b/sysdeps/x86_64/fpu/multiarch/s_truncf.c -index dae01d166a..92435ce39d 100644 ---- a/sysdeps/x86_64/fpu/multiarch/s_truncf.c -+++ b/sysdeps/x86_64/fpu/multiarch/s_truncf.c -@@ -16,17 +16,20 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - --#define NO_MATH_REDIRECT --#include <libm-alias-float.h> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL -+# define NO_MATH_REDIRECT -+# include <libm-alias-float.h> - --#define truncf __redirect_truncf --#define __truncf __redirect___truncf --#include <math.h> --#undef truncf --#undef __truncf -+# define truncf __redirect_truncf -+# define __truncf __redirect___truncf -+# include <math.h> -+# undef truncf -+# undef __truncf - --#define SYMBOL_NAME truncf --#include "ifunc-sse4_1.h" -+# define SYMBOL_NAME truncf -+# include "ifunc-sse4_1.h" - - libc_ifunc_redirected (__redirect_truncf, __truncf, IFUNC_SELECTOR ()); - libm_alias_float (__trunc, trunc) -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/w_exp.c b/sysdeps/x86_64/fpu/multiarch/w_exp.c -index 27eee98a0a..3584187e0e 100644 ---- a/sysdeps/x86_64/fpu/multiarch/w_exp.c -+++ b/sysdeps/x86_64/fpu/multiarch/w_exp.c -@@ -1 +1,6 @@ --#include <sysdeps/../math/w_exp.c> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL >= AVX2_X86_ISA_LEVEL -+# include <sysdeps/ieee754/dbl-64/w_exp.c> -+#else -+# include <sysdeps/../math/w_exp.c> -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/w_log.c b/sysdeps/x86_64/fpu/multiarch/w_log.c -index 9b2b018711..414ca3ca3d 100644 ---- a/sysdeps/x86_64/fpu/multiarch/w_log.c -+++ b/sysdeps/x86_64/fpu/multiarch/w_log.c -@@ -1 +1,6 @@ --#include <sysdeps/../math/w_log.c> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL >= AVX2_X86_ISA_LEVEL -+# include <sysdeps/ieee754/dbl-64/w_log.c> -+#else -+# include <sysdeps/../math/w_log.c> -+#endif -diff --git a/sysdeps/x86_64/fpu/multiarch/w_pow.c b/sysdeps/x86_64/fpu/multiarch/w_pow.c -index b50c1988de..d5fcc4f871 100644 ---- a/sysdeps/x86_64/fpu/multiarch/w_pow.c -+++ b/sysdeps/x86_64/fpu/multiarch/w_pow.c -@@ -1 +1,6 @@ --#include <sysdeps/../math/w_pow.c> -+#include <sysdeps/x86/isa-level.h> -+#if MINIMUM_X86_ISA_LEVEL >= AVX2_X86_ISA_LEVEL -+# include <sysdeps/ieee754/dbl-64/w_pow.c> -+#else -+# include <sysdeps/../math/w_pow.c> -+#endif - -commit 31da30f23cddd36db29d5b6a1c7619361b271fb4 -Author: Charles Fol <folcharles@gmail.com> -Date: Thu Mar 28 12:25:38 2024 -0300 - - iconv: ISO-2022-CN-EXT: fix out-of-bound writes when writing escape sequence (CVE-2024-2961) - - ISO-2022-CN-EXT uses escape sequences to indicate character set changes - (as specified by RFC 1922). While the SOdesignation has the expected - bounds checks, neither SS2designation nor SS3designation have its; - allowing a write overflow of 1, 2, or 3 bytes with fixed values: - '$+I', '$+J', '$+K', '$+L', '$+M', or '$*H'. - - Checked on aarch64-linux-gnu. - - Co-authored-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> - Reviewed-by: Carlos O'Donell <carlos@redhat.com> - Tested-by: Carlos O'Donell <carlos@redhat.com> - - (cherry picked from commit f9dc609e06b1136bb0408be9605ce7973a767ada) - -diff --git a/iconvdata/Makefile b/iconvdata/Makefile -index ea019ce5c0..7196a8744b 100644 ---- a/iconvdata/Makefile -+++ b/iconvdata/Makefile -@@ -75,7 +75,8 @@ ifeq (yes,$(build-shared)) - tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \ - tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9 \ - bug-iconv10 bug-iconv11 bug-iconv12 tst-iconv-big5-hkscs-to-2ucs4 \ -- bug-iconv13 bug-iconv14 bug-iconv15 -+ bug-iconv13 bug-iconv14 bug-iconv15 \ -+ tst-iconv-iso-2022-cn-ext - ifeq ($(have-thread-library),yes) - tests += bug-iconv3 - endif -@@ -330,6 +331,8 @@ $(objpfx)bug-iconv14.out: $(addprefix $(objpfx), $(gconv-modules)) \ - $(addprefix $(objpfx),$(modules.so)) - $(objpfx)bug-iconv15.out: $(addprefix $(objpfx), $(gconv-modules)) \ - $(addprefix $(objpfx),$(modules.so)) -+$(objpfx)tst-iconv-iso-2022-cn-ext.out: $(addprefix $(objpfx), $(gconv-modules)) \ -+ $(addprefix $(objpfx),$(modules.so)) - - $(objpfx)iconv-test.out: run-iconv-test.sh \ - $(addprefix $(objpfx), $(gconv-modules)) \ -diff --git a/iconvdata/iso-2022-cn-ext.c b/iconvdata/iso-2022-cn-ext.c -index b34c8a36f4..cce29b1969 100644 ---- a/iconvdata/iso-2022-cn-ext.c -+++ b/iconvdata/iso-2022-cn-ext.c -@@ -574,6 +574,12 @@ DIAG_IGNORE_Os_NEEDS_COMMENT (5, "-Wmaybe-uninitialized"); - { \ - const char *escseq; \ - \ -+ if (outptr + 4 > outend) \ -+ { \ -+ result = __GCONV_FULL_OUTPUT; \ -+ break; \ -+ } \ -+ \ - assert (used == CNS11643_2_set); /* XXX */ \ - escseq = "*H"; \ - *outptr++ = ESC; \ -@@ -587,6 +593,12 @@ DIAG_IGNORE_Os_NEEDS_COMMENT (5, "-Wmaybe-uninitialized"); - { \ - const char *escseq; \ - \ -+ if (outptr + 4 > outend) \ -+ { \ -+ result = __GCONV_FULL_OUTPUT; \ -+ break; \ -+ } \ -+ \ - assert ((used >> 5) >= 3 && (used >> 5) <= 7); \ - escseq = "+I+J+K+L+M" + ((used >> 5) - 3) * 2; \ - *outptr++ = ESC; \ -diff --git a/iconvdata/tst-iconv-iso-2022-cn-ext.c b/iconvdata/tst-iconv-iso-2022-cn-ext.c -new file mode 100644 -index 0000000000..96a8765fd5 ---- /dev/null -+++ b/iconvdata/tst-iconv-iso-2022-cn-ext.c -@@ -0,0 +1,128 @@ -+/* Verify ISO-2022-CN-EXT does not write out of the bounds. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <stdio.h> -+#include <string.h> -+ -+#include <errno.h> -+#include <iconv.h> -+#include <sys/mman.h> -+ -+#include <support/xunistd.h> -+#include <support/check.h> -+#include <support/support.h> -+ -+/* The test sets up a two memory page buffer with the second page marked -+ PROT_NONE to trigger a fault if the conversion writes beyond the exact -+ expected amount. Then we carry out various conversions and precisely -+ place the start of the output buffer in order to trigger a SIGSEGV if the -+ process writes anywhere between 1 and page sized bytes more (only one -+ PROT_NONE page is setup as a canary) than expected. These tests exercise -+ all three of the cases in ISO-2022-CN-EXT where the converter must switch -+ character sets and may run out of buffer space while doing the -+ operation. */ -+ -+static int -+do_test (void) -+{ -+ iconv_t cd = iconv_open ("ISO-2022-CN-EXT", "UTF-8"); -+ TEST_VERIFY_EXIT (cd != (iconv_t) -1); -+ -+ char *ntf; -+ size_t ntfsize; -+ char *outbufbase; -+ { -+ int pgz = getpagesize (); -+ TEST_VERIFY_EXIT (pgz > 0); -+ ntfsize = 2 * pgz; -+ -+ ntf = xmmap (NULL, ntfsize, PROT_READ | PROT_WRITE, MAP_PRIVATE -+ | MAP_ANONYMOUS, -1); -+ xmprotect (ntf + pgz, pgz, PROT_NONE); -+ -+ outbufbase = ntf + pgz; -+ } -+ -+ /* Check if SOdesignation escape sequence does not trigger an OOB write. */ -+ { -+ char inbuf[] = "\xe4\xba\xa4\xe6\x8d\xa2"; -+ -+ for (int i = 0; i < 9; i++) -+ { -+ char *inp = inbuf; -+ size_t inleft = sizeof (inbuf) - 1; -+ -+ char *outp = outbufbase - i; -+ size_t outleft = i; -+ -+ TEST_VERIFY_EXIT (iconv (cd, &inp, &inleft, &outp, &outleft) -+ == (size_t) -1); -+ TEST_COMPARE (errno, E2BIG); -+ -+ TEST_VERIFY_EXIT (iconv (cd, NULL, NULL, NULL, NULL) == 0); -+ } -+ } -+ -+ /* Same as before for SS2designation. */ -+ { -+ char inbuf[] = "㴽 \xe3\xb4\xbd"; -+ -+ for (int i = 0; i < 14; i++) -+ { -+ char *inp = inbuf; -+ size_t inleft = sizeof (inbuf) - 1; -+ -+ char *outp = outbufbase - i; -+ size_t outleft = i; -+ -+ TEST_VERIFY_EXIT (iconv (cd, &inp, &inleft, &outp, &outleft) -+ == (size_t) -1); -+ TEST_COMPARE (errno, E2BIG); -+ -+ TEST_VERIFY_EXIT (iconv (cd, NULL, NULL, NULL, NULL) == 0); -+ } -+ } -+ -+ /* Same as before for SS3designation. */ -+ { -+ char inbuf[] = "劄 \xe5\x8a\x84"; -+ -+ for (int i = 0; i < 14; i++) -+ { -+ char *inp = inbuf; -+ size_t inleft = sizeof (inbuf) - 1; -+ -+ char *outp = outbufbase - i; -+ size_t outleft = i; -+ -+ TEST_VERIFY_EXIT (iconv (cd, &inp, &inleft, &outp, &outleft) -+ == (size_t) -1); -+ TEST_COMPARE (errno, E2BIG); -+ -+ TEST_VERIFY_EXIT (iconv (cd, NULL, NULL, NULL, NULL) == 0); -+ } -+ } -+ -+ TEST_VERIFY_EXIT (iconv_close (cd) != -1); -+ -+ xmunmap (ntf, ntfsize); -+ -+ return 0; -+} -+ -+#include <support/test-driver.c> - -commit e828914cf9f2fc2caa5bced0fc6a03cb78324979 -Author: Florian Weimer <fweimer@redhat.com> -Date: Tue Apr 23 21:16:32 2024 +0200 - - nptl: Fix tst-cancel30 on kernels without ppoll_time64 support - - Fall back to ppoll if ppoll_time64 fails with ENOSYS. - Fixes commit 370da8a121c3ba9eeb2f13da15fc0f21f4136b25 ("nptl: Fix - tst-cancel30 on sparc64"). - - Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> - (cherry picked from commit f4724843ada64a51d66f65d3199fe431f9d4c254) - -diff --git a/sysdeps/pthread/tst-cancel30.c b/sysdeps/pthread/tst-cancel30.c -index 3030660e5f..94ad6281bc 100644 ---- a/sysdeps/pthread/tst-cancel30.c -+++ b/sysdeps/pthread/tst-cancel30.c -@@ -18,6 +18,7 @@ - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - -+#include <errno.h> - #include <support/check.h> - #include <support/xstdio.h> - #include <support/xthread.h> -@@ -46,13 +47,19 @@ tf (void *arg) - - /* Wait indefinitely for cancellation, which only works if asynchronous - cancellation is enabled. */ --#if defined SYS_ppoll || defined SYS_ppoll_time64 --# ifndef SYS_ppoll_time64 --# define SYS_ppoll_time64 SYS_ppoll -+#ifdef SYS_ppoll_time64 -+ long int ret = syscall (SYS_ppoll_time64, NULL, 0, NULL, NULL); -+ (void) ret; -+# ifdef SYS_ppoll -+ if (ret == -1 && errno == ENOSYS) -+ syscall (SYS_ppoll, NULL, 0, NULL, NULL); - # endif -- syscall (SYS_ppoll_time64, NULL, 0, NULL, NULL); - #else -+# ifdef SYS_ppoll -+ syscall (SYS_ppoll, NULL, 0, NULL, NULL); -+# else - for (;;); -+# endif - #endif - - return 0; - -commit e701c7d761f6e5c48d8e9dd5da88cbe2e94943f4 -Author: Florian Weimer <fweimer@redhat.com> -Date: Thu Apr 25 12:56:48 2024 +0200 - - i386: ulp update for SSE2 --disable-multi-arch configurations - - (cherry picked from commit 3a3a4497421422aa854c855cbe5110ca7d598ffc) - -diff --git a/sysdeps/i386/fpu/libm-test-ulps b/sysdeps/i386/fpu/libm-test-ulps -index 84e6686eba..f2139fc172 100644 ---- a/sysdeps/i386/fpu/libm-test-ulps -+++ b/sysdeps/i386/fpu/libm-test-ulps -@@ -1232,6 +1232,7 @@ ldouble: 6 - - Function: "hypot": - double: 1 -+float: 1 - float128: 1 - ldouble: 1 - - -commit 2f8f157eb0cc7f1d8d9a3fcaa8c55bed53b092a8 -Author: H.J. Lu <hjl.tools@gmail.com> -Date: Tue Apr 23 13:59:50 2024 -0700 - - x86: Define MINIMUM_X86_ISA_LEVEL in config.h [BZ #31676] - - Define MINIMUM_X86_ISA_LEVEL at configure time to avoid - - /usr/bin/ld: …/build/elf/librtld.os: in function `init_cpu_features': - …/git/elf/../sysdeps/x86/cpu-features.c:1202: undefined reference to `_dl_runtime_resolve_fxsave' - /usr/bin/ld: …/build/elf/librtld.os: relocation R_X86_64_PC32 against undefined hidden symbol `_dl_runtime_resolve_fxsave' can not be used when making a shared object - /usr/bin/ld: final link failed: bad value - collect2: error: ld returned 1 exit status - - when glibc is built with -march=x86-64-v3 and configured with - --with-rtld-early-cflags=-march=x86-64, which is used to allow ld.so to - print an error message on unsupported CPUs: - - Fatal glibc error: CPU does not support x86-64-v3 - - This fixes BZ #31676. - Reviewed-by: Sunil K Pandey <skpgkp2@gmail.com> - - (cherry picked from commit 46c999741340ea559784c20a45077955b50aca43) - -diff --git a/config.h.in b/config.h.in -index 4d33c63a84..1e647de585 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -286,6 +286,9 @@ - /* Define if x86 ISA level should be included in shared libraries. */ - #undef INCLUDE_X86_ISA_LEVEL - -+/* The x86 ISA level. 1 for baseline. Undefined on non-x86. */ -+#undef MINIMUM_X86_ISA_LEVEL -+ - /* Define if -msahf is enabled by default on x86. */ - #undef HAVE_X86_LAHF_SAHF - -diff --git a/sysdeps/x86/configure b/sysdeps/x86/configure -index 2a5421bb31..d28d9bcb29 100644 ---- a/sysdeps/x86/configure -+++ b/sysdeps/x86/configure -@@ -151,6 +151,13 @@ printf "%s\n" "$libc_cv_have_x86_isa_level" >&6; } - else - libc_cv_have_x86_isa_level=baseline - fi -+if test $libc_cv_have_x86_isa_level = baseline; then -+ printf "%s\n" "#define MINIMUM_X86_ISA_LEVEL 1" >>confdefs.h -+ -+else -+ printf "%s\n" "#define MINIMUM_X86_ISA_LEVEL $libc_cv_have_x86_isa_level" >>confdefs.h -+ -+fi - config_vars="$config_vars - have-x86-isa-level = $libc_cv_have_x86_isa_level" - config_vars="$config_vars -diff --git a/sysdeps/x86/configure.ac b/sysdeps/x86/configure.ac -index 78ff7c8f41..5b0acd03d2 100644 ---- a/sysdeps/x86/configure.ac -+++ b/sysdeps/x86/configure.ac -@@ -105,6 +105,11 @@ EOF - else - libc_cv_have_x86_isa_level=baseline - fi -+if test $libc_cv_have_x86_isa_level = baseline; then -+ AC_DEFINE_UNQUOTED(MINIMUM_X86_ISA_LEVEL, 1) -+else -+ AC_DEFINE_UNQUOTED(MINIMUM_X86_ISA_LEVEL, $libc_cv_have_x86_isa_level) -+fi - LIBC_CONFIG_VAR([have-x86-isa-level], [$libc_cv_have_x86_isa_level]) - LIBC_CONFIG_VAR([x86-isa-level-3-or-above], [3 4]) - LIBC_CONFIG_VAR([enable-x86-isa-level], [$libc_cv_include_x86_isa_level]) -diff --git a/sysdeps/x86/isa-level.h b/sysdeps/x86/isa-level.h -index 11fe1ca90c..2c7f74212b 100644 ---- a/sysdeps/x86/isa-level.h -+++ b/sysdeps/x86/isa-level.h -@@ -61,8 +61,10 @@ - # define __X86_ISA_V4 0 - #endif - --#define MINIMUM_X86_ISA_LEVEL \ -+#ifndef MINIMUM_X86_ISA_LEVEL -+# define MINIMUM_X86_ISA_LEVEL \ - (__X86_ISA_V1 + __X86_ISA_V2 + __X86_ISA_V3 + __X86_ISA_V4) -+#endif - - /* Depending on the minimum ISA level, a feature check result can be a - compile-time constant.. */ - -commit 1263d583d2e28afb8be53f8d6922f0842036f35d -Author: Florian Weimer <fweimer@redhat.com> -Date: Thu Apr 25 15:00:45 2024 +0200 - - CVE-2024-33599: nscd: Stack-based buffer overflow in netgroup cache (bug 31677) - - Using alloca matches what other caches do. The request length is - bounded by MAXKEYLEN. - - Reviewed-by: Carlos O'Donell <carlos@redhat.com> - (cherry picked from commit 87801a8fd06db1d654eea3e4f7626ff476a9bdaa) - -diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c -index 0c6e46f15c..f227dc7fa2 100644 ---- a/nscd/netgroupcache.c -+++ b/nscd/netgroupcache.c -@@ -502,12 +502,13 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req, - = (struct indataset *) mempool_alloc (db, - sizeof (*dataset) + req->key_len, - 1); -- struct indataset dataset_mem; - bool cacheable = true; - if (__glibc_unlikely (dataset == NULL)) - { - cacheable = false; -- dataset = &dataset_mem; -+ /* The alloca is safe because nscd_run_worker verfies that -+ key_len is not larger than MAXKEYLEN. */ -+ dataset = alloca (sizeof (*dataset) + req->key_len); - } - - datahead_init_pos (&dataset->head, sizeof (*dataset) + req->key_len, - -commit 5a508e0b508c8ad53bd0d2fb48fd71b242626341 -Author: Florian Weimer <fweimer@redhat.com> -Date: Thu Apr 25 15:01:07 2024 +0200 - - CVE-2024-33600: nscd: Do not send missing not-found response in addgetnetgrentX (bug 31678) - - If we failed to add a not-found response to the cache, the dataset - point can be null, resulting in a null pointer dereference. - - Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org> - (cherry picked from commit 7835b00dbce53c3c87bbbb1754a95fb5e58187aa) - -diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c -index f227dc7fa2..c18fe111f3 100644 ---- a/nscd/netgroupcache.c -+++ b/nscd/netgroupcache.c -@@ -147,7 +147,7 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - /* No such service. */ - cacheable = do_notfound (db, fd, req, key, &dataset, &total, &timeout, - &key_copy); -- goto writeout; -+ goto maybe_cache_add; - } - - memset (&data, '\0', sizeof (data)); -@@ -348,7 +348,7 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - { - cacheable = do_notfound (db, fd, req, key, &dataset, &total, &timeout, - &key_copy); -- goto writeout; -+ goto maybe_cache_add; - } - - total = buffilled; -@@ -410,14 +410,12 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - } - - if (he == NULL && fd != -1) -- { -- /* We write the dataset before inserting it to the database -- since while inserting this thread might block and so would -- unnecessarily let the receiver wait. */ -- writeout: -+ /* We write the dataset before inserting it to the database since -+ while inserting this thread might block and so would -+ unnecessarily let the receiver wait. */ - writeall (fd, &dataset->resp, dataset->head.recsize); -- } - -+ maybe_cache_add: - if (cacheable) - { - /* If necessary, we also propagate the data to disk. */ - -commit c99f886de54446cd4447db6b44be93dabbdc2f8b -Author: Florian Weimer <fweimer@redhat.com> -Date: Thu Apr 25 15:01:07 2024 +0200 - - CVE-2024-33600: nscd: Avoid null pointer crashes after notfound response (bug 31678) - - The addgetnetgrentX call in addinnetgrX may have failed to produce - a result, so the result variable in addinnetgrX can be NULL. - Use db->negtimeout as the fallback value if there is no result data; - the timeout is also overwritten below. - - Also avoid sending a second not-found response. (The client - disconnects after receiving the first response, so the data stream did - not go out of sync even without this fix.) It is still beneficial to - add the negative response to the mapping, so that the client can get - it from there in the future, instead of going through the socket. - - Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org> - (cherry picked from commit b048a482f088e53144d26a61c390bed0210f49f2) - -diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c -index c18fe111f3..e22ffa5884 100644 ---- a/nscd/netgroupcache.c -+++ b/nscd/netgroupcache.c -@@ -511,14 +511,15 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req, - - datahead_init_pos (&dataset->head, sizeof (*dataset) + req->key_len, - sizeof (innetgroup_response_header), -- he == NULL ? 0 : dh->nreloads + 1, result->head.ttl); -+ he == NULL ? 0 : dh->nreloads + 1, -+ result == NULL ? db->negtimeout : result->head.ttl); - /* Set the notfound status and timeout based on the result from - getnetgrent. */ -- dataset->head.notfound = result->head.notfound; -+ dataset->head.notfound = result == NULL || result->head.notfound; - dataset->head.timeout = timeout; - - dataset->resp.version = NSCD_VERSION; -- dataset->resp.found = result->resp.found; -+ dataset->resp.found = result != NULL && result->resp.found; - /* Until we find a matching entry the result is 0. */ - dataset->resp.result = 0; - -@@ -566,7 +567,9 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req, - goto out; - } - -- if (he == NULL) -+ /* addgetnetgrentX may have already sent a notfound response. Do -+ not send another one. */ -+ if (he == NULL && dataset->resp.found) - { - /* We write the dataset before inserting it to the database - since while inserting this thread might block and so would - -commit a9a8d3eebb145779a18d90e3966009a1daa63cd8 -Author: Florian Weimer <fweimer@redhat.com> -Date: Thu Apr 25 15:01:07 2024 +0200 - - CVE-2024-33601, CVE-2024-33602: nscd: netgroup: Use two buffers in addgetnetgrentX (bug 31680) - - This avoids potential memory corruption when the underlying NSS - callback function does not use the buffer space to store all strings - (e.g., for constant strings). - - Instead of custom buffer management, two scratch buffers are used. - This increases stack usage somewhat. - - Scratch buffer allocation failure is handled by return -1 - (an invalid timeout value) instead of terminating the process. - This fixes bug 31679. - - Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org> - (cherry picked from commit c04a21e050d64a1193a6daab872bca2528bda44b) - -diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c -index e22ffa5884..e8fe041846 100644 ---- a/nscd/netgroupcache.c -+++ b/nscd/netgroupcache.c -@@ -23,6 +23,7 @@ - #include <stdlib.h> - #include <unistd.h> - #include <sys/mman.h> -+#include <scratch_buffer.h> - - #include "../nss/netgroup.h" - #include "nscd.h" -@@ -65,6 +66,16 @@ struct dataset - char strdata[0]; - }; - -+/* Send a notfound response to FD. Always returns -1 to indicate an -+ ephemeral error. */ -+static time_t -+send_notfound (int fd) -+{ -+ if (fd != -1) -+ TEMP_FAILURE_RETRY (send (fd, ¬found, sizeof (notfound), MSG_NOSIGNAL)); -+ return -1; -+} -+ - /* Sends a notfound message and prepares a notfound dataset to write to the - cache. Returns true if there was enough memory to allocate the dataset and - returns the dataset in DATASETP, total bytes to write in TOTALP and the -@@ -83,8 +94,7 @@ do_notfound (struct database_dyn *db, int fd, request_header *req, - total = sizeof (notfound); - timeout = time (NULL) + db->negtimeout; - -- if (fd != -1) -- TEMP_FAILURE_RETRY (send (fd, ¬found, total, MSG_NOSIGNAL)); -+ send_notfound (fd); - - dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len, 1); - /* If we cannot permanently store the result, so be it. */ -@@ -109,11 +119,78 @@ do_notfound (struct database_dyn *db, int fd, request_header *req, - return cacheable; - } - -+struct addgetnetgrentX_scratch -+{ -+ /* This is the result that the caller should use. It can be NULL, -+ point into buffer, or it can be in the cache. */ -+ struct dataset *dataset; -+ -+ struct scratch_buffer buffer; -+ -+ /* Used internally in addgetnetgrentX as a staging area. */ -+ struct scratch_buffer tmp; -+ -+ /* Number of bytes in buffer that are actually used. */ -+ size_t buffer_used; -+}; -+ -+static void -+addgetnetgrentX_scratch_init (struct addgetnetgrentX_scratch *scratch) -+{ -+ scratch->dataset = NULL; -+ scratch_buffer_init (&scratch->buffer); -+ scratch_buffer_init (&scratch->tmp); -+ -+ /* Reserve space for the header. */ -+ scratch->buffer_used = sizeof (struct dataset); -+ static_assert (sizeof (struct dataset) < sizeof (scratch->tmp.__space), -+ "initial buffer space"); -+ memset (scratch->tmp.data, 0, sizeof (struct dataset)); -+} -+ -+static void -+addgetnetgrentX_scratch_free (struct addgetnetgrentX_scratch *scratch) -+{ -+ scratch_buffer_free (&scratch->buffer); -+ scratch_buffer_free (&scratch->tmp); -+} -+ -+/* Copy LENGTH bytes from S into SCRATCH. Returns NULL if SCRATCH -+ could not be resized, otherwise a pointer to the copy. */ -+static char * -+addgetnetgrentX_append_n (struct addgetnetgrentX_scratch *scratch, -+ const char *s, size_t length) -+{ -+ while (true) -+ { -+ size_t remaining = scratch->buffer.length - scratch->buffer_used; -+ if (remaining >= length) -+ break; -+ if (!scratch_buffer_grow_preserve (&scratch->buffer)) -+ return NULL; -+ } -+ char *copy = scratch->buffer.data + scratch->buffer_used; -+ memcpy (copy, s, length); -+ scratch->buffer_used += length; -+ return copy; -+} -+ -+/* Copy S into SCRATCH, including its null terminator. Returns false -+ if SCRATCH could not be resized. */ -+static bool -+addgetnetgrentX_append (struct addgetnetgrentX_scratch *scratch, const char *s) -+{ -+ if (s == NULL) -+ s = ""; -+ return addgetnetgrentX_append_n (scratch, s, strlen (s) + 1) != NULL; -+} -+ -+/* Caller must initialize and free *SCRATCH. If the return value is -+ negative, this function has sent a notfound response. */ - static time_t - addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - const char *key, uid_t uid, struct hashentry *he, -- struct datahead *dh, struct dataset **resultp, -- void **tofreep) -+ struct datahead *dh, struct addgetnetgrentX_scratch *scratch) - { - if (__glibc_unlikely (debug_level > 0)) - { -@@ -132,14 +209,10 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - - char *key_copy = NULL; - struct __netgrent data; -- size_t buflen = MAX (1024, sizeof (*dataset) + req->key_len); -- size_t buffilled = sizeof (*dataset); -- char *buffer = NULL; - size_t nentries = 0; - size_t group_len = strlen (key) + 1; - struct name_list *first_needed - = alloca (sizeof (struct name_list) + group_len); -- *tofreep = NULL; - - if (netgroup_database == NULL - && !__nss_database_get (nss_database_netgroup, &netgroup_database)) -@@ -151,8 +224,6 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - } - - memset (&data, '\0', sizeof (data)); -- buffer = xmalloc (buflen); -- *tofreep = buffer; - first_needed->next = first_needed; - memcpy (first_needed->name, key, group_len); - data.needed_groups = first_needed; -@@ -195,8 +266,8 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - while (1) - { - int e; -- status = getfct.f (&data, buffer + buffilled, -- buflen - buffilled - req->key_len, &e); -+ status = getfct.f (&data, scratch->tmp.data, -+ scratch->tmp.length, &e); - if (status == NSS_STATUS_SUCCESS) - { - if (data.type == triple_val) -@@ -204,68 +275,10 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - const char *nhost = data.val.triple.host; - const char *nuser = data.val.triple.user; - const char *ndomain = data.val.triple.domain; -- -- size_t hostlen = strlen (nhost ?: "") + 1; -- size_t userlen = strlen (nuser ?: "") + 1; -- size_t domainlen = strlen (ndomain ?: "") + 1; -- -- if (nhost == NULL || nuser == NULL || ndomain == NULL -- || nhost > nuser || nuser > ndomain) -- { -- const char *last = nhost; -- if (last == NULL -- || (nuser != NULL && nuser > last)) -- last = nuser; -- if (last == NULL -- || (ndomain != NULL && ndomain > last)) -- last = ndomain; -- -- size_t bufused -- = (last == NULL -- ? buffilled -- : last + strlen (last) + 1 - buffer); -- -- /* We have to make temporary copies. */ -- size_t needed = hostlen + userlen + domainlen; -- -- if (buflen - req->key_len - bufused < needed) -- { -- buflen += MAX (buflen, 2 * needed); -- /* Save offset in the old buffer. We don't -- bother with the NULL check here since -- we'll do that later anyway. */ -- size_t nhostdiff = nhost - buffer; -- size_t nuserdiff = nuser - buffer; -- size_t ndomaindiff = ndomain - buffer; -- -- char *newbuf = xrealloc (buffer, buflen); -- /* Fix up the triplet pointers into the new -- buffer. */ -- nhost = (nhost ? newbuf + nhostdiff -- : NULL); -- nuser = (nuser ? newbuf + nuserdiff -- : NULL); -- ndomain = (ndomain ? newbuf + ndomaindiff -- : NULL); -- *tofreep = buffer = newbuf; -- } -- -- nhost = memcpy (buffer + bufused, -- nhost ?: "", hostlen); -- nuser = memcpy ((char *) nhost + hostlen, -- nuser ?: "", userlen); -- ndomain = memcpy ((char *) nuser + userlen, -- ndomain ?: "", domainlen); -- } -- -- char *wp = buffer + buffilled; -- wp = memmove (wp, nhost ?: "", hostlen); -- wp += hostlen; -- wp = memmove (wp, nuser ?: "", userlen); -- wp += userlen; -- wp = memmove (wp, ndomain ?: "", domainlen); -- wp += domainlen; -- buffilled = wp - buffer; -+ if (!(addgetnetgrentX_append (scratch, nhost) -+ && addgetnetgrentX_append (scratch, nuser) -+ && addgetnetgrentX_append (scratch, ndomain))) -+ return send_notfound (fd); - ++nentries; - } - else -@@ -317,8 +330,8 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - } - else if (status == NSS_STATUS_TRYAGAIN && e == ERANGE) - { -- buflen *= 2; -- *tofreep = buffer = xrealloc (buffer, buflen); -+ if (!scratch_buffer_grow (&scratch->tmp)) -+ return send_notfound (fd); - } - else if (status == NSS_STATUS_RETURN - || status == NSS_STATUS_NOTFOUND -@@ -351,10 +364,17 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - goto maybe_cache_add; - } - -- total = buffilled; -+ /* Capture the result size without the key appended. */ -+ total = scratch->buffer_used; -+ -+ /* Make a copy of the key. The scratch buffer must not move after -+ this point. */ -+ key_copy = addgetnetgrentX_append_n (scratch, key, req->key_len); -+ if (key_copy == NULL) -+ return send_notfound (fd); - - /* Fill in the dataset. */ -- dataset = (struct dataset *) buffer; -+ dataset = scratch->buffer.data; - timeout = datahead_init_pos (&dataset->head, total + req->key_len, - total - offsetof (struct dataset, resp), - he == NULL ? 0 : dh->nreloads + 1, -@@ -363,11 +383,7 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - dataset->resp.version = NSCD_VERSION; - dataset->resp.found = 1; - dataset->resp.nresults = nentries; -- dataset->resp.result_len = buffilled - sizeof (*dataset); -- -- assert (buflen - buffilled >= req->key_len); -- key_copy = memcpy (buffer + buffilled, key, req->key_len); -- buffilled += req->key_len; -+ dataset->resp.result_len = total - sizeof (*dataset); - - /* Now we can determine whether on refill we have to create a new - record or not. */ -@@ -398,7 +414,7 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - if (__glibc_likely (newp != NULL)) - { - /* Adjust pointer into the memory block. */ -- key_copy = (char *) newp + (key_copy - buffer); -+ key_copy = (char *) newp + (key_copy - (char *) dataset); - - dataset = memcpy (newp, dataset, total + req->key_len); - cacheable = true; -@@ -439,7 +455,7 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, - } - - out: -- *resultp = dataset; -+ scratch->dataset = dataset; - - return timeout; - } -@@ -460,6 +476,9 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req, - if (user != NULL) - key = strchr (key, '\0') + 1; - const char *domain = *key++ ? key : NULL; -+ struct addgetnetgrentX_scratch scratch; -+ -+ addgetnetgrentX_scratch_init (&scratch); - - if (__glibc_unlikely (debug_level > 0)) - { -@@ -475,12 +494,8 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req, - group, group_len, - db, uid); - time_t timeout; -- void *tofree; - if (result != NULL) -- { -- timeout = result->head.timeout; -- tofree = NULL; -- } -+ timeout = result->head.timeout; - else - { - request_header req_get = -@@ -489,7 +504,10 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req, - .key_len = group_len - }; - timeout = addgetnetgrentX (db, -1, &req_get, group, uid, NULL, NULL, -- &result, &tofree); -+ &scratch); -+ result = scratch.dataset; -+ if (timeout < 0) -+ goto out; - } - - struct indataset -@@ -603,7 +621,7 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req, - } - - out: -- free (tofree); -+ addgetnetgrentX_scratch_free (&scratch); - return timeout; - } - -@@ -613,11 +631,12 @@ addgetnetgrentX_ignore (struct database_dyn *db, int fd, request_header *req, - const char *key, uid_t uid, struct hashentry *he, - struct datahead *dh) - { -- struct dataset *ignore; -- void *tofree; -- time_t timeout = addgetnetgrentX (db, fd, req, key, uid, he, dh, -- &ignore, &tofree); -- free (tofree); -+ struct addgetnetgrentX_scratch scratch; -+ addgetnetgrentX_scratch_init (&scratch); -+ time_t timeout = addgetnetgrentX (db, fd, req, key, uid, he, dh, &scratch); -+ addgetnetgrentX_scratch_free (&scratch); -+ if (timeout < 0) -+ timeout = 0; - return timeout; - } - -@@ -661,5 +680,9 @@ readdinnetgr (struct database_dyn *db, struct hashentry *he, - .key_len = he->len - }; - -- return addinnetgrX (db, -1, &req, db->data + he->key, he->owner, he, dh); -+ int timeout = addinnetgrX (db, -1, &req, db->data + he->key, he->owner, -+ he, dh); -+ if (timeout < 0) -+ timeout = 0; -+ return timeout; - } - -commit fd658f026f25cf59e8db243bc3b3e09cd5a20ba0 -Author: H.J. Lu <hjl.tools@gmail.com> -Date: Thu Apr 25 08:06:52 2024 -0700 - - elf: Also compile dl-misc.os with $(rtld-early-cflags) - - Also compile dl-misc.os with $(rtld-early-cflags) to avoid - - Program received signal SIGILL, Illegal instruction. - 0x00007ffff7fd36ea in _dl_strtoul (nptr=nptr@entry=0x7fffffffe2c9 "2", - endptr=endptr@entry=0x7fffffffd728) at dl-misc.c:156 - 156 bool positive = true; - (gdb) bt - #0 0x00007ffff7fd36ea in _dl_strtoul (nptr=nptr@entry=0x7fffffffe2c9 "2", - endptr=endptr@entry=0x7fffffffd728) at dl-misc.c:156 - #1 0x00007ffff7fdb1a9 in tunable_initialize ( - cur=cur@entry=0x7ffff7ffbc00 <tunable_list+2176>, - strval=strval@entry=0x7fffffffe2c9 "2", len=len@entry=1) - at dl-tunables.c:131 - #2 0x00007ffff7fdb3a2 in parse_tunables (valstring=<optimized out>) - at dl-tunables.c:258 - #3 0x00007ffff7fdb5d9 in __GI___tunables_init (envp=0x7fffffffdd58) - at dl-tunables.c:288 - #4 0x00007ffff7fe44c3 in _dl_sysdep_start ( - start_argptr=start_argptr@entry=0x7fffffffdcb0, - dl_main=dl_main@entry=0x7ffff7fe5f80 <dl_main>) - at ../sysdeps/unix/sysv/linux/dl-sysdep.c:110 - #5 0x00007ffff7fe5cae in _dl_start_final (arg=0x7fffffffdcb0) at rtld.c:494 - #6 _dl_start (arg=0x7fffffffdcb0) at rtld.c:581 - #7 0x00007ffff7fe4b38 in _start () - (gdb) - - when setting GLIBC_TUNABLES in glibc compiled with APX. - Reviewed-by: Florian Weimer <fweimer@redhat.com> - - (cherry picked from commit 049b7684c912dd32b67b1b15b0f43bf07d5f512e) - -diff --git a/elf/Makefile b/elf/Makefile -index 69aa423c4b..a50a988e73 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -170,6 +170,7 @@ CFLAGS-.op += $(call elide-stack-protector,.op,$(elide-routines.os)) - CFLAGS-.os += $(call elide-stack-protector,.os,$(all-rtld-routines)) - - # Add the requested compiler flags to the early startup code. -+CFLAGS-dl-misc.os += $(rtld-early-cflags) - CFLAGS-dl-printf.os += $(rtld-early-cflags) - CFLAGS-dl-setup_hash.os += $(rtld-early-cflags) - CFLAGS-dl-sysdep.os += $(rtld-early-cflags) - -commit 9831f98c266a8d56d1bf729b709c08e40375540c -Author: Florian Weimer <fweimer@redhat.com> -Date: Fri Apr 19 14:38:17 2024 +0200 - - login: Check default sizes of structs utmp, utmpx, lastlog - - The default <utmp-size.h> is for ports with a 64-bit time_t. - Ports with a 32-bit time_t or with __WORDSIZE_TIME64_COMPAT32=1 - need to override it. - - Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> - (cherry picked from commit 4d4da5aab936504b2d3eca3146e109630d9093c4) - -diff --git a/login/Makefile b/login/Makefile -index 1e22008a61..b26ac42bfc 100644 ---- a/login/Makefile -+++ b/login/Makefile -@@ -44,7 +44,7 @@ subdir-dirs = programs - vpath %.c programs - - tests := tst-utmp tst-utmpx tst-grantpt tst-ptsname tst-getlogin tst-updwtmpx \ -- tst-pututxline-lockfail tst-pututxline-cache -+ tst-pututxline-lockfail tst-pututxline-cache tst-utmp-size - - # Empty compatibility library for old binaries. - extra-libs := libutil -diff --git a/login/tst-utmp-size.c b/login/tst-utmp-size.c -new file mode 100644 -index 0000000000..1b7f7ff042 ---- /dev/null -+++ b/login/tst-utmp-size.c -@@ -0,0 +1,33 @@ -+/* Check expected sizes of struct utmp, struct utmpx, struct lastlog. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <utmp.h> -+#include <utmpx.h> -+#include <utmp-size.h> -+ -+static int -+do_test (void) -+{ -+ _Static_assert (sizeof (struct utmp) == UTMP_SIZE, "struct utmp size"); -+ _Static_assert (sizeof (struct utmpx) == UTMP_SIZE, "struct utmpx size"); -+ _Static_assert (sizeof (struct lastlog) == LASTLOG_SIZE, -+ "struct lastlog size"); -+ return 0; -+} -+ -+#include <support/test-driver.c> -diff --git a/sysdeps/arc/utmp-size.h b/sysdeps/arc/utmp-size.h -new file mode 100644 -index 0000000000..a247fcd3da ---- /dev/null -+++ b/sysdeps/arc/utmp-size.h -@@ -0,0 +1,3 @@ -+/* arc has less padding than other architectures with 64-bit time_t. */ -+#define UTMP_SIZE 392 -+#define LASTLOG_SIZE 296 -diff --git a/sysdeps/arm/utmp-size.h b/sysdeps/arm/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/arm/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/csky/utmp-size.h b/sysdeps/csky/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/csky/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/generic/utmp-size.h b/sysdeps/generic/utmp-size.h -new file mode 100644 -index 0000000000..89dbe878b0 ---- /dev/null -+++ b/sysdeps/generic/utmp-size.h -@@ -0,0 +1,23 @@ -+/* Expected sizes of utmp-related structures stored in files. 64-bit version. -+ Copyright (C) 2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+/* Expected size, in bytes, of struct utmp and struct utmpx. */ -+#define UTMP_SIZE 400 -+ -+/* Expected size, in bytes, of struct lastlog. */ -+#define LASTLOG_SIZE 296 -diff --git a/sysdeps/hppa/utmp-size.h b/sysdeps/hppa/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/hppa/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/m68k/utmp-size.h b/sysdeps/m68k/utmp-size.h -new file mode 100644 -index 0000000000..5946685819 ---- /dev/null -+++ b/sysdeps/m68k/utmp-size.h -@@ -0,0 +1,3 @@ -+/* m68k has 2-byte alignment. */ -+#define UTMP_SIZE 382 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/microblaze/utmp-size.h b/sysdeps/microblaze/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/microblaze/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/mips/utmp-size.h b/sysdeps/mips/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/mips/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/nios2/utmp-size.h b/sysdeps/nios2/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/nios2/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/or1k/utmp-size.h b/sysdeps/or1k/utmp-size.h -new file mode 100644 -index 0000000000..6b3653aa4d ---- /dev/null -+++ b/sysdeps/or1k/utmp-size.h -@@ -0,0 +1,3 @@ -+/* or1k has less padding than other architectures with 64-bit time_t. */ -+#define UTMP_SIZE 392 -+#define LASTLOG_SIZE 296 -diff --git a/sysdeps/powerpc/utmp-size.h b/sysdeps/powerpc/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/powerpc/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/riscv/utmp-size.h b/sysdeps/riscv/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/riscv/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/sh/utmp-size.h b/sysdeps/sh/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/sh/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/sparc/utmp-size.h b/sysdeps/sparc/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/sparc/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 -diff --git a/sysdeps/x86/utmp-size.h b/sysdeps/x86/utmp-size.h -new file mode 100644 -index 0000000000..8f21ebe1b6 ---- /dev/null -+++ b/sysdeps/x86/utmp-size.h -@@ -0,0 +1,2 @@ -+#define UTMP_SIZE 384 -+#define LASTLOG_SIZE 292 - -commit 836d43b98973e0845b739ff5d3aad3af09dc7d0f -Author: Florian Weimer <fweimer@redhat.com> -Date: Fri Apr 19 14:38:17 2024 +0200 - - login: structs utmp, utmpx, lastlog _TIME_BITS independence (bug 30701) - - These structs describe file formats under /var/log, and should not - depend on the definition of _TIME_BITS. This is achieved by - defining __WORDSIZE_TIME64_COMPAT32 to 1 on 32-bit ports that - support 32-bit time_t values (where __time_t is 32 bits). - - Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> - (cherry picked from commit 9abdae94c7454c45e02e97e4ed1eb1b1915d13d8) - -diff --git a/bits/wordsize.h b/bits/wordsize.h -index 14edae3a11..53013a9275 100644 ---- a/bits/wordsize.h -+++ b/bits/wordsize.h -@@ -21,7 +21,9 @@ - #define __WORDSIZE32_PTRDIFF_LONG - - /* Set to 1 in order to force time types to be 32 bits instead of 64 bits in -- struct lastlog and struct utmp{,x} on 64-bit ports. This may be done in -+ struct lastlog and struct utmp{,x}. This may be done in - order to make 64-bit ports compatible with 32-bit ports. Set to 0 for -- 64-bit ports where the time types are 64-bits or for any 32-bit ports. */ -+ 64-bit ports where the time types are 64-bits and new 32-bit ports -+ where time_t is 64 bits, and there is no companion architecture with -+ 32-bit time_t. */ - #define __WORDSIZE_TIME64_COMPAT32 -diff --git a/login/Makefile b/login/Makefile -index b26ac42bfc..f91190e3dc 100644 ---- a/login/Makefile -+++ b/login/Makefile -@@ -44,7 +44,9 @@ subdir-dirs = programs - vpath %.c programs - - tests := tst-utmp tst-utmpx tst-grantpt tst-ptsname tst-getlogin tst-updwtmpx \ -- tst-pututxline-lockfail tst-pututxline-cache tst-utmp-size -+ tst-pututxline-lockfail tst-pututxline-cache tst-utmp-size tst-utmp-size-64 -+ -+CFLAGS-tst-utmp-size-64.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 - - # Empty compatibility library for old binaries. - extra-libs := libutil -diff --git a/login/tst-utmp-size-64.c b/login/tst-utmp-size-64.c -new file mode 100644 -index 0000000000..7a581a4c12 ---- /dev/null -+++ b/login/tst-utmp-size-64.c -@@ -0,0 +1,2 @@ -+/* The on-disk layout must not change in time64 mode. */ -+#include "tst-utmp-size.c" -diff --git a/sysdeps/arm/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h -new file mode 100644 -index 0000000000..6ecbfe7c86 ---- /dev/null -+++ b/sysdeps/arm/bits/wordsize.h -@@ -0,0 +1,21 @@ -+/* Copyright (C) 1999-2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#define __WORDSIZE 32 -+#define __WORDSIZE_TIME64_COMPAT32 1 -+#define __WORDSIZE32_SIZE_ULONG 0 -+#define __WORDSIZE32_PTRDIFF_LONG 0 -diff --git a/sysdeps/csky/bits/wordsize.h b/sysdeps/csky/bits/wordsize.h -new file mode 100644 -index 0000000000..6ecbfe7c86 ---- /dev/null -+++ b/sysdeps/csky/bits/wordsize.h -@@ -0,0 +1,21 @@ -+/* Copyright (C) 1999-2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#define __WORDSIZE 32 -+#define __WORDSIZE_TIME64_COMPAT32 1 -+#define __WORDSIZE32_SIZE_ULONG 0 -+#define __WORDSIZE32_PTRDIFF_LONG 0 -diff --git a/sysdeps/m68k/bits/wordsize.h b/sysdeps/m68k/bits/wordsize.h -new file mode 100644 -index 0000000000..6ecbfe7c86 ---- /dev/null -+++ b/sysdeps/m68k/bits/wordsize.h -@@ -0,0 +1,21 @@ -+/* Copyright (C) 1999-2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#define __WORDSIZE 32 -+#define __WORDSIZE_TIME64_COMPAT32 1 -+#define __WORDSIZE32_SIZE_ULONG 0 -+#define __WORDSIZE32_PTRDIFF_LONG 0 -diff --git a/sysdeps/microblaze/bits/wordsize.h b/sysdeps/microblaze/bits/wordsize.h -new file mode 100644 -index 0000000000..6ecbfe7c86 ---- /dev/null -+++ b/sysdeps/microblaze/bits/wordsize.h -@@ -0,0 +1,21 @@ -+/* Copyright (C) 1999-2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#define __WORDSIZE 32 -+#define __WORDSIZE_TIME64_COMPAT32 1 -+#define __WORDSIZE32_SIZE_ULONG 0 -+#define __WORDSIZE32_PTRDIFF_LONG 0 -diff --git a/sysdeps/mips/bits/wordsize.h b/sysdeps/mips/bits/wordsize.h -index 57f0f2a22f..30dd3fd85d 100644 ---- a/sysdeps/mips/bits/wordsize.h -+++ b/sysdeps/mips/bits/wordsize.h -@@ -19,11 +19,7 @@ - - #define __WORDSIZE _MIPS_SZPTR - --#if _MIPS_SIM == _ABI64 --# define __WORDSIZE_TIME64_COMPAT32 1 --#else --# define __WORDSIZE_TIME64_COMPAT32 0 --#endif -+#define __WORDSIZE_TIME64_COMPAT32 1 - - #if __WORDSIZE == 32 - #define __WORDSIZE32_SIZE_ULONG 0 -diff --git a/sysdeps/nios2/bits/wordsize.h b/sysdeps/nios2/bits/wordsize.h -new file mode 100644 -index 0000000000..6ecbfe7c86 ---- /dev/null -+++ b/sysdeps/nios2/bits/wordsize.h -@@ -0,0 +1,21 @@ -+/* Copyright (C) 1999-2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#define __WORDSIZE 32 -+#define __WORDSIZE_TIME64_COMPAT32 1 -+#define __WORDSIZE32_SIZE_ULONG 0 -+#define __WORDSIZE32_PTRDIFF_LONG 0 -diff --git a/sysdeps/powerpc/powerpc32/bits/wordsize.h b/sysdeps/powerpc/powerpc32/bits/wordsize.h -index 04ca9debf0..6993fb6b29 100644 ---- a/sysdeps/powerpc/powerpc32/bits/wordsize.h -+++ b/sysdeps/powerpc/powerpc32/bits/wordsize.h -@@ -2,10 +2,9 @@ - - #if defined __powerpc64__ - # define __WORDSIZE 64 --# define __WORDSIZE_TIME64_COMPAT32 1 - #else - # define __WORDSIZE 32 --# define __WORDSIZE_TIME64_COMPAT32 0 - # define __WORDSIZE32_SIZE_ULONG 0 - # define __WORDSIZE32_PTRDIFF_LONG 0 - #endif -+#define __WORDSIZE_TIME64_COMPAT32 1 -diff --git a/sysdeps/powerpc/powerpc64/bits/wordsize.h b/sysdeps/powerpc/powerpc64/bits/wordsize.h -index 04ca9debf0..6993fb6b29 100644 ---- a/sysdeps/powerpc/powerpc64/bits/wordsize.h -+++ b/sysdeps/powerpc/powerpc64/bits/wordsize.h -@@ -2,10 +2,9 @@ - - #if defined __powerpc64__ - # define __WORDSIZE 64 --# define __WORDSIZE_TIME64_COMPAT32 1 - #else - # define __WORDSIZE 32 --# define __WORDSIZE_TIME64_COMPAT32 0 - # define __WORDSIZE32_SIZE_ULONG 0 - # define __WORDSIZE32_PTRDIFF_LONG 0 - #endif -+#define __WORDSIZE_TIME64_COMPAT32 1 -diff --git a/sysdeps/sh/bits/wordsize.h b/sysdeps/sh/bits/wordsize.h -new file mode 100644 -index 0000000000..6ecbfe7c86 ---- /dev/null -+++ b/sysdeps/sh/bits/wordsize.h -@@ -0,0 +1,21 @@ -+/* Copyright (C) 1999-2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#define __WORDSIZE 32 -+#define __WORDSIZE_TIME64_COMPAT32 1 -+#define __WORDSIZE32_SIZE_ULONG 0 -+#define __WORDSIZE32_PTRDIFF_LONG 0 -diff --git a/sysdeps/sparc/sparc32/bits/wordsize.h b/sysdeps/sparc/sparc32/bits/wordsize.h -index 4bbd2e63b4..a2e79e0fa9 100644 ---- a/sysdeps/sparc/sparc32/bits/wordsize.h -+++ b/sysdeps/sparc/sparc32/bits/wordsize.h -@@ -1,6 +1,6 @@ - /* Determine the wordsize from the preprocessor defines. */ - - #define __WORDSIZE 32 --#define __WORDSIZE_TIME64_COMPAT32 0 -+#define __WORDSIZE_TIME64_COMPAT32 1 - #define __WORDSIZE32_SIZE_ULONG 0 - #define __WORDSIZE32_PTRDIFF_LONG 0 -diff --git a/sysdeps/sparc/sparc64/bits/wordsize.h b/sysdeps/sparc/sparc64/bits/wordsize.h -index 2f66f10d72..ea103e5970 100644 ---- a/sysdeps/sparc/sparc64/bits/wordsize.h -+++ b/sysdeps/sparc/sparc64/bits/wordsize.h -@@ -2,10 +2,9 @@ - - #if defined __arch64__ || defined __sparcv9 - # define __WORDSIZE 64 --# define __WORDSIZE_TIME64_COMPAT32 1 - #else - # define __WORDSIZE 32 --# define __WORDSIZE_TIME64_COMPAT32 0 - # define __WORDSIZE32_SIZE_ULONG 0 - # define __WORDSIZE32_PTRDIFF_LONG 0 - #endif -+#define __WORDSIZE_TIME64_COMPAT32 1 -diff --git a/sysdeps/unix/sysv/linux/hppa/bits/wordsize.h b/sysdeps/unix/sysv/linux/hppa/bits/wordsize.h -new file mode 100644 -index 0000000000..6ecbfe7c86 ---- /dev/null -+++ b/sysdeps/unix/sysv/linux/hppa/bits/wordsize.h -@@ -0,0 +1,21 @@ -+/* Copyright (C) 1999-2024 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#define __WORDSIZE 32 -+#define __WORDSIZE_TIME64_COMPAT32 1 -+#define __WORDSIZE32_SIZE_ULONG 0 -+#define __WORDSIZE32_PTRDIFF_LONG 0 -diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h b/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h -index 04ca9debf0..6993fb6b29 100644 ---- a/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h -+++ b/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h -@@ -2,10 +2,9 @@ - - #if defined __powerpc64__ - # define __WORDSIZE 64 --# define __WORDSIZE_TIME64_COMPAT32 1 - #else - # define __WORDSIZE 32 --# define __WORDSIZE_TIME64_COMPAT32 0 - # define __WORDSIZE32_SIZE_ULONG 0 - # define __WORDSIZE32_PTRDIFF_LONG 0 - #endif -+#define __WORDSIZE_TIME64_COMPAT32 1 -diff --git a/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h b/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h -index 7562875ee2..ea103e5970 100644 ---- a/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h -+++ b/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h -@@ -2,10 +2,9 @@ - - #if defined __arch64__ || defined __sparcv9 - # define __WORDSIZE 64 --# define __WORDSIZE_TIME64_COMPAT32 1 - #else - # define __WORDSIZE 32 - # define __WORDSIZE32_SIZE_ULONG 0 - # define __WORDSIZE32_PTRDIFF_LONG 0 --# define __WORDSIZE_TIME64_COMPAT32 0 - #endif -+#define __WORDSIZE_TIME64_COMPAT32 1 -diff --git a/sysdeps/x86/bits/wordsize.h b/sysdeps/x86/bits/wordsize.h -index 70f652bca1..3f40aa76f9 100644 ---- a/sysdeps/x86/bits/wordsize.h -+++ b/sysdeps/x86/bits/wordsize.h -@@ -8,10 +8,9 @@ - #define __WORDSIZE32_PTRDIFF_LONG 0 - #endif - -+#define __WORDSIZE_TIME64_COMPAT32 1 -+ - #ifdef __x86_64__ --# define __WORDSIZE_TIME64_COMPAT32 1 - /* Both x86-64 and x32 use the 64-bit system call interface. */ - # define __SYSCALL_WORDSIZE 64 --#else --# define __WORDSIZE_TIME64_COMPAT32 0 - #endif - -commit acc56074b0a5127631a64640aef1b7c5c103ebd8 -Author: Florian Weimer <fweimer@redhat.com> -Date: Thu May 2 17:06:19 2024 +0200 - - nscd: Use time_t for return type of addgetnetgrentX - - Using int may give false results for future dates (timeouts after the - year 2028). - - Fixes commit 04a21e050d64a1193a6daab872bca2528bda44b ("CVE-2024-33601, - CVE-2024-33602: nscd: netgroup: Use two buffers in addgetnetgrentX - (bug 31680)"). - - Reviewed-by: Carlos O'Donell <carlos@redhat.com> - (cherry picked from commit 4bbca1a44691a6e9adcee5c6798a707b626bc331) - -diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c -index e8fe041846..01d554af9c 100644 ---- a/nscd/netgroupcache.c -+++ b/nscd/netgroupcache.c -@@ -680,8 +680,8 @@ readdinnetgr (struct database_dyn *db, struct hashentry *he, - .key_len = he->len - }; - -- int timeout = addinnetgrX (db, -1, &req, db->data + he->key, he->owner, -- he, dh); -+ time_t timeout = addinnetgrX (db, -1, &req, db->data + he->key, he->owner, -+ he, dh); - if (timeout < 0) - timeout = 0; - return timeout; - -commit 273a835fe7c685cc54266bb8b502787bad5e9bae -Author: Carlos O'Donell <carlos@redhat.com> -Date: Tue Apr 23 13:30:37 2024 -0400 - - time: Allow later version licensing. - - The FSF's Licensing and Compliance Lab noted a discrepancy in the - licensing of several files in the glibc package. - - When timespect_get.c was impelemented the license did not include - the standard ", or (at your option) any later version." text. - - Change the license in timespec_get.c and all copied files to match - the expected license. - - This change was previously approved in principle by the FSF in - RT ticket #1316403. And a similar instance was fixed in - commit 46703efa02f6ddebce5ee54c92f7c32598de0de6. - - (cherry picked from commit 91695ee4598b39d181ab8df579b888a8863c4cab) - -diff --git a/sysdeps/unix/sysv/linux/timespec_get.c b/sysdeps/unix/sysv/linux/timespec_get.c -index c6e5e66289..778d1e3354 100644 ---- a/sysdeps/unix/sysv/linux/timespec_get.c -+++ b/sysdeps/unix/sysv/linux/timespec_get.c -@@ -5,7 +5,7 @@ - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either -- version 2.1 of the License. -+ version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -diff --git a/sysdeps/unix/sysv/linux/timespec_getres.c b/sysdeps/unix/sysv/linux/timespec_getres.c -index 5acebe2a2c..2eef9e512c 100644 ---- a/sysdeps/unix/sysv/linux/timespec_getres.c -+++ b/sysdeps/unix/sysv/linux/timespec_getres.c -@@ -5,7 +5,7 @@ - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either -- version 2.1 of the License. -+ version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -diff --git a/time/timespec_get.c b/time/timespec_get.c -index b031e42ca2..26a044bca6 100644 ---- a/time/timespec_get.c -+++ b/time/timespec_get.c -@@ -4,7 +4,7 @@ - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either -- version 2.1 of the License. -+ version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -diff --git a/time/timespec_getres.c b/time/timespec_getres.c -index edb397507c..2e18b8bcac 100644 ---- a/time/timespec_getres.c -+++ b/time/timespec_getres.c -@@ -5,7 +5,7 @@ - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either -- version 2.1 of the License. -+ version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - -commit 3148714ab61ad61281bae5a30f530d637034ac3b -Author: Gabi Falk <gabifalk@gmx.com> -Date: Tue Apr 30 20:05:02 2024 +0000 - - i586: Fix multiple definitions of __memcpy_chk and __mempcpy_chk - - /home/bmg/install/compilers/x86_64-linux-gnu/lib/gcc/x86_64-glibc-linux-gnu/13.2.1/../../../../x86_64-glibc-linux-gnu/bin/ld: /home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(memcpy_chk.o): in function `__memcpy_chk': - /home/bmg/src/glibc/debug/../sysdeps/i386/memcpy_chk.S:29: multiple definition of `__memcpy_chk';/home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(memcpy.o):/home/bmg/src/glibc/string/../sysdeps/i386/i586/memcpy.S:31: first defined here /home/bmg/install/compilers/x86_64-linux-gnu/lib/gcc/x86_64-glibc-linux-gnu/13.2.1/../../../../x86_64-glibc-linux-gnu/bin/ld: /home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(mempcpy_chk.o): in function `__mempcpy_chk': /home/bmg/src/glibc/debug/../sysdeps/i386/mempcpy_chk.S:28: multiple definition of `__mempcpy_chk'; /home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(mempcpy.o):/home/bmg/src/glibc/string/../sysdeps/i386/i586/memcpy.S:31: first defined here - - After this change, the static library built for i586, regardless of PIC - options, contains implementations of these functions respectively from - sysdeps/i386/memcpy_chk.S and sysdeps/i386/mempcpy_chk.S. This ensures - that memcpy and mempcpy won't pull in __chk_fail and the routines it - calls. - - Reported-by: Florian Weimer <fweimer@redhat.com> - Signed-off-by: Gabi Falk <gabifalk@gmx.com> - Reviewed-by: H.J. Lu <hjl.tools@gmail.com> - Reviewed-by: Dmitry V. Levin <ldv@altlinux.org> - (cherry picked from commit 789894a2f554d4503ecb2f13b2b4e93e43414f33) - -diff --git a/sysdeps/i386/i586/memcpy.S b/sysdeps/i386/i586/memcpy.S -index 3e26f112d6..79856d498a 100644 ---- a/sysdeps/i386/i586/memcpy.S -+++ b/sysdeps/i386/i586/memcpy.S -@@ -26,7 +26,7 @@ - #define LEN SRC+4 - - .text --#if defined PIC && IS_IN (libc) -+#if defined SHARED && IS_IN (libc) - ENTRY (__memcpy_chk) - movl 12(%esp), %eax - cmpl %eax, 16(%esp) - -commit ad92c483a4bd34db1cfb3eb625212ea64848244f -Author: Gabi Falk <gabifalk@gmx.com> -Date: Tue Apr 30 20:05:03 2024 +0000 - - i686: Fix multiple definitions of __memmove_chk and __memset_chk - - Commit c73c96a4a1af1326df7f96eec58209e1e04066d8 updated memcpy.S and - mempcpy.S, but omitted memmove.S and memset.S. As a result, the static - library built as PIC, whether with or without multiarch support, - contains two definitions for each of the __memmove_chk and __memset_chk - symbols. - - /usr/lib/gcc/i686-pc-linux-gnu/14/../../../../i686-pc-linux-gnu/bin/ld: /usr/lib/gcc/i686-pc-linux-gnu/14/../../../../lib/libc.a(memset-ia32.o): in function `__memset_chk': - /var/tmp/portage/sys-libs/glibc-2.39-r3/work/glibc-2.39/string/../sysdeps/i386/i686/memset.S:32: multiple definition of `__memset_chk'; /usr/lib/gcc/i686-pc-linux-gnu/14/../../../../lib/libc.a(memset_chk.o):/var/tmp/portage/sys-libs/glibc-2.39-r3/work/glibc-2.39/debug/../sysdeps/i386/i686/multiarch/memset_chk.c:24: first defined here - - After this change, regardless of PIC options, the static library, built - for i686 with multiarch contains implementations of these functions - respectively from debug/memmove_chk.c and debug/memset_chk.c, and - without multiarch contains implementations of these functions - respectively from sysdeps/i386/memmove_chk.S and - sysdeps/i386/memset_chk.S. This ensures that memmove and memset won't - pull in __chk_fail and the routines it calls. - - Reported-by: Sam James <sam@gentoo.org> - Tested-by: Sam James <sam@gentoo.org> - Fixes: c73c96a4a1 ("i686: Fix build with --disable-multiarch") - Signed-off-by: Gabi Falk <gabifalk@gmx.com> - Reviewed-by: H.J. Lu <hjl.tools@gmail.com> - Reviewed-by: Dmitry V. Levin <ldv@altlinux.org> - (cherry picked from commit 5a2cf833f5772d6c37c7adac388dd9af9cc1c4b9) - -diff --git a/sysdeps/i386/i686/memmove.S b/sysdeps/i386/i686/memmove.S -index f230359ad6..effd958120 100644 ---- a/sysdeps/i386/i686/memmove.S -+++ b/sysdeps/i386/i686/memmove.S -@@ -29,7 +29,7 @@ - #define SRC DEST+4 - #define LEN SRC+4 - --#if defined PIC && IS_IN (libc) -+#if defined SHARED && IS_IN (libc) - ENTRY_CHK (__memmove_chk) - movl 12(%esp), %eax - cmpl %eax, 16(%esp) -diff --git a/sysdeps/i386/i686/memset.S b/sysdeps/i386/i686/memset.S -index f02f5a6df7..ab06771ea0 100644 ---- a/sysdeps/i386/i686/memset.S -+++ b/sysdeps/i386/i686/memset.S -@@ -27,7 +27,7 @@ - #define LEN CHR+4 - - .text --#if defined PIC && IS_IN (libc) -+#if defined SHARED && IS_IN (libc) - ENTRY_CHK (__memset_chk) - movl 12(%esp), %eax - cmpl %eax, 16(%esp) - -commit ff110b2591f0bdeccd121c3726af19c62d6fb184 -Author: Gabi Falk <gabifalk@gmx.com> -Date: Tue Apr 30 20:05:04 2024 +0000 - - Add a test to check for duplicate definitions in the static library - - This change follows two previous fixes addressing multiple definitions - of __memcpy_chk and __mempcpy_chk functions on i586, and __memmove_chk - and __memset_chk functions on i686. The test is intended to prevent - such issues from occurring in the future. - - Signed-off-by: Gabi Falk <gabifalk@gmx.com> - Reviewed-by: H.J. Lu <hjl.tools@gmail.com> - Reviewed-by: Dmitry V. Levin <ldv@altlinux.org> - (cherry picked from commit ded2e0753e9c46debeb2e0d26c5e560d2581d314) - -diff --git a/Makefile b/Makefile -index 7052b46df8..2e351c0321 100644 ---- a/Makefile -+++ b/Makefile -@@ -577,6 +577,13 @@ $(objpfx)lint-makefiles.out: scripts/lint-makefiles.sh - $(SHELL) $< "$(PYTHON)" `pwd` > $@ ; \ - $(evaluate-test) - -+# Link libc.a as a whole to verify that it does not contain multiple -+# definitions of any symbols. -+tests-special += $(objpfx)link-static-libc.out -+$(objpfx)link-static-libc.out: -+ $(LINK.o) $(whole-archive) -r $(objpfx)libc.a -o /dev/null > $@ 2>&1; \ -+ $(evaluate-test) -+ - # Print test summary for tests in $1 .sum file; - # $2 is optional test identifier. - # Fail if there are unexpected failures in the test results. - -commit fa616ea3730cb42046d19f28d611be0bc390af7c -Author: Sam James <sam@gentoo.org> -Date: Sat May 4 13:28:13 2024 +0100 - - Revert "Add a test to check for duplicate definitions in the static library" - - This reverts commit ff110b2591f0bdeccd121c3726af19c62d6fb184. - - I had the wrong cherry-pick reference (the commit content is right; it's - just referring to a base that isn't upstream), but let's revert and reapply - for clarity. - - Signed-off-by: Sam James <sam@gentoo.org> - -diff --git a/Makefile b/Makefile -index 2e351c0321..7052b46df8 100644 ---- a/Makefile -+++ b/Makefile -@@ -577,13 +577,6 @@ $(objpfx)lint-makefiles.out: scripts/lint-makefiles.sh - $(SHELL) $< "$(PYTHON)" `pwd` > $@ ; \ - $(evaluate-test) - --# Link libc.a as a whole to verify that it does not contain multiple --# definitions of any symbols. --tests-special += $(objpfx)link-static-libc.out --$(objpfx)link-static-libc.out: -- $(LINK.o) $(whole-archive) -r $(objpfx)libc.a -o /dev/null > $@ 2>&1; \ -- $(evaluate-test) -- - # Print test summary for tests in $1 .sum file; - # $2 is optional test identifier. - # Fail if there are unexpected failures in the test results. - -commit c16871e662cd0f3370173d916864b19e69f1bc9a -Author: Sam James <sam@gentoo.org> -Date: Sat May 4 13:28:51 2024 +0100 - - Revert "i686: Fix multiple definitions of __memmove_chk and __memset_chk" - - This reverts commit ad92c483a4bd34db1cfb3eb625212ea64848244f. - - I had the wrong cherry-pick reference (the commit content is right; it's - just referring to a base that isn't upstream), but let's revert and reapply - for clarity. - - Signed-off-by: Sam James <sam@gentoo.org> - -diff --git a/sysdeps/i386/i686/memmove.S b/sysdeps/i386/i686/memmove.S -index effd958120..f230359ad6 100644 ---- a/sysdeps/i386/i686/memmove.S -+++ b/sysdeps/i386/i686/memmove.S -@@ -29,7 +29,7 @@ - #define SRC DEST+4 - #define LEN SRC+4 - --#if defined SHARED && IS_IN (libc) -+#if defined PIC && IS_IN (libc) - ENTRY_CHK (__memmove_chk) - movl 12(%esp), %eax - cmpl %eax, 16(%esp) -diff --git a/sysdeps/i386/i686/memset.S b/sysdeps/i386/i686/memset.S -index ab06771ea0..f02f5a6df7 100644 ---- a/sysdeps/i386/i686/memset.S -+++ b/sysdeps/i386/i686/memset.S -@@ -27,7 +27,7 @@ - #define LEN CHR+4 - - .text --#if defined SHARED && IS_IN (libc) -+#if defined PIC && IS_IN (libc) - ENTRY_CHK (__memset_chk) - movl 12(%esp), %eax - cmpl %eax, 16(%esp) - -commit 5141d4d83c17406f0eaea3e345ef2b52e10f386e -Author: Sam James <sam@gentoo.org> -Date: Sat May 4 13:28:54 2024 +0100 - - Revert "i586: Fix multiple definitions of __memcpy_chk and __mempcpy_chk" - - This reverts commit 3148714ab61ad61281bae5a30f530d637034ac3b. - - I had the wrong cherry-pick reference (the commit content is right; it's - just referring to a base that isn't upstream), but let's revert and reapply - for clarity. - - Signed-off-by: Sam James <sam@gentoo.org> - -diff --git a/sysdeps/i386/i586/memcpy.S b/sysdeps/i386/i586/memcpy.S -index 79856d498a..3e26f112d6 100644 ---- a/sysdeps/i386/i586/memcpy.S -+++ b/sysdeps/i386/i586/memcpy.S -@@ -26,7 +26,7 @@ - #define LEN SRC+4 - - .text --#if defined SHARED && IS_IN (libc) -+#if defined PIC && IS_IN (libc) - ENTRY (__memcpy_chk) - movl 12(%esp), %eax - cmpl %eax, 16(%esp) - -commit 8323a83abd73446dc434aceff66219712c09140b -Author: Gabi Falk <gabifalk@gmx.com> -Date: Tue Apr 30 20:05:02 2024 +0000 - - i586: Fix multiple definitions of __memcpy_chk and __mempcpy_chk - - /home/bmg/install/compilers/x86_64-linux-gnu/lib/gcc/x86_64-glibc-linux-gnu/13.2.1/../../../../x86_64-glibc-linux-gnu/bin/ld: /home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(memcpy_chk.o): in function `__memcpy_chk': - /home/bmg/src/glibc/debug/../sysdeps/i386/memcpy_chk.S:29: multiple definition of `__memcpy_chk';/home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(memcpy.o):/home/bmg/src/glibc/string/../sysdeps/i386/i586/memcpy.S:31: first defined here /home/bmg/install/compilers/x86_64-linux-gnu/lib/gcc/x86_64-glibc-linux-gnu/13.2.1/../../../../x86_64-glibc-linux-gnu/bin/ld: /home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(mempcpy_chk.o): in function `__mempcpy_chk': /home/bmg/src/glibc/debug/../sysdeps/i386/mempcpy_chk.S:28: multiple definition of `__mempcpy_chk'; /home/bmg/build/glibcs/i586-linux-gnu/glibc/libc.a(mempcpy.o):/home/bmg/src/glibc/string/../sysdeps/i386/i586/memcpy.S:31: first defined here - - After this change, the static library built for i586, regardless of PIC - options, contains implementations of these functions respectively from - sysdeps/i386/memcpy_chk.S and sysdeps/i386/mempcpy_chk.S. This ensures - that memcpy and mempcpy won't pull in __chk_fail and the routines it - calls. - - Reported-by: Florian Weimer <fweimer@redhat.com> - Signed-off-by: Gabi Falk <gabifalk@gmx.com> - Reviewed-by: H.J. Lu <hjl.tools@gmail.com> - Reviewed-by: Dmitry V. Levin <ldv@altlinux.org> - (cherry picked from commit 0fdf4ba48ccce5abf567340b0ab8fa8ed8a9bc6e) - -diff --git a/sysdeps/i386/i586/memcpy.S b/sysdeps/i386/i586/memcpy.S -index 3e26f112d6..79856d498a 100644 ---- a/sysdeps/i386/i586/memcpy.S -+++ b/sysdeps/i386/i586/memcpy.S -@@ -26,7 +26,7 @@ - #define LEN SRC+4 - - .text --#if defined PIC && IS_IN (libc) -+#if defined SHARED && IS_IN (libc) - ENTRY (__memcpy_chk) - movl 12(%esp), %eax - cmpl %eax, 16(%esp) - -commit 8b005d7869debac4d5cd67f65e49a0fad89da9ad -Author: Gabi Falk <gabifalk@gmx.com> -Date: Tue Apr 30 20:05:03 2024 +0000 - - i686: Fix multiple definitions of __memmove_chk and __memset_chk - - Commit c73c96a4a1af1326df7f96eec58209e1e04066d8 updated memcpy.S and - mempcpy.S, but omitted memmove.S and memset.S. As a result, the static - library built as PIC, whether with or without multiarch support, - contains two definitions for each of the __memmove_chk and __memset_chk - symbols. - - /usr/lib/gcc/i686-pc-linux-gnu/14/../../../../i686-pc-linux-gnu/bin/ld: /usr/lib/gcc/i686-pc-linux-gnu/14/../../../../lib/libc.a(memset-ia32.o): in function `__memset_chk': - /var/tmp/portage/sys-libs/glibc-2.39-r3/work/glibc-2.39/string/../sysdeps/i386/i686/memset.S:32: multiple definition of `__memset_chk'; /usr/lib/gcc/i686-pc-linux-gnu/14/../../../../lib/libc.a(memset_chk.o):/var/tmp/portage/sys-libs/glibc-2.39-r3/work/glibc-2.39/debug/../sysdeps/i386/i686/multiarch/memset_chk.c:24: first defined here - - After this change, regardless of PIC options, the static library, built - for i686 with multiarch contains implementations of these functions - respectively from debug/memmove_chk.c and debug/memset_chk.c, and - without multiarch contains implementations of these functions - respectively from sysdeps/i386/memmove_chk.S and - sysdeps/i386/memset_chk.S. This ensures that memmove and memset won't - pull in __chk_fail and the routines it calls. - - Reported-by: Sam James <sam@gentoo.org> - Tested-by: Sam James <sam@gentoo.org> - Fixes: c73c96a4a1 ("i686: Fix build with --disable-multiarch") - Signed-off-by: Gabi Falk <gabifalk@gmx.com> - Reviewed-by: H.J. Lu <hjl.tools@gmail.com> - Reviewed-by: Dmitry V. Levin <ldv@altlinux.org> - (cherry picked from commit 5a2cf833f5772d6c37c7adac388dd9af9cc1c4b9) - -diff --git a/sysdeps/i386/i686/memmove.S b/sysdeps/i386/i686/memmove.S -index f230359ad6..effd958120 100644 ---- a/sysdeps/i386/i686/memmove.S -+++ b/sysdeps/i386/i686/memmove.S -@@ -29,7 +29,7 @@ - #define SRC DEST+4 - #define LEN SRC+4 - --#if defined PIC && IS_IN (libc) -+#if defined SHARED && IS_IN (libc) - ENTRY_CHK (__memmove_chk) - movl 12(%esp), %eax - cmpl %eax, 16(%esp) -diff --git a/sysdeps/i386/i686/memset.S b/sysdeps/i386/i686/memset.S -index f02f5a6df7..ab06771ea0 100644 ---- a/sysdeps/i386/i686/memset.S -+++ b/sysdeps/i386/i686/memset.S -@@ -27,7 +27,7 @@ - #define LEN CHR+4 - - .text --#if defined PIC && IS_IN (libc) -+#if defined SHARED && IS_IN (libc) - ENTRY_CHK (__memset_chk) - movl 12(%esp), %eax - cmpl %eax, 16(%esp) - -commit f8e462342189525e4605cf233b8f798d1c7f398d -Author: Gabi Falk <gabifalk@gmx.com> -Date: Tue Apr 30 20:05:04 2024 +0000 - - Add a test to check for duplicate definitions in the static library - - This change follows two previous fixes addressing multiple definitions - of __memcpy_chk and __mempcpy_chk functions on i586, and __memmove_chk - and __memset_chk functions on i686. The test is intended to prevent - such issues from occurring in the future. - - Signed-off-by: Gabi Falk <gabifalk@gmx.com> - Reviewed-by: H.J. Lu <hjl.tools@gmail.com> - Reviewed-by: Dmitry V. Levin <ldv@altlinux.org> - (cherry picked from commit ded2e0753e9c46debeb2e0d26c5e560d2581d314) - -diff --git a/Makefile b/Makefile -index 7052b46df8..2e351c0321 100644 ---- a/Makefile -+++ b/Makefile -@@ -577,6 +577,13 @@ $(objpfx)lint-makefiles.out: scripts/lint-makefiles.sh - $(SHELL) $< "$(PYTHON)" `pwd` > $@ ; \ - $(evaluate-test) - -+# Link libc.a as a whole to verify that it does not contain multiple -+# definitions of any symbols. -+tests-special += $(objpfx)link-static-libc.out -+$(objpfx)link-static-libc.out: -+ $(LINK.o) $(whole-archive) -r $(objpfx)libc.a -o /dev/null > $@ 2>&1; \ -+ $(evaluate-test) -+ - # Print test summary for tests in $1 .sum file; - # $2 is optional test identifier. - # Fail if there are unexpected failures in the test results. diff --git a/pkgs/development/libraries/glibc/2.40-master.patch b/pkgs/development/libraries/glibc/2.40-master.patch new file mode 100644 index 000000000000..0b418d1dbeb3 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.40-master.patch @@ -0,0 +1,5127 @@ +commit 6daa77104520ca992a9369bd01cccd4d98c82984 +Author: Andreas K. Hüttel <dilfridge@gentoo.org> +Date: Sun Jul 21 19:02:10 2024 +0200 + + Replace advisories directory + + Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> + +diff --git a/advisories/GLIBC-SA-2023-0001 b/advisories/GLIBC-SA-2023-0001 +deleted file mode 100644 +index 3d19c91b6a..0000000000 +--- a/advisories/GLIBC-SA-2023-0001 ++++ /dev/null +@@ -1,14 +0,0 @@ +-printf: incorrect output for integers with thousands separator and width field +- +-When the printf family of functions is called with a format specifier +-that uses an <apostrophe> (enable grouping) and a minimum width +-specifier, the resulting output could be larger than reasonably expected +-by a caller that computed a tight bound on the buffer size. The +-resulting larger than expected output could result in a buffer overflow +-in the printf family of functions. +- +-CVE-Id: CVE-2023-25139 +-Public-Date: 2023-02-02 +-Vulnerable-Commit: e88b9f0e5cc50cab57a299dc7efe1a4eb385161d (2.37) +-Fix-Commit: c980549cc6a1c03c23cc2fe3e7b0fe626a0364b0 (2.38) +-Fix-Commit: 07b9521fc6369d000216b96562ff7c0ed32a16c4 (2.37-4) +diff --git a/advisories/GLIBC-SA-2023-0002 b/advisories/GLIBC-SA-2023-0002 +deleted file mode 100644 +index 5122669a64..0000000000 +--- a/advisories/GLIBC-SA-2023-0002 ++++ /dev/null +@@ -1,15 +0,0 @@ +-getaddrinfo: Stack read overflow in no-aaaa mode +- +-If the system is configured in no-aaaa mode via /etc/resolv.conf, +-getaddrinfo is called for the AF_UNSPEC address family, and a DNS +-response is received over TCP that is larger than 2048 bytes, +-getaddrinfo may potentially disclose stack contents via the returned +-address data, or crash. +- +-CVE-Id: CVE-2023-4527 +-Public-Date: 2023-09-12 +-Vulnerable-Commit: f282cdbe7f436c75864e5640a409a10485e9abb2 (2.36) +-Fix-Commit: bd77dd7e73e3530203be1c52c8a29d08270cb25d (2.39) +-Fix-Commit: 4ea972b7edd7e36610e8cde18bf7a8149d7bac4f (2.36-113) +-Fix-Commit: b7529346025a130fee483d42178b5c118da971bb (2.37-38) +-Fix-Commit: b25508dd774b617f99419bdc3cf2ace4560cd2d6 (2.38-19) +diff --git a/advisories/GLIBC-SA-2023-0003 b/advisories/GLIBC-SA-2023-0003 +deleted file mode 100644 +index d3aef80348..0000000000 +--- a/advisories/GLIBC-SA-2023-0003 ++++ /dev/null +@@ -1,15 +0,0 @@ +-getaddrinfo: Potential use-after-free +- +-When an NSS plugin only implements the _gethostbyname2_r and +-_getcanonname_r callbacks, getaddrinfo could use memory that was freed +-during buffer resizing, potentially causing a crash or read or write to +-arbitrary memory. +- +-CVE-Id: CVE-2023-4806 +-Public-Date: 2023-09-12 +-Fix-Commit: 973fe93a5675c42798b2161c6f29c01b0e243994 (2.39) +-Fix-Commit: e09ee267c03e3150c2c9ba28625ab130705a485e (2.34-420) +-Fix-Commit: e3ccb230a961b4797510e6a1f5f21fd9021853e7 (2.35-270) +-Fix-Commit: a9728f798ec7f05454c95637ee6581afaa9b487d (2.36-115) +-Fix-Commit: 6529a7466c935f36e9006b854d6f4e1d4876f942 (2.37-39) +-Fix-Commit: 00ae4f10b504bc4564e9f22f00907093f1ab9338 (2.38-20) +diff --git a/advisories/GLIBC-SA-2023-0004 b/advisories/GLIBC-SA-2023-0004 +deleted file mode 100644 +index 5286a7aa54..0000000000 +--- a/advisories/GLIBC-SA-2023-0004 ++++ /dev/null +@@ -1,16 +0,0 @@ +-tunables: local privilege escalation through buffer overflow +- +-If a tunable of the form NAME=NAME=VAL is passed in the environment of a +-setuid program and NAME is valid, it may result in a buffer overflow, +-which could be exploited to achieve escalated privileges. This flaw was +-introduced in glibc 2.34. +- +-CVE-Id: CVE-2023-4911 +-Public-Date: 2023-10-03 +-Vulnerable-Commit: 2ed18c5b534d9e92fc006202a5af0df6b72e7aca (2.34) +-Fix-Commit: 1056e5b4c3f2d90ed2b4a55f96add28da2f4c8fa (2.39) +-Fix-Commit: dcc367f148bc92e7f3778a125f7a416b093964d9 (2.34-423) +-Fix-Commit: c84018a05aec80f5ee6f682db0da1130b0196aef (2.35-274) +-Fix-Commit: 22955ad85186ee05834e47e665056148ca07699c (2.36-118) +-Fix-Commit: b4e23c75aea756b4bddc4abcf27a1c6dca8b6bd3 (2.37-45) +-Fix-Commit: 750a45a783906a19591fb8ff6b7841470f1f5701 (2.38-27) +diff --git a/advisories/GLIBC-SA-2023-0005 b/advisories/GLIBC-SA-2023-0005 +deleted file mode 100644 +index cc4eb90b82..0000000000 +--- a/advisories/GLIBC-SA-2023-0005 ++++ /dev/null +@@ -1,18 +0,0 @@ +-getaddrinfo: DoS due to memory leak +- +-The fix for CVE-2023-4806 introduced a memory leak when an application +-calls getaddrinfo for AF_INET6 with AI_CANONNAME, AI_ALL and AI_V4MAPPED +-flags set. +- +-CVE-Id: CVE-2023-5156 +-Public-Date: 2023-09-25 +-Vulnerable-Commit: e09ee267c03e3150c2c9ba28625ab130705a485e (2.34-420) +-Vulnerable-Commit: e3ccb230a961b4797510e6a1f5f21fd9021853e7 (2.35-270) +-Vulnerable-Commit: a9728f798ec7f05454c95637ee6581afaa9b487d (2.36-115) +-Vulnerable-Commit: 6529a7466c935f36e9006b854d6f4e1d4876f942 (2.37-39) +-Vulnerable-Commit: 00ae4f10b504bc4564e9f22f00907093f1ab9338 (2.38-20) +-Fix-Commit: 8006457ab7e1cd556b919f477348a96fe88f2e49 (2.34-421) +-Fix-Commit: 17092c0311f954e6f3c010f73ce3a78c24ac279a (2.35-272) +-Fix-Commit: 856bac55f98dc840e7c27cfa82262b933385de90 (2.36-116) +-Fix-Commit: 4473d1b87d04b25cdd0e0354814eeaa421328268 (2.37-42) +-Fix-Commit: 5ee59ca371b99984232d7584fe2b1a758b4421d3 (2.38-24) +diff --git a/advisories/GLIBC-SA-2024-0001 b/advisories/GLIBC-SA-2024-0001 +deleted file mode 100644 +index 28931c75ae..0000000000 +--- a/advisories/GLIBC-SA-2024-0001 ++++ /dev/null +@@ -1,15 +0,0 @@ +-syslog: Heap buffer overflow in __vsyslog_internal +- +-__vsyslog_internal did not handle a case where printing a SYSLOG_HEADER +-containing a long program name failed to update the required buffer +-size, leading to the allocation and overflow of a too-small buffer on +-the heap. +- +-CVE-Id: CVE-2023-6246 +-Public-Date: 2024-01-30 +-Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37) +-Fix-Commit: 6bd0e4efcc78f3c0115e5ea9739a1642807450da (2.39) +-Fix-Commit: 23514c72b780f3da097ecf33a793b7ba9c2070d2 (2.38-42) +-Fix-Commit: 97a4292aa4a2642e251472b878d0ec4c46a0e59a (2.37-57) +-Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16) +-Fix-Commit: d1a83b6767f68b3cb5b4b4ea2617254acd040c82 (2.36-126) +diff --git a/advisories/GLIBC-SA-2024-0002 b/advisories/GLIBC-SA-2024-0002 +deleted file mode 100644 +index 940bfcf2fc..0000000000 +--- a/advisories/GLIBC-SA-2024-0002 ++++ /dev/null +@@ -1,15 +0,0 @@ +-syslog: Heap buffer overflow in __vsyslog_internal +- +-__vsyslog_internal used the return value of snprintf/vsnprintf to +-calculate buffer sizes for memory allocation. If these functions (for +-any reason) failed and returned -1, the resulting buffer would be too +-small to hold output. +- +-CVE-Id: CVE-2023-6779 +-Public-Date: 2024-01-30 +-Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37) +-Fix-Commit: 7e5a0c286da33159d47d0122007aac016f3e02cd (2.39) +-Fix-Commit: d0338312aace5bbfef85e03055e1212dd0e49578 (2.38-43) +-Fix-Commit: 67062eccd9a65d7fda9976a56aeaaf6c25a80214 (2.37-58) +-Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16) +-Fix-Commit: 2bc9d7c002bdac38b5c2a3f11b78e309d7765b83 (2.36-127) +diff --git a/advisories/GLIBC-SA-2024-0003 b/advisories/GLIBC-SA-2024-0003 +deleted file mode 100644 +index b43a5150ab..0000000000 +--- a/advisories/GLIBC-SA-2024-0003 ++++ /dev/null +@@ -1,13 +0,0 @@ +-syslog: Integer overflow in __vsyslog_internal +- +-__vsyslog_internal calculated a buffer size by adding two integers, but +-did not first check if the addition would overflow. +- +-CVE-Id: CVE-2023-6780 +-Public-Date: 2024-01-30 +-Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37) +-Fix-Commit: ddf542da94caf97ff43cc2875c88749880b7259b (2.39) +-Fix-Commit: d37c2b20a4787463d192b32041c3406c2bd91de0 (2.38-44) +-Fix-Commit: 2b58cba076e912961ceaa5fa58588e4b10f791c0 (2.37-59) +-Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16) +-Fix-Commit: b9b7d6a27aa0632f334352fa400771115b3c69b7 (2.36-128) +diff --git a/advisories/GLIBC-SA-2024-0004 b/advisories/GLIBC-SA-2024-0004 +deleted file mode 100644 +index 08df2b3118..0000000000 +--- a/advisories/GLIBC-SA-2024-0004 ++++ /dev/null +@@ -1,28 +0,0 @@ +-ISO-2022-CN-EXT: fix out-of-bound writes when writing escape sequence +- +-The iconv() function in the GNU C Library versions 2.39 and older may +-overflow the output buffer passed to it by up to 4 bytes when converting +-strings to the ISO-2022-CN-EXT character set, which may be used to +-crash an application or overwrite a neighbouring variable. +- +-ISO-2022-CN-EXT uses escape sequences to indicate character set changes +-(as specified by RFC 1922). While the SOdesignation has the expected +-bounds checks, neither SS2designation nor SS3designation have its; +-allowing a write overflow of 1, 2, or 3 bytes with fixed values: +-'$+I', '$+J', '$+K', '$+L', '$+M', or '$*H'. +- +-CVE-Id: CVE-2024-2961 +-Public-Date: 2024-04-17 +-Vulnerable-Commit: 755104edc75c53f4a0e7440334e944ad3c6b32fc (2.1.93-169) +-Fix-Commit: f9dc609e06b1136bb0408be9605ce7973a767ada (2.40) +-Fix-Commit: 31da30f23cddd36db29d5b6a1c7619361b271fb4 (2.39-31) +-Fix-Commit: e1135387deded5d73924f6ca20c72a35dc8e1bda (2.38-66) +-Fix-Commit: 89ce64b269a897a7780e4c73a7412016381c6ecf (2.37-89) +-Fix-Commit: 4ed98540a7fd19f458287e783ae59c41e64df7b5 (2.36-164) +-Fix-Commit: 36280d1ce5e245aabefb877fe4d3c6cff95dabfa (2.35-315) +-Fix-Commit: a8b0561db4b9847ebfbfec20075697d5492a363c (2.34-459) +-Fix-Commit: ed4f16ff6bed3037266f1fa682ebd32a18fce29c (2.33-263) +-Fix-Commit: 682ad4c8623e611a971839990ceef00346289cc9 (2.32-140) +-Fix-Commit: 3703c32a8d304c1ee12126134ce69be965f38000 (2.31-154) +- +-Reported-By: Charles Fol +diff --git a/advisories/GLIBC-SA-2024-0005 b/advisories/GLIBC-SA-2024-0005 +deleted file mode 100644 +index a59596610a..0000000000 +--- a/advisories/GLIBC-SA-2024-0005 ++++ /dev/null +@@ -1,22 +0,0 @@ +-nscd: Stack-based buffer overflow in netgroup cache +- +-If the Name Service Cache Daemon's (nscd) fixed size cache is exhausted +-by client requests then a subsequent client request for netgroup data +-may result in a stack-based buffer overflow. This flaw was introduced +-in glibc 2.15 when the cache was added to nscd. +- +-This vulnerability is only present in the nscd binary. +- +-CVE-Id: CVE-2024-33599 +-Public-Date: 2024-04-23 +-Vulnerable-Commit: 684ae515993269277448150a1ca70db3b94aa5bd (2.15) +-Fix-Commit: 69c58d5ef9f584ea198bd00f7964d364d0e6b921 (2.31-155) +-Fix-Commit: a77064893bfe8a701770e2f53a4d33805bc47a5a (2.32-141) +-Fix-Commit: 5c75001a96abcd50cbdb74df24c3f013188d076e (2.33-264) +-Fix-Commit: 52f73e5c4e29b14e79167272297977f360ae1e97 (2.34-460) +-Fix-Commit: 7a95873543ce225376faf13bb71c43dea6d24f86 (2.35-316) +-Fix-Commit: caa3151ca460bdd9330adeedd68c3112d97bffe4 (2.36-165) +-Fix-Commit: f75c298e747b2b8b41b1c2f551c011a52c41bfd1 (2.37-91) +-Fix-Commit: 5968aebb86164034b8f8421b4abab2f837a5bdaf (2.38-72) +-Fix-Commit: 1263d583d2e28afb8be53f8d6922f0842036f35d (2.39-35) +-Fix-Commit: 87801a8fd06db1d654eea3e4f7626ff476a9bdaa (2.40) +diff --git a/advisories/GLIBC-SA-2024-0006 b/advisories/GLIBC-SA-2024-0006 +deleted file mode 100644 +index d44148d3d9..0000000000 +--- a/advisories/GLIBC-SA-2024-0006 ++++ /dev/null +@@ -1,32 +0,0 @@ +-nscd: Null pointer crash after notfound response +- +-If the Name Service Cache Daemon's (nscd) cache fails to add a not-found +-netgroup response to the cache, the client request can result in a null +-pointer dereference. This flaw was introduced in glibc 2.15 when the +-cache was added to nscd. +- +-This vulnerability is only present in the nscd binary. +- +-CVE-Id: CVE-2024-33600 +-Public-Date: 2024-04-24 +-Vulnerable-Commit: 684ae515993269277448150a1ca70db3b94aa5bd (2.15) +-Fix-Commit: b048a482f088e53144d26a61c390bed0210f49f2 (2.40) +-Fix-Commit: 7835b00dbce53c3c87bbbb1754a95fb5e58187aa (2.40) +-Fix-Commit: c99f886de54446cd4447db6b44be93dabbdc2f8b (2.39-37) +-Fix-Commit: 5a508e0b508c8ad53bd0d2fb48fd71b242626341 (2.39-36) +-Fix-Commit: 2ae9446c1b7a3064743b4a51c0bbae668ee43e4c (2.38-74) +-Fix-Commit: 541ea5172aa658c4bd5c6c6d6fd13903c3d5bb0a (2.38-73) +-Fix-Commit: a8070b31043c7585c36ba68a74298c4f7af075c3 (2.37-93) +-Fix-Commit: 5eea50c4402e39588de98aa1d4469a79774703d4 (2.37-92) +-Fix-Commit: f205b3af56740e3b014915b1bd3b162afe3407ef (2.36-167) +-Fix-Commit: c34f470a615b136170abd16142da5dd0c024f7d1 (2.36-166) +-Fix-Commit: bafadc589fbe21ae330e8c2af74db9da44a17660 (2.35-318) +-Fix-Commit: 4370bef52b0f3f3652c6aa13d7a9bb3ac079746d (2.35-317) +-Fix-Commit: 1f94122289a9bf7dba573f5d60327aaa2b85cf2e (2.34-462) +-Fix-Commit: 966d6ac9e40222b84bb21674cc4f83c8d72a5a26 (2.34-461) +-Fix-Commit: e3eef1b8fbdd3a7917af466ca9c4b7477251ca79 (2.33-266) +-Fix-Commit: f20a8d696b13c6261b52a6434899121f8b19d5a7 (2.33-265) +-Fix-Commit: be602180146de37582a3da3a0caa4b719645de9c (2.32-143) +-Fix-Commit: 394eae338199078b7961b051c191539870742d7b (2.32-142) +-Fix-Commit: 8d7949183760170c61e55def723c1d8050187874 (2.31-157) +-Fix-Commit: 304ce5fe466c4762b21b36c26926a4657b59b53e (2.31-156) +diff --git a/advisories/GLIBC-SA-2024-0007 b/advisories/GLIBC-SA-2024-0007 +deleted file mode 100644 +index b6928fa27a..0000000000 +--- a/advisories/GLIBC-SA-2024-0007 ++++ /dev/null +@@ -1,28 +0,0 @@ +-nscd: netgroup cache may terminate daemon on memory allocation failure +- +-The Name Service Cache Daemon's (nscd) netgroup cache uses xmalloc or +-xrealloc and these functions may terminate the process due to a memory +-allocation failure resulting in a denial of service to the clients. The +-flaw was introduced in glibc 2.15 when the cache was added to nscd. +- +-This vulnerability is only present in the nscd binary. +- +-Subsequent refactoring of the netgroup cache only added more uses of +-xmalloc and xrealloc. Uses of xmalloc and xrealloc in other parts of +-nscd only occur during startup of the daemon and so are not affected by +-client requests that could trigger an out of memory followed by +-termination. +- +-CVE-Id: CVE-2024-33601 +-Public-Date: 2024-04-24 +-Vulnerable-Commit: 684ae515993269277448150a1ca70db3b94aa5bd (2.15) +-Fix-Commit: c04a21e050d64a1193a6daab872bca2528bda44b (2.40) +-Fix-Commit: a9a8d3eebb145779a18d90e3966009a1daa63cd8 (2.39-38) +-Fix-Commit: 71af8ca864345d39b746d5cee84b94b430fad5db (2.38-75) +-Fix-Commit: 6e106dc214d6a033a4e945d1c6cf58061f1c5f1f (2.37-94) +-Fix-Commit: b6742463694b1dfdd5120b91ee21cf05d15ec2e2 (2.36-168) +-Fix-Commit: 7a5864cac60e06000394128a5a2817b03542f5a3 (2.35-319) +-Fix-Commit: 86f1d5f4129c373ac6fb6df5bcf38273838843cb (2.34-463) +-Fix-Commit: 4d27d4b9a188786fc6a56745506cec2acfc51f83 (2.33-267) +-Fix-Commit: 3ed195a8ec89da281e3c4bf887a13d281b72d8f4 (2.32-144) +-Fix-Commit: bbf5a58ccb55679217f94de706164d15372fbbc0 (2.31-158) +diff --git a/advisories/GLIBC-SA-2024-0008 b/advisories/GLIBC-SA-2024-0008 +deleted file mode 100644 +index d93e2a6f0b..0000000000 +--- a/advisories/GLIBC-SA-2024-0008 ++++ /dev/null +@@ -1,26 +0,0 @@ +-nscd: netgroup cache assumes NSS callback uses in-buffer strings +- +-The Name Service Cache Daemon's (nscd) netgroup cache can corrupt memory +-when the NSS callback does not store all strings in the provided buffer. +-The flaw was introduced in glibc 2.15 when the cache was added to nscd. +- +-This vulnerability is only present in the nscd binary. +- +-There is no guarantee from the NSS callback API that the returned +-strings are all within the buffer. However, the netgroup cache code +-assumes that the NSS callback uses in-buffer strings and if it doesn't +-the buffer resizing logic could lead to potential memory corruption. +- +-CVE-Id: CVE-2024-33602 +-Public-Date: 2024-04-24 +-Vulnerable-Commit: 684ae515993269277448150a1ca70db3b94aa5bd (2.15) +-Fix-Commit: c04a21e050d64a1193a6daab872bca2528bda44b (2.40) +-Fix-Commit: a9a8d3eebb145779a18d90e3966009a1daa63cd8 (2.39-38) +-Fix-Commit: 71af8ca864345d39b746d5cee84b94b430fad5db (2.38-75) +-Fix-Commit: 6e106dc214d6a033a4e945d1c6cf58061f1c5f1f (2.37-94) +-Fix-Commit: b6742463694b1dfdd5120b91ee21cf05d15ec2e2 (2.36-168) +-Fix-Commit: 7a5864cac60e06000394128a5a2817b03542f5a3 (2.35-319) +-Fix-Commit: 86f1d5f4129c373ac6fb6df5bcf38273838843cb (2.34-463) +-Fix-Commit: 4d27d4b9a188786fc6a56745506cec2acfc51f83 (2.33-267) +-Fix-Commit: 3ed195a8ec89da281e3c4bf887a13d281b72d8f4 (2.32-144) +-Fix-Commit: bbf5a58ccb55679217f94de706164d15372fbbc0 (2.31-158) +diff --git a/advisories/README b/advisories/README +deleted file mode 100644 +index b8f8a829ca..0000000000 +--- a/advisories/README ++++ /dev/null +@@ -1,77 +0,0 @@ +-GNU C Library Security Advisory Format +-====================================== +- +-Security advisories in this directory follow a simple git commit log +-format, with a heading and free-format description augmented with tags +-to allow parsing key information. References to code changes are +-specific to the glibc repository and follow a specific format: +- +- Tag-name: <commit-ref> (release-version) +- +-The <commit-ref> indicates a specific commit in the repository. The +-release-version indicates the publicly consumable release in which this +-commit is known to exist. The release-version is derived from the +-git-describe format, (i.e. stripped out from glibc-2.34.NNN-gxxxx) and +-is of the form 2.34-NNN. If the -NNN suffix is absent, it means that +-the change is in that release tarball, otherwise the change is on the +-release/2.YY/master branch and not in any released tarball. +- +-The following tags are currently being used: +- +-CVE-Id: +-This is the CVE-Id assigned under the CVE Program +-(https://www.cve.org/). +- +-Public-Date: +-The date this issue became publicly known. +- +-Vulnerable-Commit: +-The commit that introduced this vulnerability. There could be multiple +-entries, one for each release branch in the glibc repository; the +-release-version portion of this tag should tell you which branch this is +-on. +- +-Fix-Commit: +-The commit that fixed this vulnerability. There could be multiple +-entries for each release branch in the glibc repository, indicating that +-all of those commits contributed to fixing that issue in each of those +-branches. +- +-Reported-By: +-The entity that reported this issue. There could be multiple entries, one for +-each reporter. +- +-Adding an Advisory +------------------- +- +-An advisory for a CVE needs to be added on the master branch in two steps: +- +-1. Add the text of the advisory without any Fix-Commit tags along with +- the fix for the CVE. Add the Vulnerable-Commit tag, if applicable. +- The advisories directory does not exist in release branches, so keep +- the advisory text commit distinct from the code changes, to ease +- backports. Ask for the GLIBC-SA advisory number from the security +- team. +- +-2. Finish all backports on release branches and then back on the msater +- branch, add all commit refs to the advisory using the Fix-Commit +- tags. Don't bother adding the release-version subscript since the +- next step will overwrite it. +- +-3. Run the process-advisories.sh script in the scripts directory on the +- advisory: +- +- scripts/process-advisories.sh update GLIBC-SA-YYYY-NNNN +- +- (replace YYYY-NNNN with the actual advisory number). +- +-4. Verify the updated advisory and push the result. +- +-Getting a NEWS snippet from advisories +--------------------------------------- +- +-Run: +- +- scripts/process-advisories.sh news +- +-and copy the content into the NEWS file. + +commit 8bbb8d7b16cae777eed06bc9d2e059fc00be24e9 +Author: Florian Weimer <fweimer@redhat.com> +Date: Wed Jul 24 12:06:47 2024 +0200 + + resolv: Allow short error responses to match any query (bug 31890) + + Reviewed-by: DJ Delorie <dj@redhat.com> + (cherry picked from commit 691a3b2e9bfaba842e46a5ccb7f5e6ea144c3ade) + +diff --git a/NEWS b/NEWS +index 31281ac408..66b755ed34 100644 +--- a/NEWS ++++ b/NEWS +@@ -5,6 +5,12 @@ See the end for copying conditions. + Please send GNU C library bug reports via <https://sourceware.org/bugzilla/> + using `glibc' in the "product" field. + ++Version 2.41 ++ ++The following bugs are resolved with this release: ++ ++ [31890] resolv: Allow short error responses to match any DNS query ++ + Version 2.40 + + Major new features: +diff --git a/resolv/Makefile b/resolv/Makefile +index 5f44f5896b..d927e337d9 100644 +--- a/resolv/Makefile ++++ b/resolv/Makefile +@@ -106,6 +106,7 @@ tests += \ + tst-resolv-nondecimal \ + tst-resolv-res_init-multi \ + tst-resolv-search \ ++ tst-resolv-short-response \ + tst-resolv-trailing \ + + # This test calls __res_context_send directly, which is not exported +@@ -299,6 +300,8 @@ $(objpfx)tst-resolv-nondecimal: $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)tst-resolv-qtypes: $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)tst-resolv-rotate: $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)tst-resolv-search: $(objpfx)libresolv.so $(shared-thread-library) ++$(objpfx)tst-resolv-short-response: $(objpfx)libresolv.so \ ++ $(shared-thread-library) + $(objpfx)tst-resolv-trailing: $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)tst-resolv-threads: $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)tst-resolv-txnid-collision: $(objpfx)libresolv.a \ +diff --git a/resolv/res_send.c b/resolv/res_send.c +index ea7cf192b2..572e72c32f 100644 +--- a/resolv/res_send.c ++++ b/resolv/res_send.c +@@ -1199,19 +1199,30 @@ send_dg(res_state statp, + } + + /* Check for the correct header layout and a matching +- question. */ ++ question. Some recursive resolvers send REFUSED ++ without copying back the question section ++ (producing a response that is only HFIXEDSZ bytes ++ long). Skip query matching in this case. */ ++ bool thisansp_error = (anhp->rcode == SERVFAIL || ++ anhp->rcode == NOTIMP || ++ anhp->rcode == REFUSED); ++ bool skip_query_match = (*thisresplenp == HFIXEDSZ ++ && ntohs (anhp->qdcount) == 0 ++ && thisansp_error); + int matching_query = 0; /* Default to no matching query. */ + if (!recvresp1 + && anhp->id == hp->id +- && __libc_res_queriesmatch (buf, buf + buflen, +- *thisansp, +- *thisansp + *thisanssizp)) ++ && (skip_query_match ++ || __libc_res_queriesmatch (buf, buf + buflen, ++ *thisansp, ++ *thisansp + *thisanssizp))) + matching_query = 1; + if (!recvresp2 + && anhp->id == hp2->id +- && __libc_res_queriesmatch (buf2, buf2 + buflen2, +- *thisansp, +- *thisansp + *thisanssizp)) ++ && (skip_query_match ++ || __libc_res_queriesmatch (buf2, buf2 + buflen2, ++ *thisansp, ++ *thisansp + *thisanssizp))) + matching_query = 2; + if (matching_query == 0) + /* Spurious UDP packet. Drop it and continue +@@ -1221,9 +1232,7 @@ send_dg(res_state statp, + goto wait; + } + +- if (anhp->rcode == SERVFAIL || +- anhp->rcode == NOTIMP || +- anhp->rcode == REFUSED) { ++ if (thisansp_error) { + next_ns: + if (recvresp1 || (buf2 != NULL && recvresp2)) { + *resplen2 = 0; +diff --git a/resolv/tst-resolv-short-response.c b/resolv/tst-resolv-short-response.c +new file mode 100644 +index 0000000000..cf1e39876f +--- /dev/null ++++ b/resolv/tst-resolv-short-response.c +@@ -0,0 +1,112 @@ ++/* Test for spurious timeouts with short 12-byte responses (bug 31890). ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <https://www.gnu.org/licenses/>. */ ++ ++#include <resolv.h> ++#include <support/check.h> ++#include <support/resolv_test.h> ++#include <support/check_nss.h> ++ ++/* The rcode in the initial response. */ ++static volatile int rcode; ++ ++static void ++response (const struct resolv_response_context *ctx, ++ struct resolv_response_builder *b, ++ const char *qname, uint16_t qclass, uint16_t qtype) ++{ ++ switch (ctx->server_index) ++ { ++ case 0: ++ /* First server times out. */ ++ struct resolv_response_flags flags = {.rcode = rcode}; ++ resolv_response_init (b, flags); ++ break; ++ case 1: ++ /* Second server sends reply. */ ++ resolv_response_init (b, (struct resolv_response_flags) {}); ++ resolv_response_add_question (b, qname, qclass, qtype); ++ resolv_response_section (b, ns_s_an); ++ resolv_response_open_record (b, qname, qclass, qtype, 0); ++ switch (qtype) ++ { ++ case T_A: ++ { ++ char ipv4[4] = {192, 0, 2, 17}; ++ resolv_response_add_data (b, &ipv4, sizeof (ipv4)); ++ } ++ break; ++ case T_AAAA: ++ { ++ char ipv6[16] ++ = {0x20, 0x01, 0xd, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}; ++ resolv_response_add_data (b, &ipv6, sizeof (ipv6)); ++ } ++ break; ++ default: ++ FAIL_EXIT1 ("unexpected TYPE%d query", qtype); ++ } ++ resolv_response_close_record (b); ++ break; ++ default: ++ FAIL_EXIT1 ("unexpected query to server %d", ctx->server_index); ++ } ++} ++ ++static void ++check_one (void) ++{ ++ ++ /* The buggy 1-second query timeout results in 30 seconds of delay, ++ which triggers a test timeout failure. */ ++ for (int i = 0; i < 10; ++i) ++ { ++ check_hostent ("www.example", gethostbyname ("www.example"), ++ "name: www.example\n" ++ "address: 192.0.2.17\n"); ++ check_hostent ("www.example", gethostbyname2 ("www.example", AF_INET6), ++ "name: www.example\n" ++ "address: 2001:db8::1\n"); ++ } ++} ++ ++static int ++do_test (void) ++{ ++ struct resolv_test *aux = resolv_test_start ++ ((struct resolv_redirect_config) ++ { ++ .response_callback = response, ++ }); ++ ++ _res.options |= RES_SNGLKUP; ++ ++ rcode = 2; /* SERVFAIL. */ ++ check_one (); ++ ++ rcode = 4; /* NOTIMP. */ ++ check_one (); ++ ++ rcode = 5; /* REFUSED. */ ++ check_one (); ++ ++ resolv_test_end (aux); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> + +commit ef141426630da0946f0af8732eddce9b9a52b2d3 +Author: Florian Weimer <fweimer@redhat.com> +Date: Wed Jul 24 12:06:47 2024 +0200 + + resolv: Do not wait for non-existing second DNS response after error (bug 30081) + + In single-request mode, there is no second response after an error + because the second query has not been sent yet. Waiting for it + introduces an unnecessary timeout. + + Reviewed-by: DJ Delorie <dj@redhat.com> + (cherry picked from commit af625987d619388a100b153520d3ee308bda9889) + +diff --git a/NEWS b/NEWS +index 66b755ed34..4d7100b21c 100644 +--- a/NEWS ++++ b/NEWS +@@ -9,6 +9,7 @@ Version 2.41 + + The following bugs are resolved with this release: + ++ [30081] resolv: Do not wait for non-existing second DNS response after error + [31890] resolv: Allow short error responses to match any DNS query + + Version 2.40 +diff --git a/resolv/Makefile b/resolv/Makefile +index d927e337d9..abff7fc007 100644 +--- a/resolv/Makefile ++++ b/resolv/Makefile +@@ -106,6 +106,7 @@ tests += \ + tst-resolv-nondecimal \ + tst-resolv-res_init-multi \ + tst-resolv-search \ ++ tst-resolv-semi-failure \ + tst-resolv-short-response \ + tst-resolv-trailing \ + +@@ -300,6 +301,8 @@ $(objpfx)tst-resolv-nondecimal: $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)tst-resolv-qtypes: $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)tst-resolv-rotate: $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)tst-resolv-search: $(objpfx)libresolv.so $(shared-thread-library) ++$(objpfx)tst-resolv-semi-failure: $(objpfx)libresolv.so \ ++ $(shared-thread-library) + $(objpfx)tst-resolv-short-response: $(objpfx)libresolv.so \ + $(shared-thread-library) + $(objpfx)tst-resolv-trailing: $(objpfx)libresolv.so $(shared-thread-library) +diff --git a/resolv/res_send.c b/resolv/res_send.c +index 572e72c32f..9c77613f37 100644 +--- a/resolv/res_send.c ++++ b/resolv/res_send.c +@@ -1238,7 +1238,7 @@ send_dg(res_state statp, + *resplen2 = 0; + return resplen; + } +- if (buf2 != NULL) ++ if (buf2 != NULL && !single_request) + { + /* No data from the first reply. */ + resplen = 0; +diff --git a/resolv/tst-resolv-semi-failure.c b/resolv/tst-resolv-semi-failure.c +new file mode 100644 +index 0000000000..aa9798b5a7 +--- /dev/null ++++ b/resolv/tst-resolv-semi-failure.c +@@ -0,0 +1,133 @@ ++/* Test parallel failure/success responses (bug 30081). ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <https://www.gnu.org/licenses/>. */ ++ ++#include <resolv.h> ++#include <support/check.h> ++#include <support/resolv_test.h> ++#include <support/check_nss.h> ++ ++/* The rcode in the initial response. */ ++static volatile int rcode; ++ ++/* Whether to fail the initial A query (!fail_aaaa) or the initial ++ AAAA query (fail_aaaa). */ ++static volatile bool fail_aaaa; ++ ++static void ++response (const struct resolv_response_context *ctx, ++ struct resolv_response_builder *b, ++ const char *qname, uint16_t qclass, uint16_t qtype) ++{ ++ /* Handle the failing query. */ ++ if ((fail_aaaa && qtype == T_AAAA) && ctx->server_index == 0) ++ { ++ struct resolv_response_flags flags = {.rcode = rcode}; ++ resolv_response_init (b, flags); ++ return; ++ } ++ ++ /* Otherwise produce a response. */ ++ resolv_response_init (b, (struct resolv_response_flags) {}); ++ resolv_response_add_question (b, qname, qclass, qtype); ++ resolv_response_section (b, ns_s_an); ++ resolv_response_open_record (b, qname, qclass, qtype, 0); ++ switch (qtype) ++ { ++ case T_A: ++ { ++ char ipv4[4] = {192, 0, 2, 17}; ++ resolv_response_add_data (b, &ipv4, sizeof (ipv4)); ++ } ++ break; ++ case T_AAAA: ++ { ++ char ipv6[16] ++ = {0x20, 0x01, 0xd, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}; ++ resolv_response_add_data (b, &ipv6, sizeof (ipv6)); ++ } ++ break; ++ default: ++ FAIL_EXIT1 ("unexpected TYPE%d query", qtype); ++ } ++ resolv_response_close_record (b); ++} ++ ++static void ++check_one (void) ++{ ++ ++ /* The buggy 1-second query timeout results in 30 seconds of delay, ++ which triggers are test timeout failure. */ ++ for (int i = 0; i < 30; ++i) ++ { ++ static const struct addrinfo hints = ++ { ++ .ai_family = AF_UNSPEC, ++ .ai_socktype = SOCK_STREAM, ++ }; ++ struct addrinfo *ai; ++ int ret = getaddrinfo ("www.example", "80", &hints, &ai); ++ const char *expected; ++ if (ret == 0 && ai->ai_next != NULL) ++ expected = ("address: STREAM/TCP 192.0.2.17 80\n" ++ "address: STREAM/TCP 2001:db8::1 80\n"); ++ else ++ /* Only one response because the AAAA lookup failure is ++ treated as an ignoreable error. */ ++ expected = "address: STREAM/TCP 192.0.2.17 80\n"; ++ check_addrinfo ("www.example", ai, ret, expected); ++ if (ret == 0) ++ freeaddrinfo (ai); ++ } ++} ++ ++static int ++do_test (void) ++{ ++ for (int do_single_lookup = 0; do_single_lookup < 2; ++do_single_lookup) ++ { ++ struct resolv_test *aux = resolv_test_start ++ ((struct resolv_redirect_config) ++ { ++ .response_callback = response, ++ }); ++ ++ if (do_single_lookup) ++ _res.options |= RES_SNGLKUP; ++ ++ for (int do_fail_aaaa = 0; do_fail_aaaa < 2; ++do_fail_aaaa) ++ { ++ fail_aaaa = do_fail_aaaa; ++ ++ rcode = 2; /* SERVFAIL. */ ++ check_one (); ++ ++ rcode = 4; /* NOTIMP. */ ++ check_one (); ++ ++ rcode = 5; /* REFUSED. */ ++ check_one (); ++ } ++ ++ resolv_test_end (aux); ++ } ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/resolv/tst-resolv-short-response.c b/resolv/tst-resolv-short-response.c +index cf1e39876f..be354ae1c7 100644 +--- a/resolv/tst-resolv-short-response.c ++++ b/resolv/tst-resolv-short-response.c +@@ -81,6 +81,18 @@ check_one (void) + check_hostent ("www.example", gethostbyname2 ("www.example", AF_INET6), + "name: www.example\n" + "address: 2001:db8::1\n"); ++ static const struct addrinfo hints = ++ { ++ .ai_family = AF_UNSPEC, ++ .ai_socktype = SOCK_STREAM, ++ }; ++ struct addrinfo *ai; ++ int ret = getaddrinfo ("www.example", "80", &hints, &ai); ++ check_addrinfo ("www.example", ai, ret, ++ "address: STREAM/TCP 192.0.2.17 80\n" ++ "address: STREAM/TCP 2001:db8::1 80\n"); ++ if (ret == 0) ++ freeaddrinfo (ai); + } + } + + +commit b6aeba2de157ba0cdc8fb0aed67b632b3490f383 +Author: Florian Weimer <fweimer@redhat.com> +Date: Wed Jul 24 12:50:17 2024 +0200 + + manual: Do not mention STATIC_TLS in dynamic linker hardening recommendations + + The current toolchain does not consistently generate it, and + glibc does not use it. + + Reviewed-by: Szabolcs Nagy <szabolcs.nagy@arm.com> + (cherry picked from commit 90842d3980064ef410b998b22170ad409b76b9fd) + +diff --git a/manual/dynlink.texi b/manual/dynlink.texi +index 03565d4fb0..1500a53de6 100644 +--- a/manual/dynlink.texi ++++ b/manual/dynlink.texi +@@ -993,21 +993,21 @@ The dynamic segment should also mention @code{BIND_NOW} on the + enough). + + @item +-For shared objects (not main programs), if the program header has a +-@code{PT_TLS} segment, the dynamic segment (as shown by @samp{readelf +--dW}) should contain the @code{STATIC_TLS} flag on the @code{FLAGS} +-line. +- +-If @code{STATIC_TLS} is missing in shared objects, ensure that the +-appropriate relocations for GNU2 TLS descriptors are used (for example, ++Ensure that only static TLS relocations (thread-pointer relative offset ++locations) are used, for example @code{R_AARCH64_TLS_TPREL} and ++@code{X86_64_TPOFF64}. As the second-best option, and only if ++compatibility with non-hardened applications using @code{dlopen} is ++needed, GNU2 TLS descriptor relocations can be used (for example, + @code{R_AARCH64_TLSDESC} or @code{R_X86_64_TLSDESC}). + + @item +-There should not be a reference to the symbols @code{__tls_get_addr}, +-@code{__tls_get_offset}, @code{__tls_get_addr_opt} in the dynamic symbol +-table (in the @samp{readelf -sDW} output). Thread-local storage must be +-accessed using the initial-exec (static) model, or using GNU2 TLS +-descriptors. ++There should not be references to the traditional TLS function symbols ++@code{__tls_get_addr}, @code{__tls_get_offset}, ++@code{__tls_get_addr_opt} in the dynamic symbol table (in the ++@samp{readelf -sDW} output). Supporting global dynamic TLS relocations ++(such as @code{R_AARCH64_TLS_DTPMOD}, @code{R_AARCH64_TLS_DTPREL}, ++@code{R_X86_64_DTPMOD64}, @code{R_X86_64_DTPOFF64}) should not be used, ++either. + + @item + Likewise, the functions @code{dlopen}, @code{dlmopen}, @code{dlclose} + +commit 145b5886379c8de4f0a1bca3556a4c3d7b6c24b2 +Author: Florian Weimer <fweimer@redhat.com> +Date: Wed Jul 24 13:42:16 2024 +0200 + + Fix version number in NEWS file + +diff --git a/NEWS b/NEWS +index 4d7100b21c..6b62f55658 100644 +--- a/NEWS ++++ b/NEWS +@@ -5,7 +5,7 @@ See the end for copying conditions. + Please send GNU C library bug reports via <https://sourceware.org/bugzilla/> + using `glibc' in the "product" field. + +-Version 2.41 ++Version 2.40.1 + + The following bugs are resolved with this release: + + +commit 2aebac5e158277d852b87b0cbd4af2b2d10ac387 +Author: Miguel Martín <mmartinv@redhat.com> +Date: Tue Jul 16 17:14:56 2024 +0200 + + malloc: avoid global locks in tst-aligned_alloc-lib.c + + Make sure the DSO used by aligned_alloc/calloc/malloc tests does not get + a global lock on multithreaded tests. + Reviewed-by: Arjun Shankar <arjun@redhat.com> + + (cherry picked from commit 9a27b566b2048f599048f2f4afe1cce06c4ef43d) + +diff --git a/malloc/tst-aligned_alloc-lib.c b/malloc/tst-aligned_alloc-lib.c +index 0205df5acf..9ef1f839c1 100644 +--- a/malloc/tst-aligned_alloc-lib.c ++++ b/malloc/tst-aligned_alloc-lib.c +@@ -17,37 +17,38 @@ + License along with the GNU C Library; see the file COPYING.LIB. If + not, see <https://www.gnu.org/licenses/>. */ + +-#include <array_length.h> + #include <libc-symbols.h> + #include <stdlib.h> ++#include <time.h> + + extern void *__libc_malloc (size_t size); + extern void *__libc_calloc (size_t n, size_t size); + ++__thread unsigned int seed = 0; ++ + int aligned_alloc_count = 0; + int libc_malloc_count = 0; + int libc_calloc_count = 0; + +-/* Get a random alignment value. Biased towards the smaller values. Must be +- a power of 2. */ +-static size_t get_random_alignment (void) +-{ +- size_t aligns[] = { +- 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384 +- }; +- +- return aligns[random () % array_length (aligns)]; +-} +- +-static void *get_random_alloc (size_t size) ++static void * ++get_random_alloc (size_t size) + { + void *retval; + size_t align; ++ struct timespec tp; ++ ++ if (seed == 0) ++ { ++ clock_gettime (CLOCK_REALTIME, &tp); ++ seed = tp.tv_nsec; ++ } + +- switch (random() % 3) +- { ++ switch (rand_r (&seed) % 3) ++ { + case 1: +- align = get_random_alignment (); ++ /* Get a random alignment value. Biased towards the smaller ++ * values up to 16384. Must be a power of 2. */ ++ align = 1 << rand_r (&seed) % 15; + retval = aligned_alloc (align, size); + aligned_alloc_count++; + break; +@@ -59,13 +60,13 @@ static void *get_random_alloc (size_t size) + retval = __libc_malloc (size); + libc_malloc_count++; + break; +- } ++ } + + return retval; + } + +- +-void * __random_malloc (size_t size) ++void * ++__random_malloc (size_t size) + { + return get_random_alloc (size); + } + +commit 5d2a931a8167a288374c3a38dc10fe0492ab5ffe +Author: Miguel Martín <mmartinv@redhat.com> +Date: Tue Jul 16 17:14:57 2024 +0200 + + malloc: add multi-threaded tests for aligned_alloc/calloc/malloc + + Improve aligned_alloc/calloc/malloc test coverage by adding + multi-threaded tests with random memory allocations and with/without + cross-thread memory deallocations. + + Perform a number of memory allocation calls with random sizes limited + to 0xffff. + + Use the existing DSO ('malloc/tst-aligned_alloc-lib.c') to randomize + allocator selection. + + The multi-threaded allocation/deallocation is staged as described below: + + - Stage 1: Half of the threads will be allocating memory and the + other half will be waiting for them to finish the allocation. + - Stage 2: Half of the threads will be allocating memory and the + other half will be deallocating memory. + - Stage 3: Half of the threads will be deallocating memory and the + second half waiting on them to finish. + + Add 'malloc/tst-aligned-alloc-random-thread.c' where each thread will + deallocate only the memory that was previously allocated by itself. + + Add 'malloc/tst-aligned-alloc-random-thread-cross.c' where each thread + will deallocate memory that was previously allocated by another thread. + + The intention is to be able to utilize existing malloc testing to ensure + that similar allocation APIs are also exposed to the same rigors. + Reviewed-by: Arjun Shankar <arjun@redhat.com> + + (cherry picked from commit b0fbcb7d0051a68baf26b2aed51a8a31c34d68e5) + +diff --git a/malloc/Makefile b/malloc/Makefile +index 02aff1bd1d..98d507a6eb 100644 +--- a/malloc/Makefile ++++ b/malloc/Makefile +@@ -28,6 +28,8 @@ tests := \ + mallocbug \ + tst-aligned-alloc \ + tst-aligned-alloc-random \ ++ tst-aligned-alloc-random-thread \ ++ tst-aligned-alloc-random-thread-cross \ + tst-alloc_buffer \ + tst-calloc \ + tst-free-errno \ +@@ -151,6 +153,8 @@ ifeq ($(have-GLIBC_2.23)$(build-shared),yesyes) + # the tests expect specific internal behavior that is changed due to linking to + # libmcheck.a. + tests-exclude-mcheck = \ ++ tst-aligned-alloc-random-thread \ ++ tst-aligned-alloc-random-thread-cross \ + tst-compathooks-off \ + tst-compathooks-on \ + tst-malloc-backtrace \ +@@ -415,7 +419,11 @@ $(objpfx)tst-mallocstate: $(objpfx)libc_malloc_debug.so + $(objpfx)tst-mallocstate-malloc-check: $(objpfx)libc_malloc_debug.so + + $(objpfx)tst-aligned-alloc-random.out: $(objpfx)tst-aligned_alloc-lib.so ++$(objpfx)tst-aligned-alloc-random-thread.out: $(objpfx)tst-aligned_alloc-lib.so ++$(objpfx)tst-aligned-alloc-random-thread-cross.out: $(objpfx)tst-aligned_alloc-lib.so + $(objpfx)tst-malloc-random.out: $(objpfx)tst-aligned_alloc-lib.so + + tst-aligned-alloc-random-ENV = LD_PRELOAD=$(objpfx)tst-aligned_alloc-lib.so ++tst-aligned-alloc-random-thread-ENV = LD_PRELOAD=$(objpfx)tst-aligned_alloc-lib.so ++tst-aligned-alloc-random-thread-cross-ENV = LD_PRELOAD=$(objpfx)tst-aligned_alloc-lib.so + tst-malloc-random-ENV = LD_PRELOAD=$(objpfx)tst-aligned_alloc-lib.so +diff --git a/malloc/tst-aligned-alloc-random-thread-cross.c b/malloc/tst-aligned-alloc-random-thread-cross.c +new file mode 100644 +index 0000000000..360ecc56ee +--- /dev/null ++++ b/malloc/tst-aligned-alloc-random-thread-cross.c +@@ -0,0 +1,19 @@ ++/* multi-threaded memory allocation and cross-thread deallocation test. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; see the file COPYING.LIB. If ++ not, see <https://www.gnu.org/licenses/>. */ ++#define CROSS_THREAD_DEALLOC ++#include "tst-aligned-alloc-random-thread.c" +diff --git a/malloc/tst-aligned-alloc-random-thread.c b/malloc/tst-aligned-alloc-random-thread.c +new file mode 100644 +index 0000000000..e95f79250a +--- /dev/null ++++ b/malloc/tst-aligned-alloc-random-thread.c +@@ -0,0 +1,145 @@ ++/* multi-threaded memory allocation/deallocation test. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; see the file COPYING.LIB. If ++ not, see <https://www.gnu.org/licenses/>. */ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <support/check.h> ++#include <support/support.h> ++#include <support/xthread.h> ++#include <support/test-driver.h> ++#include <sys/sysinfo.h> ++#include <unistd.h> ++ ++#ifndef ITERATIONS ++# define ITERATIONS 16 ++#endif ++ ++#ifndef NUM_THREADS ++# define NUM_THREADS 8 ++#endif ++ ++#ifndef NUM_ALLOCATIONS ++# define NUM_ALLOCATIONS 2048 ++#endif ++ ++static pthread_barrier_t barrier; ++ ++__thread unsigned int seed; ++ ++typedef struct ++{ ++ int id; ++ pthread_t thread; ++} thread; ++ ++thread threads[NUM_THREADS]; ++ ++void *allocations[NUM_THREADS][NUM_ALLOCATIONS]; ++ ++void ++run_thread_dealloc (int id) ++{ ++ for (int i = 0; i < NUM_ALLOCATIONS; i++) ++ { ++ free (allocations[id][i]); ++ allocations[id][i] = NULL; ++ } ++} ++ ++void ++run_thread_alloc (int id) ++{ ++ size_t msb, size; ++ for (int i = 0; i < NUM_ALLOCATIONS; i++) ++ { ++ msb = 1 << rand_r (&seed) % 16; ++ size = msb + rand_r (&seed) % msb; ++ allocations[id][i] = malloc (size); ++ TEST_VERIFY_EXIT (allocations[id][i] != NULL); ++ } ++} ++ ++void * ++run_allocations (void *arg) ++{ ++ int id = *((int *) arg); ++ seed = time (NULL) + id; ++ ++ /* Stage 1: First half o the threads allocating memory and the second ++ * half waiting for them to finish ++ */ ++ if (id < NUM_THREADS / 2) ++ run_thread_alloc (id); ++ ++ xpthread_barrier_wait (&barrier); ++ ++ /* Stage 2: Half of the threads allocationg memory and the other ++ * half deallocating: ++ * - In the non cross-thread dealloc scenario the first half will be ++ * deallocating the memory allocated by themselves in stage 1 and the ++ * second half will be allocating memory. ++ * - In the cross-thread dealloc scenario the first half will continue ++ * to allocate memory and the second half will deallocate the memory ++ * allocated by the first half in stage 1. ++ */ ++ if (id < NUM_THREADS / 2) ++#ifndef CROSS_THREAD_DEALLOC ++ run_thread_dealloc (id); ++#else ++ run_thread_alloc (id + NUM_THREADS / 2); ++#endif ++ else ++#ifndef CROSS_THREAD_DEALLOC ++ run_thread_alloc (id); ++#else ++ run_thread_dealloc (id - NUM_THREADS / 2); ++#endif ++ ++ xpthread_barrier_wait (&barrier); ++ ++ // Stage 3: Second half of the threads deallocating and the first half ++ // waiting for them to finish. ++ if (id >= NUM_THREADS / 2) ++ run_thread_dealloc (id); ++ ++ return NULL; ++} ++ ++static int ++do_test (void) ++{ ++ xpthread_barrier_init (&barrier, NULL, NUM_THREADS); ++ ++ for (int i = 0; i < ITERATIONS; i++) ++ { ++ for (int t = 0; t < NUM_THREADS; t++) ++ { ++ threads[t].id = t; ++ threads[t].thread ++ = xpthread_create (NULL, run_allocations, &threads[t].id); ++ } ++ ++ for (int t = 0; t < NUM_THREADS; t++) ++ xpthread_join (threads[t].thread); ++ } ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> + +commit 65fbcfe58991194301a7e4fb9c53ab936573e711 +Author: Arjun Shankar <arjun@redhat.com> +Date: Mon Jul 29 14:30:59 2024 +0200 + + manual/stdio: Clarify putc and putwc + + The manual entry for `putc' described what "most systems" do instead of + describing the glibc implementation and its guarantees. This commit + fixes that by warning that putc may be implemented as a macro that + double-evaluates `stream', and removing the performance claim. + + Even though the current `putc' implementation does not double-evaluate + `stream', offering this obscure guarantee as an extension to what + POSIX allows does not seem very useful. + + The entry for `putwc' is also edited to bring it in line with `putc'. + Reviewed-by: Florian Weimer <fweimer@redhat.com> + + (cherry picked from commit 10de4a47ef3f481592e3c62eb07bcda23e9fde4d) + +diff --git a/manual/stdio.texi b/manual/stdio.texi +index f5e289d58a..f9529a098d 100644 +--- a/manual/stdio.texi ++++ b/manual/stdio.texi +@@ -903,21 +903,21 @@ This function is a GNU extension. + @deftypefun int putc (int @var{c}, FILE *@var{stream}) + @standards{ISO, stdio.h} + @safety{@prelim{}@mtsafe{}@asunsafe{@asucorrupt{}}@acunsafe{@acucorrupt{} @aculock{}}} +-This is just like @code{fputc}, except that most systems implement it as ++This is just like @code{fputc}, except that it may be implemented as + a macro, making it faster. One consequence is that it may evaluate the + @var{stream} argument more than once, which is an exception to the +-general rule for macros. @code{putc} is usually the best function to +-use for writing a single character. ++general rule for macros. Therefore, @var{stream} should never be an ++expression with side-effects. + @end deftypefun + + @deftypefun wint_t putwc (wchar_t @var{wc}, FILE *@var{stream}) + @standards{ISO, wchar.h} + @safety{@prelim{}@mtsafe{}@asunsafe{@asucorrupt{}}@acunsafe{@acucorrupt{} @aculock{}}} +-This is just like @code{fputwc}, except that it can be implement as ++This is just like @code{fputwc}, except that it may be implemented as + a macro, making it faster. One consequence is that it may evaluate the + @var{stream} argument more than once, which is an exception to the +-general rule for macros. @code{putwc} is usually the best function to +-use for writing a single wide character. ++general rule for macros. Therefore, @var{stream} should never be an ++expression with side-effects. + @end deftypefun + + @deftypefun int putc_unlocked (int @var{c}, FILE *@var{stream}) + +commit 132a72f93cb4ad9f16b8469dc061de5f75f6a44e +Author: Lukas Bulwahn <lukas.bulwahn@redhat.com> +Date: Mon Jul 29 11:08:17 2024 +0200 + + manual: make setrlimit() description less ambiguous + + The existing description for setrlimit() has some ambiguity. It could be + understood to have the semantics of getrlimit(), i.e., the limits from the + process are stored in the provided rlp pointer. + + Make the description more explicit that rlp are the input values, and that + the limits of the process is changed with this function. + + Reviewed-by: Florian Weimer <fweimer@redhat.com> + (cherry picked from commit aedbf08891069fc029ed021e4dba933eb877b394) + +diff --git a/manual/resource.texi b/manual/resource.texi +index c9b21dedeb..25966bcb64 100644 +--- a/manual/resource.texi ++++ b/manual/resource.texi +@@ -192,8 +192,8 @@ If the sources are compiled with @code{_FILE_OFFSET_BITS == 64} on a + @standards{BSD, sys/resource.h} + @safety{@prelim{}@mtsafe{}@assafe{}@acsafe{}} + @c Direct syscall on most systems; lock-taking critical section on HURD. +-Store the current and maximum limits for the resource @var{resource} +-in @code{*@var{rlp}}. ++Change the current and maximum limits of the process for the resource ++@var{resource} to the values provided in @code{*@var{rlp}}. + + The return value is @code{0} on success and @code{-1} on failure. The + following @code{errno} error condition is possible: + +commit 509166c9a53ad81217a28cc67ba2a688f02fc477 +Author: Florian Weimer <fweimer@redhat.com> +Date: Wed Jun 26 11:27:54 2024 +0200 + + Enhance test coverage for strnlen, wcsnlen + + This commit adds string/test-strnlen-nonarray and + wcsmbs/test-wcsnlen-nonarray. + + Reviewed-by: Noah Goldstein <goldstein.w.n@gmail.com> + (cherry picked from commit 783d4c0b81889c39a9ddf13b60d0fde4040fb1c0) + +diff --git a/string/Makefile b/string/Makefile +index 8f31fa49e6..2e20fc00fd 100644 +--- a/string/Makefile ++++ b/string/Makefile +@@ -184,6 +184,7 @@ tests := \ + test-strncpy \ + test-strndup \ + test-strnlen \ ++ test-strnlen-nonarray \ + test-strpbrk \ + test-strrchr \ + test-strspn \ +diff --git a/string/test-Xnlen-nonarray.c b/string/test-Xnlen-nonarray.c +new file mode 100644 +index 0000000000..499bef2041 +--- /dev/null ++++ b/string/test-Xnlen-nonarray.c +@@ -0,0 +1,133 @@ ++/* Test non-array inputs to string length functions. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <https://www.gnu.org/licenses/>. */ ++ ++/* This skeleton file is included from string/test-strnlen-nonarray.c ++ and wcsmbs/test-wcsnlen-nonarray.c to test that reading of the array ++ stops at the first null character. ++ ++ TEST_IDENTIFIER must be the test function identifier. TEST_NAME is ++ the same as a string. ++ ++ CHAR must be defined as the character type. */ ++ ++#include <array_length.h> ++#include <string.h> ++#include <support/check.h> ++#include <support/next_to_fault.h> ++#include <support/test-driver.h> ++#include <sys/param.h> ++#include <unistd.h> ++ ++typedef __typeof (TEST_IDENTIFIER) *proto_t; ++ ++#define TEST_MAIN ++#include "test-string.h" ++ ++IMPL (TEST_IDENTIFIER, 1) ++ ++static int ++test_main (void) ++{ ++ enum { buffer_length = 256 }; ++ TEST_VERIFY_EXIT (sysconf (_SC_PAGESIZE) >= buffer_length); ++ ++ test_init (); ++ ++ /* Buffer layout: There are a_count 'A' character followed by ++ zero_count null character, for a total of buffer_length ++ character: ++ ++ AAAAA...AAAAA 00000 ... 00000 (unmapped page follows) ++ \ / \ / ++ (a_count) (zero_count) ++ \___ (buffer_length) ___/ ++ ^ ++ | ++ start_offset ++ ++ The buffer length does not change, but a_count (and thus _zero) ++ and start_offset vary. ++ ++ If start_offset == buffer_length, only 0 is a valid length ++ argument. The result is 0. ++ ++ Otherwwise, if zero_count > 0 (if there a null characters in the ++ buffer), then any length argument is valid. If start_offset < ++ a_count (i.e., there is a non-null character at start_offset), the ++ result is the minimum of a_count - start_offset and the length ++ argument. Otherwise the result is 0. ++ ++ Otherwise, there are no null characters before the unmapped page. ++ The length argument must not be greater than buffer_length - ++ start_offset, and the result is the length argument. */ ++ ++ struct support_next_to_fault ntf ++ = support_next_to_fault_allocate (buffer_length * sizeof (CHAR)); ++ CHAR *buffer = (CHAR *) ntf.buffer; ++ ++ FOR_EACH_IMPL (impl, 0) ++ { ++ printf ("info: testing %s\n", impl->name); ++ for (size_t i = 0; i < buffer_length; ++i) ++ buffer[i] = 'A'; ++ ++ for (int zero_count = 0; zero_count <= buffer_length; ++zero_count) ++ { ++ if (zero_count > 0) ++ buffer[buffer_length - zero_count] = 0; ++ int a_count = buffer_length - zero_count; ++ for (int start_offset = 0; start_offset <= buffer_length; ++ ++start_offset) ++ { ++ CHAR *start_pointer = buffer + start_offset; ++ if (start_offset == buffer_length) ++ TEST_COMPARE (CALL (impl, buffer + start_offset, 0), 0); ++ else if (zero_count > 0) ++ for (int length_argument = 0; ++ length_argument <= 2 * buffer_length; ++ ++length_argument) ++ { ++ if (test_verbose) ++ printf ("zero_count=%d a_count=%d start_offset=%d" ++ " length_argument=%d\n", ++ zero_count, a_count, start_offset, ++ length_argument); ++ if (start_offset < a_count) ++ TEST_COMPARE (CALL (impl, start_pointer, length_argument), ++ MIN (a_count - start_offset, ++ length_argument)); ++ else ++ TEST_COMPARE (CALL (impl, start_pointer, length_argument), ++ 0); ++ } ++ else ++ for (int length_argument = 0; ++ length_argument <= buffer_length - start_offset; ++ ++length_argument) ++ TEST_COMPARE (CALL (impl, start_pointer, length_argument), ++ length_argument); ++ } ++ } ++ } ++ ++ support_next_to_fault_free (&ntf); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/string/test-strnlen-nonarray.c b/string/test-strnlen-nonarray.c +new file mode 100644 +index 0000000000..0ad05756d9 +--- /dev/null ++++ b/string/test-strnlen-nonarray.c +@@ -0,0 +1,4 @@ ++#define TEST_IDENTIFIER strnlen ++#define TEST_NAME "strnlen" ++typedef char CHAR; ++#include "test-Xnlen-nonarray.c" +diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile +index 1cddd8cc6d..c51c9b4f1f 100644 +--- a/wcsmbs/Makefile ++++ b/wcsmbs/Makefile +@@ -160,6 +160,7 @@ tests := \ + test-wcsncmp \ + test-wcsncpy \ + test-wcsnlen \ ++ test-wcsnlen-nonarray \ + test-wcspbrk \ + test-wcsrchr \ + test-wcsspn \ +diff --git a/wcsmbs/test-wcsnlen-nonarray.c b/wcsmbs/test-wcsnlen-nonarray.c +new file mode 100644 +index 0000000000..a4b21fecd3 +--- /dev/null ++++ b/wcsmbs/test-wcsnlen-nonarray.c +@@ -0,0 +1,5 @@ ++#include <wchar.h> ++#define TEST_IDENTIFIER wcsnlen ++#define TEST_NAME "wcsnlen" ++typedef wchar_t CHAR; ++#include "../string/test-Xnlen-nonarray.c" + +commit 46f19b234244f4654b9e3898ac1c27de86068222 +Author: Florian Weimer <fweimer@redhat.com> +Date: Thu Jun 27 16:26:56 2024 +0200 + + Enhanced test coverage for strncmp, wcsncmp + + Add string/test-strncmp-nonarray and + wcsmbs/test-wcsncmp-nonarray. + + This is the test that uncovered bug 31934. Test run time + is more than one minute on a fairly current system, so turn + these into xtests that do not run automatically. + + Reviewed-by: Noah Goldstein <goldstein.w.n@gmail.com> + (cherry picked from commit 54252394c25ddf0062e288d4a6ab7a885f8ae009) + +diff --git a/string/Makefile b/string/Makefile +index 2e20fc00fd..1dff405c27 100644 +--- a/string/Makefile ++++ b/string/Makefile +@@ -236,7 +236,10 @@ tests-unsupported += $(tests-translation) + endif + + # This test allocates a lot of memory and can run for a long time. +-xtests = tst-strcoll-overflow ++xtests += tst-strcoll-overflow ++ ++# This test runs for a long time. ++xtests += test-strncmp-nonarray + + # This test needs libdl. + ifeq (yes,$(build-shared)) +diff --git a/string/test-Xncmp-nonarray.c b/string/test-Xncmp-nonarray.c +new file mode 100644 +index 0000000000..9f3a3ca75d +--- /dev/null ++++ b/string/test-Xncmp-nonarray.c +@@ -0,0 +1,183 @@ ++/* Test non-array inputs to string comparison functions. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <https://www.gnu.org/licenses/>. */ ++ ++/* This skeleton file is included from string/test-strncmp-nonarray.c and ++ wcsmbs/test-wcsncmp-nonarray.c to test that reading of the arrays stops ++ at the first null character. ++ ++ TEST_IDENTIFIER must be the test function identifier. TEST_NAME is ++ the same as a string. ++ ++ CHAR must be defined as the character type. */ ++ ++#include <array_length.h> ++#include <string.h> ++#include <support/check.h> ++#include <support/next_to_fault.h> ++#include <support/test-driver.h> ++#include <sys/param.h> ++#include <unistd.h> ++ ++/* Much shorter than test-Xnlen-nonarray.c because of deeply nested loops. */ ++enum { buffer_length = 80 }; ++ ++/* The test buffer layout follows what is described test-Xnlen-nonarray.c, ++ except that there two buffers, left and right. The variables ++ a_count, zero_count, start_offset are all duplicated. */ ++ ++/* Return the maximum string length for a string that starts at ++ start_offset. */ ++static int ++string_length (int a_count, int start_offset) ++{ ++ if (start_offset == buffer_length || start_offset >= a_count) ++ return 0; ++ else ++ return a_count - start_offset; ++} ++ ++/* This is the valid maximum length argument computation for ++ strnlen/wcsnlen. See text-Xnlen-nonarray.c. */ ++static int ++maximum_length (int start_offset, int zero_count) ++{ ++ if (start_offset == buffer_length) ++ return 0; ++ else if (zero_count > 0) ++ /* Effectively unbounded, but we need to stop fairly low, ++ otherwise testing takes too long. */ ++ return buffer_length + 32; ++ else ++ return buffer_length - start_offset; ++} ++ ++typedef __typeof (TEST_IDENTIFIER) *proto_t; ++ ++#define TEST_MAIN ++#include "test-string.h" ++ ++IMPL (TEST_IDENTIFIER, 1) ++ ++static int ++test_main (void) ++{ ++ TEST_VERIFY_EXIT (sysconf (_SC_PAGESIZE) >= buffer_length); ++ test_init (); ++ ++ struct support_next_to_fault left_ntf ++ = support_next_to_fault_allocate (buffer_length * sizeof (CHAR)); ++ CHAR *left_buffer = (CHAR *) left_ntf.buffer; ++ struct support_next_to_fault right_ntf ++ = support_next_to_fault_allocate (buffer_length * sizeof (CHAR)); ++ CHAR *right_buffer = (CHAR *) right_ntf.buffer; ++ ++ FOR_EACH_IMPL (impl, 0) ++ { ++ printf ("info: testing %s\n", impl->name); ++ for (size_t i = 0; i < buffer_length; ++i) ++ left_buffer[i] = 'A'; ++ ++ for (int left_zero_count = 0; left_zero_count <= buffer_length; ++ ++left_zero_count) ++ { ++ if (left_zero_count > 0) ++ left_buffer[buffer_length - left_zero_count] = 0; ++ int left_a_count = buffer_length - left_zero_count; ++ for (size_t i = 0; i < buffer_length; ++i) ++ right_buffer[i] = 'A'; ++ for (int right_zero_count = 0; right_zero_count <= buffer_length; ++ ++right_zero_count) ++ { ++ if (right_zero_count > 0) ++ right_buffer[buffer_length - right_zero_count] = 0; ++ int right_a_count = buffer_length - right_zero_count; ++ for (int left_start_offset = 0; ++ left_start_offset <= buffer_length; ++ ++left_start_offset) ++ { ++ CHAR *left_start_pointer = left_buffer + left_start_offset; ++ int left_maxlen ++ = maximum_length (left_start_offset, left_zero_count); ++ int left_length ++ = string_length (left_a_count, left_start_offset); ++ for (int right_start_offset = 0; ++ right_start_offset <= buffer_length; ++ ++right_start_offset) ++ { ++ CHAR *right_start_pointer ++ = right_buffer + right_start_offset; ++ int right_maxlen ++ = maximum_length (right_start_offset, right_zero_count); ++ int right_length ++ = string_length (right_a_count, right_start_offset); ++ ++ /* Maximum length is modelled after strnlen/wcsnlen, ++ and must be valid for both pointer arguments at ++ the same time. */ ++ int maxlen = MIN (left_maxlen, right_maxlen); ++ ++ for (int length_argument = 0; length_argument <= maxlen; ++ ++length_argument) ++ { ++ if (test_verbose) ++ { ++ printf ("left: zero_count=%d" ++ " a_count=%d start_offset=%d\n", ++ left_zero_count, left_a_count, ++ left_start_offset); ++ printf ("right: zero_count=%d" ++ " a_count=%d start_offset=%d\n", ++ right_zero_count, right_a_count, ++ right_start_offset); ++ printf ("length argument: %d\n", ++ length_argument); ++ } ++ ++ /* Effective lengths bounded by length argument. ++ The effective length determines the ++ outcome of the comparison. */ ++ int left_effective ++ = MIN (left_length, length_argument); ++ int right_effective ++ = MIN (right_length, length_argument); ++ if (left_effective == right_effective) ++ TEST_COMPARE (CALL (impl, ++ left_start_pointer, ++ right_start_pointer, ++ length_argument), 0); ++ else if (left_effective < right_effective) ++ TEST_COMPARE (CALL (impl, ++ left_start_pointer, ++ right_start_pointer, ++ length_argument) < 0, 1); ++ else ++ TEST_COMPARE (CALL (impl, ++ left_start_pointer, ++ right_start_pointer, ++ length_argument) > 0, 1); ++ } ++ } ++ } ++ } ++ } ++ } ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/string/test-strncmp-nonarray.c b/string/test-strncmp-nonarray.c +new file mode 100644 +index 0000000000..581e52d01b +--- /dev/null ++++ b/string/test-strncmp-nonarray.c +@@ -0,0 +1,4 @@ ++#define TEST_IDENTIFIER strncmp ++#define TEST_NAME "strncmp" ++typedef char CHAR; ++#include "test-Xncmp-nonarray.c" +diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile +index c51c9b4f1f..63adf0e8ef 100644 +--- a/wcsmbs/Makefile ++++ b/wcsmbs/Makefile +@@ -206,6 +206,10 @@ tests := \ + wcsmbs-tst1 \ + # tests + ++# This test runs for a long time. ++xtests += test-wcsncmp-nonarray ++ ++ + include ../Rules + + ifeq ($(run-built-tests),yes) +diff --git a/wcsmbs/test-wcsncmp-nonarray.c b/wcsmbs/test-wcsncmp-nonarray.c +new file mode 100644 +index 0000000000..1ad9ebd8fd +--- /dev/null ++++ b/wcsmbs/test-wcsncmp-nonarray.c +@@ -0,0 +1,5 @@ ++#include <wchar.h> ++#define TEST_IDENTIFIER wcsncmp ++#define TEST_NAME "wcsncmp" ++typedef wchar_t CHAR; ++#include "../string/test-Xncmp-nonarray.c" + +commit 3433a358428bcec2d203fa408b85f442c9a465ca +Author: H.J. Lu <hjl.tools@gmail.com> +Date: Wed Jul 24 14:05:13 2024 -0700 + + linux: Update the mremap C implementation [BZ #31968] + + Update the mremap C implementation to support the optional argument for + MREMAP_DONTUNMAP added in Linux 5.7 since it may not always be correct + to implement a variadic function as a non-variadic function on all Linux + targets. Return MAP_FAILED and set errno to EINVAL for unknown flag bits. + This fixes BZ #31968. + + Note: A test must be added when a new flag bit is introduced. + + Signed-off-by: H.J. Lu <hjl.tools@gmail.com> + Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> + (cherry picked from commit 6c40cb0e9f893d49dc7caee580a055de53562206) + +diff --git a/NEWS b/NEWS +index 6b62f55658..5948704ef9 100644 +--- a/NEWS ++++ b/NEWS +@@ -11,6 +11,7 @@ The following bugs are resolved with this release: + + [30081] resolv: Do not wait for non-existing second DNS response after error + [31890] resolv: Allow short error responses to match any DNS query ++ [31968] mremap implementation in C does not handle arguments correctly + + Version 2.40 + +diff --git a/sysdeps/unix/sysv/linux/mremap.c b/sysdeps/unix/sysv/linux/mremap.c +index 4f770799c4..1ada5c1f40 100644 +--- a/sysdeps/unix/sysv/linux/mremap.c ++++ b/sysdeps/unix/sysv/linux/mremap.c +@@ -20,6 +20,12 @@ + #include <sysdep.h> + #include <stdarg.h> + #include <stddef.h> ++#include <errno.h> ++ ++#define MREMAP_KNOWN_BITS \ ++ (MREMAP_MAYMOVE \ ++ | MREMAP_FIXED \ ++ | MREMAP_DONTUNMAP) + + void * + __mremap (void *addr, size_t old_len, size_t new_len, int flags, ...) +@@ -27,7 +33,13 @@ __mremap (void *addr, size_t old_len, size_t new_len, int flags, ...) + va_list va; + void *new_addr = NULL; + +- if (flags & MREMAP_FIXED) ++ if (flags & ~(MREMAP_KNOWN_BITS)) ++ { ++ __set_errno (EINVAL); ++ return MAP_FAILED; ++ } ++ ++ if (flags & (MREMAP_FIXED | MREMAP_DONTUNMAP)) + { + va_start (va, flags); + new_addr = va_arg (va, void *); + +commit 2eb2d78ca75d7432bd1d11d227f4c899554ea02e +Author: H.J. Lu <hjl.tools@gmail.com> +Date: Wed Jul 24 14:05:14 2024 -0700 + + mremap: Update manual entry + + Update mremap manual entry: + + 1. Change mremap to variadic. + 2. Document MREMAP_FIXED and MREMAP_DONTUNMAP. + + Signed-off-by: H.J. Lu <hjl.tools@gmail.com> + Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> + (cherry picked from commit cb2dee4eccf46642eef588bee64f9c875c408f1c) + +diff --git a/NEWS b/NEWS +index 5948704ef9..8da0408ad9 100644 +--- a/NEWS ++++ b/NEWS +@@ -10,6 +10,7 @@ Version 2.40.1 + The following bugs are resolved with this release: + + [30081] resolv: Do not wait for non-existing second DNS response after error ++ [31968] mremap implementation in C does not handle arguments correctly + [31890] resolv: Allow short error responses to match any DNS query + [31968] mremap implementation in C does not handle arguments correctly + +diff --git a/manual/llio.texi b/manual/llio.texi +index 6f0a48609b..ea84196abd 100644 +--- a/manual/llio.texi ++++ b/manual/llio.texi +@@ -1892,7 +1892,7 @@ There is no existing mapping in at least part of the given region. + + @end deftypefun + +-@deftypefun {void *} mremap (void *@var{address}, size_t @var{length}, size_t @var{new_length}, int @var{flag}) ++@deftypefun {void *} mremap (void *@var{address}, size_t @var{length}, size_t @var{new_length}, int @var{flag}, ... /* void *@var{new_address} */) + @standards{GNU, sys/mman.h} + @safety{@prelim{}@mtsafe{}@assafe{}@acsafe{}} + +@@ -1901,12 +1901,40 @@ area. @var{address} and @var{length} must cover a region entirely mapped + in the same @code{mmap} statement. A new mapping with the same + characteristics will be returned with the length @var{new_length}. + +-One option is possible, @code{MREMAP_MAYMOVE}. If it is given in +-@var{flags}, the system may remove the existing mapping and create a new +-one of the desired length in another location. ++Possible flags are + +-The address of the resulting mapping is returned, or @math{-1}. Possible +-error codes include: ++@table @code ++ ++@item MREMAP_MAYMOVE ++If it is given in @var{flags}, the system may remove the existing mapping ++and create a new one of the desired length in another location. ++ ++@item MREMAP_FIXED ++If it is given in @var{flags}, @code{mremap} accepts a fifth argument, ++@code{void *new_address}, which specifies a page-aligned address to ++which the mapping must be moved. Any previous mapping at the address ++range specified by @var{new_address} and @var{new_size} is unmapped. ++ ++@code{MREMAP_FIXED} must be used together with @code{MREMAP_MAYMOVE}. ++ ++@item MREMAP_DONTUNMAP ++If it is given in @var{flags}, @code{mremap} accepts a fifth argument, ++@code{void *new_address}, which specifies a page-aligned address. Any ++previous mapping at the address range specified by @var{new_address} and ++@var{new_size} is unmapped. If @var{new_address} is @code{NULL}, the ++kernel chooses the page-aligned address at which to create the mapping. ++Otherwise, the kernel takes it as a hint about where to place the mapping. ++The mapping at the address range specified by @var{old_address} and ++@var{old_size} isn't unmapped. ++ ++@code{MREMAP_DONTUNMAP} must be used together with @code{MREMAP_MAYMOVE}. ++@var{old_size} must be the same as @var{new_size}. This flag bit is ++Linux-specific. ++ ++@end table ++ ++The address of the resulting mapping is returned, or @code{MAP_FAILED}. ++Possible error codes include: + + @table @code + +@@ -1915,7 +1943,7 @@ There is no existing mapping in at least part of the original region, or + the region covers two or more distinct mappings. + + @item EINVAL +-The address given is misaligned or inappropriate. ++Any arguments are inappropriate, including unknown @var{flags} values. + + @item EAGAIN + The region has pages locked, and if extended it would exceed the + +commit ca53bc68ab92ab413a7d53e951227d380a85ebd8 +Author: H.J. Lu <hjl.tools@gmail.com> +Date: Wed Jul 24 14:05:15 2024 -0700 + + Add mremap tests + + Add tests for MREMAP_MAYMOVE and MREMAP_FIXED. On Linux, also test + MREMAP_DONTUNMAP. + + Signed-off-by: H.J. Lu <hjl.tools@gmail.com> + Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> + (cherry picked from commit ff0320bec2810192d453c579623482fab87bfa01) + +diff --git a/misc/Makefile b/misc/Makefile +index 5d17c562fe..7b7f8351bf 100644 +--- a/misc/Makefile ++++ b/misc/Makefile +@@ -257,6 +257,8 @@ tests := \ + tst-mntent-blank-passno \ + tst-mntent-escape \ + tst-mntent2 \ ++ tst-mremap1 \ ++ tst-mremap2 \ + tst-preadvwritev \ + tst-preadvwritev2 \ + tst-preadvwritev64 \ +diff --git a/misc/tst-mremap1.c b/misc/tst-mremap1.c +new file mode 100644 +index 0000000000..0469991a6c +--- /dev/null ++++ b/misc/tst-mremap1.c +@@ -0,0 +1,46 @@ ++/* Test mremap with MREMAP_MAYMOVE. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <https://www.gnu.org/licenses/>. */ ++ ++#include <errno.h> ++#include <sys/mman.h> ++#include <support/xstdlib.h> ++#include <support/xunistd.h> ++#include <support/check.h> ++#include <support/test-driver.h> ++ ++static int ++do_test (void) ++{ ++ size_t old_size = getpagesize (); ++ char *old_addr = xmmap (NULL, old_size, PROT_READ | PROT_WRITE, ++ MAP_PRIVATE | MAP_ANONYMOUS, -1); ++ old_addr[0] = 1; ++ old_addr[old_size - 1] = 2; ++ ++ /* Test MREMAP_MAYMOVE. */ ++ size_t new_size = old_size + old_size; ++ char *new_addr = mremap (old_addr, old_size, new_size, MREMAP_MAYMOVE); ++ TEST_VERIFY_EXIT (new_addr != MAP_FAILED); ++ new_addr[0] = 1; ++ new_addr[new_size - 1] = 2; ++ xmunmap (new_addr, new_size); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/misc/tst-mremap2.c b/misc/tst-mremap2.c +new file mode 100644 +index 0000000000..45be7f0369 +--- /dev/null ++++ b/misc/tst-mremap2.c +@@ -0,0 +1,54 @@ ++/* Test mremap with MREMAP_FIXED. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <https://www.gnu.org/licenses/>. */ ++ ++#include <errno.h> ++#include <sys/mman.h> ++#include <support/xstdlib.h> ++#include <support/xunistd.h> ++#include <support/test-driver.h> ++#include <mremap-failure.h> ++ ++static int ++do_test (void) ++{ ++ size_t old_size = getpagesize (); ++ size_t new_size = old_size + old_size; ++ char *old_addr = xmmap (NULL, old_size, PROT_READ | PROT_WRITE, ++ MAP_PRIVATE | MAP_ANONYMOUS, -1); ++ old_addr[0] = 1; ++ old_addr[old_size - 1] = 2; ++ ++ char *fixed_addr = xmmap (NULL, new_size, PROT_READ | PROT_WRITE, ++ MAP_PRIVATE | MAP_ANONYMOUS, -1); ++ fixed_addr[0] = 1; ++ fixed_addr[new_size - 1] = 2; ++ ++ /* Test MREMAP_FIXED. */ ++ char *new_addr = mremap (old_addr, old_size, new_size, ++ MREMAP_FIXED | MREMAP_MAYMOVE, ++ fixed_addr); ++ if (new_addr == MAP_FAILED) ++ return mremap_failure_exit (errno); ++ new_addr[0] = 1; ++ new_addr[new_size - 1] = 2; ++ xmunmap (new_addr, new_size); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/sysdeps/generic/mremap-failure.h b/sysdeps/generic/mremap-failure.h +new file mode 100644 +index 0000000000..bc0d476368 +--- /dev/null ++++ b/sysdeps/generic/mremap-failure.h +@@ -0,0 +1,25 @@ ++/* mremap failure handling. Generic version. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <https://www.gnu.org/licenses/>. */ ++ ++/* Return exit value on mremap failure with errno ERR. */ ++ ++static int ++mremap_failure_exit (int err) ++{ ++ return EXIT_FAILURE; ++} +diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile +index 097b5a26fc..59998c7af4 100644 +--- a/sysdeps/unix/sysv/linux/Makefile ++++ b/sysdeps/unix/sysv/linux/Makefile +@@ -206,6 +206,7 @@ tests += \ + tst-getauxval \ + tst-gettid \ + tst-gettid-kill \ ++ tst-linux-mremap1 \ + tst-memfd_create \ + tst-misalign-clone \ + tst-mlock2 \ +diff --git a/sysdeps/unix/sysv/linux/mremap-failure.h b/sysdeps/unix/sysv/linux/mremap-failure.h +new file mode 100644 +index 0000000000..c99ab30ca9 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/mremap-failure.h +@@ -0,0 +1,30 @@ ++/* mremap failure handling. Linux version. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <https://www.gnu.org/licenses/>. */ ++ ++#include <support/check.h> ++ ++/* Return exit value on mremap failure with errno ERR. */ ++ ++static int ++mremap_failure_exit (int err) ++{ ++ if (err != EINVAL) ++ return EXIT_FAILURE; ++ ++ return EXIT_UNSUPPORTED; ++} +diff --git a/sysdeps/unix/sysv/linux/tst-linux-mremap1.c b/sysdeps/unix/sysv/linux/tst-linux-mremap1.c +new file mode 100644 +index 0000000000..408e8af2ab +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/tst-linux-mremap1.c +@@ -0,0 +1,63 @@ ++/* Test mremap with MREMAP_DONTUNMAP. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <https://www.gnu.org/licenses/>. */ ++ ++#include <errno.h> ++#include <sys/mman.h> ++#include <support/xstdlib.h> ++#include <support/xunistd.h> ++#include <support/check.h> ++#include <support/test-driver.h> ++#include <mremap-failure.h> ++ ++static int ++do_test (void) ++{ ++ size_t old_size = getpagesize (); ++ size_t new_size = old_size; ++ char *old_addr = xmmap (NULL, old_size, PROT_READ | PROT_WRITE, ++ MAP_PRIVATE | MAP_ANONYMOUS, -1); ++ old_addr[0] = 1; ++ old_addr[old_size - 1] = 2; ++ ++ /* Create an available 64-page mmap region. */ ++ size_t fixed_size = old_size * 64; ++ char *fixed_addr = xmmap (NULL, fixed_size, PROT_READ | PROT_WRITE, ++ MAP_PRIVATE | MAP_ANONYMOUS, -1); ++ xmunmap (fixed_addr, fixed_size); ++ ++ /* Add 3 * pagesize. */ ++ fixed_size += 3 * old_size; ++ ++ /* Test MREMAP_DONTUNMAP. It should return FIXED_ADDR created above. */ ++ char *new_addr = mremap (old_addr, old_size, new_size, ++ MREMAP_DONTUNMAP | MREMAP_MAYMOVE, ++ fixed_addr); ++ if (new_addr == MAP_FAILED) ++ return mremap_failure_exit (errno); ++ TEST_VERIFY_EXIT (fixed_addr == new_addr); ++ old_addr[0] = 3; ++ old_addr[old_size - 1] = 4; ++ new_addr[0] = 1; ++ new_addr[new_size - 1] = 2; ++ xmunmap (new_addr, new_size); ++ xmunmap (old_addr, old_size); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> + +commit 928769737c8f0cbb51dfa2a02de0594c2395d802 +Author: Florian Weimer <fweimer@redhat.com> +Date: Thu Aug 1 10:46:10 2024 +0200 + + resolv: Fix tst-resolv-short-response for older GCC (bug 32042) + + Previous GCC versions do not support the C23 change that + allows labels on declarations. + + Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> + (cherry picked from commit ec119972cb2598c04ec7d4219e20506006836f64) + +diff --git a/resolv/tst-resolv-short-response.c b/resolv/tst-resolv-short-response.c +index be354ae1c7..9b06b0c176 100644 +--- a/resolv/tst-resolv-short-response.c ++++ b/resolv/tst-resolv-short-response.c +@@ -33,8 +33,10 @@ response (const struct resolv_response_context *ctx, + { + case 0: + /* First server times out. */ +- struct resolv_response_flags flags = {.rcode = rcode}; +- resolv_response_init (b, flags); ++ { ++ struct resolv_response_flags flags = {.rcode = rcode}; ++ resolv_response_init (b, flags); ++ } + break; + case 1: + /* Second server sends reply. */ + +commit aa533d58ff12e27771d9c960a727d74992a3f2a3 +Author: Florian Weimer <fweimer@redhat.com> +Date: Fri Aug 2 15:22:14 2024 +0200 + + x86: Tunables may incorrectly set Prefer_PMINUB_for_stringop (bug 32047) + + Fixes commit 5bcf6265f215326d14dfacdce8532792c2c7f8f8 ("x86: + Disable non-temporal memset on Skylake Server"). + + Reviewed-by: Noah Goldstein <goldstein.w.n@gmail.com> + (cherry picked from commit 7a630f7d3392ca391a399486ce2846f9e4b4ee63) + +diff --git a/sysdeps/x86/cpu-tunables.c b/sysdeps/x86/cpu-tunables.c +index ae9dcd6180..ccc6b64dc2 100644 +--- a/sysdeps/x86/cpu-tunables.c ++++ b/sysdeps/x86/cpu-tunables.c +@@ -248,6 +248,7 @@ TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *valp) + CHECK_GLIBC_IFUNC_PREFERRED_BOTH (n, cpu_features, + Avoid_Non_Temporal_Memset, 25); + } ++ break; + case 26: + { + CHECK_GLIBC_IFUNC_PREFERRED_NEED_BOTH + +commit 6a97e2ba144a554809161d488f25e4bae07c9405 +Author: Andreas Schwab <schwab@suse.de> +Date: Mon Aug 5 10:55:51 2024 +0200 + + Fix name space violation in fortify wrappers (bug 32052) + + Rename the identifier sz to __sz everywhere. + + Fixes: a643f60c53 ("Make sure that the fortified function conditionals are constant") + (cherry picked from commit 39ca997ab378990d5ac1aadbaa52aaf1db6d526f) + +diff --git a/NEWS b/NEWS +index 8da0408ad9..b9eb4a558b 100644 +--- a/NEWS ++++ b/NEWS +@@ -13,6 +13,7 @@ The following bugs are resolved with this release: + [31968] mremap implementation in C does not handle arguments correctly + [31890] resolv: Allow short error responses to match any DNS query + [31968] mremap implementation in C does not handle arguments correctly ++ [32052] Name space violation in fortify wrappers + + Version 2.40 + +diff --git a/libio/bits/stdio2.h b/libio/bits/stdio2.h +index 91a80dd7c6..4b8bc35bdf 100644 +--- a/libio/bits/stdio2.h ++++ b/libio/bits/stdio2.h +@@ -308,14 +308,14 @@ fgets (__fortify_clang_overload_arg (char *, __restrict, __s), int __n, + "fgets called with bigger size than length of " + "destination buffer") + { +- size_t sz = __glibc_objsize (__s); +- if (__glibc_safe_or_unknown_len (__n, sizeof (char), sz)) ++ size_t __sz = __glibc_objsize (__s); ++ if (__glibc_safe_or_unknown_len (__n, sizeof (char), __sz)) + return __fgets_alias (__s, __n, __stream); + #if !__fortify_use_clang +- if (__glibc_unsafe_len (__n, sizeof (char), sz)) +- return __fgets_chk_warn (__s, sz, __n, __stream); ++ if (__glibc_unsafe_len (__n, sizeof (char), __sz)) ++ return __fgets_chk_warn (__s, __sz, __n, __stream); + #endif +- return __fgets_chk (__s, sz, __n, __stream); ++ return __fgets_chk (__s, __sz, __n, __stream); + } + + __fortify_function __wur __nonnull ((4)) __attribute_overloadable__ size_t +@@ -326,14 +326,14 @@ fread (__fortify_clang_overload_arg (void *, __restrict, __ptr), + "fread called with bigger size * n than length " + "of destination buffer") + { +- size_t sz = __glibc_objsize0 (__ptr); +- if (__glibc_safe_or_unknown_len (__n, __size, sz)) ++ size_t __sz = __glibc_objsize0 (__ptr); ++ if (__glibc_safe_or_unknown_len (__n, __size, __sz)) + return __fread_alias (__ptr, __size, __n, __stream); + #if !__fortify_use_clang +- if (__glibc_unsafe_len (__n, __size, sz)) +- return __fread_chk_warn (__ptr, sz, __size, __n, __stream); ++ if (__glibc_unsafe_len (__n, __size, __sz)) ++ return __fread_chk_warn (__ptr, __sz, __size, __n, __stream); + #endif +- return __fread_chk (__ptr, sz, __size, __n, __stream); ++ return __fread_chk (__ptr, __sz, __size, __n, __stream); + } + + #ifdef __USE_GNU +@@ -345,14 +345,14 @@ fgets_unlocked (__fortify_clang_overload_arg (char *, __restrict, __s), + "fgets called with bigger size than length of " + "destination buffer") + { +- size_t sz = __glibc_objsize (__s); +- if (__glibc_safe_or_unknown_len (__n, sizeof (char), sz)) ++ size_t __sz = __glibc_objsize (__s); ++ if (__glibc_safe_or_unknown_len (__n, sizeof (char), __sz)) + return __fgets_unlocked_alias (__s, __n, __stream); + #if !__fortify_use_clang +- if (__glibc_unsafe_len (__n, sizeof (char), sz)) +- return __fgets_unlocked_chk_warn (__s, sz, __n, __stream); ++ if (__glibc_unsafe_len (__n, sizeof (char), __sz)) ++ return __fgets_unlocked_chk_warn (__s, __sz, __n, __stream); + #endif +- return __fgets_unlocked_chk (__s, sz, __n, __stream); ++ return __fgets_unlocked_chk (__s, __sz, __n, __stream); + } + #endif + +@@ -366,8 +366,8 @@ fread_unlocked (__fortify_clang_overload_arg0 (void *, __restrict, __ptr), + "fread_unlocked called with bigger size * n than " + "length of destination buffer") + { +- size_t sz = __glibc_objsize0 (__ptr); +- if (__glibc_safe_or_unknown_len (__n, __size, sz)) ++ size_t __sz = __glibc_objsize0 (__ptr); ++ if (__glibc_safe_or_unknown_len (__n, __size, __sz)) + { + # ifdef __USE_EXTERN_INLINES + if (__builtin_constant_p (__size) +@@ -393,10 +393,10 @@ fread_unlocked (__fortify_clang_overload_arg0 (void *, __restrict, __ptr), + return __fread_unlocked_alias (__ptr, __size, __n, __stream); + } + # if !__fortify_use_clang +- if (__glibc_unsafe_len (__n, __size, sz)) +- return __fread_unlocked_chk_warn (__ptr, sz, __size, __n, __stream); ++ if (__glibc_unsafe_len (__n, __size, __sz)) ++ return __fread_unlocked_chk_warn (__ptr, __sz, __size, __n, __stream); + # endif +- return __fread_unlocked_chk (__ptr, sz, __size, __n, __stream); ++ return __fread_unlocked_chk (__ptr, __sz, __size, __n, __stream); + + } + #endif +diff --git a/socket/bits/socket2.h b/socket/bits/socket2.h +index 04780f320e..bd91647f37 100644 +--- a/socket/bits/socket2.h ++++ b/socket/bits/socket2.h +@@ -37,14 +37,14 @@ recv (int __fd, __fortify_clang_overload_arg0 (void *, ,__buf), size_t __n, + "recv called with bigger length than " + "size of destination buffer") + { +- size_t sz = __glibc_objsize0 (__buf); +- if (__glibc_safe_or_unknown_len (__n, sizeof (char), sz)) ++ size_t __sz = __glibc_objsize0 (__buf); ++ if (__glibc_safe_or_unknown_len (__n, sizeof (char), __sz)) + return __recv_alias (__fd, __buf, __n, __flags); + #if !__fortify_use_clang +- if (__glibc_unsafe_len (__n, sizeof (char), sz)) +- return __recv_chk_warn (__fd, __buf, __n, sz, __flags); ++ if (__glibc_unsafe_len (__n, sizeof (char), __sz)) ++ return __recv_chk_warn (__fd, __buf, __n, __sz, __flags); + #endif +- return __recv_chk (__fd, __buf, __n, sz, __flags); ++ return __recv_chk (__fd, __buf, __n, __sz, __flags); + } + + extern ssize_t __recvfrom_chk (int __fd, void *__restrict __buf, size_t __n, +@@ -71,13 +71,13 @@ recvfrom (int __fd, __fortify_clang_overload_arg0 (void *, __restrict, __buf), + "recvfrom called with bigger length " + "than size of destination buffer") + { +- size_t sz = __glibc_objsize0 (__buf); +- if (__glibc_safe_or_unknown_len (__n, sizeof (char), sz)) ++ size_t __sz = __glibc_objsize0 (__buf); ++ if (__glibc_safe_or_unknown_len (__n, sizeof (char), __sz)) + return __recvfrom_alias (__fd, __buf, __n, __flags, __addr, __addr_len); + #if !__fortify_use_clang +- if (__glibc_unsafe_len (__n, sizeof (char), sz)) +- return __recvfrom_chk_warn (__fd, __buf, __n, sz, __flags, __addr, ++ if (__glibc_unsafe_len (__n, sizeof (char), __sz)) ++ return __recvfrom_chk_warn (__fd, __buf, __n, __sz, __flags, __addr, + __addr_len); + #endif +- return __recvfrom_chk (__fd, __buf, __n, sz, __flags, __addr, __addr_len); ++ return __recvfrom_chk (__fd, __buf, __n, __sz, __flags, __addr, __addr_len); + } +diff --git a/stdlib/bits/stdlib.h b/stdlib/bits/stdlib.h +index 1557b862b1..9c78ecf458 100644 +--- a/stdlib/bits/stdlib.h ++++ b/stdlib/bits/stdlib.h +@@ -43,16 +43,16 @@ __NTH (realpath (const char *__restrict __name, + "bytes long buffer") + #endif + { +- size_t sz = __glibc_objsize (__resolved); ++ size_t __sz = __glibc_objsize (__resolved); + +- if (sz == (size_t) -1) ++ if (__sz == (size_t) -1) + return __realpath_alias (__name, __resolved); + + #if !__fortify_use_clang && defined _LIBC_LIMITS_H_ && defined PATH_MAX +- if (__glibc_unsafe_len (PATH_MAX, sizeof (char), sz)) +- return __realpath_chk_warn (__name, __resolved, sz); ++ if (__glibc_unsafe_len (PATH_MAX, sizeof (char), __sz)) ++ return __realpath_chk_warn (__name, __resolved, __sz); + #endif +- return __realpath_chk (__name, __resolved, sz); ++ return __realpath_chk (__name, __resolved, __sz); + } + + +diff --git a/wcsmbs/bits/wchar2.h b/wcsmbs/bits/wchar2.h +index 9fdff47ee2..43c6b63027 100644 +--- a/wcsmbs/bits/wchar2.h ++++ b/wcsmbs/bits/wchar2.h +@@ -74,9 +74,9 @@ __fortify_function __attribute_overloadable__ wchar_t * + __NTH (wcscpy (__fortify_clang_overload_arg (wchar_t *, __restrict, __dest), + const wchar_t *__restrict __src)) + { +- size_t sz = __glibc_objsize (__dest); +- if (sz != (size_t) -1) +- return __wcscpy_chk (__dest, __src, sz / sizeof (wchar_t)); ++ size_t __sz = __glibc_objsize (__dest); ++ if (__sz != (size_t) -1) ++ return __wcscpy_chk (__dest, __src, __sz / sizeof (wchar_t)); + return __wcscpy_alias (__dest, __src); + } + +@@ -84,9 +84,9 @@ __fortify_function __attribute_overloadable__ wchar_t * + __NTH (wcpcpy (__fortify_clang_overload_arg (wchar_t *, __restrict, __dest), + const wchar_t *__restrict __src)) + { +- size_t sz = __glibc_objsize (__dest); +- if (sz != (size_t) -1) +- return __wcpcpy_chk (__dest, __src, sz / sizeof (wchar_t)); ++ size_t __sz = __glibc_objsize (__dest); ++ if (__sz != (size_t) -1) ++ return __wcpcpy_chk (__dest, __src, __sz / sizeof (wchar_t)); + return __wcpcpy_alias (__dest, __src); + } + +@@ -118,9 +118,9 @@ __fortify_function __attribute_overloadable__ wchar_t * + __NTH (wcscat (__fortify_clang_overload_arg (wchar_t *, __restrict, __dest), + const wchar_t *__restrict __src)) + { +- size_t sz = __glibc_objsize (__dest); +- if (sz != (size_t) -1) +- return __wcscat_chk (__dest, __src, sz / sizeof (wchar_t)); ++ size_t __sz = __glibc_objsize (__dest); ++ if (__sz != (size_t) -1) ++ return __wcscat_chk (__dest, __src, __sz / sizeof (wchar_t)); + return __wcscat_alias (__dest, __src); + } + +@@ -128,9 +128,9 @@ __fortify_function __attribute_overloadable__ wchar_t * + __NTH (wcsncat (__fortify_clang_overload_arg (wchar_t *, __restrict, __dest), + const wchar_t *__restrict __src, size_t __n)) + { +- size_t sz = __glibc_objsize (__dest); +- if (sz != (size_t) -1) +- return __wcsncat_chk (__dest, __src, __n, sz / sizeof (wchar_t)); ++ size_t __sz = __glibc_objsize (__dest); ++ if (__sz != (size_t) -1) ++ return __wcsncat_chk (__dest, __src, __n, __sz / sizeof (wchar_t)); + return __wcsncat_alias (__dest, __src, __n); + } + +@@ -170,10 +170,10 @@ __fortify_function int + __NTH (swprintf (wchar_t *__restrict __s, size_t __n, + const wchar_t *__restrict __fmt, ...)) + { +- size_t sz = __glibc_objsize (__s); +- if (sz != (size_t) -1 || __USE_FORTIFY_LEVEL > 1) ++ size_t __sz = __glibc_objsize (__s); ++ if (__sz != (size_t) -1 || __USE_FORTIFY_LEVEL > 1) + return __swprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1, +- sz / sizeof (wchar_t), __fmt, __va_arg_pack ()); ++ __sz / sizeof (wchar_t), __fmt, __va_arg_pack ()); + return __swprintf_alias (__s, __n, __fmt, __va_arg_pack ()); + } + #elif __fortify_use_clang +@@ -206,10 +206,10 @@ __fortify_function int + __NTH (vswprintf (wchar_t *__restrict __s, size_t __n, + const wchar_t *__restrict __fmt, __gnuc_va_list __ap)) + { +- size_t sz = __glibc_objsize (__s); +- if (sz != (size_t) -1 || __USE_FORTIFY_LEVEL > 1) ++ size_t __sz = __glibc_objsize (__s); ++ if (__sz != (size_t) -1 || __USE_FORTIFY_LEVEL > 1) + return __vswprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1, +- sz / sizeof (wchar_t), __fmt, __ap); ++ __sz / sizeof (wchar_t), __fmt, __ap); + return __vswprintf_alias (__s, __n, __fmt, __ap); + } + +@@ -257,14 +257,14 @@ fgetws (__fortify_clang_overload_arg (wchar_t *, __restrict, __s), int __n, + "fgetws called with length bigger " + "than size of destination buffer") + { +- size_t sz = __glibc_objsize (__s); +- if (__glibc_safe_or_unknown_len (__n, sizeof (wchar_t), sz)) ++ size_t __sz = __glibc_objsize (__s); ++ if (__glibc_safe_or_unknown_len (__n, sizeof (wchar_t), __sz)) + return __fgetws_alias (__s, __n, __stream); + #if !__fortify_use_clang +- if (__glibc_unsafe_len (__n, sizeof (wchar_t), sz)) +- return __fgetws_chk_warn (__s, sz / sizeof (wchar_t), __n, __stream); ++ if (__glibc_unsafe_len (__n, sizeof (wchar_t), __sz)) ++ return __fgetws_chk_warn (__s, __sz / sizeof (wchar_t), __n, __stream); + #endif +- return __fgetws_chk (__s, sz / sizeof (wchar_t), __n, __stream); ++ return __fgetws_chk (__s, __sz / sizeof (wchar_t), __n, __stream); + } + + #ifdef __USE_GNU +@@ -275,15 +275,15 @@ fgetws_unlocked (__fortify_clang_overload_arg (wchar_t *, __restrict, __s), + "fgetws_unlocked called with length bigger " + "than size of destination buffer") + { +- size_t sz = __glibc_objsize (__s); +- if (__glibc_safe_or_unknown_len (__n, sizeof (wchar_t), sz)) ++ size_t __sz = __glibc_objsize (__s); ++ if (__glibc_safe_or_unknown_len (__n, sizeof (wchar_t), __sz)) + return __fgetws_unlocked_alias (__s, __n, __stream); + # if !__fortify_use_clang +- if (__glibc_unsafe_len (__n, sizeof (wchar_t), sz)) +- return __fgetws_unlocked_chk_warn (__s, sz / sizeof (wchar_t), __n, ++ if (__glibc_unsafe_len (__n, sizeof (wchar_t), __sz)) ++ return __fgetws_unlocked_chk_warn (__s, __sz / sizeof (wchar_t), __n, + __stream); + # endif +- return __fgetws_unlocked_chk (__s, sz / sizeof (wchar_t), __n, __stream); ++ return __fgetws_unlocked_chk (__s, __sz / sizeof (wchar_t), __n, __stream); + } + #endif + + +commit 5641780762723156b0d20a0b9f7df1d76831bab0 +Author: Arjun Shankar <arjun@redhat.com> +Date: Tue Jul 30 11:37:57 2024 +0200 + + manual/stdio: Further clarify putc, putwc, getc, and getwc + + This is a follow-up to 10de4a47ef3f481592e3c62eb07bcda23e9fde4d that + reworded the manual entries for putc and putwc and removed any + performance claims. + + This commit further clarifies these entries and brings getc and getwc in + line with the descriptions of putc and putwc, removing any performance + claims from them as well. + Reviewed-by: Florian Weimer <fweimer@redhat.com> + + (cherry picked from commit 942670c81dc8071dd75d6213e771daa5d2084cb6) + +diff --git a/manual/stdio.texi b/manual/stdio.texi +index f9529a098d..8517653507 100644 +--- a/manual/stdio.texi ++++ b/manual/stdio.texi +@@ -904,20 +904,16 @@ This function is a GNU extension. + @standards{ISO, stdio.h} + @safety{@prelim{}@mtsafe{}@asunsafe{@asucorrupt{}}@acunsafe{@acucorrupt{} @aculock{}}} + This is just like @code{fputc}, except that it may be implemented as +-a macro, making it faster. One consequence is that it may evaluate the +-@var{stream} argument more than once, which is an exception to the +-general rule for macros. Therefore, @var{stream} should never be an +-expression with side-effects. ++a macro and may evaluate the @var{stream} argument more than once. ++Therefore, @var{stream} should never be an expression with side-effects. + @end deftypefun + + @deftypefun wint_t putwc (wchar_t @var{wc}, FILE *@var{stream}) + @standards{ISO, wchar.h} + @safety{@prelim{}@mtsafe{}@asunsafe{@asucorrupt{}}@acunsafe{@acucorrupt{} @aculock{}}} + This is just like @code{fputwc}, except that it may be implemented as +-a macro, making it faster. One consequence is that it may evaluate the +-@var{stream} argument more than once, which is an exception to the +-general rule for macros. Therefore, @var{stream} should never be an +-expression with side-effects. ++a macro and may evaluate the @var{stream} argument more than once. ++Therefore, @var{stream} should never be an expression with side-effects. + @end deftypefun + + @deftypefun int putc_unlocked (int @var{c}, FILE *@var{stream}) +@@ -1110,20 +1106,17 @@ This function is a GNU extension. + @deftypefun int getc (FILE *@var{stream}) + @standards{ISO, stdio.h} + @safety{@prelim{}@mtsafe{}@asunsafe{@asucorrupt{}}@acunsafe{@aculock{} @acucorrupt{}}} +-This is just like @code{fgetc}, except that it is permissible (and +-typical) for it to be implemented as a macro that evaluates the +-@var{stream} argument more than once. @code{getc} is often highly +-optimized, so it is usually the best function to use to read a single +-character. ++This is just like @code{fgetc}, except that it may be implemented as ++a macro and may evaluate the @var{stream} argument more than once. ++Therefore, @var{stream} should never be an expression with side-effects. + @end deftypefun + + @deftypefun wint_t getwc (FILE *@var{stream}) + @standards{ISO, wchar.h} + @safety{@prelim{}@mtsafe{}@asunsafe{@asucorrupt{}}@acunsafe{@aculock{} @acucorrupt{}}} +-This is just like @code{fgetwc}, except that it is permissible for it to +-be implemented as a macro that evaluates the @var{stream} argument more +-than once. @code{getwc} can be highly optimized, so it is usually the +-best function to use to read a single wide character. ++This is just like @code{fgetwc}, except that it may be implemented as ++a macro and may evaluate the @var{stream} argument more than once. ++Therefore, @var{stream} should never be an expression with side-effects. + @end deftypefun + + @deftypefun int getc_unlocked (FILE *@var{stream}) + +commit 39ee60a719eb6ffde76ccc232d79273c473d7a93 +Author: Florian Weimer <fweimer@redhat.com> +Date: Fri Aug 9 17:01:17 2024 +0200 + + support: Add options list terminator to the test driver + + This avoids crashes if a test is passed unknown options. + + Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> + (cherry picked from commit c2a474f4617ede7a8bf56b7257acb37dc757b2d1) + +diff --git a/support/test-driver.c b/support/test-driver.c +index f4c3e4d666..04ceebc08f 100644 +--- a/support/test-driver.c ++++ b/support/test-driver.c +@@ -155,6 +155,7 @@ main (int argc, char **argv) + { + CMDLINE_OPTIONS + TEST_DEFAULT_OPTIONS ++ { 0, } + }; + test_config.options = &options; + #endif + +commit e3556937c2402b8acf2e586bf53168e9f482ba91 +Author: H.J. Lu <hjl.tools@gmail.com> +Date: Mon Jul 22 17:47:21 2024 -0700 + + x86-64: Remove sysdeps/x86_64/x32/dl-machine.h + + Remove sysdeps/x86_64/x32/dl-machine.h by folding x32 ARCH_LA_PLTENTER, + ARCH_LA_PLTEXIT and RTLD_START into sysdeps/x86_64/dl-machine.h. There + are no regressions on x86-64 nor x32. There are no changes in x86-64 + _dl_start_user. On x32, _dl_start_user changes are + + <_dl_start_user>: + mov %eax,%r12d + + mov %esp,%r13d + mov (%rsp),%edx + mov %edx,%esi + - mov %esp,%r13d + and $0xfffffff0,%esp + mov 0x0(%rip),%edi # <_dl_start_user+0x14> + lea 0x8(%r13,%rdx,4),%ecx + + Signed-off-by: H.J. Lu <hjl.tools@gmail.com> + Reviewed-by: Noah Goldstein <goldstein.w.n@gmail.com> + (cherry picked from commit 652c6cf26927352fc0e37e4e60c6fc98ddf6d3b4) + +diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h +index a6de3793e4..4f12955875 100644 +--- a/sysdeps/x86_64/dl-machine.h ++++ b/sysdeps/x86_64/dl-machine.h +@@ -139,37 +139,37 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], + .globl _start\n\ + .globl _dl_start_user\n\ + _start:\n\ +- movq %rsp, %rdi\n\ ++ mov %" RSP_LP ", %" RDI_LP "\n\ + call _dl_start\n\ + _dl_start_user:\n\ + # Save the user entry point address in %r12.\n\ +- movq %rax, %r12\n\ ++ mov %" RAX_LP ", %" R12_LP "\n\ + # Save %rsp value in %r13.\n\ +- movq %rsp, %r13\n\ ++ mov %" RSP_LP ", % " R13_LP "\n\ + "\ + RTLD_START_ENABLE_X86_FEATURES \ + "\ + # Read the original argument count.\n\ +- movq (%rsp), %rdx\n\ ++ mov (%rsp), %" RDX_LP "\n\ + # Call _dl_init (struct link_map *main_map, int argc, char **argv, char **env)\n\ + # argc -> rsi\n\ +- movq %rdx, %rsi\n\ ++ mov %" RDX_LP ", %" RSI_LP "\n\ + # And align stack for the _dl_init call. \n\ +- andq $-16, %rsp\n\ ++ and $-16, %" RSP_LP "\n\ + # _dl_loaded -> rdi\n\ +- movq _rtld_local(%rip), %rdi\n\ ++ mov _rtld_local(%rip), %" RDI_LP "\n\ + # env -> rcx\n\ +- leaq 16(%r13,%rdx,8), %rcx\n\ ++ lea 2*" LP_SIZE "(%r13,%rdx," LP_SIZE "), %" RCX_LP "\n\ + # argv -> rdx\n\ +- leaq 8(%r13), %rdx\n\ ++ lea " LP_SIZE "(%r13), %" RDX_LP "\n\ + # Clear %rbp to mark outermost frame obviously even for constructors.\n\ + xorl %ebp, %ebp\n\ + # Call the function to run the initializers.\n\ + call _dl_init\n\ + # Pass our finalizer function to the user in %rdx, as per ELF ABI.\n\ +- leaq _dl_fini(%rip), %rdx\n\ ++ lea _dl_fini(%rip), %" RDX_LP "\n\ + # And make sure %rsp points to argc stored on the stack.\n\ +- movq %r13, %rsp\n\ ++ mov %" R13_LP ", %" RSP_LP "\n\ + # Jump to the user's entry point.\n\ + jmp *%r12\n\ + .previous\n\ +@@ -234,8 +234,13 @@ elf_machine_plt_value (struct link_map *map, const ElfW(Rela) *reloc, + + + /* Names of the architecture-specific auditing callback functions. */ ++#ifdef __LP64__ + #define ARCH_LA_PLTENTER x86_64_gnu_pltenter + #define ARCH_LA_PLTEXIT x86_64_gnu_pltexit ++#else ++#define ARCH_LA_PLTENTER x32_gnu_pltenter ++#define ARCH_LA_PLTEXIT x32_gnu_pltexit ++#endif + + #endif /* !dl_machine_h */ + +diff --git a/sysdeps/x86_64/x32/dl-machine.h b/sysdeps/x86_64/x32/dl-machine.h +deleted file mode 100644 +index c35cee9261..0000000000 +--- a/sysdeps/x86_64/x32/dl-machine.h ++++ /dev/null +@@ -1,76 +0,0 @@ +-/* Machine-dependent ELF dynamic relocation inline functions. x32 version. +- Copyright (C) 2012-2024 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. +- +- The GNU C Library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public +- License along with the GNU C Library; if not, see +- <https://www.gnu.org/licenses/>. */ +- +-/* Must allow <sysdeps/x86_64/dl-machine.h> to be included more than once. +- See #ifdef RESOLVE_MAP in sysdeps/x86_64/dl-machine.h. */ +-#include <sysdeps/x86_64/dl-machine.h> +- +-#ifndef _X32_DL_MACHINE_H +-#define _X32_DL_MACHINE_H +- +-#undef ARCH_LA_PLTENTER +-#undef ARCH_LA_PLTEXIT +-#undef RTLD_START +- +-/* Names of the architecture-specific auditing callback functions. */ +-#define ARCH_LA_PLTENTER x32_gnu_pltenter +-#define ARCH_LA_PLTEXIT x32_gnu_pltexit +- +-/* Initial entry point code for the dynamic linker. +- The C function `_dl_start' is the real entry point; +- its return value is the user program's entry point. */ +-#define RTLD_START asm ("\n\ +-.text\n\ +- .p2align 4\n\ +-.globl _start\n\ +-.globl _dl_start_user\n\ +-_start:\n\ +- movl %esp, %edi\n\ +- call _dl_start\n\ +-_dl_start_user:\n\ +- # Save the user entry point address in %r12.\n\ +- movl %eax, %r12d\n\ +- # Read the original argument count.\n\ +- movl (%rsp), %edx\n\ +- # Call _dl_init (struct link_map *main_map, int argc, char **argv, char **env)\n\ +- # argc -> rsi\n\ +- movl %edx, %esi\n\ +- # Save %rsp value in %r13.\n\ +- movl %esp, %r13d\n\ +- # And align stack for the _dl_init call.\n\ +- and $-16, %esp\n\ +- # _dl_loaded -> rdi\n\ +- movl _rtld_local(%rip), %edi\n\ +- # env -> rcx\n\ +- lea 8(%r13,%rdx,4), %ecx\n\ +- # argv -> rdx\n\ +- lea 4(%r13), %edx\n\ +- # Clear %rbp to mark outermost frame obviously even for constructors.\n\ +- xorl %ebp, %ebp\n\ +- # Call the function to run the initializers.\n\ +- call _dl_init\n\ +- # Pass our finalizer function to the user in %rdx, as per ELF ABI.\n\ +- lea _dl_fini(%rip), %edx\n\ +- # And make sure %rsp points to argc stored on the stack.\n\ +- movl %r13d, %esp\n\ +- # Jump to the user's entry point.\n\ +- jmp *%r12\n\ +-.previous\n\ +-"); +- +-#endif /* !_X32_DL_MACHINE_H */ + +commit 898f25e0b1026be5701d05715600be646e9d0714 +Author: H.J. Lu <hjl.tools@gmail.com> +Date: Mon Jul 22 17:47:22 2024 -0700 + + x32/cet: Support shadow stack during startup for Linux 6.10 + + Use RXX_LP in RTLD_START_ENABLE_X86_FEATURES. Support shadow stack during + startup for Linux 6.10: + + commit 2883f01ec37dd8668e7222dfdb5980c86fdfe277 + Author: H.J. Lu <hjl.tools@gmail.com> + Date: Fri Mar 15 07:04:33 2024 -0700 + + x86/shstk: Enable shadow stacks for x32 + + 1. Add shadow stack support to x32 signal. + 2. Use the 64-bit map_shadow_stack syscall for x32. + 3. Set up shadow stack for x32. + + Add the map_shadow_stack system call to <fixup-asm-unistd.h> and regenerate + arch-syscall.h. Tested on Intel Tiger Lake with CET enabled x32. There + are no regressions with CET enabled x86-64. There are no changes in CET + enabled x86-64 _dl_start_user. + + Signed-off-by: H.J. Lu <hjl.tools@gmail.com> + Reviewed-by: Noah Goldstein <goldstein.w.n@gmail.com> + (cherry picked from commit 8344c1f5514b1b5b1c8c6e48f4b802653bd23b71) + +diff --git a/sysdeps/unix/sysv/linux/x86_64/dl-cet.h b/sysdeps/unix/sysv/linux/x86_64/dl-cet.h +index 1fe3133406..b4f7e6c9cd 100644 +--- a/sysdeps/unix/sysv/linux/x86_64/dl-cet.h ++++ b/sysdeps/unix/sysv/linux/x86_64/dl-cet.h +@@ -92,9 +92,9 @@ dl_cet_ibt_enabled (void) + # Pass GL(dl_x86_feature_1) to _dl_cet_setup_features.\n\ + movl %edx, %edi\n\ + # Align stack for the _dl_cet_setup_features call.\n\ +- andq $-16, %rsp\n\ ++ and $-16, %" RSP_LP "\n\ + call _dl_cet_setup_features\n\ + # Restore %rax and %rsp from %r12 and %r13.\n\ +- movq %r12, %rax\n\ +- movq %r13, %rsp\n\ ++ mov %" R12_LP ", %" RAX_LP "\n\ ++ mov %" R13_LP ", %" RSP_LP "\n\ + " +diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/arch-syscall.h b/sysdeps/unix/sysv/linux/x86_64/x32/arch-syscall.h +index 3040a47d72..df3e22236d 100644 +--- a/sysdeps/unix/sysv/linux/x86_64/x32/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/x86_64/x32/arch-syscall.h +@@ -155,6 +155,7 @@ + #define __NR_lsm_set_self_attr 1073742284 + #define __NR_lstat 1073741830 + #define __NR_madvise 1073741852 ++#define __NR_map_shadow_stack 1073742277 + #define __NR_mbind 1073742061 + #define __NR_membarrier 1073742148 + #define __NR_memfd_create 1073742143 +diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/fixup-asm-unistd.h b/sysdeps/unix/sysv/linux/x86_64/x32/fixup-asm-unistd.h +index 98124169e6..47fa8af4ce 100644 +--- a/sysdeps/unix/sysv/linux/x86_64/x32/fixup-asm-unistd.h ++++ b/sysdeps/unix/sysv/linux/x86_64/x32/fixup-asm-unistd.h +@@ -15,6 +15,10 @@ + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + ++#ifndef __NR_map_shadow_stack ++# define __NR_map_shadow_stack 1073742277 ++#endif ++ + /* X32 uses the same 64-bit syscall interface for set_thread_area. */ + #ifndef __NR_set_thread_area + # define __NR_set_thread_area 1073742029 + +commit c0af0c2ba016030c778bc22c55f5f9498f96b8b9 +Author: Noah Goldstein <goldstein.w.n@gmail.com> +Date: Tue Aug 13 23:29:14 2024 +0800 + + x86: Fix bug in strchrnul-evex512 [BZ #32078] + + Issue was we were expecting not matches with CHAR before the start of + the string in the page cross case. + + The check code in the page cross case: + ``` + and $0xffffffffffffffc0,%rax + vmovdqa64 (%rax),%zmm17 + vpcmpneqb %zmm17,%zmm16,%k1 + vptestmb %zmm17,%zmm17,%k0{%k1} + kmovq %k0,%rax + inc %rax + shr %cl,%rax + je L(continue) + ``` + + expects that all characters that neither match null nor CHAR will be + 1s in `rax` prior to the `inc`. Then the `inc` will overflow all of + the 1s where no relevant match was found. + + This is incorrect in the page-cross case, as the + `vmovdqa64 (%rax),%zmm17` loads from before the start of the input + string. + + If there are matches with CHAR before the start of the string, `rax` + won't properly overflow. + + The fix is quite simple. Just replace: + + ``` + inc %rax + shr %cl,%rax + ``` + With: + ``` + sar %cl,%rax + inc %rax + ``` + + The arithmetic shift will clear any matches prior to the start of the + string while maintaining the signbit so the 1s can properly overflow + to zero in the case of no matches. + Reviewed-by: H.J. Lu <hjl.tools@gmail.com> + + (cherry picked from commit 7da08862471dfec6fdae731c2a5f351ad485c71f) + +diff --git a/string/test-strchr.c b/string/test-strchr.c +index c795eac6fa..72b17af687 100644 +--- a/string/test-strchr.c ++++ b/string/test-strchr.c +@@ -255,6 +255,69 @@ check1 (void) + check_result (impl, s, c, exp_result); + } + ++static void ++check2 (void) ++{ ++ CHAR *s = (CHAR *) (buf1 + getpagesize () - 4 * sizeof (CHAR)); ++ CHAR *s_begin = (CHAR *) (buf1 + getpagesize () - 64); ++#ifndef USE_FOR_STRCHRNUL ++ CHAR *exp_result = NULL; ++#else ++ CHAR *exp_result = s + 1; ++#endif ++ CHAR val = 0x12; ++ for (; s_begin != s; ++s_begin) ++ *s_begin = val; ++ ++ s[0] = val + 1; ++ s[1] = 0; ++ s[2] = val + 1; ++ s[3] = val + 1; ++ ++ { ++ FOR_EACH_IMPL (impl, 0) ++ check_result (impl, s, val, exp_result); ++ } ++ s[3] = val; ++ { ++ FOR_EACH_IMPL (impl, 0) ++ check_result (impl, s, val, exp_result); ++ } ++ exp_result = s; ++ s[0] = val; ++ { ++ FOR_EACH_IMPL (impl, 0) ++ check_result (impl, s, val, exp_result); ++ } ++ ++ s[3] = val + 1; ++ { ++ FOR_EACH_IMPL (impl, 0) ++ check_result (impl, s, val, exp_result); ++ } ++ ++ s[0] = val + 1; ++ s[1] = val + 1; ++ s[2] = val + 1; ++ s[3] = val + 1; ++ s[4] = val; ++ exp_result = s + 4; ++ { ++ FOR_EACH_IMPL (impl, 0) ++ check_result (impl, s, val, exp_result); ++ } ++ s[4] = 0; ++#ifndef USE_FOR_STRCHRNUL ++ exp_result = NULL; ++#else ++ exp_result = s + 4; ++#endif ++ { ++ FOR_EACH_IMPL (impl, 0) ++ check_result (impl, s, val, exp_result); ++ } ++} ++ + int + test_main (void) + { +@@ -263,7 +326,7 @@ test_main (void) + test_init (); + + check1 (); +- ++ check2 (); + printf ("%20s", ""); + FOR_EACH_IMPL (impl, 0) + printf ("\t%s", impl->name); +diff --git a/sysdeps/x86_64/multiarch/strchr-evex-base.S b/sysdeps/x86_64/multiarch/strchr-evex-base.S +index 04e2c0e79e..3a0b7c9d64 100644 +--- a/sysdeps/x86_64/multiarch/strchr-evex-base.S ++++ b/sysdeps/x86_64/multiarch/strchr-evex-base.S +@@ -124,13 +124,13 @@ L(page_cross): + VPCMPNE %VMM(1), %VMM(0), %k1 + VPTEST %VMM(1), %VMM(1), %k0{%k1} + KMOV %k0, %VRAX +-# ifdef USE_AS_WCSCHR ++ sar %cl, %VRAX ++#ifdef USE_AS_WCSCHR + sub $VEC_MATCH_MASK, %VRAX +-# else ++#else + inc %VRAX +-# endif ++#endif + /* Ignore number of character for alignment adjustment. */ +- shr %cl, %VRAX + jz L(align_more) + + bsf %VRAX, %VRAX + +commit 586e4cd8c67df95ebb0bfecea3d007bff618d6d9 +Author: Florian Weimer <fweimer@redhat.com> +Date: Fri Aug 9 16:17:14 2024 +0200 + + Define __libc_initial for the static libc + + Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> + (cherry picked from commit eb0e50e9a1cf80a2ba6f33f990a08ef37a3267fb) + +diff --git a/include/libc-internal.h b/include/libc-internal.h +index 87ac591835..1ef43ffe67 100644 +--- a/include/libc-internal.h ++++ b/include/libc-internal.h +@@ -53,6 +53,9 @@ extern __typeof (__profile_frequency) __profile_frequency attribute_hidden; + is not for an audit module, not loaded via dlmopen, and not loaded + via static dlopen either). */ + extern _Bool __libc_initial attribute_hidden; ++#else ++/* The static libc is always the initial namespace. */ ++# define __libc_initial ((_Bool) 1) + #endif + + #endif /* _LIBC_INTERNAL */ + +commit 709319f9de6f976f9feceb623cb2c96769e9d78b +Author: Florian Weimer <fweimer@redhat.com> +Date: Mon Aug 19 15:48:03 2024 +0200 + + string: strerror, strsignal cannot use buffer after dlmopen (bug 32026) + + Secondary namespaces have a different malloc. Allocating the + buffer in one namespace and freeing it another results in + heap corruption. Fix this by using a static string (potentially + translated) in secondary namespaces. It would also be possible + to use the malloc from the initial namespace to manage the + buffer, but these functions would still not be safe to use in + auditors etc. because a call to strerror could still free a + buffer while it is used by the application. Another approach + could use proper initial-exec TLS, duplicated in secondary + namespaces, but that would need a callback interface for freeing + libc resources in namespaces on thread exit, which does not exist + today. + + Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> + (cherry picked from commit 25a5eb4010df94b412c67db9e346029de316d06b) + +diff --git a/NEWS b/NEWS +index b9eb4a558b..10a125bc66 100644 +--- a/NEWS ++++ b/NEWS +@@ -13,6 +13,7 @@ The following bugs are resolved with this release: + [31968] mremap implementation in C does not handle arguments correctly + [31890] resolv: Allow short error responses to match any DNS query + [31968] mremap implementation in C does not handle arguments correctly ++ [32026] strerror/strsignal TLS not handled correctly for secondary namespaces + [32052] Name space violation in fortify wrappers + + Version 2.40 +diff --git a/string/strerror_l.c b/string/strerror_l.c +index 15cce261e6..70456e5bb4 100644 +--- a/string/strerror_l.c ++++ b/string/strerror_l.c +@@ -20,7 +20,7 @@ + #include <stdio.h> + #include <string.h> + #include <tls-internal.h> +- ++#include <libc-internal.h> + + static const char * + translate (const char *str, locale_t loc) +@@ -31,6 +31,12 @@ translate (const char *str, locale_t loc) + return res; + } + ++static char * ++unknown_error (locale_t loc) ++{ ++ return (char *) translate ("Unknown error", loc); ++} ++ + + /* Return a string describing the errno code in ERRNUM. */ + char * +@@ -40,18 +46,25 @@ __strerror_l (int errnum, locale_t loc) + char *err = (char *) __get_errlist (errnum); + if (__glibc_unlikely (err == NULL)) + { +- struct tls_internal_t *tls_internal = __glibc_tls_internal (); +- free (tls_internal->strerror_l_buf); +- if (__asprintf (&tls_internal->strerror_l_buf, "%s%d", +- translate ("Unknown error ", loc), errnum) > 0) +- err = tls_internal->strerror_l_buf; +- else ++ if (__libc_initial) + { +- /* The memory was freed above. */ +- tls_internal->strerror_l_buf = NULL; +- /* Provide a fallback translation. */ +- err = (char *) translate ("Unknown error", loc); ++ struct tls_internal_t *tls_internal = __glibc_tls_internal (); ++ free (tls_internal->strerror_l_buf); ++ if (__asprintf (&tls_internal->strerror_l_buf, "%s%d", ++ translate ("Unknown error ", loc), errnum) > 0) ++ err = tls_internal->strerror_l_buf; ++ else ++ { ++ /* The memory was freed above. */ ++ tls_internal->strerror_l_buf = NULL; ++ /* Provide a fallback translation. */ ++ err = unknown_error (loc); ++ } + } ++ else ++ /* Secondary namespaces use a different malloc, so cannot ++ participate in the buffer management. */ ++ err = unknown_error (loc); + } + else + err = (char *) translate (err, loc); +diff --git a/string/strsignal.c b/string/strsignal.c +index 3114601564..d9b0365468 100644 +--- a/string/strsignal.c ++++ b/string/strsignal.c +@@ -21,6 +21,7 @@ + #include <string.h> + #include <libintl.h> + #include <tls-internal.h> ++#include <libc-internal.h> + + /* Return a string describing the meaning of the signal number SIGNUM. */ + char * +@@ -30,21 +31,28 @@ strsignal (int signum) + if (desc != NULL) + return _(desc); + +- struct tls_internal_t *tls_internal = __glibc_tls_internal (); +- free (tls_internal->strsignal_buf); ++ if (__libc_initial) ++ { ++ struct tls_internal_t *tls_internal = __glibc_tls_internal (); ++ free (tls_internal->strsignal_buf); + +- int r; ++ int r; + #ifdef SIGRTMIN +- if (signum >= SIGRTMIN && signum <= SIGRTMAX) +- r = __asprintf (&tls_internal->strsignal_buf, _("Real-time signal %d"), +- signum - SIGRTMIN); +- else ++ if (signum >= SIGRTMIN && signum <= SIGRTMAX) ++ r = __asprintf (&tls_internal->strsignal_buf, _("Real-time signal %d"), ++ signum - SIGRTMIN); ++ else + #endif +- r = __asprintf (&tls_internal->strsignal_buf, _("Unknown signal %d"), +- signum); +- +- if (r == -1) +- tls_internal->strsignal_buf = NULL; +- +- return tls_internal->strsignal_buf; ++ r = __asprintf (&tls_internal->strsignal_buf, _("Unknown signal %d"), ++ signum); ++ ++ if (r >= 0) ++ return tls_internal->strsignal_buf; ++ else ++ tls_internal->strsignal_buf = NULL; ++ } ++ /* Fall through on asprintf error, and for !__libc_initial: ++ secondary namespaces use a different malloc and cannot ++ participate in the buffer management. */ ++ return _("Unknown signal"); + } + +commit bc240ba7c86a74bc64d4234feadb49bb8e36e1c9 +Author: Maciej W. Rozycki <macro@redhat.com> +Date: Fri Jul 26 13:21:34 2024 +0100 + + support: Add FAIL test failure helper + + Add a FAIL test failure helper analogous to FAIL_RET, that does not + cause the current function to return, providing a standardized way to + report a test failure with a message supplied while permitting the + caller to continue executing, for further reporting, cleaning up, etc. + + Update existing test cases that provide a conflicting definition of FAIL + by removing the local FAIL definition and then as follows: + + - tst-fortify-syslog: provide a meaningful message in addition to the + file name already added by <support/check.h>; 'support_record_failure' + is already called by 'support_print_failure_impl' invoked by the new + FAIL test failure helper. + + - tst-ctype: no update to FAIL calls required, with the name of the file + and the line number within of the failure site additionally included + by the new FAIL test failure helper, and error counting plus count + reporting upon test program termination also already provided by + 'support_record_failure' and 'support_report_failure' respectively, + called by 'support_print_failure_impl' and 'adjust_exit_status' also + respectively. However in a number of places 'printf' is called and + the error count adjusted by hand, so update these places to make use + of FAIL instead. And last but not least adjust the final summary just + to report completion, with any error count following as reported by + the test driver. + + - test-tgmath2: no update to FAIL calls required, with the name of the + file of the failure site additionally included by the new FAIL test + failure helper. Also there is no need to track the return status by + hand as any call to FAIL will eventually cause the test case to return + an unsuccesful exit status regardless of the return status from the + test function, via a call to 'adjust_exit_status' made by the test + driver. + + Reviewed-by: DJ Delorie <dj@redhat.com> + (cherry picked from commit 1b97a9f23bf605ca608162089c94187573fb2a9e) + +diff --git a/debug/tst-fortify-syslog.c b/debug/tst-fortify-syslog.c +index a7ddbf7c6b..2712acf689 100644 +--- a/debug/tst-fortify-syslog.c ++++ b/debug/tst-fortify-syslog.c +@@ -22,7 +22,6 @@ + #include <syslog.h> + #include <string.h> + #include <unistd.h> +-#include <stdio.h> + + #include <support/check.h> + #include <support/support.h> +@@ -46,18 +45,13 @@ handler (int sig) + _exit (127); + } + +-#define FAIL() \ +- do { \ +- printf ("Failure on line %d\n", __LINE__); \ +- support_record_failure (); \ +- } while (0) + #define CHK_FAIL_START \ + chk_fail_ok = 1; \ + if (! setjmp (chk_fail_buf)) \ + { + #define CHK_FAIL_END \ + chk_fail_ok = 0; \ +- FAIL (); \ ++ FAIL ("not supposed to reach here"); \ + } + + static void +diff --git a/localedata/tst-ctype.c b/localedata/tst-ctype.c +index 9de979a2d7..a23689719c 100644 +--- a/localedata/tst-ctype.c ++++ b/localedata/tst-ctype.c +@@ -21,6 +21,8 @@ + #include <stdio.h> + #include <string.h> + ++#include <support/check.h> ++ + + static const char lower[] = "abcdefghijklmnopqrstuvwxyz"; + static const char upper[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; +@@ -53,19 +55,11 @@ static struct classes + #define nclasses (sizeof (classes) / sizeof (classes[0])) + + +-#define FAIL(str, args...) \ +- { \ +- printf (" " str "\n", ##args); \ +- ++errors; \ +- } +- +- + static int + do_test (void) + { + const char *cp; + const char *cp2; +- int errors = 0; + char *inpline = NULL; + size_t inplinelen = 0; + char *resline = NULL; +@@ -394,11 +388,8 @@ punct = %04x alnum = %04x\n", + { + if (((__ctype_b[(unsigned int) *inp] & classes[n].mask) != 0) + != (*resp != '0')) +- { +- printf (" is%s('%c' = '\\x%02x') %s true\n", inpline, +- *inp, *inp, *resp == '1' ? "not" : "is"); +- ++errors; +- } ++ FAIL (" is%s('%c' = '\\x%02x') %s true\n", inpline, ++ *inp, *inp, *resp == '1' ? "not" : "is"); + ++inp; + ++resp; + } +@@ -408,11 +399,8 @@ punct = %04x alnum = %04x\n", + while (*inp != '\0') + { + if (tolower (*inp) != *resp) +- { +- printf (" tolower('%c' = '\\x%02x') != '%c'\n", +- *inp, *inp, *resp); +- ++errors; +- } ++ FAIL (" tolower('%c' = '\\x%02x') != '%c'\n", ++ *inp, *inp, *resp); + ++inp; + ++resp; + } +@@ -422,11 +410,8 @@ punct = %04x alnum = %04x\n", + while (*inp != '\0') + { + if (toupper (*inp) != *resp) +- { +- printf (" toupper('%c' = '\\x%02x') != '%c'\n", +- *inp, *inp, *resp); +- ++errors; +- } ++ FAIL (" toupper('%c' = '\\x%02x') != '%c'\n", ++ *inp, *inp, *resp); + ++inp; + ++resp; + } +@@ -436,14 +421,7 @@ punct = %04x alnum = %04x\n", + } + + +- if (errors != 0) +- { +- printf (" %d error%s for `%s' locale\n\n\n", errors, +- errors == 1 ? "" : "s", setlocale (LC_ALL, NULL)); +- return 1; +- } +- +- printf (" No errors for `%s' locale\n\n\n", setlocale (LC_ALL, NULL)); ++ printf ("Completed testing for `%s' locale\n\n\n", setlocale (LC_ALL, NULL)); + return 0; + } + +diff --git a/math/test-tgmath2.c b/math/test-tgmath2.c +index 37afa8a08a..4aeb877b8e 100644 +--- a/math/test-tgmath2.c ++++ b/math/test-tgmath2.c +@@ -24,6 +24,8 @@ + #include <string.h> + #include <tgmath.h> + ++#include <support/check.h> ++ + //#define DEBUG + + typedef complex float cfloat; +@@ -87,13 +89,6 @@ enum + int count; + int counts[Tlast][C_last]; + +-#define FAIL(str) \ +- do \ +- { \ +- printf ("%s failure on line %d\n", (str), __LINE__); \ +- result = 1; \ +- } \ +- while (0) + #define TEST_TYPE_ONLY(expr, rettype) \ + do \ + { \ +@@ -133,8 +128,6 @@ int counts[Tlast][C_last]; + int + test_cos (const int Vint4, const long long int Vllong4) + { +- int result = 0; +- + TEST (cos (vfloat1), float, cos); + TEST (cos (vdouble1), double, cos); + TEST (cos (vldouble1), ldouble, cos); +@@ -152,7 +145,7 @@ test_cos (const int Vint4, const long long int Vllong4) + TEST (cos (Vcdouble1), cdouble, cos); + TEST (cos (Vcldouble1), cldouble, cos); + +- return result; ++ return 0; + } + + int +diff --git a/support/check.h b/support/check.h +index 711f34b83b..7ea22c7a2c 100644 +--- a/support/check.h ++++ b/support/check.h +@@ -24,6 +24,11 @@ + + __BEGIN_DECLS + ++/* Record a test failure, print the failure message to standard output ++ and pass the result of 1 through. */ ++#define FAIL(...) \ ++ support_print_failure_impl (__FILE__, __LINE__, __VA_ARGS__) ++ + /* Record a test failure, print the failure message to standard output + and return 1. */ + #define FAIL_RET(...) \ + +commit 27fb563bfee521239316142fa4968282bffa86a6 +Author: Maciej W. Rozycki <macro@redhat.com> +Date: Fri Jul 26 13:21:34 2024 +0100 + + stdio-common: Add test for vfscanf with matches longer than INT_MAX [BZ #27650] + + Complement commit b03e4d7bd25b ("stdio: fix vfscanf with matches longer + than INT_MAX (bug 27650)") and add a test case for the issue, inspired + by the reproducer provided with the bug report. + + This has been verified to succeed as from the commit referred and fail + beforehand. + + As the test requires 2GiB of data to be passed around its performance + has been evaluated using a choice of systems and the execution time + determined to be respectively in the range of 9s for POWER9@2.166GHz, + 24s for FU740@1.2GHz, and 40s for 74Kf@950MHz. As this is on the verge + of and beyond the default timeout it has been increased by the factor of + 8. Regardless, following recent practice the test has been added to the + standard rather than extended set. + + Reviewed-by: DJ Delorie <dj@redhat.com> + (cherry picked from commit 89cddc8a7096f3d9225868304d2bc0a1aaf07d63) + +diff --git a/stdio-common/Makefile b/stdio-common/Makefile +index a63c05a120..e4f0146d2c 100644 +--- a/stdio-common/Makefile ++++ b/stdio-common/Makefile +@@ -240,6 +240,7 @@ tests := \ + tst-scanf-binary-c23 \ + tst-scanf-binary-gnu11 \ + tst-scanf-binary-gnu89 \ ++ tst-scanf-bz27650 \ + tst-scanf-intn \ + tst-scanf-round \ + tst-scanf-to_inpunct \ +@@ -328,6 +329,7 @@ generated += \ + tst-printf-fp-free.mtrace \ + tst-printf-fp-leak-mem.out \ + tst-printf-fp-leak.mtrace \ ++ tst-scanf-bz27650.mtrace \ + tst-vfprintf-width-prec-mem.out \ + tst-vfprintf-width-prec.mtrace \ + # generated +@@ -419,6 +421,9 @@ tst-printf-fp-free-ENV = \ + tst-printf-fp-leak-ENV = \ + MALLOC_TRACE=$(objpfx)tst-printf-fp-leak.mtrace \ + LD_PRELOAD=$(common-objpfx)/malloc/libc_malloc_debug.so ++tst-scanf-bz27650-ENV = \ ++ MALLOC_TRACE=$(objpfx)tst-scanf-bz27650.mtrace \ ++ LD_PRELOAD=$(common-objpfx)malloc/libc_malloc_debug.so + + $(objpfx)tst-unbputc.out: tst-unbputc.sh $(objpfx)tst-unbputc + $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \ +diff --git a/stdio-common/tst-scanf-bz27650.c b/stdio-common/tst-scanf-bz27650.c +new file mode 100644 +index 0000000000..3a742bc865 +--- /dev/null ++++ b/stdio-common/tst-scanf-bz27650.c +@@ -0,0 +1,108 @@ ++/* Test for BZ #27650, formatted input matching beyond INT_MAX. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <https://www.gnu.org/licenses/>. */ ++ ++#include <error.h> ++#include <errno.h> ++#include <limits.h> ++#include <mcheck.h> ++#include <stddef.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#include <sys/types.h> ++ ++#include <support/check.h> ++#include <support/test-driver.h> ++ ++/* Produce a stream of more than INT_MAX characters via buffer BUF of ++ size SIZE according to bookkeeping in COOKIE and then return EOF. */ ++ ++static ssize_t ++io_read (void *cookie, char *buf, size_t size) ++{ ++ unsigned int *written = cookie; ++ unsigned int w = *written; ++ ++ if (w > INT_MAX) ++ return 0; ++ ++ memset (buf, 'a', size); ++ *written = w + size; ++ return size; ++} ++ ++/* Consume a stream of more than INT_MAX characters from an artificial ++ input stream of which none is the new line character. The call to ++ fscanf is supposed to complete upon the EOF condition of input, ++ however in the presence of BZ #27650 it will terminate prematurely ++ with characters still outstanding in input. Diagnose the condition ++ and return status accordingly. */ ++ ++int ++do_test (void) ++{ ++ static cookie_io_functions_t io_funcs = { .read = io_read }; ++ unsigned int written = 0; ++ FILE *in; ++ int v; ++ ++ mtrace (); ++ ++ in = fopencookie (&written, "r", io_funcs); ++ if (in == NULL) ++ { ++ FAIL ("fopencookie: %m"); ++ goto out; ++ } ++ ++ v = fscanf (in, "%*[^\n]"); ++ if (ferror (in)) ++ { ++ FAIL ("fscanf: input failure, at %u: %m", written); ++ goto out_close; ++ } ++ else if (v == EOF) ++ { ++ FAIL ("fscanf: unexpected end of file, at %u", written); ++ goto out_close; ++ } ++ ++ if (!feof (in)) ++ { ++ v = fgetc (in); ++ if (ferror (in)) ++ FAIL ("fgetc: input failure: %m"); ++ else if (v == EOF) ++ FAIL ("fgetc: unexpected end of file after missing end of file"); ++ else if (v == '\n') ++ FAIL ("unexpected new line character received"); ++ else ++ FAIL ("character received after end of file expected: \\x%02x", v); ++ } ++ ++out_close: ++ if (fclose (in) != 0) ++ FAIL ("fclose: %m"); ++ ++out: ++ return EXIT_SUCCESS; ++} ++ ++#define TIMEOUT (DEFAULT_TIMEOUT * 8) ++#include <support/test-driver.c> + +commit 2f749d2b15cbc82268d7f8735f21ae1e3b68754f +Author: Siddhesh Poyarekar <siddhesh@sourceware.org> +Date: Wed Aug 14 19:20:04 2024 -0400 + + Make tst-ungetc use libsupport + + Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org> + Reviewed-by: Carlos O'Donell <carlos@redhat.com> + (cherry picked from commit 3f7df7e757f4efec38e45d4068e5492efcac4856) + +diff --git a/stdio-common/tst-ungetc.c b/stdio-common/tst-ungetc.c +index 1344b2b591..5c808f0734 100644 +--- a/stdio-common/tst-ungetc.c ++++ b/stdio-common/tst-ungetc.c +@@ -1,70 +1,72 @@ +-/* Test for ungetc bugs. */ ++/* Test for ungetc bugs. ++ Copyright (C) 1996-2024 Free Software Foundation, Inc. ++ Copyright The GNU Toolchain Authors. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <https://www.gnu.org/licenses/>. */ + + #include <stdio.h> + #include <stdlib.h> +-#include <unistd.h> +- +-#undef assert +-#define assert(x) \ +- if (!(x)) \ +- { \ +- fputs ("test failed: " #x "\n", stderr); \ +- retval = 1; \ +- goto the_end; \ +- } ++#include <support/check.h> ++#include <support/support.h> ++#include <support/temp_file.h> ++#include <support/xstdio.h> ++#include <support/xunistd.h> + +-int +-main (int argc, char *argv[]) ++static int ++do_test (void) + { +- char name[] = "/tmp/tst-ungetc.XXXXXX"; ++ char *name = NULL; + FILE *fp = NULL; +- int retval = 0; + int c; + char buffer[64]; + +- int fd = mkstemp (name); ++ int fd = create_temp_file ("tst-ungetc.", &name); + if (fd == -1) +- { +- printf ("mkstemp failed: %m\n"); +- return 1; +- } +- close (fd); +- fp = fopen (name, "w"); +- assert (fp != NULL) +- fputs ("bla", fp); +- fclose (fp); +- fp = NULL; ++ FAIL_EXIT1 ("cannot create temporary file: %m"); ++ xclose (fd); + +- fp = fopen (name, "r"); +- assert (fp != NULL); +- assert (ungetc ('z', fp) == 'z'); +- assert (getc (fp) == 'z'); +- assert (getc (fp) == 'b'); +- assert (getc (fp) == 'l'); +- assert (ungetc ('m', fp) == 'm'); +- assert (getc (fp) == 'm'); +- assert ((c = getc (fp)) == 'a'); +- assert (getc (fp) == EOF); +- assert (ungetc (c, fp) == c); +- assert (feof (fp) == 0); +- assert (getc (fp) == c); +- assert (getc (fp) == EOF); +- fclose (fp); +- fp = NULL; ++ fp = xfopen (name, "w"); ++ fputs ("bla", fp); ++ xfclose (fp); + +- fp = fopen (name, "r"); +- assert (fp != NULL); +- assert (getc (fp) == 'b'); +- assert (getc (fp) == 'l'); +- assert (ungetc ('b', fp) == 'b'); +- assert (fread (buffer, 1, 64, fp) == 2); +- assert (buffer[0] == 'b'); +- assert (buffer[1] == 'a'); ++ fp = xfopen (name, "r"); ++ TEST_VERIFY_EXIT (ungetc ('z', fp) == 'z'); ++ TEST_VERIFY_EXIT (getc (fp) == 'z'); ++ TEST_VERIFY_EXIT (getc (fp) == 'b'); ++ TEST_VERIFY_EXIT (getc (fp) == 'l'); ++ TEST_VERIFY_EXIT (ungetc ('m', fp) == 'm'); ++ TEST_VERIFY_EXIT (getc (fp) == 'm'); ++ TEST_VERIFY_EXIT ((c = getc (fp)) == 'a'); ++ TEST_VERIFY_EXIT (getc (fp) == EOF); ++ TEST_VERIFY_EXIT (ungetc (c, fp) == c); ++ TEST_VERIFY_EXIT (feof (fp) == 0); ++ TEST_VERIFY_EXIT (getc (fp) == c); ++ TEST_VERIFY_EXIT (getc (fp) == EOF); ++ xfclose (fp); + +-the_end: +- if (fp != NULL) +- fclose (fp); +- unlink (name); ++ fp = xfopen (name, "r"); ++ TEST_VERIFY_EXIT (getc (fp) == 'b'); ++ TEST_VERIFY_EXIT (getc (fp) == 'l'); ++ TEST_VERIFY_EXIT (ungetc ('b', fp) == 'b'); ++ TEST_VERIFY_EXIT (fread (buffer, 1, 64, fp) == 2); ++ TEST_VERIFY_EXIT (buffer[0] == 'b'); ++ TEST_VERIFY_EXIT (buffer[1] == 'a'); ++ xfclose (fp); + +- return retval; ++ return 0; + } ++ ++#include <support/test-driver.c> + +commit dac7a0694b5e853f08be518cd5a133ac5804666d +Author: Siddhesh Poyarekar <siddhesh@sourceware.org> +Date: Tue Aug 13 21:00:06 2024 -0400 + + ungetc: Fix uninitialized read when putting into unused streams [BZ #27821] + + When ungetc is called on an unused stream, the backup buffer is + allocated without the main get area being present. This results in + every subsequent ungetc (as the stream remains in the backup area) + checking uninitialized memory in the backup buffer when trying to put a + character back into the stream. + + Avoid comparing the input character with buffer contents when in backup + to avoid this uninitialized read. The uninitialized read is harmless in + this context since the location is promptly overwritten with the input + character, thus fulfilling ungetc functionality. + + Also adjust wording in the manual to drop the paragraph that says glibc + cannot do multiple ungetc back to back since with this change, ungetc + can actually do this. + + Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org> + Reviewed-by: Carlos O'Donell <carlos@redhat.com> + (cherry picked from commit cdf0f88f97b0aaceb894cc02b21159d148d7065c) + +diff --git a/libio/genops.c b/libio/genops.c +index 99f5e80f20..b012fa33d2 100644 +--- a/libio/genops.c ++++ b/libio/genops.c +@@ -662,7 +662,7 @@ _IO_sputbackc (FILE *fp, int c) + { + int result; + +- if (fp->_IO_read_ptr > fp->_IO_read_base ++ if (fp->_IO_read_ptr > fp->_IO_read_base && !_IO_in_backup (fp) + && (unsigned char)fp->_IO_read_ptr[-1] == (unsigned char)c) + { + fp->_IO_read_ptr--; +diff --git a/manual/stdio.texi b/manual/stdio.texi +index 8517653507..92614775fa 100644 +--- a/manual/stdio.texi ++++ b/manual/stdio.texi +@@ -1467,11 +1467,9 @@ program; usually @code{ungetc} is used only to unread a character that + was just read from the same stream. @Theglibc{} supports this + even on files opened in binary mode, but other systems might not. + +-@Theglibc{} only supports one character of pushback---in other +-words, it does not work to call @code{ungetc} twice without doing input +-in between. Other systems might let you push back multiple characters; +-then reading from the stream retrieves the characters in the reverse +-order that they were pushed. ++@Theglibc{} supports pushing back multiple characters; subsequently ++reading from the stream retrieves the characters in the reverse order ++that they were pushed. + + Pushing back characters doesn't alter the file; only the internal + buffering for the stream is affected. If a file positioning function +diff --git a/stdio-common/tst-ungetc.c b/stdio-common/tst-ungetc.c +index 5c808f0734..388b202493 100644 +--- a/stdio-common/tst-ungetc.c ++++ b/stdio-common/tst-ungetc.c +@@ -48,6 +48,8 @@ do_test (void) + TEST_VERIFY_EXIT (getc (fp) == 'b'); + TEST_VERIFY_EXIT (getc (fp) == 'l'); + TEST_VERIFY_EXIT (ungetc ('m', fp) == 'm'); ++ TEST_VERIFY_EXIT (ungetc ('n', fp) == 'n'); ++ TEST_VERIFY_EXIT (getc (fp) == 'n'); + TEST_VERIFY_EXIT (getc (fp) == 'm'); + TEST_VERIFY_EXIT ((c = getc (fp)) == 'a'); + TEST_VERIFY_EXIT (getc (fp) == EOF); + +commit e24902f409994f226dbc6fde2476009df452a18f +Author: Siddhesh Poyarekar <siddhesh@sourceware.org> +Date: Tue Aug 13 21:08:49 2024 -0400 + + ungetc: Fix backup buffer leak on program exit [BZ #27821] + + If a file descriptor is left unclosed and is cleaned up by _IO_cleanup + on exit, its backup buffer remains unfreed, registering as a leak in + valgrind. This is not strictly an issue since (1) the program should + ideally be closing the stream once it's not in use and (2) the program + is about to exit anyway, so keeping the backup buffer around a wee bit + longer isn't a real problem. Free it anyway to keep valgrind happy + when the streams in question are the standard ones, i.e. stdout, stdin + or stderr. + + Also, the _IO_have_backup macro checks for _IO_save_base, + which is a roundabout way to check for a backup buffer instead of + directly looking for _IO_backup_base. The roundabout check breaks when + the main get area has not been used and user pushes a char into the + backup buffer with ungetc. Fix this to use the _IO_backup_base + directly. + + Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org> + Reviewed-by: Carlos O'Donell <carlos@redhat.com> + (cherry picked from commit 3e1d8d1d1dca24ae90df2ea826a8916896fc7e77) + +diff --git a/libio/genops.c b/libio/genops.c +index b012fa33d2..35d8b30710 100644 +--- a/libio/genops.c ++++ b/libio/genops.c +@@ -816,6 +816,12 @@ _IO_unbuffer_all (void) + legacy = 1; + #endif + ++ /* Free up the backup area if it was ever allocated. */ ++ if (_IO_have_backup (fp)) ++ _IO_free_backup_area (fp); ++ if (fp->_mode > 0 && _IO_have_wbackup (fp)) ++ _IO_free_wbackup_area (fp); ++ + if (! (fp->_flags & _IO_UNBUFFERED) + /* Iff stream is un-orientated, it wasn't used. */ + && (legacy || fp->_mode != 0)) +diff --git a/libio/libioP.h b/libio/libioP.h +index 1af287b19f..616253fcd0 100644 +--- a/libio/libioP.h ++++ b/libio/libioP.h +@@ -577,8 +577,8 @@ extern void _IO_old_init (FILE *fp, int flags) __THROW; + ((__fp)->_wide_data->_IO_write_base \ + = (__fp)->_wide_data->_IO_write_ptr = __p, \ + (__fp)->_wide_data->_IO_write_end = (__ep)) +-#define _IO_have_backup(fp) ((fp)->_IO_save_base != NULL) +-#define _IO_have_wbackup(fp) ((fp)->_wide_data->_IO_save_base != NULL) ++#define _IO_have_backup(fp) ((fp)->_IO_backup_base != NULL) ++#define _IO_have_wbackup(fp) ((fp)->_wide_data->_IO_backup_base != NULL) + #define _IO_in_backup(fp) ((fp)->_flags & _IO_IN_BACKUP) + #define _IO_have_markers(fp) ((fp)->_markers != NULL) + #define _IO_blen(fp) ((fp)->_IO_buf_end - (fp)->_IO_buf_base) +diff --git a/stdio-common/Makefile b/stdio-common/Makefile +index e4f0146d2c..a91754f52d 100644 +--- a/stdio-common/Makefile ++++ b/stdio-common/Makefile +@@ -254,6 +254,7 @@ tests := \ + tst-swscanf \ + tst-tmpnam \ + tst-ungetc \ ++ tst-ungetc-leak \ + tst-unlockedio \ + tst-vfprintf-mbs-prec \ + tst-vfprintf-user-type \ +@@ -316,6 +317,7 @@ tests-special += \ + $(objpfx)tst-printf-bz25691-mem.out \ + $(objpfx)tst-printf-fp-free-mem.out \ + $(objpfx)tst-printf-fp-leak-mem.out \ ++ $(objpfx)tst-ungetc-leak-mem.out \ + $(objpfx)tst-vfprintf-width-prec-mem.out \ + # tests-special + +@@ -330,6 +332,8 @@ generated += \ + tst-printf-fp-leak-mem.out \ + tst-printf-fp-leak.mtrace \ + tst-scanf-bz27650.mtrace \ ++ tst-ungetc-leak-mem.out \ ++ tst-ungetc-leak.mtrace \ + tst-vfprintf-width-prec-mem.out \ + tst-vfprintf-width-prec.mtrace \ + # generated +@@ -424,6 +428,9 @@ tst-printf-fp-leak-ENV = \ + tst-scanf-bz27650-ENV = \ + MALLOC_TRACE=$(objpfx)tst-scanf-bz27650.mtrace \ + LD_PRELOAD=$(common-objpfx)malloc/libc_malloc_debug.so ++tst-ungetc-leak-ENV = \ ++ MALLOC_TRACE=$(objpfx)tst-ungetc-leak.mtrace \ ++ LD_PRELOAD=$(common-objpfx)malloc/libc_malloc_debug.so + + $(objpfx)tst-unbputc.out: tst-unbputc.sh $(objpfx)tst-unbputc + $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \ +diff --git a/stdio-common/tst-ungetc-leak.c b/stdio-common/tst-ungetc-leak.c +new file mode 100644 +index 0000000000..6c5152b43f +--- /dev/null ++++ b/stdio-common/tst-ungetc-leak.c +@@ -0,0 +1,32 @@ ++/* Test for memory leak with ungetc when stream is unused. ++ Copyright The GNU Toolchain Authors. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <https://www.gnu.org/licenses/>. */ ++ ++#include <stdio.h> ++#include <mcheck.h> ++#include <support/check.h> ++#include <support/support.h> ++ ++static int ++do_test (void) ++{ ++ mtrace (); ++ TEST_COMPARE (ungetc('y', stdin), 'y'); ++ return 0; ++} ++ ++#include <support/test-driver.c> + +commit 3b3350d7baa8de70b71c02e964d5b8343749ebf8 +Author: Maciej W. Rozycki <macro@redhat.com> +Date: Fri Jul 26 13:21:34 2024 +0100 + + posix: Use <support/check.h> facilities in tst-truncate and tst-truncate64 + + Remove local FAIL macro in favor to FAIL_RET from <support/check.h>, + which provides equivalent reporting, with the name of the file of the + failure site additionally included, for the tst-truncate-common core + shared between the tst-truncate and tst-truncate64 tests. + + Reviewed-by: DJ Delorie <dj@redhat.com> + (cherry picked from commit fe47595504a55e7bb992f8928533df154b510383) + +diff --git a/posix/tst-truncate-common.c b/posix/tst-truncate-common.c +index b774fa46b8..b8c561ffdb 100644 +--- a/posix/tst-truncate-common.c ++++ b/posix/tst-truncate-common.c +@@ -21,6 +21,8 @@ + #include <sys/stat.h> + #include <unistd.h> + ++#include <support/check.h> ++ + static void do_prepare (void); + #define PREPARE(argc, argv) do_prepare () + static int do_test (void); +@@ -42,9 +44,6 @@ do_prepare (void) + } + } + +-#define FAIL(str) \ +- do { printf ("error: %s (line %d)\n", str, __LINE__); return 1; } while (0) +- + static int + do_test_with_offset (off_t offset) + { +@@ -54,35 +53,35 @@ do_test_with_offset (off_t offset) + memset (buf, 0xcf, sizeof (buf)); + + if (pwrite (temp_fd, buf, sizeof (buf), offset) != sizeof (buf)) +- FAIL ("write failed"); ++ FAIL_RET ("write failed"); + if (fstat (temp_fd, &st) < 0 || st.st_size != (offset + sizeof (buf))) +- FAIL ("initial size wrong"); ++ FAIL_RET ("initial size wrong"); + + if (ftruncate (temp_fd, offset + 800) < 0) +- FAIL ("size reduction with ftruncate failed"); ++ FAIL_RET ("size reduction with ftruncate failed"); + if (fstat (temp_fd, &st) < 0 || st.st_size != (offset + 800)) +- FAIL ("size after reduction with ftruncate is incorrect"); ++ FAIL_RET ("size after reduction with ftruncate is incorrect"); + + /* The following test covers more than POSIX. POSIX does not require + that ftruncate() can increase the file size. But we are testing + Unix systems. */ + if (ftruncate (temp_fd, offset + 1200) < 0) +- FAIL ("size increate with ftruncate failed"); ++ FAIL_RET ("size increate with ftruncate failed"); + if (fstat (temp_fd, &st) < 0 || st.st_size != (offset + 1200)) +- FAIL ("size after increase is incorrect"); ++ FAIL_RET ("size after increase is incorrect"); + + if (truncate (temp_filename, offset + 800) < 0) +- FAIL ("size reduction with truncate failed"); ++ FAIL_RET ("size reduction with truncate failed"); + if (fstat (temp_fd, &st) < 0 || st.st_size != (offset + 800)) +- FAIL ("size after reduction with truncate incorrect"); ++ FAIL_RET ("size after reduction with truncate incorrect"); + + /* The following test covers more than POSIX. POSIX does not require + that truncate() can increase the file size. But we are testing + Unix systems. */ + if (truncate (temp_filename, (offset + 1200)) < 0) +- FAIL ("size increase with truncate failed"); ++ FAIL_RET ("size increase with truncate failed"); + if (fstat (temp_fd, &st) < 0 || st.st_size != (offset + 1200)) +- FAIL ("size increase with truncate is incorrect"); ++ FAIL_RET ("size increase with truncate is incorrect"); + + return 0; + } + +commit 3414b17e9db16c3bc0de5b49555c4f94f155ffc8 +Author: Maciej W. Rozycki <macro@redhat.com> +Date: Fri Jul 26 13:21:34 2024 +0100 + + nptl: Use <support/check.h> facilities in tst-setuid3 + + Remove local FAIL macro in favor to FAIL_EXIT1 from <support/check.h>, + which provides equivalent reporting, with the name of the file and the + line number within of the failure site additionally included. Remove + FAIL_ERR altogether and include ": %m" explicitly with the format string + supplied to FAIL_EXIT1 as there seems little value to have a separate + macro just for this. + + Reviewed-by: DJ Delorie <dj@redhat.com> + (cherry picked from commit 8c98195af6e6f1ce21743fc26c723e0f7e45bcf2) + +diff --git a/sysdeps/pthread/tst-setuid3.c b/sysdeps/pthread/tst-setuid3.c +index 83f42a0ae5..3845ab03d3 100644 +--- a/sysdeps/pthread/tst-setuid3.c ++++ b/sysdeps/pthread/tst-setuid3.c +@@ -15,24 +15,19 @@ + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +-#include <stdio.h> + #include <errno.h> + #include <pthread.h> + #include <stdbool.h> + #include <unistd.h> + ++#include <support/check.h> ++ + /* The test must run under a non-privileged user ID. */ + static const uid_t test_uid = 1; + + static pthread_barrier_t barrier1; + static pthread_barrier_t barrier2; + +-#define FAIL(fmt, ...) \ +- do { printf ("FAIL: " fmt "\n", __VA_ARGS__); _exit (1); } while (0) +- +-#define FAIL_ERR(fmt, ...) \ +- do { printf ("FAIL: " fmt ": %m\n", __VA_ARGS__); _exit (1); } while (0) +- + /* True if x is not a successful return code from pthread_barrier_wait. */ + static inline bool + is_invalid_barrier_ret (int x) +@@ -45,10 +40,10 @@ thread_func (void *ctx __attribute__ ((unused))) + { + int ret = pthread_barrier_wait (&barrier1); + if (is_invalid_barrier_ret (ret)) +- FAIL ("pthread_barrier_wait (barrier1) (on thread): %d", ret); ++ FAIL_EXIT1 ("pthread_barrier_wait (barrier1) (on thread): %d", ret); + ret = pthread_barrier_wait (&barrier2); + if (is_invalid_barrier_ret (ret)) +- FAIL ("pthread_barrier_wait (barrier2) (on thread): %d", ret); ++ FAIL_EXIT1 ("pthread_barrier_wait (barrier2) (on thread): %d", ret); + return NULL; + } + +@@ -59,13 +54,13 @@ setuid_failure (int phase) + switch (ret) + { + case 0: +- FAIL ("setuid succeeded unexpectedly in phase %d", phase); ++ FAIL_EXIT1 ("setuid succeeded unexpectedly in phase %d", phase); + case -1: + if (errno != EPERM) +- FAIL_ERR ("setuid phase %d", phase); ++ FAIL_EXIT1 ("setuid phase %d: %m", phase); + break; + default: +- FAIL ("invalid setuid return value in phase %d: %d", phase, ret); ++ FAIL_EXIT1 ("invalid setuid return value in phase %d: %d", phase, ret); + } + } + +@@ -74,42 +69,42 @@ do_test (void) + { + if (getuid () == 0) + if (setuid (test_uid) != 0) +- FAIL_ERR ("setuid (%u)", (unsigned) test_uid); ++ FAIL_EXIT1 ("setuid (%u): %m", (unsigned) test_uid); + if (setuid (getuid ())) +- FAIL_ERR ("setuid (%s)", "getuid ()"); ++ FAIL_EXIT1 ("setuid (%s): %m", "getuid ()"); + setuid_failure (1); + + int ret = pthread_barrier_init (&barrier1, NULL, 2); + if (ret != 0) +- FAIL ("pthread_barrier_init (barrier1): %d", ret); ++ FAIL_EXIT1 ("pthread_barrier_init (barrier1): %d", ret); + ret = pthread_barrier_init (&barrier2, NULL, 2); + if (ret != 0) +- FAIL ("pthread_barrier_init (barrier2): %d", ret); ++ FAIL_EXIT1 ("pthread_barrier_init (barrier2): %d", ret); + + pthread_t thread; + ret = pthread_create (&thread, NULL, thread_func, NULL); + if (ret != 0) +- FAIL ("pthread_create: %d", ret); ++ FAIL_EXIT1 ("pthread_create: %d", ret); + + /* Ensure that the thread is running properly. */ + ret = pthread_barrier_wait (&barrier1); + if (is_invalid_barrier_ret (ret)) +- FAIL ("pthread_barrier_wait (barrier1): %d", ret); ++ FAIL_EXIT1 ("pthread_barrier_wait (barrier1): %d", ret); + + setuid_failure (2); + + /* Check success case. */ + if (setuid (getuid ()) != 0) +- FAIL_ERR ("setuid (%s)", "getuid ()"); ++ FAIL_EXIT1 ("setuid (%s): %m", "getuid ()"); + + /* Shutdown. */ + ret = pthread_barrier_wait (&barrier2); + if (is_invalid_barrier_ret (ret)) +- FAIL ("pthread_barrier_wait (barrier2): %d", ret); ++ FAIL_EXIT1 ("pthread_barrier_wait (barrier2): %d", ret); + + ret = pthread_join (thread, NULL); + if (ret != 0) +- FAIL ("pthread_join: %d", ret); ++ FAIL_EXIT1 ("pthread_join: %d", ret); + + return 0; + } + +commit b7edcfa0f41ccfaeb665a661d3a6a594c8d95848 +Author: Florian Weimer <fweimer@redhat.com> +Date: Thu Aug 1 23:31:23 2024 +0200 + + elf: Clarify and invert second argument of _dl_allocate_tls_init + + Also remove an outdated comment: _dl_allocate_tls_init is + called as part of pthread_create. + + Reviewed-by: Carlos O'Donell <carlos@redhat.com> + (cherry picked from commit fe06fb313bddf7e4530056897d4a706606e49377) + +diff --git a/elf/dl-tls.c b/elf/dl-tls.c +index 3d221273f1..ecb966d282 100644 +--- a/elf/dl-tls.c ++++ b/elf/dl-tls.c +@@ -552,9 +552,14 @@ _dl_resize_dtv (dtv_t *dtv, size_t max_modid) + /* Allocate initial TLS. RESULT should be a non-NULL pointer to storage + for the TLS space. The DTV may be resized, and so this function may + call malloc to allocate that space. The loader's GL(dl_load_tls_lock) +- is taken when manipulating global TLS-related data in the loader. */ ++ is taken when manipulating global TLS-related data in the loader. ++ ++ If MAIN_THREAD, this is the first call during process ++ initialization. In this case, TLS initialization for secondary ++ (audit) namespaces is skipped because that has already been handled ++ by dlopen. */ + void * +-_dl_allocate_tls_init (void *result, bool init_tls) ++_dl_allocate_tls_init (void *result, bool main_thread) + { + if (result == NULL) + /* The memory allocation failed. */ +@@ -633,7 +638,7 @@ _dl_allocate_tls_init (void *result, bool init_tls) + because it would already be set by the audit setup. However, + subsequent thread creation would need to follow the default + behaviour. */ +- if (map->l_ns != LM_ID_BASE && !init_tls) ++ if (map->l_ns != LM_ID_BASE && main_thread) + continue; + memset (__mempcpy (dest, map->l_tls_initimage, + map->l_tls_initimage_size), '\0', +@@ -661,7 +666,7 @@ _dl_allocate_tls (void *mem) + { + return _dl_allocate_tls_init (mem == NULL + ? _dl_allocate_tls_storage () +- : allocate_dtv (mem), true); ++ : allocate_dtv (mem), false); + } + rtld_hidden_def (_dl_allocate_tls) + +diff --git a/elf/rtld.c b/elf/rtld.c +index bfdf632e77..09b9c9993b 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -2338,7 +2338,7 @@ dl_main (const ElfW(Phdr) *phdr, + into the main thread's TLS area, which we allocated above. + Note: thread-local variables must only be accessed after completing + the next step. */ +- _dl_allocate_tls_init (tcbp, false); ++ _dl_allocate_tls_init (tcbp, true); + + /* And finally install it for the main thread. */ + if (! __rtld_tls_init_tp_called) +diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c +index f35a8369bd..2cb562f8ea 100644 +--- a/nptl/allocatestack.c ++++ b/nptl/allocatestack.c +@@ -139,7 +139,7 @@ get_cached_stack (size_t *sizep, void **memp) + memset (dtv, '\0', (dtv[-1].counter + 1) * sizeof (dtv_t)); + + /* Re-initialize the TLS. */ +- _dl_allocate_tls_init (TLS_TPADJ (result), true); ++ _dl_allocate_tls_init (TLS_TPADJ (result), false); + + return result; + } +diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h +index 656e8a3fa0..154efb0e19 100644 +--- a/sysdeps/generic/ldsodefs.h ++++ b/sysdeps/generic/ldsodefs.h +@@ -1200,10 +1200,8 @@ extern void _dl_get_tls_static_info (size_t *sizep, size_t *alignp); + + extern void _dl_allocate_static_tls (struct link_map *map) attribute_hidden; + +-/* These are internal entry points to the two halves of _dl_allocate_tls, +- only used within rtld.c itself at startup time. */ + extern void *_dl_allocate_tls_storage (void) attribute_hidden; +-extern void *_dl_allocate_tls_init (void *, bool); ++extern void *_dl_allocate_tls_init (void *result, bool main_thread); + rtld_hidden_proto (_dl_allocate_tls_init) + + /* True if the TCB has been set up. */ + +commit f496b750f135e57da921e975835c44bd199246dd +Author: Florian Weimer <fweimer@redhat.com> +Date: Thu Aug 1 23:31:30 2024 +0200 + + elf: Avoid re-initializing already allocated TLS in dlopen (bug 31717) + + The old code used l_init_called as an indicator for whether TLS + initialization was complete. However, it is possible that + TLS for an object is initialized, written to, and then dlopen + for this object is called again, and l_init_called is not true at + this point. Previously, this resulted in TLS being initialized + twice, discarding any interim writes (technically introducing a + use-after-free bug even). + + This commit introduces an explicit per-object flag, l_tls_in_slotinfo. + It indicates whether _dl_add_to_slotinfo has been called for this + object. This flag is used to avoid double-initialization of TLS. + In update_tls_slotinfo, the first_static_tls micro-optimization + is removed because preserving the initalization flag for subsequent + use by the second loop for static TLS is a bit complicated, and + another per-object flag does not seem to be worth it. Furthermore, + the l_init_called flag is dropped from the second loop (for static + TLS initialization) because l_need_tls_init on its own prevents + double-initialization. + + The remaining l_init_called usage in resize_scopes and update_scopes + is just an optimization due to the use of scope_has_map, so it is + not changed in this commit. + + The isupper check ensures that libc.so.6 is TLS is not reverted. + Such a revert happens if l_need_tls_init is not cleared in + _dl_allocate_tls_init for the main_thread case, now that + l_init_called is not checked anymore in update_tls_slotinfo + in elf/dl-open.c. + + Reported-by: Jonathon Anderson <janderson@rice.edu> + Reviewed-by: Carlos O'Donell <carlos@redhat.com> + (cherry picked from commit 5097cd344fd243fb8deb6dec96e8073753f962f9) + +diff --git a/NEWS b/NEWS +index 10a125bc66..5b20efbf6c 100644 +--- a/NEWS ++++ b/NEWS +@@ -10,7 +10,7 @@ Version 2.40.1 + The following bugs are resolved with this release: + + [30081] resolv: Do not wait for non-existing second DNS response after error +- [31968] mremap implementation in C does not handle arguments correctly ++ [31717] elf: Avoid re-initializing already allocated TLS in dlopen + [31890] resolv: Allow short error responses to match any DNS query + [31968] mremap implementation in C does not handle arguments correctly + [32026] strerror/strsignal TLS not handled correctly for secondary namespaces +diff --git a/elf/Makefile b/elf/Makefile +index a3475f3fb5..a03c6520d8 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -416,6 +416,10 @@ tests += \ + tst-dlmopen4 \ + tst-dlopen-self \ + tst-dlopen-tlsmodid \ ++ tst-dlopen-tlsreinit1 \ ++ tst-dlopen-tlsreinit2 \ ++ tst-dlopen-tlsreinit3 \ ++ tst-dlopen-tlsreinit4 \ + tst-dlopenfail \ + tst-dlopenfail-2 \ + tst-dlopenrpath \ +@@ -853,6 +857,9 @@ modules-names += \ + tst-dlmopen-twice-mod1 \ + tst-dlmopen-twice-mod2 \ + tst-dlmopen1mod \ ++ tst-dlopen-tlsreinitmod1 \ ++ tst-dlopen-tlsreinitmod2 \ ++ tst-dlopen-tlsreinitmod3 \ + tst-dlopenfaillinkmod \ + tst-dlopenfailmod1 \ + tst-dlopenfailmod2 \ +@@ -3118,3 +3125,26 @@ $(objpfx)tst-recursive-tls.out: \ + 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15) + $(objpfx)tst-recursive-tlsmod%.os: tst-recursive-tlsmodN.c + $(compile-command.c) -DVAR=thread_$* -DFUNC=get_threadvar_$* ++ ++# Order matters here. The test needs the constructor for ++# tst-dlopen-tlsreinitmod2.so to be called first. ++LDFLAGS-tst-dlopen-tlsreinitmod1.so = -Wl,--no-as-needed ++$(objpfx)tst-dlopen-tlsreinitmod1.so: \ ++ $(objpfx)tst-dlopen-tlsreinitmod3.so $(objpfx)tst-dlopen-tlsreinitmod2.so ++LDFLAGS-tst-dlopen-tlsreinit2 = -Wl,--no-as-needed ++$(objpfx)tst-dlopen-tlsreinit2: \ ++ $(objpfx)tst-dlopen-tlsreinitmod3.so $(objpfx)tst-dlopen-tlsreinitmod2.so ++LDFLAGS-tst-dlopen-tlsreinit4 = -Wl,--no-as-needed ++$(objpfx)tst-dlopen-tlsreinit4: \ ++ $(objpfx)tst-dlopen-tlsreinitmod3.so $(objpfx)tst-dlopen-tlsreinitmod2.so ++# tst-dlopen-tlsreinitmod2.so is underlinked and refers to ++# tst-dlopen-tlsreinitmod3.so. The dependency is provided via ++# $(objpfx)tst-dlopen-tlsreinitmod1.so. ++tst-dlopen-tlsreinitmod2.so-no-z-defs = yes ++$(objpfx)tst-dlopen-tlsreinit.out: $(objpfx)tst-dlopen-tlsreinitmod1.so \ ++ $(objpfx)tst-dlopen-tlsreinitmod2.so $(objpfx)tst-dlopen-tlsreinitmod3.so ++# Reuse an audit module which provides ample debug logging. ++$(objpfx)tst-dlopen-tlsreinit3.out: $(objpfx)tst-auditmod1.so ++tst-dlopen-tlsreinit3-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so ++$(objpfx)tst-dlopen-tlsreinit4.out: $(objpfx)tst-auditmod1.so ++tst-dlopen-tlsreinit4-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so +diff --git a/elf/dl-open.c b/elf/dl-open.c +index c378da16c0..8556e7bd2f 100644 +--- a/elf/dl-open.c ++++ b/elf/dl-open.c +@@ -363,17 +363,8 @@ resize_tls_slotinfo (struct link_map *new) + { + bool any_tls = false; + for (unsigned int i = 0; i < new->l_searchlist.r_nlist; ++i) +- { +- struct link_map *imap = new->l_searchlist.r_list[i]; +- +- /* Only add TLS memory if this object is loaded now and +- therefore is not yet initialized. */ +- if (! imap->l_init_called && imap->l_tls_blocksize > 0) +- { +- _dl_add_to_slotinfo (imap, false); +- any_tls = true; +- } +- } ++ if (_dl_add_to_slotinfo (new->l_searchlist.r_list[i], false)) ++ any_tls = true; + return any_tls; + } + +@@ -383,22 +374,8 @@ resize_tls_slotinfo (struct link_map *new) + static void + update_tls_slotinfo (struct link_map *new) + { +- unsigned int first_static_tls = new->l_searchlist.r_nlist; + for (unsigned int i = 0; i < new->l_searchlist.r_nlist; ++i) +- { +- struct link_map *imap = new->l_searchlist.r_list[i]; +- +- /* Only add TLS memory if this object is loaded now and +- therefore is not yet initialized. */ +- if (! imap->l_init_called && imap->l_tls_blocksize > 0) +- { +- _dl_add_to_slotinfo (imap, true); +- +- if (imap->l_need_tls_init +- && first_static_tls == new->l_searchlist.r_nlist) +- first_static_tls = i; +- } +- } ++ _dl_add_to_slotinfo (new->l_searchlist.r_list[i], true); + + size_t newgen = GL(dl_tls_generation) + 1; + if (__glibc_unlikely (newgen == 0)) +@@ -410,13 +387,11 @@ TLS generation counter wrapped! Please report this.")); + /* We need a second pass for static tls data, because + _dl_update_slotinfo must not be run while calls to + _dl_add_to_slotinfo are still pending. */ +- for (unsigned int i = first_static_tls; i < new->l_searchlist.r_nlist; ++i) ++ for (unsigned int i = 0; i < new->l_searchlist.r_nlist; ++i) + { + struct link_map *imap = new->l_searchlist.r_list[i]; + +- if (imap->l_need_tls_init +- && ! imap->l_init_called +- && imap->l_tls_blocksize > 0) ++ if (imap->l_need_tls_init && imap->l_tls_blocksize > 0) + { + /* For static TLS we have to allocate the memory here and + now, but we can delay updating the DTV. */ +diff --git a/elf/dl-tls.c b/elf/dl-tls.c +index ecb966d282..3d529b722c 100644 +--- a/elf/dl-tls.c ++++ b/elf/dl-tls.c +@@ -632,17 +632,21 @@ _dl_allocate_tls_init (void *result, bool main_thread) + some platforms use in static programs requires it. */ + dtv[map->l_tls_modid].pointer.val = dest; + +- /* Copy the initialization image and clear the BSS part. For +- audit modules or dependencies with initial-exec TLS, we can not +- set the initial TLS image on default loader initialization +- because it would already be set by the audit setup. However, +- subsequent thread creation would need to follow the default +- behaviour. */ ++ /* Copy the initialization image and clear the BSS part. ++ For audit modules or dependencies with initial-exec TLS, ++ we can not set the initial TLS image on default loader ++ initialization because it would already be set by the ++ audit setup, which uses the dlopen code and already ++ clears l_need_tls_init. Calls with !main_thread from ++ pthread_create need to initialze TLS for the current ++ thread regardless of namespace. */ + if (map->l_ns != LM_ID_BASE && main_thread) + continue; + memset (__mempcpy (dest, map->l_tls_initimage, + map->l_tls_initimage_size), '\0', + map->l_tls_blocksize - map->l_tls_initimage_size); ++ if (main_thread) ++ map->l_need_tls_init = 0; + } + + total += cnt; +@@ -1099,9 +1103,32 @@ _dl_tls_initial_modid_limit_setup (void) + } + + +-void ++/* Add module to slot information data. If DO_ADD is false, only the ++ required memory is allocated. Must be called with ++ GL (dl_load_tls_lock) acquired. If the function has already been ++ called for the link map L with !DO_ADD, then this function will not ++ raise an exception, otherwise it is possible that it encounters a ++ memory allocation failure. ++ ++ Return false if L has already been added to the slotinfo data, or ++ if L has no TLS data. If the returned value is true, L has been ++ added with this call (DO_ADD), or has been added in a previous call ++ (!DO_ADD). ++ ++ The expected usage is as follows: Call _dl_add_to_slotinfo for ++ several link maps with DO_ADD set to false, and record if any calls ++ result in a true result. If there was a true result, call ++ _dl_add_to_slotinfo again, this time with DO_ADD set to true. (For ++ simplicity, it's possible to call the function for link maps where ++ the previous result was false.) The return value from the second ++ round of calls can be ignored. If there was true result initially, ++ call _dl_update_slotinfo to update the TLS generation counter. */ ++bool + _dl_add_to_slotinfo (struct link_map *l, bool do_add) + { ++ if (l->l_tls_blocksize == 0 || l->l_tls_in_slotinfo) ++ return false; ++ + /* Now that we know the object is loaded successfully add + modules containing TLS data to the dtv info table. We + might have to increase its size. */ +@@ -1157,7 +1184,10 @@ cannot create TLS data structures")); + atomic_store_relaxed (&listp->slotinfo[idx].map, l); + atomic_store_relaxed (&listp->slotinfo[idx].gen, + GL(dl_tls_generation) + 1); ++ l->l_tls_in_slotinfo = true; + } ++ ++ return true; + } + + #if PTHREAD_IN_LIBC +diff --git a/elf/tst-dlopen-tlsreinit1.c b/elf/tst-dlopen-tlsreinit1.c +new file mode 100644 +index 0000000000..2016b9b0c6 +--- /dev/null ++++ b/elf/tst-dlopen-tlsreinit1.c +@@ -0,0 +1,40 @@ ++/* Test that dlopen preserves already accessed TLS (bug 31717). ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <https://www.gnu.org/licenses/>. */ ++ ++#include <stdbool.h> ++#include <support/check.h> ++#include <support/xdlfcn.h> ++#include <ctype.h> ++ ++static int ++do_test (void) ++{ ++ void *handle = xdlopen ("tst-dlopen-tlsreinitmod1.so", RTLD_NOW); ++ ++ bool *tlsreinitmod3_tested = xdlsym (handle, "tlsreinitmod3_tested"); ++ TEST_VERIFY (*tlsreinitmod3_tested); ++ ++ xdlclose (handle); ++ ++ /* This crashes if the libc.so.6 TLS image has been reverted. */ ++ TEST_VERIFY (!isupper ('@')); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/elf/tst-dlopen-tlsreinit2.c b/elf/tst-dlopen-tlsreinit2.c +new file mode 100644 +index 0000000000..90ad2c7713 +--- /dev/null ++++ b/elf/tst-dlopen-tlsreinit2.c +@@ -0,0 +1,39 @@ ++/* Test that dlopen preserves already accessed TLS (bug 31717). ++ Variant with initially-linked modules. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <https://www.gnu.org/licenses/>. */ ++ ++#include <ctype.h> ++#include <stdbool.h> ++#include <support/check.h> ++#include <support/xdlfcn.h> ++ ++ ++static int ++do_test (void) ++{ ++ /* Defined in tst-dlopen-tlsreinitmod3.so. */ ++ extern bool tlsreinitmod3_tested; ++ TEST_VERIFY (tlsreinitmod3_tested); ++ ++ /* This crashes if the libc.so.6 TLS image has been reverted. */ ++ TEST_VERIFY (!isupper ('@')); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/elf/tst-dlopen-tlsreinit3.c b/elf/tst-dlopen-tlsreinit3.c +new file mode 100644 +index 0000000000..79bd585aff +--- /dev/null ++++ b/elf/tst-dlopen-tlsreinit3.c +@@ -0,0 +1,2 @@ ++/* Same code, but run with LD_AUDIT=tst-auditmod1.so. */ ++#include "tst-dlopen-tlsreinit1.c" +diff --git a/elf/tst-dlopen-tlsreinit4.c b/elf/tst-dlopen-tlsreinit4.c +new file mode 100644 +index 0000000000..344c9211ab +--- /dev/null ++++ b/elf/tst-dlopen-tlsreinit4.c +@@ -0,0 +1,2 @@ ++/* Same code, but run with LD_AUDIT=tst-auditmod1.so. */ ++#include "tst-dlopen-tlsreinit2.c" +diff --git a/elf/tst-dlopen-tlsreinitmod1.c b/elf/tst-dlopen-tlsreinitmod1.c +new file mode 100644 +index 0000000000..354cc3de51 +--- /dev/null ++++ b/elf/tst-dlopen-tlsreinitmod1.c +@@ -0,0 +1,20 @@ ++/* Test that dlopen preserves already accessed TLS (bug 31717), module 1. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <https://www.gnu.org/licenses/>. */ ++ ++/* This module triggers loading of tst-dlopen-tlsreinitmod2.so and ++ tst-dlopen-tlsreinitmod3.so. */ +diff --git a/elf/tst-dlopen-tlsreinitmod2.c b/elf/tst-dlopen-tlsreinitmod2.c +new file mode 100644 +index 0000000000..677e69bd35 +--- /dev/null ++++ b/elf/tst-dlopen-tlsreinitmod2.c +@@ -0,0 +1,30 @@ ++/* Test that dlopen preserves already accessed TLS (bug 31717), module 2. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <https://www.gnu.org/licenses/>. */ ++ ++#include <stdio.h> ++ ++/* Defined in tst-dlopen-tlsreinitmod3.so. This an underlinked symbol ++ dependency. */ ++extern void call_tlsreinitmod3 (void); ++ ++static void __attribute__ ((constructor)) ++tlsreinitmod2_init (void) ++{ ++ puts ("info: constructor of tst-dlopen-tlsreinitmod2.so invoked"); ++ call_tlsreinitmod3 (); ++} +diff --git a/elf/tst-dlopen-tlsreinitmod3.c b/elf/tst-dlopen-tlsreinitmod3.c +new file mode 100644 +index 0000000000..ef769c5131 +--- /dev/null ++++ b/elf/tst-dlopen-tlsreinitmod3.c +@@ -0,0 +1,102 @@ ++/* Test that dlopen preserves already accessed TLS (bug 31717), module 3. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <https://www.gnu.org/licenses/>. */ ++ ++#include <dlfcn.h> ++#include <stdbool.h> ++#include <stdio.h> ++#include <unistd.h> ++ ++/* Used to verify from the main program that the test ran. */ ++bool tlsreinitmod3_tested; ++ ++/* This TLS variable must not revert back to the initial state after ++ dlopen. */ ++static __thread int tlsreinitmod3_state = 1; ++ ++/* Set from the ELF constructor during dlopen. */ ++static bool tlsreinitmod3_constructed; ++ ++/* Second half of test, behind a compiler barrier. The compiler ++ barrier is necessary to prevent carrying over TLS address ++ information from call_tlsreinitmod3 to call_tlsreinitmod3_tail. */ ++void call_tlsreinitmod3_tail (void *self) __attribute__ ((weak)); ++ ++/* Called from tst-dlopen-tlsreinitmod2.so. */ ++void ++call_tlsreinitmod3 (void) ++{ ++ printf ("info: call_tlsreinitmod3 invoked (state=%d)\n", ++ tlsreinitmod3_state); ++ ++ if (tlsreinitmod3_constructed) ++ { ++ puts ("error: call_tlsreinitmod3 called after ELF constructor"); ++ fflush (stdout); ++ /* Cannot rely on test harness due to dynamic linking. */ ++ _exit (1); ++ } ++ ++ tlsreinitmod3_state = 2; ++ ++ /* Self-dlopen. This will run the ELF constructor. */ ++ void *self = dlopen ("tst-dlopen-tlsreinitmod3.so", RTLD_NOW); ++ if (self == NULL) ++ { ++ printf ("error: dlopen: %s\n", dlerror ()); ++ fflush (stdout); ++ /* Cannot rely on test harness due to dynamic linking. */ ++ _exit (1); ++ } ++ ++ call_tlsreinitmod3_tail (self); ++} ++ ++void ++call_tlsreinitmod3_tail (void *self) ++{ ++ printf ("info: dlopen returned in tlsreinitmod3 (state=%d)\n", ++ tlsreinitmod3_state); ++ ++ if (!tlsreinitmod3_constructed) ++ { ++ puts ("error: dlopen did not call tlsreinitmod3 ELF constructor"); ++ fflush (stdout); ++ /* Cannot rely on test harness due to dynamic linking. */ ++ _exit (1); ++ } ++ ++ if (tlsreinitmod3_state != 2) ++ { ++ puts ("error: TLS state reverted in tlsreinitmod3"); ++ fflush (stdout); ++ /* Cannot rely on test harness due to dynamic linking. */ ++ _exit (1); ++ } ++ ++ dlclose (self); ++ ++ /* Signal test completion to the main program. */ ++ tlsreinitmod3_tested = true; ++} ++ ++static void __attribute__ ((constructor)) ++tlsreinitmod3_init (void) ++{ ++ puts ("info: constructor of tst-dlopen-tlsreinitmod3.so invoked"); ++ tlsreinitmod3_constructed = true; ++} +diff --git a/include/link.h b/include/link.h +index cb0d7d8e2f..5ed445d5a6 100644 +--- a/include/link.h ++++ b/include/link.h +@@ -212,6 +212,7 @@ struct link_map + unsigned int l_find_object_processed:1; /* Zero if _dl_find_object_update + needs to process this + lt_library map. */ ++ unsigned int l_tls_in_slotinfo:1; /* TLS slotinfo updated in dlopen. */ + + /* NODELETE status of the map. Only valid for maps of type + lt_loaded. Lazy binding sets l_nodelete_active directly, +diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h +index 154efb0e19..259ce2e7d6 100644 +--- a/sysdeps/generic/ldsodefs.h ++++ b/sysdeps/generic/ldsodefs.h +@@ -1239,13 +1239,7 @@ extern void *_dl_open (const char *name, int mode, const void *caller, + extern int _dl_scope_free (void *) attribute_hidden; + + +-/* Add module to slot information data. If DO_ADD is false, only the +- required memory is allocated. Must be called with GL +- (dl_load_tls_lock) acquired. If the function has already been called +- for the link map L with !do_add, then this function will not raise +- an exception, otherwise it is possible that it encounters a memory +- allocation failure. */ +-extern void _dl_add_to_slotinfo (struct link_map *l, bool do_add) ++extern bool _dl_add_to_slotinfo (struct link_map *l, bool do_add) + attribute_hidden; + + /* Update slot information data for at least the generation of the + +commit f4a9b6e97bf05cf5a41907e55901f7e9afaafd4d +Author: Florian Weimer <fweimer@redhat.com> +Date: Mon Sep 9 21:10:23 2024 +0200 + + elf: Fix tst-dlopen-tlsreinit1.out test dependency + + Fixes commit 5097cd344fd243fb8deb6dec96e8073753f962f9 + ("elf: Avoid re-initializing already allocated TLS in dlopen + (bug 31717)"). + + Reported-by: Patsy Griffin <patsy@redhat.com> + Reviewed-by: Patsy Griffin <patsy@redhat.com> + (cherry picked from commit e82a7cb1622bff08d8e3a144d7c5516a088f1cbc) + +diff --git a/elf/Makefile b/elf/Makefile +index a03c6520d8..dc686c3bff 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -3141,7 +3141,7 @@ $(objpfx)tst-dlopen-tlsreinit4: \ + # tst-dlopen-tlsreinitmod3.so. The dependency is provided via + # $(objpfx)tst-dlopen-tlsreinitmod1.so. + tst-dlopen-tlsreinitmod2.so-no-z-defs = yes +-$(objpfx)tst-dlopen-tlsreinit.out: $(objpfx)tst-dlopen-tlsreinitmod1.so \ ++$(objpfx)tst-dlopen-tlsreinit1.out: $(objpfx)tst-dlopen-tlsreinitmod1.so \ + $(objpfx)tst-dlopen-tlsreinitmod2.so $(objpfx)tst-dlopen-tlsreinitmod3.so + # Reuse an audit module which provides ample debug logging. + $(objpfx)tst-dlopen-tlsreinit3.out: $(objpfx)tst-auditmod1.so + +commit adfb14e71f240a6bc2a4cbd6e6c50cc3fa1bcc3b +Author: Florian Weimer <fweimer@redhat.com> +Date: Tue Sep 10 12:40:27 2024 +0200 + + debug: Fix read error handling in pcprofiledump + + The reading loops did not check for read failures. Addresses + a static analysis report. + + Manually tested by compiling a program with the GCC's + -finstrument-functions option, running it with + “LD_PRELOAD=debug/libpcprofile.so PCPROFILE_OUTPUT=output-file”, + and reviewing the output of “debug/pcprofiledump output-file”. + + (cherry picked from commit 89b088bf70c651c231bf27e644270d093b8f144a) + +diff --git a/debug/pcprofiledump.c b/debug/pcprofiledump.c +index 049a9c2744..94530f0cf9 100644 +--- a/debug/pcprofiledump.c ++++ b/debug/pcprofiledump.c +@@ -75,6 +75,44 @@ static struct argp argp = + options, parse_opt, args_doc, doc, NULL, more_help + }; + ++/* Try to read SIZE bytes from FD and store them on BUF. Terminate ++ the process upon read error. Also terminate the process if less ++ than SIZE bytes are remaining in the file. If !IN_HEADER, do not ++ terminate the process if the end of the file is encountered ++ immediately, before any bytes are read. ++ ++ Returns true if SIZE bytes have been read, and false if no bytes ++ have been read due to an end-of-file condition. */ ++static bool ++read_exactly (int fd, void *buffer, size_t size, bool in_header) ++{ ++ char *p = buffer; ++ char *end = p + size; ++ while (p < end) ++ { ++ ssize_t ret = TEMP_FAILURE_RETRY (read (fd, p, end - p)); ++ if (ret < 0) ++ { ++ if (in_header) ++ error (EXIT_FAILURE, errno, _("cannot read header")); ++ else ++ error (EXIT_FAILURE, errno, _("cannot read pointer pair")); ++ } ++ if (ret == 0) ++ { ++ if (p == buffer && !in_header) ++ /* Nothing has been read. */ ++ return false; ++ if (in_header) ++ error (EXIT_FAILURE, 0, _("unexpected end of file in header")); ++ else ++ error (EXIT_FAILURE, 0, ++ _("unexpected end of file in pointer pair")); ++ } ++ p += ret; ++ } ++ return true; ++} + + int + main (int argc, char *argv[]) +@@ -110,8 +148,7 @@ main (int argc, char *argv[]) + /* Read the first 4-byte word. It contains the information about + the word size and the endianness. */ + uint32_t word; +- if (TEMP_FAILURE_RETRY (read (fd, &word, 4)) != 4) +- error (EXIT_FAILURE, errno, _("cannot read header")); ++ read_exactly (fd, &word, sizeof (word), true); + + /* Check whether we have to swap the byte order. */ + int must_swap = (word & 0x0fffffff) == bswap_32 (0xdeb00000); +@@ -121,56 +158,30 @@ main (int argc, char *argv[]) + /* We have two loops, one for 32 bit pointers, one for 64 bit pointers. */ + if (word == 0xdeb00004) + { +- union +- { +- uint32_t ptrs[2]; +- char bytes[8]; +- } pair; ++ uint32_t ptrs[2]; + + while (1) + { +- size_t len = sizeof (pair); +- size_t n; +- +- while (len > 0 +- && (n = TEMP_FAILURE_RETRY (read (fd, &pair.bytes[8 - len], +- len))) != 0) +- len -= n; +- +- if (len != 0) +- /* Nothing to read. */ ++ if (!read_exactly (fd, ptrs, sizeof (ptrs), false)) + break; + + printf ("this = %#010" PRIx32 ", caller = %#010" PRIx32 "\n", +- must_swap ? bswap_32 (pair.ptrs[0]) : pair.ptrs[0], +- must_swap ? bswap_32 (pair.ptrs[1]) : pair.ptrs[1]); ++ must_swap ? bswap_32 (ptrs[0]) : ptrs[0], ++ must_swap ? bswap_32 (ptrs[1]) : ptrs[1]); + } + } + else if (word == 0xdeb00008) + { +- union +- { +- uint64_t ptrs[2]; +- char bytes[16]; +- } pair; ++ uint64_t ptrs[2]; + + while (1) + { +- size_t len = sizeof (pair); +- size_t n; +- +- while (len > 0 +- && (n = TEMP_FAILURE_RETRY (read (fd, &pair.bytes[8 - len], +- len))) != 0) +- len -= n; +- +- if (len != 0) +- /* Nothing to read. */ ++ if (!read_exactly (fd, ptrs, sizeof (ptrs), false)) + break; + + printf ("this = %#018" PRIx64 ", caller = %#018" PRIx64 "\n", +- must_swap ? bswap_64 (pair.ptrs[0]) : pair.ptrs[0], +- must_swap ? bswap_64 (pair.ptrs[1]) : pair.ptrs[1]); ++ must_swap ? bswap_64 (ptrs[0]) : ptrs[0], ++ must_swap ? bswap_64 (ptrs[1]) : ptrs[1]); + } + } + else + +commit 7073164add3b874cf0c19ca0fb84236f6bb0985d +Author: Siddhesh Poyarekar <siddhesh@sourceware.org> +Date: Tue Sep 3 14:58:33 2024 -0400 + + libio: Attempt wide backup free only for non-legacy code + + _wide_data and _mode are not available in legacy code, so do not attempt + to free the wide backup buffer in legacy code. + + Resolves: BZ #32137 and BZ #27821 + + Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org> + Reviewed-by: Florian Weimer <fweimer@redhat.com> + (cherry picked from commit ae4d44b1d501421ad9a3af95279b8f4d1546f1ce) + +diff --git a/NEWS b/NEWS +index 5b20efbf6c..9033335db1 100644 +--- a/NEWS ++++ b/NEWS +@@ -9,12 +9,14 @@ Version 2.40.1 + + The following bugs are resolved with this release: + ++ [27821] ungetc: Fix backup buffer leak on program exit + [30081] resolv: Do not wait for non-existing second DNS response after error + [31717] elf: Avoid re-initializing already allocated TLS in dlopen + [31890] resolv: Allow short error responses to match any DNS query + [31968] mremap implementation in C does not handle arguments correctly + [32026] strerror/strsignal TLS not handled correctly for secondary namespaces + [32052] Name space violation in fortify wrappers ++ [32137] libio: Attempt wide backup free only for non-legacy code + + Version 2.40 + +diff --git a/libio/genops.c b/libio/genops.c +index 35d8b30710..6f20d49669 100644 +--- a/libio/genops.c ++++ b/libio/genops.c +@@ -819,7 +819,7 @@ _IO_unbuffer_all (void) + /* Free up the backup area if it was ever allocated. */ + if (_IO_have_backup (fp)) + _IO_free_backup_area (fp); +- if (fp->_mode > 0 && _IO_have_wbackup (fp)) ++ if (!legacy && fp->_mode > 0 && _IO_have_wbackup (fp)) + _IO_free_wbackup_area (fp); + + if (! (fp->_flags & _IO_UNBUFFERED) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index be55dd89b7c6..09dde042848b 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -44,9 +44,9 @@ } @ args: let - version = "2.39"; - patchSuffix = "-52"; - sha256 = "sha256-93vUfPgXDFc2Wue/hmlsEYrbOxINMlnGTFAtPcHi2SY="; + version = "2.40"; + patchSuffix = "-36"; + sha256 = "sha256-GaiQF16SY9dI9ieZPeb0sa+c0h4D8IDkv7Oh+sECBaI="; in assert withLinuxHeaders -> linuxHeaders != null; @@ -62,17 +62,17 @@ stdenv.mkDerivation ({ [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. $ git fetch --all -p && git checkout origin/release/2.39/master && git describe - glibc-2.39-52-gf8e4623421 - $ git show --minimal --reverse glibc-2.39.. ':!ADVISORIES' > 2.39-master.patch + glibc-2.40-36-g7073164add + $ git show --minimal --reverse glibc-2.40.. ':!ADVISORIES' > 2.40-master.patch To compare the archive contents zdiff can be used. - $ diff -u 2.39-master.patch ../nixpkgs/pkgs/development/libraries/glibc/2.39-master.patch + $ diff -u 2.40-master.patch ../nixpkgs/pkgs/development/libraries/glibc/2.40-master.patch Please note that each commit has changes to the file ADVISORIES excluded since that conflicts with the directory advisories/ making cross-builds from hosts with case-insensitive file-systems impossible. */ - ./2.39-master.patch + ./2.40-master.patch /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch @@ -205,7 +205,7 @@ stdenv.mkDerivation ({ env = { linuxHeaders = lib.optionalString withLinuxHeaders linuxHeaders; - inherit (stdenv) is64bit; + inherit (stdenv.hostPlatform) is64bit; # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to # prevent a retained dependency on the bootstrap tools in the stdenv-linux # bootstrap. @@ -283,14 +283,14 @@ stdenv.mkDerivation ({ homepage = "https://www.gnu.org/software/libc/"; description = "GNU C Library"; - longDescription = - '' Any Unix-like operating system needs a C library: the library which - defines the "system calls" and other basic facilities such as - open, malloc, printf, exit... + longDescription = '' + Any Unix-like operating system needs a C library: the library which + defines the "system calls" and other basic facilities such as + open, malloc, printf, exit... - The GNU C library is used as the C library in the GNU system and - most systems with the Linux kernel. - ''; + The GNU C library is used as the C library in the GNU system and + most systems with the Linux kernel. + ''; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index acace1c6a5bf..0427280fcc42 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.80.0"; + version = "2.82.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-U5sKKeFalmdsTwWUVBJQVmxcpE2l1Nh6NzL6LQeQnko="; + hash = "sha256-OGhM/zFyc2FcZ7j6mAbxYpnVHlUG2bkJuuFbWJ+pnLY="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { glib # for glib-compile-schemas ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index f9f8a4568a57..668f60ec10ec 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { glib # for glib-compile-schemas ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa ]); propagatedBuildInputs = [ glib libsigcxx ]; diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix deleted file mode 100644 index 3894db5ab9c8..000000000000 --- a/pkgs/development/libraries/glm/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - version = "1.0.1"; - pname = "glm"; - - src = fetchFromGitHub { - owner = "g-truc"; - repo = pname; - rev = version; - sha256 = "sha256-GnGyzNRpzuguc3yYbEFtYLvG+KiCtRAktiN+NvbOICE="; - }; - - outputs = [ "out" "doc" ]; - - nativeBuildInputs = [ cmake ]; - - env.NIX_CFLAGS_COMPILE = - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102823 - if (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") then "-fno-ipa-modref" - # Fix compilation errors on darwin - else if (stdenv.cc.isClang) then "-Wno-error" - else ""; - - cmakeFlags = [ - (lib.cmakeBool "BUILD_SHARED_LIBS" false) - (lib.cmakeBool "BUILD_STATIC_LIBS" false) - (lib.cmakeBool "GLM_TEST_ENABLE" doCheck) - ]; - - doCheck = true; - - postInstall = '' - # Install pkg-config file - mkdir -p $out/lib/pkgconfig - substituteAll ${./glm.pc.in} $out/lib/pkgconfig/glm.pc - - # Install docs - mkdir -p $doc/share/doc/glm - cp -rv ../doc/api $doc/share/doc/glm/html - cp -v ../doc/manual.pdf $doc/share/doc/glm - ''; - - meta = with lib; { - description = "OpenGL Mathematics library for C++"; - longDescription = '' - OpenGL Mathematics (GLM) is a header only C++ mathematics library for - graphics software based on the OpenGL Shading Language (GLSL) - specification and released under the MIT license. - ''; - homepage = "https://github.com/g-truc/glm"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ smancill ]; - }; -} - diff --git a/pkgs/development/libraries/glm/glm.pc.in b/pkgs/development/libraries/glm/glm.pc.in deleted file mode 100644 index e196c793d1d5..000000000000 --- a/pkgs/development/libraries/glm/glm.pc.in +++ /dev/null @@ -1,7 +0,0 @@ -prefix=@out@ -includedir=@out@/include - -Name: GLM -Description: OpenGL Mathematics -Version: @version@ -Cflags: -I${includedir} diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix deleted file mode 100644 index ee7876e548d4..000000000000 --- a/pkgs/development/libraries/globalarrays/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook -, blas, gfortran, openssh, mpi -} : - -stdenv.mkDerivation rec { - pname = "globalarrays"; - version = "5.8.2"; - - src = fetchFromGitHub { - owner = "GlobalArrays"; - repo = "ga"; - rev = "v${version}"; - sha256 = "sha256-2ffQIg9topqKX7ygnWaa/UunL9d0Lj9qr9xucsjLuoY="; - }; - - nativeBuildInputs = [ autoreconfHook gfortran ]; - buildInputs = [ mpi blas openssh ]; - - preConfigure = '' - configureFlagsArray+=( "--enable-i8" \ - "--with-mpi" \ - "--with-mpi3" \ - "--enable-eispack" \ - "--enable-underscoring" \ - "--with-blas8=${blas}/lib -lblas" ) - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Global Arrays Programming Models"; - homepage = "http://hpc.pnl.gov/globalarrays/"; - maintainers = [ maintainers.markuskowa ]; - license = licenses.bsd3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix deleted file mode 100644 index 53377022ad69..000000000000 --- a/pkgs/development/libraries/glog/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, gflags, gtest, perl }: - -stdenv.mkDerivation rec { - pname = "glog"; - version = "0.6.0"; - - src = fetchFromGitHub { - owner = "google"; - repo = "glog"; - rev = "v${version}"; - sha256 = "sha256-xqRp9vaauBkKz2CXbh/Z4TWqhaUtqfbsSlbYZR/kW9s="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ gtest ]; - - propagatedBuildInputs = [ gflags ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - # glog's custom FindUnwind.cmake module detects LLVM's unwind in case - # stdenv.cc is clang. But the module doesn't get installed, causing - # consumers of the CMake config file to fail at the configuration step. - # Explicitly disabling unwind support sidesteps the issue. - "-DWITH_UNWIND=OFF" - ]; - - doCheck = true; - - # There are some non-thread safe tests that can fail - enableParallelChecking = false; - nativeCheckInputs = [ perl ]; - - env.GTEST_FILTER = - let - filteredTests = lib.optionals stdenv.hostPlatform.isMusl [ - "Symbolize.SymbolizeStackConsumption" - "Symbolize.SymbolizeWithDemanglingStackConsumption" - ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - "LogBacktraceAt.DoesBacktraceAtRightLineWhenEnabled" - ] ++ lib.optionals stdenv.cc.isClang [ - # Clang optimizes an expected allocation away. - # See https://github.com/google/glog/issues/937 - "DeathNoAllocNewHook.logging" - ] ++ lib.optionals stdenv.isDarwin [ - "LogBacktraceAt.DoesBacktraceAtRightLineWhenEnabled" - ]; - in - "-${builtins.concatStringsSep ":" filteredTests}"; - - checkPhase = - let - excludedTests = lib.optionals stdenv.isDarwin [ - "mock-log" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - "logging" # works around segfaults on aarch64-darwin for now - ]; - excludedTestsRegex = lib.optionalString (excludedTests != [ ]) "(${lib.concatStringsSep "|" excludedTests})"; - in - '' - runHook preCheck - ctest -E "${excludedTestsRegex}" --output-on-failure - runHook postCheck - ''; - - meta = with lib; { - homepage = "https://github.com/google/glog"; - license = licenses.bsd3; - description = "Library for application-level logging"; - platforms = platforms.unix; - maintainers = with maintainers; [ nh2 r-burns ]; - }; -} diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix deleted file mode 100644 index ed5e4ec9b06f..000000000000 --- a/pkgs/development/libraries/gloox/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl -, zlibSupport ? true, zlib -, sslSupport ? true, openssl -, idnSupport ? true, libidn -}: - - -stdenv.mkDerivation rec{ - pname = "gloox"; - version = "1.0.28"; - - src = fetchurl { - url = "https://camaya.net/download/gloox-${version}.tar.bz2"; - sha256 = "sha256-WRvRLCSe3gtQoe9rmawN6O+cG6T9Lhhvl6dAIVzFlmw="; - }; - - # needed since gcc12 - postPatch = '' - sed '1i#include <ctime>' -i \ - src/tests/{tag/tag_perf.cpp,zlib/zlib_perf.cpp} \ - src/examples/*.cpp - ''; - - buildInputs = [ ] - ++ lib.optional zlibSupport zlib - ++ lib.optional sslSupport openssl - ++ lib.optional idnSupport libidn; - - meta = with lib; { - description = "Portable high-level Jabber/XMPP library for C++"; - mainProgram = "gloox-config"; - homepage = "http://camaya.net/gloox"; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix deleted file mode 100644 index 9fa8765f054e..000000000000 --- a/pkgs/development/libraries/glpk/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib, stdenv -, fetchurl -, fetchpatch -, libmysqlclient -# Excerpt from glpk's INSTALL file: -# This feature allows the exact simplex solver to use the GNU MP -# bignum library. If it is disabled, the exact simplex solver uses the -# GLPK bignum module, which provides the same functionality as GNU MP, -# however, it is much less efficient. -, withGmp ? true -, gmp -}: - -assert withGmp -> gmp != null; - -stdenv.mkDerivation rec { - version = "5.0"; - pname = "glpk"; - - src = fetchurl { - url = "mirror://gnu/glpk/${pname}-${version}.tar.gz"; - sha256 = "sha256-ShAT7rtQ9yj8YBvdgzsLKHAzPDs+WoFu66kh2VvsbxU="; - }; - - buildInputs = - [ libmysqlclient - ] ++ lib.optionals withGmp [ - gmp - ]; - - configureFlags = lib.optionals withGmp [ - "--with-gmp" - ]; - - patches = [ - # GLPK makes it possible to customize its message printing behaviour. Sage - # does that and needs to differentiate between printing regular messages and - # printing errors. Unfortunately there is no way to tell and glpk upstream - # rejected this patch. All it does is set the variable pointing to the error - # file back to NULL before glpk calls abort(). In sage's case, abort won't - # actually be called because the error handler jumps out of the function. - # This shouldn't affect everybody else, since glpk just calls abort() - # immediately afterwards anyways. - # See the sage trac ticket for more details: - # https://trac.sagemath.org/ticket/20710#comment:18 - (fetchpatch { - name = "error_recovery.patch"; - url = "https://raw.githubusercontent.com/sagemath/sage/d3c1f607e32f964bf0cab877a63767c86fd00266/build/pkgs/glpk/patches/error_recovery.patch"; - sha256 = "sha256-2hNtUEoGTFt3JgUvLH3tPWnz+DZcXNhjXzS+/V89toA="; - }) - ]; - - postPatch = - # Do not hardcode the include path for libmysqlclient. - '' - substituteInPlace configure \ - --replace '-I/usr/include/mysql' '$(mysql_config --include)' - ''; - - doCheck = true; - - meta = with lib; { - description = "GNU Linear Programming Kit"; - - longDescription = - '' The GNU Linear Programming Kit is intended for solving large - scale linear programming problems by means of the revised - simplex method. It is a set of routines written in the ANSI C - programming language and organized in the form of a library. - ''; - - homepage = "https://www.gnu.org/software/glpk/"; - license = licenses.gpl3Plus; - - maintainers = with maintainers; [ ] ++ teams.sage.members; - mainProgram = "glpsol"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/glui/default.nix b/pkgs/development/libraries/glui/default.nix deleted file mode 100644 index f3999bfb439b..000000000000 --- a/pkgs/development/libraries/glui/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, libglut -, libGL -, libGLU -, libX11 -, libXext -, libXi -, libXmu -}: - -stdenv.mkDerivation rec { - pname = "glui"; - version = "2.37"; - - src = fetchFromGitHub { - owner = "libglui"; - repo = "glui"; - rev = version; - sha256 = "0qg2y8w95s03zay1qsqs8pqxxlg6l9kwm7rrs1qmx0h22sxb360i"; - }; - - buildInputs = [ libglut libGLU libGL libXmu libXext libX11 libXi ]; - - installPhase = '' - mkdir -p "$out"/{bin,lib,share/glui/doc,include} - cp -rT bin "$out/bin" - cp -rT lib "$out/lib" - cp -rT include "$out/include" - cp -rT doc "$out/share/glui/doc" - cp LICENSE.txt "$out/share/glui/doc" - ''; - - meta = with lib; { - description = "User interface library using OpenGL"; - license = licenses.zlib ; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 0d1997cf1afc..f21dd724c95e 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { substituteInPlace tests/testsuite.c \ --replace /bin/rm rm '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # This specific test fails on darwin for some unknown reason substituteInPlace tests/test-filters.c \ --replace-fail 'test_charset_conversion (datadir, "japanese", "utf-8", "iso-2022-jp");' "" diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix deleted file mode 100644 index fb44222e75f5..000000000000 --- a/pkgs/development/libraries/gmm/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "gmm"; - version = "5.4.2"; - - src = fetchurl { - url = "mirror://savannah/getfem/stable/${pname}-${version}.tar.gz"; - sha256 = "sha256-UgbnMmQ/aTQQkCiy8XNmDywu3LDuJpIo1pSsym4iyIo="; - }; - - meta = with lib; { - description = "Generic C++ template library for sparse, dense and skyline matrices"; - homepage = "http://getfem.org/gmm.html"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index e809ed926eda..2700dad0db09 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -24,13 +24,13 @@ let self = stdenv.mkDerivation rec { # addition, `configfsf.guess' would return `i386-apple-darwin10.2.0' on # `x86_64-darwin', leading to a 32-bit ABI build, which is undesirable. preConfigure = - if !stdenv.isDarwin + if !stdenv.hostPlatform.isDarwin then "ln -sf configfsf.guess config.guess" else ''echo "Darwin host is `./config.guess`."''; configureFlags = [ (lib.enableFeature cxx "cxx") - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "ac_cv_build=x86_64-apple-darwin13.4.0" "ac_cv_host=x86_64-apple-darwin13.4.0" ]; @@ -43,8 +43,8 @@ let self = stdenv.mkDerivation rec { branch = "4"; description = "GNU multiple precision arithmetic library"; - longDescription = - '' GMP is a free library for arbitrary precision arithmetic, operating + longDescription = '' + GMP is a free library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers. There is no practical limit to the precision except the ones implied by the available memory in the machine GMP runs on. GMP has a rich @@ -72,7 +72,7 @@ let self = stdenv.mkDerivation rec { platforms = lib.platforms.all; badPlatforms = [ "x86_64-darwin" ]; # never built on aarch64-darwin, aarch64-linux since first introduction in nixpkgs - broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; }; in self diff --git a/pkgs/development/libraries/gmp/5.1.3-CVE-2021-43618.patch b/pkgs/development/libraries/gmp/5.1.3-CVE-2021-43618.patch deleted file mode 100644 index 13b9bc5f58cd..000000000000 --- a/pkgs/development/libraries/gmp/5.1.3-CVE-2021-43618.patch +++ /dev/null @@ -1,20 +0,0 @@ -Based on https://gmplib.org/repo/gmp-6.2/raw-rev/561a9c25298e, -adapted for 5.x by ris - -diff -r e1fd9db13b47 -r 561a9c25298e mpz/inp_raw.c ---- a/mpz/inp_raw.c Tue Dec 22 23:49:51 2020 +0100 -+++ b/mpz/inp_raw.c Thu Oct 21 19:06:49 2021 +0200 -@@ -81,8 +81,11 @@ - - abs_csize = ABS (csize); - -+ if (UNLIKELY (abs_csize > ~(mp_bitcnt_t) 0 / 8)) -+ return 0; /* Bit size overflows */ -+ - /* round up to a multiple of limbs */ -- abs_xsize = (abs_csize*8 + GMP_NUMB_BITS-1) / GMP_NUMB_BITS; -+ abs_xsize = ((mp_bitcnt_t)abs_csize*8 + GMP_NUMB_BITS-1) / GMP_NUMB_BITS; - - if (abs_xsize != 0) - { - diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix deleted file mode 100644 index e4fb89d054da..000000000000 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ lib, stdenv, fetchurl, m4 -, cxx ? true -, withStatic ? stdenv.hostPlatform.isStatic -}: - -let inherit (lib) optional; in - -let self = stdenv.mkDerivation rec { - pname = "gmp"; - version = "5.1.3"; - - src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv - urls = [ "mirror://gnu/gmp/gmp-${version}.tar.bz2" "ftp://ftp.gmplib.org/pub/gmp-${version}/gmp-${version}.tar.bz2" ]; - sha256 = "0q5i39pxrasgn9qdxzpfbwhh11ph80p57x6hf48m74261d97j83m"; - }; - - #outputs TODO: split $cxx due to libstdc++ dependency - # maybe let ghc use a version with *.so shared with rest of nixpkgs and *.a added - # - see #5855 for related discussion - outputs = [ "out" "dev" "info" ]; - passthru.static = self.out; - - nativeBuildInputs = [ m4 ]; - - patches = [ - ./5.1.3-CVE-2021-43618.patch - ] ++ lib.optionals stdenv.isDarwin [ - ./need-size-t.patch - ]; - - configureFlags = [ - "--with-pic" - (lib.enableFeature cxx "cxx") - # Build a "fat binary", with routines for several sub-architectures - # (x86), except on Solaris where some tests crash with "Memory fault". - # See <https://hydra.nixos.org/build/2760931>, for instance. - # - # no darwin because gmp uses ASM that clang doesn't like - (lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") - # The config.guess in GMP tries to runtime-detect various - # ARM optimization flags via /proc/cpuinfo (and is also - # broken on multicore CPUs). Avoid this impurity. - "--build=${stdenv.buildPlatform.config}" - ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" - ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" - ; - - doCheck = true; - - dontDisableStatic = withStatic; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://gmplib.org/"; - description = "GNU multiple precision arithmetic library"; - license = licenses.gpl3Plus; - - longDescription = - '' GMP is a free library for arbitrary precision arithmetic, operating - on signed integers, rational numbers, and floating point numbers. - There is no practical limit to the precision except the ones implied - by the available memory in the machine GMP runs on. GMP has a rich - set of functions, and the functions have a regular interface. - - The main target applications for GMP are cryptography applications - and research, Internet security applications, algebra systems, - computational algebra research, etc. - - GMP is carefully designed to be as fast as possible, both for small - operands and for huge operands. The speed is achieved by using - fullwords as the basic arithmetic type, by using fast algorithms, - with highly optimised assembly code for the most common inner loops - for a lot of CPUs, and by a general emphasis on speed. - - GMP is faster than any other bignum library. The advantage for GMP - increases with the operand sizes for many operations, since GMP uses - asymptotically faster algorithms. - ''; - - platforms = platforms.all; - badPlatforms = [ "x86_64-darwin" ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; - }; -}; - in self diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 3187b529aa17..458c7928c00e 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -38,13 +38,13 @@ let self = stdenv.mkDerivation rec { # See <https://hydra.nixos.org/build/2760931>, for instance. # # no darwin because gmp uses ASM that clang doesn't like - (lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") + (lib.enableFeature (!stdenv.hostPlatform.isSunOS && stdenv.hostPlatform.isx86) "fat") # The config.guess in GMP tries to runtime-detect various # ARM optimization flags via /proc/cpuinfo (and is also # broken on multicore CPUs). Avoid this impurity. "--build=${stdenv.buildPlatform.config}" - ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" - ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" + ] ++ optional (cxx && stdenv.hostPlatform.isDarwin) "CPPFLAGS=-fexceptions" + ++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.is64bit) "ABI=64" # to build a .dll on windows, we need --disable-static + --enable-shared # see https://gmplib.org/manual/Notes-for-Particular-Systems.html ++ optional (!withStatic && stdenv.hostPlatform.isWindows) "--disable-static --enable-shared" @@ -64,27 +64,27 @@ let self = stdenv.mkDerivation rec { gpl2Only ]; - longDescription = - '' GMP is a free library for arbitrary precision arithmetic, operating - on signed integers, rational numbers, and floating point numbers. - There is no practical limit to the precision except the ones implied - by the available memory in the machine GMP runs on. GMP has a rich - set of functions, and the functions have a regular interface. - - The main target applications for GMP are cryptography applications - and research, Internet security applications, algebra systems, - computational algebra research, etc. - - GMP is carefully designed to be as fast as possible, both for small - operands and for huge operands. The speed is achieved by using - fullwords as the basic arithmetic type, by using fast algorithms, - with highly optimised assembly code for the most common inner loops - for a lot of CPUs, and by a general emphasis on speed. - - GMP is faster than any other bignum library. The advantage for GMP - increases with the operand sizes for many operations, since GMP uses - asymptotically faster algorithms. - ''; + longDescription = '' + GMP is a free library for arbitrary precision arithmetic, operating + on signed integers, rational numbers, and floating point numbers. + There is no practical limit to the precision except the ones implied + by the available memory in the machine GMP runs on. GMP has a rich + set of functions, and the functions have a regular interface. + + The main target applications for GMP are cryptography applications + and research, Internet security applications, algebra systems, + computational algebra research, etc. + + GMP is carefully designed to be as fast as possible, both for small + operands and for huge operands. The speed is achieved by using + fullwords as the basic arithmetic type, by using fast algorithms, + with highly optimised assembly code for the most common inner loops + for a lot of CPUs, and by a general emphasis on speed. + + GMP is faster than any other bignum library. The advantage for GMP + increases with the operand sizes for many operations, since GMP uses + asymptotically faster algorithms. + ''; platforms = platforms.all; maintainers = [ ]; diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix deleted file mode 100644 index 558d8c0b112a..000000000000 --- a/pkgs/development/libraries/gnet/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, glib, libtool }: - -stdenv.mkDerivation rec { - pname = "gnet"; - version = "2.0.8"; - src = fetchFromGitHub { - owner = "GNOME"; - repo = "gnet"; - rev = "GNET_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "1cy78kglzi235md964ikvm0rg801bx0yk9ya8zavndjnaarzqq87"; - }; - - nativeBuildInputs = [ pkg-config autoconf automake ]; - buildInputs = [ glib libtool ]; - - preConfigure = "./autogen.sh"; - - meta = with lib; { - description = "Network library, written in C, object-oriented, and built upon GLib"; - homepage = "https://developer.gnome.org/gnet/"; - license = licenses.lgpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ pSub ]; - }; -} diff --git a/pkgs/development/libraries/gnome-desktop/bubblewrap-paths.patch b/pkgs/development/libraries/gnome-desktop/bubblewrap-paths.patch deleted file mode 100644 index c31e093f4b7e..000000000000 --- a/pkgs/development/libraries/gnome-desktop/bubblewrap-paths.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c -index ddcc1511..546c2a36 100644 ---- a/libgnome-desktop/gnome-desktop-thumbnail-script.c -+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c -@@ -555,9 +555,9 @@ add_bwrap (GPtrArray *array, - g_return_val_if_fail (script->s_infile != NULL, FALSE); - - add_args (array, -- "bwrap", -- "--ro-bind", "/usr", "/usr", -- "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache", -+ "@bubblewrap_bin@", -+ "--ro-bind", "@storeDir@", "@storeDir@", -+ "--ro-bind-try", "/run/current-system", "/run/current-system", - NULL); - - /* These directories might be symlinks into /usr/... */ diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix deleted file mode 100644 index db95029c804e..000000000000 --- a/pkgs/development/libraries/gnome-desktop/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ lib -, stdenv -, fetchurl -, substituteAll -, pkg-config -, libxslt -, ninja -, gnome -, gtk3 -, gtk4 -, glib -, gettext -, libxml2 -, xkeyboard_config -, libxkbcommon -, isocodes -, meson -, wayland -, libseccomp -, systemd -, bubblewrap -, gobject-introspection -, gtk-doc -, docbook-xsl-nons -, gsettings-desktop-schemas -}: - -stdenv.mkDerivation rec { - pname = "gnome-desktop"; - version = "44.0"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-QsdzdF2EuhS8HPHExvRgYUiAOlzTN5QcY5ZHlfPFnUI="; - }; - - patches = lib.optionals stdenv.isLinux [ - (substituteAll { - src = ./bubblewrap-paths.patch; - bubblewrap_bin = "${bubblewrap}/bin/bwrap"; - inherit (builtins) storeDir; - }) - ]; - - nativeBuildInputs = [ - pkg-config - meson - ninja - gettext - libxslt - libxml2 - gobject-introspection - gtk-doc - docbook-xsl-nons - glib - ]; - - buildInputs = [ - xkeyboard_config - libxkbcommon # for xkbregistry - isocodes - gtk3 - gtk4 - glib - ] ++ lib.optionals stdenv.isLinux [ - bubblewrap - wayland - libseccomp - systemd - ]; - - propagatedBuildInputs = [ - gsettings-desktop-schemas - ]; - - mesonFlags = [ - "-Dgtk_doc=true" - "-Ddesktop_docs=false" - ] ++ lib.optionals (!stdenv.isLinux) [ - "-Dsystemd=disabled" - "-Dudev=disabled" - ]; - - separateDebugInfo = stdenv.isLinux; - - passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-desktop"; - }; - }; - - meta = with lib; { - description = "Library with common API for various GNOME modules"; - homepage = "https://gitlab.gnome.org/GNOME/gnome-desktop"; - license = with licenses; [ gpl2Plus lgpl2Plus ]; - platforms = platforms.unix; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix deleted file mode 100644 index 498641bbdc30..000000000000 --- a/pkgs/development/libraries/gnome-menus/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, gnome }: - -stdenv.mkDerivation rec { - pname = "gnome-menus"; - version = "3.36.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07xvaf8s0fiv0035nk8zpzymn5www76w2a1vflrgqmp9plw8yd6r"; - }; - - makeFlags = [ - "INTROSPECTION_GIRDIR=${placeholder "out"}/share/gir-1.0/" - "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0" - ]; - - nativeBuildInputs = [ pkg-config gettext gobject-introspection ]; - buildInputs = [ glib ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/gnome-menus"; - description = "Library that implements freedesktops's Desktop Menu Specification in GNOME"; - license = with licenses; [ gpl2 lgpl2 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix deleted file mode 100644 index dc797dd02d16..000000000000 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ stdenv -, lib -, fetchurl -, pkg-config -, vala -, glib -, meson -, ninja -, libxslt -, gtk4 -, enableBackend ? stdenv.isLinux -, json-glib -, libadwaita -, librest_1_0 -, libxml2 -, libsecret -, gtk-doc -, gobject-introspection -, gettext -, glib-networking -, libsoup_3 -, docbook-xsl-nons -, docbook_xml_dtd_412 -, gnome -, gcr_4 -, libkrb5 -, gvfs -, dbus -, wrapGAppsHook4 -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gnome-online-accounts"; - 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-MMoTA4zXpp1bay1TZD+6ZUjRcSuSXwwhbzEzw2y/d3M="; - }; - - mesonFlags = [ - "-Dfedora=false" # not useful in NixOS or for NixOS users. - "-Dgoabackend=${lib.boolToString enableBackend}" - "-Dgtk_doc=${lib.boolToString enableBackend}" - "-Dman=${lib.boolToString enableBackend}" - "-Dwebdav=true" - ]; - - nativeBuildInputs = [ - dbus # used for checks and pkg-config to install dbus service/s - docbook_xml_dtd_412 - docbook-xsl-nons - gettext - gobject-introspection - gtk-doc - libxslt - meson - ninja - pkg-config - vala - wrapGAppsHook4 - ]; - - buildInputs = [ - gcr_4 - glib - glib-networking - gtk4 - libadwaita - gvfs # OwnCloud, Google Drive - json-glib - libkrb5 - librest_1_0 - libxml2 - libsecret - libsoup_3 - ]; - - separateDebugInfo = true; - - passthru = { - updateScript = gnome.updateScript { - versionPolicy = "odd-unstable"; - packageName = "gnome-online-accounts"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/gnome-online-accounts"; - description = "Single sign-on framework for GNOME"; - platforms = platforms.unix; - license = licenses.lgpl2Plus; - maintainers = teams.gnome.members; - }; -}) diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/development/libraries/gnome-video-effects/default.nix deleted file mode 100644 index a4cedd6c9187..000000000000 --- a/pkgs/development/libraries/gnome-video-effects/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv -, fetchurl -, pkg-config -, meson -, ninja -, gettext -, gnome -}: - -stdenv.mkDerivation rec { - pname = "gnome-video-effects"; - version = "0.6.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "166utGs/WoMvsuDZC0K/jGFgICylKsmt0Xr84ZLjyKg="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - description = "Collection of GStreamer effects to be used in different GNOME Modules"; - homepage = "https://gitlab.gnome.org/GNOME/gnome-video-effects"; - platforms = platforms.unix; - maintainers = teams.gnome.members; - license = licenses.gpl2; - }; -} diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix deleted file mode 100644 index 9fa5247cb489..000000000000 --- a/pkgs/development/libraries/gnu-config/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv, fetchurl }: - -# 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. - -let - rev = "948ae97ca5703224bd3eada06b7a69f40dd15a02"; - - # Don't use fetchgit as this is needed during Aarch64 bootstrapping - configGuess = fetchurl { - name = "config.guess-${builtins.substring 0 7 rev}"; - url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}"; - hash = "sha256-ZByuPAx0xJNU0+3gCfP+vYD+vhUBp3wdn6yNQsxFtss="; - }; - configSub = fetchurl { - name = "config.sub-${builtins.substring 0 7 rev}"; - url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}"; - hash = "sha256-/jovMvuv9XhIcyVJ9I2YP9ZSYCTsLw9ancdcL0NZo6Y="; - }; -in stdenv.mkDerivation { - pname = "gnu-config"; - version = "2024-01-01"; - - unpackPhase = '' - runHook preUnpack - cp ${configGuess} ./config.guess - cp ${configSub} ./config.sub - chmod +w ./config.sub ./config.guess - runHook postUnpack - ''; - - # If this isn't set, `pkgs.gnu-config.overrideAttrs( _: { patches - # = ...; })` will behave very counterintuitively: the (unpatched) - # gnu-config from the updateAutotoolsGnuConfigScriptsHook stdenv's - # defaultNativeBuildInputs will "update" the patched gnu-config by - # reverting the patch! - dontUpdateAutotoolsGnuConfigScripts = true; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - install -Dm755 ./config.guess $out/config.guess - install -Dm755 ./config.sub $out/config.sub - runHook postInstall - ''; - - meta = with lib; { - description = "Attempt to guess a canonical system name"; - homepage = "https://savannah.gnu.org/projects/config"; - license = licenses.gpl3; - # In addition to GPLv3: - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that - # program. - maintainers = with maintainers; [ dezgeg emilytrau ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index f1ecc1e9939f..964c0acb7c78 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -52,7 +52,7 @@ let # XXX: Gnulib's `test-select' fails on FreeBSD: # https://hydra.nixos.org/build/2962084/nixlog/1/raw . - doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin + doCheck = !stdenv.hostPlatform.isFreeBSD && !stdenv.hostPlatform.isDarwin && stdenv.buildPlatform == stdenv.hostPlatform; inherit (stdenv.hostPlatform) isDarwin; @@ -98,9 +98,10 @@ stdenv.mkDerivation rec { sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh - '' + lib.optionalString stdenv.hostPlatform.isMusl '' # See https://gitlab.com/gnutls/gnutls/-/issues/945 + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + # See https://gitlab.com/gnutls/gnutls/-/issues/945 sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool.sh - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' sed '2iexit 77' -i tests/{ktls,ktls_keyupdate}.sh ''; @@ -115,7 +116,7 @@ stdenv.mkDerivation rec { "--with-unbound-root-key-file=${dns-root-data}/root.key" (lib.withFeature withP11-kit "p11-kit") (lib.enableFeature cxxBindings "cxx") - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-ktls" ] ++ lib.optionals (stdenv.hostPlatform.isMinGW) [ "--disable-doc" @@ -127,7 +128,7 @@ stdenv.mkDerivation rec { buildInputs = [ lzo lzip libtasn1 libidn2 zlib gmp libunistring unbound gettext libiconv ] ++ lib.optional (withP11-kit) p11-kit - ++ lib.optional (tpmSupport && stdenv.isLinux) trousers; + ++ lib.optional (tpmSupport && stdenv.hostPlatform.isLinux) trousers; nativeBuildInputs = [ perl pkg-config texinfo ] ++ [ autoconf automake ] ++ lib.optionals doCheck [ which nettools util-linux ]; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index d58bdd2e7800..925db88c9d01 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -40,7 +40,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gobject-introspection"; - version = "1.80.1"; + version = "1.82.0"; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build # by pygobject3 (and maybe others), but it's only searched in $out @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/${lib.versions.majorMinor finalAttrs.version}/gobject-introspection-${finalAttrs.version}.tar.xz"; - hash = "sha256-od98Qk4VvaGrY5wA6QUbmt9c6hqeUS+KYDtTzRmbxtg="; + hash = "sha256-D1pMGQhCS/JrxB6TYRaMNjaFCA+9uHoZbIkchAHKLwk="; }; patches = [ @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { (python3.withPackages pythonModules) ]; - nativeCheckInputs = lib.optionals stdenv.isDarwin [ + nativeCheckInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools # for otool ]; @@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dgi_cross_use_prebuilt_gi=true" ]; - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; # During configurePhase, two python scripts are generated and need this. See # https://github.com/NixOS/nixpkgs/pull/98316#issuecomment-695785692 diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix deleted file mode 100644 index a0be4727293b..000000000000 --- a/pkgs/development/libraries/goffice/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ fetchurl, lib, stdenv, pkg-config, intltool, glib, gtk3, lasem -, libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome -, autoreconfHook -, gtk-doc -}: - -stdenv.mkDerivation rec { - pname = "goffice"; - version = "0.10.57"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-Zr/X4x0vZ1bVpiw2cDg8u6ArPLTBBClQGSqAG3Kjyas="; - }; - - nativeBuildInputs = [ - pkg-config intltool autoreconfHook gtk-doc - glib # for glib-genmarshal - ]; - - propagatedBuildInputs = [ - glib gtk3 libxml2 cairo pango libgsf lasem - ]; - - buildInputs = [ libxslt librsvg ]; - - enableParallelBuilding = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = { - description = "Glib/GTK set of document centric objects and utilities"; - - longDescription = '' - There are common operations for document centric applications that are - conceptually simple, but complex to implement fully: plugins, load/save - documents, undo/redo. - ''; - - license = lib.licenses.gpl2Plus; - - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix deleted file mode 100644 index 96b1f3ae13ce..000000000000 --- a/pkgs/development/libraries/gom/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, glib -, python3 -, sqlite -, gdk-pixbuf -, gnome -, gobject-introspection -}: - -stdenv.mkDerivation rec { - pname = "gom"; - version = "0.4"; - - outputs = [ "out" "py" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "17ca07hpg7dqxjn0jpqim3xqcmplk2a87wbwrrlq3dd3m8381l38"; - }; - - patches = [ - ./longer-stress-timeout.patch - ]; - - nativeBuildInputs = [ - gobject-introspection - meson - ninja - pkg-config - ]; - - buildInputs = [ - gdk-pixbuf - glib - sqlite - python3.pkgs.pygobject3 - ]; - - mesonFlags = [ - "-Dpygobject-override-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" - ]; - - # Success is more likely on x86_64 - doCheck = stdenv.isx86_64; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "GObject to SQLite object mapper"; - homepage = "https://gitlab.gnome.org/GNOME/gom"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/development/libraries/gom/longer-stress-timeout.patch b/pkgs/development/libraries/gom/longer-stress-timeout.patch deleted file mode 100644 index 3dcd1d0a107f..000000000000 --- a/pkgs/development/libraries/gom/longer-stress-timeout.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/meson.build b/tests/meson.build -index 1df4884..d7a6f5d 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -25,7 +25,7 @@ test('test-gom-find', test_find) - - test_stress = executable('test-gom-stress', 'test-gom-stress.c', - dependencies: [libgom_dep]) --test('test-gom-stress', test_stress, timeout: 300) -+test('test-gom-stress', test_stress, timeout: 500) - - test_transform = executable('test-gom-transform', 'test-gom-transform.c', - c_args: '-DIMAGE="@0@/gnome.png"'.format(meson.current_source_dir()), diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix deleted file mode 100644 index ca6951c30e4d..000000000000 --- a/pkgs/development/libraries/goocanvasmm/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, goocanvas2, gtkmm3, gnome }: - -stdenv.mkDerivation rec { - pname = "goocanvasmm"; - version = "1.90.11"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0vpdfrj59nwzwj8bk4s0h05iyql62pxjzsxh72g3vry07s3i3zw0"; - }; - nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ gtkmm3 goocanvas2 ]; - - enableParallelBuilding = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - attrPath = "goocanvasmm2"; - versionPolicy = "none"; # stable version has not been released yet, last update 2015 - }; - }; - - meta = with lib; { - description = "C++ bindings for GooCanvas"; - homepage = "https://gitlab.gnome.org/Archive/goocanvasmm"; - license = licenses.lgpl2; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix deleted file mode 100644 index 4d8ef6821240..000000000000 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, c-ares -, cmake -, crc32c -, curl -, gbenchmark -, grpc -, gtest -, ninja -, nlohmann_json -, openssl -, pkg-config -, protobuf - # default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173 -, apis ? [ "*" ] -, staticOnly ? stdenv.hostPlatform.isStatic -}: -let - # defined in cmake/GoogleapisConfig.cmake - googleapisRev = "85f8c758016c279fb7fa8f0d51ddc7ccc0dd5e05"; - googleapis = fetchFromGitHub { - name = "googleapis-src"; - owner = "googleapis"; - repo = "googleapis"; - rev = googleapisRev; - hash = "sha256-4Qiz0pBgW3OZi+Z8Zq6k9E94+8q6/EFMwPh8eQxDjdI="; - }; -in -stdenv.mkDerivation rec { - pname = "google-cloud-cpp"; - version = "2.14.0"; - - src = fetchFromGitHub { - owner = "googleapis"; - repo = "google-cloud-cpp"; - rev = "v${version}"; - sha256 = "sha256-0SoOaAqvk8cVC5W3ejTfe4O/guhrro3uAzkeIpAkCpg="; - }; - - patches = [ - # https://github.com/googleapis/google-cloud-cpp/pull/12554, tagged in 2.16.0 - (fetchpatch { - name = "prepare-for-GCC-13.patch"; - url = "https://github.com/googleapis/google-cloud-cpp/commit/ae30135c86982c36e82bb0f45f99baa48c6a780b.patch"; - hash = "sha256-L0qZfdhP8Zt/gYBWvJafteVgBHR8Kup49RoOrLDtj3k="; - }) - ]; - - postPatch = '' - substituteInPlace external/googleapis/CMakeLists.txt \ - --replace "https://github.com/googleapis/googleapis/archive/\''${_GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" "file://${googleapis}" - sed -i '/https:\/\/storage.googleapis.com\/cloud-cpp-community-archive\/com_google_googleapis/d' external/googleapis/CMakeLists.txt - ''; - - nativeBuildInputs = [ - cmake - ninja - pkg-config - ] ++ lib.optionals (!doInstallCheck) [ - # enable these dependencies when doInstallCheck is false because we're - # unconditionally building tests and benchmarks - # - # when doInstallCheck is true, these deps are added to nativeInstallCheckInputs - gbenchmark - gtest - ]; - - buildInputs = [ - c-ares - crc32c - (curl.override { inherit openssl; }) - grpc - nlohmann_json - openssl - protobuf - ]; - - # https://hydra.nixos.org/build/222679737/nixlog/3/tail - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-error=maybe-uninitialized"; - - doInstallCheck = true; - - preInstallCheck = - let - # These paths are added to (DY)LD_LIBRARY_PATH because they contain - # testing-only shared libraries that do not need to be installed, but - # need to be loadable by the test executables. - # - # Setting (DY)LD_LIBRARY_PATH is only necessary when building shared libraries. - additionalLibraryPaths = [ - "$PWD/google/cloud/bigtable" - "$PWD/google/cloud/bigtable/benchmarks" - "$PWD/google/cloud/pubsub" - "$PWD/google/cloud/spanner" - "$PWD/google/cloud/spanner/benchmarks" - "$PWD/google/cloud/storage" - "$PWD/google/cloud/storage/benchmarks" - "$PWD/google/cloud/testing_util" - ]; - ldLibraryPathName = "${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH"; - in - lib.optionalString doInstallCheck ( - lib.optionalString (!staticOnly) '' - export ${ldLibraryPathName}=${lib.concatStringsSep ":" additionalLibraryPaths} - '' - ); - - installCheckPhase = lib.optionalString doInstallCheck '' - runHook preInstallCheck - - # Disable any integration tests, which need to contact the internet. - # Also disable the `storage_benchmark_*` tests. - # With Protobuf < 23.x they require -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=ON. - # With Protobuf >= 23.x they require They require setting -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=OFF - ctest --label-exclude integration-test --exclude-regex storage_benchmarks_ - - runHook postInstallCheck - ''; - - nativeInstallCheckInputs = lib.optionals doInstallCheck [ - gbenchmark - gtest - ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS:BOOL=${if staticOnly then "OFF" else "ON"}" - # unconditionally build tests to catch linker errors as early as possible - # this adds a good chunk of time to the build - "-DBUILD_TESTING:BOOL=ON" - "-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES:BOOL=OFF" - ] ++ lib.optionals (apis != [ "*" ]) [ - "-DGOOGLE_CLOUD_CPP_ENABLE=${lib.concatStringsSep ";" apis}" - ]; - - requiredSystemFeatures = [ "big-parallel" ]; - - meta = with lib; { - license = with licenses; [ asl20 ]; - homepage = "https://github.com/googleapis/google-cloud-cpp"; - description = "C++ Idiomatic Clients for Google Cloud Platform services"; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ cpcloud ]; - }; -} diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix deleted file mode 100644 index e76c033c705d..000000000000 --- a/pkgs/development/libraries/gperftools/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch -, autoreconfHook -, libunwind -, perl -}: - -stdenv.mkDerivation rec { - pname = "gperftools"; - version = "2.15"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "${pname}-${version}"; - sha256 = "sha256-3ibr8AHzo7txX1U+9oOWA60qeeJs/OGeevv+sgBwQa0="; - }; - - patches = [ - # Add the --disable-general-dynamic-tls configure option: - # https://bugzilla.redhat.com/show_bug.cgi?id=1483558 - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/gperftools/raw/f62d87a34f56f64fb8eb86727e34fbc2d3f5294a/f/gperftools-2.7.90-disable-generic-dynamic-tls.patch"; - sha256 = "02falhpaqkl27hl1dib4yvmhwsddmgbw0krb46w31fyf3awb2ydv"; - }) - ]; - - nativeBuildInputs = [ autoreconfHook ]; - - # tcmalloc uses libunwind in a way that works correctly only on non-ARM dynamically linked linux - buildInputs = [ perl ] - ++ lib.optional (stdenv.isLinux && !(stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isStatic )) libunwind; - - # Disable general dynamic TLS on AArch to support dlopen()'ing the library: - # https://bugzilla.redhat.com/show_bug.cgi?id=1483558 - configureFlags = lib.optional stdenv.hostPlatform.isAarch - "--disable-general-dynamic-tls"; - - prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile.am --replace stdc++ c++ - ''; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin - "-D_XOPEN_SOURCE"; - - # some packages want to link to the static tcmalloc_minimal - # to drop the runtime dependency on gperftools - dontDisableStatic = true; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://github.com/gperftools/gperftools"; - description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; - platforms = platforms.all; - license = licenses.bsd3; - maintainers = with maintainers; [ vcunat ]; - }; -} diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index fa4bb1be6dd3..45df332bc0ca 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { # which has a path length limit. Nix on darwin is using a build directory # that already has quite a long path and the resulting socket path doesn't # fit in the limit. https://github.com/NixOS/nix/pull/1085 - ++ lib.optionals stdenv.isDarwin [ "--disable-gpg-test" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-gpg-test" ]; env.NIX_CFLAGS_COMPILE = toString ( # qgpgme uses Q_ASSERT which retains build inputs at runtime unless diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix deleted file mode 100644 index b11ec3a9f5c3..000000000000 --- a/pkgs/development/libraries/grail/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ enableX11 ? true, - lib, stdenv, fetchurl, pkg-config, xorg, python3, frame }: - -stdenv.mkDerivation rec { - pname = "grail"; - version = "3.1.1"; - - src = fetchurl { - url = "https://launchpad.net/grail/trunk/${version}/+download/${pname}-${version}.tar.bz2"; - sha256 = "1wwx5ibjdz5pyd0f5cd1n91y67r68dymxpm2lgd829041xjizvay"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ python3 frame ] - ++ lib.optionals enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes]; - - configureFlags = lib.optional enableX11 "--with-x11"; - - meta = { - homepage = "https://launchpad.net/canonical-multitouch/grail"; - description = "Gesture Recognition And Instantiation Library"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch b/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch deleted file mode 100644 index 36d81ca9f138..000000000000 --- a/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch +++ /dev/null @@ -1,51 +0,0 @@ -From d68fcb793d70032e978ecf8e0577eea955a741cf Mon Sep 17 00:00:00 2001 -From: worldofpeace <worldofpeace@protonmail.ch> -Date: Sun, 10 Apr 2022 12:02:10 +0800 -Subject: [PATCH] meson: add options for tests installation dirs - ---- - meson_options.txt | 6 ++++++ - tests/meson.build | 13 +++++++++++-- - 2 files changed, 17 insertions(+), 2 deletions(-) - -diff --git a/meson_options.txt b/meson_options.txt -index b9a2fb5..4b8629f 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -23,3 +23,9 @@ option('tests', type: 'boolean', - option('installed_tests', type: 'boolean', - value: true, - description: 'Install tests') -+option('installed_test_datadir', type: 'string', -+ value: '', -+ description: 'Installation directory for data files in tests') -+option('installed_test_bindir', type: 'string', -+ value: '', -+ description: 'Installation directory for binary files in tests') -diff --git a/tests/meson.build b/tests/meson.build -index 2b925e7..3276849 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -21,8 +21,17 @@ unit_tests = [ - - gen_installed_test = find_program('gen-installed-test.py') - --installed_test_datadir = join_paths(get_option('prefix'), get_option('datadir'), 'installed-tests', graphene_api_path) --installed_test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), 'installed-tests', graphene_api_path) -+installed_test_suffix = join_paths('installed-tests', graphene_api_path) -+ -+installed_test_datadir = join_paths(get_option('installed_test_datadir'), installed_test_suffix) -+if installed_test_datadir == '' -+ installed_test_datadir = join_paths(get_option('prefix'), get_option('datadir'), installed_test_suffix) -+endif -+ -+installed_test_bindir = join_paths(get_option('installed_test_bindir'), installed_test_suffix) -+if installed_test_bindir == '' -+ installed_test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), installed_test_suffix) -+endif - - # Make tests conditional on having mutest-1 installed system-wide, or - # available as a subproject --- -2.35.1 - diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix deleted file mode 100644 index 0364b9ecfaaf..000000000000 --- a/pkgs/development/libraries/graphene/default.nix +++ /dev/null @@ -1,129 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch -, nix-update-script -, pkg-config -, meson -, mesonEmulatorHook -, ninja -, python3 -, mutest -, nixosTests -, glib -, withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform || stdenv.hostPlatform.emulatorAvailable buildPackages -, gtk-doc -, docbook_xsl -, docbook_xml_dtd_43 -, buildPackages -, gobject-introspection -, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages -, makeWrapper -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "graphene"; - version = "1.10.8"; - - outputs = [ "out" "dev" ] - ++ lib.optionals withDocumentation [ "devdoc" ] - ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "installedTests" ]; - - src = fetchFromGitHub { - owner = "ebassi"; - repo = "graphene"; - rev = finalAttrs.version; - sha256 = "P6JQhSktzvyMHatP/iojNGXPmcsxsFxdYerXzS23ojI="; - }; - - patches = [ - # Add option for changing installation path of installed tests. - ./0001-meson-add-options-for-tests-installation-dirs.patch - - # Disable flaky simd_operators_reciprocal test - # https://github.com/ebassi/graphene/issues/246 - (fetchpatch { - url = "https://github.com/ebassi/graphene/commit/4fbdd07ea3bcd0964cca3966010bf71cb6fa8209.patch"; - sha256 = "uFkkH0u4HuQ/ua1mfO7sJZ7MPrQdV/JON7mTYB4DW80="; - includes = [ "tests/simd.c" ]; - revert = true; - }) - ]; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - python3 - makeWrapper - ] ++ lib.optionals withDocumentation [ - docbook_xml_dtd_43 - docbook_xsl - gtk-doc - ] ++ lib.optionals (withDocumentation && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ] ++ lib.optionals withIntrospection [ - gobject-introspection - ]; - - buildInputs = [ - glib - ]; - - nativeCheckInputs = [ - mutest - ]; - - mesonFlags = [ - (lib.mesonBool "gtk_doc" withDocumentation) - (lib.mesonEnable "introspection" withIntrospection) - "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" - "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" - ] ++ lib.optionals stdenv.isAarch32 [ - # the box test is failing with SIGBUS on armv7l-linux - # https://github.com/ebassi/graphene/issues/215 - "-Darm_neon=false" - ]; - - doCheck = true; - - postPatch = '' - patchShebangs tests/gen-installed-test.py - '' + lib.optionalString withIntrospection '' - PATH=${python3.withPackages (pp: [ pp.pygobject3 pp.tappy ])}/bin:$PATH patchShebangs tests/introspection.py - ''; - - postFixup = let - introspectionPy = "${placeholder "installedTests"}/libexec/installed-tests/graphene-1.0/introspection.py"; - in lib.optionalString withIntrospection '' - if [ -x '${introspectionPy}' ] ; then - wrapProgram '${introspectionPy}' \ - --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" [ glib.out (placeholder "out") ]}" - fi - ''; - - passthru = { - tests = { - installedTests = nixosTests.installed-tests.graphene; - pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - }; - }; - - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "Thin layer of graphic data types"; - homepage = "https://github.com/ebassi/graphene"; - license = licenses.mit; - maintainers = teams.gnome.members ++ (with maintainers; [ ]); - platforms = platforms.unix; - pkgConfigModules = [ "graphene-1.0" "graphene-gobject-1.0" ]; - }; -}) diff --git a/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch b/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch deleted file mode 100644 index cb6a1a354945..000000000000 --- a/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/chromaprint/grl-chromaprint.c b/src/chromaprint/grl-chromaprint.c -index 5a3598b..8979291 100644 ---- a/src/chromaprint/grl-chromaprint.c -+++ b/src/chromaprint/grl-chromaprint.c -@@ -111,6 +111,8 @@ - - gst_init (NULL, NULL); - -+ @load_plugins@ -+ - source = grl_chromaprint_source_new (); - grl_registry_register_source (registry, - plugin, diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix deleted file mode 100644 index 128ed788f43f..000000000000 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ lib, stdenv -, fetchurl -, substituteAll -, meson -, ninja -, pkg-config -, gettext -, gperf -, sqlite -, libarchive -, libdmapsharing -, libsoup_3 -, gnome -, libxml2 -, lua5_4 -, liboauth -, libmediaart -, grilo -, gst_all_1 -, gnome-online-accounts -, gmime -, gom -, json-glib -, avahi -, tracker -, dleyna-server -, itstool -, totem-pl-parser -}: - -stdenv.mkDerivation rec { - pname = "grilo-plugins"; - version = "0.3.16"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "/m9Nvlhsa4uiQGOU4gLyLQCdZCqW6zpU8y9qIdCEzcs="; - }; - - patches = [ - # grl-chromaprint requires the following GStreamer elements: - # * fakesink (gstreamer) - # * playbin (gst-plugins-base) - # * chromaprint (gst-plugins-bad) - (substituteAll { - src = ./chromaprint-gst-plugins.patch; - load_plugins = lib.concatMapStrings (plugin: ''gst_registry_scan_path(gst_registry_get(), "${lib.getLib plugin}/lib/gstreamer-1.0");'') (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-bad - ]); - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - itstool - gperf # for lua-factory - ]; - - buildInputs = [ - grilo - libxml2 - # libgdata - lua5_4 - liboauth - sqlite - gnome-online-accounts - totem-pl-parser - libarchive - libdmapsharing - libsoup_3 - gmime - gom - json-glib - avahi - libmediaart - tracker - dleyna-server - gst_all_1.gstreamer - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/grilo-plugins"; - description = "Collection of plugins for the Grilo framework"; - maintainers = teams.gnome.members; - license = licenses.lgpl21Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix deleted file mode 100644 index 06b524579ac4..000000000000 --- a/pkgs/development/libraries/grilo/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ stdenv -, lib -, fetchurl -, meson -, mesonEmulatorHook -, ninja -, pkg-config -, python3 -, gettext -, vala -, glib -, liboauth -, gtk3 -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, libxml2 -, gnome -, gobject-introspection -, libsoup_3 -, totem-pl-parser -}: - -stdenv.mkDerivation rec { - pname = "grilo"; - version = "0.3.16"; # if you change minor, also change ./setup-hook.sh - - outputs = [ "out" "dev" "man" "devdoc" ]; - outputBin = "dev"; - - setupHook = ./setup-hook.sh; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "iEWA6MXs4oDfI6pj/1I0t9SJiKQE331r/M0ed7RzvZY="; - }; - - mesonFlags = [ - "-Denable-gtk-doc=true" - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - python3 - gettext - gobject-introspection - vala - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ - glib - liboauth - gtk3 - libxml2 - libsoup_3 - totem-pl-parser - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/grilo"; - description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; - maintainers = teams.gnome.members; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/grilo/setup-hook.sh b/pkgs/development/libraries/grilo/setup-hook.sh deleted file mode 100644 index 9337c520a207..000000000000 --- a/pkgs/development/libraries/grilo/setup-hook.sh +++ /dev/null @@ -1,7 +0,0 @@ -make_grilo_find_plugins() { - if [ -d "$1"/lib/grilo-0.3 ]; then - addToSearchPath GRL_PLUGIN_PATH "$1/lib/grilo-0.3" - fi -} - -addEnvHooks "$hostOffset" make_grilo_find_plugins diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 2110755a1719..ee467e8ad18a 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -19,17 +19,25 @@ , arrow-cpp }: +# This package should be updated together with all related python grpc packages +# to ensure compatibility. +# nixpkgs-update: no auto update stdenv.mkDerivation rec { pname = "grpc"; - version = "1.62.1"; # N.B: if you change this, please update: - # pythonPackages.grpcio-tools + version = "1.67.0"; # N.B: if you change this, please update: + # pythonPackages.grpcio + # pythonPackages.grpcio-channelz + # pythonPackages.grpcio-health-checking + # pythonPackages.grpcio-reflection # pythonPackages.grpcio-status + # pythonPackages.grpcio-testing + # pythonPackages.grpcio-tools src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-L0bn6Bg36UKIRxznH9o4T7WXUqMwFjr8ybeQfbUi8xM="; + hash = "sha256-NjoSm3ZiHqe0QeVRFWO2FheoOzKjSX2oyiCM3qNUxhM="; fetchSubmodules = true; }; @@ -40,13 +48,14 @@ stdenv.mkDerivation rec { url = "https://github.com/lopsided98/grpc/commit/a9b917666234f5665c347123d699055d8c2537b2.patch"; hash = "sha256-Lm0GQsz/UjBbXXEE14lT0dcRzVmCKycrlrdBJj+KLu8="; }) - ]; + # fix build of 1.63.0 and newer on darwin: https://github.com/grpc/grpc/issues/36654 + ] ++ (lib.optional stdenv.hostPlatform.isDarwin ./dynamic-lookup-darwin.patch); nativeBuildInputs = [ cmake pkg-config ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) grpc; propagatedBuildInputs = [ c-ares re2 zlib abseil-cpp ]; buildInputs = [ openssl protobuf ] - ++ lib.optionals stdenv.isLinux [ libnsl ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libnsl ]; cmakeFlags = [ "-DgRPC_ZLIB_PROVIDER=package" @@ -91,12 +100,12 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-error" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Workaround for https://github.com/llvm/llvm-project/issues/48757 "-Wno-elaborated-enum-base" ]); - enableParallelBuilds = true; + enableParallelBuilding = true; passthru.tests = { inherit (python3.pkgs) grpcio-status grpcio-tools jaxlib; diff --git a/pkgs/development/libraries/grpc/dynamic-lookup-darwin.patch b/pkgs/development/libraries/grpc/dynamic-lookup-darwin.patch new file mode 100644 index 000000000000..d72ffcc72190 --- /dev/null +++ b/pkgs/development/libraries/grpc/dynamic-lookup-darwin.patch @@ -0,0 +1,11 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 053b9e3784..0979b504da 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38083,3 +38083,6 @@ generate_pkgconfig( + "-lgrpcpp_otel_plugin" + "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib" + "grpcpp_otel_plugin.pc") ++ ++target_link_options(upb_textformat_lib PRIVATE -Wl,-undefined,dynamic_lookup) ++target_link_options(upb_json_lib PRIVATE -Wl,-undefined,dynamic_lookup) diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix deleted file mode 100644 index b9b57de4274a..000000000000 --- a/pkgs/development/libraries/gsasl/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ fetchurl, lib, stdenv, libidn, libkrb5 -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gsasl"; - version = "2.2.1"; - - src = fetchurl { - url = "mirror://gnu/gsasl/gsasl-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-1FtWLhO9E7n8ILNy9LUyaXQM9iefg28JzhG50yvO4HU="; - }; - - # This is actually bug in musl. It is already fixed in trunc and - # this patch won't be necessary with musl > 1.2.3. - # - # https://git.musl-libc.org/cgit/musl/commit/?id=b50eb8c36c20f967bd0ed70c0b0db38a450886ba - patches = lib.optional stdenv.hostPlatform.isMusl ./gsasl.patch; - - buildInputs = [ libidn libkrb5 ]; - - configureFlags = [ "--with-gssapi-impl=mit" ]; - - preCheck = '' - export LOCALDOMAIN="dummydomain" - ''; - doCheck = !stdenv.hostPlatform.isDarwin; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = { - description = "GNU SASL, Simple Authentication and Security Layer library"; - mainProgram = "gsasl"; - - longDescription = - '' GNU SASL is a library that implements the IETF Simple - Authentication and Security Layer (SASL) framework and - some SASL mechanisms. SASL is used in network servers - (e.g. IMAP, SMTP, etc.) to authenticate peers. - ''; - - homepage = "https://www.gnu.org/software/gsasl/"; - license = lib.licenses.gpl3Plus; - - maintainers = with lib.maintainers; [ shlevy ]; - pkgConfigModules = [ "libgsasl" ]; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/development/libraries/gsasl/gsasl.patch b/pkgs/development/libraries/gsasl/gsasl.patch deleted file mode 100644 index 572d3034967e..000000000000 --- a/pkgs/development/libraries/gsasl/gsasl.patch +++ /dev/null @@ -1,21 +0,0 @@ -GNU libc and Musl libc have different ideas what - - strverscmp("UNKNOWN", "2.2.0") - -should return. Hopefully nobody depend on this particular behaviour in -practice. - ---- a/tests/version.c 1970-01-01 00:00:00.000000000 -0000 -+++ b/tests/version.c 1970-01-01 00:00:00.000000000 -0000 -@@ -111,11 +111,5 @@ - exit_code = EXIT_FAILURE; - } - -- if (gsasl_check_version ("UNKNOWN")) -- { -- printf ("FAIL: gsasl_check_version (UNKNOWN)\n"); -- exit_code = EXIT_FAILURE; -- } -- - return exit_code; - } diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix deleted file mode 100644 index c33011f4b01d..000000000000 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, stdenv -, fetchurl -, pkg-config -, glib -, gobject-introspection -, buildPackages -, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages -, meson -, ninja - # just for passthru -, gnome -}: - -stdenv.mkDerivation rec { - pname = "gsettings-desktop-schemas"; - version = "46.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-STpGoRYbY4jVeqcvYyp5zpbELV/70dCwD0luxYdvhXU="; - }; - - strictDeps = true; - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ - glib - meson - ninja - pkg-config - ] ++ lib.optionals withIntrospection [ - gobject-introspection - ]; - - mesonFlags = [ - (lib.mesonBool "introspection" withIntrospection) - ]; - - preInstall = '' - # Meson installs the schemas to share/glib-2.0/schemas - # We add the override file there too so it will be compiled and later moved by - # glib's setup hook. - mkdir -p $out/share/glib-2.0/schemas - cat - > $out/share/glib-2.0/schemas/remove-backgrounds.gschema.override <<- EOF - # These paths are supposed to refer to gnome-backgrounds - # but since we do not use FHS, they are broken. - # And we do not want to hardcode the correct paths - # since then every GTK app would pull in gnome-backgrounds. - # Let’s just override the broken paths so that people are not confused. - [org.gnome.desktop.background] - picture-uri=''' - picture-uri-dark=''' - - [org.gnome.desktop.screensaver] - picture-uri=''' - EOF - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"; - description = "Collection of GSettings schemas for settings shared by various components of a desktop"; - license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/development/libraries/gsl-lite/default.nix b/pkgs/development/libraries/gsl-lite/default.nix deleted file mode 100644 index fcab02095264..000000000000 --- a/pkgs/development/libraries/gsl-lite/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, ninja -, installCompatHeader ? false -, installLegacyHeaders ? false -}: - -stdenv.mkDerivation rec { - pname = "gsl-lite"; - version = "0.41.0"; - - src = fetchFromGitHub { - owner = "gsl-lite"; - repo = "gsl-lite"; - rev = "v${version}"; - hash = "sha256-cuuix302bVA7dWa7EJoxJ+otf1rSzjWQK8DHJsVkQio="; - }; - - patches = [ - (fetchpatch { - name = "type-limits-cast-fix.patch"; - url = "https://github.com/gsl-lite/gsl-lite/commit/13475be0e5bf5f464c398f4a07ef5c7684bc57c5.patch"; - hash = "sha256-rSz7OBmgQ3KcQ971tS3Z3QNC+U4XmrPjgmuOyG7J6Bo="; - }) - ]; - - nativeBuildInputs = [ cmake ninja ]; - - cmakeFlags = lib.mapAttrsToList - (name: value: ''-DGSL_LITE_OPT_${name}:BOOL=${if value then "ON" else "OFF"}'') - { - INSTALL_COMPAT_HEADER = installCompatHeader; - INSTALL_LEGACY_HEADERS = installLegacyHeaders; - BUILD_TESTS = doCheck; - }; - - # Building tests is broken on Darwin. - doCheck = !stdenv.isDarwin; - - meta = with lib; { - description = '' - A single-file header-only version of ISO C++ Guidelines Support Library - (GSL) for C++98, C++11, and later - ''; - longDescription = '' - gsl-lite is a single-file header-only implementation of the C++ Core - Guidelines Support Library originally based on Microsoft GSL and adapted - for C++98, C++03. It also works when compiled as C++11, C++14, C++17, - C++20. - ''; - homepage = "https://github.com/gsl-lite/gsl-lite"; - changelog = "https://github.com/gsl-lite/gsl-lite/blob/${src.rev}/CHANGES.txt"; - license = licenses.mit; - maintainers = with maintainers; [ azahi ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix deleted file mode 100644 index 2211f2d0d99f..000000000000 --- a/pkgs/development/libraries/gsl/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ fetchurl, fetchpatch, lib, stdenv }: - -stdenv.mkDerivation rec { - pname = "gsl"; - version = "2.8"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://gnu/gsl/${pname}-${version}.tar.gz"; - hash = "sha256-apnu7RVjLGNUiVsd1ULtWoVcDxXZrRMmxv4rLJ5CMZA="; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/macports/macports-ports/raw/90be777d2ce451d3c23783cb2be0efab9732e4d0/math/gsl/files/patch-fix-linking.diff"; - extraPrefix = ""; - hash = "sha256-lweYndIxcM5+4ckIUubkD9XbJbqkfdK+y9c3aRzmq0M="; - }) - ]; - - preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then '' - MACOSX_DEPLOYMENT_TARGET=10.16 - '' else null; - - postInstall = '' - moveToOutput bin/gsl-config "$dev" - ''; - - # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma"; - - # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html - doCheck = stdenv.hostPlatform.system != "i686-linux"; - - meta = { - description = "GNU Scientific Library, a large numerical library"; - homepage = "https://www.gnu.org/software/gsl/"; - license = lib.licenses.gpl3Plus; - - longDescription = '' - The GNU Scientific Library (GSL) is a numerical library for C - and C++ programmers. It is free software under the GNU General - Public License. - - The library provides a wide range of mathematical routines such - as random number generators, special functions and least-squares - fitting. There are over 1000 functions in total with an - extensive test suite. - ''; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix deleted file mode 100644 index ae2c489fe832..000000000000 --- a/pkgs/development/libraries/gsm/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv, fetchurl -, # Compile statically (support for packages that look for the static object) - staticSupport ? stdenv.hostPlatform.isStatic -}: - -let - inherit (stdenv) isDarwin; - inherit (lib) optional optionalString; -in - -stdenv.mkDerivation rec { - pname = "gsm"; - version = "1.0.22"; - - src = fetchurl { - url = "https://www.quut.com/gsm/${pname}-${version}.tar.gz"; - sha256 = "sha256-8Acukfa7hah4svbb9KC3yFDE3rgEnVVMZTQLO/ad8Kw="; - }; - - patchPhase = '' - substituteInPlace Makefile \ - --replace "= gcc " "?= gcc " - # Fix include directory - sed -e 's,$(GSM_INSTALL_ROOT)/inc,$(GSM_INSTALL_ROOT)/include/gsm,' -i Makefile - '' + optionalString (!staticSupport) ( - (if isDarwin then '' - # Build dylib on Darwin - sed -e 's,libgsm.a,libgsm.dylib,' -i Makefile - sed -e 's,$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS),$(LD) -o $(LIBGSM) -dynamiclib -install_name $(GSM_INSTALL_ROOT)/$(LIBGSM) $(GSM_OBJECTS) -lc,' -i Makefile - '' else '' - # Build ELF shared object by default - sed -e 's,libgsm.a,libgsm.so,' -i Makefile - sed -e 's/$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)/$(LD) -shared -Wl,-soname,libgsm.so -o $(LIBGSM) $(GSM_OBJECTS) -lc/' -i Makefile - '') + '' - # Remove line that is unused when building shared libraries - sed -e 's,$(RANLIB) $(LIBGSM),,' -i Makefile - '' - ); - - makeFlags = [ - "SHELL=${stdenv.shell}" - "INSTALL_ROOT=$(out)" - ] ++ optional stdenv.cc.isClang "CC=clang"; - - preInstall = "mkdir -p $out/{bin,lib,man/man1,man/man3,include/gsm}"; - - parallelBuild = false; - - meta = with lib; { - description = "Lossy speech compression codec"; - homepage = "https://www.quut.com/gsm/"; - license = licenses.bsd2; - maintainers = with maintainers; [ codyopel raskin ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix deleted file mode 100644 index 1a40b87c01aa..000000000000 --- a/pkgs/development/libraries/gsoap/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, unzip, m4, bison, flex, openssl, zlib, buildPackages }: - -let - majorVersion = "2.8"; - isCross = stdenv.hostPlatform != stdenv.buildPlatform; - -in stdenv.mkDerivation rec { - pname = "gsoap"; - version = "${majorVersion}.108"; - - src = fetchurl { - url = "mirror://sourceforge/project/gsoap2/gsoap-${majorVersion}/gsoap_${version}.zip"; - sha256 = "0x58bwlclk7frv03kg8bp0pm7zl784samvbzskrnr7dl5v866nvl"; - }; - - buildInputs = [ openssl zlib ]; - nativeBuildInputs = [ autoreconfHook bison flex m4 unzip ]; - # Parallel building doesn't work as of 2.8.49 - enableParallelBuilding = false; - - # Future versions of automake require subdir-objects if the source is structured this way - # As of 2.8.49 (maybe earlier) this is needed to silence warnings - prePatch = '' - substituteInPlace configure.ac \ - --replace 'AM_INIT_AUTOMAKE([foreign])' 'AM_INIT_AUTOMAKE([foreign subdir-objects])' - ${lib.optionalString isCross '' - substituteInPlace gsoap/wsdl/Makefile.am \ - --replace-fail 'SOAP=$(top_builddir)/gsoap/src/soapcpp2$(EXEEXT)' 'SOAP=${lib.getExe' buildPackages.gsoap "soapcpp2"}' - ''} - ''; - - meta = with lib; { - description = "C/C++ toolkit for SOAP web services and XML-based applications"; - homepage = "http://www.cs.fsu.edu/~engelen/soap.html"; - # gsoap is dual/triple licensed (see homepage for details): - # 1. gSOAP Public License 1.3 (based on Mozilla Public License 1.1). - # Components NOT covered by the gSOAP Public License are: - # - wsdl2h tool and its source code output, - # - soapcpp2 tool and its source code output, - # - UDDI code, - # - the webserver example code in gsoap/samples/webserver, - # - and several example applications in the gsoap/samples directory. - # 2. GPLv2 covers all of the software - # 3. Proprietary commercial software development license (removes GPL - # restrictions) - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; -} diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix deleted file mode 100644 index e588a7adca62..000000000000 --- a/pkgs/development/libraries/gsound/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome, meson, ninja }: - -stdenv.mkDerivation rec { - pname = "gsound"; - version = "1.0.3"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06l80xgykj7x1kqkjvcq06pwj2rmca458zvs053qc55x3sg06bfa"; - }; - - strictDeps = true; - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ pkg-config meson ninja gobject-introspection libtool vala ]; - buildInputs = [ glib libcanberra ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/gsound"; - description = "Small library for playing system sounds"; - mainProgram = "gsound-play"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch b/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch deleted file mode 100644 index 6200dca189f8..000000000000 --- a/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2d6dd1c286eb57fbf968510318cafc94888b98de Mon Sep 17 00:00:00 2001 -From: OPNA2608 <christoph.neidahl@gmail.com> -Date: Sun, 13 Jun 2021 21:56:03 +0200 -Subject: [PATCH] Darwin build fix - ---- - gspell/Makefile.am | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/gspell/Makefile.am b/gspell/Makefile.am -index 69ee421..7c58973 100644 ---- a/gspell/Makefile.am -+++ b/gspell/Makefile.am -@@ -161,6 +162,12 @@ gspell_private_headers += \ - gspell_private_c_files += \ - gspell-osx.c - -+libgspell_core_la_CFLAGS += \ -+ -xobjective-c -+ -+libgspell_core_la_LDFLAGS += \ -+ -framework Cocoa -+ - endif # OS_OSX - - if HAVE_INTROSPECTION --- -2.29.3 - diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix deleted file mode 100644 index 3e3ca2d59135..000000000000 --- a/pkgs/development/libraries/gspell/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ stdenv -, lib -, buildPackages -, fetchurl -, pkg-config -, libxml2 -, autoreconfHook -, gtk-doc -, glib -, gtk3 -, enchant2 -, icu -, vala -, gobject-introspection -, gnome -}: - -stdenv.mkDerivation rec { - pname = "gspell"; - version = "1.12.2"; - - outputs = [ "out" "dev" ]; - outputBin = "dev"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "tOmTvYJ+TOtqdwsbXolQ/OO+nIsrDL6yL9+ZKAjdITk="; - }; - - patches = [ - # Extracted from: https://github.com/Homebrew/homebrew-core/blob/2a27fb86b08afc7ae6dff79cf64aafb8ecc93275/Formula/gspell.rb#L125-L149 - # Dropped the GTK_MAC_* changes since gtk-mac-integration is not needed since 1.12.1 - ./0001-Darwin-build-fix.patch - ]; - - nativeBuildInputs = [ - pkg-config - vala - gobject-introspection - libxml2 - autoreconfHook - gtk-doc - glib - ]; - - buildInputs = [ - gtk3 - icu - vala # for share/vala/Makefile.vapigen (PKG_CONFIG_VAPIGEN_VAPIGEN) - ]; - - propagatedBuildInputs = [ - # required for pkg-config - enchant2 - ]; - - configureFlags = [ - "GLIB_COMPILE_RESOURCES=${lib.getDev buildPackages.glib}/bin/glib-compile-resources" - "GLIB_MKENUMS=${lib.getDev buildPackages.glib}/bin/glib-mkenums" - "PKG_CONFIG_VAPIGEN_VAPIGEN=${lib.getBin buildPackages.vala}/bin/vapigen" - "--enable-introspection=yes" - "--enable-vala=yes" - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - description = "Spell-checking library for GTK applications"; - mainProgram = "gspell-app1"; - homepage = "https://gitlab.gnome.org/GNOME/gspell"; - license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix deleted file mode 100644 index 42d22c2bd5fe..000000000000 --- a/pkgs/development/libraries/gss/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, stdenv -, fetchurl -, withShishi ? !stdenv.isDarwin -, shishi -}: - -stdenv.mkDerivation rec { - pname = "gss"; - version = "1.0.4"; - - src = fetchurl { - url = "mirror://gnu/gss/gss-${version}.tar.gz"; - hash = "sha256-7M6r3vTK4/znIYsuy4PrQifbpEtTthuMKy6IrgJBnHM="; - }; - - # krb5context test uses certificates that expired on 2024-07-11. - # Reported to bug-gss@gnu.org with Message-ID: <87cyngavtt.fsf@alyssa.is>. - postPatch = '' - rm tests/krb5context.c - ''; - - buildInputs = lib.optional withShishi shishi; - - # ./stdint.h:89:5: error: expected value in expression - preConfigure = lib.optionalString stdenv.isDarwin '' - export GNULIBHEADERS_OVERRIDE_WINT_T=0 - ''; - - configureFlags = [ - "--${if withShishi then "enable" else "disable"}-kerberos5" - ]; - - # Fixup .la files - postInstall = lib.optionalString withShishi '' - sed -i 's,\(-lshishi\),-L${shishi}/lib \1,' $out/lib/libgss.la - ''; - - meta = with lib; { - homepage = "https://www.gnu.org/software/gss/"; - description = "Generic Security Service"; - mainProgram = "gss"; - license = licenses.gpl3Plus; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/gssdp/1.6.nix b/pkgs/development/libraries/gssdp/1.6.nix index 468c2a84ca28..d52c90b41b91 100644 --- a/pkgs/development/libraries/gssdp/1.6.nix +++ b/pkgs/development/libraries/gssdp/1.6.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "GObject-based API for handling resource discovery and announcement over SSDP"; homepage = "http://www.gupnp.org/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 939fb0e7b426..a838efc15a70 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, fetchpatch2 , fetchurl , meson , ninja @@ -12,6 +13,8 @@ , glib , gnome , gssdp-tools +, buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages }: stdenv.mkDerivation rec { @@ -19,13 +22,21 @@ stdenv.mkDerivation rec { version = "1.4.1"; outputs = [ "out" "dev" ] - ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; + ++ lib.optionals withIntrospection [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "VySWVDV9PVGxQDFRaaJMBnHeeqUsb3XIxcmr1Ao1JSk="; }; + patches = [ + (fetchpatch2 { + # https://gitlab.gnome.org/GNOME/gssdp/-/merge_requests/11 + url = "https://gitlab.gnome.org/GNOME/gssdp/-/commit/db9d02c22005be7e5e81b43a3ab777250bd7b27b.diff"; + hash = "sha256-DJQrg6MhzpX8R0QaNnqdwA1+v8xncDU8jcX+I3scW1M="; + }) + ]; + strictDeps = true; depsBuildBuild = [ @@ -36,10 +47,12 @@ stdenv.mkDerivation rec { meson ninja pkg-config + glib + python3 + ] ++ lib.optionals withIntrospection [ gobject-introspection vala gi-docgen - python3 ]; buildInputs = [ @@ -51,14 +64,16 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" "-Dsniffer=false" + (lib.mesonBool "gtk_doc" withIntrospection) + (lib.mesonBool "introspection" withIntrospection) + (lib.mesonBool "vapi" withIntrospection) ]; # Bail out! GLib-GIO-FATAL-CRITICAL: g_inet_address_to_string: assertion 'G_IS_INET_ADDRESS (address)' failed - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; - postFixup = lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' + postFixup = lib.optionalString withIntrospection '' # Move developer documentation to devdoc output. # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. find -L "$out/share/doc" -type f -regex '.*\.devhelp2?' -print0 \ diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index bf27c6f25d7b..7d8df7c8a42d 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -104,7 +104,7 @@ , Foundation , MediaToolbox , enableGplPlugins ? true -, bluezSupport ? stdenv.isLinux +, bluezSupport ? stdenv.hostPlatform.isLinux # Causes every application using GstDeviceMonitor to send mDNS queries every 2 seconds , microdnsSupport ? false # Checks meson.is_cross_build(), so even canExecute isn't enough. @@ -114,13 +114,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.24.3"; + version = "1.24.7"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-6Q8mx9ycdvSqWZt1jP1tjBDWoLnLJluiw8m984iFWPg="; + hash = "sha256-ddUT/AumNfsfOXhtiQtz+6xfS8iP858qn/YvS49CjyI="; }; patches = [ @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { gobject-introspection ] ++ lib.optionals enableDocumentation [ hotdoc - ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.isLinux) [ + ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.hostPlatform.isLinux) [ wayland-scanner ]; @@ -214,11 +214,11 @@ stdenv.mkDerivation rec { libmicrodns ] ++ lib.optionals openh264Support [ openh264 - ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.isLinux) [ + ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.hostPlatform.isLinux) [ libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs wayland wayland-protocols - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin mjpegtools @@ -245,9 +245,9 @@ stdenv.mkDerivation rec { libGLU ] ++ lib.optionals guiSupport [ gtk3 - ] ++ lib.optionals (stdenv.isLinux && guiSupport) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && guiSupport) [ directfb - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # For unknown reasons the order is important, e.g. if # VideoToolbox is last, we get: # fatal error: 'VideoToolbox/VideoToolbox.h' file not found @@ -306,14 +306,14 @@ stdenv.mkDerivation rec { (lib.mesonEnable "openh264" openh264Support) (lib.mesonEnable "doc" enableDocumentation) ] - ++ lib.optionals (!stdenv.isLinux) [ + ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Ddoc=disabled" # needs gstcuda to be enabled which is Linux-only "-Dnvcodec=disabled" # Linux-only - ] ++ lib.optionals (!stdenv.isLinux || !gst-plugins-base.waylandEnabled) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux || !gst-plugins-base.waylandEnabled) [ "-Dva=disabled" # see comment on `libva` in `buildInputs` - ] ++ lib.optionals (!stdenv.isLinux || !guiSupport) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux || !guiSupport) [ "-Ddirectfb=disabled" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Daja=disabled" "-Dchromaprint=disabled" "-Dflite=disabled" @@ -327,7 +327,7 @@ stdenv.mkDerivation rec { "-Duvch264=disabled" # requires gudev "-Dv4l2codecs=disabled" # requires gudev "-Dladspa=disabled" # requires lrdf - ] ++ lib.optionals (!stdenv.isLinux || !stdenv.isx86_64 || !gst-plugins-base.waylandEnabled) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux || !stdenv.hostPlatform.isx86_64 || !gst-plugins-base.waylandEnabled) [ "-Dqsv=disabled" # Linux (and Windows) x86 only, makes va required ] ++ lib.optionals (!gst-plugins-base.glEnabled) [ "-Dgl=disabled" diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 3d55425190f6..459c14beb005 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -19,24 +19,26 @@ , libvisual , tremor # provides 'virbisidec' , libGL +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages +, buildPackages , gobject-introspection -, enableX11 ? stdenv.isLinux +, enableX11 ? stdenv.hostPlatform.isLinux , libXext , libXi , libXv , libdrm -, enableWayland ? stdenv.isLinux +, enableWayland ? stdenv.hostPlatform.isLinux , wayland-scanner , wayland , wayland-protocols -, enableAlsa ? stdenv.isLinux +, enableAlsa ? stdenv.hostPlatform.isLinux , alsa-lib # TODO: fix once x86_64-darwin sdk updated -, enableCocoa ? (stdenv.isDarwin && stdenv.isAarch64) +, enableCocoa ? (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) , Cocoa , OpenGL , enableGl ? (enableX11 || enableWayland || enableCocoa) -, enableCdparanoia ? (!stdenv.isDarwin) +, enableCdparanoia ? (!stdenv.hostPlatform.isDarwin) , cdparanoia , glib , testers @@ -47,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; - version = "1.24.3"; + version = "1.24.7"; outputs = [ "out" "dev" ]; @@ -57,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-8QlDl+qnky8G5X67sHWqM6osduS3VjChawLI1K9Ggy4="; + hash = "sha256-FSjRdGo5Mpn1rBfr8ToypmAgLx4p0KhSoiUPagWaL9o="; }; strictDeps = true; @@ -73,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: { orc glib gstreamer + ] ++ lib.optionals withIntrospection [ gobject-introspection ] ++ lib.optionals enableDocumentation [ hotdoc @@ -91,11 +94,11 @@ stdenv.mkDerivation (finalAttrs: { libjpeg tremor pango - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libdrm libGL libvisual - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenGL ] ++ lib.optionals enableAlsa [ alsa-lib @@ -111,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ gstreamer - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libdrm ]; @@ -119,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dexamples=disabled" # requires many dependencies and probably not useful for our users # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices "-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}" + (lib.mesonEnable "introspection" withIntrospection) (lib.mesonEnable "doc" enableDocumentation) ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "-Dtests=disabled" @@ -128,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!enableGl) "-Dgl=disabled" ++ lib.optional (!enableAlsa) "-Dalsa=disabled" ++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled" - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Ddrm=disabled" "-Dlibvisual=disabled" ]; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index d1094cfc8794..26a708546bb0 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -15,8 +15,12 @@ , lib , Cocoa , CoreServices -, rustc +, xpc , testers +, rustc +, withRust ? + lib.any (lib.meta.platformMatch stdenv.hostPlatform) rustc.targetPlatforms && + lib.all (p: !lib.meta.platformMatch stdenv.hostPlatform p) rustc.badTargetPlatforms , gobject-introspection , buildPackages , withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages @@ -28,9 +32,12 @@ , enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc }: +let + hasElfutils = lib.meta.availableOn stdenv.hostPlatform elfutils; +in stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; - version = "1.24.3"; + version = "1.24.7"; outputs = [ "bin" @@ -44,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-EiXvSjKfrhytxexyfaskmtVn6AcoeUk1Yc65HtNKpBQ="; + hash = "sha256-wOdbEkxSu3oMPc23NLKtJg6nKGqHRc8upinUyEnmqVg="; }; depsBuildBuild = [ @@ -63,26 +70,28 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper glib bash-completion - rustc - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap # for setcap binary ] ++ lib.optionals withIntrospection [ gobject-introspection + ] ++ lib.optionals withRust [ + rustc ] ++ lib.optionals enableDocumentation [ hotdoc ]; buildInputs = [ bash-completion - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap - ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ + ] ++ lib.optionals hasElfutils [ elfutils ] ++ lib.optionals withLibunwind [ libunwind - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa CoreServices + xpc ]; propagatedBuildInputs = [ @@ -92,10 +101,11 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + (lib.mesonEnable "ptp-helper" withRust) (lib.mesonEnable "introspection" withIntrospection) (lib.mesonEnable "doc" enableDocumentation) (lib.mesonEnable "libunwind" withLibunwind) - (lib.mesonEnable "libdw" withLibunwind) + (lib.mesonEnable "libdw" (withLibunwind && hasElfutils)) ]; postPatch = '' diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 4020193e0ae1..cee836e86ac9 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -1,4 +1,5 @@ -{ callPackage +{ stdenv +, callPackage , AVFoundation , AudioToolbox , Cocoa @@ -14,12 +15,15 @@ , Security , SystemConfiguration , VideoToolbox +, xpc , ipu6ep-camera-hal , ipu6epmtl-camera-hal }: { - gstreamer = callPackage ./core { inherit Cocoa CoreServices; }; + inherit stdenv; + + gstreamer = callPackage ./core { inherit Cocoa CoreServices xpc; }; gstreamermm = callPackage ./gstreamermm { }; diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 1232224faa13..99991bbaca6f 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gst-devtools"; - version = "1.24.3"; + version = "1.24.7"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-uREUov2Vj0Ks9EEYbofivsk1OO81qfgkgREZc2D/sjc="; + hash = "sha256-56p6I/pYfVjcWnu1Hvta159vKkxZh1ZMZvYztbvTixc="; }; outputs = [ diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 89830f3aed31..786f449054bc 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "gst-editing-services"; - version = "1.24.3"; + version = "1.24.7"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-z3QyFWiLATkFzSyff+3aIeLTTIRDQJkMbqJdEKA3KT8="; + hash = "sha256-sjzDEqI/q3F+S2A/ByvkIJhPucndIHfiBraqmxHfKdg="; }; nativeBuildInputs = [ @@ -61,6 +61,10 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs \ scripts/extract-release-date-from-doap-file.py + + # Hack for https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3800 + substituteInPlace ges/ges-frame-composition-meta.c \ + --replace-fail "GstFrameCompositionApi" "GESFrameCompositionApi" ''; meta = with lib; { diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 40c9cbc769c0..4bb334e2e7a5 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -39,9 +39,9 @@ , qt6Support ? false, qt6 , raspiCameraSupport ? false, libraspberrypi , enableJack ? true, libjack2 -, enableX11 ? stdenv.isLinux, xorg +, enableX11 ? stdenv.hostPlatform.isLinux, xorg , ncurses -, enableWayland ? stdenv.isLinux +, enableWayland ? stdenv.hostPlatform.isLinux , wayland , wayland-protocols , libgudev @@ -54,17 +54,17 @@ # MMAL is not supported on aarch64, see: # https://github.com/raspberrypi/userland/issues/688 -assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch32); +assert raspiCameraSupport -> (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch32); stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.24.3"; + version = "1.24.7"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-FQ+RTmHcBWALaLiMoQPHzCJxMBWOOJ6p6hWfQFCi67A="; + hash = "sha256-dZrLEebeg3P/jLteerjrmjhjG+gc8kIgJnsAHrVVk8E="; }; patches = [ @@ -147,9 +147,9 @@ stdenv.mkDerivation rec { qtbase qtdeclarative qtwayland - ]) ++ lib.optionals stdenv.isDarwin [ + ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libdrm libGL libv4l @@ -177,7 +177,7 @@ stdenv.mkDerivation rec { "-Dximagesrc=disabled" # Linux-only ] ++ lib.optionals (!enableJack) [ "-Djack=disabled" - ] ++ lib.optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Ddv1394=disabled" # Linux only "-Doss4=disabled" # Linux only "-Doss=disabled" # Linux only diff --git a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix index 68485f7e7454..4bbb20c6e41a 100644 --- a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix +++ b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix @@ -6,17 +6,18 @@ , gst_all_1 , ipu6-camera-hal , libdrm +, libva }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "icamerasrc-${ipu6-camera-hal.ipuVersion}"; - version = "unstable-2023-10-23"; + version = "unstable-2024-09-29"; src = fetchFromGitHub { owner = "intel"; repo = "icamerasrc"; - rev = "528a6f177732def4d5ebc17927220d8823bc8fdc"; - hash = "sha256-Ezcm5OpF/NKvJf5sFeJyvNc2Uq0166GukC9MuNUV2Fs="; + rev = "refs/tags/20240926_1446"; + hash = "sha256-BpIZxkPmSVKqPntwBJjGmCaMSYFCEZHJa4soaMAJRWE="; }; nativeBuildInputs = [ @@ -34,8 +35,10 @@ stdenv.mkDerivation { buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad ipu6-camera-hal libdrm + libva ]; NIX_CFLAGS_COMPILE = [ diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 38a553ec8669..06cd16b05c27 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.24.3"; + version = "1.24.7"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-2cWxUkaKRcH6g1FBBCIJCnGScHrXTS4aQ2f1JU4YjZE="; + hash = "sha256-w+QXm6GDwtMQHt+H/3DdB+cox2al/uNObs3tdspYAt8="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index 3e8eec7b8a60..187d1a048697 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -57,15 +57,15 @@ let mp4 = [ ]; # net - aws = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + aws = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; hlssink3 = [ ]; ndi = [ ]; onvif = [ pango ]; raptorq = [ ]; - reqwest = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + reqwest = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; rtp = [ ]; - webrtc = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - webrtchttp = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + webrtc = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; + webrtchttp = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; # text textahead = [ ]; @@ -110,9 +110,9 @@ let [ "csound" # tests have weird failure on x86, does not currently work on arm or darwin "livesync" # tests have suspicious intermittent failure, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/357 - ] ++ lib.optionals stdenv.isAarch64 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "raptorq" # pointer alignment failure in tests on aarch64 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "reqwest" # tests hang on darwin "threadshare" # tests cannot bind to localhost on darwin "webp" # not supported on darwin (upstream crate issue) @@ -200,13 +200,13 @@ stdenv.mkDerivation (finalAttrs: { cargo cargo-c' nasm - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lld ] ++ lib.optionals enableDocumentation [ hotdoc ]; - env = lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_LINK = "-fuse-ld=lld"; }; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_LINK = "-fuse-ld=lld"; }; buildInputs = [ gstreamer diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index b6d2b6464e41..58c9486d9855 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.24.3"; + version = "1.24.7"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-YmKOzKeLj1tRxZpNYCxl6SBf/FDDyDzWH6sfY0i2NWU="; + hash = "sha256-2ceOXNC+rTC/XnSvgOQefVAGGUYX/b9EuIvibla76Pk="; }; outputs = [ diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 6f8ac715af50..b94f6daa917c 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.24.3"; + version = "1.24.7"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-TJUTQcTGSGMLb+EjTsET2B3S0khSm/K1R44K0HfIDtM="; + hash = "sha256-PclU/FP+GIg2cDIqHCFePGUpA24KabMPZHgc1AwmhZM="; }; nativeBuildInputs = [ @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { libmad libmpeg2 x264 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit CoreFoundation DiskArbitration diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index db154403ffb3..2b9c02bbebd2 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.24.3"; + version = "1.24.7"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-hF8u/g3KjasjTd6PsJHaLNBqnSpoNCK1bctoiVT5Bw4="; + hash = "sha256-OqXtnX9LWny2DYsDcNmD1ZOV3lRu52cEQBGA/Q/V7oY="; }; outputs = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { xorg.libICE nasm libvpx - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL libGLU ]; diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix deleted file mode 100644 index 6a09d8cbe9e2..000000000000 --- a/pkgs/development/libraries/gtdialog/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkg-config }: - -stdenv.mkDerivation rec { - pname = "gtdialog"; - version = "1.4"; - - src = fetchurl { - url = "https://foicica.com/gtdialog/download/gtdialog_${version}.zip"; - sha256 = "sha256-0+WBr1IZIhQjxOsKO/yuXjaTRWPObhMdGqgibcpXGtI="; - }; - - nativeBuildInputs = [ pkg-config unzip ]; - buildInputs = [ - cdk - gtk2 - glib - ncurses - ]; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = with lib; { - description = "Cross-platform helper for creating interactive dialogs"; - mainProgram = "gtdialog"; - license = licenses.mit; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; - homepage = "http://foicica.com/gtdialog"; - downloadPage = "http://foicica.com/gtdialog/download"; - }; -} diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix deleted file mode 100644 index 7e44794620c0..000000000000 --- a/pkgs/development/libraries/gtest/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, ninja -# Enable C++17 support -# https://github.com/google/googletest/issues/3081 -# Projects that require a higher standard can override this package. -# For an example why that may be necessary, see: -# https://github.com/mhx/dwarfs/issues/188#issuecomment-1907574427 -# Setting this to `null` does not pass any flags to set this. -, cxx_standard ? ( - if ( - (stdenv.cc.isGNU && (lib.versionOlder stdenv.cc.version "11.0")) - || - (stdenv.cc.isClang && (lib.versionOlder stdenv.cc.version "16.0")) - ) - then "17" - else null - ) -, static ? stdenv.hostPlatform.isStatic, -}: - -stdenv.mkDerivation rec { - pname = "gtest"; - version = "1.14.0"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "google"; - repo = "googletest"; - rev = "v${version}"; - hash = "sha256-t0RchAHTJbuI5YW4uyBPykTvcjy90JW9AOPNjIhwh6U="; - }; - - patches = [ - ./fix-cmake-config-includedir.patch - ]; - - nativeBuildInputs = [ cmake ninja ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" - ] ++ lib.optionals (cxx_standard != null) [ - "-DCMAKE_CXX_STANDARD=${cxx_standard}" - ]; - - meta = with lib; { - description = "Google's framework for writing C++ tests"; - homepage = "https://github.com/google/googletest"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ ivan-tkatchev ]; - }; -} diff --git a/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch b/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch deleted file mode 100644 index 6d29e04b2568..000000000000 --- a/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt -index 428bd9f8..04b84539 100644 ---- a/googlemock/CMakeLists.txt -+++ b/googlemock/CMakeLists.txt -@@ -104,10 +104,10 @@ endif() - string(REPLACE ";" "$<SEMICOLON>" dirs "${gmock_build_include_dirs}") - target_include_directories(gmock SYSTEM INTERFACE - "$<BUILD_INTERFACE:${dirs}>" -- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") -+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") - target_include_directories(gmock_main SYSTEM INTERFACE - "$<BUILD_INTERFACE:${dirs}>" -- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") -+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") - - ######################################################################## - # -diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt -index 51a67c91..fb09e978 100644 ---- a/googletest/CMakeLists.txt -+++ b/googletest/CMakeLists.txt -@@ -143,10 +143,10 @@ set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION}) - string(REPLACE ";" "$<SEMICOLON>" dirs "${gtest_build_include_dirs}") - target_include_directories(gtest SYSTEM INTERFACE - "$<BUILD_INTERFACE:${dirs}>" -- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") -+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") - target_include_directories(gtest_main SYSTEM INTERFACE - "$<BUILD_INTERFACE:${dirs}>" -- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") -+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") - if(CMAKE_SYSTEM_NAME MATCHES "QNX") - target_link_libraries(gtest PUBLIC regex) - endif() diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/development/libraries/gthree/default.nix deleted file mode 100644 index 3657f62f929c..000000000000 --- a/pkgs/development/libraries/gthree/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, fetchpatch -, ninja -, meson -, pkg-config -, gobject-introspection -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, glib -, gtk3 -, graphene -, libepoxy -, json-glib -}: - -stdenv.mkDerivation rec { - pname = "gthree"; - version = "0.9.0"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchFromGitHub { - owner = "alexlarsson"; - repo = "gthree"; - rev = version; - sha256 = "09fcnjc3j21lh5fjf067wm35sb4qni4vgzing61kixnn2shy79iy"; - }; - - patches = [ - # Add option for disabling examples - (fetchpatch { - url = "https://github.com/alexlarsson/gthree/commit/75f05c40aba9d5f603d8a3c490c3406c1fe06776.patch"; - sha256 = "PBwLz4DLhC+7BtypVTFMFiF3hKAJeskU3XBKFHa3a84="; - }) - ]; - - nativeBuildInputs = [ - ninja - meson - pkg-config - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - gobject-introspection - ]; - - buildInputs = [ - libepoxy - json-glib - ]; - - propagatedBuildInputs = [ - glib - gtk3 - graphene - ]; - - mesonFlags = [ - "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}" - # Data for examples is useless when the example programs are not installed. - "-Dexamples=false" - ]; - - meta = with lib; { - description = "GObject/GTK port of three.js"; - homepage = "https://github.com/alexlarsson/gthree"; - license = licenses.mit; - 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-engine-bluecurve/default.nix b/pkgs/development/libraries/gtk-engine-bluecurve/default.nix deleted file mode 100644 index 43cf8675735f..000000000000 --- a/pkgs/development/libraries/gtk-engine-bluecurve/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }: - -stdenv.mkDerivation rec { - pname = "gtk-engine-bluecurve"; - version = "1.0"; - - src = fetchurl { - url = "https://ftp.gnome.org/pub/gnome/teams/art.gnome.org/archive/themes/gtk2/GTK2-Wonderland-Engine-${version}.tar.bz2"; - sha256 = "1nim3lhmbs5mw1hh76d9258c1p923854x2j6i30gmny812c7qjnm"; - }; - - nativeBuildInputs = [ pkg-config intltool ]; - - buildInputs = [ gtk2 ]; - - meta = { - description = "Original Bluecurve engine from Red Hat's artwork package"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/gtk-engine-murrine/default.nix b/pkgs/development/libraries/gtk-engine-murrine/default.nix deleted file mode 100644 index 9c83bc4f47c8..000000000000 --- a/pkgs/development/libraries/gtk-engine-murrine/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }: - -stdenv.mkDerivation rec { - pname = "gtk-engine-murrine"; - version = "0.98.2"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9"; - }; - - strictDeps = true; - nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ gtk2 ]; - - meta = { - description = "Very flexible theme engine"; - homepage = "https://gitlab.gnome.org/Archive/murrine"; - license = lib.licenses.lgpl3; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gtk-engines/default.nix b/pkgs/development/libraries/gtk-engines/default.nix deleted file mode 100644 index d722143b210e..000000000000 --- a/pkgs/development/libraries/gtk-engines/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }: - -stdenv.mkDerivation rec { - pname = "gtk-engines"; - version = "2.20.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gtk-engines/${lib.versions.majorMinor version}/gtk-engines-${version}.tar.bz2"; - sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm"; - }; - - nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ gtk2 ]; - - meta = { - description = "Theme engines for GTK 2"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix deleted file mode 100644 index b3edf0ba4853..000000000000 --- a/pkgs/development/libraries/gtk-frdp/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, meson -, ninja -, pkg-config -, vala -, gobject-introspection -, glib -, gtk3 -, freerdp3 -, fuse3 -, unstableGitUpdater -}: - -stdenv.mkDerivation rec { - pname = "gtk-frdp"; - version = "3.37.1-unstable-2024-03-01"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = pname; - rev = "11e9fcbee8ca5ec70456dd5b616b2560d7f73adc"; - sha256 = "2e/bAZFRTbBU4ZfgMFHiN9JwVm4qXSRtirPvbC3oT5s="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - vala - gobject-introspection - ]; - - buildInputs = [ - glib - gtk3 - freerdp3 - fuse3 - ]; - - passthru = { - updateScript = unstableGitUpdater { - tagPrefix = "v"; - }; - }; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ - "-DTARGET_OS_IPHONE=0" - "-DTARGET_OS_WATCH=0" - ]); - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/gtk-frdp"; - description = "RDP viewer widget for GTK"; - maintainers = teams.gnome.members; - license = licenses.lgpl3Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix deleted file mode 100644 index c977de194278..000000000000 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, wayland-scanner -, wayland -, gtk3 -, gobject-introspection -, vala -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gtk-layer-shell"; - version = "0.9.0"; - - outputs = [ "out" "dev" "devdoc" ]; - outputBin = "devdoc"; # for demo - - src = fetchFromGitHub { - owner = "wmww"; - repo = "gtk-layer-shell"; - rev = "v${finalAttrs.version}"; - hash = "sha256-9hQE1NY5QCuj+5R5aSjJ0DaMUQuO7HPpZooj+1+96RY="; - }; - - strictDeps = true; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - wayland-scanner - vala - wayland-scanner - ]; - - buildInputs = [ - wayland - gtk3 - ]; - - mesonFlags = [ - "-Ddocs=true" - "-Dexamples=true" - ]; - - meta = with lib; { - description = "Library to create panels and other desktop components for Wayland using the Layer Shell protocol"; - mainProgram = "gtk-layer-demo"; - homepage = "https://github.com/wmww/gtk-layer-shell"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ eonpatapon donovanglover ]; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix deleted file mode 100644 index 69ef71f1506f..000000000000 --- a/pkgs/development/libraries/gtk-sharp-beans/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, which, pkg-config, mono, gtk-sharp-2_0, gio-sharp }: - -stdenv.mkDerivation rec { - pname = "gtk-sharp-beans"; - version = "2.14.0"; - - src = fetchFromGitHub { - owner = "mono"; - repo = "gtk-sharp-beans"; - - rev = version; - sha256 = "04sylwdllb6gazzs2m4jjfn14mil9l3cny2q0xf0zkhczzih6ah1"; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook which ]; - buildInputs = [ mono gtk-sharp-2_0 gio-sharp ]; - - dontStrip = true; - - meta = with lib; { - description = "Binds some API from GTK that isn't in GTK# 2.12.x"; - platforms = platforms.linux; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index ed0900ee1a92..7d11b671b1b7 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -25,9 +25,9 @@ , testers , AppKit , Cocoa -, gdktarget ? if stdenv.isDarwin then "quartz" else "x11" -, cupsSupport ? config.gtk2.cups or stdenv.isLinux -, xineramaSupport ? stdenv.isLinux +, gdktarget ? if stdenv.hostPlatform.isDarwin then "quartz" else "x11" +, cupsSupport ? config.gtk2.cups or stdenv.hostPlatform.isLinux +, xineramaSupport ? stdenv.hostPlatform.isLinux }: let @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/3bbf0b6176d42836d23c36a6ac410e807ec0a7a7.patch"; hash = "sha256-mstOPk9NNpUwScrdEbvGhmAv8jlds3SBdj53T0q33vM="; }) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch ./patches/2.0-darwin-x11.patch # Fixes an incompatible function pointer conversion and implicit int errors with clang 16. @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { gdk-pixbuf glib pango - ] ++ lib.optionals (stdenv.isLinux || stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) [ libXcomposite libXcursor libXi @@ -91,14 +91,14 @@ stdenv.mkDerivation (finalAttrs: { libXrender ] ++ lib.optional xineramaSupport libXinerama ++ lib.optional cupsSupport cups - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libXdamage AppKit Cocoa ]; preConfigure = - lib.optionalString (stdenv.isDarwin + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") "MACOSX_DEPLOYMENT_TARGET=10.16"; @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { "--sysconfdir=/etc" "--with-gdktarget=${gdktarget}" "--with-xinput=yes" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-glibtest" "--disable-introspection" "--disable-visibility" @@ -116,6 +116,13 @@ stdenv.mkDerivation (finalAttrs: { "ac_cv_path_GDK_PIXBUF_CSOURCE=${buildPackages.gdk-pixbuf.dev}/bin/gdk-pixbuf-csource" ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-int" + "-Wno-error=incompatible-pointer-types" + ]; + }; + enableParallelBuilding = true; installFlags = [ diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index ed0612bf2ecb..984ab02bf645 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -33,15 +33,15 @@ , gnome , gsettings-desktop-schemas , sassc -, trackerSupport ? stdenv.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform) -, tracker -, x11Support ? stdenv.isLinux -, waylandSupport ? stdenv.isLinux +, trackerSupport ? stdenv.hostPlatform.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform) +, tinysparql +, x11Support ? stdenv.hostPlatform.isLinux +, waylandSupport ? stdenv.hostPlatform.isLinux , libGL , wayland , wayland-protocols -, xineramaSupport ? stdenv.isLinux -, cupsSupport ? stdenv.isLinux +, xineramaSupport ? stdenv.hostPlatform.isLinux +, cupsSupport ? stdenv.hostPlatform.isLinux , cups , AppKit , Cocoa @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./patches/3.0-immodules.cache.patch ./patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33 @@ -120,10 +120,10 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon (libepoxy.override { inherit x11Support; }) isocodes - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ] ++ lib.optionals trackerSupport [ - tracker + tinysparql ]; #TODO: colord? @@ -146,7 +146,7 @@ stdenv.mkDerivation (finalAttrs: { libXrandr libXrender pango - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # explicitly propagated, always needed Cocoa QuartzCore @@ -166,13 +166,13 @@ stdenv.mkDerivation (finalAttrs: { "-Dtracker3=${lib.boolToString trackerSupport}" "-Dbroadway_backend=${lib.boolToString broadwaySupport}" "-Dx11_backend=${lib.boolToString x11Support}" - "-Dquartz_backend=${lib.boolToString (stdenv.isDarwin && !x11Support)}" + "-Dquartz_backend=${lib.boolToString (stdenv.hostPlatform.isDarwin && !x11Support)}" "-Dintrospection=${lib.boolToString withIntrospection}" ]; doCheck = false; # needs X11 - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; # These are the defines that'd you'd get with --enable-debug=minimum (default). # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options @@ -202,7 +202,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs ''${files[@]} ''; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # The updater is needed for nixos env and it's tiny. moveToOutput bin/gtk-update-icon-cache "$out" # Launcher @@ -219,14 +219,14 @@ stdenv.mkDerivation (finalAttrs: { ''; # Wrap demos - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' demos=(gtk3-demo gtk3-demo-application gtk3-icon-browser gtk3-widget-factory) for program in ''${demos[@]}; do wrapProgram $dev/bin/$program \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${finalAttrs.pname}-${finalAttrs.version}" done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # a comment created a cycle between outputs sed '/^# ModulesPath =/d' -i "$out"/lib/gtk-*/*/immodules.cache ''; diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 3a144b2de3ac..8a79a06560fc 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -4,6 +4,7 @@ , substituteAll , fetchurl , pkg-config +, docutils , gettext , graphene , gi-docgen @@ -32,13 +33,12 @@ , gsettings-desktop-schemas , gst_all_1 , sassc -, trackerSupport ? stdenv.isLinux -, tracker -, x11Support ? stdenv.isLinux -, waylandSupport ? stdenv.isLinux +, trackerSupport ? stdenv.hostPlatform.isLinux +, tinysparql +, x11Support ? stdenv.hostPlatform.isLinux +, waylandSupport ? stdenv.hostPlatform.isLinux , libGL -# experimental and can cause crashes in inspector -, vulkanSupport ? stdenv.isLinux +, vulkanSupport ? stdenv.hostPlatform.isLinux , shaderc , vulkan-loader , vulkan-headers @@ -46,15 +46,16 @@ , wayland , wayland-protocols , wayland-scanner -, xineramaSupport ? stdenv.isLinux -, cupsSupport ? stdenv.isLinux +, xineramaSupport ? stdenv.hostPlatform.isLinux +, cupsSupport ? stdenv.hostPlatform.isLinux , compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages , cups -, AppKit -, Cocoa , libexecinfo , broadwaySupport ? true , testers +, apple-sdk +, apple-sdk_10_15 +, darwinMinVersionHook }: let @@ -69,7 +70,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk4"; - version = "4.14.5"; + version = "4.16.3"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -81,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = with finalAttrs; "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - hash = "sha256-VUfyufAGsTOZPgcLh8F4BOBR79o5E/6soRCPor5B4k0="; + hash = "sha256-LsU+B9GMnwA7OeSmqDgFTZJZ4Ei2xMBdgMDQWqch2UQ="; }; depsBuildBuild = [ @@ -89,6 +90,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ + docutils # for rst2man, rst2html5 gettext gobject-introspection makeWrapper @@ -130,10 +132,8 @@ stdenv.mkDerivation (finalAttrs: { libXi libXrandr libXrender - ]) ++ lib.optionals stdenv.isDarwin [ - AppKit - ] ++ lib.optionals trackerSupport [ - tracker + ]) ++ lib.optionals trackerSupport [ + tinysparql ] ++ lib.optionals waylandSupport [ libGL wayland @@ -142,8 +142,6 @@ stdenv.mkDerivation (finalAttrs: { xorg.libXinerama ] ++ lib.optionals cupsSupport [ cups - ] ++ lib.optionals stdenv.isDarwin [ - Cocoa ] ++ lib.optionals stdenv.hostPlatform.isMusl [ libexecinfo ]; @@ -164,6 +162,11 @@ stdenv.mkDerivation (finalAttrs: { # Required for GSettings schemas at runtime. # Will be picked up by wrapGAppsHook4. gsettings-desktop-schemas + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (darwinMinVersionHook "10.15") + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin + && lib.versionOlder apple-sdk.version "10.15") [ + apple-sdk_10_15 ]; mesonFlags = [ @@ -175,13 +178,13 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "vulkan" vulkanSupport) (lib.mesonEnable "print-cups" cupsSupport) (lib.mesonBool "x11-backend" x11Support) - ] ++ lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64) [ "-Dmedia-gstreamer=disabled" # requires gstreamer-gl ]; doCheck = false; # needs X11 - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; # These are the defines that'd you'd get with --enable-debug=minimum (default). # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options @@ -218,7 +221,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' PATH="$OLD_PATH" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # The updater is needed for nixos env and it's tiny. moveToOutput bin/gtk4-update-icon-cache "$out" # Launcher @@ -234,7 +237,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # Wrap demos - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' demos=(gtk4-demo gtk4-demo-application gtk4-icon-browser gtk4-widget-factory) for program in ''${demos[@]}; do diff --git a/pkgs/development/libraries/gtk4-layer-shell/default.nix b/pkgs/development/libraries/gtk4-layer-shell/default.nix deleted file mode 100644 index 14df22925dc0..000000000000 --- a/pkgs/development/libraries/gtk4-layer-shell/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, wayland-protocols -, wayland-scanner -, wayland -, gtk4 -, gobject-introspection -, vala -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gtk4-layer-shell"; - version = "1.0.3"; - - outputs = [ "out" "dev" "devdoc" ]; - outputBin = "devdoc"; - - src = fetchFromGitHub { - owner = "wmww"; - repo = "gtk4-layer-shell"; - rev = "v${finalAttrs.version}"; - hash = "sha256-oGtU1H1waA8ZAjaLMdb+x0KIIwgjhdn38ra/eFVWfFI="; - }; - - strictDeps = true; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - vala - wayland-scanner - wayland-protocols - ]; - - buildInputs = [ - wayland - gtk4 - ]; - - mesonFlags = [ - "-Ddocs=true" - "-Dexamples=true" - ]; - - meta = with lib; { - description = "Library to create panels and other desktop components for Wayland using the Layer Shell protocol and GTK4"; - mainProgram = "gtk4-layer-demo"; - license = licenses.mit; - maintainers = with maintainers; [ donovanglover ]; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix deleted file mode 100644 index 0cc510ce7313..000000000000 --- a/pkgs/development/libraries/gtkdatabox/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, gtk3 -, pango -, cairo -}: - -stdenv.mkDerivation rec { - pname = "gtkdatabox"; - version = "1.0.0"; - - src = fetchurl { - url = "mirror://sourceforge/gtkdatabox/${pname}-${version}.tar.gz"; - sha256 = "1qykm551bx8j8pfgxs60l2vhpi8lv4r8va69zvn2594lchh71vlb"; - }; - - nativeBuildInputs = [ pkg-config ]; - - propagatedBuildInputs = [ gtk3 pango cairo ]; - - meta = { - description = "GTK widget for displaying large amounts of numerical data"; - homepage = "https://gtkdatabox.sourceforge.io/"; - license = lib.licenses.lgpl2Only; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ yl3dy ]; - }; -} diff --git a/pkgs/development/libraries/gtkextra/default.nix b/pkgs/development/libraries/gtkextra/default.nix deleted file mode 100644 index 66516add6d9c..000000000000 --- a/pkgs/development/libraries/gtkextra/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv -, lib -, fetchurl -, pkg-config -, gobject-introspection -, file -, gtk2 -, glib -, cairo -, atk -, pango -, libtiff -, libpng -, libjpeg -}: - -stdenv.mkDerivation rec { - pname = "gtkextra"; - version = "3.3.4"; - - src = fetchurl { - url = "mirror://sourceforge/project/gtkextra/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "1mpihbyzhv3ymfim93l9xnxmzhwyqdba5xb4rdn5vggdg25766v5"; - }; - - postPatch = '' - substituteInPlace configure \ - --replace "/usr/bin/file" "${file}/bin/file" - ''; - - nativeBuildInputs = [ gobject-introspection pkg-config ]; - - buildInputs = [ gtk2 glib cairo atk pango libtiff libpng libjpeg ]; - - meta = with lib; { - homepage = "https://gtkextra.sourceforge.net/"; - description = "GtkExtra is a useful set of widgets for creating GUI's for GTK+"; - license = licenses.lgpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ tesq0 ]; - }; -} diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix deleted file mode 100644 index 19bcb4ad99c3..000000000000 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ fetchurl, lib, stdenv, pkg-config, gtk2 }: - -stdenv.mkDerivation rec { - pname = "gtkimageview"; - version = "1.6.4"; - - src = fetchurl { - url = "https://sources.archlinux.org/other/packages/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1wj63af9j9p5i067lpwi9lxvwalamakrmklvl983kvi7s4w1ss2c"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 ]; - - preConfigure = '' - sed '/DEPRECATED_FLAGS/d' -i configure - sed 's/-Wall -Werror//' -i configure - ''; - - doCheck = true; - - meta = { - homepage = "https://gitlab.gnome.org/Archive/gtkimageview"; - - description = "Image viewer widget for GTK"; - - longDescription = - '' GtkImageView is a simple image viewer widget for GTK. Similar to - the image viewer panes in gThumb or Eye of Gnome. It makes writing - image viewing and editing applications easy. Among its features - are: mouse and keyboard zooming; scrolling and dragging; adjustable - interpolation; GIF animation support. - ''; - - license = lib.licenses.lgpl2Plus; - - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index 36ff98d9f165..c1b0be342f80 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "4.14.0"; + version = "4.16.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-k1CgREt0TKPcaVhuvRtnB1IJIrbZ9PIyEDzmA6Jx7No="; + hash = "sha256-OyP9Or+PsiOwDpmDtgEK8tuA44yJq2mUuLYjCqhdYPk="; }; nativeBuildInputs = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { pangomm_2_48 ]; - nativeCheckInputs = lib.optionals (!stdenv.isDarwin)[ + nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin)[ xvfb-run ]; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - ${lib.optionalString (!stdenv.isDarwin) "xvfb-run -s '-screen 0 800x600x24'"} \ + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "xvfb-run -s '-screen 0 800x600x24'"} \ meson test --print-errorlogs runHook postCheck diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index fb5c72e8b34d..9defccd8de65 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -35,9 +35,13 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./3.x-nix_share_path.patch ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + enableParallelBuilding = true; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; checkPhase = '' NO_AT_BRIDGE=1 \ XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index f1a12eb0de12..e034bff9e576 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; - version = "5.12.1"; + version = "5.14.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor finalAttrs.version}/gtksourceview-${finalAttrs.version}.tar.xz"; - hash = "sha256-hMgqrZhcWq2ufOp4BJBKdjQeyCsmjUZZTBpHjzm0LB8="; + hash = "sha256-AJhi6HuSnaWnJOzgefAfjO4p50eXoeysNJ9YwVo8vFg="; }; patches = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # 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"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "-D_POSIX_C_SOURCE=200809L"; nativeBuildInputs = [ meson @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { "-Ddocumentation=true" ]; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; checkPhase = '' runHook preCheck diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix deleted file mode 100644 index 641ebbf9f08d..000000000000 --- a/pkgs/development/libraries/gtkspellmm/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl -, pkg-config -, gtk3, glib, glibmm, gtkmm3, gtkspell3 -}: - -stdenv.mkDerivation rec { - pname = "gtkspellmm"; - version = "3.0.5"; - - src = fetchurl { - url = "mirror://sourceforge/project/gtkspell/gtkspellmm/" + - "${pname}-${version}.tar.xz"; - sha256 = "0i8mxwyfv5mskachafa4qlh315q0cfph7s66s1s34nffadbmm1sv"; - }; - - propagatedBuildInputs = [ - gtkspell3 - ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - gtk3 glib glibmm gtkmm3 - ]; - - meta = with lib; { - description = "C++ binding for the gtkspell library"; - homepage = "https://gtkspell.sourceforge.net/"; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix deleted file mode 100644 index 9586c3be7b78..000000000000 --- a/pkgs/development/libraries/gts/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ fetchurl, lib, stdenv, pkg-config, autoreconfHook, gettext, glib, buildPackages }: - - -stdenv.mkDerivation rec { - pname = "gts"; - version = "0.7.6"; - - outputs = [ "bin" "dev" "out" ]; - - src = fetchurl { - url = "mirror://sourceforge/gts/${pname}-${version}.tar.gz"; - sha256 = "07mqx09jxh8cv9753y2d2jsv7wp8vjmrd7zcfpbrddz3wc9kx705"; - }; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - glib # required to satisfy AM_PATH_GLIB_2_0 - ]; - buildInputs = [ gettext ]; - propagatedBuildInputs = [ glib ]; - - doCheck = false; # fails with "permission denied" - - preBuild = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - pushd src - make CC=${buildPackages.stdenv.cc}/bin/cc predicates_init - mv predicates_init predicates_init_build - make clean - popd - - substituteInPlace src/Makefile --replace "./predicates_init" "./predicates_init_build" - ''; - - meta = { - homepage = "https://gts.sourceforge.net/"; - license = lib.licenses.lgpl2Plus; - description = "GNU Triangulated Surface Library"; - - longDescription = '' - Library intended to provide a set of useful functions to deal with - 3D surfaces meshed with interconnected triangles. - ''; - - maintainers = [ ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/gumbo/default.nix b/pkgs/development/libraries/gumbo/default.nix deleted file mode 100644 index 118646c619ae..000000000000 --- a/pkgs/development/libraries/gumbo/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, stdenv -, fetchFromGitea -, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "gumbo"; - version = "0.12.1"; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "gumbo-parser"; - repo = "gumbo-parser"; - rev = version; - hash = "sha256-d4V4bI08Prmg3U0KGu4yIwpHcvTJT3NAd4lbzdBU/AE="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - meta = with lib; { - description = "C99 HTML parsing algorithm"; - homepage = "https://codeberg.org/gumbo-parser/gumbo-parser"; - maintainers = [ maintainers.nico202 ]; - platforms = with platforms; linux ++ darwin; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix deleted file mode 100644 index 97c7ed790ac4..000000000000 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, pkg-config -, gobject-introspection -, vala -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_412 -, glib -, libxml2 -, gnome -}: - -stdenv.mkDerivation rec { - pname = "gupnp-av"; - version = "0.14.1"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "t5zgzEsMZtnFS8Ihg6EOVwmgAR0q8nICWUjvyrM6Pk8="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - vala - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_412 - ]; - - buildInputs = [ - glib - libxml2 - ]; - - NIX_CFLAGS_COMPILE = [ - "-Wno-error=deprecated-declarations" - ]; - - mesonFlags = [ - "-Dgtk_doc=true" - ]; - - doCheck = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - homepage = "http://gupnp.org/"; - description = "Collection of helpers for building AV (audio/video) applications using GUPnP"; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix deleted file mode 100644 index 44e7c5b5f47c..000000000000 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, pkg-config -, gobject-introspection -, vala -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_412 -, libxml2 -, gst_all_1 -, gnome -}: - -stdenv.mkDerivation rec { - pname = "gupnp-dlna"; - version = "0.12.0"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "PVO5b4W8VijTPjZ+yb8q2zjvKzTXrQQ0proM9K2QSOY="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - vala - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_412 - ]; - - buildInputs = [ - libxml2 - gst_all_1.gst-plugins-base - ]; - - mesonFlags = [ - "-Dgtk_doc=true" - ]; - - doCheck = true; - - postPatch = '' - chmod +x tests/test-discoverer.sh.in - patchShebangs tests/test-discoverer.sh.in - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/gupnp-dlna"; - description = "Library to ease DLNA-related bits for applications using GUPnP"; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix deleted file mode 100644 index 60a3bfe91117..000000000000 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib, stdenv -, fetchurl -, pkg-config -, meson -, ninja -, gettext -, gobject-introspection -, gtk-doc -, docbook_xsl -, docbook_xml_dtd_412 -, glib -, gupnp -, gnome -}: - -stdenv.mkDerivation rec { - pname = "gupnp-igd"; - version = "1.2.0"; - - outputs = [ "out" "dev" ] - ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-S1EgCYqhPt0ngYup7k1/6WG/VAv1DQVv9wPGFUXgK+E="; - }; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - pkg-config - meson - ninja - gettext - gobject-introspection - gtk-doc - docbook_xsl - docbook_xml_dtd_412 - ]; - - propagatedBuildInputs = [ - glib - gupnp - ]; - - mesonFlags = [ - "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" - "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" - ]; - - # Seems to get stuck sometimes. - # https://github.com/NixOS/nixpkgs/issues/119288 - #doCheck = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - freeze = true; - }; - }; - - meta = with lib; { - description = "Library to handle UPnP IGD port mapping"; - homepage = "http://www.gupnp.org/"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix index 9d90624aae6d..46714e2e25bd 100644 --- a/pkgs/development/libraries/gupnp/1.6.nix +++ b/pkgs/development/libraries/gupnp/1.6.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.6.6"; + version = "1.6.7"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-ydxQ6MeLN5LRsObFxfUsk+k0XT2uKJHjEamTpXT1oE8="; + hash = "sha256-SmHYpainJw5gzpz+lmHMT6Mm8EWmVxjS64/2iv2++AU="; }; depsBuildBuild = [ @@ -51,6 +51,11 @@ stdenv.mkDerivation rec { doCheck = true; + mesonCheckFlags = [ + # The service-proxy test takes 28s on ofborg, which is too close to the time limit. + "--timeout-multiplier" "2" + ]; + postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. moveToOutput "share/doc" "$devdoc" diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 08b2925b0ea3..5fa0df314274 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ]; # Bail out! ERROR:../tests/test-bugs.c:168:test_on_timeout: code should not be reached - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix deleted file mode 100644 index 3e75bdecaecd..000000000000 --- a/pkgs/development/libraries/gusb/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, substituteAll -, meson -, ninja -, pkg-config -, gobject-introspection -, gi-docgen -, python3 -, glib -, libusb1 -, json-glib -, vala -, hwdata -, umockdev -}: - -let - pythonEnv = python3.pythonOnBuildForHost.withPackages (ps: with ps; [ - setuptools - ]); -in -stdenv.mkDerivation rec { - pname = "gusb"; - version = "0.4.9"; - - outputs = [ "bin" "out" "dev" "devdoc" ]; - - src = fetchFromGitHub { - owner = "hughsie"; - repo = "libgusb"; - rev = "refs/tags/${version}"; - hash = "sha256-piIPNLc3deToyQaajXFvM+CKh9ni8mb0P3kb+2RoJOs="; - }; - - patches = [ - (substituteAll { - src = ./fix-python-path.patch; - python = "${pythonEnv}/bin/python3"; - }) - ]; - - strictDeps = true; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - gi-docgen - vala - ]; - - # all required in gusb.pc - propagatedBuildInputs = [ - glib - libusb1 - json-glib - ]; - - mesonFlags = [ - (lib.mesonBool "tests" doCheck) - (lib.mesonOption "usb_ids" "${hwdata}/share/hwdata/usb.ids") - ]; - - checkInputs = [ - umockdev - ]; - - doCheck = false; # tests try to access USB - - postFixup = '' - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput "share/doc" "$devdoc" - ''; - - meta = with lib; { - description = "GLib libusb wrapper"; - mainProgram = "gusbcmd"; - homepage = "https://github.com/hughsie/libgusb"; - license = licenses.lgpl21; - maintainers = [ maintainers.marcweber ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gusb/fix-python-path.patch b/pkgs/development/libraries/gusb/fix-python-path.patch deleted file mode 100644 index 5f04387a537e..000000000000 --- a/pkgs/development/libraries/gusb/fix-python-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/gusb/meson.build b/gusb/meson.build -index 8236a2b..282aa48 100644 ---- a/gusb/meson.build -+++ b/gusb/meson.build -@@ -147,7 +147,7 @@ libgusb_gir = libgusb_girtarget[0] - libgusb_typelib = libgusb_girtarget[1] - - pymod = import('python') --py_installation = pymod.find_installation() -+py_installation = pymod.find_installation('@python@') - - # Verify the map file is correct -- note we can't actually use the generated - # file for two reasons: - diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix deleted file mode 100644 index 7c5cdca3f619..000000000000 --- a/pkgs/development/libraries/gvfs/default.nix +++ /dev/null @@ -1,156 +0,0 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, pkg-config -, substituteAll -, gettext -, dbus -, glib -, udevSupport ? stdenv.isLinux -, libgudev -, udisks2 -, libgcrypt -, libcap -, polkit -, libgphoto2 -, avahi -, libarchive -, fuse3 -, libcdio -, libxml2 -, libsoup_3 -, libxslt -, docbook_xsl -, docbook_xml_dtd_42 -, samba -, libmtp -, gnomeSupport ? false -, gnome -, gcr_4 -, glib-networking -, gnome-online-accounts -, wrapGAppsHook3 -, libimobiledevice -, libbluray -, libcdio-paranoia -, libnfs -, openssh -, libsecret -, libgdata -, libmsgraph -, python3 -, gsettings-desktop-schemas -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gvfs"; - version = "1.54.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz"; - hash = "sha256-VJCPThC18cIx6QMwyMFbfyHyu2EPGUwDSzOON5xQjjw="; - }; - - patches = [ - (substituteAll { - src = ./hardcode-ssh-path.patch; - ssh_program = "${lib.getBin openssh}/bin/ssh"; - }) - ]; - - postPatch = '' - patchShebangs test - ''; - - nativeBuildInputs = [ - meson - ninja - python3 - pkg-config - gettext - wrapGAppsHook3 - libxslt - docbook_xsl - docbook_xml_dtd_42 - ]; - - buildInputs = [ - glib - libgcrypt - dbus - libgphoto2 - avahi - libarchive - libimobiledevice - libbluray - libnfs - libxml2 - gsettings-desktop-schemas - libsoup_3 - ] ++ lib.optionals udevSupport [ - libgudev - udisks2 - fuse3 - libcdio - samba - libmtp - libcap - polkit - libcdio-paranoia - ] ++ lib.optionals gnomeSupport [ - gcr_4 - glib-networking # TLS support - gnome-online-accounts - libsecret - libgdata - libmsgraph - ]; - - mesonFlags = [ - "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" - "-Dtmpfilesdir=no" - ] ++ lib.optionals (!udevSupport) [ - "-Dgudev=false" - "-Dudisks2=false" - "-Dfuse=false" - "-Dcdda=false" - "-Dsmb=false" - "-Dmtp=false" - "-Dadmin=false" - "-Dgphoto2=false" - "-Dlibusb=false" - "-Dlogind=false" - ] ++ lib.optionals (!gnomeSupport) [ - "-Dgcr=false" - "-Dgoa=false" - "-Dkeyring=false" - "-Dgoogle=false" - "-Donedrive=false" - ] ++ lib.optionals (avahi == null) [ - "-Ddnssd=false" - ] ++ lib.optionals (samba == null) [ - # Xfce don't want samba - "-Dsmb=false" - ]; - - doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'" - doInstallCheck = finalAttrs.finalPackage.doCheck; - - separateDebugInfo = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = "gvfs"; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)"; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - maintainers = teams.gnome.members; - }; -}) diff --git a/pkgs/development/libraries/gvfs/hardcode-ssh-path.patch b/pkgs/development/libraries/gvfs/hardcode-ssh-path.patch deleted file mode 100644 index aaf8e291aa8b..000000000000 --- a/pkgs/development/libraries/gvfs/hardcode-ssh-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/daemon/meson.build b/daemon/meson.build -index 72a16890..718944e1 100644 ---- a/daemon/meson.build -+++ b/daemon/meson.build -@@ -256,7 +256,7 @@ if enable_sftp - '-DDEFAULT_BACKEND_TYPE=sftp', - '-DBACKEND_TYPES="sftp", G_VFS_TYPE_BACKEND_SFTP,', - '-DMAX_JOB_THREADS=1', -- '-DSSH_PROGRAM="ssh"', -+ '-DSSH_PROGRAM="@ssh_program@"', - ] - - programs += {'gvfsd-sftp': {'sources': sources, 'dependencies': deps, 'c_args': cflags}} diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/development/libraries/gvm-libs/default.nix deleted file mode 100644 index c3e5e278b590..000000000000 --- a/pkgs/development/libraries/gvm-libs/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - lib, - stdenv, - cmake, - doxygen, - fetchFromGitHub, - glib, - glib-networking, - gnutls, - gpgme, - hiredis, - libgcrypt, - libnet, - libpcap, - libssh, - libuuid, - libxcrypt, - libxml2, - openldap, - paho-mqtt-c, - pkg-config, - radcli, - zlib, -}: - -stdenv.mkDerivation rec { - pname = "gvm-libs"; - version = "22.11.0"; - - src = fetchFromGitHub { - owner = "greenbone"; - repo = "gvm-libs"; - rev = "refs/tags/v${version}"; - hash = "sha256-VYFAy6VVASNOBLs39qukePYr5pV0IR1qjztv+veNCVc="; - }; - - postPatch = '' - substituteInPlace CMakeLists.txt --replace-fail "-Werror" "" - ''; - - nativeBuildInputs = [ - cmake - doxygen - pkg-config - ]; - - buildInputs = [ - glib - glib-networking - gnutls - gpgme - hiredis - libgcrypt - libnet - libpcap - libssh - libuuid - libxcrypt - libxml2 - openldap - paho-mqtt-c - radcli - zlib - ]; - - cmakeFlags = [ "-DGVM_RUN_DIR=${placeholder "out"}/run/gvm" ]; - - # causes redefinition of _FORTIFY_SOURCE - hardeningDisable = [ "fortify3" ]; - - meta = with lib; { - description = "Libraries module for the Greenbone Vulnerability Management Solution"; - homepage = "https://github.com/greenbone/gvm-libs"; - changelog = "https://github.com/greenbone/gvm-libs/releases/tag/v${version}"; - license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ fab ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/half/default.nix b/pkgs/development/libraries/half/default.nix deleted file mode 100644 index 557ed1ffe90e..000000000000 --- a/pkgs/development/libraries/half/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchzip }: - -stdenv.mkDerivation rec { - version = "2.2.0"; - pname = "half"; - - src = fetchzip { - url = "mirror://sourceforge/half/${version}/half-${version}.zip"; - sha256 = "sha256-ZdGgBMZylFgkvs/XVBnvgBY2EYSHRLY3S4YwXjshpOY="; - stripRoot = false; - }; - - buildCommand = '' - mkdir -p $out/include $out/share/doc - cp $src/include/half.hpp $out/include/ - cp $src/{ChangeLog,LICENSE,README}.txt $out/share/doc/ - ''; - - meta = with lib; { - description = "C++ library for half precision floating point arithmetics"; - platforms = platforms.all; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 12297a5da669..124c507f5a63 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -33,16 +33,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; - version = "9.0.0"; + version = "10.1.0"; src = fetchurl { url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz"; - hash = "sha256-pBsnLO65IMVyY+yFFgRULZ7IXuMDBQbZRmIGfHtquJ4="; + hash = "sha256-bONSDy0ImjPO8PxIMhM0uOC3IUH2p2Nxmqrs0neey4I="; }; postPatch = '' patchShebangs src/*.py test - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # ApplicationServices.framework headers have cast-align warnings. substituteInPlace src/hb.hh \ --replace '#pragma GCC diagnostic error "-Wcast-align"' "" @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = lib.optionalString withIcu '' rm "$out"/lib/libharfbuzz.* "$dev/lib/pkgconfig/harfbuzz.pc" ln -s {'${harfbuzz.dev}',"$dev"}/lib/pkgconfig/harfbuzz.pc - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s {'${harfbuzz.out}',"$out"}/lib/libharfbuzz.dylib ln -s {'${harfbuzz.out}',"$out"}/lib/libharfbuzz.0.dylib ''} diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix deleted file mode 100644 index 6d60d62fcce7..000000000000 --- a/pkgs/development/libraries/hawknl/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{lib, stdenv, fetchurl, unzip}: - -stdenv.mkDerivation rec { - pname = "hawknl"; - version = "1.68"; - - src = fetchurl { - url = "http://urchlay.naptime.net/~urchlay/src/HawkNL${lib.replaceStrings ["."] [""] version}src.zip"; - sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028"; - }; - - nativeBuildInputs = [ unzip ]; - - makefile = "makefile.linux"; - - patchPhase = '' - sed -i s/soname,NL/soname,libNL/ src/makefile.linux - ''; - - preInstall = '' - sed -i s,/usr/local,$out, src/makefile.linux - mkdir -p $out/lib $out/include - ''; - - meta = { - homepage = "http://hawksoft.com/hawknl/"; - description = "Free, open source, game oriented network API"; - license = lib.licenses.lgpl2Plus; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/hdf5-blosc/blosc_filter.pc.in b/pkgs/development/libraries/hdf5-blosc/blosc_filter.pc.in deleted file mode 100644 index 04e29515d9b1..000000000000 --- a/pkgs/development/libraries/hdf5-blosc/blosc_filter.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@out@ -includedir=${prefix}/include -libdir=${prefix}/lib - -Name: blosc_filter -Description: Blosc Filter -URL: http://blosc.org/ -Version: @version@ -Requires: \ - blosc \ - hdf5 -Cflags: -isystem${includedir} -Libs: -L${libdir} -Wl,-rpath,${libdir} -lblosc_filter diff --git a/pkgs/development/libraries/hdf5-blosc/default.nix b/pkgs/development/libraries/hdf5-blosc/default.nix deleted file mode 100644 index 985660ff9073..000000000000 --- a/pkgs/development/libraries/hdf5-blosc/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, c-blosc, cmake, hdf5, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "hdf5-blosc"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "Blosc"; - repo = pname; - rev = "v${version}"; - sha256 = "1nj2bm1v6ymm3fmyvhbn6ih5fgdiapavlfghh1pvbmhw71cysyqs"; - }; - - patches = [ ./no-external-blosc.patch ]; - - outputs = [ "out" "dev" "plugin" ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ c-blosc hdf5 ]; - - preConfigure = '' - substituteInPlace CMakeLists.txt --replace 'set(BLOSC_INSTALL_DIR "''${CMAKE_CURRENT_BINARY_DIR}/blosc")' 'set(BLOSC_INSTALL_DIR "${c-blosc}")' - ''; - - cmakeFlags = [ - "-DPLUGIN_INSTALL_PATH=${placeholder "plugin"}/hdf5/lib/plugin" - ]; - - postInstall = '' - mkdir -p $out/lib/pkgconfig - substituteAll ${./blosc_filter.pc.in} $out/lib/pkgconfig/blosc_filter.pc - ''; - - meta = with lib; { - description = "Filter for HDF5 that uses the Blosc compressor"; - homepage = "https://github.com/Blosc/hdf5-blosc"; - license = licenses.mit; - maintainers = with maintainers; [ bhipple ]; - }; -} diff --git a/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch b/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch deleted file mode 100644 index 8f2bd8579ed8..000000000000 --- a/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/CMakeLists.txt 2019-10-11 12:12:27.445417039 -0400 -+++ b/CMakeLists.txt 2019-10-11 12:27:26.630691742 -0400 -@@ -22,14 +22,6 @@ - message("BLOSC_CMAKE_ARGS='${BLOSC_CMAKE_ARGS}'") - message("GIT_EXECUTABLE='${GIT_EXECUTABLE}'") - --ExternalProject_Add(project_blosc -- PREFIX ${BLOSC_PREFIX} -- GIT_REPOSITORY https://github.com/Blosc/c-blosc.git -- INSTALL_DIR ${BLOSC_INSTALL_DIR} -- CMAKE_ARGS ${BLOSC_CMAKE_ARGS} --) -- -- - # sources - set(SOURCES src/blosc_filter.c) - set(PLUGIN_SOURCES src/blosc_filter.c src/blosc_plugin.c ) -@@ -53,7 +45,6 @@ - # add blosc libraries - add_library(blosc_shared SHARED IMPORTED) - set_property(TARGET blosc_shared PROPERTY IMPORTED_LOCATION ${BLOSC_INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}blosc${CMAKE_SHARED_LIBRARY_SUFFIX}) --add_dependencies(blosc_shared project_blosc) - include_directories(${BLOSC_INSTALL_DIR}/include) - - add_library(blosc_filter_shared SHARED ${SOURCES}) - diff --git a/pkgs/development/libraries/hfst-ospell/default.nix b/pkgs/development/libraries/hfst-ospell/default.nix deleted file mode 100644 index 823bcbbe8c08..000000000000 --- a/pkgs/development/libraries/hfst-ospell/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, autoreconfHook -, fetchFromGitHub -, fetchpatch -, icu -, libarchive -, pkg-config -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "hfst-ospell"; - version = "0.5.3"; - - src = fetchFromGitHub { - owner = "hfst"; - repo = "hfst-ospell"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-16H1nbAIe+G71+TnlLG0WnH9LktZwmc0d0O+oYduH1k="; - }; - - patches = [ - # Pull upstream fix for gcc-13 - (fetchpatch { - name = "cstdint.patch"; - url = "https://github.com/hfst/hfst-ospell/commit/7481bffbf622bc9aee3547183fbe8db9cf8b22ce.patch"; - hash = "sha256-q/B5mLx8Oc0nIRe3n3gl0OTyjIaEMCBsPc1GvpE226c="; - }) - ]; - - buildInputs = [ - icu - libarchive - ]; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - # libxmlxx is listed as a dependency but Darwin build fails with it, - # might also be better in general since libxmlxx in Nixpkgs is 8 years old - # https://github.com/hfst/hfst-ospell/issues/48#issuecomment-546535653 - configureFlags = [ - "--without-libxmlpp" - "--without-tinyxml2" - ]; - - meta = with lib; { - homepage = "https://github.com/hfst/hfst-ospell/"; - 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/hfst/default.nix b/pkgs/development/libraries/hfst/default.nix deleted file mode 100644 index 41707bbd4986..000000000000 --- a/pkgs/development/libraries/hfst/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, autoreconfHook -, bison -, flex -, foma -, fetchFromGitHub -, gettext -, icu -, stdenv -, swig -, pkg-config -, zlib -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "hfst"; - version = "3.16.0"; - - src = fetchFromGitHub { - owner = "hfst"; - repo = "hfst"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-2ST0s08Pcp+hTn7rUTgPE1QkH6PPWtiuFezXV3QW0kU="; - }; - - nativeBuildInputs = [ - autoreconfHook - bison - flex - pkg-config - swig - ]; - - buildInputs = [ - foma - gettext - icu - zlib - ]; - - configureFlags = [ - "--enable-all-tools" - "--with-foma-upstream=true" - ]; - - meta = with lib; { - description = "FST language processing library"; - homepage = "https://github.com/hfst/hfst"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ lurkki ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index 05b915efb8f9..6e537e8b74fb 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ libusb1 udev ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libusb1 udev ]; enableParallelBuilding = true; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Cocoa IOKit ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa IOKit ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -37,9 +37,9 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ prusnak ]; # You can choose between GPLv3, BSD or HIDAPI license (even more liberal) license = with licenses; [ bsd3 /* or */ gpl3Only ] ; - pkgConfigModules = lib.optionals stdenv.isDarwin [ + pkgConfigModules = lib.optionals stdenv.hostPlatform.isDarwin [ "hidapi" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "hidapi-hidraw" "hidapi-libusb" ]; diff --git a/pkgs/development/libraries/highfive/default.nix b/pkgs/development/libraries/highfive/default.nix deleted file mode 100644 index 5ee46c698fe9..000000000000 --- a/pkgs/development/libraries/highfive/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, boost -, eigen -, hdf5 -, mpiSupport ? hdf5.mpiSupport -, mpi ? hdf5.mpi -}: - -assert mpiSupport -> mpi != null; - -stdenv.mkDerivation rec { - pname = "highfive${lib.optionalString mpiSupport "-mpi"}"; - version = "2.10.0"; - - src = fetchFromGitHub { - owner = "BlueBrain"; - repo = "HighFive"; - rev = "v${version}"; - sha256 = "sha256-0ACT899G+CCc08UFsSC8SnUEZR2mrpQbqXW9FklRAjU="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ boost eigen hdf5 ]; - - passthru = { - inherit mpiSupport mpi; - }; - - cmakeFlags = [ - "-DHIGHFIVE_USE_BOOST=ON" - "-DHIGHFIVE_USE_EIGEN=ON" - "-DHIGHFIVE_EXAMPLES=OFF" - "-DHIGHFIVE_UNIT_TESTS=OFF" - "-DHIGHFIVE_USE_INSTALL_DEPS=ON" - ] - ++ (lib.optionals mpiSupport [ "-DHIGHFIVE_PARALLEL_HDF5=ON" ]); - - meta = with lib; { - description = "Header-only C++ HDF5 interface"; - license = licenses.boost; - homepage = "https://bluebrain.github.io/HighFive/"; - platforms = platforms.unix; - maintainers = with maintainers; [ robertodr ]; - }; -} diff --git a/pkgs/development/libraries/hiredis-vip/default.nix b/pkgs/development/libraries/hiredis-vip/default.nix deleted file mode 100644 index 32fd7d0db751..000000000000 --- a/pkgs/development/libraries/hiredis-vip/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "hiredis-vip"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "vipshop"; - repo = "hiredis-vip"; - rev = version; - sha256 = "1z9zry635pxqv6d2cgk3dghb5qfpg9m7dz34ld4djw9b53hjr2z2"; - }; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = { - description = "C client library for the Redis database"; - homepage = "https://github.com/vipshop/hiredis-vip"; - license = lib.licenses.bsd3; - }; - -} diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix deleted file mode 100644 index 68c2dc209514..000000000000 --- a/pkgs/development/libraries/hiredis/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, openssl }: - -stdenv.mkDerivation rec { - pname = "hiredis"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "redis"; - repo = "hiredis"; - rev = "v${version}"; - sha256 = "sha256-ZxUITm3OcbERcvaNqGQU46bEfV+jN6safPalG0TVfBg="; - }; - - buildInputs = [ - openssl - ]; - - PREFIX = "\${out}"; - USE_SSL = 1; - - meta = with lib; { - homepage = "https://github.com/redis/hiredis"; - description = "Minimalistic C client for Redis >= 1.2"; - license = licenses.bsd3; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index d8e320a44c19..d31e57b6c228 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "hivex"; - version = "1.3.23"; + version = "1.3.24"; src = fetchurl { url = "https://libguestfs.org/download/hivex/${pname}-${version}.tar.gz"; - hash = "sha256-QM9UhPFclGciWfs7makL7285DmPzelKhwGgIogFqa70="; + hash = "sha256-pS+kXOzJp4rbLShgXWgmHk8f1FFKd4pUcwE9LMyKGTw="; }; patches = [ ./hivex-syms.patch ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libxml2 ] ++ (with perlPackages; [ perl IOStringy ]) - ++ lib.optionals stdenv.isDarwin [ libintl ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/hmat-oss/default.nix b/pkgs/development/libraries/hmat-oss/default.nix deleted file mode 100644 index 0981ff2f8214..000000000000 --- a/pkgs/development/libraries/hmat-oss/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, blas -, lapack -}: - - -stdenv.mkDerivation rec { - pname = "hmat-oss"; - version = "1.10.0"; - - src = fetchFromGitHub { - owner = "jeromerobert"; - repo = "hmat-oss"; - rev = "refs/tags/${version}"; - sha256 = "sha256-GnFlvZCEzSCcBVLjFWLe+AKXVA6UMs/gycrOJ2TBqrE="; - }; - - cmakeFlags = [ - "-DHMAT_GIT_VERSION=OFF" - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ blas lapack ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Hierarchical matrix C/C++ library"; - homepage = "https://github.com/jeromerobert/hmat-oss"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ gdinh ]; - }; -} diff --git a/pkgs/development/libraries/hnswlib/default.nix b/pkgs/development/libraries/hnswlib/default.nix deleted file mode 100644 index 59cd69f9629e..000000000000 --- a/pkgs/development/libraries/hnswlib/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, python3 -}: -let - python = python3.withPackages(ps: with ps; [ - numpy - ]); -in - -stdenv.mkDerivation (finalAttrs: { - pname = "hnswlib"; - version = "0.8.0"; - - src = fetchFromGitHub { - owner = "nmslib"; - repo = "hnswlib"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-1KkAX42j/I06KO4wCnDsDifN1JiENqYKR5NNHBjyuVA="; - }; - - # this is a header-only library, so we don't need to build it - # we need `cmake` only to run tests - nativeCheckInputs = [ - cmake - python - ]; - - # we only want to run buildPhase when we run tests - dontBuild = !finalAttrs.finalPackage.doCheck; - - installPhase = '' - runHook preInstall - - install -Dm644 $src/hnswlib/*.h -t $out/include/hnswlib - - runHook postInstall - ''; - - doCheck = true; - - preCheck = '' - pushd ../tests/cpp - ${python.interpreter} update_gen_data.py - popd - ''; - - checkPhase = '' - runHook preCheck - - ./test_updates - - runHook postCheck - ''; - - meta = with lib; { - description = "Header-only C++/python library for fast approximate nearest neighbors"; - homepage = "https://github.com/nmslib/hnswlib"; - changelog = "https://github.com/nmslib/hnswlib/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ natsukium ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/hotpatch/default.nix b/pkgs/development/libraries/hotpatch/default.nix deleted file mode 100644 index 7dcf09c5c5b2..000000000000 --- a/pkgs/development/libraries/hotpatch/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "hotpatch"; - version = "0.2"; - - src = fetchFromGitHub { - owner = "vikasnkumar"; - repo = "hotpatch"; - rev = "4b65e3f275739ea5aa798d4ad083c4cb10e29149"; - sha256 = "169vdh55wsbn6fl58lpzqx64v6ifzh7krykav33x1d9hsk98qjqh"; - }; - - doCheck = true; - - nativeBuildInputs = [ cmake ]; - - preConfigure = '' - substituteInPlace test/loader.c \ - --replace \"/lib64/ld-linux-x86-64.so.2 \""$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --replace \"/lib/ld-linux-x86-64.so.2 \""$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --replace \"/lib/ld-linux.so.2 \""$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --replace \"/lib32/ld-linux.so.2 \""$(cat $NIX_CC/nix-support/dynamic-linker)" - ''; - - checkPhase = '' - LD_LIBRARY_PATH=$(pwd)/src make test - ''; - - patches = [ ./no-loader-test.patch ]; - - meta = with lib; { - description = "Hot patching executables on Linux using .so file injection"; - mainProgram = "hotpatcher"; - homepage = src.meta.homepage; - license = licenses.bsd3; - maintainers = [ ]; - platforms = ["i686-linux" "x86_64-linux"]; - }; -} diff --git a/pkgs/development/libraries/hotpatch/no-loader-test.patch b/pkgs/development/libraries/hotpatch/no-loader-test.patch deleted file mode 100644 index 5bc975bb848a..000000000000 --- a/pkgs/development/libraries/hotpatch/no-loader-test.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/test/loader.c b/test/loader.c -index 4e3dfdc..7f98d94 100644 ---- a/test/loader.c -+++ b/test/loader.c -@@ -54,20 +54,6 @@ int main(int argc, char **argv) - assert(ret < 0); - ret = ld_find_library(maps, mapnum, "libc", false, NULL, 6); - assert(ret >= 0); --#if __WORDSIZE == 64 -- ret = ld_find_library(maps, mapnum, "/lib64/ld-linux-x86-64.so.2", -- true, NULL, 6); -- assert(ret >= 0); -- ret = ld_find_library(maps, mapnum, "/lib/ld-linux-x86-64.so.2", -- false, NULL, 6); --#else -- ret = ld_find_library(maps, mapnum, "/lib/ld-linux.so.2", -- true, NULL, 6); -- assert(ret >= 0); -- ret = ld_find_library(maps, mapnum, "/lib32/ld-linux.so.2", -- false, NULL, 6); --#endif -- assert(ret < 0); - ld_free_maps(maps, mapnum); - return 0; - } diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix deleted file mode 100644 index 953dd472210a..000000000000 --- a/pkgs/development/libraries/howard-hinnant-date/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, tzdata, fetchpatch, substituteAll }: - -stdenv.mkDerivation rec { - pname = "howard-hinnant-date"; - version = "3.0.1"; - - src = fetchFromGitHub { - owner = "HowardHinnant"; - repo = "date"; - rev = "v${version}"; - sha256 = "1qk7pgnk0bpinja28104qha6f7r1xwh5dy3gra7vjkqwl0jdwa35"; - }; - - patches = [ - # Add pkg-config file - # https://github.com/HowardHinnant/date/pull/538 - (fetchpatch { - name = "output-date-pc-for-pkg-config.patch"; - url = "https://git.alpinelinux.org/aports/plain/community/date/538-output-date-pc-for-pkg-config.patch?id=11f6b4d4206b0648182e7b41cd57dcc9ccea0728"; - sha256 = "1ma0586jsd89jgwbmd2qlvlc8pshs1pc4zk5drgxi3qvp8ai1154"; - }) - # Fix CMake include directory path. - # https://github.com/HowardHinnant/date/pull/753 - (fetchpatch { - name = "fix-cmake-include-dir.patch"; - url = "https://github.com/HowardHinnant/date/commit/8061b53c489b0c8676feedcb65049b27664327b5.patch"; - hash = "sha256-weZUgu0SDad7EK7msUbVzk1zY4euI0Biafj/5jD4JV4="; - }) - # Without this patch, this library will drop a `tzdata` directory into - # `~/Downloads` if it cannot find `/usr/share/zoneinfo`. Make the path it - # searches for `zoneinfo` be the one from the `tzdata` package. - (substituteAll { - src = ./make-zoneinfo-available.diff; - inherit tzdata; - }) - # The reported version to cmake's find_package() is 3.0.0, but the actual - # version is 3.0.1. This patch fixes that. - (fetchpatch { - name = "fix-cmake-version.patch"; - url = "https://github.com/HowardHinnant/date/commit/2e19c006e2218447ee31f864191859517603f59f.patch"; - hash = "sha256-SRAWrwv64ap3Qh3RlhwqgS0L2YsrjqVSgw6iH3KlWvk="; - }) - ]; - - # Tweaks to fix undefined variable substitutions - # https://github.com/HowardHinnant/date/pull/538#pullrequestreview-1373268697 - postPatch = '' - substituteInPlace date.pc.in \ - --replace '@CMAKE_INSTALL_LIB@' '@CMAKE_INSTALL_FULL_LIBDIR@' \ - --replace '@CMAKE_INSTALL_INCLUDE@' '@CMAKE_INSTALL_FULL_INCLUDEDIR@' \ - --replace '@PACKAGE_VERSION@' '${version}' - ''; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DBUILD_TZ_LIB=true" - "-DBUILD_SHARED_LIBS=true" - "-DUSE_SYSTEM_TZ_DB=true" - ]; - - outputs = [ "out" "dev" ]; - - meta = with lib; { - license = licenses.mit; - description = "Date and time library based on the C++11/14/17 <chrono> header"; - homepage = "https://github.com/HowardHinnant/date"; - platforms = platforms.unix; - maintainers = with maintainers; [ r-burns ]; - }; -} diff --git a/pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff b/pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff deleted file mode 100644 index f9e69ff38cbb..000000000000 --- a/pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/tz.cpp b/src/tz.cpp -index 68436c3..2bfe19e 100644 ---- a/src/tz.cpp -+++ b/src/tz.cpp -@@ -349,7 +349,7 @@ discover_tz_dir() - struct stat sb; - using namespace std; - # ifndef __APPLE__ -- CONSTDATA auto tz_dir_default = "/usr/share/zoneinfo"; -+ CONSTDATA auto tz_dir_default = "@tzdata@/share/zoneinfo"; - CONSTDATA auto tz_dir_buildroot = "/usr/share/zoneinfo/uclibc"; - - // Check special path which is valid for buildroot with uclibc builds diff --git a/pkgs/development/libraries/htmlcxx/c++17.patch b/pkgs/development/libraries/htmlcxx/c++17.patch deleted file mode 100644 index 53fa9fbfc8c1..000000000000 --- a/pkgs/development/libraries/htmlcxx/c++17.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --color -Naur a/html/CharsetConverter.cc b/html/CharsetConverter.cc ---- a/html/CharsetConverter.cc 2018-12-29 03:13:56.000000000 +0000 -+++ b/html/CharsetConverter.cc 2021-05-31 23:03:10.705334580 +0100 -@@ -7,7 +7,7 @@ - using namespace std; - using namespace htmlcxx; - --CharsetConverter::CharsetConverter(const string &from, const string &to) throw (Exception) -+CharsetConverter::CharsetConverter(const string &from, const string &to) - { - mIconvDescriptor = iconv_open(to.c_str(), from.c_str()); - if (mIconvDescriptor == (iconv_t)(-1)) -diff --color -Naur a/html/CharsetConverter.h b/html/CharsetConverter.h ---- a/html/CharsetConverter.h 2018-12-29 03:13:56.000000000 +0000 -+++ b/html/CharsetConverter.h 2021-05-31 23:03:19.042574598 +0100 -@@ -17,7 +17,7 @@ - : std::runtime_error(arg) {} - }; - -- CharsetConverter(const std::string &from, const std::string &to) throw (Exception); -+ CharsetConverter(const std::string &from, const std::string &to); - ~CharsetConverter(); - - std::string convert(const std::string &input); diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix deleted file mode 100644 index 4b01162bf25b..000000000000 --- a/pkgs/development/libraries/htmlcxx/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, libiconv }: - -stdenv.mkDerivation rec { - pname = "htmlcxx"; - version = "0.87"; - - src = fetchurl { - url = "mirror://sourceforge/htmlcxx/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-XTj5OM9N+aKYpTRq8nGV//q/759GD8KgIjPLz6j8dcg="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libiconv ]; - patches = [ - ./ptrdiff.patch - ./c++17.patch - ]; - - meta = with lib; { - homepage = "https://htmlcxx.sourceforge.net/"; - description = "Simple non-validating css1 and html parser for C++"; - mainProgram = "htmlcxx"; - license = licenses.lgpl2; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/htmlcxx/ptrdiff.patch b/pkgs/development/libraries/htmlcxx/ptrdiff.patch deleted file mode 100644 index 6348ba24f8da..000000000000 --- a/pkgs/development/libraries/htmlcxx/ptrdiff.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -rc htmlcxx-orig-0.85/html/tree.h htmlcxx-0.85/html/tree.h -*** htmlcxx-orig-0.85/html/tree.h 2015-09-02 13:57:17.988688798 +0200 ---- htmlcxx-0.85/html/tree.h 2015-09-02 13:57:52.737768811 +0200 -*************** -*** 45,50 **** ---- 45,51 ---- - #ifndef tree_hh_ - #define tree_hh_ - -+ #include <cstddef> - #include <cassert> - #include <memory> - #include <stdexcept> diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix deleted file mode 100644 index 6ba2b8fc1ace..000000000000 --- a/pkgs/development/libraries/http-parser/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, enableShared ? !stdenv.hostPlatform.isStatic -, enableStatic ? stdenv.hostPlatform.isStatic -}: - -stdenv.mkDerivation rec { - pname = "http-parser"; - version = "2.9.4"; - - src = fetchFromGitHub { - owner = "nodejs"; - repo = "http-parser"; - rev = "v${version}"; - sha256 = "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c"; - }; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - patches = [ - ./enable-static-shared.patch - ] ++ lib.optionals stdenv.isAarch32 [ - # https://github.com/nodejs/http-parser/pull/510 - (fetchpatch { - url = "https://github.com/nodejs/http-parser/commit/4f15b7d510dc7c6361a26a7c6d2f7c3a17f8d878.patch"; - sha256 = "sha256-rZZMJeow3V1fTnjadRaRa+xTq3pdhZn/eJ4xjxEDoU4="; - }) - ]; - - makeFlags = [ - "DESTDIR=" - "PREFIX=$(out)" - "BINEXT=${stdenv.hostPlatform.extensions.executable}" - "Platform=${lib.toLower stdenv.hostPlatform.uname.system}" - "AEXT=${lib.strings.removePrefix "." stdenv.hostPlatform.extensions.staticLibrary}" - "ENABLE_SHARED=${if enableShared then "1" else "0"}" - "ENABLE_STATIC=${if enableStatic then "1" else "0"}" - ] ++ lib.optionals enableShared [ - "SOEXT=${lib.strings.removePrefix "." stdenv.hostPlatform.extensions.sharedLibrary}" - ] ++ lib.optionals enableStatic [ - "AEXT=${lib.strings.removePrefix "." stdenv.hostPlatform.extensions.staticLibrary}" - ] ++ lib.optionals (enableShared && stdenv.hostPlatform.isWindows) [ - "SONAME=$(SOLIBNAME).$(SOMAJOR).$(SOMINOR).$(SOEXT)" - "LIBNAME=$(SOLIBNAME).$(SOMAJOR).$(SOMINOR).$(SOREV).$(SOEXT)" - "LDFLAGS=-Wl,--out-implib=$(LIBNAME).a" - ]; - - buildFlags = lib.optional enableShared "library" - ++ lib.optional enableStatic "package"; - - doCheck = true; - checkTarget = "test"; - - enableParallelBuilding = true; - - postInstall = lib.optionalString stdenv.hostPlatform.isWindows '' - install -D *.dll.a $out/lib - ln -sf libhttp_parser.${version}.dll.a $out/lib/libhttp_parser.dll.a - ''; - - meta = with lib; { - description = "HTTP message parser written in C"; - homepage = "https://github.com/nodejs/http-parser"; - maintainers = with maintainers; [ matthewbauer ]; - license = licenses.mit; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/http-parser/enable-static-shared.patch b/pkgs/development/libraries/http-parser/enable-static-shared.patch deleted file mode 100644 index 42f11d4c817f..000000000000 --- a/pkgs/development/libraries/http-parser/enable-static-shared.patch +++ /dev/null @@ -1,93 +0,0 @@ -commit abcb3cca9452779e91380b7636f32745166af3de -Author: John Ericson <John.Ericson@Obsidian.Systems> -Date: Wed Nov 29 23:55:38 2023 -0500 - - Make build system: enable/disable shared/static support - - This allows building this package in static-lib-only distros. - -diff --git a/Makefile b/Makefile -index 5d21221..cbc7914 100644 ---- a/Makefile -+++ b/Makefile -@@ -18,6 +18,9 @@ - # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - # IN THE SOFTWARE. - -+ENABLE_SHARED ?= 1 -+ENABLE_STATIC ?= -+ - PLATFORM ?= $(shell sh -c 'uname -s | tr "[A-Z]" "[a-z]"') - HELPER ?= - BINEXT ?= -@@ -25,6 +28,8 @@ SOLIBNAME = libhttp_parser - SOMAJOR = 2 - SOMINOR = 9 - SOREV = 4 -+AEXT = a -+STATICLIBNAME = $(SOLIBNAME).$(AEXT) - ifeq (darwin,$(PLATFORM)) - SOEXT ?= dylib - SONAME ?= $(SOLIBNAME).$(SOMAJOR).$(SOMINOR).$(SOEXT) -@@ -109,11 +114,17 @@ test-valgrind: test_g - libhttp_parser.o: http_parser.c http_parser.h Makefile - $(CC) $(CPPFLAGS_FAST) $(CFLAGS_LIB) -c http_parser.c -o libhttp_parser.o - --library: libhttp_parser.o -- $(CC) $(LDFLAGS_LIB) -o $(LIBNAME) $< -+.PHONY: library -+library: $(LIBNAME) -+ -+$(LIBNAME): libhttp_parser.o -+ $(CC) $(LDFLAGS_LIB) -o $@ $< - --package: http_parser.o -- $(AR) rcs libhttp_parser.a http_parser.o -+.PHONY: package -+package: $(STATICLIBNAME) -+ -+$(STATICLIBNAME): http_parser.o -+ $(AR) rcs $@ $< - - url_parser: http_parser.o contrib/url_parser.c - $(CC) $(CPPFLAGS_FAST) $(CFLAGS_FAST) $^ -o $@ -@@ -130,12 +141,30 @@ parsertrace_g: http_parser_g.o contrib/parsertrace.c - tags: http_parser.c http_parser.h test.c - ctags $^ - --install: library -+.PHONY: install-headers -+install-headers: - $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h -+ -+.PHONY: install-library -+install-library: library - $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) - ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) - ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT) - -+.PHONY: install-package -+install-package: package -+ $(INSTALL) -D $(STATICLIBNAME) $(DESTDIR)$(LIBDIR)/$(STATICLIBNAME) -+ -+.PHONY: install -+install: install-headers -+ifeq ($(ENABLE_SHARED),1) -+install: install-library -+endif -+ifeq ($(ENABLE_STATIC),1) -+install: install-package -+endif -+ -+.PHONY: install-strip - install-strip: library - $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h - $(INSTALL) -D -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) -@@ -147,6 +176,7 @@ uninstall: - rm $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT) - rm $(DESTDIR)$(LIBDIR)/$(SONAME) - rm $(DESTDIR)$(LIBDIR)/$(LIBNAME) -+ rm $(DESTDIR)$(LIBDIR)/$(STATICLIBNAME) - - clean: - rm -f *.o *.a tags test test_fast test_g \ diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix deleted file mode 100644 index eb733b4df17b..000000000000 --- a/pkgs/development/libraries/httplib/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, openssl -}: - -stdenv.mkDerivation rec { - pname = "httplib"; - version = "0.17.3"; - - src = fetchFromGitHub { - owner = "yhirose"; - repo = "cpp-httplib"; - rev = "v${version}"; - hash = "sha256-yvaPIbRqJGkiob3Nrv3H1ieFAC5b+h1tTncJWTy4dmk="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl ]; - - meta = with lib; { - description = "C++ header-only HTTP/HTTPS server and client library"; - homepage = "https://github.com/yhirose/cpp-httplib"; - changelog = "https://github.com/yhirose/cpp-httplib/releases/tag/v${version}"; - maintainers = with maintainers; [ aidalgol ]; - license = licenses.mit; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index c26f6d3aa715..c7c07998f8b7 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -980,7 +980,7 @@ rec { readmeFile = "README"; src = fetchurl { - url = "https://downloads.sourceforge.net/rospell/${fileName}"; + url = "mirror://sourceforge/rospell/${fileName}"; hash = "sha256-fxKNZOoGyeZxHDCxGMCv7vsBTY8zyS2szfRVq6LQRRk="; }; diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix deleted file mode 100644 index f2316ab657a1..000000000000 --- a/pkgs/development/libraries/hwloc/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, expat, ncurses, pciutils, numactl -, x11Support ? false -, libX11 -, cairo -, config -, enableCuda ? config.cudaSupport -, cudaPackages -}: - -stdenv.mkDerivation rec { - pname = "hwloc"; - version = "2.11.1"; - - src = fetchurl { - url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2"; - sha256 = "sha256-BM37/60iXOFfZhhPD0FBMn2r8ojRCouE0T9Rest4cMY="; - }; - - configureFlags = [ - "--localstatedir=/var" - "--enable-netloc" - ]; - - # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. - nativeBuildInputs = [ pkg-config ] - ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]; - - buildInputs = [ expat ncurses ] - ++ lib.optionals x11Support [ cairo libX11 ] - ++ lib.optionals stdenv.isLinux [ numactl ] - ++ lib.optionals enableCuda [ cudaPackages.cuda_cudart ]; - - # Since `libpci' appears in `hwloc.pc', it must be propagated. - propagatedBuildInputs = lib.optional stdenv.isLinux pciutils; - - enableParallelBuilding = true; - - postInstall = lib.optionalString stdenv.isLinux '' - if [ -d "${numactl}/lib64" ]; then - numalibdir="${numactl}/lib64" - else - numalibdir="${numactl}/lib" - test -d "$numalibdir" - fi - - sed -i "$lib/lib/libhwloc.la" \ - -e "s|-lnuma|-L$numalibdir -lnuma|g" - ''; - - # Checks disabled because they're impure (hardware dependent) and - # fail on some build machines. - doCheck = false; - - outputs = [ "out" "lib" "dev" "doc" "man" ]; - - meta = with lib; { - description = "Portable abstraction of hierarchical architectures for high-performance computing"; - longDescription = '' - hwloc provides a portable abstraction (across OS, - versions, architectures, ...) of the hierarchical topology of - modern architectures, including NUMA memory nodes, sockets, - shared caches, cores and simultaneous multithreading. It also - gathers various attributes such as cache and memory - information. It primarily aims at helping high-performance - computing applications with gathering information about the - hardware so as to exploit it accordingly and efficiently. - - hwloc may display the topology in multiple convenient - formats. It also offers a powerful programming interface to - gather information about the hardware, bind processes, and much - more. - ''; - # https://www.open-mpi.org/projects/hwloc/license.php - license = licenses.bsd3; - homepage = "https://www.open-mpi.org/projects/hwloc/"; - maintainers = with maintainers; [ fpletz markuskowa ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix deleted file mode 100644 index cb962212ffea..000000000000 --- a/pkgs/development/libraries/hyena/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, mono, gtk-sharp-2_0, monoDLLFixer }: - -stdenv.mkDerivation rec { - pname = "hyena"; - version = "0.5"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "eb7154a42b6529bb9746c39272719f3168d6363ed4bad305a916ed7d90bc8de9"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - mono gtk-sharp-2_0 - ]; - - postPatch = '' - patchShebangs build/dll-map-makefile-verifier - patchShebangs build/private-icon-theme-installer - substituteInPlace configure --replace lib/mono/2.0/ lib/mono/2.0-api/ - find -name Makefile.in | xargs -n 1 -d '\n' sed -e 's/^dnl/#/' -i - ''; - - dontStrip = true; - - inherit monoDLLFixer; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/Archive/hyena"; - description = "C# library which contains a hodge-podge of random stuff"; - longDescription = '' - Hyena is a C# library used to make awesome applications. It contains a lot of random things, - including useful data structures, a Sqlite-based db layer, cool widgets, a JSON library, - a smart job/task scheduler, a user-query/search parser, and much more. It's particularly - useful for Gtk# applications, though only the Hyena.Gui assembly requires Gtk#. - ''; - platforms = platforms.all; - maintainers = with maintainers; [ obadz ]; - license = licenses.mit; - }; -} diff --git a/pkgs/development/libraries/hyperscan/default.nix b/pkgs/development/libraries/hyperscan/default.nix deleted file mode 100644 index 0b9765dac4cf..000000000000 --- a/pkgs/development/libraries/hyperscan/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, ragel -, python3 -, util-linux -, pkg-config -, boost -, pcre -, withStatic ? false # build only shared libs by default, build static+shared if true -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "hyperscan"; - version = "5.4.2"; - - src = fetchFromGitHub { - owner = "intel"; - repo = "hyperscan"; - hash = "sha256-tzmVc6kJPzkFQLUM1MttQRLpgs0uckbV6rCxEZwk1yk="; - rev = "v${finalAttrs.version}"; - }; - - outputs = [ "out" "dev" ]; - - buildInputs = [ boost ]; - nativeBuildInputs = [ - cmake ragel python3 util-linux pkg-config - ]; - - cmakeFlags = [ - "-DBUILD_AVX512=ON" - ] - ++ lib.optional (!stdenv.isDarwin) "-DFAT_RUNTIME=ON" - ++ lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON" - ++ lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON"; - - # hyperscan CMake is completely broken for chimera builds when pcre is compiled - # the only option to make it build - building from source - # In case pcre is built from source, chimera build is turned on by default - preConfigure = lib.optional withStatic '' - mkdir -p pcre - tar xvf ${pcre.src} --strip-components 1 -C pcre - ''; - - postPatch = '' - sed -i '/examples/d' CMakeLists.txt - substituteInPlace libhs.pc.in \ - --replace "libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" "libdir=@CMAKE_INSTALL_LIBDIR@" \ - --replace "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@" - ''; - - doCheck = true; - checkPhase = '' - runHook preCheck - - bin/unit-hyperscan - ${lib.optionalString withStatic ''bin/unit-chimera''} - - runHook postCheck - ''; - - meta = with lib; { - description = "High-performance multiple regex matching library"; - longDescription = '' - Hyperscan is a high-performance multiple regex matching library. - It follows the regular expression syntax of the commonly-used - libpcre library, but is a standalone library with its own C API. - - Hyperscan uses hybrid automata techniques to allow simultaneous - matching of large numbers (up to tens of thousands) of regular - expressions and for the matching of regular expressions across - streams of data. - - Hyperscan is typically used in a DPI library stack. - ''; - - homepage = "https://www.hyperscan.io/"; - maintainers = with maintainers; [ avnik ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - license = licenses.bsd3; - }; -}) diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index ed142788c765..e5fc14bb9cc9 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -6,6 +6,10 @@ let }; in { + icu76 = make-icu { + version = "76.1"; + hash = "sha256-36y0a/5HR0EEcs4+EUS/KKEC/uqk44dbrJtMbPMPTz4="; + }; icu75 = make-icu { version = "75.1"; hash = "sha256-y5aN8+TS6H6LEcSaXQHHh70TuVRSgPxmQvgmUnYYyu8="; diff --git a/pkgs/development/libraries/icu/make-icu.nix b/pkgs/development/libraries/icu/make-icu.nix index 575f184c163f..d7fe46041607 100644 --- a/pkgs/development/libraries/icu/make-icu.nix +++ b/pkgs/development/libraries/icu/make-icu.nix @@ -8,9 +8,13 @@ let pname = "icu4c"; + release = lib.replaceStrings [ "." ] [ "-" ] version; + # To test rc versions of ICU replace the line above with the line below. + #release = lib.replaceStrings [ "." ] [ "-" ] (if lib.hasSuffix "rc" version then lib.replaceStrings [ "1" ] [ "" ] version else version); + baseAttrs = { src = fetchurl { - url = "https://github.com/unicode-org/icu/releases/download/release-${lib.replaceStrings [ "." ] [ "-" ] version}/icu4c-${lib.replaceStrings [ "." ] [ "_" ] version}-src.tgz"; + url = "https://github.com/unicode-org/icu/releases/download/release-${release}/icu4c-${lib.replaceStrings [ "." ] [ "_" ] version}-src.tgz"; inherit hash; }; @@ -31,7 +35,7 @@ let # $(includedir) is different from $(prefix)/include due to multiple outputs sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in - '' + lib.optionalString stdenv.isAarch32 '' + '' + lib.optionalString stdenv.hostPlatform.isAarch32 '' # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux ''; @@ -39,7 +43,7 @@ let dontDisableStatic = withStatic; configureFlags = [ "--disable-debug" ] - ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) "--enable-rpath" + ++ lib.optional (stdenv.hostPlatform.isFreeBSD || stdenv.hostPlatform.isDarwin) "--enable-rpath" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--with-cross-build=${nativeBuildRoot}" ++ lib.optional withStatic "--enable-static"; @@ -59,7 +63,7 @@ let }; realAttrs = baseAttrs // { - name = pname + "-" + version; + inherit pname version; outputs = [ "out" "dev" ] ++ lib.optional withStatic "static"; outputBin = "dev"; @@ -74,8 +78,8 @@ let postInstall = lib.optionalString withStatic '' mkdir -p $static/lib mv -v lib/*.a $static/lib - '' + lib.optionalString stdenv.isDarwin '' - sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${lib.versions.majorMinor version}/pkgdata.inc '' + (let replacements = [ { from = "\${prefix}/include"; to = "${placeholder "dev"}/include"; } # --cppflags-searchpath @@ -83,7 +87,7 @@ let { from = "\${pkglibdir}/pkgdata.inc"; to = "${placeholder "dev"}/lib/icu/pkgdata.inc"; } # --incpkgdatafile ]; in '' - rm $out/share/icu/${version}/install-sh $out/share/icu/${version}/mkinstalldirs # Avoid having a runtime dependency on bash + rm $out/share/icu/${lib.versions.majorMinor version}/install-sh $out/share/icu/${lib.versions.majorMinor version}/mkinstalldirs # Avoid having a runtime dependency on bash substituteInPlace "$dev/bin/icu-config" \ ${lib.concatMapStringsSep " " (r: "--replace '${r.from}' '${r.to}'") replacements} @@ -93,7 +97,8 @@ let }; buildRootOnlyAttrs = baseAttrs // { - name = pname + "-build-root-" + version; + pname = pname + "-build-root"; + inherit version; preConfigure = baseAttrs.preConfigure + '' mkdir build diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix deleted file mode 100644 index e95f5e3cab2d..000000000000 --- a/pkgs/development/libraries/id3lib/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, libiconv, zlib }: - -stdenv.mkDerivation rec { - pname = "id3lib"; - version = "3.8.3"; - - patches = [ - ./id3lib-3.8.3-gcc43-1.patch - ./patch_id3lib_3.8.3_UTF16_writing_bug.diff - ]; - - buildInputs = [ libiconv zlib ]; - - src = fetchurl { - url = "mirror://sourceforge/id3lib/${pname}-${version}.tar.gz"; - sha256 = "0yfhqwk0w8q2hyv1jib1008jvzmwlpsxvc8qjllhna6p1hycqj97"; - }; - - doCheck = false; # fails to compile - - meta = with lib; { - description = "Library for reading, writing, and manipulating ID3v1 and ID3v2 tags"; - homepage = "https://id3lib.sourceforge.net"; - platforms = platforms.unix; - license = licenses.lgpl2; - }; -} diff --git a/pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch b/pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch deleted file mode 100644 index 2b7457d54c79..000000000000 --- a/pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch +++ /dev/null @@ -1,104 +0,0 @@ -http://www.linuxfromscratch.org/patches/downloads/id3lib/id3lib-3.8.3-gcc43-1.patch - -Submitted By: Ken Moffat <ken at linuxfromscratch dot org> -Date: 2008-11-21 -Initial Package Version: 3.8.3 -Upstream Status: unknown -Origin: fedora -Description: Allows it to compile with gcc-4.3. - -diff -up id3lib-3.8.3/include/id3/id3lib_strings.h~ id3lib-3.8.3/include/id3/id3lib_strings.h ---- id3lib-3.8.3/include/id3/id3lib_strings.h~ 2003-03-02 02:23:00.000000000 +0200 -+++ id3lib-3.8.3/include/id3/id3lib_strings.h 2008-01-04 01:30:52.000000000 +0200 -@@ -29,6 +29,7 @@ - #ifndef _ID3LIB_STRINGS_H_ - #define _ID3LIB_STRINGS_H_ - -+#include <cstring> - #include <string> - - #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) -diff -up id3lib-3.8.3/configure.in~ id3lib-3.8.3/configure.in ---- id3lib-3.8.3/configure.in~ 2008-01-04 11:39:01.000000000 +0100 -+++ id3lib-3.8.3/configure.in 2008-01-04 11:39:01.000000000 +0100 -@@ -227,7 +227,6 @@ AC_CHECK_HEADERS(fstream iostream iomani - ) - AC_CHECK_HEADERS( \ - string \ -- iomanip.h \ - ,,AC_MSG_ERROR([Missing a vital header file for id3lib]) - ) - -diff -up id3lib-3.8.3/configure~ id3lib-3.8.3/configure ---- id3lib-3.8.3/configure~ 2008-01-04 11:39:10.000000000 +0100 -+++ id3lib-3.8.3/configure 2008-01-04 11:39:10.000000000 +0100 -@@ -22976,7 +22976,6 @@ done - - for ac_header in \ - string \ -- iomanip.h \ - - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -diff -up id3lib-3.8.3/include/id3/writers.h~ id3lib-3.8.3/include/id3/writers.h ---- id3lib-3.8.3/include/id3/writers.h~ 2008-01-04 11:59:39.000000000 +0100 -+++ id3lib-3.8.3/include/id3/writers.h 2008-01-04 11:59:39.000000000 +0100 -@@ -28,9 +28,9 @@ - #ifndef _ID3LIB_WRITERS_H_ - #define _ID3LIB_WRITERS_H_ - -+#include <cstring> - #include "id3/writer.h" - #include "id3/id3lib_streams.h" --//#include <string.h> - - class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer - { -diff -up id3lib-3.8.3/examples/demo_info.cpp~ id3lib-3.8.3/examples/demo_info.cpp ---- id3lib-3.8.3/examples/demo_info.cpp~ 2008-01-04 12:00:56.000000000 +0100 -+++ id3lib-3.8.3/examples/demo_info.cpp 2008-01-04 12:00:56.000000000 +0100 -@@ -309,7 +309,7 @@ void PrintInformation(const ID3_Tag &myT - - #define DEBUG - --int main( unsigned int argc, char * const argv[]) -+int main(int argc, char * const argv[]) - { - ID3D_INIT_DOUT(); - -diff -up id3lib-3.8.3/examples/demo_copy.cpp~ id3lib-3.8.3/examples/demo_copy.cpp ---- id3lib-3.8.3/examples/demo_copy.cpp~ 2008-01-04 12:01:26.000000000 +0100 -+++ id3lib-3.8.3/examples/demo_copy.cpp 2008-01-04 12:01:26.000000000 +0100 -@@ -81,7 +81,7 @@ void DisplayTags(ostream &os, luint nTag - } - } - --int main( unsigned int argc, char * const argv[]) -+int main(int argc, char * const argv[]) - { - int ulFlag = ID3TT_ID3; - ID3D_INIT_DOUT(); -diff -up id3lib-3.8.3/examples/demo_convert.cpp~ id3lib-3.8.3/examples/demo_convert.cpp ---- id3lib-3.8.3/examples/demo_convert.cpp~ 2008-01-04 12:01:20.000000000 +0100 -+++ id3lib-3.8.3/examples/demo_convert.cpp 2008-01-04 12:01:20.000000000 +0100 -@@ -84,7 +84,7 @@ void DisplayTags(ostream &os, luint nTag - } - } - --int main( unsigned int argc, char * const argv[]) -+int main(int argc, char * const argv[]) - { - flags_t ulFlag = ID3TT_ALL; - gengetopt_args_info args; -diff -up id3lib-3.8.3/examples/demo_tag.cpp~ id3lib-3.8.3/examples/demo_tag.cpp ---- id3lib-3.8.3/examples/demo_tag.cpp~ 2008-01-04 12:01:41.000000000 +0100 -+++ id3lib-3.8.3/examples/demo_tag.cpp 2008-01-04 12:01:41.000000000 +0100 -@@ -46,7 +46,7 @@ void DisplayTags(ostream &os, luint nTag - os << "v2"; - } - --int main( unsigned int argc, char * const argv[]) -+int main(int argc, char * const argv[]) - { - int ulFlag = ID3TT_ID3; - ID3D_INIT_DOUT(); diff --git a/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff b/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff deleted file mode 100644 index b05d2cf298d3..000000000000 --- a/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff +++ /dev/null @@ -1,39 +0,0 @@ -diff -ruN id3lib-3.8.3.orig/ChangeLog id3lib-3.8.3/ChangeLog ---- id3lib-3.8.3.orig/ChangeLog 2003-03-02 01:23:00.000000000 +0100 -+++ id3lib-3.8.3/ChangeLog 2006-02-22 00:33:59.946214472 +0100 -@@ -1,3 +1,8 @@ -+2006-02-17 Jerome Couderc -+ -+ * Patch from Spoon to fix UTF-16 writing bug -+ http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979 -+ - 2003-03-02 Sunday 17:38 Thijmen Klok <thijmen@id3lib.org> - - * THANKS (1.20): added more people -diff -ruN id3lib-3.8.3.orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp ---- id3lib-3.8.3.orig/src/io_helpers.cpp 2003-03-02 01:23:00.000000000 +0100 -+++ id3lib-3.8.3/src/io_helpers.cpp 2006-02-22 00:35:02.926639992 +0100 -@@ -363,11 +363,22 @@ - // Write the BOM: 0xFEFF - unicode_t BOM = 0xFEFF; - writer.writeChars((const unsigned char*) &BOM, 2); -+ // Patch from Spoon : 2004-08-25 14:17 -+ // http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979 -+ // Wrong code -+ //for (size_t i = 0; i < size; i += 2) -+ //{ -+ // unicode_t ch = (data[i] << 8) | data[i+1]; -+ // writer.writeChars((const unsigned char*) &ch, 2); -+ //} -+ // Right code -+ unsigned char *pdata = (unsigned char *) data.c_str(); - for (size_t i = 0; i < size; i += 2) - { -- unicode_t ch = (data[i] << 8) | data[i+1]; -+ unicode_t ch = (pdata[i] << 8) | pdata[i+1]; - writer.writeChars((const unsigned char*) &ch, 2); - } -+ // End patch - } - return writer.getCur() - beg; - } diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix deleted file mode 100644 index 37354f8be489..000000000000 --- a/pkgs/development/libraries/idnkit/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, libiconv }: - -stdenv.mkDerivation rec { - pname = "idnkit"; - version = "2.3"; - - src = fetchurl { - url = "https://jprs.co.jp/idn/${pname}-${version}.tar.bz2"; - sha256 = "0zp9yc84ff5s0g2i6v9yfyza2n2x4xh0kq7hjd3anhh0clbp3l16"; - }; - - buildInputs = [ libiconv ]; - - meta = with lib; { - homepage = "https://jprs.co.jp/idn/index-e.html"; - description = "Provides functionalities about i18n domain name processing"; - license = { - fullName = "Open Source Code License version 1.1"; - url = "https://jprs.co.jp/idn/idnkit2-OSCL.txt"; - }; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix deleted file mode 100644 index 63ca16e19d7a..000000000000 --- a/pkgs/development/libraries/igraph/default.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, arpack -, bison -, blas -, cmake -, flex -, fop -, glpk -, gmp -, lapack -, libxml2 -, libxslt -, llvmPackages -, pkg-config -, plfit -, python3 -, sourceHighlight -, xmlto -}: - -assert (blas.isILP64 == lapack.isILP64 && - blas.isILP64 == arpack.isILP64 && - !blas.isILP64); - -stdenv.mkDerivation (finalAttrs: { - pname = "igraph"; - version = "0.10.13"; - - src = fetchFromGitHub { - owner = "igraph"; - repo = "igraph"; - rev = finalAttrs.version; - hash = "sha256-c5yZI5AfaO/NFyy88efu1COb+T2r1LpHhUTfilw2H1U="; - }; - - postPatch = '' - echo "${finalAttrs.version}" > IGRAPH_VERSION - ''; - - outputs = [ "out" "dev" "doc" ]; - - nativeBuildInputs = [ - bison - cmake - flex - fop - libxml2 - libxslt - pkg-config - python3 - sourceHighlight - xmlto - ]; - - buildInputs = [ - arpack - blas - glpk - gmp - lapack - libxml2 - plfit - ] ++ lib.optionals stdenv.cc.isClang [ - llvmPackages.openmp - ]; - - cmakeFlags = [ - "-DIGRAPH_USE_INTERNAL_BLAS=OFF" - "-DIGRAPH_USE_INTERNAL_LAPACK=OFF" - "-DIGRAPH_USE_INTERNAL_ARPACK=OFF" - "-DIGRAPH_USE_INTERNAL_GLPK=OFF" - "-DIGRAPH_USE_INTERNAL_GMP=OFF" - "-DIGRAPH_USE_INTERNAL_PLFIT=OFF" - "-DIGRAPH_GLPK_SUPPORT=ON" - "-DIGRAPH_GRAPHML_SUPPORT=ON" - "-DIGRAPH_OPENMP_SUPPORT=ON" - "-DIGRAPH_ENABLE_LTO=AUTO" - "-DIGRAPH_ENABLE_TLS=ON" - "-DBUILD_SHARED_LIBS=ON" - ]; - - doCheck = true; - - postInstall = '' - mkdir -p "$out/share" - cp -r doc "$out/share" - ''; - - postFixup = '' - substituteInPlace $dev/lib/cmake/igraph/igraph-targets.cmake \ - --replace-fail "_IMPORT_PREFIX \"$out\"" "_IMPORT_PREFIX \"$dev\"" - '' + lib.optionalString stdenv.isDarwin '' - install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libigraph.dylib - ''; - - passthru.tests = { - python = python3.pkgs.igraph; - }; - - meta = with lib; { - description = "C library for complex network analysis and graph theory"; - homepage = "https://igraph.org/"; - changelog = "https://github.com/igraph/igraph/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = with maintainers; [ MostAwesomeDude dotlambda ]; - }; -}) diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix deleted file mode 100644 index ad13daef788d..000000000000 --- a/pkgs/development/libraries/ijs/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, autoreconfHook, ghostscript }: - -stdenv.mkDerivation { - pname = "ijs"; - inherit (ghostscript) version src; - - postPatch = "cd ijs"; - - enableParallelBuilding = true; - - nativeBuildInputs = [ autoreconfHook ]; - - configureFlags = [ "--enable-shared" ]; - - meta = with lib; { - homepage = "https://www.openprinting.org/download/ijs/"; - description = "Raster printer driver architecture"; - - license = licenses.gpl3Plus; - - platforms = platforms.all; - maintainers = [ maintainers.abbradar ]; - }; -} diff --git a/pkgs/development/libraries/ilbc/CMakeLists.txt b/pkgs/development/libraries/ilbc/CMakeLists.txt deleted file mode 100644 index edd8e7a32797..000000000000 --- a/pkgs/development/libraries/ilbc/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -cmake_minimum_required(VERSION 2.6) - -project(ilbc) - -file(GLOB ilbc_SRCS *.c) -file(GLOB ilbc_HDRS *.h) - -add_library(ilbc SHARED ${ilbc_SRCS}) - -install(TARGETS ilbc DESTINATION lib) -install(FILES ${ilbc_HDRS} DESTINATION include/ilbc) diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/development/libraries/ilbc/default.nix deleted file mode 100644 index 39d7b7b61b04..000000000000 --- a/pkgs/development/libraries/ilbc/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, gawk, cmake }: - -stdenv.mkDerivation rec { - name = "ilbc-rfc3951"; - - script = ./extract-cfile.awk; - - rfc3951 = fetchurl { - url = "http://www.ietf.org/rfc/rfc3951.txt"; - sha256 = "0zf4mvi3jzx6zjrfl2rbhl2m68pzbzpf1vbdmn7dqbfpcb67jpdy"; - }; - - nativeBuildInputs = [ cmake ]; - - unpackPhase = '' - mkdir -v ${name} - cd ${name} - ${gawk}/bin/gawk -f ${script} ${rfc3951} - cp -v ${./CMakeLists.txt} CMakeLists.txt - ''; - - meta = { - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/ilbc/extract-cfile.awk b/pkgs/development/libraries/ilbc/extract-cfile.awk deleted file mode 100644 index e4b07bc08963..000000000000 --- a/pkgs/development/libraries/ilbc/extract-cfile.awk +++ /dev/null @@ -1,24 +0,0 @@ -BEGIN { srcname = "nothing"; } -{ if (/^A\.[0-9][0-9]*\.* *[a-zA-Z][a-zA-Z_0-9]*\.[ch]/) { - if (srcname != "nothing") - close(srcname); - srcname = $2; - printf("creating source file %s\n", srcname); - }else if (srcname != "nothing") { - if (/Andersen,* *et* *al\./) - printf("skipping %s\n", $0); - else if (/ /) - printf("skipping2 %s\n", $0); - else if (/Internet Low Bit Rate Codec *December 2004/) - printf("skipping3 %s\n", $0); - else if (/Authors' *Addresses/){ - close(srcname); - exit;} - else - print $0 >> srcname; - } -} -END { - printf("ending file %s\n", srcname); - close(srcname); -} diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix deleted file mode 100644 index 219d961f9f96..000000000000 --- a/pkgs/development/libraries/ilmbase/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv -, lib -, buildPackages -, cmake -, openexr -}: - -stdenv.mkDerivation rec { - pname = "ilmbase"; - version = lib.getVersion openexr; - - # the project no longer provides separate tarballs. We may even want to merge - # the ilmbase package into openexr in the future. - inherit (openexr) src patches; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ cmake ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - # fails 1 out of 1 tests with - # "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed" - # at least on i686. spooky! - doCheck = stdenv.isx86_64; - - preConfigure = '' - # Need to cd after patches for openexr patches to apply. - cd IlmBase - ''; - - meta = with lib; { - description = " A library for 2D/3D vectors and matrices and other mathematical objects, functions and data types for computer graphics"; - homepage = "https://www.openexr.com/"; - license = licenses.bsd3; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/imath/default.nix b/pkgs/development/libraries/imath/default.nix deleted file mode 100644 index ae7bbe2fba3f..000000000000 --- a/pkgs/development/libraries/imath/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "imath"; - version = "3.1.11"; - - src = fetchFromGitHub { - owner = "AcademySoftwareFoundation"; - repo = "imath"; - rev = "v${version}"; - sha256 = "sha256-Cnl0BTXUzkDvgLSNXJbh5ATczBdbxiwbS4J9L6N8sKI="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Imath is a C++ and python library of 2D and 3D vector, matrix, and math operations for computer graphics"; - homepage = "https://github.com/AcademySoftwareFoundation/Imath"; - license = licenses.bsd3; - maintainers = with maintainers; [ paperdigits ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index 1b33c1c74f2d..16f9976e2df5 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -26,15 +26,15 @@ IMGUI_BUILD_DX10_BINDING ? false, IMGUI_BUILD_DX11_BINDING ? false, IMGUI_BUILD_DX12_BINDING ? false, - IMGUI_BUILD_GLFW_BINDING ? !stdenv.isDarwin, + IMGUI_BUILD_GLFW_BINDING ? !stdenv.hostPlatform.isDarwin, IMGUI_BUILD_GLUT_BINDING ? false, - IMGUI_BUILD_METAL_BINDING ? stdenv.isDarwin, + IMGUI_BUILD_METAL_BINDING ? stdenv.hostPlatform.isDarwin, IMGUI_BUILD_OPENGL2_BINDING ? false, IMGUI_BUILD_OPENGL3_BINDING ? IMGUI_BUILD_SDL2_BINDING || IMGUI_BUILD_GLFW_BINDING || IMGUI_BUILD_GLUT_BINDING, - IMGUI_BUILD_OSX_BINDING ? stdenv.isDarwin, + IMGUI_BUILD_OSX_BINDING ? stdenv.hostPlatform.isDarwin, IMGUI_BUILD_SDL2_BINDING ? - !IMGUI_BUILD_GLFW_BINDING && !stdenv.isDarwin, + !IMGUI_BUILD_GLFW_BINDING && !stdenv.hostPlatform.isDarwin, IMGUI_BUILD_SDL2_RENDERER_BINDING ? IMGUI_BUILD_SDL2_BINDING, IMGUI_BUILD_VULKAN_BINDING ? false, IMGUI_BUILD_WIN32_BINDING ? false, @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { pname = "imgui"; - version = "1.90.6"; + version = "1.91.4"; outputs = [ # Note: no "dev" because vcpkg installs include/ and imgui-config.cmake # into different prefixes but expects the merged layout at import time @@ -69,8 +69,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; - rev = "v${version}"; - sha256 = "sha256-FSob6FPfg0tF0n72twA5/moLvEaB251BPkIDJUXhYbg="; + rev = "refs/tags/v${version}"; + hash = "sha256-6j4keBOAzbBDsV0+R4zTNlsltxz2dJDGI43UIrHXDNM="; }; cmakeRules = "${vcpkgSource}/ports/imgui"; diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix deleted file mode 100644 index 884cebab2e30..000000000000 --- a/pkgs/development/libraries/iml/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{lib, stdenv, autoreconfHook, fetchurl, gmp, blas}: -stdenv.mkDerivation rec { - pname = "iml"; - version = "1.0.5"; - src = fetchurl { - url = "http://www.cs.uwaterloo.ca/~astorjoh/iml-${version}.tar.bz2"; - sha256 = "0akwhhz9b40bz6lrfxpamp7r7wkk48p455qbn04mfnl9a1l6db8x"; - }; - buildInputs = [ - gmp - blas - ]; - nativeBuildInputs = [ - autoreconfHook - ]; - configureFlags = [ - "--with-gmp-include=${gmp.dev}/include" - "--with-gmp-lib=${gmp}/lib" - "--with-cblas=-lblas" - ]; - meta = { - description = "Algorithms for computing exact solutions to dense systems of linear equations over the integers"; - license = lib.licenses.gpl2Plus; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.unix; - homepage = "https://cs.uwaterloo.ca/~astorjoh/iml.html"; - }; -} diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix deleted file mode 100644 index 6f7a14a61611..000000000000 --- a/pkgs/development/libraries/imlib2/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ lib, stdenv, fetchurl -# Image file formats -, libjpeg, libtiff, giflib, libpng, libwebp, libjxl -, libspectre -# imlib2 can load images from ID3 tags. -, libid3tag, librsvg, libheif -, freetype , bzip2, pkg-config -, x11Support ? true -, webpSupport ? true -, svgSupport ? false -, heifSupport ? false -, jxlSupport ? false -, psSupport ? false - -# for passthru.tests -, libcaca -, diffoscopeMinimal -, feh -, icewm -, openbox -, fluxbox -, enlightenment -, xorg -, testers - -, gitUpdater -}: - -let - inherit (lib) optional optionals; -in -stdenv.mkDerivation (finalAttrs: { - pname = "imlib2"; - version = "1.12.3"; - - src = fetchurl { - url = "mirror://sourceforge/enlightenment/imlib2-${finalAttrs.version}.tar.xz"; - hash = "sha256-liRGVldqPgpvWLeOUU3ckZYirGgGcRvCMYN+7mLB3jQ="; - }; - - buildInputs = [ - libjpeg libtiff giflib libpng - bzip2 freetype libid3tag - ] ++ optionals x11Support [ xorg.libXft xorg.libXext ] - ++ optional heifSupport libheif - ++ optional svgSupport librsvg - ++ optional webpSupport libwebp - ++ optional jxlSupport libjxl - ++ optional psSupport libspectre; - - nativeBuildInputs = [ pkg-config ]; - - enableParallelBuilding = true; - - # Do not build amd64 assembly code on Darwin, because it fails to compile - # with unknow directive errors - configureFlags = optional stdenv.isDarwin "--enable-amd64=no" - ++ optional (!svgSupport) "--without-svg" - ++ optional (!heifSupport) "--without-heif" - ++ optional (!x11Support) "--without-x"; - - outputs = [ "bin" "out" "dev" ]; - - passthru = { - tests = { - inherit - libcaca - diffoscopeMinimal - feh - icewm - openbox - fluxbox - enlightenment; - pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - }; - updateScript = gitUpdater { - # No nicer place to find latest release. - url = "https://git.enlightenment.org/old/legacy-imlib2.git"; - rev-prefix = "v"; - }; - }; - - meta = with lib; { - description = "Image manipulation library"; - - longDescription = '' - This is the Imlib 2 library - a library that does image file loading and - saving as well as rendering, manipulation, arbitrary polygon support, etc. - It does ALL of these operations FAST. Imlib2 also tries to be highly - intelligent about doing them, so writing naive programs can be done - easily, without sacrificing speed. - ''; - - homepage = "https://docs.enlightenment.org/api/imlib2/html"; - changelog = "https://git.enlightenment.org/old/legacy-imlib2/raw/tag/v${finalAttrs.version}/ChangeLog"; - license = licenses.imlib2; - pkgConfigModules = [ "imlib2" ]; - platforms = platforms.unix; - maintainers = [ ]; - }; -}) diff --git a/pkgs/development/libraries/immer/default.nix b/pkgs/development/libraries/immer/default.nix deleted file mode 100644 index 1e82c6ad1d5d..000000000000 --- a/pkgs/development/libraries/immer/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "immer"; - version = "0.8.0"; - - src = fetchFromGitHub { - owner = "arximboldi"; - repo = "immer"; - rev = "v${version}"; - hash = "sha256-R0C6hN50eyFSv10L/Q0tRdnUrRvze+eRXPrlAQsddYY="; - }; - - nativeBuildInputs = [ cmake ]; - dontBuild = true; - dontUseCmakeBuildDir = true; - - meta = with lib; { - description = "Postmodern immutable and persistent data structures for C++ — value semantics at scale"; - homepage = "https://sinusoid.es/immer"; - changelog = "https://github.com/arximboldi/immer/releases/tag/v${version}"; - license = licenses.boost; - maintainers = with maintainers; [ sifmelcara ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/impy/default.nix b/pkgs/development/libraries/impy/default.nix deleted file mode 100644 index 5be23b0a96f4..000000000000 --- a/pkgs/development/libraries/impy/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, libpng -, zlib -, giflib -, libjpeg -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "impy"; - version = "0.2"; - - src = fetchFromGitHub { - owner = "bcampbell"; - repo = "impy"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-0bHm3jawYgcIeF2COALWlypX7kvPw1hifB/W+TKcC4M="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - libpng - zlib - giflib - libjpeg - ]; - - meta = with lib; { - description = "Simple library for loading/saving images and animations, written in C"; - homepage = "https://github.com/bcampbell/impy"; - license = licenses.gpl3; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/libraries/imtui/default.nix b/pkgs/development/libraries/imtui/default.nix deleted file mode 100644 index a4f477543b89..000000000000 --- a/pkgs/development/libraries/imtui/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, imgui -, ninja -, withEmscripten ? false, emscripten -, withCurl ? (!withEmscripten), curl -, withNcurses ? (!withEmscripten), ncurses -, static ? withEmscripten -, darwin -}: - -stdenv.mkDerivation rec { - pname = "imtui"; - version = "1.0.5"; - - src = fetchFromGitHub { - owner = "ggerganov"; - repo = pname; - rev = "v${version}"; - hash = "sha256-eHQPDEfxKGLdiOi0lUUgqJcmme1XJLSPAafT223YK+U="; - }; - - nativeBuildInputs = [ cmake ninja ]; - - buildInputs = lib.optional withEmscripten emscripten - ++ lib.optional withCurl curl - ++ lib.optional withNcurses ncurses - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - - postPatch = '' - cp -r ${imgui.src}/* third-party/imgui/imgui - chmod -R u+w third-party/imgui - '' + lib.optionalString (lib.versionAtLeast imgui.version "1.90.1") '' - substituteInPlace src/imtui-impl-{emscripten,ncurses}.cpp \ - --replace "ImGuiKey_KeyPadEnter" "ImGuiKey_KeypadEnter" - ''; - - cmakeFlags = [ - "-DEMSCRIPTEN:BOOL=${if withEmscripten then "ON" else "OFF"}" - "-DIMTUI_SUPPORT_CURL:BOOL=${if withCurl then "ON" else "OFF"}" - "-DIMTUI_SUPPORT_NCURSES:BOOL=${if withNcurses then "ON" else "OFF"}" - "-DBUILD_SHARED_LIBS:BOOL=${if (!static) then "ON" else "OFF"}" - "-DIMTUI_BUILD_EXAMPLES:BOOL=OFF" - "-DIMTUI_INSTALL_IMGUI_HEADERS:BOOL=OFF" - ]; - - meta = with lib; { - description = "Immediate mode text-based user interface library"; - longDescription = '' - ImTui is an immediate mode text-based user interface library. Supports 256 - ANSI colors and mouse/keyboard input. - ''; - homepage = "https://imtui.ggerganov.com"; - changelog = "https://github.com/ggerganov/imtui/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ azahi ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/inchi/default.nix b/pkgs/development/libraries/inchi/default.nix deleted file mode 100644 index f74cfdec9305..000000000000 --- a/pkgs/development/libraries/inchi/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ fetchurl -, lib -, stdenv -, unzip -, fixDarwinDylibNames -}: - -let - versionMajor = "1"; - versionMinor = "0.6"; - version = versionMajor + "." + versionMinor; - removeDots = lib.replaceStrings [ "." ] [ "" ]; - src-doc = fetchurl { - url = "http://www.inchi-trust.org/download/${removeDots version}/INCHI-1-DOC.zip"; - sha256 = "1kyda09i9p89xfq90ninwi7w13k1w3ljpl4gqdhpfhi5g8fgxx7f"; - }; -in - stdenv.mkDerivation rec { - pname = "inchi"; - inherit version; - - src = fetchurl { - url = "http://www.inchi-trust.org/download/${removeDots version}/INCHI-1-SRC.zip"; - sha256 = "1zbygqn0443p0gxwr4kx3m1bkqaj8x9hrpch3s41py7jq08f6x28"; - }; - - nativeBuildInputs = [ unzip ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - outputs = [ "out" "doc" ]; - - enableParallelBuilding = true; - - preConfigure = '' - cd ./INCHI_API/libinchi/gcc - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace makefile \ - --replace ",--version-script=libinchi.map" "" \ - --replace "LINUX_Z_RELRO = ,-z,relro" "" \ - --replace "-soname" "-install_name" \ - --replace "gcc" $CC - ''; - installPhase = let - versionOneDot = versionMajor + "." + removeDots versionMinor; - in '' - runHook preInstall - - cd ../../.. - mkdir -p $out/lib - mkdir -p $out/include/inchi - mkdir -p $doc/share/ - - install -m 755 INCHI_API/bin/Linux/libinchi.so.${versionOneDot}.00 $out/lib - ln -s $out/lib/libinchi.so.${versionOneDot}.00 $out/lib/libinchi.so.1 - ln -s $out/lib/libinchi.so.${versionOneDot}.00 $out/lib/libinchi.so - install -m 644 INCHI_BASE/src/*.h $out/include/inchi - - runHook postInstall - ''; - - preFixup = lib.optionalString stdenv.isDarwin '' - fixDarwinDylibNames $(find "$out" -name "*.so.*") - ''; - - postInstall = '' - unzip '${src-doc}' - install -m 644 INCHI-1-DOC/*.pdf $doc/share - ''; - - meta = with lib; { - homepage = "https://www.inchi-trust.org/"; - description = "IUPAC International Chemical Identifier library"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ rmcgibbo ]; - }; - } diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix deleted file mode 100644 index 4558ebbd0dcf..000000000000 --- a/pkgs/development/libraries/incrtcl/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, writeText, tcl }: - -tcl.mkTclDerivation rec { - pname = "incrtcl"; - version = "4.2.3"; - - src = fetchurl { - url = "mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl${version}.tar.gz"; - sha256 = "sha256-idOs2GXP3ZY7ECtF+K9hg5REyK6sQ0qk+666gUQPjCY="; - }; - - enableParallelBuilding = true; - - patchPhase = '' - substituteInPlace configure --replace "\''${TCL_SRC_DIR}/generic" "${tcl}/include" - ''; - - postInstall = '' - rmdir $out/bin - mv $out/lib/itcl${version}/* $out/lib - ln -s libitcl${version}${stdenv.hostPlatform.extensions.sharedLibrary} \ - $out/lib/libitcl${lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary} - rmdir $out/lib/itcl${version} - ''; - - setupHook = writeText "setup-hook.sh" '' - export ITCL_LIBRARY=@out@/lib - ''; - - outputs = [ "out" "dev" "man" ]; - - meta = with lib; { - homepage = "https://incrtcl.sourceforge.net/"; - description = "Object Oriented Enhancements for Tcl/Tk"; - license = licenses.tcltk; - platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice ]; - }; -} diff --git a/pkgs/development/libraries/inih/default.nix b/pkgs/development/libraries/inih/default.nix deleted file mode 100644 index 91d27fbc675c..000000000000 --- a/pkgs/development/libraries/inih/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja }: - -stdenv.mkDerivation rec { - pname = "inih"; - version = "58"; - - src = fetchFromGitHub { - owner = "benhoyt"; - repo = pname; - rev = "r${version}"; - hash = "sha256-b2f6hQvkmWgni/zdfv3I1b9ypd7zSyEBv/JVBA6K7/w="; - }; - - nativeBuildInputs = [ meson ninja ]; - - meta = with lib; { - description = "Simple .INI file parser in C, good for embedded systems"; - homepage = "https://github.com/benhoyt/inih"; - changelog = "https://github.com/benhoyt/inih/releases/tag/r${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ TredwellGit ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix deleted file mode 100644 index b0bb4dce192f..000000000000 --- a/pkgs/development/libraries/iniparser/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - fetchFromGitHub, - substituteAll, - symlinkJoin, - cmake, - doxygen, - ruby, - validatePkgConfig, - testers, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "iniparser"; - version = "4.2.4"; - - src = fetchFromGitLab { - owner = "iniparser"; - repo = "iniparser"; - rev = "v${finalAttrs.version}"; - hash = "sha256-R069LuOmjCFj7dHXiMjuK7WUupk5+dVd8IDKY/wBn2o="; - }; - - patches = lib.optionals finalAttrs.finalPackage.doCheck [ - (substituteAll { - # Do not let cmake's fetchContent download unity - src = ./remove-fetchcontent-usage.patch; - unitySrc = symlinkJoin { - name = "unity-with-iniparser-config"; - paths = [ - (fetchFromGitHub { - owner = "throwtheswitch"; - repo = "unity"; - rev = "v2.6.0"; - hash = "sha256-SCcUGNN/UJlu3ALJiZ9bQKxYRZey3cm9QG+NOehp6Ow="; - }) - ]; - postBuild = '' - ln -s ${finalAttrs.src}/test/unity_config.h $out/src/unity_config.h - ''; - }; - }) - ]; - - nativeBuildInputs = [ - cmake - doxygen - validatePkgConfig - ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ ruby ]; - - cmakeFlags = [ "-DBUILD_TESTING=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" ]; - - doCheck = false; - - postFixup = '' - ln -sv $out/include/iniparser/*.h $out/include/ - ''; - - passthru.tests = { - pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - iniparser-with-tests = finalAttrs.overrideAttrs (_: { - doCheck = true; - }); - }; - - meta = with lib; { - homepage = "https://gitlab.com/iniparser/iniparser"; - description = "Free standalone ini file parsing library"; - changelog = "https://gitlab.com/iniparser/iniparser/-/releases/v${finalAttrs.version}"; - license = licenses.mit; - platforms = platforms.unix; - pkgConfigModules = [ "iniparser" ]; - maintainers = [ maintainers.primeos ]; - }; -}) diff --git a/pkgs/development/libraries/iniparser/remove-fetchcontent-usage.patch b/pkgs/development/libraries/iniparser/remove-fetchcontent-usage.patch deleted file mode 100644 index db96c37e6b2c..000000000000 --- a/pkgs/development/libraries/iniparser/remove-fetchcontent-usage.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index b28d151..33a6bcf 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -28,10 +28,8 @@ set(FETCHCONTENT_QUIET OFF) - - FetchContent_Declare( - unity -- GIT_REPOSITORY "https://github.com/throwtheswitch/unity.git" -- GIT_PROGRESS TRUE -- PATCH_COMMAND ${CMAKE_COMMAND} -E copy -- ${CMAKE_CURRENT_LIST_DIR}/unity_config.h ./src/) -+ SOURCE_DIR @unitySrc@ -+) - - FetchContent_MakeAvailable(unity) - target_compile_definitions(unity PUBLIC UNITY_INCLUDE_CONFIG_H) diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix deleted file mode 100644 index a54872d6c2a5..000000000000 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -# for passthru.tests -, intel-compute-runtime -, intel-media-driver -}: - -stdenv.mkDerivation rec { - pname = "intel-gmmlib"; - version = "22.5.1"; - - src = fetchFromGitHub { - owner = "intel"; - repo = "gmmlib"; - rev = "intel-gmmlib-${version}"; - hash = "sha256-YHloVW5TtNI583GOEhx7S27jzHEVTSdbJSDOzv7KZiI="; - }; - - nativeBuildInputs = [ cmake ]; - - passthru.tests = { - inherit intel-compute-runtime intel-media-driver; - }; - - meta = with lib; { - homepage = "https://github.com/intel/gmmlib"; - license = licenses.mit; - description = "Intel Graphics Memory Management Library"; - longDescription = '' - The Intel(R) Graphics Memory Management Library provides device specific - and buffer management for the Intel(R) Graphics Compute Runtime for - OpenCL(TM) and the Intel(R) Media Driver for VAAPI. - ''; - platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix deleted file mode 100644 index 5b5cfac9e06b..000000000000 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, pkg-config -, libva -, libpciaccess -, intel-gmmlib -, libdrm -, enableX11 ? stdenv.isLinux -, libX11 - # for passhtru.tests -, pkgsi686Linux -}: - -stdenv.mkDerivation rec { - pname = "intel-media-driver"; - version = "24.2.5"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "intel"; - repo = "media-driver"; - rev = "intel-media-${version}"; - hash = "sha256-nnaKfGMRNMZzrgMv7OgXj+11RaZSFijrxunnbGSWQlw="; - }; - - patches = [ - # fix platform detection - (fetchpatch { - url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/7376a99f060c26d6be8e56674da52a61662617b9/debian/patches/0002-Remove-settings-based-on-ARCH.patch"; - hash = "sha256-57yePuHWYb3XXrB4MjYO2h6jbqfs4SGTLlLG91el8M4="; - }) - ]; - - cmakeFlags = [ - "-DINSTALL_DRIVER_SYSCONF=OFF" - "-DLIBVA_DRIVERS_PATH=${placeholder "out"}/lib/dri" - # Works only on hosts with suitable CPUs. - "-DMEDIA_RUN_TEST_SUITE=OFF" - "-DMEDIA_BUILD_FATAL_WARNINGS=OFF" - ]; - - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ libva libpciaccess intel-gmmlib libdrm ] - ++ lib.optional enableX11 libX11; - - postFixup = lib.optionalString enableX11 '' - patchelf --set-rpath "$(patchelf --print-rpath $out/lib/dri/iHD_drv_video.so):${lib.makeLibraryPath [ libX11 ]}" \ - $out/lib/dri/iHD_drv_video.so - ''; - - passthru.tests = { - inherit (pkgsi686Linux) intel-media-driver; - }; - - meta = with lib; { - description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs"; - longDescription = '' - The Intel Media Driver for VAAPI is a new VA-API (Video Acceleration API) - user mode driver supporting hardware accelerated decoding, encoding, and - video post processing for GEN based graphics hardware. - ''; - homepage = "https://github.com/intel/media-driver"; - changelog = "https://github.com/intel/media-driver/releases/tag/intel-media-${version}"; - license = with licenses; [ bsd3 mit ]; - platforms = platforms.linux; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix deleted file mode 100644 index 37c0e7253ad1..000000000000 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtest, libdrm, libpciaccess, libva, libX11 -, libXau, libXdmcp, libpthreadstubs, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "intel-media-sdk"; - version = "23.2.2"; - - src = fetchFromGitHub { - owner = "Intel-Media-SDK"; - repo = "MediaSDK"; - rev = "intel-mediasdk-${version}"; - hash = "sha256-wno3a/ZSKvgHvZiiJ0Gq9GlrEbfHCizkrSiHD6k/Loo="; - }; - - patches = [ - # Search oneVPL-intel-gpu in NixOS specific /run/opengl-driver/lib directory - # See https://github.com/NixOS/nixpkgs/pull/315425 - ./nixos-search-onevplrt-in-run-opengl-driver-lib.patch - # https://github.com/Intel-Media-SDK/MediaSDK/pull/3005 - (fetchpatch { - name = "include-cstdint-explicitly.patch"; - url = "https://github.com/Intel-Media-SDK/MediaSDK/commit/a4f37707c1bfdd5612d3de4623ffb2d21e8c1356.patch"; - hash = "sha256-OPwGzcMTctJvHcKn5bHqV8Ivj4P7+E4K9WOKgECqf04="; - }) - ]; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ - libdrm libva libpciaccess libX11 libXau libXdmcp libpthreadstubs - ]; - nativeCheckInputs = [ gtest ]; - - cmakeFlags = [ - "-DBUILD_SAMPLES=OFF" - "-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}" - "-DUSE_SYSTEM_GTEST=ON" - ]; - - doCheck = true; - - meta = with lib; { - description = "Intel Media SDK"; - mainProgram = "mfx-tracer-config"; - license = licenses.mit; - maintainers = with maintainers; [ midchildan pjungkamp ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/libraries/intel-media-sdk/nixos-search-onevplrt-in-run-opengl-driver-lib.patch b/pkgs/development/libraries/intel-media-sdk/nixos-search-onevplrt-in-run-opengl-driver-lib.patch deleted file mode 100644 index 5057de1e1e48..000000000000 --- a/pkgs/development/libraries/intel-media-sdk/nixos-search-onevplrt-in-run-opengl-driver-lib.patch +++ /dev/null @@ -1,45 +0,0 @@ -From aceb689ae69857def8a26a8d1ceb114ccfbb2569 Mon Sep 17 00:00:00 2001 -From: Philipp Jungkamp <p.jungkamp@gmx.net> -Date: Tue, 28 May 2024 19:22:29 +0200 -Subject: [PATCH] NixOS: Search ONEVPLRT in /run/opengl-driver/lib - ---- - api/mfx_dispatch/linux/mfxloader.cpp | 2 ++ - .../suites/mfx_dispatch/linux/mfx_dispatch_test_cases_libs.cpp | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/api/mfx_dispatch/linux/mfxloader.cpp b/api/mfx_dispatch/linux/mfxloader.cpp -index 39b6bff1..f76ed65d 100644 ---- a/api/mfx_dispatch/linux/mfxloader.cpp -+++ b/api/mfx_dispatch/linux/mfxloader.cpp -@@ -193,6 +193,7 @@ mfxStatus LoaderCtx::Init(mfxInitParam& par) - if (selected_runtime && strcmp(selected_runtime, "ONEVPL") == 0) { - libs.emplace_back(ONEVPLRT); - libs.emplace_back(MFX_MODULES_DIR "/" ONEVPLRT); -+ libs.emplace_back("/run/opengl-driver/lib/" ONEVPLRT); - } else if ((selected_runtime && strcmp(selected_runtime, "MSDK") == 0) || (platform != MFX_HW_UNKNOWN)) { - if (MFX_IMPL_BASETYPE(par.Implementation) == MFX_IMPL_AUTO || - MFX_IMPL_BASETYPE(par.Implementation) == MFX_IMPL_AUTO_ANY) { -@@ -213,6 +214,7 @@ mfxStatus LoaderCtx::Init(mfxInitParam& par) - } else { - libs.emplace_back(ONEVPLRT); - libs.emplace_back(MFX_MODULES_DIR "/" ONEVPLRT); -+ libs.emplace_back("/run/opengl-driver/lib/" ONEVPLRT); - } - - mfxStatus mfx_res = MFX_ERR_UNSUPPORTED; -diff --git a/tests/unit/suites/mfx_dispatch/linux/mfx_dispatch_test_cases_libs.cpp b/tests/unit/suites/mfx_dispatch/linux/mfx_dispatch_test_cases_libs.cpp -index dedee0b3..9657da4b 100644 ---- a/tests/unit/suites/mfx_dispatch/linux/mfx_dispatch_test_cases_libs.cpp -+++ b/tests/unit/suites/mfx_dispatch/linux/mfx_dispatch_test_cases_libs.cpp -@@ -123,6 +123,7 @@ TEST_P(DispatcherLibsTestParametrized, ShouldEnumerateCorrectLibNames) - { - libs.emplace_back(ONEVPLRT); - libs.emplace_back(modules_dir + "/" + ONEVPLRT); -+ libs.emplace_back("/run/opengl-driver/lib/" + ONEVPLRT); - } - - for (const std::string& lib : libs) --- -2.44.0 - diff --git a/pkgs/development/libraries/intel-vaapi-driver/default.nix b/pkgs/development/libraries/intel-vaapi-driver/default.nix deleted file mode 100644 index 9f9e2f2bbd40..000000000000 --- a/pkgs/development/libraries/intel-vaapi-driver/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, autoreconfHook, gnum4, pkg-config, python3, wayland-scanner -, intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext -, enableHybridCodec ? false, vaapi-intel-hybrid -, enableGui ? true -}: - -stdenv.mkDerivation rec { - pname = "intel-vaapi-driver"; - version = "2.4.1"; - - src = fetchFromGitHub { - owner = "intel"; - repo = "intel-vaapi-driver"; - rev = version; - sha256 = "1cidki3av9wnkgwi7fklxbg3bh6kysf8w3fk2qadjr05a92mx3zp"; - }; - - # Set the correct install path: - LIBVA_DRIVERS_PATH = "${placeholder "out"}/lib/dri"; - - postInstall = lib.optionalString enableHybridCodec '' - ln -s ${vaapi-intel-hybrid}/lib/dri/* $out/lib/dri/ - ''; - - configureFlags = [ - (lib.enableFeature enableGui "x11") - (lib.enableFeature enableGui "wayland") - ] ++ lib.optional enableHybridCodec "--enable-hybrid-codec"; - - nativeBuildInputs = [ - autoreconfHook gnum4 pkg-config python3 wayland-scanner - ]; - - buildInputs = [ intel-gpu-tools libdrm libva ] - ++ lib.optionals enableGui [ libX11 libXext libGL wayland ] - ++ lib.optional enableHybridCodec vaapi-intel-hybrid; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://01.org/linuxmedia"; - license = licenses.mit; - description = "VA-API user mode driver for Intel GEN Graphics family"; - longDescription = '' - This VA-API video driver backend provides a bridge to the GEN GPUs through - the packaging of buffers and commands to be sent to the i915 driver for - exercising both hardware and shader functionality for video decode, - encode, and processing. - VA-API is an open-source library and API specification, which provides - access to graphics hardware acceleration capabilities for video - processing. It consists of a main library and driver-specific acceleration - backends for each supported hardware vendor. - ''; - platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/libraries/iodash/0001-Add-cmake-install-directives.patch b/pkgs/development/libraries/iodash/0001-Add-cmake-install-directives.patch deleted file mode 100644 index 1868a7419208..000000000000 --- a/pkgs/development/libraries/iodash/0001-Add-cmake-install-directives.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 89c7c160f897f64e17fb74efffccfd1fc16f8b7d Mon Sep 17 00:00:00 2001 -From: Jappie Klooster <jappieklooster@hotmail.com> -Date: Fri, 2 Apr 2021 14:22:02 -0400 -Subject: [PATCH] Add cmake install directives. - -To make nix builds work, it expect a `make install` command to -be available. -Adding these directives seems to fix the build. - -If it's no trouble to you, please add them. - -Maybe don't need endian ---- - CMakeLists.txt | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 06e416f..8d6f489 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,6 +6,8 @@ set(CMAKE_CXX_STANDARD 17) - add_library(IODash INTERFACE) - target_include_directories(IODash INTERFACE .) - -+include(GNUInstallDirs) -+ - add_executable(IODash_Test test.cpp) - target_link_libraries(IODash_Test IODash) - -@@ -20,3 +22,11 @@ if (DEFINED BUILD_BENCHMARKS AND (${BUILD_BENCHMARKS})) - target_link_libraries(boost_Benchmark_HTTP boost_system pthread) - endif() - -+install(TARGETS IODash -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(FILES IODash.hpp -+ DESTINATION include/) -+ -+install(FILES -+ IODash/Buffer.hpp IODash/SocketAddress.hpp IODash/File.hpp IODash/Socket.hpp IODash/EventLoop.hpp IODash/Serial.hpp IODash/Timer.hpp -+ DESTINATION include/IODash) --- -2.29.2 - diff --git a/pkgs/development/libraries/iodash/default.nix b/pkgs/development/libraries/iodash/default.nix deleted file mode 100644 index d8982f0f8c04..000000000000 --- a/pkgs/development/libraries/iodash/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: - -stdenv.mkDerivation rec { - pname = "iodash"; - version = "0.1.7"; - - src = fetchFromGitHub { - owner = "YukiWorkshop"; - repo = "IODash"; - rev = "9dcb26621a9c17dbab704b5bab0c3a5fc72624cb"; - sha256 = "0db5y2206fwh3h1pzjm9hy3m76inm0xpm1c5gvrladz6hiqfp7bx"; - fetchSubmodules = true; - }; - # adds missing cmake install directives - # https://github.com/YukiWorkshop/IODash/pull/2 - patches = [ ./0001-Add-cmake-install-directives.patch]; - - nativeBuildInputs = [ cmake pkg-config ]; - - meta = with lib; { - homepage = "https://github.com/YukiWorkshop/IODash"; - description = "Lightweight C++ I/O library for POSIX operation systems"; - license = licenses.mit; - maintainers = with maintainers; [ jappie ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix deleted file mode 100644 index bc1c3736f730..000000000000 --- a/pkgs/development/libraries/ip2location-c/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -}: - -stdenv.mkDerivation rec { - pname = "ip2location-c"; - version = "8.6.1"; - - src = fetchFromGitHub { - owner = "chrislim2888"; - repo = "IP2Location-C-Library"; - rev = version; - sha256 = "sha256-3/cLoGV7go4S1ew73IJzJEMTlLnvM3adl+/Sb7mPrZY="; - }; - - nativeBuildInputs = [ - autoreconfHook - ]; - - enableParallelBuilding = true; - - # Checks require a database, which require registration (although sample - # databases are available, downloading them for just 1 test seems excessive): - doCheck = false; - - meta = with lib; { - description = "Library to look up locations of host names and IP addresses"; - mainProgram = "ip2location"; - longDescription = '' - A C library to find the country, region, city,coordinates, - zip code, time zone, ISP, domain name, connection type, area code, - weather, MCC, MNC, mobile brand name, elevation and usage type of - any IP address or host name in the IP2Location databases. - ''; - homepage = "https://www.ip2location.com/developers/c"; - license = with licenses; [ gpl3Plus lgpl3Plus ]; - 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 9c6cc585f9b3..0bbed96ca3af 100644 --- a/pkgs/development/libraries/ipu6-camera-hal/default.nix +++ b/pkgs/development/libraries/ipu6-camera-hal/default.nix @@ -11,6 +11,7 @@ , ipu6-camera-bins , libtool , gst_all_1 +, libdrm # Pick one of # - ipu6 (Tiger Lake) @@ -27,13 +28,13 @@ let in stdenv.mkDerivation { pname = "${ipuVersion}-camera-hal"; - version = "unstable-2023-09-25"; + version = "unstable-2024-09-29"; src = fetchFromGitHub { owner = "intel"; repo = "ipu6-camera-hal"; - rev = "9fa05a90886d399ad3dda4c2ddc990642b3d20c9"; - hash = "sha256-yS1D7o6dsQ4FQkjfwcisOxcP7Majb+4uQ/iW5anMb5c="; + rev = "f98f72b156563fe8373e4f8d017a9f609676bb33"; + hash = "sha256-zVcgKW7/GHYd1oMvsaI77cPyj3G68dL+OXBJDz5+Td4="; }; nativeBuildInputs = [ @@ -41,12 +42,16 @@ stdenv.mkDerivation { pkg-config ]; - PKG_CONFIG_PATH = "${lib.makeLibraryPath [ ipu6-camera-bins ]}/${ipuTarget}/pkgconfig"; cmakeFlags = [ "-DIPU_VER=${ipuVersion}" + "-DTARGET_SUFFIX=-${ipuVersion}" # missing libiacss "-DUSE_PG_LITE_PIPE=ON" + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DCMAKE_INSTALL_SUB_PATH=${ipuTarget}" + "-DCMAKE_INSTALL_LIBDIR=lib" ]; NIX_CFLAGS_COMPILE = [ @@ -61,21 +66,28 @@ stdenv.mkDerivation { libtool gst_all_1.gstreamer gst_all_1.gst-plugins-base + libdrm ]; postPatch = '' substituteInPlace src/platformdata/PlatformData.h \ - --replace '/usr/share/' "${placeholder "out"}/share/" + --replace '/usr/share/' "${placeholder "out"}/share/" \ + --replace '#define CAMERA_DEFAULT_CFG_PATH "/etc/camera/"' '#define CAMERA_DEFAULT_CFG_PATH "${placeholder "out"}/etc/camera/"' + ''; + + postInstall = '' + mkdir -p $out/include/${ipuTarget}/ + cp -r $src/include $out/include/${ipuTarget}/libcamhal ''; postFixup = '' for lib in $out/lib/*.so; do - patchelf --add-rpath "${lib.makeLibraryPath [ ipu6-camera-bins ]}/${ipuTarget}" $lib + patchelf --add-rpath "${ipu6-camera-bins}/lib" $lib done ''; passthru = { - inherit ipuVersion; + inherit ipuVersion ipuTarget; }; meta = with lib; { diff --git a/pkgs/development/libraries/iqueue/default.nix b/pkgs/development/libraries/iqueue/default.nix deleted file mode 100644 index 7f5d5c4c069c..000000000000 --- a/pkgs/development/libraries/iqueue/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libbsd, microsoft-gsl }: - -stdenv.mkDerivation rec { - pname = "iqueue"; - version = "0.1.0"; - src = fetchurl { - url = "https://github.com/twosigma/iqueue/releases/download/v${version}/iqueue-${version}.tar.gz"; - sha256 = "0049fnr02k15gr21adav33swrwxrpbananilnrp63vp5zs5v9m4x"; - }; - - doCheck = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libbsd microsoft-gsl ]; - - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=array-parameter" - "-Wno-error=misleading-indentation" - ]; - - meta = with lib; { - homepage = "https://github.com/twosigma/iqueue"; - description = "Indexed queue"; - license = licenses.asl20; - platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.catern ]; - }; -} diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index fa5d2b3b0c99..6711622a2eb8 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -ie '/sys\/sysctl.h/d' source/Irrlicht/COSOperator.cpp - '' + lib.optionalString stdenv.isAarch64 '' + '' + lib.optionalString stdenv.hostPlatform.isAarch64 '' substituteInPlace source/Irrlicht/Makefile \ --replace "-DIRRLICHT_EXPORTS=1" "-DIRRLICHT_EXPORTS=1 -DPNG_ARM_NEON_OPT=0" ''; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm - ] ++ lib.optional stdenv.isAarch64 zlib; + ] ++ lib.optional stdenv.hostPlatform.isAarch64 zlib; meta = { homepage = "https://irrlicht.sourceforge.io/"; diff --git a/pkgs/development/libraries/isa-l/default.nix b/pkgs/development/libraries/isa-l/default.nix index 9a112fb1c4d9..6a53990b7823 100644 --- a/pkgs/development/libraries/isa-l/default.nix +++ b/pkgs/development/libraries/isa-l/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, nasm }: +{ lib, stdenv, fetchFromGitHub, runCommand, autoreconfHook, nix, nasm }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "isa-l"; - version = "2.31.0"; + version = "2.31.0-unstable-2024-04-25"; src = fetchFromGitHub { owner = "intel"; repo = "isa-l"; - rev = "v${version}"; - sha256 = "sha256-xBBtpjtWyba0DogdLobtuWmiiAHTXMK4oRnjYuTUCNk="; + rev = "dbaf284e112bea1b90983772a3164e794b923aaf"; + sha256 = "sha256-eM1K3uObb4eZq0nSfafltp5DuZIDwknUYj9CdLn14lY="; }; nativeBuildInputs = [ nasm autoreconfHook ]; @@ -17,13 +17,48 @@ stdenv.mkDerivation rec { export AS=nasm ''; - meta = with lib; { + passthru = { + tests = { + igzip = runCommand "test-isa-l-igzip" { + nativeBuildInputs = [ + finalAttrs.finalPackage + ]; + sample = runCommand "nixpkgs-lib.nar" { + nativeBuildInputs = [ nix ]; + } '' + nix nar --extra-experimental-features nix-command pack ${../../../../lib} > "$out" + ''; + meta = { + description = "Cross validation of igzip provided by isa-l with gzip"; + }; + } '' + HASH_ORIGINAL="$(cat "$sample" | sha256sum | cut -d" " -f1)" + HASH_COMPRESSION_TEST="$(igzip -c "$sample" | gzip -d -c | sha256sum | cut -d" " -f1)" + HASH_DECOMPRESSION_TEST="$(gzip -c "$sample" | igzip -d -c | sha256sum | cut -d" " -f1)" + if [[ "$HASH_COMPRESSION_TEST" != "$HASH_ORIGINAL" ]] || [[ "$HASH_DECOMPRESSION_TEST" != "$HASH_ORIGINAL" ]]; then + if [[ "HASH_COMPRESSION_TEST" != "$HASH_ORIGINAL" ]]; then + echo "The igzip-compressed file does not decompress to the original file." 1>&2 + fi + if [[ "HASH_DECOMPRESSION_TEST" != "$HASH_ORIGINAL" ]]; then + echo "igzip does not decompress the gzip-compressed archive to the original file." 1>&2 + fi + echo "SHA256 checksums:" 1>&2 + printf ' original file:\t%s\n' "$HASH_ORIGINAL" 1>&2 + printf ' compression test:\t%s\n' "$HASH_COMPRESSION_TEST" 1>&2 + printf ' decompression test:\t%s\n' "$HASH_DECOMPRESSION_TEST" 1>&2 + exit 1 + fi + touch "$out" + ''; + }; + }; + + meta = { description = "Collection of optimised low-level functions targeting storage applications"; mainProgram = "igzip"; - license = licenses.bsd3; + license = lib.licenses.bsd3; homepage = "https://github.com/intel/isa-l"; - maintainers = with maintainers; [ jbedo ]; - platforms = platforms.all; - broken = stdenv.isDarwin && stdenv.isAarch64; # does not build on M1 mac (asm/hwcap.h file not found) maybe needs gcc not clang? + maintainers = with lib.maintainers; [ jbedo ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix deleted file mode 100644 index 0b9b316f4433..000000000000 --- a/pkgs/development/libraries/iso-codes/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, gettext, python3, testers }: - -stdenv.mkDerivation (finalAttrs: { - pname = "iso-codes"; - version = "4.16.0"; - - src = fetchurl { - url = with finalAttrs; "https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v${version}/${pname}-v${version}.tar.gz"; - sha256 = "sha256-fJkPw5oFl1vtsBdeP/Cfw4MEiBX2i0Yqu/BVqAMuZsw="; - }; - - nativeBuildInputs = [ gettext python3 ]; - - enableParallelBuilding = true; - - passthru.tests = { - pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - }; - }; - - meta = with lib; { - homepage = "https://salsa.debian.org/iso-codes-team/iso-codes"; - description = "Various ISO codes packaged as XML files"; - license = licenses.lgpl21; - platforms = platforms.all; - pkgConfigModules = [ "iso-codes" ]; - }; -}) diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix index 808bac76e861..d4ece7d311ec 100644 --- a/pkgs/development/libraries/itk/generic.nix +++ b/pkgs/development/libraries/itk/generic.nix @@ -147,7 +147,7 @@ stdenv.mkDerivation { libX11 libuuid ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] ++ lib.optionals enablePython [ python ] ++ lib.optionals withVtk [ vtk ]; # Due to ITKVtkGlue=ON and the additional dependencies needed to configure VTK 9 diff --git a/pkgs/development/libraries/itktcl/default.nix b/pkgs/development/libraries/itktcl/default.nix deleted file mode 100644 index b6a4788075f7..000000000000 --- a/pkgs/development/libraries/itktcl/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, tcl, tk, incrtcl }: - -tcl.mkTclDerivation rec { - pname = "itk-tcl"; - version = "4.1.0"; - - src = fetchurl { - url = "mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itk${version}.tar.gz"; - sha256 = "1iy964jfgsfnc1agk1w6bbm44x18ily8d4wmr7cc9z9f4acn2r6s"; - }; - - buildInputs = [ tk incrtcl ]; - enableParallelBuilding = true; - - configureFlags = [ - "--with-tk=${tk}/lib" - "--with-itcl=${incrtcl}/lib" - "--with-tkinclude=${tk.dev}/include" - ]; - - postInstall = '' - rmdir $out/bin - mv $out/lib/itk${version}/* $out/lib - ln -s libitk${version}${stdenv.hostPlatform.extensions.sharedLibrary} \ - $out/lib/libitk${lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary} - rmdir $out/lib/itk${version} - ''; - - outputs = [ "out" "dev" "man" ]; - - meta = with lib; { - homepage = "https://incrtcl.sourceforge.net/"; - description = "Mega-widget toolkit for incr Tk"; - license = licenses.tcltk; - platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice ]; - }; -} diff --git a/pkgs/development/libraries/jabcode/default.nix b/pkgs/development/libraries/jabcode/default.nix index 1fc0e6fd0886..d735937b934d 100644 --- a/pkgs/development/libraries/jabcode/default.nix +++ b/pkgs/development/libraries/jabcode/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; maintainers = [ maintainers.xaverdh ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/jabcode.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/jabcode.x86_64-darwin }; } diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix deleted file mode 100644 index 30044eb2cc05..000000000000 --- a/pkgs/development/libraries/jama/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{lib, stdenv, fetchurl, unzip, tnt}: - -stdenv.mkDerivation rec { - pname = "jama"; - version = "1.2.5"; - - src = fetchurl { - url = "https://math.nist.gov/tnt/jama125.zip"; - sha256 = "031ns526fvi2nv7jzzv02i7i5sjcyr0gj884i3an67qhsx8vyckl"; - }; - - nativeBuildInputs = [ unzip ]; - propagatedBuildInputs = [ tnt ]; - - unpackPhase = '' - mkdir "${pname}-${version}" - unzip "$src" - ''; - installPhase = '' - mkdir -p $out/include - cp *.h $out/include - ''; - - meta = with lib; { - homepage = "https://math.nist.gov/tnt/"; - description = "JAMA/C++ Linear Algebra Package: Java-like matrix C++ templates"; - platforms = platforms.unix; - license = licenses.publicDomain; - }; -} diff --git a/pkgs/development/libraries/jarowinkler-cpp/default.nix b/pkgs/development/libraries/jarowinkler-cpp/default.nix deleted file mode 100644 index fb19f998423b..000000000000 --- a/pkgs/development/libraries/jarowinkler-cpp/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, catch2_3 -}: - -stdenv.mkDerivation rec { - pname = "jarowinkler-cpp"; - version = "1.0.2"; - - src = fetchFromGitHub { - owner = "maxbachmann"; - repo = "jarowinkler-cpp"; - rev = "v${version}"; - hash = "sha256-GuwDSCYTfSwqTnzZSft3ufVSKL7255lVvbJhBxKxjJw="; - }; - - nativeBuildInputs = [ - cmake - ]; - - cmakeFlags = lib.optionals doCheck [ - "-DJARO_WINKLER_BUILD_TESTING=ON" - ]; - - nativeCheckInputs = [ - catch2_3 - ]; - - doCheck = true; - - meta = { - description = "Fast Jaro and Jaro-Winkler distance"; - homepage = "https://github.com/maxbachmann/jarowinkler-cpp"; - changelog = "https://github.com/maxbachmann/jarowinkler-cpp/blob/${src.rev}/CHANGELOG.md"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/development/libraries/java/commons/bcel/default.nix deleted file mode 100644 index f9ffad1028ab..000000000000 --- a/pkgs/development/libraries/java/commons/bcel/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - version = "6.10.0"; - pname = "commons-bcel"; - - src = fetchurl { - url = "mirror://apache/commons/bcel/binaries/bcel-${version}-bin.tar.gz"; - hash = "sha256-RRVXxPtwbT9AX92T60uDJpFWF6DiotcG1KvKrlFfEWU="; - }; - - installPhase = '' - tar xf ${src} - mkdir -p $out/share/java - cp bcel-${version}.jar $out/share/java/ - ''; - - meta = { - homepage = "https://commons.apache.org/proper/commons-bcel/"; - description = "Gives users a convenient way to analyze, create, and manipulate (binary) Java class files"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - maintainers = with lib.maintainers; [ copumpkin ]; - license = lib.licenses.asl20; - platforms = with lib.platforms; unix; - }; -} diff --git a/pkgs/development/libraries/java/commons/bsf/default.nix b/pkgs/development/libraries/java/commons/bsf/default.nix deleted file mode 100644 index f55029335e58..000000000000 --- a/pkgs/development/libraries/java/commons/bsf/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "commons-bsf"; - version = "2.4.0"; - - src = fetchurl { - url = "mirror://apache/commons/bsf/binaries/bsf-bin-${version}.tar.gz"; - sha256 = "1my3hv4y8cvrd1kr315wvbjqsamzlzswnbqcmsa2m4hqcafddfr8"; - }; - - installPhase = '' - mkdir -p $out/share/java - cp lib/bsf.jar $out/share/java/ - ''; - - meta = { - description = "Interface to scripting languages, including JSR-223"; - homepage = "https://commons.apache.org/proper/commons-bsf/"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - }; -} - diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix deleted file mode 100644 index f5c5922e800a..000000000000 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - version = "1.26.2"; - pname = "commons-compress"; - - src = fetchurl { - url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "sha256-EyGbVhcsuEhLfKh0TPFjySFd9/Z8BEBhkslpfdu4er8="; - }; - - installPhase = '' - tar xf ${src} - mkdir -p $out/share/java - cp *.jar $out/share/java/ - ''; - - meta = { - homepage = "https://commons.apache.org/proper/commons-compress"; - description = "Allows manipulation of ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE and Z files"; - maintainers = with lib.maintainers; [ copumpkin ]; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.asl20; - platforms = with lib.platforms; unix; - }; -} diff --git a/pkgs/development/libraries/java/commons/daemon/default.nix b/pkgs/development/libraries/java/commons/daemon/default.nix deleted file mode 100644 index 63cc3d41a0c3..000000000000 --- a/pkgs/development/libraries/java/commons/daemon/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - version = "1.4.0"; - pname = "commons-daemon"; - - src = fetchurl { - url = "mirror://apache/commons/daemon/binaries/commons-daemon-${version}-bin.tar.gz"; - sha256 = "sha256-Cnsd15yREDtkoNFRAsIpACnChncVNgddTJ1CEvhKn48="; - }; - - installPhase = '' - tar xf ${src} - mkdir -p $out/share/java - cp *.jar $out/share/java/ - ''; - - meta = { - homepage = "https://commons.apache.org/proper/commons-daemon"; - description = "Apache Commons Daemon software is a set of utilities and Java support classes for running Java applications as server processes"; - maintainers = with lib.maintainers; [ rsynnest ]; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.asl20; - platforms = with lib.platforms; unix; - }; -} diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix deleted file mode 100644 index 6c9235117355..000000000000 --- a/pkgs/development/libraries/java/commons/fileupload/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - version = "1.5"; - pname = "commons-fileupload"; - - src = fetchurl { - url = "mirror://apache/commons/fileupload/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "sha256-r7EGiih4qOCbjaL7Wg+plbe0m3CuFWXs/RmbfGLmj1g="; - }; - installPhase = '' - tar xf ${src} - mkdir -p $out/share/java - cp commons-fileupload-*-bin/*.jar $out/share/java/ - ''; - - meta = { - homepage = "https://commons.apache.org/proper/commons-fileupload"; - description = "Makes it easy to add robust, high-performance, file upload capability to your servlets and web applications"; - maintainers = with lib.maintainers; [ copumpkin ]; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.asl20; - platforms = with lib.platforms; unix; - }; -} diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix deleted file mode 100644 index 160388f97b51..000000000000 --- a/pkgs/development/libraries/java/commons/io/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - version = "2.16.1"; - pname = "commons-io"; - - src = fetchurl { - url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "sha256-4+YYSDyCHwUwlw71nAnGy4g9GOl1Z8qr3gHQEyv8EPo="; - }; - - installPhase = '' - tar xf ${src} - mkdir -p $out/share/java - cp *.jar $out/share/java/ - ''; - - meta = { - homepage = "https://commons.apache.org/proper/commons-io"; - description = "Library of utilities to assist with developing IO functionality"; - maintainers = with lib.maintainers; [ copumpkin ]; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.asl20; - platforms = with lib.platforms; unix; - }; -} diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix deleted file mode 100644 index 16b80fece30b..000000000000 --- a/pkgs/development/libraries/java/commons/lang/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, stdenv -, fetchurl -}: - -stdenv.mkDerivation (finalAttrs: { - version = "3.15.0"; - pname = "commons-lang"; - - src = fetchurl { - url = "mirror://apache/commons/lang/binaries/commons-lang3-${finalAttrs.version}-bin.tar.gz"; - hash = "sha256-XaI6ajKIA5NiY9UuZJdMCuZ2kIT3cbitpMXJj33lyE4="; - }; - - installPhase = '' - runHook preInstall - tar xf ${finalAttrs.src} - mkdir -p $out/share/java - cp *.jar $out/share/java/ - runHook postInstall - ''; - - meta = { - description = "Provides additional methods to manipulate standard Java library classes"; - homepage = "https://commons.apache.org/proper/commons-lang"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ copumpkin ]; - platforms = with lib.platforms; unix; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - }; -}) diff --git a/pkgs/development/libraries/java/commons/logging/default.nix b/pkgs/development/libraries/java/commons/logging/default.nix deleted file mode 100644 index f7debe8a7bdc..000000000000 --- a/pkgs/development/libraries/java/commons/logging/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "commons-logging"; - version = "1.3.1"; - - src = fetchurl { - url = "mirror://apache/commons/logging/binaries/commons-logging-${version}-bin.tar.gz"; - sha256 = "sha256-mM85vfWDc88fNwwflvnRvoh/tb+jDH3o+96RZa9Sp7w="; - }; - - installPhase = '' - mkdir -p $out/share/java - cp commons-logging-*.jar $out/share/java/ - ''; - - meta = { - description = "Wrapper around a variety of logging API implementations"; - homepage = "https://commons.apache.org/proper/commons-logging"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - }; -} - diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/development/libraries/java/commons/math/default.nix deleted file mode 100644 index ddb3b17c1dae..000000000000 --- a/pkgs/development/libraries/java/commons/math/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - version = "3.6.1"; - pname = "commons-math"; - - src = fetchurl { - url = "mirror://apache/commons/math/binaries/commons-math3-${version}-bin.tar.gz"; - sha256 = "0x4nx5pngv2n4ga11c1s4w2mf6cwydwkgs7da6wwvcjraw57bhkz"; - }; - - installPhase = '' - tar xf ${src} - mkdir -p $out/share/java - cp *.jar $out/share/java/ - ''; - - meta = { - homepage = "https://commons.apache.org/proper/commons-math/"; - description = "Library of lightweight, self-contained mathematics and statistics components"; - maintainers = with lib.maintainers; [ copumpkin ]; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.asl20; - platforms = with lib.platforms; unix; - }; -} diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix deleted file mode 100644 index c8e67edfe2b5..000000000000 --- a/pkgs/development/libraries/java/dbus-java/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, gettext, jdk8, libmatthew_java }: - -stdenv.mkDerivation rec { - pname = "dbus-java"; - version = "2.7"; - - src = fetchurl { - url = "https://dbus.freedesktop.org/releases/dbus-java/dbus-java-${version}.tar.gz"; - sha256 = "0cyaxd8x6sxmi6pklkkx45j311a6w51fxl4jc5j3inc4cailwh5y"; - }; - JAVA_HOME=jdk8; - JAVA="${jdk8}/bin/java"; - PREFIX="\${out}"; - JAVAUNIXLIBDIR="${libmatthew_java}/lib/jni"; - JAVAUNIXJARDIR="${libmatthew_java}/share/java"; - buildInputs = [ gettext jdk8 ]; - # I'm too lazy to build the documentation - preBuild = '' - sed -i -e "s|all: bin doc man|all: bin|" \ - -e "s|install: install-bin install-man install-doc|install: install-bin|" Makefile - ''; - - meta = with lib; { - platforms = platforms.linux; - maintainers = [ maintainers.sander ]; - license = licenses.afl21; - }; -} diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix deleted file mode 100644 index cbb6b35a65c9..000000000000 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{lib, stdenv, fetchurl, jdk, unzip}: - -stdenv.mkDerivation rec { - pname = "GeoIPJava"; - version = "1.2.5"; - - src = fetchurl { - url = "https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-${version}.zip"; - sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd"; - }; - nativeBuildInputs = [ unzip ]; - buildInputs = [ jdk ]; - buildPhase = - '' - cd source - javac $(find . -name \*.java) - jar cfv maxmindgeoip.jar $(find . -name \*.class) - ''; - installPhase = - '' - mkdir -p $out/share/java - cp maxmindgeoip.jar $out/share/java - ''; - meta = { - description = "GeoIP Java API"; - license = lib.licenses.lgpl21Plus; - maintainers = [ lib.maintainers.sander ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix deleted file mode 100644 index b4aaed007895..000000000000 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, makeWrapper, jre }: - -stdenv.mkDerivation rec { - pname = "hsqldb"; - 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-0+3uhZ9/xYI34QiGSnFzPv9WE9ktxlUI36M1vAxbHpQ="; - }; - - nativeBuildInputs = [ unzip makeWrapper ]; - buildInputs = [ jre ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib $out/bin - cp -R hsqldb/lib/*.jar $out/lib - - makeWrapper ${jre}/bin/java $out/bin/hsqldb --add-flags "-classpath $out/lib/hsqldb.jar org.hsqldb.server.Server" - makeWrapper ${jre}/bin/java $out/bin/runServer --add-flags "-classpath $out/lib/hsqldb.jar org.hsqldb.server.Server" - makeWrapper ${jre}/bin/java $out/bin/runManagerSwing --add-flags "-classpath $out/lib/hsqldb.jar org.hsqldb.util.DatabaseManagerSwing" - makeWrapper ${jre}/bin/java $out/bin/runWebServer --add-flags "-classpath $out/lib/hsqldb.jar org.hsqldb.server.WebServer" - makeWrapper ${jre}/bin/java $out/bin/runManager --add-flags "-classpath $out/lib/hsqldb.jar org.hsqldb.util.DatabaseManager" - makeWrapper ${jre}/bin/java $out/bin/sqltool --add-flags "-jar $out/lib/sqltool.jar" - - runHook postInstall - ''; - - meta = with lib; { - homepage = "http://hsqldb.org"; - description = "Relational, embedable database management system written in Java and a set of related tools"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - platforms = platforms.unix; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix deleted file mode 100644 index 07afdabd89b2..000000000000 --- a/pkgs/development/libraries/java/httpunit/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "httpunit"; - version = "1.7"; - - src = fetchurl { - url = "mirror://sourceforge/httpunit/httpunit-${version}.zip"; - sha256 = "09gnayqgizd8cjqayvdpkxrc69ipyxawc96aznfrgdhdiwv8l5zf"; - }; - - buildCommand = '' - cp ./* $out - ''; - - meta = with lib; { - homepage = "https://httpunit.sourceforge.net"; - platforms = platforms.unix; - license = licenses.mit; - }; -} diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix deleted file mode 100644 index 8f7282df0bb2..000000000000 --- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, ant -, jdk -, stripJavaArchivesHook -}: - -stdenv.mkDerivation { - pname = "hydra-ant-logger"; - version = "2010.2"; - - src = fetchFromGitHub { - owner = "NixOS"; - repo = "hydra-ant-logger"; - rev = "dae3224f4ed42418d3492bdf5bee4f825819006f"; - hash = "sha256-5oQ/jZfz7izTcYR+N801HYh4lH2MF54PCMnmA4CpRwc="; - }; - - nativeBuildInputs = [ - ant - jdk - stripJavaArchivesHook - ]; - - buildPhase = '' - runHook preBuild - mkdir lib - ant - runHook postBuild - ''; - - installPhase = '' - runHook preBuild - install -Dm644 *.jar -t $out/share/java - runHook postBuild - ''; - - meta = { - homepage = "https://github.com/NixOS/hydra-ant-logger"; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix deleted file mode 100644 index f05b45cf0489..000000000000 --- a/pkgs/development/libraries/java/jdom/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, stdenv -, fetchzip -}: - -stdenv.mkDerivation rec { - pname = "jdom"; - version = "2.0.6.1"; - - src = fetchzip { - url = "http://www.jdom.org/dist/binary/jdom-${version}.zip"; - stripRoot = false; - hash = "sha256-Y++mlO+7N5EU2NhRzLl5x5WXNqu/2tDO/NpNhfRegcg="; - }; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/java - cp -a . $out/share/java - - runHook postInstall - ''; - - meta = with lib; { - description = "Java-based solution for accessing, manipulating, and outputting XML data from Java code"; - homepage = "http://www.jdom.org"; - platforms = platforms.unix; - license = licenses.bsdOriginal; - }; -} diff --git a/pkgs/development/libraries/java/jffi/default.nix b/pkgs/development/libraries/java/jffi/default.nix deleted file mode 100644 index dddcfd1fa303..000000000000 --- a/pkgs/development/libraries/java/jffi/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, ant -, jdk -, libffi -, pkg-config -, texinfo -, stripJavaArchivesHook -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "jffi"; - version = "1.3.13"; - - src = fetchFromGitHub { - owner = "jnr"; - repo = "jffi"; - rev = "jffi-${finalAttrs.version}"; - hash = "sha256-aBQkkZyXZkaJc4sr/jHnIRaJYP116u4Jqsr9XXzfOBA="; - }; - - nativeBuildInputs = [ - ant - jdk - pkg-config - texinfo - stripJavaArchivesHook - ]; - - buildInputs = [ libffi ]; - - # The pkg-config script in the build.xml doesn't work propery - # set the lib path manually to work around this. - env.LIBFFI_LIBS = "${libffi}/lib/libffi${stdenv.hostPlatform.extensions.sharedLibrary}"; - env.ANT_ARGS = "-Duse.system.libffi=1"; - - buildPhase = '' - runHook preBuild - ant jar - ant archive-platform-jar - runHook postBuild - ''; - - doCheck = true; - - checkPhase = '' - runHook preCheck - ant test - runHook postCheck - ''; - - installPhase = '' - runHook preInstall - install -Dm644 dist/*.jar -t $out/share/java - runHook postInstall - ''; - - # nix can't detect libffi as a dependency inside the jar file, so we create - # a dummy file with the path to libffi, to make sure that nix knows about it - postFixup = '' - mkdir -p $out/nix-support - echo ${libffi} > $out/nix-support/depends - ''; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "Java Foreign Function Interface"; - homepage = "https://github.com/jnr/jffi"; - platforms = platforms.unix; - license = licenses.asl20; - maintainers = with maintainers; [ bachp ]; - }; -}) diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix deleted file mode 100644 index 3a55febff294..000000000000 --- a/pkgs/development/libraries/java/jflex/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{lib, stdenv, fetchurl, jre} : - -stdenv.mkDerivation rec { - pname = "jflex"; - version = "1.9.1"; - - src = fetchurl { - url = "http://jflex.de/release/jflex-${version}.tar.gz"; - sha256 = "sha256-4MHp7vkf9t8E1z+l6v8T86ArZ5/uFHTlzK4AciTfbfY="; - }; - - sourceRoot = "${pname}-${version}"; - - installPhase = '' - runHook preInstall - mkdir -p $out - cp -a * $out - rm -f $out/bin/jflex.bat - - patchShebangs $out - sed -i -e '/^JAVA=java/ s#java#${jre}/bin/java#' $out/bin/jflex - runHook postInstall - ''; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/jflex --version - runHook postInstallCheck - ''; - - meta = { - homepage = "https://www.jflex.de/"; - description = "Lexical analyzer generator for Java, written in Java"; - mainProgram = "jflex"; - license = lib.licenses.bsd3; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix deleted file mode 100644 index 87d5f02230e8..000000000000 --- a/pkgs/development/libraries/java/lombok/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, jdk }: - -stdenv.mkDerivation rec { - pname = "lombok"; - version = "1.18.34"; - - src = fetchurl { - url = "https://projectlombok.org/downloads/lombok-${version}.jar"; - sha256 = "sha256-wn1rKv9WJB0bB/y8xrGDcJ5rQyyA9zdO6x2CPobUuBo="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - outputs = [ "out" "bin" ]; - - buildCommand = '' - mkdir -p $out/share/java - cp $src $out/share/java/lombok.jar - - makeWrapper ${jdk}/bin/java $bin/bin/lombok \ - --add-flags "-cp ${jdk}/lib/openjdk/lib/tools.jar:$out/share/java/lombok.jar" \ - --add-flags lombok.launch.Main - ''; - - meta = { - description = "Library that can write a lot of boilerplate for your Java project"; - mainProgram = "lombok"; - platforms = lib.platforms.all; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.mit; - homepage = "https://projectlombok.org/"; - maintainers = [ lib.maintainers.CrystalGamma ]; - }; -} diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix deleted file mode 100644 index 9791c0ee4556..000000000000 --- a/pkgs/development/libraries/java/lucene/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "lucene"; - version = "1.4.3"; - - src = fetchurl { - url = "https://archive.apache.org/dist/jakarta/lucene/lucene-${version}.tar.gz"; - sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh"; - }; - - buildCommand = '' - cp -r . $out/ - ''; - - meta = with lib; { - description = "Java full-text search engine"; - platforms = platforms.unix; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix deleted file mode 100644 index 113c377240b4..000000000000 --- a/pkgs/development/libraries/java/mockobjects/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "mockobjects"; - version = "0.09"; - - src = fetchurl { - url = "mirror://sourceforge/mockobjects/mockobjects-bin-${version}.tar"; - sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz"; - }; - - # Work around the "unpacker appears to have produced no directories" - sourceRoot = "."; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/java - cp mockobjects-*.jar $out/share/java - - runHook postInstall - ''; - - meta = with lib; { - description = "Generic unit testing framework and methodology for testing any kind of code"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - platforms = platforms.unix; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 6fb5f8a14c67..7d51386c589c 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Implementation of JavaScript written in Java"; - longDescription = - '' Rhino is an open-source implementation of JavaScript written - entirely in Java. It is typically embedded into Java applications - to provide scripting to end users. - ''; + longDescription = '' + Rhino is an open-source implementation of JavaScript written + entirely in Java. It is typically embedded into Java applications + to provide scripting to end users. + ''; homepage = "http://www.mozilla.org/rhino/"; diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix deleted file mode 100644 index 3adfd4c710e2..000000000000 --- a/pkgs/development/libraries/java/smack/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "smack"; - version = "4.1.9"; - - src = fetchurl { - url = "http://www.igniterealtime.org/downloadServlet?filename=smack/smack_${lib.replaceStrings ["."] ["_"] version}.tar.gz"; - sha256 = "009x0qcxd4dkvwcjz2nla470pwbabwvg37wc21pslpw42ldi0bzp"; - }; - - sourceRoot = "."; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/java - cp libs/smack-*.jar $out/share/java - - runHook postInstall - ''; - - meta = { - description = "XMPP (Jabber) client library for instant messaging and presence"; - homepage = "http://www.igniterealtime.org/projects/smack/"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - platforms = lib.platforms.unix; - license = lib.licenses.asl20; - }; -} diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix deleted file mode 100644 index f0938df820bf..000000000000 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, python3, autoconf, automake, libtool }: - -stdenv.mkDerivation rec { - pname = "jbig2dec"; - version = "0.20"; - - src = fetchurl { - url = "https://github.com/ArtifexSoftware/jbig2dec/archive/${version}/jbig2dec-${version}.tar.gz"; - hash = "sha256-qXBTaaZjOrpTJpNFDsgCxWI5fhuCRmLegJ7ekvZ6/yE="; - }; - - postPatch = '' - patchShebangs test_jbig2dec.py - ''; - - nativeBuildInputs = [ autoconf automake libtool ]; - - # `autogen.sh` runs `configure`, and expects that any flags needed - # by `configure` (like `--host`) are passed to `autogen.sh`. - configureScript = "./autogen.sh"; - - nativeCheckInputs = [ python3 ]; - doCheck = true; - - meta = { - homepage = "https://www.jbig2dec.com/"; - description = "Decoder implementation of the JBIG2 image compression format"; - mainProgram = "jbig2dec"; - license = lib.licenses.agpl3Only; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/jbig2enc/default.nix b/pkgs/development/libraries/jbig2enc/default.nix deleted file mode 100644 index 36b100b1603c..000000000000 --- a/pkgs/development/libraries/jbig2enc/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, leptonica -, zlib -, libwebp -, giflib -, libjpeg -, libpng -, libtiff -, autoreconfHook -}: - -stdenv.mkDerivation rec { - pname = "jbig2enc"; - version = "0.29"; - - src = fetchFromGitHub { - owner = "agl"; - repo = "jbig2enc"; - rev = version; - hash = "sha256-IAL4egXgaGmCilzcryjuvOoHhahyrfGWY68GBfXXgAM="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ - leptonica - zlib - libwebp - giflib - libjpeg - libpng - libtiff - ]; - - patches = [ - (fetchpatch { - name = "fix-build-leptonica-1.83.patch"; - url = "https://github.com/agl/jbig2enc/commit/ea050190466f5336c69c6a11baa1cb686677fcab.patch"; - hash = "sha256-+kScjFgDEU9F7VOUNAhm2XBjGm49fzAH8hYhmTm8xv8="; - }) - ]; - - # We don't want to install this Python 2 script - postInstall = '' - rm "$out/bin/pdf.py" - ''; - - # This is necessary, because the resulting library has - # /tmp/nix-build-jbig2enc/src/.libs before /nix/store/jbig2enc/lib - # in its rpath, which means that patchelf --shrink-rpath removes - # the /nix/store one. By cleaning up before fixup, we ensure that - # the /tmp/nix-build-jbig2enc/src/.libs directory is gone. - preFixup = '' - make clean - ''; - - meta = { - description = "Encoder for the JBIG2 image compression format"; - license = lib.licenses.asl20; - platforms = lib.platforms.all; - homepage = "https://github.com/agl/jbig2enc"; - mainProgram = "jbig2"; - }; -} diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix deleted file mode 100644 index 8678cde4370a..000000000000 --- a/pkgs/development/libraries/jbigkit/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "jbigkit"; - version = "2.1"; - - src = fetchurl { - url = "https://www.cl.cam.ac.uk/~mgk25/jbigkit/download/${pname}-${version}.tar.gz"; - sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy"; - }; - - makeFlags = [ - "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" - "AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" - "RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" - ]; - - postPatch = '' - sed -i 's/^\(CFLAGS.*\)$/\1 -fPIC/' Makefile - - for f in Makefile libjbig/Makefile pbmtools/Makefile; do - sed -i -E 's/\bar /$(AR) /g;s/\branlib /$(RANLIB) /g' "$f" - done - ''; - - installPhase = '' - runHook preInstall - - install -D -m644 libjbig/libjbig.a $out/lib/libjbig.a - install -D -m644 libjbig/libjbig85.a $out/lib/libjbig85.a - install -D -m644 libjbig/jbig.h $out/include/jbig.h - install -D -m644 libjbig/jbig_ar.h $out/include/jbig_ar.h - install -D -m644 libjbig/jbig85.h $out/include/jbig85.h - - install -d -m755 $out/share/man/man1 - install -m644 pbmtools/*.1* $out/share/man/man1 - - install -D -m755 pbmtools/jbgtopbm $out/bin/jbgtopbm - install -D -m755 pbmtools/pbmtojbg $out/bin/pbmtojbg - install -D -m755 pbmtools/jbgtopbm85 $out/bin/jbgtopbm85 - install -D -m755 pbmtools/pbmtojbg85 $out/bin/pbmtojbg85 - - runHook postInstall - ''; - - meta = with lib; { - homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/"; - description = "Software implementation of the JBIG1 data compression standard"; - license = licenses.gpl2Plus; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/jcal/default.nix b/pkgs/development/libraries/jcal/default.nix deleted file mode 100644 index 354a5518c43d..000000000000 --- a/pkgs/development/libraries/jcal/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook -, readline -}: - -stdenv.mkDerivation rec { - pname = "jcal"; - version = "0.4.1"; - - src = fetchFromGitHub { - owner = "fzerorubigd"; - repo = "jcal"; - rev = "v${version}"; - sha256 = "0m3g3rf0ycv2dsfn9y2472fa3r0yla8pfqk6gq00nrscsc3pp4zf"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ readline ]; - - preAutoreconf = "cd sources/"; - - meta = with lib; { - description = "Jalali calendar is a small and portable free software library to manipulate date and time in Jalali calendar system"; - homepage = "http://nongnu.org/jcal/"; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix deleted file mode 100644 index dd469d3762c0..000000000000 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ ffmpeg_6-full -, fetchFromGitHub -, fetchpatch -, lib -}: - -let - version = "6.0.1-8"; -in - -(ffmpeg_6-full.override { - inherit version; # Important! This sets the ABI. - source = fetchFromGitHub { - owner = "jellyfin"; - repo = "jellyfin-ffmpeg"; - rev = "v${version}"; - hash = "sha256-29g3BUdNcFEGjHkc/1qxOGazIfg0DLDIwoiDCI/aEKc="; - }; -}).overrideAttrs (old: { - pname = "jellyfin-ffmpeg"; - - # Clobber upstream patches as they don't apply to the Jellyfin fork - patches = [ - (fetchpatch { - name = "fix_build_failure_due_to_libjxl_version_to_new"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/75b1a555a70c178a9166629e43ec2f6250219eb2"; - hash = "sha256-+2kzfPJf5piim+DqEgDuVEEX5HLwRsxq0dWONJ4ACrU="; - }) - ]; - - configureFlags = old.configureFlags ++ [ - "--extra-version=Jellyfin" - "--disable-ptx-compression" # https://github.com/jellyfin/jellyfin/issues/7944#issuecomment-1156880067 - ]; - - postPatch = '' - for file in $(cat debian/patches/series); do - patch -p1 < debian/patches/$file - done - - ${old.postPatch or ""} - ''; - - meta = with lib; { - description = "${old.meta.description} (Jellyfin fork)"; - homepage = "https://github.com/jellyfin/jellyfin-ffmpeg"; - license = licenses.gpl3; - maintainers = with maintainers; [ justinas ]; - pkgConfigModules = [ "libavutil" ]; - }; -}) diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 7541e6b0c1a3..9d3bfd1d9a64 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -41,19 +41,19 @@ stdenv.mkDerivation rec { # jemalloc is unable to correctly detect transparent hugepage support on # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support - ++ lib.optionals (stdenv.isAarch32 && lib.versionOlder version "5") [ + ++ lib.optionals (stdenv.hostPlatform.isAarch32 && lib.versionOlder version "5") [ "--disable-thp" "je_cv_thp=no" ] # AArch64 has configurable page size up to 64k. The default configuration # for jemalloc only supports 4k page sizes. - ++ lib.optional stdenv.isAarch64 "--with-lg-page=16" + ++ lib.optional stdenv.hostPlatform.isAarch64 "--with-lg-page=16" # See https://github.com/jemalloc/jemalloc/issues/1997 # Using a value of 48 should work on both emulated and native x86_64-darwin. - ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) "--with-lg-vaddr=48" + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "--with-lg-vaddr=48" ; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=array-bounds"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-error=array-bounds"; # Tries to link test binaries binaries dynamically and fails doCheck = !stdenv.hostPlatform.isStatic; diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix deleted file mode 100644 index fb6dbcea6478..000000000000 --- a/pkgs/development/libraries/jitterentropy/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "jitterentropy"; - version = "3.5.0"; - - src = fetchFromGitHub { - owner = "smuellerDD"; - repo = "jitterentropy-library"; - rev = "v${version}"; - hash = "sha256-USc9e/GyajJe58/Z201AO3Y+t3IPOOdJAaifEwvgm2Q="; - }; - - outputs = [ "out" "dev" ]; - - enableParallelBuilding = true; - hardeningDisable = [ "fortify" ]; # avoid warnings - - # prevent jitterentropy from builtin strip to allow controlling this from the derivation's - # settings. Also fixes a strange issue, where this strip may fail when cross-compiling. - installFlags = [ - "INSTALL_STRIP=install" - "PREFIX=${placeholder "out"}" - ]; - - meta = with lib; { - description = "Provides a noise source using the CPU execution timing jitter"; - homepage = "https://github.com/smuellerDD/jitterentropy-library"; - changelog = "https://github.com/smuellerDD/jitterentropy-library/raw/v${version}/CHANGES.md"; - license = with licenses; [ bsd3 /* OR */ gpl2Only ]; - platforms = platforms.linux; - maintainers = with maintainers; [ johnazoidberg c0bw3b ]; - }; -} diff --git a/pkgs/development/libraries/jose/default.nix b/pkgs/development/libraries/jose/default.nix deleted file mode 100644 index 362a084d0324..000000000000 --- a/pkgs/development/libraries/jose/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, asciidoc -, zlib, jansson, openssl -}: - -stdenv.mkDerivation rec { - pname = "jose"; - version = "14"; - - src = fetchFromGitHub { - owner = "latchset"; - repo = pname; - rev = "v${version}"; - hash = "sha256-rMNPJaCtVpbwIkMQzBNpmRct6S/NelTwjmsuB0RP6R8="; - }; - - nativeBuildInputs = [ meson pkg-config ninja asciidoc ]; - buildInputs = [ zlib jansson openssl ]; - - outputs = [ "out" "dev" "man" ]; - enableParallelBuilding = true; - - meta = { - description = "C-language implementation of Javascript Object Signing and Encryption"; - mainProgram = "jose"; - homepage = "https://github.com/latchset/jose"; - maintainers = [ ]; - license = lib.licenses.asl20; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/jpcre2/default.nix b/pkgs/development/libraries/jpcre2/default.nix deleted file mode 100644 index 51fbba13ba0c..000000000000 --- a/pkgs/development/libraries/jpcre2/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pcre2 -}: - -stdenv.mkDerivation rec { - pname = "jpcre2"; - version = "10.32.01"; - rev = version; - - src = fetchFromGitHub { - owner = "jpcre2"; - repo = "jpcre2"; - rev = "refs/tags/${version}"; - hash = "sha256-CizjxAiajDLqajZKizMRAk5UEZA+jDeBSldPyIb6Ic8="; - }; - - buildInputs = [ pcre2 ]; - - meta = with lib; { - homepage = "https://docs.neuzunix.com/jpcre2/latest/"; - description = "C++ wrapper for PCRE2 Library"; - platforms = lib.platforms.all; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix deleted file mode 100644 index 943712e2b8db..000000000000 --- a/pkgs/development/libraries/json-c/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "json-c"; - version = "0.17"; - - src = fetchFromGitHub { - owner = "json-c"; - repo = "json-c"; - rev = "json-c-0.17-20230812"; - hash = "sha256-R5KIJ0xVgGqffjzJaZvvvhAneJ+ZBuanyF6KYTTxb58="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "JSON implementation in C"; - longDescription = '' - JSON-C implements a reference counting object model that allows you to - easily construct JSON objects in C, output them as JSON formatted strings - and parse JSON formatted strings back into the C representation of JSON - objects. - ''; - homepage = "https://github.com/json-c/json-c/wiki"; - changelog = "https://github.com/json-c/json-c/blob/${finalAttrs.src.rev}/ChangeLog"; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - license = licenses.mit; - }; -}) diff --git a/pkgs/development/libraries/json-fortran/default.nix b/pkgs/development/libraries/json-fortran/default.nix deleted file mode 100644 index c54965b386d9..000000000000 --- a/pkgs/development/libraries/json-fortran/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, gfortran, cmake }: - -stdenv.mkDerivation rec { - pname = "json-fortran"; - version = "9.0.2"; - - src = fetchFromGitHub { - owner = "jacobwilliams"; - repo = pname; - rev = version; - hash = "sha256-mAdagehmj1s6nTDaJqwaYrirfkyIwiTWYge0ZWQBc6g="; - }; - - nativeBuildInputs = [ - cmake - gfortran - ]; - - cmakeFlags = [ - "-DUSE_GNU_INSTALL_CONVENTION=ON" - ]; - - # Due to some misconfiguration in CMake the Fortran modules end up in $out/$out. - # Move them back to the desired location. - postInstall = '' - mv $out/$out/include $out/. - rm -r $out/nix - ''; - - meta = with lib; { - description = "Modern Fortran JSON API"; - homepage = "https://github.com/jacobwilliams/json-fortran"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.sheepforce ]; - }; -} diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix deleted file mode 100644 index 9a04f8b1f4ef..000000000000 --- a/pkgs/development/libraries/json-glib/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ lib -, stdenv -, fetchurl -, glib -, meson -, ninja -, nixosTests -, pkg-config -, gettext -, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages -, buildPackages -, gobject-introspection -, gi-docgen -, libxslt -, fixDarwinDylibNames -, gnome -}: - -stdenv.mkDerivation rec { - pname = "json-glib"; - version = "1.8.0"; - - outputs = [ "out" "dev" "installedTests" ] - ++ lib.optional withIntrospection "devdoc"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "l+9euSyoEQOa1Qpl8GYz8armR5J4kwe+cXB5XYsxlFQ="; - }; - - patches = [ - # Add option for changing installation path of installed tests. - ./meson-add-installed-tests-prefix-option.patch - ]; - - strictDeps = true; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - glib - libxslt - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - fixDarwinDylibNames - ] ++ lib.optionals withIntrospection [ - gobject-introspection - gi-docgen - ]; - - propagatedBuildInputs = [ - glib - ]; - - mesonFlags = [ - "-Dinstalled_test_prefix=${placeholder "installedTests"}" - (lib.mesonEnable "introspection" withIntrospection) - (lib.mesonEnable "gtk_doc" withIntrospection) - ]; - - # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) - # it should be a build-time dep for build - # TODO: send upstream - postPatch = '' - substituteInPlace doc/meson.build \ - --replace "'gi-docgen', ver" "'gi-docgen', native:true, ver" \ - --replace "'gi-docgen', req" "'gi-docgen', native:true, req" - ''; - - doCheck = true; - - postFixup = '' - # Move developer documentation to devdoc output. - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - if [[ -d "$out/share/doc" ]]; then - find -L "$out/share/doc" -type f -regex '.*\.devhelp2?' -print0 \ - | while IFS= read -r -d ''' file; do - moveToOutput "$(dirname "''${file/"$out/"/}")" "$devdoc" - done - fi - ''; - - passthru = { - tests = { - installedTests = nixosTests.installed-tests.json-glib; - }; - - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "Library providing (de)serialization support for the JavaScript Object Notation (JSON) format"; - homepage = "https://gitlab.gnome.org/GNOME/json-glib"; - license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch b/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch deleted file mode 100644 index ff09a0115587..000000000000 --- a/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/json-glib/tests/meson.build b/json-glib/tests/meson.build -index 1eb56c8..dca444e 100644 ---- a/json-glib/tests/meson.build -+++ b/json-glib/tests/meson.build -@@ -21,8 +21,9 @@ test_data = [ - 'stream-load.json', - ] - --installed_test_bindir = join_paths(json_libexecdir, 'installed-tests', json_api_name) --installed_test_datadir = join_paths(json_datadir, 'installed-tests', json_api_name) -+installed_test_prefix = get_option('installed_test_prefix') -+installed_test_bindir = join_paths(installed_test_prefix, 'libexec', 'installed-tests', json_api_name) -+installed_test_datadir = join_paths(installed_test_prefix, 'share', 'installed-tests', json_api_name) - - install_data(test_data, install_dir: installed_test_bindir) - -diff --git a/meson_options.txt b/meson_options.txt -index 5a96998..383aa6c 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -13,3 +13,6 @@ option('tests', - option('nls', - type: 'feature', value: 'auto', yield: true, - description: 'Enable native language support (translations)') -+option('installed_test_prefix', -+ description: 'Prefix for installed tests', -+ type: 'string') diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix deleted file mode 100644 index f7b6d1c4baab..000000000000 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, python3 -, validatePkgConfig -, secureMemory ? false -, enableStatic ? stdenv.hostPlatform.isStatic -}: - -stdenv.mkDerivation rec { - pname = "jsoncpp"; - version = "1.9.5"; - - outputs = ["out" "dev"]; - - src = fetchFromGitHub { - owner = "open-source-parsers"; - repo = "jsoncpp"; - rev = version; - sha256 = "sha256-OyfJD19g8cT9wOD0hyJyEw4TbaxZ9eY04396U/7R+hs="; - }; - - /* During darwin bootstrap, we have a cp that doesn't understand the - * --reflink=auto flag, which is used in the default unpackPhase for dirs - */ - unpackPhase = '' - cp -a ${src} ${src.name} - chmod -R +w ${src.name} - export sourceRoot=${src.name} - ''; - - postPatch = lib.optionalString secureMemory '' - sed -i 's/#define JSONCPP_USING_SECURE_MEMORY 0/#define JSONCPP_USING_SECURE_MEMORY 1/' include/json/version.h - ''; - - nativeBuildInputs = [ cmake python3 validatePkgConfig ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_OBJECT_LIBS=OFF" - "-DJSONCPP_WITH_CMAKE_PACKAGE=ON" - "-DBUILD_STATIC_LIBS=${if enableStatic then "ON" else "OFF"}" - ] - # the test's won't compile if secureMemory is used because there is no - # comparison operators and conversion functions between - # std::basic_string<..., Json::SecureAllocator<char>> vs. - # std::basic_string<..., [default allocator]> - ++ lib.optional ((stdenv.buildPlatform != stdenv.hostPlatform) || secureMemory) "-DJSONCPP_WITH_TESTS=OFF"; - - meta = with lib; { - homepage = "https://github.com/open-source-parsers/jsoncpp"; - description = "C++ library for interacting with JSON"; - 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 deleted file mode 100644 index 8071fce57ef9..000000000000 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, glib -, json-glib -, pkg-config -, gobject-introspection -, vala -, gi-docgen -, gnome -}: - -stdenv.mkDerivation rec { - pname = "jsonrpc-glib"; - version = "3.44.1"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "E2HRfpyAVkav5RAuWbr4ykUCOGAPyr0BWGxlS3i7MN8="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - vala - gi-docgen - ]; - - buildInputs = [ - glib - json-glib - ]; - - mesonFlags = [ - "-Denable_gtk_doc=true" - ]; - - # Tests fail non-deterministically - # https://gitlab.gnome.org/GNOME/jsonrpc-glib/issues/2 - doCheck = false; - - postFixup = '' - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput "share/doc" "$devdoc" - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "Library to communicate using the JSON-RPC 2.0 specification"; - homepage = "https://gitlab.gnome.org/GNOME/jsonrpc-glib"; - license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/judy/cross.patch b/pkgs/development/libraries/judy/cross.patch deleted file mode 100644 index a4e53c08a6d6..000000000000 --- a/pkgs/development/libraries/judy/cross.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/Judy1/Makefile.am -+++ b/src/Judy1/Makefile.am -@@ -18,7 +18,7 @@ - libinline_la_CFLAGS = $(AM_CFLAGS) -DJUDYGETINLINE - - Judy1Tables.c: Judy1TablesGen.c -- $(CC) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o Judy1TablesGen Judy1TablesGen.c; ./Judy1TablesGen -+ $(CC_FOR_BUILD) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o Judy1TablesGen Judy1TablesGen.c; ./Judy1TablesGen - - Judy1ByCount.c:../JudyCommon/JudyByCount.c - cp -f ../JudyCommon/JudyByCount.c Judy1ByCount.c ---- a/src/JudyL/Makefile.am -+++ b/src/JudyL/Makefile.am -@@ -18,7 +18,7 @@ - libinline_la_CFLAGS = $(AM_CFLAGS) -DJUDYGETINLINE - - JudyLTables.c: JudyLTablesGen.c -- $(CC) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o JudyLTablesGen JudyLTablesGen.c; ./JudyLTablesGen -+ $(CC_FOR_BUILD) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o JudyLTablesGen JudyLTablesGen.c; ./JudyLTablesGen - - JudyLByCount.c: ../JudyCommon/JudyByCount.c - cp -f ../JudyCommon/JudyByCount.c JudyLByCount.c diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix deleted file mode 100644 index 618aee498466..000000000000 --- a/pkgs/development/libraries/judy/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, pkgsBuildBuild, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "judy"; - version = "1.0.5"; - - src = fetchurl { - url = "mirror://sourceforge/judy/Judy-${version}.tar.gz"; - sha256 = "1sv3990vsx8hrza1mvq3bhvv9m6ff08y4yz7swn6znszz24l0w6j"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ]; - patches = [ ./cross.patch ]; - - # Disable parallel builds as manpages lack some dependencies: - # ../tool/jhton ext/JudyHS_funcs_3.htm | grep -v '^[ ]*$' | sed -e 's/\.C//' > man/man3/JudyHS_funcs - # make[2]: *** No rule to make target 'man/man3/JSLD', needed by 'all-am'. Stop. - # Let's wait for the upstream fix similar to https://sourceforge.net/p/judy/patches/4/ - enableParallelBuilding = false; - - meta = { - homepage = "https://judy.sourceforge.net/"; - license = lib.licenses.lgpl21Plus; - description = "State-of-the-art C library that implements a sparse dynamic array"; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix deleted file mode 100644 index 517746aa9b53..000000000000 --- a/pkgs/development/libraries/jxrlib/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: - -stdenv.mkDerivation rec { - pname = "jxrlib"; - version = "1.1"; - - # Use the source from a fork on github because CodePlex does not - # deliver an easily downloadable tarball. - src = fetchFromGitHub { - owner = "4creators"; - repo = pname; - rev = "f7521879862b9085318e814c6157490dd9dbbdb4"; - sha256 = "0rk3hbh00nw0wgbfbqk1szrlfg3yq7w6ar16napww3nrlm9cj65w"; - }; - - patches = [ - (fetchpatch { - url = "https://salsa.debian.org/debian-phototools-team/jxrlib/-/raw/df96f9b9c1fbe9cdc97589c337f8a948bc81c4d0/debian/patches/usecmake.patch"; - sha256 = "sha256-BpCToLgA5856PZk5mXlwAy3Oh9aYP/2wvu2DXDTqufM="; - }) - (fetchpatch { - url = "https://salsa.debian.org/debian-phototools-team/jxrlib/-/raw/6c88037293aff8d5bc8a76ea32b36781c430ede3/debian/patches/bug803743.patch"; - sha256 = "sha256-omIGa+ZrWjaH/IkBn4jgjufF/HEDKw69anVCX4hw+xQ="; - }) - (fetchpatch { - url = "https://salsa.debian.org/debian-phototools-team/jxrlib/-/raw/b23d49062ec6a9b2739c9dade86be525a72fc807/debian/patches/pkg-config.patch"; - sha256 = "sha256-ZACaXEi+rbKIFBHtSBheyFfqV2HYsKKrT+SmTShyUhg="; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - strictDeps = true; - - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; - - meta = with lib; { - description = "Implementation of the JPEG XR image codec standard"; - homepage = "https://jxrlib.codeplex.com"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/development/libraries/kcp/default.nix b/pkgs/development/libraries/kcp/default.nix deleted file mode 100644 index b473419bfdf2..000000000000 --- a/pkgs/development/libraries/kcp/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "kcp"; - version = "1.7"; - - src = fetchFromGitHub { - owner = "skywind3000"; - repo = "kcp"; - rev = version; - hash = "sha256-yW40x4T++4rB7hoabGN8qiSN7octyoUYEfE9oDlLxjU="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Fast and Reliable ARQ Protocol"; - homepage = "https://github.com/skywind3000/kcp"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh index 8d86ab1d54ad..e576dbb4ec73 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh @@ -6,53 +6,53 @@ addEnvHooks "$targetOffset" ecmEnvHook ecmPostHook() { # Because we need to use absolute paths here, we must set *all* the paths. - cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}" - cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin" - cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin" - cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib" - cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/libexec" - cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake" - cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include" - cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var" - cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputBin}/share" - cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputBin}/share" - cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputBin}/share/doc/HTML" - cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputBin}/share/config.kcfg" - cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputBin}/share/kconf_update" - cmakeFlags+=" -DKDE_INSTALL_KSERVICES5DIR=${!outputBin}/share/kservices5" - cmakeFlags+=" -DKDE_INSTALL_KSERVICETYPES5DIR=${!outputBin}/share/kservicetypes5" - cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputBin}/share/kxmlgui5" - cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputBin}/share/knotifications5" - cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons" - cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale" - cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds" - cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates" - cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers" - cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputBin}/share/applications" - cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputBin}/share/desktop-directories" - cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputBin}/share/mime/packages" - cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputBin}/share/appdata" - cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputBin}/share/man" - cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputBin}/share/info" - cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputBin}/share/dbus-1" - cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputBin}/share/dbus-1/interfaces" - cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputBin}/share/dbus-1/services" - cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputBin}/share/dbus-1/system-services" - cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputBin}/etc" - cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputBin}/etc/xdg" - cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputBin}/etc/xdg/autostart" + appendToVar cmakeFlags "-DKDE_INSTALL_EXECROOTDIR=${!outputBin}" + appendToVar cmakeFlags "-DKDE_INSTALL_BINDIR=${!outputBin}/bin" + appendToVar cmakeFlags "-DKDE_INSTALL_SBINDIR=${!outputBin}/sbin" + appendToVar cmakeFlags "-DKDE_INSTALL_LIBDIR=${!outputLib}/lib" + appendToVar cmakeFlags "-DKDE_INSTALL_LIBEXECDIR=${!outputLib}/libexec" + appendToVar cmakeFlags "-DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake" + appendToVar cmakeFlags "-DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include" + appendToVar cmakeFlags "-DKDE_INSTALL_LOCALSTATEDIR=/var" + appendToVar cmakeFlags "-DKDE_INSTALL_DATAROOTDIR=${!outputBin}/share" + appendToVar cmakeFlags "-DKDE_INSTALL_DATADIR=${!outputBin}/share" + appendToVar cmakeFlags "-DKDE_INSTALL_DOCBUNDLEDIR=${!outputBin}/share/doc/HTML" + appendToVar cmakeFlags "-DKDE_INSTALL_KCFGDIR=${!outputBin}/share/config.kcfg" + appendToVar cmakeFlags "-DKDE_INSTALL_KCONFUPDATEDIR=${!outputBin}/share/kconf_update" + appendToVar cmakeFlags "-DKDE_INSTALL_KSERVICES5DIR=${!outputBin}/share/kservices5" + appendToVar cmakeFlags "-DKDE_INSTALL_KSERVICETYPES5DIR=${!outputBin}/share/kservicetypes5" + appendToVar cmakeFlags "-DKDE_INSTALL_KXMLGUI5DIR=${!outputBin}/share/kxmlgui5" + appendToVar cmakeFlags "-DKDE_INSTALL_KNOTIFY5RCDIR=${!outputBin}/share/knotifications5" + appendToVar cmakeFlags "-DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons" + appendToVar cmakeFlags "-DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale" + appendToVar cmakeFlags "-DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds" + appendToVar cmakeFlags "-DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates" + appendToVar cmakeFlags "-DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers" + appendToVar cmakeFlags "-DKDE_INSTALL_APPDIR=${!outputBin}/share/applications" + appendToVar cmakeFlags "-DKDE_INSTALL_DESKTOPDIR=${!outputBin}/share/desktop-directories" + appendToVar cmakeFlags "-DKDE_INSTALL_MIMEDIR=${!outputBin}/share/mime/packages" + appendToVar cmakeFlags "-DKDE_INSTALL_METAINFODIR=${!outputBin}/share/appdata" + appendToVar cmakeFlags "-DKDE_INSTALL_MANDIR=${!outputBin}/share/man" + appendToVar cmakeFlags "-DKDE_INSTALL_INFODIR=${!outputBin}/share/info" + appendToVar cmakeFlags "-DKDE_INSTALL_DBUSDIR=${!outputBin}/share/dbus-1" + appendToVar cmakeFlags "-DKDE_INSTALL_DBUSINTERFACEDIR=${!outputBin}/share/dbus-1/interfaces" + appendToVar cmakeFlags "-DKDE_INSTALL_DBUSSERVICEDIR=${!outputBin}/share/dbus-1/services" + appendToVar cmakeFlags "-DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputBin}/share/dbus-1/system-services" + appendToVar cmakeFlags "-DKDE_INSTALL_SYSCONFDIR=${!outputBin}/etc" + appendToVar cmakeFlags "-DKDE_INSTALL_CONFDIR=${!outputBin}/etc/xdg" + appendToVar cmakeFlags "-DKDE_INSTALL_AUTOSTARTDIR=${!outputBin}/etc/xdg/autostart" if [ "$(uname)" = "Darwin" ]; then - cmakeFlags+=" -DKDE_INSTALL_BUNDLEDIR=${!outputBin}/Applications/KDE" + appendToVar cmakeFlags "-DKDE_INSTALL_BUNDLEDIR=${!outputBin}/Applications/KDE" fi if [ -n "${qtPluginPrefix-}" ]; then - cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/$qtPluginPrefix" - cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputBin}/$qtPluginPrefix" + appendToVar cmakeFlags "-DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/$qtPluginPrefix" + appendToVar cmakeFlags "-DKDE_INSTALL_PLUGINDIR=${!outputBin}/$qtPluginPrefix" fi if [ -n "${qtQmlPrefix-}" ]; then - cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix" + appendToVar cmakeFlags "-DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix" fi } postHooks+=(ecmPostHook) diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index 0ad7cfbbb7e1..4e9a2a465214 100644 --- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, mkDerivation, propagate, extra-cmake-modules, kcoreaddons, qttools, - enablePolkit ? stdenv.isLinux, polkit-qt + enablePolkit ? stdenv.hostPlatform.isLinux, polkit-qt }: mkDerivation { diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 4b52cd95b710..d40c5a0a95e2 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -22,7 +22,7 @@ mkDerivation { outputs = [ "out" "dev" ]; patches = [ ./kdoctools-no-find-docbook-xml.patch ] # kf.doctools.core: Error: Could not find kdoctools catalogs - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ (fetchpatch { name = "kdoctools-relocate-datapath.patch"; url = "https://github.com/msys2/MINGW-packages/raw/0900785a1f4e4146ab9561fb92a1c70fa70fcfc4/mingw-w64-kdoctools-qt5/0001-kdoctools-relocate-datapath.patch"; diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index 1bd1f115c6cb..32d01b261488 100644 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -18,7 +18,7 @@ mkDerivation { pname = "kfilemetadata"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ attr ] ++ [ ebook_tools diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix index 1f2620c5664d..fb18cfb287e7 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix @@ -21,7 +21,7 @@ mkDerivation { CXXFLAGS = [ ''-DNIXPKGS_KF5_KIOCORE=\"${getLib kio}/lib/libKF5KIOCore.so.5\"'' ''-DNIXPKGS_KF5_PARTS=\"${getLib kparts}/lib/libKF5Parts.so.5\"'' - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ ''-DNIXPKGS_KF5_PLASMA=\"${getLib plasma-framework}/lib/libKF5Plasma.so.5\"'' ]; setupHook = writeScript "setup-hook.sh" '' diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 522c27bf56eb..89f341f9977a 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -15,14 +15,14 @@ mkDerivation { karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications ktextwidgets kwallet kwidgetsaddons kwindowsystem qtscript qtx11extras kcrash libkrb5 - ] ++ lib.lists.optionals stdenv.isLinux [ + ] ++ lib.lists.optionals stdenv.hostPlatform.isLinux [ acl attr # both are needed for ACL support util-linux # provides libmount ]; propagatedBuildInputs = [ kbookmarks kcompletion kconfig kcoreaddons kitemviews kjobwidgets kservice kxmlgui qtbase qttools solid - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ kded ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix index 5284d673d89e..d9d5a6f70380 100644 --- a/pkgs/development/libraries/kde-frameworks/knotifications.nix +++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix @@ -11,7 +11,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ]; } diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index ccc9f76b237a..23abe70fed05 100644 --- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -15,7 +15,7 @@ mkDerivation ({ editorconfig-core-c ]; propagatedBuildInputs = [ kparts ]; -} // lib.optionalAttrs stdenv.isDarwin { +} // lib.optionalAttrs stdenv.hostPlatform.isDarwin { postPatch = '' substituteInPlace src/part/CMakeLists.txt \ --replace "kpart.desktop" "${kparts}/share/kservicetypes5/kpart.desktop" diff --git a/pkgs/development/libraries/kde-frameworks/solid/default.nix b/pkgs/development/libraries/kde-frameworks/solid/default.nix index 27160c3bda0d..e26f8bfa9a62 100644 --- a/pkgs/development/libraries/kde-frameworks/solid/default.nix +++ b/pkgs/development/libraries/kde-frameworks/solid/default.nix @@ -8,8 +8,8 @@ mkDerivation { pname = "solid"; patches = [ ./fix-search-path.patch ]; nativeBuildInputs = [ bison extra-cmake-modules flex ] - ++ lib.optionals stdenv.isLinux [ media-player-info ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ media-player-info ]; buildInputs = [ qtdeclarative qttools ]; propagatedBuildInputs = [ qtbase ]; - propagatedUserEnvPkgs = lib.optionals stdenv.isLinux [ media-player-info ]; + propagatedUserEnvPkgs = lib.optionals stdenv.hostPlatform.isLinux [ media-player-info ]; } diff --git a/pkgs/development/libraries/kerberos/0001-Define-HAVE_DB_185_H.patch b/pkgs/development/libraries/kerberos/0001-Define-HAVE_DB_185_H.patch new file mode 100644 index 000000000000..f6e2c428c634 --- /dev/null +++ b/pkgs/development/libraries/kerberos/0001-Define-HAVE_DB_185_H.patch @@ -0,0 +1,26 @@ +From 08d719e96214f648ae95043acc308deca36e1f7a Mon Sep 17 00:00:00 2001 +From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com> +Date: Tue, 15 Oct 2024 13:52:39 -0400 +Subject: [PATCH] Define HAVE_DB_185_H + +--- + cf/db.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/cf/db.m4 b/cf/db.m4 +index c0b4510b6..c95a9dee9 100644 +--- a/cf/db.m4 ++++ b/cf/db.m4 +@@ -57,6 +57,9 @@ AS_IF([test "x$with_berkeley_db" != xno], + db.h \ + ])]) + ++dnl detect if compat db_185.h is present ++AC_CHECK_HEADERS([db_185.h]) ++ + dnl db_create is used by db3 and db4 and db5 and db6 + + AC_FIND_FUNC_NO_LIBS(db_create, [$dbheader] db-6 db-5 db4 db3 db, [ +-- +2.46.0 + diff --git a/pkgs/development/libraries/kerberos/0001-Include-db.h-for-nbdb-compat-mode.patch b/pkgs/development/libraries/kerberos/0001-Include-db.h-for-nbdb-compat-mode.patch new file mode 100644 index 000000000000..e939332783f5 --- /dev/null +++ b/pkgs/development/libraries/kerberos/0001-Include-db.h-for-nbdb-compat-mode.patch @@ -0,0 +1,25 @@ +From 749d9451293f9d9f8a3f506401cae369003aeebf Mon Sep 17 00:00:00 2001 +From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com> +Date: Sun, 13 Oct 2024 17:16:13 -0400 +Subject: [PATCH] Include db.h for nbdb compat mode + +--- + lib/otp/otp_db.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/otp/otp_db.c b/lib/otp/otp_db.c +index 036359c1d..32c04bc8c 100644 +--- a/lib/otp/otp_db.c ++++ b/lib/otp/otp_db.c +@@ -39,7 +39,7 @@ RCSID("$Id$"); + #include "otp_locl.h" + + #if defined(HAVE_DB_NDBM) +-# include <ndbm.h> ++# include <db.h> + #elif !defined(HAVE_NDBM) + # include "ndbm_wrap.h" + #endif +-- +2.46.0 + diff --git a/pkgs/development/libraries/kerberos/0001-Link-tests-with-libresolv.patch b/pkgs/development/libraries/kerberos/0001-Link-tests-with-libresolv.patch new file mode 100644 index 000000000000..f20128df9e01 --- /dev/null +++ b/pkgs/development/libraries/kerberos/0001-Link-tests-with-libresolv.patch @@ -0,0 +1,51 @@ +From 862900febaec4a2c70257a39374b81138ee9f168 Mon Sep 17 00:00:00 2001 +From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com> +Date: Tue, 15 Oct 2024 16:06:33 -0400 +Subject: [PATCH] Link tests with libresolv + +--- + lib/gssapi/Makefile.am | 1 + + lib/krb5/Makefile.am | 2 ++ + lib/roken/Makefile.am | 1 + + 3 files changed, 4 insertions(+) + +diff --git a/lib/gssapi/Makefile.am b/lib/gssapi/Makefile.am +index 3254866dc..db967e586 100644 +--- a/lib/gssapi/Makefile.am ++++ b/lib/gssapi/Makefile.am +@@ -403,6 +403,7 @@ LDADD = libgssapi.la \ + $(top_builddir)/lib/krb5/libkrb5.la \ + $(LIB_roken) + ++test_names_LDFLAGS = -lresolv + test_names_LDADD = $(LDADD) $(top_builddir)/lib/asn1/libasn1.la + test_context_LDADD = $(LDADD) $(top_builddir)/lib/asn1/libasn1.la $(top_builddir)/lib/wind/libwind.la + +diff --git a/lib/krb5/Makefile.am b/lib/krb5/Makefile.am +index ecce461dd..e22cfe87c 100644 +--- a/lib/krb5/Makefile.am ++++ b/lib/krb5/Makefile.am +@@ -330,6 +330,8 @@ test_rfc3961_LDADD = \ + $(LIB_hcrypto) \ + $(LIB_roken) + ++test_plugin_LDFLAGS = -lresolv ++ + if DEVELOPER_MODE + headerdeps = $(dist_libkrb5_la_SOURCES) + endif +diff --git a/lib/roken/Makefile.am b/lib/roken/Makefile.am +index 1f530c7ae..8350d7034 100644 +--- a/lib/roken/Makefile.am ++++ b/lib/roken/Makefile.am +@@ -54,6 +54,7 @@ libtest_la_CFLAGS = -DTEST_SNPRINTF -DTEST_STRPFTIME + + parse_reply_test_SOURCES = parse_reply-test.c resolve.c + parse_reply_test_CFLAGS = -DTEST_RESOLVE ++parse_reply_test_LDFLAGS = -lresolv + + test_readenv_SOURCES = test-readenv.c test-mem.c + test_auxval_SOURCES = test-auxval.c +-- +2.46.0 + diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 60b3ad00aeda..4b28f52f11d3 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -32,10 +32,10 @@ , nixosTests , withCJSON ? true -, withCapNG ? stdenv.isLinux +, withCapNG ? stdenv.hostPlatform.isLinux # libmicrohttpd should theoretically work for darwin as well, but something is broken. # It affects tests check-bx509d and check-httpkadmind. -, withMicroHTTPD ? stdenv.isLinux +, withMicroHTTPD ? stdenv.hostPlatform.isLinux , withOpenLDAP ? true , withOpenLDAPAsHDBModule ? false , withOpenSSL ? true @@ -48,13 +48,13 @@ assert lib.assertMsg (withOpenLDAPAsHDBModule -> withOpenLDAP) '' stdenv.mkDerivation { pname = "heimdal"; - version = "7.8.0-unstable-2023-11-29"; + version = "7.8.0-unstable-2024-09-10"; src = fetchFromGitHub { owner = "heimdal"; repo = "heimdal"; - rev = "3253c49544eacb33d5ad2f6f919b0696e5aab794"; - hash = "sha256-uljzQBzXrZCZjcIWfioqHN8YsbUUNy14Vo+A3vZIXzM="; + rev = "fd2d434dd375c402d803e6f948cfc6e257d3facc"; + hash = "sha256-WA3lo3eD05l7zKuKEVxudMmiG7OvjK/calaUzPQ2pWs="; }; outputs = [ "out" "dev" "man" "info" ]; @@ -66,12 +66,12 @@ stdenv.mkDerivation { perl bison flex + perlPackages.JSON texinfo - ] - ++ (with perlPackages; [ JSON ]); + ]; buildInputs = [ db libedit pam ] - ++ lib.optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ CoreFoundation Security SystemConfiguration ] ++ lib.optionals (withCJSON) [ cjson ] ++ lib.optionals (withCapNG) [ libcap_ng ] ++ lib.optionals (withMicroHTTPD) [ libmicrohttpd ] @@ -109,6 +109,15 @@ stdenv.mkDerivation { "--with-sqlite3=${sqlite.dev}" ]; + patches = [ + # Proposed @ https://github.com/heimdal/heimdal/pull/1262 + ./0001-Include-db.h-for-nbdb-compat-mode.patch + # Proposed @ https://github.com/heimdal/heimdal/pull/1264 + ./0001-Define-HAVE_DB_185_H.patch + # Proposed @ https://github.com/heimdal/heimdal/pull/1265 + ./0001-Link-tests-with-libresolv.patch + ]; + # (check-ldap) slapd resides within ${openldap}/libexec, # which is not part of $PATH by default. # (check-ldap) prepending ${openldap}/bin to the path to avoid @@ -117,22 +126,20 @@ stdenv.mkDerivation { # (check-ldap) the bdb backend got deprecated in favour of mdb in openldap 2.5.0, # but the heimdal tests still seem to expect bdb as the openldap backend. # This might be fixed upstream in a future update. - patchPhase = '' - runHook prePatch - + postPatch = '' substituteInPlace tests/ldap/slapd-init.in \ - --replace 'SCHEMA_PATHS="' 'SCHEMA_PATHS="${openldap}/etc/schema ' + --replace-fail 'SCHEMA_PATHS="' 'SCHEMA_PATHS="${openldap}/etc/schema ' substituteInPlace tests/ldap/check-ldap.in \ - --replace 'PATH=' 'PATH=${openldap}/libexec:${openldap}/bin:' + --replace-fail 'PATH=' 'PATH=${openldap}/libexec:${openldap}/bin:' substituteInPlace tests/ldap/slapd.conf \ - --replace 'database bdb' 'database mdb' - - runHook postPatch + --replace-fail 'database bdb' 'database mdb' + substituteInPlace tests/kdc/check-iprop.in \ + --replace-fail '/bin/pwd' 'pwd' ''; # (test_cc) heimdal uses librokens implementation of `secure_getenv` on darwin, # which expects either USER or LOGNAME to be set. - preCheck = lib.optionalString (stdenv.isDarwin) '' + preCheck = lib.optionalString (stdenv.hostPlatform.isDarwin) '' export USER=nix-builder ''; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index f48a2136ad11..cf429432c447 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -43,6 +43,10 @@ stdenv.mkDerivation rec { # stdenv will take care of overriding bindir, sbindir, etc. such that "out" contains the binaries. prefix = builtins.placeholder "lib"; + env = lib.optionalAttrs stdenv.hostPlatform.isStatic { + NIX_CFLAGS_COMPILE = "-fcommon"; + }; + configureFlags = [ "--localstatedir=/var/lib" (lib.withFeature withLdap "ldap") @@ -52,7 +56,7 @@ stdenv.mkDerivation rec { # krb5's ./configure does not allow passing --enable-shared and --enable-static at the same time. # See https://bbs.archlinux.org/viewtopic.php?pid=1576737#p1576737 ++ lib.optionals staticOnly [ "--enable-static" "--disable-shared" ] - ++ lib.optional stdenv.isFreeBSD ''WARN_CFLAGS='' + ++ lib.optional stdenv.hostPlatform.isFreeBSD ''WARN_CFLAGS='' ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "krb5_cv_attr_constructor_destructor=yes,yes" "ac_cv_func_regcomp=yes" @@ -61,7 +65,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ byacc perl pkg-config ] # Provides the mig command used by the build scripts - ++ lib.optional stdenv.isDarwin bootstrap_cmds; + ++ lib.optional stdenv.hostPlatform.isDarwin bootstrap_cmds; buildInputs = [ openssl ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "bionic" && !(stdenv.hostPlatform.useLLVM or false)) [ keyutils ] @@ -69,7 +73,7 @@ stdenv.mkDerivation rec { ++ lib.optionals withLibedit [ libedit ] ++ lib.optionals withVerto [ libverto ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk; [ + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk; [ libs.xpc frameworks.Kerberos ]); diff --git a/pkgs/development/libraries/keystone/default.nix b/pkgs/development/libraries/keystone/default.nix deleted file mode 100644 index 278385a1fd66..000000000000 --- a/pkgs/development/libraries/keystone/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, pkg-config -, cmake -, python3 -, fixDarwinDylibNames -}: - -stdenv.mkDerivation rec { - pname = "keystone"; - version = "0.9.2"; - - src = fetchFromGitHub { - owner = "keystone-engine"; - repo = pname; - rev = version; - sha256 = "020d1l1aqb82g36l8lyfn2j8c660mm6sh1nl4haiykwgdl9xnxfa"; - }; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_INSTALL_LIBDIR=lib" - ]; - - nativeBuildInputs = [ - pkg-config - cmake - python3 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # TODO: could be replaced by setting CMAKE_INSTALL_NAME_DIR? - fixDarwinDylibNames - ]; - - meta = with lib; { - description = "Lightweight multi-platform, multi-architecture assembler framework"; - homepage = "https://www.keystone-engine.org"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ luc65r ]; - mainProgram = "kstool"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix deleted file mode 100644 index 56dbe1fa9179..000000000000 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }: - -stdenv.mkDerivation rec { - pname = "opencl-icd-loader"; - version = "2024.05.08"; - - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "OpenCL-ICD-Loader"; - rev = "v${version}"; - hash = "sha256-wFwc1ku3FNEH2k8TJij2sT7JspWorR/XbxXwPZaQcGA="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ opencl-headers ]; - - cmakeFlags = [ - (lib.cmakeBool "OCL_ICD_ENABLE_TRACE" withTracing) - ]; - - meta = with lib; { - description = "Official Khronos OpenCL ICD Loader"; - mainProgram = "cllayerinfo"; - homepage = "https://github.com/KhronosGroup/OpenCL-ICD-Loader"; - license = licenses.asl20; - maintainers = with maintainers; [ davidtwco ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix deleted file mode 100644 index 0347339205c6..000000000000 --- a/pkgs/development/libraries/kmsxx/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, cmake -, pkg-config -, libdrm -, fmt -, libevdev -, withPython ? false -, python3Packages -}: - -stdenv.mkDerivation { - pname = "kmsxx"; - version = "2021-07-26"; - - src = fetchFromGitHub { - owner = "tomba"; - repo = "kmsxx"; - fetchSubmodules = true; - rev = "54f591ec0de61dd192baf781c9b2ec87d5b461f7"; - hash = "sha256-j+20WY4a2iTKZnYjXhxbNnZZ53K3dHpDMTp+ZulS+7c="; - }; - - # Didn't detect pybind11 without cmake - nativeBuildInputs = [ meson ninja pkg-config ] ++ lib.optionals withPython [ cmake ]; - buildInputs = [ libdrm fmt libevdev ] - ++ lib.optionals withPython (with python3Packages; [ python pybind11 ]); - - dontUseCmakeConfigure = true; - - mesonFlags = lib.optional (!withPython) "-Dpykms=disabled"; - - meta = with lib; { - description = "C++11 library, utilities and python bindings for Linux kernel mode setting"; - homepage = "https://github.com/tomba/kmsxx"; - license = licenses.mpl20; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/kronosnet/default.nix b/pkgs/development/libraries/kronosnet/default.nix deleted file mode 100644 index dc73e71111c4..000000000000 --- a/pkgs/development/libraries/kronosnet/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, autoreconfHook, pkg-config -, libqb, libxml2, libnl, lksctp-tools -, nss, openssl, bzip2, lzo, lz4, xz, zlib, zstd -, doxygen -}: - -stdenv.mkDerivation rec { - pname = "kronosnet"; - version = "1.29"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-GRjoNNF9jW2uNQAJjOM9TQtq9rS+12s94LhCXQr5aoQ="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; - - buildInputs = [ - libqb libxml2 libnl lksctp-tools - nss openssl - bzip2 lzo lz4 xz zlib zstd - ]; - - meta = with lib; { - description = "VPN on steroids"; - homepage = "https://kronosnet.org/"; - license = with licenses; [ lgpl21Plus gpl2Plus ]; - maintainers = with maintainers; [ ryantm ]; - }; -} diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix deleted file mode 100644 index 5c5ab34bc24c..000000000000 --- a/pkgs/development/libraries/kyotocabinet/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, zlib }: - -stdenv.mkDerivation rec { - pname = "kyotocabinet"; - version = "1.2.80"; - - src = fetchurl { - url = "https://dbmx.net/kyotocabinet/pkg/kyotocabinet-${version}.tar.gz"; - sha256 = "sha256-TIXXNmaNgpIL/b25KsPWa32xEI8JWBp2ndkWCgLe80k="; - }; - - prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace kccommon.h \ - --replace tr1/unordered_map unordered_map \ - --replace tr1/unordered_set unordered_set \ - --replace tr1::hash std::hash \ - --replace tr1::unordered_map std::unordered_map \ - --replace tr1::unordered_set std::unordered_set - - substituteInPlace lab/kcdict/Makefile --replace stdc++ c++ - substituteInPlace configure \ - --replace /usr/local/bin:/usr/local/sbin: "" \ - --replace /usr/bin:/usr/sbin: "" \ - --replace /bin:/sbin: "" \ - --replace stdc++ c++ - ''; - - buildInputs = [ zlib ]; - - meta = with lib; { - homepage = "https://dbmx.net/kyotocabinet"; - description = "Library of routines for managing a database"; - license = licenses.gpl3Plus; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix deleted file mode 100644 index 6032e7051b99..000000000000 --- a/pkgs/development/libraries/lame/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchurl -, nasmSupport ? true, nasm # Assembly optimizations -, cpmlSupport ? true # Compaq's fast math library -#, efenceSupport ? false, libefence # Use ElectricFence for malloc debugging -, sndfileFileIOSupport ? false, libsndfile # Use libsndfile, instead of lame's internal routines -, analyzerHooksSupport ? true # Use analyzer hooks -, decoderSupport ? true # mpg123 decoder -, frontendSupport ? true # Build the lame executable -#, mp3xSupport ? false, gtk1 # Build GTK frame analyzer -, mp3rtpSupport ? false # Build mp3rtp -, debugSupport ? false # Debugging (disables optimizations) -}: - -stdenv.mkDerivation rec { - pname = "lame"; - version = "3.100"; - - src = fetchurl { - url = "mirror://sourceforge/lame/${pname}-${version}.tar.gz"; - sha256 = "07nsn5sy3a8xbmw1bidxnsj5fj6kg9ai04icmqw40ybkp353dznx"; - }; - - outputs = [ "out" "lib" "doc" ]; # a small single header - outputMan = "out"; - - nativeBuildInputs = [ ] - ++ lib.optional nasmSupport nasm; - - buildInputs = [ ] - #++ optional efenceSupport libefence - #++ optional mp3xSupport gtk1 - ++ lib.optional sndfileFileIOSupport libsndfile; - - configureFlags = [ - (lib.enableFeature nasmSupport "nasm") - (lib.enableFeature cpmlSupport "cpml") - #(enableFeature efenceSupport "efence") - (if sndfileFileIOSupport then "--with-fileio=sndfile" else "--with-fileio=lame") - (lib.enableFeature analyzerHooksSupport "analyzer-hooks") - (lib.enableFeature decoderSupport "decoder") - (lib.enableFeature frontendSupport "frontend") - (lib.enableFeature frontendSupport "dynamic-frontends") - #(enableFeature mp3xSupport "mp3x") - (lib.enableFeature mp3rtpSupport "mp3rtp") - (lib.optionalString debugSupport "--enable-debug=alot") - ]; - - preConfigure = '' - # Prevent a build failure for 3.100 due to using outdated symbol list - # https://hydrogenaud.io/index.php/topic,114777.msg946373.html#msg946373 - sed -i '/lame_init_old/d' include/libmp3lame.sym - ''; - - meta = with lib; { - description = "High quality MPEG Audio Layer III (MP3) encoder"; - homepage = "http://lame.sourceforge.net"; - license = licenses.lgpl2; - maintainers = with maintainers; [ codyopel ]; - platforms = platforms.all; - mainProgram = "lame"; - }; -} diff --git a/pkgs/development/libraries/lasem/default.nix b/pkgs/development/libraries/lasem/default.nix deleted file mode 100644 index c76a69556250..000000000000 --- a/pkgs/development/libraries/lasem/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ fetchurl, lib, stdenv, pkg-config, intltool, gobject-introspection, glib, gdk-pixbuf -, libxml2, cairo, pango, gnome }: - -stdenv.mkDerivation rec { - pname = "lasem"; - version = "0.4.4"; - - outputs = [ "bin" "out" "dev" "man" "doc" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0fds3fsx84ylsfvf55zp65y8xqjj5n8gbhcsk02vqglivk7izw4v"; - }; - - nativeBuildInputs = [ pkg-config intltool gobject-introspection ]; - - propagatedBuildInputs = [ - glib gdk-pixbuf libxml2 cairo pango - ]; - - enableParallelBuilding = true; - doCheck = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = { - description = "SVG and MathML rendering library"; - mainProgram = "lasem-render-0.4"; - - homepage = "https://github.com/LasemProject/lasem"; - license = lib.licenses.gpl2Plus; - - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix deleted file mode 100644 index 7b2965f1f730..000000000000 --- a/pkgs/development/libraries/lasso/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib, stdenv -, autoreconfHook -, fetchurl -, fetchpatch -, glib -, gobject-introspection -, gtk-doc -, libtool -, libxml2 -, libxslt -, openssl -, pkg-config -, python3 -, xmlsec -, zlib -}: - -stdenv.mkDerivation rec { - pname = "lasso"; - version = "2.8.2"; - - src = fetchurl { - url = "https://dev.entrouvert.org/lasso/lasso-${version}.tar.gz"; - hash = "sha256-ahgxv9v49CTHUIq6R7BF1RNB7A/ekSLziwuGsJbvUz4="; - }; - - patches = [ - # Fix build with xmlsec 1.3.0 - (fetchpatch { - url = "https://git.entrouvert.org/entrouvert/lasso/commit/ffaddeb015a61db3e52c391de00430107a23e2f1.patch"; - hash = "sha256-D2npxpIuR/KrNYiKO3KXCvHEb/XVXUKIP0HQUd+w56k="; - }) - ]; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - python3 - gobject-introspection - ]; - - buildInputs = [ - glib - gtk-doc - libtool - libxml2 - libxslt - openssl - python3.pkgs.six - xmlsec - zlib - ]; - - configurePhase = '' - ./configure --with-pkg-config=$PKG_CONFIG_PATH \ - --disable-perl \ - --prefix=$out - ''; - - meta = with lib; { - homepage = "https://lasso.entrouvert.org/"; - description = "Liberty Alliance Single Sign-On library"; - changelog = "https://git.entrouvert.org/entrouvert/lasso/raw/tag/v${version}/ChangeLog"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ womfoo ]; - }; -} diff --git a/pkgs/development/libraries/lcm/default.nix b/pkgs/development/libraries/lcm/default.nix deleted file mode 100644 index dcd50a6f4fe1..000000000000 --- a/pkgs/development/libraries/lcm/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, glib, pkg-config }: - -stdenv.mkDerivation rec { - pname = "lcm"; - version = "1.5.0"; - - src = fetchFromGitHub { - owner = "lcm-proj"; - repo = "lcm"; - rev = "v${version}"; - hash = "sha256-IFHoJl5OtnUb+w3gLG5f578yAektjgrY9Uj2eUVoIrc="; - }; - - outputs = [ "out" "dev" "man" ]; - - nativeBuildInputs = [ - pkg-config - cmake - ]; - - buildInputs = [ - glib - ]; - - meta = with lib; { - description = "Lightweight Communications and Marshalling (LCM)"; - homepage = "https://github.com/lcm-proj/lcm"; - license = licenses.lgpl21; - maintainers = with maintainers; [ kjeremy ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/lcms/cve-2013-4276.patch b/pkgs/development/libraries/lcms/cve-2013-4276.patch deleted file mode 100644 index 8f2f32297828..000000000000 --- a/pkgs/development/libraries/lcms/cve-2013-4276.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -ur lcms-1.19.dfsg/samples/icctrans.c lcms-1.19.dfsg-patched/samples/icctrans.c ---- lcms-1.19.dfsg/samples/icctrans.c 2009-10-30 15:57:45.000000000 +0000 -+++ lcms-1.19.dfsg-patched/samples/icctrans.c 2013-08-06 11:53:14.385266647 +0100 -@@ -86,6 +86,8 @@ - static LPcmsNAMEDCOLORLIST InputColorant = NULL; - static LPcmsNAMEDCOLORLIST OutputColorant = NULL; - -+unsigned int Buffer_size = 4096; -+ - - // isatty replacement - -@@ -500,7 +502,7 @@ - - Prefix[0] = 0; - if (!lTerse) -- sprintf(Prefix, "%s=", C); -+ snprintf(Prefix, 20, "%s=", C); - - if (InHexa) - { -@@ -648,7 +650,9 @@ - static - void GetLine(char* Buffer) - { -- scanf("%s", Buffer); -+ char User_buffer[Buffer_size]; -+ fgets(User_buffer, (Buffer_size - 1), stdin); -+ sscanf(User_buffer,"%s", Buffer); - - if (toupper(Buffer[0]) == 'Q') { // Quit? - -@@ -668,7 +672,7 @@ - static - double GetAnswer(const char* Prompt, double Range) - { -- char Buffer[4096]; -+ char Buffer[Buffer_size]; - double val = 0.0; - - if (Range == 0.0) { // Range 0 means double value -@@ -738,7 +742,7 @@ - static - WORD GetIndex(void) - { -- char Buffer[4096], Name[40], Prefix[40], Suffix[40]; -+ char Buffer[Buffer_size], Name[40], Prefix[40], Suffix[40]; - int index, max; - - max = cmsNamedColorCount(hTrans)-1; -diff -ur lcms-1.19.dfsg/tifficc/tiffdiff.c lcms-1.19.dfsg-patched/tifficc/tiffdiff.c ---- lcms-1.19.dfsg/tifficc/tiffdiff.c 2009-10-30 15:57:46.000000000 +0000 -+++ lcms-1.19.dfsg-patched/tifficc/tiffdiff.c 2013-08-06 11:49:06.698951157 +0100 -@@ -633,7 +633,7 @@ - cmsIT8SetSheetType(hIT8, "TIFFDIFF"); - - -- sprintf(Buffer, "Differences between %s and %s", TiffName1, TiffName2); -+ snprintf(Buffer, 256, "Differences between %s and %s", TiffName1, TiffName2); - - cmsIT8SetComment(hIT8, Buffer); - diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix deleted file mode 100644 index 9a957a119243..000000000000 --- a/pkgs/development/libraries/lcms/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "lcms"; - version = "1.19"; - - src = fetchurl { - url = "mirror://sourceforge/lcms/${pname}-${version}.tar.gz"; - sha256 = "1abkf8iphwyfs3z305z3qczm3z1i9idc1lz4gvfg92jnkz5k5bl0"; - }; - - patches = [ ./cve-2013-4276.patch ]; - - outputs = [ "bin" "dev" "out" "man" ]; - - doCheck = false; # fails with "Error in Linear interpolation (2p): Must be i=8000, But is n=8001" - - meta = { - description = "Color management engine"; - homepage = "http://www.littlecms.com/"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix deleted file mode 100644 index ab984884073a..000000000000 --- a/pkgs/development/libraries/lcms2/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, libtiff, libjpeg, zlib }: - -stdenv.mkDerivation rec { - pname = "lcms2"; - version = "2.16"; - - src = fetchurl { - url = "mirror://sourceforge/lcms/${pname}-${version}.tar.gz"; - hash = "sha256-2HPTSti5tM6gEGMfGmIo0gh0deTcXnY+uBrMI9nUWlE="; - }; - - outputs = [ "bin" "dev" "out" ]; - - propagatedBuildInputs = [ libtiff libjpeg zlib ]; - - # See https://trac.macports.org/ticket/60656 - LDFLAGS = if stdenv.hostPlatform.isDarwin then "-Wl,-w" else null; - - meta = with lib; { - description = "Color management engine"; - homepage = "http://www.littlecms.com/"; - license = licenses.mit; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/lcrq/default.nix b/pkgs/development/libraries/lcrq/default.nix deleted file mode 100644 index 25589d28d955..000000000000 --- a/pkgs/development/libraries/lcrq/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - stdenv, - fetchFromGitea, - lib -}: -stdenv.mkDerivation (finalAttrs: { - pname = "lcrq"; - version = "0.2.1"; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "librecast"; - repo = "lcrq"; - rev = "v${finalAttrs.version}"; - hash = "sha256-xhv1rU0CImd5vs0bMdF1eJZt2AToU/JhBsoCsCLdyyg="; - }; - - installFlags = [ "PREFIX=$(out)" ]; - - meta = { - changelog = "https://codeberg.org/librecast/lcrq/src/tag/v${finalAttrs.version}/CHANGELOG.md"; - description = "Librecast RaptorQ library"; - homepage = "https://librecast.net/lcrq.html"; - license = [ lib.licenses.gpl2 lib.licenses.gpl3 ]; - maintainers = with lib.maintainers; [ albertchae aynish DMills27 jasonodoom jleightcap ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/ldacbt/default.nix b/pkgs/development/libraries/ldacbt/default.nix deleted file mode 100644 index b11da8cb59d3..000000000000 --- a/pkgs/development/libraries/ldacbt/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "ldacBT"; - version = "2.0.2.3"; - - src = fetchFromGitHub { - repo = "ldacBT"; - owner = "ehfive"; - rev = "v${version}"; - sha256 = "09dalysx4fgrgpfdm9a51x6slnf4iik1sqba4xjgabpvq91bnb63"; - fetchSubmodules = true; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - cmake - ]; - - cmakeFlags = [ - # CMakeLists.txt by default points to $out - "-DINSTALL_INCLUDEDIR=${placeholder "dev"}/include" - ]; - - meta = with lib; { - description = "AOSP libldac dispatcher"; - homepage = "https://github.com/EHfive/ldacBT"; - license = licenses.asl20; - # libldac code detects & #error's out on non-LE byte order - platforms = platforms.littleEndian; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix deleted file mode 100644 index 80a3f725f970..000000000000 --- a/pkgs/development/libraries/ldb/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib, stdenv -, fetchurl -, python3 -, pkg-config -, readline -, tdb -, talloc -, tevent -, popt -, libxslt -, docbook-xsl-nons -, docbook_xml_dtd_42 -, cmocka -, wafHook -, buildPackages -, libxcrypt -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "ldb"; - version = "2.9.1"; - - src = fetchurl { - url = "mirror://samba/ldb/ldb-${finalAttrs.version}.tar.gz"; - hash = "sha256-yV5Nwy3qiGS3mJnuNAyf3yi0hvRku8OLqZFRoItJP5s="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - pkg-config - python3 - wafHook - libxslt - docbook-xsl-nons - docbook_xml_dtd_42 - tdb - tevent - ]; - - buildInputs = [ - python3 - readline # required to build python - tdb - talloc - tevent - popt - cmocka - libxcrypt - ]; - - # otherwise the configure script fails with - # PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make! - preConfigure = '' - export PKGCONFIG="$PKG_CONFIG" - export PYTHONHASHSEED=1 - ''; - - wafPath = "buildtools/bin/waf"; - - wafConfigureFlags = [ - "--bundled-libraries=NONE" - "--builtin-libraries=replace" - "--without-ldb-lmdb" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--cross-compile" - "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" - ]; - - # python-config from build Python gives incorrect values when cross-compiling. - # If python-config is not found, the build falls back to using the sysconfig - # module, which works correctly in all cases. - PYTHON_CONFIG = "/invalid"; - - stripDebugList = [ "bin" "lib" "modules" ]; - - passthru.tests.pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - }; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "LDAP-like embedded database"; - homepage = "https://ldb.samba.org/"; - license = licenses.lgpl3Plus; - pkgConfigModules = [ "ldb" ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix deleted file mode 100644 index 1e696b1175a4..000000000000 --- a/pkgs/development/libraries/ldns/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchurl, openssl, perl, which, dns-root-data }: - -stdenv.mkDerivation rec { - pname = "ldns"; - version = "1.8.3"; - - src = fetchurl { - url = "https://www.nlnetlabs.nl/downloads/ldns/${pname}-${version}.tar.gz"; - sha256 = "sha256-w/ct0QNrKQfjpW5qz537LlUSVrPBu9l4eULe7rcOeGA="; - }; - - postPatch = '' - patchShebangs doc/doxyparse.pl - ''; - - outputs = [ "out" "dev" "man" "examples" ]; - - nativeBuildInputs = [ perl ]; - buildInputs = [ openssl ]; - - configureFlags = [ - "--with-ssl=${openssl.dev}" - "--with-trust-anchor=${dns-root-data}/root.key" - "--with-drill" - "--disable-gost" - "--with-examples" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ]; - - nativeCheckInputs = [ which ]; - doCheck = false; # fails. missing some files - - postInstall = '' - # Only 'drill' stays in $out - # the rest are examples: - moveToOutput "bin/ldns*" "$examples" - # with exception of ldns-config, which goes to $dev: - moveToOutput "bin/ldns-config" "$dev" - ''; - - meta = with lib; { - description = "Library with the aim of simplifying DNS programming in C"; - homepage = "http://www.nlnetlabs.nl/projects/ldns/"; - license = licenses.bsd3; - maintainers = with maintainers; [ dtzWill ]; - mainProgram = "drill"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix deleted file mode 100644 index d3bd349cc8e0..000000000000 --- a/pkgs/development/libraries/leatherman/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, boost, cmake, curl, ruby }: - -stdenv.mkDerivation rec { - pname = "leatherman"; - version = "1.12.13"; - - src = fetchFromGitHub { - sha256 = "sha256-rfh4JLnLekx9UhyLH6eDJUeItPROmY/Lc6mcWpbGb3s="; - rev = version; - repo = "leatherman"; - owner = "puppetlabs"; - }; - - cmakeFlags = [ "-DLEATHERMAN_ENABLE_TESTING=OFF" ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost curl ruby ]; - - meta = with lib; { - homepage = "https://github.com/puppetlabs/leatherman/"; - description = "Collection of C++ and CMake utility libraries"; - license = licenses.asl20; - maintainers = [ maintainers.womfoo ]; - platforms = platforms.unix; - }; - -} diff --git a/pkgs/development/libraries/lemon-graph/default.nix b/pkgs/development/libraries/lemon-graph/default.nix deleted file mode 100644 index ae071a727133..000000000000 --- a/pkgs/development/libraries/lemon-graph/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchurl -, cmake -}: - -stdenv.mkDerivation rec { - pname = "lemon-graph"; - version = "1.3.1"; - - src = fetchurl { - url = "https://lemon.cs.elte.hu/pub/sources/lemon-${version}.tar.gz"; - sha256 = "1j6kp9axhgna47cfnmk1m7vnqn01hwh7pf1fp76aid60yhjwgdvi"; - }; - - nativeBuildInputs = [ cmake ]; - - # error: no viable conversion from ... - doCheck = !stdenv.isDarwin; - - patches = [ - # error: ISO C++17 does not allow 'register' storage class specifier - ./remove-register.patch - ]; - - meta = with lib; { - homepage = "https://lemon.cs.elte.hu/trac/lemon"; - description = "Efficient library for combinatorial optimization tasks on graphs and networks"; - license = licenses.boost; - maintainers = with maintainers; [ trepetti ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/lemon-graph/remove-register.patch b/pkgs/development/libraries/lemon-graph/remove-register.patch deleted file mode 100644 index 002e832035bf..000000000000 --- a/pkgs/development/libraries/lemon-graph/remove-register.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/lemon/random.h b/lemon/random.h -index 8de74ede8a..f9861f3916 100644 ---- a/lemon/random.h -+++ b/lemon/random.h -@@ -249,8 +249,8 @@ namespace lemon { - - current = state + length; - -- register Word *curr = state + length - 1; -- register long num; -+ Word *curr = state + length - 1; -+ long num; - - num = length - shift; - while (num--) { diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix deleted file mode 100644 index 8972485bb282..000000000000 --- a/pkgs/development/libraries/lensfun/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake, python3 }: - -let - version = "0.3.4"; - pname = "lensfun"; - - # Fetch a more recent version of the repo containing a more recent lens - # database - lensfunDatabase = fetchFromGitHub { - owner = "lensfun"; - repo = "lensfun"; - rev = "a1510e6f33ce9bc8b5056a823c6d5bc6b8cba033"; - sha256 = "sha256-qdONyKk873Tq11M33JmznhJMAGd4dqp5KdXdVhfy/Ak="; - }; - -in -stdenv.mkDerivation { - inherit pname version; - - src = fetchFromGitHub { - owner = "lensfun"; - repo = "lensfun"; - rev = "v${version}"; - sha256 = "sha256-FyYilIz9ssSHG6S02Z2bXy7fjSY51+SWW3v8bm7sLvY="; - }; - - # replace database with a more recent snapshot - # the master branch uses version 2 profiles, while 0.3.3 requires version 1 profiles, - # so we run the conversion tool the project provides, - # then untar the verson 1 profiles into the source dir before we build - prePatch = '' - rm -R data/db - python3 ${lensfunDatabase}/tools/lensfun_convert_db_v2_to_v1.py $TMPDIR ${lensfunDatabase}/data/db - mkdir -p data/db - tar xvf $TMPDIR/db/version_1.tar -C data/db - date +%s > data/db/timestamp.txt - ''; - - nativeBuildInputs = [ - cmake - pkg-config - python3 - python3.pkgs.setuptools - python3.pkgs.lxml # For the db converison - ]; - - buildInputs = [ glib zlib libpng ]; - - cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ]; - - meta = with lib; { - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ flokli paperdigits ]; - license = lib.licenses.lgpl3; - description = "Opensource database of photographic lenses and their characteristics"; - homepage = "https://lensfun.github.io"; - }; -} diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix deleted file mode 100644 index 12cd3f074fcb..000000000000 --- a/pkgs/development/libraries/leptonica/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, which, gnuplot -, giflib, libjpeg, libpng, libtiff, libwebp, openjpeg, zlib -}: - -stdenv.mkDerivation rec { - pname = "leptonica"; - version = "1.84.1"; - - src = fetchurl { - url = "https://github.com/DanBloomberg/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-Kz4SVLHMo4HnfIGbWcqZd0/0NTAgm5rrUR4dRliKZPY="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ giflib libjpeg libpng libtiff libwebp openjpeg zlib ]; - enableParallelBuilding = true; - - nativeCheckInputs = [ which gnuplot ]; - - # Fails on pngio_reg for unknown reason - doCheck = false; # !stdenv.isDarwin; - - meta = { - description = "Image processing and analysis library"; - homepage = "http://www.leptonica.org/"; - license = lib.licenses.bsd2; # http://www.leptonica.org/about-the-license.html - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/lerc/default.nix b/pkgs/development/libraries/lerc/default.nix deleted file mode 100644 index 463344f5b7f6..000000000000 --- a/pkgs/development/libraries/lerc/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "lerc"; - version = "4.0.0"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "esri"; - repo = "lerc"; - rev = "v${finalAttrs.version}"; - hash = "sha256-IHY9QtNYsxPz/ksxRMZGHleT+/bawfTYNVRSTAuYQ7Y="; - }; - - patches = [ - # https://github.com/Esri/lerc/pull/227 - (fetchpatch { - name = "use-cmake-install-full-dir.patch"; - url = "https://github.com/Esri/lerc/commit/5462ca7f7dfb38c65e16f5abfd96873af177a0f8.patch"; - hash = "sha256-qaNR3QwLe0AB6vu1nXOh9KhlPdWM3DmgCJj4d0VdOUk="; - }) - ]; - - nativeBuildInputs = [ - 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/lesstif/c-missing_xm_h.patch b/pkgs/development/libraries/lesstif/c-missing_xm_h.patch deleted file mode 100644 index 2d298d5f4c4e..000000000000 --- a/pkgs/development/libraries/lesstif/c-missing_xm_h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lesstif2-0.94.4.orig/include/Motif-2.1/Xm/XmStrDefs.h -+++ lesstif2-0.94.4/include/Motif-2.1/Xm/XmStrDefs.h -@@ -28,6 +28,8 @@ - - #include <X11/StringDefs.h> - -+#include <Xm/Xm.h> -+ - #ifdef __cplusplus - extern "C" { - #endif diff --git a/pkgs/development/libraries/lesstif/c-render_table_crash.patch b/pkgs/development/libraries/lesstif/c-render_table_crash.patch deleted file mode 100644 index 1699dbe19084..000000000000 --- a/pkgs/development/libraries/lesstif/c-render_table_crash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lesstif2-0.95.0.orig/lib/Xm-2.1/RenderTable.c -+++ lesstif2-0.95.0/lib/Xm-2.1/RenderTable.c -@@ -465,7 +465,7 @@ - DEBUGOUT(_LtDebug(__FILE__, w, "_XmRenderTableFinaliseTag(%s)\n", tag)); - #if 1 - /* Experimental start */ -- if (r->dpy == 0) -+ if (r->dpy == 0 && w) - r->dpy = XtDisplay(w); - /* Experimental end */ - #endif diff --git a/pkgs/development/libraries/lesstif/c-xpmpipethrough.patch b/pkgs/development/libraries/lesstif/c-xpmpipethrough.patch deleted file mode 100644 index 69f9a2464c6d..000000000000 --- a/pkgs/development/libraries/lesstif/c-xpmpipethrough.patch +++ /dev/null @@ -1,381 +0,0 @@ -Index: lesstif2-0.95.0/lib/Xm-2.1/XpmRdFToI.c -=================================================================== ---- lesstif2-0.95.0.orig/lib/Xm-2.1/XpmRdFToI.c 2004-11-18 22:00:58.000000000 +0100 -+++ lesstif2-0.95.0/lib/Xm-2.1/XpmRdFToI.c 2006-07-11 11:13:29.000000000 +0200 -@@ -44,11 +44,15 @@ - DebugUtil.h! */ - #include <stdio.h> - #include <string.h> -+#include <errno.h> - - #include <ctype.h> - #ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> - #endif -+#ifdef HAVE_SYS_WAIT_H -+#include <sys/wait.h> -+#endif - #ifdef HAVE_SYS_STAT_H - #include <sys/stat.h> - #endif -@@ -87,16 +91,6 @@ - strcpy(dst, src); \ - else return (XpmFileInvalid); } - #endif --#include <sys/stat.h> --#if !defined(NO_ZPIPE) && defined(WIN32) --# define popen _popen --# define pclose _pclose --# if defined(STAT_ZFILE) --# include <io.h> --# define stat _stat --# define fstat _fstat --# endif --#endif - - LFUNC(OpenReadFile, int, (char *filename, xpmData *mdata)); - LFUNC(xpmDataClose, void, (xpmData *mdata)); -@@ -173,90 +167,131 @@ - } - #endif /* CXPMPROG */ - --/* -- * open the given file to be read as an xpmData which is returned. -- */ - #ifndef NO_ZPIPE -- FILE *s_popen(char *cmd, const char *type); --#else --# define s_popen popen -+/* Do not depend on errno after read_through */ -+FILE* -+xpmPipeThrough(fd, cmd, arg1, mode) -+ int fd; -+ const char* cmd; -+ const char* arg1; -+ const char* mode; -+{ -+ FILE* fp; -+ int status, fds[2], in = 0, out = 1; -+ pid_t pid; -+ if ( 'w' == *mode ) -+ out = 0, in = 1; -+ if ( pipe(fds) < 0 ) -+ return NULL; -+ pid = fork(); -+ if ( pid < 0 ) -+ goto fail1; -+ if ( 0 == pid ) -+ { -+ close(fds[in]); -+ if ( dup2(fds[out], out) < 0 ) -+ goto err; -+ close(fds[out]); -+ if ( dup2(fd, in) < 0 ) -+ goto err; -+ close(fd); -+ pid = fork(); -+ if ( pid < 0 ) -+ goto err; -+ if ( 0 == pid ) -+ { -+ execlp(cmd, cmd, arg1, NULL); -+ perror(cmd); -+ goto err; -+ } -+ _exit(0); -+ err: -+ _exit(1); -+ } -+ close(fds[out]); -+ /* calling process: wait for first child */ -+ while ( waitpid(pid, &status, 0) < 0 && EINTR == errno ) -+ ; -+ if ( WIFSIGNALED(status) || -+ (WIFEXITED(status) && WEXITSTATUS(status) != 0) ) -+ goto fail2; -+ fp = fdopen(fds[in], mode); -+ if ( !fp ) -+ goto fail2; -+ close(fd); /* still open in 2nd child */ -+ return fp; -+fail1: -+ close(fds[out]); -+fail2: -+ close(fds[in]); -+ return NULL; -+} - #endif - -+/* -+ * open the given file to be read as an xpmData which is returned. -+ */ - static int - OpenReadFile(filename, mdata) - char *filename; - xpmData *mdata; - { --#ifndef NO_ZPIPE -- char buf[BUFSIZ]; --# ifdef STAT_ZFILE -- char *compressfile; -- struct stat status; --# endif --#endif -- - if (!filename) { - mdata->stream.file = (stdin); - mdata->type = XPMFILE; - } else { --#ifndef NO_ZPIPE -- size_t len = strlen(filename); -- -- if(len == 0 || -- filename[len-1] == '/') -- return(XpmOpenFailed); -- if ((len > 2) && !strcmp(".Z", filename + (len - 2))) { -- mdata->type = XPMPIPE; -- snprintf(buf, sizeof(buf), "uncompress -c \"%s\"", filename); -- if (!(mdata->stream.file = s_popen(buf, "r"))) -- return (XpmOpenFailed); -- -- } else if ((len > 3) && !strcmp(".gz", filename + (len - 3))) { -- mdata->type = XPMPIPE; -- snprintf(buf, sizeof(buf), "gunzip -qc \"%s\"", filename); -- if (!(mdata->stream.file = s_popen(buf, "r"))) -- return (XpmOpenFailed); -- -- } else { --# ifdef STAT_ZFILE -- if (!(compressfile = (char *) XpmMalloc(len + 4))) -+ int fd = open(filename, O_RDONLY); -+#if defined(NO_ZPIPE) -+ if ( fd < 0 ) -+ return XpmOpenFailed; -+#else -+ const char* ext = NULL; -+ if ( fd >= 0 ) -+ ext = strrchr(filename, '.'); -+#ifdef STAT_ZFILE /* searching for z-files if the given name not found */ -+ else -+ { -+ size_t len = strlen(filename); -+ char *compressfile = (char *) XpmMalloc(len + 4); -+ if ( !compressfile ) - return (XpmNoMemory); -- -- snprintf(compressfile, len+4, "%s.Z", filename); -- if (!stat(compressfile, &status)) { -- snprintf(buf, sizeof(buf), "uncompress -c \"%s\"", compressfile); -- if (!(mdata->stream.file = s_popen(buf, "r"))) { -+ strcpy(compressfile, filename); -+ strcpy(compressfile + len, ext = ".Z"); -+ fd = open(compressfile, O_RDONLY); -+ if ( fd < 0 ) -+ { -+ strcpy(compressfile + len, ext = ".gz"); -+ fd = open(compressfile, O_RDONLY); -+ if ( fd < 0 ) -+ { - XpmFree(compressfile); -- return (XpmOpenFailed); -- } -- mdata->type = XPMPIPE; -- } else { -- snprintf(compressfile, len+4, "%s.gz", filename); -- if (!stat(compressfile, &status)) { -- snprintf(buf, sizeof(buf), "gunzip -c \"%s\"", compressfile); -- if (!(mdata->stream.file = s_popen(buf, "r"))) { -- XpmFree(compressfile); -- return (XpmOpenFailed); -- } -- mdata->type = XPMPIPE; -- } else { --# endif --#endif -- if (!(mdata->stream.file = fopen(filename, "r"))) { --#if !defined(NO_ZPIPE) && defined(STAT_ZFILE) -- XpmFree(compressfile); --#endif -- return (XpmOpenFailed); -- } -- mdata->type = XPMFILE; --#ifndef NO_ZPIPE --# ifdef STAT_ZFILE -+ return XpmOpenFailed; - } - } - XpmFree(compressfile); --# endif - } - #endif -+ if ( ext && !strcmp(ext, ".Z") ) -+ { -+ mdata->type = XPMPIPE; -+ mdata->stream.file = xpmPipeThrough(fd, "uncompress", "-c", "r"); -+ } -+ else if ( ext && !strcmp(ext, ".gz") ) -+ { -+ mdata->type = XPMPIPE; -+ mdata->stream.file = xpmPipeThrough(fd, "gunzip", "-qc", "r"); -+ } -+ else -+#endif /* z-files */ -+ { -+ mdata->type = XPMFILE; -+ mdata->stream.file = fdopen(fd, "r"); -+ } -+ if (!mdata->stream.file) -+ { -+ close(fd); -+ return (XpmOpenFailed); -+ } - } - mdata->CommentLength = 0; - #ifdef CXPMPROG -@@ -273,15 +308,6 @@ - xpmDataClose(mdata) - xpmData *mdata; - { -- switch (mdata->type) { -- case XPMFILE: -- if (mdata->stream.file != (stdin)) -- fclose(mdata->stream.file); -- break; --#ifndef NO_ZPIPE -- case XPMPIPE: -+ if (mdata->stream.file != (stdin)) - fclose(mdata->stream.file); -- break; --#endif -- } - } -Index: lesstif2-0.95.0/lib/Xm-2.1/XpmWrFFrI.c -=================================================================== ---- lesstif2-0.95.0.orig/lib/Xm-2.1/XpmWrFFrI.c 2005-04-13 20:03:27.000000000 +0200 -+++ lesstif2-0.95.0/lib/Xm-2.1/XpmWrFFrI.c 2006-07-11 11:13:29.000000000 +0200 -@@ -50,11 +50,15 @@ - DebugUtil.h! */ - #include <stdio.h> - #include <string.h> -+#include <errno.h> - - #include <ctype.h> - #ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> - #endif -+#ifdef HAVE_SYS_WAIT_H -+#include <sys/wait.h> -+#endif - #ifdef HAVE_SYS_STAT_H - #include <sys/stat.h> - #endif -@@ -94,11 +98,6 @@ - else return (XpmFileInvalid); } - #endif - --#if !defined(NO_ZPIPE) && defined(WIN32) --# define popen _popen --# define pclose _pclose --#endif -- - /* MS Windows define a function called WriteFile @#%#&!!! */ - LFUNC(xpmWriteFile, int, (FILE *file, XpmImage *image, char *name, - XpmInfo *info)); -@@ -354,58 +353,48 @@ - fprintf(file, ",\n\"XPMENDEXT\""); - } - -+ -+#ifndef NO_ZPIPE -+FUNC(xpmPipeThrough, FILE*, (int fd, -+ const char* cmd, -+ const char* arg1, -+ const char* mode)); -+#endif -+ - /* - * open the given file to be written as an xpmData which is returned - */ --#ifndef NO_ZPIPE -- FILE *s_popen(char *cmd, const char *type); --#else --# define s_popen popen --#endif - static int - OpenWriteFile(filename, mdata) - char *filename; - xpmData *mdata; - { --#ifndef NO_ZPIPE -- char buf[BUFSIZ]; -- --#endif -- - if (!filename) { - mdata->stream.file = (stdout); - mdata->type = XPMFILE; - } else { - #ifndef NO_ZPIPE -- size_t len = strlen(filename); -- -- if(len == 0 || -- filename[0] == '/' || -- strstr(filename, "../") != NULL || -- filename[len-1] == '/') -- return(XpmOpenFailed); -- -+ size_t len; -+#endif -+ int fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0644); -+ if ( fd < 0 ) -+ return(XpmOpenFailed); -+#ifndef NO_ZPIPE -+ len = strlen(filename); - if (len > 2 && !strcmp(".Z", filename + (len - 2))) { -- snprintf(buf, sizeof(buf), "compress > \"%s\"", filename); -- if (!(mdata->stream.file = s_popen(buf, "w"))) -- return (XpmOpenFailed); -- -+ mdata->stream.file = xpmPipeThrough(fd, "compress", NULL, "w"); - mdata->type = XPMPIPE; - } else if (len > 3 && !strcmp(".gz", filename + (len - 3))) { -- snprintf(buf, sizeof(buf), "gzip -q > \"%s\"", filename); -- if (!(mdata->stream.file = s_popen(buf, "w"))) -- return (XpmOpenFailed); -- -+ mdata->stream.file = xpmPipeThrough(fd, "gzip", "-q", "w"); - mdata->type = XPMPIPE; -- } else { -+ } else - #endif -- if (!(mdata->stream.file = fopen(filename, "w"))) -- return (XpmOpenFailed); -- -+ { -+ mdata->stream.file = fdopen(fd, "w"); - mdata->type = XPMFILE; --#ifndef NO_ZPIPE - } --#endif -+ if (!mdata->stream.file) -+ return (XpmOpenFailed); - } - return (XpmSuccess); - } -@@ -417,15 +406,6 @@ - xpmDataClose(mdata) - xpmData *mdata; - { -- switch (mdata->type) { -- case XPMFILE: -- if (mdata->stream.file != (stdout)) -- fclose(mdata->stream.file); -- break; --#ifndef NO_ZPIPE -- case XPMPIPE: -+ if (mdata->stream.file != (stdout)) - fclose(mdata->stream.file); -- break; --#endif -- } - } diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix deleted file mode 100644 index 33c2f220e40d..000000000000 --- a/pkgs/development/libraries/lesstif/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, stdenv -, fetchurl -, freetype -, fontconfig -, libICE -, libX11 -, libXp -, libXau -, libXext -, libXt -}: - -stdenv.mkDerivation rec { - pname = "lesstif"; - version = "0.95.2"; - src = fetchurl { - url = "mirror://sourceforge/lesstif/${pname}-${version}.tar.bz2"; - sha256 = "1qzpxjjf7ri1jzv71mvq5m9g8hfaj5yzwp30rwxlm6n2b24a6jpb"; - }; - buildInputs = [ - freetype - fontconfig - libICE - libX11 - libXext - libXt - ]; - propagatedBuildInputs = [ - libXau - libXp - ]; - - # These patches fix a number of later issues - in particular the - # render_table_crash shows up in 'arb'. The same patches appear - # in Debian, so we assume they have been sent upstream. - # - patches = [ - ./c-missing_xm_h.patch - ./c-render_table_crash.patch - ./c-xpmpipethrough.patch - ]; - - meta = with lib; { - description = "Open source clone of the Motif widget set"; - homepage = "https://lesstif.sourceforge.net"; - platforms = platforms.unix; - license = with licenses; [ gpl2 lgpl2 ]; - }; -} diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix deleted file mode 100644 index 4bf0a9d3f94a..000000000000 --- a/pkgs/development/libraries/level-zero/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, addDriverRunpath -, cmake -, fetchFromGitHub -, intel-compute-runtime -, openvino -, stdenv -}: - -stdenv.mkDerivation rec { - pname = "level-zero"; - version = "1.17.28"; - - src = fetchFromGitHub { - owner = "oneapi-src"; - repo = "level-zero"; - rev = "refs/tags/v${version}"; - hash = "sha256-rgQ7B3RZemlcurEQ8bwvlvJAypzHTOBqpowasziZCiQ="; - }; - - nativeBuildInputs = [ cmake addDriverRunpath ]; - - postFixup = '' - addDriverRunpath $out/lib/libze_loader.so - ''; - - passthru.tests = { - inherit intel-compute-runtime openvino; - }; - - meta = with lib; { - description = "oneAPI Level Zero Specification Headers and Loader"; - homepage = "https://github.com/oneapi-src/level-zero"; - changelog = "https://github.com/oneapi-src/level-zero/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = [ maintainers.ziguana ]; - }; -} - diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix deleted file mode 100644 index f5e7e2a638d2..000000000000 --- a/pkgs/development/libraries/leveldb/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, fixDarwinDylibNames, snappy, cmake -, static ? stdenv.hostPlatform.isStatic }: - -stdenv.mkDerivation rec { - pname = "leveldb"; - version = "1.23"; - - src = fetchFromGitHub { - owner = "google"; - repo = "leveldb"; - rev = version; - sha256 = "sha256-RL+dfSFZZzWvUobSqiPbuC4nDiGzjIIukbVJZRacHbI="; - }; - - patches = [ - # Re-enable RTTI. Needed for e.g. Ceph to compile properly. - # See https://github.com/NixOS/nixpkgs/issues/147801, - # https://github.com/google/leveldb/issues/731, - # https://lists.ceph.io/hyperkitty/list/dev@ceph.io/thread/K4OSAA4AJS2V7FQI6GNCKCK3IRQDBQRS/. - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/leveldb/raw/e8178670c664e952fdd00f1fc6e3eb28b2c5b6a8/f/0006-revert-no-rtti.patch"; - sha256 = "sha256-d2YAV8O+1VKu3WwgNsWw6Cxg5sUUR+xOlJtA7pTcigQ="; - }) - ]; - - outputs = [ "out" "dev" ]; - - buildInputs = [ snappy ]; - - nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames ++ [ cmake ]; - - doCheck = true; - - buildFlags = [ "all" ]; - - # NOTE: disabling tests due to gtest issue - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" - "-DLEVELDB_BUILD_TESTS=OFF" - "-DLEVELDB_BUILD_BENCHMARKS=OFF" - ]; - - postInstall = '' - substituteInPlace "$out"/lib/cmake/leveldb/leveldbTargets.cmake \ - --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES "'$dev'"' - mkdir -p $dev/lib/pkgconfig - cat <<EOF > $dev/lib/pkgconfig/leveldb.pc - Name: leveldb - Description: Fast and lightweight key/value database library by Google. - Version: ${version} - Libs: -L$out/lib -lleveldb - Cflags: -I$dev/include - EOF - ''; - - meta = with lib; { - homepage = "https://github.com/google/leveldb"; - description = "Fast and lightweight key/value database library by Google"; - license = licenses.bsd3; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix deleted file mode 100644 index f1ba199fc8e0..000000000000 --- a/pkgs/development/libraries/levmar/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "levmar"; - version = "2.6"; - - src = fetchurl { - url = "https://www.ics.forth.gr/~lourakis/levmar/${pname}-${version}.tgz"; - sha256 = "1mxsjip9x782z6qa6k5781wjwpvj5aczrn782m9yspa7lhgfzx1v"; - }; - - patchPhase = '' - substituteInPlace levmar.h --replace "define HAVE_LAPACK" "undef HAVE_LAPACK" - sed -i 's/LAPACKLIBS=.*/LAPACKLIBS=/' Makefile - substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" - ''; - - installPhase = '' - mkdir -p $out/include $out/lib - cp lm.h $out/include - cp liblevmar.a $out/lib - ''; - - meta = { - description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++"; - homepage = "https://www.ics.forth.gr/~lourakis/levmar/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/lib2geom/default.nix b/pkgs/development/libraries/lib2geom/default.nix index e0db2b76f19e..eedb433e61be 100644 --- a/pkgs/development/libraries/lib2geom/default.nix +++ b/pkgs/development/libraries/lib2geom/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { # TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829 checkPhase = let disabledTests = - lib.optionals stdenv.isAarch64 [ + lib.optionals stdenv.hostPlatform.isAarch64 [ # Broken on all platforms, test just accidentally passes on some. # https://gitlab.com/inkscape/lib2geom/-/issues/63 "elliptical-arc-test" diff --git a/pkgs/development/libraries/lib3ds/default.nix b/pkgs/development/libraries/lib3ds/default.nix deleted file mode 100644 index 791d2ab523d0..000000000000 --- a/pkgs/development/libraries/lib3ds/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - pname = "lib3ds"; - version = "1.3.0"; - - src = fetchurl { - url = "http://lib3ds.googlecode.com/files/lib3ds-${version}.zip"; - sha256 = "1qr9arfdkjf7q11xhvxwzmhxqz3nhcjkyb8zzfjpz9jm54q0rc7m"; - }; - - nativeBuildInputs = [ unzip ]; - - meta = { - description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files"; - homepage = "https://lib3ds.sourceforge.net/"; - license = "LGPL"; - platforms = lib.platforms.unix; - }; -} - diff --git a/pkgs/development/libraries/lib3mf/default.nix b/pkgs/development/libraries/lib3mf/default.nix deleted file mode 100644 index 2436fbc00287..000000000000 --- a/pkgs/development/libraries/lib3mf/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja, automaticcomponenttoolkit -, pkg-config, libzip, gtest, openssl, libuuid, libossp_uuid }: - -stdenv.mkDerivation rec { - pname = "lib3mf"; - version = "2.2.0"; - - src = fetchFromGitHub { - owner = "3MFConsortium"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-WMTTYYgpCIM86a6Jw8iah/YVXN9T5youzEieWL/d+Bc="; - }; - - patches = [ ./upgrade-to-cpp-14.patch ]; - - nativeBuildInputs = [ cmake ninja pkg-config ]; - - outputs = [ "out" "dev" ]; - - cmakeFlags = [ - "-DCMAKE_INSTALL_INCLUDEDIR=include/lib3mf" - "-DUSE_INCLUDED_ZLIB=OFF" - "-DUSE_INCLUDED_LIBZIP=OFF" - "-DUSE_INCLUDED_GTEST=OFF" - "-DUSE_INCLUDED_SSL=OFF" - ]; - - buildInputs = [ - libzip gtest openssl - ] ++ (if stdenv.isDarwin then [ libossp_uuid ] else [ libuuid ]); - - postPatch = '' - # This lets us build the tests properly on aarch64-darwin. - substituteInPlace CMakeLists.txt \ - --replace 'SET(CMAKE_OSX_ARCHITECTURES "x86_64")' "" - - # fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ - sed -i 's,libdir=''${\(exec_\)\?prefix}/,libdir=,' lib3mf.pc.in - - # replace bundled binaries - for i in AutomaticComponentToolkit/bin/act.*; do - ln -sf ${automaticcomponenttoolkit}/bin/act $i - done - ''; - - meta = with lib; { - description = "Reference implementation of the 3D Manufacturing Format file standard"; - homepage = "https://3mf.io/"; - license = licenses.bsd2; - maintainers = with maintainers; [ gebner ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/lib3mf/upgrade-to-cpp-14.patch b/pkgs/development/libraries/lib3mf/upgrade-to-cpp-14.patch deleted file mode 100644 index a453571838d0..000000000000 --- a/pkgs/development/libraries/lib3mf/upgrade-to-cpp-14.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9f719beb7..a20f84eb8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -34,12 +34,12 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - # using GCC - add_definitions(-DBUILD_DLL) - add_compile_options(-Wall) -- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2") -+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2") - elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin") - # using GCC - add_definitions(-DBUILD_DLL) - add_compile_options(-Wall) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2") - set(CMAKE_MACOSX_RPATH ON) - endif() diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix deleted file mode 100644 index 7016c5c86593..000000000000 --- a/pkgs/development/libraries/libHX/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool }: - -stdenv.mkDerivation rec { - pname = "libHX"; - version = "3.22"; - - src = fetchurl { - url = "mirror://sourceforge/libhx/libHX/${version}/${pname}-${version}.tar.xz"; - sha256 = "18w39j528lyg2026dr11f2xxxphy91cg870nx182wbd8cjlqf86c"; - }; - - patches = []; - - nativeBuildInputs = [ autoconf automake libtool ]; - - preConfigure = '' - sh autogen.sh - ''; - - meta = with lib; { - homepage = "https://libhx.sourceforge.net/"; - longDescription = '' - libHX is a C library (with some C++ bindings available) that provides data structures - and functions commonly needed, such as maps, deques, linked lists, string formatting - and autoresizing, option and config file parsing, type checking casts and more. - ''; - maintainers = [ ]; - platforms = platforms.linux; - license = with licenses; [ gpl3 lgpl21Plus wtfpl ]; - }; -} diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix deleted file mode 100644 index b92d9161c1a3..000000000000 --- a/pkgs/development/libraries/libLAS/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, libgeotiff, libtiff, laszip_2, fixDarwinDylibNames }: - -stdenv.mkDerivation rec { - pname = "libLAS"; - version = "1.8.1"; - - src = fetchurl { - url = "https://download.osgeo.org/liblas/libLAS-${version}.tar.bz2"; - sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; - }; - - patches = [ - (fetchpatch { - name = "aarch64-darwin.patch"; - url = "https://github.com/libLAS/libLAS/commit/ded463732db1f9baf461be6f3fe5b8bb683c41cd.patch"; - sha256 = "sha256-aWMpazeefDHE9OzuLR3FJ8+oXeGhEsk1igEm6j2DUnw="; - }) - (fetchpatch { - name = "fix-build-with-boost-1.73-1.patch"; - url = "https://github.com/libLAS/libLAS/commit/af431abce95076b59f4eb7c6ef0930ca57c8a063.patch"; - hash = "sha256-2lr028t5hq3oOLZFXnvIJXCUsoVHbG/Mus93OZvi5ZU="; - }) - (fetchpatch { - name = "fix-build-with-boost-1.73-2.patch"; - url = "https://github.com/libLAS/libLAS/commit/0d3b8d75f371a6b7c605bbe5293091cb64a7e2d3.patch"; - hash = "sha256-gtNIazR+l1h+Xef+4qQc7EVi+Nlht3F8CrwkINothtA="; - }) - # remove on update. fix compile error in apps/las2col.c - # https://github.com/libLAS/libLAS/pull/151 - (fetchpatch { - name = "fflush-x2-is-not-an-fsync.patch"; - url = "https://github.com/libLAS/libLAS/commit/e789d43df4500da0c12d2f6d3ac1d031ed835493.patch"; - hash = "sha256-0zI0NvOt9C5BPrfAbgU1N1kj3rZFB7rf0KRj7yemyWI="; - }) - ]; - - nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ boost libgeotiff libtiff laszip_2 ]; - - cmakeFlags = [ - "-DWITH_LASZIP=ON" - # libLAS is currently not compatible with LASzip 3, - # see https://github.com/libLAS/libLAS/issues/144. - "-DLASZIP_INCLUDE_DIR=${laszip_2}/include" - "-DCMAKE_EXE_LINKER_FLAGS=-pthread" - ]; - - postFixup = lib.optionalString stdenv.isDarwin '' - install_name_tool -change "@rpath/liblas.3.dylib" "$out/lib/liblas.3.dylib" $out/lib/liblas_c.dylib - ''; - - meta = with lib; { - description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset"; - homepage = "https://liblas.org"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; teams.geospatial.members ++ [ lib.maintainers.michelk ]; - }; -} diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix deleted file mode 100644 index c0d3b91885e6..000000000000 --- a/pkgs/development/libraries/libaacs/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, libgcrypt, libgpg-error, bison, flex }: - -# library that allows libbluray to play AACS protected bluray disks -# libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info. - -# Info on how to use / obtain aacs keys: -# http://vlc-bluray.whoknowsmy.name/ -# https://wiki.archlinux.org/index.php/BluRay - -stdenv.mkDerivation rec { - pname = "libaacs"; - version = "0.11.1"; - - src = fetchurl { - url = "http://get.videolan.org/libaacs/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-qIqg6+TJinf3rv/ZKrPvZKxUjGuCLoJIqLkmclvqCjk="; - }; - - buildInputs = [ libgcrypt libgpg-error ]; - - nativeBuildInputs = [ bison flex ]; - - meta = with lib; { - homepage = "https://www.videolan.org/developers/libaacs.html"; - description = "Library to access AACS protected Blu-Ray disks"; - mainProgram = "aacs_info"; - license = licenses.lgpl21; - maintainers = with maintainers; [ abbradar ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/development/libraries/libaal/default.nix deleted file mode 100644 index d5b0b95f9599..000000000000 --- a/pkgs/development/libraries/libaal/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - version = "1.0.7"; - pname = "libaal"; - - src = fetchurl { - url = "mirror://sourceforge/reiser4/${pname}-${version}.tar.gz"; - sha256 = "sha256-fIVohp2PVCaNaQRVJ4zfW8mukiiqM3BgF8Vwu9qrmJE="; - }; - - preInstall = '' - substituteInPlace Makefile --replace ./run-ldconfig true - ''; - - enableParallelBuilding = true; - - meta = { - homepage = "http://www.namesys.com/"; - description = "Support library for Reiser4"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ mglolenstine ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/development/libraries/libabigail/default.nix deleted file mode 100644 index fcfc88cbb667..000000000000 --- a/pkgs/development/libraries/libabigail/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, stdenv -, fetchurl -, autoreconfHook -, elfutils -, libxml2 -, pkg-config -, strace -, python3 -}: - -stdenv.mkDerivation rec { - pname = "libabigail"; - version = "2.5"; - - outputs = [ "bin" "out" "dev" ]; - - src = fetchurl { - url = "https://mirrors.kernel.org/sourceware/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-fPxOmwCuONh/sMY76rsyucv5zkEOUs7rWtWzxb6xEfM="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - strace - ]; - - buildInputs = [ - elfutils - libxml2 - ]; - - nativeCheckInputs = [ - python3 - ]; - - configureFlags = [ - "--enable-bash-completion=yes" - "--enable-cxx11=yes" - ]; - - enableParallelBuilding = true; - - doCheck = true; - - preCheck = '' - # runtestdiffpkg needs cache directory - export XDG_CACHE_HOME="$TEMPDIR" - patchShebangs tests/ - ''; - - meta = with lib; { - description = "ABI Generic Analysis and Instrumentation Library"; - homepage = "https://sourceware.org/libabigail/"; - license = licenses.asl20-llvm; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix deleted file mode 100644 index 5476b3c7402b..000000000000 --- a/pkgs/development/libraries/libabw/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, boost, doxygen, gperf, pkg-config, librevenge, libxml2, perl, zlib }: - -stdenv.mkDerivation rec { - pname = "libabw"; - version = "0.1.3"; - - src = fetchurl { - url = "https://dev-www.libreoffice.org/src/libabw/${pname}-${version}.tar.xz"; - sha256 = "1vbfrmnvib3cym0yyyabnd8xpx4f7wp20vnn09s6dln347fajqz7"; - }; - - # Boost 1.59 compatibility fix - # Attempt removing when updating - postPatch = '' - sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ boost doxygen gperf librevenge libxml2 perl zlib ]; - - meta = with lib; { - homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libabw"; - description = "Library parsing abiword documents"; - platforms = platforms.unix; - license = licenses.mpl20; - }; -} diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix deleted file mode 100644 index 3ed46996056a..000000000000 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, gitUpdater, meson, mesonEmulatorHook, ninja, glib, check, python3, vala, gtk-doc, glibcLocales -, libxml2, libxslt, pkg-config, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }: - -stdenv.mkDerivation rec { - pname = "libaccounts-glib"; - version = "1.27"; - - outputs = [ "out" "dev" "devdoc" "py" ]; - - src = fetchFromGitLab { - owner = "accounts-sso"; - repo = "libaccounts-glib"; - rev = "VERSION_${version}"; - hash = "sha256-mLhcwp8rhCGSB1K6rTWT0tuiINzgwULwXINfCbgPKEg="; - }; - - nativeBuildInputs = [ - check - docbook_xml_dtd_43 - docbook_xsl - glibcLocales - gobject-introspection - gtk-doc - meson - ninja - pkg-config - vala - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ - glib - libxml2 - libxslt - python3.pkgs.pygobject3 - sqlite - ]; - - # TODO: send patch upstream to make running tests optional - postPatch = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - substituteInPlace meson.build \ - --replace "subdir('tests')" "" - ''; - - LC_ALL = "en_US.UTF-8"; - - mesonFlags = [ - "-Dinstall-py-overrides=true" - "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" - ]; - - passthru.updateScript = gitUpdater { - rev-prefix = "VERSION_"; - }; - - meta = with lib; { - description = "Library for managing accounts which can be used from GLib applications"; - homepage = "https://gitlab.com/accounts-sso/libaccounts-glib"; - platforms = platforms.linux; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/libad9361/default.nix b/pkgs/development/libraries/libad9361/default.nix deleted file mode 100644 index f370870f71ef..000000000000 --- a/pkgs/development/libraries/libad9361/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libiio }: - -stdenv.mkDerivation rec { - pname = "libad9361"; - version = "0.3"; - - src = fetchFromGitHub { - owner = "analogdevicesinc"; - repo = "libad9361-iio"; - rev = "v${version}"; - hash = "sha256-9e66qSrKpczatZY9lPAzi/6f7lHChnl2+Pih53oa28Y="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ libiio ]; - - postPatch = lib.optionalString stdenv.isDarwin '' - # Fix iio include path on darwin to match linux - for i in test/*.c; do - substituteInPlace $i \ - --replace 'iio/iio.h' 'iio.h' - done - ''; - - meta = with lib; { - description = "IIO AD9361 library for filter design and handling, multi-chip sync, etc"; - homepage = "http://analogdevicesinc.github.io/libad9361-iio/"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 924b8884df80..34b064d29412 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.3"; + version = "1.6.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; rev = finalAttrs.version; - hash = "sha256-NCQCd/QnJg2fEI6q5ys8HQXinGnKaoxhMUHd8rwxAmk="; + hash = "sha256-oCTMMKpI7XqpK37SGXgQFNqCZyTuuIE6TOz/k5nUNGU="; }; depsBuildBuild = [ @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ appstream fribidi - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Foundation ]; @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ adwaita-icon-theme - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ xvfb-run ]; @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { # # not ok /Adwaita/ButtonContent/style_class_button - Gdk-FATAL-CRITICAL: # gdk_macos_monitor_get_workarea: assertion 'GDK_IS_MACOS_MONITOR (self)' failed - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; separateDebugInfo = true; checkPhase = '' @@ -93,12 +93,14 @@ stdenv.mkDerivation (finalAttrs: { # AdwSettings needs to be initialized from “org.gnome.desktop.interface” GSettings schema when portal is not used for color scheme. # It will not actually be used since the “color-scheme” key will only have been introduced in GNOME 42, falling back to detecting theme name. # See adw_settings_constructed function in https://gitlab.gnome.org/GNOME/libadwaita/commit/60ec69f0a5d49cad8a6d79e4ecefd06dc6e3db12 - "XDG_DATA_DIRS=${glib.getSchemaDataDirPath gsettings-desktop-schemas}" + # + # The "Validate docs" test looks for various GIR dependencies, thus preserve the existing paths. + "XDG_DATA_DIRS=$XDG_DATA_DIRS:${glib.getSchemaDataDirPath gsettings-desktop-schemas}" # Tests need a cache directory "HOME=$TMPDIR" ) - env "''${testEnvironment[@]}" ${lib.optionalString (!stdenv.isDarwin) "xvfb-run"} \ + env "''${testEnvironment[@]}" ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "xvfb-run"} \ meson test --print-errorlogs runHook postCheck diff --git a/pkgs/development/libraries/libaec/default.nix b/pkgs/development/libraries/libaec/default.nix deleted file mode 100644 index cd816329a51a..000000000000 --- a/pkgs/development/libraries/libaec/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitLab -, cmake -}: - -stdenv.mkDerivation rec { - pname = "libaec"; - version = "1.1.3"; - - src = fetchFromGitLab { - domain = "gitlab.dkrz.de"; - owner = "k202009"; - repo = "libaec"; - rev = "v${version}"; - sha256 = "sha256-4WS3l79v9CTFBLuJmNMMK7RRNPLSa5KYID3W4aGMTuE="; - }; - - nativeBuildInputs = [ - cmake - ]; - - doCheck = true; - - meta = with lib; { - homepage = "https://gitlab.dkrz.de/k202009/libaec"; - description = "Adaptive Entropy Coding library"; - license = licenses.bsd2; - maintainers = with maintainers; [ tbenst ]; - }; -} diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix index 0582019d72f5..8fa18093aa35 100644 --- a/pkgs/development/libraries/libagar/libagar_test.nix +++ b/pkgs/development/libraries/libagar/libagar_test.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { buildInputs = [ perl bsdbuild libagar libjpeg libpng openssl ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Tests for libagar"; mainProgram = "agartest"; homepage = "http://libagar.org/index.html"; diff --git a/pkgs/development/libraries/libajantv2/default.nix b/pkgs/development/libraries/libajantv2/default.nix deleted file mode 100644 index ed5a57ed7364..000000000000 --- a/pkgs/development/libraries/libajantv2/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, ninja -, pkg-config -}: - -# Warning: We are aware that the upstream changed and there are new releases, -# this got initally packaged for obs-studio which appears to fail to build even upstream with the new version. -# https://github.com/NixOS/nixpkgs/pull/296191 / https://github.com/obsproject/obs-studio/pull/10037 -stdenv.mkDerivation rec { - pname = "libajantv2"; - version = "16.2-bugfix5"; - - src = fetchFromGitHub { - owner = "aja-video"; - repo = "ntv2"; - rev = "v${version}"; - sha256 = "sha256-h5PKWMwqTeI5/EaTWkjYojuvDU0FyMpzIjWB98UOJwc="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - cmake - ninja - pkg-config - ]; - - postInstall = '' - mkdir -p "$out/lib/pkgconfig" - cat >"$out/lib/pkgconfig/libajantv2.pc" <<EOF - prefix=$out - libdir=\''${prefix}/lib - includedir=\''${prefix}/include/ajalibraries - - Name: libajantv2 - Description: Library for controlling AJA NTV2 video devices - Version: ${version} - Libs: -L\''${libdir} -lajantv2 - Cflags: -I\''${includedir} -I\''${includedir}/ajantv2/includes - EOF - ''; - - meta = with lib; { - 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 = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix deleted file mode 100644 index 99a847af0b87..000000000000 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, openssl }: - -stdenv.mkDerivation rec { - pname = "libamqpcpp"; - version = "4.3.26"; - - src = fetchFromGitHub { - owner = "CopernicaMarketingSoftware"; - repo = "AMQP-CPP"; - rev = "v${version}"; - sha256 = "sha256-lHkYoppJ/wo6RRE6V4iN6JXz5OoErJUl4IyrwiCB9FM="; - }; - - buildInputs = [ openssl ]; - - patches = [ ./libamqpcpp-darwin.patch ]; - - makeFlags = [ "PREFIX=$(out)" ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Library for communicating with a RabbitMQ server"; - homepage = "https://github.com/CopernicaMarketingSoftware/AMQP-CPP"; - license = licenses.asl20; - maintainers = [ maintainers.mjp ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libamqpcpp/libamqpcpp-darwin.patch b/pkgs/development/libraries/libamqpcpp/libamqpcpp-darwin.patch deleted file mode 100644 index 9f8d700929b4..000000000000 --- a/pkgs/development/libraries/libamqpcpp/libamqpcpp-darwin.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/Makefile -+++ b/src/Makefile -@@ -0,0 +1 @@ -+CXX ?= g++ -@@ -43 +44 @@ ${SHARED_LIB}: ${SHARED_OBJECTS} -- ${LD} ${LD_FLAGS} -Wl,${SONAMEPARAMETER},lib$(LIBRARY_NAME).so.$(SONAME) -o $@ ${SHARED_OBJECTS} -+ ${CXX} ${LD_FLAGS} -Wl,${SONAMEPARAMETER},lib$(LIBRARY_NAME).so.$(SONAME) -o $@ ${SHARED_OBJECTS} -@@ -52 +53 @@ ${SHARED_OBJECTS}: -- ${CPP} ${CPPFLAGS} -fpic -o $@ ${@:%.o=%.cpp} -+ ${CXX} ${CPPFLAGS} -fpic -o $@ ${@:%.o=%.cpp} -@@ -55 +56 @@ ${STATIC_OBJECTS}: -- ${CPP} ${CPPFLAGS} -o $@ ${@:%.s.o=%.cpp} -+ ${CXX} ${CPPFLAGS} -o $@ ${@:%.s.o=%.cpp} diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix deleted file mode 100644 index f61c0bfafc7b..000000000000 --- a/pkgs/development/libraries/libantlr3c/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "libantlr3c"; - version = "3.4"; - src = fetchurl { - url = "https://www.antlr3.org/download/C/libantlr3c-${version}.tar.gz"; - sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"; - }; - - configureFlags = lib.optional stdenv.is64bit "--enable-64bit" - # libantlr3c wrongly emits the abi flags -m64 and -m32 which imply x86 archs - # https://github.com/antlr/antlr3/issues/205 - ++ lib.optional (!stdenv.hostPlatform.isx86) "--disable-abiflags"; - - meta = with lib; { - description = "C runtime libraries of ANTLR v3"; - homepage = "https://www.antlr3.org/"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ vbgl ]; - }; -} diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index b920fe9c3b4e..6c6743b2b55e 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { buildInputs = [ ] ++ lib.optional usePulseAudio libpulseaudio ++ - lib.optionals stdenv.isLinux [ alsa-lib libcap ] ++ - lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ]; + lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libcap ] ++ + lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio CoreServices AudioUnit ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix deleted file mode 100644 index 8f4afbf5a3e0..000000000000 --- a/pkgs/development/libraries/libaom/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib, stdenv, fetchzip, yasm, perl, cmake, pkg-config, python3 -, enableVmaf ? true, libvmaf -, gitUpdater - -# for passthru.tests -, ffmpeg -, libavif -, libheif -}: - -let - isCross = stdenv.buildPlatform != stdenv.hostPlatform; -in -stdenv.mkDerivation rec { - pname = "libaom"; - version = "3.9.1"; - - src = fetchzip { - url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - hash = "sha256-XQ1sekNZDUAiYP/HriYRj4+40PAvE/OiyG9bbrdg63I="; - stripRoot = false; - }; - - patches = [ ./outputs.patch ]; - - nativeBuildInputs = [ - yasm perl cmake pkg-config python3 - ]; - - propagatedBuildInputs = lib.optional enableVmaf libvmaf; - - preConfigure = '' - # build uses `git describe` to set the build version - cat > $NIX_BUILD_TOP/git << "EOF" - #!${stdenv.shell} - echo v${version} - EOF - chmod +x $NIX_BUILD_TOP/git - export PATH=$NIX_BUILD_TOP:$PATH - ''; - - # Configuration options: - # https://aomedia.googlesource.com/aom/+/refs/heads/master/build/cmake/aom_config_defaults.cmake - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DENABLE_TESTS=OFF" - ] ++ lib.optionals enableVmaf [ - "-DCONFIG_TUNE_VMAF=1" - ] ++ lib.optionals (isCross && !stdenv.hostPlatform.isx86) [ - "-DCMAKE_ASM_COMPILER=${stdenv.cc.targetPrefix}as" - ] ++ lib.optionals stdenv.isAarch32 [ - # armv7l-hf-multiplatform does not support NEON - # see lib/systems/platform.nix - "-DENABLE_NEON=0" - ]; - - postFixup = '' - moveToOutput lib/libaom.a "$static" - '' + lib.optionalString stdenv.hostPlatform.isStatic '' - ln -s $static $out - ''; - - outputs = [ "out" "bin" "dev" "static" ]; - - passthru = { - updateScript = gitUpdater { - url = "https://aomedia.googlesource.com/aom"; - rev-prefix = "v"; - ignoredVersions = "(alpha|beta|rc).*"; - }; - tests = { - inherit libavif libheif; - ffmpeg = ffmpeg.override { withAom = true; }; - }; - }; - - meta = with lib; { - description = "Alliance for Open Media AV1 codec library"; - longDescription = '' - Libaom is the reference implementation of the AV1 codec from the Alliance - for Open Media. It contains an AV1 library as well as applications like - an encoder (aomenc) and a decoder (aomdec). - ''; - homepage = "https://aomedia.org/av1-features/get-started/"; - changelog = "https://aomedia.googlesource.com/aom/+/refs/tags/v${version}/CHANGELOG"; - maintainers = with maintainers; [ primeos kiloreux dandellion ]; - platforms = platforms.all; - outputsToInstall = [ "bin" ]; - license = licenses.bsd2; - }; -} diff --git a/pkgs/development/libraries/libaom/outputs.patch b/pkgs/development/libraries/libaom/outputs.patch deleted file mode 100644 index 7b34338403f2..000000000000 --- a/pkgs/development/libraries/libaom/outputs.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/build/cmake/aom_install.cmake b/build/cmake/aom_install.cmake -index 0bd2bf035..5cf5acea8 100644 ---- a/build/cmake/aom_install.cmake -+++ b/build/cmake/aom_install.cmake -@@ -42,8 +42,8 @@ macro(setup_aom_install_targets) - -DAOM_ROOT=${AOM_ROOT} - -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} - -DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR} -- -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR} -- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} -+ -DCMAKE_INSTALL_FULL_INCLUDEDIR=${CMAKE_INSTALL_FULL_INCLUDEDIR} -+ -DCMAKE_INSTALL_FULL_LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR} - -DCMAKE_PROJECT_NAME=${CMAKE_PROJECT_NAME} - -DCONFIG_MULTITHREAD=${CONFIG_MULTITHREAD} - -DCONFIG_TUNE_VMAF=${CONFIG_TUNE_VMAF} -@@ -84,12 +84,12 @@ macro(setup_aom_install_targets) - # Setup the install rules. install() will automatically prepend - # CMAKE_INSTALL_PREFIX to relative paths - install(FILES ${AOM_INSTALL_INCS} -- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aom") -+ DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/aom") - install(FILES "${AOM_PKG_CONFIG_FILE}" -- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") -+ DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") - install(TARGETS ${AOM_INSTALL_LIBS};${AOM_INSTALL_BINS} -- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" -- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" -- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") -+ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" -+ LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}") - endif() - endmacro() -diff --git a/build/cmake/pkg_config.cmake b/build/cmake/pkg_config.cmake -index e8fff2e77..b8a73aad4 100644 ---- a/build/cmake/pkg_config.cmake -+++ b/build/cmake/pkg_config.cmake -@@ -11,8 +11,8 @@ - cmake_minimum_required(VERSION 3.5) - - set(REQUIRED_ARGS "AOM_ROOT" "AOM_CONFIG_DIR" "CMAKE_INSTALL_PREFIX" -- "CMAKE_INSTALL_BINDIR" "CMAKE_INSTALL_INCLUDEDIR" -- "CMAKE_INSTALL_LIBDIR" "CMAKE_PROJECT_NAME" -+ "CMAKE_INSTALL_BINDIR" "CMAKE_INSTALL_FULL_INCLUDEDIR" -+ "CMAKE_INSTALL_FULL_LIBDIR" "CMAKE_PROJECT_NAME" - "CONFIG_MULTITHREAD") - - foreach(arg ${REQUIRED_ARGS}) -@@ -35,15 +35,15 @@ else() - endif() - - # Write pkg-config info. --set(prefix "${CMAKE_INSTALL_PREFIX}") --set(bindir "${CMAKE_INSTALL_BINDIR}") --set(includedir "${CMAKE_INSTALL_INCLUDEDIR}") --set(libdir "${CMAKE_INSTALL_LIBDIR}") -+get_filename_component(prefix "${CMAKE_INSTALL_FULL_INCLUDEDIR}" DIRECTORY) -+get_filename_component(exec_prefix "${CMAKE_INSTALL_FULL_LIBDIR}" DIRECTORY) -+get_filename_component(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}" NAME) -+get_filename_component(libdir "${CMAKE_INSTALL_FULL_LIBDIR}" NAME) - set(pkgconfig_file "${AOM_CONFIG_DIR}/aom.pc") - string(TOLOWER ${CMAKE_PROJECT_NAME} pkg_name) - file(WRITE "${pkgconfig_file}" "# libaom pkg-config.\n") - file(APPEND "${pkgconfig_file}" "prefix=${prefix}\n") --file(APPEND "${pkgconfig_file}" "exec_prefix=\${prefix}\n") -+file(APPEND "${pkgconfig_file}" "exec_prefix=${exec_prefix}\n") - file(APPEND "${pkgconfig_file}" "includedir=\${prefix}/${includedir}\n") - file(APPEND "${pkgconfig_file}" "libdir=\${exec_prefix}/${libdir}\n\n") - file(APPEND "${pkgconfig_file}" "Name: ${pkg_name}\n") diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/development/libraries/libaosd/default.nix deleted file mode 100644 index 540fc10998e5..000000000000 --- a/pkgs/development/libraries/libaosd/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cairo, pango, - libX11, libXcomposite, autoconf, automake }: - -stdenv.mkDerivation rec { - version = "0.2.7-9-g177589f"; - pname = "libaosd"; - - src = fetchFromGitHub { - owner = "atheme-legacy"; - repo = "libaosd"; - rev = version; - sha256 = "1cn7k0n74p6jp25kxwcyblhmbdvgw3mikvj0m2jh4c6xccfrgb9a"; - }; - - nativeBuildInputs = [ autoconf automake pkg-config ]; - buildInputs = [ cairo pango libX11 libXcomposite ]; - enableParallelBuilding = true; - - preConfigure = '' - ./autogen.sh - ''; - - meta = with lib; { - longDescription = '' - libaosd is an advanced on screen display library. - - It supports many modern features like anti-aliased text and - composited rendering via XComposite, as well as support for - rendering Cairo and Pango layouts. - ''; - broken = stdenv.isDarwin; - homepage = "https://github.com/atheme-legacy/libaosd"; - license = licenses.mit; - maintainers = with maintainers; [ unode ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix deleted file mode 100644 index e2cd9624bc40..000000000000 --- a/pkgs/development/libraries/libappindicator/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ stdenv, fetchgit, lib -, pkg-config, autoreconfHook -, glib, dbus-glib -, gtkVersion ? "3" -, gtk2, libindicator-gtk2, libdbusmenu-gtk2 -, gtk3, libindicator-gtk3, libdbusmenu-gtk3 -, gtk-doc, vala, gobject-introspection -, monoSupport ? false, mono, gtk-sharp-2_0, gtk-sharp-3_0 -, testers -}: - -let - throwBadGtkVersion = throw "unknown GTK version ${gtkVersion}"; -in - -stdenv.mkDerivation (finalAttrs: { - pname = let postfix = if monoSupport then "sharp" else "gtk${gtkVersion}"; - in "libappindicator-${postfix}"; - version = "12.10.1+20.10.20200706.1"; - - outputs = [ "out" "dev" ]; - - src = fetchgit { - url = "https://git.launchpad.net/ubuntu/+source/libappindicator"; - rev = "fe25e53bc7e39cd59ad6b3270cd7a6a9c78c4f44"; - sha256 = "0xjvbl4gn7ra2fs6gn2g9s787kzb5cg9hv79iqsz949rxh4iw32d"; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook vala gobject-introspection gtk-doc ]; - - propagatedBuildInputs = { - "2" = [ gtk2 libdbusmenu-gtk2 ]; - "3" = [ gtk3 libdbusmenu-gtk3 ]; - }.${gtkVersion} or throwBadGtkVersion; - - buildInputs = [ - glib dbus-glib - { - "2" = libindicator-gtk2; - "3" = libindicator-gtk3; - }.${gtkVersion} or throwBadGtkVersion - ] ++ lib.optionals monoSupport [ - mono - { - "2" = gtk-sharp-2_0; - "3" = gtk-sharp-3_0; - }.${gtkVersion} or throwBadGtkVersion - ]; - - preAutoreconf = '' - gtkdocize - ''; - - configureFlags = [ - "CFLAGS=-Wno-error" - "--sysconfdir=/etc" - "--localstatedir=/var" - "--with-gtk=${gtkVersion}" - ]; - - doCheck = false; # generates shebangs in check phase, too lazy to fix - - installFlags = [ - "sysconfdir=${placeholder "out"}/etc" - "localstatedir=\${TMPDIR}" - ]; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = with lib; { - description = "Library to allow applications to export a menu into the Unity Menu bar"; - homepage = "https://launchpad.net/libappindicator"; - license = with licenses; [ lgpl21 lgpl3 ]; - pkgConfigModules = { - "2" = [ "appindicator-0.1" ]; - "3" = [ "appindicator3-0.1" ]; - }.${gtkVersion} or throwBadGtkVersion; - platforms = platforms.linux; - maintainers = [ maintainers.msteen ]; - # TODO: Resolve the issues with the Mono bindings. - broken = monoSupport; - }; -}) diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix deleted file mode 100644 index 6e2ef83c5eac..000000000000 --- a/pkgs/development/libraries/libargon2/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, fixDarwinDylibNames }: - -stdenv.mkDerivation rec { - pname = "libargon2"; - version = "20190702"; - - src = fetchFromGitHub { - owner = "P-H-C"; - repo = "phc-winner-argon2"; - rev = version; - sha256 = "0p4ry9dn0mi9js0byijxdyiwx74p1nr8zj7wjpd1fjgqva4sk23i"; - }; - - nativeBuildInputs = lib.optionals stdenv.isDarwin [ - fixDarwinDylibNames - ]; - - patches = [ - # TODO: remove when https://github.com/P-H-C/phc-winner-argon2/pull/277 is merged + released - (fetchpatch { - url = "https://github.com/P-H-C/phc-winner-argon2/commit/cd1c1d8d204e4ec4557e358013567c097cb70562.patch"; - sha256 = "0whqv8b6q9602n7vxpzbd8bk8wz22r1jz9x5lrm9z7ib3wz81c8a"; - }) - ]; - - makeFlags = [ - "AR=${stdenv.cc.targetPrefix}ar" # Fix cross-compilation - "PREFIX=${placeholder "out"}" - "ARGON2_VERSION=${version}" - "LIBRARY_REL=lib" - "PKGCONFIG_REL=lib" - ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - "LIBRARIES=$(LIB_ST)" - ]; - - meta = with lib; { - description = "Key derivation function that was selected as the winner of the Password Hashing Competition in July 2015"; - longDescription = '' - A password-hashing function created by by Alex Biryukov, Daniel Dinu, and - Dmitry Khovratovich. Argon2 was declared the winner of the Password - Hashing Competition (PHC). There were 24 submissions and 9 finalists. - Catena, Lyra2, Makwa and yescrypt were given special recognition. The PHC - recommends using Argon2 rather than legacy algorithms. - ''; - homepage = "https://www.argon2.com/"; - license = with licenses; [ asl20 cc0 ]; - maintainers = with maintainers; [ taeer olynch ]; - mainProgram = "argon2"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libargs/default.nix b/pkgs/development/libraries/libargs/default.nix deleted file mode 100644 index 227afc0eb1f8..000000000000 --- a/pkgs/development/libraries/libargs/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "args"; - version = "6.4.6"; - - src = fetchFromGitHub { - owner = "Taywee"; - repo = pname; - rev = version; - sha256 = "sha256-2gH3h3QAl0+XVULt/fR2UUGKNIxTUmnRRdxPOFdpVy4="; - }; - - nativeBuildInputs = [ cmake ]; - - # https://github.com/Taywee/args/issues/108 - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace '$'{CMAKE_INSTALL_LIBDIR_ARCHIND} '$'{CMAKE_INSTALL_LIBDIR} - substituteInPlace packaging/pkgconfig.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - - meta = with lib; { - description = "Simple header-only C++ argument parser library"; - homepage = "https://github.com/Taywee/args"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/development/libraries/libasr/default.nix deleted file mode 100644 index 8d5b6d128ddf..000000000000 --- a/pkgs/development/libraries/libasr/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, libevent, openssl }: - -stdenv.mkDerivation rec { - pname = "libasr"; - version= "1.0.4"; - - src = fetchurl { - url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; - sha256 = "1d6s8njqhvayx2gp47409sp1fn8m608ws26hr1srfp6i23nnpyqr"; - }; - - buildInputs = [ libevent openssl ]; - - meta = with lib; { - homepage = "https://github.com/OpenSMTPD/libasr"; - description = "Free, simple and portable asynchronous resolver library"; - license = licenses.isc; - maintainers = [ maintainers.koral ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix deleted file mode 100644 index 3c3fa3ee7066..000000000000 --- a/pkgs/development/libraries/libass/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, yasm -, freetype, fribidi, harfbuzz -, fontconfigSupport ? true, fontconfig ? null # fontconfig support -, rasterizerSupport ? false # Internal rasterizer -, largeTilesSupport ? false # Use larger tiles in the rasterizer -, libiconv -, darwin -}: - -assert fontconfigSupport -> fontconfig != null; - -stdenv.mkDerivation rec { - pname = "libass"; - version = "0.17.3"; - - src = fetchurl { - url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-6uQl2lDwAVwh97OpxyYqkQ8CGK9GniLikxRi/tPFCVk="; - }; - - outputs = [ "out" "dev" ]; - - configureFlags = [ - (lib.enableFeature fontconfigSupport "fontconfig") - (lib.enableFeature rasterizerSupport "rasterizer") - (lib.enableFeature largeTilesSupport "large-tiles") - ]; - - nativeBuildInputs = [ pkg-config yasm ]; - - buildInputs = [ freetype fribidi harfbuzz ] - ++ lib.optional fontconfigSupport fontconfig - ++ lib.optional stdenv.isDarwin [ - libiconv - darwin.apple_sdk.frameworks.ApplicationServices - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreText - ]; - - meta = with lib; { - description = "Portable ASS/SSA subtitle renderer"; - homepage = "https://github.com/libass/libass"; - license = licenses.isc; - platforms = platforms.unix; - maintainers = with maintainers; [ codyopel ]; - }; -} diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix deleted file mode 100644 index 9998bfdceb7b..000000000000 --- a/pkgs/development/libraries/libassuan/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ fetchurl, lib, stdenv, gettext, npth, libgpg-error, buildPackages, gitUpdater }: - -stdenv.mkDerivation rec { - pname = "libassuan"; - version = "2.5.7"; - - src = fetchurl { - url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-AQMIH/wng4ouUEeRU8oQXoc9PWXYqVkygunJTH5q+3Y="; - }; - - outputs = [ "out" "dev" "info" ]; - outputBin = "dev"; # libassuan-config - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - buildInputs = [ npth gettext ]; - - configureFlags = [ - # Required for cross-compilation. - "--with-libgpg-error-prefix=${libgpg-error.dev}" - ]; - - doCheck = true; - - # Make sure includes are fixed for callers who don't use libassuan-config - postInstall = '' - sed -i 's,#include <gpg-error.h>,#include "${libgpg-error.dev}/include/gpg-error.h",g' $dev/include/assuan.h - ''; - - passthru.updateScript = gitUpdater { - url = "https://dev.gnupg.org/source/libassuan.git"; - rev-prefix = "libassuan-"; - ignoredVersions = ".*-base"; - }; - - meta = with lib; { - description = "IPC library used by GnuPG and related software"; - mainProgram = "libassuan-config"; - longDescription = '' - Libassuan is a small library implementing the so-called Assuan - protocol. This protocol is used for IPC between most newer - GnuPG components. Both, server and client side functions are - provided. - ''; - homepage = "https://gnupg.org/software/libassuan/"; - changelog = "https://dev.gnupg.org/source/libassuan/browse/master/NEWS;libassuan-${version}"; - license = licenses.lgpl2Plus; - platforms = platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/development/libraries/libasyncns/default.nix deleted file mode 100644 index 09e056373d27..000000000000 --- a/pkgs/development/libraries/libasyncns/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libasyncns"; - version = "0.8"; - - src = fetchurl { - url = "http://0pointer.de/lennart/projects/libasyncns/${pname}-${version}.tar.gz"; - sha256 = "0x5b6lcic4cd7q0bx00x93kvpyzl7n2abbgvqbrlzrfb8vknc6jg"; - }; - - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace libasyncns/asyncns.c \ - --replace '<arpa/nameser.h>' '<arpa/nameser_compat.h>' - ''; - - configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ]; - - meta = with lib; { - homepage = "http://0pointer.de/lennart/projects/libasyncns/"; - description = "C library for Linux/Unix for executing name service queries asynchronously"; - license = licenses.lgpl21; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix deleted file mode 100644 index bf83a9e8456a..000000000000 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool }: - -stdenv.mkDerivation rec { - pname = "libatomic_ops"; - version = "7.8.2"; - - src = fetchurl { - urls = [ - "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz" - "https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz" - ]; - sha256 = "sha256-0wUgf+IH8rP7XLTAGdoStEzj/LxZPf1QgNhnsaJBm1E="; - }; - - outputs = [ "out" "dev" "doc" ]; - - nativeBuildInputs = lib.optionals stdenv.isCygwin [ autoconf automake libtool ]; - - preConfigure = lib.optionalString stdenv.isCygwin '' - sed -i -e "/libatomic_ops_gpl_la_SOURCES/a libatomic_ops_gpl_la_LIBADD = libatomic_ops.la" src/Makefile.am - ./autogen.sh - ''; - - meta = { - description = "Library for semi-portable access to hardware-provided atomic memory update operations"; - license = lib.licenses.gpl2Plus ; - maintainers = [lib.maintainers.raskin]; - platforms = with lib.platforms; unix ++ windows; - }; -} diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix deleted file mode 100644 index 9c790172039b..000000000000 --- a/pkgs/development/libraries/libaudclient/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, dbus-glib }: - -stdenv.mkDerivation rec { - pname = "libaudclient"; - version = "3.5-rc2"; - - src = fetchurl { - url = "https://distfiles.audacious-media-player.org/${pname}-${version}.tar.bz2"; - sha256 = "0nhpgz0kg8r00z54q5i96pjk7s57krq3fvdypq496c7fmlv9kdap"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib dbus-glib ]; - - meta = with lib; { - description = "Legacy D-Bus client library for Audacious"; - homepage = "https://audacious-media-player.org/"; - license = licenses.bsd2; - maintainers = with maintainers; [ pSub ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/libraries/libaudec/default.nix b/pkgs/development/libraries/libaudec/default.nix deleted file mode 100644 index ffe5f785acd5..000000000000 --- a/pkgs/development/libraries/libaudec/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, libsndfile, libsamplerate -, meson, ninja, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "libaudec"; - version = "0.3.4"; - - src = fetchFromGitHub { - owner = "zrythm"; - repo = "libaudec"; - rev = "v${version}"; - sha256 = "sha256-8morbrq8zG+2N3ruMeJa85ci9P0wPQOfZ5H56diFEAo="; - }; - - buildInputs = [ libsndfile libsamplerate ]; - nativeBuildInputs = [ meson ninja pkg-config ]; - - meta = with lib; { - description = "Library for reading and resampling audio files"; - homepage = "https://www.zrythm.org"; - license = licenses.agpl3Plus; - mainProgram = "audec"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix deleted file mode 100644 index 4dfc5713af7e..000000000000 --- a/pkgs/development/libraries/libavc1394/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libraw1394, argp-standalone }: - -stdenv.mkDerivation rec { - pname = "libavc1394"; - version = "0.5.4"; - - src = fetchurl { - url = "mirror://sourceforge/libavc1394/${pname}-${version}.tar.gz"; - sha256 = "0lsv46jdqvdx5hx92v0z2cz3yh6212pz9gk0k3513sbaa04zzcbw"; - }; - - buildInputs = lib.optional stdenv.hostPlatform.isMusl argp-standalone; - nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ libraw1394 ]; - - NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-largp"; - - meta = { - description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set"; - homepage = "https://sourceforge.net/projects/libavc1394/"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix deleted file mode 100644 index 8e7ebeb0a251..000000000000 --- a/pkgs/development/libraries/libavif/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, libaom -, cmake -, pkg-config -, zlib -, libpng -, libjpeg -, dav1d -, libyuv -, gdk-pixbuf -, makeWrapper -}: - -let - gdkPixbufModuleDir = "${placeholder "out"}/${gdk-pixbuf.moduleDir}"; - gdkPixbufModuleFile = "${placeholder "out"}/${gdk-pixbuf.binaryDir}/avif-loaders.cache"; -in - -stdenv.mkDerivation rec { - pname = "libavif"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "AOMediaCodec"; - repo = pname; - rev = "v${version}"; - hash = "sha256-yNJiMTWgOKR1c2pxTkLY/uPWGIY4xgH+Ee0r15oroDU="; - }; - - # reco: encode libaom slowest but best, decode dav1d fastest - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DAVIF_CODEC_AOM=ON" # best encoder (slow but small) - "-DAVIF_CODEC_DAV1D=ON" # best decoder (fast) - "-DAVIF_CODEC_AOM_DECODE=OFF" - "-DAVIF_BUILD_APPS=ON" - "-DAVIF_BUILD_GDK_PIXBUF=ON" - ]; - - nativeBuildInputs = [ - cmake - pkg-config - gdk-pixbuf - makeWrapper - ]; - - buildInputs = [ - gdk-pixbuf - zlib - libpng - libjpeg - ]; - - propagatedBuildInputs = [ - dav1d - libaom - libyuv - ]; - - postPatch = '' - substituteInPlace contrib/gdk-pixbuf/avif.thumbnailer.in \ - --replace '@CMAKE_INSTALL_FULL_BINDIR@/gdk-pixbuf-thumbnailer' "$out/libexec/gdk-pixbuf-thumbnailer-avif" - ''; - - env.PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = gdkPixbufModuleDir; - - postInstall = '' - GDK_PIXBUF_MODULEDIR=${gdkPixbufModuleDir} \ - GDK_PIXBUF_MODULE_FILE=${gdkPixbufModuleFile} \ - gdk-pixbuf-query-loaders --update-cache - - '' - # Cross-compiled gdk-pixbuf doesn't support thumbnailers - + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' - mkdir -p "$out/bin" - makeWrapper ${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer "$out/libexec/gdk-pixbuf-thumbnailer-avif" \ - --set GDK_PIXBUF_MODULE_FILE ${gdkPixbufModuleFile} - ''; - - meta = with lib; { - description = "C implementation of the AV1 Image File Format"; - longDescription = '' - Libavif aims to be a friendly, portable C implementation of the - AV1 Image File Format. It is a work-in-progress, but can already - encode and decode all AOM supported YUV formats and bit depths - (with alpha). It also features an encoder and a decoder - (avifenc/avifdec). - ''; - homepage = "https://github.com/AOMediaCodec/libavif"; - changelog = "https://github.com/AOMediaCodec/libavif/blob/v${version}/CHANGELOG.md"; - maintainers = with maintainers; [ mkg20001 ]; - platforms = platforms.all; - license = licenses.bsd2; - }; -} diff --git a/pkgs/development/libraries/libax25/default.nix b/pkgs/development/libraries/libax25/default.nix deleted file mode 100644 index 27f519099006..000000000000 --- a/pkgs/development/libraries/libax25/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, stdenv -, fetchurl -, glibc -}: - -stdenv.mkDerivation rec { - pname = "libax25"; - version = "0.0.12-rc5"; - - buildInputs = [ glibc ] ++ lib.optionals stdenv.hostPlatform.isStatic [ glibc.static ]; - - # Due to recent unsolvable administrative domain problems with linux-ax25.org, - # the new domain is linux-ax25.in-berlin.de - src = fetchurl { - url = "https://linux-ax25.in-berlin.de/pub/ax25-lib/libax25-${version}.tar.gz"; - hash = "sha256-vxV5GVDOHr38N/512ArZpnZ+a7FTbXBNpoSJkc9DI98="; - }; - - configureFlags = [ "--sysconfdir=/etc" ]; - - LDFLAGS = lib.optionals stdenv.hostPlatform.isStatic [ "-static-libgcc" "-static" ]; - - meta = with lib; { - description = "AX.25 library for hamradio applications"; - homepage = "https://linux-ax25.in-berlin.de/wiki/Main_Page"; - license = licenses.lgpl21Only; - maintainers = with maintainers; [ sarcasticadmin ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/development/libraries/libayatana-appindicator/default.nix deleted file mode 100644 index 719f1b3e4275..000000000000 --- a/pkgs/development/libraries/libayatana-appindicator/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchFromGitHub, lib -, pkg-config, cmake -, gtk-doc -, gtk3, libayatana-indicator, libdbusmenu-gtk3 -, vala -, gobject-introspection -}: - -stdenv.mkDerivation rec { - pname = "libayatana-appindicator"; - version = "0.5.92"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "AyatanaIndicators"; - repo = "libayatana-appindicator"; - rev = version; - sha256 = "sha256-NzaWQBb2Ez1ik23wCgW1ZQh1/rY7GcPlLvaSgV7uXrA="; - }; - - nativeBuildInputs = [ pkg-config cmake gtk-doc vala gobject-introspection ]; - - buildInputs = [ gtk3 ]; - - propagatedBuildInputs = [ libayatana-indicator libdbusmenu-gtk3 ]; - - cmakeFlags = [ - "-DENABLE_BINDINGS_MONO=False" - ]; - - meta = with lib; { - description = "Ayatana Application Indicators Shared Library"; - homepage = "https://github.com/AyatanaIndicators/libayatana-appindicator"; - changelog = "https://github.com/AyatanaIndicators/libayatana-appindicator/blob/${version}/ChangeLog"; - license = [ licenses.lgpl3Plus licenses.lgpl21Plus ]; - maintainers = [ maintainers.nickhu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libayatana-common/default.nix b/pkgs/development/libraries/libayatana-common/default.nix deleted file mode 100644 index 439cc45031f9..000000000000 --- a/pkgs/development/libraries/libayatana-common/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, gitUpdater -, testers -, cmake -, glib -, gobject-introspection -, gtest -, intltool -, lomiri -, pkg-config -, systemd -, vala -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libayatana-common"; - version = "0.9.10"; - - src = fetchFromGitHub { - owner = "AyatanaIndicators"; - repo = "libayatana-common"; - rev = finalAttrs.version; - hash = "sha256-qi3xsnZjqSz3I7O+xPxDnI91qDIA0XFJ3tCQQF84vIg="; - }; - - postPatch = '' - # Queries via pkg_get_variable, can't override prefix - substituteInPlace data/CMakeLists.txt \ - --replace 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemd_user_unit_dir)' 'set(SYSTEMD_USER_UNIT_DIR ''${CMAKE_INSTALL_PREFIX}/lib/systemd/user)' - ''; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - gobject-introspection - intltool - pkg-config - vala - ]; - - buildInputs = [ - lomiri.cmake-extras - glib - lomiri.lomiri-url-dispatcher - systemd - ]; - - checkInputs = [ - gtest - ]; - - cmakeFlags = [ - "-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}" - "-DENABLE_LOMIRI_FEATURES=ON" - "-DGSETTINGS_LOCALINSTALL=ON" - "-DGSETTINGS_COMPILE=ON" - ]; - - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - - passthru = { - tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - updateScript = gitUpdater { }; - }; - - meta = with lib; { - description = "Common functions for Ayatana System Indicators"; - homepage = "https://github.com/AyatanaIndicators/libayatana-common"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.linux; - pkgConfigModules = [ - "libayatana-common" - ]; - }; -}) diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix deleted file mode 100644 index 39697b4af521..000000000000 --- a/pkgs/development/libraries/libb2/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, libtool -, pkg-config -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libb2"; - version = "0.98.1"; - - src = fetchFromGitHub { - owner = "BLAKE2"; - repo = "libb2"; - rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "0qj8aaqvfcavj1vj5asm4pqm03ap7q8x4c2fy83cqggvky0frgya"; - }; - - nativeBuildInputs = [ - autoreconfHook - libtool - pkg-config - ]; - - configureFlags = lib.optional stdenv.hostPlatform.isx86 "--enable-fat=yes"; - - enableParallelBuilding = true; - - doCheck = true; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = with lib; { - description = "BLAKE2 family of cryptographic hash functions"; - homepage = "https://blake2.net/"; - pkgConfigModules = [ "libb2" ]; - platforms = platforms.all; - maintainers = with maintainers; [ dfoxfranke dotlambda ]; - license = licenses.cc0; - }; -}) diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix deleted file mode 100644 index 3b24089e53c6..000000000000 --- a/pkgs/development/libraries/libb64/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "libb64"; - version = "2.0.0.1"; - - src = fetchFromGitHub { - owner = "libb64"; - repo = "libb64"; - rev = "v${version}"; - sha256 = "sha256-9loDftr769qnIi00MueO86kjha2EiG9pnCLogp0Iq3c="; - }; - - patches = [ - # Fix parallel build failure: https://github.com/libb64/libb64/pull/9 - # make[1]: *** No rule to make target 'libb64.a', needed by 'c-example1'. Stop. - (fetchpatch { - name = "parallel-make.patch"; - url = "https://github.com/libb64/libb64/commit/4fe47c052e9123da8f751545deb48be08c3411f6.patch"; - sha256 = "18b3np3gpyzimqmk6001riqv5n70wfbclky6zzsrvj5zl1dj4ljf"; - }) - # Fix i686-linux build failure. - (fetchpatch { - name = "elif.patch"; - url = "https://github.com/libb64/libb64/commit/819e43c8b34261ea3ee694bdc27865a033966083.patch"; - hash = "sha256-r2jI6Q3rWDtArLlkAuyy7vcjsuRvX+2fBd5yk8XOMcc"; - }) - (fetchpatch { - name = "size_t.patch"; - url = "https://github.com/libb64/libb64/commit/b5edeafc89853c48fa41a4c16393a1fdc8638ab6.patch"; - hash = "sha256-+bqfOOlT/t0FLQEMHuxW1BxJcx9rk0yYM3wD43mcymo"; - }) - # Fix build with Clang 16. - # https://github.com/libb64/libb64/pull/10 - (fetchpatch { - name = "use-proper-function-prototype-for-main.patch"; - url = "https://github.com/libb64/libb64/commit/98eaf510f40e384b32c01ad4bd5c3a697fdd8560.patch"; - hash = "sha256-CGslJUw0og/bBBirLm0J5Q7cf2WW/vniVAkXHlb6lbQ="; - }) - ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) (fetchpatch { - name = "0001-example-Do-not-run-the-tests.patch"; - url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch?id=484e0de1e4ee107f21ae2a5c5f976ed987978baf"; - sha256 = "sha256-KTsiIWJe66BKlu/A43FWfW0XAu4E7lWX/RY4NITRrm4="; - }); - - enableParallelBuilding = true; - - installPhase = '' - mkdir -p $out $out/lib $out/bin $out/include - cp -r include/* $out/include/ - cp base64/base64 $out/bin/ - cp src/libb64.a src/cencode.o src/cdecode.o $out/lib/ - ''; - - meta = { - description = "ANSI C routines for fast base64 encoding/decoding"; - homepage = "https://github.com/libb64/libb64"; - license = lib.licenses.publicDomain; - mainProgram = "base64"; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch b/pkgs/development/libraries/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch deleted file mode 100644 index 61fd56ee0880..000000000000 --- a/pkgs/development/libraries/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch +++ /dev/null @@ -1,201 +0,0 @@ -From eadfee17e7d3a1c1bb2a0ff8585772b40331ebd7 Mon Sep 17 00:00:00 2001 -From: Jan Tojnar <jtojnar@gmail.com> -Date: Sat, 24 Dec 2022 15:31:51 +0100 -Subject: [PATCH 1/4] libbacktrace: avoid libtool wrapping tests -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When `--enable-shared` is used, libtool will produce shell scripts -instead of programs, preventing separate debug info from being generated: - - objcopy --only-keep-debug btest btest_gnudebuglink.debug - objcopy: btest: file format not recognized - make[2]: *** [Makefile:2615: btest_gnudebuglink] Error 1 - -Let’s make it properly set rpath with `-no-install` flag, -so that wrappers are not needed, as mentioned on -https://autotools.info/libtool/wrappers.html ---- - Makefile.am | 28 +++++++++++++++++++++++----- - 1 file changed, 23 insertions(+), 5 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 3d67909..06ccf3f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -107,6 +107,8 @@ check_DATA = - # Flags to use when compiling test programs. - libbacktrace_TEST_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) -g - -+libbacktrace_TEST_LDFLAGS = -no-install -+ - if USE_DSYMUTIL - - %.dSYM: % -@@ -171,48 +173,56 @@ xcoff_%.c: xcoff.c - - test_elf_32_SOURCES = test_format.c testlib.c - test_elf_32_CFLAGS = $(libbacktrace_TEST_CFLAGS) -+test_elf_32_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - test_elf_32_LDADD = libbacktrace_noformat.la elf_32.lo - - BUILDTESTS += test_elf_32 - - test_elf_64_SOURCES = test_format.c testlib.c - test_elf_64_CFLAGS = $(libbacktrace_TEST_CFLAGS) -+test_elf_64_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - test_elf_64_LDADD = libbacktrace_noformat.la elf_64.lo - - BUILDTESTS += test_elf_64 - - test_macho_SOURCES = test_format.c testlib.c - test_macho_CFLAGS = $(libbacktrace_TEST_CFLAGS) -+test_macho_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - test_macho_LDADD = libbacktrace_noformat.la macho.lo - - BUILDTESTS += test_macho - - test_xcoff_32_SOURCES = test_format.c testlib.c - test_xcoff_32_CFLAGS = $(libbacktrace_TEST_CFLAGS) -+test_xcoff_32_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - test_xcoff_32_LDADD = libbacktrace_noformat.la xcoff_32.lo - - BUILDTESTS += test_xcoff_32 - - test_xcoff_64_SOURCES = test_format.c testlib.c - test_xcoff_64_CFLAGS = $(libbacktrace_TEST_CFLAGS) -+test_xcoff_64_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - test_xcoff_64_LDADD = libbacktrace_noformat.la xcoff_64.lo - - BUILDTESTS += test_xcoff_64 - - test_pecoff_SOURCES = test_format.c testlib.c - test_pecoff_CFLAGS = $(libbacktrace_TEST_CFLAGS) -+test_pecoff_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - test_pecoff_LDADD = libbacktrace_noformat.la pecoff.lo - - BUILDTESTS += test_pecoff - - test_unknown_SOURCES = test_format.c testlib.c - test_unknown_CFLAGS = $(libbacktrace_TEST_CFLAGS) -+test_unknown_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - test_unknown_LDADD = libbacktrace_noformat.la unknown.lo - - BUILDTESTS += test_unknown - - unittest_SOURCES = unittest.c testlib.c - unittest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -+unittest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - unittest_LDADD = libbacktrace.la - - BUILDTESTS += unittest -@@ -254,7 +264,7 @@ if HAVE_OBJCOPY_DEBUGLINK - - b2test_SOURCES = $(btest_SOURCES) - b2test_CFLAGS = $(libbacktrace_TEST_CFLAGS) --b2test_LDFLAGS = -Wl,--build-id -+b2test_LDFLAGS = -Wl,--build-id $(libbacktrace_TEST_LDFLAGS) - b2test_LDADD = libbacktrace_elf_for_test.la - - check_PROGRAMS += b2test -@@ -264,7 +274,7 @@ if HAVE_DWZ - - b3test_SOURCES = $(btest_SOURCES) - b3test_CFLAGS = $(libbacktrace_TEST_CFLAGS) --b3test_LDFLAGS = -Wl,--build-id -+b3test_LDFLAGS = -Wl,--build-id $(libbacktrace_TEST_LDFLAGS) - b3test_LDADD = libbacktrace_elf_for_test.la - - check_PROGRAMS += b3test -@@ -278,6 +288,7 @@ endif HAVE_ELF - - btest_SOURCES = btest.c testlib.c - btest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -O -+btest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - btest_LDADD = libbacktrace.la - - BUILDTESTS += btest -@@ -332,6 +343,7 @@ endif HAVE_DWZ - - stest_SOURCES = stest.c - stest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -+stest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - stest_LDADD = libbacktrace.la - - BUILDTESTS += stest -@@ -354,6 +366,7 @@ if HAVE_ELF - - ztest_SOURCES = ztest.c testlib.c - ztest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -DSRCDIR=\"$(srcdir)\" -+ztest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - ztest_LDADD = libbacktrace.la - ztest_alloc_LDADD = libbacktrace_alloc.la - -@@ -373,6 +386,7 @@ BUILDTESTS += ztest_alloc - - zstdtest_SOURCES = zstdtest.c testlib.c - zstdtest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -DSRCDIR=\"$(srcdir)\" -+zstdtest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - zstdtest_LDADD = libbacktrace.la - zstdtest_alloc_LDADD = libbacktrace_alloc.la - -@@ -394,6 +408,7 @@ endif HAVE_ELF - - edtest_SOURCES = edtest.c edtest2_build.c testlib.c - edtest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -+edtest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - edtest_LDADD = libbacktrace.la - - BUILDTESTS += edtest -@@ -424,6 +439,7 @@ BUILDTESTS += ttest - - ttest_SOURCES = ttest.c testlib.c - ttest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -pthread -+ttest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - ttest_LDADD = libbacktrace.la - - if USE_DSYMUTIL -@@ -472,12 +488,12 @@ if HAVE_COMPRESSED_DEBUG - - ctestg_SOURCES = btest.c testlib.c - ctestg_CFLAGS = $(libbacktrace_TEST_CFLAGS) --ctestg_LDFLAGS = -Wl,--compress-debug-sections=zlib-gnu -+ctestg_LDFLAGS = -Wl,--compress-debug-sections=zlib-gnu $(libbacktrace_TEST_LDFLAGS) - ctestg_LDADD = libbacktrace.la - - ctesta_SOURCES = btest.c testlib.c - ctesta_CFLAGS = $(libbacktrace_TEST_CFLAGS) --ctesta_LDFLAGS = -Wl,--compress-debug-sections=zlib-gabi -+ctesta_LDFLAGS = -Wl,--compress-debug-sections=zlib-gabi $(libbacktrace_TEST_LDFLAGS) - ctesta_LDADD = libbacktrace.la - - BUILDTESTS += ctestg ctesta -@@ -486,7 +502,7 @@ if HAVE_COMPRESSED_DEBUG_ZSTD - - ctestzstd_SOURCES = btest.c testlib.c - ctestzstd_CFLAGS = $(libbacktrace_TEST_CFLAGS) --ctestzstd_LDFLAGS = -Wl,--compress-debug-sections=zstd -+ctestzstd_LDFLAGS = -Wl,--compress-debug-sections=zstd $(libbacktrace_TEST_LDFLAGS) - ctestzstd_LDADD = libbacktrace.la - - BUILDTESTS += ctestzstd -@@ -533,6 +549,7 @@ endif - - mtest_SOURCES = mtest.c testlib.c - mtest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -O -+mtest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - mtest_LDADD = libbacktrace.la - - BUILDTESTS += mtest -@@ -565,6 +582,7 @@ if HAVE_ELF - - xztest_SOURCES = xztest.c testlib.c - xztest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -DSRCDIR=\"$(srcdir)\" -+xztest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - xztest_LDADD = libbacktrace.la - - xztest_alloc_SOURCES = $(xztest_SOURCES) --- -2.43.1 - diff --git a/pkgs/development/libraries/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch b/pkgs/development/libraries/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch deleted file mode 100644 index ee6063875091..000000000000 --- a/pkgs/development/libraries/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 2ceaa9bc8a9a0c8a02806a92e19bd21b3fccf3a0 Mon Sep 17 00:00:00 2001 -From: Jan Tojnar <jtojnar@gmail.com> -Date: Sat, 24 Dec 2022 16:46:18 +0100 -Subject: [PATCH 2/4] libbacktrace: Allow configuring debug dir -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On platforms that do not use FHS like NixOS or GNU Guix, -the build-id directories are not under `/usr/lib/debug`. - -Let’s add `--with-separate-debug-dir` configure flag so that -the path can be changed. The same flag is supported by gdb: - -https://github.com/bminor/binutils-gdb/blob/095f84c7e3cf85cd68c657c46b80be078f336bc9/gdb/configure.ac#L113-L115 ---- - Makefile.am | 13 +++++++------ - configure.ac | 8 ++++++++ - elf.c | 4 ++-- - 3 files changed, 17 insertions(+), 8 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 06ccf3f..6304faa 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -33,7 +33,8 @@ ACLOCAL_AMFLAGS = -I config - - AM_CPPFLAGS = - --AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG) -+AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG) \ -+ -DSYSTEM_DEBUG_DIR=\"$(SEPARATE_DEBUG_DIR)\" - - include_HEADERS = backtrace.h backtrace-supported.h - -@@ -134,7 +135,7 @@ libbacktrace_noformat_la_DEPENDENCIES = $(libbacktrace_noformat_la_LIBADD) - if HAVE_ELF - if HAVE_OBJCOPY_DEBUGLINK - --TEST_BUILD_ID_DIR=$(abs_builddir)/usr/lib/debug/.build-id/ -+TEST_DEBUG_DIR=$(abs_builddir)/usr/lib/debug - - check_LTLIBRARIES += libbacktrace_elf_for_test.la - -@@ -143,8 +144,8 @@ libbacktrace_elf_for_test_la_LIBADD = $(BACKTRACE_FILE) elf_for_test.lo \ - $(VIEW_FILE) $(ALLOC_FILE) - - elf_for_test.c: elf.c -- SEARCH='^#define SYSTEM_BUILD_ID_DIR.*$$'; \ -- REPLACE="#define SYSTEM_BUILD_ID_DIR \"$(TEST_BUILD_ID_DIR)\""; \ -+ SEARCH='^#define BUILD_ID_DIR.*$$'; \ -+ REPLACE='\0\n#undef SYSTEM_DEBUG_DIR\n#define SYSTEM_DEBUG_DIR "$(TEST_DEBUG_DIR)"'; \ - $(SED) "s%$$SEARCH%$$REPLACE%" \ - $< \ - > $@.tmp -@@ -474,13 +475,13 @@ endif HAVE_OBJCOPY_DEBUGLINK - - %_buildid: % - ./install-debuginfo-for-buildid.sh \ -- "$(TEST_BUILD_ID_DIR)" \ -+ "$(TEST_DEBUG_DIR)/.build-id" \ - $< - $(OBJCOPY) --strip-debug $< $@ - - %_buildidfull: % - ./install-debuginfo-for-buildid.sh \ -- "$(TEST_BUILD_ID_DIR)" \ -+ "$(TEST_DEBUG_DIR)/.build-id" \ - $< - $(OBJCOPY) --strip-all $< $@ - -diff --git a/configure.ac b/configure.ac -index 69304ea..aeb2ee9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -67,6 +67,14 @@ AM_MAINTAINER_MODE - AC_ARG_WITH(target-subdir, - [ --with-target-subdir=SUBDIR Configuring in a subdirectory for target]) - -+AC_ARG_WITH(separate-debug-dir, -+[ --with-separate-debug-dir=DEBUGDIR Look for global separate debug info in this path @<:@LIBDIR/debug@:>@], -+[separate_debug_dir=$withval], -+[separate_debug_dir=$libdir/debug]) -+ -+SEPARATE_DEBUG_DIR=$separate_debug_dir -+AC_SUBST(SEPARATE_DEBUG_DIR) -+ - # We must force CC to /not/ be precious variables; otherwise - # the wrong, non-multilib-adjusted value will be used in multilibs. - # As a side effect, we have to subst CFLAGS ourselves. -diff --git a/elf.c b/elf.c -index 3ef07bb..21fbe4f 100644 ---- a/elf.c -+++ b/elf.c -@@ -856,7 +856,7 @@ elf_readlink (struct backtrace_state *state, const char *filename, - } - } - --#define SYSTEM_BUILD_ID_DIR "/usr/lib/debug/.build-id/" -+#define BUILD_ID_DIR "/.build-id/" - - /* Open a separate debug info file, using the build ID to find it. - Returns an open file descriptor, or -1. -@@ -870,7 +870,7 @@ elf_open_debugfile_by_buildid (struct backtrace_state *state, - backtrace_error_callback error_callback, - void *data) - { -- const char * const prefix = SYSTEM_BUILD_ID_DIR; -+ const char * const prefix = SYSTEM_DEBUG_DIR BUILD_ID_DIR; - const size_t prefix_len = strlen (prefix); - const char * const suffix = ".debug"; - const size_t suffix_len = strlen (suffix); --- -2.43.1 - diff --git a/pkgs/development/libraries/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch b/pkgs/development/libraries/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch deleted file mode 100644 index 7b8f8f0f61dc..000000000000 --- a/pkgs/development/libraries/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 47c3503938c863d55c835463d8815b5fa4ab8326 Mon Sep 17 00:00:00 2001 -From: Jan Tojnar <jtojnar@gmail.com> -Date: Sat, 24 Dec 2022 20:19:27 +0100 -Subject: [PATCH 3/4] libbacktrace: Support multiple build id directories -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -gdb supports multiple debug directories separated by colons: -https://github.com/bminor/binutils-gdb/blob/fcbfb25dcca625a7f999ec51d48b6fc3a32123c3/gdb/build-id.c#L136-L142 - -This is useful for example when using dwarffs in addition -to debug data installed using distribution’s package manager. ---- - elf.c | 57 ++++++++++++++++++++++++++++++++++++--------------------- - 1 file changed, 36 insertions(+), 21 deletions(-) - -diff --git a/elf.c b/elf.c -index 21fbe4f..ccffa95 100644 ---- a/elf.c -+++ b/elf.c -@@ -865,12 +865,12 @@ elf_readlink (struct backtrace_state *state, const char *filename, - when the build ID is known is in /usr/lib/debug/.build-id. */ - - static int --elf_open_debugfile_by_buildid (struct backtrace_state *state, -+elf_open_debugfile_by_buildid (const char * const prefix, -+ struct backtrace_state *state, - const char *buildid_data, size_t buildid_size, - backtrace_error_callback error_callback, - void *data) - { -- const char * const prefix = SYSTEM_DEBUG_DIR BUILD_ID_DIR; - const size_t prefix_len = strlen (prefix); - const char * const suffix = ".debug"; - const size_t suffix_len = strlen (suffix); -@@ -6947,27 +6947,42 @@ elf_add (struct backtrace_state *state, const char *filename, int descriptor, - if (buildid_data != NULL) - { - int d; -+ char debug_directories[strlen(SYSTEM_DEBUG_DIR) + 1]; -+ char *debug_dir; - -- d = elf_open_debugfile_by_buildid (state, buildid_data, buildid_size, -- error_callback, data); -- if (d >= 0) -- { -- int ret; -+ strcpy(debug_directories, SYSTEM_DEBUG_DIR); - -- elf_release_view (state, &buildid_view, error_callback, data); -- if (debuglink_view_valid) -- elf_release_view (state, &debuglink_view, error_callback, data); -- if (debugaltlink_view_valid) -- elf_release_view (state, &debugaltlink_view, error_callback, data); -- ret = elf_add (state, "", d, NULL, 0, base_address, opd, -- error_callback, data, fileline_fn, found_sym, -- found_dwarf, NULL, 0, 1, NULL, 0); -- if (ret < 0) -- backtrace_close (d, error_callback, data); -- else if (descriptor >= 0) -- backtrace_close (descriptor, error_callback, data); -- return ret; -- } -+ debug_dir = strtok (debug_directories, ":"); -+ while (debug_dir != NULL) -+ { -+ char prefix[strlen(debug_dir) + strlen(BUILD_ID_DIR) + 1]; -+ strcpy(prefix, debug_dir); -+ strcat(prefix, BUILD_ID_DIR); -+ -+ d = elf_open_debugfile_by_buildid (prefix, state, buildid_data, buildid_size, -+ error_callback, data); -+ -+ if (d >= 0) -+ { -+ int ret; -+ -+ elf_release_view (state, &buildid_view, error_callback, data); -+ if (debuglink_view_valid) -+ elf_release_view (state, &debuglink_view, error_callback, data); -+ if (debugaltlink_view_valid) -+ elf_release_view (state, &debugaltlink_view, error_callback, data); -+ ret = elf_add (state, "", d, NULL, 0, base_address, opd, -+ error_callback, data, fileline_fn, found_sym, -+ found_dwarf, NULL, 0, 1, NULL, 0); -+ if (ret < 0) -+ backtrace_close (d, error_callback, data); -+ else if (descriptor >= 0) -+ backtrace_close (descriptor, error_callback, data); -+ return ret; -+ } -+ -+ debug_dir = strtok (NULL, ":"); -+ } - } - - if (buildid_view_valid) --- -2.43.1 - diff --git a/pkgs/development/libraries/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch b/pkgs/development/libraries/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch deleted file mode 100644 index 2da495e95521..000000000000 --- a/pkgs/development/libraries/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 884ef7c843be906d62e4240c2a0e885dcd5a5726 Mon Sep 17 00:00:00 2001 -From: Jan Tojnar <jtojnar@gmail.com> -Date: Sat, 24 Dec 2022 20:30:22 +0100 -Subject: [PATCH 4/4] libbacktrace: Support NIX_DEBUG_INFO_DIRS environment - variable -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Let’s make debug data lookup work on NixOS just like in gdb. ---- - elf.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/elf.c b/elf.c -index ccffa95..e86950d 100644 ---- a/elf.c -+++ b/elf.c -@@ -6946,11 +6946,18 @@ elf_add (struct backtrace_state *state, const char *filename, int descriptor, - - if (buildid_data != NULL) - { -+ const char *debug_directories_immutable; -+ const char *nix_debug = getenv ("NIX_DEBUG_INFO_DIRS"); -+ if (nix_debug != NULL) -+ debug_directories_immutable = nix_debug; -+ else -+ debug_directories_immutable = SYSTEM_DEBUG_DIR; -+ - int d; -- char debug_directories[strlen(SYSTEM_DEBUG_DIR) + 1]; -+ char debug_directories[strlen(debug_directories_immutable) + 1]; - char *debug_dir; - -- strcpy(debug_directories, SYSTEM_DEBUG_DIR); -+ strcpy(debug_directories, debug_directories_immutable); - - debug_dir = strtok (debug_directories, ":"); - while (debug_dir != NULL) --- -2.43.1 - diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/development/libraries/libbacktrace/default.nix deleted file mode 100644 index 1be572671e02..000000000000 --- a/pkgs/development/libraries/libbacktrace/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, enableStatic ? stdenv.hostPlatform.isStatic -, enableShared ? !stdenv.hostPlatform.isStatic -, unstableGitUpdater -, autoreconfHook -}: - -stdenv.mkDerivation { - pname = "libbacktrace"; - version = "0-unstable-2024-03-02"; - - src = fetchFromGitHub { - owner = "ianlancetaylor"; - repo = "libbacktrace"; - rev = "28824f2cc9069e3fdc39d3702acdf753e35c41b4"; - sha256 = "1k1O1GT22hZAWPF8NYP0y4qe+e3pGfzT9Mz2TH+H/v4="; - }; - - patches = [ - # Fix tests with shared library. - # https://github.com/ianlancetaylor/libbacktrace/pull/99 - ./0001-libbacktrace-avoid-libtool-wrapping-tests.patch - - # Support multiple debug dirs. - # https://github.com/ianlancetaylor/libbacktrace/pull/100 - ./0002-libbacktrace-Allow-configuring-debug-dir.patch - ./0003-libbacktrace-Support-multiple-build-id-directories.patch - - # Support NIX_DEBUG_INFO_DIRS environment variable. - ./0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch - ]; - - nativeBuildInputs = [ - autoreconfHook - ]; - - configureFlags = [ - (lib.enableFeature enableStatic "static") - (lib.enableFeature enableShared "shared") - ]; - - doCheck = stdenv.isLinux && !stdenv.hostPlatform.isMusl; - - passthru = { - updateScript = unstableGitUpdater { }; - }; - - meta = with lib; { - description = "C library that may be linked into a C/C++ program to produce symbolic backtraces"; - homepage = "https://github.com/ianlancetaylor/libbacktrace"; - maintainers = with maintainers; [ twey ]; - license = with licenses; [ bsd3 ]; - }; -} diff --git a/pkgs/development/libraries/libbaseencode/default.nix b/pkgs/development/libraries/libbaseencode/default.nix deleted file mode 100644 index 7cd4b173c9b7..000000000000 --- a/pkgs/development/libraries/libbaseencode/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "libbaseencode"; - version = "1.0.15"; - - src = fetchFromGitHub { - owner = "paolostivanin"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-WiE+ZMX4oZieER1pu43aSWytkxfkQdX+S3JI98XPpL4="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Library written in C for encoding and decoding data using base32 or base64 (RFC-4648)"; - homepage = "https://github.com/paolostivanin/libbaseencode"; - license = licenses.asl20; - maintainers = with maintainers; [ alexbakker ]; - }; -} diff --git a/pkgs/development/libraries/libbde/default.nix b/pkgs/development/libraries/libbde/default.nix deleted file mode 100644 index 4bef9748701c..000000000000 --- a/pkgs/development/libraries/libbde/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fuse -, ncurses -, python3 -}: - -stdenv.mkDerivation rec { - pname = "libbde"; - version = "20221031"; - - src = fetchurl { - url = "https://github.com/libyal/libbde/releases/download/${version}/${pname}-alpha-${version}.tar.gz"; - sha256 = "sha256-uMbwofboePCFWlxEOdRbZK7uZuj0MZC/qusWuu0Bm7g="; - }; - - buildInputs = [ fuse ncurses python3 ]; - - configureFlags = [ "--enable-python" ]; - - meta = with lib; { - description = "Library to access the BitLocker Drive Encryption (BDE) format"; - homepage = "https://github.com/libyal/libbde/"; - license = licenses.lgpl3; - maintainers = with maintainers; [ eliasp ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix deleted file mode 100644 index 5c2255a50a62..000000000000 --- a/pkgs/development/libraries/libbdplus/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, libgcrypt, libgpg-error, gettext }: - -# library that allows libbluray to play BDplus protected bluray disks -# libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info. - -# Info on how to use / obtain aacs keys: -# http://vlc-bluray.whoknowsmy.name/ -# https://wiki.archlinux.org/index.php/BluRay - -stdenv.mkDerivation rec { - pname = "libbdplus"; - version = "0.2.0"; - - src = fetchurl { - url = "http://get.videolan.org/libbdplus/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-uT7qPq7zPW6RVdLDSwaMUFSTqlpJNuYydPQ0KrD0Clg="; - }; - - buildInputs = [ libgcrypt libgpg-error gettext ]; - - nativeBuildInputs = [ ]; - - meta = with lib; { - homepage = "http://www.videolan.org/developers/libbdplus.html"; - description = "Library to access BD+ protected Blu-Ray disks"; - license = licenses.lgpl21; - maintainers = with maintainers; [ abbradar ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix deleted file mode 100644 index 94d1257d0e7d..000000000000 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, cmake, git, doxygen, help2man, ncurses, tecla -, libusb1, udev }: - -stdenv.mkDerivation rec { - pname = "libbladeRF"; - version = "2.5.0"; - - src = fetchFromGitHub { - owner = "Nuand"; - repo = "bladeRF"; - rev = "libbladeRF_v${version}"; - hash = "sha256-H40w5YKp6M3QLrsPhILEnJiWutCYLtbgC4a63sV397Q="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ cmake pkg-config git doxygen help2man ]; - # ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208 - buildInputs = [ tecla libusb1 ] - ++ lib.optionals stdenv.isLinux [ udev ] - ++ lib.optionals stdenv.isDarwin [ ncurses ]; - - # Fixup shebang - prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash"; - - # Let us avoid nettools as a dependency. - postPatch = '' - sed -i 's/$(hostname)/hostname/' host/utilities/bladeRF-cli/src/cmd/doc/generate.bash - ''; - - cmakeFlags = [ - "-DBUILD_DOCUMENTATION=ON" - ] ++ lib.optionals stdenv.isLinux [ - "-DUDEV_RULES_PATH=etc/udev/rules.d" - "-DINSTALL_UDEV_RULES=ON" - "-DBLADERF_GROUP=bladerf" - ]; - - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; - }; - - hardeningDisable = [ "fortify" ]; - - meta = with lib; { - homepage = "https://nuand.com/libbladeRF-doc"; - description = "Supporting library of the BladeRF SDR opensource hardware"; - license = licenses.lgpl21; - maintainers = with maintainers; [ markuskowa ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix deleted file mode 100644 index 7679aefe5b95..000000000000 --- a/pkgs/development/libraries/libblockdev/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config -, gtk-doc -, docbook_xml_dtd_43 -, python3 -, gobject-introspection -, glib -, udev -, kmod -, parted -, cryptsetup -, lvm2 -, util-linux -, libbytesize -, libndctl -, nss -, volume_key -, libxslt -, docbook_xsl -, gptfdisk -, libyaml -, autoconf-archive -, thin-provisioning-tools -, makeBinaryWrapper -, e2fsprogs -, libnvme -, keyutils -}: -stdenv.mkDerivation (finalAttrs: { - pname = "libblockdev"; - version = "3.1.1"; - - src = fetchFromGitHub { - owner = "storaged-project"; - repo = "libblockdev"; - rev = "${finalAttrs.version}-1"; - hash = "sha256-WCMedMkaMMhZbB3iJu3c+CTT3AvOjzOSYP45J+NQEDQ="; - }; - - outputs = [ "out" "dev" "devdoc" ]; - - postPatch = '' - patchShebangs scripts - ''; - - nativeBuildInputs = [ - autoconf-archive - autoreconfHook - docbook_xsl - docbook_xml_dtd_43 - gobject-introspection - gtk-doc - libxslt - makeBinaryWrapper - pkg-config - python3 - ]; - - buildInputs = [ - cryptsetup - e2fsprogs - glib - gptfdisk - keyutils - kmod - libbytesize - libndctl - libnvme - libyaml - lvm2 - nss - parted - udev - util-linux - volume_key - ]; - - postInstall = '' - wrapProgram $out/bin/lvm-cache-stats --prefix PATH : \ - ${lib.makeBinPath [ thin-provisioning-tools ]} - ''; - - meta = { - changelog = "https://github.com/storaged-project/libblockdev/raw/${finalAttrs.src.rev}/NEWS.rst"; - description = "Library for manipulating block devices"; - homepage = "http://storaged.org/libblockdev/"; - license = with lib.licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the utils - maintainers = with lib.maintainers; [ johnazoidberg ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/development/libraries/libblocksruntime/default.nix deleted file mode 100644 index 0ab380064429..000000000000 --- a/pkgs/development/libraries/libblocksruntime/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, clang }: - -stdenv.mkDerivation { - pname = "blocksruntime"; - version = "unstable-2014-06-24"; - - src = fetchFromGitHub { - owner = "mackyle"; - repo = "blocksruntime"; - rev = "b5c5274daf1e0e46ecc9ad8f6f69889bce0a0a5d"; - sha256 = "0ic4lagagkylcvwgf10mg0s1i57h4i25ds2fzvms22xj4zwzk1sd"; - }; - - buildInputs = [ clang ]; - - configurePhase = '' - export CC=clang - export CXX=clang++ - ''; - - buildPhase = "./buildlib"; - - checkPhase = "./checktests"; - - doCheck = false; # hasdescriptor.c test fails, hrm. - - installPhase = ''prefix="/" DESTDIR=$out ./installlib''; - - meta = with lib; { - description = "Installs the BlocksRuntime library from the compiler-rt"; - homepage = "https://github.com/mackyle/blocksruntime"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 672908281b0e..c31c05920e31 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ fontconfig ] ++ lib.optional withMetadata libxml2 ++ lib.optional withFonts freetype - ++ lib.optional stdenv.isDarwin DiskArbitration; + ++ lib.optional stdenv.hostPlatform.isDarwin DiskArbitration; propagatedBuildInputs = lib.optional withAACS libaacs; diff --git a/pkgs/development/libraries/libbpkg/default.nix b/pkgs/development/libraries/libbpkg/default.nix deleted file mode 100644 index 969654b675a2..000000000000 --- a/pkgs/development/libraries/libbpkg/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv -, build2 -, fetchurl -, libbutl -, enableShared ? !stdenv.hostPlatform.isStatic -, enableStatic ? !enableShared -}: - -stdenv.mkDerivation rec { - pname = "libbpkg"; - version = "0.17.0"; - outputs = [ "out" "dev" "doc" ]; - - src = fetchurl { - url = "https://pkg.cppget.org/1/alpha/build2/libbpkg-${version}.tar.gz"; - hash = "sha256-4P4+uJGWB3iblYPuErJNr8c7/pS2UhN6LXr7MY2rWDY="; - }; - - nativeBuildInputs = [ - build2 - ]; - buildInputs = [ - libbutl - ]; - - build2ConfigureFlags = [ - "config.bin.lib=${build2.configSharedStatic enableShared enableStatic}" - ]; - - strictDeps = true; - - doCheck = true; - - meta = with lib; { - description = "build2 package dependency manager utility library"; - longDescription = '' - This library defines the types and utilities for working with build2 packages. - In particular, it provides C++ classes as well as the parser and serializer - implementations that can be used to read, manipulate, and write package, - repository and signature manifests. - ''; - homepage = "https://build2.org/"; - changelog = "https://git.build2.org/cgit/libbpkg/log"; - license = licenses.mit; - maintainers = with maintainers; [ r-burns ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libbsd/darwin-enable-strtonum.patch b/pkgs/development/libraries/libbsd/darwin-enable-strtonum.patch deleted file mode 100644 index b2123c78bec2..000000000000 --- a/pkgs/development/libraries/libbsd/darwin-enable-strtonum.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/default.nix b/pkgs/development/libraries/libbsd/default.nix deleted file mode 100644 index 90a92f50f463..000000000000 --- a/pkgs/development/libraries/libbsd/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, stdenv -, fetchurl -, autoreconfHook -, libmd -, gitUpdater -}: - -stdenv.mkDerivation rec { - pname = "libbsd"; - version = "0.12.2"; - - src = fetchurl { - url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz"; - hash = "sha256-uIzJFj0MZSqvOamZkdl03bocOpcR248bWDivKhRzEBQ="; - }; - - outputs = [ "out" "dev" "man" ]; - - enableParallelBuilding = true; - - doCheck = true; - - nativeBuildInputs = [ autoreconfHook ]; - propagatedBuildInputs = [ libmd ]; - - 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 { - # No nicer place to find latest release. - url = "https://gitlab.freedesktop.org/libbsd/libbsd.git"; - }; - - # Fix undefined reference errors with version script under LLVM. - configureFlags = lib.optionals (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") [ "LDFLAGS=-Wl,--undefined-version" ]; - - meta = with lib; { - description = "Common functions found on BSD systems"; - homepage = "https://libbsd.freedesktop.org/"; - license = with licenses; [ beerware bsd2 bsd3 bsdOriginal isc mit ]; - platforms = platforms.unix; - # See architectures defined in src/local-elf.h. - badPlatforms = lib.platforms.microblaze; - maintainers = with maintainers; [ matthewbauer ]; - }; -} diff --git a/pkgs/development/libraries/libbtbb/default.nix b/pkgs/development/libraries/libbtbb/default.nix index e0e70005e25f..9ea153fab6f6 100644 --- a/pkgs/development/libraries/libbtbb/default.nix +++ b/pkgs/development/libraries/libbtbb/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1byv8174xam7siakr1p0523x97wkh0fmwmq341sd3g70qr2g767d"; }; - nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; # https://github.com/greatscottgadgets/libbtbb/issues/63 postPatch = '' diff --git a/pkgs/development/libraries/libbutl/default.nix b/pkgs/development/libraries/libbutl/default.nix index 65fe845ff25a..aaf78cec08dc 100644 --- a/pkgs/development/libraries/libbutl/default.nix +++ b/pkgs/development/libraries/libbutl/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ build2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # but especially important when bootstrapping disallowedReferences = [ build2 ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace libbutl/uuid-linux.cxx \ --replace '"libuuid.so' '"${lib.getLib libuuid}/lib/libuuid.so' ''; diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix deleted file mode 100644 index 5f987943d8df..000000000000 --- a/pkgs/development/libraries/libcacard/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, nss }: - -stdenv.mkDerivation rec { - pname = "libcacard"; - version = "2.8.1"; - - src = fetchurl { - url = "https://www.spice-space.org/download/libcacard/${pname}-${version}.tar.xz"; - sha256 = "sha256-+79N6Mt9tb3/XstnL/Db5pOfufNEuQDVG6YpUymjMuc="; - }; - - postPatch = lib.optionalString stdenv.isDarwin '' - sed -i '/--version-script/d' Makefile.in - sed -i 's/^vflag = .*$/vflag = ""/' meson.build - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib nss ]; - - meta = with lib; { - description = "Smart card emulation library"; - homepage = "https://gitlab.freedesktop.org/spice/libcacard"; - license = licenses.lgpl21; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 0a9aabf73123..7f164c18b49c 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -2,7 +2,7 @@ , gtk2-x11, gtk3-x11 , gtkSupport ? null , libpulseaudio, gst_all_1, libvorbis, libcap, systemd , Carbon, CoreServices, AppKit -, withAlsa ? stdenv.isLinux, alsa-lib }: +, withAlsa ? stdenv.hostPlatform.isLinux, alsa-lib }: stdenv.mkDerivation rec { pname = "libcanberra"; @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional (gtkSupport == "gtk2") gtk2-x11 ++ lib.optional (gtkSupport == "gtk3") gtk3-x11 - ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices AppKit ] - ++ lib.optionals stdenv.isLinux [ libcap systemd ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon CoreServices AppKit ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap systemd ] ++ lib.optional withAlsa alsa-lib; configureFlags = [ "--disable-oss" ] - ++ lib.optional stdenv.isLinux "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"; + ++ lib.optional stdenv.hostPlatform.isLinux "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"; patches = [ (fetchpatch { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { url = "http://git.0pointer.net/libcanberra.git/patch/?id=c0620e432650e81062c1967cc669829dbd29b310"; sha256 = "0rc7zwn39yxzxp37qh329g7375r5ywcqcaak8ryd0dgvg8m5hcx9"; }) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (fetchpatch { url = "https://github.com/macports/macports-ports/raw/5a7965dfea7727d1ceedee46c7b0ccee9cb23468/audio/libcanberra/files/patch-configure.diff"; sha256 = "sha256-pEJy1krciUEg5BFIS8FJ4BubjfS/nt9aqi6BLnS1+4M="; diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix deleted file mode 100644 index ab562d9c1999..000000000000 --- a/pkgs/development/libraries/libcangjie/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }: - -stdenv.mkDerivation rec { - pname = "libcangjie"; - version = "1.4_rev_${rev}"; - rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d"; - - # fetchFromGitLab isn't working for some reason - src = fetchurl { - url = "https://gitlab.freedesktop.org/cangjie/libcangjie/-/archive/a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d/libcangjie-a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d.tar.gz"; - sha256 = "sha256-j5IQ0hBefoF8p966YrfZgYCw7ht5twJhYi4l0NneukQ="; - }; - - nativeBuildInputs = [ pkg-config autoconf automake ]; - buildInputs = [ libtool m4 sqlite ]; - - configureScript = "./autogen.sh"; - - preConfigure = '' - find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';' - ''; - - doCheck = true; - - meta = { - description = "C library implementing the Cangjie input method"; - longDescription = '' - libcangjie is a library implementing the Cangjie input method. - ''; - homepage = "https://gitlab.freedesktop.org/cangjie/libcangjie"; - license = lib.licenses.lgpl3Plus; - - maintainers = [ lib.maintainers.linquize ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/libcaption/default.nix b/pkgs/development/libraries/libcaption/default.nix deleted file mode 100644 index 0070aa3524ee..000000000000 --- a/pkgs/development/libraries/libcaption/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, re2c -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libcaption"; - version = "0.7"; - - src = fetchFromGitHub { - owner = "szatmary"; - repo = "libcaption"; - rev = finalAttrs.version; - hash = "sha256-OBtxoFJF0cxC+kfSK8TIKIdLkmCh5WOJlI0fejnisJo="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ re2c ]; - - meta = with lib; { - description = "Free open-source CEA608 / CEA708 closed-caption encoder/decoder"; - homepage = "https://github.com/szatmary/libcaption"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ pschmitt ]; - }; -}) diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix deleted file mode 100644 index 673885b096e4..000000000000 --- a/pkgs/development/libraries/libcbor/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, cmocka - -# for passthru.tests -, libfido2 -, mysql80 -, openssh -, systemd -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libcbor"; - version = "0.11.0"; - - src = fetchFromGitHub { - owner = "PJK"; - repo = "libcbor"; - rev = "v${finalAttrs.version}"; - hash = "sha256-N1xYkZw/6lX/nX/TE6/pVuEFgSyDiUJ50msK42NrKwI="; - }; - - outputs = [ "out" "dev" ]; - - strictDeps = true; - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - cmocka # cmake expects cmocka module - ]; - - cmakeFlags = lib.optional finalAttrs.finalPackage.doCheck "-DWITH_TESTS=ON" - ++ lib.optional (!stdenv.hostPlatform.isStatic) "-DBUILD_SHARED_LIBS=ON"; - - # Tests are restricted while pkgsStatic.cmocka is broken. Tracked at: - # https://github.com/NixOS/nixpkgs/issues/213623 - doCheck = !stdenv.hostPlatform.isStatic - && stdenv.hostPlatform == stdenv.buildPlatform; - - nativeCheckInputs = [ cmocka ]; - - passthru.tests = { - inherit libfido2 mysql80; - openssh = (openssh.override { withFIDO = true; }); - systemd = (systemd.override { - withFido2 = true; - withCryptsetup = true; - }); - }; - - meta = with lib; { - description = "CBOR protocol implementation for C and others"; - homepage = "https://github.com/PJK/libcbor"; - license = licenses.mit; - maintainers = [ ]; - }; -}) diff --git a/pkgs/development/libraries/libccd/default.nix b/pkgs/development/libraries/libccd/default.nix deleted file mode 100644 index c8e7c8af2104..000000000000 --- a/pkgs/development/libraries/libccd/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: - -stdenv.mkDerivation rec { - pname = "libccd"; - version = "2.1"; - - src = fetchFromGitHub { - owner = "danfis"; - repo = pname; - rev = "v${version}"; - sha256 = "0sfmn5pd7k5kyhbxnd689xmsa5v843r7sska96dlysqpljd691jc"; - }; - - patches = [ - # Fix pkgconfig file with absolute CMAKE_INSTALL_*DIR - # https://github.com/danfis/libccd/pull/76 - (fetchpatch { - url = "https://github.com/danfis/libccd/commit/cd16c4f168ae308e4c77db66ac97a2eaf47e059e.patch"; - sha256 = "02wj21c185kwf8bn4qi4cnna0ypzqm481xw9rr8jy1i0cb1r9idg"; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Library for collision detection between two convex shapes"; - homepage = "https://github.com/danfis/libccd"; - license = licenses.bsd3; - maintainers = with maintainers; [ lopsided98 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libcdada/default.nix b/pkgs/development/libraries/libcdada/default.nix deleted file mode 100644 index 8b1e4e0c7ab4..000000000000 --- a/pkgs/development/libraries/libcdada/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -}: - -stdenv.mkDerivation rec { - pname = "libcdada"; - version = "0.6.0"; - - src = fetchFromGitHub { - owner = "msune"; - repo = "libcdada"; - rev = "v${version}"; - hash = "sha256-fgH4gl8Uq8mY9gxa968suU66VJYnFzpSLj4JGpJcJA4="; - }; - - nativeBuildInputs = [ - autoreconfHook - ]; - - configureFlags = [ - "--without-tests" - "--without-examples" - ]; - - meta = with lib; { - description = "Library for basic data structures in C"; - longDescription = '' - Basic data structures in C: list, set, map/hashtable, queue... (libstdc++ wrapper) - ''; - homepage = "https://github.com/msune/libcdada"; - license = licenses.bsd2; - maintainers = with maintainers; [ _0x4A6F ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/development/libraries/libcdaudio/default.nix deleted file mode 100644 index 8e7bb7e2964a..000000000000 --- a/pkgs/development/libraries/libcdaudio/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "libcdaudio"; - version = "0.99.12p2"; - - src = fetchurl { - url = "mirror://sourceforge/libcdaudio/libcdaudio-${version}.tar.gz"; - sha256 = "1fsy6dlzxrx177qc877qhajm9l4g28mvh06h2l15rxy4bapzknjz" ; - }; - - meta = { - description = "Portable library for controlling audio CDs"; - mainProgram = "libcdaudio-config"; - homepage = "https://libcdaudio.sourceforge.net"; - platforms = lib.platforms.linux; - license = lib.licenses.lgpl2; - }; -} diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix deleted file mode 100644 index 11a0c259dfdb..000000000000 --- a/pkgs/development/libraries/libcddb/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, libiconv }: - -stdenv.mkDerivation rec { - pname = "libcddb"; - version = "1.3.2"; - - src = fetchurl { - url = "mirror://sourceforge/libcddb/${pname}-${version}.tar.bz2"; - sha256 = "0fr21a7vprdyy1bq6s99m0x420c9jm5fipsd63pqv8qyfkhhxkim"; - }; - - buildInputs = [ libiconv ]; - - configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ]; - - doCheck = false; # fails 3 of 5 tests with locale errors - - meta = with lib; { - description = "C library to access data on a CDDB server (freedb.org)"; - homepage = "https://libcddb.sourceforge.net/"; - license = licenses.lgpl2Plus; - mainProgram = "cddb_query"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix index 5f01756ecac0..93b3cb91ffc9 100644 --- a/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -27,15 +27,15 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libcdio ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv IOKit DiskArbitration ]; - propagatedBuildInputs = lib.optional stdenv.isDarwin DiskArbitration; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin DiskArbitration; - configureFlags = lib.optionals stdenv.isDarwin [ "--disable-ld-version-script" ]; + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-ld-version-script" ]; meta = with lib; { description = "CD paranoia on top of libcdio"; diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 820ac97a434f..62eb37e34ab6 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -31,11 +31,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config help2man ]; buildInputs = [ libcddb libiconv ncurses ] - ++ lib.optionals stdenv.isDarwin [ Carbon IOKit ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon IOKit ]; enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Library for OS-independent CD-ROM and CD image access"; diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 78746cf01254..4116f2a0172a 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DHAVE_LINUX_API=1" ]; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index ce83c3c22cd4..9595efc1c1b9 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -31,7 +31,7 @@ let gl_rpath = lib.makeLibraryPath [ - stdenv.cc.cc.lib + stdenv.cc.cc ]; rpath = lib.makeLibraryPath [ diff --git a/pkgs/development/libraries/libcello/default.nix b/pkgs/development/libraries/libcello/default.nix deleted file mode 100644 index b2f3fc5fae5b..000000000000 --- a/pkgs/development/libraries/libcello/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libcello"; - version = "2.1.0"; - - src = fetchurl { - url = "https://libcello.org/static/libCello-${version}.tar.gz"; - sha256 = "0a1b2x5ni07vd9ridnl7zv7h2s32070wsphjy94qr066b99gdb29"; - }; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = { - homepage = "https://libcello.org/"; - description = "Higher level programming in C"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.MostAwesomeDude ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libcerf/default.nix b/pkgs/development/libraries/libcerf/default.nix deleted file mode 100644 index 92fd70bb0cc6..000000000000 --- a/pkgs/development/libraries/libcerf/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, lib, fetchurl, cmake, perl, gnuplot }: - -stdenv.mkDerivation rec { - pname = "libcerf"; - version = "2.4"; - - src = fetchurl { - url = "https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${version}/libcerf-v${version}.tar.gz"; - sha256 = "sha256-CAswrlZMPavjuJJkUira9WR+x1QCFXK+5UkpaXsnbNw="; - }; - - nativeBuildInputs = [ cmake perl ]; - - passthru.tests = { - inherit gnuplot; - }; - - meta = with lib; { - description = "Complex error (erf), Dawson, Faddeeva, and Voigt function library"; - homepage = "https://jugit.fz-juelich.de/mlz/libcerf"; - license = licenses.mit; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix deleted file mode 100644 index f49d12e639db..000000000000 --- a/pkgs/development/libraries/libchamplain/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ fetchurl -, lib -, stdenv -, meson -, ninja -, vala -, gtk-doc -, docbook_xsl -, docbook_xml_dtd_412 -, pkg-config -, glib -, gtk3 -, cairo -, sqlite -, gnome -, clutter-gtk -, libsoup -, libsoup_3 -, gobject-introspection /*, libmemphis */ -, withLibsoup3 ? false -}: - -stdenv.mkDerivation rec { - pname = "libchamplain"; - version = "0.12.21"; - - outputs = [ "out" "dev" ] - ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "qRXNFyoMUpRMVXn8tGg/ioeMVxv16SglS12v78cn5ac="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - vala - ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ - gtk-doc - docbook_xsl - docbook_xml_dtd_412 - ]; - - buildInputs = [ - sqlite - (if withLibsoup3 then libsoup_3 else libsoup) - ]; - - propagatedBuildInputs = [ - glib - gtk3 - cairo - clutter-gtk - ]; - - mesonFlags = [ - (lib.mesonBool "gtk_doc" (stdenv.buildPlatform == stdenv.hostPlatform)) - "-Dvapi=true" - (lib.mesonBool "libsoup3" withLibsoup3) - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/libchamplain"; - license = licenses.lgpl2Plus; - - description = "C library providing a ClutterActor to display maps"; - - longDescription = '' - libchamplain is a C library providing a ClutterActor to display - maps. It also provides a GTK widget to display maps in GTK - applications. Python and Perl bindings are also available. It - supports numerous free map sources such as OpenStreetMap, - OpenCycleMap, OpenAerialMap, and Maps for free. - ''; - - maintainers = teams.gnome.members ++ teams.pantheon.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix deleted file mode 100644 index 9152038e1681..000000000000 --- a/pkgs/development/libraries/libchardet/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, perl }: - -stdenv.mkDerivation rec { - pname = "libchardet"; - version = "1.0.6"; - - src = fetchFromGitHub { - owner = "Joungkyun"; - repo = "libchardet"; - rev = version; - sha256 = "sha256-JhEiWM3q8X+eEBHxv8k9yYOaTGoJOzI+/iFYC0gZJJs="; - }; - - nativeBuildInputs = [ autoreconfHook perl ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Mozilla's Universal Charset Detector C/C++ API"; - mainProgram = "chardet-config"; - homepage = "ftp://ftp.oops.org/pub/oops/libchardet/index.html"; - license = licenses.mpl11; - maintainers = [ maintainers.abbradar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/development/libraries/libchewing/default.nix deleted file mode 100644 index 7cfa864fc06f..000000000000 --- a/pkgs/development/libraries/libchewing/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, sqlite, cmake }: - -stdenv.mkDerivation rec { - pname = "libchewing"; - version = "unstable-2020-06-27"; - - src = fetchFromGitHub { - owner = "chewing"; - repo = "libchewing"; - rev = "452f6221fbad90c0706a3963b17e226216e40dd7"; - sha256 = "sha256-w3/K2O/CU+XVzqzVCYJyq1vLgToN6iIUhJ9J7ia4p9E="; - }; - - buildInputs = [ sqlite ]; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Intelligent Chinese phonetic input method"; - homepage = "https://chewing.im/"; - license = licenses.lgpl21Only; - maintainers = [ maintainers.ericsagnes ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch b/pkgs/development/libraries/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch deleted file mode 100644 index f5a016f63ac3..000000000000 --- a/pkgs/development/libraries/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 86fd3be1d31d2e7c09603aa3a8966537ac01bb07 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Tue, 11 Aug 2020 20:30:16 +0200 -Subject: [PATCH] Fix RPC compilation when using libtirpc rather than glibc - ---- - src/block-server.c | 3 +++ - utils/chop-block-server.c | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/src/block-server.c b/src/block-server.c -index 3f97417..29b299e 100644 ---- a/src/block-server.c -+++ b/src/block-server.c -@@ -18,6 +18,9 @@ - - /* Server-side stubs. */ - -+#include <rpc/types.h> -+#include <rpc/xdr.h> -+#include <rpc/auth.h> - #include <rpc/svc.h> - #include <chop/block-server.h> - -diff --git a/utils/chop-block-server.c b/utils/chop-block-server.c -index a2076c0..9462f5d 100644 ---- a/utils/chop-block-server.c -+++ b/utils/chop-block-server.c -@@ -19,6 +19,9 @@ - store, e.g. a GDBM block store, and serves it remotely. A lot of code is - borrowed from `chop-archiver.c'. */ - -+#include <rpc/types.h> -+#include <rpc/xdr.h> -+#include <rpc/auth.h> - #include <chop/chop-config.h> - - #include <alloca.h> --- -2.25.4 - diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix deleted file mode 100644 index aa9f50917be1..000000000000 --- a/pkgs/development/libraries/libchop/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ fetchurl, lib, stdenv, zlib, bzip2, libgcrypt -, gdbm, gperf, tdb, gnutls, db, libuuid -, lzo, pkg-config, guile, rpcsvc-proto, libtirpc -}: - -stdenv.mkDerivation rec { - pname = "libchop"; - version = "0.5.2"; - - src = fetchurl { - url = "mirror://savannah/libchop/libchop-${version}.tar.gz"; - sha256 = "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g"; - }; - - patches = [ ./gets-undeclared.patch ./size_t.patch ./0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch ]; - - nativeBuildInputs = [ pkg-config gperf rpcsvc-proto ]; - - env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; - NIX_LDFLAGS = [ "-ltirpc" ]; - - buildInputs = - [ zlib bzip2 lzo - libgcrypt - gdbm db tdb - gnutls libuuid - guile libtirpc - ]; - - doCheck = false; - - preConfigure = '' - sed -re 's%@GUILE@%&/guile%' -i */Makefile.* Makefile.* - ''; - - meta = with lib; { - description = "Tools & library for data backup and distributed storage"; - - longDescription = - '' Libchop is a set of utilities and library for data backup and - distributed storage. Its main application is chop-backup, an - encrypted backup program that supports data integrity checks, - versioning at little cost, distribution among several sites, - selective sharing of stored data, adaptive compression, and more. - The library itself, which chop-backup builds upon, implements - storage techniques such as content-based addressing, content hash - keys, Merkle trees, similarity detection, and lossless compression. - It makes it easy to combine them in different ways. The - ‘chop-archiver’ and ‘chop-block-server’ tools, illustrated in the - manual, provide direct access to these facilities from the command - line. It is written in C and has Guile (Scheme) bindings. - ''; - - homepage = "https://www.nongnu.org/libchop/"; - license = licenses.gpl3Plus; - maintainers = [ ]; - platforms = platforms.gnu ++ platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libchop/gets-undeclared.patch b/pkgs/development/libraries/libchop/gets-undeclared.patch deleted file mode 100644 index b6cdc77caa84..000000000000 --- a/pkgs/development/libraries/libchop/gets-undeclared.patch +++ /dev/null @@ -1,71 +0,0 @@ -This patch is needed to allow builds with newer versions of -the GNU libc (2.16+). - - -commit 66712c23388e93e5c518ebc8515140fa0c807348 -Author: Eric Blake <eblake@redhat.com> -Date: Thu Mar 29 13:30:41 2012 -0600 - - stdio: don't assume gets any more - - Gnulib intentionally does not have a gets module, and now that C11 - and glibc have dropped it, we should be more proactive about warning - any user on a platform that still has a declaration of this dangerous - interface. - - * m4/stdio_h.m4 (gl_STDIO_H, gl_STDIO_H_DEFAULTS): Drop gets - support. - * modules/stdio (Makefile.am): Likewise. - * lib/stdio-read.c (gets): Likewise. - * tests/test-stdio-c++.cc: Likewise. - * m4/warn-on-use.m4 (gl_WARN_ON_USE_PREPARE): Fix comment. - * lib/stdio.in.h (gets): Make warning occur in more places. - * doc/posix-functions/gets.texi (gets): Update documentation. - Reported by Christer Solskogen. - - Signed-off-by: Eric Blake <eblake@redhat.com> - -diff --git a/lib/stdio.in.h b/lib/stdio.in.h -index aa7b599..c377b6e 100644 ---- a/lib/stdio.in.h -+++ b/lib/stdio.in.h -@@ -698,22 +698,11 @@ _GL_WARN_ON_USE (getline, "getline is unportable - " - # endif - #endif - --#if @GNULIB_GETS@ --# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef gets --# define gets rpl_gets --# endif --_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1))); --_GL_CXXALIAS_RPL (gets, char *, (char *s)); --# else --_GL_CXXALIAS_SYS (gets, char *, (char *s)); --# undef gets --# endif --_GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ -+ so any use of gets warrants an unconditional warning; besides, C11 -+ removed it. */ -+#undef gets -+#if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif - -@@ -1053,9 +1042,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - " - # endif - #endif - --/* Some people would argue that sprintf should be handled like gets -- (for example, OpenBSD issues a link warning for both functions), -- since both can cause security holes due to buffer overruns. -+/* Some people would argue that all sprintf uses should be warned about -+ (for example, OpenBSD issues a link warning for it), -+ since it can cause security holes due to buffer overruns. - However, we believe that sprintf can be used safely, and is more - efficient than snprintf in those safe cases; and as proof of our - belief, we use sprintf in several gnulib modules. So this header diff --git a/pkgs/development/libraries/libchop/size_t.patch b/pkgs/development/libraries/libchop/size_t.patch deleted file mode 100644 index 82b6cb995ef3..000000000000 --- a/pkgs/development/libraries/libchop/size_t.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/chop.c -+++ b/src/chop.c -@@ -539,7 +539,7 @@ extern const chop_class_t chop_gdbm_bloc - chop_qdbm_block_iterator_class; - - const struct chop_class_entry * --chop_lookup_class_entry (const char *str, unsigned int len); -+chop_lookup_class_entry (const char *str, size_t len); - - /* Include the gperf-generated perfect hash table. */ - #include "class-lookup.c" diff --git a/pkgs/development/libraries/libcifpp/default.nix b/pkgs/development/libraries/libcifpp/default.nix deleted file mode 100644 index 564c7690b378..000000000000 --- a/pkgs/development/libraries/libcifpp/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenv -, boost -, cmake -, fetchFromGitHub -, eigen -, zlib -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libcifpp"; - version = "7.0.4"; - - src = fetchFromGitHub { - owner = "PDB-REDO"; - repo = "libcifpp"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-/dX77KRYmTIj8jxRzQRlpG/ktqDL1jjySux/JqHnE3I="; - }; - - nativeBuildInputs = [ - cmake - ]; - - cmakeFlags = [ - # disable network access - "-DCIFPP_DOWNLOAD_CCD=OFF" - ]; - - buildInputs = [ - boost - eigen - zlib - ]; - - # cmake requires the existence of this directory when building dssp - postInstall = '' - mkdir -p $out/share/libcifpp - ''; - - meta = with lib; { - description = "Manipulate mmCIF and PDB files"; - homepage = "https://github.com/PDB-REDO/libcifpp"; - changelog = "https://github.com/PDB-REDO/libcifpp/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; - license = licenses.bsd2; - maintainers = with maintainers; [ natsukium ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix deleted file mode 100644 index caa7e51336a4..000000000000 --- a/pkgs/development/libraries/libcint/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, blas - # Check Inputs -, python3 -}: - -stdenv.mkDerivation rec { - pname = "libcint"; - version = "6.1.2"; - - src = fetchFromGitHub { - owner = "sunqm"; - repo = "libcint"; - rev = "v${version}"; - hash = "sha256-URJcC0ib87ejrTCglCjhC2tQHNc5TRvo4CQ52N58n+4="; - }; - - postPatch = '' - sed -i 's/libcint.so/libcint${stdenv.hostPlatform.extensions.sharedLibrary}/g' testsuite/*.py - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ blas ]; - cmakeFlags = [ - "-DENABLE_TEST=1" - "-DQUICK_TEST=1" - "-DCMAKE_INSTALL_PREFIX=" # ends up double-adding /nix/store/... prefix, this avoids issue - "-DWITH_RANGE_COULOMB:STRING=1" - "-DWITH_FORTRAN:STRING=1" - "-DMIN_EXPCUTOFF:STRING=20" - ]; - - strictDeps = true; - - doCheck = true; - nativeCheckInputs = [ python3.pkgs.numpy ]; - - meta = with lib; { - description = "General GTO integrals for quantum chemistry"; - longDescription = '' - libcint is an open source library for analytical Gaussian integrals. - It provides C/Fortran API to evaluate one-electron / two-electron - integrals for Cartesian / real-spheric / spinor Gaussian type functions. - ''; - homepage = "http://wiki.sunqm.net/libcint"; - downloadPage = "https://github.com/sunqm/libcint"; - changelog = "https://github.com/sunqm/libcint/blob/master/ChangeLog"; - license = licenses.bsd2; - maintainers = with maintainers; [ drewrisinger ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libck/default.nix b/pkgs/development/libraries/libck/default.nix deleted file mode 100644 index 71937b2a658e..000000000000 --- a/pkgs/development/libraries/libck/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "ck"; - version = "0.7.2"; - - src = fetchFromGitHub { - owner = "concurrencykit"; - repo = pname; - rev = version; - sha256 = "sha256-lxJ8WsZ3pBGf4sFYj5+tR37EYDZqpksaoohiIKA4pRI="; - }; - - postPatch = '' - substituteInPlace \ - configure \ - --replace \ - 'COMPILER=`./.1 2> /dev/null`' \ - "COMPILER=gcc" - ''; - - configureFlags = ["--platform=${stdenv.hostPlatform.parsed.cpu.name}}"]; - - dontDisableStatic = true; - - meta = with lib; { - description = "High-performance concurrency research library"; - longDescription = '' - Concurrency primitives, safe memory reclamation mechanisms and non-blocking data structures for the research, design and implementation of high performance concurrent systems. - ''; - license = with licenses; [ asl20 bsd2 ]; - homepage = "http://concurrencykit.org/"; - platforms = platforms.unix; - maintainers = with maintainers; [ chessai thoughtpolice ]; - }; -} diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix deleted file mode 100644 index 982d34f1bdce..000000000000 --- a/pkgs/development/libraries/libcli/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, libxcrypt }: - -stdenv.mkDerivation rec { - pname = "libcli"; - version = "1.9.7"; - - src = fetchFromGitHub { - sha256 = "08pmjhqkwldhmcwjhi2l27slf1fk6nxxfaihnk2637pqkycy8z0c"; - rev = "v${version}"; - repo = "libcli"; - owner = "dparrish"; - }; - - patches = - [ (fetchurl { - url = "https://github.com/dparrish/libcli/commit/ebc5a09db457ee1be9996711463cbbafe5ea72d5.patch"; - sha256 = "0szjiw3gd7by1sv924shnngfxvc98xvaqvx228b575xq93xxjcwl"; - }) - ]; - - buildInputs = [ libxcrypt ]; - - enableParallelBuilding = true; - - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" "PREFIX=$(out)" ]; - - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=address" - ]; - - meta = with lib; { - description = "Emulate a Cisco-style telnet command-line interface"; - homepage = "http://sites.dparrish.com/libcli"; - license = licenses.lgpl21Plus; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/development/libraries/libcloudproviders/default.nix deleted file mode 100644 index 8b6722d9cde7..000000000000 --- a/pkgs/development/libraries/libcloudproviders/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, pkg-config -, gobject-introspection -, vala -, gtk-doc -, docbook_xsl -, glib -, mesonEmulatorHook -, gnome -}: - -# TODO: Add installed tests once https://gitlab.gnome.org/World/libcloudproviders/issues/4 is fixed - -stdenv.mkDerivation rec { - pname = "libcloudproviders"; - version = "0.3.6"; - - src = fetchurl { - url = "mirror://gnome/sources/libcloudproviders/${lib.versions.majorMinor version}/libcloudproviders-${version}.tar.xz"; - hash = "sha256-O3URCzpP3vTFxaRA5IcB/gVNKuBh0VbIkTa7W6BedLc="; - }; - - outputs = [ "out" "dev" "devdoc" ]; - - mesonFlags = [ - "-Denable-gtk-doc=true" - ]; - - strictDeps = true; - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - vala - gtk-doc - docbook_xsl - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ glib ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = "libcloudproviders"; - }; - }; - - meta = with lib; { - description = "DBus API that allows cloud storage sync clients to expose their services"; - homepage = "https://gitlab.gnome.org/World/libcloudproviders"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix deleted file mode 100644 index e4548420a057..000000000000 --- a/pkgs/development/libraries/libclthreads/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libclthreads"; - version = "2.4.2"; - - src = fetchurl { - url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2"; - sha256 = "0cbs1w89q8wfjrrhvxf6xk0y02nkjl5hd0yb692c8ma01i6b2nf6"; - }; - - patchPhase = '' - cd source - # don't run ldconfig: - sed -e "/ldconfig/d" -i ./Makefile - ''; - - makeFlags = [ - "PREFIX=$(out)" - "SUFFIX=''" - ]; - - preInstall = '' - # The Makefile does not create the include and lib directories - mkdir -p $out/include - mkdir -p $out/lib - ''; - - postInstall = '' - ln $out/lib/libclthreads.so $out/lib/libclthreads.so.2 - ''; - - meta = with lib; { - description = "Zita thread library"; - homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; - license = licenses.lgpl21; - maintainers = with maintainers; [ magnetophon ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix deleted file mode 100644 index 40f259677ff4..000000000000 --- a/pkgs/development/libraries/libclxclient/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkg-config }: - -stdenv.mkDerivation rec { - pname = "libclxclient"; - version = "3.9.2"; - - src = fetchurl { - url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2"; - sha256 = "10bq6fy8d3pr1x2x3xx9qhf2hdxrwdgvg843a2y6lx70y1jfj0c5"; - }; - - buildInputs = [ libclthreads libX11 libXft xorg.xorgproto ]; - - nativeBuildInputs = [ pkg-config ]; - - env.NIX_CFLAGS_COMPILE = "-I${xorg.xorgproto}/include -I${libXft.dev}/include"; - - patchPhase = '' - cd source - # use pkg-config instead of pkgcon: - sed -e 's/pkgconf/pkg-config/g' -i ./Makefile - # don't run ldconfig: - sed -e "/ldconfig/d" -i ./Makefile - # make sure it can find clxclient.h: - sed -e 's/<clxclient.h>/"clxclient.h"/' -i ./enumip.cc - ''; - - makeFlags = [ - "PREFIX=$(out)" - "SUFFIX=''" - ]; - - preInstall = '' - # The Makefile does not create the include directory - mkdir -p $out/include - ''; - - postInstall = '' - ln $out/lib/libclxclient.so $out/lib/libclxclient.so.3 - ''; - - meta = with lib; { - description = "Zita X11 library"; - homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; - license = licenses.lgpl21; - maintainers = with maintainers; [ magnetophon ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix deleted file mode 100644 index 52da37199919..000000000000 --- a/pkgs/development/libraries/libcmis/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, boost, libxml2, pkg-config, docbook2x, curl, autoreconfHook, cppunit }: - -stdenv.mkDerivation rec { - pname = "libcmis"; - version = "0.6.2"; - - src = fetchFromGitHub { - owner = "tdf"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-HXiyQKjOlQXWABY10XrOiYxPqfpmUJC3a6xD98LIHDw="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config docbook2x ]; - buildInputs = [ boost libxml2 curl cppunit ]; - - configureFlags = [ - "--disable-werror" - "DOCBOOK2MAN=${docbook2x}/bin/docbook2man" - ]; - - doCheck = true; - - enableParallelBuilding = true; - - meta = with lib; { - description = "C++ client library for the CMIS interface"; - homepage = "https://github.com/tdf/libcmis"; - license = licenses.gpl2; - mainProgram = "cmis-client"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix deleted file mode 100644 index 41c5565482fe..000000000000 --- a/pkgs/development/libraries/libcollectdclient/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, collectd }: - -collectd.overrideAttrs (oldAttrs: { - pname = "libcollectdclient"; - inherit (collectd) version; - buildInputs = [ ]; - - configureFlags = (oldAttrs.configureFlags or []) ++ [ - "--disable-daemon" - "--disable-all-plugins" - ]; - - postInstall = "rm -rf $out/{bin,etc,sbin,share}"; - - meta = with lib; { - description = "C Library for collectd, a daemon which collects system performance statistics periodically"; - homepage = "http://collectd.org"; - license = licenses.gpl2; - platforms = platforms.linux; # TODO: collectd may be linux but the C client may be more portable? - maintainers = [ maintainers.sheenobu maintainers.bjornfor ]; - }; -}) diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index c33fdcf00f33..93aec103bca0 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { dontUseQmakeConfigure = true; configureFlags = [ "-config" "release" ] # Build mixes up dylibs/frameworks if one is not explicitly specified. - ++ lib.optionals stdenv.isDarwin [ "-config" "qt_framework" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-config" "qt_framework" ]; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix deleted file mode 100644 index 049b0c8f4fb8..000000000000 --- a/pkgs/development/libraries/libconfig/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, stdenv -, fetchurl -, # this also disables building tests. - # on static windows cross-compile they fail to build - doCheck ? with stdenv.hostPlatform; !(isWindows && isStatic) -}: - -stdenv.mkDerivation rec { - pname = "libconfig"; - version = "1.7.3"; - - src = fetchurl { - url = "https://hyperrealm.github.io/${pname}/dist/${pname}-${version}.tar.gz"; - sha256 = "sha256-VFFm1srAN3RDgdHpzFpUBQlOe/rRakEWmbz/QLuzHuc="; - }; - - inherit doCheck; - - configureFlags = lib.optional (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isStatic) "--disable-examples" - ++ lib.optional (!doCheck) "--disable-tests"; - - cmakeFlags = lib.optionals (!doCheck) [ "-DBUILD_TESTS:BOOL=OFF" ]; - - meta = with lib; { - homepage = "http://www.hyperrealm.com/libconfig"; - description = "Simple library for processing structured configuration files"; - license = licenses.lgpl3; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix deleted file mode 100644 index 91a5a2f26f87..000000000000 --- a/pkgs/development/libraries/libconfuse/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, autoreconfHook -, flex -}: - -stdenv.mkDerivation rec { - pname = "libconfuse"; - version = "3.3"; - - src = fetchFromGitHub { - sha256 = "1npfk5jv59kk4n8pkyx89fn9s6p8x3gbffs42jaw24frgxfgp8ca"; - rev = "v${version}"; - repo = "libconfuse"; - owner = "martinh"; - }; - - patches = [ - (fetchpatch { - name = "CVE-2022-40320.patch"; - urls = [ - "https://sources.debian.org/data/main/libc/libconfuse/3.3-3/debian/patches/CVE-2022-40320.patch" - # files on sources.debian.org can disappear - "https://web.archive.org/web/20230107133212/https://sources.debian.org/data/main/libc/libconfuse/3.3-3/debian/patches/CVE-2022-40320.patch" - ]; - sha256 = "sha256-ftfE9JFz4nyRSOb2xHb9BAtgWn5Yv2WLm4RegDLtiBw="; - }) - ]; - - postPatch = '' - substituteInPlace tests/Makefile.am \ - --replace 'TESTS += empty_string' "" \ - --replace 'TESTS += print_filter' "" - ''; - - nativeBuildInputs = [ autoreconfHook flex ]; - - enableParallelBuilding = true; - - # On darwin the tests depend on the installed libraries because of install_name. - doInstallCheck = true; - installCheckTarget = "check"; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Small configuration file parser library for C"; - longDescription = '' - libConfuse (previously libcfg) is a configuration file parser library - written in C. It supports sections and (lists of) values, as well as - some other features. It makes it very easy to add configuration file - capability to a program using a simple API. - - The goal of libConfuse is not to be the configuration file parser library - with a gazillion of features. Instead, it aims to be easy to use and - quick to integrate with your code. - ''; - license = licenses.isc; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/libcork/default.nix b/pkgs/development/libraries/libcork/default.nix deleted file mode 100644 index c013775fcaeb..000000000000 --- a/pkgs/development/libraries/libcork/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv -, fetchFromGitHub -, cmake -, lib -, pkg-config -, check -}: -stdenv.mkDerivation rec { - pname = "libcork"; - version = "1.0.0--rc3"; - - src = fetchFromGitHub { - owner = "dcreager"; - repo = pname; - rev = version; - sha256 = "152gqnmr6wfmflf5l6447am4clmg3p69pvy3iw7yhaawjqa797sk"; - }; - - postPatch = '' - # N.B. We need to create this file, otherwise it tries to use git to - # determine the package version, which we do not want. - echo "${version}" > .version-stamp - echo "${version}" > .commit-stamp - - # N.B. We disable tests by force, since their build is broken. - sed -i '/add_subdirectory(tests)/d' ./CMakeLists.txt - - # https://github.com/dcreager/libcork/issues/173 - substituteInPlace cmake/FindCTargets.cmake \ - --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ - --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} \ - --replace '\$'{datarootdir}/'$'{base_docdir} '$'{CMAKE_INSTALL_FULL_DOCDIR} - ''; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ check ]; - - doCheck = false; - - postInstall = '' - ln -s $out/lib/libcork.so $out/lib/libcork.so.1 - ''; - - meta = with lib; { - homepage = "https://github.com/dcreager/libcork"; - description = "Simple, easily embeddable cross-platform C library"; - mainProgram = "cork-hash"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ lovesegfault ]; - }; -} diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/development/libraries/libcotp/default.nix deleted file mode 100644 index 80b418e3065d..000000000000 --- a/pkgs/development/libraries/libcotp/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libgcrypt }: - -stdenv.mkDerivation rec { - pname = "libcotp"; - version = "3.0.0"; - - src = fetchFromGitHub { - owner = "paolostivanin"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-/IIzUMms4aS63psyxwL+Ynj78c38R3WwbD2HIpdHF88="; - }; - - postPatch = lib.optionalString stdenv.cc.isClang '' - substituteInPlace CMakeLists.txt \ - --replace "add_link_options(-Wl," "# add_link_options(-Wl," - ''; - - buildInputs = [ libgcrypt ]; - nativeBuildInputs = [ cmake pkg-config ]; - - meta = with lib; { - description = "C library that generates TOTP and HOTP"; - homepage = "https://github.com/paolostivanin/libcotp"; - license = licenses.asl20; - maintainers = with maintainers; [ alexbakker ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix deleted file mode 100644 index 4f813d74a897..000000000000 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libevent, openssl}: - -stdenv.mkDerivation rec { - pname = "libcouchbase"; - version = "3.3.9"; - - src = fetchFromGitHub { - owner = "couchbase"; - repo = "libcouchbase"; - rev = version; - sha256 = "sha256-dvXRbAdgb1WmKLijYkx6+js60ZxK1Tl2aTFSF7EpN74="; - }; - - cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libevent openssl ]; - - # Running tests in parallel does not work - enableParallelChecking = false; - - doCheck = !stdenv.isDarwin; - - meta = with lib; { - description = "C client library for Couchbase"; - homepage = "https://github.com/couchbase/libcouchbase"; - license = licenses.asl20; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libcpr/default.nix b/pkgs/development/libraries/libcpr/default.nix deleted file mode 100644 index 8a4025cf7097..000000000000 --- a/pkgs/development/libraries/libcpr/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl }: - -let version = "1.10.5"; in -stdenv.mkDerivation { - pname = "libcpr"; - inherit version; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "libcpr"; - repo = "cpr"; - rev = version; - hash = "sha256-mAuU2uF8d+aHvCmotgIrBi/pUp1jkP6G0f98M76zjOw="; - }; - - nativeBuildInputs = [ cmake ]; - - propagatedBuildInputs = [ curl ]; - - cmakeFlags = [ - "-DCPR_USE_SYSTEM_CURL=ON" - ]; - - postPatch = '' - # Linking with stdc++fs is no longer necessary. - sed -i '/stdc++fs/d' include/CMakeLists.txt - ''; - - postInstall = '' - substituteInPlace "$out/lib/cmake/cpr/cprTargets.cmake" \ - --replace "_IMPORT_PREFIX \"$out\"" \ - "_IMPORT_PREFIX \"$dev\"" - ''; - - meta = with lib; { - description = "C++ wrapper around libcurl"; - homepage = "https://docs.libcpr.org/"; - license = licenses.mit; - maintainers = with maintainers; [ rycee ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix deleted file mode 100644 index 029bec5630bf..000000000000 --- a/pkgs/development/libraries/libcrafter/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, libpcap }: - -stdenv.mkDerivation rec { - pname = "libcrafter"; - version = "1.0"; - - src = fetchFromGitHub { - owner = "pellegre"; - repo = "libcrafter"; - rev = "version-${version}"; - sha256 = "sha256-tCdN3+EzISVl+wp5umOFD+bgV+uUdabH+2LyxlV/W7Q="; - }; - - preConfigure = "cd libcrafter"; - - configureScript = "./autogen.sh"; - - configureFlags = [ "--with-libpcap=yes" ]; - - nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ libtool ]; - - propagatedBuildInputs = [ libpcap ]; - - meta = { - homepage = "https://github.com/pellegre/libcrafter"; - description = "High level C++ network packet sniffing and crafting library"; - license = lib.licenses.bsd3; - maintainers = [ ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/development/libraries/libcredis/default.nix deleted file mode 100644 index 3515bce2da20..000000000000 --- a/pkgs/development/libraries/libcredis/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libcredis"; - version = "0.2.3"; - - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/credis/credis-${version}.tar.gz"; - sha256 = "1l3hlw9rrc11qggbg9a2303p3bhxxx2vqkmlk8avsrbqw15r1ayr"; - }; - - # credis build system has no install actions, provide our own. - installPhase = '' - mkdir -p "$out/bin" - mkdir -p "$out/lib" - mkdir -p "$out/include" - - cp -v credis-test "$out/bin/" - cp -v *.a *.so "$out/lib/" - cp -v *.h "$out/include/" - ''; - - meta = with lib; { - description = "C client library for Redis (key-value database)"; - mainProgram = "credis-test"; - homepage = "https://code.google.com/archive/p/credis/"; - license = licenses.bsd3; # from homepage - platforms = platforms.all; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/development/libraries/libcrossguid/default.nix b/pkgs/development/libraries/libcrossguid/default.nix deleted file mode 100644 index c81dbb86f6a0..000000000000 --- a/pkgs/development/libraries/libcrossguid/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libuuid }: - -stdenv.mkDerivation rec { - name = "lib" + pname + "-" + version; - pname = "crossguid"; - version = "2016-02-21"; - - src = fetchFromGitHub { - owner = "graeme-hill"; - repo = pname; - rev = "8f399e8bd4252be9952f3dfa8199924cc8487ca4"; - sha256 = "1i29y207qqddvaxbn39pk2fbh3gx8zvdprfp35wasj9rw2wjk3s9"; - }; - - buildInputs = [ libuuid ]; - - buildPhase = '' - $CXX -c guid.cpp -o guid.o $CXXFLAGS -std=c++11 -DGUID_LIBUUID - $AR rvs libcrossguid.a guid.o - ''; - installPhase = '' - mkdir -p $out/{lib,include} - install -D -m644 libcrossguid.a "$out/lib/libcrossguid.a" - install -D -m644 guid.h "$out/include/guid.h" - ''; - - meta = with lib; { - description = "Lightweight cross platform C++ GUID/UUID library"; - license = licenses.mit; - maintainers = with maintainers; [ edwtjo ]; - homepage = "https://github.com/graeme-hill/crossguid"; - platforms = with platforms; linux; - }; - -} diff --git a/pkgs/development/libraries/libcs50/default.nix b/pkgs/development/libraries/libcs50/default.nix deleted file mode 100644 index a7dd7c6879b5..000000000000 --- a/pkgs/development/libraries/libcs50/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation (finalAttrs: { - pname = "libcs50"; - version = "11.0.3"; - - src = fetchFromGitHub { - owner = "cs50"; - repo = "libcs50"; - rev = "v${finalAttrs.version}"; - hash = "sha256-G6QayPGR4lkeFuUYsFszekLAzzpA3hhIRmqt/OB0cdY="; - }; - - installPhase = '' - runHook preInstall - mkdir $out - cp -R build/lib $out/lib - cp -R build/include $out/include - ln -sf $out/lib/libcs50.so.11.0.3 $out/lib/libcs50.so.11 - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/cs50/libcs50"; - description = "CS50 Library for C"; - license = licenses.gpl3Only; - }; -}) diff --git a/pkgs/development/libraries/libcsptr/default.nix b/pkgs/development/libraries/libcsptr/default.nix deleted file mode 100644 index a8f33deda36c..000000000000 --- a/pkgs/development/libraries/libcsptr/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "libcsptr"; - version = "2.0.4"; - - src = fetchFromGitHub { - owner = "Snaipe"; - repo = "libcsptr"; - rev = "v${version}"; - sha256 = "0i1498h2i6zq3fn3zf3iw7glv6brn597165hnibgwccqa8sh3ich"; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Smart pointer constructs for the (GNU) C programming language"; - homepage = "https://github.com/Snaipe/libcsptr"; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ maintainers.fragamus ]; - }; -} diff --git a/pkgs/development/libraries/libctb/default.nix b/pkgs/development/libraries/libctb/default.nix deleted file mode 100644 index d52adac556d8..000000000000 --- a/pkgs/development/libraries/libctb/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl }: -stdenv.mkDerivation rec { - pname = "libctb"; - version = "0.16"; - src = fetchurl { - url = "https://iftools.com/download/files/legacy/${pname}-${version}.tar.gz"; - sha256 = "027wh89d0qyly3d9m6rg4x7x1gqz3y3cnxlgk0k8xgygcrm05c0w"; - }; - patches = [ - ./include-kbhit.patch - ]; - sourceRoot = "${pname}-${version}/build"; - makeFlags = [ - "prefix=$(out)" - ]; - meta = with lib; { - description = "Communications toolbox"; - homepage = "https://iftools.com"; - license = licenses.lgpl2; - platforms = platforms.linux; - maintainers = [ maintainers.misuzu ]; - }; -} diff --git a/pkgs/development/libraries/libctb/include-kbhit.patch b/pkgs/development/libraries/libctb/include-kbhit.patch deleted file mode 100644 index 76b4e38fadb9..000000000000 --- a/pkgs/development/libraries/libctb/include-kbhit.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/GNUmakefile b/GNUmakefile -index e39a687..026f9c4 100644 ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -140,7 +140,7 @@ all: ../lib/libctb$(LIBFLAG)$(GPIBFLAG)-0.16.a ../lib/libctb$(LIBFLAG)$(GPIBFLAG - - install: install_ctb_lib install_ctb_dll - $(INSTALL) -d $(DESTDIR)$(prefix)/include/ctb-0.16 -- for f in ctb.h fifo.h getopt.h $(GPIBINC) iobase.h linux/serport.h linux/timer.h portscan.h serport.h serportx.h timer.h; do \ -+ for f in ctb.h fifo.h getopt.h $(GPIBINC) iobase.h kbhit.h linux/serport.h linux/timer.h portscan.h serport.h serportx.h timer.h; do \ - if test ! -d $(DESTDIR)$(prefix)/include/ctb-0.16/`dirname $$f` ; then \ - $(INSTALL) -d $(DESTDIR)$(prefix)/include/ctb-0.16/`dirname $$f`; \ - fi; \ diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix deleted file mode 100644 index 816bbe41708a..000000000000 --- a/pkgs/development/libraries/libctemplate/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python3, autoconf, automake, libtool }: - -stdenv.mkDerivation rec { - pname = "ctemplate"; - version = "2.4"; - - src = fetchFromGitHub { - owner = "OlafvdSpek"; - repo = "ctemplate"; - rev = "ctemplate-${version}"; - sha256 = "1x0p5yym6vvcx70pm8ihnbxxrl2wnblfp72ih5vjyg8mzkc8cxrr"; - }; - - nativeBuildInputs = [ python3 autoconf automake libtool ]; - - postPatch = '' - patchShebangs . - ''; - - preConfigure = '' - ./autogen.sh - ''; - - meta = { - description = "Simple but powerful template language for C++"; - longDescription = '' - CTemplate is a simple but powerful template language for C++. It - emphasizes separating logic from presentation: it is impossible to - embed application logic in this template language. - ''; - homepage = "https://github.com/OlafvdSpek/ctemplate"; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/libctl/default.nix b/pkgs/development/libraries/libctl/default.nix deleted file mode 100644 index 6969f6166beb..000000000000 --- a/pkgs/development/libraries/libctl/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, gfortran -, guile -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "libctl"; - version = "4.5.1"; - - src = fetchFromGitHub { - owner = "NanoComp"; - repo = pname; - rev = "v${version}"; - sha256 = "uOydBWYPXSBUi+4MM6FNx6B5l2to7Ny9Uc1MMTV9bGA="; - }; - - nativeBuildInputs = [ autoreconfHook gfortran guile pkg-config ]; - - configureFlags = [ "--enable-shared" ]; - - meta = with lib; { - description = "Guile-based library for supporting flexible control files in scientific simulations"; - mainProgram = "gen-ctl-io"; - homepage = "https://github.com/NanoComp/libctl"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ carpinchomug ]; - }; -} diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix deleted file mode 100644 index ec7f1ba26ab1..000000000000 --- a/pkgs/development/libraries/libcue/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, bison, flex }: - -stdenv.mkDerivation rec { - pname = "libcue"; - version = "2.3.0"; - - src = fetchFromGitHub { - owner = "lipnitsk"; - repo = "libcue"; - rev = "v${version}"; - hash = "sha256-ZMUUa8CmpFNparPsM/P2yvRto9E85EdTxpID5sKQbNI="; - }; - - nativeBuildInputs = [ cmake bison flex ]; - - doCheck = true; - - meta = with lib; { - description = "CUE Sheet Parser Library"; - longDescription = '' - libcue is intended to parse a so called cue sheet from a char string or - a file pointer. For handling of the parsed data a convenient API is - available. - ''; - homepage = "https://github.com/lipnitsk/libcue"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ astsmtl ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libcxxrt/default.nix b/pkgs/development/libraries/libcxxrt/default.nix index b1ad3d40eb31..908609675f62 100644 --- a/pkgs/development/libraries/libcxxrt/default.nix +++ b/pkgs/development/libraries/libcxxrt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "libcxxrt"; - version = "4.0.10-unstable-2024-08-06"; + version = "4.0.10-unstable-2024-09-24"; src = fetchFromGitHub { owner = "libcxxrt"; repo = "libcxxrt"; - rev = "7a3ef57f64be0f2f2a156af011adfbe76c7dce74"; - sha256 = "H4FodZ3fAgkWWE+ZByAOx7Nn0+ujxEobOkeHdE/lI94="; + rev = "40e4fa2049930412a2c43cdf0c39b6b5aa735341"; + sha256 = "2rEbRTr8RLl8EKrDq210baCPDt9OppdL7zloNjGOZME="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix deleted file mode 100644 index 112792454c43..000000000000 --- a/pkgs/development/libraries/libdaemon/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "libdaemon"; - version = "0.14"; - - src = fetchurl { - url = "http://0pointer.de/lennart/projects/libdaemon/${pname}-${version}.tar.gz"; - sha256 = "0d5qlq5ab95wh1xc87rqrh1vx6i8lddka1w3f1zcqvcqdxgyn8zx"; - }; - - outputs = [ "out" "dev" "doc" ]; - - patches = [ ./fix-includes.patch ]; - - configureFlags = [ "--disable-lynx" ] - ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) - [ # Can't run this test while cross-compiling - "ac_cv_func_setpgrp_void=yes" - ]; - - meta = { - description = "Lightweight C library that eases the writing of UNIX daemons"; - homepage = "http://0pointer.de/lennart/projects/libdaemon/"; - license = lib.licenses.lgpl2Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libdaemon/fix-includes.patch b/pkgs/development/libraries/libdaemon/fix-includes.patch deleted file mode 100644 index 51c5133afede..000000000000 --- a/pkgs/development/libraries/libdaemon/fix-includes.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- libdaemon-0.14.orig/examples/testd.c -+++ libdaemon-0.14/examples/testd.c -@@ -21,9 +21,9 @@ - #include <signal.h> - #include <errno.h> - #include <string.h> -+#include <unistd.h> - #include <sys/types.h> - #include <sys/time.h> --#include <sys/unistd.h> - #include <sys/select.h> - - #include <libdaemon/dfork.h> diff --git a/pkgs/development/libraries/libdatachannel/default.nix b/pkgs/development/libraries/libdatachannel/default.nix deleted file mode 100644 index bc831d354e77..000000000000 --- a/pkgs/development/libraries/libdatachannel/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - ninja, - pkg-config, - libnice, - openssl, - plog, - srtp, - usrsctp, -}: - -stdenv.mkDerivation rec { - pname = "libdatachannel"; - version = "0.21.2"; - - src = fetchFromGitHub { - owner = "paullouisageneau"; - repo = "libdatachannel"; - rev = "v${version}"; - hash = "sha256-3fax57oaJvOgbTDPCiiUdtsfAGhICfPkuMihawq06SA="; - }; - - outputs = [ - "out" - "dev" - ]; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - ninja - pkg-config - ]; - - buildInputs = [ - libnice - openssl - srtp - usrsctp - plog - ]; - - cmakeFlags = [ - "-DUSE_NICE=ON" - "-DPREFER_SYSTEM_LIB=ON" - "-DNO_EXAMPLES=ON" - ]; - - postFixup = '' - # Fix include path that will be incorrect due to the "dev" output - substituteInPlace "$dev/lib/cmake/LibDataChannel/LibDataChannelTargets.cmake" \ - --replace-fail "\''${_IMPORT_PREFIX}/include" "$dev/include" - ''; - - meta = with lib; { - description = "C/C++ WebRTC network library featuring Data Channels, Media Transport, and WebSockets"; - homepage = "https://libdatachannel.org/"; - license = with licenses; [ mpl20 ]; - maintainers = with maintainers; [ erdnaxe ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/libdatovka/default.nix b/pkgs/development/libraries/libdatovka/default.nix deleted file mode 100644 index 7d6896efa639..000000000000 --- a/pkgs/development/libraries/libdatovka/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, autoreconfHook -, pkg-config -, fetchurl -, expat -, gpgme -, libgcrypt -, libxml2 -, libxslt -, gnutls -, curl -, docbook_xsl -}: - -stdenv.mkDerivation rec { - pname = "libdatovka"; - version = "0.6.2"; - - src = fetchurl { - url = "https://gitlab.nic.cz/datovka/libdatovka/-/archive/v${version}/libdatovka-v${version}.tar.gz"; - sha256 = "sha256-4JFPlEpSFv5t3p/NGq0cfn+neJj2M0BNWWd6nlCjHE0="; - }; - - patches = [ - ./libdatovka-deprecated-fn-curl.patch - ]; - - configureFlags = [ - "--with-docbook-xsl-stylesheets=${docbook_xsl}/xml/xsl/docbook" - ]; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ expat gpgme libgcrypt libxml2 libxslt gnutls curl docbook_xsl ]; - - meta = with lib; { - description = "Client library for accessing SOAP services of Czech government-provided Databox infomation system"; - homepage = "https://gitlab.nic.cz/datovka/libdatovka"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.ovlach ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libdatovka/libdatovka-deprecated-fn-curl.patch b/pkgs/development/libraries/libdatovka/libdatovka-deprecated-fn-curl.patch deleted file mode 100644 index b63f850c7d71..000000000000 --- a/pkgs/development/libraries/libdatovka/libdatovka-deprecated-fn-curl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libdatovka-v0.2.1/configure.ac 2021-11-03 13:33:03.000000000 +0100 -+++ libdatovka-v0.2.1-patched/configure.ac 2023-01-18 11:44:25.647566474 +0100 -@@ -46,6 +46,8 @@ - [Define if you want include debugging code]) - ) - -+CFLAGS="${CFLAGS} -Wno-error=deprecated-declarations" -+ - AC_CHECK_DECL([_WIN32]) - AM_CONDITIONAL([WIN32], [test "$ac_cv_have_decl__WIN32" = "yes"]) - diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/development/libraries/libdatrie/default.nix deleted file mode 100644 index e810da2e96cd..000000000000 --- a/pkgs/development/libraries/libdatrie/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, autoreconfHook, autoconf-archive -, installShellFiles, libiconv }: - -stdenv.mkDerivation rec { - - pname = "libdatrie"; - version = "2019-12-20"; - - outputs = [ "bin" "out" "lib" "dev" ]; - - src = fetchFromGitHub { - owner = "tlwg"; - repo = "libdatrie"; - rev = "d1db08ac1c76f54ba23d63665437473788c999f3"; - sha256 = "03dc363259iyiidrgadzc7i03mmfdj8h78j82vk6z53w6fxq5zxc"; - }; - - nativeBuildInputs = [ - autoreconfHook - autoconf-archive - installShellFiles - ]; - - buildInputs = [ libiconv ]; - - preAutoreconf = let - reports = "https://github.com/tlwg/libdatrie/issues"; - in - '' - sed -i -e "/AC_INIT/,+3d" configure.ac - sed -i "5iAC_INIT(${pname},${version},[${reports}])" configure.ac - ''; - - postInstall = '' - installManPage man/trietool.1 - ''; - - meta = with lib; { - homepage = "https://linux.thai.net/~thep/datrie/datrie.html"; - description = "This is an implementation of double-array structure for representing trie"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; - maintainers = [ ]; - pkgConfigModules = [ "datrie-0.2" ]; - }; -} diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix deleted file mode 100644 index c94707903872..000000000000 --- a/pkgs/development/libraries/libdazzle/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ninja -, meson -, mesonEmulatorHook -, pkg-config -, vala -, gobject-introspection -, libxml2 -, gtk-doc -, docbook_xsl -, docbook_xml_dtd_43 -, dbus -, xvfb-run -, glib -, gtk3 -, gnome -}: - -stdenv.mkDerivation rec { - pname = "libdazzle"; - version = "3.44.0"; - - outputs = [ "out" "dev" "devdoc" ]; - outputBin = "dev"; - - src = fetchurl { - url = "mirror://gnome/sources/libdazzle/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "PNPkXrbiaAywXVLh6A3Y+dWdR2UhLw4o945sF4PRjq4="; - }; - - nativeBuildInputs = [ - ninja - meson - pkg-config - vala - gobject-introspection - libxml2 - gtk-doc - docbook_xsl - docbook_xml_dtd_43 - dbus - glib - ] ++ lib.optionals stdenv.isLinux [ - xvfb-run - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ - glib - gtk3 - ]; - - mesonFlags = [ - "-Denable_gtk_doc=true" - ]; - - doCheck = stdenv.isLinux; - - checkPhase = '' - xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus}/share/dbus-1/session.conf \ - meson test --print-errorlogs - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - }; - }; - - meta = with lib; { - description = "Library to delight your users with fancy features"; - mainProgram = "dazzle-list-counters"; - longDescription = '' - The libdazzle library is a companion library to GObject and GTK. It - provides various features that we wish were in the underlying library but - cannot for various reasons. In most cases, they are wildly out of scope - for those libraries. In other cases, our design isn't quite generic - enough to work for everyone. - ''; - homepage = "https://gitlab.gnome.org/GNOME/libdazzle"; - license = licenses.gpl3Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix deleted file mode 100644 index 6537e3ae2a3e..000000000000 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib, stdenv, fetchurl, libdbi -# TODO: migrate away from overriding packages to null -, libmysqlclient ? null -, sqlite ? null -, postgresql ? null -}: - -stdenv.mkDerivation rec { - pname = "libdbi-drivers"; - version = "0.9.0"; - - src = fetchurl { - url = "mirror://sourceforge/libdbi-drivers/libdbi-drivers-${version}.tar.gz"; - sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3"; - }; - - buildInputs = [ libdbi sqlite postgresql ] ++ lib.optional (libmysqlclient != null) libmysqlclient; - - patches = [ - # https://sourceforge.net/p/libdbi-drivers/libdbi-drivers/ci/24f48b86c8988ee3aaebc5f303d71e9d789f77b6 - ./libdbi-drivers-0.9.0-buffer_overflow.patch - ]; - - postPatch = '' - sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure; - ''; - - configureFlags = [ - "--sysconfdir=/etc" - "--localstatedir=/var" - "--disable-docs" - "--enable-libdbi" - "--with-dbi-incdir=${libdbi}/include" - "--with-dbi-libdir=${libdbi}/lib" - ] ++ lib.optionals (libmysqlclient != null) [ - "--with-mysql" - "--with-mysql-incdir=${lib.getDev libmysqlclient}/include/mysql" - "--with-mysql-libdir=${libmysqlclient}/lib/mysql" - ] ++ lib.optionals (sqlite != null) [ - "--with-sqlite3" - "--with-sqlite3-incdir=${sqlite.dev}/include/sqlite" - "--with-sqlite3-libdir=${sqlite.out}/lib/sqlite" - ] ++ lib.optionals (postgresql != null) [ - "--with-pgsql" - ]; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ - "-Wno-error=incompatible-function-pointer-types" - "-Wno-error=int-conversion" - ]); - - installFlags = [ "DESTDIR=\${out}" ]; - - postInstall = '' - mv $out/$out/* $out - DIR=$out/$out - while rmdir $DIR 2>/dev/null; do - DIR="$(dirname "$DIR")" - done - - # Remove the unneeded var/lib directories - rm -rf $out/var - ''; - - meta = with lib; { - homepage = "https://libdbi-drivers.sourceforge.net/"; - description = "Database drivers for libdbi"; - platforms = platforms.all; - license = licenses.lgpl21; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libdbi-drivers/libdbi-drivers-0.9.0-buffer_overflow.patch b/pkgs/development/libraries/libdbi-drivers/libdbi-drivers-0.9.0-buffer_overflow.patch deleted file mode 100644 index 1891c1a143ba..000000000000 --- a/pkgs/development/libraries/libdbi-drivers/libdbi-drivers-0.9.0-buffer_overflow.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/drivers/sqlite3/dbd_sqlite3.c -+++ b/drivers/sqlite3/dbd_sqlite3.c -@@ -1451,7 +1451,7 @@ static int getTables(char** tables, int - break; - } - -- word_lower[item-start+1]; -+ char word_lower[item-start+1]; - strncpy(word_lower,start,item-start); - word_lower[item-start] = '\0'; - int i = 0; diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/development/libraries/libdbi/default.nix deleted file mode 100644 index f0cb74cb86d0..000000000000 --- a/pkgs/development/libraries/libdbi/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libdbi"; - version = "0.9.0"; - - src = fetchurl { - url = "mirror://sourceforge/libdbi/${pname}-${version}.tar.gz"; - sha256 = "00s5ra7hdlq25iv23nwf4h1v3kmbiyzx0v9bhggjiii4lpf6ryys"; - }; - - meta = with lib; { - homepage = "https://libdbi.sourceforge.net/"; - description = "DB independent interface to DB"; - license = licenses.lgpl21; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix deleted file mode 100644 index 5143372d2b0d..000000000000 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ stdenv, fetchurl, lib, file -, pkg-config, intltool -, glib, dbus-glib, json-glib -, gobject-introspection, vala -, gtkVersion ? null, gtk2, gtk3 -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libdbusmenu-${if gtkVersion == null then "glib" else "gtk${gtkVersion}"}"; - version = "16.04.0"; - - src = let - inherit (finalAttrs) version; - in fetchurl { - url = "https://launchpad.net/dbusmenu/${lib.versions.majorMinor version}/${version}/+download/libdbusmenu-${version}.tar.gz"; - sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r"; - }; - - nativeBuildInputs = [ vala pkg-config intltool gobject-introspection ]; - - buildInputs = [ - glib dbus-glib json-glib - ] ++ lib.optional (gtkVersion != null) - { - "2" = gtk2; - "3" = gtk3; - }.${gtkVersion} or (throw "unknown GTK version ${gtkVersion}"); - - patches = [ - ./requires-glib.patch - ]; - - postPatch = '' - for f in {configure,ltmain.sh,m4/libtool.m4}; do - substituteInPlace $f \ - --replace /usr/bin/file ${file}/bin/file - done - ''; - - # https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/libdbusmenu - preConfigure = '' - export HAVE_VALGRIND_TRUE="#" - export HAVE_VALGRIND_FALSE="" - ''; - - configureFlags = [ - "CFLAGS=-Wno-error" - "--sysconfdir=/etc" - "--localstatedir=/var" - # TODO use `lib.withFeatureAs` - (if gtkVersion == null then "--disable-gtk" else "--with-gtk=${gtkVersion}") - "--disable-scrollkeeper" - ] ++ lib.optional (gtkVersion != "2") "--disable-dumper"; - - doCheck = false; # generates shebangs in check phase, too lazy to fix - - installFlags = [ - "sysconfdir=${placeholder "out"}/etc" - "localstatedir=\${TMPDIR}" - "typelibdir=${placeholder "out"}/lib/girepository-1.0" - ]; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = with lib; { - description = "Library for passing menu structures across DBus"; - homepage = "https://launchpad.net/dbusmenu"; - license = with licenses; [ gpl3 lgpl21 lgpl3 ]; - pkgConfigModules = [ - "dbusmenu-glib-0.4" - "dbusmenu-jsonloader-0.4" - ] ++ lib.optional (gtkVersion == "3") "dbusmenu-gtk${gtkVersion}-0.4"; - platforms = platforms.linux; - maintainers = [ maintainers.msteen ]; - }; -}) diff --git a/pkgs/development/libraries/libdbusmenu/requires-glib.patch b/pkgs/development/libraries/libdbusmenu/requires-glib.patch deleted file mode 100644 index 53cad2cf018f..000000000000 --- a/pkgs/development/libraries/libdbusmenu/requires-glib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libdbusmenu-glib/dbusmenu-glib-0.4.pc.in -+++ b/libdbusmenu-glib/dbusmenu-glib-0.4.pc.in -@@ -5,7 +5,7 @@ - includedir=@includedir@ - - Cflags: -I${includedir}/libdbusmenu-glib-0.4 --Requires: -+Requires: glib-2.0 - Libs: -L${libdir} -ldbusmenu-glib - - Name: libdbusmenu-glib diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index 0163eb9015d2..fc33817a857e 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libusb1 ] - ++ lib.optional stdenv.isLinux libraw1394 - ++ lib.optional stdenv.isDarwin CoreServices; + ++ lib.optional stdenv.hostPlatform.isLinux libraw1394 + ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices; meta = with lib; { description = "Capture and control API for IIDC compliant cameras"; diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix deleted file mode 100644 index e4dfba60fe99..000000000000 --- a/pkgs/development/libraries/libde265/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config - -, callPackage - - # for passthru.tests -, imagemagick -, libheif -, imlib2Full -, gst_all_1 -}: - -stdenv.mkDerivation (finalAttrs: rec { - version = "1.0.15"; - pname = "libde265"; - - src = fetchFromGitHub { - owner = "strukturag"; - repo = "libde265"; - rev = "refs/tags/v${version}"; - hash = "sha256-guiLM4RNe5O0qpeCoQUbs1Z7j0wp8iK9za2+6NIB8yY="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - enableParallelBuilding = true; - - passthru.tests = { - inherit imagemagick libheif imlib2Full; - inherit (gst_all_1) gst-plugins-bad; - - test-corpus-decode = callPackage ./test-corpus-decode.nix { - libde265 = finalAttrs.finalPackage; - }; - }; - - meta = { - homepage = "https://github.com/strukturag/libde265"; - description = "Open h.265 video codec implementation"; - mainProgram = "dec265"; - license = lib.licenses.lgpl3; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ gebner ]; - }; -}) diff --git a/pkgs/development/libraries/libde265/test-corpus-decode.nix b/pkgs/development/libraries/libde265/test-corpus-decode.nix deleted file mode 100644 index 9c184362d10b..000000000000 --- a/pkgs/development/libraries/libde265/test-corpus-decode.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv -, fetchFromGitHub -, libde265 -}: - -stdenv.mkDerivation { - pname = "libde265-test-corpus-decode"; - version = "unstable-2020-02-19"; - - src = fetchFromGitHub { - owner = "strukturag"; - repo = "libde265-data"; - rev = "bdfdfdbe682f514c5185c270c74eac42731a7fa8"; - sha256 = "sha256-fOgu7vMoyH30Zzbkfm4a6JVDZtYLO/0R2syC2Wux+Z8="; - }; - - dontConfigure = true; - dontBuild = true; - - doCheck = true; - nativeCheckInputs = [ libde265 ]; - # based on invocations in https://github.com/strukturag/libde265/blob/0b1752abff97cb542941d317a0d18aa50cb199b1/scripts/ci-run.sh - checkPhase = '' - echo "Single-threaded:" - find . -name '*.bin' | while read f; do - echo "Decoding $f" - dec265 -q -c $f - dec265 -0 -q -c $f - dec265 -q --disable-deblocking --disable-sao $f - done - echo "Multi-threaded:" - find RandomAccess/ -name '*.bin' | while read f; do - echo "Decoding $f" - dec265 -t 4 -q -c $f - dec265 -t 4 -0 -q -c $f - dec265 -t 4 -q --disable-deblocking --disable-sao $f - done - ''; - # a larger corpus of files can be found - # as an ubuntu package libde265-teststreams @ - # https://launchpad.net/~strukturag/+archive/ubuntu/libde265/+packages - # but it is *much* larger - - installPhase = '' - touch $out - ''; -} diff --git a/pkgs/development/libraries/libdecor/default.nix b/pkgs/development/libraries/libdecor/default.nix deleted file mode 100644 index f81fdc68768a..000000000000 --- a/pkgs/development/libraries/libdecor/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv -, lib -, fetchFromGitLab -, pkg-config -, meson -, ninja -, wayland -, wayland-protocols -, wayland-scanner -, cairo -, dbus -, pango -, gtk3 -}: - -stdenv.mkDerivation rec { - pname = "libdecor"; - version = "0.2.2"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "libdecor"; - repo = "libdecor"; - rev = version; - hash = "sha256-mID19uHXFKJUZtQsSOXjRdz541YVjMxmSHVa+DlkPRc="; - }; - - outputs = [ "out" "dev" ]; - - strictDeps = true; - - mesonFlags = [ - (lib.mesonBool "demo" false) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - wayland-scanner - ]; - - buildInputs = [ - wayland - wayland-protocols - cairo - dbus - pango - gtk3 - ]; - - meta = with lib; { - homepage = "https://gitlab.freedesktop.org/libdecor/libdecor"; - description = "Client-side decorations library for Wayland clients"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ artturin ]; - }; -} diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix index c59ace0aa23e..56589f8cf8df 100644 --- a/pkgs/development/libraries/libdeflate/default.nix +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdeflate"; - version = "1.20"; + version = "1.22"; src = fetchFromGitHub { owner = "ebiggers"; repo = "libdeflate"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-kHLdu/Pb94+arj98Jjp57FpvWbAXW49s9cxCA1cf898="; + hash = "sha256-KpKY0A1cRV9XR1WrE15Eewf2fDWwIFGjQm/fFCnBDrg="; }; cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [ "-DLIBDEFLATE_BUILD_SHARED_LIB=OFF" ]; diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index bfefe90487c4..53944f5a5e94 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr ] ++ lib.optionals withXorg [ libX11 libGL ] - ++ lib.optionals stdenv.isDarwin [ OpenGL ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenGL ]; configureFlags = [ "--enable-ILU" "--enable-ILUT" ]; diff --git a/pkgs/development/libraries/libdex/default.nix b/pkgs/development/libraries/libdex/default.nix deleted file mode 100644 index 373fae4876b1..000000000000 --- a/pkgs/development/libraries/libdex/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv -, lib -, fetchurl -, gi-docgen -, gobject-introspection -, meson -, ninja -, pkg-config -, vala -, glib -, liburing -, gnome -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libdex"; - version = "0.6.1"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/libdex/${lib.versions.majorMinor finalAttrs.version}/libdex-${finalAttrs.version}.tar.xz"; - hash = "sha256-0XbeZXhXHjKowLYDtqWhP6X4f7a1RCV1s47FrxaxepI="; - }; - - nativeBuildInputs = [ - gi-docgen - gobject-introspection - meson - ninja - pkg-config - vala - ]; - - buildInputs = [ - glib - liburing - ]; - - mesonFlags = [ - "-Ddocs=true" - ]; - - doCheck = true; - - postFixup = '' - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput "share/doc" "$devdoc" - ''; - - passthru.updateScript = gnome.updateScript { - packageName = "libdex"; - versionPolicy = "odd-unstable"; - }; - - meta = with lib; { - description = "Library supporting deferred execution for GNOME and GTK"; - homepage = "https://gitlab.gnome.org/GNOME/libdex"; - maintainers = teams.gnome.members; - platforms = platforms.linux ++ platforms.darwin; - license = licenses.lgpl21Plus; - }; -}) diff --git a/pkgs/development/libraries/libdicom/default.nix b/pkgs/development/libraries/libdicom/default.nix deleted file mode 100644 index 94dfaf81298d..000000000000 --- a/pkgs/development/libraries/libdicom/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, uthash -, meson -, ninja -, pkg-config -, check -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libdicom"; - version = "1.0.5"; - - src = fetchFromGitHub { - owner = "ImagingDataCommons"; - repo = "libdicom"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-9n0Gp9+fmTM/shgWC8zpwt1pic9BrvDubOt7f+ZDMeE="; - }; - - patches = [ - (fetchpatch { - name = "CVE-2024-24793.CVE-2024-24794.patch"; - url = "https://github.com/ImagingDataCommons/libdicom/commit/3661aa4cdbe9c39f67d38ae87520f9e3ed50ab16.patch"; - excludes = [ "CHANGELOG.md" ]; - hash = "sha256-/KTp0nKYk6jX4phNHY+nzjEptUBHKM2JkOftS5vHsEw="; - }) - ]; - - buildInputs = [ uthash ]; - - nativeBuildInputs = [ meson ninja pkg-config ] - ++ lib.optionals (finalAttrs.finalPackage.doCheck) [ check ]; - - mesonBuildType = "release"; - - mesonFlags = lib.optionals (!finalAttrs.finalPackage.doCheck) [ "-Dtests=false" ]; - - doCheck = true; - - meta = with lib; { - description = "C library for reading DICOM files"; - homepage = "https://github.com/ImagingDataCommons/libdicom"; - license = licenses.mit; - maintainers = with maintainers; [ lromor ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix deleted file mode 100644 index d957d2d05d0d..000000000000 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, minizip, pcsclite, opensc, openssl -, xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: - -stdenv.mkDerivation rec { - version = "3.17.1"; - pname = "libdigidocpp"; - - src = fetchurl { - url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - hash = "sha256-3qDsIAOiWMZDj2zLE+Os7BoeCPeC4JQ6p8jSBd7PdV0="; - }; - - nativeBuildInputs = [ cmake pkg-config xxd ]; - - buildInputs = [ - minizip pcsclite opensc openssl xercesc - xml-security-c xsd zlib xalanc - ]; - - outputs = [ "out" "lib" "dev" "bin" ]; - - # libdigidocpp.so's `PKCS11Signer::PKCS11Signer()` dlopen()s "opensc-pkcs11.so" - # itself, so add OpenSC to its DT_RUNPATH after the fixupPhase shrinked it. - # https://github.com/open-eid/cmake/pull/35 might be an alternative. - postFixup = '' - patchelf --add-rpath ${opensc}/lib/pkcs11 $lib/lib/libdigidocpp.so - ''; - - meta = with lib; { - description = "Library for creating DigiDoc signature files"; - mainProgram = "digidoc-tool"; - homepage = "https://www.id.ee/"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - maintainers = [ maintainers.jagajaga ]; - }; -} diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix deleted file mode 100644 index 926973bb5739..000000000000 --- a/pkgs/development/libraries/libdiscid/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, darwin }: - -stdenv.mkDerivation rec { - pname = "libdiscid"; - version = "0.6.4"; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; - - src = fetchurl { - url = "http://ftp.musicbrainz.org/pub/musicbrainz/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-3V6PHJrq1ELiO3SanMkzY3LmLoitcHmitiiVsDkMsoI="; - }; - - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework IOKit"; - - meta = with lib; { - description = "C library for creating MusicBrainz DiscIDs from audio CDs"; - homepage = "http://musicbrainz.org/doc/libdiscid"; - maintainers = with maintainers; [ ehmry ]; - license = licenses.lgpl21; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libdisplay-info/default.nix b/pkgs/development/libraries/libdisplay-info/default.nix deleted file mode 100644 index 68cca4ea1355..000000000000 --- a/pkgs/development/libraries/libdisplay-info/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, meson -, pkg-config -, ninja -, python3 -, hwdata -, edid-decode -}: - -stdenv.mkDerivation rec { - pname = "libdisplay-info"; - version = "0.2.0"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "emersion"; - repo = pname; - rev = version; - sha256 = "sha256-6xmWBrPHghjok43eIDGeshpUEQTuwWLXNHg7CnBUt3Q="; - }; - - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson pkg-config ninja edid-decode hwdata python3 ]; - - postPatch = '' - patchShebangs tool/gen-search-table.py - ''; - - meta = with lib; { - description = "EDID and DisplayID library"; - mainProgram = "di-edid-decode"; - homepage = "https://gitlab.freedesktop.org/emersion/libdisplay-info"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ pedrohlc ]; - }; -} diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix deleted file mode 100644 index 8824061dee86..000000000000 --- a/pkgs/development/libraries/libdivecomputer/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libdivecomputer"; - version = "0.8.0"; - - src = fetchurl { - url = "https://www.libdivecomputer.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-J17M55I2RO1YH6q53LTxpprSUbzrByHE5fhftjFheg4="; - }; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "http://www.libdivecomputer.org"; - description = "Cross-platform and open source library for communication with dive computers from various manufacturers"; - mainProgram = "dctool"; - maintainers = [ maintainers.mguentner ]; - license = licenses.lgpl21; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/development/libraries/libdivsufsort/default.nix deleted file mode 100644 index f2a2dae5f816..000000000000 --- a/pkgs/development/libraries/libdivsufsort/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{lib, stdenv, fetchFromGitHub, cmake}: - -stdenv.mkDerivation rec { - pname = "libdivsufsort"; - version = "2.0.1"; - - src = fetchFromGitHub { - owner = "y-256"; - repo = pname; - rev = "${version}"; - hash = "sha256-4p+L1bq9SBgWSHXx+WYWAe60V2g1AN+zlJvC+F367Tk="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = { - homepage = "https://github.com/y-256/libdivsufsort"; - license = lib.licenses.mit; - description = "Library to construct the suffix array and the BW transformed string"; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libdmapsharing/default.nix b/pkgs/development/libraries/libdmapsharing/default.nix deleted file mode 100644 index 47b02a65e083..000000000000 --- a/pkgs/development/libraries/libdmapsharing/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitLab, - autoconf, - automake, - libtool, - pkg-config, - vala, - avahi, - gdk-pixbuf, - gst_all_1, - glib, - gtk-doc, - docbook-xsl-nons, - docbook_xml_dtd_43, - gobject-introspection, - libsoup_3, - withGtkDoc ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, -}: - -stdenv.mkDerivation rec { - pname = "libdmapsharing"; - version = "3.9.13"; - - outputs = - [ - "out" - "dev" - ] - ++ lib.optionals withGtkDoc [ - "devdoc" - ]; - - outputBin = "dev"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = pname; - rev = "${lib.toUpper pname}_${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "oR9lpOFxgGfrtzncFT6dbmhKQfcuH/NvhOR/USHAHQc="; - }; - - strictDeps = true; - - nativeBuildInputs = - [ - autoconf - automake - libtool - gtk-doc # gtkdocize - pkg-config - gobject-introspection - vala - ] - ++ lib.optionals withGtkDoc [ - docbook-xsl-nons - docbook_xml_dtd_43 - ]; - - buildInputs = - [ - avahi - gdk-pixbuf - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - ] - ++ lib.optionals withGtkDoc [ - gtk-doc - ]; - - propagatedBuildInputs = [ - glib - libsoup_3 - ]; - - configureFlags = [ - (lib.enableFeature false "tests") # Tests require mDNS server - (lib.enableFeature withGtkDoc "gtk-doc") - ]; - - postPatch = '' - substituteInPlace configure.ac \ - --replace-fail pkg-config "$PKG_CONFIG" - ''; - - preConfigure = '' - NOCONFIGURE=1 ./autogen.sh - ''; - - meta = with lib; { - homepage = "https://www.flyn.org/projects/libdmapsharing/"; - description = "Library that implements the DMAP family of protocols"; - maintainers = teams.gnome.members; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix deleted file mode 100644 index bd7eb2359ef7..000000000000 --- a/pkgs/development/libraries/libdmtx/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "libdmtx"; - version = "0.7.7"; - - src = fetchFromGitHub { - owner = "dmtx"; - repo = "libdmtx"; - rev = "v${version}"; - sha256 = "sha256-UQy8iFfl8BNT5cBUMVF1tIScFPfHekSofaebtel9JWk="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - meta = { - description = "Open source software for reading and writing Data Matrix barcodes"; - homepage = "https://github.com/dmtx/libdmtx"; - changelog = "https://github.com/dmtx/libdmtx/blob/v${version}/ChangeLog"; - platforms = lib.platforms.all; - maintainers = [ ]; - license = lib.licenses.bsd2; - }; -} diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix deleted file mode 100644 index 58112ea2c2fd..000000000000 --- a/pkgs/development/libraries/libdnet/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - automake, - autoconf, - libtool, - pkg-config, - check, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libdnet"; - version = "1.18.0"; - - enableParallelBuilding = true; - - src = fetchFromGitHub { - owner = "ofalk"; - repo = "libdnet"; - rev = "refs/tags/libdnet-${finalAttrs.version}"; - hash = "sha256-oPlBQB9e8vGJ/rVydMqsZqdInhrpm2sNWkDl9JkkXCI="; - }; - - nativeBuildInputs = [ - automake - autoconf - pkg-config - check - ]; - buildInputs = [ libtool ]; - - # .so endings are missing (quick and dirty fix) - postInstall = '' - for i in $out/lib/*; do - ln -s $i $i.so - done - ''; - - meta = { - 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 ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/development/libraries/libdovi/Cargo.lock b/pkgs/development/libraries/libdovi/Cargo.lock deleted file mode 100644 index ef5eb016f3f9..000000000000 --- a/pkgs/development/libraries/libdovi/Cargo.lock +++ /dev/null @@ -1,726 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - -[[package]] -name = "anstyle" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "bitstream-io" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499" - -[[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 = "bitvec_helpers" -version = "3.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e6539ed4bcd1be8442a26b154a1e363cbcb1410b9c275646d6f6ca532fd142f" -dependencies = [ - "bitstream-io", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "ciborium" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" - -[[package]] -name = "ciborium-ll" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" -dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "clap" -version = "4.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" -dependencies = [ - "clap_builder", -] - -[[package]] -name = "clap_builder" -version = "4.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" -dependencies = [ - "anstyle", - "clap_lex", -] - -[[package]] -name = "clap_lex" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" - -[[package]] -name = "crc" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -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 = "criterion" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" -dependencies = [ - "anes", - "cast", - "ciborium", - "clap", - "criterion-plot", - "is-terminal", - "itertools", - "num-traits", - "once_cell", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools", -] - -[[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-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "dolby_vision" -version = "3.3.1" -dependencies = [ - "anyhow", - "bitvec", - "bitvec_helpers", - "crc", - "criterion", - "libc", - "roxmltree", - "serde", - "serde_json", - "tinyvec", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[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 = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "indexmap" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[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 = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[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 = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "oorandom" -version = "11.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" - -[[package]] -name = "plotters" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" - -[[package]] -name = "plotters-svg" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" -dependencies = [ - "plotters-backend", -] - -[[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 = "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 = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[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 = "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-syntax" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" - -[[package]] -name = "roxmltree" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[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 = "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", -] - -[[package]] -name = "serde_json" -version = "1.0.122" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" -dependencies = [ - "indexmap", - "itoa", - "memchr", - "ryu", - "serde", -] - -[[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 = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "tinyvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" -dependencies = [ - "serde", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[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 = "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", - "wasm-bindgen-shared", -] - -[[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", - "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 = "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 = "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 = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -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", - "windows_x86_64_msvc", -] - -[[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.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[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.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[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.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] diff --git a/pkgs/development/libraries/libdovi/default.nix b/pkgs/development/libraries/libdovi/default.nix deleted file mode 100644 index 5f87567e3bc8..000000000000 --- a/pkgs/development/libraries/libdovi/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, cargo-c -, rust -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "libdovi"; - version = "3.3.1"; - - src = fetchCrate { - pname = "dolby_vision"; - inherit version; - hash = "sha256-ecd+r0JWZtP/rxt4Y3Cj2TkygXIMy5KZhZpXBwJNPx4="; - }; - - cargoLock.lockFile = ./Cargo.lock; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - - nativeBuildInputs = [ cargo-c ]; - - buildPhase = '' - runHook preBuild - ${rust.envVars.setEnv} cargo cbuild -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - ${rust.envVars.setEnv} cargo cinstall -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} - runHook postInstall - ''; - - checkPhase = '' - runHook preCheck - ${rust.envVars.setEnv} cargo ctest -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} - runHook postCheck - ''; - - meta = with lib; { - description = "C library for Dolby Vision metadata parsing and writing"; - homepage = "https://crates.io/crates/dolby_vision"; - license = licenses.mit; - maintainers = with maintainers; [ kranzes ]; - }; -} diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix deleted file mode 100644 index f4d54722327d..000000000000 --- a/pkgs/development/libraries/libdrm/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv, lib, fetchurl, pkg-config, meson, ninja, docutils -, libpthreadstubs -, withIntel ? lib.meta.availableOn stdenv.hostPlatform libpciaccess, libpciaccess -, withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light, valgrind-light -, gitUpdater -}: - -stdenv.mkDerivation rec { - pname = "libdrm"; - version = "2.4.122"; - - src = fetchurl { - url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-2fUHm3d9/8qTAMzFaxCpNYjN+8nd4vrhEZQN+2KS8lE="; - }; - - outputs = [ "out" "dev" "bin" ]; - - nativeBuildInputs = [ pkg-config meson ninja docutils ]; - buildInputs = [ libpthreadstubs ] - ++ lib.optional withIntel libpciaccess - ++ lib.optional withValgrind valgrind-light; - - mesonFlags = [ - "-Dinstall-test-programs=true" - "-Dcairo-tests=disabled" - (lib.mesonEnable "intel" withIntel) - (lib.mesonEnable "omap" stdenv.hostPlatform.isLinux) - (lib.mesonEnable "valgrind" withValgrind) - ] ++ lib.optionals stdenv.hostPlatform.isAarch [ - "-Dtegra=enabled" - ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ - "-Detnaviv=disabled" - ]; - - passthru = { - updateScript = gitUpdater { - url = "https://gitlab.freedesktop.org/mesa/drm.git"; - rev-prefix = "libdrm-"; - # Skip versions like libdrm-2_0_2 that happen to go last when - # sorted. - ignoredVersions = "_"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.freedesktop.org/mesa/drm"; - downloadPage = "https://dri.freedesktop.org/libdrm/"; - description = "Direct Rendering Manager library and headers"; - longDescription = '' - A userspace library for accessing the DRM (Direct Rendering Manager) on - Linux, BSD and other operating systems that support the ioctl interface. - The library provides wrapper functions for the ioctls to avoid exposing - the kernel interface directly, and for chipsets with drm memory manager, - support for tracking relocations and buffers. - New functionality in the kernel DRM drivers typically requires a new - libdrm, but a new libdrm will always work with an older kernel. - - libdrm is a low-level library, typically used by graphics drivers such as - the Mesa drivers, the X drivers, libva and similar projects. - ''; - license = licenses.mit; - platforms = lib.subtractLists platforms.darwin platforms.unix; - maintainers = with maintainers; [ primeos ]; - }; -} diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix deleted file mode 100644 index 49c2ab1bdfa7..000000000000 --- a/pkgs/development/libraries/libdv/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, popt }: - -stdenv.mkDerivation rec { - pname = "libdv"; - version = "1.0.0"; - - src = fetchurl { - url = "mirror://sourceforge/libdv/libdv-${version}.tar.gz"; - sha256 = "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3"; - }; - - # Disable priority scheduling on Darwin because it doesn’t support sched_setscheduler. - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace encodedv/dvconnect.c \ - --replace '#ifdef _SC_PRIORITY_SCHEDULING' '#if 0' - ''; - - configureFlags = [ - "--disable-asm" - "--disable-sdl" - "--disable-gtk" - "--disable-xv" - "--disable-gprof" - ]; - - buildInputs = [ popt ]; - - meta = with lib; { - description = "Software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards"; - homepage = "https://sourceforge.net/projects/libdv/"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libdvbcsa/default.nix b/pkgs/development/libraries/libdvbcsa/default.nix deleted file mode 100644 index f9daa860cf47..000000000000 --- a/pkgs/development/libraries/libdvbcsa/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "libdvbcsa"; - version = "1.1.0"; - - src = fetchurl { - url = "http://get.videolan.org/libdvbcsa/${version}/${pname}-${version}.tar.gz"; - sha256 = "4db78af5cdb2641dfb1136fe3531960a477c9e3e3b6ba19a2754d046af3f456d"; - }; - - doCheck = true; - - meta = { - description = "Free implementation of the DVB Common Scrambling Algorithm with encryption and decryption capabilities"; - homepage = "http://www.videolan.org/developers/libdvbcsa.html"; - platforms = lib.platforms.unix; - license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ melias122 ]; - }; - -} diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix deleted file mode 100644 index 6ec8aab8943c..000000000000 --- a/pkgs/development/libraries/libdvbpsi/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "libdvbpsi"; - version = "1.3.3"; - - src = fetchurl { - url = "http://get.videolan.org/libdvbpsi/${version}/${pname}-${version}.tar.bz2"; - sha256 = "04h1l3vrkrdsrvkgzcr51adk10g6hxcxvgjphyyxz718ry5rkd82"; - }; - - meta = { - description = "Simple library designed for decoding and generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818 and ITU-T H.222.0"; - homepage = "http://www.videolan.org/developers/libdvbpsi.html"; - platforms = lib.platforms.unix; - license = lib.licenses.lgpl21; - }; - -} diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index 6c832250fc1c..2e1cc41c5a73 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "libdvdcss"; version = "1.4.3"; - buildInputs = lib.optional stdenv.isDarwin IOKit; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin IOKit; src = fetchurl { url = "http://get.videolan.org/libdvdcss/${version}/${pname}-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/libdwarf/common.nix b/pkgs/development/libraries/libdwarf/common.nix deleted file mode 100644 index 4cf3102bbbfc..000000000000 --- a/pkgs/development/libraries/libdwarf/common.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl, buildInputs, hash, version, url, knownVulnerabilities }: - -stdenv.mkDerivation rec { - pname = "libdwarf"; - inherit version; - - src = fetchurl { - inherit url hash; - }; - - configureFlags = [ "--enable-shared" "--disable-nonshared" ]; - - inherit buildInputs; - - outputs = [ "bin" "lib" "dev" "out" ]; - - meta = { - homepage = "https://github.com/davea42/libdwarf-code"; - platforms = lib.platforms.unix; - license = lib.licenses.lgpl21Plus; - maintainers = [ lib.maintainers.atry ]; - inherit knownVulnerabilities; - }; -} diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix deleted file mode 100644 index b4bccdf30ef3..000000000000 --- a/pkgs/development/libraries/libdwarf/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ callPackage -, zlib -, zstd -}: - -callPackage ./common.nix rec { - version = "0.9.2"; - url = "https://www.prevanders.net/libdwarf-${version}.tar.xz"; - hash = "sha512-9QK22kuW1ZYtoRl8SuUiv9soWElsSvGYEJ2ETgAhMYyypevJyM+fwuRDmZfKlUXGUMpPKPDZbLZrBcm4m5jy+A=="; - buildInputs = [ zlib zstd ]; - knownVulnerabilities = []; -} diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix deleted file mode 100644 index 969b5d9636f2..000000000000 --- a/pkgs/development/libraries/libdwg/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{lib, stdenv, fetchurl, indent}: - -stdenv.mkDerivation rec { - pname = "libdwg"; - version = "0.6"; - - src = fetchurl { - url = "mirror://sourceforge/libdwg/libdwg-${version}.tar.bz2"; - sha256 = "0l8ks1x70mkna1q7mzy1fxplinz141bd24qhrm1zkdil74mcsryc"; - }; - - nativeBuildInputs = [ indent ]; - - hardeningDisable = [ "format" ]; - - # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' - for f in "$out"/bin/*; do - if isELF "$f"; then - patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" - fi - done - ''; - - meta = { - description = "Library reading dwg files"; - homepage = "http://libdwg.sourceforge.net/en/"; - license = lib.licenses.gpl3; - maintainers = [lib.maintainers.marcweber]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix deleted file mode 100644 index 8746ea42882c..000000000000 --- a/pkgs/development/libraries/libdynd/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "libdynd"; - version = "0.7.2"; - - src = fetchFromGitHub { - owner = "libdynd"; - repo = "libdynd"; - rev = "v${version}"; - sha256 = "0fkd5rawqni1cq51fmr76iw7ll4fmbahfwv4rglnsabbkylf73pr"; - }; - - cmakeFlags = [ - "-DDYND_BUILD_BENCHMARKS=OFF" - ]; - - env.NIX_CFLAGS_COMPILE = builtins.toString [ - # added to fix build with gcc7+ - "-Wno-error=implicit-fallthrough" - "-Wno-error=nonnull" - "-Wno-error=tautological-compare" - "-Wno-error=class-memaccess" - "-Wno-error=parentheses" - "-Wno-error=deprecated-copy" - # Needed with GCC 12 - "-Wno-error=deprecated-declarations" - "-Wno-error=maybe-uninitialized" - ]; - - nativeBuildInputs = [ cmake ]; - - outputs = [ "out" "dev" ]; - outputDoc = "dev"; - - meta = with lib; { - description = "C++ dynamic ndarray library, with Python exposure"; - homepage = "http://libdynd.org"; - license = licenses.bsd2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix deleted file mode 100644 index f066e470568b..000000000000 --- a/pkgs/development/libraries/libe-book/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, stdenv -, fetchurl -, gperf -, pkg-config -, librevenge -, libxml2 -, boost -, icu -, cppunit -, zlib -, liblangtag -}: - -stdenv.mkDerivation rec { - pname = "libe-book"; - version = "0.1.3"; - - src = fetchurl { - url = "mirror://sourceforge/libebook/libe-book-${version}/libe-book-${version}.tar.xz"; - hash = "sha256-fo2P808ngxrKO8b5zFMsL5DSBXx3iWO4hP89HjTf4fk="; - }; - - # restore compatibility with icu68+ - postPatch = '' - substituteInPlace src/lib/EBOOKCharsetConverter.cpp --replace \ - "TRUE, TRUE, &status)" \ - "true, true, &status)" - ''; - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - gperf - librevenge - libxml2 - boost - icu - cppunit - zlib - liblangtag - ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; - - meta = with lib; { - description = "Library for import of reflowable e-book formats"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libe57format/default.nix b/pkgs/development/libraries/libe57format/default.nix deleted file mode 100644 index 7e70cb950310..000000000000 --- a/pkgs/development/libraries/libe57format/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ - lib, stdenv, - cmake, - fetchFromGitHub, - fetchpatch, - xercesc, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libe57format"; - version = "3.1.1"; - - src = fetchFromGitHub { - owner = "asmaloney"; - repo = "libE57Format"; - rev = "v${finalAttrs.version}"; - hash = "sha256-bOuWh9Nkxva2v0M6+vnAya8EW/G3WQePxHakQt8T9NE="; - fetchSubmodules = true; # for submodule-vendored libraries such as `gtest` - }; - - # Repository of E57 files used for testing. - libE57Format-test-data_src = fetchFromGitHub { - owner = "asmaloney"; - repo = "libE57Format-test-data"; - rev = "4960564a732c6444c50dfae5b2273e68837399cd"; - hash = "sha256-k26yVbYSQJ3EMgcpjm35N1OAxarFmfMvzfTN2Hdyu8c="; - }; - - CXXFLAGS = [ - # GCC 13: error: 'int16_t' has not been declared in 'std' - "-include cstdint" - ]; - - patches = [ - # TODO: Remove with the next release: https://github.com/asmaloney/libE57Format/pull/299 - (fetchpatch { - name = "libE57Format-Dont-force-warnings-as-errors-when-building-self.patch"; # https://github.com/apache/thrift/pull/2726 - url = "https://github.com/asmaloney/libE57Format/commit/66bb5af15937b4c10a7f412ca4d1673f42bbad28.patch"; - hash = "sha256-2cNURjMLP0TijYY5gbuWLE7H/PlMW936wAeOqJ/w9C0="; - }) - - ]; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - xercesc - ]; - - cmakeFlags = [ - # See https://github.com/asmaloney/libE57Format/blob/9372bdea8db2cc0c032a08f6d655a53833d484b8/test/README.md - (if finalAttrs.finalPackage.doCheck - then "-DE57_TEST_DATA_PATH=${finalAttrs.libE57Format-test-data_src}" - else "-DE57_BUILD_TEST=OFF" - ) - ]; - - doCheck = true; - - postCheck = '' - ./testE57 - ''; - - # The build system by default builds ONLY static libraries, and with - # `-DE57_BUILD_SHARED=ON` builds ONLY shared libraries, see: - # https://github.com/asmaloney/libE57Format/issues/48 - # https://github.com/asmaloney/libE57Format/blob/f657d470da5f0d185fe371c4c011683f6e30f0cb/CMakeLists.txt#L82-L89 - # We support building both by building statically and then - # building an .so file here manually. - # The way this is written makes this Linux-only for now. - postInstall = '' - cd $out/lib - g++ -Wl,--no-undefined -shared -o libE57FormatShared.so -L. -Wl,-whole-archive -lE57Format -Wl,-no-whole-archive -lxerces-c - mv libE57FormatShared.so libE57Format.so - - if [ "$dontDisableStatic" -ne "1" ]; then - rm libE57Format.a - fi - ''; - - meta = with lib; { - description = "Library for reading & writing the E57 file format"; - homepage = "https://github.com/asmaloney/libE57Format"; - license = licenses.boost; - maintainers = with maintainers; [ chpatrick nh2 ]; - platforms = platforms.linux; # because of the .so buiding in `postInstall` above - }; -}) diff --git a/pkgs/development/libraries/libeatmydata/LFS64.patch b/pkgs/development/libraries/libeatmydata/LFS64.patch deleted file mode 100644 index 2a8ab5e08893..000000000000 --- a/pkgs/development/libraries/libeatmydata/LFS64.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 59f04ad8730034a205a1a792662d4b5dc2006b7c Mon Sep 17 00:00:00 2001 -From: Alyssa Ross <hi@alyssa.is> -Date: Mon, 13 May 2024 09:53:23 +0200 -Subject: [PATCH] Fix sync_file_range() with musl 1.2.4 - -musl 1.2.4 has removed the transitional LFS off64_t type. -sync_file_range is declared with off_t in musl, which is always 64 -bits. - -This assumes that the same is true of any other libc which doesn't -provide off64_t. If it's not, gcc will produce an error due to the -conflicting types of sync_file_range(), so it will be caught and can -be fixed. ---- - configure.ac | 2 ++ - libeatmydata/libeatmydata.c | 11 +++++++++-- - 2 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4d101ba..f3c4a69 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -37,6 +37,8 @@ AC_CHECK_HEADERS_ONCE(pthread.h) - AC_CHECK_SIZEOF(mode_t) - AC_CHECK_SIZEOF(int) - -+AC_CHECK_TYPES([off64_t]) -+ - AC_CHECK_TYPE(pthread_barrier_t,,,[ - #ifdef HAVE_PTHREAD_H - #include <pthread.h> -diff --git a/libeatmydata/libeatmydata.c b/libeatmydata/libeatmydata.c -index 134afcd..0015f1f 100644 ---- a/libeatmydata/libeatmydata.c -+++ b/libeatmydata/libeatmydata.c -@@ -35,6 +35,12 @@ - #define CHECK_FILE "/tmp/eatmydata" - */ - -+#ifdef HAVE_OFF64_T -+typedef off64_t sync_file_range_off; -+#else -+typedef off_t sync_file_range_off; -+#endif -+ - typedef int (*libc_open_t)(const char*, int, ...); - #ifdef HAVE_OPEN64 - typedef int (*libc_open64_t)(const char*, int, ...); -@@ -44,7 +50,7 @@ typedef int (*libc_sync_t)(void); - typedef int (*libc_fdatasync_t)(int); - typedef int (*libc_msync_t)(void*, size_t, int); - #ifdef HAVE_SYNC_FILE_RANGE --typedef int (*libc_sync_file_range_t)(int, off64_t, off64_t, unsigned int); -+typedef int (*libc_sync_file_range_t)(int, sync_file_range_off, sync_file_range_off, unsigned int); - #endif - #ifdef HAVE_SYNCFS - typedef int (*libc_syncfs_t)(int); -@@ -259,7 +265,8 @@ int LIBEATMYDATA_API msync(void *addr, size_t length, int flags) - } - - #ifdef HAVE_SYNC_FILE_RANGE --int LIBEATMYDATA_API sync_file_range(int fd, off64_t offset, off64_t nbytes, -+int LIBEATMYDATA_API sync_file_range(int fd, sync_file_range_off offset, -+ sync_file_range_off nbytes, - unsigned int flags) - { - if (eatmydata_is_hungry()) { --- -2.45.1 - diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix deleted file mode 100644 index f315e32f02d9..000000000000 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, strace -, which -}: - -stdenv.mkDerivation rec { - pname = "libeatmydata"; - version = "131"; - - src = fetchFromGitHub { - owner = "stewartsmith"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-0lrYDW51/KSr809whGwg9FYhzcLRfmoxipIgrK1zFCc="; - }; - - patches = [ - # https://github.com/stewartsmith/libeatmydata/pull/36 - ./LFS64.patch - ]; - - postPatch = '' - patchShebangs . - ''; - - nativeBuildInputs = [ - autoreconfHook - ]; - - nativeCheckInputs = [ - strace - which - ]; - - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Small LD_PRELOAD library to disable fsync and friends"; - homepage = "https://www.flamingspork.com/projects/libeatmydata/"; - license = licenses.gpl3Plus; - mainProgram = "eatmydata"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libeb/default.nix b/pkgs/development/libraries/libeb/default.nix deleted file mode 100644 index fe0011f9c997..000000000000 --- a/pkgs/development/libraries/libeb/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, perl, zlib }: -stdenv.mkDerivation rec { - pname = "libeb"; - version = "4.4.3"; - - src = fetchurl { - url = "ftp://ftp.sra.co.jp/pub/misc/eb/eb-${version}.tar.bz2"; - sha256 = "0psbdzirazfnn02hp3gsx7xxss9f1brv4ywp6a15ihvggjki1rxb"; - }; - - nativeBuildInputs = [ perl ]; - buildInputs = [ zlib ]; - - meta = with lib; { - description = "C library for accessing Japanese CD-ROM books"; - longDescription = '' - The EB library is a library for accessing CD-ROM books, which are a - common way to distribute electronic dictionaries in Japan. It supports - the EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING formats. - ''; - license = licenses.bsd3; - maintainers = with maintainers; [ gebner ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix deleted file mode 100644 index 34a45e398bcd..000000000000 --- a/pkgs/development/libraries/libebml/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: - -stdenv.mkDerivation rec { - pname = "libebml"; - version = "1.4.5"; - - src = fetchFromGitHub { - owner = "Matroska-Org"; - repo = "libebml"; - rev = "release-${version}"; - sha256 = "sha256-PIVBePTWceMgiENdaL9lvXIL/RQIrtg7l0OG2tO0SU8="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=YES" - "-DCMAKE_INSTALL_PREFIX=" - ]; - - meta = with lib; { - description = "Extensible Binary Meta Language library"; - homepage = "https://dl.matroska.org/downloads/libebml/"; - license = licenses.lgpl21; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix deleted file mode 100644 index c91cb23189f7..000000000000 --- a/pkgs/development/libraries/libebur128/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, speexdsp, pkg-config }: - -stdenv.mkDerivation rec { - version = "1.2.6"; - pname = "libebur128"; - - src = fetchFromGitHub { - owner = "jiixyj"; - repo = "libebur128"; - rev = "v${version}"; - sha256 = "sha256-UKO2k+kKH/dwt2xfaYMrH/GXjEkIrnxh1kGG/3P5d3Y="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ speexdsp ]; - - # https://github.com/jiixyj/libebur128/issues/121 - postPatch = '' - substituteInPlace ebur128/libebur128.pc.cmake \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ - ''; - - meta = with lib; { - description = "Implementation of the EBU R128 loudness standard"; - homepage = "https://github.com/jiixyj/libebur128"; - license = licenses.mit; - maintainers = [ maintainers.andrewrk ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix deleted file mode 100644 index 246fb73090b9..000000000000 --- a/pkgs/development/libraries/libee/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libestr }: -stdenv.mkDerivation rec { - pname = "libee"; - version = "0.4.1"; - - src = fetchurl { - url = "http://www.libee.org/download/files/download/libee-${version}.tar.gz"; - sha256 = "09xhgzmsq0g3jsyj24vy67bhzk2fv971w5ixdkhfwgar70cw1nn0"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libestr]; - - meta = { - description = "Event Expression Library inspired by CEE"; - homepage = "http://www.libee.org/"; - license = lib.licenses.lgpl21Plus; - mainProgram = "libee-convert"; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libei/default.nix b/pkgs/development/libraries/libei/default.nix deleted file mode 100644 index c2529e66c0bb..000000000000 --- a/pkgs/development/libraries/libei/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchFromGitLab -, libevdev -, libxkbcommon -, meson -, ninja -, pkg-config -, protobuf -, protobufc -, systemd -, buildPackages -}: -let - munit = fetchFromGitHub { - owner = "nemequ"; - repo = "munit"; - rev = "fbbdf1467eb0d04a6ee465def2e529e4c87f2118"; - hash = "sha256-qm30C++rpLtxBhOABBzo+6WILSpKz2ibvUvoe8ku4ow="; - }; -in -stdenv.mkDerivation rec { - pname = "libei"; - version = "1.3.0"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "libinput"; - repo = "libei"; - rev = version; - hash = "sha256-yKeMHgR3s83xwoXgLW28ewF2tvs6l0Hq0cCAroCgq0U="; - }; - - buildInputs = [ - libevdev - libxkbcommon - protobuf - protobufc - systemd - ]; - nativeBuildInputs = [ - meson - ninja - pkg-config - (buildPackages.python3.withPackages (ps: with ps; [ - attrs - jinja2 - pytest - python-dbusmock - strenum - structlog - ])) - ]; - - postPatch = '' - ln -s "${munit}" ./subprojects/munit - patchShebangs ./proto/ei-scanner - ''; - - meta = with lib; { - description = "Library for Emulated Input"; - mainProgram = "ei-debug-events"; - homepage = "https://gitlab.freedesktop.org/libinput/libei"; - license = licenses.mit; - maintainers = [ maintainers.pedrohlc ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix deleted file mode 100644 index fdfa4fda0def..000000000000 --- a/pkgs/development/libraries/libelf/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib, stdenv -, fetchurl, autoreconfHook, gettext, freebsd, netbsd -}: - -stdenv.mkDerivation rec { - pname = "libelf"; - version = "0.8.13"; - - src = fetchurl { - url = "https://fossies.org/linux/misc/old/${pname}-${version}.tar.gz"; - sha256 = "0vf7s9dwk2xkmhb79aigqm0x0yfbw1j0b9ksm51207qwr179n6jr"; - }; - - patches = [ - ./dont-hardcode-ar.patch - # Fix warnings from preprocessor instructions. - # https://github.com/NixOS/nixpkgs/issues/59929 - ./preprocessor-warnings.patch - # `configure` defines a test `main` with an implicit `int` return, which clang 16 disallows. - ./fix-configure-main.patch - ]; - - enableParallelBuilding = true; - # Lacks dependencies: - # mkdir ...-libelf-0.8.13/lib - # mkdir ...-libelf-0.8.13/lib - # mkdir: cannot create directory '...-libelf-0.8.13/lib': File exists - enableParallelInstalling = false; - - doCheck = true; - - preConfigure = if !stdenv.hostPlatform.useAndroidPrebuilt then null else '' - sed -i 's|DISTSUBDIRS = lib po|DISTSUBDIRS = lib|g' Makefile.in - sed -i 's|SUBDIRS = lib @POSUB@|SUBDIRS = lib|g' Makefile.in - ''; - - configureFlags = [] - # Configure check for dynamic lib support is broken, see - # http://lists.uclibc.org/pipermail/uclibc-cvs/2005-August/019383.html - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "mr_cv_target_elf=yes" - # Libelf's custom NLS macros fail to determine the catalog file extension - # on Darwin, so disable NLS for now. - ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-nls"; - - strictDeps = true; - nativeBuildInputs = - (if stdenv.hostPlatform.isFreeBSD then [ freebsd.gencat ] - else if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ] - else [ gettext ]) - # The provided `configure` script fails on clang 16 because some tests have a `main` - # returning an implicit `int`, which clang 16 treats as an error. Running `autoreconf` fixes - # the test and allows `configure` to detect clang properly. - ++ [ autoreconfHook ]; - - meta = { - description = "ELF object file access library"; - - homepage = "https://github.com/Distrotech/libelf"; - - license = lib.licenses.lgpl2Plus; - - platforms = lib.platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libelf/dont-hardcode-ar.patch b/pkgs/development/libraries/libelf/dont-hardcode-ar.patch deleted file mode 100644 index e282d9005dbb..000000000000 --- a/pkgs/development/libraries/libelf/dont-hardcode-ar.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/lib/Makefile.in -+++ b/lib/Makefile.in -@@ -27,7 +27,7 @@ installdirs = $(libdir) $(includedir) $(includedir)/libelf - - CC = @CC@ - LD = @LD@ --AR = ar -+AR ?= ar - MV = mv -f - RM = rm -f - LN_S = @LN_S@ diff --git a/pkgs/development/libraries/libelf/fix-configure-main.patch b/pkgs/development/libraries/libelf/fix-configure-main.patch deleted file mode 100644 index cc7e5f4c41d1..000000000000 --- a/pkgs/development/libraries/libelf/fix-configure-main.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur a/configure.in b/configure.in ---- a/configure.in 2008-05-23 04:17:56.000000000 -0400 -+++ b/configure.in 2023-06-01 19:16:04.801921924 -0400 -@@ -282,7 +282,7 @@ - #define memmove(d,s,n) bcopy((s),(d),(n)) - #endif - extern int strcmp(); --main() { -+int main() { - char buf[] = "0123456789"; - memmove(buf + 1, buf, 9); - if (strcmp(buf, "0012345678")) exit(1); diff --git a/pkgs/development/libraries/libelf/preprocessor-warnings.patch b/pkgs/development/libraries/libelf/preprocessor-warnings.patch deleted file mode 100644 index e04c8ee202a0..000000000000 --- a/pkgs/development/libraries/libelf/preprocessor-warnings.patch +++ /dev/null @@ -1,264 +0,0 @@ -diff --git a/lib/elf_repl.h b/lib/elf_repl.h -index c5cf90f..7e1e8df 100644 ---- a/lib/elf_repl.h -+++ b/lib/elf_repl.h -@@ -45,7 +45,7 @@ typedef __libelf_u32_t Elf32_Word; - #define ELF32_FSZ_SWORD 4 - #define ELF32_FSZ_WORD 4 - --#if __LIBELF64 -+#if defined(__LIBELF64) - - typedef __libelf_u64_t Elf64_Addr; - typedef __libelf_u16_t Elf64_Half; -@@ -93,7 +93,7 @@ typedef struct { - Elf32_Half e_shstrndx; - } Elf32_Ehdr; - --#if __LIBELF64 -+#if defined(__LIBELF64) - typedef struct { - unsigned char e_ident[EI_NIDENT]; - Elf64_Half e_type; -@@ -307,7 +307,7 @@ typedef struct { - Elf32_Word sh_entsize; - } Elf32_Shdr; - --#if __LIBELF64 -+#if defined(__LIBELF64) - typedef struct { - Elf64_Word sh_name; - Elf64_Word sh_type; -@@ -434,7 +434,7 @@ typedef struct { - Elf32_Half st_shndx; - } Elf32_Sym; - --#if __LIBELF64 -+#if defined(__LIBELF64) - typedef struct { - Elf64_Word st_name; - unsigned char st_info; -@@ -457,7 +457,7 @@ typedef struct { - #define ELF32_ST_TYPE(i) ((i)&0xf) - #define ELF32_ST_INFO(b,t) (((b)<<4)+((t)&0xf)) - --#if __LIBELF64 -+#if defined(__LIBELF64) - #define ELF64_ST_BIND(i) ((i)>>4) - #define ELF64_ST_TYPE(i) ((i)&0xf) - #define ELF64_ST_INFO(b,t) (((b)<<4)+((t)&0xf)) -@@ -495,7 +495,7 @@ typedef struct { - * Macros for manipulating st_other - */ - #define ELF32_ST_VISIBILITY(o) ((o)&0x3) --#if __LIBELF64 -+#if defined(__LIBELF64) - #define ELF64_ST_VISIBILITY(o) ((o)&0x3) - #endif /* __LIBELF64 */ - -@@ -521,7 +521,7 @@ typedef struct { - Elf32_Sword r_addend; - } Elf32_Rela; - --#if __LIBELF64 -+#if defined(__LIBELF64) - typedef struct { - Elf64_Addr r_offset; - Elf64_Xword r_info; -@@ -541,7 +541,7 @@ typedef struct { - #define ELF32_R_TYPE(i) ((unsigned char)(i)) - #define ELF32_R_INFO(s,t) (((s)<<8)+(unsigned char)(t)) - --#if __LIBELF64 -+#if defined(__LIBELF64) - #define ELF64_R_SYM(i) ((Elf64_Xword)(i)>>32) - #define ELF64_R_TYPE(i) ((i)&0xffffffffL) - #define ELF64_R_INFO(s,t) (((Elf64_Xword)(s)<<32)+((t)&0xffffffffL)) -@@ -556,7 +556,7 @@ typedef struct { - Elf32_Word n_type; /* descriptor type */ - } Elf32_Nhdr; - --#if __LIBELF64 -+#if defined(__LIBELF64) - /* Solaris and GNU use this layout. Be compatible. */ - /* XXX: Latest ELF specs say it's 64-bit!!! */ - typedef struct { -@@ -587,7 +587,7 @@ typedef struct { - Elf32_Word p_align; - } Elf32_Phdr; - --#if __LIBELF64 -+#if defined(__LIBELF64) - typedef struct { - Elf64_Word p_type; - Elf64_Word p_flags; -@@ -654,7 +654,7 @@ typedef struct { - } d_un; - } Elf32_Dyn; - --#if __LIBELF64 -+#if defined(__LIBELF64) - typedef struct { - Elf64_Sxword d_tag; - union { -@@ -798,7 +798,7 @@ typedef struct { - Elf32_Half si_flags; - } Elf32_Syminfo; - --#if __LIBELF64 -+#if defined(__LIBELF64) - typedef struct { - Elf64_Half si_boundto; - Elf64_Half si_flags; -@@ -863,7 +863,7 @@ typedef struct { - - typedef Elf32_Half Elf32_Versym; - --#if __LIBELF64 -+#if defined(__LIBELF64) - - typedef struct { - Elf64_Half vd_version; -@@ -933,7 +933,7 @@ typedef Elf64_Half Elf64_Versym; - /* - * Move section - */ --#if __LIBELF64 -+#if defined(__LIBELF64) - - typedef struct { - Elf32_Lword m_value; -@@ -973,7 +973,7 @@ typedef struct { - } c_un; - } Elf32_Cap; - --#if __LIBELF64 -+#if defined(__LIBELF64) - - typedef struct { - Elf64_Xword c_tag; -diff --git a/lib/gelf.h b/lib/gelf.h -index 5af0558..98a759c 100644 ---- a/lib/gelf.h -+++ b/lib/gelf.h -@@ -22,15 +22,15 @@ - #ifndef _GELF_H - #define _GELF_H - --#if __LIBELF_INTERNAL__ -+#if defined(__LIBELF_INTERNAL__) - #include <libelf.h> - #else /* __LIBELF_INTERNAL__ */ - #include <libelf/libelf.h> - #endif /* __LIBELF_INTERNAL__ */ - --#if __LIBELF_NEED_LINK_H -+#if defined(__LIBELF_NEED_LINK_H) - #include <link.h> --#elif __LIBELF_NEED_SYS_LINK_H -+#elif defined(__LIBELF_NEED_SYS_LINK_H) - #include <sys/link.h> - #endif /* __LIBELF_NEED_LINK_H */ - -@@ -46,7 +46,7 @@ extern "C" { - # endif /* __STDC__ || defined(__cplusplus) */ - #endif /* __P */ - --#if !__LIBELF64 -+#if !defined(__LIBELF64) - - #error "GElf is not supported on this system." - -@@ -71,7 +71,7 @@ typedef Elf64_Sym GElf_Sym; - /* - * Symbol versioning - */ --#if __LIBELF_SYMBOL_VERSIONS -+#if defined(__LIBELF_SYMBOL_VERSIONS) - typedef Elf64_Verdef GElf_Verdef; - typedef Elf64_Verneed GElf_Verneed; - typedef Elf64_Verdaux GElf_Verdaux; -diff --git a/lib/libelf.h b/lib/libelf.h -index 3ebd0f3..788482d 100644 ---- a/lib/libelf.h -+++ b/lib/libelf.h -@@ -25,7 +25,7 @@ - #include <stddef.h> /* for size_t */ - #include <sys/types.h> - --#if __LIBELF_INTERNAL__ -+#if defined(__LIBELF_INTERNAL__) - #include <sys_elf.h> - #else /* __LIBELF_INTERNAL__ */ - #include <libelf/sys_elf.h> -@@ -224,7 +224,7 @@ extern Elf_Data *elf32_xlatetom __P((Elf_Data *__dst, const Elf_Data *__src, - */ - extern long elf32_checksum __P((Elf *__elf)); - --#if __LIBELF64 -+#if defined(__LIBELF64) - /* - * 64-bit ELF functions - * Not available on all platforms -diff --git a/lib/sys_elf.h.in b/lib/sys_elf.h.in -index b71a20d..722051b 100644 ---- a/lib/sys_elf.h.in -+++ b/lib/sys_elf.h.in -@@ -68,7 +68,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - #ifdef __LIBELF_HEADER_ELF_H - # include __LIBELF_HEADER_ELF_H - #else /* __LIBELF_HEADER_ELF_H */ --# if __LIBELF_INTERNAL__ -+# if defined(__LIBELF_INTERNAL__) - # include <elf_repl.h> - # else /* __LIBELF_INTERNAL__ */ - # include <libelf/elf_repl.h> -@@ -92,7 +92,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - # define STN_UNDEF 0 - # endif /* STN_UNDEF */ - --# if __LIBELF64 -+# if defined(__LIBELF64) - - # ifndef ELF64_FSZ_ADDR - # define ELF64_FSZ_ADDR 8 -@@ -116,7 +116,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - # define ELF64_R_INFO(s,t) (((Elf64_Xword)(s)<<32)+((t)&0xffffffffL)) - # endif /* ELF64_R_SYM */ - --# if __LIBELF64_LINUX -+# if defined(__LIBELF64_LINUX) - typedef __libelf_u64_t Elf64_Addr; - typedef __libelf_u16_t Elf64_Half; - typedef __libelf_u64_t Elf64_Off; -diff --git a/lib/sys_elf.h.w32 b/lib/sys_elf.h.w32 -index 0f93c55..7360104 100644 ---- a/lib/sys_elf.h.w32 -+++ b/lib/sys_elf.h.w32 -@@ -68,7 +68,7 @@ - #ifdef __LIBELF_HEADER_ELF_H - # include __LIBELF_HEADER_ELF_H - #else /* __LIBELF_HEADER_ELF_H */ --# if __LIBELF_INTERNAL__ -+# if defined(__LIBELF_INTERNAL__) - # include <elf_repl.h> - # else /* __LIBELF_INTERNAL__ */ - # include <libelf/elf_repl.h> -@@ -92,7 +92,7 @@ - # define STN_UNDEF 0 - # endif /* STN_UNDEF */ - --# if __LIBELF64 -+# if defined(__LIBELF64) - - # ifndef ELF64_FSZ_ADDR - # define ELF64_FSZ_ADDR 8 -@@ -116,7 +116,7 @@ - # define ELF64_R_INFO(s,t) (((Elf64_Xword)(s)<<32)+((t)&0xffffffffL)) - # endif /* ELF64_R_SYM */ - --# if __LIBELF64_LINUX -+# if defined(__LIBELF64_LINUX) - typedef __libelf_u64_t Elf64_Addr; - typedef __libelf_u16_t Elf64_Half; - typedef __libelf_u64_t Elf64_Off; diff --git a/pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch b/pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch deleted file mode 100644 index e4b4e592b7a5..000000000000 --- a/pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 77a34d31695e02bc3d06b68c7ca3ff9c3cb67844 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Sun, 26 May 2019 19:46:27 +0200 -Subject: [PATCH] Don't detect package version with Git - -This will build in a Nix-based build environment. Instead we ismply -replace `@version@` using `substituteAll`. ---- - dwarf/Makefile | 19 +++++++++---------- - elf/Makefile | 15 +++++++-------- - 2 files changed, 16 insertions(+), 18 deletions(-) - -diff --git a/dwarf/Makefile b/dwarf/Makefile -index 71456bd..f871227 100644 ---- a/dwarf/Makefile -+++ b/dwarf/Makefile -@@ -43,16 +43,15 @@ CLEAN += libdwarf++.so - # Create pkg-config for local library and headers. This will be - # transformed in to the correct global pkg-config by install. - libdwarf++.pc: always -- @(VER=$$(git describe --match 'v*' | sed -e s/^v//); \ -- echo "libdir=$$PWD"; \ -- echo "includedir=$$PWD"; \ -- echo ""; \ -- echo "Name: libdwarf++"; \ -- echo "Description: C++11 DWARF library"; \ -- echo "Version: $$VER"; \ -- echo "Requires: libelf++ = $$VER"; \ -- echo "Libs: -L\$${libdir} -ldwarf++"; \ -- echo "Cflags: -I\$${includedir}") > $@ -+ @(echo "libdir=$$PWD"; \ -+ echo "includedir=$$PWD"; \ -+ echo ""; \ -+ echo "Name: libdwarf++"; \ -+ echo "Description: C++11 DWARF library"; \ -+ echo "Version: @version@"; \ -+ echo "Requires: libelf++ = @version@"; \ -+ echo "Libs: -L\$${libdir} -ldwarf++"; \ -+ echo "Cflags: -I\$${includedir}") > $@ - CLEAN += libdwarf++.pc - - .PHONY: always -diff --git a/elf/Makefile b/elf/Makefile -index 9c7c224..50630a7 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -42,15 +42,14 @@ CLEAN += libelf++.so - # Create pkg-config for local library and headers. This will be - # transformed in to the correct global pkg-config by install. - libelf++.pc: always -- @(VER=$$(git describe --match 'v*' | sed -e s/^v//); \ -- echo "libdir=$$PWD"; \ -+ @(echo "libdir=$$PWD"; \ - echo "includedir=$$PWD"; \ -- echo ""; \ -- echo "Name: libelf++"; \ -- echo "Description: C++11 ELF library"; \ -- echo "Version: $$VER"; \ -- echo "Libs: -L\$${libdir} -lelf++"; \ -- echo "Cflags: -I\$${includedir}") > $@ -+ echo ""; \ -+ echo "Name: libelf++"; \ -+ echo "Description: C++11 ELF library"; \ -+ echo "Version: @version@"; \ -+ echo "Libs: -L\$${libdir} -lelf++"; \ -+ echo "Cflags: -I\$${includedir}") > $@ - CLEAN += libelf++.pc - - .PHONY: always --- -2.19.2 - diff --git a/pkgs/development/libraries/libelfin/default.nix b/pkgs/development/libraries/libelfin/default.nix deleted file mode 100644 index 8ff7d8c95237..000000000000 --- a/pkgs/development/libraries/libelfin/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python3, substituteAll }: - -stdenv.mkDerivation rec { - pname = "libelfin"; - version = "unstable-2018-08-25"; - - src = fetchFromGitHub { - owner = "aclements"; - repo = pname; - rev = "ac45a094fadba77ad840063fb7aab82571546be0"; - sha256 = "143x680c6hsy51kngs04ypg4ql3lp498llcwj4lh1v0qp5qvjhyz"; - }; - - patches = [ - (substituteAll { - src = ./0001-Don-t-detect-package-version-with-Git.patch; - inherit version; - }) - ]; - - nativeBuildInputs = [ python3 ]; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - meta = with lib; { - homepage = "https://github.com/aclements/libelfin/"; - license = licenses.mit; - description = "C++11 ELF/DWARF parser"; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libemf2svg/default.nix b/pkgs/development/libraries/libemf2svg/default.nix deleted file mode 100644 index 351d9345f3f7..000000000000 --- a/pkgs/development/libraries/libemf2svg/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, fontconfig -, freetype -, libpng -}: - -stdenv.mkDerivation rec { - pname = "libemf2svg"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "kakwa"; - repo = pname; - rev = version; - sha256 = "04g6dp5xadszqjyjl162x26mfhhwinia65hbkl3mv70bs4an9898"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ fontconfig freetype libpng ]; - - meta = with lib; { - description = "Microsoft EMF to SVG conversion library"; - mainProgram = "emf2svg-conv"; - homepage = "https://github.com/kakwa/libemf2svg"; - maintainers = with maintainers; [ erdnaxe ]; - license = licenses.gpl2Only; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix deleted file mode 100644 index 11cc35b2e509..000000000000 --- a/pkgs/development/libraries/libepc/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ stdenv -, lib -, fetchurl -, autoreconfHook -, gnome-common -, pkg-config -, intltool -, gtk-doc -, glib -, avahi -, gnutls -, libuuid -, libsoup -, gtk3 -, gnome -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libepc"; - version = "0.4.6"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/libepc/${lib.versions.majorMinor finalAttrs.version}/libepc-${finalAttrs.version}.tar.xz"; - sha256 = "1s3svb2slqjsrqfv50c2ymnqcijcxb5gnx6bfibwh9l5ga290n91"; - }; - - patches = [ - # Remove dependency that is only needed by uninstalled examples. - ./no-avahi-ui.patch - ]; - - nativeBuildInputs = [ - autoreconfHook - gnome-common - pkg-config - intltool - gtk-doc - ]; - - buildInputs = [ - glib - libuuid - gtk3 - ]; - - propagatedBuildInputs = [ - avahi - gnutls - libsoup - ]; - - enableParallelBuilding = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = "libepc"; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "Easy Publish and Consume Library"; - homepage = "https://gitlab.gnome.org/Archive/libepc"; - license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/development/libraries/libepc/no-avahi-ui.patch b/pkgs/development/libraries/libepc/no-avahi-ui.patch deleted file mode 100644 index 4649ecbe27ce..000000000000 --- a/pkgs/development/libraries/libepc/no-avahi-ui.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index acf0d25..13022d1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -32,8 +32,6 @@ noinst_PROGRAMS = \ - examples/lookup-resource \ - examples/service-browser \ - examples/simple-publisher \ -- examples/consumer-ui \ -- examples/publisher-ui \ - examples/server-credentials \ - $(TESTS) - TESTS = \ -@@ -155,10 +153,6 @@ examples_service_browser_LDADD = $(example_epc_libs) - examples_simple_publisher_CFLAGS = $(example_epc_cflags) - examples_simple_publisher_LDADD = $(example_epc_libs) - --examples_consumer_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS) --examples_consumer_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS) --examples_publisher_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS) -rdynamic --examples_publisher_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS) - examples_server_credentials_CFLAGS = $(example_epc_ui_cflags) - examples_server_credentials_LDADD = $(example_epc_ui_libs) - -diff --git a/configure.ac b/configure.ac -index d68bf94..89bd471 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -53,7 +53,6 @@ PKG_CHECK_EXISTS([$GIO_REQUIREMENT], - GIO=$GIO_REQUIREMENT], - [AC_MSG_RESULT([no])]) - --PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui-gtk3 >= 0.6]) - PKG_CHECK_MODULES(LIBEPC, [avahi-client >= 0.6 - avahi-glib >= 0.6 - glib-2.0 >= 2.36 diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index f771ad140b55..5ff8055cedee 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -10,7 +10,7 @@ , libX11 , Carbon , OpenGL -, x11Support ? !stdenv.isDarwin +, x11Support ? !stdenv.hostPlatform.isDarwin , testers }: @@ -30,15 +30,15 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs src/*.py '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1" '' # cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?) - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace test/meson.build \ --replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," "" '' - + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' substituteInPlace test/meson.build \ --replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," "" ''; @@ -47,23 +47,23 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ meson ninja pkg-config utilmacros python3 ]; - buildInputs = lib.optionals (x11Support && !stdenv.isDarwin) [ + buildInputs = lib.optionals (x11Support && !stdenv.hostPlatform.isDarwin) [ libGL ] ++ lib.optionals x11Support [ libX11 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon OpenGL ]; mesonFlags = [ - "-Degl=${if (x11Support && !stdenv.isDarwin) then "yes" else "no"}" + "-Degl=${if (x11Support && !stdenv.hostPlatform.isDarwin) then "yes" else "no"}" "-Dglx=${if x11Support then "yes" else "no"}" "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}" "-Dx11=${lib.boolToString x11Support}" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (x11Support && !stdenv.isDarwin) ''-DLIBGL_PATH="${lib.getLib libGL}/lib"''; + env.NIX_CFLAGS_COMPILE = lib.optionalString (x11Support && !stdenv.hostPlatform.isDarwin) ''-DLIBGL_PATH="${lib.getLib libGL}/lib"''; doCheck = true; diff --git a/pkgs/development/libraries/liberfa/default.nix b/pkgs/development/libraries/liberfa/default.nix deleted file mode 100644 index 612d5ec34b78..000000000000 --- a/pkgs/development/libraries/liberfa/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "erfa"; - version = "2.0.1"; - - nativeBuildInputs = [ autoreconfHook ]; - - src = fetchFromGitHub { - owner = "liberfa"; - repo = "erfa"; - rev = "v${version}"; - sha256 = "sha256-NtHYgiN5mo3kWC2H+5TUDbU1nFrwuhNyOIhg2jZbssM="; - }; - - configureFlags = [ "--enable-shared" ]; - - meta = with lib; { - description = "Essential Routines for Fundamental Astronomy"; - homepage = "https://github.com/liberfa/erfa"; - maintainers = with maintainers; [ mir06 ]; - license = { - url = "https://github.com/liberfa/erfa/blob/master/LICENSE"; - free = true; - }; - }; -} diff --git a/pkgs/development/libraries/liberio/default.nix b/pkgs/development/libraries/liberio/default.nix deleted file mode 100644 index f7e4fa6e7329..000000000000 --- a/pkgs/development/libraries/liberio/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, autoreconfHook -, systemd -, pkg-config -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "liberio"; - version = "unstable-2019-12-11"; - - src = fetchFromGitHub { - owner = "EttusResearch"; - repo = "liberio"; - rev = "81777e500d1c3b88d5048d46643fb5553eb5f786"; - sha256 = "1n40lj5g497mmqh14vahdhy3jwvcry2pkc670p4c9f1pggp6ysgk"; - }; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - ]; - - buildInputs = [ - systemd - ]; - - doCheck = true; - - meta = with lib; { - description = "Ettus Research DMA I/O Library"; - homepage = "https://github.com/EttusResearch/liberio"; - license = licenses.gpl2; - maintainers = [ maintainers.doronbehar ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix deleted file mode 100644 index 0fb8890cf129..000000000000 --- a/pkgs/development/libraries/libesmtp/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, openssl }: - -stdenv.mkDerivation rec { - pname = "libESMTP"; - version = "1.1.0"; - - nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ openssl ]; - - src = fetchFromGitHub { - owner = "libesmtp"; - repo = pname; - rev = "v${version}"; - sha256 = "1bhh8hlsl9597x0bnfl563k2c09b61qnkb9mfyqcmzlq63m1zw5y"; - }; - - meta = with lib; { - description = "Library for Posting Electronic Mail"; - longDescription = '' - libESMTP is an SMTP client library which manages submission of electronic mail - via a preconfigured Mail Transport Agent (MTA) such as Exim or Postfix. - It implements many SMTP extensions including TLS for security - and PIPELINING for high performance. - ''; - homepage = "https://libesmtp.github.io/"; - license = licenses.lgpl21Plus; - }; -} - diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix deleted file mode 100644 index 5630047eed7f..000000000000 --- a/pkgs/development/libraries/libestr/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libestr"; - version = "0.1.11"; - - src = fetchurl { - url = "http://libestr.adiscon.com/files/download/${pname}-${version}.tar.gz"; - sha256 = "0910ifzcs8kpd3srrr4fvbacgh2zrc6yn7i4rwfj6jpzhlkjnqs6"; - }; - - meta = with lib; { - homepage = "https://libestr.adiscon.com/"; - description = "Some essentials for string handling"; - license = licenses.lgpl21; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/development/libraries/libetpan/default.nix deleted file mode 100644 index 767b53c9d277..000000000000 --- a/pkgs/development/libraries/libetpan/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch -, autoconf, automake, libtool, openssl, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "libetpan"; - version = "1.9.4"; - - src = fetchFromGitHub { - owner = "dinhviethoa"; - repo = "libetpan"; - rev = version; - hash = "sha256-lukeWURNsRPTuFk2q2XVnwkKz5Y+PRiPba5GPQCw6jw="; - }; - - outputs = [ "out" "dev" ]; - - patches = [ - # The following patches are security and/or reliability fixes. - # They all must be removed for the next version bump. - - # Fix potential null pointer deference - # https://github.com/dinhvh/libetpan/pull/348 - (fetchpatch { - name = "pr-348-null-pointer-deference.patch"; - url = "https://github.com/dinhvh/libetpan/commit/720e92e5752e562723a9730f8e604cb78f3a9163.patch"; - hash = "sha256-/bA/ekeMhLE3OyREHIanlrb+uuSxwur+ZloeaX9AyyM="; - }) - - # Fix potential null pointer deference - # https://github.com/dinhvh/libetpan/pull/361 - (fetchpatch { - name = "pr-361-null-pointer-deference.patch"; - url = "https://github.com/dinhvh/libetpan/commit/0cdefb017fcfd0fae56a151dc14c8439a38ecc44.patch"; - hash = "sha256-qbWisOCPI91AIXzg3n7mceSVbBKHZXd8Z0z1u/SrIG8="; - }) - - # Fix potential null pointer deference - # https://github.com/dinhvh/libetpan/pull/363 - (fetchpatch { - name = "pr-363-null-pointer-deference.patch"; - url = "https://github.com/dinhvh/libetpan/commit/68bde8b12b40a680c29d228f0b8fe4dfbf2d8d0b.patch"; - hash = "sha256-dUbnh2RoeELk/usHeFsdGC+J198jcudx3rb6/3sUAX0="; - }) - - # Missing boundary fix - # https://github.com/dinhvh/libetpan/pull/384 - (fetchpatch { - name = "pr-384-missing-boundary-fix.patch"; - url = "https://github.com/dinhvh/libetpan/commit/24c485495216c00076b29391591f46b61fcb3dac.patch"; - hash = "sha256-6ry8EfiYgbMtQYtT7L662I1A7N7N6OOy9T2ECgR7+cI="; - }) - - # CVE-2020-15953: Detect extra data after STARTTLS response and exit - # https://github.com/dinhvh/libetpan/pull/387 - (fetchpatch { - name = "cve-2020-15953-imap.patch"; - url = "https://github.com/dinhvh/libetpan/commit/1002a0121a8f5a9aee25357769807f2c519fa50b.patch"; - hash = "sha256-dqnHZAzX6ym8uF23iKVotdHQv9XQ/BGBAiRGSb7QLcE="; - }) - - # CVE-2020-15953: Detect extra data after STARTTLS responses in SMTP and POP3 and exit - # https://github.com/dinhvh/libetpan/pull/388 - (fetchpatch { - name = "cve-2020-15953-pop3-smtp.patch"; - url = "https://github.com/dinhvh/libetpan/commit/298460a2adaabd2f28f417a0f106cb3b68d27df9.patch"; - hash = "sha256-QI0gvLGUik4TQAz/pxwVfOhZc/xtj6jcWPZkJVsSCFM="; - }) - - # Fix buffer overwrite for empty string in remove_trailing_eol - # https://github.com/dinhvh/libetpan/pull/408 - (fetchpatch { - name = "pr-408-fix-buffer-overwrite.patch"; - url = "https://github.com/dinhvh/libetpan/commit/078b924c7f49ac435b10b0f53a73f1bbc4717064.patch"; - hash = "sha256-lBRS+bv/7IK7yat2p3mc0SRYn/wRB/spjE7ungj6DT0="; - }) - - # CVE-2022-4121: Fixed crash when st_info_list is NULL. - # https://github.com/dinhvh/libetpan/issues/420 - (fetchpatch { - name = "cve-2022-4121.patch"; - url = "https://github.com/dinhvh/libetpan/commit/5c9eb6b6ba64c4eb927d7a902317410181aacbba.patch"; - hash = "sha256-O+LUkI91oej7MFg4Pg6/xq1uhSanweH81VzPXBdiPh4="; - }) - ]; - - nativeBuildInputs = [ autoconf automake libtool pkg-config ]; - - buildInputs = [ openssl ]; - - configureScript = "./autogen.sh"; - - meta = with lib; { - description = "Mail Framework for the C Language"; - homepage = "https://www.etpan.org/libetpan.html"; - license = licenses.bsd3; - maintainers = with maintainers; [ oxzi ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix deleted file mode 100644 index 32960de8919d..000000000000 --- a/pkgs/development/libraries/libev/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook -, # Note: -static hasn’t work on darwin - static ? with stdenv.hostPlatform; isStatic && !isDarwin -}: - -# 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 { - pname = "libev"; - version="4.33"; - - src = fetchurl { - url = "http://dist.schmorp.de/libev/Attic/${pname}-${version}.tar.gz"; - sha256 = "1sjs4324is7fp21an4aas2z4dwsvs6z4xwrmp72vwpq1s6wbfzjh"; - }; - - nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; - - configureFlags = lib.optional (static) "LDFLAGS=-static"; - - meta = { - description = "High-performance event loop/event model with lots of features"; - maintainers = [ lib.maintainers.raskin ]; - platforms = lib.platforms.all; - license = lib.licenses.bsd2; # or GPL2+ - }; -} diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix deleted file mode 100644 index abd8185eae2a..000000000000 --- a/pkgs/development/libraries/libevdev/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, python3 }: - -stdenv.mkDerivation rec { - pname = "libevdev"; - version = "1.13.2"; - - src = fetchurl { - url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-PsqGps5VuB1bzpEGN/xFHIu+NzsflpjzdcfxrQ3jrEg="; - }; - - nativeBuildInputs = [ python3 ]; - - meta = with lib; { - description = "Wrapper library for evdev devices"; - homepage = "https://www.freedesktop.org/software/libevdev/doc/latest/index.html"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.amorsillo ]; - }; -} diff --git a/pkgs/development/libraries/libevdevplus/0001-Add-cmake-install-directives.patch b/pkgs/development/libraries/libevdevplus/0001-Add-cmake-install-directives.patch deleted file mode 100644 index 2635d6ab829e..000000000000 --- a/pkgs/development/libraries/libevdevplus/0001-Add-cmake-install-directives.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7f208aaf21aa468013fc41e67c32f6a6c8c08249 Mon Sep 17 00:00:00 2001 -From: Jappie Klooster <jappieklooster@hotmail.com> -Date: Fri, 2 Apr 2021 16:01:05 -0400 -Subject: [PATCH] Add cmake install directives - -To make nix builds work, it expect a make install command to -be available. -Adding these directives seems to fix the build. - -If it's no trouble to you, please add them. ---- - CMakeLists.txt | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f9db618..425d391 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -4,10 +4,17 @@ project(libevdevPlus) - set(SOURCE_FILES - evdevPlus.cpp evdevPlus.hpp CommonIncludes.hpp InputEvent.hpp Resource.cpp) - -+include(GNUInstallDirs) -+ - add_library(evdevPlus ${SOURCE_FILES}) - target_include_directories(evdevPlus PUBLIC .) - - add_executable(evdevPlus_test test.cpp) - target_link_libraries(evdevPlus_test evdevPlus) - --configure_file(evdevPlus.pc.in evdevPlus.pc @ONLY) -\ No newline at end of file -+configure_file(evdevPlus.pc.in evdevPlus.pc @ONLY) -+ -+install(TARGETS evdevPlus -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(FILES evdevPlus.hpp CommonIncludes.hpp InputEvent.hpp -+ DESTINATION include/) --- -2.29.2 - diff --git a/pkgs/development/libraries/libevdevplus/default.nix b/pkgs/development/libraries/libevdevplus/default.nix deleted file mode 100644 index 11d644cd90df..000000000000 --- a/pkgs/development/libraries/libevdevplus/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: - -stdenv.mkDerivation rec { - pname = "libevdevplus"; - version = "unstable-2021-04-02"; - - # adds missing cmake install directives - # https://github.com/YukiWorkshop/libevdevPlus/pull/10 - patches = [ ./0001-Add-cmake-install-directives.patch]; - - src = fetchFromGitHub { - owner = "YukiWorkshop"; - repo = "libevdevPlus"; - rev = "b4d4b3143056424a3da9f0516ca02a47209ef757"; - sha256 = "09y65s16gch0w7fy1s9yjk9gz3bjzxix36h5wmwww6lkj2i1z3rj"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Easy-to-use event device library in C++"; - license = licenses.mit; - maintainers = with maintainers; [ willibutz ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix deleted file mode 100644 index 167371e287c0..000000000000 --- a/pkgs/development/libraries/libevent/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib, stdenv, fetchurl, findutils, fixDarwinDylibNames -, updateAutotoolsGnuConfigScriptsHook -, sslSupport ? true, openssl -, fetchpatch - -, static ? stdenv.hostPlatform.isStatic -}: - -stdenv.mkDerivation rec { - pname = "libevent"; - version = "2.1.12"; - - src = fetchurl { - url = "https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz"; - sha256 = "1fq30imk8zd26x8066di3kpc5zyfc5z6frr3zll685zcx4dxxrlj"; - }; - - patches = [ - # Don't define BIO_get_init() for LibreSSL 3.5+ - (fetchpatch { - url = "https://github.com/libevent/libevent/commit/883630f76cbf512003b81de25cd96cb75c6cf0f9.patch"; - sha256 = "sha256-VPJqJUAovw6V92jpqIXkIR1xYGbxIWxaHr8cePWI2SU="; - }) - ]; - - configureFlags = lib.flatten [ - (lib.optional (!sslSupport) "--disable-openssl") - (lib.optionals static ["--disable-shared" "--with-pic"]) - ]; - - preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' - MACOSX_DEPLOYMENT_TARGET=10.16 - ''; - - # libevent_openssl is moved into its own output, so that openssl isn't present - # in the default closure. - outputs = [ "out" "dev" ] - ++ lib.optional sslSupport "openssl" - ; - outputBin = "dev"; - propagatedBuildOutputs = [ "out" ] - ++ lib.optional sslSupport "openssl" - ; - - nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - - buildInputs = lib.optional sslSupport openssl - ++ lib.optional stdenv.isCygwin findutils; - - doCheck = false; # needs the net - - postInstall = lib.optionalString sslSupport '' - moveToOutput "lib/libevent_openssl*" "$openssl" - substituteInPlace "$dev/lib/pkgconfig/libevent_openssl.pc" \ - --replace "$out" "$openssl" - sed "/^libdir=/s|$out|$openssl|" -i "$openssl"/lib/libevent_openssl.la - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Event notification library"; - mainProgram = "event_rpcgen.py"; - longDescription = '' - The libevent API provides a mechanism to execute a callback function - when a specific event occurs on a file descriptor or after a timeout - has been reached. Furthermore, libevent also support callbacks due - to signals or regular timeouts. - - libevent is meant to replace the event loop found in event driven - network servers. An application just needs to call event_dispatch() - and then add or remove events dynamically without having to change - the event loop. - ''; - homepage = "https://libevent.org/"; - license = licenses.bsd3; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix deleted file mode 100644 index 6c149b0186ee..000000000000 --- a/pkgs/development/libraries/libewf/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ fetchurl, lib, stdenv, zlib, openssl, libuuid, pkg-config, bzip2 }: - -stdenv.mkDerivation rec { - version = "20231119"; - pname = "libewf"; - - src = fetchurl { - url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz"; - hash = "sha256-7AjUEaXasOzJV9ErZK2a4HMTaqhcBbLKd8M+A5SbKrc="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ zlib openssl libuuid ] - ++ lib.optionals stdenv.isDarwin [ bzip2 ]; - - # cannot run test program while cross compiling - configureFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - "ac_cv_openssl_xts_duplicate_keys=yes" - ]; - - meta = { - description = "Library for support of the Expert Witness Compression Format"; - homepage = "https://sourceforge.net/projects/libewf/"; - license = lib.licenses.lgpl3; - maintainers = [ lib.maintainers.raskin ] ; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libexecinfo/30-linux-makefile.patch b/pkgs/development/libraries/libexecinfo/30-linux-makefile.patch deleted file mode 100644 index 134c64441d36..000000000000 --- a/pkgs/development/libraries/libexecinfo/30-linux-makefile.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- Makefile.orig -+++ Makefile -@@ -23,24 +23,25 @@ - # SUCH DAMAGE. - # - # $Id: Makefile,v 1.3 2004/07/19 05:19:55 sobomax Exp $ -+# -+# Linux Makefile by Matt Smith <mcs@darkregion.net>, 2011/01/04 - --LIB= execinfo -+CC=cc -+AR=ar -+EXECINFO_CFLAGS=$(CFLAGS) -O2 -pipe -fno-strict-aliasing -std=gnu99 -c -+EXECINFO_LDFLAGS=$(LDFLAGS) - --SRCS= stacktraverse.c stacktraverse.h execinfo.c execinfo.h -+all: static dynamic - --INCS= execinfo.h -+static: -+ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c -+ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c -+ $(AR) rcs libexecinfo.a stacktraverse.o execinfo.o - --SHLIB_MAJOR= 1 --SHLIB_MINOR= 0 -+dynamic: -+ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c -o stacktraverse.So -+ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c -o execinfo.So -+ $(CC) -shared -Wl,-soname,libexecinfo.so.1 -o libexecinfo.so.1 stacktraverse.So execinfo.So - --NOPROFILE= yes -- --DPADD= ${LIBM} --LDADD= -lm -- --#WARNS?= 4 -- --#stacktraverse.c: gen.py --# ./gen.py > stacktraverse.c -- --.include <bsd.lib.mk> -+clean: -+ rm -rf *.o *.So *.a *.so diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix deleted file mode 100644 index 24fc1e6dc74e..000000000000 --- a/pkgs/development/libraries/libexecinfo/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch -, enableStatic ? true -, enableShared ? !stdenv.hostPlatform.isStatic -}: - -stdenv.mkDerivation rec { - pname = "libexecinfo"; - version = "1.1"; - - src = fetchurl { - url = "http://distcache.freebsd.org/local-distfiles/itetcu/${pname}-${version}.tar.bz2"; - sha256 = "07wvlpc1jk1sj4k5w53ml6wagh0zm9kv2l1jngv8xb7xww9ik8n9"; - }; - - patches = [ - (fetchpatch { - name = "10-execinfo.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/libexecinfo/10-execinfo.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; - sha256 = "0lnphrad4vspyljnvmm62dyxj98vgp3wabj4w3vfzfph7j8piw7g"; - }) - (fetchpatch { - name = "20-define-gnu-source.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/libexecinfo/20-define-gnu-source.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; - sha256 = "1mp8mc639b0h2s69m5z6s2h3q3n1zl298j9j0plzj7f979j76302"; - }) - ./30-linux-makefile.patch - ]; - - makeFlags = [ "CC:=$(CC)" "AR:=$(AR)" ]; - hardeningEnable = [ "stackprotector" ]; - - buildFlags = - lib.optional enableStatic "static" - ++ lib.optional enableShared "dynamic"; - - patchFlags = [ "-p0" ]; - - installPhase = '' - install -Dm644 execinfo.h stacktraverse.h -t $out/include - '' + lib.optionalString enableShared '' - install -Dm755 libexecinfo.so.1 -t $out/lib - ln -s $out/lib/libexecinfo.so{.1,} - '' + lib.optionalString enableStatic '' - install -Dm755 libexecinfo.a -t $out/lib - ''; - - meta = with lib; { - description = "Quick-n-dirty BSD licensed clone of the GNU libc backtrace facility"; - license = licenses.bsd2; - homepage = "https://www.freshports.org/devel/libexecinfo"; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix deleted file mode 100644 index 8b9e889d3e2b..000000000000 --- a/pkgs/development/libraries/libexif/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gettext }: - -stdenv.mkDerivation rec { - pname = "libexif"; - version = "0.6.24"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "${pname}-${builtins.replaceStrings ["."] ["_"] version}-release"; - sha256 = "sha256-Eqgnm31s8iPJdhTpk5HM89HSZTXTK+e7YZ/CCdbeJX4="; - }; - - nativeBuildInputs = [ autoreconfHook gettext ]; - - meta = with lib; { - homepage = "https://libexif.github.io/"; - description = "Library to read and manipulate EXIF data in digital photographs"; - license = licenses.lgpl21; - platforms = platforms.unix; - maintainers = with maintainers; [ erictapen ]; - }; - -} diff --git a/pkgs/development/libraries/libexsid/default.nix b/pkgs/development/libraries/libexsid/default.nix deleted file mode 100644 index 38cdfc84d4e4..000000000000 --- a/pkgs/development/libraries/libexsid/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, autoreconfHook -, pkg-config -, docSupport ? true -, doxygen -, libftdi1 -}: - -stdenv.mkDerivation rec { - pname = "libexsid"; - version = "2.1"; - - src = fetchFromGitHub { - owner = "libsidplayfp"; - repo = "exsid-driver"; - rev = version; - sha256 = "1qbiri549fma8c72nmj3cpz3sn1vc256kfafnygkmkzg7wdmgi7r"; - }; - - outputs = [ "out" ] - ++ lib.optional docSupport "doc"; - - nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ lib.optional docSupport doxygen; - - buildInputs = [ libftdi1 ]; - - enableParallelBuilding = true; - - installTargets = [ "install" ] - ++ lib.optional docSupport "doc"; - - postInstall = lib.optionalString docSupport '' - mkdir -p $doc/share/libexsid/doc - cp -r docs/html $doc/share/libexsid/doc/ - ''; - - meta = with lib; { - description = "Driver for exSID USB"; - homepage = "http://hacks.slashdirt.org/hw/exsid/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index d947534cb2ec..ac64cbc1801c 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch2, substituteAll , libtool, gettext, zlib, bzip2, flac, libvorbis , exiv2, libgsf, pkg-config -, rpmSupport ? stdenv.isLinux, rpm +, rpmSupport ? stdenv.hostPlatform.isLinux, rpm , gstreamerSupport ? true, gst_all_1 # ^ Needed e.g. for proper id3 and FLAC support. # Set to `false` to decrease package closure size by about 87 MB (53%). @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { }) ]; - preConfigure = - '' echo "patching installation directory in \`extractor.c'..." - sed -i "src/main/extractor.c" \ - -e "s|pexe[[:blank:]]*=.*$|pexe = strdup(\"$out/lib/\");|g" - ''; + preConfigure = '' + echo "patching installation directory in \`extractor.c'..." + sed -i "src/main/extractor.c" \ + -e "s|pexe[[:blank:]]*=.*$|pexe = strdup(\"$out/lib/\");|g" + ''; nativeBuildInputs = [ pkg-config ]; @@ -64,33 +64,33 @@ stdenv.mkDerivation rec { # Checks need to be run after "make install", otherwise plug-ins are not in # the search path, etc. doCheck = false; - doInstallCheck = !stdenv.isDarwin; + doInstallCheck = !stdenv.hostPlatform.isDarwin; installCheckPhase = "make check"; meta = with lib; { description = "Simple library for keyword extraction"; mainProgram = "extract"; - longDescription = - '' GNU libextractor is a library used to extract meta-data from files - of arbitrary type. It is designed to use helper-libraries to perform - the actual extraction, and to be trivially extendable by linking - against external extractors for additional file types. + longDescription = '' + GNU libextractor is a library used to extract meta-data from files + of arbitrary type. It is designed to use helper-libraries to perform + the actual extraction, and to be trivially extendable by linking + against external extractors for additional file types. - The goal is to provide developers of file-sharing networks or - WWW-indexing bots with a universal library to obtain simple keywords - to match against queries. libextractor contains a shell-command - extract that, similar to the well-known file command, can extract - meta-data from a file an print the results to stdout. + The goal is to provide developers of file-sharing networks or + WWW-indexing bots with a universal library to obtain simple keywords + to match against queries. libextractor contains a shell-command + extract that, similar to the well-known file command, can extract + meta-data from a file an print the results to stdout. - Currently, libextractor supports the following formats: HTML, PDF, - PS, OLE2 (DOC, XLS, PPT), OpenOffice (sxw), StarOffice (sdw), DVI, - MAN, FLAC, MP3 (ID3v1 and ID3v2), NSF(E) (NES music), SID (C64 - music), OGG, WAV, EXIV2, JPEG, GIF, PNG, TIFF, DEB, RPM, TAR(.GZ), - ZIP, ELF, S3M (Scream Tracker 3), XM (eXtended Module), IT (Impulse - Tracker), FLV, REAL, RIFF (AVI), MPEG, QT and ASF. Also, various - additional MIME types are detected. - ''; + Currently, libextractor supports the following formats: HTML, PDF, + PS, OLE2 (DOC, XLS, PPT), OpenOffice (sxw), StarOffice (sdw), DVI, + MAN, FLAC, MP3 (ID3v1 and ID3v2), NSF(E) (NES music), SID (C64 + music), OGG, WAV, EXIV2, JPEG, GIF, PNG, TIFF, DEB, RPM, TAR(.GZ), + ZIP, ELF, S3M (Scream Tracker 3), XM (eXtended Module), IT (Impulse + Tracker), FLV, REAL, RIFF (AVI), MPEG, QT and ASF. Also, various + additional MIME types are detected. + ''; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix deleted file mode 100644 index 6ed3603dd184..000000000000 --- a/pkgs/development/libraries/libexttextcat/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libexttextcat"; - version = "3.4.6"; - - src = fetchurl { - url = "https://dev-www.libreoffice.org/src/libexttextcat/${pname}-${version}.tar.xz"; - sha256 = "sha256-bXfqziDp6hBsEzDiaO3nDJpKiXRN3CVxVoJ1TsozaN8="; - }; - - meta = with lib; { - description = "N-Gram-Based Text Categorization library primarily intended for language guessing"; - homepage = "https://wiki.documentfoundation.org/Libexttextcat"; - license = licenses.bsd3; - mainProgram = "createfp"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix deleted file mode 100644 index a2cb4d2bd246..000000000000 --- a/pkgs/development/libraries/libf2c/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{lib, stdenv, fetchurl, unzip}: - -stdenv.mkDerivation rec { - pname = "libf2c"; - version = "20160102"; - - src = fetchurl { - url = "http://www.netlib.org/f2c/libf2c.zip"; - sha256 = "1q78y8j8xpl8zdzdxmn5ablss56hi5a7vz3idam9l2nfx5q40h6a"; - }; - - unpackPhase = '' - mkdir build - cd build - unzip ${src} - ''; - - makeFlags = [ "-f" "makefile.u" ]; - - installPhase = '' - mkdir -p $out/include $out/lib - cp libf2c.a $out/lib - cp f2c.h $out/include - ''; - - nativeBuildInputs = [ unzip ]; - - hardeningDisable = [ "format" ]; - - # Makefile is missing depepdencies on generated headers: - # main.c:4:10: fatal error: signal1.h: No such file or directory - enableParallelBuilding = false; - - meta = { - description = "F2c converts Fortran 77 source code to C"; - homepage = "http://www.netlib.org/f2c/"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libfabric/default.nix b/pkgs/development/libraries/libfabric/default.nix deleted file mode 100644 index 658e380d210b..000000000000 --- a/pkgs/development/libraries/libfabric/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, autoreconfHook -, enablePsm2 ? (stdenv.isx86_64 && stdenv.isLinux) -, libpsm2 -, enableOpx ? (stdenv.isx86_64 && stdenv.isLinux) -, libuuid -, numactl -}: - -stdenv.mkDerivation rec { - pname = "libfabric"; - version = "1.22.0"; - - enableParallelBuilding = true; - - src = fetchFromGitHub { - owner = "ofiwg"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-s6e9UMCYqSuAvVvlF+SuduCA5UC43QEahUA8apubnOk="; - }; - - outputs = [ "out" "dev" "man" ]; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - - buildInputs = lib.optionals enableOpx [ libuuid numactl ] ++ lib.optionals enablePsm2 [ libpsm2 ]; - - configureFlags = [ - (if enablePsm2 then "--enable-psm2=${libpsm2}" else "--disable-psm2") - (if enableOpx then "--enable-opx" else "--disable-opx") - ]; - - meta = with lib; { - homepage = "https://ofiwg.github.io/libfabric/"; - description = "Open Fabric Interfaces"; - license = with licenses; [ gpl2 bsd2 ]; - platforms = platforms.all; - maintainers = [ maintainers.bzizou ]; - }; -} diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix deleted file mode 100644 index 008611594b46..000000000000 --- a/pkgs/development/libraries/libfakekey/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - automake, - autoconf, - libtool, - libX11, - libXi, - libXtst, - pkg-config, - xorgproto, -}: - -stdenv.mkDerivation rec { - pname = "libfakekey"; - version = "0.3"; - - src = fetchgit { - url = "https://git.yoctoproject.org/libfakekey"; - rev = "refs/tags/${version}"; - hash = "sha256-QNJlxZ9uNwNgFWm9qRJdPfusx7dXHZajjFH7wDhpgcs="; - }; - - 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 = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch b/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch deleted file mode 100644 index 7dfad4978005..000000000000 --- a/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index 2af4804..bcff809 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -80,7 +80,7 @@ PREFIX ?= /usr/local - LIBDIRNAME ?= /lib/faketime - PLATFORM ?=$(shell uname) - --CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) -+CFLAGS += -std=gnu99 -Wall -Wextra -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) - ifeq ($(PLATFORM),SunOS) - CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 - endif diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix deleted file mode 100644 index 2cb94d11fd67..000000000000 --- a/pkgs/development/libraries/libfaketime/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, coreutils }: - -stdenv.mkDerivation rec { - pname = "libfaketime"; - version = "0.9.10"; - - src = fetchFromGitHub { - owner = "wolfcw"; - repo = "libfaketime"; - rev = "v${version}"; - sha256 = "sha256-DYRuQmIhQu0CNEboBAtHOr/NnWxoXecuPMSR/UQ/VIQ="; - }; - - patches = [ - ./nix-store-date.patch - (fetchpatch { - name = "0001-libfaketime.c-wrap-timespec_get-in-TIME_UTC-macro.patch"; - url = "https://github.com/wolfcw/libfaketime/commit/e0e6b79568d36a8fd2b3c41f7214769221182128.patch"; - sha256 = "sha256-KwwP76v0DXNW73p/YBvwUOPdKMAcVdbQSKexD/uFOYo="; - }) - (fetchpatch { - name = "LFS64.patch"; - url = "https://github.com/wolfcw/libfaketime/commit/f32986867addc9d22b0fab29c1c927f079d44ac1.patch"; - hash = "sha256-fIXuxxcV9J2IcgwcwSrMo4maObkH9WYv1DC/wdtbq/g="; - }) - ] ++ (lib.optionals stdenv.cc.isClang [ - # https://github.com/wolfcw/libfaketime/issues/277 - ./0001-Remove-unsupported-clang-flags.patch - ]); - - postPatch = '' - patchShebangs test src - for a in test/functests/test_exclude_mono.sh src/faketime.c ; do - substituteInPlace $a \ - --replace /bin/bash ${stdenv.shell} - done - substituteInPlace src/faketime.c --replace @DATE_CMD@ ${coreutils}/bin/date - ''; - - PREFIX = placeholder "out"; - LIBDIRNAME = "/lib"; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=cast-function-type -Wno-error=format-truncation"; - - nativeCheckInputs = [ perl ]; - - meta = with lib; { - description = "Report faked system time to programs without having to change the system-wide time"; - homepage = "https://github.com/wolfcw/libfaketime/"; - license = licenses.gpl2; - platforms = platforms.all; - maintainers = [ maintainers.bjornfor ]; - mainProgram = "faketime"; - }; -} diff --git a/pkgs/development/libraries/libfaketime/nix-store-date.patch b/pkgs/development/libraries/libfaketime/nix-store-date.patch deleted file mode 100644 index e93a7ec76507..000000000000 --- a/pkgs/development/libraries/libfaketime/nix-store-date.patch +++ /dev/null @@ -1,29 +0,0 @@ -From abd7dd05b440e3dc9621a1579e4afb0267897d9c Mon Sep 17 00:00:00 2001 -From: Finn Behrens <me@kloenk.de> -Date: Fri, 5 Mar 2021 21:58:57 +0100 -Subject: [PATCH] use nix date path - ---- - src/faketime.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/src/faketime.c b/src/faketime.c -index af618f2..48e47da 100644 ---- a/src/faketime.c -+++ b/src/faketime.c -@@ -50,11 +50,7 @@ - - const char version[] = "0.9.10"; - --#if (defined __APPLE__) || (defined __sun) --static const char *date_cmd = "gdate"; --#else --static const char *date_cmd = "date"; --#endif -+static const char *date_cmd = "@DATE_CMD@"; - - #define PATH_BUFSIZE 4096 - --- -2.24.3 (Apple Git-128) - diff --git a/pkgs/development/libraries/libfann/default.nix b/pkgs/development/libraries/libfann/default.nix deleted file mode 100644 index 590755c3a0fa..000000000000 --- a/pkgs/development/libraries/libfann/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "libfann"; - version = "2.2.0"; - - src = fetchFromGitHub { - owner = "libfann"; - repo = "fann"; - rev = version; - sha256 = "0awbs0vjsrdglqiaybb0ln13ciizmyrw9ahllahvgbq4nr0nvf6y"; - }; - - nativeBuildInputs = [ cmake ]; - - outputs = [ "out" "dev" ]; - - meta = { - homepage = "http://leenissen.dk/fann/wp/"; - description = "Fast Artificial Neural Network Library"; - maintainers = with lib.maintainers; [ fpletz ]; - license = lib.licenses.lgpl21; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/libff/default.nix b/pkgs/development/libraries/libff/default.nix deleted file mode 100644 index af2191fb4136..000000000000 --- a/pkgs/development/libraries/libff/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, gmp, openssl, pkg-config -, enableStatic ? stdenv.hostPlatform.isStatic }: - -stdenv.mkDerivation rec { - pname = "libff"; - version = "0.2.1"; - - src = fetchFromGitHub { - owner = "scipr-lab"; - repo = "libff"; - rev = "v${version}"; - sha256 = "0dczi829497vqlmn6n4fgi89bc2h9f13gx30av5z2h6ikik7crgn"; - fetchSubmodules = true; - }; - - cmakeFlags = [ "-DWITH_PROCPS=Off" ] - ++ lib.optionals stdenv.isAarch64 [ "-DCURVE=ALT_BN128" "-DUSE_ASM=OFF" ]; - - postPatch = lib.optionalString (!enableStatic) '' - substituteInPlace libff/CMakeLists.txt --replace "STATIC" "SHARED" - ''; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ boost gmp openssl ]; - - meta = with lib; { - description = "C++ library for Finite Fields and Elliptic Curves"; - changelog = "https://github.com/scipr-lab/libff/blob/develop/CHANGELOG.md"; - homepage = "https://github.com/scipr-lab/libff"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ arturcygan ]; - }; -} diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix deleted file mode 100644 index ebeb520a769e..000000000000 --- a/pkgs/development/libraries/libffcall/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libffcall"; - version = "2.4"; - - src = fetchurl { - url = "mirror://gnu/libffcall/libffcall-${version}.tar.gz"; - sha256 = "sha256-jvaZIdvcBrxbuQUTYiY3p7g6cfMfW6N3vp2P2PV5EsI="; - }; - - enableParallelBuilding = false; - - outputs = [ "dev" "out" "doc" "man" ]; - - postInstall = '' - mkdir -p $doc/share/doc/libffcall - mv $out/share/html $doc/share/doc/libffcall - rm -rf $out/share - ''; - - meta = with lib; { - description = "Foreign function call library"; - homepage = "https://www.gnu.org/software/libffcall/"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libffi/3.3.nix b/pkgs/development/libraries/libffi/3.3.nix index 50bec9edd050..d8dd3fa47d5c 100644 --- a/pkgs/development/libraries/libffi/3.3.nix +++ b/pkgs/development/libraries/libffi/3.3.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ armeenm ]; platforms = platforms.all; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 9293077b1aa7..021776ed3856 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation (finalAttrs: { # cgit) that are needed here should be included directly in Nixpkgs as # files. patches = [ + # https://github.com/libffi/libffi/pull/857 + # function label needs to come before .cfi_startproc + ./label-before-cfi_startproc.patch ]; strictDeps = true; diff --git a/pkgs/development/libraries/libffi/label-before-cfi_startproc.patch b/pkgs/development/libraries/libffi/label-before-cfi_startproc.patch new file mode 100644 index 000000000000..379c670b4546 --- /dev/null +++ b/pkgs/development/libraries/libffi/label-before-cfi_startproc.patch @@ -0,0 +1,47 @@ +From 3065c530d3aa50c2b5ee9c01f88a9c0b61732805 Mon Sep 17 00:00:00 2001 +From: Ivan Tadeu Ferreira Antunes Filho <antunesi@google.com> +Date: Mon, 16 Sep 2024 16:10:39 -0400 +Subject: [PATCH] Move cfi_startproc after CNAME(label) + +This is a fix for https://github.com/libffi/libffi/issues/852: error: invalid CFI advance_loc expression on apple targets. + +The CFI for darwin arm64 was broken because the CNAME macro was being used after the +cfi_startproc macro. +--- + src/aarch64/sysv.S | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/aarch64/sysv.S b/src/aarch64/sysv.S +index 6a9a5611f..e83bc65de 100644 +--- a/src/aarch64/sysv.S ++++ b/src/aarch64/sysv.S +@@ -89,8 +89,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + x5 closure + */ + +- cfi_startproc + CNAME(ffi_call_SYSV): ++ cfi_startproc + BTI_C + PAC_CFI_WINDOW_SAVE + /* Sign the lr with x1 since that is the CFA which is the modifer used in auth instructions */ +@@ -348,8 +348,8 @@ CNAME(ffi_closure_SYSV_V): + #endif + + .align 4 +- cfi_startproc + CNAME(ffi_closure_SYSV): ++ cfi_startproc + BTI_C + SIGN_LR + PAC_CFI_WINDOW_SAVE +@@ -647,8 +647,8 @@ CNAME(ffi_go_closure_SYSV_V): + #endif + + .align 4 +- cfi_startproc + CNAME(ffi_go_closure_SYSV): ++ cfi_startproc + BTI_C + SIGN_LR_LINUX_ONLY + PAC_CFI_WINDOW_SAVE diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix deleted file mode 100644 index 04bfadeef979..000000000000 --- a/pkgs/development/libraries/libfido2/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, fetchurl -, cmake -, pkg-config -, hidapi -, libcbor -, openssl -, udev -, zlib -, withPcsclite ? true -, pcsclite -}: - -stdenv.mkDerivation rec { - pname = "libfido2"; - 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"; - hash = "sha256-q6qxMY0h0mLs5Bb7inEy+pN0vaifb6UrhqmKL1cSth4="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ libcbor zlib ] - ++ lib.optionals stdenv.isDarwin [ hidapi ] - ++ lib.optionals stdenv.isLinux [ udev ] - ++ lib.optionals (stdenv.isLinux && withPcsclite) [ pcsclite ]; - - propagatedBuildInputs = [ openssl ]; - - outputs = [ "out" "dev" "man" ]; - - cmakeFlags = [ - "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" - "-DCMAKE_INSTALL_LIBDIR=lib" - ] ++ lib.optionals stdenv.isDarwin [ - "-DUSE_HIDAPI=1" - ] ++ lib.optionals stdenv.isLinux [ - "-DNFC_LINUX=1" - ] ++ lib.optionals (stdenv.isLinux && withPcsclite) [ - "-DUSE_PCSC=1" - ]; - - # causes possible redefinition of _FORTIFY_SOURCE? - hardeningDisable = [ "fortify3" ]; - - meta = with lib; { - description = '' - Provides library functionality for FIDO 2.0, including communication with a device over USB. - ''; - homepage = "https://github.com/Yubico/libfido2"; - license = licenses.bsd2; - maintainers = with maintainers; [ prusnak ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 4076e5325c93..bbbcb81797af 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gettext gnutls nettle libxcrypt ] - ++ lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ApplicationServices ]; - preBuild = lib.optionalString (stdenv.isDarwin) '' + preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin) '' export MACOSX_DEPLOYMENT_TARGET=11.0 ''; diff --git a/pkgs/development/libraries/libfishsound/default.nix b/pkgs/development/libraries/libfishsound/default.nix deleted file mode 100644 index e8ceb261a4fe..000000000000 --- a/pkgs/development/libraries/libfishsound/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, libvorbis, speex, flac, pkg-config }: - -stdenv.mkDerivation rec { - pname = "libfishsound"; - version = "1.0.0"; - - src = fetchurl { - url = "https://downloads.xiph.org/releases/libfishsound/${pname}-${version}.tar.gz"; - sha256 = "1iz7mn6hw2wg8ljaw74f4g2zdj68ib88x4vjxxg3gjgc5z75f2rf"; - }; - - propagatedBuildInputs = [ libvorbis speex flac ]; - - nativeBuildInputs = [ pkg-config ]; - - meta = with lib; { - homepage = "https://xiph.org/fishsound/"; - description = "Simple programming interface for decoding and encoding audio data using Xiph.org codecs (FLAC, Speex and Vorbis)"; - longDescription = ''libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex and Ogg Vorbis files. - -libfishsound is a wrapper around the existing codec libraries and provides a consistent, higher-level programming interface. It has been designed for use in a wide variety of applications; it has no direct dependencies on Ogg encapsulation, though it is most commonly used in conjunction with liboggz to decode or encode FLAC, Speex or Vorbis audio tracks in Ogg files, including Ogg Theora and Annodex. - -FishSound has been developed and tested on GNU/Linux, Darwin/MacOSX and Win32. It probably also works on other Unix-like systems via GNU autoconf. For Win32: nmake Makefiles, Visual Studio .NET 2003 solution files and Visual C++ 6.0 workspace files are all provided in the source distribution.''; - platforms = platforms.unix; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index c7915ae676ef..490f695fc101 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config python.pkgs.pythonImportsCheckHook ]; buildInputs = [ eigen zlib libpng boost guile python qtbase ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa ]; preConfigure = '' substituteInPlace studio/src/guile/interpreter.cpp \ @@ -57,7 +57,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DGUILE_CCACHE_DIR=${placeholder "out"}/${guile.siteCcacheDir}" - ] ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") [ # warning: 'aligned_alloc' is only available on macOS 10.15 or newer "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15" ]; @@ -66,7 +66,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=enum-constexpr-conversion"; }; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' # No rules to install the mac app, so do it manually. mkdir -p $out/Applications cp -r studio/Studio.app $out/Applications/Studio.app diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix deleted file mode 100644 index 3d451de582a5..000000000000 --- a/pkgs/development/libraries/libfixposix/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, getconf }: - -stdenv.mkDerivation rec { - pname = "libfixposix"; - version="0.5.1"; - - src = fetchFromGitHub { - owner = "sionescu"; - repo = "libfixposix"; - rev = "v${version}"; - sha256 = "sha256-5qA6ytbqE+/05XQGxP9/4vEs9gFcuI3k7eJJYucW7fM="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optionals stdenv.isDarwin [ getconf ]; - - meta = with lib; { - homepage = "https://github.com/sionescu/libfixposix"; - description = "Thin wrapper over POSIX syscalls and some replacement functionality"; - license = licenses.boost; - maintainers = with maintainers; [ orivej raskin ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix deleted file mode 100644 index 64928de4d4fe..000000000000 --- a/pkgs/development/libraries/libfm/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, stdenv -, fetchurl -, glib -, intltool -, menu-cache -, pango -, pkg-config -, vala -, extraOnly ? false -, withGtk3 ? false, gtk2, gtk3 -}: - -let - gtk = if withGtk3 then gtk3 else gtk2; - inherit (lib) optional optionalString; -in -stdenv.mkDerivation rec { - pname = if extraOnly - then "libfm-extra" - else "libfm"; - version = "1.3.2"; - - src = fetchurl { - url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz"; - sha256 = "sha256-pQQmMDBM+OXYz/nVZca9VG8ii0jJYBU+02ajTofK0eU="; - }; - - nativeBuildInputs = [ vala pkg-config intltool ]; - buildInputs = [ glib gtk pango ] - ++ optional (!extraOnly) menu-cache; - - configureFlags = [ "--sysconfdir=/etc" ] - ++ optional extraOnly "--with-extra-only" - ++ optional withGtk3 "--with-gtk=3"; - - installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; - - # libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm - postInstall = optionalString (!extraOnly) '' - rm $out/lib/libfm-extra.so $out/lib/libfm-extra.so.* $out/lib/libfm-extra.la $out/lib/pkgconfig/libfm-extra.pc - ''; - - enableParallelBuilding = true; - - meta = with lib; { - broken = stdenv.isDarwin; - homepage = "https://blog.lxde.org/category/pcmanfm/"; - license = licenses.lgpl21Plus; - description = "Glib-based library for file management"; - maintainers = [ maintainers.ttuegel ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/libfprint-2-tod1-elan/default.nix b/pkgs/development/libraries/libfprint-2-tod1-elan/default.nix deleted file mode 100644 index 3e7253a40175..000000000000 --- a/pkgs/development/libraries/libfprint-2-tod1-elan/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenvNoCC -, lib -, fetchzip -, libfprint-tod -, openssl -, gusb -, glib -, autoPatchelfHook -}: - -stdenvNoCC.mkDerivation { - pname = "libfprint-2-tod1-elan"; - version = "0.0.8"; - - src = fetchzip { - url = "https://download.lenovo.com/pccbbs/mobiles/r1slf01w.zip"; - hash = "sha256-GD/BebPto1fFLgyvpiitt+ngwEtdsnKsvdFNeSmVDmw="; - # .so is in a subzip - postFetch = '' - unpackFile $out/* - rm $out/*.zip - mv * $out/ - ''; - }; - - nativeBuildInputs = [ autoPatchelfHook]; - - buildInputs = [ - libfprint-tod - openssl - gusb - glib - ]; - - installPhase = '' - runHook preInstall - - install -Dm444 libfprint-2-tod1-elan.so -t "$out/lib/libfprint-2/tod-1/" - - runHook postInstall - ''; - - passthru.driverPath = "/lib/libfprint-2/tod-1"; - - meta = with lib; { - description = "Elan(04f3:0c4b) driver module for libfprint-2-tod Touch OEM Driver"; - homepage = "https://support.lenovo.com/us/en/downloads/ds560939-elan-fingerprint-driver-for-ubuntu-2204-thinkpad-e14-gen-4-e15-gen-4"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ qdlmcfresh ]; - }; -} diff --git a/pkgs/development/libraries/libfprint-2-tod1-goodix-550a/default.nix b/pkgs/development/libraries/libfprint-2-tod1-goodix-550a/default.nix deleted file mode 100644 index 16626fe0e227..000000000000 --- a/pkgs/development/libraries/libfprint-2-tod1-goodix-550a/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, lib, fetchzip, unzip, libfprint-tod }: - -stdenv.mkDerivation { - pname = "libfprint-2-tod1-goodix-550a"; - version = "0.0.9"; - - src = fetchzip { - url = "https://download.lenovo.com/pccbbs/mobiles/r1slg01w.zip"; - sha256 = "sha256-6tp8Unu6rs27oB5VAqfRqHmv5D9N3njl5qv6We0b/Ec="; - }; - - nativeBuildInputs = [ unzip ]; - - unpackPhase = '' - unzip $src/libfprint-tod-goodix-550a-0.0.9.zip - cd libfprint-tod-goodix-550a-0.0.9 - ar x libfprint-2-tod-goodix_amd64.deb - tar xf data.tar.xz - ''; - - buildPhase = '' - patchelf \ - --set-rpath ${lib.makeLibraryPath [ libfprint-tod ]} \ - usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-550a-$version.so - ''; - - installPhase = '' - mkdir -p "$out/lib/libfprint-2/tod-1/" - mkdir -p "$out/lib/udev/rules.d/" - - cp usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-550a-$version.so "$out/lib/libfprint-2/tod-1/" - cp lib/udev/rules.d/60-libfprint-2-tod1-goodix.rules "$out/lib/udev/rules.d/" - ''; - - passthru.driverPath = "/lib/libfprint-2/tod-1"; - - meta = with lib; { - description = "Goodix 550a driver module for libfprint-2-tod Touch OEM Driver (from Lenovo)"; - homepage = "https://support.lenovo.com/us/en/downloads/ds560884-goodix-fingerprint-driver-for-linux-thinkpad-e14-gen-4-e15-gen-4"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = with maintainers; [ utkarshgupta137 ]; - }; -} diff --git a/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix b/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix deleted file mode 100644 index c7710ce1d199..000000000000 --- a/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, lib, fetchgit, libfprint-tod }: - -stdenv.mkDerivation { - pname = "libfprint-2-tod1-goodix"; - version = "0.0.6"; - - src = fetchgit { - url = "https://git.launchpad.net/~oem-solutions-engineers/libfprint-2-tod1-goodix/+git/libfprint-2-tod1-goodix"; - rev = "882735c6366fbe30149eea5cfd6d0ddff880f0e4"; # droped-lp1880058 on 2020-11-25 - sha256 = "sha256-Uv+Rr4V31DyaZFOj79Lpyfl3G6zVWShh20roI0AvMPU="; - }; - - buildPhase = '' - patchelf \ - --set-rpath ${lib.makeLibraryPath [ libfprint-tod ]} \ - usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-53xc-$version.so - ''; - - installPhase = '' - mkdir -p "$out/lib/libfprint-2/tod-1/" - mkdir -p "$out/lib/udev/rules.d/" - - cp usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-53xc-$version.so "$out/lib/libfprint-2/tod-1/" - cp lib/udev/rules.d/60-libfprint-2-tod1-goodix.rules "$out/lib/udev/rules.d/" - ''; - - passthru.driverPath = "/lib/libfprint-2/tod-1"; - - meta = with lib; { - description = "Goodix driver module for libfprint-2-tod Touch OEM Driver"; - homepage = "https://git.launchpad.net/~oem-solutions-engineers/libfprint-2-tod1-goodix/+git/libfprint-2-tod1-goodix/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = with maintainers; [ grahamc ]; - }; -} diff --git a/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch b/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch deleted file mode 100644 index ac06e83ab938..000000000000 --- a/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c02f2e040dd1e7664777c5a705272e4eb7bfb569 Mon Sep 17 00:00:00 2001 -From: Vincent Breitmoser <look@my.amazin.horse> -Date: Thu, 10 Jun 2021 14:09:19 +0200 -Subject: [PATCH] vfs0090: add missing explicit dependencies in meson.build - -Make all dependencies explicit, so they can be found when building with Nix. - ---- - meson.build | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/meson.build b/meson.build -index 54a7ca4..88f8793 100644 ---- a/meson.build -+++ b/meson.build -@@ -17,6 +17,9 @@ udev_dep = dependency('udev') - vfs009x_deps += libfprint_tod_dep - vfs009x_deps += dependency('nss') - vfs009x_deps += dependency('openssl') -+vfs009x_deps += dependency('gusb') -+vfs009x_deps += dependency('libfprint-2') -+vfs009x_deps += dependency('glib-2.0') - - vfs0090_deps += dependency('pixman-1') - --- -2.31.1 - diff --git a/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch b/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch deleted file mode 100644 index 6111cf0ad294..000000000000 --- a/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5405e02c629e689449e852424aed8cca217ed309 Mon Sep 17 00:00:00 2001 -From: Vincent Breitmoser <look@my.amazin.horse> -Date: Thu, 10 Jun 2021 14:10:52 +0200 -Subject: [PATCH] vfs0090: add missing <linux/limits.h> include - -This header is needed for the NAME_MAX constant used in this file. - ---- - vfs0090.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/vfs0090.c b/vfs0090.c -index 8034faf..6070df7 100644 ---- a/vfs0090.c -+++ b/vfs0090.c -@@ -24,6 +24,7 @@ - - #include <errno.h> - #include <ctype.h> -+#include <linux/limits.h> - #include <nss.h> - #include <pk11pub.h> - #include <sechash.h> --- -2.31.1 - diff --git a/pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix b/pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix deleted file mode 100644 index e40fa4c3df76..000000000000 --- a/pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, lib, fetchFromGitLab, pkg-config, libfprint, libfprint-tod, gusb, udev, nss, openssl, meson, pixman, ninja, glib }: -stdenv.mkDerivation { - pname = "libfprint-2-tod1-vfs0090"; - version = "0.8.5"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "3v1n0"; - repo = "libfprint-tod-vfs0090"; - rev = "6084a1545589beec0c741200b18b0902cca225ba"; - sha256 = "sha256-tSML/8USd/LuHF/YGLvNgykixF6VYtfE4SXzeV47840="; - }; - - patches = [ - # TODO remove once https://gitlab.freedesktop.org/3v1n0/libfprint-tod-vfs0090/-/merge_requests/1 is merged - ./0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch - # TODO remove once https://gitlab.freedesktop.org/3v1n0/libfprint-tod-vfs0090/-/merge_requests/2 is merged - ./0002-vfs0090-add-missing-linux-limits.h-include.patch - ]; - - nativeBuildInputs = [ pkg-config meson ninja ]; - buildInputs = [ libfprint libfprint-tod glib gusb udev nss openssl pixman ]; - - installPhase = '' - runHook preInstall - - install -D -t "$out/lib/libfprint-2/tod-1/" libfprint-tod-vfs009x.so - install -D -t "$out/lib/udev/rules.d/" $src/60-libfprint-2-tod-vfs0090.rules - - runHook postInstall - ''; - - passthru.driverPath = "/lib/libfprint-2/tod-1"; - - meta = with lib; { - description = "Libfprint-2-tod Touch OEM Driver for 2016 ThinkPad's fingerprint readers"; - homepage = "https://gitlab.freedesktop.org/3v1n0/libfprint-tod-vfs0090"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ valodim ]; - }; -} diff --git a/pkgs/development/libraries/libfprint-tod/default.nix b/pkgs/development/libraries/libfprint-tod/default.nix deleted file mode 100644 index 538df33ff281..000000000000 --- a/pkgs/development/libraries/libfprint-tod/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, libfprint -, fetchFromGitLab -}: - -# for the curious, "tod" means "Touch OEM Drivers" meaning it can load -# external .so's. -libfprint.overrideAttrs ({ postPatch ? "", mesonFlags ? [], ... }: let - version = "1.90.7+git20210222+tod1"; -in { - pname = "libfprint-tod"; - inherit version; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "3v1n0"; - repo = "libfprint"; - rev = "v${version}"; - sha256 = "0cj7iy5799pchyzqqncpkhibkq012g3bdpn18pfb19nm43svhn4j"; - }; - - mesonFlags = [ - # Include virtual drivers for fprintd tests - "-Ddrivers=all" - "-Dudev_hwdb_dir=${placeholder "out"}/lib/udev/hwdb.d" - ]; - - - postPatch = '' - ${postPatch} - patchShebangs ./tests/*.py ./tests/*.sh - ''; - - - meta = with lib; { - homepage = "https://gitlab.freedesktop.org/3v1n0/libfprint"; - description = "Library designed to make it easy to add support for consumer fingerprint readers, with support for loaded drivers"; - license = licenses.lgpl21; - platforms = platforms.linux; - maintainers = with maintainers; [ grahamc ]; - }; -}) diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix deleted file mode 100644 index 3c1b14eaf909..000000000000 --- a/pkgs/development/libraries/libfprint/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib, stdenv -, fetchFromGitLab -, pkg-config -, meson -, python3 -, ninja -, gusb -, pixman -, glib -, nss -, gobject-introspection -, cairo -, libgudev -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -}: - -stdenv.mkDerivation rec { - pname = "libfprint"; - version = "1.94.6"; - outputs = [ "out" "devdoc" ]; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "libfprint"; - repo = pname; - rev = "v${version}"; - hash = "sha256-lDnAXWukBZSo8X6UEVR2nOMeVUi/ahnJgx2cP+vykZ8="; - }; - - postPatch = '' - patchShebangs \ - tests/test-runner.sh \ - tests/unittest_inspector.py \ - tests/virtual-image.py \ - tests/umockdev-test.py \ - tests/test-generated-hwdb.sh - ''; - - nativeBuildInputs = [ - pkg-config - meson - ninja - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - gobject-introspection - ]; - - buildInputs = [ - gusb - pixman - glib - nss - cairo - libgudev - ]; - - mesonFlags = [ - "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d" - # Include virtual drivers for fprintd tests - "-Ddrivers=all" - "-Dudev_hwdb_dir=${placeholder "out"}/lib/udev/hwdb.d" - ]; - - nativeInstallCheckInputs = [ - (python3.withPackages (p: with p; [ pygobject3 ])) - ]; - - # We need to run tests _after_ install so all the paths that get loaded are in - # the right place. - doCheck = false; - - doInstallCheck = true; - - installCheckPhase = '' - runHook preInstallCheck - - ninjaCheckPhase - - runHook postInstallCheck - ''; - - meta = with lib; { - homepage = "https://fprint.freedesktop.org/"; - description = "Library designed to make it easy to add support for consumer fingerprint readers"; - license = licenses.lgpl21Only; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix deleted file mode 100644 index 6f79ec1b9465..000000000000 --- a/pkgs/development/libraries/libfpx/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "libfpx"; - version = "1.3.1-7"; - - src = fetchurl { - url = "mirror://imagemagick/delegates/${pname}-${version}.tar.xz"; - sha256 = "1s28mwb06w6dj0zl6ashpj8m1qiyadawzl7cvbw7dmj1w39ipghh"; - }; - - # Darwin gets misdetected as Windows without this - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__unix"; - - patches = [ - (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch?id=f28a947813dbc0a1fd1a8d4a712d58a64c48ca01"; - sha256 = "032y8110zgnkdhkdq3745zk53am1x34d912rai8q70k3sskyq22p"; - }) - # Pull upstream fix for -fno-common: - # https://github.com/ImageMagick/libfpx/pull/1 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/ImageMagick/libfpx/commit/c32b340581ba6c88c5092f374f655c7579b598a6.patch"; - sha256 = "1gbc0qb2ri1mj9r66wx0yn28fsr7zhhlyz2mwbica8wh34xijgz9"; - }) - # fix clang build: remove register keyword - # remove on next update - (fetchpatch { - name = "remove-register-keyword.patch"; - url = "https://github.com/ImageMagick/libfpx/commit/5f340b0a490450b40302cc9948c7dfac60d40041.patch"; - hash = "sha256-6m9MFb1eWGK5cMvPmTu7uh3Pac65r2HPB8wJ8xc1O5o="; - }) - ]; - - meta = with lib; { - homepage = "http://www.imagemagick.org"; - description = "Library for manipulating FlashPIX images"; - license = "Flashpix"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libfreeaptx/default.nix b/pkgs/development/libraries/libfreeaptx/default.nix deleted file mode 100644 index cfc120244521..000000000000 --- a/pkgs/development/libraries/libfreeaptx/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "libfreeaptx"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "iamthehorker"; - repo = pname; - rev = version; - sha256 = "sha256-eEUhOrKqb2hHWanY+knpY9FBEnjkkFTB+x6BZgMBpbo="; - }; - - outputs = [ "out" "dev" ]; - - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile \ - --replace '-soname' '-install_name' \ - --replace 'lib$(NAME).so' 'lib$(NAME).dylib' - ''; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - # disable static builds - "ANAME=" - "AOBJECTS=" - "STATIC_UTILITIES=" - ]; - - enableParallelBuilding = true; - - postInstall = lib.optionalString stdenv.isDarwin '' - install_name_tool -change libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 $out/bin/freeaptxdec - install_name_tool -change libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 $out/bin/freeaptxenc - install_name_tool -id $out/lib/libfreeaptx.dylib $out/lib/libfreeaptx.dylib - install_name_tool -id $out/lib/libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 - ''; - - meta = with lib; { - description = "Free Implementation of Audio Processing Technology codec (aptX)"; - license = licenses.lgpl21Plus; - homepage = "https://github.com/iamthehorker/libfreeaptx"; - platforms = platforms.unix; - maintainers = with maintainers; [ kranzes ]; - }; -} diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index b05ea5bbe2d5..90e6f29c9d6e 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libnfc openssl ] ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + buildInputs = [ libnfc openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; meta = with lib; { description = "Libfreefare project aims to provide a convenient API for MIFARE card manipulations"; diff --git a/pkgs/development/libraries/libfsm/default.nix b/pkgs/development/libraries/libfsm/default.nix deleted file mode 100644 index 9840b875f331..000000000000 --- a/pkgs/development/libraries/libfsm/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, bmake -, docbook_xsl -, libxslt -}: - -stdenv.mkDerivation rec { - pname = "libfsm"; - version = "0.1pre2987_${builtins.substring 0 8 src.rev}"; - - src = fetchFromGitHub { - owner = "katef"; - repo = pname; - rev = "087e3389ad2cd5e5c40caeb40387e632567d7258"; - hash = "sha256-XWrZxnRbMB609l+sYFf8VsXy3NxqBsBPUrHgKLIyu/I="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - bmake - docbook_xsl - libxslt # xsltproc - ]; - enableParallelBuilding = true; - enableParallelInstalling = false; - - # note: build checks value of '$CC' to add some extra cflags, but we don't - # necessarily know which 'stdenv' someone chose, so we leave it alone (e.g. - # if we use stdenv vs clangStdenv, we don't know which, and CC=cc in all - # cases.) it's unclear exactly what should be done if we want those flags, - # but the defaults work fine. - makeFlags = [ "-r" "PREFIX=$(out)" ]; - - # fix up multi-output install. we also have to fix the pkg-config libdir - # file; it uses prefix=$out; libdir=${prefix}/lib, which is wrong in - # our case; libdir should really be set to the $lib output. - postInstall = '' - mkdir -p $lib $dev/lib - - mv $out/lib $lib/lib - mv $out/include $dev/include - mv $out/share/pkgconfig $dev/lib/pkgconfig - rmdir $out/share - - for x in libfsm.pc libre.pc; do - substituteInPlace "$dev/lib/pkgconfig/$x" \ - --replace 'libdir=''${prefix}/lib' "libdir=$lib/lib" - done - ''; - - outputs = [ "out" "lib" "dev" ]; - - meta = with lib; { - description = "DFA regular expression library & friends"; - homepage = "https://github.com/katef/libfsm"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice ]; - }; -} diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 27b23f9d54bc..18dab4e340da 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii"; }; - buildInputs = [ libusb-compat-0_1 ] ++ lib.optionals stdenv.isDarwin [ libobjc Security IOKit ]; + buildInputs = [ libusb-compat-0_1 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc Security IOKit ]; propagatedBuildInputs = [ libusb-compat-0_1 ]; - configureFlags = lib.optional (!stdenv.isDarwin) "--with-async-mode"; + configureFlags = lib.optional (!stdenv.hostPlatform.isDarwin) "--with-async-mode"; # allow async mode. from ubuntu. see: # https://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/libftdi/trusty/view/head:/debian/patches/04_async_mode.diff @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for f in "$out"/bin/*; do if isELF "$f"; then patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" diff --git a/pkgs/development/libraries/libfyaml/default.nix b/pkgs/development/libraries/libfyaml/default.nix deleted file mode 100644 index 40e7ab53240e..000000000000 --- a/pkgs/development/libraries/libfyaml/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, testers }: - -stdenv.mkDerivation (finalAttrs: { - pname = "libfyaml"; - version = "0.9"; - - src = fetchFromGitHub { - owner = "pantoniou"; - repo = "libfyaml"; - rev = "v${finalAttrs.version}"; - hash = "sha256-Id5pdFzjA9q67okfESO3LZH8jIz93mVgIEEuBbPjuGI="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - outputs = [ "bin" "dev" "out" "man" ]; - - configureFlags = [ "--disable-network" ]; - - doCheck = true; - - preCheck = '' - patchShebangs test - ''; - - passthru.tests.pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - }; - - meta = with lib; { - description = "Fully feature complete YAML parser and emitter, supporting the latest YAML spec and passing the full YAML testsuite"; - homepage = "https://github.com/pantoniou/libfyaml"; - changelog = "https://github.com/pantoniou/libfyaml/releases/tag/v${finalAttrs.version}"; - license = licenses.mit; - maintainers = [ ]; - pkgConfigModules = [ "libfyaml" ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/development/libraries/libgadu/default.nix deleted file mode 100644 index 65f8b26c5a37..000000000000 --- a/pkgs/development/libraries/libgadu/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, zlib, protobufc, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "libgadu"; - version = "1.12.2"; - - src = fetchFromGitHub { - owner = "wojtekka"; - repo = pname; - rev = version; - sha256 = "1s16cripy5w9k12534qb012iwc5m9qcjyrywgsziyn3kl3i0aa8h"; - }; - - propagatedBuildInputs = [ zlib ]; - buildInputs = [ protobufc ]; - nativeBuildInputs = [ autoreconfHook ]; - - meta = { - description = "Library to deal with gadu-gadu protocol (most popular polish IM protocol)"; - homepage = "https://libgadu.net/index.en.html"; - platforms = lib.platforms.linux; - license = lib.licenses.lgpl21; - }; - -} diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix deleted file mode 100644 index c90d47dff502..000000000000 --- a/pkgs/development/libraries/libgaminggear/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, gettext -, gtk2, libcanberra, libnotify, pcre, sqlite, xorg -, harfbuzz -}: - -stdenv.mkDerivation rec { - pname = "libgaminggear"; - version = "0.15.1"; - - src = fetchurl { - url = "mirror://sourceforge/libgaminggear/${pname}-${version}.tar.bz2"; - sha256 = "0jf5i1iv8j842imgiixbhwcr6qcwa93m27lzr6gb01ri5v35kggz"; - }; - - outputs = [ "dev" "out" "bin" ]; - - nativeBuildInputs = [ cmake pkg-config gettext ]; - - propagatedBuildInputs = [ - gtk2 libcanberra libnotify pcre sqlite xorg.libXdmcp xorg.libpthreadstubs - ]; - - cmakeFlags = [ - "-DINSTALL_CMAKE_MODULESDIR=lib/cmake" - "-DINSTALL_PKGCONFIGDIR=lib/pkgconfig" - "-DINSTALL_LIBDIR=lib" - ]; - - # https://sourceforge.net/p/libgaminggear/discussion/general/thread/b43a776b3a/ - env.NIX_CFLAGS_COMPILE = toString [ "-I${harfbuzz.dev}/include/harfbuzz" ]; - - postFixup = '' - moveToOutput bin "$bin" - ''; - - meta = { - description = "Provides functionality for gaming input devices"; - homepage = "https://sourceforge.net/projects/libgaminggear/"; - platforms = lib.platforms.linux; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix deleted file mode 100644 index 34eea1047413..000000000000 --- a/pkgs/development/libraries/libgbinder/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, glib, libglibutil }: - -stdenv.mkDerivation rec { - pname = "libgbinder"; - version = "1.1.40"; - - src = fetchFromGitHub { - owner = "mer-hybris"; - repo = pname; - rev = version; - sha256 = "sha256-bv3UeL5xx28N/fSG1BeUSbbSvDaNgehpnx2OzIIaSXw="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - glib - libglibutil - ]; - - postPatch = '' - # Fix pkg-config and ranlib names for cross-compilation - substituteInPlace Makefile \ - --replace "pkg-config" "$PKG_CONFIG" \ - --replace "ranlib" "$RANLIB" - ''; - - makeFlags = [ - "LIBDIR=$(out)/lib" - "INSTALL_INCLUDE_DIR=$(dev)/include/gbinder" - "INSTALL_PKGCONFIG_DIR=$(dev)/lib/pkgconfig" - ]; - - installTargets = [ "install" "install-dev" ]; - - postInstall = '' - sed -i -e "s@includedir=/usr@includedir=$dev@g" $dev/lib/pkgconfig/$pname.pc - sed -i -e "s@Cflags: @Cflags: $($PKG_CONFIG --cflags libglibutil) @g" $dev/lib/pkgconfig/$pname.pc - ''; - - meta = { - description = "GLib-style interface to binder"; - homepage = "https://github.com/mer-hybris/libgbinder"; - license = lib.licenses.bsd3; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ mcaju ]; - }; -} diff --git a/pkgs/development/libraries/libgcrypt/1.8.nix b/pkgs/development/libraries/libgcrypt/1.8.nix index 2f0f3b4fd019..720c376d0263 100644 --- a/pkgs/development/libraries/libgcrypt/1.8.nix +++ b/pkgs/development/libraries/libgcrypt/1.8.nix @@ -10,7 +10,7 @@ , rsyslog }: -assert enableCapabilities -> stdenv.isLinux; +assert enableCapabilities -> stdenv.hostPlatform.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index ffe9f42326f8..ad360dab55ca 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -11,7 +11,7 @@ , rsyslog }: -assert enableCapabilities -> stdenv.isLinux; +assert enableCapabilities -> stdenv.hostPlatform.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ libgpg-error ] - ++ lib.optional stdenv.isDarwin gettext + ++ lib.optional stdenv.hostPlatform.isDarwin gettext ++ lib.optional enableCapabilities libcap; strictDeps = true; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { # 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 '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $lib/lib cp src/.libs/libgcrypt.20.dylib $lib/lib ''; diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index a8af4d9b4874..b6a64c4b7a3f 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { # as mentioned in https://github.com/GNOME/libgda/blob/95eeca4b0470f347c645a27f714c62aa6e59f820/libgda/sqlite/README#L31, # which references the paper https://web.archive.org/web/20100610151539/http://lattice.umiacs.umd.edu/files/functions_tr.pdf # See also https://github.com/Homebrew/homebrew-core/blob/104f9ecd02854a82372b64d63d41356555378a52/Formula/libgda.rb - "--enable-system-sqlite=${if stdenv.isDarwin then "no" else "yes"}" + "--enable-system-sqlite=${if stdenv.hostPlatform.isDarwin then "no" else "yes"}" ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix deleted file mode 100644 index 34735e644e43..000000000000 --- a/pkgs/development/libraries/libgdamm/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, glibmm, libgda, libxml2, gnome -, mysqlSupport ? false -, postgresSupport ? false }: - -let - gda = libgda.override { - inherit mysqlSupport postgresSupport; - }; -in stdenv.mkDerivation rec { - pname = "libgdamm"; - version = "4.99.11"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1fyh15b3f8hmwbswalxk1g4l04yvvybksn5nm7gznn5jl5q010p9"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glibmm libxml2 ]; - propagatedBuildInputs = [ gda ]; - - enableParallelBuilding = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; # Should be odd-unstable but stable version has not been released yet. - }; - }; - - meta = with lib; { - description = "C++ bindings for libgda"; - homepage = "https://www.gnome-db.org/"; - license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix deleted file mode 100644 index 3f7242aedd33..000000000000 --- a/pkgs/development/libraries/libgdata/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib, stdenv -, fetchurl -, pkg-config -, meson -, ninja -, nixosTests -, vala -, gettext -, libxml2 -, glib -, json-glib -, gcr -, gnome-online-accounts -, gobject-introspection -, gnome -, p11-kit -, openssl -, uhttpmock -, libsoup -}: - -stdenv.mkDerivation rec { - pname = "libgdata"; - version = "0.18.1"; - - outputs = [ "out" "dev" "installedTests" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "3YWS7rZRKtCoz1yL6McudvdL/msj5N2T8HVu4HFoBMc="; - }; - - patches = [ - ./installed-tests-path.patch - ]; - - nativeBuildInputs = [ - gettext - gobject-introspection - meson - ninja - pkg-config - vala - ]; - - buildInputs = [ - gcr - openssl - p11-kit - uhttpmock - ]; - - propagatedBuildInputs = [ - glib - libsoup - libxml2 - gnome-online-accounts - json-glib - ]; - - mesonFlags = [ - "-Dgtk_doc=false" - "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" - "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" - "-Dinstalled_tests=true" - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; # Stable version has not been updated for a long time. - }; - - tests = { - installedTests = nixosTests.installed-tests.libgdata; - }; - }; - - meta = with lib; { - description = "GData API library"; - homepage = "https://gitlab.gnome.org/GNOME/libgdata"; - maintainers = with maintainers; [ raskin ] ++ teams.gnome.members; - platforms = platforms.linux; - license = licenses.lgpl21Plus; - }; -} diff --git a/pkgs/development/libraries/libgdata/installed-tests-path.patch b/pkgs/development/libraries/libgdata/installed-tests-path.patch deleted file mode 100644 index f8c0a1293a1f..000000000000 --- a/pkgs/development/libraries/libgdata/installed-tests-path.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff --git a/gdata/tests/meson.build b/gdata/tests/meson.build -index 05184deb..3a9392d4 100644 ---- a/gdata/tests/meson.build -+++ b/gdata/tests/meson.build -@@ -1,5 +1,12 @@ --tests_execdir = gdata_libexecdir / 'installed-tests' / gdata_name --tests_metadir = gdata_datadir / 'installed-tests' / gdata_name -+tests_bindir = get_option('installed_test_bindir') / 'installed-tests' / gdata_name -+if tests_bindir == '' -+ test_bindir = gdata_libexecdir / 'installed-tests' / gdata_name -+endif -+ -+tests_datadir = get_option('installed_test_datadir') / 'installed-tests' / gdata_name -+if tests_datadir == '' -+ tests_datadir = gdata_datadir / 'installed-tests' / gdata_name -+endif - - tests_sources = files( - 'common.c', -@@ -49,7 +56,7 @@ foreach test_name, extra_args: tests - dependencies: common_deps + extra_args.get('dependencies', []), - sources: tests_sources, - install: install_tests and not should_fail, -- install_dir: tests_execdir, -+ install_dir: tests_bindir, - ) - - test( -@@ -65,7 +72,7 @@ if install_tests - should_fail = extra_args.get('should_fail', false) - tests_conf = { - 'TEST_TYPE': 'session', -- 'TEST_ABS_PATH': gdata_prefix / tests_execdir / test_name, -+ 'TEST_ABS_PATH': tests_bindir / test_name, - } - - configure_file ( -@@ -73,13 +80,13 @@ if install_tests - output: test_name + '.test', - configuration: tests_conf, - install: not should_fail, -- install_dir: tests_metadir, -+ install_dir: tests_datadir, - ) - endforeach - - install_subdir( - 'traces', -- install_dir: tests_execdir, -+ install_dir: tests_bindir, - ) - - test_data = [ -@@ -98,6 +105,6 @@ if install_tests - - install_data( - test_data, -- install_dir: tests_execdir, -+ install_dir: tests_bindir, - ) - endif -diff --git a/meson.build b/meson.build -index 50441abb..5fc773b1 100644 ---- a/meson.build -+++ b/meson.build -@@ -20,9 +20,9 @@ gdata_api_version_minor = 0 - - # Define the install directories - gdata_prefix = get_option('prefix') --gdata_datadir = get_option('datadir') --gdata_libexecdir = get_option('libexecdir') --gdata_includedir = get_option('includedir') -+gdata_datadir = gdata_prefix / get_option('datadir') -+gdata_libexecdir = gdata_prefix / get_option('libexecdir') -+gdata_includedir = gdata_prefix / get_option('includedir') - - gdata_include_subdir = gdata_name / 'gdata' - -diff --git a/meson_options.txt b/meson_options.txt -index 25cc6b55..6fc2cfa3 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -43,3 +43,11 @@ option('vapi', - type: 'boolean', - value: true, - description: 'Enable creation of vapi files') -+ -+option('installed_test_datadir', type: 'string', -+ value: '', -+ description: 'Installation directory for data files in tests') -+ -+option('installed_test_bindir', type: 'string', -+ value: '', -+ description: 'Installation directory for binary files in tests') diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 4d315b042ee9..63efe5430537 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -34,9 +34,9 @@ stdenv.mkDerivation (finalAttrs: { [ glib cairo fontconfig libtiff giflib libjpeg libpng libXrender libexif ] - ++ lib.optional stdenv.isDarwin Carbon; + ++ lib.optional stdenv.hostPlatform.isDarwin Carbon; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so ''; diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix deleted file mode 100644 index 4cbaf916897c..000000000000 --- a/pkgs/development/libraries/libgee/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv -, lib -, fetchurl -, autoconf -, vala -, pkg-config -, glib -, gobject-introspection -, gnome -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libgee"; - version = "0.20.6"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://gnome/sources/libgee/${lib.versions.majorMinor finalAttrs.version}/libgee-${finalAttrs.version}.tar.xz"; - sha256 = "G/g09eENYMxhJNdO08HdONpkZ4f794ciILi0Bo5HbU0="; - }; - - nativeBuildInputs = [ - pkg-config - autoconf - vala - gobject-introspection - ]; - - buildInputs = [ - glib - ]; - - doCheck = true; - - env = { - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; - }; - - passthru = { - updateScript = gnome.updateScript { - packageName = "libgee"; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; - homepage = "https://gitlab.gnome.org/GNOME/libgee"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; - maintainers = teams.gnome.members; - }; -}) diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix deleted file mode 100644 index 37e726fa23bb..000000000000 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config -, libjpeg -, libtiff -, proj -, zlib -}: - -stdenv.mkDerivation rec { - version = "1.7.3"; - pname = "libgeotiff"; - - src = fetchFromGitHub { - owner = "OSGeo"; - repo = "libgeotiff"; - rev = version; - hash = "sha256-FUvWZR5BrGEMnApxCBQBwmmi9NU7Tx6Ziq3mbIxjqfc="; - }; - - outputs = [ "out" "dev" ]; - - sourceRoot = "${src.name}/libgeotiff"; - - configureFlags = [ - "--with-jpeg=${libjpeg.dev}" - "--with-zlib=${zlib.dev}" - ]; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ libtiff proj ]; - - #hardeningDisable = [ "format" ]; - - meta = with lib; { - description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery"; - homepage = "https://github.com/OSGeo/libgeotiff"; - changelog = "https://github.com/OSGeo/libgeotiff/blob/${src.rev}/libgeotiff/NEWS"; - license = licenses.mit; - maintainers = with maintainers; teams.geospatial.members ++ [ marcweber ]; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/pkgs/development/libraries/libgepub/default.nix b/pkgs/development/libraries/libgepub/default.nix deleted file mode 100644 index fbf9d28ce93e..000000000000 --- a/pkgs/development/libraries/libgepub/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, glib -, gobject-introspection -, gnome -, webkitgtk_4_1 -, libsoup_3 -, libxml2 -, libarchive -}: - -stdenv.mkDerivation rec { - pname = "libgepub"; - version = "0.7.1"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "o+SzGiMmWdJqVLkSGziCw9c5fDz0SuXGS4ZwCYC8f2A="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - ]; - - buildInputs = [ - glib - webkitgtk_4_1 - libsoup_3 - libxml2 - libarchive - ]; - - doCheck = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - description = "GObject based library for handling and rendering epub documents"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/development/libraries/libgflow/default.nix b/pkgs/development/libraries/libgflow/default.nix deleted file mode 100644 index 007afa6ef5bf..000000000000 --- a/pkgs/development/libraries/libgflow/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{stdenv, lib, vala, meson, ninja, pkg-config, fetchFromGitea, gobject-introspection, glib, gtk3}: - -stdenv.mkDerivation rec { - pname = "libgflow"; - version = "1.0.4"; - - outputs = [ "out" "dev" "devdoc" ]; - outputBin = "devdoc"; # demo app - - src = fetchFromGitea { - domain = "notabug.org"; - owner = "grindhold"; - repo = "libgtkflow"; - rev = "gflow_${version}"; - hash = "sha256-JoVq7U5JQ3pRxptR7igWFw7lcBTsgr3aVXxayLqhyFo="; - }; - - nativeBuildInputs = [ - vala - meson - ninja - pkg-config - gobject-introspection - ]; - - buildInputs = [ - gtk3 - glib - ]; - - postFixup = '' - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput "share/doc" "$devdoc" - ''; - - mesonFlags = [ - "-Denable_valadoc=true" - "-Denable_gtk3=false" - "-Denable_gtk4=false" - ]; - - meta = with lib; { - description = "Flow graph widget for GTK 3"; - homepage = "https://notabug.org/grindhold/libgtkflow"; - maintainers = with maintainers; [ grindhold ]; - license = licenses.lgpl3Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix deleted file mode 100644 index aa710a916125..000000000000 --- a/pkgs/development/libraries/libgig/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkg-config, libuuid }: - -stdenv.mkDerivation rec { - pname = "libgig"; - version = "4.4.1"; - - src = fetchurl { - url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; - sha256 = "sha256-/cie+rH5BhKObFRymWdXfo0EYgFwGLwSVRJX313+OqQ="; - }; - - nativeBuildInputs = [ autoconf automake libtool pkg-config ]; - - buildInputs = [ libsndfile libuuid ]; - - preConfigure = "make -f Makefile.svn"; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "http://www.linuxsampler.org"; - description = "Gigasampler file access library"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix deleted file mode 100644 index abf15fdec4d8..000000000000 --- a/pkgs/development/libraries/libgit2-glib/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ stdenv -, lib -, fetchurl -, gnome -, meson -, ninja -, pkg-config -, vala -, libssh2 -, gtk-doc -, gobject-introspection -, gi-docgen -, libgit2 -, glib -, python3 -, fetchpatch -}: - -stdenv.mkDerivation rec { - pname = "libgit2-glib"; - version = "1.2.0"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "EzHa2oOPTh9ZGyZFnUQSajJd52LcPNJhU6Ma+9/hgZA="; - }; - - patches = [ - (fetchpatch { - name = "support-libgit2-1.8.patch"; - # https://gitlab.gnome.org/GNOME/libgit2-glib/-/merge_requests/40 - url = "https://gitlab.gnome.org/GNOME/libgit2-glib/-/commit/a76fdf96c3af9ce9d21a3985c4be8a1aa6eea661.patch"; - hash = "sha256-ysU8pAixyftensfEC9bE0RUFMPMei0jYT26WKN5uOFE="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - vala - gtk-doc - gobject-introspection - gi-docgen - ]; - - propagatedBuildInputs = [ - # Required by libgit2-glib-1.0.pc - libgit2 - glib - ]; - - buildInputs = [ - libssh2 - python3.pkgs.pygobject3 # this should really be a propagated input of python output - ]; - - mesonFlags = [ - "-Dgtk_doc=true" - ]; - - postPatch = '' - chmod +x meson_python_compile.py - patchShebangs meson_python_compile.py - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - description = "Glib wrapper library around the libgit2 git access library"; - homepage = "https://gitlab.gnome.org/GNOME/libgit2-glib"; - license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index e110ceb67aa8..847894d06587 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgit2"; - version = "1.8.1"; + version = "1.8.4"; # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib outputs = ["lib" "dev" "out"]; @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libgit2"; repo = "libgit2"; rev = "v${finalAttrs.version}"; - hash = "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY="; + hash = "sha256-AVhDq9nC2ccwFYJmejr0hmnyV4AxZLamuHktYPlkzUs="; }; cmakeFlags = [ @@ -49,9 +49,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ zlib libssh2 openssl pcre llhttp ] ++ lib.optional withGssapi krb5 - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin Security; - propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; + propagatedBuildInputs = lib.optional (!stdenv.hostPlatform.isLinux) libiconv; doCheck = true; checkPhase = '' diff --git a/pkgs/development/libraries/libglibutil/default.nix b/pkgs/development/libraries/libglibutil/default.nix deleted file mode 100644 index 59434902d78d..000000000000 --- a/pkgs/development/libraries/libglibutil/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, glib }: - -stdenv.mkDerivation rec { - pname = "libglibutil"; - version = "1.0.79"; - - src = fetchFromGitHub { - owner = "sailfishos"; - repo = pname; - rev = version; - sha256 = "sha256-UJsKjvigZuwDL4DyjUE6fXEecgoHrTE+5pO0hVyCwP4="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - glib - ]; - - postPatch = '' - # Fix pkg-config name for cross-compilation - substituteInPlace Makefile --replace "pkg-config" "$PKG_CONFIG" - ''; - - makeFlags = [ - "LIBDIR=$(out)/lib" - "INSTALL_INCLUDE_DIR=$(dev)/include/gutil" - "INSTALL_PKGCONFIG_DIR=$(dev)/lib/pkgconfig" - ]; - - installTargets = [ "install" "install-dev" ]; - - postInstall = '' - sed -i -e "s@includedir=/usr@includedir=$dev@g" $dev/lib/pkgconfig/$pname.pc - sed -i -e "s@Cflags: @Cflags: $($PKG_CONFIG --cflags glib-2.0) @g" $dev/lib/pkgconfig/$pname.pc - ''; - - meta = { - description = "Library of glib utilities"; - homepage = "https://git.sailfishos.org/mer-core/libglibutil"; - license = lib.licenses.bsd3; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ mcaju ]; - }; -} diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix deleted file mode 100644 index d3e85c012cf1..000000000000 --- a/pkgs/development/libraries/libglvnd/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ stdenv, lib, fetchFromGitLab -, fetchpatch -, autoreconfHook, pkg-config, python3, addDriverRunpath -, libX11, libXext, xorgproto -}: - -stdenv.mkDerivation rec { - pname = "libglvnd"; - version = "1.7.0"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "glvnd"; - repo = "libglvnd"; - rev = "v${version}"; - sha256 = "sha256-2U9JtpGyP4lbxtVJeP5GUgh5XthloPvFIw28+nldYx8="; - }; - - patches = [ - # Enable 64-bit file APIs on 32-bit systems: - # https://gitlab.freedesktop.org/glvnd/libglvnd/-/merge_requests/288 - (fetchpatch { - name = "large-file.patch"; - url = "https://gitlab.freedesktop.org/glvnd/libglvnd/-/commit/956d2d3f531841cabfeddd940be4c48b00c226b4.patch"; - hash = "sha256-Y6YCzd/jZ1VZP9bFlHkHjzSwShXeA7iJWdyfxpgT2l0="; - }) - ]; - - nativeBuildInputs = [ autoreconfHook pkg-config python3 addDriverRunpath ]; - buildInputs = [ libX11 libXext xorgproto ]; - - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace src/GLX/Makefile.am \ - --replace "-Wl,-Bsymbolic " "" - substituteInPlace src/EGL/Makefile.am \ - --replace "-Wl,-Bsymbolic " "" - substituteInPlace src/GLdispatch/Makefile.am \ - --replace "-Xlinker --version-script=$(VERSION_SCRIPT)" "-Xlinker" - ''; - - 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=\"${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 [ - "-Wno-error" - "-Wno-int-conversion" - ]); - - configureFlags = [] - # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268 - ++ lib.optional stdenv.hostPlatform.isMusl "--disable-tls" - # Remove when aarch64-darwin asm support is upstream: https://gitlab.freedesktop.org/glvnd/libglvnd/-/issues/216 - ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "--disable-asm"; - - outputs = [ "out" "dev" ]; - - # Set RUNPATH so that libGLX can find driver libraries in /run/opengl-driver(-32)/lib. - # Note that libEGL does not need it because it uses driver config files which should - # contain absolute paths to libraries. - postFixup = '' - addDriverRunpath $out/lib/libGLX.so - ''; - - passthru = { inherit (addDriverRunpath) driverLink; }; - - meta = with lib; { - description = "GL Vendor-Neutral Dispatch library"; - longDescription = '' - libglvnd is a vendor-neutral dispatch layer for arbitrating OpenGL API - calls between multiple vendors. It allows multiple drivers from different - vendors to coexist on the same filesystem, and determines which vendor to - dispatch each API call to at runtime. - Both GLX and EGL are supported, in any combination with OpenGL and OpenGL ES. - ''; - inherit (src.meta) homepage; - # https://gitlab.freedesktop.org/glvnd/libglvnd#libglvnd: - changelog = "https://gitlab.freedesktop.org/glvnd/libglvnd/-/tags/v${version}"; - license = with licenses; [ mit bsd1 bsd3 gpl3Only asl20 ]; - platforms = platforms.unix; - # https://gitlab.freedesktop.org/glvnd/libglvnd/-/issues/212 - badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; - maintainers = with maintainers; [ primeos ]; - }; -} diff --git a/pkgs/development/libraries/libgmpris/default.nix b/pkgs/development/libraries/libgmpris/default.nix deleted file mode 100644 index a7826fabd134..000000000000 --- a/pkgs/development/libraries/libgmpris/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv -, lib -, fetchurl -, pkg-config -, glib -, gobject-introspection -}: - -stdenv.mkDerivation rec { - pname = "libgmpris"; - version = "2.2.1-8"; - - src = fetchurl { - url = "https://www.sonarnerd.net/src/focal/src/${pname}_${version}.tar.gz"; - sha256 = "sha256-iyKNmg6sf+mxlY/4vt5lKdrKfJzkoCYU2j1O8uwk8K4="; - }; - - nativeBuildInputs = [ pkg-config gobject-introspection ]; - - buildInputs = [ glib ]; - - postInstall = '' - mkdir -p $out/share/doc/${pname} - cp ./AUTHORS $out/share/doc/${pname} - cp ./README $out/share/doc/${pname} - ''; - - meta = with lib; { - homepage = "https://www.sonarnerd.net/src/"; - description = "GMPRIS GDBus bindings GDBus bindings generated from the GMPRIS XML spec files"; - license = licenses.lgpl21; - maintainers = with maintainers; [ lovesegfault ]; - }; -} diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix deleted file mode 100644 index a5c278956f2d..000000000000 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, gobject-introspection -, glib -, gtk3 -, libxklavier -, wrapGAppsHook3 -, gnome -}: - -stdenv.mkDerivation rec { - pname = "libgnomekbd"; - version = "3.28.1"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ItxZVm1zwAZTUPWpc0DmLsx7CMTfGRg4BLuL4kyP6HA="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - wrapGAppsHook3 - glib - gobject-introspection - ]; - - # Requires in libgnomekbd.pc - propagatedBuildInputs = [ - gtk3 - libxklavier - glib - ]; - - postInstall = '' - # Missing post-install script. - glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "Keyboard management library"; - mainProgram = "gkbd-keyboard-display"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libgnt/default.nix b/pkgs/development/libraries/libgnt/default.nix deleted file mode 100644 index 104a22beab74..000000000000 --- a/pkgs/development/libraries/libgnt/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkg-config -, gtk-doc, docbook-xsl-nons -, glib, ncurses, libxml2 -, buildDocs ? true -, mesonEmulatorHook -}: -stdenv.mkDerivation rec { - pname = "libgnt"; - version = "2.14.3"; - - outputs = [ "out" "dev" ] ++ lib.optional buildDocs "devdoc"; - - src = fetchurl { - url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.xz"; - hash = "sha256-V/VFf3KZnQuxoTmjfydG7BtaAsCU8nEKM52LzqQjYSM="; - }; - - nativeBuildInputs = [ glib meson ninja pkg-config ] - ++ lib.optionals buildDocs [ gtk-doc docbook-xsl-nons ] - ++ lib.optionals (buildDocs && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ glib ncurses libxml2 ]; - - postPatch = '' - substituteInPlace meson.build --replace \ - "ncurses_sys_prefix = '/usr'" \ - "ncurses_sys_prefix = '${lib.getDev ncurses}'" - ''; - mesonFlags = [ - (lib.mesonBool "doc" buildDocs) - (lib.mesonBool "python2" false) - ]; - - meta = with lib; { - description = "Ncurses toolkit for creating text-mode graphical user interfaces"; - homepage = "https://keep.imfreedom.org/libgnt/libgnt/"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with lib.maintainers; [ ony ]; - }; -} diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix deleted file mode 100644 index b3db03d0240b..000000000000 --- a/pkgs/development/libraries/libgnurl/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchurl, libtool, perl, pkg-config, python3, zlib, gnutls -, libidn2, libunistring }: - -stdenv.mkDerivation rec { - pname = "libgnurl"; - version = "7.72.0"; - - src = fetchurl { - url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz"; - sha256 = "1y4laraq37kw8hc8jlzgcw7y37bfd0n71q0sy3d3z6yg7zh2prxi"; - }; - - nativeBuildInputs = [ libtool perl pkg-config python3 ]; - - buildInputs = [ gnutls zlib libidn2 libunistring ]; - - configureFlags = [ - "--disable-ntlm-wb" - "--without-ca-bundle" - "--with-ca-fallback" - # below options will cause errors if enabled - "--disable-ftp" - "--disable-tftp" - "--disable-file" - "--disable-ldap" - "--disable-dict" - "--disable-rtsp" - "--disable-telnet" - "--disable-pop3" - "--disable-imap" - "--disable-smb" - "--disable-smtp" - "--disable-gopher" - "--without-ssl" # disables only openssl, not ssl in general - "--without-libpsl" - "--without-librtmp" - ]; - - meta = with lib; { - description = "Fork of libcurl used by GNUnet"; - homepage = "https://gnunet.org/en/gnurl.html"; - maintainers = [ ]; - platforms = platforms.unix; - license = licenses.curl; - }; -} diff --git a/pkgs/development/libraries/libgourou/default.nix b/pkgs/development/libraries/libgourou/default.nix deleted file mode 100644 index bfd483e5d31c..000000000000 --- a/pkgs/development/libraries/libgourou/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, fetchzip -, pugixml -, updfparser -, curl -, openssl -, libzip -, installShellFiles -}: - -stdenv.mkDerivation rec { - pname = "libgourou"; - version = "0.8.2"; - - src = fetchzip { - url = "https://indefero.soutade.fr/p/libgourou/source/download/v${version}/"; - sha256 = "sha256-adkrvBCgN07Ir+J3JFCy+X9p9609lj1w8nElrlHXTxc"; - extension = "zip"; - }; - - postPatch = '' - patchShebangs scripts/setup.sh - ''; - - postConfigure = '' - mkdir lib - ln -s ${updfparser}/lib lib/updfparser - ''; - - nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ pugixml updfparser curl openssl libzip ]; - - makeFlags = [ "BUILD_STATIC=1" "BUILD_SHARED=1" ]; - - installPhase = '' - runHook preInstall - install -Dt $out/include include/libgourou*.h - install -Dt $out/lib libgourou.so - install -Dt $out/lib libgourou.so.${version} - install -Dt $out/lib libgourou.a - install -Dt $out/bin utils/acsmdownloader - install -Dt $out/bin utils/adept_{activate,loan_mgt,remove} - installManPage utils/man/*.1 - runHook postInstall - ''; - - meta = with lib; { - description = "Implementation of Adobe's ADEPT protocol for ePub/PDF DRM"; - homepage = "https://indefero.soutade.fr/p/libgourou"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ autumnal ]; - platforms = platforms.all; - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix deleted file mode 100644 index 9920a54e0413..000000000000 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ stdenv, lib, buildPackages, fetchurl, fetchpatch, gettext -, genPosixLockObjOnly ? false -}: let - genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly { - buildPhase = '' - cd src - make gen-posix-lock-obj - ''; - - installPhase = '' - mkdir -p $out/bin - install -m755 gen-posix-lock-obj $out/bin - ''; - - outputs = [ "out" ]; - outputBin = "out"; - }; -in stdenv.mkDerivation (rec { - pname = "libgpg-error"; - version = "1.50"; - - src = fetchurl { - url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - 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 - ''; - - configureFlags = [ - # See https://dev.gnupg.org/T6257#164567 - "--enable-install-gpg-error-config" - ]; - - outputs = [ "out" "dev" "info" ]; - outputBin = "dev"; # deps want just the lib, most likely - - # If architecture-dependent MO files aren't available, they're generated - # during build, so we need gettext for cross-builds. - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ gettext ]; - - postConfigure = - # For some reason, /bin/sh on OpenIndiana leads to this at the end of the - # `config.status' run: - # ./config.status[1401]: shift: (null): bad number - # (See <https://hydra.nixos.org/build/2931046/nixlog/1/raw>.) - # Thus, re-run it with Bash. - lib.optionalString stdenv.isSunOS '' - ${stdenv.shell} config.status - '' - # ./configure errorneous decides to use weak symbols on pkgsStatic, - # which, together with other defines results in locking functions in - # src/posix-lock.c to be no-op, causing tests/t-lock.c to fail. - + lib.optionalString stdenv.hostPlatform.isStatic '' - sed '/USE_POSIX_THREADS_WEAK/ d' config.h - echo '#undef USE_POSIX_THREADS_WEAK' >> config.h - ''; - - doCheck = true; # not cross - - meta = with lib; { - homepage = "https://www.gnupg.org/software/libgpg-error/index.html"; - changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=NEWS;hb=refs/tags/libgpg-error-${version}"; - description = "Small library that defines common error values for all GnuPG components"; - mainProgram = "gen-posix-lock-obj"; - - longDescription = '' - Libgpg-error is a small library that defines common error values - for all GnuPG components. Among these are GPG, GPGSM, GPGME, - GPG-Agent, libgcrypt, Libksba, DirMngr, Pinentry, SmartCard - Daemon and possibly more in the future. - ''; - - license = licenses.lgpl2Plus; - platforms = platforms.all; - maintainers = [ ]; - }; -} // genPosixLockObjOnlyAttrs) diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix deleted file mode 100644 index c196b137555d..000000000000 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, buildPackages -, autoreconfHook -, pkg-config -, gettext -, libusb1 -, libtool -, libexif -, libgphoto2 -, libjpeg -, curl -, libxml2 -, gd -}: - -stdenv.mkDerivation rec { - pname = "libgphoto2"; - version = "2.5.31"; - - src = fetchFromGitHub { - owner = "gphoto"; - repo = "libgphoto2"; - rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release"; - sha256 = "sha256-UmyDKEaPP9VJqi8f+y6JZcTlQomhMTN+/C//ODYx6/w="; - }; - - depsBuildBuild = [ pkg-config ]; - - nativeBuildInputs = [ - autoreconfHook - gettext - libtool - pkg-config - ]; - - buildInputs = [ - libjpeg - libtool # for libltdl - libusb1 - curl - libxml2 - gd - ]; - - # These are mentioned in the Requires line of libgphoto's pkg-config file. - propagatedBuildInputs = [ libexif ]; - - hardeningDisable = [ "format" ]; - - postInstall = - let - executablePrefix = - if stdenv.buildPlatform == stdenv.hostPlatform then - "$out" - else - buildPackages.libgphoto2; - in - '' - mkdir -p $out/lib/udev/{rules.d,hwdb.d} - ${executablePrefix}/lib/libgphoto2/print-camera-list \ - udev-rules version 201 group camera \ - >$out/lib/udev/rules.d/40-libgphoto2.rules - ${executablePrefix}/lib/libgphoto2/print-camera-list \ - hwdb version 201 group camera \ - >$out/lib/udev/hwdb.d/20-gphoto.hwdb - ''; - - meta = { - homepage = "http://www.gphoto.org/proj/libgphoto2/"; - description = "Library for accessing digital cameras"; - longDescription = '' - This is the library backend for gphoto2. It contains the code for PTP, - MTP, and other vendor specific protocols for controlling and transferring data - from digital cameras. - ''; - # XXX: the homepage claims LGPL, but several src files are lgpl21Plus - license = lib.licenses.lgpl21Plus; - platforms = with lib.platforms; unix; - maintainers = with lib.maintainers; [ jcumming ]; - }; -} diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix deleted file mode 100644 index 1880b8310fce..000000000000 --- a/pkgs/development/libraries/libgpiod/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkg-config -, enable-tools ? true }: - -stdenv.mkDerivation rec { - pname = "libgpiod"; - version = "2.1.3"; - - src = fetchurl { - url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - hash = "sha256-jYDqAirngSKqUlMI50I7gwZL/yePzZzQRblLT4H4BX0="; - }; - - nativeBuildInputs = [ - autoconf-archive - pkg-config - autoreconfHook - ]; - - configureFlags = [ - "--enable-tools=${if enable-tools then "yes" else "no"}" - "--enable-bindings-cxx" - ]; - - meta = with lib; { - description = "C library and tools for interacting with the linux GPIO character device"; - longDescription = '' - Since linux 4.8 the GPIO sysfs interface is deprecated. User space should use - the character device instead. This library encapsulates the ioctl calls and - data structures behind a straightforward API. - ''; - homepage = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/"; - license = with licenses; [ - lgpl21Plus # libgpiod - lgpl3Plus # C++ bindings - ] ++ lib.optional enable-tools gpl2Plus; - maintainers = [ maintainers.expipiplus1 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index a81f9587b3be..5d4e0253be8d 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -67,6 +67,13 @@ stdenv.mkDerivation rec { libimobiledevice ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-int" + "-Wno-error=incompatible-pointer-types" + ]; + }; + meta = with lib; { homepage = "https://sourceforge.net/projects/gtkpod/"; description = "Library used by gtkpod to access the contents of an ipod"; diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix deleted file mode 100644 index 268ada87ac6e..000000000000 --- a/pkgs/development/libraries/libgringotts/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, zlib, bzip2, libmcrypt, libmhash }: - -stdenv.mkDerivation rec { - pname = "libgringotts"; - version = "1.2.1"; - - src = fetchurl { - url = "https://sourceforge.net/projects/gringotts.berlios/files/${pname}-${version}.tar.bz2"; - sha256 = "1ldz1lyl1aml5ci1mpnys8dg6n7khpcs4zpycak3spcpgdsnypm7"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ zlib bzip2 libmcrypt libmhash ]; - - meta = with lib; { - description = "Small library to encapsulate data in an encrypted structure"; - homepage = "https://libgringotts.sourceforge.net/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ pSub ]; - }; -} diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index ce0c6e14edc2..c6de97101be8 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { glib libxml2 libsoup - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit ]; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix deleted file mode 100644 index dcb460272d16..000000000000 --- a/pkgs/development/libraries/libgsf/default.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ fetchFromGitLab -, lib -, stdenv -, autoreconfHook -, fetchpatch2 -, gtk-doc -, pkg-config -, intltool -, gettext -, glib -, libxml2 -, zlib -, bzip2 -, perl -, gdk-pixbuf -, libiconv -, libintl -, gnome -}: - -stdenv.mkDerivation rec { - pname = "libgsf"; - version = "1.14.52"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "libgsf"; - rev = "LIBGSF_${lib.replaceStrings ["."] ["_"] version}"; - 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 \ - --replace "AC_PATH_PROG(PKG_CONFIG, pkg-config, no)" \ - "PKG_PROG_PKG_CONFIG" - ''; - - strictDeps = true; - - nativeBuildInputs = [ - autoreconfHook - gtk-doc - pkg-config - intltool - libintl - ]; - - buildInputs = [ - gettext - bzip2 - zlib - ]; - - nativeCheckInputs = [ - perl - ]; - - propagatedBuildInputs = [ - libxml2 - glib - gdk-pixbuf - libiconv - ]; - - doCheck = true; - - preCheck = '' - patchShebangs ./tests/ - ''; - - # checking pkg-config is at least version 0.9.0... ./configure: line 15213: no: command not found - # configure: error: in `/build/libgsf-1.14.50': - # configure: error: The pkg-config script could not be found or is too old. Make sure it - # is in your PATH or set the PKG_CONFIG environment variable to the full - preConfigure = '' - export PKG_CONFIG="$(command -v "$PKG_CONFIG")" - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "GNOME's Structured File Library"; - homepage = "https://www.gnome.org/projects/libgsf"; - license = licenses.lgpl21Only; - maintainers = with maintainers; [ lovek323 ]; - platforms = lib.platforms.unix; - - longDescription = '' - Libgsf aims to provide an efficient extensible I/O abstraction for - dealing with different structured file formats. - ''; - }; -} diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/development/libraries/libgssglue/default.nix deleted file mode 100644 index b11c9e3600a5..000000000000 --- a/pkgs/development/libraries/libgssglue/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - autoreconfHook, - krb5, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libgssglue"; - version = "0.9"; - - 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 - ''; - - postInstall = '' - mkdir -p $out/etc - cat <<EOF > $out/etc/gssapi_mech.conf - ${lib.getLib krb5}/lib/libgssapi_krb5.so mechglue_internal_krb5_init - EOF - ''; - - meta = with lib; { - homepage = "http://www.citi.umich.edu/projects/nfsv4/linux/"; - description = "Exports a gssapi interface which calls other random gssapi libraries"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ corngood ]; - }; -}) diff --git a/pkgs/development/libraries/libgtkflow3/default.nix b/pkgs/development/libraries/libgtkflow3/default.nix deleted file mode 100644 index 7c85bd00b5d6..000000000000 --- a/pkgs/development/libraries/libgtkflow3/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{stdenv, lib, vala, meson, ninja, pkg-config, fetchFromGitea, gobject-introspection, glib, gtk3, libgflow}: - -stdenv.mkDerivation rec { - pname = "libgtkflow3"; - version = "1.0.6"; - - outputs = [ "out" "dev" "devdoc" ]; - outputBin = "devdoc"; # demo app - - src = fetchFromGitea { - domain = "notabug.org"; - owner = "grindhold"; - repo = "libgtkflow"; - rev = "gtkflow3_${version}"; - hash = "sha256-JoVq7U5JQ3pRxptR7igWFw7lcBTsgr3aVXxayLqhyFo="; - }; - - nativeBuildInputs = [ - vala - meson - ninja - pkg-config - gobject-introspection - ]; - - buildInputs = [ - gtk3 - glib - libgflow - ]; - - postFixup = '' - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput "share/doc" "$devdoc" - ''; - - mesonFlags = [ - "-Denable_valadoc=true" - "-Denable_gtk4=false" - "-Denable_gflow=false" - ]; - - postPatch = '' - rm -r libgflow - ''; - - meta = with lib; { - description = "Flow graph widget for GTK 3"; - homepage = "https://notabug.org/grindhold/libgtkflow"; - maintainers = with maintainers; [ grindhold ]; - license = licenses.lgpl3Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libgtkflow4/default.nix b/pkgs/development/libraries/libgtkflow4/default.nix deleted file mode 100644 index 60439e7636e1..000000000000 --- a/pkgs/development/libraries/libgtkflow4/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{stdenv, lib, vala, meson, ninja, pkg-config, fetchFromGitea, gobject-introspection, glib, gtk4, libgflow}: - -stdenv.mkDerivation rec { - pname = "libgtkflow4"; - version = "0.2.6"; - - outputs = [ "out" "dev" "devdoc" ]; - outputBin = "devdoc"; # demo app - - src = fetchFromGitea { - domain = "notabug.org"; - owner = "grindhold"; - repo = "libgtkflow"; - rev = "gtkflow4_${version}"; - hash = "sha256-JoVq7U5JQ3pRxptR7igWFw7lcBTsgr3aVXxayLqhyFo="; - }; - - nativeBuildInputs = [ - vala - meson - ninja - pkg-config - gobject-introspection - ]; - - buildInputs = [ - gtk4 - glib - libgflow - ]; - - postFixup = '' - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput "share/doc" "$devdoc" - ''; - - mesonFlags = [ - "-Denable_valadoc=true" - "-Denable_gtk3=false" - "-Denable_gflow=false" - ]; - - postPatch = '' - rm -r libgflow - ''; - - meta = with lib; { - description = "Flow graph widget for GTK 3"; - homepage = "https://notabug.org/grindhold/libgtkflow"; - maintainers = with maintainers; [ grindhold ]; - license = licenses.lgpl3Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix deleted file mode 100644 index a265d366ab76..000000000000 --- a/pkgs/development/libraries/libgtop/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv -, fetchurl -, glib -, pkg-config -, perl -, gettext -, gobject-introspection -, gnome -, gtk-doc -, deterministic-uname -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libgtop"; - version = "2.41.3"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://gnome/sources/libgtop/${lib.versions.majorMinor finalAttrs.version}/libgtop-${finalAttrs.version}.tar.xz"; - hash = "sha256-d1Z235WOLqJFL3Vo8osupYEGPTEnc91cC3Ykwbmy2ow="; - }; - - nativeBuildInputs = [ - # uname output embedded in https://gitlab.gnome.org/GNOME/libgtop/-/blob/master/src/daemon/Makefile.am - deterministic-uname - pkg-config - gtk-doc - perl - gettext - gobject-introspection - ]; - - propagatedBuildInputs = [ - glib - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = "libgtop"; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "Library that reads information about processes and the running system"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix deleted file mode 100644 index dcd2015e1d15..000000000000 --- a/pkgs/development/libraries/libgudev/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ stdenv -, lib -, fetchurl -, pkg-config -, meson -, ninja -, udev -, glib -, glibcLocales -, umockdev -, gnome -, vala -, gobject-introspection -, buildPackages -, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libgudev"; - version = "238"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://gnome/sources/libgudev/${lib.versions.majorMinor finalAttrs.version}/libgudev-${finalAttrs.version}.tar.xz"; - hash = "sha256-YSZqsa/J1z28YKiyr3PpnS/f9H2ZVE0IV2Dk+mZ7XdE="; - }; - - patches = [ - # Conditionally disable one test that requires a locale implementation - # https://gitlab.gnome.org/GNOME/libgudev/-/merge_requests/31 - ./tests-skip-double-test-on-stub-locale-impls.patch - ]; - - postPatch = lib.optionalString finalAttrs.finalPackage.doCheck '' - # The relative location of LD_PRELOAD works for Glibc but not for other loaders (e.g. pkgsMusl) - substituteInPlace tests/meson.build \ - --replace "LD_PRELOAD=libumockdev-preload.so.0" "LD_PRELOAD=${lib.getLib umockdev}/lib/libumockdev-preload.so.0" - ''; - - strictDeps = true; - - nativeBuildInputs = [ - pkg-config - meson - ninja - glib # for glib-mkenums needed during the build - ] ++ lib.optionals withIntrospection [ - gobject-introspection - vala - ]; - - buildInputs = [ - udev - glib - ]; - - checkInputs = [ - glibcLocales - umockdev - ]; - - doCheck = withIntrospection; - mesonFlags = [ - (lib.mesonEnable "introspection" withIntrospection) - (lib.mesonEnable "vapi" withIntrospection) - (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck) - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = "libgudev"; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - description = "Library that provides GObject bindings for libudev"; - homepage = "https://gitlab.gnome.org/GNOME/libgudev"; - maintainers = teams.gnome.members; - platforms = platforms.linux; - license = licenses.lgpl2Plus; - }; -}) diff --git a/pkgs/development/libraries/libgudev/tests-skip-double-test-on-stub-locale-impls.patch b/pkgs/development/libraries/libgudev/tests-skip-double-test-on-stub-locale-impls.patch deleted file mode 100644 index 277670aeed2b..000000000000 --- a/pkgs/development/libraries/libgudev/tests-skip-double-test-on-stub-locale-impls.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ad8b10870ee2092268f87144d8e5ab7db2011139 Mon Sep 17 00:00:00 2001 -From: Alyssa Ross <hi@alyssa.is> -Date: Tue, 30 Jan 2024 20:47:21 +0100 -Subject: [PATCH] tests: Skip double test on stub locale impls - -On musl, setlocale() with an unknown locale name will succeed, but -treat the requested locale as if it were C.UTF-8. Therefore, to -properly check whether the locale is supported, we need to actually -verify whether it works the way we expect when deciding whether to -skip the test. ---- - tests/test-double.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/tests/test-double.c b/tests/test-double.c -index 91e77c9..e9d9232 100644 ---- a/tests/test-double.c -+++ b/tests/test-double.c -@@ -39,8 +39,6 @@ fixture_teardown (Fixture *f, G_GNUC_UNUSED const void *data) - static void - test_double (Fixture *f, G_GNUC_UNUSED const void *data) - { -- g_assert_cmpstr (nl_langinfo(RADIXCHAR), ==, ","); -- - umockdev_testbed_add_device (f->testbed, "platform", "dev1", NULL, - "in_accel_scale", "0.0000098", NULL, - "ID_MODEL", "KoolGadget", "SCALE", "0.0000098", NULL); -@@ -73,6 +71,10 @@ int main(int argc, char **argv) - if (setlocale (LC_NUMERIC, "fr_FR.UTF-8") == NULL) - return GNU_SKIP_RETURNCODE; - -+ /* Skip if locale doesn't work how we expect. */ -+ if (strcmp (nl_langinfo(RADIXCHAR), ",")) -+ return GNU_SKIP_RETURNCODE; -+ - g_test_init (&argc, &argv, NULL); - - g_test_add ("/gudev/double", Fixture, NULL, --- -GitLab - diff --git a/pkgs/development/libraries/libguestfs/appliance.nix b/pkgs/development/libraries/libguestfs/appliance.nix deleted file mode 100644 index 1cedb03cb764..000000000000 --- a/pkgs/development/libraries/libguestfs/appliance.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, stdenvNoCC -, fetchurl -}: - -stdenvNoCC.mkDerivation rec { - pname = "libguestfs-appliance"; - version = "1.46.0"; - - src = fetchurl { - url = "http://download.libguestfs.org/binaries/appliance/appliance-${version}.tar.xz"; - hash = "sha256-p1UN5wv3y+V5dFMG5yM3bVf1vaoDzQnVv9apfwC4gNg="; - }; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp README.fixed initrd kernel root $out - - runHook postInstall - ''; - - meta = with lib; { - description = "VM appliance disk image used in libguestfs package"; - homepage = "https://libguestfs.org"; - license = with licenses; [ gpl2Plus lgpl2Plus ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - hydraPlatforms = [ ]; # Hydra fails with "Output limit exceeded" - }; -} diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix deleted file mode 100644 index 0b2b4278a65a..000000000000 --- a/pkgs/development/libraries/libguestfs/default.nix +++ /dev/null @@ -1,168 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, autoreconfHook -, makeWrapper -, libxcrypt -, ncurses -, cpio -, gperf -, cdrkit -, flex -, bison -, qemu -, pcre2 -, augeas -, libxml2 -, acl -, libcap -, libcap_ng -, libconfig -, systemd -, fuse -, yajl -, libvirt -, hivex -, db -, gmp -, readline -, file -, numactl -, libapparmor -, jansson -, getopt -, perlPackages -, ocamlPackages -, libtirpc -, appliance ? null -, javaSupport ? false -, jdk -, zstd -}: - -assert appliance == null || lib.isDerivation appliance; - -stdenv.mkDerivation rec { - pname = "libguestfs"; - version = "1.50.1"; - - src = fetchurl { - url = "https://libguestfs.org/download/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; - sha256 = "sha256-Xmhx6I+C5SHjHUQt5qELZJcCN8t5VumdEXsSO1hWWm8="; - }; - - strictDeps = true; - nativeBuildInputs = [ - autoreconfHook - bison - cdrkit - cpio - flex - getopt - gperf - makeWrapper - pkg-config - qemu - zstd - ] ++ (with perlPackages; [ perl libintl-perl GetoptLong ModuleBuild ]) - ++ (with ocamlPackages; [ ocaml findlib ]); - buildInputs = [ - libxcrypt - ncurses - jansson - pcre2 - augeas - libxml2 - acl - libcap - libcap_ng - libconfig - systemd - fuse - yajl - libvirt - gmp - readline - file - hivex - db - numactl - libapparmor - perlPackages.ModuleBuild - libtirpc - ] ++ (with ocamlPackages; [ ocamlbuild ocaml_libvirt gettext-stub ounit ]) - ++ lib.optional javaSupport jdk; - - prePatch = '' - # build-time scripts - substituteInPlace run.in --replace '#!/bin/bash' '#!${stdenv.shell}' - substituteInPlace ocaml-link.sh.in --replace '#!/bin/bash' '#!${stdenv.shell}' - - # $(OCAMLLIB) is read-only "${ocamlPackages.ocaml}/lib/ocaml" - substituteInPlace ocaml/Makefile.am --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml' - substituteInPlace ocaml/Makefile.in --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml' - - # some scripts hardcore /usr/bin/env which is not available in the build env - patchShebangs . - ''; - configureFlags = [ - "--disable-appliance" - "--disable-daemon" - "--with-distro=NixOS" - "--with-guestfs-path=${placeholder "out"}/lib/guestfs" - ] ++ lib.optionals (!javaSupport) [ "--without-java" ]; - patches = [ - ./libguestfs-syms.patch - ]; - - createFindlibDestdir = true; - - installFlags = [ "REALLY_INSTALL=yes" ]; - enableParallelBuilding = true; - - postInstall = '' - mv "$out/lib/ocaml/guestfs" "$OCAMLFIND_DESTDIR/guestfs" - for bin in $out/bin/*; do - wrapProgram "$bin" \ - --prefix PATH : "$out/bin:${hivex}/bin:${qemu}/bin" \ - --prefix PERL5LIB : "$out/${perlPackages.perl.libPrefix}" - done - ''; - - postFixup = lib.optionalString (appliance != null) '' - mkdir -p $out/{lib,lib64} - ln -s ${appliance} $out/lib64/guestfs - ln -s ${appliance} $out/lib/guestfs - ''; - - doInstallCheck = appliance != null; - installCheckPhase = '' - runHook preInstallCheck - - export HOME=$(mktemp -d) # avoid access to /homeless-shelter/.guestfish - - ${qemu}/bin/qemu-img create -f qcow2 disk1.img 10G - - $out/bin/guestfish <<'EOF' - add-drive disk1.img - run - list-filesystems - part-disk /dev/sda mbr - mkfs ext2 /dev/sda1 - list-filesystems - EOF - - runHook postInstallCheck - ''; - - meta = with lib; { - description = "Tools for accessing and modifying virtual machine disk images"; - license = with licenses; [ gpl2Plus lgpl21Plus ]; - homepage = "https://libguestfs.org/"; - maintainers = with maintainers; [ offline ]; - platforms = platforms.linux; - # this is to avoid "output size exceeded" - hydraPlatforms = if appliance != null then appliance.meta.hydraPlatforms else platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libguestfs/libguestfs-syms.patch b/pkgs/development/libraries/libguestfs/libguestfs-syms.patch deleted file mode 100644 index 09c4b1393ce7..000000000000 --- a/pkgs/development/libraries/libguestfs/libguestfs-syms.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/Makefile.am b/lib/Makefile.am ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -168,8 +168,7 @@ libguestfs_la_LIBADD = \ - # Force libtool to name the library 'libguestfs.so.0.$(MAX_PROC_NR).0'. - # Include the version script to limit which symbols are exported. - libguestfs_la_LDFLAGS = \ -- -version-info $(MAX_PROC_NR):0:$(MAX_PROC_NR) \ -- $(VERSION_SCRIPT_FLAGS)$(srcdir)/libguestfs.syms -+ -version-info $(MAX_PROC_NR):0:$(MAX_PROC_NR) - - if HAVE_FUSE - # XXX Unfortunately FUSE_CFLAGS defines _FILE_OFFSET_BITS=64. diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix deleted file mode 100644 index f82401f524fa..000000000000 --- a/pkgs/development/libraries/libgumath/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, libndtypes -, libxnd -}: - -stdenv.mkDerivation { - pname = "libgumath"; - version = "unstable-2019-08-01"; - - src = fetchFromGitHub { - owner = "xnd-project"; - repo = "gumath"; - rev = "360ed454105ac5615a7cb7d216ad25bc4181b876"; - sha256 = "1wprkxpmjrk369fpw8rbq51r7jvqkcndqs209y7p560cnagmsxc6"; - }; - - buildInputs = [ libndtypes libxnd ]; - - # Override linker with cc (symlink to either gcc or clang) - # Library expects to use cc for linking - configureFlags = [ - "LD=${stdenv.cc.targetPrefix}cc" - ]; - - doCheck = true; - - meta = with lib; { - description = "Library supporting function dispatch on general data containers. C base and Python wrapper"; - homepage = "https://xnd.io/"; - license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix deleted file mode 100644 index 42b927211543..000000000000 --- a/pkgs/development/libraries/libgweather/default.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, libxml2 -, json-glib -, glib -, gettext -, libsoup_3 -, gi-docgen -, gobject-introspection -, python3 -, tzdata -, geocode-glib_2 -, vala -, gnome -, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform -}: - -stdenv.mkDerivation rec { - pname = "libgweather"; - version = "4.4.2"; - - outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-puQntHcK2kiUXzqpBq9xD8gzz/DULfkfGCgwJ0DXlOw="; - }; - - patches = [ - # Headers depend on glib but it is only listed in Requires.private, - # which does not influence Cflags on non-static builds in nixpkgs’s - # pkg-config. Let’s add it to Requires to ensure Cflags are set correctly. - ./fix-pkgconfig.patch - ]; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - glib - (python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ])) - ] ++ lib.optionals withIntrospection [ - gi-docgen - gobject-introspection - vala - ]; - - buildInputs = [ - glib - libsoup_3 - libxml2 - json-glib - geocode-glib_2 - ]; - - mesonFlags = [ - "-Dzoneinfo_dir=${tzdata}/share/zoneinfo" - (lib.mesonBool "introspection" withIntrospection) - ] ++ lib.optionals stdenv.isDarwin [ - "-Dc_args=-D_DARWIN_C_SOURCE" - ]; - - postPatch = '' - patchShebangs build-aux/meson/gen_locations_variant.py - - # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) - # it should be a build-time dep for build - # TODO: send upstream - substituteInPlace doc/meson.build \ - --replace "'gi-docgen', ver" "'gi-docgen', native:true, ver" \ - --replace "'gi-docgen', req" "'gi-docgen', native:true, req" - - # gir works for us even when cross-compiling - # TODO: send upstream because downstream users can use the option to disable gir if they don't have it working - substituteInPlace libgweather/meson.build \ - --replace "g_ir_scanner.found() and not meson.is_cross_build()" "g_ir_scanner.found()" - ''; - - postFixup = '' - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput "share/doc" "$devdoc" - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - # Version 40.alpha preceded version 4.0. - freeze = "40.alpha"; - }; - }; - - meta = with lib; { - description = "Library to access weather information from online services for numerous locations"; - homepage = "https://gitlab.gnome.org/GNOME/libgweather"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libgweather/fix-pkgconfig.patch b/pkgs/development/libraries/libgweather/fix-pkgconfig.patch deleted file mode 100644 index b118a3bc9dd8..000000000000 --- a/pkgs/development/libraries/libgweather/fix-pkgconfig.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/libgweather/meson.build b/libgweather/meson.build -index b5d0b4d4..10010d70 100644 ---- a/libgweather/meson.build -+++ b/libgweather/meson.build -@@ -269,6 +269,9 @@ pkgconfig.generate( - description: 'Gather weather information from online services', - version: meson.project_version(), - subdirs: libgweather_full_version, -+ requires: [ -+ 'glib-2.0', -+ ], - variables: [ - 'soupapiversion=' + libsoup_api_version, - ] diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix deleted file mode 100644 index cff74fbb4741..000000000000 --- a/pkgs/development/libraries/libgxps/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, cairo -, libarchive, freetype, libjpeg, libtiff, gnome, lcms2 -}: - -stdenv.mkDerivation rec { - pname = "libgxps"; - version = "0.3.2"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "bSeGclajXM+baSU+sqiKMrrKO5fV9O9/guNmf6Q1JRw="; - }; - - nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ]; - buildInputs = [ glib cairo freetype libjpeg libtiff lcms2 ]; - propagatedBuildInputs = [ libarchive ]; - - mesonFlags = [ - "-Denable-test=false" - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-Ddisable-introspection=true" - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - description = "GObject based library for handling and rendering XPS documents"; - homepage = "https://gitlab.gnome.org/GNOME/libgxps"; - license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix index d25335c89157..c20a8382b5d0 100644 --- a/pkgs/development/libraries/libhandy/0.x.nix +++ b/pkgs/development/libraries/libhandy/0.x.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "-Dintrospection=enabled" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' NO_AT_BRIDGE=1 \ diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index a43ee0986be8..829de78a6aeb 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules"; PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs"; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' runHook preCheck diff --git a/pkgs/development/libraries/libhangul/default.nix b/pkgs/development/libraries/libhangul/default.nix deleted file mode 100644 index 2ff18376a461..000000000000 --- a/pkgs/development/libraries/libhangul/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libhangul"; - version = "0.1.0"; - - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libhangul/libhangul-${version}.tar.gz"; - sha256 = "0ni9b0v70wkm0116na7ghv03pgxsfpfszhgyj3hld3bxamfal1ar"; - }; - - meta = with lib; { - description = "Core algorithm library for Korean input routines"; - mainProgram = "hangul"; - homepage = "https://github.com/choehwanjin/libhangul"; - license = licenses.lgpl21; - maintainers = [ maintainers.ianwookim ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix deleted file mode 100644 index dabd74e648c3..000000000000 --- a/pkgs/development/libraries/libharu/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, zlib, libpng }: - -stdenv.mkDerivation rec { - pname = "libharu"; - version = "2.4.4"; - - src = fetchFromGitHub { - owner = "libharu"; - repo = pname; - rev = "v${version}"; - hash = "sha256-tw/E79Cg/8kIei6NUu1W+mP0sUDCm8KTB7ZjzxsqpeM="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib libpng ]; - - meta = { - description = "Cross platform, open source library for generating PDF files"; - homepage = "http://libharu.org/"; - license = lib.licenses.zlib; - maintainers = [ lib.maintainers.marcweber ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix deleted file mode 100644 index c35db9e46b43..000000000000 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchurl }: - -# libhdhomerun requires UDP port 65001 to be open in order to detect and communicate with tuners. -# If your firewall is enabled, make sure to have something like: -# networking.firewall.allowedUDPPorts = [ 65001 ]; - -stdenv.mkDerivation rec { - pname = "libhdhomerun"; - version = "20231214"; - - src = fetchurl { - url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz"; - hash = "sha256-VSoQLoqiq8xBYJDewvb4DaWfl/kfV5aOnp17PcAF268="; - }; - - patches = [ - ./nixos-darwin-no-fat-dylib.patch - ]; - - makeFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,lib,include/hdhomerun} - install -Dm444 libhdhomerun${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib - install -Dm555 hdhomerun_config $out/bin - cp *.h $out/include/hdhomerun - - runHook postInstall - ''; - - meta = with lib; { - description = "Implements the libhdhomerun protocol for use with Silicondust HDHomeRun TV tuners"; - mainProgram = "hdhomerun_config"; - homepage = "https://www.silicondust.com/support/linux"; - license = licenses.lgpl21Only; - maintainers = with maintainers; [ sielicki ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libhdhomerun/nixos-darwin-no-fat-dylib.patch b/pkgs/development/libraries/libhdhomerun/nixos-darwin-no-fat-dylib.patch deleted file mode 100644 index 99c389a19434..000000000000 --- a/pkgs/development/libraries/libhdhomerun/nixos-darwin-no-fat-dylib.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 6b9ed19d7874b88b7db5b740dac3dcd7dcda6c8c Mon Sep 17 00:00:00 2001 -From: Nicholas Sielicki <git@opensource.nslick.com> -Date: Sat, 25 Nov 2023 13:54:39 -0600 -Subject: [PATCH] nixos-darwin-no-fat-dylib - -Signed-off-by: Nicholas Sielicki <git@opensource.nslick.com> ---- - Makefile | 24 ++++-------------------- - 1 file changed, 4 insertions(+), 20 deletions(-) - -diff --git a/Makefile b/Makefile -index 1d8fb9f..35c7d15 100644 ---- a/Makefile -+++ b/Makefile -@@ -42,30 +42,14 @@ LIBSRCS += hdhomerun_video.c - - ifeq ($(OS),Darwin) - --TARGET_X64 := -target x86_64-apple-macos10.11 --TARGET_ARM64 := -target arm64-apple-macos11 -- - all : hdhomerun_config libhdhomerun.dylib - --hdhomerun_config_x64 : hdhomerun_config.c $(LIBSRCS) -- $(CC) $(TARGET_X64) $(CFLAGS) $+ $(LDFLAGS) -o $@ -- $(STRIP) $@ -- --hdhomerun_config_arm64 : hdhomerun_config.c $(LIBSRCS) -- $(CC) $(TARGET_ARM64) $(CFLAGS) $+ $(LDFLAGS) -o $@ -+hdhomerun_config: hdhomerun_config.c $(LIBSRCS) -+ $(CC) $(CFLAGS) $+ $(LDFLAGS) -o $@ - $(STRIP) $@ - --hdhomerun_config : hdhomerun_config_x64 hdhomerun_config_arm64 -- lipo -create -output hdhomerun_config hdhomerun_config_x64 hdhomerun_config_arm64 -- --libhdhomerun_x64.dylib : $(LIBSRCS) -- $(CC) $(TARGET_X64) $(CFLAGS) -DDLL_EXPORT -fPIC -dynamiclib $+ $(LDFLAGS) -o $@ -- --libhdhomerun_arm64.dylib : $(LIBSRCS) -- $(CC) $(TARGET_ARM64) $(CFLAGS) -DDLL_EXPORT -fPIC -dynamiclib $+ $(LDFLAGS) -o $@ -- --libhdhomerun.dylib : libhdhomerun_x64.dylib libhdhomerun_arm64.dylib -- lipo -create -output libhdhomerun.dylib libhdhomerun_x64.dylib libhdhomerun_arm64.dylib -+libhdhomerun.dylib : $(LIBSRCS) -+ $(CC) $(CFLAGS) -DDLL_EXPORT -fPIC -dynamiclib $+ $(LDFLAGS) -o $@ - - else - --- -2.42.0 - diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix deleted file mode 100644 index 1b9c0c0768c3..000000000000 --- a/pkgs/development/libraries/libheif/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, dav1d -, rav1e -, libde265 -, x265 -, libpng -, libjpeg -, libaom -, gdk-pixbuf - -# for passthru.tests -, gimp -, imagemagick -, imlib2Full -, imv -, python3Packages -, vips -}: - -stdenv.mkDerivation rec { - pname = "libheif"; - version = "1.18.2"; - - outputs = [ "bin" "out" "dev" "man" ]; - - src = fetchFromGitHub { - owner = "strukturag"; - repo = "libheif"; - rev = "v${version}"; - hash = "sha256-Z21E2b4E9jGtwR1RpFMAbGsWFw6jXn++WexlzdoyZzE="; - }; - - nativeBuildInputs = [ - pkg-config - cmake - ]; - - buildInputs = [ - dav1d - rav1e - libde265 - x265 - libpng - libjpeg - libaom - gdk-pixbuf - ]; - - # Fix installation path for gdk-pixbuf module - PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${placeholder "out"}/${gdk-pixbuf.moduleDir}"; - - # Wrong include path in .cmake. It's a bit difficult to patch because of special characters. - postFixup = '' - sed '/^ INTERFACE_INCLUDE_DIRECTORIES/s|"[^"]*/include"|"${placeholder "dev"}/include"|' \ - -i "$dev"/lib/cmake/libheif/libheif-config.cmake - ''; - - passthru.tests = { - inherit gimp imagemagick imlib2Full imv vips; - inherit (python3Packages) pillow-heif; - }; - - meta = { - homepage = "http://www.libheif.org/"; - description = "ISO/IEC 23008-12:2017 HEIF image file format decoder and encoder"; - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ gebner ]; - }; -} diff --git a/pkgs/development/libraries/libhsts/default.nix b/pkgs/development/libraries/libhsts/default.nix deleted file mode 100644 index 124b1fc5496c..000000000000 --- a/pkgs/development/libraries/libhsts/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, fetchurl, autoconf-archive, autoreconfHook, pkg-config, python3 }: -let - chromium_version = "90.0.4417.1"; - - hsts_list = fetchurl { - url = "https://raw.github.com/chromium/chromium/${chromium_version}/net/http/transport_security_state_static.json"; - sha256 = "09f24n30x5dmqk8zk7k2glcilgr27832a3304wj1yp97158sqsfx"; - }; - -in -stdenv.mkDerivation rec { - pname = "libhsts"; - version = "0.1.0"; - - src = fetchFromGitLab { - owner = "rockdaboot"; - repo = pname; - rev = "libhsts-${version}"; - sha256 = "0gbchzf0f4xzb6zjc56dk74hqrmdgyirmgxvvsqp9vqn9wb5kkx4"; - }; - - postPatch = '' - pushd tests - cp ${hsts_list} transport_security_state_static.json - sed 's/^ *\/\/.*$//g' transport_security_state_static.json >hsts.json - popd - patchShebangs src/hsts-make-dafsa - ''; - - nativeBuildInputs = [ autoconf-archive autoreconfHook pkg-config python3 ]; - - outputs = [ "out" "dev" ]; - - meta = with lib; { - description = "Library to easily check a domain against the Chromium HSTS Preload list"; - mainProgram = "hsts"; - homepage = "https://gitlab.com/rockdaboot/libhsts"; - license = with licenses; [ mit bsd3 ]; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libhsts/update.sh b/pkgs/development/libraries/libhsts/update.sh deleted file mode 100755 index f80966e08c9a..000000000000 --- a/pkgs/development/libraries/libhsts/update.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq - -set -euo pipefail -x - -cd "$(dirname "$0")" - -chromium_version=$(curl -s "https://api.github.com/repos/chromium/chromium/tags" | jq -r 'map(select(.prerelease | not)) | .[1].name') -sha256=$(nix-prefetch-url "https://raw.github.com/chromium/chromium/$chromium_version/net/http/transport_security_state_static.json") - -sed -e "0,/chromium_version/s/chromium_version = \".*\"/chromium_version = \"$chromium_version\"/" \ - -e "0,/sha256/s/sha256 = \".*\"/sha256 = \"$sha256\"/" \ - --in-place ./default.nix diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix deleted file mode 100644 index 80bc73e9a043..000000000000 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch -, gnome, libgee, glib, json-glib, libarchive, libsoup, gobject-introspection }: - -let - pname = "libhttpseverywhere"; - version = "0.8.3"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w"; - }; - - nativeBuildInputs = [ vala gobject-introspection meson ninja pkg-config ]; - buildInputs = [ glib libgee json-glib libsoup libarchive ]; - - patches = [ - # Fixes build with vala >=0.42 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/commit/6da08ef1ade9ea267cecf14dd5cb2c3e6e5e50cb.patch"; - sha256 = "1nwjlh8iqgjayccwdh0fbpq2g1h8bg1k1g9i324f2bhhvyhmpq8f"; - }) - # fix build with meson 0.60 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/-/commit/4c38b2ca25802c464f3204a62815201d8cf549fd.patch"; - sha256 = "sha256-1+fmR0bpvJ9ISN2Hr+BTIQz+Bf6VfY1RdVZ/OohUlWU="; - }) - ]; - - mesonFlags = [ "-Denable_valadoc=true" ]; - - doCheck = true; - - checkPhase = "(cd test && ./httpseverywhere_test)"; - - FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; - - outputs = [ "out" "devdoc" ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "Library to use HTTPSEverywhere in desktop applications"; - homepage = "https://gitlab.gnome.org/GNOME/libhttpseverywhere"; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ sternenseemann ] ++ teams.gnome.members; - }; -} diff --git a/pkgs/development/libraries/libhugetlbfs/default.nix b/pkgs/development/libraries/libhugetlbfs/default.nix deleted file mode 100644 index bcc676b1b040..000000000000 --- a/pkgs/development/libraries/libhugetlbfs/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, lib, fetchurl, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "libhugetlbfs"; - version = "2.24"; - - src = fetchurl { - url = "https://github.com/libhugetlbfs/libhugetlbfs/releases/download/${version}/libhugetlbfs-${version}.tar.gz"; - hash = "sha256-1QHfqRyOrREGlno9OCnyunOMP6wKZcs1jtKrOHDdxe8="; - }; - - outputs = [ "bin" "dev" "man" "doc" "lib" "out" ]; - - nativeBuildInputs = [ autoreconfHook ]; - - postConfigure = '' - patchShebangs ld.hugetlbfs - ''; - - enableParallelBuilding = true; - makeFlags = [ - "BUILDTYPE=NATIVEONLY" - "PREFIX=$(out)" - "HEADERDIR=$(dev)/include" - "LIBDIR32=$(lib)/$(LIB32)" - "LIBDIR64=$(lib)/$(LIB64)" - "EXEDIR=$(bin)/bin" - "DOCDIR=$(doc)/share/doc/libhugetlbfs" - "MANDIR=$(man)/share/man" - ] ++ lib.optionals (stdenv.buildPlatform.system != stdenv.hostPlatform.system) [ - # The ARCH logic defaults to querying `uname`, which will return build platform arch - "ARCH=${stdenv.hostPlatform.uname.processor}" - ]; - - # Default target builds tests as well, and the tests want a static - # libc. - buildFlags = [ "libs" "tools" ]; - installTargets = [ "install" "install-docs" ]; - - meta = with lib; { - homepage = "https://github.com/libhugetlbfs/libhugetlbfs"; - changelog = "https://github.com/libhugetlbfs/libhugetlbfs/blob/${version}/NEWS"; - description = "library and utilities for Linux hugepages"; - maintainers = with maintainers; [ qyliss ]; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - badPlatforms = flatten [ - systems.inspect.platformPatterns.isStatic - systems.inspect.patterns.isMusl - ]; - }; -} diff --git a/pkgs/development/libraries/libhv/default.nix b/pkgs/development/libraries/libhv/default.nix deleted file mode 100644 index c64c8e6e291f..000000000000 --- a/pkgs/development/libraries/libhv/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, curl, openssl, Security }: - -stdenv.mkDerivation (finalAttrs: { - pname = "libhv"; - version = "1.3.2"; - - src = fetchFromGitHub { - owner = "ithewei"; - repo = "libhv"; - rev = "v${finalAttrs.version}"; - hash = "sha256-tVuQwj2HvAhp51urGCuNPjBEIaTu9yR031Ih/5or9Pk="; - }; - - patches = [ - # Fix build failure on gcc-13: - # https://github.com/ithewei/libhv/pull/490 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/ithewei/libhv/commit/b3e61519fbdbbb956fed275c0a849ba5d4d6e45c.patch"; - hash = "sha256-fuYI+B3qZkSAbLZc0p6/0fnqaHx6w9N9vhTEE2t6UUs="; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ curl openssl ] ++ lib.optional stdenv.isDarwin Security; - - cmakeFlags = [ - "-DENABLE_UDS=ON" - "-DWITH_MQTT=ON" - "-DWITH_CURL=ON" - "-DWITH_NGHTTP2=ON" - "-DWITH_OPENSSL=ON" - "-DWITH_KCP=ON" - ]; - - meta = with lib; { - description = "C/c++ network library for developing TCP/UDP/SSL/HTTP/WebSocket/MQTT client/server"; - homepage = "https://github.com/ithewei/libhv"; - license = licenses.bsd3; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/libhwy/default.nix b/pkgs/development/libraries/libhwy/default.nix deleted file mode 100644 index 7bf78ec875e2..000000000000 --- a/pkgs/development/libraries/libhwy/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, stdenv -, cmake -, ninja -, gtest -, fetchFromGitHub -, fetchpatch -}: - -stdenv.mkDerivation rec { - pname = "libhwy"; - version = "1.0.7"; - - src = fetchFromGitHub { - owner = "google"; - repo = "highway"; - rev = version; - hash = "sha256-Z+mAR9nSAbCskUvo6oK79Yd85bu0HtI2aR5THS1EozM="; - }; - - patches = lib.optional stdenv.hostPlatform.isRiscV - # Adds CMake option HWY_CMAKE_RVV - # https://github.com/google/highway/pull/1743 - (fetchpatch { - name = "libhwy-add-rvv-optout.patch"; - url = "https://github.com/google/highway/commit/5d58d233fbcec0c6a39df8186a877329147324b3.patch"; - hash = "sha256-ileSNYddOt1F5rooRB0fXT20WkVlnG+gP5w7qJdBuww="; - }); - - hardeningDisable = lib.optionals stdenv.hostPlatform.isAarch64 [ - # aarch64-specific code gets: - # __builtin_clear_padding not supported for variable length aggregates - "trivialautovarinit" - ]; - - nativeBuildInputs = [ cmake ninja ]; - - # Required for case-insensitive filesystems ("BUILD" exists) - dontUseCmakeBuildDir = true; - - cmakeFlags = let - libExt = stdenv.hostPlatform.extensions.library; - in [ - "-GNinja" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optionals doCheck [ - "-DHWY_SYSTEM_GTEST:BOOL=ON" - "-DGTEST_INCLUDE_DIR=${lib.getDev gtest}/include" - "-DGTEST_LIBRARY=${lib.getLib gtest}/lib/libgtest${libExt}" - "-DGTEST_MAIN_LIBRARY=${lib.getLib gtest}/lib/libgtest_main${libExt}" - ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ - "-DHWY_CMAKE_ARM7=ON" - ] ++ lib.optionals stdenv.hostPlatform.isx86_32 [ - # Quoting CMakelists.txt: - # This must be set on 32-bit x86 with GCC < 13.1, otherwise math_test will be - # skipped. For GCC 13.1+, you can also build with -fexcess-precision=standard. - # Fixes tests: - # HwyMathTestGroup/HwyMathTest.TestAllAtanh/EMU128 - # HwyMathTestGroup/HwyMathTest.TestAllLog1p/EMU128 - "-DHWY_CMAKE_SSE2=ON" - ] ++ lib.optionals stdenv.hostPlatform.isRiscV [ - # Runtime dispatch is not implemented https://github.com/google/highway/issues/838 - # so tests (and likely normal operation) fail with SIGILL on processors without V. - # Until the issue is resolved, we disable RVV completely. - "-DHWY_CMAKE_RVV=OFF" - ]; - - # hydra's darwin machines run into https://github.com/libjxl/libjxl/issues/408 - doCheck = !stdenv.hostPlatform.isDarwin; - - meta = with lib; { - description = "Performance-portable, length-agnostic SIMD with runtime dispatch"; - homepage = "https://github.com/google/highway"; - license = with licenses; [ asl20 bsd3 ]; - platforms = platforms.unix; - maintainers = with maintainers; [ zhaofengli ]; - }; -} diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix deleted file mode 100644 index 2040ef3bee08..000000000000 --- a/pkgs/development/libraries/libiberty/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, buildPackages -, staticBuild ? stdenv.hostPlatform.isStatic -}: - -let inherit (buildPackages.buildPackages) gcc; in - -stdenv.mkDerivation { - pname = "libiberty"; - version = "${gcc.cc.version}"; - - inherit (gcc.cc) src; - - outputs = [ "out" "dev" ]; - - postUnpack = "sourceRoot=\${sourceRoot}/libiberty"; - - configureFlags = [ "--enable-install-libiberty" ] - ++ lib.optional (!staticBuild) "--enable-shared"; - - postInstall = lib.optionalString (!staticBuild) '' - cp pic/libiberty.a $out/lib*/libiberty.a - ''; - - meta = with lib; { - homepage = "https://gcc.gnu.org/"; - license = licenses.lgpl2; - description = "Collection of subroutines used by various GNU programs"; - maintainers = with maintainers; [ abbradar ericson2314 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix deleted file mode 100644 index 9088d9022069..000000000000 --- a/pkgs/development/libraries/libibmad/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, stdenv, fetchurl, libibumad }: - -stdenv.mkDerivation rec { - pname = "libibmad"; - version = "1.3.13"; - - src = fetchurl { - url = "https://www.openfabrics.org/downloads/management/${pname}-${version}.tar.gz"; - sha256 = "02sj8k2jpcbiq8s0l2lqk4vwji2dbb2lc730cv1yzv0zr0hxgk8p"; - }; - - buildInputs = [ libibumad ]; - - meta = with lib; { - homepage = "https://www.openfabrics.org/"; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/development/libraries/libibumad/default.nix deleted file mode 100644 index b9ebef7d4ccb..000000000000 --- a/pkgs/development/libraries/libibumad/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libibumad"; - version = "1.3.10.2"; - - src = fetchurl { - url = "https://www.openfabrics.org/downloads/management/${pname}-${version}.tar.gz"; - sha256 = "0bkygb3lbpaj6s4vsyixybrrkcnilbijv4ga5p1xdwyr3gip83sh"; - }; - - meta = with lib; { - homepage = "https://www.openfabrics.org/"; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix deleted file mode 100644 index 9d5db75bb121..000000000000 --- a/pkgs/development/libraries/libical/default.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkgsBuildBuild -, pkgsBuildHost -, cmake -, glib -, icu -, libxml2 -, ninja -, perl -, pkg-config -, libical -, python3 -, tzdata -, fixDarwinDylibNames -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable pkgsBuildHost -, gobject-introspection -, vala -}: - -stdenv.mkDerivation rec { - pname = "libical"; - version = "3.0.18"; - - outputs = [ "out" "dev" ]; # "devdoc" ]; - - src = fetchFromGitHub { - owner = "libical"; - repo = "libical"; - rev = "v${version}"; - sha256 = "sha256-32FNnCybXO67Vtg1LM6miJUaK+r0mlfjxgLQg1LD8Es="; - }; - - strictDeps = true; - - depsBuildBuild = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # provides ical-glib-src-generator that runs during build - libical - ]; - - nativeBuildInputs = [ - cmake - icu - ninja - perl - pkg-config - ] ++ lib.optionals withIntrospection [ - gobject-introspection - vala - # Docs building fails: - # https://github.com/NixOS/nixpkgs/pull/67204 - # previously with https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489 - # gtk-doc docbook_xsl docbook_xml_dtd_43 # for docs - ] ++ lib.optionals stdenv.isDarwin [ - fixDarwinDylibNames - ]; - nativeInstallCheckInputs = [ - # running libical-glib tests - (python3.pythonOnBuildForHost.withPackages (pkgs: with pkgs; [ - pygobject3 - ])) - ]; - - buildInputs = [ - glib - libxml2 - icu - ]; - - cmakeFlags = [ - "-DENABLE_GTK_DOC=False" - "-DGOBJECT_INTROSPECTION=${if withIntrospection then "True" else "False"}" - "-DICAL_GLIB_VAPI=${if withIntrospection then "True" else "False"}" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DIMPORT_ICAL_GLIB_SRC_GENERATOR=${lib.getDev pkgsBuildBuild.libical}/lib/cmake/LibIcal/IcalGlibSrcGenerator.cmake" - ]; - - patches = [ - # Will appear in 3.1.0 - # https://github.com/libical/libical/issues/350 - ./respect-env-tzdir.patch - ]; - - postPatch = '' - # Fix typo in test env setup - # https://github.com/libical/libical/commit/03c02ced21494413920744a400c638b0cb5d493f - substituteInPlace src/test/libical-glib/CMakeLists.txt \ - --replace-fail "''${CMAKE_BINARY_DIR}/src/libical-glib;\$ENV{GI_TYPELIB_PATH}" "''${CMAKE_BINARY_DIR}/src/libical-glib:\$ENV{GI_TYPELIB_PATH}" \ - --replace-fail "''${LIBRARY_OUTPUT_PATH};\$ENV{LD_LIBRARY_PATH}" "''${LIBRARY_OUTPUT_PATH}:\$ENV{LD_LIBRARY_PATH}" - ''; - - # Using install check so we do not have to manually set - # LD_LIBRARY_PATH and GI_TYPELIB_PATH variables - # Musl does not support TZDIR. - doInstallCheck = !stdenv.hostPlatform.isMusl; - enableParallelChecking = false; - preInstallCheck = if stdenv.isDarwin then '' - for testexe in $(find ./src/test -maxdepth 1 -type f -executable); do - for lib in $(cd lib && ls *.3.dylib); do - install_name_tool -change $lib $out/lib/$lib $testexe - done - done - '' else null; - installCheckPhase = '' - runHook preInstallCheck - - export TZDIR=${tzdata}/share/zoneinfo - ctest --output-on-failure - - runHook postInstallCheck - ''; - - meta = with lib; { - homepage = "https://github.com/libical/libical"; - description = "Open Source implementation of the iCalendar protocols"; - changelog = "https://github.com/libical/libical/raw/v${version}/ReleaseNotes.txt"; - license = licenses.mpl20; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/development/libraries/libical/respect-env-tzdir.patch deleted file mode 100644 index 59d23e490e5a..000000000000 --- a/pkgs/development/libraries/libical/respect-env-tzdir.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/src/libical/icaltz-util.c -+++ b/src/libical/icaltz-util.c -@@ -94,9 +94,9 @@ - static const char *zdir = NULL; - - static const char *search_paths[] = { -+ "/etc/zoneinfo", - "/usr/share/zoneinfo", - "/usr/lib/zoneinfo", -- "/etc/zoneinfo", - "/usr/share/lib/zoneinfo" - }; - -@@ -178,6 +178,15 @@ - const char *fname = ZONES_TAB_SYSTEM_FILENAME; - size_t i, num_search_paths; - -+ const char *env_tzdir = getenv ("TZDIR"); -+ if (env_tzdir) { -+ sprintf (file_path, "%s/%s", env_tzdir, fname); -+ if (!access (file_path, F_OK|R_OK)) { -+ zdir = env_tzdir; -+ return; -+ } -+ } -+ - num_search_paths = sizeof(search_paths) / sizeof(search_paths[0]); - for (i = 0; i < num_search_paths; i++) { - snprintf(file_path, MAXPATHLEN, "%s/%s", search_paths[i], fname); diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix deleted file mode 100644 index fc2fa9b66487..000000000000 --- a/pkgs/development/libraries/libicns/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, libpng, openjpeg, zlib }: - -stdenv.mkDerivation { - pname = "libicns"; - version = "0.8.1-unstable-2022-04-10"; - - src = fetchgit { - name = "libicns"; - url = "https://git.code.sf.net/p/icns/code"; - rev = "921f972c461c505e5ac981aaddbdfdde97e8bb2b"; - hash = "sha256-YeO0rlTujDNmrdJ3DRyl3TORswF2KFKA+wVUxJo8Dno"; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libpng openjpeg zlib ]; - - meta = with lib; { - description = "Library for manipulation of the Mac OS icns resource format"; - homepage = "https://icns.sourceforge.io"; - license = with licenses; [ gpl2 lgpl2 lgpl21 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index b59887381f49..9bb60501a065 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { configureFlags = [ (lib.enableFeature enableStatic "static") (lib.enableFeature enableShared "shared") - ] ++ lib.optional stdenv.isFreeBSD "--with-pic"; + ] ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic"; passthru = { inherit setupHooks; }; diff --git a/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch b/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch deleted file mode 100644 index b1f9d0978cec..000000000000 --- a/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch +++ /dev/null @@ -1,13 +0,0 @@ -Common subdirectories: libid3tag-0.15.1b/msvc++ and libid3tag-0.15.1b-patched/msvc++ -diff -uwp libid3tag-0.15.1b/utf16.c libid3tag-0.15.1b-patched/utf16.c ---- libid3tag-0.15.1b/utf16.c 2004-01-23 10:41:32.000000000 +0100 -+++ libid3tag-0.15.1b-patched/utf16.c 2018-11-01 13:12:00.866050641 +0100 -@@ -250,6 +250,8 @@ id3_ucs4_t *id3_utf16_deserialize(id3_by - id3_ucs4_t *ucs4; - - end = *ptr + (length & ~1); -+ if (end == *ptr) -+ return 0; - - utf16 = malloc((length / 2 + 1) * sizeof(*utf16)); - if (utf16 == 0) diff --git a/pkgs/development/libraries/libid3tag/debian-patches.patch b/pkgs/development/libraries/libid3tag/debian-patches.patch deleted file mode 100644 index 0a828b334cf8..000000000000 --- a/pkgs/development/libraries/libid3tag/debian-patches.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/compat.gperf b/compat.gperf -index 4e24613..5635980 100644 ---- a/compat.gperf -+++ b/compat.gperf -@@ -236,6 +236,10 @@ int id3_compat_fixup(struct id3_tag *tag) - - encoding = id3_parse_uint(&data, 1); - string = id3_parse_string(&data, end - data, encoding, 0); -+ if (!string) -+ { -+ continue; -+ } - - if (id3_ucs4_length(string) < 4) { - free(string); -diff --git a/genre.dat b/genre.dat -index 17acab5..1f02779 100644 ---- a/genre.dat -+++ b/genre.dat -@@ -277,8 +277,8 @@ static id3_ucs4_t const genre_PUNK_ROCK[] = - { 'P', 'u', 'n', 'k', ' ', 'R', 'o', 'c', 'k', 0 }; - static id3_ucs4_t const genre_DRUM_SOLO[] = - { 'D', 'r', 'u', 'm', ' ', 'S', 'o', 'l', 'o', 0 }; --static id3_ucs4_t const genre_A_CAPPELLA[] = -- { 'A', ' ', 'C', 'a', 'p', 'p', 'e', 'l', 'l', 'a', 0 }; -+static id3_ucs4_t const genre_A_CAPELLA[] = -+ { 'A', ' ', 'C', 'a', 'p', 'e', 'l', 'l', 'a', 0 }; - static id3_ucs4_t const genre_EURO_HOUSE[] = - { 'E', 'u', 'r', 'o', '-', 'H', 'o', 'u', 's', 'e', 0 }; - static id3_ucs4_t const genre_DANCE_HALL[] = -@@ -452,7 +452,7 @@ static id3_ucs4_t const *const genre_table[] = { - genre_DUET, - genre_PUNK_ROCK, - genre_DRUM_SOLO, -- genre_A_CAPPELLA, -+ genre_A_CAPELLA, - genre_EURO_HOUSE, - genre_DANCE_HALL, - genre_GOA, -diff --git a/genre.dat.in b/genre.dat.in -index 872de40..e71e34b 100644 ---- a/genre.dat.in -+++ b/genre.dat.in -@@ -153,7 +153,7 @@ Freestyle - Duet - Punk Rock - Drum Solo --A Cappella -+A Capella - Euro-House - Dance Hall - Goa -diff --git a/parse.c b/parse.c -index 86a3f21..947c249 100644 ---- a/parse.c -+++ b/parse.c -@@ -165,6 +165,9 @@ id3_ucs4_t *id3_parse_string(id3_byte_t const **ptr, id3_length_t length, - case ID3_FIELD_TEXTENCODING_UTF_8: - ucs4 = id3_utf8_deserialize(ptr, length); - break; -+ default: -+ /* FIXME: Unknown encoding! Print warning? */ -+ return NULL; - } - - if (ucs4 && !full) { -diff --git a/utf16.c b/utf16.c -index 70ee9d5..6e60a75 100644 ---- a/utf16.c -+++ b/utf16.c -@@ -282,5 +282,18 @@ id3_ucs4_t *id3_utf16_deserialize(id3_byte_t const **ptr, id3_length_t length, - - free(utf16); - -+ if (end == *ptr && length % 2 != 0) -+ { -+ /* We were called with a bogus length. It should always -+ * be an even number. We can deal with this in a few ways: -+ * - Always give an error. -+ * - Try and parse as much as we can and -+ * - return an error if we're called again when we -+ * already tried to parse everything we can. -+ * - tell that we parsed it, which is what we do here. -+ */ -+ (*ptr)++; -+ } -+ - return ucs4; - } \ No newline at end of file diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix deleted file mode 100644 index c8c9d8bf5103..000000000000 --- a/pkgs/development/libraries/libid3tag/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchurl, zlib, gperf_3_0 }: - -stdenv.mkDerivation rec { - pname = "libid3tag"; - version = "0.15.1b"; - - src = fetchurl { - url = "mirror://sourceforge/mad/libid3tag-${version}.tar.gz"; - sha256 = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"; - }; - - outputs = [ "out" "dev" ]; - setOutputFlags = false; - - strictDeps = true; - - nativeBuildInputs = [ gperf_3_0 ]; - - buildInputs = [ zlib ]; - - patches = [ - ./debian-patches.patch - ./CVE-2017-11550-and-CVE-2017-11551.patch - ]; - - preConfigure = '' - configureFlagsArray+=( - --includedir=$dev/include - ) - ''; - - postInstall = '' - mkdir -p $dev/lib/pkgconfig - cp ${./id3tag.pc} $dev/lib/pkgconfig/id3tag.pc - substituteInPlace $dev/lib/pkgconfig/id3tag.pc \ - --subst-var-by out $out \ - --subst-var-by dev $dev \ - --subst-var-by version "${version}" - ''; - - meta = with lib; { - description = "ID3 tag manipulation library"; - homepage = "https://mad.sourceforge.net/"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libid3tag/id3tag.pc b/pkgs/development/libraries/libid3tag/id3tag.pc deleted file mode 100644 index e3df7b3f9df0..000000000000 --- a/pkgs/development/libraries/libid3tag/id3tag.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@out@ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=@dev@/include - -Name: libid3tag -Description: ID3 tag manipulation library -Version: @version@ - -Libs: -L${libdir} -lid3tag -Cflags: -I${includedir} diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix deleted file mode 100644 index 916d6d0ad687..000000000000 --- a/pkgs/development/libraries/libidn/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ fetchurl, lib, stdenv, libiconv -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libidn"; - version = "1.42"; - - src = fetchurl { - url = "mirror://gnu/libidn/libidn-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-1sGZ3NgG5P4nk2DLSwg0mg05Vg7VSP/RzK3ajN7LRyM="; - }; - - outputs = [ "bin" "dev" "out" "info" "devdoc" ]; - - hardeningDisable = [ "format" ]; - - buildInputs = lib.optional stdenv.isDarwin libiconv; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = { - homepage = "https://www.gnu.org/software/libidn/"; - description = "Library for internationalized domain names"; - - longDescription = '' - GNU Libidn is a fully documented implementation of the - Stringprep, Punycode and IDNA specifications. Libidn's purpose - is to encode and decode internationalized domain names. The - native C, C\# and Java libraries are available under the GNU - Lesser General Public License version 2.1 or later. - - The library contains a generic Stringprep implementation. - Profiles for Nameprep, iSCSI, SASL, XMPP and Kerberos V5 are - included. Punycode and ASCII Compatible Encoding (ACE) via IDNA - are supported. A mechanism to define Top-Level Domain (TLD) - specific validation tables, and to compare strings against those - tables, is included. Default tables for some TLDs are also - included. - ''; - - mainProgram = "idn"; - license = lib.licenses.lgpl2Plus; - pkgConfigModules = [ "libidn" ]; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ lsix ]; - }; -}) diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index bfe9c2a24264..90c7198757c7 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { # The above patch causes the documentation to be regenerated, so the # documentation tools are required. - nativeBuildInputs = lib.optionals stdenv.isDarwin [ help2man texinfo ]; - buildInputs = [ libunistring ] ++ lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ help2man texinfo ]; + buildInputs = [ libunistring ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; depsBuildBuild = [ buildPackages.stdenv.cc ]; meta = { diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix deleted file mode 100644 index 911210202fe0..000000000000 --- a/pkgs/development/libraries/libiec61883/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libraw1394 }: - -stdenv.mkDerivation rec { - version = "1.2.0"; - pname = "libiec61883"; - - src = fetchurl { - url = "mirror://debian/pool/main/libi/libiec61883/libiec61883_${version}.orig.tar.gz"; - name = "libiec61883-${version}.tar.gz"; - sha256 = "7c7879c6b9add3148baea697dfbfdcefffbc8ac74e8e6bcf46125ec1d21b373a"; - }; - - nativeBuildInputs = [ pkg-config ]; - - propagatedBuildInputs = [ libraw1394 ]; - - meta = with lib; { - homepage = "https://www.linux1394.org"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libieee1284/default.nix b/pkgs/development/libraries/libieee1284/default.nix deleted file mode 100644 index c49e42523137..000000000000 --- a/pkgs/development/libraries/libieee1284/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl -, autoconf, automake, libtool, xmlto, docbook_xml_dtd_412, docbook_xsl -}: - -stdenv.mkDerivation rec { - pname = "libieee1284"; - version = "0.2.11"; - - src = fetchFromGitHub { - owner = "twaugh"; - repo = pname; - rev = "V${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "0wfv1prmhhpyll9l4g1ij3im7hk9mm96ydw3l9fvhjp3993cdn2x"; - }; - - patches = [ - (fetchurl { - name = "musl.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/libieee1284/files/libieee1284-0.2.11-don-t-blindly-assume-outb_p-to-be-available.patch"; - hash = "sha256-sNu0OPBMa9GIwSu754noateF4FZC14f+8YRgYUl13KQ="; - }) - ]; - - nativeBuildInputs = [ - autoconf - automake - libtool - xmlto - docbook_xml_dtd_412 - docbook_xsl - ]; - - configureFlags = [ - "--without-python" - ]; - - prePatch = '' - ./bootstrap - ''; - - meta = with lib; { - description = "Parallel port communication library"; - mainProgram = "libieee1284_test"; - homepage = "http://cyberelk.net/tim/software/libieee1284/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 8adc01512040..023dfce86bf5 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { libxml2 libusb1 ] ++ lib.optional avahiSupport avahi - ++ lib.optional stdenv.isLinux libaio - ++ lib.optionals stdenv.isDarwin [ CFNetwork CoreServices ]; + ++ lib.optional stdenv.hostPlatform.isLinux libaio + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CFNetwork CoreServices ]; cmakeFlags = [ "-DUDEV_RULES_INSTALL_DIR=${placeholder "out"}/lib/udev/rules.d" diff --git a/pkgs/development/libraries/libimagequant/Cargo.lock b/pkgs/development/libraries/libimagequant/Cargo.lock deleted file mode 100644 index 4925fc1a9e31..000000000000 --- a/pkgs/development/libraries/libimagequant/Cargo.lock +++ /dev/null @@ -1,282 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[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", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "bitflags" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" - -[[package]] -name = "bytemuck" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" - -[[package]] -name = "c_test" -version = "0.1.0" -dependencies = [ - "cc", - "imagequant-sys", -] - -[[package]] -name = "cc" -version = "1.0.97" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "crc32fast" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" -dependencies = [ - "cfg-if", -] - -[[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-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "either" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" - -[[package]] -name = "fallible_collections" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88c69768c0a15262df21899142bc6df9b9b823546d4b4b9a7bc2d6c448ec6fd" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "flate2" -version = "1.0.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash", -] - -[[package]] -name = "imagequant" -version = "4.3.1" -dependencies = [ - "arrayvec", - "lodepng", - "once_cell", - "rayon", - "rgb", - "thread_local", -] - -[[package]] -name = "imagequant-sys" -version = "4.0.4" -dependencies = [ - "bitflags", - "imagequant", - "libc", -] - -[[package]] -name = "libc" -version = "0.2.154" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" - -[[package]] -name = "lodepng" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a42d298694b14401847de29abd44adf278b42e989e516deac7b72018400002d8" -dependencies = [ - "crc32fast", - "fallible_collections", - "flate2", - "libc", - "rgb", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "proc-macro2" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[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-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "rgb" -version = "0.8.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "syn" -version = "2.0.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ad3dee41f36859875573074334c200d1add8e4a87bb37113ebd31d926b7b11f" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "zerocopy" -version = "0.7.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix deleted file mode 100644 index f4e3512bdb76..000000000000 --- a/pkgs/development/libraries/libimagequant/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rust -, rustPlatform -, cargo-c -, python3 - -# tests -, testers -, vips -, libimagequant -}: - -rustPlatform.buildRustPackage rec { - pname = "libimagequant"; - version = "4.3.1"; - - src = fetchFromGitHub { - owner = "ImageOptim"; - repo = "libimagequant"; - rev = version; - hash = "sha256-dau+oGwcyN7AA1jEBtCgYV/cmrx5Wo3koKXbloYagrw="; - }; - - cargoLock = { - # created it by running `cargo update` in the source tree. - lockFile = ./Cargo.lock; - }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - - nativeBuildInputs = [ cargo-c ]; - - postBuild = '' - pushd imagequant-sys - ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} - popd - ''; - - postInstall = '' - pushd imagequant-sys - ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} - popd - ''; - - passthru.tests = { - inherit vips; - inherit (python3.pkgs) pillow; - - pkg-config = testers.hasPkgConfigModules { - package = libimagequant; - moduleNames = [ "imagequant" ]; - }; - }; - - meta = with lib; { - homepage = "https://pngquant.org/lib/"; - description = "Image quantization library"; - longDescription = "Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images."; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ ma9e ]; - }; -} diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix deleted file mode 100644 index a1f7f50a2575..000000000000 --- a/pkgs/development/libraries/libime/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchFromGitHub -, cmake -, extra-cmake-modules -, boost -, python3 -, fcitx5 -, zstd -}: - -let - tableVer = "20240108"; - table = fetchurl { - url = "https://download.fcitx-im.org/data/table-${tableVer}.tar.gz"; - hash = "sha256-cpxZbYaQfecnx00Pw/0kHEBsXevStMt07v4CI4funa4="; - }; - arpaVer = "20230712"; - arpa = fetchurl { - url = "https://download.fcitx-im.org/data/lm_sc.arpa-${arpaVer}.tar.xz"; - hash = "sha256-ut1iwWxjc3h6D9qPCc1FLRL2DVhohW9lHO7PGge6ujI="; - }; - dictVer = "20240416"; - dict = fetchurl { - url = "https://download.fcitx-im.org/data/dict-${dictVer}.tar.zst"; - hash = "sha256-nCYsv6MGy0w7BVmRt+IrRT4PJn8gzrXZ2eX4++Ty02c="; - }; -in -stdenv.mkDerivation rec { - pname = "libime"; - version = "1.1.8"; - - src = fetchFromGitHub { - owner = "fcitx"; - repo = "libime"; - rev = version; - hash = "sha256-uT0V1CXPaF2FctsndxVszS7Qske6vObbOA4aOnmbdQY="; - fetchSubmodules = true; - }; - - prePatch = '' - ln -s ${table} data/$(stripHash ${table}) - ln -s ${arpa} data/$(stripHash ${arpa}) - ln -s ${dict} data/$(stripHash ${dict}) - ''; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - python3 - ]; - - buildInputs = [ - zstd - boost - fcitx5 - ]; - - meta = with lib; { - description = "Library to support generic input method implementation"; - homepage = "https://github.com/fcitx/libime"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ poscat ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libimobiledevice-glue/default.nix b/pkgs/development/libraries/libimobiledevice-glue/default.nix deleted file mode 100644 index 13a2e83d0473..000000000000 --- a/pkgs/development/libraries/libimobiledevice-glue/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config -, libplist -, nix-update-script -}: - -stdenv.mkDerivation rec { - pname = "libimobiledevice-glue"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "libimobiledevice"; - repo = pname; - rev = version; - hash = "sha256-+poCrn2YHeH8RQCfWDdnlmJB4Nf+unWUVwn7YwILHIs="; - }; - - preAutoreconf = '' - export RELEASE_VERSION=${version} - ''; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - propagatedBuildInputs = [ - libplist - ]; - - outputs = [ "out" "dev" ]; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - homepage = "https://github.com/libimobiledevice/libimobiledevice-glue"; - description = "Library with common code used by the libraries and tools around the libimobiledevice project"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index 0e81f32bebf8..88b9391d4bdb 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { libtasn1 libusbmuxd libimobiledevice-glue - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ SystemConfiguration CoreFoundation ]; diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix deleted file mode 100644 index 767b7a1d8cf2..000000000000 --- a/pkgs/development/libraries/libindicator/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, fetchurl, lib, file -, pkg-config, glib -, gtkVersion ? "3", gtk2, gtk3 }: - -stdenv.mkDerivation rec { - pname = "libindicator-gtk${gtkVersion}"; - version = "12.10.1"; - - src = fetchurl { - url = "https://launchpad.net/libindicator/${lib.versions.majorMinor version}/${version}/+download/libindicator-${version}.tar.gz"; - sha256 = "b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f"; - }; - - strictDeps = true; - - nativeBuildInputs = [ pkg-config glib ]; - - buildInputs = [ (if gtkVersion == "2" then gtk2 else gtk3) ]; - - postPatch = '' - substituteInPlace configure \ - --replace 'LIBINDICATOR_LIBS+="$LIBM"' 'LIBINDICATOR_LIBS+=" $LIBM"' - for f in {build-aux/ltmain.sh,configure,m4/libtool.m4}; do - substituteInPlace $f\ - --replace /usr/bin/file ${file}/bin/file - done - ''; - - configureFlags = [ - "CFLAGS=-Wno-error" - "--sysconfdir=/etc" - "--localstatedir=/var" - "--with-gtk=${gtkVersion}" - ]; - - installFlags = [ - "sysconfdir=\${out}/etc" - "localstatedir=\${TMPDIR}" - ]; - - doCheck = false; # fails 8 out of 8 tests - - meta = with lib; { - description = "Set of symbols and convenience functions for Ayatana indicators"; - homepage = "https://launchpad.net/libindicator"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.msteen ]; - }; -} diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix deleted file mode 100644 index e720ee8b0726..000000000000 --- a/pkgs/development/libraries/libinfinity/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ gtkWidgets ? false # build GTK widgets for libinfinity -, avahiSupport ? false # build support for Avahi in libinfinity -, lib, stdenv, fetchurl, pkg-config, glib, libxml2, gnutls, gsasl -, gobject-introspection -, gtk3 ? null, gtk-doc, docbook_xsl, docbook_xml_dtd_412, avahi ? null, libdaemon, libidn, gss -, libintl }: - -assert avahiSupport -> avahi != null; -assert gtkWidgets -> gtk3 != null; - -let - self = stdenv.mkDerivation rec { - pname = "libinfinity"; - version = "0.7.2"; - src = fetchurl { - url = "https://github.com/gobby/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "17i3g61hxz9pzl3ryd1yr15142r25m06jfzjrpdy7ic1b8vjjw3f"; - }; - - outputs = [ "bin" "out" "dev" "man" "devdoc" ]; - - nativeBuildInputs = [ pkg-config gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; - buildInputs = [ glib libxml2 gsasl libidn gss libintl libdaemon ] - ++ lib.optional gtkWidgets gtk3 - ++ lib.optional avahiSupport avahi; - - propagatedBuildInputs = [ gnutls ]; - - configureFlags = [ - (lib.enableFeature true "gtk-doc") - (lib.enableFeature true "introspection") - (lib.withFeature gtkWidgets "inftextgtk") - (lib.withFeature gtkWidgets "infgtk") - (lib.withFeature true "infinoted") - (lib.withFeature true "libdaemon") - (lib.withFeature avahiSupport "avahi") - ]; - - passthru = { - infinoted = "${self.bin}/bin/infinoted-${lib.versions.majorMinor version}"; - }; - - meta = { - homepage = "https://gobby.github.io/"; - description = "Implementation of the Infinote protocol written in GObject-based C"; - mainProgram = "infinoted-0.7"; - license = lib.licenses.lgpl2Plus; - maintainers = [ ]; - platforms = with lib.platforms; linux ++ darwin; - }; - }; -in self diff --git a/pkgs/development/libraries/libinjection/default.nix b/pkgs/development/libraries/libinjection/default.nix deleted file mode 100644 index d4193f32ccc0..000000000000 --- a/pkgs/development/libraries/libinjection/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, python3 -}: - -stdenv.mkDerivation rec { - pname = "libinjection"; - version = "3.10.0"; - - src = fetchFromGitHub { - owner = "client9"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "0chsgam5dqr9vjfhdcp8cgk7la6nf3lq44zs6z6si98cq743550g"; - }; - - nativeBuildInputs = [ python3 ]; - - strictDeps = true; - - patches = [ - (fetchpatch { - name = "support-python3-for-building"; - url = "https://raw.githubusercontent.com/sysown/proxysql/bed58f92917eb651b80fd8ffa627a485eb320805/deps/libinjection/update-build-py3.diff"; - hash = "sha256-SPdf57FIDDNpatWe5pjhAiZl5yPMDEv50k0Wj+eWTEM="; - }) - ]; - - postPatch = '' - patchShebangs src - substituteInPlace src/Makefile \ - --replace /usr/local $out - ''; - - configurePhase = "cd src"; - buildPhase = "make all"; - - # no binaries, so out = library, dev = headers - outputs = [ "out" "dev" ]; - - meta = with lib; { - description = "SQL / SQLI tokenizer parser analyzer"; - homepage = "https://github.com/client9/libinjection"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice ]; - }; -} diff --git a/pkgs/development/libraries/libinklevel/default.nix b/pkgs/development/libraries/libinklevel/default.nix deleted file mode 100644 index 945fa0df5962..000000000000 --- a/pkgs/development/libraries/libinklevel/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libusb1 }: - -stdenv.mkDerivation rec { - pname = "libinklevel"; - version = "0.9.4"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-J0cEaC5v4naO4GGUzdfV55kB7KzA+q+v64i5y5Xbp9Q="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libusb1 - ]; - - outputs = [ "out" "dev" "doc" ]; - - meta = with lib; { - description = "Library for checking the ink level of your printer"; - longDescription = '' - Libinklevel is a library for checking the ink level of your printer on a - system which runs Linux or FreeBSD. It supports printers attached via - USB. Currently printers of the following brands are supported: HP, Epson - and Canon. Canon BJNP network printers are supported too. This is not - official software from the printer manufacturers. The goal of this - project is to create a vendor independent API for retrieving the ink - level of a printer connected to a Linux or FreeBSD box. - ''; - homepage = "https://libinklevel.sourceforge.net/"; - license = licenses.gpl2; - platforms = platforms.linux ++ platforms.freebsd; - maintainers = with maintainers; [ samb96 ]; - }; -} diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/development/libraries/libinotify-kqueue/default.nix deleted file mode 100644 index 3d73ace3c925..000000000000 --- a/pkgs/development/libraries/libinotify-kqueue/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "libinotify-kqueue"; - version = "20180201"; - - src = fetchFromGitHub { - owner = "libinotify-kqueue"; - repo = "libinotify-kqueue"; - rev = version; - sha256 = "sha256-9A5s8rPGlRv3KbxOukk0VB2IQrDxVjklO5RB+IA1cDY="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - doCheck = true; - checkFlags = [ "test" ]; - - meta = with lib; { - description = "Inotify shim for macOS and BSD"; - homepage = "https://github.com/libinotify-kqueue/libinotify-kqueue"; - license = licenses.mit; - 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 0021f08aa5e2..bc8977c70882 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -22,6 +22,7 @@ , valgrind , python3 , nixosTests +, wayland-scanner }: let @@ -86,6 +87,7 @@ stdenv.mkDerivation rec { cairo glib gtk3 + wayland-scanner ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/libinsane/default.nix b/pkgs/development/libraries/libinsane/default.nix deleted file mode 100644 index a83268ca31ad..000000000000 --- a/pkgs/development/libraries/libinsane/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv -, lib -, meson -, ninja -, fetchFromGitLab -, pkg-config -, glib -, docbook_xsl -, sane-backends -, gobject-introspection -, vala -, gtk-doc -, valgrind -, doxygen -, cunit -}: - -stdenv.mkDerivation rec { - pname = "libinsane"; - version = "1.0.10"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - repo = "libinsane"; - group = "World"; - owner = "OpenPaperwork"; - rev = version; - sha256 = "sha256-2BLg8zB0InPJqK9JypQIMVXIJndo9ZuNB4OeOAo/Hsc="; - }; - - nativeBuildInputs = [ meson pkg-config ninja doxygen gtk-doc docbook_xsl gobject-introspection vala ]; - - buildInputs = [ sane-backends glib ]; - - nativeCheckInputs = [ cunit valgrind ]; - - doCheck = true; - - meta = { - description = "Crossplatform access to image scanners (paper eaters only)"; - homepage = "https://openpaper.work/en/projects/"; - license = lib.licenses.lgpl3Plus; - maintainers = [ lib.maintainers.symphorien ]; - }; -} diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index 6d6d7d46576d..c059d619ccae 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals useGTK [ gtk2 ] - ++ lib.optional stdenv.isDarwin Carbon; + ++ lib.optional stdenv.hostPlatform.isDarwin Carbon; preBuild = '' diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix deleted file mode 100644 index e6ddb9b471c7..000000000000 --- a/pkgs/development/libraries/libipfix/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation { - pname = "libipfix"; - version = "110209"; - src = fetchurl { - url = "mirror://sourceforge/libipfix/files/libipfix/libipfix_110209.tgz"; - sha256 = "0h7v0sxjjdc41hl5vq2x0yhyn04bczl11bqm97825mivrvfymhn6"; - }; - - # Workaround build failure on -fno-common toolchains: - # ld: ../libmisc/libmisc.a(mlog.o):/build/libipfix_110209/libmisc/misc.h:111: multiple definition of - # `ht_globals'; collector.o:/build/libipfix_110209/collector/../libmisc/misc.h:111: first defined here - # TODO: drop the workaround when fix ix released: - # https://sourceforge.net/p/libipfix/code/ci/a501612c6b8ac6f2df16b366f7a92211382bae6b/ - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - meta = with lib; { - homepage = "https://libipfix.sourceforge.net/"; - description = "Libipfix C-library implements the IPFIX protocol defined by the IP Flow Information Export working group of the IETF"; - mainProgram = "ipfix_collector"; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ lewo ]; - }; -} diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/development/libraries/libipt/default.nix deleted file mode 100644 index 61ec0ce67d88..000000000000 --- a/pkgs/development/libraries/libipt/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, freebsd }: - -stdenv.mkDerivation rec { - pname = "libipt"; - version = "2.1.1"; - - src = fetchFromGitHub { - owner = "intel"; - repo = "libipt"; - rev = "v${version}"; - sha256 = "sha256-tyOheitSlccf/n3mklGL2oAKLBKYT60LSLre9/G/b9Q="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional stdenv.isFreeBSD freebsd.libstdthreads; - - meta = with lib; { - description = "Intel Processor Trace decoder library"; - homepage = "https://github.com/intel/libipt"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ orivej ]; - }; -} diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/development/libraries/libiptcdata/default.nix deleted file mode 100644 index f6f918c1d522..000000000000 --- a/pkgs/development/libraries/libiptcdata/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, libiconv -, libintl -}: - -stdenv.mkDerivation rec { - pname = "libiptcdata"; - version = "1.0.5"; - - src = fetchFromGitHub { - owner = "ianw"; - repo = pname; - rev = "release_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-ZjokepDAHiSEwXrkvM9qUAPcpIiRQoOsv7REle7roPU="; - }; - - postPatch = '' - # gtk-doc doesn't build without network access - sed -i '/GTK_DOC_CHECK/d;/docs/d' configure.ac - sed -i 's/docs//' Makefile.am - ''; - - nativeBuildInputs = [ - autoreconfHook - ]; - - buildInputs = lib.optionals stdenv.isDarwin [ - libiconv - libintl - ]; - - meta = with lib; { - description = "Library for reading and writing the IPTC metadata in images and other files"; - mainProgram = "iptc"; - homepage = "https://github.com/ianw/libiptcdata"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ wegank ]; - }; -} diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix deleted file mode 100644 index 9d64b53c13f4..000000000000 --- a/pkgs/development/libraries/libircclient/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - version = "1.10"; - pname = "libircclient"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "0b9wa0h3xc31wpqlvgxgnvqp5wgx3kwsf5s9432m5cj8ycx6zcmv"; - }; - - outputs = [ "out" "dev" ]; - - configureFlags = [ "--enable-shared" ]; - - postPatch = '' - substituteInPlace src/Makefile.in \ - --replace "@prefix@/include" "@prefix@/include/libircclient" \ - --replace "@libdir@" "@prefix@/lib" \ - --replace "cp " "install " - ''; - - meta = with lib; { - description = "Small but extremely powerful library which implements the client IRC protocol"; - homepage = "http://www.ulduzsoft.com/libircclient/"; - license = licenses.lgpl3; - maintainers = with maintainers; [ obadz ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix deleted file mode 100644 index 45a4a2b93acf..000000000000 --- a/pkgs/development/libraries/libirecovery/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config -, libusb1 -, readline -, libimobiledevice-glue -}: - -stdenv.mkDerivation rec { - pname = "libirecovery"; - version = "1.2.0"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "libimobiledevice"; - repo = pname; - rev = version; - hash = "sha256-3C66oNjIZA6Byf1Y2cVQUSLz6Css1y4xFZuQmo7QxMo="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ - libusb1 - readline - libimobiledevice-glue - ]; - - preAutoreconf = '' - export RELEASE_VERSION=${version} - ''; - - # Packager note: Not clear whether this needs a NixOS configuration, - # as only the `idevicerestore` binary was tested so far (which worked - # without further configuration). - configureFlags = [ - "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d" - ''--with-udevrule="OWNER=\"root\", GROUP=\"myusergroup\", MODE=\"0660\""'' - ]; - - meta = with lib; { - description = "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux"; - longDescription = '' - libirecovery is a cross-platform library which implements communication to - iBoot/iBSS found on Apple's iOS devices via USB. A command-line utility is also - provided. - ''; - homepage = "https://github.com/libimobiledevice/libirecovery"; - license = licenses.lgpl21Only; - maintainers = with maintainers; [ nh2 ]; - mainProgram = "irecovery"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libiscsi/default.nix b/pkgs/development/libraries/libiscsi/default.nix deleted file mode 100644 index 1008037c60cc..000000000000 --- a/pkgs/development/libraries/libiscsi/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "libiscsi"; - version = "1.20.0"; - - src = fetchFromGitHub { - owner = "sahlberg"; - repo = "libiscsi"; - rev = version; - sha256 = "sha256-idiK9JowKhGAk5F5qJ57X14Q2Y0TbIKRI02onzLPkas="; - }; - - postPatch = '' - substituteInPlace lib/socket.c \ - --replace-fail "void iscsi_decrement_iface_rr() {" "void iscsi_decrement_iface_rr(void) {" - ''; - - nativeBuildInputs = [ autoreconfHook ]; - - env = lib.optionalAttrs (stdenv.is32bit || stdenv.isDarwin) { - # iscsi-discard.c:223:57: error: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] - NIX_CFLAGS_COMPILE = "-Wno-error=format"; - }; - - meta = with lib; { - description = "iscsi client library and utilities"; - homepage = "https://github.com/sahlberg/libiscsi"; - license = licenses.lgpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ misuzu ]; - }; -} diff --git a/pkgs/development/libraries/libisds/default.nix b/pkgs/development/libraries/libisds/default.nix deleted file mode 100644 index 4c61e3c48868..000000000000 --- a/pkgs/development/libraries/libisds/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv -, fetchurl -, expat -, gpgme -, libgcrypt -, libxml2 -, libxslt -, curl -, docbook_xsl -}: - -stdenv.mkDerivation rec { - pname = "libisds"; - version = "0.11.2"; - - src = fetchurl { - url = "http://xpisar.wz.cz/${pname}/dist/${pname}-${version}.tar.xz"; - sha256 = "sha256-YUb4N7J7EaYHHiFI965kUhtNitRTJfmY/ns3MTfkGPs="; - }; - - configureFlags = [ - "--with-docbook-xsl-stylesheets=${docbook_xsl}/xml/xsl/docbook" - ]; - - buildInputs = [ expat gpgme libgcrypt libxml2 libxslt curl docbook_xsl ]; - - NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; - - meta = with lib; { - description = "Client library for accessing SOAP services of Czech government-provided Databox infomation system"; - homepage = "http://xpisar.wz.cz/libisds/"; - license = licenses.lgpl3; - maintainers = [ maintainers.mmahut ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix deleted file mode 100644 index 8b70a3b715f6..000000000000 --- a/pkgs/development/libraries/libite/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libconfuse }: - -stdenv.mkDerivation rec { - pname = "libite"; - version = "2.6.1"; - - src = fetchFromGitHub { - owner = "troglobit"; - repo = "libite"; - rev = "v${version}"; - sha256 = "sha256-q1NoHSiPmFPwkTJqg3L5fEBXF/JjRWvA9e4d532ILE8="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libconfuse ]; - - meta = with lib; { - description = "Lightweight library of frog DNA"; - longDescription = '' - Libite is a lightweight library of frog DNA. It can be used to fill - the gaps in any dinosaur project. It holds useful functions and macros - developed by both Finit and the OpenBSD project. Most notably the - string functions: strlcpy(3), strlcat(3) and the highly useful *BSD - sys/queue.h and sys/tree.h API's. - - Libite is the frog DNA missing in GNU libc. However, -lite does not - aim to become another GLIB! One noticeable gap in GLIBC is the missing - _SAFE macros in the BSD sys/queue.h API — highly recommended when - traversing lists to delete/free nodes. - ''; - homepage = "https://github.com/troglobit/libite"; - platforms = with platforms; linux ++ netbsd; - maintainers = with maintainers; [ fpletz ]; - license = with licenses; [ mit isc bsd2 bsd3 ]; - }; -} - diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix deleted file mode 100644 index 52084508620c..000000000000 --- a/pkgs/development/libraries/libivykis/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, file, protobufc }: - -stdenv.mkDerivation rec { - pname = "libivykis"; - - version = "0.43.1"; - - src = fetchurl { - url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz"; - sha256 = "sha256-x9Kxi9k0Ln7f0T4OOKaNv+qm0x6S4+Z3K6o5Qp3+u58="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ file protobufc ]; - - meta = with lib; { - homepage = "https://libivykis.sourceforge.net/"; - description = '' - A thin wrapper over various OS'es implementation of I/O readiness - notification facilities - ''; - license = licenses.zlib; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libixp/default.nix b/pkgs/development/libraries/libixp/default.nix deleted file mode 100644 index 7d235d7a7649..000000000000 --- a/pkgs/development/libraries/libixp/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, unzip, txt2tags }: - -stdenv.mkDerivation rec { - pname = "libixp"; - version = "unstable-2022-04-04"; - - src = fetchFromGitHub { - owner = "0intro"; - repo = "libixp"; - rev = "ca2acb2988e4f040022f0e2094c69ab65fa6ec53"; - hash = "sha256-S25DmXJ7fN0gXLV0IzUdz8hXPTYEHmaSG7Mnli6GQVc="; - }; - - postPatch = lib.optionalString stdenv.cc.isClang '' - substituteInPlace mk/ixp.mk \ - --replace "©" "C " - ''; - - postConfigure = '' - sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk - ''; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ txt2tags ]; - - meta = { - homepage = "https://github.com/0intro/libixp"; - description = "Portable, simple C-language 9P client and server library"; - mainProgram = "ixpc"; - maintainers = with lib.maintainers; [ kovirobi ]; - license = lib.licenses.mit; - platforms = with lib.platforms; unix; - }; -} diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix deleted file mode 100644 index 79a419451de2..000000000000 --- a/pkgs/development/libraries/libjcat/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, docbook_xml_dtd_43 -, docbook-xsl-nons -, glib -, json-glib -, gnutls -, gpgme -, gobject-introspection -, vala -, gtk-doc -, meson -, ninja -, pkg-config -, python3 -, nixosTests -}: - -stdenv.mkDerivation rec { - pname = "libjcat"; - version = "0.2.1"; - - outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; - - src = fetchFromGitHub { - owner = "hughsie"; - repo = "libjcat"; - rev = version; - sha256 = "sha256-tCXz62MEqYBnrx2RxlTBwKGTahfhUCVdet4VnXw5klQ="; - }; - - patches = [ - # Installed tests are installed to different output - ./installed-tests-path.patch - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - docbook_xml_dtd_43 - docbook-xsl-nons - gobject-introspection - vala - gnutls - gtk-doc - python3 - ]; - - buildInputs = [ - glib - json-glib - gnutls - gpgme - ]; - - mesonFlags = [ - "-Dgtkdoc=true" - "-Dinstalled_test_prefix=${placeholder "installedTests"}" - ]; - - doCheck = true; - - passthru = { - tests = { - installed-tests = nixosTests.installed-tests.libjcat; - }; - }; - - meta = with lib; { - description = "Library for reading and writing Jcat files"; - mainProgram = "jcat-tool"; - homepage = "https://github.com/hughsie/libjcat"; - license = licenses.lgpl21Plus; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libjcat/installed-tests-path.patch b/pkgs/development/libraries/libjcat/installed-tests-path.patch deleted file mode 100644 index d199f91385f5..000000000000 --- a/pkgs/development/libraries/libjcat/installed-tests-path.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/meson.build b/meson.build -index f69968d..d1d6c6e 100644 ---- a/meson.build -+++ b/meson.build -@@ -114,8 +114,8 @@ else - datadir = join_paths(prefix, get_option('datadir')) - localstatedir = join_paths(prefix, get_option('localstatedir')) - libexecdir = join_paths(prefix, get_option('libexecdir')) -- installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name()) -- installed_test_datadir = join_paths(datadir, 'installed-tests', meson.project_name()) -+ installed_test_bindir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name()) -+ installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name()) - endif - mandir = join_paths(prefix, get_option('mandir')) - localedir = join_paths(prefix, get_option('localedir')) -diff --git a/meson_options.txt b/meson_options.txt -index 4784300..d382fc1 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,3 +1,4 @@ -+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') - option('gtkdoc', type : 'boolean', value : false, description : 'enable developer documentation') - option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data') - option('tests', type : 'boolean', value : true, description : 'enable tests') diff --git a/pkgs/development/libraries/libjodycode/default.nix b/pkgs/development/libraries/libjodycode/default.nix index 28a564c9bc91..acac78266f88 100644 --- a/pkgs/development/libraries/libjodycode/default.nix +++ b/pkgs/development/libraries/libjodycode/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://codeberg.org/jbruchon/libjodycode"; changelog = "https://codeberg.org/jbruchon/libjodycode/src/branch/master/CHANGES.txt"; license = lib.licenses.mit; + platforms = lib.platforms.all; maintainers = with lib.maintainers; [ pbsds ]; }; }) diff --git a/pkgs/development/libraries/libjpeg-turbo/0001-Compile-transupp.c-as-part-of-the-library.patch b/pkgs/development/libraries/libjpeg-turbo/0001-Compile-transupp.c-as-part-of-the-library.patch deleted file mode 100644 index 552914a51cd5..000000000000 --- a/pkgs/development/libraries/libjpeg-turbo/0001-Compile-transupp.c-as-part-of-the-library.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6442d11617f95d13e2a371bd3e01f5082a9c356d Mon Sep 17 00:00:00 2001 -From: Las <las@protonmail.ch> -Date: Sun, 3 Jan 2021 18:35:37 +0000 -Subject: [PATCH] Compile transupp.c as part of the library - ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index adb0ca45..46fc16dd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -581,7 +581,7 @@ set(JPEG_SOURCES ${JPEG12_SOURCES} jcapimin.c jchuff.c jcicc.c jcinit.c - jclhuff.c jcmarker.c jcmaster.c jcomapi.c jcparam.c jcphuff.c jctrans.c - jdapimin.c jdatadst.c jdatasrc.c jdhuff.c jdicc.c jdinput.c jdlhuff.c - jdmarker.c jdmaster.c jdphuff.c jdtrans.c jerror.c jfdctflt.c jmemmgr.c -- jmemnobs.c jpeg_nbits.c) -+ jmemnobs.c jpeg_nbits.c transupp.c) - - if(WITH_ARITH_ENC OR WITH_ARITH_DEC) - set(JPEG_SOURCES ${JPEG_SOURCES} jaricom.c) -@@ -1803,7 +1803,7 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h - ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h -- ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h -+ ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h ${CMAKE_CURRENT_SOURCE_DIR}/transupp.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT include) - - include(cmakescripts/BuildPackages.cmake) --- -2.43.0 - diff --git a/pkgs/development/libraries/libjpeg-turbo/0002-Make-exported-symbols-in-transupp.c-weak.patch b/pkgs/development/libraries/libjpeg-turbo/0002-Make-exported-symbols-in-transupp.c-weak.patch deleted file mode 100644 index fc23b776312a..000000000000 --- a/pkgs/development/libraries/libjpeg-turbo/0002-Make-exported-symbols-in-transupp.c-weak.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 6442d11617f95d13e2a371bd3e01f5082a9c356d Mon Sep 17 00:00:00 2001 -From: Las <las@protonmail.ch> -Date: Sun, 3 Jan 2021 18:35:37 +0000 -Subject: [PATCH] Make exported symbols in transupp.c weak - -The exported symbols are made weak to not conflict with users -of the library that already vendor this functionality. ---- - transupp.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/transupp.c b/transupp.c -index 34fbb371..c0ade5a9 100644 ---- a/transupp.c -+++ b/transupp.c -@@ -1388,7 +1388,7 @@ jt_read_integer(const char **strptr, JDIMENSION *result) - * This code is loosely based on XParseGeometry from the X11 distribution. - */ - --GLOBAL(boolean) -+GLOBAL(boolean) __attribute__((weak)) - jtransform_parse_crop_spec(jpeg_transform_info *info, const char *spec) - { - info->crop = FALSE; -@@ -1488,7 +1488,7 @@ trim_bottom_edge(jpeg_transform_info *info, JDIMENSION full_height) - * and transformation is not perfect. Otherwise returns TRUE. - */ - --GLOBAL(boolean) -+GLOBAL(boolean) __attribute__((weak)) - jtransform_request_workspace(j_decompress_ptr srcinfo, - jpeg_transform_info *info) - { -@@ -2035,7 +2035,7 @@ adjust_exif_parameters(JOCTET *data, unsigned int length, JDIMENSION new_width, - * to jpeg_write_coefficients(). - */ - --GLOBAL(jvirt_barray_ptr *) -+GLOBAL(jvirt_barray_ptr *) __attribute__((weak)) - jtransform_adjust_parameters(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, - jvirt_barray_ptr *src_coef_arrays, - jpeg_transform_info *info) -@@ -2154,7 +2154,7 @@ jtransform_adjust_parameters(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, - * Note that some transformations will modify the source data arrays! - */ - --GLOBAL(void) -+GLOBAL(void) __attribute__((weak)) - jtransform_execute_transform(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, - jvirt_barray_ptr *src_coef_arrays, - jpeg_transform_info *info) -@@ -2266,7 +2266,7 @@ jtransform_execute_transform(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, - * (may use custom action then) - */ - --GLOBAL(boolean) -+GLOBAL(boolean) __attribute__((weak)) - jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height, - int MCU_width, int MCU_height, - JXFORM_CODE transform) -@@ -2305,7 +2305,7 @@ jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height, - * This must be called before jpeg_read_header() to have the desired effect. - */ - --GLOBAL(void) -+GLOBAL(void) __attribute__((weak)) - jcopy_markers_setup(j_decompress_ptr srcinfo, JCOPY_OPTION option) - { - #ifdef SAVE_MARKERS_SUPPORTED -@@ -2337,7 +2337,7 @@ jcopy_markers_setup(j_decompress_ptr srcinfo, JCOPY_OPTION option) - * JFIF APP0 or Adobe APP14 markers if selected. - */ - --GLOBAL(void) -+GLOBAL(void) __attribute__((weak)) - jcopy_markers_execute(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, - JCOPY_OPTION option) - { --- -2.43.0 - diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix deleted file mode 100644 index 9055e75de47f..000000000000 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, nasm -, openjdk -, enableJava ? false # whether to build the java wrapper -, enableJpeg7 ? false # whether to build libjpeg with v7 compatibility -, enableJpeg8 ? false # whether to build libjpeg with v8 compatibility -, enableStatic ? stdenv.hostPlatform.isStatic -, enableShared ? !stdenv.hostPlatform.isStatic - -# for passthru.tests -, dvgrab -, epeg -, freeimage -, gd -, graphicsmagick -, imagemagick -, imlib2 -, jhead -, libjxl -, mjpegtools -, opencv -, python3 -, vips -, testers -}: - -assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both - -stdenv.mkDerivation (finalAttrs: { - - pname = "libjpeg-turbo"; - version = "3.0.3"; - - src = fetchFromGitHub { - owner = "libjpeg-turbo"; - repo = "libjpeg-turbo"; - rev = finalAttrs.version; - hash = "sha256-w2wJaVf4sjJ9pPPqc9R4TE6Q6Yl0U6+fI5KLpQKwEXI="; - }; - - patches = [ - # This is needed by freeimage - ./0001-Compile-transupp.c-as-part-of-the-library.patch - ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ - ./0002-Make-exported-symbols-in-transupp.c-weak.patch - ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ - ./mingw-boolean.patch - ]; - - outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; - - postFixup = '' - moveToOutput include/transupp.h $dev_private - ''; - - nativeBuildInputs = [ - cmake - nasm - ] ++ lib.optionals enableJava [ - openjdk - ]; - - cmakeFlags = [ - "-DENABLE_STATIC=${if enableStatic then "1" else "0"}" - "-DENABLE_SHARED=${if enableShared then "1" else "0"}" - ] ++ lib.optionals enableJava [ - "-DWITH_JAVA=1" - ] ++ lib.optionals enableJpeg7 [ - "-DWITH_JPEG7=1" - ] ++ lib.optionals enableJpeg8 [ - "-DWITH_JPEG8=1" - ] ++ lib.optionals stdenv.hostPlatform.isRiscV [ - # https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428 - # https://github.com/libjpeg-turbo/libjpeg-turbo/commit/88bf1d16786c74f76f2e4f6ec2873d092f577c75 - "-DFLOATTEST=fp-contract" - ]; - - doInstallCheck = true; - installCheckTarget = "test"; - - passthru.tests = { - inherit - dvgrab - epeg - freeimage - gd - graphicsmagick - imagemagick - imlib2 - jhead - libjxl - mjpegtools - opencv - vips; - inherit (python3.pkgs) pillow imread pyturbojpeg; - pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - }; - - meta = with lib; { - homepage = "https://libjpeg-turbo.org/"; - description = "Faster (using SIMD) libjpeg implementation"; - license = licenses.ijg; # and some parts under other BSD-style licenses - pkgConfigModules = [ "libjpeg" "libturbojpeg" ]; - maintainers = with maintainers; [ vcunat colemickens kamadorueda ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch b/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch deleted file mode 100644 index 9b9483d63987..000000000000 --- a/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch +++ /dev/null @@ -1,19 +0,0 @@ -Ported to updated libjpeg-turbo from -https://github.com/msys2/MINGW-packages/blob/master/mingw-w64-libjpeg-turbo/jpeg-typedefs.patch ---- a/jmorecfg.h 2012-02-10 06:47:55 +0300 -+++ b/jmorecfg.h 2012-05-03 10:29:13 +0400 -@@ -224,7 +224,13 @@ - * Defining HAVE_BOOLEAN before including jpeglib.h should make it work. - */ - --#ifndef HAVE_BOOLEAN -+#if defined(_WIN32) && !defined(HAVE_BOOLEAN) -+#ifndef __RPCNDR_H__ -+typedef unsigned char boolean; -+#endif -+#define HAVE_BOOLEAN -+#endif -+#if !defined(HAVE_BOOLEAN) && !defined(__RPCNDR_H__) - typedef int boolean; - #endif - #ifndef FALSE /* in case these macros already exist */ diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix deleted file mode 100644 index ce73a5955354..000000000000 --- a/pkgs/development/libraries/libjpeg/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - testers, - static ? false, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libjpeg"; - version = "9f"; - - src = fetchurl { - url = "http://www.ijg.org/files/jpegsrc.v${finalAttrs.version}.tar.gz"; - hash = "sha256-BHBcEQyyRpyqeftx+6PXv4NJFHBulkGkWJSFwfgyVls="; - }; - - configureFlags = lib.optional static "--enable-static --disable-shared"; - - outputs = [ - "bin" - "dev" - "out" - "man" - ]; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = { - homepage = "https://www.ijg.org/"; - description = "Library that implements the JPEG image file format"; - maintainers = with lib.maintainers; [ sigmanificient ]; - license = lib.licenses.free; - pkgConfigModules = [ "libjpeg" ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix deleted file mode 100644 index f132a66560be..000000000000 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, argtable, catch2 -, curl, doxygen, hiredis, jsoncpp, libmicrohttpd }: - -stdenv.mkDerivation rec { - pname = "libjson-rpc-cpp"; - version = "1.4.1"; - - src = fetchFromGitHub { - owner = "cinemast"; - repo = "libjson-rpc-cpp"; - sha256 = "sha256-YCCZN4y88AixQeo24pk6YHfSCsJz8jJ97Dg40KM08cQ="; - rev = "v${version}"; - }; - - env.NIX_CFLAGS_COMPILE = "-I${catch2}/include/catch2"; - - nativeBuildInputs = [ pkg-config cmake doxygen ]; - - buildInputs = [ argtable catch2 curl hiredis jsoncpp libmicrohttpd ]; - - postPatch = '' - for f in cmake/FindArgtable.cmake \ - src/stubgenerator/stubgenerator.cpp \ - src/stubgenerator/stubgeneratorfactory.cpp - do - sed -i -re 's/argtable2/argtable3/g' $f - done - - sed -i -re 's#MATCHES "jsoncpp"#MATCHES ".*/jsoncpp/json$"#g' cmake/FindJsoncpp.cmake - ''; - - preConfigure = '' - mkdir -p Build/Install - pushd Build - ''; - - # this hack is needed because the cmake scripts - # require write permission to absolute paths - configurePhase = '' - runHook preConfigure - cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)/Install \ - -DCMAKE_BUILD_TYPE=Release - runHook postConfigure - ''; - - preInstall = '' - function fixRunPath { - p=$(patchelf --print-rpath $1) - q="$p:${ - lib.makeLibraryPath [ jsoncpp argtable libmicrohttpd curl ] - }:$out/lib" - patchelf --set-rpath $q $1 - } - - mkdir -p $out - ''; - - postInstall = '' - sed -i -re "s#-([LI]).*/Build/Install(.*)#-\1$out\2#g" Install/lib64/pkgconfig/*.pc - for f in Install/lib64/*.so* $(find Install/bin -executable -type f); do - fixRunPath $f - done - cp -r Install/* $out - ''; - - installPhase = '' - runHook preInstall - make install - runHook postInstall - ''; - - meta = with lib; { - description = "C++ framework for json-rpc (json remote procedure call)"; - mainProgram = "jsonrpcstub"; - 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/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix deleted file mode 100644 index dd68957616b6..000000000000 --- a/pkgs/development/libraries/libjson/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - pname = "libjson"; - version = "7.6.1"; - src = fetchurl { - url = "mirror://sourceforge/libjson/libjson_${version}.zip"; - sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7"; - }; - patches = [ ./install-fix.patch ]; - nativeBuildInputs = [ unzip ]; - makeFlags = [ "prefix=$(out)" ]; - env.NIX_CFLAGS_COMPILE = toString [ "-std=c++11" ]; - preInstall = "mkdir -p $out/lib"; - - meta = with lib; { - homepage = "http://libjson.sourceforge.net/"; - description = "JSON reader and writer"; - longDescription = '' - A JSON reader and writer which is super-efficient and - usually runs circles around other JSON libraries. - It's highly customizable to optimize for your particular project, and - very lightweight. For Windows, OSX, or Linux. Works in any language. - ''; - platforms = platforms.unix; - license = licenses.bsd2; - }; -} diff --git a/pkgs/development/libraries/libjson/install-fix.patch b/pkgs/development/libraries/libjson/install-fix.patch deleted file mode 100644 index f074c8ba3aa5..000000000000 --- a/pkgs/development/libraries/libjson/install-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libjson-orig/makefile libjson/makefile ---- libjson-orig/makefile 2012-05-30 05:15:42.000000000 -0400 -+++ libjson/makefile 2013-08-15 09:17:41.154245534 -0400 -@@ -266,7 +266,7 @@ - cp -r ./$(srcdir)/JSONDefs $(include_path)/$(libname_hdr)/$(srcdir) - chmod -R a+r $(include_path)/$(libname_hdr) - find $(include_path)/$(libname_hdr) -type d -exec chmod a+x {} \; -- cp -rv $(srcdir)/Dependencies/ $(include_path)/$(libname_hdr)/$(srcdir) -+ cp -rv $(srcdir)/../Dependencies/ $(include_path)/$(libname_hdr)/$(srcdir)/.. - @echo "Install header files: Done." - - clean: banner diff --git a/pkgs/development/libraries/libjwt/default.nix b/pkgs/development/libraries/libjwt/default.nix deleted file mode 100644 index 724e464cddda..000000000000 --- a/pkgs/development/libraries/libjwt/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, jansson, openssl }: - -stdenv.mkDerivation rec { - pname = "libjwt"; - version = "1.17.2"; - - src = fetchFromGitHub { - owner = "benmcollins"; - repo = "libjwt"; - rev = "v${version}"; - sha256 = "sha256-y7QX6P0EScY9MMdbwc8nDUKCxtNQCqjh9wlbxVuT6lA="; - }; - - buildInputs = [ jansson openssl ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - meta = with lib; { - homepage = "https://github.com/benmcollins/libjwt"; - description = "JWT C Library"; - license = licenses.mpl20; - maintainers = with maintainers; [ pnotequalnp ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/development/libraries/libjxl/default.nix deleted file mode 100644 index 4ae2657de914..000000000000 --- a/pkgs/development/libraries/libjxl/default.nix +++ /dev/null @@ -1,148 +0,0 @@ -{ stdenv, lib, fetchFromGitHub -, brotli -, cmake -, giflib -, gperftools -, gtest -, libhwy -, libjpeg -, libpng -, libwebp -, gdk-pixbuf -, openexr_3 -, pkg-config -, makeWrapper -, zlib -, asciidoc -, graphviz -, doxygen -, python3 -, lcms2 -, enablePlugins ? stdenv.buildPlatform.canExecute stdenv.hostPlatform -}: - -let - loadersPath = "${gdk-pixbuf.binaryDir}/jxl-loaders.cache"; -in - -stdenv.mkDerivation rec { - pname = "libjxl"; - version = "0.10.3"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "libjxl"; - repo = "libjxl"; - rev = "v${version}"; - hash = "sha256-zk/fI1C26K5WC9QBfzS6MqPT9PiR4wmWURjOOIiNsg4="; - # There are various submodules in `third_party/`. - fetchSubmodules = true; - }; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - pkg-config - gdk-pixbuf - makeWrapper - asciidoc - doxygen - python3 - ]; - - depsBuildBuild = [ - graphviz - ]; - - # Functionality not currently provided by this package - # that the cmake build can apparently use: - # OpenGL/GLUT (for Examples -> comparison with sjpeg) - # viewer (see `cmakeFlags`) - # plugins like for GDK and GIMP (see `cmakeFlags`) - - # Vendored libraries: - # `libjxl` currently vendors many libraries as git submodules that they - # might patch often (e.g. test/gmock, see - # https://github.com/NixOS/nixpkgs/pull/103160#discussion_r519487734). - # When it has stabilised in the future, we may want to tell the build - # to use use nixpkgs system libraries. - - # As of writing, libjxl does not point out all its dependencies - # conclusively in its README or otherwise; they can best be determined - # by checking the CMake output for "Could NOT find". - buildInputs = [ - lcms2 - giflib - gperftools # provides `libtcmalloc` - gtest - libjpeg - libpng - libwebp - gdk-pixbuf - openexr_3 - zlib - ]; - - propagatedBuildInputs = [ - brotli - libhwy - ]; - - cmakeFlags = [ - # For C dependencies like brotli, which are dynamically linked, - # we want to use the system libraries, so that we don't have to care about - # installing their .so files generated by this build. - # The other C++ dependencies are statically linked in, so there - # using the vendorered ones is easier. - "-DJPEGXL_FORCE_SYSTEM_BROTLI=ON" - - # Use our version of highway, though it is still statically linked in - "-DJPEGXL_FORCE_SYSTEM_HWY=ON" - - # Use our version of gtest - "-DJPEGXL_FORCE_SYSTEM_GTEST=ON" - - # TODO: Update this package to enable this (overridably via an option): - # Viewer tools for evaluation. - # "-DJPEGXL_ENABLE_VIEWERS=ON" - ] ++ lib.optionals enablePlugins [ - # Enable plugins, such as: - # * the `gdk-pixbuf` one, which allows applications like `eog` to load jpeg-xl files - # * the `gimp` one, which allows GIMP to load jpeg-xl files - "-DJPEGXL_ENABLE_PLUGINS=ON" - ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - "-DJPEGXL_STATIC=ON" - ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ - "-DJPEGXL_FORCE_NEON=ON" - ]; - - postPatch = '' - substituteInPlace plugins/gdk-pixbuf/jxl.thumbnailer \ - --replace '/usr/bin/gdk-pixbuf-thumbnailer' "$out/libexec/gdk-pixbuf-thumbnailer-jxl" - ''; - - postInstall = lib.optionalString enablePlugins '' - GDK_PIXBUF_MODULEDIR="$out/${gdk-pixbuf.moduleDir}" \ - GDK_PIXBUF_MODULE_FILE="$out/${loadersPath}" \ - gdk-pixbuf-query-loaders --update-cache - mkdir -p "$out/bin" - makeWrapper ${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer "$out/libexec/gdk-pixbuf-thumbnailer-jxl" \ - --set GDK_PIXBUF_MODULE_FILE "$out/${loadersPath}" - ''; - - CXXFLAGS = lib.optionalString stdenv.hostPlatform.isAarch32 "-mfp16-format=ieee"; - - # FIXME x86_64-darwin: - # https://github.com/NixOS/nixpkgs/pull/204030#issuecomment-1352768690 - doCheck = with stdenv; !(hostPlatform.isi686 || isDarwin && isx86_64); - - meta = with lib; { - homepage = "https://github.com/libjxl/libjxl"; - description = "JPEG XL image format reference implementation"; - license = licenses.bsd3; - maintainers = with maintainers; [ nh2 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix deleted file mode 100644 index d1a9711ddd89..000000000000 --- a/pkgs/development/libraries/libkate/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, libogg, libpng }: - -stdenv.mkDerivation rec { - pname = "libkate"; - version = "0.4.1"; - - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libkate/${pname}-${version}.tar.gz"; - sha256 = "0s3vr2nxfxlf1k75iqpp4l78yf4gil3f0v778kvlngbchvaq23n4"; - }; - - buildInputs = [ libogg libpng ]; - - meta = with lib; { - description = "Library for encoding and decoding Kate streams"; - longDescription = '' - This is libkate, the reference implementation of a codec for the Kate - bitstream format. Kate is a karaoke and text codec meant for encapsulation - in an Ogg container. It can carry Unicode text, images, and animate - them.''; - homepage = "https://code.google.com/archive/p/libkate/"; - platforms = platforms.unix; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/libkcapi/default.nix b/pkgs/development/libraries/libkcapi/default.nix deleted file mode 100644 index 93405b1f9e3b..000000000000 --- a/pkgs/development/libraries/libkcapi/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, buildPackages - # libkcapi offers multiple tools. They can be disabled for minimization. -, kcapi-test ? true -, kcapi-speed ? true -, kcapi-hasher ? true -, kcapi-rngapp ? true -, kcapi-encapp ? true -, kcapi-dgstapp ? true -}: - -stdenv.mkDerivation rec { - pname = "libkcapi"; - version = "1.5.0"; - - src = fetchFromGitHub { - owner = "smuellerDD"; - repo = "libkcapi"; - rev = "v${version}"; - hash = "sha256-xOI29cjhUGUeHLaYIrPA5ZwwCE9lBdZG6kaW0lo1uL8="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - # libkcapi looks also for a host c compiler when cross-compiling - # otherwise you obtain following error message: - # "error: no acceptable C compiler found in $PATH" - depsBuildBuild = [ - buildPackages.stdenv.cc - ]; - - enableParallelBuilding = true; - - configureFlags = - lib.optional kcapi-test "--enable-kcapi-test" ++ - lib.optional kcapi-speed "--enable-kcapi-speed" ++ - lib.optional kcapi-hasher "--enable-kcapi-hasher" ++ - lib.optional kcapi-rngapp "--enable-kcapi-rngapp" ++ - lib.optional kcapi-encapp "--enable-kcapi-encapp" ++ - lib.optional kcapi-dgstapp "--enable-kcapi-dgstapp" - ; - - meta = { - homepage = "http://www.chronox.de/libkcapi.html"; - description = "Linux Kernel Crypto API User Space Interface Library"; - license = with lib.licenses; [ bsd3 gpl2Only ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ orichter thillux ]; - }; -} diff --git a/pkgs/development/libraries/libkqueue/default.nix b/pkgs/development/libraries/libkqueue/default.nix deleted file mode 100644 index 54b6b2beecac..000000000000 --- a/pkgs/development/libraries/libkqueue/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "libkqueue"; - version = "2.6.2"; - - src = fetchFromGitHub { - owner = "mheily"; - repo = "libkqueue"; - rev = "v${version}"; - sha256 = "sha256-5Zds9sqHkFldJf3ThTPOiaGKohmFcIzY0ARDA0iswVk="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "kqueue(2) compatibility library"; - homepage = "https://github.com/mheily/libkqueue"; - changelog = "https://github.com/mheily/libkqueue/raw/v${version}/ChangeLog"; - license = licenses.bsd2; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix deleted file mode 100644 index fbccbdd37fef..000000000000 --- a/pkgs/development/libraries/libkrun/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, cargo -, pkg-config -, glibc -, openssl -, libepoxy -, libdrm -, pipewire -, virglrenderer -, libkrunfw -, llvmPackages -, rustc -, withGpu ? false -, withSound ? false -, withNet ? false -, sevVariant ? false -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libkrun"; - version = "1.9.4"; - - src = fetchFromGitHub { - owner = "containers"; - repo = "libkrun"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-QzyNPThwbjPKANeZ4GAT9b4f8LTcjXnCiK+vzRkhM4c="; - }; - - outputs = [ "out" "dev" ]; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) src; - hash = "sha256-33s62iOWYh1a8ETY/fbPRxvnj8dR4/UfG8mjFyWwz5k="; - }; - - nativeBuildInputs = [ - llvmPackages.clang - rustPlatform.cargoSetupHook - cargo - rustc - ] ++ lib.optional (sevVariant || withGpu) pkg-config; - - buildInputs = [ - (libkrunfw.override { inherit sevVariant; }) - glibc - glibc.static - ] ++ 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.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 RossComputerGuy ]; - platforms = libkrunfw.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/development/libraries/libkrunfw/default.nix deleted file mode 100644 index ecfa284d944e..000000000000 --- a/pkgs/development/libraries/libkrunfw/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchurl -, flex -, bison -, bc -, cpio -, perl -, elfutils -, python3 -, sevVariant ? false -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libkrunfw"; - version = "4.3.0"; - - src = fetchFromGitHub { - owner = "containers"; - repo = "libkrunfw"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-bfcnr7L8Hb0A+ZnZnphEsP7M8NrlIwnsNJ0nW1HnrWE="; - }; - - kernelSrc = fetchurl { - url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.44.tar.xz"; - hash = "sha256-kyGClpNJFWNv5roI4SWUhCTMJw/YlIUCwKuRCHqfzNg="; - }; - - postPatch = '' - substituteInPlace Makefile \ - --replace 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s $(kernelSrc) $(KERNEL_TARBALL)' - ''; - - nativeBuildInputs = [ - flex - bison - bc - cpio - perl - python3 - python3.pkgs.pyelftools - ]; - - buildInputs = [ - elfutils - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ] ++ lib.optionals sevVariant [ - "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 RossComputerGuy ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - }; -}) diff --git a/pkgs/development/libraries/libks/default.nix b/pkgs/development/libraries/libks/default.nix deleted file mode 100644 index 4122d4f57617..000000000000 --- a/pkgs/development/libraries/libks/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, pkg-config -, libuuid -, openssl -, libossp_uuid -, freeswitch -, nix-update-script -}: - -stdenv.mkDerivation rec { - pname = "libks"; - version = "2.0.6"; - - src = fetchFromGitHub { - owner = "signalwire"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-zKL+ukAdKiCC4wh55hnZpebFraIdKWDFsRfhVzhUNj0="; - }; - - patches = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/openwrt/telephony/5ced7ea4fc9bd746273d564bf3c102f253d2182e/libs/libks/patches/01-find-libm.patch"; - sha256 = "1hyrsdxg69d08qzvf3mbrx2363lw52jcybw8i3ynzqcl228gcg8a"; - }) - ]; - - dontUseCmakeBuildDir = true; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ openssl ] - ++ lib.optional stdenv.isLinux libuuid - ++ lib.optional stdenv.isDarwin libossp_uuid; - - passthru = { - tests.freeswitch = freeswitch; - updateScript = nix-update-script { }; - }; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "Foundational support for signalwire C products"; - homepage = "https://github.com/signalwire/libks"; - maintainers = with lib.maintainers; [ misuzu ]; - platforms = platforms.unix; - license = licenses.mit; - }; -} diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix deleted file mode 100644 index 5eb07184c651..000000000000 --- a/pkgs/development/libraries/libksba/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ buildPackages, lib, stdenv, fetchurl, gettext, libgpg-error }: - -stdenv.mkDerivation rec { - pname = "libksba"; - version = "1.6.7"; - - src = fetchurl { - url = "mirror://gnupg/libksba/libksba-${version}.tar.bz2"; - hash = "sha256-z3JRC467TrZpPu92V0nYNnegPHkpGjEQQKW/15uqt2M="; - }; - - outputs = [ "out" "dev" "info" ]; - - buildInputs = [ gettext ]; - propagatedBuildInputs = [ libgpg-error ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - configureFlags = [ "--with-libgpg-error-prefix=${libgpg-error.dev}" ]; - - postInstall = '' - mkdir -p $dev/bin - mv $out/bin/*-config $dev/bin/ - rmdir --ignore-fail-on-non-empty $out/bin - ''; - - meta = with lib; { - homepage = "https://www.gnupg.org"; - description = "CMS and X.509 access library"; - mainProgram = "ksba-config"; - platforms = platforms.all; - maintainers = [ ]; - license = licenses.lgpl3; - }; -} diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix deleted file mode 100644 index 3698be42d5f6..000000000000 --- a/pkgs/development/libraries/libksi/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, curl }: - -stdenv.mkDerivation rec { - pname = "libksi"; - version = "3.21.3087"; - - src = fetchFromGitHub { - owner = "Guardtime"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-zEWxJpv0MeGUq/xkM26tDoauFyw53enGyWVhlX0jlYI="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ openssl curl ]; - - configureFlags = [ - "--with-openssl=${openssl.dev}" - "--with-cafile=/etc/ssl/certs/ca-certificates.crt" - ]; - - meta = with lib; { - homepage = "https://github.com/GuardTime/libksi"; - description = "Keyless Signature Infrastructure API library"; - license = licenses.asl20; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix deleted file mode 100644 index 38f1cc03cac4..000000000000 --- a/pkgs/development/libraries/liblangtag/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, gtk-doc, gettext -, pkg-config, glib, libxml2, gobject-introspection, gnome-common, unzip -}: - -stdenv.mkDerivation rec { - pname = "liblangtag"; - version = "0.6.3"; - - # Artifact tarball contains lt-localealias.h needed for darwin - src = fetchurl { - url = "https://bitbucket.org/tagoh/liblangtag/downloads/${pname}-${version}.tar.bz2"; - sha256 = "sha256-HxKiCgLsOo0i5U3tuLaDpDycFgvaG6M3vxBgYHrnM70="; - }; - - core_zip = fetchurl { - # please update if an update is available - url = "http://www.unicode.org/Public/cldr/37/core.zip"; - sha256 = "0myswkvvaxvrz9zwq4zh65sygfd9n72cd5rk4pwacqba4nxgb4xs"; - }; - - language_subtag_registry = fetchurl { - url = "http://www.iana.org/assignments/language-subtag-registry"; - sha256 = "0y9x5gra6jri4sk16f0dp69p06almnsl48rs85605f035kf539qm"; - }; - - patches = [ - # Pull upstream fix for gcc-13 build compatibility - (fetchpatch { - name = "gcc-13-p1.patch"; - url = "https://bitbucket.org/tagoh/liblangtag/commits/0b6e9f4616a34146e7443c4e9a7197153645e40b/raw"; - hash = "sha256-69wJDVwDCP5OPHKoRn9WZNrvfCvmlX3SwtRmcpJHn2o="; - }) - (fetchpatch { - name = "gcc-13-p1.patch"; - url = "https://bitbucket.org/tagoh/liblangtag/commits/1497c4477d0fa0b7df1886951b953dd3cea54427/raw"; - hash = "sha256-k0Uaeg6YLxVze4fgf0kiyuiZJ5wh2Jq3h7cFPQPtwyo="; - }) - ]; - - postPatch = '' - gtkdocize - cp "${core_zip}" data/core.zip - touch data/stamp-core-zip - cp "${language_subtag_registry}" data/language-subtag-registry - ''; - - configureFlags = - lib.optional - (stdenv.hostPlatform.libc == "glibc") - "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias"; - - buildInputs = [ gettext glib libxml2 gnome-common ]; - nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config unzip gobject-introspection ]; - - meta = with lib; { - description = "Interface library to access tags for identifying languages"; - license = licenses.mpl20; - maintainers = [ maintainers.raskin ]; - platforms = platforms.unix; - # There are links to a homepage that are broken by a BitBucket change - homepage = "https://bitbucket.org/tagoh/liblangtag/overview"; - }; -} diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 7dcc3b0d0cc0..060839326b15 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config which cmake ]; buildInputs = [ fftwSinglePrec libsamplerate qtbase ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") "-std=c++11"; diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix deleted file mode 100644 index f25ee3afae4a..000000000000 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, curl, openssl }: - -stdenv.mkDerivation rec { - pname = "liblastfm-SF"; - version = "0.5"; - - nativeBuildInputs = [ pkg-config ]; - - propagatedBuildInputs = [ curl openssl ]; - - src = fetchurl { - url = "mirror://sourceforge/liblastfm/libclastfm-${version}.tar.gz"; - sha256 = "0hpfflvfx6r4vvsbvdc564gkby8kr07p8ma7hgpxiy2pnlbpian9"; - }; - - meta = { - homepage = "https://liblastfm.sourceforge.net"; - description = "Unofficial C lastfm library"; - license = lib.licenses.gpl3; - }; -} diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/development/libraries/liblaxjson/default.nix deleted file mode 100644 index 9464714d5cc9..000000000000 --- a/pkgs/development/libraries/liblaxjson/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - version = "1.0.5"; - pname = "liblaxjson"; - - src = fetchFromGitHub { - owner = "andrewrk"; - repo = "liblaxjson"; - rev = version; - sha256 = "01iqbpbhnqfifhv82m6hi8190w5sdim4qyrkss7z1zyv3gpchc5s"; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Library for parsing JSON config files"; - homepage = "https://github.com/andrewrk/liblaxjson"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = [ maintainers.andrewrk ]; - }; -} diff --git a/pkgs/development/libraries/liblc3/default.nix b/pkgs/development/libraries/liblc3/default.nix deleted file mode 100644 index ff04d23cb0c6..000000000000 --- a/pkgs/development/libraries/liblc3/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -}: - -let - name = "liblc3"; - version = "1.1.1"; -in -stdenv.mkDerivation { - pname = name; - version = version; - - src = fetchFromGitHub { - owner = "google"; - repo = "liblc3"; - rev = "v${version}"; - sha256 = "sha256-h9qy04FqlHXp0bOUoP4+WqI0yrM78e56S+DEn3HztYo="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - meson - ninja - ]; - - meta = with lib; { - description = "LC3 (Low Complexity Communication Codec) is an efficient low latency audio codec"; - homepage = "https://github.com/google/liblc3"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ jansol ]; - }; -} - diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix deleted file mode 100644 index 07f24f4d5a06..000000000000 --- a/pkgs/development/libraries/liblcf/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config -, expat -, icu -}: - -stdenv.mkDerivation rec { - pname = "liblcf"; - version = "0.8"; - - src = fetchFromGitHub { - owner = "EasyRPG"; - repo = "liblcf"; - rev = version; - hash = "sha256-jJGIsNw7wplTL5FBWGL8osb9255o9ZaWgl77R+RLDMM="; - }; - - dtrictDeps = true; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - propagatedBuildInputs = [ - expat - icu - ]; - - enableParallelBuilding = true; - enableParallelChecking = true; - - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - - meta = with lib; { - description = "Library to handle RPG Maker 2000/2003 and EasyRPG projects"; - homepage = "https://github.com/EasyRPG/liblcf"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix deleted file mode 100644 index 449792a07e82..000000000000 --- a/pkgs/development/libraries/liblinear/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -let - soVersion = "5"; -in stdenv.mkDerivation rec { - pname = "liblinear"; - version = "2.47"; - - src = fetchFromGitHub { - owner = "cjlin1"; - repo = "liblinear"; - rev = "v${builtins.replaceStrings ["."] [""] version}"; - sha256 = "sha256-so7uCc/52NdN0V2Ska8EUdw/wSegaudX5AF+c0xe5jk="; - }; - - makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" ]; - - outputs = [ "bin" "dev" "out" ]; - - buildFlags = [ "lib" "predict" "train" ]; - - installPhase = '' - ${if stdenv.isDarwin then '' - install -D liblinear.so.${soVersion} $out/lib/liblinear.${soVersion}.dylib - ln -s $out/lib/liblinear.${soVersion}.dylib $out/lib/liblinear.dylib - '' else '' - install -Dt $out/lib liblinear.so.${soVersion} - ln -s $out/lib/liblinear.so.${soVersion} $out/lib/liblinear.so - ''} - install -D train $bin/bin/liblinear-train - install -D predict $bin/bin/liblinear-predict - install -Dm444 -t $dev/include linear.h - ''; - - meta = with lib; { - description = "Library for large linear classification"; - homepage = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/"; - license = licenses.bsd3; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/liblinphone/backport-cpp17.patch b/pkgs/development/libraries/liblinphone/backport-cpp17.patch deleted file mode 100644 index d9eb75fa2768..000000000000 --- a/pkgs/development/libraries/liblinphone/backport-cpp17.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 9ece6e77dcf6545c3b8104068302c6243e3a5e88 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micka=C3=ABl=20Turnel?= - <mickael.turnel@belledonne-communications.com> -Date: Wed, 1 Mar 2023 09:14:53 +0100 -Subject: [PATCH] Set c++ version 17 and fix compilation errors - -Backported-by: Lorenz Brun <lorenz@brun.one> - ---- - CMakeLists.txt | 2 +- - daemon/daemon.cc | 2 +- - libxsd/xsd/cxx/config.hxx | 2 +- - src/conference/session/streams-group.cpp | 10 +++++----- - 4 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 475ff16a8..a771e4595 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -92,7 +92,7 @@ cmake_dependent_option(ENABLE_QRCODE "Enable QRCode support" YES "ENABLE_VIDEO" - # * DISABLE_BC_PACKAGE_SEARCH: skip find_package() for every BC package (bctoolbox, ortp, etc.) - # * DISABLE_SOCI_PACKAGE_SEARCH: skip find_package() for Soci. - --set(CMAKE_CXX_STANDARD 14) -+set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_EXTENSIONS NO) - - if(NOT CMAKE_BUILD_TYPE) -diff --git a/daemon/daemon.cc b/daemon/daemon.cc -index 197fc22ef..fd09edb26 100644 ---- a/daemon/daemon.cc -+++ b/daemon/daemon.cc -@@ -628,7 +628,7 @@ void Daemon::execCommand(const string &command) { - ist.get(argsbuf); - string args = argsbuf.str(); - if (!args.empty() && (args[0] == ' ')) args.erase(0, 1); -- list<DaemonCommand*>::iterator it = find_if(mCommands.begin(), mCommands.end(), bind2nd(mem_fun(&DaemonCommand::matches), name)); -+ list<DaemonCommand*>::iterator it = find_if(mCommands.begin(), mCommands.end(), [&name](const DaemonCommand *dc) { return dc->matches(name); }); - if (it != mCommands.end()) { - ms_mutex_lock(&mMutex); - (*it)->exec(this, args); -diff --git a/libxsd/xsd/cxx/config.hxx b/libxsd/xsd/cxx/config.hxx -index 076b107f5..385841731 100644 ---- a/libxsd/xsd/cxx/config.hxx -+++ b/libxsd/xsd/cxx/config.hxx -@@ -19,7 +19,7 @@ - # endif - #else - # if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L --# ifdef __GNUC__ -+# if defined(__GNUC__) && !defined(__clang__) - # if (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4 - # define XSD_CXX11_NULLPTR - # endif -diff --git a/src/conference/session/streams-group.cpp b/src/conference/session/streams-group.cpp -index bff739dda..84277a6b7 100644 ---- a/src/conference/session/streams-group.cpp -+++ b/src/conference/session/streams-group.cpp -@@ -447,11 +447,11 @@ float StreamsGroup::computeOverallQuality(_functor func){ - } - - float StreamsGroup::getAverageQuality(){ -- return computeOverallQuality(mem_fun(&Stream::getAverageQuality)); -+ return computeOverallQuality(mem_fn(&Stream::getAverageQuality)); - } - - float StreamsGroup::getCurrentQuality(){ -- return computeOverallQuality(mem_fun(&Stream::getCurrentQuality)); -+ return computeOverallQuality(mem_fn(&Stream::getCurrentQuality)); - } - - int StreamsGroup::getAvpfRrInterval()const{ -@@ -481,11 +481,11 @@ bool StreamsGroup::avpfEnabled() const{ - } - - void StreamsGroup::refreshSockets(){ -- forEach<Stream>(mem_fun(&Stream::refreshSockets)); -+ forEach<Stream>(mem_fn(&Stream::refreshSockets)); - } - - void StreamsGroup::computeAndReportBandwidth(){ -- forEach<Stream>(mem_fun(&Stream::updateBandwidthReports)); -+ forEach<Stream>(mem_fn(&Stream::updateBandwidthReports)); - - if (!bctbx_log_level_enabled(BCTBX_LOG_DOMAIN, BCTBX_LOG_MESSAGE)) return; - -@@ -540,7 +540,7 @@ void StreamsGroup::finish(){ - mIceService->finish(); // finish ICE first, as it has actions on the streams. - for (auto & ss : mSharedServices) ss.second->checkDestroy(); - mSharedServices.clear(); -- forEach<Stream>(mem_fun(&Stream::finish)); -+ forEach<Stream>(mem_fn(&Stream::finish)); - mFinished = true; - } - --- -2.41.0 - diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix deleted file mode 100644 index a4a1e03e93ef..000000000000 --- a/pkgs/development/libraries/liblinphone/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ lib -, bc-soci -, belcard -, belle-sip -, cmake -, doxygen -, fetchFromGitLab -, jsoncpp -, libxml2 -, lime -, mediastreamer -, python3 -, sqlite -, stdenv -, xercesc -, zxing-cpp -}: - -stdenv.mkDerivation rec { - pname = "liblinphone"; - version = "5.2.98"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = pname; - rev = version; - hash = "sha256-kQZePMa7MTaSJLEObM8khfSFYLqhlgTcVyKfTPLwKYU="; - }; - - patches = [ - # zxing-cpp 2.0+ requires C++ 17 - # Manual backport as upstream ran formatters in the meantime - ./backport-cpp17.patch - ]; - - postPatch = '' - substituteInPlace src/CMakeLists.txt \ - --replace "jsoncpp_object" "jsoncpp" \ - --replace "jsoncpp_static" "jsoncpp" - ''; - - cmakeFlags = [ - "-DENABLE_STATIC=NO" # Do not build static libraries - "-DENABLE_UNIT_TESTS=NO" # Do not build test executables - "-DENABLE_STRICT=NO" # Do not build with -Werror - ]; - - buildInputs = [ - # Made by BC - belcard - belle-sip - lime - mediastreamer - - # Vendored by BC - bc-soci - - jsoncpp - libxml2 - sqlite - xercesc - zxing-cpp - ]; - - nativeBuildInputs = [ - cmake - doxygen - (python3.withPackages (ps: [ ps.pystache ps.six ])) - ]; - - strictDeps = true; - - # Some grammar files needed to be copied too from some dependencies. I suppose - # if one define a dependency in such a way that its share directory is found, - # then this copying would be unnecessary. Instead of actually copying these - # files, create a symlink. - postInstall = '' - mkdir -p $out/share/belr/grammars - ln -s ${belcard}/share/belr/grammars/* $out/share/belr/grammars/ - ''; - - meta = with lib; { - homepage = "https://www.linphone.org/technical-corner/liblinphone"; - description = "Library for SIP calls and instant messaging"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix deleted file mode 100644 index 1a9ce7c331a0..000000000000 --- a/pkgs/development/libraries/liblo/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "liblo"; - version = "0.31"; - - src = fetchurl { - url = "mirror://sourceforge/liblo/liblo/${version}/${pname}-${version}.tar.gz"; - sha256 = "0l67rkdhfa8cffa0nynql3lh2xlbn1454h6qxhjddp1029p48krb"; - }; - - doCheck = false; # fails 1 out of 3 tests - - meta = { - description = "Lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol"; - homepage = "https://sourceforge.net/projects/liblo"; - license = lib.licenses.gpl2; - maintainers = [lib.maintainers.marcweber]; - platforms = with lib.platforms; linux ++ darwin; - }; -} diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/development/libraries/liblockfile/default.nix deleted file mode 100644 index 17fc086704ec..000000000000 --- a/pkgs/development/libraries/liblockfile/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - _name = "liblockfile"; - version = "1.17"; - name = "${_name}-${version}"; - - src = fetchurl { - url = "mirror://debian/pool/main/libl/${_name}/${_name}_${version}.orig.tar.gz"; - sha256 = "sha256-bpN/NlCvq0qsGY80i4mxykLtzrF/trsJGPZCFDzP0V4="; - }; - - preConfigure = '' - sed -i -e 's/ -g [^ ]* / /' Makefile.in - ''; - - preInstall = '' - mkdir -p $out/{bin,lib,include,man} $out/man/man{1,3} - ''; - - meta = { - description = "Shared library with NFS-safe locking functions"; - mainProgram = "dotlockfile"; - homepage = "http://packages.debian.org/unstable/libs/liblockfile1"; - license = lib.licenses.gpl2Plus; - - maintainers = [ lib.maintainers.bluescreen303 ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix deleted file mode 100644 index 50b850b886a5..000000000000 --- a/pkgs/development/libraries/liblogging/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config -, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd -, systemd -}: - -stdenv.mkDerivation rec { - pname = "liblogging"; - version = "1.0.6"; - - src = fetchurl { - url = "http://download.rsyslog.com/liblogging/liblogging-${version}.tar.gz"; - sha256 = "14xz00mq07qmcgprlj5b2r21ljgpa4sbwmpr6jm2wrf8wms6331k"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals withSystemd [ systemd ]; - - configureFlags = [ - "--enable-rfc3195" - "--enable-stdlog" - (if withSystemd then "--enable-journal" else "--disable-journal") - "--enable-man-pages" - ]; - - meta = with lib; { - homepage = "http://www.liblogging.org/"; - description = "Lightweight signal-safe logging library"; - mainProgram = "stdlogctl"; - license = licenses.bsd2; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix deleted file mode 100644 index 184d9932eb28..000000000000 --- a/pkgs/development/libraries/liblognorm/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libestr, json_c, pcre, fastJson }: - -stdenv.mkDerivation rec { - pname = "liblognorm"; - version = "2.0.6"; - - src = fetchurl { - url = "http://www.liblognorm.com/files/download/liblognorm-${version}.tar.gz"; - sha256 = "1wpn15c617r7lfm1z9d5aggmmi339s6yn4pdz698j0r2bkl5gw6g"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libestr json_c pcre fastJson ]; - - configureFlags = [ "--enable-regexp" ]; - - meta = with lib; { - description = "Help to make sense out of syslog data, or, actually, any event data that is present in text form"; - homepage = "https://www.liblognorm.com/"; - license = licenses.lgpl21; - mainProgram = "lognormalizer"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix deleted file mode 100644 index f0d0cc09e9c1..000000000000 --- a/pkgs/development/libraries/liblouis/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ fetchFromGitHub -, lib -, stdenv -, autoreconfHook -, pkg-config -, gettext -, python3 -, texinfo -, help2man -, libyaml -, perl -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "liblouis"; - version = "3.31.0"; - - outputs = [ "out" "dev" "info" "doc" ] - # configure: WARNING: cannot generate manual pages while cross compiling - ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "man" ]; - - src = fetchFromGitHub { - owner = "liblouis"; - repo = "liblouis"; - rev = "v${finalAttrs.version}"; - hash = "sha256-0OnIvRwoL7GsuQPXJixA0DRf/tf8CNqwe9lHSahQbwk="; - }; - - strictDeps = true; - nativeBuildInputs = [ - autoreconfHook - pkg-config - gettext - python3 - python3.pkgs.build - python3.pkgs.installer - python3.pkgs.setuptools - python3.pkgs.wheel - # Docs, man, info - texinfo - help2man - ]; - - buildInputs = [ - # lou_checkYaml - libyaml - ]; - - nativeCheckInputs = [ - perl - ]; - - configureFlags = [ - # Required by Python bindings - "--enable-ucs4" - ]; - - postPatch = '' - patchShebangs tests - substituteInPlace python/louis/__init__.py.in --replace "###LIBLOUIS_SONAME###" "$out/lib/liblouis.so" - ''; - - postInstall = '' - pushd python - python -m build --no-isolation --outdir dist/ --wheel - python -m installer --prefix $out dist/*.whl - popd - ''; - - doCheck = true; - - meta = with lib; { - description = "Open-source braille translator and back-translator"; - homepage = "https://liblouis.io/"; - license = with licenses; [ - lgpl21Plus # library - gpl3Plus # tools - ]; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index 6b8c2ebeaa94..f2f6497b676b 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ Carbon AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Carbon AppKit ]; propagatedBuildInputs = [ glib ]; meta = with lib; { diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix deleted file mode 100644 index 97c48cfa2ca2..000000000000 --- a/pkgs/development/libraries/liblscp/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - cmake, - pkg-config, -}: - -stdenv.mkDerivation rec { - pname = "liblscp"; - version = "1.0.0"; - - src = fetchurl { - url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.gz"; - sha256 = "sha256-ZaPfB3Veg1YCBHieoK9fFqL0tB4PiNsY81oJmn2rd/I="; - }; - - postPatch = '' - # fix prefix to only appear once - substituteInPlace CMakeLists.txt \ - --replace-fail '"''${CONFIG_PREFIX}/' '"' - ''; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "http://www.linuxsampler.org"; - description = "LinuxSampler Control Protocol (LSCP) wrapper library"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libltc/default.nix b/pkgs/development/libraries/libltc/default.nix deleted file mode 100644 index a290b9bce9e0..000000000000 --- a/pkgs/development/libraries/libltc/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "libltc"; - version = "1.3.2"; - - src = fetchurl { - url = "https://github.com/x42/libltc/releases/download/v${version}/libltc-${version}.tar.gz"; - sha256 = "sha256-Cm1CzWwh6SWif6Vg3EWsgAV9J18jNCECglkJwC07Ekk="; - }; - - meta = with lib; { - homepage = "http://x42.github.io/libltc/"; - description = "POSIX-C Library for handling Linear/Logitudinal Time Code (LTC)"; - license = licenses.lgpl3Plus; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/liblxi/default.nix b/pkgs/development/libraries/liblxi/default.nix deleted file mode 100644 index 24c454d4ee7e..000000000000 --- a/pkgs/development/libraries/liblxi/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, cmake -, libtirpc, rpcsvc-proto, avahi, libxml2 -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "liblxi"; - version = "1.20"; - - src = fetchFromGitHub { - owner = "lxi-tools"; - repo = "liblxi"; - rev = "v${finalAttrs.version}"; - hash = "sha256-jS0huNkbyKrsJ3NkenrYtjkzLakOsTJpwlgSo98ribE="; - }; - - postPatch = '' - # needed by darwin - sed -e 1i'#include <string.h>' \ - -e 1i'#include <stdlib.h>' \ - -i src/bonjour.c - ''; - - nativeBuildInputs = [ meson ninja cmake pkg-config rpcsvc-proto ]; - - buildInputs = lib.optionals (!stdenv.isDarwin) [ - libtirpc - avahi - ] ++ [ - libxml2 - ]; - - meta = with lib; { - description = "Library for communicating with LXI compatible instruments"; - longDescription = '' - liblxi is an open source software library which offers a simple - API for communicating with LXI compatible instruments. - The API allows applications to easily discover instruments - on networks and communicate SCPI commands. - ''; - homepage = "https://lxi-tools.github.io/"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = [ maintainers.vq ]; - }; -}) diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix deleted file mode 100644 index a8c212ea8463..000000000000 --- a/pkgs/development/libraries/libmad/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, autoconf - -# for passthru.tests -, audacity -, mpd -, normalize -, ocamlPackages -, streamripper -, vlc -}: - -stdenv.mkDerivation rec { - pname = "libmad"; - version = "0.15.1b"; - - src = fetchurl { - url = "mirror://sourceforge/mad/${pname}-${version}.tar.gz"; - sha256 = "14460zhacxhswnzb36qfpd1f2wbk10qvksvm6wyq5hpvdgnw7ymv"; - }; - - outputs = [ "out" "dev" ]; - - patches = [ - (fetchpatch { - url = "https://github.com/openwrt/packages/raw/openwrt-19.07/libs/libmad/patches/001-mips_removal_h_constraint.patch"; - sha256 = "0layswr6qg6axf4vyz6xrv73jwga34mkma3ifk9w9vrk41454hr5"; - }) - (fetchpatch { - url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/libmad.patch"; - sha256 = "0rysq0sn3dfdz6pa6bfqkmk4ymc4rzk5ym7p16dyk37sldg1pbzs"; - }) - (fetchpatch { - url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/amd64-64bit.diff"; - sha256 = "0mx56dmkbvw3zxnqd2hjng48q0d7q7473pns4n0ksdam29b0c5ar"; - }) - (fetchpatch { - name = "CVE-2017-8372-CVE-2017-8373.patch"; - url = "https://github.com/openwrt/packages/raw/openwrt-19.07/libs/libmad/patches/102-CVE-2017-8373-CVE-2017-8372-md-size.patch"; - sha256 = "0p6mkpn66h1ds8jvww28q4vlr58jwm58m9vb7pkvvyvy764agqnk"; - }) - (fetchpatch { - name = "CVE-2017-8374.patch"; - url = "https://github.com/openwrt/packages/raw/openwrt-19.07/libs/libmad/patches/101-CVE-2017-8374-length-check.patch"; - sha256 = "1j1ssxwmx9nfahzl62frbzck93xrjc2v3w30c12vmk29iflf1890"; - }) - ] - # optimize.diff is taken from https://projects.archlinux.org/svntogit/packages.git/tree/trunk/optimize.diff?h=packages/libmad - # It is included here in order to fix a build failure in Clang - # But it may be useful to fix other, currently unknown problems as well - ++ lib.optionals stdenv.cc.isClang [ - (fetchpatch { - url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/optimize.diff"; - sha256 = "0hcxzz9ql1fizyqbsgdchdwi7bvchfr72172j43hpyj53p0yabc6"; - }) - ]; - - # The -fforce-mem flag has been removed in GCC 4.3. - postPatch = '' - substituteInPlace configure.ac --replace "-fforce-mem" "" - substituteInPlace configure.ac --replace "arch=\"-march=i486\"" "" - ''; - - nativeBuildInputs = [ autoconf ]; - - preConfigure = "autoconf"; - - passthru.tests = { - inherit audacity mpd normalize streamripper vlc; - ocaml-mad = ocamlPackages.mad; - }; - - meta = with lib; { - homepage = "https://sourceforge.net/projects/mad/"; - description = "High-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2"; - license = licenses.gpl2; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix deleted file mode 100644 index 594ba202a6e1..000000000000 --- a/pkgs/development/libraries/libmanette/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib, stdenv -, fetchurl -, ninja -, meson -, mesonEmulatorHook -, pkg-config -, vala -, gobject-introspection -, buildPackages -, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, glib -, libgudev -, libevdev -, gnome -}: - -stdenv.mkDerivation rec { - pname = "libmanette"; - version = "0.2.9"; - - outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-KTZr5UUvYKdMZfxk/+LXTt3U5uaCTCzvpWekO9kraI8="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - glib - ] ++ lib.optionals withIntrospection [ - vala - gobject-introspection - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - ] ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ - glib - libevdev - ] ++ lib.optionals withIntrospection [ - libgudev - ]; - - mesonFlags = [ - (lib.mesonBool "doc" withIntrospection) - (lib.mesonEnable "gudev" withIntrospection) - (lib.mesonBool "introspection" withIntrospection) - (lib.mesonBool "vapi" withIntrospection) - ]; - - doCheck = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "Simple GObject game controller library"; - mainProgram = "manette-test"; - homepage = "https://gnome.pages.gitlab.gnome.org/libmanette/"; - license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix deleted file mode 100644 index 50b66eccfb3d..000000000000 --- a/pkgs/development/libraries/libmatchbox/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, libX11, libXext, libpng, libXft, libICE, pango, libjpeg}: - -stdenv.mkDerivation rec { - pname = "libmatchbox"; - version = "1.11"; - - buildInputs = [ libXft libICE pango libjpeg ]; - propagatedBuildInputs = [ libX11 libXext libpng ]; - NIX_LDFLAGS = "-lX11"; - - src = fetchurl { - url = "https://downloads.yoctoproject.org/releases/matchbox/libmatchbox/${version}/libmatchbox-${version}.tar.bz2"; - sha256 = "0lvv44s3bf96zvkysa4ansxj2ffgj3b5kgpliln538q4wd9ank15"; - }; - - meta = { - description = "Library of the matchbox X window manager"; - homepage = "http://matchbox-project.org/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix deleted file mode 100644 index 7ee8b8656647..000000000000 --- a/pkgs/development/libraries/libmatheval/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, guile, flex, fetchpatch }: - -stdenv.mkDerivation rec { - version = "1.1.11"; - pname = "libmatheval"; - - nativeBuildInputs = [ pkg-config flex ]; - buildInputs = [ guile ]; - - src = fetchurl { - url = "https://ftp.gnu.org/gnu/libmatheval/${pname}-${version}.tar.gz"; - sha256 = "474852d6715ddc3b6969e28de5e1a5fbaff9e8ece6aebb9dc1cc63e9e88e89ab"; - }; - - # Patches coming from debian package - # https://packages.debian.org/source/sid/libs/libmatheval - patches = [ - (fetchpatch { - url = "https://sources.debian.org/data/main/libm/libmatheval/1.1.11%2Bdfsg-5/debian/patches/002-skip-docs.patch"; - hash = "sha256-wjz54FKQq7t9Bz0W3EOu+ZPTt8EcfkMotkZKwlWa09o="; - }) - (fetchpatch { - url = "https://sources.debian.org/data/main/libm/libmatheval/1.1.11%2Bdfsg-5/debian/patches/003-guile3.0.patch"; - hash = "sha256-H3E/2m4MfQAbjpXbVFyNhikVifi3spVThzaVU5srmjI="; - }) - (fetchpatch { - url = "https://sources.debian.org/data/main/libm/libmatheval/1.1.11%2Bdfsg-5/debian/patches/disable_coth_test.patch"; - hash = "sha256-9XeMXWDTzELWTPcsjAqOlIzp4qY9yupU+e6r0rJEUS0="; - }) - ]; - - env.NIX_CFLAGS_COMPILE = "-I${lib.getDev guile}/include/guile/${guile.effectiveVersion}"; - env.NIX_LDFLAGS = "-L${guile}/lib -lguile-${guile.effectiveVersion}"; - - meta = { - description = "Library to parse and evaluate symbolic expressions input as text"; - longDescription = '' - GNU libmatheval is a library (callable from C and Fortran) to parse and evaluate symbolic - expressions input as text. It supports expressions in any number of variables of arbitrary - names, decimal and symbolic constants, basic unary and binary operators, and elementary - mathematical functions. In addition to parsing and evaluation, libmatheval can also compute - symbolic derivatives and output expressions to strings. - ''; - homepage = "https://www.gnu.org/software/libmatheval/"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.bzizou ]; - platforms = lib.platforms.unix; - }; -} - diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix deleted file mode 100644 index 9a944abbb1ec..000000000000 --- a/pkgs/development/libraries/libmaxminddb/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libmaxminddb"; - version = "1.10.0"; - - src = fetchurl { - url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-Xm23LfQjriJb/oiXBp9t70D6qJMfRWuZ15uLTWZMZnE="; - }; - - meta = with lib; { - description = "C library for working with MaxMind geolocation DB files"; - homepage = "https://github.com/maxmind/libmaxminddb"; - license = licenses.asl20; - maintainers = teams.helsinki-systems.members; - mainProgram = "mmdblookup"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix deleted file mode 100644 index ee4acc094e66..000000000000 --- a/pkgs/development/libraries/libmbim/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, meson -, ninja -, pkg-config -, glib -, python3 -, help2man -, bash-completion -, bash -, buildPackages -, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages -, withDocs ? stdenv.hostPlatform == stdenv.buildPlatform -, gobject-introspection -}: - -stdenv.mkDerivation rec { - pname = "libmbim"; - version = "1.30.0"; - - outputs = [ "out" "dev" ] - ++ lib.optionals withDocs [ "man" ]; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "mobile-broadband"; - repo = "libmbim"; - rev = version; - hash = "sha256-sHTpu9WeMZroT+1I18ObEHWSzcyj/Relyz8UNe+WawI="; - }; - - mesonFlags = [ - "-Dudevdir=${placeholder "out"}/lib/udev" - (lib.mesonBool "introspection" withIntrospection) - (lib.mesonBool "man" withDocs) - ]; - - strictDeps = true; - - nativeBuildInputs = [ - meson - ninja - pkg-config - python3 - ] ++ lib.optionals withDocs [ - help2man - ] ++ lib.optionals withIntrospection [ - gobject-introspection - ]; - - buildInputs = [ - glib - bash-completion - bash - ]; - - doCheck = true; - - postPatch = '' - patchShebangs \ - build-aux/mbim-codegen/mbim-codegen - ''; - - meta = with lib; { - homepage = "https://www.freedesktop.org/wiki/Software/libmbim/"; - description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"; - changelog = "https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/raw/${version}/NEWS"; - maintainers = teams.freedesktop.members; - platforms = platforms.linux; - license = licenses.gpl2Plus; - }; -} diff --git a/pkgs/development/libraries/libmcfp/default.nix b/pkgs/development/libraries/libmcfp/default.nix deleted file mode 100644 index 37d667ffee9a..000000000000 --- a/pkgs/development/libraries/libmcfp/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, stdenv -, cmake -, fetchFromGitHub -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libmcfp"; - version = "1.3.3"; - - src = fetchFromGitHub { - owner = "mhekkel"; - repo = "libmcfp"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-hAY560uFrrM3gH3r4ArprWEsK/1w/XXDeyTMIYUv+qY="; - }; - - nativeBuildInputs = [ - cmake - ]; - - meta = with lib; { - description = "Header only library that can collect configuration options from command line arguments"; - homepage = "https://github.com/mhekkel/libmcfp"; - changelog = "https://github.com/mhekkel/libmcfp/blob/${finalAttrs.src.rev}/changelog"; - license = licenses.bsd2; - maintainers = with maintainers; [ natsukium ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix deleted file mode 100644 index 6a4b0adfefb4..000000000000 --- a/pkgs/development/libraries/libmcrypt/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, cctools, disablePosixThreads ? false }: - -stdenv.mkDerivation rec { - pname = "libmcrypt"; - version = "2.5.8"; - - src = fetchurl { - url = "mirror://sourceforge/mcrypt/Libmcrypt/${version}/libmcrypt-${version}.tar.gz"; - sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4"; - }; - - buildInputs = lib.optional stdenv.isDarwin cctools; - - configureFlags = lib.optionals disablePosixThreads [ "--disable-posix-threads" ] - ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # AC_FUNC_MALLOC is broken on cross builds. - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ]; - - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration -Wno-implicit-int"; - }; - - meta = { - description = "Replacement for the old crypt() package and crypt(1) command, with extensions"; - mainProgram = "libmcrypt-config"; - homepage = "https://mcrypt.sourceforge.net"; - license = "GPL"; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix deleted file mode 100644 index 867bd5dc9ba3..000000000000 --- a/pkgs/development/libraries/libmd/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: - -stdenv.mkDerivation (finalAttrs: { - pname = "libmd"; - version = "1.1.0"; - - src = fetchurl { - urls = [ - "https://archive.hadrons.org/software/libmd/libmd-${finalAttrs.version}.tar.xz" - "https://libbsd.freedesktop.org/releases/libmd-${finalAttrs.version}.tar.xz" - ]; - sha256 = "sha256-G9aqQidTE68xQcfPLluWTosf1IgCXK8vlx9DsAd2szI="; - }; - - enableParallelBuilding = true; - - doCheck = true; - - nativeBuildInputs = [ autoreconfHook ]; - - meta = with lib; { - homepage = "https://www.hadrons.org/software/libmd/"; - changelog = "https://archive.hadrons.org/software/libmd/libmd-${finalAttrs.version}.announce"; - # Git: https://git.hadrons.org/cgit/libmd.git - description = "Message Digest functions from BSD systems"; - license = with licenses; [ bsd3 bsd2 isc beerware publicDomain ]; - maintainers = with maintainers; [ primeos ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix deleted file mode 100644 index a68db1389ab5..000000000000 --- a/pkgs/development/libraries/libmediaart/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, meson, mesonEmulatorHook, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome }: - -stdenv.mkDerivation rec { - pname = "libmediaart"; - version = "1.9.6"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "w7xQJdfbOAWH+cjrgAxhH2taFta0t4/P+T9ih2pnfxc="; - }; - - nativeBuildInputs = [ meson ninja pkg-config vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ] - ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ glib gdk-pixbuf ]; - - mesonFlags = [ - "-Dgtk_doc=true" - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - description = "Library tasked with managing, extracting and handling media art caches"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix deleted file mode 100644 index 07fe854c777c..000000000000 --- a/pkgs/development/libraries/libmemcached/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }: - -stdenv.mkDerivation rec { - pname = "libmemcached"; - version = "1.0.18"; - - src = fetchurl { - url = "https://launchpad.net/libmemcached/${lib.versions.majorMinor version}/${version}/+download/libmemcached-${version}.tar.gz"; - sha256 = "10jzi14j32lpq0if0p9vygcl2c1352hwbywzvr9qzq7x6aq0nb72"; - }; - - # Fix linking against libpthread (patch from Fedora) - # https://bugzilla.redhat.com/show_bug.cgi?id=1037707 - # https://bugs.launchpad.net/libmemcached/+bug/1281907 - # Fix building on macOS (patch from Homebrew) - # https://bugs.launchpad.net/libmemcached/+bug/1245562 - patches = lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch - ++ lib.optional stdenv.isDarwin (fetchpatch { - url = "https://raw.githubusercontent.com/Homebrew/homebrew/bfd4a0a4626b61c2511fdf573bcbbc6bbe86340e/Library/Formula/libmemcached.rb"; - sha256 = "1gjf3vd7hiyzxjvlg2zfc3y2j0lyr6nhbws4xb5dmin3csyp8qb8"; - }) - ++ lib.optional stdenv.hostPlatform.isMusl ./musl-fixes.patch; - - buildInputs = [ libevent ]; - propagatedBuildInputs = [ cyrus_sasl ]; - - env.NIX_CFLAGS_COMPILE = "-fpermissive"; - - meta = with lib; { - homepage = "https://libmemcached.org"; - description = "Open source C/C++ client library and tools for the memcached server"; - license = licenses.bsd3; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch b/pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch deleted file mode 100644 index e5e21c433587..000000000000 --- a/pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up libmemcached-1.0.16/build-aux/ltmain.sh.orig libmemcached-1.0.16/build-aux/ltmain.sh ---- libmemcached-1.0.16/build-aux/ltmain.sh.orig 2013-12-03 16:36:53.222107642 +0100 -+++ libmemcached-1.0.16/build-aux/ltmain.sh 2013-12-03 16:37:35.770132249 +0100 -@@ -5664,6 +5664,15 @@ func_mode_link () - *" $arg "*) ;; - * ) func_append new_inherited_linker_flags " $arg" ;; - esac -+ # As we are forced to pass -nostdlib to g++ during linking, the option -+ # -pthread{,s} is not in effect; add the -lpthread to $deplist -+ # explicitly to link correctly. -+ if test "$tagname" = CXX -a x"$with_gcc" = xyes; then -+ case "$arg" in -+ -pthread*) func_append deplibs " -lpthread" ;; -+ esac -+ fi -+ - continue - ;; - diff --git a/pkgs/development/libraries/libmemcached/musl-fixes.patch b/pkgs/development/libraries/libmemcached/musl-fixes.patch deleted file mode 100644 index eb2a6bc980eb..000000000000 --- a/pkgs/development/libraries/libmemcached/musl-fixes.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/libhashkit/fnv_64.cc b/libhashkit/fnv_64.cc -index 68e4dd0..64656b7 100644 ---- a/libhashkit/fnv_64.cc -+++ b/libhashkit/fnv_64.cc -@@ -37,8 +37,9 @@ - - - #include <libhashkit/common.h> -+#include <limits.h> - --#if __WORDSIZE == 64 && defined(HAVE_FNV64_HASH) -+#if (LONG_BITS == 64) && defined(HAVE_FNV64_HASH) - - /* FNV hash'es lifted from Dustin Sallings work */ - static uint64_t FNV_64_INIT= 0xcbf29ce484222325; -diff --git a/libhashkit/has.cc b/libhashkit/has.cc -index 843e32e..4153e5e 100644 ---- a/libhashkit/has.cc -+++ b/libhashkit/has.cc -@@ -37,6 +37,7 @@ - - - #include <libhashkit/common.h> -+#include <limits.h> - - bool libhashkit_has_algorithm(const hashkit_hash_algorithm_t algo) - { -@@ -44,7 +45,7 @@ bool libhashkit_has_algorithm(const hashkit_hash_algorithm_t algo) - { - case HASHKIT_HASH_FNV1_64: - case HASHKIT_HASH_FNV1A_64: --#if __WORDSIZE == 64 && defined(HAVE_FNV64_HASH) -+#if (LONG_BITS == 64) && defined(HAVE_FNV64_HASH) - return true; - #else - return false; -diff --git a/libtest/cmdline.cc b/libtest/cmdline.cc -index 29a22de..161c646 100644 ---- a/libtest/cmdline.cc -+++ b/libtest/cmdline.cc -@@ -61,7 +61,7 @@ using namespace libtest; - #include <algorithm> - #include <stdexcept> - --#ifndef __USE_GNU -+#ifndef _GNU_SOURCE - static char **environ= NULL; - #endif - -@@ -201,7 +201,7 @@ Application::error_t Application::run(const char *args[]) - - fatal_assert(posix_spawnattr_setsigmask(&spawnattr, &mask) == 0); - --#if defined(POSIX_SPAWN_USEVFORK) || defined(__linux__) -+#if defined(POSIX_SPAWN_USEVFORK) || defined(__GLIBC__) - // Use USEVFORK on linux - flags |= POSIX_SPAWN_USEVFORK; - #endif diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix deleted file mode 100644 index 128975246a8a..000000000000 --- a/pkgs/development/libraries/libmesode/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, autoreconfHook -, libtool -, openssl -, expat -, pkg-config -, check -}: - -stdenv.mkDerivation rec { - pname = "libmesode"; - version = "0.10.1"; - - src = fetchFromGitHub { - owner = "profanity-im"; - repo = "libmesode"; - rev = version; - sha256 = "1bxnkhrypgv41qyy1n545kcggmlw1hvxnhwihijhhcf2pxd2s654"; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ openssl expat libtool check ]; - - dontDisableStatic = true; - - doCheck = true; - - meta = with lib; { - description = "Fork of libstrophe (https://github.com/strophe/libstrophe) for use with Profanity XMPP Client"; - longDescription = '' - Reasons for forking: - - - Remove Windows support - - Support only one XML Parser implementation (expat) - - Support only one SSL implementation (OpenSSL) - - This simplifies maintenance of the library when used in Profanity. - Whilst Profanity will run against libstrophe, libmesode provides extra - TLS functionality such as manual SSL certificate verification. - ''; - homepage = "https://github.com/profanity-im/libmesode/"; - license = with licenses; [ gpl3Only mit]; - platforms = platforms.unix; - broken = stdenv.isDarwin; - maintainers = with maintainers; [ devhell ]; - }; -} diff --git a/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch b/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch deleted file mode 100644 index 1e3a5d680df6..000000000000 --- a/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch +++ /dev/null @@ -1,78 +0,0 @@ -Patch fixing #DEFINE redefinitions for generic PACKAGE_* attributes which -cause collisions when using libmhash in another package also using autotools. - -Debian Bug report #473204 - -diff -x configure -x config.guess -x config.sub -x 'Makefile.*' -Nru -mhash-0.9.9.orig/configure.in mhash-0.9.9/configure.in ---- mhash-0.9.9.orig/configure.in 2007-04-04 19:22:28.000000000 -0700 -+++ mhash-0.9.9/configure.in 2008-03-29 00:21:24.000000000 -0800 -@@ -6,6 +6,7 @@ - AM_INIT_AUTOMAKE - - AC_DEFINE([MHASH_VERSION], PROGRAM_VERSION, "MHash Version") -+AC_CONFIG_HEADER([include/mutils/config.h]) - AC_CONFIG_HEADER([include/mutils/mhash_config.h]) - - -diff -x configure -x config.guess -x config.sub -x 'Makefile.*' -Nru -mhash-0.9.9.orig/include/mutils/config.h.in -mhash-0.9.9/include/mutils/config.h.in ---- mhash-0.9.9.orig/include/mutils/config.h.in 1969-12-31 16:00:00.000000000 --0800 -+++ mhash-0.9.9/include/mutils/config.h.in 2008-03-29 00:48:22.000000000 --0800 -@@ -0,0 +1,22 @@ -+/* Name of package */ -+#undef PACKAGE -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#undef PACKAGE_BUGREPORT -+ -+/* Define to the full name of this package. */ -+#undef PACKAGE_NAME -+ -+/* Define to the full name and version of this package. */ -+#undef PACKAGE_STRING -+ -+/* Define to the one symbol short name of this package. */ -+#undef PACKAGE_TARNAME -+ -+/* Define to the version of this package. */ -+#undef PACKAGE_VERSION -+ -+/* Version number of package */ -+#undef VERSION -+ -+ -diff -x configure -x config.guess -x config.sub -x 'Makefile.*' -Nru -mhash-0.9.9.orig/include/mutils/mhash_config.h.in -mhash-0.9.9/include/mutils/mhash_config.h.in ---- mhash-0.9.9.orig/include/mutils/mhash_config.h.in 2008-03-29 -00:23:29.000000000 -0800 -+++ mhash-0.9.9/include/mutils/mhash_config.h.in 2008-03-29 -00:06:41.000000000 -0800 -@@ -181,24 +181,6 @@ - /* Define to 1 if your C compiler doesn't accept -c and -o together. */ - #undef NO_MINUS_C_MINUS_O - --/* Name of package */ --#undef PACKAGE -- --/* Define to the address where bug reports for this package should be sent. */ --#undef PACKAGE_BUGREPORT -- --/* Define to the full name of this package. */ --#undef PACKAGE_NAME -- --/* Define to the full name and version of this package. */ --#undef PACKAGE_STRING -- --/* Define to the one symbol short name of this package. */ --#undef PACKAGE_TARNAME -- --/* Define to the version of this package. */ --#undef PACKAGE_VERSION -- - /* Define to 1 if the C compiler supports function prototypes. */ - #undef PROTOTYPES diff --git a/pkgs/development/libraries/libmhash/default.nix b/pkgs/development/libraries/libmhash/default.nix deleted file mode 100644 index 0cccefb99980..000000000000 --- a/pkgs/development/libraries/libmhash/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "mhash"; - version = "0.9.9.9"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1w7yiljan8gf1ibiypi6hm3r363imm3sxl1j8hapjdq3m591qljn"; - }; - - dontDisableStatic = true; - - patches = [ ./autotools-define-conflict-debian-fix.patch ]; - - meta = { - description = "Hash algorithms library"; - longDescription = '' - Libmhash is a library that provides a uniform interface to several hash - algorithms. It supports the basics for message authentication by - following rfc2104 (HMAC). It also includes some key generation algorithms - which are based on hash algorithms. - ''; - homepage = "https://mhash.sourceforge.net"; - license = "LGPL"; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libmicrodns/default.nix b/pkgs/development/libraries/libmicrodns/default.nix deleted file mode 100644 index c9dd899a2b00..000000000000 --- a/pkgs/development/libraries/libmicrodns/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -}: - -stdenv.mkDerivation rec { - version = "0.2.0"; - pname = "libmicrodns"; - - src = fetchFromGitHub { - owner = "videolabs"; - repo = pname; - rev = version; - sha256 = "05vgka45c1frnv4q7pbz0bggsn5xaykh4xpklh9yb6d6qj7dbx0b"; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - meta = with lib; { - description = "Minimal mDNS resolver library, used by VLC"; - homepage = "https://github.com/videolabs/libmicrodns"; - license = licenses.lgpl21; - platforms = platforms.unix; - maintainers = [ maintainers.shazow ]; - }; -} diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index f3122d8ab210..6e3f7eee3c57 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -13,14 +13,14 @@ in stdenv.mkDerivation rec { }; buildInputs = [ texinfo ] - ++ optional stdenv.isLinux alsa-lib - ++ optional stdenv.isDarwin CoreAudio; + ++ optional stdenv.hostPlatform.isLinux alsa-lib + ++ optional stdenv.hostPlatform.isDarwin CoreAudio; propagatedBuildInputs = - optional stdenv.isLinux libpulseaudio; + optional stdenv.hostPlatform.isLinux libpulseaudio; outputs = [ "out" "dev" "man" ]; - NIX_LDFLAGS = optionalString stdenv.isLinux "-lasound"; + NIX_LDFLAGS = optionalString stdenv.hostPlatform.isLinux "-lasound"; postInstall = '' moveToOutput bin/libmikmod-config "$dev" diff --git a/pkgs/development/libraries/libmilter/darwin.patch b/pkgs/development/libraries/libmilter/darwin.patch deleted file mode 100644 index 9bad640450c6..000000000000 --- a/pkgs/development/libraries/libmilter/darwin.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix build issues on Darwin. - ---- a/devtools/OS/Darwin 2014-03-05 01:59:45.000000000 +0100 -+++ b/devtools/OS/Darwin 2020-05-18 14:47:57.000000000 +0200 -@@ -8,6 +8,8 @@ - # We look a lot more like 4.4BSD than NeXTStep or OpenStep. - # - define(`confCC', `cc -traditional-cpp -pipe ${Extra_CC_Flags}') -+define(`confCCOPTS_SO', `-fPIC') -+define(`confSOEXT', `dylib') - define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX -DNETINFO -DAUTO_NETINFO_ALIASES -DAUTO_NETINFO_HOSTS') - define(`confENVDEF', `-DDARWIN') - define(`confLDOPTS', `${Extra_LD_Flags}') ---- a/sendmail/sendmail.h 2020-05-18 14:51:17.000000000 +0200 -+++ b/sendmail/sendmail.h 2020-05-18 14:51:00.000000000 +0200 -@@ -122,7 +122,11 @@ - # endif - - #if NAMED_BIND --# include <arpa/nameser.h> -+# ifdef __APPLE__ -+# include <arpa/nameser_compat.h> -+# else -+# include <arpa/nameser.h> -+# endif - # ifdef NOERROR - # undef NOERROR /* avoid <sys/streams.h> conflict */ - # endif diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix deleted file mode 100644 index a06f3d4deca1..000000000000 --- a/pkgs/development/libraries/libmilter/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchurl, m4, fixDarwinDylibNames }: - -stdenv.mkDerivation rec { - pname = "libmilter"; - version = "8.18.1"; - - src = fetchurl { - url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.${version}.tar.gz"; - sha256 = "sha256-y/HzCcOOSAb3zz6tJCYPF9H+j7YyVtE+2zzdGgmPB3A="; - }; - - buildPhase = '' - mkdir -p $out/lib - cd libmilter - cat > a.m4 <<EOF - define(\`confCC', \`$CC') - define(\`confAR', \`$AR') - define(\`confEBINDIR', \`$out/libexec') - define(\`confINCLUDEDIR', \`$out/include') - define(\`confLIBDIR', \`$out/lib') - define(\`confMANROOT', \`$out/man/cat') - define(\`confMANROOTMAN', \`$out/man/man') - define(\`confMBINDIR', \`$out/sbin') - define(\`confSBINDIR', \`$out/sbin') - define(\`confSHAREDLIBDIR', \`$out/lib') - define(\`confUBINDIR', \`$out/bin') - define(\`confINCGRP', \`root') - define(\`confLIBGRP', \`root') - APPENDDEF(\`confENVDEF', \`-DNETINET6') - EOF - export MILTER_SOVER=1 - sh Build -f ./a.m4 - ''; - - patches = [ ./install.patch ./sharedlib.patch ./darwin.patch ]; - - nativeBuildInputs = [ m4 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - - postInstall = lib.optionalString stdenv.isDarwin '' - fixDarwinDylibNames $out/lib/libmilter.*.1 - ''; - - meta = with lib; { - description = "Sendmail Milter mail filtering API library"; - platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; - license = licenses.sendmail; - }; -} diff --git a/pkgs/development/libraries/libmilter/install.patch b/pkgs/development/libraries/libmilter/install.patch deleted file mode 100644 index f6d3574ca4c1..000000000000 --- a/pkgs/development/libraries/libmilter/install.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -rc sendmail-8.14.4/devtools/M4/UNIX/library.m4 sendmail-8.14.4-new/devtools/M4/UNIX/library.m4 -*** sendmail-8.14.4/devtools/M4/UNIX/library.m4 Wed Sep 6 00:56:53 2006 ---- sendmail-8.14.4-new/devtools/M4/UNIX/library.m4 Tue Feb 9 11:25:13 2010 -*************** -*** 28,34 **** - - install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.a - ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ') -! ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}') - - bldCURRENT_PRODUCT-clean: - rm -f ${OBJS} bldCURRENT_PRODUCT.a ${MANPAGES} ---- 28,34 ---- - - install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.a - ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ') -! ${INSTALL} -c bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}') - - bldCURRENT_PRODUCT-clean: - rm -f ${OBJS} bldCURRENT_PRODUCT.a ${MANPAGES} -diff -rc sendmail-8.14.4/libmilter/Makefile.m4 sendmail-8.14.4-new/libmilter/Makefile.m4 -*** sendmail-8.14.4/libmilter/Makefile.m4 Tue Nov 24 22:59:33 2009 ---- sendmail-8.14.4-new/libmilter/Makefile.m4 Tue Feb 9 10:47:19 2010 -*************** -*** 33,40 **** - MFDEF= ${SRCDIR}/inc`'lude/libmilter/mfdef.h - install-mfapi: ${MFAPI} - if [ ! -d ${DESTDIR}${INCLUDEDIR}/libmilter ]; then mkdir -p ${DESTDIR}${INCLUDEDIR}/libmilter; else :; fi -! ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} ${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h -! ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} ${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h - divert(0) - - bldFINISH ---- 33,40 ---- - MFDEF= ${SRCDIR}/inc`'lude/libmilter/mfdef.h - install-mfapi: ${MFAPI} - if [ ! -d ${DESTDIR}${INCLUDEDIR}/libmilter ]; then mkdir -p ${DESTDIR}${INCLUDEDIR}/libmilter; else :; fi -! ${INSTALL} -c ${MFAPI} ${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h -! ${INSTALL} -c ${MFDEF} ${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h - divert(0) - - bldFINISH diff --git a/pkgs/development/libraries/libmilter/sharedlib.patch b/pkgs/development/libraries/libmilter/sharedlib.patch deleted file mode 100644 index 1e256c59ec3e..000000000000 --- a/pkgs/development/libraries/libmilter/sharedlib.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4 sendmail-8.14.3/devtools/M4/UNIX/milterlibrary.m4 ---- sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4 1970-01-01 01:00:00.000000000 +0100 -+++ sendmail-8.14.3/devtools/M4/UNIX/milterlibrary.m4 2009-08-22 21:51:10.000000000 +0200 -@@ -0,0 +1,39 @@ -+divert(-1) -+# -+# Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers. -+# All rights reserved. -+# -+# By using this file, you agree to the terms and conditions set -+# forth in the LICENSE file which can be found at the top level of -+# the sendmail distribution. -+# -+# -+# Definitions for Makefile construction for sendmail -+# -+divert(0)dnl -+include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/links.m4')dnl -+define(`confSOEXT', ifdef(`confSOEXT', `confSOEXT', `so'))dnl -+bldLIST_PUSH_ITEM(`bldC_PRODUCTS', bldCURRENT_PRODUCT)dnl -+bldPUSH_TARGET(bldCURRENT_PRODUCT`.'confSOEXT bldCURRENT_PRODUCT`.a')dnl -+bldPUSH_INSTALL_TARGET(`install-'bldCURRENT_PRODUCT)dnl -+bldPUSH_CLEAN_TARGET(bldCURRENT_PRODUCT`-clean')dnl -+ -+include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/defines.m4') -+divert(bldTARGETS_SECTION) -+bldCURRENT_PRODUCT`.'confSOEXT: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'} -+ ${CCLINK} ${LDOPTS_SO} -o bldCURRENT_PRODUCT.confSOEXT ifdef(`confSONAME',`-Wl,confSONAME,bldCURRENT_PRODUCT.confSOEXT.${MILTER_SOVER}') ${bldCURRENT_PRODUCT`OBJS'} -lc ${LIBS} -+bldCURRENT_PRODUCT.a: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'} -+ ${AR} ${AROPTS} bldCURRENT_PRODUCT.a ${bldCURRENT_PRODUCT`OBJS'} -+ ${RANLIB} ${RANLIBOPTS} bldCURRENT_PRODUCT.a -+ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)') -+ -+install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.confSOEXT bldCURRENT_PRODUCT.a -+ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'LIBDIR}"; else :; fi ') -+ ${INSTALL} -c bldCURRENT_PRODUCT.confSOEXT "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.confSOEXT.${MILTER_SOVER}" -+ ${LN} ${LNOPTS} bldCURRENT_PRODUCT.confSOEXT.${MILTER_SOVER} "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.confSOEXT" -+ ${INSTALL} -c -m 644 bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"') -+ -+bldCURRENT_PRODUCT-clean: -+ rm -f ${OBJS} bldCURRENT_PRODUCT.confSOEXT bldCURRENT_PRODUCT.a ${MANPAGES} -+ -+divert(0) -+COPTS+= confCCOPTS_SO -diff -Nru sendmail-8.14.3.orig/libmilter/Makefile.m4 sendmail-8.14.3/libmilter/Makefile.m4 ---- sendmail-8.14.3.orig/libmilter/Makefile.m4 2008-04-08 07:23:44.000000000 +0200 -+++ sendmail-8.14.3/libmilter/Makefile.m4 2009-08-22 21:53:35.000000000 +0200 -@@ -9,7 +9,7 @@ - SMSRCDIR=ifdef(`confSMSRCDIR', `confSMSRCDIR', `${SRCDIR}/sendmail') - PREPENDDEF(`confINCDIRS', `-I${SMSRCDIR} ') - --bldPRODUCT_START(`library', `libmilter') -+bldPRODUCT_START(`milterlibrary', `libmilter') - define(`bldINSTALLABLE', `true') - define(`LIBMILTER_EXTRAS', `errstring.c strl.c') - APPENDDEF(`confENVDEF', `-DNOT_SENDMAIL -Dsm_snprintf=snprintf') diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix deleted file mode 100644 index 189d2b12e519..000000000000 --- a/pkgs/development/libraries/libminc/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, zlib, netcdf, nifticlib, hdf5 }: - -stdenv.mkDerivation (finalAttrs: { - pname = "libminc"; - version = "2.4.06"; - - src = fetchFromGitHub { - owner = "BIC-MNI"; - repo = "libminc"; - rev = "refs/tags/release-${finalAttrs.version}"; - hash = "sha256-HTt3y0AFM9pkEkWPb9cDmvUz4iBQWfpX7wLF9Vlg8hc="; - }; - - postPatch = '' - patchShebangs . - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - zlib - nifticlib - ]; - propagatedBuildInputs = [ - netcdf - hdf5 - ]; - - cmakeFlags = [ - "-DLIBMINC_MINC1_SUPPORT=ON" - "-DLIBMINC_BUILD_SHARED_LIBS=ON" - "-DLIBMINC_USE_NIFTI=ON" - "-DLIBMINC_USE_SYSTEM_NIFTI=ON" - ]; - - doCheck = !stdenv.isDarwin; - # -j1: see https://github.com/BIC-MNI/libminc/issues/110 - checkPhase = '' - ctest -j1 --output-on-failure - ''; - - meta = with lib; { - homepage = "https://github.com/BIC-MNI/libminc"; - description = "Medical imaging library based on HDF5"; - maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.free; - }; -}) diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/development/libraries/libmkv/default.nix deleted file mode 100644 index 584d76e1cf2b..000000000000 --- a/pkgs/development/libraries/libmkv/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libtool, autoconf, automake }: - -stdenv.mkDerivation rec { - pname = "libmkv"; - version = "0.6.5.1"; - - src = fetchFromGitHub { - owner = "saintdev"; - repo = pname; - rev = "refs/tags/${version}"; - sha256 = "0pr9q7yprndl8d15ir7i7cznvmf1yqpvnsyivv763n6wryssq6dl"; - }; - - nativeBuildInputs = [ libtool autoconf automake ]; - - preConfigure = "sh bootstrap.sh"; - - meta = { - description = "Abandoned library. Alternative lightweight Matroska muxer written for HandBrake"; - longDescription = '' - Library was meant to be an alternative to the official libmatroska library. - It is written in plain C, and intended to be very portable. - ''; - homepage = "https://github.com/saintdev/libmkv"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.wmertens ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/development/libraries/libmms/default.nix deleted file mode 100644 index 0d099e77b6e3..000000000000 --- a/pkgs/development/libraries/libmms/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, glib, pkg-config }: - -stdenv.mkDerivation rec { - pname = "libmms"; - version = "0.6.4"; - - src = fetchurl { - url = "mirror://sourceforge/libmms/libmms-${version}.tar.gz"; - sha256 = "0kvhxr5hkabj9v7ah2rzkbirndfqdijd9hp8v52c1z6bxddf019w"; - }; - - buildInputs = [ glib ]; - - nativeBuildInputs = [ pkg-config ]; - - meta = with lib; { - description = "Library for downloading (streaming) media files using the mmst and mmsh protocols"; - homepage = "http://libmms.sourceforge.net"; - platforms = platforms.all; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix deleted file mode 100644 index 19896b13998d..000000000000 --- a/pkgs/development/libraries/libmng/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl, zlib, libpng, libjpeg, lcms2 }: - -stdenv.mkDerivation rec { - pname = "libmng"; - version = "2.0.3"; - - src = fetchurl { - url = "mirror://sourceforge/libmng/${pname}-${version}.tar.xz"; - sha256 = "1lvxnpds0vcf0lil6ia2036ghqlbl740c4d2sz0q5g6l93fjyija"; - }; - - outputs = [ "out" "dev" "devdoc" ]; - outputMan= "devdoc"; - - propagatedBuildInputs = [ zlib libpng libjpeg lcms2 ]; - - meta = with lib; { - description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics"; - homepage = "http://www.libmng.com"; - license = licenses.zlib; - maintainers = with maintainers; [ marcweber ]; - platforms = platforms.unix ++ platforms.windows; - }; -} diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix deleted file mode 100644 index 9a6f6a1d14dc..000000000000 --- a/pkgs/development/libraries/libmnl/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libmnl"; - version = "1.0.5"; - - src = fetchurl { - url = "https://netfilter.org/projects/libmnl/files/${pname}-${version}.tar.bz2"; - sha256 = "09851ns07399rbz0y8slrlmnw3fn1nakr8d37pxjn5gkks8rnjr7"; - }; - - meta = { - description = "Minimalistic user-space library oriented to Netlink developers"; - longDescription = '' - libmnl is a minimalistic user-space library oriented to Netlink developers. - There are a lot of common tasks in parsing, validating, constructing of both the Netlink - header and TLVs that are repetitive and easy to get wrong. - This library aims to provide simple helpers that allows you to re-use code and to avoid - re-inventing the wheel. - ''; - homepage = "https://netfilter.org/projects/libmnl/index.html"; - license = lib.licenses.lgpl21Plus; - - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/development/libraries/libmodbus/default.nix deleted file mode 100644 index e76b528395ef..000000000000 --- a/pkgs/development/libraries/libmodbus/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "libmodbus"; - version = "3.1.10"; - - src = fetchFromGitHub { - owner = "stephane"; - repo = "libmodbus"; - rev = "v${version}"; - hash = "sha256-e2lB5D41a5MOmz9M90ZXfIltSOxNDOrQUpRNU2yYd1k="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - configureFlags = [ - # when cross-compiling we assume that the host system will return a valid - # pointer for calls to malloc(0) or realloc(0) - # https://www.uclibc.org/FAQ.html#gnu_malloc - # https://www.gnu.org/software/autoconf/manual/autoconf.html#index-AC_005fFUNC_005fMALLOC-454 - # the upstream source should be patched to avoid needing this - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ]; - - meta = with lib; { - description = "Library to send/receive data according to the Modbus protocol"; - homepage = "https://libmodbus.org/"; - license = licenses.lgpl21Plus; - platforms = with platforms; unix ++ windows; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix deleted file mode 100644 index 334dfa9d8015..000000000000 --- a/pkgs/development/libraries/libmodplug/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, file }: - -stdenv.mkDerivation rec { - pname = "libmodplug"; - version = "0.8.9.0"; - - src = fetchurl { - url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${pname}-${version}.tar.gz"; - sha256 = "1pnri98a603xk47smnxr551svbmgbzcw018mq1k6srbrq6kaaz25"; - }; - - # Unfortunately, upstream appears inactive and the patches from the fork don’t apply cleanly. - # Modify `src/fastmix.cpp` to remove usage of the register storage class, which is - # not allowed in C++17 and is an error in clang 16. - prePatch = "substituteInPlace src/fastmix.cpp --replace 'register ' ''"; - - outputs = [ "out" "dev" ]; - - preConfigure = '' - substituteInPlace configure \ - --replace ' -mmacosx-version-min=10.5' "" \ - --replace /usr/bin/file ${file}/bin/file - ''; - - meta = with lib; { - description = "MOD playing library"; - homepage = "https://modplug-xmms.sourceforge.net/"; - license = licenses.publicDomain; - platforms = platforms.unix; - maintainers = with maintainers; [ raskin ]; - }; -} diff --git a/pkgs/development/libraries/libmodule/default.nix b/pkgs/development/libraries/libmodule/default.nix deleted file mode 100644 index dd98908f3111..000000000000 --- a/pkgs/development/libraries/libmodule/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, cmake, pkg-config }: - -stdenv.mkDerivation rec { - pname = "libmodule"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "FedeDP"; - repo = "libmodule"; - rev = version; - sha256 = "sha256-wkRiDWO9wUyxkAeqvm99u22Jq4xnQJx6zS7Sb+R8iMg="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - # https://github.com/FedeDP/libmodule/issues/7 - postPatch = '' - substituteInPlace Extra/libmodule.pc.in \ - --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - - meta = with lib; { - description = "C simple and elegant implementation of an actor library"; - homepage = "https://github.com/FedeDP/libmodule"; - platforms = platforms.linux; - license = licenses.mit; - maintainers = with maintainers; [ - eadwu - ]; - }; -} diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/development/libraries/libmodulemd/default.nix deleted file mode 100644 index 0769cf4b1c2b..000000000000 --- a/pkgs/development/libraries/libmodulemd/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch2 -, pkg-config -, meson -, ninja -, gobject-introspection -, python3 -, libyaml -, rpm -, file -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_412 -, glib -}: - -stdenv.mkDerivation rec { - pname = "libmodulemd"; - version = "2.15.0"; - - outputs = [ "bin" "out" "dev" "devdoc" "man" "py" ]; - - src = fetchFromGitHub { - owner = "fedora-modularity"; - repo = pname; - rev = "${pname}-${version}"; - sha256 = "sha256-mIyrdksyEk1AKV+vw4g8LUwlQRzwwMkPDuCbw2IiNcA="; - }; - - patches = [ - # Adapt to GLib 2.79 documentation - # https://github.com/fedora-modularity/libmodulemd/pull/612 - (fetchpatch2 { - url = "https://github.com/fedora-modularity/libmodulemd/commit/9d2809090cc0cccd7bab67453dc00cf43a289082.patch"; - hash = "sha256-dMtc6GN6lIDjUReFUhEFJ/8wosASo3tLu4ve72BCXQ8="; - }) - (fetchpatch2 { - url = "https://github.com/fedora-modularity/libmodulemd/commit/29c339a31b1c753dcdef041e5c2e0e600e48b59d.patch"; - hash = "sha256-uniHrQdbcXlJk2hq106SgV/E330LfxDc07E4FbOMLr0="; - }) - # Adapt to GLib 2.80.1 documentation - (fetchpatch2 { - url = "https://github.com/fedora-modularity/libmodulemd/commit/f3336199b4e69af3305f156abc7533bed9e9a762.patch"; - hash = "sha256-Rvg+/KTKiEBXVEK7tlcTDf53HkaW462g/rg1rHPzaZA="; - }) - ]; - - nativeBuildInputs = [ - pkg-config - meson - ninja - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_412 - gobject-introspection - ]; - - buildInputs = [ - libyaml - rpm - file # for libmagic - glib - ]; - - mesonFlags = [ - "-Dgobject_overrides_dir_py3=${placeholder "py"}/${python3.sitePackages}/gi/overrides" - ]; - - postPatch = '' - # Use proper glib devdoc path - substituteInPlace meson.build --replace-fail \ - "glib_docpath = join_paths(glib_prefix," "glib_docpath = join_paths('${lib.getOutput "devdoc" glib}'," - ''; - - postFixup = '' - # Python overrides depend our own typelibs and other packages - mkdir -p "$py/nix-support" - echo "$out ${python3.pkgs.pygobject3} ${python3.pkgs.six}" > "$py/nix-support/propagated-build-inputs" - ''; - - meta = with lib; { - description = "C Library for manipulating module metadata files"; - mainProgram = "modulemd-validator"; - homepage = "https://github.com/fedora-modularity/libmodulemd"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/libmongocrypt/default.nix b/pkgs/development/libraries/libmongocrypt/default.nix index f45d41fed628..0c887527307f 100644 --- a/pkgs/development/libraries/libmongocrypt/default.nix +++ b/pkgs/development/libraries/libmongocrypt/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ mongoc openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix deleted file mode 100644 index 5c999c4c1d48..000000000000 --- a/pkgs/development/libraries/libmowgli/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "libmowgli"; - version = "2.1.3"; - - src = fetchFromGitHub { - owner = "atheme"; - repo = "libmowgli-2"; - rev = "v${version}"; - sha256 = "sha256-jlw6ixMoIdIjmQ86N+KN+Gez218sw894POkcCYnT0s0="; - }; - - meta = with lib; { - description = "Development framework for C providing high performance and highly flexible algorithms"; - homepage = "https://github.com/atheme/libmowgli-2"; - license = licenses.isc; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix deleted file mode 100644 index 0e813375b9a2..000000000000 --- a/pkgs/development/libraries/libmp3splt/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, libtool, libmad, libid3tag }: - -stdenv.mkDerivation rec { - pname = "libmp3splt"; - version = "0.9.2"; - - src = fetchurl { - url = "mirror://sourceforge/mp3splt/${pname}-${version}.tar.gz"; - sha256 = "1p1mn2hsmj5cp40fnc8g1yfvk72p8pjxi866gjdkgjsqrr7xdvih"; - }; - - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ libtool ]; - buildInputs = [ libmad libid3tag ]; - - configureFlags = [ "--disable-pcre" ]; - - meta = with lib; { - homepage = "https://sourceforge.net/projects/mp3splt/"; - description = "Utility to split mp3, ogg vorbis and FLAC files without decoding"; - maintainers = with maintainers; [ bosu ]; - platforms = platforms.unix; - license = licenses.gpl2; - }; -} diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix deleted file mode 100644 index edb692d512d7..000000000000 --- a/pkgs/development/libraries/libmpack/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libtool }: - -stdenv.mkDerivation rec { - pname = "libmpack"; - version = "1.0.5"; - src = fetchFromGitHub { - owner = "libmpack"; - repo = "libmpack"; - rev = version; - sha256 = "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2"; - }; - - makeFlags = [ - "LIBTOOL=${libtool}/bin/libtool" - "PREFIX=$(out)" - "config=release" - ]; - - meta = with lib; { - description = "Simple implementation of msgpack in C"; - homepage = "https://github.com/tarruda/libmpack/"; - license = licenses.mit; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix deleted file mode 100644 index fe11b59f4523..000000000000 --- a/pkgs/development/libraries/libmpc/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchurl -, gmp, mpfr -}: - -# 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 { - pname = "libmpc"; - version = "1.3.1"; # to avoid clash with the MPD client - - src = fetchurl { - url = "mirror://gnu/mpc/mpc-${version}.tar.gz"; - sha256 = "sha256-q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg="; - }; - - strictDeps = true; - enableParallelBuilding = true; - - buildInputs = [ gmp mpfr ]; - - doCheck = true; # not cross; - - meta = { - description = "Library for multiprecision complex arithmetic with exact rounding"; - - longDescription = - '' GNU MPC is a C library for the arithmetic of complex numbers with - arbitrarily high precision and correct rounding of the result. It is - built upon and follows the same principles as GNU MPFR. - ''; - - homepage = "https://www.multiprecision.org/mpc/"; - license = lib.licenses.lgpl2Plus; - - platforms = lib.platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/pkgs/development/libraries/libmpcdec/default.nix deleted file mode 100644 index 753687221245..000000000000 --- a/pkgs/development/libraries/libmpcdec/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libmpcdec"; - version = "1.2.6"; - - src = fetchurl { - url = "https://files.musepack.net/source/libmpcdec-${version}.tar.bz2"; - sha256 = "1a0jdyga1zfi4wgkg3905y6inghy3s4xfs5m4x7pal08m0llkmab"; - }; - - meta = { - description = "Musepack SV7 decoder library"; - platforms = lib.platforms.unix; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix deleted file mode 100644 index baada92d4340..000000000000 --- a/pkgs/development/libraries/libmpeg2/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - version = "0.5.1"; - pname = "libmpeg2"; - - src = fetchurl { - url = "http://libmpeg2.sourceforge.net/files/${pname}-${version}.tar.gz"; - sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny"; - }; - - # Otherwise clang fails with 'duplicate symbol ___sputc' - buildFlags = lib.optional stdenv.isDarwin "CFLAGS=-std=gnu89"; - - meta = { - homepage = "http://libmpeg2.sourceforge.net/"; - description = "Free library for decoding mpeg-2 and mpeg-1 video streams"; - license = lib.licenses.gpl2; - maintainers = [ ]; - platforms = with lib.platforms; unix; - }; -} diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix deleted file mode 100644 index 136a30310916..000000000000 --- a/pkgs/development/libraries/libmspack/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "libmspack"; - version = "0.11alpha"; - - src = fetchurl { - url = "https://www.cabextract.org.uk/libmspack/${pname}-${version}.tar.gz"; - hash = "sha256-cN0fsvCuzDZ5G3Gh4YQOYhcweeraoIEZLRwyOg7uohs="; - }; - - meta = { - description = "De/compression library for various Microsoft formats"; - homepage = "https://www.cabextract.org.uk/libmspack"; - license = lib.licenses.lgpl2Only; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix deleted file mode 100644 index ea61234333b8..000000000000 --- a/pkgs/development/libraries/libmtp/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv -, autoconf -, automake -, fetchFromGitHub -, fetchpatch -, gettext -, lib -, libiconv -, libtool -, libusb1 -, pkg-config -, buildPackages -}: - -stdenv.mkDerivation rec { - pname = "libmtp"; - version = "1.1.21"; - - src = fetchFromGitHub { - owner = "libmtp"; - repo = "libmtp"; - rev = "libmtp-${builtins.replaceStrings [ "." ] [ "-" ] version}"; - sha256 = "sha256-m9QFVD8udQ3SdGwn276BnIKqGeATA5QuokOK29Ykc1k="; - }; - - patches = [ - # Backport cross fix. - (fetchpatch { - url = "https://github.com/libmtp/libmtp/commit/467fa26e6b14c0884b15cf6d191de97e5513fe05.patch"; - sha256 = "2DrRrdcguJ9su4LxtT6YOjer8gUTxIoHVpk+6M9P4cg="; - }) - ]; - - outputs = [ "bin" "dev" "out" ]; - - nativeBuildInputs = [ - autoconf - automake - gettext - libtool - pkg-config - ]; - - buildInputs = [ libiconv ]; - - propagatedBuildInputs = [ libusb1 ]; - - preConfigure = "NOCONFIGURE=1 ./autogen.sh"; - - configureFlags = [ "--with-udev=${placeholder "out"}/lib/udev" ]; - - configurePlatforms = [ "build" "host" ]; - - makeFlags = lib.optionals (stdenv.isLinux && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - "MTP_HOTPLUG=${buildPackages.libmtp}/bin/mtp-hotplug" - ]; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://github.com/libmtp/libmtp"; - description = "Implementation of Microsoft's Media Transfer Protocol"; - longDescription = '' - libmtp is an implementation of Microsoft's Media Transfer Protocol (MTP) - in the form of a library suitable primarily for POSIX compliant operating - systems. We implement MTP Basic, the stuff proposed for standardization. - ''; - platforms = platforms.unix; - license = licenses.lgpl21; - maintainers = with maintainers; [ lovesegfault ]; - }; -} diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix deleted file mode 100644 index cc2a292a0493..000000000000 --- a/pkgs/development/libraries/libmwaw/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge }: - -stdenv.mkDerivation rec { - pname = "libmwaw"; - version = "0.3.22"; - - src = fetchurl { - url = "mirror://sourceforge/libmwaw/libmwaw/libmwaw-${version}/libmwaw-${version}.tar.xz"; - sha256 = "sha256-oaOf/Oo/8qenquDCOHfd9JGLVUv4Kw3l186Of2HqjjI="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - boost - cppunit - zlib - libwpg - libwpd - librevenge - ]; - enableParallelBuilding = true; - - meta = with lib; { - description = "Import library for some old mac text documents"; - license = licenses.mpl20; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix deleted file mode 100644 index cdc4b4f077ad..000000000000 --- a/pkgs/development/libraries/libmx/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, libtool, pkg-config, automake, autoconf, intltool -, gobject-introspection, gtk2, gtk-doc -, clutter, clutter-gtk -}: - -stdenv.mkDerivation rec { - pname = "libmx"; - version = "1.4.7"; - - src = fetchFromGitHub { - owner = "clutter-project"; - repo = "mx"; - rev = version; - sha256 = "sha256-+heIPSkg3d22xsU48UOTJ9FPLXC7zLivcnabQOM9aEk="; - }; - - # remove the following superfluous checks - preConfigure = '' - substituteInPlace "autogen.sh" \ - --replace '`which intltoolize`' '"x"' \ - --replace '`which gtkdocize`' '"x"' \ - --replace '`which autoreconf`' '"x"' - ''; - - configureFlags = [ "--enable-introspection" - "--without-startup-notification" - "--without-dbus" - "--without-glade" - "--without-clutter-imcontext" - "--without-clutter-gesture" - ]; - - configureScript = "sh autogen.sh"; - - nativeBuildInputs = [ pkg-config automake autoconf intltool gobject-introspection ]; - buildInputs = [ - libtool - gtk2 gtk-doc clutter clutter-gtk - ]; - - # patch to resolve GL errors - # source : https://github.com/clutter-project/mx/pull/62 - preBuild = '' - sed -i 's/GLushort/gushort/g' mx/mx-deform-texture.c - sed -i 's/GLfloat/gfloat/g' mx/mx-texture-frame.c - ''; - - meta = with lib; { - homepage = "http://www.clutter-project.org/"; - description = "Clutter-based toolkit"; - mainProgram = "mx-create-image-cache"; - longDescription = - ''Mx is a widget toolkit using Clutter that provides a set of standard - interface elements, including buttons, progress bars, scroll bars and - others. It also implements some standard managers. One other interesting - feature is the possibility setting style properties from a CSS format - file.''; - license = licenses.lgpl21; - maintainers = [ ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix deleted file mode 100644 index 2e9f4bc2b866..000000000000 --- a/pkgs/development/libraries/libmypaint/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv -, autoconf -, automake -, fetchFromGitHub -, glib -, intltool -, json_c -, libtool -, pkg-config -, python3 -}: - -stdenv.mkDerivation rec { - pname = "libmypaint"; - version = "1.6.1"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "mypaint"; - repo = "libmypaint"; - rev = "v${version}"; - sha256 = "1ppgpmnhph9h8ayx9776f79a0bxbdszfw9c6bw7c3ffy2yk40178"; - }; - - nativeBuildInputs = [ - autoconf - automake - intltool - libtool - pkg-config - python3 - ]; - - buildInputs = [ - glib - ]; - - # for libmypaint.pc - propagatedBuildInputs = [ - json_c - ]; - - doCheck = true; - - preConfigure = "./autogen.sh"; - - meta = with lib; { - homepage = "http://mypaint.org/"; - description = "Library for making brushstrokes which is used by MyPaint and other projects"; - license = licenses.isc; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix deleted file mode 100644 index 21e648e5a998..000000000000 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv -, fetchurl -, cmake -, boost -, openssl -, mysql80 -}: - -stdenv.mkDerivation rec { - pname = "libmysqlconnectorcpp"; - version = "9.0.0"; - - src = fetchurl { - url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - hash = "sha256-7XEbT3sf/fyadgSOGVr/KH4tFd3evgvKhRsJ4UFCKzA="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - boost - openssl - mysql80 - ]; - - cmakeFlags = [ - # libmysqlclient is shared library - "-DMYSQLCLIENT_STATIC_LINKING=false" - # still needed for mysql-workbench - "-DWITH_JDBC=true" - ]; - - meta = { - homepage = "https://dev.mysql.com/downloads/connector/cpp/"; - description = "C++ library for connecting to mysql servers"; - license = lib.licenses.gpl2Only; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/development/libraries/libnabo/default.nix deleted file mode 100644 index 8be83148b514..000000000000 --- a/pkgs/development/libraries/libnabo/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{lib, stdenv, fetchFromGitHub, cmake, eigen, boost}: - -stdenv.mkDerivation rec { - version = "1.1.2"; - pname = "libnabo"; - - src = fetchFromGitHub { - owner = "ethz-asl"; - repo = "libnabo"; - rev = version; - sha256 = "sha256-/XXRwiLLaEvp+Q+c6lBiuWBb9by6o0pDf8wFtBNp7o8="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen boost ]; - - cmakeFlags = [ - "-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3" - ]; - - doCheck = true; - checkTarget = "test"; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Fast K Nearest Neighbor library for low-dimensional spaces"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ cryptix ]; - }; -} diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix deleted file mode 100644 index 49e89b97344b..000000000000 --- a/pkgs/development/libraries/libnatpmp/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, fixDarwinDylibNames -}: - -stdenv.mkDerivation rec { - pname = "libnatpmp"; - version = "20230423"; - - src = fetchurl { - url = "https://miniupnp.tuxfamily.org/files/${pname}-${version}.tar.gz"; - hash = "sha256-BoTtLIQGQ351GaG9IOqDeA24cbOjpddSMRuj6Inb/HA="; - }; - - patches = [ - # install natpmp_declspec.h too, else nothing that uses this library will build - (fetchpatch { - url = "https://github.com/miniupnp/libnatpmp/commit/5f4a7c65837a56e62c133db33c28cd1ea71db662.patch"; - hash = "sha256-tvoGFmo5AzUgb40bIs/EzikE0ex1SFzE5peLXhktnbc="; - }) - ]; - - makeFlags = [ - "INSTALLPREFIX=$(out)" - "CC:=$(CC)" - ]; - - nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; - - postFixup = '' - chmod +x $out/lib/* - ''; - - meta = with lib; { - description = "NAT-PMP client"; - homepage = "http://miniupnp.free.fr/libnatpmp.html"; - license = licenses.bsd3; - maintainers = with maintainers; [ orivej ]; - mainProgram = "natpmpc"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/development/libraries/libnats-c/default.nix deleted file mode 100644 index 5d641a386344..000000000000 --- a/pkgs/development/libraries/libnats-c/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, cmake, protobuf, protobufc -, libsodium, openssl -}: - -stdenv.mkDerivation rec { - pname = "libnats"; - version = "3.8.2"; - - src = fetchFromGitHub { - owner = "nats-io"; - repo = "nats.c"; - rev = "v${version}"; - sha256 = "sha256-Tn88RRigL6C36AcFhUlLbLyqcqbBR8z6PKAQH4w/mYY="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libsodium openssl protobuf protobufc ]; - - separateDebugInfo = true; - outputs = [ "out" "dev" ]; - - # https://github.com/nats-io/nats.c/issues/542 - postPatch = '' - substituteInPlace src/libnats.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ - ''; - - meta = with lib; { - description = "C API for the NATS messaging system"; - homepage = "https://github.com/nats-io/nats.c"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice ]; - }; -} diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix deleted file mode 100644 index 1ec57144b1a0..000000000000 --- a/pkgs/development/libraries/libnatspec/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, popt, libiconv }: - -stdenv.mkDerivation rec { - pname = "libnatspec"; - version = "0.3.0"; - - src = fetchurl { - url = "mirror://sourceforge/natspec/${pname}-${version}.tar.bz2"; - sha256 = "0wffxjlc8svilwmrcg3crddpfrpv35mzzjgchf8ygqsvwbrbb3b7"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ popt ]; - - propagatedBuildInputs = [ libiconv ]; - - meta = with lib; { - homepage = "https://natspec.sourceforge.net/"; - description = "Library intended to smooth national specificities in using of programs"; - mainProgram = "natspec"; - platforms = platforms.unix; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix deleted file mode 100644 index d2ccec80a570..000000000000 --- a/pkgs/development/libraries/libndctl/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - meson, - ninja, - pkg-config, - asciidoctor, - iniparser, - json_c, - keyutils, - kmod, - udev, - util-linux, -}: - -stdenv.mkDerivation rec { - pname = "libndctl"; - version = "79"; - - src = fetchFromGitHub { - owner = "pmem"; - repo = "ndctl"; - rev = "v${version}"; - sha256 = "sha256-gG1Rz5AtDLzikGFr8A3l25ypd+VoLw2oWjszy9ogDLk="; - }; - - outputs = [ - "out" - "man" - "dev" - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - asciidoctor - ]; - - buildInputs = [ - iniparser - json_c - keyutils - kmod - udev - util-linux - ]; - - mesonFlags = [ - (lib.mesonOption "rootprefix" "${placeholder "out"}") - (lib.mesonOption "sysconfdir" "${placeholder "out"}/etc/ndctl.conf.d") - (lib.mesonEnable "libtracefs" false) - # Use asciidoctor due to xmlto errors - (lib.mesonEnable "asciidoctor" true) - (lib.mesonEnable "systemd" false) - (lib.mesonOption "iniparserdir" "${iniparser}") - ]; - - postPatch = '' - patchShebangs test - - substituteInPlace git-version --replace-fail /bin/bash ${stdenv.shell} - substituteInPlace git-version-gen --replace-fail /bin/sh ${stdenv.shell} - - echo "m4_define([GIT_VERSION], [${version}])" > version.m4; - ''; - - meta = { - description = "Tools for managing the Linux Non-Volatile Memory Device sub-system"; - homepage = "https://github.com/pmem/ndctl"; - license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ thoughtpolice ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libndp/default.nix b/pkgs/development/libraries/libndp/default.nix deleted file mode 100644 index 17831d646cbc..000000000000 --- a/pkgs/development/libraries/libndp/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, gitUpdater }: - -stdenv.mkDerivation rec { - pname = "libndp"; - version = "1.9"; - - src = fetchurl { - url = "http://libndp.org/files/libndp-${version}.tar.gz"; - hash = "sha256-qKshTgHcOpthUnaQU5VjfzkSmMhNd2UfDL8LEILdLdQ="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "ac_cv_func_malloc_0_nonnull=yes" - ]; - - passthru.updateScript = gitUpdater { - url = "https://github.com/jpirko/libndp.git"; - rev-prefix = "v"; - }; - - meta = with lib; { - homepage = "http://libndp.org/"; - description = "Library for Neighbor Discovery Protocol"; - mainProgram = "ndptool"; - platforms = platforms.linux; - maintainers = [ ]; - license = licenses.lgpl21; - }; - -} diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix deleted file mode 100644 index 175b48f10934..000000000000 --- a/pkgs/development/libraries/libndtypes/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -}: - -stdenv.mkDerivation { - pname = "libndtypes"; - version = "unstable-2019-08-01"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "xnd-project"; - repo = "ndtypes"; - rev = "3ce6607c96d8fe67b72cc0c97bf595620cdd274e"; - sha256 = "18303q0jfar1lmi4krp94plczb455zcgw772f9lb8xa5p0bkhx01"; - }; - - # Override linker with cc (symlink to either gcc or clang) - # Library expects to use cc for linking - configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ]; - - doCheck = true; - - meta = with lib; { - description = "Dynamic types for data description and in-memory computations"; - homepage = "https://xnd.io/"; - license = licenses.bsdOriginal; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/libraries/libnest2d/default.nix b/pkgs/development/libraries/libnest2d/default.nix deleted file mode 100644 index b3aba528f924..000000000000 --- a/pkgs/development/libraries/libnest2d/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost }: - -stdenv.mkDerivation { - version = "4.12.0"; - pname = "libnest2d"; - - # This revision is waiting to be merged upstream - # Once it has been merged, this should be switched to it - # Upstream PR: https://github.com/tamasmeszaros/libnest2d/pull/18 - src = fetchFromGitHub { - owner = "Ultimaker"; - repo = "libnest2d"; - rev = "31391fd173249ad9b906390058e13b09238fadc8"; - sha256 = "1hzqi4z55x76rss3xk7hfqhy9hcaq2jaav5jqxa1aqmbvarr2gla"; - }; - - postPatch = '' - substituteInPlace {,examples/}CMakeLists.txt \ - --replace "set(CMAKE_CXX_STANDARD 11)" "set(CMAKE_CXX_STANDARD 14)" - ''; - - propagatedBuildInputs = [ clipper nlopt boost ]; - nativeBuildInputs = [ cmake ]; - - CLIPPER_PATH = "${clipper.out}"; - cmakeFlags = [ "-DLIBNEST2D_HEADER_ONLY=OFF" ]; - - meta = with lib; { - description = - "2D irregular bin packaging and nesting library written in modern C++"; - homepage = "https://github.com/Ultimaker/libnest2d"; - license = licenses.lgpl3; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix deleted file mode 100644 index c8f38387111f..000000000000 --- a/pkgs/development/libraries/libnet/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool }: - -stdenv.mkDerivation rec { - pname = "libnet"; - version = "1.3"; - - src = fetchFromGitHub { - owner = "sam-github"; - repo = "libnet"; - rev = "v${version}"; - hash = "sha256-P3LaDMMNPyEnA8nO1Bm7H0mW/hVBr0cFdg+p2JmWcGI="; - }; - - nativeBuildInputs = [ - autoconf - automake - libtool - ]; - - preConfigure = "./autogen.sh"; - - meta = with lib; { - homepage = "https://github.com/sam-github/libnet"; - description = "Portable framework for low-level network packet construction"; - mainProgram = "libnet-config"; - license = licenses.bsd3; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/development/libraries/libnetfilter_acct/default.nix deleted file mode 100644 index 6c52d7f7b560..000000000000 --- a/pkgs/development/libraries/libnetfilter_acct/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libmnl }: - -stdenv.mkDerivation rec { - version = "1.0.3"; - pname = "libnetfilter_acct"; - - src = fetchurl { - url = "https://www.netfilter.org/projects/libnetfilter_acct/files/${pname}-${version}.tar.bz2"; - sha256 = "06lsjndgfjsgfjr43px2n2wk3nr7whz6r405mks3887y7vpwwl22"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libmnl ]; - - meta = with lib; { - homepage = "https://www.netfilter.org/projects/libnetfilter_acct/"; - description = "Userspace library providing interface to extended accounting infrastructure"; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix deleted file mode 100644 index c424879a8191..000000000000 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libnfnetlink, libmnl }: - -stdenv.mkDerivation rec { - pname = "libnetfilter_conntrack"; - version = "1.0.9"; - - src = fetchurl { - url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Z72d9J/jTouCFE9t+5OzIPOEqOpZcn6S/40YtfS1eag="; - }; - - patches = [ - # Fix Musl build. - (fetchpatch { - url = "https://git.netfilter.org/libnetfilter_conntrack/patch/?id=21ee35dde73aec5eba35290587d479218c6dd824"; - sha256 = "00rp82jrx5ygcw8la3c7bv7sigw9qzbn956dk71qjx981a2g2kqk"; - }) - ]; - - hardeningDisable = [ "trivialautovarinit" ]; - - buildInputs = [ libmnl ]; - propagatedBuildInputs = [ libnfnetlink ]; - nativeBuildInputs = [ pkg-config ]; - - meta = with lib; { - description = "Userspace library providing an API to the in-kernel connection tracking state table"; - longDescription = '' - libnetfilter_conntrack is a userspace library providing a programming interface (API) to the - in-kernel connection tracking state table. The library libnetfilter_conntrack has been - previously known as libnfnetlink_conntrack and libctnetlink. This library is currently used - by conntrack-tools among many other applications - ''; - homepage = "https://netfilter.org/projects/libnetfilter_conntrack/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix deleted file mode 100644 index 5d221bed34a0..000000000000 --- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libmnl }: - -stdenv.mkDerivation rec { - pname = "libnetfilter_cthelper"; - version = "1.0.1"; - - src = fetchurl { - url = "https://netfilter.org/projects/libnetfilter_cthelper/files/${pname}-${version}.tar.bz2"; - sha256 = "sha256-FAc9VIcjOJc1XT/wTdwcjQPMW6jSNWI2qogWGp8tyRI="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libmnl ]; - - meta = { - description = "Userspace library that provides the programming interface to the user-space connection tracking helper infrastructure"; - longDescription = '' - libnetfilter_cthelper is the userspace library that provides the programming interface - to the user-space helper infrastructure available since Linux kernel 3.6. With this - library, you register, configure, enable and disable user-space helpers. This library - is used by conntrack-tools. - ''; - homepage = "https://www.netfilter.org/projects/libnetfilter_cthelper/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix deleted file mode 100644 index d4b53a181871..000000000000 --- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libmnl }: - -stdenv.mkDerivation rec { - pname = "libnetfilter_cttimeout"; - version = "1.0.1"; - - src = fetchurl { - url = "https://netfilter.org/projects/libnetfilter_cttimeout/files/${pname}-${version}.tar.bz2"; - sha256 = "sha256-C1naLzIE4cgMuF0fbXIoX8B7AaL1Z4q/Xcz7vv1lAyU="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libmnl ]; - - meta = { - description = "Userspace library that provides the programming interface to the connection tracking timeout infrastructure"; - longDescription = '' - libnetfilter_cttimeout is the userspace library that provides the programming - interface to the fine-grain connection tracking timeout infrastructure. - With this library, you can create, update and delete timeout policies that can - be attached to traffic flows. This library is used by conntrack-tools. - ''; - homepage = "https://netfilter.org/projects/libnetfilter_cttimeout/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix deleted file mode 100644 index aadc3d92b597..000000000000 --- a/pkgs/development/libraries/libnetfilter_log/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }: - -stdenv.mkDerivation rec { - pname = "libnetfilter_log"; - version = "1.0.2"; - - src = fetchurl { - url = "https://netfilter.org/projects/libnetfilter_log/files/${pname}-${version}.tar.bz2"; - sha256 = "1spy9xs41v76kid5ana8n126f3mvgq6fjibbfbj4kn0larbhix73"; - }; - - buildInputs = [ libmnl ]; - propagatedBuildInputs = [ libnfnetlink ]; - nativeBuildInputs = [ pkg-config ]; - - meta = with lib; { - description = "Userspace library providing interface to packets that have been logged by the kernel packet filter"; - longDescription = '' - libnetfilter_log is a userspace library providing interface to packets - that have been logged by the kernel packet filter. It is is part of a - system that deprecates the old syslog/dmesg based packet logging. This - library has been previously known as libnfnetlink_log. - ''; - homepage = "https://netfilter.org/projects/libnetfilter_log/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ orivej ]; - }; -} diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix deleted file mode 100644 index d1783289965e..000000000000 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libmnl, libnfnetlink }: - -stdenv.mkDerivation rec { - version = "1.0.5"; - pname = "libnetfilter_queue"; - - src = fetchurl { - url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${pname}-${version}.tar.bz2"; - sha256 = "1xdra6i4p8jkv943ygjw646qx8df27f7p5852kc06vjx608krzzr"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libmnl libnfnetlink ]; - - meta = with lib; { - homepage = "https://www.netfilter.org/projects/libnetfilter_queue/"; - description = "Userspace API to packets queued by the kernel packet filter"; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix deleted file mode 100644 index 88bc909ea0e6..000000000000 --- a/pkgs/development/libraries/libnfc/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, libusb-compat-0_1 -, readline -, cmake -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "libnfc"; - version = "1.8.0"; - - src = fetchFromGitHub { - owner = "nfc-tools"; - repo = pname; - rev = "libnfc-${version}"; - sha256 = "5gMv/HajPrUL/vkegEqHgN2d6Yzf01dTMrx4l34KMrQ="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - libusb-compat-0_1 - readline - ]; - - configureFlags = [ - "sysconfdir=/etc" - ]; - - cmakeFlags = lib.optionals stdenv.isDarwin [ - "-DLIBNFC_DRIVER_PN532_I2C=OFF" - "-DLIBNFC_DRIVER_PN532_SPI=OFF" - ]; - - meta = with lib; { - description = "Library for Near Field Communication (NFC)"; - homepage = "https://github.com/nfc-tools/libnfc"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix deleted file mode 100644 index 3b6b804a8dc6..000000000000 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libnfnetlink"; - version = "1.0.2"; - - src = fetchurl { - url = "https://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${version}.tar.bz2"; - sha256 = "0xn3rcrzxr6g82kfxzs9bqn2zvl2kf2yda30drwb9vr6sk1wfr5h"; - }; - - meta = { - description = "Low-level library for netfilter related kernel/userspace communication"; - longDescription = '' - libnfnetlink is the low-level library for netfilter related kernel/userspace communication. - It provides a generic messaging infrastructure for in-kernel netfilter subsystems - (such as nfnetlink_log, nfnetlink_queue, nfnetlink_conntrack) and their respective users - and/or management tools in userspace. - - This library is not meant as a public API for application developers. - It is only used by other netfilter.org projects, like the aforementioned ones. - ''; - homepage = "https://www.netfilter.org/projects/libnfnetlink/index.html"; - license = lib.licenses.gpl2; - - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix deleted file mode 100644 index d9beee7933fa..000000000000 --- a/pkgs/development/libraries/libnfs/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "libnfs"; - version = "5.0.2"; - - src = fetchFromGitHub { - owner = "sahlberg"; - repo = "libnfs"; - rev = "libnfs-${version}"; - sha256 = "sha256-rdxi5bPXHTICZQIj/CmHgZ/V70svnITJj/OSF4mmC3o="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - patches = [ - # Fixes 100% CPU usage in multi-threaded mode - (fetchpatch { - url = "https://github.com/sahlberg/libnfs/commit/34d6fe37e986da5b0ced86cd028a88e482537d5a.patch"; - sha256 = "sha256-i7mi+TVdkLb4MztT5Ic/Q8XBIWk9lo8v5bNjHOr6LaI="; - }) - # Fixes deprecation warnings on macOS - (fetchpatch { - url = "https://github.com/sahlberg/libnfs/commit/f6631c54a7b0385988f11357bf96728a6d7345b9.patch"; - sha256 = "sha256-xLRZ9J1vr04n//gNv9ljUBt5LHUGBRRVIXJCMlFbHFI="; - }) - ]; - - configureFlags = [ - "--enable-pthread" - ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "NFS client library"; - homepage = "https://github.com/sahlberg/libnfs"; - license = with licenses; [ lgpl2 bsd2 gpl3 ]; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix deleted file mode 100644 index 1da5bf5a6de5..000000000000 --- a/pkgs/development/libraries/libnftnl/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libmnl, gitUpdater }: - -stdenv.mkDerivation rec { - version = "1.2.7"; - pname = "libnftnl"; - - src = fetchurl { - url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz"; - hash = "sha256-kSJ3T5aAk9XAus3dZ95IDzH6QHNAWn/AWKNLDzh67LM="; - }; - - configureFlags = lib.optional (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "LDFLAGS=-Wl,--undefined-version"; - - 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/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ fpletz ] ++ teams.helsinki-systems.members; - }; -} diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix deleted file mode 100644 index 3578441dd61a..000000000000 --- a/pkgs/development/libraries/libngspice/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchurl -, flex -, bison -, fftw -, withNgshared ? true -, libXaw -, libXext -, llvmPackages -, readline -}: - -stdenv.mkDerivation rec { - pname = "${lib.optionalString withNgshared "lib"}ngspice"; - version = "43"; - - src = fetchurl { - url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - hash = "sha256-FN1qbwhTHyBRwTrmN5CkVwi9Q/PneIamqEiYwpexNpk="; - }; - - nativeBuildInputs = [ - flex - bison - ]; - - buildInputs = [ - fftw - readline - ] ++ lib.optionals (!withNgshared) [ - libXaw - libXext - ] ++ lib.optionals stdenv.isDarwin [ - llvmPackages.openmp - ]; - - configureFlags = lib.optionals withNgshared [ - "--with-ngshared" - ] ++ [ - "--enable-xspice" - "--enable-cider" - ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Next Generation Spice (Electronic Circuit Simulator)"; - mainProgram = "ngspice"; - homepage = "http://ngspice.sourceforge.net"; - license = with licenses; [ bsd3 gpl2Plus lgpl2Plus ]; # See https://sourceforge.net/p/ngspice/ngspice/ci/master/tree/COPYING - maintainers = with maintainers; [ bgamari rongcuid ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix deleted file mode 100644 index 72419deaccb5..000000000000 --- a/pkgs/development/libraries/libnice/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ lib, stdenv -, fetchurl -, fetchpatch -, meson -, ninja -, pkg-config -, python3 -, gobject-introspection -, gtk-doc -, docbook_xsl -, docbook_xml_dtd_412 -, glib -, gupnp-igd -, gst_all_1 -, gnutls -, graphviz -}: - -stdenv.mkDerivation rec { - pname = "libnice"; - version = "0.1.22"; - - outputs = [ "bin" "out" "dev" ] - ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; - - src = fetchurl { - url = "https://libnice.freedesktop.org/releases/${pname}-${version}.tar.gz"; - hash = "sha256-pfckzwnq5QxBp1FxQdidpKYeyerKMtpKAHP67VQXrX4="; - }; - - patches = [ - # Fix generating data - # Note: upstream is not willing to merge our fix - # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/35#note_98871 - (fetchpatch { - url = "https://gitlab.freedesktop.org/libnice/libnice/commit/d470c4bf4f2449f7842df26ca1ce1efb63452bc6.patch"; - sha256 = "0z74vizf92flfw1m83p7yz824vfykmnm0xbnk748bnnyq186i6mg"; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - python3 - gobject-introspection - - # documentation - gtk-doc - docbook_xsl - docbook_xml_dtd_412 - graphviz - ]; - - buildInputs = [ - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gnutls - gupnp-igd - ]; - - propagatedBuildInputs = [ - glib - ]; - - mesonFlags = [ - "-Dgtk_doc=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" - "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" - "-Dexamples=disabled" # requires many dependencies and probably not useful for our users - ]; - - # Tests are flaky - # see https://github.com/NixOS/nixpkgs/pull/53293#issuecomment-453739295 - doCheck = false; - - meta = with lib; { - description = "GLib ICE implementation"; - longDescription = '' - Libnice is an implementation of the IETF's Interactice Connectivity - Establishment (ICE) standard (RFC 5245) and the Session Traversal - Utilities for NAT (STUN) standard (RFC 5389). - - It provides a GLib-based library, libnice and a Glib-free library, - libstun as well as GStreamer elements.''; - homepage = "https://libnice.freedesktop.org/"; - platforms = platforms.unix; - license = with licenses; [ lgpl21 mpl11 ]; - }; -} diff --git a/pkgs/development/libraries/libnitrokey/default.nix b/pkgs/development/libraries/libnitrokey/default.nix deleted file mode 100644 index 6b847a8e742d..000000000000 --- a/pkgs/development/libraries/libnitrokey/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, hidapi -, libusb1 -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libnitrokey"; - version = "3.8"; - - src = fetchFromGitHub { - owner = "Nitrokey"; - repo = "libnitrokey"; - rev = "v${finalAttrs.version}"; - hash = "sha256-4PEZ31QyVOmdhpKqTN8fwcHoLuu+w+OJ3fZeqwlE+io="; - # On OSX, libnitrokey depends on a custom version of hidapi in a submodule. - # Monitor https://github.com/Nitrokey/libnitrokey/issues/140 to see if we - # can remove this extra work one day. - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - cmakeFlags = [ - "-DADD_GIT_INFO=OFF" - "-DCMAKE_INSTALL_UDEVRULESDIR=etc/udev/rules.d" - ]; - - buildInputs = [ libusb1 ]; - - propagatedBuildInputs = [ hidapi ]; - - meta = with lib; { - description = "Communicate with Nitrokey devices in a clean and easy manner"; - homepage = "https://github.com/Nitrokey/libnitrokey"; - license = licenses.lgpl3; - maintainers = with maintainers; [ panicgh raitobezarius ]; - }; -}) diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/development/libraries/libnixxml/default.nix deleted file mode 100644 index 7a9e0580e37e..000000000000 --- a/pkgs/development/libraries/libnixxml/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix, bash}: - -stdenv.mkDerivation { - pname = "libnixxml"; - version = "unstable-2020-06-25"; - - src = fetchFromGitHub { - owner = "svanderburg"; - repo = "libnixxml"; - rev = "54c04a5fdbc8661b2445a7527f499e0a77753a1a"; - sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ="; - }; - - prePatch = '' - # Remove broken test - substituteInPlace tests/draw/Makefile.am \ - --replace "draw-wrong.sh" "" - rm tests/draw/draw-wrong.sh - - # Fix bash path - substituteInPlace scripts/nixexpr2xml.in \ - --replace "/bin/bash" "${bash}/bin/bash" - ''; - - preAutoreconf = '' - # Copied from bootstrap script - ln -s README.md README - mkdir -p config - ''; - - configureFlags = [ "--with-gd" "--with-glib" ]; - CFLAGS = "-Wall"; - - strictDeps = true; - nativeBuildInputs = [ - autoreconfHook - pkg-config - getopt - libxslt - ]; - buildInputs = [ - bash - libxml2 - gd.dev - glib - nix - ]; - nativeCheckInputs = [ - nix - ]; - - doCheck = true; - - meta = with lib; { - description = "XML-based Nix-friendly data integration library"; - homepage = "https://github.com/svanderburg/libnixxml"; - license = licenses.mit; - maintainers = with maintainers; [ tomberek ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix deleted file mode 100644 index cb8506dca6ca..000000000000 --- a/pkgs/development/libraries/libnotify/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, libxslt -, docbook-xsl-ns -, glib -, gdk-pixbuf -, gnome -, buildPackages -, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages -, gobject-introspection -}: - -stdenv.mkDerivation rec { - pname = "libnotify"; - version = "0.8.3"; - - outputs = [ "out" "man" "dev" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-7o8++UYVatNAb99F/u29zZMtvSEatPFvdeuk82+y9sA="; - }; - - mesonFlags = [ - # disable tests as we don't need to depend on GTK (2/3) - "-Dtests=false" - "-Ddocbook_docs=disabled" - "-Dgtk_doc=false" - "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" - ]; - - strictDeps = true; - - nativeBuildInputs = [ - meson - ninja - pkg-config - libxslt - docbook-xsl-ns - glib # for glib-mkenums needed during the build - ] ++ lib.optionals withIntrospection [ - gobject-introspection - ]; - - propagatedBuildInputs = [ - gdk-pixbuf - glib - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - description = "Library that sends desktop notifications to a notification daemon"; - homepage = "https://gitlab.gnome.org/GNOME/libnotify"; - license = licenses.lgpl21; - maintainers = teams.gnome.members; - mainProgram = "notify-send"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/development/libraries/libnsl/default.nix deleted file mode 100644 index b199406918ab..000000000000 --- a/pkgs/development/libraries/libnsl/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtirpc, pkg-config }: - -stdenv.mkDerivation rec { - pname = "libnsl"; - version = "2.0.1"; - - src = fetchFromGitHub { - owner = "thkukuk"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-bCToqXVE4RZcoZ2eTNZcVHyzKlWyIpSAssQCOZcfmEA="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libtirpc ]; - - meta = with lib; { - description = "Client interface library for NIS(YP) and NIS+"; - homepage = "https://github.com/thkukuk/libnsl"; - license = licenses.lgpl21; - maintainers = [ maintainers.dezgeg ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libnut/default.nix b/pkgs/development/libraries/libnut/default.nix deleted file mode 100644 index c89206209963..000000000000 --- a/pkgs/development/libraries/libnut/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv -, lib -, fetchgit -}: -stdenv.mkDerivation rec { - pname = "libnut"; - version = "unstable-2020-11-06"; - - src = fetchgit { - url = "https://git.ffmpeg.org/nut.git"; - rev = "12f6a7af3e0f34fd957cf078b66f072d3dc695b3"; - sha256 = "1wgl2mb9482c1j3yac0v2ilfjs7gb9mhw9kjnrmlj9kp0whm4l1j"; - }; - - sourceRoot = "${src.name}/src/trunk"; - makeFlags = ["prefix=$(out)"]; - installTargets = [ - "install-libnut" - "install-nututils" - ]; - - meta = with lib; { - description = "Library to read/write the NUT video container format"; - homepage = "https://git.ffmpeg.org/gitweb/nut.git"; - license = licenses.mit; - maintainers = with maintainers; [quag]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix deleted file mode 100644 index 3f2f02987fbb..000000000000 --- a/pkgs/development/libraries/liboauth/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ fetchurl, lib, stdenv, nss, nspr, pkg-config }: - - -stdenv.mkDerivation rec { - pname = "liboauth"; - version = "1.0.3"; - - src = fetchurl { - url = "mirror://sourceforge/liboauth/${pname}-${version}.tar.gz"; - sha256 = "07w1aq8y8wld43wmbk2q8134p3bfkp2vma78mmsfgw2jn1bh3xhd"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ pkg-config ]; - - propagatedBuildInputs = [ nss nspr ]; - - configureFlags = [ "--enable-nss" ]; - - postInstall = '' - substituteInPlace $out/lib/liboauth.la \ - --replace "-lnss3" "-L${nss.out}/lib -lnss3" - ''; - - meta = with lib; { - platforms = platforms.all; - description = "C library implementing the OAuth secure authentication protocol"; - homepage = "http://liboauth.sourceforge.net/"; - license = licenses.mit; - }; - -} diff --git a/pkgs/development/libraries/libodb-sqlite/default.nix b/pkgs/development/libraries/libodb-sqlite/default.nix deleted file mode 100644 index 547ff807d441..000000000000 --- a/pkgs/development/libraries/libodb-sqlite/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv -, build2 -, fetchurl -, libodb -, sqlite -, enableShared ? !stdenv.hostPlatform.isStatic -, enableStatic ? !enableShared -}: -stdenv.mkDerivation rec { - pname = "libodb-sqlite"; - version = "2.5.0-b.27"; - - outputs = [ "out" "dev" "doc" ]; - - src = fetchurl { - url = "https://pkg.cppget.org/1/beta/odb/libodb-sqlite-${version}.tar.gz"; - hash = "sha256-jpxtY/VMkh88IzqGYgedu5TZGVIbPpy/FZNvUaOMf+w="; - }; - - nativeBuildInputs = [ - build2 - ]; - buildInputs = [ - libodb - ]; - propagatedBuildInputs = [ - sqlite - ]; - - build2ConfigureFlags = [ - "config.bin.lib=${build2.configSharedStatic enableShared enableStatic}" - ]; - - doCheck = true; - - meta = with lib; { - description = "SQLite ODB runtime library"; - longDescription = '' - ODB is an object-relational mapping (ORM) system for C++. It provides - tools, APIs, and library support that allow you to persist C++ objects - to a relational database (RDBMS) without having to deal with tables, - columns, or SQL and without manually writing any of the mapping code. - For more information see: - - http://www.codesynthesis.com/products/odb/ - - This package contains the SQLite ODB runtime library. Every application - that includes code generated for the SQLite database will need to link - to this library. - ''; - homepage = "https://www.codesynthesis.com/products/odb/"; - changelog = "https://git.codesynthesis.com/cgit/odb/libodb-sqlite/tree/NEWS"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ r-burns ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libodb/default.nix b/pkgs/development/libraries/libodb/default.nix deleted file mode 100644 index b83e4d5c6816..000000000000 --- a/pkgs/development/libraries/libodb/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv -, build2 -, fetchurl -, enableShared ? !stdenv.hostPlatform.isStatic -, enableStatic ? !enableShared -}: -stdenv.mkDerivation rec { - pname = "libodb"; - version = "2.5.0-b.27"; - - outputs = [ "out" "dev" "doc" ]; - - src = fetchurl { - url = "https://pkg.cppget.org/1/beta/odb/libodb-${version}.tar.gz"; - hash = "sha256-04Et/wHYsWvJPLlcL0J2iOPV2SBFC6J32EleGw38K2Q="; - }; - - nativeBuildInputs = [ build2 ]; - build2ConfigureFlags = [ - "config.bin.lib=${build2.configSharedStatic enableShared enableStatic}" - ]; - - doCheck = true; - - meta = with lib; { - description = "Common ODB runtime library"; - longDescription = '' - ODB is an object-relational mapping (ORM) system for C++. It provides - tools, APIs, and library support that allow you to persist C++ objects - to a relational database (RDBMS) without having to deal with tables, - columns, or SQL and without manually writing any of the mapping code. - For more information see: - - http://www.codesynthesis.com/products/odb/ - - This package contains the common ODB runtime library. Every application - that includes code generated by the ODB compiler will need to link to - this library. - ''; - homepage = "https://www.codesynthesis.com/products/odb/"; - changelog = "https://git.codesynthesis.com/cgit/odb/libodb/tree/NEWS"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ r-burns ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix deleted file mode 100644 index 4f9574e07908..000000000000 --- a/pkgs/development/libraries/libodfgen/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge }: - -stdenv.mkDerivation rec { - pname = "libodfgen"; - version = "0.1.7"; - - src = fetchurl { - url = "mirror://sourceforge/project/libwpd/libodfgen/libodfgen-${version}/libodfgen-${version}.tar.xz"; - sha256 = "sha256-Mj5JH5VsjKKrsSyZjjUGcJMKMjF7+WYrBhXdSzkiuDE="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - boost - cppunit - zlib - libwpg - libwpd - librevenge - ]; - - meta = with lib; { - description = "Base library for generating ODF documents"; - license = licenses.mpl20; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix deleted file mode 100644 index a64afbb930ae..000000000000 --- a/pkgs/development/libraries/libofa/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, expat, curl, fftw }: - -stdenv.mkDerivation rec { - pname = "libofa"; - version = "0.9.3"; - deb_patch = "5"; - - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${pname}-${version}.tar.gz"; - sha256 = "184ham039l7lwhfgg0xr2vch2xnw1lwh7sid432mh879adhlc5h2"; - }; - - patches = fetchurl { - url = "mirror://debian/pool/main/libo/libofa/libofa_${version}-${deb_patch}.debian.tar.gz"; - sha256 = "1rfkyz13cm8izm90c1xflp4rvsa24aqs6qpbbbqqcbmvzsj6j9yn"; - }; - - outputs = [ "out" "dev" ]; - - setOutputFlags = false; - - preConfigure = '' - configureFlagsArray=(--includedir=$dev/include --libdir=$out/lib) - ''; - - propagatedBuildInputs = [ expat curl fftw ]; - - meta = with lib; { - homepage = "https://code.google.com/archive/p/musicip-libofa/"; - description = "Library Open Fingerprint Architecture"; - longDescription = '' - LibOFA (Library Open Fingerprint Architecture) is an open-source audio - fingerprint created and provided by MusicIP''; - platforms = platforms.linux; - license = licenses.gpl2; - }; -} diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix deleted file mode 100644 index b7dddd16672c..000000000000 --- a/pkgs/development/libraries/libofx/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, opensp, pkg-config, libxml2, curl -, autoconf, automake, libtool, gengetopt, libiconv }: - -stdenv.mkDerivation rec { - pname = "libofx"; - version = "0.10.9"; - - src = fetchFromGitHub { - owner = "LibOFX"; - repo = pname; - rev = version; - sha256 = "sha256-KOQrEAt1jHrOpPQ7QbGUADe0i7sQXNH2fblPRzT0EIg="; - }; - - preConfigure = "./autogen.sh"; - configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; - nativeBuildInputs = [ pkg-config libtool autoconf automake gengetopt ]; - buildInputs = [ opensp libxml2 curl ] ++ lib.optional stdenv.isDarwin libiconv; - - meta = { - description = "Opensource implementation of the Open Financial eXchange specification"; - homepage = "https://libofx.sourceforge.net/"; - license = "LGPL"; - platforms = lib.platforms.unix; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix deleted file mode 100644 index ba0338ffd934..000000000000 --- a/pkgs/development/libraries/libogg/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libogg"; - version = "1.3.5"; - - src = fetchurl { - url = "http://downloads.xiph.org/releases/ogg/${pname}-${version}.tar.xz"; - sha256 = "01b7050bghdvbxvw0gzv588fn4a27zh42ljpwzm4vrf8dziipnf4"; - }; - - outputs = [ "out" "dev" "doc" ]; - - meta = with lib; { - description = "Media container library to manipulate Ogg files"; - longDescription = '' - Library to work with Ogg multimedia container format. - Ogg is flexible file storage and streaming format that supports - plethora of codecs. Open format free for anyone to use. - ''; - homepage = "https://xiph.org/ogg/"; - license = licenses.bsd3; - maintainers = [ maintainers.ehmry ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix deleted file mode 100644 index d458590179dd..000000000000 --- a/pkgs/development/libraries/liboggz/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, libogg, pkg-config }: - -stdenv.mkDerivation rec { - pname = "liboggz"; - version = "1.1.1"; - - src = fetchurl { - url = "https://downloads.xiph.org/releases/liboggz/${pname}-${version}.tar.gz"; - sha256 = "0nj17lhnsw4qbbk8jy4j6a78w6v2llhqdwq46g44mbm9w2qsvbvb"; - }; - - propagatedBuildInputs = [ libogg ]; - - nativeBuildInputs = [ pkg-config ]; - - meta = with lib; { - homepage = "https://xiph.org/oggz/"; - description = "C library and tools for manipulating with Ogg files and streams"; - longDescription = '' - Oggz comprises liboggz and the tool oggz, which provides commands to - inspect, edit and validate Ogg files. The oggz-chop tool can also be used - to serve time ranges of Ogg media over HTTP by any web server that - supports CGI. - - liboggz is a C library for reading and writing Ogg files and streams. It - offers various improvements over the reference libogg, including support - for seeking, validation and timestamp interpretation. Ogg is an - interleaving data container developed by Monty at Xiph.Org, originally to - support the Ogg Vorbis audio format but now used for many free codecs - including Dirac, FLAC, Speex and Theora.''; - platforms = platforms.unix; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix deleted file mode 100644 index 4b112b70e7ad..000000000000 --- a/pkgs/development/libraries/liboil/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{lib, stdenv, fetchurl, pkg-config }: - -stdenv.mkDerivation rec { - pname = "liboil"; - version = "0.3.17"; - - src = fetchurl { - url = "${meta.homepage}/download/liboil-${version}.tar.gz"; - sha256 = "0sgwic99hxlb1av8cm0albzh8myb7r3lpcwxfm606l0bkc3h4pqh"; - }; - - patches = [ ./x86_64-cpuid.patch ]; - - outputs = [ "out" "dev" "devdoc" ]; - outputBin = "dev"; # oil-bugreport - - nativeBuildInputs = [ pkg-config ]; - - # fix "argb_paint_i386.c:53:Incorrect register `%rax' used with `l' suffix" - # errors - configureFlags = lib.optional (stdenv.isDarwin && stdenv.isx86_64) "--build=x86_64"; - - # fixes a cast in inline asm: easier than patching - buildFlags = lib.optional stdenv.isDarwin "CFLAGS=-fheinous-gnu-extensions"; - - meta = with lib; { - description = "Library of simple functions that are optimized for various CPUs"; - mainProgram = "oil-bugreport"; - homepage = "https://liboil.freedesktop.org"; - license = licenses.bsd2; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/liboil/x86_64-cpuid.patch b/pkgs/development/libraries/liboil/x86_64-cpuid.patch deleted file mode 100644 index d86dd79c3bcb..000000000000 --- a/pkgs/development/libraries/liboil/x86_64-cpuid.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 705916007fba0a845229a02dc6474cb523eff150 Mon Sep 17 00:00:00 2001 -From: David Schleef <ds@schleef.org> -Date: Tue, 20 Jul 2010 21:05:26 +0000 -Subject: x86: Fix cpuid function on x86-64 - -Fixes: #28956. ---- -diff --git a/liboil/liboilcpu-x86.c b/liboil/liboilcpu-x86.c -index e7a1978..ef4d3f2 100644 ---- a/liboil/liboilcpu-x86.c -+++ b/liboil/liboilcpu-x86.c -@@ -162,13 +162,10 @@ get_cpuid (uint32_t op, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d) - static void - get_cpuid (uint32_t op, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d) - { -+ *a = op; - __asm__ ( -- " pushq %%rbx\n" - " cpuid\n" -- " mov %%ebx, %%esi\n" -- " popq %%rbx\n" -- : "=a" (*a), "=S" (*b), "=c" (*c), "=d" (*d) -- : "0" (op)); -+ : "+a" (*a), "=b" (*b), "=c" (*c), "=d" (*d)); - } - #endif - -@@ -185,7 +182,7 @@ oil_cpu_detect_cpuid (void) - { - uint32_t eax, ebx, ecx, edx; - uint32_t level; -- char vendor[13] = { 0 }; -+ char vendor[13+4] = { 0 }; - int ret; - - oil_fault_check_enable (); --- -cgit v0.9.0.2-2-gbebe diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix deleted file mode 100644 index 78f37bbbb67d..000000000000 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenv -, fetchurl -}: - -stdenv.mkDerivation rec { - pname = "libomxil-bellagio"; - version = "0.9.3"; - - src = fetchurl { - url = "mirror://sourceforge/omxil/omxil/Bellagio%20${version}/${pname}-${version}.tar.gz"; - sha256 = "0k6p6h4npn8p1qlgq6z3jbfld6n1bqswzvxzndki937gr0lhfg2r"; - }; - - configureFlags = - lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" ]; - - patches = [ - ./fedora-fixes.patch - ./fno-common.patch - # Fix stack overread: https://sourceforge.net/p/omxil/patches/8/ - (fetchurl { - name = "no-overread.patch"; - url = "https://sourceforge.net/p/omxil/patches/8/attachment/0001-src-base-omx_base_component.c-fix-stack-overread.patch"; - hash = "sha256-ElpiDxU0Ii4Ou8ebVx4Ne9UnB6mesC8cRj77N7LdovA="; - }) - ]; - - # Disable parallel build as it fails as: - # ld: cannot find -lomxil-bellagio - enableParallelBuilding = false; - - doCheck = false; # fails - - env.NIX_CFLAGS_COMPILE = - # stringop-truncation: see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1028978 - if stdenv.cc.isGNU then "-Wno-error=array-bounds -Wno-error=stringop-overflow=8 -Wno-error=stringop-truncation" - else let - isLLVM17 = stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17"; - in "-Wno-error=absolute-value -Wno-error=enum-conversion -Wno-error=logical-not-parentheses -Wno-error=non-literal-null-conversion${lib.optionalString (isLLVM17) " -Wno-error=unused-but-set-variable"}"; - - meta = with lib; { - homepage = "https://omxil.sourceforge.net/"; - description = "Opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; - mainProgram = "omxregister-bellagio"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libomxil-bellagio/fedora-fixes.patch b/pkgs/development/libraries/libomxil-bellagio/fedora-fixes.patch deleted file mode 100644 index 2ae3c3c871c5..000000000000 --- a/pkgs/development/libraries/libomxil-bellagio/fedora-fixes.patch +++ /dev/null @@ -1,199 +0,0 @@ -When libomxdynamicloader.so is loaded, it complains that RM_Deinit can't be resolved. -Link explicitly against omxil-bellagio so that ld.so can find the reference. - -Signed-off-by: Qais Yousef <qais.yousef@imgtec.com> - ---- bellagio-0.9.3/src/dynamic_loader/Makefile.am.old 2012-03-23 15:07:47.379021034 +0000 -+++ bellagio-0.9.3/src/dynamic_loader/Makefile.am 2012-03-23 15:08:47.563034818 +0000 -@@ -3,7 +3,7 @@ - omxdynamicloader_LTLIBRARIES = libomxdynamicloader.la - libomxdynamicloader_la_SOURCES = ste_dynamic_component_loader.c ste_dynamic_component_loader.h - --libomxdynamicloader_la_LDFLAGS = -+libomxdynamicloader_la_LDFLAGS = -L$(abs_top_srcdir)/src/.libs -lomxil-bellagio - libomxdynamicloader_la_CFLAGS = -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/base \ -Fix dependency issue to allow parallel build - -Signed-off-by: Qais Yousef <qais.yousef@imgtec.com> - -Index: bellagio-0.9.3/src/Makefile.am -=================================================================== ---- bellagio-0.9.3.orig/src/Makefile.am -+++ bellagio-0.9.3/src/Makefile.am -@@ -8,6 +8,7 @@ omxregister_bellagio_SOURCES = omxregist - omxregister_bellagio_CFLAGS = -DOMXILCOMPONENTSPATH=\"$(plugindir)/\" \ - -I$(top_srcdir)/include - omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir) -+omxregister_bellagio_DEPENDENCIES = libomxil-bellagio.la - - lib_LTLIBRARIES = libomxil-bellagio.la - libomxil_bellagio_la_SOURCES = component_loader.h \ -We always access globalComponentList[] at indexComponent=-1 which causes a -segfault. Use i as the index instead. - -Signed-off-by: Qais Yousef <qais.yousef@imgtec.com> - ---- bellagio-0.9.3/src/omx_reference_resource_manager.c.old 2012-03-13 10:15:25.743940980 +0000 -+++ bellagio-0.9.3/src/omx_reference_resource_manager.c 2012-03-13 10:18:02.201971009 +0000 -@@ -485,7 +485,6 @@ - OMX_ERRORTYPE RM_removeFromWaitForResource(OMX_COMPONENTTYPE *openmaxStandComp) { - omx_base_component_PrivateType* omx_base_component_Private; - int i = 0; -- int indexComponent = -1; - - DEBUG(DEB_LEV_FUNCTION_NAME, "In %s\n", __func__); - omx_base_component_Private = (omx_base_component_PrivateType*)openmaxStandComp->pComponentPrivate; -@@ -493,16 +492,13 @@ - while(listOfcomponentRegistered[i].component_name != NULL ) { - if (!strcmp(listOfcomponentRegistered[i].component_name, omx_base_component_Private->name)) { - // found component in the list of the resource manager -- removeElemFromList(&globalComponentList[indexComponent], openmaxStandComp); -- break; -+ removeElemFromList(&globalComponentList[i], openmaxStandComp); -+ DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__); -+ return OMX_ErrorNone; - } - i++; - } -- if (indexComponent <0) { -- // No resource to be handled -- DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__); -- return OMX_ErrorNone; -- } -- DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__); -+ // No resource to be handled -+ DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__); - return OMX_ErrorNone; - } - OMX_INDEXTYPE/OMX_INDEXVENDORTYPE in one switch - src/base/omx_base_component.c | 54 ++++++++++++++++++++++------------------- - 1 files changed, 29 insertions(+), 25 deletions(-) ---- a/src/base/omx_base_component.c -+++ a/src/base/omx_base_component.c -@@ -915,14 +915,6 @@ OSCL_EXPORT_REF OSCL_EXPORT_REF OMX_ERRORTYPE omx_base_component_GetParameter( - return OMX_ErrorBadParameter; - } - switch(nParamIndex) { -- case OMX_IndexParameterThreadsID: -- if ((err = checkHeader(ComponentParameterStructure, sizeof(OMX_PARAM_BELLAGIOTHREADS_ID))) != OMX_ErrorNone) { -- break; -- } -- threadID = (OMX_PARAM_BELLAGIOTHREADS_ID *)ComponentParameterStructure; -- threadID->nThreadBufferMngtID = omx_base_component_Private->bellagioThreads->nThreadBufferMngtID; -- threadID->nThreadMessageID = omx_base_component_Private->bellagioThreads->nThreadMessageID; -- break; - case OMX_IndexParamAudioInit: - case OMX_IndexParamVideoInit: - case OMX_IndexParamImageInit: -@@ -988,28 +980,40 @@ OSCL_EXPORT_REF OSCL_EXPORT_REF OMX_ERRORTYPE omx_base_component_GetParameter( - } - } - break; -- case OMX_IndexVendorCompPropTunnelFlags: -- pPropTunnelSetup = (OMX_VENDOR_PROP_TUNNELSETUPTYPE*)ComponentParameterStructure; -+ default: -+ /* additional switch statement for extended OMX_INDEXTYPE */ -+ switch((OMX_INDEXVENDORTYPE) nParamIndex) { -+ case OMX_IndexParameterThreadsID: -+ if ((err = checkHeader(ComponentParameterStructure, sizeof(OMX_PARAM_BELLAGIOTHREADS_ID))) != OMX_ErrorNone) { -+ break; -+ } -+ threadID = (OMX_PARAM_BELLAGIOTHREADS_ID *)ComponentParameterStructure; -+ threadID->nThreadBufferMngtID = omx_base_component_Private->bellagioThreads->nThreadBufferMngtID; -+ threadID->nThreadMessageID = omx_base_component_Private->bellagioThreads->nThreadMessageID; -+ break; -+ case OMX_IndexVendorCompPropTunnelFlags: -+ pPropTunnelSetup = (OMX_VENDOR_PROP_TUNNELSETUPTYPE*)ComponentParameterStructure; - -- if (pPropTunnelSetup->nPortIndex >= (omx_base_component_Private->sPortTypesParam[OMX_PortDomainAudio].nPorts + -- omx_base_component_Private->sPortTypesParam[OMX_PortDomainVideo].nPorts + -- omx_base_component_Private->sPortTypesParam[OMX_PortDomainImage].nPorts + -- omx_base_component_Private->sPortTypesParam[OMX_PortDomainOther].nPorts)) { -+ if (pPropTunnelSetup->nPortIndex >= (omx_base_component_Private->sPortTypesParam[OMX_PortDomainAudio].nPorts + -+ omx_base_component_Private->sPortTypesParam[OMX_PortDomainVideo].nPorts + -+ omx_base_component_Private->sPortTypesParam[OMX_PortDomainImage].nPorts + -+ omx_base_component_Private->sPortTypesParam[OMX_PortDomainOther].nPorts)) { - -- DEBUG(DEB_LEV_ERR,"In %s OMX_IndexVendorCompPropTunnelFlags nPortIndex=%d Line=%d \n", -- __func__,(int)pPropTunnelSetup->nPortIndex,__LINE__); -+ DEBUG(DEB_LEV_ERR,"In %s OMX_IndexVendorCompPropTunnelFlags nPortIndex=%d Line=%d \n", -+ __func__,(int)pPropTunnelSetup->nPortIndex,__LINE__); - -- return OMX_ErrorBadPortIndex; -- } -+ return OMX_ErrorBadPortIndex; -+ } - -- pPort = omx_base_component_Private->ports[pPropTunnelSetup->nPortIndex]; -+ pPort = omx_base_component_Private->ports[pPropTunnelSetup->nPortIndex]; - -- pPropTunnelSetup->nTunnelSetup.nTunnelFlags = pPort->nTunnelFlags; -- pPropTunnelSetup->nTunnelSetup.eSupplier = pPort->eBufferSupplier; -- break; -- default: -- err = OMX_ErrorUnsupportedIndex; -- break; -+ pPropTunnelSetup->nTunnelSetup.nTunnelFlags = pPort->nTunnelFlags; -+ pPropTunnelSetup->nTunnelSetup.eSupplier = pPort->eBufferSupplier; -+ break; -+ default: -+ err = OMX_ErrorUnsupportedIndex; -+ break; -+ } - } - DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s for component %p\n", __func__, hComponent); - return err; -diff -up libomxil-bellagio-0.9.3/Makefile.am.nodoc libomxil-bellagio-0.9.3/Makefile.am ---- libomxil-bellagio-0.9.3/Makefile.am.nodoc 2011-01-12 08:53:26.000000000 +0100 -+++ libomxil-bellagio-0.9.3/Makefile.am 2012-04-23 13:46:15.410823381 +0200 -@@ -7,7 +7,6 @@ EXTRA_DIST = libomxil-bellagio.spec - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libomxil-bellagio.pc - --docdir = $(DESTDIR)$(prefix)/share/doc/@PACKAGE@ - doc_DATA = README \ - ChangeLog \ - TODO -diff -up libomxil-bellagio-0.9.3/src/omxregister.c.unused libomxil-bellagio-0.9.3/src/omxregister.c ---- libomxil-bellagio-0.9.3/src/omxregister.c.unused 2011-01-12 08:53:26.000000000 +0100 -+++ libomxil-bellagio-0.9.3/src/omxregister.c 2012-12-10 22:02:28.621695659 +0100 -@@ -248,7 +248,15 @@ static int buildComponentsList(FILE* omx - } - fptr(stComponents); - err = fwrite(lib_absolute_path, 1, strlen(lib_absolute_path), omxregistryfp); -- err = fwrite("\n", 1, 1, omxregistryfp); -+ if (err != strlen(lib_absolute_path)) { -+ DEBUG(DEB_LEV_ERR, "Failed to write %zu bytes to fd %d\n", strlen(lib_absolute_path), fileno(omxregistryfp)); -+ continue; -+ } -+ err = fwrite("\n", 1, strlen(buffer), omxregistryfp); -+ if (err != strlen(buffer)) { -+ DEBUG(DEB_LEV_ERR, "Failed to write %zu bytes to fd %d\n", strlen(buffer), fileno(omxregistryfp)); -+ continue; -+ } - - - for (i = 0; i<num_of_comp; i++) { ---- libomxil-bellagio-0.9.3/include/OMX_Types.h.orig 2011-01-12 08:53:26.000000000 +0100 -+++ libomxil-bellagio-0.9.3/include/OMX_Types.h 2013-02-25 09:53:55.000000000 +0100 -@@ -314,6 +314,18 @@ - * platform & operating specific object used to reference the window */ - typedef void* OMX_NATIVE_WINDOWTYPE; - -+ -+/** Define the OMX IL version that corresponds to this set of header files. -+ * We also define a combined version that can be used to write or compare -+ * values of the 32bit nVersion field, assuming a little endian architecture */ -+#define OMX_VERSION_MAJOR 1 -+#define OMX_VERSION_MINOR 1 -+#define OMX_VERSION_REVISION 2 -+#define OMX_VERSION_STEP 0 -+ -+#define OMX_VERSION ((OMX_VERSION_STEP<<24) | (OMX_VERSION_REVISION<<16) | (OMX_VERSION_MINOR<<8) | OMX_VERSION_MAJOR) -+ -+ - /** The OMX_VERSIONTYPE union is used to specify the version for - a structure or component. For a component, the version is entirely - specified by the component vendor. Components doing the same function diff --git a/pkgs/development/libraries/libomxil-bellagio/fno-common.patch b/pkgs/development/libraries/libomxil-bellagio/fno-common.patch deleted file mode 100644 index be70391adaae..000000000000 --- a/pkgs/development/libraries/libomxil-bellagio/fno-common.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fix build faiure on gcc-10 (defaults to -fno-common). ---- a/src/omx_reference_resource_manager.c -+++ b/src/omx_reference_resource_manager.c -@@ -30,6 +30,11 @@ - #include "base/omx_base_component.h" - #include "queue.h" - -+int globalIndex; -+NameIndexType *listOfcomponentRegistered; -+ComponentListType **globalComponentList; -+ComponentListType **globalWaitingComponentList; -+ - /** - * This is the static base pointer of the list - */ ---- a/src/omx_reference_resource_manager.h -+++ b/src/omx_reference_resource_manager.h -@@ -49,10 +49,10 @@ struct NameIndexType { - }; - - --int globalIndex; --NameIndexType *listOfcomponentRegistered; --ComponentListType **globalComponentList; --ComponentListType **globalWaitingComponentList; -+extern int globalIndex; -+extern NameIndexType *listOfcomponentRegistered; -+extern ComponentListType **globalComponentList; -+extern ComponentListType **globalWaitingComponentList; - - OMX_ERRORTYPE RM_RegisterComponent(char *name, int max_components); - OMX_ERRORTYPE addElemToList(ComponentListType **list, OMX_COMPONENTTYPE *openmaxStandComp, int index, OMX_BOOL bIsWaiting); diff --git a/pkgs/development/libraries/libopenaptx/default.nix b/pkgs/development/libraries/libopenaptx/default.nix deleted file mode 100644 index 33a5cadb71dd..000000000000 --- a/pkgs/development/libraries/libopenaptx/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "libopenaptx"; - version = "0.2.1"; - - src = fetchFromGitHub { - owner = "pali"; - repo = "libopenaptx"; - rev = version; - sha256 = "sha256-4FYKxw1U+efCfzKOPSDJH8a/dG0KV+anJDgxjqzD80k="; - }; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - # disable static builds - "ANAME=" - "AOBJECTS=" - "STATIC_UTILITIES=" - ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Audio Processing Technology codec (aptX)"; - license = licenses.gpl3Plus; - homepage = "https://github.com/pali/libopenaptx"; - platforms = platforms.linux; - maintainers = with maintainers; [ orivej ]; - }; -} diff --git a/pkgs/development/libraries/libopenglrecorder/default.nix b/pkgs/development/libraries/libopenglrecorder/default.nix deleted file mode 100644 index 05616dd7c984..000000000000 --- a/pkgs/development/libraries/libopenglrecorder/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, libjpeg -, libvpx -, openh264 -, withPulse ? stdenv.hostPlatform.isLinux -, libpulseaudio -, libvorbis -}: - -stdenv.mkDerivation rec { - pname = "libopenglrecorder"; - version = "unstable-2020-08-13"; - - src = fetchFromGitHub { - owner = "Benau"; - repo = "libopenglrecorder"; - rev = "c1b81ce26e62fae1aaa086b5cd337cb12361ea3d"; - sha256 = "13s2d7qs8z4w0gb3hx03n97xmwl07d4s473m4gw90qcvmz217kiz"; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - libjpeg - libvpx - openh264 - ] ++ lib.optionals withPulse [ - libpulseaudio - libvorbis - ]; - - meta = with lib; { - description = "Library allowing Optional async readback OpenGL frame buffer with optional audio recording"; - homepage = "https://github.com/Benau/libopenglrecorder"; - license = licenses.bsd3; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = with platforms; windows ++ linux; - }; -} diff --git a/pkgs/development/libraries/libopenshot-audio/default.nix b/pkgs/development/libraries/libopenshot-audio/default.nix index 236b3026068f..2d8cec21b189 100644 --- a/pkgs/development/libraries/libopenshot-audio/default.nix +++ b/pkgs/development/libraries/libopenshot-audio/default.nix @@ -40,9 +40,9 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ (if stdenv.isDarwin then [ + ] ++ (if stdenv.hostPlatform.isDarwin then [ Accelerate AGL Cocoa diff --git a/pkgs/development/libraries/libopenshot/default.nix b/pkgs/development/libraries/libopenshot/default.nix index 0d83fa659e53..231b0cd109aa 100644 --- a/pkgs/development/libraries/libopenshot/default.nix +++ b/pkgs/development/libraries/libopenshot/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-9X2UIRDD+1kNLbV8AnnPabdO2M0OfTDxQ7xyZtsE10k="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ # Darwin requires both Magick++ and MagickCore for a successful linkage ./0001-link-magickcore.diff ]; @@ -51,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: { qtbase qtmultimedia zeromq - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix deleted file mode 100644 index 118f283a0f9f..000000000000 --- a/pkgs/development/libraries/liboping/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, ncurses ? null, perl ? null, lib }: - -stdenv.mkDerivation rec { - pname = "liboping"; - version = "1.10.0"; - - src = fetchurl { - url = "https://noping.cc/files/${pname}-${version}.tar.bz2"; - sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b"; - }; - - patches = [ - # Add support for ncurses-6.3. A backport of patch pending upstream - # inclusion: https://github.com/octo/liboping/pull/61 - ./ncurses-6.3.patch - - # Pull pending fix for format arguments mismatch: - # https://github.com/octo/liboping/pull/60 - (fetchpatch { - name = "format-args.patch"; - url = "https://github.com/octo/liboping/commit/7a50e33f2a686564aa43e4920141e6f64e042df1.patch"; - sha256 = "118fl3k84m3iqwfp49g5qil4lw1gcznzmyxnfna0h7za2nm50cxw"; - }) - ]; - - env.NIX_CFLAGS_COMPILE = lib.optionalString - stdenv.cc.isGNU "-Wno-error=format-truncation"; - - buildInputs = [ ncurses perl ]; - - configureFlags = lib.optional (perl == null) "--with-perl-bindings=no"; - - meta = with lib; { - description = "C library to generate ICMP echo requests (a.k.a. ping packets)"; - longDescription = '' - liboping is a C library to generate ICMP echo requests, better known as - "ping packets". It is intended for use in network monitoring applications - or applications that would otherwise need to fork ping(1) frequently. - Included is a sample application, called oping, which demonstrates the - library's abilities. - ''; - homepage = "http://noping.cc/"; - license = licenses.lgpl21; - platforms = platforms.unix; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/development/libraries/liboping/ncurses-6.3.patch b/pkgs/development/libraries/liboping/ncurses-6.3.patch deleted file mode 100644 index 14d2be07fe38..000000000000 --- a/pkgs/development/libraries/liboping/ncurses-6.3.patch +++ /dev/null @@ -1,21 +0,0 @@ -A backport of https://github.com/octo/liboping/pull/61 ---- a/src/oping.c -+++ b/src/oping.c -@@ -1125,7 +1125,7 @@ static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */ - wattron (ctx->window, COLOR_PAIR(color)); - - if (has_utf8()) -- mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, symbol); -+ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, "%s", symbol); - else - mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, symbolc); - -@@ -1222,7 +1222,7 @@ static int update_graph_histogram (ping_context_t *ctx) /* {{{ */ - if (counters[x] == 0) - mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, ' '); - else if (has_utf8 ()) -- mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, -+ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, "%s", - hist_symbols_utf8[index]); - else - mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix deleted file mode 100644 index bd749616cc47..000000000000 --- a/pkgs/development/libraries/libopusenc/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libopus }: - -stdenv.mkDerivation rec { - pname = "libopusenc"; - version = "0.2.1"; - - src = fetchurl { - url = "mirror://mozilla/opus/libopusenc-${version}.tar.gz"; - sha256 = "1ffb0vhlymlsq70pxsjj0ksz77yfm2x0a1x8q50kxmnkm1hxp642"; - }; - - outputs = [ "out" "dev" ]; - - doCheck = true; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libopus ]; - - meta = with lib; { - description = "Library for encoding .opus audio files and live streams"; - license = licenses.bsd3; - homepage = "https://www.opus-codec.org/"; - platforms = platforms.unix; - maintainers = with maintainers; [ pmiddend ]; - }; -} diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix deleted file mode 100644 index 498f26a7caf0..000000000000 --- a/pkgs/development/libraries/libosinfo/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib, stdenv -, fetchurl -, fetchpatch -, pkg-config -, meson -, ninja -, gettext -, gobject-introspection -, gtk-doc -, docbook_xsl -, glib -, libsoup_3 -, libxml2 -, libxslt -, check -, curl -, perl -, hwdata -, osinfo-db -, substituteAll -, vala ? null -}: - -stdenv.mkDerivation rec { - pname = "libosinfo"; - version = "1.11.0"; - - src = fetchurl { - url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-G/lu7J4UYPPRpxMWPMof8NSAo0kLUImSkvFFSLOpa2A="; - }; - - outputs = [ "out" "dev" ] - ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc"; - - nativeBuildInputs = [ - pkg-config - meson - ninja - vala - gettext - gobject-introspection - gtk-doc - docbook_xsl - perl # for pod2man - ]; - buildInputs = [ - glib - libsoup_3 - libxml2 - libxslt - ]; - nativeCheckInputs = [ - check - curl - perl - ]; - - patches = [ - (substituteAll { - src = ./osinfo-db-data-dir.patch; - osinfo_db_data_dir = "${osinfo-db}/share"; - }) - - # Fix build with libxml 2.12 - (fetchpatch { - url = "https://gitlab.com/libosinfo/libosinfo/-/commit/5bbdd06503456784c5ffa22409e8bab50470d673.patch"; - hash = "sha256-KqgHXI+lD5VYp2wtA58Drp15TgNK1O3xCaYBy4/B9wc="; - }) - ]; - - mesonFlags = [ - "-Dwith-usb-ids-path=${hwdata}/share/hwdata/usb.ids" - "-Dwith-pci-ids-path=${hwdata}/share/hwdata/pci.ids" - "-Denable-gtk-doc=true" - ]; - - preCheck = '' - patchShebangs ../osinfo/check-symfile.pl ../osinfo/check-symsorting.pl - ''; - - doCheck = true; - - meta = with lib; { - description = "GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support"; - homepage = "https://libosinfo.org/"; - changelog = "https://gitlab.com/libosinfo/libosinfo/-/blob/v${version}/NEWS"; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch b/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch deleted file mode 100644 index 2197eca23d9d..000000000000 --- a/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/osinfo/osinfo_loader.c -+++ b/osinfo/osinfo_loader.c -@@ -2304,7 +2304,7 @@ - } else { - path = g_getenv("OSINFO_SYSTEM_DIR"); - if (!path) -- path = DATA_DIR "/osinfo"; -+ path = "@osinfo_db_data_dir@/osinfo"; - - file = g_file_new_for_path(path); - } diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix deleted file mode 100644 index 211ca0559b9a..000000000000 --- a/pkgs/development/libraries/libosmium/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, protozero, expat, zlib, bzip2, boost, lz4 }: - -stdenv.mkDerivation rec { - pname = "libosmium"; - version = "2.20.0"; - - src = fetchFromGitHub { - owner = "osmcode"; - repo = "libosmium"; - rev = "v${version}"; - sha256 = "sha256-QM6Nj2cmrhUysR2enFKhTWXdBXNqM21/Yqdn/zXEfYE="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ protozero zlib bzip2 expat boost lz4 ]; - - cmakeFlags = [ "-DINSTALL_GDALCPP:BOOL=ON" ]; - - doCheck = true; - - meta = with lib; { - description = "Fast and flexible C++ library for working with OpenStreetMap data"; - homepage = "https://osmcode.org/libosmium/"; - license = licenses.boost; - changelog = [ - "https://github.com/osmcode/libosmium/releases/tag/v${version}" - "https://github.com/osmcode/libosmium/blob/v${version}/CHANGELOG.md" - ]; - maintainers = with maintainers; teams.geospatial.members ++ [ das-g ]; - }; -} diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix deleted file mode 100644 index a283df1bbaea..000000000000 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "libossp-uuid"; - version = "1.6.2"; - - src = fetchurl { - url = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-${version}.tar.gz"; - sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"; - }; - - configureFlags = [ - "ac_cv_va_copy=yes" - ] ++ lib.optional stdenv.isFreeBSD "--with-pic"; - - patches = [ ./shtool.patch ]; - - meta = with lib; { - homepage = "http://www.ossp.org/pkg/lib/uuid/"; - description = "OSSP uuid ISO-C and C++ shared library"; - longDescription = - '' - OSSP uuid is a ISO-C:1999 application programming interface - (API) and corresponding command line interface (CLI) for the - generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 - compliant Universally Unique Identifier (UUID). It supports - DCE 1.1 variant UUIDs of version 1 (time and node based), - version 3 (name based, MD5), version 4 (random number based) - and version 5 (name based, SHA-1). Additional API bindings are - provided for the languages ISO-C++:1998, Perl:5 and - PHP:4/5. Optional backward compatibility exists for the ISO-C - DCE-1.1 and Perl Data::UUID APIs. - - UUIDs are 128 bit numbers which are intended to have a high - likelihood of uniqueness over space and time and are - computationally difficult to guess. They are globally unique - identifiers which can be locally generated without contacting - a global registration authority. UUIDs are intended as unique - identifiers for both mass tagging objects with an extremely - short lifetime and to reliably identifying very persistent - objects across a network. - ''; - license = licenses.bsd2; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libossp-uuid/shtool.patch b/pkgs/development/libraries/libossp-uuid/shtool.patch deleted file mode 100644 index f0c7cc485f50..000000000000 --- a/pkgs/development/libraries/libossp-uuid/shtool.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/shtool 2008-07-05 05:43:08.000000000 +0800 -+++ b/shtool 2018-07-25 15:45:40.559587471 +0800 -@@ -1400,7 +1400,7 @@ - if [ ".$opt_t" = .yes ]; then - echo "strip $dsttmp" 1>&2 - fi -- strip $dsttmp || shtool_exit $? -+ $STRIP $dsttmp || shtool_exit $? - fi - if [ ".$opt_o" != . ]; then - if [ ".$opt_t" = .yes ]; then diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix deleted file mode 100644 index 672d298f1446..000000000000 --- a/pkgs/development/libraries/libotr/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, pkgsHostTarget, libgcrypt, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "libotr"; - version = "4.1.1"; - - src = fetchurl { - url = "https://otr.cypherpunks.ca/libotr-${version}.tar.gz"; - sha256 = "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb"; - }; - - patches = [ ./fix-regtest-client.patch ]; - - outputs = [ "bin" "out" "dev" ]; - - nativeBuildInputs = [ - autoreconfHook - pkgsHostTarget.libgcrypt.dev # for libgcrypt-config - ]; - propagatedBuildInputs = [ libgcrypt ]; - - meta = with lib; { - homepage = "http://www.cypherpunks.ca/otr/"; - license = licenses.lgpl21; - description = "Library for Off-The-Record Messaging"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libotr/fix-regtest-client.patch b/pkgs/development/libraries/libotr/fix-regtest-client.patch deleted file mode 100644 index bfd0007b9616..000000000000 --- a/pkgs/development/libraries/libotr/fix-regtest-client.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur a/tests/regression/client/client.c b/tests/regression/client/client.c ---- a/tests/regression/client/client.c 2015-12-25 17:39:45.000000000 +0000 -+++ b/tests/regression/client/client.c 2022-03-29 19:33:18.646398117 +0100 -@@ -27,6 +27,7 @@ - #include <syscall.h> - #include <sys/epoll.h> - #include <sys/types.h> -+#include <sys/socket.h> - #include <sys/un.h> - #include <unistd.h> - diff --git a/pkgs/development/libraries/libow/default.nix b/pkgs/development/libraries/libow/default.nix deleted file mode 100644 index 5340caeff0a8..000000000000 --- a/pkgs/development/libraries/libow/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, libtool }: - -stdenv.mkDerivation rec { - version = "3.2p4"; - pname = "libow"; - - src = fetchFromGitHub { - owner = "owfs"; - repo = "owfs"; - rev = "v${version}"; - sha256 = "0dln1ar7bxwhpi36sccmpwapy7iz4j097rbf02mgn42lw5vrcg3s"; - }; - - nativeBuildInputs = [ autoconf automake libtool pkg-config ]; - - preConfigure = '' - # Tries to use glibtoolize on Darwin, but it shouldn't for Nix. - sed -i -e 's/glibtoolize/libtoolize/g' bootstrap - ./bootstrap - ''; - - configureFlags = [ - "--disable-owtcl" - "--disable-owphp" - "--disable-owpython" - "--disable-zero" - "--disable-owshell" - "--disable-owhttpd" - "--disable-owftpd" - "--disable-owserver" - "--disable-owperl" - "--disable-owtap" - "--disable-owmon" - "--disable-owexternal" - ]; - - meta = with lib; { - description = "1-Wire File System full library"; - homepage = "https://owfs.org/"; - license = licenses.gpl2; - maintainers = with maintainers; [ disserman ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix deleted file mode 100644 index 9cf52b2cc04e..000000000000 --- a/pkgs/development/libraries/libowfat/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libowfat"; - version = "0.33"; - - src = fetchurl { - url = "https://www.fefe.de/libowfat/${pname}-${version}.tar.xz"; - sha256 = "sha256-MR7Is/S3K7RC4yP7ATqY+Vb6dFVH8ryUVih7INAnzX0="; - }; - - # Fix for glibc 2.34 from Gentoo - # https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=914a4aa87415dabfe77181a2365766417a5919a4 - postPatch = '' - # do not define "__pure__", this the gcc builtin (bug #806505) - sed 's#__pure__;#__attribute__((__pure__));#' -i fmt.h scan.h byte.h stralloc.h str.h critbit.h || die - sed 's#__pure__$#__attrib__pure__#' -i fmt.h scan.h byte.h stralloc.h str.h critbit.h || die - # remove unneeded definition of __deprecated__ - sed '/^#define __deprecated__$/d' -i scan/scan_iso8601.c scan/scan_httpdate.c || die - ''; - preBuild = '' - make headers - ''; - - makeFlags = [ "prefix=$(out)" ]; - enableParallelBuilding = true; - - meta = with lib; { - description = "GPL reimplementation of libdjb"; - homepage = "https://www.fefe.de/libowfat/"; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libowlevelzs/default.nix b/pkgs/development/libraries/libowlevelzs/default.nix deleted file mode 100644 index 6199dcca1bb8..000000000000 --- a/pkgs/development/libraries/libowlevelzs/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ cmake -, fetchFromGitHub -, lib -, stdenv -}: - -stdenv.mkDerivation rec { - pname = "libowlevelzs"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "fogti"; - repo = "libowlevelzs"; - rev = "v${version}"; - sha256 = "y/EaMMsmJEmnptfjwiat4FC2+iIKlndC2Wdpop3t7vY="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = { - description = "Zscheile Lowlevel (utility) library"; - homepage = "https://github.com/fogti/libowlevelzs"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ sigmanificient ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix deleted file mode 100644 index 69eb2fb63394..000000000000 --- a/pkgs/development/libraries/libp11/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool, pkg-config -, openssl }: - -stdenv.mkDerivation rec { - pname = "libp11"; - version = "0.4.12"; - - src = fetchFromGitHub { - owner = "OpenSC"; - repo = "libp11"; - rev = "${pname}-${version}"; - sha256 = "sha256-Xqjl12xT30ZXWYzPWNN3jWY9pxojhd7Kq0OC7rABt4M="; - }; - - configureFlags = [ - "--with-enginesdir=${placeholder "out"}/lib/engines" - ]; - - nativeBuildInputs = [ autoreconfHook pkg-config libtool ]; - - buildInputs = [ openssl ]; - - enableParallelBuilding = true; - - passthru = { inherit openssl; }; - - meta = with lib; { - description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier"; - homepage = "https://github.com/OpenSC/libp11"; - license = licenses.lgpl21Plus; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libpam-wrapper/default.nix b/pkgs/development/libraries/libpam-wrapper/default.nix deleted file mode 100644 index 6ea6229f4dda..000000000000 --- a/pkgs/development/libraries/libpam-wrapper/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - cmake, - linux-pam, - substituteAll, - enablePython ? false, - python ? null, -}: - -assert enablePython -> python != null; - -stdenv.mkDerivation rec { - pname = "libpam-wrapper"; - version = "1.1.5"; - - src = fetchgit { - url = "git://git.samba.org/pam_wrapper.git"; - rev = "pam_wrapper-${version}"; - 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. - buildInputs = [ linux-pam ]; - - meta = with lib; { - description = "Wrapper for testing PAM modules"; - homepage = "https://cwrap.org/pam_wrapper.html"; - license = licenses.gpl3Plus; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libpam-wrapper/python.patch b/pkgs/development/libraries/libpam-wrapper/python.patch deleted file mode 100644 index 0ddb05d26fa9..000000000000 --- a/pkgs/development/libraries/libpam-wrapper/python.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 deleted file mode 100644 index 416fe1b29e55..000000000000 --- a/pkgs/development/libraries/libpanel/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - 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" - ]; - - outputBin = "dev"; - - src = fetchurl { - url = "mirror://gnome/sources/libpanel/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-t3NJSjxpMANFzY4nAnRI0RiRgwJswTeAL4hkF8bqMLY="; - }; - - strictDeps = true; - - depsBuildBuild = [ pkg-config ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - vala - gi-docgen - gtk4 # gtk4-update-icon-cache - ]; - - buildInputs = [ - glib - gtk4 - libadwaita - ]; - - mesonFlags = [ (lib.mesonBool "install-examples" true) ]; - - postFixup = '' - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput "share/doc" "$devdoc" - ''; - - passthru = { - updateScript = gnome.updateScript { packageName = pname; }; - }; - - meta = with lib; { - description = "Dock/panel library for GTK 4"; - mainProgram = "libpanel-example"; - homepage = "https://gitlab.gnome.org/GNOME/libpanel"; - license = licenses.lgpl3Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix deleted file mode 100644 index 9e36812e7e89..000000000000 --- a/pkgs/development/libraries/libpaper/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: - -stdenv.mkDerivation rec { - version = "1.1.29"; - pname = "libpaper"; - - src = fetchurl { - url = "mirror://debian/pool/main/libp/libpaper/libpaper_${version}.tar.gz"; - hash = "sha256-JjMOIemjEkZY1RX9hQsM3lRv9C2JsllqUmTF8Wd/BUc="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - # The configure script of libpaper is buggy: it uses AC_SUBST on a headerfile - # to compile sysconfdir into the library. Autoconf however defines sysconfdir - # as "${prefix}/etc", which is not expanded by AC_SUBST so libpaper will look - # for config files in (literally, without expansion) '${prefix}/etc'. Manually - # setting sysconfdir fixes this issue. - preConfigure = '' - configureFlagsArray+=( - "--sysconfdir=$out/etc" - ) - ''; - - # Set the default paper to letter (this is what libpaper uses as default as well, - # if you call getdefaultpapername()). - # The user can still override this with the PAPERCONF environment variable. - postInstall = '' - mkdir -p $out/etc - echo letter > $out/etc/papersize - ''; - - meta = { - description = "Library for handling paper characteristics"; - homepage = "http://packages.debian.org/unstable/source/libpaper"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix deleted file mode 100644 index 7def28b92460..000000000000 --- a/pkgs/development/libraries/libpar2/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libsigcxx }: - -stdenv.mkDerivation rec { - pname = "libpar2"; - version = "0.4"; - - src = fetchurl { - url = "https://launchpad.net/libpar2/trunk/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "1m4ncws1h03zq7zyqbaymvjzzbh1d3lc4wb1aksrdf0ync76yv9i"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libsigcxx ]; - - patches = [ ./libpar2-0.4-external-verification.patch ]; - - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; - - meta = { - homepage = "https://parchive.sourceforge.net/"; - license = lib.licenses.gpl2Plus; - description = "Library for using Parchives (parity archive volume sets)"; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch b/pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch deleted file mode 100644 index 74879c4fe9b8..000000000000 --- a/pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -aud -U 5 libpar2-0.4-original/par2repairer.h libpar2-0.4-patched/par2repairer.h ---- libpar2-0.4-original/par2repairer.h 2013-07-18 15:03:10.000000000 +0200 -+++ libpar2-0.4-patched/par2repairer.h 2014-08-06 15:52:59.000000000 +0200 -@@ -94,11 +94,11 @@ - // Perform a sliding window scan of the DiskFile looking for blocks of data that - // might belong to any of the source files (for which a verification packet was - // available). If a block of data might be from more than one source file, prefer - // the one specified by the "sourcefile" parameter. If the first data block - // found is for a different source file then "sourcefile" is changed accordingly. -- bool ScanDataFile(DiskFile *diskfile, // [in] The file being scanned -+ virtual bool ScanDataFile(DiskFile *diskfile, // [in] The file being scanned - Par2RepairerSourceFile* &sourcefile, // [in/out] The source file matched - MatchType &matchtype, // [out] The type of match - MD5Hash &hashfull, // [out] The full hash of the file - MD5Hash &hash16k, // [out] The hash of the first 16k - u32 &count); // [out] The number of blocks found diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix deleted file mode 100644 index 7256e4922605..000000000000 --- a/pkgs/development/libraries/libpcap/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib -, stdenv -, fetchurl -, flex -, bison -, bluez -, libnl -, libxcrypt -, pkg-config -, withBluez ? false -, withRemote ? false - -# for passthru.tests -, ettercap -, nmap -, ostinato -, tcpreplay -, vde2 -, wireshark -, python3 -, haskellPackages -}: - -stdenv.mkDerivation rec { - pname = "libpcap"; - version = "1.10.4"; - - src = fetchurl { - url = "https://www.tcpdump.org/release/${pname}-${version}.tar.gz"; - hash = "sha256-7RmgOD+tcuOtQ1/SOdfNgNZJFrhyaVUBWdIORxYOvl8="; - }; - - buildInputs = lib.optionals stdenv.isLinux [ libnl ] - ++ lib.optionals withRemote [ libxcrypt ]; - - nativeBuildInputs = [ flex bison ] - ++ lib.optionals stdenv.isLinux [ pkg-config ] - ++ lib.optionals withBluez [ bluez.dev ]; - - # We need to force the autodetection because detection doesn't - # work in pure build environments. - configureFlags = [ - "--with-pcap=${if stdenv.isLinux then "linux" else "bpf"}" - ] ++ lib.optionals stdenv.isDarwin [ - "--disable-universal" - ] ++ lib.optionals withRemote [ - "--enable-remote" - ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) - [ "ac_cv_linux_vers=2" ]; - - postInstall = '' - if [ "$dontDisableStatic" -ne "1" ]; then - rm -f $out/lib/libpcap.a - fi - ''; - - passthru.tests = { - inherit ettercap nmap ostinato tcpreplay vde2 wireshark; - inherit (python3.pkgs) pcapy-ng scapy; - haskell-pcap = haskellPackages.pcap; - }; - - meta = with lib; { - homepage = "https://www.tcpdump.org"; - description = "Packet Capture Library"; - mainProgram = "pcap-config"; - platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/libpeas/2.x.nix b/pkgs/development/libraries/libpeas/2.x.nix index f223231eaf0b..5b7b4e71591e 100644 --- a/pkgs/development/libraries/libpeas/2.x.nix +++ b/pkgs/development/libraries/libpeas/2.x.nix @@ -7,23 +7,24 @@ , gobject-introspection , meson , ninja +, vala , gjs , glib , lua5_1 , python3 -, spidermonkey_115 +, spidermonkey_128 , gnome }: stdenv.mkDerivation rec { pname = "libpeas"; - version = "2.0.3"; + version = "2.0.5"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-OeO1B8KdLQHfE0XpszgP16nQrrWy5lfTjmwr6lAj5fA="; + hash = "sha256-N28vc9cxtU4T3bqx2Rtjgs9qmAUk3vRN9irdFUid5t0="; }; patches = [ @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config + vala ]; buildInputs = [ @@ -55,7 +57,7 @@ stdenv.mkDerivation rec { lua5_1.pkgs.lgi python3 python3.pkgs.pygobject3 - spidermonkey_115 + spidermonkey_128 ]; propagatedBuildInputs = [ @@ -65,6 +67,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" + "-Dvapi=true" ]; postPatch = '' diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix deleted file mode 100644 index 0598fd6451ef..000000000000 --- a/pkgs/development/libraries/libpfm/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, stdenv -, fetchurl -, enableShared ? !stdenv.hostPlatform.isStatic -, windows -}: - -stdenv.mkDerivation (finalAttrs: { - version = "4.13.0"; - pname = "libpfm"; - - src = fetchurl { - url = "mirror://sourceforge/perfmon2/libpfm4/libpfm-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-0YuXdkx1VSjBBR03bjNUXQ62DG6/hWgENoE/pbBMw9E="; - }; - - # Don't install libpfm.so on windows as it doesn't exist - # This target is created only if `ifeq ($(SYS),Linux)` passes - patches = [ ./fix-windows.patch ]; - - # Upstream uses "WINDOWS" instead of "Windows" which is incorrect - # See: https://github.com/NixOS/nixpkgs/pull/252982#discussion_r1314346216 - postPatch = '' - substituteInPlace config.mk examples/Makefile \ - --replace '($(SYS),WINDOWS)' '($(SYS),Windows)' - ''; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - "LDCONFIG=true" - "ARCH=${stdenv.hostPlatform.uname.processor}" - "SYS=${stdenv.hostPlatform.uname.system}" - ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - env.CONFIG_PFMLIB_SHARED = if enableShared then "y" else "n"; - - buildInputs = lib.optional stdenv.hostPlatform.isWindows windows.libgnurx; - - meta = with lib; { - description = "Helper library to program the performance monitoring events"; - longDescription = '' - This package provides a library, called libpfm4 which is used to - develop monitoring tools exploiting the performance monitoring - events such as those provided by the Performance Monitoring Unit - (PMU) of modern processors. - ''; - license = licenses.gpl2; - maintainers = with maintainers; [ pierron t4ccer ]; - platforms = platforms.linux ++ platforms.windows; - }; -}) diff --git a/pkgs/development/libraries/libpfm/fix-windows.patch b/pkgs/development/libraries/libpfm/fix-windows.patch deleted file mode 100644 index 584b9ba6eb81..000000000000 --- a/pkgs/development/libraries/libpfm/fix-windows.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/lib/Makefile b/lib/Makefile -index 5ca71e3..cd0717f 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -428,11 +428,13 @@ install: - -mkdir -p $(DESTDIR)$(LIBDIR) - $(INSTALL) -m 644 $(ALIBPFM) $(DESTDIR)$(LIBDIR) - ifeq ($(CONFIG_PFMLIB_SHARED),y) -+ifeq ($(SYS),Linux) - $(INSTALL) $(SLIBPFM) $(DESTDIR)$(LIBDIR) - cd $(DESTDIR)$(LIBDIR); $(LN) $(SLIBPFM) $(VLIBPFM) - cd $(DESTDIR)$(LIBDIR); $(LN) $(SLIBPFM) libpfm.$(SOLIBEXT) - -$(LDCONFIG) - endif -+endif - - tags: - $(CTAGS) -o $(TOPDIR)/tags --tag-relative=yes $(SRCS) $(INCDEP) diff --git a/pkgs/development/libraries/libpg_query/default.nix b/pkgs/development/libraries/libpg_query/default.nix deleted file mode 100644 index 46920c977cbc..000000000000 --- a/pkgs/development/libraries/libpg_query/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, which, squawk }: - -stdenv.mkDerivation rec { - pname = "libpg_query"; - version = "16-5.1.0"; - - src = fetchFromGitHub { - owner = "pganalyze"; - repo = "libpg_query"; - rev = version; - hash = "sha256-X48wjKdgkAc4wUubQ5ip1zZYiCKzQJyQTgGvO/pOY3I="; - }; - - nativeBuildInputs = [ which ]; - - makeFlags = [ "build" "build_shared" ]; - - installPhase = '' - install -Dm644 -t $out/lib libpg_query.a - install -Dm644 -t $out/include pg_query.h - install -Dm644 -t $out/lib libpg_query${stdenv.hostPlatform.extensions.sharedLibrary} - ''; - - doCheck = true; - checkTarget = "test"; - - passthru.tests = { - inherit squawk; - }; - - meta = with lib; { - homepage = "https://github.com/pganalyze/libpg_query"; - description = "C library for accessing the PostgreSQL parser outside of the server environment"; - changelog = "https://github.com/pganalyze/libpg_query/blob/${version}/CHANGELOG.md"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libpgf/default.nix b/pkgs/development/libraries/libpgf/default.nix deleted file mode 100644 index c0d24cb3cdf5..000000000000 --- a/pkgs/development/libraries/libpgf/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchzip -, autoreconfHook -, dos2unix -}: - -stdenv.mkDerivation rec { - pname = "libpgf"; - version = "7.21.7"; - - src = fetchzip { - url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}.zip"; - hash = "sha256-TAWIuikijfyeTRetZWoMMdB/FeGAR7ZjNssVxUevlVg="; - }; - - postPatch = '' - find . -type f | xargs dos2unix - mv README.txt README - ''; - - nativeBuildInputs = [ - autoreconfHook - dos2unix - ]; - - meta = { - homepage = "https://www.libpgf.org/"; - description = "Progressive Graphics Format"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix index 5e23947ed3bc..9bf0d59907be 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.45"; + version = "8.13.48"; src = fetchFromGitHub { owner = "google"; repo = "libphonenumber"; rev = "v${finalAttrs.version}"; - hash = "sha256-oR6AvhB99LBNCtbGsCMghDGriTEzqVSEKfzdQyj+g6E="; + hash = "sha256-EFrw3pW2uLpzEDMsW251rsB5rvC31eLYQBqYOgGt1Ug="; }; patches = [ @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { boost icu protobuf - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix deleted file mode 100644 index 2ae333d61ad8..000000000000 --- a/pkgs/development/libraries/libpinyin/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchFromGitHub -, autoreconfHook -, glib -, db -, pkg-config -}: - -let - modelData = fetchurl { - url = "mirror://sourceforge/libpinyin/models/model19.text.tar.gz"; - sha256 = "02zml6m8sj5q97ibpvaj9s9yz3gfj0jnjrfhkn02qv4nwm72lhjn"; - }; -in -stdenv.mkDerivation rec { - pname = "libpinyin"; - version = "2.8.1"; - - src = fetchFromGitHub { - owner = "libpinyin"; - repo = "libpinyin"; - rev = version; - hash = "sha256-3+CBbjCaY0Ubyphf0uCfYvF2rtc9fF1eEAM1doonjHg="; - }; - - postUnpack = '' - tar -xzf ${modelData} -C $sourceRoot/data - ''; - - strictDeps = true; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ - glib - db - ]; - - meta = with lib; { - description = "Library for intelligent sentence-based Chinese pinyin input method"; - homepage = "https://github.com/libpinyin/libpinyin"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ linsui ericsagnes ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix deleted file mode 100644 index 3aeb79b46af8..000000000000 --- a/pkgs/development/libraries/libpipeline/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook }: - -stdenv.mkDerivation rec { - pname = "libpipeline"; - version = "1.5.7"; - - src = fetchurl { - url = "mirror://savannah/libpipeline/libpipeline-${version}.tar.gz"; - sha256 = "sha256-uLRRlJiQIqeewTF/ZKKnWxVRsqVb6gb2dwTLKi5GkLA="; - }; - - patches = lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ]; - - # necessary to build on FreeBSD native pending inclusion of - # https://git.savannah.gnu.org/cgit/config.git/commit/?id=e4786449e1c26716e3f9ea182caf472e4dbc96e0 - nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; - - meta = with lib; { - homepage = "http://libpipeline.nongnu.org"; - description = "C library for manipulating pipelines of subprocesses in a flexible and convenient way"; - platforms = platforms.unix; - license = licenses.gpl3; - }; -} diff --git a/pkgs/development/libraries/libpipeline/fix-on-osx.patch b/pkgs/development/libraries/libpipeline/fix-on-osx.patch deleted file mode 100644 index c539e2dde970..000000000000 --- a/pkgs/development/libraries/libpipeline/fix-on-osx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/pipeline.c b/lib/pipeline.c -index 26478f9..1612307 100644 ---- a/lib/pipeline.c -+++ b/lib/pipeline.c -@@ -75,6 +75,8 @@ - # endif - #endif - -+const char* program_name = "libpipeline"; -+ - #if defined(HAVE_SETENV) && !defined(HAVE_CLEARENV) - int clearenv (void) - { diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix deleted file mode 100644 index 0ffa7b2828f3..000000000000 --- a/pkgs/development/libraries/libplacebo/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, meson -, ninja -, pkg-config -, python3Packages -, vulkan-headers -, vulkan-loader -, shaderc -, lcms2 -, libGL -, libX11 -, libunwind -, libdovi -, xxHash -, fast-float -, vulkanSupport ? true -}: - -stdenv.mkDerivation rec { - pname = "libplacebo"; - version = "7.349.0"; - - src = fetchFromGitLab { - domain = "code.videolan.org"; - owner = "videolan"; - repo = pname; - rev = "v${version}"; - hash = "sha256-mIjQvc7SRjE1Orb2BkHK+K1TcRQvzj2oUOCUT4DzIuA="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - python3Packages.jinja2 - python3Packages.glad2 - ]; - - buildInputs = [ - shaderc - lcms2 - libGL - libX11 - libunwind - libdovi - xxHash - vulkan-headers - ] ++ lib.optionals vulkanSupport [ - vulkan-loader - ] ++ lib.optionals (!stdenv.cc.isGNU) [ - fast-float - ]; - - mesonFlags = [ - (lib.mesonBool "demos" false) # Don't build and install the demo programs - (lib.mesonEnable "d3d11" false) # Disable the Direct3D 11 based renderer - (lib.mesonEnable "glslang" false) # rely on shaderc for GLSL compilation instead - (lib.mesonEnable "vk-proc-addr" vulkanSupport) - (lib.mesonOption "vulkan-registry" "${vulkan-headers}/share/vulkan/registry/vk.xml") - ] ++ lib.optionals stdenv.isDarwin [ - (lib.mesonEnable "unwind" false) # libplacebo doesn’t build with `darwin.libunwind` - ]; - - postPatch = '' - substituteInPlace meson.build \ - --replace 'python_env.append' '#' - ''; - - meta = with lib; { - description = "Reusable library for GPU-accelerated video/image rendering primitives"; - longDescription = '' - Reusable library for GPU-accelerated image/view processing primitives and - shaders, as well a batteries-included, extensible, high-quality rendering - pipeline (similar to mpv's vo_gpu). Supports Vulkan, OpenGL and Metal (via - MoltenVK). - ''; - homepage = "https://code.videolan.org/videolan/libplacebo"; - changelog = "https://code.videolan.org/videolan/libplacebo/-/tags/v${version}"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ primeos ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/development/libraries/libplctag/default.nix deleted file mode 100644 index 994cf0fef05c..000000000000 --- a/pkgs/development/libraries/libplctag/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, stdenv -, cmake -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "libplctag"; - version = "2.6.3"; - - src = fetchFromGitHub { - owner = "libplctag"; - repo = "libplctag"; - rev = "v${version}"; - sha256 = "sha256-HUog7Tlm4jiqYXk22dziumCA/68c35+OwnTNYu9mV5E="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - homepage = "https://github.com/libplctag/libplctag"; - description = "Library that uses EtherNet/IP or Modbus TCP to read and write tags in PLCs"; - license = with licenses; [ lgpl2Plus mpl20 ]; - maintainers = with maintainers; [ petterstorvik ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix deleted file mode 100644 index eeabf62e1c81..000000000000 --- a/pkgs/development/libraries/libplist/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config - -, enablePython ? false -, python3 -}: - -stdenv.mkDerivation rec { - pname = "libplist"; - version = "2.6.0"; - - outputs = [ "bin" "dev" "out" ] ++ lib.optional enablePython "py"; - - src = fetchFromGitHub { - owner = "libimobiledevice"; - repo = pname; - rev = version; - hash = "sha256-hitRcOjbF+L9Og9/qajqFqOhKfRn9+iWLoCKmS9dT80="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = lib.optionals enablePython [ - python3 - python3.pkgs.cython - ]; - - preAutoreconf = '' - export RELEASE_VERSION=${version} - ''; - - configureFlags = [ - "--enable-debug" - ] ++ lib.optionals (!enablePython) [ - "--without-cython" - ]; - - doCheck = true; - - postFixup = lib.optionalString enablePython '' - moveToOutput "lib/${python3.libPrefix}" "$py" - ''; - - meta = with lib; { - description = "Library to handle Apple Property List format in binary or XML"; - homepage = "https://github.com/libimobiledevice/libplist"; - license = licenses.lgpl21Plus; - maintainers = [ ]; - platforms = platforms.unix; - mainProgram = "plistutil"; - }; -} diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 11e3fb31604f..57b75a949b7d 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation (finalAttrs: { hash = "sha256-alygZSOSotfJ2yrltAIQhDwLvAgcvUEIJasAzFnxSmw="; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1" - + lib.optionalString stdenv.isFreeBSD '' + + lib.optionalString stdenv.hostPlatform.isFreeBSD '' sed -i 1i'int feenableexcept(int __mask);' contrib/libtests/pngvalid.c ''; diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/pkgs/development/libraries/libpointmatcher/default.nix deleted file mode 100644 index 57c629783aa6..000000000000 --- a/pkgs/development/libraries/libpointmatcher/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo, yaml-cpp }: - -stdenv.mkDerivation rec { - pname = "libpointmatcher"; - version = "1.4.3"; - - src = fetchFromGitHub { - owner = "norlab-ulaval"; - repo = "libpointmatcher"; - rev = version; - hash = "sha256-ewsU3aCFPeem1pJpqKaceMhL7SwTYOaYlcwOfMxwkSs="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen boost libnabo yaml-cpp ]; - - cmakeFlags = [ - (lib.cmakeFeature "EIGEN_INCLUDE_DIR" "${eigen}/include/eigen3") - (lib.cmakeBool "BUILD_TESTS" doCheck) - ]; - - doCheck = true; - - meta = with lib; { - inherit (src.meta) homepage; - description = "\"Iterative Closest Point\" library for 2-D/3-D mapping in robotic"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ cryptix ]; - }; -} diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/development/libraries/libportal/default.nix deleted file mode 100644 index b5c06c609f30..000000000000 --- a/pkgs/development/libraries/libportal/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, meson -, ninja -, pkg-config -, gobject-introspection -, vala -, gi-docgen -, glib -, gtk3 -, gtk4 -, libsForQt5 -, variant ? null -}: - -assert variant == null || variant == "gtk3" || variant == "gtk4" || variant == "qt5"; - -stdenv.mkDerivation rec { - pname = "libportal" + lib.optionalString (variant != null) "-${variant}"; - version = "0.7.1"; - - outputs = [ "out" "dev" ] - ++ lib.optional (variant != "qt5") "devdoc"; - - src = fetchFromGitHub { - owner = "flatpak"; - repo = "libportal"; - rev = version; - sha256 = "sha256-3roZJHnGFM7ClxbB7I/haexPTwYskidz9F+WV3RL9Ho="; - }; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gi-docgen - ] ++ lib.optionals (variant != "qt5") [ - gobject-introspection - vala - ]; - - propagatedBuildInputs = [ - glib - ] ++ lib.optionals (variant == "gtk3") [ - gtk3 - ] ++ lib.optionals (variant == "gtk4") [ - gtk4 - ] ++ lib.optionals (variant == "qt5") [ - libsForQt5.qtbase - libsForQt5.qtx11extras - ]; - - mesonFlags = [ - (lib.mesonEnable "backend-gtk3" (variant == "gtk3")) - (lib.mesonEnable "backend-gtk4" (variant == "gtk4")) - (lib.mesonEnable "backend-qt5" (variant == "qt5")) - (lib.mesonBool "vapi" (variant != "qt5")) - (lib.mesonBool "introspection" (variant != "qt5")) - (lib.mesonBool "docs" (variant != "qt5")) # requires introspection=true - ]; - - postFixup = '' - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput "share/doc" "$devdoc" - ''; - - # we don't have any binaries - dontWrapQtApps = true; - - meta = with lib; { - description = "Flatpak portal library"; - homepage = "https://github.com/flatpak/libportal"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libpostal/0001-test-adding-header-to-fix-warning.patch b/pkgs/development/libraries/libpostal/0001-test-adding-header-to-fix-warning.patch deleted file mode 100644 index cddd20d29e95..000000000000 --- a/pkgs/development/libraries/libpostal/0001-test-adding-header-to-fix-warning.patch +++ /dev/null @@ -1,24 +0,0 @@ -From bfdb6b8f87cc1cae9ba47870ff23deae0bb8ba51 Mon Sep 17 00:00:00 2001 -From: Al <albarrentine@gmail.com> -Date: Sun, 17 Dec 2017 20:17:01 -0500 -Subject: [PATCH] [test] adding header to fix warning - ---- - test/test_expand.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/test_expand.c b/test/test_expand.c -index 59ed9af7..2b211728 100644 ---- a/test/test_expand.c -+++ b/test/test_expand.c -@@ -4,6 +4,7 @@ - #include <stdarg.h> - - #include "greatest.h" -+#include "../src/string_utils.h" - #include "../src/libpostal.h" - - SUITE(libpostal_expansion_tests); --- -2.42.0 - diff --git a/pkgs/development/libraries/libpostal/default.nix b/pkgs/development/libraries/libpostal/default.nix deleted file mode 100644 index 1d0ea162d1d6..000000000000 --- a/pkgs/development/libraries/libpostal/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "libpostal"; - version = "1.1"; - - src = fetchFromGitHub { - owner = "openvenues"; - repo = "libpostal"; - rev = "v${version}"; - sha256 = "sha256-gQTD2LQibaB2TK0SbzoILAljAGExURvDcF3C/TfDXqk="; - }; - - patches = [ - # Fix darwin compilation with XCode 12 https://github.com/openvenues/libpostal/issues/511 - (fetchpatch { - name = "Fix-C-compilation-macOS.patch"; - url = "https://github.com/openvenues/libpostal/commit/9fcf066e38121b5c1439fc6bdc9a7e02234c8622.patch"; - hash = "sha256-VpboGK+5sc1XrxMB051KWc8vP7Eu2g7zmTirzSaerns="; - }) - # https://github.com/openvenues/libpostal/commit/bfdb6b8f87cc1cae9ba47870ff23deae0bb8ba51.patch - # with extra hunk removed so it applies - ./0001-test-adding-header-to-fix-warning.patch - ]; - - nativeBuildInputs = [ autoreconfHook ]; - - configureFlags = [ - "--disable-data-download" - ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "--disable-sse2" ]; - - meta = with lib; { - description = "C library for parsing/normalizing street addresses around the world. Powered by statistical NLP and open geo data"; - homepage = "https://github.com/openvenues/libpostal"; - license = licenses.mit; - maintainers = [ maintainers.Thra11 ]; - mainProgram = "libpostal_data"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libpqxx/6.nix b/pkgs/development/libraries/libpqxx/6.nix deleted file mode 100644 index 612a6c204482..000000000000 --- a/pkgs/development/libraries/libpqxx/6.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, doxygen, xmlto, python3, gnused }: - -stdenv.mkDerivation rec { - pname = "libpqxx"; - version = "6.4.8"; - - src = fetchFromGitHub { - owner = "jtv"; - repo = pname; - rev = version; - hash = "sha256-ybnW9ip1QVadmbYLP+gvo49k9ExHfnsOhSnI6NjsAQk="; - }; - - nativeBuildInputs = [ gnused python3 ]; - buildInputs = [ postgresql doxygen xmlto ]; - - preConfigure = '' - patchShebangs . - ''; - - configureFlags = [ "--enable-shared" ]; - - meta = { - description = "C++ library to access PostgreSQL databases"; - homepage = "https://pqxx.org/development/libpqxx/"; - license = lib.licenses.bsd3; - platforms = lib.platforms.unix; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix deleted file mode 100644 index 842be540a67f..000000000000 --- a/pkgs/development/libraries/libpqxx/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, python3 }: - -stdenv.mkDerivation rec { - pname = "libpqxx"; - version = "7.7.5"; - - src = fetchFromGitHub { - owner = "jtv"; - repo = pname; - rev = version; - sha256 = "sha256-mvGPMbk4b8NmPvzy5hS+Au69NtDGha8ONTEQf6I3VZE="; - }; - - nativeBuildInputs = [ python3 ]; - buildInputs = [ postgresql ]; - - preConfigure = '' - patchShebangs ./tools/splitconfig - ''; - - configureFlags = [ "--enable-shared --disable-documentation" ]; - CXXFLAGS = [ "-std=c++17" ]; - - meta = { - description = "C++ library to access PostgreSQL databases"; - homepage = "https://pqxx.org/development/libpqxx/"; - license = lib.licenses.bsd3; - platforms = lib.platforms.unix; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 59b2966711dd..436b4d7ecfbe 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libproxy"; - version = "0.5.7"; + version = "0.5.9"; outputs = [ "out" "dev" "devdoc" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libproxy"; repo = "libproxy"; rev = finalAttrs.version; - hash = "sha256-VKVazLkmm1BZeGxrQmkpHors27bki0l8US3ZGI6OR0w="; + hash = "sha256-Z70TjLk5zulyYMAK+uMDhpsdvLa6m25pY8jahUA6ASE="; }; patches = [ diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix deleted file mode 100644 index 58931a816188..000000000000 --- a/pkgs/development/libraries/libpseudo/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{lib, stdenv, fetchurl, pkg-config, glib, ncurses}: -stdenv.mkDerivation rec { - pname = "libpseudo"; - version = "1.2.0"; - - src = fetchurl { - url = "mirror://sourceforge/libpseudo/libpseudo-${version}.tar.gz"; - sha256 = "0d3pw0m3frycr3x5kzqcaj4r2qh43iv6b0fpd6l4yk0aa4a9560n"; - }; - - patchPhase = '' - sed -i -e s@/usr/local@$out@ -e /ldconfig/d Makefile - ''; - - preInstall = '' - mkdir -p $out/include - mkdir -p $out/lib - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib ncurses ]; - - meta = with lib; { - homepage = "http://libpseudo.sourceforge.net/"; - description = "Simple, thread-safe messaging between threads"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix deleted file mode 100644 index 1659a55cb4ef..000000000000 --- a/pkgs/development/libraries/libpsl/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib, stdenv -, fetchurl -, autoreconfHook -, docbook_xsl -, docbook_xml_dtd_43 -, gtk-doc -, lzip -, libidn2 -, libunistring -, libxslt -, pkg-config -, python3 -, buildPackages -, publicsuffix-list -}: - -stdenv.mkDerivation rec { - pname = "libpsl"; - version = "0.21.5"; - - src = fetchurl { - url = "https://github.com/rockdaboot/libpsl/releases/download/${version}/libpsl-${version}.tar.lz"; - hash = "sha256-mp9qjG7bplDPnqVUdc0XLdKEhzFoBOnHMgLZdXLNOi0="; - }; - - outputs = [ "out" "dev" ] - # bin/psl-make-dafsa brings a large runtime closure through python3 - ++ lib.optional (!stdenv.hostPlatform.isStatic) "bin"; - - nativeBuildInputs = [ - autoreconfHook - docbook_xsl - docbook_xml_dtd_43 - gtk-doc - lzip - pkg-config - libxslt - ]; - - buildInputs = [ - libidn2 - libunistring - libxslt - ] ++ lib.optional (!stdenv.hostPlatform.isStatic) python3; - - propagatedBuildInputs = [ - publicsuffix-list - ]; - - postPatch = lib.optionalString (!stdenv.hostPlatform.isStatic) '' - patchShebangs src/psl-make-dafsa - ''; - - preAutoreconf = '' - gtkdocize - ''; - - configureFlags = [ - # "--enable-gtk-doc" - "--enable-man" - "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" - "--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" - "--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt" - "PYTHON=${lib.getExe buildPackages.python3}" - ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = with lib; { - description = "C library for the Publix Suffix List"; - longDescription = '' - libpsl is a C library for the Publix Suffix List (PSL). A "public suffix" - is a domain name under which Internet users can directly register own - names. Browsers and other web clients can use it to avoid privacy-leaking - "supercookies" and "super domain" certificates, for highlighting parts of - the domain in a user interface or sorting domain lists by site. - ''; - homepage = "https://rockdaboot.github.io/libpsl/"; - changelog = "https://raw.githubusercontent.com/rockdaboot/libpsl/libpsl-${version}/NEWS"; - license = licenses.mit; - maintainers = [ maintainers.c0bw3b ]; - mainProgram = "psl"; - platforms = platforms.unix ++ platforms.windows; - pkgConfigModules = [ "libpsl" ]; - }; -} diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix deleted file mode 100644 index a608b6741b0c..000000000000 --- a/pkgs/development/libraries/libpst/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, stdenv -, fetchurl -, autoreconfHook -, bzip2 -, doxygen -, gettext -, imagemagick -, libgsf -, pkg-config -, xmlto -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libpst"; - version = "0.6.76"; - - src = fetchurl { - url = "http://www.five-ten-sg.com/libpst/packages/libpst-${finalAttrs.version}.tar.gz"; - hash = "sha256-PSkb7rvbSNK5NGCLwGGVtkHaY9Ko9eDThvLp1tBaC0I="; - }; - - nativeBuildInputs = [ - autoreconfHook - doxygen - gettext - pkg-config - xmlto - ]; - - buildInputs = [ - bzip2 - imagemagick - libgsf - ]; - - configureFlags = [ - "--disable-static" - "--enable-libpst-shared" - "--enable-python=no" - ]; - - doCheck = true; - - meta = with lib; { - homepage = "https://www.five-ten-sg.com/libpst/"; - description = "Library to read PST (MS Outlook Personal Folders) files"; - license = licenses.gpl2Plus; - maintainers = [ ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/libptytty/default.nix b/pkgs/development/libraries/libptytty/default.nix deleted file mode 100644 index 3ed0cf6a39d0..000000000000 --- a/pkgs/development/libraries/libptytty/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv -, lib -, fetchurl -, cmake -}: - -let - isCross = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; - isStatic = stdenv.hostPlatform.isStatic; - isMusl = stdenv.hostPlatform.isMusl; -in - -stdenv.mkDerivation rec { - pname = "libptytty"; - version = "2.0"; - - src = fetchurl { - url = "http://dist.schmorp.de/libptytty/${pname}-${version}.tar.gz"; - sha256 = "1xrikmrsdkxhdy9ggc0ci6kg5b1hn3bz44ag1mk5k1zjmlxfscw0"; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = lib.optional isStatic "-DBUILD_SHARED_LIBS=OFF" - ++ lib.optional (isCross || isStatic) "-DTTY_GID_SUPPORT=OFF" - # Musl lacks UTMP/WTMP built-in support - ++ lib.optionals isMusl [ - "-DUTMP_SUPPORT=OFF" - "-DWTMP_SUPPORT=OFF" - "-DLASTLOG_SUPPORT=OFF" - ]; - - meta = with lib; { - description = "OS independent and secure pty/tty and utmp/wtmp/lastlog"; - homepage = "http://dist.schmorp.de/libptytty"; - maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.unix; - license = licenses.gpl2; - # pkgsMusl.pkgsStatic errors as: - # ln: failed to create symbolic link './include': File exists - broken = isStatic && isMusl; - }; - -} diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix index fade2a9194ae..dd610989617b 100644 --- a/pkgs/development/libraries/libpwquality/default.nix +++ b/pkgs/development/libraries/libpwquality/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , autoreconfHook , perl , cracklib @@ -29,9 +30,15 @@ stdenv.mkDerivation rec { patches = [ # ensure python site-packages goes in $py output ./python-binding-prefix.patch + + (fetchpatch { + name = "musl.patch"; + url = "https://github.com/libpwquality/libpwquality/commit/b0fcd96954be89e8c318e5328dd27c40b401de96.patch"; + hash = "sha256-ykN1hcRKyX3QAqWTH54kUjOxN6+IwRpqQVsujTd9XWs="; + }) ]; - nativeBuildInputs = [ autoreconfHook perl ] ++ lib.optionals enablePython [ python ]; + nativeBuildInputs = [ autoreconfHook perl ] ++ lib.optionals enablePython [ (python.withPackages (ps: with ps; [ distutils ])) ]; buildInputs = [ cracklib ] ++ lib.optionals enablePAM [ pam ]; configureFlags = lib.optionals (!enablePython) [ "--disable-python-bindings" ]; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix deleted file mode 100644 index ab206c5dc4bb..000000000000 --- a/pkgs/development/libraries/libqalculate/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, intltool -, pkg-config -, doxygen -, autoreconfHook -, buildPackages -, curl -, gettext -, libiconv -, readline -, libxml2 -, mpfr -, icu -, gnuplot -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libqalculate"; - version = "5.2.0"; - - src = fetchFromGitHub { - owner = "qalculate"; - repo = "libqalculate"; - rev = "v${finalAttrs.version}"; - hash = "sha256-puNzw/3oWph76um4eNuEftvWPmjC1cZIXKU9pWB++jE="; - }; - - outputs = [ "out" "dev" "doc" ]; - - nativeBuildInputs = [ - intltool - pkg-config - autoreconfHook - doxygen - ]; - depsBuildBuild = [ - buildPackages.stdenv.cc - ]; - - buildInputs = [ - curl - gettext - libiconv - readline - ]; - propagatedBuildInputs = [ - libxml2 - mpfr - icu - ]; - enableParallelBuilding = true; - - preConfigure = '' - intltoolize -f - ''; - - patchPhase = '' - substituteInPlace libqalculate/Calculator-plot.cc \ - --replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \ - --replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - ' - '' + lib.optionalString stdenv.cc.isClang '' - substituteInPlace src/qalc.cc \ - --replace 'printf(_("aborted"))' 'printf("%s", _("aborted"))' - ''; - - preBuild = '' - pushd docs/reference - doxygen Doxyfile - popd - ''; - - meta = with lib; { - description = "Advanced calculator library"; - homepage = "http://qalculate.github.io"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ gebner doronbehar alyaeanyx ]; - mainProgram = "qalc"; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix deleted file mode 100644 index 080078d2b7fa..000000000000 --- a/pkgs/development/libraries/libqb/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libxml2 }: - -stdenv.mkDerivation rec { - pname = "libqb"; - version = "2.0.8"; - - src = fetchFromGitHub { - owner = "ClusterLabs"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-ZjxC7W4U8T68mZy/OvWj/e4W9pJIj2lVDoEjxXYr/G8="; - }; - - patches = [ - # add a declaration of fdatasync, missing on darwin https://github.com/ClusterLabs/libqb/pull/496 - (fetchpatch { - url = "https://github.com/ClusterLabs/libqb/commit/255ccb70ee19cc0c82dd13e4fd5838ca5427795f.patch"; - hash = "sha256-6x4B3FM0XSRIeAly8JtMOGOdyunTcbaDzUeBZInXR4U="; - }) - ]; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - buildInputs = [ libxml2 ]; - - postPatch = '' - sed -i '/# --enable-new-dtags:/,/--enable-new-dtags is required/ d' configure.ac - ''; - - meta = with lib; { - homepage = "https://github.com/clusterlabs/libqb"; - description = "Library providing high performance logging, tracing, ipc, and poll"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index fd10ccc5375c..ec2234bb9a28 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase libGLU ] - ++ lib.optional stdenv.isDarwin AGL; + ++ lib.optional stdenv.hostPlatform.isDarwin AGL; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix deleted file mode 100644 index 58fadd30ee8d..000000000000 --- a/pkgs/development/libraries/libqmi/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, meson -, ninja -, pkg-config -, gobject-introspection -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, help2man -, glib -, python3 -, mesonEmulatorHook -, libgudev -, bash-completion -, libmbim -, libqrtr-glib -, buildPackages -, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages -, withMan ? stdenv.buildPlatform.canExecute stdenv.hostPlatform -}: - -stdenv.mkDerivation rec { - pname = "libqmi"; - version = "1.34.0"; - - outputs = [ "out" "dev" ] - ++ lib.optional withIntrospection "devdoc"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "mobile-broadband"; - repo = "libqmi"; - rev = version; - hash = "sha256-l9ev9ZOWicVNZ/Wj//KNd3NHcefIrLVriqJhEpwWvtQ="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - python3 - ] ++ lib.optionals withMan [ - help2man - ] ++ lib.optionals withIntrospection [ - gobject-introspection - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - ] ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ - bash-completion - libmbim - ] ++ lib.optionals withIntrospection [ - libgudev - ]; - - propagatedBuildInputs = [ - glib - ] ++ lib.optionals withIntrospection [ - libqrtr-glib - ]; - - mesonFlags = [ - "-Dudevdir=${placeholder "out"}/lib/udev" - (lib.mesonBool "gtk_doc" withIntrospection) - (lib.mesonBool "introspection" withIntrospection) - (lib.mesonBool "man" withMan) - (lib.mesonBool "qrtr" withIntrospection) - (lib.mesonBool "udev" withIntrospection) - ]; - - doCheck = true; - - postPatch = '' - patchShebangs \ - build-aux/qmi-codegen/qmi-codegen - ''; - - meta = with lib; { - homepage = "https://www.freedesktop.org/wiki/Software/libqmi/"; - description = "Modem protocol helper library"; - maintainers = teams.freedesktop.members; - platforms = platforms.linux; - license = with licenses; [ - # Library - lgpl2Plus - # Tools - gpl2Plus - ]; - changelog = "https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/blob/${version}/NEWS"; - }; -} diff --git a/pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch b/pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch index 94b4c61befe5..825c9e0c3825 100644 --- a/pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch +++ b/pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch @@ -16,7 +16,7 @@ index b5877ed..455167c 100644 QString provider = providerString; - query.setFocus(QUrl("/usr/share/mobile-broadband-provider-info/serviceproviders.xml")); -+ query.setFocus(QUrl("@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml")); ++ query.setFocus(QUrl("@mobileBroadbandProviderInfo@/share/mobile-broadband-provider-info/serviceproviders.xml")); if (provider.contains("\'")) { provider = provider.replace("\'", "'"); @@ -25,7 +25,7 @@ index b5877ed..455167c 100644 #ifdef QOFONO_PROVISIONING QXmlQuery query; - query.setFocus(QUrl("/usr/share/mobile-broadband-provider-info/serviceproviders.xml")); -+ query.setFocus(QUrl("@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml")); ++ query.setFocus(QUrl("@mobileBroadbandProviderInfo@/share/mobile-broadband-provider-info/serviceproviders.xml")); QString providerStr = provider; if (providerStr.contains("\'")) { diff --git a/pkgs/development/libraries/libqofono/default.nix b/pkgs/development/libraries/libqofono/default.nix index a7d7868f30b3..f337de228a3e 100644 --- a/pkgs/development/libraries/libqofono/default.nix +++ b/pkgs/development/libraries/libqofono/default.nix @@ -23,7 +23,7 @@ mkDerivation rec { patches = [ (substituteAll { src = ./0001-NixOS-provide-mobile-broadband-provider-info-path.patch; - inherit mobile-broadband-provider-info; + mobileBroadbandProviderInfo = mobile-broadband-provider-info; }) ./0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch ]; diff --git a/pkgs/development/libraries/libqrtr-glib/default.nix b/pkgs/development/libraries/libqrtr-glib/default.nix deleted file mode 100644 index 9309c48a8c6a..000000000000 --- a/pkgs/development/libraries/libqrtr-glib/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, meson -, mesonEmulatorHook -, ninja -, pkg-config -, gobject-introspection -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, glib -}: - -stdenv.mkDerivation rec { - pname = "libqrtr-glib"; - version = "1.2.2"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "mobile-broadband"; - repo = "libqrtr-glib"; - rev = version; - sha256 = "kHLrOXN6wgBrHqipo2KfAM5YejS0/bp7ziBSpt0s1i0="; - }; - - strictDeps = true; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ - glib - ]; - - meta = with lib; { - homepage = "https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib"; - description = "Qualcomm IPC Router protocol helper library"; - maintainers = teams.freedesktop.members; - platforms = platforms.linux; - license = licenses.lgpl2Plus; - }; -} diff --git a/pkgs/development/libraries/libr3/default.nix b/pkgs/development/libraries/libr3/default.nix deleted file mode 100644 index 78934bbdcfb8..000000000000 --- a/pkgs/development/libraries/libr3/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, pcre -, pkg-config -, check -, autoreconfHook -}: - -stdenv.mkDerivation rec { - pname = "r3"; - version = "1.3.4"; - - src = fetchFromGitHub { - owner = "c9s"; - repo = "r3"; - rev = version; - sha256 = "09cixbms817p6nb77wz3rxp0znnac8ybycvsrrzgwlbfn58a3zwl"; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - buildInputs = [ check ]; - propagatedBuildInputs = [ pcre ]; - - strictDeps = true; - - meta = { - description = "High-performance path dispatching library"; - homepage = "https://github.com/c9s/r3"; - license = [ lib.licenses.mit ]; - }; - -} diff --git a/pkgs/development/libraries/libraqm/default.nix b/pkgs/development/libraries/libraqm/default.nix deleted file mode 100644 index 9899c70b8089..000000000000 --- a/pkgs/development/libraries/libraqm/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, meson -, ninja -, freetype -, harfbuzz -, fribidi -}: - -stdenv.mkDerivation rec { - pname = "libraqm"; - version = "0.10.2"; - - src = fetchFromGitHub { - owner = "HOST-Oman"; - repo = "libraqm"; - rev = "v${version}"; - sha256 = "sha256-KhGE66GS5rIieVXJUFA3jSsXEpbdnzN0VIAF/zOelU4="; - }; - - buildInputs = [ freetype harfbuzz fribidi ]; - - nativeBuildInputs = [ pkg-config meson ninja ]; - - doCheck = true; - - meta = with lib; { - description = "Library for complex text layout"; - homepage = "https://github.com/HOST-Oman/libraqm"; - license = licenses.mit; - maintainers = with maintainers; [ sifmelcara ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/development/libraries/libraspberrypi/default.nix deleted file mode 100644 index bb7508b1cec5..000000000000 --- a/pkgs/development/libraries/libraspberrypi/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "libraspberrypi"; - version = "unstable-2022-06-16"; - - src = fetchFromGitHub { - owner = "raspberrypi"; - repo = "userland"; - rev = "54fd97ae4066a10b6b02089bc769ceed328737e0"; - hash = "sha512-f7tBgIykcIdkwcFjBKk5ooD/5Bsyrd/0OFr7LNCwWFYeE4DH3XA7UR7YjArkwqUVCVBByr82EOaacw0g1blOkw=="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - cmakeFlags = [ - # -DARM64=ON disables all targets that only build on 32-bit ARM; this allows - # the package to build on aarch64 and other architectures - "-DARM64=${if stdenv.hostPlatform.isAarch32 then "OFF" else "ON"}" - "-DVMCS_INSTALL_PREFIX=${placeholder "out"}" - ]; - - meta = with lib; { - description = "Userland tools & libraries for interfacing with Raspberry Pi hardware"; - homepage = "https://github.com/raspberrypi/userland"; - license = licenses.bsd3; - platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ dezgeg tkerber ]; - }; -} diff --git a/pkgs/development/libraries/librasterlite2/default.nix b/pkgs/development/libraries/librasterlite2/default.nix index de9fa02d44db..0286d944691f 100644 --- a/pkgs/development/libraries/librasterlite2/default.nix +++ b/pkgs/development/libraries/librasterlite2/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { libspatialite libtiff libwebp - libxml2 + (libxml2.override { enableHttp = true; }) lz4 minizip openjpeg diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix deleted file mode 100644 index d8e9f1f5a2f5..000000000000 --- a/pkgs/development/libraries/libraw/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, lcms2 -, pkg-config - -# for passthru.tests -, deepin -, freeimage -, hdrmerge -, imagemagick -, python3 -}: - -stdenv.mkDerivation rec { - pname = "libraw"; - version = "0.21.2"; - - src = fetchFromGitHub { - owner = "LibRaw"; - repo = "LibRaw"; - rev = version; - hash = "sha256-p9CmOCulvV7+KKn1lXwpcysOo0+mD5UgPqy2ki0cIFE="; - }; - - outputs = [ "out" "lib" "dev" "doc" ]; - - propagatedBuildInputs = [ lcms2 ]; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - enableParallelBuilding = true; - - passthru.tests = { - inherit imagemagick hdrmerge freeimage; - inherit (deepin) deepin-image-viewer; - inherit (python3.pkgs) rawkit; - }; - - meta = with lib; { - description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; - homepage = "https://www.libraw.org/"; - license = with licenses; [ cddl lgpl2Plus ]; - platforms = platforms.unix; - }; -} - diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix deleted file mode 100644 index 184cb2e7de4a..000000000000 --- a/pkgs/development/libraries/libraw1394/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libraw1394"; - version = "2.1.2"; - - src = fetchurl { - url = "mirror://kernel/linux/libs/ieee1394/${pname}-${version}.tar.gz"; - sha256 = "0z5md84941ky5l7afayx2z6j0sk0mildxbjajq6niznd44ky7i6x"; - }; - - meta = with lib; { - description = "Library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface"; - homepage = "https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/librclone/default.nix b/pkgs/development/libraries/librclone/default.nix deleted file mode 100644 index bb3053e19d53..000000000000 --- a/pkgs/development/libraries/librclone/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, stdenv -, buildGoModule -, rclone -}: - -let - ext = stdenv.hostPlatform.extensions.sharedLibrary; -in buildGoModule rec { - pname = "librclone"; - inherit (rclone) version src vendorHash; - - patches = rclone.patches or [ ]; - - buildPhase = '' - runHook preBuild - cd librclone - go build --buildmode=c-shared -o librclone${ext} github.com/rclone/rclone/librclone - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -Dt $out/lib librclone${ext} - install -Dt $out/include librclone.h - runHook postInstall - ''; - - meta = { - description = "Rclone as a C library"; - homepage = "https://github.com/rclone/rclone/tree/master/librclone"; - maintainers = with lib.maintainers; [ dotlambda ]; - inherit (rclone.meta) license platforms; - }; -} diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index a747ad8eb8de..eace8af8156c 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -15,13 +15,14 @@ stdenv.mkDerivation rec { pname = "raptor2"; - version = "unstable-2022-06-06"; + version = "2.0.16"; + underscoredVersion = lib.strings.replaceStrings ["."] ["_"] version; src = fetchFromGitHub { owner = "dajobe"; repo = "raptor"; - rev = "3cca62a33da68143b687c9e486eefc7c7cbb4586"; - sha256 = "sha256-h03IyFH1GHPqajfHBBTb19lCEu+VXzQLGC1wiEGVvgY="; + rev = "${pname}_${underscoredVersion}"; + sha256 = "sha256-Eic63pV2p154YkSmkqWr86fGTr+XmVGy5l5/6q14LQM="; }; cmakeFlags = [ @@ -30,13 +31,7 @@ stdenv.mkDerivation rec { ]; patches = [ - # https://github.com/dajobe/raptor/pull/52 - (fetchpatch { - name = "fix-cmake-generated-pc-file"; - url = "https://github.com/dajobe/raptor/commit/fa1ef9a27d8762f5588ac2e92554a188e73dee9f.diff"; - sha256 = "sha256-zXIbrYGgC9oTpiD0WUikT4vRdc9b6bsyfnDkwUSlqao="; - }) - # pull upstream fix for libxml2-2.11 API compatibility: + # pull upstream fix for libxml2-2.11 API compatibility, part of unreleased 2.0.17 # https://github.com/dajobe/raptor/pull/58 (fetchpatch { name = "libxml2-2.11.patch"; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index fa419830f3c7..ebdf2ec4d8a6 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ SystemConfiguration ]; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 5dc620fd5c01..ef311bdd0246 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -23,7 +23,7 @@ assert enablePython -> pythonPackages != null; stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.56.1"; + version = "2.56.2"; outputs = [ "out" "dev" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1ICSJqr5WRePLIHsD3T2L0Nxdn1LWaHqHDJrfTIRl88="; + sha256 = "sha256-7DO+AC9R6mnSs52ex/uIzEv7q+fS7FQ5FGYe5niap4Q="; }; buildInputs = [ diff --git a/pkgs/development/libraries/librecast/default.nix b/pkgs/development/libraries/librecast/default.nix deleted file mode 100644 index df053e0ad903..000000000000 --- a/pkgs/development/libraries/librecast/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - stdenv, - fetchFromGitea, - lcrq, - lib, - libsodium, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "librecast"; - version = "0.8.0"; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "librecast"; - repo = "librecast"; - rev = "v${finalAttrs.version}"; - hash = "sha256-8Qit1KFazVG+2TEmSGXiBNawvpc7Ihr/0mx4KCzBoAY="; - }; - buildInputs = [ lcrq libsodium ]; - installFlags = [ "PREFIX=$(out)" ]; - - meta = { - changelog = "https://codeberg.org/librecast/librecast/src/tag/v${finalAttrs.version}/CHANGELOG.md"; - description = "IPv6 multicast library"; - homepage = "https://librecast.net/librecast.html"; - license = [ lib.licenses.gpl2 lib.licenses.gpl3 ]; - maintainers = with lib.maintainers; [ albertchae aynish DMills27 jasonodoom jleightcap ]; - platforms = lib.platforms.gnu; - }; -}) diff --git a/pkgs/development/libraries/libredwg/default.nix b/pkgs/development/libraries/libredwg/default.nix deleted file mode 100644 index 6eb06a1ebe67..000000000000 --- a/pkgs/development/libraries/libredwg/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, writeShellScript -, pkg-config -, texinfo -, pcre2 -, swig -, libxml2 -, ncurses -, enablePython ? false -, python ? null -}: -let - isPython3 = enablePython && python.pythonAtLeast "3"; -in -stdenv.mkDerivation rec { - pname = "libredwg"; - version = "0.13.3"; - - src = fetchFromGitHub { - owner = "LibreDWG"; - repo = pname; - rev = version; - hash = "sha256-FlBHwNsqVSBE8dTDewoKkCbs8Jd/4d69MPpEFzg6Ruc="; - fetchSubmodules = true; - }; - - postPatch = let - printVersion = writeShellScript "print-version" '' - echo -n ${lib.escapeShellArg version} - ''; - in '' - # avoid git dependency - cp ${printVersion} build-aux/git-version-gen - ''; - - preConfigure = lib.optionalString (stdenv.isDarwin && enablePython) '' - # prevent configure picking up stack_size from distutils.sysconfig - export PYTHON_EXTRA_LDFLAGS=" " - ''; - - nativeBuildInputs = [ autoreconfHook pkg-config texinfo ] - ++ lib.optional enablePython swig; - - buildInputs = [ pcre2 ] - ++ lib.optionals enablePython [ python ] - # configurePhase fails with python 3 when ncurses is missing - ++ lib.optional isPython3 ncurses - ; - - # prevent python tests from running when not building with python - configureFlags = lib.optional (!enablePython) "--disable-python"; - - # FAIL: alive.test - doCheck = !stdenv.isLinux; - - # the "xmlsuite" test requires the libxml2 c library as well as the python module - nativeCheckInputs = lib.optionals enablePython [ libxml2 libxml2.dev ]; - - meta = with lib; { - description = "Free implementation of the DWG file format"; - homepage = "https://savannah.gnu.org/projects/libredwg/"; - maintainers = with maintainers; [ tweber ]; - license = licenses.gpl3Plus; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix deleted file mode 100644 index 258067c08300..000000000000 --- a/pkgs/development/libraries/librelp/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, autoreconfHook -, gnutls -, openssl -, pkg-config -, zlib -}: - -stdenv.mkDerivation rec { - pname = "librelp"; - version = "1.11.0"; - - src = fetchFromGitHub { - owner = "rsyslog"; - repo = "librelp"; - rev = "v${version}"; - sha256 = "sha256-VJlvFiOsIyiu0kBU8NkObtt9j2ElrSzJtvE8wtSlOus="; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ gnutls zlib openssl ]; - - meta = with lib; { - description = "Reliable logging library"; - homepage = "https://www.librelp.com/"; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix deleted file mode 100644 index 10dba7e7a59d..000000000000 --- a/pkgs/development/libraries/librem/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, zlib, openssl, libre -, cmake }: - -stdenv.mkDerivation rec { - version = "2.12.0"; - pname = "librem"; - src = fetchFromGitHub { - owner = "baresip"; - repo = "rem"; - rev = "v${version}"; - sha256 = "sha256-MsXSUxFH89EqxMe4285xFV1Tsqmv2l5RnEeli48O3XQ="; - }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib openssl libre ]; - cmakeFlags = [ - "-DRE_INCLUDE_DIR=${libre}/include/re" - ]; - makeFlags = [ - "LIBRE_MK=${libre}/share/re/re.mk" - "PREFIX=$(out)" - "AR=${stdenv.cc.targetPrefix}ar" - ] - ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${lib.getDev stdenv.cc.cc}" - ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}" - ; - enableParallelBuilding = true; - meta = { - description = "Library for real-time audio and video processing"; - homepage = "https://github.com/baresip/rem"; - maintainers = with lib.maintainers; [ raskin ]; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/libremidi/default.nix b/pkgs/development/libraries/libremidi/default.nix deleted file mode 100644 index 48014bea0741..000000000000 --- a/pkgs/development/libraries/libremidi/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ alsa-lib -, cmake -, CoreAudio -, CoreFoundation -, CoreMIDI -, CoreServices -, fetchFromGitHub -, lib -, stdenv -}: - -stdenv.mkDerivation rec { - pname = "libremidi"; - version = "4.4.0"; - - src = fetchFromGitHub { - owner = "jcelerier"; - repo = "libremidi"; - rev = "v${version}"; - hash = "sha256-raVBJ75/UmM3P69s8VNUXRE/2jV4WqPIfI4eXaf6UEg="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = lib.optional stdenv.isLinux alsa-lib - ++ lib.optionals stdenv.isDarwin [ - CoreAudio - CoreFoundation - CoreMIDI - CoreServices - ]; - - postInstall = '' - cp -r $src/include $out - ''; - - meta = { - description = "Modern C++ MIDI real-time & file I/O library"; - homepage = "https://github.com/jcelerier/libremidi"; - maintainers = [ ]; - license = lib.licenses.bsd2; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 9629c0e961a9..0924285cae87 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -8,7 +8,7 @@ }: let - ldLibPathEnvName = if stdenv.isDarwin + ldLibPathEnvName = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; @@ -151,4 +151,9 @@ in { }) ]; }; + + libressl_4_0 = generic { + version = "4.0.0"; + hash = "sha256-TYQZVfCsw9/HHQ49018oOvRhIiNQ4mhD/qlzHAJGoeQ="; + }; } diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix deleted file mode 100644 index e8733a324cab..000000000000 --- a/pkgs/development/libraries/librevenge/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib }: - -stdenv.mkDerivation rec { - pname = "librevenge"; - version = "0.0.5"; - - src = fetchurl { - url = "mirror://sourceforge/project/libwpd/librevenge/librevenge-${version}/librevenge-${version}.tar.xz"; - sha256 = "sha256-EG0MRLtkCLE0i54EZWZvqDuBYXdmWiLNAX6IbBqu6zQ="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - boost - cppunit - zlib - ]; - - # Clang and gcc-7 generate warnings, and - # -Werror causes these warnings to be interpreted as errors - # Simplest solution: disable -Werror - configureFlags = [ "--disable-werror" ]; - - # Fix an issue with boost 1.59 - # This is fixed upstream so please remove this when updating - postPatch = '' - sed -i 's,-DLIBREVENGE_BUILD,\0 -DBOOST_ERROR_CODE_HEADER_ONLY,g' src/lib/Makefile.in - ''; - - meta = with lib; { - description = "Base library for writing document import filters"; - license = licenses.mpl20; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix deleted file mode 100644 index 6ff2abb11de9..000000000000 --- a/pkgs/development/libraries/librime/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc, - yaml-cpp, gtest, capnproto, pkg-config, librime-lua, librime-octagram, - plugins ? [ librime-lua librime-octagram ] }: - -let - copySinglePlugin = plug: "cp -r ${plug} plugins/${plug.name}"; - copyPlugins = '' - mkdir -p plugins - ${lib.concatMapStringsSep "\n" copySinglePlugin plugins} - chmod +w -R plugins/* - ''; -in -stdenv.mkDerivation rec { - pname = "librime"; - version = "1.11.2"; - - src = fetchFromGitHub { - owner = "rime"; - repo = pname; - rev = version; - sha256 = "sha256-QHuzpitxSYQ4EcBPY1f0R5zl4UFtefu0bFXA76Iv+j0="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ boost glog leveldb marisa opencc yaml-cpp gtest capnproto ] - ++ plugins; # for propagated build inputs - - preConfigure = copyPlugins; - - meta = with lib; { - homepage = "https://rime.im/"; - description = "Rime Input Method Engine, the core library"; - license = licenses.bsd3; - maintainers = with maintainers; [ vonfry ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/librist/darwin.patch b/pkgs/development/libraries/librist/darwin.patch deleted file mode 100644 index 6a5cc8459a36..000000000000 --- a/pkgs/development/libraries/librist/darwin.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/tools/srp_shared.c b/tools/srp_shared.c -index f782126..23e82a5 100644 ---- a/tools/srp_shared.c -+++ b/tools/srp_shared.c -@@ -173,7 +173,11 @@ void user_verifier_lookup(char * username, - if (stat(srpfile, &buf) != 0) - return; - -+#if defined(__APPLE__) -+ *generation = ((uint64_t)buf.st_mtimespec.tv_sec << 32) | buf.st_mtimespec.tv_nsec; -+#else - *generation = ((uint64_t)buf.st_mtim.tv_sec << 32) | buf.st_mtim.tv_nsec; -+#endif - #endif - - if (!lookup_data || !hashversion) diff --git a/pkgs/development/libraries/librist/default.nix b/pkgs/development/libraries/librist/default.nix deleted file mode 100644 index 788e75eafdda..000000000000 --- a/pkgs/development/libraries/librist/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv -, lib -, fetchFromGitLab -, meson -, ninja -, pkg-config -, cjson -, cmocka -, mbedtls -}: - -stdenv.mkDerivation rec { - pname = "librist"; - version = "0.2.10"; - - src = fetchFromGitLab { - domain = "code.videolan.org"; - owner = "rist"; - repo = "librist"; - rev = "v${version}"; - hash = "sha256-8N4wQXxjNZuNGx/c7WVAV5QS48Bff5G3t11UkihT+K0="; - }; - - patches = [ - # https://github.com/NixOS/nixpkgs/pull/257020 - ./darwin.patch - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - cjson - cmocka - mbedtls - ]; - - meta = with lib; { - description = "Library that can be used to easily add the RIST protocol to your application"; - homepage = "https://code.videolan.org/rist/librist"; - license = with licenses; [ bsd2 mit isc ]; - maintainers = with maintainers; [ raphaelr sebtm ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libroxml/default.nix b/pkgs/development/libraries/libroxml/default.nix deleted file mode 100644 index 647e4c188a05..000000000000 --- a/pkgs/development/libraries/libroxml/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libroxml"; - version = "2.3.0"; - - src = fetchurl { - url = "http://download.libroxml.net/pool/v2.x/libroxml-${version}.tar.gz"; - sha256 = "0y0vc9n4rfbimjp28nx4kdfzz08j5xymh5xjy84l9fhfac5z5a0x"; - }; - - meta = with lib; { - description = "This library is minimum, easy-to-use, C implementation for xml file parsing"; - homepage = "https://www.libroxml.net/"; - license = licenses.lgpl3; - maintainers = with maintainers; [ mpickering ]; - mainProgram = "roxml"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/librsb/default.nix b/pkgs/development/libraries/librsb/default.nix index d9dc209a7139..4a995cbbe89d 100644 --- a/pkgs/development/libraries/librsb/default.nix +++ b/pkgs/development/libraries/librsb/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ KarlJoad ]; platforms = platforms.all; # ./rsb_common.h:56:10: fatal error: 'omp.h' file not found - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/librseq/default.nix b/pkgs/development/libraries/librseq/default.nix deleted file mode 100644 index 890c0dd25ff2..000000000000 --- a/pkgs/development/libraries/librseq/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, autoreconfHook, linuxHeaders -}: - -stdenv.mkDerivation rec { - pname = "librseq"; - version = "0.1.0pre71_${builtins.substring 0 7 src.rev}"; - - src = fetchFromGitHub { - owner = "compudj"; - repo = "librseq"; - rev = "170f840b498e1aff068b90188727a656111bfc2f"; - sha256 = "0rdx59y8y9x8cfmmx5gl66gibkzpk3kw5lrrqhrxan8zr37a055y"; - }; - - outputs = [ "out" "dev" "man" ]; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ linuxHeaders ]; - - installTargets = [ "install" "install-man" ]; - - doCheck = true; - separateDebugInfo = true; - enableParallelBuilding = true; - - patchPhase = '' - patchShebangs tests - ''; - - # The share/ subdir only contains a doc/ with a README.md that just describes - # how to compile the library, which clearly isn't very useful! So just get - # rid of it anyway. - postInstall = '' - rm -rf $out/share - ''; - - meta = with lib; { - description = "Userspace library for the Linux Restartable Sequence API"; - homepage = "https://github.com/compudj/librseq"; - license = licenses.lgpl21Only; - platforms = platforms.linux; - maintainers = with maintainers; [ thoughtpolice ]; - }; -} diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index e8426b97cec5..3d7a8bf8e5ba 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.2"; + version = "2.58.3"; 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-GOnXDAjPJfUNYQ1tWvVxVh1nz0F5+WLgQmZHXfbi4iQ="; + hash = "sha256-SfKaCpL0wtGaLLQelqsvzn61veQYUMipFPz2VeMRCUQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; - hash = "sha256-E0bXSxWI0MkJmNvl8gxklXHgy4zlkiee59+s0h4Gw5s="; + hash = "sha256-pTd3H4ZYwsCb4C6gijE0gRWZ4Mq6gGGmwXE3nKGILhw="; # TODO: move this to fetchCargoTarball dontConfigure = true; }; @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { pango libintl vala # for share/vala/Makefile.vapigen - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Foundation libobjc @@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.enableFeature withIntrospection "vala") "--enable-always-build-tests" - ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-Bsymbolic" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "RUST_TARGET=${stdenv.hostPlatform.rust.rustcTarget}"; doCheck = false; # all tests fail on libtool-generated rsvg-convert not being able to find coreutils @@ -113,11 +113,8 @@ stdenv.mkDerivation (finalAttrs: { ${lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (stdenv.hostPlatform.emulator buildPackages)} ${lib.getDev gdk-pixbuf}/bin/gdk-pixbuf-query-loaders ''; - # librsvg only links Foundation, but it also requiers libobjc. The Framework.tbd in the 11.0 SDK - # reexports libobjc, but the one in the 10.12 SDK does not, so link it manually. - env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { - NIX_LDFLAGS = "-lobjc"; - }; + # librsvg only links Foundation, but it also requiers libobjc. + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = "-lobjc"; }; preConfigure = '' PKG_CONFIG_VAPIGEN_VAPIGEN="$(type -p vapigen)" diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix deleted file mode 100644 index 5139c397de3a..000000000000 --- a/pkgs/development/libraries/librsync/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, perl, zlib, bzip2, popt }: - -stdenv.mkDerivation rec { - pname = "librsync"; - version = "2.3.4"; - - src = fetchFromGitHub { - owner = "librsync"; - repo = "librsync"; - rev = "v${version}"; - sha256 = "sha256-fiOby8tOhv0KJ+ZwAWfh/ynqHlYC9kNqKfxNl3IhzR8="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ perl zlib bzip2 popt ]; - - dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - - meta = with lib; { - description = "Implementation of the rsync remote-delta algorithm"; - homepage = "https://librsync.sourceforge.net/"; - changelog = "https://github.com/librsync/librsync/releases/tag/v${version}"; - license = licenses.lgpl2Plus; - mainProgram = "rdiff"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/librtprocess/default.nix b/pkgs/development/libraries/librtprocess/default.nix deleted file mode 100644 index dabb5e62e45d..000000000000 --- a/pkgs/development/libraries/librtprocess/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages }: - -stdenv.mkDerivation rec { - pname = "librtprocess"; - version = "0.12.0"; - - src = fetchFromGitHub { - owner = "CarVac"; - repo = "librtprocess"; - rev = version; - hash = "sha256-/1o6SWUor+ZBQ6RsK2PoDRu03jcVRG58PNYFttriH2w="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = lib.optionals stdenv.isDarwin [ llvmPackages.openmp ]; - - meta = with lib; { - description = "Highly optimized library for processing RAW images"; - homepage = "https://github.com/CarVac/librtprocess"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ hjones2199 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/librttopo/default.nix b/pkgs/development/libraries/librttopo/default.nix deleted file mode 100644 index 5d768db366df..000000000000 --- a/pkgs/development/libraries/librttopo/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, stdenv -, fetchFromGitea -, autoreconfHook -, validatePkgConfig -, geos -}: - -stdenv.mkDerivation rec { - pname = "librttopo"; - version = "1.1.0"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitea { - domain = "git.osgeo.org/gitea"; - owner = "rttopo"; - repo = "librttopo"; - rev = "librttopo-${version}"; - sha256 = "0h7lzlkn9g4xky6h81ndy0aa6dxz8wb6rnl8v3987jy1i6pr072p"; - }; - - nativeBuildInputs = [ - autoreconfHook - validatePkgConfig - geos # for geos-config - ]; - - buildInputs = [ geos ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "RT Topology Library"; - homepage = "https://git.osgeo.org/gitea/rttopo/librttopo"; - license = licenses.gpl2Plus; - maintainers = with maintainers; teams.geospatial.members ++ [ dotlambda ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index 45cd9d091dd0..ec4da5a34784 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -14,13 +14,13 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile ] - ++ optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; + ++ optionals stdenv.hostPlatform.isDarwin [ ApplicationServices CoreServices ]; configureFlags = [ "--disable-fftw" ]; outputs = [ "dev" "out" ]; - postConfigure = optionalString stdenv.isDarwin '' + postConfigure = optionalString stdenv.hostPlatform.isDarwin '' # need headers from the Carbon.framework in /System/Library/Frameworks to # compile this on darwin -- not sure how to handle NIX_CFLAGS_COMPILE+=" -I${Carbon}/Library/Frameworks/Carbon.framework/Headers" diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix deleted file mode 100644 index aedcafd4ce73..000000000000 --- a/pkgs/development/libraries/libsass/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, testers - -# for passthru.tests -, gtk3 -, gtk4 -, sassc -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libsass"; - version = "3.6.6"; # also check sassc for updates - - src = fetchFromGitHub { - owner = "sass"; - repo = "libsass"; - rev = finalAttrs.version; - hash = "sha256-FkLL3OAJXDptRQY6ZkYbss2pcc40f/wasIvEIyHRQFo="; - # Remove unicode file names which leads to different checksums on HFS+ - # vs. other filesystems because of unicode normalisation. - postFetch = '' - rm -r $out/test/e2e/unicode-pwd - ''; - }; - - preConfigure = '' - export LIBSASS_VERSION=${finalAttrs.version} - ''; - - nativeBuildInputs = [ autoreconfHook ]; - - passthru.tests = { - inherit gtk3 gtk4 sassc; - pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - }; - - meta = with lib; { - description = "C/C++ implementation of a Sass compiler"; - homepage = "https://github.com/sass/libsass"; - license = licenses.mit; - maintainers = with maintainers; [ codyopel offline ]; - pkgConfigModules = [ "libsass" ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/libsbsms/common.nix b/pkgs/development/libraries/libsbsms/common.nix index f206f68de42a..7215c23667b8 100644 --- a/pkgs/development/libraries/libsbsms/common.nix +++ b/pkgs/development/libraries/libsbsms/common.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # Fix buidling on platforms other than x86 (substituteAll { src = ./configure.patch; - msse = lib.optionalString stdenv.isx86_64 "-msse"; + msse = lib.optionalString stdenv.hostPlatform.isx86_64 "-msse"; }) ]; diff --git a/pkgs/development/libraries/libschrift/default.nix b/pkgs/development/libraries/libschrift/default.nix deleted file mode 100644 index 376c0abbcdf9..000000000000 --- a/pkgs/development/libraries/libschrift/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "libschrift"; - version = "0.10.2"; - - src = fetchFromGitHub { - owner = "tomolt"; - repo = pname; - rev = "v" + version; - sha256 = "01hgvkcb46kr9jzc4ah0js0jy9kr0ll18j2k0c5zil55l3a9rqw1"; - }; - - postPatch = '' - substituteInPlace config.mk \ - --replace "PREFIX = /usr/local" "PREFIX = $out" - ''; - - makeFlags = [ "libschrift.a" ]; - - meta = with lib; { - homepage = "https://github.com/tomolt/libschrift"; - description = "Lightweight TrueType font rendering library"; - license = licenses.isc; - platforms = platforms.all; - maintainers = [ maintainers.sternenseemann ]; - }; -} diff --git a/pkgs/development/libraries/libsciter/default.nix b/pkgs/development/libraries/libsciter/default.nix deleted file mode 100644 index 9e9c0aece0ba..000000000000 --- a/pkgs/development/libraries/libsciter/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, glib -, cairo -, libuuid -, pango -, gtk3 -, stdenv -, fetchurl -, autoPatchelfHook -}: - -stdenv.mkDerivation { - pname = "libsciter"; - version = "4.4.8.23-bis"; # Version specified in GitHub commit title - - src = fetchurl { - url = "https://github.com/c-smile/sciter-sdk/raw/9f1724a45f5a53c4d513b02ed01cdbdab08fa0e5/bin.lnx/x64/libsciter-gtk.so"; - sha256 = "a1682fbf55e004f1862d6ace31b5220121d20906bdbf308d0a9237b451e4db86"; - }; - - nativeBuildInputs = [ - autoPatchelfHook - ]; - - buildInputs = [ glib cairo libuuid pango gtk3 ]; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - - install -m755 -D $src $out/lib/libsciter-gtk.so - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://sciter.com"; - description = "Embeddable HTML/CSS/JavaScript engine for modern UI development"; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ leixb ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - }; -} diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix deleted file mode 100644 index 6adc2124a3ab..000000000000 --- a/pkgs/development/libraries/libscrypt/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "libscrypt"; - version = "1.22"; - - src = fetchFromGitHub { - owner = "technion"; - repo = "libscrypt"; - rev = "v${version}"; - sha256 = "sha256-QWWqC10bENemG5FYEog87tT7IxDaBJUDqu6j/sO3sYE="; - }; - - buildFlags = lib.optional stdenv.isDarwin "LDFLAGS= LDFLAGS_EXTRA= CFLAGS_EXTRA="; - - installFlags = [ "PREFIX=$(out)" ]; - installTargets = lib.optional stdenv.isDarwin "install-osx"; - - doCheck = true; - - meta = with lib; { - description = "Shared library that implements scrypt() functionality"; - homepage = "https://lolware.net/2014/04/29/libscrypt.html"; - license = licenses.bsd2; - maintainers = with maintainers; [ davidak ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix deleted file mode 100644 index 94034d6167cb..000000000000 --- a/pkgs/development/libraries/libsearpc/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config -, python3 -, glib -, jansson -}: - -stdenv.mkDerivation rec { - version = "3.3-20230626"; - commit = "783141fb694f3bd1f8bd8a783670dd25a53b9fc1"; - pname = "libsearpc"; - - src = fetchFromGitHub { - owner = "haiwen"; - repo = "libsearpc"; - rev = commit; - sha256 = "sha256-nYYp3EyA8nufhbWaw4Lv/c4utGYaxC+PoFyamUEVJx4="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - python3 - ]; - - propagatedBuildInputs = [ - glib - jansson - ]; - - meta = with lib; { - homepage = "https://github.com/haiwen/libsearpc"; - description = "Simple and easy-to-use C language RPC framework based on GObject System"; - mainProgram = "searpc-codegen.py"; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ greizgh ]; - }; -} diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix deleted file mode 100644 index a8b2a98850dd..000000000000 --- a/pkgs/development/libraries/libseccomp/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv, fetchurl, getopt, util-linuxMinimal, which, gperf, nix-update-script }: - -stdenv.mkDerivation rec { - pname = "libseccomp"; - version = "2.5.5"; - - src = fetchurl { - url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - hash = "sha256-JIosik2bmFiqa69ScSw0r+/PnJ6Ut23OAsHJqiX7M3U="; - }; - - outputs = [ "out" "lib" "dev" "man" "pythonsrc" ]; - - nativeBuildInputs = [ gperf ]; - buildInputs = [ getopt ]; - - patchPhase = '' - patchShebangs . - ''; - - nativeCheckInputs = [ util-linuxMinimal which ]; - doCheck = !(stdenv.targetPlatform.useLLVM or false); - - # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference. - preFixup = "rm -rfv src"; - - # Copy the python module code into a tarball that we can export and use as the - # src input for buildPythonPackage calls - postInstall = '' - cp -R ./src/python/ tmp-pythonsrc/ - tar -zcf $pythonsrc --mtime="@$SOURCE_DATE_EPOCH" --sort=name --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/ - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "High level library for the Linux Kernel seccomp filter"; - mainProgram = "scmp_sys_resolver"; - homepage = "https://github.com/seccomp/libseccomp"; - license = licenses.lgpl21Only; - platforms = platforms.linux; - badPlatforms = [ - "alpha-linux" - "loongarch64-linux" - "m68k-linux" - "microblaze-linux" - "microblazeel-linux" - "riscv32-linux" - "sparc-linux" - "sparc64-linux" - ]; - maintainers = with maintainers; [ thoughtpolice ]; - }; -} diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix deleted file mode 100644 index d0b1515d0bad..000000000000 --- a/pkgs/development/libraries/libsecret/default.nix +++ /dev/null @@ -1,138 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch2 -, glib -, meson -, ninja -, pkg-config -, gettext -, libxslt -, python3 -, docbook-xsl-nons -, docbook_xml_dtd_42 -, libgcrypt -, gobject-introspection -, buildPackages -, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages -, vala -, gi-docgen -, gnome -, gjs -, libintl -, dbus -}: - -stdenv.mkDerivation rec { - pname = "libsecret"; - version = "0.21.4"; - - outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-Fj0I14O+bUq5qXnOtaT+y8HZZg08NBaMWBMBzVORKyA="; - }; - - patches = [ - # https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/141 - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/libsecret/-/commit/208989323211c756dff690115e5cbde5ef7491ce.patch"; - hash = "sha256-DtRbqyyoMttEYf6B16m9O72Yjurv6rpbnqH7AlrAU4k="; - }) - ]; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - libxslt # for xsltproc for building man pages - docbook-xsl-nons - docbook_xml_dtd_42 - libintl - vala - glib - ] ++ lib.optionals withIntrospection [ - gi-docgen - gobject-introspection - ]; - - buildInputs = [ - libgcrypt - ]; - - propagatedBuildInputs = [ - glib - ]; - - nativeCheckInputs = [ - python3 - python3.pkgs.dbus-python - python3.pkgs.pygobject3 - dbus - gjs - ]; - - mesonFlags = [ - (lib.mesonBool "introspection" withIntrospection) - (lib.mesonBool "gtk_doc" withIntrospection) - ]; - - doCheck = stdenv.isLinux && withIntrospection; - separateDebugInfo = true; - - postPatch = '' - patchShebangs ./tool/test-*.sh - ''; - - preCheck = '' - # Our gobject-introspection patches make the shared library paths absolute - # in the GIR files. When running tests, the library is not yet installed, - # though, so we need to replace the absolute path with a local one during build. - # We are using a symlink that will be overwitten during installation. - mkdir -p $out/lib $out/lib - ln -s "$PWD/libsecret/libmock-service.so" "$out/lib/libmock-service.so" - ln -s "$PWD/libsecret/libsecret-1.so.0" "$out/lib/libsecret-1.so.0" - ''; - - checkPhase = '' - runHook preCheck - - dbus-run-session \ - --config-file=${dbus}/share/dbus-1/session.conf \ - meson test --print-errorlogs --timeout-multiplier 0 - - runHook postCheck - ''; - - postCheck = '' - # This is test-only so it won’t be overwritten during installation. - rm "$out/lib/libmock-service.so" - ''; - - postFixup = '' - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput "share/doc" "$devdoc" - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - # Does not seem to use the odd-unstable policy: https://gitlab.gnome.org/GNOME/libsecret/issues/30 - versionPolicy = "none"; - }; - }; - - meta = { - description = "Library for storing and retrieving passwords and other secrets"; - homepage = "https://gitlab.gnome.org/GNOME/libsecret"; - license = lib.licenses.lgpl21Plus; - mainProgram = "secret-tool"; - inherit (glib.meta) platforms maintainers; - }; -} diff --git a/pkgs/development/libraries/libsegfault/default.nix b/pkgs/development/libraries/libsegfault/default.nix deleted file mode 100644 index 58896c3e2bc2..000000000000 --- a/pkgs/development/libraries/libsegfault/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, meson -, ninja -, boost -, libbacktrace -, unstableGitUpdater -}: - -stdenv.mkDerivation rec { - pname = "libsegfault"; - version = "0-unstable-2022-11-13"; - - src = fetchFromGitHub { - owner = "jonathanpoelen"; - repo = "libsegfault"; - rev = "8bca5964613695bf829c96f7a3a14dbd8304fe1f"; - sha256 = "vKtY6ZEkyK2K+BzJCSo30f9MpERpPlUnarFIlvJ1Giw="; - }; - - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin) "-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED=1"; - - nativeBuildInputs = [ - meson - ninja - ]; - - buildInputs = [ - boost - libbacktrace - ]; - - passthru = { - updateScript = unstableGitUpdater { }; - }; - - meta = with lib; { - description = "Implementation of libSegFault.so with Boost.stracktrace"; - homepage = "https://github.com/jonathanpoelen/libsegfault"; - license = licenses.asl20; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libserdes/default.nix b/pkgs/development/libraries/libserdes/default.nix deleted file mode 100644 index 9c61d6a4079e..000000000000 --- a/pkgs/development/libraries/libserdes/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, perl -, which -, boost -, rdkafka -, jansson -, curl -, avro-c -, avro-cpp -, nix-update-script }: - -stdenv.mkDerivation rec { - pname = "libserdes"; - version = "7.7.1"; - - src = fetchFromGitHub { - owner = "confluentinc"; - repo = pname; - rev = "v${version}"; - hash = "sha256-rg4SWa9nIDT6JrnnCDwdiFE1cvpUn0HWHn+bPkXMHQ4="; - }; - - outputs = [ "dev" "out" ]; - - nativeBuildInputs = [ perl which ]; - - buildInputs = [ boost rdkafka jansson curl avro-c avro-cpp ]; - - makeFlags = [ "GEN_PKG_CONFIG=y" ]; - - postPatch = '' - patchShebangs configure lds-gen.pl - ''; - - # Has a configure script but it’s not Autoconf so steal some bits from multiple-outputs.sh: - setOutputFlags = false; - - preConfigure = '' - configureFlagsArray+=( - "--libdir=''${!outputLib}/lib" - "--includedir=''${!outputInclude}/include" - ) - ''; - - preInstall = '' - installFlagsArray+=("pkgconfigdir=''${!outputDev}/lib/pkgconfig") - ''; - - # Header files get installed with executable bit for some reason; get rid of it. - postInstall = '' - chmod -x ''${!outputInclude}/include/libserdes/*.h - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Schema-based serializer/deserializer C/C++ library with support for Avro and the Confluent Platform Schema Registry"; - homepage = "https://github.com/confluentinc/libserdes"; - license = licenses.asl20; - maintainers = with maintainers; [ liff ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix deleted file mode 100644 index 79f46ffca1f8..000000000000 --- a/pkgs/development/libraries/libserialport/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, udev, darwin }: - -stdenv.mkDerivation rec { - pname = "libserialport"; - version = "0.1.1"; - - src = fetchurl { - url = "https://sigrok.org/download/source/libserialport/${pname}-${version}.tar.gz"; - sha256 = "17ajlwgvyyrap8z7f16zcs59pksvncwbmd3mzf98wj7zqgczjaja"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optional stdenv.isLinux udev - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.IOKit; - - meta = with lib; { - description = "Cross-platform shared library for serial port access"; - homepage = "https://sigrok.org/"; - license = licenses.gpl3Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix deleted file mode 100644 index 8f97b09a3138..000000000000 --- a/pkgs/development/libraries/libshout/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config -, openssl, libvorbis, libtheora, speex }: - -# need pkg-config so that libshout installs ${out}/lib/pkgconfig/shout.pc - -stdenv.mkDerivation rec { - pname = "libshout"; - version = "2.4.6"; - - src = fetchurl { - url = "https://downloads.xiph.org/releases/libshout/${pname}-${version}.tar.gz"; - sha256 = "sha256-OcvU8O/f3cl1XYghfkf48tcQj6dn+dWKK6JqFtj3yRA="; - }; - - patches = [ - # Fixes building libshout with clang. Can be dropped once the following MR is merged: - # https://gitlab.xiph.org/xiph/icecast-libshout/-/merge_requests/4. - (fetchpatch { - url = "https://gitlab.xiph.org/xiph/icecast-libshout/-/commit/600fa105a799986efcccddfedfdfd3e9a1988cd0.patch"; - hash = "sha256-XjogfcQJBPZX9MPAbNJyXaFZNekL1pabvtTT7N+cz+s="; - }) - (fetchpatch { - url = "https://gitlab.xiph.org/xiph/icecast-libshout/-/commit/8ab2de318d55c9d0987ffae7d9b94b365af732c1.patch"; - hash = "sha256-0+Wp2Xu59ESCJfoDcwAJHuAJyzMsaBe7f8Js3/ren2g="; - }) - ]; - - outputs = [ "out" "dev" "doc" ]; - - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ openssl libvorbis libtheora speex ]; - - meta = { - description = "icecast 'c' language bindings"; - - longDescription = '' - Libshout is a library for communicating with and sending data to an icecast - server. It handles the socket connection, the timing of the data, and prevents - bad data from getting to the icecast server. - ''; - - homepage = "https://www.icecast.org"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ jcumming ]; - mainProgram = "shout"; - platforms = with lib.platforms; unix; - }; -} diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix deleted file mode 100644 index 17783999b53c..000000000000 --- a/pkgs/development/libraries/libshumate/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ lib -, stdenv -, fetchurl -, gi-docgen -, meson -, ninja -, pkg-config -, vala -, gobject-introspection -, gperf -, glib -, cairo -, sqlite -, libsoup_3 -, gtk4 -, libsysprof-capture -, json-glib -, protobufc -, xvfb-run -, gnome -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libshumate"; - 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-TMbNc/bYcVX2J2arY+WqzEc72aDONZBpMqz8g56WTAw="; - }; - - depsBuildBuild = [ - # required to find native gi-docgen when cross compiling - pkg-config - ]; - - nativeBuildInputs = [ - gi-docgen - meson - ninja - pkg-config - vala - gobject-introspection - gperf - ]; - - buildInputs = [ - glib - cairo - sqlite - libsoup_3 - gtk4 - libsysprof-capture - json-glib - protobufc - ]; - - nativeCheckInputs = [ - xvfb-run - ]; - - mesonFlags = [ - "-Ddemos=true" - ]; - - doCheck = !stdenv.isDarwin; - - checkPhase = '' - runHook preCheck - - env \ - HOME="$TMPDIR" \ - GTK_A11Y=none \ - xvfb-run meson test --print-errorlogs - - runHook postCheck - ''; - - postFixup = '' - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput share/doc/libshumate-1.0 "$devdoc" - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = "libshumate"; - }; - }; - - meta = with lib; { - description = "GTK toolkit providing widgets for embedded maps"; - mainProgram = "shumate-demo"; - homepage = "https://gitlab.gnome.org/GNOME/libshumate"; - license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix deleted file mode 100644 index 803189719272..000000000000 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, makeFontsConf -, nix-update-script -, testers -, autoreconfHook -, docSupport ? true -, doxygen -, graphviz -, libexsid -, libgcrypt -, perl -, pkg-config -, unittest-cpp -, xa -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libsidplayfp"; - version = "2.9.0"; - - src = fetchFromGitHub { - owner = "libsidplayfp"; - repo = "libsidplayfp"; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-m1bbbtNJvoY6l2+jMbEN/dR9V7LZ4f1lHHGnn0F4bmU="; - }; - - outputs = [ - "out" - ] ++ lib.optionals docSupport [ - "doc" - ]; - - postPatch = '' - patchShebangs . - ''; - - strictDeps = true; - - nativeBuildInputs = [ - autoreconfHook - perl - pkg-config - xa - ] ++ lib.optionals docSupport [ - doxygen - graphviz - ]; - - buildInputs = [ - libexsid - libgcrypt - ]; - - checkInputs = [ - unittest-cpp - ]; - - enableParallelBuilding = true; - - configureFlags = [ - (lib.strings.enableFeature true "hardsid") - (lib.strings.withFeature true "gcrypt") - (lib.strings.withFeature true "exsid") - (lib.strings.enableFeature finalAttrs.finalPackage.doCheck "tests") - ]; - - # Make Doxygen happy with the setup, reduce log noise - FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf { fontDirectories = [ ]; }); - - preBuild = '' - # Reduce noise from fontconfig during doc building - export XDG_CACHE_HOME=$TMPDIR - ''; - - buildFlags = [ - "all" - ] ++ lib.optionals docSupport [ - "doc" - ]; - - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - - postInstall = lib.optionalString docSupport '' - mkdir -p $doc/share/doc/libsidplayfp - mv docs/html $doc/share/doc/libsidplayfp/ - ''; - - passthru = { - tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "Library to play Commodore 64 music derived from libsidplay2"; - longDescription = '' - libsidplayfp is a C64 music player library which integrates - the reSID SID chip emulation into a cycle-based emulator - environment, constantly aiming to improve emulation of the - C64 system and the SID chips. - ''; - homepage = "https://github.com/libsidplayfp/libsidplayfp"; - license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ ramkromberg OPNA2608 ]; - platforms = platforms.all; - pkgConfigModules = [ - "libsidplayfp" - "libstilview" - ]; - }; -}) diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/development/libraries/libsieve/default.nix deleted file mode 100644 index 12838b6269f7..000000000000 --- a/pkgs/development/libraries/libsieve/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{lib, stdenv, fetchurl}: -stdenv.mkDerivation rec { - version = "2.3.1"; - pname = "libsieve"; - - src = fetchurl { - url = "https://github.com/downloads/sodabrew/libsieve/libsieve-${version}.tar.gz"; - sha256 = "1gllhl9hbmc86dq3k98d4kjs5bwk0p2rlk7ywqj3fjn7jw6mbhcj"; - }; - - meta = with lib; { - description = "Interpreter for RFC 3028 Sieve and various extensions"; - homepage = "http://sodabrew.com/libsieve/"; - license = licenses.lgpl21; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libsignal-protocol-c/default.nix b/pkgs/development/libraries/libsignal-protocol-c/default.nix deleted file mode 100644 index 203d3613af85..000000000000 --- a/pkgs/development/libraries/libsignal-protocol-c/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssl }: - -stdenv.mkDerivation rec { - pname = "libsignal-protocol-c"; - version = "2.3.3"; - - src = fetchFromGitHub { - owner = "signalapp"; - repo = "libsignal-protocol-c"; - rev = "v${version}"; - sha256 = "0z5p03vk15i6h870azfjgyfgxhv31q2vq6rfhnybrnkxq2wqzwhk"; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ openssl ]; - - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; - - outputs = [ "out" "dev" ]; - - meta = with lib; { - description = "Signal Protocol C Library"; - homepage = "https://github.com/signalapp/libsignal-protocol-c"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ orivej ]; - }; -} diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix deleted file mode 100644 index 95541c97eb89..000000000000 --- a/pkgs/development/libraries/libsignon-glib/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv, fetchgit, nix-update-script, pkg-config, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobject-introspection }: - -stdenv.mkDerivation rec { - pname = "libsignon-glib"; - version = "2.1"; - - outputs = [ "out" "dev" "devdoc" "py" ]; - - src = fetchgit { - url = "https://gitlab.com/accounts-sso/${pname}"; - rev = "refs/tags/${version}"; - sha256 = "0gnx9gqsh0hcfm1lk7w60g64mkn1iicga5f5xcy1j9a9byacsfd0"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - check - docbook_xml_dtd_412 - docbook_xml_dtd_43 - docbook_xsl - gobject-introspection - gtk-doc - meson - ninja - pkg-config - python3 - vala - ]; - - buildInputs = [ - glib - python3.pkgs.pygobject3 - ]; - - mesonFlags = [ - "-Dintrospection=true" - "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" - ]; - - postPatch = '' - chmod +x build-aux/gen-error-map.py - patchShebangs build-aux/gen-error-map.py - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - 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 = [ ]; - platforms = platforms.linux; - }; -} - diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix deleted file mode 100644 index 84c2f19e5e29..000000000000 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl -, enableSigbusFix ? false # required by kernels < 3.18.6 -}: - -stdenv.mkDerivation rec { - pname = "libsigsegv"; - version = "2.14"; - - src = fetchurl { - url = "mirror://gnu/libsigsegv/libsigsegv-${version}.tar.gz"; - sha256 = "sha256-zaw5QYAzZM+BqQhJm+t5wgDq1gtrW0DK0ST9HgbKopU="; - }; - - patches = if enableSigbusFix then [ ./sigbus_fix.patch ] else null; - - doCheck = true; # not cross; - - meta = { - homepage = "https://www.gnu.org/software/libsigsegv/"; - description = "Library to handle page faults in user mode"; - - longDescription = '' - GNU libsigsegv is a library for handling page faults in user mode. A - page fault occurs when a program tries to access to a region of memory - that is currently not available. Catching and handling a page fault is - a useful technique for implementing pageable virtual memory, - memory-mapped access to persistent databases, generational garbage - collectors, stack overflow handlers, distributed shared memory, and - more. - ''; - - license = lib.licenses.gpl2Plus; - - maintainers = [ ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libsigsegv/sigbus_fix.patch b/pkgs/development/libraries/libsigsegv/sigbus_fix.patch deleted file mode 100644 index 6f1c399041dd..000000000000 --- a/pkgs/development/libraries/libsigsegv/sigbus_fix.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/src/signals.h 2017-08-23 14:07:05.000000000 +0100 -+++ b/src/signals.h 2017-08-23 14:06:53.000000000 +0100 -@@ -18,4 +18,4 @@ - /* List of signals that are sent when an invalid virtual memory address - is accessed, or when the stack overflows. */ - #define SIGSEGV_FOR_ALL_SIGNALS(var,body) \ -- { int var; var = SIGSEGV; { body } } -+ { int var; var = SIGSEGV; { body } var = SIGBUS; { body } } diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix deleted file mode 100644 index 81f13acb340a..000000000000 --- a/pkgs/development/libraries/libsixel/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, gdk-pixbuf -, gd -, pkg-config -}: -stdenv.mkDerivation rec { - pname = "libsixel"; - version = "1.10.3"; - - src = fetchFromGitHub { - owner = "libsixel"; - repo = "libsixel"; - rev = "v${version}"; - sha256 = "1nny4295ipy4ajcxmmh04c796hcds0y7z7rv3qd17mj70y8j0r2d"; - }; - - buildInputs = [ - gdk-pixbuf gd - ]; - - nativeBuildInputs = [ - meson ninja pkg-config - ]; - - doCheck = true; - - mesonFlags = [ - "-Dtests=enabled" - # build system seems to be broken here, it still seems to handle jpeg - # through some other ways. - "-Djpeg=disabled" - "-Dpng=disabled" - ]; - - meta = with lib; { - description = "SIXEL library for console graphics, and converter programs"; - homepage = "https://github.com/libsixel/libsixel"; - maintainers = [ ]; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix deleted file mode 100644 index 8256f0525bbc..000000000000 --- a/pkgs/development/libraries/libskk/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, - libtool, gettext, pkg-config, - vala, gnome-common, gobject-introspection, - libgee, json-glib, skk-dicts, libxkbcommon }: - -stdenv.mkDerivation rec { - pname = "libskk"; - version = "1.0.5"; - - src = fetchFromGitHub { - owner = "ueno"; - repo = "libskk"; - rev = version; - sha256 = "0y279pcgs3jrsi9vzx086xhz9jbz23dqqijp4agygc9ackp9sxy5"; - }; - - buildInputs = [ skk-dicts libxkbcommon ]; - nativeBuildInputs = [ vala gnome-common gobject-introspection libtool gettext pkg-config ]; - propagatedBuildInputs = [ libgee json-glib ]; - - preConfigure = '' - ./autogen.sh - ''; - - # link SKK-JISYO.L from skkdicts for the bundled tool `skk` - preInstall = '' - dictDir=$out/share/skk - mkdir -p $dictDir - ln -s ${skk-dicts}/share/SKK-JISYO.L $dictDir/ - ''; - - enableParallelBuilding = true; - - meta = { - description = "Library to deal with Japanese kana-to-kanji conversion method"; - mainProgram = "skk"; - longDescription = '' - Libskk is a library that implements basic features of SKK including: - new word registration, completion, numeric conversion, abbrev mode, kuten input, - hankaku-katakana input, Lisp expression evaluation (concat only), and re-conversion. - It also supports various typing rules including: romaji-to-kana, AZIK, TUT-Code, and NICOLA, - as well as various dictionary types including: file dictionary (such as SKK-JISYO.[SML]), - user dictionary, skkserv, and CDB format dictionary. - ''; - homepage = "https://github.com/ueno/libskk"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ yuriaisaka ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/development/libraries/libslirp/default.nix deleted file mode 100644 index a8a8c3e77e08..000000000000 --- a/pkgs/development/libraries/libslirp/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, meson -, ninja -, pkg-config -, glib -}: - -stdenv.mkDerivation rec { - pname = "libslirp"; - version = "4.8.0"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "slirp"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-t2LpOPx+S2iABQv3+xFdHj/FjWns40cNKToDKMZhAuw="; - }; - - separateDebugInfo = true; - - nativeBuildInputs = [ meson ninja pkg-config ]; - - buildInputs = [ glib ]; - - postPatch = '' - echo ${version} > .tarball-version - ''; - - meta = with lib; { - description = "General purpose TCP-IP emulator"; - homepage = "https://gitlab.freedesktop.org/slirp/libslirp"; - license = licenses.bsd3; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libsmartcols/default.nix b/pkgs/development/libraries/libsmartcols/default.nix deleted file mode 100644 index 5b4fcf875f6f..000000000000 --- a/pkgs/development/libraries/libsmartcols/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3, gtk-doc}: - -stdenv.mkDerivation rec { - pname = "libsmartcols"; - version = "2.39.3"; - - nativeBuildInputs = [ autoreconfHook pkg-config python3 gtk-doc ]; - - src = fetchFromGitHub { - owner = "karelzak"; - repo = "util-linux"; - rev = "v${version}"; - sha256 = "sha256-X39os2iHqSrrYP6HVHPOkuTfc6vNB3pmsOP3VjW50fI="; - }; - - configureFlags = [ "--disable-all-programs" "--enable-libsmartcols" ]; - - buildPhase = '' - make libsmartcols.la - ''; - - installTargets = [ "install-am" "install-pkgconfigDATA" ]; - - meta = { - description = "smart column output alignment library"; - homepage = "https://github.com/karelzak/util-linux/tree/master/libsmartcols"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = with lib.maintainers; [ rb2k ]; - }; -} - diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/development/libraries/libsmi/default.nix deleted file mode 100644 index 5750e6677b34..000000000000 --- a/pkgs/development/libraries/libsmi/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv , fetchurl }: - -stdenv.mkDerivation rec { - pname = "libsmi"; - version = "0.5.0"; - - src = fetchurl { - url = "https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${pname}-${version}.tar.gz"; - sha256 = "1lslaxr2qcj6hf4naq5n5mparfhmswsgq4wa7zm2icqvvgdcq6pj"; - }; - - env.NIX_CFLAGS_COMPILE = "-std=gnu90"; - - meta = with lib; { - description = "Library to Access SMI MIB Information"; - homepage = "https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html"; - license = licenses.free; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix deleted file mode 100644 index 54360cad4ed9..000000000000 --- a/pkgs/development/libraries/libsnark/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }: - -stdenv.mkDerivation rec { - pname = "libsnark"; - version = "unstable-2018-01-15"; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps; - - cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin || !stdenv.hostPlatform.isx86) [ "-DWITH_SUPERCOP=OFF" ] - ++ lib.optionals (!stdenv.hostPlatform.isx86) [ "-DCURVE=ALT_BN128" ]; - - src = fetchFromGitHub { - rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; - owner = "scipr-lab"; - repo = "libsnark"; - sha256 = "13f02qp2fmfhvxlp4xi69m0l8r5nq913l2f0zwdk7hl46lprfdca"; - fetchSubmodules = true; - }; - - meta = with lib; { - description = "C++ library for zkSNARKs"; - homepage = "https://github.com/scipr-lab/libsnark"; - license = licenses.mit; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index a1ffdae6bb33..ad3ab58b0e13 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook autogen pkg-config python3 ]; buildInputs = [ flac lame libmpg123 libogg libopus libvorbis ] - ++ lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon AudioToolbox ]; enableParallelBuilding = true; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # need headers from the Carbon.framework in /System/Library/Frameworks to # compile this on darwin -- not sure how to handle - preConfigure = lib.optionalString stdenv.isDarwin + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' NIX_CFLAGS_COMPILE+=" -I$SDKROOT/System/Library/Frameworks/Carbon.framework/Versions/A/Headers" ''; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix deleted file mode 100644 index 044450c1825d..000000000000 --- a/pkgs/development/libraries/libsodium/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libsodium"; - version = "1.0.20"; - - src = fetchurl { - url = "https://download.libsodium.org/libsodium/releases/libsodium-${finalAttrs.version}.tar.gz"; - hash = "sha256-67Ze9spDkzPCu0GgwZkFhyiNoH9sf9B8s6GMwY0wzhk="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ autoreconfHook ]; - - separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; - - enableParallelBuilding = true; - hardeningDisable = lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_32) "stackprotector"; - - # FIXME: the hardeingDisable attr above does not seems effective, so - # the need to disable stackprotector via configureFlags - configureFlags = lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_32) "--disable-ssp"; - - doCheck = true; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = with lib; { - description = "Modern and easy-to-use crypto library"; - homepage = "https://doc.libsodium.org/"; - license = licenses.isc; - maintainers = with maintainers; [ raskin ]; - pkgConfigModules = [ "libsodium" ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix deleted file mode 100644 index a0f5cd610e34..000000000000 --- a/pkgs/development/libraries/libsolv/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, ninja -, pkg-config -, zlib -, xz -, bzip2 -, zchunk -, zstd -, expat -, withRpm ? !stdenv.isDarwin -, rpm -, db -, withConda ? true -}: - -stdenv.mkDerivation rec { - version = "0.7.30"; - pname = "libsolv"; - - src = fetchFromGitHub { - owner = "openSUSE"; - repo = "libsolv"; - rev = version; - hash = "sha256-De2lQu80MjKvjnN0W3/Y9JwFbA8g7tleflVXC9Lib5Y="; - }; - - cmakeFlags = [ - "-DENABLE_COMPLEX_DEPS=true" - (lib.cmakeBool "ENABLE_CONDA" withConda) - "-DENABLE_LZMA_COMPRESSION=true" - "-DENABLE_BZIP2_COMPRESSION=true" - "-DENABLE_ZSTD_COMPRESSION=true" - "-DENABLE_ZCHUNK_COMPRESSION=true" - "-DWITH_SYSTEM_ZCHUNK=true" - ] ++ lib.optionals withRpm [ - "-DENABLE_COMPS=true" - "-DENABLE_PUBKEY=true" - "-DENABLE_RPMDB=true" - "-DENABLE_RPMDB_BYRPMHEADER=true" - "-DENABLE_RPMMD=true" - ]; - - nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = [ zlib xz bzip2 zchunk zstd expat db ] - ++ lib.optional withRpm rpm; - - meta = with lib; { - description = "Free package dependency solver"; - homepage = "https://github.com/openSUSE/libsolv"; - license = licenses.bsd3; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ copumpkin ]; - }; -} diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index b7de8bf04e88..c4b501628272 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libjack2 ] - ++ lib.optionals stdenv.isLinux [ libpulseaudio alsa-lib ] - ++ lib.optional stdenv.isDarwin AudioUnit; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio alsa-lib ] + ++ lib.optional stdenv.hostPlatform.isDarwin AudioUnit; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DBUILD_TESTS=OFF" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-strict-prototypes"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-strict-prototypes"; meta = with lib; { description = "Cross platform audio input and output"; diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index 4d5f30cf0b6e..2aff5ca60377 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "3.4.4"; + version = "3.6.0"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KRxncl827ZDqQ+//JQZLacWi0ZgUiEd8BcSBo7Swxao="; + sha256 = "sha256-YpWfeR6OhEL4wTztrIxJGdePkSDVu1MBvmel5TMYtKM="; }; depsBuildBuild = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { glib.out brotli libnghttp2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libsysprof-capture ]; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { (lib.mesonEnable "docs" withIntrospection) (lib.mesonEnable "introspection" withIntrospection) - (lib.mesonEnable "sysprof" stdenv.isLinux) + (lib.mesonEnable "sysprof" stdenv.hostPlatform.isLinux) (lib.mesonEnable "vapi" withIntrospection) ]; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index e92c59bc2f2c..a88cd9355326 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libpsl glib.out brotli - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libsysprof-capture ]; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" "-Dgnome=${lib.boolToString gnomeSupport}" "-Dntlm=disabled" - ] ++ lib.optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Dsysprof=disabled" ]; diff --git a/pkgs/development/libraries/libspatialaudio/default.nix b/pkgs/development/libraries/libspatialaudio/default.nix deleted file mode 100644 index a97a46f357a6..000000000000 --- a/pkgs/development/libraries/libspatialaudio/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, cmake, fetchFromGitHub, libmysofa, zlib }: - -stdenv.mkDerivation rec { - pname = "libspatialaudio"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "videolabs"; - repo = "libspatialaudio"; - rev = version; - hash = "sha256-sPnQPD41AceXM4uGqWXMYhuQv0TUkA6TZP8ChxUFIoI="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libmysofa zlib ]; - - postFixup = '' - substituteInPlace "''${!outputDev}/lib/pkgconfig/spatialaudio.pc" \ - --replace '-L${lib.getDev libmysofa}' '-L${lib.getLib libmysofa}' - ''; - - meta = with lib; { - description = - "Ambisonic encoding / decoding and binauralization library in C++"; - homepage = "https://github.com/videolabs/libspatialaudio"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ krav ]; - }; -} diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix deleted file mode 100644 index 98d184ae703c..000000000000 --- a/pkgs/development/libraries/libspatialite/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, validatePkgConfig -, freexl -, geos -, librttopo -, libxml2 -, minizip -, proj -, sqlite -, libiconv -, zlib -}: - -stdenv.mkDerivation rec { - pname = "libspatialite"; - version = "5.1.0"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${version}.tar.gz"; - hash = "sha256-Q74t00na/+AW3RQAxdEShYKMIv6jXKUQnyHz7VBgUIA="; - }; - - nativeBuildInputs = [ - pkg-config - validatePkgConfig - geos # for geos-config - ]; - - buildInputs = [ - freexl - geos - librttopo - (libxml2.override { enableHttp = true; }) - minizip - proj - sqlite - zlib - ] ++ lib.optionals stdenv.isDarwin [ - libiconv - ]; - - enableParallelBuilding = true; - - postInstall = lib.optionalString stdenv.isDarwin '' - ln -s $out/lib/mod_spatialite.{so,dylib} - ''; - - # Failed tests (linux & darwin): - # - check_virtualtable6 - # - check_drop_rename - doCheck = false; - - preCheck = '' - export LD_LIBRARY_PATH=$(pwd)/src/.libs - export DYLD_LIBRARY_PATH=$(pwd)/src/.libs - ''; - - meta = with lib; { - description = "Extensible spatial index library in C++"; - homepage = "https://www.gaia-gis.it/fossil/libspatialite"; - # They allow any of these - license = with licenses; [ gpl2Plus lgpl21Plus mpl11 ]; - platforms = platforms.unix; - maintainers = with maintainers; teams.geospatial.members ++ [ dotlambda ]; - }; -} diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix deleted file mode 100644 index 9299e4dbfb13..000000000000 --- a/pkgs/development/libraries/libspectre/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ fetchurl, lib, stdenv, pkg-config, ghostscript, cairo }: - -stdenv.mkDerivation rec { - pname = "libspectre"; - version = "0.2.12"; - - src = fetchurl { - url = "https://libspectre.freedesktop.org/releases/${pname}-${version}.tar.gz"; - hash = "sha256-VadRfNNXK9JWXfDPRQlEoE1Sc7J567NpqJU5GVfw+WA="; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - # Need `libgs.so'. - ghostscript - ]; - - doCheck = true; - - checkInputs = [ - cairo - ]; - - meta = { - homepage = "http://libspectre.freedesktop.org/"; - description = "PostScript rendering library"; - - longDescription = '' - libspectre is a small library for rendering Postscript - documents. It provides a convenient easy to use API for - handling and rendering Postscript documents. - ''; - - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libspectrum/default.nix b/pkgs/development/libraries/libspectrum/default.nix deleted file mode 100644 index 3dda20ab6128..000000000000 --- a/pkgs/development/libraries/libspectrum/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, perl, pkg-config, audiofile, bzip2, glib, libgcrypt, zlib }: - -stdenv.mkDerivation rec { - pname = "libspectrum"; - version = "1.5.0"; - - src = fetchurl { - url = "mirror://sourceforge/fuse-emulator/${pname}-${version}.tar.gz"; - sha256 = "sha256-o1PLRumxooEGHYFjU+oBDQpv545qF6oLe3QnHKXkrPw="; - }; - - nativeBuildInputs = [ perl pkg-config ]; - - buildInputs = [ audiofile bzip2 glib libgcrypt zlib ]; - - enableParallelBuilding = true; - doCheck = true; - - meta = with lib; { - homepage = "https://fuse-emulator.sourceforge.net/libspectrum.php"; - description = "ZX Spectrum input and output support library"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ orivej ]; - }; -} diff --git a/pkgs/development/libraries/libspelling/default.nix b/pkgs/development/libraries/libspelling/default.nix deleted file mode 100644 index 874e9eff22c4..000000000000 --- a/pkgs/development/libraries/libspelling/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, meson -, ninja -, pkg-config -, gobject-introspection -, vala -, gi-docgen -, glib -, gtk4 -, gtksourceview5 -, enchant -, icu -, nix-update-script -}: - -stdenv.mkDerivation rec { - pname = "libspelling"; - version = "0.2.1"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "chergert"; - repo = "libspelling"; - rev = version; - hash = "sha256-0OGcwPGWtYYf0XmvzXEaQgebBOW/6JWcDuF4MlQjCZQ="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - vala - gi-docgen - ]; - - buildInputs = [ - glib - gtk4 - gtksourceview5 - enchant - icu - ]; - - postFixup = '' - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput "share/doc" "$devdoc" - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Spellcheck library for GTK 4"; - homepage = "https://gitlab.gnome.org/chergert/libspelling"; - license = licenses.lgpl21Plus; - changelog = "https://gitlab.gnome.org/chergert/libspelling/-/raw/${version}/NEWS"; - maintainers = with maintainers; [ chuangzhu ]; - }; -} diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix deleted file mode 100644 index d8746f72f3b5..000000000000 --- a/pkgs/development/libraries/libspf2/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "libspf2"; - version = "2.2.13"; - - src = fetchFromGitHub { - owner = "helsinki-systems"; - repo = "libspf2"; - rev = "v${version}"; - hash = "sha256-tkCHP3B1sBb0+scHBjX5lCvaeSrZryfaGKye02LFlYs="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - strictDeps = true; - - postPatch = '' - # disable static bins compilation - sed -i \ - -e '/bin_PROGRAMS/s/spfquery_static//' src/spfquery/Makefile.am \ - -e '/bin_PROGRAMS/s/spftest_static//' src/spftest/Makefile.am \ - -e '/bin_PROGRAMS/s/spfd_static//' src/spfd/Makefile.am \ - -e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am - ''; - - doCheck = true; - - meta = with lib; { - description = "Implementation of the Sender Policy Framework for SMTP " + - "authorization (Helsinki Systems fork)"; - homepage = "https://github.com/helsinki-systems/libspf2"; - license = with licenses; [ lgpl21Plus bsd2 ]; - maintainers = with maintainers; [ pacien ] ++ teams.helsinki-systems.members; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix deleted file mode 100644 index c14117305f04..000000000000 --- a/pkgs/development/libraries/libspiro/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{lib, stdenv, pkg-config, autoreconfHook, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "libspiro"; - version = "20240903"; - - src = fetchFromGitHub { - owner = "fontforge"; - repo = pname; - rev = version; - sha256 = "sha256-psEF1SWkire6ngEUcMU0xnGYaT8ktqDCBlBckToGUMg="; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - - meta = with lib; { - description = "Library that simplifies the drawing of beautiful curves"; - homepage = "https://github.com/fontforge/libspiro"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.erictapen ]; - }; -} diff --git a/pkgs/development/libraries/libspnav/configure-socket-path.patch b/pkgs/development/libraries/libspnav/configure-socket-path.patch deleted file mode 100644 index 9a8ef0d49811..000000000000 --- a/pkgs/development/libraries/libspnav/configure-socket-path.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/spnav.c b/spnav.c -index f9e10f8..27149f7 100644 ---- a/spnav.c -+++ b/spnav.c -@@ -36,7 +36,7 @@ OF SUCH DAMAGE. - #include <sys/select.h> - #include "spnav.h" - --#define SPNAV_SOCK_PATH "/var/run/spnav.sock" -+#define DEFAULT_SPNAV_SOCK_PATH "/run/spnav.sock" - - #ifdef USE_X11 - #include <X11/Xlib.h> -@@ -70,6 +70,24 @@ static struct event_node *ev_queue, *ev_queue_tail; - /* AF_UNIX socket used for alternative communication with daemon */ - static int sock = -1; - -+static char *spath = NULL; -+ -+static char *socket_path() -+{ -+ char *xdg_runtime_dir; -+ if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) { -+ if ( spath == NULL ) { -+ spath = malloc(strlen(xdg_runtime_dir) + strlen("/spnav.sock") + 1); -+ if ( spath != NULL ) { -+ sprintf(spath, "%s/spnav.sock", xdg_runtime_dir); -+ } -+ } -+ if(access(spath, F_OK) != -1){ -+ return spath; -+ } -+ } -+ return DEFAULT_SPNAV_SOCK_PATH; -+} - - int spnav_open(void) - { -@@ -92,7 +110,7 @@ int spnav_open(void) - - memset(&addr, 0, sizeof addr); - addr.sun_family = AF_UNIX; -- strncpy(addr.sun_path, SPNAV_SOCK_PATH, sizeof(addr.sun_path)); -+ strncpy(addr.sun_path, socket_path(), sizeof(addr.sun_path)); - - - if(connect(s, (struct sockaddr*)&addr, sizeof addr) == -1) { diff --git a/pkgs/development/libraries/libspnav/default.nix b/pkgs/development/libraries/libspnav/default.nix deleted file mode 100644 index d67b12a726b4..000000000000 --- a/pkgs/development/libraries/libspnav/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, libX11, fixDarwinDylibNames }: - -stdenv.mkDerivation rec { - version = "0.2.3"; - pname = "libspnav"; - - src = fetchFromGitHub { - owner = "FreeSpacenav"; - repo = "libspnav"; - rev = "${pname}-${version}"; - sha256 = "098h1jhlj87axpza5zgy58prp0zn94wyrbch6x0s7q4mzh7dc8ba"; - }; - - nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = [ libX11 ]; - - patches = [ - # Changes the socket path from /run/spnav.sock to $XDG_RUNTIME_DIR/spnav.sock - # to allow for a user service - ./configure-socket-path.patch - ]; - - configureFlags = [ "--disable-debug"]; - makeFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - "AR=${stdenv.cc.targetPrefix}ar" - ]; - - preInstall = '' - mkdir -p $out/{lib,include} - ''; - - meta = with lib; { - homepage = "https://spacenav.sourceforge.net/"; - description = "Device driver and SDK for 3Dconnexion 3D input devices"; - longDescription = "A free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ sohalt ]; - }; -} diff --git a/pkgs/development/libraries/libspng/default.nix b/pkgs/development/libraries/libspng/default.nix deleted file mode 100644 index 5377c75b1842..000000000000 --- a/pkgs/development/libraries/libspng/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, fetchFromGitHub -, stdenv -, zlib -, ninja -, meson -, pkg-config -, cmake -, libpng -}: - -stdenv.mkDerivation rec { - pname = "libspng"; - version = "0.7.4"; - - src = fetchFromGitHub { - owner = "randy408"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-BiRuPQEKVJYYgfUsglIuxrBoJBFiQ0ygQmAFrVvCz4Q="; - }; - - doCheck = true; - - mesonBuildType = "release"; - - mesonFlags = [ - # this is required to enable testing - # https://github.com/randy408/libspng/blob/bc383951e9a6e04dbc0766f6737e873e0eedb40b/tests/README.md#testing - "-Ddev_build=true" - ]; - - outputs = [ "out" "dev" ]; - - nativeCheckInputs = [ - cmake - libpng - ]; - - buildInputs = [ - zlib - ]; - - nativeBuildInputs = [ - ninja - meson - pkg-config - ]; - - meta = with lib; { - description = "Simple, modern libpng alternative"; - homepage = "https://libspng.org/"; - license = with licenses; [ bsd2 ]; - maintainers = with maintainers; [ humancalico ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/development/libraries/libsrs2/default.nix deleted file mode 100644 index e6fd748362e9..000000000000 --- a/pkgs/development/libraries/libsrs2/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, lib, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libsrs2"; - version = "1.0.18"; - - src = fetchurl { - url = "https://www.libsrs2.org/srs/libsrs2-${version}.tar.gz"; - sha256 = "9d1191b705d7587a5886736899001d04168392bbb6ed6345a057ade50943a492"; - }; - - meta = { - description = "Next generation SRS library from the original designer of SRS"; - mainProgram = "srs"; - license = with lib.licenses; [ gpl2 bsd3 ]; - homepage = "https://www.libsrs2.org/"; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix deleted file mode 100644 index 15f8fab50889..000000000000 --- a/pkgs/development/libraries/libssh/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, cmake -, zlib -, openssl -, libsodium - -# for passthru.tests -, ffmpeg -, sshping -, wireshark -}: - -stdenv.mkDerivation rec { - pname = "libssh"; - version = "0.10.6"; - - src = fetchurl { - url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/libssh-${version}.tar.xz"; - hash = "sha256-GGHUmPW28XQbarxz5ghHhJHtz5ydS2Yw7vbnRZbencE="; - }; - - # Do not split 'dev' output until lib/cmake/libssh/libssh-config.cmake - # is fixed to point INTERFACE_INCLUDE_DIRECTORIES to .dev output. - # Otherwise it breaks `plasma5Packages.kio-extras`: - # https://hydra.nixos.org/build/221540008/nixlog/3/tail - #outputs = [ "out" "dev" ]; - - postPatch = '' - # Fix headers to use libsodium instead of NaCl - sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c - ''; - - # Don’t build examples, which are not installed and require additional dependencies not - # included in `buildInputs` such as libX11. - cmakeFlags = [ "-DWITH_EXAMPLES=OFF" ]; - - # single output, otherwise cmake and .pc files point to the wrong directory - # outputs = [ "out" "dev" ]; - - buildInputs = [ zlib openssl libsodium ]; - - nativeBuildInputs = [ cmake pkg-config ]; - - passthru.tests = { - inherit ffmpeg sshping wireshark; - }; - - meta = with lib; { - description = "SSH client library"; - homepage = "https://libssh.org"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ sander ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libssh2/CVE-2023-48795.patch b/pkgs/development/libraries/libssh2/CVE-2023-48795.patch deleted file mode 100644 index c89e4a137b72..000000000000 --- a/pkgs/development/libraries/libssh2/CVE-2023-48795.patch +++ /dev/null @@ -1,459 +0,0 @@ -From d34d9258b8420b19ec3f97b4cc5bf7aa7d98e35a Mon Sep 17 00:00:00 2001 -From: Michael Buckley <michael@buckleyisms.com> -Date: Thu, 30 Nov 2023 15:08:02 -0800 -Subject: [PATCH] src: add 'strict KEX' to fix CVE-2023-48795 "Terrapin Attack" - -Refs: -https://terrapin-attack.com/ -https://seclists.org/oss-sec/2023/q4/292 -https://osv.dev/list?ecosystem=&q=CVE-2023-48795 -https://github.com/advisories/GHSA-45x7-px36-x8w8 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-48795 - -Fixes #1290 -Closes #1291 ---- - src/kex.c | 63 +++++++++++++++++++++++------------ - src/libssh2_priv.h | 18 +++++++--- - src/packet.c | 83 +++++++++++++++++++++++++++++++++++++++++++--- - src/packet.h | 2 +- - src/session.c | 3 ++ - src/transport.c | 12 ++++++- - 6 files changed, 149 insertions(+), 32 deletions(-) - -diff --git a/src/kex.c b/src/kex.c -index 8e7b7f0af3..a7b301e157 100644 ---- a/src/kex.c -+++ b/src/kex.c -@@ -3032,6 +3032,13 @@ kex_method_extension_negotiation = { - 0, - }; - -+static const LIBSSH2_KEX_METHOD -+kex_method_strict_client_extension = { -+ "kex-strict-c-v00@openssh.com", -+ NULL, -+ 0, -+}; -+ - static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = { - #if LIBSSH2_ED25519 - &kex_method_ssh_curve25519_sha256, -@@ -3050,6 +3057,7 @@ static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = { - &kex_method_diffie_helman_group1_sha1, - &kex_method_diffie_helman_group_exchange_sha1, - &kex_method_extension_negotiation, -+ &kex_method_strict_client_extension, - NULL - }; - -@@ -3302,13 +3310,13 @@ static int kexinit(LIBSSH2_SESSION * session) - return 0; - } - --/* kex_agree_instr -+/* _libssh2_kex_agree_instr - * Kex specific variant of strstr() - * Needle must be preceded by BOL or ',', and followed by ',' or EOL - */ --static unsigned char * --kex_agree_instr(unsigned char *haystack, size_t haystack_len, -- const unsigned char *needle, size_t needle_len) -+unsigned char * -+_libssh2_kex_agree_instr(unsigned char *haystack, size_t haystack_len, -+ const unsigned char *needle, size_t needle_len) - { - unsigned char *s; - unsigned char *end_haystack; -@@ -3393,7 +3401,7 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session, - while(s && *s) { - unsigned char *p = (unsigned char *) strchr((char *) s, ','); - size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); -- if(kex_agree_instr(hostkey, hostkey_len, s, method_len)) { -+ if(_libssh2_kex_agree_instr(hostkey, hostkey_len, s, method_len)) { - const LIBSSH2_HOSTKEY_METHOD *method = - (const LIBSSH2_HOSTKEY_METHOD *) - kex_get_method_by_name((char *) s, method_len, -@@ -3427,9 +3435,9 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session, - } - - while(hostkeyp && (*hostkeyp) && (*hostkeyp)->name) { -- s = kex_agree_instr(hostkey, hostkey_len, -- (unsigned char *) (*hostkeyp)->name, -- strlen((*hostkeyp)->name)); -+ s = _libssh2_kex_agree_instr(hostkey, hostkey_len, -+ (unsigned char *) (*hostkeyp)->name, -+ strlen((*hostkeyp)->name)); - if(s) { - /* So far so good, but does it suit our purposes? (Encrypting vs - Signing) */ -@@ -3463,6 +3471,12 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, - { - const LIBSSH2_KEX_METHOD **kexp = libssh2_kex_methods; - unsigned char *s; -+ const unsigned char *strict = -+ (unsigned char *)"kex-strict-s-v00@openssh.com"; -+ -+ if(_libssh2_kex_agree_instr(kex, kex_len, strict, 28)) { -+ session->kex_strict = 1; -+ } - - if(session->kex_prefs) { - s = (unsigned char *) session->kex_prefs; -@@ -3470,7 +3484,7 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, - while(s && *s) { - unsigned char *q, *p = (unsigned char *) strchr((char *) s, ','); - size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); -- q = kex_agree_instr(kex, kex_len, s, method_len); -+ q = _libssh2_kex_agree_instr(kex, kex_len, s, method_len); - if(q) { - const LIBSSH2_KEX_METHOD *method = (const LIBSSH2_KEX_METHOD *) - kex_get_method_by_name((char *) s, method_len, -@@ -3504,9 +3518,9 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, - } - - while(*kexp && (*kexp)->name) { -- s = kex_agree_instr(kex, kex_len, -- (unsigned char *) (*kexp)->name, -- strlen((*kexp)->name)); -+ s = _libssh2_kex_agree_instr(kex, kex_len, -+ (unsigned char *) (*kexp)->name, -+ strlen((*kexp)->name)); - if(s) { - /* We've agreed on a key exchange method, - * Can we agree on a hostkey that works with this kex? -@@ -3550,7 +3564,7 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session, - unsigned char *p = (unsigned char *) strchr((char *) s, ','); - size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); - -- if(kex_agree_instr(crypt, crypt_len, s, method_len)) { -+ if(_libssh2_kex_agree_instr(crypt, crypt_len, s, method_len)) { - const LIBSSH2_CRYPT_METHOD *method = - (const LIBSSH2_CRYPT_METHOD *) - kex_get_method_by_name((char *) s, method_len, -@@ -3572,9 +3586,9 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session, - } - - while(*cryptp && (*cryptp)->name) { -- s = kex_agree_instr(crypt, crypt_len, -- (unsigned char *) (*cryptp)->name, -- strlen((*cryptp)->name)); -+ s = _libssh2_kex_agree_instr(crypt, crypt_len, -+ (unsigned char *) (*cryptp)->name, -+ strlen((*cryptp)->name)); - if(s) { - endpoint->crypt = *cryptp; - return 0; -@@ -3614,7 +3628,7 @@ static int kex_agree_mac(LIBSSH2_SESSION * session, - unsigned char *p = (unsigned char *) strchr((char *) s, ','); - size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); - -- if(kex_agree_instr(mac, mac_len, s, method_len)) { -+ if(_libssh2_kex_agree_instr(mac, mac_len, s, method_len)) { - const LIBSSH2_MAC_METHOD *method = (const LIBSSH2_MAC_METHOD *) - kex_get_method_by_name((char *) s, method_len, - (const LIBSSH2_COMMON_METHOD **) -@@ -3635,8 +3649,9 @@ static int kex_agree_mac(LIBSSH2_SESSION * session, - } - - while(*macp && (*macp)->name) { -- s = kex_agree_instr(mac, mac_len, (unsigned char *) (*macp)->name, -- strlen((*macp)->name)); -+ s = _libssh2_kex_agree_instr(mac, mac_len, -+ (unsigned char *) (*macp)->name, -+ strlen((*macp)->name)); - if(s) { - endpoint->mac = *macp; - return 0; -@@ -3667,7 +3682,7 @@ static int kex_agree_comp(LIBSSH2_SESSION *session, - unsigned char *p = (unsigned char *) strchr((char *) s, ','); - size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); - -- if(kex_agree_instr(comp, comp_len, s, method_len)) { -+ if(_libssh2_kex_agree_instr(comp, comp_len, s, method_len)) { - const LIBSSH2_COMP_METHOD *method = - (const LIBSSH2_COMP_METHOD *) - kex_get_method_by_name((char *) s, method_len, -@@ -3689,8 +3704,9 @@ static int kex_agree_comp(LIBSSH2_SESSION *session, - } - - while(*compp && (*compp)->name) { -- s = kex_agree_instr(comp, comp_len, (unsigned char *) (*compp)->name, -- strlen((*compp)->name)); -+ s = _libssh2_kex_agree_instr(comp, comp_len, -+ (unsigned char *) (*compp)->name, -+ strlen((*compp)->name)); - if(s) { - endpoint->comp = *compp; - return 0; -@@ -3871,6 +3887,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, - session->local.kexinit = key_state->oldlocal; - session->local.kexinit_len = key_state->oldlocal_len; - key_state->state = libssh2_NB_state_idle; -+ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; - session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; - session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; - return -1; -@@ -3896,6 +3913,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, - session->local.kexinit = key_state->oldlocal; - session->local.kexinit_len = key_state->oldlocal_len; - key_state->state = libssh2_NB_state_idle; -+ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; - session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; - session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; - return -1; -@@ -3944,6 +3962,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, - session->remote.kexinit = NULL; - } - -+ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; - session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; - session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; - -diff --git a/src/libssh2_priv.h b/src/libssh2_priv.h -index 7660366954..18d9ab2130 100644 ---- a/src/libssh2_priv.h -+++ b/src/libssh2_priv.h -@@ -736,6 +736,9 @@ struct _LIBSSH2_SESSION - /* key signing algorithm preferences -- NULL yields server order */ - char *sign_algo_prefs; - -+ /* Whether to use the OpenSSH Strict KEX extension */ -+ int kex_strict; -+ - /* (remote as source of data -- packet_read ) */ - libssh2_endpoint_data remote; - -@@ -908,6 +911,7 @@ struct _LIBSSH2_SESSION - int fullpacket_macstate; - size_t fullpacket_payload_len; - int fullpacket_packet_type; -+ uint32_t fullpacket_required_type; - - /* State variables used in libssh2_sftp_init() */ - libssh2_nonblocking_states sftpInit_state; -@@ -948,10 +952,11 @@ struct _LIBSSH2_SESSION - }; - - /* session.state bits */ --#define LIBSSH2_STATE_EXCHANGING_KEYS 0x00000001 --#define LIBSSH2_STATE_NEWKEYS 0x00000002 --#define LIBSSH2_STATE_AUTHENTICATED 0x00000004 --#define LIBSSH2_STATE_KEX_ACTIVE 0x00000008 -+#define LIBSSH2_STATE_INITIAL_KEX 0x00000001 -+#define LIBSSH2_STATE_EXCHANGING_KEYS 0x00000002 -+#define LIBSSH2_STATE_NEWKEYS 0x00000004 -+#define LIBSSH2_STATE_AUTHENTICATED 0x00000008 -+#define LIBSSH2_STATE_KEX_ACTIVE 0x00000010 - - /* session.flag helpers */ - #ifdef MSG_NOSIGNAL -@@ -1182,6 +1187,11 @@ ssize_t _libssh2_send(libssh2_socket_t socket, const void *buffer, - int _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, - key_exchange_state_t * state); - -+unsigned char *_libssh2_kex_agree_instr(unsigned char *haystack, -+ size_t haystack_len, -+ const unsigned char *needle, -+ size_t needle_len); -+ - /* Let crypt.c/hostkey.c expose their method structs */ - const LIBSSH2_CRYPT_METHOD **libssh2_crypt_methods(void); - const LIBSSH2_HOSTKEY_METHOD **libssh2_hostkey_methods(void); -diff --git a/src/packet.c b/src/packet.c -index eccb8c56a8..6da14e9fa1 100644 ---- a/src/packet.c -+++ b/src/packet.c -@@ -624,14 +624,13 @@ packet_authagent_open(LIBSSH2_SESSION * session, - * layer when it has received a packet. - * - * The input pointer 'data' is pointing to allocated data that this function -- * is asked to deal with so on failure OR success, it must be freed fine. -- * The only exception is when the return code is LIBSSH2_ERROR_EAGAIN. -+ * will be freed unless return the code is LIBSSH2_ERROR_EAGAIN. - * - * This function will always be called with 'datalen' greater than zero. - */ - int - _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, -- size_t datalen, int macstate) -+ size_t datalen, int macstate, uint32_t seq) - { - int rc = 0; - unsigned char *message = NULL; -@@ -676,6 +675,70 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - break; - } - -+ if(session->state & LIBSSH2_STATE_INITIAL_KEX) { -+ if(msg == SSH_MSG_KEXINIT) { -+ if(!session->kex_strict) { -+ if(datalen < 17) { -+ LIBSSH2_FREE(session, data); -+ session->packAdd_state = libssh2_NB_state_idle; -+ return _libssh2_error(session, -+ LIBSSH2_ERROR_BUFFER_TOO_SMALL, -+ "Data too short extracting kex"); -+ } -+ else { -+ const unsigned char *strict = -+ (unsigned char *)"kex-strict-s-v00@openssh.com"; -+ struct string_buf buf; -+ unsigned char *algs = NULL; -+ size_t algs_len = 0; -+ -+ buf.data = (unsigned char *)data; -+ buf.dataptr = buf.data; -+ buf.len = datalen; -+ buf.dataptr += 17; /* advance past type and cookie */ -+ -+ if(_libssh2_get_string(&buf, &algs, &algs_len)) { -+ LIBSSH2_FREE(session, data); -+ session->packAdd_state = libssh2_NB_state_idle; -+ return _libssh2_error(session, -+ LIBSSH2_ERROR_BUFFER_TOO_SMALL, -+ "Algs too short"); -+ } -+ -+ if(algs_len == 0 || -+ _libssh2_kex_agree_instr(algs, algs_len, strict, 28)) { -+ session->kex_strict = 1; -+ } -+ } -+ } -+ -+ if(session->kex_strict && seq) { -+ LIBSSH2_FREE(session, data); -+ session->socket_state = LIBSSH2_SOCKET_DISCONNECTED; -+ session->packAdd_state = libssh2_NB_state_idle; -+ libssh2_session_disconnect(session, "strict KEX violation: " -+ "KEXINIT was not the first packet"); -+ -+ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, -+ "strict KEX violation: " -+ "KEXINIT was not the first packet"); -+ } -+ } -+ -+ if(session->kex_strict && session->fullpacket_required_type && -+ session->fullpacket_required_type != msg) { -+ LIBSSH2_FREE(session, data); -+ session->socket_state = LIBSSH2_SOCKET_DISCONNECTED; -+ session->packAdd_state = libssh2_NB_state_idle; -+ libssh2_session_disconnect(session, "strict KEX violation: " -+ "unexpected packet type"); -+ -+ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, -+ "strict KEX violation: " -+ "unexpected packet type"); -+ } -+ } -+ - if(session->packAdd_state == libssh2_NB_state_allocated) { - /* A couple exceptions to the packet adding rule: */ - switch(msg) { -@@ -1364,6 +1427,15 @@ _libssh2_packet_ask(LIBSSH2_SESSION * session, unsigned char packet_type, - - return 0; - } -+ else if(session->kex_strict && -+ (session->state & LIBSSH2_STATE_INITIAL_KEX)) { -+ libssh2_session_disconnect(session, "strict KEX violation: " -+ "unexpected packet type"); -+ -+ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, -+ "strict KEX violation: " -+ "unexpected packet type"); -+ } - packet = _libssh2_list_next(&packet->node); - } - return -1; -@@ -1425,7 +1497,10 @@ _libssh2_packet_require(LIBSSH2_SESSION * session, unsigned char packet_type, - } - - while(session->socket_state == LIBSSH2_SOCKET_CONNECTED) { -- int ret = _libssh2_transport_read(session); -+ int ret; -+ session->fullpacket_required_type = packet_type; -+ ret = _libssh2_transport_read(session); -+ session->fullpacket_required_type = 0; - if(ret == LIBSSH2_ERROR_EAGAIN) - return ret; - else if(ret < 0) { -diff --git a/src/packet.h b/src/packet.h -index 1d90b8af12..955351e5f6 100644 ---- a/src/packet.h -+++ b/src/packet.h -@@ -72,6 +72,6 @@ int _libssh2_packet_burn(LIBSSH2_SESSION * session, - int _libssh2_packet_write(LIBSSH2_SESSION * session, unsigned char *data, - unsigned long data_len); - int _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, -- size_t datalen, int macstate); -+ size_t datalen, int macstate, uint32_t seq); - - #endif /* LIBSSH2_PACKET_H */ -diff --git a/src/session.c b/src/session.c -index 35e7929fe7..9d89ade8ec 100644 ---- a/src/session.c -+++ b/src/session.c -@@ -469,6 +469,8 @@ libssh2_session_init_ex(LIBSSH2_ALLOC_FUNC((*my_alloc)), - session->abstract = abstract; - session->api_timeout = 0; /* timeout-free API by default */ - session->api_block_mode = 1; /* blocking API by default */ -+ session->state = LIBSSH2_STATE_INITIAL_KEX; -+ session->fullpacket_required_type = 0; - session->packet_read_timeout = LIBSSH2_DEFAULT_READ_TIMEOUT; - session->flag.quote_paths = 1; /* default behavior is to quote paths - for the scp subsystem */ -@@ -1223,6 +1225,7 @@ libssh2_session_disconnect_ex(LIBSSH2_SESSION *session, int reason, - const char *desc, const char *lang) - { - int rc; -+ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; - session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; - BLOCK_ADJUST(rc, session, - session_disconnect(session, reason, desc, lang)); -diff --git a/src/transport.c b/src/transport.c -index 21be9d2b80..a8bb588a4b 100644 ---- a/src/transport.c -+++ b/src/transport.c -@@ -186,6 +186,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) - struct transportpacket *p = &session->packet; - int rc; - int compressed; -+ uint32_t seq = session->remote.seqno; - - if(session->fullpacket_state == libssh2_NB_state_idle) { - session->fullpacket_macstate = LIBSSH2_MAC_CONFIRMED; -@@ -317,7 +318,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) - if(session->fullpacket_state == libssh2_NB_state_created) { - rc = _libssh2_packet_add(session, p->payload, - session->fullpacket_payload_len, -- session->fullpacket_macstate); -+ session->fullpacket_macstate, seq); - if(rc == LIBSSH2_ERROR_EAGAIN) - return rc; - if(rc) { -@@ -328,6 +329,11 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) - - session->fullpacket_state = libssh2_NB_state_idle; - -+ if(session->kex_strict && -+ session->fullpacket_packet_type == SSH_MSG_NEWKEYS) { -+ session->remote.seqno = 0; -+ } -+ - return session->fullpacket_packet_type; - } - -@@ -1093,6 +1099,10 @@ int _libssh2_transport_send(LIBSSH2_SESSION *session, - - session->local.seqno++; - -+ if(session->kex_strict && data[0] == SSH_MSG_NEWKEYS) { -+ session->local.seqno = 0; -+ } -+ - ret = LIBSSH2_SEND(session, p->outbuf, total_length, - LIBSSH2_SOCKET_SEND_FLAGS(session)); - if(ret < 0) diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix deleted file mode 100644 index e548b011f66d..000000000000 --- a/pkgs/development/libraries/libssh2/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchurl -, openssl -, zlib -, windows - -# for passthru.tests -, aria2 -, curl -, libgit2 -, mc -, vlc -}: - -stdenv.mkDerivation rec { - pname = "libssh2"; - version = "1.11.0"; - - src = fetchurl { - url = "https://www.libssh2.org/download/libssh2-${version}.tar.gz"; - sha256 = "sha256-NzYWHkHiaTMk3rOMJs/cPv5iCdY0ukJY2xzs/2pa1GE="; - }; - - patches = [ - # fetchpatch cannot be used due to infinite recursion - # https://github.com/libssh2/libssh2/commit/d34d9258b8420b19ec3f97b4cc5bf7aa7d98e35a - ./CVE-2023-48795.patch - ]; - - # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion - # necessary for FreeBSD code path in configure - postPatch = '' - substituteInPlace ./config.guess --replace-fail /usr/bin/uname uname - ''; - - outputs = [ "out" "dev" "devdoc" ]; - - propagatedBuildInputs = [ openssl ]; # see Libs: in libssh2.pc - 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"; - platforms = platforms.all; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index abda8137f5c8..9b45ffb58ce7 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-VoiqSmhVR9cXSoo3PqnY7pJ+dm48wwK97jRSPCxdbBE="; }; - buildInputs = lib.optional stdenv.isDarwin IOKit; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin IOKit; meta = with lib; { homepage = "https://www.i-scream.org/libstatgrab/"; diff --git a/pkgs/development/libraries/libstemmer/default.nix b/pkgs/development/libraries/libstemmer/default.nix deleted file mode 100644 index 3f66ee92a72e..000000000000 --- a/pkgs/development/libraries/libstemmer/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, perl, buildPackages }: - -stdenv.mkDerivation rec { - pname = "libstemmer"; - version = "2.2.0"; - - src = fetchFromGitHub { - owner = "snowballstem"; - repo = "snowball"; - rev = "v${version}"; - sha256 = "sha256-qXrypwv/I+5npvGHGsHveijoui0ZnoGYhskCfLkewVE="; - }; - - nativeBuildInputs = [ perl ]; - - prePatch = '' - patchShebangs . - '' + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - substituteInPlace GNUmakefile \ - --replace './snowball' '${lib.getBin buildPackages.libstemmer}/bin/snowball' - ''; - - makeTarget = "libstemmer.a"; - - installPhase = '' - runHook preInstall - install -Dt $out/lib libstemmer.a - install -Dt $out/include include/libstemmer.h - install -Dt $out/bin {snowball,stemwords} - runHook postInstall - ''; - - meta = with lib; { - description = "Snowball Stemming Algorithms"; - homepage = "https://snowballstem.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ fpletz ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix deleted file mode 100644 index 13b117b5e012..000000000000 --- a/pkgs/development/libraries/libstroke/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchurl -, automake -, autoconf -, libX11 -}: - -stdenv.mkDerivation rec { - pname = "libstroke"; - version = "0.5.1"; - - src = fetchurl { - url = "https://web.archive.org/web/20161204100704/http://etla.net/libstroke/${pname}-${version}.tar.gz"; - sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d"; - }; - - nativeBuildInputs = [ automake autoconf ]; - buildInputs = [ libX11 ]; - - # libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it. - # Also, modern automake doesn't like things and returns error code 63. But it generates the file. - preConfigure = '' - rm config.sub - autoconf - automake -a || true - ''; - - meta = { - description = "Library for simple gesture recognition"; - homepage = "https://web.archive.org/web/20161204100704/http://etla.net/libstroke/"; - license = lib.licenses.gpl2; - - longDescription = - '' libstroke, last updated in 2001, still successfully provides a basic - gesture recognition engine based around a 3x3 grid. It's simple and - easy to work with, and notably used by FVWM. - ''; - - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/development/libraries/libsurvive/default.nix deleted file mode 100644 index 53ebe6f18e41..000000000000 --- a/pkgs/development/libraries/libsurvive/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, libglut -, lapack -, libusb1 -, blas -, zlib -, eigen -}: - -stdenv.mkDerivation rec { - pname = "libsurvive"; - version = "1.01"; - - src = fetchFromGitHub { - owner = "cntools"; - repo = pname; - rev = "v${version}"; - # Fixes 'Unknown CMake command "cnkalman_generate_code"' - fetchSubmodules = true; - hash = "sha256-NcxdTKra+YkLt/iu9+1QCeQZLV3/qlhma2Ns/+ZYVsk="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ - libglut - lapack - libusb1 - blas - zlib - eigen - ]; - - # https://github.com/cntools/libsurvive/issues/272 - postPatch = '' - substituteInPlace survive.pc.in \ - libs/cnkalman/cnkalman.pc.in libs/cnkalman/libs/cnmatrix/cnmatrix.pc.in \ - --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ - ''; - - meta = with lib; { - description = "Open Source Lighthouse Tracking System"; - homepage = "https://github.com/cntools/libsurvive"; - license = licenses.mit; - maintainers = with maintainers; [ expipiplus1 prusnak ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libsv/default.nix b/pkgs/development/libraries/libsv/default.nix deleted file mode 100644 index 4136c6471407..000000000000 --- a/pkgs/development/libraries/libsv/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, -}: - -stdenv.mkDerivation rec { - pname = "libsv"; - version = "1.2"; - - src = fetchFromGitHub { - owner = "uael"; - repo = "sv"; - rev = "v${version}"; - sha256 = "sha256-sc7WTRY8XTm5+J+zlS7tGa2f+2d7apj+XHyBafZXXeE="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Public domain cross-platform semantic versioning in C99"; - homepage = "https://github.com/uael/sv"; - license = licenses.unlicense; - maintainers = [ lib.maintainers.sigmanificient ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix deleted file mode 100644 index 9d58109fa8e3..000000000000 --- a/pkgs/development/libraries/libsvm/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fixDarwinDylibNames -, llvmPackages -, withOpenMP ? true -}: - -stdenv.mkDerivation rec { - pname = "libsvm"; - version = "3.33"; - - src = fetchurl { - url = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz"; - sha256 = "sha256-1doSzMPQ7thFP732+sfZ8AUvPopfB6IXTk7wqdg9zfg="; - }; - - patches = lib.optionals withOpenMP [ ./openmp.patch ]; - - buildInputs = lib.optionals (stdenv.cc.isClang && withOpenMP) [ llvmPackages.openmp ]; - - buildFlags = [ "lib" "all" ]; - - outputs = [ "out" "bin" "dev" ]; - - nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; - - installPhase = - let - libSuff = stdenv.hostPlatform.extensions.sharedLibrary; - soVersion = "3"; - libName = if stdenv.isDarwin then "libsvm.${soVersion}${libSuff}" else "libsvm${libSuff}.${soVersion}"; - in - '' - runHook preInstall - - install -D libsvm.so.${soVersion} $out/lib/${libName} - ln -s $out/lib/${libName} $out/lib/libsvm${libSuff} - - install -Dt $bin/bin/ svm-scale svm-train svm-predict - - install -Dm644 -t $dev/include svm.h - mkdir $dev/include/libsvm - ln -s $dev/include/svm.h $dev/include/libsvm/svm.h - - runHook postInstall - ''; - - meta = with lib; { - description = "Library for support vector machines"; - homepage = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/"; - license = licenses.bsd3; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libsvm/openmp.patch b/pkgs/development/libraries/libsvm/openmp.patch deleted file mode 100644 index b48fbae1f43f..000000000000 --- a/pkgs/development/libraries/libsvm/openmp.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- /Makefile 1970-01-01 01:00:01.000000000 +0100 -+++ /Makefile 1970-01-01 01:00:01.000000000 +0100 -@@ -9,8 +9,8 @@ - endif - - # Uncomment the following lines to enable parallelization with OpenMP --# CFLAGS += -fopenmp --# SHARED_LIB_FLAG += -fopenmp -+CFLAGS += -fopenmp -+SHARED_LIB_FLAG += -fopenmp - - all: svm-train svm-predict svm-scale - diff --git a/pkgs/development/libraries/libsystemtap/default.nix b/pkgs/development/libraries/libsystemtap/default.nix deleted file mode 100644 index 8290cee53a47..000000000000 --- a/pkgs/development/libraries/libsystemtap/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchgit -, gettext -, python3 -, elfutils -}: - -stdenv.mkDerivation { - pname = "libsystemtap"; - version = "5.1"; - - src = fetchgit { - url = "git://sourceware.org/git/systemtap.git"; - rev = "release-5.1"; - hash = "sha256-3rhDllsgYGfh1gb5frUrlkzdz57A6lcvBELtgvb5Q7M="; - }; - - dontBuild = true; - - nativeBuildInputs = [ gettext python3 elfutils ]; - - installPhase = '' - mkdir -p $out/include - cp -r includes/* $out/include/ - ''; - - meta = with lib; { - description = "Statically defined probes development files"; - homepage = "https://sourceware.org/systemtap/"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = [ lib.maintainers.farlion ]; - }; -} diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix deleted file mode 100644 index 83bb0708110b..000000000000 --- a/pkgs/development/libraries/libtar/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook }: - -stdenv.mkDerivation rec { - version = "1.2.20"; - pname = "libtar"; - - # Maintenance repo for libtar (Arch Linux uses this) - src = fetchgit { - url = "git://repo.or.cz/libtar.git"; - rev = "refs/tags/v${version}"; - sha256 = "1pjsqnqjaqgkzf1j8m6y5h76bwprffsjjj6gk8rh2fjsha14rqn9"; - }; - - patches = let - fp = name: sha256: - fetchpatch { - url = "https://sources.debian.net/data/main/libt/libtar/1.2.20-4/debian/patches/${name}.patch"; - inherit sha256; - }; - in [ - (fetchpatch { - name = "no_static_buffers.patch"; - url = "https://src.fedoraproject.org/rpms/libtar/raw/e25b692fc7ceaa387dafb865b472510754f51bd2/f/libtar-1.2.20-no-static-buffer.patch"; - sha256 = "sha256-QcWOgdkNlALb+YDVneT1zCNAMf4d8IUm2kUUUy2VvJs="; - }) - (fp "no_maxpathlen" "11riv231wpbdb1cm4nbdwdsik97wny5sxcwdgknqbp61ibk572b7") - (fp "CVE-2013-4420" "0d010190bqgr2ggy02qwxvjaymy9a22jmyfwdfh4086v876cbxpq") - (fp "th_get_size-unsigned-int" "1ravbs5yrfac98mnkrzciw9hd2fxq4dc07xl3wx8y2pv1bzkwm41") - (fetchpatch { - name = "CVE-2021-33643_CVE-2021-33644.patch"; - url = "https://src.fedoraproject.org/rpms/libtar/raw/e25b692fc7ceaa387dafb865b472510754f51bd2/f/libtar-1.2.20-CVE-2021-33643-CVE-2021-33644.patch"; - sha256 = "sha256-HdjotTvKJNntkdcV+kR08Ht/MyNeB6qUT0qo67BBOVA="; - }) - (fetchpatch { - name = "CVE-2021-33645_CVE-2021-33646_CVE-2021-33640.patch"; - url = "https://src.fedoraproject.org/rpms/libtar/raw/e25b692fc7ceaa387dafb865b472510754f51bd2/f/libtar-1.2.20-CVE-2021-33645-CVE-2021-33646.patch"; - sha256 = "sha256-p9DEFAL5Y+Ldy5c9Wj9h/BSg4TDxIxCjCQJD+wGQ7oI="; - }) - ]; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ]; - - meta = with lib; { - description = "C library for manipulating POSIX tar files"; - mainProgram = "libtar"; - homepage = "https://repo.or.cz/libtar"; - license = licenses.bsd3; - platforms = with platforms; linux ++ darwin; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix deleted file mode 100644 index 3c630bac630d..000000000000 --- a/pkgs/development/libraries/libtasn1/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, perl -, texinfo - -# for passthru.tests -, gnutls -, samba -, qemu -}: - -stdenv.mkDerivation rec { - pname = "libtasn1"; - version = "4.19.0"; - - src = fetchurl { - url = "mirror://gnu/libtasn1/libtasn1-${version}.tar.gz"; - sha256 = "sha256-FhPwrBz0hNbsDOO4wG1WJjzHJC8cI7MNgtI940WmP3o="; - }; - - # Patch borrowed from alpine to work around a specific test failure with musl libc - # Upstream is patching this test in their own CI because that CI is using alpine and thus musl - # https://github.com/gnutls/libtasn1/commit/06e7433c4e587e2ba6df521264138585a63d07c7#diff-037ea159eb0a7cb0ac23b851e66bee30fb838ee8d0d99fa331a1ba65283d37f7R293 - patches = lib.optional stdenv.hostPlatform.isMusl (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/main/libtasn1/failed-test.patch?id=aaed9995acc1511d54d5d93e1ea3776caf4aa488"; - sha256 = "sha256-GTfwqEelEsGtLEcBwGRfBZZz1vKXRfWXtMx/409YqX8="; - }); - - outputs = [ "out" "dev" "devdoc" ]; - outputBin = "dev"; - - nativeBuildInputs = [ texinfo perl ]; - - doCheck = true; - preCheck = if stdenv.isDarwin then - "export DYLD_LIBRARY_PATH=`pwd`/lib/.libs" - else - null; - - passthru.tests = { - inherit gnutls samba qemu; - }; - - meta = with lib; { - homepage = "https://www.gnu.org/software/libtasn1/"; - description = "ASN.1 library"; - longDescription = '' - Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some - other packages. The goal of this implementation is to be highly - portable, and only require an ANSI C89 platform. - ''; - license = licenses.lgpl2Plus; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/development/libraries/libtelnet/default.nix deleted file mode 100644 index eebaee394ee0..000000000000 --- a/pkgs/development/libraries/libtelnet/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, zlib }: - -stdenv.mkDerivation { - pname = "libtelnet"; - version = "0.21+45f2d5c"; - - src = fetchFromGitHub { - owner = "seanmiddleditch"; - repo = "libtelnet"; - rev = "45f2d5cfcf383312280e61c85b107285fed260cf"; - sha256 = "1lp6gdbndsp2w8mhy88c2jknxj2klvnggvq04ln7qjg8407ifpda"; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ zlib ]; - - meta = { - description = "Simple RFC-complient TELNET implementation as a C library"; - homepage = "https://github.com/seanmiddleditch/libtelnet"; - license = lib.licenses.publicDomain; - maintainers = [ lib.maintainers.tomberek ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix deleted file mode 100644 index a96baf0d9f3e..000000000000 --- a/pkgs/development/libraries/libtermkey/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, lib, fetchzip, libtool, pkg-config, ncurses, unibilium }: - -stdenv.mkDerivation rec { - pname = "libtermkey"; - version = "0.22"; - - src = fetchzip { - url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-${version}.tar.gz"; - sha256 = "02dks6bj7n23lj005yq41azf95wh3hapmgc2lzyh12vigkjh67rg"; - }; - - makeFlags = [ "PREFIX=$(out)" "LIBTOOL=${libtool}/bin/libtool" ]; - - nativeBuildInputs = [ libtool pkg-config ]; - buildInputs = [ ncurses unibilium ]; - - strictDeps = true; - - meta = with lib; { - description = "Terminal keypress reading library"; - homepage = "http://www.leonerd.org.uk/code/libtermkey"; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libthai/default.nix b/pkgs/development/libraries/libthai/default.nix deleted file mode 100644 index a72bfc6f25d5..000000000000 --- a/pkgs/development/libraries/libthai/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, installShellFiles, pkg-config, libdatrie }: - -stdenv.mkDerivation rec { - pname = "libthai"; - version = "0.1.29"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "https://github.com/tlwg/libthai/releases/download/v${version}/libthai-${version}.tar.xz"; - sha256 = "sha256-/IDMfctQ4RMCtBfOvSTy0wqLmHKS534AMme5EA0PS80="; - }; - - strictDeps = true; - - nativeBuildInputs = [ installShellFiles (lib.getBin libdatrie) pkg-config ]; - - buildInputs = [ libdatrie ]; - - postInstall = '' - installManPage man/man3/*.3 - ''; - - meta = with lib; { - homepage = "https://linux.thai.net/projects/libthai/"; - description = "Set of Thai language support routines"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ crertel ]; - pkgConfigModules = [ "libthai" ]; - }; -} diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix deleted file mode 100644 index 8c93e414ed5d..000000000000 --- a/pkgs/development/libraries/libthreadar/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, gcc-unwrapped }: - -stdenv.mkDerivation rec { - version = "1.4.0"; - pname = "libthreadar"; - - src = fetchurl { - url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz"; - sha256 = "sha256-LkcVF4AnuslzpIg/S8sGNJQye6iGcQRGqCqAhg8aN5E="; - }; - - outputs = [ "out" "dev" ]; - - buildInputs = [ gcc-unwrapped ]; - - CXXFLAGS = [ "-std=c++14" ]; - - configureFlags = [ - "--disable-build-html" - ]; - - postInstall = '' - # Disable html help - rm -r "$out"/share - ''; - - meta = with lib; { - homepage = "https://libthreadar.sourceforge.net/"; - description = "C++ library that provides several classes to manipulate threads"; - longDescription = '' - Libthreadar is a C++ library providing a small set of C++ classes to manipulate - threads in a very simple and efficient way from your C++ code. - ''; - maintainers = with maintainers; [ izorkin ]; - license = licenses.lgpl3; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libticables2/default.nix b/pkgs/development/libraries/libticables2/default.nix deleted file mode 100644 index d3f2e86a964f..000000000000 --- a/pkgs/development/libraries/libticables2/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, pkg-config -, autoreconfHook -, glib -, libusb1 -}: - -stdenv.mkDerivation rec { - pname = "libticables2"; - version = "1.3.5"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "08j5di0cgix9vcpdv7b8xhxdjkk9zz7fqfnv3l4apk3jdr8vcvqc"; - }; - - patches = [ - (fetchpatch { - name = "add-support-for-aarch64-macos-target-triple.patch"; - url = "https://github.com/debrouxl/tilibs/commit/ef41c51363b11521460f33e8c332db7b0a9ca085.patch"; - stripLen = 2; - sha256 = "sha256-oTR1ACEZI0fjErpnFXTCnfLT1mo10Ypy0q0D8NOPNsM="; - }) - ]; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ - libusb1 - glib - ]; - - configureFlags = [ - "--enable-libusb10" - ]; - - postInstall = '' - mkdir -p $out/etc/udev/rules.d - cat > $out/etc/udev/rules.d/69-libsane.rules << EOF - ACTION!="add", GOTO="libticables_end" - - # serial device (assume TI calculator) - KERNEL=="ttyS[0-3]", ENV{ID_PDA}="1" - # parallel device (assume TI calculator) - SUBSYSTEM=="ppdev", ENV{ID_PDA}="1" - # SilverLink - SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e001", ENV{ID_PDA}="1" - # TI-84+ DirectLink - SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e003", ENV{ID_PDA}="1" - # TI-89 Titanium DirectLink - SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e004", ENV{ID_PDA}="1" - # TI-84+ SE DirectLink - SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e008", ENV{ID_PDA}="1" - # TI-Nspire DirectLink - SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e012", ENV{ID_PDA}="1" - - LABEL="libticables_end" - EOF - ''; - - meta = with lib; { - changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; - description = "This library is part of the TiLP framework"; - homepage = "http://lpg.ticalc.org/prj_tilp/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ siraben luc65r ]; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/pkgs/development/libraries/libticalcs2/default.nix b/pkgs/development/libraries/libticalcs2/default.nix index 2488a5bbb0b4..551bfed8fc8b 100644 --- a/pkgs/development/libraries/libticalcs2/default.nix +++ b/pkgs/development/libraries/libticalcs2/default.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { libticables2 xz bzip2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ acl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc ]; diff --git a/pkgs/development/libraries/libtickit/001-skip-test-18term-builder-on-macos.patch b/pkgs/development/libraries/libtickit/001-skip-test-18term-builder-on-macos.patch deleted file mode 100644 index 3ecdf75f06f8..000000000000 --- a/pkgs/development/libraries/libtickit/001-skip-test-18term-builder-on-macos.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6179359c0b9247ae981b8b2a2897eabc921147fd Mon Sep 17 00:00:00 2001 -From: Gustavo Coutinho de Souza <dev@onemoresuza.mailer.me> -Date: Tue, 8 Aug 2023 15:45:43 -0300 -Subject: [PATCH] test: skip test 18 if on MacOS - ---- - t/18term-builder.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/t/18term-builder.c b/t/18term-builder.c -index 8b23ab4..c1b64a2 100644 ---- a/t/18term-builder.c -+++ b/t/18term-builder.c -@@ -21,6 +21,11 @@ static void output(TickitTerm *tt, const char *bytes, size_t len, void *user) - - int main(int argc, char *argv[]) - { -+ -+ #if defined(__APPLE__) || defined(__MACH__) -+ skip_all("the test does not seem to work on MacOS"); -+ return exit_status(); -+ #endif - // getstr override - { - /* We need a termtype that isn't xterm, but that will actually load. --- -2.41.0 diff --git a/pkgs/development/libraries/libtickit/default.nix b/pkgs/development/libraries/libtickit/default.nix deleted file mode 100644 index eaecc2d6d8bd..000000000000 --- a/pkgs/development/libraries/libtickit/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, libtool -, perl -, libtermkey -, unibilium -}: -let - version = "0.4.3"; -in -stdenv.mkDerivation { - pname = "libtickit"; - inherit version; - - src = fetchFromGitHub { - owner = "leonerd"; - repo = "libtickit"; - rev = "v${version}"; - hash = "sha256-QCrym8g5J1qwsFpU/PB8zZIWdM3YzOySknISSbQE4Sc="; - }; - - patches = [ - # Disabled on darwin, since test assumes TERM=linux - ./001-skip-test-18term-builder-on-macos.patch - ]; - - nativeBuildInputs = [ - pkg-config - libtool - ]; - - buildInputs = [ - libtermkey - unibilium - ]; - - nativeCheckInputs = [ perl ]; - - makeFlags = [ - "LIBTOOL=${lib.getExe libtool}" - ]; - - installFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = with lib; { - description = "Terminal interface construction kit"; - longDescription = '' - This library provides an abstracted mechanism for building interactive full-screen terminal - programs. It provides a full set of output drawing functions, and handles keyboard and mouse - input events. - ''; - homepage = "https://www.leonerd.org.uk/code/libtickit/"; - license = licenses.mit; - maintainers = with maintainers; [ onemoresuza ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libticonv/default.nix b/pkgs/development/libraries/libticonv/default.nix deleted file mode 100644 index 0c075406dee2..000000000000 --- a/pkgs/development/libraries/libticonv/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv -, lib -, fetchurl -, pkg-config -, autoreconfHook -, glib -}: - -stdenv.mkDerivation rec { - pname = "libticonv"; - version = "1.1.5"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "0y080v12bm81wgjm6fnw7q0yg7scphm8hhrls9njcszj7fkscv9i"; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ - glib - ]; - - configureFlags = [ - "--enable-iconv" - ]; - - meta = with lib; { - changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; - description = "This library is part of the TiLP framework"; - homepage = "http://lpg.ticalc.org/prj_tilp/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ siraben luc65r ]; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix deleted file mode 100644 index b66c8c288bc8..000000000000 --- a/pkgs/development/libraries/libtiff/default.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, fetchpatch -, nix-update-script - -, autoreconfHook -, pkg-config -, sphinx - -, lerc -, libdeflate -, libjpeg -, libwebp -, xz -, zlib -, zstd - - # for passthru.tests -, libgeotiff -, python3Packages -, imagemagick -, graphicsmagick -, gdal -, openimageio -, freeimage -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libtiff"; - version = "4.6.0"; - - src = fetchFromGitLab { - owner = "libtiff"; - repo = "libtiff"; - rev = "v${finalAttrs.version}"; - hash = "sha256-qCg5qjsPPynCHIg0JsPJldwVdcYkI68zYmyNAKUCoyw="; - }; - - patches = [ - # FreeImage needs this patch - ./headers.patch - # libc++abi 11 has an `#include <version>`, this picks up files name - # `version` in the project's include paths - ./rename-version.patch - # Fix static linking of `libtiff` via `pkg-config` not working - # because `libtiff` does not declare `Lerc` dependency. - # nixpkgs has `lerc` >= 4 which provides a `.pc` file. - # TODO: Close when https://gitlab.com/libtiff/libtiff/-/merge_requests/633 is merged and available - (fetchpatch { - name = "libtiff-4.pc-Fix-Requires.private-missing-Lerc.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/ea882c3c240c14a897b9be38d815cc1893aafa59.patch"; - hash = "sha256-C0xA3k1sgKmGJjEnyG9UxhXqYBYShKUDQsyjhbEDJbQ="; - }) - ]; - - postPatch = '' - mv VERSION VERSION.txt - ''; - - outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; - - postFixup = '' - moveToOutput include/tif_config.h $dev_private - moveToOutput include/tif_dir.h $dev_private - moveToOutput include/tif_hash_set.h $dev_private - moveToOutput include/tiffiop.h $dev_private - ''; - - # If you want to change to a different build system, please make - # sure cross-compilation works first! - nativeBuildInputs = [ autoreconfHook pkg-config sphinx ]; - - buildInputs = [ - lerc - zstd - ]; - - # TODO: opengl support (bogus configure detection) - propagatedBuildInputs = [ - libdeflate - libjpeg - # libwebp depends on us; this will cause infinite - # recursion otherwise - (libwebp.override { tiffSupport = false; }) - xz - zlib - zstd - ]; - - enableParallelBuilding = true; - - doCheck = true; - - passthru = { - tests = { - inherit libgeotiff imagemagick graphicsmagick gdal openimageio freeimage; - inherit (python3Packages) pillow imread; - pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - }; - }; - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "Library and utilities for working with the TIFF image file format"; - homepage = "https://libtiff.gitlab.io/libtiff"; - changelog = "https://libtiff.gitlab.io/libtiff/releases/v${finalAttrs.version}.html"; - license = licenses.libtiff; - platforms = platforms.unix ++ platforms.windows; - pkgConfigModules = [ "libtiff-4" ]; - maintainers = teams.geospatial.members; - }; -}) diff --git a/pkgs/development/libraries/libtiff/headers.patch b/pkgs/development/libraries/libtiff/headers.patch deleted file mode 100644 index 933e06f32326..000000000000 --- a/pkgs/development/libraries/libtiff/headers.patch +++ /dev/null @@ -1,16 +0,0 @@ -export private headers for freeimage ---- i/libtiff/Makefile.am -+++ w/libtiff/Makefile.am -@@ -36,8 +36,12 @@ EXTRA_DIST = \ - tif_win32_versioninfo.rc - - libtiffinclude_HEADERS = \ -+ tif_config.h \ -+ tif_dir.h \ -+ tif_hash_set.h \ - tiff.h \ - tiffio.h \ -+ tiffiop.h \ - tiffvers.h - - if HAVE_CXX diff --git a/pkgs/development/libraries/libtiff/libtiff_t.nix b/pkgs/development/libraries/libtiff/libtiff_t.nix deleted file mode 100644 index 37e48f6ea14f..000000000000 --- a/pkgs/development/libraries/libtiff/libtiff_t.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib -, stdenv -, fetchzip - -, autoreconfHook -, pkg-config -, sphinx - -, libdeflate -, libjpeg -, xz -, zlib -}: - -# This is a fork created by the hylafaxplus developer to -# restore tools dropped by original libtiff in version 4.6.0. - -stdenv.mkDerivation (finalAttrs: { - pname = "libtiff_t"; - version = "4.6.0t"; - - src = fetchzip { - url = "http://www.libtiff.org/downloads/tiff-${finalAttrs.version}.tar.xz"; - hash = "sha256-9ov4w2jw4LtKr82/4jWMAGhc5GEdviJ7bT+y0+U/Ac4="; - }; - - patches = [ - # FreeImage needs this patch - ./headers.patch - # libc++abi 11 has an `#include <version>`, this picks up files name - # `version` in the project's include paths - ./rename-version.patch - ]; - - postPatch = '' - mv VERSION VERSION.txt - ''; - - outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; - - postFixup = '' - moveToOutput include/tif_config.h $dev_private - moveToOutput include/tif_dir.h $dev_private - moveToOutput include/tif_hash_set.h $dev_private - moveToOutput include/tiffiop.h $dev_private - ''; - - # If you want to change to a different build system, please make - # sure cross-compilation works first! - nativeBuildInputs = [ autoreconfHook pkg-config sphinx ]; - - # TODO: opengl support (bogus configure detection) - propagatedBuildInputs = [ - libdeflate - libjpeg - xz - zlib - ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = with lib; { - description = "Library and utilities for working with the TIFF image file format (fork containing tools dropped in original libtiff version)"; - homepage = "http://www.libtiff.org"; - changelog = "http://www.libtiff.org/releases/v${finalAttrs.version}.html"; - maintainers = with maintainers; [ yarny ]; - license = licenses.libtiff; - platforms = platforms.unix ++ platforms.windows; - pkgConfigModules = [ "libtiff-4" ]; - }; -}) diff --git a/pkgs/development/libraries/libtiff/rename-version.patch b/pkgs/development/libraries/libtiff/rename-version.patch deleted file mode 100644 index 04fa1bfc88c7..000000000000 --- a/pkgs/development/libraries/libtiff/rename-version.patch +++ /dev/null @@ -1,21 +0,0 @@ -fix case-insensitive build ---- a/Makefile.am -+++ b/Makefile.am -@@ -34,7 +34,7 @@ docfiles = \ - README.md \ - RELEASE-DATE \ - TODO \ -- VERSION -+ VERSION.txt - - EXTRA_DIST = \ - placeholder.h \ -@@ -68,7 +68,7 @@ NEW_LIBTIFF_RELEASE_DATE=$(shell date +"%Y%m%d") - release: - @(echo --- Setting release date to $(NEW_LIBTIFF_RELEASE_DATE) and release version to $(LIBTIFF_VERSION) ---) - (rm -f $(top_srcdir)/RELEASE-DATE && echo $(NEW_LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) -- (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION) -+ (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) - (rm -f $(top_builddir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(NEW_LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_builddir)/libtiff/tiffvers.h && sed -i 's,@,,g' $(top_builddir)/libtiff/tiffvers.h) - - pkgconfigdir = $(libdir)/pkgconfig diff --git a/pkgs/development/libraries/libtifiles2/default.nix b/pkgs/development/libraries/libtifiles2/default.nix deleted file mode 100644 index 874cbc87c875..000000000000 --- a/pkgs/development/libraries/libtifiles2/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv -, lib -, fetchurl -, pkg-config -, autoreconfHook -, glib -, libarchive -, libticonv -}: - -stdenv.mkDerivation rec { - pname = "libtifiles2"; - version = "1.1.7"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "10n9mhlabmaw3ha5ckllxfy6fygs2pmlmj5v6w5v62bvx54kpils"; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ - glib - libarchive - libticonv - ]; - - meta = with lib; { - changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; - description = "This library is part of the TiLP framework"; - homepage = "http://lpg.ticalc.org/prj_tilp/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ siraben luc65r ]; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix deleted file mode 100644 index cd198dac309d..000000000000 --- a/pkgs/development/libraries/libtiger/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, lib, fetchurl, autoreconfHook, pkg-config -, libkate, pango, cairo, darwin -}: - -stdenv.mkDerivation rec { - pname = "libtiger"; - version = "0.3.4"; - - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libtiger/libtiger-${version}.tar.gz"; - sha256 = "0rj1bmr9kngrgbxrjbn4f4f9pww0wmf6viflinq7ava7zdav4hkk"; - }; - - patches = [ - ./pkg-config.patch - ]; - - postPatch = '' - substituteInPlace configure.ac --replace "-Werror" "-Wno-error" - ''; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libkate pango cairo ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.ApplicationServices; - - meta = { - homepage = "https://code.google.com/archive/p/libtiger/"; - description = "Rendering library for Kate streams using Pango and Cairo"; - platforms = lib.platforms.unix; - license = lib.licenses.lgpl21Plus; - maintainers = with lib.maintainers; [ matthewbauer ]; - }; -} diff --git a/pkgs/development/libraries/libtiger/pkg-config.patch b/pkgs/development/libraries/libtiger/pkg-config.patch deleted file mode 100644 index 68c892544615..000000000000 --- a/pkgs/development/libraries/libtiger/pkg-config.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3ebeb0932edc01b7768216dc7d3b3c5aac21fba0 Mon Sep 17 00:00:00 2001 -From: Alyssa Ross <hi@alyssa.is> -Date: Sun, 26 Feb 2023 17:21:48 +0000 -Subject: [PATCH] configure.ac: detect pkg-config properly - -When cross compiling, the relevant pkg-config program might be prefixed -with the name of the host platform, so the previous check was not -correct. Detect pkg-config properly, using the appropriate macro. ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2f63684..bf2faf7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -46,7 +46,7 @@ AC_CHECK_FUNCS([select nanosleep usleep]) - - AC_TYPE_SIZE_T - --AC_CHECK_PROG(HAVE_PKG_CONFIG,pkg-config,yes) -+PKG_PROG_PKG_CONFIG - - AC_ARG_ENABLE(doc, [ --disable-doc Disable building documentation (default enabled)]) - if test "x$enable_doc" != "xno" -@@ -57,7 +57,7 @@ else - fi - AM_CONDITIONAL(HAVE_DOXYGEN,test "${HAVE_DOXYGEN}" = "yes") - --if test "x$HAVE_PKG_CONFIG" = "xyes" -+if test "x$PKG_CONFIG" != "x" - then - PKG_CHECK_MODULES(KATE,kate >= 0.2.0) - PKG_CHECK_MODULES(PANGOCAIRO,pangocairo >= 1.16) --- -2.37.1 - diff --git a/pkgs/development/libraries/libtins/0001-force-cpp-14.patch b/pkgs/development/libraries/libtins/0001-force-cpp-14.patch deleted file mode 100644 index 3426713a07e3..000000000000 --- a/pkgs/development/libraries/libtins/0001-force-cpp-14.patch +++ /dev/null @@ -1,26 +0,0 @@ -This change bypasses all the code that attempts to see which C++11 features are enabled in your specific C++11 compiler. C++14 is required for gtest 1.13+. -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 902233e676ee..49ac8a1010a4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -103,17 +103,9 @@ ENDIF() - # C++11 support - OPTION(LIBTINS_ENABLE_CXX11 "Compile libtins with c++11 features" ON) - IF(LIBTINS_ENABLE_CXX11) -- # We only use declval and decltype on gcc/clang as VC fails to build that code, -- # at least on VC2013 -- IF(HAS_CXX11_RVALUE_REFERENCES AND HAS_CXX11_FUNCTIONAL AND HAS_CXX11_CHRONO AND -- HAS_CXX11_NOEXCEPT AND ((HAS_CXX11_DECLVAL AND HAS_CXX11_DECLTYPE) OR MSVC)) -- SET(TINS_HAVE_CXX11 ON) -- MESSAGE(STATUS "Enabling C++11 features") -- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_COMPILER_FLAGS}") -- ELSE() -- MESSAGE(WARNING "The compiler doesn't support the necessary C++11 features. " -- "Disabling C++11 on this build") -- ENDIF() -+ SET(TINS_HAVE_CXX11 ON) -+ MESSAGE(STATUS "Using C++11 features") -+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") - ELSE(LIBTINS_ENABLE_CXX11) - MESSAGE( - WARNING diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix deleted file mode 100644 index 6f195615551f..000000000000 --- a/pkgs/development/libraries/libtins/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, lib, stdenv }: - -stdenv.mkDerivation rec { - pname = "libtins"; - version = "4.5"; - - src = fetchFromGitHub { - owner = "mfontanini"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-zL4C2Cgs9Y3NebL8MPQBO5j8Bm6xhl8ZggQBPJLRn0o="; - }; - - patches = [ - # Required for gtest 1.13+, see also upstream report at: - # https://github.com/mfontanini/libtins/issues/529 - ./0001-force-cpp-14.patch - ]; - - postPatch = '' - rm -rf googletest - cp -r ${gtest.src} googletest - chmod -R a+w googletest - ''; - - nativeBuildInputs = [ cmake gtest ]; - buildInputs = [ - openssl - libpcap - boost - ]; - - configureFlags = [ - "--with-boost-libdir=${boost.out}/lib" - "--with-boost=${boost.dev}" - ]; - - doCheck = true; - checkTarget = "tests test"; - - meta = with lib; { - description = "High-level, multiplatform C++ network packet sniffing and crafting library"; - homepage = "https://libtins.github.io/"; - changelog = "https://raw.githubusercontent.com/mfontanini/${pname}/v${version}/CHANGES.md"; - license = lib.licenses.bsd2; - maintainers = with maintainers; [ fdns ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix deleted file mode 100644 index 2a32900040d8..000000000000 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, libtool, libtommath }: - -stdenv.mkDerivation rec { - pname = "libtomcrypt"; - version = "1.18.2"; - - src = fetchurl { - url = "https://github.com/libtom/libtomcrypt/releases/download/v${version}/crypt-${version}.tar.xz"; - sha256 = "113vfrgapyv72lalhd3nkw7jnks8az0gcb5wqn9hj19nhcxlrbcn"; - }; - - # Fixes a build failure on aarch64-darwin. Define for all Darwin targets for when x86_64-darwin - # upgrades to a newer SDK. - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DTARGET_OS_IPHONE=0"; - - patches = [ - (fetchpatch { - name = "CVE-2019-17362.patch"; - url = "https://github.com/libtom/libtomcrypt/pull/508/commits/25c26a3b7a9ad8192ccc923e15cf62bf0108ef94.patch"; - sha256 = "1bwsj0pwffxw648wd713z3xcyrbxc2z646psrzp38ys564fjh5zf"; - }) - ]; - - nativeBuildInputs = [ libtool libtommath ]; - - postPatch = '' - substituteInPlace makefile.shared --replace "LIBTOOL:=glibtool" "LIBTOOL:=libtool" - ''; - - preBuild = '' - makeFlagsArray+=(PREFIX=$out \ - CFLAGS="-DUSE_LTM -DLTM_DESC -DLTC_PTHREAD" \ - EXTRALIBS=\"-ltommath\" \ - INSTALL_GROUP=$(id -g) \ - INSTALL_USER=$(id -u)) - ''; - - makefile = "makefile.shared"; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Fairly comprehensive, modular and portable cryptographic toolkit"; - homepage = "https://www.libtom.net/LibTomCrypt/"; - changelog = "https://github.com/libtom/libtomcrypt/raw/v${version}/changes"; - license = with licenses; [ publicDomain wtfpl ]; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix deleted file mode 100644 index 2501bc827fae..000000000000 --- a/pkgs/development/libraries/libtommath/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, libtool }: - -stdenv.mkDerivation rec { - pname = "libtommath"; - version = "1.3.0"; - - src = fetchurl { - url = "https://github.com/libtom/libtommath/releases/download/v${version}/ltm-${version}.tar.xz"; - sha256 = "sha256-KWJy2TQ1mRMI63NgdgDANLVYgHoH6CnnURQuZcz6nQg="; - }; - - nativeBuildInputs = [ libtool ]; - - postPatch = '' - substituteInPlace makefile.shared --replace glibtool libtool - substituteInPlace makefile_include.mk --replace "shell arch" "shell uname -m" - ''; - - preBuild = '' - makeFlagsArray=(PREFIX=$out \ - INSTALL_GROUP=$(id -g) \ - INSTALL_USER=$(id -u)) - ''; - - makefile = "makefile.shared"; - - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-DTARGET_OS_IPHONE=0"; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://www.libtom.net/LibTomMath/"; - description = "Library for integer-based number-theoretic applications"; - license = with licenses; [ publicDomain wtfpl ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix deleted file mode 100644 index bcf9270a7158..000000000000 --- a/pkgs/development/libraries/libtsm/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libxkbcommon, pkg-config, cmake }: - -stdenv.mkDerivation rec { - pname = "libtsm"; - version = "4.0.2"; - - src = fetchFromGitHub { - owner = "Aetf"; - repo = "libtsm"; - rev = "v${version}"; - sha256 = "sha256-BYMRPjGRVSnYzkdbxypkuE0YkeVLPJ32iGZ1b0R6wto="; - }; - - buildInputs = [ libxkbcommon ]; - - nativeBuildInputs = [ cmake pkg-config ]; - - # https://github.com/Aetf/libtsm/issues/20 - postPatch = '' - substituteInPlace etc/libtsm.pc.in \ - --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - - meta = with lib; { - description = "Terminal-emulator State Machine"; - homepage = "https://www.freedesktop.org/wiki/Software/kmscon/libtsm/"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix deleted file mode 100644 index 724a3b6b3118..000000000000 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, json_c, hidapi }: - -stdenv.mkDerivation rec { - pname = "libu2f-host"; - version = "1.1.10"; - - src = fetchurl { - url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.xz"; - sha256 = "0vrivl1dwql6nfi48z6dy56fwy2z13d7abgahgrs2mcmqng7hra2"; - }; - - patches = [ - # remove after updating to next release - (fetchpatch { - name = "json-c-0.14-support.patch"; - url = "https://github.com/Yubico/libu2f-host/commit/840f01135d2892f45e71b9e90405de587991bd03.patch"; - sha256 = "0xplx394ppsbsb4h4l8b9m4dv9shbl0zyck3y26vbm9i1g981ki7"; - }) - ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ json_c hidapi ]; - - doCheck = true; - - meta = with lib; { - description = "C library and command-line tool that implements the host-side of the U2F protocol"; - homepage = "https://developers.yubico.com/libu2f-host"; - license = with licenses; [ gpl3Plus lgpl21Plus ]; - mainProgram = "u2f-host"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix deleted file mode 100644 index 86f0245b2ed7..000000000000 --- a/pkgs/development/libraries/libu2f-server/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, json_c, openssl, check, file, help2man, which, gengetopt }: - -stdenv.mkDerivation rec { - pname = "libu2f-server"; - version = "1.1.0"; - src = fetchurl { - url = "https://developers.yubico.com/libu2f-server/Releases/${pname}-${version}.tar.xz"; - sha256 = "0xx296nmmqa57w0v5p2kasl5zr1ms2gh6qi4lhv6xvzbmjp3rkcd"; - }; - - patches = [ - # remove after updating to next release - (fetchpatch { - name = "json-c-0.14-support.patch"; - url = "https://github.com/Yubico/libu2f-server/commit/f7c4983b31909299c47bf9b2627c84b6bfe225de.patch"; - sha256 = "10q66w3paii1yhfdmjskpip078fk9p3sjllbqx1yx71qbjki55b0"; - }) - ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ json_c openssl check file help2man which gengetopt ]; - - meta = with lib; { - homepage = "https://developers.yubico.com/libu2f-server/"; - description = "C library that implements the server-side of the U2F protocol"; - mainProgram = "u2f-server"; - license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ philandstuff ]; - }; -} diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index e48748308bb2..1a3a89a2d71d 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { done ''; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-Wno-error=gnu-folding-constant" ]); diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix deleted file mode 100644 index 1b54ea948dd0..000000000000 --- a/pkgs/development/libraries/libuchardet/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, cmake }: - -stdenv.mkDerivation rec { - pname = "uchardet"; - version = "0.0.8"; - - outputs = [ "bin" "out" "man" "dev" ]; - - src = fetchurl { - url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-6Xpgz8AKHBR6Z0sJe7FCKr2fp4otnOPz/cwueKNKxfA="; - }; - - nativeBuildInputs = [ cmake ]; - - doCheck = !stdenv.isi686; # tests fail on i686 - - meta = with lib; { - description = "Mozilla's Universal Charset Detector C/C++ API"; - mainProgram = "uchardet"; - homepage = "https://www.freedesktop.org/wiki/Software/uchardet/"; - license = licenses.mpl11; - maintainers = [ ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/libraries/libucl/default.nix b/pkgs/development/libraries/libucl/default.nix deleted file mode 100644 index 0adb3a66465e..000000000000 --- a/pkgs/development/libraries/libucl/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, pkg-config -, autoreconfHook -, curl -, lua -, openssl -, features ? { - urls = false; - # Upstream enables regex by default - regex = true; - # Signature support is broken with openssl 1.1.1: https://github.com/vstakhov/libucl/issues/203 - signatures = false; - lua = false; - utils = false; - } -}: - -let - featureDeps = { - urls = [ curl ]; - signatures = [ openssl ]; - lua = [ lua ]; - }; -in -stdenv.mkDerivation rec { - pname = "libucl"; - version = "0.9.2"; - - src = fetchFromGitHub { - owner = "vstakhov"; - repo = pname; - rev = version; - sha256 = "sha256-esNEVBa660rl3Oo2SLaLrFThFkjbqtZ1r0tjMq3h6cM="; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - - buildInputs = lib.concatLists ( - lib.mapAttrsToList (feat: enabled: - lib.optionals enabled (featureDeps."${feat}" or []) - ) features - ); - - enableParallelBuilding = true; - - configureFlags = lib.mapAttrsToList (feat: enabled: lib.strings.enableFeature enabled feat) features; - - meta = with lib; { - description = "Universal configuration library parser"; - homepage = "https://github.com/vstakhov/libucl"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = with maintainers; [ jpotier ]; - }; -} diff --git a/pkgs/development/libraries/libucontext/default.nix b/pkgs/development/libraries/libucontext/default.nix deleted file mode 100644 index 23301648bdf9..000000000000 --- a/pkgs/development/libraries/libucontext/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "libucontext"; - version = "1.2"; - - src = fetchFromGitHub { - owner = "kaniini"; - repo = pname; - rev = "v${version}"; - hash = "sha256-fk3ZKkp3dsyeF6SOWSccr5MkKEwS4AAuosD/h+6wjSw="; - }; - - makeFlags = [ "DESTDIR=$(out)" ]; - - meta = with lib; { - homepage = "https://github.com/kaniini/libucontext"; - description = "ucontext implementation featuring glibc-compatible ABI"; - license = licenses.isc; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libudev-zero/default.nix b/pkgs/development/libraries/libudev-zero/default.nix deleted file mode 100644 index ffacc906b4ea..000000000000 --- a/pkgs/development/libraries/libudev-zero/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "libudev-zero"; - version = "1.0.3"; - - src = fetchFromGitHub { - owner = "illiliti"; - repo = "libudev-zero"; - rev = version; - sha256 = "sha256-NXDof1tfr66ywYhCBDlPa+8DUfFj6YH0dvSaxHFqsXI="; - }; - - makeFlags = [ "PREFIX=$(out)" "AR=${stdenv.cc.targetPrefix}ar" ]; - - # Just let the installPhase build stuff, because there's no - # non-install target that builds everything anyway. - dontBuild = true; - - installTargets = lib.optionals stdenv.hostPlatform.isStatic "install-static"; - - meta = with lib; { - homepage = "https://github.com/illiliti/libudev-zero"; - description = "Daemonless replacement for libudev"; - changelog = "https://github.com/illiliti/libudev-zero/releases/tag/${version}"; - maintainers = with maintainers; [ qyliss shamilton ]; - license = licenses.isc; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libudfread/default.nix b/pkgs/development/libraries/libudfread/default.nix deleted file mode 100644 index d4f9a0d06b46..000000000000 --- a/pkgs/development/libraries/libudfread/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, }: - -stdenv.mkDerivation rec { - pname = "libudfread"; - version = "1.1.2"; - - src = fetchurl { - url = - "https://code.videolan.org/videolan/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; - sha256 = "1idsfxff1x264n8jd7077qrd61rycsd09fwmc4ar7l4qmhk6gw9b"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - meta = with lib; { - description = "UDF reader"; - homepage = "https://code.videolan.org/videolan/libudfread"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ chkno ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libuecc/default.nix b/pkgs/development/libraries/libuecc/default.nix deleted file mode 100644 index 1cc3ac8ebea1..000000000000 --- a/pkgs/development/libraries/libuecc/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchgit, cmake }: - -stdenv.mkDerivation rec { - version = "7"; - pname = "libuecc"; - - src = fetchgit { - url = "git://git.universe-factory.net/libuecc"; - rev = "refs/tags/v${version}"; - sha256 = "1sm05aql75sh13ykgsv3ns4x4zzw9lvzid6misd22gfgf6r9n5fs"; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Very small Elliptic Curve Cryptography library"; - homepage = "https://git.universe-factory.net/libuecc"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; - }; -} diff --git a/pkgs/development/libraries/libuev/default.nix b/pkgs/development/libraries/libuev/default.nix deleted file mode 100644 index a124c25a2040..000000000000 --- a/pkgs/development/libraries/libuev/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "libuev"; - version = "2.4.1"; - - src = fetchFromGitHub { - owner = "troglobit"; - repo = "libuev"; - rev = "v${version}"; - hash = "sha256-x1Sk7IuhlBQPFL7Rq4tmEanBxI/WaQ2L5fpUyEWOoi8="; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - - meta = with lib; { - description = "Lightweight event loop library for Linux epoll() family APIs"; - homepage = "https://codedocs.xyz/troglobit/libuev/"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ vifino ]; - }; -} diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index a798977b1f41..77197986343f 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, Cocoa }: let - backend = if stdenv.isDarwin then "darwin" else "unix"; + backend = if stdenv.hostPlatform.isDarwin then "darwin" else "unix"; in stdenv.mkDerivation rec { @@ -15,20 +15,20 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - propagatedBuildInputs = lib.optional stdenv.isLinux gtk3 - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux gtk3 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt ''; installPhase = '' mkdir -p $out/{include,lib} mkdir -p $out/lib/pkgconfig - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' mv ./out/libui.so.0 $out/lib/ ln -s $out/lib/libui.so.0 $out/lib/libui.so - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mv ./out/libui.A.dylib $out/lib/ ln -s $out/lib/libui.A.dylib $out/lib/libui.dylib '' + '' @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { --subst-var-by out $out \ --subst-var-by version "${version}" ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libui.A.dylib $out/lib/libui.A.dylib ''; diff --git a/pkgs/development/libraries/libuinputplus/0001-Add-cmake-install-directives.patch b/pkgs/development/libraries/libuinputplus/0001-Add-cmake-install-directives.patch deleted file mode 100644 index cd6f43d37705..000000000000 --- a/pkgs/development/libraries/libuinputplus/0001-Add-cmake-install-directives.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 265e406e254c8d84016b12b344d8df71d1765dd1 Mon Sep 17 00:00:00 2001 -From: Jappie Klooster <jappieklooster@hotmail.com> -Date: Fri, 2 Apr 2021 16:33:18 -0400 -Subject: [PATCH] Add cmake install directives - -To make nix builds work, it expect a make install command to -be available. -Adding these directives seems to fix the build. - -If it's no trouble to you, please consider adding them. ---- - CMakeLists.txt | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cbfc9c1..948c432 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,6 +7,8 @@ set(SOURCE_FILES - uInput.cpp uInputSetup.cpp uInputResource.cpp - uInput.hpp CommonIncludes.hpp uInputSetup.hpp) - -+include(GNUInstallDirs) -+ - add_library(uInputPlus ${SOURCE_FILES}) - target_include_directories(uInputPlus PUBLIC .) - -@@ -15,3 +17,9 @@ target_link_libraries(uInputPlus_test uInputPlus) - - configure_file(uInputPlus.pc.in uInputPlus.pc @ONLY) - -+ -+install(TARGETS uInputPlus -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(FILES uInput.hpp CommonIncludes.hpp uInputSetup.hpp -+ DESTINATION include/) -+ --- -2.29.2 - diff --git a/pkgs/development/libraries/libuinputplus/default.nix b/pkgs/development/libraries/libuinputplus/default.nix deleted file mode 100644 index 28110b577047..000000000000 --- a/pkgs/development/libraries/libuinputplus/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: -stdenv.mkDerivation rec { - pname = "libuinputplus"; - version = "2021-04-02"; - - # adds missing cmake install directives - # https://github.com/YukiWorkshop/libuInputPlus/pull/7 - patches = [ ./0001-Add-cmake-install-directives.patch]; - - src = fetchFromGitHub { - owner = "YukiWorkshop"; - repo = "libuInputPlus"; - rev = "f7f18eb339bba61a43f2cad481a9b1a453a66957"; - sha256 = "0sind2ghhy4h9kfkr5hsmhcq0di4ifwqyv4gac96rgj5mwvs33lp"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Easy-to-use uinput library in C++"; - license = licenses.mit; - maintainers = with maintainers; [ willibutz ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/development/libraries/libuiohook/default.nix b/pkgs/development/libraries/libuiohook/default.nix index 4fe42dad6c89..7d58b7814958 100644 --- a/pkgs/development/libraries/libuiohook/default.nix +++ b/pkgs/development/libraries/libuiohook/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = - if stdenv.isDarwin then [ AppKit ApplicationServices Carbon ] + if stdenv.hostPlatform.isDarwin then [ AppKit ApplicationServices Carbon ] else [ libX11 libxkbcommon diff --git a/pkgs/development/libraries/libuldaq/0001-uldaq.patch b/pkgs/development/libraries/libuldaq/0001-uldaq.patch deleted file mode 100644 index 97375283cd64..000000000000 --- a/pkgs/development/libraries/libuldaq/0001-uldaq.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 0e69cd4..b4a1f1a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -26,7 +26,7 @@ dist_pkgconfig_DATA=libuldaq.pc - # fpga/USB_DIO32HS.bin - - if OS_LINUX --rulesdatadir=/lib/udev/rules.d/ -+rulesdatadir=$(libdir)/udev/rules.d/ - dist_rulesdata_DATA=rules/50-uldaq.rules - endif - -@@ -42,14 +42,6 @@ dist-up: dist - mkdir -p $(reldir) - cp $(distdir).tar.bz2 $(reldir) - --if OS_LINUX --install-data-hook: -- udevadm control --reload-rules && \ -- test -f "/etc/redhat-release" && echo "/usr/local/lib" > /etc/ld.so.conf.d/uldaq.conf || echo "" && \ -- test -f "/etc/arch-release" && echo "/usr/local/lib" > /etc/ld.so.conf.d/uldaq.conf || echo "" && \ -- ldconfig --endif -- - if OS_LINUX - uninstall-hook: - test -f "/etc/ld.so.conf.d/uldaq.conf" && rm "/etc/ld.so.conf.d/uldaq.conf" || echo "" diff --git a/pkgs/development/libraries/libuldaq/default.nix b/pkgs/development/libraries/libuldaq/default.nix deleted file mode 100644 index fb234ef60d14..000000000000 --- a/pkgs/development/libraries/libuldaq/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libusb1, ...}: - -stdenv.mkDerivation rec { - pname = "libuldaq"; - version = "1.2.1"; - - src = fetchFromGitHub { - owner = "mccdaq"; - repo = "uldaq"; - rev = "v${version}"; - sha256 = "sha256-DA1mxu94z5xDpGK9OBwD02HXlOATv/slqZ4lz5GM7QM="; - }; - - patches = [ - # Patch needed for `make install` to succeed - ./0001-uldaq.patch - ]; - - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ libusb1 ]; - - meta = with lib; { - description = "Library to talk to uldaq devices"; - longDescription = '' - Library used to communicate with USB data acquisition (DAQ) - devices from Measurement Computing - ''; - homepage = "https://github.com/mccdaq/uldaq"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.simonkampe ]; - }; -} diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix deleted file mode 100644 index d73bed773dff..000000000000 --- a/pkgs/development/libraries/libunarr/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchurl -, cmake -}: - -stdenv.mkDerivation rec { - pname = "libunarr"; - version = "1.1.1"; - - src = fetchurl { - url = "https://github.com/selmf/unarr/releases/download/v${version}/unarr-${version}.tar.xz"; - hash = "sha256-Mo76BOqZbdOJFrEkeozxdqwpuFyvkhdONNMZmN5BdNI="; - }; - - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace CMakeLists.txt \ - --replace "-flto" "" \ - --replace "AppleClang" "Clang" - ''; - - nativeBuildInputs = [ - cmake - ]; - - meta = with lib; { - homepage = "https://github.com/selmf/unarr"; - description = "Lightweight decompression library with support for rar, tar and zip archives"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ wegank ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix deleted file mode 100644 index 557ad37f23d2..000000000000 --- a/pkgs/development/libraries/libunibreak/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "libunibreak"; - version = "6.1"; - - src = let - rev_version = lib.replaceStrings ["."] ["_"] version; - in fetchFromGitHub { - owner = "adah1972"; - repo = pname; - rev = "libunibreak_${rev_version}"; - sha256 = "sha256-8yheb+XSvc1AqITjSutF+/4OWb4+7hweedKzhKJcE1Y="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - meta = with lib; { - homepage = "https://github.com/adah1972/libunibreak"; - description = "Implementation of line breaking and word breaking algorithms as in the Unicode standard"; - license = licenses.zlib; - platforms = platforms.unix; - maintainers = [ maintainers.coroa ]; - }; -} diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/development/libraries/libuninameslist/default.nix deleted file mode 100644 index ff438f749fd8..000000000000 --- a/pkgs/development/libraries/libuninameslist/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, autoreconfHook -}: - -stdenv.mkDerivation rec { - pname = "libuninameslist"; - version = "20240910"; - - src = fetchFromGitHub { - owner = "fontforge"; - repo = "libuninameslist"; - rev = version; - hash = "sha256-Pi30c3To57AzY59i39JVG2IUkGnq7CEAQkqJ1f5AZhw="; - }; - - nativeBuildInputs = [ - autoreconfHook - ]; - - meta = with lib; { - homepage = "https://github.com/fontforge/libuninameslist/"; - changelog = "https://github.com/fontforge/libuninameslist/blob/${version}/ChangeLog"; - description = "Library of Unicode names and annotation data"; - license = licenses.bsd3; - maintainers = with maintainers; [ erictapen ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 13ffffe6aa74..abf5f0df2558 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: { ]; strictDeps = true; - propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; - buildInputs = lib.optionals stdenv.isDarwin [ + propagatedBuildInputs = lib.optional (!stdenv.hostPlatform.isLinux) libiconv; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix deleted file mode 100644 index 5905798ee880..000000000000 --- a/pkgs/development/libraries/libunity/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib -, stdenv -, fetchgit -, pkg-config -, glib -, vala -, dee -, gobject-introspection -, libdbusmenu -, gtk3 -, intltool -, python3 -, autoreconfHook -}: - -stdenv.mkDerivation { - pname = "libunity"; - version = "unstable-2021-02-01"; - - outputs = [ "out" "dev" "py" ]; - - # Obtained from https://git.launchpad.net/ubuntu/+source/libunity/log/ - src = fetchgit { - url = "https://git.launchpad.net/ubuntu/+source/libunity"; - rev = "import/7.1.4+19.04.20190319-5"; - sha256 = "LHUs6kl1srS6Xektx+jmm4SXLR47VuQ9IhYbBxf2Wc8="; - }; - - patches = [ - # Fix builf with latest Vala - # https://code.launchpad.net/~jtojnar/libunity/libunity - # Did not send upstream because Ubuntu is stuck on Vala 0.48. - ./fix-vala.patch - ]; - - nativeBuildInputs = [ - autoreconfHook - gobject-introspection - intltool - pkg-config - python3 - vala - ]; - - buildInputs = [ - glib - gtk3 - ]; - - propagatedBuildInputs = [ - dee - libdbusmenu - ]; - - preConfigure = '' - intltoolize - ''; - - configureFlags = [ - "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" - ]; - - meta = with lib; { - description = "Library for instrumenting and integrating with all aspects of the Unity shell"; - homepage = "https://launchpad.net/libunity"; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libunity/fix-vala.patch b/pkgs/development/libraries/libunity/fix-vala.patch deleted file mode 100644 index 555c2ad7bcb0..000000000000 --- a/pkgs/development/libraries/libunity/fix-vala.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/protocol/protocol-icon.vala 2013-08-27 12:53:57 +0000 -+++ b/protocol/protocol-icon.vala 2021-04-13 22:34:41 +0000 -@@ -185,7 +185,7 @@ - } - - /* Added to GIcon interface in 2.37 */ -- private Variant serialize () -+ private Variant? serialize () - { - Variant? ret = null; - return ret; - diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix deleted file mode 100644 index b1a091d12b3d..000000000000 --- a/pkgs/development/libraries/liburcu/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, perl }: - -stdenv.mkDerivation rec { - version = "0.14.0"; - pname = "liburcu"; - - src = fetchurl { - url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "sha256-ykO/Jh1NOSz/IN+uRAg2YDvwCfziT9ybJpfYN6IjnU8="; - }; - - outputs = [ "out" "dev" "doc" ]; - - nativeCheckInputs = [ perl ]; - - preCheck = "patchShebangs tests/unit"; - doCheck = true; - - meta = with lib; { - description = "Userspace RCU (read-copy-update) library"; - homepage = "https://lttng.org/urcu"; - changelog = "https://github.com/urcu/userspace-rcu/raw/v${version}/ChangeLog"; - license = licenses.lgpl21Plus; - # https://git.liburcu.org/?p=userspace-rcu.git;a=blob;f=include/urcu/arch.h - platforms = intersectLists platforms.unix (platforms.x86 ++ platforms.power ++ platforms.s390 ++ platforms.arm ++ platforms.aarch64 ++ platforms.mips ++ platforms.m68k ++ platforms.riscv); - maintainers = [ maintainers.bjornfor ]; - }; - -} diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix deleted file mode 100644 index c35df57b6052..000000000000 --- a/pkgs/development/libraries/liburing/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, -}: - -stdenv.mkDerivation rec { - pname = "liburing"; - version = "2.7"; - - src = fetchFromGitHub { - owner = "axboe"; - repo = "liburing"; - rev = "refs/tags/liburing-${version}"; - hash = "sha256-WhNlO2opPM7v4LOLWpmzPv31++zmn5Hmb6Su9IQBDH8="; - }; - - separateDebugInfo = true; - enableParallelBuilding = true; - # Upstream's configure script is not autoconf generated, but a hand written one. - setOutputFlags = false; - dontDisableStatic = true; - dontAddStaticConfigureFlags = true; - configureFlags = [ - "--includedir=${placeholder "dev"}/include" - "--mandir=${placeholder "man"}/share/man" - ]; - - # mysterious link failure - hardeningDisable = [ "trivialautovarinit" ]; - - # Doesn't recognize platform flags - configurePlatforms = [ ]; - - outputs = [ - "out" - "bin" - "dev" - "man" - ]; - - postInstall = '' - # Always builds both static and dynamic libraries, so we need to remove the - # libraries that don't match stdenv type. - rm $out/lib/liburing*${ - if stdenv.hostPlatform.isStatic then ".so*" else ".a" - } - - # Copy the examples into $bin. Most reverse dependency of - # this package should reference only the $out output - for file in $(find ./examples -executable -type f); do - install -Dm555 -t "$bin/bin" "$file" - done - ''; - - meta = with lib; { - description = "Userspace library for the Linux io_uring API"; - homepage = "https://github.com/axboe/liburing"; - license = licenses.lgpl21; - platforms = platforms.linux; - maintainers = with maintainers; [ - thoughtpolice - nickcao - ]; - }; -} diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index bd8561e0e8a3..f03ae09b2895 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -4,7 +4,7 @@ , autoreconfHook , doxygen , pkg-config -, enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isStatic +, enableUdev ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic , udev , libobjc , IOKit @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withDocs [ doxygen ]; propagatedBuildInputs = lib.optional enableUdev udev ++ - lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; dontDisableStatic = withStatic; diff --git a/pkgs/development/libraries/libusbgx/default.nix b/pkgs/development/libraries/libusbgx/default.nix deleted file mode 100644 index dacaf6d42da9..000000000000 --- a/pkgs/development/libraries/libusbgx/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, libconfig, autoreconfHook }: -stdenv.mkDerivation { - pname = "libusbgx"; - version = "unstable-2021-10-31"; - src = fetchFromGitHub { - owner = "linux-usb-gadgets"; - repo = "libusbgx"; - rev = "060784424609d5a4e3bce8355f788c93f09802a5"; - sha256 = "172qh8gva17jr18ldhf9zi960w2bqzmp030w6apxq57c9nv6d8k7"; - }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libconfig ]; - meta = { - description = "C library encapsulating the kernel USB gadget-configfs userspace API functionality"; - license = with lib.licenses; [ - lgpl21Plus # library - gpl2Plus # examples - ]; - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libusbsio/default.nix b/pkgs/development/libraries/libusbsio/default.nix deleted file mode 100644 index 090683898a16..000000000000 --- a/pkgs/development/libraries/libusbsio/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, stdenv -, fetchzip -, pkg-config -, fixDarwinDylibNames -, libusb1 -, systemdMinimal -, darwin -}: - -stdenv.mkDerivation rec { - pname = "libusbsio"; - version = "2.1.11"; - - src = fetchzip { - url = "https://www.nxp.com/downloads/en/libraries/libusbsio-${version}-src.zip"; - sha256 = "sha256-qgoeaGWTWdTk5XpJwoauckEQlqB9lp5x2+TN09vQttI="; - }; - - postPatch = '' - rm -r bin/* - ''; - - makeFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - "BINDIR=" - ]; - - nativeBuildInputs = [ - pkg-config - ] ++ lib.optionals stdenv.isDarwin [ - fixDarwinDylibNames - ]; - - buildInputs = [ - libusb1 - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - AppKit - CoreFoundation - IOKit - ]) ++ lib.optionals stdenv.isLinux [ - systemdMinimal # libudev - ]; - - installPhase = '' - runHook preInstall - install -D bin/libusbsio${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libusbsio${stdenv.hostPlatform.extensions.sharedLibrary} - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://www.nxp.com/design/software/development-software/library-for-windows-macos-and-ubuntu-linux:LIBUSBSIO"; - description = "Library for communicating with devices connected via the USB bridge on LPC-Link2 and MCU-Link debug probes on supported NXP microcontroller evaluation boards"; - platforms = platforms.all; - license = licenses.bsd3; - maintainers = with maintainers; [ frogamic sbruder ]; - }; -} diff --git a/pkgs/development/libraries/libutempter/default.nix b/pkgs/development/libraries/libutempter/default.nix deleted file mode 100644 index 717418e686b4..000000000000 --- a/pkgs/development/libraries/libutempter/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, lib, glib }: - -stdenv.mkDerivation rec { - pname = "libutempter"; - version = "1.2.1"; - - src = fetchurl { - url = "http://ftp.altlinux.org/pub/people/ldv/utempter/libutempter-${version}.tar.gz"; - sha256 = "sha256-ln/vNy85HeUBhDrYdXDGz12r2WUfAPF4MJD7wSsqNMs="; - }; - - buildInputs = [ glib ]; - - patches = [ ./exec_path.patch ]; - - patchFlags = [ "-p2" ]; - - prePatch = '' - substituteInPlace Makefile --replace 2711 0711 - ''; - - makeFlags = [ - "libdir=\${out}/lib" - "libexecdir=\${out}/lib" - "includedir=\${out}/include" - "mandir=\${out}/share/man" - ]; - - meta = with lib; { - homepage = "https://github.com/altlinux/libutempter"; - description = "Interface for terminal emulators such as screen and xterm to record user sessions to utmp and wtmp files"; - longDescription = '' - The bundled utempter binary must be able to run as a user belonging to group utmp. - On NixOS systems, this can be achieved by creating a setguid wrapper. - ''; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - maintainers = [ maintainers.msteen ]; - }; -} diff --git a/pkgs/development/libraries/libutempter/exec_path.patch b/pkgs/development/libraries/libutempter/exec_path.patch deleted file mode 100644 index da3fe110fb67..000000000000 --- a/pkgs/development/libraries/libutempter/exec_path.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/libutempter/iface.c b/libutempter/iface.c -index 37c74a8..6f44c9a 100644 ---- a/libutempter/iface.c -+++ b/libutempter/iface.c -@@ -43,7 +43,7 @@ - __result; })) - #endif - --#define UTEMPTER_DEFAULT_PATHNAME LIBEXECDIR "/utempter/utempter" -+#define UTEMPTER_DEFAULT_PATHNAME "utempter" - - static const char *utempter_pathname; - static int saved_fd = -1; -@@ -57,8 +57,8 @@ do_child(int master_fd, const char *path, char *const *argv) - _exit(EXIT_FAILURE); - } - -- execv(path, argv); -- print_dbg("execv: %s", strerror(errno)); -+ execvp(path, argv); -+ print_dbg("execvp: %s", strerror(errno)); - - while (EACCES == errno) { - /* try saved group ID */ -@@ -73,7 +73,7 @@ do_child(int master_fd, const char *path, char *const *argv) - if (setgid(sgid)) - break; - -- (void) execv(path, argv); -+ (void) execvp(path, argv); - break; - } diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index a4254921e179..181462dc39dd 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , autoconf , automake +, darwin , libtool , pkg-config , pkgsStatic @@ -50,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { "tcp_bind6_error_addrinuse" "tcp_bind_error_addrinuse_listen" # https://github.com/libuv/libuv/pull/4075#issuecomment-1935572237 "thread_priority" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Sometimes: timeout (no output), failed uv_listen. Someone # should report these failures to libuv team. There tests should # be much more robust. @@ -71,10 +72,10 @@ stdenv.mkDerivation (finalAttrs: { "fs_event_watch_dir_recursive" "fs_event_watch_file" "fs_event_watch_file_current_dir" "fs_event_watch_file_exact_path" "process_priority" "udp_create_early_bad_bind" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # fail on macos < 10.15 (starting in libuv 1.47.0) "fs_write_alotof_bufs_with_offset" "fs_write_multiple_bufs" "fs_read_bufs" - ] ++ lib.optionals stdenv.isAarch32 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ # I observe this test failing with some regularity on ARMv7: # https://github.com/libuv/libuv/issues/1871 "shutdown_close_pipe" @@ -86,6 +87,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ automake autoconf libtool pkg-config ]; + # This is part of the Darwin bootstrap, so we don’t always get + # `libutil.dylib` automatically propagated through the SDK. + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.getLib darwin.libutil) + ]; + preConfigure = '' LIBTOOLIZE=libtoolize ./autogen.sh ''; diff --git a/pkgs/development/libraries/libuvc/default.nix b/pkgs/development/libraries/libuvc/default.nix deleted file mode 100644 index e7ff4bb7f288..000000000000 --- a/pkgs/development/libraries/libuvc/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, libusb1 -}: - -stdenv.mkDerivation rec { - pname = "libuvc"; - version = "unstable-2020-11-29"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "5cddef71b17d41f7e98875a840c50d9704c3d2b2"; - sha256 = "0kranb0x1k5qad8rwxnn1w9963sbfj2cfzdgpfmlivb04544m2j7"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ libusb1 ]; - - meta = with lib; { - homepage = "https://ken.tossell.net/libuvc/"; - description = "Cross-platform library for USB video devices"; - platforms = platforms.linux; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ prusnak ]; - }; -} diff --git a/pkgs/development/libraries/libva-vdpau-driver/default.nix b/pkgs/development/libraries/libva-vdpau-driver/default.nix deleted file mode 100644 index 2e3976e3a4d2..000000000000 --- a/pkgs/development/libraries/libva-vdpau-driver/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, libvdpau, libGLU, libGL, libva, pkg-config }: - -stdenv.mkDerivation rec { - pname = "libva-vdpau-driver"; - version = "0.7.4"; - - src = fetchurl { - url = "https://www.freedesktop.org/software/vaapi/releases/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1fcvgshzyc50yb8qqm6v6wn23ghimay23ci0p8sm8gxcy211jp0m"; - }; - - patches = [ - (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/libva-vdpau-driver-0.7.4-glext-85.patch"; - sha256 = "0f0v7cl7kna3jcfnxw48b9mfl0hpacw72df9vym96sa2206vqlb0"; }) - (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/libva-vdpau-driver-0.7.4-drop-h264-api.patch"; - sha256 = "0q5w83jbf4qqmhwf54h906pzxgvhqv7g2vrkw7jzgnrxhhj9sj60"; }) - (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/libva-vdpau-driver-0.7.4-fix_type.patch"; - sha256 = "0s5dk6aa4sm0iyicnf2fwfsrqbvr58nbp77mhjg5bvwlar7znqv7"; }) - (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/sigfpe-crash.patch"; - sha256 = "15snqf60ib0xb3cnav5b2r55qv8lv2fa4p6jwxajh8wbvqpw0ibz"; }) - (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/implement-vaquerysurfaceattributes.patch"; - sha256 = "1dapx3bqqblw6l2iqqw1yff6qifam8q4m2rq343kwb3dqhy2ymy5"; }) - (fetchpatch { url = "https://github.com/gentoo/gentoo/raw/34d5cc6fcf1d76c1c2833cb534717246c221214c/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch"; - sha256 = "1m4is6lk580mppsx2mvdv1xifj6gvx724si4qynsm9qrdfdc9fby"; }) - ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libvdpau libGLU libGL libva ]; - - postPatch = '' - sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure - ''; - - meta = with lib; { - homepage = "https://cgit.freedesktop.org/vaapi/vdpau-driver"; - license = licenses.gpl2Plus; - description = "VDPAU driver for the VAAPI library"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libva/1.nix b/pkgs/development/libraries/libva/1.nix index 1a9c7309e542..15e4d0a9e801 100644 --- a/pkgs/development/libraries/libva/1.nix +++ b/pkgs/development/libraries/libva/1.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # TODO: share libs between minimal and !minimal - perhaps just symlink them # Add FHS paths for non-NixOS applications. - configureFlags = lib.optionals stdenv.isLinux [ "--with-drivers-path=${mesa.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] + configureFlags = lib.optionals stdenv.hostPlatform.isLinux [ "--with-drivers-path=${mesa.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 8a41c60b169f..f88404682b44 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libdrm ] ++ lib.optionals (!minimal) [ libX11 libXext libXfixes wayland libffi libGL ]; - mesonFlags = lib.optionals stdenv.isLinux [ + mesonFlags = lib.optionals stdenv.hostPlatform.isLinux [ # Add FHS and Debian paths for non-NixOS applications "-Ddriverdir=${mesa.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/i386-linux-gnu/dri" ]; diff --git a/pkgs/development/libraries/libvarlink/default.nix b/pkgs/development/libraries/libvarlink/default.nix deleted file mode 100644 index 28a80052def8..000000000000 --- a/pkgs/development/libraries/libvarlink/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, python3 -, nix-update-script -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libvarlink"; - version = "23"; - - src = fetchFromGitHub { - owner = "varlink"; - repo = "libvarlink"; - rev = finalAttrs.version; - sha256 = "sha256-oUy9HhybNMjRBWoqqal1Mw8cC5RddgN4izxAl0cgnKE="; - }; - - nativeBuildInputs = [ meson ninja python3 ]; - - postPatch = '' - # test-object: ../lib/test-object.c:129: main: Assertion `setlocale(LC_NUMERIC, "de_DE.UTF-8") != 0' failed. - # PR that added it https://github.com/varlink/libvarlink/pull/27 - substituteInPlace lib/test-object.c \ - --replace 'assert(setlocale(LC_NUMERIC, "de_DE.UTF-8") != 0);' "" - - patchShebangs lib/test-symbols.sh varlink-wrapper.py - ''; - - doCheck = true; - - passthru = { - updateScript = nix-update-script { }; - tests = { - version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "varlink --version"; - }; - }; - }; - - meta = with lib; { - description = "C implementation of the Varlink protocol and command line tool"; - mainProgram = "varlink"; - homepage = "https://github.com/varlink/libvarlink"; - license = licenses.asl20; - maintainers = with maintainers; [ artturin ]; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix deleted file mode 100644 index 7a042a172c82..000000000000 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libpthreadstubs, libXau, libXdmcp -, libXext, libvdpau, glib, libva, libGLU }: - -stdenv.mkDerivation rec { - pname = "libvdpau-va-gl"; - version = "0.4.2"; - - src = fetchFromGitHub { - owner = "i-rinat"; - repo = "libvdpau-va-gl"; - rev = "v${version}"; - sha256 = "0asndybfv8xb0fx73sjjw5kydqrahqkm6n04lh589pbf18s5qlld"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva libGLU ]; - - doCheck = false; # fails. needs DRI access - - meta = with lib; { - homepage = "https://github.com/i-rinat/libvdpau-va-gl"; - description = "VDPAU driver with OpenGL/VAAPI backend"; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix deleted file mode 100644 index 8c1c3b7c5e9c..000000000000 --- a/pkgs/development/libraries/libvdpau/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, xorg, mesa, meson, ninja }: - -stdenv.mkDerivation rec { - pname = "libvdpau"; - version = "1.5"; - - src = fetchurl { - url = "https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-pdUKQrjCiP68BxUatkOsjeBqGERpZcckH4m06BCCGRM="; - }; - patches = [ ./installdir.patch ]; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = with xorg; [ xorgproto libXext ]; - - propagatedBuildInputs = [ xorg.libX11 ]; - - mesonFlags = lib.optionals stdenv.isLinux [ "-Dmoduledir=${mesa.driverLink}/lib/vdpau" ]; - - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lX11"; - - meta = with lib; { - homepage = "https://www.freedesktop.org/wiki/Software/VDPAU/"; - description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)"; - license = licenses.mit; # expat version - platforms = platforms.unix; - maintainers = [ maintainers.vcunat ]; - }; -} diff --git a/pkgs/development/libraries/libvdpau/installdir.patch b/pkgs/development/libraries/libvdpau/installdir.patch deleted file mode 100644 index 859715f70d39..000000000000 --- a/pkgs/development/libraries/libvdpau/installdir.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/trace/meson.build 2020-02-15 16:34:58.698832000 +0100 -+++ b/trace/meson.build 2020-02-15 16:39:05.359952802 +0100 -@@ -4,5 +4,5 @@ - dependencies : libdl, - version : '1.0.0', - install : true, -- install_dir : moduledir, -+ install_dir : get_option('prefix') + '/lib/libvdpau', - ) diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix deleted file mode 100644 index 4efe91096576..000000000000 --- a/pkgs/development/libraries/libversion/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, lib }: - -stdenv.mkDerivation rec { - pname = "libversion"; - version = "3.0.3"; - - src = fetchFromGitHub { - owner = "repology"; - repo = "libversion"; - rev = version; - hash = "sha256-REmXD0NFd7Af01EU/f2IGoTKiju6ErTI7WUinvrAzaA="; - }; - - nativeBuildInputs = [ cmake ]; - - checkTarget = "test"; - doCheck = true; - - meta = with lib; { - description = "Advanced version string comparison library"; - homepage = "https://github.com/repology/libversion"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ ryantm ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix index 895a382c96a3..09d7ac023648 100644 --- a/pkgs/development/libraries/libvgm/default.nix +++ b/pkgs/development/libraries/libvgm/default.nix @@ -1,122 +1,130 @@ -{ stdenv -, lib -, fetchFromGitHub -, unstableGitUpdater -, cmake -, libiconv -, zlib -, enableShared ? true +{ + stdenv, + lib, + fetchFromGitHub, + unstableGitUpdater, + testers, + cmake, + libiconv, + zlib, + enableShared ? (!stdenv.hostPlatform.isStatic), -, enableAudio ? true -, withWaveWrite ? true -, withWinMM ? stdenv.hostPlatform.isWindows -, withDirectSound ? stdenv.hostPlatform.isWindows -, withXAudio2 ? stdenv.hostPlatform.isWindows -, withWASAPI ? stdenv.hostPlatform.isWindows -, withOSS ? stdenv.hostPlatform.isFreeBSD -, withSADA ? stdenv.hostPlatform.isSunOS -, withALSA ? stdenv.hostPlatform.isLinux -, alsa-lib -, withPulseAudio ? stdenv.hostPlatform.isLinux -, libpulseaudio -, withCoreAudio ? stdenv.hostPlatform.isDarwin -, CoreAudio -, AudioToolbox -, withLibao ? true -, libao + enableAudio ? true, + withWaveWrite ? true, + withWinMM ? stdenv.hostPlatform.isWindows, + withDirectSound ? stdenv.hostPlatform.isWindows, + withXAudio2 ? stdenv.hostPlatform.isWindows, + withWASAPI ? stdenv.hostPlatform.isWindows, + withOSS ? stdenv.hostPlatform.isFreeBSD, + withSADA ? stdenv.hostPlatform.isSunOS, + withALSA ? stdenv.hostPlatform.isLinux, + alsa-lib, + withPulseAudio ? stdenv.hostPlatform.isLinux, + libpulseaudio, + withCoreAudio ? stdenv.hostPlatform.isDarwin, + CoreAudio, + AudioToolbox, + withLibao ? true, + libao, -, enableEmulation ? true -, withAllEmulators ? true -, emulators ? [ ] + enableEmulation ? true, + withAllEmulators ? true, + emulators ? [ ], -, enableLibplayer ? true + enableLibplayer ? true, -, enableTools ? false + enableTools ? false, }: assert enableTools -> enableAudio && enableEmulation && enableLibplayer; -let - inherit (lib) optional optionals; - onOff = val: if val then "ON" else "OFF"; -in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "libvgm"; - version = "0-unstable-2024-06-08"; + version = "0-unstable-2024-10-17"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "34c368cde98f33c42455fbbfbec07073ba79bf5c"; - hash = "sha256-eX2k2cUtapHhx8dLaFk63Si0Di1q0uDWvdOI0+FgqEY="; + rev = "7b694e53e42a75ce48b846c53d08e4a33f627842"; + hash = "sha256-u+mBzmEixJT3rwuipITktFI4iVswnXftfF7syBw4t/w="; }; outputs = [ "out" "dev" - ] ++ optional enableTools "bin"; + ] ++ lib.optionals enableTools [ "bin" ]; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ - libiconv - zlib - ] ++ optionals withALSA [ - alsa-lib - ] ++ optionals withPulseAudio [ - libpulseaudio - ] ++ optionals withCoreAudio [ - CoreAudio - AudioToolbox - ] ++ optionals withLibao [ - libao - ]; + propagatedBuildInputs = + [ + libiconv + zlib + ] + ++ lib.optionals withALSA [ alsa-lib ] + ++ lib.optionals withPulseAudio [ libpulseaudio ] + ++ lib.optionals withCoreAudio [ + CoreAudio + AudioToolbox + ] + ++ lib.optionals withLibao [ libao ]; - cmakeFlags = [ - "-DBUILD_LIBAUDIO=${onOff enableAudio}" - "-DBUILD_LIBEMU=${onOff enableEmulation}" - "-DBUILD_LIBPLAYER=${onOff enableLibplayer}" - "-DBUILD_TESTS=${onOff enableTools}" - "-DBUILD_PLAYER=${onOff enableTools}" - "-DBUILD_VGM2WAV=${onOff enableTools}" - "-DLIBRARY_TYPE=${if enableShared then "SHARED" else "STATIC"}" - "-DUSE_SANITIZERS=ON" - ] ++ optionals enableAudio [ - "-DAUDIODRV_WAVEWRITE=${onOff withWaveWrite}" - "-DAUDIODRV_WINMM=${onOff withWinMM}" - "-DAUDIODRV_DSOUND=${onOff withDirectSound}" - "-DAUDIODRV_XAUDIO2=${onOff withXAudio2}" - "-DAUDIODRV_WASAPI=${onOff withWASAPI}" - "-DAUDIODRV_OSS=${onOff withOSS}" - "-DAUDIODRV_SADA=${onOff withSADA}" - "-DAUDIODRV_ALSA=${onOff withALSA}" - "-DAUDIODRV_PULSE=${onOff withPulseAudio}" - "-DAUDIODRV_APPLE=${onOff withCoreAudio}" - "-DAUDIODRV_LIBAO=${onOff withLibao}" - ] ++ optionals enableEmulation ([ - "-DSNDEMU__ALL=${onOff withAllEmulators}" - ] ++ optionals (!withAllEmulators) - (lib.lists.forEach emulators (x: "-DSNDEMU_${x}=ON")) - ) ++ optionals enableTools [ - "-DUTIL_CHARCNV_ICONV=ON" - "-DUTIL_CHARCNV_WINAPI=${onOff stdenv.hostPlatform.isWindows}" - ]; + cmakeFlags = + [ + (lib.cmakeBool "BUILD_LIBAUDIO" enableAudio) + (lib.cmakeBool "BUILD_LIBEMU" enableEmulation) + (lib.cmakeBool "BUILD_LIBPLAYER" enableLibplayer) + (lib.cmakeBool "BUILD_TESTS" enableTools) + (lib.cmakeBool "BUILD_PLAYER" enableTools) + (lib.cmakeBool "BUILD_VGM2WAV" enableTools) + (lib.cmakeFeature "LIBRARY_TYPE" (if enableShared then "SHARED" else "STATIC")) + (lib.cmakeBool "USE_SANITIZERS" true) + ] + ++ lib.optionals enableAudio [ + (lib.cmakeBool "AUDIODRV_WAVEWRITE" withWaveWrite) + (lib.cmakeBool "AUDIODRV_WINMM" withWinMM) + (lib.cmakeBool "AUDIODRV_DSOUND" withDirectSound) + (lib.cmakeBool "AUDIODRV_XAUDIO2" withXAudio2) + (lib.cmakeBool "AUDIODRV_WASAPI" withWASAPI) + (lib.cmakeBool "AUDIODRV_OSS" withOSS) + (lib.cmakeBool "AUDIODRV_SADA" withSADA) + (lib.cmakeBool "AUDIODRV_ALSA" withALSA) + (lib.cmakeBool "AUDIODRV_PULSE" withPulseAudio) + (lib.cmakeBool "AUDIODRV_APPLE" withCoreAudio) + (lib.cmakeBool "AUDIODRV_LIBAO" withLibao) + ] + ++ lib.optionals enableEmulation ( + [ (lib.cmakeBool "SNDEMU__ALL" withAllEmulators) ] + ++ lib.optionals (!withAllEmulators) ( + lib.lists.forEach emulators (x: (lib.cmakeBool "SNDEMU_${x}" true)) + ) + ) + ++ lib.optionals enableTools [ + (lib.cmakeBool "UTIL_CHARCNV_ICONV" true) + (lib.cmakeBool "UTIL_CHARCNV_WINAPI" stdenv.hostPlatform.isWindows) + ]; - passthru.updateScript = unstableGitUpdater { - url = "https://github.com/ValleyBell/libvgm.git"; + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = unstableGitUpdater { }; }; - meta = with lib; { - homepage = "https://github.com/ValleyBell/libvgm"; + meta = { description = "More modular rewrite of most components from VGMPlay"; + homepage = "https://github.com/ValleyBell/libvgm"; license = - if (enableEmulation && (withAllEmulators || (lib.lists.any (core: core == "WSWAN_ALL") emulators))) then - licenses.unfree # https://github.com/ValleyBell/libvgm/issues/43 + if + (enableEmulation && (withAllEmulators || (lib.lists.any (core: core == "WSWAN_ALL") emulators))) + then + lib.licenses.unfree # https://github.com/ValleyBell/libvgm/issues/43 else - licenses.gpl2Only; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.all; + lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ OPNA2608 ]; + platforms = lib.platforms.all; + pkgConfigModules = + [ "vgm-utils" ] + ++ lib.optionals enableAudio [ "vgm-audio" ] + ++ lib.optionals enableEmulation [ "vgm-emu" ] + ++ lib.optionals enableLibplayer [ "vgm-player" ]; }; -} +}) diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix deleted file mode 100644 index 4caa26aadc6a..000000000000 --- a/pkgs/development/libraries/libviper/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{lib, stdenv, fetchurl, pkg-config, glib, ncurses, gpm}: -stdenv.mkDerivation rec { - pname = "libviper"; - version = "1.4.6"; - - src = fetchurl { - url = "mirror://sourceforge/libviper/libviper-${version}.tar.gz"; - sha256 = "1jvm7wdgw6ixyhl0pcfr9lnr9g6sg6whyrs9ihjiz0agvqrgvxwc"; - }; - - postPatch = '' - sed -i -e s@/usr/local@$out@ -e /ldconfig/d -e '/cd vdk/d' Makefile - - # Fix pending upstream inclusion for ncurses-6.3 support: - # https://github.com/TragicWarrior/libviper/pull/16 - # Not applied as it due to unrelated code changes in context. - substituteInPlace viper_msgbox.c --replace \ - 'mvwprintw(window,height-3,tmp,prompt);' \ - 'mvwprintw(window,height-3,tmp,"%s",prompt);' - substituteInPlace w_decorate.c --replace \ - 'mvwprintw(window,0,x,title);' \ - 'mvwprintw(window,0,x,"%s",title);' - ''; - - preInstall = '' - mkdir -p $out/include - mkdir -p $out/lib - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib ncurses gpm]; - - meta = with lib; { - homepage = "http://libviper.sourceforge.net/"; - description = "Simple window creation and management facilities for the console"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libviperfx/default.nix b/pkgs/development/libraries/libviperfx/default.nix deleted file mode 100644 index 2778726a4bf7..000000000000 --- a/pkgs/development/libraries/libviperfx/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "libviperfx"; - version = "unstable-2018-01-15"; - - src = fetchFromGitHub { - owner = "vipersaudio"; - repo = "viperfx_core_binary"; - rev = "6f7d0da725affe854f083baf5d90c70e172e4488"; - sha256 = "sha256-hfX46Kk91eQgiO3uhew91I6eEHxazhdGwSkhfNZ+HvQ="; - }; - - dontBuild = true; - - installPhase = '' - runHook preInstall - install -D libviperfx_x64_linux.so $out/lib/libviperfx.so - install -D README.md $out/share/licenses/libviperfx/LICENSE - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/vipersaudio/viperfx_core_binary"; - description = "ViPER FX core"; - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ rewine ]; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix deleted file mode 100644 index b01a9a788bad..000000000000 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, gettext -, vala -, libcap_ng -, libvirt -, libxml2 -, buildPackages -, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages -, gobject-introspection -, withDocs ? stdenv.hostPlatform == stdenv.buildPlatform -, gtk-doc -, docbook-xsl-nons -}: - -stdenv.mkDerivation rec { - pname = "libvirt-glib"; - version = "5.0.0"; - - outputs = [ "out" "dev" ] ++ lib.optional withDocs "devdoc"; - - src = fetchurl { - url = "https://libvirt.org/sources/glib/${pname}-${version}.tar.xz"; - sha256 = "m/7DRjgkFqNXXYcpm8ZBsqRkqlGf2bEofjGKpDovO4s="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - vala - gobject-introspection - ] ++ lib.optionals withIntrospection [ - gobject-introspection - ] ++ lib.optionals withDocs [ - gtk-doc - docbook-xsl-nons - ]; - - buildInputs = [ - libvirt - libxml2 - ] ++ lib.optionals stdenv.isLinux [ - libcap_ng - ]; - - strictDeps = true; - - # The build system won't let us build with docs or introspection - # unless we're building natively, but will still do a mandatory - # check for the dependencies for those things unless we explicitly - # disable the options. - mesonFlags = [ - (lib.mesonEnable "docs" withDocs) - (lib.mesonEnable "introspection" withIntrospection) - ]; - - meta = with lib; { - description = "Library for working with virtual machines"; - longDescription = '' - libvirt-glib wraps libvirt to provide a high-level object-oriented API better - suited for glib-based applications, via three libraries: - - - libvirt-glib - GLib main loop integration & misc helper APIs - - libvirt-gconfig - GObjects for manipulating libvirt XML documents - - libvirt-gobject - GObjects for managing libvirt objects - ''; - homepage = "https://libvirt.org/"; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 56b0b0a39089..b1e565266f86 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -34,7 +34,7 @@ , stdenv , substituteAll , xhtml1 -, yajl +, json_c , writeScript , nixosTests @@ -72,14 +72,14 @@ , enableIscsi ? false , openiscsi , libiscsi -, enableXen ? stdenv.isLinux && stdenv.isx86_64 +, enableXen ? stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 , xen -, enableZfs ? stdenv.isLinux +, enableZfs ? stdenv.hostPlatform.isLinux , zfs }: let - inherit (stdenv) isDarwin isLinux isx86_64; + inherit (stdenv.hostPlatform) isDarwin isLinux isx86_64; binPath = lib.makeBinPath ([ dnsmasq ] ++ lib.optionals isLinux [ @@ -114,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.5.0"; + version = "10.9.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-Nku4l1f34NOUr23KWDH9uZu72OgMK3KfYjsRRbuTvf8="; + hash = "sha256-LYQYA5UIKYs+8rSNZDymmrxuTWsgmukP5Y17lGB5UQs="; fetchSubmodules = true; }; @@ -163,6 +163,9 @@ stdenv.mkDerivation rec { sed -i '/qemuvhostusertest/d' tests/meson.build sed -i '/qemuxml2xmltest/d' tests/meson.build sed -i '/domaincapstest/d' tests/meson.build + # virshtest frequently times out on Darwin + substituteInPlace tests/meson.build \ + --replace-fail "data.get('timeout', 30)" "data.get('timeout', 120)" '' + lib.optionalString enableXen '' # Has various hardcoded paths that don't exist outside of a Xen dom0. sed -i '/libxlxml2domconfigtest/d' tests/meson.build @@ -202,7 +205,7 @@ stdenv.mkDerivation rec { python3 readline xhtml1 - yajl + json_c ] ++ lib.optionals isLinux [ acl attr @@ -312,7 +315,7 @@ stdenv.mkDerivation rec { (feat "ssh_proxy" isLinux) (feat "tests" true) (feat "udev" isLinux) - (feat "yajl" true) + (feat "json_c" true) (driver "ch" isLinux) (driver "esx" true) diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix deleted file mode 100644 index 4b66ef5b4e1d..000000000000 --- a/pkgs/development/libraries/libvisio/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, fetchurl -, boost -, libwpd -, libwpg -, pkg-config -, zlib -, gperf -, librevenge -, libxml2 -, icu -, perl -, cppunit -, doxygen -}: - -stdenv.mkDerivation rec { - pname = "libvisio"; - version = "0.1.7"; - - outputs = [ "out" "bin" "dev" "doc" ]; - - src = fetchurl { - url = "https://dev-www.libreoffice.org/src/libvisio/${pname}-${version}.tar.xz"; - sha256 = "0k7adcbbf27l7n453cca1m6s9yj6qvb5j6bsg2db09ybf3w8vbwg"; - }; - - strictDeps = true; - nativeBuildInputs = [ pkg-config doxygen perl gperf ]; - buildInputs = [ boost libwpd libwpg zlib librevenge libxml2 icu cppunit ]; - - doCheck = true; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Library providing ability to interpret and import visio diagrams into various applications"; - homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libvisio"; - license = licenses.mpl20; - platforms = platforms.unix; - maintainers = with maintainers; [ nickcao ]; - }; -} diff --git a/pkgs/development/libraries/libvisio2svg/default.nix b/pkgs/development/libraries/libvisio2svg/default.nix deleted file mode 100644 index b2a68ed58680..000000000000 --- a/pkgs/development/libraries/libvisio2svg/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, freetype -, libemf2svg -, librevenge -, libvisio -, libwmf -, libxml2 -}: - -stdenv.mkDerivation rec { - pname = "libvisio2svg"; - version = "0.5.5"; - - src = fetchFromGitHub { - owner = "kakwa"; - repo = pname; - rev = version; - sha256 = "14m37mmib1596c76j9w178jqhwxyih2sy5w5q9xglh8cmlfn1hfx"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libxml2 freetype librevenge libvisio libwmf libemf2svg ]; - - cmakeFlags = [ - # file RPATH_CHANGE could not write new RPATH - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ]; - - meta = with lib; { - description = "Library and tools to convert Microsoft Visio documents (VSS and VSD) to SVG"; - homepage = "https://github.com/kakwa/libvisio2svg"; - maintainers = with maintainers; [ erdnaxe ]; - license = licenses.gpl2Only; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix deleted file mode 100644 index 12fae974312b..000000000000 --- a/pkgs/development/libraries/libvisual/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, SDL -, autoreconfHook -, glib -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "libvisual"; - version = "0.4.1"; - - src = fetchurl { - url = "mirror://sourceforge/libvisual/${pname}-${version}.tar.gz"; - hash = "sha256-qhKHdBf3bTZC2fTHIzAjgNgzF1Y51jpVZB0Bkopd230="; - }; - - outputs = [ "out" "dev" ]; - - patches = [ - # pull upstream fix for SDL1 cross-compilation. - # https://github.com/Libvisual/libvisual/pull/238 - (fetchpatch { - name = "sdl-cross-prereq.patch"; - url = "https://github.com/Libvisual/libvisual/commit/7902d24aa1a552619a5738339b3823e90dd3b865.patch"; - hash = "sha256-84u8klHDAw/q4d+9L4ROAr7XsbXItHrhaEKkTEMSPcc="; - # remove extra libvisual prefix - stripLen = 1; - # pull in only useful configure.ac changes. - excludes = [ "Makefile.am" ]; - }) - (fetchpatch { - name = "sdl-cross-pc.patch"; - url = "https://github.com/Libvisual/libvisual/commit/f79a2e8d21ad1d7fe26e2aa83cea4c9f48f9e392.patch"; - hash = "sha256-8c7SdLxXC8K9BAwj7DzozsZAcbs5l1xuBqky9LJ1MfM="; - # remove extra libvisual prefix - stripLen = 1; - }) - ]; - - strictDeps = true; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ SDL glib ]; - - configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # Remove once "sdl-cross-prereq.patch" patch above is removed. - "--disable-lv-tool" - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ]; - - meta = { - description = "Abstraction library for audio visualisations"; - homepage = "https://sourceforge.net/projects/libvisual/"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix deleted file mode 100644 index 9e692fc5805e..000000000000 --- a/pkgs/development/libraries/libvmaf/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, ffmpeg-full -, libaom -, meson -, nasm -, ninja -, testers -, xxd -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libvmaf"; - version = "3.0.0"; - - src = fetchFromGitHub { - owner = "netflix"; - repo = "vmaf"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-6mwU2so1YM2pyWkJbDHVl443GgWtQazbBv3gTMBq5NA="; - }; - - sourceRoot = "${finalAttrs.src.name}/libvmaf"; - - nativeBuildInputs = [ meson ninja nasm xxd ]; - - mesonFlags = [ "-Denable_avx512=true" ]; - - outputs = [ "out" "dev" ]; - doCheck = false; - - passthru.tests = { - inherit libaom ffmpeg-full; - version = testers.testVersion { - package = finalAttrs.finalPackage; - }; - pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - moduleNames = [ "libvmaf" ]; - }; - }; - - meta = with lib; { - description = "Perceptual video quality assessment based on multi-method fusion (VMAF)"; - homepage = "https://github.com/Netflix/vmaf"; - changelog = "https://github.com/Netflix/vmaf/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = licenses.bsd2Patent; - maintainers = [ maintainers.cfsmp3 ]; - mainProgram = "vmaf"; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index a6c78c3262fc..e6b5bf4acb5b 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { libpng ] ++ lib.optionals withSystemd [ systemd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon ]; diff --git a/pkgs/development/libraries/libvoikko/default.nix b/pkgs/development/libraries/libvoikko/default.nix deleted file mode 100644 index 3f5f4ef5c858..000000000000 --- a/pkgs/development/libraries/libvoikko/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv -, lib -, autoreconfHook -, hfst-ospell -, fetchFromGitHub -, pkg-config -, python3 -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libvoikko"; - version = "4.3.2"; - - src = fetchFromGitHub { - owner = "voikko"; - repo = "corevoikko"; - rev = "refs/tags/rel-libvoikko-${finalAttrs.version}"; - hash = "sha256-0MIQ54dCxyAfdgYWmmTVF+Yfa15K2sjJyP1JNxwHP2M="; - }; - - sourceRoot = "${finalAttrs.src.name}/libvoikko"; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - python3 - ]; - - buildInputs = [ - hfst-ospell - ]; - - meta = with lib; { - homepage = "https://voikko.puimula.org/"; - description = "Finnish language processing library"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ lurkki ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix deleted file mode 100644 index 42e7328a8ec1..000000000000 --- a/pkgs/development/libraries/libvorbis/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, libogg, pkg-config }: - -stdenv.mkDerivation rec { - pname = "libvorbis"; - version = "1.3.7"; - - src = fetchurl { - url = "https://downloads.xiph.org/releases/vorbis/${pname}-${version}.tar.xz"; - sha256 = "0jwmf87x5sdis64rbv0l87mdpah1rbilkkxszipbzg128f9w8g5k"; - }; - - outputs = [ "out" "dev" "doc" ]; - - nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ libogg ]; - - doCheck = true; - - # strip -mno-ieee-fp flag from configure and configure.ac when using - # clang as the flag is not recognized by the compiler - preConfigure = lib.optionalString (stdenv.cc.isClang or false) '' - sed s/\-mno\-ieee\-fp// -i {configure,configure.ac} - ''; - - meta = with lib; { - description = "Vorbis audio compression reference implementation"; - homepage = "https://xiph.org/vorbis/"; - license = licenses.bsd3; - maintainers = [ maintainers.ehmry ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libvori/default.nix b/pkgs/development/libraries/libvori/default.nix deleted file mode 100644 index 9483c2a0bb7a..000000000000 --- a/pkgs/development/libraries/libvori/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, lib, fetchurl, cmake }: - -stdenv.mkDerivation rec { - pname = "libvori"; - version = "220621"; - - src = fetchurl { - url = "https://brehm-research.de/files/${pname}-${version}.tar.gz"; - hash = "sha256-HPqYxWSBS92s8cDn8RWCE311hmj2MH5us5LHIxeYTBQ="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Library for Voronoi integration of electron densities"; - homepage = "https://brehm-research.de/libvori.php"; - license = with licenses; [ lgpl3Only ]; - platforms = platforms.unix; - maintainers = [ maintainers.sheepforce ]; - }; -} diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix deleted file mode 100644 index ef0929a841d8..000000000000 --- a/pkgs/development/libraries/libvpx/default.nix +++ /dev/null @@ -1,219 +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 - -# for passthru.tests -, ffmpeg -, gst_all_1 -}: - -let - inherit (stdenv) is64bit isMips isDarwin isCygwin; - inherit (lib) enableFeature optional optionals; - - # 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 - darwinVersion = - /**/ 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"; - - cpu = - /**/ if stdenv.hostPlatform.isArmv7 then "armv7" - else if stdenv.hostPlatform.isAarch64 then "arm64" - else if stdenv.hostPlatform.isx86_32 then "x86" - else stdenv.hostPlatform.parsed.cpu.name; - - kernel = - # Build system doesn't understand BSD, so pretend to be Linux. - /**/ if stdenv.isBSD then "linux" - else if stdenv.isDarwin then "darwin${darwinVersion}" - else stdenv.hostPlatform.parsed.kernel.name; - - isGeneric = - /**/ (stdenv.hostPlatform.isPower && stdenv.hostPlatform.isLittleEndian) - || stdenv.hostPlatform.parsed.cpu.name == "armv6l" - || stdenv.hostPlatform.isRiscV; - - target = - /**/ if (stdenv.isBSD || stdenv.hostPlatform != stdenv.buildPlatform) then - (if isGeneric then "generic-gnu" else "${cpu}-${kernel}-gcc") - else null; -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.14.1"; - - src = fetchFromGitHub { - owner = "webmproject"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Pfg7g4y/dqn2VKDQU1LnTJQSj1Tont9/8Je6ShDb2GQ="; - }; - - postPatch = '' - patchShebangs --build \ - build/make/*.sh \ - build/make/*.pl \ - build/make/*.pm \ - test/*.sh \ - configure - - # When cross-compiling (for aarch64-multiplatform), the compiler errors out on these flags. - # Since they're 'just' warnings, it's fine to just remove them. - substituteInPlace configure \ - --replace "check_add_cflags -Wparentheses-equality" "" \ - --replace "check_add_cflags -Wunreachable-code-loop-increment" "" \ - --replace "check_cflags -Wshorten-64-to-32 && add_cflags_only -Wshorten-64-to-32" "" - ''; - - 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 (target != null) [ - "--target=${target}" - (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" ''; - - passthru.tests = { - inherit (gst_all_1) gst-plugins-good; - ffmpeg = ffmpeg.override { withVpx = true; }; - }; - - meta = with lib; { - description = "WebM VP8/VP9 codec SDK"; - homepage = "https://www.webmproject.org/"; - changelog = "https://github.com/webmproject/libvpx/raw/v${version}/CHANGELOG"; - license = licenses.bsd3; - maintainers = with maintainers; [ codyopel ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix deleted file mode 100644 index 0e92d28046aa..000000000000 --- a/pkgs/development/libraries/libvterm-neovim/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, stdenv -, fetchurl -, perl -, libtool -}: - -stdenv.mkDerivation rec { - pname = "libvterm-neovim"; - # Releases are not tagged, look at commit history to find latest release - version = "0.3.3"; - - src = fetchurl { - url = "https://launchpad.net/libvterm/trunk/v${lib.versions.majorMinor version}/+download/libvterm-${version}.tar.gz"; - hash = "sha256-CRVvQ90hKL00fL7r5Q2aVx0yxk4M8Y0hEZeUav9yJuA="; - }; - - nativeBuildInputs = [ perl libtool ]; - - makeFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - "LIBTOOL=${libtool}/bin/libtool" - "PREFIX=$(out)" - ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "VT220/xterm/ECMA-48 terminal emulator library"; - homepage = "http://www.leonerd.org.uk/code/libvterm/"; - license = licenses.mit; - maintainers = with maintainers; [ rvolosatovs ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix deleted file mode 100644 index f1e217f2b3e5..000000000000 --- a/pkgs/development/libraries/libvterm/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, ncurses }: - -stdenv.mkDerivation rec { - pname = "libvterm"; - version = "0.99.7"; - - src = fetchurl { - url = "mirror://sourceforge/libvterm/${pname}-${version}.tar.gz"; - sha256 = "10gaqygmmwp0cwk3j8qflri5caf8vl3f7pwfl2svw5whv8wkn0k2"; - }; - - preInstall = '' - mkdir -p $out/include $out/lib - ''; - - postPatch = '' - substituteInPlace Makefile \ - --replace "gcc" "${stdenv.cc.targetPrefix}cc" \ - --replace "ldconfig" "" \ - --replace "/usr" "$out" - - makeFlagsArray+=("PKG_CFG=`${stdenv.cc.targetPrefix}pkg-config --cflags glib-2.0`") - ''; - - # For headers - propagatedBuildInputs = [ glib ]; - - strictDeps = true; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ncurses ]; - - meta = with lib; { - homepage = "http://libvterm.sourceforge.net/"; - description = "Terminal emulator library to mimic both vt100 and rxvt"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libwbxml/default.nix b/pkgs/development/libraries/libwbxml/default.nix deleted file mode 100644 index 1ddc1c3534cc..000000000000 --- a/pkgs/development/libraries/libwbxml/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub, lib, cmake, expat }: - -stdenv.mkDerivation rec { - pname = "libwbxml"; - version = "0.11.10"; - - src = fetchFromGitHub { - owner = "libwbxml"; - repo = "libwbxml"; - rev = "${pname}-${version}"; - sha256 = "sha256-yy8+CyNKXuttCmxRxH/XptIloDklto4f5Zg0vnwnneY="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ expat ]; - - postPatch = '' - sed -i 's/^SET.*$//' cmake/CMakeLists.txt - ''; - - meta = with lib; { - homepage = "https://github.com/libwbxml/libwbxml"; - description = "WBXML Library (aka libwbxml) contains a library and its associated tools to Parse, Encode and Handle WBXML documents"; - maintainers = with maintainers; [ mh ]; - platforms = platforms.linux; - license = licenses.lgpl21Plus; - }; -} diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix deleted file mode 100644 index f788a7f59b9c..000000000000 --- a/pkgs/development/libraries/libwebp/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool -, threadingSupport ? true # multi-threading -, openglSupport ? false, libglut, libGL, libGLU # OpenGL (required for vwebp) -, pngSupport ? true, libpng # PNG image format -, jpegSupport ? true, libjpeg # JPEG image format -, tiffSupport ? true, libtiff # TIFF image format -, gifSupport ? true, giflib # GIF image format -, alignedSupport ? false # Force aligned memory operations -, swap16bitcspSupport ? false # Byte swap for 16bit color spaces -, experimentalSupport ? false # Experimental code -, libwebpmuxSupport ? true # Build libwebpmux -, libwebpdemuxSupport ? true # Build libwebpdemux -, libwebpdecoderSupport ? true # Build libwebpdecoder - -# for passthru.tests -, gd -, graphicsmagick -, haskellPackages -, imagemagick -, imlib2 -, libjxl -, opencv -, python3 -, vips -}: - -stdenv.mkDerivation rec { - pname = "libwebp"; - version = "1.4.0"; - - src = fetchFromGitHub { - owner = "webmproject"; - repo = pname; - rev = "v${version}"; - hash = "sha256-OR/VzKNn3mnwjf+G+RkEGAaaKrhVlAu1e2oTRwdsPj8="; - }; - - configureFlags = [ - (lib.enableFeature threadingSupport "threading") - (lib.enableFeature openglSupport "gl") - (lib.enableFeature pngSupport "png") - (lib.enableFeature jpegSupport "jpeg") - (lib.enableFeature tiffSupport "tiff") - (lib.enableFeature gifSupport "gif") - (lib.enableFeature alignedSupport "aligned") - (lib.enableFeature swap16bitcspSupport "swap-16bit-csp") - (lib.enableFeature experimentalSupport "experimental") - (lib.enableFeature libwebpmuxSupport "libwebpmux") - (lib.enableFeature libwebpdemuxSupport "libwebpdemux") - (lib.enableFeature libwebpdecoderSupport "libwebpdecoder") - ]; - - nativeBuildInputs = [ autoreconfHook libtool ]; - buildInputs = [ ] - ++ lib.optionals openglSupport [ libglut libGL libGLU ] - ++ lib.optionals pngSupport [ libpng ] - ++ lib.optionals jpegSupport [ libjpeg ] - ++ lib.optionals tiffSupport [ libtiff ] - ++ lib.optionals gifSupport [ giflib ]; - - enableParallelBuilding = true; - - passthru.tests = { - inherit gd graphicsmagick imagemagick imlib2 libjxl opencv vips; - inherit (python3.pkgs) pillow imread; - haskell-webp = haskellPackages.webp; - }; - - meta = with lib; { - description = "Tools and library for the WebP image format"; - homepage = "https://developers.google.com/speed/webp/"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ ajs124 ]; - }; -} diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix deleted file mode 100644 index af028888b23b..000000000000 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, openssl -, zlib -, libuv - # External poll is required for e.g. mosquitto, but discouraged by the maintainer. -, withExternalPoll ? false -}: - -stdenv.mkDerivation rec { - pname = "libwebsockets"; - version = "4.3.3"; - - src = fetchFromGitHub { - owner = "warmcat"; - repo = "libwebsockets"; - rev = "v${version}"; - hash = "sha256-IXA9NUh55GtZmn4BhCXntVdHcKZ34iZIJ/0wlySj0/M="; - }; - - outputs = [ "out" "dev" ]; - - buildInputs = [ openssl zlib libuv ]; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DLWS_WITH_PLUGINS=ON" - "-DLWS_WITH_IPV6=ON" - "-DLWS_WITH_SOCKS5=ON" - "-DDISABLE_WERROR=ON" - "-DLWS_BUILD_HASH=no_hash" - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON" - ++ lib.optional withExternalPoll "-DLWS_WITH_EXTERNAL_POLL=ON" - ++ ( - if stdenv.hostPlatform.isStatic then - [ "-DLWS_WITH_SHARED=OFF" ] - else - [ "-DLWS_WITH_STATIC=OFF" "-DLWS_LINK_TESTAPPS_DYNAMIC=ON" ] - ); - - postInstall = '' - # Fix path that will be incorrect on move to "dev" output. - substituteInPlace "$out/lib/cmake/libwebsockets/LibwebsocketsTargets-release.cmake" \ - --replace "\''${_IMPORT_PREFIX}" "$out" - - # The package builds a few test programs that are not usually necessary. - # Move those to the dev output. - moveToOutput "bin/libwebsockets-test-*" "$dev" - moveToOutput "share/libwebsockets-test-*" "$dev" - ''; - - # $out/share/libwebsockets-test-server/plugins/libprotocol_*.so refers to crtbeginS.o - disallowedReferences = [ stdenv.cc.cc ]; - - meta = with lib; { - description = "Light, portable C library for websockets"; - longDescription = '' - Libwebsockets is a lightweight pure C library built to - use minimal CPU and memory resources, and provide fast - throughput in both directions. - ''; - homepage = "https://libwebsockets.org/"; - # Relicensed from LGPLv2.1+ to MIT with 4.0. Licensing situation - # is tricky, see https://github.com/warmcat/libwebsockets/blob/main/LICENSE - license = with licenses; [ mit publicDomain bsd3 asl20 ]; - maintainers = with maintainers; [ mindavi ]; - platforms = platforms.all; - }; -} - diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix deleted file mode 100644 index 455e59d89718..000000000000 --- a/pkgs/development/libraries/libwhereami/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }: - -stdenv.mkDerivation rec { - pname = "libwhereami"; - version = "0.5.0"; - - src = fetchFromGitHub { - sha256 = "05fc28dri2h858kxbvldk5b6wd5is3fjcdsiqj3nxf95i66bb3xp"; - rev = version; - repo = "libwhereami"; - owner = "puppetlabs"; - }; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ boost curl leatherman ]; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Library to report hypervisor information from inside a VM"; - license = licenses.asl20; - maintainers = [ maintainers.womfoo ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; # fails on aarch64 - }; - -} diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix deleted file mode 100644 index b42e09894db8..000000000000 --- a/pkgs/development/libraries/libwmf/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config -, freetype, glib, imagemagick, libjpeg, libpng, libxml2, zlib -}: - -stdenv.mkDerivation rec { - pname = "libwmf"; - version = "0.2.13"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "caolanm"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-vffohx57OvQKu8DfNXNBm9bPsA8KgkQWs/3mmFn7L6M="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ zlib imagemagick libpng glib freetype libjpeg libxml2 ]; - enableParallelBuilding = true; - - meta = with lib; { - description = "WMF library from wvWare"; - homepage = "https://wvware.sourceforge.net/libwmf.html"; - downloadPage = "https://github.com/caolanm/libwmf/releases"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libwnck/2.nix b/pkgs/development/libraries/libwnck/2.nix index bc5a89dc120d..890b1a7651a8 100644 --- a/pkgs/development/libraries/libwnck/2.nix +++ b/pkgs/development/libraries/libwnck/2.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ johnazoidberg ]; # ./xutils.h:31:10: fatal error: 'gdk/gdkx.h' file not found # #include <gdk/gdkx.h> - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index 2f535930ed03..25b2be3db4a2 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , meson , mesonEmulatorHook , ninja @@ -23,25 +22,16 @@ stdenv.mkDerivation rec { pname = "libwnck"; - version = "43.0"; + version = "43.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "kFvNuFhH1rj4hh5WswzW3GHq5n7O9M2ZSp+SWiaiwf4="; + sha256 = "Y0tFh7c2ekk9OBjEtXdA2sBhU8+PJc1k9a8WtlfdaEU="; }; - patches = [ - # bamfdaemon crashes with libwnck3 43.0 - # https://bugs.launchpad.net/ubuntu/+source/libwnck3/+bug/1990263 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libwnck/-/commit/6ceb684442eb26e3bdb8a38bf52264ad55f96a7b.patch"; - sha256 = "/1wCnElCrZB7XTDW/l3dxMKZ9czGnukbGu4/aQStoXE="; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix index 3d2df9259a54..d4e743ee2855 100644 --- a/pkgs/development/libraries/libwpe/fdo.nix +++ b/pkgs/development/libraries/libwpe/fdo.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "wpebackend-fdo"; - version = "1.14.2"; + version = "1.14.3"; src = fetchurl { url = "https://wpewebkit.org/releases/wpebackend-fdo-${version}.tar.xz"; - sha256 = "k8l2aumGTurq7isKdPIsvKCN9CwaG9tVsIbyUo44DTg="; + sha256 = "sha256-EBIYQllahQKR2z6C89sLmYTfB5Ai04bOQsK4UIFZ3Gw="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix deleted file mode 100644 index ada7f984a4a2..000000000000 --- a/pkgs/development/libraries/libwpg/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libwpd, zlib, librevenge, boost }: - -stdenv.mkDerivation rec { - pname = "libwpg"; - version = "0.3.4"; - - src = fetchurl { - url = "mirror://sourceforge/libwpg/${pname}-${version}.tar.xz"; - hash = "sha256-tV/alEDR4HBjDrJIfYuGl89BLCFKJ8runfac7HwATeM="; - }; - - buildInputs = [ libwpd zlib librevenge boost ]; - nativeBuildInputs = [ pkg-config ]; - - meta = with lib; { - homepage = "https://libwpg.sourceforge.net"; - description = "C++ library to parse WPG"; - license = with licenses; [ lgpl21 mpl20 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix deleted file mode 100644 index f5af2e8284c8..000000000000 --- a/pkgs/development/libraries/libwps/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, boost, pkg-config, librevenge, zlib }: - -stdenv.mkDerivation rec { - pname = "libwps"; - version = "0.4.14"; - - src = fetchurl { - url = "mirror://sourceforge/libwps/${pname}-${version}.tar.bz2"; - sha256 = "sha256-xVEdlAngO446F50EZcHMKW7aBvyDcTVu9Egs2oaIadE="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ boost librevenge zlib ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; - - meta = with lib; { - homepage = "https://libwps.sourceforge.net/"; - description = "Microsoft Works document format import filter library"; - platforms = platforms.unix; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/libwtk-sdl2/default.nix b/pkgs/development/libraries/libwtk-sdl2/default.nix deleted file mode 100644 index 4da8873ca775..000000000000 --- a/pkgs/development/libraries/libwtk-sdl2/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config -, boost -, SDL2 -, SDL2_ttf -, SDL2_image -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libwtk-sdl2"; - version = "unstable-2023-02-28"; - - src = fetchFromGitHub { - owner = "muesli4"; - repo = "libwtk-sdl2"; - rev = "0504f8342c8c97d0c8b43d33751427c564ad8d44"; - sha256 = "sha256-NAjsDQ4/hklYRfa85uleOr50tmc6UJVo2xiDnEbmIxk="; - }; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - ]; - buildInputs = [ - boost - SDL2 - SDL2_ttf - SDL2_image - ]; - # From some reason, this is needed as otherwise SDL.h is not found - NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2"; - - outputs = [ "out" "dev" "lib" ]; - - meta = with lib; { - description = "Simplistic SDL2 GUI framework in early developement"; - mainProgram = "libwtk-sdl2-test"; - homepage = "https://github.com/muesli4/libwtk-sdl2"; - # See: https://github.com/muesli4/mpd-touch-screen-gui/tree/master/LICENSES - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ doronbehar ]; - /* Partial darwin build failure log (from ofborg): - geometry.cpp:95:34: error: no member named 'abs' in namespace 'std' - > return { std::abs(v.w), std::abs(v.h) }; - > ~~~~~^ - */ - platforms = platforms.linux; - }; -}) diff --git a/pkgs/development/libraries/libx86/constants.patch b/pkgs/development/libraries/libx86/constants.patch deleted file mode 100644 index 10fc829d6743..000000000000 --- a/pkgs/development/libraries/libx86/constants.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- libx86/lrmi.c 2008-09-06 12:24:36.070136428 +0200 -+++ libx86/lrmi.c 2008-09-06 12:28:10.584287458 +0200 -@@ -56,5 +56,17 @@ - - #if defined(__linux__) -+#ifndef TF_MASK -+#define TF_MASK X86_EFLAGS_TF -+#endif -+#ifndef IF_MASK -+#define IF_MASK X86_EFLAGS_IF -+#endif -+#ifndef IOPL_MASK -+#define IOPL_MASK X86_EFLAGS_IOPL -+#endif -+#ifndef VIF_MASK -+#define VIF_MASK X86_EFLAGS_VIF -+#endif - #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) - #elif defined(__NetBSD__) || defined(__FreeBSD__) - #define DEFAULT_VM86_FLAGS (PSL_I | PSL_IOPL) diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix deleted file mode 100644 index 1abefa8f4374..000000000000 --- a/pkgs/development/libraries/libx86/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libx86"; - version = "1.1"; - src = fetchurl { - url = "https://www.codon.org.uk/~mjg59/libx86/downloads/${pname}-${version}.tar.gz"; - sha256 = "0j6h6bc02c6qi0q7c1ncraz4d1hkm5936r35rfsp4x1jrc233wav"; - }; - patches = [./constants.patch ./non-x86.patch ]; - - # using BACKEND=x86emu on 64bit systems fixes: - # http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html - makeFlags = [ - "DESTDIR=$(out)" - ] ++ lib.optional (!stdenv.isi686) "BACKEND=x86emu"; - - preBuild = '' - sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@' - sed -e s@/usr@@ -i Makefile - ''; - - meta = with lib; { - description = "Real-mode x86 code emulator"; - maintainers = with maintainers; [ raskin ]; - platforms = [ "x86_64-linux" "i686-linux" ]; - license = licenses.mit; - }; -} diff --git a/pkgs/development/libraries/libx86/non-x86.patch b/pkgs/development/libraries/libx86/non-x86.patch deleted file mode 100644 index 286057c4ba87..000000000000 --- a/pkgs/development/libraries/libx86/non-x86.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -Naur libx86-1.1+ds1.orig/Makefile libx86-1.1+ds1/Makefile ---- libx86-1.1+ds1.orig/Makefile 2008-05-19 12:28:59.000000000 +0300 -+++ libx86-1.1+ds1/Makefile 2012-02-20 01:32:03.750068423 +0200 -@@ -5,6 +5,7 @@ - ifeq ($(BACKEND),x86emu) - OBJECTS += thunk.o x86emu/decode.o x86emu/debug.o x86emu/fpu.o \ - x86emu/ops.o x86emu/ops2.o x86emu/prim_ops.o x86emu/sys.o -+ CFLAGS += -DX86EMU -fno-delete-null-pointer-checks - else - OBJECTS += lrmi.o - endif -diff -Naur libx86-1.1+ds1.orig/thunk.c libx86-1.1+ds1/thunk.c ---- libx86-1.1+ds1.orig/thunk.c 2008-04-03 03:48:00.000000000 +0300 -+++ libx86-1.1+ds1/thunk.c 2012-02-20 01:12:56.468820192 +0200 -@@ -32,6 +32,7 @@ - #define TRUE 1 - #define FALSE 0 - -+#ifndef X86EMU - #define __BUILDIO(bwl,bw,type) \ - static inline void out##bwl##_local(unsigned long port, unsigned type value) { __asm__ __volatile__("out" #bwl " %" #bw "0, %w1" : : "a"(value), "Nd"(port)); \ - }\ -@@ -44,6 +45,15 @@ - __BUILDIO(b,b,char) - __BUILDIO(w,w,short) - __BUILDIO(l,,int) -+#else -+/* use libc functions */ -+#define inb_local inb -+#define inw_local inw -+#define inl_local inl -+#define outb_local outb -+#define outw_local outw -+#define outl_local outl -+#endif /* X86EMU */ - - - char *mmap_addr = SHMERRORPTR; diff --git a/pkgs/development/libraries/libx86/src-for-default.nix b/pkgs/development/libraries/libx86/src-for-default.nix deleted file mode 100644 index b7e432d8109c..000000000000 --- a/pkgs/development/libraries/libx86/src-for-default.nix +++ /dev/null @@ -1,7 +0,0 @@ -rec { - pname="libx86"; - version="1.1"; - hash="0j6h6bc02c6qi0q7c1ncraz4d1hkm5936r35rfsp4x1jrc233wav"; - url="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-${version}.tar.gz"; - advertisedUrl="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-${version}.tar.gz"; -} diff --git a/pkgs/development/libraries/libx86/src-info-for-default.nix b/pkgs/development/libraries/libx86/src-info-for-default.nix deleted file mode 100644 index 9861e21f6559..000000000000 --- a/pkgs/development/libraries/libx86/src-info-for-default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - downloadPage = "http://www.codon.org.uk/~mjg59/libx86/downloads/?C=M;O=D"; - baseName = "libx86"; -} diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix deleted file mode 100644 index 4ace07d2cf0e..000000000000 --- a/pkgs/development/libraries/libx86emu/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, perl }: - -stdenv.mkDerivation rec { - pname = "libx86emu"; - version = "3.5"; - - src = fetchFromGitHub { - owner = "wfeldt"; - repo = "libx86emu"; - rev = version; - sha256 = "sha256-dKT/Ey+vardXu/+coaC69TTUXjJLsLBKgCx9VY8f0oY="; - }; - - nativeBuildInputs = [ perl ]; - - postUnpack = "rm $sourceRoot/git2log"; - patchPhase = '' - # VERSION is usually generated using Git - echo "${version}" > VERSION - substituteInPlace Makefile --replace "/usr" "/" - ''; - - buildFlags = [ "shared" "CC=${stdenv.cc.targetPrefix}cc" ]; - enableParallelBuilding = true; - - installFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib" ]; - - meta = with lib; { - description = "x86 emulation library"; - license = licenses.bsd2; - homepage = "https://github.com/wfeldt/libx86emu"; - maintainers = with maintainers; [ bobvanderlinden ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix deleted file mode 100644 index d5e543a1b5f3..000000000000 --- a/pkgs/development/libraries/libxc/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }: - -stdenv.mkDerivation rec { - pname = "libxc"; - version = "6.2.2"; - - src = fetchFromGitLab { - owner = "libxc"; - repo = "libxc"; - rev = version; - hash = "sha256-JYhuyW95I7Q0edLIe7H//+ej5vh6MdAGxXjmNxDMuhQ="; - }; - - # Timeout increase has already been included upstream in master. - # Check upon updates if this can be removed. - postPatch = '' - substituteInPlace testsuite/CMakeLists.txt \ - --replace "PROPERTIES TIMEOUT 1" "PROPERTIES TIMEOUT 30" - ''; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ perl cmake gfortran ]; - - preConfigure = '' - patchShebangs ./ - ''; - - cmakeFlags = [ - "-DENABLE_FORTRAN=ON" - "-DBUILD_SHARED_LIBS=ON" - "-DENABLE_XHOST=OFF" - # Force compilation of higher derivatives - "-DDISABLE_VXC=0" - "-DDISABLE_FXC=0" - "-DDISABLE_KXC=0" - "-DDISABLE_LXC=0" - ]; - - doCheck = true; - - meta = with lib; { - description = "Library of exchange-correlation functionals for density-functional theory"; - mainProgram = "xc-info"; - homepage = "https://www.tddft.org/programs/Libxc/"; - license = licenses.mpl20; - platforms = platforms.unix; - maintainers = with maintainers; [ markuskowa ]; - }; -} diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix deleted file mode 100644 index b66fe5c5a21a..000000000000 --- a/pkgs/development/libraries/libxcomp/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libjpeg, libpng, libX11, zlib }: - -stdenv.mkDerivation rec { - pname = "libxcomp"; - version = "3.5.99.16"; - - src = fetchurl { - sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2"; - url = "https://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; - }; - - buildInputs = [ libjpeg libpng libX11 zlib ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - preAutoreconf = '' - cd nxcomp/ - sed -i 's|/src/.libs/libXcomp.a|/src/.libs/libXcomp.la|' test/Makefile.am - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "NX compression library"; - homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libxdg-basedir/default.nix b/pkgs/development/libraries/libxdg-basedir/default.nix deleted file mode 100644 index 7786ec7908ff..000000000000 --- a/pkgs/development/libraries/libxdg-basedir/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -}: - -stdenv.mkDerivation rec { - pname = "libxdg-basedir"; - version = "1.2.3"; - - src = fetchFromGitHub { - owner = "devnev"; - repo = pname; - rev = "refs/tags/libxdg-basedir-${version}"; - hash = "sha256-ewtUKDdE6k9Q9hglWwhbTU3DTxvIN41t+zf2Gch9Dkk="; - }; - - nativeBuildInputs = [ - autoreconfHook - ]; - - meta = with lib; { - description = "Implementation of the XDG Base Directory specification"; - homepage = "https://github.com/devnev/libxdg-basedir"; - license = licenses.mit; - maintainers = with maintainers; [ nickcao ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix deleted file mode 100644 index 6994398eaa90..000000000000 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, bison -, doxygen -, xkeyboard_config -, libxcb -, libxml2 -, python3 -, libX11 - # To enable the "interactive-wayland" subcommand of xkbcli. This is the - # wayland equivalent of `xev` on X11. -, xorg -, withWaylandTools ? stdenv.isLinux -, wayland -, wayland-protocols -, wayland-scanner -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libxkbcommon"; - version = "1.7.0"; - - src = fetchurl { - url = with finalAttrs; "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; - hash = "sha256-ZXgvChCktFWvnGuqtwQOL1N1IMqi7CCSgFzf02hjskc="; - }; - - patches = [ - # Disable one Xvfb test as it fails for permission checks. - ./disable-x11com.patch - ]; - - outputs = [ "out" "dev" "doc" ]; - - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config bison doxygen xorg.xvfb ] - ++ lib.optional withWaylandTools wayland-scanner; - buildInputs = [ xkeyboard_config libxcb libxml2 ] - ++ lib.optionals withWaylandTools [ wayland wayland-protocols ]; - nativeCheckInputs = [ python3 ]; - - mesonFlags = [ - "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb" - "-Dxkb-config-extra-path=/etc/xkb" # default=$sysconfdir/xkb ($out/etc) - "-Dx-locale-root=${libX11.out}/share/X11/locale" - "-Denable-docs=true" - "-Denable-wayland=${lib.boolToString withWaylandTools}" - ]; - - doCheck = true; - preCheck = '' - patchShebangs ../test/ - ''; - - passthru = { - tests.pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - }; - }; - - meta = with lib; { - description = "Library to handle keyboard descriptions"; - longDescription = '' - libxkbcommon is a keyboard keymap compiler and support library which - processes a reduced subset of keymaps as defined by the XKB (X Keyboard - Extension) specification. It also contains a module for handling Compose - and dead keys. - ''; # and a separate library for listing available keyboard layouts. - homepage = "https://xkbcommon.org"; - changelog = "https://github.com/xkbcommon/libxkbcommon/blob/xkbcommon-${finalAttrs.version}/NEWS"; - license = licenses.mit; - maintainers = with maintainers; [ primeos ttuegel ]; - mainProgram = "xkbcli"; - platforms = with platforms; unix; - pkgConfigModules = [ - "xkbcommon" - "xkbcommon-x11" - "xkbregistry" - ]; - }; -}) diff --git a/pkgs/development/libraries/libxkbcommon/disable-x11com.patch b/pkgs/development/libraries/libxkbcommon/disable-x11com.patch deleted file mode 100644 index fb5c8458b5dd..000000000000 --- a/pkgs/development/libraries/libxkbcommon/disable-x11com.patch +++ /dev/null @@ -1,17 +0,0 @@ -On nixpkgs /tmp/.X11-unix is not compatible with Xvfb requirement and the -test fails. ---- a/meson.build -+++ b/meson.build -@@ -775,12 +775,6 @@ if get_option('enable-x11') - env: test_env, - is_parallel : false, - ) -- test( -- 'x11comp', -- executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep), -- env: test_env, -- is_parallel : false, -- ) - endif - if get_option('enable-xkbregistry') - test( diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix deleted file mode 100644 index 3fa295279f0c..000000000000 --- a/pkgs/development/libraries/libxklavier/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook, pkg-config, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl -, glib, isocodes, gobject-introspection -, withDoc ? (stdenv.buildPlatform == stdenv.hostPlatform) -}: - -stdenv.mkDerivation rec { - pname = "libxklavier"; - version = "5.4"; - - src = fetchgit { - url = "https://gitlab.freedesktop.org/archived-projects/libxklavier.git"; - rev = "${pname}-${version}"; - sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a"; - }; - - patches = [ - ./honor-XKB_CONFIG_ROOT.patch - ] ++ lib.optionals stdenv.isDarwin [ - (fetchpatch { - url = "https://gitlab.freedesktop.org/archived-projects/libxklavier/-/commit/1387c21a788ec1ea203c8392ea1460fc29d83f70.patch"; - sha256 = "sha256-fyWu7sVfDv/ozjhLSLCVsv+iNFawWgJqHUsQHHSkQn4="; - }) - ]; - - outputs = [ "out" "dev" ] ++ lib.optionals withDoc [ "devdoc" ]; - - # TODO: enable xmodmap support, needs xmodmap DB - propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; - - nativeBuildInputs = [ autoreconfHook pkg-config gtk-doc docbook_xsl gobject-introspection ]; - - preAutoreconf = '' - export NOCONFIGURE=1 - gtkdocize - ''; - - configureFlags = [ - "--with-xkb-base=${xkeyboard_config}/etc/X11/xkb" - "--with-xkb-bin-base=${xorg.xkbcomp}/bin" - "--disable-xmodmap-support" - "${if withDoc then "--enable-gtk-doc" else "--disable-gtk-doc"}" - ]; - - meta = with lib; { - description = "Library providing high-level API for X Keyboard Extension known as XKB"; - homepage = "http://freedesktop.org/wiki/Software/LibXklavier"; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libxklavier/honor-XKB_CONFIG_ROOT.patch b/pkgs/development/libraries/libxklavier/honor-XKB_CONFIG_ROOT.patch deleted file mode 100644 index 93b768eeb202..000000000000 --- a/pkgs/development/libraries/libxklavier/honor-XKB_CONFIG_ROOT.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 999a419f4b36764a7269650a7f965d48bd4b73f7 Mon Sep 17 00:00:00 2001 -From: Louis Bettens <louis@bettens.info> -Date: Sat, 28 Dec 2019 14:30:58 +0100 -Subject: [PATCH] honor $XKB_CONFIG_ROOT - ---- - libxklavier/xklavier_config_xkb.c | 30 +++++++++++++++++++++++++----- - 1 file changed, 25 insertions(+), 5 deletions(-) - -diff --git a/libxklavier/xklavier_config_xkb.c b/libxklavier/xklavier_config_xkb.c -index baec569..00e8de5 100644 ---- a/libxklavier/xklavier_config_xkb.c -+++ b/libxklavier/xklavier_config_xkb.c -@@ -45,6 +45,18 @@ - #define XK_XKB_KEYS - #include <X11/keysymdef.h> - -+static const gchar * -+xkl_xkb_get_base_path(void) -+{ -+ const gchar *base_path; -+ -+ base_path = g_getenv ("XKB_CONFIG_ROOT"); -+ if (!base_path) -+ base_path = XKB_BASE; -+ -+ return base_path; -+} -+ - #ifdef LIBXKBFILE_PRESENT - static XkbRF_RulesPtr xkl_rules; - -@@ -65,7 +77,8 @@ xkl_rules_set_load(XklEngine * engine) - - locale = setlocale(LC_ALL, NULL); - -- g_snprintf(file_name, sizeof file_name, XKB_BASE "/rules/%s", rf); -+ g_snprintf(file_name, sizeof file_name, "%s/rules/%s", -+ xkl_xkb_get_base_path(), rf); - xkl_debug(160, "Loading rules from [%s]\n", file_name); - - rules_set = XkbRF_Load(file_name, locale, True, True); -@@ -98,10 +111,14 @@ gboolean - xkl_xkb_load_config_registry(XklConfigRegistry * config, - gboolean if_extras_needed) - { -- return xkl_config_registry_load_helper(config, -+ const gchar *rules_path = g_strdup_printf("%s/rules", -+ xkl_xkb_get_base_path()); -+ gboolean ok = xkl_config_registry_load_helper(config, - XKB_DEFAULT_RULESET, -- XKB_BASE "/rules", -+ rules_path, - if_extras_needed); -+ g_free(rules_path); -+ return ok; - } - - #ifdef LIBXKBFILE_PRESENT -@@ -249,6 +266,7 @@ xkl_config_get_keyboard(XklEngine * engine, - pid_t cpid, pid; - int status = 0; - FILE *tmpxkb; -+ const gchar *opt_I; - - xkl_debug(150, "tmp XKB/XKM file names: [%s]/[%s]\n", - xkb_fn, xkm_fn); -@@ -296,14 +314,16 @@ xkl_config_get_keyboard(XklEngine * engine, - break; - case 0: - /* child */ -+ opt_I = g_strdup_printf("-I%s", xkl_xkb_get_base_path()); - xkl_debug(160, "Executing %s\n", XKBCOMP); - xkl_debug(160, "%s %s %s %s %s %s %s %s\n", - XKBCOMP, XKBCOMP, "-w0", "-I", -- "-I" XKB_BASE, "-xkm", xkb_fn, -+ opt_I, "-xkm", xkb_fn, - xkm_fn); - execl(XKBCOMP, XKBCOMP, "-w0", "-I", -- "-I" XKB_BASE, "-xkm", xkb_fn, -+ opt_I, "-xkm", xkb_fn, - xkm_fn, NULL); -+ g_free(opt_I); - xkl_debug(0, "Could not exec %s: %d\n", - XKBCOMP, errno); - exit(1); --- -2.24.1 - diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/development/libraries/libxl/default.nix deleted file mode 100644 index 3a6c0ca18edd..000000000000 --- a/pkgs/development/libraries/libxl/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libxl"; - version = "3.9.4.3"; - - src = fetchurl { - url = "https://www.libxl.com/download/${pname}-lin-${version}.tar.gz"; - sha256 = "sha256-U8hXoqBzjSGigOXc29LZQk3KrGiYvBPBJPg5qihcAsY="; - }; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - mkdir $out - cp -rva include_c include_cpp license.txt $out/ - cp -rva lib64 $out/lib - ''; - - meta = with lib; { - description = "Library for parsing Excel files"; - homepage = "https://www.libxl.com/"; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix deleted file mode 100644 index 4c9b77d7c387..000000000000 --- a/pkgs/development/libraries/libxls/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, autoconf-archive }: - -stdenv.mkDerivation rec { - pname = "libxls"; - version = "1.6.2"; - - src = fetchFromGitHub { - owner = "libxls"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-vjmYByk+IDBon8xGR1+oNaEQTiJK+IVpDXsG1IyVNoY="; - }; - - patches = [ - # Fix cross-compilation - (fetchpatch { - url = "https://github.com/libxls/libxls/commit/007e63c1f5e19bc73292f267c85d7dd14e9ecb38.patch"; - sha256 = "sha256-PjPHuXth4Yaq9nVfk5MYJMRo5B0R6YA1KEqgwfjF3PM="; - }) - ]; - - nativeBuildInputs = [ autoreconfHook autoconf-archive ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Extract Cell Data From Excel xls files"; - homepage = "https://github.com/libxls/libxls"; - license = licenses.bsd2; - maintainers = with maintainers; [ abbradar ]; - mainProgram = "xls2csv"; - platforms = platforms.unix; - knownVulnerabilities = [ - "CVE-2023-38851" - "CVE-2023-38852" - "CVE-2023-38853" - "CVE-2023-38854" - "CVE-2023-38855" - "CVE-2023-38856" - ]; - }; -} diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix deleted file mode 100644 index b5128c1180e4..000000000000 --- a/pkgs/development/libraries/libxlsxwriter/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, minizip -, python3 -, zlib -}: - -stdenv.mkDerivation rec { - pname = "libxlsxwriter"; - version = "1.1.8"; - - src = fetchFromGitHub { - owner = "jmcnamara"; - repo = "libxlsxwriter"; - rev = "refs/tags/v${version}"; - hash = "sha256-GtH8324whOUizGZTzQtD53WTy4BNPnpTSkCX/iOIolQ="; - }; - - buildInputs = [ - minizip - zlib - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - "USE_SYSTEM_MINIZIP=1" - ]; - - # TEST 428/429 worksheet:worksheet_table15 *** buffer overflow detected ***: terminated - hardeningDisable = [ "fortify3" ]; - - doCheck = true; - - nativeCheckInputs = [ - python3.pkgs.pytest - ]; - - checkTarget = "test"; - - meta = with lib; { - description = "C library for creating Excel XLSX files"; - homepage = "https://libxlsxwriter.github.io/"; - changelog = "https://github.com/jmcnamara/libxlsxwriter/blob/${src.rev}/Changes.txt"; - license = licenses.bsd2; - maintainers = with maintainers; [ dotlambda ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix deleted file mode 100644 index 2446df52a2bc..000000000000 --- a/pkgs/development/libraries/libxmi/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl, libtool }: - -stdenv.mkDerivation rec { - pname = "libxmi"; - version = "1.2"; - - src = fetchurl { - url = "mirror://gnu/libxmi/${pname}-${version}.tar.gz"; - sha256 = "03d4ikh29l38rl1wavb0icw7m5pp7yilnv7bb2k8qij1dinsymlx"; - }; - - CFLAGS = "-std=gnu89"; - - # For the x86_64 GNU/Linux arch to be recognized by 'configure' - preConfigure = "cp ${libtool}/share/libtool/build-aux/config.sub ."; - - meta = { - description = "Library for rasterizing 2-D vector graphics"; - homepage = "https://www.gnu.org/software/libxmi/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 82176e4fab89..6924c71fab66 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxml2"; - version = "2.13.3"; + version = "2.13.4"; outputs = [ "bin" "dev" "out" "devdoc" ] ++ lib.optional pythonSupport "py" @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor finalAttrs.version}/libxml2-${finalAttrs.version}.tar.xz"; - hash = "sha256-CAXXwYDPCcqtcWZsekWKdPBBVhpTKQJFTaUEfYOUgTg="; + hash = "sha256-ZdBC4cgBAkPmF++wKv2iC4XCFgrNv7y1smuAzsZRVlA="; }; strictDeps = true; @@ -49,13 +49,13 @@ stdenv.mkDerivation (finalAttrs: { gettext ] ++ lib.optionals (pythonSupport && python?isPy3 && python.isPy3) [ ncurses - ] ++ lib.optionals (stdenv.isDarwin && pythonSupport && python?isPy2 && python.isPy2) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonSupport && python?isPy2 && python.isPy2) [ libintl ]; propagatedBuildInputs = [ findXMLCatalogs - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ lib.optionals icuSupport [ icu @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && stdenv.hostPlatform.libc != "musl"; - preCheck = lib.optional stdenv.isDarwin '' + preCheck = lib.optional stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH="$PWD/.libs:$DYLD_LIBRARY_PATH" ''; diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix deleted file mode 100644 index a90ae30fec1e..000000000000 --- a/pkgs/development/libraries/libxmlb/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, docbook_xml_dtd_43 -, docbook-xsl-nons -, glib -, gobject-introspection -, gtk-doc -, meson -, ninja -, pkg-config -, python3 -, shared-mime-info -, nixosTests -, xz -, zstd -}: - -stdenv.mkDerivation rec { - pname = "libxmlb"; - version = "0.3.19"; - - outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; - - src = fetchFromGitHub { - owner = "hughsie"; - repo = "libxmlb"; - rev = version; - hash = "sha256-gXLWHkT+h/wvmmi7PyIx16gbeYznVOT7CwuBgF3bjOY="; - }; - - patches = [ - ./installed-tests-path.patch - ]; - - nativeBuildInputs = [ - docbook_xml_dtd_43 - docbook-xsl-nons - gobject-introspection - gtk-doc - meson - ninja - pkg-config - python3 - shared-mime-info - ]; - - buildInputs = [ - glib - xz - zstd - ]; - - mesonFlags = [ - "--libexecdir=${placeholder "out"}/libexec" - "-Dgtkdoc=true" - "-Dinstalled_test_prefix=${placeholder "installedTests"}" - ]; - - preCheck = '' - export XDG_DATA_DIRS=$XDG_DATA_DIRS:${shared-mime-info}/share - ''; - - doCheck = true; - - passthru = { - tests = { - installed-tests = nixosTests.installed-tests.libxmlb; - }; - }; - - meta = with lib; { - description = "Library to help create and query binary XML blobs"; - mainProgram = "xb-tool"; - homepage = "https://github.com/hughsie/libxmlb"; - license = licenses.lgpl21Plus; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libxmlb/installed-tests-path.patch b/pkgs/development/libraries/libxmlb/installed-tests-path.patch deleted file mode 100644 index b35c8dfc8cdf..000000000000 --- a/pkgs/development/libraries/libxmlb/installed-tests-path.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -111,7 +111,7 @@ else - datadir = join_paths(prefix, get_option('datadir')) - libexecdir = join_paths(prefix, get_option('libexecdir')) -- installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name()) -- installed_test_datadir = join_paths(datadir, 'installed-tests', meson.project_name()) -+ installed_test_bindir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name()) -+ installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name()) - endif - - gio = dependency('gio-2.0', version : '>= 2.45.8') ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -3,4 +3,5 @@ option('introspection', type : 'boolean', value : true, description : 'generate - option('tests', type : 'boolean', value : true, description : 'enable tests') - option('stemmer', type : 'boolean', value : false, description : 'enable stemmer support') -+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') - option('cli', type : 'boolean', value : true, description : 'build and install the xb-tool CLI') diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix deleted file mode 100644 index 1cd4e5aa03a9..000000000000 --- a/pkgs/development/libraries/libxmp/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libxmp"; - version = "4.6.0"; - - meta = with lib; { - description = "Extended module player library"; - homepage = "https://xmp.sourceforge.net/"; - longDescription = '' - Libxmp is a library that renders module files to PCM data. It supports - over 90 mainstream and obscure module formats including Protracker (MOD), - Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT). - ''; - license = licenses.lgpl21Plus; - platforms = platforms.all; - }; - - src = fetchurl { - url = "mirror://sourceforge/xmp/libxmp/${pname}-${version}.tar.gz"; - sha256 = "sha256-LTxF/lI7UJB+ieYPmjt/TMmquD7J27p3Q+r/vNyzXqY="; - }; -} diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix deleted file mode 100644 index 205e9425a74e..000000000000 --- a/pkgs/development/libraries/libxnd/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - libndtypes, -}: - -stdenv.mkDerivation { - pname = "libxnd"; - version = "0.2.0-unstable-2023-11-17"; - - src = fetchFromGitHub { - owner = "xnd-project"; - repo = "libxnd"; - rev = "e1a06d9f6175f4f4e1da369b7e907ad6b2952c00"; - hash = "sha256-RWt2Nx0tfMghQES2SM+0jbAU7IunuuTORhBe2tvqVTY="; - }; - - buildInputs = [ libndtypes ]; - - # Override linker with cc (symlink to either gcc or clang) - # Library expects to use cc for linking - configureFlags = [ - # Override linker with cc (symlink to either gcc or clang) - # Library expects to use cc for linking - "LD=${stdenv.cc.targetPrefix}cc" - # needed for tests - "--with-includes=${libndtypes}/include" - "--with-libs=${libndtypes}/lib" - ]; - - # other packages which depend on libxnd seem to expect overflow.h, but - # it doesn't seem to be included in the installed headers. for now this - # works, but the generic name of the header could produce problems - # with collisions down the line. - postInstall = '' - cp libxnd/overflow.h $out/include/overflow.h - ''; - - doCheck = true; - - meta = { - description = "C library for managing typed memory blocks and Python container module"; - homepage = "https://xnd.io/"; - license = lib.licenses.bsdOriginal; - maintainers = with lib.maintainers; [ costrouc ]; - }; -} diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index f86c6068e2da..34092649067c 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxml2.dev libxcrypt - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ] ++ lib.optionals pythonSupport [ libxml2.py diff --git a/pkgs/development/libraries/libxsmm/default.nix b/pkgs/development/libraries/libxsmm/default.nix deleted file mode 100644 index eeb9dcf71b4a..000000000000 --- a/pkgs/development/libraries/libxsmm/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gfortran -, python3, util-linux, which - -, enableStatic ? stdenv.hostPlatform.isStatic -}: - -stdenv.mkDerivation rec { - pname = "libxsmm"; - version = "1.17"; - - src = fetchFromGitHub { - owner = "libxsmm"; - repo = "libxsmm"; - rev = version; - sha256 = "sha256-s/NEFU4IwQPLyPLwMmrrpMDd73q22Sk2BNid/kedawY="; - }; - - # Fixes /build references in the rpath - patches = [ ./rpath.patch ]; - - outputs = [ "out" "dev" "doc" ]; - - nativeBuildInputs = [ - gfortran - python3 - util-linux - which - ]; - - enableParallelBuilding = true; - - dontConfigure = true; - - makeFlags = let - static = if enableStatic then "1" else "0"; - in [ - "OMP=1" - "PREFIX=$(out)" - "STATIC=${static}" - ]; - - postInstall = '' - mkdir -p $dev/lib/pkgconfig - mv $out/lib/*.pc $dev/lib/pkgconfig - - moveToOutput "share/libxsmm" ''${!outputDoc} - ''; - - prePatch = '' - patchShebangs . - ''; - - meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); - description = "Library targeting Intel Architecture for specialized dense and sparse matrix operations, and deep learning primitives"; - mainProgram = "libxsmm_gemm_generator"; - license = licenses.bsd3; - homepage = "https://github.com/hfp/libxsmm"; - platforms = platforms.linux; - maintainers = with lib.maintainers; [ chessai ]; - }; -} diff --git a/pkgs/development/libraries/libxsmm/rpath.patch b/pkgs/development/libraries/libxsmm/rpath.patch deleted file mode 100644 index bd3feca413b7..000000000000 --- a/pkgs/development/libraries/libxsmm/rpath.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile.inc b/Makefile.inc -index 424d7b2e4..87934fee0 100644 ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -918,7 +918,7 @@ ifneq (Darwin,$(UNAME)) - XLNKVERBOSE := --verbose - linkopt = $(if $1,$(XLNKOPT)$(if $2,$1=$(call quote,$2),$1)) - abslibrpath = $(strip $(if $(findstring .$(ILIBEXT),$1)$(wildcard $1/), \ -- $(call linkopt,--rpath,$(call qxdir,$(call qapath,$1))))) -+ $(call linkopt,--rpath,$(PREFIX)/lib))) - XGROUP_BEGIN := $(call linkopt,--start-group) - XGROUP_END := $(call linkopt,--end-group) - ifneq (0,$(ASNEEDED)) diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix deleted file mode 100644 index dc58226edea4..000000000000 --- a/pkgs/development/libraries/libyaml/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, autoreconfHook -}: - -stdenv.mkDerivation rec { - pname = "libyaml"; - version = "0.2.5"; - - src = fetchFromGitHub { - owner = "yaml"; - repo = "libyaml"; - rev = version; - sha256 = "18zsnsxc53pans4a01cs4401a2cjk3qi098hi440pj4zijifgcsb"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ autoreconfHook ]; - - meta = with lib; { - homepage = "https://pyyaml.org/"; - description = "YAML 1.1 parser and emitter written in C"; - license = licenses.mit; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/development/libraries/libykclient/default.nix deleted file mode 100644 index 0f99c86f9392..000000000000 --- a/pkgs/development/libraries/libykclient/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, help2man, curl }: - -stdenv.mkDerivation { - pname = "libykclient"; - version = "unstable-2019-03-18"; - src = fetchFromGitHub { - owner = "Yubico"; - repo = "yubico-c-client"; - rev = "ad9eda6aac4c3f81784607c30b971f4a050b5c2e"; - sha256 = "01b19jgv2lypih6lhw9yjjsfl8q1ahl955vhr2ai8ccshh0050yj"; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config help2man ]; - buildInputs = [ curl ]; - - meta = with lib; { - description = "Yubikey C client library"; - mainProgram = "ykclient"; - homepage = "https://developers.yubico.com/yubico-c-client"; - license = licenses.bsd2; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix deleted file mode 100644 index 8278b3d8a841..000000000000 --- a/pkgs/development/libraries/libykneomgr/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, pcsclite, libzip, help2man }: - -stdenv.mkDerivation rec { - pname = "libykneomgr"; - version = "0.1.8"; - - src = fetchurl { - url = "https://developers.yubico.com/libykneomgr/Releases/${pname}-${version}.tar.gz"; - sha256 = "12gqblz400kr11m1fdr1vvwr85lgy5v55zy0cf782whpk8lyyj97"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pcsclite libzip help2man ]; - - configureFlags = [ - "--with-backend=pcsc" - ]; - - meta = with lib; { - description = "C library to interact with the CCID-part of the Yubikey NEO"; - homepage = "https://developers.yubico.com/libykneomgr"; - license = licenses.bsd3; - mainProgram = "ykneomgr"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/development/libraries/libytnef/default.nix deleted file mode 100644 index 43734b19b890..000000000000 --- a/pkgs/development/libraries/libytnef/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "libytnef"; - version = "2.1.2"; - - src = fetchFromGitHub { - owner = "Yeraze"; - repo = "ytnef"; - rev = "v${version}"; - hash = "sha256-kQb45Da0T7wWi1IivA8Whk+ECL2nyFf7Gc0gK1HKj2c="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Yeraze's TNEF Stream Reader - for winmail.dat files"; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = with maintainers; [ fpletz ]; - }; -} diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix deleted file mode 100644 index 3b05be00d905..000000000000 --- a/pkgs/development/libraries/libyubikey/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libyubikey"; - version = "1.13"; - - src = fetchurl { - url = "https://developers.yubico.com/yubico-c/Releases/${pname}-${version}.tar.gz"; - sha256 = "009l3k2zyn06dbrlja2d4p2vfnzjhlcqxi88v02mlrnb17mx1v84"; - }; - - meta = with lib; { - homepage = "http://opensource.yubico.com/yubico-c/"; - description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)"; - license = licenses.bsd2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libyuv/default.nix b/pkgs/development/libraries/libyuv/default.nix deleted file mode 100644 index 68d3b5ff2789..000000000000 --- a/pkgs/development/libraries/libyuv/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, stdenv -, fetchgit -, cmake -, libjpeg -}: - -stdenv.mkDerivation rec { - pname = "libyuv"; - version = "1787"; # Defined in: include/libyuv/version.h - - src = fetchgit { - url = "https://chromium.googlesource.com/libyuv/libyuv.git"; - rev = "eb6e7bb63738e29efd82ea3cf2a115238a89fa51"; # refs/heads/stable - hash = "sha256-DtRYoaAXb9ZD2OLiKbzKzH5vzuu+Lzu4eHaDgPB9hjU="; - }; - - nativeBuildInputs = [ - cmake - ]; - - # NEON does not work on aarch64, we disable it - cmakeFlags = lib.optionals stdenv.isAarch64 ["-DCMAKE_CXX_FLAGS=-DLIBYUV_DISABLE_NEON"]; - - buildInputs = [ libjpeg ]; - - patches = [ - ./link-library-against-libjpeg.patch - ]; - - postPatch = '' - mkdir -p $out/lib/pkgconfig - cp ${./yuv.pc} $out/lib/pkgconfig/libyuv.pc - - substituteInPlace $out/lib/pkgconfig/libyuv.pc \ - --replace "@PREFIX@" "$out" \ - --replace "@VERSION@" "$version" - ''; - - meta = with lib; { - homepage = "https://chromium.googlesource.com/libyuv/libyuv"; - description = "Open source project that includes YUV scaling and conversion functionality"; - mainProgram = "yuvconvert"; - platforms = platforms.unix; - maintainers = with maintainers; [ leixb ]; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/libyuv/link-library-against-libjpeg.patch b/pkgs/development/libraries/libyuv/link-library-against-libjpeg.patch deleted file mode 100644 index d0f3d2968462..000000000000 --- a/pkgs/development/libraries/libyuv/link-library-against-libjpeg.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 636531ee..af1b0e4e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,6 +39,7 @@ INCLUDE ( FindJPEG ) - if (JPEG_FOUND) - include_directories( ${JPEG_INCLUDE_DIR} ) - target_link_libraries( yuvconvert ${JPEG_LIBRARY} ) -+ target_link_libraries( ${ly_lib_shared} ${JPEG_LIBRARY} ) - add_definitions( -DHAVE_JPEG ) - endif() diff --git a/pkgs/development/libraries/libyuv/yuv.pc b/pkgs/development/libraries/libyuv/yuv.pc deleted file mode 100644 index ecce62ed0efd..000000000000 --- a/pkgs/development/libraries/libyuv/yuv.pc +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@PREFIX@ -exec_prefix=${prefix} -libdir=${prefix}/lib -includedir=${prefix}/include - -Name: yuv -Description: WebM Project Yuv codec implementation -Version: @VERSION@ -Requires: -Conflicts: -Libs: -L${libdir} -lyuv -lm -Libs.private: -lm -lpthread -Cflags: -I${includedir} diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix deleted file mode 100644 index cb7038d5355c..000000000000 --- a/pkgs/development/libraries/libzapojit/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome, gnome-online-accounts, gobject-introspection }: - -stdenv.mkDerivation rec { - pname = "libzapojit"; - version = "0.0.3"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; - }; - - nativeBuildInputs = [ pkg-config intltool gobject-introspection ]; - propagatedBuildInputs = [ glib json-glib librest libsoup gnome-online-accounts ]; # zapojit-0.0.pc - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; - homepage = "https://gitlab.gnome.org/Archive/libzapojit"; - license = licenses.lgpl21Plus; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix deleted file mode 100644 index bb40e05b9e6f..000000000000 --- a/pkgs/development/libraries/libzdb/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{lib, stdenv, fetchurl, sqlite}: - -stdenv.mkDerivation rec -{ - version = "3.4.0"; - pname = "libzdb"; - - src = fetchurl - { - url = "https://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz"; - sha256 = "sha256-q9Z1cZvL3eQwqk7hOXW5gNVdKry1zCKAgqMDIKa7nw8="; - }; - - buildInputs = [ sqlite ]; - - meta = - { - homepage = "http://www.tildeslash.com/libzdb/"; - description = "Small, easy to use Open Source Database Connection Pool Library"; - license = lib.licenses.gpl3; - platforms = lib.platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix deleted file mode 100644 index ecc3736d1fbb..000000000000 --- a/pkgs/development/libraries/libzen/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: - -stdenv.mkDerivation rec { - version = "0.4.41"; - pname = "libzen"; - src = fetchurl { - url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; - sha256 = "sha256-6yN9fT3Kbca6BocZQgon3gk0p4PMrrKGdWKzWvOQHi0="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - configureFlags = [ "--enable-shared" ]; - - sourceRoot = "ZenLib/Project/GNU/Library"; - - preConfigure = "sh autogen.sh"; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Shared library for libmediainfo and mediainfo"; - homepage = "https://mediaarea.net/"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = [ maintainers.devhell ]; - }; -} diff --git a/pkgs/development/libraries/libzim/default.nix b/pkgs/development/libraries/libzim/default.nix deleted file mode 100644 index 83a225576e06..000000000000 --- a/pkgs/development/libraries/libzim/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - icu, - meson, - ninja, - pkg-config, - python3, - xapian, - xz, - zstd, -}: - -stdenv.mkDerivation rec { - pname = "libzim"; - version = "9.2.3"; - - src = fetchFromGitHub { - owner = "openzim"; - repo = "libzim"; - rev = "refs/tags/${version}"; - hash = "sha256-z22+cDlFQtLMLFh5+7Nt9LsGFyBPi3HeZhYb0LK86Oc="; - }; - - nativeBuildInputs = [ - ninja - meson - pkg-config - python3 - ]; - - buildInputs = [ - icu - zstd - ]; - - propagatedBuildInputs = [ - xapian - xz - ]; - - postPatch = '' - patchShebangs scripts - ''; - - mesonFlags = [ - # Tests are located at https://github.com/openzim/zim-testing-suite - # "...some tests need up to 16GB of memory..." - "-Dtest_data_dir=none" - ]; - - meta = with lib; { - description = "Reference implementation of the ZIM specification"; - homepage = "https://github.com/openzim/libzim"; - changelog = "https://github.com/openzim/libzim/releases/tag/${version}"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix deleted file mode 100644 index 453722ccf49b..000000000000 --- a/pkgs/development/libraries/libzip/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib, stdenv -, cmake -, fetchpatch2 -, fetchurl -, perl -, zlib -, groff -, withBzip2 ? false -, bzip2 -, withLZMA ? false -, xz -, withOpenssl ? false -, openssl -, withZstd ? false -, zstd -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libzip"; - version = "1.10.1"; - - src = fetchurl { - url = "https://libzip.org/download/libzip-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-lmmuXf46xbOJdTbchGaodMjPLA47H90I11snOIQpk2M="; - }; - - patches = [ - # https://github.com/nih-at/libzip/issues/404 - (fetchpatch2 { - name = "Check-for-zstd_TARGET-before-using-it-in-a-regex.patch"; - url = "https://github.com/nih-at/libzip/commit/c719428916b4d19e838f873b1a177b126a080d61.patch"; - hash = "sha256-4ksbXEM8kNvs3wtbIaXLEQNSKaxl0es/sIg0EINaTHE="; - }) - ]; - - outputs = [ "out" "dev" "man" ]; - - nativeBuildInputs = [ cmake perl groff ]; - propagatedBuildInputs = [ zlib ]; - buildInputs = lib.optionals withLZMA [ xz ] - ++ lib.optionals withBzip2 [ bzip2 ] - ++ lib.optionals withOpenssl [ openssl ] - ++ lib.optionals withZstd [ zstd ]; - - # Don't build the regression tests because they don't build with - # pkgsStatic and are not executed anyway. - cmakeFlags = [ "-DBUILD_REGRESS=0" ]; - - preCheck = '' - # regress/runtest is a generated file - patchShebangs regress - ''; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = with lib; { - homepage = "https://libzip.org/"; - description = "C library for reading, creating and modifying zip archives"; - license = licenses.bsd3; - pkgConfigModules = [ "libzip" ]; - platforms = platforms.unix; - changelog = "https://github.com/nih-at/libzip/blob/v${finalAttrs.version}/NEWS.md"; - }; -}) diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix deleted file mode 100644 index 0e139ad52926..000000000000 --- a/pkgs/development/libraries/libzmf/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{lib, stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkg-config, cppunit}: - -stdenv.mkDerivation rec { - pname = "libzmf"; - version = "0.0.2"; - - src = fetchurl { - url = "http://dev-www.libreoffice.org/src/libzmf/${pname}-${version}.tar.xz"; - sha256 = "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197"; - }; - - buildInputs = [ boost icu libpng librevenge zlib cppunit ]; - nativeBuildInputs = [ doxygen pkg-config ]; - configureFlags = [ "--disable-werror" ]; - - meta = { - description = "Library that parses the file format of Zoner Callisto/Draw documents"; - license = lib.licenses.mpl20; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.unix; - homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libzmf"; - downloadPage = "http://dev-www.libreoffice.org/src/libzmf/"; - }; -} diff --git a/pkgs/development/libraries/libzra/default.nix b/pkgs/development/libraries/libzra/default.nix deleted file mode 100644 index 163389fb11ac..000000000000 --- a/pkgs/development/libraries/libzra/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "libzra"; - version = "unstable-2020-09-11"; - - src = fetchFromGitHub { - owner = "zraorg"; - repo = "zra"; - rev = "57abf2774dfc4624f14a0bc5bba71f044ce54a38"; - sha256 = "10rlqj6ma02005gdcp57wp48d6cg0vkbv4vl9ai0zlgxyx1g6kc4"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ cmake ]; - - # in submodule dev as of 1.4.7 - postPatch = '' - (cd submodule/zstd && patch -Np1 < ${./fix-pkg-config.patch}) - ''; - - meta = with lib; { - homepage = "https://github.com/zraorg/ZRA"; - description = "Library for ZStandard random access"; - platforms = platforms.all; - maintainers = [ ]; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/libzra/fix-pkg-config.patch b/pkgs/development/libraries/libzra/fix-pkg-config.patch deleted file mode 100644 index 5b0d40a4233f..000000000000 --- a/pkgs/development/libraries/libzra/fix-pkg-config.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 7be7e35d61d8d499599623502a35460d410de114 Mon Sep 17 00:00:00 2001 -From: Alexander Shpilkin <ashpilkin@gmail.com> -Date: Thu, 26 May 2022 16:03:27 +0300 -Subject: [PATCH] Squashed commit of the following: - -commit 9aacb9d5da65a64c3845937a6f9eede329d43989 -Author: W. Felix Handte <w@felixhandte.com> -Date: Tue Dec 8 20:46:02 2020 -0500 - - Apply Same Strategy to CMake - - (cherry picked from commit a75f9ce3e924564ab358c2c1aa95b6268383ec42) - -commit e21b7ad0d98d1322ea92f99fcd1f85e2d6b6f6b7 -Author: W. Felix Handte <w@felixhandte.com> -Date: Tue Dec 8 20:10:05 2020 -0500 - - Avoid Use of Regexes in Building Package-Config File - - (cherry picked from commit b521183c74795bd9bdd9bdebe74af01cae4d3d43) ---- - build/cmake/lib/CMakeLists.txt | 29 ++++++++++++++++++++++++---- - lib/Makefile | 35 ++++++++++++++++------------------ - lib/libzstd.pc.in | 6 +++--- - 3 files changed, 44 insertions(+), 26 deletions(-) - -diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt -index 32ae7525..466c2c7b 100644 ---- a/build/cmake/lib/CMakeLists.txt -+++ b/build/cmake/lib/CMakeLists.txt -@@ -137,12 +137,33 @@ endif () - if (UNIX) - # pkg-config - set(PREFIX "${CMAKE_INSTALL_PREFIX}") -- set(LIBDIR "${CMAKE_INSTALL_LIBDIR}") -- set(INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}") -+ set(EXEC_PREFIX "\\$$\{prefix}") -+ set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}") -+ set(INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}") - set(VERSION "${zstd_VERSION}") -+ -+ string(LENGTH "${PREFIX}" PREFIX_LENGTH) -+ string(SUBSTRING "${LIBDIR}" 0 ${PREFIX_LENGTH} LIBDIR_PREFIX) -+ string(SUBSTRING "${LIBDIR}" ${PREFIX_LENGTH} -1 LIBDIR_SUFFIX) -+ string(SUBSTRING "${INCLUDEDIR}" 0 ${PREFIX_LENGTH} INCLUDEDIR_PREFIX) -+ string(SUBSTRING "${INCLUDEDIR}" ${PREFIX_LENGTH} -1 INCLUDEDIR_SUFFIX) -+ -+ if ("${INCLUDEDIR_PREFIX}" STREQUAL "${PREFIX}") -+ set(INCLUDEDIR_PREFIX "\\$$\{prefix}") -+ endif() -+ if ("${LIBDIR_PREFIX}" STREQUAL "${PREFIX}") -+ set(LIBDIR_PREFIX "\\$$\{exec_prefix}") -+ endif() -+ - add_custom_target(libzstd.pc ALL -- ${CMAKE_COMMAND} -DIN="${LIBRARY_DIR}/libzstd.pc.in" -DOUT="libzstd.pc" -- -DPREFIX="${PREFIX}" -DLIBDIR="${LIBDIR}" -DINCLUDEDIR="${INCLUDEDIR}" -DVERSION="${VERSION}" -+ ${CMAKE_COMMAND} -+ -DIN="${LIBRARY_DIR}/libzstd.pc.in" -+ -DOUT="libzstd.pc" -+ -DPREFIX="${PREFIX}" -+ -DEXEC_PREFIX="${EXEC_PREFIX}" -+ -DINCLUDEDIR="${INCLUDEDIR_PREFIX}${INCLUDEDIR_SUFFIX}" -+ -DLIBDIR="${LIBDIR_PREFIX}${LIBDIR_SUFFIX}" -+ -DVERSION="${VERSION}" - -P "${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig.cmake" - COMMENT "Creating pkg-config file") - -diff --git a/lib/Makefile b/lib/Makefile -index 4a9ab799..2893ec21 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -257,6 +257,8 @@ ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD Ne - - all: libzstd.pc - -+HAS_EXPLICIT_EXEC_PREFIX := $(if $(or $(EXEC_PREFIX),$(exec_prefix)),1,) -+ - DESTDIR ?= - # directory variables : GNU conventions prefer lowercase - # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html -@@ -270,24 +272,17 @@ LIBDIR ?= $(libdir) - includedir ?= $(PREFIX)/include - INCLUDEDIR ?= $(includedir) - --PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n $(SED_ERE_OPT) -e "s@^$(EXEC_PREFIX)(/|$$)@@p") --PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n $(SED_ERE_OPT) -e "s@^$(PREFIX)(/|$$)@@p") -+PCINCDIR := $(patsubst $(PREFIX)%,%,$(INCLUDEDIR)) -+PCLIBDIR := $(patsubst $(EXEC_PREFIX)%,%,$(LIBDIR)) - --ifeq (,$(PCLIBDIR)) --# Additional prefix check is required, since the empty string is technically a --# valid PCLIBDIR --ifeq (,$(shell echo "$(LIBDIR)" | sed -n $(SED_ERE_OPT) -e "\\@^$(EXEC_PREFIX)(/|$$)@ p")) --$(error configured libdir ($(LIBDIR)) is outside of prefix ($(PREFIX)), can't generate pkg-config file) --endif --endif -+# If we successfully stripped off a prefix, we'll add a reference to the -+# relevant pc variable. -+PCINCPREFIX := $(if $(findstring $(INCLUDEDIR),$(PCINCDIR)),,$${prefix}) -+PCLIBPREFIX := $(if $(findstring $(LIBDIR),$(PCLIBDIR)),,$${exec_prefix}) - --ifeq (,$(PCINCDIR)) --# Additional prefix check is required, since the empty string is technically a --# valid PCINCDIR --ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n $(SED_ERE_OPT) -e "\\@^$(PREFIX)(/|$$)@ p")) --$(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(EXEC_PREFIX)), can't generate pkg-config file) --endif --endif -+# If no explicit EXEC_PREFIX was set by the caller, write it out as a reference -+# to PREFIX, rather than as a resolved value. -+PCEXEC_PREFIX := $(if $(HAS_EXPLICIT_EXEC_PREFIX),$(EXEC_PREFIX),$${prefix}) - - ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly)) - PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig -@@ -308,9 +303,11 @@ INSTALL_DATA ?= $(INSTALL) -m 644 - libzstd.pc: - libzstd.pc: libzstd.pc.in - @echo creating pkgconfig -- $(Q)@sed $(SED_ERE_OPT) -e 's|@PREFIX@|$(PREFIX)|' \ -- -e 's|@LIBDIR@|$(PCLIBDIR)|' \ -- -e 's|@INCLUDEDIR@|$(PCINCDIR)|' \ -+ $(Q)@sed $(SED_ERE_OPT) \ -+ -e 's|@PREFIX@|$(PREFIX)|' \ -+ -e 's|@EXEC_PREFIX@|$(PCEXEC_PREFIX)|' \ -+ -e 's|@INCLUDEDIR@|$(PCINCPREFIX)$(PCINCDIR)|' \ -+ -e 's|@LIBDIR@|$(PCLIBPREFIX)$(PCLIBDIR)|' \ - -e 's|@VERSION@|$(VERSION)|' \ - $< >$@ - -diff --git a/lib/libzstd.pc.in b/lib/libzstd.pc.in -index 8ec0235a..8465c977 100644 ---- a/lib/libzstd.pc.in -+++ b/lib/libzstd.pc.in -@@ -3,9 +3,9 @@ - # BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) - - prefix=@PREFIX@ --exec_prefix=${prefix} --includedir=${prefix}/@INCLUDEDIR@ --libdir=${exec_prefix}/@LIBDIR@ -+exec_prefix=@EXEC_PREFIX@ -+includedir=@INCLUDEDIR@ -+libdir=@LIBDIR@ - - Name: zstd - Description: fast lossless compression algorithm library --- -2.36.0 - diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index 1f7e8fdf2c49..1cb0da700732 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ninja ]; - # Not a propagatedBuildInput because only the $py output needs it; $out is + # Not in propagatedBuildInputs because only the $py output needs it; $out is # just the library itself (e.g. C/C++ headers). buildInputs = with python.pkgs; [ python @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { scikit-build-core ]; - env.CXXFLAGS = toString (lib.optional stdenv.isDarwin [ "-faligned-allocation" "-fno-aligned-new" "-fvisibility=hidden" ]); + env.CXXFLAGS = toString (lib.optional stdenv.hostPlatform.isDarwin [ "-faligned-allocation" "-fno-aligned-new" "-fvisibility=hidden" ]); postBuild = '' pushd ../api/python diff --git a/pkgs/development/libraries/lightgbm/default.nix b/pkgs/development/libraries/lightgbm/default.nix deleted file mode 100644 index 4aa28f6461e1..000000000000 --- a/pkgs/development/libraries/lightgbm/default.nix +++ /dev/null @@ -1,155 +0,0 @@ -{ config, stdenv, lib, fetchFromGitHub, cmake, gtest, doCheck ? true -, cudaSupport ? config.cudaSupport or false, openclSupport ? false -, mpiSupport ? false, javaWrapper ? false, hdfsSupport ? false, pythonLibrary ? false -, rLibrary ? false, cudaPackages, opencl-headers, ocl-icd, boost -, llvmPackages, openmpi, openjdk, swig, hadoop, R, rPackages, pandoc }: - -assert doCheck -> !mpiSupport; -assert openclSupport -> !cudaSupport; -assert cudaSupport -> !openclSupport; - -stdenv.mkDerivation rec { - pnameBase = "lightgbm"; - # prefix with r when building the R library - # The R package build results in a special binary file - # that contains a subset of the .so file use for the CLI - # and python version. In general, the CRAN version from - # nixpkgs's r-modules should be used, but this non-standard - # build allows for enabling CUDA support and other features - # which aren't included in the CRAN release. Build with: - # nix-build -E "with (import $NIXPKGS{}); \ - # let \ - # lgbm = lightgbm.override{rLibrary = true; doCheck = false;}; \ - # in \ - # rWrapper.override{ packages = [ lgbm ]; }" - pname = lib.optionalString rLibrary "r-" + pnameBase; - version = "4.5.0"; - - src = fetchFromGitHub { - owner = "microsoft"; - repo = pnameBase; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-nST6+/c3Y4/hqwgEUhx03gWtjxhlmUu1XKDCy2pSsvU="; - }; - - nativeBuildInputs = [ cmake ] - ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ] - ++ lib.optionals openclSupport [ opencl-headers ocl-icd boost ] - ++ lib.optionals mpiSupport [ openmpi ] - ++ lib.optionals hdfsSupport [ hadoop ] - ++ lib.optionals (hdfsSupport || javaWrapper) [ openjdk ] - ++ lib.optionals javaWrapper [ swig ] - ++ lib.optionals rLibrary [ R pandoc ]; - - buildInputs = [ gtest ] - ++ lib.optional cudaSupport cudaPackages.cudatoolkit; - - propagatedBuildInputs = lib.optionals rLibrary [ - rPackages.data_table - rPackages.markdown - rPackages.rmarkdown - rPackages.jsonlite - rPackages.Matrix - rPackages.R6 - ]; - - # Skip APPLE in favor of linux build for .so files - postPatch = '' - export PROJECT_SOURCE_DIR=./ - substituteInPlace CMakeLists.txt \ - --replace "find_package(GTest CONFIG)" "find_package(GTest REQUIRED)" \ - --replace "OpenCL_INCLUDE_DIRS}" "OpenCL_INCLUDE_DIRS}" \ - --replace "elseif(APPLE)" "elseif(APPLESKIP)" - substituteInPlace \ - external_libs/compute/include/boost/compute/cl.hpp \ - external_libs/compute/include/boost/compute/cl_ext.hpp \ - --replace "include <OpenCL/" "include <CL/" - substituteInPlace build_r.R \ - --replace "shQuote(normalizePath" "shQuote(type = 'cmd', string = normalizePath" \ - --replace "file.path(getwd(), \"lightgbm_r\")" "'$out/tmp'" \ - --replace \ - "install_args <- c(\"CMD\", \"INSTALL\", \"--no-multiarch\", \"--with-keep.source\", tarball)" \ - "install_args <- c(\"CMD\", \"INSTALL\", \"--no-multiarch\", \"--with-keep.source\", \"-l $out/library\", tarball)" - - # Retry this test in next release. Something fails in the setup, so GTEST_FILTER is not enough - rm tests/cpp_tests/test_arrow.cpp - ''; - - cmakeFlags = lib.optionals doCheck [ "-DBUILD_CPP_TEST=ON" ] - ++ lib.optionals cudaSupport [ "-DUSE_CUDA=1" "-DCMAKE_CXX_COMPILER=${cudaPackages.backendStdenv.cc}/bin/cc" ] - ++ lib.optionals openclSupport [ "-DUSE_GPU=ON" ] - ++ lib.optionals mpiSupport [ "-DUSE_MPI=ON" ] - ++ lib.optionals hdfsSupport [ - "-DUSE_HDFS=ON" - "-DHDFS_LIB=${hadoop}/lib/hadoop-${hadoop.version}/lib/native/libhdfs.so" - "-DHDFS_INCLUDE_DIR=${hadoop}/lib/hadoop-${hadoop.version}/include" ] - ++ lib.optionals javaWrapper [ - "-DUSE_SWIG=ON" - # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" ] - ++ lib.optionals rLibrary [ "-D__BUILD_FOR_R=ON" ] - ++ lib.optionals pythonLibrary [ "-D__BUILD_FOR_PYTHON=ON" ]; - - configurePhase = lib.optionals rLibrary '' - export R_LIBS_SITE="$out/library:$R_LIBS_SITE''${R_LIBS_SITE:+:}" - ''; - - # set the R package buildPhase to null because lightgbm has a - # custom builder script that builds and installs in one step - buildPhase = lib.optionals rLibrary '' - ''; - - inherit doCheck; - - installPhase = '' - runHook preInstall - '' + lib.optionalString (!rLibrary) '' - mkdir -p $out - mkdir -p $out/lib - mkdir -p $out/bin - cp -r ../include $out - install -Dm755 ../lib_lightgbm${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/lib_lightgbm${stdenv.hostPlatform.extensions.sharedLibrary} - '' + lib.optionalString (!rLibrary && !pythonLibrary) '' - install -Dm755 ../lightgbm $out/bin/lightgbm - '' + lib.optionalString javaWrapper '' - cp -r java $out - cp -r com $out - cp -r lightgbmlib.jar $out - '' + '' - '' + lib.optionalString rLibrary '' - mkdir $out - mkdir $out/tmp - mkdir $out/library - mkdir $out/library/lightgbm - '' + lib.optionalString (rLibrary && (!openclSupport)) '' - Rscript build_r.R \ - -j$NIX_BUILD_CORES - rm -rf $out/tmp - '' + lib.optionalString (rLibrary && openclSupport) '' - Rscript build_r.R --use-gpu \ - --opencl-library=${ocl-icd}/lib/libOpenCL.so \ - --opencl-include-dir=${opencl-headers}/include \ - --boost-librarydir=${boost} \ - -j$NIX_BUILD_CORES - rm -rf $out/tmp - '' + '' - runHook postInstall - ''; - - postFixup = lib.optionalString rLibrary '' - if test -e $out/nix-support/propagated-build-inputs; then - ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages - fi - ''; - - meta = with lib; { - description = - "LightGBM is a gradient boosting framework that uses tree based learning algorithms."; - mainProgram = "lightgbm"; - homepage = "https://github.com/microsoft/LightGBM"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ nviets ]; - }; -} diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix deleted file mode 100644 index d40ac0a05c54..000000000000 --- a/pkgs/development/libraries/lime/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ bctoolbox -, belle-sip -, cmake -, fetchFromGitLab -, lib -, bc-soci -, sqlite -, stdenv -}: - -stdenv.mkDerivation rec { - pname = "lime"; - version = "5.2.98"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = pname; - rev = version; - hash = "sha256-LdwXBJpwSA/PoCXL+c1pcX1V2Fq/eR6nNmwBKDM1Vr8="; - }; - - buildInputs = [ - # Made by BC - bctoolbox - belle-sip - - # Vendored by BC - bc-soci - - sqlite - ]; - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DENABLE_STATIC=NO" # Do not build static libraries - "-DENABLE_UNIT_TESTS=NO" # Do not build test executables - ]; - - meta = with lib; { - description = "End-to-end encryption library for instant messaging. Part of the Linphone project"; - homepage = "https://www.linphone.org/technical-corner/lime"; - license = licenses.gpl3Only; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix deleted file mode 100644 index ed199914e640..000000000000 --- a/pkgs/development/libraries/linbox/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, fetchpatch -, autoreconfHook -, givaro -, pkg-config -, blas -, lapack -, fflas-ffpack -, gmpxx -}: - -assert (!blas.isILP64) && (!lapack.isILP64); - -stdenv.mkDerivation rec { - pname = "linbox"; - version = "1.7.0"; - - src = fetchFromGitHub { - owner = "linbox-team"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-mW84a98KPLqcHMjX3LIYTmVe0ngUdz6RJLpoDaAqKU8="; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/linbox-team/linbox/commit/4be26e9ef0eaf36a9909e5008940e8bf7dc625b6.patch"; - sha256 = "PX0Tik7blXOV2vHUq92xMxaADkNoNGiax4qrjQyGK6U="; - }) - ]; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ - givaro - blas - gmpxx - fflas-ffpack - ]; - - configureFlags = [ - "--with-blas-libs=-lblas" - "--without-archnative" - ] ++ lib.optionals stdenv.isx86_64 [ - # disable SIMD instructions (which are enabled *when available* by default) - "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" - "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" - "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41" - "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42" - "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx" - "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2" - "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma" - "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4" - ]; - - # https://github.com/linbox-team/linbox/issues/304 - hardeningDisable = [ "fortify3" ]; - - doCheck = true; - - enableParallelBuilding = true; - - meta = with lib; { - description = "C++ library for exact, high-performance linear algebra"; - mainProgram = "linbox-config"; - license = licenses.lgpl21Plus; - maintainers = teams.sage.members; - platforms = platforms.unix; - homepage = "https://linalg.org/"; - }; -} diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix deleted file mode 100644 index c52b7085796c..000000000000 --- a/pkgs/development/libraries/linenoise-ng/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "linenoise-ng"; - version = "1.0.1"; - - src = fetchFromGitHub { - owner = "arangodb"; - repo = "linenoise-ng"; - rev = "v${version}"; - sha256 = "176iz0kj0p8d8i3jqps4z8xkxwl3f1986q88i9xg5fvqgpzsxp20"; - }; - - nativeBuildInputs = [ cmake ]; - - 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 = [ ]; - platforms = lib.platforms.all; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix deleted file mode 100644 index a525a3da9a41..000000000000 --- a/pkgs/development/libraries/linenoise/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, validatePkgConfig -, fixDarwinDylibNames -}: - -stdenv.mkDerivation { - pname = "linenoise"; - version = "1.0-34-g93b2db9"; - - src = fetchFromGitHub { - owner = "antirez"; - repo = "linenoise"; - rev = "1.0-34-g93b2db9"; - hash = "sha256-GsrYg16gpjHkkmpCU3yGzqNS/buZl+JoWALLvwzmT4A="; - }; - - nativeBuildInputs = [ validatePkgConfig ] - ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; - - buildPhase = '' - runHook preBuild - - $CC -c -o linenoise.o linenoise.c - $CC -shared -o liblinenoise.so linenoise.o - $AR rcs liblinenoise.a linenoise.o - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -d $out/lib/pkgconfig $out/include - install -m644 linenoise.h $out/include/ - install -m644 liblinenoise.a $out/lib/ - install -m644 liblinenoise.so $out/lib/ - substituteAll ${./linenoise.pc.in} $out/lib/pkgconfig/linenoise.pc - - runHook postInstall - ''; - - meta = { - homepage = "https://github.com/antirez/linenoise"; - description = "Minimal, zero-config, BSD licensed, readline replacement"; - maintainers = with lib.maintainers; [ fstamour remexre ]; - platforms = lib.platforms.unix; - license = lib.licenses.bsd2; - }; -} diff --git a/pkgs/development/libraries/linenoise/linenoise.pc.in b/pkgs/development/libraries/linenoise/linenoise.pc.in deleted file mode 100644 index feb917dab0d9..000000000000 --- a/pkgs/development/libraries/linenoise/linenoise.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@out@ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: linenoise -Description: A minimal, zero-config, BSD licensed, readline replacement. -Version: @version@ -Libs: -L${libdir} -llinenoise -Cflags: -I${includedir} diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index 6667aa4882e0..0700b645e30a 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-3UKAwhYaYZ42+d+wiW/AB6x5TSOel8d++d3HeZqAg/8="; }; - configureFlags = lib.optionals stdenv.isDarwin [ "LIBTOOL=${cctools}/bin/libtool" ]; + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "LIBTOOL=${cctools}/bin/libtool" ]; nativeBuildInputs = [ autoreconfHook ] - ++ lib.optionals stdenv.isDarwin [ cctools autoSignDarwinBinariesHook fixDarwinDylibNames ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools autoSignDarwinBinariesHook fixDarwinDylibNames ]; meta = { homepage = "https://liquidsdr.org/"; diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix deleted file mode 100644 index 6ab138016d19..000000000000 --- a/pkgs/development/libraries/liquidfun/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, requireFile, cmake, libGLU, libGL, libX11, libXi }: - -stdenv.mkDerivation rec { - pname = "liquidfun"; - version = "1.1.0"; - - src = requireFile { - url = "https://github.com/google/liquidfun/releases/download/v${version}/liquidfun-${version}"; - sha256 = "5011a000eacd6202a47317c489e44aa753a833fb562d970e7b8c0da9de01df86"; - name = "liquidfun-${version}.tar.gz"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libGLU libGL libX11 libXi ]; - - sourceRoot = "liquidfun/Box2D"; - - preConfigurePhases = "preConfigure"; - - preConfigure = '' - sed -i Box2D/Common/b2Settings.h -e 's@b2_maxPolygonVertices .*@b2_maxPolygonVertices 15@' - substituteInPlace Box2D/CMakeLists.txt --replace "Common/b2GrowableStack.h" "Common/b2GrowableStack.h Common/b2GrowableBuffer.h" - ''; - - configurePhase = '' - mkdir Build - cd Build; - cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=$out .. - ''; - - meta = with lib; { - description = "2D physics engine based on Box2D"; - maintainers = with maintainers; [ qknight ]; - platforms = platforms.linux; - hydraPlatforms = [ ]; - license = licenses.bsd2; - homepage = "https://google.github.io/liquidfun/"; - }; -} diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix deleted file mode 100644 index 80c9d1f1d810..000000000000 --- a/pkgs/development/libraries/lirc/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, autoreconfHook -, pkg-config -, help2man -, python3 -, linuxHeaders - -, alsa-lib -, libxslt -, systemd -, libusb-compat-0_1 -, libftdi1 -, libICE -, libSM -, libX11 -}: - -let - pythonEnv = python3.pythonOnBuildForHost.withPackages (p: with p; [ pyyaml setuptools ]); -in -stdenv.mkDerivation rec { - pname = "lirc"; - version = "0.10.2"; - - src = fetchurl { - url = "mirror://sourceforge/lirc/${pname}-${version}.tar.bz2"; - sha256 = "sha256-PUTsgnSIHPJi8WCAVkHwgn/8wgreDYXn5vO5Dg09Iio="; - }; - - patches = [ - # Fix installation of Python bindings - (fetchpatch { - url = "https://sourceforge.net/p/lirc/tickets/339/attachment/0001-Fix-Python-bindings.patch"; - sha256 = "088a39x8c1qd81qwvbiqd6crb2lk777wmrs8rdh1ga06lglyvbly"; - }) - - # Add a workaround for linux-headers-5.18 until upstream adapts: - # https://sourceforge.net/p/lirc/git/merge-requests/45/ - ./linux-headers-5.18.patch - ]; - - postPatch = '' - patchShebangs . - - # fix overriding PYTHONPATH - sed -i 's,^PYTHONPATH *= *,PYTHONPATH := $(PYTHONPATH):,' \ - Makefile.in - sed -i 's,PYTHONPATH=,PYTHONPATH=$(PYTHONPATH):,' \ - doc/Makefile.in - - # Pull fix for new pyyaml pending upstream inclusion - # https://sourceforge.net/p/lirc/git/merge-requests/39/ - substituteInPlace python-pkg/lirc/database.py --replace 'yaml.load(' 'yaml.safe_load(' - - # cant import '/build/lirc-0.10.1/python-pkg/lirc/_client.so' while cross-compiling to check the version - substituteInPlace python-pkg/setup.py \ - --replace "VERSION='0.0.0'" "VERSION='${version}'" - ''; - - preConfigure = '' - export PKGCONFIG="$PKG_CONFIG" - ''; - - strictDeps = true; - - nativeBuildInputs = [ autoreconfHook help2man libxslt pythonEnv pkg-config ]; - - buildInputs = [ alsa-lib systemd libusb-compat-0_1 libftdi1 libICE libSM libX11 ]; - - DEVINPUT_HEADER = "${linuxHeaders}/include/linux/input-event-codes.h"; - - configureFlags = [ - "--sysconfdir=/etc" - "--localstatedir=/var" - "--with-systemdsystemunitdir=$(out)/lib/systemd/system" - "--enable-uinput" # explicit activation because build env has no uinput - "--enable-devinput" # explicit activation because build env has no /dev/input - "--with-lockdir=/run/lirc/lock" # /run/lock is not writable for 'lirc' user - "PYTHON=${pythonEnv.interpreter}" - ]; - - installFlags = [ - "sysconfdir=$out/etc" - "localstatedir=$TMPDIR" - ]; - - meta = with lib; { - description = "Allows to receive and send infrared signals"; - homepage = "https://www.lirc.org/"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ pSub ]; - }; -} diff --git a/pkgs/development/libraries/lirc/linux-headers-5.18.patch b/pkgs/development/libraries/lirc/linux-headers-5.18.patch deleted file mode 100644 index 733c423b7a83..000000000000 --- a/pkgs/development/libraries/lirc/linux-headers-5.18.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/daemons/lircd.cpp -+++ b/daemons/lircd.cpp -@@ -110,6 +110,17 @@ int clock_gettime(int clk_id, struct timespec *t){ - #endif - #define WHITE_SPACE " \t" - -+/* Defines removed in linux-headers-5.18: -+ https://sourceforge.net/p/lirc/git/merge-requests/45/ -+ */ -+#ifndef LIRC_CAN_SET_REC_FILTER -+# define LIRC_CAN_SET_REC_FILTER 0x08000000 -+#endif -+ -+#ifndef LIRC_CAN_NOTIFY_DECODE -+# define LIRC_CAN_NOTIFY_DECODE 0x01000000 -+#endif -+ - static const logchannel_t logchannel = LOG_APP; - - /** How long we sleep while waiting for busy write sockets. */ ---- a/tools/lirc-lsplugins.cpp -+++ b/tools/lirc-lsplugins.cpp -@@ -21,6 +21,12 @@ - #include "config.h" - #include "lirc_private.h" - -+/* Defines removed in linux-headers-5.18: -+ https://sourceforge.net/p/lirc/git/merge-requests/45/ -+ */ -+#ifndef LIRC_CAN_NOTIFY_DECODE -+# define LIRC_CAN_NOTIFY_DECODE 0x01000000 -+#endif - - #define USAGE \ - "\nSynopsis:\n" \ diff --git a/pkgs/development/libraries/litehtml/default.nix b/pkgs/development/libraries/litehtml/default.nix deleted file mode 100644 index b7626733210d..000000000000 --- a/pkgs/development/libraries/litehtml/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gumbo -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "litehtml"; - version = "0.9"; - - src = fetchFromGitHub { - owner = "litehtml"; - repo = "litehtml"; - rev = "v${finalAttrs.version}"; - hash = "sha256-ZE/HKzo3ejKpW/ih3sJwn2hzCtsBhAXeJWGezYd6Yc4"; - }; - - # Don't search for non-existant gumbo cmake config - # This will mislead cmake that litehtml is not found - # Affects build of pkgs that depend on litehtml - postPatch = '' - substituteInPlace cmake/litehtmlConfig.cmake \ - --replace-fail "find_dependency(gumbo)" "" - ''; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - gumbo - ]; - - cmakeFlags = [ - "-DEXTERNAL_GUMBO=ON" - # BuildTesting need to download test data online - "-DLITEHTML_BUILD_TESTING=OFF" - ]; - - meta = with lib; { - description = "Fast and lightweight HTML/CSS rendering engine"; - homepage = "http://www.litehtml.com/"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ fgaz ]; - }; -}) diff --git a/pkgs/development/libraries/llhttp/default.nix b/pkgs/development/libraries/llhttp/default.nix deleted file mode 100644 index dfdd8200b556..000000000000 --- a/pkgs/development/libraries/llhttp/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, testers, python3 }: - -stdenv.mkDerivation (finalAttrs: { - pname = "llhttp"; - version = "9.2.1"; - - src = fetchFromGitHub { - owner = "nodejs"; - repo = "llhttp"; - rev = "release/v${finalAttrs.version}"; - hash = "sha256-cnEp7Ds32bqu3jeUU/rqJOr/VW3KNmJU4pmNNaTpXRs="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - cmake - ]; - - cmakeFlags = [ - "-DBUILD_STATIC_LIBS=ON" - ]; - - passthru.tests = { - inherit (python3.pkgs) aiohttp; - - pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - moduleNames = [ "libllhttp" ]; - }; - }; - - meta = with lib; { - description = "Port of http_parser to llparse"; - homepage = "https://llhttp.org/"; - changelog = "https://github.com/nodejs/llhttp/releases/tag/release/v${finalAttrs.version}"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/libraries/lmdb/bin-ext.patch b/pkgs/development/libraries/lmdb/bin-ext.patch deleted file mode 100644 index 2d5af99772c0..000000000000 --- a/pkgs/development/libraries/lmdb/bin-ext.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile -index 612484e..2e6b562 100644 ---- a/libraries/liblmdb/Makefile -+++ b/libraries/liblmdb/Makefile -@@ -27,6 +27,7 @@ CFLAGS = $(THREADS) $(OPT) $(W) $(XCFLAGS) - LDLIBS = - SOLIBS = - SOEXT = .so -+BINEXT = - prefix = /usr/local - exec_prefix = $(prefix) - bindir = $(exec_prefix)/bin -@@ -49,7 +50,7 @@ install: $(ILIBS) $(IPROGS) $(IHDRS) - mkdir -p $(DESTDIR)$(libdir) - mkdir -p $(DESTDIR)$(includedir) - mkdir -p $(DESTDIR)$(mandir)/man1 -- for f in $(IPROGS); do cp $$f $(DESTDIR)$(bindir); done -+ for f in $(IPROGS); do cp $$f$(BINEXT) $(DESTDIR)$(bindir); done - for f in $(ILIBS); do cp $$f $(DESTDIR)$(libdir); done - for f in $(IHDRS); do cp $$f $(DESTDIR)$(includedir); done - for f in $(IDOCS); do cp $$f $(DESTDIR)$(mandir)/man1; done diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix deleted file mode 100644 index 7c907e9ef70f..000000000000 --- a/pkgs/development/libraries/lmdb/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, windows }: - -stdenv.mkDerivation rec { - pname = "lmdb"; - version = "0.9.33"; - - src = fetchFromGitLab { - domain = "git.openldap.org"; - owner = "openldap"; - repo = "openldap"; - rev = "LMDB_${version}"; - sha256 = "sha256-5IBoJ3jaNXao5zVzb0LDM8RGid4s8DGQpjVqrVPLpXQ="; - }; - - postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; - - patches = [ ./hardcoded-compiler.patch ./bin-ext.patch ]; - patchFlags = [ "-p3" ]; - - # Don't attempt the .so if static, as it would fail. - postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' - sed 's/^ILIBS\>.*/ILIBS = liblmdb.a/' -i Makefile - ''; - - outputs = [ "bin" "out" "dev" ]; - - buildInputs = lib.optional stdenv.hostPlatform.isWindows windows.pthreads; - - makeFlags = [ - "prefix=$(out)" - "CC=${stdenv.cc.targetPrefix}cc" - "AR=${stdenv.cc.targetPrefix}ar" - ] - ++ lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so" - ++ lib.optionals stdenv.hostPlatform.isWindows [ "SOEXT=.dll" "BINEXT=.exe" ]; - - doCheck = true; - checkTarget = "test"; - - postInstall = '' - moveToOutput bin "$bin" - '' - # add lmdb.pc (dynamic only) - + '' - mkdir -p "$dev/lib/pkgconfig" - cat > "$dev/lib/pkgconfig/lmdb.pc" <<EOF - Name: lmdb - Description: ${meta.description} - Version: ${version} - - Cflags: -I$dev/include - Libs: -L$out/lib -llmdb - EOF - - # Expected by Rust libraries. - ln -s lmdb.pc "$dev/lib/pkgconfig/liblmdb.pc" - ''; - - meta = with lib; { - description = "Lightning memory-mapped database"; - longDescription = '' - LMDB is an ultra-fast, ultra-compact key-value embedded data store - developed by Symas for the OpenLDAP Project. It uses memory-mapped files, - so it has the read performance of a pure in-memory database while still - offering the persistence of standard disk-based databases, and is only - limited to the size of the virtual address space. - ''; - homepage = "https://symas.com/lmdb/"; - changelog = "https://git.openldap.org/openldap/openldap/-/blob/LMDB_${version}/libraries/liblmdb/CHANGES"; - maintainers = with maintainers; [ jb55 vcunat ]; - license = licenses.openldap; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/lmdb/hardcoded-compiler.patch b/pkgs/development/libraries/lmdb/hardcoded-compiler.patch deleted file mode 100644 index ddb247b7f113..000000000000 --- a/pkgs/development/libraries/lmdb/hardcoded-compiler.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 029031a68873bc3784a8561bd8e049efbd34f9d0 (HEAD) -Author: Vladimír Čunát <vcunat@gmail.com> -Date: Sun Apr 1 11:05:31 2018 +0200 - - make: gcc -> $(CC) - -diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile -index f254511..612484e 100644 ---- a/libraries/liblmdb/Makefile -+++ b/libraries/liblmdb/Makefile -@@ -102,13 +102,13 @@ COV_OBJS=xmdb.o xmidl.o - - coverage: xmtest - for i in mtest*.c [0-9]*.c; do j=`basename \$$i .c`; $(MAKE) $$j.o; \ -- gcc -o x$$j $$j.o $(COV_OBJS) -pthread $(COV_FLAGS); \ -+ $(CC) -o x$$j $$j.o $(COV_OBJS) -pthread $(COV_FLAGS); \ - rm -rf testdb; mkdir testdb; ./x$$j; done - gcov xmdb.c - gcov xmidl.c - - xmtest: mtest.o xmdb.o xmidl.o -- gcc -o xmtest mtest.o xmdb.o xmidl.o -pthread $(COV_FLAGS) -+ $(CC) -o xmtest mtest.o xmdb.o xmidl.o -pthread $(COV_FLAGS) - - xmdb.o: mdb.c lmdb.h midl.h - $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -O0 $(COV_FLAGS) -c mdb.c -o $@ diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix deleted file mode 100644 index c8b4dec313be..000000000000 --- a/pkgs/development/libraries/lmdbxx/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, lmdb }: - -stdenv.mkDerivation (finalAttrs: { - pname = "lmdbxx"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "hoytech"; - repo = "lmdbxx"; - rev = finalAttrs.version; - sha256 = "sha256-7CxQZdgHVvmof6wVR9Mzic6tg89XJT3Z1ICGRs7PZYo="; - }; - - buildInputs = [ lmdb ]; - makeFlags = [ "PREFIX=$(out)" ]; - - meta = { - homepage = "https://github.com/hoytech/lmdbxx#readme"; - description = "C++11 wrapper for the LMDB embedded B+ tree database library"; - license = lib.licenses.unlicense; - maintainers = with lib.maintainers; [ fgaz ]; - }; -}) diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix deleted file mode 100644 index 0dc8051c35f2..000000000000 --- a/pkgs/development/libraries/log4cplus/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "log4cplus"; - version = "2.1.1"; - - src = fetchurl { - url = "mirror://sourceforge/log4cplus/log4cplus-${version}.tar.bz2"; - sha256 = "sha256-ZZfeeCd15OD7qP3K2TjDcJ/YOagITEtu3648xQRuJog="; - }; - - meta = { - homepage = "http://log4cplus.sourceforge.net/"; - description = "Port the log4j library from Java to C++"; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix deleted file mode 100644 index e300a607d7b6..000000000000 --- a/pkgs/development/libraries/log4cpp/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "log4cpp"; - version = "1.1.4"; - - src = fetchurl { - url = "mirror://sourceforge/log4cpp/${pname}-${version}.tar.gz"; - sha256 = "sha256-aWETZZ5CZUBiUnSoslEFLMBDBtjuXEKgx2OfOcqQydY="; - }; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://log4cpp.sourceforge.net/"; - description = "Logging framework for C++ patterned after Apache log4j"; - mainProgram = "log4cpp-config"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix deleted file mode 100644 index 34e00295000a..000000000000 --- a/pkgs/development/libraries/log4cxx/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, libtool, cmake, libxml2, cppunit, boost -, apr, aprutil, db, expat -}: - -stdenv.mkDerivation rec { - pname = "log4cxx"; - version = "1.2.0"; - - src = fetchurl { - url = "mirror://apache/logging/log4cxx/${version}/apache-${pname}-${version}.tar.gz"; - hash = "sha256-CfR0iqVnXvXAdwvtv14ASIZokzxak1pDrFuFviQ2xIo="; - }; - - postPatch = '' - substituteInPlace CMakeLists.txt --replace "\\\''${prefix}/" "" - ''; - - buildInputs = [ libxml2 cppunit boost apr aprutil db expat ]; - nativeBuildInputs = [ libtool cmake ]; - - meta = { - homepage = "https://logging.apache.org/log4cxx/index.html"; - description = "Logging framework for C++ patterned after Apache log4j"; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix deleted file mode 100644 index 41d16e28ff44..000000000000 --- a/pkgs/development/libraries/log4shib/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchgit, autoreconfHook }: - -stdenv.mkDerivation { - pname = "log4shib"; - version = "1.0.9"; - - src = fetchgit { - url = "https://git.shibboleth.net/git/cpp-log4shib.git"; - rev = "a1afe19b7b49c32fcb03e6d72809501b8965cf85"; - sha256 = "06rrc5l6qxlc8abzim2jcxwz2c577qrjqx15cbfqq1zfqagj9hix"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - CXXFLAGS = "-std=c++11"; - - meta = with lib; { - description = "Forked version of log4cpp that has been created for the Shibboleth project"; - mainProgram = "log4shib-config"; - maintainers = [ ]; - license = licenses.lgpl21; - homepage = "http://log4cpp.sf.net"; - }; -} diff --git a/pkgs/development/libraries/loki/default.nix b/pkgs/development/libraries/loki/default.nix deleted file mode 100644 index ce011b4ba1b6..000000000000 --- a/pkgs/development/libraries/loki/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "loki"; - version = "0.1.7"; - - src = fetchurl { - url = "mirror://sourceforge/loki-lib/Loki/Loki%20${version}/loki-${version}.tar.gz"; - sha256 = "1xhwna961fl4298ac5cc629x5030zlw31vx4h8zws290amw5860g"; - }; - - buildPhase = '' - substituteInPlace Makefile.common --replace /usr $out - make build-shared - ''; - - env.NIX_CFLAGS_COMPILE = toString [ - "-std=c++11" - ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "C++ library of designs, containing flexible implementations of common design patterns and idioms"; - homepage = "https://loki-lib.sourceforge.net"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix deleted file mode 100644 index 21dd9db2797c..000000000000 --- a/pkgs/development/libraries/loudmouth/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, openssl, libidn, glib, pkg-config, zlib, darwin }: - -stdenv.mkDerivation rec { - version = "1.5.3"; - pname = "loudmouth"; - - src = fetchurl { - url = "https://mcabber.com/files/loudmouth/${pname}-${version}.tar.bz2"; - sha256 = "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl"; - }; - - configureFlags = [ "--with-ssl=openssl" ]; - - propagatedBuildInputs = [ openssl libidn glib zlib ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Foundation - ]; - - meta = with lib; { - description = "Lightweight C library for the Jabber protocol"; - platforms = platforms.all; - downloadPage = "http://mcabber.com/files/loudmouth/"; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/lpcnetfreedv/default.nix b/pkgs/development/libraries/lpcnetfreedv/default.nix deleted file mode 100644 index c8af5c6baf33..000000000000 --- a/pkgs/development/libraries/lpcnetfreedv/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, cmake }: - -let - dataVersion = "191005_v1.0"; - data = fetchurl { - url = "http://rowetel.com/downloads/deep/lpcnet_${dataVersion}.tgz"; - sha256 = "sha256-UJRAkkdR/dh/+qVoPuPd3ZN69cgzuRBMzOZdUWFJJsg="; - }; -in -stdenv.mkDerivation rec { - pname = "lpcnetfreedv"; - version = "unstable-2022-08-22"; - - src = fetchFromGitHub { - owner = "drowe67"; - repo = "LPCNet"; - rev = "67a6eb74d0c07faddcdce199856862cc45779d25"; - sha256 = "sha256-eHYZoDgoZBuuLvQn9X7H/zmK5onOAniOgY1/8RVn8gk="; - }; - - nativeBuildInputs = [ cmake ]; - - postPatch = '' - mkdir build - ln -s ${data} build/lpcnet_${dataVersion}.tgz - ''; - - meta = with lib; { - homepage = "https://freedv.org/"; - description = "Experimental Neural Net speech coding for FreeDV"; - license = licenses.bsd3; - maintainers = with maintainers; [ mvs ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/lrdf/default.nix b/pkgs/development/libraries/lrdf/default.nix deleted file mode 100644 index c9597f8320cb..000000000000 --- a/pkgs/development/libraries/lrdf/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ config, lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook -, librdf_raptor2, doCheck ? config.doCheckByDefault or false, ladspaPlugins -}: - -stdenv.mkDerivation rec { - pname = "lrdf"; - version = "0.6.1"; - - src = fetchFromGitHub { - owner = "swh"; - repo = "LRDF"; - rev = "v${version}"; - sha256 = "00wzkfb8y0aqd519ypz067cq099dpc89w69zw8ln39vl6f9x2pd4"; - }; - - postPatch = lib.optionalString doCheck '' - sed -i -e 's:usr/local:${ladspaPlugins}:' examples/{instances,remove}_test.c - ''; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - propagatedBuildInputs = [ librdf_raptor2 ]; - - inherit doCheck; - - enableParallelBuilding = true; - - meta = { - description = "Lightweight RDF library with special support for LADSPA plugins"; - homepage = "https://sourceforge.net/projects/lrdf/"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.marcweber ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/luabridge/default.nix b/pkgs/development/libraries/luabridge/default.nix deleted file mode 100644 index 16f8841f89c3..000000000000 --- a/pkgs/development/libraries/luabridge/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -}: - -stdenvNoCC.mkDerivation rec { - pname = "luabridge"; - version = "2.8"; - - src = fetchFromGitHub { - owner = "vinniefalco"; - repo = "LuaBridge"; - rev = version; - sha256 = "sha256-gXrBNzE41SH98Xz480+uHQlxHjMHzs23AImxil5LZ0g="; - }; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/include - cp -r Source/LuaBridge $out/include - runHook postInstall - ''; - - meta = with lib; { - description = "Lightweight, dependency-free library for binding Lua to C++"; - homepage = "https://github.com/vinniefalco/LuaBridge"; - changelog = "https://github.com/vinniefalco/LuaBridge/blob/${version}/CHANGES.md"; - platforms = platforms.unix; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix deleted file mode 100644 index 41aadfcdc747..000000000000 --- a/pkgs/development/libraries/lucene++/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, gtest, zlib }: - -stdenv.mkDerivation rec { - pname = "lucene++"; - version = "3.0.8"; - - src = fetchFromGitHub { - owner = "luceneplusplus"; - repo = "LucenePlusPlus"; - rev = "rel_${version}"; - sha256 = "12v7r62f7pqh5h210pb74sfx6h70lj4pgfpva8ya2d55fn0qxrr2"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost gtest zlib ]; - - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; - - patches = [ - (fetchpatch { - name = "pkgconfig_use_correct_LIBDIR_for_destination_library"; - url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/39cd44bd54e918d25ee464477992ad0dc234dcba.patch"; - sha256 = "sha256-PP6ENNhPJMWrYDlTnr156XV8d5aX/VNX8v4vvi9ZiWo"; - }) - (fetchpatch { - name = "fix-visibility-on-mac.patch"; - url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/bc436842227aea561b68c6ae89fbd1fdefcac7b3.patch"; - sha256 = "sha256-/S7tFZ4ht5p0cv036xF2NKZQwExbPaGINyWZiUg/lS4="; - }) - ]; - - # Don't use the built in gtest - but the nixpkgs one requires C++14. - postPatch = '' - substituteInPlace src/test/CMakeLists.txt \ - --replace "add_subdirectory(gtest)" "" - substituteInPlace CMakeLists.txt \ - --replace "set(CMAKE_CXX_STANDARD 11)" "set(CMAKE_CXX_STANDARD 14)" - ''; - - doCheck = true; - - checkPhase = '' - runHook preCheck - LD_LIBRARY_PATH=$PWD/src/contrib:$PWD/src/core \ - src/test/lucene++-tester - runHook postCheck - ''; - - postInstall = '' - mv $out/include/pkgconfig $out/lib/ - cp $src/src/contrib/include/*h $out/include/lucene++/ - ''; - - meta = { - description = "C++ port of the popular Java Lucene search engine"; - homepage = "https://github.com/luceneplusplus/LucenePlusPlus"; - license = with lib.licenses; [ asl20 lgpl3Plus ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/development/libraries/lyra/default.nix deleted file mode 100644 index 0d34c42b8122..000000000000 --- a/pkgs/development/libraries/lyra/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja }: - -stdenv.mkDerivation rec { - pname = "lyra"; - version = "1.6.1"; - - src = fetchFromGitHub { - owner = "bfgroup"; - repo = "lyra"; - rev = version; - sha256 = "sha256-tS2SPLiKaL8C35AmOXyJPstFUfynkE/A53rurqiySbI="; - }; - - nativeBuildInputs = [ meson ninja ]; - - postPatch = "sed -i s#/usr#$out#g meson.build"; - - postInstall = '' - mkdir -p $out/include - cp -R $src/include/* $out/include - ''; - - meta = with lib; { - homepage = "https://github.com/bfgroup/Lyra"; - description = "Simple to use, composable, command line parser for C++ 11 and beyond"; - platforms = platforms.unix; - license = licenses.boost; - maintainers = with maintainers; [ davidtwco ]; - }; -} diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix deleted file mode 100644 index 43d551819a65..000000000000 --- a/pkgs/development/libraries/lzo/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook }: - -stdenv.mkDerivation rec { - pname = "lzo"; - version = "2.10"; - - src = fetchurl { - url = "https://www.oberhumer.com/opensource/lzo/download/${pname}-${version}.tar.gz"; - sha256 = "0wm04519pd3g8hqpjqhfr72q8qmbiwqaxcs3cndny9h86aa95y60"; - }; - - nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; - - configureFlags = lib.optional (!stdenv.hostPlatform.isStatic) "--enable-shared" ; - - enableParallelBuilding = true; - - doCheck = true; # not cross; - - strictDeps = true; - - meta = with lib; { - description = "Real-time data (de)compression library"; - longDescription = '' - LZO is a portable lossless data compression library written in ANSI C. - Both the source code and the compressed data format are designed to be - portable across platforms. - LZO offers pretty fast compression and *extremely* fast decompression. - While it favours speed over compression ratio, it includes slower - compression levels achieving a quite competitive compression ratio - while still decompressing at this very high speed. - ''; - - homepage = "http://www.oberhumer.com/opensource/lzo"; - license = licenses.gpl2Plus; - - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/development/libraries/mac/default.nix deleted file mode 100644 index ca58c20eab9b..000000000000 --- a/pkgs/development/libraries/mac/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, yasm }: - -stdenv.mkDerivation rec { - pname = "mac"; - version = "4.11-u4-b5-s7"; - - src = fetchurl { - url = "https://www.deb-multimedia.org/pool/main/m/monkeys-audio/monkeys-audio_${version}.orig.tar.gz"; - sha256 = "16i96cw5r3xbsivjigqp15vv32wa38k86mxq11qx1pzmpryqpqkk"; - }; - - patches = [ - (fetchpatch { - name = "mac-4.11.4.5.7-gcc6.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/mac/files/mac-4.11.4.5.7-gcc6.patch?id=1bd4e0e30e4d8a8862217d7067323851b34c7fe4"; - sha256 = "093b8m8p8s6dmc62fc8vb4hlmjc2ncb4rdgc82g0a8gg6w5kcj8x"; - }) - (fetchpatch { - name = "mac-4.11.4.5.7-output.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/mac/files/mac-4.11.4.5.7-output.patch?id=1bd4e0e30e4d8a8862217d7067323851b34c7fe4"; - sha256 = "0njmwj6d9jqi4pz4fax02w37gk22vda0grszrs2nn97zzmjl36zk"; - }) - ]; - - CXXFLAGS = "-DSHNTOOL"; - - nativeBuildInputs = [ yasm ]; - - meta = with lib; { - description = "APE codec and decompressor"; - homepage = "https://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"; - license = licenses.unfreeRedistributable; - platforms = [ "x86_64-linux" ]; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/maeparser/default.nix b/pkgs/development/libraries/maeparser/default.nix deleted file mode 100644 index 16459987c13f..000000000000 --- a/pkgs/development/libraries/maeparser/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ fetchFromGitHub -, lib -, stdenv -, boost -, zlib -, cmake -}: - -stdenv.mkDerivation rec { - pname = "maeparser"; - version = "1.3.1"; - - src = fetchFromGitHub { - owner = "schrodinger"; - repo = "maeparser"; - rev = "v${version}"; - sha256 = "sha256-+eCTOU0rqFQC87wcxgINGLsULfbIr/wKxQTkRR59JVc="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost zlib ]; - - meta = with lib; { - homepage = "https://github.com/schrodinger/maeparser"; - description = "Maestro file parser"; - maintainers = [ maintainers.rmcgibbo ]; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/magic-enum/default.nix b/pkgs/development/libraries/magic-enum/default.nix deleted file mode 100644 index 7f65505793c7..000000000000 --- a/pkgs/development/libraries/magic-enum/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ fetchFromGitHub -, lib -, stdenv -, cmake -, nix-update-script -, testers -, magic-enum -}: -stdenv.mkDerivation rec{ - pname = "magic-enum"; - version = "0.9.6"; - - src = fetchFromGitHub { - owner = "Neargye"; - repo = "magic_enum"; - rev = "refs/tags/v${version}"; - hash = "sha256-1pO9FWd0InXqg8+lwRF3YNFTAeVLjqoI9v15LjWxnZY="; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly - # (setting it to an absolute path causes include files to go to $out/$out/include, - # because the absolute path is interpreted with root at $out). - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" - ]; - - passthru = { - updateScript = nix-update-script { }; - tests.version = testers.testVersion { package = magic-enum; }; - }; - - meta = { - description = "Static reflection for enums (to string, from string, iteration) for modern C++"; - homepage = "https://github.com/Neargye/magic_enum"; - changelog = "https://github.com/Neargye/magic_enum/releases/tag/v${version}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ Alper-Celik ]; - }; -} diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index ed7406cc52b7..1381a48315df 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { buildInputs = [ libetpan cyrus_sasl libctemplate libuchardet html-tidy libxml2 openssl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glib icu libuuid - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; @@ -37,12 +37,12 @@ stdenv.mkDerivation rec { --replace buffio.h tidybuffio.h substituteInPlace src/core/basetypes/MCString.cpp \ --replace "xmlErrorPtr" "const xmlError *" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace src/core/basetypes/MCICUTypes.h \ --replace "__CHAR16_TYPE__ UChar" "char16_t UChar" ''; - cmakeFlags = lib.optionals (!stdenv.isDarwin) [ + cmakeFlags = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DBUILD_SHARED_LIBS=ON" ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { cp src/libMailCore.* $out/lib ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' ( cd unittest diff --git a/pkgs/development/libraries/mapnik/catch2-src.patch b/pkgs/development/libraries/mapnik/catch2-src.patch deleted file mode 100644 index 04c6f7add217..000000000000 --- a/pkgs/development/libraries/mapnik/catch2-src.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 0705ddce1..771291b88 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -7,8 +7,7 @@ include(FetchContent) - - FetchContent_Declare( - Catch2 -- GIT_REPOSITORY https://github.com/catchorg/Catch2.git -- GIT_TAG v2.13.7) -+ SOURCE_DIR @catch2_src@) - FetchContent_MakeAvailable(Catch2) - - if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.19.0") diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index c41ebde0241e..dba5f247bc85 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -1,43 +1,46 @@ -{ lib -, stdenv -, fetchFromGitHub -, buildPackages -, cmake -, pkg-config -, substituteAll -, boost -, cairo -, freetype -, gdal -, harfbuzz -, icu -, libjpeg -, libpng -, libtiff -, libwebp -, libxml2 -, proj -, python3 -, sqlite -, zlib -, catch2 -, postgresql -, protozero -, sparsehash +{ + lib, + stdenv, + fetchFromGitHub, + gitUpdater, + buildPackages, + cmake, + pkg-config, + boost, + cairo, + freetype, + gdal, + harfbuzz, + icu, + libjpeg, + libpng, + libtiff, + libwebp, + libxml2, + proj, + python3, + sqlite, + zlib, + catch2, + postgresql, + protozero, + sparsehash, }: stdenv.mkDerivation rec { pname = "mapnik"; - version = "4.0.2"; + version = "4.0.3"; src = fetchFromGitHub { owner = "mapnik"; repo = "mapnik"; rev = "v${version}"; - hash = "sha256-U5QQ7I7ZBNlMm74Vpvv8lvJ4EefM3+jHURFAP03Lmvw="; + hash = "sha256-BDddxaMgUv1q3zceiAOorSpT7GH1xt3PotrdJg4/j+E="; fetchSubmodules = true; }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + postPatch = '' substituteInPlace configure \ --replace '$PYTHON scons/scons.py' ${buildPackages.scons}/bin/scons @@ -56,18 +59,16 @@ stdenv.mkDerivation rec { # Upstream HarfBuzz wants to drop CMake support anyway. # See discussion: https://github.com/mapnik/mapnik/issues/4265 ./cmake-harfbuzz.patch - # prevent CMake from trying to get libraries on the Internet - (substituteAll { - src = ./catch2-src.patch; - catch2_src = catch2.src; - }) # Account for full paths when generating libmapnik.pc ./export-pkg-config-full-paths.patch # Use 'sparsehash' package. ./use-sparsehash-package.patch ]; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; buildInputs = [ boost @@ -99,7 +100,9 @@ stdenv.mkDerivation rec { # Use 'protozero' package. (lib.cmakeBool "USE_EXTERNAL_MAPBOX_PROTOZERO" true) # macOS builds fail when using memory mapped file cache. - (lib.cmakeBool "USE_MEMORY_MAPPED_FILE" (!stdenv.isDarwin)) + (lib.cmakeBool "USE_MEMORY_MAPPED_FILE" (!stdenv.hostPlatform.isDarwin)) + # don't try to download sources for catch2, use our own + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CATCH2" "${catch2.src}") ]; doCheck = true; @@ -122,7 +125,13 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open source toolkit for developing mapping applications"; homepage = "https://mapnik.org"; - maintainers = with maintainers; [ hrdinka hummeltech ]; + maintainers = + with maintainers; + teams.geospatial.members + ++ [ + hrdinka + hummeltech + ]; license = licenses.lgpl21Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/marisa/default.nix b/pkgs/development/libraries/marisa/default.nix deleted file mode 100644 index 4a3f8be04172..000000000000 --- a/pkgs/development/libraries/marisa/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "marisa"; - version = "0.2.6"; - - src = fetchFromGitHub { - owner = "s-yata"; - repo = "marisa-trie"; - rev = "v${version}"; - sha256 = "1hy8hfksizk1af6kg8z3b9waiz6d5ggd73fiqcvmhfgra36dscyq"; - }; - - enableParallelBuilding = true; - - nativeBuildInputs = [ autoreconfHook ]; - - meta = with lib; { - homepage = "https://github.com/s-yata/marisa-trie"; - description = "Static and space-efficient trie data structure library"; - license = licenses.bsd3; - maintainers = with maintainers; [ sifmelcara ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/marl/default.nix b/pkgs/development/libraries/marl/default.nix deleted file mode 100644 index 7ff28a9d5221..000000000000 --- a/pkgs/development/libraries/marl/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, cmake, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "marl"; - version = "1.0.0"; # Based on marl's CHANGES.md - - src = fetchFromGitHub { - owner = "google"; - repo = pname; - sha256 = "0pnbarbyv82h05ckays2m3vgxzdhpcpg59bnzsddlb5v7rqhw51w"; - rev = "40209e952f5c1f3bc883d2b7f53b274bd454ca53"; - }; - - nativeBuildInputs = [ cmake ]; - - # Turn on the flag to install after building the library. - cmakeFlags = ["-DMARL_INSTALL=ON"]; - - meta = with lib; { - homepage = "https://github.com/google/marl"; - description = "Hybrid thread / fiber task scheduler written in C++ 11"; - platforms = platforms.all; - license = licenses.asl20; - maintainers = with maintainers; [ breakds ]; - }; -} diff --git a/pkgs/development/libraries/mathgl/default.nix b/pkgs/development/libraries/mathgl/default.nix deleted file mode 100644 index e2dc599c4f3b..000000000000 --- a/pkgs/development/libraries/mathgl/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, stdenv -, fetchurl -, cmake -, zlib -, libpng -, libGL -}: -stdenv.mkDerivation rec { - pname = "mathgl"; - version = "8.0.1"; - - src = fetchurl { - url = "mirror://sourceforge/mathgl/mathgl-${version}.tar.gz"; - sha256 = "sha256-yoS/lIDDntMRLpIMFs49jyiYaY9iiW86V3FBKGIqVao="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - zlib - libpng - libGL - ]; - - meta = with lib; { - description = "Library for scientific data visualization"; - homepage = "https://mathgl.sourceforge.net/"; - license = with licenses; [ gpl3 lgpl3 ]; - platforms = platforms.linux; - maintainers = [ maintainers.GabrielDougherty ]; - }; -} diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix deleted file mode 100644 index 3a2fde315779..000000000000 --- a/pkgs/development/libraries/matio/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, stdenv, fetchurl }: -stdenv.mkDerivation rec { - pname = "matio"; - version = "1.5.27"; - src = fetchurl { - url = "mirror://sourceforge/matio/${pname}-${version}.tar.gz"; - sha256 = "sha256-CmqgCxjEUStjqNJ5BrB5yMbtQdSyhE96SuWY4Y0i07M="; - }; - - meta = with lib; { - description = "C library for reading and writing Matlab MAT files"; - homepage = "http://matio.sourceforge.net/"; - license = licenses.bsd2; - maintainers = [ ]; - mainProgram = "matdump"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo-beta.6.lock b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo-beta.6.lock deleted file mode 100644 index 437f13e5e786..000000000000 --- a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo-beta.6.lock +++ /dev/null @@ -1,6253 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - -[[package]] -name = "aead" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" -dependencies = [ - "generic-array", - "rand_core 0.6.4", -] - -[[package]] -name = "aes" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" -dependencies = [ - "cfg-if", - "cipher 0.4.4", - "cpufeatures", -] - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.9", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "getrandom 0.2.9", - "once_cell", - "version_check", -] - -[[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_log-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" - -[[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 = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - -[[package]] -name = "anstream" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is-terminal", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" - -[[package]] -name = "anstyle-parse" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "anstyle-wincon" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd" -dependencies = [ - "anstyle", - "windows-sys 0.48.0", -] - -[[package]] -name = "anyhow" -version = "1.0.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" - -[[package]] -name = "anymap2" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" - -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - -[[package]] -name = "arrayvec" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" -dependencies = [ - "serde", -] - -[[package]] -name = "askama" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb98f10f371286b177db5eeb9a6e5396609555686a35e1d4f7b9a9c6d8af0139" -dependencies = [ - "askama_derive", - "askama_escape", - "askama_shared", -] - -[[package]] -name = "askama_derive" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87bf87e6e8b47264efa9bde63d6225c6276a52e05e91bf37eaa8afd0032d6b71" -dependencies = [ - "askama_shared", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "askama_escape" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" - -[[package]] -name = "askama_shared" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf722b94118a07fcbc6640190f247334027685d4e218b794dbfe17c32bf38ed0" -dependencies = [ - "askama_escape", - "mime", - "mime_guess", - "nom", - "proc-macro2", - "quote", - "serde", - "syn 1.0.109", - "toml 0.5.11", -] - -[[package]] -name = "assert-json-diff" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "assert_matches" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" - -[[package]] -name = "assign" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002" - -[[package]] -name = "async-channel" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-compression" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-executor" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" -dependencies = [ - "async-lock", - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "slab", -] - -[[package]] -name = "async-global-executor" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" -dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "once_cell", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite", - "log", - "parking", - "polling", - "rustix", - "slab", - "socket2", - "waker-fn", -] - -[[package]] -name = "async-lock" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-process" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" -dependencies = [ - "async-io", - "async-lock", - "autocfg", - "blocking", - "cfg-if", - "event-listener", - "futures-lite", - "rustix", - "signal-hook", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-std" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" -dependencies = [ - "async-channel", - "async-global-executor", - "async-io", - "async-lock", - "async-process", - "crossbeam-utils", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "once_cell", - "pin-project-lite", - "pin-utils", - "slab", - "wasm-bindgen-futures", -] - -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "async-task" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" - -[[package]] -name = "async-trait" -version = "0.1.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "atomic" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "atomic-waker" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" - -[[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 = "axum" -version = "0.6.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "113713495a32dd0ab52baf5c10044725aa3aec00b31beda84218e469029b72a3" -dependencies = [ - "async-trait", - "axum-core", - "bitflags 1.3.2", - "bytes", - "futures-util", - "http", - "http-body", - "hyper", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "sync_wrapper", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - -[[package]] -name = "backoff" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" -dependencies = [ - "futures-core", - "getrandom 0.2.9", - "instant", - "pin-project-lite", - "rand 0.8.5", - "tokio", -] - -[[package]] -name = "backtrace" -version = "0.3.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide 0.6.2", - "object", - "rustc-demangle", -] - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "benchmarks" -version = "1.0.0" -dependencies = [ - "criterion", - "matrix-sdk-crypto", - "matrix-sdk-sled", - "matrix-sdk-test", - "pprof", - "ruma", - "serde_json", - "tempfile", - "tokio", -] - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24a6904aef64d73cf10ab17ebace7befb918b82164785cb89907993be7f83813" - -[[package]] -name = "bitmaps" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703642b98a00b3b90513279a8ede3fcfa479c126c5fb46e78f3051522f021403" - -[[package]] -name = "blake3" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" -dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if", - "constant_time_eq", - "digest 0.10.6", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[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 = "block-padding" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" -dependencies = [ - "generic-array", -] - -[[package]] -name = "blocking" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" -dependencies = [ - "async-channel", - "async-lock", - "async-task", - "atomic-waker", - "fastrand", - "futures-lite", - "log", -] - -[[package]] -name = "bs58" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" - -[[package]] -name = "bumpalo" -version = "3.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" - -[[package]] -name = "bytemuck" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "bytesize" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38fcc2979eff34a4b84e1cf9a1e3da42a7d44b3b690a40cdcb23e3d556cfb2e5" - -[[package]] -name = "camino" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "cbc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" -dependencies = [ - "cipher 0.4.4", -] - -[[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 = "chacha20" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" -dependencies = [ - "cfg-if", - "cipher 0.3.0", - "cpufeatures", - "zeroize", -] - -[[package]] -name = "chacha20poly1305" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" -dependencies = [ - "aead", - "chacha20", - "cipher 0.3.0", - "poly1305", - "zeroize", -] - -[[package]] -name = "checked_int_cast" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" - -[[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", -] - -[[package]] -name = "ciborium" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" - -[[package]] -name = "ciborium-ll" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" -dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "clap" -version = "3.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_derive 3.2.18", - "clap_lex 0.2.4", - "indexmap", - "once_cell", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap" -version = "4.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ac1f6381d8d82ab4684768f89c0ea3afe66925ceadb4eeb3fc452ffc55d62" -dependencies = [ - "clap_builder", - "clap_derive 4.2.0", - "once_cell", -] - -[[package]] -name = "clap_builder" -version = "4.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84080e799e54cff944f4b4a4b0e71630b0e0443b25b985175c7dddc1a859b749" -dependencies = [ - "anstream", - "anstyle", - "bitflags 1.3.2", - "clap_lex 0.4.1", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "3.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "clap_derive" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clap_lex" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" - -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "concurrent-queue" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if", - "wasm-bindgen", -] - -[[package]] -name = "const-oid" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" - -[[package]] -name = "const_format" -version = "0.2.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7309d9b4d3d2c0641e018d449232f2e28f1b22933c137f157d3dbc14228b8c0e" -dependencies = [ - "const_format_proc_macros", -] - -[[package]] -name = "const_format_proc_macros" -version = "0.2.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f47bf7270cf70d370f8f98c1abb6d2d4cf60a6845d30e05bfb90c6568650" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "constant_time_eq" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" - -[[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.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 = "cpp_demangle" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c76f98bdfc7f66172e6c7065f981ebb576ffc903fe4c0561d9f0c2509226dc6" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "cpufeatures" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "criterion" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" -dependencies = [ - "anes", - "atty", - "cast", - "ciborium", - "clap 3.2.23", - "criterion-plot", - "futures", - "itertools", - "lazy_static", - "num-traits", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "tokio", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if", -] - -[[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 = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ctor" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4056f63fce3b82d852c3da92b08ea59959890813a7f4ce9c0ff85b10cf301b" -dependencies = [ - "quote", - "syn 2.0.15", -] - -[[package]] -name = "ctr" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" -dependencies = [ - "cipher 0.4.4", -] - -[[package]] -name = "curve25519-dalek" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" -dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", - "serde", - "subtle", - "zeroize", -] - -[[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.15", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "dashmap" -version = "5.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" -dependencies = [ - "cfg-if", - "hashbrown", - "lock_api", - "once_cell", - "parking_lot_core 0.9.7", -] - -[[package]] -name = "deadpool" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "421fe0f90f2ab22016f32a9881be5134fdd71c65298917084b0c7477cbc3856e" -dependencies = [ - "async-trait", - "deadpool-runtime", - "num_cpus", - "retain_mut", - "tokio", -] - -[[package]] -name = "deadpool-runtime" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaa37046cc0f6c3cc6090fbdbf73ef0b8ef4cfcc37f6befc0020f63e8cf121e1" -dependencies = [ - "tokio", -] - -[[package]] -name = "deadpool-sqlite" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e026821eaacbce25ff0d54405e4421d71656fcae3e4a9323461280fcda6dbc7d" -dependencies = [ - "deadpool", - "deadpool-sync", - "rusqlite", -] - -[[package]] -name = "deadpool-sync" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1bea344b64b32537fde6e0f0179b1ede34d435636719dd40fe6a0f28218a61c" -dependencies = [ - "deadpool", -] - -[[package]] -name = "debugid" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" -dependencies = [ - "uuid", -] - -[[package]] -name = "deflate" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" -dependencies = [ - "adler32", - "byteorder", -] - -[[package]] -name = "der" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" -dependencies = [ - "const-oid", -] - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "digest" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" -dependencies = [ - "block-buffer 0.10.4", - "crypto-common", - "subtle", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ed25519" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" -dependencies = [ - "serde", - "signature", -] - -[[package]] -name = "ed25519-dalek" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" -dependencies = [ - "curve25519-dalek", - "ed25519", - "rand 0.7.3", - "serde", - "serde_bytes", - "sha2 0.9.9", - "zeroize", -] - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "encoding_rs" -version = "0.8.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" -dependencies = [ - "cfg-if", -] - -[[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 = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "example-appservice-autojoin" -version = "0.1.0" -dependencies = [ - "anyhow", - "matrix-sdk-appservice", - "tokio", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "example-autojoin" -version = "0.1.0" -dependencies = [ - "anyhow", - "matrix-sdk", - "tokio", - "tracing-subscriber", -] - -[[package]] -name = "example-command-bot" -version = "0.1.0" -dependencies = [ - "anyhow", - "matrix-sdk", - "tokio", - "tracing-subscriber", - "url", -] - -[[package]] -name = "example-cross-signing-bootstrap" -version = "0.1.0" -dependencies = [ - "anyhow", - "matrix-sdk", - "tokio", - "tracing-subscriber", - "url", -] - -[[package]] -name = "example-custom-events" -version = "0.1.0" -dependencies = [ - "anyhow", - "dirs", - "matrix-sdk", - "serde", - "tokio", - "tracing-subscriber", -] - -[[package]] -name = "example-emoji-verification" -version = "0.1.0" -dependencies = [ - "anyhow", - "clap 4.2.4", - "futures", - "matrix-sdk", - "tokio", - "tracing-subscriber", - "url", -] - -[[package]] -name = "example-get-profiles" -version = "0.1.0" -dependencies = [ - "anyhow", - "matrix-sdk", - "tokio", - "tracing-subscriber", - "url", -] - -[[package]] -name = "example-getting-started" -version = "0.1.0" -dependencies = [ - "anyhow", - "dirs", - "matrix-sdk", - "tokio", - "tracing-subscriber", -] - -[[package]] -name = "example-image-bot" -version = "0.1.0" -dependencies = [ - "anyhow", - "matrix-sdk", - "mime", - "tokio", - "tracing-subscriber", - "url", -] - -[[package]] -name = "example-login" -version = "0.1.0" -dependencies = [ - "anyhow", - "matrix-sdk", - "tokio", - "tracing-subscriber", - "url", -] - -[[package]] -name = "example-persist-session" -version = "0.1.0" -dependencies = [ - "anyhow", - "dirs", - "matrix-sdk", - "rand 0.8.5", - "serde", - "serde_json", - "tokio", - "tracing-subscriber", -] - -[[package]] -name = "example-timeline" -version = "0.1.0" -dependencies = [ - "anyhow", - "clap 4.2.4", - "futures", - "matrix-sdk", - "tokio", - "tracing-subscriber", - "url", -] - -[[package]] -name = "extension-trait" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd65f1b59dd22d680c7a626cc4a000c1e03d241c51c3e034d2bc9f1e90734f9b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "eyeball" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1015c5225a75e0ab3d325e934456d92fdd57f440e8c81d09018878d4f651cd46" -dependencies = [ - "futures-core", - "readlock", -] - -[[package]] -name = "eyeball-im" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e6dff0ac9894dcc183064377dfeb4137bcffa9f9ec3dbc10f8e7fba34c0ac7" -dependencies = [ - "futures-core", - "imbl", - "tokio", - "tokio-stream", -] - -[[package]] -name = "eyre" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" -dependencies = [ - "indenter", - "once_cell", -] - -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fdeflate" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "findshlibs" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64" -dependencies = [ - "cc", - "lazy_static", - "libc", - "winapi", -] - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flate2" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" -dependencies = [ - "crc32fast", - "miniz_oxide 0.6.2", -] - -[[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 = "fs-err" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" - -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[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-timer" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[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.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "getrandom" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "gif" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" -dependencies = [ - "color_quant", - "weezl", -] - -[[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.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "gloo-utils" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8e8fc851e9c7b9852508bc6e3f690f452f474417e8545ec9857b7f7377036b5" -dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "goblin" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6b4de4a8eb6c46a8c77e1d3be942cb9a8bf073c22374578e5ba4b08ed0ff68" -dependencies = [ - "log", - "plain", - "scroll", -] - -[[package]] -name = "h2" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.6", -] - -[[package]] -name = "hashlink" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" -dependencies = [ - "hashbrown", -] - -[[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" -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 = "hkdf" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" -dependencies = [ - "hmac", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest 0.10.6", -] - -[[package]] -name = "html5ever" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" -dependencies = [ - "log", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "http-types" -version = "2.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" -dependencies = [ - "anyhow", - "async-channel", - "base64 0.13.1", - "futures-lite", - "http", - "infer", - "pin-project-lite", - "rand 0.7.3", - "serde", - "serde_json", - "serde_qs", - "serde_urlencoded", - "url", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "hyper" -version = "0.14.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" -dependencies = [ - "http", - "hyper", - "rustls", - "tokio", - "tokio-rustls", -] - -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -dependencies = [ - "cxx", - "cxx-build", -] - -[[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 = "image" -version = "0.23.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "gif 0.11.4", - "jpeg-decoder 0.1.22", - "num-iter", - "num-rational 0.3.2", - "num-traits", - "png 0.16.8", - "scoped_threadpool", - "tiff 0.6.1", -] - -[[package]] -name = "image" -version = "0.24.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "gif 0.12.0", - "jpeg-decoder 0.3.0", - "num-rational 0.4.1", - "num-traits", - "png 0.17.8", - "tiff 0.8.1", -] - -[[package]] -name = "imbl" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2806b69cd9f4664844027b64465eacb444c67c1db9c778e341adff0c25cdb0d" -dependencies = [ - "bitmaps", - "imbl-sized-chunks", - "rand_core 0.6.4", - "rand_xoshiro", - "serde", - "version_check", -] - -[[package]] -name = "imbl-sized-chunks" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6957ea0b2541c5ca561d3ef4538044af79f8a05a1eb3a3b148936aaceaa1076" -dependencies = [ - "bitmaps", -] - -[[package]] -name = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - -[[package]] -name = "indexed_db_futures" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfbcff6ae46750b15cc594bfd277b188cbddcfdc1817848f97f03f26f8625b9e" -dependencies = [ - "cfg-if", - "js-sys", - "uuid", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown", - "serde", -] - -[[package]] -name = "indoc" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" - -[[package]] -name = "infer" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" - -[[package]] -name = "inferno" -version = "0.11.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fb7c1b80a1dfa604bb4a649a5c5aeef3d913f7c520cb42b40e534e8a61bcdfc" -dependencies = [ - "ahash 0.8.3", - "indexmap", - "is-terminal", - "itoa", - "log", - "num-format", - "once_cell", - "quick-xml", - "rgb", - "str_stack", -] - -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "block-padding", - "generic-array", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[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 = "ipnet" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" - -[[package]] -name = "is-terminal" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" -dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "jpeg-decoder" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" -dependencies = [ - "rayon", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" -dependencies = [ - "rayon", -] - -[[package]] -name = "js-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "js_int" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d937f95470b270ce8b8950207715d71aa8e153c0d44c6684d59397ed4949160a" -dependencies = [ - "serde", -] - -[[package]] -name = "js_option" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68421373957a1593a767013698dbf206e2b221eefe97a44d98d18672ff38423c" -dependencies = [ - "serde", -] - -[[package]] -name = "konst" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330f0e13e6483b8c34885f7e6c9f19b1a7bd449c673fbb948a51c99d66ef74f4" -dependencies = [ - "konst_macro_rules", - "konst_proc_macros", -] - -[[package]] -name = "konst_macro_rules" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37" - -[[package]] -name = "konst_proc_macros" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "984e109462d46ad18314f10e392c286c3d47bce203088a09012de1015b45b737" - -[[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log", -] - -[[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.142" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libm" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" - -[[package]] -name = "libsqlite3-sys" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", - "value-bag", -] - -[[package]] -name = "log-panics" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f9dd8546191c1850ecf67d22f5ff00a935b890d0e84713159a55495cc2ac5f" -dependencies = [ - "backtrace", - "log", -] - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] -name = "markup5ever" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" -dependencies = [ - "log", - "phf 0.10.1", - "phf_codegen", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata", -] - -[[package]] -name = "matchit" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" - -[[package]] -name = "matrix-pickle" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b18185b3f64cc8d44840dbf92d92aeb05c1ef97094f51a32c1afd36a4415d225" -dependencies = [ - "matrix-pickle-derive", - "thiserror", -] - -[[package]] -name = "matrix-pickle-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cef08fbb48d0d5125d3885e422c426b5be84067c63ceb5d8b32f9130143f5b81" -dependencies = [ - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "matrix-sdk" -version = "0.6.2" -dependencies = [ - "anyhow", - "anymap2", - "assert_matches", - "async-stream", - "async-trait", - "backoff", - "bytes", - "bytesize", - "chrono", - "ctor 0.2.0", - "dashmap", - "dirs", - "event-listener", - "eyeball", - "eyeball-im", - "eyre", - "futures", - "futures-core", - "futures-util", - "getrandom 0.2.9", - "gloo-timers", - "http", - "hyper", - "image 0.24.6", - "imbl", - "indexmap", - "matrix-sdk-base", - "matrix-sdk-common", - "matrix-sdk-indexeddb", - "matrix-sdk-sled", - "matrix-sdk-test", - "mime", - "mime_guess", - "once_cell", - "pin-project-lite", - "rand 0.8.5", - "reqwest", - "ruma", - "serde", - "serde_html_form", - "serde_json", - "tempfile", - "thiserror", - "tokio", - "tower", - "tracing", - "tracing-subscriber", - "url", - "uuid", - "wasm-bindgen-test", - "wiremock", - "zeroize", -] - -[[package]] -name = "matrix-sdk-appservice" -version = "0.1.0" -dependencies = [ - "axum", - "dashmap", - "http", - "http-body", - "hyper", - "matrix-sdk", - "matrix-sdk-test", - "regex", - "ruma", - "serde", - "serde_html_form", - "serde_json", - "serde_yaml", - "thiserror", - "tokio", - "tower", - "tracing", - "tracing-subscriber", - "url", - "wiremock", -] - -[[package]] -name = "matrix-sdk-base" -version = "0.6.1" -dependencies = [ - "assert_matches", - "assign", - "async-stream", - "async-trait", - "bitflags 2.2.1", - "ctor 0.2.0", - "dashmap", - "eyeball", - "futures", - "futures-core", - "futures-util", - "http", - "matrix-sdk-common", - "matrix-sdk-crypto", - "matrix-sdk-store-encryption", - "matrix-sdk-test", - "once_cell", - "ruma", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "tracing-subscriber", - "wasm-bindgen-test", - "zeroize", -] - -[[package]] -name = "matrix-sdk-common" -version = "0.6.0" -dependencies = [ - "futures-core", - "futures-util", - "gloo-timers", - "instant", - "matrix-sdk-test", - "ruma", - "serde", - "serde_json", - "tokio", - "wasm-bindgen-futures", - "wasm-bindgen-test", -] - -[[package]] -name = "matrix-sdk-crypto" -version = "0.6.0" -dependencies = [ - "aes", - "anyhow", - "assert_matches", - "async-std", - "async-trait", - "atomic", - "base64 0.21.0", - "bs58", - "byteorder", - "cfg-if", - "ctor 0.2.0", - "ctr", - "dashmap", - "event-listener", - "eyeball", - "futures", - "futures-core", - "futures-util", - "hmac", - "http", - "indoc", - "itertools", - "matrix-sdk-common", - "matrix-sdk-qrcode", - "matrix-sdk-test", - "olm-rs", - "pbkdf2", - "proptest", - "rand 0.8.5", - "rmp-serde", - "ruma", - "serde", - "serde_json", - "sha2 0.10.6", - "thiserror", - "tokio", - "tokio-stream", - "tracing", - "tracing-subscriber", - "vodozemac", - "zeroize", -] - -[[package]] -name = "matrix-sdk-crypto-ffi" -version = "0.1.0" -dependencies = [ - "anyhow", - "assert_matches", - "base64 0.21.0", - "futures-util", - "hmac", - "http", - "js_int", - "matrix-sdk-common", - "matrix-sdk-crypto", - "matrix-sdk-sqlite", - "pbkdf2", - "rand 0.8.5", - "ruma", - "serde", - "serde_json", - "sha2 0.10.6", - "tempfile", - "thiserror", - "tokio", - "tracing", - "tracing-subscriber", - "uniffi", - "vodozemac", - "zeroize", -] - -[[package]] -name = "matrix-sdk-crypto-js" -version = "0.1.0-alpha.0" -dependencies = [ - "anyhow", - "console_error_panic_hook", - "futures-util", - "http", - "js-sys", - "matrix-sdk-common", - "matrix-sdk-crypto", - "matrix-sdk-indexeddb", - "matrix-sdk-qrcode", - "ruma", - "serde_json", - "tracing", - "tracing-subscriber", - "vodozemac", - "wasm-bindgen", - "wasm-bindgen-futures", - "zeroize", -] - -[[package]] -name = "matrix-sdk-crypto-nodejs" -version = "0.6.0" -dependencies = [ - "http", - "matrix-sdk-common", - "matrix-sdk-crypto", - "matrix-sdk-sled", - "matrix-sdk-sqlite", - "napi", - "napi-build", - "napi-derive", - "ruma", - "serde_json", - "tracing-subscriber", - "vodozemac", - "zeroize", -] - -[[package]] -name = "matrix-sdk-ffi" -version = "0.2.0" -dependencies = [ - "anyhow", - "base64 0.21.0", - "extension-trait", - "eyeball", - "eyeball-im", - "futures-core", - "futures-util", - "log-panics", - "matrix-sdk", - "matrix-sdk-sled", - "matrix-sdk-sqlite", - "mime", - "once_cell", - "opentelemetry", - "opentelemetry-otlp", - "ruma", - "sanitize-filename-reader-friendly", - "serde_json", - "thiserror", - "tokio", - "tokio-stream", - "tracing", - "tracing-android", - "tracing-core", - "tracing-opentelemetry", - "tracing-subscriber", - "uniffi", - "url", - "zeroize", -] - -[[package]] -name = "matrix-sdk-indexeddb" -version = "0.2.0" -dependencies = [ - "anyhow", - "assert_matches", - "async-trait", - "base64 0.21.0", - "dashmap", - "getrandom 0.2.9", - "gloo-utils", - "indexed_db_futures", - "js-sys", - "matrix-sdk-base", - "matrix-sdk-common", - "matrix-sdk-crypto", - "matrix-sdk-store-encryption", - "matrix-sdk-test", - "ruma", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "uuid", - "wasm-bindgen", - "wasm-bindgen-test", - "web-sys", -] - -[[package]] -name = "matrix-sdk-integration-testing" -version = "0.1.0" -dependencies = [ - "anyhow", - "assign", - "ctor 0.2.0", - "matrix-sdk", - "once_cell", - "tempfile", - "tokio", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "matrix-sdk-qrcode" -version = "0.4.0" -dependencies = [ - "base64 0.21.0", - "byteorder", - "image 0.23.14", - "qrcode", - "ruma-common", - "thiserror", - "vodozemac", -] - -[[package]] -name = "matrix-sdk-sled" -version = "0.2.0" -dependencies = [ - "assert_matches", - "async-stream", - "async-trait", - "dashmap", - "fs_extra", - "futures-core", - "futures-util", - "glob", - "matrix-sdk-base", - "matrix-sdk-common", - "matrix-sdk-crypto", - "matrix-sdk-store-encryption", - "matrix-sdk-test", - "once_cell", - "ruma", - "serde", - "serde_json", - "sled", - "tempfile", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "matrix-sdk-sqlite" -version = "0.1.0" -dependencies = [ - "assert_matches", - "async-stream", - "async-trait", - "ctor 0.2.0", - "dashmap", - "deadpool-sqlite", - "fs_extra", - "futures-core", - "futures-util", - "glob", - "matrix-sdk-base", - "matrix-sdk-common", - "matrix-sdk-crypto", - "matrix-sdk-store-encryption", - "matrix-sdk-test", - "once_cell", - "rmp-serde", - "ruma", - "rusqlite", - "serde", - "serde_json", - "tempfile", - "thiserror", - "tokio", - "tracing", - "tracing-subscriber", - "vodozemac", -] - -[[package]] -name = "matrix-sdk-store-encryption" -version = "0.2.0" -dependencies = [ - "anyhow", - "blake3", - "chacha20poly1305", - "displaydoc", - "getrandom 0.2.9", - "hmac", - "pbkdf2", - "rand 0.8.5", - "rmp-serde", - "serde", - "serde_json", - "sha2 0.10.6", - "thiserror", - "zeroize", -] - -[[package]] -name = "matrix-sdk-test" -version = "0.6.0" -dependencies = [ - "http", - "matrix-sdk-test-macros", - "once_cell", - "ruma", - "serde", - "serde_json", - "tokio", - "wasm-bindgen-test", -] - -[[package]] -name = "matrix-sdk-test-macros" -version = "0.3.0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -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.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" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -dependencies = [ - "adler32", -] - -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", -] - -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - -[[package]] -name = "napi" -version = "2.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b29acdc6cc5c918c3eabd51d241b1c6dfa8914f3552fcfd76e1d7536934581" -dependencies = [ - "bitflags 2.2.1", - "ctor 0.2.0", - "napi-derive", - "napi-sys", - "once_cell", - "tokio", -] - -[[package]] -name = "napi-build" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e" - -[[package]] -name = "napi-derive" -version = "2.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2ac63101a19228b0881694cac07468d642fd10e4f943a9c9feebeebf1a4787" -dependencies = [ - "convert_case", - "napi-derive-backend", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "napi-derive-backend" -version = "1.0.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e32b5bc4d803e40b783b0aa3fe488eac8711cfaa4c5c9915293dfd3d0b99925" -dependencies = [ - "convert_case", - "once_cell", - "proc-macro2", - "quote", - "regex", - "semver", - "syn 1.0.109", -] - -[[package]] -name = "napi-sys" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "166b5ef52a3ab5575047a9fe8d4a030cdd0f63c96f071cd6907674453b07bae3" -dependencies = [ - "libloading", -] - -[[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 = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nix" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "static_assertions", -] - -[[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 = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-format" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" -dependencies = [ - "arrayvec", - "itoa", -] - -[[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-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", - "libm", -] - -[[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 = "object" -version = "0.30.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" -dependencies = [ - "memchr", -] - -[[package]] -name = "olm-rs" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6c2c7054110ce4d7b4756d7b7fe507fea9413968ad0ef8f1d043d504aec725" -dependencies = [ - "getrandom 0.2.9", - "olm-sys", - "serde", - "serde_json", - "zeroize", -] - -[[package]] -name = "olm-sys" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2afecf25624989021f9f0f157f7152102fd147b89445d08449739f216002d339" -dependencies = [ - "cmake", - "fs_extra", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "openssl" -version = "0.10.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ea2d98598bf9ada7ea6ee8a30fb74f9156b63bbe495d64ec2b87c269d2dda3" -dependencies = [ - "bitflags 1.3.2", - "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.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.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "992bac49bdbab4423199c654a5515bd2a6c6a23bf03f2dd3bdb7e5ae6259bc69" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "opentelemetry" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" -dependencies = [ - "opentelemetry_api", - "opentelemetry_sdk", -] - -[[package]] -name = "opentelemetry-http" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc79add46364183ece1a4542592ca593e6421c60807232f5b8f7a31703825d" -dependencies = [ - "async-trait", - "bytes", - "http", - "opentelemetry_api", - "reqwest", -] - -[[package]] -name = "opentelemetry-otlp" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c928609d087790fc936a1067bdc310ae702bdf3b090c3f281b713622c8bbde" -dependencies = [ - "async-trait", - "futures", - "futures-util", - "http", - "opentelemetry", - "opentelemetry-http", - "opentelemetry-proto", - "prost", - "reqwest", - "thiserror", - "tokio", - "tonic", -] - -[[package]] -name = "opentelemetry-proto" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28" -dependencies = [ - "futures", - "futures-util", - "opentelemetry", - "prost", - "tonic", - "tonic-build", -] - -[[package]] -name = "opentelemetry_api" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" -dependencies = [ - "fnv", - "futures-channel", - "futures-util", - "indexmap", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" -dependencies = [ - "async-trait", - "crossbeam-channel", - "dashmap", - "fnv", - "futures-channel", - "futures-executor", - "futures-util", - "once_cell", - "opentelemetry_api", - "percent-encoding", - "rand 0.8.5", - "thiserror", - "tokio", - "tokio-stream", -] - -[[package]] -name = "os_str_bytes" -version = "6.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "parking" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.7", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "windows-sys 0.45.0", -] - -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "paste" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" - -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest 0.10.6", - "hmac", - "password-hash", - "sha2 0.10.6", -] - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "petgraph" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", -] - -[[package]] -name = "phf" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" -dependencies = [ - "phf_macros", - "phf_shared 0.11.1", -] - -[[package]] -name = "phf_codegen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand 0.8.5", -] - -[[package]] -name = "phf_generator" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" -dependencies = [ - "phf_shared 0.11.1", - "rand 0.8.5", -] - -[[package]] -name = "phf_macros" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" -dependencies = [ - "phf_generator 0.11.1", - "phf_shared 0.11.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" -dependencies = [ - "siphasher", -] - -[[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.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 = "pkcs7" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f7364e6d0e236473de91e042395d71e0e64715f99a60620b014a4a4c7d1619b" -dependencies = [ - "der", - "spki", -] - -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "plain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - -[[package]] -name = "plotters" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" - -[[package]] -name = "plotters-svg" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "png" -version = "0.16.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "deflate", - "miniz_oxide 0.3.7", -] - -[[package]] -name = "png" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide 0.7.1", -] - -[[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 = "poly1305" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" -dependencies = [ - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "pprof" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196ded5d4be535690899a4631cc9f18cdc41b7ebf24a79400f46f48e49a11059" -dependencies = [ - "backtrace", - "cfg-if", - "criterion", - "findshlibs", - "inferno", - "libc", - "log", - "nix", - "once_cell", - "parking_lot 0.12.1", - "smallvec", - "symbolic-demangle", - "tempfile", - "thiserror", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "prettyplease" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.109", -] - -[[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-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-macro2" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "proptest" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f1b898011ce9595050a68e60f90bad083ff2987a695a42357134c8381fba70" -dependencies = [ - "bitflags 1.3.2", - "byteorder", - "lazy_static", - "num-traits", - "quick-error", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_xorshift", - "regex-syntax 0.6.29", - "unarray", -] - -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" -dependencies = [ - "bytes", - "heck", - "itertools", - "lazy_static", - "log", - "multimap", - "petgraph", - "prettyplease", - "prost", - "prost-types", - "regex", - "syn 1.0.109", - "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost", -] - -[[package]] -name = "pulldown-cmark" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" -dependencies = [ - "bitflags 1.3.2", - "memchr", - "unicase", -] - -[[package]] -name = "qrcode" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d2f1455f3630c6e5107b4f2b94e74d76dea80736de0981fd27644216cff57f" -dependencies = [ - "checked_int_cast", - "image 0.23.14", -] - -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - -[[package]] -name = "quick-xml" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" -dependencies = [ - "memchr", -] - -[[package]] -name = "quote" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[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 0.5.1", -] - -[[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 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.9", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_xorshift" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" -dependencies = [ - "rand_core 0.6.4", -] - -[[package]] -name = "rand_xoshiro" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" -dependencies = [ - "rand_core 0.6.4", -] - -[[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "readlock" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed5b7f359207e69e1395440120fa3b07c59bb92c4ec077804cd10d7ebbe4c01a" - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.9", - "redox_syscall 0.2.16", - "thiserror", -] - -[[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 0.7.1", -] - -[[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-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[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.11.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" -dependencies = [ - "async-compression", - "base64 0.21.0", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "tokio-rustls", - "tokio-socks", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", - "winreg", -] - -[[package]] -name = "retain_mut" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0" - -[[package]] -name = "rgb" -version = "0.8.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" -dependencies = [ - "bytemuck", -] - -[[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 = "rmp" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f" -dependencies = [ - "byteorder", - "num-traits", - "paste", -] - -[[package]] -name = "rmp-serde" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - -[[package]] -name = "ruma" -version = "0.8.2" -source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" -dependencies = [ - "assign", - "js_int", - "js_option", - "ruma-appservice-api", - "ruma-client-api", - "ruma-common", - "ruma-federation-api", - "ruma-push-gateway-api", -] - -[[package]] -name = "ruma-appservice-api" -version = "0.8.1" -source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" -dependencies = [ - "js_int", - "ruma-common", - "serde", - "serde_json", -] - -[[package]] -name = "ruma-client-api" -version = "0.16.2" -source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" -dependencies = [ - "assign", - "bytes", - "http", - "js_int", - "js_option", - "maplit", - "ruma-common", - "serde", - "serde_html_form", - "serde_json", -] - -[[package]] -name = "ruma-common" -version = "0.11.3" -source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" -dependencies = [ - "base64 0.21.0", - "bytes", - "form_urlencoded", - "getrandom 0.2.9", - "html5ever", - "http", - "indexmap", - "js-sys", - "js_int", - "js_option", - "konst", - "percent-encoding", - "phf 0.11.1", - "pulldown-cmark", - "rand 0.8.5", - "regex", - "ruma-identifiers-validation", - "ruma-macros", - "serde", - "serde_html_form", - "serde_json", - "thiserror", - "tracing", - "url", - "uuid", - "wildmatch", -] - -[[package]] -name = "ruma-federation-api" -version = "0.7.1" -source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" -dependencies = [ - "js_int", - "ruma-common", - "serde", - "serde_json", -] - -[[package]] -name = "ruma-identifiers-validation" -version = "0.9.1" -source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" -dependencies = [ - "js_int", - "thiserror", -] - -[[package]] -name = "ruma-macros" -version = "0.11.3" -source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" -dependencies = [ - "once_cell", - "proc-macro-crate", - "proc-macro2", - "quote", - "ruma-identifiers-validation", - "serde", - "syn 1.0.109", - "toml 0.7.3", -] - -[[package]] -name = "ruma-push-gateway-api" -version = "0.7.1" -source = "git+https://github.com/ruma/ruma?rev=0143bd9b9f5dcfcaa835afb76f342c12f014f945#0143bd9b9f5dcfcaa835afb76f342c12f014f945" -dependencies = [ - "js_int", - "ruma-common", - "serde", - "serde_json", -] - -[[package]] -name = "rusqlite" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" -dependencies = [ - "bitflags 1.3.2", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustix" -version = "0.37.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b864d3c18a5785a05953adeed93e2dca37ed30f18e69bba9f30079d51f363f" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" -dependencies = [ - "base64 0.21.0", -] - -[[package]] -name = "rustversion" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[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 = "sanitize-filename-reader-friendly" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b750e71aac86f4b238844ac9416e7339a8de1225eb1ebe5fba89890f634c46bf" -dependencies = [ - "const_format", -] - -[[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 = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scoped_threadpool" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - -[[package]] -name = "scroll" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" -dependencies = [ - "scroll_derive", -] - -[[package]] -name = "scroll_derive" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "security-framework" -version = "2.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" -dependencies = [ - "bitflags 1.3.2", - "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 = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.160" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_bytes" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.160" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "serde_html_form" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53192e38d5c88564b924dbe9b60865ecbb71b81d38c4e61c817cffd3e36ef696" -dependencies = [ - "form_urlencoded", - "indexmap", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_json" -version = "1.0.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_qs" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" -dependencies = [ - "percent-encoding", - "serde", - "thiserror", -] - -[[package]] -name = "serde_spanned" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" -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_yaml" -version = "0.9.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "sha2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.6", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "signal-hook" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" - -[[package]] -name = "simd-adler32" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" - -[[package]] -name = "siphasher" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "sled" -version = "0.34.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935" -dependencies = [ - "crc32fast", - "crossbeam-epoch", - "crossbeam-utils", - "fs2", - "fxhash", - "libc", - "log", - "parking_lot 0.11.2", -] - -[[package]] -name = "sliding-sync-integration-test" -version = "0.1.0" -dependencies = [ - "anyhow", - "assert_matches", - "eyeball", - "eyeball-im", - "futures", - "matrix-sdk", - "matrix-sdk-integration-testing", - "tokio", - "uuid", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spki" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" -dependencies = [ - "der", -] - -[[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" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "str_stack" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb" - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot 0.12.1", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "symbolic-common" -version = "10.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b55cdc318ede251d0957f07afe5fed912119b8c1bc5a7804151826db999e737" -dependencies = [ - "debugid", - "memmap2", - "stable_deref_trait", - "uuid", -] - -[[package]] -name = "symbolic-demangle" -version = "10.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79be897be8a483a81fff6a3a4e195b4ac838ef73ca42d348b3f722da9902e489" -dependencies = [ - "cpp_demangle", - "rustc-demangle", - "symbolic-common", -] - -[[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 = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "tempfile" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", -] - -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[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 = "tiff" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437" -dependencies = [ - "jpeg-decoder 0.1.22", - "miniz_oxide 0.4.4", - "weezl", -] - -[[package]] -name = "tiff" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" -dependencies = [ - "flate2", - "jpeg-decoder 0.3.0", - "weezl", -] - -[[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", -] - -[[package]] -name = "time" -version = "0.3.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" -dependencies = [ - "itoa", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" - -[[package]] -name = "time-macros" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" -dependencies = [ - "time-core", -] - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", -] - -[[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 = "1.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" -dependencies = [ - "autocfg", - "bytes", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "socket2", - "tokio-macros", - "windows-sys 0.45.0", -] - -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-macros" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[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.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls", - "tokio", - "webpki", -] - -[[package]] -name = "tokio-socks" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" -dependencies = [ - "either", - "futures-util", - "thiserror", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", - "tokio-util", -] - -[[package]] -name = "tokio-util" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tonic" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.13.1", - "bytes", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost", - "prost-derive", - "tokio", - "tokio-stream", - "tokio-util", - "tower", - "tower-layer", - "tower-service", - "tracing", - "tracing-futures", -] - -[[package]] -name = "tonic-build" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" -dependencies = [ - "prettyplease", - "proc-macro2", - "prost-build", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "indexmap", - "pin-project", - "pin-project-lite", - "rand 0.8.5", - "slab", - "tokio", - "tokio-util", - "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" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-android" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12612be8f868a09c0ceae7113ff26afe79d81a24473a393cb9120ece162e86c0" -dependencies = [ - "android_log-sys", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "tracing-core" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" -dependencies = [ - "once_cell", - "valuable", -] - -[[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 = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-opentelemetry" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" -dependencies = [ - "once_cell", - "opentelemetry", - "tracing", - "tracing-core", - "tracing-log", - "tracing-subscriber", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "time 0.3.20", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "unarray" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" - -[[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-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "uniffi" -version = "0.23.0" -source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745" -dependencies = [ - "anyhow", - "camino", - "clap 3.2.23", - "uniffi_bindgen", - "uniffi_build", - "uniffi_core", - "uniffi_macros", -] - -[[package]] -name = "uniffi-bindgen" -version = "0.1.0" -dependencies = [ - "uniffi", -] - -[[package]] -name = "uniffi_bindgen" -version = "0.23.0" -source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745" -dependencies = [ - "anyhow", - "askama", - "camino", - "fs-err", - "glob", - "goblin", - "heck", - "once_cell", - "paste", - "serde", - "serde_json", - "toml 0.5.11", - "uniffi_meta", - "uniffi_testing", - "weedle2", -] - -[[package]] -name = "uniffi_build" -version = "0.23.0" -source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745" -dependencies = [ - "anyhow", - "camino", - "uniffi_bindgen", -] - -[[package]] -name = "uniffi_checksum_derive" -version = "0.23.0" -source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "uniffi_core" -version = "0.23.0" -source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745" -dependencies = [ - "anyhow", - "bytes", - "camino", - "cargo_metadata", - "log", - "once_cell", - "paste", - "static_assertions", -] - -[[package]] -name = "uniffi_macros" -version = "0.23.0" -source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745" -dependencies = [ - "bincode", - "camino", - "fs-err", - "once_cell", - "proc-macro2", - "quote", - "serde", - "syn 1.0.109", - "toml 0.5.11", - "uniffi_build", - "uniffi_meta", -] - -[[package]] -name = "uniffi_meta" -version = "0.23.0" -source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745" -dependencies = [ - "anyhow", - "bytes", - "serde", - "siphasher", - "uniffi_checksum_derive", - "uniffi_core", -] - -[[package]] -name = "uniffi_testing" -version = "0.23.0" -source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745" -dependencies = [ - "anyhow", - "camino", - "cargo_metadata", - "fs-err", - "once_cell", - "serde", - "serde_json", -] - -[[package]] -name = "universal-hash" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "unsafe-libyaml" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb" -dependencies = [ - "getrandom 0.2.9", - "wasm-bindgen", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "value-bag" -version = "1.0.0-alpha.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" -dependencies = [ - "ctor 0.1.26", - "version_check", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "vodozemac" -version = "0.3.0" -source = "git+https://github.com/matrix-org/vodozemac?rev=fb609ca1e4df5a7a818490ae86ac694119e41e71#fb609ca1e4df5a7a818490ae86ac694119e41e71" -dependencies = [ - "aes", - "arrayvec", - "base64 0.13.1", - "cbc", - "ed25519-dalek", - "hkdf", - "hmac", - "matrix-pickle", - "pkcs7", - "prost", - "rand 0.7.3", - "serde", - "serde_json", - "sha2 0.10.6", - "subtle", - "thiserror", - "x25519-dalek", - "zeroize", -] - -[[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - -[[package]] -name = "walkdir" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -dependencies = [ - "same-file", - "winapi-util", -] - -[[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 = "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.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] -name = "wasm-bindgen-test" -version = "0.3.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db36fc0f9fb209e88fb3642590ae0205bb5a56216dabd963ba15879fe53a30b" -dependencies = [ - "console_error_panic_hook", - "js-sys", - "scoped-tls", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test-macro", -] - -[[package]] -name = "wasm-bindgen-test-macro" -version = "0.3.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0734759ae6b3b1717d661fe4f016efcfb9828f5edb4520c18eaee05af3b43be9" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "wasm-command-bot" -version = "0.1.0" -dependencies = [ - "console_error_panic_hook", - "matrix-sdk", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test", - "web-sys", -] - -[[package]] -name = "web-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" -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 = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - -[[package]] -name = "weedle2" -version = "4.0.0" -source = "git+https://github.com/mozilla/uniffi-rs?rev=aa91307b6ac27aae6d5c7ad971b762df952d2745#aa91307b6ac27aae6d5c7ad971b762df952d2745" -dependencies = [ - "nom", -] - -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" - -[[package]] -name = "which" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" -dependencies = [ - "either", - "libc", - "once_cell", -] - -[[package]] -name = "wildmatch" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee583bdc5ff1cf9db20e9db5bb3ff4c3089a8f6b8b31aff265c9aba85812db86" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[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 = "winnow" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "wiremock" -version = "0.5.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7b0b5b253ebc0240d6aac6dd671c495c467420577bf634d3064ae7e6fa2b4c" -dependencies = [ - "assert-json-diff", - "async-trait", - "base64 0.21.0", - "deadpool", - "futures", - "futures-timer", - "http-types", - "hyper", - "log", - "once_cell", - "regex", - "serde", - "serde_json", - "tokio", -] - -[[package]] -name = "x25519-dalek" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2392b6b94a576b4e2bf3c5b2757d63f10ada8020a2e4d08ac849ebcf6ea8e077" -dependencies = [ - "curve25519-dalek", - "rand_core 0.5.1", - "serde", - "zeroize", -] - -[[package]] -name = "xshell" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaad2035244c56da05573d4d7fda5f903c60a5f35b9110e157a14a1df45a9f14" -dependencies = [ - "xshell-macros", -] - -[[package]] -name = "xshell-macros" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4916a4a3cad759e499a3620523bf9545cc162d7a06163727dde97ce9aaa4cf39" - -[[package]] -name = "xtask" -version = "0.1.0" -dependencies = [ - "camino", - "clap 4.2.4", - "fs_extra", - "serde", - "serde_json", - "uniffi", - "uniffi_bindgen", - "xshell", -] - -[[package]] -name = "zeroize" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo.lock b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo.lock new file mode 100644 index 000000000000..9dba9d42911d --- /dev/null +++ b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo.lock @@ -0,0 +1,2309 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c" +dependencies = [ + "memchr", +] + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "anyhow" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +dependencies = [ + "serde", +] + +[[package]] +name = "as_variant" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38fa22307249f86fb7fad906fcae77f2564caeb56d7209103c551cd1cf4798f" + +[[package]] +name = "assign" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002" + +[[package]] +name = "async-trait" +version = "0.1.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +dependencies = [ + "serde", +] + +[[package]] +name = "bitmaps" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" + +[[package]] +name = "blake3" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] + +[[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 = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bs58" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cc" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +dependencies = [ + "libc", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chacha20" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "chacha20poly1305" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" +dependencies = [ + "aead", + "chacha20", + "cipher", + "poly1305", + "zeroize", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", + "zeroize", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "const_panic" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" + +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + +[[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 = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "rand_core", + "typenum", +] + +[[package]] +name = "ctor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f34ba9a9bcb8645379e9de8cb3ecfcf4d1c85ba66d90deb3259206fa5aa193b" +dependencies = [ + "quote", + "syn 2.0.66", +] + +[[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 = "4.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest", + "fiat-crypto", + "platforms", + "rustc_version", + "serde", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "date_header" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c03c416ed1a30fbb027ef484ba6ab6f80e1eada675e1a2b92fd673c045a1f1d" + +[[package]] +name = "deadpool" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490" +dependencies = [ + "async-trait", + "deadpool-runtime", + "num_cpus", + "tokio", +] + +[[package]] +name = "deadpool-runtime" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaa37046cc0f6c3cc6090fbdbf73ef0b8ef4cfcc37f6befc0020f63e8cf121e1" +dependencies = [ + "tokio", +] + +[[package]] +name = "deadpool-sqlite" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8010e36e12f3be22543a5e478b4af20aeead9a700dd69581a5e050a070fc22c" +dependencies = [ + "deadpool", + "deadpool-sync", + "rusqlite", +] + +[[package]] +name = "deadpool-sync" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524bc3df0d57e98ecd022e21ba31166c2625e7d3e5bcc4510efaeeab4abcab04" +dependencies = [ + "deadpool-runtime", +] + +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "der_derive", + "flagset", + "zeroize", +] + +[[package]] +name = "der_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[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" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "ed25519" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "pkcs8", + "serde", + "signature", +] + +[[package]] +name = "ed25519-dalek" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +dependencies = [ + "curve25519-dalek", + "ed25519", + "rand_core", + "serde", + "sha2", + "subtle", + "zeroize", +] + +[[package]] +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 = "eyeball" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42482893d982111055ce4b24234d6250396d3785767c6b04cedd84612a0b80fb" +dependencies = [ + "futures-core", + "readlock", + "tracing", +] + +[[package]] +name = "eyeball-im" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "021fab29d9670be5867b16d56a95c29a12c3c1bb654e7d589010a028716d625d" +dependencies = [ + "futures-core", + "imbl", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + +[[package]] +name = "flagset" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdeb3aa5e95cf9aabc17f060cfa0ced7b83f042390760ca53bf09df9968acaa1" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[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-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-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-channel", + "futures-core", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[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.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hashlink" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[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 = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "imbl" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978d142c8028edf52095703af2fad11d6f611af1246685725d6b850634647085" +dependencies = [ + "bitmaps", + "imbl-sized-chunks", + "rand_core", + "rand_xoshiro", + "version_check", +] + +[[package]] +name = "imbl-sized-chunks" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "144006fb58ed787dcae3f54575ff4349755b00ccc99f4b4873860b654be1ed63" +dependencies = [ + "bitmaps", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown", + "serde", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[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 = "js_int" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d937f95470b270ce8b8950207715d71aa8e153c0d44c6684d59397ed4949160a" +dependencies = [ + "serde", +] + +[[package]] +name = "js_option" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68421373957a1593a767013698dbf206e2b221eefe97a44d98d18672ff38423c" +dependencies = [ + "serde", +] + +[[package]] +name = "konst" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "030400e39b2dff8beaa55986a17e0014ad657f569ca92426aafcb5e8e71faee7" +dependencies = [ + "const_panic", + "konst_kernel", + "typewit", +] + +[[package]] +name = "konst_kernel" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3376133edc39f027d551eb77b077c2865a0ef252b2e7d0dd6b6dc303db95d8b5" +dependencies = [ + "typewit", +] + +[[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.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "log" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + +[[package]] +name = "maplit" +version = "1.0.2" +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 = "matrix-pickle" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb521190328c57a2051f70250beb874dc0fac6bcd22b615f7f9700b7b4fb826" +dependencies = [ + "matrix-pickle-derive", + "thiserror", +] + +[[package]] +name = "matrix-pickle-derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fb3c7231cbb7fbbc50871615edebf65183b382cdaa1fe21c5e88a12617de8e" +dependencies = [ + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "matrix-sdk-base" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=931c5649420adb071caf1abafc7964758487e472#931c5649420adb071caf1abafc7964758487e472" +dependencies = [ + "as_variant", + "async-trait", + "bitflags", + "eyeball", + "eyeball-im", + "futures-util", + "matrix-sdk-common", + "matrix-sdk-store-encryption", + "once_cell", + "ruma", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "matrix-sdk-common" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=931c5649420adb071caf1abafc7964758487e472#931c5649420adb071caf1abafc7964758487e472" +dependencies = [ + "async-trait", + "futures-core", + "futures-util", + "gloo-timers", + "instant", + "ruma", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", + "tracing-subscriber", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "matrix-sdk-crypto" +version = "0.7.1" +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=931c5649420adb071caf1abafc7964758487e472#931c5649420adb071caf1abafc7964758487e472" +dependencies = [ + "aes", + "as_variant", + "async-trait", + "bs58", + "byteorder", + "cbc", + "cfg-if", + "ctr", + "eyeball", + "futures-core", + "futures-util", + "hkdf", + "hmac", + "itertools", + "js_option", + "matrix-sdk-common", + "matrix-sdk-qrcode", + "pbkdf2", + "rand", + "rmp-serde", + "ruma", + "serde", + "serde_json", + "sha2", + "subtle", + "thiserror", + "time", + "tokio", + "tokio-stream", + "tracing", + "url", + "vodozemac", + "zeroize", +] + +[[package]] +name = "matrix-sdk-crypto-nodejs" +version = "0.0.0" +dependencies = [ + "ahash", + "http", + "matrix-sdk-common", + "matrix-sdk-crypto", + "matrix-sdk-sqlite", + "napi", + "napi-build", + "napi-derive", + "serde_json", + "tracing-subscriber", + "zeroize", +] + +[[package]] +name = "matrix-sdk-qrcode" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=931c5649420adb071caf1abafc7964758487e472#931c5649420adb071caf1abafc7964758487e472" +dependencies = [ + "byteorder", + "qrcode", + "ruma-common", + "thiserror", + "vodozemac", +] + +[[package]] +name = "matrix-sdk-sqlite" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=931c5649420adb071caf1abafc7964758487e472#931c5649420adb071caf1abafc7964758487e472" +dependencies = [ + "async-trait", + "deadpool-sqlite", + "itertools", + "matrix-sdk-base", + "matrix-sdk-crypto", + "matrix-sdk-store-encryption", + "rmp-serde", + "ruma", + "rusqlite", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", + "vodozemac", +] + +[[package]] +name = "matrix-sdk-store-encryption" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=931c5649420adb071caf1abafc7964758487e472#931c5649420adb071caf1abafc7964758487e472" +dependencies = [ + "base64", + "blake3", + "chacha20poly1305", + "hmac", + "pbkdf2", + "rand", + "rmp-serde", + "serde", + "serde_json", + "sha2", + "thiserror", + "zeroize", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "napi" +version = "2.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ede2d12cd6fce44da537a4be1f5510c73be2506c2e32dfaaafd1f36968f3a0e" +dependencies = [ + "bitflags", + "ctor", + "napi-derive", + "napi-sys", + "once_cell", + "tokio", +] + +[[package]] +name = "napi-build" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e" + +[[package]] +name = "napi-derive" +version = "2.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da1c6a8fa84d549aa8708fcd062372bf8ec6e849de39016ab921067d21bde367" +dependencies = [ + "cfg-if", + "convert_case", + "napi-derive-backend", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "napi-derive-backend" +version = "1.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20bbc7c69168d06a848f925ec5f0e0997f98e8c8d4f2cc30157f0da51c009e17" +dependencies = [ + "convert_case", + "once_cell", + "proc-macro2", + "quote", + "regex", + "semver", + "syn 1.0.109", +] + +[[package]] +name = "napi-sys" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "166b5ef52a3ab5575047a9fe8d4a030cdd0f63c96f071cd6907674453b07bae3" +dependencies = [ + "libloading", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[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.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +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 = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project-lite" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs7" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d79178be066405e0602bf3035946edef6b11b3f9dde46dfe5f8bfd7dea4b77e7" +dependencies = [ + "der", + "spki", + "x509-cert", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "platforms" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" + +[[package]] +name = "poly1305" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" +dependencies = [ + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[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" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[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", + "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-macro2" +version = "1.0.85" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +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-derive" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "qrcode" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23e719ca51966ff9f5a8436edb00d6115b3c606a0bb27c8f8ca74a38ff2b036d" + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[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_xoshiro" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +dependencies = [ + "rand_core", +] + +[[package]] +name = "readlock" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7b323e7196daa571c8584de958be19e92941c41f845776fe06babfe8fa280a2" + +[[package]] +name = "regex" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.3.6", + "regex-syntax 0.7.4", +] + +[[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.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.4", +] + +[[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.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" + +[[package]] +name = "rmp" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmp-serde" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +dependencies = [ + "byteorder", + "rmp", + "serde", +] + +[[package]] +name = "ruma" +version = "0.10.1" +source = "git+https://github.com/ruma/ruma?rev=75e8829bec0b7bc5332860e1fb2df658d5c71d66#75e8829bec0b7bc5332860e1fb2df658d5c71d66" +dependencies = [ + "assign", + "js_int", + "js_option", + "ruma-client-api", + "ruma-common", + "ruma-events", + "web-time", +] + +[[package]] +name = "ruma-client-api" +version = "0.18.0" +source = "git+https://github.com/ruma/ruma?rev=75e8829bec0b7bc5332860e1fb2df658d5c71d66#75e8829bec0b7bc5332860e1fb2df658d5c71d66" +dependencies = [ + "as_variant", + "assign", + "bytes", + "date_header", + "http", + "js_int", + "js_option", + "maplit", + "ruma-common", + "ruma-events", + "serde", + "serde_html_form", + "serde_json", + "thiserror", + "url", + "web-time", +] + +[[package]] +name = "ruma-common" +version = "0.13.0" +source = "git+https://github.com/ruma/ruma?rev=75e8829bec0b7bc5332860e1fb2df658d5c71d66#75e8829bec0b7bc5332860e1fb2df658d5c71d66" +dependencies = [ + "as_variant", + "base64", + "bytes", + "form_urlencoded", + "getrandom", + "http", + "indexmap", + "js-sys", + "js_int", + "konst", + "percent-encoding", + "rand", + "regex", + "ruma-identifiers-validation", + "ruma-macros", + "serde", + "serde_html_form", + "serde_json", + "thiserror", + "time", + "tracing", + "url", + "uuid", + "web-time", + "wildmatch", +] + +[[package]] +name = "ruma-events" +version = "0.28.1" +source = "git+https://github.com/ruma/ruma?rev=75e8829bec0b7bc5332860e1fb2df658d5c71d66#75e8829bec0b7bc5332860e1fb2df658d5c71d66" +dependencies = [ + "as_variant", + "indexmap", + "js_int", + "js_option", + "percent-encoding", + "regex", + "ruma-common", + "ruma-identifiers-validation", + "ruma-macros", + "serde", + "serde_json", + "thiserror", + "tracing", + "url", + "wildmatch", +] + +[[package]] +name = "ruma-identifiers-validation" +version = "0.9.5" +source = "git+https://github.com/ruma/ruma?rev=75e8829bec0b7bc5332860e1fb2df658d5c71d66#75e8829bec0b7bc5332860e1fb2df658d5c71d66" +dependencies = [ + "js_int", + "thiserror", +] + +[[package]] +name = "ruma-macros" +version = "0.13.0" +source = "git+https://github.com/ruma/ruma?rev=75e8829bec0b7bc5332860e1fb2df658d5c71d66#75e8829bec0b7bc5332860e1fb2df658d5c71d66" +dependencies = [ + "once_cell", + "proc-macro-crate", + "proc-macro2", + "quote", + "ruma-identifiers-validation", + "serde", + "syn 2.0.66", + "toml", +] + +[[package]] +name = "rusqlite" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" +dependencies = [ + "bitflags", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" + +[[package]] +name = "serde" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_bytes" +version = "0.11.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "serde_html_form" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde65b75f2603066b78d6fa239b2c07b43e06ead09435f60554d3912962b4a3c" +dependencies = [ + "form_urlencoded", + "indexmap", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_json" +version = "1.0.117" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "serde", +] + +[[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 = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "rand_core", +] + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[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.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "thiserror" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[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.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 = "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 = "1.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd" +dependencies = [ + "backtrace", + "num_cpus", + "pin-project-lite", +] + +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", + "tokio-util", +] + +[[package]] +name = "tokio-util" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.14", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.7", +] + +[[package]] +name = "toml_edit" +version = "0.22.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.11", +] + +[[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.66", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "time", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "typewit" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e5cee357cc77d1e02f10a3e6c4e13b8462fafab05998b62d331b7d9485589ff" + +[[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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" + +[[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-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "uuid" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +dependencies = [ + "getrandom", + "wasm-bindgen", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vodozemac" +version = "0.6.0" +source = "git+https://github.com/matrix-org/vodozemac/?rev=4ef989c6a8eba0bc809e285a081c56320a9bbf1e#4ef989c6a8eba0bc809e285a081c56320a9bbf1e" +dependencies = [ + "aes", + "arrayvec", + "base64", + "cbc", + "chacha20poly1305", + "curve25519-dalek", + "ed25519-dalek", + "getrandom", + "hkdf", + "hmac", + "matrix-pickle", + "pkcs7", + "prost", + "rand", + "serde", + "serde_bytes", + "serde_json", + "sha2", + "subtle", + "thiserror", + "x25519-dalek", + "zeroize", +] + +[[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.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.66", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[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.66", + "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 = "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 = "wildmatch" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee583bdc5ff1cf9db20e9db5bb3ff4c3089a8f6b8b31aff265c9aba85812db86" + +[[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.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19f495880723d0999eb3500a9064d8dbcf836460b24c17df80ea7b5794053aac" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c52728401e1dc672a56e81e593e912aa54c78f40246869f78359a2bf24d29d" +dependencies = [ + "memchr", +] + +[[package]] +name = "x25519-dalek" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" +dependencies = [ + "curve25519-dalek", + "rand_core", + "serde", + "zeroize", +] + +[[package]] +name = "x509-cert" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1301e935010a701ae5f8655edc0ad17c44bad3ac5ce8c39185f75453b720ae94" +dependencies = [ + "const-oid", + "der", + "spki", +] + +[[package]] +name = "zerocopy" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/beta3.nix b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/beta3.nix index e92dccd640f5..1ffe479c4ff2 100644 --- a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/beta3.nix +++ b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/beta3.nix @@ -1,13 +1,76 @@ -import ./generic.nix { +{ + lib, + stdenv, + fetchFromGitHub, + cargo, + rustPlatform, + rustc, + napi-rs-cli, + nodejs, + libiconv, +}: + +stdenv.mkDerivation rec { + pname = "matrix-sdk-crypto-nodejs"; version = "0.1.0-beta.3"; - hash = "sha256-0p+1cMn9PU+Jk2JW7G+sdzxhMaI3gEAk5w2nm05oBSU="; - outputHashes = { - "uniffi-0.21.0" = "sha256-blKCfCsSNtr8NtO7Let7VJ/9oGuW9Eu8j9A6/oHUcP0="; + + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "matrix-rust-sdk"; + rev = "${pname}-v${version}"; + hash = "sha256-0p+1cMn9PU+Jk2JW7G+sdzxhMaI3gEAk5w2nm05oBSU="; }; - cargoLock = ./Cargo-beta.3.lock; + patches = [ # This is needed because two versions of indexed_db_futures are present (which will fail to vendor, see https://github.com/rust-lang/cargo/issues/10310). # (matrix-sdk-crypto-nodejs doesn't use this dependency, we only need to remove it to vendor the dependencies successfully.) ./remove-duplicate-dependency.patch ]; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo-beta.3.lock; + outputHashes = { + "uniffi-0.21.0" = "sha256-blKCfCsSNtr8NtO7Let7VJ/9oGuW9Eu8j9A6/oHUcP0="; + }; + }; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + cargo + rustc + napi-rs-cli + nodejs + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + + buildPhase = '' + runHook preBuild + + cd bindings/${pname} + npm run release-build --offline + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + local -r outPath="$out/lib/node_modules/@matrix-org/${pname}" + mkdir -p "$outPath" + cp package.json index.js index.d.ts matrix-sdk-crypto.*.node "$outPath" + + runHook postInstall + ''; + + meta = with lib; { + description = "No-network-IO implementation of a state machine that handles E2EE for Matrix clients"; + homepage = "https://github.com/matrix-org/matrix-rust-sdk/tree/${src.rev}/bindings/matrix-sdk-crypto-nodejs"; + license = licenses.asl20; + maintainers = with maintainers; [ + winter + dandellion + ]; + inherit (nodejs.meta) platforms; + }; } diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix index 9955e2af84b9..093d3d7a2133 100644 --- a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix +++ b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix @@ -1,11 +1,72 @@ -import ./generic.nix { - version = "0.1.0-beta.6"; - hash = "sha256-0oLk7yq/XELS0GkeZj7PxY3KKXfzws0djF3KmxYisY0="; - outputHashes = { - "ruma-0.8.2" = "sha256-bKvcElIVugj+gZZhPFPGfCqva4fo1IqW/e9gf+q/Tfw="; - "uniffi-0.23.0" = "sha256-4WUp3PQm3ZgqHNMvz9+PBtNAeiq6m4PBViwXpQDglLk="; - "vodozemac-0.3.0" = "sha256-tAimsVD8SZmlVybb7HvRffwlNsfb7gLWGCplmwbLIVE="; +{ + lib, + stdenv, + fetchFromGitHub, + cargo, + rustPlatform, + rustc, + napi-rs-cli, + nodejs, + libiconv, +}: + +stdenv.mkDerivation rec { + pname = "matrix-sdk-crypto-nodejs"; + version = "0.2.0-beta.1"; + + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "matrix-rust-sdk-crypto-nodejs"; + rev = "v${version}"; + hash = "sha256-g86RPfhF9XHpbXhHRbyhl920VazCrQyRQrYV6tVCHy4="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "matrix-sdk-base-0.7.0" = "sha256-nCiG4T/MB7gvGrmadKOEbh8+54081PHee9Bm8oY/nl0="; + "ruma-0.10.1" = "sha256-Yc5RKk4aRjNIoQsMl30fFehTDCkRO9VvenAvLoVHzXo="; + "vodozemac-0.6.0" = "sha256-jJgrJJ0SFcy2oRRZ3ubuKnM2pLO8Tx6NyXordWJjz8o="; + }; + }; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + cargo + rustc + napi-rs-cli + nodejs + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + + buildPhase = '' + runHook preBuild + + npm run release-build --offline + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + local -r outPath="$out/lib/node_modules/@matrix-org/${pname}" + mkdir -p "$outPath" + cp package.json index.js index.d.ts matrix-sdk-crypto.*.node "$outPath" + + runHook postInstall + ''; + + meta = with lib; { + description = "No-network-IO implementation of a state machine that handles E2EE for Matrix clients"; + homepage = "https://github.com/matrix-org/matrix-rust-sdk-crypto-nodejs"; + changelog = "https://github.com/matrix-org/matrix-rust-sdk-crypto-nodejs/blob/main/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ + winter + dandellion + ]; + inherit (nodejs.meta) platforms; }; - cargoLock = ./Cargo-beta.6.lock; - patches = []; } diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/generic.nix b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/generic.nix deleted file mode 100644 index 63e9861421ab..000000000000 --- a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/generic.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ version, hash, outputHashes, cargoLock, patches }: - -{ lib, stdenv, fetchFromGitHub -, cargo, rustPlatform, rustc, napi-rs-cli, nodejs, libiconv -}: - -stdenv.mkDerivation rec { - pname = "matrix-sdk-crypto-nodejs"; - inherit version patches; - - src = fetchFromGitHub { - owner = "matrix-org"; - repo = "matrix-rust-sdk"; - rev = "${pname}-v${version}"; - inherit hash; - }; - - - cargoDeps = rustPlatform.importCargoLock { - lockFile = cargoLock; - inherit outputHashes; - }; - - nativeBuildInputs = [ - rustPlatform.cargoSetupHook - cargo - rustc - napi-rs-cli - nodejs - ]; - - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - - buildPhase = '' - runHook preBuild - - cd bindings/${pname} - npm run release-build --offline - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - local -r outPath="$out/lib/node_modules/@matrix-org/${pname}" - mkdir -p "$outPath" - cp package.json index.js index.d.ts matrix-sdk-crypto.*.node "$outPath" - - runHook postInstall - ''; - - meta = with lib; { - description = "No-network-IO implementation of a state machine that handles E2EE for Matrix clients"; - homepage = "https://github.com/matrix-org/matrix-rust-sdk/tree/${src.rev}/bindings/matrix-sdk-crypto-nodejs"; - license = licenses.asl20; - maintainers = with maintainers; [ winter ]; - inherit (nodejs.meta) platforms; - }; -} diff --git a/pkgs/development/libraries/maxflow/default.nix b/pkgs/development/libraries/maxflow/default.nix deleted file mode 100644 index 9c53a16d3724..000000000000 --- a/pkgs/development/libraries/maxflow/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "maxflow"; - version = "3.0.5"; - - src = fetchFromGitHub { - owner = "gerddie"; - repo = pname; - rev = version; - hash = "sha256-a84SxGMnfBEaoMEeeIFffTOtErSN5yzZBrAUDjkalGY="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Software for computing mincut/maxflow in a graph"; - homepage = "https://github.com/gerddie/maxflow"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = [ maintainers.tadfisher ]; - }; -} diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix index f8f53522db13..9655393615b9 100644 --- a/pkgs/development/libraries/mbedtls/3.nix +++ b/pkgs/development/libraries/mbedtls/3.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "3.6.1"; - hash = "sha256-SVWz2uOvGIplnBr4g6nwfxKMWVpzdZjusseAhw6GOJ8="; + version = "3.6.2"; + hash = "sha256-tSWhF8i0Tx9QSFmyDEHdd2xveZvpyd+HXR+8xYj2Syo="; } diff --git a/pkgs/development/libraries/mbedtls/generic.nix b/pkgs/development/libraries/mbedtls/generic.nix index e87a133eb2a1..14545a2710fc 100644 --- a/pkgs/development/libraries/mbedtls/generic.nix +++ b/pkgs/development/libraries/mbedtls/generic.nix @@ -47,6 +47,10 @@ stdenv.mkDerivation rec { "-DGEN_FILES=off" ]; + env = lib.optionalAttrs (stdenv.cc.isGNU && (lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "14")) { + NIX_CFLAGS_COMPILE = "-Wno-error=calloc-transposed-args"; + }; + doCheck = true; # Parallel checking causes test failures diff --git a/pkgs/development/libraries/mdk-sdk/default.nix b/pkgs/development/libraries/mdk-sdk/default.nix deleted file mode 100644 index 3381282f675b..000000000000 --- a/pkgs/development/libraries/mdk-sdk/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchurl, autoPatchelfHook -, alsa-lib, gcc-unwrapped, libX11, libcxx, libdrm, libglvnd, libpulseaudio, libxcb, mesa, wayland, xz, zlib -, libva, libvdpau, addDriverRunpath -}: - -stdenv.mkDerivation rec { - pname = "mdk-sdk"; - version = "0.29.1"; - - src = fetchurl { - url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux-x64.tar.xz"; - hash = "sha256-7dkvm5kP3gcQwXOE9DrjoOTzKRiwk/PVeRr7poLdCU0="; - }; - - nativeBuildInputs = [ autoPatchelfHook ]; - - buildInputs = [ - alsa-lib gcc-unwrapped libX11 libcxx libdrm libglvnd libpulseaudio libxcb mesa wayland xz zlib - ]; - - appendRunpaths = lib.makeLibraryPath [ - libva libvdpau addDriverRunpath.driverLink - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - cp -r include $out - cp -d lib/amd64/libmdk* $out/lib - ln -s . $out/lib/amd64 - cp -r lib/cmake $out/lib - - runHook postInstall - ''; - - meta = with lib; { - description = "multimedia development kit"; - homepage = "https://github.com/wang-bin/mdk-sdk"; - license = licenses.unfree; - maintainers = with maintainers; [ orivej ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix index 8c07b2aad31a..296317788d21 100644 --- a/pkgs/development/libraries/medfile/default.nix +++ b/pkgs/development/libraries/medfile/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/*/*.c --replace-warn \ "#if H5_VERS_MINOR > 12" \ "#if H5_VERS_MINOR > 14" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Some medfile test files #define _a, which # breaks system header files that use _a as a function parameter substituteInPlace tests/c/*.c \ diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index cdd1eb3bdbf7..03efb5d57a70 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -3,7 +3,7 @@ , cmake , fetchFromGitLab , fetchpatch2 -, ffmpeg_7 +, ffmpeg , glew , gsm , lib @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { bzrtp ortp - ffmpeg_7 + ffmpeg glew libX11 libXext diff --git a/pkgs/development/libraries/memorymapping/default.nix b/pkgs/development/libraries/memorymapping/default.nix index 91af205f0320..1b3c17bc4f8c 100644 --- a/pkgs/development/libraries/memorymapping/default.nix +++ b/pkgs/development/libraries/memorymapping/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation { # Uses BSD-style funopen() to implement glibc-style fmemopen(). # Add more BSDs if you need to. platforms = platforms.darwin; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/libraries/memstream/default.nix b/pkgs/development/libraries/memstream/default.nix index 90505a56a931..7877718e6d35 100644 --- a/pkgs/development/libraries/memstream/default.nix +++ b/pkgs/development/libraries/memstream/default.nix @@ -9,13 +9,18 @@ stdenv.mkDerivation rec { sha256 = "0kvdb897g7nyviaz72arbqijk2g2wa61cmi3l5yh48rzr49r3a3a"; }; + postPatch = '' + substituteInPlace Makefile \ + --replace-fail 'cc' '$(CC)' + ''; + dontConfigure = true; postBuild = '' $AR rcs libmemstream.a memstream.o ''; - doCheck = true; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; checkPhase = '' runHook preCheck diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix deleted file mode 100644 index e05d387846a6..000000000000 --- a/pkgs/development/libraries/menu-cache/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, libfm-extra }: - -stdenv.mkDerivation rec { - pname = "menu-cache"; - version = "1.1.0"; - - src = fetchurl { - url = "mirror://sourceforge/lxde/menu-cache-${version}.tar.xz"; - sha256 = "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd"; - }; - - patches = [ - # Pull patch pending upstream inclusion for -fno-common toolchain support: - # https://github.com/lxde/menu-cache/pull/19 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/lxde/menu-cache/commit/1ce739649b4d66339a03fc0ec9ee7a2f7c141780.patch"; - sha256 = "08x3h0w2pl8ifj83v9jkf4j3zxcwsyzh251divlhhnwx0rw1pyn7"; - }) - ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ glib libfm-extra ]; - - meta = with lib; { - description = "Library to read freedesktop.org menu files"; - homepage = "https://blog.lxde.org/tag/menu-cache/"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.ttuegel ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix deleted file mode 100644 index 138e7f247c13..000000000000 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchurl -, meson, ninja -, pkg-config, libGLX -, testers -, gitUpdater -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "glu"; - version = "9.0.3"; - - src = let - inherit (finalAttrs) pname version; - in fetchurl { - url = "https://mesa.freedesktop.org/archive/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-vUP+EvN0sRkusV/iDkX/RWubwmq1fw7ukZ+Wyg+KMw8="; - }; - - nativeBuildInputs = [ meson ninja pkg-config ]; - propagatedBuildInputs = [ libGLX ]; - - outputs = [ "out" "dev" ]; - - mesonFlags = lib.optionals stdenv.isDarwin [ - "-Dgl_provider=gl" # glvnd is default - ]; - - enableParallelBuilding = true; - - passthru = { - tests = { - pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - }; - updateScript = gitUpdater { - # No nicer place to find latest release. - url = "https://gitlab.freedesktop.org/mesa/glu"; - rev-prefix = "glu-"; - }; - }; - - meta = { - description = "OpenGL utility library"; - homepage = "https://cgit.freedesktop.org/mesa/glu/"; - license = lib.licenses.sgi-b-20; - pkgConfigModules = [ "glu" ]; - platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isAndroid; - }; -}) diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index c78a3c31e0c2..6c349d679871 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -5,14 +5,14 @@ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; - version = "24.2.2"; + version = "24.2.6"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-1aRnG5BnFDuBOnGIb7X3yDk4PkhpBbMpp+IjfpmgtkM="; + hash = "sha256-yoX2DvinzqrG+rekiqO/iG6F6Zn63WC+ZaathimxO1g="; }; meta = { diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 94a72143a71f..fb5f6b1d817c 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -55,13 +55,13 @@ "svga" # VMWare virtualized GPU "virgl" # QEMU virtualized GPU (aka VirGL) "zink" # generic OpenGL over Vulkan, experimental - ] ++ lib.optionals (stdenv.isAarch64 || stdenv.isAarch32) [ + ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) [ "etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs) "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) "lima" # ARM Mali 4xx "panfrost" # ARM Mali Midgard and up (T/G series) "vc4" # Broadcom VC4 (Raspberry Pi 0-3) - ] ++ lib.optionals stdenv.isAarch64 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "tegra" # Nvidia Tegra SoCs "v3d" # Broadcom VC5 (Raspberry Pi 4) ] ++ lib.optionals stdenv.hostPlatform.isx86 [ @@ -78,7 +78,7 @@ # QEMU virtualized GPU (aka VirGL) # Requires ATOMIC_INT_LOCK_FREE == 2. "virtio" - ] ++ lib.optionals stdenv.isAarch64 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D) "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) "imagination-experimental" # PowerVR Rogue (currently N/A) @@ -170,7 +170,7 @@ in stdenv.mkDerivation { # Needed to discover llvm-config for cross preConfigure = '' - PATH=${llvmPackages.libllvm.dev}/bin:$PATH + PATH=${lib.getDev llvmPackages.libllvm}/bin:$PATH ''; mesonFlags = [ @@ -203,8 +203,8 @@ in stdenv.mkDerivation { # Enable Intel RT stuff when available (lib.mesonBool "install-intel-clc" true) - (lib.mesonEnable "intel-rt" stdenv.isx86_64) - (lib.mesonOption "clang-libdir" "${llvmPackages.clang-unwrapped.lib}/lib") + (lib.mesonEnable "intel-rt" stdenv.hostPlatform.isx86_64) + (lib.mesonOption "clang-libdir" "${lib.getLib llvmPackages.clang-unwrapped}/lib") # Clover, old OpenCL frontend (lib.mesonOption "gallium-opencl" "icd") @@ -289,11 +289,12 @@ in stdenv.mkDerivation { rustPlatform.bindgenHook wayland-scanner ] ++ lib.optionals needNativeCLC [ - buildPackages.mesa.driversdev + # `or null` to not break eval with `attribute missing` on darwin to linux cross + (buildPackages.mesa.driversdev or null) ]; disallowedRequisites = lib.optionals needNativeCLC [ - buildPackages.mesa.driversdev + (buildPackages.mesa.driversdev or null) ]; propagatedBuildInputs = [ libdrm ]; diff --git a/pkgs/development/libraries/meshoptimizer/default.nix b/pkgs/development/libraries/meshoptimizer/default.nix deleted file mode 100644 index c632932e5a53..000000000000 --- a/pkgs/development/libraries/meshoptimizer/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, nix-update-script }: - -let - basis_universal = fetchFromGitHub { - owner = "zeux"; - repo = "basis_universal"; - rev = "8903f6d69849fd782b72a551a4dd04a264434e20"; - hash = "sha256-o3dCxAAkpMoNkvkM7qD75cPn/obDc/fJ8u7KLPm1G6g="; - }; -in stdenv.mkDerivation rec { - pname = "meshoptimizer"; - version = "0.21"; - src = fetchFromGitHub { - owner = "zeux"; - repo = "meshoptimizer"; - rev = "v${version}"; - hash = "sha256-G8rR4Ff3mVxTPD1etI82fYwFawsjrLvwWuEuib+dUBU="; - }; - - nativeBuildInputs = [ cmake ]; - - outputs = [ "bin" "dev" "out" ]; - - cmakeFlags = [ - "-DMESHOPT_BUILD_GLTFPACK=ON" - "-DMESHOPT_BASISU_PATH=${basis_universal}" - ] ++ lib.optional (!stdenv.hostPlatform.isStatic) - "-DMESHOPT_BUILD_SHARED_LIBS:BOOL=ON"; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Mesh optimization library that makes meshes smaller and faster to render"; - homepage = "https://github.com/zeux/meshoptimizer"; - license = licenses.mit; - maintainers = [ maintainers.lillycham ]; - platforms = platforms.all; - mainProgram = "gltfpack"; - }; -} diff --git a/pkgs/development/libraries/microsoft-gsl/default.nix b/pkgs/development/libraries/microsoft-gsl/default.nix deleted file mode 100644 index 59df670e9ec5..000000000000 --- a/pkgs/development/libraries/microsoft-gsl/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, gtest -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "microsoft-gsl"; - version = "4.0.0"; - - src = fetchFromGitHub { - owner = "Microsoft"; - repo = "GSL"; - rev = "v${version}"; - hash = "sha256-cXDFqt2KgMFGfdh6NGE+JmP4R0Wm9LNHM0eIblYe6zU="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ gtest ]; - - # error: unsafe buffer access - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unsafe-buffer-usage"; - - patches = [ - # nvcc doesn't recognize the "gsl" attribute namespace (microsoft/onnxruntime#13573) - # only affects nvcc - (fetchpatch { - url = "https://raw.githubusercontent.com/microsoft/onnxruntime/4bfa69def85476b33ccfaf68cf070f3fb65d39f7/cmake/patches/gsl/1064.patch"; - hash = "sha256-0jESA+VENWQms9HGE0jRiZZuWLJehBlbArxSaQbYOrM="; - }) - ]; - - doCheck = true; - - meta = with lib; { - description = "C++ Core Guideline support library"; - longDescription = '' - The Guideline Support Library (GSL) contains functions and types that are suggested for - use by the C++ Core Guidelines maintained by the Standard C++ Foundation. - This package contains Microsoft's implementation of GSL. - ''; - homepage = "https://github.com/Microsoft/GSL"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice yuriaisaka ]; - }; -} diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix deleted file mode 100644 index 29fd2b662e69..000000000000 --- a/pkgs/development/libraries/mimalloc/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja -, secureBuild ? false -}: - -let - soext = stdenv.hostPlatform.extensions.sharedLibrary; -in -stdenv.mkDerivation rec { - pname = "mimalloc"; - version = "2.1.7"; - - src = fetchFromGitHub { - owner = "microsoft"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-slAi8Ht/jwpsFy5zC3CpfTdAkxEMpHJlgmNqMgz+psU="; - }; - - doCheck = !stdenv.hostPlatform.isStatic; - preCheck = let - ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; - in '' - export ${ldLibraryPathEnv}="$(pwd)/build:''${${ldLibraryPathEnv}}" - ''; - - nativeBuildInputs = [ cmake ninja ]; - cmakeFlags = [ "-DMI_INSTALL_TOPLEVEL=ON" ] - ++ lib.optionals secureBuild [ "-DMI_SECURE=ON" ] - ++ lib.optionals stdenv.hostPlatform.isStatic [ "-DMI_BUILD_SHARED=OFF" ] - ++ lib.optionals (!doCheck) [ "-DMI_BUILD_TESTS=OFF" ] - ; - - postInstall = let - rel = lib.versions.majorMinor version; - suffix = if stdenv.isLinux then "${soext}.${rel}" else ".${rel}${soext}"; - in '' - # first, move headers and cmake files, that's easy - mkdir -p $dev/lib - mv $out/lib/cmake $dev/lib/ - - find $dev $out -type f - '' + (lib.optionalString secureBuild '' - # pretend we're normal mimalloc - ln -sfv $out/lib/libmimalloc-secure${suffix} $out/lib/libmimalloc${suffix} - ln -sfv $out/lib/libmimalloc-secure${suffix} $out/lib/libmimalloc${soext} - ln -sfv $out/lib/libmimalloc-secure.a $out/lib/libmimalloc.a - ln -sfv $out/lib/mimalloc-secure.o $out/lib/mimalloc.o - ''); - - outputs = [ "out" "dev" ]; - - meta = with lib; { - description = "Compact, fast, general-purpose memory allocator"; - homepage = "https://github.com/microsoft/mimalloc"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = with maintainers; [ kamadorueda thoughtpolice ]; - }; -} diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix deleted file mode 100644 index 668b2fdf10c9..000000000000 --- a/pkgs/development/libraries/mimetic/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, cutee }: - -stdenv.mkDerivation rec { - pname = "mimetic"; - version = "0.9.8"; - - src = fetchurl { - url = "http://www.codesink.org/download/${pname}-${version}.tar.gz"; - sha256 = "003715lvj4nx23arn1s9ss6hgc2yblkwfy5h94li6pjz2a6xc1rs"; - }; - - buildInputs = [ cutee ]; - - patches = [ - # Fix build with gcc11 - (fetchpatch { - url = "https://github.com/tat/mimetic/commit/bf84940f9021950c80846e6b1a5f8b0b55991b00.patch"; - sha256 = "sha256-1JW9zPg67BgNsdIjK/jp9j7QMg50eRMz5FsDsbbzBlI="; - }) - ] ++ lib.optional stdenv.isAarch64 ./narrowing.patch; - - meta = with lib; { - description = "MIME handling library"; - homepage = "https://www.codesink.org/mimetic_mime_library.html"; - license = licenses.mit; - maintainers = with maintainers; [ leenaars]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/mimetic/narrowing.patch b/pkgs/development/libraries/mimetic/narrowing.patch deleted file mode 100644 index 676e29376c7d..000000000000 --- a/pkgs/development/libraries/mimetic/narrowing.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ru a/mimetic/codec/base64.cxx b/mimetic/codec/base64.cxx ---- a/mimetic/codec/base64.cxx 2014-06-17 10:12:00.000000000 +0200 -+++ b/mimetic/codec/base64.cxx 2020-07-30 20:54:10.212742011 +0200 -@@ -14,19 +14,19 @@ - "0123456789+/="; - - const char Base64::sDecTable[] = { -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,62,-1,-1,-1,63,52,53, -- 54,55,56,57,58,59,60,61,-1,-1, -- -1, eq_sign, -1,-1,-1, 0, 1, 2, 3, 4, -+ 255,255,255,255,255,255,255,255,255,255, -+ 255,255,255,255,255,255,255,255,255,255, -+ 255,255,255,255,255,255,255,255,255,255, -+ 255,255,255,255,255,255,255,255,255,255, -+ 255,255,255,62,255,255,255,63,52,53, -+ 54,55,56,57,58,59,60,61,255,255, -+ 255, eq_sign, 255,255,255, 0, 1, 2, 3, 4, - 5, 6, 7, 8, 9,10,11,12,13,14, - 15,16,17,18,19,20,21,22,23,24, -- 25,-1,-1,-1,-1,-1,-1,26,27,28, -+ 25,255,255,255,255,255,255,26,27,28, - 29,30,31,32,33,34,35,36,37,38, - 39,40,41,42,43,44,45,46,47,48, -- 49,50,51,-1 -+ 49,50,51,255 - }; - - const int Base64::sDecTableSz = sizeof(Base64::sDecTable) / sizeof(char); diff --git a/pkgs/development/libraries/miniaudio/default.nix b/pkgs/development/libraries/miniaudio/default.nix deleted file mode 100644 index d8567177be61..000000000000 --- a/pkgs/development/libraries/miniaudio/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -}: -stdenv.mkDerivation rec { - pname = "miniaudio"; - version = "0.11.21"; - - src = fetchFromGitHub { - owner = "mackron"; - repo = "miniaudio"; - rev = version; - hash = "sha256-EOIykyUXYcdDeTYb/Mf3xgcxEpKS4us213tEFwm5mEI="; - }; - - installPhase = '' - mkdir -p $out - cp -r $src/* $out/ - ''; - - meta = with lib; { - description = "Single header audio playback and capture library written in C"; - homepage = "https://github.com/mackron/miniaudio"; - changelog = "https://github.com/mackron/miniaudio/blob/${src.rev}/CHANGES.md"; - license = with licenses; [ unlicense /* or */ mit0 ]; - maintainers = [ maintainers.jansol ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/development/libraries/miniball/default.nix deleted file mode 100644 index 13a814684a42..000000000000 --- a/pkgs/development/libraries/miniball/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation { - pname = "miniball"; - version = "3.0"; - - src = fetchurl { - url = "https://www.inf.ethz.ch/personal/gaertner/miniball/Miniball.hpp"; - sha256 = "1piap5v8wqq0aachrq6j50qkr01gzpyndl6vf661vyykrfq0nnd2"; - }; - - dontUnpack = true; - - installPhase = '' - mkdir -p $out/include - cp $src $out/include/miniball.hpp - ''; - - meta = { - description = "Smallest Enclosing Balls of Points"; - homepage = "https://www.inf.ethz.ch/personal/gaertner/miniball.html"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.erikryb ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/minilibx/default.nix b/pkgs/development/libraries/minilibx/default.nix deleted file mode 100644 index b088aed10921..000000000000 --- a/pkgs/development/libraries/minilibx/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, installShellFiles -, libX11 -, libXext -, unstableGitUpdater -}: - -stdenv.mkDerivation { - pname = "minilibx"; - version = "0-unstable-2021-10-30"; - - src = fetchFromGitHub { - owner = "42Paris"; - repo = "minilibx-linux"; - rev = "7dc53a411a7d4ae286c60c6229bd1e395b0efb82"; - hash = "sha256-aRYMpaPC7dC6EHmmXugvwcQnaizRCQZKFcQX0K2MLM4="; - }; - - outputs = [ "out" "dev" "man" ]; - - nativeBuildInputs = [ - installShellFiles - ]; - - buildInputs = [ - libX11 - libXext - ]; - - dontConfigure = true; - - makefile = "Makefile.mk"; - - makeFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{include,lib} - cp mlx*.h $out/include - cp libmlx*.a $out/lib - installManPage man/man*/* - - runHook postInstall - ''; - - passthru = { - updateScript = unstableGitUpdater { }; - }; - - meta = with lib; { - description = "Simple X-Window (X11R6) programming API in C"; - homepage = "https://github.com/42Paris/minilibx-linux"; - license = licenses.bsd2; - maintainers = with maintainers; [ wegank ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix deleted file mode 100644 index ebb0f2889738..000000000000 --- a/pkgs/development/libraries/minixml/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "mxml"; - version = "3.3.1"; - - src = fetchFromGitHub { - owner = "michaelrsweet"; - repo = "mxml"; - rev = "v${version}"; - sha256 = "sha256-l7GUA+vlSECi/72eU3Y9COpGtLTRh3vYcHUi+uRkCn8="; - }; - - # remove the -arch flags which are set by default in the build - configureFlags = lib.optionals stdenv.isDarwin [ - "--with-archflags=\"-mmacosx-version-min=10.14\"" - ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Small XML library"; - homepage = "https://www.msweet.org/mxml/"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/miniz/default.nix b/pkgs/development/libraries/miniz/default.nix deleted file mode 100644 index 0cb5087c4f7a..000000000000 --- a/pkgs/development/libraries/miniz/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, fetchFromGitHub -, nix-update-script -, stdenv -, testers -, validatePkgConfig -, cmake -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "miniz"; - version = "3.0.2"; - - src = fetchFromGitHub { - owner = "richgel999"; - repo = "miniz"; - rev = finalAttrs.version; - hash = "sha256-3J0bkr2Yk+MJXilUqOCHsWzuykySv5B1nepmucvA4hg="; - }; - passthru.updateScript = nix-update-script {}; - - strictDeps = true; - nativeBuildInputs = [ cmake validatePkgConfig ]; - - postFixup = '' - substituteInPlace "$out"/lib/pkgconfig/miniz.pc \ - --replace-fail '=''${prefix}//' '=/' \ - --replace-fail '=''${exec_prefix}//' '=/' - ''; - - passthru.tests.pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - versionCheck = true; - }; - - meta = with lib; { - description = "Single C source file zlib-replacement library"; - homepage = "https://github.com/richgel999/miniz"; - license = licenses.mit; - maintainers = with maintainers; [ astro ]; - platforms = platforms.unix; - pkgConfigModules = [ "miniz" ]; - }; -}) diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix deleted file mode 100644 index fde280137e74..000000000000 --- a/pkgs/development/libraries/minizip-ng/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gtest -, pkg-config -, zlib -, bzip2 -, xz -, zstd -, openssl -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "minizip-ng"; - version = "4.0.3"; - - src = fetchFromGitHub { - owner = "zlib-ng"; - repo = "minizip-ng"; - rev = finalAttrs.version; - hash = "sha256-rP3WficGQZ2sSYnU9Tj0lVl36ShwV76fn/1lv+TrK2c="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ zlib bzip2 xz zstd openssl ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - "-DMZ_OPENSSL=ON" - "-DMZ_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" - "-DMZ_BUILD_UNIT_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" - "-DMZ_LIB_SUFFIX='-ng'" - ] ++ lib.optionals stdenv.isDarwin [ - # missing header file - "-DMZ_LIBCOMP=OFF" - ]; - - postInstall = '' - # make lib findable as libminizip-ng even if compat is enabled - for ext in so dylib a ; do - if [ -e $out/lib/libminizip.$ext ] && [ ! -e $out/lib/libminizip-ng.$ext ]; then - ln -s $out/lib/libminizip.$ext $out/lib/libminizip-ng.$ext - fi - done - if [ ! -e $out/include/minizip-ng ]; then - ln -s $out/include $out/include/minizip-ng - fi - ''; - - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; - nativeCheckInputs = [ gtest ]; - enableParallelChecking = false; - - meta = with lib; { - description = "Fork of the popular zip manipulation library found in the zlib distribution"; - homepage = "https://github.com/zlib-ng/minizip-ng"; - license = licenses.zlib; - maintainers = with maintainers; [ gebner ris ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix deleted file mode 100644 index 44cba9767b36..000000000000 --- a/pkgs/development/libraries/minizip/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, stdenv, zlib, autoreconfHook }: - -stdenv.mkDerivation { - pname = "minizip"; - inherit (zlib) src version; - - patchFlags = [ "-p3" ]; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ zlib ]; - - sourceRoot = "zlib-${zlib.version}/contrib/minizip"; - - meta = { - description = "Compression library implementing the deflate compression method found in gzip and PKZIP"; - inherit (zlib.meta) license homepage; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/mitama-cpp-result/default.nix b/pkgs/development/libraries/mitama-cpp-result/default.nix deleted file mode 100644 index 69d910e3bd99..000000000000 --- a/pkgs/development/libraries/mitama-cpp-result/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "mitama-cpp-result"; - version = "9.3.0"; - - src = fetchFromGitHub { - owner = "LoliGothick"; - repo = "mitama-cpp-result"; - rev = "v${finalAttrs.version}"; - hash = "sha256-CWYVPpmPIZZTsqXKh+Ft3SlQ4C9yjUof1mJ8Acn5kmM="; - }; - - nativeBuildInputs = [ - cmake - ]; - - meta = with lib; { - homepage = "https://github.com/LoliGothick/mitama-cpp-result"; - description = "Library that provides `result<T, E>` and `maybe<T>` and monadic functions for them"; - longDescription = '' - mitama-cpp-result is the C++17 libraries for error handling without exceptions. - - mitama-cpp-result provides `result<T, E>`, `maybe<T>`, and associated monadic functions - (like Result and Option in Programming Language Rust). - ''; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix; - }; -}) -# TODO [ ken-matsui ]: tests diff --git a/pkgs/development/libraries/mlib/default.nix b/pkgs/development/libraries/mlib/default.nix deleted file mode 100644 index 91e127127833..000000000000 --- a/pkgs/development/libraries/mlib/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "mlib"; - version = "0.7.3"; - - src = fetchFromGitHub { - owner = "P-p-H-d"; - repo = pname; - rev = "V${version}"; - hash = "sha256-r8ol923tNkZ13QXWjWpMrN6rBjjjg5XoBCho4OKdyvY="; - }; - - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=$(out)" ]; - - doCheck = true; - - meta = with lib; { - description = "Library of generic and type safe containers in pure C language"; - longDescription = '' - M*LIB (M star lib) is a C library enabling to define and use generic and - type safe container, aka handling generic containers in in pure C - language. The objects within the containers can be trivial or very - complex: they can have their own constructor, destructor, operators or can - be basic C type like the C type 'int'. This makes it possible to construct - fully recursive objects (container-of[...]-container-of-type-T), without - erasing type information (typically using void pointers or resorting to C - macro to access the container). - ''; - homepage = "https://github.com/P-p-H-d/mlib"; - changelog = "https://github.com/P-p-H-d/mlib/releases/tag/${src.rev}"; - license = licenses.bsd2; - maintainers = with maintainers; [ azahi ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 2ca4e6b46dc1..c3fa57204987 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -23,7 +23,7 @@ , darwin , cudaSupport ? config.cudaSupport , cudaPackages ? { } -, enableJackrack ? stdenv.isLinux +, enableJackrack ? stdenv.hostPlatform.isLinux , glib , ladspa-sdk , ladspaPlugins @@ -31,7 +31,7 @@ , python3 , swig , qt ? null -, enableSDL1 ? stdenv.isLinux +, enableSDL1 ? stdenv.hostPlatform.isLinux , SDL , enableSDL2 ? true , SDL2 @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "mlt"; - version = "7.26.0"; + version = "7.28.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - hash = "sha256-MC7D7bgguDFZi8Dyip1wAa2zxxkpLupl05xFiDc8Byw="; + hash = "sha256-rXxjHXXIFFggd2v9ZlNBs0XUDmvJxLvR2JfGkTxDYEA="; # The submodule contains glaxnimate code, since MLT uses internally some functions defined in glaxnimate. # Since glaxnimate is not available as a library upstream, we cannot remove for now this dependency on # submodules until upstream exports glaxnimate as a library: https://gitlab.com/mattbas/glaxnimate/-/issues/545 @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { rubberband sox vid-stab - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Accelerate ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix deleted file mode 100644 index cbc0f86e31b1..000000000000 --- a/pkgs/development/libraries/mm-common/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchurl -, bash -, gnome -, meson -, python3 -, ninja -}: - -stdenv.mkDerivation rec { - pname = "mm-common"; - version = "1.0.6"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "tVxGA3282rxc7js4nqEcw5EK22jr6IPpR3hHqmYIYuc="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - meson - python3 - ninja - ]; - - # for shebangs - buildInputs = [ - python3 - bash - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - description = "Common build files of GLib/GTK C++ bindings"; - longDescription = '' - The mm-common module provides the build infrastructure and utilities - shared among the GNOME C++ binding libraries. It is only a required - dependency for building the C++ bindings from the gnome.org version - control repository. An installation of mm-common is not required for - building tarball releases, unless configured to use maintainer-mode. - ''; - homepage = "https://www.gtkmm.org"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 802226c46f8a..fc967445d01c 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { icu cyrus_sasl snappy - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; diff --git a/pkgs/development/libraries/mongocxx/default.nix b/pkgs/development/libraries/mongocxx/default.nix index 5659043e2f62..415e7ca96e3a 100644 --- a/pkgs/development/libraries/mongocxx/default.nix +++ b/pkgs/development/libraries/mongocxx/default.nix @@ -10,7 +10,7 @@ , darwin }: -let stdenv = if pkgs.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; in +let stdenv = if pkgs.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; in stdenv.mkDerivation (finalAttrs: { pname = "mongocxx"; @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { mongoc openssl cyrus_sasl - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; cmakeFlags = [ "-DCMAKE_CXX_STANDARD=20" diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix deleted file mode 100644 index 23e613be0887..000000000000 --- a/pkgs/development/libraries/mono-addins/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mono4, gtk-sharp-2_0 }: - -stdenv.mkDerivation rec { - pname = "mono-addins"; - version = "1.3.3"; - - src = fetchFromGitHub { - owner = "mono"; - repo = "mono-addins"; - - rev = "mono-addins-${version}"; - sha256 = "018g3bd8afjc39h22h2j5r6ldsdn08ynx7wg889gdvnxg3hrxgl2"; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - - # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged - buildInputs = [ mono4 gtk-sharp-2_0 ]; - - dontStrip = true; - - meta = with lib; { - homepage = "https://www.mono-project.com/archived/monoaddins/"; - description = "Generic framework for creating extensible applications"; - mainProgram = "mautil"; - longDescription = '' - Mono.Addins is a generic framework for creating extensible applications, - and for creating libraries which extend those applications. - ''; - platforms = platforms.linux; - license = licenses.mit; - }; -} diff --git a/pkgs/development/libraries/monocypher/default.nix b/pkgs/development/libraries/monocypher/default.nix deleted file mode 100644 index f5853385ba91..000000000000 --- a/pkgs/development/libraries/monocypher/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "monocypher"; - version = "4.0.2"; - - src = fetchurl { - url = "https://monocypher.org/download/monocypher-${version}.tar.gz"; - hash = "sha256-ONBxeXOMDJBnfbo863p7hJa8/qdYuhpT6AP+0wrgh5w="; - }; - - installFlags = [ "PREFIX=$(out)" ]; - - doCheck = true; - - meta = with lib; { - description = "Boring crypto that simply works"; - homepage = "https://monocypher.org"; - license = with licenses; [ bsd2 cc0 ]; - platforms = platforms.linux; - maintainers = with maintainers; [ sikmir ]; - }; -} diff --git a/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch b/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch deleted file mode 100644 index 84b62dcd4eb0..000000000000 --- a/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/bindings/xmbind.alias -+++ b/bindings/xmbind.alias -@@ -62,3 +62,4 @@ - "Sun Microsystems, Inc." sun - ! "Sun Microsystems, Inc." sun_at - "Tektronix, Inc." tek -+"The X.Org Foundation" tpc diff --git a/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch b/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch deleted file mode 100644 index 801310ba41ce..000000000000 --- a/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/lib/Xm/XmP.h -+++ b/lib/Xm/XmP.h -@@ -1437,7 +1437,7 @@ extern void _XmDestroyParentCallback( - - #endif /* NO_XM_1_2_BC */ - --#if __GNUC__ -+#if __GNUC__ && ! __APPLE__ - # define XM_DEPRECATED __attribute__((__deprecated__)) - # define XM_ALIAS(sym) __attribute__((__weak__,alias(#sym))) - #else - diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix deleted file mode 100644 index d59c5894836d..000000000000 --- a/pkgs/development/libraries/motif/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libtool -, xbitmaps, libXext, libXft, libXrender, libXmu, libXt -, expat, libjpeg, libpng, libiconv -, flex -, libXp, libXau -, demoSupport ? false -}: -# refer to the gentoo package - -stdenv.mkDerivation rec { - pname = "motif"; - version = "2.3.8"; - - src = fetchurl { - url = "mirror://sourceforge/motif/${pname}-${version}.tar.gz"; - sha256 = "1rxwkrhmj8sfg7dwmkhq885valwqbh26d79033q7vb7fcqv756w5"; - }; - - buildInputs = [ - libtool - xbitmaps libXext libXft libXrender libXmu libXt - expat libjpeg libpng libiconv - ]; - - nativeBuildInputs = [ pkg-config flex ]; - - propagatedBuildInputs = [ libXp libXau ]; - - postPatch = lib.optionalString (!demoSupport) '' - sed 's/\<demos\>//' -i Makefile.{am,in} - ''; - - patches = [ - ./Remove-unsupported-weak-refs-on-darwin.patch - ./Add-X.Org-to-bindings-file.patch - (fetchpatch rec { - name = "fix-format-security.patch"; - url = "https://raw.githubusercontent.com/void-linux/void-packages/b9a1110dabb01c052dadc1abae1413bd4afe3652/srcpkgs/motif/patches/02-${name}"; - sha256 = "13vzpf8yxvhf4gl7q0yzlr6ak1yzx382fsqsrv5lc8jbbg4nwrrq"; - }) - (fetchpatch { - name = "missing-headers.patch"; - url = "https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/4cedf181bcfe13e5d206554c51edb82cb17e7ad5.patch"; - extraPrefix = "lib/Xm/"; - stripLen = 2; - hash = "sha256-WlagHOgf2gZDxXN+SSEW6de1FuN4fbpd9zviMwo1+HI="; - }) - (fetchurl { - name = "noreturn.patch"; - url = "https://dev.gentoo.org/~ulm/distfiles/motif-2.3.8-patches-5.tar.xz"; - downloadToTemp = true; - postFetch = '' - tar -xOf $downloadedFile patch/12_all_noreturn.patch > $out - ''; - hash = "sha256-FyaBfqD/TuJVFFHZlp1/b1MyL8BJAfV43ktuusgxbfE="; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/macports/macports-ports/acc8c7cb2247d9892bf5a52eb92431a4c0c8e1cd/x11/openmotif/files/wcs-functions.patch"; - extraPrefix = ""; - hash = "sha256-w3zCUs/RbnRoUJ0sNCI00noEOkov/IGV/zIygakSQqc="; - }) - ]; - - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=implicit-function-declaration" - "-Wno-error=incompatible-function-pointer-types" - ]; - }; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://motif.ics.com"; - description = "Unix standard widget-toolkit and window-manager"; - platforms = platforms.unix; - license = with licenses; [ lgpl21Plus ]; - maintainers = with maintainers; [ qyliss ]; - broken = demoSupport && stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16"; - }; -} diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix deleted file mode 100644 index d2cd26f38bf6..000000000000 --- a/pkgs/development/libraries/movit/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, SDL2 -, fftw -, gtest -, darwin -, eigen -, libepoxy -}: - -stdenv.mkDerivation rec { - pname = "movit"; - version = "1.7.1"; - - src = fetchurl { - url = "https://movit.sesse.net/${pname}-${version}.tar.gz"; - sha256 = "sha256-szBztwXwzLasSULPURUVFUB7QLtOmi3QIowcLLH7wRo="; - }; - - outputs = [ "out" "dev" ]; - - GTEST_DIR = "${gtest.src}/googletest"; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - SDL2 - fftw - gtest - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.OpenGL - darwin.libobjc - ]; - - propagatedBuildInputs = [ - eigen - libepoxy - ]; - - env = lib.optionalAttrs stdenv.isDarwin { - NIX_LDFLAGS = "-framework OpenGL"; - }; - - enableParallelBuilding = true; - - meta = with lib; { - description = "High-performance, high-quality video filters for the GPU"; - homepage = "https://movit.sesse.net"; - license = licenses.gpl2Plus; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix deleted file mode 100644 index 1fdb48dab4c4..000000000000 --- a/pkgs/development/libraries/mp4v2/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, lib, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "mp4v2"; - version = "5.0.1"; - - src = fetchFromGitHub { - # 2020-06-20: THE current upstream, maintained and used in distros fork. - owner = "TechSmith"; - repo = "mp4v2"; - rev = "Release-ThirdParty-MP4v2-${version}"; - sha256 = "sha256-OP+oVTH9pqYfHtYL1Kjrs1qey/J40ijLi5Gu8GJnvSY="; - }; - - env.NIX_CFLAGS_COMPILE = "-Wno-error=narrowing"; - - # `faac' expects `mp4.h'. - postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h"; - - enableParallelBuilding = true; - - meta = { - description = "Provides functions to read, create, and modify mp4 files"; - longDescription = '' - MP4v2 library provides an API to work with mp4 files - as defined by ISO-IEC:14496-1:2001 MPEG-4 Systems. - This container format is derived from Apple's QuickTime format. - ''; - homepage = "https://github.com/TechSmith/mp4v2"; - maintainers = [ lib.maintainers.Anton-Latukha ]; - platforms = lib.platforms.unix; - license = lib.licenses.mpl11; - }; -} diff --git a/pkgs/development/libraries/mpdecimal/default.nix b/pkgs/development/libraries/mpdecimal/default.nix deleted file mode 100644 index 1041100f9f8e..000000000000 --- a/pkgs/development/libraries/mpdecimal/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook }: - -stdenv.mkDerivation rec { - pname = "mpdecimal"; - version = "4.0.0"; - outputs = [ "out" "cxx" "doc" "dev" ]; - - src = fetchurl { - url = "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-${version}.tar.gz"; - hash = "sha256-lCRFwyRbInMP1Bpnp8XCMdEcsbmTa5wPdjNPt9C0Row="; - }; - - nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; - - configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ]; - - postInstall = '' - mkdir -p $cxx/lib - mv $out/lib/*c++* $cxx/lib - - mkdir -p $dev/nix-support - echo -n $cxx >> $dev/nix-support/propagated-build-inputs - ''; - - meta = { - description = "Library for arbitrary precision decimal floating point arithmetic"; - - longDescription = '' - libmpdec is a fast C/C++ library for correctly-rounded arbitrary - precision decimal floating point arithmetic. It is a complete - implementation of Mike Cowlishaw/IBM's General Decimal Arithmetic - Specification. The full specification is available here: - - http://speleotrove.com/decimal/ - - libmpdec will - with minor restrictions - also conform to the IEEE - 754-2008 Standard for Floating-Point Arithmetic, provided that the - appropriate context parameters are set. - - libmpdec++ is a complete implementation of the General Decimal Arithmetic - Specification. libmpdec++ is mostly a header library around libmpdec's C - functions. - ''; - - homepage = "https://www.bytereef.org/mpdecimal/index.html"; - - downloadPage = "https://www.bytereef.org/mpdecimal/download.html"; - - changelog = "https://www.bytereef.org/mpdecimal/changelog.html"; - - license = lib.licenses.bsd2; - - maintainers = with lib.maintainers; [ kaction ]; - - platforms = lib.platforms.unix ++ lib.platforms.windows; - }; -} diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix deleted file mode 100644 index 802a89c4c5e4..000000000000 --- a/pkgs/development/libraries/mpfi/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{lib, stdenv, fetchFromGitLab, autoreconfHook, texinfo, mpfr}: -stdenv.mkDerivation rec { - pname = "mpfi"; - version = "1.5.4"; - - src = fetchFromGitLab { - domain = "gitlab.inria.fr"; - owner = "mpfi"; - repo = "mpfi"; - - # Apparently there is an upstream off-by-one-commit error in tagging - # Conditional to allow auto-updaters to try new releases - # TODO: remove the conditional after an upstream update - # rev = version; - rev = if version == "1.5.4" then - "feab26bc54529417af983950ddbffb3a4c334d4f" - else version; - - sha256 = "sha256-aj/QmJ38ifsW36JFQcbp55aIQRvOpiqLHwEh/aFXsgo="; - }; - - sourceRoot = "${src.name}/mpfi"; - - nativeBuildInputs = [ autoreconfHook texinfo ]; - buildInputs = [ mpfr ]; - - meta = { - description = "Multiple precision interval arithmetic library based on MPFR"; - homepage = "http://perso.ens-lyon.fr/nathalie.revol/software.html"; - license = lib.licenses.lgpl21Plus; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix deleted file mode 100644 index 2ba09fc226fd..000000000000 --- a/pkgs/development/libraries/mpfr/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, stdenv -, fetchurl -, gmp -, writeScript -, updateAutotoolsGnuConfigScriptsHook -}: - -# 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 { - version = "4.2.1"; - pname = "mpfr"; - - src = fetchurl { - urls = [ - "https://www.mpfr.org/${pname}-${version}/${pname}-${version}.tar.xz" - "mirror://gnu/mpfr/${pname}-${version}.tar.xz" - ]; - hash = "sha256-J3gHNTpnJpeJlpRa8T5Sgp46vXqaW3+yeTiU4Y8fy7I="; - }; - - outputs = [ "out" "dev" "doc" "info" ]; - - strictDeps = true; - # necessary to build on FreeBSD native pending inclusion of - # https://git.savannah.gnu.org/cgit/config.git/commit/?id=e4786449e1c26716e3f9ea182caf472e4dbc96e0 - nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; - # mpfr.h requires gmp.h - propagatedBuildInputs = [ gmp ]; - - configureFlags = lib.optional stdenv.hostPlatform.isSunOS "--disable-thread-safe" - ++ lib.optional stdenv.hostPlatform.is64bit "--with-pic" - ++ lib.optionals stdenv.hostPlatform.isPower64 [ - # Without this, the `tget_set_d128` test experiences a link - # error due to missing `__dpd_trunctdkf`. - "--disable-decimal-float" - ]; - - doCheck = true; # not cross; - - enableParallelBuilding = true; - - passthru = { - updateScript = writeScript "update-mpfr" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl pcre common-updater-scripts - - set -eu -o pipefail - - # Expect the text in format of '<title>GNU MPFR version 4.1.1</title>' - new_version="$(curl -s https://www.mpfr.org/mpfr-current/ | - pcregrep -o1 '<title>GNU MPFR version ([0-9.]+)</title>')" - update-source-version ${pname} "$new_version" - ''; - }; - - meta = { - homepage = "https://www.mpfr.org/"; - description = "Library for multiple-precision floating-point arithmetic"; - - longDescription = '' - The GNU MPFR library is a C library for multiple-precision - floating-point computations with correct rounding. MPFR is - based on the GMP multiple-precision library. - - The main goal of MPFR is to provide a library for - multiple-precision floating-point computation which is both - efficient and has a well-defined semantics. It copies the good - ideas from the ANSI/IEEE-754 standard for double-precision - floating-point arithmetic (53-bit mantissa). - ''; - - license = lib.licenses.lgpl2Plus; - - maintainers = [ ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index a4716a47bb1b..a01cc726f223 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -1,17 +1,29 @@ -{ stdenv, lib, fetchurl, perl, gfortran -, openssh, hwloc, python3 -, darwin -# either libfabric or ucx work for ch4backend on linux. On darwin, neither of -# these libraries currently build so this argument is ignored on Darwin. -, ch4backend -# Process managers to build (`--with-pm`), -# cf. https://github.com/pmodels/mpich/blob/b80a6d7c24defe7cdf6c57c52430f8075a0a41d6/README.vin#L562-L586 -, withPm ? [ "hydra" "gforker" ] -, pmix -# PMIX support is likely incompatible with process managers (`--with-pm`) -# https://github.com/NixOS/nixpkgs/pull/274804#discussion_r1432601476 -, pmixSupport ? false -} : +{ + stdenv, + lib, + fetchurl, + perl, + gfortran, + automake, + autoconf, + openssh, + hwloc, + python3, + darwin, + # either libfabric or ucx work for ch4backend on linux. On darwin, neither of + # these libraries currently build so this argument is ignored on Darwin. + ch4backend, + # Process managers to build (`--with-pm`), + # cf. https://github.com/pmodels/mpich/blob/b80a6d7c24defe7cdf6c57c52430f8075a0a41d6/README.vin#L562-L586 + withPm ? [ + "hydra" + "gforker" + ], + pmix, + # PMIX support is likely incompatible with process managers (`--with-pm`) + # https://github.com/NixOS/nixpkgs/pull/274804#discussion_r1432601476 + pmixSupport ? false, +}: let withPmStr = if withPm != [ ] then builtins.concatStringsSep ":" withPm else "no"; @@ -19,37 +31,62 @@ in assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "mpich"; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "sha256-iD9bs66r9ifLhJLKAqA7GR0Jg2u+D1mdhQg1EXl4HUE="; + hash = "sha256-egGRgMUdFzitnF2NRSMU3mXoKO4kC8stH4DemmW+iKg="; }; - outputs = [ "out" "doc" "man" ]; + patches = [ + # Disables ROMIO test which was enabled in + # https://github.com/pmodels/mpich/commit/09686f45d77b7739f7aef4c2c6ef4c3060946595 + # The test searches for mpicc in $out/bin, which is not yet present in the checkPhase + # Moreover it fails one test. + ./disable-romio-tests.patch + ]; - configureFlags = [ - "--enable-shared" - "--with-pm=${withPmStr}" - ] ++ lib.optionals (lib.versionAtLeast gfortran.version "10") [ - "FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300 - "FCFLAGS=-fallow-argument-mismatch" - ] ++ lib.optionals pmixSupport [ - "--with-pmix" + outputs = [ + "out" + "doc" + "man" ]; + configureFlags = + [ + "--enable-shared" + "--with-pm=${withPmStr}" + ] + ++ lib.optionals (lib.versionAtLeast gfortran.version "10") [ + "FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300 + "FCFLAGS=-fallow-argument-mismatch" + ] + ++ lib.optionals pmixSupport [ + "--with-pmix" + ]; + enableParallelBuilding = true; - nativeBuildInputs = [ gfortran python3 ]; - buildInputs = [ perl openssh hwloc ] - ++ lib.optional (!stdenv.isDarwin) ch4backend + nativeBuildInputs = [ + gfortran + python3 + autoconf + automake + ]; + buildInputs = + [ + perl + openssh + hwloc + ] + ++ lib.optional (!stdenv.hostPlatform.isDarwin) ch4backend ++ lib.optional pmixSupport pmix - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation; # test_double_serializer.test fails on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preFixup = '' # Ensure the default compilers are the ones mpich was built with @@ -58,7 +95,7 @@ stdenv.mkDerivation rec { sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort ''; - meta = with lib; { + meta = { # As far as we know, --with-pmix silently disables all of `--with-pm` broken = pmixSupport && withPm != [ ]; @@ -74,7 +111,7 @@ stdenv.mkDerivation rec { url = "http://git.mpich.org/mpich.git/blob/a385d6d0d55e83c3709ae851967ce613e892cd21:/COPYRIGHT"; fullName = "MPICH license (permissive)"; }; - maintainers = [ maintainers.markuskowa ]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = [ lib.maintainers.markuskowa ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/mpich/disable-romio-tests.patch b/pkgs/development/libraries/mpich/disable-romio-tests.patch new file mode 100644 index 000000000000..2a4cd96aee69 --- /dev/null +++ b/pkgs/development/libraries/mpich/disable-romio-tests.patch @@ -0,0 +1,13 @@ +diff --git a/src/mpi/romio/Makefile.am b/src/mpi/romio/Makefile.am +index a6429766f..658f1c563 100644 +--- a/src/mpi/romio/Makefile.am ++++ b/src/mpi/romio/Makefile.am +@@ -56,7 +56,7 @@ nodist_include_HEADERS += include/mpio.h include/mpiof.h + + # ------------------------------------------------------------------------ + +-SUBDIRS = $(external_subdirs) . test ++SUBDIRS = $(external_subdirs) + DIST_SUBDIRS = test test-internal $(external_dist_subdirs) + + # for the sake of parallel make and avoiding an excessive number of convenience diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix deleted file mode 100644 index 26f22fd9968f..000000000000 --- a/pkgs/development/libraries/mpir/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, m4, which, yasm, autoreconfHook, fetchpatch, buildPackages }: - -stdenv.mkDerivation rec { - pname = "mpir"; - version = "3.0.0"; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - nativeBuildInputs = [ m4 which yasm autoreconfHook ]; - - src = fetchurl { - url = "https://mpir.org/mpir-${version}.tar.bz2"; - sha256 = "1fvmhrqdjs925hzr2i8bszm50h00gwsh17p2kn2pi51zrxck9xjj"; - }; - - patches = [ - # Fixes configure check failures with clang 16 due to implicit definitions of `exit`, which - # is an error with newer versions of clang. - (fetchpatch { - url = "https://github.com/wbhart/mpir/commit/bbc43ca6ae0bec4f64e69c9cd4c967005d6470eb.patch"; - hash = "sha256-vW+cDK5Hq2hKEyprOJaNbj0bT2FJmMcyZHPE8GUNUWc="; - }) - ]; - - configureFlags = [ "--enable-cxx" ] - ++ lib.optionals stdenv.isLinux [ "--enable-fat" ]; - - meta = { - description = "Highly optimised library for bignum arithmetic forked from GMP"; - license = lib.licenses.lgpl3Plus; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.unix; - downloadPage = "https://mpir.org/downloads.html"; - homepage = "https://mpir.org/"; - }; -} diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix deleted file mode 100644 index 049868c9381b..000000000000 --- a/pkgs/development/libraries/mps/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, sqlite -}: - -stdenv.mkDerivation rec { - pname = "mps"; - version = "1.118.0"; - - src = fetchFromGitHub { - owner = "Ravenbrook"; - repo = "mps"; - rev = "refs/tags/release-${version}"; - hash = "sha256-3ql3jWLccgnQHKf23B1en+nJ9rxqmHcWd7aBr93YER0="; - }; - - postPatch = '' - # Disable -Werror to avoid biuld failure on fresh toolchains like - # gcc-13. - substituteInPlace code/gc.gmk --replace-fail '-Werror ' ' ' - substituteInPlace code/gp.gmk --replace-fail '-Werror ' ' ' - substituteInPlace code/ll.gmk --replace-fail '-Werror ' ' ' - ''; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ sqlite ]; - - meta = { - description = "Flexible memory management and garbage collection library"; - homepage = "https://www.ravenbrook.com/project/mps"; - license = lib.licenses.sleepycat; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.thoughtpolice ]; - }; -} diff --git a/pkgs/development/libraries/mqtt_cpp/default.nix b/pkgs/development/libraries/mqtt_cpp/default.nix deleted file mode 100644 index fca89f8d0f68..000000000000 --- a/pkgs/development/libraries/mqtt_cpp/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - boost, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "mqtt_cpp"; - version = "13.2.1"; - - src = fetchFromGitHub { - owner = "redboltz"; - repo = "mqtt_cpp"; - rev = "v${finalAttrs.version}"; - hash = "sha256-E5dMZ0uJ1AOwiGTxD4qhbO72blplmXHh1gTYGE34H+0="; - }; - - nativeBuildInputs = [cmake]; - - buildInputs = [boost]; - - meta = with lib; { - description = "MQTT client/server for C++14 based on Boost.Asio"; - homepage = "https://github.com/redboltz/mqtt_cpp"; - license = licenses.boost; - maintainers = with maintainers; [spalf]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/msgpack-c/default.nix b/pkgs/development/libraries/msgpack-c/default.nix deleted file mode 100644 index 3d8cae18ace0..000000000000 --- a/pkgs/development/libraries/msgpack-c/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gtest -, zlib -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "msgpack-c"; - version = "6.0.2"; - - src = fetchFromGitHub { - owner = "msgpack"; - repo = "msgpack-c"; - rev = "refs/tags/c-${finalAttrs.version}"; - hash = "sha256-Tjgn9ayyPK1mKA4OBr7/VogSzJwh5RZR5BrMNadfqak="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - ]; - - cmakeFlags = [ - (lib.cmakeBool "MSGPACK_BUILD_EXAMPLES" false) # examples are not installed even if built - (lib.cmakeBool "MSGPACK_BUILD_TESTS" finalAttrs.finalPackage.doCheck) - ]; - - checkInputs = [ - gtest - zlib - ]; - - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - - meta = with lib; { - description = "MessagePack implementation for C"; - homepage = "https://github.com/msgpack/msgpack-c"; - changelog = "https://github.com/msgpack/msgpack-c/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = licenses.boost; - maintainers = with maintainers; [ nickcao ]; - }; -}) diff --git a/pkgs/development/libraries/msgpack-cxx/default.nix b/pkgs/development/libraries/msgpack-cxx/default.nix deleted file mode 100644 index 73664813612d..000000000000 --- a/pkgs/development/libraries/msgpack-cxx/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, boost -, zlib -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "msgpack-cxx"; - version = "6.1.1"; - - src = fetchFromGitHub { - owner = "msgpack"; - repo = "msgpack-c"; - rev = "refs/tags/cpp-${finalAttrs.version}"; - hash = "sha256-m0Ki+9/nZo2b4BUT+gUtdxok5I7xQtcfnMkbG+OHsKs="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - boost - ]; - - cmakeFlags = [ - "-DMSGPACK_BUILD_DOCS=OFF" # docs are not installed even if built - ] ++ lib.optional finalAttrs.finalPackage.doCheck "-DMSGPACK_BUILD_TESTS=ON"; - - checkInputs = [ - zlib - ]; - - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - - meta = with lib; { - description = "MessagePack implementation for C++"; - homepage = "https://github.com/msgpack/msgpack-c"; - changelog = "https://github.com/msgpack/msgpack-c/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = licenses.boost; - maintainers = with maintainers; [ nickcao ]; - }; -}) diff --git a/pkgs/development/libraries/msgpack/default.nix b/pkgs/development/libraries/msgpack/default.nix deleted file mode 100644 index d040eff11a32..000000000000 --- a/pkgs/development/libraries/msgpack/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ callPackage, fetchFromGitHub, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "3.3.0"; - - src = fetchFromGitHub { - owner = "msgpack"; - repo = "msgpack-c"; - rev = "cpp-${version}"; - sha256 = "02dxgzxlwn8g9ca2j4m0rjvdq1k2iciy6ickj615daz5w8pcjajd"; - }; -}) diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix deleted file mode 100644 index a784bc026361..000000000000 --- a/pkgs/development/libraries/msgpack/generic.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, cmake -, version, src, patches ? [ ] -, ... -}: - -stdenv.mkDerivation { - pname = "msgpack"; - inherit version; - - inherit src patches; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DMSGPACK_BUILD_EXAMPLES=OFF"; - - meta = with lib; { - description = "MessagePack implementation for C and C++"; - homepage = "https://msgpack.org"; - license = licenses.asl20; - maintainers = with maintainers; [ redbaron ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix deleted file mode 100644 index a21dd799e0fc..000000000000 --- a/pkgs/development/libraries/msgpuck/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: - -stdenv.mkDerivation rec { - pname = "msgpuck"; - version = "2.0"; - - src = fetchFromGitHub { - owner = "rtsisyk"; - repo = "msgpuck"; - rev = version; - sha256 = "0cjq86kncn3lv65vig9cqkqqv2p296ymcjjbviw0j1s85cfflps0"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ cmake pkg-config ]; - - meta = with lib; { - description = "Simple and efficient MsgPack binary serialization library in a self-contained header file"; - homepage = "https://github.com/rtsisyk/msgpuck"; - license = licenses.bsd2; - platforms = platforms.all; - maintainers = with maintainers; [ izorkin ]; - }; -} diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix deleted file mode 100644 index b5eaee26aa03..000000000000 --- a/pkgs/development/libraries/msilbc/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, ilbc, mediastreamer, pkg-config }: - -stdenv.mkDerivation rec { - pname = "msilbc"; - version = "2.1.2"; - - src = fetchurl { - url = "mirror://savannah/linphone/plugins/sources/${pname}-${version}.tar.gz"; - sha256 = "07j02y994ybh274fp7ydjvi76h34y2c34ndwjpjfcwwr03b48cfp"; - }; - - propagatedBuildInputs = [ ilbc mediastreamer ]; - nativeBuildInputs = [ pkg-config ]; - - configureFlags = [ - "ILBC_LIBS=ilbc" "ILBC_CFLAGS=-I${ilbc}/include" - "MEDIASTREAMER_LIBS=mediastreamer" "MEDIASTREAMER_CFLAGS=-I${mediastreamer}/include" - ]; - - meta = with lib; { - description = "Mediastreamer plugin for the iLBC audio codec"; - platforms = platforms.linux; - license = licenses.gpl2; - }; -} diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix deleted file mode 100644 index 334cda54d1bf..000000000000 --- a/pkgs/development/libraries/mtdev/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, stdenv -, fetchurl -, evdev-proto -, gitUpdater -}: - -stdenv.mkDerivation rec { - pname = "mtdev"; - version = "1.1.7"; - - src = fetchurl { - url = "https://bitmath.org/code/mtdev/${pname}-${version}.tar.bz2"; - hash = "sha256-oQetrSEB/srFSsf58OCg3RVdlUGT2lXCNAyX8v8dgU4="; - }; - - buildInputs = lib.optional stdenv.hostPlatform.isFreeBSD evdev-proto; - - passthru.updateScript = gitUpdater { - url = "https://bitmath.org/git/mtdev.git"; - rev-prefix = "v"; - }; - - meta = with lib; { - homepage = "https://bitmath.org/code/mtdev/"; - description = "Multitouch Protocol Translation Library"; - mainProgram = "mtdev-test"; - longDescription = '' - The mtdev is a stand-alone library which transforms all variants of - kernel MT events to the slotted type B protocol. The events put into - mtdev may be from any MT device, specifically type A without contact - tracking, type A with contact tracking, or type B with contact tracking. - See the kernel documentation for further details. - ''; - license = licenses.mit; - platforms = with platforms; freebsd ++ linux; - }; -} diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix deleted file mode 100644 index dff005d9eb1b..000000000000 --- a/pkgs/development/libraries/mtxclient/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, coeurl -, curl -, libevent -, nlohmann_json -, olm -, openssl -, re2 -, spdlog -}: - -stdenv.mkDerivation rec { - pname = "mtxclient"; - version = "0.10.0"; - - src = fetchFromGitHub { - owner = "Nheko-Reborn"; - repo = "mtxclient"; - rev = "v${version}"; - hash = "sha256-luWcbYCv5OM3aidxiO7glqD+VYnCZMElZYaPKbtvMYI="; - }; - - postPatch = '' - # See https://github.com/gabime/spdlog/issues/1897 - sed -i '1a add_compile_definitions(SPDLOG_FMT_EXTERNAL)' CMakeLists.txt - ''; - - cmakeFlags = [ - # Network requiring tests can't be disabled individually: - # https://github.com/Nheko-Reborn/mtxclient/issues/22 - "-DBUILD_LIB_TESTS=OFF" - "-DBUILD_LIB_EXAMPLES=OFF" - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - coeurl - curl - libevent - nlohmann_json - olm - openssl - re2 - spdlog - ]; - - meta = with lib; { - description = "Client API library for the Matrix protocol"; - homepage = "https://github.com/Nheko-Reborn/mtxclient"; - license = licenses.mit; - maintainers = with maintainers; [ fpletz pstn ]; - platforms = platforms.all; - # Should be fixable if a higher clang version is used, see: - # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 - broken = stdenv.hostPlatform.isDarwin; - }; -} diff --git a/pkgs/development/libraries/multipart-parser-c/default.nix b/pkgs/development/libraries/multipart-parser-c/default.nix deleted file mode 100644 index ef4834b8c005..000000000000 --- a/pkgs/development/libraries/multipart-parser-c/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "multipart-parser-c"; - version = "unstable-2015-12-14"; - - src = fetchFromGitHub { - owner = "iafonov"; - repo = pname; - rev = "772639cf10db6d9f5a655ee9b7eb20b815fab396"; - sha256 = "056r63vj8f1rwf3wk7jmwhm8ba25l6h1gs6jnkh0schbwcvi56xl"; - }; - - buildPhase = '' - make solib - ''; - - installPhase = '' - mkdir -p $out/lib - mv lib*${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ - - mkdir -p $out/include - mv *.h $out/include/ - ''; - - meta = { - 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/muparserx/default.nix b/pkgs/development/libraries/muparserx/default.nix deleted file mode 100644 index 957e49c4d6d7..000000000000 --- a/pkgs/development/libraries/muparserx/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "muparserx"; - version = "4.0.12"; - - src = fetchFromGitHub { - owner = "beltoforion"; - repo = "muparserx"; - rev = "v${version}"; - sha256 = "sha256-rekPXmncNdVX6LvPQP1M2Pzs3pyiCCcLPLnPFiyWJ4s="; - }; - - nativeBuildInputs = [ cmake ]; - - doCheck = true; - checkPhase = '' - echo "***Muparserx self-test***" - echo "quit" | ./example > test_result.log - cat test_result.log - if grep -Fqi "failed" test_result.log; then - echo ">=1 muparserx tests failed" - exit 1 - else - echo -e "\nmuparserx tests succeeded" - fi - ''; - - meta = with lib; { - description = "C++ Library for Parsing Expressions with Strings, Complex Numbers, Vectors, Matrices and more"; - homepage = "https://beltoforion.de/en/muparserx/"; - license = licenses.bsd2; - maintainers = with maintainers; [ drewrisinger ]; - }; -} diff --git a/pkgs/development/libraries/mustache-hpp/default.nix b/pkgs/development/libraries/mustache-hpp/default.nix deleted file mode 100644 index ce6dd1d21a9b..000000000000 --- a/pkgs/development/libraries/mustache-hpp/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "mustache"; - version = "4.1"; - - src = fetchFromGitHub { - owner = "kainjow"; - repo = "Mustache"; - rev = "v${version}"; - sha256 = "0r9rbk6v1wpld2ismfsk2lkhbyv3dkf0p03hkjivbj05qkfhvlbb"; - }; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/include - cp mustache.hpp $out/include - ''; - - meta = with lib; { - description = "Mustache text templates for modern C++"; - homepage = "https://github.com/kainjow/Mustache"; - license = licenses.boost; - }; -} diff --git a/pkgs/development/libraries/mustache-tcl/default.nix b/pkgs/development/libraries/mustache-tcl/default.nix deleted file mode 100644 index 063c8ea36f71..000000000000 --- a/pkgs/development/libraries/mustache-tcl/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, fetchFromGitHub, tcl, tcllib }: - -tcl.mkTclDerivation rec { - pname = "mustache-tcl"; - version = "1.1.3.4"; - - src = fetchFromGitHub { - owner = "ianka"; - repo = "mustache.tcl"; - rev = "v${version}"; - sha256 = "sha256-apM57LEZ0Y9hXcEPWrKYOoTVtP5QSqiaQrjTHQc3pc4="; - }; - - buildInputs = [ - tcllib - ]; - - unpackPhase = '' - mkdir -p $out/lib/mustache-tcl - cp $src/mustache.tcl $out/lib/mustache-tcl/mustache.tcl - cp $src/pkgIndex.tcl $out/lib/mustache-tcl/pkgIndex.tcl - ''; - - meta = with lib; { - homepage = "https://github.com/ianka/mustache.tcl"; - description = "Tcl implementation of the mustache templating language"; - license = licenses.bsd2; - platforms = platforms.all; - maintainers = with maintainers; [ nat-418 ]; - }; -} - diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix deleted file mode 100644 index 63a1628cc40d..000000000000 --- a/pkgs/development/libraries/mutest/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, meson -, ninja -, unstableGitUpdater -}: - -stdenv.mkDerivation { - pname = "mutest"; - version = "0-unstable-2023-02-24"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "ebassi"; - repo = "mutest"; - rev = "18a20071773f7c4b75e82a931ef9b916b273b3e5"; - sha256 = "z0kASte0/I48Fgxhblu24MjGHidWomhfFOhfStGtPn4="; - }; - - nativeBuildInputs = [ - meson - ninja - ]; - - doCheck = true; - - passthru = { - updateScript = unstableGitUpdater { }; - }; - - meta = with lib; { - homepage = "https://github.com/ebassi/mutest"; - description = "BDD testing framework for C, inspired by Mocha"; - license = licenses.mit; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/mvapich/default.nix b/pkgs/development/libraries/mvapich/default.nix deleted file mode 100644 index 1299d06d4687..000000000000 --- a/pkgs/development/libraries/mvapich/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, bison, numactl, libxml2 -, perl, gfortran, slurm, openssh, hwloc, zlib, makeWrapper -# InfiniBand dependencies -, opensm, rdma-core -# OmniPath dependencies -, libpsm2, libfabric -# Compile with slurm as a process manager -, useSlurm ? false -# Network type for MVAPICH2 -, network ? "ethernet" -} : - -assert builtins.elem network [ "ethernet" "infiniband" "omnipath" ]; - -stdenv.mkDerivation rec { - pname = "mvapich"; - version = "2.3.7"; - - src = fetchurl { - url = "http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-${version}.tar.gz"; - sha256 = "sha256-w5pEkvS+UN9hAHhXSLoolOI85FCpQSgYHVFtpXV3Ua4="; - }; - - outputs = [ "out" "doc" "man" ]; - - nativeBuildInputs = [ pkg-config bison makeWrapper gfortran ]; - propagatedBuildInputs = [ numactl rdma-core zlib opensm ]; - buildInputs = [ - numactl - libxml2 - perl - openssh - hwloc - ] ++ lib.optionals (network == "infiniband") [ rdma-core opensm ] - ++ lib.optionals (network == "omnipath") [ libpsm2 libfabric ] - ++ lib.optional useSlurm slurm; - - configureFlags = [ - "--with-pm=hydra" - "--enable-fortran=all" - "--enable-cxx" - "--enable-threads=multiple" - "--enable-hybrid" - "--enable-shared" - "FFLAGS=-fallow-argument-mismatch" # fix build with gfortran 10 - ] ++ lib.optional useSlurm "--with-pm=slurm" - ++ lib.optional (network == "ethernet") "--with-device=ch3:sock" - ++ lib.optionals (network == "infiniband") [ "--with-device=ch3:mrail" "--with-rdma=gen2" "--disable-ibv-dlopen" ] - ++ lib.optionals (network == "omnipath") ["--with-device=ch3:psm" "--with-psm2=${libpsm2}"]; - - doCheck = true; - - preFixup = '' - # /tmp/nix-build... ends up in the RPATH, fix it manually - for entry in $out/bin/mpichversion $out/bin/mpivars; do - echo "fix rpath: $entry" - patchelf --allowed-rpath-prefixes ${builtins.storeDir} --shrink-rpath $entry - done - - # Ensure the default compilers are the ones mvapich was built with - substituteInPlace $out/bin/mpicc --replace 'CC="gcc"' 'CC=${stdenv.cc}/bin/cc' - substituteInPlace $out/bin/mpicxx --replace 'CXX="g++"' 'CXX=${stdenv.cc}/bin/c++' - substituteInPlace $out/bin/mpifort --replace 'FC="gfortran"' 'FC=${gfortran}/bin/gfortran' - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "MPI-3.1 implementation optimized for Infiband transport"; - homepage = "https://mvapich.cse.ohio-state.edu"; - license = licenses.bsd3; - maintainers = [ maintainers.markuskowa ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/mvfst/default.nix b/pkgs/development/libraries/mvfst/default.nix index 0a784fff339a..7c9d2e8da445 100644 --- a/pkgs/development/libraries/mvfst/default.nix +++ b/pkgs/development/libraries/mvfst/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index c785e640ccb0..d52eadbba6cd 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -45,12 +45,12 @@ stdenv.mkDerivation rec { ois ] ++ lib.optionals withOgre [ ogre - ] ++ lib.optionals (!withOgre && stdenv.isLinux) [ + ] ++ lib.optionals (!withOgre && stdenv.hostPlatform.isLinux) [ libGL libGLU - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix deleted file mode 100644 index 960fefc74ac1..000000000000 --- a/pkgs/development/libraries/mythes/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, hunspell, ncurses, pkg-config, perl }: - -stdenv.mkDerivation rec { - pname = "mythes"; - version = "1.2.4"; - - src = fetchurl { - url = "mirror://sourceforge/hunspell/mythes-${version}.tar.gz"; - sha256 = "0prh19wy1c74kmzkkavm9qslk99gz8h8wmjvwzjc6lf8v2az708y"; - }; - - buildInputs = [ hunspell ]; - nativeBuildInputs = [ ncurses pkg-config perl ]; - - meta = { - homepage = "https://hunspell.sourceforge.net/"; - description = "Thesaurus library from Hunspell project"; - mainProgram = "th_gen_idx.pl"; - license = lib.licenses.bsd3; - inherit (hunspell.meta) platforms; - }; -} diff --git a/pkgs/development/libraries/nanodbc/default.nix b/pkgs/development/libraries/nanodbc/default.nix deleted file mode 100644 index 7fca00c1d459..000000000000 --- a/pkgs/development/libraries/nanodbc/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, catch2, cmake, unixODBC }: - -stdenv.mkDerivation rec { - pname = "nanodbc"; - version = "2.14.0"; - - src = fetchFromGitHub { - owner = "nanodbc"; - repo = "nanodbc"; - rev = "v${version}"; - hash = "sha256-dVUOwA7LfLqcQq2nc6OAha0krmgTy5RUHupBVrNdo4g="; - }; - - postPatch = '' - cp ${catch2}/include/catch2/catch.hpp test/catch/catch.hpp - ''; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ unixODBC ]; - - cmakeFlags = if (stdenv.hostPlatform.isStatic) then - [ "-DBUILD_STATIC_LIBS=ON" ] - else - [ "-DBUILD_SHARED_LIBS=ON" ]; - - meta = with lib; { - homepage = "https://github.com/nanodbc/nanodbc"; - changelog = "https://github.com/nanodbc/nanodbc/raw/v${version}/CHANGELOG.md"; - description = "Small C++ wrapper for the native C ODBC API"; - license = licenses.mit; - maintainers = [ maintainers.bzizou ]; - }; -} diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix deleted file mode 100644 index d7b7409dad14..000000000000 --- a/pkgs/development/libraries/nanomsg/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, cmake, fetchFromGitHub, fetchpatch }: - -stdenv.mkDerivation rec { - version = "1.1.5"; - pname = "nanomsg"; - - src = fetchFromGitHub { - owner = "nanomsg"; - repo = "nanomsg"; - rev = version; - sha256 = "01ddfzjlkf2dgijrmm3j3j8irccsnbgfvjcnwslsfaxnrmrq5s64"; - }; - - patches = [ - # Add pkgconfig fix from https://github.com/nanomsg/nanomsg/pull/1085 - (fetchpatch { - url = "https://github.com/nanomsg/nanomsg/commit/e3323f19579529d272cb1d55bd6b653c4f34c064.patch"; - sha256 = "URz7TAqqpKxqjgvQqNX4WNSShwiEzAvO2h0hCZ2NhVY="; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - # https://github.com/nanomsg/nanomsg/issues/1082 - postPatch = '' - substituteInPlace src/pkgconfig.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ - ''; - - meta = with lib; { - description= "Socket library that provides several common communication patterns"; - homepage = "https://nanomsg.org/"; - license = licenses.mit; - mainProgram = "nanocat"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/nanosvg/default.nix b/pkgs/development/libraries/nanosvg/default.nix deleted file mode 100644 index 29861777889b..000000000000 --- a/pkgs/development/libraries/nanosvg/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, unstableGitUpdater }: - -stdenv.mkDerivation { - pname = "nanosvg"; - version = "0-unstable-2023-12-30"; - - src = fetchFromGitHub { - owner = "memononen"; - repo = "nanosvg"; - rev = "93ce879dc4c04a3ef1758428ec80083c38610b1f"; - hash = "sha256-ZtenaXJqMZr2+BxYENG1zUoQ+Qoxlxy0m/1YfJBKAFk="; - }; - - nativeBuildInputs = [ cmake ]; - - passthru.updateScript = unstableGitUpdater { }; - - meta = with lib; { - description = "Simple stupid SVG parser"; - homepage = "https://github.com/memononen/nanosvg"; - license = licenses.zlib; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/ncnn/cmakelists.patch b/pkgs/development/libraries/ncnn/cmakelists.patch deleted file mode 100644 index a43d7b0c4b72..000000000000 --- a/pkgs/development/libraries/ncnn/cmakelists.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 785e2cd..459024d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -589,7 +589,8 @@ endif() - if(NCNN_VULKAN) - if(NCNN_SYSTEM_GLSLANG) - find_package(Threads) -- find_package(glslang QUIET) -+ find_package(SPIRV-Tools-opt REQUIRED) -+ find_package(glslang REQUIRED) - if(glslang_FOUND) - add_library(glslang ALIAS glslang::glslang) - add_library(SPIRV ALIAS glslang::SPIRV) -@@ -601,7 +602,6 @@ if(NCNN_VULKAN) - set(NCNN_SYSTEM_GLSLANG OFF) - else() - include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") -- include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") - if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") - # hlsl support can be optional - include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") -diff --git a/src/ncnn.pc.in b/src/ncnn.pc.in -index b580fce..be2becd 100644 ---- a/src/ncnn.pc.in -+++ b/src/ncnn.pc.in -@@ -1,6 +1,6 @@ - prefix=${pcfiledir}/../.. --librarydir=${prefix}/@CMAKE_INSTALL_LIBDIR@ --includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -+librarydir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ - - Name: @CMAKE_PROJECT_NAME@ - Description: high-performance neural network inference framework optimized for the mobile platform diff --git a/pkgs/development/libraries/ncnn/default.nix b/pkgs/development/libraries/ncnn/default.nix deleted file mode 100644 index ae82d0490be4..000000000000 --- a/pkgs/development/libraries/ncnn/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, vulkan-headers -, vulkan-loader -, glslang -, opencv -, protobuf -}: - -stdenv.mkDerivation rec { - pname = "ncnn"; - version = "20240820"; - - src = fetchFromGitHub { - owner = "Tencent"; - repo = pname; - rev = version; - hash = "sha256-KFRWpPajSqYeasPKaNMVe0WTIXwCI5v9GLo5ygN/22M="; - }; - - patches = [ - ./cmakelists.patch - ]; - - cmakeFlags = [ - "-DNCNN_CMAKE_VERBOSE=1" # Only for debugging the build - "-DNCNN_SHARED_LIB=1" - "-DNCNN_ENABLE_LTO=1" - "-DNCNN_VULKAN=1" - "-DNCNN_BUILD_EXAMPLES=0" - "-DNCNN_BUILD_TOOLS=0" - "-DNCNN_SYSTEM_GLSLANG=1" - "-DNCNN_PYTHON=0" # Should be an attribute - ] - # Requires setting `Vulkan_LIBRARY` on Darwin. Otherwise the build fails due to missing symbols. - ++ lib.optionals stdenv.isDarwin [ "-DVulkan_LIBRARY=-lvulkan" ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ vulkan-headers vulkan-loader glslang opencv protobuf ]; - - meta = with lib; { - description = "ncnn is a high-performance neural network inference framework optimized for the mobile platform"; - homepage = "https://github.com/Tencent/ncnn"; - license = licenses.bsd3; - maintainers = with maintainers; [ tilcreator ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix deleted file mode 100644 index 1b5dced4e81a..000000000000 --- a/pkgs/development/libraries/nco/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ antlr2 -, coreutils -, curl -, fetchFromGitHub -, flex -, gsl -, lib -, libtool -, netcdf -, netcdfcxx4 -, stdenv -, udunits -, which -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "nco"; - version = "5.2.8"; - - src = fetchFromGitHub { - owner = "nco"; - repo = "nco"; - rev = finalAttrs.version; - hash = "sha256-FTaXgBmDlQv75roeJo4dJyJCpzOj9ilJo2hdxDnyjno="; - }; - - nativeBuildInputs = [ - antlr2 - flex - which - ]; - - buildInputs = [ - coreutils - curl - gsl - netcdf - netcdfcxx4 - udunits - ]; - - postPatch = '' - substituteInPlace src/nco/nco_fl_utl.c \ - --replace "/bin/cp" "${coreutils}/bin/cp" - - substituteInPlace src/nco/nco_fl_utl.c \ - --replace "/bin/mv" "${coreutils}/bin/mv" - ''; - - makeFlags = lib.optionals stdenv.isDarwin [ "LIBTOOL=${libtool}/bin/libtool" ]; - - enableParallelBuilding = true; - - meta = { - description = "NetCDF Operator toolkit"; - homepage = "https://nco.sourceforge.net/"; - license = lib.licenses.bsd3; - longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5"; - maintainers = with lib.maintainers; [ bzizou ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 95b427a7bad3..0ee09d2416cd 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -9,6 +9,7 @@ , enableStatic ? stdenv.hostPlatform.isStatic , withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt , mouseSupport ? false, gpm +, withTermlib ? false , unicodeSupport ? true , testers , binlore @@ -38,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!withCxx) "--without-cxx" ++ lib.optional (abiVersion == "5") "--with-abi-version=5" ++ lib.optional stdenv.hostPlatform.isNetBSD "--enable-rpath" + ++ lib.optional withTermlib "--with-termlib" ++ lib.optionals stdenv.hostPlatform.isWindows [ "--enable-sp-funcs" "--enable-term-driver" @@ -65,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { ]); # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: - CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; + CFLAGS = lib.optionalString stdenv.hostPlatform.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; strictDeps = true; @@ -77,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { ncurses ]; - buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; + buildInputs = lib.optional (mouseSupport && stdenv.hostPlatform.isLinux) gpm; preConfigure = '' export PKG_CONFIG_LIBDIR="$dev/lib/pkgconfig" @@ -90,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-pkg-config-libdir=$PKG_CONFIG_LIBDIR" ) '' - + lib.optionalString stdenv.isSunOS '' + + lib.optionalString stdenv.hostPlatform.isSunOS '' sed -i -e '/-D__EXTENSIONS__/ s/-D_XOPEN_SOURCE=\$cf_XOPEN_SOURCE//' \ -e '/CPPFLAGS="$CPPFLAGS/s/ -D_XOPEN_SOURCE_EXTENDED//' \ configure @@ -102,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; postFixup = let - abiVersion-extension = if stdenv.isDarwin then "${abiVersion}.$dylibtype" else "$dylibtype.${abiVersion}"; in + abiVersion-extension = if stdenv.hostPlatform.isDarwin then "${abiVersion}.$dylibtype" else "$dylibtype.${abiVersion}"; in '' # Determine what suffixes our libraries have suffix="$(awk -F': ' 'f{print $3; f=0} /default library suffix/{f=1}' config.log)" diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/development/libraries/ndi/default.nix index b691f2b10afa..78a4f808b4c3 100644 --- a/pkgs/development/libraries/ndi/default.nix +++ b/pkgs/development/libraries/ndi/default.nix @@ -3,10 +3,10 @@ let versionJSON = lib.importJSON ./version.json; ndiPlatform = - if stdenv.isAarch64 then "aarch64-rpi4-linux-gnueabi" - else if stdenv.isAarch32 then "arm-rpi2-linux-gnueabihf" - else if stdenv.isx86_64 then "x86_64-linux-gnu" - else if stdenv.isi686 then "i686-linux-gnu" + if stdenv.hostPlatform.isAarch64 then "aarch64-rpi4-linux-gnueabi" + else if stdenv.hostPlatform.isAarch32 then "arm-rpi2-linux-gnueabihf" + else if stdenv.hostPlatform.isx86_64 then "x86_64-linux-gnu" + else if stdenv.hostPlatform.isi686 then "i686-linux-gnu" else throw "unsupported platform for NDI SDK"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix deleted file mode 100644 index b968a0ee48be..000000000000 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, doxygen -, pkg-config -, python3 -, python3Packages -, wafHook -, boost179 -, openssl -, sqlite -}: - -stdenv.mkDerivation rec { - pname = "ndn-cxx"; - version = "0.9.0"; - - src = fetchFromGitHub { - owner = "named-data"; - repo = "ndn-cxx"; - rev = "${pname}-${version}"; - sha256 = "sha256-u9+QxqdCET1f5B54HF+Jk/YuQvhcYWsPNIVHi5l0XTM="; - }; - - nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ]; - - buildInputs = [ boost179 openssl sqlite ]; - - wafConfigureFlags = [ - "--with-openssl=${openssl.dev}" - "--boost-includes=${boost179.dev}/include" - "--boost-libs=${boost179.out}/lib" - "--with-tests" - ]; - - doCheck = false; # some tests fail in upstream, some fail because of the sandbox environment - checkPhase = '' - runHook preCheck - LD_PRELOAD=build/libndn-cxx.so build/unit-tests - runHook postCheck - ''; - - meta = with lib; { - homepage = "https://named-data.net/"; - description = "Named Data Networking (NDN) or Content Centric Networking (CCN) abstraction"; - longDescription = '' - ndn-cxx is a C++ library, implementing Named Data Networking (NDN) - primitives that can be used to implement various NDN applications. - NDN operates by addressing and delivering Content Objects directly - by Name instead of merely addressing network end-points. In addition, - the NDN security model explicitly secures individual Content Objects - rather than securing the connection or “pipe”. Named and secured - content resides in distributed caches automatically populated on - demand or selectively pre-populated. When requested by name, NDN - delivers named content to the user from the nearest cache, thereby - traversing fewer network hops, eliminating redundant requests, - and consuming less resources overall. - ''; - license = licenses.lgpl3; - platforms = platforms.unix; - maintainers = with maintainers; [ sjmackenzie bertof ]; - }; -} diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix deleted file mode 100644 index 7ede8a409c3b..000000000000 --- a/pkgs/development/libraries/ndpi/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, stdenv -, autoreconfHook -, fetchFromGitHub -, json_c -, libpcap -, libtool -, pkg-config -, which -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "ndpi"; - version = "4.10"; - - src = fetchFromGitHub { - owner = "ntop"; - repo = "nDPI"; - rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-iXqvDMJsOXcg9YkqKFgInLLfH6j/HEp4bEaIl6dpVtc="; - }; - - nativeBuildInputs = [ - autoreconfHook - libtool - pkg-config - which - ]; - - buildInputs = [ - json_c - libpcap - ]; - - meta = with lib; { - description = "Library for deep-packet inspection"; - longDescription = '' - nDPI is a library for deep-packet inspection based on OpenDPI. - ''; - homepage = "https://www.ntop.org/products/deep-packet-inspection/ndpi/"; - changelog = "https://github.com/ntop/nDPI/blob/${finalAttrs.version}/CHANGELOG.md"; - license = with licenses; [ lgpl3Plus bsd3 ]; - maintainers = with maintainers; [ takikawa ]; - mainProgram = "ndpiReader"; - platforms = with platforms; unix; - }; -}) diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix deleted file mode 100644 index 243c9b81bbe1..000000000000 --- a/pkgs/development/libraries/neardal/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, glib, readline, makeWrapper }: - -stdenv.mkDerivation { - pname = "neardal"; - version = "unstable-0.7-post-git-2015-09-30"; - - src = fetchFromGitHub { - owner = "connectivity"; - repo = "neardal"; - rev = "5b1c8b5c2c45c10f11cee12fbcb397f8953850d7"; - sha256 = "12qwg7qiw2wfpaxfg2fjkmj5lls0g33xp6w433g8bnkvwlq4s29g"; - }; - - nativeBuildInputs = [ pkg-config makeWrapper autoconf automake ]; - buildInputs = [ glib readline ]; - - preConfigure = '' - substituteInPlace "ncl/Makefile.am" --replace "noinst_PROGRAMS" "bin_PROGRAMS" - substituteInPlace "demo/Makefile.am" --replace "noinst_PROGRAMS" "bin_PROGRAMS" - sh autogen.sh - ''; - - configureFlags = [ "--disable-dependency-tracking" "--disable-traces" ]; - - meta = with lib; { - broken = true; # 2022-11-13 - description = "C APIs to exchange datas with the NFC daemon 'Neard'"; - license = licenses.lgpl2; - homepage = "https://01.org/linux-nfc"; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix deleted file mode 100644 index dbed519662fe..000000000000 --- a/pkgs/development/libraries/neatvnc/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, aml -, ffmpeg -, gnutls -, libjpeg_turbo -, mesa -, pixman -, zlib -}: - -stdenv.mkDerivation rec { - pname = "neatvnc"; - version = "0.8.1"; - - src = fetchFromGitHub { - owner = "any1"; - repo = pname; - rev = "v${version}"; - hash = "sha256-2gPDcFcu1kGIDubguL38Z0K+k7WGFf7DX8yZteedcNg="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - aml - ffmpeg - gnutls - libjpeg_turbo - mesa - pixman - zlib - ]; - - mesonFlags = [ - (lib.mesonBool "tests" true) - ]; - - doCheck = true; - - meta = with lib; { - description = "VNC server library"; - longDescription = '' - This is a liberally licensed VNC server library that's intended to be - fast and neat. Goals: - - Speed - - Clean interface - - Interoperability with the Freedesktop.org ecosystem - ''; - inherit (src.meta) homepage; - changelog = "https://github.com/any1/neatvnc/releases/tag/v${version}"; - license = licenses.isc; - platforms = platforms.linux; - maintainers = with maintainers; [ nickcao ]; - }; -} diff --git a/pkgs/development/libraries/neon/darwin-fix-configure.patch b/pkgs/development/libraries/neon/darwin-fix-configure.patch deleted file mode 100644 index b8bbd288f7a2..000000000000 --- a/pkgs/development/libraries/neon/darwin-fix-configure.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar neon-0.29.6/configure neon-0.29.6-darwin-fix-configure/configure ---- neon-0.29.6/configure 2011-05-03 14:25:31.000000000 +0200 -+++ neon-0.29.6-darwin-fix-configure/configure 2012-06-06 23:32:21.000000000 +0200 -@@ -4184,7 +4184,7 @@ - case x"$ne_cv_os_uname" in #( - x"Darwin") : - -- CPPFLAGS="$CPPFLAGS -no-cpp-precomp" -+ CPPFLAGS="$CPPFLAGS" - LDFLAGS="$LDFLAGS -flat_namespace" - # poll has various issues in various Darwin releases - if test x${ac_cv_func_poll+set} != xset; then diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix deleted file mode 100644 index 3185ff4158ee..000000000000 --- a/pkgs/development/libraries/neon/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchurl, libxml2, pkg-config -, compressionSupport ? true, zlib ? null -, sslSupport ? true, openssl ? null -, static ? stdenv.hostPlatform.isStatic -, shared ? !stdenv.hostPlatform.isStatic -, bash -}: - -assert compressionSupport -> zlib != null; -assert sslSupport -> openssl != null; -assert static || shared; - -let - inherit (lib) optionals; -in - -stdenv.mkDerivation rec { - version = "0.32.5"; - pname = "neon"; - - src = fetchurl { - url = "https://notroj.github.io/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-SHLhL4Alct7dSwL4cAZYFLLVFB99va9wju2rgmtRpYo="; - }; - - patches = optionals stdenv.isDarwin [ ./darwin-fix-configure.patch ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [libxml2 openssl bash] - ++ lib.optional compressionSupport zlib; - - strictDeps = true; - - configureFlags = [ - (lib.enableFeature shared "shared") - (lib.enableFeature static "static") - (lib.withFeature compressionSupport "zlib") - (lib.withFeature sslSupport "ssl") - ]; - - preConfigure = '' - export PKG_CONFIG="$(command -v "$PKG_CONFIG")" - ''; - - passthru = {inherit compressionSupport sslSupport;}; - - meta = with lib; { - description = "HTTP and WebDAV client library"; - mainProgram = "neon-config"; - homepage = "https://notroj.github.io/neon/"; - changelog = "https://github.com/notroj/${pname}/blob/${version}/NEWS"; - platforms = platforms.unix; - license = licenses.lgpl2; - }; -} diff --git a/pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch b/pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch deleted file mode 100644 index 7d1723c3ef98..000000000000 --- a/pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 60c699d..606b972 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -402,7 +402,7 @@ ELSE(MSVC) - FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED) - ENDIF(MSVC) - --CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5free_memory "" HAVE_H5FREE_MEMORY) -+CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARIES} H5free_memory "" HAVE_H5FREE_MEMORY) - IF(NOT HAVE_H5FREE_MEMORY) - MESSAGE(STATUS "Plugin support requires libhdf5 with H5Free support. Your libhdf5 install does not provide H5Free. Please install a newer version of libhdf5 if you require plugin compression support.") - SET(NC_HAS_DEF_VAR_FILTER "") diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix deleted file mode 100644 index 08f812a272a2..000000000000 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, cmake, ninja }: -stdenv.mkDerivation rec { - pname = "netcdf-cxx4"; - version = "4.3.1"; - - src = fetchFromGitHub { - owner = "Unidata"; - repo = "netcdf-cxx4"; - rev = "v${version}"; - sha256 = "sha256-GZ6n7dW3l8Kqrk2Xp2mxRTUWWQj0XEd2LDTG9EtrfhY="; - }; - - patches = [ - # This fix is included upstream, remove with next upgrade - ./cmake-h5free.patch - ]; - - preConfigure = '' - cmakeFlags+="-Dabs_top_srcdir=$(readlink -f ./)" - ''; - - nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ netcdf hdf5 curl ]; - - doCheck = true; - enableParallelChecking = false; - preCheck = '' - export HDF5_PLUGIN_PATH=${netcdf}/lib/hdf5-plugins - ''; - - meta = { - description = "C++ API to manipulate netcdf files"; - mainProgram = "ncxx4-config"; - homepage = "https://www.unidata.ucar.edu/software/netcdf/"; - license = lib.licenses.free; - platforms = lib.platforms.unix; - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index 0edc956eee60..d9a80768bb61 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran ]; buildInputs = [ netcdf hdf5 curl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation CoreServices SystemConfiguration ]; - env.NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ + env.NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-F${CoreServices}/Library/Frameworks" "-F${SystemConfiguration}/Library/Frameworks" ]); diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix deleted file mode 100644 index 65e8b6f46dfd..000000000000 --- a/pkgs/development/libraries/netcdf/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ lib, stdenv -, fetchurl, unzip -, hdf5 -, bzip2 -, libzip -, zstd -, szipSupport ? false -, szip -, libxml2 -, m4 -, curl # for DAP -, removeReferencesTo -}: - -let - inherit (hdf5) mpiSupport mpi; -in stdenv.mkDerivation rec { - pname = "netcdf" + lib.optionalString mpiSupport "-mpi"; - version = "4.9.2"; - - src = fetchurl { - url = "https://downloads.unidata.ucar.edu/netcdf-c/${version}/netcdf-c-${version}.tar.gz"; - hash = "sha256-zxG6u725lj8J9VB54LAZ9tA3H1L44SZKW6jp/asabEg="; - }; - - postPatch = '' - patchShebangs . - - # this test requires the net - for a in ncdap_test/Makefile.am ncdap_test/Makefile.in; do - substituteInPlace $a --replace testurl.sh " " - done - - # Prevent building the tests from prepending `#!/bin/bash` and wiping out the patched shenbangs. - substituteInPlace nczarr_test/Makefile.in \ - --replace '#!/bin/bash' '${stdenv.shell}' - ''; - - nativeBuildInputs = [ m4 removeReferencesTo ]; - - buildInputs = [ - curl - hdf5 - libxml2 - mpi - bzip2 - libzip - zstd - ] ++ lib.optional szipSupport szip; - - passthru = { - 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" - "--enable-shared" - "--disable-dap-remote-tests" - "--with-plugin-dir=${placeholder "out"}/lib/hdf5-plugins" - ] - ++ (lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${lib.getDev mpi}/bin/mpicc" ]); - - enableParallelBuilding = true; - - disallowedReferences = [ stdenv.cc ]; - - postFixup = '' - remove-references-to -t ${stdenv.cc} "$(readlink -f $out/lib/libnetcdf.settings)" - ''; - - doCheck = !mpiSupport; - nativeCheckInputs = [ unzip ]; - - preCheck = '' - export HOME=$TEMP - ''; - - meta = { - description = "Libraries for the Unidata network Common Data Format"; - platforms = lib.platforms.unix; - homepage = "https://www.unidata.ucar.edu/software/netcdf/"; - changelog = "https://docs.unidata.ucar.edu/netcdf-c/${version}/RELEASE_NOTES.html"; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix index 44afdf45513f..b1cf1f5f6bfe 100644 --- a/pkgs/development/libraries/nettle/generic.nix +++ b/pkgs/development/libraries/nettle/generic.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation { # /usr/include/mp.h from OpenSolaris. See # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> # for details. - ++ lib.optional stdenv.isSunOS "--with-include-path=${gmp.dev}/include"; + ++ lib.optional stdenv.hostPlatform.isSunOS "--with-include-path=${gmp.dev}/include"; - doCheck = (stdenv.hostPlatform.system != "i686-cygwin" && !stdenv.isDarwin); + doCheck = (stdenv.hostPlatform.system != "i686-cygwin" && !stdenv.hostPlatform.isDarwin); enableParallelBuilding = true; diff --git a/pkgs/development/libraries/networking-ts-cxx/default.nix b/pkgs/development/libraries/networking-ts-cxx/default.nix deleted file mode 100644 index 7dc6d4b11fee..000000000000 --- a/pkgs/development/libraries/networking-ts-cxx/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "networking-ts-cxx"; - version = "2019-02-27"; - - # Used until https://github.com/chriskohlhoff/networking-ts-impl/issues/17 is - # resolved and we can generate in Nix. - src = fetchFromGitHub { - owner = "chriskohlhoff"; - repo = "networking-ts-impl"; - rev = "c97570e7ceef436581be3c138868a19ad96e025b"; - sha256 = "12b5lg989nn1b8v6x9fy3cxsf3hs5hr67bd1mfyh8pjikir7zv6j"; - }; - - installPhase = '' - mkdir -p $out/{include,lib/pkgconfig} - cp -r include $out/ - substituteAll ${./networking_ts.pc.in} $out/lib/pkgconfig/networking_ts.pc - ''; - - meta = with lib; { - description = "Experimental implementation of the C++ Networking Technical Specification"; - homepage = "https://github.com/chriskohlhoff/networking-ts-impl"; - license = licenses.boost; - maintainers = with maintainers; [ bhipple ]; - }; -} diff --git a/pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in b/pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in deleted file mode 100644 index d52f68f4c155..000000000000 --- a/pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in +++ /dev/null @@ -1,8 +0,0 @@ -prefix=@out@ -includedir=${prefix}/include - -Name: networking_ts -Description: Experimental implementation of the C++ Networking Technical Specification -URL: https://github.com/chriskohlhoff/networking-ts-impl -Version: ${networking_ts_version} -Cflags: -isystem${includedir} diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index 15a834709806..d8adcf63b19d 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { unset CPP ''; - configureFlags = lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-nls" ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libnewt.so.${version} $out/lib/libnewt.so.${version} install_name_tool -change libnewt.so.${version} $out/lib/libnewt.so.${version} $out/bin/whiptail ''; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix deleted file mode 100644 index fbe3e2a92f15..000000000000 --- a/pkgs/development/libraries/nghttp2/default.nix +++ /dev/null @@ -1,113 +0,0 @@ -{ lib -, stdenv -, fetchurl -, installShellFiles -, pkg-config - -# Optional dependencies -, enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic -, c-aresMinimal, libev, openssl, zlib -, enableGetAssets ? false, libxml2 -, enableHpack ? false, jansson -, enableHttp3 ? false, ngtcp2, nghttp3, quictls -, enableJemalloc ? false, jemalloc -, enablePython ? false, python3, ncurses - -# Unit tests ; we have to set TZDIR, which is a GNUism. -, enableTests ? stdenv.hostPlatform.isGnu, cunit, tzdata - -# downstream dependencies, for testing -, curl -, libsoup -}: - -# 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. - -assert enableGetAssets -> enableApp; -assert enableHpack -> enableApp; -assert enableHttp3 -> enableApp; -assert enableJemalloc -> enableApp; - -stdenv.mkDerivation rec { - pname = "nghttp2"; - version = "1.62.1"; - - src = fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-OWbsgv2n/DgFBtNyomDY2bbpRr5N6u8f7MGnS0gJrj0="; - }; - - outputs = [ "out" "dev" "lib" "doc" "man" ]; - - nativeBuildInputs = [ pkg-config ] - ++ lib.optionals (enableApp) [ installShellFiles ]; - - buildInputs = lib.optionals enableApp [ c-aresMinimal libev zlib ] - ++ lib.optionals (enableApp && !enableHttp3) [ openssl ] - ++ lib.optionals (enableGetAssets) [ libxml2 ] - ++ lib.optionals (enableHpack) [ jansson ] - ++ lib.optionals (enableJemalloc) [ jemalloc ] - ++ lib.optionals (enableHttp3) [ ngtcp2 nghttp3 quictls ] - ++ lib.optionals (enablePython) [ python3 ]; - - enableParallelBuilding = true; - - configureFlags = [ - "--disable-examples" - (lib.enableFeature enableApp "app") - (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 ]; - preCheck = lib.optionalString (enableTests) '' - export TZDIR=${tzdata}/share/zoneinfo - ''; - - # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion - # necessary for FreeBSD code path in configure - postPatch = '' - substituteInPlace ./config.guess --replace-fail /usr/bin/uname uname - ''; - - postInstall = lib.optionalString (enableApp) '' - installShellCompletion --bash doc/bash_completion/{h2load,nghttp,nghttpd,nghttpx} - '' + lib.optionalString (!enableApp) '' - rm -r $out/bin - '' + lib.optionalString (enablePython) '' - patchShebangs $out/share/nghttp2 - '' + lib.optionalString (!enablePython) '' - rm -r $out/share - ''; - - passthru.tests = { - inherit curl libsoup; - }; - - meta = with lib; { - description = "HTTP/2 C library and tools"; - longDescription = '' - nghttp2 is an implementation of the HyperText Transfer Protocol version 2 in C. - The framing layer of HTTP/2 is implemented as a reusable C library. On top of that, - we have implemented an HTTP/2 client, server and proxy. We have also developed - load test and benchmarking tools for HTTP/2. - An HPACK encoder and decoder are available as a public API. - We have Python bindings of this library, but we do not have full code coverage yet. - An experimental high level C++ library is also available. - ''; - - homepage = "https://nghttp2.org/"; - changelog = "https://github.com/nghttp2/nghttp2/releases/tag/v${version}"; - # News articles with changes summary can be found here: https://nghttp2.org/blog/archives/ - license = licenses.mit; - maintainers = with maintainers; [ c0bw3b ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index 2a264dbe6c46..d6fa71d590ea 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -6,20 +6,20 @@ stdenv.mkDerivation rec { pname = "nghttp3"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-sVEMFTe3+r11yz4gzV+0VC8ngaanoj27DLW5hakyc4Y="; + hash = "sha256-5QsJLN79SkbrCfIGfeJ91AUEf9/V6BWkNE60wOkxdow="; fetchSubmodules = true; }; outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/development/libraries/ngt/default.nix b/pkgs/development/libraries/ngt/default.nix deleted file mode 100644 index e42ee750cc09..000000000000 --- a/pkgs/development/libraries/ngt/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, llvmPackages -, enableAVX ? stdenv.hostPlatform.avxSupport -}: - -stdenv.mkDerivation rec { - pname = "NGT"; - version = "1.12.3-alpha"; - - src = fetchFromGitHub { - owner = "yahoojapan"; - repo = "NGT"; - rev = "29c88ff6cd5824d3196986d1f50b834565b6c9dd"; - sha256 = "sha256-nu0MJNpaenOB4+evoSVLKmPIuZXVj1Rm9x53+TfhezY="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ llvmPackages.openmp ]; - - NIX_ENFORCE_NO_NATIVE = ! enableAVX; - __AVX2__ = if enableAVX then 1 else 0; - - meta = with lib; { - homepage = "https://github.com/yahoojapan/NGT"; - description = "Nearest Neighbor Search with Neighborhood Graph and Tree for High-dimensional Data"; - platforms = platforms.linux ++ platforms.darwin; - license = licenses.asl20; - maintainers = with maintainers; [ tomberek ]; - }; -} diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index 8e17a3394dc3..5a4c9cae8e9d 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-P9l7J4JMSO40YoFIHlv9kmKJeJGV5Y4hXkKA3rM0lTI="; + hash = "sha256-AIz4wQo5NimeSEKvk741abq2q3lyWpHz0kfU/PrOyYQ="; fetchSubmodules = true; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libev nghttp3 quictls - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ] ++ lib.optional withJemalloc jemalloc; diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index 1cf06ecb837f..74401482119c 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - hash = "sha256-7DesCT8swwk9E1ckYrj3mGsdx37HrJxd+svKpJRrhoI="; + hash = "sha256-qBDpNyBxcW/OPnrbmL+NmKWIF69p1OoZFqlP6mwPi9U="; }; outputs = [ "out" "dev" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = true; nativeCheckInputs = [ cunit ] - ++ lib.optional stdenv.isDarwin ncurses; + ++ lib.optional stdenv.hostPlatform.isDarwin ncurses; passthru.tests = knot-dns.passthru.tests; # the only consumer so far diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix deleted file mode 100644 index 8714c6b4037a..000000000000 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, nix, cmake, pkg-config, boost }: - -stdenv.mkDerivation rec { - pname = "nix-plugins"; - version = "14.0.0"; - - src = fetchFromGitHub { - owner = "shlevy"; - repo = "nix-plugins"; - rev = version; - hash = "sha256-RDKAuLwcZ3Pbn5JUDmGBcfD0xbM6Jud2ouXh/YKpfS8="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ nix boost ]; - - meta = { - description = "Collection of miscellaneous plugins for the nix expression language"; - homepage = "https://github.com/shlevy/nix-plugins"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix deleted file mode 100644 index 339db2bb0879..000000000000 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -}: -let - testData = fetchFromGitHub { - owner = "nlohmann"; - repo = "json_test_data"; - rev = "v3.1.0"; - hash = "sha256-bG34W63ew7haLnC82A3lS7bviPDnApLipaBjJAjLcVk="; - }; -in stdenv.mkDerivation (finalAttrs: { - pname = "nlohmann_json"; - version = "3.11.3"; - - src = fetchFromGitHub { - owner = "nlohmann"; - repo = "json"; - rev = "v${finalAttrs.version}"; - hash = "sha256-7F0Jon+1oWL7uqet5i1IgHX0fUw/+z0QwEcA3zs5xHg="; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DJSON_BuildTests=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" - "-DJSON_FastTests=ON" - "-DJSON_MultipleHeaders=ON" - ] ++ lib.optional finalAttrs.finalPackage.doCheck "-DJSON_TestDataDirectory=${testData}"; - - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - - # skip tests that require git or modify “installed files” - preCheck = '' - checkFlagsArray+=("ARGS=-LE 'not_reproducible|git_required'") - ''; - - postInstall = "rm -rf $out/lib64"; - - meta = with lib; { - description = "JSON for Modern C++"; - homepage = "https://json.nlohmann.me"; - changelog = "https://github.com/nlohmann/json/blob/develop/ChangeLog.md"; - license = licenses.mit; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix index 2fae17a23236..4995d98adca7 100644 --- a/pkgs/development/libraries/nlopt/default.nix +++ b/pkgs/development/libraries/nlopt/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-TgieCX7yUdTAEblzXY/gCN0r6F9TVDh4RdNDjQdXZ1o="; }; - nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildInputs = [ octave ]; configureFlags = [ diff --git a/pkgs/development/libraries/nng/default.nix b/pkgs/development/libraries/nng/default.nix deleted file mode 100644 index 612f8e384570..000000000000 --- a/pkgs/development/libraries/nng/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja, mbedtlsSupport ? true, mbedtls }: - -stdenv.mkDerivation rec { - pname = "nng"; - version = "1.8.0"; - - src = fetchFromGitHub { - owner = "nanomsg"; - repo = "nng"; - rev = "v${version}"; - hash = "sha256-E2uosZrmxO3fqwlLuu5e36P70iGj5xUlvhEb+1aSvOA="; - }; - - nativeBuildInputs = [ cmake ninja ] - ++ lib.optionals mbedtlsSupport [ mbedtls ]; - - buildInputs = lib.optionals mbedtlsSupport [ mbedtls ]; - - cmakeFlags = [ "-G Ninja" ] - ++ lib.optionals mbedtlsSupport [ "-DMBEDTLS_ROOT_DIR=${mbedtls}" "-DNNG_ENABLE_TLS=ON" ]; - - meta = with lib; { - homepage = "https://nng.nanomsg.org/"; - description = "Nanomsg next generation"; - license = licenses.mit; - mainProgram = "nngcat"; - platforms = platforms.unix; - maintainers = with maintainers; [ nviets ]; - }; -} diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix deleted file mode 100644 index 1cd69074911b..000000000000 --- a/pkgs/development/libraries/notify-sharp/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, autoreconfHook -, mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }: - -stdenv.mkDerivation rec { - pname = "notify-sharp"; - version = "3.0.3"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "Archive"; - repo = "notify-sharp"; - - rev = version; - sha256 = "1vm7mnmxdwrgy4mr07lfva8sa6a32f2ah5x7w8yzcmahaks3sj5m"; - }; - - nativeBuildInputs = [ - pkg-config autoreconfHook - ]; - - buildInputs = [ - mono gtk-sharp-3_0 - dbus-sharp-1_0 dbus-sharp-glib-1_0 - ]; - - dontStrip = true; - - postPatch = '' - sed -i 's#^[ \t]*DOCDIR=.*$#DOCDIR=$out/lib/monodoc#' ./configure.ac - ''; - - meta = with lib; { - description = "D-Bus for .NET"; - platforms = platforms.linux; - license = licenses.mit; - }; -} diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix deleted file mode 100644 index a61bd0088052..000000000000 --- a/pkgs/development/libraries/npapi-sdk/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "npapi-sdk"; - - version = "0.27.2"; - - src = fetchurl { - url = "https://bitbucket.org/mgorny/npapi-sdk/downloads/${pname}-${version}.tar.bz2"; - - sha256 = "0xxfcsjmmgbbyl9zwpzdshbx27grj5fnzjfmldmm9apws2yk9gq1"; - }; - - meta = with lib; { - description = "Bundle of NPAPI headers by Mozilla"; - - homepage = "https://bitbucket.org/mgorny/npapi-sdk"; # see also https://github.com/mozilla/npapi-sdk - license = licenses.bsd3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix deleted file mode 100644 index 815c3dff031e..000000000000 --- a/pkgs/development/libraries/npth/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkgsCross }: - -stdenv.mkDerivation rec { - pname = "npth"; - version = "1.7"; - - src = fetchurl { - url = "mirror://gnupg/npth/npth-${version}.tar.bz2"; - sha256 = "sha256-hYn1aTe3XOM7KNMS/MvzArO3HsPzlF/eaqp0AnkUrQU="; - }; - - patches = [ - (fetchpatch { - name = "musl.patch"; - url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=patch;h=417abd56fd7bf45cd4948414050615cb1ad59134"; - hash = "sha256-0g2tLFjW1bybNi6oxlW7vPimsQLjmTih4JZSoATjESI="; - }) - ]; - - nativeBuildInputs = [ autoreconfHook ]; - - doCheck = true; - - passthru.tests = { - musl = pkgsCross.musl64.npth; - }; - - meta = with lib; { - description = "New GNU Portable Threads Library"; - mainProgram = "npth-config"; - longDescription = '' - This is a library to provide the GNU Pth API and thus a non-preemptive - threads implementation. - - In contrast to GNU Pth is is based on the system's standard threads - implementation. This allows the use of libraries which are not - compatible to GNU Pth. Experience with a Windows Pth emulation showed - that this is a solid way to provide a co-routine based framework. - ''; - homepage = "http://www.gnupg.org"; - license = licenses.lgpl3; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/nrf5-sdk/default.nix b/pkgs/development/libraries/nrf5-sdk/default.nix deleted file mode 100644 index c8667287a002..000000000000 --- a/pkgs/development/libraries/nrf5-sdk/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, fetchzip -}: - -stdenv.mkDerivation rec { - pname = "nrf5-sdk"; - version = "17.1.0"; - - urlHash = "ddde560"; - - src = fetchzip { - url = "https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/sdks/nrf5/binaries/nrf5_sdk_${version}_${urlHash}.zip"; - sha256 = "sha256-q4WQ7X7/z/42/qcii+mOLnobqcbUy0tInkOfRH/Gwus="; - }; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/nRF5_SDK - mv * $out/share/nRF5_SDK - rm $out/share/nRF5_SDK/*.msi - - runHook postInstall - ''; - - meta = with lib; { - description = "Nordic Semiconductor nRF5 Software Development Kit"; - homepage = "https://www.nordicsemi.com/Products/Development-software/nRF5-SDK"; - license = licenses.unfree; - platforms = platforms.all; - maintainers = with maintainers; [ stargate01 ]; - }; -} diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 586c4ddb94fc..1f126d256870 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "nspr"; - version = "4.35"; + version = "4.36"; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - hash = "sha256-fqMpfqWWm10lpd2NR/JEPNqI6e50YwH24eFCb4pqvI8="; + hash = "sha256-Vd7DF/FAHNLl26hE00C5MKt1R/gYF5pAArzmLm8caJU="; }; patches = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { preConfigure = '' cd nspr - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace '@executable_path/' "$out/lib/" substituteInPlace configure.in --replace '@executable_path/' "$out/lib/" ''; @@ -34,14 +34,14 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-optimize" "--disable-debug" - ] ++ lib.optional stdenv.is64bit "--enable-64bit"; + ] ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit"; postInstall = '' find $out -name "*.a" -delete moveToOutput share "$dev" # just aclocal ''; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index 7ef488cca4c1..eda3955217fe 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , nspr , perl +, installShellFiles , zlib , sqlite , ninja @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ] + nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools fixDarwinDylibNames ]; buildInputs = [ zlib sqlite ]; @@ -61,7 +62,7 @@ stdenv.mkDerivation rec { substituteInPlace coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'" ''; - outputs = [ "out" "dev" "tools" ]; + outputs = [ "out" "dev" "tools" "man" ]; buildPhase = let @@ -93,7 +94,7 @@ stdenv.mkDerivation rec { --enable-libpkix \ -j $NIX_BUILD_CORES \ ${lib.optionalString enableFIPS "--enable-fips"} \ - ${lib.optionalString stdenv.isDarwin "--clang"} \ + ${lib.optionalString stdenv.hostPlatform.isDarwin "--clang"} \ ${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"} runHook postBuild @@ -140,6 +141,8 @@ stdenv.mkDerivation rec { -e "s,@MOD_PATCH_VERSION@,$NSS_PATCH_VERSION," \ pkg/pkg-config/nss-config.in > $out/bin/nss-config chmod 0755 $out/bin/nss-config + + installManPage doc/nroff/* ''; postInstall = lib.optionalString useP11kit '' @@ -155,7 +158,7 @@ stdenv.mkDerivation rec { (lib.optionalString enableFIPS ('' for libname in freebl3 nssdbm3 softokn3 do libfile="$out/lib/lib$libname${stdenv.hostPlatform.extensions.sharedLibrary}"'' + - (if stdenv.isDarwin + (if stdenv.hostPlatform.isDarwin then '' DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ '' else '' diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index b2d040232374..a6c5e3dd4c2b 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.104"; - hash = "sha256-TEGEKocapU5OTqx69n8nrn/X3SZr49d1alHM73UnDJw="; + version = "3.106"; + hash = "sha256-j8B5RgEdBbtqPmIUniNF8ToGPIrPJ8gVTMplcv72fD0="; } diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix deleted file mode 100644 index 9bec1886abb6..000000000000 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config }: - -stdenv.mkDerivation rec { - pname = "nss_wrapper"; - version = "1.1.16"; - - src = fetchurl { - url = "mirror://samba/cwrap/nss_wrapper-${version}.tar.gz"; - sha256 = "sha256-3HmrByd5vkQDtFtgzQRN0TeA1LuWddJ6vxkyrafIqI0="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - meta = with lib; { - description = "Wrapper for the user, group and hosts NSS API"; - mainProgram = "nss_wrapper.pl"; - homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary;"; - license = licenses.bsd3; - platforms = platforms.unix; - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/development/libraries/nsync/default.nix b/pkgs/development/libraries/nsync/default.nix deleted file mode 100644 index 8df7bd605992..000000000000 --- a/pkgs/development/libraries/nsync/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "nsync"; - version = "1.29.2"; - - src = fetchFromGitHub { - owner = "google"; - repo = pname; - rev = version; - hash = "sha256-RAwrS8Vz5fZwZRvF4OQfn8Ls11S8OIV2TmJpNrBE4MI="; - }; - - nativeBuildInputs = [ cmake ]; - - # Needed for case-insensitive filesystems like on macOS - # because a file named BUILD exists already. - cmakeBuildDir = "build_dir"; - - meta = { - homepage = "https://github.com/google/nsync"; - description = "C library that exports various synchronization primitives"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ puffnfresh Luflosi ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/development/libraries/ntbtls/default.nix deleted file mode 100644 index e04d2ae43537..000000000000 --- a/pkgs/development/libraries/ntbtls/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, gettext, libgpg-error, libgcrypt, libksba, zlib }: - -stdenv.mkDerivation rec { - pname = "ntbtls"; - version = "0.3.2"; - - src = fetchurl { - url = "mirror://gnupg/ntbtls/ntbtls-${version}.tar.bz2"; - sha256 = "sha256-vfy5kCSs7JxsS5mK1juzkh30z+5KdyrWwMoyTbvysHw="; - }; - - outputs = [ "dev" "out" ]; - - buildInputs = [ libgcrypt libgpg-error libksba zlib ] - ++ lib.optional stdenv.isDarwin gettext; - - postInstall = '' - moveToOutput "bin/ntbtls-config" $dev - ''; - - meta = with lib; { - description = "Tiny TLS 1.2 only implementation"; - mainProgram = "ntbtls-config"; - homepage = "https://www.gnupg.org/software/ntbtls/"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ joachifm ]; - }; -} diff --git a/pkgs/development/libraries/ntirpc/default.nix b/pkgs/development/libraries/ntirpc/default.nix deleted file mode 100644 index e7100e66f384..000000000000 --- a/pkgs/development/libraries/ntirpc/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake -, krb5, liburcu , libtirpc, libnsl -} : - -stdenv.mkDerivation rec { - pname = "ntirpc"; - version = "6.0.1"; - - src = fetchFromGitHub { - owner = "nfs-ganesha"; - repo = "ntirpc"; - rev = "v${version}"; - sha256 = "sha256-Txtc0Oyt/WfZiMe26uMzx3HFq/YaeU6cYfjPQwh0uQg="; - }; - - outputs = [ "out" "dev" ]; - postPatch = '' - substituteInPlace ntirpc/netconfig.h --replace "/etc/netconfig" "$out/etc/netconfig" - sed '1i#include <assert.h>' -i src/work_pool.c - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ krb5 liburcu libnsl ]; - - postInstall = '' - mkdir -p $out/etc - - # Library needs a netconfig to run. - # Steal the file from libtirpc - cp ${libtirpc}/etc/netconfig $out/etc/ - ''; - - meta = with lib; { - description = "Transport-independent RPC (TI-RPC)"; - homepage = "https://github.com/nfs-ganesha/ntirpc"; - maintainers = [ maintainers.markuskowa ]; - platforms = platforms.linux; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix deleted file mode 100644 index 776608c4ad96..000000000000 --- a/pkgs/development/libraries/ntl/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv -, lib -, fetchurl -, perl -, gmp -, gf2x ? null -# I asked the ntl maintainer weather or not to include gf2x by default: -# > If I remember correctly, gf2x is now thread safe, so there's no reason not to use it. -, withGf2x ? true -, tune ? false # tune for current system; non reproducible and time consuming -}: - -assert withGf2x -> gf2x != null; - -stdenv.mkDerivation rec { - pname = "ntl"; - version = "11.5.1"; - - src = fetchurl { - url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz"; - sha256 = "sha256-IQ0GwxMGy8bq9oFEU8Vsd22djo3zbXTrMG9qUj0caoo="; - }; - - buildInputs = [ - gmp - ]; - - nativeBuildInputs = [ - perl # needed for ./configure - ]; - - sourceRoot = "${pname}-${version}/src"; - - enableParallelBuilding = true; - - dontAddPrefix = true; # DEF_PREFIX instead - - # Written in perl, does not support autoconf-style - # --build=/--host= options: - # Error: unrecognized option: --build=x86_64-unknown-linux-gnu - configurePlatforms = [ ]; - - # reference: http://shoup.net/ntl/doc/tour-unix.html - configureFlags = [ - "DEF_PREFIX=$(out)" - "SHARED=on" # genereate a shared library (as well as static) - "NATIVE=off" # don't target code to current hardware (reproducibility, portability) - "TUNE=${ - if tune then - "auto" - else if stdenv.hostPlatform.isx86 then - "x86" # "chooses options that should be well suited for most x86 platforms" - else - "generic" # "chooses options that should be OK for most platforms" - }" - "CXX=${stdenv.cc.targetPrefix}c++" - ] ++ lib.optionals withGf2x [ - "NTL_GF2X_LIB=on" - "GF2X_PREFIX=${gf2x}" - ]; - - doCheck = true; # takes some time - - meta = with lib; { - description = "Library for doing Number Theory"; - longDescription = '' - NTL is a high-performance, portable C++ library providing data - structures and algorithms for manipulating signed, arbitrary - length integers, and for vectors, matrices, and polynomials over - the integers and over finite fields. - ''; - # Upstream contact: maintainer is victorshoup on GitHub. Alternatively the - # email listed on the homepage. - homepage = "http://www.shoup.net/ntl/"; - # also locally at "${src}/doc/tour-changes.html"; - changelog = "https://www.shoup.net/ntl/doc/tour-changes.html"; - maintainers = teams.sage.members; - license = licenses.gpl2Plus; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/numcpp/default.nix b/pkgs/development/libraries/numcpp/default.nix deleted file mode 100644 index b8dea0f3662b..000000000000 --- a/pkgs/development/libraries/numcpp/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - boost, - python3, - gtest, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "numcpp"; - version = "2.12.1"; - - src = fetchFromGitHub { - owner = "dpilger26"; - repo = "NumCpp"; - rev = "Version_${finalAttrs.version}"; - hash = "sha256-1LGyDvT+PiGRXn7NorcYUjSPzNuRv/YXhQWIaOa7xdo="; - }; - - nativeCheckInputs = [gtest python3]; - - nativeBuildInputs = [cmake]; - - buildInputs = [boost]; - - cmakeFlags = lib.optionals finalAttrs.finalPackage.doCheck [ - "-DBUILD_TESTS=ON" - "-DBUILD_MULTIPLE_TEST=ON" - ]; - - doCheck = !stdenv.isDarwin && !stdenv.hostPlatform.isStatic; - - postInstall = '' - substituteInPlace $out/share/NumCpp/cmake/NumCppConfig.cmake \ - --replace "\''${PACKAGE_PREFIX_DIR}/" "" - ''; - - NIX_CFLAGS_COMPILE="-Wno-error"; - - meta = with lib; { - description = "Templatized Header Only C++ Implementation of the Python NumPy Library"; - homepage = "https://github.com/dpilger26/NumCpp"; - license = licenses.mit; - maintainers = with maintainers; [spalf]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/nuraft/default.nix b/pkgs/development/libraries/nuraft/default.nix deleted file mode 100644 index e26d9f467e7f..000000000000 --- a/pkgs/development/libraries/nuraft/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, asio, openssl, zlib }: - -stdenv.mkDerivation rec { - pname = "nuraft"; - version = "2.1.0"; - - src = fetchFromGitHub { - owner = "eBay"; - repo = "NuRaft"; - rev = "v${version}"; - sha256 = "sha256-puO8E7tSLqB0oq/NlzEZqQgIZKm7ZUb4HhR0XuI9dco="; - }; - - patches = [ - # Fix gcc-13 build failure: - # https://github.com/eBay/NuRaft/pull/435 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/eBay/NuRaft/commit/fddf33a4d8cd7fcd0306cc838a30893a4df3d58f.patch"; - hash = "sha256-JOtR3llE4QwQM7PBx+ILR87zsPB0GZ/aIKbSdHIrePA="; - }) - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost asio openssl zlib ]; - - meta = with lib; { - homepage = "https://github.com/eBay/NuRaft"; - description = "C++ implementation of Raft core logic as a replication library"; - license = licenses.asl20; - maintainers = with maintainers; [ wheelsandmetal ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix b/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix deleted file mode 100644 index 813821bfb71c..000000000000 --- a/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cudaPackages }: - -stdenv.mkDerivation { - pname = "nvidia-optical-flow-sdk"; - version = "2.0"; - - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = "NVIDIAOpticalFlowSDK"; - rev = "edb50da3cf849840d680249aa6dbef248ebce2ca"; - sha256 = "0hv0m0k9wl2wjhhl886j7ymngnf2xz7851nfh57s1gy5bv9lgdgz"; - }; - - # # We only need the header files. The library files are - # # in the nvidia_x11 driver. - installPhase = '' - mkdir -p $out/include - cp -R * $out/include - ''; - - # Makes setupCudaHook propagate nvidia-optical-flow-sdk together with cuda - # packages. Currently used by opencv4.cxxdev, hopefully can be removed in the - # future - nativeBuildInputs = [ - cudaPackages.markForCudatoolkitRootHook - ]; - - meta = with lib; { - description = "Nvidia optical flow headers for computing the relative motion of pixels between images"; - homepage = "https://developer.nvidia.com/opticalflow-sdk"; - license = licenses.bsd3; # applies to the header files only - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix index 786a11f48204..aa8f6a16c442 100644 --- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix +++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "nvidia-vaapi-driver"; - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "elFarto"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ETdHbPI3rZR4026rOT5K9/pjKTZxD5+RioKzUVGMwsA="; + sha256 = "sha256-KeOg9VvPTqIo0qB+dcU915yTztvFxo1jJcHHpsmMmfk="; }; patches = [ diff --git a/pkgs/development/libraries/oatpp/default.nix b/pkgs/development/libraries/oatpp/default.nix deleted file mode 100644 index 54e821b17848..000000000000 --- a/pkgs/development/libraries/oatpp/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "oatpp"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "oatpp"; - repo = "oatpp"; - rev = version; - sha256 = "sha256-k6RPg53z9iTrrKZXOm5Ga9qxI32mHgB+4d6y+IUvJC0="; - }; - - nativeBuildInputs = [ cmake ]; - - # Tests fail on darwin. See https://github.com/NixOS/nixpkgs/pull/105419#issuecomment-735826894 - doCheck = !stdenv.isDarwin; - - meta = with lib; { - homepage = "https://oatpp.io/"; - description = "Light and powerful C++ web framework for highly scalable and resource-efficient web applications"; - license = licenses.asl20; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix deleted file mode 100644 index 2c092dd57b13..000000000000 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, ruby -, opencl-headers -, autoreconfHook -, windows -}: - -stdenv.mkDerivation rec { - pname = "ocl-icd"; - version = "2.3.2"; - - src = fetchFromGitHub { - owner = "OCL-dev"; - repo = "ocl-icd"; - rev = "v${version}"; - sha256 = "sha256-nx9Zz5DpS29g1HRIwPAQi6i+d7Blxd53WQ7Sb1a3FHg="; - }; - - nativeBuildInputs = [ - autoreconfHook - ruby - ]; - - buildInputs = [ opencl-headers ] - ++ lib.optionals stdenv.hostPlatform.isWindows [ windows.dlfcn ]; - - configureFlags = [ - "--enable-custom-vendordir=/run/opengl-driver/etc/OpenCL/vendors" - ]; - - # fixes: can't build x86_64-w64-mingw32 shared library unless -no-undefined is specified - makeFlags = lib.optionals stdenv.hostPlatform.isWindows [ "LDFLAGS=-no-undefined" ]; - - meta = with lib; { - description = "OpenCL ICD Loader for ${opencl-headers.name}"; - mainProgram = "cllayerinfo"; - homepage = "https://github.com/OCL-dev/ocl-icd"; - license = licenses.bsd2; - platforms = platforms.unix ++ platforms.windows; - maintainers = with maintainers; [ r-burns ]; - }; -} diff --git a/pkgs/development/libraries/octomap/default.nix b/pkgs/development/libraries/octomap/default.nix deleted file mode 100644 index af668d279e27..000000000000 --- a/pkgs/development/libraries/octomap/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "octomap"; - version = "1.10.0"; - - src = fetchFromGitHub { - owner = "OctoMap"; - repo = pname; - rev = "v${version}"; - hash = "sha256-QxQHxxFciR6cvB/b8i0mr1hqGxOXhXmB4zgdsD977Mw="; - }; - - sourceRoot = "${src.name}/octomap"; - - nativeBuildInputs = [ cmake ]; - - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=deprecated-declarations" - ]; - - meta = with lib; { - description = "Probabilistic, flexible, and compact 3D mapping library for robotic systems"; - homepage = "https://octomap.github.io/"; - license = licenses.bsd3; - maintainers = with maintainers; [ lopsided98 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix deleted file mode 100644 index 8b426654147f..000000000000 --- a/pkgs/development/libraries/ode/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, stdenv -, fetchurl -, darwin -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "ode"; - version = "0.16.5"; - - src = fetchurl { - url = "https://bitbucket.org/odedevs/ode/downloads/ode-${finalAttrs.version}.tar.gz"; - hash = "sha256-uode3RZFcJWHle6qcPFIU7/DTMmHH4rd6NpH4SvVRnk="; - }; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.GLUT - ]; - - env.CXXFLAGS = lib.optionalString stdenv.cc.isClang (toString [ - "-std=c++14" - "-Wno-error=c++11-narrowing" - ]); - - meta = with lib; { - description = "Open Dynamics Engine"; - mainProgram = "ode-config"; - homepage = "https://www.ode.org"; - license = with licenses; [ bsd3 lgpl21Only lgpl3Only zlib ]; - maintainers = with maintainers; [ wegank ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix deleted file mode 100644 index 92b943dbdf2f..000000000000 --- a/pkgs/development/libraries/odpic/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }: - -let - version = "5.3.0"; - libPath = lib.makeLibraryPath [ oracle-instantclient.lib ]; - -in -stdenv.mkDerivation { - inherit version; - - pname = "odpic"; - - src = fetchFromGitHub { - owner = "oracle"; - repo = "odpi"; - rev = "v${version}"; - sha256 = "sha256-Ez9B89I008YMu1s/8J0V4bydkooth+O5846Fmwl4FsA="; - }; - - nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; - - buildInputs = [ oracle-instantclient ] - ++ lib.optionals stdenv.isLinux [ libaio ]; - - dontPatchELF = true; - makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" ]; - - postFixup = '' - ${lib.optionalString (stdenv.isLinux) '' - patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary})" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary} - ''} - ${lib.optionalString (stdenv.isDarwin) '' - install_name_tool -add_rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary} - ''} - ''; - - meta = with lib; { - description = "Oracle ODPI-C library"; - homepage = "https://oracle.github.io/odpi/"; - maintainers = with maintainers; [ mkazulak ]; - license = licenses.asl20; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; - hydraPlatforms = [ ]; - }; -} diff --git a/pkgs/development/libraries/ogdf/default.nix b/pkgs/development/libraries/ogdf/default.nix deleted file mode 100644 index e88fc796ba77..000000000000 --- a/pkgs/development/libraries/ogdf/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, doxygen }: - -stdenv.mkDerivation rec { - pname = "ogdf"; - version = "2022.02"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "dogwood-202202"; - sha256 = "sha256-zkQ6sS0EUmiigv3T7To+tG3XbFbR3XEbFo15oQ0bWf0="; - }; - - nativeBuildInputs = [ cmake doxygen ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-fPIC" - "-DBUILD_SHARED_LIBS=ON" - "-DOGDF_WARNING_ERRORS=OFF" - ]; - - meta = with lib; { - description = "Open Graph Drawing Framework/Open Graph algorithms and Data structure Framework"; - homepage = "http://www.ogdf.net"; - license = licenses.gpl2; - maintainers = [ maintainers.ianwookim ]; - platforms = platforms.all; - longDescription = '' - OGDF stands both for Open Graph Drawing Framework (the original name) and - Open Graph algorithms and Data structures Framework. - - OGDF is a self-contained C++ library for graph algorithms, in particular - for (but not restricted to) automatic graph drawing. It offers sophisticated - algorithms and data structures to use within your own applications or - scientific projects. - - OGDF is developed and supported by Osnabrück University, TU Dortmund, - University of Cologne, University of Konstanz, and TU Ilmenau. - ''; - }; -} diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index a77529a42704..2a4007c3ce71 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -74,7 +74,7 @@ let ois pugixml zziplib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libglut libGL libGLU @@ -88,7 +88,7 @@ let libXt libXxf86vm xorgproto - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ lib.optionals withNvidiaCg [ nvidia_cg_toolkit @@ -97,7 +97,7 @@ let cmakeFlags = [ (lib.cmakeBool "OGRE_BUILD_DEPENDENCIES" false) (lib.cmakeBool "OGRE_BUILD_SAMPLES" withSamples) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeBool "OGRE_BUILD_LIBS_AS_FRAMEWORKS" false) ]; @@ -112,11 +112,11 @@ let in { ogre_14 = common { - version = "14.2.6"; - hash = "sha256-kxvrRigSe6sPa3lAH+6zKTY4YEU9javlKHK8Zf6jxZE="; - # https://github.com/OGRECave/ogre/blob/v14.2.5/Components/Overlay/CMakeLists.txt - imguiVersion = "1.90.4"; - imguiHash = "sha256-7+Ay7H97tIO6CUsEyaQv4i9q2FCw98eQUq/KYZyfTAw="; + version = "14.3.1"; + hash = "sha256-rr8tetBfFdZPVvN3fYRWltf8/e6oLcLL0uhHKWanuVA="; + # https://github.com/OGRECave/ogre/blob/v14.3.1/Components/Overlay/CMakeLists.txt + imguiVersion = "1.91.2"; + imguiHash = "sha256-B7XXQNuEPcT1ID5nMYbAV+aNCG9gIrC9J7BLnYB8yjI="; }; ogre_13 = common { diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix index 0a384b03bb2a..435509dee216 100644 --- a/pkgs/development/libraries/ois/default.nix +++ b/pkgs/development/libraries/ois/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isLinux [ libX11 ] - ++ lib.optionals stdenv.isDarwin [ Cocoa IOKit Kernel ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libX11 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa IOKit Kernel ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" diff --git a/pkgs/development/libraries/okapi/default.nix b/pkgs/development/libraries/okapi/default.nix index b7a75ad6d1b9..06f980e718c8 100644 --- a/pkgs/development/libraries/okapi/default.nix +++ b/pkgs/development/libraries/okapi/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { cargoVendorDir = "vendor"; doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' cp -r include $out diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix deleted file mode 100644 index c83b84fe71e1..000000000000 --- a/pkgs/development/libraries/olm/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, cmake }: - -stdenv.mkDerivation rec { - pname = "olm"; - version = "3.2.16"; - - src = fetchFromGitLab { - domain = "gitlab.matrix.org"; - owner = "matrix-org"; - repo = pname; - rev = version; - sha256 = "sha256-JX20mpuLO+UoNc8iQlXEHAbH9sfblkBbM1gE27Ve0ac="; - }; - - nativeBuildInputs = [ cmake ]; - - doCheck = true; - - postPatch = '' - substituteInPlace olm.pc.in \ - --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - - meta = with lib; { - description = "Implements double cryptographic ratchet and Megolm ratchet"; - homepage = "https://gitlab.matrix.org/matrix-org/olm"; - license = licenses.asl20; - maintainers = with maintainers; [ tilpner oxzi ]; - knownVulnerabilities = [ '' - The libolm end‐to‐end encryption library used in many Matrix - clients and Jitsi Meet has been deprecated upstream, and relies - on a cryptography library that has known side‐channel issues and - disclaims that its implementations are not cryptographically secure - and should not be used when cryptographic security is required. - - It is not known if the issues can be exploited over the network in - practical conditions. Upstream does not believe such an attack is - feasible, but has stated that the library should not be used going - forward, and there are no plans to move to another cryptography - implementation or otherwise further maintain the library at all. - - You should make an informed decision about whether to override this - security warning, especially if you critically rely on end‐to‐end - encryption. If you don’t care about that, or don’t use the Matrix - functionality of a multi‐protocol client depending on libolm, - then there should be no additional risk. - - Some clients are investigating migrating away from libolm to maintained - libraries without known vulnerabilities. - - For further information, see: - - * The CVE records for the known vulnerabilities: - - * CVE-2024-45191 - * CVE-2024-45192 - * CVE-2024-45193 - - * The libolm deprecation notice: - <https://gitlab.matrix.org/matrix-org/olm/-/blob/6d4b5b07887821a95b144091c8497d09d377f985/README.md#important-libolm-is-now-deprecated> - - * The warning from the cryptography code used by libolm: - <https://gitlab.matrix.org/matrix-org/olm/-/blob/6d4b5b07887821a95b144091c8497d09d377f985/lib/crypto-algorithms/README.md> - - * The blog post disclosing the details of the known vulnerabilities: - <https://soatok.blog/2024/08/14/security-issues-in-matrixs-olm-library/> - - * The statement about the deprecation and vulnerabilities from the - Matrix.org Foundation: - <https://matrix.org/blog/2024/08/libolm-deprecation/> - - * A (likely incomplete) aggregation of client tracking issue links: - <https://github.com/NixOS/nixpkgs/pull/334638#issuecomment-2289025802> - '' ]; - }; -} diff --git a/pkgs/development/libraries/omorfi/default.nix b/pkgs/development/libraries/omorfi/default.nix deleted file mode 100644 index 6002ea464673..000000000000 --- a/pkgs/development/libraries/omorfi/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib -, stdenv -, autoreconfHook -, cg3 -, fetchFromGitHub -, fetchpatch -, hfst -, hfst-ospell -, icu -, libvoikko -, makeWrapper -, pkg-config -, python3 -, zip -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "omorfi"; - version = "0.9.9"; - - src = fetchFromGitHub { - owner = "flammie"; - repo = "omorfi"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-UoqdwNWCNOPX6u1YBlnXUcB/fmcvcy/HXbYciVrMBOY="; - }; - - patches = [ - # allow building with python311. - # patch is incorporated upstream and should be removed on the next update - (fetchpatch { - name = "python311.patch"; - url = "https://github.com/flammie/omorfi/commit/9736452ae6624060dbea0876a722c3731e776357.patch"; - hash = "sha256-Q4fi5HMmO0fq8YI833vgv2EYp//9Um/xFoRk28WrUMk="; - }) - ]; - - # Fix for omorfi-hyphenate.sh file not found error - postInstall = '' - ln -s $out/share/omorfi/{omorfi.hyphenate-rules.hfst,omorfi.hyphenate.hfst} - ''; - - nativeBuildInputs = [ - autoreconfHook - cg3 - makeWrapper - pkg-config - python3 - zip - python3.pkgs.wrapPython - ]; - - buildInputs = [ - python3.pkgs.hfst - hfst-ospell - libvoikko - ]; - - # Supplied pkg-config file doesn't properly expose these - propagatedBuildInputs = [ - hfst - icu - ]; - - # Wrap shell scripts so they find the Python scripts - # omorfi.bash inexplicably fails when wrapped - preFixup = '' - wrapPythonProgramsIn "$out/bin" "$out ${python3.pkgs.hfst}" - for i in "$out/bin"/*.{sh,bash}; do - if [ $(basename "$i") != "omorfi.bash" ]; then - wrapProgram "$i" --prefix "PATH" : "$out/bin/" - fi - done - ''; - - # Enable all features - configureFlags = [ - "--enable-labeled-segments" - "--enable-lemmatiser" - "--enable-segmenter" - "--enable-hyphenator" - ]; - - meta = with lib; { - description = "Analysis for Finnish text"; - homepage = "https://github.com/flammie/omorfi"; - license = licenses.gpl3; - maintainers = with maintainers; [ lurkki ]; - # Darwin build fails due to hfst not being found - broken = stdenv.isDarwin; - }; -}) diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix deleted file mode 100644 index cf00629e3842..000000000000 --- a/pkgs/development/libraries/oniguruma/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "oniguruma"; - version = "6.9.9"; - - # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages - src = fetchurl { - url = "https://github.com/kkos/oniguruma/releases/download/v${version}/onig-${version}.tar.gz"; - sha256 = "sha256-YBYr07n8b0iG1MegeSX/03QWdzL1Xc6MSRv9nNgYps8="; - }; - - outputs = [ "dev" "lib" "out" ]; - outputBin = "dev"; # onig-config - - nativeBuildInputs = [ autoreconfHook ]; - configureFlags = [ "--enable-posix-api=yes" ]; - - meta = with lib; { - homepage = "https://github.com/kkos/oniguruma"; - description = "Regular expressions library"; - mainProgram = "onig-config"; - license = licenses.bsd2; - maintainers = with maintainers; [ artturin ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index bb344664e659..a1bfe9dced1d 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -23,6 +23,7 @@ , protobuf_21 , pythonSupport ? true , cudaSupport ? config.cudaSupport +, ncclSupport ? config.cudaSupport , cudaPackages ? {} }@inputs: @@ -149,7 +150,7 @@ effectiveStdenv.mkDerivation rec { numpy pybind11 packaging - ]) ++ lib.optionals effectiveStdenv.isDarwin [ + ]) ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ Foundation libiconv ] ++ lib.optionals cudaSupport (with cudaPackages; [ @@ -160,8 +161,9 @@ effectiveStdenv.mkDerivation rec { libcufft # cufft.h cudnn # cudnn.h cuda_cudart + ] ++ lib.optionals (cudaSupport && ncclSupport) (with cudaPackages; [ nccl - ]); + ])); nativeCheckInputs = [ gtest @@ -198,7 +200,7 @@ effectiveStdenv.mkDerivation rec { "-Donnxruntime_ENABLE_LTO=ON" "-Donnxruntime_USE_FULL_PROTOBUF=OFF" (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport) - (lib.cmakeBool "onnxruntime_USE_NCCL" cudaSupport) + (lib.cmakeBool "onnxruntime_USE_NCCL" (cudaSupport && ncclSupport)) ] ++ lib.optionals pythonSupport [ "-Donnxruntime_ENABLE_PYTHON=ON" ] ++ lib.optionals cudaSupport [ diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/development/libraries/opae/default.nix deleted file mode 100644 index 339edf234f53..000000000000 --- a/pkgs/development/libraries/opae/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake -, libuuid, json_c -, doxygen, perl, python3 -}: - -stdenv.mkDerivation rec { - pname = "opae"; - version = "1.0.0"; - - # the tag has a silly name for some reason. drop this in the future if - # possible - tver = "${version}-5"; - - src = fetchFromGitHub { - owner = "opae"; - repo = "opae-sdk"; - rev = "refs/tags/${tver}"; - sha256 = "1dmkpnr9dqxwjhbdzx2r3fdfylvinda421yyg319am5gzlysxwi8"; - }; - - doCheck = false; - - env.NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=format-truncation" - "-Wno-error=address-of-packed-member" - "-Wno-array-bounds" - ]; - - nativeBuildInputs = [ cmake doxygen perl python3.pkgs.sphinx ]; - buildInputs = [ libuuid json_c python3 ]; - - # Set the Epoch to 1980; otherwise the Python wheel/zip code - # gets very angry - preConfigure = '' - find . -type f | while read file; do - touch -d @315532800 $file; - done - ''; - - cmakeFlags = [ "-DBUILD_ASE=1" ]; - - meta = with lib; { - description = "Open Programmable Acceleration Engine SDK"; - homepage = "https://01.org/opae"; - license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ thoughtpolice ]; - # Needs a major update, not compatible with gcc-11. - broken = true; - }; -} diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index 496b7ac60fe0..15a33af177ce 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, removeReferencesTo -, alsaSupport ? !stdenv.isDarwin, alsa-lib -, dbusSupport ? !stdenv.isDarwin, dbus -, pipewireSupport ? !stdenv.isDarwin, pipewire -, pulseSupport ? !stdenv.isDarwin, libpulseaudio +, alsaSupport ? !stdenv.hostPlatform.isDarwin, alsa-lib +, dbusSupport ? !stdenv.hostPlatform.isDarwin, dbus +, pipewireSupport ? !stdenv.hostPlatform.isDarwin, pipewire +, pulseSupport ? !stdenv.hostPlatform.isDarwin, libpulseaudio , CoreServices, AudioUnit, AudioToolbox }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ++ lib.optional dbusSupport dbus ++ lib.optional pipewireSupport pipewire ++ lib.optional pulseSupport libpulseaudio - ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices AudioUnit AudioToolbox ]; cmakeFlags = [ # Automatically links dependencies without having to rely on dlopen, thus diff --git a/pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch b/pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch deleted file mode 100644 index 77b9e1febddc..000000000000 --- a/pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch +++ /dev/null @@ -1,24 +0,0 @@ -Subject: Add audit_token_to_pid() - -Description: Apple provides audit_token_to_pid to get the pid of an -audit token. Unfortunately, they have never released this to the -OpenBSM project. - -diff -r -u -p1 a/bsm/libbsm.h b/bsm/libbsm.h ---- a/bsm/libbsm.h 2009-04-15 16:45:54.000000000 -0500 -+++ b/bsm/libbsm.h 2018-05-11 04:11:14.063083147 -0500 -@@ -1298,1 +1298,2 @@ int audit_set_stat(au_stat_t *stats, siz - int audit_send_trigger(int *trigger); -+pid_t audit_token_to_pid(audit_token_t atoken); - -diff -r -u -p1 a/libbsm/bsm_wrappers.c b/libbsm/bsm_wrappers.c ---- a/libbsm/bsm_wrappers.c 2009-04-15 16:46:06.000000000 -0500 -+++ b/libbsm/bsm_wrappers.c 2018-05-11 04:10:15.710820393 -0500 -@@ -823,1 +823,6 @@ audit_get_car(char *path, size_t sz) - } -+ -+pid_t audit_token_to_pid(audit_token_t atoken) -+{ -+ return atoken.val[5]; -+} - \ No newline at end of file diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix deleted file mode 100644 index f30fcac869f1..000000000000 --- a/pkgs/development/libraries/openbsm/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchFromGitHub, lib }: - -stdenv.mkDerivation rec { - pname = "openbsm"; - version = "1.1"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = lib.toUpper (builtins.replaceStrings ["." "-"] ["_" "_"] "${pname}-${version}"); - sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1"; - }; - - patches = lib.optionals stdenv.isDarwin [ ./bsm-add-audit_token_to_pid.patch ]; - - preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' - MACOSX_DEPLOYMENT_TARGET=10.16 - ''; - - configureFlags = [ "ac_cv_file__usr_include_mach_audit_triggers_defs=no" ]; - - meta = { - description = "Implementation of Sun's Basic Security Module (BSM) security audit API and file format"; - homepage = "http://www.openbsm.org/"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ matthewbauer ]; - license = lib.licenses.bsd2; - }; -} diff --git a/pkgs/development/libraries/opencascade-occt/default.nix b/pkgs/development/libraries/opencascade-occt/default.nix deleted file mode 100644 index a09cacaf3928..000000000000 --- a/pkgs/development/libraries/opencascade-occt/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, stdenv -, fetchurl -, cmake -, ninja -, tcl -, tk -, libGL -, libGLU -, libXext -, libXmu -, libXi -, darwin -}: - -stdenv.mkDerivation rec { - pname = "opencascade-occt"; - version = "7.8.1"; - commit = "V${builtins.replaceStrings ["."] ["_"] version}"; - - src = fetchurl { - name = "occt-${commit}.tar.gz"; - url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; - hash = "sha256-AGMZqTLLjXbzJFW/RSTsohAGV8sMxlUmdU/Y2oOzkk8="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - tcl - tk - libGL - libGLU - libXext - libXmu - libXi - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - - meta = with lib; { - description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; - homepage = "https://www.opencascade.org/"; - license = licenses.lgpl21; # essentially... - # The special exception defined in the file OCCT_LGPL_EXCEPTION.txt - # are basically about making the license a little less share-alike. - maintainers = with maintainers; [ amiloradovsky gebner ]; - platforms = platforms.all; - }; - -} diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix deleted file mode 100644 index 341c3f3ecf57..000000000000 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ lib -, stdenv -, applyPatches -, fetchFromGitHub -, cmake -, git -, llvmPackages_14 -, spirv-llvm-translator -, buildWithPatches ? true -}: - -let - addPatches = component: pkg: pkg.overrideAttrs (oldAttrs: { - postPatch = oldAttrs.postPatch or "" + '' - for p in ${passthru.patchesOut}/${component}/*; do - patch -p1 -i "$p" - done - ''; - }); - - llvmPkgs = llvmPackages_14; - inherit (llvmPkgs) llvm; - spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; }; - libclang = if buildWithPatches then passthru.libclang else llvmPkgs.libclang; - - passthru = rec { - spirv-llvm-translator = spirv-llvm-translator'; - llvm = addPatches "llvm" llvmPkgs.llvm; - libclang = addPatches "clang" llvmPkgs.libclang; - - clang-unwrapped = libclang.out; - clang = llvmPkgs.clang.override { - cc = clang-unwrapped; - }; - - patchesOut = stdenv.mkDerivation { - pname = "opencl-clang-patches"; - inherit version src; - # Clang patches assume the root is the llvm root dir - # but clang root in nixpkgs is the clang sub-directory - postPatch = '' - for filename in patches/clang/*.patch; do - substituteInPlace "$filename" \ - --replace "a/clang/" "a/" \ - --replace "b/clang/" "b/" - done - ''; - - installPhase = '' - [ -d patches ] && cp -r patches/ $out || mkdir $out - mkdir -p $out/clang $out/llvm - ''; - }; - }; - - version = "14.0.0-unstable-2024-07-09"; - src = applyPatches { - src = fetchFromGitHub { - owner = "intel"; - repo = "opencl-clang"; - # https://github.com/intel/opencl-clang/compare/ocl-open-140 - rev = "470cf0018e1ef6fc92eda1356f5f31f7da452abc"; - hash = "sha256-Ja+vJ317HI3Nh45kcAMhyLVTIqyy6pE5KAsKs4ou9J8="; - }; - - patches = [ - # Build script tries to find Clang OpenCL headers under ${llvm} - # Work around it by specifying that directory manually. - ./opencl-headers-dir.patch - ]; - - postPatch = '' - # fix not be able to find clang from PATH - substituteInPlace cl_headers/CMakeLists.txt \ - --replace " NO_DEFAULT_PATH" "" - '' + lib.optionalString stdenv.isDarwin '' - # Uses linker flags that are not supported on Darwin. - sed -i -e '/SET_LINUX_EXPORTS_FILE/d' CMakeLists.txt - substituteInPlace CMakeLists.txt \ - --replace '-Wl,--no-undefined' "" - ''; - }; -in - -stdenv.mkDerivation { - pname = "opencl-clang"; - inherit version src; - - nativeBuildInputs = [ cmake git llvm.dev ]; - - buildInputs = [ libclang llvm spirv-llvm-translator' ]; - - cmakeFlags = [ - "-DPREFERRED_LLVM_VERSION=${lib.getVersion llvm}" - "-DOPENCL_HEADERS_DIR=${libclang.lib}/lib/clang/${lib.getVersion libclang}/include/" - - "-DLLVMSPIRV_INCLUDED_IN_LLVM=OFF" - "-DSPIRV_TRANSLATOR_DIR=${spirv-llvm-translator'}" - ]; - - inherit passthru; - - meta = with lib; { - 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 = [ ]; - platforms = platforms.all; - # error: invalid value 'CL3.0' in '-cl-std=CL3.0' - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/development/libraries/opencl-clang/opencl-headers-dir.patch b/pkgs/development/libraries/opencl-clang/opencl-headers-dir.patch deleted file mode 100644 index 70343b8ee197..000000000000 --- a/pkgs/development/libraries/opencl-clang/opencl-headers-dir.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt -index 3dd2ea4..aeae6e9 100644 ---- a/cl_headers/CMakeLists.txt -+++ b/cl_headers/CMakeLists.txt -@@ -11,12 +11,14 @@ add_custom_command( - ) - endfunction(copy_file) - --if(USE_PREBUILT_LLVM) -- set(OPENCL_HEADERS_DIR -- "${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/") --else(USE_PREBUILT_LLVM) -- set(OPENCL_HEADERS_DIR "${CLANG_SOURCE_DIR}/lib/Headers") --endif(USE_PREBUILT_LLVM) -+if(NOT DEFINED OPENCL_HEADERS_DIR) -+ if(USE_PREBUILT_LLVM) -+ set(OPENCL_HEADERS_DIR -+ "${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/") -+ else(USE_PREBUILT_LLVM) -+ set(OPENCL_HEADERS_DIR "${CLANG_SOURCE_DIR}/lib/Headers") -+ endif(USE_PREBUILT_LLVM) -+endif() - copy_file(${OPENCL_HEADERS_DIR}/opencl-c.h opencl-c.h) - - add_custom_target ( diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix deleted file mode 100644 index 58709dcd8699..000000000000 --- a/pkgs/development/libraries/opencl-clhpp/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3, opencl-headers }: - -stdenv.mkDerivation rec { - pname = "opencl-clhpp"; - version = "2024.05.08"; - - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "OpenCL-CLHPP"; - rev = "v${version}"; - sha256 = "sha256-bIm4tGqwWX0IPKH3BwLgkf0T7YFrkN6vemYvdPrqUpw="; - }; - - nativeBuildInputs = [ cmake python3 ]; - - propagatedBuildInputs = [ opencl-headers ]; - - strictDeps = true; - - cmakeFlags = [ - "-DBUILD_EXAMPLES=OFF" - "-DBUILD_TESTS=OFF" - ]; - - meta = with lib; { - description = "OpenCL Host API C++ bindings"; - homepage = "http://github.khronos.org/OpenCL-CLHPP/"; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix deleted file mode 100644 index b13dc2bb8dd7..000000000000 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, hashcat -, ocl-icd -, tesseract -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "opencl-headers"; - version = "2023.12.14"; - - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "OpenCL-Headers"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-wF9KQjzYKJf6ulXRy80o53bp6lTtm8q1NubKbcH+RY0="; - }; - - nativeBuildInputs = [ cmake ]; - - passthru.tests = { - inherit ocl-icd tesseract hashcat; - pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - moduleNames = [ "OpenCL-Headers" ]; - }; - }; - - meta = with lib; { - description = "Khronos OpenCL headers version ${finalAttrs.version}"; - homepage = "https://www.khronos.org/registry/cl/"; - license = licenses.asl20; - platforms = platforms.unix ++ platforms.windows; - maintainers = [ ]; - }; -}) diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix deleted file mode 100644 index 6ecb76c0eed7..000000000000 --- a/pkgs/development/libraries/opencollada/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, pkg-config, libxml2, pcre -, darwin}: - -stdenv.mkDerivation rec { - pname = "opencollada"; - - version = "1.6.68"; - - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "OpenCOLLADA"; - rev = "v${version}"; - sha256 = "1ym16fxx9qhf952vva71sdzgbm7ifis0h1n5fj1bfdj8zvvkbw5w"; - }; - - patches = [ - ./pcre.patch - - # fix build with gcc 13 - (fetchurl { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch?id=b76590f9fb8615da3da9d783ad841c0e3881a27b"; - hash = "sha256-uimeLGHgXaFi61mmoaloJ5vo83c8EIQmtHEMngC2Nq4="; - }) - ]; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ]); - - propagatedBuildInputs = [ libxml2 pcre ]; - - postPatch = '' - # Drop blanket -Werror as it tends to fail on newer toolchain for - # minor warnings. In this case it was gcc-13 build failure. - substituteInPlace DAEValidator/CMakeLists.txt --replace-fail ' -Werror"' '"' - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp \ - --replace math.h cmath - ''; - - meta = { - description = "Library for handling the COLLADA file format"; - homepage = "https://github.com/KhronosGroup/OpenCOLLADA/"; - maintainers = [ ]; - platforms = lib.platforms.unix; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/libraries/opencollada/pcre.patch b/pkgs/development/libraries/opencollada/pcre.patch deleted file mode 100644 index 39408f5a61e3..000000000000 --- a/pkgs/development/libraries/opencollada/pcre.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h -index 22f2598b..269c50ca 100644 ---- a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h -+++ b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h -@@ -13,8 +13,7 @@ - - #include "COLLADABUPrerequisites.h" - --struct real_pcre; --typedef struct real_pcre pcre; -+#include "pcre.h" - - - namespace COLLADABU diff --git a/pkgs/development/libraries/opencolorio/1.x.nix b/pkgs/development/libraries/opencolorio/1.x.nix index 63098028fc64..7d1839163efc 100644 --- a/pkgs/development/libraries/opencolorio/1.x.nix +++ b/pkgs/development/libraries/opencolorio/1.x.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # TODO: Investigate whether git can be dropped: It's only used to apply patches nativeBuildInputs = [ cmake pkg-config git ]; - buildInputs = [ lcms2 tinyxml ] ++ lib.optional stdenv.isDarwin boost; + buildInputs = [ lcms2 tinyxml ] ++ lib.optional stdenv.hostPlatform.isDarwin boost; postPatch = '' substituteInPlace src/core/CMakeLists.txt --replace "-Werror" "" @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { "-DUSE_EXTERNAL_TINYXML=ON" # External yaml-cpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517 "-DUSE_EXTERNAL_YAML=OFF" - ] ++ lib.optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "-DOCIO_USE_BOOST_PTR=ON" ++ lib.optional (!stdenv.hostPlatform.isx86) "-DOCIO_USE_SSE=OFF" - ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-DCMAKE_OSX_ARCHITECTURES=arm64"; + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-DCMAKE_OSX_ARCHITECTURES=arm64"; postInstall = '' moveToOutput bin "$bin" diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 3e9302e025f2..4bc1f410872e 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "opencolorio"; - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenColorIO"; rev = "v${version}"; - hash = "sha256-CSD3AZ36tmC/cYSdPsdDYx894+jd9GkGkhYJ767QY8A="; + hash = "sha256-7Uj1YBpunj9/32U5hpCokxfcVoRB9Oi2G9Cso+gAu5Q="; }; patches = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ./line-numbers.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # these tests don't like being run headless on darwin. no builtin # way of skipping tests so this is what we're reduced to. substituteInPlace tests/cpu/Config_tests.cpp \ @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; # precision issues on non-x86 - doCheck = stdenv.isx86_64; + doCheck = stdenv.hostPlatform.isx86_64; # Tends to fail otherwise. enableParallelChecking = false; diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix deleted file mode 100644 index 38a50b75027b..000000000000 --- a/pkgs/development/libraries/opencore-amr/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "opencore-amr"; - version = "0.1.6"; - src = fetchurl { - url = "mirror://sourceforge/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; - hash = "sha256-SD60BhCI4rNLNY5HVAtdSVqWzUaONhBQ+uYVsYCdxKE="; - }; - - meta = { - homepage = "https://opencore-amr.sourceforge.io/"; - description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. - Library of VisualOn implementation of Adaptive Multi Rate Wideband (AMR-WB)"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.kiloreux ]; - }; -} diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index 6ac83dfa7d92..5aea0da27380 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ qmake ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ glew ] - ++ lib.optionals stdenv.isLinux [ libGLU libGL libglut libXmu libXext libX11 ] - ++ lib.optional stdenv.isDarwin GLUT; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL libglut libXmu libXext libX11 ] + ++ lib.optional stdenv.hostPlatform.isDarwin GLUT; doCheck = false; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = '' install -D copying.txt "$out/share/doc/opencsg/copying.txt" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/*.app $out/Applications rmdir $out/bin || true @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' app=$out/Applications/opencsgexample.app/Contents/MacOS/opencsgexample install_name_tool -change \ $(otool -L $app | awk '/opencsg.+dylib/ { print $1 }') \ diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix deleted file mode 100644 index e4b6110e1c15..000000000000 --- a/pkgs/development/libraries/openct/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, pcsclite, libusb-compat-0_1 -, doxygen, libxslt -}: - -stdenv.mkDerivation rec { - pname = "openct"; - version = "0.6.20"; - - src = fetchFromGitHub { - owner = "OpenSC"; - repo = "openct"; - rev = "${pname}-${version}"; - sha256 = "09wxq0jxdxhci3zr7jd3zcxjkl3j0r1v00k3q8gqrg9gighh8nk2"; - }; - - postPatch = '' - sed -i 's,$(DESTDIR),$(out),g' etc/Makefile.am - ''; - - configureFlags = [ - "--enable-api-doc" - "--enable-usb" - "--enable-pcsc" - "--localstatedir=/var" - "--sysconfdir=/etc" - ]; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ pcsclite libusb-compat-0_1 doxygen libxslt ]; - - preInstall = '' - mkdir -p $out/etc - ''; - - meta = with lib; { - broken = stdenv.isDarwin; - homepage = "https://github.com/OpenSC/openct/"; - license = licenses.lgpl21; - description = "Drivers for several smart card readers"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index cca9e8ae1c74..0a48e4da8563 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -26,7 +26,7 @@ , libtiff , enableWebP ? true , libwebp -, enableEXR ? !stdenv.isDarwin +, enableEXR ? !stdenv.hostPlatform.isDarwin , openexr , ilmbase , enableJPEG2000 ? true @@ -35,7 +35,7 @@ , eigen , enableBlas ? true , blas -, enableVA ? !stdenv.isDarwin +, enableVA ? !stdenv.hostPlatform.isDarwin , libva , enableContrib ? true @@ -97,6 +97,12 @@ }@inputs: let + inherit (lib.attrsets) mapAttrsToList optionalAttrs; + inherit (lib.lists) last optionals; + inherit (lib.meta) getExe; + inherit (lib.strings) cmakeBool cmakeFeature cmakeOptionType concatStrings concatStringsSep optionalString; + inherit (lib.trivial) flip; + version = "4.9.0"; # It's necessary to consistently use backendStdenv when building with CUDA @@ -228,26 +234,23 @@ let }; # See opencv/cmake/OpenCVDownload.cmake - installExtraFiles = extra: '' - mkdir -p "${extra.dst}" - '' + lib.concatStrings (lib.flip lib.mapAttrsToList extra.files (name: md5: '' - ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}" + installExtraFiles = {dst, files, src, ...}: '' + mkdir -p "${dst}" + '' + concatStrings (flip mapAttrsToList files (name: md5: '' + ln -s "${src}/${name}" "${dst}/${md5}-${name}" '')); - installExtraFile = extra: '' - mkdir -p "${extra.dst}" - ln -s "${extra.src}" "${extra.dst}/${extra.md5}-${extra.name}" + installExtraFile = {dst, md5, name, src, ...}: '' + mkdir -p "${dst}" + ln -s "${src}" "${dst}/${md5}-${name}" ''; - opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}"; - - printEnabled = enabled: if enabled then "ON" else "OFF"; withOpenblas = (enableBlas && blas.provider.pname == "openblas"); #multithreaded openblas conflicts with opencv multithreading, which manifest itself in hung tests #https://github.com/OpenMathLib/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded openblas_ = blas.provider.override { singleThreaded = true; }; - inherit (cudaPackages) cudaFlags cudaVersion; - inherit (cudaFlags) cudaCapabilities; + inherit (cudaPackages) cudaFlags; + inherit (cudaFlags) cmakeCudaArchitecturesString cudaCapabilities; in @@ -258,20 +261,21 @@ effectiveStdenv.mkDerivation { outputs = [ "out" "cxxdev" - ] ++ lib.optionals (runAccuracyTests || runPerformanceTests) [ + ] ++ optionals (runAccuracyTests || runPerformanceTests) [ "package_tests" ]; cudaPropagateToOutput = "cxxdev"; - postUnpack = lib.optionalString buildContrib '' + postUnpack = optionalString buildContrib '' cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib" ''; # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV. patches = [ ./cmake-don-t-use-OpenCVFindOpenEXR.patch - ] ++ lib.optionals enableContrib [ - ] ++ lib.optional enableCuda ./cuda_opt_flow.patch; + ] ++ optionals enableCuda [ + ./cuda_opt_flow.patch + ]; # This prevents cmake from using libraries in impure paths (which # causes build failure on non NixOS) @@ -281,8 +285,8 @@ effectiveStdenv.mkDerivation { preConfigure = installExtraFile ade + - lib.optionalString enableIpp (installExtraFiles ippicv) + ( - lib.optionalString buildContrib '' + optionalString enableIpp (installExtraFiles ippicv) + ( + optionalString buildContrib '' cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/source/opencv_contrib") ${installExtraFiles vgg} @@ -304,35 +308,35 @@ effectiveStdenv.mkDerivation { pcre2 protobuf_21 zlib - ] ++ lib.optionals enablePython [ + ] ++ optionals enablePython [ pythonPackages.python - ] ++ lib.optionals (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) [ + ] ++ optionals (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) [ hdf5 - ] ++ lib.optionals enableGtk2 [ + ] ++ optionals enableGtk2 [ gtk2 - ] ++ lib.optionals enableGtk3 [ + ] ++ optionals enableGtk3 [ gtk3 - ] ++ lib.optionals enableVtk [ + ] ++ optionals enableVtk [ vtk - ] ++ lib.optionals enableJPEG [ + ] ++ optionals enableJPEG [ libjpeg - ] ++ lib.optionals enablePNG [ + ] ++ optionals enablePNG [ libpng - ] ++ lib.optionals enableTIFF [ + ] ++ optionals enableTIFF [ libtiff - ] ++ lib.optionals enableWebP [ + ] ++ optionals enableWebP [ libwebp - ] ++ lib.optionals enableEXR [ + ] ++ optionals enableEXR [ openexr ilmbase - ] ++ lib.optionals enableJPEG2000 [ + ] ++ optionals enableJPEG2000 [ openjpeg - ] ++ lib.optionals enableFfmpeg [ + ] ++ optionals enableFfmpeg [ ffmpeg - ] ++ lib.optionals (enableFfmpeg && effectiveStdenv.isDarwin) [ + ] ++ optionals (enableFfmpeg && effectiveStdenv.hostPlatform.isDarwin) [ bzip2 VideoDecodeAcceleration - ] ++ lib.optionals (enableGStreamer && effectiveStdenv.isLinux) [ + ] ++ optionals (enableGStreamer && effectiveStdenv.hostPlatform.isLinux) [ elfutils gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -340,27 +344,27 @@ effectiveStdenv.mkDerivation { libunwind orc zstd - ] ++ lib.optionals enableOvis [ + ] ++ optionals enableOvis [ ogre - ] ++ lib.optionals enableGPhoto2 [ + ] ++ optionals enableGPhoto2 [ libgphoto2 - ] ++ lib.optionals enableDC1394 [ + ] ++ optionals enableDC1394 [ libdc1394 - ] ++ lib.optionals enableEigen [ + ] ++ optionals enableEigen [ eigen - ] ++ lib.optionals enableVA [ + ] ++ optionals enableVA [ libva - ] ++ lib.optionals enableBlas [ + ] ++ optionals enableBlas [ blas.provider - ] ++ lib.optionals enableTesseract [ + ] ++ optionals enableTesseract [ # There is seemingly no compile-time flag for Tesseract. It's # simply enabled automatically if contrib is built, and it detects # tesseract & leptonica. tesseract leptonica - ] ++ lib.optionals enableTbb [ + ] ++ optionals enableTbb [ tbb - ] ++ lib.optionals effectiveStdenv.isDarwin [ + ] ++ optionals effectiveStdenv.hostPlatform.isDarwin [ bzip2 AVFoundation Cocoa @@ -368,76 +372,78 @@ effectiveStdenv.mkDerivation { CoreMedia MediaToolbox Accelerate - ] ++ lib.optionals enableDocs [ + ] ++ optionals enableDocs [ doxygen graphviz-nox - ] ++ lib.optionals enableCuda [ + ] ++ optionals enableCuda [ cudaPackages.cuda_cudart cudaPackages.cuda_cccl # <thrust/*> cudaPackages.libnpp # npp.h nvidia-optical-flow-sdk - ] ++ lib.optionals enableCublas [ + ] ++ optionals enableCublas [ # May start using the default $out instead once # https://github.com/NixOS/nixpkgs/issues/271792 # has been addressed cudaPackages.libcublas # cublas_v2.h - ] ++ lib.optionals enableCudnn [ + ] ++ optionals enableCudnn [ cudaPackages.cudnn # cudnn.h - ] ++ lib.optionals enableCufft [ + ] ++ optionals enableCufft [ cudaPackages.libcufft # cufft.h ]; - propagatedBuildInputs = lib.optionals enablePython [ pythonPackages.numpy ]; + propagatedBuildInputs = optionals enablePython [ pythonPackages.numpy ]; - nativeBuildInputs = [ cmake pkg-config unzip ] - ++ lib.optionals enablePython [ + nativeBuildInputs = [ + cmake + pkg-config + unzip + ] ++ optionals enablePython [ pythonPackages.pip pythonPackages.wheel pythonPackages.setuptools - ] ++ lib.optionals enableCuda [ + ] ++ optionals enableCuda [ cudaPackages.cuda_nvcc ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + env.NIX_CFLAGS_COMPILE = optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; # Configure can't find the library without this. - OpenBLAS_HOME = lib.optionalString withOpenblas openblas_.dev; - OpenBLAS = lib.optionalString withOpenblas openblas_; + OpenBLAS_HOME = optionalString withOpenblas openblas_.dev; + OpenBLAS = optionalString withOpenblas openblas_; cmakeFlags = [ - "-DOPENCV_GENERATE_PKGCONFIG=ON" - "-DWITH_OPENMP=ON" - "-DBUILD_PROTOBUF=OFF" - "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf_21}" - "-DPROTOBUF_UPDATE_FILES=ON" - "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" - "-DBUILD_TESTS=${printEnabled runAccuracyTests}" - "-DBUILD_PERF_TESTS=${printEnabled runPerformanceTests}" - "-DCMAKE_SKIP_BUILD_RPATH=ON" - "-DBUILD_DOCS=${printEnabled enableDocs}" + (cmakeBool "OPENCV_GENERATE_PKGCONFIG" true) + (cmakeBool "WITH_OPENMP" true) + (cmakeBool "BUILD_PROTOBUF" false) + (cmakeOptionType "path" "Protobuf_PROTOC_EXECUTABLE" (getExe buildPackages.protobuf_21)) + (cmakeBool "PROTOBUF_UPDATE_FILES" true) + (cmakeBool "OPENCV_ENABLE_NONFREE" enableUnfree) + (cmakeBool "BUILD_TESTS" runAccuracyTests) + (cmakeBool "BUILD_PERF_TESTS" runPerformanceTests) + (cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) + (cmakeBool "BUILD_DOCS" enableDocs) # "OpenCV disables pkg-config to avoid using of host libraries. Consider using PKG_CONFIG_LIBDIR to specify target SYSROOT" # but we have proper separation of build and host libs :), fixes cross - "-DOPENCV_ENABLE_PKG_CONFIG=ON" - (opencvFlag "IPP" enableIpp) - (opencvFlag "TIFF" enableTIFF) - (opencvFlag "WEBP" enableWebP) - (opencvFlag "JPEG" enableJPEG) - (opencvFlag "PNG" enablePNG) - (opencvFlag "OPENEXR" enableEXR) - (opencvFlag "OPENJPEG" enableJPEG2000) - "-DWITH_JASPER=OFF" # OpenCV falls back to a vendored copy of Jasper when OpenJPEG is disabled - (opencvFlag "TBB" enableTbb) + (cmakeBool "OPENCV_ENABLE_PKG_CONFIG" true) + (cmakeBool "WITH_IPP" enableIpp) + (cmakeBool "WITH_TIFF" enableTIFF) + (cmakeBool "WITH_WEBP" enableWebP) + (cmakeBool "WITH_JPEG" enableJPEG) + (cmakeBool "WITH_PNG" enablePNG) + (cmakeBool "WITH_OPENEXR" enableEXR) + (cmakeBool "WITH_OPENJPEG" enableJPEG2000) + (cmakeBool "WITH_JASPER" false) # OpenCV falls back to a vendored copy of Jasper when OpenJPEG is disabled + (cmakeBool "WITH_TBB" enableTbb) # CUDA options - (opencvFlag "CUDA" enableCuda) - (opencvFlag "CUDA_FAST_MATH" enableCuda) - (opencvFlag "CUBLAS" enableCublas) - (opencvFlag "CUDNN" enableCudnn) - (opencvFlag "CUFFT" enableCufft) + (cmakeBool "WITH_CUDA" enableCuda) + (cmakeBool "WITH_CUBLAS" enableCublas) + (cmakeBool "WITH_CUDNN" enableCudnn) + (cmakeBool "WITH_CUFFT" enableCufft) # LTO options - (opencvFlag "ENABLE_LTO" enableLto) - (opencvFlag "ENABLE_THIN_LTO" ( + (cmakeBool "ENABLE_LTO" enableLto) + (cmakeBool "ENABLE_THIN_LTO" ( enableLto && ( # Only clang supports thin LTO, so we must either be using clang through the effectiveStdenv, effectiveStdenv.cc.isClang || @@ -445,51 +451,53 @@ effectiveStdenv.mkDerivation { (enableCuda && effectiveStdenv.cc.isClang) ) )) - ] ++ lib.optionals enableCuda [ - "-DCUDA_FAST_MATH=ON" - "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" + ] ++ optionals enableCuda [ + (cmakeBool "CUDA_FAST_MATH" true) + (cmakeFeature "CUDA_NVCC_FLAGS" "--expt-relaxed-constexpr") # OpenCV respects at least three variables: # -DCUDA_GENERATION takes a single arch name, e.g. Volta # -DCUDA_ARCH_BIN takes a semi-colon separated list of real arches, e.g. "8.0;8.6" # -DCUDA_ARCH_PTX takes the virtual arch, e.g. "8.6" - "-DCUDA_ARCH_BIN=${lib.concatStringsSep ";" cudaCapabilities}" - "-DCUDA_ARCH_PTX=${lib.last cudaCapabilities}" + (cmakeFeature "CUDA_ARCH_BIN" cmakeCudaArchitecturesString) + (cmakeFeature "CUDA_ARCH_PTX" (last cudaCapabilities)) - "-DNVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH=${nvidia-optical-flow-sdk}" - ] ++ lib.optionals effectiveStdenv.isDarwin [ - "-DWITH_OPENCL=OFF" - "-DWITH_LAPACK=OFF" + (cmakeOptionType "path" "NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH" nvidia-optical-flow-sdk.outPath) + ] ++ optionals effectiveStdenv.hostPlatform.isDarwin [ + (cmakeBool "WITH_OPENCL" false) + (cmakeBool "WITH_LAPACK" false) # Disable unnecessary vendoring that's enabled by default only for Darwin. # Note that the opencvFlag feature flags listed above still take # precedence, so we can safely list everything here. - "-DBUILD_ZLIB=OFF" - "-DBUILD_TIFF=OFF" - "-DBUILD_OPENJPEG=OFF" - "-DBUILD_JASPER=OFF" - "-DBUILD_JPEG=OFF" - "-DBUILD_PNG=OFF" - "-DBUILD_WEBP=OFF" - ] ++ lib.optionals (!effectiveStdenv.isDarwin) [ - "-DOPENCL_LIBRARY=${ocl-icd}/lib/libOpenCL.so" - ] ++ lib.optionals enablePython [ - "-DOPENCV_SKIP_PYTHON_LOADER=ON" - ] ++ lib.optionals (enabledModules != [ ]) [ - "-DBUILD_LIST=${lib.concatStringsSep "," enabledModules}" + (cmakeBool "BUILD_ZLIB" false) + (cmakeBool "BUILD_TIFF" false) + (cmakeBool "BUILD_OPENJPEG" false) + (cmakeBool "BUILD_JASPER" false) + (cmakeBool "BUILD_JPEG" false) + (cmakeBool "BUILD_PNG" false) + (cmakeBool "BUILD_WEBP" false) + ] ++ optionals (!effectiveStdenv.hostPlatform.isDarwin) [ + (cmakeOptionType "path" "OPENCL_LIBRARY" "${ocl-icd}/lib/libOpenCL.so") + ] ++ optionals enablePython [ + (cmakeOptionType "path" "OPENCV_PYTHON_INSTALL_PATH" pythonPackages.python.sitePackages) + ] ++ optionals (enabledModules != [ ]) [ + (cmakeFeature "BUILD_LIST" (concatStringsSep "," enabledModules)) ]; - postBuild = lib.optionalString enableDocs '' + postBuild = optionalString enableDocs '' make doxygen ''; preInstall = - lib.optionalString (runAccuracyTests || runPerformanceTests) '' - mkdir $package_tests - cp -R $src/samples $package_tests/ - '' - + lib.optionalString runAccuracyTests "mv ./bin/*test* $package_tests/ \n" - + lib.optionalString runPerformanceTests "mv ./bin/*perf* $package_tests/"; + optionalString (runAccuracyTests || runPerformanceTests) '' + mkdir $package_tests + cp -R $src/samples $package_tests/ + '' + optionalString runAccuracyTests '' + mv ./bin/*test* $package_tests/ + '' + optionalString runPerformanceTests '' + mv ./bin/*perf* $package_tests/ + ''; # By default $out/lib/pkgconfig/opencv4.pc looks something like this: # @@ -510,22 +518,29 @@ effectiveStdenv.mkDerivation { '' # fix deps not progagating from opencv4.cxxdev if cuda is disabled # see https://github.com/NixOS/nixpkgs/issues/276691 - + lib.optionalString (!enableCuda) '' + + optionalString (!enableCuda) '' mkdir -p "$cxxdev/nix-support" echo "''${!outputDev}" >> "$cxxdev/nix-support/propagated-build-inputs" '' + # remove the requirement that the exact same version of CUDA is used in packages + # consuming OpenCV's CMakes files + + optionalString enableCuda '' + substituteInPlace "$out/lib/cmake/opencv4/OpenCVConfig.cmake" \ + --replace-fail \ + 'find_host_package(CUDA ''${OpenCV_CUDA_VERSION} EXACT REQUIRED)' \ + 'find_host_package(CUDA REQUIRED)' \ + --replace-fail \ + 'message(FATAL_ERROR "OpenCV static library was compiled with CUDA' \ + 'message("OpenCV static library was compiled with CUDA' + '' # install python distribution information, so other packages can `import opencv` - + lib.optionalString enablePython '' + + optionalString enablePython '' pushd $NIX_BUILD_TOP/$sourceRoot/modules/python/package python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist . pushd dist python -m pip install ./*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache - # the cv2/__init__.py just tries to check provide "nice user feedback" if the installation is bad - # however, this also causes infinite recursion when used by other packages - rm -r $out/${pythonPackages.python.sitePackages}/cv2 - popd popd ''; @@ -536,18 +551,18 @@ effectiveStdenv.mkDerivation { tests = { inherit (gst_all_1) gst-plugins-bad; } - // lib.optionalAttrs (!effectiveStdenv.isDarwin) { inherit qimgv; } - // lib.optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; } - // lib.optionalAttrs (effectiveStdenv.buildPlatform != "x86_64-darwin") { + // optionalAttrs (!effectiveStdenv.hostPlatform.isDarwin) { inherit qimgv; } + // optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; } + // optionalAttrs (effectiveStdenv.buildPlatform != "x86_64-darwin") { opencv4-tests = callPackage ./tests.nix { inherit enableGStreamer enableGtk2 enableGtk3 runAccuracyTests runPerformanceTests testDataSrc; inherit opencv4; }; } - // lib.optionalAttrs (enableCuda) { + // optionalAttrs (enableCuda) { no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { attrName = "opencv4"; }; }; - } // lib.optionalAttrs enablePython { pythonPath = [ ]; }; + } // optionalAttrs enablePython { pythonPath = [ ]; }; meta = { description = "Open Computer Vision Library with more than 500 algorithms"; diff --git a/pkgs/development/libraries/opencv/tests.nix b/pkgs/development/libraries/opencv/tests.nix index d1966b1a4aa8..dec10c1b13ab 100644 --- a/pkgs/development/libraries/opencv/tests.nix +++ b/pkgs/development/libraries/opencv/tests.nix @@ -26,7 +26,7 @@ let "video" #"videoio" # - a lot of GStreamer warnings and failed tests #"dnn" #- some caffe tests failed, probably because github workflow also downloads additional models - ] ++ lib.optionals (!stdenv.isAarch64 && enableGStreamer) [ "gapi" ] + ] ++ lib.optionals (!stdenv.hostPlatform.isAarch64 && enableGStreamer) [ "gapi" ] ++ lib.optionals (enableGtk2 || enableGtk3) [ "highgui" ]; perfTestNames = [ "calib3d" @@ -38,8 +38,8 @@ let "photo" "stitching" "video" - ] ++ lib.optionals (!stdenv.isAarch64 && enableGStreamer) [ "gapi" ]; - testRunner = lib.optionalString (!stdenv.isDarwin) "${lib.getExe xvfb-run} -a "; + ] ++ lib.optionals (!stdenv.hostPlatform.isAarch64 && enableGStreamer) [ "gapi" ]; + testRunner = lib.optionalString (!stdenv.hostPlatform.isDarwin) "${lib.getExe xvfb-run} -a "; testsPreparation = '' touch $out # several tests want a write access, so we have to copy files diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix deleted file mode 100644 index 9fbb8356679c..000000000000 --- a/pkgs/development/libraries/opendbx/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, readline, libmysqlclient, postgresql, sqlite }: - -let inherit (lib) getDev; in - -stdenv.mkDerivation rec { - pname = "opendbx"; - version = "1.4.6"; - - src = fetchurl { - url = "https://linuxnetworks.de/opendbx/download/opendbx-${version}.tar.gz"; - sha256 = "0z29h6zx5f3gghkh1a0060w6wr572ci1rl2a3480znf728wa0ii2"; - }; - - preConfigure = '' - export CPPFLAGS="-I${getDev libmysqlclient}/include/mysql" - export LDFLAGS="-L${libmysqlclient}/lib/mysql" - configureFlagsArray=(--with-backends="mysql pgsql sqlite3") - ''; - - buildInputs = [ readline libmysqlclient postgresql sqlite ]; - - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-std=c++14" - ]; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "Extremely lightweight but extensible database access library written in C"; - mainProgram = "odbx-sql"; - license = licenses.lgpl21; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 322885ac8606..e7408ba37e67 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { restinio http-parser openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix deleted file mode 100644 index 00b5d624153a..000000000000 --- a/pkgs/development/libraries/opendkim/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libbsd, openssl, libmilter -, autoreconfHook, perl, makeWrapper, unbound }: - -stdenv.mkDerivation rec { - pname = "opendkim"; - version = "2.11.0-Beta2"; - - src = fetchFromGitHub { - owner = "trusteddomainproject"; - repo = "OpenDKIM"; - rev = "rel-opendkim-${lib.replaceStrings ["."] ["-"] version}"; - sha256 = "0nx3in8sa6xna4vfacj8g60hfzk61jpj2ldag80xzxip9c3rd2pw"; - }; - - configureFlags= [ - "--with-milter=${libmilter}" - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ] ++ lib.optional stdenv.isDarwin "--with-unbound=${unbound}"; - - nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; - - buildInputs = [ libbsd openssl libmilter perl ] ++ lib.optional stdenv.isDarwin unbound; - - postInstall = '' - wrapProgram $out/sbin/opendkim-genkey \ - --prefix PATH : ${openssl.bin}/bin - ''; - - meta = with lib; { - description = "C library for producing DKIM-aware applications and an open source milter for providing DKIM service"; - homepage = "http://www.opendkim.org/"; - maintainers = with maintainers; [ abbradar ]; - license = licenses.bsd3; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/opendmarc/default.nix b/pkgs/development/libraries/opendmarc/default.nix deleted file mode 100644 index d8af86b6cdb5..000000000000 --- a/pkgs/development/libraries/opendmarc/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libmilter, perl, perlPackages, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "opendmarc"; - version = "1.4.2"; - - src = fetchFromGitHub { - owner = "trusteddomainproject"; - repo = "opendmarc"; - rev = "rel-opendmarc-${builtins.replaceStrings [ "." ] [ "-" ] version}"; - hash = "sha256-vnWtTvHhzCed7P6rN3wAz6zfRvtV0cLn5GhDxLF8H3c="; - }; - - outputs = [ "bin" "dev" "out" "doc" ]; - - buildInputs = [ perl ]; - nativeBuildInputs = [ autoreconfHook makeWrapper ]; - - postPatch = '' - substituteInPlace configure.ac --replace ' docs/Makefile' "" - patchShebangs contrib reports - ''; - - configureFlags = [ - "--with-milter=${libmilter}" - ]; - - postFixup = '' - for b in $bin/bin/opendmarc-{expire,import,params,reports}; do - wrapProgram $b --set PERL5LIB ${perlPackages.makeFullPerlPath (with perlPackages; [ Switch DBI DBDmysql HTTPMessage ])} - done - ''; - - meta = with lib; { - description = "Free open source software implementation of the DMARC specification"; - homepage = "http://www.trusteddomain.org/opendmarc/"; - license = with licenses; [ bsd3 sendmail ]; - maintainers = teams.helsinki-systems.members; - }; -} diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix index 9e6d6eaa65da..65666cd7d6f2 100644 --- a/pkgs/development/libraries/openexr/3.nix +++ b/pkgs/development/libraries/openexr/3.nix @@ -5,6 +5,7 @@ , imath , libdeflate , pkg-config +, libjxl , pkgsCross }: @@ -41,12 +42,13 @@ stdenv.mkDerivation rec { # Without 'sse' enforcement tests fail on i686 as due to excessive precision as: # error reading back channel B pixel 21,-76 got -nan expected -nan - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-msse2 -mfpmath=sse"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-msse2 -mfpmath=sse"; # https://github.com/AcademySoftwareFoundation/openexr/issues/1400 - doCheck = !stdenv.isAarch32; + doCheck = !stdenv.hostPlatform.isAarch32; passthru.tests = { + inherit libjxl; musl = pkgsCross.musl64.openexr_3; }; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index b45557b95c1b..a79759be24f2 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { # https://github.com/AcademySoftwareFoundation/openexr/issues/1400 # https://github.com/AcademySoftwareFoundation/openexr/issues/1281 - doCheck = !stdenv.isAarch32 && !stdenv.isi686; + doCheck = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isi686; meta = with lib; { description = "High dynamic-range (HDR) image file format"; diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix deleted file mode 100644 index c961dfd069a6..000000000000 --- a/pkgs/development/libraries/openexrid-unstable/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }: - -stdenv.mkDerivation { - pname = "openexrid-unstable"; - version = "2017-09-17"; - - src = fetchFromGitHub { - owner = "MercenariesEngineering"; - repo = "openexrid"; - rev = "bec0081548a096f9bcdd1504970c96264b0fc050"; - sha256 = "0h4b74lv59p4hhrvrqdmlnchn2i0v5id4kl8xc7j26l9884q0383"; - }; - - outputs = [ "dev" "out" "lib" ]; - - patches = [ ./openexrid.patch ]; - - postPatch = '' - substituteInPlace openexrid/makefile \ - --replace g++ c++ - ''; - - env.NIX_CFLAGS_COMPILE = ''-I${ilmbase.dev}/include/OpenEXR - -I${openexr.dev}/include/OpenEXR - -I${openfx.dev}/include/OpenFX - ''; - - buildInputs = [ re2 openfx zlib ilmbase libGLU libGL openexr ]; - - enableParallelBuilding = true; - - buildPhase = '' - mkdir openexrid/release - - PREFIX=$out make -C openexrid install - - mkdir $dev; - mkdir $lib; - ''; - - installPhase = '' - find $out - mv $out/include $dev/ - mv $out/lib $lib/ - ''; - - meta = with lib; { - description = "OpenEXR files able to isolate any object of a CG image with a perfect antialiazing"; - homepage = "https://github.com/MercenariesEngineering/openexrid"; - maintainers = [ maintainers.guibou ]; - platforms = platforms.all; - license = licenses.mit; - }; -} diff --git a/pkgs/development/libraries/openexrid-unstable/openexrid.patch b/pkgs/development/libraries/openexrid-unstable/openexrid.patch deleted file mode 100644 index bbbf75b575dc..000000000000 --- a/pkgs/development/libraries/openexrid-unstable/openexrid.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/makefile b/makefile -index 7a92771..31ef664 100644 ---- a/makefile -+++ b/makefile -@@ -8,8 +8,8 @@ _openexrid: - _openfx: - make -C openfx - --_test: _openexrid -- make -C test -+#_test: _openexrid -+# make -C test - - clean: - make -C openfx clean -diff --git a/makefile.config b/makefile.config -index 0c6cdfa..0166c4c 100644 ---- a/makefile.config -+++ b/makefile.config -@@ -4,7 +4,7 @@ - - PREFIX ?= ~/openexrid - --OFX_INCLUDE ?= /usr/include/openfx -+OFX_INCLUDE ?= /usr/include/OpenFX - EXR_INCLUDE ?= /usr/include/OpenEXR - EXR_LIB ?= /usr/lib - RE2_INCLUDE ?= /usr/include -@@ -13,5 +13,5 @@ RE2_LIB ?= /usr/lib - VERSION ?= release - CPPFLAGS += -O3 -Wall -DNDEBUG -fPIC -I $(EXR_INCLUDE) -I $(OFX_INCLUDE) -I $(RE2_INCLUDE) -Dlinux - LDFLAGS += -L$(EXR_LIB) -L$(RE2_LIB) -L../openexrid/$(VERSION) -lpthread --LDFLAGS += -Wl,-Bstatic -lopenexrid -lIlmImf -lIlmThread -lIex -lImath -lHalf -lz -lre2 -Wl,-Bdynamic -+LDFLAGS += -lopenexrid -lIlmImf -lIlmThread -lIex -lImath -lHalf -lz -lre2 -Wl,-Bdynamic - diff --git a/pkgs/development/libraries/openfec/default.nix b/pkgs/development/libraries/openfec/default.nix deleted file mode 100644 index 964f5d86f672..000000000000 --- a/pkgs/development/libraries/openfec/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv -, lib -, fetchzip -, cmake -, gitUpdater -}: - -stdenv.mkDerivation rec { - pname = "openfec"; - version = "1.4.2.11"; - - src = fetchzip { - url = "https://github.com/roc-streaming/openfec/archive/refs/tags/v${version}.tar.gz"; - hash = "sha256-lBR8vz8whEdPVHAGVq9eRriKtmS5tUAvtoyXwO4AuEs="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - cmake - ]; - - cmakeFlags = [ - "-DDEBUG:STRING=OFF" - (lib.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic) - ]; - - installPhase = - let so = stdenv.hostPlatform.extensions.library; - in '' - # This is pretty horrible but sadly there is not installation procedure - # provided. - mkdir -p $dev/include - cp -R ../src/* $dev/include - find $dev/include -type f -a ! -iname '*.h' -delete - - install -D -m755 -t $out/lib ../bin/Release/libopenfec${so} - '' + lib.optionalString stdenv.isDarwin '' - install_name_tool -id $out/lib/libopenfec${so} $out/lib/libopenfec${so} - '' + '' - ln -s libopenfec${so} $out/lib/libopenfec${so}.1 - ''; - - passthru.updateScript = gitUpdater { - url = "https://github.com/roc-streaming/openfec.git"; - rev-prefix = "v"; - }; - - meta = with lib; { - description = "Application-level Forward Erasure Correction codes"; - homepage = "https://github.com/roc-streaming/openfec"; - license = licenses.cecill-c; - maintainers = with maintainers; [ bgamari ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix deleted file mode 100644 index 2bfb08708588..000000000000 --- a/pkgs/development/libraries/openfx/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation { - pname = "openfx"; - version = "1.4"; - - src = fetchFromGitHub { - owner = "AcademySoftwareFoundation"; - repo = "openfx"; - rev = "OFX_Release_1_4_TAG"; - sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548"; - }; - - outputs = [ "dev" "out" ]; - - enableParallelBuilding = true; - - buildPhase = '' - mkdir $dev - mkdir $out - ''; - - installPhase = '' - mkdir -p $dev/include/OpenFX/ - cp -r include/* $dev/include/OpenFX/ - ''; - - meta = with lib; { - description = "Image processing plug-in standard"; - homepage = "https://openeffects.org/"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = [ maintainers.guibou ]; - }; -} diff --git a/pkgs/development/libraries/openhmd/default.nix b/pkgs/development/libraries/openhmd/default.nix deleted file mode 100644 index ce0630bee62f..000000000000 --- a/pkgs/development/libraries/openhmd/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, hidapi -, SDL2 -, libGL -, glew -, withExamples ? true -}: - -let examplesOnOff = if withExamples then "ON" else "OFF"; in - -stdenv.mkDerivation rec { - pname = "openhmd"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "OpenHMD"; - repo = "OpenHMD"; - rev = version; - sha256 = "1hkpdl4zgycag5k8njvqpx01apxmm8m8pvhlsxgxpqiqy9a38ccg"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ - hidapi - ] ++ lib.optionals withExamples [ - SDL2 - glew - libGL - ]; - - cmakeFlags = [ - "-DBUILD_BOTH_STATIC_SHARED_LIBS=ON" - "-DOPENHMD_EXAMPLE_SIMPLE=${examplesOnOff}" - "-DOPENHMD_EXAMPLE_SDL=${examplesOnOff}" - "-DOpenGL_GL_PREFERENCE=GLVND" - - # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ]; - - postInstall = lib.optionalString withExamples '' - mkdir -p $out/bin - install -D examples/simple/simple $out/bin/openhmd-example-simple - install -D examples/opengl/openglexample $out/bin/openhmd-example-opengl - ''; - - meta = with lib; { - homepage = "http://www.openhmd.net"; # https does not work - description = "Library API and drivers immersive technology"; - longDescription = '' - OpenHMD is a very simple FLOSS C library and a set of drivers - for interfacing with Virtual Reality (VR) Headsets aka - Head-mounted Displays (HMDs), controllers and trackers like - Oculus Rift, HTC Vive, Windows Mixed Reality, and etc. - ''; - license = licenses.boost; - maintainers = with maintainers; [ oxij ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/openimagedenoise/cuda.patch b/pkgs/development/libraries/openimagedenoise/cuda.patch deleted file mode 100644 index 4bc5172d8830..000000000000 --- a/pkgs/development/libraries/openimagedenoise/cuda.patch +++ /dev/null @@ -1,32 +0,0 @@ -Remove upstream workarounds for CMake "limitations" that do not appear to exist -in nixpkgs build environment, but rather break the build, presumably because -CMAKE_INSTALL_{BIN,LIB}DIR is an absolute path in our build so -CMAKE_INSTALL_PREFIX has no effect. - -diff --git a/devices/CMakeLists.txt b/devices/CMakeLists.txt -index d5111cd..43986ad 100644 ---- a/devices/CMakeLists.txt -+++ b/devices/CMakeLists.txt -@@ -53,7 +53,6 @@ if(OIDN_DEVICE_CUDA) - -DCMAKE_CXX_COMPILER:FILEPATH=${_host_compiler} - -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE} - -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -- -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/cuda/preinstall - -DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR} - -DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR} - -DCUDAToolkit_ROOT:PATH=${CUDAToolkit_ROOT} -@@ -69,14 +68,6 @@ if(OIDN_DEVICE_CUDA) - DEPENDS - OpenImageDenoise_core - ) -- -- # Due to limitations of CMake, the module is pre-installed at build time to a temporary location, -- # and then copied to the real install location at install time. -- install(DIRECTORY -- ${CMAKE_CURRENT_BINARY_DIR}/cuda/preinstall/ -- DESTINATION "." -- USE_SOURCE_PERMISSIONS -- ) - endif() - - if(OIDN_DEVICE_HIP) diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/development/libraries/openimagedenoise/default.nix deleted file mode 100644 index ad68505ad609..000000000000 --- a/pkgs/development/libraries/openimagedenoise/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - cmake, - config, - cudaPackages, - cudaSupport ? config.cudaSupport, - darwin, - fetchzip, - ispc, - lib, - python3, - stdenv, - tbb, - xcodebuild, -}: - -let - stdenv' = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; -in -stdenv'.mkDerivation (finalAttrs: { - pname = "openimagedenoise"; - version = "2.2.2"; - - # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs - src = fetchzip { - url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${finalAttrs.version}/oidn-${finalAttrs.version}.src.tar.gz"; - sha256 = "sha256-ZIrs4oEb+PzdMh2x2BUFXKyu/HBlFb3CJX24ciEHy3Q="; - }; - - patches = lib.optional cudaSupport ./cuda.patch; - - postPatch = - '' - substituteInPlace devices/metal/CMakeLists.txt \ - --replace-fail "AppleClang" "Clang" - ''; - - nativeBuildInputs = [ - cmake - python3 - ispc - ] ++ lib.optional cudaSupport cudaPackages.cuda_nvcc - ++ lib.optionals stdenv.isDarwin [ xcodebuild ]; - - buildInputs = - [ tbb ] - ++ lib.optionals stdenv.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - Accelerate - MetalKit - MetalPerformanceShadersGraph - ] - ) - ++ lib.optionals cudaSupport [ - cudaPackages.cuda_cudart - cudaPackages.cuda_cccl - ]; - - cmakeFlags = [ - (lib.cmakeBool "OIDN_DEVICE_CUDA" cudaSupport) - (lib.cmakeFeature "TBB_INCLUDE_DIR" "${tbb.dev}/include") - (lib.cmakeFeature "TBB_ROOT" "${tbb}") - ]; - - meta = with lib; { - homepage = "https://openimagedenoise.github.io"; - description = "High-Performance Denoising Library for Ray Tracing"; - license = licenses.asl20; - maintainers = [ maintainers.leshainc ]; - platforms = platforms.unix; - changelog = "https://github.com/OpenImageDenoise/oidn/blob/v${version}/CHANGELOG.md"; - }; -}) diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix index 51c1f255c326..4decdf16d38b 100644 --- a/pkgs/development/libraries/openimageio/default.nix +++ b/pkgs/development/libraries/openimageio/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.5.15.0"; + version = "2.5.16.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenImageIO"; rev = "v${version}"; - hash = "sha256-jtX6IDR/yFn10hf+FxM0s4St9XYxhQ1UlMAsNzOxuio="; + hash = "sha256-hUCwlzQW5mJH5HYPbLWOcupc36nxM12CV0sakZhiGzo="; }; # Workaround broken zlib version detecion in CMake < 3.37. diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix deleted file mode 100644 index 25b43b3600e9..000000000000 --- a/pkgs/development/libraries/openjpeg/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, libpng, libtiff, zlib, lcms2, jpylyzer -, jpipLibSupport ? false # JPIP library & executables -, jpipServerSupport ? false, curl, fcgi # JPIP Server -, jdk -, poppler -}: - -let - mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}"; -in - -stdenv.mkDerivation rec { - pname = "openjpeg"; - version = "2.5.2"; - - src = fetchFromGitHub { - owner = "uclouvain"; - repo = "openjpeg"; - rev = "v${version}"; - hash = "sha256-mQ9B3MJY2/bg0yY/7jUJrAXM6ozAHT5fmwES5Q1SGxw="; - }; - - outputs = [ "out" "dev" ]; - - cmakeFlags = [ - "-DCMAKE_INSTALL_NAME_DIR=\${CMAKE_INSTALL_PREFIX}/lib" - "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_CODEC=ON" - "-DBUILD_THIRDPARTY=OFF" - (mkFlag jpipLibSupport "BUILD_JPIP") - (mkFlag jpipServerSupport "BUILD_JPIP_SERVER") - "-DBUILD_VIEWER=OFF" - "-DBUILD_JAVA=OFF" - (mkFlag doCheck "BUILD_TESTING") - ]; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ libpng libtiff zlib lcms2 ] - ++ lib.optionals jpipServerSupport [ curl fcgi ] - ++ lib.optional (jpipLibSupport) jdk; - - doCheck = (!stdenv.isAarch64 && !stdenv.hostPlatform.isPower64); # tests fail on aarch64-linux and powerpc64 - nativeCheckInputs = [ jpylyzer ]; - checkPhase = '' - substituteInPlace ../tools/ctest_scripts/travis-ci.cmake \ - --replace "JPYLYZER_EXECUTABLE=" "JPYLYZER_EXECUTABLE=\"$(command -v jpylyzer)\" # " - OPJ_SOURCE_DIR=.. ctest -S ../tools/ctest_scripts/travis-ci.cmake - ''; - - passthru = { - incDir = "openjpeg-${lib.versions.majorMinor version}"; - tests = { - inherit poppler; - }; - }; - - meta = with lib; { - description = "Open-source JPEG 2000 codec written in C language"; - homepage = "https://www.openjpeg.org/"; - license = licenses.bsd2; - maintainers = with maintainers; [ codyopel ]; - platforms = platforms.all; - changelog = "https://github.com/uclouvain/openjpeg/blob/v${version}/CHANGELOG.md"; - }; -} diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix deleted file mode 100644 index e25f0a8c172d..000000000000 --- a/pkgs/development/libraries/openldap/default.nix +++ /dev/null @@ -1,141 +0,0 @@ -{ lib -, stdenv -, fetchurl - -# dependencies -, cyrus_sasl -, groff -, libsodium -, libtool -, openssl -, systemdMinimal -, libxcrypt - -# passthru -, nixosTests -}: - -stdenv.mkDerivation rec { - pname = "openldap"; - version = "2.6.8"; - - src = fetchurl { - url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz"; - hash = "sha256-SJaTI+lOO+OwPGoTKULcun741UXyrTVAFwkBn2lsPE4="; - }; - - # TODO: separate "out" and "bin" - outputs = [ - "out" - "dev" - "man" - "devdoc" - ]; - - __darwinAllowLocalNetworking = true; - - enableParallelBuilding = true; - - nativeBuildInputs = [ - groff - ]; - - buildInputs = [ - (cyrus_sasl.override { - inherit openssl; - }) - libsodium - libtool - openssl - ] ++ lib.optionals (stdenv.isLinux) [ - libxcrypt # causes linking issues on *-darwin - systemdMinimal - ]; - - preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' - MACOSX_DEPLOYMENT_TARGET=10.16 - ''; - - configureFlags = [ - "--enable-argon2" - "--enable-crypt" - "--enable-modules" - "--enable-overlays" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--with-yielding_select=yes" - "ac_cv_func_memcmp_working=yes" - ] ++ lib.optional stdenv.isFreeBSD "--with-pic"; - - env.NIX_CFLAGS_COMPILE = toString [ "-DLDAPI_SOCK=\"/run/openldap/ldapi\"" ]; - - makeFlags= [ - "CC=${stdenv.cc.targetPrefix}cc" - "STRIP=" # Disable install stripping as it breaks cross-compiling. We strip binaries anyway in fixupPhase. - "STRIP_OPTS=" - "prefix=${placeholder "out"}" - "sysconfdir=/etc" - "systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" - # contrib modules require these - "moduledir=${placeholder "out"}/lib/modules" - "mandir=${placeholder "out"}/share/man" - ]; - - extraContribModules = [ - # https://git.openldap.org/openldap/openldap/-/tree/master/contrib/slapd-modules - "passwd/sha2" - "passwd/pbkdf2" - "passwd/totp" - ]; - - postBuild = '' - for module in $extraContribModules; do - make $makeFlags CC=$CC -C contrib/slapd-modules/$module - done - ''; - - preCheck = '' - substituteInPlace tests/scripts/all \ - --replace "/bin/rm" "rm" - - # skip flaky tests - rm -f tests/scripts/test063-delta-multiprovider - - # https://bugs.openldap.org/show_bug.cgi?id=10009 - # can probably be re-added once https://github.com/cyrusimap/cyrus-sasl/pull/772 - # has made it to a release - rm -f tests/scripts/test076-authid-rewrite - ''; - - doCheck = true; - - # The directory is empty and serve no purpose. - preFixup = '' - rm -r $out/var - ''; - - installFlags = [ - "prefix=${placeholder "out"}" - "sysconfdir=${placeholder "out"}/etc" - "moduledir=${placeholder "out"}/lib/modules" - "INSTALL=install" - ]; - - postInstall = '' - for module in $extraContribModules; do - make $installFlags install -C contrib/slapd-modules/$module - done - chmod +x "$out"/lib/*.{so,dylib} - ''; - - passthru.tests = { - inherit (nixosTests) openldap; - }; - - meta = with lib; { - homepage = "https://www.openldap.org/"; - description = "Open source implementation of the Lightweight Directory Access Protocol"; - license = licenses.openldap; - maintainers = with maintainers; [ hexa ] ++ teams.helsinki-systems.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix deleted file mode 100644 index 0ae1118a36b0..000000000000 --- a/pkgs/development/libraries/openmpi/default.nix +++ /dev/null @@ -1,280 +0,0 @@ -{ - 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 (finalAttrs: { - pname = "openmpi"; - version = "5.0.5"; - - src = fetchurl { - url = "https://www.open-mpi.org/software/ompi/v${lib.versions.majorMinor finalAttrs.version}/downloads/openmpi-${finalAttrs.version}.tar.bz2"; - sha256 = "sha256-ZYjVfApL0pmiQQP04ZYFGynotV+9pJ4R1bPTIDCjJ3Y="; - }; - - postPatch = '' - patchShebangs ./ - - # 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") - ]} - ''; - - # 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 - libevent - hwloc - ] - ++ lib.optionals stdenv.isLinux [ - libnl - numactl - pmix - ucx - ucc - prrte - ] - ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] - ++ 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 - ] - ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ] - ++ lib.optionals fortranSupport [ gfortran ]; - - configureFlags = [ - (lib.enableFeature cudaSupport "mca-dso") - (lib.enableFeature fortranSupport "mpi-fortran") - (lib.withFeatureAs stdenv.isLinux "libnl" (lib.getDev libnl)) - "--with-pmix=${lib.getDev pmix}" - "--with-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.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 = - 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 or gfortran}/bin/${ - targetPackages.gfortran.targetPrefix or 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 \{} \; - - # 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 }: - # From some reason the Darwin build doesn't include some of these - # wrapperDataSubstitutions strings and even some of the files. Hence - # we currently don't perform these substitutions on other platforms, - # until a Darwin user will care enough about this cross platform - # related substitution. - lib.optionalString stdenv.isLinux '' - 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}" - - # Handle informative binaries about the compilation - for i in {prte,ompi,oshmem}_info; do - moveToOutput "bin/$i" "''${!outputDev}" - done - ''; - - postFixup = - lib.optionalString (lib.elem "man" finalAttrs.outputs) '' - remove-references-to -t "''${!outputMan}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.library}) - '' - + 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.library}) - - # 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 = { - 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 lib.maintainers; [ - markuskowa - doronbehar - ]; - license = lib.licenses.bsd3; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/development/libraries/openpa/default.nix deleted file mode 100644 index 23f025e2aa63..000000000000 --- a/pkgs/development/libraries/openpa/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, file }: - -stdenv.mkDerivation rec { - pname = "openpa"; - version = "1.0.4"; - - src = fetchurl { - url = "https://trac.mpich.org/projects/${pname}/raw-attachment/wiki/Downloads/${pname}-${version}.tar.gz"; - sha256 = "0flyi596hm6fv7xyw2iykx3s65p748s62bf15624xcnwpfrh8ncy"; - }; - - prePatch = "substituteInPlace configure --replace /usr/bin/file ${file}/bin/file"; - - doCheck = true; - - meta = { - description = "Atomic primitives for high performance, concurrent software"; - homepage = "https://trac.mpich.org/projects/openpa"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ leenaars ]; - platforms = lib.platforms.unix; - longDescription = '' - OPA (or sometimes OpenPA or Open Portable Atomics) is an - open source library intended to provide a consistent C API for performing - atomic operations on a variety of platforms. The main goal of the project is to - enable the portable usage of atomic operations in concurrent software. - Developers of client software can worry about implementing and improving their - concurrent algorithms instead of fiddling with inline assembly syntax and - learning new assembly dialects in order improve or maintain application - portability. - ''; - }; -} diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix deleted file mode 100644 index 5e7de98efc46..000000000000 --- a/pkgs/development/libraries/opensaml-cpp/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkg-config -, darwin, boost, openssl, log4shib, xercesc, xml-security-c, xml-tooling-c, zlib -}: - -stdenv.mkDerivation rec { - pname = "opensaml-cpp"; - version = "3.0.1"; - - src = fetchgit { - url = "https://git.shibboleth.net/git/cpp-opensaml.git"; - rev = version; - sha256 = "0ms3sqmwqkrqb92d7jy2hqwnz5yd7cbrz73n321jik0jilrwl5w8"; - }; - - buildInputs = [ - boost openssl log4shib xercesc xml-security-c xml-tooling-c zlib - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - CoreServices - SystemConfiguration - ]); - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ]; - - env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.isDarwin) "-std=c++14"; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://shibboleth.net/products/opensaml-cpp.html"; - description = "Low-level library written in C++ that provides support for producing and consuming SAML messages"; - mainProgram = "samlsign"; - platforms = platforms.unix; - license = licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 3566e458598c..1b0f4b229d36 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake doxygen ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libX11 libXinerama libXrandr libGLU libGL ] ++ [ glib libxml2 pcre zlib @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { ++ lib.optional sdlSupport SDL2 ++ lib.optional restSupport asio ++ lib.optionals withExamples [ fltk ] - ++ lib.optionals (!stdenv.isDarwin) [ ] - ++ lib.optionals stdenv.isDarwin [ AGL Accelerate Carbon Cocoa Foundation ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AGL Accelerate Carbon Cocoa Foundation ] ++ lib.optional (restSupport || colladaSupport) boost ; diff --git a/pkgs/development/libraries/openslide/default.nix b/pkgs/development/libraries/openslide/default.nix deleted file mode 100644 index cc0b5ed98c61..000000000000 --- a/pkgs/development/libraries/openslide/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook -, pkg-config, cairo, glib, gdk-pixbuf, libjpeg -, libpng, libtiff, libxml2, openjpeg, sqlite, zlib -}: - -stdenv.mkDerivation rec { - pname = "openslide"; - version = "3.4.1"; - - src = fetchFromGitHub { - owner = "openslide"; - repo = "openslide"; - rev = "v${version}"; - sha256 = "1g4hhjr4cbx754cwi9wl84k33bkg232w8ajic7aqhzm8x182hszp"; - }; - - buildInputs = [ cairo glib gdk-pixbuf libjpeg libpng libtiff libxml2 openjpeg sqlite zlib ]; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - meta = with lib; { - homepage = "https://openslide.org"; - description = "C library that provides a simple interface to read whole-slide images"; - license = licenses.lgpl21; - platforms = platforms.unix; - maintainers = with maintainers; [ lromor ]; - }; -} diff --git a/pkgs/development/libraries/openslp/CVE-2016-4912.patch b/pkgs/development/libraries/openslp/CVE-2016-4912.patch deleted file mode 100644 index 06223deda89b..000000000000 --- a/pkgs/development/libraries/openslp/CVE-2016-4912.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/common/slp_xmalloc.c -+++ b/common/slp_xmalloc.c -@@ -206,7 +206,7 @@ void * _xrealloc(const char * file, int line, void * ptr, size_t size) - if (newptr == 0) - return 0; - memcpy(newptr, ptr, x->size); -- _xfree(file, line, x); -+ _xfree(file, line, ptr); - } - return newptr; - } diff --git a/pkgs/development/libraries/openslp/CVE-2019-5544.patch b/pkgs/development/libraries/openslp/CVE-2019-5544.patch deleted file mode 100644 index 2afc0aed3302..000000000000 --- a/pkgs/development/libraries/openslp/CVE-2019-5544.patch +++ /dev/null @@ -1,165 +0,0 @@ -diff -ur openslp-2.0.0.orig/common/slp_buffer.c openslp-2.0.0/common/slp_buffer.c ---- openslp-2.0.0.orig/common/slp_buffer.c 2012-12-10 15:31:53.000000000 -0800 -+++ openslp-2.0.0/common/slp_buffer.c 2019-11-26 21:54:20.000000000 -0800 -@@ -30,6 +30,13 @@ - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - *-------------------------------------------------------------------------*/ - -+/* Copyright (c) 2019 VMware, Inc. -+ * SPDX-License-Identifier: BSD-3-Clause -+ * This file is provided under the BSD-3-Clause license. -+ * See COPYING file for more details and other copyrights -+ * that may apply. -+ */ -+ - /** Functions for managing SLP message buffers. - * - * This file provides a higher level abstraction over malloc and free that -@@ -153,4 +160,20 @@ - xfree(buf); - } - -+/** Report remaining free buffer size in bytes. -+ * -+ * Check if buffer is allocated and if so return bytes left in a -+ * @c SLPBuffer object. -+ * -+ * @param[in] buf The SLPBuffer to be freed. -+ */ -+size_t -+RemainingBufferSpace(SLPBuffer buf) -+{ -+ if (buf->allocated == 0) { -+ return 0; -+ } -+ return buf->end - buf->curpos; -+} -+ - /*=========================================================================*/ -diff -ur openslp-2.0.0.orig/common/slp_buffer.h openslp-2.0.0/common/slp_buffer.h ---- openslp-2.0.0.orig/common/slp_buffer.h 2012-11-28 09:07:04.000000000 -0800 -+++ openslp-2.0.0/common/slp_buffer.h 2019-11-26 21:54:32.000000000 -0800 -@@ -30,6 +30,13 @@ - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - *-------------------------------------------------------------------------*/ - -+/* Copyright (c) 2019 VMware, Inc. -+ * SPDX-License-Identifier: BSD-3-Clause -+ * This file is provided under the BSD-3-Clause license. -+ * See COPYING file for more details and other copyrights -+ * that may apply. -+ */ -+ - /** Header file that defines SLP message buffer management routines. - * - * Includes structures, constants and functions that used to handle memory -@@ -78,6 +85,8 @@ - - SLPBuffer SLPBufferListAdd(SLPBuffer * list, SLPBuffer buf); - -+size_t RemainingBufferSpace(SLPBuffer buf); -+ - /*! @} */ - - #endif /* SLP_BUFFER_H_INCLUDED */ -diff -ur openslp-2.0.0.orig/slpd/slpd_process.c openslp-2.0.0/slpd/slpd_process.c ---- openslp-2.0.0.orig/slpd/slpd_process.c 2012-12-12 09:38:54.000000000 -0800 -+++ openslp-2.0.0/slpd/slpd_process.c 2019-11-26 21:55:10.000000000 -0800 -@@ -30,6 +30,13 @@ - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - *-------------------------------------------------------------------------*/ - -+/* Copyright (c) 2019 VMware, Inc. -+ * SPDX-License-Identifier: BSD-3-Clause -+ * This file is provided under the BSD-3-Clause license. -+ * See COPYING file for more details and other copyrights -+ * that may apply. -+ */ -+ - /** Processes incoming SLP messages. - * - * @file slpd_process.c -@@ -514,13 +521,27 @@ - { - for (i = 0; i < db->urlcount; i++) - { -- /* urlentry is the url from the db result */ - urlentry = db->urlarray[i]; -+ if (urlentry->opaque != NULL) { -+ const int64_t newsize = size + urlentry->opaquelen; -+ if (urlentry->opaquelen <= 0 || newsize > INT_MAX) -+ { -+ SLPDLog("Invalid opaquelen %d or sizeo of opaque url is too big, size=%d\n", -+ urlentry->opaquelen, size); -+ errorcode = SLP_ERROR_PARSE_ERROR; -+ goto FINISHED; -+ } -+ size += urlentry->opaquelen; -+ } -+ else -+ { -+ /* urlentry is the url from the db result */ -+ size += urlentry->urllen + 6; /* 1 byte for reserved */ -+ /* 2 bytes for lifetime */ -+ /* 2 bytes for urllen */ -+ /* 1 byte for authcount */ -+ } - -- size += urlentry->urllen + 6; /* 1 byte for reserved */ -- /* 2 bytes for lifetime */ -- /* 2 bytes for urllen */ -- /* 1 byte for authcount */ - #ifdef ENABLE_SLPv2_SECURITY - /* make room to include the authblock that was asked for */ - if (G_SlpdProperty.securityEnabled -@@ -594,7 +615,7 @@ - urlentry = db->urlarray[i]; - - #ifdef ENABLE_SLPv1 -- if (urlentry->opaque == 0) -+ if (urlentry->opaque == NULL) - { - /* url-entry reserved */ - *result->curpos++ = 0; -@@ -606,8 +627,18 @@ - PutUINT16(&result->curpos, urlentry->urllen); - - /* url-entry url */ -- memcpy(result->curpos, urlentry->url, urlentry->urllen); -- result->curpos += urlentry->urllen; -+ if (RemainingBufferSpace(result) >= urlentry->urllen) -+ { -+ memcpy(result->curpos, urlentry->url, urlentry->urllen); -+ result->curpos = result->curpos + urlentry->urllen; -+ } -+ else -+ { -+ SLPDLog("Url too big (ask: %d have %" PRId64 "), failing request\n", -+ urlentry->opaquelen, (int64_t) RemainingBufferSpace(result)); -+ errorcode = SLP_ERROR_PARSE_ERROR; -+ goto FINISHED; -+ } - - /* url-entry auths */ - *result->curpos++ = 0; -@@ -621,8 +652,18 @@ - - /* TRICKY: Fix up the lifetime. */ - TO_UINT16(urlentry->opaque + 1, urlentry->lifetime); -- memcpy(result->curpos, urlentry->opaque, urlentry->opaquelen); -- result->curpos += urlentry->opaquelen; -+ if (RemainingBufferSpace(result) >= urlentry->opaquelen) -+ { -+ memcpy(result->curpos, urlentry->opaque, urlentry->opaquelen); -+ result->curpos = result->curpos + urlentry->opaquelen; -+ } -+ else -+ { -+ SLPDLog("Opaque Url too big (ask: %d have %" PRId64 "), failing request\n", -+ urlentry->opaquelen, (int64_t) RemainingBufferSpace(result)); -+ errorcode = SLP_ERROR_PARSE_ERROR; -+ goto FINISHED; -+ } - } - } - } diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix deleted file mode 100644 index e390cfd932fd..000000000000 --- a/pkgs/development/libraries/openslp/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "openslp"; - version = "2.0.0"; - - src = fetchurl { - url = "mirror://sourceforge/openslp/${version}/${version}/openslp-${version}.tar.gz"; - sha256 = "16splwmqp0400w56297fkipaq9vlbhv7hapap8z09gp5m2i3fhwj"; - }; - - patches = [ - (fetchpatch { - name = "openslp-2.0.0-null-pointer-deref.patch"; - url = "https://src.fedoraproject.org/rpms/openslp/raw/696fd55ae4fcea7beda0a25131dca8bfb14bbdf9/f/openslp-2.0.0-null-pointer-deref.patch"; - sha256 = "186f3rj3z2lf5h1lpbhqk0szj2a9far1p3mjqg6422f29yjfnz6a"; - }) - (fetchpatch { - name = "openslp-2.0.0-CVE-2016-7567.patch"; - url = "https://src.fedoraproject.org/rpms/openslp/raw/696fd55ae4fcea7beda0a25131dca8bfb14bbdf9/f/openslp-2.0.0-cve-2016-7567.patch"; - sha256 = "0zp61axx93b7nrbsyhn2x4dnw7n9y6g4rys21hyqxk4khrnc2yr9"; - }) - ./CVE-2016-4912.patch - ./CVE-2019-5544.patch - ]; - - meta = with lib; { - homepage = "http://www.openslp.org/"; - description = "Open-source implementation of the IETF Service Location Protocol"; - maintainers = with maintainers; [ ttuegel ]; - license = licenses.bsd3; - platforms = platforms.all; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; - knownVulnerabilities = [ - "CVE-2023-29552: UDP Reflection Attack with ampliciation factor of up to 2200" - ]; - }; - -} diff --git a/pkgs/development/libraries/openssl/3.3/CVE-2024-5535.patch b/pkgs/development/libraries/openssl/3.3/CVE-2024-5535.patch deleted file mode 100644 index 2d0f822b25ee..000000000000 --- a/pkgs/development/libraries/openssl/3.3/CVE-2024-5535.patch +++ /dev/null @@ -1,108 +0,0 @@ -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/3.2/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/3.3/use-etc-ssl-certs-darwin.patch index e8b07b4ae599..e8b07b4ae599 100644 --- a/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs-darwin.patch +++ b/pkgs/development/libraries/openssl/3.3/use-etc-ssl-certs-darwin.patch diff --git a/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/3.3/use-etc-ssl-certs.patch index 13a36fbcd031..13a36fbcd031 100644 --- a/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs.patch +++ b/pkgs/development/libraries/openssl/3.3/use-etc-ssl-certs.patch diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 7c0788a673f6..3dee6474adee 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, buildPackages, perl, coreutils, writeShellScript -, makeWrapper +, makeBinaryWrapper , withCryptodev ? false, cryptodev , withZlib ? false, zlib , enableSSL2 ? false , enableSSL3 ? false , enableMD2 ? false -, enableKTLS ? stdenv.isLinux +, enableKTLS ? stdenv.hostPlatform.isLinux , static ? stdenv.hostPlatform.isStatic # path to openssl.cnf file. will be placed in $etc/etc/ssl/openssl.cnf to replace the default , conf ? null @@ -25,7 +25,13 @@ let inherit version; src = fetchurl { - url = "https://www.openssl.org/source/openssl-${version}.tar.gz"; + url = if lib.versionOlder version "3.0" then + let + versionFixed = builtins.replaceStrings ["."] ["_"] version; + in + "https://github.com/openssl/openssl/releases/download/OpenSSL_${versionFixed}/openssl-${version}.tar.gz" + else + "https://github.com/openssl/openssl/releases/download/openssl-${version}/openssl-${version}.tar.gz"; inherit hash; }; @@ -71,7 +77,7 @@ let stdenv.cc.isGNU; nativeBuildInputs = - lib.optional (!stdenv.hostPlatform.isWindows) makeWrapper + lib.optional (!stdenv.hostPlatform.isWindows) makeBinaryWrapper ++ [ perl ] ++ lib.optionals static [ removeReferencesTo ]; buildInputs = lib.optional withCryptodev cryptodev @@ -216,8 +222,8 @@ let rm -r $etc/etc/ssl/misc rmdir $etc/etc/ssl/{certs,private} - - ${lib.optionalString (conf != null) "cat ${conf} > $etc/etc/ssl/openssl.cnf"} + '' + lib.optionalString (conf != null) '' + cat ${conf} > $etc/etc/ssl/openssl.cnf ''; postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) '' @@ -227,6 +233,10 @@ let echo "Found an erroneous dependency on perl ^^^" >&2 exit 1 fi + '' + lib.optionalString (lib.versionAtLeast version "3.3.0") '' + # cleanup cmake helpers for now (for OpenSSL >= 3.3), only rely on pkg-config. + # pkg-config gets its paths fixed correctly + rm -rf $dev/lib/cmake ''; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -280,8 +290,8 @@ in { }; openssl_3 = common { - version = "3.0.14"; - hash = "sha256-7soDXU3U6E/CWEbZUtpil0hK+gZQpvhMaC453zpBI8o="; + version = "3.0.15"; + hash = "sha256-I8Zm0O3yDxQkmz2PA2isrumrWFsJ4d6CEHxm4fPslTM="; patches = [ ./3.0/nix-ssl-cert-file.patch @@ -290,8 +300,6 @@ 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) @@ -304,34 +312,9 @@ in { }; }; - openssl_3_2 = common { - version = "3.2.2"; - hash = "sha256-GXFJwY2enyksQ/BACsq6EuX1LKz+BQ89GZJ36nOOwuc="; - - patches = [ - ./3.0/nix-ssl-cert-file.patch - - # openssl will only compile in KTLS if the current kernel supports it. - # 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) - ]; - - withDocs = true; - - extraMeta = { - license = lib.licenses.asl20; - }; - }; - openssl_3_3 = common { - version = "3.3.1"; - hash = "sha256-d3zVlihMiDN1oqehG/XSeG/FQTJV76sgxQ1v/m0CC34="; + version = "3.3.2"; + hash = "sha256-LopAsBl5r+i+C7+z3l3BxnCf7bRtbInBDaEUq1/D0oE="; patches = [ ./3.0/nix-ssl-cert-file.patch @@ -340,11 +323,9 @@ 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) + then ./3.3/use-etc-ssl-certs-darwin.patch + else ./3.3/use-etc-ssl-certs.patch) ]; withDocs = true; diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix deleted file mode 100644 index b5c2847fb9ba..000000000000 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ config, lib, stdenv, fetchFromGitHub, cmake, pkg-config, xorg, libGLU -, libGL, glew, ocl-icd, python3 -, cudaSupport ? config.cudaSupport -, cudaPackages -, openclSupport ? !cudaSupport -, darwin -}: - -stdenv.mkDerivation rec { - pname = "opensubdiv"; - version = "3.6.0"; - - src = fetchFromGitHub { - owner = "PixarAnimationStudios"; - repo = "OpenSubdiv"; - rev = "v${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-liy6pQyWMk7rw0usrCoLGzZLO7RAg0z2pV/GF2NnOkE="; - }; - - outputs = [ "out" "dev" "static" ]; - - nativeBuildInputs = [ - cmake - pkg-config - ] ++ lib.optional cudaSupport [ - cudaPackages.cuda_nvcc - ]; - buildInputs = - [ libGLU libGL python3 - # FIXME: these are not actually needed, but the configure script wants them. - glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor - xorg.libXinerama xorg.libXi - ] - ++ lib.optionals (openclSupport && !stdenv.isDarwin) [ ocl-icd ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - OpenCL - Cocoa - CoreVideo - IOKit - AppKit - AGL - MetalKit - ]) - ++ lib.optionals cudaSupport [ - cudaPackages.cuda_cudart - ]; - - # It's important to set OSD_CUDA_NVCC_FLAGS, - # because otherwise OSD might piggyback unwanted architectures: - # https://github.com/PixarAnimationStudios/OpenSubdiv/blob/7d0ab5530feef693ac0a920585b5c663b80773b3/CMakeLists.txt#L602 - preConfigure = lib.optionalString cudaSupport '' - cmakeFlagsArray+=( - -DOSD_CUDA_NVCC_FLAGS="${lib.concatStringsSep " " cudaPackages.cudaFlags.gencode}" - ) - ''; - - cmakeFlags = - [ "-DNO_TUTORIALS=1" - "-DNO_REGRESSION=1" - "-DNO_EXAMPLES=1" - (lib.cmakeBool "NO_METAL" (!stdenv.isDarwin)) - (lib.cmakeBool "NO_OPENCL" (!openclSupport)) - (lib.cmakeBool "NO_CUDA" (!cudaSupport)) - ] ++ lib.optionals (!stdenv.isDarwin) [ - "-DGLEW_INCLUDE_DIR=${glew.dev}/include" - "-DGLEW_LIBRARY=${glew.dev}/lib" - ] ++ lib.optionals cudaSupport [ - ] ++ lib.optionals (!openclSupport) [ - ]; - - preBuild = let maxBuildCores = 16; in lib.optionalString cudaSupport '' - # https://github.com/PixarAnimationStudios/OpenSubdiv/issues/1313 - NIX_BUILD_CORES=$(( NIX_BUILD_CORES < ${toString maxBuildCores} ? NIX_BUILD_CORES : ${toString maxBuildCores} )) - ''; - - postInstall = '' - moveToOutput "lib/*.a" $static - ''; - - meta = { - description = "Open-Source subdivision surface library"; - homepage = "http://graphics.pixar.com/opensubdiv"; - broken = openclSupport && cudaSupport; - platforms = lib.platforms.unix; - maintainers = [ ]; - license = lib.licenses.asl20; - }; -} diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix deleted file mode 100644 index a85aa6d14e46..000000000000 --- a/pkgs/development/libraries/opentracing-cpp/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { - pname = "opentracing-cpp"; - version = "1.6.0"; - src = fetchFromGitHub { - owner = "opentracing"; - repo = "opentracing-cpp"; - rev = "v${version}"; - sha256 = "09wdwbz8gbjgyqi764cyb6aw72wng6hwk44xpl432gl7whrrysvi"; - }; - - nativeBuildInputs = [ cmake ]; - - meta = { - description = "C++ implementation of the OpenTracing API"; - homepage = "https://opentracing.io"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ rob ]; - }; - -} diff --git a/pkgs/development/libraries/openvdb/11.nix b/pkgs/development/libraries/openvdb/11.nix new file mode 100644 index 000000000000..a65bb286ae2e --- /dev/null +++ b/pkgs/development/libraries/openvdb/11.nix @@ -0,0 +1,19 @@ +{ + lib, + fetchFromGitHub, + openvdb, +}: + +openvdb.overrideAttrs (old: rec { + name = "${old.pname}-${version}"; + version = "11.0.0"; + src = fetchFromGitHub { + owner = "AcademySoftwareFoundation"; + repo = "openvdb"; + rev = "v${version}"; + sha256 = "sha256-wDDjX0nKZ4/DIbEX33PoxR43dJDj2NF3fm+Egug62GQ="; + }; + meta = old.meta // { + license = lib.licenses.mpl20; + }; +}) diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index 2b1fca97f06e..d7718eb1eee4 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "openvdb"; - version = "11.0.0"; + version = "12.0.0"; outputs = [ "out" "dev" ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec owner = "AcademySoftwareFoundation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "sha256-wDDjX0nKZ4/DIbEX33PoxR43dJDj2NF3fm+Egug62GQ="; + sha256 = "sha256-S2uvzDCrTxAmvUMJr5PChcYTqhIHvRZbOfQLtUvzypI="; }; nativeBuildInputs = [ cmake ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec cmakeFlags = [ "-DOPENVDB_CORE_STATIC=OFF" "-DOPENVDB_BUILD_NANOVDB=ON"]; # error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer - env = lib.optionalAttrs (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13" && lib.versionAtLeast tbb.version "2021.8.0") { + env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13" && lib.versionAtLeast tbb.version "2021.8.0") { NIX_CFLAGS_COMPILE = "-faligned-allocation"; }; @@ -37,6 +37,6 @@ stdenv.mkDerivation rec homepage = "https://www.openvdb.org"; maintainers = [ maintainers.guibou ]; platforms = platforms.unix; - license = licenses.mpl20; + license = licenses.asl20; }; } diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix deleted file mode 100644 index a1f30277151b..000000000000 --- a/pkgs/development/libraries/openvino/default.nix +++ /dev/null @@ -1,183 +0,0 @@ -{ lib -, gcc12Stdenv -, fetchFromGitHub -, fetchurl -, cudaSupport ? opencv.cudaSupport or false - -# build -, scons -, addDriverRunpath -, autoPatchelfHook -, cmake -, git -, libarchive -, patchelf -, pkg-config -, python3Packages -, shellcheck - -# runtime -, flatbuffers -, level-zero -, libusb1 -, libxml2 -, ocl-icd -, opencv -, protobuf -, pugixml -, snappy -, tbb_2021_5 -, cudaPackages -}: - -let - inherit (lib) - cmakeBool - ; - - stdenv = gcc12Stdenv; - - # prevent scons from leaking in the default python version - scons' = scons.override { inherit python3Packages; }; - - tbbbind_version = "2_5"; - tbbbind = fetchurl { - url = "https://storage.openvinotoolkit.org/dependencies/thirdparty/linux/tbbbind_${tbbbind_version}_static_lin_v4.tgz"; - hash = "sha256-Tr8wJGUweV8Gb7lhbmcHxrF756ZdKdNRi1eKdp3VTuo="; - }; - - python = python3Packages.python.withPackages (ps: with ps; [ - cython - pybind11 - setuptools - sphinx - wheel - ]); - -in - -stdenv.mkDerivation rec { - pname = "openvino"; - version = "2024.2.0"; - - src = fetchFromGitHub { - owner = "openvinotoolkit"; - repo = "openvino"; - rev = "refs/tags/${version}"; - fetchSubmodules = true; - hash = "sha256-HiKKvmqgbwW625An+Su0EOHqVrP18yvG2aOzrS0jWr4="; - }; - - outputs = [ - "out" - "python" - ]; - - nativeBuildInputs = [ - addDriverRunpath - autoPatchelfHook - cmake - git - libarchive - patchelf - pkg-config - python - scons' - shellcheck - ] ++ lib.optionals cudaSupport [ - cudaPackages.cuda_nvcc - ]; - - postPatch = '' - mkdir -p temp/tbbbind_${tbbbind_version} - pushd temp/tbbbind_${tbbbind_version} - bsdtar -xf ${tbbbind} - echo "${tbbbind.url}" > ie_dependency.info - popd - ''; - - dontUseSconsCheck = true; - dontUseSconsBuild = true; - dontUseSconsInstall = true; - - cmakeFlags = [ - "-Wno-dev" - "-DCMAKE_MODULE_PATH:PATH=${placeholder "out"}/lib/cmake" - "-DCMAKE_PREFIX_PATH:PATH=${placeholder "out"}" - "-DOpenCV_DIR=${opencv}/lib/cmake/opencv4/" - "-DProtobuf_LIBRARIES=${protobuf}/lib/libprotobuf${stdenv.hostPlatform.extensions.sharedLibrary}" - "-DPython_EXECUTABLE=${python.interpreter}" - - (cmakeBool "CMAKE_VERBOSE_MAKEFILE" true) - (cmakeBool "NCC_SYLE" false) - (cmakeBool "BUILD_TESTING" false) - (cmakeBool "ENABLE_CPPLINT" false) - (cmakeBool "ENABLE_TESTING" false) - (cmakeBool "ENABLE_SAMPLES" false) - - # features - (cmakeBool "ENABLE_INTEL_CPU" stdenv.isx86_64) - (cmakeBool "ENABLE_JS" false) - (cmakeBool "ENABLE_LTO" true) - (cmakeBool "ENABLE_ONEDNN_FOR_GPU" false) - (cmakeBool "ENABLE_OPENCV" true) - (cmakeBool "ENABLE_PYTHON" true) - - # system libs - (cmakeBool "ENABLE_SYSTEM_FLATBUFFERS" true) - (cmakeBool "ENABLE_SYSTEM_OPENCL" true) - (cmakeBool "ENABLE_SYSTEM_PROTOBUF" false) - (cmakeBool "ENABLE_SYSTEM_PUGIXML" true) - (cmakeBool "ENABLE_SYSTEM_SNAPPY" true) - (cmakeBool "ENABLE_SYSTEM_TBB" true) - ]; - - autoPatchelfIgnoreMissingDeps = [ - "libngraph_backend.so" - ]; - - buildInputs = [ - flatbuffers - level-zero - libusb1 - libxml2 - ocl-icd - opencv.cxxdev - pugixml - snappy - tbb_2021_5 - ] ++ lib.optionals cudaSupport [ - cudaPackages.cuda_cudart - ]; - - enableParallelBuilding = true; - - postInstall = '' - mkdir -p $python - mv $out/python/* $python/ - rmdir $out/python - ''; - - postFixup = '' - # Link to OpenCL - find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do - addDriverRunpath "$lib" - done - ''; - - meta = with lib; { - description = "OpenVINO™ Toolkit repository"; - longDescription = '' - This toolkit allows developers to deploy pre-trained deep learning models through a high-level C++ Inference Engine API integrated with application logic. - - This open source version includes several components: namely Model Optimizer, nGraph and Inference Engine, as well as CPU, GPU, MYRIAD, - multi device and heterogeneous plugins to accelerate deep learning inferencing on Intel® CPUs and Intel® Processor Graphics. - It supports pre-trained models from the Open Model Zoo, along with 100+ open source and public models in popular formats such as Caffe*, TensorFlow*, MXNet* and ONNX*. - ''; - homepage = "https://docs.openvinotoolkit.org/"; - license = with licenses; [ asl20 ]; - platforms = platforms.all; - broken = stdenv.isDarwin; # Cannot find macos sdk - maintainers = with maintainers; [ tfmoraes ]; - }; -} diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix deleted file mode 100644 index a12abd5db557..000000000000 --- a/pkgs/development/libraries/openwsman/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, curl, libxml2, pam, sblim-sfcc }: - -stdenv.mkDerivation rec { - pname = "openwsman"; - version = "2.7.2"; - - src = fetchFromGitHub { - owner = "Openwsman"; - repo = "openwsman"; - rev = "v${version}"; - sha256 = "sha256-CH2pqWs64Dznim3IljmsthKEQfACVlaAKQ/07MgryHo="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ curl libxml2 pam sblim-sfcc ]; - - cmakeFlags = [ - "-DCMAKE_BUILD_RUBY_GEM=no" - "-DBUILD_PYTHON=no" - "-DBUILD_PYTHON3=yes" - ]; - - preConfigure = '' - appendToVar cmakeFlags "-DPACKAGE_ARCHITECTURE=$(uname -m)" - ''; - - configureFlags = [ "--disable-more-warnings" ]; - - meta = with lib; { - description = "Openwsman server implementation and client API with bindings"; - downloadPage = "https://github.com/Openwsman/openwsman/releases"; - homepage = "https://openwsman.github.io"; - license = licenses.bsd3; - maintainers = with maintainers; [ deepfire ]; - platforms = platforms.linux; # PAM is not available on Darwin - }; -} diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix deleted file mode 100644 index febbf5114e58..000000000000 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr, vulkan-headers, libGL, vulkan-loader, wayland, pkg-config }: - -stdenv.mkDerivation rec { - pname = "openxr-loader"; - version = "1.1.40"; - - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "OpenXR-SDK-Source"; - rev = "release-${version}"; - sha256 = "sha256-dKSQqiZtnxKj9arpxm9vwz8WzKBXh6y6vzZ9uHP7vX0="; - }; - - nativeBuildInputs = [ cmake python3 pkg-config ]; - buildInputs = [ libX11 libXxf86vm libXrandr vulkan-headers libGL vulkan-loader wayland ]; - - cmakeFlags = [ "-DBUILD_TESTS=ON" ]; - - outputs = [ "out" "dev" "layers" ]; - - # https://github.com/KhronosGroup/OpenXR-SDK-Source/issues/305 - postPatch = '' - substituteInPlace src/loader/openxr.pc.in \ - --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ - ''; - - postInstall = '' - mkdir -p "$layers/share" - mv "$out/share/openxr" "$layers/share" - # Use absolute paths in manifests so no LD_LIBRARY_PATH shenanigans are necessary - for file in "$layers/share/openxr/1/api_layers/explicit.d/"*; do - substituteInPlace "$file" --replace '"library_path": "lib' "\"library_path\": \"$layers/lib/lib" - done - mkdir -p "$layers/lib" - mv "$out/lib/libXrApiLayer"* "$layers/lib" - ''; - - meta = with lib; { - description = "Khronos OpenXR loader"; - homepage = "https://www.khronos.org/openxr"; - platforms = platforms.linux; - license = licenses.asl20; - maintainers = [ maintainers.ralith ]; - }; -} diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix deleted file mode 100644 index ae9e63619a80..000000000000 --- a/pkgs/development/libraries/openzwave/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, doxygen, fontconfig, graphviz-nox, libxml2, pkg-config, which -, systemd }: - -stdenv.mkDerivation rec { - pname = "openzwave"; - version = "1.6-unstable-2022-11-17"; - - src = fetchFromGitHub { - owner = "OpenZWave"; - repo = "open-zwave"; - rev = "3fff11d246a0d558d26110e1db6bd634a1b347c0"; - hash = "sha256-CLK2MeoTmZ8GMKb1OAZFNLyc4C+k+REK2w+WQxZv0/E="; - }; - - outputs = [ "out" "doc" ]; - - nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkg-config which ]; - - buildInputs = [ systemd ]; - - hardeningDisable = [ "format" ]; - - enableParallelBuilding = true; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - FONTCONFIG_FILE="${fontconfig.out}/etc/fonts/fonts.conf"; - FONTCONFIG_PATH="${fontconfig.out}/etc/fonts/"; - - postPatch = '' - substituteInPlace cpp/src/Options.cpp \ - --replace /etc/openzwave $out/etc/openzwave - substituteInPlace cpp/build/Makefile \ - --replace "-Werror" "-Werror -Wno-format" - ''; - - meta = with lib; { - description = "C++ library to control Z-Wave Networks via a USB Z-Wave Controller"; - homepage = "http://www.openzwave.net/"; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix deleted file mode 100644 index 87381141d98f..000000000000 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ /dev/null @@ -1,149 +0,0 @@ -{ lib -, stdenv -, fetchurl -, autoPatchelfHook -, fixDarwinDylibNames -, unzip -, libaio -, makeWrapper -, odbcSupport ? true -, unixODBC -}: - -assert odbcSupport -> unixODBC != null; - -let - inherit (lib) optional optionals optionalString; - - throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; - - # assemble list of components - components = [ "basic" "sdk" "sqlplus" "tools" ] ++ optional odbcSupport "odbc"; - - # determine the version number, there might be different ones per architecture - version = { - x86_64-linux = "21.10.0.0.0"; - aarch64-linux = "19.10.0.0.0"; - x86_64-darwin = "19.8.0.0.0"; - }.${stdenv.hostPlatform.system} or throwSystem; - - directory = { - x86_64-linux = "2110000"; - aarch64-linux = "191000"; - x86_64-darwin = "198000"; - }.${stdenv.hostPlatform.system} or throwSystem; - - # hashes per component and architecture - hashes = { - x86_64-linux = { - basic = "sha256-uo0QBOmx7TQyroD+As60IhjEkz//+0Cm1tWvLI3edaE="; - sdk = "sha256-TIBFi1jHLJh+SUNFvuL7aJpxh61hG6gXhFIhvdPgpts="; - sqlplus = "sha256-mF9kLjhZXe/fasYDfmZrYPL2CzAp3xDbi624RJDA4lM="; - tools = "sha256-ay8ynzo1fPHbCg9GoIT5ja//iZPIZA2yXI/auVExiRY="; - odbc = "sha256-3M6/cEtUrIFzQay8eHNiLGE+L0UF+VTmzp4cSBcrzlk="; - }; - aarch64-linux = { - basic = "sha256-DNntH20BAmo5kOz7uEgW2NXaNfwdvJ8l8oMnp50BOsY="; - sdk = "sha256-8VpkNyLyFMUfQwbZpSDV/CB95RoXfaMr8w58cRt/syw="; - sqlplus = "sha256-iHcyijHhAvjsAqN9R+Rxo2R47k940VvPbScc2MWYn0Q="; - tools = "sha256-4QY0EwcnctwPm6ZGDZLudOFM4UycLFmRIluKGXVwR0M="; - odbc = "sha256-T+RIIKzZ9xEg/E72pfs5xqHz2WuIWKx/oRfDrQbw3ms="; - }; - x86_64-darwin = { - basic = "sha256-V+1BmPOhDYPNXdwkcsBY1MOwt4Yka66/a7/HORzBIIc="; - sdk = "sha256-D6iuTEQYqmbOh1z5LnKN16ga6vLmjnkm4QK15S/Iukw="; - sqlplus = "sha256-08uoiwoKPZmTxLZLYRVp0UbN827FXdhOukeDUXvTCVk="; - tools = "sha256-1xFFGZapFq9ogGQ6ePSv4PrXl5qOAgRZWAp4mJ5uxdU="; - odbc = "sha256-S6+5P4daK/+nXwoHmOkj4DIkHtwdzO5GOkCCI612bRY="; - }; - }.${stdenv.hostPlatform.system} or throwSystem; - - # rels per component and architecture, optional - rels = { }.${stdenv.hostPlatform.system} or { }; - - # convert platform to oracle architecture names - arch = { - x86_64-linux = "linux.x64"; - aarch64-linux = "linux.arm64"; - x86_64-darwin = "macos.x64"; - }.${stdenv.hostPlatform.system} or throwSystem; - - shortArch = { - x86_64-linux = "linux"; - aarch64-linux = "linux"; - x86_64-darwin = "mac"; - }.${stdenv.hostPlatform.system} or throwSystem; - - # calculate the filename of a single zip file - srcFilename = component: arch: version: rel: - "instantclient-${component}-${arch}-${version}" + - (optionalString (rel != "") "-${rel}") + - "dbru.zip"; # ¯\_(ツ)_/¯ - - # fetcher for the non clickthrough artifacts - fetcher = srcFilename: hash: fetchurl { - url = "https://download.oracle.com/otn_software/${shortArch}/instantclient/${directory}/${srcFilename}"; - sha256 = hash; - }; - - # assemble srcs - srcs = map - (component: - (fetcher (srcFilename component arch version rels.${component} or "") hashes.${component} or "")) - components; - - pname = "oracle-instantclient"; - extLib = stdenv.hostPlatform.extensions.sharedLibrary; -in -stdenv.mkDerivation { - inherit pname version srcs; - - buildInputs = [ stdenv.cc.cc.lib ] - ++ optional stdenv.isLinux libaio - ++ optional odbcSupport unixODBC; - - nativeBuildInputs = [ makeWrapper unzip ] - ++ optional stdenv.isLinux autoPatchelfHook - ++ optional stdenv.isDarwin fixDarwinDylibNames; - - outputs = [ "out" "dev" "lib" ]; - - unpackCmd = "unzip $curSrc"; - - installPhase = '' - mkdir -p "$out/"{bin,include,lib,"share/java","share/${pname}-${version}/demo/"} $lib/lib - install -Dm755 {adrci,genezi,uidrvci,sqlplus,exp,expdp,imp,impdp} $out/bin - - # cp to preserve symlinks - cp -P *${extLib}* $lib/lib - - install -Dm644 *.jar $out/share/java - install -Dm644 sdk/include/* $out/include - install -Dm644 sdk/demo/* $out/share/${pname}-${version}/demo - - # provide alias - ln -sfn $out/bin/sqlplus $out/bin/sqlplus64 - ''; - - postFixup = optionalString stdenv.isDarwin '' - for exe in "$out/bin/"* ; do - if [ ! -L "$exe" ]; then - install_name_tool -add_rpath "$lib/lib" "$exe" - fi - done - ''; - - meta = with lib; { - description = "Oracle instant client libraries and sqlplus CLI"; - longDescription = '' - Oracle instant client provides access to Oracle databases (OCI, - OCCI, Pro*C, ODBC or JDBC). This package includes the sqlplus - command line SQL client. - ''; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ dylanmtaylor ]; - hydraPlatforms = [ ]; - }; -} diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix deleted file mode 100644 index 14cc99622755..000000000000 --- a/pkgs/development/libraries/orcania/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, check, subunit }: -stdenv.mkDerivation rec { - pname = "orcania"; - version = "2.3.3"; - - src = fetchFromGitHub { - owner = "babelouest"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Cz3IE5UrfoWjMxQ/+iR1bLsYxf5DVN+7aJqLBcPjduA="; - }; - - nativeBuildInputs = [ cmake ]; - - nativeCheckInputs = [ check subunit ]; - - cmakeFlags = [ "-DBUILD_ORCANIA_TESTING=on" ]; - - doCheck = true; - - meta = with lib; { - description = "Potluck with different functions for different purposes that can be shared among C programs"; - mainProgram = "base64url"; - homepage = "https://github.com/babelouest/orcania"; - license = licenses.lgpl21; - maintainers = with maintainers; [ johnazoidberg ]; - }; -} diff --git a/pkgs/development/libraries/orocos-kdl/default.nix b/pkgs/development/libraries/orocos-kdl/default.nix deleted file mode 100644 index 05a3cefaeceb..000000000000 --- a/pkgs/development/libraries/orocos-kdl/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, eigen }: - -stdenv.mkDerivation rec { - pname = "orocos-kdl"; - version = "1.5.1"; - - src = fetchFromGitHub { - owner = "orocos"; - repo = "orocos_kinematics_dynamics"; - rev = "v${version}"; - sha256 = "15ky7vw461005axx96d0f4zxdnb9dxl3h082igyd68sbdb8r1419"; - # Needed to build Python bindings - fetchSubmodules = true; - }; - - sourceRoot = "${src.name}/orocos_kdl"; - - nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ eigen ]; - - meta = with lib; { - description = "Kinematics and Dynamics Library"; - homepage = "https://www.orocos.org/kdl.html"; - license = licenses.lgpl21Only; - maintainers = with maintainers; [ lopsided98 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix deleted file mode 100644 index 9940ec12ab70..000000000000 --- a/pkgs/development/libraries/ortp/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ bctoolbox -, cmake -, fetchFromGitLab -, lib -, stdenv -}: - -stdenv.mkDerivation rec { - pname = "ortp"; - version = "5.2.109"; - - src = fetchFromGitLab { - domain = "gitlab.linphone.org"; - owner = "public"; - group = "BC"; - repo = pname; - rev = version; - hash = "sha256-EgUPICdKi8c/E6uonZB4DKyOZ3Od4JM5/bR2U6cq9ew="; - }; - - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error=stringop-truncation"; - - buildInputs = [ bctoolbox ]; - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Real-Time Transport Protocol (RFC3550) stack. Part of the Linphone project"; - mainProgram = "ortp_tester"; - homepage = "https://linphone.org/technical-corner/ortp"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix deleted file mode 100644 index d552bedaa4f9..000000000000 --- a/pkgs/development/libraries/osip/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{lib, stdenv, fetchurl}: -stdenv.mkDerivation rec { - version = "5.3.1"; - src = fetchurl { - url = "mirror://gnu/osip/libosip2-${version}.tar.gz"; - sha256 = "sha256-/oL+hBYIJmrBWlwRGCFtoAxVTVAG4odaisN1Kx5q3Hk="; - }; - pname = "libosip2"; - - meta = { - license = lib.licenses.lgpl21Plus; - homepage = "https://www.gnu.org/software/osip/"; - description = "GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; - maintainers = with lib.maintainers; [ raskin ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix deleted file mode 100644 index 0be196597c90..000000000000 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ cairo, fetchzip, glib, libsoup, gnome-common, gtk3, gobject-introspection, pkg-config, lib, stdenv }: - -stdenv.mkDerivation rec { - pname = "osm-gps-map"; - version = "1.2.0"; - - src = fetchzip { - url = "https://github.com/nzjrs/osm-gps-map/releases/download/${version}/osm-gps-map-${version}.tar.gz"; - sha256 = "sha256-ciw28YXhR+GC6B2VPC+ZxjyhadOk3zYGuOssSgqjwH0="; - }; - - outputs = [ "out" "dev" "doc" ]; - - nativeBuildInputs = [ pkg-config gobject-introspection gnome-common ]; - - buildInputs = [ - cairo glib - gtk3 - libsoup - ]; - - meta = with lib; { - description = "GTK widget for displaying OpenStreetMap tiles"; - homepage = "https://nzjrs.github.io/osm-gps-map"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ hrdinka ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix deleted file mode 100644 index b520c7087ba7..000000000000 --- a/pkgs/development/libraries/p11-kit/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, libtasn1 -, libxslt -, docbook-xsl-nons -, docbook_xml_dtd_43 -, gettext -, libffi -, libintl -}: - -stdenv.mkDerivation rec { - pname = "p11-kit"; - version = "0.25.5"; - - src = fetchFromGitHub { - owner = "p11-glue"; - repo = pname; - rev = version; - hash = "sha256-2xDUvXGsF8x42uezgnvOXLVUdNNHcaE042HDDEJeplc="; - fetchSubmodules = true; - }; - - outputs = [ "out" "bin" "dev" ]; - - strictDeps = true; - - nativeBuildInputs = [ - meson - ninja - pkg-config - libtasn1 # asn1Parser - libxslt # xsltproc - docbook-xsl-nons - docbook_xml_dtd_43 - gettext - ]; - - buildInputs = [ - libffi - libtasn1 - libintl - ]; - - mesonFlags = [ - "--sysconfdir=/etc" - (lib.mesonBool "man" true) - (lib.mesonEnable "systemd" false) - (lib.mesonOption "bashcompdir" "${placeholder "bin"}/share/bash-completion/completions") - (lib.mesonOption "trust_paths" (lib.concatStringsSep ":" [ - "/etc/ssl/trust-source" # p11-kit trust source - "/etc/ssl/certs/ca-certificates.crt" # NixOS + Debian/Ubuntu/Arch/Gentoo... - "/etc/pki/tls/certs/ca-bundle.crt" # Fedora/CentOS - "/var/lib/ca-certificates/ca-bundle.pem" # openSUSE - "/etc/ssl/cert.pem" # Darwin/macOS - ])) - ]; - - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - - postPatch = '' - # Install sample config files to $out/etc even though they will be loaded from /etc. - substituteInPlace p11-kit/meson.build \ - --replace 'install_dir: prefix / p11_system_config' "install_dir: '$out/etc/pkcs11'" - ''; - - preCheck = '' - # Tests run in fakeroot for non-root users (with Nix single-user install) - if [ "$(id -u)" != "0" ]; then - export FAKED_MODE=1 - fi - ''; - - meta = with lib; { - description = "Library for loading and sharing PKCS#11 modules"; - longDescription = '' - Provides a way to load and enumerate PKCS#11 modules. - Provides a standard configuration setup for installing - PKCS#11 modules in such a way that they're discoverable. - ''; - homepage = "https://p11-glue.github.io/p11-glue/p11-kit.html"; - changelog = [ - "https://github.com/p11-glue/p11-kit/raw/${version}/NEWS" - "https://github.com/p11-glue/p11-kit/releases/tag/${version}" - ]; - platforms = platforms.all; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix deleted file mode 100644 index 43822d76aa19..000000000000 --- a/pkgs/development/libraries/packr/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ stdenv -, buildGoModule -, fetchFromGitHub -, lib -, symlinkJoin -}: - -let p2 = buildGoModule rec { - pname = "packr2"; - version = "2.8.0"; - - src = fetchFromGitHub { - owner = "gobuffalo"; - repo = "packr"; - rev = "v${version}"; - hash = "sha256-UfnL3Lnq3ocXrTqKtmyar6BoKUUHHKMOFCiD5wX26PQ="; - }+"/v2"; - - subPackages = [ "packr2" ]; - - vendorHash = "sha256-N3u+DmEe0r72zFPb8El/MwjyIcTehQRE+MgusIII2Is="; - - doCheck = false; - - meta = with lib; { - description = "Simple and easy way to embed static files into Go binaries"; - homepage = "https://github.com/gobuffalo/packr"; - license = licenses.mit; - maintainers = with maintainers; [ mmahut ]; - - # golang.org/x/sys needs to be updated due to: - # - # https://github.com/golang/go/issues/49219 - # - # but this package is no longer maintained. - # - broken = stdenv.isDarwin; - }; -}; -p1 = buildGoModule rec { - pname = "packr1"; - version = "2.8.0"; - - src = fetchFromGitHub { - owner = "gobuffalo"; - repo = "packr"; - rev = "v${version}"; - hash = "sha256-UfnL3Lnq3ocXrTqKtmyar6BoKUUHHKMOFCiD5wX26PQ="; - }; - - subPackages = [ "packr" ]; - - vendorHash = "sha256-6mlV3q7irI0aoeB91OYSD3RvmwYcNXRNkSYowjmSflQ="; - - doCheck = false; - - meta = with lib; { - description = "Simple and easy way to embed static files into Go binaries"; - homepage = "https://github.com/gobuffalo/packr"; - license = licenses.mit; - maintainers = with maintainers; [ mmahut ]; - - # golang.org/x/sys needs to be updated due to: - # - # https://github.com/golang/go/issues/49219 - # - # but this package is no longer maintained. - # - broken = stdenv.isDarwin; - }; -}; -in -symlinkJoin{ - name = "packr"; - paths = [p1 p2]; -} diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix deleted file mode 100644 index b7d3d92db0bb..000000000000 --- a/pkgs/development/libraries/pagmo2/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ fetchFromGitHub -, lib, stdenv -, cmake -, eigen -, nlopt -, ipopt -, boost -, tbb - # tests pass but take 30+ minutes -, runTests ? false -}: - -stdenv.mkDerivation rec { - pname = "pagmo2"; - version = "2.19.1"; - - src = fetchFromGitHub { - owner = "esa"; - repo = "pagmo2"; - rev = "v${version}"; - sha256 = "sha256-ido3e0hQLDEPT0AmsfAVTPlGbWe5QBkxgRO6Fg1wp/c="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen nlopt boost tbb ] ++ lib.optional (!stdenv.isDarwin) ipopt; - - cmakeFlags = [ - "-DPAGMO_BUILD_TESTS=${if runTests then "ON" else "OFF"}" - "-DPAGMO_WITH_EIGEN3=yes" - "-DPAGMO_WITH_NLOPT=yes" - "-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt${stdenv.hostPlatform.extensions.sharedLibrary}" - ] ++ lib.optionals stdenv.isLinux [ - "-DPAGMO_WITH_IPOPT=yes" - "-DCMAKE_CXX_FLAGS='-fuse-ld=gold'" - ] ++ lib.optionals stdenv.isDarwin [ - # FIXME: fails ipopt test with Invalid_Option on darwin, so disable. - "-DPAGMO_WITH_IPOPT=no" - "-DLLVM_USE_LINKER=gold" - ]; - - doCheck = runTests; - - meta = with lib; { - homepage = "https://esa.github.io/pagmo2/"; - description = "Scientific library for massively parallel optimization"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/libraries/paho-mqtt-c/default.nix b/pkgs/development/libraries/paho-mqtt-c/default.nix deleted file mode 100644 index 23f0bc99c88a..000000000000 --- a/pkgs/development/libraries/paho-mqtt-c/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssl, enableStatic ? stdenv.hostPlatform.isStatic, enableShared ? !stdenv.hostPlatform.isStatic }: - -stdenv.mkDerivation rec { - pname = "paho.mqtt.c"; - version = "1.3.13"; - - src = fetchFromGitHub { - owner = "eclipse"; - repo = "paho.mqtt.c"; - rev = "v${version}"; - hash = "sha256-dKQnepQAryAjImh2rX1jdgiKBtJQy9wzk/7rGQjUtPg="; - }; - - postPatch = '' - substituteInPlace src/MQTTVersion.c \ - --replace "namebuf[60]" "namebuf[120]" \ - --replace "lib%s" "$out/lib/lib%s" - ''; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ openssl ]; - - cmakeFlags = [ - (lib.cmakeBool "PAHO_WITH_SSL" true) - (lib.cmakeBool "PAHO_BUILD_STATIC" enableStatic) - (lib.cmakeBool "PAHO_BUILD_SHARED" enableShared) - ]; - - meta = with lib; { - description = "Eclipse Paho MQTT C Client Library"; - mainProgram = "MQTTVersion"; - homepage = "https://www.eclipse.org/paho/"; - license = licenses.epl20; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index d91552e3799a..fcdf8f27f981 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -16,7 +16,7 @@ , ninja , glib , python3 -, x11Support? !stdenv.isDarwin, libXft +, x11Support? !stdenv.hostPlatform.isDarwin, libXft , withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , buildPackages, gobject-introspection , testers @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pango"; - version = "1.52.2"; + version = "1.54.0"; outputs = [ "bin" "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = with finalAttrs; "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-0Adq/gEIKBS4U97smfk0ns5fLOg5CLjlj/c2tB94qWs="; + hash = "sha256-ip7tdQIe5zTX/A/fOmXDu6Ud/v5K5RqbQUpgxwstHtg="; }; depsBuildBuild = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ fribidi libthai - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Carbon CoreGraphics @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ - (lib.mesonBool "gtk_doc" withIntrospection) + (lib.mesonBool "documentation" withIntrospection) (lib.mesonEnable "introspection" withIntrospection) (lib.mesonEnable "xft" x11Support) ]; diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 600c7b0eb058..f15a7dfe4490 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew -, xorg, ffmpeg_7, libjpeg, libpng, libtiff, eigen +, xorg, ffmpeg, libjpeg, libpng, libtiff, eigen , Carbon, Cocoa }: @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { libGL glew xorg.libX11 - ffmpeg_7 + ffmpeg libjpeg libpng libtiff eigen ] - ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]; # The tests use cmake's findPackage to find the installed version of # pangolin, which isn't what we want (or available). @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/stevenlovegrove/Pangolin"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.expipiplus1 ]; + maintainers = []; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/pangomm/2.42.nix b/pkgs/development/libraries/pangomm/2.42.nix index 267e46c48c3d..ebbaee668563 100644 --- a/pkgs/development/libraries/pangomm/2.42.nix +++ b/pkgs/development/libraries/pangomm/2.42.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optionals stdenv.isDarwin [ + nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; propagatedBuildInputs = [ pango glibmm cairomm ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "C++ interface to the Pango text rendering library"; homepage = "https://www.pango.org/"; license = with licenses; [ lgpl2 lgpl21 ]; diff --git a/pkgs/development/libraries/pangomm/2.48.nix b/pkgs/development/libraries/pangomm/2.48.nix index fa4148e06aa0..92acaf32c09c 100644 --- a/pkgs/development/libraries/pangomm/2.48.nix +++ b/pkgs/development/libraries/pangomm/2.48.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "pangomm"; - version= "2.52.0"; + version= "2.54.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-NKE0EmpkhP8S93Q1jDbsxE0OnfCU4bg3ltl3S7fSSUc="; + hash = "sha256-Slsf0bfEehr0UnfqgrWr6sqOCPsQon2qY5TPiNdOes8="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meson ninja python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 02a76869cf1e..65dede46ee9e 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optionals stdenv.isDarwin [ + nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; propagatedBuildInputs = [ pango glibmm cairomm ]; diff --git a/pkgs/development/libraries/parson/default.nix b/pkgs/development/libraries/parson/default.nix deleted file mode 100644 index 4bdee532eea8..000000000000 --- a/pkgs/development/libraries/parson/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja }: - -stdenv.mkDerivation { - pname = "parson"; - version = "1.5.3"; - - src = fetchFromGitHub { - owner = "kgabis"; - repo = "parson"; - rev = "ba29f4eda9ea7703a9f6a9cf2b0532a2605723c3"; # upstream doesn't use tags - hash = "sha256-IEmCa0nauUzG+zcLpr++ySD7i21zVJh/35r9RaQkok0="; - }; - - nativeBuildInputs = [ meson ninja ]; - - meta = { - description = "Lightweight JSON library written in C"; - homepage = "https://github.com/kgabis/parson"; - 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 deleted file mode 100644 index 05c8abfafb2a..000000000000 --- a/pkgs/development/libraries/partio/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, unzip -, cmake -, libglut -, libGLU -, libGL -, zlib -, swig -, doxygen -, xorg -, python3 -, darwin -}: - -stdenv.mkDerivation rec { - pname = "partio"; - version = "1.17.3"; - - src = fetchFromGitHub { - owner = "wdas"; - repo = "partio"; - rev = "refs/tags/v${version}"; - hash = "sha256-wV9byR85qwOkoTyLjG0gOLC3Gc19ykwiLpDy4T/MENQ="; - }; - - outputs = [ "dev" "out" "lib" ]; - - nativeBuildInputs = [ - unzip - cmake - doxygen - python3 - ]; - - buildInputs = [ - zlib - swig - xorg.libXi - xorg.libXmu - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.GLUT - ] ++ lib.optionals (!stdenv.isDarwin) [ - libglut - libGLU - libGL - ]; - - # TODO: - # Sexpr support - - strictDeps = true; - - meta = with lib; { - description = "C++ (with python bindings) library for easily reading/writing/manipulating common animation particle formats such as PDB, BGEO, PTC"; - homepage = "https://github.com/wdas/partio"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = [ maintainers.guibou ]; - }; -} diff --git a/pkgs/development/libraries/pc-ble-driver/default.nix b/pkgs/development/libraries/pc-ble-driver/default.nix index 7a7b8475d7c4..0391b72ada89 100644 --- a/pkgs/development/libraries/pc-ble-driver/default.nix +++ b/pkgs/development/libraries/pc-ble-driver/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DNRF_BLE_DRIVER_VERSION=${version}" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "-DARCH=arm64" ]; @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ]; diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix deleted file mode 100644 index 347e8b5cdf2c..000000000000 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ config -, lib -, stdenv -, fetchFromGitHub -, alsa-lib -, autoconf -, automake -, libpulseaudio -, libtool -, pkg-config -, portaudio -, which -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "pcaudiolib"; - version = "1.2"; - - src = fetchFromGitHub { - owner = "espeak-ng"; - repo = "pcaudiolib"; - rev = finalAttrs.version; - hash = "sha256-ZG/HBk5DHaZP/H3M01vDr3M2nP9awwsPuKpwtalz3EE="; - }; - - nativeBuildInputs = [ - autoconf - automake - libtool - pkg-config - which - ]; - - buildInputs = [ - portaudio - ] - ++ lib.optional stdenv.isLinux alsa-lib - ++ lib.optional pulseaudioSupport libpulseaudio; - - # touch ChangeLog to avoid below error on darwin: - # Makefile.am: error: required file './ChangeLog.md' not found - preConfigure = lib.optionalString stdenv.isDarwin '' - touch ChangeLog - '' + '' - ./autogen.sh - ''; - - meta = with lib; { - homepage = "https://github.com/espeak-ng/pcaudiolib"; - description = "Provides a C API to different audio devices"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ aske ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix deleted file mode 100644 index ced4e04c0b87..000000000000 --- a/pkgs/development/libraries/pcg-c/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchzip }: - -stdenv.mkDerivation rec { - version = "0.94"; - pname = "pcg-c"; - - src = fetchzip { - url = "http://www.pcg-random.org/downloads/${pname}-${version}.zip"; - sha256 = "0smm811xbvs03a5nc2668zd0178wnyri2h023pqffy767bpy1vlv"; - }; - - enableParallelBuilding = true; - - patches = [ - ./prefix-variable.patch - ]; - - preInstall = '' - sed -i s,/usr/local,$out, Makefile - mkdir -p $out/lib $out/include - ''; - - meta = { - description = "Family of better random number generators"; - homepage = "https://www.pcg-random.org/"; - license = lib.licenses.asl20; - longDescription = '' - PCG is a family of simple fast space-efficient statistically good - algorithms for random number generation. Unlike many general-purpose RNGs, - they are also hard to predict. - ''; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.linus ]; - broken = stdenv.isi686; # https://github.com/imneme/pcg-c/issues/11 - }; -} diff --git a/pkgs/development/libraries/pcg-c/prefix-variable.patch b/pkgs/development/libraries/pcg-c/prefix-variable.patch deleted file mode 100644 index bfdcdfa7b17e..000000000000 --- a/pkgs/development/libraries/pcg-c/prefix-variable.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile b/Makefile -index dddea44..fdb9401 100644 ---- a/Makefile -+++ b/Makefile -@@ -30,8 +30,8 @@ all: - PREFIX = /usr/local - - install: all -- install src/libpcg_random.a $PREFIX/lib -- install -m 0644 include/pcg_variants.h $PREFIX/include -+ install src/libpcg_random.a ${PREFIX}/lib -+ install -m 0644 include/pcg_variants.h ${PREFIX}/include - - test: all - cd test-low; $(MAKE) test diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 36e54f873cc7..41639d300ecd 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { qtbase libXt ] - ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa AGL ]; propagatedBuildInputs = [ boost @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { vtk ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] ++ lib.optionals cudaSupport [ "-DWITH_CUDA=true" ]; diff --git a/pkgs/development/libraries/pcmsolver/default.nix b/pkgs/development/libraries/pcmsolver/default.nix deleted file mode 100644 index c2924426f8bb..000000000000 --- a/pkgs/development/libraries/pcmsolver/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, perl, gfortran, python3 -, boost, eigen, zlib -} : - -stdenv.mkDerivation rec { - pname = "pcmsolver"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "PCMSolver"; - repo = pname; - rev = "v${version}"; - sha256= "0jrxr8z21hjy7ik999hna9rdqy221kbkl3qkb06xw7g80rc9x9yr"; - }; - - # Glibc 2.34 changed SIGSTKSZ to a dynamic value, which breaks - # PCMsolver. Replace SIGSTKZ by the backward-compatible _SC_SIGSTKSZ. - postPatch = '' - substituteInPlace external/Catch/catch.hpp \ - --replace SIGSTKSZ _SC_SIGSTKSZ - ''; - - nativeBuildInputs = [ - cmake - gfortran - perl - python3 - ]; - - buildInputs = [ - boost - eigen - zlib - ]; - - cmakeFlags = [ "-DENABLE_OPENMP=ON" ]; - - hardeningDisable = [ "format" ]; - - # Requires files, that are not installed. - doCheck = false; - - meta = with lib; { - description = "API for the Polarizable Continuum Model"; - mainProgram = "run_pcm"; - homepage = "https://pcmsolver.readthedocs.io/en/stable/"; - license = licenses.lgpl3Only; - platforms = platforms.linux; - maintainers = [ maintainers.sheepforce ]; - }; -} diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix deleted file mode 100644 index 2ab81728d5ea..000000000000 --- a/pkgs/development/libraries/pdal/default.nix +++ /dev/null @@ -1,140 +0,0 @@ -{ lib -, stdenv -, callPackage -, fetchFromGitHub -, testers - -, enableE57 ? lib.meta.availableOn stdenv.hostPlatform libe57format - -, cmake -, curl -, gdal -, hdf5-cpp -, laszip -, libe57format -, libgeotiff -, libtiff -, libxml2 -, openscenegraph -, pkg-config -, postgresql -, proj -, sqlite -, tiledb -, xercesc -, zlib -, zstd -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "pdal"; - version = "2.8.0"; - - src = fetchFromGitHub { - owner = "PDAL"; - repo = "PDAL"; - rev = finalAttrs.version; - hash = "sha256-VHcUyYADmNzxZ+Ix56TNuaP9wG+vRlEl71cNM0uMaHg="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - curl - gdal - hdf5-cpp - laszip - libgeotiff - libtiff - (libxml2.override { enableHttp = true; }) - openscenegraph - postgresql - proj - sqlite - tiledb - xercesc - zlib - zstd - ] ++ lib.optionals enableE57 [ - libe57format - ]; - - cmakeFlags = [ - "-DBUILD_PLUGIN_E57=${if enableE57 then "ON" else "OFF"}" - "-DBUILD_PLUGIN_HDF=ON" - "-DBUILD_PLUGIN_PGPOINTCLOUD=ON" - "-DBUILD_PLUGIN_TILEDB=ON" - "-DWITH_COMPLETION=ON" - "-DWITH_TESTS=ON" - "-DBUILD_PGPOINTCLOUD_TESTS=OFF" - - # Plugins can probably not be made work easily: - "-DBUILD_PLUGIN_CPD=OFF" - "-DBUILD_PLUGIN_FBX=OFF" # Autodesk FBX SDK is gratis+proprietary; not packaged in nixpkgs - "-DBUILD_PLUGIN_GEOWAVE=OFF" - "-DBUILD_PLUGIN_I3S=OFF" - "-DBUILD_PLUGIN_ICEBRIDGE=OFF" - "-DBUILD_PLUGIN_MATLAB=OFF" - "-DBUILD_PLUGIN_MBIO=OFF" - "-DBUILD_PLUGIN_MRSID=OFF" - "-DBUILD_PLUGIN_NITF=OFF" - "-DBUILD_PLUGIN_OCI=OFF" - "-DBUILD_PLUGIN_RDBLIB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs - "-DBUILD_PLUGIN_RIVLIB=OFF" - ]; - - doCheck = true; - - disabledTests = [ - # 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 - "pdal_io_tiledb_writer_test" - "pdal_io_tiledb_reader_test" - "pdal_io_tiledb_time_writer_test" - "pdal_io_tiledb_time_reader_test" - "pdal_io_tiledb_bit_fields_test" - "pdal_io_tiledb_utils_test" - "pdal_io_e57_read_test" - "pdal_io_e57_write_test" - "pdal_io_stac_reader_test" - - # Segfault - "pdal_io_hdf_reader_test" - - # Failure - "pdal_app_plugin_test" - ]; - - checkPhase = '' - runHook preCheck - # tests are flaky and they seem to fail less often when they don't run in - # parallel - ctest -j 1 --output-on-failure -E '^${lib.concatStringsSep "|" finalAttrs.disabledTests}$' - runHook postCheck - ''; - - passthru.tests = { - version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "pdal --version"; - version = "pdal ${finalAttrs.finalPackage.version}"; - }; - pdal = callPackage ./tests.nix { pdal = finalAttrs.finalPackage; }; - pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - }; - }; - - meta = with lib; { - description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data"; - homepage = "https://pdal.io"; - license = licenses.bsd3; - maintainers = teams.geospatial.members; - platforms = platforms.all; - pkgConfigModules = [ "pdal" ]; - }; -}) diff --git a/pkgs/development/libraries/pdal/tests.nix b/pkgs/development/libraries/pdal/tests.nix deleted file mode 100644 index 1f71626856b3..000000000000 --- a/pkgs/development/libraries/pdal/tests.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ runCommand, pdal }: - -let - inherit (pdal) pname; -in -runCommand "${pname}-tests" { meta.timeout = 60; } - '' - ${pdal}/bin/pdal --drivers - touch $out - '' diff --git a/pkgs/development/libraries/pe-parse/default.nix b/pkgs/development/libraries/pe-parse/default.nix deleted file mode 100644 index 1a3a602d5527..000000000000 --- a/pkgs/development/libraries/pe-parse/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "pe-parse"; - version = "2.1.1"; - - src = fetchFromGitHub { - owner = "trailofbits"; - repo = "pe-parse"; - rev = "v${version}"; - hash = "sha256-XegSZWRoQg6NEWuTSFI1RMvN3GbpLDrZrloPU2XdK2M="; - }; - - nativeBuildInputs = [ cmake ]; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ - "-Wno-error=deprecated-declarations" - ]); - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/dump-pe ../tests/assets/example.exe - ''; - - meta = with lib; { - description = "Principled, lightweight parser for Windows portable executable files"; - homepage = "https://github.com/trailofbits/pe-parse"; - changelog = "https://github.com/trailofbits/pe-parse/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ arturcygan ]; - mainProgram = "dump-pe"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/pffft/default.nix b/pkgs/development/libraries/pffft/default.nix deleted file mode 100644 index b68b6d486823..000000000000 --- a/pkgs/development/libraries/pffft/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "pffft"; - version = "unstable-2022-04-10"; - - src = fetchFromGitHub { - owner = "marton78"; - repo = pname; - rev = "08f5ed2618ac06d7dcc83d209d7253dc215274d5"; - sha256 = "sha256-9LfLQ17IRsbEwGQJZzhW2Av4en1KuJVicLrS2AyjUZY="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Pretty Fast FFT (PFFFT) library"; - homepage = "https://github.com/marton78/pffft"; - license = licenses.bsd3; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/development/libraries/phash/default.nix deleted file mode 100644 index 73097db5ccc6..000000000000 --- a/pkgs/development/libraries/phash/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cimg, imagemagick }: - -stdenv.mkDerivation rec { - pname = "pHash"; - version = "0.9.6"; - - buildInputs = [ cimg ]; - - # CImg.h calls to external binary `convert` from the `imagemagick` package - # at runtime - propagatedBuildInputs = [ imagemagick ]; - - nativeBuildInputs = [ pkg-config ]; - - configureFlags = ["--enable-video-hash=no" "--enable-audio-hash=no"]; - postInstall = '' - cp ${cimg}/include/CImg.h $out/include/ - ''; - - src = fetchFromGitHub { - owner = "clearscene"; - repo = "pHash"; - rev = version; - sha256 = "sha256-frISiZ89ei7XfI5F2nJJehfQZsk0Mlb4n91q/AiZ2vA="; - }; - - meta = with lib; { - description = "Compute the perceptual hash of an image"; - license = licenses.gpl3; - maintainers = [maintainers.imalsogreg]; - platforms = platforms.all; - homepage = "http://www.phash.org"; - downloadPage = "https://github.com/clearscene/pHash"; - }; -} diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index 27f7c019ac77..e00be9c841f9 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -16,7 +16,7 @@ let nativeBuildInputs = [ cmake doxygen ]; buildInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ Foundation ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; doInstallCheck = true; diff --git a/pkgs/development/libraries/physics/apfel/cmake.patch b/pkgs/development/libraries/physics/apfel/cmake.patch deleted file mode 100644 index 5bc342aeb48c..000000000000 --- a/pkgs/development/libraries/physics/apfel/cmake.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,8 +46,8 @@ message(STATUS "APFEL: APFEL_DOWNLOAD_PDFS=${APFEL_DOWNLOAD_PDFS}") - # CONFIG SCRIPT ======================================================== - set(prefix ${CMAKE_INSTALL_PREFIX}) - set(exec_prefix "${prefix}") --set(includedir "${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") --set(libdir "${prefix}/${CMAKE_INSTALL_LIBDIR}") -+set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}") -+set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}") - set(PACKAGE_VERSION "${apfel_VERSION}") - configure_file("${PROJECT_SOURCE_DIR}/bin/apfel-config.in" "${PROJECT_BINARY_DIR}/bin/apfel-config") - configure_file("${PROJECT_SOURCE_DIR}/bin/apfel.in" "${PROJECT_BINARY_DIR}/bin/apfel") diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix deleted file mode 100644 index da403af44b9b..000000000000 --- a/pkgs/development/libraries/physics/apfel/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gfortran -, lhapdf -, python3 -, swig -, zlib -}: - -stdenv.mkDerivation rec { - pname = "apfel"; - version = "3.1.1"; - - src = fetchFromGitHub { - owner = "scarrazza"; - repo = "apfel"; - rev = version; - hash = "sha256-0Ix7KwEZUG/NmGJ380DVJbUA0PcoEJDlcGSc09l5Tbc="; - }; - - patches = [ - # https://github.com/scarrazza/apfel/pull/54 - ./cmake.patch - ]; - - nativeBuildInputs = [ - cmake - swig - ]; - buildInputs = [ - gfortran - lhapdf - python3 - zlib - ]; - - cmakeFlags = [ - "-DAPFEL_DOWNLOAD_PDFS=OFF" - "-DAPFEL_Python_SITEARCH=autoprefix" - ]; - - doCheck = true; - nativeCheckInputs = [ - lhapdf.pdf_sets.NNPDF23_nlo_as_0118 - lhapdf.pdf_sets.NNPDF31_nnlo_as_0118 - ]; - - env.NIX_CFLAGS_COMPILE = "-DAPFEL_VERSION=${version}"; - - meta = with lib; { - description = "PDF Evolution Library"; - homepage = "https://apfel.mi.infn.it/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ veprbl ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix deleted file mode 100644 index 2c6c9702c249..000000000000 --- a/pkgs/development/libraries/physics/apfelgrid/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }: - -stdenv.mkDerivation rec { - pname = "apfelgrid"; - version = "1.0.1"; - - src = fetchFromGitHub { - owner = "nhartland"; - repo = "APFELgrid"; - rev = "v${version}"; - sha256 = "0l0cyxd00kmb5aggzwsxg83ah0qiwav0shbxkxwrz3dvw78n89jk"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ apfel applgrid lhapdf root5 ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Ultra-fast theory predictions for collider observables"; - mainProgram = "apfelgrid-config"; - license = licenses.mit; - homepage = "https://nhartland.github.io/APFELgrid/"; - platforms = platforms.unix; - maintainers = with maintainers; [ veprbl ]; - }; -} diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix index c2dbb1235b48..b083f278af9d 100644 --- a/pkgs/development/libraries/physics/applgrid/default.nix +++ b/pkgs/development/libraries/physics/applgrid/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran ]; # For some reason zlib was only needed after bump to gfortran8 - buildInputs = [ hoppet lhapdf root5 zlib ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ hoppet lhapdf root5 zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; patches = [ ./bad_code.patch @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace src/Makefile.in \ --replace "-L\$(subst /libgfortran.a, ,\$(FRTLIB) )" "-L${gfortran.cc.lib}/lib" - '' + (lib.optionalString stdenv.isDarwin '' + '' + (lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/Makefile.in \ --replace "gfortran -print-file-name=libgfortran.a" "gfortran -print-file-name=libgfortran.dylib" ''); diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix deleted file mode 100644 index 13d1cb081249..000000000000 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - lib, - stdenv, - fetchpatch, - fetchurl, - cmake, - freetype, - gfortran, - openssl, - libnsl, - motif, - xorg, - libxcrypt, -}: - -stdenv.mkDerivation rec { - version = "2024.06.12.0"; - pname = "cernlib"; - year = lib.versions.major version; - - src = fetchurl { - urls = [ - "https://ftp.riken.jp/cernlib/download/${year}_source/tar/cernlib-cernlib-${version}-free.tar.gz" - "https://cernlib.web.cern.ch/download/${year}_source/tar/cernlib-cernlib-${version}-free.tar.gz" - ]; - hash = "sha256-SEFgQjPBkmRoaMD/7yXiXO9DZNrRhqZ01kptSDQur84="; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/user-attachments/files/16832928/geant321-fix-weak-alias-on-darwin.patch"; - hash = "sha256-YzaUh4rJBszGdp5s/HDQMI5qQhCGrTt9P6XCgZOFn1I="; - }) - ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "find_program ( SED NAMES gsed" "find_program ( SED NAMES sed" - ''; - - # gfortran warning's on iframework messes with CMake's check_fortran_compiler_flag - # see also https://github.com/NixOS/nixpkgs/issues/27218 - preConfigure = '' - export NIX_CFLAGS_COMPILE="$(echo $NIX_CFLAGS_COMPILE | sed 's|-iframework [^ ]*||g')" - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = with xorg; [ - freetype - gfortran - openssl - libX11 - libXaw - libXft - libXt - libxcrypt - motif - ] ++ lib.optional stdenv.isLinux libnsl; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = "http://cernlib.web.cern.ch"; - description = "Legacy collection of libraries and modules for data analysis in high energy physics"; - platforms = [ - "aarch64-linux" - "i686-linux" - "x86_64-linux" - "x86_64-darwin" - ]; - maintainers = with lib.maintainers; [ veprbl ]; - license = lib.licenses.gpl2; - }; -} diff --git a/pkgs/development/libraries/physics/cernlib/setup-hook.sh b/pkgs/development/libraries/physics/cernlib/setup-hook.sh deleted file mode 100644 index d48b98cfa624..000000000000 --- a/pkgs/development/libraries/physics/cernlib/setup-hook.sh +++ /dev/null @@ -1,3 +0,0 @@ -export CERN_LEVEL=@version@ -export CERN=@out@ -export CERN_ROOT=$CERN diff --git a/pkgs/development/libraries/physics/clhep/default.nix b/pkgs/development/libraries/physics/clhep/default.nix deleted file mode 100644 index 589233a19593..000000000000 --- a/pkgs/development/libraries/physics/clhep/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenv -, fetchurl -, cmake -}: - -stdenv.mkDerivation rec { - pname = "clhep"; - version = "2.4.7.1"; - - src = fetchurl { - url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz"; - hash = "sha256-HIMEp3cqxrmRlfEwA3jG4930rQfIXWSgRQVlKruKVfk="; - }; - - prePatch = '' - cd CLHEP - ''; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "clhep_ensure_out_of_source_build()" "" - ''; - - nativeBuildInputs = [ - cmake - ]; - - meta = with lib; { - description = "Set of HEP-specific foundation and utility classes such as random generators, physics vectors, geometry and linear algebra"; - homepage = "https://cern.ch/clhep"; - license = with licenses; [ gpl3Only lgpl3Only ]; - maintainers = with maintainers; [ veprbl ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/pkgs/development/libraries/physics/fastjet-contrib/default.nix deleted file mode 100644 index 9a42e693da28..000000000000 --- a/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchurl, fastjet }: - -stdenv.mkDerivation rec { - pname = "fastjet-contrib"; - version = "1.053"; - - src = fetchurl { - url = "https://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz"; - sha256 = "sha256-sSokjgsUOTTJnjt8jdgyZRIvbGwJUzwqA99E9e/x5vo="; - }; - - buildInputs = [ fastjet ]; - - postPatch = '' - for f in Makefile.in */Makefile; do - substituteInPlace "$f" --replace "CXX=g++" "" - done - patchShebangs ./utils/check.sh ./utils/install-sh - ''; - - # Written in shell manually, does not support autoconf-style - # --build=/--host= options: - # Error: --build=x86_64-unknown-linux-gnu: unrecognised argument - configurePlatforms = [ ]; - - enableParallelBuilding = true; - - doCheck = true; - - postBuild = '' - make fragile-shared - ''; - - postInstall = '' - make fragile-shared-install - ''; - - meta = with lib; { - description = "Third party extensions for FastJet"; - homepage = "http://fastjet.fr/"; - changelog = "https://phab.hepforge.org/source/fastjetsvn/browse/contrib/tags/${version}/NEWS?as=source&blame=off"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ veprbl ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix deleted file mode 100644 index f00b527ad408..000000000000 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchurl -, python ? null -, withPython ? false -}: - -stdenv.mkDerivation rec { - pname = "fastjet"; - version = "3.4.2"; - - src = fetchurl { - url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz"; - hash = "sha256-s9MxVbVc5D9CDNbZm1Jaz3vcJZOnu36omKnds9jKOOM="; - }; - - buildInputs = lib.optional withPython python; - - configureFlags = [ - "--enable-allcxxplugins" - ] ++ lib.optional withPython "--enable-pyext"; - - enableParallelBuilding = true; - - meta = { - description = "Software package for jet finding in pp and e+e− collisions"; - mainProgram = "fastjet-config"; - license = lib.licenses.gpl2Plus; - homepage = "http://fastjet.fr/"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ veprbl ]; - }; -} diff --git a/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix b/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix deleted file mode 100644 index 3c781689bbf8..000000000000 --- a/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ lib -, stdenv -, fetchurl -, boost -, gfortran -, lhapdf -, ncurses -, perl -, python ? null -, swig -, yoda -, zlib -, withPython ? false -}: - -stdenv.mkDerivation rec { - pname = "fastnlo-toolkit"; - version = "2.5.0-2826"; - - src = fetchurl { - url = "https://fastnlo.hepforge.org/code/v25/fastnlo_toolkit-${version}.tar.gz"; - sha256 = "sha256-7aIMYCOkHC/17CHYiEfrxvtSJxTDivrS7BQ32cGiEy0="; - }; - - buildInputs = [ - boost - gfortran - gfortran.cc.lib - lhapdf - yoda - ] ++ lib.optional withPython python - ++ lib.optional (withPython && python.isPy3k) ncurses; - - propagatedBuildInputs = [ - zlib - ] ++ lib.optional withPython swig; - - preConfigure = '' - substituteInPlace ./fastnlotoolkit/Makefile.in \ - --replace "-fext-numeric-literals" "" - - # disable test that fails due to strict floating-point number comparison - echo "#!/usr/bin/env perl" > check/fnlo-tk-stattest.pl.in - chmod +x check/fnlo-tk-stattest.pl.in - ''; - - configureFlags = [ - "--with-yoda=${yoda}" - ] ++ lib.optional withPython "--enable-pyext"; - - enableParallelBuilding = true; - - doCheck = true; - nativeCheckInputs = [ - perl - lhapdf.pdf_sets.CT10nlo - ]; - preCheck = '' - patchShebangs --build check - ''; - enableParallelChecking = false; - - # None of our currently packaged versions of swig are C++17-friendly - # Use a workaround from https://github.com/swig/swig/issues/1538 - env.CXXFLAGS="-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES"; - - meta = with lib; { - homepage = "http://fastnlo.hepforge.org"; - description = "Fast pQCD calculations for hadron-induced processes"; - longDescription = '' - The fastNLO project provides computer code to create and evaluate fast - interpolation tables of pre-computed coefficients in perturbation theory - for observables in hadron-induced processes. - - This allows fast theory predictions of these observables for arbitrary - parton distribution functions (of regular shape), renormalization or - factorization scale choices, and/or values of alpha_s(Mz) as e.g. needed - in PDF fits or in systematic studies. Very time consuming complete - recalculations are thus avoided. - ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ veprbl ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 7349c708e3d9..31e76793ec01 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -4,7 +4,7 @@ , enableQt ? enableQT , enableXM ? false , libGLX -, enableOpenGLX11 ? !libGLX.meta.broken +, enableOpenGLX11 ? !stdenv.isDarwin , enablePython ? false , enableRaytracerX11 ? false @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { "-DGEANT4_USE_SYSTEM_EXPAT=ON" "-DGEANT4_USE_SYSTEM_ZLIB=ON" "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" - ] ++ lib.optionals (enableOpenGLX11 && stdenv.isDarwin) [ + ] ++ lib.optionals (enableOpenGLX11 && stdenv.hostPlatform.isDarwin) [ "-DXQuartzGL_INCLUDE_DIR=${libGLX.dev}/include" "-DXQuartzGL_gl_LIBRARY=${libGLX}/lib/libGL.dylib" ] ++ lib.optionals (enableMultiThreading && enablePython) [ @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Toolkit for the simulation of the passage of particles through matter"; longDescription = '' Geant4 is a toolkit for the simulation of the passage of particles through matter. diff --git a/pkgs/development/libraries/physics/hepmc2/default.nix b/pkgs/development/libraries/physics/hepmc2/default.nix deleted file mode 100644 index 870114ffcba4..000000000000 --- a/pkgs/development/libraries/physics/hepmc2/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, cmake }: - -stdenv.mkDerivation rec { - pname = "hepmc"; - version = "2.06.11"; - - src = fetchurl { - url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC-${version}.tar.gz"; - sha256 = "1pp89bs05nv60wjk1690ndwh4dsd5mk20bzsd4a2lklysdifvb6f"; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-Dmomentum:STRING=GEV" - "-Dlength:STRING=MM" - ]; - - meta = with lib; { - description = "HepMC package is an object oriented event record written in C++ for High Energy Physics Monte Carlo Generators"; - license = licenses.lgpl21; - homepage = "http://hepmc.web.cern.ch/hepmc/"; - platforms = platforms.unix; - maintainers = with maintainers; [ veprbl ]; - }; -} diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix index 53ee798c17b6..c622d7562001 100644 --- a/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/pkgs/development/libraries/physics/hepmc3/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ++ lib.optional withPython python; # error: invalid version number in 'MACOSX_DEPLOYMENT_TARGET=11.0' - preConfigure = lib.optionalString (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' + preConfigure = lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 ''; diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix deleted file mode 100644 index ef7ce7ce586d..000000000000 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }: - -stdenv.mkDerivation rec { - pname = "herwig"; - version = "7.3.0"; - - src = fetchurl { - url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - hash = "sha256-JiSBnS3/EFupUuobXPEutvSSbUlRd0pBkHaZ4vVnaGw="; - }; - - nativeBuildInputs = [ autoconf automake libtool gfortran ]; - - buildInputs = [ boost fastjet gsl thepeg zlib ] - # There is a bug that requires for default PDF's to be present during the build - ++ (with lhapdf.pdf_sets; [ CT14lo CT14nlo ]); - - postPatch = '' - patchShebangs ./ - - # Fix failing "make install" being unable to find HwEvtGenInterface.so - substituteInPlace src/defaults/decayers.in.in \ - --replace "read EvtGenDecayer.in" "" - ''; - - configureFlags = [ - "--with-thepeg=${thepeg}" - ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Multi-purpose particle physics event generator"; - homepage = "https://herwig.hepforge.org/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ veprbl ]; - platforms = platforms.unix; - broken = stdenv.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen... - }; -} diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/pkgs/development/libraries/physics/hoppet/default.nix deleted file mode 100644 index af6200b9c578..000000000000 --- a/pkgs/development/libraries/physics/hoppet/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, gfortran, perl }: - -stdenv.mkDerivation rec { - pname = "hoppet"; - version = "1.2.0"; - - src = fetchurl { - url = "https://hoppet.hepforge.org/downloads/${pname}-${version}.tgz"; - sha256 = "0j7437rh4xxbfzmkjr22ry34xm266gijzj6mvrq193fcsfzipzdz"; - }; - - nativeBuildInputs = [ perl gfortran ]; - - enableParallelBuilding = true; - - preConfigure = '' - patchShebangs . - ''; - - meta = with lib; { - description = "Higher Order Perturbative Parton Evolution Toolkit"; - mainProgram = "hoppet-config"; - license = licenses.gpl2; - homepage = "https://hoppet.hepforge.org"; - platforms = platforms.unix; - maintainers = with maintainers; [ veprbl ]; - }; -} diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 8111f6168430..26ca234c520c 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # The Apple SDK only exports locale_t from xlocale.h whereas glibc # had decided that xlocale.h should be a part of locale.h - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.cc.isGNU) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.cc.isGNU) '' substituteInPlace src/GridPDF.cc --replace '#include <locale>' '#include <xlocale.h>' ''; diff --git a/pkgs/development/libraries/physics/mela/default.nix b/pkgs/development/libraries/physics/mela/default.nix deleted file mode 100644 index a478a972c956..000000000000 --- a/pkgs/development/libraries/physics/mela/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gfortran }: - -stdenv.mkDerivation rec { - pname = "mela"; - version = "2.0.1"; - - src = fetchFromGitHub { - owner = "vbertone"; - repo = "MELA"; - rev = version; - sha256 = "01sgd4mwx4n58x95brphp4dskqkkx8434bvsr38r5drg9na5nc9y"; - }; - - nativeBuildInputs = [ gfortran ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Mellin Evolution LibrAry"; - mainProgram = "mela-config"; - license = licenses.gpl3; - homepage = "https://github.com/vbertone/MELA"; - platforms = platforms.unix; - maintainers = with maintainers; [ veprbl ]; - }; -} diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix deleted file mode 100644 index 4e2d878db00c..000000000000 --- a/pkgs/development/libraries/physics/nlojet/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "nlojet++"; - version = "4.1.3"; - - src = fetchurl { - url = "https://desy.de/~znagy/hep-programs/nlojet++/nlojet++-${version}.tar.gz"; - sha256 = "18qfn5kjzvnyh29x40zm2maqzfmrnay9r58n8pfpq5lcphdhhv8p"; - }; - - patches = [ - ./nlojet_clang_fix.patch - ]; - - env.CXXFLAGS="-std=c++11"; - - # error: no member named 'finite' in the global namespace; did you mean simply 'finite'? - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite"; - - meta = { - homepage = "http://www.desy.de/~znagy/Site/NLOJet++.html"; - license = lib.licenses.gpl2; - description = "Implementation of calculation of the hadron jet cross sections"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ veprbl ]; - }; -} diff --git a/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch b/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch deleted file mode 100644 index 917c57e8cb47..000000000000 --- a/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -rupN nlojet++-4.1.3-orig/nlo-hep/hep-lorentz/bits/hep-lorentzvector_complex.h nlojet++-4.1.3/nlo-hep/hep-lorentz/bits/hep-lorentzvector_complex.h ---- nlojet++-4.1.3-orig/nlo-hep/hep-lorentz/bits/hep-lorentzvector_complex.h 2010-05-11 11:06:00.000000000 -0400 -+++ nlojet++-4.1.3/nlo-hep/hep-lorentz/bits/hep-lorentzvector_complex.h 2014-08-23 03:22:51.000000000 -0400 -@@ -26,8 +26,11 @@ - namespace nlo { - - // Spacializations -+ template<> - class lorentzvector<std::complex<float> >; -+ template<> - class lorentzvector<std::complex<double> >; -+ template<> - class lorentzvector<std::complex<long double> >; - - template<> -diff -rupN nlojet++-4.1.3-orig/nlo-hep/hep-lorentz/bits/hep-threevector_complex.h nlojet++-4.1.3/nlo-hep/hep-lorentz/bits/hep-threevector_complex.h ---- nlojet++-4.1.3-orig/nlo-hep/hep-lorentz/bits/hep-threevector_complex.h 2010-05-11 11:06:00.000000000 -0400 -+++ nlojet++-4.1.3/nlo-hep/hep-lorentz/bits/hep-threevector_complex.h 2014-08-23 03:23:09.000000000 -0400 -@@ -26,8 +26,11 @@ - namespace nlo { - - // Specializations -+ template<> - class threevector<std::complex<float> >; -+ template<> - class threevector<std::complex<double> >; -+ template<> - class threevector<std::complex<long double> >; - - template<> diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 0eb45943e0aa..55ba50f2ae31 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ rsync ] - ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; buildInputs = [ boost fastjet hepmc zlib lhapdf ]; configureFlags = [ diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix deleted file mode 100644 index 565a0c317cd8..000000000000 --- a/pkgs/development/libraries/physics/qcdnum/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, gfortran, zlib }: - -stdenv.mkDerivation rec { - pname = "QCDNUM"; - version = "18-00-00"; - - src = fetchurl { - url = "http://www.nikhef.nl/user/h24/qcdnum-files/download/qcdnum${builtins.replaceStrings ["-"] [""] version}.tar.gz"; - hash = "sha256-4Qj5JreEA1LkCAunGRTTQD7YEYNk+HcQ4iH97DIO4gA="; - }; - - nativeBuildInputs = [ gfortran ]; - buildInputs = [ zlib ]; - - FFLAGS = [ - "-std=legacy" # fix build with gfortran 10 - ]; - - enableParallelBuilding = true; - - meta = { - description = "Very fast QCD evolution program written in FORTRAN77"; - mainProgram = "qcdnum-config"; - license = lib.licenses.gpl3; - homepage = "https://www.nikhef.nl/~h24/qcdnum/index.html"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ veprbl ]; - }; -} diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index c8db0fb22d0e..3246d9e06ec3 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texliveBasic, yoda, which, makeWrapper }: +{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, hdf5, hepmc3, highfive, imagemagick, less, pkg-config, python3, rsync, texliveBasic, yoda, which, makeWrapper }: stdenv.mkDerivation rec { pname = "rivet"; - version = "3.1.10"; + version = "4.0.1"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - hash = "sha256-RYuODfHec46ZctJLJg6qCH3xLJnU/p3uU3fUfqakmRk="; + hash = "sha256-ToaS1uilOWHHeYPra6SJPDdlzyP3BXieTYZb5Iku/3k="; }; latex = texliveBasic.withPackages (ps: with ps; [ @@ -25,43 +25,43 @@ stdenv.mkDerivation rec { xstring ]); - nativeBuildInputs = [ rsync makeWrapper ]; - buildInputs = [ hepmc imagemagick python3 latex python3.pkgs.yoda ]; - propagatedBuildInputs = [ fastjet fastjet-contrib ]; + nativeBuildInputs = [ rsync makeWrapper pkg-config ]; + buildInputs = [ hepmc3 highfive imagemagick python3 latex python3.pkgs.yoda ]; + propagatedBuildInputs = [ hdf5 fastjet fastjet-contrib ]; preConfigure = '' + substituteInPlace configure \ + --replace-fail 'if test $HEPMC_VERSION -le 310; then' 'if false; then' substituteInPlace bin/rivet-build.in \ - --replace 'num_jobs=$(getconf _NPROCESSORS_ONLN)' 'num_jobs=''${NIX_BUILD_CORES:-$(getconf _NPROCESSORS_ONLN)}' \ - --replace 'which' '"${which}/bin/which"' \ - --replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"} #' \ - --replace 'mycxxflags="' "mycxxflags=\"$NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK " + --replace-fail 'num_jobs=$(getconf _NPROCESSORS_ONLN)' 'num_jobs=''${NIX_BUILD_CORES:-$(getconf _NPROCESSORS_ONLN)}' \ + --replace-fail 'which' '"${which}/bin/which"' \ + --replace-fail 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"} #' \ + --replace-fail 'mycxxflags="' "mycxxflags=\"$NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK " ''; preInstall = '' substituteInPlace bin/make-plots \ - --replace '"which"' '"${which}/bin/which"' \ - --replace '"latex"' '"'$latex'/bin/latex"' \ - --replace '"dvips"' '"'$latex'/bin/dvips"' \ - --replace '"ps2pdf"' '"${ghostscript}/bin/ps2pdf"' \ - --replace '"ps2eps"' '"${ghostscript}/bin/ps2eps"' \ - --replace '"kpsewhich"' '"'$latex'/bin/kpsewhich"' \ - --replace '"convert"' '"${imagemagick.out}/bin/convert"' + --replace-fail '"which"' '"${which}/bin/which"' \ + --replace-fail '"latex"' '"'$latex'/bin/latex"' \ + --replace-fail '"dvips"' '"'$latex'/bin/dvips"' \ + --replace-fail '"ps2pdf"' '"${ghostscript}/bin/ps2pdf"' \ + --replace-fail '"ps2eps"' '"${ghostscript}/bin/ps2eps"' \ + --replace-fail '"kpsewhich"' '"'$latex'/bin/kpsewhich"' \ + --replace-fail '"convert"' '"${imagemagick.out}/bin/convert"' substituteInPlace bin/rivet \ - --replace '"less"' '"${less}/bin/less"' - substituteInPlace bin/rivet-mkhtml \ - --replace '"make-plots"' \"$out/bin/make-plots\" \ - --replace '"rivet-cmphistos"' \"$out/bin/rivet-cmphistos\" \ - --replace 'ch_cmd = [sys.executable, os.path.join(os.path.dirname(__file__),' 'ch_cmd = [(' + --replace-fail '"less"' '"${less}/bin/less"' + substituteInPlace bin/rivet-mkhtml-tex \ + --replace-fail '"make-plots"' \"$out/bin/make-plots\" \ + --replace-fail '"rivet-cmphistos"' \"$out/bin/rivet-cmphistos\" \ + --replace-fail 'ch_cmd = [sys.executable, os.path.join(os.path.dirname(__file__),' 'ch_cmd = [(' ''; configureFlags = [ "--with-fastjet=${fastjet}" "--with-yoda=${yoda}" - ] ++ (if lib.versions.major hepmc.version == "3" then [ - "--with-hepmc3=${hepmc}" - ] else [ - "--with-hepmc=${hepmc}" - ]); + "--with-hepmc3=${hepmc3}" + "--with-highfive=${highfive}" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix deleted file mode 100644 index b55d6869e4da..000000000000 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }: - -stdenv.mkDerivation rec { - pname = "thepeg"; - version = "2.3.0"; - - src = fetchurl { - url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; - hash = "sha256-rDWXmuicKWCMqSwVakn/aKrOeloSoMkvCgGoM9LTRXI="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ]; - - configureFlags = [ - "--with-hepmc=${hepmc2}" - "--with-rivet=${rivet}" - "--without-javagui" - ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Toolkit for High Energy Physics Event Generation"; - homepage = "https://herwig.hepforge.org/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ veprbl ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index a6ad9cbd9274..1b478e368c8d 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,6 +1,7 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab +, autoreconfHook , python , root , makeWrapper @@ -10,14 +11,17 @@ stdenv.mkDerivation rec { pname = "yoda"; - version = "1.9.10"; + version = "2.0.1"; - src = fetchurl { - url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - hash = "sha256-CnCO6dcElF0zh8xDexX/3fOCxw/lurOe0r2/g8LCjG8="; + src = fetchFromGitLab { + owner = "hepcedar"; + repo = pname; + rev = "yoda-${version}"; + hash = "sha256-WeMOd1dsy+qwiODQ7EWiLa1GNfUWXwpTtkS4EKUWF+c="; }; nativeBuildInputs = with python.pkgs; [ + autoreconfHook cython makeWrapper ]; diff --git a/pkgs/development/libraries/pico-sdk/default.nix b/pkgs/development/libraries/pico-sdk/default.nix deleted file mode 100644 index 259e47426b76..000000000000 --- a/pkgs/development/libraries/pico-sdk/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - - # 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 = "2.0.0"; - - src = fetchFromGitHub { - owner = "raspberrypi"; - repo = "pico-sdk"; - rev = finalAttrs.version; - fetchSubmodules = withSubmodules; - hash = if (withSubmodules) then - "sha256-fVSpBVmjeP5pwkSPhhSCfBaEr/FEtA82mQOe/cHFh0A=" - else - "sha256-d6mEjuG8S5jvJS4g8e90gFII3sEqUVlT2fgd9M9LUkA="; - }; - - nativeBuildInputs = [ cmake ]; - - # SDK contains libraries and build-system to develop projects for RP2040 chip - # We only need to compile pioasm binary - sourceRoot = "${finalAttrs.src.name}/tools/pioasm"; - - installPhase = '' - runHook preInstall - mkdir -p $out/lib/pico-sdk - cp -a ../../../* $out/lib/pico-sdk/ - chmod 755 $out/lib/pico-sdk/tools/pioasm/build/pioasm - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/raspberrypi/pico-sdk"; - description = "SDK provides the headers, libraries and build system necessary to write programs for the RP2040-based devices"; - license = licenses.bsd3; - maintainers = with maintainers; [ muscaln ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/piper-phonemize/default.nix b/pkgs/development/libraries/piper-phonemize/default.nix deleted file mode 100644 index b08495cae74c..000000000000 --- a/pkgs/development/libraries/piper-phonemize/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch - -# build -, cmake -, pkg-config - -# runtime -, espeak-ng -, onnxruntime -}: - -let - espeak-ng' = espeak-ng.overrideAttrs (oldAttrs: { - version = "1.52-dev"; - src = fetchFromGitHub { - owner = "rhasspy"; - repo = "espeak-ng"; - rev = "0f65aa301e0d6bae5e172cc74197d32a6182200f"; - hash = "sha256-2V0D3QO+v9OqffpNmwJQd3NIBd/IFeLkjaJ3Y0HHw7E="; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/espeak-ng/espeak-ng/commit/497c6217d696c1190c3e8b992ff7b9110eb3bedd.patch"; - hash = "sha256-KfzqnRyQfz6nuMKnsHoUzb9rn9h/Pg54mupW1Cr+Zx0="; - }) - ./espeak-mbrola.patch - ]; - }); -in -stdenv.mkDerivation rec { - pname = "piper-phonemize"; - version = "2023.11.14-4"; - - src = fetchFromGitHub { - owner = "rhasspy"; - repo = "piper-phonemize"; - rev = "refs/tags/${version}"; - hash = "sha256-pj1DZUhy3XWGn+wNtxKKDWET9gsfofEB0NZ+EEQz9q0="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - cmakeFlags = [ - "-DONNXRUNTIME_DIR=${onnxruntime.dev}" - "-DESPEAK_NG_DIR=${espeak-ng'}" - ]; - - buildInputs = [ - espeak-ng' - onnxruntime - ]; - - passthru = { - espeak-ng = espeak-ng'; - }; - - meta = with lib; { - description = "C++ library for converting text to phonemes for Piper"; - homepage = "https://github.com/rhasspy/piper-phonemize"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; - }; -} diff --git a/pkgs/development/libraries/piper-phonemize/espeak-mbrola.patch b/pkgs/development/libraries/piper-phonemize/espeak-mbrola.patch deleted file mode 100644 index 9d3f0aeb4abe..000000000000 --- a/pkgs/development/libraries/piper-phonemize/espeak-mbrola.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/libespeak-ng/mbrowrap.c b/src/libespeak-ng/mbrowrap.c -index ae137873..9015cc01 100644 ---- a/src/libespeak-ng/mbrowrap.c -+++ b/src/libespeak-ng/mbrowrap.c -@@ -206,7 +206,7 @@ static int start_mbrola(const char *voice_path) - signal(SIGTERM, SIG_IGN); - - snprintf(charbuf, sizeof(charbuf), "%g", mbr_volume); -- execlp("mbrola", "mbrola", "-e", "-v", charbuf, -+ execlp("@mbrola/bin/mbrola", "mbrola", "-e", "-v", charbuf, - voice_path, "-", "-.wav", (char *)NULL); - /* if execution reaches this point then the exec() failed */ - snprintf(mbr_errorbuf, sizeof(mbr_errorbuf), -diff --git a/src/libespeak-ng/synth_mbrola.c b/src/libespeak-ng/synth_mbrola.c -index 734631b7..46d1f13e 100644 ---- a/src/libespeak-ng/synth_mbrola.c -+++ b/src/libespeak-ng/synth_mbrola.c -@@ -85,7 +85,7 @@ espeak_ng_STATUS LoadMbrolaTable(const char *mbrola_voice, const char *phtrans, - if (!load_MBR()) - return ENS_MBROLA_NOT_FOUND; - -- sprintf(path, "%s/mbrola/%s", path_home, mbrola_voice); -+ sprintf(path, "@mbrola@/share/mbrola/voices/%s/%s", mbrola_voice, mbrola_voice); - #if PLATFORM_POSIX - // if not found, then also look in - // usr/share/mbrola/xx, /usr/share/mbrola/xx/xx, /usr/share/mbrola/voices/xx diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 2ffd9eb2bf3f..f8735c294a07 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -4,6 +4,7 @@ , python3 , meson , ninja +, elogind , systemd , enableSystemd ? true # enableSystemd=false maintained by maintainers.qyliss. , pkg-config @@ -58,7 +59,7 @@ stdenv.mkDerivation(finalAttrs: { pname = "pipewire"; - version = "1.2.3"; + version = "1.2.6"; outputs = [ "out" @@ -74,7 +75,7 @@ stdenv.mkDerivation(finalAttrs: { owner = "pipewire"; repo = "pipewire"; rev = finalAttrs.version; - sha256 = "sha256-sdbv1PqLMGlRXe42pgNW5tNtQ3tEYWCwndZQQQEM6ig="; + sha256 = "sha256-AmrbA1YQBeETLC9u9rQ2f85rG9TASvcbCZ/Xlz7ICdY="; }; patches = [ @@ -120,7 +121,7 @@ stdenv.mkDerivation(finalAttrs: { ncurses readline sbc - ] ++ (if enableSystemd then [ systemd ] else [ udev ]) + ] ++ (if enableSystemd then [ systemd ] else [ elogind udev ]) ++ (if lib.meta.availableOn stdenv.hostPlatform webrtc-audio-processing_1 then [ webrtc-audio-processing_1 ] else [ webrtc-audio-processing ]) ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform ldacbt) ldacbt ++ lib.optional zeroconfSupport avahi @@ -146,6 +147,7 @@ stdenv.mkDerivation(finalAttrs: { (lib.mesonEnable "avahi" zeroconfSupport) (lib.mesonEnable "gstreamer" true) (lib.mesonEnable "gstreamer-device-provider" true) + (lib.mesonOption "logind-provider" (if enableSystemd then "libsystemd" else "libelogind")) (lib.mesonEnable "systemd" enableSystemd) (lib.mesonEnable "systemd-system-service" enableSystemd) (lib.mesonEnable "udev" (!enableSystemd)) diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix deleted file mode 100644 index 71c0b7d47037..000000000000 --- a/pkgs/development/libraries/pixman/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, libpng -, glib /*just passthru*/ - -# for passthru.tests -, cairo -, qemu -, scribus -, tigervnc -, wlroots_0_17 -, wlroots_0_18 -, xwayland - -, gitUpdater -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "pixman"; - version = "0.43.4"; - - src = fetchurl { - urls = with finalAttrs; [ - "mirror://xorg/individual/lib/${pname}-${version}.tar.gz" - "https://cairographics.org/releases/${pname}-${version}.tar.gz" - ]; - hash = "sha256-oGJNuQGAx923n8epFRCT3DfGRtjDjT8jL3Z89kuFoiY="; - }; - - # Raise test timeout, 120s can be slightly exceeded on slower hardware - postPatch = '' - substituteInPlace test/meson.build \ - --replace-fail 'timeout : 120' 'timeout : 240' - ''; - - separateDebugInfo = !stdenv.hostPlatform.isStatic; - - nativeBuildInputs = [ meson ninja pkg-config ]; - - buildInputs = [ libpng ]; - - # Default "enabled" value attempts to enable CPU features on all - # architectures and requires used to disable them: - # https://gitlab.freedesktop.org/pixman/pixman/-/issues/88 - mesonAutoFeatures = "auto"; - mesonFlags = [ - "-Diwmmxt=disabled" - ] - # Disable until https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 is resolved - ++ lib.optional (stdenv.isAarch64 && !stdenv.cc.isGNU) "-Da64-neon=disabled"; - - preConfigure = '' - # https://gitlab.freedesktop.org/pixman/pixman/-/issues/62 - export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 184 ? 184 : NIX_BUILD_CORES)) - ''; - - enableParallelBuilding = true; - - doCheck = !stdenv.isDarwin; - - postInstall = glib.flattenInclude; - - passthru = { - tests = { - inherit cairo qemu scribus tigervnc wlroots_0_17 wlroots_0_18 xwayland; - pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - }; - }; - updateScript = gitUpdater { - url = "https://gitlab.freedesktop.org/pixman/pixman.git"; - rev-prefix = "pixman-"; - }; - }; - - meta = with lib; { - homepage = "http://pixman.org"; - description = "Low-level library for pixel manipulation"; - license = licenses.mit; - platforms = platforms.all; - pkgConfigModules = [ "pixman-1" ]; - }; -}) diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix deleted file mode 100644 index 3723a6806ad9..000000000000 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, openssl, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "pkcs11-helper"; - version = "1.30.0"; - - src = fetchFromGitHub { - owner = "OpenSC"; - repo = "pkcs11-helper"; - rev = "${pname}-${version}"; - hash = "sha256-FP3y/YHsPPqey4QfxIiC4QjruuK1K2Bg+2QL2gXDT+k="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ openssl ]; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://github.com/OpenSC/pkcs11-helper"; - license = with licenses; [ bsd3 gpl2Only ]; - description = "Library that simplifies the interaction with PKCS#11 providers"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/pkger/default.nix b/pkgs/development/libraries/pkger/default.nix deleted file mode 100644 index 37895fbeed65..000000000000 --- a/pkgs/development/libraries/pkger/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, lib - -}: - -buildGoModule rec { - pname = "pkger"; - version = "0.17.1"; - - src = fetchFromGitHub { - owner = "markbates"; - repo = "pkger"; - rev = "v${version}"; - hash = "sha256-nBuOC+uVw+hYSssgTkPRJZEBkufhQgU5D6jsZZre7Is="; - }; - - vendorHash = "sha256-9+2s84bqoNU3aaxmWYzIuFKPA3Tw9phXu5Csaaq/L60="; - - doCheck = false; - - meta = with lib; { - 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}"; - license = licenses.mit; - maintainers = with maintainers; [ flokli ]; - }; -} diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix index 99e8b3fd9d11..e0121a04e353 100644 --- a/pkgs/development/libraries/plasma-wayland-protocols/default.nix +++ b/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "plasma-wayland-protocols"; - version = "1.13.0"; + version = "1.14.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-3Ud+NS9f9uasaGKGxLIrGb9aSSG4XuWn2gK7eqEV1X4="; + hash = "sha256-GkOF7Px591ifBzgcqxHD/1H24vpLc7eGANatCWOUv4E="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/platform-folders/default.nix b/pkgs/development/libraries/platform-folders/default.nix deleted file mode 100644 index 27f4446891bd..000000000000 --- a/pkgs/development/libraries/platform-folders/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gitUpdater }: - -stdenv.mkDerivation rec { - pname = "platform-folders"; - version = "4.2.0"; - - src = fetchFromGitHub { - owner = "sago007"; - repo = "PlatformFolders"; - rev = version; - hash = "sha256-ruhAP9kjwm6pIFJ5a6oy6VE5W39bWQO3qSrT5IUtiwA="; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - ]; - - passthru.updateScript = gitUpdater { }; - - meta = with lib; { - 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 = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix deleted file mode 100644 index de93d6944c93..000000000000 --- a/pkgs/development/libraries/plib/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ fetchurl, fetchpatch, lib, stdenv, libGLU, libGL, libglut, SDL -, libXi, libSM, libXmu, libXext, libX11 }: - -stdenv.mkDerivation rec { - pname = "plib"; - version = "1.8.5"; - - src = fetchurl { - # XXX: The author doesn't use the orthodox SF way to store tarballs. - url = "https://plib.sourceforge.net/dist/${pname}-${version}.tar.gz"; - sha256 = "0cha71mflpa10vh2l7ipyqk67dq2y0k5xbafwdks03fwdyzj4ns8"; - }; - - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/p/plib/1.8.5-7/debian/patches/04_CVE-2011-4620.diff"; - sha256 = "1b7y0vqqdzd48q68ldlzw0zzqy9mg4c10a754r4hi3ldjmcplf0j"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/p/plib/1.8.5-7/debian/patches/05_CVE-2012-4552.diff"; - sha256 = "0b6cwdwii5b5vy78sbw5cw1s96l4jyzr4dk69v63pa0wwi2b5dki"; - }) - (fetchpatch { - url = "https://sources.debian.org/data/main/p/plib/1.8.5-13/debian/patches/08_CVE-2021-38714.patch"; - sha256 = "sha256-3f1wZn0QqK/hPWCg1KEzbB95IGoxBjLZoCOFlW98t5w="; - }) - ]; - - propagatedBuildInputs = [ - libGLU libGL libglut SDL - - # The following libs ought to be propagated build inputs of Mesa. - libXi libSM libXmu libXext libX11 - ]; - - meta = { - description = "Suite of portable game libraries"; - - longDescription = '' - PLIB includes sound effects, music, a complete 3D engine, font - rendering, a simple Windowing library, a game scripting - language, a GUI, networking, 3D math library and a collection of - handy utility functions. All are 100% portable across nearly - all modern computing platforms. What's more, it's all available - on line - and completely free. Each library component is fairly - independent of the others - so if you want to use SDL, GTK, - GLUT, or FLTK instead of PLIB's 'PW' windowing library, you can. - ''; - - license = lib.licenses.lgpl2Plus; - - homepage = "https://plib.sourceforge.net/"; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/plog/default.nix b/pkgs/development/libraries/plog/default.nix deleted file mode 100644 index 45b0fa49a1ab..000000000000 --- a/pkgs/development/libraries/plog/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "plog"; - version = "1.1.10"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "SergiusTheBest"; - repo = pname; - rev = version; - hash = "sha256-NZphrg9OB1FTY2ifu76AXeCyGwW2a2BkxMGjZPf4uM8="; - }; - - strictDeps = true; - nativeBuildInputs = [ - cmake - ]; - - cmakeFlags = [ - "-DPLOG_BUILD_SAMPLES=NO" - ]; - - meta = with lib; { - description = "Portable, simple and extensible C++ logging library"; - homepage = "https://github.com/SergiusTheBest/plog"; - license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ raphaelr erdnaxe ]; - }; -} diff --git a/pkgs/development/libraries/plplot/default.nix b/pkgs/development/libraries/plplot/default.nix index 6e4e47f094ed..d49b8da211d8 100644 --- a/pkgs/development/libraries/plplot/default.nix +++ b/pkgs/development/libraries/plplot/default.nix @@ -1,16 +1,21 @@ -{ lib -, stdenv -, fetchurl -, cmake -, enableWX ? false -, wxGTK32 -, Cocoa -, enableXWin ? false -, xorg +{ + lib, + stdenv, + fetchurl, + cmake, + pkg-config, + enableWX ? false, + wxGTK32, + Cocoa, + enableXWin ? false, + xorg, + enablePNG ? false, + cairo, + pango, }: stdenv.mkDerivation rec { - pname = "plplot"; + pname = "plplot"; version = "5.15.0"; src = fetchurl { @@ -18,18 +23,26 @@ stdenv.mkDerivation rec { sha256 = "0ywccb6bs1389zjfmc9zwdvdsvlpm7vg957whh6b5a96yvcf8bdr"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = lib.optional enableWX wxGTK32 - ++ lib.optional (enableWX && stdenv.isDarwin) Cocoa - ++ lib.optional enableXWin xorg.libX11; + buildInputs = + lib.optional enableWX wxGTK32 + ++ lib.optional (enableWX && stdenv.hostPlatform.isDarwin) Cocoa + ++ lib.optional enableXWin xorg.libX11 + ++ lib.optionals enablePNG [ + cairo + pango + ]; passthru = { inherit (xorg) libX11; inherit enableWX enableXWin - ; + ; }; cmakeFlags = [ @@ -41,9 +54,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cross-platform scientific graphics plotting library"; mainProgram = "pltek"; - homepage = "https://plplot.org"; + homepage = "https://plplot.org"; maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.lgpl2; + platforms = platforms.unix; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix deleted file mode 100644 index 69e86acfef23..000000000000 --- a/pkgs/development/libraries/pmix/default.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - perl, - autoconf, - automake, - removeReferencesTo, - libtool, - python3, - flex, - libevent, - targetPackages, - makeWrapper, - hwloc, - munge, - zlib, - pandoc, - gitMinimal, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "pmix"; - version = "5.0.3"; - - src = fetchFromGitHub { - repo = "openpmix"; - owner = "openpmix"; - rev = "v${finalAttrs.version}"; - hash = "sha256-5qBZj4L0Qu/RvNj8meL0OlLCdfGvBP0D916Mr+0XOCQ="; - fetchSubmodules = true; - }; - - outputs = [ "out" ] ++ lib.optionals stdenv.isLinux [ "dev" ]; - - postPatch = '' - patchShebangs ./autogen.pl - patchShebangs ./config - ''; - - nativeBuildInputs = [ - pandoc - perl - autoconf - automake - libtool - flex - gitMinimal - python3 - removeReferencesTo - makeWrapper - ]; - - buildInputs = [ - libevent - hwloc - munge - zlib - ]; - - configureFlags = [ - "--with-libevent=${lib.getDev libevent}" - "--with-libevent-libdir=${lib.getLib libevent}/lib" - "--with-munge=${munge}" - "--with-hwloc=${lib.getDev hwloc}" - "--with-hwloc-libdir=${lib.getLib hwloc}/lib" - ]; - - preConfigure = '' - ./autogen.pl - ''; - - postInstall = - '' - find $out/lib/ -name "*.la" -exec rm -f \{} \; - - moveToOutput "bin/pmix_info" "''${!outputDev}" - moveToOutput "bin/pmixcc" "''${!outputDev}" - moveToOutput "share/pmix/pmixcc-wrapper-data.txt" "''${!outputDev}" - - '' - # From some reason the Darwin build doesn't include this file, so we - # currently disable this substitution for any non-Linux platform, until a - # Darwin user will care enough about this cross platform fix. - + lib.optionalString stdenv.isLinux '' - # 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). - substituteInPlace "''${!outputDev}"/share/pmix/pmixcc-wrapper-data.txt \ - --replace-fail compiler=gcc \ - compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc - ''; - - postFixup = lib.optionalString (lib.elem "dev" finalAttrs.outputs) '' - # The build info (parameters to ./configure) are hardcoded - # into the library. This clears all references to $dev/include. - remove-references-to -t "''${!outputDev}" $(readlink -f $out/lib/libpmix.so) - - # The path to the pmixcc-wrapper-data.txt is hard coded and - # points to $out instead of dev. Use wrapper to fix paths. - wrapProgram "''${!outputDev}"/bin/pmixcc \ - --set PMIX_INCLUDEDIR "''${!outputDev}"/include \ - --set PMIX_PKGDATADIR "''${!outputDev}"/share/pmix - ''; - - enableParallelBuilding = true; - - meta = { - description = "Process Management Interface for HPC environments"; - homepage = "https://openpmix.github.io/"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - markuskowa - doronbehar - ]; - }; -}) diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix deleted file mode 100644 index dfd74e495e76..000000000000 --- a/pkgs/development/libraries/png++/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchurl, libpng -, docSupport ? true, doxygen ? null -}: -assert docSupport -> doxygen != null; - -stdenv.mkDerivation rec { - pname = "pngpp"; - version = "0.2.10"; - - src = fetchurl { - url = "mirror://savannah/pngpp/png++-${version}.tar.gz"; - sha256 = "1qgf8j25r57wjqlnzdkm8ya5x1bmj6xjvapv8f2visqnmcbg52lr"; - }; - - doCheck = true; - checkTarget = "test"; - preCheck = '' - patchShebangs test/test.sh - substituteInPlace test/test.sh --replace "exit 1" "exit 0" - ''; - - postCheck = "cat test/test.log"; - - buildInputs = lib.optional docSupport doxygen; - - propagatedBuildInputs = [ libpng ]; - - preConfigure = lib.optionalString stdenv.isDarwin '' - substituteInPlace error.hpp --replace "#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE" "#if (__clang__ || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE" - '' + '' - sed "s|\(PNGPP := .\)|PREFIX := ''${out}\n\\1|" -i Makefile - ''; - - makeFlags = lib.optional docSupport "docs"; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://www.nongnu.org/pngpp/"; - description = "C++ wrapper for libpng library"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = [ maintainers.ramkromberg ]; - }; -} diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix deleted file mode 100644 index 097edd0953c7..000000000000 --- a/pkgs/development/libraries/poco/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, pcre2, expat, sqlite, openssl, unixODBC, libmysqlclient }: - -stdenv.mkDerivation rec { - pname = "poco"; - - version = "1.13.3"; - - src = fetchFromGitHub { - owner = "pocoproject"; - repo = "poco"; - sha256 = "sha256-ryBQjzg1DyYd/LBZzjHxq8m/7ZXRSKNNGRkIII0eHK0="; - rev = "poco-${version}-release"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ unixODBC libmysqlclient ]; - propagatedBuildInputs = [ zlib pcre2 expat sqlite openssl ]; - - outputs = [ "out" "dev" ]; - - MYSQL_DIR = libmysqlclient; - MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql"; - - configureFlags = [ - "--unbundled" - ]; - - postFixup = '' - grep -rlF INTERFACE_INCLUDE_DIRECTORIES "$dev/lib/cmake/Poco" | while read -r f; do - substituteInPlace "$f" \ - --replace "$"'{_IMPORT_PREFIX}/include' "" - done - ''; - - meta = with lib; { - homepage = "https://pocoproject.org/"; - description = "Cross-platform C++ libraries with a network/internet focus"; - license = licenses.boost; - maintainers = with maintainers; [ orivej tomodachi94 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/default.nix index b663c865d233..0fb66ccc7c3d 100644 --- a/pkgs/development/libraries/polkit-qt-1/default.nix +++ b/pkgs/development/libraries/polkit-qt-1/default.nix @@ -27,7 +27,7 @@ mkDerivation rec { glib pcre polkit - ] ++ lib.optionals stdenv.isLinux [ libselinux libsepol util-linux ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libselinux libsepol util-linux ]; meta = with lib; { description = "Qt wrapper around PolKit"; diff --git a/pkgs/development/libraries/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch b/pkgs/development/libraries/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch deleted file mode 100644 index 4e38660217fe..000000000000 --- a/pkgs/development/libraries/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 7ba07551dfcd4ef9a87b8f0d9eb8b91fabcb41b3 Mon Sep 17 00:00:00 2001 -From: Jan Tojnar <jtojnar@gmail.com> -Date: Mon, 1 Nov 2021 14:17:17 +0100 -Subject: [PATCH] build: Use datarootdir in Meson-generated pkg-config files -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With datadir outside of prefix (currently unsupported by Meson[1] -but a frequent occurrence in Nixpkgs), the `datadir` entry, -in the `polkit-gobject-1` pkg-config file will be an absolute path. -This will prevent changing the base directory of `policydir` -with `--define-variable=prefix=…`, which many projects use -to install policy files to their own prefix. - -Previously, this worked without changes on Nixpkgs’s part because -the pkg-config template used by Autotools contained `@datarootdir@`, -which resolves to `$(prefix)/share`[2], taking no heed of the changed datadir. - -Similar issue can happen when a distribution package redefines datadir -like Debian does/did.[3] - -This patch changes Meson-based build system to use `$(prefix)/share` -in the generated pkg-config files, mirroring Autotools. - ---- - -1. Likely to change in the future: https://github.com/mesonbuild/meson/issues/2561#issuecomment-939253717 -2. https://www.gnu.org/prep/standards/html_node/Directory-Variables.html -3. https://blogs.gnome.org/hughsie/2014/06/16/datarootdir-v-s-datadir/ ---- - src/polkit/meson.build | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/polkit/meson.build b/src/polkit/meson.build -index 63dc1e85..c92cb70f 100644 ---- a/src/polkit/meson.build -+++ b/src/polkit/meson.build -@@ -113,9 +113,8 @@ pkg.generate( - requires: common_deps, - variables: [ - 'exec_prefix=${prefix}', -- 'datadir=' + ('${prefix}' / pk_datadir), -- 'policydir=' + ('${datadir}' / pk_actiondir), -- 'actiondir=' + ('${datadir}' / pk_actiondir), -+ 'policydir=' + ('${prefix}' / 'share' / pk_actiondir), -+ 'actiondir=' + ('${prefix}' / 'share' / pk_actiondir), - 'pkcheck_supports_uid=true', - ], - ) --- -GitLab - diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix deleted file mode 100644 index dd3c6aaea354..000000000000 --- a/pkgs/development/libraries/polkit/default.nix +++ /dev/null @@ -1,197 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, glib -, expat -, pam -, meson -, mesonEmulatorHook -, ninja -, perl -, python3 -, gettext -, duktape -, gobject-introspection -, libxslt -, docbook-xsl-nons -, dbus -, docbook_xml_dtd_412 -, gtk-doc -, coreutils -, fetchpatch -, useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal -, systemdMinimal -, elogind -, buildPackages -, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages -# A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault). -# Not yet investigated; it may be due to the "Make netgroup support optional" -# patch not updating the tests correctly yet, or doing something wrong, -# or being unrelated to that. -, doCheck ? (stdenv.isLinux && !stdenv.hostPlatform.isMusl) -}: - -let - system = "/run/current-system/sw"; - setuid = "/run/wrappers/bin"; -in -stdenv.mkDerivation rec { - pname = "polkit"; - version = "124"; - - outputs = [ "bin" "dev" "out" ]; # small man pages in $bin - - # Tarballs do not contain subprojects. - src = fetchFromGitHub { - owner = "polkit-org"; - repo = "polkit"; - rev = version; - hash = "sha256-Vc9G2xK6U1cX+xW2BnKp3oS/ACbSXS/lztbFP5oJOlM="; - }; - - patches = [ - # Allow changing base for paths in pkg-config file as before. - # https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/100 - ./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 = [ - pkg-config - ]; - - nativeBuildInputs = [ - glib - pkg-config - gettext - meson - ninja - perl - - # man pages - libxslt - docbook-xsl-nons - docbook_xml_dtd_412 - ] ++ lib.optionals withIntrospection [ - gobject-introspection - gtk-doc - ] ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ - expat - pam - dbus - duktape - ] ++ lib.optionals stdenv.isLinux [ - # On Linux, fall back to elogind when systemd support is off. - (if useSystemd then systemdMinimal else elogind) - ]; - - propagatedBuildInputs = [ - glib # in .pc Requires - ]; - - nativeCheckInputs = [ - dbus - (python3.pythonOnBuildForHost.withPackages (pp: with pp; [ - dbus-python - (python-dbusmock.overridePythonAttrs (attrs: { - # Avoid dependency cycle. - doCheck = false; - })) - ])) - ]; - - env = { - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; - PKG_CONFIG_SYSTEMD_SYSUSERS_DIR = "${placeholder "out"}/lib/sysusers.d"; - }; - - mesonFlags = [ - "--datadir=${system}/share" - "--sysconfdir=/etc" - "-Dpolkitd_user=polkituser" #TODO? <nixos> config.ids.uids.polkituser - "-Dos_type=redhat" # only affects PAM includes - "-Dintrospection=${lib.boolToString withIntrospection}" - "-Dtests=${lib.boolToString doCheck}" - "-Dgtk_doc=${lib.boolToString withIntrospection}" - "-Dman=true" - ] ++ lib.optionals stdenv.isLinux [ - "-Dsession_tracking=${if useSystemd then "libsystemd-login" else "libelogind"}" - ]; - - # HACK: We want to install policy files files to $out/share but polkit - # should read them from /run/current-system/sw/share on a NixOS system. - # Similarly for config files in /etc. - # With autotools, it was possible to override Make variables - # at install time but Meson does not support this - # so we need to convince it to install all files to a temporary - # location using DESTDIR and then move it to proper one in postInstall. - env.DESTDIR = "dest"; - - inherit doCheck; - - postPatch = '' - patchShebangs test/polkitbackend/polkitbackendjsauthoritytest-wrapper.py - - # ‘libpolkit-agent-1.so’ should call the setuid wrapper on - # NixOS. Hard-coding the path is kinda ugly. Maybe we can just - # call through $PATH, but that might have security implications. - substituteInPlace src/polkitagent/polkitagentsession.c \ - --replace 'PACKAGE_PREFIX "/lib/polkit-1/' '"${setuid}/' - substituteInPlace test/data/etc/polkit-1/rules.d/10-testing.rules \ - --replace /bin/true ${coreutils}/bin/true \ - --replace /bin/false ${coreutils}/bin/false - ''; - - postConfigure = lib.optionalString doCheck '' - # Unpacked by meson - chmod +x subprojects/mocklibc-1.0/bin/mocklibc - patchShebangs subprojects/mocklibc-1.0/bin/mocklibc - ''; - - checkPhase = '' - runHook preCheck - - # tests need access to the system bus - dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS meson test --print-errorlogs' - - runHook postCheck - ''; - - postInstall = '' - # Move stuff from DESTDIR to proper location. - # We need to be careful with the ordering to merge without conflicts. - for o in $(getAllOutputNames); do - mv "$DESTDIR/''${!o}" "''${!o}" - done - mv "$DESTDIR/etc" "$out" - mv "$DESTDIR${system}/share"/* "$out/share" - # Ensure we did not forget to install anything. - rmdir --parents --ignore-fail-on-non-empty "$DESTDIR${builtins.storeDir}" "$DESTDIR${system}/share" - ! test -e "$DESTDIR" - ''; - - meta = with lib; { - homepage = "https://github.com/polkit-org/polkit"; - description = "Toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; - license = licenses.lgpl2Plus; - platforms = platforms.linux; - badPlatforms = [ - # mandatory libpolkit-gobject shared library - lib.systems.inspect.platformPatterns.isStatic - ]; - maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); - }; -} diff --git a/pkgs/development/libraries/polkit/elogind.patch b/pkgs/development/libraries/polkit/elogind.patch deleted file mode 100644 index e7d97a7b131c..000000000000 --- a/pkgs/development/libraries/polkit/elogind.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 78e625dbafa8543b17ffaf9c42cf90c9cf9a612e Mon Sep 17 00:00:00 2001 -From: Alyssa Ross <hi@alyssa.is> -Date: Wed, 8 May 2024 11:20:42 +0200 -Subject: [PATCH] Fix configuration with elogind - -Previously, it would try to get sysusers_dir from systemd even though -systemd_dep was undefined. Determining systemd_systemdsystemunitdir -from systemd was already checking for systemd logind specifically, and -systemd_sysusers_dir is only used in the systemd logind case, so move -both of those into the systemd-logind-specific branch above. - -(cherry picked from commit b58b58af10c390ab9a11a4cfe6a4ff3d50cc0fa5) ---- - meson.build | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/meson.build b/meson.build -index 2f81c90..0888322 100644 ---- a/meson.build -+++ b/meson.build -@@ -202,6 +202,16 @@ if enable_logind - if not logind_dep.found() - logind_dep = dependency('libsystemd-login', not_found_message: 'libsystemd support requested but libsystemd or libsystemd-login library not found') - endif -+ -+ # systemd unit / service files -+ systemd_systemdsystemunitdir = get_option('systemdsystemunitdir') -+ if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login' -+ systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it') -+ # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used -+ systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') -+ endif -+ -+ systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d') - else - logind_dep = dependency('libelogind', not_found_message: 'libelogind support requested but libelogind library not found') - endif -@@ -210,16 +220,6 @@ if enable_logind - config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep)) - func = 'sd_pidfd_get_session' - config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep)) -- -- # systemd unit / service files -- systemd_systemdsystemunitdir = get_option('systemdsystemunitdir') -- if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login' -- systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it') -- # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used -- systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') -- endif -- -- systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d') - endif - config_h.set('HAVE_LIBSYSTEMD', enable_logind) - -@@ -404,7 +404,7 @@ output += ' introspection: ' + enable_introspection.to_string( - output += ' Distribution/OS: ' + os_type + '\n' - output += ' Authentication framework: ' + auth_fw + '\n' - output += ' Session tracking: ' + session_tracking + '\n' --if enable_logind -+if session_tracking == 'logind' - output += ' systemdsystemunitdir: ' + systemd_systemdsystemunitdir + '\n' - endif - output += ' polkitd user: ' + polkitd_user + ' \n' --- -2.44.0 - diff --git a/pkgs/development/libraries/polkit/system_bus.conf b/pkgs/development/libraries/polkit/system_bus.conf deleted file mode 100644 index 435b4740a2f7..000000000000 --- a/pkgs/development/libraries/polkit/system_bus.conf +++ /dev/null @@ -1,58 +0,0 @@ -<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - <!-- Our well-known bus type, do not change this --> - <type>system</type> - - <!-- Fork into daemon mode --> - <fork/> - - <!-- Enable logging to syslog --> - <syslog/> - - <!-- Only allow socket-credentials-based authentication --> - <auth>EXTERNAL</auth> - - <!-- Only listen on a local socket. (abstract=/path/to/socket - means use abstract namespace, don't really create filesystem - file; only Linux supports this. Use path=/whatever on other - systems.) --> - <listen>unix:path=/tmp/system_bus_socket</listen> - - <policy context="default"> - <!-- All users can connect to system bus --> - <allow user="*"/> - - <!-- Holes must be punched in service configuration files for - name ownership and sending method calls --> - <deny own="*"/> - <deny send_type="method_call"/> - - <!-- Signals and reply messages (method returns, errors) are allowed - by default --> - <allow send_type="signal"/> - <allow send_requested_reply="true" send_type="method_return"/> - <allow send_requested_reply="true" send_type="error"/> - - <!-- All messages may be received by default --> - <allow receive_type="method_call"/> - <allow receive_type="method_return"/> - <allow receive_type="error"/> - <allow receive_type="signal"/> - - <!-- Allow anyone to talk to the message bus --> - <allow send_destination="org.freedesktop.DBus" - send_interface="org.freedesktop.DBus" /> - <allow send_destination="org.freedesktop.DBus" - send_interface="org.freedesktop.DBus.Introspectable"/> - <!-- But disallow some specific bus services --> - <deny send_destination="org.freedesktop.DBus" - send_interface="org.freedesktop.DBus" - send_member="UpdateActivationEnvironment"/> - <deny send_destination="org.freedesktop.DBus" - send_interface="org.freedesktop.DBus.Debug.Stats"/> - <deny send_destination="org.freedesktop.DBus" - send_interface="org.freedesktop.systemd1.Activator"/> - </policy> - -</busconfig> diff --git a/pkgs/development/libraries/poly2tri-c/default.nix b/pkgs/development/libraries/poly2tri-c/default.nix deleted file mode 100644 index 0c68c2950eb2..000000000000 --- a/pkgs/development/libraries/poly2tri-c/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv -, fetchFromGitLab -, autoreconfHook -, pkg-config -, glib -}: - -stdenv.mkDerivation rec { - pname = "poly2tri-c"; - version = "0.1.0"; - - outputs = [ "bin" "out" "dev" ]; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "jtojnar"; - repo = pname; - rev = "p2tc-${version}"; - sha256 = "158vm3wqfxs22b74kqc4prlvjny38qqm3kz5wrgasmx0qciwh0g8"; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ - glib - ]; - - env.NIX_CFLAGS_COMPILE = toString [ - "--std=gnu99" - "-Wno-error" - ]; - - meta = with lib; { - description = "Library for generating, refining and rendering 2-Dimensional Constrained Delaunay Triangulations"; - mainProgram = "p2tc"; - homepage = "https://code.google.com/archive/p/poly2tri-c/"; - license = licenses.bsd3; - maintainers = with lib.maintainers; [ jtojnar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/popl/default.nix b/pkgs/development/libraries/popl/default.nix deleted file mode 100644 index b72b97172e37..000000000000 --- a/pkgs/development/libraries/popl/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -}: - -stdenvNoCC.mkDerivation rec { - pname = "popl"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "badaix"; - repo = pname; - rev = "v${version}"; - hash = "sha256-AkqFRPK0tVdalL+iyMou0LIUkPkFnYYdSqwEbFbgzqI="; - }; - - dontConfigure = true; - dontBuild = true; - dontFixup = true; - - installPhase = '' - runHook preInstall - - install -Dm644 $src/include/popl.hpp $out/include/popl.hpp - - runHook postInstall - ''; - - meta = with lib; { - description = "Header-only C++ program options parser library"; - homepage = "https://github.com/badaix/popl"; - changelog = "https://github.com/badaix/popl/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ azahi ]; - }; -} diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 2893b5e1b044..368c5a06a463 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: rec { dontWrapQtApps = true; # Workaround #54606 - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt ''; diff --git a/pkgs/development/libraries/popt/1.16-cygwin.patch b/pkgs/development/libraries/popt/1.16-cygwin.patch deleted file mode 100644 index 9c084f0b8eaa..000000000000 --- a/pkgs/development/libraries/popt/1.16-cygwin.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- origsrc/poptconfig.c 2009-05-20 08:18:07.000000000 -0500 -+++ src/poptconfig.c 2012-03-29 18:13:46.869286100 -0500 -@@ -42,7 +42,7 @@ extern int glob_pattern_p (const char *_ - /*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/ - #endif /* __LCLINT__ */ - --#if !defined(__GLIBC__) -+#if !defined(__GLIBC__) && !defined(__CYGWIN__) - /* Return nonzero if PATTERN contains any metacharacters. - Metacharacters can be quoted with backslashes if QUOTE is nonzero. */ - static int diff --git a/pkgs/development/libraries/popt/1.16-vpath.patch b/pkgs/development/libraries/popt/1.16-vpath.patch deleted file mode 100644 index 4cfa1c8fb4db..000000000000 --- a/pkgs/development/libraries/popt/1.16-vpath.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- origsrc/Doxyfile.in 2008-04-26 16:57:32.000000000 -0500 -+++ src/Doxyfile.in 2012-03-29 18:15:56.649709100 -0500 -@@ -460,14 +460,14 @@ WARN_LOGFILE = - # with spaces. - - INPUT = \ -- ./popt.c \ -- ./popt.h \ -- ./poptconfig.c \ -- ./popthelp.c \ -- ./poptint.c \ -- ./poptint.h \ -- ./poptparse.c \ -- ./system.h -+ @srcdir@/popt.c \ -+ @srcdir@/popt.h \ -+ @srcdir@/poptconfig.c \ -+ @srcdir@/popthelp.c \ -+ @srcdir@/poptint.c \ -+ @srcdir@/poptint.h \ -+ @srcdir@/poptparse.c \ -+ @srcdir@/system.h - - # If the value of the INPUT tag contains directories, you can use the - # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -@@ -658,7 +658,7 @@ HTML_HEADER = - # each generated HTML page. If it is left blank doxygen will generate a - # standard footer. - --HTML_FOOTER = footer_no_timestamp.html -+HTML_FOOTER = @srcdir@/footer_no_timestamp.html - - # The HTML_STYLESHEET tag can be used to specify a user-defined cascading - # style sheet that is used by each HTML page. It can be used to diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix deleted file mode 100644 index e97629b0dfd0..000000000000 --- a/pkgs/development/libraries/popt/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch2 -, updateAutotoolsGnuConfigScriptsHook -}: - -stdenv.mkDerivation rec { - pname = "popt"; - version = "1.19"; - - src = fetchurl { - url = "https://ftp.osuosl.org/pub/rpm/popt/releases/popt-1.x/popt-${version}.tar.gz"; - sha256 = "sha256-wlpIOPyOTByKrLi9Yg7bMISj1jv4mH/a08onWMYyQPk="; - }; - - nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; - - patches = lib.optionals stdenv.isCygwin [ - ./1.16-cygwin.patch - ./1.16-vpath.patch - ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ - # Do not require <sys/ioctl.h> - (fetchpatch2 { - url = "https://aur.archlinux.org/cgit/aur.git/plain/get-w32-console-maxcols.mingw32.patch?h=mingw-w64-popt&id=63f2cdb0de116362c49681cef20f7a8b4355e85a"; - sha256 = "zv43l1RBqNzT/JG+jQaMVFaFv+ZYPuIiAtKUDzJJBbc="; - stripLen = 1; - extraPrefix = "src/"; - }) - - # Do not try to detect setuid, it is not a thing. - (fetchpatch2 { - url = "https://github.com/rpm-software-management/popt/commit/905544c5d9767894edaf71a1e3ce5126944c5695.patch"; - sha256 = "3PmcxeiEZ/Hof0zoVFSytEXvQ8gE8Sp5UdagExPVICU="; - stripLen = 1; - extraPrefix = "src/"; - revert = true; - }) - ]; - - doCheck = false; # fails - - meta = with lib; { - homepage = "https://github.com/rpm-software-management/popt"; - description = "Command line option parsing library"; - maintainers = with maintainers; [ qyliss ]; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index a109aad97b9d..e16562d85eb1 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -5,11 +5,7 @@ , libjack2 , pkg-config , which -, AudioUnit -, AudioToolbox -, CoreAudio -, CoreServices -, Carbon }: +}: stdenv.mkDerivation rec { pname = "portaudio"; @@ -22,14 +18,14 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ pkg-config which ]; - buildInputs = [ libjack2 ] ++ lib.optionals (!stdenv.isDarwin) [ alsa-lib ]; + buildInputs = + [ libjack2 ] + ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform alsa-lib) [ alsa-lib ]; configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays -Wno-error=implicit-const-int-float-conversion"; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; - # Disable parallel build as it fails as: # make: *** No rule to make target '../../../lib/libportaudio.la', # needed by 'libportaudiocpp.la'. Stop. @@ -45,10 +41,10 @@ stdenv.mkDerivation rec { # not sure why, but all the headers seem to be installed by the make install installPhase = '' make install - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (lib.meta.availableOn stdenv.hostPlatform alsa-lib) '' # fixup .pc file to find alsa library sed -i "s|-lasound|-L${alsa-lib.out}/lib -lasound|" "$out/lib/pkgconfig/"*.pc - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' cp include/pa_mac_core.h $out/include/pa_mac_core.h ''; diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index 8e743f6a54b3..eac2a369fd0b 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ unzip cmake ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon CoreAudio CoreFoundation CoreMIDI CoreServices ]; diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix deleted file mode 100644 index 863ffed42932..000000000000 --- a/pkgs/development/libraries/ppl/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ fetchurl, fetchpatch, lib, stdenv, gmpxx, perl, gnum4 }: - -let version = "1.2"; in - -stdenv.mkDerivation { - pname = "ppl"; - inherit version; - - src = fetchurl { - url = "http://bugseng.com/products/ppl/download/ftp/releases/${version}/ppl-${version}.tar.bz2"; - sha256 = "1wgxcbgmijgk11df43aiqfzv31r3bkxmgb4yl68g21194q60nird"; - }; - - patches = [(fetchpatch { - name = "clang5-support.patch"; - url = "https://raw.githubusercontent.com/sagemath/sage/9.2/build/pkgs/ppl/patches/clang5-support.patch"; - sha256 = "1zj90hm25pkgvk4jlkfzh18ak9b98217gbidl3731fdccbw6hr87"; - })]; - - postPatch = lib.optionalString stdenv.cc.isClang '' - substituteInPlace src/PIP_Tree.cc \ - --replace "std::auto_ptr" "std::unique_ptr" - substituteInPlace src/Powerset_inlines.hh src/Pointset_Powerset_inlines.hh \ - --replace "std::mem_fun_ref" "std::mem_fn" - ''; - - nativeBuildInputs = [ perl gnum4 ]; - propagatedBuildInputs = [ gmpxx ]; - - configureFlags = [ "--disable-watchdog" ] ++ - lib.optionals stdenv.isDarwin [ - "CPPFLAGS=-fexceptions" - "--disable-ppl_lcdd" "--disable-ppl_lpsol" "--disable-ppl_pips" - ]; - - # Beware! It took ~6 hours to compile PPL and run its tests on a 1.2 GHz - # x86_64 box. Nevertheless, being a dependency of GCC, it probably ought - # to be tested. - doCheck = false; - - enableParallelBuilding = true; - - meta = { - description = "Parma Polyhedra Library"; - - longDescription = '' - The Parma Polyhedra Library (PPL) provides numerical abstractions - especially targeted at applications in the field of analysis and - verification of complex systems. These abstractions include convex - polyhedra, defined as the intersection of a finite number of (open or - closed) halfspaces, each described by a linear inequality (strict or - non-strict) with rational coefficients; some special classes of - polyhedra shapes that offer interesting complexity/precision tradeoffs; - and grids which represent regularly spaced points that satisfy a set of - linear congruence relations. The library also supports finite - powersets and products of (any kind of) polyhedra and grids and a mixed - integer linear programming problem solver using an exact-arithmetic - version of the simplex algorithm. - ''; - - homepage = "http://bugseng.com/products/ppl/"; - - license = lib.licenses.gpl3Plus; - - maintainers = [ ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/pplite/default.nix b/pkgs/development/libraries/pplite/default.nix deleted file mode 100644 index ba5c4514105d..000000000000 --- a/pkgs/development/libraries/pplite/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, lib, fetchurl, flint, gmp }: - -stdenv.mkDerivation { - pname = "pplite"; - version = "0.12"; - - src = fetchurl { - url = "https://github.com/ezaffanella/PPLite/raw/main/releases/pplite-0.12.tar.gz"; - hash = "sha256-9qulVEIZRPHV5GnVmp65nMrGrUwRGkR8i8ORbLdHb1E="; - }; - - buildInputs = [ flint gmp ]; - - meta = { - homepage = "https://github.com/ezaffanella/PPLite"; - description = "Convex polyhedra library for Abstract Interpretation"; - mainProgram = "pplite_lcdd"; - license = lib.licenses.gpl3Only; - }; -} diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix deleted file mode 100644 index 372a2940e0ae..000000000000 --- a/pkgs/development/libraries/precice/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, mpi, python3, petsc, pkg-config }: - -stdenv.mkDerivation rec { - pname = "precice"; - version = "3.1.2"; - - src = fetchFromGitHub { - owner = "precice"; - repo = "precice"; - rev = "v${version}"; - hash = "sha256-KpmcQj8cv5V5OXCMhe2KLTsqUzKWtTeQyP+zg+Y+yd0="; - }; - - cmakeFlags = [ - "-DPRECICE_PETScMapping=OFF" - "-DBUILD_SHARED_LIBS=ON" - "-DPYTHON_LIBRARIES=${python3.libPrefix}" - "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}" - ]; - - env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals stdenv.isDarwin [ "-D_GNU_SOURCE" ] - # libxml2-2.12 changed const qualifiers - ++ [ "-fpermissive" ] - ); - - nativeBuildInputs = [ cmake gcc pkg-config python3 python3.pkgs.numpy ]; - buildInputs = [ boost eigen libxml2 mpi petsc ]; - - meta = { - description = "preCICE stands for Precise Code Interaction Coupling Environment"; - homepage = "https://precice.org/"; - license = with lib.licenses; [ gpl3 ]; - maintainers = with lib.maintainers; [ Scriptkiddi ]; - mainProgram = "binprecice"; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/presage/default.nix b/pkgs/development/libraries/presage/default.nix deleted file mode 100644 index c9e44e585914..000000000000 --- a/pkgs/development/libraries/presage/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, autoreconfHook -, dbus -, doxygen -, fontconfig -, gettext -, graphviz -, help2man -, pkg-config -, sqlite -, tinyxml -, cppunit -}: - -stdenv.mkDerivation rec { - pname = "presage"; - version = "0.9.1"; - - src = fetchurl { - url = "mirror://sourceforge/presage/presage/${version}/presage-${version}.tar.gz"; - sha256 = "0rm3b3zaf6bd7hia0lr1wyvi1rrvxkn7hg05r5r1saj0a3ingmay"; - }; - - patches = [ - (fetchpatch { - name = "gcc6.patch"; - url = "https://git.alpinelinux.org/aports/plain/community/presage/gcc6.patch?id=40e2044c9ecb36eacb3a1fd043f09548d210dc01"; - sha256 = "0243nx1ygggmsly7057vndb4pkjxg9rpay5gyqqrq9jjzjzh63dj"; - }) - ./fixed-cppunit-detection.patch - # fix gcc11 build - (fetchpatch { - name = "presage-0.9.1-gcc11.patch"; - url = "https://build.opensuse.org/public/source/openSUSE:Factory/presage/presage-0.9.1-gcc11.patch?rev=3f8b4b19c99276296d6ea595cc6c431f"; - sha256 = "sha256-pLrIFXvJHRvv4x9gBIfal4Y68lByDE3XE2NZNiAXe9k="; - }) - ]; - - nativeBuildInputs = [ - autoreconfHook - doxygen - fontconfig - gettext - graphviz - help2man - pkg-config - ]; - - preBuild = '' - export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf - ''; - - buildInputs = [ - dbus - sqlite - tinyxml - ]; - - nativeCheckInputs = [ - cppunit - ]; - - doCheck = true; - - checkTarget = "check"; - - meta = with lib; { - description = "Intelligent predictive text entry system"; - homepage = "https://presage.sourceforge.io/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/libraries/presage/fixed-cppunit-detection.patch b/pkgs/development/libraries/presage/fixed-cppunit-detection.patch deleted file mode 100644 index 27238d2956d1..000000000000 --- a/pkgs/development/libraries/presage/fixed-cppunit-detection.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5624aa156c551ab2b81bb86279844397ed690653 Mon Sep 17 00:00:00 2001 -From: Matteo Vescovi <matteo.vescovi@yahoo.co.uk> -Date: Sun, 21 Jan 2018 17:17:12 +0000 -Subject: [PATCH] Fixed cppunit detection. - ---- - configure.ac | 16 +++++++++++----- - 1 file changed, 11 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a02e9f1..1538a51 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -204,10 +204,16 @@ AM_CONDITIONAL([USE_SQLITE], [test "x$use_sqlite" = "xyes"]) - dnl ================== - dnl Checks for CppUnit - dnl ================== --AM_PATH_CPPUNIT([1.9.6], -- [], -- [AC_MSG_WARN([CppUnit not found. Unit tests will not be built. CppUnit can be obtained from http://cppunit.sourceforge.net.])]) --AM_CONDITIONAL([HAVE_CPPUNIT], [test "$CPPUNIT_LIBS"]) -+PKG_CHECK_MODULES([CPPUNIT], -+ [cppunit >= 1.9], -+ [have_cppunit=yes], -+ [AM_PATH_CPPUNIT([1.9], -+ [have_cppunit=yes], -+ [AC_MSG_WARN([CppUnit not found. Unit tests will not be built. CppUnit can be obtained from http://cppunit.sourceforge.net.])]) -+ ]) -+AC_SUBST([CPPUNIT_CFLAGS]) -+AC_SUBST([CPPUNIT_LIBS]) -+AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$have_cppunit" = "xyes"]) - - - dnl ============================ -@@ -592,7 +598,7 @@ then - else - build_demo_application="no" - fi --if test "$CPPUNIT_LIBS" -+if test "x$have_cppunit" = "xyes" - then - build_unit_tests="yes" - else --- -2.31.1 - diff --git a/pkgs/development/libraries/prime-server/default.nix b/pkgs/development/libraries/prime-server/default.nix deleted file mode 100644 index 946fbb0dff18..000000000000 --- a/pkgs/development/libraries/prime-server/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, curl, zeromq, czmq, libsodium }: - -stdenv.mkDerivation rec { - pname = "prime-server"; - version = "0.7.0"; - - src = fetchFromGitHub { - owner = "kevinkreiser"; - repo = "prime_server"; - rev = version; - sha256 = "0izmmvi3pvidhlrgfpg4ccblrw6fil3ddxg5cfxsz4qbh399x83w"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ curl zeromq czmq libsodium ]; - - # https://github.com/kevinkreiser/prime_server/issues/95 - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=unused-variable" ]; - - meta = with lib; { - description = "Non-blocking (web)server API for distributed computing and SOA based on zeromq"; - homepage = "https://github.com/kevinkreiser/prime_server"; - license = licenses.bsd2; - maintainers = [ maintainers.Thra11 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/proj-datumgrid/default.nix b/pkgs/development/libraries/proj-datumgrid/default.nix deleted file mode 100644 index cfc75ce0c51a..000000000000 --- a/pkgs/development/libraries/proj-datumgrid/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "proj-datumgrid"; - version = "world-1.0"; - - src = fetchFromGitHub { - owner = "OSGeo"; - repo = "proj-datumgrid"; - rev = version; - sha256 = "132wp77fszx33wann0fjkmi1isxvsb0v9iw0gd9sxapa9h6hf3am"; - }; - - sourceRoot = "${src.name}/scripts"; - - buildPhase = '' - $CC nad2bin.c -o nad2bin - ''; - - installPhase = '' - mkdir -p $out/bin - cp nad2bin $out/bin/ - ''; - - meta = with lib; { - description = "Repository for proj datum grids"; - homepage = "https://proj4.org"; - license = licenses.mit; - maintainers = [ ]; - mainProgram = "nad2bin"; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 8fedba3ef08c..217399deb1c3 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proj"; - version = "9.4.1"; + version = "9.5.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = finalAttrs.version; - hash = "sha256-sLlG9NNHST9d0G5hV1tOGpTSv4rbUxERW3kwGC+t1iU="; + hash = "sha256-j7Bvv8F9wxrcQlquRa7Pdj5HTUJhwo8Wc1/JbULkUhM="; }; patches = [ @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { preCheck = let - libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + libPathEnvVar = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' export HOME=$TMPDIR diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/development/libraries/prometheus-cpp/default.nix deleted file mode 100644 index dda515932f2c..000000000000 --- a/pkgs/development/libraries/prometheus-cpp/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gbenchmark -, gtest -, civetweb -, zlib -, curl -}: - -stdenv.mkDerivation rec { - pname = "prometheus-cpp"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "jupp0r"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-qx6oBxd0YrUyFq+7ArnKBqOwrl5X8RS9nErhRDUJ7+8="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ gbenchmark gtest zlib curl ]; - propagatedBuildInputs = [ civetweb ]; - strictDeps = true; - - cmakeFlags = [ - "-DUSE_THIRDPARTY_LIBRARIES=OFF" - "-DBUILD_SHARED_LIBS=ON" - ]; - - outputs = [ "out" "dev" ]; - - postInstall = '' - mkdir -p $dev/lib/pkgconfig - substituteAll ${./prometheus-cpp.pc.in} $dev/lib/pkgconfig/prometheus-cpp.pc - ''; - - meta = { - description = "Prometheus Client Library for Modern C++"; - homepage = "https://github.com/jupp0r/prometheus-cpp"; - license = [ lib.licenses.mit ]; - }; - -} diff --git a/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in b/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in deleted file mode 100644 index c373f4153b55..000000000000 --- a/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@out@ -includedir=${prefix}/include -libdir=${prefix}/lib - -Name: prometheus-cpp -Description: Prometheus Client Library for Modern C++ -URL: https://github.com/jupp0r/prometheus-cpp -Version: @version@ -Cflags: -isystem${includedir} -Libs: -Wl,-rpath,${libdir} -L${libdir} -lprometheus-cpp-core -lprometheus-cpp-pull -lprometheus-cpp-push diff --git a/pkgs/development/libraries/properties-cpp/default.nix b/pkgs/development/libraries/properties-cpp/default.nix deleted file mode 100644 index 2c510afdfa15..000000000000 --- a/pkgs/development/libraries/properties-cpp/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, gitUpdater -, testers -, cmake -, pkg-config -, gtest -, doxygen -, graphviz -, lomiri -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "properties-cpp"; - version = "0.0.3"; - - src = fetchFromGitLab { - owner = "ubports"; - repo = "development/core/lib-cpp/properties-cpp"; - rev = finalAttrs.version; - hash = "sha256-C/BDEuKNMQHOjATO5aWBptjIlgfv6ykzjFAsHb6uP3Q="; - }; - - postPatch = lib.optionalString (!finalAttrs.finalPackage.doCheck) '' - sed -i "/add_subdirectory(tests)/d" CMakeLists.txt - ''; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - doxygen - graphviz - pkg-config - ]; - - buildInputs = [ - lomiri.cmake-extras - ]; - - checkInputs = [ - gtest - ]; - - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - - passthru = { - tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - updateScript = gitUpdater { }; - }; - - meta = with lib; { - homepage = "https://gitlab.com/ubports/development/core/lib-cpp/properties-cpp"; - description = "Very simple convenience library for handling properties and signals in C++11"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; - pkgConfigModules = [ - "properties-cpp" - ]; - }; -}) diff --git a/pkgs/development/libraries/protobuf/25.nix b/pkgs/development/libraries/protobuf/25.nix index a5a6a3419b5f..5a22c869ed0e 100644 --- a/pkgs/development/libraries/protobuf/25.nix +++ b/pkgs/development/libraries/protobuf/25.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix ({ - version = "25.4"; - hash = "sha256-dIouv6QaX6Tlahjrdz250DJkKjZ74/EwoQjTs3vBS/U="; + version = "25.5"; + hash = "sha256-DFLlk4T8ODo3lmvrANlkIsrmDXZHmqMPTYxDWaz56qA="; } // args) diff --git a/pkgs/development/libraries/protobuf/28.nix b/pkgs/development/libraries/protobuf/28.nix index 215182b3f45e..ae6940fa050e 100644 --- a/pkgs/development/libraries/protobuf/28.nix +++ b/pkgs/development/libraries/protobuf/28.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix ( { - version = "28.0"; - hash = "sha256-dAyXtBPeZAhmAOWbG1Phh57fqMmkH2AbDUr+8A+irJQ="; + version = "28.3"; + hash = "sha256-+bb5RxITzxuX50ItmpQhWEG1kMfvlizWTMJJzwlhhYM="; } // args ) diff --git a/pkgs/development/libraries/protobuf/3.20.nix b/pkgs/development/libraries/protobuf/3.20.nix deleted file mode 100644 index bae3550f8f05..000000000000 --- a/pkgs/development/libraries/protobuf/3.20.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3.nix ({ - version = "3.20.3"; - sha256 = "sha256-u/1Yb8+mnDzc3OwirpGESuhjkuKPgqDAvlgo3uuzbbk="; -} // args) diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix deleted file mode 100644 index 9dc7f70c2fe2..000000000000 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, autoreconfHook, zlib, gtest, buildPackages -, version, sha256 -, ... -}: - -let -mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { - pname = "protobuf"; - inherit version; - - # make sure you test also -A pythonPackages.protobuf - src = fetchFromGitHub { - owner = "protocolbuffers"; - repo = "protobuf"; - rev = "v${version}"; - inherit sha256; - }; - - postPatch = '' - rm -rf gmock - cp -r ${gtest.src}/googlemock gmock - cp -r ${gtest.src}/googletest googletest - chmod -R a+w gmock - chmod -R a+w googletest - ln -s ../googletest gmock/gtest - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace src/google/protobuf/testing/googletest.cc \ - --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' - ''; - - nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc buildProtobuf ]; - - buildInputs = [ zlib ]; - configureFlags = lib.optional (buildProtobuf != null) "--with-protoc=${buildProtobuf}/bin/protoc"; - - enableParallelBuilding = true; - - doCheck = true; - - dontDisableStatic = true; - - meta = { - description = "Google's data interchange format"; - longDescription = - ''Protocol Buffers are a way of encoding structured data in an efficient - yet extensible format. Google uses Protocol Buffers for almost all of - its internal RPC protocols and file formats. - ''; - homepage = "https://developers.google.com/protocol-buffers/"; - license = lib.licenses.bsd3; - mainProgram = "protoc"; - platforms = lib.platforms.unix; - }; -}; -in mkProtobufDerivation(if (stdenv.buildPlatform != stdenv.hostPlatform) - then (mkProtobufDerivation null buildPackages.stdenv) - else null) stdenv diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 71f8e90b774a..5e212e7f6f54 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -18,6 +18,8 @@ , grpc , enableShared ? !stdenv.hostPlatform.isStatic +, testers +, protobuf , ... }: @@ -28,11 +30,11 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; inherit hash; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/google/protobuf/testing/googletest.cc \ --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; @@ -44,8 +46,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch"; hash = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; }) - ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - ./static-executables-have-no-rpath.patch ]; nativeBuildInputs = [ @@ -74,25 +74,26 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals enableShared [ "-Dprotobuf_BUILD_SHARED_LIBS=ON" ] - # Tests fail to build on 32-bit platforms; fixed in 22.x - # https://github.com/protocolbuffers/protobuf/issues/10418 - ++ lib.optionals (stdenv.hostPlatform.is32bit && lib.versionOlder version "22") [ + ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ "-Dprotobuf_BUILD_TESTS=OFF" ]; - # FIXME: investigate. 24.x and 23.x have different errors. - # At least some of it is not reproduced on some other machine; example: - # https://hydra.nixos.org/build/235677717/nixlog/4/tail - # Also AnyTest.TestPackFromSerializationExceedsSizeLimit fails on 32-bit platforms - # https://github.com/protocolbuffers/protobuf/issues/8460 - doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "23") && !stdenv.hostPlatform.is32bit; + doCheck = + # FIXME: investigate. 24.x and 23.x have different errors. + # At least some of it is not reproduced on some other machine; example: + # https://hydra.nixos.org/build/235677717/nixlog/4/tail + !(stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "23") + # Tests fail to build on 32-bit platforms; fixed in 22.x + # https://github.com/protocolbuffers/protobuf/issues/10418 + # Also AnyTest.TestPackFromSerializationExceedsSizeLimit fails on 32-bit platforms + # https://github.com/protocolbuffers/protobuf/issues/8460 + && !stdenv.hostPlatform.is32bit; passthru = { tests = { - pythonProtobuf = python3.pkgs.protobuf.override (_: { - protobuf = finalAttrs.finalPackage; - }); + pythonProtobuf = python3.pkgs.protobuf; inherit grpc; + version = testers.testVersion { package = protobuf; }; }; inherit abseil-cpp; @@ -108,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; platforms = lib.platforms.all; homepage = "https://protobuf.dev/"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "protoc"; }; }) diff --git a/pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch b/pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch deleted file mode 100644 index cd2474e14590..000000000000 --- a/pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/cmake/install.cmake b/cmake/install.cmake -index 26a55be8b..b6823c3f9 100644 ---- a/cmake/install.cmake -+++ b/cmake/install.cmake -@@ -32,13 +32,6 @@ if (protobuf_BUILD_PROTOC_BINARIES) - install(TARGETS protoc EXPORT protobuf-targets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc - BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc) -- if (UNIX AND NOT APPLE) -- set_property(TARGET protoc -- PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") -- elseif (APPLE) -- set_property(TARGET protoc -- PROPERTY INSTALL_RPATH "@loader_path/../lib") -- endif() - endif (protobuf_BUILD_PROTOC_BINARIES) - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/protobuf.pc ${CMAKE_CURRENT_BINARY_DIR}/protobuf-lite.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") diff --git a/pkgs/development/libraries/protobufc/default.nix b/pkgs/development/libraries/protobufc/default.nix deleted file mode 100644 index 5a3972527550..000000000000 --- a/pkgs/development/libraries/protobufc/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config -, protobuf -, zlib -, buildPackages -}: - -stdenv.mkDerivation rec { - pname = "protobuf-c"; - version = "1.5.0"; - - src = fetchFromGitHub { - owner = "protobuf-c"; - repo = "protobuf-c"; - rev = "refs/tags/v${version}"; - hash = "sha256-Dkpcc7ZfvAIVY91trRiHuiRFcUGUbQxbheYKTBcq80I="; - }; - - outputs = [ "out" "dev" "lib" ]; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - buildInputs = [ protobuf zlib ]; - - env.PROTOC = lib.getExe buildPackages.protobuf; - - meta = with lib; { - homepage = "https://github.com/protobuf-c/protobuf-c/"; - description = "C bindings for Google's Protocol Buffers"; - license = licenses.bsd2; - platforms = platforms.all; - maintainers = with maintainers; [ nickcao ]; - }; -} diff --git a/pkgs/development/libraries/protolock/default.nix b/pkgs/development/libraries/protolock/default.nix deleted file mode 100644 index f8483eb5d68b..000000000000 --- a/pkgs/development/libraries/protolock/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "protolock"; - version = "0.17.0"; - - src = fetchFromGitHub { - owner = "nilslice"; - repo = "protolock"; - rev = "v${version}"; - sha256 = "sha256-+7kU4nCBwCA6mnjFrejPrIILYUSfYpq13d+0MmNZoBg="; - }; - - vendorHash = "sha256-lJhtZQ9S7/h3dSZ72O2l8oHHf3tEmGKC2PPAms09Itc="; - - postInstall = '' - rm $out/bin/plugin* - ''; - - meta = with lib; { - description = "Protocol Buffer companion tool. Track your .proto files and prevent changes to messages and services which impact API compatibility. https://protolock.dev"; - mainProgram = "protolock"; - homepage = "https://github.com/nilslice/protolock"; - license = licenses.bsd3; - maintainers = with maintainers; [ groodt ]; - }; -} diff --git a/pkgs/development/libraries/prototypejs/default.nix b/pkgs/development/libraries/prototypejs/default.nix deleted file mode 100644 index b3ded7025e99..000000000000 --- a/pkgs/development/libraries/prototypejs/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchurl, ... }: -let - version = "1.7.3.0"; -in fetchurl { - name = "prototype-${version}.js"; - url = "https://ajax.googleapis.com/ajax/libs/prototype/${version}/prototype.js"; - sha256 = "0q43vvrsb22h4jvavs1gk3v4ps61yx9k85b5n6q9mxivhmxprg26"; - - meta = with lib; { - description = "Foundation for ambitious web user interfaces"; - longDescription = '' - Prototype takes the complexity out of client-side web - programming. Built to solve real-world problems, it adds - useful extensions to the browser scripting environment - and provides elegant APIs around the clumsy interfaces - of Ajax and the Document Object Model. - ''; - homepage = "http://prototypejs.org/"; - downloadPage = "http://prototypejs.org/download/"; - license = licenses.mit; - maintainers = with maintainers; [ das_j ]; - }; -} diff --git a/pkgs/development/libraries/protozero/default.nix b/pkgs/development/libraries/protozero/default.nix deleted file mode 100644 index ed3e67fdeed1..000000000000 --- a/pkgs/development/libraries/protozero/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "protozero"; - version = "1.7.1"; - - src = fetchFromGitHub { - owner = "mapbox"; - repo = "protozero"; - rev = "v${version}"; - sha256 = "sha256-R8lGewsEOxPNbKlkIeiM4yIwUcTzi2Dm0+xJ2WrBTBQ="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Minimalistic protocol buffer decoder and encoder in C++"; - homepage = "https://github.com/mapbox/protozero"; - license = with licenses; [ bsd2 asl20 ]; - changelog = [ - "https://github.com/mapbox/protozero/releases/tag/v${version}" - "https://github.com/mapbox/protozero/blob/v${version}/CHANGELOG.md" - ]; - maintainers = with maintainers; teams.geospatial.members ++ [ das-g ]; - }; -} diff --git a/pkgs/development/libraries/pslib/default.nix b/pkgs/development/libraries/pslib/default.nix deleted file mode 100644 index 02a8fcde91ef..000000000000 --- a/pkgs/development/libraries/pslib/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, zlib, libpng, libjpeg, giflib, libtiff -}: - -stdenv.mkDerivation rec { - pname = "pslib"; - version = "0.4.8"; - - src = fetchurl { - name = "${pname}-snixource-${version}.tar.gz"; - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-gaWNvBLuUUy0o+HWCOyG6KmzxDrYCY6PV3WbA/jjH64="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ zlib libpng libjpeg giflib libtiff ]; - - env = lib.optionalAttrs stdenv.isDarwin { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; - - doCheck = true; - - outputs = [ "out" "dev" "doc" ]; - - installPhase = '' - mkdir -p $out/lib - for path in *.dylib *.so *.so.* *.o *.o.*; do - mv $path $out/lib/ - done - mkdir -p $dev/include - mv ../include/libps $dev/include - if test -d nix-support; then - mv nix-support $dev - fi - mkdir -p $doc/share/doc/${pname} - cp -r ../doc/. $doc/share/doc/${pname} - ''; - - meta = with lib; { - description = "C-library for generating multi page PostScript documents"; - homepage = "https://pslib.sourceforge.net/"; - changelog = - "https://sourceforge.net/p/pslib/git/ci/master/tree/pslib/ChangeLog"; - license = licenses.gpl2; - maintainers = with maintainers; [ ShamrockLee ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/psol/default.nix b/pkgs/development/libraries/psol/default.nix deleted file mode 100644 index b6b9d0bac513..000000000000 --- a/pkgs/development/libraries/psol/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenvNoCC, fetchurl }: - -stdenvNoCC.mkDerivation rec { - pname = "psol"; - version = "1.13.35.2"; # Latest stable, 2018-02-05 - - src = fetchurl { - url = "https://dl.google.com/dl/page-speed/psol/${version}-x64.tar.gz"; - hash = "sha256-3zujyPxU4ThF0KHap6bj2YMSbCORKFG7+Lo1vmRqQ08="; - }; - - installPhase = '' - runHook preInstall - - mkdir -p $out - mv include lib -t $out - - runHook postInstall - ''; - - meta = with lib; { - description = "PageSpeed Optimization Libraries"; - homepage = "https://developers.google.com/speed/pagespeed/psol"; - license = licenses.asl20; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - # WARNING: This only works with Linux because the pre-built PSOL binary is only supplied for Linux. - # TODO: Build PSOL from source to support more platforms. - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix deleted file mode 100644 index 18e6bc3b0f7d..000000000000 --- a/pkgs/development/libraries/psqlodbc/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchurl, postgresql, openssl -, withLibiodbc ? false, libiodbc -, withUnixODBC ? true, unixODBC -}: - -assert lib.xor withLibiodbc withUnixODBC; - -stdenv.mkDerivation rec { - pname = "psqlodbc"; - version = "16.00.0000"; - - src = fetchurl { - url = "https://ftp.postgresql.org/pub/odbc/versions.old/src/${pname}-${version}.tar.gz"; - hash = "sha256-r9iS+J0uzujT87IxTxvVvy0CIBhyxuNDHlwxCW7KTIs="; - }; - - buildInputs = [ - postgresql - openssl - ] - ++ lib.optional withLibiodbc libiodbc - ++ lib.optional withUnixODBC unixODBC; - - passthru = lib.optionalAttrs withUnixODBC { - fancyName = "PostgreSQL"; - driver = "lib/psqlodbcw.so"; - }; - - configureFlags = [ - "--with-libpq=${lib.getDev postgresql}/bin/pg_config" - ] - ++ lib.optional withLibiodbc "--with-iodbc=${libiodbc}"; - - meta = with lib; { - homepage = "https://odbc.postgresql.org/"; - description = "ODBC driver for PostgreSQL"; - license = licenses.lgpl2; - platforms = platforms.unix; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/pstreams/default.nix b/pkgs/development/libraries/pstreams/default.nix deleted file mode 100644 index 2baa3b355023..000000000000 --- a/pkgs/development/libraries/pstreams/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv -, fetchgit -}: - -stdenv.mkDerivation rec { - pname = "PStreams"; - version = "1.0.1"; - - src = fetchgit { - url = "https://git.code.sf.net/p/pstreams/code"; - rev = let dot2Underscore = lib.strings.stringAsChars (c: if c == "." then "_" else c); - in "RELEASE_${dot2Underscore version}"; - sha256 = "0r8aj0nh5mkf8cvnzl8bdy4nm7i74vs83axxfimcd74kjfn0irys"; - }; - - makeFlags = [ "prefix=${placeholder "out"}" ]; - dontBuild = true; - doCheck = true; - - preInstall = "rm INSTALL"; - # `make install` fails on case-insensitive file systems (e.g. APFS by - # default) because this target exists - - meta = with lib; { - description = "POSIX Process Control in C++"; - longDescription = '' - PStreams allows you to run another program from your C++ application and - to transfer data between the two programs similar to shell pipelines. - - In the simplest case, a PStreams class is like a C++ wrapper for the - POSIX.2 functions popen(3) and pclose(3), using C++ iostreams instead of - C's stdio library. - ''; - homepage = "https://pstreams.sourceforge.net/"; - downloadPage = "https://pstreams.sourceforge.net/download/"; - maintainers = with maintainers; [ arthur ]; - license = licenses.boost; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix deleted file mode 100644 index 930217dab39c..000000000000 --- a/pkgs/development/libraries/ptex/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, zlib, cmake }: - -stdenv.mkDerivation rec -{ - pname = "ptex"; - version = "2.4.2"; - - src = fetchFromGitHub { - owner = "wdas"; - repo = "ptex"; - rev = "v${version}"; - sha256 = "sha256-PR1ld9rXmL6BK4llznAsD5PNvi3anFMz2i9NDsG95DQ="; - }; - - outputs = [ "bin" "dev" "out" "lib" ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib ]; - - meta = with lib; { - description = "Per-Face Texture Mapping for Production Rendering"; - mainProgram = "ptxinfo"; - homepage = "http://ptex.us/"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = [ maintainers.guibou ]; - }; -} diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix deleted file mode 100644 index bbbc5017c410..000000000000 --- a/pkgs/development/libraries/pth/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "pth"; - version = "2.0.7"; - - src = fetchurl { - url = "mirror://gnu/pth/pth-${version}.tar.gz"; - sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"; - }; - - preConfigure = lib.optionalString stdenv.isAarch32 '' - configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9") - '' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' - configureFlagsArray+=("ac_cv_check_sjlj=ssjlj") - ''; - - # Fails parallel build due to missing dependency on autogenrated - # 'pth_p.h' file: - # ./shtool scpp -o pth_p.h ... - # ./libtool --mode=compile --quiet gcc -c -I. -O2 -pipe pth_uctx.c - # pth_uctx.c:31:10: fatal error: pth_p.h: No such file - enableParallelBuilding = false; - - meta = with lib; { - description = "GNU Portable Threads library"; - mainProgram = "pth-config"; - homepage = "https://www.gnu.org/software/pth"; - license = licenses.lgpl21Plus; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix deleted file mode 100644 index fc0eb1dfa291..000000000000 --- a/pkgs/development/libraries/pugixml/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, check, validatePkgConfig, shared ? false }: - -stdenv.mkDerivation rec { - pname = "pugixml"; - version = "1.14"; - - src = fetchFromGitHub { - owner = "zeux"; - repo = "pugixml"; - rev = "v${version}"; - sha256 = "sha256-xxtJr9VeBPxpxWJaDGO635+Ch7ZS6t6VyuXEio+ogZ8="; - }; - - outputs = [ "out" ] ++ lib.optionals shared [ "dev" ]; - - nativeBuildInputs = [ cmake validatePkgConfig ]; - - cmakeFlags = [ - "-DBUILD_TESTS=ON" - "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" - ]; - - nativeCheckInputs = [ check ]; - - preConfigure = '' - # Enable long long support (required for filezilla) - sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp - ''; - - meta = with lib; { - description = "Light-weight, simple and fast XML parser for C++ with XPath support"; - homepage = "https://pugixml.org"; - license = licenses.mit; - maintainers = with maintainers; [ pSub ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix deleted file mode 100644 index fa0718b993fc..000000000000 --- a/pkgs/development/libraries/pupnp/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ fetchFromGitHub -, lib -, stdenv -, cmake -}: - -stdenv.mkDerivation rec { - pname = "libupnp"; - version = "1.14.18"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "pupnp"; - repo = "pupnp"; - rev = "release-${version}"; - sha256 = "sha256-eQKtZioZjI53J1fsoer032pzqebbK5IabOnkAXwBPos="; - }; - - nativeBuildInputs = [ - cmake - ]; - - postPatch = '' - # Wrong paths in pkg-config file generated by CMake - # https://github.com/pupnp/pupnp/pull/205/files#r588946478 - substituteInPlace CMakeLists.txt \ - --replace '\''${exec_prefix}/' "" \ - --replace '\''${prefix}/' "" - ''; - - meta = { - description = "Open source UPnP development kit for Linux"; - - longDescription = '' - The Linux SDK for UPnP Devices (libupnp) provides developers - with an API and open source code for building control points, - devices, and bridges that are compliant with Version 1.0 of the - UPnP Device Architecture Specification. - ''; - - license = lib.licenses.bsd3; - - homepage = "https://pupnp.github.io/pupnp/"; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/pxlib/default.nix b/pkgs/development/libraries/pxlib/default.nix deleted file mode 100644 index 6b31ef3257dd..000000000000 --- a/pkgs/development/libraries/pxlib/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, fetchurl, intltool }: - -stdenv.mkDerivation rec { - pname = "pxlib"; - version = "0.6.8"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1yafwz4z5h30hqvk51wpgbjlmq9f2z2znvfim87ydrfrqfjmi6sz"; - }; - - nativeBuildInputs = [ intltool ]; - - meta = with lib; { - description = "Library to read and write Paradox files"; - homepage = "https://pxlib.sourceforge.net/"; - license = licenses.gpl2; - platforms = platforms.all; - maintainers = [ maintainers.winpat ]; - }; -} diff --git a/pkgs/development/libraries/py3c/default.nix b/pkgs/development/libraries/py3c/default.nix deleted file mode 100644 index 32e7d1249118..000000000000 --- a/pkgs/development/libraries/py3c/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python311 }: - -stdenv.mkDerivation rec { - pname = "py3c"; - version = "1.4"; - - src = fetchFromGitHub { - owner = "encukou"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-v8+0J56sZVbGdBlOotObUa10/zFMTvfXdMYRsKhyZaY="; - }; - - postPatch = '' - # clang and gcc-11 complain about 'register' keywords used by - # python-2.7. Let's avoid blanket -Werror. - substituteInPlace test/setup.py \ - --replace "'-Werror', " "" - ''; - - makeFlags = [ - "prefix=${placeholder "out"}" - ]; - - doCheck = true; - - nativeCheckInputs = [ - python311 - ]; - - checkTarget = "test-python"; - - meta = with lib; { - homepage = "https://github.com/encukou/py3c"; - description = "Python 2/3 compatibility layer for C extensions"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/libraries/pystring/default.nix b/pkgs/development/libraries/pystring/default.nix deleted file mode 100644 index 4ed250439803..000000000000 --- a/pkgs/development/libraries/pystring/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake }: - -stdenv.mkDerivation rec { - pname = "pystring"; - version = "1.1.3"; - - src = fetchFromGitHub { - owner = "imageworks"; - repo = "pystring"; - rev = "v${version}"; - sha256 = "1w31pjiyshqgk6zd6m3ab3xfgb0ribi77r6fwrry2aw8w1adjknf"; - }; - - patches = [ - (fetchpatch { - name = "pystring-cmake-configuration.patch"; - url = "https://github.com/imageworks/pystring/commit/4f653fc35421129eae8a2c424901ca7170059370.patch"; - sha256 = "1hynzz76ff4vvmi6kwixsmjswkpyj6s4vv05d7nw0zscj4cdp8k3"; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - doCheck = true; - - meta = with lib; { - homepage = "https://github.com/imageworks/pystring/"; - description = "Collection of C++ functions which match the interface and behavior of python's string class methods using std::string"; - license = licenses.bsd3; - maintainers = [ maintainers.rytone ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index 10db26a03984..4f417c5e15e3 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -44,11 +44,14 @@ stdenv.mkDerivation (finalAttrs: { cp -r ./extensions $out/include/PythonQt ''; - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id \ $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.dylib \ $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.dylib - install_name_tool -id \ + install_name_tool -change \ + libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.3.dylib \ + $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.3.dylib \ + -id \ $out/lib/libPythonQt_QtAll-Qt5-Python3.${python3.sourceVersion.minor}.dylib \ $out/lib/libPythonQt_QtAll-Qt5-Python3.${python3.sourceVersion.minor}.dylib ''; diff --git a/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix index e178dd5240d6..877292493dba 100644 --- a/pkgs/development/libraries/qcoro/default.nix +++ b/pkgs/development/libraries/qcoro/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "qcoro"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "danvratil"; repo = "qcoro"; rev = "v${version}"; - sha256 = "sha256-C4k5ClsMwzxURAQBGV5WBwlRr5N0SvUMJobZ+ROT0EY="; + sha256 = "sha256-teRuWtNR8r/MHZhqphazr7Jmn43qsHGv9eXOGrhSND0="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix deleted file mode 100644 index a7f1bc271155..000000000000 --- a/pkgs/development/libraries/qhull/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fixDarwinDylibNames }: - -stdenv.mkDerivation rec { - pname = "qhull"; - version = "2020.2"; - - src = fetchFromGitHub { - owner = "qhull"; - repo = "qhull"; - rev = version; - sha256 = "sha256-djUO3qzY8ch29AuhY3Bn1ajxWZ4/W70icWVrxWRAxRc="; - }; - - nativeBuildInputs = [ cmake ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - - meta = with lib; { - homepage = "http://www.qhull.org/"; - description = "Compute the convex hull, Delaunay triangulation, Voronoi diagram and more"; - license = licenses.qhull; - platforms = platforms.unix; - maintainers = with maintainers; [ orivej ]; - }; -} diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 0984912463e1..6ba9418a6e20 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { buildInputs = [ qtbase qtmultimedia - ] ++ lib.optional stdenv.isDarwin utmp; + ] ++ lib.optional stdenv.hostPlatform.isDarwin utmp; patches = [ # Changes required to make it compatible with lomiri-terminal-app diff --git a/pkgs/development/libraries/qoi/default.nix b/pkgs/development/libraries/qoi/default.nix deleted file mode 100644 index c5d527aa3ec5..000000000000 --- a/pkgs/development/libraries/qoi/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ fetchFromGitHub -, lib -, stb -, stdenv -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "qoi"; - version = "unstable-2023-08-10"; # no upstream version yet. - - src = fetchFromGitHub { - owner = "phoboslab"; - repo = "qoi"; - rev = "19b3b4087b66963a3699ee45f05ec9ef205d7c0e"; - hash = "sha256-E1hMtjMuDS2zma2s5hlHby/sroRGhtyZm9gLQ+VztsM="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ stb ]; - - buildPhase = '' - runHook preBuild - - make CFLAGS_CONV="-I${stb}/include/stb -O3" qoiconv - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - # Conversion utility for images->qoi. Not usually needed for development. - mkdir -p ${placeholder "out"}/bin - install qoiconv ${placeholder "out"}/bin - - # The actual single-header implementation. Nothing to compile, just install. - mkdir -p ${placeholder "dev"}/include/ - install qoi.h ${placeholder "dev"}/include - - runHook postInstall - ''; - - meta = with lib; { - description = "'Quite OK Image Format' for fast, lossless image compression"; - mainProgram = "qoiconv"; - homepage = "https://qoiformat.org/"; - license = licenses.mit; - maintainers = with maintainers; [ hzeller ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix deleted file mode 100644 index 4a9e520f2a97..000000000000 --- a/pkgs/development/libraries/qpdf/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, libjpeg -, perl -, zlib - -# for passthru.tests -, cups-filters -, pdfmixtool -, pdfslicer -, python3 -, testers -, versionCheckHook -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "qpdf"; - version = "11.9.1"; - - src = fetchFromGitHub { - owner = "qpdf"; - repo = "qpdf"; - 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 - # qtest needs to know where the source code is - substituteInPlace CMakeLists.txt --replace "run-qtest" "run-qtest --top $src --code $src --bin $out" - ''; - - doCheck = true; - - passthru.tests = { - pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; - inherit (python3.pkgs) pikepdf; - inherit - cups-filters - pdfmixtool - pdfslicer - ; - }; - - meta = { - homepage = "https://qpdf.sourceforge.io/"; - description = "C++ library and set of programs that inspect and manipulate the structure of PDF files"; - 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 237751c6f8f2..8a52fce9c74a 100644 --- a/pkgs/development/libraries/qrencode/default.nix +++ b/pkgs/development/libraries/qrencode/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libiconv libpng ] - ++ lib.optionals stdenv.isDarwin [ libobjc ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc ]; nativeCheckInputs = [ SDL2 ]; diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix deleted file mode 100644 index 282b926b2e77..000000000000 --- a/pkgs/development/libraries/qrupdate/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, lapack -, which -, gfortran -, blas -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "qrupdate"; - version = "1.1.5"; - - src = fetchFromGitHub { - owner = "mpimd-csc"; - repo = "qrupdate-ng"; - rev = "v${finalAttrs.version}"; - hash = "sha256-dHxLPrN00wwozagY2JyfZkD3sKUD2+BcnbjNgZepzFg="; - }; - - cmakeFlags = assert (blas.isILP64 == lapack.isILP64); [ - "-DCMAKE_Fortran_FLAGS=${toString ([ - "-std=legacy" - ] ++ lib.optionals blas.isILP64 [ - # If another application intends to use qrupdate compiled with blas with - # 64 bit support, it should add this to it's FFLAGS as well. See (e.g): - # https://savannah.gnu.org/bugs/?50339 - "-fdefault-integer-8" - ])}" - ]; - - # https://github.com/mpimd-csc/qrupdate-ng/issues/4 - patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - ./disable-zch1dn-test.patch - ]; - - doCheck = true; - - nativeBuildInputs = [ - cmake - which - gfortran - ]; - buildInputs = [ - blas - lapack - ]; - - meta = with lib; { - description = "Library for fast updating of qr and cholesky decompositions"; - homepage = "https://github.com/mpimd-csc/qrupdate-ng"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ doronbehar ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/qrupdate/disable-zch1dn-test.patch b/pkgs/development/libraries/qrupdate/disable-zch1dn-test.patch deleted file mode 100644 index 9953f7b43d7a..000000000000 --- a/pkgs/development/libraries/qrupdate/disable-zch1dn-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 69adf65643d0..0d8df9b316b8 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -10,7 +10,7 @@ }: let - stdenv' = if stdenv.isDarwin then + stdenv' = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv @@ -28,10 +28,10 @@ in stdenv'.mkDerivation rec { buildInputs = [ qtbase ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ qtmacextras ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ]; nativeBuildInputs = [ unzip qmake ] - ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; # Make sure that libqscintilla2.so is available in $out/lib since it is expected # by some packages such as sqlitebrowser @@ -71,6 +71,6 @@ in stdenv'.mkDerivation rec { maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; # ld: library not found for -lcups - broken = stdenv.isDarwin && lib.versionAtLeast qtbase.version "6"; + broken = stdenv.hostPlatform.isDarwin && lib.versionAtLeast qtbase.version "6"; }; } diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index af2f431dfb40..b94be6d893d2 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -28,15 +28,7 @@ let qtCompatVersion = srcs.qtbase.version; patches = { - qtbase = lib.optionals stdenv.isDarwin [ - ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch - - # Patch framework detection to support X.framework/X.tbd, - # extending the current support for X.framework/X. - ./qtbase.patch.d/0012-qtbase-tbd-frameworks.patch - - ./qtbase.patch.d/0014-aarch64-darwin.patch - ] ++ [ + qtbase = [ ./qtbase.patch.d/0003-qtbase-mkspecs.patch ./qtbase.patch.d/0004-qtbase-replace-libdir.patch ./qtbase.patch.d/0005-qtbase-cmake.patch @@ -63,7 +55,7 @@ let hash = "sha256-UEvIXzn387f9BAeBdhheStD/4M7en+rmqX8C6gstl6k="; }) ]; - qtmultimedia = lib.optionals stdenv.isDarwin [ + qtmultimedia = lib.optionals stdenv.hostPlatform.isDarwin [ # build patch for qtmultimedia with xcode 15 (fetchpatch { url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3f509180/qt5/qt5-qtmultimedia-xcode15.patch"; @@ -184,7 +176,7 @@ let # See: https://bugreports.qt.io/browse/QTBUG-124375 # Backport of: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=a766045f65f934df3b5f1aa63bc86fbb3e003a09 ./qtwebengine-ninja-1.12.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-mac-dont-set-dsymutil-path.patch ./qtwebengine-darwin-checks.patch @@ -218,7 +210,7 @@ let ./qtwebkit.patch ./qtwebkit-icu68.patch ./qtwebkit-cstdint.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./qtwebkit-darwin-no-readline.patch ./qtwebkit-darwin-no-qos-classes.patch ]; @@ -248,25 +240,17 @@ let inherit (srcs.qtbase) src version; patches = patches.qtbase; inherit bison cups harfbuzz libGL; - withGtk3 = !stdenv.isDarwin; inherit dconf gtk3; + withGtk3 = !stdenv.hostPlatform.isDarwin; inherit dconf gtk3; inherit developerBuild decryptSslTraffic; - inherit (darwin.apple_sdk_11_0.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth - CoreLocation CoreServices DiskArbitration Foundation OpenGL MetalKit IOKit; - libobjc = darwin.apple_sdk_11_0.objc4; - xcbuild = darwin.apple_sdk_11_0.xcodebuild; }; qt3d = callPackage ../modules/qt3d.nix {}; qtcharts = callPackage ../modules/qtcharts.nix {}; - qtconnectivity = callPackage ../modules/qtconnectivity.nix { - inherit (darwin.apple_sdk_11_0.frameworks) IOBluetooth; - }; + qtconnectivity = callPackage ../modules/qtconnectivity.nix { }; qtdatavis3d = callPackage ../modules/qtdatavis3d.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; - qtgamepad = callPackage ../modules/qtgamepad.nix { - inherit (darwin.apple_sdk_11_0.frameworks) GameController; - }; + qtgamepad = callPackage ../modules/qtgamepad.nix { }; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtimageformats = callPackage ../modules/qtimageformats.nix {}; qtlocation = callPackage ../modules/qtlocation.nix {}; @@ -278,9 +262,7 @@ let qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {}; qtpim = callPackage ../modules/qtpim.nix {}; qtpositioning = callPackage ../modules/qtpositioning.nix {}; - qtpurchasing = callPackage ../modules/qtpurchasing.nix { - inherit (darwin.apple_sdk_11_0.frameworks) Foundation StoreKit; - }; + qtpurchasing = callPackage ../modules/qtpurchasing.nix { }; qtquick1 = null; qtquick3d = callPackage ../modules/qtquick3d.nix { }; qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; @@ -309,28 +291,15 @@ let # starting with clang 16. Patches are available upstream that can be backported. # Because the first error is non-trivial to fix and suppressing it risks future breakage, # clang is pinned to clang 15. That also makes fixing the second set of errors unnecessary. - stdenv = - let stdenv' = if stdenv.cc.isClang then overrideLibcxx llvmPackages_15.stdenv else stdenv; - in if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; + stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_15.stdenv else stdenv; inherit (srcs.qtwebengine) version; + inherit (darwin) bootstrap_cmds; python = python3; - 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 - ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication - MediaPlayer MediaAccessibility SecurityInterface Vision CoreML OpenDirectory Accelerate; - libobjc = darwin.apple_sdk_11_0.objc4; }; qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; - qtwebkit = callPackage ../modules/qtwebkit.nix { - inherit (darwin) ICU; - inherit (darwin.apple_sdk_11_0.frameworks) OpenGL; - }; + qtwebkit = callPackage ../modules/qtwebkit.nix { }; qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; - qtwebview = callPackage ../modules/qtwebview.nix { - inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation WebKit; - }; + qtwebview = callPackage ../modules/qtwebview.nix { }; qtx11extras = callPackage ../modules/qtx11extras.nix {}; qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; @@ -343,8 +312,8 @@ let qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebsockets qtwebview qtx11extras qtxmlpatterns qtlottie qtdatavis3d - ] ++ lib.optional (!stdenv.isDarwin) qtwayland - ++ lib.optional (stdenv.isDarwin) qtmacextras); + ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) qtwayland + ++ lib.optional (stdenv.hostPlatform.isDarwin) qtmacextras); qmake = callPackage ({ qtbase }: makeSetupHook { name = "qmake-hook"; @@ -360,7 +329,7 @@ let wrapQtAppsHook = callPackage ({ makeBinaryWrapper, qtbase, qtwayland }: makeSetupHook { name = "wrap-qt5-apps-hook"; propagatedBuildInputs = [ qtbase.dev makeBinaryWrapper ] - ++ lib.optional stdenv.isLinux qtwayland.dev; + ++ lib.optional stdenv.hostPlatform.isLinux qtwayland.dev; } ../hooks/wrap-qt-apps-hook.sh) { }; }; diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch deleted file mode 100644 index 9d2a47c7c348..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch +++ /dev/null @@ -1,485 +0,0 @@ -From 5ec1d1009d9943f20e82ffc087deabb31d447e75 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc> -Date: Fri, 3 Apr 2020 21:07:58 +0200 -Subject: [PATCH 01/11] qtbase-mkspecs-mac - ---- - mkspecs/common/mac.conf | 2 +- - mkspecs/features/mac/default_post.prf | 206 -------------------------- - mkspecs/features/mac/default_pre.prf | 58 -------- - mkspecs/features/mac/sdk.mk | 25 ---- - mkspecs/features/mac/sdk.prf | 61 -------- - 5 files changed, 1 insertion(+), 351 deletions(-) - delete mode 100644 mkspecs/features/mac/sdk.mk - delete mode 100644 mkspecs/features/mac/sdk.prf - -diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 61bea952b2..9909dae726 100644 ---- a/mkspecs/common/mac.conf -+++ b/mkspecs/common/mac.conf -@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ - - QMAKE_FIX_RPATH = install_name_tool -id - --QMAKE_LFLAGS_RPATH = -Wl,-rpath, -+QMAKE_LFLAGS_RPATH = - QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip - - QMAKE_LFLAGS_REL_RPATH = -diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index abc6d82ade..59b94fe5b6 100644 ---- a/mkspecs/features/mac/default_post.prf -+++ b/mkspecs/features/mac/default_post.prf -@@ -1,9 +1,5 @@ - load(default_post) - --# Recompute SDK version in case the user set it explicitly --sdk_version = $$QMAKE_MAC_SDK_VERSION --QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) -- - contains(TEMPLATE, .*app) { - !macx-xcode:if(isEmpty(BUILDS)|build_pass) { - # Detect changes to the platform SDK -@@ -16,36 +12,6 @@ contains(TEMPLATE, .*app) { - QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) - } - -- # Detect incompatible SDK versions -- -- isEmpty(QT_MAC_SDK_VERSION_MIN): \ -- QT_MAC_SDK_VERSION_MIN = $$QT_MAC_SDK_VERSION -- -- !versionAtLeast(QMAKE_MAC_SDK_VERSION, $$QT_MAC_SDK_VERSION_MIN): \ -- warning("Qt requires at least version $$QT_MAC_SDK_VERSION_MIN of the platform SDK," \ -- "you're building against version $${QMAKE_MAC_SDK_VERSION}. Please upgrade.") -- -- !isEmpty(QT_MAC_SDK_VERSION_MAX) { -- # For Qt developers only -- !isEmpty($$list($$(QT_MAC_SDK_NO_VERSION_CHECK))): \ -- CONFIG += sdk_no_version_check -- -- QMAKE_MAC_SDK_MAJOR_VERSION = $$replace(QMAKE_MAC_SDK_VERSION, "(\\d+)(\\.\\d+)(\\.\\d+)?", \\1) -- -- !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_VERSION, $$QT_MAC_SDK_VERSION_MAX) { -- warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_MAX"\ -- "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_VERSION}.") -- warning("This is an unsupported configuration. You may experience build issues," \ -- "and by using") -- warning("the $$QMAKE_MAC_SDK_VERSION SDK you are opting in to new features" \ -- "that Qt has not been prepared for.") -- -- warning("Please downgrade the SDK you use to build your app to version" \ -- "$$QT_MAC_SDK_VERSION_MAX, or configure") -- warning("with CONFIG+=sdk_no_version_check when running qmake" \ -- "to silence this warning.") -- } -- } - } - - !no_objective_c:CONFIG += objective_c -@@ -73,230 +39,6 @@ qt { - } - } - --# Add the same default rpaths as Xcode does for new projects. --# This is especially important for iOS/tvOS/watchOS where no other option is possible. --!no_default_rpath { -- uikit: QMAKE_RPATHDIR += @executable_path/Frameworks -- else: QMAKE_RPATHDIR += @executable_path/../Frameworks -- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks --} -- --# Don't pass -headerpad_max_install_names when using Bitcode. --# In that case the linker emits a warning stating that the flag is ignored when --# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962). --# Using this flag is also unnecessary in practice on UIKit platforms since they --# are sandboxed, and only UIKit platforms support bitcode to begin with. --!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD -- --app_extension_api_only { -- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION --} -- --macos { -- !isEmpty(QMAKE_APPLE_DEVICE_ARCHS) { -- # If the user has requested a specific set of architectures, -- # build all of those by default, but limited to only those. -- CONFIG -= only_active_arch -- } else { -- # Otherwise allow building all of the architectures available -- # in Qt, but only build the active arch (unless the user has -- # manually overridden this via CONFIG -= only_active_arch). -- QMAKE_APPLE_DEVICE_ARCHS = $$QT_ARCHS -- } --} -- --macx-xcode { -- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO -- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ -- qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO -- else: \ -- qmake_pkginfo_typeinfo.value = "????" -- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo -- -- bundle_version = $$VERSION -- isEmpty(bundle_version): bundle_version = 1.0.0 -- -- l = $$split(bundle_version, '.') 0 0 # make sure there are at least three -- VER_MAJ = $$member(l, 0, 0) -- VER_MIN = $$member(l, 1, 1) -- VER_PAT = $$member(l, 2, 2) -- unset(l) -- -- qmake_full_version.name = QMAKE_FULL_VERSION -- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} -- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version -- -- qmake_short_version.name = QMAKE_SHORT_VERSION -- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} -- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version -- -- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { -- debug_information_format.name = DEBUG_INFORMATION_FORMAT -- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT -- debug_information_format.build = debug -- QMAKE_MAC_XCODE_SETTINGS += debug_information_format -- } -- -- QMAKE_XCODE_ARCHS = -- -- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" -- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_device -- -- simulator { -- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" -- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_simulator -- } -- -- only_active_arch.name = ONLY_ACTIVE_ARCH -- only_active_arch.value = YES -- only_active_arch.build = debug -- QMAKE_MAC_XCODE_SETTINGS += only_active_arch --} else { -- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS -- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS -- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS -- -- single_arch: VALID_ARCHS = $$first(VALID_ARCHS) -- -- macos { -- only_active_arch: DEFAULT_ARCHS = $$system("uname -m") -- else: DEFAULT_ARCHS = $$VALID_ARCHS -- } -- -- ARCHS = $(filter $(EXPORT_VALID_ARCHS), \ -- $(if $(ARCHS), $(ARCHS), \ -- $(if $(EXPORT_DEFAULT_ARCHS), $(EXPORT_DEFAULT_ARCHS), \ -- $(EXPORT_VALID_ARCHS)))) -- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ARCHS), $(EXPORT_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) -- -- QMAKE_EXTRA_VARIABLES += VALID_ARCHS DEFAULT_ARCHS ARCHS ARCH_ARGS -- -- arch_flags = $(EXPORT_ARCH_ARGS) -- -- QMAKE_CFLAGS += $$arch_flags -- QMAKE_CXXFLAGS += $$arch_flags -- QMAKE_LFLAGS += $$arch_flags -- -- QMAKE_PCH_ARCHS = $$VALID_ARCHS -- -- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET -- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET -- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET -- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET -- -- # If we're doing a simulator and device build, device and simulator -- # architectures use different paths and flags for the sysroot and -- # deployment target switch, so we must multiplex them across multiple -- # architectures using -Xarch. Otherwise we fall back to the simple path. -- # This is not strictly necessary, but results in cleaner command lines -- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit -- # individual rules to a different set of architecture(s) from the overall -- # build (such as machtest in QtCore). -- simulator:device { -- QMAKE_XARCH_CFLAGS = -- QMAKE_XARCH_LFLAGS = -- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS -- -- for (arch, VALID_ARCHS) { -- contains(VALID_SIMULATOR_ARCHS, $$arch) { -- sdk = $$simulator.sdk -- version_identifier = $$simulator.deployment_identifier -- } else { -- sdk = $$device.sdk -- version_identifier = $$device.deployment_identifier -- } -- -- version_min_flags = \ -- -Xarch_$${arch} \ -- -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \ -- -Xarch_$${arch} \ -- -isysroot$$xcodeSDKInfo(Path, $$sdk) -- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ -- -Xarch_$${arch} \ -- -isysroot$$xcodeSDKInfo(Path, $$sdk) -- -- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) -- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) -- -- QMAKE_EXTRA_VARIABLES += \ -- QMAKE_XARCH_CFLAGS_$${arch} \ -- QMAKE_XARCH_LFLAGS_$${arch} -- } -- -- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) -- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) -- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) -- } else { -- simulator { -- version_identifier = $$simulator.deployment_identifier -- sysroot_path = $$xcodeSDKInfo(Path, $$simulator.sdk) -- } else { -- version_identifier = $$device.deployment_identifier -- sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk) -- } -- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_CFLAGS += -isysroot $$sysroot_path $$version_min_flag -- QMAKE_CXXFLAGS += -isysroot $$sysroot_path $$version_min_flag -- QMAKE_LFLAGS += -isysroot $$sysroot_path $$version_min_flag -- } -- -- # Enable precompiled headers for multiple architectures -- QMAKE_CFLAGS_USE_PRECOMPILE = -- for (arch, VALID_ARCHS) { -- icc_pch_style: \ -- use_flag = "-pch-use " -- else: \ -- use_flag = -include -- -- # Only use Xarch with multi-arch, as the option confuses ccache -- count(VALID_ARCHS, 1, greaterThan): \ -- QMAKE_CFLAGS_USE_PRECOMPILE += \ -- -Xarch_$${arch} -- -- QMAKE_CFLAGS_USE_PRECOMPILE += \ -- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} -- } -- icc_pch_style { -- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} -- QMAKE_CFLAGS_USE_PRECOMPILE = -- } else { -- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- } -- -- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} --} -- --!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) { -- # Explicit SDK version has been set, respect that -- QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version --} -- --cache(QMAKE_XCODE_DEVELOPER_PATH, stash) --!isEmpty(QMAKE_XCODE_VERSION): \ -- cache(QMAKE_XCODE_VERSION, stash) -- --QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() -- --xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER --xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX --isEmpty(xcode_product_bundle_identifier_setting.value): \ -- xcode_product_bundle_identifier_setting.value = "com.yourcompany" --xcode_product_bundle_target = $$QMAKE_BUNDLE --isEmpty(xcode_product_bundle_target): \ -- xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} --xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" --QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting -- - !macx-xcode { - generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS - generate_xcode_project.target = xcodeproj -diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index 2c91ba6679..a6ab233825 100644 ---- a/mkspecs/features/mac/default_pre.prf -+++ b/mkspecs/features/mac/default_pre.prf -@@ -21,61 +21,3 @@ macos { - } - - load(default_pre) -- --isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { -- # Get path of Xcode's Developer directory -- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") -- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ -- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") -- -- # Make sure Xcode path is valid -- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ -- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") --} -- --isEmpty(QMAKE_XCODEBUILD_PATH): \ -- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") -- --!isEmpty(QMAKE_XCODEBUILD_PATH) { -- # Make sure Xcode is set up properly -- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ -- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") -- -- isEmpty(QMAKE_XCODE_VERSION) { -- # Extract Xcode version using xcodebuild -- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") -- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) -- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") -- unset(xcode_version) -- } --} -- --isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { -- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist -- exists($$QMAKE_XCODE_PREFERENCES_FILE): \ -- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null") -- -- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \ -- cache(QMAKE_TARGET_BUNDLE_PREFIX) --} -- --QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon -- --# Make the default debug info format for static debug builds --# DWARF instead of DWARF with dSYM. This cuts down build times --# for application debug builds significantly, as Xcode doesn't --# have to pull out all the DWARF info from the Qt static libs --# and put it into a dSYM file. We don't need that dSYM file in --# the first place, since the information is available in the --# object files inside the archives (static libraries). --macx-xcode:qtConfig(static): \ -- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf -- --# This variable is used by the xcode_dynamic_library_suffix --# feature, which allows Xcode to choose the Qt libraries to link to --# at build time, depending on the current Xcode SDK and configuration. --QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX -- --xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP --xcode_copy_phase_strip_setting.value = NO --QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk ---- a/mkspecs/features/mac/sdk.mk -+++ b/mkspecs/features/mac/sdk.mk -@@ -1,27 +0,0 @@ -- --ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) -- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>/dev/null -- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) -- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) -- # We don't want to complain about out of date SDK unless the target needs to be remade. -- # This covers use-cases such as running 'make check' after moving the build to a -- # computer without Xcode or with a different Xcode version. -- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0) -- ifeq ($(TARGET_UP_TO_DATE),0) -- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.) -- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) -- else ifneq ($(CURRENT_MAC_SDK_VERSION),) -- $(info The $(EXPORT_QMAKE_MAC_SDK) platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) -- else -- $(info Unknown error resolving current platform SDK version.) -- endif -- $(info This requires a fresh build of your project. Please wipe the build directory) -- ifneq ($(EXPORT__QMAKE_STASH_),) -- $(info including the qmake cache in $(EXPORT__QMAKE_STASH_)) -- endif -- $(error ^) -- endif -- endif --endif -diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -deleted file mode 100644 -index 3a9c2778bb..0000000000 ---- a/mkspecs/features/mac/sdk.prf -+++ /dev/null -@@ -1,61 +0,0 @@ -- --isEmpty(QMAKE_MAC_SDK): \ -- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") -- --contains(QMAKE_MAC_SDK, .*/.*): \ -- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)") -- --defineReplace(xcodeSDKInfo) { -- info = $$1 -- equals(info, "Path"): \ -- infoarg = --show-sdk-path -- equals(info, "PlatformPath"): \ -- infoarg = --show-sdk-platform-path -- equals(info, "SDKVersion"): \ -- infoarg = --show-sdk-version -- sdk = $$2 -- isEmpty(sdk): \ -- sdk = $$QMAKE_MAC_SDK -- -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { -- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null") -- # --show-sdk-platform-path won't work for Command Line Tools; this is fine -- # only used by the XCTest backend to testlib -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \ -- error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg") -- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) -- } -- -- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) --} -- --QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) --QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) --QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) -- --isEmpty(QMAKE_EXPORT_INCDIR_OPENGL) { -- QMAKE_EXPORT_INCDIR_OPENGL = $$QMAKE_INCDIR_OPENGL -- sysrootified = -- for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val -- QMAKE_INCDIR_OPENGL = $$sysrootified --} -- --QMAKESPEC_NAME = $$basename(QMAKESPEC) -- --# Resolve SDK version of various tools --for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) { -- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool} -- !isEmpty($$tool_variable) { -- $$tool = $$eval($$tool_variable) -- next() -- } -- -- value = $$eval($$tool) -- isEmpty(value): next() -- -- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null") -- isEmpty(sysrooted): next() -- -- $$tool = $$sysrooted $$member(value, 1, -1) -- cache($$tool_variable, set stash, $$tool) --} -diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf -deleted file mode 100644 -index df191eb13c..0000000000 ---- a/mkspecs/features/mac/toolchain.prf -+++ /dev/null -@@ -1,5 +0,0 @@ --# Ensure that we process sdk.prf first, as it will update QMAKE_CXX, --# which the default path determination uses. --sdk: load(sdk) -- --load(toolchain) diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch deleted file mode 100644 index 8a5939978a6b..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 84dbbfebd4..615bfed124 100644 ---- a/src/gui/Qt5GuiConfigExtras.cmake.in -+++ b/src/gui/Qt5GuiConfigExtras.cmake.in -@@ -119,6 +119,10 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs) - if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") - set(Qt5Gui_${_cmake_lib_name}_LIBRARY) - endif() -+ set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}.tbd") -+ if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") -+ set(Qt5Gui_${_cmake_lib_name}_LIBRARY) -+ endif() - !!ENDIF - if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY) - # The above find_library call doesn\'t work for finding diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch deleted file mode 100644 index f0809f8f9a3f..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch +++ /dev/null @@ -1,275 +0,0 @@ -From abc52460201bc5c7603505bb187138b0c59291aa Mon Sep 17 00:00:00 2001 -From: Mushroom <mushroom@watchingyour.tv> -Date: Sun, 20 Dec 2020 00:11:41 +0000 -Subject: [PATCH] [QtBase] Split macOS platforms by architecture - -Currently macOS only has one platform, which forces the default arch to -x86_64. This patch splits the platforms by architecture, and defaults to -the same as the host. - -This stops M1-based macs from compiling x64 binaries by default, -instead making them compile native binaries. - -[ChangeLog][QtBase][Platform Specific Changes][OS X] Split macOS -platforms so it doesn't default to the x64 architecture every time - -Change-Id: I34891b107bb24f68371df1c8f087eb0ad5b5dd95 ---- - configure | 9 +++- - .../clang-macx-desktop.conf} | 8 ++-- - mkspecs/common/macx.conf | 1 - - .../Info.plist.app | 0 - .../Info.plist.dSYM.in | 0 - .../Info.plist.disable_highdpi | 0 - .../Info.plist.lib | 0 - mkspecs/macx-clang-arm64/qmake.conf | 7 ++++ - .../qplatformdefs.h | 0 - mkspecs/macx-clang-x64/Info.plist.app | 24 +++++++++++ - mkspecs/macx-clang-x64/Info.plist.dSYM.in | 18 ++++++++ - .../macx-clang-x64/Info.plist.disable_highdpi | 8 ++++ - mkspecs/macx-clang-x64/Info.plist.lib | 20 +++++++++ - mkspecs/macx-clang-x64/qmake.conf | 7 ++++ - mkspecs/macx-clang-x64/qplatformdefs.h | 41 +++++++++++++++++++ - 15 files changed, 137 insertions(+), 6 deletions(-) - rename mkspecs/{macx-clang/qmake.conf => common/clang-macx-desktop.conf} (83%) - rename mkspecs/{macx-clang => macx-clang-arm64}/Info.plist.app (100%) - rename mkspecs/{macx-clang => macx-clang-arm64}/Info.plist.dSYM.in (100%) - rename mkspecs/{macx-clang => macx-clang-arm64}/Info.plist.disable_highdpi (100%) - rename mkspecs/{macx-clang => macx-clang-arm64}/Info.plist.lib (100%) - create mode 100644 mkspecs/macx-clang-arm64/qmake.conf - rename mkspecs/{macx-clang => macx-clang-arm64}/qplatformdefs.h (100%) - create mode 100644 mkspecs/macx-clang-x64/Info.plist.app - create mode 100644 mkspecs/macx-clang-x64/Info.plist.dSYM.in - create mode 100644 mkspecs/macx-clang-x64/Info.plist.disable_highdpi - create mode 100644 mkspecs/macx-clang-x64/Info.plist.lib - create mode 100644 mkspecs/macx-clang-x64/qmake.conf - create mode 100644 mkspecs/macx-clang-x64/qplatformdefs.h - -diff --git a/configure b/configure -index b6c9b462f24..a86f2ceaa5b 100755 ---- a/configure -+++ b/configure -@@ -556,7 +556,14 @@ PLATFORM_NOTES= - if [ -z "$PLATFORM" ]; then - case "$UNAME_SYSTEM:$UNAME_RELEASE" in - Darwin:*) -- PLATFORM=macx-clang -+ case "$UNAME_MACHINE" in -+ arm64) -+ PLATFORM=macx-clang-arm64 -+ ;; -+ *) -+ PLATFORM=macx-clang-x64 -+ ;; -+ esac - ;; - AIX:*) - #PLATFORM=aix-g++ -diff --git a/mkspecs/macx-clang/qmake.conf b/mkspecs/common/clang-macx-desktop.conf -similarity index 83% -rename from mkspecs/macx-clang/qmake.conf -rename to mkspecs/common/clang-macx-desktop.conf -index 0cf1f31b60d..042319a2aa3 100644 ---- a/mkspecs/macx-clang/qmake.conf -+++ b/mkspecs/common/clang-macx-desktop.conf -@@ -24,9 +24,9 @@ QMAKE_LIBS_X11 = -lX11 -lXext -lm - QMAKE_LIBDIR_X11 = /opt/X11/lib - QMAKE_INCDIR_X11 = /opt/X11/include - --include(../common/macx.conf) --include(../common/gcc-base-mac.conf) --include(../common/clang.conf) --include(../common/clang-mac.conf) -+include(macx.conf) -+include(gcc-base-mac.conf) -+include(clang.conf) -+include(clang-mac.conf) - - load(qt_config) -diff --git a/mkspecs/macx-clang/Info.plist.app b/mkspecs/macx-clang-arm64/Info.plist.app -similarity index 100% -rename from mkspecs/macx-clang/Info.plist.app -rename to mkspecs/macx-clang-arm64/Info.plist.app -diff --git a/mkspecs/macx-clang/Info.plist.dSYM.in b/mkspecs/macx-clang-arm64/Info.plist.dSYM.in -similarity index 100% -rename from mkspecs/macx-clang/Info.plist.dSYM.in -rename to mkspecs/macx-clang-arm64/Info.plist.dSYM.in -diff --git a/mkspecs/macx-clang/Info.plist.disable_highdpi b/mkspecs/macx-clang-arm64/Info.plist.disable_highdpi -similarity index 100% -rename from mkspecs/macx-clang/Info.plist.disable_highdpi -rename to mkspecs/macx-clang-arm64/Info.plist.disable_highdpi -diff --git a/mkspecs/macx-clang/Info.plist.lib b/mkspecs/macx-clang-arm64/Info.plist.lib -similarity index 100% -rename from mkspecs/macx-clang/Info.plist.lib -rename to mkspecs/macx-clang-arm64/Info.plist.lib -diff --git a/mkspecs/macx-clang-arm64/qmake.conf b/mkspecs/macx-clang-arm64/qmake.conf -new file mode 100644 -index 00000000000..0cc2361e696 ---- /dev/null -+++ b/mkspecs/macx-clang-arm64/qmake.conf -@@ -0,0 +1,7 @@ -+# -+# qmake configuration for Clang on OS X (arm64) -+# -+ -+QMAKE_APPLE_DEVICE_ARCHS=arm64 -+ -+include(../common/clang-macx-desktop.conf) -diff --git a/mkspecs/macx-clang/qplatformdefs.h b/mkspecs/macx-clang-arm64/qplatformdefs.h -similarity index 100% -rename from mkspecs/macx-clang/qplatformdefs.h -rename to mkspecs/macx-clang-arm64/qplatformdefs.h -diff --git a/mkspecs/macx-clang-x64/Info.plist.app b/mkspecs/macx-clang-x64/Info.plist.app -new file mode 100644 -index 00000000000..fa592af0897 ---- /dev/null -+++ b/mkspecs/macx-clang-x64/Info.plist.app -@@ -0,0 +1,24 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -+<plist version="1.0"> -+<dict> -+ <key>CFBundleExecutable</key> -+ <string>${EXECUTABLE_NAME}</string> -+ <key>CFBundleIconFile</key> -+ <string>${ASSETCATALOG_COMPILER_APPICON_NAME}</string> -+ <key>CFBundleIdentifier</key> -+ <string>${PRODUCT_BUNDLE_IDENTIFIER}</string> -+ <key>CFBundlePackageType</key> -+ <string>APPL</string> -+ <key>CFBundleSignature</key> -+ <string>${QMAKE_PKGINFO_TYPEINFO}</string> -+ <key>LSMinimumSystemVersion</key> -+ <string>${MACOSX_DEPLOYMENT_TARGET}</string> -+ <key>NOTE</key> -+ <string>This file was generated by Qt/QMake.</string> -+ <key>NSPrincipalClass</key> -+ <string>NSApplication</string> -+ <key>NSSupportsAutomaticGraphicsSwitching</key> -+ <true/> -+</dict> -+</plist> -diff --git a/mkspecs/macx-clang-x64/Info.plist.dSYM.in b/mkspecs/macx-clang-x64/Info.plist.dSYM.in -new file mode 100644 -index 00000000000..a8c8d0d4fb5 ---- /dev/null -+++ b/mkspecs/macx-clang-x64/Info.plist.dSYM.in -@@ -0,0 +1,18 @@ -+<?xml version=\"1.0\" encoding=\"UTF-8\"?> -+<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\"> -+<plist version=\"1.0\"> -+ <dict> -+ <key>CFBundleIdentifier</key> -+ <string>com.apple.xcode.dsym.$${BUNDLEIDENTIFIER}</string> -+ <key>CFBundlePackageType</key> -+ <string>dSYM</string> -+ <key>CFBundleSignature</key> -+ <string>????</string> -+!!IF !isEmpty(VERSION) -+ <key>CFBundleShortVersionString</key> -+ <string>$${VER_MAJ}.$${VER_MIN}</string> -+ <key>CFBundleVersion</key> -+ <string>$${VER_MAJ}.$${VER_MIN}.$${VER_PAT}</string> -+!!ENDIF -+ </dict> -+</plist> -diff --git a/mkspecs/macx-clang-x64/Info.plist.disable_highdpi b/mkspecs/macx-clang-x64/Info.plist.disable_highdpi -new file mode 100644 -index 00000000000..a9b89888ad4 ---- /dev/null -+++ b/mkspecs/macx-clang-x64/Info.plist.disable_highdpi -@@ -0,0 +1,8 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -+<plist version="1.0"> -+<dict> -+ <key>NSHighResolutionCapable</key> -+ <string>NO</string> -+</dict> -+</plist> -diff --git a/mkspecs/macx-clang-x64/Info.plist.lib b/mkspecs/macx-clang-x64/Info.plist.lib -new file mode 100644 -index 00000000000..34752ec40d9 ---- /dev/null -+++ b/mkspecs/macx-clang-x64/Info.plist.lib -@@ -0,0 +1,20 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -+<plist version="1.0"> -+<dict> -+ <key>CFBundleExecutable</key> -+ <string>${EXECUTABLE_NAME}</string> -+ <key>CFBundleIdentifier</key> -+ <string>${PRODUCT_BUNDLE_IDENTIFIER}</string> -+ <key>CFBundlePackageType</key> -+ <string>FMWK</string> -+ <key>CFBundleShortVersionString</key> -+ <string>${QMAKE_SHORT_VERSION}</string> -+ <key>CFBundleSignature</key> -+ <string>${QMAKE_PKGINFO_TYPEINFO}</string> -+ <key>CFBundleVersion</key> -+ <string>${QMAKE_FULL_VERSION}</string> -+ <key>NOTE</key> -+ <string>Please, do NOT change this file -- It was generated by Qt/QMake.</string> -+</dict> -+</plist> -diff --git a/mkspecs/macx-clang-x64/qmake.conf b/mkspecs/macx-clang-x64/qmake.conf -new file mode 100644 -index 00000000000..1ac373b53b4 ---- /dev/null -+++ b/mkspecs/macx-clang-x64/qmake.conf -@@ -0,0 +1,7 @@ -+# -+# qmake configuration for Clang on OS X (arm64) -+# -+ -+QMAKE_APPLE_DEVICE_ARCHS=x86_64 -+ -+include(../common/clang-macx-desktop.conf) -diff --git a/mkspecs/macx-clang-x64/qplatformdefs.h b/mkspecs/macx-clang-x64/qplatformdefs.h -new file mode 100644 -index 00000000000..063491dd900 ---- /dev/null -+++ b/mkspecs/macx-clang-x64/qplatformdefs.h -@@ -0,0 +1,41 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2016 The Qt Company Ltd. -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the qmake spec of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#include "../common/mac/qplatformdefs.h" -+ diff --git a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index 96c3621307c6..7949a05a61b8 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -1,202 +1,202 @@ { "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", - "rev": "9bf4d03e2515f7c454647d54542330b6e90f8191", - "sha256": "1w1lq332q270vld7sz0xqpa0f7mvi5gizycfsx9zz9c73qy4idlp" + "rev": "84b2eae328fdff5d633af0a9563272c93f6ec074", + "sha256": "0h5jmm02xyfzq9pkba3xl3kw6710azj1plshm4v9brgjq524vkpj" }, "qtactiveqt": { "url": "https://invent.kde.org/qt/qt/qtactiveqt.git", - "rev": "91bfd21f86c450b129ac2dde9d33b32e140d8a0c", - "sha256": "06fbiggjq1c1z1wgx63ir8rj1ppd1c046xwz4nzsrf1pi8dqcyl7" + "rev": "8f8e9fcc03f506cf27b0bb090c5120eaa15c6e19", + "sha256": "10ihi1m6ysqd5mig4bmiv2hq9qs06j9xrc6sx0iy1w0ihnhclzyx" }, "qtandroidextras": { "url": "https://invent.kde.org/qt/qt/qtandroidextras.git", - "rev": "197a7e05cda87a4645f30c8ef5044b342442ebd1", - "sha256": "0j5al7h2gy67cb2lj4yymdsidr1dcvvahqfysbdl2lwz3zzpdql1" + "rev": "305cce86cb62c0d2cac1209dd50f15caf2f21c2a", + "sha256": "1rdlxzr7ld6i0j3xwxwxhf467z46zaycynqhim4mfhi76fi309vz" }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "2b9835f5c9bcfe3105b60a8dd33c1db7d8611378", - "sha256": "1yms1r42yps06bg8gjbzb5y7x03ks11vg97s2j7r1aplp7kjf7wm" + "rev": "ab13e81917207959785ad0185a3a9974e552a7f5", + "sha256": "0p6xymjvhwiqvyh7pn1zkglfjnmhb3c0xfb62xnsd0rbp0xaw7ws" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", - "rev": "7315c48bcec88014e78165bbda54abfcd557e0af", - "sha256": "043lbxkaw53qah9ny4nbpp8g7q4rq9x2k21vkprk7nim66d6pmy3" + "rev": "0c97aae7dc242ac0710e09397672ad878761157a", + "sha256": "1zivl0gzbbfxa2hq4vwi2yc6k9hl9aln4aw96hd9jb7pw2n03crx" }, "qtconnectivity": { "url": "https://invent.kde.org/qt/qt/qtconnectivity.git", - "rev": "99f30db37c63447c59d5fac15bc8feb832a7fd04", - "sha256": "09v76kb7fx7bq4vplyk3cf7il3a6f9p673z1l28nrv4w308bhqfy" + "rev": "f2a9c5d1235d88cc26f2cfa348a037b65e31a5ae", + "sha256": "0r9c7f9g4l4dik1kvs239ahm8hx20kfj2lcd946fn71cz0fqri9z" }, "qtdatavis3d": { "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git", - "rev": "79cd0fb6cafcd42e4037ae1363fda3bc2cec934a", - "sha256": "19y33v3l4crzrk7qf5qhx7phxkiax14c2q4xjd1klw7n333d43cq" + "rev": "e5c03e4431eed6c4654c20fb2d2a20485cff522d", + "sha256": "0s6b3sclyyq6hmmn535ksdkckfw02yqbqzrd502p7fb2cakynhjc" }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "50c8def854806485d66aabcf6918e8b987032e55", - "sha256": "0qvw72w0m1q4yg4l35rh7ydqgp35xqfwpq0pc7q5578n1xspihhn" + "rev": "310c124dac82d711ab15309a9cb0b9d95db9ea8f", + "sha256": "082hp6brizrfr90vla315kjri4ym9vkd1qnjlyx8f9p3sgdmplyn" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", - "rev": "bc4503b8b70f4cd435d6e64a9e6c623ca44b9fcd", - "sha256": "0pvimmw5c6gh6xi2iblzyikgaw7cr8gqjdvyappcahjpalxxsjbw" + "rev": "7c8712064b1aefcf880bbc82138e96bd4909b36e", + "sha256": "06n8mn0y0sjq2znd0k2m5slaf2rcj4p8pxwayp7pyfig3mj9qf34" }, "qtgamepad": { "url": "https://invent.kde.org/qt/qt/qtgamepad.git", - "rev": "b1c2f272f69e222a532485e6f820776c220b3535", - "sha256": "1zga6sa901g0fpqyjlyj73s2f94yjm0z3599gngnlvvd7jsnlgnv" + "rev": "e9109dadba5c8f2419af67139106b4c30f90332e", + "sha256": "1xk42wbpl83rywjscw0kriw4vap2xv41p17pcr8pagrhijnhhjpg" }, "qtgraphicaleffects": { "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git", - "rev": "2c39e673d6c15a84dcc7882d3772fa04cc79f9ed", - "sha256": "177xkhi3syx6r3my5rly5bncgjfhdvgrhf6fw5ajqplik6yln4pq" + "rev": "4d3d395d14d4a956ac5b30afa859321c1e1934e4", + "sha256": "1xwq8n2h5079xm1zbyg7nk4ln53pmbjp0s35a6clhcx40mrw9b80" }, "qtimageformats": { "url": "https://invent.kde.org/qt/qt/qtimageformats.git", - "rev": "4e4f5fc6bdac96f5281a3ebeb0fee78df7b1a498", - "sha256": "1w68v55y1l1biv7krzv9vmi2czz84jk89f4pymq3ri1w3y4rc1id" + "rev": "9f658c2093e81d1dc3333e594cc1aa4b0990e221", + "sha256": "13h43hc9yzskqi30yx1wi9ia4nbrgxlwk0zh4dprcwc7p8sgwz76" }, "qtlocation": { "url": "https://invent.kde.org/qt/qt/qtlocation.git", - "rev": "3beb9c810611337fde61d89aa981e9f177a9ede9", - "sha256": "1fwn9x3n01dlkhw53n12z5kb06qj2lmangzvj3fjr5ff0yy47df9" + "rev": "e0a477d04f35495ba6eeda8578d1311dba623270", + "sha256": "104x4drmfxx2d599hzsigiy6m69y0b7n811wgm3wyhqmiay85jvl" }, "qtlottie": { "url": "https://invent.kde.org/qt/qt/qtlottie.git", - "rev": "b8c1fa109dce6f8bff9f55738d2f1e21ff677796", - "sha256": "0qydaqj8945hikby7a9529i0g5ycpvhws6y0zc566jv50qida725" + "rev": "bdbd77ef5529b894699fe8d01642e75230e59f24", + "sha256": "13b4hfnvl9as1bwn2zaw3nlxkd8yg0phssnahc5hw07xm8z11vsm" }, "qtmacextras": { "url": "https://invent.kde.org/qt/qt/qtmacextras.git", - "rev": "e66cba7cf02aa8aecce03540cd167621f2cda5f0", - "sha256": "0q7d3lh3fpkrakxx1sqx9csa7l7rxzskcavbidxb5298jxn49wn8" + "rev": "3ffd97b730fb635e0ada0b5b6f4894a128286cb1", + "sha256": "1fgpm2aa8wc65bq426xckkrwgb2h1c9hl9d454rgl5sl3xg4r61w" }, "qtmultimedia": { "url": "https://invent.kde.org/qt/qt/qtmultimedia.git", - "rev": "53069c9c6eb52b744333812f42aed36c3db6e752", - "sha256": "0y8km2mp5mj1zw1v3acsdvzrc1jyiwpxy3rmif5ssn40wwxifilp" + "rev": "85fe63b98703ced6c5568c52af77b50e6ddf1edc", + "sha256": "129pdvhrahi2r30lfhqjvyird2pb9z58xc807wab779cqi5l2v5g" }, "qtnetworkauth": { "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git", - "rev": "28180f28c98e329676463e24cef0097cba45bc00", - "sha256": "1g6clwmrpdvl9m6flyrk4vlckjnjv3phqhy1xbxlra3zcfn3357r" + "rev": "17d6ed940cea4ead62f4055184d4fc69bf06b789", + "sha256": "0w5225fj5rhzz2jq8qpbaajg011j9xpxb3w83sn9zgnr39jgknl2" }, "qtpurchasing": { "url": "https://invent.kde.org/qt/qt/qtpurchasing.git", - "rev": "d4903bf08c576a6c085278c1960a2676cd83dca7", - "sha256": "04bry3ys15bd6kaiwyb8fh037s50mcplircpzvrwdc1h8milx7y7" + "rev": "6922c0e403e94ac9c2336706bc3df1e2da217a1f", + "sha256": "0jg6z309dj0lm4gdbvqiyprkrqiwr9cg9qhrni2q4dimg7ywci31" }, "qtquick3d": { "url": "https://invent.kde.org/qt/qt/qtquick3d.git", - "rev": "ad229f0c135f74801fba2bcd22c78abc0e3cf1d2", - "sha256": "17jdsahdw72l5lpbng8733qv2fp2qkfzlzrayzigz2slfdqgjxnk" + "rev": "880d7aa04f3cc331c9bc7ba4ca71d7091480ea6d", + "sha256": "1gwsba3zkal7cjninridxvvilrh2iqc2qsrn9izha7m51li1kc7a" }, "qtquickcontrols": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git", - "rev": "9325659ec390eda5b160736a926ba58ccb445cce", - "sha256": "0r1kkn6pr6yynk8x2ggkfqqrh27g1qra102ilglj7chsmrp92xgc" + "rev": "fe98f874f89abe9b96edadb812cfa9b1488679f0", + "sha256": "1j843wfhm9xn0sd86faxg0aabdsxyjjvfrq9nfx00r7a0sb1giga" }, "qtquickcontrols2": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git", - "rev": "69fea340f8f4c483a9b2889e4e24a4b1b52ebc87", - "sha256": "0v6g146ryabks0sff5dgyx42690xckaqpx44c6g7x0b0w24lj6ws" + "rev": "d0537c14e71d0959f96592b20103033b128f9c0b", + "sha256": "123njm1ph04l7842c1q01737xfk4hfwpcdlk7pipyfvyjgpyq7bb" }, "qtquicktimeline": { "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git", - "rev": "bf6c73064c82b07fcb1f7e72c263b249e137e224", - "sha256": "0pnn5ds6sxls8i6pzzmraalvln2pabgga3gnv761b2skgkv26gnq" + "rev": "a0a95b50f2477823f9400b07e76e516555f16dc0", + "sha256": "0kcxjgcqs7l5yvxl53a7sr7sk959r3wcwyg6w5krbk0sf9sdf48b" }, "qtremoteobjects": { "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git", - "rev": "3873bdc809ca8d58d91968cb0de34da26646bc79", - "sha256": "0bncsi45zjwd6q3g40gxdqxqq4zhjrgw7xnxj1v53npbyw4vd0h5" + "rev": "289bbabdff28b4362351f3d91abf75130c9cf666", + "sha256": "11x172lkajaqq2d7hyd30wny5mi6hw4p78nqhj0j2gh3kpw6x06c" }, "qtscxml": { "url": "https://invent.kde.org/qt/qt/qtscxml.git", - "rev": "6834b183966d08d9f061642ee7ea2d482cbbf073", - "sha256": "1h88idcfcsbpx2x2djcg1lzazadm676miz19x6n0n6n4gwp46738" + "rev": "02e1e963ec9492bb1620b3ac3fc6ffc2ff280778", + "sha256": "01m13rz3df05n2c44a16l532faj3516903p1zhp0b3hlgy2jw6k9" }, "qtsensors": { "url": "https://invent.kde.org/qt/qt/qtsensors.git", - "rev": "bf0b718cd0b6c7823e9d2037d3bdece44185f444", - "sha256": "1my7ls1nsaf26kh3hn75jjnxp6gm0ilyfzcczqps0xj7xj9bzwzd" + "rev": "b97c60bee7505eb3901579abc4751f35ba7b303e", + "sha256": "0i60av9ykbsgxizw9i31mnfr87fm4kygwdmcxk4829pmscvcv91s" }, "qtserialbus": { "url": "https://invent.kde.org/qt/qt/qtserialbus.git", - "rev": "616bc5b962cdcacb1c1ba985d7236392e9cadb8c", - "sha256": "0njahb52kshci23xw89j1rgffmrmric8kz54dzmqsmlcqp181qkh" + "rev": "77dae896b13e36969fefdfa25d711e455d58597b", + "sha256": "08yr35mzzyqianhi66bd3iaw48yynrfv6izqsp23s5bggh5arh9r" }, "qtserialport": { "url": "https://invent.kde.org/qt/qt/qtserialport.git", - "rev": "34c19c6441cd440dc65b59ae7670eadf099d51f8", - "sha256": "0hiqfvz5jc6ha6ln8jl8vv4ijsdz55f3zp801dbh2r68cmf9qsrm" + "rev": "aa2ffdbd7295db9e5814070d1432a0b77c59cfce", + "sha256": "08lqzygmb40b060g47zqfxs87s1s0946xy18c7jsqy0i6cl6wl1k" }, "qtspeech": { "url": "https://invent.kde.org/qt/qt/qtspeech.git", - "rev": "8ad0f08ad7e2a8d27dc5e69806812c6a3f298946", - "sha256": "0pyiiqj18c2gvbqvgnaki2hzcizi1lam82x761y2lp717sgb09v9" + "rev": "71574a57103f0da64ce5e4c0ac6d70141496d5e8", + "sha256": "1kjpx8v80r9hp2ispgz2gxrhs8l09zpq09ylwc69gxqr6y7xrjj8" }, "qtsvg": { "url": "https://invent.kde.org/qt/qt/qtsvg.git", - "rev": "690128b2b8fb6d6fbdc43b2b2633f0f1de3f0638", - "sha256": "1iiml673isnqakjzspq5gf6818zmmd7pj6z9y2jwxb2xkkn8ahpc" + "rev": "26fdcaff0d3d6bf6f5c847e833006577a6e8ba7d", + "sha256": "0n4m6a6v66fdx4cyiyzaqqgyryf4n350xzxmibr7rrbzz7z8afrz" }, "qttools": { "url": "https://invent.kde.org/qt/qt/qttools.git", - "rev": "f82ed367d1b80b69d738cfcde534b75854a45476", - "sha256": "1pv7af4z3f9d1ifqjwbf7fhgglpnjfby8h2fg5h114mpils661bn" + "rev": "0378d3e541f40bc9c5433eac70d3949ddff9cfc4", + "sha256": "0jzncvjp07gwykfxp9nrp2nbcrfpjlpy6r2cgb8wqq1pkjy0nkg4" }, "qttranslations": { "url": "https://invent.kde.org/qt/qt/qttranslations.git", - "rev": "c601106c8b5d5495f951c8ea0ad6a9e171416ae0", - "sha256": "0w8ggzc4sxfa1y3n40m24zxp59c2y1mfb2c7zdd8nmlrg7xnqsf0" + "rev": "07ae7ea7c94225e73c8eddc9f3f89edc863e83e0", + "sha256": "177g0iavfk5kim8wibfa5d4h23cf0kfhx7hmaz20afwf5cwxb47z" }, "qtvirtualkeyboard": { "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git", - "rev": "7389450a5de5fdd210f1459abcf73621ec0496bd", - "sha256": "1hv8yi4lq3mdxqkcln2b75drdyfiaqj63khzvy09gdf1x6fyjnn5" + "rev": "e62c1219caef25182ba85383834be04eefce12bf", + "sha256": "09rhxkycz4w5k800sd88mzg8dd0gjbry4ylcj1pbhvnm6xrzw6fz" }, "qtwayland": { "url": "https://invent.kde.org/qt/qt/qtwayland.git", - "rev": "75f434f14499eb47ede2cb66f0946527bf555791", - "sha256": "17d7bcc3v55ywakaybp88c493bfx63vyiz7n8f5kcijj5q5hdf1r" + "rev": "6b1ba1cd0e1389d13e59b94e65da8f20a89ba03f", + "sha256": "127s7b76f7k1iha3crdv0z5gvm65g3lk97jzp7wl1afmv2vnfq7v" }, "qtwebchannel": { "url": "https://invent.kde.org/qt/qt/qtwebchannel.git", - "rev": "fca83088ef430f96257d2014e77d08bd350259af", - "sha256": "1jc7myns24mzfnfybzzjqkpnl235c0fm0zqkai55xwi3vcv9xyr5" + "rev": "ad85920e02049bf7ba06366046498e8366a98e8e", + "sha256": "1z28ass00f7jm2wq5kb3rkx6q861092gvpb58ivnqn753jd95ban" }, "qtwebglplugin": { "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git", - "rev": "3681356904277e055759693551357e7e488d1be9", - "sha256": "14v9r4mhqq453dzkc5gvv660gq11zsmzngvwgi44srhzcx7k1qqv" + "rev": "0d29f1cd46331caf1b5169eb037d573680454348", + "sha256": "1ar4fs9c5av8zy19k05ygkzwcsv131c561z349wzxbj9j5qyzb6d" }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "dbbdc64b804f7c4d0ed92198aaab49b07fa15e7f", - "sha256": "1gbgga8qy26nxxq0537hm3h6la04xb6m4cc2aifjhhhj8py95170" + "rev": "0231c7c3a17c0320601e7766e7e701db5b9eb0dc", + "sha256": "020lynaz4aw84y2dkc72nckhlpmv41nwfdssr1s8a27r4dk58p5a" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", - "rev": "bbb1891595aba23ff3c6d137aa74442f9e54479b", - "sha256": "0j59r6dj4wvassng39whnidd6nzhndwssfwjppppqbs5xy57zh2z" + "rev": "70030514bdaf993517556209503075db15bd1c61", + "sha256": "1cj0fqk41nb63as1br6zkwgpxxznc29hp5xlv2hnlcwc2mbfh2c4" }, "qtwinextras": { "url": "https://invent.kde.org/qt/qt/qtwinextras.git", - "rev": "907009a4f7e5d2b99805547caf4b901bdbb0d4d6", - "sha256": "0aam2imp4rkbrjir5gsk4ja7vf7vv68ybsh7qchavb3zdmjsvxcd" + "rev": "e1773a917239c5b548ebd9e2ab34a687ffb949e4", + "sha256": "1rvv9cpgfy62j1l15lz7p65g00jmy9k0gcmn5i0xlx9dgs35yw6b" }, "qtx11extras": { "url": "https://invent.kde.org/qt/qt/qtx11extras.git", - "rev": "6c3605fcb3b34e55951f597e06c135d97dfa6cd7", - "sha256": "0dqmw2yqh5b5ayq93px2na50ghfk55y55zsgwraxglly0zgm39w9" + "rev": "ff2cc0065a3504e6043b47b1b4601fcdce62eefb", + "sha256": "16m05j8iznjlsvp41pzm0yqfji42ryw5r6ypzy5avij0by0wdkir" }, "qtxmlpatterns": { "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git", - "rev": "087f6f35bd027f940818b1696d0aad822e034377", - "sha256": "0y3hkz7ss6iibpfr7dc855bzhdanz79ix0jm6b28viqjy3bdzgar" + "rev": "330c47bab8333d6dc7d4ab838afb81f29b6a32d0", + "sha256": "10slr93nfc53pzv94xw2h7wzcvzbgbr72yj06jvjr9q6jfv3qgkk" } } diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix index 60ce4e4daf49..8de92625f8a5 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -1,7 +1,7 @@ { lib, fetchgit, fetchFromGitHub }: let - version = "5.15.14"; + version = "5.15.15"; mk = name: args: { diff --git a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh b/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh index f52de4e51df2..855efb5e6c0f 100644 --- a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh @@ -20,7 +20,7 @@ qmakePrePhase() { # do the stripping ourselves (needed for separateDebugInfo) prependToVar qmakeFlags "CONFIG+=nostrip" } -prePhases+=" qmakePrePhase" +appendToVar prePhases qmakePrePhase qmakeConfigurePhase() { runHook preConfigure diff --git a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh index 1b57d676e1fc..1b189d24d9ee 100644 --- a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh @@ -97,7 +97,7 @@ postPatchMkspecs() { fi } if [ -z "${dontPatchMkspecs-}" ]; then - postPhases="${postPhases-}${postPhases:+ }postPatchMkspecs" + appendToVar postPhases postPatchMkspecs fi qtPreHook() { @@ -107,6 +107,6 @@ qtPreHook() { exit 1 fi } -prePhases+=" qtPreHook" +appendToVar prePhases qtPreHook fi diff --git a/pkgs/development/libraries/qt-5/modules/qt3d.nix b/pkgs/development/libraries/qt-5/modules/qt3d.nix index f394ff6627e0..c54f4b7d7b48 100644 --- a/pkgs/development/libraries/qt-5/modules/qt3d.nix +++ b/pkgs/development/libraries/qt-5/modules/qt3d.nix @@ -5,5 +5,5 @@ qtModule { propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # error: use of undeclared identifier 'stat64' - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-Dstat64=stat"; } diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 7f3079d5add5..eb3fc8af96d7 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -4,8 +4,7 @@ , coreutils, bison, flex, gdb, gperf, lndir, perl, pkg-config, python3 , which # darwin support -, libiconv, libobjc, xcbuild, AGL, AppKit, ApplicationServices, AVFoundation, Carbon, Cocoa, CoreAudio, CoreBluetooth -, CoreLocation, CoreServices, DiskArbitration, Foundation, OpenGL, MetalKit, IOKit +, apple-sdk_13, darwinMinVersionHook, xcbuild , dbus, fontconfig, freetype, glib, harfbuzz, icu, libdrm, libX11, libXcomposite , libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng , libxcb @@ -18,7 +17,7 @@ , withQttranslation ? true, qttranslations ? null # options -, libGLSupported ? !stdenv.isDarwin +, libGLSupported ? !stdenv.hostPlatform.isDarwin , libGL # qmake detection for libmysqlclient does not seem to work when cross compiling , mysqlSupport ? stdenv.hostPlatform == stdenv.buildPlatform @@ -38,6 +37,15 @@ let if isLinux then "linux-generic-g++" else throw "Please add a qtPlatformCross entry for ${plat.config}"; + + # Per https://doc.qt.io/qt-5/macos.html#supported-versions: deployment target = 10.13, build SDK = 13.x or 14.x. + # Despite advertising support for the macOS 14 SDK, the build system sets the maximum to 13 and complains + # about 14, so we just use that. + deploymentTarget = "10.13"; + darwinVersionInputs = [ + apple-sdk_13 + (darwinMinVersionHook deploymentTarget) + ]; in stdenv.mkDerivation (finalAttrs: ({ @@ -54,13 +62,8 @@ stdenv.mkDerivation (finalAttrs: ({ # Image formats libjpeg libpng pcre2 - ] ++ ( - if stdenv.isDarwin then [ - # TODO: move to buildInputs, this should not be propagated. - AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth - CoreLocation CoreServices DiskArbitration Foundation OpenGL - libobjc libiconv MetalKit IOKit - ] else [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) ( + [ dbus glib udev # Text rendering @@ -75,18 +78,19 @@ stdenv.mkDerivation (finalAttrs: ({ ); buildInputs = [ python3 at-spi2-core ] - ++ lib.optionals (!stdenv.isDarwin) + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) ( [ libinput ] ++ lib.optional withGtk3 gtk3 ) + ++ lib.optional stdenv.isDarwin darwinVersionInputs ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups ++ lib.optional (mysqlSupport) libmysqlclient ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which ] - ++ lib.optionals stdenv.isDarwin [ xcbuild ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { # `qtbase` expects to find `cc` (with no prefix) in the @@ -99,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: ({ # libQt5Core links calls CoreFoundation APIs that call into the system ICU. Binaries linked # against it will crash during build unless they can access `/usr/share/icu/icudtXXl.dat`. - propagatedSandboxProfile = lib.optionalString stdenv.isDarwin '' + propagatedSandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin '' (allow file-read* (subpath "/usr/share/icu")) ''; @@ -140,16 +144,28 @@ stdenv.mkDerivation (finalAttrs: ({ patchShebangs ./bin '' + ( - if stdenv.isDarwin then '' - sed -i \ - -e 's|/usr/bin/xcode-select|xcode-select|' \ - -e 's|/usr/bin/xcrun|xcrun|' \ - -e 's|/usr/bin/xcodebuild|xcodebuild|' \ - -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \ - ./configure - substituteInPlace ./mkspecs/common/mac.conf \ - --replace "/System/Library/Frameworks/OpenGL.framework/" "${OpenGL}/Library/Frameworks/OpenGL.framework/" \ - --replace "/System/Library/Frameworks/AGL.framework/" "${AGL}/Library/Frameworks/AGL.framework/" + if stdenv.hostPlatform.isDarwin then '' + for file in \ + configure \ + mkspecs/features/mac/asset_catalogs.prf \ + mkspecs/features/mac/default_pre.prf \ + mkspecs/features/mac/sdk.mk \ + mkspecs/features/mac/sdk.prf + do + substituteInPlace "$file" \ + --replace-quiet /usr/bin/xcode-select '${lib.getExe' xcbuild "xcode-select"}' \ + --replace-quiet /usr/bin/xcrun '${lib.getExe' xcbuild "xcrun"}' \ + --replace-quiet /usr/libexec/PlistBuddy '${lib.getExe' xcbuild "PlistBuddy"}' + done + + substituteInPlace configure \ + --replace-fail /System/Library/Frameworks/Cocoa.framework "$SDKROOT/System/Library/Frameworks/Cocoa.framework" + + substituteInPlace mkspecs/common/macx.conf \ + --replace-fail 'CONFIG += ' 'CONFIG += no_default_rpath ' \ + --replace-fail \ + 'QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13' \ + 'QMAKE_MACOSX_DEPLOYMENT_TARGET = ${deploymentTarget}' '' else lib.optionalString libGLSupported '' sed -i mkspecs/common/linux.conf \ -e "/^QMAKE_INCDIR_OPENGL/ s|$|${lib.getDev libGL}/include|" \ @@ -217,7 +233,7 @@ stdenv.mkDerivation (finalAttrs: ({ ''-DLIBRESOLV_SO="${stdenv.cc.libc.out}/lib/libresolv"'' ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' ] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' - ++ lib.optional stdenv.isLinux "-DUSE_X11" + ++ lib.optional stdenv.hostPlatform.isLinux "-DUSE_X11" ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [ # ignore "is only available on macOS 10.12.2 or newer" in obj-c code "-Wno-error=unguarded-availability" @@ -318,11 +334,12 @@ stdenv.mkDerivation (finalAttrs: ({ ''-${lib.optionalString (!buildTests) "no"}make tests'' ] ++ ( - if stdenv.isDarwin then [ + if stdenv.hostPlatform.isDarwin then [ "-no-fontconfig" "-qt-freetype" "-qt-libpng" "-no-framework" + "-no-rpath" ] else [ "-rpath" ] ++ [ diff --git a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix index 81efb4bee04b..77f1fa38c300 100644 --- a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix @@ -1,13 +1,11 @@ -{ qtModule, lib, stdenv, qtbase, qtdeclarative, bluez, IOBluetooth }: +{ qtModule, lib, stdenv, qtbase, qtdeclarative, bluez }: qtModule { pname = "qtconnectivity"; - buildInputs = lib.optional stdenv.isLinux bluez; + buildInputs = lib.optional stdenv.hostPlatform.isLinux bluez; propagatedBuildInputs = [ qtbase qtdeclarative - ] ++ lib.optionals stdenv.isDarwin [ - IOBluetooth ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix b/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix index d79320ea139f..e89a735d77b8 100644 --- a/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix +++ b/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix @@ -5,5 +5,5 @@ qtModule { propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # error: use of undeclared identifier 'stat64' - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-Dstat64=stat"; } diff --git a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix index 398572673171..09fd6490eeb4 100644 --- a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix +++ b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix @@ -1,10 +1,8 @@ -{ lib, stdenv, qtModule, qtbase, qtdeclarative, GameController, pkg-config }: +{ qtModule, qtbase, qtdeclarative, pkg-config }: qtModule { pname = "qtgamepad"; - propagatedBuildInputs = [ qtbase qtdeclarative ] - ++ lib.optional stdenv.isDarwin GameController; - buildInputs = [ ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/pkgs/development/libraries/qt-5/modules/qtlocation.nix index 338911a5afd5..35627af0c685 100644 --- a/pkgs/development/libraries/qt-5/modules/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/modules/qtlocation.nix @@ -4,7 +4,7 @@ qtModule { pname = "qtlocation"; propagatedBuildInputs = [ qtbase qtmultimedia ]; outputs = [ "bin" "out" "dev" ]; - qmakeFlags = lib.optionals stdenv.isDarwin [ + qmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # boost uses std::auto_ptr which has been disabled in clang with libcxx # This flag re-enables this feature # https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index d5dc16c52823..0346ca23c5e2 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -17,8 +17,8 @@ qtModule { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gstreamer gst-plugins-base ] # https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio - ++ lib.optionals stdenv.isLinux [ libpulseaudio alsa-lib wayland ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio alsa-lib wayland ]; outputs = [ "bin" "dev" "out" ]; qmakeFlags = [ "GST_VERSION=1.0" ]; - NIX_LDFLAGS = lib.optionalString (stdenv.isDarwin) "-lobjc"; + NIX_LDFLAGS = lib.optionalString (stdenv.hostPlatform.isDarwin) "-lobjc"; } diff --git a/pkgs/development/libraries/qt-5/modules/qtpurchasing.nix b/pkgs/development/libraries/qt-5/modules/qtpurchasing.nix index 3c1661c7b000..10df01285a4f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtpurchasing.nix +++ b/pkgs/development/libraries/qt-5/modules/qtpurchasing.nix @@ -1,14 +1,6 @@ -{ stdenv -, lib -, qtModule -, qtbase -, qtdeclarative -, StoreKit -, Foundation -}: +{ qtModule, qtbase, qtdeclarative }: qtModule { pname = "qtpurchasing"; propagatedBuildInputs = [ qtbase qtdeclarative ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation StoreKit ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtserialport.nix b/pkgs/development/libraries/qt-5/modules/qtserialport.nix index 7907f91b986b..3d5c00a3575e 100644 --- a/pkgs/development/libraries/qt-5/modules/qtserialport.nix +++ b/pkgs/development/libraries/qt-5/modules/qtserialport.nix @@ -3,5 +3,5 @@ qtModule { pname = "qtserialport"; propagatedBuildInputs = [ qtbase ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNIXPKGS_LIBUDEV=\"${lib.getLib systemd}/lib/libudev\""; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux "-DNIXPKGS_LIBUDEV=\"${lib.getLib systemd}/lib/libudev\""; } diff --git a/pkgs/development/libraries/qt-5/modules/qtspeech.nix b/pkgs/development/libraries/qt-5/modules/qtspeech.nix index 17bc16dab4fc..d60a12f3854d 100644 --- a/pkgs/development/libraries/qt-5/modules/qtspeech.nix +++ b/pkgs/development/libraries/qt-5/modules/qtspeech.nix @@ -3,7 +3,7 @@ qtModule { pname = "qtspeech"; propagatedBuildInputs = [ ]; - buildInputs = lib.optionals stdenv.isLinux [ speechd-minimal ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ speechd-minimal ]; nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qttools-QT_HOST_DATA-refs.patch b/pkgs/development/libraries/qt-5/modules/qttools-QT_HOST_DATA-refs.patch new file mode 100644 index 000000000000..6247cc971b0f --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qttools-QT_HOST_DATA-refs.patch @@ -0,0 +1,53 @@ +From b54dd2923448f2ae7402cf2364f40337d6c3cb6d Mon Sep 17 00:00:00 2001 +From: OPNA2608 <opna2608@protonmail.com> +Date: Wed, 7 Aug 2024 22:47:00 +0200 +Subject: [PATCH] Patch QT_HOST_DATA references + +--- + src/linguist/linguist.pro | 2 +- + src/qdoc/qdoc.pro | 2 +- + src/qtattributionsscanner/qtattributionsscanner.pro | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro +index 7638c7710..bd8798818 100644 +--- a/src/linguist/linguist.pro ++++ b/src/linguist/linguist.pro +@@ -47,7 +47,7 @@ contains(CMAKE_BIN_DIR, "^\\.\\./.*") { + load(qt_build_paths) + + cmake_linguist_config_file.input = $$PWD/Qt5LinguistToolsConfig.cmake.in +-cmake_linguist_config_version_file.input = $$[QT_HOST_DATA/src]/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in ++cmake_linguist_config_version_file.input = @qtbaseDev@/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in + cmake_linguist_macros_file.input = $$PWD/Qt5LinguistToolsMacros.cmake + CMAKE_PACKAGE_VERSION = $$MODULE_VERSION + cmake_linguist_config_file.output = $$MODULE_BASE_OUTDIR/lib/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake +diff --git a/src/qdoc/qdoc.pro b/src/qdoc/qdoc.pro +index db4b25cf1..19592d50b 100644 +--- a/src/qdoc/qdoc.pro ++++ b/src/qdoc/qdoc.pro +@@ -151,7 +151,7 @@ load(qt_build_paths) + equals(QMAKE_HOST.os, Windows): CMAKE_BIN_SUFFIX = ".exe" + + cmake_qdoc_config_file.input = $$PWD/Qt5DocToolsConfig.cmake.in +-cmake_qdoc_config_version_file.input = $$[QT_HOST_DATA/src]/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in ++cmake_qdoc_config_version_file.input = @qtbaseDev@/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in + CMAKE_PACKAGE_VERSION = $$MODULE_VERSION + cmake_qdoc_config_file.output = $$MODULE_BASE_OUTDIR/lib/cmake/Qt5DocTools/Qt5DocToolsConfig.cmake + cmake_qdoc_config_version_file.output = $$MODULE_BASE_OUTDIR/lib/cmake/Qt5DocTools/Qt5DocToolsConfigVersion.cmake +diff --git a/src/qtattributionsscanner/qtattributionsscanner.pro b/src/qtattributionsscanner/qtattributionsscanner.pro +index d645a22a9..5d4239f83 100644 +--- a/src/qtattributionsscanner/qtattributionsscanner.pro ++++ b/src/qtattributionsscanner/qtattributionsscanner.pro +@@ -51,7 +51,7 @@ load(qt_build_paths) + equals(QMAKE_HOST.os, Windows): CMAKE_BIN_SUFFIX = ".exe" + + cmake_qattributionsscanner_config_file.input = $$PWD/Qt5AttributionsScannerTools.cmake.in +-cmake_qattributionsscanner_config_version_file.input = $$[QT_HOST_DATA/src]/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in ++cmake_qattributionsscanner_config_version_file.input = @qtbaseDev@/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in + CMAKE_PACKAGE_VERSION = $$MODULE_VERSION + cmake_qattributionsscanner_config_file.output = $$MODULE_BASE_OUTDIR/lib/cmake/Qt5AttributionsScannerTools/Qt5AttributionsScannerToolsConfig.cmake + cmake_qattributionsscanner_config_version_file.output = $$MODULE_BASE_OUTDIR/lib/cmake/Qt5AttributionsScannerTools/Qt5AttributionsScannerToolsConfigVersion.cmake +-- +2.44.1 + diff --git a/pkgs/development/libraries/qt-5/modules/qttools-libclang-main-header.patch b/pkgs/development/libraries/qt-5/modules/qttools-libclang-main-header.patch new file mode 100644 index 000000000000..2f042d69c666 --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qttools-libclang-main-header.patch @@ -0,0 +1,34 @@ +From a1fb301a0b9b59f420454be1ebeb05ce0547da2c Mon Sep 17 00:00:00 2001 +From: OPNA2608 <opna2608@protonmail.com> +Date: Fri, 6 Sep 2024 14:20:05 +0200 +Subject: [PATCH] Patch includedir for libclang main header + +--- + src/qdoc/configure.pri | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/qdoc/configure.pri b/src/qdoc/configure.pri +index 4f3d77603..8fe8bc439 100644 +--- a/src/qdoc/configure.pri ++++ b/src/qdoc/configure.pri +@@ -71,7 +71,7 @@ defineTest(qtConfTest_libclang) { + LLVM_INSTALL_DIR = $$system("$$candidate --prefix 2>$$QMAKE_SYSTEM_NULL_DEVICE") + !isEmpty(LLVM_INSTALL_DIR) { + CLANG_INCLUDEPATH = $$system("$$candidate --includedir 2>/dev/null") +- LIBCLANG_MAIN_HEADER = $$CLANG_INCLUDEPATH/clang-c/Index.h ++ LIBCLANG_MAIN_HEADER = @libclangDev@/include/clang-c/Index.h + !exists($$LIBCLANG_MAIN_HEADER) { + !isEmpty(LLVM_INSTALL_DIR): \ + qtLog("Cannot find libclang's main header file, candidate: $${LIBCLANG_MAIN_HEADER}.") +@@ -121,7 +121,7 @@ defineTest(qtConfTest_libclang) { + return(false) + } + +- LIBCLANG_MAIN_HEADER = $$CLANG_INCLUDEPATH/clang-c/Index.h ++ LIBCLANG_MAIN_HEADER = @libclangDev@/include/clang-c/Index.h + !exists($$LIBCLANG_MAIN_HEADER) { + !isEmpty(LLVM_INSTALL_DIR): \ + qtLog("Cannot find libclang's main header file, candidate: $${LIBCLANG_MAIN_HEADER}.") +-- +2.44.1 + diff --git a/pkgs/development/libraries/qt-5/modules/qttools.nix b/pkgs/development/libraries/qt-5/modules/qttools.nix index 37e4348ed2c2..52be15d64e8a 100644 --- a/pkgs/development/libraries/qt-5/modules/qttools.nix +++ b/pkgs/development/libraries/qt-5/modules/qttools.nix @@ -1,17 +1,44 @@ -{ qtModule, stdenv, lib, qtbase, qtdeclarative }: +{ + qtModule, + stdenv, + lib, + qtbase, + qtdeclarative, + substituteAll, + llvmPackages, +}: qtModule { pname = "qttools"; - propagatedBuildInputs = [ qtbase qtdeclarative ]; - outputs = [ "out" "dev" "bin" ]; - # fixQtBuiltinPaths overwrites a builtin path we should keep - postPatch = '' - sed -i "src/linguist/linguist.pro" \ - -e '/^cmake_linguist_config_version_file.input =/ s|$$\[QT_HOST_DATA.*\]|${lib.getDev qtbase}|' - sed -i "src/qtattributionsscanner/qtattributionsscanner.pro" \ - -e '/^cmake_qattributionsscanner_config_version_file.input =/ s|$$\[QT_HOST_DATA.*\]|${lib.getDev qtbase}|' - ''; + outputs = [ + "out" + "dev" + "bin" + ]; + + buildInputs = with llvmPackages; [ + libclang + libllvm + ]; + + propagatedBuildInputs = [ + qtbase + qtdeclarative + ]; + + patches = [ + # fixQtBuiltinPaths overwrites builtin paths we should keep + (substituteAll { + src = ./qttools-QT_HOST_DATA-refs.patch; + qtbaseDev = lib.getDev qtbase; + }) + + (substituteAll { + src = ./qttools-libclang-main-header.patch; + libclangDev = lib.getDev llvmPackages.libclang; + }) + ]; devTools = [ "bin/qcollectiongenerator" @@ -32,11 +59,11 @@ qtModule { "bin/qthelpconverter" "bin/lprodump" "bin/qdistancefieldgenerator" - ] ++ lib.optionals stdenv.isDarwin [ - "bin/macdeployqt" - ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "bin/macdeployqt" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && qtdeclarative != null) ''-DNIXPKGS_QMLIMPORTSCANNER="${qtdeclarative.dev}/bin/qmlimportscanner"''; + env.NIX_CFLAGS_COMPILE = lib.optionalString ( + stdenv.hostPlatform.isDarwin && qtdeclarative != null + ) ''-DNIXPKGS_QMLIMPORTSCANNER="${qtdeclarative.dev}/bin/qmlimportscanner"''; setupHook = ../hooks/qttools-setup-hook.sh; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 1a63c9508c05..38ad37fc0364 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -20,16 +20,12 @@ , systemd , enableProprietaryCodecs ? true , gn -, cctools, libobjc, libpm, libunwind, sandbox, xnu -, ApplicationServices, AVFoundation, Foundation, ForceFeedback, GameController, AppKit -, ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication -, MediaPlayer, MediaAccessibility, SecurityInterface, Vision, CoreML, OpenDirectory, Accelerate -, cups, openbsm, xcbuild, writeScriptBin -, ffmpeg_7 ? null +, cctools, cups, bootstrap_cmds, xcbuild, writeScriptBin +, ffmpeg ? null , lib, stdenv , version ? null , qtCompatVersion -, pipewireSupport ? stdenv.isLinux +, pipewireSupport ? stdenv.hostPlatform.isLinux , pipewire , postPatch ? "" , nspr @@ -65,7 +61,7 @@ qtModule ({ pkgsBuildBuild.pkg-config (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtquickcontrols) pkg-config-wrapped-without-prefix - ] ++ lib.optional stdenv.isDarwin xcbuild; + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ bootstrap_cmds xcbuild ]; doCheck = true; outputs = [ "bin" "dev" "out" ]; @@ -135,7 +131,7 @@ qtModule ({ # Prevent Chromium build script from making the path to `clang` relative to # the build directory. `clang_base_path` is the value of `QMAKE_CLANG_DIR` # from `src/core/config/mac_osx.pri`. - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace ./src/3rdparty/chromium/build/toolchain/mac/BUILD.gn \ --replace 'prefix = rebase_path("$clang_base_path/bin/", root_build_dir)' 'prefix = "$clang_base_path/bin/"' '' @@ -148,32 +144,16 @@ qtModule ({ src/core/web_engine_library_info.cpp '' # Patch library paths in Chromium sources - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ src/3rdparty/chromium/device/udev_linux/udev?_loader.cc sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc - '' + lib.optionalString stdenv.isDarwin ('' + '' + lib.optionalString stdenv.hostPlatform.isDarwin ('' substituteInPlace src/buildtools/config/mac_osx.pri \ --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"' - # Following is required to prevent a build error: - # ninja: error: '/nix/store/z8z04p0ph48w22rqzx7ql67gy8cyvidi-SDKs/MacOSX10.12.sdk/usr/include/mach/exc.defs', needed by 'gen/third_party/crashpad/crashpad/util/mach/excUser.c', missing and no known rule to make it - substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ - --replace '$sysroot/usr' "${xnu}" - - # Apple has some secret stuff they don't share with OpenBSM - substituteInPlace src/3rdparty/chromium/base/mac/mach_port_rendezvous.cc \ - --replace "audit_token_to_pid(request.trailer.msgh_audit)" "request.trailer.msgh_audit.val[5]" - substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/mach/mach_message.cc \ - --replace "audit_token_to_pid(audit_trailer->msgh_audit)" "audit_trailer->msgh_audit.val[5]" - - # ld: warning: directory not found for option '-L/nix/store/...-xcodebuild-0.1.2-pre/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/usr/lib' - # ld: fatal warning(s) induced error (-fatal_warnings) - substituteInPlace src/3rdparty/chromium/build/config/compiler/BUILD.gn \ - --replace "-Wl,-fatal_warnings" "" - # Use system ffmpeg echo "gn_args += use_system_ffmpeg=true" >> src/core/config/mac_osx.pri echo "LIBS += -lavformat -lavcodec -lavutil" >> src/core/core_common.pri @@ -232,8 +212,8 @@ qtModule ({ harfbuzz icu libevent - ffmpeg_7 - ] ++ lib.optionals (!stdenv.isDarwin) [ + ffmpeg + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ dbus zlib minizip snappy nss protobuf jsoncpp # Audio formats @@ -257,40 +237,10 @@ qtModule ({ # FIXME These dependencies shouldn't be needed but can't find a way # around it. Chromium pulls this in while bootstrapping GN. - ++ lib.optionals stdenv.isDarwin [ - libobjc - cctools - - # frameworks - ApplicationServices - AVFoundation - Foundation - ForceFeedback - GameController - AppKit - ImageCaptureCore - CoreBluetooth - IOBluetooth - CoreWLAN - Quartz - Cocoa - LocalAuthentication - MediaPlayer - MediaAccessibility - SecurityInterface - Vision - CoreML - OpenDirectory - Accelerate - - openbsm - libunwind - ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools.libtool ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cups - libpm - sandbox # `sw_vers` is used by `src/3rdparty/chromium/build/config/mac/sdk_info.py` # to get some information about the host platform. @@ -313,7 +263,7 @@ qtModule ({ postInstall = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' mkdir -p $out/libexec - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' cat > $out/libexec/qt.conf <<EOF [Paths] Prefix = .. diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index bd05954ddb35..555635c79522 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -3,7 +3,6 @@ , fontconfig, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1, cmake , bison, flex, gdb, gperf, perl, pkg-config, python3, ruby -, ICU, OpenGL }: let @@ -23,13 +22,12 @@ in qtModule { pname = "qtwebkit"; propagatedBuildInputs = [ qtbase qtdeclarative qtlocation qtsensors qtwebchannel ] - ++ lib.optional stdenv.isDarwin qtmultimedia; - buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base hyphen ] - ++ lib.optionals stdenv.isDarwin [ ICU OpenGL ]; + ++ lib.optional stdenv.hostPlatform.isDarwin qtmultimedia; + buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base hyphen ]; nativeBuildInputs = [ bison flex gdb gperf perl pkg-config python3 ruby cmake ]; cmakeFlags = [ "-DPORT=Qt" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DQt5Multimedia_DIR=${lib.getDev qtmultimedia}/lib/cmake/Qt5Multimedia" "-DQt5MultimediaWidgets_DIR=${lib.getDev qtmultimedia}/lib/cmake/Qt5MultimediaWidgets" "-DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF" @@ -42,13 +40,13 @@ qtModule { # with gcc8, -Wclass-memaccess became part of -Wall and this too exceeds the logging limit ++ lib.optional stdenv.cc.isGNU "-Wno-class-memaccess" # with clang this warning blows the log over Hydra's limit - ++ lib.optional stdenv.isDarwin "-Wno-inconsistent-missing-override" - ++ lib.optional (!stdenv.isDarwin) ''-DNIXPKGS_LIBUDEV="${lib.getLib systemd}/lib/libudev"''); + ++ lib.optional stdenv.hostPlatform.isDarwin "-Wno-inconsistent-missing-override" + ++ lib.optional (!stdenv.hostPlatform.isDarwin) ''-DNIXPKGS_LIBUDEV="${lib.getLib systemd}/lib/libudev"''); doCheck = false; # fails 13 out of 13 tests (ctest) # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/libexec/* ''; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebview.nix b/pkgs/development/libraries/qt-5/modules/qtwebview.nix index fd8755390973..0ff65fa676ca 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebview.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebview.nix @@ -1,12 +1,8 @@ -{ lib, stdenv, qtModule, qtdeclarative, qtwebengine, CoreFoundation, WebKit }: +{ lib, stdenv, qtModule, qtdeclarative, qtwebengine }: qtModule { pname = "qtwebview"; propagatedBuildInputs = [ qtdeclarative qtwebengine ]; - buildInputs = lib.optionals stdenv.isDarwin [ - CoreFoundation - WebKit - ]; outputs = [ "out" "dev" "bin" ]; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework WebKit"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework CoreFoundation -framework WebKit"; } diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index c2e329b1f11f..d3d810cbbf68 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -2,6 +2,8 @@ , stdenv , buildPackages , mkDerivation +, apple-sdk_13 +, darwinMinVersionHook , perl , qmake , patches @@ -23,6 +25,14 @@ mkDerivation (args // { inherit pname version src; patches = (args.patches or []) ++ (patches.${pname} or []); + buildInputs = + args.buildInputs or [ ] + # Per https://doc.qt.io/qt-5/macos.html#supported-versions + ++ lib.optionals stdenv.isDarwin [ + apple-sdk_13 + (darwinMinVersionHook "10.13") + ]; + nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl qmake diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 83f9268624cc..0fcae043a793 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -7,10 +7,12 @@ , fetchpatch2 , makeSetupHook , makeWrapper +, runCommand , gst_all_1 , libglvnd , darwin -, overrideSDK +, apple-sdk_15 +, darwinMinVersionHook , buildPackages , python3 , config @@ -26,27 +28,40 @@ let let callPackage = self.newScope ({ inherit (self) qtModule; - inherit srcs python3; - stdenv = - if stdenv.isDarwin - then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "11.0"; } - else stdenv; + inherit srcs python3 stdenv; }); + + # Per <https://doc.qt.io/qt-6/macos.html#supported-versions>. + # This should reflect the highest “Build Environment” and the + # lowest “Target Platform”. + darwinVersionInputs = [ + apple-sdk_15 + (darwinMinVersionHook "12.0") + ]; + + onlyPluginsAndQml = drv: let + drv' = drv.__spliced.targetTarget or drv; + inherit (self.qtbase) qtPluginPrefix qtQmlPrefix; + in (runCommand "${drv'.name}-only-plugins-qml" { } '' + mkdir -p $(dirname "$out/${qtPluginPrefix}") + test -d "${drv'}/${qtPluginPrefix}" && ln -s "${drv'}/${qtPluginPrefix}" "$out/${qtPluginPrefix}" || true + test -d "${drv'}/${qtQmlPrefix}" && ln -s "${drv'}/${qtQmlPrefix}" "$out/${qtQmlPrefix}" || true + ''); in { - inherit callPackage srcs; + inherit callPackage srcs darwinVersionInputs; - qtModule = callPackage ./qtModule.nix { }; + qtModule = callPackage ./qtModule.nix { + inherit darwinVersionInputs; + }; qtbase = callPackage ./modules/qtbase.nix { withGtk3 = !stdenv.hostPlatform.isMinGW; + inherit darwinVersionInputs; inherit (srcs.qtbase) src version; - inherit (darwin.apple_sdk_11_0.frameworks) - AGL AVFoundation AppKit Contacts CoreBluetooth EventKit GSS MetalKit; patches = [ ./patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch - ./patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch ./patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch ./patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch ./patches/0005-qtbase-find-tools-in-PATH.patch @@ -55,12 +70,18 @@ let ./patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch ./patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-.patch ./patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch - # Revert "macOS: Silence warning about supporting secure state restoration" - # fix build with macOS sdk < 12.0 + # Backport patch for https://bugs.kde.org/show_bug.cgi?id=493116 + # FIXME: remove for 6.8.1 + (fetchpatch2 { + url = "https://github.com/qt/qtbase/commit/2ea3abed0125d81ca4f3bacb9650db7314657332.patch"; + hash = "sha256-mdTdwhJtebuLUQRo+y1XUrrzgqG9G7GvPQwvrXLycJI="; + }) + + # Backport patch to fix plugin loading through symlinks + # FIXME: remove for 6.8.1 (fetchpatch2 { - url = "https://github.com/qt/qtbase/commit/fc1549c01445bb9c99d3ba6de8fa9da230614e72.patch"; - revert = true; - hash = "sha256-cjB2sC4cvZn0UEc+sm6ZpjyC78ssqB1Kb5nlZQ15M4A="; + url = "https://github.com/qt/qtbase/commit/e25150ca29437ab315e3686aa801b8636e201e2a.patch"; + hash = "sha256-8WOjjffI48Vlx7gQIiOzfUtPloLys5lf06RQi1lsTys="; }) ]; }; @@ -106,15 +127,13 @@ let qtwebengine qtwebsockets qtwebview - ] ++ lib.optionals (!stdenv.isDarwin) [ qtwayland libglvnd ])) + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ qtwayland libglvnd ])) { }; qt3d = callPackage ./modules/qt3d.nix { }; qt5compat = callPackage ./modules/qt5compat.nix { }; qtcharts = callPackage ./modules/qtcharts.nix { }; - qtconnectivity = callPackage ./modules/qtconnectivity.nix { - inherit (darwin.apple_sdk_11_0.frameworks) IOBluetooth PCSC; - }; + qtconnectivity = callPackage ./modules/qtconnectivity.nix { }; qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { }; qtdeclarative = callPackage ./modules/qtdeclarative.nix { }; qtdoc = callPackage ./modules/qtdoc.nix { }; @@ -127,7 +146,6 @@ let qtlottie = callPackage ./modules/qtlottie.nix { }; qtmultimedia = callPackage ./modules/qtmultimedia.nix { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi; - inherit (darwin.apple_sdk_11_0.frameworks) VideoToolbox; }; qtmqtt = callPackage ./modules/qtmqtt.nix { }; qtnetworkauth = callPackage ./modules/qtnetworkauth.nix { }; @@ -136,9 +154,7 @@ let qtserialbus = callPackage ./modules/qtserialbus.nix { }; qtserialport = callPackage ./modules/qtserialport.nix { }; qtshadertools = callPackage ./modules/qtshadertools.nix { }; - qtspeech = callPackage ./modules/qtspeech.nix { - inherit (darwin.apple_sdk_11_0.frameworks) Cocoa; - }; + qtspeech = callPackage ./modules/qtspeech.nix { }; qtquick3d = callPackage ./modules/qtquick3d.nix { }; qtquick3dphysics = callPackage ./modules/qtquick3dphysics.nix { }; qtquickeffectmaker = callPackage ./modules/qtquickeffectmaker.nix { }; @@ -152,36 +168,33 @@ let qtwayland = callPackage ./modules/qtwayland.nix { }; qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; qtwebengine = callPackage ./modules/qtwebengine.nix { - 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) - AGL AVFoundation Accelerate Cocoa CoreLocation CoreML ForceFeedback - GameController ImageCaptureCore LocalAuthentication - MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz - ReplayKit SecurityInterface Vision; - qtModule = callPackage - ({ qtModule }: qtModule.override { - stdenv = - if stdenv.isDarwin - then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "11.0"; } - else stdenv; - }) - { }; - xcbuild = buildPackages.xcbuild.override { - productBuildVer = "20A2408"; - }; + inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds; }; qtwebsockets = callPackage ./modules/qtwebsockets.nix { }; - qtwebview = callPackage ./modules/qtwebview.nix { - inherit (darwin.apple_sdk_11_0.frameworks) WebKit; - }; + qtwebview = callPackage ./modules/qtwebview.nix { }; wrapQtAppsHook = callPackage - ({ makeBinaryWrapper }: makeSetupHook + ({ makeBinaryWrapper, qtwayland, qtbase }: + makeSetupHook { name = "wrap-qt6-apps-hook"; propagatedBuildInputs = [ makeBinaryWrapper ]; + depsTargetTargetPropagated = [ + (onlyPluginsAndQml qtbase) + ] ++ lib.optionals (lib.meta.availableOn stdenv.targetPlatform qtwayland) [ + (onlyPluginsAndQml qtwayland) + ]; + } ./hooks/wrap-qt-apps-hook.sh) + { }; + + wrapQtAppsNoGuiHook = callPackage + ({ makeBinaryWrapper, qtbase }: makeSetupHook + { + name = "wrap-qt6-apps-no-gui-hook"; + propagatedBuildInputs = [ makeBinaryWrapper ]; + depsTargetTargetPropagated = [ + (onlyPluginsAndQml qtbase) + ]; } ./hooks/wrap-qt-apps-hook.sh) { }; diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh index 79c95c4d890c..8ae22eecfa05 100644 --- a/pkgs/development/libraries/qt-6/fetch.sh +++ b/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.8/6.8.0/submodules/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh b/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh index 84b2fb153d9f..1f696be3e738 100644 --- a/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh +++ b/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh @@ -13,7 +13,7 @@ qmakePrePhase() { "NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?}" \ "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" } -prePhases+=" qmakePrePhase" +appendToVar prePhases qmakePrePhase qmakeConfigurePhase() { runHook preConfigure diff --git a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh index 5006d6b65530..48beac0b04fa 100644 --- a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh @@ -71,17 +71,20 @@ else # Only set up Qt once. fi } if [ -z "${dontPatchMkspecs-}" ]; then - postPhases="${postPhases-}${postPhases:+ }postPatchMkspecs" + appendToVar postPhases postPatchMkspecs fi qtPreHook() { - # Check that wrapQtAppsHook is used, or it is explicitly disabled. + # Check that wrapQtAppsHook/wrapQtAppsNoGuiHook is used, or it is explicitly disabled. if [[ -z "$__nix_wrapQtAppsHook" && -z "$dontWrapQtApps" ]]; then - echo >&2 "Error: wrapQtAppsHook is not used, and dontWrapQtApps is not set." + echo >&2 "Error: this derivation depends on qtbase, but no wrapping behavior was specified." + echo >&2 " - If this is a graphical application, add wrapQtAppsHook to nativeBuildInputs" + echo >&2 " - If this is a CLI application, add wrapQtAppsNoGuiHook to nativeBuildInputs" + echo >&2 " - If this is a library or you need custom wrapping logic, set dontWrapQtApps = true" exit 1 fi } - prePhases+=" qtPreHook" + appendToVar prePhases qtPreHook addQtModulePrefix() { addToSearchPath QT_ADDITIONAL_PACKAGES_PREFIX_PATH $1 diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index e738aba60560..9df79ccc89be 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -67,15 +67,8 @@ , unixODBCDrivers # darwin , moveBuildTree +, darwinVersionInputs , xcbuild -, AGL -, AVFoundation -, AppKit -, Contacts -, CoreBluetooth -, EventKit -, GSS -, MetalKit # mingw , pkgsBuildBuild # optional dependencies @@ -161,39 +154,29 @@ stdenv.mkDerivation rec { xorg.libXtst xorg.xcbutilcursor libepoxy - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AGL - AVFoundation - AppKit - Contacts - CoreBluetooth - EventKit - GSS - MetalKit ] ++ lib.optionals libGLSupported [ libGL ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ vulkan-headers vulkan-loader - ]; + ] ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups; buildInputs = lib.optionals (lib.meta.availableOn stdenv.hostPlatform at-spi2-core) [ at-spi2-core ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libinput) [ libinput - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - AppKit - CoreBluetooth - ] + ] ++ lib.optionals stdenv.hostPlatform.isDarwin darwinVersionInputs ++ lib.optional withGtk3 gtk3 - ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups ++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient ++ lib.optional (postgresql != null && lib.meta.availableOn stdenv.hostPlatform postgresql) postgresql; nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which cmake xmlstarlet ninja ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ]; - propagatedNativeBuildInputs = [ lndir ]; + propagatedNativeBuildInputs = [ lndir ] + # I’m not sure if this is necessary, but the macOS mkspecs stuff + # tries to call `xcrun xcodebuild`, so better safe than sorry. + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; strictDeps = true; @@ -202,7 +185,24 @@ stdenv.mkDerivation rec { inherit patches; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace cmake/QtPublicAppleHelpers.cmake --replace-fail "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" + # TODO: Verify that this catches all the occurrences? + for file in \ + cmake/QtPublicAppleHelpers.cmake \ + mkspecs/features/mac/asset_catalogs.prf \ + mkspecs/features/mac/default_pre.prf \ + mkspecs/features/mac/sdk.mk \ + mkspecs/features/mac/sdk.prf \ + mkspecs/features/permissions.prf \ + src/corelib/Qt6CoreMacros.cmake + do + substituteInPlace "$file" \ + --replace-quiet /usr/bin/xcrun '${lib.getExe' xcbuild "xcrun"}' \ + --replace-quiet /usr/bin/xcode-select '${lib.getExe' xcbuild "xcode-select"}' \ + --replace-quiet /usr/libexec/PlistBuddy '${lib.getExe' xcbuild "PlistBuddy"}' + done + + substituteInPlace mkspecs/common/macx.conf \ + --replace-fail 'CONFIG += ' 'CONFIG += no_default_rpath ' ''; fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh; @@ -227,22 +227,17 @@ stdenv.mkDerivation rec { "-DQT_FEATURE_journald=${if systemdSupport then "ON" else "OFF"}" "-DQT_FEATURE_vulkan=ON" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # error: 'path' is unavailable: introduced in macOS 10.15 - "-DQT_FEATURE_cxx17_filesystem=OFF" + "-DQT_FEATURE_rpath=OFF" ] ++ lib.optionals isCrossBuild [ "-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}" "-DQt6HostInfo_DIR=${pkgsBuildBuild.qt6.qtbase}/lib/cmake/Qt6HostInfo" ] ++ lib.optional (qttranslations != null && !isCrossBuild) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations"; - env.NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [ - # Undefined symbols for architecture arm64: "___gss_c_nt_hostbased_service_oid_desc" - "-framework GSS" - ]); - env.NIX_CFLAGS_COMPILE = "-DNIXPKGS_QT_PLUGIN_PREFIX=\"${qtPluginPrefix}\""; outputs = [ "out" "dev" ]; + separateDebugInfo = true; moveToDev = false; @@ -250,7 +245,7 @@ stdenv.mkDerivation rec { moveToOutput "mkspecs/modules" "$dev" fixQtModulePaths "$dev/mkspecs/modules" fixQtBuiltinPaths "$out" '*.pr?' - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # FIXME: not sure why this isn't added automatically? patchelf --add-rpath "${libmysqlclient}/lib/mariadb" $out/${qtPluginPrefix}/sqldrivers/libqsqlmysql.so diff --git a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix index 126920dd5051..8a48c8490435 100644 --- a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix @@ -5,8 +5,6 @@ , qtdeclarative , bluez , pkg-config -, IOBluetooth -, PCSC }: qtModule { @@ -16,8 +14,5 @@ qtModule { propagatedBuildInputs = [ qtbase qtdeclarative - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOBluetooth - PCSC ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix index 2a377d481c3c..42f5bfd76b88 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix @@ -6,6 +6,7 @@ , stdenv , lib , pkgsBuildBuild +, fetchpatch2 }: qtModule { @@ -19,6 +20,23 @@ qtModule { ../patches/0001-qtdeclarative-disable-qml-disk-cache.patch # add version specific QML import path ../patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch + + # Backport patches for https://bugs.kde.org/show_bug.cgi?id=493116 + # FIXME: remove for 6.8.1 + (fetchpatch2 { + url = "https://github.com/qt/qtdeclarative/commit/3330731d0cb221477ab3d856db032126403ae6a0.patch"; + hash = "sha256-XXXGJ7nVDpEG/6nr16L89J87tvutyc+YnQPQx9cRU+w="; + }) + (fetchpatch2 { + url = "https://github.com/qt/qtdeclarative/commit/2aefbca84d2f3dca2c2697f13710b6907c0c7e59.patch"; + hash = "sha256-a/BX0gpW6juJbjDRo8OleMahOC6WWqreURmYZNiGm5c="; + }) + # Backport patch to fix Kirigami applications crashing + # FIXME: remove for 6.8.1 + (fetchpatch2 { + url = "https://github.com/qt/qtdeclarative/commit/0ae3697cf40bcd3ae1de20621abad17cf6c5f52d.patch"; + hash = "sha256-YuTHqHCWOsqUOATfaAZRxPSwMsFNylxoqnqCeW5kPjs="; + }) ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index 0475a67d56b8..80eef148701a 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -5,13 +5,13 @@ qtModule rec { pname = "qtmqtt"; - version = "6.7.2"; + version = "6.8.0"; src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; rev = "v${version}"; - hash = "sha256-5OvU8I7hSnbBbu8OTrd0o2KSOyIMVfGGUSy4IsA85fA="; + hash = "sha256-WvqBEq7Zv1CONMMuDHdj8/nJHoY4y7ysrqliTZHi7x8="; }; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index 83bcb4c2a0d4..ae02112475f0 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_7 +, ffmpeg , libva , libpulseaudio , wayland @@ -21,26 +21,22 @@ , elfutils , libunwind , orc -, VideoToolbox , pkgsBuildBuild }: qtModule { pname = "qtmultimedia"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ffmpeg_7 ] + buildInputs = [ ffmpeg ] ++ 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 ]; propagatedBuildInputs = [ qtbase qtdeclarative qtsvg qtshadertools ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ qtquick3d ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoToolbox ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ]; patches = [ ../patches/fix-qtgui-include-incorrect-case.patch - # Remove new constants since macOS 12+, since we build Qt with the macOS 11 SDK - ../patches/qtmultimedia-darwin-revert-replace-deprecated-constant.patch ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ ../patches/qtmultimedia-windows-no-uppercase-libs.patch ../patches/qtmultimedia-windows-resolve-function-name.patch diff --git a/pkgs/development/libraries/qt-6/modules/qtspeech.nix b/pkgs/development/libraries/qt-6/modules/qtspeech.nix index 3fbfa6e5d90d..828f34bb72b9 100644 --- a/pkgs/development/libraries/qt-6/modules/qtspeech.nix +++ b/pkgs/development/libraries/qt-6/modules/qtspeech.nix @@ -7,13 +7,11 @@ , flite , alsa-lib , speechd-minimal -, Cocoa }: qtModule { pname = "qtspeech"; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ flite alsa-lib speechd-minimal ]; - propagatedBuildInputs = [ qtbase qtmultimedia ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + propagatedBuildInputs = [ qtbase qtmultimedia ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index 17679c83a23f..d3d55685f5fb 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -1,11 +1,11 @@ -{ qtModule +{ lib +, qtModule , qtbase , qtdeclarative , wayland , wayland-scanner , pkg-config , libdrm -, fetchpatch }: qtModule { @@ -18,32 +18,14 @@ qtModule { 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="; - }) + # Replace vendored wayland.xml with our matching version + # FIXME: remove when upstream updates past 1.23 + postPatch = '' + cp ${wayland-scanner}/share/wayland/wayland.xml src/3rdparty/protocol/wayland/wayland.xml + ''; - # 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="; - }) - - # Update wayland.xml to version 1.23.0 - (fetchpatch { - url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/c2f61bc47baacf2e6a44c6c3c4e4cbf0abfa4095.diff"; - sha256 = "sha256-ZcK/LT65oFvTzCukZB8aDYWH5L6RK5MOPs8VtpYQpq0="; - }) - ]; + meta = { + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; + }; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 8da3b7b62842..c97dd0377981 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -3,7 +3,6 @@ , qtwebchannel , qtpositioning , qtwebsockets -, fetchpatch2 , buildPackages , bison , coreutils @@ -22,6 +21,7 @@ , libXtst , libxshmfence , libXi +, cups , fontconfig , freetype , harfbuzz @@ -50,7 +50,7 @@ , systemd , pipewire , gn -, ffmpeg_7 +, ffmpeg , lib , stdenv , glib @@ -65,31 +65,6 @@ , bootstrap_cmds , cctools , xcbuild -, AGL -, AVFoundation -, Accelerate -, Cocoa -, CoreLocation -, CoreML -, ForceFeedback -, GameController -, ImageCaptureCore -, LocalAuthentication -, MediaAccessibility -, MediaPlayer -, MetalKit -, Network -, OpenDirectory -, Quartz -, ReplayKit -, SecurityInterface -, Vision -, openbsm -, libunwind -, cups -, libpm -, sandbox -, xnu }: qtModule { @@ -132,14 +107,6 @@ 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 = '' @@ -176,8 +143,6 @@ qtModule { --replace "AppleClang" "Clang" substituteInPlace cmake/Functions.cmake \ --replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" - substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ - --replace "\$sysroot/usr" "${xnu}" ''; cmakeFlags = [ @@ -206,7 +171,7 @@ qtModule { ] ++ lib.optionals enableProprietaryCodecs [ "-DQT_FEATURE_webengine_proprietary_codecs=ON" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinSdkVersion}" + "-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0" # Per Qt 6’s deployment target (why doesn’t the hook work?) ]; propagatedBuildInputs = [ @@ -237,7 +202,7 @@ qtModule { lcms2 libevent - ffmpeg_7 + ffmpeg ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus zlib @@ -281,36 +246,10 @@ qtModule { libkrb5 mesa - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AGL - AVFoundation - Accelerate - Cocoa - CoreLocation - CoreML - ForceFeedback - GameController - ImageCaptureCore - LocalAuthentication - MediaAccessibility - MediaPlayer - MetalKit - Network - OpenDirectory - Quartz - ReplayKit - SecurityInterface - Vision - - openbsm - libunwind ]; buildInputs = [ cups - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libpm - sandbox ]; requiredSystemFeatures = [ "big-parallel" ]; @@ -319,13 +258,14 @@ qtModule { export NINJAFLAGS="-j$NIX_BUILD_CORES" ''; + # Debug info is too big to link with LTO. + separateDebugInfo = false; + meta = with lib; { description = "Web engine based on the Chromium web browser"; platforms = [ "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7a-linux" "armv7l-linux" "x86_64-linux" ]; # This build takes a long time; particularly on slow architectures # 1 hour on 32x3.6GHz -> maybe 12 hours on 4x2.4GHz timeout = 24 * 3600; - # Not compatible with macOS 11 without massive patching - broken = stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "12"; }; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwebview.nix b/pkgs/development/libraries/qt-6/modules/qtwebview.nix index dfc2da1df555..149ccc2a7ea1 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebview.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebview.nix @@ -3,12 +3,10 @@ , qtModule , qtdeclarative , qtwebengine -, WebKit }: qtModule { pname = "qtwebview"; propagatedBuildInputs = [ qtdeclarative ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ qtwebengine ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ WebKit ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ qtwebengine ]; } diff --git a/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch b/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch index a8bb8f71cdbf..94ae308c1cfc 100644 --- a/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch +++ b/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch @@ -1,23 +1,8 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nick Cao <nickcao@nichi.co> -Date: Thu, 13 Apr 2023 23:42:29 +0800 -Subject: [PATCH] qtbase: qmake: always use libname instead of absolute path in - qmake files - -In generated qmake files, absolute paths to qt libraries are embedded -and then used in linker flags. However as the libraries can be provided -by qt modules other than the one currently being built, the ebedded -paths can be incorrect. ---- - cmake/QtFinishPrlFile.cmake | 7 ++++--- - cmake/QtGenerateLibHelpers.cmake | 3 --- - 2 files changed, 4 insertions(+), 6 deletions(-) - diff --git a/cmake/QtFinishPrlFile.cmake b/cmake/QtFinishPrlFile.cmake -index 1cf9377e6ce..ac4428bd7a1 100644 +index 0cef22617c..232d92bc62 100644 --- a/cmake/QtFinishPrlFile.cmake +++ b/cmake/QtFinishPrlFile.cmake -@@ -64,9 +64,10 @@ foreach(line ${lines}) +@@ -69,9 +69,10 @@ foreach(line ${lines}) endif() list(APPEND adjusted_libs "-framework" "${CMAKE_MATCH_1}") else() @@ -32,16 +17,16 @@ index 1cf9377e6ce..ac4428bd7a1 100644 endif() else() diff --git a/cmake/QtGenerateLibHelpers.cmake b/cmake/QtGenerateLibHelpers.cmake -index 3ffe354fd8d..441332d4582 100644 +index 96675267d2..c9d4a69497 100644 --- a/cmake/QtGenerateLibHelpers.cmake +++ b/cmake/QtGenerateLibHelpers.cmake -@@ -73,9 +73,6 @@ function(qt_transform_absolute_library_paths_to_link_flags out_var library_path_ - string(TOLOWER "${dir}" dir_lower) - # If library_path isn't in default link directories, we should add it to link flags. - list(FIND IMPLICIT_LINK_DIRECTORIES_LOWER "${dir_lower}" index) -- if(${index} EQUAL -1) -- list(APPEND out_list "-L\"${dir}\"") -- endif() +@@ -82,9 +82,6 @@ function(qt_transform_absolute_library_paths_to_link_flags out_var library_path_ + # If library_path isn't in default link directories, we should add it to link flags. + # But we shouldn't add it duplicately. + list(FIND IMPLICIT_LINK_DIRECTORIES_LOWER "${dir_lower}" index) +- if(index EQUAL -1 AND NOT "-L\"${dir}\"" IN_LIST out_list) +- list(APPEND out_list "-L\"${dir}\"") +- endif() + endif() list(APPEND out_list "${lib_name_with_link_flag}") else() - list(APPEND out_list "${library_path}") diff --git a/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch b/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch deleted file mode 100644 index 1e548950a2a6..000000000000 --- a/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch +++ /dev/null @@ -1,485 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nick Cao <nickcao@nichi.co> -Date: Fri, 14 Apr 2023 21:43:04 +0800 -Subject: [PATCH] qtbase: qmake: fix mkspecs for darwin - ---- - mkspecs/common/mac.conf | 2 +- - mkspecs/features/mac/default_post.prf | 264 -------------------------- - mkspecs/features/mac/default_pre.prf | 58 ------ - mkspecs/features/mac/sdk.mk | 27 --- - mkspecs/features/mac/sdk.prf | 61 ------ - mkspecs/features/mac/toolchain.prf | 5 - - 6 files changed, 1 insertion(+), 416 deletions(-) - -diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 61bea952b22..9909dae7260 100644 ---- a/mkspecs/common/mac.conf -+++ b/mkspecs/common/mac.conf -@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ - - QMAKE_FIX_RPATH = install_name_tool -id - --QMAKE_LFLAGS_RPATH = -Wl,-rpath, -+QMAKE_LFLAGS_RPATH = - QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip - - QMAKE_LFLAGS_REL_RPATH = -diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 0b64a586b93..3b40328304d 100644 ---- a/mkspecs/features/mac/default_post.prf -+++ b/mkspecs/features/mac/default_post.prf -@@ -1,9 +1,5 @@ - load(default_post) - --# Recompute SDK version in case the user set it explicitly --sdk_version = $$QMAKE_MAC_SDK_VERSION --QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) -- - contains(TEMPLATE, .*app) { - !macx-xcode:if(isEmpty(BUILDS)|build_pass) { - # Detect changes to the platform SDK -@@ -15,270 +11,10 @@ contains(TEMPLATE, .*app) { - - QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) - } -- -- # Detect incompatible SDK versions -- # The CMake equivalent is in cmake/QtPublicAppleHelpers.cmake. -- -- isEmpty(QT_MAC_SDK_VERSION_MIN): \ -- QT_MAC_SDK_VERSION_MIN = $$QT_MAC_SDK_VERSION -- -- !versionAtLeast(QMAKE_MAC_SDK_VERSION, $$QT_MAC_SDK_VERSION_MIN): \ -- warning("Qt requires at least version $$QT_MAC_SDK_VERSION_MIN of the platform SDK," \ -- "you're building against version $${QMAKE_MAC_SDK_VERSION}. Please upgrade.") -- -- !isEmpty(QT_MAC_SDK_VERSION_MAX) { -- # For Qt developers only -- !isEmpty($$list($$(QT_MAC_SDK_NO_VERSION_CHECK))): \ -- CONFIG += sdk_no_version_check -- -- QMAKE_MAC_SDK_MAJOR_VERSION = $$replace(QMAKE_MAC_SDK_VERSION, "(\\d+)(\\.\\d+)(\\.\\d+)?", \\1) -- -- !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_VERSION, $$QT_MAC_SDK_VERSION_MAX) { -- warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_MAX"\ -- "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_VERSION}.") -- warning("This is an unsupported configuration. You may experience build issues," \ -- "and by using") -- warning("the $$QMAKE_MAC_SDK_VERSION SDK you are opting in to new features" \ -- "that Qt has not been prepared for.") -- -- warning("Please downgrade the SDK you use to build your app to version" \ -- "$$QT_MAC_SDK_VERSION_MAX, or configure") -- warning("with CONFIG+=sdk_no_version_check when running qmake" \ -- "to silence this warning.") -- } -- } - } - - !no_objective_c:CONFIG += objective_c - --# Add the same default rpaths as Xcode does for new projects. --# This is especially important for iOS/tvOS/watchOS where no other option is possible. --!no_default_rpath { -- uikit: QMAKE_RPATHDIR += @executable_path/Frameworks -- else: QMAKE_RPATHDIR += @executable_path/../Frameworks -- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks --} -- --# Don't pass -headerpad_max_install_names when using Bitcode. --# In that case the linker emits a warning stating that the flag is ignored when --# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962). --# Using this flag is also unnecessary in practice on UIKit platforms since they --# are sandboxed, and only UIKit platforms support bitcode to begin with. --!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD -- --app_extension_api_only { -- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION --} -- --macos { -- !isEmpty(QMAKE_APPLE_DEVICE_ARCHS) { -- # If the user has requested a specific set of architectures, -- # build all of those by default, but limited to only those. -- CONFIG -= only_active_arch -- } else { -- # Otherwise allow building all of the architectures available -- # in Qt, but only build the active arch (unless the user has -- # manually overridden this via CONFIG -= only_active_arch). -- QMAKE_APPLE_DEVICE_ARCHS = $$QT_ARCHS -- } --} -- --macx-xcode { -- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO -- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ -- qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO -- else: \ -- qmake_pkginfo_typeinfo.value = "????" -- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo -- -- bundle_version = $$VERSION -- isEmpty(bundle_version): bundle_version = 1.0.0 -- -- l = $$split(bundle_version, '.') 0 0 # make sure there are at least three -- VER_MAJ = $$member(l, 0, 0) -- VER_MIN = $$member(l, 1, 1) -- VER_PAT = $$member(l, 2, 2) -- unset(l) -- -- qmake_full_version.name = QMAKE_FULL_VERSION -- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} -- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version -- -- qmake_short_version.name = QMAKE_SHORT_VERSION -- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} -- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version -- -- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { -- debug_information_format.name = DEBUG_INFORMATION_FORMAT -- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT -- debug_information_format.build = debug -- QMAKE_MAC_XCODE_SETTINGS += debug_information_format -- } -- -- QMAKE_XCODE_ARCHS = -- -- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" -- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_device -- -- ios:simulator { -- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" -- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_simulator -- } -- -- only_active_arch.name = ONLY_ACTIVE_ARCH -- only_active_arch.value = YES -- only_active_arch.build = debug -- QMAKE_MAC_XCODE_SETTINGS += only_active_arch --} else { -- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS -- ios:simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS -- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS -- -- single_arch: VALID_ARCHS = $$first(VALID_ARCHS) -- -- macos { -- only_active_arch: DEFAULT_ARCHS = $$system("uname -m") -- else: DEFAULT_ARCHS = $$VALID_ARCHS -- } -- -- ARCHS = $(filter $(EXPORT_VALID_ARCHS), \ -- $(if $(ARCHS), $(ARCHS), \ -- $(if $(EXPORT_DEFAULT_ARCHS), $(EXPORT_DEFAULT_ARCHS), \ -- $(EXPORT_VALID_ARCHS)))) -- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ARCHS), $(EXPORT_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) -- -- QMAKE_EXTRA_VARIABLES += VALID_ARCHS DEFAULT_ARCHS ARCHS ARCH_ARGS -- -- arch_flags = $(EXPORT_ARCH_ARGS) -- -- QMAKE_CFLAGS += $$arch_flags -- QMAKE_CXXFLAGS += $$arch_flags -- QMAKE_LFLAGS += $$arch_flags -- -- QMAKE_PCH_ARCHS = $$VALID_ARCHS -- -- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET -- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET -- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET -- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET -- -- # If we're doing a simulator and device build, device and simulator -- # architectures use different paths and flags for the sysroot and -- # deployment target switch, so we must multiplex them across multiple -- # architectures using -Xarch. Otherwise we fall back to the simple path. -- # This is not strictly necessary, but results in cleaner command lines -- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit -- # individual rules to a different set of architecture(s) from the overall -- # build (such as machtest in QtCore). -- ios:simulator:device { -- QMAKE_XARCH_CFLAGS = -- QMAKE_XARCH_LFLAGS = -- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS -- -- for (arch, VALID_ARCHS) { -- contains(VALID_SIMULATOR_ARCHS, $$arch) { -- sdk = $$simulator.sdk -- version_identifier = $$simulator.deployment_identifier -- platform_identifier = $$simulator.sdk -- } else { -- sdk = $$device.sdk -- version_identifier = $$device.deployment_identifier -- platform_identifier = $$device.sdk -- } -- -- version_min_flags = \ -- -Xarch_$${arch} \ -- -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \ -- -Xarch_$${arch} \ -- -isysroot$$xcodeSDKInfo(Path, $$sdk) -- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ -- -Xarch_$${arch} \ -- -isysroot$$xcodeSDKInfo(Path, $$sdk) -- -- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) -- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) -- -- QMAKE_EXTRA_VARIABLES += \ -- QMAKE_XARCH_CFLAGS_$${arch} \ -- QMAKE_XARCH_LFLAGS_$${arch} -- } -- -- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) -- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) -- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) -- } else { -- ios:simulator { -- version_identifier = $$simulator.deployment_identifier -- platform_identifier = $$simulator.sdk -- sysroot_path = $$xcodeSDKInfo(Path, $$simulator.sdk) -- } else { -- version_identifier = $$device.deployment_identifier -- platform_identifier = $$device.sdk -- sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk) -- } -- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_CFLAGS += -isysroot $$sysroot_path $$version_min_flag -- QMAKE_CXXFLAGS += -isysroot $$sysroot_path $$version_min_flag -- QMAKE_LFLAGS += -isysroot $$sysroot_path $$version_min_flag -- } -- -- # Enable precompiled headers for multiple architectures -- QMAKE_CFLAGS_USE_PRECOMPILE = -- for (arch, VALID_ARCHS) { -- icc_pch_style: \ -- use_flag = "-pch-use " -- else: \ -- use_flag = -include -- -- # Only use Xarch with multi-arch, as the option confuses ccache -- count(VALID_ARCHS, 1, greaterThan): \ -- QMAKE_CFLAGS_USE_PRECOMPILE += \ -- -Xarch_$${arch} -- -- QMAKE_CFLAGS_USE_PRECOMPILE += \ -- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} -- } -- icc_pch_style { -- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} -- QMAKE_CFLAGS_USE_PRECOMPILE = -- } else { -- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- } -- -- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} --} -- --!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) { -- # Explicit SDK version has been set, respect that -- QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version --} -- --cache(QMAKE_XCODE_DEVELOPER_PATH, stash) --!isEmpty(QMAKE_XCODE_VERSION): \ -- cache(QMAKE_XCODE_VERSION, stash) -- --QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() -- --xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER --xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX --isEmpty(xcode_product_bundle_identifier_setting.value): \ -- xcode_product_bundle_identifier_setting.value = "com.yourcompany" --xcode_product_bundle_target = $$QMAKE_BUNDLE --isEmpty(xcode_product_bundle_target): \ -- xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} --xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" --QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting -- - !macx-xcode { - generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS - generate_xcode_project.target = xcodeproj -diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a56..3b01424e67b 100644 ---- a/mkspecs/features/mac/default_pre.prf -+++ b/mkspecs/features/mac/default_pre.prf -@@ -1,60 +1,2 @@ - CONFIG = asset_catalogs rez $$CONFIG - load(default_pre) -- --isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { -- # Get path of Xcode's Developer directory -- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") -- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ -- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") -- -- # Make sure Xcode path is valid -- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ -- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") --} -- --isEmpty(QMAKE_XCODEBUILD_PATH): \ -- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") -- --!isEmpty(QMAKE_XCODEBUILD_PATH) { -- # Make sure Xcode is set up properly -- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ -- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") -- -- isEmpty(QMAKE_XCODE_VERSION) { -- # Extract Xcode version using xcodebuild -- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") -- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) -- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") -- unset(xcode_version) -- } --} -- --isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { -- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist -- exists($$QMAKE_XCODE_PREFERENCES_FILE): \ -- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null") -- -- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \ -- cache(QMAKE_TARGET_BUNDLE_PREFIX) --} -- --QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon -- --# Make the default debug info format for static debug builds --# DWARF instead of DWARF with dSYM. This cuts down build times --# for application debug builds significantly, as Xcode doesn't --# have to pull out all the DWARF info from the Qt static libs --# and put it into a dSYM file. We don't need that dSYM file in --# the first place, since the information is available in the --# object files inside the archives (static libraries). --macx-xcode:qtConfig(static): \ -- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf -- --# This variable is used by the xcode_dynamic_library_suffix --# feature, which allows Xcode to choose the Qt libraries to link to --# at build time, depending on the current Xcode SDK and configuration. --QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX -- --xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP --xcode_copy_phase_strip_setting.value = NO --QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk -index a32ceacb6ce..e69de29bb2d 100644 ---- a/mkspecs/features/mac/sdk.mk -+++ b/mkspecs/features/mac/sdk.mk -@@ -1,27 +0,0 @@ -- --ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) -- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>/dev/null -- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) -- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) -- # We don't want to complain about out of date SDK unless the target needs to be remade. -- # This covers use-cases such as running 'make check' after moving the build to a -- # computer without Xcode or with a different Xcode version. -- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0) -- ifeq ($(TARGET_UP_TO_DATE),0) -- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.) -- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) -- else ifneq ($(CURRENT_MAC_SDK_VERSION),) -- $(info The $(EXPORT_QMAKE_MAC_SDK) platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) -- else -- $(info Unknown error resolving current platform SDK version.) -- endif -- $(info This requires a fresh build of your project. Please wipe the build directory) -- ifneq ($(EXPORT__QMAKE_STASH_),) -- $(info including the qmake cache in $(EXPORT__QMAKE_STASH_)) -- endif -- $(error ^) -- endif -- endif --endif -diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 3a9c2778bbe..e69de29bb2d 100644 ---- a/mkspecs/features/mac/sdk.prf -+++ b/mkspecs/features/mac/sdk.prf -@@ -1,61 +0,0 @@ -- --isEmpty(QMAKE_MAC_SDK): \ -- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") -- --contains(QMAKE_MAC_SDK, .*/.*): \ -- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)") -- --defineReplace(xcodeSDKInfo) { -- info = $$1 -- equals(info, "Path"): \ -- infoarg = --show-sdk-path -- equals(info, "PlatformPath"): \ -- infoarg = --show-sdk-platform-path -- equals(info, "SDKVersion"): \ -- infoarg = --show-sdk-version -- sdk = $$2 -- isEmpty(sdk): \ -- sdk = $$QMAKE_MAC_SDK -- -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { -- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null") -- # --show-sdk-platform-path won't work for Command Line Tools; this is fine -- # only used by the XCTest backend to testlib -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \ -- error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg") -- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) -- } -- -- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) --} -- --QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) --QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) --QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) -- --isEmpty(QMAKE_EXPORT_INCDIR_OPENGL) { -- QMAKE_EXPORT_INCDIR_OPENGL = $$QMAKE_INCDIR_OPENGL -- sysrootified = -- for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val -- QMAKE_INCDIR_OPENGL = $$sysrootified --} -- --QMAKESPEC_NAME = $$basename(QMAKESPEC) -- --# Resolve SDK version of various tools --for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) { -- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool} -- !isEmpty($$tool_variable) { -- $$tool = $$eval($$tool_variable) -- next() -- } -- -- value = $$eval($$tool) -- isEmpty(value): next() -- -- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null") -- isEmpty(sysrooted): next() -- -- $$tool = $$sysrooted $$member(value, 1, -1) -- cache($$tool_variable, set stash, $$tool) --} -diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf -index df191eb13c4..e69de29bb2d 100644 ---- a/mkspecs/features/mac/toolchain.prf -+++ b/mkspecs/features/mac/toolchain.prf -@@ -1,5 +0,0 @@ --# Ensure that we process sdk.prf first, as it will update QMAKE_CXX, --# which the default path determination uses. --sdk: load(sdk) -- --load(toolchain) diff --git a/pkgs/development/libraries/qt-6/patches/0007-qtbase-allow-translations-outside-prefix.patch b/pkgs/development/libraries/qt-6/patches/0007-qtbase-allow-translations-outside-prefix.patch index d8061f1610e9..c7c097cce359 100644 --- a/pkgs/development/libraries/qt-6/patches/0007-qtbase-allow-translations-outside-prefix.patch +++ b/pkgs/development/libraries/qt-6/patches/0007-qtbase-allow-translations-outside-prefix.patch @@ -1,22 +1,13 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nick Cao <nickcao@nichi.co> -Date: Tue, 10 Oct 2023 10:14:40 -0400 -Subject: [PATCH] qtbase: allow translations outside prefix - ---- - cmake/QtBuildPathsHelpers.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/cmake/QtBuildPathsHelpers.cmake b/cmake/QtBuildPathsHelpers.cmake -index 18082ac6a5f..e16aea7d7c6 100644 +index bf28d1e9ee..08e64a2092 100644 --- a/cmake/QtBuildPathsHelpers.cmake +++ b/cmake/QtBuildPathsHelpers.cmake -@@ -134,7 +134,7 @@ function(qt_configure_process_path name default docstring) - set(rel_path ".") - elseif(rel_path MATCHES "^\.\./") - # INSTALL_SYSCONFDIR is allowed to be outside the prefix. -- if(NOT name STREQUAL "INSTALL_SYSCONFDIR") -+ if(NOT (name STREQUAL "INSTALL_SYSCONFDIR" OR name STREQUAL "INSTALL_TRANSLATIONSDIR")) - message(FATAL_ERROR - "Path component '${name}' is outside computed install prefix: ${rel_path} ") - return() +@@ -140,7 +140,7 @@ function(qt_configure_process_path name default docstring) + set(new_value ".") + elseif(rel_path MATCHES "^\.\./") + # INSTALL_SYSCONFDIR is allowed to be outside the prefix. +- if(NOT name STREQUAL "INSTALL_SYSCONFDIR") ++ if(NOT (name STREQUAL "INSTALL_SYSCONFDIR" OR name STREQUAL "INSTALL_TRANSLATIONSDIR")) + message(FATAL_ERROR + "Path component '${name}' is outside computed install prefix: ${rel_path} ") + endif() diff --git a/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch b/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch index 563906fb3157..5540ed8d77da 100644 --- a/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch +++ b/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch @@ -1,11 +1,11 @@ diff --git a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp -index affa52d..b71b461 100644 +index c90dabb53..12557976d 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp @@ -7,7 +7,7 @@ - #include <private/qabstractvideobuffer_p.h> #include <private/qmultimediautils_p.h> #include <private/qwindowsmultimediautils_p.h> + #include <private/qvideoframe_p.h> -#include <qtgui/qscreen_platform.h> +#include <QtGui/qscreen_platform.h> #include "qvideoframe.h" diff --git a/pkgs/development/libraries/qt-6/patches/qtmultimedia-darwin-revert-replace-deprecated-constant.patch b/pkgs/development/libraries/qt-6/patches/qtmultimedia-darwin-revert-replace-deprecated-constant.patch deleted file mode 100644 index 3196a6e4158c..000000000000 --- a/pkgs/development/libraries/qt-6/patches/qtmultimedia-darwin-revert-replace-deprecated-constant.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/src/multimedia/darwin/qdarwinmediadevices.mm b/src/multimedia/darwin/qdarwinmediadevices.mm -index b0a108935..881066928 100644 ---- a/src/multimedia/darwin/qdarwinmediadevices.mm -+++ b/src/multimedia/darwin/qdarwinmediadevices.mm -@@ -42,7 +42,7 @@ static AudioDeviceID defaultAudioDevice(QAudioDevice::Mode mode) - const AudioObjectPropertyAddress propertyAddress = { - selector, - kAudioObjectPropertyScopeGlobal, -- kAudioObjectPropertyElementMain, -+ kAudioObjectPropertyElementMaster, - }; - - if (auto audioDevice = getAudioObject<AudioDeviceID>(kAudioObjectSystemObject, propertyAddress, -@@ -77,7 +77,7 @@ static QList<QAudioDevice> availableAudioDevices(QAudioDevice::Mode mode) - - const AudioObjectPropertyAddress audioDevicesPropertyAddress = { - kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, -- kAudioObjectPropertyElementMain -+ kAudioObjectPropertyElementMaster - }; - - if (auto audioDevices = getAudioData<AudioDeviceID>( -@@ -130,11 +130,11 @@ static OSStatus audioDeviceChangeListener(AudioObjectID id, UInt32, - - static constexpr AudioObjectPropertyAddress listenerAddresses[] = { - { kAudioHardwarePropertyDefaultInputDevice, kAudioObjectPropertyScopeGlobal, -- kAudioObjectPropertyElementMain }, -+ kAudioObjectPropertyElementMaster }, - { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal, -- kAudioObjectPropertyElementMain }, -+ kAudioObjectPropertyElementMaster }, - { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, -- kAudioObjectPropertyElementMain } -+ kAudioObjectPropertyElementMaster } - }; - - static void setAudioListeners(QDarwinMediaDevices &instance) -diff --git a/src/multimedia/darwin/qmacosaudiodatautils_p.h b/src/multimedia/darwin/qmacosaudiodatautils_p.h -index 8cc2f8440..5cd6fced2 100644 ---- a/src/multimedia/darwin/qmacosaudiodatautils_p.h -+++ b/src/multimedia/darwin/qmacosaudiodatautils_p.h -@@ -44,7 +44,7 @@ void printUnableToReadWarning(const char *logName, AudioObjectID objectID, const - - inline static AudioObjectPropertyAddress - makePropertyAddress(AudioObjectPropertySelector selector, QAudioDevice::Mode mode, -- AudioObjectPropertyElement element = kAudioObjectPropertyElementMain) -+ AudioObjectPropertyElement element = kAudioObjectPropertyElementMaster) - { - return { selector, - mode == QAudioDevice::Input ? kAudioDevicePropertyScopeInput diff --git a/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch b/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch index c4302113786e..a48bb2c37eee 100644 --- a/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch +++ b/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch @@ -1,24 +1,12 @@ -From da66a74e8b8e57b4a60b2cd0d18ef3bebb15509c Mon Sep 17 00:00:00 2001 -From: Nick Cao <nickcao@nichi.co> -Date: Tue, 10 Oct 2023 11:45:24 -0400 -Subject: [PATCH 1/2] qtwebengine: link pulseaudio - ---- - src/core/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 4153ce180..e89f41798 100644 +index de5222645..bddb2322a 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt -@@ -340,6 +340,7 @@ foreach(arch ${archs}) - use_static_angle=true - chrome_root_store_supported=false - trial_comparison_cert_verifier_supported=false +@@ -366,6 +366,7 @@ foreach(arch ${archs}) + content_enable_legacy_ipc=true + enable_extensions_legacy_ipc=true + enable_bound_session_credentials=false + link_pulseaudio=true ) extend_gn_list(gnArgArg ARGS use_v8_context_snapshot v8_use_external_startup_data --- -2.42.0 - diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix index ef5aa994ce90..8b09c8cb19b8 100644 --- a/pkgs/development/libraries/qt-6/qtModule.nix +++ b/pkgs/development/libraries/qt-6/qtModule.nix @@ -1,5 +1,6 @@ { lib , stdenv +, darwinVersionInputs , cmake , ninja , perl @@ -19,7 +20,9 @@ stdenv.mkDerivation (args // { inherit pname version src; patches = args.patches or patches.${pname} or [ ]; - buildInputs = args.buildInputs or [ ]; + buildInputs = + args.buildInputs or [ ] + ++ lib.optionals stdenv.hostPlatform.isDarwin darwinVersionInputs; nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cmake ninja perl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ]; propagatedBuildInputs = @@ -29,6 +32,7 @@ stdenv.mkDerivation (args // { moveToDev = false; outputs = args.outputs or [ "out" "dev" ]; + separateDebugInfo = args.separateDebugInfo or true; dontWrapQtApps = args.dontWrapQtApps or true; }) // { diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix index aeca3be2539e..1bf3d1a649c8 100644 --- a/pkgs/development/libraries/qt-6/srcs.nix +++ b/pkgs/development/libraries/qt-6/srcs.nix @@ -1,318 +1,318 @@ # DO NOT EDIT! This file is generated automatically. -# Command: /home/k900/gh/NixOS/nixpkgs/./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6 +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6 { fetchurl, mirror }: { qt3d = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qt3d-everywhere-src-6.7.2.tar.xz"; - sha256 = "1pwagjicvqc7lbypkw7wvjznndyzqm2ihisqdqc36ccp0kcqgh4b"; - name = "qt3d-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qt3d-everywhere-src-6.8.0.tar.xz"; + sha256 = "0zbv1j0i9bla73b4v15skjballff2l0lxgrdfhdkaz232ng9249s"; + name = "qt3d-everywhere-src-6.8.0.tar.xz"; }; }; qt5compat = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qt5compat-everywhere-src-6.7.2.tar.xz"; - sha256 = "00y071p09v91ascxg3llc0yfbx7xs24smcgxckdrnkgwkqcba9l8"; - name = "qt5compat-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qt5compat-everywhere-src-6.8.0.tar.xz"; + sha256 = "0c2yhgsn63a5m0pxchmkkqfb7izllpr46srf2pndcsqbszyhb6rw"; + name = "qt5compat-everywhere-src-6.8.0.tar.xz"; }; }; qtactiveqt = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtactiveqt-everywhere-src-6.7.2.tar.xz"; - sha256 = "1y02pyb2bz9wf5jmf2kh20wqq2vmq8afmgrs0pvhgfvyrs8b7an0"; - name = "qtactiveqt-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtactiveqt-everywhere-src-6.8.0.tar.xz"; + sha256 = "0nycsn0yim01cvinfaljwmx8rllll6xw62cywqhbz61fqlsdy693"; + name = "qtactiveqt-everywhere-src-6.8.0.tar.xz"; }; }; qtbase = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtbase-everywhere-src-6.7.2.tar.xz"; - sha256 = "16bmfrjfxjajs6sqg1383ihhfwwf69ihkpnpvsajh5pv21g2mwn5"; - name = "qtbase-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtbase-everywhere-src-6.8.0.tar.xz"; + sha256 = "0x9wp9fd37ycpw73s03p01zi19l93xjp57vcvrrgh9xa20blib8v"; + name = "qtbase-everywhere-src-6.8.0.tar.xz"; }; }; qtcharts = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtcharts-everywhere-src-6.7.2.tar.xz"; - sha256 = "1nlv4z2rvhrn1f1f7n6qdag7lmkpl3idnj6ph572qzwb8lvs9xh0"; - name = "qtcharts-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtcharts-everywhere-src-6.8.0.tar.xz"; + sha256 = "0bqkbd31lxyqiw4nbwrach7hixg3q93v26di9hxb0s8s1nndl8qr"; + name = "qtcharts-everywhere-src-6.8.0.tar.xz"; }; }; qtconnectivity = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtconnectivity-everywhere-src-6.7.2.tar.xz"; - sha256 = "1s08djgzhh5p9ij0hxbrrcx9n7r7f0ba6pr9793mdsgh8ar23lwf"; - name = "qtconnectivity-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtconnectivity-everywhere-src-6.8.0.tar.xz"; + sha256 = "120pq8yvm4v72800cj0mm8069fiyan036arnc74zq1vmq1ngpgmv"; + name = "qtconnectivity-everywhere-src-6.8.0.tar.xz"; }; }; qtdatavis3d = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtdatavis3d-everywhere-src-6.7.2.tar.xz"; - sha256 = "0lsfd737zi8517scys3xj4c9l505vvkdg3n6dw89bdfyjmywisy0"; - name = "qtdatavis3d-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtdatavis3d-everywhere-src-6.8.0.tar.xz"; + sha256 = "1zscaf1f4dfc5v8w8bivac5hnbq4j6j70vf78b5dcy5h2dfrdwim"; + name = "qtdatavis3d-everywhere-src-6.8.0.tar.xz"; }; }; qtdeclarative = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtdeclarative-everywhere-src-6.7.2.tar.xz"; - sha256 = "16drp7yjsm50cvsyww9xk15hzf2csax02vpbv0jx8hlcmyhwnaac"; - name = "qtdeclarative-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtdeclarative-everywhere-src-6.8.0.tar.xz"; + sha256 = "1hj4asdzkm78v0mfwyvh847j010mb43i3xx11nma66g989ms6h9v"; + name = "qtdeclarative-everywhere-src-6.8.0.tar.xz"; }; }; qtdoc = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtdoc-everywhere-src-6.7.2.tar.xz"; - sha256 = "0vbmhx2rbfbxgzz1ipa185wvnm08a43sdr47y9jn1ivdnrn4bhd0"; - name = "qtdoc-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtdoc-everywhere-src-6.8.0.tar.xz"; + sha256 = "0mqjki77cbm14jxxh750p6h7kixkma1nsimdl97b4lslcrs3mj1x"; + name = "qtdoc-everywhere-src-6.8.0.tar.xz"; }; }; qtgraphs = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtgraphs-everywhere-src-6.7.2.tar.xz"; - sha256 = "0046293800if5ca04r40wsa4gxh8r5q6c863yrx3cmjadqk3m0fq"; - name = "qtgraphs-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtgraphs-everywhere-src-6.8.0.tar.xz"; + sha256 = "0hnb1nb8bdhjkrr3b64dk9wgkdgnrb8bxdafvizy2gsr0rd4m9ab"; + name = "qtgraphs-everywhere-src-6.8.0.tar.xz"; }; }; qtgrpc = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtgrpc-everywhere-src-6.7.2.tar.xz"; - sha256 = "0zp1l9vf0p78f53mhirs4crw6cjy6fmv26n7nndyrk8a0hz8b7wd"; - name = "qtgrpc-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtgrpc-everywhere-src-6.8.0.tar.xz"; + sha256 = "0zgli0y52n5ahiahkmr1439c5vmjjv69f1x6vw4jbhc3xkp4lnvx"; + name = "qtgrpc-everywhere-src-6.8.0.tar.xz"; }; }; qthttpserver = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qthttpserver-everywhere-src-6.7.2.tar.xz"; - sha256 = "11lbfx08yl725w4n8dmvviscixvfkpzx8ijhy74gx0waz6sbjlq3"; - name = "qthttpserver-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qthttpserver-everywhere-src-6.8.0.tar.xz"; + sha256 = "0zvrmqdch8mgpz3xbql3qy6zivyg8f0h10h86di90p1ssb40ihw1"; + name = "qthttpserver-everywhere-src-6.8.0.tar.xz"; }; }; qtimageformats = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtimageformats-everywhere-src-6.7.2.tar.xz"; - sha256 = "1mp5bi45gcmsds0g2xfjd1mklrijbwfv0hx4s1md2rxfbxwdi8g1"; - name = "qtimageformats-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtimageformats-everywhere-src-6.8.0.tar.xz"; + sha256 = "1m55966458jf5n7hciahzw8fdix3d2cf1w96qzmziqcigdazhnsr"; + name = "qtimageformats-everywhere-src-6.8.0.tar.xz"; }; }; qtlanguageserver = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtlanguageserver-everywhere-src-6.7.2.tar.xz"; - sha256 = "14hs20738d2ljfb5la8p0lip7qranjnrwl5fwdhs1zs4a5jzwndn"; - name = "qtlanguageserver-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtlanguageserver-everywhere-src-6.8.0.tar.xz"; + sha256 = "1vsw0q0pb7dbxhpg1df0bandfy7k62l68pi063fxpld4ihn1bxzv"; + name = "qtlanguageserver-everywhere-src-6.8.0.tar.xz"; }; }; qtlocation = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtlocation-everywhere-src-6.7.2.tar.xz"; - sha256 = "0pa8ibw490p3433ysni73f0gpz7gvxyl2abh3ygvd28ipxcdlcpj"; - name = "qtlocation-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtlocation-everywhere-src-6.8.0.tar.xz"; + sha256 = "181ijzpx4xav5j282w2ppa9g5wdc4z13q0r7269flrb9ngs8gi50"; + name = "qtlocation-everywhere-src-6.8.0.tar.xz"; }; }; qtlottie = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtlottie-everywhere-src-6.7.2.tar.xz"; - sha256 = "03piwc7p0lgqm73rx2kf5ckh986nv9dkssfl47js8lnkb29vrbyr"; - name = "qtlottie-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtlottie-everywhere-src-6.8.0.tar.xz"; + sha256 = "15kw2cgxqh8mhip0838yalbpfnp4pd000sdalgxvc53bd8wycsfb"; + name = "qtlottie-everywhere-src-6.8.0.tar.xz"; }; }; qtmultimedia = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtmultimedia-everywhere-src-6.7.2.tar.xz"; - sha256 = "1lsiarvag8lr4a1apa466xz56b1znjncy8wz5hyiv6nbb88kby4f"; - name = "qtmultimedia-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtmultimedia-everywhere-src-6.8.0.tar.xz"; + sha256 = "1kfgfcnihn0rqnjdif4n0hd8j2p9xkbfy3a2m3gsfypscajnlxi8"; + name = "qtmultimedia-everywhere-src-6.8.0.tar.xz"; }; }; qtnetworkauth = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtnetworkauth-everywhere-src-6.7.2.tar.xz"; - sha256 = "0w7l5lhhxhg9x1rd66727gwkpzi6l7wmyc0c4qrfp2g5rx7q42bz"; - name = "qtnetworkauth-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtnetworkauth-everywhere-src-6.8.0.tar.xz"; + sha256 = "0j6ch2p6c2b6akg0hq7iy96v118rypz77573bf4mvcy68ijmcpdr"; + name = "qtnetworkauth-everywhere-src-6.8.0.tar.xz"; }; }; qtpositioning = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtpositioning-everywhere-src-6.7.2.tar.xz"; - sha256 = "073v10z1axmqydrvdka9g69wr117kzhvci9sjr110swgmbq0j002"; - name = "qtpositioning-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtpositioning-everywhere-src-6.8.0.tar.xz"; + sha256 = "0fgbgsg1hnwnm7bbp0j41nlpmz9g65nwj48v2c8mjiq15cz4d0gc"; + name = "qtpositioning-everywhere-src-6.8.0.tar.xz"; }; }; qtquick3d = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtquick3d-everywhere-src-6.7.2.tar.xz"; - sha256 = "0w2js64s1wg86dblqmmy9cyjz2x96f9qbk4674xjsbnsqspgk3xv"; - name = "qtquick3d-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtquick3d-everywhere-src-6.8.0.tar.xz"; + sha256 = "0gr2y030phghpniw7flr90f4kckiksq39y53dwddncysw970959y"; + name = "qtquick3d-everywhere-src-6.8.0.tar.xz"; }; }; qtquick3dphysics = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtquick3dphysics-everywhere-src-6.7.2.tar.xz"; - sha256 = "0h21dq5yplqizyk43agfw7yzyjfcs3d8bl7jq6n07g2fnjw91izz"; - name = "qtquick3dphysics-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtquick3dphysics-everywhere-src-6.8.0.tar.xz"; + sha256 = "07wmy546hwavbpy368pyk0qgj79sqykqkcsnmv802qp7kwi5rcqk"; + name = "qtquick3dphysics-everywhere-src-6.8.0.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtquickeffectmaker-everywhere-src-6.7.2.tar.xz"; - sha256 = "0vbmgdqlwihi379z1yr8ci09jxr93jrkgd8ripr2jb680z72c3rv"; - name = "qtquickeffectmaker-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtquickeffectmaker-everywhere-src-6.8.0.tar.xz"; + sha256 = "1x3lijsfd8pv74sgyjc7cj9s0c2q9bf49r44aa2d0zdjs3rxg8ca"; + name = "qtquickeffectmaker-everywhere-src-6.8.0.tar.xz"; }; }; qtquicktimeline = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtquicktimeline-everywhere-src-6.7.2.tar.xz"; - sha256 = "1sqr0xmiz33wfl5db24chq3gsbs0p17ylbin23gcx5gh3jhdxv91"; - name = "qtquicktimeline-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtquicktimeline-everywhere-src-6.8.0.tar.xz"; + sha256 = "020zv4fnx37k8nm0c462bk8r9ma7l6ivr8j7i82h6688v0ds81hi"; + name = "qtquicktimeline-everywhere-src-6.8.0.tar.xz"; }; }; qtremoteobjects = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtremoteobjects-everywhere-src-6.7.2.tar.xz"; - sha256 = "10vlkg5v5hc8fwiw9x06d84z6cs4i5kxm652si3lwvvxma0np40b"; - name = "qtremoteobjects-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtremoteobjects-everywhere-src-6.8.0.tar.xz"; + sha256 = "123mkiak4xj05yg6sg86z1hixp8vycj0yks1fj1yk5lpdl65gpzi"; + name = "qtremoteobjects-everywhere-src-6.8.0.tar.xz"; }; }; qtscxml = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtscxml-everywhere-src-6.7.2.tar.xz"; - sha256 = "0vy80npai5ikwlf0ghxf5xj8vq1hi3cdjgddjas2g3yl0qszkv10"; - name = "qtscxml-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtscxml-everywhere-src-6.8.0.tar.xz"; + sha256 = "0fxl6yc03z43x49nskm2r1wa7vq9zg6dv1hl74nipc21yi7amadv"; + name = "qtscxml-everywhere-src-6.8.0.tar.xz"; }; }; qtsensors = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtsensors-everywhere-src-6.7.2.tar.xz"; - sha256 = "0ndvwra9bssfqw32bk5mbj3zdqgi9zshm0gd0bfd8vn5hz3xxlga"; - name = "qtsensors-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtsensors-everywhere-src-6.8.0.tar.xz"; + sha256 = "0yg6vn1yk4k962bff33pk9pjzyw3rskqcqfnadfvgyh5zb2l8dbj"; + name = "qtsensors-everywhere-src-6.8.0.tar.xz"; }; }; qtserialbus = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtserialbus-everywhere-src-6.7.2.tar.xz"; - sha256 = "0asb6xnp6gnn41bivirld1llhb2zmbgidianv7blcms5kfliqr37"; - name = "qtserialbus-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtserialbus-everywhere-src-6.8.0.tar.xz"; + sha256 = "1ynsy0xkjdp5d3rii0ch540n8cs07dzwd66cxw59gh9j92839676"; + name = "qtserialbus-everywhere-src-6.8.0.tar.xz"; }; }; qtserialport = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtserialport-everywhere-src-6.7.2.tar.xz"; - sha256 = "1z5lsgdl4g48fr2kcp7zznv5jyv42xmd4qn6rrxikd8w2v8lrhr1"; - name = "qtserialport-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtserialport-everywhere-src-6.8.0.tar.xz"; + sha256 = "1hz7fynpa6z0x206g920xfk45hi74fahpcyha1f09cddrwpdfrvp"; + name = "qtserialport-everywhere-src-6.8.0.tar.xz"; }; }; qtshadertools = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtshadertools-everywhere-src-6.7.2.tar.xz"; - sha256 = "1hbw5xz12frydk787rl6cgfxm2bxlzkxiwcxjjmgq04cmk039ypd"; - name = "qtshadertools-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtshadertools-everywhere-src-6.8.0.tar.xz"; + sha256 = "1jy4siv6ny9wgs5bcn19z05my9q8za0wi5lyngrlndw26k4jssa4"; + name = "qtshadertools-everywhere-src-6.8.0.tar.xz"; }; }; qtspeech = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtspeech-everywhere-src-6.7.2.tar.xz"; - sha256 = "1khl90m6jd2zg0r0fncdz3r1w2l96vwp6jihpq9rgr730ja7d36c"; - name = "qtspeech-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtspeech-everywhere-src-6.8.0.tar.xz"; + sha256 = "0rb52qbwjkxlncz28rcjapi059b8px3i5haq71gm7f1pph90l8vm"; + name = "qtspeech-everywhere-src-6.8.0.tar.xz"; }; }; qtsvg = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtsvg-everywhere-src-6.7.2.tar.xz"; - sha256 = "00ggr84l1h8did6ivprv343rwwcl7j2bbbilxqzmiqsvlf3143gv"; - name = "qtsvg-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtsvg-everywhere-src-6.8.0.tar.xz"; + sha256 = "16b1ckqpfhzn9xaqbwz5gy4b0xavbpjxj4064ivq23sjbqymjyng"; + name = "qtsvg-everywhere-src-6.8.0.tar.xz"; }; }; qttools = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qttools-everywhere-src-6.7.2.tar.xz"; - sha256 = "0ajbma9lbrb0d048bvg2xl74m833ddv2b9684r3hjcr53fnmbs2q"; - name = "qttools-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qttools-everywhere-src-6.8.0.tar.xz"; + sha256 = "1xw1k7rnm2yylbj08p9a0w2ydfcfwa50qca3dv6cc0w54vc1aca0"; + name = "qttools-everywhere-src-6.8.0.tar.xz"; }; }; qttranslations = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qttranslations-everywhere-src-6.7.2.tar.xz"; - sha256 = "1a9cb1br3wqn0rshkgj21hba3r7jx8dbavc3ayfjgdy1bl5phicq"; - name = "qttranslations-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qttranslations-everywhere-src-6.8.0.tar.xz"; + sha256 = "1dkw8f3hcnmnnv0ia62i5189dcgjkpx7pkcal180rka3q9kjpgw4"; + name = "qttranslations-everywhere-src-6.8.0.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtvirtualkeyboard-everywhere-src-6.7.2.tar.xz"; - sha256 = "03qqrs0nv6bhnm0ps54inw43xgnfx3vdq8mqq5wzyq09basn81ij"; - name = "qtvirtualkeyboard-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtvirtualkeyboard-everywhere-src-6.8.0.tar.xz"; + sha256 = "1q0cdmxm4j9w6lhm1k1ayjykknl6kmzr415qc14znr87ykbh4rcg"; + name = "qtvirtualkeyboard-everywhere-src-6.8.0.tar.xz"; }; }; qtwayland = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtwayland-everywhere-src-6.7.2.tar.xz"; - sha256 = "0nwa59g1wk7fkym837pkw312abjb376gx44rpd5d8jv4vphmg852"; - name = "qtwayland-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwayland-everywhere-src-6.8.0.tar.xz"; + sha256 = "02h6lak0cp87b76474ifsm78vsx0gwfc2smnzg3g3srq2rcmhmqp"; + name = "qtwayland-everywhere-src-6.8.0.tar.xz"; }; }; qtwebchannel = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtwebchannel-everywhere-src-6.7.2.tar.xz"; - sha256 = "072hniyxavz2jjkzh7mrz4g67zf0cngvp4xgdradxrqhgdh9cpdc"; - name = "qtwebchannel-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwebchannel-everywhere-src-6.8.0.tar.xz"; + sha256 = "1h30mzmhkbcjaj4wivway0ldrdidqyg2b79313v2m3capwjhs9fn"; + name = "qtwebchannel-everywhere-src-6.8.0.tar.xz"; }; }; qtwebengine = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtwebengine-everywhere-src-6.7.2.tar.xz"; - sha256 = "1lgz0mj9lw4ii1c8nkbr0ll02xzx8i6n7wvvn21f72sdb5smhxf7"; - name = "qtwebengine-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwebengine-everywhere-src-6.8.0.tar.xz"; + sha256 = "0lklgz5i3ryl6d1ghy11rvmg9isbzvrvx007nwb4qqm89294b114"; + name = "qtwebengine-everywhere-src-6.8.0.tar.xz"; }; }; qtwebsockets = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtwebsockets-everywhere-src-6.7.2.tar.xz"; - sha256 = "0pr13p6inlh2i79yc567w8dp446rh9xvfakq5diwis4wxkv4mpjv"; - name = "qtwebsockets-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwebsockets-everywhere-src-6.8.0.tar.xz"; + sha256 = "0vxgbqxahay0gz5cv3fl075qw3flm3hgz1srhs4jl75p8rff0jy1"; + name = "qtwebsockets-everywhere-src-6.8.0.tar.xz"; }; }; qtwebview = { - version = "6.7.2"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.2/submodules/qtwebview-everywhere-src-6.7.2.tar.xz"; - sha256 = "1zp44kfrks0grc1l6f3ayvfmw45zmhal0pfrzjdw7znl0dlhkqac"; - name = "qtwebview-everywhere-src-6.7.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwebview-everywhere-src-6.8.0.tar.xz"; + sha256 = "1wvrq7lf688hqvq102kyvx7kqnixxp6w25cb6rvb2xiqb50rvf3w"; + name = "qtwebview-everywhere-src-6.8.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 9007129cecf5..b6744692bbe8 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -29,12 +29,12 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ] - ++ lib.optionals (!stdenv.isDarwin) [ pkg-config ] # for finding libsecret + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ] # for finding libsecret ; - buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ] ++ [ qtbase qttools ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix index 94dc1646513c..7005c781e2a6 100644 --- a/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtpbfimageplugin"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "tumic0"; repo = "QtPBFImagePlugin"; rev = version; - sha256 = "sha256-7DaJvpApdnh5+9vd0spUDorwzpzLEaJ8477qE8nJLOc="; + sha256 = "sha256-RbGVjwVIwO6Rj/hbNEowtZLqJdtkTfnq5YdnEYnbkTM="; }; nativeBuildInputs = [ qmake ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # Fix plugin dir substituteInPlace pbfplugin.pro \ --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix darwin build substituteInPlace pbfplugin.pro \ --replace '$$PROTOBUF/include' '${protobuf}/include' \ diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 3d44f556a0ff..20b8ea9b43db 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -1,34 +1,35 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, qmake -, qtbase -, qtsvg -, qtx11extras ? null -, kwindowsystem ? null -, qtwayland -, libX11 -, libXext -, qttools -, wrapQtAppsHook -, gitUpdater +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + qmake, + qtbase, + qtsvg, + qtx11extras ? null, # Qt 5 only + kwindowsystem, + qtwayland, + libX11, + libXext, + qttools, + wrapQtAppsHook, + gitUpdater, -, qt6Kvantum ? null + qt6Kvantum ? null, }: let isQt5 = lib.versionOlder qtbase.version "6"; in stdenv.mkDerivation (finalAttrs: { pname = "qtstyleplugin-kvantum${lib.optionalString isQt5 "5"}"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${finalAttrs.version}"; - hash = "sha256-1aeXcN9DwPE8CoaxCqCNL9UEcRHJdaKxS7Ivjp3YNN8="; + hash = "sha256-x2XsJ26y9y6IF9aY0fmAcvO4zmwLjvE2Lfvzw+GqchM="; }; nativeBuildInputs = [ @@ -38,14 +39,18 @@ stdenv.mkDerivation (finalAttrs: { wrapQtAppsHook ]; - buildInputs = [ - qtbase - qtsvg - libX11 - libXext - kwindowsystem - ] ++ lib.optionals isQt5 [ qtx11extras ] - ++ lib.optionals (!isQt5) [ qtwayland ]; + buildInputs = + [ + qtbase + qtsvg + libX11 + libXext + ] + ++ lib.optionals isQt5 [ qtx11extras ] + ++ lib.optionals (!isQt5) [ + kwindowsystem + qtwayland + ]; sourceRoot = "${finalAttrs.src.name}/Kvantum"; @@ -78,11 +83,14 @@ stdenv.mkDerivation (finalAttrs: { rev-prefix = "V"; }; - meta = with lib; { + meta = { description = "SVG-based Qt5 theme engine plus a config tool and extra themes"; homepage = "https://github.com/tsujan/Kvantum"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo Scrumplex ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + romildo + Scrumplex + ]; }; }) diff --git a/pkgs/development/libraries/quantlib/default.nix b/pkgs/development/libraries/quantlib/default.nix deleted file mode 100644 index f38d560a8e68..000000000000 --- a/pkgs/development/libraries/quantlib/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, boost -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "quantlib"; - version = "1.35"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "lballabio"; - repo = "QuantLib"; - rev = "v${finalAttrs.version}"; - hash = "sha256-L0cdfrVZTwyRcDnYhbmRbH53+mBt6AnrKm+in++du2M="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ]; - - # Required by RQuantLib, may be beneficial for others too - cmakeFlags = [ "-DQL_HIGH_RESOLUTION_DATE=ON" ]; - - # Needed for RQuantLib and possible others - postInstall = '' - cp ./quantlib-config $out/bin/ - ''; - - meta = with lib; { - description = "Free/open-source library for quantitative finance"; - homepage = "https://quantlib.org"; - platforms = platforms.unix; - license = licenses.bsd3; - maintainers = [ maintainers.kupac ]; - }; -}) diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index 11350128b4aa..acdb76cc52b2 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -13,28 +13,27 @@ , runCommand , python3 , quarto -, extraPythonPackages ? ps: with ps; [] +, extraPythonPackages ? ps: [] , sysctl }: stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.5.57"; + version = "1.6.33"; + src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - sha256 = "sha256-ZBjv/Z98il8EMZe88fMKSi1YjeOZ8jEh7OxYDKUTMpY="; + hash = "sha256-0qCQswtBC8R1Q7pHLhJtqCncllqgXo1t9pG97VwCtAI="; }; + patches = [ + ./deno2.patch + ]; + nativeBuildInputs = [ makeWrapper ]; - postPatch = '' - # Compat for Deno >=1.26 - substituteInPlace bin/quarto.js \ - --replace-fail ']))?.trim();' ']))?.trim().split(" ")[0];' - ''; - dontStrip = true; preFixup = '' @@ -63,7 +62,7 @@ stdenv.mkDerivation (final: { passthru.tests = { quarto-check = runCommand "quarto-check" { - nativeBuildInputs = lib.optionals stdenv.isDarwin [ sysctl ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ sysctl ]; } '' export HOME="$(mktemp -d)" ${quarto}/bin/quarto check diff --git a/pkgs/development/libraries/quarto/deno2.patch b/pkgs/development/libraries/quarto/deno2.patch new file mode 100644 index 000000000000..1ece9ae95450 --- /dev/null +++ b/pkgs/development/libraries/quarto/deno2.patch @@ -0,0 +1,149 @@ +diff --git a/bin/quarto.js b/bin/quarto.js +index f854281..0b78f6e 100644 +--- a/bin/quarto.js ++++ b/bin/quarto.js +@@ -28511,7 +28511,7 @@ function jupyterHubServicePrefix() { + return Deno.env.get("JUPYTERHUB_SERVICE_PREFIX"); + } + function isInteractiveTerminal() { +- return Deno.isatty(Deno.stderr.rid); ++ return Deno.stderr.isTerminal(); + } + function isInteractiveSession() { + return isRStudio() || isInteractiveTerminal() || isVSCodeOutputChannel(); +@@ -83562,7 +83562,7 @@ function writeFileToStdout(file) { + }); + const contents = readAllSync(df); + writeAllSync1(Deno.stdout, contents); +- Deno.close(df.rid); ++ df.close(); + } + function clearLine() { + info(ansi.eraseLine.cursorLeft(), { +@@ -96154,6 +96154,7 @@ class ParserBase { + class SAXParser extends ParserBase { + _listeners = {}; + _controller; ++ _encoding; + fireListeners(event) { + const [name, ...args] = event; + const list = this._listeners[name] || []; +@@ -96189,33 +96190,23 @@ class SAXParser extends ParserBase { + write(chunk, controller) { + try { + this._controller = controller; +- this.chunk = new TextDecoder().decode(chunk); ++ this.chunk = new TextDecoder(this._encoding).decode(chunk); + this.run(); + } finally{ + this._controller = undefined; + } + } +- getStream() { +- return new WritableStream(this); +- } +- getWriter() { +- const streamWriter = this.getStream().getWriter(); +- return { +- async write (p) { +- await streamWriter.ready; +- await streamWriter.write(p); +- return p.length; +- } +- }; +- } +- async parse(source) { ++ async parse(source, encoding) { ++ this._encoding = encoding; + if (typeof source === 'string') { + this.chunk = source; + this.run(); + } else if (source instanceof Uint8Array) { + this.write(source); + } else { +- await Deno.copy(source, this.getWriter()); ++ await source.pipeThrough(new TextDecoderStream(this._encoding)).pipeTo(new WritableStream({ ++ write: (str)=>this.parse(str, encoding) ++ })); + } + } + on(event, listener) { +@@ -96326,8 +96317,7 @@ async function readSitemap(sitemapPath) { + } + }); + const reader = await Deno.open(sitemapPath); +- await parser.parse(reader); +- reader.close(); ++ await parser.parse(reader.readable); + return urlset; + } + function writeSitemap(sitemapPath, urlset, draftMode) { +@@ -98407,21 +98397,21 @@ async function generateFeed(feed, feedItems, path) { + feed, + escape: __VIRTUAL_FILE172 + }); +- await Deno.write(feedFile.rid, textEncoder.encode(preamble)); ++ await feedFile.write(textEncoder.encode(preamble)); + for (const feedItem of feedItems){ + const item = renderEjs(resourcePath("projects/website/listing/feed/item.ejs.md"), { + item: feedItem, + escape: __VIRTUAL_FILE172 + }); +- await Deno.write(feedFile.rid, textEncoder.encode(item)); ++ await feedFile.write(textEncoder.encode(item)); + } + const postamble = renderEjs(resourcePath("projects/website/listing/feed/postamble.ejs.md"), { + feed, + escape: __VIRTUAL_FILE172 + }); +- await Deno.write(feedFile.rid, textEncoder.encode(postamble)); ++ await feedFile.write(textEncoder.encode(postamble)); + } finally{ +- Deno.close(feedFile.rid); ++ feedFile.close(); + } + } + function prepareItems(items, options) { +@@ -112277,7 +112267,7 @@ async function renderForPublish(render, providerName, type, title, siteUrl) { + } + function stageDocumentPublish(title, publishFiles) { + const publishDir = globalTempContext().createDir(); +- const stagedFiles = window.structuredClone(publishFiles); ++ const stagedFiles = globalThis.structuredClone(publishFiles); + stagedFiles.baseDir = publishDir; + for (const file of publishFiles.files){ + const src = join2(publishFiles.baseDir, file); +@@ -126377,33 +126367,6 @@ function reportPeformanceMetrics() { + console.log("Performance metrics"); + console.log("Quarto:"); + console.log(JSON.stringify(quartoPerformanceMetrics(), null, 2)); +- console.log(); +- console.log("Deno:"); +- const denoMetrics = JSON.parse(JSON.stringify(Deno.metrics())); +- denoMetrics.ops = Object.fromEntries(Object.entries(denoMetrics.ops).map(([key, opMetrics])=>{ +- for (const key of Object.keys(opMetrics)){ +- if (opMetrics[key] === 0) { +- delete opMetrics[key]; +- } +- } +- return [ +- key, +- opMetrics +- ]; +- }).filter(([_key, opMetrics])=>Object.keys(opMetrics).length > 0).map(([key, opMetrics])=>{ +- if (opMetrics.opsDispatched === opMetrics.opsDispatchedSync && opMetrics.opsDispatched === opMetrics.opsCompleted && opMetrics.opsDispatched === opMetrics.opsCompletedSync || opMetrics.opsDispatched === opMetrics.opsDispatchedAsync && opMetrics.opsDispatched === opMetrics.opsCompleted && opMetrics.opsDispatched === opMetrics.opsCompletedAsync) { +- return [ +- key, +- opMetrics.opsDispatched +- ]; +- } else { +- return [ +- key, +- opMetrics +- ]; +- } +- })); +- console.log(JSON.stringify(denoMetrics, null, 2)); + } + async function mainRunner(runner) { + try { diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index c3f1f7a7834a..b2fcad6cab87 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib qtbase ]; propagatedBuildInputs = [ qt5compat ]; nativeBuildInputs = [ cmake ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix deleted file mode 100644 index d0b4d22b87e3..000000000000 --- a/pkgs/development/libraries/quesoglc/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl, libGLU, libGL, glew, freetype, fontconfig, fribidi, libX11 }: -stdenv.mkDerivation rec { - pname = "quesoglc"; - version = "0.7.2"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0cf9ljdzii5d4i2m23gdmf3kn521ljcldzq69lsdywjid3pg5zjl"; - }; - buildInputs = [ libGLU libGL glew freetype fontconfig fribidi libX11 ]; - # FIXME: Configure fails to use system glew. - meta = with lib; { - description = "Free implementation of the OpenGL Character Renderer"; - longDescription = '' - QuesoGLC is a free (as in free speech) implementation of the OpenGL - Character Renderer (GLC). QuesoGLC is based on the FreeType library, - provides Unicode support and is designed to be easily ported to any - platform that supports both FreeType and the OpenGL API. - ''; - homepage = "https://quesoglc.sourceforge.net/"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ astsmtl ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix deleted file mode 100644 index c3de38398084..000000000000 --- a/pkgs/development/libraries/quickder/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, python3 -, cmake -, doxygen -, graphviz -, quickmem -, arpa2common -, arpa2cm -, ensureNewerSourcesForZipFilesHook -}: - -stdenv.mkDerivation rec { - pname = "quickder"; - version = "1.7.1"; - - src = fetchFromGitLab { - owner = "arpa2"; - repo = "quick-der"; - rev = "v${version}"; - hash = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk="; - }; - - nativeBuildInputs = [ - cmake - doxygen - graphviz - ensureNewerSourcesForZipFilesHook - ]; - - buildInputs = [ - arpa2cm - arpa2common - (python3.withPackages (ps: with ps; [ - asn1ate - colored - pyparsing - setuptools - six - ])) - quickmem - ]; - - - postPatch = '' - substituteInPlace setup.py --replace 'pyparsing==' 'pyparsing>=' - ''; - - doCheck = true; - - meta = with lib; { - description = "Quick (and Easy) DER, a Library for parsing ASN.1"; - homepage = "https://gitlab.com/arpa2/quick-der/"; - license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ leenaars ]; - }; -} diff --git a/pkgs/development/libraries/quickfix/default.nix b/pkgs/development/libraries/quickfix/default.nix deleted file mode 100644 index 0c327d0d5e59..000000000000 --- a/pkgs/development/libraries/quickfix/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - autoconf, - automake, - libtool, -}: - -stdenv.mkDerivation rec { - pname = "quickfix"; - version = "1.15.1"; - - src = fetchFromGitHub { - owner = "quickfix"; - repo = "quickfix"; - rev = "v${version}"; - sha256 = "1fgpwgvyw992mbiawgza34427aakn5zrik3sjld0i924a9d17qwg"; - }; - - patches = [ - # Improved C++17 compatibility - (fetchpatch { - url = "https://github.com/quickfix/quickfix/commit/a46708090444826c5f46a5dbf2ba4b069b413c58.diff"; - sha256 = "1wlk4j0wmck0zm6a70g3nrnq8fz0id7wnyxn81f7w048061ldhyd"; - }) - ./disableUnitTests.patch - ]; - - # autoreconfHook does not work - nativeBuildInputs = [ - autoconf - automake - libtool - ]; - - enableParallelBuilding = true; - - postPatch = '' - substituteInPlace bootstrap --replace-fail glibtoolize libtoolize - ''; - - preConfigure = '' - ./bootstrap - ''; - - # More hacking out of the unittests - preBuild = '' - substituteInPlace Makefile --replace 'UnitTest++' ' ' - ''; - - meta = with lib; { - description = "QuickFIX C++ Fix Engine Library"; - homepage = "http://www.quickfixengine.org"; - license = licenses.free; # similar to BSD 4-clause - maintainers = with maintainers; [ bhipple ]; - broken = stdenv.isAarch64; - }; -} diff --git a/pkgs/development/libraries/quickfix/disableUnitTests.patch b/pkgs/development/libraries/quickfix/disableUnitTests.patch deleted file mode 100644 index 41a2f698e55f..000000000000 --- a/pkgs/development/libraries/quickfix/disableUnitTests.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -u -r source-baseline-patchPhase/configure.ac source/configure.ac ---- source-baseline-patchPhase/configure.ac 1970-01-01 00:00:01.000000000 +0000 -+++ source/configure.ac 2021-01-12 22:49:28.948861699 +0000 -@@ -43,7 +43,7 @@ - - AC_CANONICAL_HOST - --build_no_unit_test = no -+build_no_unit_test = yes - - # Detect the target system - case "${host_os}" in -@@ -344,8 +344,6 @@ - examples/Makefile - examples/executor/Makefile - examples/executor/C++/Makefile -- examples/ordermatch/Makefile -- examples/ordermatch/test/Makefile - examples/tradeclient/Makefile - examples/tradeclientgui/Makefile - examples/tradeclientgui/banzai/Makefile -diff -u -r source-baseline-patchPhase/examples/Makefile.am source/examples/Makefile.am ---- source-baseline-patchPhase/examples/Makefile.am 1970-01-01 00:00:01.000000000 +0000 -+++ source/examples/Makefile.am 2021-01-12 22:51:55.782568550 +0000 -@@ -1,3 +1,3 @@ --SUBDIRS = executor ordermatch tradeclient tradeclientgui -+SUBDIRS = executor tradeclient tradeclientgui - --EXTRA_DIST = examples.dsw configure configure.in bootstrap Makefile.am -\ No newline at end of file -+EXTRA_DIST = examples.dsw configure configure.in bootstrap Makefile.am -diff -u -r source-baseline-patchPhase/src/Makefile.am source/src/Makefile.am ---- source-baseline-patchPhase/src/Makefile.am 1970-01-01 00:00:01.000000000 +0000 -+++ source/src/Makefile.am 2021-01-12 22:53:02.593432380 +0000 -@@ -15,27 +15,23 @@ - if NO_UNIT_TEST - noinst_PROGRAMS = - else --noinst_PROGRAMS = at ut pt -+noinst_PROGRAMS = at pt - endif - - at_SOURCES = at.cpp at_application.h --ut_SOURCES = ut.cpp - pt_SOURCES = pt.cpp - - EXTRA_DIST = getopt.c getopt-repl.h - - at_LDADD = C++/libquickfix.la --ut_LDADD = C++/test/libquickfixcpptest.la C++/libquickfix.la - pt_LDADD = C++/libquickfix.la - - INCLUDES =-IC++ -IC++/test -I../UnitTest++/src --LDFLAGS =-L../UnitTest++ -lUnitTest++ -+ - - all-local: -- rm -f ../test/ut ../test/pt ../test/at ../test/ut_debug -- ln -s ../src/ut ../test/ut -+ rm -rf ../test/pt ../test/at ../test/ut_debug - ln -s ../src/pt ../test/pt - ln -s ../src/at ../test/at -- ln -s ../src/.libs/ut ../test/ut_debug - - clean-local: diff --git a/pkgs/development/libraries/quickmem/default.nix b/pkgs/development/libraries/quickmem/default.nix deleted file mode 100644 index 91b170030aaf..000000000000 --- a/pkgs/development/libraries/quickmem/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, cmake -, doxygen -, graphviz -, arpa2common -, arpa2cm -}: - -stdenv.mkDerivation rec { - pname = "quickmem"; - version = "0.3.0"; - - src = fetchFromGitLab { - owner = "arpa2"; - repo = "Quick-MEM"; - rev = "v${version}"; - hash = "sha256-cqg8QN4/I+zql7lVDDAgFA05Dmg4ylBTvPSPP7WATdc="; - }; - - nativeBuildInputs = [ - cmake - doxygen - graphviz - ]; - - buildInputs = [ - arpa2cm - arpa2common - ]; - - doCheck = true; - - meta = with lib; { - description = "Memory pooling for ARPA2 projects"; - homepage = "https://gitlab.com/arpa2/Quick-MEM/"; - license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ leungbk ]; - }; -} diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix index 49dfc94993e4..63ddc6313d6a 100644 --- a/pkgs/development/libraries/quictls/default.nix +++ b/pkgs/development/libraries/quictls/default.nix @@ -13,15 +13,15 @@ , withCryptodev ? false }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation rec { pname = "quictls"; - version = "3.1.5-quic1"; + version = "3.3.0-quic1"; src = fetchFromGitHub { owner = "quictls"; repo = "openssl"; - rev = "cb6841b741544bfd8868c1641ce96a934985509e"; - hash = "sha256-oR46jefarUGmBYjjpEvtKFzIOgSXSy58cLdX+P5ocA8="; + rev = "openssl-${version}"; + hash = "sha256-kBPwldTJbJSuvBVylJNcLSJvF/Hbqh0mfT4Ub5Xc6dk="; }; patches = [ @@ -32,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: { ../openssl/3.0/openssl-disable-kernel-detection.patch (if stdenv.hostPlatform.isDarwin - then ../openssl/use-etc-ssl-certs-darwin.patch - else ../openssl/use-etc-ssl-certs.patch) + then ../openssl/3.3/use-etc-ssl-certs-darwin.patch + else ../openssl/3.3/use-etc-ssl-certs.patch) ]; postPatch = '' @@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional enableSSL3 "enable-ssl3" # We select KTLS here instead of the configure-time detection (which we patch out). # KTLS should work on FreeBSD 13+ as well, so we could enable it if someone tests it. - ++ lib.optional (stdenv.isLinux && lib.versionAtLeast finalAttrs.version "3.0.0") "enable-ktls" + ++ lib.optional (stdenv.hostPlatform.isLinux && lib.versionAtLeast version "3.0.0") "enable-ktls" ++ lib.optional stdenv.hostPlatform.isAarch64 "no-afalgeng" # OpenSSL needs a specific `no-shared` configure flag. # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options @@ -176,11 +176,11 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - changelog = "https://github.com/quictls/openssl/blob/${finalAttrs.src.rev}/CHANGES.md"; + changelog = "https://github.com/quictls/openssl/blob/openssl-${version}/CHANGES.md"; description = "TLS/SSL and crypto library with QUIC APIs"; homepage = "https://quictls.github.io"; license = lib.licenses.openssl; maintainers = with lib.maintainers; [ izorkin ]; platforms = lib.platforms.all; }; -}) +} diff --git a/pkgs/development/libraries/qwlroots/default.nix b/pkgs/development/libraries/qwlroots/default.nix index 85282afb15b5..190a13e15a27 100644 --- a/pkgs/development/libraries/qwlroots/default.nix +++ b/pkgs/development/libraries/qwlroots/default.nix @@ -20,19 +20,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "qwlroots"; - version = "0.1.0"; + version = "0.3.0-wlroots0.17-0.18"; src = fetchFromGitHub { owner = "vioken"; repo = "qwlroots"; rev = finalAttrs.version; - hash = "sha256-ev4oCKR43XaYNTavj9XI3RAtB6RFprChpBFsrA2nVsM="; + hash = "sha256-ObXegiJ4LT8bTUxNVJ9wBKN5oILWPDYTsuCy+OCsh3k="; }; nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook wayland-scanner ]; @@ -58,6 +57,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "PREFER_QT_5" (lib.versionOlder qtbase.version "6")) ]; + dontWrapQtApps = true; + meta = { description = "Qt and QML bindings for wlroots"; homepage = "https://github.com/vioken/qwlroots"; diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index dec84c1c4955..814e8f0252c1 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ qtbase qtsvg qttools ]; - nativeBuildInputs = [ qmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ qmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; postPatch = '' sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri diff --git a/pkgs/development/libraries/qxmpp/default.nix b/pkgs/development/libraries/qxmpp/default.nix index 98b4c0a2b7c7..20730810d9cd 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.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "qxmpp-project"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Tp3SDOoUAnAvwkID6U63TkeLy6Is+sWn7Oy0nT1f/LQ="; + sha256 = "sha256-fxTlxlnqttZZWRkt+vo4MJJz7DR/FMXcOqUv+/nlV18="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix deleted file mode 100644 index 66c70fcf4dd0..000000000000 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssl, popt, xmlto }: - -stdenv.mkDerivation rec { - pname = "rabbitmq-c"; - version = "0.14.0"; - - src = fetchFromGitHub { - owner = "alanxz"; - repo = "rabbitmq-c"; - rev = "v${version}"; - hash = "sha256-ffdnLEgUg+4G12JntjFag3ZXMvEL42hsrY6VT58ccJ0="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl popt xmlto ]; - - meta = with lib; { - description = "RabbitMQ C AMQP client library"; - homepage = "https://github.com/alanxz/rabbitmq-c"; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix deleted file mode 100644 index 4d60456d8ab2..000000000000 --- a/pkgs/development/libraries/raft-canonical/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv, lz4, lxd-lts }: - -stdenv.mkDerivation rec { - pname = "raft-canonical"; - version = "0.18.1"; - - src = fetchFromGitHub { - owner = "canonical"; - repo = "raft"; - rev = "refs/tags/v${version}"; - hash = "sha256-ogTw0+ZFhMRaLAxAAXzHSlLRYFuX8W/zjqglXHfvUv4="; - }; - - nativeBuildInputs = [ autoreconfHook file pkg-config ]; - buildInputs = [ libuv lz4 ]; - - enableParallelBuilding = true; - - patches = [ - # network tests either hang indefinitely, or fail outright - ./disable-net-tests.patch - - # missing dir check is flaky - ./disable-missing-dir-test.patch - ]; - - preConfigure = '' - substituteInPlace configure --replace /usr/bin/ " " - ''; - - doCheck = true; - - outputs = [ "dev" "out" ]; - - passthru.tests = { - inherit lxd-lts; - }; - - meta = with lib; { - description = '' - Fully asynchronous C implementation of the Raft consensus protocol - ''; - longDescription = '' - The library has modular design: its core part implements only the core - Raft algorithm logic, in a fully platform independent way. On top of - that, a pluggable interface defines the I/O implementation for networking - (send/receive RPC messages) and disk persistence (store log entries and - snapshots). - ''; - homepage = "https://github.com/canonical/raft"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/raft-canonical/disable-missing-dir-test.patch b/pkgs/development/libraries/raft-canonical/disable-missing-dir-test.patch deleted file mode 100644 index ddfec9b22e14..000000000000 --- a/pkgs/development/libraries/raft-canonical/disable-missing-dir-test.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/test/unit/test_uv_fs.c b/test/unit/test_uv_fs.c -index 638c39c..c8758d2 100644 ---- a/test/unit/test_uv_fs.c -+++ b/test/unit/test_uv_fs.c -@@ -40,18 +40,6 @@ TEST(UvFsCheckDir, exists, DirSetUp, DirTearDown, 0, NULL) - return MUNIT_OK; - } - --/* If the directory doesn't exist, it an error is returned. */ --TEST(UvFsCheckDir, doesNotExist, DirSetUp, DirTearDown, 0, NULL) --{ -- const char *parent = data; -- char errmsg[RAFT_ERRMSG_BUF_SIZE]; -- char dir[128]; -- sprintf(errmsg, "%s/sub", parent); -- sprintf(errmsg, "directory '%s' does not exist", dir); -- CHECK_DIR_ERROR(dir, RAFT_NOTFOUND, errmsg); -- return MUNIT_OK; --} -- - /* If the process can't access the directory, an error is returned. */ - TEST(UvFsCheckDir, permissionDenied, NULL, NULL, 0, NULL) - { diff --git a/pkgs/development/libraries/raft-canonical/disable-net-tests.patch b/pkgs/development/libraries/raft-canonical/disable-net-tests.patch deleted file mode 100644 index 7c8be29feafd..000000000000 --- a/pkgs/development/libraries/raft-canonical/disable-net-tests.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 2137932..93abdb6 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -198,11 +198,7 @@ test_integration_uv_SOURCES = \ - test/integration/test_uv_bootstrap.c \ - test/integration/test_uv_load.c \ - test/integration/test_uv_recover.c \ -- test/integration/test_uv_recv.c \ -- test/integration/test_uv_send.c \ - test/integration/test_uv_set_term.c \ -- test/integration/test_uv_tcp_connect.c \ -- test/integration/test_uv_tcp_listen.c \ - test/integration/test_uv_snapshot_put.c \ - test/integration/test_uv_truncate.c \ - test/integration/test_uv_work.c diff --git a/pkgs/development/libraries/rang/default.nix b/pkgs/development/libraries/rang/default.nix deleted file mode 100644 index 050beef5ea30..000000000000 --- a/pkgs/development/libraries/rang/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { - pname = "rang"; - version = "3.1.0"; - src = fetchFromGitHub { - owner = "agauniyal"; - repo = "rang"; - rev = "cabe04d6d6b05356fa8f9741704924788f0dd762"; - sha256 = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s"; - }; - nativeBuildInputs = [ cmake ]; - meta = with lib; { - description = - "A Minimal, Header only Modern c++ library for terminal goodies"; - homepage = "https://agauniyal.github.io/rang/"; - license = licenses.unlicense; - maintainers = [ maintainers.HaoZeke ]; - }; -} diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix deleted file mode 100644 index 3ef599887eb4..000000000000 --- a/pkgs/development/libraries/range-v3/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "range-v3"; - version = "0.12.0"; - - src = fetchFromGitHub { - owner = "ericniebler"; - repo = "range-v3"; - rev = version; - hash = "sha256-bRSX91+ROqG1C3nB9HSQaKgLzOHEFy9mrD2WW3PRBWU="; - }; - - nativeBuildInputs = [ cmake ]; - - # Building the tests currently fails on AArch64 due to internal compiler - # errors (with GCC 9.2): - cmakeFlags = [ "-DRANGES_ENABLE_WERROR=OFF" ] - ++ lib.optional stdenv.isAarch64 "-DRANGE_V3_TESTS=OFF"; - - doCheck = !stdenv.isAarch64; - checkTarget = "test"; - - meta = with lib; { - description = "Experimental range library for C++11/14/17"; - homepage = "https://github.com/ericniebler/range-v3"; - changelog = "https://github.com/ericniebler/range-v3/releases/tag/${version}"; - license = licenses.boost; - platforms = platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix deleted file mode 100644 index ce369eb6ff3f..000000000000 --- a/pkgs/development/libraries/rapidcheck/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, unstableGitUpdater -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rapidcheck"; - version = "0-unstable-2023-12-14"; - - src = fetchFromGitHub { - owner = "emil-e"; - repo = "rapidcheck"; - rev = "ff6af6fc683159deb51c543b065eba14dfcf329b"; - hash = "sha256-Ixz5RpY0n8Un/Pv4XoTfbs40+70iyMbkQUjDqoLaWOg="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) - (lib.cmakeBool "RC_INSTALL_ALL_EXTRAS" true) - ]; - - passthru = { - updateScript = unstableGitUpdater { }; - tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - }; - - meta = with lib; { - description = "C++ framework for property based testing inspired by QuickCheck"; - inherit (finalAttrs.src.meta) homepage; - maintainers = [ ]; - license = licenses.bsd2; - pkgConfigModules = [ - "rapidcheck" - # Extras - "rapidcheck_boost" - "rapidcheck_boost_test" - "rapidcheck_catch" - "rapidcheck_doctest" - "rapidcheck_gtest" - ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix deleted file mode 100644 index ad5a525456c9..000000000000 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, catch2_3 -, python3Packages -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rapidfuzz-cpp"; - version = "3.0.5"; - - src = fetchFromGitHub { - owner = "rapidfuzz"; - repo = "rapidfuzz-cpp"; - rev = "v${finalAttrs.version}"; - hash = "sha256-8s2Jd1fI8iNmFyMbCEaGZdpqvYFB1tVNZ41ICLN4AeI="; - }; - - nativeBuildInputs = [ - cmake - ]; - - cmakeFlags = lib.optionals finalAttrs.finalPackage.doCheck [ - "-DRAPIDFUZZ_BUILD_TESTING=ON" - ]; - - CXXFLAGS = lib.optionals stdenv.cc.isClang [ - # error: no member named 'fill' in namespace 'std' - "-include algorithm" - ]; - - nativeCheckInputs = [ - catch2_3 - ]; - - passthru = { - tests = { - /** `python3Packages.levenshtein` crucially depends on `rapidfuzz-cpp` */ - inherit (python3Packages) levenshtein; - }; - }; - - meta = { - description = "Rapid fuzzy string matching in C++ using the Levenshtein Distance"; - homepage = "https://github.com/rapidfuzz/rapidfuzz-cpp"; - changelog = "https://github.com/rapidfuzz/rapidfuzz-cpp/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix deleted file mode 100644 index 9aa239458502..000000000000 --- a/pkgs/development/libraries/rapidjson/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, doxygen -, graphviz -, gtest -, valgrind -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rapidjson"; - version = "unstable-2024-04-09"; - - outputs = [ - "out" - "doc" - ]; - - src = fetchFromGitHub { - owner = "Tencent"; - repo = "rapidjson"; - rev = "ab1842a2dae061284c0a62dca1cc6d5e7e37e346"; - hash = "sha256-kAGVJfDHEUV2qNR1LpnWq3XKBJy4hD3Swh6LX5shJpM="; - }; - - patches = [ - ./use-nixpkgs-gtest.patch - # https://github.com/Tencent/rapidjson/issues/2214 - ./suppress-valgrind-failures.patch - ]; - - postPatch = '' - for f in doc/Doxyfile.*; do - substituteInPlace $f \ - --replace-fail "WARN_IF_UNDOCUMENTED = YES" "WARN_IF_UNDOCUMENTED = NO" - done - ''; - - nativeBuildInputs = [ - cmake - doxygen - graphviz - ]; - - buildInputs = [ - gtest - ]; - - 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") - ]; - - 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 Madouura tobim ]; - }; -}) diff --git a/pkgs/development/libraries/rapidjson/suppress-valgrind-failures.patch b/pkgs/development/libraries/rapidjson/suppress-valgrind-failures.patch deleted file mode 100644 index dd06ba6a6971..000000000000 --- a/pkgs/development/libraries/rapidjson/suppress-valgrind-failures.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/test/valgrind.supp b/test/valgrind.supp -index c9d3d226..63af7bf9 100644 ---- a/test/valgrind.supp -+++ b/test/valgrind.supp -@@ -24,3 +24,31 @@ - fun:*Uri*Parse_UTF16_Std* - } - -+{ -+ Suppress memcpy_chk valgrind report 5 -+ Memcheck:Overlap -+ fun:__memcpy_chk -+ fun:*dtoa_normal* -+} -+ -+{ -+ Suppress memcpy_chk valgrind report 6 -+ Memcheck:Overlap -+ fun:__memcpy_chk -+ fun:*dtoa_maxDecimalPlaces* -+} -+ -+{ -+ Suppress memcpy_chk valgrind report 7 -+ Memcheck:Overlap -+ fun:__memcpy_chk -+ ... -+ fun:*Reader*ParseDoubleHandler* -+} -+ -+{ -+ Suppress memcpy_chk valgrind report 8 -+ Memcheck:Overlap -+ fun:__memcpy_chk -+ fun:*Reader*ParseNumber_NormalPrecisionError* -+} diff --git a/pkgs/development/libraries/rapidjson/use-nixpkgs-gtest.patch b/pkgs/development/libraries/rapidjson/use-nixpkgs-gtest.patch deleted file mode 100644 index 878182ea5a5f..000000000000 --- a/pkgs/development/libraries/rapidjson/use-nixpkgs-gtest.patch +++ /dev/null @@ -1,43 +0,0 @@ -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..3d02d475 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -1,20 +1,8 @@ --find_package(GTestSrc) -+find_package(GTest REQUIRED) -+enable_testing() - --IF(GTESTSRC_FOUND) -- enable_testing() -+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() -- -- add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_BINARY_DIR}/googletest) -- include_directories(SYSTEM ${GTEST_INCLUDE_DIR}) -- -- set(TEST_LIBRARIES gtest gtest_main) -- -- add_custom_target(tests ALL) -- add_subdirectory(perftest) -- add_subdirectory(unittest) -- --ENDIF(GTESTSRC_FOUND) -+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 deleted file mode 100644 index c433f32728e1..000000000000 --- a/pkgs/development/libraries/rapidxml/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - pname = "rapidxml"; - version = "1.13"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.zip"; - sha256 = "0w9mbdgshr6sh6a5jr10lkdycjyvapbj7wxwz8hbp0a96y3biw63"; - }; - - nativeBuildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/include/${pname} - cp * $out/include/${pname} - ''; - - meta = with lib; { - description = "Fast XML DOM-style parser in C++"; - homepage = "https://rapidxml.sourceforge.net/"; - license = licenses.boost; - platforms = platforms.unix; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/rapidyaml/default.nix b/pkgs/development/libraries/rapidyaml/default.nix deleted file mode 100644 index bab70f5a6f56..000000000000 --- a/pkgs/development/libraries/rapidyaml/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, stdenv -, cmake -, fetchFromGitHub -, git -}: - -stdenv.mkDerivation rec { - pname = "rapidyaml"; - version = "0.7.2"; - - src = fetchFromGitHub { - owner = "biojppm"; - repo = pname; - fetchSubmodules = true; - rev = "v${version}"; - hash = "sha256-vAYafhWo9xavM2j+mT3OGcX7ZSS25mieR/3b79BO+jA="; - }; - - nativeBuildInputs = [ cmake git ]; - - meta = with lib; { - description = "Library to parse and emit YAML, and do it fast"; - homepage = "https://github.com/biojppm/rapidyaml"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix deleted file mode 100644 index 2cdde4f2b726..000000000000 --- a/pkgs/development/libraries/raylib/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, fetchpatch -, mesa -, libGLU -, glfw -, libX11 -, libXi -, libXcursor -, libXrandr -, libXinerama -, alsaSupport ? stdenv.hostPlatform.isLinux -, alsa-lib -, pulseSupport ? stdenv.hostPlatform.isLinux -, libpulseaudio -, sharedLib ? true -, includeEverything ? true -, raylib-games -, darwin -, autoPatchelfHook -}: -let - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL; -in -stdenv.mkDerivation (finalAttrs: { - pname = "raylib"; - version = "5.0"; - - src = fetchFromGitHub { - owner = "raysan5"; - repo = "raylib"; - rev = finalAttrs.version; - hash = "sha256-gEstNs3huQ1uikVXOW4uoYnIDr5l8O9jgZRTX1mkRww="; - }; - - nativeBuildInputs = [ - cmake - ] ++ lib.optional stdenv.isLinux autoPatchelfHook; - - buildInputs = [ glfw ] - ++ lib.optionals stdenv.isLinux [ mesa libXi libXcursor libXrandr libXinerama ] - ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ] - ++ lib.optional alsaSupport alsa-lib - ++ lib.optional pulseSupport libpulseaudio; - - propagatedBuildInputs = lib.optionals stdenv.isLinux [ libGLU libX11 ] - ++ lib.optionals stdenv.isDarwin [ OpenGL ]; - - # https://github.com/raysan5/raylib/wiki/CMake-Build-Options - cmakeFlags = [ - "-DUSE_EXTERNAL_GLFW=ON" - "-DBUILD_EXAMPLES=OFF" - "-DCUSTOMIZE_BUILD=1" - ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON" - ++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON"; - - passthru.tests = [ raylib-games ]; - - 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 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.optionals stdenv.isLinux [ - (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 = [ ]; - platforms = platforms.all; - changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG"; - }; -}) diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix deleted file mode 100644 index a748f3a86c57..000000000000 --- a/pkgs/development/libraries/rdkafka/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, zlib, zstd, pkg-config, python3, openssl, which }: - -stdenv.mkDerivation rec { - pname = "rdkafka"; - version = "2.5.3"; - - src = fetchFromGitHub { - owner = "confluentinc"; - repo = "librdkafka"; - rev = "v${version}"; - sha256 = "sha256-2AURPvhpgdIm034KEMm7Tmf8Zx/XER76aT6SiINs6wg="; - }; - - nativeBuildInputs = [ pkg-config python3 which ]; - - buildInputs = [ zlib zstd openssl ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; - - postPatch = '' - patchShebangs . - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "librdkafka - Apache Kafka C/C++ client library"; - homepage = "https://github.com/confluentinc/librdkafka"; - license = licenses.bsd2; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ commandodev ]; - }; -} diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix deleted file mode 100644 index 278d63702ed2..000000000000 --- a/pkgs/development/libraries/re2/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - abseil-cpp, - chromium, - cmake, - fetchFromGitHub, - gbenchmark, - grpc, - gtest, - haskellPackages, - icu, - lib, - mercurial, - ninja, - python3Packages, - stdenv, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "re2"; - version = "2024-07-02"; - - src = fetchFromGitHub { - owner = "google"; - repo = "re2"; - rev = finalAttrs.version; - hash = "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc="; - }; - - outputs = [ - "out" - "dev" - ]; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - gbenchmark - gtest - ]; - - propagatedBuildInputs = [ abseil-cpp ] ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ icu ]; - - 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; - - passthru.tests = { - inherit chromium grpc mercurial; - inherit (python3Packages) fb-re2 google-re2; - haskell-re2 = haskellPackages.re2; - }; - - meta = with lib; { - description = "Regular expression library"; - longDescription = '' - RE2 is a fast, safe, thread-friendly alternative to backtracking regular - expression engines like those used in PCRE, Perl, and Python. It is a C++ - library. - ''; - license = licenses.bsd3; - homepage = "https://github.com/google/re2"; - maintainers = with maintainers; [ - azahi - networkexception - ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/libraries/readline/readline-8.2-patches.nix b/pkgs/development/libraries/readline/readline-8.2-patches.nix index 77d5c495bac1..37f9aeb8f7f7 100644 --- a/pkgs/development/libraries/readline/readline-8.2-patches.nix +++ b/pkgs/development/libraries/readline/readline-8.2-patches.nix @@ -11,4 +11,7 @@ patch: [ (patch "008" "0smjjzhwxi2ibpdisnk53lh1pzgka6rhlqyh3662xy69v34ysxx1") (patch "009" "05m1fwbs7mbs3pz3pg87gbbayandrrcgaqawzliqb6g1jbk8b61x") (patch "010" "0k3vyrjs2g6y2cfs03l2gp37fhxgqpiwvxb1c7z4q88cbb32x3km") +(patch "011" "1msdahvz56l9m5m69a87zp2c7qrfv0dxwd09rj1697isgy83s0g0") +(patch "012" "1lybzig73pqpcbw79im0kn6299lkcbnh24yigygn5jm2sj7dz2kc") +(patch "013" "1a48lyrhvn6nbj5qhradfpbbs3md5maz7wb32yvaghvfgnak990y") ] diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix deleted file mode 100644 index 0f746c36483c..000000000000 --- a/pkgs/development/libraries/readosm/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, expat, zlib, validatePkgConfig }: - -stdenv.mkDerivation rec { - pname = "readosm"; - version = "1.1.0a"; - - src = fetchurl { - url = "https://www.gaia-gis.it/gaia-sins/readosm-${version}.tar.gz"; - hash = "sha256-23wFHSVs7H7NTDd1q5vIINpaS/cv/U6fQLkR15dw8UU="; - }; - - nativeBuildInputs = [ validatePkgConfig ]; - - buildInputs = [ expat zlib ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = with lib; { - description = "Open source library to extract valid data from within an Open Street Map input file"; - homepage = "https://www.gaia-gis.it/fossil/readosm"; - license = with licenses; [ mpl11 gpl2Plus lgpl21Plus ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/recastnavigation/default.nix b/pkgs/development/libraries/recastnavigation/default.nix deleted file mode 100644 index b4119f1133f5..000000000000 --- a/pkgs/development/libraries/recastnavigation/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libGL, SDL2, libGLU, catch }: - -stdenv.mkDerivation rec { - pname = "recastai"; - # use latest revision for the CMake build process and OpenMW - # OpenMW use e75adf86f91eb3082220085e42dda62679f9a3ea - version = "unstable-2023-01-02"; - - src = fetchFromGitHub { - owner = "recastnavigation"; - repo = "recastnavigation"; - rev = "405cc095ab3a2df976a298421974a2af83843baf"; - sha256 = "sha256-WVzDI7+UuAl10Tm1Zjkea/FMk0cIe7pWg0iyFLbwAdI="; - }; - - postPatch = '' - cp ${catch}/include/catch/catch.hpp Tests/catch.hpp - - # https://github.com/recastnavigation/recastnavigation/issues/524 - substituteInPlace CMakeLists.txt \ - --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ - --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - # Expects SDL2.framework in specific location, which we don't have - # Change where SDL2 headers are searched for to match what we do have - substituteInPlace RecastDemo/CMakeLists.txt \ - --replace 'include_directories(''${SDL2_LIBRARY}/Headers)' 'include_directories(${SDL2.dev}/include/SDL2)' - ''; - - doCheck = true; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ libGL SDL2 libGLU ]; - - meta = with lib; { - homepage = "https://github.com/recastnavigation/recastnavigation"; - description = "Navigation-mesh Toolset for Games"; - mainProgram = "RecastDemo"; - license = licenses.zlib; - maintainers = with maintainers; [ marius851000 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/redis-plus-plus/0001-Fix-pkg-config-paths.patch b/pkgs/development/libraries/redis-plus-plus/0001-Fix-pkg-config-paths.patch deleted file mode 100644 index ac6490c51873..000000000000 --- a/pkgs/development/libraries/redis-plus-plus/0001-Fix-pkg-config-paths.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/cmake/redis++.pc.in b/cmake/redis++.pc.in -index c98b990..46849b6 100644 ---- a/cmake/redis++.pc.in -+++ b/cmake/redis++.pc.in -@@ -1,7 +1,5 @@ --prefix=@CMAKE_INSTALL_PREFIX@ --exec_prefix=${prefix} --libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ --includedir=${prefix}/include -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ - - Name: redis++ - Description: This is a Redis client, based on hiredis and written in C++11. It supports scritpting, pub/sub, pipeline, transaction, Redis Cluster, Redis Sentinel, connection pool, ACL, SSL and thread safety. diff --git a/pkgs/development/libraries/redis-plus-plus/default.nix b/pkgs/development/libraries/redis-plus-plus/default.nix deleted file mode 100644 index bd40330194a7..000000000000 --- a/pkgs/development/libraries/redis-plus-plus/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, hiredis -, enableShared ? !stdenv.hostPlatform.isStatic -, enableStatic ? stdenv.hostPlatform.isStatic -}: - -# You must build at one type of library -assert enableShared || enableStatic; - -stdenv.mkDerivation rec { - pname = "redis-plus-plus"; - version = "1.3.12"; - - src = fetchFromGitHub { - owner = "sewenew"; - repo = "redis-plus-plus"; - rev = version; - sha256 = "sha256-RI7lLvRmS5BglvwRQ8OzSpYIyaKkf/DKrJ3fn1mWYfs="; - }; - - patches = [ - ./0001-Fix-pkg-config-paths.patch - ]; - - nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ hiredis ]; - - cmakeFlags = [ - "-DREDIS_PLUS_PLUS_BUILD_TEST=OFF" - ] ++ lib.optionals (!enableShared) [ - "-DREDIS_PLUS_PLUS_BUILD_SHARED=OFF" - ] ++ lib.optionals (!enableStatic) [ - "-DREDIS_PLUS_PLUS_BUILD_STATIC=OFF" - ]; - - meta = with lib; { - homepage = "https://github.com/sewenew/redis-plus-plus"; - description = "Redis client written in C++"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ wheelsandmetal ]; - }; -} diff --git a/pkgs/development/libraries/reproc/default.nix b/pkgs/development/libraries/reproc/default.nix deleted file mode 100644 index 5092cc2ab7bd..000000000000 --- a/pkgs/development/libraries/reproc/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, fetchpatch -}: - -stdenv.mkDerivation rec { - pname = "reproc"; - version = "14.2.4"; - - src = fetchFromGitHub { - owner = "DaanDeMeyer"; - repo = "reproc"; - rev = "v${version}"; - sha256 = "sha256-LWzBeKhE7cSiZsK8xWzoTdrOcPiU/zEkmi40WiFytic="; - }; - - patches = [ - (fetchpatch{ - name = "reproc-gcc-13-2.patch"; - url = "https://github.com/DaanDeMeyer/reproc/commit/0b23d88894ccedde04537fa23ea55cb2f8365342.patch"; - sha256 = "sha256-QyC0UcKAWCKSvSvyZTLI2eF/TuuqbGGH6cOQrS2DiCE="; - }) - (fetchpatch{ - name = "reproc-gcc-13-1.patch"; - url = "https://github.com/DaanDeMeyer/reproc/commit/9f399675b821e175f85ac3ee6e3fd2e6056573eb.patch"; - sha256 = "sha256-h/gnDFPWPpUFkys10YXjjEPibgRT1atHSVwbO0kId+U="; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DBUILD_SHARED_LIBS=ON" - "-DREPROC++=ON" - "-DREPROC_TEST=ON" - ]; - - # https://github.com/DaanDeMeyer/reproc/issues/81 - postPatch = '' - substituteInPlace reproc++/reproc++.pc.in \ - --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - substituteInPlace reproc/reproc.pc.in \ - --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - - meta = with lib; { - homepage = "https://github.com/DaanDeMeyer/reproc"; - description = "Cross-platform (C99/C++11) process library"; - license = licenses.mit; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix deleted file mode 100644 index bb58fbaad370..000000000000 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config }: - -stdenv.mkDerivation rec { - pname = "resolv_wrapper"; - version = "1.1.8"; - - src = fetchurl { - url = "mirror://samba/cwrap/resolv_wrapper-${version}.tar.gz"; - sha256 = "sha256-+8MPd9o+EuzU72bM9at34LdEkwzNiQYkBAgvkoqOwuA="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - meta = with lib; { - description = "Wrapper for the user, group and hosts NSS API"; - homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;"; - license = licenses.bsd3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/retro-gtk/default.nix b/pkgs/development/libraries/retro-gtk/default.nix deleted file mode 100644 index 69eb4b0cd12d..000000000000 --- a/pkgs/development/libraries/retro-gtk/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, meson -, ninja -, pkg-config -, libepoxy -, glib -, gtk3 -, libpulseaudio -, libsamplerate -, gobject-introspection -, vala -, gtk-doc -}: - -stdenv.mkDerivation rec { - pname = "retro-gtk"; - version = "1.0.2"; - - src = fetchurl { - url = "mirror://gnome/sources/retro-gtk/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1lnb7dwcj3lrrvdzd85dxwrlid28xf4qdbrgfjyg1wn1z6sv063i"; - }; - - patches = [ - # https://gitlab.gnome.org/GNOME/retro-gtk/-/merge_requests/150 - ./gio-unix.patch - # fix build with meson 0.60 (https://gitlab.gnome.org/GNOME/retro-gtk/-/merge_requests/167) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/retro-gtk/-/commit/8016c10e7216394bc66281f2d9be740140b6fad6.patch"; - sha256 = "sha256-HcQnqadK5sJM5mMqi4KERkJM3H+MUl8AJAorpFDsJ68="; - }) - ]; - - nativeBuildInputs = [ - gobject-introspection - gtk-doc - meson - ninja - pkg-config - vala - ]; - - buildInputs = [ - libepoxy - glib - gtk3 - libpulseaudio - libsamplerate - ]; - - meta = with lib; { - description = "GTK Libretro frontend framework"; - mainProgram = "retro-demo"; - longDescription = '' - Libretro is a plugin format design to implement video game - console emulators, video games and similar multimedia - software. Such plugins are called Libretro cores. - - RetroGTK is a framework easing the use of Libretro cores in - conjunction with GTK. - - It encourages the cores to be installed in a well defined - centralized place — namely the libretro subdirectory of your lib - directory — and it recommends them to come with Libretro core - descriptors. - ''; - homepage = "https://gitlab.gnome.org/GNOME/retro-gtk"; - changelog = "https://gitlab.gnome.org/GNOME/retro-gtk/-/blob/master/NEWS"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.DamienCassou ]; - platforms = platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/retro-gtk.x86_64-darwin - }; -} diff --git a/pkgs/development/libraries/retro-gtk/gio-unix.patch b/pkgs/development/libraries/retro-gtk/gio-unix.patch deleted file mode 100644 index 91f561c6504f..000000000000 --- a/pkgs/development/libraries/retro-gtk/gio-unix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/retro-gtk/meson.build 2021-03-21 20:25:51.000000000 +0100 -+++ b/retro-gtk/meson.build 2021-05-23 17:36:46.793693816 +0200 -@@ -103,6 +103,7 @@ - retro_gtk_deps = [ - epoxy, - gio, -+ gio_unix, - glib, - gmodule, - gobject, - diff --git a/pkgs/development/libraries/rinutils/default.nix b/pkgs/development/libraries/rinutils/default.nix deleted file mode 100644 index 45b9f299aa2d..000000000000 --- a/pkgs/development/libraries/rinutils/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv -, lib -, fetchurl -, cmake -, perl -}: - -stdenv.mkDerivation rec { - pname = "rinutils"; - version = "0.10.3"; - - src = fetchurl { - url = "https://github.com/shlomif/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-+eUn03psyMe4hwraY8qiTzKrDSn9ERbfPrtoZYMDCVU="; - }; - - nativeBuildInputs = [ cmake perl ]; - - # https://github.com/shlomif/rinutils/issues/5 - # (variable was unused at time of writing) - postPatch = '' - substituteInPlace librinutils.pc.in \ - --replace '$'{exec_prefix}/@RINUTILS_INSTALL_MYLIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ - ''; - - meta = with lib; { - description = "C11 / gnu11 utilities C library by Shlomi Fish / Rindolf"; - homepage = "https://github.com/shlomif/rinutils"; - changelog = "https://github.com/shlomif/rinutils/raw/${version}/NEWS.asciidoc"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/rlog/default.nix b/pkgs/development/libraries/rlog/default.nix deleted file mode 100644 index 75760fed577f..000000000000 --- a/pkgs/development/libraries/rlog/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "rlog"; - version = "1.4"; - - src = fetchurl { - url = "http://rlog.googlecode.com/files/rlog-${version}.tar.gz"; - sha256 = "0y9zg0pd7vmnskwac1qdyzl282z7kb01nmn57lsg2mjdxgnywf59"; - }; - - meta = { - homepage = "https://www.arg0.net/rlog"; - description = "C++ logging library used in encfs"; - platforms = lib.platforms.linux; - license = lib.licenses.lgpl3; - }; -} diff --git a/pkgs/development/libraries/rlottie/default.nix b/pkgs/development/libraries/rlottie/default.nix deleted file mode 100644 index 541c805bba5b..000000000000 --- a/pkgs/development/libraries/rlottie/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, ninja -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "rlottie"; - version = "0.2"; - - src = fetchFromGitHub { - owner = "Samsung"; - repo = pname; - rev = "v${version}"; - sha256 = "10bxr1zf9wxl55d4cw2j02r6sgqln7mbxplhhfvhw0z92fi40kr3"; - }; - - patches = [ - # Fixed build with GCC 11 - (fetchpatch { - url = "https://github.com/Samsung/rlottie/commit/2d7b1fa2b005bba3d4b45e8ebfa632060e8a157a.patch"; - hash = "sha256-2JPsj0WiBMMu0N3NUYDrHumvPN2YS8nPq5Zwagx6UWE="; - }) - ]; - - nativeBuildInputs = [ cmake ninja pkg-config ]; - - cmakeFlags = [ - (lib.cmakeFeature "LIB_INSTALL_DIR" "${placeholder "out"}/lib") - ]; - - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-U__ARM_NEON__"; - - meta = with lib; { - homepage = "https://github.com/Samsung/rlottie"; - description = "Platform independent standalone c++ library for rendering vector based animations and art in realtime"; - license = with licenses; [ mit bsd3 mpl11 ftl ]; - platforms = platforms.all; - maintainers = with maintainers; [ CRTified ]; - }; -} diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix index d41459e25ead..4cf983add42b 100644 --- a/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -6,7 +6,7 @@ , gtk3-x11 , pcre , pkg-config -, webkitgtk +, webkitgtk_4_0 , xorg , WebKit , MetalKit @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ # Ubsan seems to be broken on aarch64-darwin, it produces linker errors similar to https://github.com/NixOS/nixpkgs/issues/140751 ./disable-ubsan.patch ]; @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { pcre xorg.libX11 xorg.libXrandr - ] ++ lib.optionals stdenv.isLinux [ - webkitgtk - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + webkitgtk_4_0 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ WebKit MetalKit CoreAudioKit diff --git a/pkgs/development/libraries/rnnoise/default.nix b/pkgs/development/libraries/rnnoise/default.nix deleted file mode 100644 index eb77106fd29f..000000000000 --- a/pkgs/development/libraries/rnnoise/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ stdenv, lib, fetchurl, fetchzip, autoreconfHook, writeScript, fetchpatch -, modelUrl ? "", modelHash ? "" # Allow overriding the model URL and hash -}: - -let - modelVersionJSON = lib.importJSON ./model-version.json; - - # Copy from https://gitlab.xiph.org/xiph/rnnoise/-/raw/v${version}/model_version - default_model_version = modelVersionJSON.version; - - # Either use the default model or the one provided by package override - model_url = if (modelUrl == "") then "https://media.xiph.org/rnnoise/models/rnnoise_data-${default_model_version}.tar.gz" else modelUrl; - model_hash = if (modelHash == "") then modelVersionJSON.hash else modelHash; - -in stdenv.mkDerivation (finalAttrs: { - pname = "rnnoise"; - version = "0.2"; - - src = fetchzip { - urls = [ - "https://gitlab.xiph.org/xiph/rnnoise/-/archive/v${finalAttrs.version}/rnnoise-v${finalAttrs.version}.tar.gz" - "https://github.com/xiph/rnnoise/archive/v${finalAttrs.version}.tar.gz" - ]; - hash = "sha256-Qaf+0iOprq7ILRWNRkBjsniByctRa/lFVqiU5ZInF/Q="; - }; - - patches = [ - # remove when updating - (fetchpatch { - url = "https://github.com/xiph/rnnoise/commit/372f7b4b76cde4ca1ec4605353dd17898a99de38.patch"; - hash = "sha256-Dzikb59hjVxd1XIEj/Je4evxtGORkaNcqE+zxOJMSvs="; - }) - ]; - - model = fetchurl { - url = model_url; - hash = model_hash; - }; - - postPatch = '' - tar xvomf ${finalAttrs.model} - ''; - - nativeBuildInputs = [ autoreconfHook ]; - - postInstall = '' - install -Dt $out/bin examples/.libs/rnnoise_demo - ''; - - passthru.updateScript = writeScript "update-rnnoise.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts nix nix-prefetch findutils moreutils - - prefetch-sri() { - nix-prefetch-url "$1" | xargs nix hash to-sri --type sha256 - } - - res="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - -sL "https://api.github.com/repos/xiph/rnnoise/tags?per_page=1")" - - version="$(echo $res | jq '.[0].name | split("v") | .[1]' --raw-output)" - update-source-version ${finalAttrs.pname} "$version" --ignore-same-hash - - model_version=$(curl -sL "https://raw.githubusercontent.com/xiph/rnnoise/v$version/model_version") - model_url="https://media.xiph.org/rnnoise/models/rnnoise_data-$model_version.tar.gz" - model_hash="$(prefetch-sri $model_url)" - - modelJson=pkgs/development/libraries/rnnoise/model-version.json - - jq --arg version "$model_version" \ - --arg hash "$model_hash" \ - '.version = $version | .hash = $hash' \ - "$modelJson" | sponge "$modelJson" - ''; - - meta = { - description = "Recurrent neural network for audio noise reduction"; - homepage = "https://people.xiph.org/~jm/demo/rnnoise/"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ nh2 ]; - mainProgram = "rnnoise_demo"; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/development/libraries/rnnoise/model-version.json b/pkgs/development/libraries/rnnoise/model-version.json deleted file mode 100644 index 830f8cc36018..000000000000 --- a/pkgs/development/libraries/rnnoise/model-version.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "version": "0b50c45", - "hash": "sha256-SsgcXAiE7EvVkHAmqq4WIJt7ds2df3GvWCCUovmPS0M=" -} diff --git a/pkgs/development/libraries/robin-map/default.nix b/pkgs/development/libraries/robin-map/default.nix deleted file mode 100644 index d15bada3e813..000000000000 --- a/pkgs/development/libraries/robin-map/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "robin-map"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "Tessil"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-dspOWp/8oNR0p5XRnqO7WtPcCx54/y8m1cDho4UBYyc="; - }; - - nativeBuildInputs = [ - cmake - ]; - - meta = with lib; { - description = "C++ implementation of a fast hash map and hash set using robin hood hashing"; - homepage = "https://github.com/Tessil/robin-map"; - changelog = "https://github.com/Tessil/robin-map/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix deleted file mode 100644 index b81061639d79..000000000000 --- a/pkgs/development/libraries/rocksdb/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, ninja -, bzip2 -, lz4 -, snappy -, zlib -, zstd -, windows -, enableJemalloc ? false -, jemalloc -, enableLiburing ? stdenv.isLinux -, liburing -, enableShared ? !stdenv.hostPlatform.isStatic -, sse42Support ? stdenv.hostPlatform.sse4_2Support -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocksdb"; - version = "9.6.1"; - - src = fetchFromGitHub { - owner = "facebook"; - repo = "rocksdb"; - rev = "v${finalAttrs.version}"; - hash = "sha256-Df5X3sL4dRP9TwwfoB3645nlru6eQhFD1LKPCXHrofU="; - }; - - patches = lib.optional (lib.versionAtLeast finalAttrs.version "6.29.3" && enableLiburing) ./fix-findliburing.patch; - - nativeBuildInputs = [ cmake ninja ]; - - propagatedBuildInputs = [ bzip2 lz4 snappy zlib zstd ]; - - buildInputs = lib.optional enableJemalloc jemalloc - ++ lib.optional enableLiburing liburing - ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads; - - outputs = [ - "out" - "tools" - ]; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ - "-faligned-allocation" - ]); - - cmakeFlags = [ - "-DPORTABLE=1" - "-DWITH_JEMALLOC=${if enableJemalloc then "1" else "0"}" - "-DWITH_LIBURING=${if enableLiburing then "1" else "0"}" - "-DWITH_JNI=0" - "-DWITH_BENCHMARK_TOOLS=0" - "-DWITH_TESTS=1" - "-DWITH_TOOLS=0" - "-DWITH_CORE_TOOLS=1" - "-DWITH_BZ2=1" - "-DWITH_LZ4=1" - "-DWITH_SNAPPY=1" - "-DWITH_ZLIB=1" - "-DWITH_ZSTD=1" - "-DWITH_GFLAGS=0" - "-DUSE_RTTI=1" - "-DROCKSDB_INSTALL_ON_WINDOWS=YES" # harmless elsewhere - (lib.optional sse42Support "-DFORCE_SSE42=1") - "-DFAIL_ON_WARNINGS=NO" - ] ++ lib.optional (!enableShared) "-DROCKSDB_BUILD_SHARED=0"; - - # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]" - hardeningDisable = lib.optional stdenv.hostPlatform.isWindows "format"; - - postPatch = lib.optionalString (lib.versionOlder finalAttrs.version "8") '' - # Fix gcc-13 build failures due to missing <cstdint> and - # <system_error> includes, fixed upstyream sice 8.x - sed -e '1i #include <cstdint>' -i db/compaction/compaction_iteration_stats.h - sed -e '1i #include <cstdint>' -i table/block_based/data_block_hash_index.h - sed -e '1i #include <cstdint>' -i util/string_util.h - sed -e '1i #include <cstdint>' -i include/rocksdb/utilities/checkpoint.h - '' + lib.optionalString (lib.versionOlder finalAttrs.version "7") '' - # Fix gcc-13 build failures due to missing <cstdint> and - # <system_error> includes, fixed upstyream sice 7.x - sed -e '1i #include <system_error>' -i third-party/folly/folly/synchronization/detail/ProxyLockable-inl.h - ''; - - preInstall = '' - mkdir -p $tools/bin - cp tools/{ldb,sst_dump}${stdenv.hostPlatform.extensions.executable} $tools/bin/ - '' + lib.optionalString stdenv.isDarwin '' - ls -1 $tools/bin/* | xargs -I{} install_name_tool -change "@rpath/librocksdb.${lib.versions.major finalAttrs.version}.dylib" $out/lib/librocksdb.dylib {} - '' + lib.optionalString (stdenv.isLinux && enableShared) '' - ls -1 $tools/bin/* | xargs -I{} patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib {} - ''; - - # Old version doesn't ship the .pc file, new version puts wrong paths in there. - postFixup = '' - if [ -f "$out"/lib/pkgconfig/rocksdb.pc ]; then - substituteInPlace "$out"/lib/pkgconfig/rocksdb.pc \ - --replace '="''${prefix}//' '="/' - fi - ''; - - meta = with lib; { - homepage = "https://rocksdb.org"; - description = "Library that provides an embeddable, persistent key-value store for fast storage"; - changelog = "https://github.com/facebook/rocksdb/raw/v${finalAttrs.version}/HISTORY.md"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ adev magenbluten ]; - }; -}) diff --git a/pkgs/development/libraries/rocksdb/fix-findliburing.patch b/pkgs/development/libraries/rocksdb/fix-findliburing.patch deleted file mode 100644 index c546577813ce..000000000000 --- a/pkgs/development/libraries/rocksdb/fix-findliburing.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 23432b7958ecea64b49ba680767ea5dc696768c9 Mon Sep 17 00:00:00 2001 -From: Benjamin Lee <benjamin@computer.surgery> -Date: Sun, 26 May 2024 17:17:01 -0700 -Subject: [PATCH] fix findliburing - -`find_package(... NAMES lib*)` is basically always wrong. The previous -code was just hardcoding the static library path to work around the fact -that this doesn't work. This breaks the build when only dynamic liburing -builds are available. ---- - cmake/modules/Finduring.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/modules/Finduring.cmake b/cmake/modules/Finduring.cmake -index 8cb14cb27..87f2df474 100644 ---- a/cmake/modules/Finduring.cmake -+++ b/cmake/modules/Finduring.cmake -@@ -7,7 +7,7 @@ - find_path(uring_INCLUDE_DIR - NAMES liburing.h) - find_library(uring_LIBRARIES -- NAMES liburing.a liburing) -+ NAMES uring) - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(uring --- -2.44.0 - diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/development/libraries/rote/default.nix deleted file mode 100644 index 65e2ecd09150..000000000000 --- a/pkgs/development/libraries/rote/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, ncurses }: - -stdenv.mkDerivation rec { - pname = "rote"; - version = "0.2.8"; - - src = fetchurl { - sha256 = "05v1lw99jv4cwxl7spyi7by61j2scpdsvx809x5cga7dm5dhlmky"; - url = "mirror://sourceforge/rote/${pname}-${version}.tar.gz"; - }; - - buildInputs = [ ncurses ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Our Own Terminal Emulation Library"; - mainProgram = "rote-config"; - longDescription = '' - ROTE is a simple C library for VT102 terminal emulation. It allows the - programmer to set up virtual 'screens' and send them data. The virtual - screens will emulate the behavior of a VT102 terminal, interpreting - escape sequences, control characters and such. The library supports - ncurses as well so that you may render the virtual screen to the real - screen when you need to. - ''; - homepage = "https://rote.sourceforge.net/"; - license = licenses.lgpl21; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/rtlcss/default.nix b/pkgs/development/libraries/rtlcss/default.nix deleted file mode 100644 index 4143e649ea5c..000000000000 --- a/pkgs/development/libraries/rtlcss/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ buildNpmPackage, fetchFromGitHub, lib, ... }: - -buildNpmPackage rec { - pname = "rtlcss"; - version = "4.1.0"; - - src = fetchFromGitHub { - owner = "MohammadYounes"; - repo = "rtlcss"; - rev = "v${version}"; - hash = "sha256-KdAf7jzt8o/YEzT/bLCXj546HX0oC90kr44u3p3qv/k="; - }; - - npmDepsHash = "sha256-ghVgvw55w7T9WxokYtlFSgCfGvcOxFzm2wQIFi+6uBY="; - - dontNpmBuild = true; - - meta = with lib; { - description = "Framework for converting Left-To-Right (LTR) Cascading Style Sheets(CSS) to Right-To-Left (RTL)"; - mainProgram = "rtlcss"; - homepage = "https://rtlcss.com"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/rtrlib/default.nix b/pkgs/development/libraries/rtrlib/default.nix deleted file mode 100644 index 2f0ae61b9a9c..000000000000 --- a/pkgs/development/libraries/rtrlib/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, fetchFromGitHub, stdenv, cmake, libssh, openssl }: - -stdenv.mkDerivation rec { - pname = "rtrlib"; - version = "0.8.0"; - - src = fetchFromGitHub { - repo = pname; - owner = "rtrlib"; - rev = "v${version}"; - sha256 = "sha256-ISb4ojcDvXY/88GbFMrA5V5+SGE6CmE5D+pokDTwotQ="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libssh openssl ]; - - postFixup = '' - substituteInPlace "$out"/lib/pkgconfig/rtrlib.pc \ - --replace '=''${prefix}//' '=/' - ''; - - meta = with lib; { - description = "Open-source C implementation of the RPKI/Router Protocol client"; - homepage = "https://github.com/rtrlib/rtrlib"; - license = licenses.mit; - maintainers = with maintainers; [ Anillc ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/rttr/default.nix b/pkgs/development/libraries/rttr/default.nix deleted file mode 100644 index 10a16dd3f6b4..000000000000 --- a/pkgs/development/libraries/rttr/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja }: - -stdenv.mkDerivation rec { - pname = "rttr"; - version = "0.9.6"; - - src = fetchFromGitHub { - owner = "${pname}org"; - repo = pname; - rev = "v${version}"; - sha256 = "1yxad8sj40wi75hny8w6imrsx8wjasjmsipnlq559n4b6kl84ijp"; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - cmakeFlags = [ - "-DBUILD_EXAMPLES=OFF" - "-DBUILD_UNIT_TESTS=OFF" - "-DBUILD_PACKAGE=OFF" - ]; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "C++ Reflection Library"; - homepage = "https://www.rttr.org"; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix deleted file mode 100644 index 861de40a5b55..000000000000 --- a/pkgs/development/libraries/rubberband/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libsamplerate, libsndfile, fftw -, lv2, jdk_headless -, vamp-plugin-sdk, ladspaH, meson, ninja, darwin }: - -stdenv.mkDerivation rec { - pname = "rubberband"; - version = "3.3.0"; - - src = fetchurl { - url = "https://breakfastquay.com/files/releases/${pname}-${version}.tar.bz2"; - hash = "sha256-2e+J4rjvn4WxOsPC+uww4grPLJ86nIxFzmN/K8leV2w="; - }; - - nativeBuildInputs = [ pkg-config meson ninja jdk_headless ]; - buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH lv2 ] ++ lib.optionals stdenv.isDarwin - (with darwin.apple_sdk.frameworks; [Accelerate CoreGraphics CoreVideo]); - makeFlags = [ "AR:=$(AR)" ]; - - # TODO: package boost-test, so we can run the test suite. (Currently it fails - # to find libboost_unit_test_framework.a.) - mesonFlags = [ "-Dtests=disabled" ]; - doCheck = false; - - meta = with lib; { - description = "High quality software library for audio time-stretching and pitch-shifting"; - homepage = "https://breakfastquay.com/rubberband/"; - # commercial license available as well, see homepage. You'll get some more optimized routines - license = licenses.gpl2Plus; - maintainers = [ maintainers.marcweber ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/rustc-demangle/Cargo.lock b/pkgs/development/libraries/rustc-demangle/Cargo.lock deleted file mode 100644 index 0268b3bdd463..000000000000 --- a/pkgs/development/libraries/rustc-demangle/Cargo.lock +++ /dev/null @@ -1,67 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "arbitrary" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237430fd6ed3740afe94eefcc278ae21e050285be882804e0d6e8695f0c94691" - -[[package]] -name = "cc" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" - -[[package]] -name = "compiler_builtins" -version = "0.1.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b1438ef42c655665a8ab2c1c6d605a305f031d38d9be689ddfef41a20f3aa2" - -[[package]] -name = "libfuzzer-sys" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36a9a84a6e8b55dfefb04235e55edb2b9a2a18488fcae777a6bdaa6f06f1deb3" -dependencies = [ - "arbitrary", - "cc", - "once_cell", -] - -[[package]] -name = "once_cell" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" - -[[package]] -name = "rustc-demangle" -version = "0.1.20" -dependencies = [ - "compiler_builtins", - "rustc-std-workspace-core", -] - -[[package]] -name = "rustc-demangle-capi" -version = "0.1.0" -dependencies = [ - "rustc-demangle", -] - -[[package]] -name = "rustc-demangle-fuzz" -version = "0.0.0" -dependencies = [ - "libfuzzer-sys", - "rustc-demangle", -] - -[[package]] -name = "rustc-std-workspace-core" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1956f5517128a2b6f23ab2dadf1a976f4f5b27962e7724c2bf3d45e539ec098c" diff --git a/pkgs/development/libraries/rustc-demangle/default.nix b/pkgs/development/libraries/rustc-demangle/default.nix deleted file mode 100644 index 4e142c584529..000000000000 --- a/pkgs/development/libraries/rustc-demangle/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ rustPlatform, fetchFromGitHub, lib, stdenv }: - -rustPlatform.buildRustPackage rec { - pname = "rustc-demangle"; - version = "0.1.20"; - - src = fetchFromGitHub { - owner = "alexcrichton"; - repo = pname; - rev = version; - sha256 = "sha256-elxclyuLmr3N66s+pR4/6OU98k1oXI2wKVJtzWPY8FI="; - }; - - cargoLock = { - # generated using `cargo generate-lockfile` since repo is missing lockfile - lockFile = ./Cargo.lock; - }; - - cargoBuildFlags = [ "-p" "rustc-demangle-capi" ]; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - - postInstall = '' - mkdir -p $out/lib - cp target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/librustc_demangle.so $out/lib - cp -R crates/capi/include $out - ''; - - meta = with lib; { - description = "Rust symbol demangling"; - homepage = "https://github.com/alexcrichton/rustc-demangle"; - license = with licenses; [ asl20 mit ]; - # upstream supports other platforms, but maintainer can only test on linux - platforms = platforms.linux; - maintainers = with maintainers; [ _1000teslas ]; - }; -} diff --git a/pkgs/development/libraries/rustls-ffi/default.nix b/pkgs/development/libraries/rustls-ffi/default.nix deleted file mode 100644 index d5d736dd2225..000000000000 --- a/pkgs/development/libraries/rustls-ffi/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - Security, - apacheHttpd, -}: - -rustPlatform.buildRustPackage rec { - pname = "rustls-ffi"; - version = "0.10.0"; - - src = fetchFromGitHub { - owner = "rustls"; - repo = pname; - rev = "v${version}"; - hash = "sha256-IDIWN5g1aaE6SDdXSm4WYK6n+BpuypPYQITuDj1WJEc="; - }; - - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Security ]; - - cargoLock.lockFile = ./Cargo.lock; - postPatch = '' - cp ${./Cargo.lock} Cargo.lock - ''; - - installPhase = '' - runHook preInstall - - make install DESTDIR=${placeholder "out"} - - runHook postInstall - ''; - - passthru.tests = { - apacheHttpd = apacheHttpd.override { modTlsSupport = true; }; - # Currently broken notably because of https://github.com/curl/curl/issues/13248 - # curl = curl.override { opensslSupport = false; rustlsSupport = true; }; - }; - - meta = with lib; { - description = "C-to-rustls bindings"; - homepage = "https://github.com/rustls/rustls-ffi/"; - license = with lib.licenses; [ - mit - asl20 - isc - ]; - maintainers = [ maintainers.lesuisse ]; - }; -} diff --git a/pkgs/development/libraries/rutabaga_gfx/darwin-install.patch b/pkgs/development/libraries/rutabaga_gfx/darwin-install.patch deleted file mode 100644 index 0b68ec2beb85..000000000000 --- a/pkgs/development/libraries/rutabaga_gfx/darwin-install.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/rutabaga_gfx/ffi/Makefile b/rutabaga_gfx/ffi/Makefile -index f8c7820bf..e88a6c308 100644 ---- a/rutabaga_gfx/ffi/Makefile -+++ b/rutabaga_gfx/ffi/Makefile -@@ -47,24 +47,16 @@ build: - cargo build $(gfxstream_feature) $(release) - - install: build --ifeq ($(UNAME), Linux) - install -D -m 755 $(OUT)/$(LIB_NAME) $(DESTDIR)$(libdir)/$(LIB_NAME).$(RUTABAGA_VERSION) --endif - ifeq ($(UNAME), Darwin) -- install_name_tool -id $(DESTDIR)$(libdir)/$(LIB_NAME).$(RUTABAGA_VERSION) $(DESTDIR)$(libdir)/$(LIB_NAME) -+ install_name_tool -id $(DESTDIR)$(libdir)/$(LIB_NAME).$(RUTABAGA_VERSION) $(DESTDIR)$(libdir)/$(LIB_NAME).$(RUTABAGA_VERSION) - endif - - ln -sf $(LIB_NAME).$(RUTABAGA_VERSION) $(DESTDIR)$(libdir)/$(LIB_NAME).$(RUTABAGA_VERSION_MAJOR) - ln -sf $(LIB_NAME).$(RUTABAGA_VERSION) $(DESTDIR)$(libdir)/$(LIB_NAME) - --ifeq ($(UNAME), Linux) - install -D -m 0644 $(SRC)/share/rutabaga_gfx_ffi.pc $(DESTDIR)$(libdir)/pkgconfig/rutabaga_gfx_ffi.pc - install -D -m 0644 $(SRC)/include/rutabaga_gfx_ffi.h $(DESTDIR)$(includedir)/rutabaga_gfx_ffi.h --endif --ifeq ($(UNAME), Darwin) -- install -m 0644 $(SRC)/share/rutabaga_gfx_ffi.pc $(DESTDIR)$(libdir)/pkgconfig/rutabaga_gfx_ffi.pc -- install -m 0644 $(SRC)/include/rutabaga_gfx_ffi.h $(DESTDIR)$(includedir)/rutabaga_gfx_ffi.h --endif - - clean: - cargo clean $(release) - diff --git a/pkgs/development/libraries/rutabaga_gfx/default.nix b/pkgs/development/libraries/rutabaga_gfx/default.nix deleted file mode 100644 index 9b8f5bec42f3..000000000000 --- a/pkgs/development/libraries/rutabaga_gfx/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ lib -, stdenv -, fetchgit -, fetchpatch -, cargo -, pkg-config -, rustPlatform -, aemu -, gfxstream -, libdrm -, libiconv -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rutabaga_gfx"; - version = "0.1.2"; - - src = fetchgit { - url = "https://chromium.googlesource.com/crosvm/crosvm"; - rev = "v${finalAttrs.version}-rutabaga-release"; - fetchSubmodules = true; - hash = "sha256-0RJDKzeU7U6hc6CLKks8QcRs3fxN+/LYUbB0t6W790M="; - }; - - patches = [ - # Make gfxstream optional - # https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4860836 - (fetchpatch { - url = "https://chromium.googlesource.com/crosvm/crosvm/+/c3ad0e43eb12cbf737a6049e0134d483e337363f%5E%21/?format=TEXT"; - decode = "base64 -d"; - hash = "sha256-Ji1bK7jnRlg0OpDfCLcTHfPSiz3zYcdgsWL4n3EoIYI="; - }) - # Fix error in Makefile where it uses eight spaces instead of a tab - # https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4863380 - (fetchpatch { - url = "https://chromium.googlesource.com/crosvm/crosvm/+/fc415bccc43d36f63a2fd4c28878591bb1053450%5E%21/?format=TEXT"; - decode = "base64 -d"; - hash = "sha256-SLzlZ4o1+R2bGTPvA0a5emq97hOIIIHrubFhcQjqYwg="; - }) - # Install the dylib on Darwin. - ./darwin-install.patch - ]; - - nativeBuildInputs = [ cargo pkg-config rustPlatform.cargoSetupHook ]; - buildInputs = [ libiconv ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform gfxstream) ([ - aemu - gfxstream - ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libdrm) [ - libdrm - ]); - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) src; - hash = "sha256-wuF3Isrp+u5J8jPQoPsIOWYGNKLSNa2pLfvladAWkLs="; - }; - - CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; - "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = - "${stdenv.cc.targetPrefix}cc"; - - postConfigure = '' - cd rutabaga_gfx/ffi - substituteInPlace Makefile --replace-fail pkg-config "$PKG_CONFIG" - ''; - - # make install always rebuilds - dontBuild = true; - - makeFlags = [ - "prefix=$(out)" - "OUT=target/${stdenv.hostPlatform.rust.cargoShortTarget}/release" - ]; - - meta = with lib; { - homepage = "https://crosvm.dev/book/appendix/rutabaga_gfx.html"; - description = "cross-platform abstraction for GPU and display virtualization"; - license = licenses.bsd3; - maintainers = with maintainers; [ qyliss ]; - platforms = platforms.darwin ++ platforms.linux; - }; -}) diff --git a/pkgs/development/libraries/s2geometry/default.nix b/pkgs/development/libraries/s2geometry/default.nix deleted file mode 100644 index a8893b698a48..000000000000 --- a/pkgs/development/libraries/s2geometry/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, openssl, gtest }: - -stdenv.mkDerivation rec { - pname = "s2geometry"; - version = "0.9.0"; - - src = fetchFromGitHub { - owner = "google"; - repo = "s2geometry"; - rev = "v${version}"; - sha256 = "1mx61bnn2f6bd281qlhn667q6yfg1pxzd2js88l5wpkqlfzzhfaz"; - }; - - patches = [ - # Fix build https://github.com/google/s2geometry/issues/165 - (fetchpatch { - url = "https://github.com/google/s2geometry/commit/a4dddf40647c68cd0104eafc31e9c8fb247a6308.patch"; - sha256 = "0fp3w4bg7pgf5vv4vacp9g06rbqzhxc2fg6i5appp93q6phiinvi"; - }) - ]; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ openssl gtest ]; - - # Default of C++11 is too low for gtest. - # In newer versions of s2geometry this can be done with cmakeFlags. - postPatch = '' - substituteInPlace CMakeLists.txt --replace "CMAKE_CXX_STANDARD 11" "CMAKE_CXX_STANDARD 14" - ''; - - meta = with lib; { - description = "Computational geometry and spatial indexing on the sphere"; - homepage = "http://s2geometry.io/"; - license = licenses.asl20; - maintainers = [ maintainers.Thra11 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix deleted file mode 100644 index 5af6eff378d9..000000000000 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, openssl -, nix -}: - -stdenv.mkDerivation rec { - pname = "s2n-tls"; - version = "1.5.1"; - - src = fetchFromGitHub { - owner = "aws"; - repo = "s2n-tls"; - rev = "v${version}"; - hash = "sha256-BHDMYOHidwF6ssqSnpokXc/OwGrQNoUVb0/ubwhyiDM="; - }; - - nativeBuildInputs = [ cmake ]; - - outputs = [ "out" "dev" ]; - - buildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto). - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF" # disable -Werror - ] ++ lib.optionals stdenv.hostPlatform.isMips64 [ - # See https://github.com/aws/s2n-tls/issues/1592 and https://github.com/aws/s2n-tls/pull/1609 - "-DS2N_NO_PQ=ON" - ]; - - propagatedBuildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto). - - postInstall = '' - # Glob for 'shared' or 'static' subdir - for f in $out/lib/s2n/cmake/*/s2n-targets.cmake; do - substituteInPlace "$f" \ - --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""' - done - ''; - - passthru.tests = { - inherit nix; - }; - - meta = with lib; { - description = "C99 implementation of the TLS/SSL protocols"; - homepage = "https://github.com/aws/s2n-tls"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ orivej ]; - }; -} diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix deleted file mode 100644 index 279ce4356b69..000000000000 --- a/pkgs/development/libraries/safefile/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, stdenv, fetchurl }: -stdenv.mkDerivation rec { - pname = "safefile"; - version = "1.0.5"; - - src = fetchurl { - url = "http://research.cs.wisc.edu/mist/${pname}/releases/${pname}-${version}.tar.gz"; - sha256 = "1y0gikds2nr8jk8smhrl617njk23ymmpxyjb2j1xbj0k82xspv78"; - }; - - meta = with lib; { - description = "File open routines to safely open a file when in the presence of an attack"; - license = licenses.asl20; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.all; - homepage = "https://research.cs.wisc.edu/mist/safefile/"; - }; -} diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix deleted file mode 100644 index 7cdd3072c56c..000000000000 --- a/pkgs/development/libraries/sbc/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libsndfile }: - -stdenv.mkDerivation rec { - pname = "sbc"; - version = "2.0"; - - src = fetchurl { - url = "https://www.kernel.org/pub/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "sha256-jxI2jh279V4UU2UgRzz7M4yEs5KTnMm2Qpg2D9SgeZI="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libsndfile ]; - - meta = with lib; { - description = "SubBand Codec Library"; - homepage = "http://www.bluez.org/"; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix deleted file mode 100644 index 351eb5c15479..000000000000 --- a/pkgs/development/libraries/sblim-sfcc/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, curl }: - -stdenv.mkDerivation rec { - pname = "sblim-sfcc"; - version = "2.2.9"; # this is technically 2.2.9-preview - - src = fetchFromGitHub { - owner = "kkaempf"; - repo = "sblim-sfcc"; - rev = "514a76af2020fd6dc6fc380df76cbe27786a76a2"; - sha256 = "06c1mskl9ixbf26v88w0lvn6v2xd6n5f0jd5mckqrn9j4vmh70hs"; - }; - - buildInputs = [ curl ]; - - nativeBuildInputs = [ autoreconfHook ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Small Footprint CIM Client Library"; - homepage = "https://sourceforge.net/projects/sblim/"; - license = licenses.cpl10; - maintainers = with maintainers; [ deepfire ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index b4e8831b3177..698ac7986204 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ orc ]; - doCheck = (!stdenv.isDarwin); + doCheck = (!stdenv.hostPlatform.isDarwin); patchFlags = [ "-p0" ]; patches = [ diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch b/pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch deleted file mode 100644 index 0ea3b55ef708..000000000000 --- a/pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ruN cfitsio/configure cfitsio-rpath-universal/configure ---- cfitsio/configure 2018-05-09 21:16:00.000000000 +0200 -+++ cfitsio-rpath-universal/configure 2021-10-27 12:02:25.000000000 +0200 -@@ -4829,16 +4829,7 @@ - SHLIB_SUFFIX=".dylib" - CFITSIO_SHLIB="lib\${PACKAGE}.\${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}\${SHLIB_SUFFIX}" - CFITSIO_SHLIB_SONAME="lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX}" -- case $host in -- *darwin[56789]*) -- SHLIB_LD="$CC -dynamiclib -install_name lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}.\${CFITSIO_MICRO}" -- ;; -- *) -- # Build 'Universal' binaries (i386 & x86_64 architectures) and -- # use rpath token on Darwin 10.x or newer: -- SHLIB_LD="$CC -dynamiclib $C_UNIV_SWITCH -headerpad_max_install_names -install_name @rpath/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}.\${CFITSIO_MICRO}" -- ;; -- esac -+ SHLIB_LD="$CC -dynamiclib -install_name ${out}/lib/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}" - - lhea_shlib_cflags="-fPIC -fno-common" - ;; diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix deleted file mode 100644 index a12e00f9676d..000000000000 --- a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv -, lib -, fetchurl -, bzip2 -, curl -, zlib -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "cfitsio"; - version = "4.4.1"; - - src = fetchurl { - url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${finalAttrs.version}.tar.gz"; - hash = "sha256-ZqHcPyGAD57qvZ6sV3uR/N2aq7pnj7ujuFJzGRENHSU="; - }; - - patches = [ - ./darwin-rpath-universal.patch - ]; - - buildInputs = [ - bzip2 - curl - zlib - ]; - - configureFlags = [ - "--with-bzip2=${bzip2.out}" - "--enable-reentrant" - ]; - - hardeningDisable = [ "format" ]; - - # Shared-only build - buildFlags = [ "shared" ]; - - postPatch = '' - sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in - ''; - - meta = { - homepage = "https://heasarc.gsfc.nasa.gov/fitsio/"; - description = "Library for reading and writing FITS data files"; - longDescription = '' - CFITSIO is a library of C and Fortran subroutines for reading and - writing data files in FITS (Flexible Image Transport System) data - format. CFITSIO provides simple high-level routines for reading and - writing FITS files that insulate the programmer from the internal - complexities of the FITS format. CFITSIO also provides many - advanced features for manipulating and filtering the information in - FITS files. - ''; - changelog = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/docs/changes.txt"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ xbreak hjones2199 ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - }; -}) diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index 78ba7f42fd50..5d7137abac2c 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { # Socket address collisions between tests enableParallelChecking = false; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for f in $out/lib/udev/rules.d/*.rules do substituteInPlace $f --replace "/bin/sh" "${bash}/bin/sh" \ diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index 50ec95ee2f8f..72a9c747eeb4 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -171,7 +171,7 @@ let pname = "libasi"; buildInputs = [ libusb1 - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ autoPatchelfHook ]; meta = with lib; { @@ -182,7 +182,7 @@ let libastroasis = buildIndi3rdParty { pname = "libastroasis"; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; nativeBuildInputs = [ autoPatchelfHook ]; meta = with lib; { license = licenses.unfreeRedistributable; @@ -193,7 +193,7 @@ let libatik = buildIndi3rdParty { pname = "libatik"; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libusb1 systemd libdc1394 @@ -247,7 +247,7 @@ let libinovasdk = buildIndi3rdParty { pname = "libinovasdk"; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libusb1 ]; nativeBuildInputs = [ autoPatchelfHook ]; @@ -348,7 +348,7 @@ let ''; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libusb1 systemd ]; @@ -377,7 +377,7 @@ let cmakeFlags = [ "-DQHY_FIRMWARE_INSTALL_DIR=\${CMAKE_INSTALL_PREFIX}/lib/firmware/qhy" ]; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libusb1 ]; nativeBuildInputs = [ autoPatchelfHook ]; @@ -404,7 +404,7 @@ let libricohcamerasdk = buildIndi3rdParty { pname = "libricohcamerasdk"; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libusb1 ]; nativeBuildInputs = [ autoPatchelfHook ]; @@ -447,7 +447,7 @@ let libsvbony = buildIndi3rdParty { pname = "libsvbony"; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) libusb1 ]; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/pkgs/development/libraries/science/astronomy/libnova/default.nix b/pkgs/development/libraries/science/astronomy/libnova/default.nix deleted file mode 100644 index 2f5f6851fd8d..000000000000 --- a/pkgs/development/libraries/science/astronomy/libnova/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchgit, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "libnova"; - version = "0.16"; - - # pull from git repo because upstream stopped tarball releases after v0.15 - src = fetchgit { - url = "https://git.code.sf.net/p/libnova/${pname}"; - rev = "v${version}"; - sha256 = "0icwylwkixihzni0kgl0j8dx3qhqvym6zv2hkw2dy6v9zvysrb1b"; - }; - - nativeBuildInputs = [ - autoreconfHook - ]; - - meta = with lib; { - description = "Celestial Mechanics, Astrometry and Astrodynamics Library"; - mainProgram = "libnovaconfig"; - homepage = "http://libnova.sf.net"; - license = licenses.gpl2; - maintainers = with maintainers; [ hjones2199 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/science/astronomy/libxisf/0001-Fix-pkg-config-paths.patch b/pkgs/development/libraries/science/astronomy/libxisf/0001-Fix-pkg-config-paths.patch deleted file mode 100644 index c26a2bbc8814..000000000000 --- a/pkgs/development/libraries/science/astronomy/libxisf/0001-Fix-pkg-config-paths.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nicolas Benes <nbenes.gh@xandea.de> -Date: Mon, 22 May 2023 09:25:27 +0200 -Subject: [PATCH] Fix pkg-config paths - - -diff --git a/libxisf.pc.in b/libxisf.pc.in -index b0b8b53..944b068 100644 ---- a/libxisf.pc.in -+++ b/libxisf.pc.in -@@ -1,7 +1,7 @@ - prefix="@CMAKE_INSTALL_PREFIX@" - exec_prefix="${prefix}" --libdir="${exec_prefix}/@CMAKE_INSTALL_LIBDIR@" --includedir="${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" -+libdir="@CMAKE_INSTALL_FULL_LIBDIR@" -+includedir="@CMAKE_INSTALL_FULL_INCLUDEDIR@" - - Name: @PROJECT_NAME@ - Description: @CMAKE_PROJECT_DESCRIPTION@ --- -2.38.5 - diff --git a/pkgs/development/libraries/science/astronomy/libxisf/default.nix b/pkgs/development/libraries/science/astronomy/libxisf/default.nix deleted file mode 100644 index d19dd2788745..000000000000 --- a/pkgs/development/libraries/science/astronomy/libxisf/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, fetchFromGitea -, cmake -, pkg-config -, lz4 -, pugixml -, zlib -, zstd -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libxisf"; - version = "0.2.12"; - - src = fetchFromGitea { - domain = "gitea.nouspiro.space"; - owner = "nou"; - repo = "libXISF"; - rev = "v${finalAttrs.version}"; - hash = "sha256-QhshgKyf9s5U5JMa5TZelIo1tpJGlsOQePPG1kEfbq8="; - }; - - patches = [ - ./0001-Fix-pkg-config-paths.patch - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - cmakeFlags = [ - "-DUSE_BUNDLED_LIBS=OFF" - ] ++ lib.optional stdenv.hostPlatform.isStatic "-DBUILD_SHARED_LIBS=OFF"; - - buildInputs = [ - lz4 - pugixml - zlib - zstd - ]; - - doCheck = true; - - meta = with lib; { - description = "Library to load and write XISF format from PixInsight"; - homepage = "https://gitea.nouspiro.space/nou/libXISF"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ panicgh ]; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/development/libraries/science/astronomy/wcslib/default.nix b/pkgs/development/libraries/science/astronomy/wcslib/default.nix deleted file mode 100644 index f51b70604bec..000000000000 --- a/pkgs/development/libraries/science/astronomy/wcslib/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, flex }: - -stdenv.mkDerivation rec { - pname = "wcslib"; - version = "8.3"; - - src = fetchurl { - url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Qx6jQXknu8Arib+jQV3AtGaLDyGjtG+4o1JeL89hRQg="; - }; - - nativeBuildInputs = [ flex ]; - - enableParallelBuilding = true; - - outputs = [ "out" "man" ]; - - meta = with lib; { - homepage = "https://www.atnf.csiro.au/people/mcalabre/WCS/"; - description = "World Coordinate System library for astronomy"; - longDescription = '' - Library for world coordinate systems for spherical geometries - and their conversion to image coordinate systems. This is the - standard library for this purpose in astronomy. - ''; - maintainers = with maintainers; [ hjones2199 ]; - license = licenses.lgpl3Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix deleted file mode 100644 index 7e022bafbb40..000000000000 --- a/pkgs/development/libraries/science/benchmark/papi/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv -, fetchurl -}: - -stdenv.mkDerivation rec { - version = "7.0.1"; - pname = "papi"; - - src = fetchurl { - url = "https://bitbucket.org/icl/papi/get/papi-${lib.replaceStrings ["."] ["-"] version}-t.tar.gz"; - sha256 = "sha256-VajhmPW8sEJksfhLjBVlpBH7+AZr4fwKZPAtZxRF1Bk="; - }; - - setSourceRoot = '' - sourceRoot=$(echo */src) - ''; - - doCheck = true; - checkTarget = "test"; - - meta = with lib; { - homepage = "https://icl.utk.edu/papi/"; - description = "Library providing access to various hardware performance counters"; - license = licenses.bsdOriginal; - platforms = platforms.linux; - maintainers = with maintainers; [ costrouc zhaofengli ]; - }; -} diff --git a/pkgs/development/libraries/science/biology/bicgl/default.nix b/pkgs/development/libraries/science/biology/bicgl/default.nix deleted file mode 100644 index 89f4220f92f4..000000000000 --- a/pkgs/development/libraries/science/biology/bicgl/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, libGLU, libglut }: - -stdenv.mkDerivation rec { - pname = "bicgl"; - version = "unstable-2018-04-06"; - - owner = "BIC-MNI"; - - src = fetchFromGitHub { - inherit owner; - repo = pname; - rev = "61a035751c9244fcca1edf94d6566fa2a709ce90"; - sha256 = "0lzirdi1mf4yl8srq7vjn746sbydz7h0wjh7wy8gycy6hq04qrg4"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libminc bicpl libGLU libglut ]; - - cmakeFlags = [ - "-DLIBMINC_DIR=${libminc}/lib/cmake" - "-DBICPL_DIR=${bicpl}/lib" - ]; - - meta = with lib; { - homepage = "https://github.com/${owner}/${pname}"; - description = "Brain Imaging Centre graphics library"; - maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.hpndUc; - }; -} diff --git a/pkgs/development/libraries/science/biology/bicpl/default.nix b/pkgs/development/libraries/science/biology/bicpl/default.nix deleted file mode 100644 index fd9e4f4003e0..000000000000 --- a/pkgs/development/libraries/science/biology/bicpl/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - libminc, - netpbm, -}: - -stdenv.mkDerivation rec { - pname = "bicpl"; - version = "unstable-2024-05-14"; - - # master is not actively maintained, using develop and develop-apple branches - src = fetchFromGitHub { - owner = "BIC-MNI"; - repo = pname; - rev = "7e1e791483cf135fe29b8eecd7a360aa892823ae"; - hash = "sha256-SvbtPUfEYp3IGivG+5yFdJF904miyMk+s15zwW7e7b4="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - libminc - netpbm - ]; - - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ]; - - doCheck = false; - # internal_volume_io.h: No such file or directory - - meta = with lib; { - homepage = "https://github.com/BIC-MNI/bicpl"; - description = "Brain Imaging Centre programming library"; - maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = with licenses; [ - hpndUc - gpl3Plus - ]; - }; -} diff --git a/pkgs/development/libraries/science/biology/bpp-core/default.nix b/pkgs/development/libraries/science/biology/bpp-core/default.nix deleted file mode 100644 index 0d0e3c114920..000000000000 --- a/pkgs/development/libraries/science/biology/bpp-core/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: - -stdenv.mkDerivation rec { - pname = "bpp-core"; - version = "2.4.1"; - - src = fetchFromGitHub { owner = "BioPP"; - repo = pname; - rev = "v${version}"; - sha256 = "0ma2cl677l7s0n5sffh66cy9lxp5wycm50f121g8rx85p95vkgwv"; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/BioPP/bpp-core/commit/d450e8033b06e80dff9c2236fb7ce1f3ced5dcbb.patch"; - hash = "sha256-9t68mrK7KNs5BxljKMaA+XskCcKDNv8DNCVUYunoNdw="; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - postFixup = '' - substituteInPlace $out/lib/cmake/bpp-core/bpp-core-targets.cmake \ - --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' - ''; - # prevents cmake from exporting incorrect INTERFACE_INCLUDE_DIRECTORIES - # of form /nix/store/.../nix/store/.../include, - # probably due to relative vs absolute path issue - - doCheck = !stdenv.isDarwin; - - meta = with lib; { - homepage = "https://github.com/BioPP/bpp-core"; - changelog = "https://github.com/BioPP/bpp-core/blob/master/ChangeLog"; - description = "C++ bioinformatics libraries and tools"; - maintainers = with maintainers; [ bcdarwin ]; - license = licenses.cecill20; - }; -} diff --git a/pkgs/development/libraries/science/biology/bpp-phyl/default.nix b/pkgs/development/libraries/science/biology/bpp-phyl/default.nix deleted file mode 100644 index 0b18dbfcf19a..000000000000 --- a/pkgs/development/libraries/science/biology/bpp-phyl/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, bpp-core, bpp-seq }: - -stdenv.mkDerivation rec { - pname = "bpp-phyl"; - - inherit (bpp-core) version; - - src = fetchFromGitHub { - owner = "BioPP"; - repo = pname; - rev = "v${version}"; - sha256 = "192zks6wyk903n06c2lbsscdhkjnfwms8p7jblsmk3lvjhdipb20"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ bpp-core bpp-seq ]; - - postFixup = '' - substituteInPlace $out/lib/cmake/${pname}/${pname}-targets.cmake \ - --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' - ''; - - doCheck = !stdenv.isDarwin; - - meta = bpp-core.meta // { - homepage = "https://github.com/BioPP/bpp-phyl"; - changelog = "https://github.com/BioPP/bpp-phyl/blob/master/ChangeLog"; - }; -} diff --git a/pkgs/development/libraries/science/biology/bpp-popgen/default.nix b/pkgs/development/libraries/science/biology/bpp-popgen/default.nix deleted file mode 100644 index 2cb89b4bbd38..000000000000 --- a/pkgs/development/libraries/science/biology/bpp-popgen/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, bpp-core, bpp-seq }: - -stdenv.mkDerivation rec { - pname = "bpp-popgen"; - - inherit (bpp-core) version; - - src = fetchFromGitHub { - owner = "BioPP"; - repo = pname; - rev = "v${version}"; - sha256 = "0bz0fhrq3dri6a0hvfc3zlvrns8mrzzlnicw5pyfa812gc1qwfvh"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ bpp-core bpp-seq ]; - - postFixup = '' - substituteInPlace $out/lib/cmake/${pname}/${pname}-targets.cmake \ - --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' - ''; - # prevents cmake from exporting incorrect INTERFACE_INCLUDE_DIRECTORIES - # of form /nix/store/.../nix/store/.../include, - # probably due to relative vs absolute path issue - - doCheck = !stdenv.isDarwin; - - meta = bpp-core.meta // { - homepage = "https://github.com/BioPP/bpp-popgen"; - changelog = "https://github.com/BioPP/bpp-popgen/blob/master/ChangeLog"; - }; -} diff --git a/pkgs/development/libraries/science/biology/bpp-seq/default.nix b/pkgs/development/libraries/science/biology/bpp-seq/default.nix deleted file mode 100644 index 2f6fbf9e362c..000000000000 --- a/pkgs/development/libraries/science/biology/bpp-seq/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, bpp-core }: - -stdenv.mkDerivation rec { - pname = "bpp-seq"; - - inherit (bpp-core) version; - - src = fetchFromGitHub { - owner = "BioPP"; - repo = pname; - rev = "v${version}"; - sha256 = "1mc09g8jswzsa4wgrfv59jxn15ys3q8s0227p1j838wkphlwn2qk"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ bpp-core ]; - - postFixup = '' - substituteInPlace $out/lib/cmake/${pname}/${pname}-targets.cmake \ - --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' - ''; - # prevents cmake from exporting incorrect INTERFACE_INCLUDE_DIRECTORIES - # of form /nix/store/.../nix/store/.../include, - # probably due to relative vs absolute path issue - - doCheck = !stdenv.isDarwin; - - meta = bpp-core.meta // { - homepage = "https://github.com/BioPP/bpp-seq"; - changelog = "https://github.com/BioPP/bpp-seq/blob/master/ChangeLog"; - }; -} diff --git a/pkgs/development/libraries/science/biology/ciftilib/default.nix b/pkgs/development/libraries/science/biology/ciftilib/default.nix deleted file mode 100644 index 85b0b1c8a0e5..000000000000 --- a/pkgs/development/libraries/science/biology/ciftilib/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, boost -, libxmlxx -, pkg-config -, zlib -}: - -stdenv.mkDerivation rec { - pname = "ciftilib"; - version = "1.6.0"; - - src = fetchFromGitHub { - owner = "Washington-University"; - repo = "CiftiLib"; - rev = "v${version}"; - hash = "sha256-xc2dpMse4SozYEV/w3rXCrh1LKpTThq5nHB2y5uAD0A="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ boost libxmlxx zlib ]; - - cmakeFlags = [ "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;'big|datatype-md5'" ]; - - # error: no member named 'file_string' in 'boost::filesystem::path' - env.NIX_CFLAGS_COMPILE = "-UCIFTILIB_BOOST_NO_FSV3"; - - doCheck = true; - - meta = with lib; { - homepage = "https://github.com/Washington-University/CiftiLib"; - description = "Library for reading and writing CIFTI files"; - maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.bsd2; - }; -} diff --git a/pkgs/development/libraries/science/biology/edlib/default.nix b/pkgs/development/libraries/science/biology/edlib/default.nix deleted file mode 100644 index b8ea4a55291a..000000000000 --- a/pkgs/development/libraries/science/biology/edlib/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "edlib"; - version = "unstable-2021-08-20"; - - src = fetchFromGitHub { - owner = "Martinsos"; - repo = pname; - rev = "f8afceb49ab0095c852e0b8b488ae2c88e566afd"; - hash = "sha256-P/tFbvPBtA0MYCNDabW+Ypo3ltwP4S+6lRDxwAZ1JFo="; - }; - - nativeBuildInputs = [ cmake ]; - - doCheck = true; - checkPhase = '' - runHook preCheck - bin/runTests - runHook postCheck - ''; - - meta = with lib; { - homepage = "https://martinsos.github.io/edlib"; - description = "Lightweight, fast C/C++ library for sequence alignment using edit distance"; - maintainers = with maintainers; [ bcdarwin ]; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index 44e76244c987..46b297722feb 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ itk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ itk ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; - doCheck = !stdenv.isDarwin; # usual dynamic linker issues + doCheck = !stdenv.hostPlatform.isDarwin; # usual dynamic linker issues meta = with lib; { homepage = "https://elastix.lumc.nl"; diff --git a/pkgs/development/libraries/science/biology/gifticlib/default.nix b/pkgs/development/libraries/science/biology/gifticlib/default.nix deleted file mode 100644 index 306324129cbd..000000000000 --- a/pkgs/development/libraries/science/biology/gifticlib/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, expat, nifticlib, zlib }: - -stdenv.mkDerivation rec { - pname = "gifticlib"; - version = "unstable-2020-07-07"; - - src = fetchFromGitHub { - owner = "NIFTI-Imaging"; - repo = "gifti_clib"; - rev = "5eae81ba1e87ef3553df3b6ba585f12dc81a0030"; - sha256 = "0gcab06gm0irjnlrkpszzd4wr8z0fi7gx8f7966gywdp2jlxzw19"; - }; - - cmakeFlags = [ "-DUSE_SYSTEM_NIFTI=ON" "-DDOWNLOAD_TEST_DATA=OFF" ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ expat nifticlib zlib ]; - - # without the test data, this is only a few basic tests - doCheck = !stdenv.isDarwin; - checkPhase = '' - runHook preCheck - ctest -LE 'NEEDS_DATA' - runHook postCheck - ''; - - meta = with lib; { - homepage = "https://www.nitrc.org/projects/gifti"; - description = "Medical imaging geometry format C API"; - maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.publicDomain; - }; -} diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix deleted file mode 100644 index 8e1c0a939daf..000000000000 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, fetchurl, zlib, bzip2, xz, curl, perl }: - -stdenv.mkDerivation rec { - pname = "htslib"; - version = "1.19.1"; - - src = fetchurl { - url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Ii1001dPtnsVjGmIyYDuqrqKBlb15P+3a1+lfwNZM+w="; - }; - - # perl is only used during the check phase. - nativeBuildInputs = [ perl ]; - - buildInputs = [ zlib bzip2 xz curl ]; - - configureFlags = if ! stdenv.hostPlatform.isStatic - then [ "--enable-libcurl" ] # optional but strongly recommended - else [ "--disable-libcurl" "--disable-plugins" ]; - - - # In the case of static builds, we need to replace the build and install phases - buildPhase = lib.optional stdenv.hostPlatform.isStatic '' - make AR=$AR lib-static - make LDFLAGS=-static bgzip htsfile tabix - ''; - - installPhase = lib.optional stdenv.hostPlatform.isStatic '' - install -d $out/bin - install -d $out/lib - install -d $out/include/htslib - install -D libhts.a $out/lib - install -m644 htslib/*h $out/include/htslib - install -D bgzip htsfile tabix $out/bin - ''; - - preCheck = '' - patchShebangs test/ - ''; - - enableParallelBuilding = true; - - doCheck = true; - - meta = with lib; { - description = "C library for reading/writing high-throughput sequencing data"; - license = licenses.mit; - homepage = "http://www.htslib.org/"; - platforms = platforms.unix; - maintainers = [ maintainers.mimame ]; - }; -} diff --git a/pkgs/development/libraries/science/biology/nifticlib/default.nix b/pkgs/development/libraries/science/biology/nifticlib/default.nix deleted file mode 100644 index fee2ea8772b4..000000000000 --- a/pkgs/development/libraries/science/biology/nifticlib/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, zlib }: - -stdenv.mkDerivation rec { - pname = "nifticlib"; - version = "3.0.1"; - - src = fetchFromGitHub { - owner = "NIFTI-Imaging"; - repo = "nifti_clib"; - rev = "v${version}"; - sha256 = "0hamm6nvbjdjjd5md4jahzvn5559frigxaiybnjkh59ckxwb1hy4"; - }; - - cmakeFlags = [ "-DDOWNLOAD_TEST_DATA=OFF" ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib ]; - - checkPhase = '' - runHook preCheck - ctest -LE 'NEEDS_DATA' - runHook postCheck - ''; - doCheck = true; - - meta = with lib; { - homepage = "https://nifti-imaging.github.io"; - description = "Medical imaging format C API"; - maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.publicDomain; - }; -} diff --git a/pkgs/development/libraries/science/biology/oobicpl/default.nix b/pkgs/development/libraries/science/biology/oobicpl/default.nix deleted file mode 100644 index 7f1112311d6b..000000000000 --- a/pkgs/development/libraries/science/biology/oobicpl/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, libminc -, bicpl -, arguments -, pcre-cpp }: - -stdenv.mkDerivation rec { - pname = "oobicpl"; - version = "unstable-2020-08-12"; - - src = fetchFromGitHub { - owner = "BIC-MNI"; - repo = pname; - rev = "a9409da8a5bb4925438f32aff577b6333faec28b"; - sha256 = "0b4chjhr32wbb1sash8cq1jfnr7rzdq84hif8anlrjqd3l0gw357"; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ libminc bicpl arguments pcre-cpp ]; - - cmakeFlags = [ - "-DLIBMINC_DIR=${libminc}/lib/cmake" - "-DBICPL_DIR=${bicpl}/lib" - "-DARGUMENTS_DIR=${arguments}/lib" - "-DOOBICPL_BUILD_SHARED_LIBS=TRUE" - ]; - - meta = with lib; { - homepage = "https://github.com/BIC-MNI/oobicpl"; - description = "Brain Imaging Centre object-oriented programming library (and tools)"; - maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.free; - }; -} diff --git a/pkgs/development/libraries/science/chemistry/cppe/default.nix b/pkgs/development/libraries/science/chemistry/cppe/default.nix deleted file mode 100644 index 9781ce780660..000000000000 --- a/pkgs/development/libraries/science/chemistry/cppe/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, llvmPackages }: - -stdenv.mkDerivation rec { - pname = "cppe"; - version = "0.3.1"; - - src = fetchFromGitHub { - owner = "maxscheurer"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-guM7+ZWDJLcAUJtPkKLvC4LYSA2eBvER7cgwPZ7FxHw="; - }; - - nativeBuildInputs = [ cmake ] - ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; - - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; - - meta = with lib; { - description = "C++ and Python library for Polarizable Embedding"; - homepage = "https://github.com/maxscheurer/cppe"; - license = licenses.lgpl3Only; - platforms = platforms.unix; - maintainers = [ maintainers.sheepforce ]; - }; -} diff --git a/pkgs/development/libraries/science/chemistry/dftd4/default.nix b/pkgs/development/libraries/science/chemistry/dftd4/default.nix deleted file mode 100644 index 818155cd3726..000000000000 --- a/pkgs/development/libraries/science/chemistry/dftd4/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, gfortran -, meson -, ninja -, pkg-config -, python3 -, blas -, lapack -, mctc-lib -, mstore -, multicharge -}: - -assert !blas.isILP64 && !lapack.isILP64; - -stdenv.mkDerivation rec { - pname = "dftd4"; - version = "3.6.0"; - - src = fetchFromGitHub { - owner = "dftd4"; - repo = pname; - rev = "v${version}"; - hash = "sha256-VIV9953hx0MZupOARdH+P1h7JtZeJmTlqtO8si+lwdU="; - }; - - patches = [ - # Make sure fortran headers are installed directly in /include - ./fortran-module-dir.patch - ]; - - nativeBuildInputs = [ gfortran meson ninja pkg-config python3 ]; - - buildInputs = [ blas lapack mctc-lib mstore multicharge ]; - - outputs = [ "out" "dev" ]; - - doCheck = true; - - postPatch = '' - patchShebangs --build \ - config/install-mod.py \ - app/tester.py - ''; - - preCheck = '' - export OMP_NUM_THREADS=2 - ''; - - meta = with lib; { - description = "Generally Applicable Atomic-Charge Dependent London Dispersion Correction"; - mainProgram = "dftd4"; - license = with licenses; [ lgpl3Plus gpl3Plus ]; - homepage = "https://github.com/grimme-lab/dftd4"; - platforms = platforms.linux; - maintainers = [ maintainers.sheepforce ]; - }; -} diff --git a/pkgs/development/libraries/science/chemistry/dftd4/fortran-module-dir.patch b/pkgs/development/libraries/science/chemistry/dftd4/fortran-module-dir.patch deleted file mode 100644 index 88d33a8d0499..000000000000 --- a/pkgs/development/libraries/science/chemistry/dftd4/fortran-module-dir.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f222aab..262b505 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -89,7 +89,6 @@ target_include_directories( - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> - $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> - $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> -- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${module-dir}> - ) - target_include_directories( - "${PROJECT_NAME}-lib" -@@ -132,7 +131,7 @@ install( - install( - DIRECTORY - "${CMAKE_CURRENT_BINARY_DIR}/include/" -- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${module-dir}" -+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/" - ) - if(WITH_API) - enable_language("C") -diff --git a/config/template.cmake b/config/template.cmake -index 8b5141d..8f94d66 100644 ---- a/config/template.cmake -+++ b/config/template.cmake -@@ -6,7 +6,6 @@ set("@PROJECT_NAME@_WITH_OpenMP" @WITH_OpenMP@) - set( - "@PROJECT_NAME@_INCLUDE_DIRS" - "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" -- "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/@module-dir@" - ) - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") - -diff --git a/config/template.pc b/config/template.pc -index 3d6efbb..fea69e4 100644 ---- a/config/template.pc -+++ b/config/template.pc -@@ -6,4 +6,4 @@ Name: @PROJECT_NAME@ - Description: @PROJECT_DESCRIPTION@ - Version: @PROJECT_VERSION@ - Libs: -L${libdir} -l@PROJECT_NAME@ --Cflags: -I${includedir} -I${includedir}/@module-dir@ -+Cflags: -I${includedir} -I${includedir}/ -diff --git a/meson.build b/meson.build -index c9e9c58..ac8f0bd 100644 ---- a/meson.build -+++ b/meson.build -@@ -83,7 +83,7 @@ if install - ) - endif - -- module_id = meson.project_name() / fc_id + '-' + fc.version() -+ module_id = meson.project_name() - meson.add_install_script( - find_program(files('config'/'install-mod.py')), - get_option('includedir') / module_id, diff --git a/pkgs/development/libraries/science/chemistry/harminv/default.nix b/pkgs/development/libraries/science/chemistry/harminv/default.nix deleted file mode 100644 index f9d8573ca6d5..000000000000 --- a/pkgs/development/libraries/science/chemistry/harminv/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, gfortran -, blas -, lapack -}: - -assert !blas.isILP64; -assert !lapack.isILP64; - -stdenv.mkDerivation rec { - pname = "harminv"; - version = "1.4.2"; - - src = fetchFromGitHub { - owner = "NanoComp"; - repo = pname; - rev = "v${version}"; - hash = "sha256-HV8xylK2IOvbONYGgyaqAabp6xA7/uvN4DU7upIlZh0="; - }; - - # File is missing in the git checkout but required by autotools - postPatch = '' - touch ChangeLog - ''; - - nativeBuildInputs = [ autoreconfHook gfortran ]; - - buildInputs = [ blas lapack ]; - - configureFlags = [ - "--enable-shared" - "--enable-maintainer-mode" - ]; - - meta = with lib; { - description = "Harmonic inversion algorithm of Mandelshtam: decompose signal into sum of decaying sinusoids"; - homepage = "https://github.com/NanoComp/harminv"; - license = with licenses; [ gpl2Only ]; - maintainers = with maintainers; [ sheepforce markuskowa ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/science/chemistry/libGDSII/default.nix b/pkgs/development/libraries/science/chemistry/libGDSII/default.nix deleted file mode 100644 index 095e0ee182a3..000000000000 --- a/pkgs/development/libraries/science/chemistry/libGDSII/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -}: - -stdenv.mkDerivation rec { - pname = "libGDSII"; - version = "0.21"; - - src = fetchFromGitHub { - owner = "HomerReid"; - repo = pname; - rev = "v${version}"; - hash = "sha256-EXEt7l69etcBdDdEDlD1ODOdhTBZCVjgY1jhRUDd/W0="; - }; - - # File is missing in the repo but automake requires it - postPatch = '' - touch ChangeLog - ''; - - nativeBuildInputs = [ autoreconfHook ]; - - meta = with lib; { - description = "Library and command-line utility for reading GDSII geometry files"; - mainProgram = "GDSIIConvert"; - homepage = "https://github.com/HomerReid/libGDSII"; - license = [ licenses.gpl2Only ]; - maintainers = with maintainers; [ sheepforce markuskowa ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/science/chemistry/libmsym/default.nix b/pkgs/development/libraries/science/chemistry/libmsym/default.nix deleted file mode 100644 index fdcf7d00e3ba..000000000000 --- a/pkgs/development/libraries/science/chemistry/libmsym/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake } : - -stdenv.mkDerivation rec { - pname = "libmsym"; - version = "0.2.3"; - - src = fetchFromGitHub { - owner = "mcodev31"; - repo = pname; - rev = "v${version}"; - sha256= "k+OEwrA/saupP/wX6Ii5My0vffiJ0X9xMCTrliMSMik="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = " molecular point group symmetry lib"; - homepage = "https://github.com/mcodev31/libmsym"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.sheepforce ]; - }; -} diff --git a/pkgs/development/libraries/science/chemistry/libvdwxc/default.nix b/pkgs/development/libraries/science/chemistry/libvdwxc/default.nix deleted file mode 100644 index c843d443e81e..000000000000 --- a/pkgs/development/libraries/science/chemistry/libvdwxc/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv -, lib -, fetchFromGitLab -, gfortran -, autoreconfHook -, fftwMpi -, mpi -}: - -stdenv.mkDerivation rec { - pname = "libvdwxc"; - # Stable version has non-working MPI detection. - version = "unstable-24.02.2020"; - - src = fetchFromGitLab { - owner = "libvdwxc"; - repo = pname; - rev = "92f4910c6ac88e111db2fb3a518089d0510c53b0"; - sha256 = "1c7pjrvifncbdyngs2bv185imxbcbq64nka8gshhp8n2ns6fids6"; - }; - - nativeBuildInputs = [ autoreconfHook gfortran ]; - - buildInputs = [ mpi fftwMpi ]; - - preConfigure = '' - mkdir build && cd build - - export PATH=$PATH:${mpi}/bin - configureFlagsArray+=( - --with-mpi=${lib.getDev mpi} - CC=mpicc - FC=mpif90 - MPICC=mpicc - MPIFC=mpif90 - ) - ''; - - configureScript = "../configure"; - - hardeningDisable = [ "format" ]; - - doCheck = true; - - meta = with lib; { - description = "Portable C library of density functionals with van der Waals interactions for density functional theory"; - license = with licenses; [ lgpl3Plus bsd3 ]; - homepage = "https://libvdwxc.org/"; - platforms = platforms.unix; - maintainers = [ maintainers.sheepforce ]; - }; -} diff --git a/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix b/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix deleted file mode 100644 index 3021cf8f437d..000000000000 --- a/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, gfortran -, meson -, ninja -, pkg-config -, python3 -, json-fortran -}: - -stdenv.mkDerivation rec { - pname = "mctc-lib"; - version = "0.3.2"; - - src = fetchFromGitHub { - owner = "grimme-lab"; - repo = pname; - rev = "v${version}"; - hash = "sha256-dJYKnGlcc4N40h1RnP6MJyBj70/8kb1q4OyKTmlvS70="; - }; - - nativeBuildInputs = [ gfortran meson ninja pkg-config python3 ]; - - buildInputs = [ json-fortran ]; - - outputs = [ "out" "dev" ]; - - doCheck = true; - - postPatch = '' - patchShebangs --build config/install-mod.py - ''; - - meta = with lib; { - description = "Modular computation tool chain library"; - mainProgram = "mctc-convert"; - homepage = "https://github.com/grimme-lab/mctc-lib"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = [ maintainers.sheepforce ]; - }; -} diff --git a/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix b/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix deleted file mode 100644 index ef7738039673..000000000000 --- a/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, msgpack } : - -stdenv.mkDerivation (finalAttrs: { - pname = "mmtf-cpp"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "rcsb"; - repo = "mmtf-cpp"; - rev = "v${finalAttrs.version}"; - hash = "sha256-8JrNobvekMggS8L/VORKA32DNUdXiDrYMObjd29wQmc="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ msgpack ]; - - meta = with lib; { - description = "Library of exchange-correlation functionals with arbitrary-order derivatives"; - homepage = "https://github.com/rcsb/mmtf-cpp"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = [ maintainers.sheepforce ]; - }; -}) diff --git a/pkgs/development/libraries/science/chemistry/mstore/default.nix b/pkgs/development/libraries/science/chemistry/mstore/default.nix deleted file mode 100644 index c77667a8d71a..000000000000 --- a/pkgs/development/libraries/science/chemistry/mstore/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, gfortran -, meson -, ninja -, pkg-config -, python3 -, mctc-lib -}: - -stdenv.mkDerivation rec { - pname = "mstore"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "grimme-lab"; - repo = pname; - rev = "v${version}"; - hash = "sha256-zfrxdrZ1Um52qTRNGJoqZNQuHhK3xM/mKfk0aBLrcjw="; - }; - - nativeBuildInputs = [ gfortran meson ninja pkg-config python3 ]; - - buildInputs = [ mctc-lib ]; - - outputs = [ "out" "dev" ]; - - postPatch = '' - patchShebangs --build config/install-mod.py - ''; - - meta = with lib; { - description = "Molecular structure store for testing"; - license = licenses.asl20; - homepage = "https://github.com/grimme-lab/mstore"; - platforms = platforms.linux; - maintainers = [ maintainers.sheepforce ]; - }; -} diff --git a/pkgs/development/libraries/science/chemistry/multicharge/default.nix b/pkgs/development/libraries/science/chemistry/multicharge/default.nix deleted file mode 100644 index 3660705242f6..000000000000 --- a/pkgs/development/libraries/science/chemistry/multicharge/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch2 -, gfortran -, meson -, ninja -, pkg-config -, python3 -, blas -, lapack -, mctc-lib -, mstore -}: - -assert !blas.isILP64 && !lapack.isILP64; - -stdenv.mkDerivation rec { - pname = "multicharge"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "grimme-lab"; - repo = pname; - rev = "v${version}"; - hash = "sha256-oUI5x5/Gd0EZBb1w+0jlJUF9X51FnkHFu8H7KctqXl0="; - }; - - patches = [ - # Fix finding of MKL for Intel 2021 and newer - # Also fix finding mstore - # https://github.com/grimme-lab/multicharge/pull/20 - (fetchpatch2 { - url = "https://github.com/grimme-lab/multicharge/commit/98a11ac524cd2a1bd9e2aeb8f4429adb2d76ee8.patch"; - hash = "sha256-zZ2pcbyaHjN2ZxpMhlqUtIXImrVsLk/8WIcb9IYPgBw="; - }) - ]; - - nativeBuildInputs = [ gfortran meson ninja pkg-config python3 ]; - - buildInputs = [ blas lapack mctc-lib mstore ]; - - outputs = [ "out" "dev" ]; - - doCheck = true; - - postPatch = '' - patchShebangs --build config/install-mod.py - ''; - - preCheck = '' - export OMP_NUM_THREADS=2 - ''; - - meta = with lib; { - description = "Electronegativity equilibration model for atomic partial charges"; - mainProgram = "multicharge"; - license = licenses.asl20; - homepage = "https://github.com/grimme-lab/multicharge"; - platforms = platforms.linux; - maintainers = [ maintainers.sheepforce ]; - }; -} diff --git a/pkgs/development/libraries/science/chemistry/openmm/default.nix b/pkgs/development/libraries/science/chemistry/openmm/default.nix deleted file mode 100644 index 35aa46d270c2..000000000000 --- a/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, gfortran -, fftwSinglePrec -, doxygen -, swig -, enablePython ? false -, python3Packages -, enableOpencl ? true -, opencl-headers -, ocl-icd -, config -, enableCuda ? config.cudaSupport -, cudaPackages -, addDriverRunpath -}: - -stdenv.mkDerivation rec { - pname = "openmm"; - version = "8.1.2"; - - src = fetchFromGitHub { - owner = "openmm"; - repo = pname; - rev = version; - hash = "sha256-2UFccB+xXAw3uRw0G1TKlqTVl9tUl1sRPFG4H05vq04="; - }; - - # "This test is stochastic and may occassionally fail". It does. - postPatch = '' - rm \ - platforms/*/tests/Test*BrownianIntegrator.* \ - platforms/*/tests/Test*LangevinIntegrator.* \ - serialization/tests/TestSerializeIntegrator.cpp - ''; - - nativeBuildInputs = [ - cmake - gfortran - swig - doxygen - python3Packages.python - ] ++ lib.optionals enablePython [ - python3Packages.build - python3Packages.installer - python3Packages.wheel - ] ++ lib.optional enableCuda addDriverRunpath; - - buildInputs = [ fftwSinglePrec ] - ++ lib.optionals enableOpencl [ ocl-icd opencl-headers ] - ++ lib.optional enableCuda cudaPackages.cudatoolkit; - - propagatedBuildInputs = lib.optionals enablePython (with python3Packages; [ - setuptools - python - numpy - cython - ]); - - cmakeFlags = [ - "-DBUILD_TESTING=ON" - "-DOPENMM_BUILD_AMOEBA_PLUGIN=ON" - "-DOPENMM_BUILD_CPU_LIB=ON" - "-DOPENMM_BUILD_C_AND_FORTRAN_WRAPPERS=ON" - "-DOPENMM_BUILD_DRUDE_PLUGIN=ON" - "-DOPENMM_BUILD_PME_PLUGIN=ON" - "-DOPENMM_BUILD_RPMD_PLUGIN=ON" - "-DOPENMM_BUILD_SHARED_LIB=ON" - ] ++ lib.optionals enablePython [ - "-DOPENMM_BUILD_PYTHON_WRAPPERS=ON" - ] ++ lib.optionals enableOpencl [ - "-DOPENMM_BUILD_OPENCL_LIB=ON" - "-DOPENMM_BUILD_AMOEBA_OPENCL_LIB=ON" - "-DOPENMM_BUILD_DRUDE_OPENCL_LIB=ON" - "-DOPENMM_BUILD_RPMD_OPENCL_LIB=ON" - ] ++ lib.optionals enableCuda [ - "-DCUDA_SDK_ROOT_DIR=${cudaPackages.cudatoolkit}" - "-DOPENMM_BUILD_AMOEBA_CUDA_LIB=ON" - "-DOPENMM_BUILD_CUDA_LIB=ON" - "-DOPENMM_BUILD_DRUDE_CUDA_LIB=ON" - "-DOPENMM_BUILD_RPMD_CUDA_LIB=ON" - "-DCMAKE_LIBRARY_PATH=${cudaPackages.cudatoolkit}/lib64/stubs" - ]; - - postInstall = lib.strings.optionalString enablePython '' - export OPENMM_LIB_PATH=$out/lib - export OPENMM_INCLUDE_PATH=$out/include - cd python - ${python3Packages.python.pythonOnBuildForHost.interpreter} -m build --no-isolation --outdir dist/ --wheel - ${python3Packages.python.pythonOnBuildForHost.interpreter} -m installer --prefix $out dist/*.whl - ''; - - postFixup = '' - for lib in $out/lib/plugins/*CUDA.so $out/lib/plugins/*Cuda*.so; do - addDriverRunpath "$lib" - done - ''; - - # Couldn't get CUDA to run properly in the sandbox - doCheck = !enableCuda && !enableOpencl; - - meta = with lib; { - description = "Toolkit for molecular simulation using high performance GPU code"; - mainProgram = "TestReferenceHarmonicBondForce"; - homepage = "https://openmm.org/"; - license = with licenses; [ gpl3Plus lgpl3Plus mit ]; - platforms = platforms.linux; - maintainers = [ maintainers.sheepforce ]; - }; -} diff --git a/pkgs/development/libraries/science/chemistry/plumed/default.nix b/pkgs/development/libraries/science/chemistry/plumed/default.nix deleted file mode 100644 index 643ee2bc228c..000000000000 --- a/pkgs/development/libraries/science/chemistry/plumed/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, blas -}: - -assert !blas.isILP64; - -stdenv.mkDerivation rec { - pname = "plumed"; - version = "2.9.2"; - - src = fetchFromGitHub { - owner = "plumed"; - repo = "plumed2"; - rev = "v${version}"; - hash = "sha256-jNvdbfh1krNMrOFqkEHMy60mjsG/Wp6MQg0gHEjDA5U="; - }; - - postPatch = '' - patchShebangs . - ''; - - buildInputs = [ blas ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Molecular metadynamics library"; - homepage = "https://github.com/plumed/plumed2"; - license = licenses.lgpl3Only; - maintainers = [ maintainers.sheepforce ]; - }; -} diff --git a/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix b/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix index 08f303581c99..68f60e295347 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.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "dftd3"; repo = pname; - rev = "v${version}"; - hash = "sha256-XeLf5v/GraDGcTsVIEBnS4AL8tMeO11YTuPHlNt5Ap8="; + rev = "refs/tags/v${version}"; + hash = "sha256-Yisqd31SHMBuhZ4+VwKlkSW+gjqLttcbKzKjGvez+xE="; }; nativeBuildInputs = [ gfortran meson ninja pkg-config ]; diff --git a/pkgs/development/libraries/science/chemistry/xcfun/default.nix b/pkgs/development/libraries/science/chemistry/xcfun/default.nix deleted file mode 100644 index cac389333e49..000000000000 --- a/pkgs/development/libraries/science/chemistry/xcfun/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, gfortran, python3 } : - -stdenv.mkDerivation rec { - pname = "xcfun"; - version = "2.1.1"; - - src = fetchFromGitHub { - owner = "dftlibs"; - repo = pname; - rev = "v${version}"; - sha256 = "1bj70cnhbh6ziy02x988wwl7cbwaq17ld7qwhswqkgnnx8rpgxid"; - }; - - nativeBuildInputs = [ - cmake - gfortran - ]; - - propagatedBuildInputs = [ (python3.withPackages (p: with p; [ pybind11 ])) ]; - - cmakeFlags = [ "-DXCFUN_MAX_ORDER=3" ]; - - meta = with lib; { - description = "Library of exchange-correlation functionals with arbitrary-order derivatives"; - homepage = "https://github.com/dftlibs/xcfun"; - license = licenses.mpl20; - platforms = platforms.unix; - maintainers = [ maintainers.sheepforce ]; - }; -} diff --git a/pkgs/development/libraries/science/electronics/coloquinte/default.nix b/pkgs/development/libraries/science/electronics/coloquinte/default.nix deleted file mode 100644 index 6946080c100e..000000000000 --- a/pkgs/development/libraries/science/electronics/coloquinte/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, lemon-graph -, eigen -, boost -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "coloquinte"; - version = "0.3.1"; - - src = fetchFromGitHub { - owner = "coloquinte"; - repo = "PlaceRoute"; - rev = finalAttrs.version; - hash = "sha256-bPDXaNZCNBM0qiu+46cL/zH/41lwqHPqfqTzJaERgVQ="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - lemon-graph - eigen - boost - ]; - - meta = { - description = "Placement library for electronic circuits"; - homepage = "https://github.com/Coloquinte/PlaceRoute"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.coloquinte ]; - }; -}) diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix deleted file mode 100644 index dfd33ed603af..000000000000 --- a/pkgs/development/libraries/science/math/QuadProgpp/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation { - pname = "quadprogpp"; - version = "unstable-2023-01-20"; - - src = fetchFromGitHub { - owner = "liuq"; - repo = "QuadProgpp"; - rev = "4c51d91deb5af251957edf9454bfb74279a4544e"; - hash = "sha256-uozwuTAOPsRwYM9KyG3V0hwcmaPpfZPID9Wdd4olsvY="; - }; - - nativeBuildInputs = [ - cmake - ]; - - meta = with lib; { - description = "C++ library for Quadratic Programming"; - longDescription = '' - QuadProg++ is a C++ library for Quadratic Programming which implements - the Goldfarb-Idnani active-set dual method. - ''; - homepage = "https://github.com/liuq/QuadProgpp"; - license = licenses.mit; - maintainers = with maintainers; [ wegank ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/science/math/amd-blis/default.nix b/pkgs/development/libraries/science/math/amd-blis/default.nix deleted file mode 100644 index 17838ab37390..000000000000 --- a/pkgs/development/libraries/science/math/amd-blis/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, perl -, python3 - -# Enable BLAS interface with 64-bit integer width. -, blas64 ? false - -# Target architecture. "amdzen" compiles kernels for all Zen -# generations. To build kernels for specific Zen generations, -# use "zen", "zen2", "zen3", or "zen4". -, withArchitecture ? "amdzen" - -# Enable OpenMP-based threading. -, withOpenMP ? true -}: - -let - threadingSuffix = lib.optionalString withOpenMP "-mt"; - blasIntSize = if blas64 then "64" else "32"; - -in stdenv.mkDerivation rec { - pname = "amd-blis"; - version = "4.2"; - - src = fetchFromGitHub { - owner = "amd"; - repo = "blis"; - rev = version; - hash = "sha256-mLigzaA2S7qFCQT8UWC6bHWAvBjgpqvtgabPyFWBYT0="; - }; - - inherit blas64; - - nativeBuildInputs = [ - perl - python3 - ]; - - # Tests currently fail with non-Zen CPUs due to a floating point - # exception in one of the generic kernels. Try to re-enable the - # next release. - doCheck = false; - - enableParallelBuilding = true; - - configureFlags = [ - "--enable-cblas" - "--blas-int-size=${blasIntSize}" - ] ++ lib.optionals withOpenMP [ "--enable-threading=openmp" ] - ++ [ withArchitecture ]; - - postPatch = '' - patchShebangs configure build/flatten-headers.py - ''; - - postInstall = '' - ls $out/lib - ln -s $out/lib/libblis${threadingSuffix}.so $out/lib/libblas.so.3 - ln -s $out/lib/libblis${threadingSuffix}.so $out/lib/libcblas.so.3 - ln -s $out/lib/libblas.so.3 $out/lib/libblas.so - ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so - ''; - - meta = with lib; { - description = "BLAS-compatible library optimized for AMD CPUs"; - homepage = "https://developer.amd.com/amd-aocl/blas-library/"; - license = licenses.bsd3; - maintainers = [ maintainers.markuskowa ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/libraries/science/math/amd-libflame/default.nix b/pkgs/development/libraries/science/math/amd-libflame/default.nix deleted file mode 100644 index 0ca1c4950541..000000000000 --- a/pkgs/development/libraries/science/math/amd-libflame/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gfortran -, python3 -, amd-blis -, aocl-utils - -, withOpenMP ? true -, blas64 ? false -, withAMDOpt ? true -}: - -stdenv.mkDerivation rec { - pname = "amd-libflame"; - version = "4.2"; - - src = fetchFromGitHub { - owner = "amd"; - repo = "libflame"; - rev = version; - hash = "sha256-eiH2eq+nKUjlB1bZTZNRW1+efCHZ68UOSFy0NpcY1FI="; - }; - - postPatch = '' - patchShebangs build - - # Enforce reproducible build compiler flags - substituteInPlace CMakeLists.txt --replace '-mtune=native' "" - ''; - - passthru = { inherit blas64; }; - - nativeBuildInputs = [ cmake gfortran python3 ]; - - buildInputs = [ amd-blis aocl-utils ]; - - cmakeFlags = [ - "-DLIBAOCLUTILS_LIBRARY_PATH=${lib.getLib aocl-utils}/lib/libaoclutils${stdenv.hostPlatform.extensions.sharedLibrary}" - "-DLIBAOCLUTILS_INCLUDE_PATH=${lib.getDev aocl-utils}/include" - "-DENABLE_BUILTIN_LAPACK2FLAME=ON" - "-DENABLE_CBLAS_INTERFACES=ON" - "-DENABLE_EXT_LAPACK_INTERFACE=ON" - ] - ++ lib.optional (!withOpenMP) "-DENABLE_MULTITHREADING=OFF" - ++ lib.optional blas64 "-DENABLE_ILP64=ON" - ++ lib.optional withAMDOpt "-DENABLE_AMD_OPT=ON"; - - postInstall = '' - ln -s $out/lib/libflame.so $out/lib/liblapack.so.3 - ln -s $out/lib/libflame.so $out/lib/liblapacke.so.3 - ''; - - meta = with lib; { - description = "LAPACK-compatible linear algebra library optimized for AMD CPUs"; - homepage = "https://developer.amd.com/amd-aocl/blas-library/"; - license = licenses.bsd3; - maintainers = [ maintainers.markuskowa ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix deleted file mode 100644 index 744d565eddcd..000000000000 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake -, gfortran, blas, lapack, eigen -, useMpi ? false -, mpi -, openssh -, igraph -}: - -# MPI version can only be built with LP64 interface. -# See https://github.com/opencollab/arpack-ng#readme -assert useMpi -> !blas.isILP64; - -stdenv.mkDerivation rec { - pname = "arpack"; - version = "3.9.1"; - - src = fetchFromGitHub { - owner = "opencollab"; - repo = "arpack-ng"; - rev = version; - sha256 = "sha256-HCvapLba8oLqx9I5+KDAU0s/dTmdWOEilS75i4gyfC0="; - }; - - nativeBuildInputs = [ cmake gfortran ]; - buildInputs = assert (blas.isILP64 == lapack.isILP64); [ - blas - lapack - eigen - ] ++ lib.optional useMpi mpi; - - nativeCheckInputs = lib.optional useMpi openssh; - - doCheck = true; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DINTERFACE64=${if blas.isILP64 then "1" else "0"}" - "-DMPI=${if useMpi then "ON" else "OFF"}" - ]; - - preCheck = '' - # Prevent tests from using all cores - export OMP_NUM_THREADS=2 - ''; - - postFixup = lib.optionalString stdenv.isDarwin '' - install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libarpack.dylib - ''; - - passthru = { - inherit (blas) isILP64; - tests = { - inherit igraph; - }; - }; - - meta = { - homepage = "https://github.com/opencollab/arpack-ng"; - changelog = "https://github.com/opencollab/arpack-ng/blob/${src.rev}/CHANGES"; - description = '' - A collection of Fortran77 subroutines to solve large scale eigenvalue - problems. - ''; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ ttuegel dotlambda ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix deleted file mode 100644 index 4431ab63c7b7..000000000000 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, gfortran -# Whether to build with ILP64 interface -, blas64 ? false -}: - -stdenv.mkDerivation rec { - pname = "blas"; - version = "3.12.0"; - - src = fetchurl { - url = "http://www.netlib.org/blas/${pname}-${version}.tgz"; - sha256 = "sha256-zMQbXQiOUNsAMDF66bDJrzdXEME5KsrR/iCWAtpaWq0="; - }; - - passthru = { inherit blas64; }; - - nativeBuildInputs = [ cmake gfortran ]; - - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ] - ++ lib.optional blas64 "-DBUILD_INDEX64=ON"; - - postInstall = let - canonicalExtension = if stdenv.hostPlatform.isLinux - then "${stdenv.hostPlatform.extensions.sharedLibrary}.${lib.versions.major version}" - else stdenv.hostPlatform.extensions.sharedLibrary; - in lib.optionalString blas64 '' - ln -s $out/lib/libblas64${canonicalExtension} $out/lib/libblas${canonicalExtension} - ''; - - preFixup = lib.optionalString stdenv.isDarwin '' - for fn in $(find $out/lib -name "*.so*"); do - if [ -L "$fn" ]; then continue; fi - install_name_tool -id "$fn" "$fn" - done - ''; - - meta = with lib; { - description = "Basic Linear Algebra Subprograms"; - license = licenses.publicDomain; - maintainers = [ maintainers.markuskowa ]; - homepage = "http://www.netlib.org/blas/"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/science/math/blis/default.nix b/pkgs/development/libraries/science/math/blis/default.nix deleted file mode 100644 index b31de4b84a70..000000000000 --- a/pkgs/development/libraries/science/math/blis/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, perl -, python3 - -# Enable BLAS interface with 64-bit integer width. -, blas64 ? false - -# Target architecture. x86_64 builds Intel and AMD kernels. -, withArchitecture ? "x86_64" - -# Enable OpenMP-based threading. -, withOpenMP ? true -}: - -let - blasIntSize = if blas64 then "64" else "32"; -in stdenv.mkDerivation rec { - pname = "blis"; - version = "1.0"; - - src = fetchFromGitHub { - owner = "flame"; - repo = "blis"; - rev = version; - sha256 = "sha256-lAo6C34QQvXr3LmcsnTp4+Imi/lKxzcWu3EJkVgLvDI="; - }; - - inherit blas64; - - nativeBuildInputs = [ - perl - python3 - ]; - - doCheck = true; - - enableParallelBuilding = true; - - configureFlags = [ - "--enable-cblas" - "--blas-int-size=${blasIntSize}" - ] ++ lib.optionals withOpenMP [ "--enable-threading=openmp" ] - ++ [ withArchitecture ]; - - postPatch = '' - patchShebangs configure build/flatten-headers.py - ''; - - postInstall = '' - ln -s $out/lib/libblis.so.4 $out/lib/libblas.so.3 - ln -s $out/lib/libblis.so.4 $out/lib/libcblas.so.3 - ln -s $out/lib/libblas.so.3 $out/lib/libblas.so - ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so - ''; - - meta = with lib; { - description = "BLAS-compatible linear algebra library"; - homepage = "https://github.com/flame/blis"; - license = licenses.bsd3; - maintainers = with maintainers; [ stephen-huan ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/libraries/science/math/bonmin/default.nix b/pkgs/development/libraries/science/math/bonmin/default.nix deleted file mode 100644 index a389c602b1b6..000000000000 --- a/pkgs/development/libraries/science/math/bonmin/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fontconfig -, gfortran -, pkg-config -, blas -, bzip2 -, cbc -, clp -, doxygen -, graphviz -, ipopt -, lapack -, libamplsolver -, osi -, texliveSmall -, zlib -}: - -assert (!blas.isILP64) && (!lapack.isILP64); - -stdenv.mkDerivation rec { - pname = "bonmin"; - version = "1.8.9"; - - src = fetchFromGitHub { - owner = "coin-or"; - repo = "Bonmin"; - rev = "releases/${version}"; - sha256 = "sha256-nqjAQ1NdNJ/T4p8YljEWRt/uy2aDwyBeAsag0TmRc5Q="; - }; - - __structuredAttrs = true; - - nativeBuildInputs = [ - doxygen - gfortran - graphviz - pkg-config - texliveSmall - ]; - buildInputs = [ - blas - bzip2 - cbc - clp - ipopt - lapack - libamplsolver - osi - zlib - ]; - - configureFlags = lib.optionals stdenv.isDarwin [ - "--with-asl-lib=-lipoptamplinterface -lamplsolver" - ]; - - # Fix doc install. Should not be necessary after next release - # ref https://github.com/coin-or/Bonmin/commit/4f665bc9e489a73cb867472be9aea518976ecd28 - sourceRoot = "${src.name}/Bonmin"; - - # Fontconfig error: Cannot load default config file: No such file: (null) - env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; - - # Fontconfig error: No writable cache directories - preBuild = "export XDG_CACHE_HOME=$(mktemp -d)"; - - doCheck = true; - checkTarget = "test"; - - # ignore one failing test - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace test/Makefile.in --replace-fail \ - "./unitTest\''$(EXEEXT)" \ - "" - ''; - - # install documentation - postInstall = "make install-doxygen-docs"; - - meta = { - description = "Open-source code for solving general MINLP (Mixed Integer NonLinear Programming) problems"; - mainProgram = "bonmin"; - homepage = "https://github.com/coin-or/Bonmin"; - license = lib.licenses.epl10; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ aanderse ]; - }; -} diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix deleted file mode 100644 index 6ec28ba1c226..000000000000 --- a/pkgs/development/libraries/science/math/brial/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config -, boost -, m4ri -, gd -}: - -stdenv.mkDerivation rec { - version = "1.2.12"; - pname = "brial"; - - src = fetchFromGitHub { - owner = "BRiAl"; - repo = "BRiAl"; - rev = version; - sha256 = "sha256-y6nlqRBJRWohGDAKe/F37qBP1SgtFHR1HD+erFJReOM="; - }; - - # FIXME package boost-test and enable checks - doCheck = false; - - configureFlags = [ - "--with-boost-unit-test-framework=no" - ]; - - buildInputs = [ - boost - m4ri - gd - ]; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - meta = with lib; { - homepage = "https://github.com/BRiAl/BRiAl"; - description = "Legacy version of PolyBoRi maintained by sagemath developers"; - license = licenses.gpl2Plus; - maintainers = teams.sage.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/pkgs/development/libraries/science/math/cholmod-extra/default.nix deleted file mode 100644 index 88053a41af69..000000000000 --- a/pkgs/development/libraries/science/math/cholmod-extra/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gfortran, suitesparse, blas, lapack }: -stdenv.mkDerivation rec { - pname = "cholmod-extra"; - version = "1.2.0"; - - src = fetchFromGitHub { - repo = pname; - owner = "jluttine"; - rev = version; - sha256 = "0hz1lfp0zaarvl0dv0zgp337hyd8np41kmdpz5rr3fc6yzw7vmkg"; - }; - - nativeBuildInputs = [ gfortran ]; - buildInputs = [ suitesparse blas lapack ]; - - makeFlags = [ - "BLAS=-lcblas" - ]; - - installFlags = [ - "INSTALL_LIB=$(out)/lib" - "INSTALL_INCLUDE=$(out)/include" - ]; - - doCheck = true; - - meta = with lib; { - homepage = "https://github.com/jluttine/cholmod-extra"; - description = "Set of additional routines for SuiteSparse CHOLMOD Module"; - license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ jluttine ]; - platforms = with platforms; unix; - }; - -} diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index 910c40a4e0c0..17dddf901819 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -46,15 +46,15 @@ stdenv.mkDerivation rec { buildInputs = [ blas boost - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ ocl-icd opencl-headers - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreGraphics CoreVideo ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ OpenCL ]; diff --git a/pkgs/development/libraries/science/math/clblast/default.nix b/pkgs/development/libraries/science/math/clblast/default.nix deleted file mode 100644 index 3bf38086ca2f..000000000000 --- a/pkgs/development/libraries/science/math/clblast/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, ninja -, opencl-headers -, ocl-icd -}: - -stdenv.mkDerivation rec { - pname = "clblast"; - version = "1.6.3"; - - src = fetchFromGitHub { - owner = "CNugteren"; - repo = "CLBlast"; - rev = version; - hash = "sha256-fzenYFCAQ0B2NQgh5OaErv/yNEzjznB6ogRapqfL6P4="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - opencl-headers - ocl-icd - ]; - - cmakeFlags = [ - # https://github.com/NixOS/nixpkgs/issues/144170 - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" - ]; - - meta = with lib; { - description = "Tuned OpenCL BLAS library"; - homepage = "https://github.com/CNugteren/CLBlast"; - license = licenses.asl20; - maintainers = with maintainers; [ Tungsten842 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix deleted file mode 100644 index 55a1b9dcb4c9..000000000000 --- a/pkgs/development/libraries/science/math/cliquer/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, autoreconfHook -}: - -stdenv.mkDerivation rec { - version = "1.22"; - pname = "cliquer"; - - # autotoolized version of the original cliquer - src = fetchFromGitHub { - owner = "dimpase"; - repo = "autocliquer"; - rev = "v${version}"; - sha256 = "00gcmrhi2fjn8b246w5a3b0pl7p6haxy5wjvd9kcqib1xanz59z4"; - }; - - doCheck = true; - - nativeBuildInputs = [ - autoreconfHook - ]; - - meta = with lib; { - description = "Routines for clique searching"; - longDescription = '' - Cliquer is a set of C routines for finding cliques in an arbitrary weighted graph. - It uses an exact branch-and-bound algorithm developed by Patric Östergård. - It is designed with the aim of being efficient while still being flexible and - easy to use. - ''; - homepage = "https://users.aalto.fi/~pat/cliquer.html"; - downloadPage = src.meta.homepage; # autocliquer - license = licenses.gpl2Plus; - maintainers = teams.sage.members; - mainProgram = "cl"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/science/math/clmagma/default.nix b/pkgs/development/libraries/science/math/clmagma/default.nix deleted file mode 100644 index c5efbb757df8..000000000000 --- a/pkgs/development/libraries/science/math/clmagma/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib, stdenv, fetchurl, gfortran, opencl-headers, clblas, ocl-icd, mkl, intel-ocl }: - -let - incfile = builtins.toFile "make.inc.custom" '' - CC = g++ - FORT = gfortran - - ARCH = ar - ARCHFLAGS = cr - RANLIB = ranlib - - OPTS = -fPIC -O3 -DADD_ -Wall - FOPTS = -fPIC -O3 -DADD_ -Wall -x f95-cpp-input - F77OPTS = -fPIC -O3 -DADD_ -Wall - LDOPTS = -fPIC - - -include make.check-mkl - -include make.check-clblas - - # Gnu mkl is not available I guess? - #LIB = -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lpthread -lm -fopenmp - LIB = -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lm -fopenmp - LIB += -lclBLAS -lOpenCL - - LIBDIR = -L$(MKLROOT)/lib/intel64 \ - -L$(MKLROOT)/../compiler/lib/intel64 \ - -L$(clBLAS)/lib64 - - INC = -I$(clBLAS)/include - #-I$(AMDAPP)/include - ''; -in stdenv.mkDerivation rec { - pname = "clmagma"; - version = "1.3.0"; - src = fetchurl { - url = "https://icl.cs.utk.edu/projectsfiles/magma/cl/clmagma-${version}.tar.gz"; - sha256 = "1n27ny0xhwirw2ydn46pfcwy53gzia9zbam4irx44fd4d7f9ydv7"; - name = "clmagma-${version}.tar.gz"; - }; - - buildInputs = [ - gfortran - clblas - opencl-headers - ocl-icd - mkl - intel-ocl - ]; - - enableParallelBuilding=true; - - MKLROOT = "${mkl}"; - clBLAS = "${clblas}"; - - # Otherwise build looks for it in /run/opengl-driver/etc/OpenCL/vendors, - # which is not available. - OPENCL_VENDOR_PATH="${intel-ocl}/etc/OpenCL/vendors"; - - preBuild = '' - # By default it tries to use GPU, and thus fails for CPUs - sed -i "s/CL_DEVICE_TYPE_GPU/CL_DEVICE_TYPE_DEFAULT/" interface_opencl/clmagma_runtime.cpp - sed -i "s%/usr/local/clmagma%/$out%" Makefile.internal - cp ${incfile} make.inc - ''; - - meta = with lib; { - description = "Matrix Algebra on GPU and Multicore Architectures, OpenCL port"; - license = licenses.bsd3; - homepage = "https://icl.cs.utk.edu/magma/index.html"; - platforms = platforms.linux; - maintainers = with maintainers; [ volhovm ]; - }; -} diff --git a/pkgs/development/libraries/science/math/coin-utils/default.nix b/pkgs/development/libraries/science/math/coin-utils/default.nix deleted file mode 100644 index 60b9de0ab33a..000000000000 --- a/pkgs/development/libraries/science/math/coin-utils/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: - -stdenv.mkDerivation rec { - version = "2.11.10"; - pname = "coinutils"; - - src = fetchFromGitHub { - owner = "coin-or"; - repo = "CoinUtils"; - rev = "releases/${version}"; - hash = "sha256-Rbm45HRbRKQ6Cdup+gvKJ1xkK1HKG3irR5AIjhLer7g="; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/coin-or/CoinUtils/commit/1700ed92c2bc1562aabe65dee3b4885bd5c87fb9.patch"; - stripLen = 1; - extraPrefix = "CoinUtils/"; - hash = "sha256-8S6XteZvoJlL+5MWiOrW7HXsdcnzpuEFTyzX9qg7OUY="; - }) - ]; - - doCheck = true; - - meta = with lib; { - license = licenses.epl20; - homepage = "https://github.com/coin-or/CoinUtils"; - description = "Collection of classes and helper functions that are generally useful to multiple COIN-OR projects"; - maintainers = with maintainers; [ tmarkus ]; - }; -} diff --git a/pkgs/development/libraries/science/math/dbcsr/default.nix b/pkgs/development/libraries/science/math/dbcsr/default.nix deleted file mode 100644 index 34f9c4db39cc..000000000000 --- a/pkgs/development/libraries/science/math/dbcsr/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, mpiCheckPhaseHook -, pkg-config -, fypp -, gfortran -, blas -, lapack -, python3 -, libxsmm -, mpi -, openssh -}: - -stdenv.mkDerivation rec { - pname = "dbcsr"; - version = "2.7.0"; - - src = fetchFromGitHub { - owner = "cp2k"; - repo = "dbcsr"; - rev = "v${version}"; - hash = "sha256-QEO7f27DLsCvKXgFJnneHs1kO+5V9xiURpbQuGg1P0M="; - }; - - postPatch = '' - patchShebangs . - - # Force build of shared library, otherwise just static. - substituteInPlace src/CMakeLists.txt \ - --replace 'add_library(dbcsr ''${DBCSR_SRCS})' 'add_library(dbcsr SHARED ''${DBCSR_SRCS})' \ - --replace 'add_library(dbcsr_c ''${DBCSR_C_SRCS})' 'add_library(dbcsr_c SHARED ''${DBCSR_C_SRCS})' - - # Avoid calling the fypp wrapper script with python again. The nix wrapper took care of that. - substituteInPlace cmake/fypp-sources.cmake \ - --replace 'COMMAND ''${Python_EXECUTABLE} ''${FYPP_EXECUTABLE}' 'COMMAND ''${FYPP_EXECUTABLE}' - ''; - - nativeBuildInputs = [ - gfortran - python3 - cmake - pkg-config - fypp - ]; - - buildInputs = [ blas lapack libxsmm ]; - - propagatedBuildInputs = [ mpi ]; - - cmakeFlags = [ - "-DUSE_OPENMP=ON" - "-DUSE_SMM=libxsmm" - "-DWITH_C_API=ON" - "-DBUILD_TESTING=ON" - "-DTEST_OMP_THREADS=2" - "-DTEST_MPI_RANKS=2" - "-DENABLE_SHARED=ON" - "-DUSE_MPI=ON" - ]; - - checkInputs = [ - openssh - mpiCheckPhaseHook - ]; - - doCheck = true; - - meta = with lib; { - description = "Distributed Block Compressed Sparse Row matrix library"; - license = licenses.gpl2Only; - homepage = "https://github.com/cp2k/dbcsr"; - maintainers = [ maintainers.sheepforce ]; - }; -} diff --git a/pkgs/development/libraries/science/math/ecos/default.nix b/pkgs/development/libraries/science/math/ecos/default.nix deleted file mode 100644 index 73874641e477..000000000000 --- a/pkgs/development/libraries/science/math/ecos/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "ecos"; - version = "2.0.7"; - - src = fetchFromGitHub { - owner = "embotech"; - repo = "ecos"; - rev = version; - sha256 = "1hsndim5kjvcwk5svqa4igawzahj982180xj1d7yd0dbjlgxc7w7"; - }; - - buildPhase = '' - make all shared - ''; - - doCheck = true; - checkPhase = '' - make test - ./runecos - ''; - - installPhase = '' - mkdir -p $out/lib - cp lib*.a lib*.so $out/lib - cp -r include $out/ - ''; - - meta = with lib; { - description = "Lightweight conic solver for second-order cone programming"; - homepage = "https://www.embotech.com/ECOS"; - downloadPage = "https://github.com/embotech/ecos/releases"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ bhipple ]; - }; -} diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 5804c7d627e9..750735ba6786 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -21,13 +21,11 @@ in # Choose the maximum available optimization level builtins.head optLevels, - faiss, # To run demos in the tests - runCommand, }@inputs: let pname = "faiss"; - version = "1.8.0"; + version = "1.9.0"; inherit (cudaPackages) flags backendStdenv; @@ -46,25 +44,20 @@ in stdenv.mkDerivation { inherit pname version; - outputs = [ - "out" - "demos" - ] ++ lib.optionals pythonSupport [ "dist" ]; + outputs = [ "out" ] ++ lib.optionals pythonSupport [ "dist" ]; src = fetchFromGitHub { owner = "facebookresearch"; - repo = pname; - rev = "v${version}"; - hash = "sha256-nS8nhkNGGb2oAJKfr/MIAZjAwMxBGbNd16/CkEtv67I="; + repo = "faiss"; + rev = "refs/tags/v${version}"; + hash = "sha256-P8TynU6jz5NbcWLdI7n4LX5Gdz0Ks72bmOzQ3LGjQCQ="; }; - # 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)' + postPatch = lib.optionalString pythonSupport '' + substituteInPlace faiss/python/loader.py \ + --replace-fail \ + "# platform-dependent legacy fallback using numpy.distutils.cpuinfo" \ + "return False" ''; nativeBuildInputs = @@ -77,7 +70,6 @@ stdenv.mkDerivation { pythonPackages.python pythonPackages.setuptools pythonPackages.pip - pythonPackages.wheel ]; buildInputs = @@ -99,13 +91,7 @@ stdenv.mkDerivation { (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" ]; + buildFlags = [ "faiss" ] ++ lib.optionals pythonSupport [ "swigfaiss" ]; # pip wheel->pip install commands copied over from opencv4 @@ -114,31 +100,13 @@ stdenv.mkDerivation { python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .) ''; - 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/" - ''; + postInstall = 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 - ''; - pythonFaiss = pythonPackages.faiss; - pytest = pythonPackages.faiss.tests.pytest; - }; }; meta = { @@ -148,7 +116,5 @@ stdenv.mkDerivation { license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ SomeoneSerge ]; - # error: use of undeclared identifier 'SWIGTYPE_p_long' - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix deleted file mode 100644 index a3c61816d25c..000000000000 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, blas -, lapack -, gfortran -, enableAMPL ? true, libamplsolver -, enableMUMPS ? true, mumps, mpi -, enableSPRAL ? true, spral -}: - -assert (!blas.isILP64) && (!lapack.isILP64); - -stdenv.mkDerivation rec { - pname = "ipopt"; - version = "3.14.16"; - - src = fetchFromGitHub { - owner = "coin-or"; - repo = "Ipopt"; - rev = "releases/${version}"; - sha256 = "sha256-ZuiZZMq7NzOm6CCJgMBgEWs8PEfM3pVr2yOWbS42l8U="; - }; - - CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; - - 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 ] - ++ lib.optionals enableMUMPS [ mumps mpi ] - ++ lib.optionals enableSPRAL [ spral ]; - - enableParallelBuilding = true; - - meta = { - description = "Software package for large-scale nonlinear optimization"; - homepage = "https://projects.coin-or.org/Ipopt"; - 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 deleted file mode 100644 index a1a1ed8a69bc..000000000000 --- a/pkgs/development/libraries/science/math/itpp/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, stdenv -, fetchurl -, cmake -, gtest -, blas -, fftw -, liblapack -, gfortran -}: - -stdenv.mkDerivation rec { - pname = "it++"; - version = "4.3.1"; - - src = fetchurl { - url = "mirror://sourceforge/itpp/itpp-${version}.tar.bz2"; - sha256 = "0xxqag9wi0lg78xgw7b40rp6wxqp5grqlbs9z0ifvdfzqlhpcwah"; - }; - - nativeBuildInputs = [ cmake gfortran ]; - buildInputs = [ - fftw - liblapack - - # NOTE: OpenBLAS doesn't work here because IT++ doesn't pass aligned - # buffers, which causes segfaults in the optimized kernels :-( - blas - ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++14" - "-DBLAS_FOUND:BOOL=TRUE" - "-DBLAS_LIBRARIES:STRING=${blas}/lib/libblas.so" - "-DLAPACK_FOUND:BOOL=TRUE" - "-DLAPACK_LIBRARIES:STRING=${liblapack}/lib/liblapack.so" - "-DGTEST_DIR:PATH=${gtest.src}/googletest" - ]; - - doCheck = true; - - checkPhase = '' - ./gtests/itpp_gtests - ''; - - meta = with lib; { - description = "IT++ is a C++ library of mathematical, signal processing and communication classes and functions"; - mainProgram = "itpp-config"; - homepage = "https://itpp.sourceforge.net/"; - license = licenses.gpl3; - platforms = platforms.unix; - 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/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix deleted file mode 100644 index 6ea1ca8f8e6c..000000000000 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv -, autoreconfHook -, gengetopt -, pkg-config -, fetchFromGitLab -, pari -}: - -stdenv.mkDerivation rec { - version = "2.0.5"; - pname = "lcalc"; - - src = fetchFromGitLab { - owner = "sagemath"; - repo = pname; - rev = version; - hash = "sha256-RxWZ7T0I9zV7jUVnL6jV/PxEoU32KY7Q1UsOL5Lonuc="; - }; - - nativeBuildInputs = [ - autoreconfHook - gengetopt - pkg-config - ]; - - buildInputs = [ - pari - ]; - - configureFlags = [ - "--with-pari" - ]; - - meta = with lib; { - homepage = "https://gitlab.com/sagemath/lcalc"; - description = "Program for calculating with L-functions"; - mainProgram = "lcalc"; - license = with licenses; [ gpl2 ]; - maintainers = teams.sage.members; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/science/math/libamplsolver/default.nix b/pkgs/development/libraries/science/math/libamplsolver/default.nix deleted file mode 100644 index f74808462ae1..000000000000 --- a/pkgs/development/libraries/science/math/libamplsolver/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, substitute, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libamplsolver"; - version = "20211109"; - - src = fetchurl { - url = "https://ampl.com/netlib/ampl/solvers.tgz"; - sha256 = "sha256-LVmScuIvxmZzywPSBl9T9YcUBJP7UFAa3eWs9r4q3JM="; - }; - - patches = [ - (substitute { - src = ./libamplsolver-sharedlib.patch; - substitutions = [ "--replace" "@sharedlibext@" "${stdenv.hostPlatform.extensions.sharedLibrary}" ]; - }) - ]; - - installPhase = '' - runHook preInstall - pushd sys.$(uname -m).$(uname -s) - install -D -m 0644 *.h -t $out/include - install -D -m 0644 *${stdenv.hostPlatform.extensions.sharedLibrary}* -t $out/lib - install -D -m 0644 *.a -t $out/lib - popd - '' + lib.optionalString stdenv.isDarwin '' - install_name_tool -id $out/lib/libamplsolver.dylib $out/lib/libamplsolver.dylib - '' + '' - runHook postInstall - ''; - - meta = with lib; { - description = "Library of routines that help solvers work with AMPL"; - homepage = "https://ampl.com/netlib/ampl/"; - license = [ licenses.mit ]; - platforms = platforms.unix; - maintainers = with maintainers; [ aanderse ]; - }; -} diff --git a/pkgs/development/libraries/science/math/libamplsolver/libamplsolver-sharedlib.patch b/pkgs/development/libraries/science/math/libamplsolver/libamplsolver-sharedlib.patch deleted file mode 100644 index f2af2910e89c..000000000000 --- a/pkgs/development/libraries/science/math/libamplsolver/libamplsolver-sharedlib.patch +++ /dev/null @@ -1,39 +0,0 @@ -Authors: Andrei Rozanski and Grace Dinh -Last-Update: 2022-08-23 -Description: fix makefile.u in order to get libamplsover.so (Linux) or libamplsolver.dylib (Mac) - ---- a/makefile.u -+++ b/makefile.u - -@@ -26,8 +26,9 @@ - - .SUFFIXES: .c .o - CC = cc --CFLAGS = -O -+CFLAGS := $(CFLAGS) -pipe -DASL_BUILD -fPIC -DPIC - SHELL=/bin/sh -+OFILES=$(addsuffix .o,$(basename $(a))) - - # Add -DNO_RUSAGE to the CFLAGS assignment if your system - # lacks getrusage(). This only matters for compiling xectim.c. -@@ -86,7 +87,7 @@ - .c.o: - $(CC) -c $(CFLAGS) $*.c - --all: arith.h stdio1.h amplsolver.a funcadd0.o -+all: arith.h stdio1.h amplsolver.a funcadd0.o libamplsolver@sharedlibext@ - - a = \ - asldate.c \ -@@ -189,6 +190,11 @@ - # search path, e.g. - # exec true - # or just comment out the ranlib invocation above. -+libamplsolver.so: $(OFILES) -+ $(CC) $^ -shared -Wl,-soname,libamplsolver.so.0 $(LDFLAGS) -o $@.0 -+ ln -s $@.0 $@ -+libamplsolver.dylib: amplsolver.a -+ $(CC) -fpic -shared -Wl,-all_load amplsolver.a $(LDFLAGS) -o libamplsolver.dylib - - Aslh = arith.h asl.h funcadd.h stdio1.h - auxinfo.o libnamsave.o: funcadd.h stdio1.h \ No newline at end of file diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/pkgs/development/libraries/science/math/libbraiding/default.nix deleted file mode 100644 index 2ee2e831f6e6..000000000000 --- a/pkgs/development/libraries/science/math/libbraiding/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, autoreconfHook -}: - -stdenv.mkDerivation rec { - version = "1.2"; - pname = "libbraiding"; - - src = fetchFromGitHub { - owner = "miguelmarco"; - repo = "libbraiding"; - rev = version; - sha256 = "sha256-cgg6rvlOvFqGjgbw6i7QXS+tqvfFd1MkPCEjnW/FyFs="; - }; - - nativeBuildInputs = [ - autoreconfHook - ]; - - # no tests included for now (2018-08-05), but can't hurt to activate - doCheck = true; - - meta = with lib; { - homepage = "https://github.com/miguelmarco/libbraiding/"; - description = "C++ library for computations on braid groups"; - longDescription = '' - A library to compute several properties of braids, including centralizer and conjugacy check. - ''; - license = licenses.gpl3; - maintainers = teams.sage.members; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/development/libraries/science/math/libhomfly/default.nix deleted file mode 100644 index d0f09290c3c7..000000000000 --- a/pkgs/development/libraries/science/math/libhomfly/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, autoreconfHook -, boehmgc -}: - -stdenv.mkDerivation rec { - version = "1.02r6"; - pname = "libhomfly"; - - src = fetchFromGitHub { - owner = "miguelmarco"; - repo = "libhomfly"; - rev = version; - sha256 = "sha256-s1Hgy6S9+uREKsgjOVQdQfnds6oSLo5UWTrt5DJnY2s="; - }; - - buildInputs = [ - boehmgc - ]; - - nativeBuildInputs = [ - autoreconfHook - ]; - - doCheck = true; - - meta = with lib; { - homepage = "https://github.com/miguelmarco/libhomfly/"; - description = "Library to compute the homfly polynomial of knots and links"; - license = licenses.unlicense; - maintainers = teams.sage.members; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix deleted file mode 100644 index 595ba2aa5713..000000000000 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, gfortran -, cmake -, shared ? true -# Compile with ILP64 interface -, blas64 ? false -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "liblapack"; - version = "3.12.0"; - - src = fetchFromGitHub { - owner = "Reference-LAPACK"; - repo = "lapack"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-xn9HL4YF8JPka1gwet5bGGo2k505H3RfWpxkUIYNecQ="; - }; - - nativeBuildInputs = [ gfortran cmake ]; - - # Configure stage fails on aarch64-darwin otherwise, due to either clang 11 or gfortran 10. - hardeningDisable = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "stackprotector" ]; - - cmakeFlags = [ - "-DCMAKE_Fortran_FLAGS=-fPIC" - "-DLAPACKE=ON" - "-DCBLAS=ON" - "-DBUILD_TESTING=ON" - ] ++ lib.optional shared "-DBUILD_SHARED_LIBS=ON" - ++ lib.optional blas64 "-DBUILD_INDEX64=ON" - # Tries to run host platform binaries during the build - # Will likely be disabled by default in 3.12, see: - # https://github.com/Reference-LAPACK/lapack/issues/757 - ++ lib.optional (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) "-DTEST_FORTRAN_COMPILER=OFF"; - - passthru = { inherit blas64; }; - - postInstall = let - canonicalExtension = if stdenv.hostPlatform.isLinux - then "${stdenv.hostPlatform.extensions.sharedLibrary}.${lib.versions.major finalAttrs.version}" - else stdenv.hostPlatform.extensions.sharedLibrary; - in lib.optionalString blas64 '' - ln -s $out/lib/liblapack64${canonicalExtension} $out/lib/liblapack${canonicalExtension} - ln -s $out/lib/liblapacke64${canonicalExtension} $out/lib/liblapacke${canonicalExtension} - ''; - - doCheck = true; - - # Some CBLAS related tests fail on Darwin: - # 14 - CBLAS-xscblat2 (Failed) - # 15 - CBLAS-xscblat3 (Failed) - # 17 - CBLAS-xdcblat2 (Failed) - # 18 - CBLAS-xdcblat3 (Failed) - # 20 - CBLAS-xccblat2 (Failed) - # 21 - CBLAS-xccblat3 (Failed) - # 23 - CBLAS-xzcblat2 (Failed) - # 24 - CBLAS-xzcblat3 (Failed) - # - # Upstream issue to track: - # * https://github.com/Reference-LAPACK/lapack/issues/440 - ctestArgs = lib.optionalString stdenv.isDarwin "-E '^(CBLAS-(x[sdcz]cblat[23]))$'"; - - checkPhase = '' - runHook preCheck - ctest ${finalAttrs.ctestArgs} - runHook postCheck - ''; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = with lib; { - description = "Linear Algebra PACKage"; - homepage = "http://www.netlib.org/lapack/"; - maintainers = with maintainers; [ markuskowa ]; - license = licenses.bsd3; - pkgConfigModules = [ "lapack" ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/development/libraries/science/math/liblbfgs/default.nix deleted file mode 100644 index 26a1932bd192..000000000000 --- a/pkgs/development/libraries/science/math/liblbfgs/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, stdenv, fetchurl }: -stdenv.mkDerivation rec { - pname = "liblbfgs"; - version = "1.10"; - - configureFlags = [ "--enable-sse2" ]; - src = fetchurl { - url = "https://github.com/downloads/chokkan/liblbfgs/liblbfgs-${version}.tar.gz"; - sha256 = "1kv8d289rbz38wrpswx5dkhr2yh4fg4h6sszkp3fawxm09sann21"; - }; - - meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); - description = "Library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)"; - homepage = "http://www.chokkan.org/software/liblbfgs/"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index 92050cd17283..8cbe481207e2 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -19,11 +19,11 @@ let # this derivation. However, we should ensure on version bumps # that the CUDA toolkit for `passthru.tests` is still # up-to-date. - version = "2.3.0"; + version = "2.5.0"; device = if cudaSupport then "cuda" else "cpu"; srcs = import ./binary-hashes.nix version; unavailable = throw "libtorch is not available for this platform"; - libcxx-for-libtorch = if stdenv.isDarwin then libcxx else stdenv.cc.cc.lib; + libcxx-for-libtorch = if stdenv.hostPlatform.isDarwin then libcxx else (lib.getLib stdenv.cc.cc); in stdenv.mkDerivation { inherit version; pname = "libtorch"; @@ -31,7 +31,7 @@ in stdenv.mkDerivation { src = fetchzip srcs."${stdenv.hostPlatform.system}-${device}" or unavailable; nativeBuildInputs = - if stdenv.isDarwin then [ fixDarwinDylibNames ] + if stdenv.hostPlatform.isDarwin then [ fixDarwinDylibNames ] else [ patchelf ] ++ lib.optionals cudaSupport [ addDriverRunpath ]; dontBuild = true; @@ -59,8 +59,8 @@ in stdenv.mkDerivation { ''; postFixup = let - rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ]; - in lib.optionalString stdenv.isLinux '' + rpath = lib.makeLibraryPath [ stdenv.cc.cc ]; + in lib.optionalString stdenv.hostPlatform.isLinux '' find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do echo "setting rpath for $lib..." patchelf --set-rpath "${rpath}:$out/lib" "$lib" @@ -68,7 +68,7 @@ in stdenv.mkDerivation { addDriverRunpath "$lib" ''} done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' for f in $out/lib/*.dylib; do otool -L $f done diff --git a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix index dd8104ad5f0d..4f6350d93116 100644 --- a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix +++ b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix @@ -1,19 +1,19 @@ version: builtins.getAttr version { - "2.3.0" = { - aarch64-darwin-cpu = { - name = "libtorch-macos-arm64-2.3.0.zip"; - url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-arm64-2.3.0.zip"; - hash = "sha256-l4qY1jbsECN5qm7dWJ2jSvKuQwQ/HI6G6Vq1Kh2rxkM="; + "2.5.0" = { + aarch64-darwin-cpu = { + name = "libtorch-macos-arm64-2.5.0.zip"; + url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-arm64-2.5.0.zip"; + hash = "sha256-4d9YKUuvAESBeG/WCUsQfEHwdB2z34grnlwWslj4970="; }; x86_64-linux-cpu = { - name = "libtorch-cxx11-abi-shared-with-deps-2.3.0-cpu.zip"; - url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.3.0%2Bcpu.zip"; - hash = "sha256-dKAk6UusK2eQIcP0oMXh9cnufMpy5Ph4SGPkIPPV6ds="; + name = "libtorch-cxx11-abi-shared-with-deps-2.5.0-cpu.zip"; + url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.5.0%2Bcpu.zip"; + hash = "sha256-gUzPhc4Z8rTPhIm89pPoLP0Ww17ono+/xgMW46E/Tro="; }; x86_64-linux-cuda = { - name = "libtorch-cxx11-abi-shared-with-deps-2.3.0-cu121.zip"; - url = "https://download.pytorch.org/libtorch/cu121/libtorch-cxx11-abi-shared-with-deps-2.3.0%2Bcu121.zip"; - hash = "sha256-6B+NF6q78I2WKFudn8bK+eNYDi1zQ7mdgv06fZbm2rE="; + name = "libtorch-cxx11-abi-shared-with-deps-2.5.0-cu124.zip"; + url = "https://download.pytorch.org/libtorch/cu124/libtorch-cxx11-abi-shared-with-deps-2.5.0%2Bcu124.zip"; + hash = "sha256-UaX47GAwyZ6UmzgY85TeAHmy3u52pBHhiyM5NAz7ens="; }; }; } diff --git a/pkgs/development/libraries/science/math/libtorch/prefetch.sh b/pkgs/development/libraries/science/math/libtorch/prefetch.sh index 2682fe677976..d8680d3a60cf 100755 --- a/pkgs/development/libraries/science/math/libtorch/prefetch.sh +++ b/pkgs/development/libraries/science/math/libtorch/prefetch.sh @@ -6,11 +6,10 @@ set -eou pipefail version=$1 bucket="https://download.pytorch.org/libtorch" -CUDA_VERSION=cu121 +CUDA_VERSION=cu124 url_and_key_list=( "aarch64-darwin-cpu $bucket/cpu/libtorch-macos-arm64-${version}.zip libtorch-macos-arm64-${version}.zip" - "x86_64-darwin-cpu $bucket/cpu/libtorch-macos-x86_64-${version}.zip libtorch-macos-x86_64-${version}.zip" "x86_64-linux-cpu $bucket/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip libtorch-cxx11-abi-shared-with-deps-${version}-cpu.zip" "x86_64-linux-cuda $bucket/${CUDA_VERSION}/libtorch-cxx11-abi-shared-with-deps-${version}%2B${CUDA_VERSION}.zip libtorch-cxx11-abi-shared-with-deps-${version}-${CUDA_VERSION}.zip" ) diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/pkgs/development/libraries/science/math/lrs/default.nix deleted file mode 100644 index 6fa8567355a9..000000000000 --- a/pkgs/development/libraries/science/math/lrs/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, gmp }: - -stdenv.mkDerivation { - pname = "lrs"; - version = "7.2"; - - src = fetchurl { - url = "http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-072.tar.gz"; - sha256 = "1w1jsnfgny8cihndr5gfm99pvwp48qsvxkqfsi2q87gd3m57aj7w"; - }; - - buildInputs = [ gmp ]; - - makeFlags = [ - "prefix=${placeholder "out"}" - "CC:=$(CC)" - ]; - - meta = { - description = "Implementation of the reverse search algorithm for vertex enumeration/convex hull problems"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.raskin ]; - platforms = lib.platforms.linux; - homepage = "http://cgm.cs.mcgill.ca/~avis/C/lrs.html"; - }; -} diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix deleted file mode 100644 index 26e26e4ffdbc..000000000000 --- a/pkgs/development/libraries/science/math/m4ri/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv -, fetchFromBitbucket -, autoreconfHook -}: - -stdenv.mkDerivation rec { - version = "20200125"; - pname = "m4ri"; - - src = fetchFromBitbucket { - owner = "malb"; - repo = "m4ri"; - rev = "release-${version}"; - sha256 = "1dxgbv6zdyki3h61qlv7003wzhy6x14zmcaz9x19md1i7ng07w1k"; - }; - - doCheck = true; - - nativeBuildInputs = [ - autoreconfHook - ]; - - meta = with lib; { - homepage = "https://malb.bitbucket.io/m4ri/"; - description = "Library to do fast arithmetic with dense matrices over F_2"; - license = licenses.gpl2Plus; - maintainers = teams.sage.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix deleted file mode 100644 index ac513297f159..000000000000 --- a/pkgs/development/libraries/science/math/m4rie/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv -, fetchFromBitbucket -, autoreconfHook -, m4ri -}: - -stdenv.mkDerivation rec { - version = "20200125"; - pname = "m4rie"; - - src = fetchFromBitbucket { - owner = "malb"; - repo = "m4rie"; - rev = "release-${version}"; - sha256 = "sha256-bjAcxfXsC6+jPYC472CN78jm4UljJQlkWyvsqckCDh0="; - }; - - doCheck = true; - - buildInputs = [ - m4ri - ]; - - # does not compile correctly with -O2 on LLVM clang; see - # https://bitbucket.org/malb/m4rie/issues/23/trying-to-compile-on-apple-m1 - makeFlags = [] ++ lib.optionals stdenv.isDarwin [ "CFLAGS=-O0" ]; - nativeBuildInputs = [ - autoreconfHook - ]; - - meta = with lib; { - homepage = "https://malb.bitbucket.io/m4rie/"; - description = "Library for matrix multiplication, reduction and inversion over GF(2^k) for 2 <= k <= 10"; - longDescription = '' - M4RIE is a library for fast arithmetic with dense matrices over small finite fields of even characteristic. - It uses the M4RI library, implementing the same operations over the finite field F2. - ''; - license = licenses.gpl2Plus; - maintainers = teams.sage.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/pkgs/development/libraries/science/math/metis/default.nix deleted file mode 100644 index cd221e86b148..000000000000 --- a/pkgs/development/libraries/science/math/metis/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, cmake }: - -stdenv.mkDerivation rec { - pname = "metis"; - version = "5.1.0"; - - src = fetchurl { - url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-${version}.tar.gz"; - sha256 = "1cjxgh41r8k6j029yxs8msp3z6lcnpm16g5pvckk35kc7zhfpykn"; - }; - - cmakeFlags = [ - "-DGKLIB_PATH=../GKlib" - # remove once updated past https://github.com/KarypisLab/METIS/commit/521a2c360dc21ace5c4feb6dc0b7992433e3cb0f - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ]; - nativeBuildInputs = [ unzip cmake ]; - - meta = { - description = "Serial graph partitioning and fill-reducing matrix ordering"; - homepage = "http://glaros.dtc.umn.edu/gkhome/metis/metis/overview"; - license = lib.licenses.asl20; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix deleted file mode 100644 index 607b6c89e40d..000000000000 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ /dev/null @@ -1,184 +0,0 @@ -{ lib -, stdenv -, callPackage -, stdenvNoCC -, fetchurl -, rpmextract -, _7zz -, cctools -, validatePkgConfig -, enableStatic ? stdenv.hostPlatform.isStatic -}: - -/* - For details on using mkl as a blas provider for python packages such as numpy, - numexpr, scipy, etc., see the Python section of the NixPkgs manual. -*/ -let - # Release notes and download URLs are here: - # https://registrationcenter.intel.com/en/products/ - version = "${mklVersion}.${rel}"; - - mklVersion = "2023.1.0"; - rel = if stdenvNoCC.isDarwin then "43558" else "46342"; - - # Intel openmp uses its own versioning. - openmpVersion = "2023.1.0"; - openmpRel = "46305"; - - # Thread Building Blocks release. - tbbVersion = "2021.9.0"; - tbbRel = "43484"; - - shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary; - - oneapi-mkl = fetchurl { - url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm"; - hash = "sha256-PGLPNnR+11AmmaNxldeze/l2Kw/4+mfjB+RqsPhP6oM="; - }; - - oneapi-mkl-common = fetchurl { - url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-${mklVersion}-${mklVersion}-${rel}.noarch.rpm"; - hash = "sha256-wztTE2R/IdG6ujGf7KFocpRmXzlZSnEKopTBOlPPlBw="; - }; - - oneapi-mkl-common-devel = fetchurl { - url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-devel-${mklVersion}-${mklVersion}-${rel}.noarch.rpm"; - hash = "sha256-MWa8mpyFM4zgDLup+EzFRM+N2Oxf0o6FBBRM8mAanbI="; - }; - - oneapi-mkl-devel = fetchurl { - url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-devel-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm"; - hash = "sha256-Arq5kXktI92031XqfV0pkzQCHaFsTRKX05iOA/fPNOs="; - }; - - oneapi-openmp = fetchurl { - url = "https://yum.repos.intel.com/oneapi/intel-oneapi-openmp-${mklVersion}-${mklVersion}-${openmpRel}.x86_64.rpm"; - hash = "sha256-cyBD3P4AEvyreP4pP3BE+yyDB+ptblOQ9GYI8ysGsIM="; - }; - - oneapi-tbb = fetchurl { - url = "https://yum.repos.intel.com/oneapi/intel-oneapi-tbb-${tbbVersion}-${tbbVersion}-${tbbRel}.x86_64.rpm"; - hash = "sha256-pzJpQdiYVpcKDShePak2I0uEh7u08vJgX7OBF5p5yAM="; - }; - -in stdenvNoCC.mkDerivation ({ - pname = "mkl"; - inherit version; - - dontUnpack = stdenvNoCC.isLinux; - - sourceRoot = if stdenvNoCC.isDarwin then "." else null; - - nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin - then - [ _7zz cctools ] - else - [ rpmextract ]); - - buildPhase = if stdenvNoCC.isDarwin then '' - for f in bootstrapper.app/Contents/Resources/packages/*/cupPayload.cup; do - tar -xf $f - done - mkdir -p opt/intel - mv _installdir opt/intel/oneapi - '' else '' - rpmextract ${oneapi-mkl} - rpmextract ${oneapi-mkl-common} - rpmextract ${oneapi-mkl-common-devel} - rpmextract ${oneapi-mkl-devel} - rpmextract ${oneapi-openmp} - rpmextract ${oneapi-tbb} - ''; - - installPhase = '' - for f in $(find . -name 'mkl*.pc') ; do - bn=$(basename $f) - substituteInPlace $f \ - --replace $\{MKLROOT} "$out" \ - --replace "lib/intel64" "lib" - - sed -r -i "s|^prefix=.*|prefix=$out|g" $f - done - - for f in $(find opt/intel -name 'mkl*iomp.pc') ; do - substituteInPlace $f --replace "../compiler/lib" "lib" - done - - # License - install -Dm0655 -t $out/share/doc/mkl opt/intel/oneapi/mkl/${mklVersion}/licensing/license.txt - - # Dynamic libraries - mkdir -p $out/lib - cp -a opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.isLinux "intel64"}/*${shlibExt}* $out/lib - cp -a opt/intel/oneapi/compiler/${mklVersion}/${if stdenvNoCC.isDarwin then "mac" else "linux"}/compiler/lib/${lib.optionalString stdenvNoCC.isLinux "intel64_lin"}/*${shlibExt}* $out/lib - cp -a opt/intel/oneapi/tbb/${tbbVersion}/lib/${lib.optionalString stdenvNoCC.isLinux "intel64/gcc4.8"}/*${shlibExt}* $out/lib - - # Headers - cp -r opt/intel/oneapi/mkl/${mklVersion}/include $out/ - - # CMake config - cp -r opt/intel/oneapi/mkl/${mklVersion}/lib/cmake $out/lib - '' + - (if enableStatic then '' - install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.isLinux "intel64"}/*.a - install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/lib/pkgconfig/*.pc - '' else '' - cp opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.isLinux "intel64"}/*${shlibExt}* $out/lib - install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/lib/pkgconfig/*dynamic*.pc - '') + '' - # Setup symlinks for blas / lapack - ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt} - ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt} - ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt} - ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt} - '' + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' - ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}".3" - ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}".3" - ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}".3" - ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt}".3" - ''; - - # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the - # larger updated load commands do not fit. Use install_name_tool - # explicitly and ignore the error. - postFixup = lib.optionalString stdenvNoCC.isDarwin '' - for f in $out/lib/*.dylib; do - install_name_tool -id $out/lib/$(basename $f) $f || true - done - install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libmkl_intel_thread.dylib - install_name_tool -change @rpath/libtbb.12.dylib $out/lib/libtbb.12.dylib $out/lib/libmkl_tbb_thread.dylib - install_name_tool -change @rpath/libtbbmalloc.2.dylib $out/lib/libtbbmalloc.2.dylib $out/lib/libtbbmalloc_proxy.dylib - ''; - - # Per license agreement, do not modify the binary - dontStrip = true; - dontPatchELF = true; - - passthru.tests = { - pkg-config-dynamic-iomp = callPackage ./test { enableStatic = false; execution = "iomp"; }; - pkg-config-static-iomp = callPackage ./test { enableStatic = true; execution = "iomp"; }; - pkg-config-dynamic-seq = callPackage ./test { enableStatic = false; execution = "seq"; }; - pkg-config-static-seq = callPackage ./test { enableStatic = true; execution = "seq"; }; - }; - - meta = with lib; { - description = "Intel OneAPI Math Kernel Library"; - longDescription = '' - Intel OneAPI Math Kernel Library (Intel oneMKL) optimizes code with minimal - effort for future generations of Intel processors. It is compatible with your - choice of compilers, languages, operating systems, and linking and - threading models. - ''; - homepage = "https://software.intel.com/en-us/mkl"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.issl; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ bhipple ]; - }; -} // lib.optionalAttrs stdenvNoCC.isDarwin { - src = fetchurl { - url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/087a9190-9d96-4b8c-bd2f-79159572ed89/m_onemkl_p_${mklVersion}.${rel}_offline.dmg"; - hash = "sha256-bUaaJPSaLr60fw0DzDCjPvY/UucHlLbCSLyQxyiAi04="; - }; -}) diff --git a/pkgs/development/libraries/science/math/mkl/test/default.nix b/pkgs/development/libraries/science/math/mkl/test/default.nix deleted file mode 100644 index 1717e11e43d8..000000000000 --- a/pkgs/development/libraries/science/math/mkl/test/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv -, pkg-config -, mkl - -, enableStatic ? false -, execution ? "seq" -}: - -let - linkType = if enableStatic then "static" else "dynamic"; -in stdenv.mkDerivation { - pname = "mkl-test"; - version = mkl.version; - - unpackPhase = '' - cp ${./test.c} test.c - ''; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ (mkl.override { inherit enableStatic; }) ]; - - doCheck = true; - - buildPhase = '' - # Check regular Nix build. - gcc test.c -o test $(pkg-config --cflags --libs mkl-${linkType}-ilp64-${execution}) - - # Clear flags to ensure that we are purely relying on options - # provided by pkg-config. - NIX_CFLAGS_COMPILE="" \ - NIX_LDFLAGS="" \ - gcc test.c -o test $(pkg-config --cflags --libs mkl-${linkType}-ilp64-${execution}) - ''; - - installPhase = '' - touch $out - ''; - - checkPhase = '' - ./test - ''; -} diff --git a/pkgs/development/libraries/science/math/mkl/test/test.c b/pkgs/development/libraries/science/math/mkl/test/test.c deleted file mode 100644 index 9413ac0c68e9..000000000000 --- a/pkgs/development/libraries/science/math/mkl/test/test.c +++ /dev/null @@ -1,12 +0,0 @@ -#include <assert.h> - -#include <mkl_cblas.h> - -int main() { - float u[] = {1., 2., 3.}; - float v[] = {4., 5., 6.}; - - float dp = cblas_sdot(3, u, 1, v, 1); - - assert(dp == 32.); -} diff --git a/pkgs/development/libraries/science/math/mongoose/default.nix b/pkgs/development/libraries/science/math/mongoose/default.nix deleted file mode 100644 index f1e851ef444d..000000000000 --- a/pkgs/development/libraries/science/math/mongoose/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, blas -, llvmPackages -}: - -let - suitesparseVersion = "7.7.0"; -in -stdenv.mkDerivation { - pname = "mongoose"; - version = "3.3.3"; - - outputs = [ "bin" "out" "dev" ]; - - src = fetchFromGitHub { - owner = "DrTimothyAldenDavis"; - repo = "SuiteSparse"; - rev = "v${suitesparseVersion}"; - hash = "sha256-wE1DKC0Hn3Q9X1FzKH7Kev26ICNWH0LEKQIQP98AGuo="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - blas - ] ++ lib.optionals stdenv.cc.isClang [ - llvmPackages.openmp - ]; - - dontUseCmakeConfigure = true; - - cmakeFlags = [ - "-DBLAS_LIBRARIES=${blas}" - "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" - ]; - - buildPhase = '' - runHook preConfigure - - for f in SuiteSparse_config Mongoose; do - (cd $f && cmakeConfigurePhase && make -j$NIX_BUILD_CORES) - done - - runHook postConfigure - ''; - - installPhase = '' - runHook preInstall - - for f in SuiteSparse_config Mongoose; do - (cd $f/build && make install -j$NIX_BUILD_CORES) - done - - runHook postInstall - ''; - - meta = with lib; { - description = "Graph Coarsening and Partitioning Library"; - mainProgram = "suitesparse_mongoose"; - homepage = "https://github.com/DrTimothyAldenDavis/SuiteSparse/tree/dev/Mongoose"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ wegank ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index adeb03d71286..54b4f7cabd92 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -215,7 +215,7 @@ stdenv.mkDerivation rec { # This seems to be a bug in the openblas Makefile: # on x86_64 it expects NO_BINARY_MODE= # but on aarch64 it expects NO_BINARY_MODE=0 - NO_BINARY_MODE = if stdenv.isx86_64 + NO_BINARY_MODE = if stdenv.hostPlatform.isx86_64 then toString (stdenv.hostPlatform != stdenv.buildPlatform) else stdenv.hostPlatform != stdenv.buildPlatform; # This disables automatic build job count detection (which honours neither enableParallelBuilding nor NIX_BUILD_CORES) diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix deleted file mode 100644 index 857b438d22ad..000000000000 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "openlibm"; - version = "0.8.3"; - - src = fetchFromGitHub { - owner = "JuliaLang"; - repo = "openlibm"; - rev = "v${version}"; - sha256 = "sha256-WSf4mcZXiEL3nKTLQh3Oi1MxeH9MOFRe7DU5zFT2aQE="; - }; - - makeFlags = [ "prefix=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; - - meta = { - description = "High quality system independent, portable, open source libm implementation"; - homepage = "https://openlibm.org/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.ttuegel ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/development/libraries/science/math/openspecfun/default.nix deleted file mode 100644 index 4084aa83a20a..000000000000 --- a/pkgs/development/libraries/science/math/openspecfun/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gfortran }: - -stdenv.mkDerivation rec { - pname = "openspecfun"; - version = "0.5.7"; - src = fetchFromGitHub { - owner = "JuliaLang"; - repo = "openspecfun"; - rev = "v${version}"; - sha256 = "sha256-fx9z6bbU2V4x6Pr7/vmlSxkWxZ6qTYuPxnfqKLv08CA="; - }; - - makeFlags = [ "prefix=$(out)" ]; - - nativeBuildInputs = [ gfortran ]; - - meta = { - description = "Collection of special mathematical functions"; - homepage = "https://github.com/JuliaLang/openspecfun"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.ttuegel ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 43ad807a9d65..4589f6f1ec4b 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { "-DUSE_GLPK=ON" "-DUSE_SCIP=OFF" "-DPython3_EXECUTABLE=${python.pythonOnBuildForHost.interpreter}" - ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_MACOSX_RPATH=OFF" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_MACOSX_RPATH=OFF" ]; strictDeps = true; @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { python.pythonOnBuildForHost swig unzip - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ] ++ (with python.pythonOnBuildForHost.pkgs; [ pip @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ abseil-cpp protobuf - (python.pkgs.protobuf.override { protobuf = protobuf; }) + (python.pkgs.protobuf4.override { protobuf = protobuf; }) python.pkgs.numpy ]; nativeCheckInputs = [ diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix deleted file mode 100644 index 45d5fc5b1f9b..000000000000 --- a/pkgs/development/libraries/science/math/osi/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, gfortran, pkg-config -, blas, zlib, bzip2, coin-utils -, withGurobi ? false, gurobi -, withCplex ? false, cplex }: - -stdenv.mkDerivation rec { - pname = "osi"; - version = "0.108.10"; - - src = fetchFromGitHub { - owner = "coin-or"; - repo = "Osi"; - rev = "releases/${version}"; - hash = "sha256-rHNGnnDFU9UrszjjkZQkgWCfjjBIQba6vVbK/HLpRsQ="; - }; - - buildInputs = - [ blas zlib bzip2 coin-utils ] - ++ lib.optional withGurobi gurobi - ++ lib.optional withCplex cplex; - nativeBuildInputs = [ gfortran pkg-config ]; - configureFlags = - lib.optionals withGurobi [ "--with-gurobi-incdir=${gurobi}/include" "--with-gurobi-lib=-lgurobi${gurobi.libSuffix}" ] - ++ lib.optionals withCplex [ "--with-cplex-incdir=${cplex}/cplex/include/ilcplex" "--with-cplex-lib=-lcplex${cplex.libSuffix}" ]; - - NIX_LDFLAGS = - lib.optionalString withCplex "-L${cplex}/cplex/bin/${cplex.libArch}"; - - # Compile errors - env.NIX_CFLAGS_COMPILE = "-Wno-cast-qual"; - hardeningDisable = [ "format" ]; - - enableParallelBuilding = true; - - passthru = { inherit withGurobi withCplex; }; - - meta = with lib; { - description = "Abstract base class to a generic linear programming (LP) solver"; - homepage = "https://github.com/coin-or/Osi"; - license = licenses.epl20; - platforms = platforms.unix; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/libraries/science/math/osqp/default.nix b/pkgs/development/libraries/science/math/osqp/default.nix deleted file mode 100644 index 55f00d01636a..000000000000 --- a/pkgs/development/libraries/science/math/osqp/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "osqp"; - version = "0.6.3"; - - src = fetchFromGitHub { - owner = "oxfordcontrol"; - repo = "osqp"; - rev = "v${version}"; - 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; { - description = "Quadratic programming solver using operator splitting"; - homepage = "https://osqp.org"; - license = licenses.asl20; - maintainers = with maintainers; [ taktoa ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/science/math/p4est-sc/default.nix b/pkgs/development/libraries/science/math/p4est-sc/default.nix index bb5d212061f2..3ac61e5c2b36 100644 --- a/pkgs/development/libraries/science/math/p4est-sc/default.nix +++ b/pkgs/development/libraries/science/math/p4est-sc/default.nix @@ -1,14 +1,13 @@ { lib, stdenv, fetchFromGitHub, mpiCheckPhaseHook , autoreconfHook, pkg-config , p4est-sc-debugEnable ? true, p4est-sc-mpiSupport ? true -, mpi, openssh, zlib +, mpi, zlib }: let dbg = lib.optionalString debugEnable "-dbg"; debugEnable = p4est-sc-debugEnable; mpiSupport = p4est-sc-mpiSupport; - isOpenmpi = mpiSupport && mpi.pname == "openmpi"; in stdenv.mkDerivation { pname = "p4est-sc${dbg}"; @@ -24,9 +23,7 @@ stdenv.mkDerivation { strictDeps = true; nativeBuildInputs = [ autoreconfHook pkg-config ]; - propagatedNativeBuildInputs = lib.optional mpiSupport mpi - ++ lib.optional isOpenmpi openssh - ; + propagatedNativeBuildInputs = lib.optional mpiSupport mpi ; propagatedBuildInputs = [ zlib ]; inherit debugEnable mpiSupport; @@ -49,12 +46,11 @@ stdenv.mkDerivation { nativeCheckInputs = lib.optionals mpiSupport [ mpiCheckPhaseHook - openssh ]; # disallow Darwin checks due to prototype incompatibility of qsort_r # to be fixed in a future version of the source code - doCheck = !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = !stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform; meta = { branch = "prev3-develop"; diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/pkgs/development/libraries/science/math/planarity/default.nix deleted file mode 100644 index 21791267e1ae..000000000000 --- a/pkgs/development/libraries/science/math/planarity/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, autoreconfHook -}: - -stdenv.mkDerivation rec { - pname = "planarity"; - version = "3.0.2.0"; - - src = fetchFromGitHub { - owner = "graph-algorithms"; - repo = "edge-addition-planarity-suite"; - rev = "Version_${version}"; - sha256 = "sha256-cUAh2MXCSmtxFtV6iTHgSRgsq/26DjWwxhWJH1+367A="; - }; - - nativeBuildInputs = [ - autoreconfHook - ]; - - doCheck = true; - - meta = with lib; { - homepage = "https://github.com/graph-algorithms/edge-addition-planarity-suite"; - description = "Library for implementing graph algorithms"; - mainProgram = "planarity"; - license = licenses.bsd3; - maintainers = teams.sage.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix deleted file mode 100644 index c00d579702cc..000000000000 --- a/pkgs/development/libraries/science/math/rankwidth/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv -, fetchurl -}: - -stdenv.mkDerivation rec { - pname = "rankwidth"; - version = "0.9"; - - src = fetchurl { - url = "mirror://sageupstream/rw/rw-${version}.tar.gz"; - sha256 = "sha256-weA1Bv4lzfy0KMBR/Fay0q/7Wwb7o/LOdWYxRmvvtEE="; - }; - - configureFlags = [ - "--enable-executable=no" # no igraph dependency - ]; - - # check phase is empty for now (as of version 0.9) - doCheck = true; - - meta = with lib; { - description = "Calculates rank-width and rank-decompositions"; - license = with licenses; [ gpl2Plus ]; - maintainers = teams.sage.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix deleted file mode 100644 index a3fba32d05c3..000000000000 --- a/pkgs/development/libraries/science/math/rubiks/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ lib, stdenv -, fetchurl -, fetchpatch -, coreutils -, dos2unix -}: - -stdenv.mkDerivation rec { - pname = "rubiks"; - version = "20070912"; - - src = fetchurl { - url = "mirror://sageupstream/rubiks/rubiks-${version}.tar.bz2"; - sha256 = "0zdmkb0j1kyspdpsszzb2k3279xij79jkx0dxd9f3ix1yyyg3yfq"; - }; - - preConfigure = '' - export INSTALL="${coreutils}/bin/install" - ''; - - # everything is done in `make install` - dontBuild = true; - - installFlags = [ - "PREFIX=$(out)" - ]; - - nativeBuildInputs = [ dos2unix ]; - - prePatch = '' - find ./dietz/ -type f -exec dos2unix {} \; - ''; - - patches = [ - # Fix makefiles which use all the variables in all the wrong ways and - # hardcode values for some variables. - (fetchpatch { - url = "https://raw.githubusercontent.com/sagemath/sage/2a9a4267f93588cf33119cbacc032ed9acc433e5/build/pkgs/rubiks/patches/dietz-cu2-Makefile.patch"; - sha256 = "bRU7MJ/6BgCp2PUqZOragJhm38Q3E8ShStXQIYwIjvw="; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/sagemath/sage/2a9a4267f93588cf33119cbacc032ed9acc433e5/build/pkgs/rubiks/patches/dietz-mcube-Makefile.patch"; - sha256 = "f53z4DogXKax1vUNkraOTt3TQ4bvT7CdQK/hOaaBS38="; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/sagemath/sage/2a9a4267f93588cf33119cbacc032ed9acc433e5/build/pkgs/rubiks/patches/dietz-solver-Makefile.patch"; - sha256 = "7gMC8y9elyIy2KvXYcp7YjPBNqn9PVhUle+/GrYAAdE="; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/sagemath/sage/2a9a4267f93588cf33119cbacc032ed9acc433e5/build/pkgs/rubiks/patches/reid-Makefile.patch"; - sha256 = "rp3SYtx02vVBtSlg1vJpdIoXNcdBNKDLCLqLAKwOYeQ="; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/sagemath/sage/2a9a4267f93588cf33119cbacc032ed9acc433e5/build/pkgs/rubiks/patches/fedora-1-rubiks-includes.patch"; - sha256 = "QYJ1KQ73HTEGY/beMVbcU215g/B8rHDjYD1YM2WZ7sk="; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/sagemath/sage/2a9a4267f93588cf33119cbacc032ed9acc433e5/build/pkgs/rubiks/patches/fedora-2-rubiks-ansi-c.patch"; - sha256 = "Rnu7uphE9URxnbg2K8mkymnB61magweH+WxVWR9JC4s="; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/sagemath/sage/2a9a4267f93588cf33119cbacc032ed9acc433e5/build/pkgs/rubiks/patches/fedora-3-rubiks-prototypes.patch"; - sha256 = "Wi038g+y7No1TNMiITtAdipjRi0+g6h0Sspslm5rZGU="; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/sagemath/sage/2a9a4267f93588cf33119cbacc032ed9acc433e5/build/pkgs/rubiks/patches/fedora-4-rubiks-longtype.patch"; - sha256 = "6pNuxFM69CZ/TQGZfHXLlCN5g5lf3RiYYZKzMvLJwkw="; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/sagemath/sage/2a9a4267f93588cf33119cbacc032ed9acc433e5/build/pkgs/rubiks/patches/fedora-5-rubiks-signed.patch"; - sha256 = "CCGXBMYvSjTm4YKQZAQMi6pWGjyHDYYQzdMZDSW2vFE="; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/sagemath/sage/2a9a4267f93588cf33119cbacc032ed9acc433e5/build/pkgs/rubiks/patches/fedora-6-rubiks-attributes.patch"; - sha256 = "RhlzMb33iaLfeBoF7Y0LIgEzOB/EC+AoWMSkRPCICaU="; - }) - ]; - - meta = with lib; { - homepage = "https://wiki.sagemath.org/spkg/rubiks"; - description = "Several programs for working with Rubik's cubes"; - # The individual websites are no longer available - longDescription = '' - There are several programs for working with Rubik's cubes, by three - different people. Look inside the directories under /src to see - specific info and licensing. In summary the three contributers are: - - - Michael Reid (GPL) http://www.math.ucf.edu/~reid/Rubik/optimal_solver.html - optimal - uses many pre-computed tables to find an optimal - solution to the 3x3x3 Rubik's cube - - - Dik T. Winter (MIT License) - cube - uses Kociemba's algorithm to iteratively find a short - solution to the 3x3x3 Rubik's cube - size222 - solves a 2x2x2 Rubik's cube - - - Eric Dietz (GPL) http://www.wrongway.org/?rubiksource - cu2 - A fast, non-optimal 2x2x2 solver - cubex - A fast, non-optimal 3x3x3 solver - mcube - A fast, non-optimal 4x4x4 solver - ''; - license = with licenses; [ - gpl2 # Michael Reid's and Eric Dietz software - mit # Dik T. Winter's software - ]; - maintainers = teams.sage.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix deleted file mode 100644 index b36f48647819..000000000000 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake -, openssh, mpiCheckPhaseHook, mpi, blas, lapack -} : - -assert blas.isILP64 == lapack.isILP64; - -stdenv.mkDerivation rec { - pname = "scalapack"; - version = "2.2.1"; - - src = fetchFromGitHub { - owner = "Reference-ScaLAPACK"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-GNVGWrIWdfyTfbz7c31Vjt9eDlVzCd/aLHoWq2DMyX4="; - }; - - passthru = { inherit (blas) isILP64; }; - - __structuredAttrs = true; - - # upstream patch, remove with next release - patches = [ (fetchpatch { - name = "gcc-10"; - url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/a0f76fc0c1c16646875b454b7d6f8d9d17726b5a.patch"; - sha256 = "0civn149ikghakic30bynqg1bal097hr7i12cm4kq3ssrhq073bp"; - })]; - - # Required to activate ILP64. - # See https://github.com/Reference-ScaLAPACK/scalapack/pull/19 - postPatch = lib.optionalString passthru.isILP64 '' - sed -i 's/INTSZ = 4/INTSZ = 8/g' TESTING/EIG/* TESTING/LIN/* - sed -i 's/INTGSZ = 4/INTGSZ = 8/g' TESTING/EIG/* TESTING/LIN/* - - # These tests are not adapted to ILP64 - sed -i '/xssep/d;/xsgsep/d;/xssyevr/d' TESTING/CMakeLists.txt - ''; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ cmake ]; - nativeCheckInputs = [ openssh mpiCheckPhaseHook ]; - buildInputs = [ blas lapack ]; - propagatedBuildInputs = [ mpi ]; - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; - - # xslu and xsllt tests seem to time out on x86_64-darwin. - # this line is left so those who force installation on x86_64-darwin can still build - doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); - - preConfigure = '' - cmakeFlagsArray+=( - -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF - -DLAPACK_LIBRARIES="-llapack" - -DBLAS_LIBRARIES="-lblas" - -DCMAKE_Fortran_COMPILER=${lib.getDev mpi}/bin/mpif90 - -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"''} - ) - ''; - - # Increase individual test timeout from 1500s to 10000s because hydra's builds - # sometimes fail due to this - checkFlags = [ "ARGS=--timeout 10000" ]; - - postFixup = '' - # _IMPORT_PREFIX, used to point to lib, points to dev output. Every package using the generated - # cmake file will thus look for the library in the dev output instead of out. - # Use the absolute path to $out instead to fix the issue. - substituteInPlace $dev/lib/cmake/scalapack-${version}/scalapack-targets-release.cmake \ - --replace "\''${_IMPORT_PREFIX}" "$out" - ''; - - meta = with lib; { - homepage = "http://www.netlib.org/scalapack/"; - description = "Library of high-performance linear algebra routines for parallel distributed memory machines"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ costrouc markuskowa gdinh ]; - # xslu and xsllt tests fail on x86 darwin - broken = stdenv.isDarwin && stdenv.isx86_64; - }; -} diff --git a/pkgs/development/libraries/science/math/spooles/allocate.patch b/pkgs/development/libraries/science/math/spooles/allocate.patch deleted file mode 100644 index 71f539711e7b..000000000000 --- a/pkgs/development/libraries/science/math/spooles/allocate.patch +++ /dev/null @@ -1,38 +0,0 @@ -From cc153b180829c6b561765cbbb9b621d1142ff1cd Mon Sep 17 00:00:00 2001 -From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> -Date: Tue, 28 Nov 2023 13:13:44 +0000 -Subject: [PATCH] use proper format specifier for size_t - ---- - Utilities/MM.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Utilities/MM.h b/Utilities/MM.h -index 11e86c5..301c3ec 100644 ---- a/Utilities/MM.h -+++ b/Utilities/MM.h -@@ -33,18 +33,18 @@ if ( (count) > 0 ) { \ - if ( (ptr = (type *)malloc((unsigned long)((count)*sizeof(type)))) \ - == NULL ) {\ - fprintf(stderr, \ -- "\n ALLOCATE failure : bytes %d, line %d, file %s", \ -+ "\n ALLOCATE failure : bytes %zu, line %d, file %s", \ - (count)*sizeof(type), __LINE__, __FILE__) ; \ - exit(-1) ; } \ - else if ( MEMORY_DEBUG > 0 ) { \ - fprintf(stderr, \ -- "\n ALLOCATE : address %p, bytes %d, line %d, file %s", \ -+ "\n ALLOCATE : address %p, bytes %zu, line %d, file %s", \ - ptr, (count)*sizeof(type), __LINE__, __FILE__) ; } } \ - else if ( (count) == 0 ) { \ - ptr = NULL ; } \ - else { \ - fprintf(stderr, \ -- "\n ALLOCATE error : bytes %d, line %d, file %s", \ -+ "\n ALLOCATE error : bytes %zu, line %d, file %s", \ - (count)*sizeof(type), __LINE__, __FILE__) ; \ - exit(-1) ; } - /* --- -2.42.0 - diff --git a/pkgs/development/libraries/science/math/spooles/default.nix b/pkgs/development/libraries/science/math/spooles/default.nix deleted file mode 100644 index 47738008b02d..000000000000 --- a/pkgs/development/libraries/science/math/spooles/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv, fetchurl, perl }: - -stdenv.mkDerivation rec { - pname = "spooles"; - version = "2.2"; - - src = fetchurl { - url = "http://www.netlib.org/linalg/spooles/spooles.${version}.tgz"; - sha256 = "1pf5z3vvwd8smbpibyabprdvcmax0grzvx2y0liy98c7x6h5jid8"; - }; - - sourceRoot = "."; - - patches = [ - ./spooles.patch - # fix compiler error where NULL is used as a zero parameter - ./transform.patch - # use proper format specifier for size_t - ./allocate.patch - ]; - - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace makefile --replace "-Wl,-soname," "-Wl,-install_name,$out/lib/" - ''; - - buildPhase = '' - make lib - ''; - - installPhase = '' - mkdir -p $out/lib $out/include/spooles - cp libspooles.a libspooles.so.2.2 $out/lib/ - ln -s libspooles.so.2.2 $out/lib/libspooles.so.2 - ln -s libspooles.so.2 $out/lib/libspooles.so - for h in *.h; do - if [ $h != 'MPI.h' ]; then - cp $h $out/include/spooles - d=`basename $h .h` - if [ -d $d ]; then - mkdir $out/include/spooles/$d - cp $d/*.h $out/include/spooles/$d - fi - fi - done - ''; - - nativeBuildInputs = [ perl ]; - - meta = with lib; { - homepage = "http://www.netlib.org/linalg/spooles/"; - description = "Library for solving sparse real and complex linear systems of equations"; - license = licenses.publicDomain; - maintainers = with maintainers; [ gebner ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/science/math/spooles/spooles.patch b/pkgs/development/libraries/science/math/spooles/spooles.patch deleted file mode 100644 index 71fb4a7f44e1..000000000000 --- a/pkgs/development/libraries/science/math/spooles/spooles.patch +++ /dev/null @@ -1,188 +0,0 @@ -diff --git a/I2Ohash/src/util.c b/I2Ohash/src/util.c -index 72d082e..f32f667 100644 ---- a/I2Ohash/src/util.c -+++ b/I2Ohash/src/util.c -@@ -39,9 +39,10 @@ fflush(stdout) ; - */ - loc1 = (key1 + 1) % hashtable->nlist ; - loc2 = (key2 + 1) % hashtable->nlist ; --loc = (loc1*loc2) % hashtable->nlist ; -+long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; -+loc =(int) loc3; - #if MYDEBUG > 0 --fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ; -+fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ; - fflush(stdout) ; - #endif - /* -@@ -158,9 +159,10 @@ fflush(stdout) ; - #endif - loc1 = (key1 + 1) % hashtable->nlist ; - loc2 = (key2 + 1) % hashtable->nlist ; --loc = (loc1*loc2) % hashtable->nlist ; -+long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; -+loc =(int) loc3; - #if MYDEBUG > 0 --fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ; -+fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ; - fflush(stdout) ; - #endif - /* -diff --git a/MPI/makefile b/MPI/makefile -index 0c09f86..d25e70a 100644 ---- a/MPI/makefile -+++ b/MPI/makefile -@@ -2,7 +2,7 @@ all_drivers : - cd drivers ; make drivers - - lib : -- cd src ; make spoolesMPI.a -+ cd src ; make makeLib - - clean : - cd src ; make clean -diff --git a/MPI/src/makefile b/MPI/src/makefile -index f7650b7..71e4c49 100644 ---- a/MPI/src/makefile -+++ b/MPI/src/makefile -@@ -42,3 +42,8 @@ $(OBJ).a : \ - - clean : - - rm -f *.a *.o -+ -+makeLib : -+ perl ../../makeLib > makeG -+ make -f makeG -+ rm -f makeG -diff --git a/MT/makefile b/MT/makefile -index 9b86a32..d25e70a 100644 ---- a/MT/makefile -+++ b/MT/makefile -@@ -2,7 +2,7 @@ all_drivers : - cd drivers ; make drivers - - lib : -- cd src ; make spoolesMT.a -+ cd src ; make makeLib - - clean : - cd src ; make clean -diff --git a/Make.inc b/Make.inc -index f99eb8f..2de8a25 100644 ---- a/Make.inc -+++ b/Make.inc -@@ -12,7 +12,7 @@ - # for solaris - # - # CC = gcc -- CC = /usr/lang-4.0/bin/cc -+# CC = /usr/lang-4.0/bin/cc - # - # for sgi - # -@@ -28,7 +28,7 @@ - # - # OPTLEVEL = - # OPTLEVEL = -g -v -- OPTLEVEL = -O -+ OPTLEVEL = -O3 - # OPTLEVEL = -xO5 -v - # OPTLEVEL = -O3 - # OPTLEVEL = -O4 -@@ -43,7 +43,7 @@ - # set any load flags - # - # LDFLAGS = -Wl,+parallel -Wl,+tm,spp2000 # for hp exemplar -- LDFLAGS = -+# LDFLAGS = - # - #--------------------------------------------------------------------- - # -@@ -103,7 +103,7 @@ - # MPI install library - # - # MPI_INSTALL_DIR = -- MPI_INSTALL_DIR = /usr/local/mpich-1.0.13 -+# MPI_INSTALL_DIR = /usr/lib/openmpi - # - #--------------------------------------------------------------------- - # -@@ -142,6 +142,6 @@ - # MPI include path - # - # MPI_INCLUDE_DIR = -- MPI_INCLUDE_DIR = -I$(MPI_INSTALL_DIR)/include -+# MPI_INCLUDE_DIR = -I/usr/include/mpi - # - #--------------------------------------------------------------------- -diff --git a/Utilities/src/iohb.c b/Utilities/src/iohb.c -index ac38f7b..ac34034 100644 ---- a/Utilities/src/iohb.c -+++ b/Utilities/src/iohb.c -@@ -1725,7 +1725,7 @@ static void upcase(char* S) - - static void IOHBTerminate(char* message) - { -- fprintf(stderr,message); -+ fputs(message, stderr); - exit(1); - } - -diff --git a/makeLib b/makeLib -index 1780f39..7697b06 100755 ---- a/makeLib -+++ b/makeLib -@@ -64,14 +64,19 @@ foreach $src ( @srcnames ) { - $srcname = " \\\n " . $src ; - print $srcname ; - } -+print "\n\n.SUFFIXES: .c .o .lo .a .so" ; - print "\n\nOBJ_FILES = \$\{SRC:.c=.o\}" ; -+print "\n\nLOBJ_FILES = \$\{SRC:.c=.lo\}" ; - print "\n\n" ; - print <<'EOF' ; - .c.o : -- $(PURIFY) $(CC) -c $(CFLAGS) $*.c -o $(OBJ)_$*.o -+ $(PURIFY) $(CC) -c $(CFLAGS) $*.c -o $(OBJ)_$*.o $(MPI_INCLUDE_DIR) - --../../spooles.a : ${OBJ_FILES} -- $(AR) $(ARFLAGS) ../../spooles.a $(OBJ)_*.o -+.c.lo : -+ $(PURIFY) $(CC) -c $(CFLAGS) $*.c -fPIC -DPIC -o $(OBJ)_$*.lo $(MPI_INCLUDE_DIR) -+ -+../../libspooles.a : ${OBJ_FILES} ${LOBJ_FILES} -+ $(AR) $(ARFLAGS) ../../libspooles.a $(OBJ)_*.o - rm -f $(OBJ)_*.o -- $(RANLIB) ../../spooles.a -+ $(RANLIB) ../../libspooles.a - EOF -diff --git a/makefile b/makefile -index f014c7d..7c8042a 100755 ---- a/makefile -+++ b/makefile -@@ -124,7 +124,9 @@ lib : - cd ZV ; make lib - cd misc ; make lib - #cd MPI ; make lib --#cd MT ; make lib -+ cd MT ; make lib -+ $(CC) -shared */*/*.lo -Wl,-soname,libspooles.so.2.2 -o libspooles.so.2.2 -lpthread -lm -+ ln -s libspooles.so.2.2 libspooles.so - - global : - cd A2/src ; make -f makeGlobalLib -diff --git a/timings.h b/timings.h -index 23df189..685800b 100644 ---- a/timings.h -+++ b/timings.h -@@ -2,9 +2,8 @@ - #define _TIMINGS_ - #include <sys/time.h> - static struct timeval TV ; --static struct timezone TZ ; - #define MARKTIME(t) \ -- gettimeofday(&TV, &TZ) ; \ -+ gettimeofday(&TV, NULL) ; \ - t = (TV.tv_sec + 0.000001*TV.tv_usec) - #endif - diff --git a/pkgs/development/libraries/science/math/spooles/transform.patch b/pkgs/development/libraries/science/math/spooles/transform.patch deleted file mode 100644 index 3be3babe9d65..000000000000 --- a/pkgs/development/libraries/science/math/spooles/transform.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c5d0574182d76af3bf286dce0bb147ae3f098916 Mon Sep 17 00:00:00 2001 -From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> -Date: Tue, 28 Nov 2023 12:57:18 +0000 -Subject: [PATCH] fix compiler error: use zero, not NULL, in calls to IVinit - ---- - ETree/src/transform.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/ETree/src/transform.c b/ETree/src/transform.c -index 1e36981..dbdfc70 100644 ---- a/ETree/src/transform.c -+++ b/ETree/src/transform.c -@@ -291,7 +291,7 @@ etree2 = ETree_compress(etree, mapIV) ; - remap the nzeros[] vector - ------------------------- - */ --temp = IVinit(nfront, NULL) ; -+temp = IVinit(nfront, 0) ; - IVcopy(nfront, temp, nzeros) ; - IV_setSize(nzerosIV, nnew) ; - nzeros = IV_entries(nzerosIV) ; -@@ -453,7 +453,7 @@ etree2 = ETree_compress(etree, mapIV) ; - remap the nzeros[] vector - ------------------------- - */ --temp = IVinit(nfront, NULL) ; -+temp = IVinit(nfront, 0) ; - IVcopy(nfront, temp, nzeros) ; - IV_setSize(nzerosIV, nnew) ; - nzeros = IV_entries(nzerosIV) ; -@@ -614,7 +614,7 @@ etree2 = ETree_compress(etree, mapIV) ; - remap the nzeros[] vector - ------------------------- - */ --temp = IVinit(nfront, NULL) ; -+temp = IVinit(nfront, 0) ; - IVcopy(nfront, temp, nzeros) ; - IV_setSize(nzerosIV, nnew) ; - nzeros = IV_entries(nzerosIV) ; --- -2.42.0 - diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix deleted file mode 100644 index 2d0b416d975c..000000000000 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - gnum4, -}: - -stdenv.mkDerivation rec { - pname = "suitesparse-graphblas"; - version = "9.3.1"; - - outputs = [ - "out" - "dev" - ]; - - src = fetchFromGitHub { - owner = "DrTimothyAldenDavis"; - repo = "GraphBLAS"; - rev = "v${version}"; - hash = "sha256-lNjxNW0XrHtdULDI35qp2BRCOrdKMnWu7Rje0+uBv0g="; - }; - - nativeBuildInputs = [ - cmake - gnum4 - ]; - - preConfigure = '' - 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"; - license = licenses.asl20; - maintainers = with maintainers; [ wegank ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/pkgs/development/libraries/science/math/suitesparse/4.4.nix index f47b5c0ce818..ef859cfc1ca2 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.4.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.4.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \ -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/' '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i "SuiteSparse_config/SuiteSparse_config.mk" \ -e 's/^[[:space:]]*\(LIB = -lm\) -lrt/\1/' '' @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { "LAPACK=-llapack" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin " -DNTIMER"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin " -DNTIMER"; postInstall = '' # Build and install shared library @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { for i in "$out"/lib/lib*.a; do ar -x $i done - ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lblas ${lib.optionalString enableCuda "-lcublas"} + ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.hostPlatform.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lblas ${lib.optionalString enableCuda "-lcublas"} ) for i in umfpack cholmod amd camd colamd spqr; do ln -s libsuitesparse${SHLIB_EXT} "$out"/lib/lib$i${SHLIB_EXT} diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 43623e8604b9..28909f53fecb 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ] ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { "CUDA_PATH=${cudaPackages.cuda_nvcc}" "CUDART_LIB=${lib.getLib cudaPackages.cuda_cudart}/lib/libcudart.so" "CUBLAS_LIB=${lib.getLib cudaPackages.libcublas}/lib/libcublas.so" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Unless these are set, the build will attempt to use `Accelerate` on darwin, see: # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.13.0/SuiteSparse_config/SuiteSparse_config.mk#L368 "BLAS=-lblas" @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ] ; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Ensure that there is enough space for the `fixDarwinDylibNames` hook to # update the install names of the output dylibs. NIX_LDFLAGS = "-headerpad_max_install_names"; diff --git a/pkgs/development/libraries/science/math/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch b/pkgs/development/libraries/science/math/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch deleted file mode 100644 index 29d86238af08..000000000000 --- a/pkgs/development/libraries/science/math/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/TESTING/MATGEN/CMakeLists.txt -+++ b/TESTING/MATGEN/CMakeLists.txt -@@ -97,3 +97,4 @@ if(enable_complex16) - endif() - - add_library(matgen ${sources}) -+target_link_libraries(matgen superlu) diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix deleted file mode 100644 index 4f52c2d6c507..000000000000 --- a/pkgs/development/libraries/science/math/superlu/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, - gfortran, blas, lapack}: - -assert (!blas.isILP64) && (!lapack.isILP64); - -stdenv.mkDerivation rec { - version = "5.2.1"; - pname = "superlu"; - - src = fetchurl { - url = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_${version}.tar.gz"; - sha256 = "0qzlb7cd608q62kyppd0a8c65l03vrwqql6gsm465rky23b6dyr8"; - }; - - nativeBuildInputs = [ cmake gfortran ]; - - propagatedBuildInputs = [ blas ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=true" - "-DUSE_XSDK_DEFAULTS=true" - ]; - - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=implicit-function-declaration" - "-Wno-error=implicit-int" - ]; - }; - - patches = [ - ./add-superlu-lib-as-dependency-for-the-unit-tests.patch - ]; - - doCheck = true; - checkTarget = "test"; - - meta = { - homepage = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/"; - license = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/License.txt"; - description = "Library for the solution of large, sparse, nonsymmetric systems of linear equations"; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch b/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch deleted file mode 100644 index 97c0a7dad300..000000000000 --- a/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch +++ /dev/null @@ -1,39 +0,0 @@ -commit 433a8b99da9d71e96434bd421c2468cbda29d37c -Author: Mauricio Collares <mauricio@collares.org> -Date: Tue Mar 2 22:07:11 2021 -0300 - - trim logfile information from pari 2.13 output - - Pari (since commit 609fb01faf827d91dfa9136849a647a3bbfe8036) prints - extra logfile information such as - - [logfile is "/tmp/nix-shell.2BquN9/home/.sympow/datafiles/P02HM.txt"] - - which messes up sympow's parsing. This commit reuses the same trimming - mechanism already in sympow to trim this new message. - -diff --git a/Configure b/Configure -index 53b556e..53999ae 100755 ---- a/Configure -+++ b/Configure -@@ -322,7 +322,7 @@ echo "datafiles/param_data: \$(OTHERb)" >> $FILE - echo " \$(MKDIR) -p datafiles" >> $FILE - echo " \$(TOUCH) datafiles/param_data" >> $FILE - echo " \$(SH) armd.sh" >> $FILE --echo " \$(SED) -i -e '/logfile =/d' datafiles/*.txt" >> $FILE -+echo " \$(SED) -i -e '/logfile /d' datafiles/*.txt" >> $FILE - echo " \$(SED) -i -e '/logfile is/d' datafiles/*.txt" >> $FILE - echo "sympow.1: sympow" >> $FILE - echo " \$(HELP2MAN) \$(H2MFLAGS) -s 1 -n \"SYMPOW program\" -I sympow.h2m -o \$@ ./\$<" >> $FILE -diff --git a/generate.c b/generate.c -index dbb811f..783320c 100644 ---- a/generate.c -+++ b/generate.c -@@ -148,6 +148,7 @@ static void trimit(char *A) - " -e '" - "/^\?/d" ";" - "/^(/d" ";" -+ "/logfile /d" ";" - "/Warning:/d" ";" - "/^About to find TOO_BIG/d" ";" - "/^Now working backwards/d" ";" diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix deleted file mode 100644 index 91714bfd3e70..000000000000 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - makeWrapper, - which, - autoconf, - help2man, - file, - pari, -}: - -stdenv.mkDerivation rec { - version = "2.023.7"; - pname = "sympow"; - - src = fetchFromGitLab { - group = "rezozer"; - owner = "forks"; - repo = "sympow"; - rev = "v${version}"; - hash = "sha256-sex8gRiBdTcVMV3nSeiTYamAjPoXQdiiZwjRmeKA+mc="; - }; - - patches = [ ./clean-extra-logfile-output-from-pari.patch ]; - - postUnpack = '' - patchShebangs . - ''; - - nativeBuildInputs = [ - makeWrapper - which - autoconf - help2man - file - pari - ]; - - configurePhase = '' - runHook preConfigure - export PREFIX="$out" - export VARPREFIX="$out" # see comment on postInstall - ./Configure # doesn't take any options - runHook postConfigure - ''; - - # Usually, sympow has 3 levels of caching: statically distributed in /usr/, - # shared in /var and per-user in ~/.sympow. The shared cache assumes trust in - # other users and a shared /var is not compatible with nix's approach, so we - # set VARPREFIX to the read-only $out. This effectively disables shared - # caching. See https://trac.sagemath.org/ticket/3360#comment:36 and sympow's - # README for more details on caching. - # sympow will complain at runtime about the lack of write-permissions on the - # shared cache. We pass the `-quiet` flag by default to disable this. - postInstall = '' - wrapProgram "$out/bin/sympow" --add-flags '-quiet' - ''; - - # Example from the README as a sanity check. - doInstallCheck = true; - installCheckPhase = - '' - export HOME=$TMPDIR - "$out/bin/sympow" -curve "[1,2,3,4,5]" -moddeg | grep 'Modular Degree is 464' - echo "[1,-1,0,-79,289]" | "$out/bin/sympow" -analrank | grep ^"Analytic Rank is 4" - "$out/bin/sympow" -curve "[1,-1,0,-79,289]" -analrank | grep ^"Analytic Rank is 4" - "$out/bin/sympow" -curve "[0,1,1,-2,0]" -analrank | grep ^"Analytic Rank is 2" - '' - + lib.optionalString (!stdenv.isAarch64) '' - "$out/bin/sympow" -sp 2p16 -curve "[1,2,3,4,5]" | grep '8.3705' - ''; - - meta = { - description = "Compute special values of symmetric power elliptic curve L-functions"; - mainProgram = "sympow"; - license = { - shortName = "sympow"; - fullName = "Custom, BSD-like. See COPYING file."; - free = true; - }; - maintainers = lib.teams.sage.members; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix deleted file mode 100644 index 9f9405dec318..000000000000 --- a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ stdenv -, buildPackages -, buildBazelPackage -, fetchFromGitHub -, lib -}: -let - buildPlatform = stdenv.buildPlatform; - hostPlatform = stdenv.hostPlatform; - pythonEnv = buildPackages.python3.withPackages (ps: [ ps.numpy ]); - bazelDepsSha256ByBuildAndHost = { - x86_64-linux = { - x86_64-linux = "sha256-61qmnAB80syYhURWYJOiOnoGOtNa1pPkxfznrFScPAo="; - aarch64-linux = "sha256-sOIYpp98wJRz3RGvPasyNEJ05W29913Lsm+oi/aq/Ag="; - }; - aarch64-linux = { - aarch64-linux = "sha256-MJU4y9Dt9xJWKgw7iKW+9Ur856rMIHeFD5u05s+Q7rQ="; - }; - }; - bazelHostConfigName.aarch64-linux = "elinux_aarch64"; - bazelDepsSha256ByHost = - bazelDepsSha256ByBuildAndHost.${buildPlatform.system} or - (throw "unsupported build system ${buildPlatform.system}"); - bazelDepsSha256 = bazelDepsSha256ByHost.${hostPlatform.system} or - (throw "unsupported host system ${hostPlatform.system} with build system ${buildPlatform.system}"); -in -buildBazelPackage rec { - name = "tensorflow-lite"; - version = "2.13.0"; - - src = fetchFromGitHub { - owner = "tensorflow"; - repo = "tensorflow"; - rev = "v${version}"; - hash = "sha256-Rq5pAVmxlWBVnph20fkAwbfy+iuBNlfFy14poDPd5h0="; - }; - - bazel = buildPackages.bazel_5; - - nativeBuildInputs = [ pythonEnv buildPackages.perl ]; - - bazelTargets = [ - "//tensorflow/lite:libtensorflowlite.so" - "//tensorflow/lite/c:tensorflowlite_c" - "//tensorflow/lite/tools/benchmark:benchmark_model" - "//tensorflow/lite/tools/benchmark:benchmark_model_performance_options" - ]; - - bazelFlags = [ - "--config=opt" - ] ++ lib.optionals (hostPlatform.system != buildPlatform.system) [ - "--config=${bazelHostConfigName.${hostPlatform.system}}" - ]; - - bazelBuildFlags = [ "--cxxopt=--std=c++17" ]; - - buildAttrs = { - installPhase = '' - mkdir -p $out/{bin,lib} - - # copy the libs and binaries into the output dir - cp ./bazel-bin/tensorflow/lite/c/libtensorflowlite_c.so $out/lib - cp ./bazel-bin/tensorflow/lite/libtensorflowlite.so $out/lib - cp ./bazel-bin/tensorflow/lite/tools/benchmark/benchmark_model $out/bin - cp ./bazel-bin/tensorflow/lite/tools/benchmark/benchmark_model_performance_options $out/bin - - find . -type f -name '*.h' | while read f; do - path="$out/include/''${f/.\//}" - install -D "$f" "$path" - - # remove executable bit from headers - chmod -x "$path" - done - ''; - }; - - fetchAttrs.sha256 = bazelDepsSha256; - - PYTHON_BIN_PATH = pythonEnv.interpreter; - - dontAddBazelOpts = true; - removeRulesCC = false; - - postPatch = '' - rm .bazelversion - - # Fix gcc-13 build failure by including missing include headers - sed -e '1i #include <cstdint>' -i \ - tensorflow/lite/kernels/internal/spectrogram.cc - ''; - - preConfigure = '' - patchShebangs configure - ''; - - # configure script freaks out when parameters are passed - dontAddPrefix = true; - configurePlatforms = []; - - meta = with lib; { - description = "Open source deep learning framework for on-device inference"; - homepage = "https://www.tensorflow.org/lite"; - license = licenses.asl20; - maintainers = with maintainers; [ mschwaig cpcloud ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - }; -} diff --git a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix b/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix deleted file mode 100644 index e149f6bd94e2..000000000000 --- a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix +++ /dev/null @@ -1,163 +0,0 @@ -{ - cmake, - cudaPackages, - fetchFromGitHub, - lib, - ninja, - python3Packages ? {}, - pythonSupport ? false, - stdenv, - symlinkJoin, - which, -}: let - inherit (lib) lists strings; - inherit (cudaPackages) backendStdenv flags; - - cuda-common-redist = with cudaPackages; [ - (lib.getDev cuda_cudart) # cuda_runtime.h - (lib.getLib cuda_cudart) - (lib.getDev cuda_cccl) # <nv/target> - (lib.getDev libcublas) # cublas_v2.h - (lib.getLib libcublas) - (lib.getDev libcusolver) # cusolverDn.h - (lib.getLib libcusolver) - (lib.getDev libcusparse) # cusparse.h - (lib.getLib libcusparse) - ]; - - cuda-native-redist = symlinkJoin { - name = "cuda-redist"; - paths = with cudaPackages; - [cuda_nvcc] - ++ cuda-common-redist; - }; - - cuda-redist = symlinkJoin { - name = "cuda-redist"; - paths = cuda-common-redist; - }; -in - stdenv.mkDerivation (finalAttrs: { - pname = "tiny-cuda-nn"; - version = "1.6"; - strictDeps = true; - - format = strings.optionalString pythonSupport "setuptools"; - - src = fetchFromGitHub { - owner = "NVlabs"; - repo = "tiny-cuda-nn"; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-qW6Fk2GB71fvZSsfu+mykabSxEKvaikZ/pQQZUycOy0="; - }; - - nativeBuildInputs = - [ - cmake - cuda-native-redist - ninja - which - ] - ++ lists.optionals pythonSupport (with python3Packages; [ - pip - setuptools - wheel - ]); - - buildInputs = - [ - cuda-redist - ] - ++ lib.optionals pythonSupport ( - with python3Packages; [ - pybind11 - python - ] - ); - - propagatedBuildInputs = lib.optionals pythonSupport ( - with python3Packages; [ - torch - ] - ); - - # NOTE: We cannot use pythonImportsCheck for this module because it uses torch to immediately - # initailize CUDA and GPU access is not allowed in the nix build environment. - # NOTE: There are no tests for the C++ library or the python bindings, so we just skip the check - # phase -- we're not missing anything. - doCheck = false; - - preConfigure = '' - export TCNN_CUDA_ARCHITECTURES="${flags.cmakeCudaArchitecturesString}" - export CUDA_HOME="${cuda-native-redist}" - export LIBRARY_PATH="${cuda-native-redist}/lib/stubs:$LIBRARY_PATH" - export CC="${backendStdenv.cc}/bin/cc" - export CXX="${backendStdenv.cc}/bin/c++" - ''; - - # When building the python bindings, we cannot re-use the artifacts from the C++ build so we - # skip the CMake confurePhase and the buildPhase. - dontUseCmakeConfigure = pythonSupport; - - # The configurePhase usually puts you in the build directory, so for the python bindings we - # need to change directories to the source directory. - configurePhase = strings.optionalString pythonSupport '' - runHook preConfigure - mkdir -p "$NIX_BUILD_TOP/build" - cd "$NIX_BUILD_TOP/build" - runHook postConfigure - ''; - - buildPhase = strings.optionalString pythonSupport '' - runHook preBuild - python -m pip wheel \ - --no-build-isolation \ - --no-clean \ - --no-deps \ - --no-index \ - --verbose \ - --wheel-dir "$NIX_BUILD_TOP/build" \ - "$NIX_BUILD_TOP/source/bindings/torch" - runHook postBuild - ''; - - installPhase = - '' - runHook preInstall - mkdir -p "$out/lib" - '' - # Installing the C++ library just requires copying the static library to the output directory - + strings.optionalString (!pythonSupport) '' - cp libtiny-cuda-nn.a "$out/lib/" - '' - # Installing the python bindings requires building the wheel and installing it - + strings.optionalString pythonSupport '' - python -m pip install \ - --no-build-isolation \ - --no-cache-dir \ - --no-deps \ - --no-index \ - --no-warn-script-location \ - --prefix="$out" \ - --verbose \ - ./*.whl - '' - + '' - runHook postInstall - ''; - - passthru = { - inherit cudaPackages; - }; - - meta = with lib; { - description = "Lightning fast C++/CUDA neural network framework"; - homepage = "https://github.com/NVlabs/tiny-cuda-nn"; - license = licenses.bsd3; - maintainers = with maintainers; [connorbaker]; - platforms = platforms.linux; - # g++: error: unrecognized command-line option '-mf16c' - broken = stdenv.isAarch64; - }; - }) diff --git a/pkgs/development/libraries/science/math/wcpg/default.nix b/pkgs/development/libraries/science/math/wcpg/default.nix deleted file mode 100644 index 8f14b940f383..000000000000 --- a/pkgs/development/libraries/science/math/wcpg/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, blas -, gmp -, lapack -, libf2c -, mpfi -, mpfr -}: - -stdenv.mkDerivation rec { - pname = "wcpg"; - version = "0.9"; - - src = fetchFromGitHub { - owner = "fixif"; - repo = pname; - rev = version; - sha256 = "sha256-uA/ENjf4urEO+lqebkp/k54199o2434FYgPSmYCG4UA="; - }; - - nativeBuildInputs = [ - autoreconfHook - ]; - - buildInputs = [ - blas - gmp - lapack - libf2c - mpfi - mpfr - ]; - - meta = with lib; { - description = "Worst-Case Peak-Gain library"; - homepage = "https://github.com/fixif/WCPG"; - license = licenses.cecill-b; - platforms = platforms.unix; - maintainers = with maintainers; [ wegank ]; - }; -} diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix deleted file mode 100644 index 1c61bb07471b..000000000000 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv -, lib -, fetchFromGitLab -, gmp -, python3 -, tune ? false # tune to hardware, impure -}: - -stdenv.mkDerivation rec { - version = "0.9.2"; - pname = "zn_poly"; - - # sage has picked up the maintenance (bug fixes and building, not development) - # from the original, now unmaintained project which can be found at - # http://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/ - src = fetchFromGitLab { - owner = "sagemath"; - repo = "zn_poly"; - rev = version; - hash = "sha256-QBItcrrpOGj22/ShTDdfZjm63bGW2xY4c71R1q8abPE="; - }; - - buildInputs = [ - gmp - ]; - - nativeBuildInputs = [ - python3 # needed by ./configure to create the makefile - ]; - - # name of library file ("libzn_poly.so") - libbasename = "libzn_poly"; - libext = stdenv.hostPlatform.extensions.sharedLibrary; - - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - - # Tuning (either autotuning or with hand-written parameters) is possible - # but not implemented here. - # It seems buggy anyways (see homepage). - buildFlags = [ "all" "${libbasename}${libext}" ]; - - configureFlags = lib.optionals (!tune) [ - "--disable-tuning" - ]; - - # `make install` fails to install some header files and the lib file. - installPhase = '' - mkdir -p "$out/include/zn_poly" - mkdir -p "$out/lib" - cp "${libbasename}"*"${libext}" "$out/lib" - cp include/*.h "$out/include/zn_poly" - ''; - - doCheck = true; - - meta = with lib; { - homepage = "https://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/"; - description = "Polynomial arithmetic over Z/nZ"; - license = with licenses; [ gpl3 ]; - maintainers = teams.sage.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/science/networking/ns-3/default.nix b/pkgs/development/libraries/science/networking/ns-3/default.nix index 2e2e2a871f7a..efcfa99be0e0 100644 --- a/pkgs/development/libraries/science/networking/ns-3/default.nix +++ b/pkgs/development/libraries/science/networking/ns-3/default.nix @@ -137,6 +137,6 @@ stdenv.mkDerivation rec { platforms = with platforms; unix; maintainers = with maintainers; [ teto rgrunbla ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix b/pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix deleted file mode 100644 index dbb62fd24f06..000000000000 --- a/pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ autoPatchelfHook -, dpkg -, fetchurl -, lib -, libcxx -, stdenv -}: -stdenv.mkDerivation rec { - pname = "edgetpu-compiler"; - version = "15.0"; - - src = fetchurl rec { - url = "https://packages.cloud.google.com/apt/pool/${pname}_${version}_amd64_${sha256}.deb"; - sha256 = "ce03822053c2bddbb8640eaa988396ae66f9bc6b9d6d671914acd1727c2b445a"; - }; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - ]; - - buildInputs = [ - libcxx - ]; - - unpackPhase = '' - mkdir bin pkg - - dpkg -x $src pkg - - rm -r pkg/usr/share/lintian - - cp pkg/usr/bin/edgetpu_compiler_bin/edgetpu_compiler ./bin - cp -r pkg/usr/share . - - rm -r pkg - ''; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -r ./{bin,share} $out - - runHook postInstall - ''; - - meta = with lib; { - description = "Command line tool that compiles a TensorFlow Lite model into an Edge TPU compatible file"; - mainProgram = "edgetpu_compiler"; - homepage = "https://coral.ai/docs/edgetpu/compiler"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.asl20; - maintainers = with maintainers; [ cpcloud ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/libraries/science/robotics/ispike/default.nix b/pkgs/development/libraries/science/robotics/ispike/default.nix deleted file mode 100644 index 28a38b7056dd..000000000000 --- a/pkgs/development/libraries/science/robotics/ispike/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, boost }: - -stdenv.mkDerivation rec { - pname = "ispike"; - version = "2.1.1"; - - src = fetchurl { - url = "mirror://sourceforge/ispike/${pname}-${version}.tar.gz"; - sha256 = "0khrxp43bi5kisr8j4lp9fl4r5marzf7b4inys62ac108sfb28lp"; - }; - - postPatch = '' - sed -i "1i #include <map>" include/iSpike/YarpConnection.hpp - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ]; - - meta = { - description = "Spiking neural interface between iCub and a spiking neural simulator"; - homepage = "https://sourceforge.net/projects/ispike/"; - license = lib.licenses.lgpl3; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.nico202 ]; - }; -} diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix deleted file mode 100644 index 73fb6a6dcf6e..000000000000 --- a/pkgs/development/libraries/scmccid/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{lib, stdenv, fetchurl, patchelf, libusb-compat-0_1}: - -assert stdenv ? cc && stdenv.cc.libc != null; - -stdenv.mkDerivation rec { - pname = "scmccid"; - version = "5.0.11"; - - src = if stdenv.hostPlatform.system == "i686-linux" then (fetchurl { - url = "http://www.scmmicro.com/support/download/scmccid_${version}_linux.tar.gz"; - sha256 = "1r5wkarhzl09ncgj55baizf573czw0nplh1pgddzx9xck66kh5bm"; - }) - else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl { - url = "http://www.scmmicro.com/support/download/scmccid_${version}_linux_x64.tar.gz"; - sha256 = "0k9lzlk01sl4ycfqgrqqy3bildz0mcr1r0kkicgjz96l4s0jgz0i"; - }) - else throw "Architecture not supported"; - - nativeBuildInputs = [ patchelf ]; - - installPhase = '' - RPATH=${libusb-compat-0_1.out}/lib:${stdenv.cc.libc.out}/lib - - for a in proprietary/*/Contents/Linux/*.so*; do - if ! test -L $a; then - patchelf --set-rpath $RPATH $a - fi - done - - mkdir -p $out/pcsc/drivers - cp -R proprietary/* $out/pcsc/drivers - ''; - - meta = { - homepage = "http://www.scmmicro.com/support/pc-security-support/downloads.html"; - description = "PCSC drivers for linux, for the SCM SCR3310 v2.0 card and others"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - maintainers = [ ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/development/libraries/scope-lite/default.nix b/pkgs/development/libraries/scope-lite/default.nix deleted file mode 100644 index 37cf8d12fd00..000000000000 --- a/pkgs/development/libraries/scope-lite/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, cmake, fetchFromGitHub, lib }: let - version = "0.2.0"; -in stdenv.mkDerivation { - name = "scope-lite-${version}"; - - src = fetchFromGitHub { - owner = "martinmoene"; - repo = "scope-lite"; - rev = "v${version}"; - hash = "sha256-/Vu3blgyEOQRFqhQjuT/6ukV0iWA0TdPrLnt2Z/gd6E="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = { - description = "Migration path to C++ library extensions scope_exit, scope_fail, scope_success, unique_resource"; - license = lib.licenses.boost; - maintainers = [ lib.maintainers.shlevy ]; - homepage = "https://github.com/martinmoene/scope-lite"; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/scriptaculous/default.nix b/pkgs/development/libraries/scriptaculous/default.nix deleted file mode 100644 index 50171324b386..000000000000 --- a/pkgs/development/libraries/scriptaculous/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, ... }: - -stdenv.mkDerivation rec { - pname = "scriptaculous"; - version = "1.9.0"; - - src = fetchurl { - url = "https://script.aculo.us/dist/scriptaculous-js-${version}.zip"; - sha256 = "1xpnk3cq8n07lxd69k5jxh48s21zh41ihq10z4a6lcnk238rp8qz"; - }; - - nativeBuildInputs = [ unzip ]; - - installPhase = '' - mkdir $out - cp src/*.js $out - ''; - - meta = with lib; { - description = "Set of JavaScript libraries to enhance the user interface of web sites"; - longDescription = '' - script.aculo.us provides you with - easy-to-use, cross-browser user - interface JavaScript libraries to make - your web sites and web applications fly. - ''; - homepage = "https://script.aculo.us/"; - downloadPage = "https://script.aculo.us/dist/"; - license = licenses.mit; - maintainers = with maintainers; [ das_j ]; - }; -} diff --git a/pkgs/development/libraries/sdbus-cpp/default.nix b/pkgs/development/libraries/sdbus-cpp/default.nix index 16e9b4772659..94f56bd914f4 100644 --- a/pkgs/development/libraries/sdbus-cpp/default.nix +++ b/pkgs/development/libraries/sdbus-cpp/default.nix @@ -1,53 +1,71 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, expat -, pkg-config -, systemd +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + expat, + pkg-config, + systemdLibs, }: +let + generic = + { + version, + rev ? "v${version}", + hash, + }: + stdenv.mkDerivation (finalAttrs: { + pname = "sdbus-cpp"; + inherit version; -stdenv.mkDerivation rec { - pname = "sdbus-cpp"; - version = "1.5.0"; + src = fetchFromGitHub { + owner = "kistler-group"; + repo = "sdbus-cpp"; + inherit rev hash; + }; - src = fetchFromGitHub { - owner = "kistler-group"; - repo = "sdbus-cpp"; - rev = "v${version}"; - hash = "sha256-oO8QNffwNI245AEPdutOGqxj4qyusZYK3bZWLh2Lcag="; - }; + nativeBuildInputs = [ + cmake + pkg-config + ]; - nativeBuildInputs = [ - cmake - pkg-config - ]; + buildInputs = [ + expat + systemdLibs + ]; - buildInputs = [ - expat - systemd - ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_CODE_GEN" true) + ]; - cmakeFlags = [ - "-DBUILD_CODE_GEN=ON" - ]; + meta = { + homepage = "https://github.com/Kistler-Group/sdbus-cpp"; + changelog = "https://github.com/Kistler-Group/sdbus-cpp/blob/v${version}/ChangeLog"; + description = "High-level C++ D-Bus library designed to provide easy-to-use yet powerful API"; + longDescription = '' + sdbus-c++ is a high-level C++ D-Bus library for Linux designed to provide + expressive, easy-to-use API in modern C++. + It adds another layer of abstraction on top of sd-bus, a nice, fresh C + D-Bus implementation by systemd. + It's been written primarily as a replacement of dbus-c++, which currently + suffers from a number of (unresolved) bugs, concurrency issues and + inherent design complexities and limitations. + ''; + license = lib.licenses.lgpl2Only; + maintainers = [ ]; + platforms = lib.platforms.linux; + mainProgram = "sdbus-c++-xml2cpp"; + }; + }); +in +{ + sdbus-cpp = generic { + version = "1.5.0"; + hash = "sha256-oO8QNffwNI245AEPdutOGqxj4qyusZYK3bZWLh2Lcag="; + }; - meta = { - homepage = "https://github.com/Kistler-Group/sdbus-cpp"; - changelog = "https://github.com/Kistler-Group/sdbus-cpp/blob/v${version}/ChangeLog"; - description = "High-level C++ D-Bus library designed to provide easy-to-use yet powerful API"; - longDescription = '' - sdbus-c++ is a high-level C++ D-Bus library for Linux designed to provide - expressive, easy-to-use API in modern C++. - It adds another layer of abstraction on top of sd-bus, a nice, fresh C - D-Bus implementation by systemd. - It's been written primarily as a replacement of dbus-c++, which currently - suffers from a number of (unresolved) bugs, concurrency issues and - inherent design complexities and limitations. - ''; - license = lib.licenses.lgpl2Only; - maintainers = [ ]; - platforms = lib.platforms.linux; - mainProgram = "sdbus-c++-xml2cpp"; + sdbus-cpp_2 = generic { + version = "2.0.0"; + hash = "sha256-W8V5FRhV3jtERMFrZ4gf30OpIQLYoj2yYGpnYOmH2+g="; }; } diff --git a/pkgs/development/libraries/sealcurses/default.nix b/pkgs/development/libraries/sealcurses/default.nix deleted file mode 100644 index ad1eb0bb276d..000000000000 --- a/pkgs/development/libraries/sealcurses/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitea, cmake, pkg-config, ncurses, the-foundation }: - -stdenv.mkDerivation rec { - pname = "sealcurses"; - version = "unstable-2023-02-06"; # No release yet - - src = fetchFromGitea { - domain = "git.skyjake.fi"; - owner = "skyjake"; - repo = pname; - rev = "e11026ca34b03c5ab546512f82a6f705d0c29e95"; - hash = "sha256-N+Tvg2oIcfa68FC7rKuLxGgEKz1oBEEb8NGCiBuZ8y4="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ ncurses the-foundation ]; - - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; - - meta = with lib; { - description = "SDL Emulation and Adaptation Layer for Curses (ncursesw)"; - homepage = "https://git.skyjake.fi/skyjake/sealcurses"; - license = licenses.bsd2; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/seasocks/default.nix b/pkgs/development/libraries/seasocks/default.nix deleted file mode 100644 index 96db323f90a7..000000000000 --- a/pkgs/development/libraries/seasocks/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3, zlib, catch2 }: - -stdenv.mkDerivation rec { - pname = "seasocks"; - version = "1.4.6"; - - src = fetchFromGitHub { - owner = "mattgodbolt"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-R1McxZm2qsUoggFGfL587g+8eQf7si56xVkR8B8nehQ="; - }; - - postPatch = '' - cp ${catch2}/include/catch2/catch.hpp src/test/c/catch/catch2/catch.hpp - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib python3 ]; - - doCheck = true; - - meta = with lib; { - homepage = "https://github.com/mattgodbolt/seasocks"; - description = "Tiny embeddable C++ HTTP and WebSocket server"; - license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ fredeb ]; - }; -} diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix deleted file mode 100644 index 0c40f67c21ee..000000000000 --- a/pkgs/development/libraries/sentencepiece/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, fetchFromGitHub -, stdenv -, cmake -, gperftools - -, withGPerfTools ? true -}: - -stdenv.mkDerivation rec { - pname = "sentencepiece"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "google"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-tMt6UBDqpdjAhxAJlVOFFlE3RC36/t8K0gBAzbesnsg="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = lib.optionals withGPerfTools [ gperftools ]; - - outputs = [ "bin" "dev" "out" ]; - - # https://github.com/google/sentencepiece/issues/754 - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ - --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} - ''; - - meta = with lib; { - homepage = "https://github.com/google/sentencepiece"; - description = "Unsupervised text tokenizer for Neural Network-based text generation"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ pashashocky ]; - }; -} diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix deleted file mode 100644 index 7f6325faef25..000000000000 --- a/pkgs/development/libraries/sentry-native/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, curl -, breakpad -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "sentry-native"; - version = "0.7.9"; - - src = fetchFromGitHub { - owner = "getsentry"; - repo = "sentry-native"; - rev = version; - hash = "sha256-L7VlsxgjWPCceDuJ9OR6Et6wzaBn1hb0AOFbc7PuZWw="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - curl - breakpad - ]; - - cmakeBuildType = "RelWithDebInfo"; - - cmakeFlags = [ - "-DSENTRY_BREAKPAD_SYSTEM=On" - "-DSENTRY_BACKEND=breakpad" - ]; - - meta = with lib; { - homepage = "https://github.com/getsentry/sentry-native"; - description = "Sentry SDK for C, C++ and native applications"; - changelog = "https://github.com/getsentry/sentry-native/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ wheelsandmetal daniel-fahey ]; - }; -} diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix deleted file mode 100644 index 51e1f0264805..000000000000 --- a/pkgs/development/libraries/serd/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, stdenv -, fetchurl -, doxygen -, mandoc -, meson -, ninja -, pkg-config -, python3 -, sphinx -, writeScript -}: - -stdenv.mkDerivation rec { - pname = "serd"; - version = "0.30.16"; - - outputs = [ "out" "dev" "doc" "man" ]; - - src = fetchurl { - url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; - hash = "sha256-9Q9IbaUZzdjQOyDJ5CQU5FkTP1okRBHY5jyu+NmskUY="; - }; - - nativeBuildInputs = [ - doxygen - mandoc - meson - ninja - pkg-config - python3 - sphinx - ]; - - postPatch = '' - patchShebangs . - ''; - - passthru = { - updateScript = writeScript "update-poke" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl pcre common-updater-scripts - - set -eu -o pipefail - - # Expect the text in format of 'download.drobilla.net/serd-0.30.16.tar.xz">' - new_version="$(curl -s https://drobilla.net/category/serd/ | - pcregrep -o1 'download.drobilla.net/serd-([0-9.]+).tar.xz' | - head -n1)" - update-source-version ${pname} "$new_version" - ''; - }; - - meta = with lib; { - 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 = [ ]; - mainProgram = "serdi"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix deleted file mode 100644 index 1a2f407f9bc2..000000000000 --- a/pkgs/development/libraries/serf/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, stdenv -, fetchurl -, apr -, scons -, openssl -, aprutil -, zlib -, libkrb5 -, pkg-config -, libiconv -, fetchpatch -}: - -stdenv.mkDerivation rec { - pname = "serf"; - version = "1.3.10"; - - src = fetchurl { - url = "mirror://apache/serf/${pname}-${version}.tar.bz2"; - hash = "sha256-voHvCLqiUW7Np2p3rffe97wyJ+61eLmjO0X3tB3AZOY="; - }; - - nativeBuildInputs = [ pkg-config scons ]; - buildInputs = [ apr openssl aprutil zlib libiconv ] - ++ lib.optional (!stdenv.isCygwin) libkrb5; - - patches = [ - ./scons.patch - - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/libserf/raw/rawhide/f/libserf-1.3.9-errgetfunc.patch"; - hash = "sha256-FQJvXOIZ0iItvbbcu4kR88j74M7fOi7C/0NN3o1/ub4="; - }) - ]; - - prefixKey = "PREFIX="; - - preConfigure = '' - sconsFlags+=" APR=$(echo ${apr.dev}/bin/*-config)" - sconsFlags+=" APU=$(echo ${aprutil.dev}/bin/*-config)" - sconsFlags+=" CC=$CC" - sconsFlags+=" OPENSSL=${openssl}" - sconsFlags+=" ZLIB=${zlib}" - '' + lib.optionalString (!stdenv.isCygwin) '' - sconsFlags+=" GSSAPI=${libkrb5.dev}" - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "HTTP client library based on APR"; - homepage = "https://serf.apache.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ orivej raskin ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/serf/scons.patch b/pkgs/development/libraries/serf/scons.patch deleted file mode 100644 index 7be5e4d5045d..000000000000 --- a/pkgs/development/libraries/serf/scons.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/SConstruct b/SConstruct -index 4358a23..6ce7776 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -155,6 +155,8 @@ if sys.platform == 'win32': - env = Environment(variables=opts, - tools=('default', 'textfile',), - CPPPATH=['.', ], -+ AR=os.environ['AR'], -+ ENV=os.environ, - ) - - env.Append(BUILDERS = { diff --git a/pkgs/development/libraries/serialdv/default.nix b/pkgs/development/libraries/serialdv/default.nix deleted file mode 100644 index 549d03693375..000000000000 --- a/pkgs/development/libraries/serialdv/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "serialdv"; - version ="1.1.4"; - - src = fetchFromGitHub { - owner = "f4exb"; - repo = "serialdv"; - rev = "v${version}"; - sha256 = "0d88h2wjhf79nisiv96bq522hkbknzm88wsv0q9k33mzmrwnrx93"; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "C++ Minimal interface to encode and decode audio with AMBE3000 based devices in packet mode over a serial link"; - mainProgram = "dvtest"; - homepage = "https://github.com/f4exb/serialdv"; - platforms = platforms.unix; - maintainers = with maintainers; [ alkeryn ]; - license = licenses.gpl3; - }; -} - diff --git a/pkgs/development/libraries/sexpp/default.nix b/pkgs/development/libraries/sexpp/default.nix deleted file mode 100644 index a6a9228d449a..000000000000 --- a/pkgs/development/libraries/sexpp/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenv -, bzip2 -, cmake -, fetchFromGitHub -, gtest -, pkg-config -, zlib -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "sexpp"; - version = "0.8.8"; - - src = fetchFromGitHub { - owner = "rnpgp"; - repo = "sexpp"; - rev = "v${finalAttrs.version}"; - hash = "sha256-6PCqzHAb5is8bArQWD5N+GykoWjM8H8mV0IabtNTlYg="; - }; - - buildInputs = [ zlib bzip2 ]; - - cmakeFlags = [ - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" - "-DBUILD_SHARED_LIBS=on" - "-DWITH_SEXP_TESTS=on" - "-DDOWNLOAD_GTEST=off" - "-DWITH_SEXP_CLI=on" - "-DWITH_SANITIZERS=off" - ]; - - nativeBuildInputs = [ cmake gtest pkg-config ]; - - outputs = [ "out" "lib" "dev" ]; - - preConfigure = '' - echo "v${finalAttrs.version}" > version.txt - ''; - - meta = with lib; { - homepage = "https://github.com/rnpgp/sexp"; - description = "S-expressions parser and generator C++ library, fully compliant to [https://people.csail.mit.edu/rivest/Sexp.txt]"; - mainProgram = "sexpp"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ ribose-jeffreylau ]; - }; -}) diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index c3ecd3a9866f..2b28228c5f57 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ freetype libjpeg openal flac libvorbis glew ] - ++ lib.optional stdenv.isLinux udev - ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ] - ++ lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ]; + ++ lib.optional stdenv.hostPlatform.isLinux udev + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit Foundation AppKit OpenAL ]; cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" diff --git a/pkgs/development/libraries/sfsexp/default.nix b/pkgs/development/libraries/sfsexp/default.nix deleted file mode 100644 index 3d047ccd7f50..000000000000 --- a/pkgs/development/libraries/sfsexp/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "sfsexp"; - version = "1.4.1"; - - src = fetchFromGitHub { - owner = "mjsottile"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-uAk/8Emf23J0D3D5+eUEpWLY2fIvdQ7a80eGe9i1WQ8="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - meta = with lib; { - description = "Small Fast S-Expression Library"; - homepage = "https://github.com/mjsottile/sfsexp"; - maintainers = with maintainers; [ jb55 ]; - license = licenses.lgpl21Plus; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/sgp4/default.nix b/pkgs/development/libraries/sgp4/default.nix deleted file mode 100644 index b2095e93aa11..000000000000 --- a/pkgs/development/libraries/sgp4/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation { - pname = "sgp4"; - version = "unstable-2022-11-13"; - - src = fetchFromGitHub { - owner = "dnwrnr"; - repo = "sgp4"; - rev = "6a448b4850e5fbf8c1ca03bb5f6013a9fdc1fd91"; - hash = "sha256-gfJQOLhys5wKzZCxFVqbo+5l7jPeGPzrvYsdZKPSCJc="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Simplified perturbations models library"; - homepage = "https://github.com/dnwrnr/sgp4"; - license = licenses.asl20; - maintainers = with maintainers; [ alexwinter ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/sharness/default.nix b/pkgs/development/libraries/sharness/default.nix deleted file mode 100644 index 7829b0009b49..000000000000 --- a/pkgs/development/libraries/sharness/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, perl -, perlPackages -, sharnessExtensions ? {} }: - -stdenv.mkDerivation (finalAttrs: { - pname = "sharness"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "felipec"; - repo = "sharness"; - rev = "v${finalAttrs.version}"; - hash = "sha256-C0HVWgTm9iXDSFyXcUVRfT0ip31YGaaZ6ZvxggK/x7o="; - }; - - # Used for testing - nativeBuildInputs = [ perl perlPackages.IOTty ]; - - outputs = [ "out" "doc" ]; - - makeFlags = [ "prefix=$(out)" ]; - - extensions = lib.mapAttrsToList (k: v: "${k}.sh ${v}") sharnessExtensions; - - postInstall = lib.optionalString (sharnessExtensions != {}) '' - extDir=$out/share/sharness/sharness.d - mkdir -p "$extDir" - linkExtensions() { - set -- $extensions - while [ $# -ge 2 ]; do - ln -s "$2" "$extDir/$1" - shift 2 - done - } - linkExtensions - ''; - - doCheck = true; - - passthru.SHARNESS_TEST_SRCDIR = finalAttrs.finalPackage + "/share/sharness"; - - meta = with lib; { - description = "Portable shell library to write, run and analyze automated tests adhering to Test Anything Protocol (TAP)"; - homepage = "https://github.com/chriscool/sharness"; - license = licenses.gpl2Only; - maintainers = [ maintainers.spacefrogg ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/shhmsg/default.nix b/pkgs/development/libraries/shhmsg/default.nix deleted file mode 100644 index ad6a40716bcd..000000000000 --- a/pkgs/development/libraries/shhmsg/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "shhmsg"; - version = "1.4.2"; - - src = fetchurl { - url = "https://shh.thathost.com/pub-unix/files/shhmsg-${version}.tar.gz"; - sha256 = "0ax02fzqpaxr7d30l5xbndy1s5vgg1ag643c7zwiw2wj1czrxil8"; - }; - - postPatch = '' - substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" - ''; - - installFlags = [ "INSTBASEDIR=$(out)" ]; - - meta = with lib; { - description = "Library for displaying messages"; - homepage = "https://shh.thathost.com/pub-unix/"; - license = licenses.artistic1; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/shhopt/default.nix b/pkgs/development/libraries/shhopt/default.nix deleted file mode 100644 index 324cb8203484..000000000000 --- a/pkgs/development/libraries/shhopt/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "shhopt"; - version = "1.1.7"; - - src = fetchurl { - url = "https://shh.thathost.com/pub-unix/files/${pname}-${version}.tar.gz"; - sha256 = "0yd6bl6qw675sxa81nxw6plhpjf9d2ywlm8a5z66zyjf28sl7sds"; - }; - - postPatch = '' - substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" - ''; - - installFlags = [ "INSTBASEDIR=$(out)" ]; - - meta = with lib; { - description = "Library for parsing command line options"; - homepage = "https://shh.thathost.com/pub-unix/"; - license = licenses.artistic1; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix deleted file mode 100644 index da63b22f9e7e..000000000000 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkg-config, xercesc, xml-security-c, xml-tooling-c, darwin }: - -stdenv.mkDerivation rec { - pname = "shibboleth-sp"; - version = "3.0.4.1"; - - src = fetchgit { - url = "https://git.shibboleth.net/git/cpp-sp.git"; - rev = version; - sha256 = "1qb4dbz5gk10b9w1rf6f4vv7c2wb3a8bfzif6yiaq96ilqad7gdr"; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ boost fcgi openssl opensaml-cpp log4shib xercesc xml-security-c xml-tooling-c ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - CoreServices - SystemConfiguration - ]); - - configureFlags = [ - "--without-apxs" - "--with-xmltooling=${xml-tooling-c}" - "--with-saml=${opensaml-cpp}" - "--with-fastcgi" - "CXXFLAGS=-std=c++14" - ]; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://shibboleth.net/products/service-provider.html"; - description = "Enables SSO and Federation web applications written with any programming language or framework"; - platforms = platforms.unix; - license = licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/shine/default.nix b/pkgs/development/libraries/shine/default.nix deleted file mode 100644 index 433e4dcc6179..000000000000 --- a/pkgs/development/libraries/shine/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "shine"; - version = "3.1.1"; - - src = fetchFromGitHub { - owner = "toots"; - repo = "shine"; - rev = version; - sha256 = "06nwylqqji0i1isdprm2m5qsdj4qiywcgnp69c5b55pnw43f07qg"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - meta = with lib; { - description = "Fast fixed-point mp3 encoding library"; - mainProgram = "shineenc"; - homepage = "https://github.com/toots/shine"; - license = licenses.lgpl2Only; - maintainers = with maintainers; [ dandellion ]; - }; -} diff --git a/pkgs/development/libraries/sigslot/default.nix b/pkgs/development/libraries/sigslot/default.nix deleted file mode 100644 index 8a97ab9d32e9..000000000000 --- a/pkgs/development/libraries/sigslot/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "sigslot"; - version = "1.2.2"; - - src = fetchFromGitHub { - owner = "palacaze"; - repo = "sigslot"; - rev = "v${version}"; - hash = "sha256-MKtVZLHp8UfXW8KJ3QjPMhxnt46xV+pA9NMqAX0iqiA="; - }; - - nativeBuildInputs = [ cmake ]; - - dontBuild = true; - - meta = with lib; { - description = "Header-only, thread safe implementation of signal-slots for C++"; - license = licenses.mit; - homepage = "https://github.com/palacaze/sigslot"; - maintainers = with maintainers; [ azahi ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 7f4b73c79378..d2a4206e7dc1 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { doFakeLibgcc = true; }); - patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ]; + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./macosx.patch ]; postPatch = '' # disable broken 'nametabletest' test, fails on gcc-13: # https://github.com/silnrsi/graphite/pull/74 diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix deleted file mode 100644 index 5adc27e7c106..000000000000 --- a/pkgs/development/libraries/simdjson/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "simdjson"; - version = "3.10.1"; - - src = fetchFromGitHub { - owner = "simdjson"; - repo = "simdjson"; - rev = "v${version}"; - sha256 = "sha256-UfGt5lKmpqc21Hln4t/4KJfg+3V/hqX3UYgpCvlhkrM="; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DSIMDJSON_DEVELOPER_MODE=OFF" - ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - "-DBUILD_SHARED_LIBS=OFF" - ] ++ lib.optionals (with stdenv.hostPlatform; isPower && isBigEndian) [ - # Assume required CPU features are available, since otherwise we - # just get a failed build. - "-DCMAKE_CXX_FLAGS=-mpower8-vector" - ]; - - meta = with lib; { - homepage = "https://simdjson.org/"; - description = "Parsing gigabytes of JSON per second"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ chessai ]; - }; -} diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix deleted file mode 100644 index 416274e1c545..000000000000 --- a/pkgs/development/libraries/simgear/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, plib, libglut, xorgproto, libX11, libXext, libXi -, libICE, libSM, libXt, libXmu, libGLU, libGL, boost179, zlib, libjpeg, freealut -, openscenegraph, openal, expat, cmake, apr, xz -, curl -}: -let - version = "2020.3.19"; - shortVersion = builtins.substring 0 6 version; -in -stdenv.mkDerivation rec { - pname = "simgear"; - inherit version; - - src = fetchurl { - url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-O5N8W5RCJHjl15EUvc1seOQ6Cm/7qXVEqG1EHD+ejDo="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ plib libglut xorgproto libX11 libXext libXi - libICE libSM libXt libXmu libGLU libGL boost179 zlib libjpeg freealut - openscenegraph openal expat apr curl xz ]; - - meta = with lib; { - description = "Simulation construction toolkit"; - homepage = "https://wiki.flightgear.org/SimGear"; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; - license = licenses.lgpl2; - }; -} diff --git a/pkgs/development/libraries/smarty3-i18n/default.nix b/pkgs/development/libraries/smarty3-i18n/default.nix deleted file mode 100644 index e617ba58e8b4..000000000000 --- a/pkgs/development/libraries/smarty3-i18n/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, ... }: - -stdenv.mkDerivation rec { - pname = "smarty-i18n"; - version = "1.0"; - - src = fetchFromGitHub { - owner = "kikimosha"; - repo = "smarty3-i18n"; - rev = version; - sha256 = "0rjxq4wka73ayna3hb5dxc5pgc8bw8p5fy507yc6cv2pl4h4nji2"; - }; - - installPhase = '' - mkdir $out - cp block.t.php $out - ''; - - meta = with lib; { - description = "gettext for the smarty3 framework"; - license = licenses.lgpl21; - homepage = "https://github.com/kikimosha/smarty3-i18n"; - maintainers = with maintainers; [ das_j ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix deleted file mode 100644 index 6059bed339e6..000000000000 --- a/pkgs/development/libraries/smarty3/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, ... }: - -stdenv.mkDerivation rec { - pname = "smarty3"; - version = "3.1.48"; - - src = fetchFromGitHub { - owner = "smarty-php"; - repo = "smarty"; - rev = "v${version}"; - hash = "sha256-QGhccIJ7BZTWGF+n8rmB1RCVyJKID95NW6Yb2VvqqGQ="; - }; - - installPhase = '' - mkdir $out - cp -r libs/* $out - ''; - - meta = with lib; { - description = "Smarty 3 template engine"; - longDescription = '' - Smarty is a template engine for PHP, facilitating the - separation of presentation (HTML/CSS) from application - logic. This implies that PHP code is application - logic, and is separated from the presentation. - ''; - homepage = "https://www.smarty.net"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ das_j ]; - }; -} diff --git a/pkgs/development/libraries/smooth/default.nix b/pkgs/development/libraries/smooth/default.nix deleted file mode 100644 index 3cb227b12d3f..000000000000 --- a/pkgs/development/libraries/smooth/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config - -, bzip2 -, curl -, fribidi -, gtk3 -, iconv -, libcpuid -, libjpeg -, libpng -, libwebp -, libxml2 -, zlib -}: - -stdenv.mkDerivation rec { - pname = "smooth"; - version = "0.9.10"; - - src = fetchFromGitHub { - owner = "enzo1982"; - repo = "smooth"; - rev = "v${version}"; - sha256 = "sha256-J2Do1iAbE1GBC8co/4nxOzeGJQiPRc+21fgMDpzKX+A="; - }; - - nativeBuildInputs = [ - pkg-config - ]; - - makeFlags = [ - "prefix=$(out)" - "config=systemlibbz2,systemlibcpuid,systemlibcurl,systemlibfribidi,systemlibiconv,systemlibjpeg,systemlibpng,systemlibwebp,systemlibxml2,systemzlib" - ]; - - buildInputs = [ - bzip2 - curl - fribidi - gtk3 - iconv - libcpuid - libjpeg - libpng - libwebp - libxml2 - zlib - ]; - - meta = with lib; { - description = "Smooth Class Library"; - mainProgram = "smooth-translator"; - license = licenses.artistic2; - homepage = "http://www.smooth-project.org/"; - maintainers = with maintainers; [ shamilton ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix deleted file mode 100644 index 099a3d838bbb..000000000000 --- a/pkgs/development/libraries/smpeg/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "smpeg"; - version = "0.4.5"; - - src = fetchFromGitHub { - owner = "icculus"; - repo = "smpeg"; - rev = "release_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-nq/i7cFGpJXIuTwN/ScLMX7FN8NMdgdsRM9xOD3uycs="; - }; - - patches = [ - ./format.patch - ./gcc6.patch - ./libx11.patch - ./gtk.patch - # These patches remove use of the `register` storage class specifier, - # allowing smpeg to build with clang 16, which defaults to C++17. - (fetchpatch { - url = "https://github.com/icculus/smpeg/commit/cc114ba0dd8644c0d6205bbce2384781daeff44b.patch"; - hash = "sha256-GxSD82j05pw0r2SxmPYAe/BXX4iUc+iHWhB9Ap4GzfA="; - }) - (fetchpatch { - url = "https://github.com/icculus/smpeg/commit/b369feca5bf99d6cff50d8eb316395ef48acf24f.patch"; - hash = "sha256-U+a6dbc5cm249KlUcf4vi79yUiT4hgEvMv522K4PqUc="; - }) - ]; - - postPatch = '' - substituteInPlace video/gdith.cpp \ - --replace 'register int' 'int' \ - --replace 'register Uint16' 'Uint16' - ''; - - enableParallelBuilding = true; - - nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ]; - - buildInputs = [ SDL ] ++ lib.optionals (!stdenv.isDarwin) [ gtk2 libGLU libGL ]; - - outputs = [ "out" "dev" ]; - - preConfigure = '' - touch NEWS AUTHORS ChangeLog - sh autogen.sh - ''; - - postInstall = '' - sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \ - -e 's,"SDL_mutex.h",<SDL/SDL_mutex.h>,' \ - -e 's,"SDL_audio.h",<SDL/SDL_audio.h>,' \ - -e 's,"SDL_thread.h",<SDL/SDL_thread.h>,' \ - -e 's,"SDL_types.h",<SDL/SDL_types.h>,' \ - $dev/include/smpeg/*.h - - moveToOutput bin/smpeg-config "$dev" - - wrapProgram $dev/bin/smpeg-config \ - --prefix PATH ":" "${pkg-config}/bin" \ - --prefix PKG_CONFIG_PATH ":" "${lib.getDev SDL}/lib/pkgconfig" - ''; - - NIX_LDFLAGS = "-lX11"; - - meta = { - homepage = "http://icculus.org/smpeg/"; - description = "MPEG decoding library"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/smpeg/format.patch b/pkgs/development/libraries/smpeg/format.patch deleted file mode 100644 index 8486dee5cda4..000000000000 --- a/pkgs/development/libraries/smpeg/format.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/plaympeg.c 2014-09-04 08:55:10.646132150 +0200 -+++ b/plaympeg.c 2014-09-04 08:56:57.465210820 +0200 -@@ -262,7 +262,7 @@ - answer[i] = c; - } - answer[i] = 0; -- fprintf(stderr, answer + 4); -+ fprintf(stderr, "%s", answer + 4); - } - while(answer[3] == '-'); - diff --git a/pkgs/development/libraries/smpeg/gcc6.patch b/pkgs/development/libraries/smpeg/gcc6.patch deleted file mode 100644 index 165feb4428c2..000000000000 --- a/pkgs/development/libraries/smpeg/gcc6.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/audio/hufftable.cpp -+++ b/audio/hufftable.cpp -@@ -9,6 +9,7 @@ - #include "config.h" - #endif - -+#include <climits> - #include "MPEGaudio.h" - - static const unsigned int -@@ -550,11 +551,11 @@ htd33[ 31][2]={{ 16, 1},{ 8, 1},{ 4, - - const HUFFMANCODETABLE MPEGaudio::ht[HTN]= - { -- { 0, 0-1, 0-1, 0, 0, htd33}, -+ { 0, UINT_MAX, UINT_MAX, 0, 0, htd33}, - { 1, 2-1, 2-1, 0, 7,htd01}, - { 2, 3-1, 3-1, 0, 17,htd02}, - { 3, 3-1, 3-1, 0, 17,htd03}, -- { 4, 0-1, 0-1, 0, 0, htd33}, -+ { 4, UINT_MAX, UINT_MAX, 0, 0, htd33}, - { 5, 4-1, 4-1, 0, 31,htd05}, - { 6, 4-1, 4-1, 0, 31,htd06}, - { 7, 6-1, 6-1, 0, 71,htd07}, -@@ -564,7 +565,7 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN - {11, 8-1, 8-1, 0,127,htd11}, - {12, 8-1, 8-1, 0,127,htd12}, - {13,16-1,16-1, 0,511,htd13}, -- {14, 0-1, 0-1, 0, 0, htd33}, -+ {14, UINT_MAX, UINT_MAX, 0, 0, htd33}, - {15,16-1,16-1, 0,511,htd15}, - {16,16-1,16-1, 1,511,htd16}, - {17,16-1,16-1, 2,511,htd16}, diff --git a/pkgs/development/libraries/smpeg/gtk.patch b/pkgs/development/libraries/smpeg/gtk.patch deleted file mode 100644 index 8f9f2f492ed1..000000000000 --- a/pkgs/development/libraries/smpeg/gtk.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff '--color=auto' -Naur smpeg-r390.orig/acinclude/gtk-2.0.m4 smpeg-r390/acinclude/gtk-2.0.m4 ---- smpeg-r390.orig/acinclude/gtk-2.0.m4 1970-01-01 08:00:01.000000000 +0800 -+++ smpeg-r390/acinclude/gtk-2.0.m4 2021-12-16 15:52:17.776001058 +0800 -@@ -24,10 +24,8 @@ - - no_gtk="" - -- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -- - if test x$PKG_CONFIG != xno ; then -- if pkg-config --atleast-pkgconfig-version 0.7 ; then -+ if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then - : - else - echo "*** pkg-config too old; version 0.7 or better required." diff --git a/pkgs/development/libraries/smpeg/libx11.patch b/pkgs/development/libraries/smpeg/libx11.patch deleted file mode 100644 index 8611073780f3..000000000000 --- a/pkgs/development/libraries/smpeg/libx11.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: smpeg-0.4.5+cvs20030824/Makefile.am -=================================================================== ---- smpeg-0.4.5+cvs20030824.orig/Makefile.am -+++ smpeg-0.4.5+cvs20030824/Makefile.am -@@ -74,7 +74,7 @@ - - # Sources for gtv - gtv_SOURCES = gtv.c gtv.h --gtv_LDADD = @GTK_LIBS@ libsmpeg.la -+gtv_LDADD = @GTK_LIBS@ @X11_LIBS@ libsmpeg.la - - # Sources for glmovie - glmovie_SOURCES = glmovie-tile.c glmovie.c glmovie.h -Index: smpeg-0.4.5+cvs20030824/configure.in -=================================================================== ---- smpeg-0.4.5+cvs20030824.orig/configure.in -+++ smpeg-0.4.5+cvs20030824/configure.in -@@ -215,6 +215,7 @@ - CFLAGS="$CFLAGS $GTK_CFLAGS" - fi - AC_SUBST(GTK_LIBS) -+ PKG_CHECK_MODULES([X11], [x11]) - fi - AM_CONDITIONAL(HAVE_GTK, test x$have_gtk = xyes) - diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/development/libraries/smpeg2/default.nix deleted file mode 100644 index 24dd9c9dc400..000000000000 --- a/pkgs/development/libraries/smpeg2/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv -, autoconf -, automake -, darwin -, fetchFromGitHub -, makeWrapper -, pkg-config -, SDL2 -}: - -stdenv.mkDerivation rec { - pname = "smpeg2"; - version = "unstable-2022-05-26"; - - src = fetchFromGitHub { - owner = "icculus"; - repo = "smpeg"; - rev = "c5793e5f3f2765fc09c24380d7e92136a0e33d3b"; - sha256 = "sha256-Z0u83K1GIXd0jUYo5ZyWUH2Zt7Hn8z+yr06DAtAEukw="; - }; - - nativeBuildInputs = [ autoconf automake makeWrapper pkg-config ]; - - buildInputs = [ SDL2 ] - ++ lib.optional stdenv.isDarwin darwin.libobjc; - - outputs = [ "out" "dev" "man" ]; - - preConfigure = '' - sh autogen.sh - ''; - - postInstall = '' - moveToOutput bin/smpeg2-config "$dev" - wrapProgram $dev/bin/smpeg2-config \ - --prefix PATH ":" "${pkg-config}/bin" \ - --prefix PKG_CONFIG_PATH ":" "${SDL2.dev}/lib/pkgconfig" - ''; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "http://icculus.org/smpeg/"; - description = "SDL2 MPEG Player Library"; - license = licenses.lgpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ orivej ]; - }; -} diff --git a/pkgs/development/libraries/snap7/default.nix b/pkgs/development/libraries/snap7/default.nix deleted file mode 100644 index 39cdf6d2b45e..000000000000 --- a/pkgs/development/libraries/snap7/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, lib, fetchzip, p7zip }: - -stdenv.mkDerivation rec { - pname = "snap7"; - version = "1.4.2"; - - src = fetchzip { - url = "mirror://sourceforge/snap7/${version}/snap7-full-${version}.7z"; - sha256 = "1n5gs8bwb6g9vfllf3x12r5yzqzapmlq1bmc6hl854b8vkg30y8c"; - postFetch = '' - ${p7zip}/bin/7z x $downloadedFile - mkdir $out - cp -r snap7-full-${version}/* $out/ - ''; - }; - - outputs = [ "out" "dev" "doc" ]; - - makefile = "x86_64_linux.mk"; - makeFlags = [ "LibInstall=$(out)/lib" ]; - - preBuild = "cd build/unix"; - preInstall = '' - mkdir -p $out/lib - mkdir -p $dev/include - mkdir -p $doc/share - cp $src/examples/cpp/snap7.h $dev/include - cp -r $src/doc $doc/share/ - ''; - - meta = with lib; { - homepage = "https://snap7.sourceforge.net/"; - description = "Step7 Open Source Ethernet Communication Suite"; - license = licenses.lgpl3; - maintainers = with maintainers; [ freezeboy ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix deleted file mode 100644 index 21785e251841..000000000000 --- a/pkgs/development/libraries/snappy/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake -, fetchpatch -, static ? stdenv.hostPlatform.isStatic -}: - -stdenv.mkDerivation rec { - pname = "snappy"; - version = "1.2.1"; - - src = fetchFromGitHub { - owner = "google"; - repo = "snappy"; - rev = version; - hash = "sha256-IzKzrMDjh+Weor+OrKdX62cAKYTdDXgldxCgNE2/8vk="; - }; - - patches = [ - # Re-enable RTTI, without which other applications can't subclass - # snappy::Source (this breaks Ceph, as one example) - # https://tracker.ceph.com/issues/53060 - # https://build.opensuse.org/package/show/openSUSE:Factory/snappy - (fetchpatch { - url = "https://build.opensuse.org/public/source/openSUSE:Factory/snappy/reenable-rtti.patch?rev=a759aa6fba405cd40025e3f0ab89941d"; - sha256 = "sha256-RMuM5yd6zP1eekN/+vfS54EyY4cFbGDVor1E1vj3134="; - }) - ]; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" - "-DSNAPPY_BUILD_TESTS=OFF" - "-DSNAPPY_BUILD_BENCHMARKS=OFF" - ]; - - postInstall = '' - substituteInPlace "$out"/lib/cmake/Snappy/SnappyTargets.cmake \ - --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES "'$dev'"' - - mkdir -p $dev/lib/pkgconfig - cat <<EOF > $dev/lib/pkgconfig/snappy.pc - Name: snappy - Description: Fast compressor/decompressor library. - Version: ${version} - Libs: -L$out/lib -lsnappy - Cflags: -I$dev/include - EOF - ''; - - #checkTarget = "test"; - - # requires gbenchmark and gtest but it also installs them out $dev - doCheck = false; - - meta = with lib; { - homepage = "https://google.github.io/snappy/"; - license = licenses.bsd3; - description = "Compression/decompression library for very high speeds"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix index 007a4fbaf7bf..3ba387436e76 100644 --- a/pkgs/development/libraries/soci/default.nix +++ b/pkgs/development/libraries/soci/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { sqlite postgresql boost - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Kerberos ]; diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix deleted file mode 100644 index 475a92e79c3e..000000000000 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config }: - -stdenv.mkDerivation rec { - pname = "socket_wrapper"; - version = "1.4.3"; - - src = fetchurl { - url = "mirror://samba/cwrap/socket_wrapper-${version}.tar.gz"; - sha256 = "sha256-CWz7TqucebUtss51JsVeUI8GZb/qxsS8ZqPIMh2HU1g="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - meta = with lib; { - description = "Library passing all socket communications through unix sockets"; - homepage = "https://git.samba.org/?p=socket_wrapper.git;a=summary;"; - license = licenses.bsd3; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index b9f34eeb9748..7b33ed04871f 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-7QmK2UxEO5lC0KBDWB3bwKTy0Nc7WrdTLjoQYzezoaY="; }; - buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; + buildInputs = [ glib openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin SystemConfiguration; nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with lib; { diff --git a/pkgs/development/libraries/sokol/default.nix b/pkgs/development/libraries/sokol/default.nix deleted file mode 100644 index b84f42490e33..000000000000 --- a/pkgs/development/libraries/sokol/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation { - pname = "sokol"; - version = "unstable-2023-08-04"; - - src = fetchFromGitHub { - owner = "floooh"; - repo = "sokol"; - rev = "47d92ff86298fc96b3b84d93d0ee8c8533d3a2d2"; - sha256 = "sha256-TsM5wK9a2ectrAY8VnrMPaxCNV3e1yW92SBBCHgs+0k="; - }; - - dontBuild = true; - dontConfigure = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/include/sokol - cp *.h $out/include/sokol/ - cp -R util $out/include/sokol/util - - runHook postInstall - ''; - - meta = with lib; { - description = "Minimal cross-platform standalone C headers"; - homepage = "https://github.com/floooh/sokol"; - license = licenses.zlib; - platforms = platforms.all; - maintainers = with maintainers; [ jonnybolton ]; - }; -} - diff --git a/pkgs/development/libraries/sol2/default.nix b/pkgs/development/libraries/sol2/default.nix deleted file mode 100644 index 5ec615942545..000000000000 --- a/pkgs/development/libraries/sol2/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchFromGitHub -, lib -, stdenv -, cmake -, lua -}: -stdenv.mkDerivation (finalAttrs: { - pname = "sol2"; - version = "3.3.1"; - src = fetchFromGitHub { - owner = "ThePhD"; - repo = "sol2"; - rev = "v${finalAttrs.version}"; - hash = "sha256-7QHZRudxq3hdsfEAYKKJydc4rv6lyN6UIt/2Zmaejx8="; - }; - - nativeBuildInputs = [ cmake lua ]; - - cmakeFlags = [ - "-DSOL2_LUA_VERSION=${lua.version}" - "-DSOL2_BUILD_LUA=FALSE" - ]; - - meta = with lib;{ - description = "Lua API wrapper with advanced features and top notch performance"; - longDescription = '' - sol2 is a C++ library binding to Lua. - It currently supports all Lua versions 5.1+ (LuaJIT 2.0+ and MoonJIT included). - sol2 aims to be easy to use and easy to add to a project. - The library is header-only for easy integration with projects, and a single header can be used for drag-and-drop start up. - ''; - homepage = "https://github.com/ThePhD/sol2"; - license = licenses.mit; - maintainers = with maintainers; [ mrcjkb ]; - }; -}) diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix deleted file mode 100644 index 4ab71b36a012..000000000000 --- a/pkgs/development/libraries/sonic/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fftw, installShellFiles }: - -stdenv.mkDerivation { - pname = "sonic-unstable"; - version = "2020-12-27"; - - src = fetchFromGitHub { - owner = "waywardgeek"; - repo = "sonic"; - rev = "4a052d9774387a9d9b4af627f6a74e1694419960"; - sha256 = "0ah54nizb6iwcx277w104wsfnx05vrp4sh56d2pfxhf8xghg54m6"; - }; - - makeFlags = [ "PREFIX=${placeholder "out"}" "CC=${stdenv.cc.targetPrefix}cc" ]; - - nativeBuildInputs = [ installShellFiles ]; - - buildInputs = [ fftw ]; - - postInstall = '' - installManPage sonic.1 - '' + lib.optionalString stdenv.isDarwin '' - install_name_tool -id $out/lib/libsonic.so.0.3.0 $out/lib/libsonic.so.0.3.0 - ''; - - meta = with lib; { - description = "Simple library to speed up or slow down speech"; - mainProgram = "sonic"; - homepage = "https://github.com/waywardgeek/sonic"; - license = licenses.asl20; - maintainers = with maintainers; [ aske ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/sonivox/default.nix b/pkgs/development/libraries/sonivox/default.nix deleted file mode 100644 index 3ad01725966c..000000000000 --- a/pkgs/development/libraries/sonivox/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "sonivox"; - version = "3.6.12"; - - src = fetchFromGitHub { - owner = "pedrolcl"; - repo = pname; - rev = "v${version}"; - hash = "sha256-df3EwscTF9n1fazz5Oa3FIXgWXHruhJBzMt8Y+ELP94="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - homepage = "https://github.com/pedrolcl/sonivox"; - description = "MIDI synthesizer library"; - license = licenses.asl20; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/development/libraries/sope/default.nix deleted file mode 100644 index 89372fca3f63..000000000000 --- a/pkgs/development/libraries/sope/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ gnustep, lib, fetchFromGitHub, fetchpatch, libxml2, openssl -, openldap, mariadb, libmysqlclient, postgresql }: - -gnustep.stdenv.mkDerivation rec { - pname = "sope"; - version = "5.9.0"; - - src = fetchFromGitHub { - owner = "inverse-inc"; - repo = pname; - rev = "SOPE-${version}"; - hash = "sha256-JZh8sC/w2MRy3UyWYGMvU47XtWKGnLuUlCsVyyxd7zg="; - }; - - patches = [ - (fetchpatch { # https://github.com/Alinto/sope/pull/66 - name = "sope-fix-gnustep-1.29.0+.patch"; - url = "https://github.com/Alinto/sope/pull/66/commits/9ec2744cc851b11886c3ebb723138e4d672bd5c7.patch"; - hash = "sha256-JgYRwjmjlitgzYz9Jfei5XJRThP1TunPjI0g5M2wZPA="; - }) - ]; - - nativeBuildInputs = [ gnustep.make ]; - buildInputs = [ gnustep.base libxml2 openssl ] - ++ lib.optional (openldap != null) openldap - ++ lib.optionals (mariadb != null) [ libmysqlclient mariadb ] - ++ lib.optional (postgresql != null) postgresql; - - # Configure directories where files are installed to. Everything is automatically - # put into $out (thanks GNUstep) apart from the makefiles location which is where - # makefiles are read from during build but also where the SOPE makefiles are - # installed to in the install phase. We move them over after the installation. - preConfigure = '' - mkdir -p /build/Makefiles - ln -s ${gnustep.make}/share/GNUstep/Makefiles/* /build/Makefiles - cat <<EOF > /build/GNUstep.conf - GNUSTEP_MAKEFILES=/build/Makefiles - EOF - ''; - - configureFlags = [ "--prefix=" "--disable-debug" "--enable-xml" "--with-ssl=ssl" ] - ++ lib.optional (openldap != null) "--enable-openldap" - ++ lib.optional (mariadb != null) "--enable-mysql" - ++ lib.optional (postgresql != null) "--enable-postgresql"; - - env = { - GNUSTEP_CONFIG_FILE = "/build/GNUstep.conf"; - NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; - }; - - # Move over the makefiles (see comment over preConfigure) - postInstall = '' - mkdir -p $out/share/GNUstep/Makefiles - find /build/Makefiles -mindepth 1 -maxdepth 1 -not -type l -exec cp -r '{}' $out/share/GNUstep/Makefiles \; - ''; - - meta = with lib; { - description = "Extensive set of frameworks which form a complete Web application server environment"; - license = licenses.publicDomain; - homepage = "https://github.com/inverse-inc/sope"; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix deleted file mode 100644 index f762fbc3931e..000000000000 --- a/pkgs/development/libraries/sord/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, doxygen -, fetchFromGitHub -, meson -, ninja -, pcre2 -, pkg-config -, python3 -, serd -, zix -}: - -stdenv.mkDerivation rec { - pname = "sord"; - version = "0.16.16"; - - src = fetchFromGitHub { - owner = "drobilla"; - repo = pname; - rev = "v${version}"; - hash = "sha256-GDs1m8KoEhJDdCf7kacQMZzCNPoZhESJds6KupQvOkU="; - }; - - outputs = [ "out" "dev" "doc" "man" ]; - - nativeBuildInputs = [ - doxygen - meson - ninja - pkg-config - python3 - ]; - buildInputs = [ pcre2 ]; - propagatedBuildInputs = [ serd zix ]; - - doCheck = true; - - meta = with lib; { - homepage = "http://drobilla.net/software/sord"; - description = "Lightweight C library for storing RDF data in memory"; - license = with licenses; [ bsd0 isc ]; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix deleted file mode 100644 index 606fda594d91..000000000000 --- a/pkgs/development/libraries/soundtouch/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, lib, fetchFromGitea, autoconf, automake, libtool }: - -stdenv.mkDerivation rec { - pname = "soundtouch"; - version = "2.3.3"; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "soundtouch"; - repo = "soundtouch"; - rev = version; - hash = "sha256-imeeTj+3gXxoGTuC/13+BAplwcnQ0wRJdSVt7MPlBxc="; - }; - - nativeBuildInputs = [ autoconf automake libtool ]; - - preConfigure = "./bootstrap"; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Program and library for changing the tempo, pitch and playback rate of audio"; - homepage = "https://www.surina.net/soundtouch/"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ orivej ]; - mainProgram = "soundstretch"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix deleted file mode 100644 index 021554c3a120..000000000000 --- a/pkgs/development/libraries/soxt/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ fetchhg, lib, stdenv, cmake, coin3d, motif, libXext, libXmu, libGLU, libGL }: - -stdenv.mkDerivation { - pname = "soxt"; - version = "unstable-2019-06-14"; - - src = fetchhg { - url = "https://bitbucket.org/Coin3D/soxt"; - rev = "85e135bb266fbb17e47fc336b876a576a239c15c"; - sha256 = "0vk5cgn53yqf7csqdnlnyyhi4mbgx4wlsq70613p5fgxlvxzhcym"; - fetchSubrepos = true; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ coin3d motif libGLU libGL libXext libXmu ]; - - meta = with lib; { - homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home"; - license = licenses.bsd3; - description = "GUI binding for using Open Inventor with Xt/Motif"; - maintainers = with maintainers; [ tmplt ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/span-lite/default.nix b/pkgs/development/libraries/span-lite/default.nix deleted file mode 100644 index d0a3cd15e7bb..000000000000 --- a/pkgs/development/libraries/span-lite/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "span-lite"; - version = "0.11.0"; - - src = fetchFromGitHub { - owner = "martinmoene"; - repo = "span-lite"; - rev = "v${version}"; - hash = "sha256-BYRSdGzIvrOjPXxeabMj4tPFmQ0wfq7y+zJf6BD/bTw="; - }; - - nativeBuildInputs = [ - cmake - ]; - - meta = { - description = "C++20-like span for C++98, C++11 and later in a single-file header-only library"; - homepage = "https://github.com/martinmoene/span-lite"; - license = lib.licenses.bsd1; - maintainers = with lib.maintainers; [ icewind1991 ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/sparrow3d/default.nix b/pkgs/development/libraries/sparrow3d/default.nix deleted file mode 100644 index a502b6249a16..000000000000 --- a/pkgs/development/libraries/sparrow3d/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ lib -, stdenv -, copyPkgconfigItems -, fetchFromGitHub -, makePkgconfigItem -, pkg-config -, SDL -, SDL_image -, SDL_mixer -, SDL_net -, SDL_ttf -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "sparrow3d"; - version = "unstable-2020-10-06"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "theZiz"; - repo = "sparrow3d"; - rev = "2033349d7adeba34bda2c442e1fec22377471134"; - hash = "sha256-28j5nbTYBrMN8BQ6XrTlO1D8Viw+RiT3MAl99BAbhR4="; - }; - - pkgconfigItems = [ - (makePkgconfigItem rec { - name = "sparrow3d"; - inherit (finalAttrs) version; - inherit (finalAttrs.meta) description; - - cflags = [ "-isystem${variables.includedir}" ]; - libs = [ - "-L${variables.libdir}" - "-lsparrow3d" - "-lsparrowNet" - "-lsparrowSound" - ]; - variables = rec { - prefix = "@dev@"; - exec_prefix = "@out@"; - includedir = "${prefix}/include"; - libdir = "${exec_prefix}/lib"; - }; - }) - ]; - - nativeBuildInputs = [ - copyPkgconfigItems - pkg-config - ]; - - propagatedBuildInputs = [ - SDL.dev - SDL_image - SDL_ttf - SDL_mixer - SDL_net - ]; - - postConfigure = '' - NIX_CFLAGS_COMPILE=$(pkg-config --cflags SDL_image SDL_ttf SDL_mixer SDL_net) - ''; - - buildFlags = [ "dynamic" ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - cp libsparrow{3d,Net,Sound}.so $out/lib - - mkdir -p $dev/include - cp sparrow*.h $dev/include - - runHook postInstall - ''; - - doCheck = true; - - checkPhase = '' - runHook preCheck - - make all_no_static - ./testfile.sh - - runHook postCheck - ''; - - meta = { - homepage = "https://github.com/theZiz/sparrow3d"; - description = "A software renderer for different open handhelds like the gp2x, wiz, caanoo and pandora"; - license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ colinsane ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/development/libraries/sparrow3d/sparrow3d.pc.in b/pkgs/development/libraries/sparrow3d/sparrow3d.pc.in deleted file mode 100644 index ac87c4ff278b..000000000000 --- a/pkgs/development/libraries/sparrow3d/sparrow3d.pc.in +++ /dev/null @@ -1,16 +0,0 @@ -prefix=@out@ -includedir=${prefix}/include -libdir=${prefix}/lib - -Name: sparrow3d -Description: a software renderer for different open handhelds like the gp2x, wiz, caanoo and pandora -URL: https://github.com/theZiz/sparrow3d -Version: @version@ -Requires: \ - sdl \ - SDL_image \ - SDL_ttf \ - SDL_mixer \ - SDL_net -Cflags: -isystem${includedir} -Libs: -L${libdir} -lsparrow3d -lsparrowNet -lsparrowSound diff --git a/pkgs/development/libraries/sparsehash/default.nix b/pkgs/development/libraries/sparsehash/default.nix deleted file mode 100644 index 813024623a1a..000000000000 --- a/pkgs/development/libraries/sparsehash/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "sparsehash"; - version = "2.0.4"; - - src = fetchFromGitHub { - owner = "sparsehash"; - repo = "sparsehash"; - rev = "sparsehash-${version}"; - sha256 = "1pf1cjvcjdmb9cd6gcazz64x0cd2ndpwh6ql2hqpypjv725xwxy7"; - }; - - meta = with lib; { - homepage = "https://github.com/sparsehash/sparsehash"; - description = "Extremely memory-efficient hash_map implementation"; - platforms = platforms.all; - license = licenses.bsd3; - maintainers = with maintainers; [ pSub ]; - }; -} diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix deleted file mode 100644 index abd87c03b1a8..000000000000 --- a/pkgs/development/libraries/spdk/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, ncurses -, python3 -, cunit -, dpdk -, fuse3 -, libaio -, libbsd -, libuuid -, numactl -, openssl -, pkg-config -, zlib -, zstd -, libpcap -, libnl -, elfutils -, jansson -, ensureNewerSourcesForZipFilesHook -}: - -stdenv.mkDerivation rec { - pname = "spdk"; - - version = "24.05"; - - src = fetchFromGitHub { - owner = "spdk"; - repo = "spdk"; - rev = "v${version}"; - hash = "sha256-kjZWaarvNSYXseJ/uH7Ak7DbWEgrLnAwXcL8byJ9fjU="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - python3 - python3.pkgs.pip - python3.pkgs.setuptools - python3.pkgs.wheel - python3.pkgs.wrapPython - pkg-config - ensureNewerSourcesForZipFilesHook - ]; - - buildInputs = [ - cunit - dpdk - fuse3 - jansson - libaio - libbsd - elfutils - libuuid - libpcap - libnl - numactl - openssl - ncurses - zlib - zstd - ]; - - propagatedBuildInputs = [ - python3.pkgs.configshell - ]; - - postPatch = '' - patchShebangs . - ''; - - enableParallelBuilding = true; - - configureFlags = [ - "--with-dpdk=${dpdk}" - ]; - - postCheck = '' - python3 -m spdk - ''; - - postFixup = '' - wrapPythonPrograms - ''; - - env.NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. - # otherwise does not find strncpy when compiling - env.NIX_LDFLAGS = "-lbsd"; - - meta = with lib; { - description = "Set of libraries for fast user-mode storage"; - homepage = "https://spdk.io/"; - license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ orivej ]; - }; -} diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix deleted file mode 100644 index 6aa91db83549..000000000000 --- a/pkgs/development/libraries/spdlog/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, fmt -, catch2_3 -, staticBuild ? stdenv.hostPlatform.isStatic - -# tests -, bear -, tiledb -}: - -stdenv.mkDerivation rec { - pname = "spdlog"; - version = "1.14.1"; - - src = fetchFromGitHub { - owner = "gabime"; - repo = "spdlog"; - rev = "v${version}"; - hash = "sha256-F7khXbMilbh5b+eKnzcB0fPPWQqUHqAYPWJb83OnUKQ="; - }; - - nativeBuildInputs = [ cmake ]; - # Required to build tests, even if they aren't executed - buildInputs = [ catch2_3 ]; - propagatedBuildInputs = [ fmt ]; - - cmakeFlags = [ - "-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}" - "-DSPDLOG_BUILD_STATIC=${if staticBuild then "ON" else "OFF"}" - "-DSPDLOG_BUILD_EXAMPLE=OFF" - "-DSPDLOG_BUILD_BENCH=OFF" - "-DSPDLOG_BUILD_TESTS=ON" - "-DSPDLOG_FMT_EXTERNAL=ON" - ]; - - outputs = [ "out" "doc" "dev" ] ; - - postInstall = '' - mkdir -p $out/share/doc/spdlog - cp -rv ../example $out/share/doc/spdlog - ''; - - doCheck = true; - - passthru.tests = { - inherit bear tiledb; - }; - - meta = with lib; { - description = "Very fast, header only, C++ logging library"; - homepage = "https://github.com/gabime/spdlog"; - license = licenses.mit; - maintainers = with maintainers; [ obadz ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/spectra/default.nix b/pkgs/development/libraries/spectra/default.nix deleted file mode 100644 index 4e4901d6c73d..000000000000 --- a/pkgs/development/libraries/spectra/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, eigen -}: - -stdenv.mkDerivation rec { - pname = "spectra"; - version = "1.0.1"; - - src = fetchFromGitHub { - owner = "yixuan"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-HaJmMo4jYmO/j53/nHrL3bvdQMAvp4Nuhhe8Yc7pL88="; - }; - - nativeBuildInputs = [ cmake ]; - - propagatedBuildInputs = [ eigen ]; - - meta = with lib; { - homepage = "https://spectralib.org/"; - description = "C++ library for large scale eigenvalue problems, built on top of Eigen"; - license = licenses.mpl20; - maintainers = with maintainers; [ vonfry ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index 8bee16fef753..1dbaa016cbbf 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices AudioUnit Cocoa diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix deleted file mode 100644 index b0472e1b004a..000000000000 --- a/pkgs/development/libraries/speechd/default.nix +++ /dev/null @@ -1,124 +0,0 @@ -{ stdenv -, lib -, substituteAll -, pkg-config -, fetchurl -, python3Packages -, gettext -, itstool -, libtool -, texinfo -, util-linux -, autoreconfHook -, glib -, dotconf -, libsndfile -, withLibao ? true, libao -, withPulse ? false, libpulseaudio -, withAlsa ? false, alsa-lib -, withOss ? false -, withFlite ? true, flite -, withEspeak ? true, espeak, sonic, pcaudiolib -, mbrola -, withPico ? true, svox -, libsOnly ? false -}: - -let - inherit (python3Packages) python pyxdg wrapPython; -in stdenv.mkDerivation rec { - pname = "speech-dispatcher"; - version = "0.11.5"; - - src = fetchurl { - url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-HOR1n/q7rxrrQzpewHOb4Gdum9+66URKezvhsq8+wSs="; - }; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - utillinux = util-linux; - }) - ] ++ lib.optionals (withEspeak && espeak.mbrolaSupport) [ - # Replace FHS paths. - (substituteAll { - src = ./fix-mbrola-paths.patch; - inherit espeak mbrola; - }) - ]; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - gettext - libtool - itstool - texinfo - wrapPython - ]; - - buildInputs = [ - glib - dotconf - libsndfile - libao - libpulseaudio - alsa-lib - python - ] ++ lib.optionals withEspeak [ - espeak - sonic - pcaudiolib - ] ++ lib.optionals withFlite [ - flite - ] ++ lib.optionals withPico [ - svox - ]; - - pythonPath = [ - pyxdg - ]; - - configureFlags = [ - # Audio method falls back from left to right. - "--with-default-audio-method=\"libao,pulse,alsa,oss\"" - "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" - ] ++ lib.optionals withPulse [ - "--with-pulse" - ] ++ lib.optionals withAlsa [ - "--with-alsa" - ] ++ lib.optionals withLibao [ - "--with-libao" - ] ++ lib.optionals withOss [ - "--with-oss" - ] ++ lib.optionals withEspeak [ - "--with-espeak-ng" - ] ++ lib.optionals withPico [ - "--with-pico" - ]; - - postPatch = '' - substituteInPlace src/modules/pico.c --replace "/usr/share/pico/lang" "${svox}/share/pico/lang" - ''; - - 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" + lib.optionalString libsOnly " - client libraries only"; - homepage = "https://devel.freebsoft.org/speechd"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ - berce - jtojnar - ]; - platforms = platforms.linux; - mainProgram = "speech-dispatcher"; - }; -} diff --git a/pkgs/development/libraries/speechd/fix-mbrola-paths.patch b/pkgs/development/libraries/speechd/fix-mbrola-paths.patch deleted file mode 100644 index ea16bea9bac5..000000000000 --- a/pkgs/development/libraries/speechd/fix-mbrola-paths.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/modules/espeak.c b/src/modules/espeak.c -index 94a01197..9bb34475 100644 ---- a/src/modules/espeak.c -+++ b/src/modules/espeak.c -@@ -898,13 +898,13 @@ static SPDVoice **espeak_list_synthesis_voices() - path = g_strdup_printf("%s/mbrola/%s", espeak_data, voicename); - if (access(path, O_RDONLY) != 0) { - g_free(path); -- path = g_strdup_printf("/usr/share/mbrola/%s", voicename); -+ path = g_strdup_printf("@mbrola@/share/mbrola/%s", voicename); - if (access(path, O_RDONLY) != 0) { - g_free(path); -- path = g_strdup_printf("/usr/share/mbrola/%s/%s", voicename, voicename); -+ path = g_strdup_printf("@mbrola@/share/mbrola/%s/%s", voicename, voicename); - if (access(path, O_RDONLY) != 0) { - g_free(path); -- path = g_strdup_printf("/usr/share/mbrola/voices/%s", voicename); -+ path = g_strdup_printf("@mbrola@/share/mbrola/voices/%s", voicename); - if (access(path, O_RDONLY) != 0) { - g_free(path); - espeak_mbrola[j] = NULL; diff --git a/pkgs/development/libraries/speechd/fix-paths.patch b/pkgs/development/libraries/speechd/fix-paths.patch deleted file mode 100644 index 7509c1842ba8..000000000000 --- a/pkgs/development/libraries/speechd/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/speech-dispatcherd.service.in b/speech-dispatcherd.service.in -index ab14b99d..12521b1b 100644 ---- a/speech-dispatcherd.service.in -+++ b/speech-dispatcherd.service.in -@@ -19,7 +19,7 @@ Description=Speech-Dispatcher, common interface to speech synthesizers - [Service] - Type=forking - ExecStart=@bindir@/speech-dispatcher -d -t 0 --ExecReload=/bin/kill -HUP $MAINPID -+ExecReload=@utillinux@/bin/kill -HUP $MAINPID - - [Install] - WantedBy=multi-user.target diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index 0f5e09cf83e5..e3452beab870 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals withFftw3 [ fftw ]; configureFlags = lib.optionals withFftw3 [ "--with-fft=gpl-fftw3" ] - ++ lib.optional stdenv.isAarch64 "--disable-neon"; + ++ lib.optional stdenv.hostPlatform.isAarch64 "--disable-neon"; meta = with lib; { homepage = "https://www.speex.org/"; diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix index 1d3f8b489f21..75634072b8ec 100644 --- a/pkgs/development/libraries/spglib/default.nix +++ b/pkgs/development/libraries/spglib/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gfortran gtest ]; - buildInputs = lib.optionals stdenv.isDarwin [ openmp ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ openmp ]; cmakeFlags = [ "-DSPGLIB_WITH_Fortran=On" ]; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix deleted file mode 100644 index fd7428213fc9..000000000000 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ /dev/null @@ -1,168 +0,0 @@ -{ lib -, stdenv -, fetchurl -, acl -, cyrus_sasl -, docbook_xsl -, libepoxy -, gettext -, gobject-introspection -, gst_all_1 -, gtk-doc -, gtk3 -, hwdata -, json-glib -, libcacard -, libcap_ng -, libdrm -, libjpeg_turbo -, libopus -, libsoup_3 -, libusb1 -, lz4 -, meson -, mesonEmulatorHook -, ninja -, openssl -, perl -, phodav -, pixman -, pkg-config -, polkit -, python3 -, spice-protocol -, usbredir -, vala -, wayland-protocols -, wayland-scanner -, zlib -, wrapGAppsHook3 -, withPolkit ? stdenv.isLinux -}: - -# If this package is built with polkit support (withPolkit=true), -# usb redirection requires spice-client-glib-usb-acl-helper to run setuid root. -# The helper confirms via polkit that the user has an active session, -# then adds a device acl entry for that user. -# Example NixOS config to create a setuid wrapper for the helper: -# security.wrappers.spice-client-glib-usb-acl-helper.source = -# "${pkgs.spice-gtk}/bin/spice-client-glib-usb-acl-helper"; -# On non-NixOS installations, make a setuid copy of the helper -# outside the store and adjust PATH to find the setuid version. - -# If this package is built without polkit support (withPolkit=false), -# usb redirection requires read-write access to usb devices. -# This can be granted by adding users to a custom group like "usb" -# and using a udev rule to put all usb devices in that group. -# Example NixOS config: -# users.groups.usb = {}; -# users.users.dummy.extraGroups = [ "usb" ]; -# services.udev.extraRules = '' -# KERNEL=="*", SUBSYSTEMS=="usb", MODE="0664", GROUP="usb" -# ''; - -stdenv.mkDerivation rec { - pname = "spice-gtk"; - version = "0.42"; - - outputs = [ "out" "dev" "devdoc" "man" ]; - - src = fetchurl { - url = "https://www.spice-space.org/download/gtk/${pname}-${version}.tar.xz"; - sha256 = "sha256-k4ARfxgRrR+qGBLLZgJHm2KQ1KDYzEQtREJ/f2wOelg="; - }; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - docbook_xsl - gettext - gobject-introspection - gtk-doc - meson - ninja - perl - pkg-config - python3 - python3.pkgs.pyparsing - python3.pkgs.six - vala - wrapGAppsHook3 - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - mesonEmulatorHook - ] ++ lib.optionals stdenv.isLinux [ - wayland-scanner - ]; - - buildInputs = [ - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - cyrus_sasl - libepoxy - gtk3 - json-glib - libcacard - libjpeg_turbo - libopus - libsoup_3 - libusb1 - lz4 - openssl - phodav - pixman - spice-protocol - usbredir - vala - zlib - ] ++ lib.optionals withPolkit [ - polkit - acl - ] ++ lib.optionals stdenv.isLinux [ - libcap_ng - libdrm - wayland-protocols - ]; - - PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; - - mesonFlags = [ - "-Dusb-acl-helper-dir=${placeholder "out"}/bin" - "-Dusb-ids-path=${hwdata}/share/hwdata/usb.ids" - ] ++ lib.optionals (!withPolkit) [ - "-Dpolkit=disabled" - ] ++ lib.optionals (!stdenv.isLinux) [ - "-Dlibcap-ng=disabled" - "-Degl=disabled" - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - "-Dcoroutine=gthread" # Fixes "Function missing:makecontext" - ]; - - postPatch = '' - # get rid of absolute path to helper in store so we can use a setuid wrapper - substituteInPlace src/usb-acl-helper.c \ - --replace 'ACL_HELPER_PATH"/' '"' - # don't try to setcap/suid in a nix builder - substituteInPlace src/meson.build \ - --replace "meson.add_install_script('../build-aux/setcap-or-suid'," \ - "# meson.add_install_script('../build-aux/setcap-or-suid'," - - patchShebangs subprojects/keycodemapdb/tools/keymap-gen - ''; - - meta = with lib; { - description = "GTK 3 SPICE widget"; - longDescription = '' - spice-gtk is a GTK 3 SPICE widget. It features glib-based - objects for SPICE protocol parsing and a gtk widget for embedding - the SPICE display into other applications such as virt-manager. - Python bindings are available too. - ''; - - homepage = "https://www.spice-space.org/"; - license = licenses.lgpl21; - maintainers = [ maintainers.xeji ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix deleted file mode 100644 index d7800859d057..000000000000 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, meson, ninja }: - -stdenv.mkDerivation rec { - pname = "spice-protocol"; - version = "0.14.4"; - - src = fetchurl { - url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-BP+6YQ2f1EHPxH36oTXXAJbmCxBG0hGdjbL46g0X2RI="; - }; - - nativeBuildInputs = [ meson ninja ]; - - postInstall = '' - mkdir -p $out/lib - ln -sv ../share/pkgconfig $out/lib/pkgconfig - ''; - - meta = with lib; { - description = "Protocol headers for the SPICE protocol"; - homepage = "https://www.spice-space.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ bluescreen303 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix deleted file mode 100644 index d7855cd5cea5..000000000000 --- a/pkgs/development/libraries/spice/default.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ lib, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, pixman -, alsa-lib -, openssl -, libXrandr -, libXfixes -, libXext -, libXrender -, libXinerama -, libjpeg -, zlib -, spice-protocol -, python3 -, glib -, cyrus_sasl -, libcacard -, lz4 -, libopus -, gst_all_1 -, orc -, gdk-pixbuf -}: - -stdenv.mkDerivation rec { - pname = "spice"; - version = "0.15.2"; - - src = fetchurl { - url = "https://www.spice-space.org/download/releases/spice-server/${pname}-${version}.tar.bz2"; - sha256 = "sha256-bZ62EX8DkXRxxLwQAEq+z/SKefuF64WhxF8CM3cBW4E="; - }; - - patches = [ - ./remove-rt-on-darwin.patch - ]; - - nativeBuildInputs = [ - glib - meson - ninja - pkg-config - python3 - python3.pkgs.six - python3.pkgs.pyparsing - ]; - - buildInputs = [ - cyrus_sasl - glib - gst_all_1.gst-plugins-base - libXext - libXfixes - libXinerama - libXrandr - libXrender - libcacard - libjpeg - libopus - lz4 - openssl - orc - pixman - python3.pkgs.pyparsing - spice-protocol - zlib - ] ++ lib.optionals stdenv.isLinux [ - alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ - gdk-pixbuf - ]; - - env.NIX_CFLAGS_COMPILE = "-fno-stack-protector"; - - mesonFlags = [ - "-Dgstreamer=1.0" - ]; - - postPatch = '' - patchShebangs build-aux - - # Forgotten in 0.15.2 tarball - sed -i /meson.add_dist_script/d meson.build - ''; - - postInstall = '' - ln -s spice-server $out/include/spice - ''; - - meta = with lib; { - description = "Complete open source solution for interaction with virtualized desktop devices"; - longDescription = '' - The Spice project aims to provide a complete open source solution for interaction - with virtualized desktop devices.The Spice project deals with both the virtualized - devices and the front-end. Interaction between front-end and back-end is done using - VD-Interfaces. The VD-Interfaces (VDI) enable both ends of the solution to be easily - utilized by a third-party component. - ''; - homepage = "https://www.spice-space.org/"; - license = licenses.lgpl21; - - maintainers = with maintainers; [ bluescreen303 atemu ]; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/pkgs/development/libraries/spice/remove-rt-on-darwin.patch b/pkgs/development/libraries/spice/remove-rt-on-darwin.patch deleted file mode 100644 index b3696d736af7..000000000000 --- a/pkgs/development/libraries/spice/remove-rt-on-darwin.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -103,11 +103,11 @@ - spice_server_deps += dependency(dep) - endforeach - --if host_machine.system() != 'windows' -+if (host_machine.system() != 'windows' and host_machine.system() != 'darwin') - foreach dep : ['rt', 'm'] - spice_server_deps += compiler.find_library(dep) - endforeach --else -+elif host_machine.system() == 'windows' - foreach dep : ['ws2_32', 'shlwapi'] - spice_server_deps += compiler.find_library(dep) - endforeach - -Diff finished. Sun Oct 16 06:09:35 2022 diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix deleted file mode 100644 index 8326a71041da..000000000000 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "spirv-headers"; - version = "1.3.290.0"; - - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "SPIRV-Headers"; - rev = "vulkan-sdk-${version}"; - hash = "sha256-c9ruBCnf9PNJz030bfRhHwyqju6T8YCRx+efKCEYgSo="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Machine-readable components of the Khronos SPIR-V Registry"; - homepage = "https://github.com/KhronosGroup/SPIRV-Headers"; - license = licenses.mit; - maintainers = [ maintainers.ralith ]; - }; -} diff --git a/pkgs/development/libraries/sptk/default.nix b/pkgs/development/libraries/sptk/default.nix deleted file mode 100644 index 07b9bf3eb3c9..000000000000 --- a/pkgs/development/libraries/sptk/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, cmake -, fetchFromGitHub -, fetchpatch -}: - -stdenv.mkDerivation rec { - pname = "sptk"; - version = "4.2"; - - src = fetchFromGitHub { - owner = "sp-nitech"; - repo = "SPTK"; - rev = "v${version}"; - hash = "sha256-lIyOcN2AR3ilUZ9stpicjbwlredbwgGPwmMICxZEijU="; - }; - - patches = [ - # Fix gcc-13 build failure: - # https://github.com/sp-nitech/SPTK/pull/57 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/sp-nitech/SPTK/commit/060bc2ad7a753c1f9f9114a70d4c4337b91cb7e0.patch"; - hash = "sha256-QfzpIS63LZyTHAaMGUZh974XLRNZLQG3om7ZJJ4RlgE="; - }) - ]; - - nativeBuildInputs = [ - cmake - ]; - - doCheck = true; - - meta = with lib; { - changelog = "https://github.com/sp-nitech/SPTK/releases/tag/v${version}"; - description = "Suite of speech signal processing tools"; - homepage = "https://github.com/sp-nitech/SPTK"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix deleted file mode 100644 index dff4e09fa7a7..000000000000 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, openssl -, tcl -, installShellFiles -, buildPackages -, readline -, ncurses -, zlib -, sqlite -}: - -stdenv.mkDerivation rec { - pname = "sqlcipher"; - version = "4.6.1"; - - src = fetchFromGitHub { - owner = "sqlcipher"; - repo = "sqlcipher"; - rev = "v${version}"; - hash = "sha256-VcD3NwVrC75kLOJiIgrnzVpkBPhjxTmEFyKg/87wHGc="; - }; - - nativeBuildInputs = [ - installShellFiles - tcl - ]; - - buildInputs = [ - readline - ncurses - openssl - zlib - ]; - - depsBuildBuild = [ - buildPackages.stdenv.cc - ]; - - configureFlags = [ - "--enable-threadsafe" - "--with-readline-inc=-I${lib.getDev readline}/include" - ]; - - CFLAGS = [ - # We want feature parity with sqlite - sqlite.NIX_CFLAGS_COMPILE - "-DSQLITE_HAS_CODEC" - ]; - - BUILD_CC = "$(CC_FOR_BUILD)"; - - TCLLIBDIR = "${placeholder "out"}/lib/tcl${lib.versions.majorMinor tcl.version}"; - - postInstall = '' - installManPage sqlcipher.1 - ''; - - meta = with lib; { - changelog = "https://github.com/sqlcipher/sqlcipher/blob/v${version}/CHANGELOG.md"; - description = "SQLite extension that provides 256 bit AES encryption of database files"; - mainProgram = "sqlcipher"; - homepage = "https://www.zetetic.net/sqlcipher/"; - license = licenses.bsd3; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index dd4e15ea566f..df28ee6cb39b 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchurl, zlib, readline, ncurses +{ lib, stdenv, fetchurl, unzip, zlib, readline, ncurses , updateAutotoolsGnuConfigScriptsHook # for tests -, python3Packages, sqldiff, sqlite-analyzer, tracker +, python3Packages, sqldiff, sqlite-analyzer, tinysparql # uses readline & ncurses for a better interactive experience if set to true , interactive ? false @@ -16,19 +16,23 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.46.0"; + version = "3.46.1"; # 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-b45qezNSc3SIFvmztiu9w3Koid6HgtfwSMZTpEdBen0="; + hash = "sha256-Z9P+bSaObq3crjcn/OWPzI6cU4ab3Qegxh443fKWUHE="; + }; + docsrc = fetchurl { + url = "https://sqlite.org/2024/sqlite-doc-${archiveVersion version}.zip"; + hash = "sha256-6WkTH5PKefvGTVdyShA1c1iBVVpSYA2+acaeq3LJ/NE="; }; - outputs = [ "bin" "dev" "out" ]; - separateDebugInfo = stdenv.isLinux; + outputs = [ "bin" "dev" "man" "doc" "out" ]; + separateDebugInfo = stdenv.hostPlatform.isLinux; - nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook unzip ]; buildInputs = [ zlib ] ++ lib.optionals interactive [ readline ncurses ]; # required for aarch64 but applied for all arches for simplicity @@ -82,6 +86,10 @@ stdenv.mkDerivation rec { postInstall = '' # Do not contaminate dependent libtool-based projects with sqlite dependencies. sed -i $out/lib/libsqlite3.la -e "s/dependency_libs=.*/dependency_libs='''/" + + mkdir -p $doc/share/doc + unzip $docsrc + mv sqlite-doc-${archiveVersion version} $doc/share/doc/sqlite ''; doCheck = false; # fails to link against tcl @@ -89,7 +97,7 @@ stdenv.mkDerivation rec { passthru = { tests = { inherit (python3Packages) sqlalchemy; - inherit sqldiff sqlite-analyzer tracker; + inherit sqldiff sqlite-analyzer tinysparql; }; updateScript = gitUpdater { diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 2b843c0b22e0..863a1f668c32 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,16 +4,16 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.46.0"; + version = "3.46.1"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2024/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-BwNiEJvraJn2V5dXG5i4gkyPQ39bKSb4juBo2Y7zaOw="; + hash = "sha256-3vP8KS657MRE9sGVDlx52EYu1eez1gX9YVLRReHVq7Q="; }; nativeBuildInputs = [ unzip ]; - buildInputs = [ tcl ] ++ lib.optional stdenv.isDarwin Foundation; + buildInputs = [ tcl ] ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; makeFlags = [ makeTarget ]; diff --git a/pkgs/development/libraries/sqlitecpp/default.nix b/pkgs/development/libraries/sqlitecpp/default.nix deleted file mode 100644 index a48e9a4ac87a..000000000000 --- a/pkgs/development/libraries/sqlitecpp/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, sqlite -, gtest -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "sqlitecpp"; - version = "3.3.2"; - - src = fetchFromGitHub { - owner = "SRombauts"; - repo = "sqlitecpp"; - rev = finalAttrs.version; - sha256 = "sha256-rsVFk4FsonrwpBd3TonkxilwWeOBocH8AyeB+71OBdI="; - }; - - nativeBuildInputs = [ - cmake - ]; - buildInputs = [ - sqlite - gtest - ]; - doCheck = true; - - cmakeFlags = [ - "-DSQLITECPP_INTERNAL_SQLITE=OFF" - "-DSQLITECPP_BUILD_TESTS=ON" - ]; - - meta = with lib; { - homepage = "https://srombauts.github.io/SQLiteCpp/"; - description = "C++ SQLite3 wrapper"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = [ maintainers.jbedo maintainers.doronbehar ]; - }; -}) diff --git a/pkgs/development/libraries/sregex/default.nix b/pkgs/development/libraries/sregex/default.nix deleted file mode 100644 index 58ef91c31908..000000000000 --- a/pkgs/development/libraries/sregex/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "sregex"; - version = "0.0.1"; - - src = fetchFromGitHub { - owner = "openresty"; - repo = pname; - rev = "v${version}"; - hash = "sha256-HZ9O/3BQHHrTVLLlU0o1fLHxyRSesBhreT3IdGHnNsg="; - }; - - makeFlags = [ "PREFIX=$(out)" "CC:=$(CC)" ]; - - meta = with lib; { - homepage = "https://github.com/openresty/sregex"; - description = "Non-backtracking NFA/DFA-based Perl-compatible regex engine matching on large data streams"; - mainProgram = "sregex-cli"; - license = licenses.bsd3; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix deleted file mode 100644 index be81970413b8..000000000000 --- a/pkgs/development/libraries/srt/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, openssl -, windows -}: - -stdenv.mkDerivation rec { - pname = "srt"; - version = "1.5.3"; - - src = fetchFromGitHub { - owner = "Haivision"; - repo = "srt"; - rev = "v${version}"; - sha256 = "sha256-HmfbBPyR+z5d9/XBvNhosk8pSSPToNtM+V0hEyb2G2w="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ - windows.mingw_w64_pthreads - ]; - - patches = lib.optionals stdenv.hostPlatform.isMinGW [ - ./no-msvc-compat-headers.patch - ]; - - cmakeFlags = [ - # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly - # (setting it to an absolute path causes include files to go to $out/$out/include, - # because the absolute path is interpreted with root at $out). - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DENABLE_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - # TODO Remove this when https://github.com/Haivision/srt/issues/538 is fixed and available to nixpkgs - # Workaround for the fact that srt incorrectly disables GNUInstallDirs when LIBDIR is specified, - # see https://github.com/NixOS/nixpkgs/pull/54463#discussion_r249878330 - "-UCMAKE_INSTALL_LIBDIR" - ]; - - meta = with lib; { - description = "Secure, Reliable, Transport"; - homepage = "https://github.com/Haivision/srt"; - license = licenses.mpl20; - maintainers = with maintainers; [ nh2 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/srt/no-msvc-compat-headers.patch b/pkgs/development/libraries/srt/no-msvc-compat-headers.patch deleted file mode 100644 index ffededc7d54e..000000000000 --- a/pkgs/development/libraries/srt/no-msvc-compat-headers.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- srt-1.3.2/common/filelist_win32.maf.orig 2018-06-15 21:44:11.000000000 +0200 -+++ srt-1.3.2/common/filelist_win32.maf 2018-09-25 20:26:36.903688700 +0200 -@@ -4,7 +4,6 @@ - # - # These are included by platform_sys.h header contained in ../srtcore/filelist.maf - # --win/unistd.h - - SOURCES - win_time.cpp diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix deleted file mode 100644 index a124a3d600ca..000000000000 --- a/pkgs/development/libraries/srtp/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, libpcap -, meson -, ninja -, openssl -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "libsrtp"; - version = "2.6.0"; - - src = fetchFromGitHub { - owner = "cisco"; - repo = "libsrtp"; - rev = "v${version}"; - sha256 = "sha256-vWL5bksKT5NUoNkIRiJ2FeGODQthD8SgXjCaA7SeTe4="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - libpcap - openssl - ]; - - # rtpw tests hang - preConfigure = '' - rm test/rtpw_test.sh \ - test/rtpw_test_gcm.sh - ''; - - mesonFlags = [ - "-Dcrypto-library=openssl" - "-Dcrypto-library-kdf=disabled" - "-Ddoc=disabled" - "-Dtests=${if doCheck then "enabled" else "disabled"}" - ]; - - doCheck = true; - - meta = with lib; { - homepage = "https://github.com/cisco/libsrtp"; - description = "Secure RTP (SRTP) Reference Implementation"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ r-burns ]; - }; -} diff --git a/pkgs/development/libraries/stargate-libcds/Makefile.patch b/pkgs/development/libraries/stargate-libcds/Makefile.patch deleted file mode 100644 index b5b116b78bec..000000000000 --- a/pkgs/development/libraries/stargate-libcds/Makefile.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/Makefile b/Makefile -index 872af46..7eba8a1 100644 ---- a/Makefile -+++ b/Makefile -@@ -156,13 +156,7 @@ test: - # Compile and run the test suite through Valgrind to check for - # memory errors, then generate an HTML code coverage report - # using gcovr -- $(CC) $(CC_ARGS) -O0 $(DEBUG_FLAGS) $(PLAT_FLAGS) $(GCOVARGS) \ -+ $(CC) $(CC_ARGS) -O0 $(DEBUG_FLAGS) $(PLAT_FLAGS) \ - $(shell find src tests -name *.c) \ - -Iinclude \ - -o $(NAME).tests -- # If Valgrind exits non-zero, try running 'gdb ./libcds.tests' -- # to debug the test suite -- valgrind ./$(NAME).tests --track-origins=yes --leak-check=full -- mkdir html || rm -rf html/* -- gcovr -r . --exclude=bench --html --html-details -o html/coverage.html -- $(BROWSER) html/coverage.html & diff --git a/pkgs/development/libraries/stargate-libcds/default.nix b/pkgs/development/libraries/stargate-libcds/default.nix deleted file mode 100644 index b74f19e1959a..000000000000 --- a/pkgs/development/libraries/stargate-libcds/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, stdenv -, fetchpatch -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "stargate-libcds"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "stargateaudio"; - repo = "libcds"; - rev = version; - sha256 = "sha256-THThEzS8gGdwn3h0EBttaX5ljZH9Ma2Rcg143+GIdU8="; - }; - - # Fix 'error: unrecognized command line option' in platforms other than x86 - PLAT_FLAGS = lib.optionalString stdenv.isx86_64 "-mfpmath=sse -mssse3"; - - patches = [ - # Remove unnecessary tests (valgrind, coverage) - ./Makefile.patch - - # Fix for building on darwin - (fetchpatch { - name = "malloc-to-stdlib.patch"; - url = "https://github.com/stargateaudio/libcds/commit/65dc08f059deda8ba5707ba6116b616d0ad0bd8d.patch"; - sha256 = "sha256-FIGlobUVrDYOtnHjsWyE420PoULPHEK/3T9Fv8hfTl4="; - }) - ]; - - doCheck = true; - - installPhase = '' - runHook preInstall - install -D libcds.so -t $out/lib/ - runHook postInstall - ''; - - meta = with lib; { - description = "C data structure library"; - homepage = "https://github.com/stargateaudio/libcds"; - maintainers = with maintainers; [ yuu ]; - license = licenses.lgpl3Only; - }; -} diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix deleted file mode 100644 index bf84345be2d1..000000000000 --- a/pkgs/development/libraries/startup-notification/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{lib, stdenv, fetchurl, libX11, libxcb, pkg-config, xcbutil}: - -stdenv.mkDerivation rec { - pname = "libstartup-notification"; - version = "0.12"; - src = fetchurl { - url = "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz"; - sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; - }; - - configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "lf_cv_sane_realloc=yes" - ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libxcb xcbutil ]; - - meta = { - homepage = "https://www.freedesktop.org/software/startup-notification"; - description = "Application startup notification and feedback library"; - license = lib.licenses.lgpl2; - }; -} diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix deleted file mode 100644 index 5e3cc62ea41b..000000000000 --- a/pkgs/development/libraries/stb/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, copyPkgconfigItems, makePkgconfigItem }: - -stdenv.mkDerivation rec { - pname = "stb"; - version = "unstable-2023-01-29"; - - src = fetchFromGitHub { - owner = "nothings"; - repo = "stb"; - rev = "5736b15f7ea0ffb08dd38af21067c314d6a3aae9"; - hash = "sha256-s2ASdlT3bBNrqvwfhhN6skjbmyEnUgvNOrvhgUSRj98="; - }; - - nativeBuildInputs = [ copyPkgconfigItems ]; - - pkgconfigItems = [ - (makePkgconfigItem rec { - name = "stb"; - version = "1"; - cflags = [ "-I${variables.includedir}/stb" ]; - variables = rec { - prefix = "${placeholder "out"}"; - includedir = "${prefix}/include"; - }; - inherit (meta) description; - }) - ]; - - dontBuild = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/include/stb - cp *.h $out/include/stb/ - runHook postInstall - ''; - - meta = with lib; { - description = "Single-file public domain libraries for C/C++"; - homepage = "https://github.com/nothings/stb"; - license = licenses.publicDomain; - platforms = platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix deleted file mode 100644 index b79020e3ba71..000000000000 --- a/pkgs/development/libraries/stfl/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv, fetchurl, ncurses, libiconv }: - -stdenv.mkDerivation rec { - pname = "stfl"; - version = "0.24"; - - src = fetchurl { - url = "http://www.clifford.at/stfl/stfl-${version}.tar.gz"; - sha256 = "1460d5lc780p3q38l3wc9jfr2a7zlyrcra0li65aynj738cam9yl"; - }; - - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - - buildInputs = [ ncurses libiconv ]; - - # Silence warnings related to use of implicitly declared library functions and implicit ints. - # TODO: Remove and/or fix with patches the next time this package is updated. - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=implicit-function-declaration" - "-Wno-error=implicit-int" - ]; - }; - - preBuild = '' - sed -i s/gcc/cc/g Makefile - sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h - '' + lib.optionalString stdenv.isDarwin '' - sed -i s/-soname/-install_name/ Makefile - '' - # upstream builds shared library unconditionally. Also, it has no - # support for cross-compilation. - + lib.optionalString stdenv.hostPlatform.isStatic '' - sed -i 's/all:.*/all: libstfl.a stfl.pc/' Makefile - sed -i 's/\tar /\t${stdenv.cc.targetPrefix}ar /' Makefile - sed -i 's/\tranlib /\t${stdenv.cc.targetPrefix}ranlib /' Makefile - sed -i '/install -m 644 libstfl.so./d' Makefile - sed -i '/ln -fs libstfl.so./d' Makefile - '' ; - - installPhase = '' - DESTDIR=$out prefix=\"\" make install - '' - # some programs rely on libstfl.so.0 to be present, so link it - + lib.optionalString (!stdenv.hostPlatform.isStatic) '' - ln -s $out/lib/libstfl.so.0.24 $out/lib/libstfl.so.0 - ''; - - meta = { - homepage = "http://www.clifford.at/stfl/"; - description = "Library which implements a curses-based widget set for text terminals"; - maintainers = with lib.maintainers; [ lovek323 ]; - license = lib.licenses.lgpl3; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix deleted file mode 100644 index 5d58212d70c6..000000000000 --- a/pkgs/development/libraries/stxxl/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, parallelSupport ? (!stdenv.isDarwin) -}: - -let - mkFlag = optset: flag: if optset then "-D${flag}=ON" else "-D${flag}=OFF"; -in - -stdenv.mkDerivation rec { - pname = "stxxl"; - version = "1.4.1"; - - src = fetchFromGitHub { - owner = "stxxl"; - repo = "stxxl"; - rev = version; - sha256 = "sha256-U6DQ5mI83pyTmq5/ga5rI8v0h2/iEnNl8mxhIOpbF1I="; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_STATIC_LIBS=OFF" - (mkFlag parallelSupport "USE_GNU_PARALLEL") - (mkFlag parallelSupport "USE_OPENMP") - ]; - - passthru = { - inherit parallelSupport; - }; - - meta = with lib; { - 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 = [ ]; - mainProgram = "stxxl_tool"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix deleted file mode 100644 index 188759fc4e7e..000000000000 --- a/pkgs/development/libraries/subunit/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, check, cppunit, perl, python3Packages }: - -# NOTE: for subunit python library see pkgs/top-level/python-packages.nix - -stdenv.mkDerivation rec { - pname = "subunit"; - version = "1.4.2"; - - src = fetchurl { - url = "https://launchpad.net/subunit/trunk/${version}/+download/${pname}-${version}.tar.gz"; - hash = "sha256-hlOOv6kIC97w7ICVsuXeWrsUbVu3tCSzEVKUHXYG2dI="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ check cppunit perl python3Packages.wrapPython ]; - - propagatedBuildInputs = with python3Packages; [ testtools testscenarios ]; - - postFixup = "wrapPythonPrograms"; - - meta = with lib; { - description = "Streaming protocol for test results"; - mainProgram = "subunit-diff"; - homepage = "https://launchpad.net/subunit"; - license = licenses.asl20; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/development/libraries/svrcore/default.nix deleted file mode 100644 index fbc17a5e7b21..000000000000 --- a/pkgs/development/libraries/svrcore/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, nss, nspr }: - -stdenv.mkDerivation rec { - pname = "svrcore"; - version = "4.0.4"; - - src = fetchurl { - url = "mirror://mozilla/directory/svrcore/releases/${version}/src/${pname}-${version}.tar.bz2"; - sha256 = "0n3alg6bxml8952fb6h0bi0l29farvq21q6k20gy2ba90m3znwj7"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ nss nspr ]; - - meta = with lib; { - description = "Secure PIN handling using NSS crypto"; - license = licenses.mpl11; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/swiften/build-fix.patch b/pkgs/development/libraries/swiften/build-fix.patch deleted file mode 100644 index d0ce099973c2..000000000000 --- a/pkgs/development/libraries/swiften/build-fix.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -wbBur swift-4.0.2/Swift/QtUI/UserSearch/QtUserSearchWindow.h swift-4.0.2.my/Swift/QtUI/UserSearch/QtUserSearchWindow.h ---- swift-4.0.2/Swift/QtUI/UserSearch/QtUserSearchWindow.h 2018-04-06 13:06:46.000000000 +0300 -+++ swift-4.0.2.my/Swift/QtUI/UserSearch/QtUserSearchWindow.h 2019-10-08 20:52:23.171475337 +0300 -@@ -9,6 +9,7 @@ - #include <set> - - #include <QWizard> -+#include <QAbstractItemModel> - - #include <Swiften/Base/Override.h> - -diff -wbBur swift-4.0.2/Swiften/Network/PlatformNATTraversalWorker.cpp swift-4.0.2.my/Swiften/Network/PlatformNATTraversalWorker.cpp ---- swift-4.0.2/Swiften/Network/PlatformNATTraversalWorker.cpp 2018-04-06 13:06:46.000000000 +0300 -+++ swift-4.0.2.my/Swiften/Network/PlatformNATTraversalWorker.cpp 2019-10-08 21:12:25.284754131 +0300 -@@ -157,7 +157,7 @@ - miniUPnPInterface = new MiniUPnPInterface(); - miniUPnPSupported = miniUPnPInterface->isAvailable(); - } -- SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported << std::endl; -+// SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported << std::endl; - if (miniUPnPSupported) { - return miniUPnPInterface; - } -@@ -168,7 +168,7 @@ - natPMPInterface = new NATPMPInterface(); - natPMPSupported = natPMPInterface->isAvailable(); - } -- SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << natPMPSupported << std::endl; -+// SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << natPMPSupported << std::endl; - if (natPMPSupported) { - return natPMPInterface; - } ---- a/Swift/Controllers/ShowProfileController.h -+++ b/Swift/Controllers/ShowProfileController.h -@@ -12,6 +12,7 @@ - - #pragma once - -+#include <map> - #include <Swiften/Elements/ErrorPayload.h> - #include <Swiften/Elements/VCard.h> - #include <Swiften/JID/JID.h> diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix deleted file mode 100644 index fffe96dbf5c1..000000000000 --- a/pkgs/development/libraries/swiften/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ stdenv -, lib -, libidn -, lua -, miniupnpc -, expat -, zlib -, fetchurl -, fetchpatch -, openssl -, boost -, scons -}: - -stdenv.mkDerivation rec { - pname = "swiften"; - version = "4.0.3"; - - src = fetchurl { - url = "http://swift.im/git/swift/snapshot/swift-${version}.tar.bz2"; - hash = "sha256-aj+T6AevtR8birbsj+83nfzFC6cf72q+7nwSM0jaZrA="; - }; - - patches = [ - ./scons.patch - ./build-fix.patch - - # Fix build with latest boost - # https://swift.im/git/swift/commit/Swiften/Base/Platform.h?id=3666cbbe30e4d4e25401a5902ae359bc2c24248b - (fetchpatch { - name = "3666cbbe30e4d4e25401a5902ae359bc2c24248b.patch"; - url = "https://swift.im/git/swift/patch/Swiften/Base/Platform.h?id=3666cbbe30e4d4e25401a5902ae359bc2c24248b"; - sha256 = "Wh8Nnfm0/EppSJ7aH2vTNObHtodE5tM19kV1oDfm70w="; - }) - ]; - - nativeBuildInputs = [ - scons - ]; - - buildInputs = [ - libidn - lua - miniupnpc - expat - zlib - ]; - - propagatedBuildInputs = [ - openssl - boost - ]; - - sconsFlags = [ - "openssl=${openssl.dev}" - "boost_includedir=${boost.dev}/include" - "boost_libdir=${boost.out}/lib" - "boost_bundled_enable=false" - "max_jobs=1" - "optimize=1" - "debug=0" - "swiften_dll=1" - ]; - - postPatch = '' - # Ensure bundled dependencies cannot be used. - rm -rf 3rdParty - - find . \( \ - -name '*.py' -o -name SConscript -o -name SConstruct \ - \) -exec 2to3 -w {} + - ''; - - installTargets = "${placeholder "out"}"; - - installFlags = [ - "SWIFTEN_INSTALLDIR=${placeholder "out"}" - ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "XMPP library for C++, used by the Swift client"; - mainProgram = "swiften-config"; - homepage = "http://swift.im/swiften.html"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.twey ]; - }; -} diff --git a/pkgs/development/libraries/swiften/scons.patch b/pkgs/development/libraries/swiften/scons.patch deleted file mode 100644 index d956767696d0..000000000000 --- a/pkgs/development/libraries/swiften/scons.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/BuildTools/SCons/SConscript.boot -+++ b/BuildTools/SCons/SConscript.boot -@@ -129,5 +129 @@ vars.Add(PathVariable("sparkle_public_dsa_key", "Optional path to a public DSA k --env_ENV = { -- 'PATH' : os.environ['PATH'], -- 'LD_LIBRARY_PATH' : os.environ.get("LD_LIBRARY_PATH", ""), -- 'TERM' : os.environ.get("TERM", ""), --} -+env_ENV = os.environ diff --git a/pkgs/development/libraries/swiftshader/default.nix b/pkgs/development/libraries/swiftshader/default.nix deleted file mode 100644 index 624d239fa35c..000000000000 --- a/pkgs/development/libraries/swiftshader/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchgit, python3, cmake, jq }: - -stdenv.mkDerivation rec { - pname = "swiftshader"; - version = "2023-09-11"; - - src = fetchgit { - url = "https://swiftshader.googlesource.com/SwiftShader"; - rev = "4e40d502c440cc59b25fa3a5fee0eadbab7442aa"; - hash = "sha256-YtbTaOkFhVMKdu3jiRHQsPmoEu3KDzIQXLZ5HFBSmWI="; - # Remove 1GB of test files to get under Hydra output limit - postFetch = '' - rm -r $out/third_party/llvm-project/llvm/test - rm -r $out/third_party/json/test - rm -r $out/third_party/cppdap/third_party/json/test - rm -r $out/third_party/llvm-project/clang/test - ''; - }; - - nativeBuildInputs = [ cmake python3 jq ]; - - # Make sure we include the drivers and icd files in the output as the cmake - # generated install command only puts in the spirv-tools stuff. - installPhase = '' - runHook preInstall - - # - # Vulkan driver - # - vk_so_path="$out/lib/libvk_swiftshader.so" - mkdir -p "$(dirname "$vk_so_path")" - mv Linux/libvk_swiftshader.so "$vk_so_path" - - vk_icd_json="$out/share/vulkan/icd.d/vk_swiftshader_icd.json" - mkdir -p "$(dirname "$vk_icd_json")" - jq ".ICD.library_path = \"$vk_so_path\"" <Linux/vk_swiftshader_icd.json >"$vk_icd_json" - - runHook postInstall - ''; - - meta = with lib; { - description = - "A high-performance CPU-based implementation of the Vulkan 1.3 graphics API"; - homepage = "https://opensource.google/projects/swiftshader"; - license = licenses.asl20; - # Should be possible to support Darwin by changing the install phase with - # 's/Linux/Darwin/' and 's/so/dylib/' or something similar. - platforms = with platforms; linux; - maintainers = with maintainers; [ expipiplus1 ]; - }; -} diff --git a/pkgs/development/libraries/sycl-info/default.nix b/pkgs/development/libraries/sycl-info/default.nix deleted file mode 100644 index e0c4296cb277..000000000000 --- a/pkgs/development/libraries/sycl-info/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, ninja -, ocl-icd -, opencl-headers -, lyra -, nlohmann_json -, ronn -, doctest -}: - -stdenv.mkDerivation rec { - pname = "sycl-info"; - version = "unstable-2019-11-19"; - - src = fetchFromGitHub { - owner = "codeplaysoftware"; - repo = "sycl-info"; - rev = "b47d498ee2d6b77ec21972de5882e8e12efecd6c"; - sha256 = "0fy0y1rcfb11p3vijd8wym6xkaicav49pv2bv2l18rma929n1m1m"; - }; - - buildInputs = [ - nlohmann_json - ronn - opencl-headers - ocl-icd - doctest - lyra - ]; - - nativeBuildInputs = [ - cmake - ninja - ]; - - cmakeFlags = [ - "-DBUILD_TESTING=ON" - "-DBUILD_DOCS=ON" - "-DBUILD_SHARED_LIBS=ON" - "-DLYRA_INCLUDE_DIRS=${lib.getDev lyra}/include" - ]; - - # Required for ronn to compile the manpage. - RUBYOPT = "-KU -E utf-8:utf-8"; - - meta = with lib; - { - homepage = "https://github.com/codeplaysoftware/sycl-info"; - description = "Tool to show information about available SYCL implementations"; - mainProgram = "sycl-info"; - platforms = platforms.linux; - license = licenses.asl20; - maintainers = with maintainers; [ davidtwco ]; - }; -} diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix deleted file mode 100644 index 25043bbb0265..000000000000 --- a/pkgs/development/libraries/symengine/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gmp -, flint -, mpfr -, libmpc -, withShared ? true -}: - -stdenv.mkDerivation rec { - pname = "symengine"; - version = "0.12.0"; - - src = fetchFromGitHub { - owner = "symengine"; - repo = "symengine"; - rev = "v${version}"; - hash = "sha256-SfifujR2VM1OlPN0ZRUC3hWImXO/8PuiyrBdpyNoKW4="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ gmp flint mpfr libmpc ]; - - cmakeFlags = [ - "-DWITH_FLINT=ON" - "-DINTEGER_CLASS=flint" - "-DWITH_SYMENGINE_THREAD_SAFE=yes" - "-DWITH_MPC=yes" - "-DBUILD_FOR_DISTRIBUTION=yes" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - # error: unrecognized instruction mnemonic, did you mean: bit, cnt, hint, ins, not? - "-DBUILD_TESTS=OFF" - ] ++ lib.optionals withShared [ - "-DBUILD_SHARED_LIBS=ON" - ]; - - doCheck = true; - - meta = with lib; { - description = "Fast symbolic manipulation library"; - homepage = "https://github.com/symengine/symengine"; - platforms = platforms.unix ++ platforms.windows; - license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; - }; - -} diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix deleted file mode 100644 index f6d0c619c770..000000000000 --- a/pkgs/development/libraries/szip/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "szip"; - version = "2.1.1"; - src = fetchurl { - url = "https://support.hdfgroup.org/ftp/lib-external/szip/${version}/src/szip-${version}.tar.gz"; - sha256 = "04nlhkzzf1gihvrfbzc6rq4kc13p92ly39dzrb4y4jrd9y5rbvi1"; - }; - - meta = { - description = "Compression library that can be used with the hdf5 library"; - homepage = "https://www.hdfgroup.org/doc_resource/SZIP/"; - license = lib.licenses.unfree; - }; -} diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix deleted file mode 100644 index 16112f32b1e2..000000000000 --- a/pkgs/development/libraries/t1lib/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, libX11, libXaw }: - -let - getPatch = { name, sha256 }: fetchpatch { - inherit name sha256; - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/${name}" - + "?h=packages/t1lib&id=643a4c2c58e70072b5bc1e9e4624162517b58357"; - }; - - patches = map getPatch [ - { name = "lib-cleanup.diff"; sha256 = "1w3q1y4zk0y4mf2s2x9z4cd8d4af8i868c8837p40mz3dqrai4zp"; } - { name = "format-security.diff"; sha256 = "0cca94bif9dsc6iwpcnk1504gb3sl3nsqhni85c21q9aywyz26l3"; } - { name = "CVE-2011-0764.diff"; sha256 = "1j0y3f38im7srpqjg9jvx8as6sxkz8gw7hglcxnxl9qylx8mr2jh"; } - { name = "CVE-2011-1552_1553_1554.patch"; sha256 = "16cyq6jhyhh8912j8hapx9pq4rzxk36ljlkxlnyi7i3wr8iz1dir"; } - { name = "CVE-2010-2642.patch"; sha256 = "175zvyr9v1xs22k2svgxqjcpz5nihfa7j46hn9nzvkqcrhm5m9y8"; } - # this ^ also fixes CVE-2011-5244 - ]; -in -stdenv.mkDerivation rec { - pname = "t1lib"; - version = "5.1.2"; - - src = fetchurl { - url = "mirror://ibiblioPubLinux/libs/graphics/${pname}-${version}.tar.gz"; - hash = "sha256-ghMotQVPeJCg0M0vUoJScHBd82QdvUdtWNF+Vu2Ve1k="; - }; - inherit patches; - - buildInputs = [ libX11 libXaw ]; - buildFlags = [ "without_doc" ]; - - postInstall = lib.optionalString (!stdenv.isDarwin) '' - # ?? - chmod +x $out/lib/*.so.* - ''; - - meta = with lib; { - homepage = "http://www.t1lib.org/"; - description = "Type 1 font rasterizer library for UNIX/X11"; - license = with licenses; [ gpl2 lgpl2 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/ta-lib/default.nix b/pkgs/development/libraries/ta-lib/default.nix deleted file mode 100644 index c3f77a9a247a..000000000000 --- a/pkgs/development/libraries/ta-lib/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: - -stdenv.mkDerivation rec { - pname = "ta-lib"; - version = "0.4.0"; - src = fetchFromGitHub { - owner = "rafa-dot-el"; - repo = "talib"; - rev = version; - sha256 = "sha256-bIzN8f9ZiOLaVzGAXcZUHUh/v9z1U+zY+MnyjJr1lSw="; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - hardeningDisable = [ "format" ]; - - meta = with lib; { - description = - "TA-Lib is a library that provides common functions for the technical analysis of financial market data."; - mainProgram = "ta-lib-config"; - homepage = "https://ta-lib.org/"; - license = lib.licenses.bsd3; - - platforms = platforms.linux; - maintainers = with maintainers; [ rafael ]; - }; -} diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 0446d2cac6e7..9520f9a8404e 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz"; sha256 = "sha256-CSA8ECMRFJ9d9cw2dAn5bHJXQmZtGcJNtbqZTVqBpvU="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Carbon ] ++ lib.optionals withJpegSupport [ libjpeg diff --git a/pkgs/development/libraries/taco/default.nix b/pkgs/development/libraries/taco/default.nix deleted file mode 100644 index 693b5f25f990..000000000000 --- a/pkgs/development/libraries/taco/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv -, lib -, fetchgit -, cmake -, llvmPackages -, enablePython ? false -, python ? null -}: - -let pyEnv = python.withPackages (p: with p; [ numpy scipy ]); - -in stdenv.mkDerivation rec { - pname = "taco"; - version = "unstable-2022-08-02"; - - src = fetchgit { - url = "https://github.com/tensor-compiler/${pname}.git"; - rev = "2b8ece4c230a5f0f0a74bc6f48e28edfb6c1c95e"; - fetchSubmodules = true; - hash = "sha256-PnBocyRLiLALuVS3Gkt/yJeslCMKyK4zdsBI8BFaTSg="; - }; - - # Remove test cases from cmake build as they violate modern C++ expectations - patches = [ ./taco.patch ]; - - nativeBuildInputs = [ cmake ]; - - buildInputs = lib.optional stdenv.isDarwin llvmPackages.openmp; - - propagatedBuildInputs = lib.optional enablePython pyEnv; - - cmakeFlags = [ - "-DOPENMP=ON" - ] ++ lib.optional enablePython "-DPYTHON=ON" ; - - postInstall = lib.strings.optionalString enablePython '' - mkdir -p $out/${python.sitePackages} - cp -r lib/pytaco $out/${python.sitePackages}/. - ''; - - # The standard CMake test suite fails a single test of the CLI interface. - doCheck = false; - - # Cython somehow gets built with references to /build/. - # However, the python module works flawlessly. - dontFixup = enablePython; - - meta = with lib; { - description = "Computes sparse tensor expressions on CPUs and GPUs"; - mainProgram = "taco"; - license = licenses.mit; - homepage = "https://github.com/tensor-compiler/taco"; - maintainers = [ maintainers.sheepforce ]; - }; -} diff --git a/pkgs/development/libraries/taco/taco.patch b/pkgs/development/libraries/taco/taco.patch deleted file mode 100644 index 1fc61c2aa5ad..000000000000 --- a/pkgs/development/libraries/taco/taco.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test/tests-tensor_types.cpp b/test/tests-tensor_types.cpp -index 39d1b30a..c507da81 100644 ---- a/test/tests-tensor_types.cpp -+++ b/test/tests-tensor_types.cpp -@@ -45,7 +45,7 @@ TYPED_TEST_P(VectorTensorTest, types) { - ASSERT_EQ(t, a.getComponentType()); - ASSERT_EQ(1, a.getOrder()); - ASSERT_EQ(5, a.getDimension(0)); -- map<vector<int>,TypeParam> vals = {{{0}, 1.0}, {{2}, 2.0}}; -+ map<vector<int>,TypeParam> vals = {{{0}, (TypeParam)1.0}, {{2}, (TypeParam)2.0}}; - for (auto& val : vals) { - a.insert(val.first, val.second); - } diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix deleted file mode 100644 index 5ba1a5e20182..000000000000 --- a/pkgs/development/libraries/taglib-extras/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{lib, stdenv, fetchurl, cmake, taglib, zlib}: - -stdenv.mkDerivation rec { - pname = "taglib-extras"; - version = "1.0.1"; - src = fetchurl { - url = "https://ftp.rz.uni-wuerzburg.de/pub/unix/kde/taglib-extras/${version}/src/${pname}-${version}.tar.gz"; - sha256 = "0cln49ws9svvvals5fzxjxlzqm0fzjfymn7yfp4jfcjz655nnm7y"; - }; - buildInputs = [ taglib ]; - nativeBuildInputs = [ cmake zlib ]; - - # Workaround for upstream bug https://bugs.kde.org/show_bug.cgi?id=357181 - preConfigure = '' - sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake - ''; - - meta = with lib; { - description = "Additional taglib plugins"; - mainProgram = "taglib-extras-config"; - platforms = platforms.unix; - license = licenses.lgpl2; - }; -} diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix deleted file mode 100644 index 78a4026455e6..000000000000 --- a/pkgs/development/libraries/taglib-sharp/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, which, pkg-config, mono }: - -stdenv.mkDerivation rec { - pname = "taglib-sharp"; - version = "2.1.0.0"; - - src = fetchFromGitHub { - owner = "mono"; - repo = "taglib-sharp"; - rev = "taglib-sharp-${version}"; - sha256 = "12pk4z6ag8w7kj6vzplrlasq5lwddxrww1w1ya5ivxrfki15h5cp"; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook which ]; - buildInputs = [ mono ]; - - dontStrip = true; - - configureFlags = [ "--disable-docs" ]; - - meta = with lib; { - description = "Library for reading and writing metadata in media files"; - homepage = "https://github.com/mono/taglib-sharp"; - platforms = platforms.linux; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix deleted file mode 100644 index 17918f5f4373..000000000000 --- a/pkgs/development/libraries/taglib/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, zlib -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "taglib"; - version = "1.13.1"; - - src = fetchFromGitHub { - owner = "taglib"; - repo = "taglib"; - rev = "v${finalAttrs.version}"; - hash = "sha256-QX0EpHGT36UsgIfRf5iALnwxe0jjLpZvCTbk8vSMFF4="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ zlib ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - # Workaround unconditional ${prefix} until upstream is fixed: - # https://github.com/taglib/taglib/issues/1098 - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = with lib; { - homepage = "https://taglib.org/"; - description = "Library for reading and editing audio file metadata"; - mainProgram = "taglib-config"; - longDescription = '' - TagLib is a library for reading and editing the meta-data of several - popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 - files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, - Speex, WavPack, TrueAudio, WAV, AIFF, MP4 and ASF files. - ''; - license = with licenses; [ lgpl3 mpl11 ]; - maintainers = with maintainers; [ ttuegel ]; - pkgConfigModules = [ "taglib" "taglib_c" ]; - }; -}) diff --git a/pkgs/development/libraries/tagparser/default.nix b/pkgs/development/libraries/tagparser/default.nix deleted file mode 100644 index 3eaa0e238518..000000000000 --- a/pkgs/development/libraries/tagparser/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, cpp-utilities -, zlib -, isocodes -}: - -stdenv.mkDerivation rec { - pname = "tagparser"; - version = "12.3.1"; - - src = fetchFromGitHub { - owner = "Martchus"; - repo = "tagparser"; - rev = "v${version}"; - hash = "sha256-ihrtUd9R8Tdkuv0kdIZNzBDrhwmsC3LNDsmoCroSMPM="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - cpp-utilities zlib - ]; - - cmakeFlags = [ - "-DLANGUAGE_FILE_ISO_639_2=${isocodes}/share/iso-codes/json/iso_639-2.json" - ]; - - meta = with lib; { - homepage = "https://github.com/Martchus/tagparser"; - description = "C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags"; - license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; - platforms = platforms.all; - }; -} - diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix deleted file mode 100644 index 793fc1ccf5cb..000000000000 --- a/pkgs/development/libraries/talloc/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib, stdenv -, fetchurl -, python3 -, pkg-config -, readline -, libxslt -, libxcrypt -, docbook-xsl-nons -, docbook_xml_dtd_42 -, fixDarwinDylibNames -, wafHook -, buildPackages -}: - -stdenv.mkDerivation rec { - pname = "talloc"; - version = "2.4.2"; - - src = fetchurl { - url = "mirror://samba/talloc/${pname}-${version}.tar.gz"; - sha256 = "sha256-hez55GXiD5j5lQpS6aQR4UMgvFVfolfYdpe356mx2KY="; - }; - - nativeBuildInputs = [ - pkg-config - python3 - wafHook - docbook-xsl-nons - docbook_xml_dtd_42 - ] ++ lib.optionals stdenv.isDarwin [ - fixDarwinDylibNames - ]; - - buildInputs = [ - python3 - readline - libxslt - libxcrypt - ]; - - # otherwise the configure script fails with - # PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make! - preConfigure = '' - export PKGCONFIG="$PKG_CONFIG" - export PYTHONHASHSEED=1 - ''; - - wafPath = "buildtools/bin/waf"; - - wafConfigureFlags = [ - "--enable-talloc-compat1" - "--bundled-libraries=NONE" - "--builtin-libraries=replace" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--cross-compile" - "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" - ]; - - # python-config from build Python gives incorrect values when cross-compiling. - # If python-config is not found, the build falls back to using the sysconfig - # module, which works correctly in all cases. - PYTHON_CONFIG = "/invalid"; - - # this must not be exported before the ConfigurePhase otherwise waf whines - preBuild = lib.optionalString stdenv.hostPlatform.isMusl '' - export NIX_CFLAGS_LINK="-no-pie -shared"; - ''; - - postInstall = '' - ${stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc.c.[0-9]*.o - ''; - - meta = with lib; { - description = "Hierarchical pool based memory allocator with destructors"; - homepage = "https://tdb.samba.org/"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = [ maintainers.matthiasbeyer ]; - }; -} diff --git a/pkgs/development/libraries/taskflow/default.nix b/pkgs/development/libraries/taskflow/default.nix deleted file mode 100644 index cdb5303f1a11..000000000000 --- a/pkgs/development/libraries/taskflow/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, substituteAll -, doctest -, cmake -}: - -stdenv.mkDerivation rec { - pname = "taskflow"; - version = "3.7.0"; - - src = fetchFromGitHub { - owner = "taskflow"; - repo = "taskflow"; - rev = "v${version}"; - hash = "sha256-q2IYhG84hPIZhuogWf6ojDG9S9ZyuJz9s14kQyIc6t0="; - }; - - patches = [ - (substituteAll { - src = ./unvendor-doctest.patch; - inherit doctest; - }) - ]; - - postPatch = '' - rm -r 3rd-party - - # tries to use x86 intrinsics on aarch64-darwin - sed -i '/^#if __has_include (<immintrin\.h>)/,/^#endif/d' taskflow/utility/os.hpp - ''; - - nativeBuildInputs = [ - cmake - ]; - - doCheck = true; - - meta = { - description = "General-purpose Parallel and Heterogeneous Task Programming System"; - homepage = "https://taskflow.github.io/"; - changelog = let - release = lib.replaceStrings ["."] ["-"] version; - in "https://taskflow.github.io/taskflow/release-${release}.html"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/libraries/taskflow/unvendor-doctest.patch b/pkgs/development/libraries/taskflow/unvendor-doctest.patch deleted file mode 100644 index 85f2e1fcff98..000000000000 --- a/pkgs/development/libraries/taskflow/unvendor-doctest.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt -index 3397d798..8277191e 100644 ---- a/unittests/CMakeLists.txt -+++ b/unittests/CMakeLists.txt -@@ -1,6 +1,6 @@ - enable_testing() - --include(${TF_3RD_PARTY_DIR}/doctest/doctest.cmake) -+include(@doctest@/lib/cmake/doctest/doctest.cmake) - - list(APPEND TF_UNITTESTS - utility -@@ -24,7 +24,7 @@ list(APPEND TF_UNITTESTS - foreach(unittest IN LISTS TF_UNITTESTS) - add_executable(${unittest} ${unittest}.cpp) - target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings) -- target_include_directories(${unittest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest) -+ target_include_directories(${unittest} PRIVATE @doctest@/include/doctest) - doctest_discover_tests(${unittest}) - endforeach() - diff --git a/pkgs/development/libraries/tbb/2020_3.nix b/pkgs/development/libraries/tbb/2020_3.nix index dcd21b27ff33..c7e1e9127630 100644 --- a/pkgs/development/libraries/tbb/2020_3.nix +++ b/pkgs/development/libraries/tbb/2020_3.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = (lib.optionals stdenv.isDarwin [ + nativeBuildInputs = (lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]); diff --git a/pkgs/development/libraries/tbb/2021_5.nix b/pkgs/development/libraries/tbb/2021_5.nix index 3bfa9278106d..90e7aa2a9f2f 100644 --- a/pkgs/development/libraries/tbb/2021_5.nix +++ b/pkgs/development/libraries/tbb/2021_5.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] ++ # Workaround for gcc-12 ICE when using -O3 # https://gcc.gnu.org/PR108854 - lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ]; + lib.optionals (stdenv.cc.isGNU && stdenv.hostPlatform.isx86_32) [ "-O2" ]; # Fix undefined reference errors with version script under LLVM. NIX_LDFLAGS = lib.optionalString (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "--undefined-version"; diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 73ea56b30686..3ff04d6bf1ab 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] ++ # Workaround for gcc-12 ICE when using -O3 # https://gcc.gnu.org/PR108854 - lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ]; + lib.optionals (stdenv.cc.isGNU && stdenv.hostPlatform.isx86_32) [ "-O2" ]; # Fix undefined reference errors with version script under LLVM. NIX_LDFLAGS = lib.optionalString (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "--undefined-version"; diff --git a/pkgs/development/libraries/tbox/default.nix b/pkgs/development/libraries/tbox/default.nix deleted file mode 100644 index 9d1afcec84e1..000000000000 --- a/pkgs/development/libraries/tbox/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "tbox"; - version = "1.7.6"; - - src = fetchFromGitHub { - owner = "tboox"; - repo = pname; - rev = "v${version}"; - hash = "sha256-cwpZ7F8WzT/46HrckHe0Aug2mxirCkNA68aCxg/FcsE="; - }; - - configureFlags = [ - "--hash=y" - "--charset=y" - "--float=y" - "--demo=n" - ]; - - postInstall = '' - mkdir -p $out/lib/pkgconfig - substituteAll ${./libtbox.pc.in} $out/lib/pkgconfig/libtbox.pc - ''; - - meta = with lib; { - description = "Glib-like multi-platform c library"; - homepage = "https://docs.tboox.org"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ rewine ]; - }; -} - diff --git a/pkgs/development/libraries/tbox/libtbox.pc.in b/pkgs/development/libraries/tbox/libtbox.pc.in deleted file mode 100644 index 19907b72c07c..000000000000 --- a/pkgs/development/libraries/tbox/libtbox.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@out@ -exec_prefix=${prefix} -libdir=@out@/lib -includedir=@out@/include - -Name: tbox -Description: A glib-like multi-platform c library -Version: @version@ -Libs: -L${libdir} -ltbox -Cflags: -I${includedir} diff --git a/pkgs/development/libraries/tcl-fcgi/default.nix b/pkgs/development/libraries/tcl-fcgi/default.nix deleted file mode 100644 index 5451c5186a4e..000000000000 --- a/pkgs/development/libraries/tcl-fcgi/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, fetchFromGitHub, tcl, tclx }: - -tcl.mkTclDerivation rec { - pname = "tcl-fcgi"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "mpcjanssen"; - repo = "tcl-fcgi"; - rev = "62452dbf3177ba9458fbb42457834ca77bdf5a82"; - sha256 = "sha256-RLuV4ARmGWCJTmhs7DbMWENQGj3d5ZXWb821WrgG0qA="; - }; - - buildInputs = [ - tclx - ]; - - unpackPhase = '' - mkdir -p $out/lib/tcl-fcgi - cp -r $src/tcl-src/* $out/lib/tcl-fcgi/ - ''; - - meta = with lib; { - homepage = "https://github.com/mpcjanssen/tcl-fcgi"; - description = "Tcl interface for the FastCGI protocol"; - license = licenses.bsd2; - platforms = tclx.meta.platforms; - maintainers = with maintainers; [ nat-418 ]; - }; -} - diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix deleted file mode 100644 index a5bfba8b0559..000000000000 --- a/pkgs/development/libraries/tcllib/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, fetchzip -, tcl -, critcl -, withCritcl ? true -}: - -tcl.mkTclDerivation rec { - pname = "tcllib"; - version = "1.21"; - - src = fetchzip { - url = "mirror://sourceforge/tcllib/tcllib-${version}.tar.gz"; - hash = "sha256-p8thpRpC+9k/LvbBFaSOIpDXuhMlEWhs0qbrjtKcTzQ="; - }; - - nativeBuildInputs = lib.optional withCritcl critcl; - - buildFlags = [ "all" ] ++ lib.optional withCritcl "critcl"; - - meta = { - homepage = "https://core.tcl-lang.org/tcllib/"; - description = "Tcl-only library of standard routines for Tcl"; - license = lib.licenses.tcltk; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ fgaz ]; - }; -} diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix deleted file mode 100644 index dbc095b64e0b..000000000000 --- a/pkgs/development/libraries/tcltls/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, fetchurl, tcl, openssl }: - -tcl.mkTclDerivation rec { - pname = "tcltls"; - version = "1.7.22"; - - src = fetchurl { - url = "https://core.tcl-lang.org/tcltls/uv/tcltls-${version}.tar.gz"; - sha256 = "sha256-6E4reideyCxKqp0bH5eG2+Q1jIFekXU5/+f2Z/9Lw7Q="; - }; - - buildInputs = [ openssl ]; - - configureFlags = [ - "--with-ssl-dir=${openssl.dev}" - ]; - - meta = { - homepage = "https://core.tcl-lang.org/tcltls/index"; - description = "OpenSSL / RSA-bsafe Tcl extension"; - maintainers = [ lib.maintainers.agbrooks ]; - license = lib.licenses.tcltk; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/libraries/tclx/default.nix deleted file mode 100644 index 5e3a73febe9b..000000000000 --- a/pkgs/development/libraries/tclx/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, fetchFromGitHub -, tcl -}: - -tcl.mkTclDerivation rec { - pname = "tclx"; - version = "8.6.3"; - - src = fetchFromGitHub { - owner = "flightaware"; - repo = "tclx"; - rev = "v${version}"; - hash = "sha256-bzLF6qOF9o24joWnGR7B4S+Doj7zv9iTh/mo50iFbUs="; - }; - - # required in order for tclx to properly detect tclx.tcl at runtime - postInstall = let - majorMinorVersion = lib.versions.majorMinor version; - in '' - ln -s $prefix/lib/tclx${majorMinorVersion} $prefix/lib/tclx${majorMinorVersion}/tclx${majorMinorVersion} - ''; - - meta = { - homepage = "https://github.com/flightaware/tclx"; - description = "Tcl extensions"; - license = lib.licenses.tcltk; - maintainers = with lib.maintainers; [ kovirobi fgaz ]; - }; -} diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix deleted file mode 100644 index d78f4abafab0..000000000000 --- a/pkgs/development/libraries/tdb/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib, stdenv -, fetchurl -, pkg-config -, wafHook -, buildPackages -, python3 -, readline -, libxslt -, libxcrypt -, docbook-xsl-nons -, docbook_xml_dtd_45 -}: - -stdenv.mkDerivation rec { - pname = "tdb"; - version = "1.4.10"; - - src = fetchurl { - url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - hash = "sha256-AjOOM8FsIcnilXHO9SPnaytwhjYlT28wxs8ZXUjGLa8="; - }; - - nativeBuildInputs = [ - python3 - pkg-config - wafHook - libxslt - docbook-xsl-nons - docbook_xml_dtd_45 - ]; - - buildInputs = [ - python3 - readline # required to build python - libxcrypt - ]; - - # otherwise the configure script fails with - # PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make! - preConfigure = '' - export PKGCONFIG="$PKG_CONFIG" - export PYTHONHASHSEED=1 - ''; - - wafPath = "buildtools/bin/waf"; - - wafConfigureFlags = [ - "--bundled-libraries=NONE" - "--builtin-libraries=replace" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--cross-compile" - "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" - ]; - - postFixup = if stdenv.isDarwin - then ''install_name_tool -id $out/lib/libtdb.dylib $out/lib/libtdb.dylib'' - else null; - - # python-config from build Python gives incorrect values when cross-compiling. - # If python-config is not found, the build falls back to using the sysconfig - # module, which works correctly in all cases. - PYTHON_CONFIG = "/invalid"; - - meta = with lib; { - description = "Trivial database"; - longDescription = '' - TDB is a Trivial Database. In concept, it is very much like GDBM, - and BSD's DB except that it allows multiple simultaneous writers - and uses locking internally to keep writers from trampling on each - other. TDB is also extremely small. - ''; - homepage = "https://tdb.samba.org/"; - license = licenses.lgpl3Plus; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix deleted file mode 100644 index d02bd3b81011..000000000000 --- a/pkgs/development/libraries/tdlib/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ fetchFromGitHub, gperf, openssl, readline, zlib, cmake, lib, stdenv }: - -stdenv.mkDerivation { - pname = "tdlib"; - version = "1.8.35"; - - src = fetchFromGitHub { - owner = "tdlib"; - repo = "td"; - - # 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 = "8d08b34e22a08e58db8341839c4e18ee06c516c5"; - hash = "sha256-RxFiOp3QDpLeikPqd8vstvhdglFLtOmwpcfGvvdgI5Y="; - }; - - buildInputs = [ gperf openssl readline zlib ]; - nativeBuildInputs = [ cmake ]; - - # https://github.com/tdlib/td/issues/1974 - postPatch = '' - substituteInPlace CMake/GeneratePkgConfig.cmake \ - --replace 'function(generate_pkgconfig' \ - 'include(GNUInstallDirs) - function(generate_pkgconfig' \ - --replace '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ - --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' - sed -i "/vptr/d" test/CMakeLists.txt - ''; - - meta = with lib; { - description = "Cross-platform library for building Telegram clients"; - homepage = "https://core.telegram.org/tdlib/"; - license = [ licenses.boost ]; - platforms = platforms.unix; - maintainers = [ maintainers.vyorkin ]; - }; -} diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix deleted file mode 100644 index 072ca801f31b..000000000000 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, telepathy-glib, farstream, dbus-glib }: - -stdenv.mkDerivation rec { - pname = "telepathy-farstream"; - version = "0.6.2"; - - src = fetchurl { - url = "https://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz"; - sha256 = "02ky12bb92prr5f6xmvmfq4yz2lj33li6nj4829a98hk5pr9k83g"; - }; - - nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ]; - - meta = with lib; { - description = "GObject-based C library that uses Telepathy GLib, Farstream and GStreamer to handle the media streaming part of channels of type Call"; - homepage = "https://telepathy.freedesktop.org/wiki/Components/Telepathy-Farstream/"; - platforms = platforms.unix; - license = licenses.lgpl21Only; - }; -} diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix deleted file mode 100644 index e1510fca92a6..000000000000 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, stdenv -, fetchurl -, dbus-glib -, glib -, python3 -, pkg-config -, libxslt -, gobject-introspection -, vala -, glibcLocales -}: - -stdenv.mkDerivation rec { - pname = "telepathy-glib"; - version = "0.24.2"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "${meta.homepage}/releases/telepathy-glib/${pname}-${version}.tar.gz"; - sha256 = "sKN013HN0IESXzjDq9B5ZXZCMBxxpUPVVeK/IZGSc/A="; - }; - - strictDeps = true; - nativeBuildInputs = [ - pkg-config - libxslt - gobject-introspection - vala - python3 - ]; - - buildInputs = [ - glibcLocales - ]; - - propagatedBuildInputs = [ - dbus-glib - glib - ]; - - configureFlags = [ - "--enable-vala-bindings" - ]; - - LC_ALL = "en_US.UTF-8"; - - enableParallelBuilding = true; - - preConfigure = '' - substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires - ''; - - meta = with lib; { - homepage = "https://telepathy.freedesktop.org"; - platforms = platforms.unix; - license = with licenses; [ bsd2 bsd3 lgpl21Plus ]; - }; -} diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix deleted file mode 100644 index a8dfade71bfd..000000000000 --- a/pkgs/development/libraries/template-glib/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, pkg-config -, glib -, gobject-introspection -, flex -, bison -, vala -, gettext -, gnome -, gtk-doc -, docbook_xsl -, docbook_xml_dtd_43 -}: - -stdenv.mkDerivation rec { - pname = "template-glib"; - version = "3.36.2"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-ACDzpAGIjOdjs6F1CML1jpGXKkg6DFR6/bfMviVhmUg="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - flex - bison - vala - glib - gtk-doc - docbook_xsl - docbook_xml_dtd_43 - gobject-introspection - ]; - - buildInputs = [ - glib - ]; - - mesonFlags = [ - "-Dgtk_doc=true" - ]; - - doCheck = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "Library for template expansion which supports calling into GObject Introspection from templates"; - homepage = "https://gitlab.gnome.org/GNOME/template-glib"; - license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/development/libraries/termbox/default.nix deleted file mode 100644 index 22657cd663a2..000000000000 --- a/pkgs/development/libraries/termbox/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation (finalAttrs: { - pname = "termbox"; - version = "1.1.4"; - src = fetchFromGitHub { - owner = "termbox"; - repo = "termbox"; - rev = "v${finalAttrs.version}"; - sha256 = "075swv6ajx8m424dbmgbf6fs6nd5q004gjpvx48gkxmnf9spvykl"; - }; - - makeFlags = [ "prefix=${placeholder "out"}" ]; - - meta = with lib; { - description = "Library for writing text-based user interfaces"; - license = licenses.mit; - homepage = "https://github.com/termbox/termbox#readme"; - downloadPage = "https://github.com/termbox/termbox/releases"; - maintainers = with maintainers; [ fgaz ]; - }; -}) diff --git a/pkgs/development/libraries/termcolor/default.nix b/pkgs/development/libraries/termcolor/default.nix deleted file mode 100644 index f29776226dc2..000000000000 --- a/pkgs/development/libraries/termcolor/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "termcolor"; - version = "2.1.0"; - - src = fetchFromGitHub { - owner = "ikalnytskyi"; - repo = "termcolor"; - rev = "v${version}"; - sha256 = "sha256-2RXQ8sn2VNhQ2WZfwCCeQuM6x6C+sLA6ulAaFtaDMZw="; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DTERMCOLOR_TESTS=ON" ]; - CXXFLAGS = [ - # GCC 13: error: 'uint8_t' has not been declared - "-include cstdint" - ]; - - doCheck = true; - - checkPhase = '' - runHook preCheck - ./test_termcolor - runHook postCheck - ''; - - meta = with lib; { - description = "Header-only C++ library for printing colored messages"; - homepage = "https://github.com/ikalnytskyi/termcolor"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ prusnak ]; - }; -} diff --git a/pkgs/development/libraries/test-drive/default.nix b/pkgs/development/libraries/test-drive/default.nix deleted file mode 100644 index 41fc83844287..000000000000 --- a/pkgs/development/libraries/test-drive/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, gfortran, meson, ninja, mesonEmulatorHook }: - -stdenv.mkDerivation rec { - pname = "test-drive"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "fortran-lang"; - repo = pname; - rev = "v${version}"; - hash = "sha256-xRx8ErIN9xjxZt/nEsdIQkIGFRltuELdlI8lXA+M030="; - }; - - nativeBuildInputs = [ - gfortran - meson - ninja - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - mesonAutoFeatures = "auto"; - - meta = with lib; { - description = "Procedural Fortran testing framework"; - homepage = "https://github.com/fortran-lang/test-drive"; - license = with licenses; [ asl20 mit ]; - platforms = platforms.linux; - maintainers = [ maintainers.sheepforce ]; - }; -} diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix deleted file mode 100644 index c9f03ee0555f..000000000000 --- a/pkgs/development/libraries/tevent/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib, stdenv -, fetchurl -, python3 -, pkg-config -, cmocka -, readline -, talloc -, libxslt -, docbook-xsl-nons -, docbook_xml_dtd_42 -, which -, wafHook -, buildPackages -, libxcrypt -}: - -stdenv.mkDerivation rec { - pname = "tevent"; - version = "0.16.1"; - - src = fetchurl { - url = "mirror://samba/tevent/${pname}-${version}.tar.gz"; - sha256 = "sha256-Nilx4PMtwZBfb+RzYxnEuDSMItyFqmw/aQoo7+VIAp4="; - }; - - nativeBuildInputs = [ - pkg-config - which - python3 - libxslt - docbook-xsl-nons - docbook_xml_dtd_42 - wafHook - ]; - - buildInputs = [ - python3 - cmocka - readline # required to build python - talloc - libxcrypt - ]; - - # otherwise the configure script fails with - # PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make! - preConfigure = '' - export PKGCONFIG="$PKG_CONFIG" - export PYTHONHASHSEED=1 - ''; - - wafPath = "buildtools/bin/waf"; - - wafConfigureFlags = [ - "--bundled-libraries=NONE" - "--builtin-libraries=replace" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--cross-compile" - "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" - ]; - - # python-config from build Python gives incorrect values when cross-compiling. - # If python-config is not found, the build falls back to using the sysconfig - # module, which works correctly in all cases. - PYTHON_CONFIG = "/invalid"; - - meta = with lib; { - description = "Event system based on the talloc memory management library"; - homepage = "https://tevent.samba.org/"; - license = licenses.lgpl3Plus; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/text-engine/default.nix b/pkgs/development/libraries/text-engine/default.nix deleted file mode 100644 index 120076a7e0d7..000000000000 --- a/pkgs/development/libraries/text-engine/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch -, meson -, ninja -, json-glib -, gtk4 -, libxml2 -, gobject-introspection -, pkg-config -, libadwaita -}: - -stdenv.mkDerivation rec { - pname = "text-engine"; - version = "0.1.1"; - src = fetchFromGitHub { - owner = "mjakeman"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-YSG4Vk3hrmtaJkK1WAlQcdgiDdgC4Un0t6UdaoIcUes="; - }; - - patches = [ - # Fixes build with newer versions of clang - (fetchpatch { - url = "https://github.com/mjakeman/text-engine/commit/749c94d853c0b0e29e79a1b270ec61947b65c319.patch"; - hash = "sha256-vs/a8IBovArw8tc1ZLUsaDHRVyA71KMB1NGENOKNOdk="; - }) - ]; - - nativeBuildInputs = [ gobject-introspection gtk4 meson ninja pkg-config ]; - - buildInputs = [ libadwaita json-glib libxml2 ]; - - meta = with lib; { - description = "Rich text framework for GTK"; - mainProgram = "text-engine-demo"; - homepage = "https://github.com/mjakeman/text-engine"; - license = with licenses; [ mpl20 lgpl21Plus ]; - maintainers = with maintainers; [ foo-dogsquared ]; - }; -} diff --git a/pkgs/development/libraries/tezos-rust-libs/default.nix b/pkgs/development/libraries/tezos-rust-libs/default.nix deleted file mode 100644 index 85470f606f28..000000000000 --- a/pkgs/development/libraries/tezos-rust-libs/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, fetchFromGitLab, stdenv, llvmPackages_12, cargo, libiconv }: - -stdenv.mkDerivation rec { - version = "1.5"; - pname = "tezos-rust-libs"; - src = fetchFromGitLab { - owner = "tezos"; - repo = "tezos-rust-libs"; - rev = "v${version}"; - hash = "sha256-SuCqDZDXmWdGI/GN+3nYcUk66jnW5FQQaeTB76/rvaw="; - }; - - nativeBuildInputs = [ llvmPackages_12.llvm cargo ]; - propagatedBuildDeps = [ llvmPackages_12.libllvm ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - - buildPhase = '' - runHook preBuild - - cargo build \ - --target-dir target-librustzcash \ - --package librustzcash \ - --release - - cargo build \ - --target-dir target-wasmer \ - --package wasmer-c-api \ - --no-default-features \ - --features singlepass,cranelift,wat,middlewares,universal \ - --release - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib/tezos-rust-libs/rust - cp "librustzcash/include/librustzcash.h" \ - "target-librustzcash/release/librustzcash.a" \ - "wasmer-2.3.0/lib/c-api/wasm.h" \ - "wasmer-2.3.0/lib/c-api/wasmer.h" \ - "target-wasmer/release/libwasmer.a" \ - "$out/lib/tezos-rust-libs" - cp -r "librustzcash/include/rust" "$out/lib/tezos-rust-libs" - - runHook postInstall - ''; - - cargoVendorDir = "./vendor"; -} diff --git a/pkgs/development/libraries/the-foundation/default.nix b/pkgs/development/libraries/the-foundation/default.nix deleted file mode 100644 index d3021995ff8f..000000000000 --- a/pkgs/development/libraries/the-foundation/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchFromGitea -, cmake -, pkg-config -, curl -, libunistring -, openssl -, pcre -, zlib -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "the-foundation"; - version = "1.8.1"; - - src = fetchFromGitea { - domain = "git.skyjake.fi"; - owner = "skyjake"; - repo = "the_Foundation"; - rev = "v${finalAttrs.version}"; - hash = "sha256-gyDBK/bF+QxXMnthUfMjeUuRBZk0Xcahm7wOtLGs5kY="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ curl libunistring openssl pcre zlib ]; - - postFixup = '' - substituteInPlace "$out"/lib/pkgconfig/the_Foundation.pc \ - --replace '="''${prefix}//' '="/' - ''; - - meta = with lib; { - description = "Opinionated C11 library for low-level functionality"; - homepage = "https://git.skyjake.fi/skyjake/the_Foundation"; - license = licenses.bsd2; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix deleted file mode 100644 index e053814dddd9..000000000000 --- a/pkgs/development/libraries/theft/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - version = "0.4.5"; - pname = "theft"; - - src = fetchFromGitHub { - owner = "silentbicycle"; - repo = "theft"; - rev = "v${version}"; - sha256 = "1n2mkawfl2bpd4pwy3mdzxwlqjjvb5bdrr2x2gldlyqdwbk7qjhd"; - }; - - preConfigure = "patchShebangs ./scripts/mk_bits_lut"; - - doCheck = true; - checkTarget = "test"; - - installFlags = [ "PREFIX=$(out)" ]; - - # fix the libtheft.pc file to use the right installation - # directory. should be fixed upstream, too - postInstall = '' - install -m644 vendor/greatest.h $out/include/ - - substituteInPlace $out/lib/pkgconfig/libtheft.pc \ - --replace "/usr/local" "$out" - ''; - - meta = with lib; { - description = "C library for property-based testing"; - homepage = "https://github.com/silentbicycle/theft/"; - platforms = platforms.unix; - license = licenses.isc; - maintainers = with maintainers; [ kquick thoughtpolice ]; - }; -} diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix deleted file mode 100644 index 7995a3fe1699..000000000000 --- a/pkgs/development/libraries/thrift/default.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, boost -, zlib -, libevent -, openssl -, python3 -, cmake -, pkg-config -, bison -, flex -, static ? stdenv.hostPlatform.isStatic -}: - -stdenv.mkDerivation rec { - pname = "thrift"; - version = "0.18.1"; - - src = fetchurl { - url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-BMbxDl14jKeOE+4u8NIVLHsHDAr1VIPWuULinP8pZyY="; - }; - - # Workaround to make the Python wrapper not drop this package: - # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } - pythonPath = []; - - nativeBuildInputs = [ - bison - cmake - flex - pkg-config - python3 - python3.pkgs.setuptools - ]; - - buildInputs = [ - boost - ] ++ lib.optionals (!static) [ - (python3.withPackages (ps: [ps.twisted])) - ]; - - propagatedBuildInputs = [ - libevent - openssl - zlib - ]; - - postPatch = '' - # Python 3.10 related failures: - # SystemError: PY_SSIZE_T_CLEAN macro must be defined for '#' formats - # AttributeError: module 'collections' has no attribute 'Hashable' - substituteInPlace test/py/RunClientServer.py \ - --replace "'FastbinaryTest.py'," "" \ - --replace "'TestEof.py'," "" \ - --replace "'TestFrozen.py'," "" - - # these functions are removed in Python3.12 - substituteInPlace test/py/SerializationTest.py \ - --replace-fail "assertEquals" "assertEqual" \ - --replace-fail "assertNotEquals" "assertNotEqual" - ''; - - preConfigure = '' - export PY_PREFIX=$out - ''; - - patches = [ - # ToStringTest.cpp is failing from some reason due to locale issue, this - # doesn't disable all UnitTests as in Darwin. - ./disable-failing-test.patch - (fetchpatch { - name = "setuptools-gte-62.1.0.patch"; # https://github.com/apache/thrift/pull/2635 - url = "https://github.com/apache/thrift/commit/c41ad9d5119e9bdae1746167e77e224f390f2c42.diff"; - hash = "sha256-FkErrg/6vXTomS4AsCsld7t+Iccc55ZiDaNjJ3W1km0="; - }) - (fetchpatch { - name = "thrift-install-FindLibevent.patch"; # https://github.com/apache/thrift/pull/2726 - url = "https://github.com/apache/thrift/commit/2ab850824f75d448f2ba14a468fb77d2594998df.diff"; - hash = "sha256-ejMKFG/cJgoPlAFzVDPI4vIIL7URqaG06/IWdQ2NkhY="; - }) - (fetchpatch { - name = "thrift-fix-tests-OpenSSL3.patch"; # https://github.com/apache/thrift/pull/2760 - url = "https://github.com/apache/thrift/commit/eae3ac418f36c73833746bcd53e69ed8a12f0e1a.diff"; - hash = "sha256-0jlN4fo94cfGFUKcLFQgVMI/x7uxn5OiLiFk6txVPzs="; - }) - ]; - - cmakeFlags = [ - "-DBUILD_JAVASCRIPT:BOOL=OFF" - "-DBUILD_NODEJS:BOOL=OFF" - - # FIXME: Fails to link in static mode with undefined reference to - # `boost::unit_test::unit_test_main(bool (*)(), int, char**)' - "-DBUILD_TESTING:BOOL=${if static then "OFF" else "ON"}" - ] ++ lib.optionals static [ - "-DWITH_STATIC_LIB:BOOL=ON" - "-DOPENSSL_USE_STATIC_LIBS=ON" - ]; - - disabledTests = [ - "PythonTestSSLSocket" - "PythonThriftTNonblockingServer" - ] ++ lib.optionals stdenv.isDarwin [ - # Tests that hang up in the Darwin sandbox - "SecurityTest" - "SecurityFromBufferTest" - "python_test" - - # fails on hydra, passes locally - "concurrency_test" - - # Tests that fail in the Darwin sandbox when trying to use network - "UnitTests" - "TInterruptTest" - "TServerIntegrationTest" - "processor" - "TNonblockingServerTest" - "TNonblockingSSLServerTest" - "StressTest" - "StressTestConcurrent" - "StressTestNonBlocking" - ]; - - doCheck = !static; - - checkPhase = '' - runHook preCheck - - ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E "($(echo "$disabledTests" | tr " " "|"))" - - runHook postCheck - ''; - - enableParallelChecking = false; - - meta = with lib; { - description = "Library for scalable cross-language services"; - mainProgram = "thrift"; - homepage = "https://thrift.apache.org/"; - license = licenses.asl20; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ bjornfor ]; - }; -} diff --git a/pkgs/development/libraries/thrift/disable-failing-test.patch b/pkgs/development/libraries/thrift/disable-failing-test.patch deleted file mode 100644 index 4307d58ddedb..000000000000 --- a/pkgs/development/libraries/thrift/disable-failing-test.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git i/lib/cpp/test/CMakeLists.txt w/lib/cpp/test/CMakeLists.txt -index 19854e1a3..9d428a166 100644 ---- i/lib/cpp/test/CMakeLists.txt -+++ w/lib/cpp/test/CMakeLists.txt -@@ -77,7 +77,6 @@ set(UnitTest_SOURCES - TMemoryBufferTest.cpp - TBufferBaseTest.cpp - Base64Test.cpp -- ToStringTest.cpp - TypedefTest.cpp - TServerSocketTest.cpp - TServerTransportTest.cpp diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix deleted file mode 100644 index 1a1cf14c9ea8..000000000000 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ fetchurl, lib, stdenv, autoreconfHook, libkrb5 }: - -stdenv.mkDerivation rec { - pname = "libtirpc"; - version = "1.3.5"; - - src = fetchurl { - url = "http://git.linux-nfs.org/?p=steved/libtirpc.git;a=snapshot;h=refs/tags/libtirpc-${lib.replaceStrings ["."] ["-"] version};sf=tgz"; - hash = "sha256-bq2zfqfMJsJ6gezLCUTlNiRXJhFxFslY4iW+4kpOPVE="; - name = "${pname}-${version}.tar.gz"; - }; - - outputs = [ "out" "dev" ]; - - KRB5_CONFIG = "${libkrb5.dev}/bin/krb5-config"; - nativeBuildInputs = [ autoreconfHook ]; - propagatedBuildInputs = [ libkrb5 ]; - strictDeps = true; - - preConfigure = '' - sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i doc/Makefile.in tirpc/netconfig.h - ''; - - enableParallelBuilding = true; - - preInstall = '' - mkdir -p $out/etc - ''; - - doCheck = true; - - meta = with lib; { - homepage = "https://sourceforge.net/projects/libtirpc/"; - description = "Transport-independent Sun RPC implementation (TI-RPC)"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - longDescription = '' - Currently, NFS commands use the SunRPC routines provided by the - glibc. These routines do not support IPv6 addresses. Ulrich - Drepper, who is the maintainer of the glibc, refuses any change in - the glibc concerning the RPC. He wants the RPC to become a separate - library. Other OS (NetBSD, FreeBSD, Solarix, HP-UX, AIX) have - migrated their SunRPC library to a TI-RPC (Transport Independent - RPC) implementation. This implementation allows the support of - other transports than UDP and TCP over IPv4. FreeBSD provides a - TI-RPC library ported from NetBSD with improvements. This library - already supports IPv6. So, the FreeBSD release 5.2.1 TI-RPC has - been ported to replace the SunRPC of the glibc. - ''; - }; -} diff --git a/pkgs/development/libraries/ticpp/default.nix b/pkgs/development/libraries/ticpp/default.nix deleted file mode 100644 index 20de3d7f2b89..000000000000 --- a/pkgs/development/libraries/ticpp/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation { - pname = "ticpp"; - version = "unstable-2019-01-09"; - - src = fetchFromGitHub { - owner = "wxFormBuilder"; - repo = "ticpp"; - rev = "eb79120ea16b847ce9f483a298a394050f463d6b"; - sha256 = "0xk4cy0xbkr6326cqd1vd6b2x0rfsx4iz2sq8f5jz3yl3slxgjm2"; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DBUILD_TICPP_DLL=1" ]; - - installPhase = '' - cd .. - mkdir -p $out/lib - install build/*.{a,so} $out/lib - mkdir -p $out/include - install *.h $out/include - ''; - - meta = { - description = "Interface to TinyXML"; - license = lib.licenses.mit; - homepage = "https://github.com/wxFormBuilder/ticpp"; - }; - -} diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix deleted file mode 100644 index e00eaf632e97..000000000000 --- a/pkgs/development/libraries/tidyp/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "tidyp"; - version = "1.04"; - - src = fetchurl { - # downloads from a legacy GitHub download page from ~11 years ago - # project does not work with autoconf anymore and the configure script cannot be generated from the source download - url = "https://github.com/downloads/petdance/tidyp/${pname}-${version}.tar.gz"; - sha256 = "0f5ky0ih4vap9c6j312jn73vn8m2bj69pl2yd3a5nmv35k9zmc10"; - }; - - hardeningDisable = [ "format" ]; - - meta = with lib; { - description = "Program that can validate your HTML, as well as modify it to be more clean and standard"; - mainProgram = "tidyp"; - homepage = "http://tidyp.com/"; - platforms = platforms.all; - maintainers = with maintainers; [ pSub ]; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/tiledb/FindMagic_EP.cmake.patch b/pkgs/development/libraries/tiledb/FindMagic_EP.cmake.patch deleted file mode 100644 index 7a5a01c54588..000000000000 --- a/pkgs/development/libraries/tiledb/FindMagic_EP.cmake.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/FindMagic_EP.cmake b/FindMagic_EP.cmake ---- a/cmake/Modules/FindMagic_EP.cmake -+++ b/cmake/Modules/FindMagic_EP.cmake -@@ -126,9 +126,7 @@ if(NOT TILEDB_LIBMAGIC_EP_BUILT) - # that was modified by tiledb to also build with cmake for nix - ExternalProject_Add(ep_magic - PREFIX "externals" -- GIT_REPOSITORY "https://github.com/TileDB-Inc/file-windows.git" -- GIT_TAG "5.38.2.tiledb" -- GIT_SUBMODULES_RECURSE TRUE -+ DOWNLOAD_COMMAND true - UPDATE_COMMAND "" - CMAKE_ARGS - -DCMAKE_INSTALL_PREFIX=${TILEDB_EP_INSTALL_PREFIX} diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix deleted file mode 100644 index 28b14d3a8a5b..000000000000 --- a/pkgs/development/libraries/tiledb/default.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub - -, cmake -, zlib -, lz4 -, bzip2 -, zstd -, spdlog -, tbb -, openssl -, boost -, libpqxx -, clang-tools -, catch2_3 -, python3 -, gtest -, doxygen -, fixDarwinDylibNames -, useAVX2 ? stdenv.hostPlatform.avx2Support -}: - -let - # pre-fetch ExternalProject from cmake/Modules/FindMagic_EP.cmake - ep-file-windows = fetchFromGitHub { - owner = "TileDB-Inc"; - repo = "file-windows"; - rev = "5.38.2.tiledb"; - hash = "sha256-TFn30VCuWZr252VN1T5NNCZe2VEN3xQSomS7XxxKGF8="; - fetchSubmodules = true; - }; - -in -stdenv.mkDerivation rec { - pname = "tiledb"; - version = "2.18.2"; - - src = fetchFromGitHub { - owner = "TileDB-Inc"; - repo = "TileDB"; - rev = version; - hash = "sha256-uLiXhigYz3v7NgY38twot3sBHxZS5QCrOiPfME4wWzE="; - }; - - patches = [ - ./FindMagic_EP.cmake.patch - ]; - - postPatch = '' - # copy pre-fetched external project to directory where it is expected to be - mkdir -p build/externals/src - cp -a ${ep-file-windows} build/externals/src/ep_magic - chmod -R u+w build/externals/src/ep_magic - - # add openssl on path - sed -i '49i list(APPEND OPENSSL_PATHS "${openssl.dev}" "${openssl.out}")' \ - cmake/Modules/FindOpenSSL_EP.cmake - ''; - - # upstream will hopefully fix this in some newer release - env.CXXFLAGS = "-include random"; - - # (bundled) blosc headers have a warning on some archs that it will be using - # unaccelerated routines. - cmakeFlags = [ - "-DTILEDB_VCPKG=OFF" - "-DTILEDB_WEBP=OFF" - "-DTILEDB_WERROR=OFF" - ] ++ lib.optional (!useAVX2) "-DCOMPILER_SUPPORTS_AVX2=FALSE"; - - nativeBuildInputs = [ - ep-file-windows - catch2_3 - clang-tools - cmake - python3 - doxygen - ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - - nativeCheckInputs = [ - gtest - ]; - - buildInputs = [ - zlib - lz4 - bzip2 - zstd - spdlog - tbb - openssl - boost - libpqxx - ]; - - # test commands taken from - # https://github.com/TileDB-Inc/TileDB/blob/dev/.github/workflows/unit-test-runs.yml - checkPhase = '' - runHook preCheck - make -C tiledb tests -j$NIX_BUILD_CORES - make -C tiledb test ARGS="-R '^unit_'" -R "test_assert" - make -C tiledb test ARGS="-R 'test_ci_asserts'" - runHook postCheck - ''; - - doCheck = true; - - installTargets = [ "install-tiledb" "doc" ]; - - postInstall = lib.optionalString stdenv.isDarwin '' - install_name_tool -add_rpath ${tbb}/lib $out/lib/libtiledb.dylib - ''; - - meta = with lib; { - description = "TileDB allows you to manage the massive dense and sparse multi-dimensional array data"; - homepage = "https://github.com/TileDB-Inc/TileDB"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ rakesh4g ]; - }; -} diff --git a/pkgs/development/libraries/timezonemap/default.nix b/pkgs/development/libraries/timezonemap/default.nix deleted file mode 100644 index f2ceb056f25a..000000000000 --- a/pkgs/development/libraries/timezonemap/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ stdenv -, lib -, autoreconfHook -, fetchbzr -, fetchpatch -, pkg-config -, gtk3 -, glib -, file -, gobject-introspection -, json-glib -, libsoup -}: - -stdenv.mkDerivation rec { - pname = "timezonemap"; - version = "0.4.5.1"; - - src = fetchbzr { - url = "lp:timezonemap"; - rev = "58"; - sha256 = "sha256-wCJXwgnN+aZVerjQCm8oT3xIcwmc4ArcEoCh9pMrt+E="; - }; - - patches = [ - # Fix crashes when running in GLib 2.76 - # https://bugs.launchpad.net/ubuntu/+source/libtimezonemap/+bug/2012116 - (fetchpatch { - url = "https://git.launchpad.net/ubuntu/+source/libtimezonemap/plain/debian/patches/timezone-map-Never-try-to-access-to-free-d-or-null-values.patch?id=88f72f724e63df061204f6818c9a1e7d8c003e29"; - sha256 = "sha256-M5eR0uaqpJOeW2Ya1Al+3ZciXukzHpnjJTMVvdO0dPE="; - }) - ]; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - gobject-introspection - ]; - - buildInputs = [ - gtk3 - glib - json-glib - libsoup - ]; - - configureFlags = [ - "CFLAGS=-Wno-error" - "--sysconfdir=/etc" - "--localstatedir=/var" - ]; - - installFlags = [ - "sysconfdir=${placeholder "out"}/etc" - "localstatedir=\${TMPDIR}" - ]; - - preConfigure = '' - for f in {configure,m4/libtool.m4}; do - substituteInPlace $f\ - --replace /usr/bin/file ${file}/bin/file - done - ''; - - postPatch = '' - sed "s|/usr/share/libtimezonemap|$out/share/libtimezonemap|g" -i ./src/tz.h - ''; - - meta = with lib; { - homepage = "https://launchpad.net/timezonemap"; - description = "GTK+3 Timezone Map Widget"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.mkg20001 ]; - }; -} diff --git a/pkgs/development/libraries/tinycbor/default.nix b/pkgs/development/libraries/tinycbor/default.nix deleted file mode 100644 index 9f9a060d74d8..000000000000 --- a/pkgs/development/libraries/tinycbor/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "tinycbor"; - version = "0.6.0"; - - src = fetchFromGitHub { - owner = "intel"; - repo = "tinycbor"; - rev = "v${version}"; - sha256 = "1ph1cmsh4hm6ikd3bs45mnv9zmniyrvp2rrg8qln204kr6fngfcd"; - }; - - makeFlags = [ "prefix=$(out)" ]; - - meta = with lib; { - description = "Concise Binary Object Representation (CBOR) Library"; - mainProgram = "cbordump"; - homepage = "https://github.com/intel/tinycbor"; - license = licenses.mit; - maintainers = with maintainers; [ oxzi ]; - }; -} diff --git a/pkgs/development/libraries/tinycdb/default.nix b/pkgs/development/libraries/tinycdb/default.nix deleted file mode 100644 index c13e97e968bf..000000000000 --- a/pkgs/development/libraries/tinycdb/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, lib, fetchurl }: -let - isCross = stdenv.buildPlatform != stdenv.hostPlatform; - cross = "${stdenv.hostPlatform.config}"; - static = stdenv.hostPlatform.isStatic; - - cc = if !isCross then "cc" else "${cross}-cc"; - ar = if !isCross then "ar" else "${cross}-ar"; - ranlib = if !isCross then "ranlib" else "${cross}-ranlib"; -in stdenv.mkDerivation rec { - postPatch = '' - sed -i 's,set --, set -x; set --,' Makefile - ''; - pname = "tinycdb"; - version = "0.80"; - # In general, static library (.a) goes to "dev", shared (.so) to - # "lib". In case of static build, there is no .so library, so "lib" - # output is useless and empty. - outputs = [ "out" "dev" "man" ] ++ lib.optional (!static) "lib"; - separateDebugInfo = true; - makeFlags = - [ "prefix=$(out)" "CC=${cc}" "AR=${ar}" "RANLIB=${ranlib}" "static" - ] ++ lib.optional (!static) "shared"; - postInstall = '' - mkdir -p $dev/lib $out/bin - mv $out/lib/libcdb.a $dev/lib - rmdir $out/lib - '' + (if static then '' - cp cdb $out/bin/cdb - '' else '' - mkdir -p $lib/lib - cp libcdb.so* $lib/lib - cp cdb-shared $out/bin/cdb - ''); - - src = fetchurl { - url = "http://www.corpit.ru/mjt/tinycdb/${pname}-${version}.tar.gz"; - sha256 = "sha256-wyG5BekCwsqZo/+Kjd39iCMkf+Ht7IpLuF+Dhpxjn7g="; - }; - - meta = with lib; { - - description = "utility to manipulate constant databases (cdb)"; - mainProgram = "cdb"; - - longDescription = '' - tinycdb is a small, fast and reliable utility and subroutine - library for creating and reading constant databases. The database - structure is tuned for fast reading. - ''; - - homepage = "https://www.corpit.ru/mjt/tinycdb.html"; - license = licenses.publicDomain; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/tinyobjloader/default.nix b/pkgs/development/libraries/tinyobjloader/default.nix deleted file mode 100644 index e2fd82732688..000000000000 --- a/pkgs/development/libraries/tinyobjloader/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "tinyobjloader"; - version = "1.0.7"; - - src = fetchFromGitHub { - owner = "tinyobjloader"; - repo = "tinyobjloader"; - rev = "v${version}"; - sha256 = "sha256-BNffbicnLTGK2GQ2/bB328LFU9fqHxrpAVj2hJaekWc="; - }; - - nativeBuildInputs = [ cmake ]; - - # https://github.com/tinyobjloader/tinyobjloader/issues/336 - postPatch = '' - substituteInPlace tinyobjloader.pc.in \ - --replace '$'{prefix}/@TINYOBJLOADER_LIBRARY_DIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@TINYOBJLOADER_INCLUDE_DIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - - meta = with lib; { - homepage = "https://github.com/tinyobjloader/tinyobjloader"; - description = "Tiny but powerful single file wavefront obj loader"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index ded5013cca99..456fd7fe2dd9 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation { hardeningDisable = [ "format" ]; env.NIX_CFLAGS_COMPILE = - lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; + lib.optionalString stdenv.hostPlatform.isDarwin "-mmacosx-version-min=10.9"; nativeBuildInputs = [ unzip ]; buildPhase = '' @@ -78,7 +78,7 @@ in stdenv.mkDerivation { cp -v tinyxml.pc $out/lib/pkgconfig/ cp -v docs/* $out/share/doc/tinyxml/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libtinyxml.dylib $out/lib/libtinyxml.dylib ''; diff --git a/pkgs/development/libraries/tk/8.5.nix b/pkgs/development/libraries/tk/8.5.nix index afd575915f85..ad0013060ff6 100644 --- a/pkgs/development/libraries/tk/8.5.nix +++ b/pkgs/development/libraries/tk/8.5.nix @@ -14,7 +14,7 @@ callPackage ./generic.nix (args // { sha256 = "1yhgcalldrjlc5q614rlzg1crgd3b52dhrk1pncdaxvl2vgg2yj0"; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ # Define MODULE_SCOPE before including tkPort.h # https://core.tcl-lang.org/tk/info/dba9f5ce3b (fetchpatch { diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index c8f4efa7f7ac..84028762dbba 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -8,7 +8,7 @@ callPackage ./generic.nix (args // { src = fetchurl { url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz"; - sha256 = "sha256-LmX6BpojNlRAo8VsVWuGc7XjKig4ANjZslfj9YTOBnU="; + sha256 = "sha256-VQlp81N5+VKzAg86t7ndW/0Rwe98m3xqdfXEmsp5P+w="; }; patches = [ diff --git a/pkgs/development/libraries/tk/9.0.nix b/pkgs/development/libraries/tk/9.0.nix new file mode 100644 index 000000000000..ff99ca8b4f63 --- /dev/null +++ b/pkgs/development/libraries/tk/9.0.nix @@ -0,0 +1,23 @@ +{ + callPackage, + fetchzip, + tcl, + ... +}@args: + +callPackage ./generic.nix ( + args + // { + + src = fetchzip { + url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz"; + sha256 = "sha256-jQ9kZuFx6ikQ+SpY7kSbvXJ5hjw4WB9VgRaNlQLtG0s="; + }; + + patches = [ + # https://core.tcl-lang.org/tk/tktview/765642ffffffffffffff + ./tk-8_6_13-find-library.patch + ]; + + } +) diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 4978f8b96f58..7a4b0a76d3b4 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, src, pkg-config, tcl, libXft, patches ? [] -, enableAqua ? stdenv.isDarwin, darwin +{ stdenv, lib, src, pkg-config, tcl, libXft, zip, zlib, patches ? [] +, enableAqua ? stdenv.hostPlatform.isDarwin, darwin , ... }: tcl.mkTclDerivation { @@ -22,7 +22,7 @@ tcl.mkTclDerivation { substituteInPlace $file --replace "exec wish" "exec $out/bin/wish" done '' - + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") '' substituteInPlace unix/configure* \ --replace " -framework UniformTypeIdentifiers" "" ''; @@ -32,17 +32,33 @@ tcl.mkTclDerivation { cp ../{unix,generic}/*.h $out/include ln -s $out/lib/libtk${tcl.release}${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libtk${stdenv.hostPlatform.extensions.sharedLibrary} '' - + lib.optionalString (stdenv.isDarwin) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin) '' cp ../macosx/*.h $out/include ''; configureFlags = [ "--enable-threads" - ] ++ lib.optional stdenv.is64bit "--enable-64bit" - ++ lib.optional enableAqua "--enable-aqua"; + ] ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit" + ++ lib.optional enableAqua "--enable-aqua" + ++ lib.optional (lib.versionAtLeast tcl.version "9.0") + # By default, tk libraries get zipped and embedded into libtcl9tk*.so, + # which gets `zipfs mount`ed at runtime. This is fragile (for example + # stripping the .so removes the zip trailer), so we install them as + # traditional files. + # This might make tcl slower to start from slower storage on cold cache, + # however according to my benchmarks on fast storage and warm cache + # tcl built with --disable-zipfs actually starts in half the time. + "--disable-zipfs"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ]; + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals (lib.versionAtLeast tcl.version "9.0") [ + # Only used to detect the presence of zlib. Could be replaced with a stub. + zip + ]; + buildInputs = lib.optionals (lib.versionAtLeast tcl.version "9.0") [ + zlib + ]; propagatedBuildInputs = [ libXft @@ -70,5 +86,7 @@ tcl.mkTclDerivation { license = licenses.tcltk; platforms = platforms.all; maintainers = [ ]; + broken = stdenv.hostPlatform.isDarwin + && lib.elem (lib.versions.majorMinor tcl.version) ["8.5" "9.0"]; }; } diff --git a/pkgs/development/libraries/tkimg/default.nix b/pkgs/development/libraries/tkimg/default.nix deleted file mode 100644 index 8b66e195d5a5..000000000000 --- a/pkgs/development/libraries/tkimg/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, lib, fetchsvn, tcl, tcllib, tk, xorg, darwin }: - -tcl.mkTclDerivation rec { - pname = "tkimg"; - version = "623"; - - src = fetchsvn { - url = "svn://svn.code.sf.net/p/tkimg/code/trunk"; - rev = version; - sha256 = "sha256-6GlkqYxXmMGjiJTZS2fQNVSimcKc1BZ/lvzvtkhty+o="; - }; - - configureFlags = [ - "--with-tcl=${tcl}/lib" - "--with-tk=${tk}/lib" - "--with-tkinclude=${tk.dev}/include" - ]; - - buildInputs = [ xorg.libX11 tcllib ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - Cocoa - ]); - - meta = { - homepage = "https://sourceforge.net/projects/tkimg/"; - description = "Img package adds several image formats to Tcl/Tk"; - maintainers = with lib.maintainers; [ matthewcroughan ]; - license = lib.licenses.bsd3; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/tkrzw/default.nix b/pkgs/development/libraries/tkrzw/default.nix deleted file mode 100644 index 6470924a9ce2..000000000000 --- a/pkgs/development/libraries/tkrzw/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "tkrzw"; - version = "1.0.31"; - # TODO: defeat multi-output reference cycles - - src = fetchurl { - url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz"; - hash = "sha256-7FdHglIBTHGKRt66WNTGEe5qUcrIyTYPrnuVrUc8l08="; - }; - - postPatch = '' - substituteInPlace configure \ - --replace 'PATH=".:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:$PATH"' "" - ''; - - enableParallelBuilding = true; - - doCheck = false; # memory intensive - - meta = with lib; { - description = "Set of implementations of DBM"; - homepage = "https://dbmx.net/tkrzw/"; - maintainers = with maintainers; [ ehmry ]; - license = licenses.asl20; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/tl-expected/default.nix b/pkgs/development/libraries/tl-expected/default.nix deleted file mode 100644 index 078ae201ea2a..000000000000 --- a/pkgs/development/libraries/tl-expected/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "tl-expected"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "TartanLlama"; - repo = "expected"; - rev = "v${version}"; - hash = "sha256-AuRU8VI5l7Th9fJ5jIc/6mPm0Vqbbt6rY8QCCNDOU50="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "C++11/14/17 std::expected with functional-style extensions"; - homepage = "https://tl.tartanllama.xyz/en/latest/api/expected.html"; - license = licenses.cc0; - platforms = platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix deleted file mode 100644 index f4787271c039..000000000000 --- a/pkgs/development/libraries/tnt/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{lib, stdenv, fetchurl, unzip}: - -stdenv.mkDerivation { - pname = "tnt"; - version = "3.0.12"; - - src = fetchurl { - url = "https://math.nist.gov/tnt/tnt_3_0_12.zip"; - sha256 = "1bzkfdb598584qlc058n8wqq9vbz714gr5r57401rsa9qaxhk5j7"; - }; - - nativeBuildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/include - cp *.h $out/include - ''; - - meta = { - homepage = "https://math.nist.gov/tnt/"; - description = "Template Numerical Toolkit: C++ headers for array and matrices"; - license = lib.licenses.publicDomain; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix deleted file mode 100644 index 9080893d5e44..000000000000 --- a/pkgs/development/libraries/tntdb/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, cxxtools -, postgresql -, libmysqlclient -, sqlite -, zlib -, openssl -}: - -stdenv.mkDerivation rec { - pname = "tntdb"; - version = "1.4"; - - src = fetchFromGitHub { - owner = "maekitalo"; - repo = "tntdb"; - rev = "V${version}"; - hash = "sha256-ciqHv077sXnvCx+TJjdY1uPrlCP7/s972koXjGLgWhU="; - }; - - nativeBuildInputs = [ - autoreconfHook - ]; - - buildInputs = [ - cxxtools - postgresql - libmysqlclient - sqlite - zlib - openssl - ]; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "http://www.tntnet.org/tntdb.html"; - description = "C++ library which makes accessing SQL databases easy and robust"; - platforms = platforms.linux; - license = licenses.lgpl21; - maintainers = [ maintainers.juliendehos ]; - }; -} diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/development/libraries/tntnet/default.nix deleted file mode 100644 index 03e8558a0c1e..000000000000 --- a/pkgs/development/libraries/tntnet/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, autoreconfHook -, cxxtools -, zlib -, openssl -, zip -}: - -stdenv.mkDerivation rec { - pname = "tntnet"; - version = "3.0"; - - src = fetchFromGitHub { - owner = "maekitalo"; - repo = "tntnet"; - rev = "V${version}"; - hash = "sha256-ujVPOreCGCFlYHa19yCIiZ0ed+p0jnS14DHDwKYvtc0="; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/maekitalo/tntnet/commit/69adfc8ee351a0e82990c1ffa7af6dab726e1e49.patch"; - hash = "sha256-4UdUXKQiIa9CPlGg8XmfKQ8NTWb2A3AiuPthzEthlf8="; - }) - ]; - - nativeBuildInputs = [ - autoreconfHook - ]; - - buildInputs = [ - cxxtools - zlib - openssl - zip - ]; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "http://www.tntnet.org/tntnet.html"; - description = "Web server which allows users to develop web applications using C++"; - platforms = platforms.linux; - license = licenses.lgpl21; - maintainers = [ maintainers.juliendehos ]; - }; -} diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix deleted file mode 100644 index 4b3c8a363eb4..000000000000 --- a/pkgs/development/libraries/tokyo-cabinet/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ fetchurl, lib, stdenv, zlib, bzip2 }: - -stdenv.mkDerivation rec { - pname = "tokyocabinet"; - version = "1.4.48"; - - src = fetchurl { - url = "https://dbmx.net/tokyocabinet/${pname}-${version}.tar.gz"; - sha256 = "140zvr0n8kvsl0fbn2qn3f2kh3yynfwnizn4dgbj47m975yg80x0"; - }; - - buildInputs = [ zlib bzip2 ]; - - postInstall = - '' sed -i "$out/lib/pkgconfig/tokyocabinet.pc" \ - -e 's|-lz|-L${zlib.out}/lib -lz|g; - s|-lbz2|-L${bzip2.out}/lib -lbz2|g' - ''; - - meta = { - description = "Tokyo Cabinet: a modern implementation of DBM"; - - longDescription = - '' Tokyo Cabinet is a library of routines for managing a database. The - database is a simple data file containing records, each is a pair of - a key and a value. Every key and value is serial bytes with - variable length. Both binary data and character string can be used - as a key and a value. There is neither concept of data tables nor - data types. Records are organized in hash table, B+ tree, or - fixed-length array. - - Tokyo Cabinet is developed as the successor of GDBM and QDBM on the - following purposes. They are achieved and Tokyo Cabinet replaces - conventional DBM products: improves space efficiency, improves time - efficiency, improves parallelism, improves usability, improves - robustness, supports 64-bit architecture. - ''; - - license = lib.licenses.lgpl2Plus; - - maintainers = [ ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix deleted file mode 100644 index 6407840c443c..000000000000 --- a/pkgs/development/libraries/tokyo-tyrant/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ fetchurl, lib, stdenv, tokyocabinet, pkg-config }: - -stdenv.mkDerivation rec { - pname = "tokyotyrant"; - version = "1.1.41"; - - src = fetchurl { - url = "https://fallabs.com/tokyotyrant/tokyotyrant-${version}.tar.gz"; - sha256 = "13xqcinhydqmh7231qlir6pymacjwcf98drybkhd9597kzxp1bs2"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ tokyocabinet ]; - - doCheck = false; # FIXME - - meta = { - description = "Network interface of the Tokyo Cabinet DBM"; - - longDescription = - '' Tokyo Tyrant is a package of network interface to the DBM called - Tokyo Cabinet. Though the DBM has high performance, you might - bother in case that multiple processes share the same database, or - remote processes access the database. Thus, Tokyo Tyrant is - provided for concurrent and remote connections to Tokyo Cabinet. It - is composed of the server process managing a database and its access - library for client applications. - - Tokyo Tyrant is written in the C language, and provided as API of C, - Perl, and Ruby. Tokyo Tyrant is available on platforms which have - API conforming to C99 and POSIX. Tokyo Tyrant is a free software - licensed under the GNU Lesser General Public License. - ''; - - homepage = "https://fallabs.com/tokyotyrant/"; - - license = lib.licenses.lgpl21Plus; - - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/toml-f/default.nix b/pkgs/development/libraries/toml-f/default.nix deleted file mode 100644 index 3f95d5682f9e..000000000000 --- a/pkgs/development/libraries/toml-f/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, gfortran -, meson -, ninja -, pkg-config -, test-drive -}: - -stdenv.mkDerivation rec { - pname = "toml-f"; - version = "0.4.2"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - hash = "sha256-+cac4rUNpd2w3yBdH1XoCKdJ9IgOHZioZg8AhzGY0FE="; - }; - - nativeBuildInputs = [ gfortran meson ninja pkg-config ]; - - buildInputs = [ test-drive ]; - - outputs = [ "out" "dev" ]; - - # tftest-build fails on aarch64-linux - doCheck = !stdenv.isAarch64; - - meta = with lib; { - description = "TOML parser implementation for data serialization and deserialization in Fortran"; - license = with licenses; [ asl20 mit ]; - homepage = "https://github.com/toml-f/toml-f"; - platforms = platforms.linux; - maintainers = [ maintainers.sheepforce ]; - }; -} diff --git a/pkgs/development/libraries/tomlplusplus/default.nix b/pkgs/development/libraries/tomlplusplus/default.nix deleted file mode 100644 index dda352d0769f..000000000000 --- a/pkgs/development/libraries/tomlplusplus/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, stdenv -, meson -, cmake -, ninja -, fetchFromGitHub -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "tomlplusplus"; - version = "3.4.0"; - - src = fetchFromGitHub { - owner = "marzer"; - repo = "tomlplusplus"; - rev = "v${finalAttrs.version}"; - hash = "sha256-h5tbO0Rv2tZezY58yUbyRVpsfRjY3i+5TPkkxr6La8M="; - }; - - nativeBuildInputs = [ meson cmake ninja ]; - - meta = with lib; { - homepage = "https://github.com/marzer/tomlplusplus"; - description = "Header-only TOML config file parser and serializer for C++17"; - license = licenses.mit; - maintainers = with maintainers; [ Scrumplex ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix deleted file mode 100644 index 6598da9a6f82..000000000000 --- a/pkgs/development/libraries/totem-pl-parser/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchpatch, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome, glib }: - -stdenv.mkDerivation rec { - pname = "totem-pl-parser"; - version = "3.26.6"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "wN8PaNXPnX2kPIHH8T8RFYNYNo+Ywi1Hci870EvTrBw="; - }; - - patches = [ - # Upstream MR: https://gitlab.gnome.org/GNOME/totem-pl-parser/-/merge_requests/46 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/totem-pl-parser/-/commit/f4f69c9b99095416aaed18a73f7486ad9eb04aa9.patch"; - sha256 = "sha256-Uya5fgFgauv5rIpVK3CDGCieyMus7VjcLMMe/vQ2WWY="; - }) - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - strictDeps = true; - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config gettext glib gobject-introspection ]; - buildInputs = [ libxml2 glib ]; - - mesonFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-Dintrospection=false" - ]; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/totem-pl-parser"; - description = "Simple GObject-based library to parse and save a host of playlist formats"; - maintainers = teams.gnome.members; - license = licenses.lgpl2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 6d3a29c28ba7..bea611224444 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchFromGitHub , autoreconfHook, autoconf-archive, pkg-config, doxygen, perl , openssl, json_c, curl, libgcrypt -, cmocka, uthash, ibm-sw-tpm2, iproute2, procps, which -, libuuid +, cmocka, uthash, swtpm, iproute2, procps, which +, libuuid, libtpms }: let # Avoid a circular dependency on Linux systems (systemd depends on tpm2-tss, @@ -10,7 +10,7 @@ let # needs to be conditional based on isLinux because procps for other systems # might not support the withSystemd option. procpsWithoutSystemd = procps.override { withSystemd = false; }; - procps_pkg = if stdenv.isLinux then procpsWithoutSystemd else procps; + procps_pkg = if stdenv.hostPlatform.isLinux then procpsWithoutSystemd else procps; in stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - openssl json_c curl libgcrypt uthash libuuid + openssl json_c curl libgcrypt uthash libuuid libtpms ] # cmocka is checked in the configure script # when unit and/or integration testing is enabled @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ++ lib.optional doInstallCheck cmocka; nativeInstallCheckInputs = [ - cmocka which openssl procps_pkg iproute2 ibm-sw-tpm2 + cmocka which openssl procps_pkg iproute2 swtpm ]; strictDeps = true; @@ -68,11 +68,16 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs script substituteInPlace src/tss2-tcti/tctildr-dl.c \ - --replace '@PREFIX@' $out/lib/ + --replace-fail '@PREFIX@' $out/lib/ substituteInPlace ./test/unit/tctildr-dl.c \ - --replace '@PREFIX@' $out/lib/ + --replace-fail '@PREFIX@' $out/lib/ substituteInPlace ./bootstrap \ - --replace 'git describe --tags --always --dirty' 'echo "${version}"' + --replace-fail 'git describe --tags --always --dirty' 'echo "${version}"' + for src in src/tss2-tcti/tcti-libtpms.c test/unit/tcti-libtpms.c; do + substituteInPlace "$src" \ + --replace-fail '"libtpms.so"' '"${libtpms.out}/lib/libtpms.so"' \ + --replace-fail '"libtpms.so.0"' '"${libtpms.out}/lib/libtpms.so.0"' + done ''; configureFlags = lib.optionals doInstallCheck [ @@ -87,7 +92,7 @@ stdenv.mkDerivation rec { ''; doCheck = false; - doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # Since we rewrote the load path in the dynamic loader for the TCTI # The various tcti implementation should be placed in their target directory # before we could run tests, so we make turn checkPhase into installCheckPhase diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix deleted file mode 100644 index da5274e0b7df..000000000000 --- a/pkgs/development/libraries/tracker/default.nix +++ /dev/null @@ -1,184 +0,0 @@ -{ stdenv -, lib -, fetchurl -, gettext -, meson -, mesonEmulatorHook -, ninja -, pkg-config -, asciidoc -, gobject-introspection -, buildPackages -, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages -, vala -, python3 -, gi-docgen -, graphviz -, libxml2 -, glib -, wrapGAppsNoGuiHook -, sqlite -, libstemmer -, gnome -, icu -, libuuid -, libsoup -, libsoup_3 -, json-glib -, avahi -, systemd -, dbus -, writeText -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "tracker"; - version = "3.7.3"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = with finalAttrs; "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-qz1KUJN+BMXteEb227mZ4pCYGUAvOJylku5rd90o0fk="; - }; - - strictDeps = true; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - asciidoc - gettext - glib - wrapGAppsNoGuiHook - gi-docgen - graphviz - (python3.pythonOnBuildForHost.withPackages (p: [ p.pygobject3 ])) - ] ++ lib.optionals withIntrospection [ - gobject-introspection - vala - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ - glib - libxml2 - sqlite - icu - libsoup - libsoup_3 - libuuid - json-glib - avahi - libstemmer - dbus - ] ++ lib.optionals stdenv.isLinux [ - systemd - ]; - - nativeCheckInputs = [ - dbus - ]; - - mesonFlags = [ - "-Ddocs=true" - (lib.mesonEnable "introspection" withIntrospection) - (lib.mesonEnable "vapi" withIntrospection) - (lib.mesonBool "test_utils" withIntrospection) - ] ++ ( - let - # https://gitlab.gnome.org/GNOME/tracker/-/blob/master/meson.build#L159 - crossFile = writeText "cross-file.conf" '' - [properties] - sqlite3_has_fts5 = '${lib.boolToString (lib.hasInfix "-DSQLITE_ENABLE_FTS3" sqlite.NIX_CFLAGS_COMPILE)}' - ''; - in - [ - "--cross-file=${crossFile}" - ] - ) ++ lib.optionals (!stdenv.isLinux) [ - "-Dsystemd_user_services=false" - ]; - - doCheck = - # https://gitlab.gnome.org/GNOME/tracker/-/issues/402 - !stdenv.isDarwin - # https://gitlab.gnome.org/GNOME/tracker/-/issues/398 - && !stdenv.is32bit; - - postPatch = '' - chmod +x \ - docs/reference/libtracker-sparql/embed-files.py \ - docs/reference/libtracker-sparql/generate-svgs.sh - patchShebangs \ - utils/data-generators/cc/generate \ - docs/reference/libtracker-sparql/embed-files.py \ - docs/reference/libtracker-sparql/generate-svgs.sh - ''; - - preCheck = - let - linuxDot0 = lib.optionalString stdenv.isLinux ".0"; - darwinDot0 = lib.optionalString stdenv.isDarwin ".0"; - extension = stdenv.hostPlatform.extensions.sharedLibrary; - in - '' - # (tracker-store:6194): Tracker-CRITICAL **: 09:34:07.722: Cannot initialize database: Could not open sqlite3 database:'/homeless-shelter/.cache/tracker/meta.db': unable to open database file - export HOME=$(mktemp -d) - - # Our gobject-introspection patches make the shared library paths absolute - # in the GIR files. When running functional tests, the library is not yet installed, - # though, so we need to replace the absolute path with a local one during build. - # We are using a symlink that will be overridden during installation. - mkdir -p $out/lib - ln -s $PWD/src/libtracker-sparql/libtracker-sparql-3.0${darwinDot0}${extension} $out/lib/libtracker-sparql-3.0${darwinDot0}${extension}${linuxDot0} - ''; - - checkPhase = '' - runHook preCheck - - dbus-run-session \ - --config-file=${dbus}/share/dbus-1/session.conf \ - meson test \ - --timeout-multiplier 2 \ - --print-errorlogs - - runHook postCheck - ''; - - postCheck = '' - # Clean up out symlinks - rm -r $out/lib - ''; - - postFixup = '' - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput "share/doc" "$devdoc" - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = finalAttrs.pname; - }; - tests.pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - }; - }; - - meta = with lib; { - homepage = "https://tracker.gnome.org/"; - description = "Desktop-neutral user information store, search tool and indexer"; - mainProgram = "tracker3"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.unix; - pkgConfigModules = [ "tracker-sparql-3.0" "tracker-testutils-3.0" ]; - }; -}) diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix deleted file mode 100644 index 8cd0faf48673..000000000000 --- a/pkgs/development/libraries/tre/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{lib, stdenv, fetchurl, fetchpatch}: - -stdenv.mkDerivation rec { - pname = "tre"; - version = "0.8.0"; - src = fetchurl { - url = "https://laurikari.net/tre/${pname}-${version}.tar.gz"; - sha256 = "1pd7qsa7vc3ybdc6h2gr4pm9inypjysf92kab945gg4qa6jp11my"; - }; - - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/t/tre/0.8.0-6/debian/patches/03-cve-2016-8859"; - sha256 = "0navhizym6qxd4gngrsslbij8x9r3s67p1jzzhvsnq6ky49j7w3p"; - }) - ]; - - meta = { - description = "Lightweight and robust POSIX compliant regexp matching library"; - homepage = "https://laurikari.net/tre/"; - license = lib.licenses.bsd2; - mainProgram = "agrep"; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix deleted file mode 100644 index 0477b6ca6d11..000000000000 --- a/pkgs/development/libraries/tremor/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, libogg }: - -stdenv.mkDerivation { - pname = "tremor"; - version = "unstable-2018-03-16"; - - src = fetchFromGitLab { - owner = "xiph"; - repo = "tremor"; - domain = "gitlab.xiph.org"; - rev = "562307a4a7082e24553f3d2c55dab397a17c4b4f"; - sha256 = "0m07gq4zfgigsiz8b518xyb19v7qqp76qmp7lb262825vkqzl3zq"; - }; - - 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 ]; - - preConfigure = '' - sed -i /XIPH_PATH_OGG/d configure - ''; - - meta = { - homepage = "https://xiph.org/tremor/"; - description = "Fixed-point version of the Ogg Vorbis decoder"; - license = lib.licenses.bsd3; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix deleted file mode 100644 index 09c7ff795d3d..000000000000 --- a/pkgs/development/libraries/trompeloeil/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "trompeloeil"; - version = "48"; - - src = fetchFromGitHub { - owner = "rollbear"; - repo = "trompeloeil"; - rev = "v${version}"; - sha256 = "sha256-7MXMbqksHqcyvwJsW8+wPWfnKTbQhUlGa4GcidpiBFw="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Header only C++14 mocking framework"; - homepage = "https://github.com/rollbear/trompeloeil"; - license = licenses.boost; - maintainers = [ maintainers.bjornfor ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix deleted file mode 100644 index c12f9a44ac6d..000000000000 --- a/pkgs/development/libraries/tsocks/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "tsocks"; - version = "1.8beta5"; - - src = fetchurl { - url = "mirror://sourceforge/tsocks/${pname}-${version}.tar.gz"; - sha256 = "0ixkymiph771dcdzvssi9dr2pk1bzaw9zv85riv3xl40mzspx7c4"; - }; - - patches = [ ./poll.patch ]; - - preConfigure = '' - sed -i -e "s,\\\/usr,"$(echo $out|sed -e "s,\\/,\\\\\\\/,g")",g" tsocks - substituteInPlace tsocks --replace /usr $out - export configureFlags="$configureFlags --libdir=$out/lib" - ''; - - preBuild = '' - # We don't need the saveme binary, it is in fact never stored and we're - # never injecting stuff into ld.so.preload anyway - sed -i \ - -e "s,TARGETS=\(.*\)..SAVE.\(.*\),TARGETS=\1\2," \ - -e "/SAVE/d" Makefile - ''; - - meta = with lib; { - description = "Transparent SOCKS v4 proxying library"; - mainProgram = "tsocks"; - homepage = "https://tsocks.sourceforge.net/"; - license = lib.licenses.gpl2; - maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.unix; - broken = stdenv.hostPlatform.isDarwin; - }; -} diff --git a/pkgs/development/libraries/tsocks/poll.patch b/pkgs/development/libraries/tsocks/poll.patch deleted file mode 100644 index 2bfeb9f779ca..000000000000 --- a/pkgs/development/libraries/tsocks/poll.patch +++ /dev/null @@ -1,26 +0,0 @@ -From Ingo Hadan <ingo.hadan@sdm.de> Fri, 02 Apr 2010 21:08:50 +0200 -From: Julien Moutinho <julm+tsocks@autogeree.net> -Date: Fri, 26 Apr 2013 01:57:26 +0200 -Subject: tsocks fails if socksified application uses poll(2) (e.g. subversion-1.5) - ---- -diff --git a/tsocks.c b/tsocks.c -index 9cfdfff..470babd 100644 ---- a/tsocks.c -+++ b/tsocks.c -@@ -657,10 +657,11 @@ int poll(POLL_SIGNATURE) { - * be ready for writing), otherwise we'll just let the select loop - * come around again (since we can't flag it for read, we don't know - * if there is any data to be read and can't be bothered checking) */ -- if (conn->selectevents & WRITE) { -- setevents |= POLLOUT; -+ if (conn->selectevents & POLLOUT) { -+ ufds[i].revents |= POLLOUT; - nevents++; - } -+ ufds[i].events = conn->selectevents; - } - } - } while (nevents == 0); - - diff --git a/pkgs/development/libraries/tweeny/default.nix b/pkgs/development/libraries/tweeny/default.nix deleted file mode 100644 index 131cf2194ae8..000000000000 --- a/pkgs/development/libraries/tweeny/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "tweeny"; - version = "3.2.0"; - - src = fetchFromGitHub { - owner = "mobius3"; - repo = "tweeny"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-VmvOMK+FjYZXKH9kPUT2L7pmJMPSr5eXptCcoGWK+qo="; - }; - - nativeBuildInputs = [ - cmake - ]; - - doCheck = true; - - meta = with lib; { - description = "Modern C++ tweening library"; - license = licenses.mit; - homepage = "http://mobius3.github.io/tweeny"; - maintainers = [ maintainers.doronbehar ]; - platforms = with platforms; darwin ++ linux; - }; -}) diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/development/libraries/ubus/default.nix deleted file mode 100644 index 662ec1c7b035..000000000000 --- a/pkgs/development/libraries/ubus/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, cmake, fetchgit, libubox, libjson }: - -stdenv.mkDerivation { - pname = "ubus"; - version = "unstable-2023-12-18"; - - src = fetchgit { - url = "https://git.openwrt.org/project/ubus.git"; - rev = "65bb027054def3b94a977229fd6ad62ddd32345b"; - hash = "sha256-n82Ub0IiuvWbnlDCoN+0hjo/1PbplEbc56kuOYMrHxQ="; - }; - - cmakeFlags = [ "-DBUILD_LUA=OFF" ]; - buildInputs = [ libubox libjson ]; - nativeBuildInputs = [ cmake ]; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - "-Wno-error=gnu-folding-constant" - ]); - - meta = with lib; { - description = "OpenWrt system message/RPC bus"; - homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary"; - license = licenses.lgpl21Only; - platforms = platforms.all; - maintainers = with maintainers; [ mkg20001 ]; - }; -} diff --git a/pkgs/development/libraries/ucc/default.nix b/pkgs/development/libraries/ucc/default.nix deleted file mode 100644 index 58dc82e3cb7b..000000000000 --- a/pkgs/development/libraries/ucc/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, libtool, automake, autoconf, ucx -, config -, enableCuda ? config.cudaSupport -, cudaPackages -, enableAvx ? stdenv.hostPlatform.avxSupport -, enableSse41 ? stdenv.hostPlatform.sse4_1Support -, enableSse42 ? stdenv.hostPlatform.sse4_2Support -} : - -stdenv.mkDerivation rec { - pname = "ucc"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "openucx"; - repo = "ucc"; - rev = "v${version}"; - sha256 = "sha256-xcJLYktkxNK2ewWRgm8zH/dMaIoI+9JexuswXi7MpAU="; - }; - - outputs = [ "out" "dev" ]; - - enableParallelBuilding = true; - - postPatch = '' - - for comp in $(find src/components -name Makefile.am); do - substituteInPlace $comp \ - --replace "/bin/bash" "${stdenv.shell}" - done - ''; - - nativeBuildInputs = [ libtool automake autoconf ] - ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]; - buildInputs = [ ucx ] - ++ lib.optionals enableCuda [ - cudaPackages.cuda_cccl - cudaPackages.cuda_cudart - ]; - - - preConfigure = '' - ./autogen.sh - '' + lib.optionalString enableCuda '' - configureFlagsArray+=( "--with-nvcc-gencode=${builtins.concatStringsSep " " cudaPackages.cudaFlags.gencode}" ) - ''; - configureFlags = [ ] - ++ lib.optional enableSse41 "--with-sse41" - ++ lib.optional enableSse42 "--with-sse42" - ++ lib.optional enableAvx "--with-avx" - ++ lib.optional enableCuda "--with-cuda=${cudaPackages.cuda_cudart}"; - - postInstall = '' - find $out/lib/ -name "*.la" -exec rm -f \{} \; - - moveToOutput bin/ucc_info $dev - ''; - - meta = with lib; { - description = "Collective communication operations API"; - mainProgram = "ucc_info"; - license = licenses.bsd3; - maintainers = [ maintainers.markuskowa ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/development/libraries/uci/default.nix deleted file mode 100644 index 55281e78ac74..000000000000 --- a/pkgs/development/libraries/uci/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, cmake, fetchgit, pkg-config, libubox }: - -stdenv.mkDerivation { - pname = "uci"; - version = "unstable-2023-08-10"; - - src = fetchgit { - url = "https://git.openwrt.org/project/uci.git"; - rev = "5781664d5087ccc4b5ab58505883231212dbedbc"; - hash = "sha256-8MyFaZdAMh5oMPO/5QyNT+Or57eBL3mamJLblGGoF9g="; - }; - - hardeningDisable = [ "all" ]; - cmakeFlags = [ "-DBUILD_LUA=OFF" ]; - buildInputs = [ libubox ]; - nativeBuildInputs = [ cmake pkg-config ]; - - meta = with lib; { - description = "OpenWrt Unified Configuration Interface"; - mainProgram = "uci"; - homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary"; - license = licenses.lgpl21Only; - platforms = platforms.all; - maintainers = with maintainers; [ mkg20001 ]; - }; -} diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix deleted file mode 100644 index d8e05e9374bf..000000000000 --- a/pkgs/development/libraries/ucl/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "ucl"; - version = "1.03"; - - src = fetchurl { - url = "https://www.oberhumer.com/opensource/ucl/download/ucl-${version}.tar.gz"; - sha256 = "b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348"; - }; - - # needed to successfully compile with gcc 6+ and modern clang versions where - # `-Wimplicit-function-declaration` is otherwise on and errors by default - env.CFLAGS = "-std=c89"; - - meta = { - homepage = "http://www.oberhumer.com/opensource/ucl/"; - description = "Portable lossless data compression library"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/uclient/default.nix b/pkgs/development/libraries/uclient/default.nix deleted file mode 100644 index 7206b6ad98fc..000000000000 --- a/pkgs/development/libraries/uclient/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, lib, fetchgit, cmake, pkg-config, libubox }: - -stdenv.mkDerivation { - pname = "uclient"; - version = "unstable-2023-04-13"; - - src = fetchgit { - url = "https://git.openwrt.org/project/uclient.git"; - rev = "007d945467499f43656b141171d31f5643b83a6c"; - hash = "sha256-A47dyVc2MtOL6aImZ0b3SMWH2vzjfAXzRAOF4nfH6S0="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buidInputs = [ libubox ]; - - preConfigure = '' - sed -e 's|ubox_include_dir libubox/ustream-ssl.h|ubox_include_dir libubox/ustream-ssl.h HINTS ${libubox}/include|g' \ - -e 's|ubox_library NAMES ubox|ubox_library NAMES ubox HINTS ${libubox}/lib|g' \ - -i CMakeLists.txt - ''; - - meta = with lib; { - description = "Tiny OpenWrt fork of libnl"; - homepage = "https://git.openwrt.org/?p=project/uclient.git;a=summary"; - license = licenses.isc; - maintainers = with maintainers; [ mkg20001 ]; - mainProgram = "uclient-fetch"; - platforms = platforms.all; - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix deleted file mode 100644 index 4ee7a90dd310..000000000000 --- a/pkgs/development/libraries/ucommon/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config -, gnutls -}: - -stdenv.mkDerivation rec { - pname = "ucommon"; - version = "7.0.0"; - - src = fetchurl { - url = "mirror://gnu/commoncpp/${pname}-${version}.tar.gz"; - sha256 = "6ac9f76c2af010f97e916e4bae1cece341dc64ca28e3881ff4ddc3bc334060d7"; - }; - - nativeBuildInputs = [ pkg-config ]; - - # use C++14 Standard until error handling code gets updated upstream - CXXFLAGS = [ "-std=c++14" ]; - - # disable flaky networking test - postPatch = '' - substituteInPlace test/stream.cpp \ - --replace 'ifndef UCOMMON_SYSRUNTIME' 'if 0' - ''; - - # ucommon.pc has link time depdendencies on -lusecure -lucommon -lgnutls - propagatedBuildInputs = [ gnutls ]; - - doCheck = true; - - meta = { - description = "C++ library to facilitate using C++ design patterns"; - homepage = "https://www.gnu.org/software/commoncpp/"; - license = lib.licenses.lgpl3Plus; - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix deleted file mode 100644 index 8f134cd594e3..000000000000 --- a/pkgs/development/libraries/ucx/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, doxygen, numactl -, rdma-core, libbfd, libiberty, perl, zlib, symlinkJoin, pkg-config -, config -, autoAddDriverRunpath -, enableCuda ? config.cudaSupport -, cudaPackages -, enableRocm ? config.rocmSupport -, rocmPackages -}: - -let - rocmList = with rocmPackages; [ rocm-core rocm-runtime rocm-device-libs clr ]; - - rocm = symlinkJoin { - name = "rocm"; - paths = rocmList; - }; - -in -stdenv.mkDerivation rec { - pname = "ucx"; - version = "1.17.0"; - - src = fetchFromGitHub { - owner = "openucx"; - repo = "ucx"; - rev = "v${version}"; - sha256 = "sha256-Qd3c51LeF04haZA4wK6loNZwX2a3ju+ljwdPYPoUKCQ="; - }; - - outputs = [ "out" "doc" "dev" ]; - - nativeBuildInputs = [ - autoreconfHook - doxygen - pkg-config - ] - ++ lib.optionals enableCuda [ - cudaPackages.cuda_nvcc - autoAddDriverRunpath - ]; - - buildInputs = [ - libbfd - libiberty - numactl - perl - rdma-core - zlib - ] ++ lib.optionals enableCuda [ - cudaPackages.cuda_cudart - cudaPackages.cuda_nvml_dev - - ] ++ lib.optionals enableRocm rocmList; - - LDFLAGS = lib.optionals enableCuda [ - # Fake libnvidia-ml.so (the real one is deployed impurely) - "-L${lib.getLib cudaPackages.cuda_nvml_dev}/lib/stubs" - ]; - - configureFlags = [ - "--with-rdmacm=${lib.getDev rdma-core}" - "--with-dc" - "--with-rc" - "--with-dm" - "--with-verbs=${lib.getDev rdma-core}" - ] ++ lib.optionals enableCuda [ "--with-cuda=${cudaPackages.cuda_cudart}" ] - ++ lib.optional enableRocm "--with-rocm=${rocm}"; - - postInstall = '' - find $out/lib/ -name "*.la" -exec rm -f \{} \; - - moveToOutput bin/ucx_info $dev - - moveToOutput share/ucx/examples $doc - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Unified Communication X library"; - homepage = "https://www.openucx.org"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = [ maintainers.markuskowa ]; - }; -} diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/development/libraries/udns/default.nix deleted file mode 100644 index f9c5a80582b7..000000000000 --- a/pkgs/development/libraries/udns/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv, fetchurl }: - -# this expression is mostly based on debian's packaging -# https://tracker.debian.org/media/packages/u/udns/rules-0.6-1 - -stdenv.mkDerivation rec { - pname = "udns"; - version = "0.6"; - - configurePhase = "./configure --enable-ipv6"; - - buildPhase = "make staticlib sharedlib rblcheck_s dnsget_s"; - - src = fetchurl { - url = "http://www.corpit.ru/mjt/udns/${pname}-${version}.tar.gz"; - sha256 = "sha256-aWotDVGNqYXZdaZeEdFm8/V829HUI3aguFMH9JYBxug="; - }; - - # udns uses a very custom build and hardcodes a .so name in a few places. - # Instead of fighting with it to apply the standard dylib script, change - # the right place in the Makefile itself. - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile.in \ - --replace --soname, -install_name,$out/lib/ - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mkdir -p $out/include - mkdir -p $out/lib - mkdir -p $out/share/man/man1 - mkdir -p $out/share/man/man3 - cp dnsget_s $out/bin/dnsget - cp rblcheck_s $out/bin/rblcheck - cp udns.h $out/include/ - cp libudns.a $out/lib/ - cp libudns.so.0 $out/lib/ - ln -rs $out/lib/libudns.so.0 $out/lib/libudns.so - cp dnsget.1 rblcheck.1 $out/share/man/man1 - cp udns.3 $out/share/man/man3 - runHook postInstall - ''; - - # keep man3 - outputDevdoc = "out"; - - meta = with lib; { - homepage = "http://www.corpit.ru/mjt/udns.html"; - description = "Async-capable DNS stub resolver library"; - license = licenses.lgpl21Plus; - maintainers = [ maintainers.womfoo ]; - platforms = platforms.unix; - }; - -} diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix deleted file mode 100644 index 710979057d43..000000000000 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv -, lib -, fetchFromGitLab -, meson -, mesonEmulatorHook -, ninja -, pkg-config -, gobject-introspection -, vala -, gtk-doc -, docbook-xsl-nons -, glib -, libsoup -}: - -stdenv.mkDerivation rec { - pname = "uhttpmock"; - version = "0.5.5"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "pwithnall"; - repo = "uhttpmock"; - rev = version; - sha256 = "NuxiVVowZ8ilP9rcgapCe9OzFCpoOfZxZiSyjTeOrts="; - }; - - strictDeps = true; - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - vala - gtk-doc - docbook-xsl-nons - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ - glib - libsoup - ]; - - meta = with lib; { - description = "Project for mocking web service APIs which use HTTP or HTTPS"; - homepage = "https://gitlab.freedesktop.org/pwithnall/uhttpmock/"; - license = licenses.lgpl21Plus; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix deleted file mode 100644 index f5058237d5e5..000000000000 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config }: - -stdenv.mkDerivation rec { - pname = "uid_wrapper"; - version = "1.3.1"; - - src = fetchurl { - url = "mirror://samba/cwrap/uid_wrapper-${version}.tar.gz"; - sha256 = "sha256-9mB9hketooqW+rg8Sa1y/IPrbTiZHKJ7JJWzWP8Pbew="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - meta = with lib; { - description = "Wrapper for the user, group and hosts NSS API"; - homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;"; - license = licenses.bsd3; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix deleted file mode 100644 index 38b36267ef34..000000000000 --- a/pkgs/development/libraries/umockdev/default.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ stdenv -, lib -, docbook-xsl-nons -, fetchurl -, glib -, gobject-introspection -, gtk-doc -, libgudev -, libpcap -, meson -, mesonEmulatorHook -, ninja -, pkg-config -, python3 -, substituteAll -, systemdMinimal -, usbutils -, vala -, which -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "umockdev"; - 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-q6lcMjA3yELxYXkxJgIxuFV9EZqiiRy8qLgR/MVZKUo="; - }; - - patches = [ - # Hardcode absolute paths to libraries so that consumers - # do not need to set LD_LIBRARY_PATH themselves. - ./hardcode-paths.patch - - # Replace references to udevadm with an absolute paths, so programs using - # umockdev will just work without having to provide it in their test environment - # $PATH. - (substituteAll { - src = ./substitute-udevadm.patch; - udevadm = "${systemdMinimal}/bin/udevadm"; - }) - ]; - - nativeBuildInputs = [ - docbook-xsl-nons - gobject-introspection - gtk-doc - meson - ninja - pkg-config - vala - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; - - buildInputs = [ - glib - systemdMinimal - libpcap - ]; - - checkInputs = lib.optionals finalAttrs.passthru.withGudev [ - libgudev - ]; - - nativeCheckInputs = [ - python3 - usbutils - which - ]; - - strictDeps = true; - - mesonFlags = [ - "-Dgtk_doc=true" - ]; - - doCheck = true; - - postPatch = '' - # Substitute the path to this derivation in the patch we apply. - substituteInPlace src/umockdev-wrapper \ - --subst-var-by 'LIBDIR' "''${!outputLib}/lib" - ''; - - preCheck = '' - # Our patch makes the path to the `LD_PRELOAD`ed library absolute. - # When running tests, the library is not yet installed, though, - # so we need to replace the absolute path with a local one during build. - # We are using a symlink that will be overridden during installation. - mkdir -p "$out/lib" - ln -s "$PWD/libumockdev-preload.so.0" "$out/lib/libumockdev-preload.so.0" - ''; - - passthru = { - # libgudev is needed for an optional test but it itself relies on umockdev for testing. - withGudev = false; - - tests = { - withGudev = finalAttrs.finalPackage.overrideAttrs (attrs: { - passthru = attrs.passthru // { - withGudev = true; - }; - }); - }; - }; - - meta = with lib; { - homepage = "https://github.com/martinpitt/umockdev"; - changelog = "https://github.com/martinpitt/umockdev/releases/tag/${finalAttrs.version}"; - description = "Mock hardware devices for creating unit tests"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ flokli ]; - platforms = with platforms; linux; - }; -}) diff --git a/pkgs/development/libraries/umockdev/hardcode-paths.patch b/pkgs/development/libraries/umockdev/hardcode-paths.patch deleted file mode 100644 index 75a5c014a996..000000000000 --- a/pkgs/development/libraries/umockdev/hardcode-paths.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/meson.build b/meson.build -index 15d9e5d..a1906dd 100644 ---- a/meson.build -+++ b/meson.build -@@ -44,6 +44,7 @@ g_ir_compiler = find_program('g-ir-compiler', required: false) - - conf.set('PACKAGE_NAME', meson.project_name()) - conf.set_quoted('VERSION', meson.project_version()) -+conf.set_quoted('LIBDIR', get_option('prefix') / get_option('libdir')) - - # glibc versions somewhere between 2.28 and 2.34 - if cc.has_function('__fxstatat', prefix: '#include <sys/stat.h>') -@@ -156,7 +157,7 @@ hacked_gir = custom_target('UMockdev-1.0 hacked gir', - - if g_ir_compiler.found() - umockdev_typelib = custom_target('UMockdev-1.0 typelib', -- command: [g_ir_compiler, '--output', '@OUTPUT@', '-l', 'libumockdev.so.0', '@INPUT@'], -+ command: [g_ir_compiler, '--output', '@OUTPUT@', '-l', get_option('prefix') / get_option('libdir') / 'libumockdev.so.0', '@INPUT@'], - input: hacked_gir, - output: 'UMockdev-1.0.typelib', - install: true, -diff --git a/src/config.vapi b/src/config.vapi -index 5269dd0..a2ec46d 100644 ---- a/src/config.vapi -+++ b/src/config.vapi -@@ -2,5 +2,6 @@ - namespace Config { - public const string PACKAGE_NAME; - public const string VERSION; -+ public const string LIBDIR; - } - -diff --git a/src/umockdev-record.vala b/src/umockdev-record.vala -index bf0e644..ff5ea59 100644 ---- a/src/umockdev-record.vala -+++ b/src/umockdev-record.vala -@@ -444,7 +444,7 @@ main (string[] args) - preload = ""; - else - preload = preload + ":"; -- checked_setenv("LD_PRELOAD", preload + "libumockdev-preload.so.0"); -+ checked_setenv("LD_PRELOAD", preload + Config.LIBDIR + "/libumockdev-preload.so.0"); - - try { - root_dir = DirUtils.make_tmp("umockdev.XXXXXX"); -diff --git a/src/umockdev-run.vala b/src/umockdev-run.vala -index 7b0753e..66b778b 100644 ---- a/src/umockdev-run.vala -+++ b/src/umockdev-run.vala -@@ -95,7 +95,7 @@ main (string[] args) - preload = ""; - else - preload = preload + ":"; -- checked_setenv ("LD_PRELOAD", preload + "libumockdev-preload.so.0"); -+ checked_setenv ("LD_PRELOAD", preload + Config.LIBDIR + "/libumockdev-preload.so.0"); - - var testbed = new UMockdev.Testbed (); - -diff --git a/src/umockdev-wrapper b/src/umockdev-wrapper -index 6ce4dcd..706c49a 100755 ---- a/src/umockdev-wrapper -+++ b/src/umockdev-wrapper -@@ -1,5 +1,5 @@ - #!/bin/sh - # Wrapper program to preload the libumockdev library, so that test programs can - # set $UMOCKDEV_DIR for redirecting sysfs and other queries to a test bed. --exec env LD_PRELOAD=libumockdev-preload.so.0:$LD_PRELOAD "$@" -+exec env LD_PRELOAD=@LIBDIR@/libumockdev-preload.so.0:$LD_PRELOAD "$@" - diff --git a/pkgs/development/libraries/umockdev/substitute-udevadm.patch b/pkgs/development/libraries/umockdev/substitute-udevadm.patch deleted file mode 100644 index b09d151018e5..000000000000 --- a/pkgs/development/libraries/umockdev/substitute-udevadm.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 09efbe8090f501c60975d5467fb587ed633d6a01 Mon Sep 17 00:00:00 2001 -From: Florian Klink <flokli@flokli.de> -Date: Wed, 24 Jan 2024 14:29:28 +0200 -Subject: [PATCH] substitute udevadm - ---- - src/umockdev-record.vala | 2 +- - tests/test-umockdev-run.vala | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/umockdev-record.vala b/src/umockdev-record.vala -index 2d49bc8..272f25e 100644 ---- a/src/umockdev-record.vala -+++ b/src/umockdev-record.vala -@@ -223,7 +223,7 @@ record_device(string dev) - int exitcode; - try { - Process.spawn_sync(null, -- {"udevadm", "info", "--query=all", "--path", dev}, -+ {"@udevadm@", "info", "--query=all", "--path", dev}, - null, - SpawnFlags.SEARCH_PATH, - null, -diff --git a/tests/test-umockdev-run.vala b/tests/test-umockdev-run.vala -index cd00a08..94616cb 100644 ---- a/tests/test-umockdev-run.vala -+++ b/tests/test-umockdev-run.vala -@@ -199,8 +199,8 @@ A: size=1048576\n - - // unfortunately the udevadm output between distros is not entirely constant - assert (get_program_out ( -- "udevadm", -- umockdev_run_command + "-d " + umockdev_file + " -- udevadm info --query=all --name=/dev/loop23", -+ "@udevadm@", -+ umockdev_run_command + "-d " + umockdev_file + " -- @udevadm@ info --query=all --name=/dev/loop23", - out sout, out serr, out exit)); - - assert_cmpstr (serr, CompareOperator.EQ, ""); --- -2.43.0 - diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix deleted file mode 100644 index f2e2e27b35d7..000000000000 --- a/pkgs/development/libraries/unibilium/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, libtool, pkg-config, perl, ncurses }: - -stdenv.mkDerivation rec { - pname = "unibilium"; - version = "2.1.1"; - - src = fetchFromGitHub { - owner = "neovim"; - repo = "unibilium"; - rev = "v${version}"; - sha256 = "sha256-A/WECvma7u/Mmecvzi0cP168dt4v+zwC8CiFBkqWezA="; - }; - - makeFlags = [ "PREFIX=$(out)" "LIBTOOL=${libtool}/bin/libtool" ]; - - strictDeps = true; - - nativeBuildInputs = [ pkg-config perl libtool ]; - buildInputs = [ ncurses ]; - - meta = with lib; { - description = "Very basic terminfo library"; - license = licenses.lgpl3Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ pSub ]; - }; -} diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix deleted file mode 100644 index f26365fa8e63..000000000000 --- a/pkgs/development/libraries/unicap/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, libusb-compat-0_1, libraw1394, dcraw, intltool, perl, v4l-utils }: - -stdenv.mkDerivation rec { - pname = "libunicap"; - version="0.9.12"; - - src = fetchurl { - url = "https://www.unicap-imaging.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9"; - }; - - nativeBuildInputs = [ intltool ]; - buildInputs = [ libusb-compat-0_1 libraw1394 dcraw perl v4l-utils ]; - - patches = [ - # Debian has a patch that fixes the build. - (fetchurl { - url = "https://sources.debian.net/data/main/u/unicap/0.9.12-2/debian/patches/1009_v4l1.patch"; - sha256 = "1lgypmhdj681m7d1nmzgvh19cz8agj2f31wlnfib0ha8i3g5hg5w"; - }) - ]; - - postPatch = '' - find . -type f -exec sed -e '/linux\/types\.h/d' -i '{}' ';' - sed -e 's@/etc/udev@'"$out"'/&@' -i data/Makefile.* - ''; - - meta = with lib; { - description = "Universal video capture API"; - homepage = "http://www.unicap-imaging.org/"; - maintainers = [ maintainers.raskin ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix index b6a91a7367a4..93fc0531ccd9 100644 --- a/pkgs/development/libraries/unicorn/default.nix +++ b/pkgs/development/libraries/unicorn/default.nix @@ -1,38 +1,39 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, cmake -, IOKit -, cctools +{ + lib, + stdenv, + cctools, + cmake, + fetchFromGitHub, + IOKit, + pkg-config, }: stdenv.mkDerivation rec { pname = "unicorn"; - version = "2.0.1.post1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "unicorn-engine"; - repo = pname; - rev = version; - hash = "sha256-Jz5C35rwnDz0CXcfcvWjkwScGNQO1uijF7JrtZhM7mI="; + repo = "unicorn"; + rev = "refs/tags/${version}"; + hash = "sha256-ZlQ2WVTToT0OMxK6brsHnchxDwAR5n1wdtZtkTTgWV4="; }; - nativeBuildInputs = [ - cmake - pkg-config - ] ++ lib.optionals stdenv.isDarwin [ - cctools - ]; + nativeBuildInputs = + [ + cmake + pkg-config + ] + ++ lib.optionals stdenv.isDarwin [ + cctools + ]; - buildInputs = lib.optionals stdenv.isDarwin [ - IOKit - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; # Ensure the linker is using atomic when compiling for RISC-V, otherwise fails NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; - cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + cmakeFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Some x86 tests are interrupted by signal 10 "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;test_x86" ]; @@ -44,6 +45,9 @@ stdenv.mkDerivation rec { homepage = "https://www.unicorn-engine.org"; license = licenses.gpl2Only; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice luc65r ]; + maintainers = with maintainers; [ + thoughtpolice + luc65r + ]; }; } diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix deleted file mode 100644 index 04d33b66e5a9..000000000000 --- a/pkgs/development/libraries/unittest-cpp/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -}: - -stdenv.mkDerivation rec { - pname = "unittest-cpp"; - version = "2.0.0"; - - src = fetchFromGitHub { - owner = "unittest-cpp"; - repo = "unittest-cpp"; - rev = "v${version}"; - sha256 = "0sxb3835nly1jxn071f59fwbdzmqi74j040r81fanxyw3s1azw0i"; - }; - - patches = [ - # GCC12 Patch - (fetchpatch { - url = "https://github.com/unittest-cpp/unittest-cpp/pull/185/commits/f361c2a1034c02ba8059648f9a04662d6e2b5553.patch"; - hash = "sha256-xyhV2VBelw/uktUXSZ3JBxgG+8/Mout/JiXEZVV2+2Y="; - }) - ]; - - # Fix 'Version:' setting in .pc file. TODO: remove once upstreamed: - # https://github.com/unittest-cpp/unittest-cpp/pull/188 - cmakeFlags = [ "-DPACKAGE_VERSION=${version}" ]; - - nativeBuildInputs = [ cmake ]; - - doCheck = false; - - meta = { - homepage = "https://github.com/unittest-cpp/unittest-cpp"; - description = "Lightweight unit testing framework for C++"; - license = lib.licenses.mit; - maintainers = [ ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix deleted file mode 100644 index 8587ad6d2c3c..000000000000 --- a/pkgs/development/libraries/unixODBC/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "unixODBC"; - version = "2.3.12"; - - src = fetchurl { - urls = [ - "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz" - "https://www.unixodbc.org/${pname}-${version}.tar.gz" - ]; - sha256 = "sha256-8hBQFEXOIb9ge6Ue+MEl4Q4i3/3/7Dd2RkYt9fAZFew="; - }; - - configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ]; - - meta = with lib; { - description = "ODBC driver manager for Unix"; - homepage = "https://www.unixodbc.org/"; - license = licenses.lgpl2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index fe181d37f6bf..b5b7e78e32a6 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -39,7 +39,7 @@ nativeBuildInputs = [ cmake ]; buildInputs = [ unixODBC openssl libiconv zlib ] - ++ lib.optionals stdenv.isDarwin [ libkrb5 ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libkrb5 ]; cmakeFlags = [ "-DWITH_EXTERNAL_ZLIB=ON" @@ -50,9 +50,13 @@ "-DWITH_IODBC=OFF" ]; - buildFlags = if stdenv.isDarwin then [ "maodbc" ] else null; + buildFlags = if stdenv.hostPlatform.isDarwin then [ "maodbc" ] else null; - installTargets = if stdenv.isDarwin then [ "install/fast" ] else null; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + + installTargets = if stdenv.hostPlatform.isDarwin then [ "install/fast" ] else null; # see the top of the file for an explanation passthru = { @@ -170,7 +174,7 @@ }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "ODBC Driver ${versionMajor} for SQL Server"; homepage = "https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-2017"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; @@ -187,7 +191,7 @@ versionMajor = "18"; versionMinor = "1"; versionAdditional = "1.1"; - versionSuffix = lib.optionalString stdenv.isLinux "-1"; + versionSuffix = lib.optionalString stdenv.hostPlatform.isLinux "-1"; src = fetchurl { url = { @@ -205,7 +209,7 @@ }; nativeBuildInputs = - if stdenv.isDarwin + if stdenv.hostPlatform.isDarwin then [ # Fix up the names encoded into the dylib, and make them absolute. @@ -217,12 +221,12 @@ patchelf ]; - unpackPhase = lib.optionalString stdenv.isLinux '' + unpackPhase = lib.optionalString stdenv.hostPlatform.isLinux '' dpkg -x $src ./ ''; installPhase = - if stdenv.isDarwin + if stdenv.hostPlatform.isDarwin then '' mkdir -p $out @@ -236,14 +240,14 @@ ''; # Replace the hard-coded paths in the dylib with nixpkgs equivalents. - fixupPhase = lib.optionalString stdenv.isDarwin '' + fixupPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' ${stdenv.cc.bintools.targetPrefix}install_name_tool \ -change /usr/lib/libiconv.2.dylib ${libiconv}/lib/libiconv.2.dylib \ -change /opt/homebrew/lib/libodbcinst.2.dylib ${unixODBC}/lib/libodbcinst.2.dylib \ $out/${finalAttrs.passthru.driver} ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-rpath ${lib.makeLibraryPath [ unixODBC openssl libkrb5 libuuid stdenv.cc.cc ]} \ $out/${finalAttrs.passthru.driver} ''; @@ -251,7 +255,7 @@ # see the top of the file for an explanation passthru = { fancyName = "ODBC Driver ${finalAttrs.versionMajor} for SQL Server"; - driver = "lib/libmsodbcsql${if stdenv.isDarwin then ".${finalAttrs.versionMajor}.dylib" else "-${finalAttrs.versionMajor}.${finalAttrs.versionMinor}.so.${finalAttrs.versionAdditional}"}"; + driver = "lib/libmsodbcsql${if stdenv.hostPlatform.isDarwin then ".${finalAttrs.versionMajor}.dylib" else "-${finalAttrs.versionMajor}.${finalAttrs.versionMinor}.so.${finalAttrs.versionAdditional}"}"; }; meta = with lib; { @@ -300,7 +304,7 @@ }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Amazon Redshift ODBC driver"; homepage = "https://docs.aws.amazon.com/redshift/latest/mgmt/configure-odbc-connection.html"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/development/libraries/updfparser/default.nix b/pkgs/development/libraries/updfparser/default.nix deleted file mode 100644 index 6eb4e65e657a..000000000000 --- a/pkgs/development/libraries/updfparser/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchzip }: - -stdenv.mkDerivation rec { - name = "updfparser"; - version = "unstable-2023-08-08"; - rev = "c5ce75b9eea8ebb2746b13eeb0f335813c615115"; - - src = fetchzip { - url = "https://indefero.soutade.fr/p/updfparser/source/download/${rev}/"; - hash = "sha256-RT7mvu43Izp0rHhKq4wR4kt0TDfzHvB2NGMR+fxO5UM="; - extension = "zip"; - }; - - makeFlags = [ "BUILD_STATIC=1" "BUILD_SHARED=1" ]; - - installPhase = '' - runHook preInstall - install -Dt $out/include include/*.h - install -Dt $out/lib libupdfparser.so - install -Dt $out/lib libupdfparser.a - runHook postInstall - ''; - - meta = with lib; { - description = "Very simple PDF parser"; - homepage = "https://indefero.soutade.fr/p/updfparser"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ autumnal ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/urdfdom-headers/default.nix b/pkgs/development/libraries/urdfdom-headers/default.nix deleted file mode 100644 index 7809355cb301..000000000000 --- a/pkgs/development/libraries/urdfdom-headers/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, validatePkgConfig }: - -stdenv.mkDerivation rec { - pname = "urdfdom-headers"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "ros"; - repo = "urdfdom_headers"; - rev = version; - hash = "sha256-FQSnYuTc40MOxyFsMPfoCIonP+4AUQxdq74eoQ9tOoo="; - }; - - patches = [ - # Fix CMake relative install dir assumptions (https://github.com/ros/urdfdom_headers/pull/66) - (fetchpatch { - url = "https://github.com/ros/urdfdom_headers/commit/6e0cea148c3a7123f8367cd48d5709a4490c32f1.patch"; - hash = "sha256-LC2TACGma/k6+WE9fTkzY98SgJYKsVuj5O9v84Q5mQ4="; - }) - ]; - - nativeBuildInputs = [ cmake validatePkgConfig ]; - - meta = with lib; { - description = "URDF (U-Robot Description Format) headers provides core data structure headers for URDF"; - homepage = "https://github.com/ros/urdfdom_headers"; - license = licenses.bsd3; - maintainers = with maintainers; [ lopsided98 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/urdfdom/default.nix b/pkgs/development/libraries/urdfdom/default.nix deleted file mode 100644 index f26162ac8c83..000000000000 --- a/pkgs/development/libraries/urdfdom/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, validatePkgConfig -, tinyxml-2, console-bridge, urdfdom-headers }: - -stdenv.mkDerivation rec { - pname = "urdfdom"; - version = "4.0.0"; - - src = fetchFromGitHub { - owner = "ros"; - repo = pname; - rev = version; - hash = "sha256-t1ff5aRHE7LuQdCXuooWPDUgPWjyYyQmQUB1RJmte1w="; - }; - - patches = [ - # Fix CMake relative install dir assumptions (https://github.com/ros/urdfdom/pull/142) - (fetchpatch { - url = "https://github.com/ros/urdfdom/commit/61a7e35cd5abece97259e76aed8504052b2f5b53.patch"; - hash = "sha256-b3bEbbaSUDkwTEHJ8gVPEb+AR/zuWwLqiAW5g1T1dPU="; - }) - ]; - - nativeBuildInputs = [ cmake pkg-config validatePkgConfig ]; - buildInputs = [ tinyxml-2 console-bridge ]; - propagatedBuildInputs = [ urdfdom-headers ]; - - meta = with lib; { - description = "Provides core data structures and a simple XML parser for populating the class data structures from an URDF file"; - homepage = "https://github.com/ros/urdfdom"; - license = licenses.bsd3; - maintainers = with maintainers; [ lopsided98 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix deleted file mode 100644 index 039db9392671..000000000000 --- a/pkgs/development/libraries/uri/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, doxygen }: - -stdenv.mkDerivation rec { - pname = "uri"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "cpp-netlib"; - repo = "uri"; - rev = "v${version}"; - sha256 = "148361pixrm94q6v04k13s1msa04bx9yc3djb0lxpa7dlw19vhcd"; - }; - - env.NIX_CFLAGS_COMPILE = toString ([ - "-Wno-error=parentheses" - # Needed with GCC 12 - "-Wno-error=deprecated-declarations" - "-Wno-error=nonnull" - ] ++ lib.optionals stdenv.cc.isClang [ - # Needed with Clang 16 - "-Wno-error=deprecated-builtins" - ]); - - nativeBuildInputs = [ cmake doxygen ]; - - cmakeFlags = [ - "-DUri_BUILD_TESTS=OFF" "-DUri_BUILD_DOCS=ON" "-DBUILD_SHARED_LIBS=ON" - ]; - - postBuild = "make doc"; - - postInstall = '' - install -vd $out/share/doc - cp -vR html $out/share/doc - ''; - - meta = { - description = "C++ URI library"; - homepage = "https://cpp-netlib.org"; - license = lib.licenses.boost; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix deleted file mode 100644 index dd93f49f5946..000000000000 --- a/pkgs/development/libraries/uriparser/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, gtest }: - -stdenv.mkDerivation rec { - pname = "uriparser"; - version = "0.9.8"; - - # Release tarball differs from source tarball - src = fetchurl { - url = "https://github.com/uriparser/uriparser/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-ctG1Wb46GAb3iKPZvjShsGPUKqI4spuk7mM9bv/NM70="; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DURIPARSER_BUILD_DOCS=OFF" - ] ++ lib.optional (!doCheck) "-DURIPARSER_BUILD_TESTS=OFF"; - - nativeCheckInputs = [ gtest ]; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; - - meta = with lib; { - changelog = "https://github.com/uriparser/uriparser/blob/uriparser-${version}/ChangeLog"; - description = "Strictly RFC 3986 compliant URI parsing library"; - longDescription = '' - uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. - API documentation is available on uriparser website. - ''; - homepage = "https://uriparser.github.io/"; - license = licenses.bsd3; - maintainers = with maintainers; [ bosu ]; - mainProgram = "uriparse"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix deleted file mode 100644 index 55feb41bec8a..000000000000 --- a/pkgs/development/libraries/usbredir/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, pkg-config -, meson -, ninja -, glib -, libusb1 -}: - -stdenv.mkDerivation rec { - pname = "usbredir"; - version = "0.13.0"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "spice"; - repo = "usbredir"; - rev = "${pname}-${version}"; - sha256 = "sha256-zehf0DkqSSvmatbk/UB1oySjyqiFUYTuIhqb5xKeK7I="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - glib - ]; - - propagatedBuildInputs = [ - libusb1 - ]; - - mesonFlags = [ - "-Dgit_werror=disabled" - "-Dtools=enabled" - "-Dfuzzing=disabled" - ]; - - outputs = [ "out" "dev" ]; - - meta = with lib; { - description = "USB traffic redirection protocol"; - mainProgram = "usbredirect"; - homepage = "https://www.spice-space.org/usbredir.html"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/usrsctp/clang-fix-build.patch b/pkgs/development/libraries/usrsctp/clang-fix-build.patch deleted file mode 100644 index eb136e8be30a..000000000000 --- a/pkgs/development/libraries/usrsctp/clang-fix-build.patch +++ /dev/null @@ -1,183 +0,0 @@ -diff --git a/usrsctplib/netinet/sctp_cc_functions.c b/usrsctplib/netinet/sctp_cc_functions.c -index 57bcdaa..70cf8b7 100755 ---- a/usrsctplib/netinet/sctp_cc_functions.c -+++ b/usrsctplib/netinet/sctp_cc_functions.c -@@ -764,7 +764,7 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, - #if defined(__FreeBSD__) && !defined(__Userspace__) - int old_cwnd; - #endif -- uint32_t t_ssthresh, t_cwnd, incr; -+ uint32_t t_ssthresh, incr; - uint64_t t_ucwnd_sbw; - uint64_t t_path_mptcp; - uint64_t mptcp_like_alpha; -@@ -773,7 +773,6 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, - - /* MT FIXME: Don't compute this over and over again */ - t_ssthresh = 0; -- t_cwnd = 0; - t_ucwnd_sbw = 0; - t_path_mptcp = 0; - mptcp_like_alpha = 1; -@@ -783,7 +782,6 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, - max_path = 0; - TAILQ_FOREACH(net, &stcb->asoc.nets, sctp_next) { - t_ssthresh += net->ssthresh; -- t_cwnd += net->cwnd; - /* lastsa>>3; we don't need to devide ...*/ - srtt = net->lastsa; - if (srtt > 0) { -diff --git a/usrsctplib/netinet/sctp_indata.c b/usrsctplib/netinet/sctp_indata.c -index 3bce9e9..42ce111 100755 ---- a/usrsctplib/netinet/sctp_indata.c -+++ b/usrsctplib/netinet/sctp_indata.c -@@ -3320,7 +3320,6 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, struct sctp_association *asoc, - struct sctp_tmit_chunk *tp1; - int strike_flag = 0; - struct timeval now; -- int tot_retrans = 0; - uint32_t sending_seq; - struct sctp_nets *net; - int num_dests_sacked = 0; -@@ -3691,7 +3690,6 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, struct sctp_association *asoc, - } - - tp1->rec.data.doing_fast_retransmit = 1; -- tot_retrans++; - /* mark the sending seq for possible subsequent FR's */ - /* - * SCTP_PRINTF("Marking TSN for FR new value %x\n", -diff --git a/usrsctplib/netinet/sctp_output.c b/usrsctplib/netinet/sctp_output.c -index 6a7dff9..a914b3b 100755 ---- a/usrsctplib/netinet/sctp_output.c -+++ b/usrsctplib/netinet/sctp_output.c -@@ -9970,7 +9970,7 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp, - struct mbuf *m, *endofchain; - struct sctp_nets *net = NULL; - uint32_t tsns_sent = 0; -- int no_fragmentflg, bundle_at, cnt_thru; -+ int no_fragmentflg, bundle_at; - unsigned int mtu; - int error, i, one_chunk, fwd_tsn, ctl_cnt, tmr_started; - struct sctp_auth_chunk *auth = NULL; -@@ -10046,7 +10046,6 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp, - } - } - one_chunk = 0; -- cnt_thru = 0; - /* do we have control chunks to retransmit? */ - if (m != NULL) { - /* Start a timer no matter if we succeed or fail */ -@@ -10368,7 +10367,6 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp, - /* (void)SCTP_GETTIME_TIMEVAL(&net->last_sent_time); */ - - /* For auto-close */ -- cnt_thru++; - if (*now_filled == 0) { - (void)SCTP_GETTIME_TIMEVAL(&asoc->time_last_sent); - *now = asoc->time_last_sent; -@@ -13416,7 +13414,7 @@ sctp_lower_sosend(struct socket *so, - struct epoch_tracker et; - #endif - ssize_t sndlen = 0, max_len, local_add_more; -- int error, len; -+ int error; - struct mbuf *top = NULL; - int queue_only = 0, queue_only_for_init = 0; - int free_cnt_applied = 0; -@@ -14035,7 +14033,6 @@ sctp_lower_sosend(struct socket *so, - */ - local_add_more = sndlen; - } -- len = 0; - if (non_blocking) { - goto skip_preblock; - } -@@ -14265,7 +14262,6 @@ skip_preblock: - } - sctp_snd_sb_alloc(stcb, sndout); - atomic_add_int(&sp->length, sndout); -- len += sndout; - if (sinfo_flags & SCTP_SACK_IMMEDIATELY) { - sp->sinfo_flags |= SCTP_SACK_IMMEDIATELY; - } -diff --git a/usrsctplib/netinet/sctp_pcb.c b/usrsctplib/netinet/sctp_pcb.c -index 89a66bc..a952921 100755 ---- a/usrsctplib/netinet/sctp_pcb.c -+++ b/usrsctplib/netinet/sctp_pcb.c -@@ -7943,7 +7943,7 @@ sctp_drain_mbufs(struct sctp_tcb *stcb) - } - - void --sctp_drain() -+sctp_drain(void) - { - /* - * We must walk the PCB lists for ALL associations here. The system -diff --git a/usrsctplib/netinet/sctp_sysctl.c b/usrsctplib/netinet/sctp_sysctl.c -index bb49e17..8b77f7e 100755 ---- a/usrsctplib/netinet/sctp_sysctl.c -+++ b/usrsctplib/netinet/sctp_sysctl.c -@@ -61,7 +61,7 @@ FEATURE(sctp, "Stream Control Transmission Protocol"); - */ - - void --sctp_init_sysctls() -+sctp_init_sysctls(void) - { - SCTP_BASE_SYSCTL(sctp_sendspace) = SCTPCTL_MAXDGRAM_DEFAULT; - SCTP_BASE_SYSCTL(sctp_recvspace) = SCTPCTL_RECVSPACE_DEFAULT; -diff --git a/usrsctplib/user_socket.c b/usrsctplib/user_socket.c -index 513a5a9..89e9eb2 100755 ---- a/usrsctplib/user_socket.c -+++ b/usrsctplib/user_socket.c -@@ -2857,7 +2857,6 @@ sctp_userspace_ip_output(int *result, struct mbuf *o_pak, - struct mbuf *m_orig; - int iovcnt; - int len; -- int send_count; - struct ip *ip; - struct udphdr *udp; - struct sockaddr_in dst; -@@ -2930,16 +2929,13 @@ sctp_userspace_ip_output(int *result, struct mbuf *o_pak, - m_adj(m, sizeof(struct ip) + sizeof(struct udphdr)); - } - -- send_count = 0; - for (iovcnt = 0; m != NULL && iovcnt < MAXLEN_MBUF_CHAIN; m = m->m_next, iovcnt++) { - #if !defined(_WIN32) - send_iovec[iovcnt].iov_base = (caddr_t)m->m_data; - send_iovec[iovcnt].iov_len = SCTP_BUF_LEN(m); -- send_count += send_iovec[iovcnt].iov_len; - #else - send_iovec[iovcnt].buf = (caddr_t)m->m_data; - send_iovec[iovcnt].len = SCTP_BUF_LEN(m); -- send_count += send_iovec[iovcnt].len; - #endif - } - -@@ -3002,7 +2998,6 @@ void sctp_userspace_ip6_output(int *result, struct mbuf *o_pak, - struct mbuf *m_orig; - int iovcnt; - int len; -- int send_count; - struct ip6_hdr *ip6; - struct udphdr *udp; - struct sockaddr_in6 dst; -@@ -3076,16 +3071,13 @@ void sctp_userspace_ip6_output(int *result, struct mbuf *o_pak, - m_adj(m, sizeof(struct ip6_hdr)); - } - -- send_count = 0; - for (iovcnt = 0; m != NULL && iovcnt < MAXLEN_MBUF_CHAIN; m = m->m_next, iovcnt++) { - #if !defined(_WIN32) - send_iovec[iovcnt].iov_base = (caddr_t)m->m_data; - send_iovec[iovcnt].iov_len = SCTP_BUF_LEN(m); -- send_count += send_iovec[iovcnt].iov_len; - #else - send_iovec[iovcnt].buf = (caddr_t)m->m_data; - send_iovec[iovcnt].len = SCTP_BUF_LEN(m); -- send_count += send_iovec[iovcnt].len; - #endif - } - if (m != NULL) { diff --git a/pkgs/development/libraries/usrsctp/default.nix b/pkgs/development/libraries/usrsctp/default.nix deleted file mode 100644 index 8b172ebb45d7..000000000000 --- a/pkgs/development/libraries/usrsctp/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "usrsctp"; - version = "0.9.5.0"; - - src = fetchFromGitHub { - owner = "sctplab"; - repo = "usrsctp"; - rev = version; - sha256 = "10ndzkip8blgkw572n3dicl6mgjaa7kygwn3vls80liq92vf1sa9"; - }; - - patches = [ - # usrsctp fails to build with clang 15+ due to set but unused variable and missing prototype - # errors. These issues are fixed in the master branch, but a new release with them has not - # been made. The following patch can be dropped once a release has been made. - ./clang-fix-build.patch - ]; - - nativeBuildInputs = [ cmake ]; - - # https://github.com/sctplab/usrsctp/issues/662 - postPatch = '' - substituteInPlace usrsctplib/CMakeLists.txt \ - --replace '$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ - --replace '$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} - ''; - - meta = with lib; { - homepage = "https://github.com/sctplab/usrsctp"; - description = "Portable SCTP userland stack"; - maintainers = with maintainers; [ misuzu ]; - license = licenses.bsd3; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/development/libraries/utf8cpp/default.nix deleted file mode 100644 index 60ae45d2cd8e..000000000000 --- a/pkgs/development/libraries/utf8cpp/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "utf8cpp"; - version = "4.0.5"; - - src = fetchFromGitHub { - owner = "nemtrif"; - repo = "utfcpp"; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-Z27/31obVErsmW1b1SVcr45nKlFu01RqqpTMwS0LqJ8="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - homepage = "https://github.com/nemtrif/utfcpp"; - changelog = "https://github.com/nemtrif/utfcpp/releases/tag/v${version}"; - description = "UTF-8 with C++ in a Portable Way"; - license = licenses.boost; - maintainers = with maintainers; [ jobojeha ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix deleted file mode 100644 index f248d6d97225..000000000000 --- a/pkgs/development/libraries/utf8proc/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake - # passthru.tests -, tmux -, fcft -, arrow-cpp -}: - -stdenv.mkDerivation rec { - pname = "utf8proc"; - version = "2.9.0"; - - src = fetchFromGitHub { - owner = "JuliaStrings"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Sgh8vTbclUV+lFZdR29PtNUy8F+9L/OAXk647B+l2mg="; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DUTF8PROC_ENABLE_TESTING=ON" - ]; - - doCheck = true; - - passthru.tests = { - inherit fcft tmux arrow-cpp; - }; - - meta = with lib; { - description = "Clean C library for processing UTF-8 Unicode data"; - homepage = "https://juliastrings.github.io/utf8proc/"; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ maintainers.ftrvxmtrx maintainers.sternenseemann ]; - }; -} diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix deleted file mode 100644 index 98c5200fcc2c..000000000000 --- a/pkgs/development/libraries/uthash/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, perl }: - -stdenv.mkDerivation rec { - pname = "uthash"; - version = "2.3.0"; - - src = fetchFromGitHub { - owner = "troydhanson"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-F0M5ENT3bMn3dD16Oaq9mBFYOWzVliVWupAIrLc2nkQ="; - }; - - doCheck = true; - nativeCheckInputs = [ perl ]; - checkTarget = "all"; - preCheck = "cd tests"; - - installPhase = '' - install -Dm644 $src/include/*.h -t $out/include - ''; - - meta = with lib; { - description = "Hash table for C structures"; - homepage = "http://troydhanson.github.io/uthash"; - license = licenses.bsd2; # it's one-clause, actually, as it's source-only - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/uthenticode/default.nix b/pkgs/development/libraries/uthenticode/default.nix deleted file mode 100644 index e8d08745de8f..000000000000 --- a/pkgs/development/libraries/uthenticode/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, gtest, openssl, pe-parse }: - -stdenv.mkDerivation rec { - pname = "uthenticode"; - version = "2.0.1"; - - src = fetchFromGitHub { - owner = "trailofbits"; - repo = "uthenticode"; - rev = "v${version}"; - hash = "sha256-NGVOGXMRlgpSRw56jr63rJc/5/qCmPjtAFa0D21ogd4="; - }; - - cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_EXTERNAL_GTEST=1" ]; - - nativeBuildInputs = [ cmake ]; - nativeCheckInputs = [ gtest ]; - buildInputs = [ pe-parse openssl ]; - - doCheck = true; - checkPhase = "test/uthenticode_test"; - - meta = with lib; { - description = "Small cross-platform library for verifying Authenticode digital signatures"; - homepage = "https://github.com/trailofbits/uthenticode"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ arturcygan ]; - }; -} diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 3ea2d075602a..b6b2d4e6298f 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -101,11 +101,11 @@ stdenv.mkDerivation rec { ''; postPatch = '' - ${lib.optionalString stdenv.isAarch64 '' + ${lib.optionalString stdenv.hostPlatform.isAarch64 '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace build/config/compiler/compiler.gni \ --replace 'strip_absolute_paths_from_debug_symbols = true' \ 'strip_absolute_paths_from_debug_symbols = false' @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \ 'false' ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace build/config/compiler/BUILD.gn \ --replace "-Wl,-fatal_warnings" "" ''} @@ -141,7 +141,7 @@ stdenv.mkDerivation rec { ''host_toolchain="//build/toolchain/linux/unbundle:default"'' ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'' ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${llvmCcAndBintools}"'' - ++ lib.optional stdenv.isDarwin ''use_lld=false''; + ++ lib.optional stdenv.hostPlatform.isDarwin ''use_lld=false''; env.NIX_CFLAGS_COMPILE = toString ([ "-O2" @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild llvmPackages.llvm python3.pkgs.setuptools diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix deleted file mode 100644 index aec3bcc6af2e..000000000000 --- a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkg-config, cmrt, libdrm, libva, libX11, libGL, wayland }: - -stdenv.mkDerivation rec { - pname = "intel-hybrid-driver"; - version = "1.0.2"; - - src = fetchFromGitHub { - owner = "intel"; - repo = "intel-hybrid-driver"; - rev = version; - sha256 = "sha256-uYX7RoU1XVzcC2ea3z/VBjmT47xmzK67Y4LaiFXyJZ8="; - }; - - patches = [ - # driver_init: load libva-x11.so for any ABI version - (fetchurl { - url = "https://github.com/01org/intel-hybrid-driver/pull/26.diff"; - sha256 = "1ql4mbi5x1d2a5c8mkjvciaq60zj8nhx912992winbhfkyvpb3gx"; - }) - ]; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - buildInputs = [ cmrt libdrm libva libX11 libGL wayland ]; - - enableParallelBuilding = true; - - # Workaround build failure on -fno-common toolchains like upstream gcc-10. - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - configureFlags = [ - "--enable-drm" - "--enable-x11" - "--enable-wayland" - ]; - - postPatch = '' - patchShebangs ./src/shaders/gpp.py - ''; - - preConfigure = '' - sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure - ''; - - meta = with lib; { - homepage = "https://01.org/linuxmedia"; - description = "Intel driver for the VAAPI library with partial HW acceleration"; - license = licenses.mit; - maintainers = with maintainers; [ tadfisher ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix index 50eaddda890e..fa0e6feb7df7 100644 --- a/pkgs/development/libraries/vc/0.7.nix +++ b/pkgs/development/libraries/vc/0.7.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix deleted file mode 100644 index 5c3140a177c3..000000000000 --- a/pkgs/development/libraries/vcdimager/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, lib, fetchurl, pkg-config, libcdio, libxml2, popt -, libiconv, darwin }: - -stdenv.mkDerivation rec { - pname = "vcdimager"; - version = "2.0.1"; - - src = fetchurl { - url = "mirror://gnu/vcdimager/${pname}-${version}.tar.gz"; - sha256 = "0ypnb1vp49nmzp5571ynlz6n1gh90f23w3z4x95hb7c2p7pmylb7"; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libxml2 popt libiconv ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit DiskArbitration ]); - - propagatedBuildInputs = [ libcdio ]; - - meta = with lib; { - homepage = "https://www.gnu.org/software/vcdimager/"; - description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs"; - platforms = platforms.unix; - license = licenses.gpl2; - }; -} diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix deleted file mode 100644 index 62b39c05395e..000000000000 --- a/pkgs/development/libraries/vcg/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, eigen }: - -stdenv.mkDerivation rec { - pname = "vcg"; - version = "2023.12"; - - src = fetchFromGitHub { - owner = "cnr-isti-vclab"; - repo = "vcglib"; - rev = version; - sha256 = "sha256-U3pu1k2pCH+G4CtacaDQ9SgkFX5A9/O/qrdpgWvB1+U="; - }; - - propagatedBuildInputs = [ eigen ]; - - installPhase = '' - mkdir -p $out/include - cp -r vcg wrap $out/include - find $out -name \*.h -exec sed -i 's,<eigenlib/,<eigen3/,g' {} \; - ''; - - meta = with lib; { - homepage = "https://vcg.isti.cnr.it/vcglib/install.html"; - description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/libraries/vectorscan/default.nix b/pkgs/development/libraries/vectorscan/default.nix deleted file mode 100644 index 835db0f3566b..000000000000 --- a/pkgs/development/libraries/vectorscan/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, ragel -, util-linux -, python3 -, boost184 -, sqlite -, pcre -, enableShared ? !stdenv.hostPlatform.isStatic -}: - -stdenv.mkDerivation rec { - pname = "vectorscan"; - version = "5.4.11"; - - src = fetchFromGitHub { - owner = "VectorCamp"; - repo = "vectorscan"; - rev = "vectorscan/${version}"; - hash = "sha256-wz2oIhau/vjnri3LOyPZSCFAWg694FTLVt7+SZYEsL4="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ragel - python3 - ] ++ lib.optional stdenv.isLinux util-linux; - - buildInputs = [ - boost184 - sqlite - pcre - ]; - - # FAT_RUNTIME bundles optimized implementations for different CPU extensions and uses CPUID to - # transparently select the fastest for the current hardware. - # This feature is only available on linux for x86, x86_64, and aarch64. - # - # If FAT_RUNTIME is not available, we fall back to building for a single extension based - # on stdenv.hostPlatform. - # - # For generic builds (e.g. x86_64) this can mean using an implementation not optimized for the - # potentially available more modern hardware extensions (e.g. x86_64 with AVX512). - cmakeFlags = [ (if enableShared then "-DBUILD_SHARED_LIBS=ON" else "BUILD_STATIC_LIBS=ON") ] - ++ - (if lib.elem stdenv.hostPlatform.system [ "x86_64-linux" "i686-linux" ] then - [ "-DBUILD_AVX2=ON" "-DBUILD_AVX512=ON" "-DBUILD_AVX512VBMI=ON" "-DFAT_RUNTIME=ON" ] - else - (if (stdenv.isLinux && stdenv.isAarch64) then - [ "-DBUILD_SVE=ON" "-DBUILD_SVE2=ON" "-DBUILD_SVE2_BITPERM=ON" "-DFAT_RUNTIME=ON" ] - else - [ "-DFAT_RUNTIME=OFF" ] - ++ lib.optional stdenv.hostPlatform.avx2Support "-DBUILD_AVX2=ON" - ++ lib.optional stdenv.hostPlatform.avx512Support "-DBUILD_AVX512=ON" - ) - ); - - doCheck = true; - checkPhase = '' - runHook preCheck - - ./bin/unit-hyperscan - - runHook postCheck - ''; - - meta = with lib; { - description = "Portable fork of the high-performance regular expression matching library"; - longDescription = '' - A fork of Intel's Hyperscan, modified to run on more platforms. Currently - ARM NEON/ASIMD is 100% functional, and Power VSX are in development. - ARM SVE2 will be implemented when hardware becomes accessible to the - developers. More platforms will follow in the future, on demand/request. - - Vectorscan will follow Intel's API and internal algorithms where possible, - but will not hesitate to make code changes where it is thought of giving - better performance or better portability. In addition, the code will be - gradually simplified and made more uniform and all architecture specific - code will be abstracted away. - ''; - homepage = "https://www.vectorcamp.gr/vectorscan/"; - changelog = "https://github.com/VectorCamp/vectorscan/blob/${src.rev}/CHANGELOG-vectorscan.md"; - platforms = platforms.unix; - license = with licenses; [ bsd3 /* and */ bsd2 /* and */ licenses.boost ]; - maintainers = with maintainers; [ tnias vlaci ]; - }; -} diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix deleted file mode 100644 index e23285511afa..000000000000 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3 -, libGLU, libepoxy, libX11, libdrm, mesa -, vaapiSupport ? true, libva -, gitUpdater -}: - -stdenv.mkDerivation rec { - pname = "virglrenderer"; - version = "1.1.0"; - - src = fetchurl { - url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/${version}/virglrenderer-${version}.tar.bz2"; - hash = "sha256-XGgKst7ENLKCUv0jU/HiEtTYe+7b9sHnSufj0PZVsb0="; - }; - - separateDebugInfo = true; - - buildInputs = [ libGLU libepoxy libX11 libdrm mesa ] - ++ lib.optionals vaapiSupport [ libva ]; - - nativeBuildInputs = [ meson ninja pkg-config python3 ]; - - mesonFlags= [ - (lib.mesonBool "video" vaapiSupport) - ]; - - passthru = { - updateScript = gitUpdater { - url = "https://gitlab.freedesktop.org/virgl/virglrenderer.git"; - rev-prefix = "virglrenderer-"; - }; - }; - - meta = with lib; { - description = "Virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering"; - mainProgram = "virgl_test_server"; - homepage = "https://virgil3d.github.io/"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.xeji ]; - }; -} diff --git a/pkgs/development/libraries/virtualpg/default.nix b/pkgs/development/libraries/virtualpg/default.nix deleted file mode 100644 index d9778decd129..000000000000 --- a/pkgs/development/libraries/virtualpg/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, validatePkgConfig, postgresql, sqlite, darwin }: - -stdenv.mkDerivation rec { - pname = "virtualpg"; - version = "2.0.1"; - - src = fetchurl { - url = "https://www.gaia-gis.it/gaia-sins/virtualpg-${version}.tar.gz"; - hash = "sha256-virr64yf8nQ4IIX1HUIugjhYvKT2vC+pCYFkZMah4Is="; - }; - - nativeBuildInputs = [ - validatePkgConfig - postgresql # for pg_config - ]; - - buildInputs = [ postgresql sqlite ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Kerberos ]; - - meta = with lib; { - description = "Loadable dynamic extension to both SQLite and SpatiaLite"; - homepage = "https://www.gaia-gis.it/fossil/virtualpg"; - license = with licenses; [ mpl11 gpl2Plus lgpl21Plus ]; - platforms = platforms.unix; - maintainers = with maintainers; [ sikmir ]; - }; -} diff --git a/pkgs/development/libraries/vk-bootstrap/default.nix b/pkgs/development/libraries/vk-bootstrap/default.nix deleted file mode 100644 index bc43da3567d8..000000000000 --- a/pkgs/development/libraries/vk-bootstrap/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, vulkan-headers -, glfw -, catch2 -}: - -stdenv.mkDerivation rec { - pname = "vk-bootstrap"; - version = "0.7"; - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "charles-lunarg"; - repo = "vk-bootstrap"; - rev = "v${version}"; - hash = "sha256-X3ANqfplrCF1R494+H5/plcwMH7rbW6zpLA4MZrYaoE="; - }; - - postPatch = '' - # Upstream uses cmake FetchContent to resolve glfw and catch2 - # needed for examples and tests - sed -iE 's=add_subdirectory(ext)==g' CMakeLists.txt - sed -iE 's=Catch2==g' tests/CMakeLists.txt - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ vulkan-headers glfw catch2 ]; - - cmakeFlags = [ - "-DVK_BOOTSTRAP_VULKAN_HEADER_DIR=${vulkan-headers}/include" - ]; - - meta = with lib; { - description = "Vulkan Bootstrapping Library"; - license = licenses.mit; - homepage = "https://github.com/charles-lunarg/vk-bootstrap"; - maintainers = with maintainers; [ shamilton ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix deleted file mode 100644 index 909a9fcbab3b..000000000000 --- a/pkgs/development/libraries/vmime/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{lib, stdenv, fetchFromGitHub -, gsasl, gnutls, pkg-config, cmake, zlib, libtasn1, libgcrypt, gtk3 -# this will not work on non-nixos systems -, sendmailPath ? "/run/wrappers/bin/sendmail" -}: - -stdenv.mkDerivation rec { - pname = "vmime"; - # XXX: using unstable rev for now to comply with the removal of - # deprecated symbols in the latest release of gsasl - version = "unstable-2022-03-26"; - src = fetchFromGitHub { - owner = "kisli"; - repo = "vmime"; - rev = "fc69321d5304c73be685c890f3b30528aadcfeaf"; - sha256 = "sha256-DUcGQcT7hp5Rs2Z5C8wo+3BYwWqED0KrF3h3vgLiiow="; - }; - - buildInputs = [ gsasl gnutls zlib libtasn1 libgcrypt gtk3 ]; - nativeBuildInputs = [ pkg-config cmake ]; - - cmakeFlags = [ - "-DVMIME_SENDMAIL_PATH=${sendmailPath}" - ]; - - meta = { - homepage = "https://www.vmime.org/"; - description = "Free mail library for C++"; - license = lib.licenses.gpl3; - maintainers = [ ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index 11df1a495f02..71b540b01ca7 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -19,22 +19,24 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ boost lapack ] - ++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreGraphics CoreVideo ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkTarget = "test"; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Vector and matrix math library implemented using C++ templates"; - longDescription = ''vmmlib is a vector and matrix math library implemented - using C++ templates. Its basic functionality includes a vector - and a matrix class, with additional functionality for the - often-used 3d and 4d vectors and 3x3 and 4x4 matrices. - More advanced functionality include solvers, frustum - computations and frustum culling classes, and spatial data structures''; + longDescription = '' + vmmlib is a vector and matrix math library implemented + using C++ templates. Its basic functionality includes a vector + and a matrix class, with additional functionality for the + often-used 3d and 4d vectors and 3x3 and 4x4 matrices. + More advanced functionality include solvers, frustum + computations and frustum culling classes, and spatial data structures + ''; license = licenses.bsd2; homepage = "https://github.com/VMML/vmmlib/"; diff --git a/pkgs/development/libraries/vo-aacenc/default.nix b/pkgs/development/libraries/vo-aacenc/default.nix deleted file mode 100644 index fb8dd43fe032..000000000000 --- a/pkgs/development/libraries/vo-aacenc/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "vo-aacenc"; - version = "0.1.3"; - - src = fetchurl { - url = "mirror://sourceforge/opencore-amr/fdk-aac/${pname}-${version}.tar.gz"; - sha256 = "sha256-5Rp0d6NZ8Y33xPgtGV2rThTnQUy9SM95zBlfxEaFDzY="; - }; - - meta = with lib; { - description = "VisualOn AAC encoder library"; - homepage = "https://sourceforge.net/projects/opencore-amr/"; - license = licenses.asl20; - maintainers = [ maintainers.baloo ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/development/libraries/vo-amrwbenc/default.nix deleted file mode 100644 index e07b8cb7688d..000000000000 --- a/pkgs/development/libraries/vo-amrwbenc/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: - -stdenv.mkDerivation rec{ - pname = "vo-amrwbenc"; - version = "0.1.3"; - - src = fetchFromGitHub { - owner = "mstorsjo"; - repo = "vo-amrwbenc"; - rev = "v${version}"; - sha256 = "sha256-oHhoJAI47VqBGk9cO3G5oqnHpWxA2jnJs103MwcYj+w="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - meta = { - homepage = "https://sourceforge.net/projects/opencore-amr/"; - description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder"; - license = lib.licenses.asl20; - maintainers = [ ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix deleted file mode 100644 index 1991f2d6d7f9..000000000000 --- a/pkgs/development/libraries/volume-key/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, gettext, python3 -, ncurses, swig, glib, util-linux, cryptsetup, nss, gpgme -, buildPackages -}: - -stdenv.mkDerivation rec { - pname = "volume_key"; - version = "0.3.11"; - - src = fetchgit { - url = "https://pagure.io/volume_key.git"; - rev = "volume_key-${version}"; - sha256 = "1sqdbcih1c39bjiv4mm1m7acc3lfh2i2hf2r9i7rk8adfzq8awma"; - }; - - outputs = [ "out" "man" "dev" "py" ]; - - strictDeps = true; - - nativeBuildInputs = [ autoreconfHook gettext gpgme pkg-config swig ]; - - buildInputs = [ glib cryptsetup nss util-linux ncurses ]; - - configureFlags = [ - "--with-gpgme-prefix=${gpgme.dev}" - ]; - - preConfigure = '' - export PYTHON="${buildPackages.python3}/bin/python" - export PYTHON3_CONFIG="${python3}/bin/python3-config" - ''; - - makeFlags = [ - "pyexecdir=$(py)/${python3.sitePackages}" - "pythondir=$(py)/${python3.sitePackages}" - ]; - - doCheck = false; # fails 1 out of 1 tests, needs `certutil` - - meta = with lib; { - description = "Library for manipulating storage volume encryption keys and storing them separately from volumes to handle forgotten passphrases, and the associated command-line tool"; - mainProgram = "volume_key"; - homepage = "https://pagure.io/volume_key/"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/vrb/default.nix b/pkgs/development/libraries/vrb/default.nix deleted file mode 100644 index f6ab54dba030..000000000000 --- a/pkgs/development/libraries/vrb/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "vrb"; - version = "0.5.1"; - - src = fetchurl { - url = "http://vrb.sourceforge.net/download/${pname}-${version}.tar.bz2"; - sha256 = "d579ed1998ef2d78e2ef8481a748d26e1fa12cdda806d2e31d8ec66ffb0e289f"; - }; - - patches = [ - ./removed_options.patch - ./unused-but-set-variable.patch - ]; - - postPatch = '' - patchShebangs configure - ''; - - postInstall = '' - mkdir -p $out/share/man/man3 - cp -p vrb/man/man3/*.3 $out/share/man/man3/ - ''; - - meta = with lib; { - description = "Virtual ring buffer library written in C"; - mainProgram = "vbuf"; - license = licenses.lgpl21; - homepage = "http://vrb.sourceforge.net/"; - maintainers = [ maintainers.bobvanderlinden ]; - platforms = platforms.linux; - }; -} - diff --git a/pkgs/development/libraries/vrb/removed_options.patch b/pkgs/development/libraries/vrb/removed_options.patch deleted file mode 100644 index eda88e751843..000000000000 --- a/pkgs/development/libraries/vrb/removed_options.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/configure 2010-10-05 16:32:59.000000000 +0200 -+++ b/configure 2010-10-05 16:33:08.000000000 +0200 -@@ -341,8 +341,8 @@ - pgm_warn=( "${pgm_warn[@]}" -Winline ) - fi - --lib_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -fgnu-linker -frerun-loop-opt -finline -finline-functions -fmove-all-movables ) --pgm_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -fgnu-linker -frerun-loop-opt -finline -finline-functions -fmove-all-movables ) -+lib_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -frerun-loop-opt -finline -finline-functions ) -+pgm_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -frerun-loop-opt -finline -finline-functions ) - - lib_cp_opt=( -pipe ) - pgm_cp_opt=( -pipe ) diff --git a/pkgs/development/libraries/vrb/unused-but-set-variable.patch b/pkgs/development/libraries/vrb/unused-but-set-variable.patch deleted file mode 100644 index 43429255e8cd..000000000000 --- a/pkgs/development/libraries/vrb/unused-but-set-variable.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/vrb/src/bin/vbuf.c1 2011-06-13 22:14:24.000000000 +0200 -+++ b/vrb/src/bin/vbuf.c 2011-06-13 22:14:43.000000000 +0200 -@@ -426,7 +426,6 @@ - int opt_progress ; - int output_fd ; - int poll_time ; -- int poll_num ; - int poll_write ; - int poll_read ; - -@@ -861,7 +860,7 @@ - poll_time = display_time - get_time_ms(); - if ( poll_time < 0 ) poll_time = 0; - } -- poll_num = poll( poll_list, 2, poll_time ); -+ poll( poll_list, 2, poll_time ); - - //----------------------- - // Check for poll events. diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix deleted file mode 100644 index e233269fafd1..000000000000 --- a/pkgs/development/libraries/vrpn/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, unzip -, cmake -, darwin -, libGLU -, libGL -}: - -stdenv.mkDerivation rec { - pname = "vrpn"; - version = "07.35"; - - src = fetchFromGitHub { - owner = "vrpn"; - repo = "vrpn"; - rev = "version_${version}"; - hash = "sha256-vvlwhm5XHWD4Nh1hwY427pe36RQaqTDJiEtkCxHeCig="; - }; - - nativeBuildInputs = [ - cmake - unzip - ]; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.GLUT - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.OpenGL - ] ++ lib.optionals stdenv.isLinux [ - libGLU - libGL - ]; - - meta = with lib; { - description = "Virtual Reality Peripheral Network"; - longDescription = '' - The Virtual-Reality Peripheral Network (VRPN) is a set of classes - within a library and a set of servers that are designed to implement - a network-transparent interface between application programs and the - set of physical devices (tracker, etc.) used in a virtual-reality - (VR) system. - ''; - homepage = "https://github.com/vrpn/vrpn"; - license = licenses.boost; # see https://github.com/vrpn/vrpn/wiki/License - platforms = platforms.darwin ++ platforms.linux; - maintainers = with maintainers; [ ludo ]; - }; -} diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix deleted file mode 100644 index 6981de6aa074..000000000000 --- a/pkgs/development/libraries/vsqlite/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, boost, sqlite }: - -stdenv.mkDerivation rec { - pname = "vsqlite"; - version = "0.3.13"; - - src = fetchurl { - url = "https://evilissimo.fedorapeople.org/releases/vsqlite--/0.3.13/vsqlite++-${version}.tar.gz"; - sha256 = "17fkj0d2jh0xkjpcayhs1xvbnh1d69f026i7vs1zqnbiwbkpz237"; - }; - - buildInputs = [ boost sqlite ]; - - prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile.in \ - --replace '-Wl,--as-needed' "" \ - --replace '-Wl,-soname -Wl,libvsqlitepp.so.3' \ - "-Wl,-install_name,$out/lib/libvsqlitepp.3.dylib" - ''; - - meta = with lib; { - homepage = "http://vsqlite.virtuosic-bytes.com/"; - description = "C++ wrapper library for sqlite"; - license = licenses.bsd3; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix deleted file mode 100644 index 87cf27f70fd4..000000000000 --- a/pkgs/development/libraries/vte/default.nix +++ /dev/null @@ -1,141 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, gettext -, pkg-config -, meson -, ninja -, gnome -, glib -, gtk3 -, gtk4 -, gtkVersion ? "3" -, gobject-introspection -, vala -, python3 -, gi-docgen -, libxml2 -, gnutls -, gperf -, pango -, pcre2 -, cairo -, fribidi -, lz4 -, icu -, systemd -, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd -, nixosTests -, blackbox-terminal -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "vte"; - version = "0.76.3"; - - outputs = [ "out" "dev" ] - ++ lib.optional (gtkVersion != null) "devdoc"; - - src = fetchurl { - url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz"; - hash = "sha256-9njpTAVvN3/QAhIUrf9UUMsXLpoIsWCREYHd/3t9XWA="; - }; - - patches = [ - # VTE needs a small patch to work with musl: - # https://gitlab.gnome.org/GNOME/vte/issues/72 - # Taken from https://git.alpinelinux.org/aports/tree/community/vte3 - (fetchpatch { - name = "0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"; - url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd"; - hash = "sha256-FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU="; - }) - ]; - - nativeBuildInputs = [ - gettext - gobject-introspection - gperf - libxml2 - meson - ninja - pkg-config - vala - python3 - gi-docgen - ]; - - buildInputs = [ - cairo - fribidi - gnutls - pango # duplicated with propagatedBuildInputs to support gtkVersion == null - pcre2 - lz4 - icu - ] ++ lib.optionals systemdSupport [ - systemd - ]; - - # Required by vte-2.91.pc. - propagatedBuildInputs = lib.optionals (gtkVersion != null) [ - (assert (gtkVersion == "3" || gtkVersion == "4"); - if gtkVersion == "3" then gtk3 else gtk4) - glib - pango - ]; - - mesonFlags = [ - "-Ddocs=true" - (lib.mesonBool "gtk3" (gtkVersion == "3")) - (lib.mesonBool "gtk4" (gtkVersion == "4")) - ] ++ lib.optionals (!systemdSupport) [ - "-D_systemd=false" - ] ++ lib.optionals stdenv.isDarwin [ - # -Bsymbolic-functions is not supported on darwin - "-D_b_symbolic_functions=false" - ]; - - # error: argument unused during compilation: '-pie' [-Werror,-Wunused-command-line-argument] - env.NIX_CFLAGS_COMPILE = toString (lib.optional stdenv.hostPlatform.isMusl "-Wno-unused-command-line-argument" - ++ lib.optional stdenv.cc.isClang "-Wno-cast-function-type-strict"); - - postPatch = '' - patchShebangs perf/* - patchShebangs src/parser-seq.py - patchShebangs src/modes.py - ''; - - postFixup = '' - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput "share/doc" "$devdoc" - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = "vte"; - versionPolicy = "odd-unstable"; - }; - tests = { - inherit (nixosTests.terminal-emulators) gnome-terminal lxterminal mlterm roxterm sakura stupidterm terminator termite xfce4-terminal; - blackbox-terminal = blackbox-terminal.override { sixelSupport = true; }; - }; - }; - - meta = with lib; { - homepage = "https://www.gnome.org/"; - description = "Library implementing a terminal emulator widget for GTK"; - longDescription = '' - VTE is a library (libvte) implementing a terminal emulator widget for - GTK, and a minimal sample application (vte) using that. Vte is - mainly used in gnome-terminal, but can also be used to embed a - console/terminal in games, editors, IDEs, etc. VTE supports Unicode and - character set conversion, as well as emulating any terminal known to - the system's terminfo database. - ''; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ astsmtl antono ] ++ teams.gnome.members; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index d131fe173ab8..3f7f05678f15 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation { buildInputs = [ libpng libtiff ] ++ optionals enableQt [ (qtEnv "qvtk-qt-env" [ qtx11extras qttools qtdeclarative ]) ] - ++ optionals stdenv.isLinux [ + ++ optionals stdenv.hostPlatform.isLinux [ libGLU xorgproto libXt - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ xpc AGL Cocoa @@ -52,8 +52,8 @@ in stdenv.mkDerivation { ] ++ optionals enablePython [ python ]; - propagatedBuildInputs = optionals stdenv.isDarwin [ libobjc ] - ++ optionals stdenv.isLinux [ libX11 libGL ]; + propagatedBuildInputs = optionals stdenv.hostPlatform.isDarwin [ libobjc ] + ++ optionals stdenv.hostPlatform.isLinux [ libX11 libGL ]; # see https://github.com/NixOS/nixpkgs/pull/178367#issuecomment-1238827254 patches = map fetchpatch patchesToFetch; @@ -64,7 +64,7 @@ in stdenv.mkDerivation { -i ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp \ -i IO/Image/vtkSEPReader.h '' - + optionalString stdenv.isDarwin '' + + optionalString stdenv.hostPlatform.isDarwin '' sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c @@ -83,7 +83,7 @@ in stdenv.mkDerivation { "-DVTK_MODULE_USE_EXTERNAL_vtkpng=ON" "-DVTK_MODULE_USE_EXTERNAL_vtktiff=1" "-DVTK_MODULE_ENABLE_VTK_RenderingExternal=YES" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DOPENGL_INCLUDE_DIR=${libGL}/include" (lib.cmakeBool "VTK_OPENGL_HAS_EGL" enableEgl) ] ++ [ @@ -94,7 +94,7 @@ in stdenv.mkDerivation { ] ++ optionals enableQt [ "-DVTK_GROUP_ENABLE_Qt:STRING=YES" ] - ++ optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] + ++ optionals stdenv.hostPlatform.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] ++ optionals enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" "-DVTK_PYTHON_VERSION:STRING=${pythonMajor}" diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 9b5916810ab0..d48dc790424a 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,18 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, ninja }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.290.0"; + version = "1.3.296.0"; - nativeBuildInputs = [ cmake ]; + # Adding `ninja` here to enable Ninja backend. Otherwise on gcc-14 or + # later the build fails as: + # modules are not supported by this generator: Unix Makefiles + nativeBuildInputs = [ cmake ninja ]; # TODO: investigate why <algorithm> isn't found - cmakeFlags = lib.optionals stdenv.isDarwin [ "-DVULKAN_HEADERS_ENABLE_MODULE=OFF" ]; + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DVULKAN_HEADERS_ENABLE_MODULE=OFF" ]; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-goxA3Wg3u5hNCz54tWMJnFaS0JGVjphy14Ng/sAK/EM="; + hash = "sha256-u/40rOQyYbQza0aYbechLdKhYM1DgoMKkxauW2zZ/w0="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix deleted file mode 100644 index a43dda1b5f83..000000000000 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, libX11, libxcb -, libXrandr, wayland, moltenvk, vulkan-headers, addDriverRunpath -, testers }: - -stdenv.mkDerivation (finalAttrs: { - pname = "vulkan-loader"; - version = "1.3.290.0"; - - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "Vulkan-Loader"; - rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-z26xvp7bKaOQAXF+/Sk24Syuw3N9QXc6sk2vlQwceJ8="; - }; - - patches = [ ./fix-pkgconfig.patch ] - ++ lib.optionals stdenv.is32bit [ - # Backport patch to support 64-bit inodes on 32-bit systems - # FIXME: remove in next update - (fetchpatch { - url = "https://github.com/KhronosGroup/Vulkan-Loader/commit/ecd88b5c6b1e4c072c55c8652d76513d74c5ad4e.patch"; - hash = "sha256-Ea+v+RfmVl8fRbkr2ETM3/7R4vp+jw7hvTq2hnw4V/0="; - }) - ]; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ vulkan-headers ] - ++ lib.optionals stdenv.isLinux [ libX11 libxcb libXrandr wayland ]; - - cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ] - ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share" - ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addDriverRunpath.driverLink}/share" - ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DUSE_GAS=OFF"; - - outputs = [ "out" "dev" ]; - - doInstallCheck = true; - - installCheckPhase = '' - grep -q "${vulkan-headers}/include" $dev/lib/pkgconfig/vulkan.pc || { - echo vulkan-headers include directory not found in pkg-config file - exit 1 - } - ''; - - passthru = { - tests.pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - }; - }; - - meta = with lib; { - description = "LunarG Vulkan loader"; - homepage = "https://www.lunarg.com"; - platforms = platforms.unix ++ platforms.windows; - license = licenses.asl20; - maintainers = [ maintainers.ralith ]; - broken = finalAttrs.version != vulkan-headers.version; - pkgConfigModules = [ "vulkan" ]; - }; -}) diff --git a/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch b/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch deleted file mode 100644 index b9c5e8ad4536..000000000000 --- a/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in -index 153815577..584b15273 100644 ---- a/loader/vulkan.pc.in -+++ b/loader/vulkan.pc.in -@@ -1,7 +1,5 @@ --prefix=@CMAKE_INSTALL_PREFIX@ --exec_prefix=${prefix} --libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR_PC@ --includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR_PC@ -+libdir=@CMAKE_INSTALL_LIBDIR@ -+includedir=@CMAKE_INSTALL_INCLUDEDIR@ - - Name: @CMAKE_PROJECT_NAME@ - Description: Vulkan Loader diff --git a/pkgs/development/libraries/vulkan-utility-libraries/default.nix b/pkgs/development/libraries/vulkan-utility-libraries/default.nix deleted file mode 100644 index 060f609c8566..000000000000 --- a/pkgs/development/libraries/vulkan-utility-libraries/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3, vulkan-headers }: - -stdenv.mkDerivation (finalAttrs: { - pname = "vulkan-utility-libraries"; - version = "1.3.290.0"; - - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "Vulkan-Utility-Libraries"; - rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-dzX2xePUkjL4G+IMwPCUgFs1iKsqwZScQQBDt5toUzc="; - }; - - nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ vulkan-headers ]; - - meta = with lib; { - description = "Set of utility libraries for Vulkan"; - homepage = "https://github.com/KhronosGroup/Vulkan-Utility-Libraries"; - platforms = platforms.all; - license = licenses.asl20; - maintainers = with maintainers; [ nickcao ]; - }; -}) diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix deleted file mode 100644 index b7173ed93701..000000000000 --- a/pkgs/development/libraries/vxl/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, unzip -, cmake -, libtiff -, expat -, zlib -, libpng -, libjpeg -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "vxl"; - version = "3.5.0"; - - src = fetchFromGitHub { - owner = "vxl"; - repo = "vxl"; - rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "sha256-4kMpIrywEZzt0JH95LHeDLrDneii0R/Uw9GsWkvED+E="; - }; - - nativeBuildInputs = [ - cmake - unzip - ]; - buildInputs = [ - libtiff - expat - zlib - libpng - libjpeg - ]; - - # test failure on aarch64-linux; unknown reason: - cmakeFlags = lib.optionals stdenv.isAarch64 [ "-DCMAKE_CTEST_ARGUMENTS='-E vgl_test_frustum_3d'" ]; - - doCheck = true; - - meta = { - description = "C++ Libraries for Computer Vision Research and Implementation"; - homepage = "https://vxl.sourceforge.net"; - # 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 = [ ]; - platforms = with lib.platforms; linux; - }; -}) diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/development/libraries/waffle/default.nix deleted file mode 100644 index b92011c967df..000000000000 --- a/pkgs/development/libraries/waffle/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ stdenv -, fetchFromGitLab -, lib -, cmake -, meson -, ninja -, bash-completion -, libGL -, libglvnd -, makeWrapper -, pkg-config -, python3 -, x11Support ? true, libxcb, libX11 -, waylandSupport ? true, wayland, wayland-protocols, wayland-scanner -, useGbm ? true, mesa, udev -}: - -stdenv.mkDerivation rec { - pname = "waffle"; - version = "1.8.1"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "mesa"; - repo = "waffle"; - rev = "v${version}"; - sha256 = "sha256-Y7GRYLqSO572qA1eZ3jS8QlZ1X9xKpDtScaySTuPK/U="; - }; - - buildInputs = [ - bash-completion - libGL - ] ++ lib.optionals (with stdenv.hostPlatform; isUnix && !isDarwin) [ - libglvnd - ] ++ lib.optionals x11Support [ - libX11 - libxcb - ] ++ lib.optionals waylandSupport [ - wayland - wayland-protocols - ] ++ lib.optionals useGbm [ - udev - mesa - ]; - - depsBuildBuild = [ pkg-config ]; - - dontUseCmakeConfigure = true; - - nativeBuildInputs = [ - cmake - makeWrapper - meson - ninja - pkg-config - python3 - ] ++ lib.optionals waylandSupport [ - wayland-scanner - ]; - - PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "${placeholder "out"}/share/bash-completion/completions"; - - postInstall = '' - wrapProgram $out/bin/wflinfo \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libglvnd ]} - ''; - - meta = with lib; { - description = "Cross-platform C library that allows one to defer selection of an OpenGL API and window system until runtime"; - mainProgram = "wflinfo"; - homepage = "https://www.waffle-gl.org/"; - license = licenses.bsd2; - inherit (mesa.meta) platforms; - maintainers = with maintainers; [ Flakebi ]; - }; -} diff --git a/pkgs/development/libraries/wangle/default.nix b/pkgs/development/libraries/wangle/default.nix index e90d05318eac..d07145641a70 100644 --- a/pkgs/development/libraries/wangle/default.nix +++ b/pkgs/development/libraries/wangle/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-Wno-dev" (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/facebook/wangle/issues/206 "SSLContextManagerTest.TestSessionContextCertRemoval" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # flaky "BroadcastPoolTest.ThreadLocalPool" "Bootstrap.UDPClientServerTest" diff --git a/pkgs/development/libraries/wapp/default.nix b/pkgs/development/libraries/wapp/default.nix deleted file mode 100644 index 9543b49af3b9..000000000000 --- a/pkgs/development/libraries/wapp/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, fetchurl, tcl }: - -tcl.mkTclDerivation { - pname = "wapp"; - version = "0-unstable-2024-05-23"; - - src = fetchurl { - url = "https://wapp.tcl-lang.org/home/raw/98f23b2160bafc41f34be8e5d8ec414c53d33412eb2f724a07f2476eaf04ac6f?at=wapp.tcl"; - hash = "sha256-A+Ml5h5C+OMoDQtAoB9lHgYEK1A7qHExT3p46PHRTYg="; - }; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib/wapp - cp $src $out/lib/wapp/wapp.tcl - cat <<EOF > $out/lib/wapp/pkgIndex.tcl - package ifneeded wapp 1.0 [list source [file join \$dir wapp.tcl]] - EOF - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://wapp.tcl-lang.org/home/doc/trunk/README.md"; - description = "Framework for writing web applications in Tcl"; - license = licenses.bsd2; - maintainers = with maintainers; [ nat-418 ]; - }; -} diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix deleted file mode 100644 index 4cd3007043cf..000000000000 --- a/pkgs/development/libraries/wavpack/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gettext, autoreconfHook, libiconv }: - -stdenv.mkDerivation rec { - pname = "wavpack"; - version = "5.7.0"; - - enableParallelBuilding = true; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libiconv ]; - - # autogen.sh:9 - preAutoreconf = "cp ${gettext}/share/gettext/config.rpath ."; - - src = fetchFromGitHub { - owner = "dbry"; - repo = "WavPack"; - rev = version; - hash = "sha256-vFZxg1mVqE7Kp38vEGA5V8m2tjqhssFsUZURixhlfk0="; - }; - - outputs = [ "out" "dev" "doc" "man" ]; - - meta = with lib; { - description = "Hybrid audio compression format"; - homepage = "https://www.wavpack.com/"; - changelog = "https://github.com/dbry/WavPack/releases/tag/${version}"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ codyopel ]; - }; -} diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 3cd2ba5dbe68..72ba54250b51 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -5,7 +5,7 @@ , pkg-config , ninja , wayland-scanner -, withTests ? stdenv.isLinux +, withTests ? stdenv.hostPlatform.isLinux , libffi , epoll-shim , withDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 1be88f3a6d02..76976be200b5 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -2,12 +2,12 @@ , pkg-config , meson, ninja, wayland-scanner , python3, wayland -, testers +, gitUpdater, testers }: stdenv.mkDerivation (finalAttrs: { pname = "wayland-protocols"; - version = "1.36"; + version = "1.38"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform && # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48 @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${finalAttrs.pname}/-/releases/${finalAttrs.version}/downloads/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-cf1N4F55+aHKVZ+sMMH4Nl+hA0ZCL5/nlfdNd7nvfpI="; + hash = "sha256-/xcpLAUVnSsgzmys/kLX4xooGY+hQpp2mwOvfDhYHb4="; }; postPatch = lib.optionalString finalAttrs.doCheck '' @@ -45,6 +45,9 @@ stdenv.mkDerivation (finalAttrs: { pkgConfigModules = [ "wayland-protocols" ]; }; + passthru.updateScript = gitUpdater { + url = "https://gitlab.freedesktop.org/wayland/wayland-protocols.git"; + }; passthru.version = finalAttrs.version; passthru.tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; diff --git a/pkgs/development/libraries/waylib/default.nix b/pkgs/development/libraries/waylib/default.nix index 15ece6b3b01b..d3ae7273fae8 100644 --- a/pkgs/development/libraries/waylib/default.nix +++ b/pkgs/development/libraries/waylib/default.nix @@ -1,47 +1,32 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , pkg-config , wayland-scanner , wrapQtAppsHook , qtbase -, qtquick3d +, qtdeclarative , qwlroots , wayland , wayland-protocols , wlr-protocols , pixman , libdrm -, nixos-artwork +, libinput }: stdenv.mkDerivation (finalAttrs: { pname = "waylib"; - version = "0.1.1"; + version = "0.3.0-alpha"; src = fetchFromGitHub { owner = "vioken"; repo = "waylib"; rev = finalAttrs.version; - hash = "sha256-3IdrChuXQyQGhJ/7kTqmkV0PyuSNP53Y0Po01Fc9Qi0="; + hash = "sha256-5IWe8VFpLwDSja4to/ugVS80s5+bcAbM6/fg1HPP52Q="; }; - patches = [ - (fetchpatch { - name = "fix-build-on-qt-6_7.patch"; - url = "https://github.com/vioken/waylib/commit/09875ebedb074089ec57e71cbc8d8011f555be70.patch"; - hash = "sha256-ulXlLxn7TOlXSl4N5mjXCy3PJhxVeyDwbwKeV9J/FSI="; - }) - ]; - - postPatch = '' - substituteInPlace examples/tinywl/OutputDelegate.qml \ - --replace "/usr/share/wallpapers/deepin/desktop.jpg" \ - "${nixos-artwork.wallpapers.simple-blue}/share/backgrounds/nixos/nix-wallpaper-simple-blue.png" - ''; - depsBuildBuild = [ # To find wayland-scanner pkg-config @@ -51,36 +36,30 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config wayland-scanner - wrapQtAppsHook ]; buildInputs = [ qtbase - qtquick3d + qtdeclarative + qwlroots wayland wayland-protocols wlr-protocols pixman libdrm - ]; - - propagatedBuildInputs = [ - qwlroots - ]; - - cmakeFlags = [ - (lib.cmakeBool "INSTALL_TINYWL" true) + libinput ]; strictDeps = true; - outputs = [ "out" "dev" "bin" ]; + dontWrapQtApps = true; + + outputs = [ "out" "dev" ]; meta = { description = "Wrapper for wlroots based on Qt"; homepage = "https://github.com/vioken/waylib"; license = with lib.licenses; [ gpl3Only lgpl3Only asl20 ]; - outputsToInstall = [ "out" ]; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ rewine ]; }; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index ecf306966c1f..5a47eda36425 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, clangStdenv , buildPackages , runCommand , fetchurl @@ -29,11 +29,14 @@ , libepoxy , libjxl , at-spi2-core +, cairo , libxml2 , libsoup , libsecret , libxslt , harfbuzz +, hyphen +, libsysprof-capture , libpthreadstubs , nettle , libtasn1 @@ -50,6 +53,8 @@ , libmanette , geoclue2 , flite +, fontconfig +, freetype , openssl , sqlite , gst-plugins-base @@ -67,27 +72,28 @@ , enableGeoLocation ? true , enableExperimental ? false , withLibsecret ? true -, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd +, systemdSupport ? lib.meta.availableOn clangStdenv.hostPlatform systemd , testers }: -stdenv.mkDerivation (finalAttrs: { +# https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. +clangStdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.44.3"; + version = "2.46.3"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; # https://github.com/NixOS/nixpkgs/issues/153528 # Can't be linked within a 4GB address space. - separateDebugInfo = stdenv.isLinux && !stdenv.is32bit; + separateDebugInfo = clangStdenv.hostPlatform.isLinux && !clangStdenv.hostPlatform.is32bit; src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-3ILQQuysqYGkhSNXwG5SNXQzGc8QqUzTatQbl4g6C1Q="; + hash = "sha256-heCfpv+f6klni6mXXbxk6jJCgz+Pin1qiTey8pL8so0="; }; - patches = lib.optionals stdenv.isLinux [ + patches = lib.optionals clangStdenv.hostPlatform.isLinux [ (substituteAll { src = ./fix-bubblewrap-paths.patch; inherit (builtins) storeDir; @@ -95,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + preConfigure = lib.optionalString (clangStdenv.hostPlatform != clangStdenv.buildPlatform) '' # Ignore gettext in cmake_prefix_path so that find_program doesn't # pick up the wrong gettext. TODO: Find a better solution for # this, maybe make cmake not look up executables in @@ -118,12 +124,13 @@ stdenv.mkDerivation (finalAttrs: { gi-docgen glib # for gdbus-codegen unifdef - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [ wayland-scanner ]; buildInputs = [ at-spi2-core + cairo # required even when using skia enchant2 libavif libepoxy @@ -132,6 +139,7 @@ stdenv.mkDerivation (finalAttrs: { gst-plugins-bad gst-plugins-base harfbuzz + hyphen libGL libGLU mesa # for libEGL headers @@ -141,6 +149,7 @@ stdenv.mkDerivation (finalAttrs: { libintl lcms2 libpthreadstubs + libsysprof-capture libtasn1 libwebp libxkbcommon @@ -151,10 +160,14 @@ stdenv.mkDerivation (finalAttrs: { p11-kit sqlite woff2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals clangStdenv.hostPlatform.isBigEndian [ + # https://bugs.webkit.org/show_bug.cgi?id=274032 + fontconfig + freetype + ] ++ lib.optionals clangStdenv.hostPlatform.isDarwin [ libedit readline - ] ++ lib.optional (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") ( + ] ++ lib.optional (clangStdenv.hostPlatform.isDarwin && lib.versionOlder clangStdenv.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 @@ -166,7 +179,7 @@ stdenv.mkDerivation (finalAttrs: { runCommand "webkitgtk_headers" { } '' install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h '' - ) ++ lib.optionals stdenv.isLinux [ + ) ++ lib.optionals clangStdenv.hostPlatform.isLinux [ libseccomp libmanette wayland @@ -196,16 +209,15 @@ stdenv.mkDerivation (finalAttrs: { [ "-DENABLE_INTROSPECTION=ON" "-DPORT=GTK" - "-DUSE_LIBHYPHEN=OFF" "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}" "-DUSE_LIBSECRET=${cmakeBool withLibsecret}" "-DENABLE_EXPERIMENTAL_FEATURES=${cmakeBool enableExperimental}" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [ # Have to be explicitly specified when cross. # https://github.com/WebKit/WebKit/commit/a84036c6d1d66d723f217a4c29eee76f2039a353 "-DBWRAP_EXECUTABLE=${lib.getExe bubblewrap}" "-DDBUS_PROXY_EXECUTABLE=${lib.getExe xdg-dbus-proxy}" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals clangStdenv.hostPlatform.isDarwin [ "-DENABLE_GAMEPAD=OFF" "-DENABLE_GTKDOC=OFF" "-DENABLE_MINIBROWSER=OFF" @@ -244,6 +256,6 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = platforms.linux ++ platforms.darwin; maintainers = teams.gnome.members; - broken = stdenv.isDarwin; + broken = clangStdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/development/libraries/webp-pixbuf-loader/default.nix b/pkgs/development/libraries/webp-pixbuf-loader/default.nix deleted file mode 100644 index 78496c0e919e..000000000000 --- a/pkgs/development/libraries/webp-pixbuf-loader/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, makeWrapper -, gdk-pixbuf -, libwebp -}: - -let - inherit (gdk-pixbuf) moduleDir; - loadersPath = "${gdk-pixbuf.binaryDir}/webp-loaders.cache"; -in -stdenv.mkDerivation rec { - pname = "webp-pixbuf-loader"; - version = "0.2.6"; - - src = fetchFromGitHub { - owner = "aruiz"; - repo = "webp-pixbuf-loader"; - rev = version; - sha256 = "sha256-2GDH5+YCwb2mPdMfEscmWDOzdGnWRcppE+4rcDCZog4="; - }; - - nativeBuildInputs = [ - gdk-pixbuf.dev - meson - ninja - pkg-config - makeWrapper - ]; - - buildInputs = [ - gdk-pixbuf - libwebp - ]; - - mesonFlags = [ - "-Dgdk_pixbuf_moduledir=${placeholder "out"}/${moduleDir}" - ]; - - postPatch = '' - # It looks for gdk-pixbuf-thumbnailer in this package's bin rather than the gdk-pixbuf bin. We need to patch that. - substituteInPlace webp-pixbuf.thumbnailer.in \ - --replace "@bindir@/gdk-pixbuf-thumbnailer" "$out/libexec/gdk-pixbuf-thumbnailer-webp" - ''; - - postInstall = '' - GDK_PIXBUF_MODULE_FILE="$out/${loadersPath}" \ - GDK_PIXBUF_MODULEDIR="$out/${moduleDir}" \ - gdk-pixbuf-query-loaders --update-cache - - # gdk-pixbuf disables the thumbnailer in cross-builds (https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/fc37708313a5fc52083cf10c9326f3509d67701f) - # and therefore makeWrapper will fail because 'gdk-pixbuf-thumbnailer' the executable does not exist. - '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' - # It assumes gdk-pixbuf-thumbnailer can find the webp loader in the loaders.cache referenced by environment variable, breaking containment. - # So we replace it with a wrapped executable. - mkdir -p "$out/bin" - makeWrapper "${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer" "$out/libexec/gdk-pixbuf-thumbnailer-webp" \ - --set GDK_PIXBUF_MODULE_FILE "$out/${loadersPath}" - ''; - - meta = with lib; { - description = "WebP GDK Pixbuf Loader library"; - homepage = "https://github.com/aruiz/webp-pixbuf-loader"; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - maintainers = teams.gnome.members ++ [ maintainers.cwyc ]; - }; -} diff --git a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix index 3ac5e2bd4adc..a3efc646d319 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ./enable-powerpc.patch ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); patchPhase = lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index b25ea77b44b4..4f5c7bbdcb10 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { abseil-cpp ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Foundation ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Foundation ]); - env = lib.optionalAttrs stdenv.isx86_32 { + env = lib.optionalAttrs stdenv.hostPlatform.isx86_32 { # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5 NIX_CFLAGS_COMPILE = "-msse2"; }; @@ -53,8 +53,11 @@ stdenv.mkDerivation rec { homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "More Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; - # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/webrtc/rtc_base/system/arch.h - platforms = intersectLists platforms.unix (platforms.arm ++ platforms.aarch64 ++ platforms.mips ++ platforms.power ++ platforms.riscv ++ platforms.x86); + platforms = intersectLists + # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/meson.build + (platforms.darwin ++ platforms.linux ++ platforms.windows) + # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/webrtc/rtc_base/system/arch.h + (platforms.arm ++ platforms.aarch64 ++ platforms.mips ++ platforms.power ++ platforms.riscv ++ platforms.x86); # BE platforms are unsupported # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/31 badPlatforms = platforms.bigEndian; diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix deleted file mode 100644 index c325ade26e5c..000000000000 --- a/pkgs/development/libraries/websocket++/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "websocket++"; - version = "0.8.2"; - - src = fetchFromGitHub { - owner = "zaphoyd"; - repo = "websocketpp"; - rev = version; - sha256 = "sha256-9fIwouthv2GcmBe/UPvV7Xn9P2o0Kmn2hCI4jCh0hPM="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - homepage = "https://www.zaphoyd.com/websocketpp/"; - description = "C++/Boost Asio based websocket client/server library"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ revol-xut ]; - }; -} diff --git a/pkgs/development/libraries/wfa2-lib/default.nix b/pkgs/development/libraries/wfa2-lib/default.nix deleted file mode 100644 index 519343ff5a20..000000000000 --- a/pkgs/development/libraries/wfa2-lib/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, llvmPackages -, enableOpenMP ? true -}: - -stdenv.mkDerivation rec { - pname = "wfa2-lib"; - version = "2.3.5"; - - src = fetchFromGitHub { - owner = "smarco"; - repo = "WFA2-lib"; - rev = "v${version}"; - hash = "sha256-vTeSvhSt3PQ/BID6uM1CuXkQipgG7VViDexvAwV4nW8="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = lib.optionals enableOpenMP [ llvmPackages.openmp ]; - - cmakeFlags = [ "-DOPENMP=${if enableOpenMP then "ON" else "OFF"}" ]; - - meta = with lib; { - description = "Wavefront alignment algorithm library v2"; - homepage = "https://github.com/smarco/WFA2-lib"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/whereami/default.nix b/pkgs/development/libraries/whereami/default.nix deleted file mode 100644 index f68895ca17d0..000000000000 --- a/pkgs/development/libraries/whereami/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fixDarwinDylibNames -}: -let - libExt = stdenv.hostPlatform.extensions.sharedLibrary; -in -stdenv.mkDerivation rec { - pname = "whereami"; - version = "unstable-2022-02-18"; - - src = fetchFromGitHub { - owner = "gpakosz"; - repo = pname; - rev = "ba364cd54fd431c76c045393b6522b4bff547f50"; - sha256 = "XhRqW0wdXzlmyBf1cjqtQvztuyV4buxVl19Q0uyEOhk="; - }; - - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=strict-prototypes"; - - makeFlags = [ - "-C_gnu-make" - "build-library" - "binsubdir=platform" - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib $out/include - cp bin/platform/library${libExt} $out/lib/libwhereami${libExt} - cp src/whereami.h $out/include/whereami.h - - runHook postInstall - ''; - - meta = with lib; { - description = "Locate the current executable and running module/library"; - homepage = "https://github.com/gpakosz/whereami"; - license = with licenses; [ mit wtfpl ]; - maintainers = with maintainers; [ emilytrau ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix deleted file mode 100644 index a87afd7ee09f..000000000000 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool - -# Optional Dependencies -, lz4 ? null, snappy ? null, zlib ? null, bzip2 ? null, db ? null -, gperftools ? null, leveldb ? null -}: - -let - shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; - - optLz4 = shouldUsePkg lz4; - optSnappy = shouldUsePkg snappy; - optZlib = shouldUsePkg zlib; - optBzip2 = shouldUsePkg bzip2; - optDb = shouldUsePkg db; - optGperftools = shouldUsePkg gperftools; - optLeveldb = shouldUsePkg leveldb; -in -stdenv.mkDerivation rec { - pname = "wiredtiger"; - version = "3.2.1"; - - src = fetchFromGitHub { - repo = "wiredtiger"; - owner = "wiredtiger"; - rev = version; - sha256 = "04j2zw8b9jym43r682rh4kpdippxx7iw3ry16nxlbybzar9kgk83"; - }; - - nativeBuildInputs = [ automake autoconf libtool ]; - buildInputs = [ optLz4 optSnappy optZlib optBzip2 optDb optGperftools optLeveldb ]; - - configureFlags = [ - (lib.withFeature false "attach") - (lib.withFeatureAs true "builtins" "") - (lib.enableFeature (optBzip2 != null) "bzip2") - (lib.enableFeature false "diagnostic") - (lib.enableFeature false "java") - (lib.enableFeature (optLeveldb != null) "leveldb") - (lib.enableFeature false "python") - (lib.enableFeature (optSnappy != null) "snappy") - (lib.enableFeature (optLz4 != null) "lz4") - (lib.enableFeature (optGperftools != null) "tcmalloc") - (lib.enableFeature (optZlib != null) "zlib") - (lib.withFeatureAs (optDb != null) "berkeleydb" optDb) - (lib.withFeature false "helium") - ]; - - preConfigure = '' - ./autogen.sh - ''; - - meta = with lib; { - homepage = "http://wiredtiger.com/"; - description = ""; - mainProgram = "wt"; - license = licenses.gpl2; - platforms = intersectLists platforms.unix platforms.x86_64; - }; -} diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index c55ad0010d53..aeef5a8c4705 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -54,14 +54,14 @@ stdenv.mkDerivation (finalAttrs: { # Enable AVX/AVX2/AES-NI instructions, gated by runtime detection via CPUID. "--enable-intelasm" "--enable-aesni" - ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ # No runtime detection under ARM and no platform function checks like for X86. # However, all ARM macOS systems have the supported extensions autodetected in the configure script. "--enable-armasm=inline" ] ++ extraConfigureFlags; # Breaks tls13 tests on aarch64-darwin. - hardeningDisable = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "zerocallusedregs" ]; + hardeningDisable = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "zerocallusedregs" ]; # LTO should help with the C implementations. env.NIX_CFLAGS_COMPILE = lib.optionalString enableLto "-flto"; @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { "out" ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/development/libraries/wtk/builder.sh deleted file mode 100644 index ca5157c6d71a..000000000000 --- a/pkgs/development/libraries/wtk/builder.sh +++ /dev/null @@ -1,28 +0,0 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - -mkdir unzipped -pushd unzipped -unzip $src || true -popd - -mkdir -p $out -mv unzipped/* $out/ - -# Remove crap in the root directory. -for file in $out/* -do - if test -f $file ; then - rm $file - fi -done - -# Set the dynamic linker. -rpath= -for i in $libraries; do - rpath=$rpath${rpath:+:}$i/lib -done -find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \; -find $out -type f -perm -0100 \ - -exec patchelf --set-rpath "$rpath" {} \; diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix deleted file mode 100644 index 1360895942a4..000000000000 --- a/pkgs/development/libraries/wtk/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, requireFile, unzip, xorg }: - -stdenv.mkDerivation rec { - pname = "sun-java-wtk"; - version = "2.5.2_01"; - - src = requireFile { - url = "http://java.sun.com/products/sjwtoolkit/download.html"; - name = "sun_java_wireless_toolkit-${version}-linuxi486.bin.sh"; - sha256 = "1cjb9c27847wv0hq3j645ckn4di4vsfvp29fr4zmdqsnvk4ahvj1"; - }; - - builder = ./builder.sh; - - nativeBuildInputs = [ unzip ]; - - libraries = [ xorg.libXpm xorg.libXt xorg.libX11 xorg.libICE xorg.libSM stdenv.cc.cc ]; - - meta = { - homepage = "http://java.sun.com/products/sjwtoolkit/download.html"; - description = "Sun Java Wireless Toolkit 2.5.2_01 for CLDC"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - platforms = [ "i686-linux" ]; - }; -} diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index d14a77a67004..5182cc2ff955 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { libexif pango wxGTK - ] ++ lib.optional stdenv.isDarwin Cocoa; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index e986ab87ffac..f06af1417de8 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -12,19 +12,19 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.9.11"; + version = "4.9.12"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - hash = "sha256-aX1YU35ATL+f18tGIba6cgNYZvYm3TshHsN7RFD+vI4="; + hash = "sha256-WiOAF1yg18W4Vyyy+rzRe87GQTemvn32bexit4M/HjE="; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ sqlite wxGTK ] - ++ lib.optionals (stdenv.isDarwin) [ Cocoa setfile rez derez ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ Cocoa setfile rez derez ]; meta = with lib; { homepage = "https://utelle.github.io/wxsqlite3/"; diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix index 0775dca688b4..2d980c69cbe6 100644 --- a/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/pkgs/development/libraries/wxsqliteplus/default.nix @@ -15,23 +15,23 @@ stdenv.mkDerivation rec { sed -i '/WX_CLEAR_ARRAY/s/$/;/' src/{createtable,sqlite3table}.cpp ''; - buildInputs = [ wxGTK wxsqlite3 sqlite ] ++ lib.optional stdenv.isDarwin Cocoa; + buildInputs = [ wxGTK wxsqlite3 sqlite ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; makeFlags = [ "LDFLAGS=-L${wxsqlite3}/lib" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "SETFILE=${setfile}/bin/SetFile" ]; preBuild = '' sed -ie 's|all: $(LIBPREFIX)wxsqlite$(LIBEXT)|all: |g' Makefile sed -ie 's|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) $(LIBPREFIX)wxsqlite$(LIBEXT)|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) |g' Makefile - sed -ie 's|-lwxsqlite |-lwxcode_${if stdenv.isDarwin then "osx_cocoau_wxsqlite3-3.2.0" else "gtk3u_wxsqlite3-3.2"} |g' Makefile + sed -ie 's|-lwxsqlite |-lwxcode_${if stdenv.hostPlatform.isDarwin then "osx_cocoau_wxsqlite3-3.2.0" else "gtk3u_wxsqlite3-3.2"} |g' Makefile ''; installPhase = '' - install -D ${lib.optionalString stdenv.isDarwin "wxsqliteplus.app/Contents/MacOS/"}wxsqliteplus $out/bin/wxsqliteplus - '' + lib.optionalString stdenv.isDarwin '' + install -D ${lib.optionalString stdenv.hostPlatform.isDarwin "wxsqliteplus.app/Contents/MacOS/"}wxsqliteplus $out/bin/wxsqliteplus + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv wxsqliteplus.app $out/Applications/ ''; diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index be0c45c701dc..1379a15801e6 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -18,9 +18,9 @@ , withCurl ? false , withPrivateFonts ? false , withEGL ? true -, withMesa ? !stdenv.isDarwin -, withWebKit ? stdenv.isDarwin -, webkitgtk +, withMesa ? !stdenv.hostPlatform.isDarwin +, withWebKit ? stdenv.hostPlatform.isDarwin +, webkitgtk_4_0 , setfile , AGL , Carbon @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { buildInputs = [ gst_all_1.gst-plugins-base gst_all_1.gstreamer - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gtk3 libSM libXinerama @@ -64,9 +64,9 @@ stdenv.mkDerivation rec { ] ++ lib.optional withCurl curl ++ lib.optional withMesa libGLU - ++ lib.optional (withWebKit && !stdenv.isDarwin) webkitgtk - ++ lib.optional (withWebKit && stdenv.isDarwin) WebKit - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk_4_0 + ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit + ++ lib.optionals stdenv.hostPlatform.isDarwin [ setfile Carbon Cocoa @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { WebKit ]; - propagatedBuildInputs = lib.optional stdenv.isDarwin AGL; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin AGL; configureFlags = [ "--disable-precomp-headers" @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { ++ lib.optional withCurl "--enable-webrequest" ++ lib.optional withPrivateFonts "--enable-privatefonts" ++ lib.optional withMesa "--with-opengl" - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-osx_cocoa" "--with-libiconv" ] ++ lib.optionals withWebKit [ @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { "--enable-webviewwebkit" ]; - SEARCH_LIB = lib.optionalString (!stdenv.isDarwin) "${libGLU.out}/lib ${libGL.out}/lib "; + SEARCH_LIB = lib.optionalString (!stdenv.hostPlatform.isDarwin) "${libGLU.out}/lib ${libGL.out}/lib "; preConfigure = '' substituteInPlace configure --replace \ @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' substituteInPlace configure --replace \ /usr /no-such-path - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace \ 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix index a77dedb0c6ee..33351e28a7d8 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -20,9 +20,9 @@ , compat28 ? false , compat30 ? true , unicode ? true -, withMesa ? !stdenv.isDarwin +, withMesa ? !stdenv.hostPlatform.isDarwin , withWebKit ? true -, webkitgtk +, webkitgtk_4_0 , setfile , AGL , Carbon @@ -50,13 +50,13 @@ let in stdenv.mkDerivation rec { pname = "wxwidgets"; - version = "3.2.5"; + version = "3.2.6"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - hash = "sha256-ibkXs693xO+z3JuMvlG4b/+A8f4Lf5TYqdDa67fb9ck="; + hash = "sha256-7dc7NGiKSonFFaWp3UxLYqDc1Cc6no1Eba0QmtzX5mM="; }; nativeBuildInputs = [ pkg-config ]; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { libjpeg_turbo zlib pcre2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 libSM libXinerama @@ -78,9 +78,9 @@ stdenv.mkDerivation rec { xorgproto ] ++ lib.optional withMesa libGLU - ++ lib.optional (withWebKit && stdenv.isLinux) webkitgtk - ++ lib.optional (withWebKit && stdenv.isDarwin) WebKit - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk_4_0 + ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit + ++ lib.optionals stdenv.hostPlatform.isDarwin [ expat setfile Carbon @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { WebKit ]; - propagatedBuildInputs = lib.optional stdenv.isDarwin AGL; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin AGL; configureFlags = [ "--disable-precomp-headers" @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { (if compat30 then "--enable-compat30" else "--disable-compat30") ] ++ lib.optional unicode "--enable-unicode" ++ lib.optional withMesa "--with-opengl" - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-osx_cocoa" "--with-libiconv" ] ++ lib.optionals withWebKit [ @@ -114,12 +114,12 @@ stdenv.mkDerivation rec { "--enable-webviewwebkit" ]; - SEARCH_LIB = lib.optionalString (!stdenv.isDarwin) "${libGLU.out}/lib ${libGL.out}/lib"; + SEARCH_LIB = lib.optionalString (!stdenv.hostPlatform.isDarwin) "${libGLU.out}/lib ${libGL.out}/lib"; preConfigure = '' cp -r ${catch}/* 3rdparty/catch/ cp -r ${nanosvg}/* 3rdparty/nanosvg/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure \ --replace 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' substituteInPlace configure \ diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix deleted file mode 100644 index 2be8ea48b8e2..000000000000 --- a/pkgs/development/libraries/x264/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenv -, lib -, fetchFromGitLab -, nasm -, enableShared ? !stdenv.hostPlatform.isStatic -}: - -stdenv.mkDerivation rec { - pname = "x264"; - version = "0-unstable-2023-10-01"; - - src = fetchFromGitLab { - domain = "code.videolan.org"; - owner = "videolan"; - repo = pname; - rev = "31e19f92f00c7003fa115047ce50978bc98c3a0d"; - hash = "sha256-7/FaaDFmoVhg82BIhP3RbFq4iKGNnhviOPxl3/8PWCM="; - }; - - patches = [ - # Upstream ./configure greps for (-mcpu|-march|-mfpu) in CFLAGS, which in nix - # is put in the cc wrapper anyway. - ./disable-arm-neon-default.patch - ]; - - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile --replace '$(if $(STRIP), $(STRIP) -x $@)' '$(if $(STRIP), $(STRIP) -S $@)' - ''; - - enableParallelBuilding = true; - - outputs = [ "out" "lib" "dev" ]; - - preConfigure = lib.optionalString stdenv.hostPlatform.isx86 '' - # `AS' is set to the binutils assembler, but we need nasm - unset AS - '' + lib.optionalString stdenv.hostPlatform.isAarch '' - export AS=$CC - ''; - - configureFlags = lib.optional enableShared "--enable-shared" - ++ lib.optional (!stdenv.isi686) "--enable-pic" - ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}"; - - makeFlags = [ - "BASHCOMPLETIONSDIR=$(out)/share/bash-completion/completions" - "install-bashcompletion" - "install-lib-shared" - ]; - - nativeBuildInputs = lib.optional stdenv.hostPlatform.isx86 nasm; - - meta = with lib; { - description = "Library for encoding H264/AVC video streams"; - mainProgram = "x264"; - homepage = "http://www.videolan.org/developers/x264.html"; - license = licenses.gpl2Plus; - platforms = platforms.unix ++ platforms.windows; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/x264/disable-arm-neon-default.patch b/pkgs/development/libraries/x264/disable-arm-neon-default.patch deleted file mode 100644 index 6971944abb4f..000000000000 --- a/pkgs/development/libraries/x264/disable-arm-neon-default.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur x264-snapshot-20190517-2245-stable-orig/configure x264-snapshot-20190517-2245-stable/configure ---- x264-snapshot-20190517-2245-stable-orig/configure 2020-01-03 19:51:03.041037657 -0500 -+++ x264-snapshot-20190517-2245-stable/configure 2020-01-03 19:52:15.075034609 -0500 -@@ -930,9 +930,6 @@ - fi - - if [ $asm = auto -a $ARCH = ARM ] ; then -- # set flags so neon is built by default -- [ $compiler == CL ] || echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon" -- - cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM - if [ $compiler = CL ] && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7' ; then - define HAVE_ARMV6 diff --git a/pkgs/development/libraries/x265/darwin-__rdtsc.patch b/pkgs/development/libraries/x265/darwin-__rdtsc.patch deleted file mode 100644 index a052f818af10..000000000000 --- a/pkgs/development/libraries/x265/darwin-__rdtsc.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5ad351f7d271d0be0611797542c831898b2f531c Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyich@gmail.com> -Date: Sun, 11 Aug 2024 22:09:34 +0100 -Subject: [PATCH] source/test/testharness.h: don't redefine `__rdtsc()` builtin - -On darwin clang-16 provides `__rdtsc()` builtin. As a result the build -fails in `nixpkgs` as: - - source/test/testharness.h:78:24: error: static declaration of '__rdtsc' follows non-static declaration - static inline uint32_t __rdtsc(void) - ^ - x265_3.6/source/test/testharness.h:78:24: note: '__rdtsc' is a builtin with type 2 - -The change avoid redefinition on targets that define `__rdtsc()` builtin. ---- - source/test/testharness.h | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/test/testharness.h -+++ b/test/testharness.h -@@ -69,6 +69,8 @@ protected: - #include <intrin.h> - #elif HAVE_RDTSC - #include <intrin.h> -+#elif defined(__has_builtin) && __has_builtin(__rdtsc) -+/* compiler-provided builtin */ - #elif (!defined(__APPLE__) && (defined (__GNUC__) && (defined(__x86_64__) || defined(__i386__)))) - #include <x86intrin.h> - #elif ( !defined(__APPLE__) && defined (__GNUC__) && defined(__ARM_NEON__)) diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix deleted file mode 100644 index 8e16ca72e003..000000000000 --- a/pkgs/development/libraries/x265/default.nix +++ /dev/null @@ -1,140 +0,0 @@ -{ lib -, gccStdenv -, stdenv -, fetchurl -, cmake -, nasm - - # NUMA support enabled by default on NUMA platforms: -, numaSupport ? (stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64)) -, numactl - - # Multi bit-depth support (8bit+10bit+12bit): -, multibitdepthSupport ? (stdenv.is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) - - # Other options: -, cliSupport ? true # Build standalone CLI application -, custatsSupport ? false # Internal profiling of encoder work -, debugSupport ? false # Run-time sanity checks (debugging) -, ppaSupport ? false # PPA profiling instrumentation -, unittestsSupport ? stdenv.isx86_64 # Unit tests - only testing x64 assembly -, vtuneSupport ? false # Vtune profiling instrumentation -, werrorSupport ? false # Warnings as errors -}: - -let - mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF"; - - isCross = stdenv.buildPlatform != stdenv.hostPlatform; -in - -stdenv.mkDerivation rec { - pname = "x265"; - version = "3.6"; - - outputs = [ "out" "dev" ]; - - # Check that x265Version.txt contains the expected version number - # whether we fetch a source tarball or a tag from the git repo - src = fetchurl { - url = "https://bitbucket.org/multicoreware/x265_git/downloads/x265_${version}.tar.gz"; - hash = "sha256-ZjUx80HFOJ9GDXMOYuEKT8yjQoyiyhCWk4Z7xf4uKAc="; - }; - - patches = [ - ./darwin-__rdtsc.patch - ]; - - sourceRoot = "x265_${version}/source"; - - postPatch = '' - substituteInPlace cmake/Version.cmake \ - --replace "unknown" "${version}" \ - --replace "0.0" "${version}" - '' - # There is broken and complicated logic when setting X265_LATEST_TAG for - # mingwW64 builds. This bypasses the logic by setting it at the end of the - # file - + lib.optionalString stdenv.hostPlatform.isMinGW '' - echo 'set(X265_LATEST_TAG "${version}")' >> ./cmake/Version.cmake - ''; - - nativeBuildInputs = [ cmake nasm ] ++ lib.optionals (numaSupport) [ numactl ]; - - cmakeFlags = [ - "-Wno-dev" - (mkFlag custatsSupport "DETAILED_CU_STATS") - (mkFlag debugSupport "CHECKED_BUILD") - (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" - "-DENABLE_CLI=OFF" - "-DENABLE_SHARED=OFF" - "-DEXPORT_C_API=OFF" - ] ++ lib.optionals stdenv.hostPlatform.isPower [ - "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le - ] ++ lib.optionals isCross [ - (mkFlag stdenv.hostPlatform.isAarch32 "CROSS_COMPILE_ARM") - (mkFlag stdenv.hostPlatform.isAarch64 "CROSS_COMPILE_ARM64") - ]; - - preConfigure = lib.optionalString multibitdepthSupport '' - cmake -B build-10bits $cmakeFlags "''${cmakeFlagsArray[@]}" $cmakeStaticLibFlags - cmake -B build-12bits $cmakeFlags "''${cmakeFlagsArray[@]}" $cmakeStaticLibFlags -DMAIN12=ON - cmakeFlagsArray+=( - -DEXTRA_LIB="x265-10.a;x265-12.a" - -DEXTRA_LINK_FLAGS=-L. - -DLINKED_10BIT=ON - -DLINKED_12BIT=ON - ) - '' + '' - cmakeFlagsArray+=( - -DGIT_ARCHETYPE=1 # https://bugs.gentoo.org/814116 - ${mkFlag (!stdenv.hostPlatform.isStatic) "ENABLE_SHARED"} - -DHIGH_BIT_DEPTH=OFF - -DENABLE_HDR10_PLUS=ON - ${mkFlag cliSupport "ENABLE_CLI"} - ${mkFlag unittestsSupport "ENABLE_TESTS"} - ) - ''; - - # Builds 10bits and 12bits static libs on the side if multi bit-depth is wanted - # (we are in x265_<version>/source/build) - preBuild = lib.optionalString multibitdepthSupport '' - make -C ../build-10bits -j $NIX_BUILD_CORES - make -C ../build-12bits -j $NIX_BUILD_CORES - ln -s ../build-10bits/libx265.a ./libx265-10.a - ln -s ../build-12bits/libx265.a ./libx265-12.a - ''; - - doCheck = unittestsSupport; - checkPhase = '' - runHook preCheck - ./test/TestBench - runHook postCheck - ''; - - postInstall = '' - rm -f ${placeholder "out"}/lib/*.a - '' - # For mingw, libs are located in $out/bin not $out/lib - + lib.optionalString stdenv.hostPlatform.isMinGW '' - ln -s $out/bin/*.dll $out/lib - ''; - - meta = with lib; { - description = "Library for encoding H.265/HEVC video streams"; - mainProgram = "x265"; - homepage = "https://www.x265.org/"; - changelog = "https://x265.readthedocs.io/en/master/releasenotes.html#version-${lib.strings.replaceStrings ["."] ["-"] version}"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ codyopel ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/x265/fix-clang-asm.patch b/pkgs/development/libraries/x265/fix-clang-asm.patch deleted file mode 100644 index 6aa5fe2f0a0e..000000000000 --- a/pkgs/development/libraries/x265/fix-clang-asm.patch +++ /dev/null @@ -1,34 +0,0 @@ -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/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix deleted file mode 100644 index ccf914b46ee1..000000000000 --- a/pkgs/development/libraries/xalanc/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, xercesc, getopt, cmake }: - -stdenv.mkDerivation rec { - pname = "xalan-c"; - version = "1.12.0"; - - src = fetchFromGitHub { - owner = "apache"; - repo = "xalan-c"; - rev = "Xalan-C_1_12_0"; - sha256 = "sha256:0q1204qk97i9h14vxxq7phcfpyiin0i1zzk74ixvg4wqy87b62s8"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ xercesc getopt ]; - - meta = { - homepage = "https://xalan.apache.org/"; - description = "XSLT processor for transforming XML documents"; - mainProgram = "Xalan"; - license = lib.licenses.asl20; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = [ lib.maintainers.jagajaga ]; - }; -} diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 0862fcfe25f6..c8a28166a7a4 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -34,13 +34,13 @@ let env = { AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git - } // lib.optionalAttrs stdenv.is32bit { + } // lib.optionalAttrs stdenv.hostPlatform.is32bit { NIX_CFLAGS_COMPILE = "-fpermissive"; }; # the configure script thinks that Darwin has ___exp10 # but it’s not available on my systems (or hydra apparently) - postConfigure = lib.optionalString stdenv.isDarwin '' + postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace config.h \ --replace "#define HAVE___EXP10 1" "#undef HAVE___EXP10" ''; diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index 0bfb9c6326aa..adde4f0c3420 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { buildInputs = [ xapian perl pcre2 zlib libmagic ]; nativeBuildInputs = [ pkg-config ]; + postInstall = '' + mkdir -p $out/share/omega + cp -r templates $out/share/omega + ''; + meta = with lib; { description = "Indexer and CGI search front-end built on Xapian library"; homepage = "https://xapian.org/"; diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/development/libraries/xavs/default.nix deleted file mode 100644 index 2d0960e3ff52..000000000000 --- a/pkgs/development/libraries/xavs/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchsvn }: - -stdenv.mkDerivation rec { - pname = "xavs"; - version = "55"; - - src = fetchsvn { - url = "https://svn.code.sf.net/p/xavs/code/trunk"; - rev = version; - sha256 = "0drw16wm95dqszpl7j33y4gckz0w0107lnz6wkzb66f0dlbv48cf"; - }; - - enableParallelBuilding = true; - - patchPhase = '' - patchShebangs configure - patchShebangs config.sub - patchShebangs version.sh - patchShebangs tools/countquant_xavs.pl - patchShebangs tools/patcheck - patchShebangs tools/regression-test.pl - patchShebangs tools/xavs-format - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace config.guess --replace 'uname -p' 'uname -m' - substituteInPlace configure \ - --replace '-O4' '-O3' \ - --replace ' -s ' ' ' \ - --replace 'LDFLAGS -s' 'LDFLAGS' \ - --replace '-dynamiclib' ' ' \ - --replace '-falign-loops=16' ' ' - substituteInPlace Makefile --replace '-Wl,-soname,' ' ' - ''; - - configureFlags = [ - "--enable-pic" - "--enable-shared" - # Bug preventing compilation with assembly enabled - "--disable-asm" - ]; - - meta = with lib; { - description = "AVS encoder and decoder"; - mainProgram = "xavs"; - homepage = "https://xavs.sourceforge.net/"; - license = licenses.lgpl2; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ codyopel ]; - }; -} diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix deleted file mode 100644 index d87bcac9829f..000000000000 --- a/pkgs/development/libraries/xbase/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "xbase"; - version = "3.1.2"; - - src = fetchurl { - url = "mirror://sourceforge/xdb/xbase64-${version}.tar.gz"; - sha256 = "17287kz1nmmm64y7zp9nhhl7slzlba09h6cc83w4mvsqwd9w882r"; - }; - - prePatch = "find . -type f -not -name configure -print0 | xargs -0 chmod -x"; - patches = [ - ./xbase-fixes.patch - (fetchurl { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-db/xbase/files/xbase-3.1.2-gcc47.patch?id=0b9005ad4b5b743707922877e5157ba6ecdf224f"; - sha256 = "1kpcrkkcqdwl609yd0qxlvp743icz3vni13993sz6fkgn5lah8yl"; - }) - (fetchurl { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-db/xbase/files/xbase-3.1.2-gcc6.patch?id=0b9005ad4b5b743707922877e5157ba6ecdf224f"; - sha256 = "1994pqiip5njkcmm5czb1bg6zdldkx1mpandgmvzqrja0iacf953"; - }) - (fetchurl { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-db/xbase/files/xbase-3.1.2-gcc7.patch?id=0b9005ad4b5b743707922877e5157ba6ecdf224f"; - sha256 = "1304gn9dbdv8xf61crkg0fc8cal0h4qkyhlbqa8y618w134cxh1q"; - }) - ]; - - meta = with lib; { - homepage = "http://linux.techass.com/projects/xdb/"; - description = "C++ class library formerly known as XDB"; - platforms = platforms.linux; - license = licenses.lgpl2; - }; -} diff --git a/pkgs/development/libraries/xbase/xbase-fixes.patch b/pkgs/development/libraries/xbase/xbase-fixes.patch deleted file mode 100644 index a23658049b98..000000000000 --- a/pkgs/development/libraries/xbase/xbase-fixes.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/xbase64/xbase64.cpp b/xbase64/xbase64.cpp -index fc5613d..2449535 100644 ---- a/xbase64/xbase64.cpp -+++ b/xbase64/xbase64.cpp -@@ -51,6 +51,7 @@ - #include <xbase64/xbase64.h> - #include <ctype.h> - #include <string.h> -+#include <cerrno> - - //#include <xbase64/xbexcept.h> - -diff --git a/xbase64/xblock.cpp b/xbase64/xblock.cpp -index c44cbb9..3554fc1 100644 ---- a/xbase64/xblock.cpp -+++ b/xbase64/xblock.cpp -@@ -53,6 +53,7 @@ - #endif - - #include <xbase64/xbase64.h> -+#include <cerrno> - - #ifdef HAVE_IO_H // windows locking - #include <io.h> -diff --git a/xbase64/xbnode.cpp b/xbase64/xbnode.cpp -index 5e688c1..3c652b3 100644 ---- a/xbase64/xbnode.cpp -+++ b/xbase64/xbnode.cpp -@@ -1,4 +1,4 @@ --#include "xbNode.h" -+#include "xbnode.h" - - void xbNodeLink::AddNode(xbNodeLink* node) - { diff --git a/pkgs/development/libraries/xcb-imdkit/default.nix b/pkgs/development/libraries/xcb-imdkit/default.nix deleted file mode 100644 index 41710d5ca3dc..000000000000 --- a/pkgs/development/libraries/xcb-imdkit/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, extra-cmake-modules -, uthash -, xcbutil -, xcbutilkeysyms -, xorgproto -}: - -stdenv.mkDerivation rec { - pname = "xcb-imdkit"; - version = "1.0.9"; - - src = fetchFromGitHub { - owner = "fcitx"; - repo = "xcb-imdkit"; - rev = version; - hash = "sha256-QfuetGPY6u4OhFiE5/CoVEpdODWnd1PHWBtM3ymsZ98="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - xorgproto - uthash - ]; - - buildInputs = [ - xcbutil - xcbutilkeysyms - ]; - - meta = with lib; { - description = "input method development support for xcb"; - homepage = "https://github.com/fcitx/xcb-imdkit"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ poscat ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/development/libraries/xdg-dbus-proxy/default.nix deleted file mode 100644 index ef5a3abd9730..000000000000 --- a/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ dbus -, docbook-xsl-nons -, docbook_xml_dtd_43 -, fetchurl -, glib -, lib -, libxslt -, meson -, ninja -, pkg-config -, stdenv -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "xdg-dbus-proxy"; - version = "0.1.6"; - - src = fetchurl { - url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${finalAttrs.version}/xdg-dbus-proxy-${finalAttrs.version}.tar.xz"; - hash = "sha256-Exv1n858fufsvF2RBtZ1D09Ze/5gmWZXMkD35JUpc6E="; - }; - - nativeBuildInputs = [ - docbook-xsl-nons - docbook_xml_dtd_43 - libxslt - meson - ninja - pkg-config - ]; - - buildInputs = [ - glib - ]; - - nativeCheckInputs = [ - dbus - ]; - - # dbus[2345]: Failed to start message bus: Failed to open "/etc/dbus-1/session.conf": No such file or directory - doCheck = false; - - meta = { - description = "DBus proxy for Flatpak and others"; - homepage = "https://github.com/flatpak/xdg-dbus-proxy"; - license = lib.licenses.lgpl21Plus; - mainProgram = "xdg-dbus-proxy"; - maintainers = with lib.maintainers; [ jtojnar ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix deleted file mode 100644 index 15e09d69b6f6..000000000000 --- a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fontconfig -, glib -, gnome -, gnome-desktop -, gsettings-desktop-schemas -, gtk4 -, libadwaita -, libjxl -, librsvg -, meson -, ninja -, pkg-config -, wayland -, wayland-scanner -, webp-pixbuf-loader -, wrapGAppsHook4 -, xdg-desktop-portal -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "xdg-desktop-portal-gnome"; - version = "46.2"; - - src = fetchurl { - url = "mirror://gnome/sources/xdg-desktop-portal-gnome/${lib.versions.major finalAttrs.version}/xdg-desktop-portal-gnome-${finalAttrs.version}.tar.xz"; - hash = "sha256-tcZeol6Eg1AtAzphO+bca3GIOsB/Gj5HStGAScR9FtY="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - wayland-scanner - wrapGAppsHook4 - ]; - - buildInputs = [ - fontconfig - glib - gsettings-desktop-schemas # settings exposed by settings portal - gtk4 - libadwaita - gnome-desktop - xdg-desktop-portal - wayland # required by GTK 4 - ]; - - mesonFlags = [ - "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" - ]; - - postInstall = '' - # Pull in WebP and JXL support for gnome-backgrounds. - # In postInstall to run before gappsWrapperArgsHook. - export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE { - extraLoaders = [ - libjxl - librsvg - webp-pixbuf-loader - ]; - }}" - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = "xdg-desktop-portal-gnome"; - }; - }; - - meta = with lib; { - description = "Backend implementation for xdg-desktop-portal for the GNOME desktop environment"; - homepage = "https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"; - maintainers = teams.gnome.members; - platforms = platforms.linux; - license = licenses.lgpl21Plus; - }; -}) diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix deleted file mode 100644 index a1d01682f22e..000000000000 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, meson -, ninja -, pkg-config -, xdg-desktop-portal -, gtk3 -, gnome-settings-daemon -, gnome-desktop -, glib -, wrapGAppsHook3 -, gsettings-desktop-schemas -, buildPortalsInGnome ? true -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "xdg-desktop-portal-gtk"; - version = "1.15.1"; - - src = fetchFromGitHub { - owner = "flatpak"; - repo = "xdg-desktop-portal-gtk"; - rev = finalAttrs.version; - sha256 = "sha256-uXVjKsqoIjqJilJq8ERRzEqGKbkzc+Zl6y+37CAcYro="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - wrapGAppsHook3 - ]; - - buildInputs = [ - glib - gtk3 - xdg-desktop-portal - ] ++ lib.optionals buildPortalsInGnome [ - gsettings-desktop-schemas # settings exposed by settings portal - gnome-desktop - gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s, just mouse and xsettings) - ]; - - mesonFlags = lib.optionals (!buildPortalsInGnome) [ - "-Dwallpaper=disabled" - "-Dsettings=disabled" - "-Dappchooser=disabled" - "-Dlockdown=disabled" - ]; - - meta = with lib; { - description = "Desktop integration portals for sandboxed apps"; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.linux; - license = licenses.lgpl21Plus; - }; -}) diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix deleted file mode 100644 index e215028d7352..000000000000 --- a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, bash -, fetchFromGitHub -, makeWrapper -, meson -, ninja -, pkg-config -, wayland-protocols -, wayland-scanner -, grim -, inih -, libdrm -, mesa -, pipewire -, scdoc -, slurp -, systemd -, wayland -}: - -stdenv.mkDerivation rec { - pname = "xdg-desktop-portal-wlr"; - version = "0.7.1"; - - src = fetchFromGitHub { - owner = "emersion"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-GIIDeZMIGUiZV0IUhcclRVThE5LKaqVc5VwnNT8beNU="; - }; - - strictDeps = true; - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner makeWrapper ]; - buildInputs = [ inih libdrm mesa pipewire systemd wayland wayland-protocols ]; - - mesonFlags = [ - "-Dsd-bus-provider=libsystemd" - ]; - - postInstall = '' - wrapProgram $out/libexec/xdg-desktop-portal-wlr --prefix PATH ":" ${lib.makeBinPath [ bash grim slurp ]} - ''; - - meta = with lib; { - homepage = "https://github.com/emersion/xdg-desktop-portal-wlr"; - description = "xdg-desktop-portal backend for wlroots"; - maintainers = with maintainers; [ minijackson ]; - platforms = platforms.linux; - license = licenses.mit; - }; -} diff --git a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix deleted file mode 100644 index 7180e6992e91..000000000000 --- a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, meson -, ninja -, pkg-config -, wrapGAppsNoGuiHook -, cinnamon-desktop -, glib -, gsettings-desktop-schemas -, mate -, xdg-desktop-portal -}: - -stdenv.mkDerivation rec { - pname = "xdg-desktop-portal-xapp"; - version = "1.0.9"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = "xdg-desktop-portal-xapp"; - rev = version; - hash = "sha256-4U8d9lQxMHQ2XYXnNCQjrNup8z14Q8Ke1Bkf09AVM6k="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - wrapGAppsNoGuiHook - ]; - - buildInputs = [ - cinnamon-desktop # org.cinnamon.desktop.background - glib - gsettings-desktop-schemas # org.gnome.system.location - mate.mate-desktop # org.mate.background - xdg-desktop-portal - ]; - - mesonFlags = [ - "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" - ]; - - meta = with lib; { - description = "Backend implementation for xdg-desktop-portal for Cinnamon, MATE, Xfce"; - homepage = "https://github.com/linuxmint/xdg-desktop-portal-xapp"; - maintainers = teams.cinnamon.members; - platforms = platforms.linux; - license = licenses.lgpl21Plus; - }; -} diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index b5c653d5eac7..6275dafd6bcd 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -27,6 +27,7 @@ , runCommand , wrapGAppsHook3 , xmlto +, bash , enableGeoLocation ? true , enableSystemd ? true }: @@ -63,8 +64,18 @@ stdenv.mkDerivation (finalAttrs: { # test tries to read /proc/cmdline, which is not intended to be accessible in the sandbox ./trash-test.patch + + # Install files required to be in XDG_DATA_DIR of the installed tests + # Merged PR https://github.com/flatpak/xdg-desktop-portal/pull/1444 + ./installed-tests-share.patch ]; + # until/unless bubblewrap ships a pkg-config file, meson has no way to find it when cross-compiling. + postPatch = '' + substituteInPlace meson.build \ + --replace-fail "find_program('bwrap'" "find_program('${lib.getExe bubblewrap}'" + ''; + nativeBuildInputs = [ docbook_xml_dtd_412 docbook_xml_dtd_43 @@ -96,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: { (python3.withPackages (pp: with pp; [ pygobject3 ])) + bash ] ++ lib.optionals enableGeoLocation [ geoclue2 ] ++ lib.optionals enableSystemd [ @@ -117,8 +129,12 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "systemd" enableSystemd) ] ++ lib.optionals (!enableGeoLocation) [ "-Dgeoclue=disabled" + ] ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ + "-Dpytest=disabled" ]; + strictDeps = true; + doCheck = true; preCheck = '' @@ -132,6 +148,21 @@ stdenv.mkDerivation (finalAttrs: { export TEST_IN_CI=1 ''; + postFixup = let + documentFuse = "${placeholder "installedTests"}/libexec/installed-tests/xdg-desktop-portal/test-document-fuse.py"; + testPortals = "${placeholder "installedTests"}/libexec/installed-tests/xdg-desktop-portal/test-portals"; + + in '' + if [ -x '${documentFuse}' ] ; then + wrapGApp '${documentFuse}' + wrapGApp '${testPortals}' + # (xdg-desktop-portal:995): xdg-desktop-portal-WARNING **: 21:21:55.673: Failed to get GeoClue client: Timeout was reached + # xdg-desktop-portal:ERROR:../tests/location.c:22:location_cb: 'res' should be TRUE + # https://github.com/flatpak/xdg-desktop-portal/blob/1d6dfb57067dec182b546dfb60c87aa3452c77ed/tests/location.c#L21 + rm $installedTests/share/installed-tests/xdg-desktop-portal/test-portals-location.test + fi + ''; + passthru = { tests = { installedTests = nixosTests.installed-tests.xdg-desktop-portal; diff --git a/pkgs/development/libraries/xdg-desktop-portal/installed-tests-share.patch b/pkgs/development/libraries/xdg-desktop-portal/installed-tests-share.patch new file mode 100644 index 000000000000..ba9a3822e59e --- /dev/null +++ b/pkgs/development/libraries/xdg-desktop-portal/installed-tests-share.patch @@ -0,0 +1,9 @@ +diff --git a/tests/share/applications/meson.build b/tests/share/applications/meson.build +index d56b633..3ad3371 100644 +--- a/tests/share/applications/meson.build ++++ b/tests/share/applications/meson.build +@@ -1,2 +1,2 @@ +-configure_file(input: 'furrfix.desktop', output: '@PLAINNAME@', copy: true) +-configure_file(input: 'mimeinfo.cache', output: '@PLAINNAME@', copy: true) ++configure_file(input: 'furrfix.desktop', output: '@PLAINNAME@', copy: true, install: enable_installed_tests, install_dir: installed_tests_data_dir / 'share' / 'applications') ++configure_file(input: 'mimeinfo.cache', output: '@PLAINNAME@', copy: true, install: enable_installed_tests, install_dir: installed_tests_data_dir / 'share' / 'applications') diff --git a/pkgs/development/libraries/xed/default.nix b/pkgs/development/libraries/xed/default.nix deleted file mode 100644 index 1fb634a80b90..000000000000 --- a/pkgs/development/libraries/xed/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, llvmPackages }: - -let - # mbuild is a custom build system used only to build xed - mbuild = python3Packages.buildPythonPackage rec { - pname = "mbuild"; - version = "2022.07.28"; - - src = fetchFromGitHub { - owner = "intelxed"; - repo = "mbuild"; - rev = "v${version}"; - sha256 = "sha256-nVHHiaPbf+b+RntjUGjLLGS53e6c+seXIBx7AcTtiWU="; - }; - }; - -in stdenv.mkDerivation rec { - pname = "xed"; - version = "2024.02.22"; - - src = fetchFromGitHub { - owner = "intelxed"; - repo = "xed"; - rev = "v${version}"; - sha256 = "sha256-LF4iJ1/Z3OifCiir/kU3ufZqtiRLeaJeAwuBqP2BCF4="; - }; - - nativeBuildInputs = [ mbuild ] ++ lib.optionals stdenv.isDarwin [ llvmPackages.bintools ]; - - buildPhase = '' - patchShebangs mfile.py - - # this will build, test and install - ./mfile.py test --prefix $out - ./mfile.py examples - mkdir -p $out/bin - cp ./obj/wkit/examples/obj/xed $out/bin/ - ''; - - dontInstall = true; # already installed during buildPhase - - meta = with lib; { - broken = stdenv.isAarch64; - description = "Intel X86 Encoder Decoder (Intel XED)"; - homepage = "https://intelxed.github.io/"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ arturcygan ]; - }; -} diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix deleted file mode 100644 index e386851da02c..000000000000 --- a/pkgs/development/libraries/xercesc/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv -, lib -, fetchurl -, curl -}: - -stdenv.mkDerivation rec { - pname = "xerces-c"; - version = "3.2.5"; - - src = fetchurl { - url = "mirror://apache/xerces/c/3/sources/${pname}-${version}.tar.gz"; - sha256 = "sha256-VFz8zmxOdVIHvR8n4xkkHlDjfAwnJQ8RzaEWAY8e8PU="; - }; - - buildInputs = [ - curl - ]; - - configureFlags = [ - # Disable SSE2 extensions on platforms for which they are not enabled by default - "--disable-sse2" - "--enable-netaccessor-curl" - ]; - - enableParallelBuilding = true; - - meta = { - homepage = "https://xerces.apache.org/xerces-c/"; - description = "Validating XML parser written in a portable subset of C++"; - license = lib.licenses.asl20; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/xeus-zmq/default.nix b/pkgs/development/libraries/xeus-zmq/default.nix deleted file mode 100644 index 0e27aa511de2..000000000000 --- a/pkgs/development/libraries/xeus-zmq/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, clangStdenv -, fetchFromGitHub -, cmake -, cppzmq -, libuuid -, nlohmann_json -, openssl -, xeus -, xtl -, zeromq -}: - -clangStdenv.mkDerivation rec { - pname = "xeus-zmq"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "jupyter-xeus"; - repo = "xeus-zmq"; - rev = "${version}"; - hash = "sha256-CrFb0LDb6akCfFnwMSa4H3D3A8KJx9Kiejw6VeV3IDs="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - cppzmq - libuuid - openssl - xeus - xtl - zeromq - ]; - - propagatedBuildInputs = [ nlohmann_json ]; - - meta = { - description = "ZeroMQ-based middleware for xeus"; - homepage = "https://github.com/jupyter-xeus/xeus-zmq"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ thomasjm ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/xeus/default.nix b/pkgs/development/libraries/xeus/default.nix deleted file mode 100644 index 9283f20c335f..000000000000 --- a/pkgs/development/libraries/xeus/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, doctest -, nlohmann_json -, libuuid -, xtl -}: - -stdenv.mkDerivation rec { - pname = "xeus"; - version = "3.2.0"; - - src = fetchFromGitHub { - owner = "jupyter-xeus"; - repo = pname; - rev = version; - sha256 = "sha256-D/dJ0SHxTHJw63gHD6FRZS7O2TVZ0voIv2mQASEjLA8="; - }; - - nativeBuildInputs = [ - cmake - doctest - ]; - - buildInputs = [ - nlohmann_json - libuuid - xtl - ]; - - cmakeFlags = [ - "-DXEUS_BUILD_TESTS=ON" - ]; - - doCheck = true; - preCheck = ''export LD_LIBRARY_PATH=$PWD''; - - meta = with lib; { - homepage = "https://xeus.readthedocs.io"; - description = "C++ implementation of the Jupyter Kernel protocol"; - license = licenses.bsd3; - maintainers = with maintainers; [ serge_sans_paille ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix deleted file mode 100644 index 2b96bede313d..000000000000 --- a/pkgs/development/libraries/xgboost/default.nix +++ /dev/null @@ -1,151 +0,0 @@ -{ config -, stdenv -, lib -, fetchFromGitHub -, fetchpatch -, cmake -, gtest -, doCheck ? true -, autoAddDriverRunpath -, cudaSupport ? config.cudaSupport -, ncclSupport ? false -, rLibrary ? false -, cudaPackages -, llvmPackages -, R -, rPackages -}@inputs: - -assert ncclSupport -> (cudaSupport && !cudaPackages.nccl.meta.unsupported); -# Disable regular tests when building the R package -# because 1) the R package runs its own tests and -# 2) the R package creates a different binary shared -# object that isn't compatible with the regular CLI -# tests. -assert rLibrary -> !doCheck; - -let - # This ensures xgboost gets the correct libstdc++ when - # built with cuda support. This may be removed once - # #226165 rewrites cudaStdenv - effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv; - # Ensures we don't use the stdenv value by accident. - stdenv = builtins.throw "Use effectiveStdenv instead of stdenv in xgboost derivation."; -in - -effectiveStdenv.mkDerivation rec { - pnameBase = "xgboost"; - # prefix with r when building the R library - # The R package build results in a special xgboost.so file - # that contains a subset of the .so file use for the CLI - # and python version. In general, the CRAN version from - # nixpkgs's r-modules should be used, but this non-standard - # build allows for enabling CUDA and NCCL support which aren't - # included in the CRAN release. Build with: - # nix-build -E "with (import $NIXPKGS{}); \ - # let \ - # xgb = xgboost.override{rLibrary = true; doCheck = false;}; \ - # in \ - # rWrapper.override{ packages = [ xgb ]; }" - pname = lib.optionalString rLibrary "r-" + pnameBase; - version = "2.0.3"; - - src = fetchFromGitHub { - owner = "dmlc"; - repo = pnameBase; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-LWco3A6zwdnAf8blU4qjW7PFEeZaTcJlVTwVrs7nwWM="; - }; - - patches = lib.optionals (cudaSupport && cudaPackages.cudaMajorMinorVersion == "12.4") [ - (fetchpatch { # https://github.com/dmlc/xgboost/pull/10123 - name = "Fix compilation with the ctk 12.4."; - url = "https://github.com/dmlc/xgboost/commit/c760f85db0bc7bd6379901fbfb67ceccc2b37700.patch"; - hash = "sha256-iP9mll9pg8T2ztCR7dBPnLP17/x3ImJFrr5G3e2dqHo="; - }) - ]; - - nativeBuildInputs = [ cmake ] - ++ lib.optionals effectiveStdenv.isDarwin [ llvmPackages.openmp ] - ++ lib.optionals cudaSupport [ autoAddDriverRunpath ] - ++ lib.optionals rLibrary [ R ]; - - buildInputs = [ gtest ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit - ++ lib.optional ncclSupport cudaPackages.nccl; - - propagatedBuildInputs = lib.optionals rLibrary [ - rPackages.data_table - rPackages.jsonlite - rPackages.Matrix - ]; - - cmakeFlags = lib.optionals doCheck [ "-DGOOGLE_TEST=ON" ] - ++ lib.optionals cudaSupport [ - "-DUSE_CUDA=ON" - # Their CMakeLists.txt does not respect CUDA_HOST_COMPILER, instead using the CXX compiler. - # https://github.com/dmlc/xgboost/blob/ccf43d4ba0a94e2f0a3cc5a526197539ae46f410/CMakeLists.txt#L145 - "-DCMAKE_C_COMPILER=${effectiveStdenv.cc}/bin/gcc" - "-DCMAKE_CXX_COMPILER=${effectiveStdenv.cc}/bin/g++" - ] ++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ] - ++ lib.optionals rLibrary [ "-DR_LIB=ON" ]; - - preConfigure = lib.optionals rLibrary '' - substituteInPlace cmake/RPackageInstall.cmake.in --replace "CMD INSTALL" "CMD INSTALL -l $out/library" - export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library" - ''; - - inherit doCheck; - - # By default, cmake build will run ctests with all checks enabled - # If we're building with cuda, we run ctest manually so that we can skip the GPU tests - checkPhase = lib.optionalString cudaSupport '' - ctest --force-new-ctest-process ${ - lib.optionalString cudaSupport "-E TestXGBoostLib" - } - ''; - - # Disable finicky tests from dmlc core that fail in Hydra. XGboost team - # confirmed xgboost itself does not use this part of the dmlc code. - GTEST_FILTER = - let - # Upstream Issue: https://github.com/xtensor-stack/xsimd/issues/456 - filteredTests = lib.optionals effectiveStdenv.hostPlatform.isDarwin [ - "ThreadGroup.TimerThread" - "ThreadGroup.TimerThreadSimple" - ]; - in - "-${builtins.concatStringsSep ":" filteredTests}"; - - installPhase = - '' - runHook preInstall - '' - # the R library option builds a completely different binary xgboost.so instead of - # libxgboost.so, which isn't full featured for python and CLI - + lib.optionalString rLibrary '' - mkdir -p $out/library - export R_LIBS_SITE="$out/library:$R_LIBS_SITE''${R_LIBS_SITE:+:}" - '' + '' - cmake --install . - cp -r ../rabit/include/rabit $out/include - runHook postInstall - ''; - - postFixup = lib.optionalString rLibrary '' - if test -e $out/nix-support/propagated-build-inputs; then - ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages - fi - ''; - - meta = with lib; { - description = - "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; - homepage = "https://github.com/dmlc/xgboost"; - broken = cudaSupport && cudaPackages.cudaOlder "11.4"; - license = licenses.asl20; - mainProgram = "xgboost"; - platforms = platforms.unix; - maintainers = with maintainers; [ abbradar nviets ]; - }; -} diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix deleted file mode 100644 index 77a11b531100..000000000000 --- a/pkgs/development/libraries/xlslib/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, unzip }: - -stdenv.mkDerivation rec { - pname = "xlslib"; - version = "2.5.0"; - - src = fetchurl { - url = "mirror://sourceforge/xlslib/xlslib-package-${version}.zip"; - sha256 = "1wx3jbpkz2rvgs45x6mwawamd1b2llb0vn29b5sr0rfxzx9d1985"; - }; - - nativeBuildInputs = [ unzip autoreconfHook ]; - - setSourceRoot = "export sourceRoot=xlslib/xlslib"; - - enableParallelBuilding = true; - - meta = with lib; { - description = "C++/C library to construct Excel .xls files in code"; - homepage = "https://sourceforge.net/projects/xlslib/"; - license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/libraries/xmake-core-sv/default.nix b/pkgs/development/libraries/xmake-core-sv/default.nix deleted file mode 100644 index 83442a8d48a9..000000000000 --- a/pkgs/development/libraries/xmake-core-sv/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -}: - -stdenv.mkDerivation rec { - pname = "xmake-core-sv"; - version = "1.1"; - - src = fetchFromGitHub { - owner = "xmake-io"; - repo = pname; - rev = "v${version}"; - hash = "sha256-icvGQi6FNSZXNGs2oLiUKu6rrVsWcXh1r91kycGjnwY="; - }; - - nativeBuildInputs = [ - autoreconfHook - ]; - - meta = with lib; { - description = "Public domain cross-platform semantic versioning in c99"; - homepage = "https://github.com/xmake-io/xmake-core-sv"; - license = licenses.unlicense; - platforms = platforms.linux; - maintainers = with maintainers; [ rewine ]; - }; -} - diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix deleted file mode 100644 index d76b2031aa3f..000000000000 --- a/pkgs/development/libraries/xml-security-c/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - autoreconfHook, - pkg-config, - xalanc, - xercesc, - openssl, - darwin, -}: - -let - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices SystemConfiguration; -in -stdenv.mkDerivation (finalAttrs: { - pname = "xml-security-c"; - version = "2.0.4"; - - src = fetchgit { - url = "https://git.shibboleth.net/git/cpp-xml-security"; - rev = finalAttrs.version; - hash = "sha256-60A6LqUUGmoZMmIvhuZWjrZl6utp7WLhPe738oNd/AA="; - }; - - configureFlags = [ - "--with-openssl" - "--with-xerces" - "--with-xalan" - ]; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = - [ - xalanc - xercesc - openssl - ] - ++ lib.optionals stdenv.isDarwin [ - CoreFoundation - CoreServices - SystemConfiguration - ]; - - meta = { - homepage = "https://shibboleth.atlassian.net/wiki/spaces/DEV/pages/3726671873/Santuario"; - description = "C++ Implementation of W3C security standards for XML"; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.jagajaga ]; - }; -}) diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix deleted file mode 100644 index af73a81fcb20..000000000000 --- a/pkgs/development/libraries/xmlrpc-c/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, curl, libxml2 }: - -stdenv.mkDerivation rec { - pname = "xmlrpc-c"; - version = "1.51.07"; - - src = fetchurl { - url = "mirror://sourceforge/xmlrpc-c/${pname}-${version}.tgz"; - sha256 = "sha256-hNIK4z+SdYL4IdYcC5GUrvvx15JFkKE/qdpa4WmK3tk="; - }; - - buildInputs = [ curl libxml2 ]; - - configureFlags = [ - "--enable-libxml2-backend" - ]; - - # Build and install the "xmlrpc" tool (like the Debian package) - postInstall = '' - (cd tools/xmlrpc && make && make install) - ''; - - hardeningDisable = [ "format" ]; - - meta = with lib; { - description = "Lightweight RPC library based on XML and HTTP"; - homepage = "https://xmlrpc-c.sourceforge.net/"; - # <xmlrpc-c>/doc/COPYING also lists "Expat license", - # "ABYSS Web Server License" and "Python 1.5.2 License" - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix deleted file mode 100644 index 8040cf25813c..000000000000 --- a/pkgs/development/libraries/xmlsec/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, fetchurl, libxml2, gnutls, libxslt, pkg-config, libgcrypt, libtool -, openssl, nss, lib, runCommandCC, writeText }: - -lib.fix (self: -stdenv.mkDerivation rec { - pname = "xmlsec"; - version = "1.3.5"; - - src = fetchurl { - url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "sha256-L/1K0fhg7JPkemgDEKsryUlovQdWbnGXa9lhM9lQSRc="; - }; - - patches = [ - ./lt_dladdsearchdir.patch - ./remove_bsd_base64_decode_flag.patch - ]; - - postPatch = '' - substituteAllInPlace src/dl.c - ''; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libxml2 gnutls libgcrypt libtool openssl nss ]; - - propagatedBuildInputs = [ - # required by xmlsec/transforms.h - libxslt - ]; - - enableParallelBuilding = true; - doCheck = true; - nativeCheckInputs = [ nss.tools ]; - preCheck = '' - export TMPFOLDER=$(mktemp -d) - substituteInPlace tests/testrun.sh --replace 'timestamp=`date +%Y%m%d_%H%M%S`' 'timestamp=19700101_000000' - ''; - - # enable deprecated soap headers required by lasso - # https://dev.entrouvert.org/issues/18771 - configureFlags = [ "--enable-soap" ]; - - # otherwise libxmlsec1-gnutls.so won't find libgcrypt.so, after #909 - NIX_LDFLAGS = "-lgcrypt"; - - postInstall = '' - moveToOutput "bin/xmlsec1-config" "$dev" - moveToOutput "lib/xmlsec1Conf.sh" "$dev" - ''; - - passthru.tests.libxmlsec1-crypto = runCommandCC "libxmlsec1-crypto-test" - { - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ self libxml2 libxslt libtool ]; - } '' - $CC $(pkg-config --cflags --libs xmlsec1) -o crypto-test ${writeText "crypto-test.c" '' - #include <xmlsec/xmlsec.h> - #include <xmlsec/crypto.h> - - int main(int argc, char **argv) { - return xmlSecInit() || - xmlSecCryptoDLLoadLibrary(argc > 1 ? argv[1] : 0) || - xmlSecCryptoInit(); - } - ''} - - for crypto in "" gcrypt gnutls nss openssl; do - ./crypto-test $crypto - done - touch $out - ''; - - meta = with lib; { - description = "XML Security Library in C based on libxml2"; - homepage = "https://www.aleksey.com/xmlsec/"; - downloadPage = "https://www.aleksey.com/xmlsec/download.html"; - license = licenses.mit; - mainProgram = "xmlsec1"; - maintainers = [ ]; - platforms = with platforms; linux ++ darwin; - }; -} -) diff --git a/pkgs/development/libraries/xmlsec/lt_dladdsearchdir.patch b/pkgs/development/libraries/xmlsec/lt_dladdsearchdir.patch deleted file mode 100644 index 17dedb0d6c81..000000000000 --- a/pkgs/development/libraries/xmlsec/lt_dladdsearchdir.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/dl.c b/src/dl.c -index b13f9d46..d761855b 100644 ---- a/src/dl.c -+++ b/src/dl.c -@@ -346,6 +346,11 @@ xmlSecCryptoDLInit(void) { - xmlSecIOError("lt_dlinit", NULL, NULL); - return(-1); - } -+ ret = lt_dladdsearchdir("@out@/lib"); -+ if(ret != 0) { -+ xmlSecIOError("lt_dladdsearchdir", NULL, NULL); -+ return(-1); -+ } - #endif /* XMLSEC_DL_LIBLTDL */ - - return(0); diff --git a/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch b/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch deleted file mode 100644 index ba75343029b5..000000000000 --- a/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/tests/testEnc.sh -+++ b/tests/testEnc.sh -@@ -1181,9 +1181,6 @@ for aesgcm_k_l in $aesgcm_key_lengths ; do - else - # generate binary file out of base64 - DECODE="-d" -- if [ "`uname`" = "Darwin" ]; then -- DECODE="-D" -- fi - cat "$topfolder/$base_test_name.data" | base64 $DECODE > $tmpfile.3 - execEncTest "$res_success" \ - "" \ diff --git a/pkgs/development/libraries/xtensor/default.nix b/pkgs/development/libraries/xtensor/default.nix deleted file mode 100644 index 03ac85418710..000000000000 --- a/pkgs/development/libraries/xtensor/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, doctest -, enableAssertions ? false -, enableBoundChecks ? false # Broadcasts don't pass bound checks -, nlohmann_json -, xtl -, xsimd -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "xtensor"; - version = "0.25.0"; - - src = fetchFromGitHub { - owner = "xtensor-stack"; - repo = "xtensor"; - rev = finalAttrs.version; - hash = "sha256-hVfdtYcJ6mzqj0AUu6QF9aVKQGYKd45RngY6UN3yOH4="; - }; - - nativeBuildInputs = [ - cmake - ]; - propagatedBuildInputs = [ - nlohmann_json - xtl - xsimd - ]; - - cmakeFlags = [ - # Always build the tests, even if not running them, because testing whether - # they can be built is a test in itself. - (lib.cmakeBool "BUILD_TESTS" true) - (lib.cmakeBool "XTENSOR_ENABLE_ASSERT" enableAssertions) - (lib.cmakeBool "XTENSOR_CHECK_DIMENSION" enableBoundChecks) - ]; - - doCheck = true; - nativeCheckInputs = [ - doctest - ]; - checkTarget = "xtest"; - - meta = with lib; { - description = "Multi-dimensional arrays with broadcasting and lazy computing"; - homepage = "https://github.com/xtensor-stack/xtensor"; - license = licenses.bsd3; - maintainers = with maintainers; [ cpcloud ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/libraries/xtl/default.nix b/pkgs/development/libraries/xtl/default.nix deleted file mode 100644 index 208aceb3e35b..000000000000 --- a/pkgs/development/libraries/xtl/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, doctest -}: -stdenv.mkDerivation rec { - pname = "xtl"; - version = "0.7.7"; - - src = fetchFromGitHub { - owner = "xtensor-stack"; - repo = "xtl"; - rev = version; - hash = "sha256-f8qYh8ibC/ToHsUv3OF1ujzt3fUe7kW9cNpGyLqsgqw="; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DBUILD_TESTS=ON" ]; - - doCheck = true; - nativeCheckInputs = [ doctest ]; - checkTarget = "xtest"; - - meta = with lib; { - description = "Basic tools (containers, algorithms) used by other quantstack packages"; - homepage = "https://github.com/xtensor-stack/xtl"; - license = licenses.bsd3; - maintainers = with maintainers; [ cpcloud ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix deleted file mode 100644 index 5ec3d44dfb62..000000000000 --- a/pkgs/development/libraries/xvidcore/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchurl, yasm, autoconf, automake, libtool }: - -stdenv.mkDerivation rec { - pname = "xvidcore"; - version = "1.3.7"; - - src = fetchurl { - url = "https://downloads.xvid.com/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1xyg3amgg27zf7188kss7y248s0xhh1vv8rrk0j9bcsd5nasxsmf"; - }; - - preConfigure = '' - # Configure script is not in the root of the source directory - cd build/generic - '' + lib.optionalString stdenv.isDarwin '' - # Undocumented darwin hack - substituteInPlace configure --replace "-no-cpp-precomp" "" - ''; - - configureFlags = [ ] - # Undocumented darwin hack (assembly is probably disabled due to an - # issue with nasm, however yasm is now used) - ++ lib.optional stdenv.isDarwin "--enable-macosx_module --disable-assembly"; - - nativeBuildInputs = [ ] - ++ lib.optional (!stdenv.isDarwin) yasm; - - buildInputs = [ ] - # Undocumented darwin hack - ++ lib.optionals stdenv.isDarwin [ autoconf automake libtool ]; - - # Don't remove static libraries (e.g. 'libs/*.a') on darwin. They're needed to - # compile ffmpeg (and perhaps other things). - postInstall = lib.optionalString (!stdenv.isDarwin) '' - rm $out/lib/*.a - ''; - - # Dependants of xvidcore don't know to look in bin for dependecies. Link them - # in lib so other depedants of xvidcore can find the dlls. - postFixup = lib.optionalString stdenv.hostPlatform.isMinGW '' - ln -s $out/bin/*.dll $out/lib - ''; - - meta = with lib; { - description = "MPEG-4 video codec for PC"; - homepage = "https://www.xvid.com/"; - license = licenses.gpl2; - maintainers = with maintainers; [ codyopel lovek323 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix deleted file mode 100644 index f7461c878c23..000000000000 --- a/pkgs/development/libraries/xxHash/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "xxHash"; - version = "0.8.2"; - - src = fetchFromGitHub { - owner = "Cyan4973"; - repo = "xxHash"; - rev = "v${version}"; - hash = "sha256-kofPs01jb189LUjYHHt+KxDifZQWl0Hm779711mvWtI="; - }; - - nativeBuildInputs = [ - cmake - ]; - - # Using unofficial CMake build script to install CMake module files. - cmakeDir = "../cmake_unofficial"; - - meta = with lib; { - description = "Extremely fast hash algorithm"; - longDescription = '' - xxHash is an Extremely fast Hash algorithm, running at RAM speed limits. - It successfully completes the SMHasher test suite which evaluates - collision, dispersion and randomness qualities of hash functions. Code is - highly portable, and hashes are identical on all platforms (little / big - endian). - ''; - homepage = "https://github.com/Cyan4973/xxHash"; - license = with licenses; [ bsd2 gpl2 ]; - mainProgram = "xxhsum"; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.all; - pkgConfigModules = [ - "libxxhash" - ]; - }; -} diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/development/libraries/xylib/default.nix deleted file mode 100644 index ab2e3792eeab..000000000000 --- a/pkgs/development/libraries/xylib/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchurl -, boost -, zlib -, bzip2 -, wxGTK32 -}: - -stdenv.mkDerivation rec { - pname = "xylib"; - version = "1.6"; - - src = fetchurl { - url = "https://github.com/wojdyr/xylib/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "1iqfrfrk78mki5csxysw86zm35ag71w0jvim0f12nwq1z8rwnhdn"; - }; - - buildInputs = [ - boost - zlib - bzip2 - wxGTK32 - ]; - - meta = with lib; { - description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods"; - license = licenses.lgpl21; - homepage = "https://xylib.sourceforge.net/"; - platforms = platforms.linux; - maintainers = with maintainers; [ pSub ]; - }; -} diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix deleted file mode 100644 index 83aedce31ff8..000000000000 --- a/pkgs/development/libraries/yajl/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, which, testers }: - -stdenv.mkDerivation (finalAttrs: { - pname = "yajl"; - version = "2.1.0-unstable-2024-02-01"; - - src = fetchFromGitHub { - owner = "containers"; - repo = "yajl"; - rev = "6bc5219389fd2752631682b0a8368e6d8218a8c5"; - hash = "sha256-vY0tqCkz6PN00Qbip5ViO64L3C06fJ4JjFuIk0TWgCo="; - }; - - nativeBuildInputs = [ cmake ]; - - doCheck = true; - nativeCheckInputs = [ which ]; - - passthru = { - tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - }; - - meta = { - description = "Yet Another JSON Library"; - longDescription = '' - YAJL is a small event-driven (SAX-style) JSON parser written in ANSI - C, and a small validating JSON generator. - ''; - homepage = "http://lloyd.github.com/yajl/"; - license = lib.licenses.isc; - pkgConfigModules = [ "yajl" ]; - platforms = with lib.platforms; linux ++ darwin; - maintainers = with lib.maintainers; [ maggesi ]; - }; -}) diff --git a/pkgs/development/libraries/yas/default.nix b/pkgs/development/libraries/yas/default.nix deleted file mode 100644 index 0dad3fbf76dd..000000000000 --- a/pkgs/development/libraries/yas/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: - -stdenvNoCC.mkDerivation rec { - pname = "yas"; - version = "7.1.0"; - - src = fetchFromGitHub { - owner = "niXman"; - repo = "yas"; - rev = version; - hash = "sha256-2+CpftWOEnntYBCc1IoR5eySbmhrMVunpUTZRdQ5I+A="; - }; - - installPhase = '' - runHook preInstall - mkdir -p $out/include/yas - cp -r include/yas/* $out/include/yas - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/niXman/yas"; - description = "Yet Another Serialization"; - license = licenses.boost; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/yascreen/default.nix b/pkgs/development/libraries/yascreen/default.nix deleted file mode 100644 index d1b96ac3ebe3..000000000000 --- a/pkgs/development/libraries/yascreen/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, go-md2man, fetchFromGitHub, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "yascreen"; - version = "1.86"; - - src = fetchFromGitHub { - owner = "bbonev"; - repo = "yascreen"; - rev = "v${version}"; - sha256 = "sha256-z7j2yceiUyJNdyoVXAPiINln2/MUMqVJh+VwQnmzO2A="; - }; - - nativeBuildInputs = [ go-md2man ]; - makeFlags = [ "PREFIX=$(out)" ]; - - patches = [ - (fetchpatch { - url = "https://github.com/bbonev/yascreen/commit/a30b8fce66a3db9f1194fede30a48424ed3d696b.patch"; - sha256 = "sha256-Bnaf3OVMlqyYMdGsJ6fF3oYsWT01FcjuRzxi6xfbnZg="; - }) - ]; - - meta = with lib; { - homepage = "https://github.com/bbonev/yascreen"; - description = "Yet Another Screen Library (curses replacement for daemons and embedded apps)"; - license = licenses.lgpl3; - maintainers = [ maintainers.arezvov ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/development/libraries/yder/default.nix deleted file mode 100644 index 70105872ba77..000000000000 --- a/pkgs/development/libraries/yder/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, orcania -, systemd -, check -, subunit -, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd -}: - -stdenv.mkDerivation rec { - pname = "yder"; - version = "1.4.20"; - - src = fetchFromGitHub { - owner = "babelouest"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-BaCF1r5mOYxj0zKc11uoKI9gVKuxWd8GaneGcV+qIFg="; - }; - - patches = [ - # We set CMAKE_INSTALL_LIBDIR to the absolute path in $out, so - # prefix and exec_prefix cannot be $out, too - ./fix-pkgconfig.patch - ]; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ orcania ] - ++ lib.optional withSystemd systemd; - - nativeCheckInputs = [ check subunit ]; - - cmakeFlags = [ - "-DBUILD_YDER_TESTING=on" - ] ++ lib.optional (!withSystemd) "-DWITH_JOURNALD=off"; - - doCheck = true; - - meta = with lib; { - description = "Logging library for C applications"; - homepage = "https://github.com/babelouest/yder"; - license = licenses.lgpl21; - maintainers = with maintainers; [ johnazoidberg ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/yder/fix-pkgconfig.patch b/pkgs/development/libraries/yder/fix-pkgconfig.patch deleted file mode 100644 index f68ce2a0213e..000000000000 --- a/pkgs/development/libraries/yder/fix-pkgconfig.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/libyder.pc.in -+++ b/libyder.pc.in -@@ -1,7 +1,5 @@ --prefix=@CMAKE_INSTALL_PREFIX@ --exec_prefix=@CMAKE_INSTALL_PREFIX@ --libdir=@PKGCONFIG_TARGET_LIBDIR@ --includedir=@PKGCONFIG_TARGET_INCLUDES@ -+libdir=@CMAKE_INSTALL_LIBDIR@ -+includedir=@CMAKE_INSTALL_LIBDIR@ - - Name: @PROJECT_NAME@ - Description: @PROJECT_DESCRIPTION@ - diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix deleted file mode 100644 index 6d9856fd61a9..000000000000 --- a/pkgs/development/libraries/yojimbo/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls_2 }: - -stdenv.mkDerivation { - pname = "yojimbo"; - version = "1.1"; - - src = fetchFromGitHub { - owner = "networkprotocol"; - repo = "yojimbo"; - rev = "e02219c102d9b440290539036992d77608eab3b0"; - sha256 = "0jn25ddv73hwjals883a910m66kwj6glxxhnmn96bpzsvsaimnkr"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ premake5 doxygen ]; - propagatedBuildInputs = [ libsodium mbedtls_2 ]; - - postBuild = '' - premake5 docs - ''; - - installPhase = '' - install -Dm555 -t $out/lib bin/libyojimbo.a - install -Dm444 -t $out/include yojimbo.h - mkdir -p $out/share/doc/yojimbo - cp -r docs/html $out/share/doc/yojimbo - ''; - - doCheck = true; - - meta = with lib; { - description = "Network library for client/server games with dedicated servers"; - longDescription = '' - yojimbo is a network library for client/server games with dedicated servers. - It's designed around the networking requirements of competitive multiplayer games like first person shooters. - As such it provides a time critical networking layer on top of UDP, with a client/server architecture supporting up to 64 players per-dedicated server instance. - ''; - homepage = "https://github.com/networkprotocol/yojimbo"; - license = licenses.bsd3; - platforms = platforms.x86_64; - maintainers = with maintainers; [ paddygord ]; - }; -} diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix index 3af451ec84e0..e60008994b03 100644 --- a/pkgs/development/libraries/yubico-pam/default.nix +++ b/pkgs/development/libraries/yubico-pam/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config asciidoc libxslt docbook_xsl ]; buildInputs = [ pam yubikey-personalization libyubikey libykclient ] - ++ lib.optionals stdenv.isDarwin [ CoreServices SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices SystemConfiguration ]; meta = with lib; { description = "Yubico PAM module"; diff --git a/pkgs/development/libraries/yyjson/default.nix b/pkgs/development/libraries/yyjson/default.nix deleted file mode 100644 index f60329028ead..000000000000 --- a/pkgs/development/libraries/yyjson/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "yyjson"; - version = "0.10.0"; - - src = fetchFromGitHub { - owner = "ibireme"; - repo = "yyjson"; - rev = finalAttrs.version; - hash = "sha256-mp9Oz08qTyhj3P6F1d81SX96vamUY/JWpD2DTYR+v04="; - }; - - nativeBuildInputs = [ - cmake - ]; - - meta = { - description = "Fastest JSON library in C"; - homepage = "https://github.com/ibireme/yyjson"; - changelog = "https://github.com/ibireme/yyjson/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ sigmanificient ]; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix deleted file mode 100644 index a198b1b6046e..000000000000 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv -, lib -, fetchFromGitLab -, pkg-config -, glib -, sqlite -, gobject-introspection -, vala -, autoconf -, automake -, libtool -, gettext -, dbus -, gtk3 -, json-glib -, librdf_raptor2 -, pythonSupport ? true -, python3 -}: - -stdenv.mkDerivation rec { - pname = "zeitgeist"; - version = "1.0.4"; - - outputs = [ "out" "lib" "dev" "man" ] ++ lib.optional pythonSupport "py"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "kG1N8DXgjYAJ8fbrGHsp7eTqB20H5smzRnW0PSRUYR0="; - }; - - nativeBuildInputs = [ - autoconf - automake - libtool - pkg-config - gettext - gobject-introspection - vala - python3 - ]; - - buildInputs = [ - glib - sqlite - dbus - gtk3 - json-glib - librdf_raptor2 - python3.pkgs.rdflib - ]; - - configureFlags = [ - "--disable-telepathy" - ]; - - enableParallelBuilding = true; - - postPatch = '' - patchShebangs data/ontology2code - ''; - - preConfigure = '' - NOCONFIGURE=1 ./autogen.sh - ''; - - postFixup = lib.optionalString pythonSupport '' - moveToOutput lib/${python3.libPrefix} "$py" - ''; - - meta = with lib; { - description = "Service which logs the users’s activities and events"; - homepage = "https://zeitgeist.freedesktop.org/"; - maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); - license = licenses.lgpl21Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix deleted file mode 100644 index 9c8db3159396..000000000000 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ stdenv, lib, fetchFromGitHub -, bzip2, expat, libedit, lmdb, openssl, libxcrypt -, python3 # for tests only -, cpp11 ? false -}: - -let - zeroc_mcpp = stdenv.mkDerivation rec { - pname = "zeroc-mcpp"; - version = "2.7.2.14"; - - src = fetchFromGitHub { - owner = "zeroc-ice"; - repo = "mcpp"; - rev = "v${version}"; - sha256 = "1psryc2ql1cp91xd3f8jz84mdaqvwzkdq2pr96nwn03ds4cd88wh"; - }; - - configureFlags = [ "--enable-mcpplib" ]; - installFlags = [ "PREFIX=$(out)" ]; - }; - -in stdenv.mkDerivation rec { - pname = "zeroc-ice"; - version = "3.7.10"; - - src = fetchFromGitHub { - owner = "zeroc-ice"; - repo = "ice"; - rev = "v${version}"; - hash = "sha256-l3cKsR8HSdtFGw1S12xueQOu/U9ABlOxQQtbHBj2izs="; - }; - - buildInputs = [ zeroc_mcpp bzip2 expat libedit lmdb openssl libxcrypt ]; - - preBuild = '' - makeFlagsArray+=( - "prefix=$out" - "OPTIMIZE=yes" - "USR_DIR_INSTALL=yes" - "LANGUAGES=cpp" - "CONFIGS=${if cpp11 then "cpp11-shared" else "shared"}" - "SKIP=slice2py" # provided by a separate package - ) - ''; - - enableParallelBuilding = true; - - outputs = [ "out" "bin" "dev" ]; - - doCheck = true; - nativeCheckInputs = with python3.pkgs; [ passlib ]; - checkPhase = let - # these tests require network access so we need to skip them. - brokenTests = map lib.escapeRegex [ - "Ice/udp" "Glacier2" "IceGrid/simple" "IceStorm" "IceDiscovery/simple" - - # FIXME: certificate expired, remove for next release? - "IceSSL/configuration" - ]; - # matches CONFIGS flag in makeFlagsArray - configFlag = lib.optionalString cpp11 "--config=cpp11-shared"; - in '' - runHook preCheck - ${python3.interpreter} ./cpp/allTests.py ${configFlag} --rfilter='${lib.concatStringsSep "|" brokenTests}' - runHook postCheck - ''; - - postInstall = '' - mkdir -p $bin $dev/share - mv $out/bin $bin - mv $out/share/ice $dev/share - ''; - - meta = with lib; { - homepage = "https://www.zeroc.com/ice.html"; - description = "Internet communications engine"; - license = licenses.gpl2Only; - platforms = platforms.unix; - maintainers = with maintainers; [ abbradar ]; - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index d8509c8fc3f4..6801eddc178f 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,30 +1,49 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, asciidoc -, pkg-config -, libsodium -, enableDrafts ? false +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + libsodium, + asciidoc, + xmlto, + enableDrafts ? false, + # for passthru.tests + azmq, + cppzmq, + czmq, + zmqpp, + ffmpeg, + python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zeromq"; version = "4.3.5"; src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; - rev = "v${version}"; - sha256 = "sha256-q2h5y0Asad+fGB9haO4Vg7a1ffO2JSb7czzlhmT3VmI="; + rev = "v${finalAttrs.version}"; + hash = "sha256-q2h5y0Asad+fGB9haO4Vg7a1ffO2JSb7czzlhmT3VmI="; }; - nativeBuildInputs = [ cmake asciidoc pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + asciidoc + xmlto + ]; + buildInputs = [ libsodium ]; doCheck = false; # fails all the tests (ctest) - cmakeFlags = lib.optional enableDrafts "-DENABLE_DRAFTS=ON"; + cmakeFlags = [ + (lib.cmakeBool "WITH_LIBSODIUM" true) + (lib.cmakeBool "ENABLE_CURVE" true) + (lib.cmakeBool "ENABLE_DRAFTS" enableDrafts) + ]; postPatch = '' substituteInPlace CMakeLists.txt \ @@ -32,12 +51,46 @@ stdenv.mkDerivation rec { --replace '$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} ''; - meta = with lib; { + postBuild = '' + # From https://gitlab.archlinux.org/archlinux/packaging/packages/zeromq/-/blob/main/PKGBUILD + # man pages aren't created when using cmake + # https://github.com/zeromq/libzmq/issues/4160 + pushd ../doc + for FILE in *.txt; do + asciidoc \ + -d manpage \ + -b docbook \ + -f asciidoc.conf \ + -a zmq_version="${finalAttrs.version}" \ + "''${FILE}" + xmlto --skip-validation man "''${FILE%.txt}.xml" + done + popd + ''; + + postInstall = '' + # Install manually created man pages + install -vDm644 -t "$out/share/man/man3" ../doc/*.3 + install -vDm644 -t "$out/share/man/man7" ../doc/*.7 + ''; + + passthru.tests = { + inherit + azmq + cppzmq + czmq + zmqpp + ; + pyzmq = python3.pkgs.pyzmq; + ffmpeg = ffmpeg.override { withZmq = true; }; + }; + + meta = { branch = "4"; homepage = "http://www.zeromq.org"; description = "Intelligent Transport Layer"; - license = licenses.mpl20; - platforms = platforms.all; - maintainers = with maintainers; [ fpletz ]; + license = lib.licenses.mpl20; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ fpletz ]; }; -} +}) diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix deleted file mode 100644 index dbd6c9582dd7..000000000000 --- a/pkgs/development/libraries/zimg/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "zimg"; - version = "3.0.5"; - - src = fetchFromGitHub { - owner = "sekrit-twc"; - repo = "zimg"; - rev = "release-${version}"; - sha256 = "sha256-DCSqHCnOyIvKtIAfprb8tgtzLn67Ix6BWyeIliu0HO4="; - }; - - outputs = [ "out" "dev" "doc" ]; - - nativeBuildInputs = [ autoreconfHook ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Scaling, colorspace conversion and dithering library"; - homepage = "https://github.com/sekrit-twc/zimg"; - license = licenses.wtfpl; - platforms = with platforms; unix ++ windows; - maintainers = with maintainers; [ rnhmjoj ]; - }; -} diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix deleted file mode 100644 index a118c51ff136..000000000000 --- a/pkgs/development/libraries/zimlib/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchzip -, meson, ninja, pkg-config -, python3 -, icu -, libuuid -, xapian -, xz -, zstd -, gtest -}: - -stdenv.mkDerivation rec { - pname = "zimlib"; - version = "9.1.0"; - - src = fetchFromGitHub { - owner = "openzim"; - repo = "libzim"; - rev = version; - hash = "sha256-yWnW/+CaQwbemrNLzvQpXw5yvW2Q6LtwDgvA58+fVUs="; - }; - - testData = fetchzip rec { - passthru.version = "0.5"; - url = "https://github.com/openzim/zim-testing-suite/releases/download/v${passthru.version}/zim-testing-suite-${passthru.version}.tar.gz"; - hash = "sha256-hCIFT1WPDjhoZMlsR2cFbt4NhmIJ4DX1H/tDCIv4NjQ="; - }; - - nativeBuildInputs = [ - meson - pkg-config - ninja - python3 - ]; - - propagatedBuildInputs = [ - icu - libuuid - xapian - xz - zstd - ]; - - postPatch = '' - patchShebangs scripts - ''; - - mesonFlags = [ "-Dtest_data_dir=${testData}" ]; - - env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals (stdenv.cc.isGNU) [ - "-Wno-error=mismatched-new-delete" - ] - ); - - nativeCheckInputs = [ - gtest - ]; - - doCheck = true; - - meta = with lib; { - description = "Library for reading and writing ZIM files"; - homepage = "https://www.openzim.org/wiki/Zimlib"; - license = licenses.gpl2; - maintainers = with maintainers; [ greg ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/zlib-ng/default.nix b/pkgs/development/libraries/zlib-ng/default.nix deleted file mode 100644 index 6abb1b160cc6..000000000000 --- a/pkgs/development/libraries/zlib-ng/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, cmake, pkg-config, gtest -, withZlibCompat ? false -}: - -stdenv.mkDerivation rec { - pname = "zlib-ng"; - version = "2.2.1"; - - src = fetchFromGitHub { - owner = "zlib-ng"; - repo = "zlib-ng"; - rev = version; - hash = "sha256-XTu4Wo9wQOvXrjDxo3KTpCiy0NsqVnYtCuYsCHP5LFc="; - }; - - outputs = [ "out" "dev" "bin" ]; - - strictDeps = true; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ gtest ]; - - cmakeFlags = [ - "-DCMAKE_INSTALL_PREFIX=/" - "-DBUILD_SHARED_LIBS=ON" - "-DINSTALL_UTILS=ON" - ] ++ lib.optionals withZlibCompat [ "-DZLIB_COMPAT=ON" ]; - - meta = with lib; { - description = "zlib data compression library for the next generation systems"; - homepage = "https://github.com/zlib-ng/zlib-ng"; - license = licenses.zlib; - platforms = platforms.all; - maintainers = with maintainers; [ izorkin ]; - }; -} diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix deleted file mode 100644 index df6c253075e6..000000000000 --- a/pkgs/development/libraries/zlog/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: - -stdenv.mkDerivation rec { - version = "1.2.17"; - pname = "zlog"; - - src = fetchFromGitHub { - owner = "HardySimpson"; - repo = pname; - rev = version; - sha256 = "sha256-ckpDMRLxObpl8N539DC5u2bPpmD7jM+KugurUfta6tg="; - }; - - patches = [ - (fetchpatch { - name = "CVE-2024-22857.patch"; - url = "https://github.com/HardySimpson/zlog/commit/c47f781a9f1e9604f5201e27d046d925d0d48ac4.patch"; - hash = "sha256-3FAAHJ2R/OpNpErWXptjEh0x370/jzvK2VhuUuyaOjE="; - }) - ]; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - meta = with lib; { - description= "Reliable, high-performance, thread safe, flexible, clear-model, pure C logging library"; - homepage = "https://hardysimpson.github.io/zlog/"; - license = licenses.lgpl21; - maintainers = [ maintainers.matthiasbeyer ]; - mainProgram = "zlog-chk-conf"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/zmqpp/default.nix b/pkgs/development/libraries/zmqpp/default.nix deleted file mode 100644 index 733573b3e237..000000000000 --- a/pkgs/development/libraries/zmqpp/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zeromq }: - -stdenv.mkDerivation rec { - pname = "zmqpp"; - version = "4.2.0"; - - src = fetchFromGitHub { - owner = "zeromq"; - repo = "zmqpp"; - rev = version; - sha256 = "08v34q3sd8g1b95k73n7jwryb0xzwca8ib9dz8ngczqf26j8k72i"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ cmake pkg-config ]; - - propagatedBuildInputs = [ zeromq ]; - - meta = with lib; { - inherit (src.meta) homepage; - description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent"; - license = licenses.lgpl3; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ chris-martin ]; - }; -} diff --git a/pkgs/development/libraries/zmusic/default.nix b/pkgs/development/libraries/zmusic/default.nix deleted file mode 100644 index 1b504515f9e6..000000000000 --- a/pkgs/development/libraries/zmusic/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, alsa-lib -, cmake -, fluidsynth -, libsndfile -, mpg123 -, ninja -, pkg-config -, soundfont-fluid -, zlib -}: - -stdenv.mkDerivation rec { - pname = "zmusic"; - version = "1.1.13"; - - src = fetchFromGitHub { - owner = "ZDoom"; - repo = "ZMusic"; - rev = version; - hash = "sha256-rvvMS5KciHEvoY4hSfgAEyWJiDMqBto4o09oIpQIGTQ="; - }; - - outputs = [ "out" "dev" ]; - - patches = [ - (fetchpatch { - name = "system-fluidsynth.patch"; - 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-fail "/usr/share/sounds/sf2" "${soundfont-fluid}/share/soundfonts" \ - --replace-fail "FluidR3_GM.sf2" "FluidR3_GM2-2.sf2" - ''; - - nativeBuildInputs = [ - cmake - ninja - pkg-config - ]; - - buildInputs = [ - alsa-lib - fluidsynth - libsndfile - mpg123 - zlib - ]; - - meta = with lib; { - description = "GZDoom's music system as a standalone library"; - homepage = "https://github.com/ZDoom/ZMusic"; - license = with licenses; [ - free - gpl3Plus - lgpl21Plus - lgpl3Plus - ]; - platforms = platforms.unix; - maintainers = with maintainers; [ azahi lassulus ]; - }; -} diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix deleted file mode 100644 index 0d95e8f34b71..000000000000 --- a/pkgs/development/libraries/zookeeper_mt/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv -, fetchurl -, autoreconfHook -, jre -, openssl -, pkg-config -# We depend on ZooKeeper for the Jute compiler. -, zookeeper -}: - -stdenv.mkDerivation rec { - pname = "zookeeper_mt"; - version = lib.getVersion zookeeper; - - src = fetchurl { - url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz"; - hash = "sha512-G6Yw9HBF43QCw8FTLnJ7boCjUYwaQVQAT4wXqUowSlzox1cUPH5+8ZYMBxToJCbr0ppmz22t0uKsHRUI/IDAPQ=="; - }; - - sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-client/zookeeper-client-c"; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - jre - ]; - - buildInputs = [ - openssl - zookeeper - ]; - - # Generate the C marshallers/unmarshallers for the Jute-encoded - # definitions. - preConfigure = '' - mkdir generated - cd generated - java -cp ${zookeeper}/lib/${zookeeper.pname}-jute-${version}.jar \ - org.apache.jute.compiler.generated.Rcc -l c \ - ../../../zookeeper-jute/src/main/resources/zookeeper.jute - cd .. - ''; - - configureFlags = [ - # We're not going to start test servers in the sandbox anyway. - "--without-cppunit" - ]; - - meta = with lib; { - homepage = "https://zookeeper.apache.org"; - description = "Apache Zookeeper"; - license = licenses.asl20; - maintainers = with maintainers; [ commandodev ztzg ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix deleted file mode 100644 index edd62ed3340b..000000000000 --- a/pkgs/development/libraries/zxcvbn-c/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { - pname = "zxcvbn-c"; - version = "2.5"; - - src = fetchFromGitHub { - owner = "tsyrogit"; - repo = "zxcvbn-c"; - rev = "v${version}"; - sha256 = "sha256-RKqbv0iGkjS7Y7KikqglZ+AK1oiw4G1mB2Zg87tOlbI="; - }; - - installPhase = '' - install -D -t $out/lib libzxcvbn.so* - ''; - - meta = with lib; { - homepage = "https://github.com/tsyrogit/zxcvbn-c"; - description = "C/C++ implementation of the zxcvbn password strength estimation"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ xurei ]; - }; -} diff --git a/pkgs/development/lisp-modules/import/repository/quicklisp.lisp b/pkgs/development/lisp-modules/import/repository/quicklisp.lisp index 1dd6572330da..9666fc9fba2a 100644 --- a/pkgs/development/lisp-modules/import/repository/quicklisp.lisp +++ b/pkgs/development/lisp-modules/import/repository/quicklisp.lisp @@ -68,6 +68,13 @@ (sqlite:execute-single db "select count(*) from sha256"))))) +(defparameter *broken-systems* + '( + ;; Infinite recursion through dependencies in 2024-10-12 dist + "cl-quil" "qvm" + ) + "List of broken systems, which should be omitted from the package graph") + (defmethod import-lisp-packages ((repository quicklisp-repository) (database sqlite-database)) @@ -113,6 +120,17 @@ asds 'vector)))))) + ;; Skip known broken systems and their dependents + (dolist (system *broken-systems*) + (sql-query + "with recursive broken(name) as ( + select ? + union + select s.name from quicklisp_system s, broken b + where b.name in (select value from json_each(deps)) + ) delete from quicklisp_system where name in (select name from broken)" + system)) + (sqlite:with-transaction db ;; Should these be temp tables, that then get queried by ;; system name? This looks like it uses a lot of memory. diff --git a/pkgs/development/lisp-modules/imported.nix b/pkgs/development/lisp-modules/imported.nix index 3053655eb8a5..e788bd8bf204 100644 --- a/pkgs/development/lisp-modules/imported.nix +++ b/pkgs/development/lisp-modules/imported.nix @@ -76,11 +76,11 @@ in lib.makeScope pkgs.newScope (self: { }); _3b-bmfont = (build-asdf-system { pname = "3b-bmfont"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "3b-bmfont" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/3b-bmfont/2023-02-14/3b-bmfont-20230214-git.tgz"; - sha256 = "11wnqa1wx9vji6cmxl5m5qnf12mqc6n7d5g8038r1wayq88bxia6"; + url = "http://beta.quicklisp.org/archive/3b-bmfont/2024-10-12/3b-bmfont-20241012-git.tgz"; + sha256 = "1zmkmhw8ma2j8p6crw0x6am6fx95rxkb1n3fqlgvs2rxdk273dan"; system = "3b-bmfont"; asd = "3b-bmfont"; }); @@ -140,11 +140,11 @@ in lib.makeScope pkgs.newScope (self: { }); _3bgl-shader = (build-asdf-system { pname = "3bgl-shader"; - version = "20200427-git"; + version = "20241012-git"; asds = [ "3bgl-shader" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bgl-shader/2020-04-27/3bgl-shader-20200427-git.tgz"; - sha256 = "0ykfylmmpcc1kh617c4zbq26r5nf1kgf7cb426fnffhp31pp2xkw"; + url = "http://beta.quicklisp.org/archive/3bgl-shader/2024-10-12/3bgl-shader-20241012-git.tgz"; + sha256 = "06v9a3m0cwhj2m5nz20shzgz3362sd7bv011rlknm4nz6i4q5bzz"; system = "3bgl-shader"; asd = "3bgl-shader"; }); @@ -156,11 +156,11 @@ in lib.makeScope pkgs.newScope (self: { }); _3bgl-shader-example = (build-asdf-system { pname = "3bgl-shader-example"; - version = "20200427-git"; + version = "20241012-git"; asds = [ "3bgl-shader-example" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bgl-shader/2020-04-27/3bgl-shader-20200427-git.tgz"; - sha256 = "0ykfylmmpcc1kh617c4zbq26r5nf1kgf7cb426fnffhp31pp2xkw"; + url = "http://beta.quicklisp.org/archive/3bgl-shader/2024-10-12/3bgl-shader-20241012-git.tgz"; + sha256 = "06v9a3m0cwhj2m5nz20shzgz3362sd7bv011rlknm4nz6i4q5bzz"; system = "3bgl-shader-example"; asd = "3bgl-shader-example"; }); @@ -172,11 +172,11 @@ in lib.makeScope pkgs.newScope (self: { }); _3bmd = (build-asdf-system { pname = "3bmd"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "3bmd" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2023-10-21/3bmd-20231021-git.tgz"; - sha256 = "12xqih1gnwsn1baqm7bq3kxss73phn06gvd0v1h1vwsjd1xgpq3g"; + url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz"; + sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv"; system = "3bmd"; asd = "3bmd"; }); @@ -188,11 +188,11 @@ in lib.makeScope pkgs.newScope (self: { }); _3bmd-ext-code-blocks = (build-asdf-system { pname = "3bmd-ext-code-blocks"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "3bmd-ext-code-blocks" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2023-10-21/3bmd-20231021-git.tgz"; - sha256 = "12xqih1gnwsn1baqm7bq3kxss73phn06gvd0v1h1vwsjd1xgpq3g"; + url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz"; + sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv"; system = "3bmd-ext-code-blocks"; asd = "3bmd-ext-code-blocks"; }); @@ -204,11 +204,11 @@ in lib.makeScope pkgs.newScope (self: { }); _3bmd-ext-definition-lists = (build-asdf-system { pname = "3bmd-ext-definition-lists"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "3bmd-ext-definition-lists" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2023-10-21/3bmd-20231021-git.tgz"; - sha256 = "12xqih1gnwsn1baqm7bq3kxss73phn06gvd0v1h1vwsjd1xgpq3g"; + url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz"; + sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv"; system = "3bmd-ext-definition-lists"; asd = "3bmd-ext-definition-lists"; }); @@ -220,11 +220,11 @@ in lib.makeScope pkgs.newScope (self: { }); _3bmd-ext-math = (build-asdf-system { pname = "3bmd-ext-math"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "3bmd-ext-math" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2023-10-21/3bmd-20231021-git.tgz"; - sha256 = "12xqih1gnwsn1baqm7bq3kxss73phn06gvd0v1h1vwsjd1xgpq3g"; + url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz"; + sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv"; system = "3bmd-ext-math"; asd = "3bmd-ext-math"; }); @@ -236,11 +236,11 @@ in lib.makeScope pkgs.newScope (self: { }); _3bmd-ext-tables = (build-asdf-system { pname = "3bmd-ext-tables"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "3bmd-ext-tables" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2023-10-21/3bmd-20231021-git.tgz"; - sha256 = "12xqih1gnwsn1baqm7bq3kxss73phn06gvd0v1h1vwsjd1xgpq3g"; + url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz"; + sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv"; system = "3bmd-ext-tables"; asd = "3bmd-ext-tables"; }); @@ -252,11 +252,11 @@ in lib.makeScope pkgs.newScope (self: { }); _3bmd-ext-wiki-links = (build-asdf-system { pname = "3bmd-ext-wiki-links"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "3bmd-ext-wiki-links" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2023-10-21/3bmd-20231021-git.tgz"; - sha256 = "12xqih1gnwsn1baqm7bq3kxss73phn06gvd0v1h1vwsjd1xgpq3g"; + url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz"; + sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv"; system = "3bmd-ext-wiki-links"; asd = "3bmd-ext-wiki-links"; }); @@ -268,11 +268,11 @@ in lib.makeScope pkgs.newScope (self: { }); _3bmd-tests = (build-asdf-system { pname = "3bmd-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "3bmd-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2023-10-21/3bmd-20231021-git.tgz"; - sha256 = "12xqih1gnwsn1baqm7bq3kxss73phn06gvd0v1h1vwsjd1xgpq3g"; + url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz"; + sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv"; system = "3bmd-tests"; asd = "3bmd-tests"; }); @@ -284,11 +284,11 @@ in lib.makeScope pkgs.newScope (self: { }); _3bmd-youtube = (build-asdf-system { pname = "3bmd-youtube"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "3bmd-youtube" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2023-10-21/3bmd-20231021-git.tgz"; - sha256 = "12xqih1gnwsn1baqm7bq3kxss73phn06gvd0v1h1vwsjd1xgpq3g"; + url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz"; + sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv"; system = "3bmd-youtube"; asd = "3bmd-youtube"; }); @@ -300,11 +300,11 @@ in lib.makeScope pkgs.newScope (self: { }); _3bmd-youtube-tests = (build-asdf-system { pname = "3bmd-youtube-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "3bmd-youtube-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2023-10-21/3bmd-20231021-git.tgz"; - sha256 = "12xqih1gnwsn1baqm7bq3kxss73phn06gvd0v1h1vwsjd1xgpq3g"; + url = "http://beta.quicklisp.org/archive/3bmd/2024-10-12/3bmd-20241012-git.tgz"; + sha256 = "166pn6qr8n3513673afmln2ayy7kgbgfx45hfmvhmk71xjvq19zv"; system = "3bmd-youtube-tests"; asd = "3bmd-youtube-tests"; }); @@ -332,11 +332,11 @@ in lib.makeScope pkgs.newScope (self: { }); _3d-math = (build-asdf-system { pname = "3d-math"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "3d-math" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/3d-math/2023-10-21/3d-math-20231021-git.tgz"; - sha256 = "0fj7dy68qvmcfhz2hvr3kbv5q09nz5v6qwam14cwzcigda86ha5g"; + url = "http://beta.quicklisp.org/archive/3d-math/2024-10-12/3d-math-20241012-git.tgz"; + sha256 = "01xnzizy76ypypzpqrg9fwnxfl5mlldc554b0791rsckkhh35xvd"; system = "3d-math"; asd = "3d-math"; }); @@ -348,11 +348,11 @@ in lib.makeScope pkgs.newScope (self: { }); _3d-math-test = (build-asdf-system { pname = "3d-math-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "3d-math-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/3d-math/2023-10-21/3d-math-20231021-git.tgz"; - sha256 = "0fj7dy68qvmcfhz2hvr3kbv5q09nz5v6qwam14cwzcigda86ha5g"; + url = "http://beta.quicklisp.org/archive/3d-math/2024-10-12/3d-math-20241012-git.tgz"; + sha256 = "01xnzizy76ypypzpqrg9fwnxfl5mlldc554b0791rsckkhh35xvd"; system = "3d-math-test"; asd = "3d-math-test"; }); @@ -428,11 +428,11 @@ in lib.makeScope pkgs.newScope (self: { }); _3d-spaces = (build-asdf-system { pname = "3d-spaces"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "3d-spaces" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/3d-spaces/2023-10-21/3d-spaces-20231021-git.tgz"; - sha256 = "0jsn8hdg7kghfvgfaawz6cnpn526sf59zrdj5aakglpzk376zyjg"; + url = "http://beta.quicklisp.org/archive/3d-spaces/2024-10-12/3d-spaces-20241012-git.tgz"; + sha256 = "170f2hyvrf3mvkfg9mj7rg2zafcnqbm9h9c29y716ppq1vk1pxhc"; system = "3d-spaces"; asd = "3d-spaces"; }); @@ -444,11 +444,11 @@ in lib.makeScope pkgs.newScope (self: { }); _3d-spaces-test = (build-asdf-system { pname = "3d-spaces-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "3d-spaces-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/3d-spaces/2023-10-21/3d-spaces-20231021-git.tgz"; - sha256 = "0jsn8hdg7kghfvgfaawz6cnpn526sf59zrdj5aakglpzk376zyjg"; + url = "http://beta.quicklisp.org/archive/3d-spaces/2024-10-12/3d-spaces-20241012-git.tgz"; + sha256 = "170f2hyvrf3mvkfg9mj7rg2zafcnqbm9h9c29y716ppq1vk1pxhc"; system = "3d-spaces-test"; asd = "3d-spaces-test"; }); @@ -524,11 +524,11 @@ in lib.makeScope pkgs.newScope (self: { }); _40ants-asdf-system = (build-asdf-system { pname = "40ants-asdf-system"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "40ants-asdf-system" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2023-10-21/40ants-asdf-system-20231021-git.tgz"; - sha256 = "17hfih5b1shw2l0fw3dy3q5dxqra80k3h4jfmlnf0bp3ii0385g5"; + url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2024-10-12/40ants-asdf-system-20241012-git.tgz"; + sha256 = "0wi575m0s0a9fvp1wy5ga760f71la16z1633qk6s2f87rwcjs8kw"; system = "40ants-asdf-system"; asd = "40ants-asdf-system"; }); @@ -538,13 +538,29 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + _40ants-asdf-system-ci = (build-asdf-system { + pname = "40ants-asdf-system-ci"; + version = "20241012-git"; + asds = [ "40ants-asdf-system-ci" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2024-10-12/40ants-asdf-system-20241012-git.tgz"; + sha256 = "0wi575m0s0a9fvp1wy5ga760f71la16z1633qk6s2f87rwcjs8kw"; + system = "40ants-asdf-system-ci"; + asd = "40ants-asdf-system-ci"; + }); + systems = [ "40ants-asdf-system-ci" ]; + lispLibs = [ (getAttr "_40ants-ci" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); _40ants-asdf-system-tests = (build-asdf-system { pname = "40ants-asdf-system-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "40ants-asdf-system-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2023-10-21/40ants-asdf-system-20231021-git.tgz"; - sha256 = "17hfih5b1shw2l0fw3dy3q5dxqra80k3h4jfmlnf0bp3ii0385g5"; + url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2024-10-12/40ants-asdf-system-20241012-git.tgz"; + sha256 = "0wi575m0s0a9fvp1wy5ga760f71la16z1633qk6s2f87rwcjs8kw"; system = "40ants-asdf-system-tests"; asd = "40ants-asdf-system-tests"; }); @@ -556,27 +572,43 @@ in lib.makeScope pkgs.newScope (self: { }); _40ants-ci = (build-asdf-system { pname = "40ants-ci"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "40ants-ci" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ci/2023-10-21/ci-20231021-git.tgz"; - sha256 = "083r8l431jig7631r5rq9gcxcp0kcd9qfy9blxjyjyynm56mlndn"; + url = "http://beta.quicklisp.org/archive/ci/2024-10-12/ci-20241012-git.tgz"; + sha256 = "0fmy1302c89qbhn4zc58cydcv8qc3qrl6cjbf2fy53sphnmj0wgm"; system = "40ants-ci"; asd = "40ants-ci"; }); systems = [ "40ants-ci" ]; - lispLibs = [ (getAttr "_40ants-asdf-system" self) (getAttr "_40ants-doc" self) (getAttr "alexandria" self) (getAttr "docs-config" self) (getAttr "str" self) (getAttr "yason" self) ]; + lispLibs = [ (getAttr "_40ants-asdf-system" self) (getAttr "alexandria" self) (getAttr "serapeum" self) (getAttr "str" self) (getAttr "yason" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + _40ants-ci-docs = (build-asdf-system { + pname = "40ants-ci-docs"; + version = "20241012-git"; + asds = [ "40ants-ci-docs" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/ci/2024-10-12/ci-20241012-git.tgz"; + sha256 = "0fmy1302c89qbhn4zc58cydcv8qc3qrl6cjbf2fy53sphnmj0wgm"; + system = "40ants-ci-docs"; + asd = "40ants-ci-docs"; + }); + systems = [ "40ants-ci-docs" ]; + lispLibs = [ (getAttr "_40ants-ci" self) (getAttr "_40ants-doc" self) (getAttr "_40ants-logging-docs" self) (getAttr "docs-config" self) ]; meta = { hydraPlatforms = [ ]; }; }); _40ants-ci-tests = (build-asdf-system { pname = "40ants-ci-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "40ants-ci-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ci/2023-10-21/ci-20231021-git.tgz"; - sha256 = "083r8l431jig7631r5rq9gcxcp0kcd9qfy9blxjyjyynm56mlndn"; + url = "http://beta.quicklisp.org/archive/ci/2024-10-12/ci-20241012-git.tgz"; + sha256 = "0fmy1302c89qbhn4zc58cydcv8qc3qrl6cjbf2fy53sphnmj0wgm"; system = "40ants-ci-tests"; asd = "40ants-ci-tests"; }); @@ -588,11 +620,11 @@ in lib.makeScope pkgs.newScope (self: { }); _40ants-doc = (build-asdf-system { pname = "40ants-doc"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "40ants-doc" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/doc/2023-10-21/doc-20231021-git.tgz"; - sha256 = "1vhn3f9j3hs8ra8k2nw4zndaw4d78lkvcmah2nx4jgsmpy9021c1"; + url = "http://beta.quicklisp.org/archive/doc/2024-10-12/doc-20241012-git.tgz"; + sha256 = "1vkczfcdgg1dmzb5jzxvc50kywbz7il130qrj0smlg1grwgw10a2"; system = "40ants-doc"; asd = "40ants-doc"; }); @@ -604,11 +636,11 @@ in lib.makeScope pkgs.newScope (self: { }); _40ants-doc-full = (build-asdf-system { pname = "40ants-doc-full"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "40ants-doc-full" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/doc/2023-10-21/doc-20231021-git.tgz"; - sha256 = "1vhn3f9j3hs8ra8k2nw4zndaw4d78lkvcmah2nx4jgsmpy9021c1"; + url = "http://beta.quicklisp.org/archive/doc/2024-10-12/doc-20241012-git.tgz"; + sha256 = "1vkczfcdgg1dmzb5jzxvc50kywbz7il130qrj0smlg1grwgw10a2"; system = "40ants-doc-full"; asd = "40ants-doc-full"; }); @@ -620,11 +652,11 @@ in lib.makeScope pkgs.newScope (self: { }); _40ants-doc-test = (build-asdf-system { pname = "40ants-doc-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "40ants-doc-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/doc/2023-10-21/doc-20231021-git.tgz"; - sha256 = "1vhn3f9j3hs8ra8k2nw4zndaw4d78lkvcmah2nx4jgsmpy9021c1"; + url = "http://beta.quicklisp.org/archive/doc/2024-10-12/doc-20241012-git.tgz"; + sha256 = "1vkczfcdgg1dmzb5jzxvc50kywbz7il130qrj0smlg1grwgw10a2"; system = "40ants-doc-test"; asd = "40ants-doc-test"; }); @@ -636,11 +668,11 @@ in lib.makeScope pkgs.newScope (self: { }); _40ants-logging = (build-asdf-system { pname = "40ants-logging"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "40ants-logging" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/logging/2023-10-21/logging-20231021-git.tgz"; - sha256 = "1hd0cfqpxvvp0p3rs8q8mnf0h5dapiw3f5z22nyn6xybngdqgp8z"; + url = "http://beta.quicklisp.org/archive/logging/2024-10-12/logging-20241012-git.tgz"; + sha256 = "1rkh0ls12qkwxs7szvnr5fz2bi1wwxsz7z72ywnin13hisvgkkwz"; system = "40ants-logging"; asd = "40ants-logging"; }); @@ -652,11 +684,11 @@ in lib.makeScope pkgs.newScope (self: { }); _40ants-logging-ci = (build-asdf-system { pname = "40ants-logging-ci"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "40ants-logging-ci" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/logging/2023-10-21/logging-20231021-git.tgz"; - sha256 = "1hd0cfqpxvvp0p3rs8q8mnf0h5dapiw3f5z22nyn6xybngdqgp8z"; + url = "http://beta.quicklisp.org/archive/logging/2024-10-12/logging-20241012-git.tgz"; + sha256 = "1rkh0ls12qkwxs7szvnr5fz2bi1wwxsz7z72ywnin13hisvgkkwz"; system = "40ants-logging-ci"; asd = "40ants-logging-ci"; }); @@ -668,11 +700,11 @@ in lib.makeScope pkgs.newScope (self: { }); _40ants-logging-docs = (build-asdf-system { pname = "40ants-logging-docs"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "40ants-logging-docs" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/logging/2023-10-21/logging-20231021-git.tgz"; - sha256 = "1hd0cfqpxvvp0p3rs8q8mnf0h5dapiw3f5z22nyn6xybngdqgp8z"; + url = "http://beta.quicklisp.org/archive/logging/2024-10-12/logging-20241012-git.tgz"; + sha256 = "1rkh0ls12qkwxs7szvnr5fz2bi1wwxsz7z72ywnin13hisvgkkwz"; system = "40ants-logging-docs"; asd = "40ants-logging-docs"; }); @@ -684,11 +716,11 @@ in lib.makeScope pkgs.newScope (self: { }); _40ants-logging-example = (build-asdf-system { pname = "40ants-logging-example"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "40ants-logging-example" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/logging/2023-10-21/logging-20231021-git.tgz"; - sha256 = "1hd0cfqpxvvp0p3rs8q8mnf0h5dapiw3f5z22nyn6xybngdqgp8z"; + url = "http://beta.quicklisp.org/archive/logging/2024-10-12/logging-20241012-git.tgz"; + sha256 = "1rkh0ls12qkwxs7szvnr5fz2bi1wwxsz7z72ywnin13hisvgkkwz"; system = "40ants-logging-example"; asd = "40ants-logging-example"; }); @@ -700,11 +732,11 @@ in lib.makeScope pkgs.newScope (self: { }); _40ants-logging-tests = (build-asdf-system { pname = "40ants-logging-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "40ants-logging-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/logging/2023-10-21/logging-20231021-git.tgz"; - sha256 = "1hd0cfqpxvvp0p3rs8q8mnf0h5dapiw3f5z22nyn6xybngdqgp8z"; + url = "http://beta.quicklisp.org/archive/logging/2024-10-12/logging-20241012-git.tgz"; + sha256 = "1rkh0ls12qkwxs7szvnr5fz2bi1wwxsz7z72ywnin13hisvgkkwz"; system = "40ants-logging-tests"; asd = "40ants-logging-tests"; }); @@ -716,11 +748,11 @@ in lib.makeScope pkgs.newScope (self: { }); _40ants-slynk = (build-asdf-system { pname = "40ants-slynk"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "40ants-slynk" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/40ants-slynk/2023-10-21/40ants-slynk-20231021-git.tgz"; - sha256 = "0jvwd1my5nsf63r4ync9w3pp9z32bazcr3fppha45sa0jwna1jgi"; + url = "http://beta.quicklisp.org/archive/40ants-slynk/2024-10-12/40ants-slynk-20241012-git.tgz"; + sha256 = "0rz32aaya177s8c4lsasyfff91b2ancjlw8bi50xz150kwqqqmmx"; system = "40ants-slynk"; asd = "40ants-slynk"; }); @@ -732,11 +764,11 @@ in lib.makeScope pkgs.newScope (self: { }); _40ants-slynk-ci = (build-asdf-system { pname = "40ants-slynk-ci"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "40ants-slynk-ci" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/40ants-slynk/2023-10-21/40ants-slynk-20231021-git.tgz"; - sha256 = "0jvwd1my5nsf63r4ync9w3pp9z32bazcr3fppha45sa0jwna1jgi"; + url = "http://beta.quicklisp.org/archive/40ants-slynk/2024-10-12/40ants-slynk-20241012-git.tgz"; + sha256 = "0rz32aaya177s8c4lsasyfff91b2ancjlw8bi50xz150kwqqqmmx"; system = "40ants-slynk-ci"; asd = "40ants-slynk-ci"; }); @@ -748,11 +780,11 @@ in lib.makeScope pkgs.newScope (self: { }); _40ants-slynk-docs = (build-asdf-system { pname = "40ants-slynk-docs"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "40ants-slynk-docs" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/40ants-slynk/2023-10-21/40ants-slynk-20231021-git.tgz"; - sha256 = "0jvwd1my5nsf63r4ync9w3pp9z32bazcr3fppha45sa0jwna1jgi"; + url = "http://beta.quicklisp.org/archive/40ants-slynk/2024-10-12/40ants-slynk-20241012-git.tgz"; + sha256 = "0rz32aaya177s8c4lsasyfff91b2ancjlw8bi50xz150kwqqqmmx"; system = "40ants-slynk-docs"; asd = "40ants-slynk-docs"; }); @@ -764,11 +796,11 @@ in lib.makeScope pkgs.newScope (self: { }); _40ants-slynk-tests = (build-asdf-system { pname = "40ants-slynk-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "40ants-slynk-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/40ants-slynk/2023-10-21/40ants-slynk-20231021-git.tgz"; - sha256 = "0jvwd1my5nsf63r4ync9w3pp9z32bazcr3fppha45sa0jwna1jgi"; + url = "http://beta.quicklisp.org/archive/40ants-slynk/2024-10-12/40ants-slynk-20241012-git.tgz"; + sha256 = "0rz32aaya177s8c4lsasyfff91b2ancjlw8bi50xz150kwqqqmmx"; system = "40ants-slynk-tests"; asd = "40ants-slynk-tests"; }); @@ -890,22 +922,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - abstract-arrays = (build-asdf-system { - pname = "abstract-arrays"; - version = "20230618-git"; - asds = [ "abstract-arrays" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/abstract-arrays/2023-06-18/abstract-arrays-20230618-git.tgz"; - sha256 = "13vxmq916jxjnvqmzjibyysvq15jdcdbb1hag21z1cik473a3bq4"; - system = "abstract-arrays"; - asd = "abstract-arrays"; - }); - systems = [ "abstract-arrays" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "closer-mop" self) (getAttr "extensible-compound-types" self) (getAttr "introspect-environment" self) (getAttr "polymorphic-functions" self) (getAttr "trivial-types" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); abstract-classes = (build-asdf-system { pname = "abstract-classes"; version = "20190307-hg"; @@ -924,11 +940,11 @@ in lib.makeScope pkgs.newScope (self: { }); access = (build-asdf-system { pname = "access"; - version = "20220707-git"; + version = "20241012-git"; asds = [ "access" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/access/2022-07-07/access-20220707-git.tgz"; - sha256 = "0jgq4xz4pmi7wrgiqvvpkl9k89dhnhsaac68x6mw0w2v7h31vzph"; + url = "http://beta.quicklisp.org/archive/access/2024-10-12/access-20241012-git.tgz"; + sha256 = "0zdjqhb9rvnlq6nzmsp7372gi91k1rq9bz510m6hcki7g3r01iv5"; system = "access"; asd = "access"; }); @@ -938,11 +954,11 @@ in lib.makeScope pkgs.newScope (self: { }); acclimation = (build-asdf-system { pname = "acclimation"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "acclimation" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/acclimation/2023-06-18/acclimation-20230618-git.tgz"; - sha256 = "028nakav74h9b1q45gsd5xp8m9068ssc3abgl6b3q7y2bfy9p78a"; + url = "http://beta.quicklisp.org/archive/acclimation/2024-10-12/acclimation-20241012-git.tgz"; + sha256 = "1rp4794czi01hlv67mgykxym1hqsyn04ldgwiqjwf4lj5d3p7aj4"; system = "acclimation"; asd = "acclimation"; }); @@ -952,11 +968,11 @@ in lib.makeScope pkgs.newScope (self: { }); acclimation-temperature = (build-asdf-system { pname = "acclimation-temperature"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "acclimation-temperature" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/acclimation/2023-06-18/acclimation-20230618-git.tgz"; - sha256 = "028nakav74h9b1q45gsd5xp8m9068ssc3abgl6b3q7y2bfy9p78a"; + url = "http://beta.quicklisp.org/archive/acclimation/2024-10-12/acclimation-20241012-git.tgz"; + sha256 = "1rp4794czi01hlv67mgykxym1hqsyn04ldgwiqjwf4lj5d3p7aj4"; system = "acclimation-temperature"; asd = "acclimation-temperature"; }); @@ -1016,11 +1032,11 @@ in lib.makeScope pkgs.newScope (self: { }); action-list = (build-asdf-system { pname = "action-list"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "action-list" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/action-list/2023-10-21/action-list-20231021-git.tgz"; - sha256 = "1vb5jqj8glvyzw4c9rjap2sxbmsmvylmk3gfr6yvgy6rg0670nbg"; + url = "http://beta.quicklisp.org/archive/action-list/2024-10-12/action-list-20241012-git.tgz"; + sha256 = "0ky38svlm0xhgsmh5maqj314q4wl3apg7532q8apy37axg1y3xvh"; system = "action-list"; asd = "action-list"; }); @@ -1030,13 +1046,29 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + add-two = (build-asdf-system { + pname = "add-two"; + version = "20241012-git"; + asds = [ "add-two" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/whereiseveryone.command-line-args/2024-10-12/whereiseveryone.command-line-args-20241012-git.tgz"; + sha256 = "140xnz2v0v3hfg3dp2fhidw8ns6lxd3a5knm07wqdp48ksg119wy"; + system = "add-two"; + asd = "add-two"; + }); + systems = [ "add-two" ]; + lispLibs = [ (getAttr "cl-annot" self) (getAttr "whereiseveryone_dot_command-line-args" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); adhoc = (build-asdf-system { pname = "adhoc"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "adhoc" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/adhoc/2023-10-21/adhoc-20231021-git.tgz"; - sha256 = "1v2a9v821irg630q4d5jk9ljsm5qakg5idaq4p4bii1w8n6smxp7"; + url = "http://beta.quicklisp.org/archive/adhoc/2024-10-12/adhoc-20241012-git.tgz"; + sha256 = "1h7mnwybapxzpv0zlwr1mr91lsd7wiv722ifa21gczllvrg5qai6"; system = "adhoc"; asd = "adhoc"; }); @@ -1048,11 +1080,11 @@ in lib.makeScope pkgs.newScope (self: { }); adhoc-tests = (build-asdf-system { pname = "adhoc-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "adhoc-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/adhoc/2023-10-21/adhoc-20231021-git.tgz"; - sha256 = "1v2a9v821irg630q4d5jk9ljsm5qakg5idaq4p4bii1w8n6smxp7"; + url = "http://beta.quicklisp.org/archive/adhoc/2024-10-12/adhoc-20241012-git.tgz"; + sha256 = "1h7mnwybapxzpv0zlwr1mr91lsd7wiv722ifa21gczllvrg5qai6"; system = "adhoc-tests"; asd = "adhoc-tests"; }); @@ -1096,11 +1128,11 @@ in lib.makeScope pkgs.newScope (self: { }); adopt = (build-asdf-system { pname = "adopt"; - version = "20220331-hg"; + version = "20241012-hg"; asds = [ "adopt" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/adopt/2022-03-31/adopt-20220331-hg.tgz"; - sha256 = "0lfg12crl68nz0avdyx4j0x0p8vrysr2bl1817iaaa48jp6qp588"; + url = "http://beta.quicklisp.org/archive/adopt/2024-10-12/adopt-20241012-hg.tgz"; + sha256 = "1q36b9bp76daprnhd97h00x56kccmii8pc9w2ra6yihkfbcas41q"; system = "adopt"; asd = "adopt"; }); @@ -1144,16 +1176,48 @@ in lib.makeScope pkgs.newScope (self: { }); adp = (build-asdf-system { pname = "adp"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "adp" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/adp/2023-10-21/adp-20231021-git.tgz"; - sha256 = "1k3jcmh2wiq74hd2crww5zqzcnd4fnirzc02n5xs2f99nm1x97s1"; + url = "http://beta.quicklisp.org/archive/adp/2024-10-12/adp-20241012-git.tgz"; + sha256 = "04h91m2x1vcn8iidhx1y2cwb8j55siiifhx1ksy7hyn9hf39b2kv"; system = "adp"; asd = "adp"; }); systems = [ "adp" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "scribble" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "named-readtables" self) (getAttr "scribble" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + adp-github = (build-asdf-system { + pname = "adp-github"; + version = "20241012-git"; + asds = [ "adp-github" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/adp-github/2024-10-12/adp-github-20241012-git.tgz"; + sha256 = "1g33l2k6pc5m8d0d3dl4rf8p364563jpyk22rywrh5188m9nayjc"; + system = "adp-github"; + asd = "adp-github"; + }); + systems = [ "adp-github" ]; + lispLibs = [ (getAttr "adp" self) (getAttr "alexandria" self) (getAttr "closer-mop" self) (getAttr "trivial-arguments" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + adp-plain = (build-asdf-system { + pname = "adp-plain"; + version = "20241012-git"; + asds = [ "adp-plain" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/adp-plain/2024-10-12/adp-plain-20241012-git.tgz"; + sha256 = "0dnfx7hhdibkg0qphs3wsfll2kmpkfpg4hxfjv2paxnsmqdhspnz"; + system = "adp-plain"; + asd = "adp-plain"; + }); + systems = [ "adp-plain" ]; + lispLibs = [ (getAttr "adp" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -1208,11 +1272,11 @@ in lib.makeScope pkgs.newScope (self: { }); agnostic-lizard = (build-asdf-system { pname = "agnostic-lizard"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "agnostic-lizard" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/agnostic-lizard/2022-11-06/agnostic-lizard-20221106-git.tgz"; - sha256 = "13r1pzxkhci0pd8grhvim09lgvaykjyspnj58xq1rp1c017xnpmf"; + url = "http://beta.quicklisp.org/archive/agnostic-lizard/2024-10-12/agnostic-lizard-20241012-git.tgz"; + sha256 = "0amzshh6v3mp24j0h2cinv4zvdlg4kih04md5biakwhnmcw4j4pr"; system = "agnostic-lizard"; asd = "agnostic-lizard"; }); @@ -1224,11 +1288,11 @@ in lib.makeScope pkgs.newScope (self: { }); agnostic-lizard-debugger-prototype = (build-asdf-system { pname = "agnostic-lizard-debugger-prototype"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "agnostic-lizard-debugger-prototype" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/agnostic-lizard/2022-11-06/agnostic-lizard-20221106-git.tgz"; - sha256 = "13r1pzxkhci0pd8grhvim09lgvaykjyspnj58xq1rp1c017xnpmf"; + url = "http://beta.quicklisp.org/archive/agnostic-lizard/2024-10-12/agnostic-lizard-20241012-git.tgz"; + sha256 = "0amzshh6v3mp24j0h2cinv4zvdlg4kih04md5biakwhnmcw4j4pr"; system = "agnostic-lizard-debugger-prototype"; asd = "agnostic-lizard-debugger-prototype"; }); @@ -1252,22 +1316,6 @@ in lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "alexandria" self) (getAttr "optima" self) ]; meta = {}; }); - ahungry-fleece = (build-asdf-system { - pname = "ahungry-fleece"; - version = "20230214-git"; - asds = [ "ahungry-fleece" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ahungry-fleece/2023-02-14/ahungry-fleece-20230214-git.tgz"; - sha256 = "1q0bd4fhfypfdvv338gf0gbc8fh65m0p662ik7c9rraijgddi9ry"; - system = "ahungry-fleece"; - asd = "ahungry-fleece"; - }); - systems = [ "ahungry-fleece" ]; - lispLibs = [ (getAttr "archive" self) (getAttr "chipz" self) (getAttr "cl-json" self) (getAttr "cl-yaml" self) (getAttr "md5" self) (getAttr "split-sequence" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); alexa = (build-asdf-system { pname = "alexa"; version = "20180831-git"; @@ -1302,11 +1350,11 @@ in lib.makeScope pkgs.newScope (self: { }); alexandria = (build-asdf-system { pname = "alexandria"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "alexandria" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/alexandria/2023-10-21/alexandria-20231021-git.tgz"; - sha256 = "0pdj779j3nwzn8f1661vf00rrjrbks1xgiq0rvwjw6qyxsfqfnl9"; + url = "http://beta.quicklisp.org/archive/alexandria/2024-10-12/alexandria-20241012-git.tgz"; + sha256 = "0jq0n59s0r9yl374f0zpdnaflb5g853yqvax7ka8rnypspyykwdw"; system = "alexandria"; asd = "alexandria"; }); @@ -1316,11 +1364,11 @@ in lib.makeScope pkgs.newScope (self: { }); alexandria_plus = (build-asdf-system { pname = "alexandria+"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "alexandria+" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/alexandria-plus/2022-11-06/alexandria-plus-20221106-git.tgz"; - sha256 = "1w9r19610h599303gqlx2x5n8mmdynss2gyl7xilg5h6v8z3hkfl"; + url = "http://beta.quicklisp.org/archive/alexandria-plus/2024-10-12/alexandria-plus-20241012-git.tgz"; + sha256 = "05j88i289nx2dgc8r3n3h8x3ma31gk8xk2bpvxc5y9yzfl2mp0hk"; system = "alexandria+"; asd = "alexandria+"; }); @@ -1346,6 +1394,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + allioli = (build-asdf-system { + pname = "allioli"; + version = "20241012-git"; + asds = [ "allioli" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/allioli/2024-10-12/allioli-20241012-git.tgz"; + sha256 = "00504wf4rxrwpc171czlk56zzbf798c39jzhbipm7ba3iz28qkai"; + system = "allioli"; + asd = "allioli"; + }); + systems = [ "allioli" ]; + lispLibs = [ (getAttr "fare-quasiquote-extras" self) (getAttr "named-readtables" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); also-alsa = (build-asdf-system { pname = "also-alsa"; version = "20231021-git"; @@ -1362,6 +1426,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + alternate-asdf-system-connections = (build-asdf-system { + pname = "alternate-asdf-system-connections"; + version = "20241012-git"; + asds = [ "alternate-asdf-system-connections" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/alternate-asdf-system-connections/2024-10-12/alternate-asdf-system-connections-20241012-git.tgz"; + sha256 = "0wlmr29a8azs5kjvwdaqmfn2iwqid0f659cmj34ywchgxahdr6p6"; + system = "alternate-asdf-system-connections"; + asd = "alternate-asdf-system-connections"; + }); + systems = [ "alternate-asdf-system-connections" ]; + lispLibs = [ (getAttr "asdf-system-connections" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); amazon-ecs = (build-asdf-system { pname = "amazon-ecs"; version = "20110418-git"; @@ -1426,11 +1506,11 @@ in lib.makeScope pkgs.newScope (self: { }); anatevka = (build-asdf-system { pname = "anatevka"; - version = "v1.0.0"; + version = "v1.0.1"; asds = [ "anatevka" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/anatevka/2022-11-06/anatevka-v1.0.0.tgz"; - sha256 = "1c8y91nv1jln22j7b82qiad861zfjs9a8nxm18r1dxblszpyygsk"; + url = "http://beta.quicklisp.org/archive/anatevka/2024-10-12/anatevka-v1.0.1.tgz"; + sha256 = "1cxrbbb947pccy6532cxqrdlkfpm0m6z135mnyaiplfsd77jy772"; system = "anatevka"; asd = "anatevka"; }); @@ -1442,27 +1522,27 @@ in lib.makeScope pkgs.newScope (self: { }); anatevka-tests = (build-asdf-system { pname = "anatevka-tests"; - version = "v1.0.0"; + version = "v1.0.1"; asds = [ "anatevka-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/anatevka/2022-11-06/anatevka-v1.0.0.tgz"; - sha256 = "1c8y91nv1jln22j7b82qiad861zfjs9a8nxm18r1dxblszpyygsk"; + url = "http://beta.quicklisp.org/archive/anatevka/2024-10-12/anatevka-v1.0.1.tgz"; + sha256 = "1cxrbbb947pccy6532cxqrdlkfpm0m6z135mnyaiplfsd77jy772"; system = "anatevka-tests"; asd = "anatevka-tests"; }); systems = [ "anatevka-tests" ]; - lispLibs = [ (getAttr "anatevka" self) (getAttr "closer-mop" self) (getAttr "fiasco" self) ]; + lispLibs = [ (getAttr "anatevka" self) (getAttr "closer-mop" self) (getAttr "fiasco" self) (getAttr "trivial-garbage" self) ]; meta = { hydraPlatforms = [ ]; }; }); ansi-escape = (build-asdf-system { pname = "ansi-escape"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "ansi-escape" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/croatoan/2023-10-21/croatoan-20231021-git.tgz"; - sha256 = "0x2rlckyn8kn5mqy0fib8piggz694g3naarz2dvha1hsy4jhb1wg"; + url = "http://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz"; + sha256 = "04776x4i8inxs8n4mgy9xf0q39bzv4mfz4cl880sxwk6mnhwnn4c"; system = "ansi-escape"; asd = "ansi-escape"; }); @@ -1474,11 +1554,11 @@ in lib.makeScope pkgs.newScope (self: { }); ansi-escape-test = (build-asdf-system { pname = "ansi-escape-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "ansi-escape-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/croatoan/2023-10-21/croatoan-20231021-git.tgz"; - sha256 = "0x2rlckyn8kn5mqy0fib8piggz694g3naarz2dvha1hsy4jhb1wg"; + url = "http://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz"; + sha256 = "04776x4i8inxs8n4mgy9xf0q39bzv4mfz4cl880sxwk6mnhwnn4c"; system = "ansi-escape-test"; asd = "ansi-escape-test"; }); @@ -1509,7 +1589,7 @@ in lib.makeScope pkgs.newScope (self: { version = "master-df14cb8c-git"; asds = [ "antik" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/antik/2019-10-08/antik-master-df14cb8c-git.tgz"; + url = "http://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz"; sha256 = "1n08cx4n51z8v4bxyak166lp495xda3x7llfxcdpxndxqxcammr0"; system = "antik"; asd = "antik"; @@ -1525,7 +1605,7 @@ in lib.makeScope pkgs.newScope (self: { version = "master-df14cb8c-git"; asds = [ "antik-base" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/antik/2019-10-08/antik-master-df14cb8c-git.tgz"; + url = "http://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz"; sha256 = "1n08cx4n51z8v4bxyak166lp495xda3x7llfxcdpxndxqxcammr0"; system = "antik-base"; asd = "antik-base"; @@ -1538,11 +1618,11 @@ in lib.makeScope pkgs.newScope (self: { }); anypool = (build-asdf-system { pname = "anypool"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "anypool" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/anypool/2023-10-21/anypool-20231021-git.tgz"; - sha256 = "07ha0x6qv1qw68iim3bcr5fk2pnxk0knk8lwyylbvm9rqjmd672i"; + url = "http://beta.quicklisp.org/archive/anypool/2024-10-12/anypool-20241012-git.tgz"; + sha256 = "1ffssc5fzh7gj0z94xxfb3mk5cwja65lrhxyfgib15a6yxqf1kk1"; system = "anypool"; asd = "anypool"; }); @@ -1554,11 +1634,11 @@ in lib.makeScope pkgs.newScope (self: { }); aplesque = (build-asdf-system { pname = "aplesque"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "aplesque" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2023-10-21/april-20231021-git.tgz"; - sha256 = "19f1q7y09mpbs9vw53xnfpdgsvc6y5sqv29fm1jp0rhwb5rl7g34"; + url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; + sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; system = "aplesque"; asd = "aplesque"; }); @@ -1618,11 +1698,11 @@ in lib.makeScope pkgs.newScope (self: { }); april = (build-asdf-system { pname = "april"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "april" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2023-10-21/april-20231021-git.tgz"; - sha256 = "19f1q7y09mpbs9vw53xnfpdgsvc6y5sqv29fm1jp0rhwb5rl7g34"; + url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; + sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; system = "april"; asd = "april"; }); @@ -1634,11 +1714,11 @@ in lib.makeScope pkgs.newScope (self: { }); april-demo_dot_cnn = (build-asdf-system { pname = "april-demo.cnn"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "april-demo.cnn" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2023-10-21/april-20231021-git.tgz"; - sha256 = "19f1q7y09mpbs9vw53xnfpdgsvc6y5sqv29fm1jp0rhwb5rl7g34"; + url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; + sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; system = "april-demo.cnn"; asd = "april-demo.cnn"; }); @@ -1650,11 +1730,11 @@ in lib.makeScope pkgs.newScope (self: { }); april-demo_dot_fnn = (build-asdf-system { pname = "april-demo.fnn"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "april-demo.fnn" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2023-10-21/april-20231021-git.tgz"; - sha256 = "19f1q7y09mpbs9vw53xnfpdgsvc6y5sqv29fm1jp0rhwb5rl7g34"; + url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; + sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; system = "april-demo.fnn"; asd = "april-demo.fnn"; }); @@ -1664,29 +1744,13 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - april-demo_dot_ncurses = (build-asdf-system { - pname = "april-demo.ncurses"; - version = "20231021-git"; - asds = [ "april-demo.ncurses" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2023-10-21/april-20231021-git.tgz"; - sha256 = "19f1q7y09mpbs9vw53xnfpdgsvc6y5sqv29fm1jp0rhwb5rl7g34"; - system = "april-demo.ncurses"; - asd = "april-demo.ncurses"; - }); - systems = [ "april-demo.ncurses" ]; - lispLibs = [ (getAttr "april" self) (getAttr "croatoan" self) (getAttr "lparallel" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); april-lib_dot_dfns_dot_array = (build-asdf-system { pname = "april-lib.dfns.array"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "april-lib.dfns.array" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2023-10-21/april-20231021-git.tgz"; - sha256 = "19f1q7y09mpbs9vw53xnfpdgsvc6y5sqv29fm1jp0rhwb5rl7g34"; + url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; + sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; system = "april-lib.dfns.array"; asd = "april-lib.dfns.array"; }); @@ -1698,11 +1762,11 @@ in lib.makeScope pkgs.newScope (self: { }); april-lib_dot_dfns_dot_graph = (build-asdf-system { pname = "april-lib.dfns.graph"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "april-lib.dfns.graph" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2023-10-21/april-20231021-git.tgz"; - sha256 = "19f1q7y09mpbs9vw53xnfpdgsvc6y5sqv29fm1jp0rhwb5rl7g34"; + url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; + sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; system = "april-lib.dfns.graph"; asd = "april-lib.dfns.graph"; }); @@ -1714,11 +1778,11 @@ in lib.makeScope pkgs.newScope (self: { }); april-lib_dot_dfns_dot_numeric = (build-asdf-system { pname = "april-lib.dfns.numeric"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "april-lib.dfns.numeric" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2023-10-21/april-20231021-git.tgz"; - sha256 = "19f1q7y09mpbs9vw53xnfpdgsvc6y5sqv29fm1jp0rhwb5rl7g34"; + url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; + sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; system = "april-lib.dfns.numeric"; asd = "april-lib.dfns.numeric"; }); @@ -1730,11 +1794,11 @@ in lib.makeScope pkgs.newScope (self: { }); april-lib_dot_dfns_dot_power = (build-asdf-system { pname = "april-lib.dfns.power"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "april-lib.dfns.power" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2023-10-21/april-20231021-git.tgz"; - sha256 = "19f1q7y09mpbs9vw53xnfpdgsvc6y5sqv29fm1jp0rhwb5rl7g34"; + url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; + sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; system = "april-lib.dfns.power"; asd = "april-lib.dfns.power"; }); @@ -1746,11 +1810,11 @@ in lib.makeScope pkgs.newScope (self: { }); april-lib_dot_dfns_dot_string = (build-asdf-system { pname = "april-lib.dfns.string"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "april-lib.dfns.string" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2023-10-21/april-20231021-git.tgz"; - sha256 = "19f1q7y09mpbs9vw53xnfpdgsvc6y5sqv29fm1jp0rhwb5rl7g34"; + url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; + sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; system = "april-lib.dfns.string"; asd = "april-lib.dfns.string"; }); @@ -1762,11 +1826,11 @@ in lib.makeScope pkgs.newScope (self: { }); april-lib_dot_dfns_dot_tree = (build-asdf-system { pname = "april-lib.dfns.tree"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "april-lib.dfns.tree" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2023-10-21/april-20231021-git.tgz"; - sha256 = "19f1q7y09mpbs9vw53xnfpdgsvc6y5sqv29fm1jp0rhwb5rl7g34"; + url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; + sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; system = "april-lib.dfns.tree"; asd = "april-lib.dfns.tree"; }); @@ -1778,11 +1842,11 @@ in lib.makeScope pkgs.newScope (self: { }); april-xt_dot_uzuki = (build-asdf-system { pname = "april-xt.uzuki"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "april-xt.uzuki" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2023-10-21/april-20231021-git.tgz"; - sha256 = "19f1q7y09mpbs9vw53xnfpdgsvc6y5sqv29fm1jp0rhwb5rl7g34"; + url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; + sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; system = "april-xt.uzuki"; asd = "april-xt.uzuki"; }); @@ -1794,11 +1858,11 @@ in lib.makeScope pkgs.newScope (self: { }); arc-compat = (build-asdf-system { pname = "arc-compat"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "arc-compat" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/arc-compat/2023-06-18/arc-compat-20230618-git.tgz"; - sha256 = "01pysyx5wq5hapg5v8ir3wmql3i4cx0saaf09zbf3cir6c77yjd1"; + url = "http://beta.quicklisp.org/archive/arc-compat/2024-10-12/arc-compat-20241012-git.tgz"; + sha256 = "1wmq5mvlkvdbl4562p3n7x8bhv3swjj0yqbly07y8mv0snasns8d"; system = "arc-compat"; asd = "arc-compat"; }); @@ -1810,11 +1874,11 @@ in lib.makeScope pkgs.newScope (self: { }); architecture_dot_builder-protocol = (build-asdf-system { pname = "architecture.builder-protocol"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "architecture.builder-protocol" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2023-10-21/architecture.builder-protocol-20231021-git.tgz"; - sha256 = "0lim63d70685r7l5xy5zjbjd1qjcvjk2ard92pavl7f6arqrfhfj"; + url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz"; + sha256 = "1ckrv0ca57xvsvd9rwjcq0yljiv76wj22p1pjpjbjfr5clb9gl0q"; system = "architecture.builder-protocol"; asd = "architecture.builder-protocol"; }); @@ -1826,11 +1890,11 @@ in lib.makeScope pkgs.newScope (self: { }); architecture_dot_builder-protocol_dot_inspection = (build-asdf-system { pname = "architecture.builder-protocol.inspection"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "architecture.builder-protocol.inspection" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2023-10-21/architecture.builder-protocol-20231021-git.tgz"; - sha256 = "0lim63d70685r7l5xy5zjbjd1qjcvjk2ard92pavl7f6arqrfhfj"; + url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz"; + sha256 = "1ckrv0ca57xvsvd9rwjcq0yljiv76wj22p1pjpjbjfr5clb9gl0q"; system = "architecture.builder-protocol.inspection"; asd = "architecture.builder-protocol.inspection"; }); @@ -1842,11 +1906,11 @@ in lib.makeScope pkgs.newScope (self: { }); architecture_dot_builder-protocol_dot_json = (build-asdf-system { pname = "architecture.builder-protocol.json"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "architecture.builder-protocol.json" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2023-10-21/architecture.builder-protocol-20231021-git.tgz"; - sha256 = "0lim63d70685r7l5xy5zjbjd1qjcvjk2ard92pavl7f6arqrfhfj"; + url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz"; + sha256 = "1ckrv0ca57xvsvd9rwjcq0yljiv76wj22p1pjpjbjfr5clb9gl0q"; system = "architecture.builder-protocol.json"; asd = "architecture.builder-protocol.json"; }); @@ -1858,11 +1922,11 @@ in lib.makeScope pkgs.newScope (self: { }); architecture_dot_builder-protocol_dot_print-tree = (build-asdf-system { pname = "architecture.builder-protocol.print-tree"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "architecture.builder-protocol.print-tree" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2023-10-21/architecture.builder-protocol-20231021-git.tgz"; - sha256 = "0lim63d70685r7l5xy5zjbjd1qjcvjk2ard92pavl7f6arqrfhfj"; + url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz"; + sha256 = "1ckrv0ca57xvsvd9rwjcq0yljiv76wj22p1pjpjbjfr5clb9gl0q"; system = "architecture.builder-protocol.print-tree"; asd = "architecture.builder-protocol.print-tree"; }); @@ -1874,11 +1938,11 @@ in lib.makeScope pkgs.newScope (self: { }); architecture_dot_builder-protocol_dot_universal-builder = (build-asdf-system { pname = "architecture.builder-protocol.universal-builder"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "architecture.builder-protocol.universal-builder" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2023-10-21/architecture.builder-protocol-20231021-git.tgz"; - sha256 = "0lim63d70685r7l5xy5zjbjd1qjcvjk2ard92pavl7f6arqrfhfj"; + url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz"; + sha256 = "1ckrv0ca57xvsvd9rwjcq0yljiv76wj22p1pjpjbjfr5clb9gl0q"; system = "architecture.builder-protocol.universal-builder"; asd = "architecture.builder-protocol.universal-builder"; }); @@ -1890,11 +1954,11 @@ in lib.makeScope pkgs.newScope (self: { }); architecture_dot_builder-protocol_dot_xpath = (build-asdf-system { pname = "architecture.builder-protocol.xpath"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "architecture.builder-protocol.xpath" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2023-10-21/architecture.builder-protocol-20231021-git.tgz"; - sha256 = "0lim63d70685r7l5xy5zjbjd1qjcvjk2ard92pavl7f6arqrfhfj"; + url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2024-10-12/architecture.builder-protocol-20241012-git.tgz"; + sha256 = "1ckrv0ca57xvsvd9rwjcq0yljiv76wj22p1pjpjbjfr5clb9gl0q"; system = "architecture.builder-protocol.xpath"; asd = "architecture.builder-protocol.xpath"; }); @@ -2014,11 +2078,11 @@ in lib.makeScope pkgs.newScope (self: { }); array-utils = (build-asdf-system { pname = "array-utils"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "array-utils" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/array-utils/2023-10-21/array-utils-20231021-git.tgz"; - sha256 = "0ldnvmnb4vcwrx1xd1r5av407bky3dqmxcfbgy1h9h9aqm66ax7f"; + url = "http://beta.quicklisp.org/archive/array-utils/2024-10-12/array-utils-20241012-git.tgz"; + sha256 = "0rya7k9sfpyrn5vrn12wywpgsr2f0pmcywv51ixzb0sv8ska0mhs"; system = "array-utils"; asd = "array-utils"; }); @@ -2028,11 +2092,11 @@ in lib.makeScope pkgs.newScope (self: { }); array-utils-test = (build-asdf-system { pname = "array-utils-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "array-utils-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/array-utils/2023-10-21/array-utils-20231021-git.tgz"; - sha256 = "0ldnvmnb4vcwrx1xd1r5av407bky3dqmxcfbgy1h9h9aqm66ax7f"; + url = "http://beta.quicklisp.org/archive/array-utils/2024-10-12/array-utils-20241012-git.tgz"; + sha256 = "0rya7k9sfpyrn5vrn12wywpgsr2f0pmcywv51ixzb0sv8ska0mhs"; system = "array-utils-test"; asd = "array-utils-test"; }); @@ -2060,27 +2124,27 @@ in lib.makeScope pkgs.newScope (self: { }); arrow-macros = (build-asdf-system { pname = "arrow-macros"; - version = "20201220-git"; + version = "20241012-git"; asds = [ "arrow-macros" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/arrow-macros/2020-12-20/arrow-macros-20201220-git.tgz"; - sha256 = "1b7vldvhn8zx60h010573gmqv2igarpnb6h3pq8qydhwfza0xd4g"; + url = "http://beta.quicklisp.org/archive/arrow-macros/2024-10-12/arrow-macros-20241012-git.tgz"; + sha256 = "0q4vpysk4h9ghs5zmnzzilky9jyz7i8n0x0p98nq528crbrkh6c4"; system = "arrow-macros"; asd = "arrow-macros"; }); systems = [ "arrow-macros" ]; - lispLibs = [ (getAttr "alexandria" self) ]; + lispLibs = [ ]; meta = { hydraPlatforms = [ ]; }; }); arrow-macros-test = (build-asdf-system { pname = "arrow-macros-test"; - version = "20201220-git"; + version = "20241012-git"; asds = [ "arrow-macros-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/arrow-macros/2020-12-20/arrow-macros-20201220-git.tgz"; - sha256 = "1b7vldvhn8zx60h010573gmqv2igarpnb6h3pq8qydhwfza0xd4g"; + url = "http://beta.quicklisp.org/archive/arrow-macros/2024-10-12/arrow-macros-20241012-git.tgz"; + sha256 = "0q4vpysk4h9ghs5zmnzzilky9jyz7i8n0x0p98nq528crbrkh6c4"; system = "arrow-macros-test"; asd = "arrow-macros-test"; }); @@ -2186,11 +2250,11 @@ in lib.makeScope pkgs.newScope (self: { }); asdf-driver = (build-asdf-system { pname = "asdf-driver"; - version = "3.3.6"; + version = "3.3.7"; asds = [ "asdf-driver" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/uiop/2023-06-18/uiop-3.3.6.tgz"; - sha256 = "080lcdw90j30gg2vv9bnwj21aq08mp1kk4nax3ffkjssnrnjwhmr"; + url = "http://beta.quicklisp.org/archive/uiop/2024-10-12/uiop-3.3.7.tgz"; + sha256 = "0xvzxglkf9hlly7if0l307k31kwglk2ay4k393545c1l5l1ac584"; system = "asdf-driver"; asd = "asdf-driver"; }); @@ -2406,11 +2470,11 @@ in lib.makeScope pkgs.newScope (self: { }); assoc-utils = (build-asdf-system { pname = "assoc-utils"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "assoc-utils" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/assoc-utils/2022-11-06/assoc-utils-20221106-git.tgz"; - sha256 = "0mqb5iw4qwga66y7flifb1n0y5hp4gc3x8xfg4cild46x7mjqxws"; + url = "http://beta.quicklisp.org/archive/assoc-utils/2024-10-12/assoc-utils-20241012-git.tgz"; + sha256 = "0rgfv9qni9dnmm3qnaf1x67h0z38vw2zbmbsdk3a4x5s8ckxln6r"; system = "assoc-utils"; asd = "assoc-utils"; }); @@ -2422,16 +2486,16 @@ in lib.makeScope pkgs.newScope (self: { }); assoc-utils-test = (build-asdf-system { pname = "assoc-utils-test"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "assoc-utils-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/assoc-utils/2022-11-06/assoc-utils-20221106-git.tgz"; - sha256 = "0mqb5iw4qwga66y7flifb1n0y5hp4gc3x8xfg4cild46x7mjqxws"; + url = "http://beta.quicklisp.org/archive/assoc-utils/2024-10-12/assoc-utils-20241012-git.tgz"; + sha256 = "0rgfv9qni9dnmm3qnaf1x67h0z38vw2zbmbsdk3a4x5s8ckxln6r"; system = "assoc-utils-test"; asd = "assoc-utils-test"; }); systems = [ "assoc-utils-test" ]; - lispLibs = [ (getAttr "assoc-utils" self) (getAttr "prove" self) (getAttr "prove-asdf" self) ]; + lispLibs = [ (getAttr "assoc-utils" self) (getAttr "rove" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -2470,11 +2534,11 @@ in lib.makeScope pkgs.newScope (self: { }); async-process = (build-asdf-system { pname = "async-process"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "async-process" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/async-process/2023-10-21/async-process-20231021-git.tgz"; - sha256 = "1m2sfgfg6c0gqqy1pqsahsiw3j25y473mfw7sx0akkqbhwhm7mjb"; + url = "http://beta.quicklisp.org/archive/async-process/2024-10-12/async-process-20241012-git.tgz"; + sha256 = "0691z0vs5c65m24p1yi12iy27j59layzvzyy1yl19704x05442qh"; system = "async-process"; asd = "async-process"; }); @@ -2502,11 +2566,11 @@ in lib.makeScope pkgs.newScope (self: { }); atomics = (build-asdf-system { pname = "atomics"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "atomics" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/atomics/2023-10-21/atomics-20231021-git.tgz"; - sha256 = "02xiqgmn4kzgsb51szrh73jr6gl9gcjajgiiffvabzzdjiic6l2z"; + url = "http://beta.quicklisp.org/archive/atomics/2024-10-12/atomics-20241012-git.tgz"; + sha256 = "1ah6fgvfva0axnhj4sp1qy6gjyw41fkhpnv998di0wbp6hls8j39"; system = "atomics"; asd = "atomics"; }); @@ -2518,11 +2582,11 @@ in lib.makeScope pkgs.newScope (self: { }); atomics-test = (build-asdf-system { pname = "atomics-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "atomics-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/atomics/2023-10-21/atomics-20231021-git.tgz"; - sha256 = "02xiqgmn4kzgsb51szrh73jr6gl9gcjajgiiffvabzzdjiic6l2z"; + url = "http://beta.quicklisp.org/archive/atomics/2024-10-12/atomics-20241012-git.tgz"; + sha256 = "1ah6fgvfva0axnhj4sp1qy6gjyw41fkhpnv998di0wbp6hls8j39"; system = "atomics-test"; asd = "atomics-test"; }); @@ -2582,11 +2646,11 @@ in lib.makeScope pkgs.newScope (self: { }); auto-restart = (build-asdf-system { pname = "auto-restart"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "auto-restart" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/auto-restart/2022-11-06/auto-restart-20221106-git.tgz"; - sha256 = "1kzcxq57s3qfshvlp9w2yxs6kiyrvssrl94pa3vdf3x7644swrzi"; + url = "http://beta.quicklisp.org/archive/auto-restart/2024-10-12/auto-restart-20241012-git.tgz"; + sha256 = "1kz50w4x7glin8fyrfysazz07r4rrk90daml35yrwnz08vi3dfw7"; system = "auto-restart"; asd = "auto-restart"; }); @@ -2614,11 +2678,11 @@ in lib.makeScope pkgs.newScope (self: { }); automaton = (build-asdf-system { pname = "automaton"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "automaton" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "automaton"; asd = "automaton"; }); @@ -2694,16 +2758,16 @@ in lib.makeScope pkgs.newScope (self: { }); aws-sdk = (build-asdf-system { pname = "aws-sdk"; - version = "20230215-git"; + version = "20241012-git"; asds = [ "aws-sdk" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/aws-sdk-lisp/2023-02-15/aws-sdk-lisp-20230215-git.tgz"; - sha256 = "0h10y5qj1jjv4nnwn0qm3bwbx67bxrvnjf578nzwn8bk85x3wvl1"; + url = "http://beta.quicklisp.org/archive/aws-sdk-lisp/2024-10-12/aws-sdk-lisp-20241012-git.tgz"; + sha256 = "0iqm441fr1qx5py7cvrv4jl9zgfsm813igwvq3rj90606g6lyxjc"; system = "aws-sdk"; asd = "aws-sdk"; }); systems = [ "aws-sdk" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "assoc-utils" self) (getAttr "aws-sign4" self) (getAttr "babel" self) (getAttr "cl-ppcre" self) (getAttr "dexador" self) (getAttr "ironclad" self) (getAttr "kebab" self) (getAttr "local-time" self) (getAttr "parser_dot_ini" self) (getAttr "quri" self) (getAttr "trivial-timeout" self) (getAttr "trivial-types" self) (getAttr "xmls" self) (getAttr "yason" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "assoc-utils" self) (getAttr "aws-sign4" self) (getAttr "babel" self) (getAttr "cl-base64" self) (getAttr "cl-ppcre" self) (getAttr "dexador" self) (getAttr "ironclad" self) (getAttr "kebab" self) (getAttr "local-time" self) (getAttr "parser_dot_ini" self) (getAttr "quri" self) (getAttr "trivial-timeout" self) (getAttr "trivial-types" self) (getAttr "xmls" self) (getAttr "yason" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -2790,11 +2854,11 @@ in lib.makeScope pkgs.newScope (self: { }); babel = (build-asdf-system { pname = "babel"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "babel" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/babel/2023-02-14/babel-20230214-git.tgz"; - sha256 = "1sndap9ykyyvrzlqm9smgqy49r3n67l926yg0hb7pm00plj0y380"; + url = "http://beta.quicklisp.org/archive/babel/2024-10-12/babel-20241012-git.tgz"; + sha256 = "0359bj3yr6frybcmg8qr5vi4q8hzbsb7hmvxdc0jgkfz3c33q667"; system = "babel"; asd = "babel"; }); @@ -2804,11 +2868,11 @@ in lib.makeScope pkgs.newScope (self: { }); babel-streams = (build-asdf-system { pname = "babel-streams"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "babel-streams" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/babel/2023-02-14/babel-20230214-git.tgz"; - sha256 = "1sndap9ykyyvrzlqm9smgqy49r3n67l926yg0hb7pm00plj0y380"; + url = "http://beta.quicklisp.org/archive/babel/2024-10-12/babel-20241012-git.tgz"; + sha256 = "0359bj3yr6frybcmg8qr5vi4q8hzbsb7hmvxdc0jgkfz3c33q667"; system = "babel-streams"; asd = "babel-streams"; }); @@ -2820,11 +2884,11 @@ in lib.makeScope pkgs.newScope (self: { }); babel-tests = (build-asdf-system { pname = "babel-tests"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "babel-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/babel/2023-02-14/babel-20230214-git.tgz"; - sha256 = "1sndap9ykyyvrzlqm9smgqy49r3n67l926yg0hb7pm00plj0y380"; + url = "http://beta.quicklisp.org/archive/babel/2024-10-12/babel-20241012-git.tgz"; + sha256 = "0359bj3yr6frybcmg8qr5vi4q8hzbsb7hmvxdc0jgkfz3c33q667"; system = "babel-tests"; asd = "babel-tests"; }); @@ -2932,11 +2996,11 @@ in lib.makeScope pkgs.newScope (self: { }); bdef = (build-asdf-system { pname = "bdef"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "bdef" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/bdef/2023-10-21/bdef-20231021-git.tgz"; - sha256 = "0rx7dm5hj2llp6x6j6dxg0arn8854xf18k3kqvbrm3wk5nz19w98"; + url = "http://beta.quicklisp.org/archive/bdef/2024-10-12/bdef-20241012-git.tgz"; + sha256 = "16jz9fxxjcpnmhx0yagv8xs7l0b7qh8yx7i7p8fnlxz3pn7726y6"; system = "bdef"; asd = "bdef"; }); @@ -3074,66 +3138,18 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - bike = (build-asdf-system { - pname = "bike"; - version = "20231021-git"; - asds = [ "bike" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bike/2023-10-21/bike-20231021-git.tgz"; - sha256 = "0z1200blyri0h6dm6p6h4z4icn860nnhgw5x1iyl4rx237ssdwf2"; - system = "bike"; - asd = "bike"; - }); - systems = [ "bike" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "bike-internals" self) (getAttr "bordeaux-threads" self) (getAttr "cffi" self) (getAttr "cl-ppcre" self) (getAttr "closer-mop" self) (getAttr "flexi-streams" self) (getAttr "global-vars" self) (getAttr "named-readtables" self) (getAttr "split-sequence" self) (getAttr "trivial-features" self) (getAttr "trivial-garbage" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - bike-examples = (build-asdf-system { - pname = "bike-examples"; - version = "20231021-git"; - asds = [ "bike-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bike/2023-10-21/bike-20231021-git.tgz"; - sha256 = "0z1200blyri0h6dm6p6h4z4icn860nnhgw5x1iyl4rx237ssdwf2"; - system = "bike-examples"; - asd = "bike-examples"; - }); - systems = [ "bike-examples" ]; - lispLibs = [ (getAttr "bike" self) (getAttr "float-features" self) (getAttr "trivial-features" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); bike-internals = (build-asdf-system { pname = "bike-internals"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "bike-internals" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/bike/2023-10-21/bike-20231021-git.tgz"; - sha256 = "0z1200blyri0h6dm6p6h4z4icn860nnhgw5x1iyl4rx237ssdwf2"; + url = "http://beta.quicklisp.org/archive/bike/2024-10-12/bike-20241012-git.tgz"; + sha256 = "0ssv4n39wl3i0r8gy2sg6rxfz571jcfsd6db9ndy13drqnhyda6s"; system = "bike-internals"; asd = "bike-internals"; }); systems = [ "bike-internals" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "cffi" self) (getAttr "cl-ppcre" self) (getAttr "flexi-streams" self) (getAttr "global-vars" self) (getAttr "split-sequence" self) (getAttr "trivial-features" self) (getAttr "trivial-garbage" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - bike-tests = (build-asdf-system { - pname = "bike-tests"; - version = "20231021-git"; - asds = [ "bike-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bike/2023-10-21/bike-20231021-git.tgz"; - sha256 = "0z1200blyri0h6dm6p6h4z4icn860nnhgw5x1iyl4rx237ssdwf2"; - system = "bike-tests"; - asd = "bike-tests"; - }); - systems = [ "bike-tests" ]; - lispLibs = [ (getAttr "bike" self) (getAttr "fiveam" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "cffi" self) (getAttr "cl-ppcre" self) (getAttr "closer-mop" self) (getAttr "flexi-streams" self) (getAttr "global-vars" self) (getAttr "split-sequence" self) (getAttr "trivial-features" self) (getAttr "trivial-garbage" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -3156,11 +3172,11 @@ in lib.makeScope pkgs.newScope (self: { }); binary-lass = (build-asdf-system { pname = "binary-lass"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "binary-lass" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lass/2023-10-21/lass-20231021-git.tgz"; - sha256 = "1wax2kykc9ff0sk2linp9v8fcsm5ay6idpq365vivady9fh504r5"; + url = "http://beta.quicklisp.org/archive/lass/2024-10-12/lass-20241012-git.tgz"; + sha256 = "1b6a3v763i5fcdxczffd59kh4m73p4ilz6az85apd22apc8lr80z"; system = "binary-lass"; asd = "binary-lass"; }); @@ -3204,16 +3220,16 @@ in lib.makeScope pkgs.newScope (self: { }); binary-structures = (build-asdf-system { pname = "binary-structures"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "binary-structures" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/binary-structures/2023-10-21/binary-structures-20231021-git.tgz"; - sha256 = "0agiwvr7asqjlrhxgypmzrlgvy1gjfnrl768vvmg2q7n72km13z3"; + url = "http://beta.quicklisp.org/archive/binary-structures/2024-10-12/binary-structures-20241012-git.tgz"; + sha256 = "1ygfa4xgd0wliggmmxlqqh9nd7hfsgjwl168l8s9r595vx6fnzmb"; system = "binary-structures"; asd = "binary-structures"; }); systems = [ "binary-structures" ]; - lispLibs = [ (getAttr "babel" self) (getAttr "cffi" self) (getAttr "documentation-utils" self) (getAttr "nibbles" self) (getAttr "trivial-extensible-sequences" self) ]; + lispLibs = [ (getAttr "babel" self) (getAttr "cffi" self) (getAttr "documentation-utils" self) (getAttr "form-fiddle" self) (getAttr "nibbles" self) (getAttr "trivial-extensible-sequences" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -3268,11 +3284,11 @@ in lib.makeScope pkgs.newScope (self: { }); binding-arrows = (build-asdf-system { pname = "binding-arrows"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "binding-arrows" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/binding-arrows/2023-10-21/binding-arrows-20231021-git.tgz"; - sha256 = "05m2p7p8wmy2by51yd467ry0xyl020p9kbyrb86qfglgsl0xzykn"; + url = "http://beta.quicklisp.org/archive/binding-arrows/2024-10-12/binding-arrows-20241012-git.tgz"; + sha256 = "0kzybw5qlb49czh9v2lnxniz9jzqx306a6lnarfv59x48a7cch22"; system = "binding-arrows"; asd = "binding-arrows"; }); @@ -3282,6 +3298,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + binding-knx = (build-asdf-system { + pname = "binding-knx"; + version = "20241012-git"; + asds = [ "binding-knx" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/chipi/2024-10-12/chipi-20241012-git.tgz"; + sha256 = "0xpfclvl5v031cjnjvr3bcfc87rayw624m9yrw35f5r31p8m283g"; + system = "binding-knx"; + asd = "binding-knx"; + }); + systems = [ "binding-knx" ]; + lispLibs = [ (getAttr "chipi" self) (getAttr "knx-conn" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); binfix = (build-asdf-system { pname = "binfix"; version = "20190813-git"; @@ -3344,11 +3376,11 @@ in lib.makeScope pkgs.newScope (self: { }); birch = (build-asdf-system { pname = "birch"; - version = "20220220-git"; + version = "20241012-git"; asds = [ "birch" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/birch/2022-02-20/birch-20220220-git.tgz"; - sha256 = "0b2wh1n9b5r1dyvgg9hhh97plbj4j5anasfbii92s2g8h2ilb4yb"; + url = "http://beta.quicklisp.org/archive/birch/2024-10-12/birch-20241012-git.tgz"; + sha256 = "1b24xng92ra7420s3zy44pybk4h7xg4kjwdk35arl46badgi28r1"; system = "birch"; asd = "birch"; }); @@ -3360,11 +3392,11 @@ in lib.makeScope pkgs.newScope (self: { }); birch_dot_test = (build-asdf-system { pname = "birch.test"; - version = "20220220-git"; + version = "20241012-git"; asds = [ "birch.test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/birch/2022-02-20/birch-20220220-git.tgz"; - sha256 = "0b2wh1n9b5r1dyvgg9hhh97plbj4j5anasfbii92s2g8h2ilb4yb"; + url = "http://beta.quicklisp.org/archive/birch/2024-10-12/birch-20241012-git.tgz"; + sha256 = "1b24xng92ra7420s3zy44pybk4h7xg4kjwdk35arl46badgi28r1"; system = "birch.test"; asd = "birch.test"; }); @@ -3680,11 +3712,11 @@ in lib.makeScope pkgs.newScope (self: { }); blackbird = (build-asdf-system { pname = "blackbird"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "blackbird" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/blackbird/2022-11-06/blackbird-20221106-git.tgz"; - sha256 = "1r0f9473akzm6zyj494ma5p39hfkixa8aj17dhcdfa4kmqf9f6al"; + url = "http://beta.quicklisp.org/archive/blackbird/2024-10-12/blackbird-20241012-git.tgz"; + sha256 = "0bqg8sn816qfar410w2c2k07vqh9sig8zbkvlmwj1bk33snvmam8"; system = "blackbird"; asd = "blackbird"; }); @@ -3694,11 +3726,11 @@ in lib.makeScope pkgs.newScope (self: { }); blackbird-test = (build-asdf-system { pname = "blackbird-test"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "blackbird-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/blackbird/2022-11-06/blackbird-20221106-git.tgz"; - sha256 = "1r0f9473akzm6zyj494ma5p39hfkixa8aj17dhcdfa4kmqf9f6al"; + url = "http://beta.quicklisp.org/archive/blackbird/2024-10-12/blackbird-20241012-git.tgz"; + sha256 = "0bqg8sn816qfar410w2c2k07vqh9sig8zbkvlmwj1bk33snvmam8"; system = "blackbird-test"; asd = "blackbird-test"; }); @@ -3806,11 +3838,11 @@ in lib.makeScope pkgs.newScope (self: { }); bmas = (build-asdf-system { pname = "bmas"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "bmas" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bmas/2023-06-18/cl-bmas-20230618-git.tgz"; - sha256 = "0k8dxz49bmmd9d1dbmkwm9kb8hmgj9bzq0bycpr3250prin855ip"; + url = "http://beta.quicklisp.org/archive/cl-bmas/2024-10-12/cl-bmas-20241012-git.tgz"; + sha256 = "1j4wniwcxz4kqzw7q3ac8rpz2xhd0qfdgl5dylswh02ifdgq9z4m"; system = "bmas"; asd = "bmas"; }); @@ -4174,11 +4206,11 @@ in lib.makeScope pkgs.newScope (self: { }); bordeaux-threads = (build-asdf-system { pname = "bordeaux-threads"; - version = "v0.9.3"; + version = "v0.9.4"; asds = [ "bordeaux-threads" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/bordeaux-threads/2023-10-21/bordeaux-threads-v0.9.3.tgz"; - sha256 = "06kf639gyysfcls79nrs92z43wdwi97mr9bblfnmdhpi415cwzm9"; + url = "http://beta.quicklisp.org/archive/bordeaux-threads/2024-10-12/bordeaux-threads-v0.9.4.tgz"; + sha256 = "1ds1aa3rd38hq5i1nwd9qi8icxmdag0shcwwsf7km91v9214385d"; system = "bordeaux-threads"; asd = "bordeaux-threads"; }); @@ -4726,11 +4758,11 @@ in lib.makeScope pkgs.newScope (self: { }); calm = (build-asdf-system { pname = "calm"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "calm" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/calm/2023-10-21/calm-20231021-git.tgz"; - sha256 = "0h45h6clv08mmzp6qgz05hr76sai9kph4jwxhkx2p0hhgkwn7k9c"; + url = "http://beta.quicklisp.org/archive/calm/2024-10-12/calm-20241012-git.tgz"; + sha256 = "0c8d7aagx02cqk42pyj62hpqz3yarncigsw0g2ccc64sk74v67js"; system = "calm"; asd = "calm"; }); @@ -4934,11 +4966,11 @@ in lib.makeScope pkgs.newScope (self: { }); carrier = (build-asdf-system { pname = "carrier"; - version = "20181210-git"; + version = "20241012-git"; asds = [ "carrier" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/carrier/2018-12-10/carrier-20181210-git.tgz"; - sha256 = "1xry7alc9x86y1g5k417vhvlgkwgfrl80zpsyfdwdsz7hrwff41d"; + url = "http://beta.quicklisp.org/archive/carrier/2024-10-12/carrier-20241012-git.tgz"; + sha256 = "04w6hzqqbcvi8niqj35xz098gjfg4pdv6fbihfbna3c5v7q59gr1"; system = "carrier"; asd = "carrier"; }); @@ -4966,11 +4998,11 @@ in lib.makeScope pkgs.newScope (self: { }); caveman-middleware-dbimanager = (build-asdf-system { pname = "caveman-middleware-dbimanager"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "caveman-middleware-dbimanager" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/caveman/2022-11-06/caveman-20221106-git.tgz"; - sha256 = "041i1g78cn6mjv8ba4bylw57f3px2rp5a0jnj17rwkfhfcvc76md"; + url = "http://beta.quicklisp.org/archive/caveman/2024-10-12/caveman-20241012-git.tgz"; + sha256 = "1q07mmm41zymh464j4mldf3lv1sb9amzdcwinkywqhwnjmnx6axi"; system = "caveman-middleware-dbimanager"; asd = "caveman-middleware-dbimanager"; }); @@ -4982,11 +5014,11 @@ in lib.makeScope pkgs.newScope (self: { }); caveman2 = (build-asdf-system { pname = "caveman2"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "caveman2" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/caveman/2022-11-06/caveman-20221106-git.tgz"; - sha256 = "041i1g78cn6mjv8ba4bylw57f3px2rp5a0jnj17rwkfhfcvc76md"; + url = "http://beta.quicklisp.org/archive/caveman/2024-10-12/caveman-20241012-git.tgz"; + sha256 = "1q07mmm41zymh464j4mldf3lv1sb9amzdcwinkywqhwnjmnx6axi"; system = "caveman2"; asd = "caveman2"; }); @@ -4998,11 +5030,11 @@ in lib.makeScope pkgs.newScope (self: { }); caveman2-db = (build-asdf-system { pname = "caveman2-db"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "caveman2-db" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/caveman/2022-11-06/caveman-20221106-git.tgz"; - sha256 = "041i1g78cn6mjv8ba4bylw57f3px2rp5a0jnj17rwkfhfcvc76md"; + url = "http://beta.quicklisp.org/archive/caveman/2024-10-12/caveman-20241012-git.tgz"; + sha256 = "1q07mmm41zymh464j4mldf3lv1sb9amzdcwinkywqhwnjmnx6axi"; system = "caveman2-db"; asd = "caveman2-db"; }); @@ -5014,11 +5046,11 @@ in lib.makeScope pkgs.newScope (self: { }); caveman2-test = (build-asdf-system { pname = "caveman2-test"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "caveman2-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/caveman/2022-11-06/caveman-20221106-git.tgz"; - sha256 = "041i1g78cn6mjv8ba4bylw57f3px2rp5a0jnj17rwkfhfcvc76md"; + url = "http://beta.quicklisp.org/archive/caveman/2024-10-12/caveman-20241012-git.tgz"; + sha256 = "1q07mmm41zymh464j4mldf3lv1sb9amzdcwinkywqhwnjmnx6axi"; system = "caveman2-test"; asd = "caveman2-test"; }); @@ -5108,6 +5140,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + cbor = (build-asdf-system { + pname = "cbor"; + version = "20241012-git"; + asds = [ "cbor" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cbor/2024-10-12/cbor-20241012-git.tgz"; + sha256 = "0bkjfi449m651hbsm39dc9863mcry3ynz1j59wb2kl8zwxm1qg2r"; + system = "cbor"; + asd = "cbor"; + }); + systems = [ "cbor" ]; + lispLibs = [ (getAttr "closer-mop" self) (getAttr "ieee-floats" self) (getAttr "local-time" self) (getAttr "trivial-utf-8" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); ccl-compat = (build-asdf-system { pname = "ccl-compat"; version = "20171130-git"; @@ -5126,27 +5174,43 @@ in lib.makeScope pkgs.newScope (self: { }); ccldoc = (build-asdf-system { pname = "ccldoc"; - version = "20200427-git"; + version = "20241012-git"; asds = [ "ccldoc" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ccldoc/2020-04-27/ccldoc-20200427-git.tgz"; - sha256 = "0pxjk07drvxrk65g46lbpz2y0xgxgn04k6yvirl0hk2dry0myinp"; + url = "http://beta.quicklisp.org/archive/ccldoc/2024-10-12/ccldoc-20241012-git.tgz"; + sha256 = "15pc25pwnlg2lhzxniln53fr2i2cqa6fpr60nv4i1743x9ahp35l"; system = "ccldoc"; asd = "ccldoc"; }); systems = [ "ccldoc" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "ccl-compat" self) (getAttr "cl-who" self) (getAttr "s-xml" self) (getAttr "split-sequence" self) ]; + lispLibs = [ (getAttr "ccl-compat" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + ccldoc-docbook = (build-asdf-system { + pname = "ccldoc-docbook"; + version = "20241012-git"; + asds = [ "ccldoc-docbook" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/ccldoc/2024-10-12/ccldoc-20241012-git.tgz"; + sha256 = "15pc25pwnlg2lhzxniln53fr2i2cqa6fpr60nv4i1743x9ahp35l"; + system = "ccldoc-docbook"; + asd = "ccldoc-docbook"; + }); + systems = [ "ccldoc-docbook" ]; + lispLibs = [ (getAttr "ccldoc" self) (getAttr "s-xml" self) ]; meta = { hydraPlatforms = [ ]; }; }); ccldoc-libraries = (build-asdf-system { pname = "ccldoc-libraries"; - version = "20200427-git"; + version = "20241012-git"; asds = [ "ccldoc-libraries" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ccldoc/2020-04-27/ccldoc-20200427-git.tgz"; - sha256 = "0pxjk07drvxrk65g46lbpz2y0xgxgn04k6yvirl0hk2dry0myinp"; + url = "http://beta.quicklisp.org/archive/ccldoc/2024-10-12/ccldoc-20241012-git.tgz"; + sha256 = "15pc25pwnlg2lhzxniln53fr2i2cqa6fpr60nv4i1743x9ahp35l"; system = "ccldoc-libraries"; asd = "ccldoc-libraries"; }); @@ -5156,6 +5220,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + ceigen-lite = (build-asdf-system { + pname = "ceigen-lite"; + version = "20241012-git"; + asds = [ "ceigen-lite" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-ceigen-lite/2024-10-12/cl-ceigen-lite-20241012-git.tgz"; + sha256 = "0k2b6x913mnv1f5712xvvv7d6j3lrja4isjg6cyad694py59d09q"; + system = "ceigen-lite"; + asd = "ceigen-lite"; + }); + systems = [ "ceigen-lite" ]; + lispLibs = [ (getAttr "cffi" self) (getAttr "cl-autowrap" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); cells = (build-asdf-system { pname = "cells"; version = "20230618-git"; @@ -5190,11 +5270,11 @@ in lib.makeScope pkgs.newScope (self: { }); cephes = (build-asdf-system { pname = "cephes"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cephes" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cephes.cl/2023-10-21/cephes.cl-20231021-git.tgz"; - sha256 = "1h115lxlqgw39vp97psx1xy4g668rx1b233zp3nhn18rj6hniadr"; + url = "http://beta.quicklisp.org/archive/cephes.cl/2024-10-12/cephes.cl-20241012-git.tgz"; + sha256 = "1p0npidiy9zjb90gyihdmx0nmm87a5akph1jhs6y7z50fx8470hb"; system = "cephes"; asd = "cephes"; }); @@ -5206,11 +5286,11 @@ in lib.makeScope pkgs.newScope (self: { }); cepl = (build-asdf-system { pname = "cepl"; - version = "release-quicklisp-d1a10b6c-git"; + version = "release-quicklisp-543c9fc1-git"; asds = [ "cepl" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cepl/2021-02-28/cepl-release-quicklisp-d1a10b6c-git.tgz"; - sha256 = "0izbw2advqm3wailj3dpq6zqfrfirwn14pw5qmqh8i71r51xwmm2"; + url = "http://beta.quicklisp.org/archive/cepl/2024-10-12/cepl-release-quicklisp-543c9fc1-git.tgz"; + sha256 = "0g5frci6ljmy6pyyrjhh2kw894l3fl3wsz27k75xw49cd8xm24mh"; system = "cepl"; asd = "cepl"; }); @@ -5222,11 +5302,11 @@ in lib.makeScope pkgs.newScope (self: { }); cepl_dot_build = (build-asdf-system { pname = "cepl.build"; - version = "release-quicklisp-d1a10b6c-git"; + version = "release-quicklisp-543c9fc1-git"; asds = [ "cepl.build" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cepl/2021-02-28/cepl-release-quicklisp-d1a10b6c-git.tgz"; - sha256 = "0izbw2advqm3wailj3dpq6zqfrfirwn14pw5qmqh8i71r51xwmm2"; + url = "http://beta.quicklisp.org/archive/cepl/2024-10-12/cepl-release-quicklisp-543c9fc1-git.tgz"; + sha256 = "0g5frci6ljmy6pyyrjhh2kw894l3fl3wsz27k75xw49cd8xm24mh"; system = "cepl.build"; asd = "cepl.build"; }); @@ -5430,11 +5510,11 @@ in lib.makeScope pkgs.newScope (self: { }); cerberus = (build-asdf-system { pname = "cerberus"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "cerberus" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cerberus/2022-11-06/cerberus-20221106-git.tgz"; - sha256 = "04yi0wqykx5v8drdw7ln382gxdklv60mg4aqrxg2j5wlsyacs0kb"; + url = "http://beta.quicklisp.org/archive/cerberus/2024-10-12/cerberus-20241012-git.tgz"; + sha256 = "131x0raccj5majd72hmmlp67dsj2zdizm2xzdhw6s0jbxjbhdgfs"; system = "cerberus"; asd = "cerberus"; }); @@ -5446,11 +5526,11 @@ in lib.makeScope pkgs.newScope (self: { }); cerberus-kdc = (build-asdf-system { pname = "cerberus-kdc"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "cerberus-kdc" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cerberus/2022-11-06/cerberus-20221106-git.tgz"; - sha256 = "04yi0wqykx5v8drdw7ln382gxdklv60mg4aqrxg2j5wlsyacs0kb"; + url = "http://beta.quicklisp.org/archive/cerberus/2024-10-12/cerberus-20241012-git.tgz"; + sha256 = "131x0raccj5majd72hmmlp67dsj2zdizm2xzdhw6s0jbxjbhdgfs"; system = "cerberus-kdc"; asd = "cerberus"; }); @@ -5492,13 +5572,45 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + cf = (build-asdf-system { + pname = "cf"; + version = "20241012-git"; + asds = [ "cf" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-cf/2024-10-12/cl-cf-20241012-git.tgz"; + sha256 = "1w4asb8v81q2rf8fhhq88c2ib4ax5fbm0655kvdpfvkz1457yi25"; + system = "cf"; + asd = "cf"; + }); + systems = [ "cf" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + cf-tests = (build-asdf-system { + pname = "cf-tests"; + version = "20241012-git"; + asds = [ "cf-tests" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-cf/2024-10-12/cl-cf-20241012-git.tgz"; + sha256 = "1w4asb8v81q2rf8fhhq88c2ib4ax5fbm0655kvdpfvkz1457yi25"; + system = "cf-tests"; + asd = "cf-tests"; + }); + systems = [ "cf-tests" ]; + lispLibs = [ (getAttr "cf" self) (getAttr "fiveam" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); cffi = (build-asdf-system { pname = "cffi"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cffi" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2023-10-21/cffi-20231021-git.tgz"; - sha256 = "1d4kckxsqpyk3ihjv01c0hhxnswn4fnx4m6257z1dfhwya02s8bk"; + url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz"; + sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7"; system = "cffi"; asd = "cffi"; }); @@ -5524,11 +5636,11 @@ in lib.makeScope pkgs.newScope (self: { }); cffi-examples = (build-asdf-system { pname = "cffi-examples"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cffi-examples" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2023-10-21/cffi-20231021-git.tgz"; - sha256 = "1d4kckxsqpyk3ihjv01c0hhxnswn4fnx4m6257z1dfhwya02s8bk"; + url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz"; + sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7"; system = "cffi-examples"; asd = "cffi-examples"; }); @@ -5540,11 +5652,11 @@ in lib.makeScope pkgs.newScope (self: { }); cffi-grovel = (build-asdf-system { pname = "cffi-grovel"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cffi-grovel" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2023-10-21/cffi-20231021-git.tgz"; - sha256 = "1d4kckxsqpyk3ihjv01c0hhxnswn4fnx4m6257z1dfhwya02s8bk"; + url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz"; + sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7"; system = "cffi-grovel"; asd = "cffi-grovel"; }); @@ -5554,11 +5666,11 @@ in lib.makeScope pkgs.newScope (self: { }); cffi-libffi = (build-asdf-system { pname = "cffi-libffi"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cffi-libffi" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2023-10-21/cffi-20231021-git.tgz"; - sha256 = "1d4kckxsqpyk3ihjv01c0hhxnswn4fnx4m6257z1dfhwya02s8bk"; + url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz"; + sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7"; system = "cffi-libffi"; asd = "cffi-libffi"; }); @@ -5570,11 +5682,11 @@ in lib.makeScope pkgs.newScope (self: { }); cffi-object = (build-asdf-system { pname = "cffi-object"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cffi-object" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi-object/2023-10-21/cffi-object-20231021-git.tgz"; - sha256 = "04wdwp2r5nk74agxbkdwpy9c52f939v03s55fn0f0k5dii056wlz"; + url = "http://beta.quicklisp.org/archive/cffi-object/2024-10-12/cffi-object-20241012-git.tgz"; + sha256 = "0hdxy2lqf0q04j57y6plnlh2v6w7y7prsypxk9f4vdlnp2ah3lln"; system = "cffi-object"; asd = "cffi-object"; }); @@ -5586,11 +5698,11 @@ in lib.makeScope pkgs.newScope (self: { }); cffi-object_dot_ops = (build-asdf-system { pname = "cffi-object.ops"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cffi-object.ops" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi-object/2023-10-21/cffi-object-20231021-git.tgz"; - sha256 = "04wdwp2r5nk74agxbkdwpy9c52f939v03s55fn0f0k5dii056wlz"; + url = "http://beta.quicklisp.org/archive/cffi-object/2024-10-12/cffi-object-20241012-git.tgz"; + sha256 = "0hdxy2lqf0q04j57y6plnlh2v6w7y7prsypxk9f4vdlnp2ah3lln"; system = "cffi-object.ops"; asd = "cffi-object.ops"; }); @@ -5602,11 +5714,11 @@ in lib.makeScope pkgs.newScope (self: { }); cffi-ops = (build-asdf-system { pname = "cffi-ops"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cffi-ops" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi-ops/2023-10-21/cffi-ops-20231021-git.tgz"; - sha256 = "1bn9dqr3l5i460agiyd7p0vf07k5dx6rnrpvnhsw2ivp2qf2lbas"; + url = "http://beta.quicklisp.org/archive/cffi-ops/2024-10-12/cffi-ops-20241012-git.tgz"; + sha256 = "0hi3svwfb7m1wq892wlrsgj52jkh3x6msnimax28221baj6g64gg"; system = "cffi-ops"; asd = "cffi-ops"; }); @@ -5618,11 +5730,11 @@ in lib.makeScope pkgs.newScope (self: { }); cffi-tests = (build-asdf-system { pname = "cffi-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cffi-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2023-10-21/cffi-20231021-git.tgz"; - sha256 = "1d4kckxsqpyk3ihjv01c0hhxnswn4fnx4m6257z1dfhwya02s8bk"; + url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz"; + sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7"; system = "cffi-tests"; asd = "cffi-tests"; }); @@ -5634,11 +5746,11 @@ in lib.makeScope pkgs.newScope (self: { }); cffi-toolchain = (build-asdf-system { pname = "cffi-toolchain"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cffi-toolchain" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2023-10-21/cffi-20231021-git.tgz"; - sha256 = "1d4kckxsqpyk3ihjv01c0hhxnswn4fnx4m6257z1dfhwya02s8bk"; + url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz"; + sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7"; system = "cffi-toolchain"; asd = "cffi-toolchain"; }); @@ -5648,11 +5760,11 @@ in lib.makeScope pkgs.newScope (self: { }); cffi-uffi-compat = (build-asdf-system { pname = "cffi-uffi-compat"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cffi-uffi-compat" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2023-10-21/cffi-20231021-git.tgz"; - sha256 = "1d4kckxsqpyk3ihjv01c0hhxnswn4fnx4m6257z1dfhwya02s8bk"; + url = "http://beta.quicklisp.org/archive/cffi/2024-10-12/cffi-20241012-git.tgz"; + sha256 = "1b2j32rapgw8rn7m9sm2k8r8x9jds7vshkm90i5lw9v4xnp8x4m7"; system = "cffi-uffi-compat"; asd = "cffi-uffi-compat"; }); @@ -5758,11 +5870,11 @@ in lib.makeScope pkgs.newScope (self: { }); chanl = (build-asdf-system { pname = "chanl"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "chanl" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/chanl/2023-06-18/chanl-20230618-git.tgz"; - sha256 = "1z9lh7yqkbd5cn2zk5jwrlx1cz1mcz3mrk19wpjxi04x681ib1j5"; + url = "http://beta.quicklisp.org/archive/chanl/2024-10-12/chanl-20241012-git.tgz"; + sha256 = "1gyvsajvqjzfmcbccnysw7qyvhyqdlfcwl57lhsfwz9gif50y1fw"; system = "chanl"; asd = "chanl"; }); @@ -5786,6 +5898,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + charje_dot_documentation = (build-asdf-system { + pname = "charje.documentation"; + version = "20241012-git"; + asds = [ "charje.documentation" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/charje.documentation/2024-10-12/charje.documentation-20241012-git.tgz"; + sha256 = "0rdfi4sj5ad6krwypmsr934ic6y5xlj6iixdwwxrxj9fihfq47zb"; + system = "charje.documentation"; + asd = "charje.documentation"; + }); + systems = [ "charje.documentation" ]; + lispLibs = [ (getAttr "alexandria" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); cheat-js = (build-asdf-system { pname = "cheat-js"; version = "20121013-git"; @@ -6008,6 +6136,38 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + chipi = (build-asdf-system { + pname = "chipi"; + version = "20241012-git"; + asds = [ "chipi" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/chipi/2024-10-12/chipi-20241012-git.tgz"; + sha256 = "0xpfclvl5v031cjnjvr3bcfc87rayw624m9yrw35f5r31p8m283g"; + system = "chipi"; + asd = "chipi"; + }); + systems = [ "chipi" ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "binding-arrows" self) (getAttr "cl-cron" self) (getAttr "drakma" self) (getAttr "local-time" self) (getAttr "parse-float" self) (getAttr "sento" self) (getAttr "timer-wheel" self) (getAttr "yason" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + chipi-web = (build-asdf-system { + pname = "chipi-web"; + version = "20241012-git"; + asds = [ "chipi-web" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/chipi/2024-10-12/chipi-20241012-git.tgz"; + sha256 = "0xpfclvl5v031cjnjvr3bcfc87rayw624m9yrw35f5r31p8m283g"; + system = "chipi-web"; + asd = "chipi-web"; + }); + systems = [ "chipi-web" ]; + lispLibs = [ (getAttr "chipi" self) (getAttr "cl-base64" self) (getAttr "cl-ppcre" self) (getAttr "com_dot_inuoe_dot_jzon" self) (getAttr "drakma" self) (getAttr "hunchentoot" self) (getAttr "ironclad" self) (getAttr "marshal" self) (getAttr "snooze" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); chipmunk-blob = (build-asdf-system { pname = "chipmunk-blob"; version = "stable-git"; @@ -6200,11 +6360,11 @@ in lib.makeScope pkgs.newScope (self: { }); chunga = (build-asdf-system { pname = "chunga"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "chunga" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/chunga/2023-10-21/chunga-20231021-git.tgz"; - sha256 = "0vra4srbnd0qgvvmpk17rqm5i4v01fg1wb411d2jdd4gx9cikkfr"; + url = "http://beta.quicklisp.org/archive/chunga/2024-10-12/chunga-20241012-git.tgz"; + sha256 = "17jswsp31dh1jpg2n60nn34wxf4z6vvxjq1avy50z9fnzywvikyi"; system = "chunga"; asd = "chunga"; }); @@ -6214,11 +6374,11 @@ in lib.makeScope pkgs.newScope (self: { }); ci-utils = (build-asdf-system { pname = "ci-utils"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "ci-utils" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ci-utils/2022-11-06/ci-utils-20221106-git.tgz"; - sha256 = "0srypwhcfwmy6ppv724y0vhm0icninv2zzb2f8h1985zch73cqw3"; + url = "http://beta.quicklisp.org/archive/ci-utils/2024-10-12/ci-utils-20241012-git.tgz"; + sha256 = "1wrr1v2r7kd668hyz54x28xh153l2qkl1gra3bk4wmqi3x7xyxdg"; system = "ci-utils"; asd = "ci-utils"; }); @@ -6230,11 +6390,11 @@ in lib.makeScope pkgs.newScope (self: { }); ci-utils-features = (build-asdf-system { pname = "ci-utils-features"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "ci-utils-features" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ci-utils/2022-11-06/ci-utils-20221106-git.tgz"; - sha256 = "0srypwhcfwmy6ppv724y0vhm0icninv2zzb2f8h1985zch73cqw3"; + url = "http://beta.quicklisp.org/archive/ci-utils/2024-10-12/ci-utils-20241012-git.tgz"; + sha256 = "1wrr1v2r7kd668hyz54x28xh153l2qkl1gra3bk4wmqi3x7xyxdg"; system = "ci-utils-features"; asd = "ci-utils-features"; }); @@ -6246,11 +6406,11 @@ in lib.makeScope pkgs.newScope (self: { }); ciao = (build-asdf-system { pname = "ciao"; - version = "20230215-git"; + version = "20241012-git"; asds = [ "ciao" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ciao/2023-02-15/ciao-20230215-git.tgz"; - sha256 = "1sqp9yisd7j6j5gd2vbid2xvigbhglpj7wwm3glifg1lmmqijnpv"; + url = "http://beta.quicklisp.org/archive/ciao/2024-10-12/ciao-20241012-git.tgz"; + sha256 = "1x443k02kl5iyq6awv2vqm08d9x9f92hjivqv2c5xdamki7y513s"; system = "ciao"; asd = "ciao"; }); @@ -6324,11 +6484,11 @@ in lib.makeScope pkgs.newScope (self: { }); ckr-tables = (build-asdf-system { pname = "ckr-tables"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "ckr-tables" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-critic/2023-10-21/lisp-critic-20231021-git.tgz"; - sha256 = "15zg05pqfs2dhc5j7gfkwjmxawaizjpyb0p7386mpl4w93l9h84l"; + url = "http://beta.quicklisp.org/archive/lisp-critic/2024-10-12/lisp-critic-20241012-git.tgz"; + sha256 = "19czs2m8h3kgwjd10pdk9r5kazbgly8g82a5q3bs7pqkja42i7x7"; system = "ckr-tables"; asd = "ckr-tables"; }); @@ -6370,11 +6530,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-6502 = (build-asdf-system { pname = "cl-6502"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-6502" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-6502/2023-10-21/cl-6502-20231021-git.tgz"; - sha256 = "1ma2i6ljky1zfivrwpra3fmhcm7s2ppi4bxxl7sms8n7gkpkv41s"; + url = "http://beta.quicklisp.org/archive/cl-6502/2024-10-12/cl-6502-20241012-git.tgz"; + sha256 = "1cj38bi12i7ji3m8dd8gxb17dlna2v8s3b3h6b0a9pvmv6wchpmz"; system = "cl-6502"; asd = "cl-6502"; }); @@ -6386,11 +6546,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-aa = (build-asdf-system { pname = "cl-aa"; - version = "20180228-git"; + version = "20241012-git"; asds = [ "cl-aa" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; - sha256 = "0nckw4zb6s96hll8hrxzvgs2an3bfm0pxcywshbm4bq4rn7niqg4"; + url = "http://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz"; + sha256 = "1nkmmn38y6af10ysff3g2qkf5lb2601dcjp5rffsjh6bv2ik2jd5"; system = "cl-aa"; asd = "cl-aa"; }); @@ -6400,11 +6560,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-aa-misc = (build-asdf-system { pname = "cl-aa-misc"; - version = "20180228-git"; + version = "20241012-git"; asds = [ "cl-aa-misc" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; - sha256 = "0nckw4zb6s96hll8hrxzvgs2an3bfm0pxcywshbm4bq4rn7niqg4"; + url = "http://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz"; + sha256 = "1nkmmn38y6af10ysff3g2qkf5lb2601dcjp5rffsjh6bv2ik2jd5"; system = "cl-aa-misc"; asd = "cl-aa-misc"; }); @@ -6496,11 +6656,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-algebraic-data-type = (build-asdf-system { pname = "cl-algebraic-data-type"; - version = "20191007-git"; + version = "20241012-git"; asds = [ "cl-algebraic-data-type" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-algebraic-data-type/2019-10-07/cl-algebraic-data-type-20191007-git.tgz"; - sha256 = "1lnqxcv8pd5z8n0g5p2l0dbljx9pqiv18hxl0vhsh7ldhkrjv2jx"; + url = "http://beta.quicklisp.org/archive/cl-algebraic-data-type/2024-10-12/cl-algebraic-data-type-20241012-git.tgz"; + sha256 = "02bfx9g4267f7f85banmfy15adyvlzaz3flia8zmhlzhpx7j4bj6"; system = "cl-algebraic-data-type"; asd = "cl-algebraic-data-type"; }); @@ -6512,11 +6672,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-all = (build-asdf-system { pname = "cl-all"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-all" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-all/2023-10-21/cl-all-20231021-git.tgz"; - sha256 = "1k8mxj35fcczkz8vwl6yxmbdq5a115ilmk2h4c7qn2sz09qd9j1g"; + url = "http://beta.quicklisp.org/archive/cl-all/2024-10-12/cl-all-20241012-git.tgz"; + sha256 = "02n30b3yp949fxwnb9wr3m9hd5h1kcmxcbjc8c5fj4ihphf8sd7d"; system = "cl-all"; asd = "cl-all"; }); @@ -7562,11 +7722,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-ansi-term = (build-asdf-system { pname = "cl-ansi-term"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "cl-ansi-term" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ansi-term/2021-10-20/cl-ansi-term-20211020-git.tgz"; - sha256 = "1wz8xx1dk5v1v5cvfh4a5cf5mdrn8lnz8mpf55c34inb0bxjlx87"; + url = "http://beta.quicklisp.org/archive/cl-ansi-term/2024-10-12/cl-ansi-term-20241012-git.tgz"; + sha256 = "01nrlyb8lqca9z16ndlyy22wqy83ixcr02yibfypj255x6xbql1x"; system = "cl-ansi-term"; asd = "cl-ansi-term"; }); @@ -7734,6 +7894,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + cl-aseprite = (build-asdf-system { + pname = "cl-aseprite"; + version = "20241012-git"; + asds = [ "cl-aseprite" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-aseprite/2024-10-12/cl-aseprite-20241012-git.tgz"; + sha256 = "0xjrfi232d0my4ncafp1l2yfas8nj0k8nsbppkq70anic5ihbhch"; + system = "cl-aseprite"; + asd = "cl-aseprite"; + }); + systems = [ "cl-aseprite" ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "chipz" self) (getAttr "let-plus" self) (getAttr "lisp-binary" self) (getAttr "trivial-types" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); cl-association-rules = (build-asdf-system { pname = "cl-association-rules"; version = "20170403-git"; @@ -7766,13 +7942,29 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + cl-astar = (build-asdf-system { + pname = "cl-astar"; + version = "20241012-git"; + asds = [ "cl-astar" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-astar/2024-10-12/cl-astar-20241012-git.tgz"; + sha256 = "0fdwyg3xnj5sxn4cqycydg0cp1l3ii0brk7ad1sh28m703zmndxv"; + system = "cl-astar"; + asd = "cl-astar"; + }); + systems = [ "cl-astar" ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "float-features" self) (getAttr "let-plus" self) (getAttr "trivial-adjust-simple-array" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); cl-async = (build-asdf-system { pname = "cl-async"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-async" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-async/2023-10-21/cl-async-20231021-git.tgz"; - sha256 = "0s2ylrwfcnn7c934cd5cv3nswbln0phx2mqviq5ampmghjvjrghy"; + url = "http://beta.quicklisp.org/archive/cl-async/2024-10-12/cl-async-20241012-git.tgz"; + sha256 = "0z0gnwfb0flrxpbjmvzap0kmyz8r898x5jriyna365plc50hlcdr"; system = "cl-async"; asd = "cl-async"; }); @@ -7798,11 +7990,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-async-base = (build-asdf-system { pname = "cl-async-base"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-async-base" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-async/2023-10-21/cl-async-20231021-git.tgz"; - sha256 = "0s2ylrwfcnn7c934cd5cv3nswbln0phx2mqviq5ampmghjvjrghy"; + url = "http://beta.quicklisp.org/archive/cl-async/2024-10-12/cl-async-20241012-git.tgz"; + sha256 = "0z0gnwfb0flrxpbjmvzap0kmyz8r898x5jriyna365plc50hlcdr"; system = "cl-async-base"; asd = "cl-async"; }); @@ -7828,11 +8020,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-async-repl = (build-asdf-system { pname = "cl-async-repl"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-async-repl" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-async/2023-10-21/cl-async-20231021-git.tgz"; - sha256 = "0s2ylrwfcnn7c934cd5cv3nswbln0phx2mqviq5ampmghjvjrghy"; + url = "http://beta.quicklisp.org/archive/cl-async/2024-10-12/cl-async-20241012-git.tgz"; + sha256 = "0z0gnwfb0flrxpbjmvzap0kmyz8r898x5jriyna365plc50hlcdr"; system = "cl-async-repl"; asd = "cl-async-repl"; }); @@ -7842,11 +8034,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-async-ssl = (build-asdf-system { pname = "cl-async-ssl"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-async-ssl" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-async/2023-10-21/cl-async-20231021-git.tgz"; - sha256 = "0s2ylrwfcnn7c934cd5cv3nswbln0phx2mqviq5ampmghjvjrghy"; + url = "http://beta.quicklisp.org/archive/cl-async/2024-10-12/cl-async-20241012-git.tgz"; + sha256 = "0z0gnwfb0flrxpbjmvzap0kmyz8r898x5jriyna365plc50hlcdr"; system = "cl-async-ssl"; asd = "cl-async-ssl"; }); @@ -7856,11 +8048,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-async-test = (build-asdf-system { pname = "cl-async-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-async-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-async/2023-10-21/cl-async-20231021-git.tgz"; - sha256 = "0s2ylrwfcnn7c934cd5cv3nswbln0phx2mqviq5ampmghjvjrghy"; + url = "http://beta.quicklisp.org/archive/cl-async/2024-10-12/cl-async-20241012-git.tgz"; + sha256 = "0z0gnwfb0flrxpbjmvzap0kmyz8r898x5jriyna365plc50hlcdr"; system = "cl-async-test"; asd = "cl-async-test"; }); @@ -7872,11 +8064,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-async-util = (build-asdf-system { pname = "cl-async-util"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-async-util" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-async/2023-10-21/cl-async-20231021-git.tgz"; - sha256 = "0s2ylrwfcnn7c934cd5cv3nswbln0phx2mqviq5ampmghjvjrghy"; + url = "http://beta.quicklisp.org/archive/cl-async/2024-10-12/cl-async-20241012-git.tgz"; + sha256 = "0z0gnwfb0flrxpbjmvzap0kmyz8r898x5jriyna365plc50hlcdr"; system = "cl-async-util"; asd = "cl-async"; }); @@ -7950,11 +8142,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-autowrap = (build-asdf-system { pname = "cl-autowrap"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-autowrap" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-autowrap/2023-10-21/cl-autowrap-20231021-git.tgz"; - sha256 = "063pc7akxbsaayzpgz16dzkh0434s80h61k7mi7xq5isgzfjka2k"; + url = "http://beta.quicklisp.org/archive/cl-autowrap/2024-10-12/cl-autowrap-20241012-git.tgz"; + sha256 = "1sfvhyrwm9dhxi0y42xp7mx8mvs6lmq3bzxdx34frxni5srcgly0"; system = "cl-autowrap"; asd = "cl-autowrap"; }); @@ -7966,11 +8158,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-autowrap-test = (build-asdf-system { pname = "cl-autowrap-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-autowrap-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-autowrap/2023-10-21/cl-autowrap-20231021-git.tgz"; - sha256 = "063pc7akxbsaayzpgz16dzkh0434s80h61k7mi7xq5isgzfjka2k"; + url = "http://beta.quicklisp.org/archive/cl-autowrap/2024-10-12/cl-autowrap-20241012-git.tgz"; + sha256 = "1sfvhyrwm9dhxi0y42xp7mx8mvs6lmq3bzxdx34frxni5srcgly0"; system = "cl-autowrap-test"; asd = "cl-autowrap-test"; }); @@ -8014,11 +8206,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-base32 = (build-asdf-system { pname = "cl-base32"; - version = "20130420-git"; + version = "20241012-git"; asds = [ "cl-base32" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-base32/2013-04-20/cl-base32-20130420-git.tgz"; - sha256 = "17jrng8jb05d64ggyd11hp308c2fl5drvf9g175blgrkkl8l4mf8"; + url = "http://beta.quicklisp.org/archive/cl-base32/2024-10-12/cl-base32-20241012-git.tgz"; + sha256 = "0kc0rxwx2ak5kvrzl8y8x3csm0d6appi5k0as2jgm3ig5vgcs5cn"; system = "cl-base32"; asd = "cl-base32"; }); @@ -8028,22 +8220,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - cl-base32-tests = (build-asdf-system { - pname = "cl-base32-tests"; - version = "20130420-git"; - asds = [ "cl-base32-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-base32/2013-04-20/cl-base32-20130420-git.tgz"; - sha256 = "17jrng8jb05d64ggyd11hp308c2fl5drvf9g175blgrkkl8l4mf8"; - system = "cl-base32-tests"; - asd = "cl-base32"; - }); - systems = [ "cl-base32-tests" ]; - lispLibs = [ (getAttr "cl-base32" self) (getAttr "lisp-unit" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); cl-base58 = (build-asdf-system { pname = "cl-base58"; version = "20150113-git"; @@ -8220,11 +8396,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-bmp = (build-asdf-system { pname = "cl-bmp"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-bmp" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bmp/2023-10-21/cl-bmp-20231021-git.tgz"; - sha256 = "1khicvwhbfpbaywdc0m1lpcqai6lf7cvy4idahaahk5704dlb3l0"; + url = "http://beta.quicklisp.org/archive/cl-bmp/2024-10-12/cl-bmp-20241012-git.tgz"; + sha256 = "1mcayxjppka40q9xx1qwdvrjjblclnggnicg70i95xqnv5sdwdhz"; system = "cl-bmp"; asd = "cl-bmp"; }); @@ -8236,27 +8412,27 @@ in lib.makeScope pkgs.newScope (self: { }); cl-bnf = (build-asdf-system { pname = "cl-bnf"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "cl-bnf" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bnf/2023-02-14/cl-bnf-20230214-git.tgz"; - sha256 = "05lskaz5kwl4sk8mb13l4kvr3q0q56dyarmznpp1cjpan6rdyr4x"; + url = "http://beta.quicklisp.org/archive/cl-bnf/2024-10-12/cl-bnf-20241012-git.tgz"; + sha256 = "0aa7hnkj71f37lxzlhsppwcmk3yv42hclq08c4jrdnv8jmdb8r0l"; system = "cl-bnf"; asd = "cl-bnf"; }); systems = [ "cl-bnf" ]; - lispLibs = [ ]; + lispLibs = [ (getAttr "flexi-streams" self) (getAttr "utf8-input-stream" self) ]; meta = { hydraPlatforms = [ ]; }; }); cl-bnf-examples = (build-asdf-system { pname = "cl-bnf-examples"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "cl-bnf-examples" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bnf/2023-02-14/cl-bnf-20230214-git.tgz"; - sha256 = "05lskaz5kwl4sk8mb13l4kvr3q0q56dyarmznpp1cjpan6rdyr4x"; + url = "http://beta.quicklisp.org/archive/cl-bnf/2024-10-12/cl-bnf-20241012-git.tgz"; + sha256 = "0aa7hnkj71f37lxzlhsppwcmk3yv42hclq08c4jrdnv8jmdb8r0l"; system = "cl-bnf-examples"; asd = "cl-bnf-examples"; }); @@ -8268,11 +8444,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-bnf-tests = (build-asdf-system { pname = "cl-bnf-tests"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "cl-bnf-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bnf/2023-02-14/cl-bnf-20230214-git.tgz"; - sha256 = "05lskaz5kwl4sk8mb13l4kvr3q0q56dyarmznpp1cjpan6rdyr4x"; + url = "http://beta.quicklisp.org/archive/cl-bnf/2024-10-12/cl-bnf-20241012-git.tgz"; + sha256 = "0aa7hnkj71f37lxzlhsppwcmk3yv42hclq08c4jrdnv8jmdb8r0l"; system = "cl-bnf-tests"; asd = "cl-bnf-tests"; }); @@ -8364,11 +8540,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-brewer-ci = (build-asdf-system { pname = "cl-brewer-ci"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-brewer-ci" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-brewer/2023-10-21/cl-brewer-20231021-git.tgz"; - sha256 = "1xpgy3lci0ip9bwrx8sdwbllgq57mq3apzafxbmci5jdsa2rxh9r"; + url = "http://beta.quicklisp.org/archive/cl-brewer/2024-10-12/cl-brewer-20241012-git.tgz"; + sha256 = "0izf6v4qx82jhk7ln28jhdmnr3lb0r5iqjj0by9igq5sk3y1my4x"; system = "cl-brewer-ci"; asd = "cl-brewer-ci"; }); @@ -8380,11 +8556,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-brewer-deploy-hooks = (build-asdf-system { pname = "cl-brewer-deploy-hooks"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-brewer-deploy-hooks" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-brewer/2023-10-21/cl-brewer-20231021-git.tgz"; - sha256 = "1xpgy3lci0ip9bwrx8sdwbllgq57mq3apzafxbmci5jdsa2rxh9r"; + url = "http://beta.quicklisp.org/archive/cl-brewer/2024-10-12/cl-brewer-20241012-git.tgz"; + sha256 = "0izf6v4qx82jhk7ln28jhdmnr3lb0r5iqjj0by9igq5sk3y1my4x"; system = "cl-brewer-deploy-hooks"; asd = "cl-brewer-deploy-hooks"; }); @@ -8396,11 +8572,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-brewer-tests = (build-asdf-system { pname = "cl-brewer-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-brewer-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-brewer/2023-10-21/cl-brewer-20231021-git.tgz"; - sha256 = "1xpgy3lci0ip9bwrx8sdwbllgq57mq3apzafxbmci5jdsa2rxh9r"; + url = "http://beta.quicklisp.org/archive/cl-brewer/2024-10-12/cl-brewer-20241012-git.tgz"; + sha256 = "0izf6v4qx82jhk7ln28jhdmnr3lb0r5iqjj0by9igq5sk3y1my4x"; system = "cl-brewer-tests"; asd = "cl-brewer-tests"; }); @@ -8412,11 +8588,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-buchberger = (build-asdf-system { pname = "cl-buchberger"; - version = "20201016-git"; + version = "20241012-git"; asds = [ "cl-buchberger" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-buchberger/2020-10-16/cl-buchberger-20201016-git.tgz"; - sha256 = "105kwri3hjla1cydc323y8dfi4cjg0g4hxjzdh13inmvxwcf049w"; + url = "http://beta.quicklisp.org/archive/cl-buchberger/2024-10-12/cl-buchberger-20241012-git.tgz"; + sha256 = "0hn340y52xfgj788zh449jrh7blfv6yqfnkmqg2vghy92s8jcr1i"; system = "cl-buchberger"; asd = "cl-buchberger"; }); @@ -8852,22 +9028,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - cl-cheshire-cat = (build-asdf-system { - pname = "cl-cheshire-cat"; - version = "20121125-git"; - asds = [ "cl-cheshire-cat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cheshire-cat/2012-11-25/cl-cheshire-cat-20121125-git.tgz"; - sha256 = "1kgm1pa2c4r90nfs38x7fsw730nw13z7p6f11rv67hdjcydh2f11"; - system = "cl-cheshire-cat"; - asd = "cl-cheshire-cat"; - }); - systems = [ "cl-cheshire-cat" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-fad" self) (getAttr "cl-ppcre" self) (getAttr "cl-store" self) (getAttr "hunchentoot" self) (getAttr "split-sequence" self) (getAttr "usocket" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); cl-clblas = (build-asdf-system { pname = "cl-clblas"; version = "20181018-git"; @@ -8964,11 +9124,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-collider = (build-asdf-system { pname = "cl-collider"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-collider" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-collider/2023-10-21/cl-collider-20231021-git.tgz"; - sha256 = "1fbqic0w27b5al8vm6zvgfhsq6yjl2zl4ppjmxvyx6pl0i0bm281"; + url = "http://beta.quicklisp.org/archive/cl-collider/2024-10-12/cl-collider-20241012-git.tgz"; + sha256 = "0h0fyx7glxnzwyam2aflma6003h8fcvcf5nj5f7svarw9brcc2xa"; system = "cl-collider"; asd = "cl-collider"; }); @@ -9010,18 +9170,34 @@ in lib.makeScope pkgs.newScope (self: { }); cl-colors2 = (build-asdf-system { pname = "cl-colors2"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-colors2" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-colors2/2023-10-21/cl-colors2-20231021-git.tgz"; - sha256 = "0vjssnsg589db138kgy6wvgbmff27kn895s3zva55kyq62khgj1p"; + url = "http://beta.quicklisp.org/archive/cl-colors2/2024-10-12/cl-colors2-20241012-git.tgz"; + sha256 = "053bidgbqziv5visdq09gy8zf30cvqh1w06l23yygn1yrg7m7302"; system = "cl-colors2"; asd = "cl-colors2"; }); systems = [ "cl-colors2" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-ppcre" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-ppcre" self) (getAttr "parse-number" self) ]; meta = {}; }); + cl-concord = (build-asdf-system { + pname = "cl-concord"; + version = "20241012-git"; + asds = [ "cl-concord" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-concord/2024-10-12/cl-concord-20241012-git.tgz"; + sha256 = "01i13lp3z2v2w165h0xh72r1vyfbjr6k1gwk4hff1rf2yx2yg9k1"; + system = "cl-concord"; + asd = "cl-concord"; + }); + systems = [ "cl-concord" ]; + lispLibs = [ (getAttr "cl-redis" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); cl-conllu = (build-asdf-system { pname = "cl-conllu"; version = "20211209-git"; @@ -9104,11 +9280,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-containers = (build-asdf-system { pname = "cl-containers"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-containers" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-containers/2023-10-21/cl-containers-20231021-git.tgz"; - sha256 = "1nrql8s1j123v5gscy99lxvhlzp0ijig9x94w30v3lwfa58hf90l"; + url = "http://beta.quicklisp.org/archive/cl-containers/2024-10-12/cl-containers-20241012-git.tgz"; + sha256 = "0xpa5yhsndh33cs4q6vgjc8jxwlmv8lxkg4bamfi0f3ad4smi7zl"; system = "cl-containers"; asd = "cl-containers"; }); @@ -9118,11 +9294,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-containers-test = (build-asdf-system { pname = "cl-containers-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-containers-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-containers/2023-10-21/cl-containers-20231021-git.tgz"; - sha256 = "1nrql8s1j123v5gscy99lxvhlzp0ijig9x94w30v3lwfa58hf90l"; + url = "http://beta.quicklisp.org/archive/cl-containers/2024-10-12/cl-containers-20241012-git.tgz"; + sha256 = "0xpa5yhsndh33cs4q6vgjc8jxwlmv8lxkg4bamfi0f3ad4smi7zl"; system = "cl-containers-test"; asd = "cl-containers-test"; }); @@ -9134,11 +9310,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-cookie = (build-asdf-system { pname = "cl-cookie"; - version = "20220707-git"; + version = "20241012-git"; asds = [ "cl-cookie" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cookie/2022-07-07/cl-cookie-20220707-git.tgz"; - sha256 = "07hqamcdpdxmx2j7prawgl6cdr13b2jbrhrrhfik5n00ah4yw524"; + url = "http://beta.quicklisp.org/archive/cl-cookie/2024-10-12/cl-cookie-20241012-git.tgz"; + sha256 = "172lw0sm6i9nvlx0iv0851rsm5pc28xqqf6a75pwv1fvr6srq8qh"; system = "cl-cookie"; asd = "cl-cookie"; }); @@ -9148,16 +9324,16 @@ in lib.makeScope pkgs.newScope (self: { }); cl-cookie-test = (build-asdf-system { pname = "cl-cookie-test"; - version = "20220707-git"; + version = "20241012-git"; asds = [ "cl-cookie-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cookie/2022-07-07/cl-cookie-20220707-git.tgz"; - sha256 = "07hqamcdpdxmx2j7prawgl6cdr13b2jbrhrrhfik5n00ah4yw524"; + url = "http://beta.quicklisp.org/archive/cl-cookie/2024-10-12/cl-cookie-20241012-git.tgz"; + sha256 = "172lw0sm6i9nvlx0iv0851rsm5pc28xqqf6a75pwv1fvr6srq8qh"; system = "cl-cookie-test"; asd = "cl-cookie-test"; }); systems = [ "cl-cookie-test" ]; - lispLibs = [ (getAttr "cl-cookie" self) (getAttr "prove" self) (getAttr "prove-asdf" self) ]; + lispLibs = [ (getAttr "cl-cookie" self) (getAttr "rove" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -9354,11 +9530,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-csv = (build-asdf-system { pname = "cl-csv"; - version = "20201016-git"; + version = "20241012-git"; asds = [ "cl-csv" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz"; - sha256 = "0gcmlbwx5m3kwgk12qi80w08ak8fgdnvyia429fz6gnxmhg0k54x"; + url = "http://beta.quicklisp.org/archive/cl-csv/2024-10-12/cl-csv-20241012-git.tgz"; + sha256 = "0pb89l3bi2cnk7sav2w0dmlvjxij1wpy3w6n9c4b6imjs0pznrxi"; system = "cl-csv"; asd = "cl-csv"; }); @@ -9368,11 +9544,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-csv-clsql = (build-asdf-system { pname = "cl-csv-clsql"; - version = "20201016-git"; + version = "20241012-git"; asds = [ "cl-csv-clsql" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz"; - sha256 = "0gcmlbwx5m3kwgk12qi80w08ak8fgdnvyia429fz6gnxmhg0k54x"; + url = "http://beta.quicklisp.org/archive/cl-csv/2024-10-12/cl-csv-20241012-git.tgz"; + sha256 = "0pb89l3bi2cnk7sav2w0dmlvjxij1wpy3w6n9c4b6imjs0pznrxi"; system = "cl-csv-clsql"; asd = "cl-csv-clsql"; }); @@ -9384,11 +9560,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-csv-data-table = (build-asdf-system { pname = "cl-csv-data-table"; - version = "20201016-git"; + version = "20241012-git"; asds = [ "cl-csv-data-table" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz"; - sha256 = "0gcmlbwx5m3kwgk12qi80w08ak8fgdnvyia429fz6gnxmhg0k54x"; + url = "http://beta.quicklisp.org/archive/cl-csv/2024-10-12/cl-csv-20241012-git.tgz"; + sha256 = "0pb89l3bi2cnk7sav2w0dmlvjxij1wpy3w6n9c4b6imjs0pznrxi"; system = "cl-csv-data-table"; asd = "cl-csv-data-table"; }); @@ -9478,11 +9654,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-custom-hash-table = (build-asdf-system { pname = "cl-custom-hash-table"; - version = "20201220-git"; + version = "20241012-git"; asds = [ "cl-custom-hash-table" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-custom-hash-table/2020-12-20/cl-custom-hash-table-20201220-git.tgz"; - sha256 = "1lyp3lhqq3p2n04agaar5v50ai3vd6zvi6yq4phw3fcl2jzdjhk3"; + url = "http://beta.quicklisp.org/archive/cl-custom-hash-table/2024-10-12/cl-custom-hash-table-20241012-git.tgz"; + sha256 = "1sb5anv9kh7wv165nra95v0qkk1gvp3mn461zi7m0fla1290g598"; system = "cl-custom-hash-table"; asd = "cl-custom-hash-table"; }); @@ -9492,11 +9668,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-custom-hash-table-test = (build-asdf-system { pname = "cl-custom-hash-table-test"; - version = "20201220-git"; + version = "20241012-git"; asds = [ "cl-custom-hash-table-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-custom-hash-table/2020-12-20/cl-custom-hash-table-20201220-git.tgz"; - sha256 = "1lyp3lhqq3p2n04agaar5v50ai3vd6zvi6yq4phw3fcl2jzdjhk3"; + url = "http://beta.quicklisp.org/archive/cl-custom-hash-table/2024-10-12/cl-custom-hash-table-20241012-git.tgz"; + sha256 = "1sb5anv9kh7wv165nra95v0qkk1gvp3mn461zi7m0fla1290g598"; system = "cl-custom-hash-table-test"; asd = "cl-custom-hash-table-test"; }); @@ -9506,45 +9682,13 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - cl-darksky = (build-asdf-system { - pname = "cl-darksky"; - version = "20180711-git"; - asds = [ "cl-darksky" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-darksky/2018-07-11/cl-darksky-20180711-git.tgz"; - sha256 = "049rziv10z0ygvm0fi98jlxdd5xcqf9gp6ah7jwn9bcxwg5y0wcf"; - system = "cl-darksky"; - asd = "cl-darksky"; - }); - systems = [ "cl-darksky" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "dexador" self) (getAttr "jonathan" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - cl-darksky-test = (build-asdf-system { - pname = "cl-darksky-test"; - version = "20180711-git"; - asds = [ "cl-darksky-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-darksky/2018-07-11/cl-darksky-20180711-git.tgz"; - sha256 = "049rziv10z0ygvm0fi98jlxdd5xcqf9gp6ah7jwn9bcxwg5y0wcf"; - system = "cl-darksky-test"; - asd = "cl-darksky-test"; - }); - systems = [ "cl-darksky-test" ]; - lispLibs = [ (getAttr "cl-darksky" self) (getAttr "prove" self) (getAttr "prove-asdf" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); cl-data-structures = (build-asdf-system { pname = "cl-data-structures"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-data-structures" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-data-structures/2023-10-21/cl-data-structures-20231021-git.tgz"; - sha256 = "0bj8758yrvxvinj8lc7rr4ni7i5y3bkx8y4dzy2dayh64xkq30ca"; + url = "http://beta.quicklisp.org/archive/cl-data-structures/2024-10-12/cl-data-structures-20241012-git.tgz"; + sha256 = "0h49h1x9dgr53imj0r4lgx0zvdsv3mnh7lyayzy9hlysy2ixp425"; system = "cl-data-structures"; asd = "cl-data-structures"; }); @@ -9556,11 +9700,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-data-structures-tests = (build-asdf-system { pname = "cl-data-structures-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-data-structures-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-data-structures/2023-10-21/cl-data-structures-20231021-git.tgz"; - sha256 = "0bj8758yrvxvinj8lc7rr4ni7i5y3bkx8y4dzy2dayh64xkq30ca"; + url = "http://beta.quicklisp.org/archive/cl-data-structures/2024-10-12/cl-data-structures-20241012-git.tgz"; + sha256 = "0h49h1x9dgr53imj0r4lgx0zvdsv3mnh7lyayzy9hlysy2ixp425"; system = "cl-data-structures-tests"; asd = "cl-data-structures-tests"; }); @@ -9588,11 +9732,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-dbi = (build-asdf-system { pname = "cl-dbi"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-dbi" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dbi/2023-10-21/cl-dbi-20231021-git.tgz"; - sha256 = "1jjm2hh8vvbdblhsms6nrb5gll8ng7pqyv99zj6zk2f5h5a42a2l"; + url = "http://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; + sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy"; system = "cl-dbi"; asd = "cl-dbi"; }); @@ -9712,11 +9856,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-digraph = (build-asdf-system { pname = "cl-digraph"; - version = "20231021-hg"; + version = "20241012-hg"; asds = [ "cl-digraph" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-digraph/2023-10-21/cl-digraph-20231021-hg.tgz"; - sha256 = "0ls4lz5d143d4dnby2cyz8p0yipmfag4jvinblffin520an92x63"; + url = "http://beta.quicklisp.org/archive/cl-digraph/2024-10-12/cl-digraph-20241012-hg.tgz"; + sha256 = "18avbb608rv5radbczilfzb2857wz7pad49hwhr5za5qycjam8ss"; system = "cl-digraph"; asd = "cl-digraph"; }); @@ -9726,11 +9870,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-digraph_dot_dot = (build-asdf-system { pname = "cl-digraph.dot"; - version = "20231021-hg"; + version = "20241012-hg"; asds = [ "cl-digraph.dot" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-digraph/2023-10-21/cl-digraph-20231021-hg.tgz"; - sha256 = "0ls4lz5d143d4dnby2cyz8p0yipmfag4jvinblffin520an92x63"; + url = "http://beta.quicklisp.org/archive/cl-digraph/2024-10-12/cl-digraph-20241012-hg.tgz"; + sha256 = "18avbb608rv5radbczilfzb2857wz7pad49hwhr5za5qycjam8ss"; system = "cl-digraph.dot"; asd = "cl-digraph.dot"; }); @@ -9740,6 +9884,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + cl-digraph_dot_test = (build-asdf-system { + pname = "cl-digraph.test"; + version = "20241012-hg"; + asds = [ "cl-digraph.test" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-digraph/2024-10-12/cl-digraph-20241012-hg.tgz"; + sha256 = "18avbb608rv5radbczilfzb2857wz7pad49hwhr5za5qycjam8ss"; + system = "cl-digraph.test"; + asd = "cl-digraph.test"; + }); + systems = [ "cl-digraph.test" ]; + lispLibs = [ (getAttr "_1am" self) (getAttr "alexandria" self) (getAttr "cl-digraph" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); cl-diskspace = (build-asdf-system { pname = "cl-diskspace"; version = "20220331-git"; @@ -9822,11 +9982,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-dot = (build-asdf-system { pname = "cl-dot"; - version = "20220707-git"; + version = "20241012-git"; asds = [ "cl-dot" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dot/2022-07-07/cl-dot-20220707-git.tgz"; - sha256 = "0mcvzqfcg5rzr8rz8aa2yr2jl3ifflaksvps08zj71hbhiacqpxa"; + url = "http://beta.quicklisp.org/archive/cl-dot/2024-10-12/cl-dot-20241012-git.tgz"; + sha256 = "1874jsc51pkyh6rz27qdhhsdyzx1mr7zx7v65m849wp49qlxs1ya"; system = "cl-dot"; asd = "cl-dot"; }); @@ -10122,11 +10282,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-environments = (build-asdf-system { pname = "cl-environments"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "cl-environments" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-environments/2021-10-20/cl-environments-20211020-git.tgz"; - sha256 = "0k3f1sldd6nwphz80vc4k28z9g56rylln4admag628cyswx4qz99"; + url = "http://beta.quicklisp.org/archive/cl-environments/2024-10-12/cl-environments-20241012-git.tgz"; + sha256 = "0pafk4c0qdzqp0l23fi1pgrqycbcrwm51wq0x0jvr7975yfx2lim"; system = "cl-environments"; asd = "cl-environments"; }); @@ -10134,22 +10294,6 @@ in lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "alexandria" self) (getAttr "anaphora" self) (getAttr "collectors" self) (getAttr "optima" self) (getAttr "parse-declarations-1_dot_0" self) ]; meta = {}; }); - cl-epoch = (build-asdf-system { - pname = "cl-epoch"; - version = "20181210-git"; - asds = [ "cl-epoch" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-epoch/2018-12-10/cl-epoch-20181210-git.tgz"; - sha256 = "091p6j5l85afzcm3m9myxzr8j3hiwh0iyj8w0sgld85n2ykbbird"; - system = "cl-epoch"; - asd = "cl-epoch"; - }); - systems = [ "cl-epoch" ]; - lispLibs = [ ]; - meta = { - hydraPlatforms = [ ]; - }; - }); cl-etcd = (build-asdf-system { pname = "cl-etcd"; version = "20230214-git"; @@ -10278,11 +10422,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-fast-ecs = (build-asdf-system { pname = "cl-fast-ecs"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-fast-ecs" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fast-ecs/2023-10-21/cl-fast-ecs-20231021-git.tgz"; - sha256 = "0p959baqzjw6jkannffrhbv8ab2wf19vh384xbqs66ijr7llgqx9"; + url = "http://beta.quicklisp.org/archive/cl-fast-ecs/2024-10-12/cl-fast-ecs-20241012-git.tgz"; + sha256 = "0hwprzq6dnbfh4y08db615gzpdpr8vphy27whgsjhyg980503hxv"; system = "cl-fast-ecs"; asd = "cl-fast-ecs"; }); @@ -10292,6 +10436,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + cl-fastcgi = (build-asdf-system { + pname = "cl-fastcgi"; + version = "20241012-git"; + asds = [ "cl-fastcgi" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-fastcgi/2024-10-12/cl-fastcgi-20241012-git.tgz"; + sha256 = "0hf6a8jrz8dx91px8q4201k3y919ls7cgn4qjmkqxqhjk2gxy5k7"; + system = "cl-fastcgi"; + asd = "cl-fastcgi"; + }); + systems = [ "cl-fastcgi" ]; + lispLibs = [ (getAttr "cffi" self) (getAttr "usocket" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); cl-fbclient = (build-asdf-system { pname = "cl-fbclient"; version = "20140113-git"; @@ -10310,11 +10470,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-fbx = (build-asdf-system { pname = "cl-fbx"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-fbx" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fbx/2023-10-21/cl-fbx-20231021-git.tgz"; - sha256 = "1jzxjb9bf1hfa1d75npapprfvzxn4z939vghwmnkmf9w7q9f1nys"; + url = "http://beta.quicklisp.org/archive/cl-fbx/2024-10-12/cl-fbx-20241012-git.tgz"; + sha256 = "1g6s3ili3fcxy37g34ykmf2zc6nm70sh5q0diqbikikaly8kfi50"; system = "cl-fbx"; asd = "cl-fbx"; }); @@ -10454,16 +10614,16 @@ in lib.makeScope pkgs.newScope (self: { }); cl-fluent-logger = (build-asdf-system { pname = "cl-fluent-logger"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "cl-fluent-logger" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fluent-logger/2021-10-20/cl-fluent-logger-20211020-git.tgz"; - sha256 = "14q7ymdg3hsri2z2c8fb1syqgdlk8b288v4gw645dbaxfpava2qq"; + url = "http://beta.quicklisp.org/archive/cl-fluent-logger/2024-10-12/cl-fluent-logger-20241012-git.tgz"; + sha256 = "0dqmx28d49fraqymrvaxq19d1x5nd6sb30bza7s9vgcyz404hzg4"; system = "cl-fluent-logger"; asd = "cl-fluent-logger"; }); systems = [ "cl-fluent-logger" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "cl-messagepack" self) (getAttr "jonathan" self) (getAttr "local-time" self) (getAttr "pack" self) (getAttr "usocket" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "chanl" self) (getAttr "cl-messagepack" self) (getAttr "jonathan" self) (getAttr "local-time" self) (getAttr "pack" self) (getAttr "usocket" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -10534,11 +10694,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-form-types = (build-asdf-system { pname = "cl-form-types"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "cl-form-types" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-form-types/2023-06-18/cl-form-types-20230618-git.tgz"; - sha256 = "0755anv54zlk3cdxw972x4i353zwzwckm6ybda8hk07akgryqqfk"; + url = "http://beta.quicklisp.org/archive/cl-form-types/2024-10-12/cl-form-types-20241012-git.tgz"; + sha256 = "1qc9dy9ji14nz5k2i17idbfks3ddwrwy9bf60rq95pnngkzqs3d1"; system = "cl-form-types"; asd = "cl-form-types"; }); @@ -10548,11 +10708,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-forms = (build-asdf-system { pname = "cl-forms"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-forms" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-forms/2023-10-21/cl-forms-20231021-git.tgz"; - sha256 = "1n0hix49jx172xcvjns8lpnxkd44kp0xsvwr5sr65vw6l74323br"; + url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz"; + sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc"; system = "cl-forms"; asd = "cl-forms"; }); @@ -10562,13 +10722,29 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + cl-forms_dot_demo = (build-asdf-system { + pname = "cl-forms.demo"; + version = "20241012-git"; + asds = [ "cl-forms.demo" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz"; + sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc"; + system = "cl-forms.demo"; + asd = "cl-forms.demo"; + }); + systems = [ "cl-forms.demo" ]; + lispLibs = [ (getAttr "cl-css" self) (getAttr "cl-forms" self) (getAttr "cl-forms_dot_djula" self) (getAttr "cl-forms_dot_test" self) (getAttr "cl-forms_dot_who" self) (getAttr "cl-forms_dot_who_dot_bootstrap" self) (getAttr "cl-who" self) (getAttr "djula" self) (getAttr "hunchentoot" self) (getAttr "trivial-open-browser" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); cl-forms_dot_djula = (build-asdf-system { pname = "cl-forms.djula"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-forms.djula" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-forms/2023-10-21/cl-forms-20231021-git.tgz"; - sha256 = "1n0hix49jx172xcvjns8lpnxkd44kp0xsvwr5sr65vw6l74323br"; + url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz"; + sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc"; system = "cl-forms.djula"; asd = "cl-forms.djula"; }); @@ -10580,11 +10756,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-forms_dot_peppol = (build-asdf-system { pname = "cl-forms.peppol"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-forms.peppol" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-forms/2023-10-21/cl-forms-20231021-git.tgz"; - sha256 = "1n0hix49jx172xcvjns8lpnxkd44kp0xsvwr5sr65vw6l74323br"; + url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz"; + sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc"; system = "cl-forms.peppol"; asd = "cl-forms.peppol"; }); @@ -10596,11 +10772,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-forms_dot_test = (build-asdf-system { pname = "cl-forms.test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-forms.test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-forms/2023-10-21/cl-forms-20231021-git.tgz"; - sha256 = "1n0hix49jx172xcvjns8lpnxkd44kp0xsvwr5sr65vw6l74323br"; + url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz"; + sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc"; system = "cl-forms.test"; asd = "cl-forms.test"; }); @@ -10612,11 +10788,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-forms_dot_who = (build-asdf-system { pname = "cl-forms.who"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-forms.who" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-forms/2023-10-21/cl-forms-20231021-git.tgz"; - sha256 = "1n0hix49jx172xcvjns8lpnxkd44kp0xsvwr5sr65vw6l74323br"; + url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz"; + sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc"; system = "cl-forms.who"; asd = "cl-forms.who"; }); @@ -10628,11 +10804,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-forms_dot_who_dot_bootstrap = (build-asdf-system { pname = "cl-forms.who.bootstrap"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-forms.who.bootstrap" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-forms/2023-10-21/cl-forms-20231021-git.tgz"; - sha256 = "1n0hix49jx172xcvjns8lpnxkd44kp0xsvwr5sr65vw6l74323br"; + url = "http://beta.quicklisp.org/archive/cl-forms/2024-10-12/cl-forms-20241012-git.tgz"; + sha256 = "19ldfrsa0nvbr0mlzy4cm9fmvxfmh6x9cn0nawaypbsrwpybfslc"; system = "cl-forms.who.bootstrap"; asd = "cl-forms.who.bootstrap"; }); @@ -10660,11 +10836,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-freetype2 = (build-asdf-system { pname = "cl-freetype2"; - version = "20220707-git"; + version = "20241012-git"; asds = [ "cl-freetype2" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-freetype2/2022-07-07/cl-freetype2-20220707-git.tgz"; - sha256 = "1nhq3qslja0bcgpbmzfycqhd4vw1l58zh4ia15m1h6535qxliy0q"; + url = "http://beta.quicklisp.org/archive/cl-freetype2/2024-10-12/cl-freetype2-20241012-git.tgz"; + sha256 = "00lkmawhjgqzfrsaaqmnffm7mmn3b31gzwz8g51kdjm9s16vwpjs"; system = "cl-freetype2"; asd = "cl-freetype2"; }); @@ -10674,11 +10850,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-freetype2-tests = (build-asdf-system { pname = "cl-freetype2-tests"; - version = "20220707-git"; + version = "20241012-git"; asds = [ "cl-freetype2-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-freetype2/2022-07-07/cl-freetype2-20220707-git.tgz"; - sha256 = "1nhq3qslja0bcgpbmzfycqhd4vw1l58zh4ia15m1h6535qxliy0q"; + url = "http://beta.quicklisp.org/archive/cl-freetype2/2024-10-12/cl-freetype2-20241012-git.tgz"; + sha256 = "00lkmawhjgqzfrsaaqmnffm7mmn3b31gzwz8g51kdjm9s16vwpjs"; system = "cl-freetype2-tests"; asd = "cl-freetype2-tests"; }); @@ -10780,11 +10956,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-gamepad = (build-asdf-system { pname = "cl-gamepad"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-gamepad" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gamepad/2023-10-21/cl-gamepad-20231021-git.tgz"; - sha256 = "1kwwrbhp0bw6mrhx9y79zgx3k4m81qyjbgdbr0fks9gs0wbj8kp6"; + url = "http://beta.quicklisp.org/archive/cl-gamepad/2024-10-12/cl-gamepad-20241012-git.tgz"; + sha256 = "015qx89rnkkqaa6qsl78zvb3sb1m4xdgjpgzn5ip5i27gw94770g"; system = "cl-gamepad"; asd = "cl-gamepad"; }); @@ -11194,11 +11370,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-github-v3 = (build-asdf-system { pname = "cl-github-v3"; - version = "20191227-git"; + version = "20241012-git"; asds = [ "cl-github-v3" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-github-v3/2019-12-27/cl-github-v3-20191227-git.tgz"; - sha256 = "1xwfw6y3vm7236rd6pdmb5akk63gpzhllx99mv4r7ia3yyf9d4f8"; + url = "http://beta.quicklisp.org/archive/cl-github-v3/2024-10-12/cl-github-v3-20241012-git.tgz"; + sha256 = "0ayhnildyjjmnyk0a1sx7qxg6vq9kcggaprqf37s5qi4kadvcsr2"; system = "cl-github-v3"; asd = "cl-github-v3"; }); @@ -16842,11 +17018,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-gltf = (build-asdf-system { pname = "cl-gltf"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-gltf" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gltf/2023-10-21/cl-gltf-20231021-git.tgz"; - sha256 = "1pn1jqdyai2q8pq7ldgcpc13c8k3amarx4q8g19jpr2rngp92w9a"; + url = "http://beta.quicklisp.org/archive/cl-gltf/2024-10-12/cl-gltf-20241012-git.tgz"; + sha256 = "0s7q6zsy85wryy3wb2hn3nprh1m4vmjzsai1mdcqlhzqyh5rm6jq"; system = "cl-gltf"; asd = "cl-gltf"; }); @@ -16858,11 +17034,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-glu = (build-asdf-system { pname = "cl-glu"; - version = "20191130-git"; + version = "20241012-git"; asds = [ "cl-glu" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-opengl/2019-11-30/cl-opengl-20191130-git.tgz"; - sha256 = "0mhqmll09f079pnd6mgswz9nvr6h5n27d4q7zpmm2igf1v460id7"; + url = "http://beta.quicklisp.org/archive/cl-opengl/2024-10-12/cl-opengl-20241012-git.tgz"; + sha256 = "1xpa3x9fx7wxrs5xmkj13yzh2wjfnlb0ihirfr9clngpv1y4gcm6"; system = "cl-glu"; asd = "cl-glu"; }); @@ -16874,11 +17050,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-glut = (build-asdf-system { pname = "cl-glut"; - version = "20191130-git"; + version = "20241012-git"; asds = [ "cl-glut" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-opengl/2019-11-30/cl-opengl-20191130-git.tgz"; - sha256 = "0mhqmll09f079pnd6mgswz9nvr6h5n27d4q7zpmm2igf1v460id7"; + url = "http://beta.quicklisp.org/archive/cl-opengl/2024-10-12/cl-opengl-20241012-git.tgz"; + sha256 = "1xpa3x9fx7wxrs5xmkj13yzh2wjfnlb0ihirfr9clngpv1y4gcm6"; system = "cl-glut"; asd = "cl-glut"; }); @@ -16890,11 +17066,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-glut-examples = (build-asdf-system { pname = "cl-glut-examples"; - version = "20191130-git"; + version = "20241012-git"; asds = [ "cl-glut-examples" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-opengl/2019-11-30/cl-opengl-20191130-git.tgz"; - sha256 = "0mhqmll09f079pnd6mgswz9nvr6h5n27d4q7zpmm2igf1v460id7"; + url = "http://beta.quicklisp.org/archive/cl-opengl/2024-10-12/cl-opengl-20241012-git.tgz"; + sha256 = "1xpa3x9fx7wxrs5xmkj13yzh2wjfnlb0ihirfr9clngpv1y4gcm6"; system = "cl-glut-examples"; asd = "cl-glut-examples"; }); @@ -16922,11 +17098,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-gobject-introspection = (build-asdf-system { pname = "cl-gobject-introspection"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-gobject-introspection" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gobject-introspection/2023-10-21/cl-gobject-introspection-20231021-git.tgz"; - sha256 = "0xwmj4b3whz12i474g54krp1v6h0fpvsx8lgwpk6rkli9xc71wc3"; + url = "http://beta.quicklisp.org/archive/cl-gobject-introspection/2024-10-12/cl-gobject-introspection-20241012-git.tgz"; + sha256 = "0iw8fciydh9bi2svq30hi029df16arpspk0mjzh0cm1c6kjm9dcj"; system = "cl-gobject-introspection"; asd = "cl-gobject-introspection"; }); @@ -16936,11 +17112,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-gobject-introspection-test = (build-asdf-system { pname = "cl-gobject-introspection-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-gobject-introspection-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gobject-introspection/2023-10-21/cl-gobject-introspection-20231021-git.tgz"; - sha256 = "0xwmj4b3whz12i474g54krp1v6h0fpvsx8lgwpk6rkli9xc71wc3"; + url = "http://beta.quicklisp.org/archive/cl-gobject-introspection/2024-10-12/cl-gobject-introspection-20241012-git.tgz"; + sha256 = "0iw8fciydh9bi2svq30hi029df16arpspk0mjzh0cm1c6kjm9dcj"; system = "cl-gobject-introspection-test"; asd = "cl-gobject-introspection-test"; }); @@ -16966,6 +17142,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + cl-gog-galaxy = (build-asdf-system { + pname = "cl-gog-galaxy"; + version = "20241012-git"; + asds = [ "cl-gog-galaxy" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-gog-galaxy/2024-10-12/cl-gog-galaxy-20241012-git.tgz"; + sha256 = "0pb8q4q1gj4n8ll5cglip4rl9gqy8y0g9kpqn2xkc3lssvxkkh63"; + system = "cl-gog-galaxy"; + asd = "cl-gog-galaxy"; + }); + systems = [ "cl-gog-galaxy" ]; + lispLibs = [ (getAttr "cffi" self) (getAttr "documentation-utils" self) (getAttr "trivial-features" self) (getAttr "trivial-indent" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); cl-gopher = (build-asdf-system { pname = "cl-gopher"; version = "20231021-git"; @@ -17000,11 +17192,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-graph = (build-asdf-system { pname = "cl-graph"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "cl-graph" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-graph/2023-02-14/cl-graph-20230214-git.tgz"; - sha256 = "0g1abkph9zb0m9zz6q2471ml9q9acdhwyapk8ra3bisqpwlxvpyf"; + url = "http://beta.quicklisp.org/archive/cl-graph/2024-10-12/cl-graph-20241012-git.tgz"; + sha256 = "1adwlkj2qp73irsswfi50ayjvz3di8fh1sqavsdl7l2d6k7yipdg"; system = "cl-graph"; asd = "cl-graph"; }); @@ -17016,11 +17208,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-graph_plus_hu_dot_dwim_dot_graphviz = (build-asdf-system { pname = "cl-graph+hu.dwim.graphviz"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "cl-graph+hu.dwim.graphviz" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-graph/2023-02-14/cl-graph-20230214-git.tgz"; - sha256 = "0g1abkph9zb0m9zz6q2471ml9q9acdhwyapk8ra3bisqpwlxvpyf"; + url = "http://beta.quicklisp.org/archive/cl-graph/2024-10-12/cl-graph-20241012-git.tgz"; + sha256 = "1adwlkj2qp73irsswfi50ayjvz3di8fh1sqavsdl7l2d6k7yipdg"; system = "cl-graph+hu.dwim.graphviz"; asd = "cl-graph+hu.dwim.graphviz"; }); @@ -17032,11 +17224,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-grip = (build-asdf-system { pname = "cl-grip"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "cl-grip" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-grip/2021-10-20/cl-grip-20211020-git.tgz"; - sha256 = "1qplxq5082wai2blmq29a852jv5kdzwc8n9qlv0kqysjppph0hqz"; + url = "http://beta.quicklisp.org/archive/cl-grip/2024-10-12/cl-grip-20241012-git.tgz"; + sha256 = "0k9qg6pdj4xs5rshf78jmiasyqj4sy5r5hhrccskfsajw6wfmbc9"; system = "cl-grip"; asd = "cl-grip"; }); @@ -17250,11 +17442,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-hash-util = (build-asdf-system { pname = "cl-hash-util"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-hash-util" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-hash-util/2023-10-21/cl-hash-util-20231021-git.tgz"; - sha256 = "1xaqj5nd9qrd8xy8r88j90qq9fl6mhfrdvhfg5qhz42igr7mjnh3"; + url = "http://beta.quicklisp.org/archive/cl-hash-util/2024-10-12/cl-hash-util-20241012-git.tgz"; + sha256 = "1xab7v2mav241rs8w68qmg485g4f75nrac3hjcnm0cb19ickbs1m"; system = "cl-hash-util"; asd = "cl-hash-util"; }); @@ -17266,11 +17458,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-hash-util-test = (build-asdf-system { pname = "cl-hash-util-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-hash-util-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-hash-util/2023-10-21/cl-hash-util-20231021-git.tgz"; - sha256 = "1xaqj5nd9qrd8xy8r88j90qq9fl6mhfrdvhfg5qhz42igr7mjnh3"; + url = "http://beta.quicklisp.org/archive/cl-hash-util/2024-10-12/cl-hash-util-20241012-git.tgz"; + sha256 = "1xab7v2mav241rs8w68qmg485g4f75nrac3hjcnm0cb19ickbs1m"; system = "cl-hash-util-test"; asd = "cl-hash-util-test"; }); @@ -17386,11 +17578,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-html-readme = (build-asdf-system { pname = "cl-html-readme"; - version = "quicklisp-current-release-fa304a63-git"; + version = "quicklisp-current-release-f8aed591-git"; asds = [ "cl-html-readme" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-html-readme/2021-02-28/cl-html-readme-quicklisp-current-release-fa304a63-git.tgz"; - sha256 = "01z2ykfhg7wx7sz4kp1c6cj9ffbpppnfgfd2jpizd7f5id2wi3cb"; + url = "http://beta.quicklisp.org/archive/cl-html-readme/2024-10-12/cl-html-readme-quicklisp-current-release-f8aed591-git.tgz"; + sha256 = "1q23fdbhmra7hl12vd70m7q350wych6f739l8xmz6f84dwm9i8c7"; system = "cl-html-readme"; asd = "cl-html-readme"; }); @@ -17496,11 +17688,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-i18n = (build-asdf-system { pname = "cl-i18n"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-i18n" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-i18n/2023-10-21/cl-i18n-20231021-git.tgz"; - sha256 = "1i372x9kvgj5nx9ygcq7bp6lkbxsfgsdnbg4mjdpg1321q4c9qv4"; + url = "http://beta.quicklisp.org/archive/cl-i18n/2024-10-12/cl-i18n-20241012-git.tgz"; + sha256 = "1gp4ncf7ywyyh2f0zdkqibvn0wxm4hvsj672ni2vfqvhcivqfdza"; system = "cl-i18n"; asd = "cl-i18n"; }); @@ -17640,11 +17832,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-info = (build-asdf-system { pname = "cl-info"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "cl-info" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-info/2022-11-06/cl-info-20221106-git.tgz"; - sha256 = "1mg58n6qizssm8wqxnxgkrxaabmjzbrfjh9qld69y5z60zrybg1f"; + url = "http://beta.quicklisp.org/archive/cl-info/2024-10-12/cl-info-20241012-git.tgz"; + sha256 = "0vrrlcwdqnw8v34zd7wkjxh02zysam5c5s5n4l5q6s2jy0gmai0y"; system = "cl-info"; asd = "cl-info"; }); @@ -17656,11 +17848,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-info-test = (build-asdf-system { pname = "cl-info-test"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "cl-info-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-info/2022-11-06/cl-info-20221106-git.tgz"; - sha256 = "1mg58n6qizssm8wqxnxgkrxaabmjzbrfjh9qld69y5z60zrybg1f"; + url = "http://beta.quicklisp.org/archive/cl-info/2024-10-12/cl-info-20241012-git.tgz"; + sha256 = "0vrrlcwdqnw8v34zd7wkjxh02zysam5c5s5n4l5q6s2jy0gmai0y"; system = "cl-info-test"; asd = "cl-info-test"; }); @@ -17672,11 +17864,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-ini = (build-asdf-system { pname = "cl-ini"; - version = "20201220-git"; + version = "20241012-git"; asds = [ "cl-ini" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ini/2020-12-20/cl-ini-20201220-git.tgz"; - sha256 = "12vy3gspqn0wmkyz5id1xrgv1scgb16m7pkvmbmi19vlpj2iyq7p"; + url = "http://beta.quicklisp.org/archive/cl-ini/2024-10-12/cl-ini-20241012-git.tgz"; + sha256 = "1dj2w1fs1j52wxy91qy2jrn88aqggrvsg4fngl90ssvfh3awk4wm"; system = "cl-ini"; asd = "cl-ini"; }); @@ -17688,11 +17880,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-ini-test = (build-asdf-system { pname = "cl-ini-test"; - version = "20201220-git"; + version = "20241012-git"; asds = [ "cl-ini-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ini/2020-12-20/cl-ini-20201220-git.tgz"; - sha256 = "12vy3gspqn0wmkyz5id1xrgv1scgb16m7pkvmbmi19vlpj2iyq7p"; + url = "http://beta.quicklisp.org/archive/cl-ini/2024-10-12/cl-ini-20241012-git.tgz"; + sha256 = "1dj2w1fs1j52wxy91qy2jrn88aqggrvsg4fngl90ssvfh3awk4wm"; system = "cl-ini-test"; asd = "cl-ini-test"; }); @@ -17814,11 +18006,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-ipfs-api2 = (build-asdf-system { pname = "cl-ipfs-api2"; - version = "20210630-git"; + version = "20241012-git"; asds = [ "cl-ipfs-api2" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ipfs-api2/2021-06-30/cl-ipfs-api2-20210630-git.tgz"; - sha256 = "1h0csxk4db1hid793mk5kz3nbjyl7z4ic1zk2wy46k1vz5lnnsph"; + url = "http://beta.quicklisp.org/archive/cl-ipfs-api2/2024-10-12/cl-ipfs-api2-20241012-git.tgz"; + sha256 = "0lz19ayvcdhakckxp6z6gzlglhvnaj0qqyx1jmp211fms7dzyl0x"; system = "cl-ipfs-api2"; asd = "cl-ipfs-api2"; }); @@ -17972,11 +18164,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-js = (build-asdf-system { pname = "cl-js"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "cl-js" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/js/2023-02-14/js-20230214-git.tgz"; - sha256 = "1bf2p506zcmsqmfm5lamvxwqzcs2p8y5rf63i3s8wi46nkgqr0m7"; + url = "http://beta.quicklisp.org/archive/js/2024-10-12/js-20241012-git.tgz"; + sha256 = "084rfqxbhrwqb3xfcx3kzmnyzacr2wb8bkxzl0srdgn17pl7hkx3"; system = "cl-js"; asd = "cl-js"; }); @@ -18242,11 +18434,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-kanren = (build-asdf-system { pname = "cl-kanren"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-kanren" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-kanren/2023-10-21/cl-kanren-20231021-git.tgz"; - sha256 = "1na3gna16cnwzfw2irb294aiiknhvc283wl7q4vzdngzx5pqfim4"; + url = "http://beta.quicklisp.org/archive/cl-kanren/2024-10-12/cl-kanren-20241012-git.tgz"; + sha256 = "136jdgh23vb7imihk9dqwpk8wzjmpvkqfhah3qrxpsw0xpir29sh"; system = "cl-kanren"; asd = "cl-kanren"; }); @@ -18258,11 +18450,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-kanren-test = (build-asdf-system { pname = "cl-kanren-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-kanren-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-kanren/2023-10-21/cl-kanren-20231021-git.tgz"; - sha256 = "1na3gna16cnwzfw2irb294aiiknhvc283wl7q4vzdngzx5pqfim4"; + url = "http://beta.quicklisp.org/archive/cl-kanren/2024-10-12/cl-kanren-20241012-git.tgz"; + sha256 = "136jdgh23vb7imihk9dqwpk8wzjmpvkqfhah3qrxpsw0xpir29sh"; system = "cl-kanren-test"; asd = "cl-kanren-test"; }); @@ -18492,6 +18684,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + cl-lc = (build-asdf-system { + pname = "cl-lc"; + version = "20241012-git"; + asds = [ "cl-lc" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-lc/2024-10-12/cl-lc-20241012-git.tgz"; + sha256 = "07wpbwgjybhp6vdr2rbd93jwakqixr9dyymp3yz1h684ln7wvfkb"; + system = "cl-lc"; + asd = "cl-lc"; + }); + systems = [ "cl-lc" ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "iterate" self) (getAttr "optima" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); cl-ledger = (build-asdf-system { pname = "cl-ledger"; version = "20200218-git"; @@ -18542,11 +18750,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-liballegro = (build-asdf-system { pname = "cl-liballegro"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-liballegro" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-liballegro/2023-10-21/cl-liballegro-20231021-git.tgz"; - sha256 = "1w0gf32yds588mgg11gxlc3lzfbw4j7j4nilkv90zp9q8dlkixf7"; + url = "http://beta.quicklisp.org/archive/cl-liballegro/2024-10-12/cl-liballegro-20241012-git.tgz"; + sha256 = "1q263wzm25rynyhcym216l3swhrz6fhiwhdbh4iz212hw9w0kn71"; system = "cl-liballegro"; asd = "cl-liballegro"; }); @@ -18558,11 +18766,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-liballegro-nuklear = (build-asdf-system { pname = "cl-liballegro-nuklear"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-liballegro-nuklear" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-liballegro-nuklear/2023-10-21/cl-liballegro-nuklear-20231021-git.tgz"; - sha256 = "04v99fgl2kg8f4gsx1nwh7xlw1v2gy2zd5lc99syczz0fqh10jr9"; + url = "http://beta.quicklisp.org/archive/cl-liballegro-nuklear/2024-10-12/cl-liballegro-nuklear-20241012-git.tgz"; + sha256 = "15wbs1jfl60dnyzgzdibw2hkl64cx3n3v90i5jp0vd123kix217j"; system = "cl-liballegro-nuklear"; asd = "cl-liballegro-nuklear"; }); @@ -18918,11 +19126,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-log = (build-asdf-system { pname = "cl-log"; - version = ".1.0.1"; + version = "20241012-git"; asds = [ "cl-log" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-log/2013-01-28/cl-log.1.0.1.tgz"; - sha256 = "0lfy3sxr2shhv8qpyry9kk9gcwwl6bhfgzv0pczibl70mgraqnys"; + url = "http://beta.quicklisp.org/archive/cl-log/2024-10-12/cl-log-20241012-git.tgz"; + sha256 = "1r3z9swy1b59swvaa5b97is9ysrfmjvjjhhw56p7p5hqg93b92ak"; system = "cl-log"; asd = "cl-log"; }); @@ -18932,22 +19140,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - cl-log-test = (build-asdf-system { - pname = "cl-log-test"; - version = ".1.0.1"; - asds = [ "cl-log-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-log/2013-01-28/cl-log.1.0.1.tgz"; - sha256 = "0lfy3sxr2shhv8qpyry9kk9gcwwl6bhfgzv0pczibl70mgraqnys"; - system = "cl-log-test"; - asd = "cl-log-test"; - }); - systems = [ "cl-log-test" ]; - lispLibs = [ (getAttr "cl-log" self) (getAttr "eos" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); cl-logic = (build-asdf-system { pname = "cl-logic"; version = "20141217-git"; @@ -19110,11 +19302,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-markless = (build-asdf-system { pname = "cl-markless"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-markless" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-markless/2023-10-21/cl-markless-20231021-git.tgz"; - sha256 = "1m7hqiwm990aapa1kdwbkgydz44l3syfg2ijrxgrkq5w626l95wd"; + url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz"; + sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g"; system = "cl-markless"; asd = "cl-markless"; }); @@ -19126,11 +19318,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-markless-epub = (build-asdf-system { pname = "cl-markless-epub"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-markless-epub" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-markless/2023-10-21/cl-markless-20231021-git.tgz"; - sha256 = "1m7hqiwm990aapa1kdwbkgydz44l3syfg2ijrxgrkq5w626l95wd"; + url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz"; + sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g"; system = "cl-markless-epub"; asd = "cl-markless-epub"; }); @@ -19142,11 +19334,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-markless-latex = (build-asdf-system { pname = "cl-markless-latex"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-markless-latex" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-markless/2023-10-21/cl-markless-20231021-git.tgz"; - sha256 = "1m7hqiwm990aapa1kdwbkgydz44l3syfg2ijrxgrkq5w626l95wd"; + url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz"; + sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g"; system = "cl-markless-latex"; asd = "cl-markless-latex"; }); @@ -19158,11 +19350,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-markless-markdown = (build-asdf-system { pname = "cl-markless-markdown"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-markless-markdown" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-markless/2023-10-21/cl-markless-20231021-git.tgz"; - sha256 = "1m7hqiwm990aapa1kdwbkgydz44l3syfg2ijrxgrkq5w626l95wd"; + url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz"; + sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g"; system = "cl-markless-markdown"; asd = "cl-markless-markdown"; }); @@ -19174,11 +19366,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-markless-plump = (build-asdf-system { pname = "cl-markless-plump"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-markless-plump" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-markless/2023-10-21/cl-markless-20231021-git.tgz"; - sha256 = "1m7hqiwm990aapa1kdwbkgydz44l3syfg2ijrxgrkq5w626l95wd"; + url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz"; + sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g"; system = "cl-markless-plump"; asd = "cl-markless-plump"; }); @@ -19190,27 +19382,27 @@ in lib.makeScope pkgs.newScope (self: { }); cl-markless-standalone = (build-asdf-system { pname = "cl-markless-standalone"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-markless-standalone" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-markless/2023-10-21/cl-markless-20231021-git.tgz"; - sha256 = "1m7hqiwm990aapa1kdwbkgydz44l3syfg2ijrxgrkq5w626l95wd"; + url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz"; + sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g"; system = "cl-markless-standalone"; asd = "cl-markless-standalone"; }); systems = [ "cl-markless-standalone" ]; - lispLibs = [ (getAttr "cl-markless" self) (getAttr "cl-markless-epub" self) (getAttr "cl-markless-latex" self) (getAttr "cl-markless-markdown" self) (getAttr "cl-markless-plump" self) (getAttr "command-line-arguments" self) ]; + lispLibs = [ (getAttr "cl-markless" self) (getAttr "cl-markless-epub" self) (getAttr "cl-markless-latex" self) (getAttr "cl-markless-markdown" self) (getAttr "cl-markless-plump" self) (getAttr "command-line-arguments" self) (getAttr "pathname-utils" self) ]; meta = { hydraPlatforms = [ ]; }; }); cl-markless-test = (build-asdf-system { pname = "cl-markless-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-markless-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-markless/2023-10-21/cl-markless-20231021-git.tgz"; - sha256 = "1m7hqiwm990aapa1kdwbkgydz44l3syfg2ijrxgrkq5w626l95wd"; + url = "http://beta.quicklisp.org/archive/cl-markless/2024-10-12/cl-markless-20241012-git.tgz"; + sha256 = "0csbqglj5ccjw7j95a6cb8pj195lrdk1pn0y3f37w3pjy4pg782g"; system = "cl-markless-test"; asd = "cl-markless-test"; }); @@ -19588,11 +19780,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-migratum = (build-asdf-system { pname = "cl-migratum"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-migratum" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2023-10-21/cl-migratum-20231021-git.tgz"; - sha256 = "0vykbbrk3bq4lx27qxdj5afizvi7h8vx148x3cb790kljb0qf2vk"; + url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; + sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; system = "cl-migratum"; asd = "cl-migratum"; }); @@ -19604,11 +19796,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-migratum_dot_cli = (build-asdf-system { pname = "cl-migratum.cli"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-migratum.cli" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2023-10-21/cl-migratum-20231021-git.tgz"; - sha256 = "0vykbbrk3bq4lx27qxdj5afizvi7h8vx148x3cb790kljb0qf2vk"; + url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; + sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; system = "cl-migratum.cli"; asd = "cl-migratum.cli"; }); @@ -19620,11 +19812,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-migratum_dot_driver_dot_dbi = (build-asdf-system { pname = "cl-migratum.driver.dbi"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-migratum.driver.dbi" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2023-10-21/cl-migratum-20231021-git.tgz"; - sha256 = "0vykbbrk3bq4lx27qxdj5afizvi7h8vx148x3cb790kljb0qf2vk"; + url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; + sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; system = "cl-migratum.driver.dbi"; asd = "cl-migratum.driver.dbi"; }); @@ -19636,11 +19828,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-migratum_dot_driver_dot_mixins = (build-asdf-system { pname = "cl-migratum.driver.mixins"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-migratum.driver.mixins" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2023-10-21/cl-migratum-20231021-git.tgz"; - sha256 = "0vykbbrk3bq4lx27qxdj5afizvi7h8vx148x3cb790kljb0qf2vk"; + url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; + sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; system = "cl-migratum.driver.mixins"; asd = "cl-migratum.driver.mixins"; }); @@ -19652,11 +19844,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-migratum_dot_driver_dot_postmodern-postgresql = (build-asdf-system { pname = "cl-migratum.driver.postmodern-postgresql"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-migratum.driver.postmodern-postgresql" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2023-10-21/cl-migratum-20231021-git.tgz"; - sha256 = "0vykbbrk3bq4lx27qxdj5afizvi7h8vx148x3cb790kljb0qf2vk"; + url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; + sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; system = "cl-migratum.driver.postmodern-postgresql"; asd = "cl-migratum.driver.postmodern-postgresql"; }); @@ -19668,11 +19860,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-migratum_dot_driver_dot_rdbms-postgresql = (build-asdf-system { pname = "cl-migratum.driver.rdbms-postgresql"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-migratum.driver.rdbms-postgresql" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2023-10-21/cl-migratum-20231021-git.tgz"; - sha256 = "0vykbbrk3bq4lx27qxdj5afizvi7h8vx148x3cb790kljb0qf2vk"; + url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; + sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; system = "cl-migratum.driver.rdbms-postgresql"; asd = "cl-migratum.driver.rdbms-postgresql"; }); @@ -19684,11 +19876,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-migratum_dot_provider_dot_local-path = (build-asdf-system { pname = "cl-migratum.provider.local-path"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-migratum.provider.local-path" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2023-10-21/cl-migratum-20231021-git.tgz"; - sha256 = "0vykbbrk3bq4lx27qxdj5afizvi7h8vx148x3cb790kljb0qf2vk"; + url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; + sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; system = "cl-migratum.provider.local-path"; asd = "cl-migratum.provider.local-path"; }); @@ -19700,11 +19892,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-migratum_dot_test = (build-asdf-system { pname = "cl-migratum.test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-migratum.test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2023-10-21/cl-migratum-20231021-git.tgz"; - sha256 = "0vykbbrk3bq4lx27qxdj5afizvi7h8vx148x3cb790kljb0qf2vk"; + url = "http://beta.quicklisp.org/archive/cl-migratum/2024-10-12/cl-migratum-20241012-git.tgz"; + sha256 = "0bkzbvv3s2j5gs032nj82b0p3x6j3in54kqyg74x54b25q75ymvw"; system = "cl-migratum.test"; asd = "cl-migratum.test"; }); @@ -19828,11 +20020,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mixed = (build-asdf-system { pname = "cl-mixed"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mixed" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2023-10-21/cl-mixed-20231021-git.tgz"; - sha256 = "0sxq4yrsbxb2sgbijkqcvl9raksrnib2f9j6dm1kak0i9ry48cqc"; + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; system = "cl-mixed"; asd = "cl-mixed"; }); @@ -19844,11 +20036,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mixed-aaudio = (build-asdf-system { pname = "cl-mixed-aaudio"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mixed-aaudio" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2023-10-21/cl-mixed-20231021-git.tgz"; - sha256 = "0sxq4yrsbxb2sgbijkqcvl9raksrnib2f9j6dm1kak0i9ry48cqc"; + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; system = "cl-mixed-aaudio"; asd = "cl-mixed-aaudio"; }); @@ -19860,11 +20052,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mixed-alsa = (build-asdf-system { pname = "cl-mixed-alsa"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mixed-alsa" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2023-10-21/cl-mixed-20231021-git.tgz"; - sha256 = "0sxq4yrsbxb2sgbijkqcvl9raksrnib2f9j6dm1kak0i9ry48cqc"; + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; system = "cl-mixed-alsa"; asd = "cl-mixed-alsa"; }); @@ -19876,11 +20068,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mixed-coreaudio = (build-asdf-system { pname = "cl-mixed-coreaudio"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mixed-coreaudio" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2023-10-21/cl-mixed-20231021-git.tgz"; - sha256 = "0sxq4yrsbxb2sgbijkqcvl9raksrnib2f9j6dm1kak0i9ry48cqc"; + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; system = "cl-mixed-coreaudio"; asd = "cl-mixed-coreaudio"; }); @@ -19892,11 +20084,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mixed-examples = (build-asdf-system { pname = "cl-mixed-examples"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mixed-examples" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2023-10-21/cl-mixed-20231021-git.tgz"; - sha256 = "0sxq4yrsbxb2sgbijkqcvl9raksrnib2f9j6dm1kak0i9ry48cqc"; + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; system = "cl-mixed-examples"; asd = "cl-mixed-examples"; }); @@ -19908,11 +20100,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mixed-flac = (build-asdf-system { pname = "cl-mixed-flac"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mixed-flac" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2023-10-21/cl-mixed-20231021-git.tgz"; - sha256 = "0sxq4yrsbxb2sgbijkqcvl9raksrnib2f9j6dm1kak0i9ry48cqc"; + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; system = "cl-mixed-flac"; asd = "cl-mixed-flac"; }); @@ -19924,11 +20116,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mixed-jack = (build-asdf-system { pname = "cl-mixed-jack"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mixed-jack" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2023-10-21/cl-mixed-20231021-git.tgz"; - sha256 = "0sxq4yrsbxb2sgbijkqcvl9raksrnib2f9j6dm1kak0i9ry48cqc"; + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; system = "cl-mixed-jack"; asd = "cl-mixed-jack"; }); @@ -19940,11 +20132,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mixed-mpg123 = (build-asdf-system { pname = "cl-mixed-mpg123"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mixed-mpg123" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2023-10-21/cl-mixed-20231021-git.tgz"; - sha256 = "0sxq4yrsbxb2sgbijkqcvl9raksrnib2f9j6dm1kak0i9ry48cqc"; + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; system = "cl-mixed-mpg123"; asd = "cl-mixed-mpg123"; }); @@ -19956,11 +20148,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mixed-mpt = (build-asdf-system { pname = "cl-mixed-mpt"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mixed-mpt" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2023-10-21/cl-mixed-20231021-git.tgz"; - sha256 = "0sxq4yrsbxb2sgbijkqcvl9raksrnib2f9j6dm1kak0i9ry48cqc"; + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; system = "cl-mixed-mpt"; asd = "cl-mixed-mpt"; }); @@ -19972,11 +20164,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mixed-nxau = (build-asdf-system { pname = "cl-mixed-nxau"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mixed-nxau" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2023-10-21/cl-mixed-20231021-git.tgz"; - sha256 = "0sxq4yrsbxb2sgbijkqcvl9raksrnib2f9j6dm1kak0i9ry48cqc"; + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; system = "cl-mixed-nxau"; asd = "cl-mixed-nxau"; }); @@ -19988,11 +20180,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mixed-opus = (build-asdf-system { pname = "cl-mixed-opus"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mixed-opus" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2023-10-21/cl-mixed-20231021-git.tgz"; - sha256 = "0sxq4yrsbxb2sgbijkqcvl9raksrnib2f9j6dm1kak0i9ry48cqc"; + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; system = "cl-mixed-opus"; asd = "cl-mixed-opus"; }); @@ -20004,11 +20196,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mixed-oss = (build-asdf-system { pname = "cl-mixed-oss"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mixed-oss" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2023-10-21/cl-mixed-20231021-git.tgz"; - sha256 = "0sxq4yrsbxb2sgbijkqcvl9raksrnib2f9j6dm1kak0i9ry48cqc"; + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; system = "cl-mixed-oss"; asd = "cl-mixed-oss"; }); @@ -20020,11 +20212,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mixed-out123 = (build-asdf-system { pname = "cl-mixed-out123"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mixed-out123" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2023-10-21/cl-mixed-20231021-git.tgz"; - sha256 = "0sxq4yrsbxb2sgbijkqcvl9raksrnib2f9j6dm1kak0i9ry48cqc"; + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; system = "cl-mixed-out123"; asd = "cl-mixed-out123"; }); @@ -20036,11 +20228,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mixed-pulse = (build-asdf-system { pname = "cl-mixed-pulse"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mixed-pulse" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2023-10-21/cl-mixed-20231021-git.tgz"; - sha256 = "0sxq4yrsbxb2sgbijkqcvl9raksrnib2f9j6dm1kak0i9ry48cqc"; + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; system = "cl-mixed-pulse"; asd = "cl-mixed-pulse"; }); @@ -20050,13 +20242,29 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + cl-mixed-qoa = (build-asdf-system { + pname = "cl-mixed-qoa"; + version = "20241012-git"; + asds = [ "cl-mixed-qoa" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; + system = "cl-mixed-qoa"; + asd = "cl-mixed-qoa"; + }); + systems = [ "cl-mixed-qoa" ]; + lispLibs = [ (getAttr "cl-mixed" self) (getAttr "cl-qoa" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); cl-mixed-sdl2 = (build-asdf-system { pname = "cl-mixed-sdl2"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mixed-sdl2" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2023-10-21/cl-mixed-20231021-git.tgz"; - sha256 = "0sxq4yrsbxb2sgbijkqcvl9raksrnib2f9j6dm1kak0i9ry48cqc"; + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; system = "cl-mixed-sdl2"; asd = "cl-mixed-sdl2"; }); @@ -20068,11 +20276,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mixed-vorbis = (build-asdf-system { pname = "cl-mixed-vorbis"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mixed-vorbis" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2023-10-21/cl-mixed-20231021-git.tgz"; - sha256 = "0sxq4yrsbxb2sgbijkqcvl9raksrnib2f9j6dm1kak0i9ry48cqc"; + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; system = "cl-mixed-vorbis"; asd = "cl-mixed-vorbis"; }); @@ -20084,11 +20292,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mixed-wasapi = (build-asdf-system { pname = "cl-mixed-wasapi"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mixed-wasapi" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2023-10-21/cl-mixed-20231021-git.tgz"; - sha256 = "0sxq4yrsbxb2sgbijkqcvl9raksrnib2f9j6dm1kak0i9ry48cqc"; + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; system = "cl-mixed-wasapi"; asd = "cl-mixed-wasapi"; }); @@ -20100,11 +20308,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mixed-wav = (build-asdf-system { pname = "cl-mixed-wav"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mixed-wav" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2023-10-21/cl-mixed-20231021-git.tgz"; - sha256 = "0sxq4yrsbxb2sgbijkqcvl9raksrnib2f9j6dm1kak0i9ry48cqc"; + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; system = "cl-mixed-wav"; asd = "cl-mixed-wav"; }); @@ -20116,11 +20324,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mixed-winmm = (build-asdf-system { pname = "cl-mixed-winmm"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mixed-winmm" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2023-10-21/cl-mixed-20231021-git.tgz"; - sha256 = "0sxq4yrsbxb2sgbijkqcvl9raksrnib2f9j6dm1kak0i9ry48cqc"; + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; system = "cl-mixed-winmm"; asd = "cl-mixed-winmm"; }); @@ -20132,11 +20340,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mixed-xaudio2 = (build-asdf-system { pname = "cl-mixed-xaudio2"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mixed-xaudio2" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2023-10-21/cl-mixed-20231021-git.tgz"; - sha256 = "0sxq4yrsbxb2sgbijkqcvl9raksrnib2f9j6dm1kak0i9ry48cqc"; + url = "http://beta.quicklisp.org/archive/cl-mixed/2024-10-12/cl-mixed-20241012-git.tgz"; + sha256 = "1wianjcr1ha9lb46q0i05fwn5cl4yzkg78mqk0ib564fbyx4y0q9"; system = "cl-mixed-xaudio2"; asd = "cl-mixed-xaudio2"; }); @@ -20212,11 +20420,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-modio = (build-asdf-system { pname = "cl-modio"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-modio" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-modio/2023-10-21/cl-modio-20231021-git.tgz"; - sha256 = "1gjjr0x116afm9cap4h765zr3k7xm50ks1yl6d6hz08y5l226lyh"; + url = "http://beta.quicklisp.org/archive/cl-modio/2024-10-12/cl-modio-20241012-git.tgz"; + sha256 = "1f755xqpibdrxiqclnsiba36bl8xgw958h0lb0rw6hjsvrx9z8dg"; system = "cl-modio"; asd = "cl-modio"; }); @@ -20372,11 +20580,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mount-info = (build-asdf-system { pname = "cl-mount-info"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mount-info" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mount-info/2023-10-21/cl-mount-info-20231021-git.tgz"; - sha256 = "0k23qk10a67xqv2pvj4s0qf5a45xfj2h6hn34q1bnmmvhfw51ivd"; + url = "http://beta.quicklisp.org/archive/cl-mount-info/2024-10-12/cl-mount-info-20241012-git.tgz"; + sha256 = "0i5vpr0s27gqrskl5qkbw23ba00abbmsskgvg2zhpdljg5qiwlcw"; system = "cl-mount-info"; asd = "cl-mount-info"; }); @@ -20388,11 +20596,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mpg123 = (build-asdf-system { pname = "cl-mpg123"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mpg123" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mpg123/2023-10-21/cl-mpg123-20231021-git.tgz"; - sha256 = "0qgkcyvwak9qwlf0yw0bjm3ba28xjli7m41q5988mkap85y53hs0"; + url = "http://beta.quicklisp.org/archive/cl-mpg123/2024-10-12/cl-mpg123-20241012-git.tgz"; + sha256 = "03ysv3psfj4agf62gn1skc26qzd9g9zx6yjxxs9lrjz7g9kwf1xk"; system = "cl-mpg123"; asd = "cl-mpg123"; }); @@ -20404,11 +20612,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mpg123-example = (build-asdf-system { pname = "cl-mpg123-example"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-mpg123-example" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mpg123/2023-10-21/cl-mpg123-20231021-git.tgz"; - sha256 = "0qgkcyvwak9qwlf0yw0bjm3ba28xjli7m41q5988mkap85y53hs0"; + url = "http://beta.quicklisp.org/archive/cl-mpg123/2024-10-12/cl-mpg123-20241012-git.tgz"; + sha256 = "03ysv3psfj4agf62gn1skc26qzd9g9zx6yjxxs9lrjz7g9kwf1xk"; system = "cl-mpg123-example"; asd = "cl-mpg123-example"; }); @@ -20564,11 +20772,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mustache = (build-asdf-system { pname = "cl-mustache"; - version = "20200325-git"; + version = "20241012-git"; asds = [ "cl-mustache" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mustache/2020-03-25/cl-mustache-20200325-git.tgz"; - sha256 = "1wsmr46c56l0chshffk3rbvd7v2jwplmgmkkyr98n5n2qnjcqrc4"; + url = "http://beta.quicklisp.org/archive/cl-mustache/2024-10-12/cl-mustache-20241012-git.tgz"; + sha256 = "0isdrz1dgjvmfqvsgs2pmrran41w9n6f44r9fpdhdkjxa5zvy46b"; system = "cl-mustache"; asd = "cl-mustache"; }); @@ -20578,11 +20786,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mustache-test = (build-asdf-system { pname = "cl-mustache-test"; - version = "20200325-git"; + version = "20241012-git"; asds = [ "cl-mustache-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mustache/2020-03-25/cl-mustache-20200325-git.tgz"; - sha256 = "1wsmr46c56l0chshffk3rbvd7v2jwplmgmkkyr98n5n2qnjcqrc4"; + url = "http://beta.quicklisp.org/archive/cl-mustache/2024-10-12/cl-mustache-20241012-git.tgz"; + sha256 = "0isdrz1dgjvmfqvsgs2pmrran41w9n6f44r9fpdhdkjxa5zvy46b"; system = "cl-mustache-test"; asd = "cl-mustache-test"; }); @@ -20738,11 +20946,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mysql = (build-asdf-system { pname = "cl-mysql"; - version = "20200610-git"; + version = "20241012-git"; asds = [ "cl-mysql" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mysql/2020-06-10/cl-mysql-20200610-git.tgz"; - sha256 = "1jk2571w5zhrmza4mr5z4ia6g7r5hzhp8dsxnpx2ypnla9xpxv5h"; + url = "http://beta.quicklisp.org/archive/cl-mysql/2024-10-12/cl-mysql-20241012-git.tgz"; + sha256 = "0ibxfjnvcgpibsfqjx2d3dcjcabiw6dj43vmr76b55fc4qlkjvz5"; system = "cl-mysql"; asd = "cl-mysql"; }); @@ -20752,11 +20960,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-mysql-test = (build-asdf-system { pname = "cl-mysql-test"; - version = "20200610-git"; + version = "20241012-git"; asds = [ "cl-mysql-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mysql/2020-06-10/cl-mysql-20200610-git.tgz"; - sha256 = "1jk2571w5zhrmza4mr5z4ia6g7r5hzhp8dsxnpx2ypnla9xpxv5h"; + url = "http://beta.quicklisp.org/archive/cl-mysql/2024-10-12/cl-mysql-20241012-git.tgz"; + sha256 = "0ibxfjnvcgpibsfqjx2d3dcjcabiw6dj43vmr76b55fc4qlkjvz5"; system = "cl-mysql-test"; asd = "cl-mysql-test"; }); @@ -20766,130 +20974,82 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - cl-naive-store = (build-asdf-system { - pname = "cl-naive-store"; - version = "20231021-git"; - asds = [ "cl-naive-store" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-store/2023-10-21/cl-naive-store-20231021-git.tgz"; - sha256 = "0f51skknm29lg3miygybbagc9s4w9drfsph5mdmdjm1cks0x6v6k"; - system = "cl-naive-store"; - asd = "cl-naive-store"; - }); - systems = [ "cl-naive-store" ]; - lispLibs = [ (getAttr "cl-naive-store_dot_definitions" self) (getAttr "cl-naive-store_dot_document-types" self) (getAttr "cl-naive-store_dot_naive-core" self) (getAttr "cl-naive-store_dot_naive-documents" self) (getAttr "cl-naive-store_dot_naive-indexed" self) (getAttr "cl-naive-store_dot_naive-merkle" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - cl-naive-store_dot_definitions = (build-asdf-system { - pname = "cl-naive-store.definitions"; - version = "20231021-git"; - asds = [ "cl-naive-store.definitions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-store/2023-10-21/cl-naive-store-20231021-git.tgz"; - sha256 = "0f51skknm29lg3miygybbagc9s4w9drfsph5mdmdjm1cks0x6v6k"; - system = "cl-naive-store.definitions"; - asd = "cl-naive-store.definitions"; - }); - systems = [ "cl-naive-store.definitions" ]; - lispLibs = [ (getAttr "cl-naive-store_dot_document-types" self) (getAttr "cl-naive-store_dot_naive-core" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - cl-naive-store_dot_document-types = (build-asdf-system { - pname = "cl-naive-store.document-types"; - version = "20231021-git"; - asds = [ "cl-naive-store.document-types" ]; + cl-naive-deprecation = (build-asdf-system { + pname = "cl-naive-deprecation"; + version = "20241012-git"; + asds = [ "cl-naive-deprecation" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-store/2023-10-21/cl-naive-store-20231021-git.tgz"; - sha256 = "0f51skknm29lg3miygybbagc9s4w9drfsph5mdmdjm1cks0x6v6k"; - system = "cl-naive-store.document-types"; - asd = "cl-naive-store.document-types"; + url = "http://beta.quicklisp.org/archive/cl-naive-deprecation/2024-10-12/cl-naive-deprecation-20241012-git.tgz"; + sha256 = "17x6b5sr34qjfzbn2r6f5n4xa4p1qi438k792b48qiqnalkfp29m"; + system = "cl-naive-deprecation"; + asd = "cl-naive-deprecation"; }); - systems = [ "cl-naive-store.document-types" ]; - lispLibs = [ (getAttr "cl-naive-store_dot_naive-core" self) ]; + systems = [ "cl-naive-deprecation" ]; + lispLibs = [ ]; meta = { hydraPlatforms = [ ]; }; }); - cl-naive-store_dot_naive-core = (build-asdf-system { - pname = "cl-naive-store.naive-core"; - version = "20231021-git"; - asds = [ "cl-naive-store.naive-core" ]; + cl-naive-ptrees = (build-asdf-system { + pname = "cl-naive-ptrees"; + version = "20241012-git"; + asds = [ "cl-naive-ptrees" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-store/2023-10-21/cl-naive-store-20231021-git.tgz"; - sha256 = "0f51skknm29lg3miygybbagc9s4w9drfsph5mdmdjm1cks0x6v6k"; - system = "cl-naive-store.naive-core"; - asd = "cl-naive-store.naive-core"; + url = "http://beta.quicklisp.org/archive/cl-naive-ptrees/2024-10-12/cl-naive-ptrees-20241012-git.tgz"; + sha256 = "10548wm3mpjxmjibidv1dd8wzcn3nn12pzwlpdd1li362v8l9n6y"; + system = "cl-naive-ptrees"; + asd = "cl-naive-ptrees"; }); - systems = [ "cl-naive-store.naive-core" ]; - lispLibs = [ (getAttr "bordeaux-threads" self) (getAttr "cl-cpus" self) (getAttr "cl-fad" self) (getAttr "cl-getx" self) (getAttr "cl-murmurhash" self) (getAttr "ironclad" self) (getAttr "local-time" self) (getAttr "lparallel" self) (getAttr "split-sequence" self) (getAttr "uuid" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - cl-naive-store_dot_naive-documents = (build-asdf-system { - pname = "cl-naive-store.naive-documents"; - version = "20231021-git"; - asds = [ "cl-naive-store.naive-documents" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-store/2023-10-21/cl-naive-store-20231021-git.tgz"; - sha256 = "0f51skknm29lg3miygybbagc9s4w9drfsph5mdmdjm1cks0x6v6k"; - system = "cl-naive-store.naive-documents"; - asd = "cl-naive-store.naive-documents"; - }); - systems = [ "cl-naive-store.naive-documents" ]; - lispLibs = [ (getAttr "cl-naive-store_dot_document-types" self) (getAttr "cl-naive-store_dot_naive-core" self) (getAttr "cl-naive-store_dot_naive-indexed" self) ]; + systems = [ "cl-naive-ptrees" ]; + lispLibs = [ ]; meta = { hydraPlatforms = [ ]; }; }); - cl-naive-store_dot_naive-indexed = (build-asdf-system { - pname = "cl-naive-store.naive-indexed"; - version = "20231021-git"; - asds = [ "cl-naive-store.naive-indexed" ]; + cl-naive-ptrees_dot_tests = (build-asdf-system { + pname = "cl-naive-ptrees.tests"; + version = "20241012-git"; + asds = [ "cl-naive-ptrees.tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-store/2023-10-21/cl-naive-store-20231021-git.tgz"; - sha256 = "0f51skknm29lg3miygybbagc9s4w9drfsph5mdmdjm1cks0x6v6k"; - system = "cl-naive-store.naive-indexed"; - asd = "cl-naive-store.naive-indexed"; + url = "http://beta.quicklisp.org/archive/cl-naive-ptrees/2024-10-12/cl-naive-ptrees-20241012-git.tgz"; + sha256 = "10548wm3mpjxmjibidv1dd8wzcn3nn12pzwlpdd1li362v8l9n6y"; + system = "cl-naive-ptrees.tests"; + asd = "cl-naive-ptrees.tests"; }); - systems = [ "cl-naive-store.naive-indexed" ]; - lispLibs = [ (getAttr "cl-naive-store_dot_naive-core" self) ]; + systems = [ "cl-naive-ptrees.tests" ]; + lispLibs = [ (getAttr "cl-naive-ptrees" self) (getAttr "cl-naive-tests" self) ]; meta = { hydraPlatforms = [ ]; }; }); - cl-naive-store_dot_naive-merkle = (build-asdf-system { - pname = "cl-naive-store.naive-merkle"; - version = "20231021-git"; - asds = [ "cl-naive-store.naive-merkle" ]; + cl-naive-tests = (build-asdf-system { + pname = "cl-naive-tests"; + version = "20241012-git"; + asds = [ "cl-naive-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-store/2023-10-21/cl-naive-store-20231021-git.tgz"; - sha256 = "0f51skknm29lg3miygybbagc9s4w9drfsph5mdmdjm1cks0x6v6k"; - system = "cl-naive-store.naive-merkle"; - asd = "cl-naive-store.naive-merkle"; + url = "http://beta.quicklisp.org/archive/cl-naive-tests/2024-10-12/cl-naive-tests-20241012-git.tgz"; + sha256 = "1b7vvl5myybx92k778p3ca5367g4m6rh5k3rpr6qp9p4amd0yy2f"; + system = "cl-naive-tests"; + asd = "cl-naive-tests"; }); - systems = [ "cl-naive-store.naive-merkle" ]; - lispLibs = [ (getAttr "cl-naive-store_dot_naive-documents" self) ]; + systems = [ "cl-naive-tests" ]; + lispLibs = [ (getAttr "cl-who" self) ]; meta = { hydraPlatforms = [ ]; }; }); - cl-naive-store_dot_test = (build-asdf-system { - pname = "cl-naive-store.test"; - version = "20231021-git"; - asds = [ "cl-naive-store.test" ]; + cl-naive-tests_dot_tests = (build-asdf-system { + pname = "cl-naive-tests.tests"; + version = "20241012-git"; + asds = [ "cl-naive-tests.tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-store/2023-10-21/cl-naive-store-20231021-git.tgz"; - sha256 = "0f51skknm29lg3miygybbagc9s4w9drfsph5mdmdjm1cks0x6v6k"; - system = "cl-naive-store.test"; - asd = "cl-naive-store.test"; + url = "http://beta.quicklisp.org/archive/cl-naive-tests/2024-10-12/cl-naive-tests-20241012-git.tgz"; + sha256 = "1b7vvl5myybx92k778p3ca5367g4m6rh5k3rpr6qp9p4amd0yy2f"; + system = "cl-naive-tests.tests"; + asd = "cl-naive-tests.tests"; }); - systems = [ "cl-naive-store.test" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-naive-store" self) ]; + systems = [ "cl-naive-tests.tests" ]; + lispLibs = [ (getAttr "cl-naive-tests" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -20944,11 +21104,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-neovim = (build-asdf-system { pname = "cl-neovim"; - version = "20190521-git"; + version = "20241012-git"; asds = [ "cl-neovim" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-neovim/2019-05-21/cl-neovim-20190521-git.tgz"; - sha256 = "06hy30px9cppqzh0c8nkbyysbpw2l247r4g43wfw96rflrdwy6ks"; + url = "http://beta.quicklisp.org/archive/cl-neovim/2024-10-12/cl-neovim-20241012-git.tgz"; + sha256 = "1c72qy10kmccpfl90q4c0yinmy9z9mdqniqx24269h91xd3jyagc"; system = "cl-neovim"; asd = "cl-neovim"; }); @@ -20960,11 +21120,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-netpbm = (build-asdf-system { pname = "cl-netpbm"; - version = "20201016-hg"; + version = "20241012-hg"; asds = [ "cl-netpbm" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-netpbm/2020-10-16/cl-netpbm-20201016-hg.tgz"; - sha256 = "1xhpyn7nkadvbv8n7sbjyfj9qzr90p66dhq1j9f0jj4lmarp8anp"; + url = "http://beta.quicklisp.org/archive/cl-netpbm/2024-10-12/cl-netpbm-20241012-hg.tgz"; + sha256 = "16dv3d6x62vvc9wdvm2dc9mrm29ypzjzn2fvy46kl0h0wg7hjz92"; system = "cl-netpbm"; asd = "cl-netpbm"; }); @@ -21168,11 +21328,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-oju = (build-asdf-system { pname = "cl-oju"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "cl-oju" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-oju/2023-02-14/cl-oju-20230214-git.tgz"; - sha256 = "0pcb659m487w4nv3m0ryl0fbwdgc1vdz06hsm4l1gwi3w9gcq477"; + url = "http://beta.quicklisp.org/archive/cl-oju/2024-10-12/cl-oju-20241012-git.tgz"; + sha256 = "0gwzxl4pj45jq7vx6vssgzsp4xxc99bzfi6fbklc5nnlfkqq0v62"; system = "cl-oju"; asd = "cl-oju"; }); @@ -21344,11 +21504,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-opengl = (build-asdf-system { pname = "cl-opengl"; - version = "20191130-git"; + version = "20241012-git"; asds = [ "cl-opengl" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-opengl/2019-11-30/cl-opengl-20191130-git.tgz"; - sha256 = "0mhqmll09f079pnd6mgswz9nvr6h5n27d4q7zpmm2igf1v460id7"; + url = "http://beta.quicklisp.org/archive/cl-opengl/2024-10-12/cl-opengl-20241012-git.tgz"; + sha256 = "1xpa3x9fx7wxrs5xmkj13yzh2wjfnlb0ihirfr9clngpv1y4gcm6"; system = "cl-opengl"; asd = "cl-opengl"; }); @@ -21360,11 +21520,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-opensearch-query-builder = (build-asdf-system { pname = "cl-opensearch-query-builder"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "cl-opensearch-query-builder" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-opensearch-query-builder/2023-06-18/cl-opensearch-query-builder-20230618-git.tgz"; - sha256 = "0sdhp5517ikh40gd8m8qw2jczr0nd7c4i5r31kssx7763zq968i5"; + url = "http://beta.quicklisp.org/archive/cl-opensearch-query-builder/2024-10-12/cl-opensearch-query-builder-20241012-git.tgz"; + sha256 = "1pxlafahhgwyfhila0ikbpljcxgi59cqd2m6dvlib6ii90yq5dqx"; system = "cl-opensearch-query-builder"; asd = "cl-opensearch-query-builder"; }); @@ -21424,11 +21584,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-opus = (build-asdf-system { pname = "cl-opus"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-opus" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-opus/2023-10-21/cl-opus-20231021-git.tgz"; - sha256 = "1ss9k50qgbcms9m8bh414jvc6n03zjkxj8577a3s9p4764mbwrqq"; + url = "http://beta.quicklisp.org/archive/cl-opus/2024-10-12/cl-opus-20241012-git.tgz"; + sha256 = "183xjlqjwildm1fb8piiic1f6l9fx4mxf9gcagpav8r60d1wmbpm"; system = "cl-opus"; asd = "cl-opus"; }); @@ -21582,11 +21742,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-paths = (build-asdf-system { pname = "cl-paths"; - version = "20180228-git"; + version = "20241012-git"; asds = [ "cl-paths" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; - sha256 = "0nckw4zb6s96hll8hrxzvgs2an3bfm0pxcywshbm4bq4rn7niqg4"; + url = "http://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz"; + sha256 = "1nkmmn38y6af10ysff3g2qkf5lb2601dcjp5rffsjh6bv2ik2jd5"; system = "cl-paths"; asd = "cl-paths"; }); @@ -21596,11 +21756,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-paths-ttf = (build-asdf-system { pname = "cl-paths-ttf"; - version = "20180228-git"; + version = "20241012-git"; asds = [ "cl-paths-ttf" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; - sha256 = "0nckw4zb6s96hll8hrxzvgs2an3bfm0pxcywshbm4bq4rn7niqg4"; + url = "http://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz"; + sha256 = "1nkmmn38y6af10ysff3g2qkf5lb2601dcjp5rffsjh6bv2ik2jd5"; system = "cl-paths-ttf"; asd = "cl-paths-ttf"; }); @@ -21640,16 +21800,16 @@ in lib.makeScope pkgs.newScope (self: { }); cl-patterns = (build-asdf-system { pname = "cl-patterns"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-patterns" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-patterns/2023-10-21/cl-patterns-20231021-git.tgz"; - sha256 = "0h7k46xb069k596z34zj9xgibv4rdlzq8b8kfhy2m6j186zy9vwg"; + url = "http://beta.quicklisp.org/archive/cl-patterns/2024-10-12/cl-patterns-20241012-git.tgz"; + sha256 = "0g0q514fn1hxq518358yy2va4cb9xxqwds9cglw133qxy0wsjllh"; system = "cl-patterns"; asd = "cl-patterns"; }); systems = [ "cl-patterns" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "closer-mop" self) (getAttr "dissect" self) (getAttr "local-time" self) (getAttr "mutility" self) (getAttr "named-readtables" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "closer-mop" self) (getAttr "local-time" self) (getAttr "mutility" self) (getAttr "named-readtables" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -21926,11 +22086,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-plus-c = (build-asdf-system { pname = "cl-plus-c"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-plus-c" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-autowrap/2023-10-21/cl-autowrap-20231021-git.tgz"; - sha256 = "063pc7akxbsaayzpgz16dzkh0434s80h61k7mi7xq5isgzfjka2k"; + url = "http://beta.quicklisp.org/archive/cl-autowrap/2024-10-12/cl-autowrap-20241012-git.tgz"; + sha256 = "1sfvhyrwm9dhxi0y42xp7mx8mvs6lmq3bzxdx34frxni5srcgly0"; system = "cl-plus-c"; asd = "cl-plus-c"; }); @@ -21942,11 +22102,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-plus-ssl-osx-fix = (build-asdf-system { pname = "cl-plus-ssl-osx-fix"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-plus-ssl-osx-fix" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2023-10-21/cl-plus-ssl-osx-fix-20231021-git.tgz"; - sha256 = "03bm88jqmkf7mwbqrw4x3zj0r6rjvmhkbhi5ijw1iqiyb451bxq9"; + url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2024-10-12/cl-plus-ssl-osx-fix-20241012-git.tgz"; + sha256 = "0rkrazia05zzwzd9vx2kl1azwgjy0d4pvfmwp5mjmqsvpklgacwv"; system = "cl-plus-ssl-osx-fix"; asd = "cl-plus-ssl-osx-fix"; }); @@ -21958,11 +22118,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-plus-ssl-osx-fix-ci = (build-asdf-system { pname = "cl-plus-ssl-osx-fix-ci"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-plus-ssl-osx-fix-ci" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2023-10-21/cl-plus-ssl-osx-fix-20231021-git.tgz"; - sha256 = "03bm88jqmkf7mwbqrw4x3zj0r6rjvmhkbhi5ijw1iqiyb451bxq9"; + url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2024-10-12/cl-plus-ssl-osx-fix-20241012-git.tgz"; + sha256 = "0rkrazia05zzwzd9vx2kl1azwgjy0d4pvfmwp5mjmqsvpklgacwv"; system = "cl-plus-ssl-osx-fix-ci"; asd = "cl-plus-ssl-osx-fix-ci"; }); @@ -21974,11 +22134,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-plus-ssl-osx-fix-docs = (build-asdf-system { pname = "cl-plus-ssl-osx-fix-docs"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-plus-ssl-osx-fix-docs" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2023-10-21/cl-plus-ssl-osx-fix-20231021-git.tgz"; - sha256 = "03bm88jqmkf7mwbqrw4x3zj0r6rjvmhkbhi5ijw1iqiyb451bxq9"; + url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2024-10-12/cl-plus-ssl-osx-fix-20241012-git.tgz"; + sha256 = "0rkrazia05zzwzd9vx2kl1azwgjy0d4pvfmwp5mjmqsvpklgacwv"; system = "cl-plus-ssl-osx-fix-docs"; asd = "cl-plus-ssl-osx-fix-docs"; }); @@ -21990,11 +22150,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-plus-ssl-osx-fix-tests = (build-asdf-system { pname = "cl-plus-ssl-osx-fix-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-plus-ssl-osx-fix-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2023-10-21/cl-plus-ssl-osx-fix-20231021-git.tgz"; - sha256 = "03bm88jqmkf7mwbqrw4x3zj0r6rjvmhkbhi5ijw1iqiyb451bxq9"; + url = "http://beta.quicklisp.org/archive/cl-plus-ssl-osx-fix/2024-10-12/cl-plus-ssl-osx-fix-20241012-git.tgz"; + sha256 = "0rkrazia05zzwzd9vx2kl1azwgjy0d4pvfmwp5mjmqsvpklgacwv"; system = "cl-plus-ssl-osx-fix-tests"; asd = "cl-plus-ssl-osx-fix-tests"; }); @@ -22086,11 +22246,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-postgres = (build-asdf-system { pname = "cl-postgres"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-postgres" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/postmodern/2023-10-21/postmodern-20231021-git.tgz"; - sha256 = "1abb80zmnawzl9g09css57kviwbqw5fcxhp3fjrzw7zc3n1wfr8y"; + url = "http://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz"; + sha256 = "1hj0dpclzihy1rcnwhiv16abmaa54wygxyib3j2h9q4qs26w7pzb"; system = "cl-postgres"; asd = "cl-postgres"; }); @@ -22100,11 +22260,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-postgres_plus_local-time = (build-asdf-system { pname = "cl-postgres+local-time"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-postgres+local-time" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/local-time/2023-10-21/local-time-20231021-git.tgz"; - sha256 = "05h40dq8bqx7p7ri67c81fkfm4zzbichyicrdj4srs0vvlwxiqpj"; + url = "http://beta.quicklisp.org/archive/local-time/2024-10-12/local-time-20241012-git.tgz"; + sha256 = "0jb1mb5zs4ryiah8zjzhpln1z686mfmpmvg1phgpr2mh9vvlgjk2"; system = "cl-postgres+local-time"; asd = "cl-postgres+local-time"; }); @@ -22162,11 +22322,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-ppcre = (build-asdf-system { pname = "cl-ppcre"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "cl-ppcre" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ppcre/2023-06-18/cl-ppcre-20230618-git.tgz"; - sha256 = "1l9q5bz9i8n241fcjfj5a769y0n4iybkv4zjhkf7dap5dmjyxwjr"; + url = "http://beta.quicklisp.org/archive/cl-ppcre/2024-10-12/cl-ppcre-20241012-git.tgz"; + sha256 = "0aw7lh79wgn18c75v29md2x8irl8v7f96lj1mfkp7x0mkqsb0cs8"; system = "cl-ppcre"; asd = "cl-ppcre"; }); @@ -22176,11 +22336,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-ppcre-template = (build-asdf-system { pname = "cl-ppcre-template"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "cl-ppcre-template" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-unification/2023-02-14/cl-unification-20230214-git.tgz"; - sha256 = "1ngb74ngn9j6pxkp0nddgnq32jpkr2gvnb71swvziqic1d93194l"; + url = "http://beta.quicklisp.org/archive/cl-unification/2024-10-12/cl-unification-20241012-git.tgz"; + sha256 = "1q7bjj9dzazhgj32291rqy4lld1ilrpck374c21864qn3pmz31ag"; system = "cl-ppcre-template"; asd = "cl-ppcre-template"; }); @@ -22190,11 +22350,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-ppcre-unicode = (build-asdf-system { pname = "cl-ppcre-unicode"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "cl-ppcre-unicode" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ppcre/2023-06-18/cl-ppcre-20230618-git.tgz"; - sha256 = "1l9q5bz9i8n241fcjfj5a769y0n4iybkv4zjhkf7dap5dmjyxwjr"; + url = "http://beta.quicklisp.org/archive/cl-ppcre/2024-10-12/cl-ppcre-20241012-git.tgz"; + sha256 = "0aw7lh79wgn18c75v29md2x8irl8v7f96lj1mfkp7x0mkqsb0cs8"; system = "cl-ppcre-unicode"; asd = "cl-ppcre-unicode"; }); @@ -22298,11 +22458,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-project = (build-asdf-system { pname = "cl-project"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-project" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-project/2023-10-21/cl-project-20231021-git.tgz"; - sha256 = "1m1vxhmc1rx5fk099qh2csgvr87qzfza8h6wk3l16rlyxk8gy4h5"; + url = "http://beta.quicklisp.org/archive/cl-project/2024-10-12/cl-project-20241012-git.tgz"; + sha256 = "12bvhs1ll6wxwgarvyxbrm978jxpvgj9vyqcbnwqmf5kqxjlrh0j"; system = "cl-project"; asd = "cl-project"; }); @@ -22314,11 +22474,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-project-test = (build-asdf-system { pname = "cl-project-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-project-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-project/2023-10-21/cl-project-20231021-git.tgz"; - sha256 = "1m1vxhmc1rx5fk099qh2csgvr87qzfza8h6wk3l16rlyxk8gy4h5"; + url = "http://beta.quicklisp.org/archive/cl-project/2024-10-12/cl-project-20241012-git.tgz"; + sha256 = "12bvhs1ll6wxwgarvyxbrm978jxpvgj9vyqcbnwqmf5kqxjlrh0j"; system = "cl-project-test"; asd = "cl-project-test"; }); @@ -22522,11 +22682,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-protobufs_dot_asdf = (build-asdf-system { pname = "cl-protobufs.asdf"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-protobufs.asdf" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-protobufs/2023-10-21/cl-protobufs-20231021-git.tgz"; - sha256 = "136lv5g3g8y7fq375p034iqk935z4nkln3f77x2aw2ljzqf0yd3g"; + url = "http://beta.quicklisp.org/archive/cl-protobufs/2024-10-12/cl-protobufs-20241012-git.tgz"; + sha256 = "08digcsyxs46pl7r5d945db5r2hbrxydqqcmzbgziq61ca4p0ifn"; system = "cl-protobufs.asdf"; asd = "cl-protobufs.asdf"; }); @@ -22538,11 +22698,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-pslib = (build-asdf-system { pname = "cl-pslib"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-pslib" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-pslib/2023-10-21/cl-pslib-20231021-git.tgz"; - sha256 = "0y582j86zgydnf6b12mgj2wv09m8qysqf5fdbzwsbx750hlkw435"; + url = "http://beta.quicklisp.org/archive/cl-pslib/2024-10-12/cl-pslib-20241012-git.tgz"; + sha256 = "12lg64nbjkxmaf212qr4i0msnsixc2cbqmxkdgqjii9rsyqdvrn6"; system = "cl-pslib"; asd = "cl-pslib"; }); @@ -22554,11 +22714,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-pslib-barcode = (build-asdf-system { pname = "cl-pslib-barcode"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-pslib-barcode" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-pslib-barcode/2023-10-21/cl-pslib-barcode-20231021-git.tgz"; - sha256 = "0smp878rzcphivhzvw0hwdzgqlbx384if2d9zd133hvz14dz0d1p"; + url = "http://beta.quicklisp.org/archive/cl-pslib-barcode/2024-10-12/cl-pslib-barcode-20241012-git.tgz"; + sha256 = "1n17yv7qr6i6dhbjrcc1binlxxkc1p5blj9nwn6g26fyvakgwrsb"; system = "cl-pslib-barcode"; asd = "cl-pslib-barcode"; }); @@ -22600,6 +22760,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + cl-qoa = (build-asdf-system { + pname = "cl-qoa"; + version = "20241012-git"; + asds = [ "cl-qoa" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-qoa/2024-10-12/cl-qoa-20241012-git.tgz"; + sha256 = "0gxrra0mvvkyvhvg7cc4bvi3nwdsnx0dbjszp41ch6dsdhd3pcpy"; + system = "cl-qoa"; + asd = "cl-qoa"; + }); + systems = [ "cl-qoa" ]; + lispLibs = [ (getAttr "binary-structures" self) (getAttr "documentation-utils" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); cl-qprint = (build-asdf-system { pname = "cl-qprint"; version = "20150804-git"; @@ -22774,11 +22950,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-readline = (build-asdf-system { pname = "cl-readline"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-readline" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-readline/2023-10-21/cl-readline-20231021-git.tgz"; - sha256 = "0xjf58vb99j41pndbiin7v4kmm0308a5d7jiin6rsbz47wrjzj52"; + url = "http://beta.quicklisp.org/archive/cl-readline/2024-10-12/cl-readline-20241012-git.tgz"; + sha256 = "0law12vnj1d5174kk9l949mgkkxm1x6kpcw5wixxjavmxxwqwric"; system = "cl-readline"; asd = "cl-readline"; }); @@ -22802,6 +22978,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + cl-reddit = (build-asdf-system { + pname = "cl-reddit"; + version = "20241012-git"; + asds = [ "cl-reddit" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-reddit/2024-10-12/cl-reddit-20241012-git.tgz"; + sha256 = "0jnc88mdz7hsmsncqrqmc8m8f1yd3n9087750kqpnn1sp1cwskk1"; + system = "cl-reddit"; + asd = "cl-reddit"; + }); + systems = [ "cl-reddit" ]; + lispLibs = [ (getAttr "drakma" self) (getAttr "yason" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); cl-redis = (build-asdf-system { pname = "cl-redis"; version = "20200925-git"; @@ -22896,6 +23088,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + cl-resvg = (build-asdf-system { + pname = "cl-resvg"; + version = "20241012-git"; + asds = [ "cl-resvg" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-resvg/2024-10-12/cl-resvg-20241012-git.tgz"; + sha256 = "0263na51qs0wrc9r2dqigj4a1h70pjf0mqsgbnd6hfshvx0kq1cl"; + system = "cl-resvg"; + asd = "cl-resvg"; + }); + systems = [ "cl-resvg" ]; + lispLibs = [ (getAttr "cffi" self) (getAttr "documentation-utils" self) (getAttr "float-features" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); cl-rethinkdb = (build-asdf-system { pname = "cl-rethinkdb"; version = "20160825-git"; @@ -23388,11 +23596,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-sat_dot_minisat = (build-asdf-system { pname = "cl-sat.minisat"; - version = "20220331-git"; + version = "20241012-git"; asds = [ "cl-sat.minisat" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sat.minisat/2022-03-31/cl-sat.minisat-20220331-git.tgz"; - sha256 = "1jrpsdalz9wd3aipfvigimzgzrlb6fylw9cxf1vhhmii46yg9mdr"; + url = "http://beta.quicklisp.org/archive/cl-sat.minisat/2024-10-12/cl-sat.minisat-20241012-git.tgz"; + sha256 = "00h5smjs60r1abq27w2ayg55ypsw32769pkk72mrikyn29r6z9ni"; system = "cl-sat.minisat"; asd = "cl-sat.minisat"; }); @@ -23402,11 +23610,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-sat_dot_minisat_dot_test = (build-asdf-system { pname = "cl-sat.minisat.test"; - version = "20220331-git"; + version = "20241012-git"; asds = [ "cl-sat.minisat.test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sat.minisat/2022-03-31/cl-sat.minisat-20220331-git.tgz"; - sha256 = "1jrpsdalz9wd3aipfvigimzgzrlb6fylw9cxf1vhhmii46yg9mdr"; + url = "http://beta.quicklisp.org/archive/cl-sat.minisat/2024-10-12/cl-sat.minisat-20241012-git.tgz"; + sha256 = "00h5smjs60r1abq27w2ayg55ypsw32769pkk72mrikyn29r6z9ni"; system = "cl-sat.minisat.test"; asd = "cl-sat.minisat.test"; }); @@ -23800,11 +24008,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-skkserv = (build-asdf-system { pname = "cl-skkserv"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-skkserv" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-skkserv/2023-10-21/cl-skkserv-20231021-git.tgz"; - sha256 = "1cidiyszsvgyh5s682cg90li7fxc1yfaw67hbln43hb2wrv83gls"; + url = "http://beta.quicklisp.org/archive/cl-skkserv/2024-10-12/cl-skkserv-20241012-git.tgz"; + sha256 = "1fnar6iw6hr5w37sc96zk9kdcgam8bm71l26l7c6f5daxk57labi"; system = "cl-skkserv"; asd = "cl-skkserv"; }); @@ -23940,18 +24148,34 @@ in lib.makeScope pkgs.newScope (self: { }); cl-smtp = (build-asdf-system { pname = "cl-smtp"; - version = "20210228-git"; + version = "20241012-git"; asds = [ "cl-smtp" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-smtp/2021-02-28/cl-smtp-20210228-git.tgz"; - sha256 = "0vjjfapcrdc5671jz2d24h8zvpz7skq1x6pi9fvw6ls5sgms6fr0"; + url = "http://beta.quicklisp.org/archive/cl-smtp/2024-10-12/cl-smtp-20241012-git.tgz"; + sha256 = "1r4gsklf4p163hn4ylabx7lp5zkz27v6gq3rkyrvwb7qz6sv8ws4"; system = "cl-smtp"; asd = "cl-smtp"; }); systems = [ "cl-smtp" ]; - lispLibs = [ (getAttr "cl_plus_ssl" self) (getAttr "cl-base64" self) (getAttr "flexi-streams" self) (getAttr "trivial-gray-streams" self) (getAttr "usocket" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "cl_plus_ssl" self) (getAttr "cl-base64" self) (getAttr "flexi-streams" self) (getAttr "frugal-uuid" self) (getAttr "usocket" self) ]; meta = {}; }); + cl-smtp-tests = (build-asdf-system { + pname = "cl-smtp-tests"; + version = "20241012-git"; + asds = [ "cl-smtp-tests" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-smtp/2024-10-12/cl-smtp-20241012-git.tgz"; + sha256 = "1r4gsklf4p163hn4ylabx7lp5zkz27v6gq3rkyrvwb7qz6sv8ws4"; + system = "cl-smtp-tests"; + asd = "cl-smtp-tests"; + }); + systems = [ "cl-smtp-tests" ]; + lispLibs = [ (getAttr "cl-smtp" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); cl-soil = (build-asdf-system { pname = "cl-soil"; version = "release-quicklisp-f27087ce-git"; @@ -24144,11 +24368,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-ssh-keys = (build-asdf-system { pname = "cl-ssh-keys"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-ssh-keys" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ssh-keys/2023-10-21/cl-ssh-keys-20231021-git.tgz"; - sha256 = "1nszwlgycbisjdfcvqxjs9zl9gbwkvhk0ccr4hzjr14h30p3m3px"; + url = "http://beta.quicklisp.org/archive/cl-ssh-keys/2024-10-12/cl-ssh-keys-20241012-git.tgz"; + sha256 = "037j89fjjrld46m9j71x6zfixdm7irwd58c08j0gq6w09qjlk5l2"; system = "cl-ssh-keys"; asd = "cl-ssh-keys"; }); @@ -24160,11 +24384,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-ssh-keys_dot_test = (build-asdf-system { pname = "cl-ssh-keys.test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-ssh-keys.test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ssh-keys/2023-10-21/cl-ssh-keys-20231021-git.tgz"; - sha256 = "1nszwlgycbisjdfcvqxjs9zl9gbwkvhk0ccr4hzjr14h30p3m3px"; + url = "http://beta.quicklisp.org/archive/cl-ssh-keys/2024-10-12/cl-ssh-keys-20241012-git.tgz"; + sha256 = "037j89fjjrld46m9j71x6zfixdm7irwd58c08j0gq6w09qjlk5l2"; system = "cl-ssh-keys.test"; asd = "cl-ssh-keys.test"; }); @@ -24208,11 +24432,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-steamworks = (build-asdf-system { pname = "cl-steamworks"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-steamworks" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-steamworks/2023-10-21/cl-steamworks-20231021-git.tgz"; - sha256 = "0i1mcgsvy743m0hym3088ixm32as43wji1gfvfg845hbnf5jygmm"; + url = "http://beta.quicklisp.org/archive/cl-steamworks/2024-10-12/cl-steamworks-20241012-git.tgz"; + sha256 = "0401gfmzcc29pm15yyl0p36id0yza2i02wixma2zl8ah3cxb39w5"; system = "cl-steamworks"; asd = "cl-steamworks"; }); @@ -24224,11 +24448,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-steamworks-generator = (build-asdf-system { pname = "cl-steamworks-generator"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-steamworks-generator" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-steamworks/2023-10-21/cl-steamworks-20231021-git.tgz"; - sha256 = "0i1mcgsvy743m0hym3088ixm32as43wji1gfvfg845hbnf5jygmm"; + url = "http://beta.quicklisp.org/archive/cl-steamworks/2024-10-12/cl-steamworks-20241012-git.tgz"; + sha256 = "0401gfmzcc29pm15yyl0p36id0yza2i02wixma2zl8ah3cxb39w5"; system = "cl-steamworks-generator"; asd = "cl-steamworks-generator"; }); @@ -24430,11 +24654,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-svg = (build-asdf-system { pname = "cl-svg"; - version = "20180228-git"; + version = "20241012-git"; asds = [ "cl-svg" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-svg/2018-02-28/cl-svg-20180228-git.tgz"; - sha256 = "11rmzimy6j7ln7q5y1h2kw1225rsfb6fpn89qjcq7h5lc8fay0wz"; + url = "http://beta.quicklisp.org/archive/cl-svg/2024-10-12/cl-svg-20241012-git.tgz"; + sha256 = "05zrg6sxi01xn940c7lygfgxwjkq0zmlkihbhm7lhfaszg2xj8bh"; system = "cl-svg"; asd = "cl-svg"; }); @@ -24722,27 +24946,27 @@ in lib.makeScope pkgs.newScope (self: { }); cl-telegram-bot = (build-asdf-system { pname = "cl-telegram-bot"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "cl-telegram-bot" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2023-06-18/cl-telegram-bot-20230618-git.tgz"; - sha256 = "11a1fswifiaa14ilzp1lsncwvmqwgwlcxccx16sa1j3ip44lbr3v"; + url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2024-10-12/cl-telegram-bot-20241012-git.tgz"; + sha256 = "1i1g9ax46b5jyx2nckp2q00asb46wwlin0hj5wlqlp7cb27r3dqj"; system = "cl-telegram-bot"; asd = "cl-telegram-bot"; }); systems = [ "cl-telegram-bot" ]; - lispLibs = [ (getAttr "_40ants-asdf-system" self) (getAttr "alexandria" self) (getAttr "arrows" self) (getAttr "bordeaux-threads" self) (getAttr "cl-ppcre" self) (getAttr "cl-strings" self) (getAttr "closer-mop" self) (getAttr "dexador" self) (getAttr "jonathan" self) (getAttr "kebab" self) (getAttr "log4cl" self) (getAttr "serapeum" self) (getAttr "trivial-backtrace" self) ]; + lispLibs = [ (getAttr "_40ants-asdf-system" self) (getAttr "alexandria" self) (getAttr "arrows" self) (getAttr "bordeaux-threads" self) (getAttr "cl-ppcre" self) (getAttr "cl-strings" self) (getAttr "closer-mop" self) (getAttr "dexador" self) (getAttr "jonathan" self) (getAttr "kebab" self) (getAttr "log4cl" self) (getAttr "serapeum" self) (getAttr "str" self) (getAttr "trivial-backtrace" self) ]; meta = { hydraPlatforms = [ ]; }; }); cl-telegram-bot-ci = (build-asdf-system { pname = "cl-telegram-bot-ci"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "cl-telegram-bot-ci" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2023-06-18/cl-telegram-bot-20230618-git.tgz"; - sha256 = "11a1fswifiaa14ilzp1lsncwvmqwgwlcxccx16sa1j3ip44lbr3v"; + url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2024-10-12/cl-telegram-bot-20241012-git.tgz"; + sha256 = "1i1g9ax46b5jyx2nckp2q00asb46wwlin0hj5wlqlp7cb27r3dqj"; system = "cl-telegram-bot-ci"; asd = "cl-telegram-bot-ci"; }); @@ -24754,11 +24978,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-telegram-bot-docs = (build-asdf-system { pname = "cl-telegram-bot-docs"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "cl-telegram-bot-docs" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2023-06-18/cl-telegram-bot-20230618-git.tgz"; - sha256 = "11a1fswifiaa14ilzp1lsncwvmqwgwlcxccx16sa1j3ip44lbr3v"; + url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2024-10-12/cl-telegram-bot-20241012-git.tgz"; + sha256 = "1i1g9ax46b5jyx2nckp2q00asb46wwlin0hj5wlqlp7cb27r3dqj"; system = "cl-telegram-bot-docs"; asd = "cl-telegram-bot-docs"; }); @@ -24770,11 +24994,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-telegram-bot-tests = (build-asdf-system { pname = "cl-telegram-bot-tests"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "cl-telegram-bot-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2023-06-18/cl-telegram-bot-20230618-git.tgz"; - sha256 = "11a1fswifiaa14ilzp1lsncwvmqwgwlcxccx16sa1j3ip44lbr3v"; + url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2024-10-12/cl-telegram-bot-20241012-git.tgz"; + sha256 = "1i1g9ax46b5jyx2nckp2q00asb46wwlin0hj5wlqlp7cb27r3dqj"; system = "cl-telegram-bot-tests"; asd = "cl-telegram-bot-tests"; }); @@ -24928,11 +25152,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-threadpool = (build-asdf-system { pname = "cl-threadpool"; - version = "quickload-current-release-6f50a83e-git"; + version = "quickload-current-release-feda6ff9-git"; asds = [ "cl-threadpool" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-threadpool/2023-06-18/cl-threadpool-quickload-current-release-6f50a83e-git.tgz"; - sha256 = "17zdinrp31d6b9fdb2mi83cwmcgpj7wqzbqy5kjlfc6p6jspcqln"; + url = "http://beta.quicklisp.org/archive/cl-threadpool/2024-10-12/cl-threadpool-quickload-current-release-feda6ff9-git.tgz"; + sha256 = "0y2kai8ijz0y6j54svvdrl2f2v96pz0pl652x86lz7pl4yyg99vr"; system = "cl-threadpool"; asd = "cl-threadpool"; }); @@ -24960,11 +25184,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-tiled = (build-asdf-system { pname = "cl-tiled"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-tiled" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tiled/2023-10-21/cl-tiled-20231021-git.tgz"; - sha256 = "0nbzpirmlg23sy5ds9p87fnd2gb8i2j8np4kvd8w8d6l5hrdqavi"; + url = "http://beta.quicklisp.org/archive/cl-tiled/2024-10-12/cl-tiled-20241012-git.tgz"; + sha256 = "0ni61iahr58i44psk4z3q1w9nsxbc49m5wbb8w0icm4f7x0ijn07"; system = "cl-tiled"; asd = "cl-tiled"; }); @@ -25088,11 +25312,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-tqdm = (build-asdf-system { pname = "cl-tqdm"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "cl-tqdm" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tqdm/2023-06-18/cl-tqdm-20230618-git.tgz"; - sha256 = "12qkl7l83smdv5laz6hkgy5462dygc5i0ng9w7nila9j3zr0cc3y"; + url = "http://beta.quicklisp.org/archive/cl-tqdm/2024-10-12/cl-tqdm-20241012-git.tgz"; + sha256 = "0wlbgs7wfiy149d7zq5bpkm8g3785b1crcf2m802f9qhin2r0nzg"; system = "cl-tqdm"; asd = "cl-tqdm"; }); @@ -25102,38 +25326,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - cl-transit = (build-asdf-system { - pname = "cl-transit"; - version = "20231021-git"; - asds = [ "cl-transit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-transit/2023-10-21/cl-transit-20231021-git.tgz"; - sha256 = "0s3wlcdaliivi48p6qcwpwfb5rpqcizy7h3ykq01khy49rx6fajm"; - system = "cl-transit"; - asd = "cl-transit"; - }); - systems = [ "cl-transit" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "bit-smasher" self) (getAttr "cl-messagepack" self) (getAttr "com_dot_inuoe_dot_jzon" self) (getAttr "flexi-streams" self) (getAttr "fset" self) (getAttr "local-time" self) (getAttr "parse-float" self) (getAttr "quri" self) (getAttr "serapeum" self) (getAttr "uuid" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - cl-transit-tests = (build-asdf-system { - pname = "cl-transit-tests"; - version = "20231021-git"; - asds = [ "cl-transit-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-transit/2023-10-21/cl-transit-20231021-git.tgz"; - sha256 = "0s3wlcdaliivi48p6qcwpwfb5rpqcizy7h3ykq01khy49rx6fajm"; - system = "cl-transit-tests"; - asd = "cl-transit-tests"; - }); - systems = [ "cl-transit-tests" ]; - lispLibs = [ (getAttr "cl-transit" self) (getAttr "dexador" self) (getAttr "fiveam" self) (getAttr "marshal" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); cl-transmission = (build-asdf-system { pname = "cl-transmission"; version = "20200325-git"; @@ -25358,11 +25550,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-unicode = (build-asdf-system { pname = "cl-unicode"; - version = "20210228-git"; + version = "20241012-git"; asds = [ "cl-unicode" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-unicode/2021-02-28/cl-unicode-20210228-git.tgz"; - sha256 = "1a9gbzvi5gj3z9gcia1rgmnk0dzgc82vz47bgnfvhn4q0c7mvk31"; + url = "http://beta.quicklisp.org/archive/cl-unicode/2024-10-12/cl-unicode-20241012-git.tgz"; + sha256 = "14ydcjkj94mmx40vs27w8137lgmw16jjhpr5m46mm6gqv46yvr6l"; system = "cl-unicode"; asd = "cl-unicode"; }); @@ -25372,11 +25564,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-unification = (build-asdf-system { pname = "cl-unification"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "cl-unification" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-unification/2023-02-14/cl-unification-20230214-git.tgz"; - sha256 = "1ngb74ngn9j6pxkp0nddgnq32jpkr2gvnb71swvziqic1d93194l"; + url = "http://beta.quicklisp.org/archive/cl-unification/2024-10-12/cl-unification-20241012-git.tgz"; + sha256 = "1q7bjj9dzazhgj32291rqy4lld1ilrpck374c21864qn3pmz31ag"; system = "cl-unification"; asd = "cl-unification"; }); @@ -25386,11 +25578,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-unification-lib = (build-asdf-system { pname = "cl-unification-lib"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "cl-unification-lib" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-unification/2023-02-14/cl-unification-20230214-git.tgz"; - sha256 = "1ngb74ngn9j6pxkp0nddgnq32jpkr2gvnb71swvziqic1d93194l"; + url = "http://beta.quicklisp.org/archive/cl-unification/2024-10-12/cl-unification-20241012-git.tgz"; + sha256 = "1q7bjj9dzazhgj32291rqy4lld1ilrpck374c21864qn3pmz31ag"; system = "cl-unification-lib"; asd = "cl-unification-lib"; }); @@ -25402,11 +25594,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-unification-test = (build-asdf-system { pname = "cl-unification-test"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "cl-unification-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-unification/2023-02-14/cl-unification-20230214-git.tgz"; - sha256 = "1ngb74ngn9j6pxkp0nddgnq32jpkr2gvnb71swvziqic1d93194l"; + url = "http://beta.quicklisp.org/archive/cl-unification/2024-10-12/cl-unification-20241012-git.tgz"; + sha256 = "1q7bjj9dzazhgj32291rqy4lld1ilrpck374c21864qn3pmz31ag"; system = "cl-unification-test"; asd = "cl-unification-test"; }); @@ -25464,11 +25656,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-vectors = (build-asdf-system { pname = "cl-vectors"; - version = "20180228-git"; + version = "20241012-git"; asds = [ "cl-vectors" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; - sha256 = "0nckw4zb6s96hll8hrxzvgs2an3bfm0pxcywshbm4bq4rn7niqg4"; + url = "http://beta.quicklisp.org/archive/cl-vectors/2024-10-12/cl-vectors-20241012-git.tgz"; + sha256 = "1nkmmn38y6af10ysff3g2qkf5lb2601dcjp5rffsjh6bv2ik2jd5"; system = "cl-vectors"; asd = "cl-vectors"; }); @@ -25606,11 +25798,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-vorbis = (build-asdf-system { pname = "cl-vorbis"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-vorbis" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-vorbis/2023-10-21/cl-vorbis-20231021-git.tgz"; - sha256 = "012rh2zbnxhsn9mmvmiid1s1dncah36v5jdpmrmjahhrkm2x6qjh"; + url = "http://beta.quicklisp.org/archive/cl-vorbis/2024-10-12/cl-vorbis-20241012-git.tgz"; + sha256 = "04p0ix2mxa8iv2dab19mlix6m3inwyb0rs5wsrf8r9l1n41dyp2p"; system = "cl-vorbis"; asd = "cl-vorbis"; }); @@ -25718,11 +25910,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-wavefront = (build-asdf-system { pname = "cl-wavefront"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-wavefront" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-wavefront/2023-10-21/cl-wavefront-20231021-git.tgz"; - sha256 = "0cz35a4dxvi7x6j5llh3i5ly2f55xzqjm9p43n7qjfngxagrg227"; + url = "http://beta.quicklisp.org/archive/cl-wavefront/2024-10-12/cl-wavefront-20241012-git.tgz"; + sha256 = "1il5i04x2ff3pnjm2pgvq0hryd9rnjdbczvinj3l3w30lj553g83"; system = "cl-wavefront"; asd = "cl-wavefront"; }); @@ -25814,11 +26006,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-webdriver-client = (build-asdf-system { pname = "cl-webdriver-client"; - version = "20211230-git"; + version = "20241012-git"; asds = [ "cl-webdriver-client" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-webdriver-client/2021-12-30/cl-webdriver-client-20211230-git.tgz"; - sha256 = "12ackxk5glsi2dg7kjn6gr1c6r6xnmd23hwsbb9fghwjl23cqlri"; + url = "http://beta.quicklisp.org/archive/cl-webdriver-client/2024-10-12/cl-webdriver-client-20241012-git.tgz"; + sha256 = "1975yyvvdxg11vgpyx93nkqr5x6i1xy47230vc40yd0c9bn6lpbr"; system = "cl-webdriver-client"; asd = "cl-webdriver-client"; }); @@ -25830,11 +26022,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-webdriver-client-test = (build-asdf-system { pname = "cl-webdriver-client-test"; - version = "20211230-git"; + version = "20241012-git"; asds = [ "cl-webdriver-client-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-webdriver-client/2021-12-30/cl-webdriver-client-20211230-git.tgz"; - sha256 = "12ackxk5glsi2dg7kjn6gr1c6r6xnmd23hwsbb9fghwjl23cqlri"; + url = "http://beta.quicklisp.org/archive/cl-webdriver-client/2024-10-12/cl-webdriver-client-20241012-git.tgz"; + sha256 = "1975yyvvdxg11vgpyx93nkqr5x6i1xy47230vc40yd0c9bn6lpbr"; system = "cl-webdriver-client-test"; asd = "cl-webdriver-client-test"; }); @@ -25846,11 +26038,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-webkit2 = (build-asdf-system { pname = "cl-webkit2"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cl-webkit2" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-webkit/2023-10-21/cl-webkit-20231021-git.tgz"; - sha256 = "1n04zpsrb70sfl9mnq4kjrwqszij7fg15nfgn0242yhkyh57vw5p"; + url = "http://beta.quicklisp.org/archive/cl-webkit/2024-10-12/cl-webkit-20241012-git.tgz"; + sha256 = "1ppx4pdnx3c41hp1j8msvpyw22ck2lll2f4ap5hyfvhadp07g3m5"; system = "cl-webkit2"; asd = "cl-webkit2"; }); @@ -25860,11 +26052,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-who = (build-asdf-system { pname = "cl-who"; - version = "20220331-git"; + version = "20241012-git"; asds = [ "cl-who" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-who/2022-03-31/cl-who-20220331-git.tgz"; - sha256 = "1rdvs113q6d46cblwhsv1vmm31p952wyzkyibqix0ypadpczlgp5"; + url = "http://beta.quicklisp.org/archive/cl-who/2024-10-12/cl-who-20241012-git.tgz"; + sha256 = "1kfpy69dw0g7w7k0akimncpkxfqq85r08i2da8nw1dhk2hp6l8jc"; system = "cl-who"; asd = "cl-who"; }); @@ -25874,11 +26066,11 @@ in lib.makeScope pkgs.newScope (self: { }); cl-who-test = (build-asdf-system { pname = "cl-who-test"; - version = "20220331-git"; + version = "20241012-git"; asds = [ "cl-who-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-who/2022-03-31/cl-who-20220331-git.tgz"; - sha256 = "1rdvs113q6d46cblwhsv1vmm31p952wyzkyibqix0ypadpczlgp5"; + url = "http://beta.quicklisp.org/archive/cl-who/2024-10-12/cl-who-20241012-git.tgz"; + sha256 = "1kfpy69dw0g7w7k0akimncpkxfqq85r08i2da8nw1dhk2hp6l8jc"; system = "cl-who-test"; asd = "cl-who"; }); @@ -26336,11 +26528,11 @@ in lib.makeScope pkgs.newScope (self: { }); clack = (build-asdf-system { pname = "clack"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clack" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2023-10-21/clack-20231021-git.tgz"; - sha256 = "1w6ij1syv68vnm9xwp2q1lmnn92yafpbv7w1fyk012jxyqdsj4sy"; + url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz"; + sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3"; system = "clack"; asd = "clack"; }); @@ -26348,6 +26540,70 @@ in lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "lack" self) (getAttr "lack-middleware-backtrace" self) (getAttr "lack-util" self) (getAttr "swank" self) (getAttr "usocket" self) ]; meta = {}; }); + clack-cors = (build-asdf-system { + pname = "clack-cors"; + version = "20241012-git"; + asds = [ "clack-cors" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/clack-cors/2024-10-12/clack-cors-20241012-git.tgz"; + sha256 = "0bndzkrqmdq5cz7wfzr7kw2gy5vk8h1hmf3vplc6mqk7vr3zm6m2"; + system = "clack-cors"; + asd = "clack-cors"; + }); + systems = [ "clack-cors" ]; + lispLibs = [ (getAttr "_40ants-asdf-system" self) (getAttr "alexandria" self) (getAttr "log4cl" self) (getAttr "serapeum" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + clack-cors-ci = (build-asdf-system { + pname = "clack-cors-ci"; + version = "20241012-git"; + asds = [ "clack-cors-ci" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/clack-cors/2024-10-12/clack-cors-20241012-git.tgz"; + sha256 = "0bndzkrqmdq5cz7wfzr7kw2gy5vk8h1hmf3vplc6mqk7vr3zm6m2"; + system = "clack-cors-ci"; + asd = "clack-cors-ci"; + }); + systems = [ "clack-cors-ci" ]; + lispLibs = [ (getAttr "_40ants-ci" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + clack-cors-docs = (build-asdf-system { + pname = "clack-cors-docs"; + version = "20241012-git"; + asds = [ "clack-cors-docs" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/clack-cors/2024-10-12/clack-cors-20241012-git.tgz"; + sha256 = "0bndzkrqmdq5cz7wfzr7kw2gy5vk8h1hmf3vplc6mqk7vr3zm6m2"; + system = "clack-cors-docs"; + asd = "clack-cors-docs"; + }); + systems = [ "clack-cors-docs" ]; + lispLibs = [ (getAttr "_40ants-doc" self) (getAttr "clack-cors" self) (getAttr "docs-config" self) (getAttr "named-readtables" self) (getAttr "pythonic-string-reader" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + clack-cors-tests = (build-asdf-system { + pname = "clack-cors-tests"; + version = "20241012-git"; + asds = [ "clack-cors-tests" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/clack-cors/2024-10-12/clack-cors-20241012-git.tgz"; + sha256 = "0bndzkrqmdq5cz7wfzr7kw2gy5vk8h1hmf3vplc6mqk7vr3zm6m2"; + system = "clack-cors-tests"; + asd = "clack-cors-tests"; + }); + systems = [ "clack-cors-tests" ]; + lispLibs = [ (getAttr "clack-test" self) (getAttr "rove" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); clack-errors = (build-asdf-system { pname = "clack-errors"; version = "20190813-git"; @@ -26398,11 +26654,11 @@ in lib.makeScope pkgs.newScope (self: { }); clack-handler-hunchentoot = (build-asdf-system { pname = "clack-handler-hunchentoot"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clack-handler-hunchentoot" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2023-10-21/clack-20231021-git.tgz"; - sha256 = "1w6ij1syv68vnm9xwp2q1lmnn92yafpbv7w1fyk012jxyqdsj4sy"; + url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz"; + sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3"; system = "clack-handler-hunchentoot"; asd = "clack-handler-hunchentoot"; }); @@ -26414,11 +26670,11 @@ in lib.makeScope pkgs.newScope (self: { }); clack-handler-toot = (build-asdf-system { pname = "clack-handler-toot"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clack-handler-toot" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2023-10-21/clack-20231021-git.tgz"; - sha256 = "1w6ij1syv68vnm9xwp2q1lmnn92yafpbv7w1fyk012jxyqdsj4sy"; + url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz"; + sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3"; system = "clack-handler-toot"; asd = "clack-handler-toot"; }); @@ -26430,11 +26686,11 @@ in lib.makeScope pkgs.newScope (self: { }); clack-handler-woo = (build-asdf-system { pname = "clack-handler-woo"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clack-handler-woo" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/woo/2023-10-21/woo-20231021-git.tgz"; - sha256 = "0yzphn3c544vxj52z5h5zbvhz4ab3hm5mpsbsa57p0xa1gcm03r5"; + url = "http://beta.quicklisp.org/archive/woo/2024-10-12/woo-20241012-git.tgz"; + sha256 = "0nhxlb1qhkl20vknm44gx0cq5cks33rcljczfhgbnmpkzrdpdrrl"; system = "clack-handler-woo"; asd = "clack-handler-woo"; }); @@ -26446,11 +26702,11 @@ in lib.makeScope pkgs.newScope (self: { }); clack-handler-wookie = (build-asdf-system { pname = "clack-handler-wookie"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clack-handler-wookie" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2023-10-21/clack-20231021-git.tgz"; - sha256 = "1w6ij1syv68vnm9xwp2q1lmnn92yafpbv7w1fyk012jxyqdsj4sy"; + url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz"; + sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3"; system = "clack-handler-wookie"; asd = "clack-handler-wookie"; }); @@ -26462,11 +26718,11 @@ in lib.makeScope pkgs.newScope (self: { }); clack-pretend = (build-asdf-system { pname = "clack-pretend"; - version = "20210630-git"; + version = "20241012-git"; asds = [ "clack-pretend" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack-pretend/2021-06-30/clack-pretend-20210630-git.tgz"; - sha256 = "1fhbznnrfkg9n3ql97h4adaqf968gn7i9xpggb4zzszc8gwiyasg"; + url = "http://beta.quicklisp.org/archive/clack-pretend/2024-10-12/clack-pretend-20241012-git.tgz"; + sha256 = "0f9y264bdxspd3sfzf9hq7v0myvq5va0drw8kji1b4gyprmg995k"; system = "clack-pretend"; asd = "clack-pretend"; }); @@ -26476,13 +26732,77 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + clack-prometheus = (build-asdf-system { + pname = "clack-prometheus"; + version = "20241012-git"; + asds = [ "clack-prometheus" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/clack-prometheus/2024-10-12/clack-prometheus-20241012-git.tgz"; + sha256 = "1zkflszvxyhxn7m9c2f1k2snqwdzasbvscw5vpsglb50pczs9g0d"; + system = "clack-prometheus"; + asd = "clack-prometheus"; + }); + systems = [ "clack-prometheus" ]; + lispLibs = [ (getAttr "_40ants-asdf-system" self) (getAttr "cffi-grovel" self) (getAttr "lack-middleware-mount" self) (getAttr "prometheus" self) (getAttr "prometheus-gc" self) (getAttr "prometheus_dot_collectors_dot_process" self) (getAttr "prometheus_dot_collectors_dot_sbcl" self) (getAttr "prometheus_dot_formats_dot_text" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + clack-prometheus-ci = (build-asdf-system { + pname = "clack-prometheus-ci"; + version = "20241012-git"; + asds = [ "clack-prometheus-ci" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/clack-prometheus/2024-10-12/clack-prometheus-20241012-git.tgz"; + sha256 = "1zkflszvxyhxn7m9c2f1k2snqwdzasbvscw5vpsglb50pczs9g0d"; + system = "clack-prometheus-ci"; + asd = "clack-prometheus-ci"; + }); + systems = [ "clack-prometheus-ci" ]; + lispLibs = [ (getAttr "_40ants-ci" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + clack-prometheus-docs = (build-asdf-system { + pname = "clack-prometheus-docs"; + version = "20241012-git"; + asds = [ "clack-prometheus-docs" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/clack-prometheus/2024-10-12/clack-prometheus-20241012-git.tgz"; + sha256 = "1zkflszvxyhxn7m9c2f1k2snqwdzasbvscw5vpsglb50pczs9g0d"; + system = "clack-prometheus-docs"; + asd = "clack-prometheus-docs"; + }); + systems = [ "clack-prometheus-docs" ]; + lispLibs = [ (getAttr "_40ants-doc" self) (getAttr "clack-prometheus" self) (getAttr "docs-config" self) (getAttr "named-readtables" self) (getAttr "pythonic-string-reader" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + clack-prometheus-tests = (build-asdf-system { + pname = "clack-prometheus-tests"; + version = "20241012-git"; + asds = [ "clack-prometheus-tests" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/clack-prometheus/2024-10-12/clack-prometheus-20241012-git.tgz"; + sha256 = "1zkflszvxyhxn7m9c2f1k2snqwdzasbvscw5vpsglb50pczs9g0d"; + system = "clack-prometheus-tests"; + asd = "clack-prometheus-tests"; + }); + systems = [ "clack-prometheus-tests" ]; + lispLibs = [ (getAttr "rove" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); clack-socket = (build-asdf-system { pname = "clack-socket"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clack-socket" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2023-10-21/clack-20231021-git.tgz"; - sha256 = "1w6ij1syv68vnm9xwp2q1lmnn92yafpbv7w1fyk012jxyqdsj4sy"; + url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz"; + sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3"; system = "clack-socket"; asd = "clack-socket"; }); @@ -26540,11 +26860,11 @@ in lib.makeScope pkgs.newScope (self: { }); clack-test = (build-asdf-system { pname = "clack-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clack-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2023-10-21/clack-20231021-git.tgz"; - sha256 = "1w6ij1syv68vnm9xwp2q1lmnn92yafpbv7w1fyk012jxyqdsj4sy"; + url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz"; + sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3"; system = "clack-test"; asd = "clack-test"; }); @@ -26556,11 +26876,11 @@ in lib.makeScope pkgs.newScope (self: { }); clad = (build-asdf-system { pname = "clad"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "clad" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clad/2023-06-18/clad-20230618-git.tgz"; - sha256 = "0ssjjcj9mzkqgxqja7061gm63jlzshw9y0zpz4sdincai8bikyr7"; + url = "http://beta.quicklisp.org/archive/clad/2024-10-12/clad-20241012-git.tgz"; + sha256 = "1ah8d4wyd7yqchcnyjcnd27gx2m410cgybyp194ng1ipdpa4mm6n"; system = "clad"; asd = "clad"; }); @@ -26604,11 +26924,11 @@ in lib.makeScope pkgs.newScope (self: { }); classimp = (build-asdf-system { pname = "classimp"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "classimp" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/classimp/2023-06-18/classimp-20230618-git.tgz"; - sha256 = "0i343lmvbssbgszz9s33hsn21hkrib1rdmkmcncyf644aa6ps598"; + url = "http://beta.quicklisp.org/archive/classimp/2024-10-12/classimp-20241012-git.tgz"; + sha256 = "1sq34s5yrljh7fffllsscay7xi11lg03alrkyrh6xfwa2w7cnqmx"; system = "classimp"; asd = "classimp"; }); @@ -26620,11 +26940,11 @@ in lib.makeScope pkgs.newScope (self: { }); classimp-samples = (build-asdf-system { pname = "classimp-samples"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "classimp-samples" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/classimp/2023-06-18/classimp-20230618-git.tgz"; - sha256 = "0i343lmvbssbgszz9s33hsn21hkrib1rdmkmcncyf644aa6ps598"; + url = "http://beta.quicklisp.org/archive/classimp/2024-10-12/classimp-20241012-git.tgz"; + sha256 = "1sq34s5yrljh7fffllsscay7xi11lg03alrkyrh6xfwa2w7cnqmx"; system = "classimp-samples"; asd = "classimp-samples"; }); @@ -26666,11 +26986,11 @@ in lib.makeScope pkgs.newScope (self: { }); clast = (build-asdf-system { pname = "clast"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "clast" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clast/2023-02-14/clast-20230214-git.tgz"; - sha256 = "0v0d2h4wqpc8l0f3wsnp3xhag9diqx47crq6rjprs1ryajmzinfz"; + url = "http://beta.quicklisp.org/archive/clast/2024-10-12/clast-20241012-git.tgz"; + sha256 = "0509hrpd049s62s03wwb2mp24dfw8f0l8cg0vgq3s8wrsch7af2m"; system = "clast"; asd = "clast"; }); @@ -26682,11 +27002,11 @@ in lib.makeScope pkgs.newScope (self: { }); clath = (build-asdf-system { pname = "clath"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "clath" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clath/2023-02-14/clath-20230214-git.tgz"; - sha256 = "1i93r5q0rkxw9v0agi61m9hgwgj409rbwjvyi519gbf8wg0wzwir"; + url = "http://beta.quicklisp.org/archive/clath/2024-10-12/clath-20241012-git.tgz"; + sha256 = "0519jzm8r55am6f5w11pfbyq0bvn8jxkcz33kbrznwrf43xz5fcv"; system = "clath"; asd = "clath"; }); @@ -26714,11 +27034,11 @@ in lib.makeScope pkgs.newScope (self: { }); clavier = (build-asdf-system { pname = "clavier"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "clavier" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clavier/2023-02-14/clavier-20230214-git.tgz"; - sha256 = "1gjd0rhxs2x7gn3fw1hnxivmm4ca4f1wxlg0fqv8fdfabgzsvl5y"; + url = "http://beta.quicklisp.org/archive/clavier/2024-10-12/clavier-20241012-git.tgz"; + sha256 = "0v81ql9bbnsqaxcrv0ynm82xwifxvc6ysmfrn1lgphn4szx1p230"; system = "clavier"; asd = "clavier"; }); @@ -26730,11 +27050,11 @@ in lib.makeScope pkgs.newScope (self: { }); clavier_dot_test = (build-asdf-system { pname = "clavier.test"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "clavier.test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clavier/2023-02-14/clavier-20230214-git.tgz"; - sha256 = "1gjd0rhxs2x7gn3fw1hnxivmm4ca4f1wxlg0fqv8fdfabgzsvl5y"; + url = "http://beta.quicklisp.org/archive/clavier/2024-10-12/clavier-20241012-git.tgz"; + sha256 = "0v81ql9bbnsqaxcrv0ynm82xwifxvc6ysmfrn1lgphn4szx1p230"; system = "clavier.test"; asd = "clavier.test"; }); @@ -26858,11 +27178,11 @@ in lib.makeScope pkgs.newScope (self: { }); clazy = (build-asdf-system { pname = "clazy"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "clazy" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clazy/2023-02-14/clazy-20230214-git.tgz"; - sha256 = "0hv0sd3ax6h36l3yjxl8ypj6gs60f5r6mfgpfn23cabq5cz8g705"; + url = "http://beta.quicklisp.org/archive/clazy/2024-10-12/clazy-20241012-git.tgz"; + sha256 = "0z9iy89p4grj2a803nlrnvj335c6knmnlbicpf0b4br41j6q74xj"; system = "clazy"; asd = "clazy"; }); @@ -26954,11 +27274,11 @@ in lib.makeScope pkgs.newScope (self: { }); clerk = (build-asdf-system { pname = "clerk"; - version = "20220220-git"; + version = "20241012-git"; asds = [ "clerk" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clerk/2022-02-20/clerk-20220220-git.tgz"; - sha256 = "0x9rzdylgl6ingkg6g47wh7pb6k30mnl718y8ql1pg0vfd5y1hml"; + url = "http://beta.quicklisp.org/archive/clerk/2024-10-12/clerk-20241012-git.tgz"; + sha256 = "0p81ha537bfs8421y74vrvhi1h61f38djr3iwgab30f6sdfj4k8j"; system = "clerk"; asd = "clerk"; }); @@ -26970,11 +27290,11 @@ in lib.makeScope pkgs.newScope (self: { }); clerk-test = (build-asdf-system { pname = "clerk-test"; - version = "20220220-git"; + version = "20241012-git"; asds = [ "clerk-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clerk/2022-02-20/clerk-20220220-git.tgz"; - sha256 = "0x9rzdylgl6ingkg6g47wh7pb6k30mnl718y8ql1pg0vfd5y1hml"; + url = "http://beta.quicklisp.org/archive/clerk/2024-10-12/clerk-20241012-git.tgz"; + sha256 = "0p81ha537bfs8421y74vrvhi1h61f38djr3iwgab30f6sdfj4k8j"; system = "clerk-test"; asd = "clerk"; }); @@ -27080,11 +27400,11 @@ in lib.makeScope pkgs.newScope (self: { }); clgplot = (build-asdf-system { pname = "clgplot"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "clgplot" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clgplot/2022-11-06/clgplot-20221106-git.tgz"; - sha256 = "0qhhbdwahpn9ass9am9fdpvcnfpi4jrss60kip6jkkzgir9iyz0p"; + url = "http://beta.quicklisp.org/archive/clgplot/2024-10-12/clgplot-20241012-git.tgz"; + sha256 = "0sl5g33v1lpkjimmcs22f32hgnlfhz0ydd5rgy0ykwb7jf7x3pv7"; system = "clgplot"; asd = "clgplot"; }); @@ -27096,11 +27416,11 @@ in lib.makeScope pkgs.newScope (self: { }); clgplot-test = (build-asdf-system { pname = "clgplot-test"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "clgplot-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clgplot/2022-11-06/clgplot-20221106-git.tgz"; - sha256 = "0qhhbdwahpn9ass9am9fdpvcnfpi4jrss60kip6jkkzgir9iyz0p"; + url = "http://beta.quicklisp.org/archive/clgplot/2024-10-12/clgplot-20241012-git.tgz"; + sha256 = "0sl5g33v1lpkjimmcs22f32hgnlfhz0ydd5rgy0ykwb7jf7x3pv7"; system = "clgplot-test"; asd = "clgplot-test"; }); @@ -27160,11 +27480,11 @@ in lib.makeScope pkgs.newScope (self: { }); clim = (build-asdf-system { pname = "clim"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clim" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "clim"; asd = "clim"; }); @@ -27176,11 +27496,11 @@ in lib.makeScope pkgs.newScope (self: { }); clim-core = (build-asdf-system { pname = "clim-core"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clim-core" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "clim-core"; asd = "clim-core"; }); @@ -27192,11 +27512,11 @@ in lib.makeScope pkgs.newScope (self: { }); clim-debugger = (build-asdf-system { pname = "clim-debugger"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clim-debugger" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "clim-debugger"; asd = "clim-debugger"; }); @@ -27208,11 +27528,11 @@ in lib.makeScope pkgs.newScope (self: { }); clim-examples = (build-asdf-system { pname = "clim-examples"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clim-examples" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "clim-examples"; asd = "clim-examples"; }); @@ -27224,27 +27544,27 @@ in lib.makeScope pkgs.newScope (self: { }); clim-lisp = (build-asdf-system { pname = "clim-lisp"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clim-lisp" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "clim-lisp"; asd = "clim-lisp"; }); systems = [ "clim-lisp" ]; - lispLibs = [ (getAttr "bordeaux-threads" self) (getAttr "closer-mop" self) (getAttr "trivial-features" self) (getAttr "trivial-gray-streams" self) ]; + lispLibs = [ (getAttr "bordeaux-threads" self) (getAttr "closer-mop" self) (getAttr "cluffer" self) (getAttr "trivial-features" self) (getAttr "trivial-gray-streams" self) ]; meta = { hydraPlatforms = [ ]; }; }); clim-listener = (build-asdf-system { pname = "clim-listener"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clim-listener" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "clim-listener"; asd = "clim-listener"; }); @@ -27256,27 +27576,27 @@ in lib.makeScope pkgs.newScope (self: { }); clim-pdf = (build-asdf-system { pname = "clim-pdf"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clim-pdf" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "clim-pdf"; asd = "clim-pdf"; }); systems = [ "clim-pdf" ]; - lispLibs = [ (getAttr "cl-pdf" self) (getAttr "clim" self) (getAttr "clim-postscript" self) (getAttr "clim-postscript-font" self) (getAttr "flexi-streams" self) ]; + lispLibs = [ (getAttr "cl-pdf" self) (getAttr "cl-pdf-parser" self) (getAttr "clim" self) (getAttr "clim-postscript" self) (getAttr "clim-postscript-font" self) (getAttr "flexi-streams" self) ]; meta = { hydraPlatforms = [ ]; }; }); clim-postscript = (build-asdf-system { pname = "clim-postscript"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clim-postscript" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "clim-postscript"; asd = "clim-postscript"; }); @@ -27288,16 +27608,16 @@ in lib.makeScope pkgs.newScope (self: { }); clim-postscript-font = (build-asdf-system { pname = "clim-postscript-font"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clim-postscript-font" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "clim-postscript-font"; asd = "clim-postscript-font"; }); systems = [ "clim-postscript-font" ]; - lispLibs = [ (getAttr "clim" self) (getAttr "mcclim-backend-common" self) ]; + lispLibs = [ (getAttr "clim" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -27320,11 +27640,11 @@ in lib.makeScope pkgs.newScope (self: { }); climacs = (build-asdf-system { pname = "climacs"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "climacs" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/climacs/2023-02-14/climacs-20230214-git.tgz"; - sha256 = "1l6bjf99sybd3c1xv4ikwix3kh83rw5xplfkbra6xfqjyacl8n7h"; + url = "http://beta.quicklisp.org/archive/climacs/2024-10-12/climacs-20241012-git.tgz"; + sha256 = "0swbnsnavwaxpdcdsdag6iadc6v436pawbrzz6p8lkkbmbmc7yf8"; system = "climacs"; asd = "climacs"; }); @@ -27496,11 +27816,11 @@ in lib.makeScope pkgs.newScope (self: { }); clingon = (build-asdf-system { pname = "clingon"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clingon" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clingon/2023-10-21/clingon-20231021-git.tgz"; - sha256 = "1hp0g46b0rycwi3amlas1rbii5g2hyschp9grxz3b88q6437f6gc"; + url = "http://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz"; + sha256 = "0p8i9bkzzy4v0pg15dldrl73xri4kxyxa7si82bawh1dnnm53jgc"; system = "clingon"; asd = "clingon"; }); @@ -27512,11 +27832,11 @@ in lib.makeScope pkgs.newScope (self: { }); clingon_dot_demo = (build-asdf-system { pname = "clingon.demo"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clingon.demo" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clingon/2023-10-21/clingon-20231021-git.tgz"; - sha256 = "1hp0g46b0rycwi3amlas1rbii5g2hyschp9grxz3b88q6437f6gc"; + url = "http://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz"; + sha256 = "0p8i9bkzzy4v0pg15dldrl73xri4kxyxa7si82bawh1dnnm53jgc"; system = "clingon.demo"; asd = "clingon.demo"; }); @@ -27528,11 +27848,11 @@ in lib.makeScope pkgs.newScope (self: { }); clingon_dot_intro = (build-asdf-system { pname = "clingon.intro"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clingon.intro" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clingon/2023-10-21/clingon-20231021-git.tgz"; - sha256 = "1hp0g46b0rycwi3amlas1rbii5g2hyschp9grxz3b88q6437f6gc"; + url = "http://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz"; + sha256 = "0p8i9bkzzy4v0pg15dldrl73xri4kxyxa7si82bawh1dnnm53jgc"; system = "clingon.intro"; asd = "clingon.intro"; }); @@ -27544,11 +27864,11 @@ in lib.makeScope pkgs.newScope (self: { }); clingon_dot_test = (build-asdf-system { pname = "clingon.test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clingon.test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clingon/2023-10-21/clingon-20231021-git.tgz"; - sha256 = "1hp0g46b0rycwi3amlas1rbii5g2hyschp9grxz3b88q6437f6gc"; + url = "http://beta.quicklisp.org/archive/clingon/2024-10-12/clingon-20241012-git.tgz"; + sha256 = "0p8i9bkzzy4v0pg15dldrl73xri4kxyxa7si82bawh1dnnm53jgc"; system = "clingon.test"; asd = "clingon.test"; }); @@ -27560,11 +27880,11 @@ in lib.makeScope pkgs.newScope (self: { }); clip = (build-asdf-system { pname = "clip"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clip" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clip/2023-10-21/clip-20231021-git.tgz"; - sha256 = "1b9xd52zk5j5c78s7f5ybi22l1imb9wf492xfv591z6yajagqljv"; + url = "http://beta.quicklisp.org/archive/clip/2024-10-12/clip-20241012-git.tgz"; + sha256 = "1ikzfza4s5xl67bz4vi05hmqmkvs5qr2ycy1f6vi1ihsdvjfify0"; system = "clip"; asd = "clip"; }); @@ -27622,6 +27942,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + clith = (build-asdf-system { + pname = "clith"; + version = "20241012-git"; + asds = [ "clith" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/clith/2024-10-12/clith-20241012-git.tgz"; + sha256 = "02qfyrnihx9x6nwxgzlh2x6ymz90i524jg8gc5zsy9rcfqj2sfa7"; + system = "clith"; + asd = "clith"; + }); + systems = [ "clith" ]; + lispLibs = [ (getAttr "alexandria" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); clj = (build-asdf-system { pname = "clj"; version = "20201220-git"; @@ -27638,29 +27974,61 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + clj-arrows = (build-asdf-system { + pname = "clj-arrows"; + version = "20241012-git"; + asds = [ "clj-arrows" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/clj-arrows/2024-10-12/clj-arrows-20241012-git.tgz"; + sha256 = "0b0dpjbyk41h32laqa4hwlgximafkjgrgdahabyc3blkg5v7lill"; + system = "clj-arrows"; + asd = "clj-arrows"; + }); + systems = [ "clj-arrows" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + clj-arrows-test = (build-asdf-system { + pname = "clj-arrows-test"; + version = "20241012-git"; + asds = [ "clj-arrows-test" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/clj-arrows/2024-10-12/clj-arrows-20241012-git.tgz"; + sha256 = "0b0dpjbyk41h32laqa4hwlgximafkjgrgdahabyc3blkg5v7lill"; + system = "clj-arrows-test"; + asd = "clj-arrows-test"; + }); + systems = [ "clj-arrows-test" ]; + lispLibs = [ (getAttr "clj-arrows" self) (getAttr "fiveam" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); clj-con = (build-asdf-system { pname = "clj-con"; - version = "20210807-git"; + version = "20241012-git"; asds = [ "clj-con" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clj-con/2021-08-07/clj-con-20210807-git.tgz"; - sha256 = "0b996cfvl8nnjf2mh8ki4gdzrr4hhnhbmlgacw74hmfb6nqjb466"; + url = "http://beta.quicklisp.org/archive/clj-con/2024-10-12/clj-con-20241012-git.tgz"; + sha256 = "05zjw4ncwwpmckxqv61zhv1lcyfm7w4ic59ypcw5bypxwgkapa7c"; system = "clj-con"; asd = "clj-con"; }); systems = [ "clj-con" ]; - lispLibs = [ (getAttr "bordeaux-threads" self) ]; + lispLibs = [ (getAttr "atomics" self) (getAttr "bordeaux-threads" self) ]; meta = { hydraPlatforms = [ ]; }; }); clj-con-test = (build-asdf-system { pname = "clj-con-test"; - version = "20210807-git"; + version = "20241012-git"; asds = [ "clj-con-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clj-con/2021-08-07/clj-con-20210807-git.tgz"; - sha256 = "0b996cfvl8nnjf2mh8ki4gdzrr4hhnhbmlgacw74hmfb6nqjb466"; + url = "http://beta.quicklisp.org/archive/clj-con/2024-10-12/clj-con-20241012-git.tgz"; + sha256 = "05zjw4ncwwpmckxqv61zhv1lcyfm7w4ic59ypcw5bypxwgkapa7c"; system = "clj-con-test"; asd = "clj-con-test"; }); @@ -27672,11 +28040,11 @@ in lib.makeScope pkgs.newScope (self: { }); clj-re = (build-asdf-system { pname = "clj-re"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "clj-re" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clj-re/2022-11-06/clj-re-20221106-git.tgz"; - sha256 = "1ybcf687hybq2n9vag9i90mdx3cqajdj63q7vryxamp39zmgqks6"; + url = "http://beta.quicklisp.org/archive/clj-re/2024-10-12/clj-re-20241012-git.tgz"; + sha256 = "05d0xqnhd50hmvicaq3a08m52c12j7cmxz99mpmk10mp0cv572bl"; system = "clj-re"; asd = "clj-re"; }); @@ -27688,11 +28056,11 @@ in lib.makeScope pkgs.newScope (self: { }); clj-re-test = (build-asdf-system { pname = "clj-re-test"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "clj-re-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clj-re/2022-11-06/clj-re-20221106-git.tgz"; - sha256 = "1ybcf687hybq2n9vag9i90mdx3cqajdj63q7vryxamp39zmgqks6"; + url = "http://beta.quicklisp.org/archive/clj-re/2024-10-12/clj-re-20241012-git.tgz"; + sha256 = "05d0xqnhd50hmvicaq3a08m52c12j7cmxz99mpmk10mp0cv572bl"; system = "clj-re-test"; asd = "clj-re-test"; }); @@ -28217,16 +28585,48 @@ in lib.makeScope pkgs.newScope (self: { }); clobber = (build-asdf-system { pname = "clobber"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "clobber" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clobber/2022-11-06/clobber-20221106-git.tgz"; - sha256 = "0pqzfn2wqbzzwlwc3l84iv3i3wa9zfgnh14mq67h9qkib8wjzx3n"; + url = "http://beta.quicklisp.org/archive/clobber/2024-10-12/clobber-20241012-git.tgz"; + sha256 = "1n6j9q0czrzigw7vfahlylm1g8hmk7b1wm84jm94cgl8r5r3s8ra"; system = "clobber"; asd = "clobber"; }); systems = [ "clobber" ]; - lispLibs = [ ]; + lispLibs = [ (getAttr "clobber-base" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + clobber-base = (build-asdf-system { + pname = "clobber-base"; + version = "20241012-git"; + asds = [ "clobber-base" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/clobber/2024-10-12/clobber-20241012-git.tgz"; + sha256 = "1n6j9q0czrzigw7vfahlylm1g8hmk7b1wm84jm94cgl8r5r3s8ra"; + system = "clobber-base"; + asd = "clobber-base"; + }); + systems = [ "clobber-base" ]; + lispLibs = [ (getAttr "closer-mop" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + clobber-test = (build-asdf-system { + pname = "clobber-test"; + version = "20241012-git"; + asds = [ "clobber-test" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/clobber/2024-10-12/clobber-20241012-git.tgz"; + sha256 = "1n6j9q0czrzigw7vfahlylm1g8hmk7b1wm84jm94cgl8r5r3s8ra"; + system = "clobber-test"; + asd = "clobber-test"; + }); + systems = [ "clobber-test" ]; + lispLibs = [ (getAttr "clobber" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -28265,27 +28665,27 @@ in lib.makeScope pkgs.newScope (self: { }); clog = (build-asdf-system { pname = "clog"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clog" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clog/2023-10-21/clog-20231021-git.tgz"; - sha256 = "1hd59lwvhd8hfgh6nrgpsqrvwsh7jrpvi2rxaig67xr0zp476hak"; + url = "http://beta.quicklisp.org/archive/clog/2024-10-12/clog-20241012-git.tgz"; + sha256 = "0hqpj9ji7kfqgcxdfnc7x202qzmb7zdkmjwcyhdllqs6b0ssw5lx"; system = "clog"; asd = "clog"; }); systems = [ "clog" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "atomics" self) (getAttr "bordeaux-threads" self) (getAttr "cl-dbi" self) (getAttr "cl-isaac" self) (getAttr "cl-pass" self) (getAttr "cl-ppcre" self) (getAttr "cl-template" self) (getAttr "clack" self) (getAttr "closer-mop" self) (getAttr "hunchentoot" self) (getAttr "lack-middleware-static" self) (getAttr "lack-request" self) (getAttr "lack-util-writer-stream" self) (getAttr "mgl-pax" self) (getAttr "parse-float" self) (getAttr "quri" self) (getAttr "sqlite" self) (getAttr "trivial-open-browser" self) (getAttr "websocket-driver" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "atomics" self) (getAttr "bordeaux-threads" self) (getAttr "cl-dbi" self) (getAttr "cl-isaac" self) (getAttr "cl-pass" self) (getAttr "cl-ppcre" self) (getAttr "cl-template" self) (getAttr "clack" self) (getAttr "closer-mop" self) (getAttr "hunchentoot" self) (getAttr "lack-middleware-static" self) (getAttr "lack-request" self) (getAttr "lack-util-writer-stream" self) (getAttr "mgl-pax" self) (getAttr "parse-float" self) (getAttr "quri" self) (getAttr "sqlite" self) (getAttr "trivial-gray-streams" self) (getAttr "websocket-driver" self) ]; meta = { hydraPlatforms = [ ]; }; }); clog-ace = (build-asdf-system { pname = "clog-ace"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "clog-ace" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clog-ace/2022-11-06/clog-ace-20221106-git.tgz"; - sha256 = "0hci7qwbnjnjiy4jr6pkn3h4l9j80mypa4fi60adsz4fqm09yr41"; + url = "http://beta.quicklisp.org/archive/clog-ace/2024-10-12/clog-ace-20241012-git.tgz"; + sha256 = "01hwaiccy5i81w22kya00jscgpjw6iib2hnklqwky88i35kbb4sj"; system = "clog-ace"; asd = "clog-ace"; }); @@ -28297,11 +28697,11 @@ in lib.makeScope pkgs.newScope (self: { }); clog-collection = (build-asdf-system { pname = "clog-collection"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clog-collection" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clog-collection/2023-10-21/clog-collection-20231021-git.tgz"; - sha256 = "0jh9lpagspar6hjgq6s0gjv3qy1ykygy2gwb6dfppixz8s56fxri"; + url = "http://beta.quicklisp.org/archive/clog-collection/2024-10-12/clog-collection-20241012-git.tgz"; + sha256 = "0f6rw9sla5f7jglbisving0c97vz3a5bbn59li0jzngqp8rqwsqx"; system = "clog-collection"; asd = "clog-collection"; }); @@ -28313,11 +28713,11 @@ in lib.makeScope pkgs.newScope (self: { }); clog-plotly = (build-asdf-system { pname = "clog-plotly"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "clog-plotly" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clog-plotly/2022-11-06/clog-plotly-20221106-git.tgz"; - sha256 = "0jzpd41vchn6ag93kfrl8gd3ckds9rq6jpy34dlla6y5s2mbjbif"; + url = "http://beta.quicklisp.org/archive/clog-plotly/2024-10-12/clog-plotly-20241012-git.tgz"; + sha256 = "064fhfhh5nr1g9f4pn9x2ydmxdnxmvyxhwgbl3dgqm416scjzzs1"; system = "clog-plotly"; asd = "clog-plotly"; }); @@ -28329,11 +28729,11 @@ in lib.makeScope pkgs.newScope (self: { }); clog-terminal = (build-asdf-system { pname = "clog-terminal"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "clog-terminal" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clog-terminal/2022-11-06/clog-terminal-20221106-git.tgz"; - sha256 = "1ma7x3q4gak0ndwgbpnc1par3zcc6b02mpzwrgqmyi1251868rrq"; + url = "http://beta.quicklisp.org/archive/clog-terminal/2024-10-12/clog-terminal-20241012-git.tgz"; + sha256 = "1pvrja8fvdzqmiqzl23lb7665vcpx9lhwxahns81wlykkyx7cjd5"; system = "clog-terminal"; asd = "clog-terminal"; }); @@ -28345,11 +28745,11 @@ in lib.makeScope pkgs.newScope (self: { }); clohost = (build-asdf-system { pname = "clohost"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clohost" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clohost/2023-10-21/clohost-20231021-git.tgz"; - sha256 = "1spz32lrkxshbvfa0fdml0lcyxm0vys8yan5fsi540dqhbkiqxlj"; + url = "http://beta.quicklisp.org/archive/clohost/2024-10-12/clohost-20241012-git.tgz"; + sha256 = "1qph7nrjb62qxwkv5wbzqkycdavsjvi39b97qvs5g8jsrvbl50lh"; system = "clohost"; asd = "clohost"; }); @@ -28423,6 +28823,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + clos-encounters = (build-asdf-system { + pname = "clos-encounters"; + version = "20241012-git"; + asds = [ "clos-encounters" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/clos-encounters/2024-10-12/clos-encounters-20241012-git.tgz"; + sha256 = "021ygh6s5qb7l155bcp9qv1w2dhq9csscasp77vjlms1ahpq9ixf"; + system = "clos-encounters"; + asd = "clos-encounters"; + }); + systems = [ "clos-encounters" ]; + lispLibs = [ (getAttr "closer-mop" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); clos-fixtures = (build-asdf-system { pname = "clos-fixtures"; version = "20160825-git"; @@ -28457,11 +28873,11 @@ in lib.makeScope pkgs.newScope (self: { }); closer-mop = (build-asdf-system { pname = "closer-mop"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "closer-mop" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/closer-mop/2023-10-21/closer-mop-20231021-git.tgz"; - sha256 = "0vk255xp12y5jvrpnaak52286x33qsdsjyyh2hrgjyhi0155nn1l"; + url = "http://beta.quicklisp.org/archive/closer-mop/2024-10-12/closer-mop-20241012-git.tgz"; + sha256 = "1affaqh0sm1phs6qa12vbhf69abssjcpy55cwf4fi4nd6hgcrfqr"; system = "closer-mop"; asd = "closer-mop"; }); @@ -28563,11 +28979,11 @@ in lib.makeScope pkgs.newScope (self: { }); clouseau = (build-asdf-system { pname = "clouseau"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clouseau" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "clouseau"; asd = "clouseau"; }); @@ -28889,11 +29305,11 @@ in lib.makeScope pkgs.newScope (self: { }); clss = (build-asdf-system { pname = "clss"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clss" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clss/2023-10-21/clss-20231021-git.tgz"; - sha256 = "1js9flb5nj2z1wcyplbm5zimaan7dmd8bx9qg6nxprd8f2xrw3qy"; + url = "http://beta.quicklisp.org/archive/clss/2024-10-12/clss-20241012-git.tgz"; + sha256 = "1l2yq6wi8wmb7l8fy6w4xb3mb2yd9d14ijgqdsbnwb5k2hbmndbf"; system = "clss"; asd = "clss"; }); @@ -28919,11 +29335,11 @@ in lib.makeScope pkgs.newScope (self: { }); cluffer = (build-asdf-system { pname = "cluffer"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "cluffer" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2023-06-18/cluffer-20230618-git.tgz"; - sha256 = "1bncqb8lixr65vr07rpyb1i5h0jqnkfdpwbixk13q445xcl99fiz"; + url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; + sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg"; system = "cluffer"; asd = "cluffer"; }); @@ -28933,11 +29349,11 @@ in lib.makeScope pkgs.newScope (self: { }); cluffer-base = (build-asdf-system { pname = "cluffer-base"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "cluffer-base" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2023-06-18/cluffer-20230618-git.tgz"; - sha256 = "1bncqb8lixr65vr07rpyb1i5h0jqnkfdpwbixk13q445xcl99fiz"; + url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; + sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg"; system = "cluffer-base"; asd = "cluffer-base"; }); @@ -28949,11 +29365,11 @@ in lib.makeScope pkgs.newScope (self: { }); cluffer-simple-buffer = (build-asdf-system { pname = "cluffer-simple-buffer"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "cluffer-simple-buffer" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2023-06-18/cluffer-20230618-git.tgz"; - sha256 = "1bncqb8lixr65vr07rpyb1i5h0jqnkfdpwbixk13q445xcl99fiz"; + url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; + sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg"; system = "cluffer-simple-buffer"; asd = "cluffer-simple-buffer"; }); @@ -28965,11 +29381,11 @@ in lib.makeScope pkgs.newScope (self: { }); cluffer-simple-line = (build-asdf-system { pname = "cluffer-simple-line"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "cluffer-simple-line" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2023-06-18/cluffer-20230618-git.tgz"; - sha256 = "1bncqb8lixr65vr07rpyb1i5h0jqnkfdpwbixk13q445xcl99fiz"; + url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; + sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg"; system = "cluffer-simple-line"; asd = "cluffer-simple-line"; }); @@ -28981,11 +29397,11 @@ in lib.makeScope pkgs.newScope (self: { }); cluffer-standard-buffer = (build-asdf-system { pname = "cluffer-standard-buffer"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "cluffer-standard-buffer" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2023-06-18/cluffer-20230618-git.tgz"; - sha256 = "1bncqb8lixr65vr07rpyb1i5h0jqnkfdpwbixk13q445xcl99fiz"; + url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; + sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg"; system = "cluffer-standard-buffer"; asd = "cluffer-standard-buffer"; }); @@ -28997,11 +29413,11 @@ in lib.makeScope pkgs.newScope (self: { }); cluffer-standard-line = (build-asdf-system { pname = "cluffer-standard-line"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "cluffer-standard-line" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2023-06-18/cluffer-20230618-git.tgz"; - sha256 = "1bncqb8lixr65vr07rpyb1i5h0jqnkfdpwbixk13q445xcl99fiz"; + url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; + sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg"; system = "cluffer-standard-line"; asd = "cluffer-standard-line"; }); @@ -29013,11 +29429,11 @@ in lib.makeScope pkgs.newScope (self: { }); cluffer-test = (build-asdf-system { pname = "cluffer-test"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "cluffer-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2023-06-18/cluffer-20230618-git.tgz"; - sha256 = "1bncqb8lixr65vr07rpyb1i5h0jqnkfdpwbixk13q445xcl99fiz"; + url = "http://beta.quicklisp.org/archive/cluffer/2024-10-12/cluffer-20241012-git.tgz"; + sha256 = "1q5232v9vkjmiks2ciqj1fa1h3gh53rfhl301wp46jwra3r7qqyg"; system = "cluffer-test"; asd = "cluffer-test"; }); @@ -29101,11 +29517,11 @@ in lib.makeScope pkgs.newScope (self: { }); clunit2 = (build-asdf-system { pname = "clunit2"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "clunit2" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clunit2/2023-10-21/clunit2-20231021-git.tgz"; - sha256 = "06kfnfi1xn7sdvjq0wfbjdb6dv8pyjc2aqckkm2bq3d88k6jzb4f"; + url = "http://beta.quicklisp.org/archive/clunit2/2024-10-12/clunit2-20241012-git.tgz"; + sha256 = "03k4wc2zz31wcqcxy8fhq095i8xzcaxrzgrlrn2va10lcjs4v51b"; system = "clunit2"; asd = "clunit2"; }); @@ -29227,11 +29643,11 @@ in lib.makeScope pkgs.newScope (self: { }); clx = (build-asdf-system { pname = "clx"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "clx" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clx/2023-06-18/clx-20230618-git.tgz"; - sha256 = "0ivw1gxipxhixzazc0jlvs7pcfkdczdis7y23f4syrxkpzmgmirh"; + url = "http://beta.quicklisp.org/archive/clx/2024-10-12/clx-20241012-git.tgz"; + sha256 = "16l0badm7dxwi7x5ynk1scrbrilnxi1nzz79h1v15xi6b41pf65w"; system = "clx"; asd = "clx"; }); @@ -29257,11 +29673,11 @@ in lib.makeScope pkgs.newScope (self: { }); cmark = (build-asdf-system { pname = "cmark"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "cmark" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cmark/2023-02-14/cl-cmark-20230214-git.tgz"; - sha256 = "0d61z5y7pyv2y7sjbq3i5047z4jazkxnlqypr32yvyn5qdd78yfv"; + url = "http://beta.quicklisp.org/archive/cl-cmark/2024-10-12/cl-cmark-20241012-git.tgz"; + sha256 = "1l4i530161ppfz0wn1da7g7dwf644ppp1afrq2p7qfkajm7dcfg5"; system = "cmark"; asd = "cmark"; }); @@ -29273,11 +29689,11 @@ in lib.makeScope pkgs.newScope (self: { }); cmd = (build-asdf-system { pname = "cmd"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "cmd" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cmd/2023-06-18/cmd-20230618-git.tgz"; - sha256 = "03wbckzmz6pqdlz7pyar6nfg4vs4bl0b2np7n3kk3qhjbrdakc4m"; + url = "http://beta.quicklisp.org/archive/cmd/2024-10-12/cmd-20241012-git.tgz"; + sha256 = "0rs2priccm34yx8cj29214i4bwa908gqs1ss23gyjb7v5qcq1sj7"; system = "cmd"; asd = "cmd"; }); @@ -29319,6 +29735,70 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + coalton = (build-asdf-system { + pname = "coalton"; + version = "20241012-git"; + asds = [ "coalton" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz"; + sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7"; + system = "coalton"; + asd = "coalton"; + }); + systems = [ "coalton" ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "coalton-asdf" self) (getAttr "coalton-compiler" self) (getAttr "trivial-garbage" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + coalton-asdf = (build-asdf-system { + pname = "coalton-asdf"; + version = "20241012-git"; + asds = [ "coalton-asdf" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz"; + sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7"; + system = "coalton-asdf"; + asd = "coalton-asdf"; + }); + systems = [ "coalton-asdf" ]; + lispLibs = [ (getAttr "coalton-compiler" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + coalton-compiler = (build-asdf-system { + pname = "coalton-compiler"; + version = "20241012-git"; + asds = [ "coalton-compiler" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz"; + sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7"; + system = "coalton-compiler"; + asd = "coalton-compiler"; + }); + systems = [ "coalton-compiler" ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "concrete-syntax-tree" self) (getAttr "eclector" self) (getAttr "eclector-concrete-syntax-tree" self) (getAttr "float-features" self) (getAttr "fset" self) (getAttr "named-readtables" self) (getAttr "source-error" self) (getAttr "trivial-gray-streams" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + coalton-testing-example-project = (build-asdf-system { + pname = "coalton-testing-example-project"; + version = "20241012-git"; + asds = [ "coalton-testing-example-project" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz"; + sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7"; + system = "coalton-testing-example-project"; + asd = "coalton-testing-example-project"; + }); + systems = [ "coalton-testing-example-project" ]; + lispLibs = [ (getAttr "coalton" self) (getAttr "named-readtables" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); cocoahelper = (build-asdf-system { pname = "cocoahelper"; version = "20210807-git"; @@ -29335,13 +29815,29 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + cocoas = (build-asdf-system { + pname = "cocoas"; + version = "20241012-git"; + asds = [ "cocoas" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cocoas/2024-10-12/cocoas-20241012-git.tgz"; + sha256 = "0a3jpni8hnzd6103qj3nywy61c3jq6j9yzmg35wy4b8j94pgyvj5"; + system = "cocoas"; + asd = "cocoas"; + }); + systems = [ "cocoas" ]; + lispLibs = [ (getAttr "cffi" self) (getAttr "float-features" self) (getAttr "trivial-main-thread" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); codata-recommended-values = (build-asdf-system { pname = "codata-recommended-values"; - version = "20200218-git"; + version = "20241012-git"; asds = [ "codata-recommended-values" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/codata-recommended-values/2020-02-18/codata-recommended-values-20200218-git.tgz"; - sha256 = "0gm27bkq4ma9kc3adnbzyhchky38halb77qc30ll2097ahwy735p"; + url = "http://beta.quicklisp.org/archive/codata-recommended-values/2024-10-12/codata-recommended-values-20241012-git.tgz"; + sha256 = "0mks9hzw5wkdjkqkcfbafm9rvbfgkn2na4bajfrhs4mn7bg4bv74"; system = "codata-recommended-values"; asd = "codata-recommended-values"; }); @@ -29353,11 +29849,11 @@ in lib.makeScope pkgs.newScope (self: { }); codex = (build-asdf-system { pname = "codex"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "codex" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/codex/2023-10-21/codex-20231021-git.tgz"; - sha256 = "104qrs5nv6kffsdbf9sv4pba6yjssyk5hc6sppf2zxmcr2xwayfz"; + url = "http://beta.quicklisp.org/archive/codex/2024-10-12/codex-20241012-git.tgz"; + sha256 = "06d1qscqnkd24fhpvsm0206a4cj3wsxma7amazhvzqy1y4girgc3"; system = "codex"; asd = "codex"; }); @@ -29369,11 +29865,11 @@ in lib.makeScope pkgs.newScope (self: { }); codex-templates = (build-asdf-system { pname = "codex-templates"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "codex-templates" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/codex/2023-10-21/codex-20231021-git.tgz"; - sha256 = "104qrs5nv6kffsdbf9sv4pba6yjssyk5hc6sppf2zxmcr2xwayfz"; + url = "http://beta.quicklisp.org/archive/codex/2024-10-12/codex-20241012-git.tgz"; + sha256 = "06d1qscqnkd24fhpvsm0206a4cj3wsxma7amazhvzqy1y4girgc3"; system = "codex-templates"; asd = "codex-templates"; }); @@ -29385,11 +29881,11 @@ in lib.makeScope pkgs.newScope (self: { }); coleslaw = (build-asdf-system { pname = "coleslaw"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "coleslaw" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/coleslaw/2023-10-21/coleslaw-20231021-git.tgz"; - sha256 = "1iw532pfmxc4d4bdqh4ac19f1n960zrh31c4mv1swcv06px509yw"; + url = "http://beta.quicklisp.org/archive/coleslaw/2024-10-12/coleslaw-20241012-git.tgz"; + sha256 = "1p9hg5qnymxzx2bzcvkzjarwxw383misq0cmqgggpzyhignx80av"; system = "coleslaw"; asd = "coleslaw"; }); @@ -29401,11 +29897,11 @@ in lib.makeScope pkgs.newScope (self: { }); coleslaw-cli = (build-asdf-system { pname = "coleslaw-cli"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "coleslaw-cli" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/coleslaw/2023-10-21/coleslaw-20231021-git.tgz"; - sha256 = "1iw532pfmxc4d4bdqh4ac19f1n960zrh31c4mv1swcv06px509yw"; + url = "http://beta.quicklisp.org/archive/coleslaw/2024-10-12/coleslaw-20241012-git.tgz"; + sha256 = "1p9hg5qnymxzx2bzcvkzjarwxw383misq0cmqgggpzyhignx80av"; system = "coleslaw-cli"; asd = "coleslaw-cli"; }); @@ -29417,11 +29913,11 @@ in lib.makeScope pkgs.newScope (self: { }); coleslaw-test = (build-asdf-system { pname = "coleslaw-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "coleslaw-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/coleslaw/2023-10-21/coleslaw-20231021-git.tgz"; - sha256 = "1iw532pfmxc4d4bdqh4ac19f1n960zrh31c4mv1swcv06px509yw"; + url = "http://beta.quicklisp.org/archive/coleslaw/2024-10-12/coleslaw-20241012-git.tgz"; + sha256 = "1p9hg5qnymxzx2bzcvkzjarwxw383misq0cmqgggpzyhignx80av"; system = "coleslaw-test"; asd = "coleslaw-test"; }); @@ -29433,11 +29929,11 @@ in lib.makeScope pkgs.newScope (self: { }); collectors = (build-asdf-system { pname = "collectors"; - version = "20220220-git"; + version = "20241012-git"; asds = [ "collectors" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/collectors/2022-02-20/collectors-20220220-git.tgz"; - sha256 = "1mxcq7wq2jwbjd39afihpd46qkaidq76prgjbzpkv5749wf2spib"; + url = "http://beta.quicklisp.org/archive/collectors/2024-10-12/collectors-20241012-git.tgz"; + sha256 = "1kc9q05wyp8yjz5wqc73nar7l49vcnfhj4924li81v76hlb03665"; system = "collectors"; asd = "collectors"; }); @@ -29511,11 +30007,11 @@ in lib.makeScope pkgs.newScope (self: { }); colored = (build-asdf-system { pname = "colored"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "colored" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/colored/2023-10-21/colored-20231021-git.tgz"; - sha256 = "058984j8waw8my6vfjiccdh5jijn9kn2q7lk481zv0ygapqh373x"; + url = "http://beta.quicklisp.org/archive/colored/2024-10-12/colored-20241012-git.tgz"; + sha256 = "0msw83gs5m887n1ha54jhflqjxb2mc7yv1hifspv9g16fn6h355c"; system = "colored"; asd = "colored"; }); @@ -29527,11 +30023,11 @@ in lib.makeScope pkgs.newScope (self: { }); colored-test = (build-asdf-system { pname = "colored-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "colored-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/colored/2023-10-21/colored-20231021-git.tgz"; - sha256 = "058984j8waw8my6vfjiccdh5jijn9kn2q7lk481zv0ygapqh373x"; + url = "http://beta.quicklisp.org/archive/colored/2024-10-12/colored-20241012-git.tgz"; + sha256 = "0msw83gs5m887n1ha54jhflqjxb2mc7yv1hifspv9g16fn6h355c"; system = "colored-test"; asd = "colored-test"; }); @@ -29557,11 +30053,11 @@ in lib.makeScope pkgs.newScope (self: { }); com-on = (build-asdf-system { pname = "com-on"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "com-on" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/com-on/2023-10-21/com-on-20231021-git.tgz"; - sha256 = "1mwjhqbrpqq0x4l0zc3cqmrykrv3qjl2lklcnypddjf2l25f9gf6"; + url = "http://beta.quicklisp.org/archive/com-on/2024-10-12/com-on-20241012-git.tgz"; + sha256 = "1a3by2kx3iq0zl4304zhs89dfkp8xdjmdlnfmgywdg3wjdkxakci"; system = "com-on"; asd = "com-on"; }); @@ -29573,11 +30069,11 @@ in lib.makeScope pkgs.newScope (self: { }); com-on-test = (build-asdf-system { pname = "com-on-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "com-on-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/com-on/2023-10-21/com-on-20231021-git.tgz"; - sha256 = "1mwjhqbrpqq0x4l0zc3cqmrykrv3qjl2lklcnypddjf2l25f9gf6"; + url = "http://beta.quicklisp.org/archive/com-on/2024-10-12/com-on-20241012-git.tgz"; + sha256 = "1a3by2kx3iq0zl4304zhs89dfkp8xdjmdlnfmgywdg3wjdkxakci"; system = "com-on-test"; asd = "com-on-test"; }); @@ -29667,6 +30163,38 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + com_dot_danielkeogh_dot_graph = (build-asdf-system { + pname = "com.danielkeogh.graph"; + version = "20241012-git"; + asds = [ "com.danielkeogh.graph" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/com.danielkeogh.graph/2024-10-12/com.danielkeogh.graph-20241012-git.tgz"; + sha256 = "1hy9g49aqi1li0cdxzjmzgiskh00vlxbp1kjwiyk8a8kqzg69hj2"; + system = "com.danielkeogh.graph"; + asd = "com.danielkeogh.graph"; + }); + systems = [ "com.danielkeogh.graph" ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-speedy-queue" self) (getAttr "trivial-indent" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + com_dot_danielkeogh_dot_graph-tests = (build-asdf-system { + pname = "com.danielkeogh.graph-tests"; + version = "20241012-git"; + asds = [ "com.danielkeogh.graph-tests" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/com.danielkeogh.graph/2024-10-12/com.danielkeogh.graph-20241012-git.tgz"; + sha256 = "1hy9g49aqi1li0cdxzjmzgiskh00vlxbp1kjwiyk8a8kqzg69hj2"; + system = "com.danielkeogh.graph-tests"; + asd = "com.danielkeogh.graph-tests"; + }); + systems = [ "com.danielkeogh.graph-tests" ]; + lispLibs = [ (getAttr "com_dot_danielkeogh_dot_graph" self) (getAttr "fiveam" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); com_dot_dvlsoft_dot_rcfiles = (build-asdf-system { pname = "com.dvlsoft.rcfiles"; version = "20111203-http"; @@ -29893,11 +30421,11 @@ in lib.makeScope pkgs.newScope (self: { }); com_dot_inuoe_dot_jzon = (build-asdf-system { pname = "com.inuoe.jzon"; - version = "v1.1.2"; + version = "v1.1.4"; asds = [ "com.inuoe.jzon" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/jzon/2023-10-21/jzon-v1.1.2.tgz"; - sha256 = "1m7fcnjp9yd82x334h95192zsjc3y1pl6myvc8w9lzvcxbafvvz2"; + url = "http://beta.quicklisp.org/archive/jzon/2024-10-12/jzon-v1.1.4.tgz"; + sha256 = "0z7xpylyk8rakz449rxqpz4hazn91ap2dnf0689iigdvvl3yqz3g"; system = "com.inuoe.jzon"; asd = "com.inuoe.jzon"; }); @@ -29907,11 +30435,11 @@ in lib.makeScope pkgs.newScope (self: { }); com_dot_inuoe_dot_jzon-tests = (build-asdf-system { pname = "com.inuoe.jzon-tests"; - version = "v1.1.2"; + version = "v1.1.4"; asds = [ "com.inuoe.jzon-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/jzon/2023-10-21/jzon-v1.1.2.tgz"; - sha256 = "1m7fcnjp9yd82x334h95192zsjc3y1pl6myvc8w9lzvcxbafvvz2"; + url = "http://beta.quicklisp.org/archive/jzon/2024-10-12/jzon-v1.1.4.tgz"; + sha256 = "0z7xpylyk8rakz449rxqpz4hazn91ap2dnf0689iigdvvl3yqz3g"; system = "com.inuoe.jzon-tests"; asd = "com.inuoe.jzon-tests"; }); @@ -30145,43 +30673,43 @@ in lib.makeScope pkgs.newScope (self: { }); common-lisp-jupyter = (build-asdf-system { pname = "common-lisp-jupyter"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "common-lisp-jupyter" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/common-lisp-jupyter/2023-10-21/common-lisp-jupyter-20231021-git.tgz"; - sha256 = "0fj3yallizxld8zsxvva4l5mbp1i4rm73r4balp3r8c6lkrapsrm"; + url = "http://beta.quicklisp.org/archive/common-lisp-jupyter/2024-10-12/common-lisp-jupyter-20241012-git.tgz"; + sha256 = "1qbrzv0myxfxq7rzm2y9cm2xymkl982982h2kbsl7d1yd5hrjvl6"; system = "common-lisp-jupyter"; asd = "common-lisp-jupyter"; }); systems = [ "common-lisp-jupyter" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "babel" self) (getAttr "bordeaux-threads" self) (getAttr "cl-base64" self) (getAttr "cl-indentify" self) (getAttr "closer-mop" self) (getAttr "dissect" self) (getAttr "eclector" self) (getAttr "ironclad" self) (getAttr "jupyter-lab-extension" self) (getAttr "multilang-documentation" self) (getAttr "puri" self) (getAttr "pzmq" self) (getAttr "shasht" self) (getAttr "static-vectors" self) (getAttr "trivial-do" self) (getAttr "trivial-features" self) (getAttr "trivial-garbage" self) (getAttr "trivial-gray-streams" self) (getAttr "trivial-mimes" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "babel" self) (getAttr "bordeaux-threads" self) (getAttr "cl-base64" self) (getAttr "cl-indentify" self) (getAttr "closer-mop" self) (getAttr "dissect" self) (getAttr "eclector" self) (getAttr "ironclad" self) (getAttr "jupyter-lab-extension" self) (getAttr "multilang-documentation" self) (getAttr "nontrivial-gray-streams" self) (getAttr "puri" self) (getAttr "pzmq" self) (getAttr "shasht" self) (getAttr "static-vectors" self) (getAttr "trivial-do" self) (getAttr "trivial-features" self) (getAttr "trivial-garbage" self) (getAttr "trivial-mimes" self) ]; meta = { hydraPlatforms = [ ]; }; }); commondoc-markdown = (build-asdf-system { pname = "commondoc-markdown"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "commondoc-markdown" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/commondoc-markdown/2023-06-18/commondoc-markdown-20230618-git.tgz"; - sha256 = "070kg2gm9ynx5kvd70y1fiz57pw1qbd9v22b0v3p882sfihlm5x7"; + url = "http://beta.quicklisp.org/archive/commondoc-markdown/2024-10-12/commondoc-markdown-20241012-git.tgz"; + sha256 = "12n8yx8jhz8713r63gmrymplm1mfczm7q7a343d13wl6gng1gjs1"; system = "commondoc-markdown"; asd = "commondoc-markdown"; }); systems = [ "commondoc-markdown" ]; - lispLibs = [ (getAttr "_3bmd" self) (getAttr "_3bmd-ext-code-blocks" self) (getAttr "alexandria" self) (getAttr "babel" self) (getAttr "common-doc" self) (getAttr "common-html" self) (getAttr "esrap" self) (getAttr "ironclad" self) (getAttr "quri" self) (getAttr "str" self) ]; + lispLibs = [ (getAttr "_3bmd" self) (getAttr "_3bmd-ext-code-blocks" self) (getAttr "_3bmd-ext-tables" self) (getAttr "alexandria" self) (getAttr "babel" self) (getAttr "common-doc" self) (getAttr "common-html" self) (getAttr "esrap" self) (getAttr "ironclad" self) (getAttr "plump" self) (getAttr "quri" self) (getAttr "str" self) ]; meta = { hydraPlatforms = [ ]; }; }); commondoc-markdown-docs = (build-asdf-system { pname = "commondoc-markdown-docs"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "commondoc-markdown-docs" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/commondoc-markdown/2023-06-18/commondoc-markdown-20230618-git.tgz"; - sha256 = "070kg2gm9ynx5kvd70y1fiz57pw1qbd9v22b0v3p882sfihlm5x7"; + url = "http://beta.quicklisp.org/archive/commondoc-markdown/2024-10-12/commondoc-markdown-20241012-git.tgz"; + sha256 = "12n8yx8jhz8713r63gmrymplm1mfczm7q7a343d13wl6gng1gjs1"; system = "commondoc-markdown-docs"; asd = "commondoc-markdown-docs"; }); @@ -30193,11 +30721,11 @@ in lib.makeScope pkgs.newScope (self: { }); commondoc-markdown-test = (build-asdf-system { pname = "commondoc-markdown-test"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "commondoc-markdown-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/commondoc-markdown/2023-06-18/commondoc-markdown-20230618-git.tgz"; - sha256 = "070kg2gm9ynx5kvd70y1fiz57pw1qbd9v22b0v3p882sfihlm5x7"; + url = "http://beta.quicklisp.org/archive/commondoc-markdown/2024-10-12/commondoc-markdown-20241012-git.tgz"; + sha256 = "12n8yx8jhz8713r63gmrymplm1mfczm7q7a343d13wl6gng1gjs1"; system = "commondoc-markdown-test"; asd = "commondoc-markdown-test"; }); @@ -30273,11 +30801,11 @@ in lib.makeScope pkgs.newScope (self: { }); compiler-macro-notes = (build-asdf-system { pname = "compiler-macro-notes"; - version = "v0.2.1"; + version = "v0.3.1"; asds = [ "compiler-macro-notes" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/compiler-macro-notes/2022-11-06/compiler-macro-notes-v0.2.1.tgz"; - sha256 = "13zzygv0j0a6xacwir4yllpan8j9zh68n9kgkpppg1br8x8s78pk"; + url = "http://beta.quicklisp.org/archive/compiler-macro-notes/2024-10-12/compiler-macro-notes-v0.3.1.tgz"; + sha256 = "0pchhvk14fx54p7qq92dnf0g4jnapqr6p2a4za6bhzd8im1d9gad"; system = "compiler-macro-notes"; asd = "compiler-macro-notes"; }); @@ -30401,11 +30929,11 @@ in lib.makeScope pkgs.newScope (self: { }); conditional-commands = (build-asdf-system { pname = "conditional-commands"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "conditional-commands" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "conditional-commands"; asd = "conditional-commands"; }); @@ -30561,11 +31089,11 @@ in lib.makeScope pkgs.newScope (self: { }); consfigurator = (build-asdf-system { pname = "consfigurator"; - version = "v1.3.1"; + version = "v1.4.4"; asds = [ "consfigurator" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/consfigurator/2023-06-18/consfigurator-v1.3.1.tgz"; - sha256 = "0qx07b8cfsn32p214g631lh7p6xbqk7hi6f8jmb5aj7m3hxpwxxr"; + url = "http://beta.quicklisp.org/archive/consfigurator/2024-10-12/consfigurator-v1.4.4.tgz"; + sha256 = "1f4q5w58phj5a6i2fj712ggz2p8b5m4v77qzsvbb3xmy2vhppvv0"; system = "consfigurator"; asd = "consfigurator"; }); @@ -30641,11 +31169,11 @@ in lib.makeScope pkgs.newScope (self: { }); contextl = (build-asdf-system { pname = "contextl"; - version = "20211230-git"; + version = "20241012-git"; asds = [ "contextl" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/contextl/2021-12-30/contextl-20211230-git.tgz"; - sha256 = "0apgznz4g6lpmd86lq7w0xddfjgnirk83ig7p0j6i93xadhy9wh0"; + url = "http://beta.quicklisp.org/archive/contextl/2024-10-12/contextl-20241012-git.tgz"; + sha256 = "1jsa5wyjzzfw9pii3d6x20mh8ijnpb291g3i0y2ccj0x8z3xfyyk"; system = "contextl"; asd = "contextl"; }); @@ -30671,22 +31199,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - convolution-kernel = (build-asdf-system { - pname = "convolution-kernel"; - version = "20220707-git"; - asds = [ "convolution-kernel" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/convolution-kernel/2022-07-07/convolution-kernel-20220707-git.tgz"; - sha256 = "0r2mgwl75fxcc019mxg3s32mkx6fhi8fcy5rzz1jba1wrcw380z3"; - system = "convolution-kernel"; - asd = "convolution-kernel"; - }); - systems = [ "convolution-kernel" ]; - lispLibs = [ (getAttr "mfiano-utils" self) (getAttr "tile-grid" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); copy-directory = (build-asdf-system { pname = "copy-directory"; version = "20160628-git"; @@ -30865,11 +31377,11 @@ in lib.makeScope pkgs.newScope (self: { }); croatoan = (build-asdf-system { pname = "croatoan"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "croatoan" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/croatoan/2023-10-21/croatoan-20231021-git.tgz"; - sha256 = "0x2rlckyn8kn5mqy0fib8piggz694g3naarz2dvha1hsy4jhb1wg"; + url = "http://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz"; + sha256 = "04776x4i8inxs8n4mgy9xf0q39bzv4mfz4cl880sxwk6mnhwnn4c"; system = "croatoan"; asd = "croatoan"; }); @@ -30881,11 +31393,11 @@ in lib.makeScope pkgs.newScope (self: { }); croatoan-ncurses = (build-asdf-system { pname = "croatoan-ncurses"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "croatoan-ncurses" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/croatoan/2023-10-21/croatoan-20231021-git.tgz"; - sha256 = "0x2rlckyn8kn5mqy0fib8piggz694g3naarz2dvha1hsy4jhb1wg"; + url = "http://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz"; + sha256 = "04776x4i8inxs8n4mgy9xf0q39bzv4mfz4cl880sxwk6mnhwnn4c"; system = "croatoan-ncurses"; asd = "croatoan-ncurses"; }); @@ -30897,11 +31409,11 @@ in lib.makeScope pkgs.newScope (self: { }); croatoan-test = (build-asdf-system { pname = "croatoan-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "croatoan-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/croatoan/2023-10-21/croatoan-20231021-git.tgz"; - sha256 = "0x2rlckyn8kn5mqy0fib8piggz694g3naarz2dvha1hsy4jhb1wg"; + url = "http://beta.quicklisp.org/archive/croatoan/2024-10-12/croatoan-20241012-git.tgz"; + sha256 = "04776x4i8inxs8n4mgy9xf0q39bzv4mfz4cl880sxwk6mnhwnn4c"; system = "croatoan-test"; asd = "croatoan-test"; }); @@ -31113,11 +31625,11 @@ in lib.makeScope pkgs.newScope (self: { }); ctype = (build-asdf-system { pname = "ctype"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "ctype" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ctype/2023-10-21/ctype-20231021-git.tgz"; - sha256 = "0ih816l96bxx0w4jm2z4694p1dvpb52yrw6sar63b8bjkiyq79kd"; + url = "http://beta.quicklisp.org/archive/ctype/2024-10-12/ctype-20241012-git.tgz"; + sha256 = "0qnssrjssb7258i3a1s1bv3z6plx4pzrkg65i8an25bvwrjwpvqv"; system = "ctype"; asd = "ctype"; }); @@ -31333,11 +31845,11 @@ in lib.makeScope pkgs.newScope (self: { }); cxx-jit = (build-asdf-system { pname = "cxx-jit"; - version = "20220331-git"; + version = "20241012-git"; asds = [ "cxx-jit" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cxx-jit/2022-03-31/cl-cxx-jit-20220331-git.tgz"; - sha256 = "0mbi5r4b4jbk50yy4pv7ngsjj50579f9c362dzh0sbrxk8vd3gkp"; + url = "http://beta.quicklisp.org/archive/cl-cxx-jit/2024-10-12/cl-cxx-jit-20241012-git.tgz"; + sha256 = "1xnhkhynikqs61s488jjzklbvwb46yxqx3zi98ifszj4r8ndi3ym"; system = "cxx-jit"; asd = "cxx-jit"; }); @@ -31347,6 +31859,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + cxx-jit-test = (build-asdf-system { + pname = "cxx-jit-test"; + version = "20241012-git"; + asds = [ "cxx-jit-test" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-cxx-jit/2024-10-12/cl-cxx-jit-20241012-git.tgz"; + sha256 = "1xnhkhynikqs61s488jjzklbvwb46yxqx3zi98ifszj4r8ndi3ym"; + system = "cxx-jit-test"; + asd = "cxx-jit-test"; + }); + systems = [ "cxx-jit-test" ]; + lispLibs = [ (getAttr "cxx-jit" self) (getAttr "rove" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); cxx-test = (build-asdf-system { pname = "cxx-test"; version = "20230214-git"; @@ -31365,11 +31893,11 @@ in lib.makeScope pkgs.newScope (self: { }); cytoscape-clj = (build-asdf-system { pname = "cytoscape-clj"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "cytoscape-clj" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cytoscape-clj/2023-10-21/cytoscape-clj-20231021-git.tgz"; - sha256 = "0xfn8lsfh5qgdriqvb6w57hygjm0p61bky725a9n7fgcny7v8d3x"; + url = "http://beta.quicklisp.org/archive/cytoscape-clj/2024-10-12/cytoscape-clj-20241012-git.tgz"; + sha256 = "0kyjgffm8nlvz75dbyz4fp1v8sr7j2bd7axxyn226s30gwzhihck"; system = "cytoscape-clj"; asd = "cytoscape-clj"; }); @@ -31397,11 +31925,11 @@ in lib.makeScope pkgs.newScope (self: { }); damn-fast-priority-queue = (build-asdf-system { pname = "damn-fast-priority-queue"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "damn-fast-priority-queue" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/damn-fast-priority-queue/2022-11-06/damn-fast-priority-queue-20221106-git.tgz"; - sha256 = "14917b1z7ag3a7f88p4fk4649iy07kn9vpq6bszdxcp1irnc5a13"; + url = "http://beta.quicklisp.org/archive/damn-fast-priority-queue/2024-10-12/damn-fast-priority-queue-20241012-git.tgz"; + sha256 = "1mbigpgi7qbqvpj59l1f7p2qcg00ybvqzdca1j1b9hx62h224ndw"; system = "damn-fast-priority-queue"; asd = "damn-fast-priority-queue"; }); @@ -31413,11 +31941,11 @@ in lib.makeScope pkgs.newScope (self: { }); damn-fast-stable-priority-queue = (build-asdf-system { pname = "damn-fast-stable-priority-queue"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "damn-fast-stable-priority-queue" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/damn-fast-priority-queue/2022-11-06/damn-fast-priority-queue-20221106-git.tgz"; - sha256 = "14917b1z7ag3a7f88p4fk4649iy07kn9vpq6bszdxcp1irnc5a13"; + url = "http://beta.quicklisp.org/archive/damn-fast-priority-queue/2024-10-12/damn-fast-priority-queue-20241012-git.tgz"; + sha256 = "1mbigpgi7qbqvpj59l1f7p2qcg00ybvqzdca1j1b9hx62h224ndw"; system = "damn-fast-stable-priority-queue"; asd = "damn-fast-stable-priority-queue"; }); @@ -31573,11 +32101,11 @@ in lib.makeScope pkgs.newScope (self: { }); darts_dot_lib_dot_uuid = (build-asdf-system { pname = "darts.lib.uuid"; - version = "20210807-git"; + version = "20241012-git"; asds = [ "darts.lib.uuid" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/dartscluuid/2021-08-07/dartscluuid-20210807-git.tgz"; - sha256 = "068lsbjnx4bkhz7s2022jsh8zsvqak98s8hcy1rs10bgi36hrrkh"; + url = "http://beta.quicklisp.org/archive/dartscluuid/2024-10-12/dartscluuid-20241012-git.tgz"; + sha256 = "17i2icz6k6vb5mp95rsjr8ldzhjjlcn7dyylvxjrccbxbrblnnsl"; system = "darts.lib.uuid"; asd = "darts.lib.uuid"; }); @@ -31589,11 +32117,11 @@ in lib.makeScope pkgs.newScope (self: { }); darts_dot_lib_dot_uuid-test = (build-asdf-system { pname = "darts.lib.uuid-test"; - version = "20210807-git"; + version = "20241012-git"; asds = [ "darts.lib.uuid-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/dartscluuid/2021-08-07/dartscluuid-20210807-git.tgz"; - sha256 = "068lsbjnx4bkhz7s2022jsh8zsvqak98s8hcy1rs10bgi36hrrkh"; + url = "http://beta.quicklisp.org/archive/dartscluuid/2024-10-12/dartscluuid-20241012-git.tgz"; + sha256 = "17i2icz6k6vb5mp95rsjr8ldzhjjlcn7dyylvxjrccbxbrblnnsl"; system = "darts.lib.uuid-test"; asd = "darts.lib.uuid-test"; }); @@ -31637,11 +32165,11 @@ in lib.makeScope pkgs.newScope (self: { }); data-frame = (build-asdf-system { pname = "data-frame"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "data-frame" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/data-frame/2023-10-21/data-frame-20231021-git.tgz"; - sha256 = "12ij1sgg2yxygdxfbm6ijnagkaxijcbrw5jshi8i6pix997pb619"; + url = "http://beta.quicklisp.org/archive/data-frame/2024-10-12/data-frame-20241012-git.tgz"; + sha256 = "1sqyvb6hscz070d5ap5v5yvql4nx69c7jkp29za5dj84rsvbckcp"; system = "data-frame"; asd = "data-frame"; }); @@ -31653,11 +32181,11 @@ in lib.makeScope pkgs.newScope (self: { }); data-lens = (build-asdf-system { pname = "data-lens"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "data-lens" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/data-lens/2023-10-21/data-lens-20231021-git.tgz"; - sha256 = "00rm86rn27bcg544w3qip0890jrbixcvxnmgw7b2gbrvci8f6al8"; + url = "http://beta.quicklisp.org/archive/data-lens/2024-10-12/data-lens-20241012-git.tgz"; + sha256 = "1bark9r3br5ndcbkiagq891gn82xdiy8hrgzp72656yyadsrid5i"; system = "data-lens"; asd = "data-lens"; }); @@ -31667,6 +32195,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + data-lens_plus_fset = (build-asdf-system { + pname = "data-lens+fset"; + version = "20241012-git"; + asds = [ "data-lens+fset" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/data-lens/2024-10-12/data-lens-20241012-git.tgz"; + sha256 = "1bark9r3br5ndcbkiagq891gn82xdiy8hrgzp72656yyadsrid5i"; + system = "data-lens+fset"; + asd = "data-lens+fset"; + }); + systems = [ "data-lens+fset" ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "data-lens" self) (getAttr "fset" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); data-sift = (build-asdf-system { pname = "data-sift"; version = "20130128-git"; @@ -31763,11 +32307,11 @@ in lib.makeScope pkgs.newScope (self: { }); datafly = (build-asdf-system { pname = "datafly"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "datafly" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/datafly/2023-10-21/datafly-20231021-git.tgz"; - sha256 = "0hz1cg4gas4888841msnjnx0bnirvcmx4sdayjysvqazzf65giy8"; + url = "http://beta.quicklisp.org/archive/datafly/2024-10-12/datafly-20241012-git.tgz"; + sha256 = "103zp5s778lys4lsn7hvyis65757338n0l9gzl595qfim4apx8g0"; system = "datafly"; asd = "datafly"; }); @@ -31779,11 +32323,11 @@ in lib.makeScope pkgs.newScope (self: { }); datafly-test = (build-asdf-system { pname = "datafly-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "datafly-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/datafly/2023-10-21/datafly-20231021-git.tgz"; - sha256 = "0hz1cg4gas4888841msnjnx0bnirvcmx4sdayjysvqazzf65giy8"; + url = "http://beta.quicklisp.org/archive/datafly/2024-10-12/datafly-20241012-git.tgz"; + sha256 = "103zp5s778lys4lsn7hvyis65757338n0l9gzl595qfim4apx8g0"; system = "datafly-test"; asd = "datafly-test"; }); @@ -31891,11 +32435,11 @@ in lib.makeScope pkgs.newScope (self: { }); dbd-mysql = (build-asdf-system { pname = "dbd-mysql"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "dbd-mysql" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dbi/2023-10-21/cl-dbi-20231021-git.tgz"; - sha256 = "1jjm2hh8vvbdblhsms6nrb5gll8ng7pqyv99zj6zk2f5h5a42a2l"; + url = "http://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; + sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy"; system = "dbd-mysql"; asd = "dbd-mysql"; }); @@ -31905,11 +32449,11 @@ in lib.makeScope pkgs.newScope (self: { }); dbd-postgres = (build-asdf-system { pname = "dbd-postgres"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "dbd-postgres" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dbi/2023-10-21/cl-dbi-20231021-git.tgz"; - sha256 = "1jjm2hh8vvbdblhsms6nrb5gll8ng7pqyv99zj6zk2f5h5a42a2l"; + url = "http://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; + sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy"; system = "dbd-postgres"; asd = "dbd-postgres"; }); @@ -31919,11 +32463,11 @@ in lib.makeScope pkgs.newScope (self: { }); dbd-sqlite3 = (build-asdf-system { pname = "dbd-sqlite3"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "dbd-sqlite3" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dbi/2023-10-21/cl-dbi-20231021-git.tgz"; - sha256 = "1jjm2hh8vvbdblhsms6nrb5gll8ng7pqyv99zj6zk2f5h5a42a2l"; + url = "http://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; + sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy"; system = "dbd-sqlite3"; asd = "dbd-sqlite3"; }); @@ -31933,25 +32477,25 @@ in lib.makeScope pkgs.newScope (self: { }); dbi = (build-asdf-system { pname = "dbi"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "dbi" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dbi/2023-10-21/cl-dbi-20231021-git.tgz"; - sha256 = "1jjm2hh8vvbdblhsms6nrb5gll8ng7pqyv99zj6zk2f5h5a42a2l"; + url = "http://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; + sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy"; system = "dbi"; asd = "dbi"; }); systems = [ "dbi" ]; - lispLibs = [ (getAttr "bordeaux-threads" self) (getAttr "closer-mop" self) (getAttr "split-sequence" self) ]; + lispLibs = [ (getAttr "bordeaux-threads" self) (getAttr "cl-ppcre" self) (getAttr "closer-mop" self) (getAttr "split-sequence" self) ]; meta = {}; }); dbi-test = (build-asdf-system { pname = "dbi-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "dbi-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dbi/2023-10-21/cl-dbi-20231021-git.tgz"; - sha256 = "1jjm2hh8vvbdblhsms6nrb5gll8ng7pqyv99zj6zk2f5h5a42a2l"; + url = "http://beta.quicklisp.org/archive/cl-dbi/2024-10-12/cl-dbi-20241012-git.tgz"; + sha256 = "17szd6sz1hlwl5fm4qjgyd8ax01wkbhv8hxcyy8qscx39sc0cnpy"; system = "dbi-test"; asd = "dbi-test"; }); @@ -31961,16 +32505,16 @@ in lib.makeScope pkgs.newScope (self: { }); dbus = (build-asdf-system { pname = "dbus"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "dbus" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/dbus/2021-10-20/dbus-20211020-git.tgz"; - sha256 = "1gw5414q7r6yi2bm1wk2fhqnvhxzc5c6812z3qh67c9dyizcjy2a"; + url = "http://beta.quicklisp.org/archive/dbus/2024-10-12/dbus-20241012-git.tgz"; + sha256 = "1y880074m9g0swxrzpbplmkdxc6r62gzyigglf4x2i0zyss3gf65"; system = "dbus"; asd = "dbus"; }); systems = [ "dbus" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "asdf-package-system" self) (getAttr "babel" self) (getAttr "cl-xmlspam" self) (getAttr "flexi-streams" self) (getAttr "ieee-floats" self) (getAttr "iolib" self) (getAttr "ironclad" self) (getAttr "split-sequence" self) (getAttr "trivial-garbage" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "asdf-package-system" self) (getAttr "babel" self) (getAttr "cl-xmlspam" self) (getAttr "cxml" self) (getAttr "flexi-streams" self) (getAttr "ieee-floats" self) (getAttr "iolib" self) (getAttr "ironclad" self) (getAttr "split-sequence" self) (getAttr "trivial-garbage" self) ]; meta = {}; }); dct = (build-asdf-system { @@ -32149,11 +32693,11 @@ in lib.makeScope pkgs.newScope (self: { }); defenum = (build-asdf-system { pname = "defenum"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "defenum" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/defenum/2023-02-14/defenum-20230214-git.tgz"; - sha256 = "1nrgqq2cbmg2zgx8wmhrqcrbfkq71hsabsnjpnyb2a6ismz6d5vg"; + url = "http://beta.quicklisp.org/archive/defenum/2024-10-12/defenum-20241012-git.tgz"; + sha256 = "1856w0vsjj9fcyqrry5k4b2iv87xms5wlw8xbqawjax6w5hdsrhk"; system = "defenum"; asd = "defenum"; }); @@ -32197,11 +32741,11 @@ in lib.makeScope pkgs.newScope (self: { }); definer = (build-asdf-system { pname = "definer"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "definer" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/definer/2023-02-14/definer-20230214-git.tgz"; - sha256 = "0wgzmmdnlw74cc4nz4hvx8r3759f114bf3n8zxzbw0181llpy5ff"; + url = "http://beta.quicklisp.org/archive/definer/2024-10-12/definer-20241012-git.tgz"; + sha256 = "0vd7gcj55pdzgxq2309pxshplg3rjx95xikkc2ylqrcm9nf3d2zb"; system = "definer"; asd = "definer"; }); @@ -32213,11 +32757,11 @@ in lib.makeScope pkgs.newScope (self: { }); definitions = (build-asdf-system { pname = "definitions"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "definitions" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/definitions/2023-10-21/definitions-20231021-git.tgz"; - sha256 = "1gs6w7m26574lan7xqajvnivp2cq5n9iqr76zmbgwqk6pn02kyki"; + url = "http://beta.quicklisp.org/archive/definitions/2024-10-12/definitions-20241012-git.tgz"; + sha256 = "16wg9rzxc193qvhzay69czr19wzy16b53vm1gy6p25gqvz90zryd"; system = "definitions"; asd = "definitions"; }); @@ -32261,11 +32805,11 @@ in lib.makeScope pkgs.newScope (self: { }); deflate = (build-asdf-system { pname = "deflate"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "deflate" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/deflate/2023-06-18/deflate-20230618-git.tgz"; - sha256 = "1zarfhbkq1v6cwccvk1znga134glnnk7dx58l0fwpr437bd3gdvi"; + url = "http://beta.quicklisp.org/archive/deflate/2024-10-12/deflate-20241012-git.tgz"; + sha256 = "1b225rgc3b2b2k941aj8mz4fkyysi0my368r042wzykq28lwwwij"; system = "deflate"; asd = "deflate"; }); @@ -32293,11 +32837,11 @@ in lib.makeScope pkgs.newScope (self: { }); defmain = (build-asdf-system { pname = "defmain"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "defmain" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/defmain/2022-11-06/defmain-20221106-git.tgz"; - sha256 = "08mmb0rgbipmjhmpvr1889n1665309pwsa16qsrsbmgnmmaznw6a"; + url = "http://beta.quicklisp.org/archive/defmain/2024-10-12/defmain-20241012-git.tgz"; + sha256 = "0lb45xmpan188vcysc7d579gg1mc7qi3xyyqc6mqr49571zshzb1"; system = "defmain"; asd = "defmain"; }); @@ -32309,11 +32853,11 @@ in lib.makeScope pkgs.newScope (self: { }); defmain-test = (build-asdf-system { pname = "defmain-test"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "defmain-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/defmain/2022-11-06/defmain-20221106-git.tgz"; - sha256 = "08mmb0rgbipmjhmpvr1889n1665309pwsa16qsrsbmgnmmaznw6a"; + url = "http://beta.quicklisp.org/archive/defmain/2024-10-12/defmain-20241012-git.tgz"; + sha256 = "0lb45xmpan188vcysc7d579gg1mc7qi3xyyqc6mqr49571zshzb1"; system = "defmain-test"; asd = "defmain-test"; }); @@ -32579,70 +33123,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - dense-arrays = (build-asdf-system { - pname = "dense-arrays"; - version = "20230618-git"; - asds = [ "dense-arrays" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dense-arrays/2023-06-18/dense-arrays-20230618-git.tgz"; - sha256 = "039w29ms0klvvjp88280gl8x436khrqcvp7z13gnc4ilm74dpws5"; - system = "dense-arrays"; - asd = "dense-arrays"; - }); - systems = [ "dense-arrays" ]; - lispLibs = [ (getAttr "abstract-arrays" self) (getAttr "alexandria" self) (getAttr "asdf-system-connections" self) (getAttr "cl-form-types" self) (getAttr "closer-mop" self) (getAttr "compiler-macro-notes" self) (getAttr "extensible-compound-types" self) (getAttr "fiveam" self) (getAttr "iterate" self) (getAttr "polymorphic-functions" self) (getAttr "trivial-garbage" self) (getAttr "trivial-types" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - dense-arrays_plus_cuda = (build-asdf-system { - pname = "dense-arrays+cuda"; - version = "20230618-git"; - asds = [ "dense-arrays+cuda" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dense-arrays/2023-06-18/dense-arrays-20230618-git.tgz"; - sha256 = "039w29ms0klvvjp88280gl8x436khrqcvp7z13gnc4ilm74dpws5"; - system = "dense-arrays+cuda"; - asd = "dense-arrays+cuda"; - }); - systems = [ "dense-arrays+cuda" ]; - lispLibs = [ (getAttr "cl-cuda" self) (getAttr "dense-arrays" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - dense-arrays-plus = (build-asdf-system { - pname = "dense-arrays-plus"; - version = "20230618-git"; - asds = [ "dense-arrays-plus" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dense-arrays/2023-06-18/dense-arrays-20230618-git.tgz"; - sha256 = "039w29ms0klvvjp88280gl8x436khrqcvp7z13gnc4ilm74dpws5"; - system = "dense-arrays-plus"; - asd = "dense-arrays-plus"; - }); - systems = [ "dense-arrays-plus" ]; - lispLibs = [ (getAttr "dense-arrays-plus-lite" self) (getAttr "fiveam" self) (getAttr "generic-cl" self) (getAttr "py4cl2" self) (getAttr "reader" self) (getAttr "static-vectors" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - dense-arrays-plus-lite = (build-asdf-system { - pname = "dense-arrays-plus-lite"; - version = "20230618-git"; - asds = [ "dense-arrays-plus-lite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dense-arrays/2023-06-18/dense-arrays-20230618-git.tgz"; - sha256 = "039w29ms0klvvjp88280gl8x436khrqcvp7z13gnc4ilm74dpws5"; - system = "dense-arrays-plus-lite"; - asd = "dense-arrays-plus-lite"; - }); - systems = [ "dense-arrays-plus-lite" ]; - lispLibs = [ (getAttr "dense-arrays" self) (getAttr "extensible-compound-types-interfaces" self) (getAttr "extensible-optimizing-coerce" self) (getAttr "trivial-package-local-nicknames" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); deoxybyte-gzip = (build-asdf-system { pname = "deoxybyte-gzip"; version = "20140113-git"; @@ -32789,27 +33269,27 @@ in lib.makeScope pkgs.newScope (self: { }); deploy = (build-asdf-system { pname = "deploy"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "deploy" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/deploy/2023-10-21/deploy-20231021-git.tgz"; - sha256 = "1jxp75gyqdbladlid0p11d7v39bdc9j2bv5hi0nks4hyjmnw60hp"; + url = "http://beta.quicklisp.org/archive/deploy/2024-10-12/deploy-20241012-git.tgz"; + sha256 = "1ysi8fjgb7kq3cycb6ms44j0m70xbd140fh4qgcpj7fm26p2a59p"; system = "deploy"; asd = "deploy"; }); systems = [ "deploy" ]; - lispLibs = [ (getAttr "cffi" self) (getAttr "documentation-utils" self) (getAttr "trivial-features" self) ]; + lispLibs = [ (getAttr "cffi" self) (getAttr "documentation-utils" self) (getAttr "sha3" self) (getAttr "trivial-features" self) ]; meta = { hydraPlatforms = [ ]; }; }); deploy-test = (build-asdf-system { pname = "deploy-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "deploy-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/deploy/2023-10-21/deploy-20231021-git.tgz"; - sha256 = "1jxp75gyqdbladlid0p11d7v39bdc9j2bv5hi0nks4hyjmnw60hp"; + url = "http://beta.quicklisp.org/archive/deploy/2024-10-12/deploy-20241012-git.tgz"; + sha256 = "1ysi8fjgb7kq3cycb6ms44j0m70xbd140fh4qgcpj7fm26p2a59p"; system = "deploy-test"; asd = "deploy-test"; }); @@ -32821,11 +33301,11 @@ in lib.makeScope pkgs.newScope (self: { }); depot = (build-asdf-system { pname = "depot"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "depot" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/depot/2023-10-21/depot-20231021-git.tgz"; - sha256 = "0ri70fbjbzg08qnx6jcpq26nclj0mmvlw4an37rs15bcp1vnayci"; + url = "http://beta.quicklisp.org/archive/depot/2024-10-12/depot-20241012-git.tgz"; + sha256 = "1k9p4jqylh7i53sngi0yn2hww6y6lxqc7c0hd3j3p8jc4q3h4zn4"; system = "depot"; asd = "depot"; }); @@ -32837,11 +33317,11 @@ in lib.makeScope pkgs.newScope (self: { }); depot-in-memory = (build-asdf-system { pname = "depot-in-memory"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "depot-in-memory" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/depot/2023-10-21/depot-20231021-git.tgz"; - sha256 = "0ri70fbjbzg08qnx6jcpq26nclj0mmvlw4an37rs15bcp1vnayci"; + url = "http://beta.quicklisp.org/archive/depot/2024-10-12/depot-20241012-git.tgz"; + sha256 = "1k9p4jqylh7i53sngi0yn2hww6y6lxqc7c0hd3j3p8jc4q3h4zn4"; system = "depot-in-memory"; asd = "depot-in-memory"; }); @@ -32853,11 +33333,11 @@ in lib.makeScope pkgs.newScope (self: { }); depot-test = (build-asdf-system { pname = "depot-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "depot-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/depot/2023-10-21/depot-20231021-git.tgz"; - sha256 = "0ri70fbjbzg08qnx6jcpq26nclj0mmvlw4an37rs15bcp1vnayci"; + url = "http://beta.quicklisp.org/archive/depot/2024-10-12/depot-20241012-git.tgz"; + sha256 = "1k9p4jqylh7i53sngi0yn2hww6y6lxqc7c0hd3j3p8jc4q3h4zn4"; system = "depot-test"; asd = "depot-test"; }); @@ -32869,11 +33349,11 @@ in lib.makeScope pkgs.newScope (self: { }); depot-virtual = (build-asdf-system { pname = "depot-virtual"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "depot-virtual" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/depot/2023-10-21/depot-20231021-git.tgz"; - sha256 = "0ri70fbjbzg08qnx6jcpq26nclj0mmvlw4an37rs15bcp1vnayci"; + url = "http://beta.quicklisp.org/archive/depot/2024-10-12/depot-20241012-git.tgz"; + sha256 = "1k9p4jqylh7i53sngi0yn2hww6y6lxqc7c0hd3j3p8jc4q3h4zn4"; system = "depot-virtual"; asd = "depot-virtual"; }); @@ -32885,11 +33365,11 @@ in lib.makeScope pkgs.newScope (self: { }); depot-zip = (build-asdf-system { pname = "depot-zip"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "depot-zip" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/depot/2023-10-21/depot-20231021-git.tgz"; - sha256 = "0ri70fbjbzg08qnx6jcpq26nclj0mmvlw4an37rs15bcp1vnayci"; + url = "http://beta.quicklisp.org/archive/depot/2024-10-12/depot-20241012-git.tgz"; + sha256 = "1k9p4jqylh7i53sngi0yn2hww6y6lxqc7c0hd3j3p8jc4q3h4zn4"; system = "depot-zip"; asd = "depot-zip"; }); @@ -32901,11 +33381,11 @@ in lib.makeScope pkgs.newScope (self: { }); deptree = (build-asdf-system { pname = "deptree"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "deptree" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/deptree/2023-10-21/deptree-20231021-git.tgz"; - sha256 = "0nfybk203fbaksl3bgrgpqr2l6rl0k80xv9dm2f7712r335hxcwg"; + url = "http://beta.quicklisp.org/archive/deptree/2024-10-12/deptree-20241012-git.tgz"; + sha256 = "10ybmw28c52ahbm7xjn795367lssp6088v6705fmqbl0fgjpvxnw"; system = "deptree"; asd = "deptree"; }); @@ -32997,11 +33477,11 @@ in lib.makeScope pkgs.newScope (self: { }); dexador = (build-asdf-system { pname = "dexador"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "dexador" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/dexador/2023-10-21/dexador-20231021-git.tgz"; - sha256 = "1505ns3ac9dpp02kf1rm089kdg634g0rv2j4877cjwasc03mksip"; + url = "http://beta.quicklisp.org/archive/dexador/2024-10-12/dexador-20241012-git.tgz"; + sha256 = "19y95k821665vcy7gbxhh4rqwk7fh4brv1sgkaykncpw2l2lll5r"; system = "dexador"; asd = "dexador"; }); @@ -33011,11 +33491,11 @@ in lib.makeScope pkgs.newScope (self: { }); dexador-test = (build-asdf-system { pname = "dexador-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "dexador-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/dexador/2023-10-21/dexador-20231021-git.tgz"; - sha256 = "1505ns3ac9dpp02kf1rm089kdg634g0rv2j4877cjwasc03mksip"; + url = "http://beta.quicklisp.org/archive/dexador/2024-10-12/dexador-20241012-git.tgz"; + sha256 = "19y95k821665vcy7gbxhh4rqwk7fh4brv1sgkaykncpw2l2lll5r"; system = "dexador-test"; asd = "dexador-test"; }); @@ -33025,6 +33505,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + dexador-usocket = (build-asdf-system { + pname = "dexador-usocket"; + version = "20241012-git"; + asds = [ "dexador-usocket" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/dexador/2024-10-12/dexador-20241012-git.tgz"; + sha256 = "19y95k821665vcy7gbxhh4rqwk7fh4brv1sgkaykncpw2l2lll5r"; + system = "dexador-usocket"; + asd = "dexador-usocket"; + }); + systems = [ "dexador-usocket" ]; + lispLibs = [ (getAttr "cl_plus_ssl" self) (getAttr "dexador" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); dfio = (build-asdf-system { pname = "dfio"; version = "20221106-git"; @@ -33139,11 +33635,11 @@ in lib.makeScope pkgs.newScope (self: { }); dissect = (build-asdf-system { pname = "dissect"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "dissect" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/dissect/2023-10-21/dissect-20231021-git.tgz"; - sha256 = "0nqmk35r03gggijm8fd0lbk4ghfvqvq5yqkn09dh1j31lmnyws4i"; + url = "http://beta.quicklisp.org/archive/dissect/2024-10-12/dissect-20241012-git.tgz"; + sha256 = "1ym1zggwrj15l7y2mcz5l2gfk68prqxhdswffd9s5014pa6zyysr"; system = "dissect"; asd = "dissect"; }); @@ -33169,11 +33665,11 @@ in lib.makeScope pkgs.newScope (self: { }); djula = (build-asdf-system { pname = "djula"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "djula" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/djula/2023-10-21/djula-20231021-git.tgz"; - sha256 = "0rk6348sz8mf2jfnk4rm6ai479r1bmmcnc2lx8jjjlji0b5sis3b"; + url = "http://beta.quicklisp.org/archive/djula/2024-10-12/djula-20241012-git.tgz"; + sha256 = "1m4k0ywkpvbpljd8r9vfmsw2zkphwcfwgbdp911zkiv5rcnmgykw"; system = "djula"; asd = "djula"; }); @@ -33183,11 +33679,11 @@ in lib.makeScope pkgs.newScope (self: { }); djula-demo = (build-asdf-system { pname = "djula-demo"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "djula-demo" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/djula/2023-10-21/djula-20231021-git.tgz"; - sha256 = "0rk6348sz8mf2jfnk4rm6ai479r1bmmcnc2lx8jjjlji0b5sis3b"; + url = "http://beta.quicklisp.org/archive/djula/2024-10-12/djula-20241012-git.tgz"; + sha256 = "1m4k0ywkpvbpljd8r9vfmsw2zkphwcfwgbdp911zkiv5rcnmgykw"; system = "djula-demo"; asd = "djula-demo"; }); @@ -33199,11 +33695,11 @@ in lib.makeScope pkgs.newScope (self: { }); djula-gettext = (build-asdf-system { pname = "djula-gettext"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "djula-gettext" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/djula/2023-10-21/djula-20231021-git.tgz"; - sha256 = "0rk6348sz8mf2jfnk4rm6ai479r1bmmcnc2lx8jjjlji0b5sis3b"; + url = "http://beta.quicklisp.org/archive/djula/2024-10-12/djula-20241012-git.tgz"; + sha256 = "1m4k0ywkpvbpljd8r9vfmsw2zkphwcfwgbdp911zkiv5rcnmgykw"; system = "djula-gettext"; asd = "djula-gettext"; }); @@ -33215,11 +33711,11 @@ in lib.makeScope pkgs.newScope (self: { }); djula-locale = (build-asdf-system { pname = "djula-locale"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "djula-locale" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/djula/2023-10-21/djula-20231021-git.tgz"; - sha256 = "0rk6348sz8mf2jfnk4rm6ai479r1bmmcnc2lx8jjjlji0b5sis3b"; + url = "http://beta.quicklisp.org/archive/djula/2024-10-12/djula-20241012-git.tgz"; + sha256 = "1m4k0ywkpvbpljd8r9vfmsw2zkphwcfwgbdp911zkiv5rcnmgykw"; system = "djula-locale"; asd = "djula-locale"; }); @@ -33231,11 +33727,11 @@ in lib.makeScope pkgs.newScope (self: { }); djula-test = (build-asdf-system { pname = "djula-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "djula-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/djula/2023-10-21/djula-20231021-git.tgz"; - sha256 = "0rk6348sz8mf2jfnk4rm6ai479r1bmmcnc2lx8jjjlji0b5sis3b"; + url = "http://beta.quicklisp.org/archive/djula/2024-10-12/djula-20241012-git.tgz"; + sha256 = "1m4k0ywkpvbpljd8r9vfmsw2zkphwcfwgbdp911zkiv5rcnmgykw"; system = "djula-test"; asd = "djula-test"; }); @@ -33247,11 +33743,11 @@ in lib.makeScope pkgs.newScope (self: { }); djula-translate = (build-asdf-system { pname = "djula-translate"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "djula-translate" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/djula/2023-10-21/djula-20231021-git.tgz"; - sha256 = "0rk6348sz8mf2jfnk4rm6ai479r1bmmcnc2lx8jjjlji0b5sis3b"; + url = "http://beta.quicklisp.org/archive/djula/2024-10-12/djula-20241012-git.tgz"; + sha256 = "1m4k0ywkpvbpljd8r9vfmsw2zkphwcfwgbdp911zkiv5rcnmgykw"; system = "djula-translate"; asd = "djula-translate"; }); @@ -33311,11 +33807,11 @@ in lib.makeScope pkgs.newScope (self: { }); dns-client = (build-asdf-system { pname = "dns-client"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "dns-client" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/dns-client/2023-10-21/dns-client-20231021-git.tgz"; - sha256 = "01kwm6v7yk7mx3i6vi7rr2iz1gvgnlsjd9piirc9ryzcifj9fy7v"; + url = "http://beta.quicklisp.org/archive/dns-client/2024-10-12/dns-client-20241012-git.tgz"; + sha256 = "1lbxryi0hx1i0ib3rz3ci89pfdyzikhv4dg0lk5piggrkdji2fx3"; system = "dns-client"; asd = "dns-client"; }); @@ -33405,11 +33901,11 @@ in lib.makeScope pkgs.newScope (self: { }); docs-builder = (build-asdf-system { pname = "docs-builder"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "docs-builder" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/docs-builder/2023-06-18/docs-builder-20230618-git.tgz"; - sha256 = "0lvyms70qxkj5rq3m9kacvpvliz1lxmhzlvr8dj29xwrlg44i5kv"; + url = "http://beta.quicklisp.org/archive/docs-builder/2024-10-12/docs-builder-20241012-git.tgz"; + sha256 = "09pg4frik728g7njrpkb8jmzw6q9f47ng4c123lmqlmjha9bs03c"; system = "docs-builder"; asd = "docs-builder"; }); @@ -33421,11 +33917,11 @@ in lib.makeScope pkgs.newScope (self: { }); docs-config = (build-asdf-system { pname = "docs-config"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "docs-config" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/docs-builder/2023-06-18/docs-builder-20230618-git.tgz"; - sha256 = "0lvyms70qxkj5rq3m9kacvpvliz1lxmhzlvr8dj29xwrlg44i5kv"; + url = "http://beta.quicklisp.org/archive/docs-builder/2024-10-12/docs-builder-20241012-git.tgz"; + sha256 = "09pg4frik728g7njrpkb8jmzw6q9f47ng4c123lmqlmjha9bs03c"; system = "docs-config"; asd = "docs-config"; }); @@ -33673,11 +34169,11 @@ in lib.makeScope pkgs.newScope (self: { }); dref = (build-asdf-system { pname = "dref"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "dref" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgl-pax/2023-10-21/mgl-pax-20231021-git.tgz"; - sha256 = "03if07sjx77x9sdva2sqh920lfj1gvkxbnsrnddk6q79kr2icjyg"; + url = "http://beta.quicklisp.org/archive/mgl-pax/2024-10-12/mgl-pax-20241012-git.tgz"; + sha256 = "17szk2ijccssa9n7zg8qh6hc706hahvzcrzlx716hmgq2hfwvvy0"; system = "dref"; asd = "dref"; }); @@ -33689,11 +34185,11 @@ in lib.makeScope pkgs.newScope (self: { }); dref-test = (build-asdf-system { pname = "dref-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "dref-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgl-pax/2023-10-21/mgl-pax-20231021-git.tgz"; - sha256 = "03if07sjx77x9sdva2sqh920lfj1gvkxbnsrnddk6q79kr2icjyg"; + url = "http://beta.quicklisp.org/archive/mgl-pax/2024-10-12/mgl-pax-20241012-git.tgz"; + sha256 = "17szk2ijccssa9n7zg8qh6hc706hahvzcrzlx716hmgq2hfwvvy0"; system = "dref-test"; asd = "dref-test"; }); @@ -33705,11 +34201,11 @@ in lib.makeScope pkgs.newScope (self: { }); drei-mcclim = (build-asdf-system { pname = "drei-mcclim"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "drei-mcclim" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "drei-mcclim"; asd = "drei-mcclim"; }); @@ -33751,13 +34247,29 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + duckdb = (build-asdf-system { + pname = "duckdb"; + version = "20241012-git"; + asds = [ "duckdb" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-duckdb/2024-10-12/cl-duckdb-20241012-git.tgz"; + sha256 = "144c8c4m8vwmdg1ny5hjsvxmm8k6jijmrabyf2hmcnvk7hdy5sq0"; + system = "duckdb"; + asd = "duckdb"; + }); + systems = [ "duckdb" ]; + lispLibs = [ (getAttr "bordeaux-threads" self) (getAttr "cffi" self) (getAttr "cffi-libffi" self) (getAttr "cl-ascii-table" self) (getAttr "cl-ppcre" self) (getAttr "cl-spark" self) (getAttr "float-features" self) (getAttr "frugal-uuid" self) (getAttr "let-plus" self) (getAttr "local-time" self) (getAttr "local-time-duration" self) (getAttr "periods" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); dufy = (build-asdf-system { pname = "dufy"; - version = "20210531-git"; + version = "20241012-git"; asds = [ "dufy" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/dufy/2021-05-31/dufy-20210531-git.tgz"; - sha256 = "10qyrc5xkivwm6xmcfls1alad83ck7b2yyxbnhgc2vmnrk6j1012"; + url = "http://beta.quicklisp.org/archive/dufy/2024-10-12/dufy-20241012-git.tgz"; + sha256 = "1fj1ad7jh8i72jvdc5ypdk1j1mlkr7dc9xs4khii9adj3jl1nb0v"; system = "dufy"; asd = "dufy"; }); @@ -33945,11 +34457,11 @@ in lib.makeScope pkgs.newScope (self: { }); dynamic-wind = (build-asdf-system { pname = "dynamic-wind"; - version = "20211230-git"; + version = "20241012-git"; asds = [ "dynamic-wind" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/contextl/2021-12-30/contextl-20211230-git.tgz"; - sha256 = "0apgznz4g6lpmd86lq7w0xddfjgnirk83ig7p0j6i93xadhy9wh0"; + url = "http://beta.quicklisp.org/archive/contextl/2024-10-12/contextl-20241012-git.tgz"; + sha256 = "1jsa5wyjzzfw9pii3d6x20mh8ijnpb291g3i0y2ccj0x8z3xfyyk"; system = "dynamic-wind"; asd = "dynamic-wind"; }); @@ -34055,11 +34567,11 @@ in lib.makeScope pkgs.newScope (self: { }); easter-gauss = (build-asdf-system { pname = "easter-gauss"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "easter-gauss" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/easter-gauss/2023-10-21/easter-gauss-20231021-git.tgz"; - sha256 = "160p8fzj0cl425y018l6gmyjf5xfp8w0zgwk363s9lvs9v7ayl65"; + url = "http://beta.quicklisp.org/archive/easter-gauss/2024-10-12/easter-gauss-20241012-git.tgz"; + sha256 = "1wgr7j8b32yq0ajy4a3g08yr7z4p987gfjsrd6gai5i9zqxkbyih"; system = "easter-gauss"; asd = "easter-gauss"; }); @@ -34071,11 +34583,11 @@ in lib.makeScope pkgs.newScope (self: { }); easy-audio = (build-asdf-system { pname = "easy-audio"; - version = "20220707-git"; + version = "20241012-git"; asds = [ "easy-audio" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-audio/2022-07-07/easy-audio-20220707-git.tgz"; - sha256 = "157h1d5r403wyjvyv02gzd67xf01spsgx044j4a4nx2cziqr7w6k"; + url = "http://beta.quicklisp.org/archive/easy-audio/2024-10-12/easy-audio-20241012-git.tgz"; + sha256 = "1vlk2lzipz7sspizv4fiv6nmxhgq9piangc6gfxz6m5k3r74mwrg"; system = "easy-audio"; asd = "easy-audio"; }); @@ -34103,11 +34615,11 @@ in lib.makeScope pkgs.newScope (self: { }); easy-macros = (build-asdf-system { pname = "easy-macros"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "easy-macros" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-macros/2022-11-06/easy-macros-20221106-git.tgz"; - sha256 = "0mashvad1ssh2kmr0wxgas13vxs6dsfb6b1q69cpxmpmx6sc067g"; + url = "http://beta.quicklisp.org/archive/easy-macros/2024-10-12/easy-macros-20241012-git.tgz"; + sha256 = "12ixfmxbxszhdcv2fnd9q8m573bn6q2nvn656bpwnzvka9si6vrq"; system = "easy-macros"; asd = "easy-macros"; }); @@ -34119,11 +34631,11 @@ in lib.makeScope pkgs.newScope (self: { }); easy-routes = (build-asdf-system { pname = "easy-routes"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "easy-routes" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-routes/2023-10-21/easy-routes-20231021-git.tgz"; - sha256 = "1banw54kz2llzb9h5sm47ckfc9l348m7qncm0npsy0w837rxkyzx"; + url = "http://beta.quicklisp.org/archive/easy-routes/2024-10-12/easy-routes-20241012-git.tgz"; + sha256 = "0bz91g0vd1nn9b23npmrjw2ig6fahjs3b6iiw7ncajc2w5x9w1y4"; system = "easy-routes"; asd = "easy-routes"; }); @@ -34135,11 +34647,11 @@ in lib.makeScope pkgs.newScope (self: { }); easy-routes_plus_djula = (build-asdf-system { pname = "easy-routes+djula"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "easy-routes+djula" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-routes/2023-10-21/easy-routes-20231021-git.tgz"; - sha256 = "1banw54kz2llzb9h5sm47ckfc9l348m7qncm0npsy0w837rxkyzx"; + url = "http://beta.quicklisp.org/archive/easy-routes/2024-10-12/easy-routes-20241012-git.tgz"; + sha256 = "0bz91g0vd1nn9b23npmrjw2ig6fahjs3b6iiw7ncajc2w5x9w1y4"; system = "easy-routes+djula"; asd = "easy-routes+djula"; }); @@ -34151,11 +34663,11 @@ in lib.makeScope pkgs.newScope (self: { }); easy-routes_plus_errors = (build-asdf-system { pname = "easy-routes+errors"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "easy-routes+errors" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-routes/2023-10-21/easy-routes-20231021-git.tgz"; - sha256 = "1banw54kz2llzb9h5sm47ckfc9l348m7qncm0npsy0w837rxkyzx"; + url = "http://beta.quicklisp.org/archive/easy-routes/2024-10-12/easy-routes-20241012-git.tgz"; + sha256 = "0bz91g0vd1nn9b23npmrjw2ig6fahjs3b6iiw7ncajc2w5x9w1y4"; system = "easy-routes+errors"; asd = "easy-routes+errors"; }); @@ -34391,11 +34903,11 @@ in lib.makeScope pkgs.newScope (self: { }); eclector = (build-asdf-system { pname = "eclector"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "eclector" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/eclector/2023-10-21/eclector-20231021-git.tgz"; - sha256 = "0rh1kvm5sqqinqzzhdngfj14jq0raaxn6mlnjvvs92wgsvyfliy8"; + url = "http://beta.quicklisp.org/archive/eclector/2024-10-12/eclector-20241012-git.tgz"; + sha256 = "06qhll5k0hq652gdzvvhcv4amqg9z7qillnn3z9cm8z9sv1n912v"; system = "eclector"; asd = "eclector"; }); @@ -34407,11 +34919,11 @@ in lib.makeScope pkgs.newScope (self: { }); eclector-concrete-syntax-tree = (build-asdf-system { pname = "eclector-concrete-syntax-tree"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "eclector-concrete-syntax-tree" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/eclector/2023-10-21/eclector-20231021-git.tgz"; - sha256 = "0rh1kvm5sqqinqzzhdngfj14jq0raaxn6mlnjvvs92wgsvyfliy8"; + url = "http://beta.quicklisp.org/archive/eclector/2024-10-12/eclector-20241012-git.tgz"; + sha256 = "06qhll5k0hq652gdzvvhcv4amqg9z7qillnn3z9cm8z9sv1n912v"; system = "eclector-concrete-syntax-tree"; asd = "eclector-concrete-syntax-tree"; }); @@ -34421,6 +34933,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + eclector_dot_syntax-extensions = (build-asdf-system { + pname = "eclector.syntax-extensions"; + version = "20241012-git"; + asds = [ "eclector.syntax-extensions" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/eclector/2024-10-12/eclector-20241012-git.tgz"; + sha256 = "06qhll5k0hq652gdzvvhcv4amqg9z7qillnn3z9cm8z9sv1n912v"; + system = "eclector.syntax-extensions"; + asd = "eclector.syntax-extensions"; + }); + systems = [ "eclector.syntax-extensions" ]; + lispLibs = [ (getAttr "eclector" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); eco = (build-asdf-system { pname = "eco"; version = "20190813-git"; @@ -34567,11 +35095,11 @@ in lib.makeScope pkgs.newScope (self: { }); enchant = (build-asdf-system { pname = "enchant"; - version = "20211209-git"; + version = "20241012-git"; asds = [ "enchant" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-enchant/2021-12-09/cl-enchant-20211209-git.tgz"; - sha256 = "1d0b8743g4y75jl69rq75m8csa5af2fwlxkfvs2p06rsx9dljh79"; + url = "http://beta.quicklisp.org/archive/cl-enchant/2024-10-12/cl-enchant-20241012-git.tgz"; + sha256 = "1fcxyb9b8g0v2il2q4xj7z19y1qfxvgd34zax8sdjvl4rp66b08v"; system = "enchant"; asd = "enchant"; }); @@ -34579,22 +35107,6 @@ in lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "cffi" self) ]; meta = {}; }); - enchant-autoload = (build-asdf-system { - pname = "enchant-autoload"; - version = "20211209-git"; - asds = [ "enchant-autoload" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-enchant/2021-12-09/cl-enchant-20211209-git.tgz"; - sha256 = "1d0b8743g4y75jl69rq75m8csa5af2fwlxkfvs2p06rsx9dljh79"; - system = "enchant-autoload"; - asd = "enchant-autoload"; - }); - systems = [ "enchant-autoload" ]; - lispLibs = [ (getAttr "enchant" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); enhanced-boolean = (build-asdf-system { pname = "enhanced-boolean"; version = "1.0"; @@ -34965,11 +35477,11 @@ in lib.makeScope pkgs.newScope (self: { }); equals = (build-asdf-system { pname = "equals"; - version = "20140826-git"; + version = "20241012-git"; asds = [ "equals" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/equals/2014-08-26/equals-20140826-git.tgz"; - sha256 = "0z80z2xb7vlwfgx4sfmj1yba8gs6cgwb86iqrby25h4h34w7kj1w"; + url = "http://beta.quicklisp.org/archive/equals/2024-10-12/equals-20241012-git.tgz"; + sha256 = "1pzhj748dgjcw6qffkykxx156y78wy3bsbqmq5ijkybfjpnfsg27"; system = "equals"; asd = "equals"; }); @@ -34981,11 +35493,11 @@ in lib.makeScope pkgs.newScope (self: { }); erjoalgo-webutil = (build-asdf-system { pname = "erjoalgo-webutil"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "erjoalgo-webutil" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/erjoalgo-webutil/2023-10-21/erjoalgo-webutil-20231021-git.tgz"; - sha256 = "0zrp88sal627dhk84vkkgiwf388238f6zyw8bwlrpzcy6yffccrs"; + url = "http://beta.quicklisp.org/archive/erjoalgo-webutil/2024-10-12/erjoalgo-webutil-20241012-git.tgz"; + sha256 = "1mf9f23p6pagdi97k306a6122a5djx06nfwsxnx61gbyir2cpl2c"; system = "erjoalgo-webutil"; asd = "erjoalgo-webutil"; }); @@ -35061,11 +35573,11 @@ in lib.makeScope pkgs.newScope (self: { }); erudite = (build-asdf-system { pname = "erudite"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "erudite" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/erudite/2022-11-06/erudite-20221106-git.tgz"; - sha256 = "0za0wrblmk2kclc3wvlvsjf5mkri5ndhgc5ppc9p4zac3fd7p67n"; + url = "http://beta.quicklisp.org/archive/erudite/2024-10-12/erudite-20241012-git.tgz"; + sha256 = "159fmpm770rnixdpzpmzvqzd2kpns5mglpdxykvv2lqlnac24jn5"; system = "erudite"; asd = "erudite"; }); @@ -35077,11 +35589,11 @@ in lib.makeScope pkgs.newScope (self: { }); erudite-test = (build-asdf-system { pname = "erudite-test"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "erudite-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/erudite/2022-11-06/erudite-20221106-git.tgz"; - sha256 = "0za0wrblmk2kclc3wvlvsjf5mkri5ndhgc5ppc9p4zac3fd7p67n"; + url = "http://beta.quicklisp.org/archive/erudite/2024-10-12/erudite-20241012-git.tgz"; + sha256 = "159fmpm770rnixdpzpmzvqzd2kpns5mglpdxykvv2lqlnac24jn5"; system = "erudite-test"; asd = "erudite-test"; }); @@ -35093,11 +35605,11 @@ in lib.makeScope pkgs.newScope (self: { }); esa-mcclim = (build-asdf-system { pname = "esa-mcclim"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "esa-mcclim" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "esa-mcclim"; asd = "esa-mcclim"; }); @@ -35141,11 +35653,11 @@ in lib.makeScope pkgs.newScope (self: { }); esrap = (build-asdf-system { pname = "esrap"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "esrap" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/esrap/2023-06-18/esrap-20230618-git.tgz"; - sha256 = "0gs0mfamldhaihnlk0qxg2q4bl8bamq68dif9js9fkl8apg3iykl"; + url = "http://beta.quicklisp.org/archive/esrap/2024-10-12/esrap-20241012-git.tgz"; + sha256 = "0pvid1hld03vz2zyszvsxckcpjb2lfl2vjfig6dlrmw3dx8grdj0"; system = "esrap"; asd = "esrap"; }); @@ -35265,11 +35777,11 @@ in lib.makeScope pkgs.newScope (self: { }); event-emitter = (build-asdf-system { pname = "event-emitter"; - version = "20220331-git"; + version = "20241012-git"; asds = [ "event-emitter" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/event-emitter/2022-03-31/event-emitter-20220331-git.tgz"; - sha256 = "1v1mhwypc08hiz14kg6vp4xzkhlicw29vxgawz8m5ydxl2ranwc0"; + url = "http://beta.quicklisp.org/archive/event-emitter/2024-10-12/event-emitter-20241012-git.tgz"; + sha256 = "0kj77r09wbsiq6n62vvgk9fh37p3n3ycmhln1mhswz24rhirnpyn"; system = "event-emitter"; asd = "event-emitter"; }); @@ -35279,13 +35791,29 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + event-emitter-benchmark = (build-asdf-system { + pname = "event-emitter-benchmark"; + version = "20241012-git"; + asds = [ "event-emitter-benchmark" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/event-emitter/2024-10-12/event-emitter-20241012-git.tgz"; + sha256 = "0kj77r09wbsiq6n62vvgk9fh37p3n3ycmhln1mhswz24rhirnpyn"; + system = "event-emitter-benchmark"; + asd = "event-emitter-benchmark"; + }); + systems = [ "event-emitter-benchmark" ]; + lispLibs = [ (getAttr "event-emitter" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); event-emitter-test = (build-asdf-system { pname = "event-emitter-test"; - version = "20220331-git"; + version = "20241012-git"; asds = [ "event-emitter-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/event-emitter/2022-03-31/event-emitter-20220331-git.tgz"; - sha256 = "1v1mhwypc08hiz14kg6vp4xzkhlicw29vxgawz8m5ydxl2ranwc0"; + url = "http://beta.quicklisp.org/archive/event-emitter/2024-10-12/event-emitter-20241012-git.tgz"; + sha256 = "0kj77r09wbsiq6n62vvgk9fh37p3n3ycmhln1mhswz24rhirnpyn"; system = "event-emitter-test"; asd = "event-emitter-test"; }); @@ -35409,11 +35937,11 @@ in lib.makeScope pkgs.newScope (self: { }); example-bot = (build-asdf-system { pname = "example-bot"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "example-bot" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispcord/2023-06-18/lispcord-20230618-git.tgz"; - sha256 = "12v3n8gqry746f94wz7djhk3f3adzfnh8jga9c9lcsnwkgsrrc6a"; + url = "http://beta.quicklisp.org/archive/lispcord/2024-10-12/lispcord-20241012-git.tgz"; + sha256 = "11xwrrvvqdm1wdnxrxqgizgw25plsn28n2k0lm5kakax9n221brn"; system = "example-bot"; asd = "example-bot"; }); @@ -35503,70 +36031,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - extensible-compound-types = (build-asdf-system { - pname = "extensible-compound-types"; - version = "20231021-git"; - asds = [ "extensible-compound-types" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/extensible-compound-types/2023-10-21/extensible-compound-types-20231021-git.tgz"; - sha256 = "1fbsrp52dx3p27r7mawlia4fhbyyf7n4piplbpnhszv26g483k9m"; - system = "extensible-compound-types"; - asd = "extensible-compound-types"; - }); - systems = [ "extensible-compound-types" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-environments" self) (getAttr "cl-form-types" self) (getAttr "compiler-macro-notes" self) (getAttr "fiveam" self) (getAttr "in-nomine" self) (getAttr "introspect-environment" self) (getAttr "optima" self) (getAttr "swank" self) (getAttr "trivial-types" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - extensible-compound-types-cl = (build-asdf-system { - pname = "extensible-compound-types-cl"; - version = "20231021-git"; - asds = [ "extensible-compound-types-cl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/extensible-compound-types/2023-10-21/extensible-compound-types-20231021-git.tgz"; - sha256 = "1fbsrp52dx3p27r7mawlia4fhbyyf7n4piplbpnhszv26g483k9m"; - system = "extensible-compound-types-cl"; - asd = "extensible-compound-types-cl"; - }); - systems = [ "extensible-compound-types-cl" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "asdf-system-connections" self) (getAttr "cl-form-types" self) (getAttr "extensible-compound-types" self) (getAttr "fiveam" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - extensible-compound-types-interfaces = (build-asdf-system { - pname = "extensible-compound-types-interfaces"; - version = "20231021-git"; - asds = [ "extensible-compound-types-interfaces" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/extensible-compound-types/2023-10-21/extensible-compound-types-20231021-git.tgz"; - sha256 = "1fbsrp52dx3p27r7mawlia4fhbyyf7n4piplbpnhszv26g483k9m"; - system = "extensible-compound-types-interfaces"; - asd = "extensible-compound-types-interfaces"; - }); - systems = [ "extensible-compound-types-interfaces" ]; - lispLibs = [ (getAttr "extensible-compound-types-cl" self) (getAttr "polymorphic-functions" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - extensible-optimizing-coerce = (build-asdf-system { - pname = "extensible-optimizing-coerce"; - version = "20230618-git"; - asds = [ "extensible-optimizing-coerce" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/extensible-optimizing-coerce/2023-06-18/extensible-optimizing-coerce-20230618-git.tgz"; - sha256 = "17hqnd594xyp8rb24ampndfzqkw086fq4gxa9dlp9lzbq6fwfsb0"; - system = "extensible-optimizing-coerce"; - asd = "extensible-optimizing-coerce"; - }); - systems = [ "extensible-optimizing-coerce" ]; - lispLibs = [ (getAttr "closer-mop" self) (getAttr "extensible-compound-types" self) (getAttr "extensible-compound-types-interfaces" self) (getAttr "optima" self) (getAttr "trivial-types" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); extensible-sequences = (build-asdf-system { pname = "extensible-sequences"; version = "20130813-darcs"; @@ -35585,11 +36049,11 @@ in lib.makeScope pkgs.newScope (self: { }); external-program = (build-asdf-system { pname = "external-program"; - version = "20190307-git"; + version = "20241012-git"; asds = [ "external-program" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz"; - sha256 = "0vww1x3yilb3bjwg6k184vaj4vxyxw4vralhnlm6lk4xac67kc9z"; + url = "http://beta.quicklisp.org/archive/external-program/2024-10-12/external-program-20241012-git.tgz"; + sha256 = "1g7hawsbbfspzljj2spxxv26a5079xsa0kd7dqdclm5n71fypwx6"; system = "external-program"; asd = "external-program"; }); @@ -35599,11 +36063,11 @@ in lib.makeScope pkgs.newScope (self: { }); external-program-test = (build-asdf-system { pname = "external-program-test"; - version = "20190307-git"; + version = "20241012-git"; asds = [ "external-program-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz"; - sha256 = "0vww1x3yilb3bjwg6k184vaj4vxyxw4vralhnlm6lk4xac67kc9z"; + url = "http://beta.quicklisp.org/archive/external-program/2024-10-12/external-program-20241012-git.tgz"; + sha256 = "1g7hawsbbfspzljj2spxxv26a5079xsa0kd7dqdclm5n71fypwx6"; system = "external-program-test"; asd = "external-program"; }); @@ -35615,11 +36079,11 @@ in lib.makeScope pkgs.newScope (self: { }); external-symbol-not-found = (build-asdf-system { pname = "external-symbol-not-found"; - version = "20220220-git"; + version = "20241012-git"; asds = [ "external-symbol-not-found" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/external-symbol-not-found/2022-02-20/external-symbol-not-found-20220220-git.tgz"; - sha256 = "1wlz36y1dka4409ngvp583jafwb9z8y6ghmyb84wn9spj66kghz8"; + url = "http://beta.quicklisp.org/archive/external-symbol-not-found/2024-10-12/external-symbol-not-found-20241012-git.tgz"; + sha256 = "1ic982jbcy71wlni60wnb8hqg3cqw488h4jj5pd2sqmjwv1960v7"; system = "external-symbol-not-found"; asd = "external-symbol-not-found"; }); @@ -35759,11 +36223,11 @@ in lib.makeScope pkgs.newScope (self: { }); fare-csv = (build-asdf-system { pname = "fare-csv"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "fare-csv" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/fare-csv/2023-02-14/fare-csv-20230214-git.tgz"; - sha256 = "0k3mf968w94m4yff1k2jh7xlnpsm016qs4448bvklacjrr72vk8x"; + url = "http://beta.quicklisp.org/archive/fare-csv/2024-10-12/fare-csv-20241012-git.tgz"; + sha256 = "153sxb0vyd1cnhfw15j3183kqhcnma0ygaf5svzibknclm16n767"; system = "fare-csv"; asd = "fare-csv"; }); @@ -35859,11 +36323,11 @@ in lib.makeScope pkgs.newScope (self: { }); fare-scripts = (build-asdf-system { pname = "fare-scripts"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "fare-scripts" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/fare-scripts/2023-10-21/fare-scripts-20231021-git.tgz"; - sha256 = "1lym0k98fxqypka54m98hgzf3a5qicqmvm5hlyarpkdajgz6x5dp"; + url = "http://beta.quicklisp.org/archive/fare-scripts/2024-10-12/fare-scripts-20241012-git.tgz"; + sha256 = "08fq1ry4prlww4gr7zris7vywqs3vm1253mqfgx8vg0awrccmf98"; system = "fare-scripts"; asd = "fare-scripts"; }); @@ -35903,29 +36367,13 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - fast-generic-functions = (build-asdf-system { - pname = "fast-generic-functions"; - version = "20220220-git"; - asds = [ "fast-generic-functions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fast-generic-functions/2022-02-20/fast-generic-functions-20220220-git.tgz"; - sha256 = "16hf9bi2p5s77p3m3aqsihcd9iicqjhhxxpsarjv93c41qs54yad"; - system = "fast-generic-functions"; - asd = "fast-generic-functions"; - }); - systems = [ "fast-generic-functions" ]; - lispLibs = [ (getAttr "closer-mop" self) (getAttr "sealable-metaobjects" self) (getAttr "trivial-macroexpand-all" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); fast-http = (build-asdf-system { pname = "fast-http"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "fast-http" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/fast-http/2023-10-21/fast-http-20231021-git.tgz"; - sha256 = "13cv9kdf3z85b78xkjvs1qmbsn9frsj0n2bbj10rwd7l2glb407g"; + url = "http://beta.quicklisp.org/archive/fast-http/2024-10-12/fast-http-20241012-git.tgz"; + sha256 = "04cxh2241l9hyzarrxs528v2jjdfm5g3prc2374m4xkrb0wiygh0"; system = "fast-http"; asd = "fast-http"; }); @@ -35935,11 +36383,11 @@ in lib.makeScope pkgs.newScope (self: { }); fast-http-test = (build-asdf-system { pname = "fast-http-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "fast-http-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/fast-http/2023-10-21/fast-http-20231021-git.tgz"; - sha256 = "13cv9kdf3z85b78xkjvs1qmbsn9frsj0n2bbj10rwd7l2glb407g"; + url = "http://beta.quicklisp.org/archive/fast-http/2024-10-12/fast-http-20241012-git.tgz"; + sha256 = "04cxh2241l9hyzarrxs528v2jjdfm5g3prc2374m4xkrb0wiygh0"; system = "fast-http-test"; asd = "fast-http-test"; }); @@ -35979,13 +36427,29 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + fast-mpsc-queue = (build-asdf-system { + pname = "fast-mpsc-queue"; + version = "20241012-git"; + asds = [ "fast-mpsc-queue" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/fast-mpsc-queue/2024-10-12/fast-mpsc-queue-20241012-git.tgz"; + sha256 = "1ggiaryjv3lmzrk6m22y7vvbqn3z0n7ahmkyfjq6iyrd64d77ck7"; + system = "fast-mpsc-queue"; + asd = "fast-mpsc-queue"; + }); + systems = [ "fast-mpsc-queue" ]; + lispLibs = [ (getAttr "metabang-bind" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); fast-websocket = (build-asdf-system { pname = "fast-websocket"; - version = "20220707-git"; + version = "20241012-git"; asds = [ "fast-websocket" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/fast-websocket/2022-07-07/fast-websocket-20220707-git.tgz"; - sha256 = "1j7v00gbkzx4mq2v8y44jm4jx321hgrv9igfw23cvzzlyd3dzp6y"; + url = "http://beta.quicklisp.org/archive/fast-websocket/2024-10-12/fast-websocket-20241012-git.tgz"; + sha256 = "102z58d27966lpx08kc6apgaainbsdfhygb67ibyw6lxnaasy3jz"; system = "fast-websocket"; asd = "fast-websocket"; }); @@ -35997,11 +36461,11 @@ in lib.makeScope pkgs.newScope (self: { }); fast-websocket-test = (build-asdf-system { pname = "fast-websocket-test"; - version = "20220707-git"; + version = "20241012-git"; asds = [ "fast-websocket-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/fast-websocket/2022-07-07/fast-websocket-20220707-git.tgz"; - sha256 = "1j7v00gbkzx4mq2v8y44jm4jx321hgrv9igfw23cvzzlyd3dzp6y"; + url = "http://beta.quicklisp.org/archive/fast-websocket/2024-10-12/fast-websocket-20241012-git.tgz"; + sha256 = "102z58d27966lpx08kc6apgaainbsdfhygb67ibyw6lxnaasy3jz"; system = "fast-websocket-test"; asd = "fast-websocket-test"; }); @@ -36219,11 +36683,11 @@ in lib.makeScope pkgs.newScope (self: { }); file-attributes = (build-asdf-system { pname = "file-attributes"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "file-attributes" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/file-attributes/2023-10-21/file-attributes-20231021-git.tgz"; - sha256 = "0ga8m22bsvb4qf6zym40wy5nz6zwjm2agvx7v7ljmrrm4s5mx96l"; + url = "http://beta.quicklisp.org/archive/file-attributes/2024-10-12/file-attributes-20241012-git.tgz"; + sha256 = "14jimsmwcp8bygm2f0fjmjv0ncc5yxl7pvh04x0kw6gs1mc7rc9x"; system = "file-attributes"; asd = "file-attributes"; }); @@ -36231,6 +36695,22 @@ in lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "cffi" self) (getAttr "documentation-utils" self) (getAttr "trivial-features" self) ]; meta = {}; }); + file-finder = (build-asdf-system { + pname = "file-finder"; + version = "20241012-git"; + asds = [ "file-finder" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/file-finder/2024-10-12/file-finder-20241012-git.tgz"; + sha256 = "11cjyyngvydcq2sbgsqkxd9060a0cb3ndqrqr318djndf30ckmqx"; + system = "file-finder"; + asd = "file-finder"; + }); + systems = [ "file-finder" ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "file-attributes" self) (getAttr "local-time" self) (getAttr "named-readtables" self) (getAttr "serapeum" self) (getAttr "str" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); file-local-variable = (build-asdf-system { pname = "file-local-variable"; version = "20160318-git"; @@ -36281,11 +36761,11 @@ in lib.makeScope pkgs.newScope (self: { }); file-notify = (build-asdf-system { pname = "file-notify"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "file-notify" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/file-notify/2023-10-21/file-notify-20231021-git.tgz"; - sha256 = "0mk730ji4jdkx0x15wrnsianv86n98nh14wd6z8ljvr4k91sc7wl"; + url = "http://beta.quicklisp.org/archive/file-notify/2024-10-12/file-notify-20241012-git.tgz"; + sha256 = "1zxn0smgahbxvy8v2bwmff3262msqhqqc5qpmh4ffinx6azln1hq"; system = "file-notify"; asd = "file-notify"; }); @@ -36297,11 +36777,11 @@ in lib.makeScope pkgs.newScope (self: { }); file-select = (build-asdf-system { pname = "file-select"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "file-select" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/file-select/2023-10-21/file-select-20231021-git.tgz"; - sha256 = "1vji1b4p09lvr4zq9qv3z3y5d8m9w0qcnk2ac89i9lgx8xi58aa1"; + url = "http://beta.quicklisp.org/archive/file-select/2024-10-12/file-select-20241012-git.tgz"; + sha256 = "0vp7qfqymlw21yrlfack799xjwyh23dyxnbc5ix4fnylpi1lxjbn"; system = "file-select"; asd = "file-select"; }); @@ -36329,27 +36809,27 @@ in lib.makeScope pkgs.newScope (self: { }); filesystem-utils = (build-asdf-system { pname = "filesystem-utils"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "filesystem-utils" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/filesystem-utils/2023-10-21/filesystem-utils-20231021-git.tgz"; - sha256 = "0vf81y58wd2p9blfcz80g3c3nqwljzk4v3sz29n7lhg344x81m4z"; + url = "http://beta.quicklisp.org/archive/filesystem-utils/2024-10-12/filesystem-utils-20241012-git.tgz"; + sha256 = "0h1xqpc11iachb9yg1d2xrzp1df1qadr1call904cjf45xadn62r"; system = "filesystem-utils"; asd = "filesystem-utils"; }); systems = [ "filesystem-utils" ]; - lispLibs = [ (getAttr "documentation-utils" self) (getAttr "pathname-utils" self) (getAttr "trivial-features" self) ]; + lispLibs = [ (getAttr "cffi" self) (getAttr "documentation-utils" self) (getAttr "pathname-utils" self) (getAttr "trivial-features" self) ]; meta = { hydraPlatforms = [ ]; }; }); filesystem-utils-test = (build-asdf-system { pname = "filesystem-utils-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "filesystem-utils-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/filesystem-utils/2023-10-21/filesystem-utils-20231021-git.tgz"; - sha256 = "0vf81y58wd2p9blfcz80g3c3nqwljzk4v3sz29n7lhg344x81m4z"; + url = "http://beta.quicklisp.org/archive/filesystem-utils/2024-10-12/filesystem-utils-20241012-git.tgz"; + sha256 = "0h1xqpc11iachb9yg1d2xrzp1df1qadr1call904cjf45xadn62r"; system = "filesystem-utils-test"; asd = "filesystem-utils-test"; }); @@ -36521,11 +37001,11 @@ in lib.makeScope pkgs.newScope (self: { }); fiveam = (build-asdf-system { pname = "fiveam"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "fiveam" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/fiveam/2023-10-21/fiveam-20231021-git.tgz"; - sha256 = "1g3dsmcxzrsijz4bx5y8ixfb26kh46hsj6q94yrydz0hk5w37skf"; + url = "http://beta.quicklisp.org/archive/fiveam/2024-10-12/fiveam-20241012-git.tgz"; + sha256 = "066amfjqhagzhb602y911wbw7jh9cv1fb7bfn2ppjzm5kf7hqbnh"; system = "fiveam"; asd = "fiveam"; }); @@ -36551,11 +37031,11 @@ in lib.makeScope pkgs.newScope (self: { }); fiveam-matchers = (build-asdf-system { pname = "fiveam-matchers"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "fiveam-matchers" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/fiveam-matchers/2023-10-21/fiveam-matchers-20231021-git.tgz"; - sha256 = "18calv5cc707cdb9gzpy24753icq5lwgy2bhfq28vw1njxmwr74h"; + url = "http://beta.quicklisp.org/archive/fiveam-matchers/2024-10-12/fiveam-matchers-20241012-git.tgz"; + sha256 = "1kwichcxjmqdi8whx4daggp4fdp53w17jj1rqlph9ixgr4s9kvqv"; system = "fiveam-matchers"; asd = "fiveam-matchers"; }); @@ -36597,22 +37077,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - flac-metadata = (build-asdf-system { - pname = "flac-metadata"; - version = "20220707-git"; - asds = [ "flac-metadata" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/flac-metadata/2022-07-07/flac-metadata-20220707-git.tgz"; - sha256 = "1p515ym8rwrz3mybig83z41jrbrviikp3yyqgn9qzzjcrx7x1zsg"; - system = "flac-metadata"; - asd = "flac-metadata"; - }); - systems = [ "flac-metadata" ]; - lispLibs = [ (getAttr "binary-parser" self) (getAttr "mfiano-utils" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); flare = (build-asdf-system { pname = "flare"; version = "20231021-git"; @@ -36663,11 +37127,11 @@ in lib.makeScope pkgs.newScope (self: { }); flexi-streams = (build-asdf-system { pname = "flexi-streams"; - version = "20220220-git"; + version = "20241012-git"; asds = [ "flexi-streams" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/flexi-streams/2022-02-20/flexi-streams-20220220-git.tgz"; - sha256 = "04azqvz11s8dngy49bjl19hrfn0ip1b7m0szm4hlppq364msil7b"; + url = "http://beta.quicklisp.org/archive/flexi-streams/2024-10-12/flexi-streams-20241012-git.tgz"; + sha256 = "1bk224ryfiwsmnmq2gdfv9gld85z2rvnlx7fxcl2k122vc344akh"; system = "flexi-streams"; asd = "flexi-streams"; }); @@ -36677,11 +37141,11 @@ in lib.makeScope pkgs.newScope (self: { }); flexi-streams-test = (build-asdf-system { pname = "flexi-streams-test"; - version = "20220220-git"; + version = "20241012-git"; asds = [ "flexi-streams-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/flexi-streams/2022-02-20/flexi-streams-20220220-git.tgz"; - sha256 = "04azqvz11s8dngy49bjl19hrfn0ip1b7m0szm4hlppq364msil7b"; + url = "http://beta.quicklisp.org/archive/flexi-streams/2024-10-12/flexi-streams-20241012-git.tgz"; + sha256 = "1bk224ryfiwsmnmq2gdfv9gld85z2rvnlx7fxcl2k122vc344akh"; system = "flexi-streams-test"; asd = "flexi-streams-test"; }); @@ -36725,11 +37189,11 @@ in lib.makeScope pkgs.newScope (self: { }); float-features = (build-asdf-system { pname = "float-features"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "float-features" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/float-features/2023-10-21/float-features-20231021-git.tgz"; - sha256 = "0871g3g9dlpgfv2v29jcnqbbxss0ih7d79zy4nlvz25krqcvvw0l"; + url = "http://beta.quicklisp.org/archive/float-features/2024-10-12/float-features-20241012-git.tgz"; + sha256 = "1vxnvaprki5rk3phj20m35pva9dpgsixm8d9rnsixq1qgrv3djjf"; system = "float-features"; asd = "float-features"; }); @@ -36739,11 +37203,11 @@ in lib.makeScope pkgs.newScope (self: { }); float-features-tests = (build-asdf-system { pname = "float-features-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "float-features-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/float-features/2023-10-21/float-features-20231021-git.tgz"; - sha256 = "0871g3g9dlpgfv2v29jcnqbbxss0ih7d79zy4nlvz25krqcvvw0l"; + url = "http://beta.quicklisp.org/archive/float-features/2024-10-12/float-features-20241012-git.tgz"; + sha256 = "1vxnvaprki5rk3phj20m35pva9dpgsixm8d9rnsixq1qgrv3djjf"; system = "float-features-tests"; asd = "float-features-tests"; }); @@ -36803,11 +37267,11 @@ in lib.makeScope pkgs.newScope (self: { }); flow = (build-asdf-system { pname = "flow"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "flow" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/flow/2023-10-21/flow-20231021-git.tgz"; - sha256 = "09g88wnz3dflwrjssl45xihy75fsd0l63ggy1z7mh93hc79ficz5"; + url = "http://beta.quicklisp.org/archive/flow/2024-10-12/flow-20241012-git.tgz"; + sha256 = "1623kkyygwkqpgrbvv1zqj13mjkycqyh88nwcjsxd0clrlhlyfz3"; system = "flow"; asd = "flow"; }); @@ -36817,11 +37281,11 @@ in lib.makeScope pkgs.newScope (self: { }); flow-visualizer = (build-asdf-system { pname = "flow-visualizer"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "flow-visualizer" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/flow/2023-10-21/flow-20231021-git.tgz"; - sha256 = "09g88wnz3dflwrjssl45xihy75fsd0l63ggy1z7mh93hc79ficz5"; + url = "http://beta.quicklisp.org/archive/flow/2024-10-12/flow-20241012-git.tgz"; + sha256 = "1623kkyygwkqpgrbvv1zqj13mjkycqyh88nwcjsxd0clrlhlyfz3"; system = "flow-visualizer"; asd = "flow-visualizer"; }); @@ -36863,6 +37327,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + flx = (build-asdf-system { + pname = "flx"; + version = "20241012-git"; + asds = [ "flx" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-flx/2024-10-12/cl-flx-20241012-git.tgz"; + sha256 = "02p8qmc6wy3kf6w3rpgjvyg3jb699i5x9zk2f1p2y9h3m86d7hsw"; + system = "flx"; + asd = "flx"; + }); + systems = [ "flx" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + }); fmarshal = (build-asdf-system { pname = "fmarshal"; version = "20130720-git"; @@ -36961,11 +37441,11 @@ in lib.makeScope pkgs.newScope (self: { }); fn = (build-asdf-system { pname = "fn"; - version = "20171019-git"; + version = "20241012-git"; asds = [ "fn" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/fn/2017-10-19/fn-20171019-git.tgz"; - sha256 = "0yyp9z6iwx476whz0n1rpjznjyqqhlylhzwpgg5xx92lxmskl752"; + url = "http://beta.quicklisp.org/archive/fn/2024-10-12/fn-20241012-git.tgz"; + sha256 = "08ydmfly5jaisfj8pkksq6npz992zlz4ni1yqlrq5yigwx41xaz0"; system = "fn"; asd = "fn"; }); @@ -37506,13 +37986,13 @@ in lib.makeScope pkgs.newScope (self: { version = "master-df14cb8c-git"; asds = [ "foreign-array" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/antik/2019-10-08/antik-master-df14cb8c-git.tgz"; + url = "http://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz"; sha256 = "1n08cx4n51z8v4bxyak166lp495xda3x7llfxcdpxndxqxcammr0"; system = "foreign-array"; asd = "foreign-array"; }); systems = [ "foreign-array" ]; - lispLibs = [ (getAttr "antik-base" self) (getAttr "cffi" self) (getAttr "cffi-grovel" self) (getAttr "static-vectors" self) (getAttr "trivial-garbage" self) ]; + lispLibs = [ (getAttr "antik-base" self) (getAttr "cffi" self) (getAttr "static-vectors" self) (getAttr "trivial-garbage" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -37643,22 +38123,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - freebsd-ffi = (build-asdf-system { - pname = "freebsd-ffi"; - version = "20220707-git"; - asds = [ "freebsd-ffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/freebsd-ffi/2022-07-07/freebsd-ffi-20220707-git.tgz"; - sha256 = "0mhbkigxmkjn5pdn58pn80d1wv49zd4vq0i59pnj6wir1fnr7mva"; - system = "freebsd-ffi"; - asd = "freebsd-ffi"; - }); - systems = [ "freebsd-ffi" ]; - lispLibs = [ (getAttr "cffi" self) (getAttr "mfiano-utils" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); freebsd-sysctl = (build-asdf-system { pname = "freebsd-sysctl"; version = "20210228-git"; @@ -37787,6 +38251,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + frugal-uuid = (build-asdf-system { + pname = "frugal-uuid"; + version = "20241012-git"; + asds = [ "frugal-uuid" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-frugal-uuid/2024-10-12/cl-frugal-uuid-20241012-git.tgz"; + sha256 = "01hli6gh0rr6mizqp1iqfch7rd0jw6ygrskjdr5hf3r8wwwvr9hh"; + system = "frugal-uuid"; + asd = "frugal-uuid"; + }); + systems = [ "frugal-uuid" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + }); fs-watcher = (build-asdf-system { pname = "fs-watcher"; version = "20171130-git"; @@ -37805,16 +38285,16 @@ in lib.makeScope pkgs.newScope (self: { }); fset = (build-asdf-system { pname = "fset"; - version = "20200925-git"; + version = "20241012-git"; asds = [ "fset" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/fset/2020-09-25/fset-20200925-git.tgz"; - sha256 = "15285aacb0dlhvbrkc11yffp5x2zd1jvm77zz7rrpbdwqbafp8sy"; + url = "http://beta.quicklisp.org/archive/fset/2024-10-12/fset-20241012-git.tgz"; + sha256 = "0h9j5a7vlr8g0hq99y4wgw1l1wialzs6k16nrpmd4pwiyiypzkm6"; system = "fset"; asd = "fset"; }); systems = [ "fset" ]; - lispLibs = [ (getAttr "misc-extensions" self) (getAttr "mt19937" self) (getAttr "named-readtables" self) ]; + lispLibs = [ (getAttr "misc-extensions" self) (getAttr "named-readtables" self) (getAttr "random-state" self) ]; meta = {}; }); fsocket = (build-asdf-system { @@ -37931,11 +38411,11 @@ in lib.makeScope pkgs.newScope (self: { }); functional-geometry = (build-asdf-system { pname = "functional-geometry"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "functional-geometry" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "functional-geometry"; asd = "functional-geometry"; }); @@ -37947,16 +38427,16 @@ in lib.makeScope pkgs.newScope (self: { }); functional-trees = (build-asdf-system { pname = "functional-trees"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "functional-trees" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/functional-trees/2023-10-21/functional-trees-20231021-git.tgz"; - sha256 = "0pp320fy4vqv723asdp12slljs05lbylzhi6ja1i5zklhpv4pv9l"; + url = "http://beta.quicklisp.org/archive/functional-trees/2024-10-12/functional-trees-20241012-git.tgz"; + sha256 = "02jhc2c6d7zd75cpjmwck62b3iyzsf5q2yqqpp5ymwjmnx4bnysd"; system = "functional-trees"; asd = "functional-trees"; }); systems = [ "functional-trees" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "asdf-package-system" self) (getAttr "cl-store" self) (getAttr "closer-mop" self) (getAttr "fset" self) (getAttr "iterate" self) (getAttr "serapeum" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "asdf-package-system" self) (getAttr "atomics" self) (getAttr "bordeaux-threads" self) (getAttr "cl-store" self) (getAttr "closer-mop" self) (getAttr "fset" self) (getAttr "iterate" self) (getAttr "serapeum" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -37995,11 +38475,11 @@ in lib.makeScope pkgs.newScope (self: { }); fuzzy-dates = (build-asdf-system { pname = "fuzzy-dates"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "fuzzy-dates" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/fuzzy-dates/2023-10-21/fuzzy-dates-20231021-git.tgz"; - sha256 = "09a77i9rn7cf5amw6wsx41hpnbp128vjhdw3vq82ip2gm0y4dv9d"; + url = "http://beta.quicklisp.org/archive/fuzzy-dates/2024-10-12/fuzzy-dates-20241012-git.tgz"; + sha256 = "1nnwb7dl772zax0ysc9v4z29kq639f3za7k34hdk9fyyqbln9dgl"; system = "fuzzy-dates"; asd = "fuzzy-dates"; }); @@ -38043,11 +38523,11 @@ in lib.makeScope pkgs.newScope (self: { }); gadgets = (build-asdf-system { pname = "gadgets"; - version = "20220220-git"; + version = "20241012-git"; asds = [ "gadgets" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/gadgets/2022-02-20/gadgets-20220220-git.tgz"; - sha256 = "0g06wb3dciri2q93x2dcf58x5r8gq2kb86fgd2w4pr5r1wxwd1sm"; + url = "http://beta.quicklisp.org/archive/gadgets/2024-10-12/gadgets-20241012-git.tgz"; + sha256 = "1ba4gj8lh3ihbb66xiz7hc8cdg3gvi3q20w32nmsqdch956is34k"; system = "gadgets"; asd = "gadgets"; }); @@ -38219,11 +38699,11 @@ in lib.makeScope pkgs.newScope (self: { }); generic-cl = (build-asdf-system { pname = "generic-cl"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "generic-cl" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; + url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; + sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; system = "generic-cl"; asd = "generic-cl"; }); @@ -38233,11 +38713,11 @@ in lib.makeScope pkgs.newScope (self: { }); generic-cl_dot_arithmetic = (build-asdf-system { pname = "generic-cl.arithmetic"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "generic-cl.arithmetic" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; + url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; + sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; system = "generic-cl.arithmetic"; asd = "generic-cl.arithmetic"; }); @@ -38249,11 +38729,11 @@ in lib.makeScope pkgs.newScope (self: { }); generic-cl_dot_collector = (build-asdf-system { pname = "generic-cl.collector"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "generic-cl.collector" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; + url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; + sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; system = "generic-cl.collector"; asd = "generic-cl.collector"; }); @@ -38265,11 +38745,11 @@ in lib.makeScope pkgs.newScope (self: { }); generic-cl_dot_comparison = (build-asdf-system { pname = "generic-cl.comparison"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "generic-cl.comparison" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; + url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; + sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; system = "generic-cl.comparison"; asd = "generic-cl.comparison"; }); @@ -38281,11 +38761,11 @@ in lib.makeScope pkgs.newScope (self: { }); generic-cl_dot_container = (build-asdf-system { pname = "generic-cl.container"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "generic-cl.container" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; + url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; + sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; system = "generic-cl.container"; asd = "generic-cl.container"; }); @@ -38297,11 +38777,11 @@ in lib.makeScope pkgs.newScope (self: { }); generic-cl_dot_internal = (build-asdf-system { pname = "generic-cl.internal"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "generic-cl.internal" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; + url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; + sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; system = "generic-cl.internal"; asd = "generic-cl.internal"; }); @@ -38313,11 +38793,11 @@ in lib.makeScope pkgs.newScope (self: { }); generic-cl_dot_iterator = (build-asdf-system { pname = "generic-cl.iterator"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "generic-cl.iterator" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; + url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; + sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; system = "generic-cl.iterator"; asd = "generic-cl.iterator"; }); @@ -38329,11 +38809,11 @@ in lib.makeScope pkgs.newScope (self: { }); generic-cl_dot_lazy-seq = (build-asdf-system { pname = "generic-cl.lazy-seq"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "generic-cl.lazy-seq" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; + url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; + sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; system = "generic-cl.lazy-seq"; asd = "generic-cl.lazy-seq"; }); @@ -38345,11 +38825,11 @@ in lib.makeScope pkgs.newScope (self: { }); generic-cl_dot_map = (build-asdf-system { pname = "generic-cl.map"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "generic-cl.map" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; + url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; + sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; system = "generic-cl.map"; asd = "generic-cl.map"; }); @@ -38361,11 +38841,11 @@ in lib.makeScope pkgs.newScope (self: { }); generic-cl_dot_math = (build-asdf-system { pname = "generic-cl.math"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "generic-cl.math" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; + url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; + sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; system = "generic-cl.math"; asd = "generic-cl.math"; }); @@ -38377,11 +38857,11 @@ in lib.makeScope pkgs.newScope (self: { }); generic-cl_dot_object = (build-asdf-system { pname = "generic-cl.object"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "generic-cl.object" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; + url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; + sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; system = "generic-cl.object"; asd = "generic-cl.object"; }); @@ -38393,11 +38873,11 @@ in lib.makeScope pkgs.newScope (self: { }); generic-cl_dot_sequence = (build-asdf-system { pname = "generic-cl.sequence"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "generic-cl.sequence" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; + url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; + sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; system = "generic-cl.sequence"; asd = "generic-cl.sequence"; }); @@ -38409,11 +38889,11 @@ in lib.makeScope pkgs.newScope (self: { }); generic-cl_dot_set = (build-asdf-system { pname = "generic-cl.set"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "generic-cl.set" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; + url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; + sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; system = "generic-cl.set"; asd = "generic-cl.set"; }); @@ -38425,11 +38905,11 @@ in lib.makeScope pkgs.newScope (self: { }); generic-cl_dot_util = (build-asdf-system { pname = "generic-cl.util"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "generic-cl.util" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; + url = "http://beta.quicklisp.org/archive/generic-cl/2024-10-12/generic-cl-20241012-git.tgz"; + sha256 = "14qlfzfd8gvvbhl766801g9258z1dirmszzp1wrf24wj9yf4m0f4"; system = "generic-cl.util"; asd = "generic-cl.util"; }); @@ -38871,11 +39351,11 @@ in lib.makeScope pkgs.newScope (self: { }); github-api-cl = (build-asdf-system { pname = "github-api-cl"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "github-api-cl" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/github-api-cl/2023-10-21/github-api-cl-20231021-git.tgz"; - sha256 = "1fxlgppkgg47pbv8mzz9dd1g8axmzixahq0dbglknr1hr8q1n150"; + url = "http://beta.quicklisp.org/archive/github-api-cl/2024-10-12/github-api-cl-20241012-git.tgz"; + sha256 = "04kvhap041v26axg4pzzymnibzh430yvja8c6dhic27g2639kswh"; system = "github-api-cl"; asd = "github-api-cl"; }); @@ -38887,11 +39367,11 @@ in lib.makeScope pkgs.newScope (self: { }); github-gist-api-cl = (build-asdf-system { pname = "github-gist-api-cl"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "github-gist-api-cl" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/github-api-cl/2023-10-21/github-api-cl-20231021-git.tgz"; - sha256 = "1fxlgppkgg47pbv8mzz9dd1g8axmzixahq0dbglknr1hr8q1n150"; + url = "http://beta.quicklisp.org/archive/github-api-cl/2024-10-12/github-api-cl-20241012-git.tgz"; + sha256 = "04kvhap041v26axg4pzzymnibzh430yvja8c6dhic27g2639kswh"; system = "github-gist-api-cl"; asd = "github-gist-api-cl"; }); @@ -39015,16 +39495,16 @@ in lib.makeScope pkgs.newScope (self: { }); glfw = (build-asdf-system { pname = "glfw"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "glfw" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/glfw/2023-10-21/glfw-20231021-git.tgz"; - sha256 = "04sblfcfjgfyfmgy0wrc4qdnxrw0bv020pisv7xvlshbal1rhgv2"; + url = "http://beta.quicklisp.org/archive/glfw/2024-10-12/glfw-20241012-git.tgz"; + sha256 = "1n421gvrzs76v57icy0c4zhz84ymin91vbv5gkkj4i00cnggwdxv"; system = "glfw"; asd = "glfw"; }); systems = [ "glfw" ]; - lispLibs = [ (getAttr "cffi" self) (getAttr "documentation-utils" self) (getAttr "float-features" self) ]; + lispLibs = [ (getAttr "cffi" self) (getAttr "cl-opengl" self) (getAttr "documentation-utils" self) (getAttr "float-features" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -39263,11 +39743,11 @@ in lib.makeScope pkgs.newScope (self: { }); glsl-toolkit = (build-asdf-system { pname = "glsl-toolkit"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "glsl-toolkit" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/glsl-toolkit/2023-10-21/glsl-toolkit-20231021-git.tgz"; - sha256 = "1mz99q4l4bjlcj56i291ai2ibjdjkag2v8zm9qawqbvfan8s2g0i"; + url = "http://beta.quicklisp.org/archive/glsl-toolkit/2024-10-12/glsl-toolkit-20241012-git.tgz"; + sha256 = "0yh6y2k2v5ivzwfnvnprlcih8jn7fv3pzz2wn85fpvbfw4mg120x"; system = "glsl-toolkit"; asd = "glsl-toolkit"; }); @@ -39325,6 +39805,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + golden-utils = (build-asdf-system { + pname = "golden-utils"; + version = "20241012-git"; + asds = [ "golden-utils" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/golden-utils/2024-10-12/golden-utils-20241012-git.tgz"; + sha256 = "09vq29wjr3x7h3fshwxg8h1psy4p73yl61cjljarpqjhsgz7lmbp"; + system = "golden-utils"; + asd = "golden-utils"; + }); + systems = [ "golden-utils" ]; + lispLibs = [ (getAttr "alexandria" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); gooptest = (build-asdf-system { pname = "gooptest"; version = "20200925-git"; @@ -39565,11 +40061,11 @@ in lib.makeScope pkgs.newScope (self: { }); gt = (build-asdf-system { pname = "gt"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "gt" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-utils/2023-10-21/cl-utils-20231021-git.tgz"; - sha256 = "14q97p3w1mplhaxy8dam26yvqwr60jp13isgsi4px077w8ny37qq"; + url = "http://beta.quicklisp.org/archive/cl-utils/2024-10-12/cl-utils-20241012-git.tgz"; + sha256 = "133alv8368k9pjkvh3vsfsk50whw7si4i2i7b8z256knpb2d35gh"; system = "gt"; asd = "gt"; }); @@ -39757,11 +40253,11 @@ in lib.makeScope pkgs.newScope (self: { }); hamcrest = (build-asdf-system { pname = "hamcrest"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "hamcrest" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-hamcrest/2023-02-14/cl-hamcrest-20230214-git.tgz"; - sha256 = "0m5czvkc9jpqd2ldxw6a2677iwdq4glvzw5ah2d114z7nm6i13sm"; + url = "http://beta.quicklisp.org/archive/cl-hamcrest/2024-10-12/cl-hamcrest-20241012-git.tgz"; + sha256 = "05l5i5cmm1yqg8x9ayffaf3a9xf742k02wkxwpkc125ih5x0ggws"; system = "hamcrest"; asd = "hamcrest"; }); @@ -39771,13 +40267,29 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + hamcrest-ci = (build-asdf-system { + pname = "hamcrest-ci"; + version = "20241012-git"; + asds = [ "hamcrest-ci" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-hamcrest/2024-10-12/cl-hamcrest-20241012-git.tgz"; + sha256 = "05l5i5cmm1yqg8x9ayffaf3a9xf742k02wkxwpkc125ih5x0ggws"; + system = "hamcrest-ci"; + asd = "hamcrest-ci"; + }); + systems = [ "hamcrest-ci" ]; + lispLibs = [ (getAttr "_40ants-ci" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); hamcrest-tests = (build-asdf-system { pname = "hamcrest-tests"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "hamcrest-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-hamcrest/2023-02-14/cl-hamcrest-20230214-git.tgz"; - sha256 = "0m5czvkc9jpqd2ldxw6a2677iwdq4glvzw5ah2d114z7nm6i13sm"; + url = "http://beta.quicklisp.org/archive/cl-hamcrest/2024-10-12/cl-hamcrest-20241012-git.tgz"; + sha256 = "05l5i5cmm1yqg8x9ayffaf3a9xf742k02wkxwpkc125ih5x0ggws"; system = "hamcrest-tests"; asd = "hamcrest-tests"; }); @@ -39789,11 +40301,11 @@ in lib.makeScope pkgs.newScope (self: { }); harmony = (build-asdf-system { pname = "harmony"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "harmony" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/harmony/2023-10-21/harmony-20231021-git.tgz"; - sha256 = "00ch1dn1zpkv8z06a2ymmv2r659lb9vjpkxzdvabxlzic5sxzrzi"; + url = "http://beta.quicklisp.org/archive/harmony/2024-10-12/harmony-20241012-git.tgz"; + sha256 = "0bzqwcbnpb529bdp35c4s3p4p6rsrjnsvll2bkkrwpxlwzdd3fim"; system = "harmony"; asd = "harmony"; }); @@ -39869,11 +40381,11 @@ in lib.makeScope pkgs.newScope (self: { }); hashtrie = (build-asdf-system { pname = "hashtrie"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "hashtrie" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/hashtrie/2023-02-14/hashtrie-20230214-git.tgz"; - sha256 = "0jhlqq1a5wzr7arkdrg75r4qp2hk3cbn1lcmz2lcl3g1153my9xx"; + url = "http://beta.quicklisp.org/archive/hashtrie/2024-10-12/hashtrie-20241012-git.tgz"; + sha256 = "1qn7azbl2p3hjvrb87bb06d3njsi5ksmdcv4mk80iadq06w0rn0n"; system = "hashtrie"; asd = "hashtrie"; }); @@ -39885,11 +40397,11 @@ in lib.makeScope pkgs.newScope (self: { }); hashtrie-tests = (build-asdf-system { pname = "hashtrie-tests"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "hashtrie-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/hashtrie/2023-02-14/hashtrie-20230214-git.tgz"; - sha256 = "0jhlqq1a5wzr7arkdrg75r4qp2hk3cbn1lcmz2lcl3g1153my9xx"; + url = "http://beta.quicklisp.org/archive/hashtrie/2024-10-12/hashtrie-20241012-git.tgz"; + sha256 = "1qn7azbl2p3hjvrb87bb06d3njsi5ksmdcv4mk80iadq06w0rn0n"; system = "hashtrie-tests"; asd = "hashtrie-tests"; }); @@ -39963,11 +40475,11 @@ in lib.makeScope pkgs.newScope (self: { }); helambdap = (build-asdf-system { pname = "helambdap"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "helambdap" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/helambdap/2023-10-21/helambdap-20231021-git.tgz"; - sha256 = "1kzapbf9l2bw8i9m9sxv0dfnkksrxq81d5hbn34pm25abk0i937j"; + url = "http://beta.quicklisp.org/archive/helambdap/2024-10-12/helambdap-20241012-git.tgz"; + sha256 = "0z7hnphjxfr5z5h9gp5940pbbh163w3nnis2fan2wrrh0l88scn3"; system = "helambdap"; asd = "helambdap"; }); @@ -39979,11 +40491,11 @@ in lib.makeScope pkgs.newScope (self: { }); hello-builder = (build-asdf-system { pname = "hello-builder"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "hello-builder" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clog/2023-10-21/clog-20231021-git.tgz"; - sha256 = "1hd59lwvhd8hfgh6nrgpsqrvwsh7jrpvi2rxaig67xr0zp476hak"; + url = "http://beta.quicklisp.org/archive/clog/2024-10-12/clog-20241012-git.tgz"; + sha256 = "0hqpj9ji7kfqgcxdfnc7x202qzmb7zdkmjwcyhdllqs6b0ssw5lx"; system = "hello-builder"; asd = "hello-builder"; }); @@ -39995,11 +40507,11 @@ in lib.makeScope pkgs.newScope (self: { }); hello-clog = (build-asdf-system { pname = "hello-clog"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "hello-clog" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clog/2023-10-21/clog-20231021-git.tgz"; - sha256 = "1hd59lwvhd8hfgh6nrgpsqrvwsh7jrpvi2rxaig67xr0zp476hak"; + url = "http://beta.quicklisp.org/archive/clog/2024-10-12/clog-20241012-git.tgz"; + sha256 = "0hqpj9ji7kfqgcxdfnc7x202qzmb7zdkmjwcyhdllqs6b0ssw5lx"; system = "hello-clog"; asd = "hello-clog"; }); @@ -40169,6 +40681,38 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + hiccl = (build-asdf-system { + pname = "hiccl"; + version = "20241012-git"; + asds = [ "hiccl" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/hiccl/2024-10-12/hiccl-20241012-git.tgz"; + sha256 = "0d92q8kb8xn6c9gsm822339f9qmpf9lpzy6s6abvxbhhyfk136yp"; + system = "hiccl"; + asd = "hiccl"; + }); + systems = [ "hiccl" ]; + lispLibs = [ (getAttr "serapeum" self) (getAttr "str" self) (getAttr "trivia" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + hiccl-test = (build-asdf-system { + pname = "hiccl-test"; + version = "20241012-git"; + asds = [ "hiccl-test" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/hiccl/2024-10-12/hiccl-20241012-git.tgz"; + sha256 = "0d92q8kb8xn6c9gsm822339f9qmpf9lpzy6s6abvxbhhyfk136yp"; + system = "hiccl-test"; + asd = "hiccl-test"; + }); + systems = [ "hiccl-test" ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "fiveam" self) (getAttr "hiccl" self) (getAttr "lquery" self) (getAttr "plump" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); hl7-client = (build-asdf-system { pname = "hl7-client"; version = "20150407-git"; @@ -40265,6 +40809,38 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + hsx = (build-asdf-system { + pname = "hsx"; + version = "20241012-git"; + asds = [ "hsx" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/hsx/2024-10-12/hsx-20241012-git.tgz"; + sha256 = "0aldv9cjzl9n4p1arlmvbjdy3zwhxcmx1ajp5lwdz5vq4mivw3zy"; + system = "hsx"; + asd = "hsx"; + }); + systems = [ "hsx" ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "str" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + hsx-test = (build-asdf-system { + pname = "hsx-test"; + version = "20241012-git"; + asds = [ "hsx-test" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/hsx/2024-10-12/hsx-20241012-git.tgz"; + sha256 = "0aldv9cjzl9n4p1arlmvbjdy3zwhxcmx1ajp5lwdz5vq4mivw3zy"; + system = "hsx-test"; + asd = "hsx-test"; + }); + systems = [ "hsx-test" ]; + lispLibs = [ (getAttr "mstrings" self) (getAttr "named-readtables" self) (getAttr "rove" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); ht-simple-ajax = (build-asdf-system { pname = "ht-simple-ajax"; version = "20130421-git"; @@ -40471,11 +41047,11 @@ in lib.makeScope pkgs.newScope (self: { }); http2 = (build-asdf-system { pname = "http2"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "http2" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/http2/2023-06-18/http2-20230618-git.tgz"; - sha256 = "15jzyjxfd6g1h752ffrjxyqwgqyhkp83hxkxx36w8m5q9nl1yhxz"; + url = "http://beta.quicklisp.org/archive/http2/2024-10-12/http2-20241012-git.tgz"; + sha256 = "1zb21np8rksz7b0vkfr3hg8y1a4m20vgkks3v39cc1yclnrfavii"; system = "http2"; asd = "http2"; }); @@ -41036,10 +41612,10 @@ in lib.makeScope pkgs.newScope (self: { }); hu_dot_dwim_dot_partial-eval = (build-asdf-system { pname = "hu.dwim.partial-eval"; - version = "20171130-darcs"; + version = "stable-git"; asds = [ "hu.dwim.partial-eval" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.partial-eval/2017-11-30/hu.dwim.partial-eval-20171130-darcs.tgz"; + url = "http://beta.quicklisp.org/archive/hu.dwim.partial-eval/2024-10-12/hu.dwim.partial-eval-stable-git.tgz"; sha256 = "1zsh1rk9rcxkrqavhx2slpczii23y51fn66n68vsw5d97g9k6gzz"; system = "hu.dwim.partial-eval"; asd = "hu.dwim.partial-eval"; @@ -41050,38 +41626,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - hu_dot_dwim_dot_partial-eval_dot_documentation = (build-asdf-system { - pname = "hu.dwim.partial-eval.documentation"; - version = "20171130-darcs"; - asds = [ "hu.dwim.partial-eval.documentation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.partial-eval/2017-11-30/hu.dwim.partial-eval-20171130-darcs.tgz"; - sha256 = "1zsh1rk9rcxkrqavhx2slpczii23y51fn66n68vsw5d97g9k6gzz"; - system = "hu.dwim.partial-eval.documentation"; - asd = "hu.dwim.partial-eval.documentation"; - }); - systems = [ "hu.dwim.partial-eval.documentation" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" self) (getAttr "hu_dot_dwim_dot_partial-eval_dot_test" self) (getAttr "hu_dot_dwim_dot_presentation" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - hu_dot_dwim_dot_partial-eval_dot_test = (build-asdf-system { - pname = "hu.dwim.partial-eval.test"; - version = "20171130-darcs"; - asds = [ "hu.dwim.partial-eval.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.partial-eval/2017-11-30/hu.dwim.partial-eval-20171130-darcs.tgz"; - sha256 = "1zsh1rk9rcxkrqavhx2slpczii23y51fn66n68vsw5d97g9k6gzz"; - system = "hu.dwim.partial-eval.test"; - asd = "hu.dwim.partial-eval.test"; - }); - systems = [ "hu.dwim.partial-eval.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" self) (getAttr "hu_dot_dwim_dot_partial-eval" self) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" self) (getAttr "hu_dot_dwim_dot_util" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); hu_dot_dwim_dot_perec = (build-asdf-system { pname = "hu.dwim.perec"; version = "20211209-darcs"; @@ -42213,11 +42757,11 @@ in lib.makeScope pkgs.newScope (self: { }); hunchentoot = (build-asdf-system { pname = "hunchentoot"; - version = "v1.3.0"; + version = "v1.3.1"; asds = [ "hunchentoot" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz"; - sha256 = "1z0m45lp6rv59g69l44gj3q3d2bmjlhqzpii0vgkniam21dcimy9"; + url = "http://beta.quicklisp.org/archive/hunchentoot/2024-10-12/hunchentoot-v1.3.1.tgz"; + sha256 = "0g4lh26l2vd10ilk1hrfmpj6hpjb986jp191ha2j6p2q1pil3kgc"; system = "hunchentoot"; asd = "hunchentoot"; }); @@ -42257,22 +42801,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - hunchentoot-dev = (build-asdf-system { - pname = "hunchentoot-dev"; - version = "v1.3.0"; - asds = [ "hunchentoot-dev" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz"; - sha256 = "1z0m45lp6rv59g69l44gj3q3d2bmjlhqzpii0vgkniam21dcimy9"; - system = "hunchentoot-dev"; - asd = "hunchentoot"; - }); - systems = [ "hunchentoot-dev" ]; - lispLibs = [ (getAttr "cxml-stp" self) (getAttr "hunchentoot" self) (getAttr "hunchentoot-test" self) (getAttr "swank" self) (getAttr "xpath" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); hunchentoot-errors = (build-asdf-system { pname = "hunchentoot-errors"; version = "20231021-git"; @@ -42321,18 +42849,18 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - hunchentoot-test = (build-asdf-system { - pname = "hunchentoot-test"; - version = "v1.3.0"; - asds = [ "hunchentoot-test" ]; + hunchentoot-stuck-connection-monitor = (build-asdf-system { + pname = "hunchentoot-stuck-connection-monitor"; + version = "20241012-git"; + asds = [ "hunchentoot-stuck-connection-monitor" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz"; - sha256 = "1z0m45lp6rv59g69l44gj3q3d2bmjlhqzpii0vgkniam21dcimy9"; - system = "hunchentoot-test"; - asd = "hunchentoot"; + url = "http://beta.quicklisp.org/archive/hunchentoot-stuck-connection-monitor/2024-10-12/hunchentoot-stuck-connection-monitor-20241012-git.tgz"; + sha256 = "1zbpxcym8pi9bf3m7f8f5aa2xhq048kx54sj1ka1vnz7rgccghc6"; + system = "hunchentoot-stuck-connection-monitor"; + asd = "hunchentoot-stuck-connection-monitor"; }); - systems = [ "hunchentoot-test" ]; - lispLibs = [ (getAttr "cl-ppcre" self) (getAttr "cl-who" self) (getAttr "drakma" self) (getAttr "hunchentoot" self) ]; + systems = [ "hunchentoot-stuck-connection-monitor" ]; + lispLibs = [ (getAttr "bordeaux-threads" self) (getAttr "hunchentoot" self) (getAttr "usocket" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -42655,11 +43183,11 @@ in lib.makeScope pkgs.newScope (self: { }); imago = (build-asdf-system { pname = "imago"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "imago" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/imago/2023-10-21/imago-20231021-git.tgz"; - sha256 = "0g4s3vrsg7rfn3hwh2lrfdz9k62w1flbrbibgnw64rvy618pkv41"; + url = "http://beta.quicklisp.org/archive/imago/2024-10-12/imago-20241012-git.tgz"; + sha256 = "1jhhlqbzdd68n8scl98dxfr92s1rgd43isgd317l3ynfjwz63wq1"; system = "imago"; asd = "imago"; }); @@ -42687,16 +43215,16 @@ in lib.makeScope pkgs.newScope (self: { }); in-nomine = (build-asdf-system { pname = "in-nomine"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "in-nomine" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/in-nomine/2023-06-18/in-nomine-20230618-git.tgz"; - sha256 = "1bs44mb9gd425w7d8d0f60khllq3jqb77fp3xms578if35cdv53p"; + url = "http://beta.quicklisp.org/archive/in-nomine/2024-10-12/in-nomine-20241012-git.tgz"; + sha256 = "1wcfxqj5dfmkg94rnz2nsmyw8iwicncxmklnirlngqqvlcrd0rv4"; system = "in-nomine"; asd = "in-nomine"; }); systems = [ "in-nomine" ]; - lispLibs = [ (getAttr "alexandria" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "trivial-arguments" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -42717,6 +43245,54 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + incless = (build-asdf-system { + pname = "incless"; + version = "20241012-git"; + asds = [ "incless" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/incless/2024-10-12/incless-20241012-git.tgz"; + sha256 = "1ypxhsx3fqwfng3b425bsgxbra7asny9261amdbfd6p59r51cyiy"; + system = "incless"; + asd = "incless"; + }); + systems = [ "incless" ]; + lispLibs = [ (getAttr "quaviver" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + incless-extrinsic = (build-asdf-system { + pname = "incless-extrinsic"; + version = "20241012-git"; + asds = [ "incless-extrinsic" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/incless/2024-10-12/incless-20241012-git.tgz"; + sha256 = "1ypxhsx3fqwfng3b425bsgxbra7asny9261amdbfd6p59r51cyiy"; + system = "incless-extrinsic"; + asd = "incless-extrinsic"; + }); + systems = [ "incless-extrinsic" ]; + lispLibs = [ (getAttr "incless" self) (getAttr "quaviver" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + incless-native = (build-asdf-system { + pname = "incless-native"; + version = "20241012-git"; + asds = [ "incless-native" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/incless/2024-10-12/incless-20241012-git.tgz"; + sha256 = "1ypxhsx3fqwfng3b425bsgxbra7asny9261amdbfd6p59r51cyiy"; + system = "incless-native"; + asd = "incless-native"; + }); + systems = [ "incless-native" ]; + lispLibs = [ (getAttr "incless" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); incognito-keywords = (build-asdf-system { pname = "incognito-keywords"; version = "1.1"; @@ -42751,11 +43327,11 @@ in lib.makeScope pkgs.newScope (self: { }); inferior-shell = (build-asdf-system { pname = "inferior-shell"; - version = "20200925-git"; + version = "20241012-git"; asds = [ "inferior-shell" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/inferior-shell/2020-09-25/inferior-shell-20200925-git.tgz"; - sha256 = "02qx37zzk5j4xmwh77k2qa2wvnzvaj6qml5dh2q7b6b1ljvgcj4m"; + url = "http://beta.quicklisp.org/archive/inferior-shell/2024-10-12/inferior-shell-20241012-git.tgz"; + sha256 = "1bmw0jjcpssahymqidz159pqbz5ficz56w7b97hfy1xnwkd2fwg5"; system = "inferior-shell"; asd = "inferior-shell"; }); @@ -43083,6 +43659,86 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + inravina = (build-asdf-system { + pname = "inravina"; + version = "20241012-git"; + asds = [ "inravina" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz"; + sha256 = "16kbxzsbb4vdhbf1dzgsgwj9n3cizk3sjixjgrfa8fal4nys7sa3"; + system = "inravina"; + asd = "inravina"; + }); + systems = [ "inravina" ]; + lispLibs = [ (getAttr "incless" self) (getAttr "nontrivial-gray-streams" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + inravina-examples = (build-asdf-system { + pname = "inravina-examples"; + version = "20241012-git"; + asds = [ "inravina-examples" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz"; + sha256 = "16kbxzsbb4vdhbf1dzgsgwj9n3cizk3sjixjgrfa8fal4nys7sa3"; + system = "inravina-examples"; + asd = "inravina-examples"; + }); + systems = [ "inravina-examples" ]; + lispLibs = [ (getAttr "cl-pdf" self) (getAttr "inravina-extrinsic" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + inravina-extrinsic = (build-asdf-system { + pname = "inravina-extrinsic"; + version = "20241012-git"; + asds = [ "inravina-extrinsic" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz"; + sha256 = "16kbxzsbb4vdhbf1dzgsgwj9n3cizk3sjixjgrfa8fal4nys7sa3"; + system = "inravina-extrinsic"; + asd = "inravina-extrinsic"; + }); + systems = [ "inravina-extrinsic" ]; + lispLibs = [ (getAttr "incless-extrinsic" self) (getAttr "inravina" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + inravina-native = (build-asdf-system { + pname = "inravina-native"; + version = "20241012-git"; + asds = [ "inravina-native" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz"; + sha256 = "16kbxzsbb4vdhbf1dzgsgwj9n3cizk3sjixjgrfa8fal4nys7sa3"; + system = "inravina-native"; + asd = "inravina-native"; + }); + systems = [ "inravina-native" ]; + lispLibs = [ (getAttr "inravina" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + inravina-shim = (build-asdf-system { + pname = "inravina-shim"; + version = "20241012-git"; + asds = [ "inravina-shim" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/inravina/2024-10-12/inravina-20241012-git.tgz"; + sha256 = "16kbxzsbb4vdhbf1dzgsgwj9n3cizk3sjixjgrfa8fal4nys7sa3"; + system = "inravina-shim"; + asd = "inravina-shim"; + }); + systems = [ "inravina-shim" ]; + lispLibs = [ (getAttr "incless-native" self) (getAttr "inravina" self) (getAttr "trivial-package-locks" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); instance-tracking = (build-asdf-system { pname = "instance-tracking"; version = "20221106-git"; @@ -43261,11 +43917,11 @@ in lib.makeScope pkgs.newScope (self: { }); introspect-environment = (build-asdf-system { pname = "introspect-environment"; - version = "20220220-git"; + version = "20241012-git"; asds = [ "introspect-environment" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/introspect-environment/2022-02-20/introspect-environment-20220220-git.tgz"; - sha256 = "1p48jnr1im47529w0ciyar4hfwbivqi57zgllkmfrav09ffigk9s"; + url = "http://beta.quicklisp.org/archive/introspect-environment/2024-10-12/introspect-environment-20241012-git.tgz"; + sha256 = "1jll8h1fmf9i8nk3j3hrh62s858fzmly22zb690a2hnb685w3zlf"; system = "introspect-environment"; asd = "introspect-environment"; }); @@ -43275,11 +43931,11 @@ in lib.makeScope pkgs.newScope (self: { }); introspect-environment-test = (build-asdf-system { pname = "introspect-environment-test"; - version = "20220220-git"; + version = "20241012-git"; asds = [ "introspect-environment-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/introspect-environment/2022-02-20/introspect-environment-20220220-git.tgz"; - sha256 = "1p48jnr1im47529w0ciyar4hfwbivqi57zgllkmfrav09ffigk9s"; + url = "http://beta.quicklisp.org/archive/introspect-environment/2024-10-12/introspect-environment-20241012-git.tgz"; + sha256 = "1jll8h1fmf9i8nk3j3hrh62s858fzmly22zb690a2hnb685w3zlf"; system = "introspect-environment-test"; asd = "introspect-environment-test"; }); @@ -43289,6 +43945,54 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + invistra = (build-asdf-system { + pname = "invistra"; + version = "20241012-git"; + asds = [ "invistra" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/invistra/2024-10-12/invistra-20241012-git.tgz"; + sha256 = "14ja35zqa85hjl9wxkwrff2wnlfflxi6lnkw0ic7jp7b59f80qas"; + system = "invistra"; + asd = "invistra"; + }); + systems = [ "invistra" ]; + lispLibs = [ (getAttr "acclimation" self) (getAttr "incless" self) (getAttr "inravina" self) (getAttr "nontrivial-gray-streams" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + invistra-extrinsic = (build-asdf-system { + pname = "invistra-extrinsic"; + version = "20241012-git"; + asds = [ "invistra-extrinsic" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/invistra/2024-10-12/invistra-20241012-git.tgz"; + sha256 = "14ja35zqa85hjl9wxkwrff2wnlfflxi6lnkw0ic7jp7b59f80qas"; + system = "invistra-extrinsic"; + asd = "invistra-extrinsic"; + }); + systems = [ "invistra-extrinsic" ]; + lispLibs = [ (getAttr "inravina-extrinsic" self) (getAttr "invistra" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + invistra-numeral = (build-asdf-system { + pname = "invistra-numeral"; + version = "20241012-git"; + asds = [ "invistra-numeral" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/invistra/2024-10-12/invistra-20241012-git.tgz"; + sha256 = "14ja35zqa85hjl9wxkwrff2wnlfflxi6lnkw0ic7jp7b59f80qas"; + system = "invistra-numeral"; + asd = "invistra-numeral"; + }); + systems = [ "invistra-numeral" ]; + lispLibs = [ (getAttr "invistra" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); iolib = (build-asdf-system { pname = "iolib"; version = "v0.8.4"; @@ -43425,11 +44129,11 @@ in lib.makeScope pkgs.newScope (self: { }); ironclad = (build-asdf-system { pname = "ironclad"; - version = "v0.59"; + version = "v0.61"; asds = [ "ironclad" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2023-10-21/ironclad-v0.59.tgz"; - sha256 = "02abwy59v9hfdl2ya4h6l2hc1xrnvqlxzg9vlk87wmi92azpa8v9"; + url = "http://beta.quicklisp.org/archive/ironclad/2024-10-12/ironclad-v0.61.tgz"; + sha256 = "1yszjy6a0q1jvdgd7fpmnvi9851s8ivp4plscw27lbnl7jlj1pmk"; system = "ironclad"; asd = "ironclad"; }); @@ -43439,11 +44143,11 @@ in lib.makeScope pkgs.newScope (self: { }); ironclad-text = (build-asdf-system { pname = "ironclad-text"; - version = "v0.59"; + version = "v0.61"; asds = [ "ironclad-text" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2023-10-21/ironclad-v0.59.tgz"; - sha256 = "02abwy59v9hfdl2ya4h6l2hc1xrnvqlxzg9vlk87wmi92azpa8v9"; + url = "http://beta.quicklisp.org/archive/ironclad/2024-10-12/ironclad-v0.61.tgz"; + sha256 = "1yszjy6a0q1jvdgd7fpmnvi9851s8ivp4plscw27lbnl7jlj1pmk"; system = "ironclad-text"; asd = "ironclad-text"; }); @@ -43899,11 +44603,11 @@ in lib.makeScope pkgs.newScope (self: { }); jose = (build-asdf-system { pname = "jose"; - version = "20220331-git"; + version = "20241012-git"; asds = [ "jose" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/jose/2022-03-31/jose-20220331-git.tgz"; - sha256 = "154n6jx2f5psgzwz6k5ia6zxdjynnnbyxalxfhmm11s3rx028461"; + url = "http://beta.quicklisp.org/archive/jose/2024-10-12/jose-20241012-git.tgz"; + sha256 = "1z7xjy4ihxa8ay5vznhnxkjflfx6xmfpgwxdakk9wmkw30p2yn4h"; system = "jose"; asd = "jose"; }); @@ -44055,11 +44759,11 @@ in lib.makeScope pkgs.newScope (self: { }); json-mop = (build-asdf-system { pname = "json-mop"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "json-mop" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/json-mop/2023-10-21/json-mop-20231021-git.tgz"; - sha256 = "0l8sv1lww1ik1lpvwd53xb32qsam7p2b4lh5wb9dijd30bn78vqq"; + url = "http://beta.quicklisp.org/archive/json-mop/2024-10-12/json-mop-20241012-git.tgz"; + sha256 = "1q6mmq64hf4v448bnzfh8nxsxg5h18a9snh785r1fnvv1aij3fi1"; system = "json-mop"; asd = "json-mop"; }); @@ -44071,11 +44775,11 @@ in lib.makeScope pkgs.newScope (self: { }); json-mop-tests = (build-asdf-system { pname = "json-mop-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "json-mop-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/json-mop/2023-10-21/json-mop-20231021-git.tgz"; - sha256 = "0l8sv1lww1ik1lpvwd53xb32qsam7p2b4lh5wb9dijd30bn78vqq"; + url = "http://beta.quicklisp.org/archive/json-mop/2024-10-12/json-mop-20241012-git.tgz"; + sha256 = "1q6mmq64hf4v448bnzfh8nxsxg5h18a9snh785r1fnvv1aij3fi1"; system = "json-mop-tests"; asd = "json-mop-tests"; }); @@ -44183,16 +44887,16 @@ in lib.makeScope pkgs.newScope (self: { }); jsonrpc = (build-asdf-system { pname = "jsonrpc"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "jsonrpc" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/jsonrpc/2023-10-21/jsonrpc-20231021-git.tgz"; - sha256 = "1w75mn8ydw5xk0xc9sv657ia7wjk4030gmqf3m1q12awj3bzfxqr"; + url = "http://beta.quicklisp.org/archive/jsonrpc/2024-10-12/jsonrpc-20241012-git.tgz"; + sha256 = "1wsc6bv8xpzad0lgrlldzrpb9r4aksnw7ss2ifwa7ykbzfxcr8gi"; system = "jsonrpc"; asd = "jsonrpc"; }); systems = [ "jsonrpc" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "chanl" self) (getAttr "dissect" self) (getAttr "event-emitter" self) (getAttr "usocket" self) (getAttr "vom" self) (getAttr "yason" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "chanl" self) (getAttr "dissect" self) (getAttr "trivial-timeout" self) (getAttr "usocket" self) (getAttr "vom" self) (getAttr "yason" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -44245,11 +44949,11 @@ in lib.makeScope pkgs.newScope (self: { }); jupyter-lab-extension = (build-asdf-system { pname = "jupyter-lab-extension"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "jupyter-lab-extension" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/common-lisp-jupyter/2023-10-21/common-lisp-jupyter-20231021-git.tgz"; - sha256 = "0fj3yallizxld8zsxvva4l5mbp1i4rm73r4balp3r8c6lkrapsrm"; + url = "http://beta.quicklisp.org/archive/common-lisp-jupyter/2024-10-12/common-lisp-jupyter-20241012-git.tgz"; + sha256 = "1qbrzv0myxfxq7rzm2y9cm2xymkl982982h2kbsl7d1yd5hrjvl6"; system = "jupyter-lab-extension"; asd = "jupyter-lab-extension"; }); @@ -44485,11 +45189,11 @@ in lib.makeScope pkgs.newScope (self: { }); khazern = (build-asdf-system { pname = "khazern"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "khazern" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/khazern/2023-10-21/khazern-20231021-git.tgz"; - sha256 = "1fn9sggwipard4d3fxfr9dlip1ww4i03djdflchl5dkafp8mgq77"; + url = "http://beta.quicklisp.org/archive/khazern/2024-10-12/khazern-20241012-git.tgz"; + sha256 = "1kc15gc0kahp8w9qfyb4yr1gnwqhk8dcvi5gm678bsnbqipaj30h"; system = "khazern"; asd = "khazern"; }); @@ -44501,11 +45205,11 @@ in lib.makeScope pkgs.newScope (self: { }); khazern-extrinsic = (build-asdf-system { pname = "khazern-extrinsic"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "khazern-extrinsic" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/khazern/2023-10-21/khazern-20231021-git.tgz"; - sha256 = "1fn9sggwipard4d3fxfr9dlip1ww4i03djdflchl5dkafp8mgq77"; + url = "http://beta.quicklisp.org/archive/khazern/2024-10-12/khazern-20241012-git.tgz"; + sha256 = "1kc15gc0kahp8w9qfyb4yr1gnwqhk8dcvi5gm678bsnbqipaj30h"; system = "khazern-extrinsic"; asd = "khazern-extrinsic"; }); @@ -44517,11 +45221,11 @@ in lib.makeScope pkgs.newScope (self: { }); khazern-intrinsic = (build-asdf-system { pname = "khazern-intrinsic"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "khazern-intrinsic" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/khazern/2023-10-21/khazern-20231021-git.tgz"; - sha256 = "1fn9sggwipard4d3fxfr9dlip1ww4i03djdflchl5dkafp8mgq77"; + url = "http://beta.quicklisp.org/archive/khazern/2024-10-12/khazern-20241012-git.tgz"; + sha256 = "1kc15gc0kahp8w9qfyb4yr1gnwqhk8dcvi5gm678bsnbqipaj30h"; system = "khazern-intrinsic"; asd = "khazern-intrinsic"; }); @@ -44533,11 +45237,11 @@ in lib.makeScope pkgs.newScope (self: { }); khazern-sequence = (build-asdf-system { pname = "khazern-sequence"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "khazern-sequence" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/khazern/2023-10-21/khazern-20231021-git.tgz"; - sha256 = "1fn9sggwipard4d3fxfr9dlip1ww4i03djdflchl5dkafp8mgq77"; + url = "http://beta.quicklisp.org/archive/khazern/2024-10-12/khazern-20241012-git.tgz"; + sha256 = "1kc15gc0kahp8w9qfyb4yr1gnwqhk8dcvi5gm678bsnbqipaj30h"; system = "khazern-sequence"; asd = "khazern-sequence"; }); @@ -44549,11 +45253,11 @@ in lib.makeScope pkgs.newScope (self: { }); khazern-sequence-extrinsic = (build-asdf-system { pname = "khazern-sequence-extrinsic"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "khazern-sequence-extrinsic" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/khazern/2023-10-21/khazern-20231021-git.tgz"; - sha256 = "1fn9sggwipard4d3fxfr9dlip1ww4i03djdflchl5dkafp8mgq77"; + url = "http://beta.quicklisp.org/archive/khazern/2024-10-12/khazern-20241012-git.tgz"; + sha256 = "1kc15gc0kahp8w9qfyb4yr1gnwqhk8dcvi5gm678bsnbqipaj30h"; system = "khazern-sequence-extrinsic"; asd = "khazern-sequence-extrinsic"; }); @@ -44565,11 +45269,11 @@ in lib.makeScope pkgs.newScope (self: { }); khazern-sequence-intrinsic = (build-asdf-system { pname = "khazern-sequence-intrinsic"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "khazern-sequence-intrinsic" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/khazern/2023-10-21/khazern-20231021-git.tgz"; - sha256 = "1fn9sggwipard4d3fxfr9dlip1ww4i03djdflchl5dkafp8mgq77"; + url = "http://beta.quicklisp.org/archive/khazern/2024-10-12/khazern-20241012-git.tgz"; + sha256 = "1kc15gc0kahp8w9qfyb4yr1gnwqhk8dcvi5gm678bsnbqipaj30h"; system = "khazern-sequence-intrinsic"; asd = "khazern-sequence-intrinsic"; }); @@ -44625,6 +45329,22 @@ in lib.makeScope pkgs.newScope (self: { lispLibs = [ ]; meta = {}; }); + knx-conn = (build-asdf-system { + pname = "knx-conn"; + version = "20241012-git"; + asds = [ "knx-conn" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/knx-conn/2024-10-12/knx-conn-20241012-git.tgz"; + sha256 = "1zq716fr1mq096hbpndfawyi1a7pr6gsyxnv2g1b00vpgyf37c4r"; + system = "knx-conn"; + asd = "knx-conn"; + }); + systems = [ "knx-conn" ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "babel" self) (getAttr "binding-arrows" self) (getAttr "local-time" self) (getAttr "log4cl" self) (getAttr "sento" self) (getAttr "usocket" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); l-math = (build-asdf-system { pname = "l-math"; version = "20190307-git"; @@ -44691,11 +45411,11 @@ in lib.makeScope pkgs.newScope (self: { }); lack = (build-asdf-system { pname = "lack"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lack" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; + url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; + sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; system = "lack"; asd = "lack"; }); @@ -44705,11 +45425,11 @@ in lib.makeScope pkgs.newScope (self: { }); lack-app-directory = (build-asdf-system { pname = "lack-app-directory"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lack-app-directory" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; + url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; + sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; system = "lack-app-directory"; asd = "lack-app-directory"; }); @@ -44721,11 +45441,11 @@ in lib.makeScope pkgs.newScope (self: { }); lack-app-file = (build-asdf-system { pname = "lack-app-file"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lack-app-file" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; + url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; + sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; system = "lack-app-file"; asd = "lack-app-file"; }); @@ -44737,11 +45457,11 @@ in lib.makeScope pkgs.newScope (self: { }); lack-component = (build-asdf-system { pname = "lack-component"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lack-component" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; + url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; + sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; system = "lack-component"; asd = "lack-component"; }); @@ -44751,11 +45471,11 @@ in lib.makeScope pkgs.newScope (self: { }); lack-middleware-accesslog = (build-asdf-system { pname = "lack-middleware-accesslog"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lack-middleware-accesslog" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; + url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; + sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; system = "lack-middleware-accesslog"; asd = "lack-middleware-accesslog"; }); @@ -44767,11 +45487,11 @@ in lib.makeScope pkgs.newScope (self: { }); lack-middleware-anypool = (build-asdf-system { pname = "lack-middleware-anypool"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lack-middleware-anypool" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/anypool/2023-10-21/anypool-20231021-git.tgz"; - sha256 = "07ha0x6qv1qw68iim3bcr5fk2pnxk0knk8lwyylbvm9rqjmd672i"; + url = "http://beta.quicklisp.org/archive/anypool/2024-10-12/anypool-20241012-git.tgz"; + sha256 = "1ffssc5fzh7gj0z94xxfb3mk5cwja65lrhxyfgib15a6yxqf1kk1"; system = "lack-middleware-anypool"; asd = "lack-middleware-anypool"; }); @@ -44783,11 +45503,11 @@ in lib.makeScope pkgs.newScope (self: { }); lack-middleware-auth-basic = (build-asdf-system { pname = "lack-middleware-auth-basic"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lack-middleware-auth-basic" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; + url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; + sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; system = "lack-middleware-auth-basic"; asd = "lack-middleware-auth-basic"; }); @@ -44799,11 +45519,11 @@ in lib.makeScope pkgs.newScope (self: { }); lack-middleware-backtrace = (build-asdf-system { pname = "lack-middleware-backtrace"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lack-middleware-backtrace" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; + url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; + sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; system = "lack-middleware-backtrace"; asd = "lack-middleware-backtrace"; }); @@ -44829,11 +45549,11 @@ in lib.makeScope pkgs.newScope (self: { }); lack-middleware-csrf = (build-asdf-system { pname = "lack-middleware-csrf"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lack-middleware-csrf" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; + url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; + sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; system = "lack-middleware-csrf"; asd = "lack-middleware-csrf"; }); @@ -44843,13 +45563,29 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + lack-middleware-dbpool = (build-asdf-system { + pname = "lack-middleware-dbpool"; + version = "20241012-git"; + asds = [ "lack-middleware-dbpool" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; + sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; + system = "lack-middleware-dbpool"; + asd = "lack-middleware-dbpool"; + }); + systems = [ "lack-middleware-dbpool" ]; + lispLibs = [ (getAttr "anypool" self) (getAttr "dbi" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); lack-middleware-mito = (build-asdf-system { pname = "lack-middleware-mito"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lack-middleware-mito" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mito/2023-10-21/mito-20231021-git.tgz"; - sha256 = "12wx1mb4aprvvh1qv41xrggpr7ffd943mxia0ppz0pkqc8zqrg4z"; + url = "http://beta.quicklisp.org/archive/mito/2024-10-12/mito-20241012-git.tgz"; + sha256 = "0nz72qss2jji0narxffpnpfgz74grvhmwqqlydpw6wv3ji1rrrq3"; system = "lack-middleware-mito"; asd = "lack-middleware-mito"; }); @@ -44861,11 +45597,11 @@ in lib.makeScope pkgs.newScope (self: { }); lack-middleware-mount = (build-asdf-system { pname = "lack-middleware-mount"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lack-middleware-mount" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; + url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; + sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; system = "lack-middleware-mount"; asd = "lack-middleware-mount"; }); @@ -44877,11 +45613,11 @@ in lib.makeScope pkgs.newScope (self: { }); lack-middleware-session = (build-asdf-system { pname = "lack-middleware-session"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lack-middleware-session" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; + url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; + sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; system = "lack-middleware-session"; asd = "lack-middleware-session"; }); @@ -44893,11 +45629,11 @@ in lib.makeScope pkgs.newScope (self: { }); lack-middleware-static = (build-asdf-system { pname = "lack-middleware-static"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lack-middleware-static" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; + url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; + sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; system = "lack-middleware-static"; asd = "lack-middleware-static"; }); @@ -44909,11 +45645,11 @@ in lib.makeScope pkgs.newScope (self: { }); lack-request = (build-asdf-system { pname = "lack-request"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lack-request" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; + url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; + sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; system = "lack-request"; asd = "lack-request"; }); @@ -44925,11 +45661,11 @@ in lib.makeScope pkgs.newScope (self: { }); lack-response = (build-asdf-system { pname = "lack-response"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lack-response" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; + url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; + sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; system = "lack-response"; asd = "lack-response"; }); @@ -44941,11 +45677,11 @@ in lib.makeScope pkgs.newScope (self: { }); lack-session-store-dbi = (build-asdf-system { pname = "lack-session-store-dbi"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lack-session-store-dbi" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; + url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; + sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; system = "lack-session-store-dbi"; asd = "lack-session-store-dbi"; }); @@ -44957,11 +45693,11 @@ in lib.makeScope pkgs.newScope (self: { }); lack-session-store-redis = (build-asdf-system { pname = "lack-session-store-redis"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lack-session-store-redis" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; + url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; + sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; system = "lack-session-store-redis"; asd = "lack-session-store-redis"; }); @@ -44973,11 +45709,11 @@ in lib.makeScope pkgs.newScope (self: { }); lack-test = (build-asdf-system { pname = "lack-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lack-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; + url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; + sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; system = "lack-test"; asd = "lack-test"; }); @@ -44989,25 +45725,25 @@ in lib.makeScope pkgs.newScope (self: { }); lack-util = (build-asdf-system { pname = "lack-util"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lack-util" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; + url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; + sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; system = "lack-util"; asd = "lack-util"; }); systems = [ "lack-util" ]; - lispLibs = [ (getAttr "cl-isaac" self) ]; + lispLibs = [ (getAttr "bordeaux-threads" self) (getAttr "cl-isaac" self) ]; meta = {}; }); lack-util-writer-stream = (build-asdf-system { pname = "lack-util-writer-stream"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lack-util-writer-stream" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; + url = "http://beta.quicklisp.org/archive/lack/2024-10-12/lack-20241012-git.tgz"; + sha256 = "0w1gw5sma9lajap0v2fvy7b5nysswrakmqvczhv48wp65i9lvcys"; system = "lack-util-writer-stream"; asd = "lack-util-writer-stream"; }); @@ -45177,11 +45913,11 @@ in lib.makeScope pkgs.newScope (self: { }); lass = (build-asdf-system { pname = "lass"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lass" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lass/2023-10-21/lass-20231021-git.tgz"; - sha256 = "1wax2kykc9ff0sk2linp9v8fcsm5ay6idpq365vivady9fh504r5"; + url = "http://beta.quicklisp.org/archive/lass/2024-10-12/lass-20241012-git.tgz"; + sha256 = "1b6a3v763i5fcdxczffd59kh4m73p4ilz6az85apd22apc8lr80z"; system = "lass"; asd = "lass"; }); @@ -45399,11 +46135,11 @@ in lib.makeScope pkgs.newScope (self: { }); lemmy-api = (build-asdf-system { pname = "lemmy-api"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lemmy-api" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lemmy-api/2023-10-21/lemmy-api-20231021-git.tgz"; - sha256 = "1m8qsxbb20k7x5sjqffjllm66qb5sjy4vj9ra167c7qrahz9cnrn"; + url = "http://beta.quicklisp.org/archive/lemmy-api/2024-10-12/lemmy-api-20241012-git.tgz"; + sha256 = "0krlf3zw4snpkgqb564xk82b1d0q2scqs05s1kalr773a5d801s7"; system = "lemmy-api"; asd = "lemmy-api"; }); @@ -45413,6 +46149,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + lemmy-api-bindings-generator = (build-asdf-system { + pname = "lemmy-api-bindings-generator"; + version = "20241012-git"; + asds = [ "lemmy-api-bindings-generator" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/lemmy-api/2024-10-12/lemmy-api-20241012-git.tgz"; + sha256 = "0krlf3zw4snpkgqb564xk82b1d0q2scqs05s1kalr773a5d801s7"; + system = "lemmy-api-bindings-generator"; + asd = "lemmy-api-bindings-generator"; + }); + systems = [ "lemmy-api-bindings-generator" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + }); lense = (build-asdf-system { pname = "lense"; version = "20201220-git"; @@ -45493,11 +46245,11 @@ in lib.makeScope pkgs.newScope (self: { }); letv = (build-asdf-system { pname = "letv"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "letv" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/letv/2023-06-18/letv-20230618-git.tgz"; - sha256 = "1xig71jlsvwa2p364gngpw9l0i5ljh34d1dc20wdc1qwsyp404f5"; + url = "http://beta.quicklisp.org/archive/letv/2024-10-12/letv-20241012-git.tgz"; + sha256 = "000alkhqb2n47y6849pswp7dg9pd0wwgswfrcm0sm4bz3r7dyjx1"; system = "letv"; asd = "letv"; }); @@ -45707,11 +46459,11 @@ in lib.makeScope pkgs.newScope (self: { }); lib-helper = (build-asdf-system { pname = "lib-helper"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lib-helper" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-lib-helper/2023-10-21/cl-lib-helper-20231021-git.tgz"; - sha256 = "0lrshlw8j0lgmzp0syq8i9a3mgn52lv0y56iihlp1nzfp250z23w"; + url = "http://beta.quicklisp.org/archive/cl-lib-helper/2024-10-12/cl-lib-helper-20241012-git.tgz"; + sha256 = "11aq60cs510kx9gj709q3kkgddk8aqb32pdzyikr9jylig050wyk"; system = "lib-helper"; asd = "lib-helper"; }); @@ -45723,11 +46475,11 @@ in lib.makeScope pkgs.newScope (self: { }); lib-helper-test-system = (build-asdf-system { pname = "lib-helper-test-system"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lib-helper-test-system" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-lib-helper/2023-10-21/cl-lib-helper-20231021-git.tgz"; - sha256 = "0lrshlw8j0lgmzp0syq8i9a3mgn52lv0y56iihlp1nzfp250z23w"; + url = "http://beta.quicklisp.org/archive/cl-lib-helper/2024-10-12/cl-lib-helper-20241012-git.tgz"; + sha256 = "11aq60cs510kx9gj709q3kkgddk8aqb32pdzyikr9jylig050wyk"; system = "lib-helper-test-system"; asd = "lib-helper-test-system"; }); @@ -45739,11 +46491,11 @@ in lib.makeScope pkgs.newScope (self: { }); libcmark = (build-asdf-system { pname = "libcmark"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "libcmark" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cmark/2023-02-14/cl-cmark-20230214-git.tgz"; - sha256 = "0d61z5y7pyv2y7sjbq3i5047z4jazkxnlqypr32yvyn5qdd78yfv"; + url = "http://beta.quicklisp.org/archive/cl-cmark/2024-10-12/cl-cmark-20241012-git.tgz"; + sha256 = "1l4i530161ppfz0wn1da7g7dwf644ppp1afrq2p7qfkajm7dcfg5"; system = "libcmark"; asd = "libcmark"; }); @@ -45835,11 +46587,11 @@ in lib.makeScope pkgs.newScope (self: { }); lichat-protocol = (build-asdf-system { pname = "lichat-protocol"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lichat-protocol" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lichat-protocol/2023-10-21/lichat-protocol-20231021-git.tgz"; - sha256 = "0imaa2x6hv93bwhn8j595xspkvjpp53kasdd47v24hzi7qn46m9l"; + url = "http://beta.quicklisp.org/archive/lichat-protocol/2024-10-12/lichat-protocol-20241012-git.tgz"; + sha256 = "0y8546aaf539jnl29r4a8sa975jak1ld4d62w2n1kp8s9nb80z11"; system = "lichat-protocol"; asd = "lichat-protocol"; }); @@ -45867,11 +46619,11 @@ in lib.makeScope pkgs.newScope (self: { }); lichat-tcp-client = (build-asdf-system { pname = "lichat-tcp-client"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lichat-tcp-client" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lichat-tcp-client/2023-10-21/lichat-tcp-client-20231021-git.tgz"; - sha256 = "1l03y6iyw1yrd3nq9281wzssfw09wy32f9k893kzdwd0yvklv0m0"; + url = "http://beta.quicklisp.org/archive/lichat-tcp-client/2024-10-12/lichat-tcp-client-20241012-git.tgz"; + sha256 = "1wwh396z7185nylrsz47b6l45hyfq6mjrm620fk5bsxr3jrzxs25"; system = "lichat-tcp-client"; asd = "lichat-tcp-client"; }); @@ -46041,11 +46793,11 @@ in lib.makeScope pkgs.newScope (self: { }); linear-programming = (build-asdf-system { pname = "linear-programming"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "linear-programming" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/linear-programming/2023-06-18/linear-programming-20230618-git.tgz"; - sha256 = "13q29wki7qappqrw1m3lfazvgqsyyscmnwd8y0lmjs9d877kh40m"; + url = "http://beta.quicklisp.org/archive/linear-programming/2024-10-12/linear-programming-20241012-git.tgz"; + sha256 = "01dy54ycmalqlk4wrkw1y6vixr0mk0nxmfy3p1w5kpdwp3642h9g"; system = "linear-programming"; asd = "linear-programming"; }); @@ -46073,11 +46825,11 @@ in lib.makeScope pkgs.newScope (self: { }); linear-programming-test = (build-asdf-system { pname = "linear-programming-test"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "linear-programming-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/linear-programming/2023-06-18/linear-programming-20230618-git.tgz"; - sha256 = "13q29wki7qappqrw1m3lfazvgqsyyscmnwd8y0lmjs9d877kh40m"; + url = "http://beta.quicklisp.org/archive/linear-programming/2024-10-12/linear-programming-20241012-git.tgz"; + sha256 = "01dy54ycmalqlk4wrkw1y6vixr0mk0nxmfy3p1w5kpdwp3642h9g"; system = "linear-programming-test"; asd = "linear-programming-test"; }); @@ -46185,11 +46937,11 @@ in lib.makeScope pkgs.newScope (self: { }); lisp-binary = (build-asdf-system { pname = "lisp-binary"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lisp-binary" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-binary/2023-10-21/lisp-binary-20231021-git.tgz"; - sha256 = "141hmgib601dpdvcg2pbfl39wvx7s3g97kzc37fkfs4rllylxpsg"; + url = "http://beta.quicklisp.org/archive/lisp-binary/2024-10-12/lisp-binary-20241012-git.tgz"; + sha256 = "1zgk6pbhjj4agazffv6mc3hjzyg4xh256sla83iqy5mwm172d810"; system = "lisp-binary"; asd = "lisp-binary"; }); @@ -46199,11 +46951,11 @@ in lib.makeScope pkgs.newScope (self: { }); lisp-binary-test = (build-asdf-system { pname = "lisp-binary-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lisp-binary-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-binary/2023-10-21/lisp-binary-20231021-git.tgz"; - sha256 = "141hmgib601dpdvcg2pbfl39wvx7s3g97kzc37fkfs4rllylxpsg"; + url = "http://beta.quicklisp.org/archive/lisp-binary/2024-10-12/lisp-binary-20241012-git.tgz"; + sha256 = "1zgk6pbhjj4agazffv6mc3hjzyg4xh256sla83iqy5mwm172d810"; system = "lisp-binary-test"; asd = "lisp-binary-test"; }); @@ -46215,11 +46967,11 @@ in lib.makeScope pkgs.newScope (self: { }); lisp-chat = (build-asdf-system { pname = "lisp-chat"; - version = "20210228-git"; + version = "20241012-git"; asds = [ "lisp-chat" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-chat/2021-02-28/lisp-chat-20210228-git.tgz"; - sha256 = "0gh78lb6m2790j5z64qij6v1s5yr501idbppg2ccyayl4f8bdpzi"; + url = "http://beta.quicklisp.org/archive/lisp-chat/2024-10-12/lisp-chat-20241012-git.tgz"; + sha256 = "16ckgxg0c3rx6qvwj5cn6rmfgxbj7587r9g342bw3nfxab0sqlzd"; system = "lisp-chat"; asd = "lisp-chat"; }); @@ -46231,11 +46983,11 @@ in lib.makeScope pkgs.newScope (self: { }); lisp-critic = (build-asdf-system { pname = "lisp-critic"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lisp-critic" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-critic/2023-10-21/lisp-critic-20231021-git.tgz"; - sha256 = "15zg05pqfs2dhc5j7gfkwjmxawaizjpyb0p7386mpl4w93l9h84l"; + url = "http://beta.quicklisp.org/archive/lisp-critic/2024-10-12/lisp-critic-20241012-git.tgz"; + sha256 = "19czs2m8h3kgwjd10pdk9r5kazbgly8g82a5q3bs7pqkja42i7x7"; system = "lisp-critic"; asd = "lisp-critic"; }); @@ -46357,11 +47109,11 @@ in lib.makeScope pkgs.newScope (self: { }); lisp-pay = (build-asdf-system { pname = "lisp-pay"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lisp-pay" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-pay/2023-10-21/lisp-pay-20231021-git.tgz"; - sha256 = "14d8jvl126vvg2sd5c35jq4kdrl2a9nfl2xh2qk5zslaqvsknwq8"; + url = "http://beta.quicklisp.org/archive/lisp-pay/2024-10-12/lisp-pay-20241012-git.tgz"; + sha256 = "1rbkzngas67ras5cf90y3dk99md05jmnjgsh45khj4b6kzw5a4v5"; system = "lisp-pay"; asd = "lisp-pay"; }); @@ -46405,11 +47157,11 @@ in lib.makeScope pkgs.newScope (self: { }); lisp-stat = (build-asdf-system { pname = "lisp-stat"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lisp-stat" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-stat/2023-10-21/lisp-stat-20231021-git.tgz"; - sha256 = "1frl5psjf5l078ml3092wj02r72k7hkx9sbv5cz9nq0i52bggqim"; + url = "http://beta.quicklisp.org/archive/lisp-stat/2024-10-12/lisp-stat-20241012-git.tgz"; + sha256 = "0igrrwlfvdqxdqwqij819zlkma6b815d10v3kzh1r6hp9fhn0r3p"; system = "lisp-stat"; asd = "lisp-stat"; }); @@ -47041,11 +47793,11 @@ in lib.makeScope pkgs.newScope (self: { }); lispcord = (build-asdf-system { pname = "lispcord"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "lispcord" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispcord/2023-06-18/lispcord-20230618-git.tgz"; - sha256 = "12v3n8gqry746f94wz7djhk3f3adzfnh8jga9c9lcsnwkgsrrc6a"; + url = "http://beta.quicklisp.org/archive/lispcord/2024-10-12/lispcord-20241012-git.tgz"; + sha256 = "11xwrrvvqdm1wdnxrxqgizgw25plsn28n2k0lm5kakax9n221brn"; system = "lispcord"; asd = "lispcord"; }); @@ -47103,22 +47855,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - listoflist = (build-asdf-system { - pname = "listoflist"; - version = "20140826-git"; - asds = [ "listoflist" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/listoflist/2014-08-26/listoflist-20140826-git.tgz"; - sha256 = "02bj2ldn7sfjbbn9zd66lwysymrv3f6g4q9hwsjbcg4fkpbk6qk3"; - system = "listoflist"; - asd = "listoflist"; - }); - systems = [ "listoflist" ]; - lispLibs = [ (getAttr "clunit" self) (getAttr "xarray" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); listopia = (build-asdf-system { pname = "listopia"; version = "20210411-git"; @@ -47249,11 +47985,11 @@ in lib.makeScope pkgs.newScope (self: { }); lla = (build-asdf-system { pname = "lla"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "lla" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lla/2023-06-18/lla-20230618-git.tgz"; - sha256 = "18k00q0q6634cjzz5mrn4vq1w7y4pwqkvn4vrnxjja3a9hmxmz22"; + url = "http://beta.quicklisp.org/archive/lla/2024-10-12/lla-20241012-git.tgz"; + sha256 = "19j11z8m00ry2bfn3ahai155b6qz995qqg7ipzvjdr05sj4gfb58"; system = "lla"; asd = "lla"; }); @@ -47359,11 +48095,11 @@ in lib.makeScope pkgs.newScope (self: { }); local-time = (build-asdf-system { pname = "local-time"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "local-time" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/local-time/2023-10-21/local-time-20231021-git.tgz"; - sha256 = "05h40dq8bqx7p7ri67c81fkfm4zzbichyicrdj4srs0vvlwxiqpj"; + url = "http://beta.quicklisp.org/archive/local-time/2024-10-12/local-time-20241012-git.tgz"; + sha256 = "0jb1mb5zs4ryiah8zjzhpln1z686mfmpmvg1phgpr2mh9vvlgjk2"; system = "local-time"; asd = "local-time"; }); @@ -47419,11 +48155,11 @@ in lib.makeScope pkgs.newScope (self: { }); log4cl-extras = (build-asdf-system { pname = "log4cl-extras"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "log4cl-extras" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/log4cl-extras/2023-06-18/log4cl-extras-20230618-git.tgz"; - sha256 = "0nhzsh9sm19kd6nwn8k4j8rkfpjnkfx3i30zqr2kvjs0h27ljpjy"; + url = "http://beta.quicklisp.org/archive/log4cl-extras/2024-10-12/log4cl-extras-20241012-git.tgz"; + sha256 = "17p8y884163j0gab0idra297kivzdgagl2im0gkmdhgrh0dw3b53"; system = "log4cl-extras"; asd = "log4cl-extras"; }); @@ -47435,11 +48171,11 @@ in lib.makeScope pkgs.newScope (self: { }); log4cl-extras-test = (build-asdf-system { pname = "log4cl-extras-test"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "log4cl-extras-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/log4cl-extras/2023-06-18/log4cl-extras-20230618-git.tgz"; - sha256 = "0nhzsh9sm19kd6nwn8k4j8rkfpjnkfx3i30zqr2kvjs0h27ljpjy"; + url = "http://beta.quicklisp.org/archive/log4cl-extras/2024-10-12/log4cl-extras-20241012-git.tgz"; + sha256 = "17p8y884163j0gab0idra297kivzdgagl2im0gkmdhgrh0dw3b53"; system = "log4cl-extras-test"; asd = "log4cl-extras-test"; }); @@ -47655,10 +48391,10 @@ in lib.makeScope pkgs.newScope (self: { }); lracer = (build-asdf-system { pname = "lracer"; - version = "20190710-git"; + version = "20241012-git"; asds = [ "lracer" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/racer/2019-07-10/racer-20190710-git.tgz"; + url = "http://beta.quicklisp.org/archive/racer/2024-10-12/racer-20241012-git.tgz"; sha256 = "120x046c6vcrj70vb6ryf04mwbr8c6a15llb68x7h1siij8vwgvk"; system = "lracer"; asd = "lracer"; @@ -47687,11 +48423,11 @@ in lib.makeScope pkgs.newScope (self: { }); lru-cache = (build-asdf-system { pname = "lru-cache"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lru-cache" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lru-cache/2023-10-21/lru-cache-20231021-git.tgz"; - sha256 = "1z53q2knbi93ipi6mpfhsjh0slg49g7prxh5sgl95xxbgck0xhm5"; + url = "http://beta.quicklisp.org/archive/lru-cache/2024-10-12/lru-cache-20241012-git.tgz"; + sha256 = "035pl11j1l129akgf33w5c0b8c6gxw1xpj54r0fzxz3dw7cs8pg1"; system = "lru-cache"; asd = "lru-cache"; }); @@ -47703,11 +48439,11 @@ in lib.makeScope pkgs.newScope (self: { }); lru-cache-test = (build-asdf-system { pname = "lru-cache-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "lru-cache-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/lru-cache/2023-10-21/lru-cache-20231021-git.tgz"; - sha256 = "1z53q2knbi93ipi6mpfhsjh0slg49g7prxh5sgl95xxbgck0xhm5"; + url = "http://beta.quicklisp.org/archive/lru-cache/2024-10-12/lru-cache-20241012-git.tgz"; + sha256 = "035pl11j1l129akgf33w5c0b8c6gxw1xpj54r0fzxz3dw7cs8pg1"; system = "lru-cache-test"; asd = "lru-cache-test"; }); @@ -47795,38 +48531,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - luckless = (build-asdf-system { - pname = "luckless"; - version = "20231021-git"; - asds = [ "luckless" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/luckless/2023-10-21/luckless-20231021-git.tgz"; - sha256 = "1l2lcm0xy664bpsvin7va03vi9kxfp874axhjq5pq4cfigmr4raj"; - system = "luckless"; - asd = "luckless"; - }); - systems = [ "luckless" ]; - lispLibs = [ (getAttr "atomics" self) (getAttr "documentation-utils" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - luckless-test = (build-asdf-system { - pname = "luckless-test"; - version = "20231021-git"; - asds = [ "luckless-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/luckless/2023-10-21/luckless-20231021-git.tgz"; - sha256 = "1l2lcm0xy664bpsvin7va03vi9kxfp874axhjq5pq4cfigmr4raj"; - system = "luckless-test"; - asd = "luckless-test"; - }); - systems = [ "luckless-test" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "luckless" self) (getAttr "parachute" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); lunamech-matrix-api = (build-asdf-system { pname = "lunamech-matrix-api"; version = "20230214-git"; @@ -47907,6 +48611,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + machine-state = (build-asdf-system { + pname = "machine-state"; + version = "20241012-git"; + asds = [ "machine-state" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/machine-state/2024-10-12/machine-state-20241012-git.tgz"; + sha256 = "1zmag6j9zfpnv9xfdjzb6dfg3jzvhandm1plyv50i619p0w0nagk"; + system = "machine-state"; + asd = "machine-state"; + }); + systems = [ "machine-state" ]; + lispLibs = [ (getAttr "bordeaux-threads" self) (getAttr "cffi" self) (getAttr "documentation-utils" self) (getAttr "pathname-utils" self) (getAttr "trivial-features" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); macro-html = (build-asdf-system { pname = "macro-html"; version = "20151218-git"; @@ -48053,16 +48773,16 @@ in lib.makeScope pkgs.newScope (self: { }); magicl = (build-asdf-system { pname = "magicl"; - version = "v0.9.1"; + version = "v0.11.0"; asds = [ "magicl" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/magicl/2021-04-11/magicl-v0.9.1.tgz"; - sha256 = "0x9p55qin399jhr5md88nij8fv78b64xjhww7ys364pkjnx8ak9v"; + url = "http://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz"; + sha256 = "10scw5qhrgjhfrlia5iqn2yy2zj1d57m45g479vg56lw849whscw"; system = "magicl"; asd = "magicl"; }); systems = [ "magicl" ]; - lispLibs = [ (getAttr "abstract-classes" self) (getAttr "alexandria" self) (getAttr "cffi" self) (getAttr "cffi-libffi" self) (getAttr "interface" self) (getAttr "policy-cond" self) ]; + lispLibs = [ (getAttr "abstract-classes" self) (getAttr "alexandria" self) (getAttr "cffi" self) (getAttr "cffi-libffi" self) (getAttr "interface" self) (getAttr "policy-cond" self) (getAttr "static-vectors" self) (getAttr "trivial-garbage" self) ]; meta = { broken = true; hydraPlatforms = [ ]; @@ -48070,11 +48790,11 @@ in lib.makeScope pkgs.newScope (self: { }); magicl-examples = (build-asdf-system { pname = "magicl-examples"; - version = "v0.9.1"; + version = "v0.11.0"; asds = [ "magicl-examples" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/magicl/2021-04-11/magicl-v0.9.1.tgz"; - sha256 = "0x9p55qin399jhr5md88nij8fv78b64xjhww7ys364pkjnx8ak9v"; + url = "http://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz"; + sha256 = "10scw5qhrgjhfrlia5iqn2yy2zj1d57m45g479vg56lw849whscw"; system = "magicl-examples"; asd = "magicl-examples"; }); @@ -48086,59 +48806,59 @@ in lib.makeScope pkgs.newScope (self: { }); magicl-gen = (build-asdf-system { pname = "magicl-gen"; - version = "v0.9.1"; + version = "v0.11.0"; asds = [ "magicl-gen" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/magicl/2021-04-11/magicl-v0.9.1.tgz"; - sha256 = "0x9p55qin399jhr5md88nij8fv78b64xjhww7ys364pkjnx8ak9v"; + url = "http://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz"; + sha256 = "10scw5qhrgjhfrlia5iqn2yy2zj1d57m45g479vg56lw849whscw"; system = "magicl-gen"; asd = "magicl-gen"; }); systems = [ "magicl-gen" ]; - lispLibs = [ (getAttr "abstract-classes" self) (getAttr "cffi" self) (getAttr "cffi-libffi" self) ]; + lispLibs = [ (getAttr "abstract-classes" self) (getAttr "alexandria" self) (getAttr "cffi" self) (getAttr "cffi-libffi" self) (getAttr "interface" self) (getAttr "policy-cond" self) (getAttr "static-vectors" self) (getAttr "trivial-garbage" self) ]; meta = { hydraPlatforms = [ ]; }; }); magicl-tests = (build-asdf-system { pname = "magicl-tests"; - version = "v0.9.1"; + version = "v0.11.0"; asds = [ "magicl-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/magicl/2021-04-11/magicl-v0.9.1.tgz"; - sha256 = "0x9p55qin399jhr5md88nij8fv78b64xjhww7ys364pkjnx8ak9v"; + url = "http://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz"; + sha256 = "10scw5qhrgjhfrlia5iqn2yy2zj1d57m45g479vg56lw849whscw"; system = "magicl-tests"; asd = "magicl-tests"; }); systems = [ "magicl-tests" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "fiasco" self) (getAttr "magicl" self) (getAttr "magicl-examples" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "fiasco" self) (getAttr "magicl" self) (getAttr "magicl-examples" self) (getAttr "trivial-garbage" self) ]; meta = { hydraPlatforms = [ ]; }; }); magicl-transcendental = (build-asdf-system { pname = "magicl-transcendental"; - version = "v0.9.1"; + version = "v0.11.0"; asds = [ "magicl-transcendental" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/magicl/2021-04-11/magicl-v0.9.1.tgz"; - sha256 = "0x9p55qin399jhr5md88nij8fv78b64xjhww7ys364pkjnx8ak9v"; + url = "http://beta.quicklisp.org/archive/magicl/2024-10-12/magicl-v0.11.0.tgz"; + sha256 = "10scw5qhrgjhfrlia5iqn2yy2zj1d57m45g479vg56lw849whscw"; system = "magicl-transcendental"; asd = "magicl-transcendental"; }); systems = [ "magicl-transcendental" ]; - lispLibs = [ (getAttr "abstract-classes" self) (getAttr "alexandria" self) (getAttr "cffi" self) (getAttr "cffi-libffi" self) (getAttr "interface" self) (getAttr "policy-cond" self) ]; + lispLibs = [ (getAttr "abstract-classes" self) (getAttr "alexandria" self) (getAttr "cffi" self) (getAttr "cffi-libffi" self) (getAttr "interface" self) (getAttr "policy-cond" self) (getAttr "static-vectors" self) (getAttr "trivial-garbage" self) ]; meta = { hydraPlatforms = [ ]; }; }); maiden = (build-asdf-system { pname = "maiden"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden"; asd = "maiden"; }); @@ -48150,11 +48870,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-accounts = (build-asdf-system { pname = "maiden-accounts"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-accounts" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-accounts"; asd = "maiden-accounts"; }); @@ -48166,11 +48886,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-activatable = (build-asdf-system { pname = "maiden-activatable"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-activatable" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-activatable"; asd = "maiden-activatable"; }); @@ -48182,11 +48902,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-api-access = (build-asdf-system { pname = "maiden-api-access"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-api-access" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-api-access"; asd = "maiden-api-access"; }); @@ -48198,11 +48918,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-blocker = (build-asdf-system { pname = "maiden-blocker"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-blocker" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-blocker"; asd = "maiden-blocker"; }); @@ -48214,11 +48934,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-channel-relay = (build-asdf-system { pname = "maiden-channel-relay"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-channel-relay" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-channel-relay"; asd = "maiden-channel-relay"; }); @@ -48230,11 +48950,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-chatlog = (build-asdf-system { pname = "maiden-chatlog"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-chatlog" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-chatlog"; asd = "maiden-chatlog"; }); @@ -48246,11 +48966,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-client-entities = (build-asdf-system { pname = "maiden-client-entities"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-client-entities" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-client-entities"; asd = "maiden-client-entities"; }); @@ -48262,11 +48982,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-commands = (build-asdf-system { pname = "maiden-commands"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-commands" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-commands"; asd = "maiden-commands"; }); @@ -48278,11 +48998,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-core-manager = (build-asdf-system { pname = "maiden-core-manager"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-core-manager" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-core-manager"; asd = "maiden-core-manager"; }); @@ -48294,11 +49014,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-counter = (build-asdf-system { pname = "maiden-counter"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-counter" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-counter"; asd = "maiden-counter"; }); @@ -48310,11 +49030,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-crimes = (build-asdf-system { pname = "maiden-crimes"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-crimes" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-crimes"; asd = "maiden-crimes"; }); @@ -48326,11 +49046,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-dictionary = (build-asdf-system { pname = "maiden-dictionary"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-dictionary" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-dictionary"; asd = "maiden-dictionary"; }); @@ -48342,11 +49062,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-emoticon = (build-asdf-system { pname = "maiden-emoticon"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-emoticon" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-emoticon"; asd = "maiden-emoticon"; }); @@ -48358,11 +49078,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-help = (build-asdf-system { pname = "maiden-help"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-help" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-help"; asd = "maiden-help"; }); @@ -48374,11 +49094,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-irc = (build-asdf-system { pname = "maiden-irc"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-irc" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-irc"; asd = "maiden-irc"; }); @@ -48390,11 +49110,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-lastfm = (build-asdf-system { pname = "maiden-lastfm"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-lastfm" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-lastfm"; asd = "maiden-lastfm"; }); @@ -48406,11 +49126,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-lichat = (build-asdf-system { pname = "maiden-lichat"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-lichat" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-lichat"; asd = "maiden-lichat"; }); @@ -48422,11 +49142,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-location = (build-asdf-system { pname = "maiden-location"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-location" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-location"; asd = "maiden-location"; }); @@ -48436,13 +49156,29 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + maiden-lookup = (build-asdf-system { + pname = "maiden-lookup"; + version = "20241012-git"; + asds = [ "maiden-lookup" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; + system = "maiden-lookup"; + asd = "maiden-lookup"; + }); + systems = [ "maiden-lookup" ]; + lispLibs = [ (getAttr "cl-ppcre" self) (getAttr "drakma" self) (getAttr "lquery" self) (getAttr "maiden-api-access" self) (getAttr "maiden-client-entities" self) (getAttr "maiden-commands" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); maiden-markov = (build-asdf-system { pname = "maiden-markov"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-markov" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-markov"; asd = "maiden-markov"; }); @@ -48454,11 +49190,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-medals = (build-asdf-system { pname = "maiden-medals"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-medals" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-medals"; asd = "maiden-medals"; }); @@ -48470,11 +49206,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-networking = (build-asdf-system { pname = "maiden-networking"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-networking" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-networking"; asd = "maiden-networking"; }); @@ -48486,11 +49222,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-notify = (build-asdf-system { pname = "maiden-notify"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-notify" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-notify"; asd = "maiden-notify"; }); @@ -48502,11 +49238,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-permissions = (build-asdf-system { pname = "maiden-permissions"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-permissions" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-permissions"; asd = "maiden-permissions"; }); @@ -48518,11 +49254,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-relay = (build-asdf-system { pname = "maiden-relay"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-relay" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-relay"; asd = "maiden-relay"; }); @@ -48534,11 +49270,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-serialize = (build-asdf-system { pname = "maiden-serialize"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-serialize" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-serialize"; asd = "maiden-serialize"; }); @@ -48550,11 +49286,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-silly = (build-asdf-system { pname = "maiden-silly"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-silly" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-silly"; asd = "maiden-silly"; }); @@ -48566,11 +49302,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-storage = (build-asdf-system { pname = "maiden-storage"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-storage" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-storage"; asd = "maiden-storage"; }); @@ -48582,11 +49318,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-talk = (build-asdf-system { pname = "maiden-talk"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-talk" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-talk"; asd = "maiden-talk"; }); @@ -48598,11 +49334,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-throttle = (build-asdf-system { pname = "maiden-throttle"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-throttle" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-throttle"; asd = "maiden-throttle"; }); @@ -48614,11 +49350,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-time = (build-asdf-system { pname = "maiden-time"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-time" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-time"; asd = "maiden-time"; }); @@ -48630,11 +49366,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-trivia = (build-asdf-system { pname = "maiden-trivia"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-trivia" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-trivia"; asd = "maiden-trivia"; }); @@ -48646,11 +49382,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-twitter = (build-asdf-system { pname = "maiden-twitter"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-twitter" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-twitter"; asd = "maiden-twitter"; }); @@ -48662,11 +49398,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-urlinfo = (build-asdf-system { pname = "maiden-urlinfo"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-urlinfo" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-urlinfo"; asd = "maiden-urlinfo"; }); @@ -48678,11 +49414,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-vote = (build-asdf-system { pname = "maiden-vote"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-vote" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-vote"; asd = "maiden-vote"; }); @@ -48694,11 +49430,11 @@ in lib.makeScope pkgs.newScope (self: { }); maiden-weather = (build-asdf-system { pname = "maiden-weather"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maiden-weather" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2023-10-21/maiden-20231021-git.tgz"; - sha256 = "0srqx84nnar7dqaijwz30alhshiynapka5m0qwxiczqwmps2vzza"; + url = "http://beta.quicklisp.org/archive/maiden/2024-10-12/maiden-20241012-git.tgz"; + sha256 = "09r11y5j6l72qmalgwvrnbvgx7gxfnlrwjb5sy83krk4cw7hx6fd"; system = "maiden-weather"; asd = "maiden-weather"; }); @@ -48710,11 +49446,11 @@ in lib.makeScope pkgs.newScope (self: { }); maidenhead = (build-asdf-system { pname = "maidenhead"; - version = "20220331-git"; + version = "20241012-git"; asds = [ "maidenhead" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/maidenhead/2022-03-31/maidenhead-20220331-git.tgz"; - sha256 = "0bkw31jibx4sh2086jgsw4rvaz3i1dmycbwp203rjj78x7wz9743"; + url = "http://beta.quicklisp.org/archive/maidenhead/2024-10-12/maidenhead-20241012-git.tgz"; + sha256 = "10pcx2ngyj6lkfbg1b58lzcm02xl1a3smnad5lvvw30pbalwcq46"; system = "maidenhead"; asd = "maidenhead"; }); @@ -48806,11 +49542,11 @@ in lib.makeScope pkgs.newScope (self: { }); manifolds = (build-asdf-system { pname = "manifolds"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "manifolds" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/manifolds/2023-10-21/manifolds-20231021-git.tgz"; - sha256 = "17jabz9y0545g3spnpfb0ws6nj4l6zgjslbaq64ic016kfv3l0ny"; + url = "http://beta.quicklisp.org/archive/manifolds/2024-10-12/manifolds-20241012-git.tgz"; + sha256 = "1q9hy2k1xabf8whnyxjiaqypbnbq84q94z1gmqgicxyzn7h3ybw4"; system = "manifolds"; asd = "manifolds"; }); @@ -48822,11 +49558,11 @@ in lib.makeScope pkgs.newScope (self: { }); manifolds-test = (build-asdf-system { pname = "manifolds-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "manifolds-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/manifolds/2023-10-21/manifolds-20231021-git.tgz"; - sha256 = "17jabz9y0545g3spnpfb0ws6nj4l6zgjslbaq64ic016kfv3l0ny"; + url = "http://beta.quicklisp.org/archive/manifolds/2024-10-12/manifolds-20241012-git.tgz"; + sha256 = "1q9hy2k1xabf8whnyxjiaqypbnbq84q94z1gmqgicxyzn7h3ybw4"; system = "manifolds-test"; asd = "manifolds-test"; }); @@ -48982,11 +49718,11 @@ in lib.makeScope pkgs.newScope (self: { }); marshal = (build-asdf-system { pname = "marshal"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "marshal" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-marshal/2023-10-21/cl-marshal-20231021-git.tgz"; - sha256 = "032f7mn0ijhd7xbzwacjbrm6hijmrl9mrpkq2qdyqdjzs2cgn8iy"; + url = "http://beta.quicklisp.org/archive/cl-marshal/2024-10-12/cl-marshal-20241012-git.tgz"; + sha256 = "081j2gfjdg05xzcq0jzqxjb874wkjdbxk9vah7hmlw9d767mzs5b"; system = "marshal"; asd = "marshal"; }); @@ -48996,11 +49732,11 @@ in lib.makeScope pkgs.newScope (self: { }); marshal-tests = (build-asdf-system { pname = "marshal-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "marshal-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-marshal/2023-10-21/cl-marshal-20231021-git.tgz"; - sha256 = "032f7mn0ijhd7xbzwacjbrm6hijmrl9mrpkq2qdyqdjzs2cgn8iy"; + url = "http://beta.quicklisp.org/archive/cl-marshal/2024-10-12/cl-marshal-20241012-git.tgz"; + sha256 = "081j2gfjdg05xzcq0jzqxjb874wkjdbxk9vah7hmlw9d767mzs5b"; system = "marshal-tests"; asd = "marshal-tests"; }); @@ -49012,16 +49748,16 @@ in lib.makeScope pkgs.newScope (self: { }); math = (build-asdf-system { pname = "math"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "math" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/math/2023-10-21/math-20231021-git.tgz"; - sha256 = "0b9w6k0w2grahyivpzg7ils7729pfl39pkc4njc797l1jwy6znyy"; + url = "http://beta.quicklisp.org/archive/math/2024-10-12/math-20241012-git.tgz"; + sha256 = "104rga7fqq3xvdxryhmgdq8zygd00zk5xb05glwqw01ygl3bc0r3"; system = "math"; asd = "math"; }); systems = [ "math" ]; - lispLibs = [ (getAttr "cl-utilities" self) (getAttr "font-discovery" self) (getAttr "gsll" self) (getAttr "vgplot" self) ]; + lispLibs = [ (getAttr "cl-utilities" self) (getAttr "closer-mop" self) (getAttr "font-discovery" self) (getAttr "gsll" self) (getAttr "vgplot" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -49092,11 +49828,11 @@ in lib.makeScope pkgs.newScope (self: { }); maxpc-apache = (build-asdf-system { pname = "maxpc-apache"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "maxpc-apache" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2023-10-21/april-20231021-git.tgz"; - sha256 = "19f1q7y09mpbs9vw53xnfpdgsvc6y5sqv29fm1jp0rhwb5rl7g34"; + url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; + sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; system = "maxpc-apache"; asd = "maxpc-apache"; }); @@ -49106,6 +49842,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + maxpc-apache-test = (build-asdf-system { + pname = "maxpc-apache-test"; + version = "20241012-git"; + asds = [ "maxpc-apache-test" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; + sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; + system = "maxpc-apache-test"; + asd = "maxpc-apache-test"; + }); + systems = [ "maxpc-apache-test" ]; + lispLibs = [ (getAttr "maxpc-apache" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); maxpc-test = (build-asdf-system { pname = "maxpc-test"; version = "20200427-git"; @@ -49172,11 +49924,11 @@ in lib.makeScope pkgs.newScope (self: { }); mcclim = (build-asdf-system { pname = "mcclim"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mcclim" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "mcclim"; asd = "mcclim"; }); @@ -49186,29 +49938,13 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - mcclim-backend-common = (build-asdf-system { - pname = "mcclim-backend-common"; - version = "20231021-git"; - asds = [ "mcclim-backend-common" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; - system = "mcclim-backend-common"; - asd = "mcclim-backend-common"; - }); - systems = [ "mcclim-backend-common" ]; - lispLibs = [ (getAttr "clim" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); mcclim-bezier = (build-asdf-system { pname = "mcclim-bezier"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mcclim-bezier" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "mcclim-bezier"; asd = "mcclim-bezier"; }); @@ -49220,11 +49956,11 @@ in lib.makeScope pkgs.newScope (self: { }); mcclim-bitmaps = (build-asdf-system { pname = "mcclim-bitmaps"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mcclim-bitmaps" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "mcclim-bitmaps"; asd = "mcclim-bitmaps"; }); @@ -49236,43 +49972,43 @@ in lib.makeScope pkgs.newScope (self: { }); mcclim-clx = (build-asdf-system { pname = "mcclim-clx"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mcclim-clx" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "mcclim-clx"; asd = "mcclim-clx"; }); systems = [ "mcclim-clx" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "babel" self) (getAttr "cl-aa" self) (getAttr "cl-dejavu" self) (getAttr "cl-paths-ttf" self) (getAttr "cl-unicode" self) (getAttr "cl-vectors" self) (getAttr "clim" self) (getAttr "clx" self) (getAttr "flexi-streams" self) (getAttr "mcclim-backend-common" self) (getAttr "trivial-garbage" self) (getAttr "zpb-ttf" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "babel" self) (getAttr "cl-aa" self) (getAttr "cl-dejavu" self) (getAttr "cl-paths-ttf" self) (getAttr "cl-unicode" self) (getAttr "cl-vectors" self) (getAttr "clim" self) (getAttr "clx" self) (getAttr "flexi-streams" self) (getAttr "trivial-garbage" self) (getAttr "zpb-ttf" self) ]; meta = { hydraPlatforms = [ ]; }; }); mcclim-clx-fb = (build-asdf-system { pname = "mcclim-clx-fb"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mcclim-clx-fb" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "mcclim-clx-fb"; asd = "mcclim-clx-fb"; }); systems = [ "mcclim-clx-fb" ]; - lispLibs = [ (getAttr "mcclim-backend-common" self) (getAttr "mcclim-clx" self) (getAttr "mcclim-render" self) ]; + lispLibs = [ (getAttr "mcclim-clx" self) (getAttr "mcclim-render" self) ]; meta = { hydraPlatforms = [ ]; }; }); mcclim-dot = (build-asdf-system { pname = "mcclim-dot"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mcclim-dot" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "mcclim-dot"; asd = "mcclim-dot"; }); @@ -49284,11 +50020,11 @@ in lib.makeScope pkgs.newScope (self: { }); mcclim-fontconfig = (build-asdf-system { pname = "mcclim-fontconfig"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mcclim-fontconfig" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "mcclim-fontconfig"; asd = "mcclim-fontconfig"; }); @@ -49300,11 +50036,11 @@ in lib.makeScope pkgs.newScope (self: { }); mcclim-fonts = (build-asdf-system { pname = "mcclim-fonts"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mcclim-fonts" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "mcclim-fonts"; asd = "mcclim-fonts"; }); @@ -49316,11 +50052,11 @@ in lib.makeScope pkgs.newScope (self: { }); mcclim-franz = (build-asdf-system { pname = "mcclim-franz"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mcclim-franz" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "mcclim-franz"; asd = "mcclim-franz"; }); @@ -49332,11 +50068,11 @@ in lib.makeScope pkgs.newScope (self: { }); mcclim-harfbuzz = (build-asdf-system { pname = "mcclim-harfbuzz"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mcclim-harfbuzz" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "mcclim-harfbuzz"; asd = "mcclim-harfbuzz"; }); @@ -49348,11 +50084,11 @@ in lib.makeScope pkgs.newScope (self: { }); mcclim-layouts = (build-asdf-system { pname = "mcclim-layouts"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mcclim-layouts" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "mcclim-layouts"; asd = "mcclim-layouts"; }); @@ -49364,11 +50100,11 @@ in lib.makeScope pkgs.newScope (self: { }); mcclim-null = (build-asdf-system { pname = "mcclim-null"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mcclim-null" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "mcclim-null"; asd = "mcclim-null"; }); @@ -49380,43 +50116,43 @@ in lib.makeScope pkgs.newScope (self: { }); mcclim-raster-image = (build-asdf-system { pname = "mcclim-raster-image"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mcclim-raster-image" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "mcclim-raster-image"; asd = "mcclim-raster-image"; }); systems = [ "mcclim-raster-image" ]; - lispLibs = [ (getAttr "clim" self) (getAttr "mcclim-backend-common" self) (getAttr "mcclim-render" self) ]; + lispLibs = [ (getAttr "clim" self) (getAttr "mcclim-render" self) ]; meta = { hydraPlatforms = [ ]; }; }); mcclim-render = (build-asdf-system { pname = "mcclim-render"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mcclim-render" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "mcclim-render"; asd = "mcclim-render"; }); systems = [ "mcclim-render" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-aa" self) (getAttr "cl-dejavu" self) (getAttr "cl-paths-ttf" self) (getAttr "cl-vectors" self) (getAttr "clim" self) (getAttr "flexi-streams" self) (getAttr "mcclim-backend-common" self) (getAttr "zpb-ttf" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-aa" self) (getAttr "cl-dejavu" self) (getAttr "cl-paths-ttf" self) (getAttr "cl-vectors" self) (getAttr "clim" self) (getAttr "flexi-streams" self) (getAttr "zpb-ttf" self) ]; meta = { hydraPlatforms = [ ]; }; }); mcclim-svg = (build-asdf-system { pname = "mcclim-svg"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mcclim-svg" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "mcclim-svg"; asd = "mcclim-svg"; }); @@ -49428,11 +50164,11 @@ in lib.makeScope pkgs.newScope (self: { }); mcclim-tooltips = (build-asdf-system { pname = "mcclim-tooltips"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mcclim-tooltips" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "mcclim-tooltips"; asd = "mcclim-tooltips"; }); @@ -49444,11 +50180,11 @@ in lib.makeScope pkgs.newScope (self: { }); mcclim-tree-with-cross-edges = (build-asdf-system { pname = "mcclim-tree-with-cross-edges"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mcclim-tree-with-cross-edges" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "mcclim-tree-with-cross-edges"; asd = "mcclim-tree-with-cross-edges"; }); @@ -49522,11 +50258,11 @@ in lib.makeScope pkgs.newScope (self: { }); memory-regions = (build-asdf-system { pname = "memory-regions"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "memory-regions" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/memory-regions/2023-10-21/memory-regions-20231021-git.tgz"; - sha256 = "1za57sink8gsd9flkw1csvjr4pipzscfcza2c3dm5bc9kmq9ij8p"; + url = "http://beta.quicklisp.org/archive/memory-regions/2024-10-12/memory-regions-20241012-git.tgz"; + sha256 = "0j2qfbh2kwl8k6v0h0pbh5hml8aia888kaq4kgb12nfslim81iyd"; system = "memory-regions"; asd = "memory-regions"; }); @@ -49554,11 +50290,11 @@ in lib.makeScope pkgs.newScope (self: { }); messagebox = (build-asdf-system { pname = "messagebox"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "messagebox" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/messagebox/2023-10-21/messagebox-20231021-git.tgz"; - sha256 = "1zzczzqhd6fqvj4rg352chcz9jxc099vgs37b4ba0qmph0a3bazf"; + url = "http://beta.quicklisp.org/archive/messagebox/2024-10-12/messagebox-20241012-git.tgz"; + sha256 = "0wf25rfx7vg0l1mnzjjzwjqcjaa96a95k9diijppn7y9v2knr1qq"; system = "messagebox"; asd = "messagebox"; }); @@ -49790,11 +50526,11 @@ in lib.makeScope pkgs.newScope (self: { }); method-combination-utilities = (build-asdf-system { pname = "method-combination-utilities"; - version = "20141106-git"; + version = "20241012-git"; asds = [ "method-combination-utilities" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/method-combination-utilities/2014-11-06/method-combination-utilities-20141106-git.tgz"; - sha256 = "1lgc515j87lbb48mjys0j6p8bxzifzjw5g8i825lsdmajmwj3vis"; + url = "http://beta.quicklisp.org/archive/method-combination-utilities/2024-10-12/method-combination-utilities-20241012-git.tgz"; + sha256 = "15wjzf6r9kkfw89rgzhrr60p5b4i15b90nr3wz6idkv3n4j7fsjl"; system = "method-combination-utilities"; asd = "method-combination-utilities"; }); @@ -49806,11 +50542,11 @@ in lib.makeScope pkgs.newScope (self: { }); method-combination-utilities_dot_tests = (build-asdf-system { pname = "method-combination-utilities.tests"; - version = "20141106-git"; + version = "20241012-git"; asds = [ "method-combination-utilities.tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/method-combination-utilities/2014-11-06/method-combination-utilities-20141106-git.tgz"; - sha256 = "1lgc515j87lbb48mjys0j6p8bxzifzjw5g8i825lsdmajmwj3vis"; + url = "http://beta.quicklisp.org/archive/method-combination-utilities/2024-10-12/method-combination-utilities-20241012-git.tgz"; + sha256 = "15wjzf6r9kkfw89rgzhrr60p5b4i15b90nr3wz6idkv3n4j7fsjl"; system = "method-combination-utilities.tests"; asd = "method-combination-utilities"; }); @@ -49978,11 +50714,11 @@ in lib.makeScope pkgs.newScope (self: { }); mgl-pax = (build-asdf-system { pname = "mgl-pax"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mgl-pax" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgl-pax/2023-10-21/mgl-pax-20231021-git.tgz"; - sha256 = "03if07sjx77x9sdva2sqh920lfj1gvkxbnsrnddk6q79kr2icjyg"; + url = "http://beta.quicklisp.org/archive/mgl-pax/2024-10-12/mgl-pax-20241012-git.tgz"; + sha256 = "17szk2ijccssa9n7zg8qh6hc706hahvzcrzlx716hmgq2hfwvvy0"; system = "mgl-pax"; asd = "mgl-pax"; }); @@ -49992,11 +50728,11 @@ in lib.makeScope pkgs.newScope (self: { }); mgl-pax-bootstrap = (build-asdf-system { pname = "mgl-pax-bootstrap"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mgl-pax-bootstrap" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgl-pax/2023-10-21/mgl-pax-20231021-git.tgz"; - sha256 = "03if07sjx77x9sdva2sqh920lfj1gvkxbnsrnddk6q79kr2icjyg"; + url = "http://beta.quicklisp.org/archive/mgl-pax/2024-10-12/mgl-pax-20241012-git.tgz"; + sha256 = "17szk2ijccssa9n7zg8qh6hc706hahvzcrzlx716hmgq2hfwvvy0"; system = "mgl-pax-bootstrap"; asd = "mgl-pax-bootstrap"; }); @@ -50008,11 +50744,11 @@ in lib.makeScope pkgs.newScope (self: { }); mgl-pax-test = (build-asdf-system { pname = "mgl-pax-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mgl-pax-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgl-pax/2023-10-21/mgl-pax-20231021-git.tgz"; - sha256 = "03if07sjx77x9sdva2sqh920lfj1gvkxbnsrnddk6q79kr2icjyg"; + url = "http://beta.quicklisp.org/archive/mgl-pax/2024-10-12/mgl-pax-20241012-git.tgz"; + sha256 = "17szk2ijccssa9n7zg8qh6hc706hahvzcrzlx716hmgq2hfwvvy0"; system = "mgl-pax-test"; asd = "mgl-pax-test"; }); @@ -50024,11 +50760,11 @@ in lib.makeScope pkgs.newScope (self: { }); mgl-pax_dot_asdf = (build-asdf-system { pname = "mgl-pax.asdf"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mgl-pax.asdf" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgl-pax/2023-10-21/mgl-pax-20231021-git.tgz"; - sha256 = "03if07sjx77x9sdva2sqh920lfj1gvkxbnsrnddk6q79kr2icjyg"; + url = "http://beta.quicklisp.org/archive/mgl-pax/2024-10-12/mgl-pax-20241012-git.tgz"; + sha256 = "17szk2ijccssa9n7zg8qh6hc706hahvzcrzlx716hmgq2hfwvvy0"; system = "mgl-pax.asdf"; asd = "mgl-pax.asdf"; }); @@ -50198,11 +50934,11 @@ in lib.makeScope pkgs.newScope (self: { }); misc-extensions = (build-asdf-system { pname = "misc-extensions"; - version = "20150608-git"; + version = "20241012-git"; asds = [ "misc-extensions" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz"; - sha256 = "0gz5f4p70qzilnxsnf5lih2n9m4wjcw8hlw4w8mpn9jyhyppyyv0"; + url = "http://beta.quicklisp.org/archive/misc-extensions/2024-10-12/misc-extensions-20241012-git.tgz"; + sha256 = "0pvgg376vkydp2831bnnvwrv27m4ivc78c0nhvb4848c3ik1hn5j"; system = "misc-extensions"; asd = "misc-extensions"; }); @@ -50212,16 +50948,16 @@ in lib.makeScope pkgs.newScope (self: { }); mito = (build-asdf-system { pname = "mito"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mito" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mito/2023-10-21/mito-20231021-git.tgz"; - sha256 = "12wx1mb4aprvvh1qv41xrggpr7ffd943mxia0ppz0pkqc8zqrg4z"; + url = "http://beta.quicklisp.org/archive/mito/2024-10-12/mito-20241012-git.tgz"; + sha256 = "0nz72qss2jji0narxffpnpfgz74grvhmwqqlydpw6wv3ji1rrrq3"; system = "mito"; asd = "mito"; }); systems = [ "mito" ]; - lispLibs = [ (getAttr "cl-reexport" self) (getAttr "lack-middleware-mito" self) (getAttr "mito-core" self) (getAttr "mito-migration" self) ]; + lispLibs = [ (getAttr "cl-package-locks" self) (getAttr "lack-middleware-mito" self) (getAttr "mito-core" self) (getAttr "mito-migration" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -50260,48 +50996,48 @@ in lib.makeScope pkgs.newScope (self: { }); mito-core = (build-asdf-system { pname = "mito-core"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mito-core" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mito/2023-10-21/mito-20231021-git.tgz"; - sha256 = "12wx1mb4aprvvh1qv41xrggpr7ffd943mxia0ppz0pkqc8zqrg4z"; + url = "http://beta.quicklisp.org/archive/mito/2024-10-12/mito-20241012-git.tgz"; + sha256 = "0nz72qss2jji0narxffpnpfgz74grvhmwqqlydpw6wv3ji1rrrq3"; system = "mito-core"; asd = "mito-core"; }); systems = [ "mito-core" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-ppcre" self) (getAttr "cl-reexport" self) (getAttr "closer-mop" self) (getAttr "dbi" self) (getAttr "dissect" self) (getAttr "local-time" self) (getAttr "sxql" self) (getAttr "trivia" self) (getAttr "uuid" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-ppcre" self) (getAttr "closer-mop" self) (getAttr "dbi" self) (getAttr "dissect" self) (getAttr "local-time" self) (getAttr "sxql" self) (getAttr "trivia" self) (getAttr "uuid" self) ]; meta = { hydraPlatforms = [ ]; }; }); mito-migration = (build-asdf-system { pname = "mito-migration"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mito-migration" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mito/2023-10-21/mito-20231021-git.tgz"; - sha256 = "12wx1mb4aprvvh1qv41xrggpr7ffd943mxia0ppz0pkqc8zqrg4z"; + url = "http://beta.quicklisp.org/archive/mito/2024-10-12/mito-20241012-git.tgz"; + sha256 = "0nz72qss2jji0narxffpnpfgz74grvhmwqqlydpw6wv3ji1rrrq3"; system = "mito-migration"; asd = "mito-migration"; }); systems = [ "mito-migration" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "chipz" self) (getAttr "cl-reexport" self) (getAttr "closer-mop" self) (getAttr "dbi" self) (getAttr "esrap" self) (getAttr "mito-core" self) (getAttr "sxql" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "chipz" self) (getAttr "closer-mop" self) (getAttr "dbi" self) (getAttr "esrap" self) (getAttr "mito-core" self) (getAttr "sxql" self) ]; meta = { hydraPlatforms = [ ]; }; }); mito-test = (build-asdf-system { pname = "mito-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mito-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mito/2023-10-21/mito-20231021-git.tgz"; - sha256 = "12wx1mb4aprvvh1qv41xrggpr7ffd943mxia0ppz0pkqc8zqrg4z"; + url = "http://beta.quicklisp.org/archive/mito/2024-10-12/mito-20241012-git.tgz"; + sha256 = "0nz72qss2jji0narxffpnpfgz74grvhmwqqlydpw6wv3ji1rrrq3"; system = "mito-test"; asd = "mito-test"; }); systems = [ "mito-test" ]; - lispLibs = [ (getAttr "mito" self) (getAttr "prove" self) (getAttr "prove-asdf" self) ]; + lispLibs = [ (getAttr "dbd-mysql" self) (getAttr "dbd-postgres" self) (getAttr "dbd-sqlite3" self) (getAttr "mito" self) (getAttr "rove" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -50372,11 +51108,11 @@ in lib.makeScope pkgs.newScope (self: { }); mk-defsystem = (build-asdf-system { pname = "mk-defsystem"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "mk-defsystem" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mk-defsystem/2023-02-14/mk-defsystem-20230214-git.tgz"; - sha256 = "0qrhfsyqij2kvbzwis6xa3861j37nymqdm23j92md73vbga895ma"; + url = "http://beta.quicklisp.org/archive/mk-defsystem/2024-10-12/mk-defsystem-20241012-git.tgz"; + sha256 = "0zrr11szr50bqaxybm66ggj5bmchwljjafhxcwsyzgpqbnf06740"; system = "mk-defsystem"; asd = "mk-defsystem"; }); @@ -50498,11 +51234,11 @@ in lib.makeScope pkgs.newScope (self: { }); mmap = (build-asdf-system { pname = "mmap"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mmap" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mmap/2023-10-21/mmap-20231021-git.tgz"; - sha256 = "0vn211wjhc50ycsq27dhx8b3lq23sv8cnd5ghj1kg7z0zwpiw5y9"; + url = "http://beta.quicklisp.org/archive/mmap/2024-10-12/mmap-20241012-git.tgz"; + sha256 = "1wlxymkkbjyyp6fikxi94q26pjfz656y4d8kgm22xxvw70hppgc3"; system = "mmap"; asd = "mmap"; }); @@ -50512,11 +51248,11 @@ in lib.makeScope pkgs.newScope (self: { }); mmap-test = (build-asdf-system { pname = "mmap-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mmap-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mmap/2023-10-21/mmap-20231021-git.tgz"; - sha256 = "0vn211wjhc50ycsq27dhx8b3lq23sv8cnd5ghj1kg7z0zwpiw5y9"; + url = "http://beta.quicklisp.org/archive/mmap/2024-10-12/mmap-20241012-git.tgz"; + sha256 = "1wlxymkkbjyyp6fikxi94q26pjfz656y4d8kgm22xxvw70hppgc3"; system = "mmap-test"; asd = "mmap-test"; }); @@ -50560,11 +51296,11 @@ in lib.makeScope pkgs.newScope (self: { }); mnas-package = (build-asdf-system { pname = "mnas-package"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "mnas-package" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-package/2023-06-18/mnas-package-20230618-git.tgz"; - sha256 = "17w9w1ql8d0hr5wh63r2fg5wnsl5s8xyhw8db8vx1pkpp2bq6775"; + url = "http://beta.quicklisp.org/archive/mnas-package/2024-10-12/mnas-package-20241012-git.tgz"; + sha256 = "05wkh2rzlp3csnk3p50rp3jv4jycdqa5hylqf93b2q8vjxvv67wm"; system = "mnas-package"; asd = "mnas-package"; }); @@ -50592,11 +51328,11 @@ in lib.makeScope pkgs.newScope (self: { }); mnas-string = (build-asdf-system { pname = "mnas-string"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mnas-string" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-string/2023-10-21/mnas-string-20231021-git.tgz"; - sha256 = "1c606jz1fpw39s0la56hbjcr9cdg2fxy9pdvz08mab2z1nd1533a"; + url = "http://beta.quicklisp.org/archive/mnas-string/2024-10-12/mnas-string-20241012-git.tgz"; + sha256 = "1pk0fyi3pjq7h9x40hixapsa06s0dah6xd4d63jpyhp7y6fa8w6f"; system = "mnas-string"; asd = "mnas-string"; }); @@ -50832,11 +51568,11 @@ in lib.makeScope pkgs.newScope (self: { }); moira = (build-asdf-system { pname = "moira"; - version = "20171130-git"; + version = "20241012-git"; asds = [ "moira" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/moira/2017-11-30/moira-20171130-git.tgz"; - sha256 = "0r6hvq8j04y1i85f8jwhhafylgfrkg8c1z5746nsbv0v0348sf5h"; + url = "http://beta.quicklisp.org/archive/moira/2024-10-12/moira-20241012-git.tgz"; + sha256 = "01wxjg122flla4pgys57hya3fwrkyjkpp26j5ypl5885zz1ip5b7"; system = "moira"; asd = "moira"; }); @@ -51084,11 +51820,11 @@ in lib.makeScope pkgs.newScope (self: { }); mssql = (build-asdf-system { pname = "mssql"; - version = "20210124-git"; + version = "20241012-git"; asds = [ "mssql" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mssql/2021-01-24/cl-mssql-20210124-git.tgz"; - sha256 = "09i50adppgc1ybm3ka9vbindhwa2x29f9n3n0jkrryymdhb8zknm"; + url = "http://beta.quicklisp.org/archive/cl-mssql/2024-10-12/cl-mssql-20241012-git.tgz"; + sha256 = "15hnlkx6d2vw46v7h01wljzag33j5is679amv74kzk4qq91wfkx2"; system = "mssql"; asd = "mssql"; }); @@ -51210,11 +51946,11 @@ in lib.makeScope pkgs.newScope (self: { }); multiposter = (build-asdf-system { pname = "multiposter"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "multiposter" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/multiposter/2023-10-21/multiposter-20231021-git.tgz"; - sha256 = "1pcj52sjd1cjplcg1b4pf7sdfl1vgqkm19j042fyww8gh61l77xa"; + url = "http://beta.quicklisp.org/archive/multiposter/2024-10-12/multiposter-20241012-git.tgz"; + sha256 = "1q1zinv4csnb0yjlndym5dlf7apax3f5qdiids3dlai09jb4hbjg"; system = "multiposter"; asd = "multiposter"; }); @@ -51274,11 +52010,11 @@ in lib.makeScope pkgs.newScope (self: { }); mutility = (build-asdf-system { pname = "mutility"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mutility" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mutility/2023-10-21/mutility-20231021-git.tgz"; - sha256 = "0mli8xb16vz8ki5d3a5c6n7s3zfsk3hzpcd8zmxn3q9w37iz3511"; + url = "http://beta.quicklisp.org/archive/mutility/2024-10-12/mutility-20241012-git.tgz"; + sha256 = "17ip4rkvval66k9r3a2hvpr4pqa087b3rqjdayl115fi6bfzncr4"; system = "mutility"; asd = "mutility"; }); @@ -51290,11 +52026,11 @@ in lib.makeScope pkgs.newScope (self: { }); mutils = (build-asdf-system { pname = "mutils"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "mutils" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mutils/2023-10-21/mutils-20231021-git.tgz"; - sha256 = "02c646rydaw2wslipdivs189yawdysrmkb2hl8yxb5iz7cy8c643"; + url = "http://beta.quicklisp.org/archive/mutils/2024-10-12/mutils-20241012-git.tgz"; + sha256 = "1xmqms002bafrdrpzgqq5dr0qfiywg3p7mhvb6xny1jrk3qdqz75"; system = "mutils"; asd = "mutils"; }); @@ -51512,6 +52248,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + myweb = (build-asdf-system { + pname = "myweb"; + version = "20241012-git"; + asds = [ "myweb" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/myweb/2024-10-12/myweb-20241012-git.tgz"; + sha256 = "10r67w3cgrq0r7qmqdnv4c3pjz7kkhz9q3jj0amlknr0nsr4y2zp"; + system = "myweb"; + asd = "myweb"; + }); + systems = [ "myweb" ]; + lispLibs = [ (getAttr "bordeaux-threads" self) (getAttr "cl-log" self) (getAttr "local-time" self) (getAttr "trivial-utf-8" self) (getAttr "usocket" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); nail = (build-asdf-system { pname = "nail"; version = "20230214-git"; @@ -51530,11 +52282,11 @@ in lib.makeScope pkgs.newScope (self: { }); named-closure = (build-asdf-system { pname = "named-closure"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "named-closure" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/named-closure/2023-06-18/named-closure-20230618-git.tgz"; - sha256 = "1alifwg0vw7fskrsq2b3fiiwlq6qjvmp8q30z2cwxy8ckhlchv96"; + url = "http://beta.quicklisp.org/archive/named-closure/2024-10-12/named-closure-20241012-git.tgz"; + sha256 = "1ja7lvid589n3r25vh7j21wji60dm2qika2jn51jvfbbii853x09"; system = "named-closure"; asd = "named-closure"; }); @@ -51718,11 +52470,11 @@ in lib.makeScope pkgs.newScope (self: { }); ndebug = (build-asdf-system { pname = "ndebug"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "ndebug" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ndebug/2023-02-14/ndebug-20230214-git.tgz"; - sha256 = "1rph1jqcyc7b08rllkwrldzqacf7px8zkr8gvx8qf8y51bnd5bms"; + url = "http://beta.quicklisp.org/archive/ndebug/2024-10-12/ndebug-20241012-git.tgz"; + sha256 = "168khn4190p55fjhbpnbq130lbaafq7cw0131x7n650d9f4h2hyq"; system = "ndebug"; asd = "ndebug"; }); @@ -51888,60 +52640,12 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - net_dot_didierverna_dot_declt = (build-asdf-system { - pname = "net.didierverna.declt"; - version = "4.0b2"; - asds = [ "net.didierverna.declt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/declt/2022-07-07/declt-4.0b2.tgz"; - sha256 = "1xkbf1xqrkmr8na09b0spmrznsx2ml10i9q026zv9mpbsc7gh0i6"; - system = "net.didierverna.declt"; - asd = "net.didierverna.declt"; - }); - systems = [ "net.didierverna.declt" ]; - lispLibs = [ (getAttr "net_dot_didierverna_dot_declt_dot_core" self) (getAttr "net_dot_didierverna_dot_declt_dot_setup" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - net_dot_didierverna_dot_declt_dot_assess = (build-asdf-system { - pname = "net.didierverna.declt.assess"; - version = "4.0b2"; - asds = [ "net.didierverna.declt.assess" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/declt/2022-07-07/declt-4.0b2.tgz"; - sha256 = "1xkbf1xqrkmr8na09b0spmrznsx2ml10i9q026zv9mpbsc7gh0i6"; - system = "net.didierverna.declt.assess"; - asd = "net.didierverna.declt.assess"; - }); - systems = [ "net.didierverna.declt.assess" ]; - lispLibs = [ (getAttr "net_dot_didierverna_dot_declt_dot_setup" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - net_dot_didierverna_dot_declt_dot_core = (build-asdf-system { - pname = "net.didierverna.declt.core"; - version = "4.0b2"; - asds = [ "net.didierverna.declt.core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/declt/2022-07-07/declt-4.0b2.tgz"; - sha256 = "1xkbf1xqrkmr8na09b0spmrznsx2ml10i9q026zv9mpbsc7gh0i6"; - system = "net.didierverna.declt.core"; - asd = "net.didierverna.declt.core"; - }); - systems = [ "net.didierverna.declt.core" ]; - lispLibs = [ (getAttr "net_dot_didierverna_dot_declt_dot_assess" self) (getAttr "net_dot_didierverna_dot_declt_dot_setup" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); net_dot_didierverna_dot_declt_dot_setup = (build-asdf-system { pname = "net.didierverna.declt.setup"; version = "4.0b2"; asds = [ "net.didierverna.declt.setup" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/declt/2022-07-07/declt-4.0b2.tgz"; + url = "http://beta.quicklisp.org/archive/declt/2024-10-12/declt-4.0b2.tgz"; sha256 = "1xkbf1xqrkmr8na09b0spmrznsx2ml10i9q026zv9mpbsc7gh0i6"; system = "net.didierverna.declt.setup"; asd = "net.didierverna.declt.setup"; @@ -52034,11 +52738,11 @@ in lib.makeScope pkgs.newScope (self: { }); net_dot_didierverna_dot_tfm = (build-asdf-system { pname = "net.didierverna.tfm"; - version = "20210411-git"; + version = "20241012-git"; asds = [ "net.didierverna.tfm" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfm/2021-04-11/tfm-20210411-git.tgz"; - sha256 = "1wwphg315zq9213vhi5l8fyrfyzasym3rwf34dxfc5cyhsf0wbi6"; + url = "http://beta.quicklisp.org/archive/tfm/2024-10-12/tfm-20241012-git.tgz"; + sha256 = "15lnp9w9z5ar64bynb365n4wqh8wa7z4m4dzy320xrxnnc1w2sn2"; system = "net.didierverna.tfm"; asd = "net.didierverna.tfm"; }); @@ -52050,11 +52754,11 @@ in lib.makeScope pkgs.newScope (self: { }); net_dot_didierverna_dot_tfm_dot_core = (build-asdf-system { pname = "net.didierverna.tfm.core"; - version = "20210411-git"; + version = "20241012-git"; asds = [ "net.didierverna.tfm.core" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfm/2021-04-11/tfm-20210411-git.tgz"; - sha256 = "1wwphg315zq9213vhi5l8fyrfyzasym3rwf34dxfc5cyhsf0wbi6"; + url = "http://beta.quicklisp.org/archive/tfm/2024-10-12/tfm-20241012-git.tgz"; + sha256 = "15lnp9w9z5ar64bynb365n4wqh8wa7z4m4dzy320xrxnnc1w2sn2"; system = "net.didierverna.tfm.core"; asd = "net.didierverna.tfm.core"; }); @@ -52066,11 +52770,11 @@ in lib.makeScope pkgs.newScope (self: { }); net_dot_didierverna_dot_tfm_dot_setup = (build-asdf-system { pname = "net.didierverna.tfm.setup"; - version = "20210411-git"; + version = "20241012-git"; asds = [ "net.didierverna.tfm.setup" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfm/2021-04-11/tfm-20210411-git.tgz"; - sha256 = "1wwphg315zq9213vhi5l8fyrfyzasym3rwf34dxfc5cyhsf0wbi6"; + url = "http://beta.quicklisp.org/archive/tfm/2024-10-12/tfm-20241012-git.tgz"; + sha256 = "15lnp9w9z5ar64bynb365n4wqh8wa7z4m4dzy320xrxnnc1w2sn2"; system = "net.didierverna.tfm.setup"; asd = "net.didierverna.tfm.setup"; }); @@ -52130,27 +52834,27 @@ in lib.makeScope pkgs.newScope (self: { }); neural-classifier = (build-asdf-system { pname = "neural-classifier"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "neural-classifier" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/neural-classifier/2022-11-06/neural-classifier-20221106-git.tgz"; - sha256 = "1d23q1k3i2kbjcrvp0qml2nmmdcr12lrmga3qdrgrvsbdcqarn3c"; + url = "http://beta.quicklisp.org/archive/neural-classifier/2024-10-12/neural-classifier-20241012-git.tgz"; + sha256 = "0aq7m781c27di7lfs1a7di55f31i7x490yfd2033738biqn0x019"; system = "neural-classifier"; asd = "neural-classifier"; }); systems = [ "neural-classifier" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "magicl" self) (getAttr "snakes" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "magicl" self) (getAttr "serapeum" self) (getAttr "snakes" self) ]; meta = { hydraPlatforms = [ ]; }; }); new-op = (build-asdf-system { pname = "new-op"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "new-op" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/new-op/2023-02-14/new-op-20230214-git.tgz"; - sha256 = "0i7ail2am8s632gxz8h5w9mad68c66jszclric5yg1ihj4619qgm"; + url = "http://beta.quicklisp.org/archive/new-op/2024-10-12/new-op-20241012-git.tgz"; + sha256 = "1jrnn4xbx5gc1202hqpinh0q1gm2wcv28jr8fl6g7wm6170nscxh"; system = "new-op"; asd = "new-op"; }); @@ -52162,11 +52866,11 @@ in lib.makeScope pkgs.newScope (self: { }); nibbles = (build-asdf-system { pname = "nibbles"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "nibbles" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/nibbles/2023-10-21/nibbles-20231021-git.tgz"; - sha256 = "12qjich11hp31dhbvbsixyjbddmr6faaajigrivgbxy9kw6d279j"; + url = "http://beta.quicklisp.org/archive/nibbles/2024-10-12/nibbles-20241012-git.tgz"; + sha256 = "00j464l3l1rx2x9gzx45gz7wcpplk1wmfh5liigzlxqq0ybjc7lr"; system = "nibbles"; asd = "nibbles"; }); @@ -52176,11 +52880,11 @@ in lib.makeScope pkgs.newScope (self: { }); nibbles-streams = (build-asdf-system { pname = "nibbles-streams"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "nibbles-streams" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/nibbles-streams/2023-06-18/nibbles-streams-20230618-git.tgz"; - sha256 = "05zwv0z4331ba1g48i6npas0rk88y705ww1574ivkfh870rr5yd4"; + url = "http://beta.quicklisp.org/archive/nibbles-streams/2024-10-12/nibbles-streams-20241012-git.tgz"; + sha256 = "1m1i9nivpahk11rzdwy3xxdcdwmkx3xzb4kqcz3gh3prwhyg83a1"; system = "nibbles-streams"; asd = "nibbles-streams"; }); @@ -52208,11 +52912,11 @@ in lib.makeScope pkgs.newScope (self: { }); ningle = (build-asdf-system { pname = "ningle"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "ningle" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ningle/2023-10-21/ningle-20231021-git.tgz"; - sha256 = "0rplv9c2lwk5k22p7axxkp24934kg79xlbfsvf2i0kc24wnd73b6"; + url = "http://beta.quicklisp.org/archive/ningle/2024-10-12/ningle-20241012-git.tgz"; + sha256 = "1ym6phipbg94q7344ng9yf02ykh0x5ldx8nfrbsh8p15qajsw7hc"; system = "ningle"; asd = "ningle"; }); @@ -52224,11 +52928,11 @@ in lib.makeScope pkgs.newScope (self: { }); ningle-test = (build-asdf-system { pname = "ningle-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "ningle-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ningle/2023-10-21/ningle-20231021-git.tgz"; - sha256 = "0rplv9c2lwk5k22p7axxkp24934kg79xlbfsvf2i0kc24wnd73b6"; + url = "http://beta.quicklisp.org/archive/ningle/2024-10-12/ningle-20241012-git.tgz"; + sha256 = "1ym6phipbg94q7344ng9yf02ykh0x5ldx8nfrbsh8p15qajsw7hc"; system = "ningle-test"; asd = "ningle-test"; }); @@ -52256,27 +52960,75 @@ in lib.makeScope pkgs.newScope (self: { }); nodgui = (build-asdf-system { pname = "nodgui"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "nodgui" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/nodgui/2023-10-21/nodgui-20231021-git.tgz"; - sha256 = "187yf73ipbkirf94mxfmmd4a0q4xdmqghc3skc92534gzdjlyya4"; + url = "http://beta.quicklisp.org/archive/nodgui/2024-10-12/nodgui-20241012-git.tgz"; + sha256 = "088dkpqsxc4dmfsbz24wrgi192xrn8116p4zpklwfqa0fblmfzpb"; system = "nodgui"; asd = "nodgui"; }); systems = [ "nodgui" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "cl-colors2" self) (getAttr "cl-jpeg" self) (getAttr "cl-ppcre-unicode" self) (getAttr "cl-unicode" self) (getAttr "clunit2" self) (getAttr "esrap" self) (getAttr "named-readtables" self) (getAttr "parse-number" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "cl-colors2" self) (getAttr "cl-opengl" self) (getAttr "cl-ppcre-unicode" self) (getAttr "cl-unicode" self) (getAttr "esrap" self) (getAttr "flexi-streams" self) (getAttr "jpeg-turbo" self) (getAttr "named-readtables" self) (getAttr "parse-number" self) (getAttr "pngload" self) (getAttr "sdl2" self) (getAttr "sdl2-ttf" self) (getAttr "static-vectors" self) (getAttr "trivial-garbage" self) (getAttr "zpng" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + nodgui-lite = (build-asdf-system { + pname = "nodgui-lite"; + version = "20241012-git"; + asds = [ "nodgui-lite" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/nodgui/2024-10-12/nodgui-20241012-git.tgz"; + sha256 = "088dkpqsxc4dmfsbz24wrgi192xrn8116p4zpklwfqa0fblmfzpb"; + system = "nodgui-lite"; + asd = "nodgui-lite"; + }); + systems = [ "nodgui-lite" ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "cl-colors2" self) (getAttr "cl-ppcre-unicode" self) (getAttr "cl-unicode" self) (getAttr "esrap" self) (getAttr "flexi-streams" self) (getAttr "named-readtables" self) (getAttr "parse-number" self) (getAttr "pngload" self) (getAttr "static-vectors" self) (getAttr "trivial-garbage" self) (getAttr "zpng" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + noisy = (build-asdf-system { + pname = "noisy"; + version = "20241012-git"; + asds = [ "noisy" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/noisy/2024-10-12/noisy-20241012-git.tgz"; + sha256 = "0qr29rxbrrlgd3k7hb6c62yzgflaygvxabq2sbhs90r0bi3cs0dj"; + system = "noisy"; + asd = "noisy"; + }); + systems = [ "noisy" ]; + lispLibs = [ (getAttr "random-state" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + nontrivial-gray-streams = (build-asdf-system { + pname = "nontrivial-gray-streams"; + version = "20241012-git"; + asds = [ "nontrivial-gray-streams" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/nontrivial-gray-streams/2024-10-12/nontrivial-gray-streams-20241012-git.tgz"; + sha256 = "0v49nqsc5jbrg499qhk550zg4v5arjh9nch33n5g4f5bfgw7lzh3"; + system = "nontrivial-gray-streams"; + asd = "nontrivial-gray-streams"; + }); + systems = [ "nontrivial-gray-streams" ]; + lispLibs = [ ]; meta = { hydraPlatforms = [ ]; }; }); north = (build-asdf-system { pname = "north"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "north" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/north/2023-10-21/north-20231021-git.tgz"; - sha256 = "00g9m0chigk6szx3i500xri3l70hwdvldky691r74fhhjh1646iv"; + url = "http://beta.quicklisp.org/archive/north/2024-10-12/north-20241012-git.tgz"; + sha256 = "0ml49xixdr1aagj580dr0dzx7dvdqrf45yyh3pzdzbp0pzqbpjz2"; system = "north"; asd = "north"; }); @@ -52288,11 +53040,11 @@ in lib.makeScope pkgs.newScope (self: { }); north-core = (build-asdf-system { pname = "north-core"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "north-core" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/north/2023-10-21/north-20231021-git.tgz"; - sha256 = "00g9m0chigk6szx3i500xri3l70hwdvldky691r74fhhjh1646iv"; + url = "http://beta.quicklisp.org/archive/north/2024-10-12/north-20241012-git.tgz"; + sha256 = "0ml49xixdr1aagj580dr0dzx7dvdqrf45yyh3pzdzbp0pzqbpjz2"; system = "north-core"; asd = "north-core"; }); @@ -52304,11 +53056,11 @@ in lib.makeScope pkgs.newScope (self: { }); north-dexador = (build-asdf-system { pname = "north-dexador"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "north-dexador" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/north/2023-10-21/north-20231021-git.tgz"; - sha256 = "00g9m0chigk6szx3i500xri3l70hwdvldky691r74fhhjh1646iv"; + url = "http://beta.quicklisp.org/archive/north/2024-10-12/north-20241012-git.tgz"; + sha256 = "0ml49xixdr1aagj580dr0dzx7dvdqrf45yyh3pzdzbp0pzqbpjz2"; system = "north-dexador"; asd = "north-dexador"; }); @@ -52320,11 +53072,11 @@ in lib.makeScope pkgs.newScope (self: { }); north-drakma = (build-asdf-system { pname = "north-drakma"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "north-drakma" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/north/2023-10-21/north-20231021-git.tgz"; - sha256 = "00g9m0chigk6szx3i500xri3l70hwdvldky691r74fhhjh1646iv"; + url = "http://beta.quicklisp.org/archive/north/2024-10-12/north-20241012-git.tgz"; + sha256 = "0ml49xixdr1aagj580dr0dzx7dvdqrf45yyh3pzdzbp0pzqbpjz2"; system = "north-drakma"; asd = "north-drakma"; }); @@ -52336,11 +53088,11 @@ in lib.makeScope pkgs.newScope (self: { }); north-example = (build-asdf-system { pname = "north-example"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "north-example" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/north/2023-10-21/north-20231021-git.tgz"; - sha256 = "00g9m0chigk6szx3i500xri3l70hwdvldky691r74fhhjh1646iv"; + url = "http://beta.quicklisp.org/archive/north/2024-10-12/north-20241012-git.tgz"; + sha256 = "0ml49xixdr1aagj580dr0dzx7dvdqrf45yyh3pzdzbp0pzqbpjz2"; system = "north-example"; asd = "north-example"; }); @@ -52592,11 +53344,11 @@ in lib.makeScope pkgs.newScope (self: { }); num-utils = (build-asdf-system { pname = "num-utils"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "num-utils" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/numerical-utilities/2023-10-21/numerical-utilities-20231021-git.tgz"; - sha256 = "1al1wxgpqanq5l51d6xwcbhqc2d8z1rfs7334r5z1468bd7yjw3g"; + url = "http://beta.quicklisp.org/archive/numerical-utilities/2024-10-12/numerical-utilities-20241012-git.tgz"; + sha256 = "00ck2bj4pqir2aan26xhirk41wzrfaziqmnngabhmwi0hz81bjs6"; system = "num-utils"; asd = "num-utils"; }); @@ -52704,11 +53456,11 @@ in lib.makeScope pkgs.newScope (self: { }); nytpu_dot_lisp-utils = (build-asdf-system { pname = "nytpu.lisp-utils"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "nytpu.lisp-utils" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/nytpu.lisp-utils/2023-10-21/nytpu.lisp-utils-20231021-git.tgz"; - sha256 = "001lv374c4lx7fw05mqjzjx15y8rl8p8xn58clghqq12vpsj3vb0"; + url = "http://beta.quicklisp.org/archive/nytpu.lisp-utils/2024-10-12/nytpu.lisp-utils-20241012-git.tgz"; + sha256 = "11mn2xf0nlaqmni0s22n4jbdy8rkqkin1sqni90drd8cs6mccmsd"; system = "nytpu.lisp-utils"; asd = "nytpu.lisp-utils"; }); @@ -52896,75 +53648,43 @@ in lib.makeScope pkgs.newScope (self: { }); omg = (build-asdf-system { pname = "omg"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "omg" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/omglib/2023-10-21/omglib-20231021-git.tgz"; - sha256 = "0vjncz3p5b3j76dwv8qimils6ybcs6lsx24kzl2h1cssf8m8zrxw"; + url = "http://beta.quicklisp.org/archive/omglib/2024-10-12/omglib-20241012-git.tgz"; + sha256 = "0jp68w3sw9z8gn3498lrmysf93f22a71hsr9c886wix5zpwgqpx7"; system = "omg"; asd = "omg"; }); systems = [ "omg" ]; - lispLibs = [ (getAttr "bordeaux-threads" self) (getAttr "cl-jpeg" self) (getAttr "clack" self) (getAttr "find-port" self) (getAttr "hunchentoot" self) (getAttr "inferior-shell" self) (getAttr "media-types" self) (getAttr "osicat" self) (getAttr "pngload" self) (getAttr "skippy" self) (getAttr "swank" self) (getAttr "trivial-utf-8" self) (getAttr "usocket" self) (getAttr "websocket-driver-server" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - one-more-re-nightmare = (build-asdf-system { - pname = "one-more-re-nightmare"; - version = "20231021-git"; - asds = [ "one-more-re-nightmare" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/one-more-re-nightmare/2023-10-21/one-more-re-nightmare-20231021-git.tgz"; - sha256 = "0mwgjgnp8dsf2zn0290px5q89z93zs0v4dhvs3rcir4mpiw8rbsn"; - system = "one-more-re-nightmare"; - asd = "one-more-re-nightmare"; - }); - systems = [ "one-more-re-nightmare" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "babel" self) (getAttr "bordeaux-threads" self) (getAttr "dynamic-mixins" self) (getAttr "esrap" self) (getAttr "stealth-mixin" self) (getAttr "trivia" self) (getAttr "trivial-indent" self) ]; + lispLibs = [ (getAttr "bordeaux-threads" self) (getAttr "cl-jpeg" self) (getAttr "cl-parallel" self) (getAttr "clack" self) (getAttr "hunchentoot" self) (getAttr "media-types" self) (getAttr "pngload" self) (getAttr "skippy" self) (getAttr "trivial-utf-8" self) (getAttr "websocket-driver-server" self) ]; meta = { hydraPlatforms = [ ]; }; }); - one-more-re-nightmare-simd = (build-asdf-system { - pname = "one-more-re-nightmare-simd"; - version = "20231021-git"; - asds = [ "one-more-re-nightmare-simd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/one-more-re-nightmare/2023-10-21/one-more-re-nightmare-20231021-git.tgz"; - sha256 = "0mwgjgnp8dsf2zn0290px5q89z93zs0v4dhvs3rcir4mpiw8rbsn"; - system = "one-more-re-nightmare-simd"; - asd = "one-more-re-nightmare-simd"; - }); - systems = [ "one-more-re-nightmare-simd" ]; - lispLibs = [ (getAttr "one-more-re-nightmare" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - one-more-re-nightmare-tests = (build-asdf-system { - pname = "one-more-re-nightmare-tests"; - version = "20231021-git"; - asds = [ "one-more-re-nightmare-tests" ]; + omgdaemon = (build-asdf-system { + pname = "omgdaemon"; + version = "20241012-git"; + asds = [ "omgdaemon" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/one-more-re-nightmare/2023-10-21/one-more-re-nightmare-20231021-git.tgz"; - sha256 = "0mwgjgnp8dsf2zn0290px5q89z93zs0v4dhvs3rcir4mpiw8rbsn"; - system = "one-more-re-nightmare-tests"; - asd = "one-more-re-nightmare-tests"; + url = "http://beta.quicklisp.org/archive/omglib/2024-10-12/omglib-20241012-git.tgz"; + sha256 = "0jp68w3sw9z8gn3498lrmysf93f22a71hsr9c886wix5zpwgqpx7"; + system = "omgdaemon"; + asd = "omgdaemon"; }); - systems = [ "one-more-re-nightmare-tests" ]; - lispLibs = [ (getAttr "lparallel" self) (getAttr "one-more-re-nightmare" self) (getAttr "parachute" self) ]; + systems = [ "omgdaemon" ]; + lispLibs = [ (getAttr "bordeaux-threads" self) (getAttr "cffi" self) (getAttr "find-port" self) (getAttr "inferior-shell" self) (getAttr "iolib" self) (getAttr "log4cl" self) (getAttr "omg" self) (getAttr "osicat" self) (getAttr "swank" self) (getAttr "trivial-dump-core" self) (getAttr "trivial-utf-8" self) ]; meta = { hydraPlatforms = [ ]; }; }); ook = (build-asdf-system { pname = "ook"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "ook" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ook/2023-02-14/ook-20230214-git.tgz"; - sha256 = "176ffzw1vr6rbn56lm9c6kg3p999apn4kb8z4889cn16v0rd6m29"; + url = "http://beta.quicklisp.org/archive/ook/2024-10-12/ook-20241012-git.tgz"; + sha256 = "0vh6g6a392z77yd4vgj3izajyai7pckr90ij1xns6cf9w505aq8w"; system = "ook"; asd = "ook"; }); @@ -53008,11 +53728,11 @@ in lib.makeScope pkgs.newScope (self: { }); open-location-code = (build-asdf-system { pname = "open-location-code"; - version = "20220331-git"; + version = "20241012-git"; asds = [ "open-location-code" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/open-location-code/2022-03-31/open-location-code-20220331-git.tgz"; - sha256 = "1ii8aj9kxxikgafsycy2ngrs9f2zdvmzrhggq7z5cgmi1h0fqg1z"; + url = "http://beta.quicklisp.org/archive/open-location-code/2024-10-12/open-location-code-20241012-git.tgz"; + sha256 = "17ip3xzqr2jk9br39d58grrjbk6gsh2mq1a9irjg9a5fig0jlyb2"; system = "open-location-code"; asd = "open-location-code"; }); @@ -53054,6 +53774,38 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + open-with = (build-asdf-system { + pname = "open-with"; + version = "20241012-git"; + asds = [ "open-with" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/open-with/2024-10-12/open-with-20241012-git.tgz"; + sha256 = "0bc0p8nigmfq4axx6qmlxdkm4sb0d2mdi1h7bwmnh0irvmrgdy33"; + system = "open-with"; + asd = "open-with"; + }); + systems = [ "open-with" ]; + lispLibs = [ (getAttr "documentation-utils" self) (getAttr "trivial-features" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + openai-openapi-client = (build-asdf-system { + pname = "openai-openapi-client"; + version = "20241012-git"; + asds = [ "openai-openapi-client" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/openai-openapi-client/2024-10-12/openai-openapi-client-20241012-git.tgz"; + sha256 = "0qyd9i0y75gf92kf8v22n6wmh63791115r7gmg9ca9pl0dgbpmg9"; + system = "openai-openapi-client"; + asd = "openai-openapi-client"; + }); + systems = [ "openai-openapi-client" ]; + lispLibs = [ (getAttr "com_dot_inuoe_dot_jzon" self) (getAttr "dexador" self) (getAttr "openapi-generator" self) (getAttr "quri" self) (getAttr "str" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); openal-blob = (build-asdf-system { pname = "openal-blob"; version = "stable-git"; @@ -53072,16 +53824,16 @@ in lib.makeScope pkgs.newScope (self: { }); openapi-generator = (build-asdf-system { pname = "openapi-generator"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "openapi-generator" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/openapi-generator/2023-10-21/openapi-generator-20231021-git.tgz"; - sha256 = "00kq91jmlq6086zrlx5bb3pkn2zxny9p5zkzp8bgjqas5k92p23j"; + url = "http://beta.quicklisp.org/archive/openapi-generator/2024-10-12/openapi-generator-20241012-git.tgz"; + sha256 = "0zc0y8frcnsqj76sqmqsgfv0zhdz5kkpynwan3sigc78fl1nrs3q"; system = "openapi-generator"; asd = "openapi-generator"; }); systems = [ "openapi-generator" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-hash-util" self) (getAttr "cl-json-pointer" self) (getAttr "cl-project" self) (getAttr "cl-semver" self) (getAttr "com_dot_inuoe_dot_jzon" self) (getAttr "dexador" self) (getAttr "json-mop" self) (getAttr "listopia" self) (getAttr "moptilities" self) (getAttr "parse-float" self) (getAttr "pathname-utils" self) (getAttr "quri" self) (getAttr "serapeum" self) (getAttr "str" self) (getAttr "yason" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-hash-util" self) (getAttr "cl-json-pointer" self) (getAttr "cl-project" self) (getAttr "cl-semver" self) (getAttr "cl-yaml" self) (getAttr "com_dot_inuoe_dot_jzon" self) (getAttr "dexador" self) (getAttr "json-mop" self) (getAttr "listopia" self) (getAttr "moptilities" self) (getAttr "parse-float" self) (getAttr "pathname-utils" self) (getAttr "quri" self) (getAttr "serapeum" self) (getAttr "str" self) (getAttr "yason" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -53150,6 +53902,102 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + openrpc-ci = (build-asdf-system { + pname = "openrpc-ci"; + version = "20241012-git"; + asds = [ "openrpc-ci" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/openrpc/2024-10-12/openrpc-20241012-git.tgz"; + sha256 = "1s3c5yzfdzvv9wdfjl6lmap7dv5wqz6ywnxl1sbahy1k2xm3fg1s"; + system = "openrpc-ci"; + asd = "openrpc-ci"; + }); + systems = [ "openrpc-ci" ]; + lispLibs = [ (getAttr "_40ants-asdf-system" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + openrpc-client = (build-asdf-system { + pname = "openrpc-client"; + version = "20241012-git"; + asds = [ "openrpc-client" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/openrpc/2024-10-12/openrpc-20241012-git.tgz"; + sha256 = "1s3c5yzfdzvv9wdfjl6lmap7dv5wqz6ywnxl1sbahy1k2xm3fg1s"; + system = "openrpc-client"; + asd = "openrpc-client"; + }); + systems = [ "openrpc-client" ]; + lispLibs = [ (getAttr "_40ants-asdf-system" self) (getAttr "alexandria" self) (getAttr "closer-mop" self) (getAttr "dexador" self) (getAttr "jsonrpc" self) (getAttr "kebab" self) (getAttr "log4cl" self) (getAttr "serapeum" self) (getAttr "str" self) (getAttr "usocket" self) (getAttr "yason" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + openrpc-deps = (build-asdf-system { + pname = "openrpc-deps"; + version = "20241012-git"; + asds = [ "openrpc-deps" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/openrpc/2024-10-12/openrpc-20241012-git.tgz"; + sha256 = "1s3c5yzfdzvv9wdfjl6lmap7dv5wqz6ywnxl1sbahy1k2xm3fg1s"; + system = "openrpc-deps"; + asd = "openrpc-deps"; + }); + systems = [ "openrpc-deps" ]; + lispLibs = [ (getAttr "jsonrpc" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + openrpc-docs = (build-asdf-system { + pname = "openrpc-docs"; + version = "20241012-git"; + asds = [ "openrpc-docs" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/openrpc/2024-10-12/openrpc-20241012-git.tgz"; + sha256 = "1s3c5yzfdzvv9wdfjl6lmap7dv5wqz6ywnxl1sbahy1k2xm3fg1s"; + system = "openrpc-docs"; + asd = "openrpc-docs"; + }); + systems = [ "openrpc-docs" ]; + lispLibs = [ (getAttr "_40ants-asdf-system" self) (getAttr "_40ants-doc" self) (getAttr "docs-config" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + openrpc-example = (build-asdf-system { + pname = "openrpc-example"; + version = "20241012-git"; + asds = [ "openrpc-example" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/openrpc/2024-10-12/openrpc-20241012-git.tgz"; + sha256 = "1s3c5yzfdzvv9wdfjl6lmap7dv5wqz6ywnxl1sbahy1k2xm3fg1s"; + system = "openrpc-example"; + asd = "openrpc-example"; + }); + systems = [ "openrpc-example" ]; + lispLibs = [ (getAttr "_40ants-asdf-system" self) (getAttr "alexandria" self) (getAttr "clack" self) (getAttr "clack-handler-hunchentoot" self) (getAttr "jsonrpc" self) (getAttr "openrpc-client" self) (getAttr "openrpc-server" self) (getAttr "serapeum" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + openrpc-server = (build-asdf-system { + pname = "openrpc-server"; + version = "20241012-git"; + asds = [ "openrpc-server" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/openrpc/2024-10-12/openrpc-20241012-git.tgz"; + sha256 = "1s3c5yzfdzvv9wdfjl6lmap7dv5wqz6ywnxl1sbahy1k2xm3fg1s"; + system = "openrpc-server"; + asd = "openrpc-server"; + }); + systems = [ "openrpc-server" ]; + lispLibs = [ (getAttr "_40ants-asdf-system" self) (getAttr "alexandria" self) (getAttr "clack-cors" self) (getAttr "clack-prometheus" self) (getAttr "closer-mop" self) (getAttr "jsonrpc" self) (getAttr "lack-request" self) (getAttr "lambda-fiddle" self) (getAttr "local-time" self) (getAttr "log4cl" self) (getAttr "log4cl-extras" self) (getAttr "serapeum" self) (getAttr "str" self) (getAttr "websocket-driver" self) (getAttr "yason" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); ops-test = (build-asdf-system { pname = "ops-test"; version = "20211020-git"; @@ -53406,11 +54254,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_melusina_dot_atelier = (build-asdf-system { pname = "org.melusina.atelier"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.melusina.atelier" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-atelier/2023-10-21/cl-atelier-20231021-git.tgz"; - sha256 = "0j5m9c3z9xcw6ww3fmqpz897fa7mcih6nl9vy36ggnv1iin6x90g"; + url = "http://beta.quicklisp.org/archive/cl-atelier/2024-10-12/cl-atelier-20241012-git.tgz"; + sha256 = "0n8v4f7xq1szxhipmkvg4x5s41vqllcq6hxzcd7r0rbxi9i57pqz"; system = "org.melusina.atelier"; asd = "org.melusina.atelier"; }); @@ -53422,11 +54270,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_melusina_dot_confidence = (build-asdf-system { pname = "org.melusina.confidence"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.melusina.confidence" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-confidence/2023-10-21/cl-confidence-20231021-git.tgz"; - sha256 = "0i474vyx16whv1jl75d026rhmfpf4xd243pw4vkjln7s85h2z6l3"; + url = "http://beta.quicklisp.org/archive/cl-confidence/2024-10-12/cl-confidence-20241012-git.tgz"; + sha256 = "1azvv54zchw88gpzh4dkflz6y0pvf7wq433yc7m90fs3c70wmsjl"; system = "org.melusina.confidence"; asd = "org.melusina.confidence"; }); @@ -53438,11 +54286,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_melusina_dot_rashell = (build-asdf-system { pname = "org.melusina.rashell"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.melusina.rashell" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rashell/2023-10-21/cl-rashell-20231021-git.tgz"; - sha256 = "0816i17rh56kvj5xma509pq2c1si62ki930nsg2c7asv3yx7724g"; + url = "http://beta.quicklisp.org/archive/cl-rashell/2024-10-12/cl-rashell-20241012-git.tgz"; + sha256 = "0fpdyhfc68xy6m0ixfvcnczlmlwasby24k47nc25x73swshlxqwq"; system = "org.melusina.rashell"; asd = "org.melusina.rashell"; }); @@ -53454,11 +54302,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_melusina_dot_webmachine = (build-asdf-system { pname = "org.melusina.webmachine"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.melusina.webmachine" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-webmachine/2023-10-21/cl-webmachine-20231021-git.tgz"; - sha256 = "0rdqk9zwdzgbc4pskq2cv1w8b1y85f1lixrpm9d92b2sbx7hhxib"; + url = "http://beta.quicklisp.org/archive/cl-webmachine/2024-10-12/cl-webmachine-20241012-git.tgz"; + sha256 = "0k31fbwsv0zdixzis625dsk9zlz04g4908wzwb8p593dksqa0sr8"; system = "org.melusina.webmachine"; asd = "org.melusina.webmachine"; }); @@ -53470,11 +54318,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_conduit-packages = (build-asdf-system { pname = "org.tfeb.conduit-packages"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.conduit-packages" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/conduit-packages/2023-10-21/conduit-packages-20231021-git.tgz"; - sha256 = "1d1hpf4a88492zr87ybcmzj0pjrirwra4kjqg7g18s7nymxmm1kr"; + url = "http://beta.quicklisp.org/archive/conduit-packages/2024-10-12/conduit-packages-20241012-git.tgz"; + sha256 = "1x89maglc4cw2c87y23zrsvh8mk22ik1anmps462w3a0j3c1ly12"; system = "org.tfeb.conduit-packages"; asd = "org.tfeb.conduit-packages"; }); @@ -53486,11 +54334,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_dsm = (build-asdf-system { pname = "org.tfeb.dsm"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "org.tfeb.dsm" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/dsm/2023-02-14/dsm-20230214-git.tgz"; - sha256 = "0pzhxbvkvcwzjx1lm3jmry5l79hnh82x4a0x868wabibb7ra9fx9"; + url = "http://beta.quicklisp.org/archive/dsm/2024-10-12/dsm-20241012-git.tgz"; + sha256 = "033swj37bgbzn35fjndxqsk89i17bhsim12j8mciiziykx62c4pw"; system = "org.tfeb.dsm"; asd = "org.tfeb.dsm"; }); @@ -53502,11 +54350,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax = (build-asdf-system { pname = "org.tfeb.hax"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax"; asd = "org.tfeb.hax"; }); @@ -53518,11 +54366,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax_dot_abstract-classes = (build-asdf-system { pname = "org.tfeb.hax.abstract-classes"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax.abstract-classes" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax.abstract-classes"; asd = "org.tfeb.hax.abstract-classes"; }); @@ -53534,11 +54382,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax_dot_binding = (build-asdf-system { pname = "org.tfeb.hax.binding"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax.binding" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax.binding"; asd = "org.tfeb.hax.binding"; }); @@ -53550,11 +54398,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax_dot_collecting = (build-asdf-system { pname = "org.tfeb.hax.collecting"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax.collecting" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax.collecting"; asd = "org.tfeb.hax.collecting"; }); @@ -53566,11 +54414,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax_dot_comment-form = (build-asdf-system { pname = "org.tfeb.hax.comment-form"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax.comment-form" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax.comment-form"; asd = "org.tfeb.hax.comment-form"; }); @@ -53582,11 +54430,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax_dot_cs-forms = (build-asdf-system { pname = "org.tfeb.hax.cs-forms"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax.cs-forms" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax.cs-forms"; asd = "org.tfeb.hax.cs-forms"; }); @@ -53598,11 +54446,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax_dot_define-functions = (build-asdf-system { pname = "org.tfeb.hax.define-functions"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax.define-functions" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax.define-functions"; asd = "org.tfeb.hax.define-functions"; }); @@ -53614,11 +54462,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax_dot_dynamic-state = (build-asdf-system { pname = "org.tfeb.hax.dynamic-state"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax.dynamic-state" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax.dynamic-state"; asd = "org.tfeb.hax.dynamic-state"; }); @@ -53630,11 +54478,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax_dot_iterate = (build-asdf-system { pname = "org.tfeb.hax.iterate"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax.iterate" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax.iterate"; asd = "org.tfeb.hax.iterate"; }); @@ -53646,11 +54494,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax_dot_memoize = (build-asdf-system { pname = "org.tfeb.hax.memoize"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax.memoize" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax.memoize"; asd = "org.tfeb.hax.memoize"; }); @@ -53662,11 +54510,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax_dot_metatronic = (build-asdf-system { pname = "org.tfeb.hax.metatronic"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax.metatronic" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax.metatronic"; asd = "org.tfeb.hax.metatronic"; }); @@ -53678,11 +54526,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax_dot_object-accessors = (build-asdf-system { pname = "org.tfeb.hax.object-accessors"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax.object-accessors" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax.object-accessors"; asd = "org.tfeb.hax.object-accessors"; }); @@ -53694,11 +54542,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax_dot_read-package = (build-asdf-system { pname = "org.tfeb.hax.read-package"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax.read-package" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax.read-package"; asd = "org.tfeb.hax.read-package"; }); @@ -53710,11 +54558,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax_dot_simple-loops = (build-asdf-system { pname = "org.tfeb.hax.simple-loops"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax.simple-loops" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax.simple-loops"; asd = "org.tfeb.hax.simple-loops"; }); @@ -53726,11 +54574,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax_dot_singleton-classes = (build-asdf-system { pname = "org.tfeb.hax.singleton-classes"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax.singleton-classes" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax.singleton-classes"; asd = "org.tfeb.hax.singleton-classes"; }); @@ -53742,11 +54590,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax_dot_slog = (build-asdf-system { pname = "org.tfeb.hax.slog"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax.slog" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax.slog"; asd = "org.tfeb.hax.slog"; }); @@ -53758,11 +54606,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax_dot_spam = (build-asdf-system { pname = "org.tfeb.hax.spam"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax.spam" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax.spam"; asd = "org.tfeb.hax.spam"; }); @@ -53774,11 +54622,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax_dot_stringtable = (build-asdf-system { pname = "org.tfeb.hax.stringtable"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax.stringtable" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax.stringtable"; asd = "org.tfeb.hax.stringtable"; }); @@ -53790,11 +54638,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax_dot_trace-macroexpand = (build-asdf-system { pname = "org.tfeb.hax.trace-macroexpand"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax.trace-macroexpand" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax.trace-macroexpand"; asd = "org.tfeb.hax.trace-macroexpand"; }); @@ -53806,11 +54654,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax_dot_utilities = (build-asdf-system { pname = "org.tfeb.hax.utilities"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax.utilities" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax.utilities"; asd = "org.tfeb.hax.utilities"; }); @@ -53822,11 +54670,11 @@ in lib.makeScope pkgs.newScope (self: { }); org_dot_tfeb_dot_hax_dot_wrapping-standard = (build-asdf-system { pname = "org.tfeb.hax.wrapping-standard"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "org.tfeb.hax.wrapping-standard" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2023-10-21/tfeb-lisp-hax-20231021-git.tgz"; - sha256 = "0d7r9ac57cdsw59lnkhknj4avf09fn6vcfp2r86w7j83fqrb651z"; + url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2024-10-12/tfeb-lisp-hax-20241012-git.tgz"; + sha256 = "08rrl3kihqkhxgghdvsd1304i4jcnmag5jzw15pp4rbqvsp36nfa"; system = "org.tfeb.hax.wrapping-standard"; asd = "org.tfeb.hax.wrapping-standard"; }); @@ -53982,11 +54830,11 @@ in lib.makeScope pkgs.newScope (self: { }); orizuru-orm = (build-asdf-system { pname = "orizuru-orm"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "orizuru-orm" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/orizuru-orm/2023-10-21/orizuru-orm-20231021-git.tgz"; - sha256 = "1njd12r04yphz722qnf80561iiggyk6yg0wxy7pbh2xwhfs5pflr"; + url = "http://beta.quicklisp.org/archive/orizuru-orm/2024-10-12/orizuru-orm-20241012-git.tgz"; + sha256 = "064sr0nxz884vrh550d8v3v9pqgs65d97lrr3828qn6bgaxwm1va"; system = "orizuru-orm"; asd = "orizuru-orm"; }); @@ -54044,11 +54892,11 @@ in lib.makeScope pkgs.newScope (self: { }); overlord = (build-asdf-system { pname = "overlord"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "overlord" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/overlord/2023-06-18/overlord-20230618-git.tgz"; - sha256 = "05lnagv4vlvap0k1pg5yfkhl1pjl0vlbflwjhl0rb9apyh7kkgia"; + url = "http://beta.quicklisp.org/archive/overlord/2024-10-12/overlord-20241012-git.tgz"; + sha256 = "1afhqx6wdqdah1fpapvr6zxpzkkqmhbrxkqxam523fqjyg4a6941"; system = "overlord"; asd = "overlord"; }); @@ -54268,11 +55116,11 @@ in lib.makeScope pkgs.newScope (self: { }); papyrus = (build-asdf-system { pname = "papyrus"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "papyrus" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/papyrus/2022-11-06/papyrus-20221106-git.tgz"; - sha256 = "0swpsxir553cs2pj6xz8cgyr3y9fh88hiv527ssa8cm7qkxcbbg9"; + url = "http://beta.quicklisp.org/archive/papyrus/2024-10-12/papyrus-20241012-git.tgz"; + sha256 = "0cnhdl2x5vs91srlfjnaznwj5vrg6qlyn2xjbyy40p8yvr5pny88"; system = "papyrus"; asd = "papyrus"; }); @@ -54284,11 +55132,11 @@ in lib.makeScope pkgs.newScope (self: { }); parachute = (build-asdf-system { pname = "parachute"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "parachute" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/parachute/2023-10-21/parachute-20231021-git.tgz"; - sha256 = "1g7zkzcd0k2gjsr91lndarg7mzfdb23rmh8h97i2y3grync9n1h6"; + url = "http://beta.quicklisp.org/archive/parachute/2024-10-12/parachute-20241012-git.tgz"; + sha256 = "1hghjrv5d5w9nz27lhwz8vvbdcjl2skm76r8adpzmi7s1f9ww121"; system = "parachute"; asd = "parachute"; }); @@ -54298,11 +55146,11 @@ in lib.makeScope pkgs.newScope (self: { }); parachute-fiveam = (build-asdf-system { pname = "parachute-fiveam"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "parachute-fiveam" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/parachute/2023-10-21/parachute-20231021-git.tgz"; - sha256 = "1g7zkzcd0k2gjsr91lndarg7mzfdb23rmh8h97i2y3grync9n1h6"; + url = "http://beta.quicklisp.org/archive/parachute/2024-10-12/parachute-20241012-git.tgz"; + sha256 = "1hghjrv5d5w9nz27lhwz8vvbdcjl2skm76r8adpzmi7s1f9ww121"; system = "parachute-fiveam"; asd = "parachute-fiveam"; }); @@ -54314,11 +55162,11 @@ in lib.makeScope pkgs.newScope (self: { }); parachute-lisp-unit = (build-asdf-system { pname = "parachute-lisp-unit"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "parachute-lisp-unit" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/parachute/2023-10-21/parachute-20231021-git.tgz"; - sha256 = "1g7zkzcd0k2gjsr91lndarg7mzfdb23rmh8h97i2y3grync9n1h6"; + url = "http://beta.quicklisp.org/archive/parachute/2024-10-12/parachute-20241012-git.tgz"; + sha256 = "1hghjrv5d5w9nz27lhwz8vvbdcjl2skm76r8adpzmi7s1f9ww121"; system = "parachute-lisp-unit"; asd = "parachute-lisp-unit"; }); @@ -54330,11 +55178,11 @@ in lib.makeScope pkgs.newScope (self: { }); parachute-prove = (build-asdf-system { pname = "parachute-prove"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "parachute-prove" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/parachute/2023-10-21/parachute-20231021-git.tgz"; - sha256 = "1g7zkzcd0k2gjsr91lndarg7mzfdb23rmh8h97i2y3grync9n1h6"; + url = "http://beta.quicklisp.org/archive/parachute/2024-10-12/parachute-20241012-git.tgz"; + sha256 = "1hghjrv5d5w9nz27lhwz8vvbdcjl2skm76r8adpzmi7s1f9ww121"; system = "parachute-prove"; asd = "parachute-prove"; }); @@ -54612,11 +55460,11 @@ in lib.makeScope pkgs.newScope (self: { }); parse-number = (build-asdf-system { pname = "parse-number"; - version = "v1.7"; + version = "v1.8"; asds = [ "parse-number" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz"; - sha256 = "0sk06ib1bhqv9y39vwnnw44vmbc4b0kvqm37xxmkxd4dwchq82d7"; + url = "http://beta.quicklisp.org/archive/parse-number/2024-10-12/parse-number-v1.8.tgz"; + sha256 = "1yh54v02i9b55bmkfkz59qd14irw8llasp48drbilkbz1az1qg2p"; system = "parse-number"; asd = "parse-number"; }); @@ -54624,6 +55472,38 @@ in lib.makeScope pkgs.newScope (self: { lispLibs = [ ]; meta = {}; }); + parse-number-range = (build-asdf-system { + pname = "parse-number-range"; + version = "1.0.1"; + asds = [ "parse-number-range" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/parse-number-range/2024-10-12/parse-number-range_1.0.1.tgz"; + sha256 = "1kd0l3bcywhwmnjil0zzvq4cjlhpj2g1wiy7h7860nflzfz7qvds"; + system = "parse-number-range"; + asd = "parse-number-range"; + }); + systems = [ "parse-number-range" ]; + lispLibs = [ (getAttr "cartesian-product-switch" self) (getAttr "enhanced-multiple-value-bind" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + parse-number-range__tests = (build-asdf-system { + pname = "parse-number-range_tests"; + version = "1.0.1"; + asds = [ "parse-number-range_tests" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/parse-number-range/2024-10-12/parse-number-range_1.0.1.tgz"; + sha256 = "1kd0l3bcywhwmnjil0zzvq4cjlhpj2g1wiy7h7860nflzfz7qvds"; + system = "parse-number-range_tests"; + asd = "parse-number-range_tests"; + }); + systems = [ "parse-number-range_tests" ]; + lispLibs = [ (getAttr "parachute" self) (getAttr "parse-number-range" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); parse-rgb = (build-asdf-system { pname = "parse-rgb"; version = "20231021-git"; @@ -54876,11 +55756,11 @@ in lib.makeScope pkgs.newScope (self: { }); pathname-utils = (build-asdf-system { pname = "pathname-utils"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "pathname-utils" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/pathname-utils/2023-10-21/pathname-utils-20231021-git.tgz"; - sha256 = "0j358819g2jwrpih84ksqs5ywgg82ykhk7hd6zh33kxpk5rdmm7m"; + url = "http://beta.quicklisp.org/archive/pathname-utils/2024-10-12/pathname-utils-20241012-git.tgz"; + sha256 = "1z1z3dar6g2ybxgk9zgcyb8bh5g6rh12bwl3ik6rdwy3rdd5b1q5"; system = "pathname-utils"; asd = "pathname-utils"; }); @@ -54892,11 +55772,11 @@ in lib.makeScope pkgs.newScope (self: { }); pathname-utils-test = (build-asdf-system { pname = "pathname-utils-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "pathname-utils-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/pathname-utils/2023-10-21/pathname-utils-20231021-git.tgz"; - sha256 = "0j358819g2jwrpih84ksqs5ywgg82ykhk7hd6zh33kxpk5rdmm7m"; + url = "http://beta.quicklisp.org/archive/pathname-utils/2024-10-12/pathname-utils-20241012-git.tgz"; + sha256 = "1z1z3dar6g2ybxgk9zgcyb8bh5g6rh12bwl3ik6rdwy3rdd5b1q5"; system = "pathname-utils-test"; asd = "pathname-utils-test"; }); @@ -55320,11 +56200,11 @@ in lib.makeScope pkgs.newScope (self: { }); persistent = (build-asdf-system { pname = "persistent"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "persistent" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "persistent"; asd = "persistent"; }); @@ -55384,11 +56264,11 @@ in lib.makeScope pkgs.newScope (self: { }); petalisp = (build-asdf-system { pname = "petalisp"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "petalisp" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2023-10-21/petalisp-20231021-git.tgz"; - sha256 = "05mspnbncszmw75kcdhs54jyz397ij40gbsyspm7s24qhw03iqad"; + url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz"; + sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9"; system = "petalisp"; asd = "petalisp"; }); @@ -55400,27 +56280,27 @@ in lib.makeScope pkgs.newScope (self: { }); petalisp_dot_api = (build-asdf-system { pname = "petalisp.api"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "petalisp.api" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2023-10-21/petalisp-20231021-git.tgz"; - sha256 = "05mspnbncszmw75kcdhs54jyz397ij40gbsyspm7s24qhw03iqad"; + url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz"; + sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9"; system = "petalisp.api"; asd = "petalisp.api"; }); systems = [ "petalisp.api" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "petalisp_dot_codegen" self) (getAttr "petalisp_dot_core" self) (getAttr "petalisp_dot_ir" self) (getAttr "petalisp_dot_native-backend" self) (getAttr "petalisp_dot_utilities" self) (getAttr "split-sequence" self) (getAttr "trivia" self) (getAttr "trivial-macroexpand-all" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "petalisp_dot_codegen" self) (getAttr "petalisp_dot_core" self) (getAttr "petalisp_dot_ir" self) (getAttr "petalisp_dot_native-backend" self) (getAttr "petalisp_dot_packages" self) (getAttr "petalisp_dot_utilities" self) (getAttr "split-sequence" self) (getAttr "trivia" self) (getAttr "trivial-macroexpand-all" self) ]; meta = { hydraPlatforms = [ ]; }; }); petalisp_dot_codegen = (build-asdf-system { pname = "petalisp.codegen"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "petalisp.codegen" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2023-10-21/petalisp-20231021-git.tgz"; - sha256 = "05mspnbncszmw75kcdhs54jyz397ij40gbsyspm7s24qhw03iqad"; + url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz"; + sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9"; system = "petalisp.codegen"; asd = "petalisp.codegen"; }); @@ -55432,27 +56312,27 @@ in lib.makeScope pkgs.newScope (self: { }); petalisp_dot_core = (build-asdf-system { pname = "petalisp.core"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "petalisp.core" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2023-10-21/petalisp-20231021-git.tgz"; - sha256 = "05mspnbncszmw75kcdhs54jyz397ij40gbsyspm7s24qhw03iqad"; + url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz"; + sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9"; system = "petalisp.core"; asd = "petalisp.core"; }); systems = [ "petalisp.core" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "lparallel" self) (getAttr "petalisp_dot_utilities" self) (getAttr "trivia" self) (getAttr "typo" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "lparallel" self) (getAttr "petalisp_dot_packages" self) (getAttr "petalisp_dot_utilities" self) (getAttr "trivia" self) (getAttr "typo" self) ]; meta = { hydraPlatforms = [ ]; }; }); petalisp_dot_examples = (build-asdf-system { pname = "petalisp.examples"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "petalisp.examples" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2023-10-21/petalisp-20231021-git.tgz"; - sha256 = "05mspnbncszmw75kcdhs54jyz397ij40gbsyspm7s24qhw03iqad"; + url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz"; + sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9"; system = "petalisp.examples"; asd = "petalisp.examples"; }); @@ -55462,29 +56342,13 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - petalisp_dot_graphviz = (build-asdf-system { - pname = "petalisp.graphviz"; - version = "20231021-git"; - asds = [ "petalisp.graphviz" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2023-10-21/petalisp-20231021-git.tgz"; - sha256 = "05mspnbncszmw75kcdhs54jyz397ij40gbsyspm7s24qhw03iqad"; - system = "petalisp.graphviz"; - asd = "petalisp.graphviz"; - }); - systems = [ "petalisp.graphviz" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-dot" self) (getAttr "closer-mop" self) (getAttr "petalisp" self) (getAttr "petalisp_dot_core" self) (getAttr "petalisp_dot_ir" self) (getAttr "petalisp_dot_utilities" self) (getAttr "trivial-features" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); petalisp_dot_ir = (build-asdf-system { pname = "petalisp.ir"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "petalisp.ir" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2023-10-21/petalisp-20231021-git.tgz"; - sha256 = "05mspnbncszmw75kcdhs54jyz397ij40gbsyspm7s24qhw03iqad"; + url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz"; + sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9"; system = "petalisp.ir"; asd = "petalisp.ir"; }); @@ -55496,11 +56360,11 @@ in lib.makeScope pkgs.newScope (self: { }); petalisp_dot_native-backend = (build-asdf-system { pname = "petalisp.native-backend"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "petalisp.native-backend" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2023-10-21/petalisp-20231021-git.tgz"; - sha256 = "05mspnbncszmw75kcdhs54jyz397ij40gbsyspm7s24qhw03iqad"; + url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz"; + sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9"; system = "petalisp.native-backend"; asd = "petalisp.native-backend"; }); @@ -55510,13 +56374,29 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + petalisp_dot_packages = (build-asdf-system { + pname = "petalisp.packages"; + version = "20241012-git"; + asds = [ "petalisp.packages" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz"; + sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9"; + system = "petalisp.packages"; + asd = "petalisp.packages"; + }); + systems = [ "petalisp.packages" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + }); petalisp_dot_test-suite = (build-asdf-system { pname = "petalisp.test-suite"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "petalisp.test-suite" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2023-10-21/petalisp-20231021-git.tgz"; - sha256 = "05mspnbncszmw75kcdhs54jyz397ij40gbsyspm7s24qhw03iqad"; + url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz"; + sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9"; system = "petalisp.test-suite"; asd = "petalisp.test-suite"; }); @@ -55528,11 +56408,11 @@ in lib.makeScope pkgs.newScope (self: { }); petalisp_dot_utilities = (build-asdf-system { pname = "petalisp.utilities"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "petalisp.utilities" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2023-10-21/petalisp-20231021-git.tgz"; - sha256 = "05mspnbncszmw75kcdhs54jyz397ij40gbsyspm7s24qhw03iqad"; + url = "http://beta.quicklisp.org/archive/petalisp/2024-10-12/petalisp-20241012-git.tgz"; + sha256 = "06njw0jx48rm52zbpwdw442j6rasqsmfd2zsi71y30aij7c9b0h9"; system = "petalisp.utilities"; asd = "petalisp.utilities"; }); @@ -55752,11 +56632,11 @@ in lib.makeScope pkgs.newScope (self: { }); phos = (build-asdf-system { pname = "phos"; - version = "20220220-git"; + version = "20241012-git"; asds = [ "phos" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/phos/2022-02-20/phos-20220220-git.tgz"; - sha256 = "1zwci86rkbaiix0w2gd5q6nr8v2vv945pkvwp0j240iyzd4hfxr3"; + url = "http://beta.quicklisp.org/archive/phos/2024-10-12/phos-20241012-git.tgz"; + sha256 = "0lnv54iczidjpskciw7y2faazgxjwpncggdh5kggpjziq03pr7lv"; system = "phos"; asd = "phos"; }); @@ -55771,7 +56651,7 @@ in lib.makeScope pkgs.newScope (self: { version = "master-df14cb8c-git"; asds = [ "physical-dimension" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/antik/2019-10-08/antik-master-df14cb8c-git.tgz"; + url = "http://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz"; sha256 = "1n08cx4n51z8v4bxyak166lp495xda3x7llfxcdpxndxqxcammr0"; system = "physical-dimension"; asd = "physical-dimension"; @@ -55798,11 +56678,11 @@ in lib.makeScope pkgs.newScope (self: { }); picl = (build-asdf-system { pname = "picl"; - version = "20210124-git"; + version = "20241012-git"; asds = [ "picl" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/picl/2021-01-24/picl-20210124-git.tgz"; - sha256 = "14jwx7hv6h563ppvxicdkrqx0cxlz15im9a4grd9yvwdfxl70l4c"; + url = "http://beta.quicklisp.org/archive/picl/2024-10-12/picl-20241012-git.tgz"; + sha256 = "0pdzlmphf1bqk5xdvwf1m1l3s5whwm4ysnpl5kpwq70adx38rysk"; system = "picl"; asd = "picl"; }); @@ -56038,11 +56918,11 @@ in lib.makeScope pkgs.newScope (self: { }); plot = (build-asdf-system { pname = "plot"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "plot" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/plot/2023-10-21/plot-20231021-git.tgz"; - sha256 = "1cmdpgf9srw8f1ggpkksk3fnw6mxixwl9ia592m0af4y84cqml5k"; + url = "http://beta.quicklisp.org/archive/plot/2024-10-12/plot-20241012-git.tgz"; + sha256 = "1x5kc5y0s082y24qgq138331qmfs0xxxj43ss3aw0kgx7wfpxlms"; system = "plot"; asd = "plot"; }); @@ -56086,11 +56966,11 @@ in lib.makeScope pkgs.newScope (self: { }); plump = (build-asdf-system { pname = "plump"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "plump" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/plump/2023-10-21/plump-20231021-git.tgz"; - sha256 = "09hhqb3ajvqw8smj4c6b1yqbxhaypf3hz71qrzkynxd0bhq8y6af"; + url = "http://beta.quicklisp.org/archive/plump/2024-10-12/plump-20241012-git.tgz"; + sha256 = "04wy2v69zal186gg0pvcj60184gi7cpkpx3h1w93c9nilmla0dv9"; system = "plump"; asd = "plump"; }); @@ -56116,11 +56996,11 @@ in lib.makeScope pkgs.newScope (self: { }); plump-dom = (build-asdf-system { pname = "plump-dom"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "plump-dom" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/plump/2023-10-21/plump-20231021-git.tgz"; - sha256 = "09hhqb3ajvqw8smj4c6b1yqbxhaypf3hz71qrzkynxd0bhq8y6af"; + url = "http://beta.quicklisp.org/archive/plump/2024-10-12/plump-20241012-git.tgz"; + sha256 = "04wy2v69zal186gg0pvcj60184gi7cpkpx3h1w93c9nilmla0dv9"; system = "plump-dom"; asd = "plump-dom"; }); @@ -56132,11 +57012,11 @@ in lib.makeScope pkgs.newScope (self: { }); plump-lexer = (build-asdf-system { pname = "plump-lexer"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "plump-lexer" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/plump/2023-10-21/plump-20231021-git.tgz"; - sha256 = "09hhqb3ajvqw8smj4c6b1yqbxhaypf3hz71qrzkynxd0bhq8y6af"; + url = "http://beta.quicklisp.org/archive/plump/2024-10-12/plump-20241012-git.tgz"; + sha256 = "04wy2v69zal186gg0pvcj60184gi7cpkpx3h1w93c9nilmla0dv9"; system = "plump-lexer"; asd = "plump-lexer"; }); @@ -56148,11 +57028,11 @@ in lib.makeScope pkgs.newScope (self: { }); plump-parser = (build-asdf-system { pname = "plump-parser"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "plump-parser" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/plump/2023-10-21/plump-20231021-git.tgz"; - sha256 = "09hhqb3ajvqw8smj4c6b1yqbxhaypf3hz71qrzkynxd0bhq8y6af"; + url = "http://beta.quicklisp.org/archive/plump/2024-10-12/plump-20241012-git.tgz"; + sha256 = "04wy2v69zal186gg0pvcj60184gi7cpkpx3h1w93c9nilmla0dv9"; system = "plump-parser"; asd = "plump-parser"; }); @@ -56164,11 +57044,11 @@ in lib.makeScope pkgs.newScope (self: { }); plump-sexp = (build-asdf-system { pname = "plump-sexp"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "plump-sexp" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/plump-sexp/2023-10-21/plump-sexp-20231021-git.tgz"; - sha256 = "09m8lkgb3k0dcz2m6w8smvw77b1ajsc3kpy80h5hcxg16wlzzgjh"; + url = "http://beta.quicklisp.org/archive/plump-sexp/2024-10-12/plump-sexp-20241012-git.tgz"; + sha256 = "19gihmsbwv42zwyc4rd1pcvj5yzf1vnhpci7r5kz1dnrmz9gzy3l"; system = "plump-sexp"; asd = "plump-sexp"; }); @@ -56260,11 +57140,11 @@ in lib.makeScope pkgs.newScope (self: { }); pngload = (build-asdf-system { pname = "pngload"; - version = "20220707-git"; + version = "20241012-git"; asds = [ "pngload" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/pngload/2022-07-07/pngload-20220707-git.tgz"; - sha256 = "1qnd2pz6ckdm5nnf4ipli3zgiyisfqjyf1aiy7iigijv4018lrlx"; + url = "http://beta.quicklisp.org/archive/pngload/2024-10-12/pngload-20241012-git.tgz"; + sha256 = "1j5j8n8xa8hgc413lfxij3wmkwyal13p0a5q6n74zzr61f1kn6vc"; system = "pngload"; asd = "pngload"; }); @@ -56276,11 +57156,11 @@ in lib.makeScope pkgs.newScope (self: { }); pngload_dot_test = (build-asdf-system { pname = "pngload.test"; - version = "20220707-git"; + version = "20241012-git"; asds = [ "pngload.test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/pngload/2022-07-07/pngload-20220707-git.tgz"; - sha256 = "1qnd2pz6ckdm5nnf4ipli3zgiyisfqjyf1aiy7iigijv4018lrlx"; + url = "http://beta.quicklisp.org/archive/pngload/2024-10-12/pngload-20241012-git.tgz"; + sha256 = "1j5j8n8xa8hgc413lfxij3wmkwyal13p0a5q6n74zzr61f1kn6vc"; system = "pngload.test"; asd = "pngload.test"; }); @@ -56324,11 +57204,11 @@ in lib.makeScope pkgs.newScope (self: { }); policy-cond = (build-asdf-system { pname = "policy-cond"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "policy-cond" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/policy-cond/2023-10-21/policy-cond-20231021-git.tgz"; - sha256 = "0v4vjy810p5hhg2s2n14v8l7rpciwxr5w9gbh9h8lm7v5fjzclxg"; + url = "http://beta.quicklisp.org/archive/policy-cond/2024-10-12/policy-cond-20241012-git.tgz"; + sha256 = "17gm4alfb8nf85963ckahipx61xfffj0ra2cnn6yra32krzj7gnk"; system = "policy-cond"; asd = "policy-cond"; }); @@ -56370,18 +57250,18 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - polymorphic-functions = (build-asdf-system { - pname = "polymorphic-functions"; - version = "20230618-git"; - asds = [ "polymorphic-functions" ]; + polymorphic-functions-lite = (build-asdf-system { + pname = "polymorphic-functions-lite"; + version = "20241012-git"; + asds = [ "polymorphic-functions-lite" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/polymorphic-functions/2023-06-18/polymorphic-functions-20230618-git.tgz"; - sha256 = "1059l2i50ld3jm6rqarwkafgw6jnk3hcycfkjh5v64maw5q1rkyi"; - system = "polymorphic-functions"; - asd = "polymorphic-functions"; + url = "http://beta.quicklisp.org/archive/polymorphic-functions/2024-10-12/polymorphic-functions-20241012-git.tgz"; + sha256 = "1bawhbj5rh1q6qrcjnx48n78841mgri5n63pmicxxyhif2il0zq3"; + system = "polymorphic-functions-lite"; + asd = "polymorphic-functions-lite"; }); - systems = [ "polymorphic-functions" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-form-types" self) (getAttr "closer-mop" self) (getAttr "compiler-macro-notes" self) (getAttr "ctype" self) (getAttr "extensible-compound-types" self) (getAttr "fiveam" self) (getAttr "introspect-environment" self) (getAttr "let-plus" self) (getAttr "optima" self) (getAttr "split-sequence" self) (getAttr "trivial-garbage" self) ]; + systems = [ "polymorphic-functions-lite" ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "fiveam" self) (getAttr "introspect-environment" self) (getAttr "optima" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -56532,11 +57412,11 @@ in lib.makeScope pkgs.newScope (self: { }); postmodern = (build-asdf-system { pname = "postmodern"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "postmodern" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/postmodern/2023-10-21/postmodern-20231021-git.tgz"; - sha256 = "1abb80zmnawzl9g09css57kviwbqw5fcxhp3fjrzw7zc3n1wfr8y"; + url = "http://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz"; + sha256 = "1hj0dpclzihy1rcnwhiv16abmaa54wygxyib3j2h9q4qs26w7pzb"; system = "postmodern"; asd = "postmodern"; }); @@ -56544,22 +57424,6 @@ in lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "cl-postgres" self) (getAttr "closer-mop" self) (getAttr "global-vars" self) (getAttr "s-sql" self) (getAttr "split-sequence" self) ]; meta = {}; }); - postmodern-localtime = (build-asdf-system { - pname = "postmodern-localtime"; - version = "20200610-git"; - asds = [ "postmodern-localtime" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/postmodern-localtime/2020-06-10/postmodern-localtime-20200610-git.tgz"; - sha256 = "0kiswbdr3vsl7xfs43h0w9c2s6fm6ammff6mpab6zba7rdmfg6d3"; - system = "postmodern-localtime"; - asd = "postmodern-localtime"; - }); - systems = [ "postmodern-localtime" ]; - lispLibs = [ (getAttr "cl-postgres" self) (getAttr "local-time" self) (getAttr "postmodern" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); postmodernity = (build-asdf-system { pname = "postmodernity"; version = "20170124-git"; @@ -56642,11 +57506,11 @@ in lib.makeScope pkgs.newScope (self: { }); ppath = (build-asdf-system { pname = "ppath"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "ppath" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ppath/2023-10-21/ppath-20231021-git.tgz"; - sha256 = "1xp9igyajj4ndk0gswqx8ynblvhmwkm1lliyp543v0mf1hdq4ayk"; + url = "http://beta.quicklisp.org/archive/ppath/2024-10-12/ppath-20241012-git.tgz"; + sha256 = "122h2xlr9435gjim567cyry13ylbsixziy5bi1n4lzpfjnkq68qg"; system = "ppath"; asd = "ppath"; }); @@ -56658,11 +57522,11 @@ in lib.makeScope pkgs.newScope (self: { }); ppath-test = (build-asdf-system { pname = "ppath-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "ppath-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ppath/2023-10-21/ppath-20231021-git.tgz"; - sha256 = "1xp9igyajj4ndk0gswqx8ynblvhmwkm1lliyp543v0mf1hdq4ayk"; + url = "http://beta.quicklisp.org/archive/ppath/2024-10-12/ppath-20241012-git.tgz"; + sha256 = "122h2xlr9435gjim567cyry13ylbsixziy5bi1n4lzpfjnkq68qg"; system = "ppath-test"; asd = "ppath-test"; }); @@ -56720,6 +57584,38 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + precise-time = (build-asdf-system { + pname = "precise-time"; + version = "20241012-git"; + asds = [ "precise-time" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/precise-time/2024-10-12/precise-time-20241012-git.tgz"; + sha256 = "114ix5nldfg301g0af8lsnc129i7hnhgdzmnznda2fv92zf3vn8g"; + system = "precise-time"; + asd = "precise-time"; + }); + systems = [ "precise-time" ]; + lispLibs = [ (getAttr "cffi" self) (getAttr "documentation-utils" self) (getAttr "trivial-features" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + pregexp = (build-asdf-system { + pname = "pregexp"; + version = "20241012-git"; + asds = [ "pregexp" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/pregexp/2024-10-12/pregexp-20241012-git.tgz"; + sha256 = "10l9hj7a812km1hygg6iwwl1bf8jgsfyfr1ixj7bif8k8502h4nz"; + system = "pregexp"; + asd = "pregexp"; + }); + systems = [ "pregexp" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + }); prepl = (build-asdf-system { pname = "prepl"; version = "20231021-git"; @@ -56850,11 +57746,11 @@ in lib.makeScope pkgs.newScope (self: { }); priority-queue-benchmark = (build-asdf-system { pname = "priority-queue-benchmark"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "priority-queue-benchmark" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/damn-fast-priority-queue/2022-11-06/damn-fast-priority-queue-20221106-git.tgz"; - sha256 = "14917b1z7ag3a7f88p4fk4649iy07kn9vpq6bszdxcp1irnc5a13"; + url = "http://beta.quicklisp.org/archive/damn-fast-priority-queue/2024-10-12/damn-fast-priority-queue-20241012-git.tgz"; + sha256 = "1mbigpgi7qbqvpj59l1f7p2qcg00ybvqzdca1j1b9hx62h224ndw"; system = "priority-queue-benchmark"; asd = "priority-queue-benchmark"; }); @@ -56894,6 +57790,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + progressons = (build-asdf-system { + pname = "progressons"; + version = "20241012-git"; + asds = [ "progressons" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/progressons/2024-10-12/progressons-20241012-git.tgz"; + sha256 = "1i93khd0l1aphzh6qb4yy9cpi2nmqac08b90yx95p4zymap03nly"; + system = "progressons"; + asd = "progressons"; + }); + systems = [ "progressons" ]; + lispLibs = [ (getAttr "cl-ansi-text" self) (getAttr "str" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); projectured_dot_document = (build-asdf-system { pname = "projectured.document"; version = "quicklisp-c3a60e76-git"; @@ -57040,11 +57952,11 @@ in lib.makeScope pkgs.newScope (self: { }); prometheus-gc = (build-asdf-system { pname = "prometheus-gc"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "prometheus-gc" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/prometheus-gc/2023-06-18/prometheus-gc-20230618-git.tgz"; - sha256 = "1i9hif2yyb2bgxngqg1imvw5jkdykx13fvqgs60kkq6ww6jjxwwf"; + url = "http://beta.quicklisp.org/archive/prometheus-gc/2024-10-12/prometheus-gc-20241012-git.tgz"; + sha256 = "0lfdh7j7jzklhr76fdw1z3a777h5sr5c9h1i6nv1knnm36l44zpj"; system = "prometheus-gc"; asd = "prometheus-gc"; }); @@ -57056,11 +57968,11 @@ in lib.makeScope pkgs.newScope (self: { }); prometheus-gc-ci = (build-asdf-system { pname = "prometheus-gc-ci"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "prometheus-gc-ci" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/prometheus-gc/2023-06-18/prometheus-gc-20230618-git.tgz"; - sha256 = "1i9hif2yyb2bgxngqg1imvw5jkdykx13fvqgs60kkq6ww6jjxwwf"; + url = "http://beta.quicklisp.org/archive/prometheus-gc/2024-10-12/prometheus-gc-20241012-git.tgz"; + sha256 = "0lfdh7j7jzklhr76fdw1z3a777h5sr5c9h1i6nv1knnm36l44zpj"; system = "prometheus-gc-ci"; asd = "prometheus-gc-ci"; }); @@ -57072,11 +57984,11 @@ in lib.makeScope pkgs.newScope (self: { }); prometheus-gc-tests = (build-asdf-system { pname = "prometheus-gc-tests"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "prometheus-gc-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/prometheus-gc/2023-06-18/prometheus-gc-20230618-git.tgz"; - sha256 = "1i9hif2yyb2bgxngqg1imvw5jkdykx13fvqgs60kkq6ww6jjxwwf"; + url = "http://beta.quicklisp.org/archive/prometheus-gc/2024-10-12/prometheus-gc-20241012-git.tgz"; + sha256 = "0lfdh7j7jzklhr76fdw1z3a777h5sr5c9h1i6nv1knnm36l44zpj"; system = "prometheus-gc-tests"; asd = "prometheus-gc-tests"; }); @@ -57532,11 +58444,11 @@ in lib.makeScope pkgs.newScope (self: { }); psychiq = (build-asdf-system { pname = "psychiq"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "psychiq" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/psychiq/2023-10-21/psychiq-20231021-git.tgz"; - sha256 = "00w83619c88xl8lzh7pcjw31b92fx1myjbnsypr9zwwbm35zmr7g"; + url = "http://beta.quicklisp.org/archive/psychiq/2024-10-12/psychiq-20241012-git.tgz"; + sha256 = "1036yyrzvyqszn037y4189h12221mkxdyp0nlyj26qjyil3qizbl"; system = "psychiq"; asd = "psychiq"; }); @@ -57548,11 +58460,11 @@ in lib.makeScope pkgs.newScope (self: { }); psychiq-test = (build-asdf-system { pname = "psychiq-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "psychiq-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/psychiq/2023-10-21/psychiq-20231021-git.tgz"; - sha256 = "00w83619c88xl8lzh7pcjw31b92fx1myjbnsypr9zwwbm35zmr7g"; + url = "http://beta.quicklisp.org/archive/psychiq/2024-10-12/psychiq-20241012-git.tgz"; + sha256 = "1036yyrzvyqszn037y4189h12221mkxdyp0nlyj26qjyil3qizbl"; system = "psychiq-test"; asd = "psychiq-test"; }); @@ -57626,11 +58538,11 @@ in lib.makeScope pkgs.newScope (self: { }); purgatory = (build-asdf-system { pname = "purgatory"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "purgatory" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/purgatory/2023-10-21/purgatory-20231021-git.tgz"; - sha256 = "1qjg31c5a6kmkc97sv91dr2n0n79hcqkw1d8s7a079npkf6zldz9"; + url = "http://beta.quicklisp.org/archive/purgatory/2024-10-12/purgatory-20241012-git.tgz"; + sha256 = "1srafcpl01a1dv84z3sqc1wl23r8hz1nm3rrmmqiilfh2r4jfw6f"; system = "purgatory"; asd = "purgatory"; }); @@ -57642,11 +58554,11 @@ in lib.makeScope pkgs.newScope (self: { }); purgatory-tests = (build-asdf-system { pname = "purgatory-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "purgatory-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/purgatory/2023-10-21/purgatory-20231021-git.tgz"; - sha256 = "1qjg31c5a6kmkc97sv91dr2n0n79hcqkw1d8s7a079npkf6zldz9"; + url = "http://beta.quicklisp.org/archive/purgatory/2024-10-12/purgatory-20241012-git.tgz"; + sha256 = "1srafcpl01a1dv84z3sqc1wl23r8hz1nm3rrmmqiilfh2r4jfw6f"; system = "purgatory-tests"; asd = "purgatory-tests"; }); @@ -57720,11 +58632,11 @@ in lib.makeScope pkgs.newScope (self: { }); py4cl = (build-asdf-system { pname = "py4cl"; - version = "20220707-git"; + version = "20241012-git"; asds = [ "py4cl" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/py4cl/2022-07-07/py4cl-20220707-git.tgz"; - sha256 = "14pps4r9dx9wx36vwv0r45g0fw1z6739bqacqmzwmyvdilxip977"; + url = "http://beta.quicklisp.org/archive/py4cl/2024-10-12/py4cl-20241012-git.tgz"; + sha256 = "0i2zg58zgcyw68m846sqwjb77mvps766xlp30i65h18plc8yqmpg"; system = "py4cl"; asd = "py4cl"; }); @@ -57736,11 +58648,11 @@ in lib.makeScope pkgs.newScope (self: { }); py4cl2 = (build-asdf-system { pname = "py4cl2"; - version = "v2.9.2"; + version = "v2.9.3"; asds = [ "py4cl2" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/py4cl2/2023-06-18/py4cl2-v2.9.2.tgz"; - sha256 = "136145y8mys2brsvc1lcdi6zpykvwn59vgavc8r9kmsdyd5aqi8v"; + url = "http://beta.quicklisp.org/archive/py4cl2/2024-10-12/py4cl2-v2.9.3.tgz"; + sha256 = "0g7qhwnyi1la22k90z8993q8knr117f40jk73wjsvixicqc4awqq"; system = "py4cl2"; asd = "py4cl2"; }); @@ -57752,16 +58664,16 @@ in lib.makeScope pkgs.newScope (self: { }); py4cl2-cffi = (build-asdf-system { pname = "py4cl2-cffi"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "py4cl2-cffi" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/py4cl2-cffi/2023-10-21/py4cl2-cffi-20231021-git.tgz"; - sha256 = "104p14qvpx77w1vcd4zwkzxclgfixvgdphk6d01psgwjr8x0zp1q"; + url = "http://beta.quicklisp.org/archive/py4cl2-cffi/2024-10-12/py4cl2-cffi-20241012-git.tgz"; + sha256 = "12ggqz8ibbzsmym51yfd19dlw751s7a1i6ra4z8m2ml3zw1k63zr"; system = "py4cl2-cffi"; asd = "py4cl2-cffi"; }); systems = [ "py4cl2-cffi" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "cffi" self) (getAttr "cl-ppcre" self) (getAttr "float-features" self) (getAttr "iterate" self) (getAttr "optima" self) (getAttr "parse-number" self) (getAttr "swank" self) (getAttr "trivial-backtrace" self) (getAttr "trivial-garbage" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "cffi" self) (getAttr "cl-ppcre" self) (getAttr "float-features" self) (getAttr "iterate" self) (getAttr "optima" self) (getAttr "parse-number" self) (getAttr "trivial-features" self) (getAttr "trivial-garbage" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -57918,16 +58830,16 @@ in lib.makeScope pkgs.newScope (self: { }); qlot = (build-asdf-system { pname = "qlot"; - version = "20231021-git"; + version = "1.5.14"; asds = [ "qlot" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/qlot/2023-10-21/qlot-20231021-git.tgz"; - sha256 = "0q8nmrd79yb00wg574zi98ydyf67n9f9i63n6pcbfxypibi4i74r"; + url = "http://beta.quicklisp.org/archive/qlot/2024-10-12/qlot-1.5.14.tgz"; + sha256 = "15rg8gjwisi2gp7a0pfgdvs9mjs1xxff0a58b14nm8sf11cdggkr"; system = "qlot"; asd = "qlot"; }); systems = [ "qlot" ]; - lispLibs = [ ]; + lispLibs = [ (getAttr "archive" self) (getAttr "bordeaux-threads" self) (getAttr "cl_plus_ssl" self) (getAttr "deflate" self) (getAttr "dexador" self) (getAttr "fuzzy-match" self) (getAttr "ironclad" self) (getAttr "lparallel" self) (getAttr "quri" self) (getAttr "yason" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -57966,11 +58878,11 @@ in lib.makeScope pkgs.newScope (self: { }); qoi = (build-asdf-system { pname = "qoi"; - version = "20220707-git"; + version = "20241012-git"; asds = [ "qoi" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/qoi/2022-07-07/qoi-20220707-git.tgz"; - sha256 = "12j762h599cc9qpdpcmxiddixm168sxd2i60mbyka8x6dab64mla"; + url = "http://beta.quicklisp.org/archive/qoi/2024-10-12/qoi-20241012-git.tgz"; + sha256 = "06akq38q7m648c3kpx1pzw21fwqry7fkg6sfgbap0b7bifzg1dsn"; system = "qoi"; asd = "qoi"; }); @@ -59094,6 +60006,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + quaviver = (build-asdf-system { + pname = "quaviver"; + version = "20241012-git"; + asds = [ "quaviver" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/quaviver/2024-10-12/quaviver-20241012-git.tgz"; + sha256 = "17kixyznxfwlxkfl2d2ngxas3vi7r21bgfy4g7xlngvakxw3zfzp"; + system = "quaviver"; + asd = "quaviver"; + }); + systems = [ "quaviver" ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "trivial-features" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); queen = (build-asdf-system { pname = "queen"; version = "20230618-git"; @@ -59112,11 +60040,11 @@ in lib.makeScope pkgs.newScope (self: { }); query-fs = (build-asdf-system { pname = "query-fs"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "query-fs" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/query-fs/2022-11-06/query-fs-20221106-git.tgz"; - sha256 = "010ljk1p8r5rm6b5fpznk9m241362fwy3qk8xdx836ncs8pzzyqf"; + url = "http://beta.quicklisp.org/archive/query-fs/2024-10-12/query-fs-20241012-git.tgz"; + sha256 = "09gz8xrjg9r5bclphgwjdnif8qx4qnx518jragq3znwvlzfb34fw"; system = "query-fs"; asd = "query-fs"; }); @@ -59238,11 +60166,11 @@ in lib.makeScope pkgs.newScope (self: { }); quick-patch = (build-asdf-system { pname = "quick-patch"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "quick-patch" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/quick-patch/2023-06-18/quick-patch-20230618-git.tgz"; - sha256 = "0finjayzf42an5a20hs80r1dnjpcln6ml3k5krhzwr46ps0qka4w"; + url = "http://beta.quicklisp.org/archive/quick-patch/2024-10-12/quick-patch-20241012-git.tgz"; + sha256 = "0a2wkqn65kl88yz7a8728x9gjy4w37hjavfqx4hyijhs1ph38wdi"; system = "quick-patch"; asd = "quick-patch"; }); @@ -59270,11 +60198,11 @@ in lib.makeScope pkgs.newScope (self: { }); quickhull = (build-asdf-system { pname = "quickhull"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "quickhull" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/quickhull/2023-10-21/quickhull-20231021-git.tgz"; - sha256 = "0ldnkxw64vz2j3zvklpy3w13w8znr72kxm925hqbc5xyz1ydqsqr"; + url = "http://beta.quicklisp.org/archive/quickhull/2024-10-12/quickhull-20241012-git.tgz"; + sha256 = "1814qq23dg2shnfdkw9w9ap53qzg2igy119bwslvflmcb1jd7bpm"; system = "quickhull"; asd = "quickhull"; }); @@ -59302,11 +60230,11 @@ in lib.makeScope pkgs.newScope (self: { }); quicklisp-starter = (build-asdf-system { pname = "quicklisp-starter"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "quicklisp-starter" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-brewer/2023-10-21/cl-brewer-20231021-git.tgz"; - sha256 = "1xpgy3lci0ip9bwrx8sdwbllgq57mq3apzafxbmci5jdsa2rxh9r"; + url = "http://beta.quicklisp.org/archive/cl-brewer/2024-10-12/cl-brewer-20241012-git.tgz"; + sha256 = "0izf6v4qx82jhk7ln28jhdmnr3lb0r5iqjj0by9igq5sk3y1my4x"; system = "quicklisp-starter"; asd = "quicklisp-starter"; }); @@ -59460,6 +60388,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + quil-coalton = (build-asdf-system { + pname = "quil-coalton"; + version = "20241012-git"; + asds = [ "quil-coalton" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz"; + sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7"; + system = "quil-coalton"; + asd = "quil-coalton"; + }); + systems = [ "quil-coalton" ]; + lispLibs = [ (getAttr "coalton" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); quine-mccluskey = (build-asdf-system { pname = "quine-mccluskey"; version = "20141217-git"; @@ -59478,25 +60422,25 @@ in lib.makeScope pkgs.newScope (self: { }); quri = (build-asdf-system { pname = "quri"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "quri" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/quri/2023-06-18/quri-20230618-git.tgz"; - sha256 = "0l1jnvvkyaxbf08lnqfdbv6lrkq02iqr3y3rwvqxm4fvnzp7mnpz"; + url = "http://beta.quicklisp.org/archive/quri/2024-10-12/quri-20241012-git.tgz"; + sha256 = "0vismgg72xrflzdsrv8ybq3cxf717k5296g9b731974vwlf7ibh0"; system = "quri"; asd = "quri"; }); systems = [ "quri" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "babel" self) (getAttr "cl-utilities" self) (getAttr "split-sequence" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "babel" self) (getAttr "cl-utilities" self) (getAttr "idna" self) (getAttr "split-sequence" self) ]; meta = {}; }); quri-test = (build-asdf-system { pname = "quri-test"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "quri-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/quri/2023-06-18/quri-20230618-git.tgz"; - sha256 = "0l1jnvvkyaxbf08lnqfdbv6lrkq02iqr3y3rwvqxm4fvnzp7mnpz"; + url = "http://beta.quicklisp.org/archive/quri/2024-10-12/quri-20241012-git.tgz"; + sha256 = "0vismgg72xrflzdsrv8ybq3cxf717k5296g9b731974vwlf7ibh0"; system = "quri-test"; asd = "quri-test"; }); @@ -59554,22 +60498,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - racer = (build-asdf-system { - pname = "racer"; - version = "20190710-git"; - asds = [ "racer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/racer/2019-07-10/racer-20190710-git.tgz"; - sha256 = "120x046c6vcrj70vb6ryf04mwbr8c6a15llb68x7h1siij8vwgvk"; - system = "racer"; - asd = "racer"; - }); - systems = [ "racer" ]; - lispLibs = [ (getAttr "aserve" self) (getAttr "deflate" self) (getAttr "flexi-streams" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); rail = (build-asdf-system { pname = "rail"; version = "20171227-git"; @@ -59650,13 +60578,29 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + random-sampling = (build-asdf-system { + pname = "random-sampling"; + version = "20241012-git"; + asds = [ "random-sampling" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/random-sampling/2024-10-12/random-sampling-20241012-git.tgz"; + sha256 = "0c5cf7k37fh8h9dhcj9bfk9zx245i806wh7qkvh1g659kvl2gamj"; + system = "random-sampling"; + asd = "random-sampling"; + }); + systems = [ "random-sampling" ]; + lispLibs = [ (getAttr "_3d-math" self) (getAttr "documentation-utils" self) (getAttr "random-state" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); random-state = (build-asdf-system { pname = "random-state"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "random-state" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/random-state/2023-10-21/random-state-20231021-git.tgz"; - sha256 = "1hr5a0xhqhajg2qgy65aiy2iwgj77fcijs4jnd7b9zj9004hj0hw"; + url = "http://beta.quicklisp.org/archive/random-state/2024-10-12/random-state-20241012-git.tgz"; + sha256 = "1iwcrn2fqvsw651wk60nm6x5hlmlvj04v8xxfxmzhqmx5f081f1g"; system = "random-state"; asd = "random-state"; }); @@ -59668,11 +60612,11 @@ in lib.makeScope pkgs.newScope (self: { }); random-state-test = (build-asdf-system { pname = "random-state-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "random-state-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/random-state/2023-10-21/random-state-20231021-git.tgz"; - sha256 = "1hr5a0xhqhajg2qgy65aiy2iwgj77fcijs4jnd7b9zj9004hj0hw"; + url = "http://beta.quicklisp.org/archive/random-state/2024-10-12/random-state-20241012-git.tgz"; + sha256 = "1iwcrn2fqvsw651wk60nm6x5hlmlvj04v8xxfxmzhqmx5f081f1g"; system = "random-state-test"; asd = "random-state-test"; }); @@ -59684,16 +60628,16 @@ in lib.makeScope pkgs.newScope (self: { }); random-state-viewer = (build-asdf-system { pname = "random-state-viewer"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "random-state-viewer" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/random-state/2023-10-21/random-state-20231021-git.tgz"; - sha256 = "1hr5a0xhqhajg2qgy65aiy2iwgj77fcijs4jnd7b9zj9004hj0hw"; + url = "http://beta.quicklisp.org/archive/random-state/2024-10-12/random-state-20241012-git.tgz"; + sha256 = "1iwcrn2fqvsw651wk60nm6x5hlmlvj04v8xxfxmzhqmx5f081f1g"; system = "random-state-viewer"; asd = "random-state-viewer"; }); systems = [ "random-state-viewer" ]; - lispLibs = [ (getAttr "qtcore" self) (getAttr "qtgui" self) (getAttr "qtools" self) (getAttr "random-state" self) ]; + lispLibs = [ (getAttr "random-state" self) (getAttr "trivial-features" self) (getAttr "zpng" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -59972,11 +60916,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks = (build-asdf-system { pname = "reblocks"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "reblocks" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks/2023-10-21/reblocks-20231021-git.tgz"; - sha256 = "1p2lr89f6b7w49210lvxgqa3kgias6r2wrd2w1g77h18rcl2pmlz"; + url = "http://beta.quicklisp.org/archive/reblocks/2024-10-12/reblocks-20241012-git.tgz"; + sha256 = "0s8npy7bh013qhm6ngvi7ar117ja2m098nr4krnzlcg2ivxdff3i"; system = "reblocks"; asd = "reblocks"; }); @@ -59988,27 +60932,27 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-auth = (build-asdf-system { pname = "reblocks-auth"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "reblocks-auth" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-auth/2023-10-21/reblocks-auth-20231021-git.tgz"; - sha256 = "0ha1dsnr55m7sp2h59z3a7vi8l2qsx9km6kry24k9za0cjdpgjvi"; + url = "http://beta.quicklisp.org/archive/reblocks-auth/2024-10-12/reblocks-auth-20241012-git.tgz"; + sha256 = "1qydbk61a5xb2a61gj8mal0bmanhzynky1rh6lzwa10r5ybls4dq"; system = "reblocks-auth"; asd = "reblocks-auth"; }); systems = [ "reblocks-auth" ]; - lispLibs = [ (getAttr "_40ants-asdf-system" self) (getAttr "alexandria" self) (getAttr "cl-strings" self) (getAttr "dexador" self) (getAttr "jonathan" self) (getAttr "local-time" self) (getAttr "log4cl" self) (getAttr "mailgun" self) (getAttr "mito" self) (getAttr "quri" self) (getAttr "reblocks" self) (getAttr "reblocks-lass" self) (getAttr "reblocks-ui" self) (getAttr "secret-values" self) (getAttr "uuid" self) ]; + lispLibs = [ (getAttr "_40ants-asdf-system" self) (getAttr "alexandria" self) (getAttr "cl-strings" self) (getAttr "dexador" self) (getAttr "jonathan" self) (getAttr "local-time" self) (getAttr "log4cl" self) (getAttr "mailgun" self) (getAttr "mito" self) (getAttr "quri" self) (getAttr "reblocks" self) (getAttr "reblocks-lass" self) (getAttr "reblocks-ui" self) (getAttr "secret-values" self) (getAttr "serapeum" self) (getAttr "uuid" self) (getAttr "yason" self) ]; meta = { hydraPlatforms = [ ]; }; }); reblocks-auth-ci = (build-asdf-system { pname = "reblocks-auth-ci"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "reblocks-auth-ci" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-auth/2023-10-21/reblocks-auth-20231021-git.tgz"; - sha256 = "0ha1dsnr55m7sp2h59z3a7vi8l2qsx9km6kry24k9za0cjdpgjvi"; + url = "http://beta.quicklisp.org/archive/reblocks-auth/2024-10-12/reblocks-auth-20241012-git.tgz"; + sha256 = "1qydbk61a5xb2a61gj8mal0bmanhzynky1rh6lzwa10r5ybls4dq"; system = "reblocks-auth-ci"; asd = "reblocks-auth-ci"; }); @@ -60018,29 +60962,13 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - reblocks-auth-docs = (build-asdf-system { - pname = "reblocks-auth-docs"; - version = "20231021-git"; - asds = [ "reblocks-auth-docs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-auth/2023-10-21/reblocks-auth-20231021-git.tgz"; - sha256 = "0ha1dsnr55m7sp2h59z3a7vi8l2qsx9km6kry24k9za0cjdpgjvi"; - system = "reblocks-auth-docs"; - asd = "reblocks-auth-docs"; - }); - systems = [ "reblocks-auth-docs" ]; - lispLibs = [ (getAttr "_40ants-doc" self) (getAttr "docs-config" self) (getAttr "named-readtables" self) (getAttr "pythonic-string-reader" self) (getAttr "reblocks-auth" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); reblocks-auth-example = (build-asdf-system { pname = "reblocks-auth-example"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "reblocks-auth-example" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-auth/2023-10-21/reblocks-auth-20231021-git.tgz"; - sha256 = "0ha1dsnr55m7sp2h59z3a7vi8l2qsx9km6kry24k9za0cjdpgjvi"; + url = "http://beta.quicklisp.org/archive/reblocks-auth/2024-10-12/reblocks-auth-20241012-git.tgz"; + sha256 = "1qydbk61a5xb2a61gj8mal0bmanhzynky1rh6lzwa10r5ybls4dq"; system = "reblocks-auth-example"; asd = "reblocks-auth-example"; }); @@ -60052,11 +60980,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-auth-tests = (build-asdf-system { pname = "reblocks-auth-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "reblocks-auth-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-auth/2023-10-21/reblocks-auth-20231021-git.tgz"; - sha256 = "0ha1dsnr55m7sp2h59z3a7vi8l2qsx9km6kry24k9za0cjdpgjvi"; + url = "http://beta.quicklisp.org/archive/reblocks-auth/2024-10-12/reblocks-auth-20241012-git.tgz"; + sha256 = "1qydbk61a5xb2a61gj8mal0bmanhzynky1rh6lzwa10r5ybls4dq"; system = "reblocks-auth-tests"; asd = "reblocks-auth-tests"; }); @@ -60068,11 +60996,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-docs = (build-asdf-system { pname = "reblocks-docs"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "reblocks-docs" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks/2023-10-21/reblocks-20231021-git.tgz"; - sha256 = "1p2lr89f6b7w49210lvxgqa3kgias6r2wrd2w1g77h18rcl2pmlz"; + url = "http://beta.quicklisp.org/archive/reblocks/2024-10-12/reblocks-20241012-git.tgz"; + sha256 = "0s8npy7bh013qhm6ngvi7ar117ja2m098nr4krnzlcg2ivxdff3i"; system = "reblocks-docs"; asd = "reblocks-docs"; }); @@ -60084,27 +61012,27 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-file-server = (build-asdf-system { pname = "reblocks-file-server"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-file-server" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-file-server/2023-06-18/reblocks-file-server-20230618-git.tgz"; - sha256 = "0qwfqas3ip8c9jc2hf6rywfl8j3zz6k0k4f6jcf6jv9i5bdzqdvm"; + url = "http://beta.quicklisp.org/archive/reblocks-file-server/2024-10-12/reblocks-file-server-20241012-git.tgz"; + sha256 = "1v17v0474k845l0s0bgly3zbgq2rjn5fyh8zmjnisszgkdd3bh13"; system = "reblocks-file-server"; asd = "reblocks-file-server"; }); systems = [ "reblocks-file-server" ]; - lispLibs = [ (getAttr "_40ants-asdf-system" self) (getAttr "cl-fad" self) (getAttr "cl-ppcre" self) (getAttr "reblocks" self) (getAttr "routes" self) (getAttr "trivial-mimes" self) ]; + lispLibs = [ (getAttr "_40ants-asdf-system" self) (getAttr "cl-fad" self) (getAttr "cl-ppcre" self) (getAttr "log4cl" self) (getAttr "reblocks" self) (getAttr "routes" self) (getAttr "trivial-mimes" self) ]; meta = { hydraPlatforms = [ ]; }; }); reblocks-file-server-ci = (build-asdf-system { pname = "reblocks-file-server-ci"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-file-server-ci" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-file-server/2023-06-18/reblocks-file-server-20230618-git.tgz"; - sha256 = "0qwfqas3ip8c9jc2hf6rywfl8j3zz6k0k4f6jcf6jv9i5bdzqdvm"; + url = "http://beta.quicklisp.org/archive/reblocks-file-server/2024-10-12/reblocks-file-server-20241012-git.tgz"; + sha256 = "1v17v0474k845l0s0bgly3zbgq2rjn5fyh8zmjnisszgkdd3bh13"; system = "reblocks-file-server-ci"; asd = "reblocks-file-server-ci"; }); @@ -60116,11 +61044,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-file-server-docs = (build-asdf-system { pname = "reblocks-file-server-docs"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-file-server-docs" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-file-server/2023-06-18/reblocks-file-server-20230618-git.tgz"; - sha256 = "0qwfqas3ip8c9jc2hf6rywfl8j3zz6k0k4f6jcf6jv9i5bdzqdvm"; + url = "http://beta.quicklisp.org/archive/reblocks-file-server/2024-10-12/reblocks-file-server-20241012-git.tgz"; + sha256 = "1v17v0474k845l0s0bgly3zbgq2rjn5fyh8zmjnisszgkdd3bh13"; system = "reblocks-file-server-docs"; asd = "reblocks-file-server-docs"; }); @@ -60132,11 +61060,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-file-server-tests = (build-asdf-system { pname = "reblocks-file-server-tests"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-file-server-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-file-server/2023-06-18/reblocks-file-server-20230618-git.tgz"; - sha256 = "0qwfqas3ip8c9jc2hf6rywfl8j3zz6k0k4f6jcf6jv9i5bdzqdvm"; + url = "http://beta.quicklisp.org/archive/reblocks-file-server/2024-10-12/reblocks-file-server-20241012-git.tgz"; + sha256 = "1v17v0474k845l0s0bgly3zbgq2rjn5fyh8zmjnisszgkdd3bh13"; system = "reblocks-file-server-tests"; asd = "reblocks-file-server-tests"; }); @@ -60148,11 +61076,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-lass = (build-asdf-system { pname = "reblocks-lass"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-lass" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-lass/2023-06-18/reblocks-lass-20230618-git.tgz"; - sha256 = "0dc7m6r1dbwrslb18d6gdscfz04s38rs62bcb4w0h9vv71x75s2m"; + url = "http://beta.quicklisp.org/archive/reblocks-lass/2024-10-12/reblocks-lass-20241012-git.tgz"; + sha256 = "0aic2dnsp4hkc26fpnn0p493psz1fip9rfhbacfwaaqyxdgrh9cl"; system = "reblocks-lass"; asd = "reblocks-lass"; }); @@ -60164,11 +61092,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-lass-ci = (build-asdf-system { pname = "reblocks-lass-ci"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-lass-ci" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-lass/2023-06-18/reblocks-lass-20230618-git.tgz"; - sha256 = "0dc7m6r1dbwrslb18d6gdscfz04s38rs62bcb4w0h9vv71x75s2m"; + url = "http://beta.quicklisp.org/archive/reblocks-lass/2024-10-12/reblocks-lass-20241012-git.tgz"; + sha256 = "0aic2dnsp4hkc26fpnn0p493psz1fip9rfhbacfwaaqyxdgrh9cl"; system = "reblocks-lass-ci"; asd = "reblocks-lass-ci"; }); @@ -60180,11 +61108,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-lass-docs = (build-asdf-system { pname = "reblocks-lass-docs"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-lass-docs" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-lass/2023-06-18/reblocks-lass-20230618-git.tgz"; - sha256 = "0dc7m6r1dbwrslb18d6gdscfz04s38rs62bcb4w0h9vv71x75s2m"; + url = "http://beta.quicklisp.org/archive/reblocks-lass/2024-10-12/reblocks-lass-20241012-git.tgz"; + sha256 = "0aic2dnsp4hkc26fpnn0p493psz1fip9rfhbacfwaaqyxdgrh9cl"; system = "reblocks-lass-docs"; asd = "reblocks-lass-docs"; }); @@ -60196,11 +61124,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-lass-tests = (build-asdf-system { pname = "reblocks-lass-tests"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-lass-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-lass/2023-06-18/reblocks-lass-20230618-git.tgz"; - sha256 = "0dc7m6r1dbwrslb18d6gdscfz04s38rs62bcb4w0h9vv71x75s2m"; + url = "http://beta.quicklisp.org/archive/reblocks-lass/2024-10-12/reblocks-lass-20241012-git.tgz"; + sha256 = "0aic2dnsp4hkc26fpnn0p493psz1fip9rfhbacfwaaqyxdgrh9cl"; system = "reblocks-lass-tests"; asd = "reblocks-lass-tests"; }); @@ -60212,27 +61140,27 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-navigation-widget = (build-asdf-system { pname = "reblocks-navigation-widget"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-navigation-widget" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2023-06-18/reblocks-navigation-widget-20230618-git.tgz"; - sha256 = "0hcfw0855rmlhjdawm8zqn24w5hkbs8xndlwvg5xd8nz6b0z40z6"; + url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2024-10-12/reblocks-navigation-widget-20241012-git.tgz"; + sha256 = "0gwfzlf8054g3iizbkbbzkxfmr8xlcvgcqycx7crlgzc8qksrqhm"; system = "reblocks-navigation-widget"; asd = "reblocks-navigation-widget"; }); systems = [ "reblocks-navigation-widget" ]; - lispLibs = [ (getAttr "_40ants-asdf-system" self) (getAttr "log4cl" self) (getAttr "reblocks" self) (getAttr "reblocks-ui" self) ]; + lispLibs = [ (getAttr "_40ants-asdf-system" self) (getAttr "log4cl" self) (getAttr "reblocks" self) (getAttr "str" self) ]; meta = { hydraPlatforms = [ ]; }; }); reblocks-navigation-widget-ci = (build-asdf-system { pname = "reblocks-navigation-widget-ci"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-navigation-widget-ci" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2023-06-18/reblocks-navigation-widget-20230618-git.tgz"; - sha256 = "0hcfw0855rmlhjdawm8zqn24w5hkbs8xndlwvg5xd8nz6b0z40z6"; + url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2024-10-12/reblocks-navigation-widget-20241012-git.tgz"; + sha256 = "0gwfzlf8054g3iizbkbbzkxfmr8xlcvgcqycx7crlgzc8qksrqhm"; system = "reblocks-navigation-widget-ci"; asd = "reblocks-navigation-widget-ci"; }); @@ -60244,11 +61172,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-navigation-widget-docs = (build-asdf-system { pname = "reblocks-navigation-widget-docs"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-navigation-widget-docs" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2023-06-18/reblocks-navigation-widget-20230618-git.tgz"; - sha256 = "0hcfw0855rmlhjdawm8zqn24w5hkbs8xndlwvg5xd8nz6b0z40z6"; + url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2024-10-12/reblocks-navigation-widget-20241012-git.tgz"; + sha256 = "0gwfzlf8054g3iizbkbbzkxfmr8xlcvgcqycx7crlgzc8qksrqhm"; system = "reblocks-navigation-widget-docs"; asd = "reblocks-navigation-widget-docs"; }); @@ -60260,11 +61188,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-navigation-widget-tests = (build-asdf-system { pname = "reblocks-navigation-widget-tests"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-navigation-widget-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2023-06-18/reblocks-navigation-widget-20230618-git.tgz"; - sha256 = "0hcfw0855rmlhjdawm8zqn24w5hkbs8xndlwvg5xd8nz6b0z40z6"; + url = "http://beta.quicklisp.org/archive/reblocks-navigation-widget/2024-10-12/reblocks-navigation-widget-20241012-git.tgz"; + sha256 = "0gwfzlf8054g3iizbkbbzkxfmr8xlcvgcqycx7crlgzc8qksrqhm"; system = "reblocks-navigation-widget-tests"; asd = "reblocks-navigation-widget-tests"; }); @@ -60276,11 +61204,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-parenscript = (build-asdf-system { pname = "reblocks-parenscript"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-parenscript" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2023-06-18/reblocks-parenscript-20230618-git.tgz"; - sha256 = "1rivsj5qq9bnhwb897r9cdg9ajlqsplvq4ipcprx6gnkqb7wydkp"; + url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2024-10-12/reblocks-parenscript-20241012-git.tgz"; + sha256 = "0c29y7k6kczzcz1fgsk0iyf93qsx4nmw3iir807zicya8dkvvpk6"; system = "reblocks-parenscript"; asd = "reblocks-parenscript"; }); @@ -60292,11 +61220,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-parenscript-ci = (build-asdf-system { pname = "reblocks-parenscript-ci"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-parenscript-ci" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2023-06-18/reblocks-parenscript-20230618-git.tgz"; - sha256 = "1rivsj5qq9bnhwb897r9cdg9ajlqsplvq4ipcprx6gnkqb7wydkp"; + url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2024-10-12/reblocks-parenscript-20241012-git.tgz"; + sha256 = "0c29y7k6kczzcz1fgsk0iyf93qsx4nmw3iir807zicya8dkvvpk6"; system = "reblocks-parenscript-ci"; asd = "reblocks-parenscript-ci"; }); @@ -60308,11 +61236,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-parenscript-docs = (build-asdf-system { pname = "reblocks-parenscript-docs"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-parenscript-docs" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2023-06-18/reblocks-parenscript-20230618-git.tgz"; - sha256 = "1rivsj5qq9bnhwb897r9cdg9ajlqsplvq4ipcprx6gnkqb7wydkp"; + url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2024-10-12/reblocks-parenscript-20241012-git.tgz"; + sha256 = "0c29y7k6kczzcz1fgsk0iyf93qsx4nmw3iir807zicya8dkvvpk6"; system = "reblocks-parenscript-docs"; asd = "reblocks-parenscript-docs"; }); @@ -60324,11 +61252,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-parenscript-tests = (build-asdf-system { pname = "reblocks-parenscript-tests"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-parenscript-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2023-06-18/reblocks-parenscript-20230618-git.tgz"; - sha256 = "1rivsj5qq9bnhwb897r9cdg9ajlqsplvq4ipcprx6gnkqb7wydkp"; + url = "http://beta.quicklisp.org/archive/reblocks-parenscript/2024-10-12/reblocks-parenscript-20241012-git.tgz"; + sha256 = "0c29y7k6kczzcz1fgsk0iyf93qsx4nmw3iir807zicya8dkvvpk6"; system = "reblocks-parenscript-tests"; asd = "reblocks-parenscript-tests"; }); @@ -60340,11 +61268,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-prometheus = (build-asdf-system { pname = "reblocks-prometheus"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "reblocks-prometheus" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2023-10-21/reblocks-prometheus-20231021-git.tgz"; - sha256 = "11gd6lsdxzz34l41v3n7dz9hzj1x3pn15bpd3hr1sr40a4f32qzm"; + url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2024-10-12/reblocks-prometheus-20241012-git.tgz"; + sha256 = "0bjzwk28csfdvnic2znil6cxk8fmh5p49n971q5pjs0dmwdzmwra"; system = "reblocks-prometheus"; asd = "reblocks-prometheus"; }); @@ -60356,11 +61284,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-prometheus-ci = (build-asdf-system { pname = "reblocks-prometheus-ci"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "reblocks-prometheus-ci" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2023-10-21/reblocks-prometheus-20231021-git.tgz"; - sha256 = "11gd6lsdxzz34l41v3n7dz9hzj1x3pn15bpd3hr1sr40a4f32qzm"; + url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2024-10-12/reblocks-prometheus-20241012-git.tgz"; + sha256 = "0bjzwk28csfdvnic2znil6cxk8fmh5p49n971q5pjs0dmwdzmwra"; system = "reblocks-prometheus-ci"; asd = "reblocks-prometheus-ci"; }); @@ -60372,11 +61300,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-prometheus-docs = (build-asdf-system { pname = "reblocks-prometheus-docs"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "reblocks-prometheus-docs" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2023-10-21/reblocks-prometheus-20231021-git.tgz"; - sha256 = "11gd6lsdxzz34l41v3n7dz9hzj1x3pn15bpd3hr1sr40a4f32qzm"; + url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2024-10-12/reblocks-prometheus-20241012-git.tgz"; + sha256 = "0bjzwk28csfdvnic2znil6cxk8fmh5p49n971q5pjs0dmwdzmwra"; system = "reblocks-prometheus-docs"; asd = "reblocks-prometheus-docs"; }); @@ -60388,11 +61316,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-prometheus-tests = (build-asdf-system { pname = "reblocks-prometheus-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "reblocks-prometheus-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2023-10-21/reblocks-prometheus-20231021-git.tgz"; - sha256 = "11gd6lsdxzz34l41v3n7dz9hzj1x3pn15bpd3hr1sr40a4f32qzm"; + url = "http://beta.quicklisp.org/archive/reblocks-prometheus/2024-10-12/reblocks-prometheus-20241012-git.tgz"; + sha256 = "0bjzwk28csfdvnic2znil6cxk8fmh5p49n971q5pjs0dmwdzmwra"; system = "reblocks-prometheus-tests"; asd = "reblocks-prometheus-tests"; }); @@ -60404,11 +61332,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-tests = (build-asdf-system { pname = "reblocks-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "reblocks-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks/2023-10-21/reblocks-20231021-git.tgz"; - sha256 = "1p2lr89f6b7w49210lvxgqa3kgias6r2wrd2w1g77h18rcl2pmlz"; + url = "http://beta.quicklisp.org/archive/reblocks/2024-10-12/reblocks-20241012-git.tgz"; + sha256 = "0s8npy7bh013qhm6ngvi7ar117ja2m098nr4krnzlcg2ivxdff3i"; system = "reblocks-tests"; asd = "reblocks-tests"; }); @@ -60420,11 +61348,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-typeahead = (build-asdf-system { pname = "reblocks-typeahead"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "reblocks-typeahead" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2023-10-21/reblocks-typeahead-20231021-git.tgz"; - sha256 = "1j8ng31gaznhhmd536ch9r1zlmlhyarzpgsvpy1nnjizkagp06ky"; + url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2024-10-12/reblocks-typeahead-20241012-git.tgz"; + sha256 = "150msgfsagpcpbgfva3hgnw3jhd3rg13g0ham9ns0lhf1lb3777m"; system = "reblocks-typeahead"; asd = "reblocks-typeahead"; }); @@ -60436,11 +61364,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-typeahead-ci = (build-asdf-system { pname = "reblocks-typeahead-ci"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "reblocks-typeahead-ci" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2023-10-21/reblocks-typeahead-20231021-git.tgz"; - sha256 = "1j8ng31gaznhhmd536ch9r1zlmlhyarzpgsvpy1nnjizkagp06ky"; + url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2024-10-12/reblocks-typeahead-20241012-git.tgz"; + sha256 = "150msgfsagpcpbgfva3hgnw3jhd3rg13g0ham9ns0lhf1lb3777m"; system = "reblocks-typeahead-ci"; asd = "reblocks-typeahead-ci"; }); @@ -60452,11 +61380,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-typeahead-docs = (build-asdf-system { pname = "reblocks-typeahead-docs"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "reblocks-typeahead-docs" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2023-10-21/reblocks-typeahead-20231021-git.tgz"; - sha256 = "1j8ng31gaznhhmd536ch9r1zlmlhyarzpgsvpy1nnjizkagp06ky"; + url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2024-10-12/reblocks-typeahead-20241012-git.tgz"; + sha256 = "150msgfsagpcpbgfva3hgnw3jhd3rg13g0ham9ns0lhf1lb3777m"; system = "reblocks-typeahead-docs"; asd = "reblocks-typeahead-docs"; }); @@ -60468,11 +61396,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-typeahead-example = (build-asdf-system { pname = "reblocks-typeahead-example"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "reblocks-typeahead-example" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2023-10-21/reblocks-typeahead-20231021-git.tgz"; - sha256 = "1j8ng31gaznhhmd536ch9r1zlmlhyarzpgsvpy1nnjizkagp06ky"; + url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2024-10-12/reblocks-typeahead-20241012-git.tgz"; + sha256 = "150msgfsagpcpbgfva3hgnw3jhd3rg13g0ham9ns0lhf1lb3777m"; system = "reblocks-typeahead-example"; asd = "reblocks-typeahead-example"; }); @@ -60484,11 +61412,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-typeahead-tests = (build-asdf-system { pname = "reblocks-typeahead-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "reblocks-typeahead-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2023-10-21/reblocks-typeahead-20231021-git.tgz"; - sha256 = "1j8ng31gaznhhmd536ch9r1zlmlhyarzpgsvpy1nnjizkagp06ky"; + url = "http://beta.quicklisp.org/archive/reblocks-typeahead/2024-10-12/reblocks-typeahead-20241012-git.tgz"; + sha256 = "150msgfsagpcpbgfva3hgnw3jhd3rg13g0ham9ns0lhf1lb3777m"; system = "reblocks-typeahead-tests"; asd = "reblocks-typeahead-tests"; }); @@ -60500,27 +61428,27 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-ui = (build-asdf-system { pname = "reblocks-ui"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-ui" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-ui/2023-06-18/reblocks-ui-20230618-git.tgz"; - sha256 = "0c67xjnq0lccc4y1pkpf0ndhlqcrvm1g637p4z3d1r79la36wq4y"; + url = "http://beta.quicklisp.org/archive/reblocks-ui/2024-10-12/reblocks-ui-20241012-git.tgz"; + sha256 = "1iwq62ba0rsiqw34d681nzg88wzps1f3d1ahl99crrk9xpy1c3y5"; system = "reblocks-ui"; asd = "reblocks-ui"; }); systems = [ "reblocks-ui" ]; - lispLibs = [ (getAttr "_40ants-doc" self) (getAttr "log4cl" self) (getAttr "log4cl-extras" self) (getAttr "parenscript" self) (getAttr "quri" self) (getAttr "reblocks" self) (getAttr "reblocks-parenscript" self) ]; + lispLibs = [ (getAttr "_40ants-doc" self) (getAttr "log4cl" self) (getAttr "log4cl-extras" self) (getAttr "parenscript" self) (getAttr "quri" self) (getAttr "reblocks" self) (getAttr "reblocks-parenscript" self) (getAttr "serapeum" self) (getAttr "spinneret" self) ]; meta = { hydraPlatforms = [ ]; }; }); reblocks-ui-docs = (build-asdf-system { pname = "reblocks-ui-docs"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-ui-docs" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-ui/2023-06-18/reblocks-ui-20230618-git.tgz"; - sha256 = "0c67xjnq0lccc4y1pkpf0ndhlqcrvm1g637p4z3d1r79la36wq4y"; + url = "http://beta.quicklisp.org/archive/reblocks-ui/2024-10-12/reblocks-ui-20241012-git.tgz"; + sha256 = "1iwq62ba0rsiqw34d681nzg88wzps1f3d1ahl99crrk9xpy1c3y5"; system = "reblocks-ui-docs"; asd = "reblocks-ui-docs"; }); @@ -60532,11 +61460,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-ui-examples = (build-asdf-system { pname = "reblocks-ui-examples"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-ui-examples" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-ui/2023-06-18/reblocks-ui-20230618-git.tgz"; - sha256 = "0c67xjnq0lccc4y1pkpf0ndhlqcrvm1g637p4z3d1r79la36wq4y"; + url = "http://beta.quicklisp.org/archive/reblocks-ui/2024-10-12/reblocks-ui-20241012-git.tgz"; + sha256 = "1iwq62ba0rsiqw34d681nzg88wzps1f3d1ahl99crrk9xpy1c3y5"; system = "reblocks-ui-examples"; asd = "reblocks-ui-examples"; }); @@ -60548,11 +61476,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-websocket = (build-asdf-system { pname = "reblocks-websocket"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-websocket" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-websocket/2023-06-18/reblocks-websocket-20230618-git.tgz"; - sha256 = "1nh1mskyqy5y1ar84vy7qwjqgxv8ykxg1jdlrhh0r2khal2az4cj"; + url = "http://beta.quicklisp.org/archive/reblocks-websocket/2024-10-12/reblocks-websocket-20241012-git.tgz"; + sha256 = "0zn14if637cfadz93cgyk79hqrjyzddwc483gl10386rj9nvcf6b"; system = "reblocks-websocket"; asd = "reblocks-websocket"; }); @@ -60564,11 +61492,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-websocket-ci = (build-asdf-system { pname = "reblocks-websocket-ci"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-websocket-ci" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-websocket/2023-06-18/reblocks-websocket-20230618-git.tgz"; - sha256 = "1nh1mskyqy5y1ar84vy7qwjqgxv8ykxg1jdlrhh0r2khal2az4cj"; + url = "http://beta.quicklisp.org/archive/reblocks-websocket/2024-10-12/reblocks-websocket-20241012-git.tgz"; + sha256 = "0zn14if637cfadz93cgyk79hqrjyzddwc483gl10386rj9nvcf6b"; system = "reblocks-websocket-ci"; asd = "reblocks-websocket-ci"; }); @@ -60580,11 +61508,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-websocket-docs = (build-asdf-system { pname = "reblocks-websocket-docs"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-websocket-docs" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-websocket/2023-06-18/reblocks-websocket-20230618-git.tgz"; - sha256 = "1nh1mskyqy5y1ar84vy7qwjqgxv8ykxg1jdlrhh0r2khal2az4cj"; + url = "http://beta.quicklisp.org/archive/reblocks-websocket/2024-10-12/reblocks-websocket-20241012-git.tgz"; + sha256 = "0zn14if637cfadz93cgyk79hqrjyzddwc483gl10386rj9nvcf6b"; system = "reblocks-websocket-docs"; asd = "reblocks-websocket-docs"; }); @@ -60596,11 +61524,11 @@ in lib.makeScope pkgs.newScope (self: { }); reblocks-websocket-tests = (build-asdf-system { pname = "reblocks-websocket-tests"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "reblocks-websocket-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/reblocks-websocket/2023-06-18/reblocks-websocket-20230618-git.tgz"; - sha256 = "1nh1mskyqy5y1ar84vy7qwjqgxv8ykxg1jdlrhh0r2khal2az4cj"; + url = "http://beta.quicklisp.org/archive/reblocks-websocket/2024-10-12/reblocks-websocket-20241012-git.tgz"; + sha256 = "0zn14if637cfadz93cgyk79hqrjyzddwc483gl10386rj9nvcf6b"; system = "reblocks-websocket-tests"; asd = "reblocks-websocket-tests"; }); @@ -61202,11 +62130,11 @@ in lib.makeScope pkgs.newScope (self: { }); rove = (build-asdf-system { pname = "rove"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "rove" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/rove/2023-10-21/rove-20231021-git.tgz"; - sha256 = "04wc8f8y6pb99n1gpdgmrz61wnl18yidiwdbaaws2087lbm67skj"; + url = "http://beta.quicklisp.org/archive/rove/2024-10-12/rove-20241012-git.tgz"; + sha256 = "1cx55d8frlk8rzdwbf1698rsvy34gx0ws2ix257qsh7gxy2mld05"; system = "rove"; asd = "rove"; }); @@ -61216,11 +62144,11 @@ in lib.makeScope pkgs.newScope (self: { }); rovers-problem-translator = (build-asdf-system { pname = "rovers-problem-translator"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "rovers-problem-translator" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/shop3/2023-10-21/shop3-20231021-git.tgz"; - sha256 = "13d3735pw6qpsz66g9p8b8fhhd1givc72jypdglbm99bs0sjcdas"; + url = "http://beta.quicklisp.org/archive/shop3/2024-10-12/shop3-20241012-git.tgz"; + sha256 = "1sdyyyd82fqmm9lcqmg7k8yy3l3891m2gjwidibzvk95bp4xf9sd"; system = "rovers-problem-translator"; asd = "rovers-problem-translator"; }); @@ -61422,6 +62350,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + rs-dlx = (build-asdf-system { + pname = "rs-dlx"; + version = "20241012-git"; + asds = [ "rs-dlx" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/rs-dlx/2024-10-12/rs-dlx-20241012-git.tgz"; + sha256 = "003ykkh61hg5q9lxjckqp8njhpgg21j9008gcsw60hnxdipmanaf"; + system = "rs-dlx"; + asd = "rs-dlx"; + }); + systems = [ "rs-dlx" ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "iterate" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); rs-json = (build-asdf-system { pname = "rs-json"; version = "20230618-git"; @@ -61710,11 +62654,11 @@ in lib.makeScope pkgs.newScope (self: { }); s-dot2 = (build-asdf-system { pname = "s-dot2"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "s-dot2" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/s-dot2/2023-10-21/s-dot2-20231021-git.tgz"; - sha256 = "0948fi6kwr9d1bnpmxz76ic929plpm56c2qx6r504jxk62gnfwa9"; + url = "http://beta.quicklisp.org/archive/s-dot2/2024-10-12/s-dot2-20241012-git.tgz"; + sha256 = "0zc833sc7szwyrrcinl84q3b0y9akh7hd5lhq3vxclk4zgb9n4nf"; system = "s-dot2"; asd = "s-dot2"; }); @@ -61774,11 +62718,11 @@ in lib.makeScope pkgs.newScope (self: { }); s-sql = (build-asdf-system { pname = "s-sql"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "s-sql" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/postmodern/2023-10-21/postmodern-20231021-git.tgz"; - sha256 = "1abb80zmnawzl9g09css57kviwbqw5fcxhp3fjrzw7zc3n1wfr8y"; + url = "http://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz"; + sha256 = "1hj0dpclzihy1rcnwhiv16abmaa54wygxyib3j2h9q4qs26w7pzb"; system = "s-sql"; asd = "s-sql"; }); @@ -61942,11 +62886,11 @@ in lib.makeScope pkgs.newScope (self: { }); sandalphon_dot_lambda-list = (build-asdf-system { pname = "sandalphon.lambda-list"; - version = "20180711-git"; + version = "20241012-git"; asds = [ "sandalphon.lambda-list" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/sandalphon.lambda-list/2018-07-11/sandalphon.lambda-list-20180711-git.tgz"; - sha256 = "1iihs05cwy4xyms2vl3fjc9xpivyxb2mpmb60nylxrkvlm0l7v7h"; + url = "http://beta.quicklisp.org/archive/sandalphon.lambda-list/2024-10-12/sandalphon.lambda-list-20241012-git.tgz"; + sha256 = "1j4xfcb1n71kh95v0y495snkna5avdp0inbiaia7r5fsxlcf4s45"; system = "sandalphon.lambda-list"; asd = "sandalphon.lambda-list"; }); @@ -62038,11 +62982,11 @@ in lib.makeScope pkgs.newScope (self: { }); sb-fastcgi = (build-asdf-system { pname = "sb-fastcgi"; - version = "20210124-git"; + version = "20241012-git"; asds = [ "sb-fastcgi" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/sb-fastcgi/2021-01-24/sb-fastcgi-20210124-git.tgz"; - sha256 = "15arl39xq0wp9marrgf36grv7z5w2z4zaigllypx96b3kbmw6qb5"; + url = "http://beta.quicklisp.org/archive/sb-fastcgi/2024-10-12/sb-fastcgi-20241012-git.tgz"; + sha256 = "1jw5bmim4ll3a1bqlw02ksgw58cv1qr5li0gbczj7g9fjfk3r64z"; system = "sb-fastcgi"; asd = "sb-fastcgi"; }); @@ -62070,11 +63014,11 @@ in lib.makeScope pkgs.newScope (self: { }); sc-extensions = (build-asdf-system { pname = "sc-extensions"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "sc-extensions" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/sc-extensions/2023-10-21/sc-extensions-20231021-git.tgz"; - sha256 = "1hskfsfwym4h1l398v2ia8jqs4r6qi8f4sn4aynikcw4xj75qys9"; + url = "http://beta.quicklisp.org/archive/sc-extensions/2024-10-12/sc-extensions-20241012-git.tgz"; + sha256 = "1va153gr7002j5hshalq13gk6jpij29h613nm47aimj01hjy9p0n"; system = "sc-extensions"; asd = "sc-extensions"; }); @@ -62086,11 +63030,11 @@ in lib.makeScope pkgs.newScope (self: { }); sc-osc = (build-asdf-system { pname = "sc-osc"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "sc-osc" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-collider/2023-10-21/cl-collider-20231021-git.tgz"; - sha256 = "1fbqic0w27b5al8vm6zvgfhsq6yjl2zl4ppjmxvyx6pl0i0bm281"; + url = "http://beta.quicklisp.org/archive/cl-collider/2024-10-12/cl-collider-20241012-git.tgz"; + sha256 = "0h0fyx7glxnzwyam2aflma6003h8fcvcf5nj5f7svarw9brcc2xa"; system = "sc-osc"; asd = "sc-osc"; }); @@ -62137,7 +63081,7 @@ in lib.makeScope pkgs.newScope (self: { version = "master-df14cb8c-git"; asds = [ "science-data" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/antik/2019-10-08/antik-master-df14cb8c-git.tgz"; + url = "http://beta.quicklisp.org/archive/antik/2024-10-12/antik-master-df14cb8c-git.tgz"; sha256 = "1n08cx4n51z8v4bxyak166lp495xda3x7llfxcdpxndxqxcammr0"; system = "science-data"; asd = "science-data"; @@ -62150,11 +63094,11 @@ in lib.makeScope pkgs.newScope (self: { }); scigraph = (build-asdf-system { pname = "scigraph"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "scigraph" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "scigraph"; asd = "scigraph"; }); @@ -62164,6 +63108,70 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + scrapycl = (build-asdf-system { + pname = "scrapycl"; + version = "20241012-git"; + asds = [ "scrapycl" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/scrapycl/2024-10-12/scrapycl-20241012-git.tgz"; + sha256 = "0qlvsc5qr8vyyrsasp041ydlfx8vgsy191m0nhab487fzmrlbzwp"; + system = "scrapycl"; + asd = "scrapycl"; + }); + systems = [ "scrapycl" ]; + lispLibs = [ (getAttr "_40ants-asdf-system" self) (getAttr "_40ants-doc" self) (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "closer-mop" self) (getAttr "dexador" self) (getAttr "log4cl" self) (getAttr "log4cl-extras" self) (getAttr "lquery" self) (getAttr "plump" self) (getAttr "quri" self) (getAttr "serapeum" self) (getAttr "spinneret" self) (getAttr "str" self) (getAttr "yason" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + scrapycl-ci = (build-asdf-system { + pname = "scrapycl-ci"; + version = "20241012-git"; + asds = [ "scrapycl-ci" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/scrapycl/2024-10-12/scrapycl-20241012-git.tgz"; + sha256 = "0qlvsc5qr8vyyrsasp041ydlfx8vgsy191m0nhab487fzmrlbzwp"; + system = "scrapycl-ci"; + asd = "scrapycl-ci"; + }); + systems = [ "scrapycl-ci" ]; + lispLibs = [ (getAttr "_40ants-ci" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + scrapycl-docs = (build-asdf-system { + pname = "scrapycl-docs"; + version = "20241012-git"; + asds = [ "scrapycl-docs" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/scrapycl/2024-10-12/scrapycl-20241012-git.tgz"; + sha256 = "0qlvsc5qr8vyyrsasp041ydlfx8vgsy191m0nhab487fzmrlbzwp"; + system = "scrapycl-docs"; + asd = "scrapycl-docs"; + }); + systems = [ "scrapycl-docs" ]; + lispLibs = [ (getAttr "_40ants-doc" self) (getAttr "docs-config" self) (getAttr "named-readtables" self) (getAttr "pythonic-string-reader" self) (getAttr "scrapycl" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + scrapycl-tests = (build-asdf-system { + pname = "scrapycl-tests"; + version = "20241012-git"; + asds = [ "scrapycl-tests" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/scrapycl/2024-10-12/scrapycl-20241012-git.tgz"; + sha256 = "0qlvsc5qr8vyyrsasp041ydlfx8vgsy191m0nhab487fzmrlbzwp"; + system = "scrapycl-tests"; + asd = "scrapycl-tests"; + }); + systems = [ "scrapycl-tests" ]; + lispLibs = [ (getAttr "rove" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); scratch-buffer = (build-asdf-system { pname = "scratch-buffer"; version = "20200427-git"; @@ -62374,11 +63382,11 @@ in lib.makeScope pkgs.newScope (self: { }); sdl2-image = (build-asdf-system { pname = "sdl2-image"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "sdl2-image" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sdl2-image/2023-10-21/cl-sdl2-image-20231021-git.tgz"; - sha256 = "0327l8qhgk79bg6lf4n4jp18z1q39apy8s5i10hnpb3j4yjs8i7y"; + url = "http://beta.quicklisp.org/archive/cl-sdl2-image/2024-10-12/cl-sdl2-image-20241012-git.tgz"; + sha256 = "1jzrz3ppr5nbh0w6cvbbpv5x6gdq71a6v2qanvnjvcjs0zwf97iq"; system = "sdl2-image"; asd = "sdl2-image"; }); @@ -62390,11 +63398,11 @@ in lib.makeScope pkgs.newScope (self: { }); sdl2-mixer = (build-asdf-system { pname = "sdl2-mixer"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "sdl2-mixer" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sdl2-mixer/2021-10-20/cl-sdl2-mixer-20211020-git.tgz"; - sha256 = "0g6ywb3gqr0rif4z6kkz6m8vyv8nrr5wr1w9sc6d3zypbbnqgbp6"; + url = "http://beta.quicklisp.org/archive/cl-sdl2-mixer/2024-10-12/cl-sdl2-mixer-20241012-git.tgz"; + sha256 = "0d33pmyrcni90qfj0d4hxf97may1bv7i9z4a6rj02dw254n9r9lh"; system = "sdl2-mixer"; asd = "sdl2-mixer"; }); @@ -62406,11 +63414,11 @@ in lib.makeScope pkgs.newScope (self: { }); sdl2-ttf = (build-asdf-system { pname = "sdl2-ttf"; - version = "20200925-git"; + version = "20241012-git"; asds = [ "sdl2-ttf" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sdl2-ttf/2020-09-25/cl-sdl2-ttf-20200925-git.tgz"; - sha256 = "15mvb7hr5l284s56gbf1xyb9v5xv95b2043zaysswhn5x20ylcnb"; + url = "http://beta.quicklisp.org/archive/cl-sdl2-ttf/2024-10-12/cl-sdl2-ttf-20241012-git.tgz"; + sha256 = "1asdymsn65a06qr1c8fknakdvpjwxsvl69py6fsz21nirxyha5nc"; system = "sdl2-ttf"; asd = "sdl2-ttf"; }); @@ -62422,11 +63430,11 @@ in lib.makeScope pkgs.newScope (self: { }); sdl2-ttf-examples = (build-asdf-system { pname = "sdl2-ttf-examples"; - version = "20200925-git"; + version = "20241012-git"; asds = [ "sdl2-ttf-examples" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sdl2-ttf/2020-09-25/cl-sdl2-ttf-20200925-git.tgz"; - sha256 = "15mvb7hr5l284s56gbf1xyb9v5xv95b2043zaysswhn5x20ylcnb"; + url = "http://beta.quicklisp.org/archive/cl-sdl2-ttf/2024-10-12/cl-sdl2-ttf-20241012-git.tgz"; + sha256 = "1asdymsn65a06qr1c8fknakdvpjwxsvl69py6fsz21nirxyha5nc"; system = "sdl2-ttf-examples"; asd = "sdl2-ttf-examples"; }); @@ -62550,16 +63558,16 @@ in lib.makeScope pkgs.newScope (self: { }); select = (build-asdf-system { pname = "select"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "select" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/select/2022-11-06/select-20221106-git.tgz"; - sha256 = "0bhpvfqp7n33pia4y62qi31bx86gjl2nxjy529rfawac57c9rxv3"; + url = "http://beta.quicklisp.org/archive/select/2024-10-12/select-20241012-git.tgz"; + sha256 = "1js02xgfd488lhv90rgxw0cvfbsarlpakydwrg1jr2hh5bhqyifh"; system = "select"; asd = "select"; }); systems = [ "select" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "anaphora" self) (getAttr "let-plus" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "alexandria_plus" self) (getAttr "anaphora" self) (getAttr "let-plus" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -62614,11 +63622,11 @@ in lib.makeScope pkgs.newScope (self: { }); semz_dot_decompress = (build-asdf-system { pname = "semz.decompress"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "semz.decompress" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/decompress/2023-10-21/decompress-20231021-git.tgz"; - sha256 = "1p72m70qcl245gb420a6hr37s9qc3sdj6v3aqi3sj6v4qgdw733z"; + url = "http://beta.quicklisp.org/archive/decompress/2024-10-12/decompress-20241012-git.tgz"; + sha256 = "0nzz6r57v94kyl5r77yawalnjszw93qjiqqargl3vjrmiga37gjp"; system = "semz.decompress"; asd = "semz.decompress"; }); @@ -62630,59 +63638,59 @@ in lib.makeScope pkgs.newScope (self: { }); sendgrid = (build-asdf-system { pname = "sendgrid"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "sendgrid" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sendgrid/2023-10-21/cl-sendgrid-20231021-git.tgz"; - sha256 = "1i90smwdw3wmq49qmxzkxvxybi18c222r79xzbhp9qp4isg4aznm"; + url = "http://beta.quicklisp.org/archive/cl-sendgrid/2024-10-12/cl-sendgrid-20241012-git.tgz"; + sha256 = "02wwi2fwfd21aisf1y6ngypg7dmfvlf3bgxhqhrp1vpw8b34ha4w"; system = "sendgrid"; asd = "sendgrid"; }); systems = [ "sendgrid" ]; - lispLibs = [ (getAttr "dexador" self) (getAttr "jonathan" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "dexador" self) (getAttr "jonathan" self) (getAttr "qbase64" self) ]; meta = { hydraPlatforms = [ ]; }; }); sento = (build-asdf-system { pname = "sento"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "sento" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gserver/2023-10-21/cl-gserver-20231021-git.tgz"; - sha256 = "05zfa33y93qimnp1i7kamg3yj4msfp8fdhgh0waz3ll5k7v1g0fj"; + url = "http://beta.quicklisp.org/archive/cl-gserver/2024-10-12/cl-gserver-20241012-git.tgz"; + sha256 = "1281iir75ccr5ilh2jv9xh1w446492gywvady48xggqyh6idaz9k"; system = "sento"; asd = "sento"; }); systems = [ "sento" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "atomics" self) (getAttr "binding-arrows" self) (getAttr "blackbird" self) (getAttr "bordeaux-threads" self) (getAttr "jpl-queues" self) (getAttr "log4cl" self) (getAttr "str" self) (getAttr "timer-wheel" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "atomics" self) (getAttr "binding-arrows" self) (getAttr "blackbird" self) (getAttr "bordeaux-threads" self) (getAttr "cl-speedy-queue" self) (getAttr "local-time-duration" self) (getAttr "log4cl" self) (getAttr "str" self) (getAttr "timer-wheel" self) ]; meta = { hydraPlatforms = [ ]; }; }); sentry-client = (build-asdf-system { pname = "sentry-client"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "sentry-client" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sentry-client/2023-06-18/cl-sentry-client-20230618-git.tgz"; - sha256 = "1n9byyrag4f6ah1lxhv7r0v6z1p5mpiw656m5pdis9ps9nw7a6ar"; + url = "http://beta.quicklisp.org/archive/cl-sentry-client/2024-10-12/cl-sentry-client-20241012-git.tgz"; + sha256 = "0i83kgrjznffj6z5ryxnxlk995937askhilsbfa2nixakwal2c5h"; system = "sentry-client"; asd = "sentry-client"; }); systems = [ "sentry-client" ]; - lispLibs = [ (getAttr "babel" self) (getAttr "cl-json" self) (getAttr "cl-ppcre" self) (getAttr "dexador" self) (getAttr "local-time" self) (getAttr "salza2" self) (getAttr "swank" self) (getAttr "trivial-backtrace" self) (getAttr "uuid" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "babel" self) (getAttr "cl-json" self) (getAttr "cl-ppcre" self) (getAttr "dexador" self) (getAttr "local-time" self) (getAttr "salza2" self) (getAttr "swank" self) (getAttr "trivial-backtrace" self) (getAttr "uuid" self) ]; meta = { hydraPlatforms = [ ]; }; }); sentry-client_dot_async = (build-asdf-system { pname = "sentry-client.async"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "sentry-client.async" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sentry-client/2023-06-18/cl-sentry-client-20230618-git.tgz"; - sha256 = "1n9byyrag4f6ah1lxhv7r0v6z1p5mpiw656m5pdis9ps9nw7a6ar"; + url = "http://beta.quicklisp.org/archive/cl-sentry-client/2024-10-12/cl-sentry-client-20241012-git.tgz"; + sha256 = "0i83kgrjznffj6z5ryxnxlk995937askhilsbfa2nixakwal2c5h"; system = "sentry-client.async"; asd = "sentry-client.async"; }); @@ -62694,11 +63702,11 @@ in lib.makeScope pkgs.newScope (self: { }); sentry-client_dot_hunchentoot = (build-asdf-system { pname = "sentry-client.hunchentoot"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "sentry-client.hunchentoot" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sentry-client/2023-06-18/cl-sentry-client-20230618-git.tgz"; - sha256 = "1n9byyrag4f6ah1lxhv7r0v6z1p5mpiw656m5pdis9ps9nw7a6ar"; + url = "http://beta.quicklisp.org/archive/cl-sentry-client/2024-10-12/cl-sentry-client-20241012-git.tgz"; + sha256 = "0i83kgrjznffj6z5ryxnxlk995937askhilsbfa2nixakwal2c5h"; system = "sentry-client.hunchentoot"; asd = "sentry-client.hunchentoot"; }); @@ -62742,11 +63750,11 @@ in lib.makeScope pkgs.newScope (self: { }); serapeum = (build-asdf-system { pname = "serapeum"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "serapeum" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/serapeum/2023-10-21/serapeum-20231021-git.tgz"; - sha256 = "0jbvkxznx7b3nd7apw89lbhhp659a0agj7ibjcqckyqs7pn29s3r"; + url = "http://beta.quicklisp.org/archive/serapeum/2024-10-12/serapeum-20241012-git.tgz"; + sha256 = "12dc4p3i82p3jhxpp5wd6xiwy2fgdjybgfgj54nv8ya75rl9a64z"; system = "serapeum"; asd = "serapeum"; }); @@ -62980,11 +63988,11 @@ in lib.makeScope pkgs.newScope (self: { }); shasht = (build-asdf-system { pname = "shasht"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "shasht" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/shasht/2023-10-21/shasht-20231021-git.tgz"; - sha256 = "1y7qh8kdhk06243vkmxzdk0y9rax4g8pv28bd01j48ix777mpcdc"; + url = "http://beta.quicklisp.org/archive/shasht/2024-10-12/shasht-20241012-git.tgz"; + sha256 = "0i4k6w5r74f2a0i3ffian715v057w63psywk89ih0hl9xxpc4pga"; system = "shasht"; asd = "shasht"; }); @@ -63092,27 +64100,27 @@ in lib.makeScope pkgs.newScope (self: { }); shop3 = (build-asdf-system { pname = "shop3"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "shop3" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/shop3/2023-10-21/shop3-20231021-git.tgz"; - sha256 = "13d3735pw6qpsz66g9p8b8fhhd1givc72jypdglbm99bs0sjcdas"; + url = "http://beta.quicklisp.org/archive/shop3/2024-10-12/shop3-20241012-git.tgz"; + sha256 = "1sdyyyd82fqmm9lcqmg7k8yy3l3891m2gjwidibzvk95bp4xf9sd"; system = "shop3"; asd = "shop3"; }); systems = [ "shop3" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "fiveam-asdf" self) (getAttr "iterate" self) (getAttr "trivial-garbage" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "fiveam-asdf" self) (getAttr "iterate" self) (getAttr "random-state" self) (getAttr "trivial-garbage" self) ]; meta = { hydraPlatforms = [ ]; }; }); shop3-thmpr-api = (build-asdf-system { pname = "shop3-thmpr-api"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "shop3-thmpr-api" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/shop3/2023-10-21/shop3-20231021-git.tgz"; - sha256 = "13d3735pw6qpsz66g9p8b8fhhd1givc72jypdglbm99bs0sjcdas"; + url = "http://beta.quicklisp.org/archive/shop3/2024-10-12/shop3-20241012-git.tgz"; + sha256 = "1sdyyyd82fqmm9lcqmg7k8yy3l3891m2gjwidibzvk95bp4xf9sd"; system = "shop3-thmpr-api"; asd = "shop3-thmpr-api"; }); @@ -63156,11 +64164,11 @@ in lib.makeScope pkgs.newScope (self: { }); si-kanren = (build-asdf-system { pname = "si-kanren"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "si-kanren" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/si-kanren/2023-10-21/si-kanren-20231021-git.tgz"; - sha256 = "0gzi871iap5hma4c3v7lpb4vcrj72sbr5bmc1xzslhxdmb1r26pq"; + url = "http://beta.quicklisp.org/archive/si-kanren/2024-10-12/si-kanren-20241012-git.tgz"; + sha256 = "1m99ryyfjxbjbmswprz8gr9hl3srwz74fwjna35wf8d41ns5ajlj"; system = "si-kanren"; asd = "si-kanren"; }); @@ -63252,11 +64260,11 @@ in lib.makeScope pkgs.newScope (self: { }); simple-date = (build-asdf-system { pname = "simple-date"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "simple-date" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/postmodern/2023-10-21/postmodern-20231021-git.tgz"; - sha256 = "1abb80zmnawzl9g09css57kviwbqw5fcxhp3fjrzw7zc3n1wfr8y"; + url = "http://beta.quicklisp.org/archive/postmodern/2024-10-12/postmodern-20241012-git.tgz"; + sha256 = "1hj0dpclzihy1rcnwhiv16abmaa54wygxyib3j2h9q4qs26w7pzb"; system = "simple-date"; asd = "simple-date"; }); @@ -63626,22 +64634,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - skeleton = (build-asdf-system { - pname = "skeleton"; - version = "20230214-git"; - asds = [ "skeleton" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ahungry-fleece/2023-02-14/ahungry-fleece-20230214-git.tgz"; - sha256 = "1q0bd4fhfypfdvv338gf0gbc8fh65m0p662ik7c9rraijgddi9ry"; - system = "skeleton"; - asd = "skeleton"; - }); - systems = [ "skeleton" ]; - lispLibs = [ (getAttr "ahungry-fleece" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); skeleton-creator = (build-asdf-system { pname = "skeleton-creator"; version = "20191227-git"; @@ -63660,27 +64652,27 @@ in lib.makeScope pkgs.newScope (self: { }); sketch = (build-asdf-system { pname = "sketch"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "sketch" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/sketch/2023-10-21/sketch-20231021-git.tgz"; - sha256 = "0qpdwpgk1x10isp125ci1pdfcnlix8wygvfjd7fxwjg41lw8wqp4"; + url = "http://beta.quicklisp.org/archive/sketch/2024-10-12/sketch-20241012-git.tgz"; + sha256 = "1bq0ljb2awzkk4shsd0w4v2hc2abmkwfv7nz8d88hglrvar8qbnl"; system = "sketch"; asd = "sketch"; }); systems = [ "sketch" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-geometry" self) (getAttr "glkit" self) (getAttr "mathkit" self) (getAttr "md5" self) (getAttr "sdl2-image" self) (getAttr "sdl2-ttf" self) (getAttr "sdl2kit" self) (getAttr "split-sequence" self) (getAttr "static-vectors" self) (getAttr "zpng" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-plus-c" self) (getAttr "closer-mop" self) (getAttr "glkit" self) (getAttr "glu-tessellate" self) (getAttr "mathkit" self) (getAttr "md5" self) (getAttr "sdl2" self) (getAttr "sdl2-image" self) (getAttr "sdl2-ttf" self) (getAttr "sdl2kit" self) (getAttr "split-sequence" self) (getAttr "static-vectors" self) (getAttr "trivial-garbage" self) (getAttr "zpng" self) ]; meta = { hydraPlatforms = [ ]; }; }); sketch-examples = (build-asdf-system { pname = "sketch-examples"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "sketch-examples" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/sketch/2023-10-21/sketch-20231021-git.tgz"; - sha256 = "0qpdwpgk1x10isp125ci1pdfcnlix8wygvfjd7fxwjg41lw8wqp4"; + url = "http://beta.quicklisp.org/archive/sketch/2024-10-12/sketch-20241012-git.tgz"; + sha256 = "1bq0ljb2awzkk4shsd0w4v2hc2abmkwfv7nz8d88hglrvar8qbnl"; system = "sketch-examples"; asd = "sketch-examples"; }); @@ -63804,11 +64796,11 @@ in lib.makeScope pkgs.newScope (self: { }); slim = (build-asdf-system { pname = "slim"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "slim" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2023-10-21/mcclim-20231021-git.tgz"; - sha256 = "09f1067v5bc2zmqj1khslrwi76a9xdkpzh7wx9yrvx7y126ikxlm"; + url = "http://beta.quicklisp.org/archive/mcclim/2024-10-12/mcclim-20241012-git.tgz"; + sha256 = "17chywrma5vhq254spmg1idpk1sq8isk1qj0lga9n8aiybqssxv9"; system = "slim"; asd = "slim"; }); @@ -63820,11 +64812,11 @@ in lib.makeScope pkgs.newScope (self: { }); slite = (build-asdf-system { pname = "slite"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "slite" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/slite/2023-10-21/slite-20231021-git.tgz"; - sha256 = "0b4c4vs1zlhcvr9flv8bx76v9hrwc9qmazmp60407q7cghn0k8zk"; + url = "http://beta.quicklisp.org/archive/slite/2024-10-12/slite-20241012-git.tgz"; + sha256 = "1ij1qxp20p7zfxm453v42z27ff3z6lk7hly8knk5fj3awj9nvljd"; system = "slite"; asd = "slite"; }); @@ -63884,11 +64876,11 @@ in lib.makeScope pkgs.newScope (self: { }); slynk = (build-asdf-system { pname = "slynk"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "slynk" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/sly/2023-10-21/sly-20231021-git.tgz"; - sha256 = "15nyr02ykkws4q79jcmxcawddg8sgq9v5l8k7jv7gg3hnpzxjlb2"; + url = "http://beta.quicklisp.org/archive/sly/2024-10-12/sly-20241012-git.tgz"; + sha256 = "1mxkcgh7g76mqn148zm2mhsh09whwh89wldlyfhq0d9h96zch451"; system = "slynk"; asd = "slynk"; }); @@ -63960,6 +64952,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + small-coalton-programs = (build-asdf-system { + pname = "small-coalton-programs"; + version = "20241012-git"; + asds = [ "small-coalton-programs" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz"; + sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7"; + system = "small-coalton-programs"; + asd = "small-coalton-programs"; + }); + systems = [ "small-coalton-programs" ]; + lispLibs = [ (getAttr "coalton" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); smart-buffer = (build-asdf-system { pname = "smart-buffer"; version = "20211020-git"; @@ -64006,6 +65014,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + smoothers = (build-asdf-system { + pname = "smoothers"; + version = "20241012-git"; + asds = [ "smoothers" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/smoothers/2024-10-12/smoothers-20241012-git.tgz"; + sha256 = "0byqn3xni83jkbzc0jllpyfsgjaiifsjr55aaf90pbi71as39xfd"; + system = "smoothers"; + asd = "smoothers"; + }); + systems = [ "smoothers" ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "alexandria_plus" self) (getAttr "array-operations" self) (getAttr "lla" self) (getAttr "num-utils" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); smug = (build-asdf-system { pname = "smug"; version = "20211230-git"; @@ -64358,11 +65382,11 @@ in lib.makeScope pkgs.newScope (self: { }); snooze = (build-asdf-system { pname = "snooze"; - version = "20210807-git"; + version = "20241012-git"; asds = [ "snooze" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/snooze/2021-08-07/snooze-20210807-git.tgz"; - sha256 = "0y6n5k6yw6183kf00m4wa9fksad9qjy4i5qr027ys48mgw8d23fj"; + url = "http://beta.quicklisp.org/archive/snooze/2024-10-12/snooze-20241012-git.tgz"; + sha256 = "0gm9vxi7lcir80snka3qkl6sw8z90jaqf31c72bgyk9j8qkf7xvc"; system = "snooze"; asd = "snooze"; }); @@ -64374,11 +65398,11 @@ in lib.makeScope pkgs.newScope (self: { }); snooze-demo = (build-asdf-system { pname = "snooze-demo"; - version = "20210807-git"; + version = "20241012-git"; asds = [ "snooze-demo" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/snooze/2021-08-07/snooze-20210807-git.tgz"; - sha256 = "0y6n5k6yw6183kf00m4wa9fksad9qjy4i5qr027ys48mgw8d23fj"; + url = "http://beta.quicklisp.org/archive/snooze/2024-10-12/snooze-20241012-git.tgz"; + sha256 = "0gm9vxi7lcir80snka3qkl6sw8z90jaqf31c72bgyk9j8qkf7xvc"; system = "snooze-demo"; asd = "snooze"; }); @@ -64390,11 +65414,11 @@ in lib.makeScope pkgs.newScope (self: { }); snooze-tests = (build-asdf-system { pname = "snooze-tests"; - version = "20210807-git"; + version = "20241012-git"; asds = [ "snooze-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/snooze/2021-08-07/snooze-20210807-git.tgz"; - sha256 = "0y6n5k6yw6183kf00m4wa9fksad9qjy4i5qr027ys48mgw8d23fj"; + url = "http://beta.quicklisp.org/archive/snooze/2024-10-12/snooze-20241012-git.tgz"; + sha256 = "0gm9vxi7lcir80snka3qkl6sw8z90jaqf31c72bgyk9j8qkf7xvc"; system = "snooze-tests"; asd = "snooze"; }); @@ -64422,11 +65446,11 @@ in lib.makeScope pkgs.newScope (self: { }); software-evolution-library = (build-asdf-system { pname = "software-evolution-library"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "software-evolution-library" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/sel/2023-10-21/sel-20231021-git.tgz"; - sha256 = "09s1avxc569y0hanrgqw1dkhlv4mmfkwnl3vhb5hyxgljrw11wh0"; + url = "http://beta.quicklisp.org/archive/sel/2024-10-12/sel-20241012-git.tgz"; + sha256 = "1j1disr1wcql30hdj3f49ss41843wlmqx486nkna6qbnnsfay66w"; system = "software-evolution-library"; asd = "software-evolution-library"; }); @@ -64468,6 +65492,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + source-error = (build-asdf-system { + pname = "source-error"; + version = "20241012-git"; + asds = [ "source-error" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz"; + sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7"; + system = "source-error"; + asd = "source-error"; + }); + systems = [ "source-error" ]; + lispLibs = [ (getAttr "alexandria" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); south = (build-asdf-system { pname = "south"; version = "20231021-git"; @@ -64726,16 +65766,16 @@ in lib.makeScope pkgs.newScope (self: { }); spinneret = (build-asdf-system { pname = "spinneret"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "spinneret" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/spinneret/2023-10-21/spinneret-20231021-git.tgz"; - sha256 = "0b9wvhgcaa6fqpm2hayd5q2aysy198dwh1c3fapd3sr49vabp806"; + url = "http://beta.quicklisp.org/archive/spinneret/2024-10-12/spinneret-20241012-git.tgz"; + sha256 = "09ak35p487bwlwbv0vcdg9h869n8m7i3j1qj4f53lh1bm5s1zi5n"; system = "spinneret"; asd = "spinneret"; }); systems = [ "spinneret" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-ppcre" self) (getAttr "global-vars" self) (getAttr "parenscript" self) (getAttr "serapeum" self) (getAttr "trivia" self) (getAttr "trivial-gray-streams" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-ppcre" self) (getAttr "global-vars" self) (getAttr "in-nomine" self) (getAttr "parenscript" self) (getAttr "serapeum" self) (getAttr "trivia" self) (getAttr "trivial-gray-streams" self) ]; meta = {}; }); split-sequence = (build-asdf-system { @@ -64976,11 +66016,11 @@ in lib.makeScope pkgs.newScope (self: { }); staple = (build-asdf-system { pname = "staple"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "staple" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/staple/2023-10-21/staple-20231021-git.tgz"; - sha256 = "1k3dgw0i1j8x7kwlgc53w808gfn4gll598ajgngsmrc3jisiw0nx"; + url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz"; + sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi"; system = "staple"; asd = "staple"; }); @@ -64992,11 +66032,11 @@ in lib.makeScope pkgs.newScope (self: { }); staple-code-parser = (build-asdf-system { pname = "staple-code-parser"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "staple-code-parser" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/staple/2023-10-21/staple-20231021-git.tgz"; - sha256 = "1k3dgw0i1j8x7kwlgc53w808gfn4gll598ajgngsmrc3jisiw0nx"; + url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz"; + sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi"; system = "staple-code-parser"; asd = "staple-code-parser"; }); @@ -65008,11 +66048,11 @@ in lib.makeScope pkgs.newScope (self: { }); staple-markdown = (build-asdf-system { pname = "staple-markdown"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "staple-markdown" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/staple/2023-10-21/staple-20231021-git.tgz"; - sha256 = "1k3dgw0i1j8x7kwlgc53w808gfn4gll598ajgngsmrc3jisiw0nx"; + url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz"; + sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi"; system = "staple-markdown"; asd = "staple-markdown"; }); @@ -65024,11 +66064,11 @@ in lib.makeScope pkgs.newScope (self: { }); staple-markless = (build-asdf-system { pname = "staple-markless"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "staple-markless" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/staple/2023-10-21/staple-20231021-git.tgz"; - sha256 = "1k3dgw0i1j8x7kwlgc53w808gfn4gll598ajgngsmrc3jisiw0nx"; + url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz"; + sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi"; system = "staple-markless"; asd = "staple-markless"; }); @@ -65040,11 +66080,11 @@ in lib.makeScope pkgs.newScope (self: { }); staple-package-recording = (build-asdf-system { pname = "staple-package-recording"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "staple-package-recording" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/staple/2023-10-21/staple-20231021-git.tgz"; - sha256 = "1k3dgw0i1j8x7kwlgc53w808gfn4gll598ajgngsmrc3jisiw0nx"; + url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz"; + sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi"; system = "staple-package-recording"; asd = "staple-package-recording"; }); @@ -65056,11 +66096,11 @@ in lib.makeScope pkgs.newScope (self: { }); staple-restructured-text = (build-asdf-system { pname = "staple-restructured-text"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "staple-restructured-text" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/staple/2023-10-21/staple-20231021-git.tgz"; - sha256 = "1k3dgw0i1j8x7kwlgc53w808gfn4gll598ajgngsmrc3jisiw0nx"; + url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz"; + sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi"; system = "staple-restructured-text"; asd = "staple-restructured-text"; }); @@ -65072,11 +66112,11 @@ in lib.makeScope pkgs.newScope (self: { }); staple-server = (build-asdf-system { pname = "staple-server"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "staple-server" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/staple/2023-10-21/staple-20231021-git.tgz"; - sha256 = "1k3dgw0i1j8x7kwlgc53w808gfn4gll598ajgngsmrc3jisiw0nx"; + url = "http://beta.quicklisp.org/archive/staple/2024-10-12/staple-20241012-git.tgz"; + sha256 = "147511d57xkv9d9crnqygj8lqkdpmbyq3g8b9cns130d8m46f2vi"; system = "staple-server"; asd = "staple-server"; }); @@ -65118,25 +66158,25 @@ in lib.makeScope pkgs.newScope (self: { }); static-vectors = (build-asdf-system { pname = "static-vectors"; - version = "v1.8.9"; + version = "v1.9.3"; asds = [ "static-vectors" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/static-vectors/2021-06-30/static-vectors-v1.8.9.tgz"; - sha256 = "079qa20lhanzsz1qf4iags91n0ziylbjgbcymm5a5qj7yryas4fw"; + url = "http://beta.quicklisp.org/archive/static-vectors/2024-10-12/static-vectors-v1.9.3.tgz"; + sha256 = "1sn37hyf6x56irn2qqc51ncqswa3n94j6cxwcj2ixgxmszcyzx5h"; system = "static-vectors"; asd = "static-vectors"; }); systems = [ "static-vectors" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "cffi" self) (getAttr "cffi-grovel" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "cffi" self) ]; meta = {}; }); statistics = (build-asdf-system { pname = "statistics"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "statistics" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/statistics/2023-10-21/statistics-20231021-git.tgz"; - sha256 = "0cx17fraqq3ac2w5mn4rkahfki3pr80flbcnhlrv6crgj8wshz2n"; + url = "http://beta.quicklisp.org/archive/statistics/2024-10-12/statistics-20241012-git.tgz"; + sha256 = "00dir3sif9jqc0b48vsk8r41h4zmf95jj4nqrc45mbnr80pmdrsl"; system = "statistics"; asd = "statistics"; }); @@ -65258,11 +66298,11 @@ in lib.makeScope pkgs.newScope (self: { }); stepster = (build-asdf-system { pname = "stepster"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "stepster" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/stepster/2023-06-18/stepster-20230618-git.tgz"; - sha256 = "1c59168aq364id3pnp5bzzjcv9yzdj2azm5nnyxabszjh4yjg1a9"; + url = "http://beta.quicklisp.org/archive/stepster/2024-10-12/stepster-20241012-git.tgz"; + sha256 = "027psal692mvpaj8bzp8fkkrsy5pgyrg8sr21xgc4m8ypp0shvw3"; system = "stepster"; asd = "stepster"; }); @@ -65290,11 +66330,11 @@ in lib.makeScope pkgs.newScope (self: { }); stmx = (build-asdf-system { pname = "stmx"; - version = "stable-992c9615-git"; + version = "stable-95f7dea8-git"; asds = [ "stmx" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/stmx/2023-06-18/stmx-stable-992c9615-git.tgz"; - sha256 = "1zhd25vr0sfw8rrlagz3y5c8jl7pgrlf35b5m06m79zjz3fv5368"; + url = "http://beta.quicklisp.org/archive/stmx/2024-10-12/stmx-stable-95f7dea8-git.tgz"; + sha256 = "1qq25y79casaa56a76gj9hk2f3hjcc5z3f4na4vy3sw99km54hn9"; system = "stmx"; asd = "stmx"; }); @@ -65306,11 +66346,11 @@ in lib.makeScope pkgs.newScope (self: { }); stmx_dot_test = (build-asdf-system { pname = "stmx.test"; - version = "stable-992c9615-git"; + version = "stable-95f7dea8-git"; asds = [ "stmx.test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/stmx/2023-06-18/stmx-stable-992c9615-git.tgz"; - sha256 = "1zhd25vr0sfw8rrlagz3y5c8jl7pgrlf35b5m06m79zjz3fv5368"; + url = "http://beta.quicklisp.org/archive/stmx/2024-10-12/stmx-stable-95f7dea8-git.tgz"; + sha256 = "1qq25y79casaa56a76gj9hk2f3hjcc5z3f4na4vy3sw99km54hn9"; system = "stmx.test"; asd = "stmx.test"; }); @@ -65338,11 +66378,11 @@ in lib.makeScope pkgs.newScope (self: { }); str = (build-asdf-system { pname = "str"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "str" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-str/2023-10-21/cl-str-20231021-git.tgz"; - sha256 = "0zq0f6iia4mg755zmbpnjcbbiybi1ckxrvcy097iz4g9ayc0frmq"; + url = "http://beta.quicklisp.org/archive/cl-str/2024-10-12/cl-str-20241012-git.tgz"; + sha256 = "1c9vcrm4gy3ljwnzjimsxswszfs2im1a4iqalpn1mhv8ddwavb2j"; system = "str"; asd = "str"; }); @@ -65352,11 +66392,11 @@ in lib.makeScope pkgs.newScope (self: { }); str_dot_test = (build-asdf-system { pname = "str.test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "str.test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-str/2023-10-21/cl-str-20231021-git.tgz"; - sha256 = "0zq0f6iia4mg755zmbpnjcbbiybi1ckxrvcy097iz4g9ayc0frmq"; + url = "http://beta.quicklisp.org/archive/cl-str/2024-10-12/cl-str-20241012-git.tgz"; + sha256 = "1c9vcrm4gy3ljwnzjimsxswszfs2im1a4iqalpn1mhv8ddwavb2j"; system = "str.test"; asd = "str.test"; }); @@ -65414,16 +66454,16 @@ in lib.makeScope pkgs.newScope (self: { }); stripe = (build-asdf-system { pname = "stripe"; - version = "20220707-git"; + version = "20241012-git"; asds = [ "stripe" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/stripe/2022-07-07/stripe-20220707-git.tgz"; - sha256 = "1n9lv9yixzampf986vkspspr7mrvpsz2l5h919agc52hkv9wg2f7"; + url = "http://beta.quicklisp.org/archive/stripe/2024-10-12/stripe-20241012-git.tgz"; + sha256 = "1ng1381pg0mj1ba0ndxvhaqmm0w64v0gq0qsxbfm9kr6hq46gsf9"; system = "stripe"; asd = "stripe"; }); systems = [ "stripe" ]; - lispLibs = [ (getAttr "dexador" self) (getAttr "local-time" self) (getAttr "mfiano-utils" self) (getAttr "yason" self) ]; + lispLibs = [ (getAttr "dexador" self) (getAttr "golden-utils" self) (getAttr "local-time" self) (getAttr "yason" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -65602,38 +66642,6 @@ in lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-ppcre" self) (getAttr "clx" self) (getAttr "dynamic-mixins-swm" self) ]; meta = {}; }); - stumpwm-dynamic-float = (build-asdf-system { - pname = "stumpwm-dynamic-float"; - version = "20221106-git"; - asds = [ "stumpwm-dynamic-float" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/stumpwm-dynamic-float/2022-11-06/stumpwm-dynamic-float-20221106-git.tgz"; - sha256 = "13m9864vfj4b5b0hlvp7jrb96368rxr5ydjsdqldky10yad7icxf"; - system = "stumpwm-dynamic-float"; - asd = "stumpwm-dynamic-float"; - }); - systems = [ "stumpwm-dynamic-float" ]; - lispLibs = [ (getAttr "stumpwm" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - stumpwm-sndioctl = (build-asdf-system { - pname = "stumpwm-sndioctl"; - version = "20210531-git"; - asds = [ "stumpwm-sndioctl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/stumpwm-sndioctl/2021-05-31/stumpwm-sndioctl-20210531-git.tgz"; - sha256 = "1q4w4grim7izvw01k95wh7bbaaq0hz2ljjhn47nyd7pzrk9dabpv"; - system = "stumpwm-sndioctl"; - asd = "stumpwm-sndioctl"; - }); - systems = [ "stumpwm-sndioctl" ]; - lispLibs = [ (getAttr "stumpwm" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); stumpwm-tests = (build-asdf-system { pname = "stumpwm-tests"; version = "20231021-git"; @@ -65748,11 +66756,11 @@ in lib.makeScope pkgs.newScope (self: { }); swank = (build-asdf-system { pname = "swank"; - version = "v2.28"; + version = "v2.30"; asds = [ "swank" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/slime/2023-02-14/slime-v2.28.tgz"; - sha256 = "155y3xld9snkfm7xhn7gz655xxxr6g7qv45znbg25k6y1lczmy4z"; + url = "http://beta.quicklisp.org/archive/slime/2024-10-12/slime-v2.30.tgz"; + sha256 = "0qb7m65gq0mbxfrdppkh3k4jn13i14i07ziga4r8b3rmrxhrmlv0"; system = "swank"; asd = "swank"; }); @@ -65778,11 +66786,11 @@ in lib.makeScope pkgs.newScope (self: { }); swank-crew = (build-asdf-system { pname = "swank-crew"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "swank-crew" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/swank-crew/2023-02-14/swank-crew-20230214-git.tgz"; - sha256 = "0na16gby46g66b0632lgzrfnj79ml3k5z2g5d1x87p6cqhzxgrf9"; + url = "http://beta.quicklisp.org/archive/swank-crew/2024-10-12/swank-crew-20241012-git.tgz"; + sha256 = "0v0gg9d74x28xw3n12nrvkdnnvz0m972l4rymfansfaawiqm7ssz"; system = "swank-crew"; asd = "swank-crew"; }); @@ -65794,11 +66802,11 @@ in lib.makeScope pkgs.newScope (self: { }); swank-protocol = (build-asdf-system { pname = "swank-protocol"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "swank-protocol" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/swank-protocol/2021-10-20/swank-protocol-20211020-git.tgz"; - sha256 = "1c6cbkvcy3k56pkq5nlnj5m0zwkgbbrhfs1igwkr89xal2a4fz56"; + url = "http://beta.quicklisp.org/archive/swank-protocol/2024-10-12/swank-protocol-20241012-git.tgz"; + sha256 = "0vqcdxp228fk3snay90ml33r1y03l5k05snq633f95his8ffxknl"; system = "swank-protocol"; asd = "swank-protocol"; }); @@ -65840,11 +66848,11 @@ in lib.makeScope pkgs.newScope (self: { }); sxql = (build-asdf-system { pname = "sxql"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "sxql" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/sxql/2023-10-21/sxql-20231021-git.tgz"; - sha256 = "100war7l253dhld5gl49xmdfpl93kardjaaxb0cka0yzrvz4x0sw"; + url = "http://beta.quicklisp.org/archive/sxql/2024-10-12/sxql-20241012-git.tgz"; + sha256 = "11x4qgdwbddbk0a8avrirp1ksmphfxlimirfwvmiwi0jc4zd5csa"; system = "sxql"; asd = "sxql"; }); @@ -65872,11 +66880,11 @@ in lib.makeScope pkgs.newScope (self: { }); sxql-test = (build-asdf-system { pname = "sxql-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "sxql-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/sxql/2023-10-21/sxql-20231021-git.tgz"; - sha256 = "100war7l253dhld5gl49xmdfpl93kardjaaxb0cka0yzrvz4x0sw"; + url = "http://beta.quicklisp.org/archive/sxql/2024-10-12/sxql-20241012-git.tgz"; + sha256 = "11x4qgdwbddbk0a8avrirp1ksmphfxlimirfwvmiwi0jc4zd5csa"; system = "sxql-test"; asd = "sxql-test"; }); @@ -65902,11 +66910,11 @@ in lib.makeScope pkgs.newScope (self: { }); symath = (build-asdf-system { pname = "symath"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "symath" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/symath/2023-02-14/symath-20230214-git.tgz"; - sha256 = "0jynx61ycbhibz7cs5rzb7ifhh0hh6iqbx4j07xlz21669vgzb65"; + url = "http://beta.quicklisp.org/archive/symath/2024-10-12/symath-20241012-git.tgz"; + sha256 = "1bxggf9kn4bhx877hyj4kpr76p47d8cd35lgv224hri5211fqyaz"; system = "symath"; asd = "symath"; }); @@ -65980,11 +66988,11 @@ in lib.makeScope pkgs.newScope (self: { }); system-locale = (build-asdf-system { pname = "system-locale"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "system-locale" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/system-locale/2023-10-21/system-locale-20231021-git.tgz"; - sha256 = "0p68mgmh52mzq66dz3rczakzwavjp9ld27c2anxjx8fzbf033fp9"; + url = "http://beta.quicklisp.org/archive/system-locale/2024-10-12/system-locale-20241012-git.tgz"; + sha256 = "1q91vyvsh787fz3j49lmyw2lx85288cmamb11h99wdmbmf61rdgr"; system = "system-locale"; asd = "system-locale"; }); @@ -65994,29 +67002,13 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - t-clack-handler-fcgi = (build-asdf-system { - pname = "t-clack-handler-fcgi"; - version = "20231021-git"; - asds = [ "t-clack-handler-fcgi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2023-10-21/clack-20231021-git.tgz"; - sha256 = "1w6ij1syv68vnm9xwp2q1lmnn92yafpbv7w1fyk012jxyqdsj4sy"; - system = "t-clack-handler-fcgi"; - asd = "t-clack-handler-fcgi"; - }); - systems = [ "t-clack-handler-fcgi" ]; - lispLibs = [ (getAttr "clack-test" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); t-clack-handler-hunchentoot = (build-asdf-system { pname = "t-clack-handler-hunchentoot"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "t-clack-handler-hunchentoot" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2023-10-21/clack-20231021-git.tgz"; - sha256 = "1w6ij1syv68vnm9xwp2q1lmnn92yafpbv7w1fyk012jxyqdsj4sy"; + url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz"; + sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3"; system = "t-clack-handler-hunchentoot"; asd = "t-clack-handler-hunchentoot"; }); @@ -66028,11 +67020,11 @@ in lib.makeScope pkgs.newScope (self: { }); t-clack-handler-toot = (build-asdf-system { pname = "t-clack-handler-toot"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "t-clack-handler-toot" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2023-10-21/clack-20231021-git.tgz"; - sha256 = "1w6ij1syv68vnm9xwp2q1lmnn92yafpbv7w1fyk012jxyqdsj4sy"; + url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz"; + sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3"; system = "t-clack-handler-toot"; asd = "t-clack-handler-toot"; }); @@ -66044,11 +67036,11 @@ in lib.makeScope pkgs.newScope (self: { }); t-clack-handler-wookie = (build-asdf-system { pname = "t-clack-handler-wookie"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "t-clack-handler-wookie" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2023-10-21/clack-20231021-git.tgz"; - sha256 = "1w6ij1syv68vnm9xwp2q1lmnn92yafpbv7w1fyk012jxyqdsj4sy"; + url = "http://beta.quicklisp.org/archive/clack/2024-10-12/clack-20241012-git.tgz"; + sha256 = "0dljkfxdypn50d6jlssl79ag072r7lcdhfy771hna0ihxii8vsm3"; system = "t-clack-handler-wookie"; asd = "t-clack-handler-wookie"; }); @@ -66058,214 +67050,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - t-lack = (build-asdf-system { - pname = "t-lack"; - version = "20231021-git"; - asds = [ "t-lack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; - system = "t-lack"; - asd = "t-lack"; - }); - systems = [ "t-lack" ]; - lispLibs = [ (getAttr "clack" self) (getAttr "lack" self) (getAttr "prove" self) (getAttr "prove-asdf" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - t-lack-component = (build-asdf-system { - pname = "t-lack-component"; - version = "20231021-git"; - asds = [ "t-lack-component" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; - system = "t-lack-component"; - asd = "t-lack-component"; - }); - systems = [ "t-lack-component" ]; - lispLibs = [ (getAttr "lack-component" self) (getAttr "lack-test" self) (getAttr "prove" self) (getAttr "prove-asdf" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - t-lack-middleware-accesslog = (build-asdf-system { - pname = "t-lack-middleware-accesslog"; - version = "20231021-git"; - asds = [ "t-lack-middleware-accesslog" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; - system = "t-lack-middleware-accesslog"; - asd = "t-lack-middleware-accesslog"; - }); - systems = [ "t-lack-middleware-accesslog" ]; - lispLibs = [ (getAttr "lack" self) (getAttr "lack-test" self) (getAttr "prove" self) (getAttr "prove-asdf" self) (getAttr "split-sequence" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - t-lack-middleware-auth-basic = (build-asdf-system { - pname = "t-lack-middleware-auth-basic"; - version = "20231021-git"; - asds = [ "t-lack-middleware-auth-basic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; - system = "t-lack-middleware-auth-basic"; - asd = "t-lack-middleware-auth-basic"; - }); - systems = [ "t-lack-middleware-auth-basic" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-base64" self) (getAttr "lack" self) (getAttr "lack-middleware-auth-basic" self) (getAttr "lack-test" self) (getAttr "prove" self) (getAttr "prove-asdf" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - t-lack-middleware-backtrace = (build-asdf-system { - pname = "t-lack-middleware-backtrace"; - version = "20231021-git"; - asds = [ "t-lack-middleware-backtrace" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; - system = "t-lack-middleware-backtrace"; - asd = "t-lack-middleware-backtrace"; - }); - systems = [ "t-lack-middleware-backtrace" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "lack" self) (getAttr "lack-test" self) (getAttr "prove" self) (getAttr "prove-asdf" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - t-lack-middleware-csrf = (build-asdf-system { - pname = "t-lack-middleware-csrf"; - version = "20231021-git"; - asds = [ "t-lack-middleware-csrf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; - system = "t-lack-middleware-csrf"; - asd = "t-lack-middleware-csrf"; - }); - systems = [ "t-lack-middleware-csrf" ]; - lispLibs = [ (getAttr "cl-ppcre" self) (getAttr "lack" self) (getAttr "lack-middleware-csrf" self) (getAttr "lack-request" self) (getAttr "lack-test" self) (getAttr "prove" self) (getAttr "prove-asdf" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - t-lack-middleware-mount = (build-asdf-system { - pname = "t-lack-middleware-mount"; - version = "20231021-git"; - asds = [ "t-lack-middleware-mount" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; - system = "t-lack-middleware-mount"; - asd = "t-lack-middleware-mount"; - }); - systems = [ "t-lack-middleware-mount" ]; - lispLibs = [ (getAttr "lack" self) (getAttr "lack-component" self) (getAttr "lack-middleware-mount" self) (getAttr "lack-test" self) (getAttr "prove" self) (getAttr "prove-asdf" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - t-lack-middleware-session = (build-asdf-system { - pname = "t-lack-middleware-session"; - version = "20231021-git"; - asds = [ "t-lack-middleware-session" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; - system = "t-lack-middleware-session"; - asd = "t-lack-middleware-session"; - }); - systems = [ "t-lack-middleware-session" ]; - lispLibs = [ (getAttr "cl-cookie" self) (getAttr "lack" self) (getAttr "lack-middleware-session" self) (getAttr "lack-test" self) (getAttr "prove" self) (getAttr "prove-asdf" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - t-lack-middleware-static = (build-asdf-system { - pname = "t-lack-middleware-static"; - version = "20231021-git"; - asds = [ "t-lack-middleware-static" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; - system = "t-lack-middleware-static"; - asd = "t-lack-middleware-static"; - }); - systems = [ "t-lack-middleware-static" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "lack" self) (getAttr "lack-test" self) (getAttr "prove" self) (getAttr "prove-asdf" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - t-lack-request = (build-asdf-system { - pname = "t-lack-request"; - version = "20231021-git"; - asds = [ "t-lack-request" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; - system = "t-lack-request"; - asd = "t-lack-request"; - }); - systems = [ "t-lack-request" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "clack-test" self) (getAttr "dexador" self) (getAttr "flexi-streams" self) (getAttr "hunchentoot" self) (getAttr "lack-request" self) (getAttr "prove" self) (getAttr "prove-asdf" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - t-lack-session-store-dbi = (build-asdf-system { - pname = "t-lack-session-store-dbi"; - version = "20231021-git"; - asds = [ "t-lack-session-store-dbi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; - system = "t-lack-session-store-dbi"; - asd = "t-lack-session-store-dbi"; - }); - systems = [ "t-lack-session-store-dbi" ]; - lispLibs = [ (getAttr "dbi" self) (getAttr "lack" self) (getAttr "lack-session-store-dbi" self) (getAttr "lack-test" self) (getAttr "prove" self) (getAttr "prove-asdf" self) (getAttr "sqlite" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - t-lack-session-store-redis = (build-asdf-system { - pname = "t-lack-session-store-redis"; - version = "20231021-git"; - asds = [ "t-lack-session-store-redis" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; - system = "t-lack-session-store-redis"; - asd = "t-lack-session-store-redis"; - }); - systems = [ "t-lack-session-store-redis" ]; - lispLibs = [ (getAttr "lack" self) (getAttr "lack-session-store-redis" self) (getAttr "lack-test" self) (getAttr "prove" self) (getAttr "prove-asdf" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); - t-lack-util = (build-asdf-system { - pname = "t-lack-util"; - version = "20231021-git"; - asds = [ "t-lack-util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2023-10-21/lack-20231021-git.tgz"; - sha256 = "1cmqf9fqjxdkhf73sv2k4jccalrqbli2y6yv5wzq9x6jhpdk77s3"; - system = "t-lack-util"; - asd = "t-lack-util"; - }); - systems = [ "t-lack-util" ]; - lispLibs = [ (getAttr "lack-test" self) (getAttr "lack-util" self) (getAttr "prove" self) (getAttr "prove-asdf" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); ta2 = (build-asdf-system { pname = "ta2"; version = "master-fe503896-git"; @@ -66300,11 +67084,11 @@ in lib.makeScope pkgs.newScope (self: { }); taglib = (build-asdf-system { pname = "taglib"; - version = "20210411-git"; + version = "20241012-git"; asds = [ "taglib" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/taglib/2021-04-11/taglib-20210411-git.tgz"; - sha256 = "13291kb95hwb2nbkjscjb2abn5l267cjwspaqsmr3bsdvvf0033b"; + url = "http://beta.quicklisp.org/archive/taglib/2024-10-12/taglib-20241012-git.tgz"; + sha256 = "1jhi38g2ngmbsv71chxyavgf4fzb64nr7z648ia01qxii0435csb"; system = "taglib"; asd = "taglib"; }); @@ -66316,11 +67100,11 @@ in lib.makeScope pkgs.newScope (self: { }); taglib-tests = (build-asdf-system { pname = "taglib-tests"; - version = "20210411-git"; + version = "20241012-git"; asds = [ "taglib-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/taglib/2021-04-11/taglib-20210411-git.tgz"; - sha256 = "13291kb95hwb2nbkjscjb2abn5l267cjwspaqsmr3bsdvvf0033b"; + url = "http://beta.quicklisp.org/archive/taglib/2024-10-12/taglib-20241012-git.tgz"; + sha256 = "1jhi38g2ngmbsv71chxyavgf4fzb64nr7z648ia01qxii0435csb"; system = "taglib-tests"; asd = "taglib-tests"; }); @@ -66524,11 +67308,11 @@ in lib.makeScope pkgs.newScope (self: { }); teddy = (build-asdf-system { pname = "teddy"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "teddy" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/teddy/2021-10-20/teddy-20211020-git.tgz"; - sha256 = "108cdxckzpdixi975rr2q1kkga6jngwj7j3nhfss9pzqcsf9w9ks"; + url = "http://beta.quicklisp.org/archive/teddy/2024-10-12/teddy-20241012-git.tgz"; + sha256 = "0qg83khyny5pw9lk3ysid32wl1wds43ja35qx72mxpli3nhj7nhq"; system = "teddy"; asd = "teddy"; }); @@ -66668,11 +67452,11 @@ in lib.makeScope pkgs.newScope (self: { }); ten = (build-asdf-system { pname = "ten"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "ten" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ten/2023-06-18/ten-20230618-git.tgz"; - sha256 = "1z1aqdlmjagdfyl3d9m92g96cdbnbdvbxbfixcl1qifbkzxka739"; + url = "http://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz"; + sha256 = "0zrbgyvc21gq8r507jm664zd4r9q206g2ah1yybwi32lgzify6nk"; system = "ten"; asd = "ten"; }); @@ -66684,11 +67468,11 @@ in lib.makeScope pkgs.newScope (self: { }); ten_dot_examples = (build-asdf-system { pname = "ten.examples"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "ten.examples" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ten/2023-06-18/ten-20230618-git.tgz"; - sha256 = "1z1aqdlmjagdfyl3d9m92g96cdbnbdvbxbfixcl1qifbkzxka739"; + url = "http://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz"; + sha256 = "0zrbgyvc21gq8r507jm664zd4r9q206g2ah1yybwi32lgzify6nk"; system = "ten.examples"; asd = "ten.examples"; }); @@ -66700,11 +67484,11 @@ in lib.makeScope pkgs.newScope (self: { }); ten_dot_i18n_dot_cl-locale = (build-asdf-system { pname = "ten.i18n.cl-locale"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "ten.i18n.cl-locale" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ten/2023-06-18/ten-20230618-git.tgz"; - sha256 = "1z1aqdlmjagdfyl3d9m92g96cdbnbdvbxbfixcl1qifbkzxka739"; + url = "http://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz"; + sha256 = "0zrbgyvc21gq8r507jm664zd4r9q206g2ah1yybwi32lgzify6nk"; system = "ten.i18n.cl-locale"; asd = "ten.i18n.cl-locale"; }); @@ -66716,11 +67500,11 @@ in lib.makeScope pkgs.newScope (self: { }); ten_dot_i18n_dot_gettext = (build-asdf-system { pname = "ten.i18n.gettext"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "ten.i18n.gettext" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ten/2023-06-18/ten-20230618-git.tgz"; - sha256 = "1z1aqdlmjagdfyl3d9m92g96cdbnbdvbxbfixcl1qifbkzxka739"; + url = "http://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz"; + sha256 = "0zrbgyvc21gq8r507jm664zd4r9q206g2ah1yybwi32lgzify6nk"; system = "ten.i18n.gettext"; asd = "ten.i18n.gettext"; }); @@ -66732,11 +67516,11 @@ in lib.makeScope pkgs.newScope (self: { }); ten_dot_tests = (build-asdf-system { pname = "ten.tests"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "ten.tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/ten/2023-06-18/ten-20230618-git.tgz"; - sha256 = "1z1aqdlmjagdfyl3d9m92g96cdbnbdvbxbfixcl1qifbkzxka739"; + url = "http://beta.quicklisp.org/archive/ten/2024-10-12/ten-20241012-git.tgz"; + sha256 = "0zrbgyvc21gq8r507jm664zd4r9q206g2ah1yybwi32lgzify6nk"; system = "ten.tests"; asd = "ten.tests"; }); @@ -66796,11 +67580,11 @@ in lib.makeScope pkgs.newScope (self: { }); test-40ants-system = (build-asdf-system { pname = "test-40ants-system"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "test-40ants-system" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2023-10-21/40ants-asdf-system-20231021-git.tgz"; - sha256 = "17hfih5b1shw2l0fw3dy3q5dxqra80k3h4jfmlnf0bp3ii0385g5"; + url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2024-10-12/40ants-asdf-system-20241012-git.tgz"; + sha256 = "0wi575m0s0a9fvp1wy5ga760f71la16z1633qk6s2f87rwcjs8kw"; system = "test-40ants-system"; asd = "test-40ants-system"; }); @@ -66812,11 +67596,11 @@ in lib.makeScope pkgs.newScope (self: { }); test-gadgets = (build-asdf-system { pname = "test-gadgets"; - version = "20220220-git"; + version = "20241012-git"; asds = [ "test-gadgets" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/gadgets/2022-02-20/gadgets-20220220-git.tgz"; - sha256 = "0g06wb3dciri2q93x2dcf58x5r8gq2kb86fgd2w4pr5r1wxwd1sm"; + url = "http://beta.quicklisp.org/archive/gadgets/2024-10-12/gadgets-20241012-git.tgz"; + sha256 = "1ba4gj8lh3ihbb66xiz7hc8cdg3gvi3q20w32nmsqdch956is34k"; system = "test-gadgets"; asd = "test-gadgets"; }); @@ -66940,11 +67724,11 @@ in lib.makeScope pkgs.newScope (self: { }); testiere = (build-asdf-system { pname = "testiere"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "testiere" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/testiere/2023-10-21/testiere-20231021-git.tgz"; - sha256 = "1kgd9fqp2bkxpzfv4z4jhicivmfi0wnnmg75ip7zh67jdh8m6fhd"; + url = "http://beta.quicklisp.org/archive/testiere/2024-10-12/testiere-20241012-git.tgz"; + sha256 = "0sfsk7i5kxk8s1273i9vwz49hak0qdrr9asq70kdiwq0lfd56kgg"; system = "testiere"; asd = "testiere"; }); @@ -67050,6 +67834,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + thih-coalton = (build-asdf-system { + pname = "thih-coalton"; + version = "20241012-git"; + asds = [ "thih-coalton" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/coalton/2024-10-12/coalton-20241012-git.tgz"; + sha256 = "19flzjxf3y6pxm09bmr8bmiqbgh4f7d5jjbgx2cb3dckmgvvg1d7"; + system = "thih-coalton"; + asd = "thih-coalton"; + }); + systems = [ "thih-coalton" ]; + lispLibs = [ (getAttr "coalton" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); thnappy = (build-asdf-system { pname = "thnappy"; version = "20180831-git"; @@ -67260,11 +68060,11 @@ in lib.makeScope pkgs.newScope (self: { }); tiny-routes = (build-asdf-system { pname = "tiny-routes"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "tiny-routes" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tiny-routes/2023-10-21/tiny-routes-20231021-git.tgz"; - sha256 = "085k0ibfhz5i68mrd1y4pr5dykrpcd4p1iig6bgxa5h7c844sm0i"; + url = "http://beta.quicklisp.org/archive/tiny-routes/2024-10-12/tiny-routes-20241012-git.tgz"; + sha256 = "1wswzz7d26ic9izls7pnkybm8ryf5j0ksv55gr6k5nji9x8r5jqx"; system = "tiny-routes"; asd = "tiny-routes"; }); @@ -67276,11 +68076,11 @@ in lib.makeScope pkgs.newScope (self: { }); tiny-routes-middleware-cookie = (build-asdf-system { pname = "tiny-routes-middleware-cookie"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "tiny-routes-middleware-cookie" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tiny-routes/2023-10-21/tiny-routes-20231021-git.tgz"; - sha256 = "085k0ibfhz5i68mrd1y4pr5dykrpcd4p1iig6bgxa5h7c844sm0i"; + url = "http://beta.quicklisp.org/archive/tiny-routes/2024-10-12/tiny-routes-20241012-git.tgz"; + sha256 = "1wswzz7d26ic9izls7pnkybm8ryf5j0ksv55gr6k5nji9x8r5jqx"; system = "tiny-routes-middleware-cookie"; asd = "tiny-routes-middleware-cookie"; }); @@ -67436,27 +68236,27 @@ in lib.makeScope pkgs.newScope (self: { }); tooter = (build-asdf-system { pname = "tooter"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "tooter" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/tooter/2023-10-21/tooter-20231021-git.tgz"; - sha256 = "1l4jjsb3l1adnd7am8kvgb0vn4czwi6z894222hjmhash904p48l"; + url = "http://beta.quicklisp.org/archive/tooter/2024-10-12/tooter-20241012-git.tgz"; + sha256 = "03ymavph34248lh18jycsky55dg83kjr6k5a9bib5wh2idswrfxp"; system = "tooter"; asd = "tooter"; }); systems = [ "tooter" ]; - lispLibs = [ (getAttr "cl-ppcre" self) (getAttr "com_dot_inuoe_dot_jzon" self) (getAttr "documentation-utils" self) (getAttr "drakma" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "cl-ppcre" self) (getAttr "documentation-utils" self) (getAttr "drakma" self) (getAttr "yason" self) ]; meta = { hydraPlatforms = [ ]; }; }); torrents = (build-asdf-system { pname = "torrents"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "torrents" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-torrents/2022-11-06/cl-torrents-20221106-git.tgz"; - sha256 = "1icz98icnisz8cz669adin5x68y3ybcajy69yrma1djgd3v7inl5"; + url = "http://beta.quicklisp.org/archive/cl-torrents/2024-10-12/cl-torrents-20241012-git.tgz"; + sha256 = "1xigzskksgn8pg18v2dncfapdn94zv0djr4yi8nmkqbv8ljx93l4"; system = "torrents"; asd = "torrents"; }); @@ -67468,11 +68268,11 @@ in lib.makeScope pkgs.newScope (self: { }); torrents-test = (build-asdf-system { pname = "torrents-test"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "torrents-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-torrents/2022-11-06/cl-torrents-20221106-git.tgz"; - sha256 = "1icz98icnisz8cz669adin5x68y3ybcajy69yrma1djgd3v7inl5"; + url = "http://beta.quicklisp.org/archive/cl-torrents/2024-10-12/cl-torrents-20241012-git.tgz"; + sha256 = "1xigzskksgn8pg18v2dncfapdn94zv0djr4yi8nmkqbv8ljx93l4"; system = "torrents-test"; asd = "torrents-test"; }); @@ -67564,11 +68364,11 @@ in lib.makeScope pkgs.newScope (self: { }); transducers = (build-asdf-system { pname = "transducers"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "transducers" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-transducers/2023-10-21/cl-transducers-20231021-git.tgz"; - sha256 = "16711ah5cka09ib6lhjbrm2ycwj8m8b5jgp0j87x93z8p0gkmj8y"; + url = "http://beta.quicklisp.org/archive/cl-transducers/2024-10-12/cl-transducers-20241012-git.tgz"; + sha256 = "1n7g2fr5bxyq1axp3a1pw01c5v167njhd7i0gbpq35s1fxvqw6ik"; system = "transducers"; asd = "transducers"; }); @@ -67580,11 +68380,11 @@ in lib.makeScope pkgs.newScope (self: { }); transducers-jzon = (build-asdf-system { pname = "transducers-jzon"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "transducers-jzon" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-transducers/2023-10-21/cl-transducers-20231021-git.tgz"; - sha256 = "16711ah5cka09ib6lhjbrm2ycwj8m8b5jgp0j87x93z8p0gkmj8y"; + url = "http://beta.quicklisp.org/archive/cl-transducers/2024-10-12/cl-transducers-20241012-git.tgz"; + sha256 = "1n7g2fr5bxyq1axp3a1pw01c5v167njhd7i0gbpq35s1fxvqw6ik"; system = "transducers-jzon"; asd = "transducers"; }); @@ -67594,6 +68394,38 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + transit = (build-asdf-system { + pname = "transit"; + version = "20241012-git"; + asds = [ "transit" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-transit/2024-10-12/cl-transit-20241012-git.tgz"; + sha256 = "09rlajmcljl43n5866ackbdjkdz19sd12wzdzxnk2l7bjx3khqm4"; + system = "transit"; + asd = "transit"; + }); + systems = [ "transit" ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "bit-smasher" self) (getAttr "cl-messagepack" self) (getAttr "com_dot_inuoe_dot_jzon" self) (getAttr "flexi-streams" self) (getAttr "frugal-uuid" self) (getAttr "fset" self) (getAttr "local-time" self) (getAttr "parse-float" self) (getAttr "quri" self) (getAttr "serapeum" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + transit-tests = (build-asdf-system { + pname = "transit-tests"; + version = "20241012-git"; + asds = [ "transit-tests" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-transit/2024-10-12/cl-transit-20241012-git.tgz"; + sha256 = "09rlajmcljl43n5866ackbdjkdz19sd12wzdzxnk2l7bjx3khqm4"; + system = "transit-tests"; + asd = "transit-tests"; + }); + systems = [ "transit-tests" ]; + lispLibs = [ (getAttr "dexador" self) (getAttr "fiveam" self) (getAttr "marshal" self) (getAttr "transit" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); translate = (build-asdf-system { pname = "translate"; version = "20180228-git"; @@ -67802,11 +68634,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivia = (build-asdf-system { pname = "trivia"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "trivia" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2023-06-18/trivia-20230618-git.tgz"; - sha256 = "13q261kc4y3g16zswfs1f2y57jpg04d7cx3xig76wp8wfgaq5g1m"; + url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia"; asd = "trivia"; }); @@ -67816,11 +68648,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivia_dot_balland2006 = (build-asdf-system { pname = "trivia.balland2006"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "trivia.balland2006" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2023-06-18/trivia-20230618-git.tgz"; - sha256 = "13q261kc4y3g16zswfs1f2y57jpg04d7cx3xig76wp8wfgaq5g1m"; + url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.balland2006"; asd = "trivia.balland2006"; }); @@ -67830,11 +68662,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivia_dot_benchmark = (build-asdf-system { pname = "trivia.benchmark"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "trivia.benchmark" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2023-06-18/trivia-20230618-git.tgz"; - sha256 = "13q261kc4y3g16zswfs1f2y57jpg04d7cx3xig76wp8wfgaq5g1m"; + url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.benchmark"; asd = "trivia.benchmark"; }); @@ -67846,11 +68678,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivia_dot_cffi = (build-asdf-system { pname = "trivia.cffi"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "trivia.cffi" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2023-06-18/trivia-20230618-git.tgz"; - sha256 = "13q261kc4y3g16zswfs1f2y57jpg04d7cx3xig76wp8wfgaq5g1m"; + url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.cffi"; asd = "trivia.cffi"; }); @@ -67862,11 +68694,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivia_dot_fset = (build-asdf-system { pname = "trivia.fset"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "trivia.fset" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2023-06-18/trivia-20230618-git.tgz"; - sha256 = "13q261kc4y3g16zswfs1f2y57jpg04d7cx3xig76wp8wfgaq5g1m"; + url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.fset"; asd = "trivia.fset"; }); @@ -67878,11 +68710,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivia_dot_level0 = (build-asdf-system { pname = "trivia.level0"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "trivia.level0" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2023-06-18/trivia-20230618-git.tgz"; - sha256 = "13q261kc4y3g16zswfs1f2y57jpg04d7cx3xig76wp8wfgaq5g1m"; + url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.level0"; asd = "trivia.level0"; }); @@ -67892,11 +68724,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivia_dot_level1 = (build-asdf-system { pname = "trivia.level1"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "trivia.level1" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2023-06-18/trivia-20230618-git.tgz"; - sha256 = "13q261kc4y3g16zswfs1f2y57jpg04d7cx3xig76wp8wfgaq5g1m"; + url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.level1"; asd = "trivia.level1"; }); @@ -67906,11 +68738,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivia_dot_level2 = (build-asdf-system { pname = "trivia.level2"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "trivia.level2" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2023-06-18/trivia-20230618-git.tgz"; - sha256 = "13q261kc4y3g16zswfs1f2y57jpg04d7cx3xig76wp8wfgaq5g1m"; + url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.level2"; asd = "trivia.level2"; }); @@ -67920,11 +68752,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivia_dot_ppcre = (build-asdf-system { pname = "trivia.ppcre"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "trivia.ppcre" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2023-06-18/trivia-20230618-git.tgz"; - sha256 = "13q261kc4y3g16zswfs1f2y57jpg04d7cx3xig76wp8wfgaq5g1m"; + url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.ppcre"; asd = "trivia.ppcre"; }); @@ -67936,11 +68768,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivia_dot_quasiquote = (build-asdf-system { pname = "trivia.quasiquote"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "trivia.quasiquote" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2023-06-18/trivia-20230618-git.tgz"; - sha256 = "13q261kc4y3g16zswfs1f2y57jpg04d7cx3xig76wp8wfgaq5g1m"; + url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.quasiquote"; asd = "trivia.quasiquote"; }); @@ -67950,11 +68782,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivia_dot_test = (build-asdf-system { pname = "trivia.test"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "trivia.test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2023-06-18/trivia-20230618-git.tgz"; - sha256 = "13q261kc4y3g16zswfs1f2y57jpg04d7cx3xig76wp8wfgaq5g1m"; + url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.test"; asd = "trivia.test"; }); @@ -67966,11 +68798,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivia_dot_trivial = (build-asdf-system { pname = "trivia.trivial"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "trivia.trivial" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2023-06-18/trivia-20230618-git.tgz"; - sha256 = "13q261kc4y3g16zswfs1f2y57jpg04d7cx3xig76wp8wfgaq5g1m"; + url = "http://beta.quicklisp.org/archive/trivia/2024-10-12/trivia-20241012-git.tgz"; + sha256 = "1kysjmgi0hg4f4vwn64494aylsywxs66ksz3bnissf9p5nzgz61b"; system = "trivia.trivial"; asd = "trivia.trivial"; }); @@ -67978,13 +68810,29 @@ in lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "trivia_dot_level2" self) ]; meta = {}; }); + trivial-adjust-simple-array = (build-asdf-system { + pname = "trivial-adjust-simple-array"; + version = "20241012-git"; + asds = [ "trivial-adjust-simple-array" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/trivial-adjust-simple-array/2024-10-12/trivial-adjust-simple-array-20241012-git.tgz"; + sha256 = "05yifs4b44whqz4bgv4wys6kvza8y7z5w52kh55ch7krpv61ncy6"; + system = "trivial-adjust-simple-array"; + asd = "trivial-adjust-simple-array"; + }); + systems = [ "trivial-adjust-simple-array" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + }); trivial-arguments = (build-asdf-system { pname = "trivial-arguments"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "trivial-arguments" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-arguments/2023-10-21/trivial-arguments-20231021-git.tgz"; - sha256 = "1gfkybbb3xy93gvlr6hzyf65llfhp21mmv3bb92h4wc2mfr8i336"; + url = "http://beta.quicklisp.org/archive/trivial-arguments/2024-10-12/trivial-arguments-20241012-git.tgz"; + sha256 = "1x1jifrw4ryyqgbln07znrc1drl4gxvzhbhv5gl1kgp2xm0rvr7j"; system = "trivial-arguments"; asd = "trivial-arguments"; }); @@ -68136,11 +68984,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivial-clipboard = (build-asdf-system { pname = "trivial-clipboard"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "trivial-clipboard" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-clipboard/2023-10-21/trivial-clipboard-20231021-git.tgz"; - sha256 = "029qmx523xfk54p99ndgbmdd20s5i32mzpf77xymngrn4c33v9jk"; + url = "http://beta.quicklisp.org/archive/trivial-clipboard/2024-10-12/trivial-clipboard-20241012-git.tgz"; + sha256 = "1agj4nvw4qq7k4vp64y15gq5h5g22zasys48c2bvzqjr0n9d4lj1"; system = "trivial-clipboard"; asd = "trivial-clipboard"; }); @@ -68150,11 +68998,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivial-clipboard-test = (build-asdf-system { pname = "trivial-clipboard-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "trivial-clipboard-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-clipboard/2023-10-21/trivial-clipboard-20231021-git.tgz"; - sha256 = "029qmx523xfk54p99ndgbmdd20s5i32mzpf77xymngrn4c33v9jk"; + url = "http://beta.quicklisp.org/archive/trivial-clipboard/2024-10-12/trivial-clipboard-20241012-git.tgz"; + sha256 = "1agj4nvw4qq7k4vp64y15gq5h5g22zasys48c2bvzqjr0n9d4lj1"; system = "trivial-clipboard-test"; asd = "trivial-clipboard-test"; }); @@ -68164,6 +69012,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + trivial-clock = (build-asdf-system { + pname = "trivial-clock"; + version = "20241012-git"; + asds = [ "trivial-clock" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/cl-trivial-clock/2024-10-12/cl-trivial-clock-20241012-git.tgz"; + sha256 = "1m1351j3xvrf6631gmf99xaxb3dhh4ak657p1hac3b9f9a5h85nd"; + system = "trivial-clock"; + asd = "trivial-clock"; + }); + systems = [ "trivial-clock" ]; + lispLibs = [ (getAttr "cffi" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); trivial-cltl2 = (build-asdf-system { pname = "trivial-cltl2"; version = "20211230-git"; @@ -68514,11 +69378,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivial-file-size = (build-asdf-system { pname = "trivial-file-size"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "trivial-file-size" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-file-size/2022-11-06/trivial-file-size-20221106-git.tgz"; - sha256 = "0ji5j3zgshmfgxwg2yh599r47zaivzky646zk12jg48sb3i7q8fw"; + url = "http://beta.quicklisp.org/archive/trivial-file-size/2024-10-12/trivial-file-size-20241012-git.tgz"; + sha256 = "08dbyrrgvvl459lk3pcq0j7qryb20hdh946y42h4jsp5crhbi71z"; system = "trivial-file-size"; asd = "trivial-file-size"; }); @@ -68542,11 +69406,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivial-gray-streams = (build-asdf-system { pname = "trivial-gray-streams"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "trivial-gray-streams" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-gray-streams/2023-10-21/trivial-gray-streams-20231021-git.tgz"; - sha256 = "08jfx79cayi27fd2icxyy3salwrypy61i2fm8mbcq424xlm21ida"; + url = "http://beta.quicklisp.org/archive/trivial-gray-streams/2024-10-12/trivial-gray-streams-20241012-git.tgz"; + sha256 = "0iw6q5hx7x8sc5s7ikvsjccsksbm0rd13d54mkrg62sc56hjywrm"; system = "trivial-gray-streams"; asd = "trivial-gray-streams"; }); @@ -68556,11 +69420,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivial-gray-streams-test = (build-asdf-system { pname = "trivial-gray-streams-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "trivial-gray-streams-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-gray-streams/2023-10-21/trivial-gray-streams-20231021-git.tgz"; - sha256 = "08jfx79cayi27fd2icxyy3salwrypy61i2fm8mbcq424xlm21ida"; + url = "http://beta.quicklisp.org/archive/trivial-gray-streams/2024-10-12/trivial-gray-streams-20241012-git.tgz"; + sha256 = "0iw6q5hx7x8sc5s7ikvsjccsksbm0rd13d54mkrg62sc56hjywrm"; system = "trivial-gray-streams-test"; asd = "trivial-gray-streams-test"; }); @@ -68808,16 +69672,16 @@ in lib.makeScope pkgs.newScope (self: { }); trivial-main-thread = (build-asdf-system { pname = "trivial-main-thread"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "trivial-main-thread" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-main-thread/2023-10-21/trivial-main-thread-20231021-git.tgz"; - sha256 = "0l7avhykgg5ssr7jczjkgz71zzdbq0sadi2sikdw6mgysjh9fsqv"; + url = "http://beta.quicklisp.org/archive/trivial-main-thread/2024-10-12/trivial-main-thread-20241012-git.tgz"; + sha256 = "0vxr82ald41355hvlg0ngrpzkz9y3nyl24h58306kmg982xk4hnk"; system = "trivial-main-thread"; asd = "trivial-main-thread"; }); systems = [ "trivial-main-thread" ]; - lispLibs = [ (getAttr "bordeaux-threads" self) (getAttr "simple-tasks" self) (getAttr "trivial-features" self) ]; + lispLibs = [ (getAttr "bordeaux-threads" self) (getAttr "documentation-utils" self) (getAttr "trivial-features" self) ]; meta = {}; }); trivial-method-combinations = (build-asdf-system { @@ -68948,11 +69812,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivial-octet-streams = (build-asdf-system { pname = "trivial-octet-streams"; - version = "20130128-git"; + version = "20241012-git"; asds = [ "trivial-octet-streams" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-octet-streams/2013-01-28/trivial-octet-streams-20130128-git.tgz"; - sha256 = "0ysnsarlzynb7jf4b63b6kkxjancxc66jwmn0sb3vxyh87siiv6n"; + url = "http://beta.quicklisp.org/archive/trivial-octet-streams/2024-10-12/trivial-octet-streams-20241012-git.tgz"; + sha256 = "0zj7aijn10hflr87774hwi5k1jzq6j5bgh2hm70ixxhcmaq7lqk5"; system = "trivial-octet-streams"; asd = "trivial-octet-streams"; }); @@ -69026,11 +69890,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivial-package-locks = (build-asdf-system { pname = "trivial-package-locks"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "trivial-package-locks" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-package-locks/2023-06-18/trivial-package-locks-20230618-git.tgz"; - sha256 = "0zkc1k43r08yh7p62br1n48yc2fyn2xpph9pbfwip0g3q38vhx2k"; + url = "http://beta.quicklisp.org/archive/trivial-package-locks/2024-10-12/trivial-package-locks-20241012-git.tgz"; + sha256 = "09zhirygjmwr4xvwp1zx9b17mkxml7f7rni1xiwxg5vfgn0y1bi3"; system = "trivial-package-locks"; asd = "trivial-package-locks"; }); @@ -69042,11 +69906,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivial-package-manager = (build-asdf-system { pname = "trivial-package-manager"; - version = "20171227-git"; + version = "20241012-git"; asds = [ "trivial-package-manager" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-package-manager/2017-12-27/trivial-package-manager-20171227-git.tgz"; - sha256 = "0v61x4wzamilnjyq35ki46zl9443fslv9slwqwlazfknnbp3vcq8"; + url = "http://beta.quicklisp.org/archive/trivial-package-manager/2024-10-12/trivial-package-manager-20241012-git.tgz"; + sha256 = "1q71r9h5xra0bg5c5v2gzjjswfv626gfg9sxn59w645g30xn1sph"; system = "trivial-package-manager"; asd = "trivial-package-manager"; }); @@ -69056,11 +69920,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivial-package-manager_dot_test = (build-asdf-system { pname = "trivial-package-manager.test"; - version = "20171227-git"; + version = "20241012-git"; asds = [ "trivial-package-manager.test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-package-manager/2017-12-27/trivial-package-manager-20171227-git.tgz"; - sha256 = "0v61x4wzamilnjyq35ki46zl9443fslv9slwqwlazfknnbp3vcq8"; + url = "http://beta.quicklisp.org/archive/trivial-package-manager/2024-10-12/trivial-package-manager-20241012-git.tgz"; + sha256 = "1q71r9h5xra0bg5c5v2gzjjswfv626gfg9sxn59w645g30xn1sph"; system = "trivial-package-manager.test"; asd = "trivial-package-manager.test"; }); @@ -69152,11 +70016,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivial-sanitize = (build-asdf-system { pname = "trivial-sanitize"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "trivial-sanitize" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-sanitize/2023-10-21/trivial-sanitize-20231021-git.tgz"; - sha256 = "0m8aq5fczrq8fd825vjdvrgbkwzkz9lrl2xkp5lyps6vacgmp9cw"; + url = "http://beta.quicklisp.org/archive/trivial-sanitize/2024-10-12/trivial-sanitize-20241012-git.tgz"; + sha256 = "18pc1diq0mfmr3ql79islv2mfm4y791vg9xwz3dwp8wa912dd93h"; system = "trivial-sanitize"; asd = "trivial-sanitize"; }); @@ -69168,11 +70032,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivial-sanitize-tests = (build-asdf-system { pname = "trivial-sanitize-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "trivial-sanitize-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-sanitize/2023-10-21/trivial-sanitize-20231021-git.tgz"; - sha256 = "0m8aq5fczrq8fd825vjdvrgbkwzkz9lrl2xkp5lyps6vacgmp9cw"; + url = "http://beta.quicklisp.org/archive/trivial-sanitize/2024-10-12/trivial-sanitize-20241012-git.tgz"; + sha256 = "18pc1diq0mfmr3ql79islv2mfm4y791vg9xwz3dwp8wa912dd93h"; system = "trivial-sanitize-tests"; asd = "trivial-sanitize-tests"; }); @@ -69184,11 +70048,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivial-shell = (build-asdf-system { pname = "trivial-shell"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "trivial-shell" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-shell/2023-02-14/trivial-shell-20230214-git.tgz"; - sha256 = "0nj6d4adifp8pqzbq82n668vlc0nh7rnx4lbrsrvcx2pkq7i5551"; + url = "http://beta.quicklisp.org/archive/trivial-shell/2024-10-12/trivial-shell-20241012-git.tgz"; + sha256 = "0cqfipcywi1ndl43walw7d54rd7layjq3wv2wpz5rlprv7dhpb2p"; system = "trivial-shell"; asd = "trivial-shell"; }); @@ -69198,11 +70062,11 @@ in lib.makeScope pkgs.newScope (self: { }); trivial-shell-test = (build-asdf-system { pname = "trivial-shell-test"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "trivial-shell-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-shell/2023-02-14/trivial-shell-20230214-git.tgz"; - sha256 = "0nj6d4adifp8pqzbq82n668vlc0nh7rnx4lbrsrvcx2pkq7i5551"; + url = "http://beta.quicklisp.org/archive/trivial-shell/2024-10-12/trivial-shell-20241012-git.tgz"; + sha256 = "0cqfipcywi1ndl43walw7d54rd7layjq3wv2wpz5rlprv7dhpb2p"; system = "trivial-shell-test"; asd = "trivial-shell-test"; }); @@ -69292,6 +70156,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + trivial-system-loader = (build-asdf-system { + pname = "trivial-system-loader"; + version = "20241012-git"; + asds = [ "trivial-system-loader" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/trivial-system-loader/2024-10-12/trivial-system-loader-20241012-git.tgz"; + sha256 = "094j50asfgyhqcm86p47azviivap0hni2gjp3khdxcn4f9i9d2b0"; + system = "trivial-system-loader"; + asd = "trivial-system-loader"; + }); + systems = [ "trivial-system-loader" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + }); trivial-tco = (build-asdf-system { pname = "trivial-tco"; version = "20131003-git"; @@ -69372,6 +70252,38 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + trivial-toplevel-commands = (build-asdf-system { + pname = "trivial-toplevel-commands"; + version = "20241012-git"; + asds = [ "trivial-toplevel-commands" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/trivial-toplevel-commands/2024-10-12/trivial-toplevel-commands-20241012-git.tgz"; + sha256 = "03n0dpzgdgghc7cxj1s19w2wlx6r8f1s983f5a6cix5rigx9r834"; + system = "trivial-toplevel-commands"; + asd = "trivial-toplevel-commands"; + }); + systems = [ "trivial-toplevel-commands" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + trivial-toplevel-prompt = (build-asdf-system { + pname = "trivial-toplevel-prompt"; + version = "20241012-git"; + asds = [ "trivial-toplevel-prompt" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/trivial-toplevel-prompt/2024-10-12/trivial-toplevel-prompt-20241012-git.tgz"; + sha256 = "07gvazwqiw37sic9zz8qnl3gz0b8n4qzrwbmg4wy3rlkps98i4s2"; + system = "trivial-toplevel-prompt"; + asd = "trivial-toplevel-prompt"; + }); + systems = [ "trivial-toplevel-prompt" ]; + lispLibs = [ ]; + meta = { + hydraPlatforms = [ ]; + }; + }); trivial-types = (build-asdf-system { pname = "trivial-types"; version = "20120407-git"; @@ -69878,11 +70790,11 @@ in lib.makeScope pkgs.newScope (self: { }); type-templates = (build-asdf-system { pname = "type-templates"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "type-templates" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/type-templates/2023-10-21/type-templates-20231021-git.tgz"; - sha256 = "1gm9xc3wg7ina7fxh3a2jnn1fm744dk9dx138zl86wrbafwd8wg7"; + url = "http://beta.quicklisp.org/archive/type-templates/2024-10-12/type-templates-20241012-git.tgz"; + sha256 = "1zmz3bmwg8ncqbnjwimn8n7q9ik9arnhd5ijd22ap1nwhbnmk1rj"; system = "type-templates"; asd = "type-templates"; }); @@ -69894,11 +70806,11 @@ in lib.makeScope pkgs.newScope (self: { }); typo = (build-asdf-system { pname = "typo"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "typo" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/typo/2023-10-21/typo-20231021-git.tgz"; - sha256 = "137i9llr7dzhifa4khcnr1pk0scsplp1bxgp0f0xax4g3wk9gby8"; + url = "http://beta.quicklisp.org/archive/typo/2024-10-12/typo-20241012-git.tgz"; + sha256 = "1xgrfj1yxay04zf1ppf56b4j5p1wn67zfhiwpfd30dvk53mcrlik"; system = "typo"; asd = "typo"; }); @@ -69910,11 +70822,11 @@ in lib.makeScope pkgs.newScope (self: { }); typo_dot_test-suite = (build-asdf-system { pname = "typo.test-suite"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "typo.test-suite" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/typo/2023-10-21/typo-20231021-git.tgz"; - sha256 = "137i9llr7dzhifa4khcnr1pk0scsplp1bxgp0f0xax4g3wk9gby8"; + url = "http://beta.quicklisp.org/archive/typo/2024-10-12/typo-20241012-git.tgz"; + sha256 = "1xgrfj1yxay04zf1ppf56b4j5p1wn67zfhiwpfd30dvk53mcrlik"; system = "typo.test-suite"; asd = "typo.test-suite"; }); @@ -69958,11 +70870,11 @@ in lib.makeScope pkgs.newScope (self: { }); uax-15 = (build-asdf-system { pname = "uax-15"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "uax-15" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/uax-15/2022-11-06/uax-15-20221106-git.tgz"; - sha256 = "0kkr3sw3hqsb8ciyn8dzb1cfz260fk1y39vydc98gsfrn6nqh3vw"; + url = "http://beta.quicklisp.org/archive/uax-15/2024-10-12/uax-15-20241012-git.tgz"; + sha256 = "12qkq4r6qv5cn535bwpkq7zfahajlrv8v7661x4wzf4pp0avx7n6"; system = "uax-15"; asd = "uax-15"; }); @@ -70353,22 +71265,6 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); - unicly = (build-asdf-system { - pname = "unicly"; - version = "20210124-git"; - asds = [ "unicly" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/unicly/2021-01-24/unicly-20210124-git.tgz"; - sha256 = "1f29zc1gmnsmb84hbsvacg02bqfiq2mv9wgr0hhf3bjbji5jh5zb"; - system = "unicly"; - asd = "unicly"; - }); - systems = [ "unicly" ]; - lispLibs = [ (getAttr "ironclad" self) (getAttr "split-sequence" self) ]; - meta = { - hydraPlatforms = [ ]; - }; - }); unifgram = (build-asdf-system { pname = "unifgram"; version = "20180228-git"; @@ -70461,11 +71357,11 @@ in lib.makeScope pkgs.newScope (self: { }); unix-sockets = (build-asdf-system { pname = "unix-sockets"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "unix-sockets" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-unix-sockets/2023-06-18/cl-unix-sockets-20230618-git.tgz"; - sha256 = "13v1kv5d862mn8imkcdwhsfxsn1h6f735xqm8kxi5v901c7mdg3w"; + url = "http://beta.quicklisp.org/archive/cl-unix-sockets/2024-10-12/cl-unix-sockets-20241012-git.tgz"; + sha256 = "09l3032p3gavyin1hn45yqv6b3vrg74vzcz85ppqg4nzpmp44845"; system = "unix-sockets"; asd = "unix-sockets"; }); @@ -70477,11 +71373,11 @@ in lib.makeScope pkgs.newScope (self: { }); unix-sockets_dot_tests = (build-asdf-system { pname = "unix-sockets.tests"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "unix-sockets.tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-unix-sockets/2023-06-18/cl-unix-sockets-20230618-git.tgz"; - sha256 = "13v1kv5d862mn8imkcdwhsfxsn1h6f735xqm8kxi5v901c7mdg3w"; + url = "http://beta.quicklisp.org/archive/cl-unix-sockets/2024-10-12/cl-unix-sockets-20241012-git.tgz"; + sha256 = "09l3032p3gavyin1hn45yqv6b3vrg74vzcz85ppqg4nzpmp44845"; system = "unix-sockets.tests"; asd = "unix-sockets.tests"; }); @@ -70573,11 +71469,11 @@ in lib.makeScope pkgs.newScope (self: { }); usocket = (build-asdf-system { pname = "usocket"; - version = "0.8.6"; + version = "0.8.8"; asds = [ "usocket" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/usocket/2023-06-18/usocket-0.8.6.tgz"; - sha256 = "0by8hhg6gijdbq5vjykd374rmvqyikp4synpyk0wjcl7rk3r0vgn"; + url = "http://beta.quicklisp.org/archive/usocket/2024-10-12/usocket-0.8.8.tgz"; + sha256 = "13j2hyl7j06vl8hh3930wd3bi2p0pcg4dcd243al31fgw4m0bvag"; system = "usocket"; asd = "usocket"; }); @@ -70587,11 +71483,11 @@ in lib.makeScope pkgs.newScope (self: { }); usocket-server = (build-asdf-system { pname = "usocket-server"; - version = "0.8.6"; + version = "0.8.8"; asds = [ "usocket-server" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/usocket/2023-06-18/usocket-0.8.6.tgz"; - sha256 = "0by8hhg6gijdbq5vjykd374rmvqyikp4synpyk0wjcl7rk3r0vgn"; + url = "http://beta.quicklisp.org/archive/usocket/2024-10-12/usocket-0.8.8.tgz"; + sha256 = "13j2hyl7j06vl8hh3930wd3bi2p0pcg4dcd243al31fgw4m0bvag"; system = "usocket-server"; asd = "usocket-server"; }); @@ -70601,11 +71497,11 @@ in lib.makeScope pkgs.newScope (self: { }); usocket-test = (build-asdf-system { pname = "usocket-test"; - version = "0.8.6"; + version = "0.8.8"; asds = [ "usocket-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/usocket/2023-06-18/usocket-0.8.6.tgz"; - sha256 = "0by8hhg6gijdbq5vjykd374rmvqyikp4synpyk0wjcl7rk3r0vgn"; + url = "http://beta.quicklisp.org/archive/usocket/2024-10-12/usocket-0.8.8.tgz"; + sha256 = "13j2hyl7j06vl8hh3930wd3bi2p0pcg4dcd243al31fgw4m0bvag"; system = "usocket-test"; asd = "usocket-test"; }); @@ -70615,6 +71511,38 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + utf8-input-stream = (build-asdf-system { + pname = "utf8-input-stream"; + version = "20241012-git"; + asds = [ "utf8-input-stream" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/utf8-input-stream/2024-10-12/utf8-input-stream-20241012-git.tgz"; + sha256 = "06fk8fsz9nngdfjymg93h1l5m4yhfg4w8as68zlaj698xf9ry3i5"; + system = "utf8-input-stream"; + asd = "utf8-input-stream"; + }); + systems = [ "utf8-input-stream" ]; + lispLibs = [ (getAttr "babel" self) (getAttr "trivial-gray-streams" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); + utf8-input-stream_dot_tests = (build-asdf-system { + pname = "utf8-input-stream.tests"; + version = "20241012-git"; + asds = [ "utf8-input-stream.tests" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/utf8-input-stream/2024-10-12/utf8-input-stream-20241012-git.tgz"; + sha256 = "06fk8fsz9nngdfjymg93h1l5m4yhfg4w8as68zlaj698xf9ry3i5"; + system = "utf8-input-stream.tests"; + asd = "utf8-input-stream.tests"; + }); + systems = [ "utf8-input-stream.tests" ]; + lispLibs = [ (getAttr "fiveam" self) (getAttr "flexi-streams" self) (getAttr "utf8-input-stream" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); utilities_dot_binary-dump = (build-asdf-system { pname = "utilities.binary-dump"; version = "20181210-git"; @@ -70769,6 +71697,22 @@ in lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "ironclad" self) (getAttr "trivial-utf-8" self) ]; meta = {}; }); + uuidv7 = (build-asdf-system { + pname = "uuidv7"; + version = "20241012-git"; + asds = [ "uuidv7" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/uuidv7.lisp/2024-10-12/uuidv7.lisp-20241012-git.tgz"; + sha256 = "1lirb92a1b3hpf66gndas4yix0smfckg9arzk69lpcvxsidzc66l"; + system = "uuidv7"; + asd = "uuidv7"; + }); + systems = [ "uuidv7" ]; + lispLibs = [ (getAttr "local-time" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); validate-list = (build-asdf-system { pname = "validate-list"; version = "20210411-git"; @@ -70849,11 +71793,11 @@ in lib.makeScope pkgs.newScope (self: { }); varray = (build-asdf-system { pname = "varray"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "varray" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2023-10-21/april-20231021-git.tgz"; - sha256 = "19f1q7y09mpbs9vw53xnfpdgsvc6y5sqv29fm1jp0rhwb5rl7g34"; + url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; + sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; system = "varray"; asd = "varray"; }); @@ -70925,11 +71869,11 @@ in lib.makeScope pkgs.newScope (self: { }); vellum = (build-asdf-system { pname = "vellum"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "vellum" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/vellum/2023-10-21/vellum-20231021-git.tgz"; - sha256 = "1i279h8hwhpbjlqc3r34g8pqxn8kxvi2b3mbszjdv9xar3g50w2g"; + url = "http://beta.quicklisp.org/archive/vellum/2024-10-12/vellum-20241012-git.tgz"; + sha256 = "0qy5hsyy3qf5245n5lfnhsfdjmsdjmwa2d3jp8gr6zg71npfx926"; system = "vellum"; asd = "vellum"; }); @@ -70941,16 +71885,16 @@ in lib.makeScope pkgs.newScope (self: { }); vellum-binary = (build-asdf-system { pname = "vellum-binary"; - version = "20230618-git"; + version = "20241012-git"; asds = [ "vellum-binary" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/vellum-binary/2023-06-18/vellum-binary-20230618-git.tgz"; - sha256 = "1mrmxzhqfqrbndsy3pf4ksq3kgg705vdaklf9ayc1vcp49jmy60x"; + url = "http://beta.quicklisp.org/archive/vellum-binary/2024-10-12/vellum-binary-20241012-git.tgz"; + sha256 = "15kv5vzzrf6c3nvibz3p3d9arxmvwska37p5s13g9d2z1k3wyag1"; system = "vellum-binary"; asd = "vellum-binary"; }); systems = [ "vellum-binary" ]; - lispLibs = [ (getAttr "chipz" self) (getAttr "cl-conspack" self) (getAttr "ieee-floats" self) (getAttr "nibbles" self) (getAttr "salza2" self) (getAttr "vellum" self) ]; + lispLibs = [ (getAttr "chipz" self) (getAttr "cl-conspack" self) (getAttr "ieee-floats" self) (getAttr "nibbles" self) (getAttr "salza2" self) (getAttr "trivial-utf-8" self) (getAttr "vellum" self) ]; meta = { hydraPlatforms = [ ]; }; @@ -70973,11 +71917,11 @@ in lib.makeScope pkgs.newScope (self: { }); vellum-csv = (build-asdf-system { pname = "vellum-csv"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "vellum-csv" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/vellum-csv/2023-10-21/vellum-csv-20231021-git.tgz"; - sha256 = "1m5sa73gbjpv0lzmzv3qv5xblh0p1fhldgm9yifqa86fj9fhaa0g"; + url = "http://beta.quicklisp.org/archive/vellum-csv/2024-10-12/vellum-csv-20241012-git.tgz"; + sha256 = "0xk4n6w3hsnn8cl34x8vigzmqnkdn04j6831095yyqk7373hvfql"; system = "vellum-csv"; asd = "vellum-csv"; }); @@ -70989,11 +71933,11 @@ in lib.makeScope pkgs.newScope (self: { }); vellum-csv-tests = (build-asdf-system { pname = "vellum-csv-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "vellum-csv-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/vellum-csv/2023-10-21/vellum-csv-20231021-git.tgz"; - sha256 = "1m5sa73gbjpv0lzmzv3qv5xblh0p1fhldgm9yifqa86fj9fhaa0g"; + url = "http://beta.quicklisp.org/archive/vellum-csv/2024-10-12/vellum-csv-20241012-git.tgz"; + sha256 = "0xk4n6w3hsnn8cl34x8vigzmqnkdn04j6831095yyqk7373hvfql"; system = "vellum-csv-tests"; asd = "vellum-csv-tests"; }); @@ -71005,11 +71949,11 @@ in lib.makeScope pkgs.newScope (self: { }); vellum-postmodern = (build-asdf-system { pname = "vellum-postmodern"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "vellum-postmodern" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/vellum-postmodern/2023-10-21/vellum-postmodern-20231021-git.tgz"; - sha256 = "17rkmls4c2ghp1wgsnq41mcjqmamphwpycd58fwwn07bj45n6ajx"; + url = "http://beta.quicklisp.org/archive/vellum-postmodern/2024-10-12/vellum-postmodern-20241012-git.tgz"; + sha256 = "1q7s57vfcs01nl03kjkyjk9ya68cnl9p6mf1z864imfd04ssy9gr"; system = "vellum-postmodern"; asd = "vellum-postmodern"; }); @@ -71021,11 +71965,11 @@ in lib.makeScope pkgs.newScope (self: { }); vellum-tests = (build-asdf-system { pname = "vellum-tests"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "vellum-tests" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/vellum/2023-10-21/vellum-20231021-git.tgz"; - sha256 = "1i279h8hwhpbjlqc3r34g8pqxn8kxvi2b3mbszjdv9xar3g50w2g"; + url = "http://beta.quicklisp.org/archive/vellum/2024-10-12/vellum-20241012-git.tgz"; + sha256 = "0qy5hsyy3qf5245n5lfnhsfdjmsdjmwa2d3jp8gr6zg71npfx926"; system = "vellum-tests"; asd = "vellum-tests"; }); @@ -71053,11 +71997,11 @@ in lib.makeScope pkgs.newScope (self: { }); verbose = (build-asdf-system { pname = "verbose"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "verbose" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/verbose/2023-10-21/verbose-20231021-git.tgz"; - sha256 = "16gfxvhx1xxib9iwxw9s6hkr9nb5cywkm9c5gmgxdcif1iglzlm0"; + url = "http://beta.quicklisp.org/archive/verbose/2024-10-12/verbose-20241012-git.tgz"; + sha256 = "1q0knjk1nlnvlg9kydyxzd4sd2v8vm9dx10zqz2bpihd5nyhz3nv"; system = "verbose"; asd = "verbose"; }); @@ -71085,11 +72029,11 @@ in lib.makeScope pkgs.newScope (self: { }); vernacular = (build-asdf-system { pname = "vernacular"; - version = "20211020-git"; + version = "20241012-git"; asds = [ "vernacular" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/vernacular/2021-10-20/vernacular-20211020-git.tgz"; - sha256 = "19vzn28hw4is4sgmvzqin18ds89s0pai21vcm0ky10vmfv6wg745"; + url = "http://beta.quicklisp.org/archive/vernacular/2024-10-12/vernacular-20241012-git.tgz"; + sha256 = "09jz68lms82vxq672pars6hqapvdl4z8z2v1s9kmzvgxm2khw8pw"; system = "vernacular"; asd = "vernacular"; }); @@ -71165,11 +72109,11 @@ in lib.makeScope pkgs.newScope (self: { }); vex = (build-asdf-system { pname = "vex"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "vex" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2023-10-21/april-20231021-git.tgz"; - sha256 = "19f1q7y09mpbs9vw53xnfpdgsvc6y5sqv29fm1jp0rhwb5rl7g34"; + url = "http://beta.quicklisp.org/archive/april/2024-10-12/april-20241012-git.tgz"; + sha256 = "1jb7c9hs8fvx7zm0p0pvsn8r5qsfnf9hr53xnnvcgparfjvxhfxn"; system = "vex"; asd = "vex"; }); @@ -71453,11 +72397,11 @@ in lib.makeScope pkgs.newScope (self: { }); vom = (build-asdf-system { pname = "vom"; - version = "20160825-git"; + version = "20241012-git"; asds = [ "vom" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz"; - sha256 = "0536kppj76ax4lrxhv42npkfjsmx45km2g439vf9jmw3apinz9cy"; + url = "http://beta.quicklisp.org/archive/vom/2024-10-12/vom-20241012-git.tgz"; + sha256 = "1rnrr69h3j8phm6z3cfagv2bjh71wbzx9acnas9fn33j3q94gr95"; system = "vom"; asd = "vom"; }); @@ -71755,11 +72699,11 @@ in lib.makeScope pkgs.newScope (self: { }); websocket-driver = (build-asdf-system { pname = "websocket-driver"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "websocket-driver" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/websocket-driver/2023-10-21/websocket-driver-20231021-git.tgz"; - sha256 = "107fgcmvpa84b6lld7whgk5dg3pa7l52ca4j2cg5b97bl440cgb3"; + url = "http://beta.quicklisp.org/archive/websocket-driver/2024-10-12/websocket-driver-20241012-git.tgz"; + sha256 = "1lj6xarr62199ladkml7qpgi86w94j4djrp54v9ch0zakni3rhj2"; system = "websocket-driver"; asd = "websocket-driver"; }); @@ -71771,11 +72715,11 @@ in lib.makeScope pkgs.newScope (self: { }); websocket-driver-base = (build-asdf-system { pname = "websocket-driver-base"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "websocket-driver-base" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/websocket-driver/2023-10-21/websocket-driver-20231021-git.tgz"; - sha256 = "107fgcmvpa84b6lld7whgk5dg3pa7l52ca4j2cg5b97bl440cgb3"; + url = "http://beta.quicklisp.org/archive/websocket-driver/2024-10-12/websocket-driver-20241012-git.tgz"; + sha256 = "1lj6xarr62199ladkml7qpgi86w94j4djrp54v9ch0zakni3rhj2"; system = "websocket-driver-base"; asd = "websocket-driver-base"; }); @@ -71787,11 +72731,11 @@ in lib.makeScope pkgs.newScope (self: { }); websocket-driver-client = (build-asdf-system { pname = "websocket-driver-client"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "websocket-driver-client" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/websocket-driver/2023-10-21/websocket-driver-20231021-git.tgz"; - sha256 = "107fgcmvpa84b6lld7whgk5dg3pa7l52ca4j2cg5b97bl440cgb3"; + url = "http://beta.quicklisp.org/archive/websocket-driver/2024-10-12/websocket-driver-20241012-git.tgz"; + sha256 = "1lj6xarr62199ladkml7qpgi86w94j4djrp54v9ch0zakni3rhj2"; system = "websocket-driver-client"; asd = "websocket-driver-client"; }); @@ -71803,11 +72747,11 @@ in lib.makeScope pkgs.newScope (self: { }); websocket-driver-server = (build-asdf-system { pname = "websocket-driver-server"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "websocket-driver-server" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/websocket-driver/2023-10-21/websocket-driver-20231021-git.tgz"; - sha256 = "107fgcmvpa84b6lld7whgk5dg3pa7l52ca4j2cg5b97bl440cgb3"; + url = "http://beta.quicklisp.org/archive/websocket-driver/2024-10-12/websocket-driver-20241012-git.tgz"; + sha256 = "1lj6xarr62199ladkml7qpgi86w94j4djrp54v9ch0zakni3rhj2"; system = "websocket-driver-server"; asd = "websocket-driver-server"; }); @@ -71881,6 +72825,22 @@ in lib.makeScope pkgs.newScope (self: { hydraPlatforms = [ ]; }; }); + whereiseveryone_dot_command-line-args = (build-asdf-system { + pname = "whereiseveryone.command-line-args"; + version = "20241012-git"; + asds = [ "whereiseveryone.command-line-args" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/whereiseveryone.command-line-args/2024-10-12/whereiseveryone.command-line-args-20241012-git.tgz"; + sha256 = "140xnz2v0v3hfg3dp2fhidw8ns6lxd3a5knm07wqdp48ksg119wy"; + system = "whereiseveryone.command-line-args"; + asd = "whereiseveryone.command-line-args"; + }); + systems = [ "whereiseveryone.command-line-args" ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "charje_dot_documentation" self) (getAttr "serapeum" self) (getAttr "str" self) (getAttr "trivia" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); which = (build-asdf-system { pname = "which"; version = "20160421-git"; @@ -71993,11 +72953,11 @@ in lib.makeScope pkgs.newScope (self: { }); winhttp = (build-asdf-system { pname = "winhttp"; - version = "20200610-git"; + version = "20241012-git"; asds = [ "winhttp" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/winhttp/2020-06-10/winhttp-20200610-git.tgz"; - sha256 = "121mpn14kfj86bp4qlc69a139ffrsvgiisa7rax9mvbj361s8dna"; + url = "http://beta.quicklisp.org/archive/winhttp/2024-10-12/winhttp-20241012-git.tgz"; + sha256 = "1g4prr0x2cyc58wcpa3kfiwcs9f536bzfmsnlwnh3yn9aqndg67c"; system = "winhttp"; asd = "winhttp"; }); @@ -72041,11 +73001,11 @@ in lib.makeScope pkgs.newScope (self: { }); with-branching = (build-asdf-system { pname = "with-branching"; - version = "20220220-git"; + version = "20241012-git"; asds = [ "with-branching" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/with-branching/2022-02-20/with-branching-20220220-git.tgz"; - sha256 = "0jaaz2b1k6pbh9hyvvsxp8dn18gqjz24kgri9wazqxyn0n05jpl9"; + url = "http://beta.quicklisp.org/archive/with-branching/2024-10-12/with-branching-20241012-git.tgz"; + sha256 = "0rhmlg1nbbhaa5jflhnydsqs7aqwg8d7ijxxcqa8lkcq49wvm647"; system = "with-branching"; asd = "with-branching"; }); @@ -72105,11 +73065,11 @@ in lib.makeScope pkgs.newScope (self: { }); with-contexts = (build-asdf-system { pname = "with-contexts"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "with-contexts" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/with-contexts/2023-02-14/with-contexts-20230214-git.tgz"; - sha256 = "11cfvsj594nms6652l2vvwgbl6zhk6cp46v0vd1y8b5ygi8fcarm"; + url = "http://beta.quicklisp.org/archive/with-contexts/2024-10-12/with-contexts-20241012-git.tgz"; + sha256 = "1biz33wxg312zsmpyjqfcmq4vnixxz3g4hp9krc61977d5n4fxwj"; system = "with-contexts"; asd = "with-contexts"; }); @@ -72217,25 +73177,25 @@ in lib.makeScope pkgs.newScope (self: { }); woo = (build-asdf-system { pname = "woo"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "woo" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/woo/2023-10-21/woo-20231021-git.tgz"; - sha256 = "0yzphn3c544vxj52z5h5zbvhz4ab3hm5mpsbsa57p0xa1gcm03r5"; + url = "http://beta.quicklisp.org/archive/woo/2024-10-12/woo-20241012-git.tgz"; + sha256 = "0nhxlb1qhkl20vknm44gx0cq5cks33rcljczfhgbnmpkzrdpdrrl"; system = "woo"; asd = "woo"; }); systems = [ "woo" ]; - lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "cffi" self) (getAttr "cffi-grovel" self) (getAttr "clack-socket" self) (getAttr "fast-http" self) (getAttr "fast-io" self) (getAttr "lev" self) (getAttr "quri" self) (getAttr "smart-buffer" self) (getAttr "static-vectors" self) (getAttr "swap-bytes" self) (getAttr "trivial-mimes" self) (getAttr "trivial-utf-8" self) (getAttr "vom" self) ]; + lispLibs = [ (getAttr "alexandria" self) (getAttr "bordeaux-threads" self) (getAttr "cffi" self) (getAttr "cffi-grovel" self) (getAttr "cl_plus_ssl" self) (getAttr "clack-socket" self) (getAttr "fast-http" self) (getAttr "fast-io" self) (getAttr "lev" self) (getAttr "quri" self) (getAttr "smart-buffer" self) (getAttr "static-vectors" self) (getAttr "swap-bytes" self) (getAttr "trivial-mimes" self) (getAttr "trivial-utf-8" self) (getAttr "vom" self) ]; meta = {}; }); woo-test = (build-asdf-system { pname = "woo-test"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "woo-test" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/woo/2023-10-21/woo-20231021-git.tgz"; - sha256 = "0yzphn3c544vxj52z5h5zbvhz4ab3hm5mpsbsa57p0xa1gcm03r5"; + url = "http://beta.quicklisp.org/archive/woo/2024-10-12/woo-20241012-git.tgz"; + sha256 = "0nhxlb1qhkl20vknm44gx0cq5cks33rcljczfhgbnmpkzrdpdrrl"; system = "woo-test"; asd = "woo-test"; }); @@ -72483,11 +73443,11 @@ in lib.makeScope pkgs.newScope (self: { }); xhtmlambda = (build-asdf-system { pname = "xhtmlambda"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "xhtmlambda" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/xhtmlambda/2023-02-14/xhtmlambda-20230214-git.tgz"; - sha256 = "0narbzz06ry1wn048avm1fwihvnjvvc4wfcv5hmdazkilpvnqz2y"; + url = "http://beta.quicklisp.org/archive/xhtmlambda/2024-10-12/xhtmlambda-20241012-git.tgz"; + sha256 = "1xqwps5lr66lhqiczvccxrpy8kff15fx6qr9nh1i65wi4p68i1bb"; system = "xhtmlambda"; asd = "xhtmlambda"; }); @@ -72609,11 +73569,11 @@ in lib.makeScope pkgs.newScope (self: { }); xml-emitter = (build-asdf-system { pname = "xml-emitter"; - version = "20221106-git"; + version = "20241012-git"; asds = [ "xml-emitter" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/xml-emitter/2022-11-06/xml-emitter-20221106-git.tgz"; - sha256 = "0yvcrzqz14kx90i6sm7kpi8l8hy61a1yjj0a8wvgryjbgp6abqvc"; + url = "http://beta.quicklisp.org/archive/xml-emitter/2024-10-12/xml-emitter-20241012-git.tgz"; + sha256 = "1q7iygd1v857a3c72kv4zxm9nhx94kkam4p8z5v10q2r2cwfps1w"; system = "xml-emitter"; asd = "xml-emitter"; }); @@ -72855,11 +73815,11 @@ in lib.makeScope pkgs.newScope (self: { }); yason = (build-asdf-system { pname = "yason"; - version = "20230214-git"; + version = "20241012-git"; asds = [ "yason" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/yason/2023-02-14/yason-20230214-git.tgz"; - sha256 = "00iwpdv04rwwb6y63dbgdz4925ih5kl0wc8dy91rsga15cbniqyd"; + url = "http://beta.quicklisp.org/archive/yason/2024-10-12/yason-20241012-git.tgz"; + sha256 = "00hqii9n6ay5cq1ahbqpnw3l3v0mmz5s1f9kn6l35g8zxj1nlpa7"; system = "yason"; asd = "yason"; }); @@ -72867,6 +73827,22 @@ in lib.makeScope pkgs.newScope (self: { lispLibs = [ (getAttr "alexandria" self) (getAttr "trivial-gray-streams" self) ]; meta = {}; }); + yason-tests = (build-asdf-system { + pname = "yason-tests"; + version = "20241012-git"; + asds = [ "yason-tests" ]; + src = (createAsd { + url = "http://beta.quicklisp.org/archive/yason/2024-10-12/yason-20241012-git.tgz"; + sha256 = "00hqii9n6ay5cq1ahbqpnw3l3v0mmz5s1f9kn6l35g8zxj1nlpa7"; + system = "yason-tests"; + asd = "yason-tests"; + }); + systems = [ "yason-tests" ]; + lispLibs = [ (getAttr "unit-test" self) (getAttr "yason" self) ]; + meta = { + hydraPlatforms = [ ]; + }; + }); youtube = (build-asdf-system { pname = "youtube"; version = "20191227-git"; @@ -73077,11 +74053,11 @@ in lib.makeScope pkgs.newScope (self: { }); zippy = (build-asdf-system { pname = "zippy"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "zippy" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/zippy/2023-10-21/zippy-20231021-git.tgz"; - sha256 = "1yvkqdpbsgsij6d7l6g5qdmgxpbq4670kjhv436h4iaxb9xdnz34"; + url = "http://beta.quicklisp.org/archive/zippy/2024-10-12/zippy-20241012-git.tgz"; + sha256 = "06znhzi4zjg2p2858cwnlslqvx28zlmqr9jqij0rkvnn7ysa7qcg"; system = "zippy"; asd = "zippy"; }); @@ -73093,11 +74069,11 @@ in lib.makeScope pkgs.newScope (self: { }); zippy-dwim = (build-asdf-system { pname = "zippy-dwim"; - version = "20231021-git"; + version = "20241012-git"; asds = [ "zippy-dwim" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/zippy/2023-10-21/zippy-20231021-git.tgz"; - sha256 = "1yvkqdpbsgsij6d7l6g5qdmgxpbq4670kjhv436h4iaxb9xdnz34"; + url = "http://beta.quicklisp.org/archive/zippy/2024-10-12/zippy-20241012-git.tgz"; + sha256 = "06znhzi4zjg2p2858cwnlslqvx28zlmqr9jqij0rkvnn7ysa7qcg"; system = "zippy-dwim"; asd = "zippy-dwim"; }); @@ -73205,11 +74181,11 @@ in lib.makeScope pkgs.newScope (self: { }); zpb-ttf = (build-asdf-system { pname = "zpb-ttf"; - version = "release-1.0.6"; + version = "release-1.0.7"; asds = [ "zpb-ttf" ]; src = (createAsd { - url = "http://beta.quicklisp.org/archive/zpb-ttf/2023-06-18/zpb-ttf-release-1.0.6.tgz"; - sha256 = "043xga76jms7dipcwnyh8lkj3gx66cvrkwhc728hjaf7axarvcmv"; + url = "http://beta.quicklisp.org/archive/zpb-ttf/2024-10-12/zpb-ttf-release-1.0.7.tgz"; + sha256 = "04lph7i153zlswvpgg76fxazyswj8j0idqm4ysn8qmflb7xcvd78"; system = "zpb-ttf"; asd = "zpb-ttf"; }); diff --git a/pkgs/development/lisp-modules/nix-cl.nix b/pkgs/development/lisp-modules/nix-cl.nix index 619a6144c5de..a1441d2e57ff 100644 --- a/pkgs/development/lisp-modules/nix-cl.nix +++ b/pkgs/development/lisp-modules/nix-cl.nix @@ -177,15 +177,23 @@ let asdf = "${asdfFasl}/asdf.${faslExt}"; }; - preConfigure = '' + configurePhase = '' + runHook preConfigure + source ${./setup-hook.sh} buildAsdfPath + + runHook postConfigure ''; buildPhase = optionalString (src != null) '' + runHook preBuild + export CL_SOURCE_REGISTRY=$CL_SOURCE_REGISTRY:$src// export ASDF_OUTPUT_TRANSLATIONS="$src:$(pwd):${storeDir}:${storeDir}" ${pkg}/bin/${program} ${toString flags} < $buildScript + + runHook postBuild ''; # Copy compiled files to store @@ -200,6 +208,8 @@ let concatMapStringsSep "\\|" (replaceStrings ["." "+"] ["[.]" "[+]"]) systems; in '' + runHook preInstall + mkdir -pv $out cp -r * $out @@ -207,6 +217,8 @@ let find $out -name "*.asd" \ | grep -v "/\(${mkSystemsRegex systems}\)\.asd$" \ | xargs rm -fv || true + + runHook postInstall ''; dontPatchShebangs = true; @@ -295,7 +307,7 @@ let $out/bin/${o.program} \ --add-flags "${toString o.flags}" \ --set ASDF "${o.asdfFasl}/asdf.${o.faslExt}" \ - --prefix CL_SOURCE_REGISTRY : "$CL_SOURCE_REGISTRY" \ + --prefix CL_SOURCE_REGISTRY : "$CL_SOURCE_REGISTRY''${CL_SOURCE_REGISTRY:+:}" \ --prefix ASDF_OUTPUT_TRANSLATIONS : "$(echo $CL_SOURCE_REGISTRY | sed s,//:,::,g):" \ --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ --prefix DYLD_LIBRARY_PATH : "$DYLD_LIBRARY_PATH" \ diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 7bada7cbd653..ea93ef4a4572 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -9,6 +9,7 @@ let setAttr hasAttr optionals + isDerivation hasSuffix splitString remove @@ -23,23 +24,33 @@ let # E.g. cl-unicode creating .txt files during compilation build-with-compile-into-pwd = args: let - build = (build-asdf-system (args // { version = args.version + "-build"; })) + args' = if isDerivation args then args.drvAttrs else args; + build = (build-asdf-system (args' // { version = args'.version + "-build"; })) .overrideAttrs(o: { buildPhase = with builtins; '' + runHook preBuild + mkdir __fasls export ASDF_OUTPUT_TRANSLATIONS="$(pwd):$(pwd)/__fasls:${storeDir}:${storeDir}" export CL_SOURCE_REGISTRY=$CL_SOURCE_REGISTRY:$(pwd)// ${o.pkg}/bin/${o.program} ${toString (o.flags or [])} < ${o.buildScript} + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -pv $out rm -rf __fasls cp -r * $out + + runHook postInstall ''; }); - in build-asdf-system (args // { + in build-asdf-system (args' // { # Patches are already applied in `build` patches = []; + postPatch = ""; src = build; }); @@ -49,39 +60,11 @@ let packages = ql.overrideScope (self: super: { - cl-environments = super.cl-environments.overrideLispAttrs (old: { - patches = old.patches or [] ++ [ - # Needed because SB-INT:TRULY-DYNAMIC-EXTENT has been removed since sbcl 2.3.10. - # The update isn't available on quicklisp yet, but we can fetch from upstream directly - (pkgs.fetchpatch { - url = "https://github.com/alex-gutev/cl-environments/commit/1bd7ecf68adeaf654616c6fb763c1239e0f2e221.patch"; - sha256 = "sha256-i6KdthYqPlJPvxM2c2kossHYvXNhpZHl/7NzELNrOHU="; - }) - ]; - }); - cl-unicode = build-with-compile-into-pwd { inherit (super.cl-unicode) pname version src systems; lispLibs = super.cl-unicode.lispLibs ++ [ self.flexi-streams ]; }; - dissect = super.dissect.overrideAttrs { - version = "1.0.0-trunk"; - src = pkgs.fetchFromGitHub { - owner = "Shinmera"; - repo = "dissect"; - rev = "a70cabcd748cf7c041196efd711e2dcca2bbbb2c"; - hash = "sha256-WXv/jbokgKJTc47rBjvOF5npnqDlsyr8oSXIzN/7ofo="; - }; - }; - - cl-gobject-introspection = super.cl-gobject-introspection.overrideLispAttrs (o: { - postPatch = '' - substituteInPlace src/init.lisp \ - --replace sb-ext::set-floating-point-modes sb-int:set-floating-point-modes - ''; - }); - jzon = super.com_dot_inuoe_dot_jzon; cl-notify = build-asdf-system { @@ -99,12 +82,7 @@ let ]; }; - cl-liballegro-nuklear = build-with-compile-into-pwd { - inherit (super.cl-liballegro-nuklear) pname version src; - nativeBuildInputs = [ pkgs.allegro5 ]; - nativeLibs = [ pkgs.allegro5 ]; - lispLibs = super.cl-liballegro-nuklear.lispLibs ++ [ self.cl-liballegro ]; - }; + cl-liballegro-nuklear = build-with-compile-into-pwd super.cl-liballegro-nuklear; lessp = build-asdf-system { pname = "lessp"; @@ -182,9 +160,15 @@ let cephes = build-with-compile-into-pwd { inherit (super.cephes) pname version src lispLibs; patches = [ ./patches/cephes-make.patch ]; + postPatch = '' + find \( -name '*.dll' -o -name '*.dylib' -o -name '*.so' \) -delete + ''; postConfigure = '' substituteAllInPlace cephes.asd ''; + postInstall = '' + find $out -name '*.o' -delete + ''; }; clx-truetype = build-asdf-system { @@ -266,37 +250,9 @@ let inherit (super.magicl) pname version src lispLibs; nativeBuildInputs = [ pkgs.gfortran ]; nativeLibs = [ pkgs.openblas ]; - patches = [ ./patches/magicl-dont-build-fortran-twice.patch ]; - }; - - cl-glib = build-asdf-system { - pname = "cl-glib"; - version = "1.0.0"; - src = pkgs.fetchFromGitHub { - owner = "bohonghuang"; - repo = "cl-glib"; - rev = "84b128192d6b11cf03f1150e474a23368f07edff"; - hash = "sha256-A56Yz+W4n1rAxxZg15zfkrLMbKMEG/zsWqaX7+kx4Qg="; - }; - lispLibs = with self; [ - cl-gobject-introspection-wrapper - bordeaux-threads - ]; }; - cl-glib_dot_gio = build-asdf-system { - pname = "cl-glib.gio"; - version = "1.0.0"; - src = pkgs.fetchFromGitHub { - owner = "bohonghuang"; - repo = "cl-glib"; - rev = "84b128192d6b11cf03f1150e474a23368f07edff"; - hash = "sha256-A56Yz+W4n1rAxxZg15zfkrLMbKMEG/zsWqaX7+kx4Qg="; - }; - lispLibs = with self; [ - cl-gobject-introspection-wrapper - ]; - }; + cl-glib_dot_gio = throw "cl-glib_dot_gio was replaced by cl-gio"; cl-gtk4 = build-asdf-system { pname = "cl-gtk4"; @@ -304,13 +260,14 @@ let src = pkgs.fetchFromGitHub { owner = "bohonghuang"; repo = "cl-gtk4"; - rev = "e18f621b996fd986d9829d590203c690440dee64"; - hash = "sha256-++qydw6db4O3m+DAjutVPN8IuePOxseo9vhWEvwiR6E="; + rev = "ff60e3495cdbba5c09d0bb8aa49f3184cc060c8e"; + hash = "sha256-06cyPf+5z+GE3YvZEJ67kC281nkwRz/hoaykTISsni0="; }; lispLibs = with self; [ cl-gobject-introspection-wrapper cl-glib - cl-glib_dot_gio + cl-gio + cl-gobject ]; nativeBuildInputs = [ pkgs.gobject-introspection @@ -323,13 +280,8 @@ let cl-gtk4_dot_adw = build-asdf-system { pname = "cl-gtk4.adw"; - version = "1.0.0"; - src = pkgs.fetchFromGitHub { - owner = "bohonghuang"; - repo = "cl-gtk4"; - rev = "e18f621b996fd986d9829d590203c690440dee64"; - hash = "sha256-++qydw6db4O3m+DAjutVPN8IuePOxseo9vhWEvwiR6E="; - }; + version = self.cl-gtk4.version; + src = self.cl-gtk4.src; lispLibs = with self; [ cl-gobject-introspection-wrapper cl-gtk4 @@ -342,15 +294,12 @@ let ]; }; - cl-gtk4_dot_webkit2 = build-asdf-system { - pname = "cl-gtk4.webkit2"; - version = "1.0.0"; - src = pkgs.fetchFromGitHub { - owner = "bohonghuang"; - repo = "cl-gtk4"; - rev = "e18f621b996fd986d9829d590203c690440dee64"; - hash = "sha256-++qydw6db4O3m+DAjutVPN8IuePOxseo9vhWEvwiR6E="; - }; + cl-gtk4_dot_webkit2 = throw "cl-gtk4_dot_webkit2 was replaced by cl-gtk4_dot_webkit"; + + cl-gtk4_dot_webkit = build-asdf-system { + pname = "cl-gtk4.webkit"; + version = self.cl-gtk4.version; + src = self.cl-gtk4.src; lispLibs = with self; [ cl-gobject-introspection-wrapper cl-gtk4 @@ -361,8 +310,6 @@ let nativeLibs = [ pkgs.webkitgtk_6_0 ]; - # Requires old webkitgtk_5_0 which was replaced by webkitgtk_6_0 - meta.broken = true; }; cl-avro = build-asdf-system { @@ -371,97 +318,43 @@ let src = pkgs.fetchFromGitHub { owner = "SahilKang"; repo = "cl-avro"; - rev = "7d624253e98afb987a01729bd72c99bae02f0d7d"; - hash = "sha256-AlTn+Q1gKnAFEfcnz9+VeHz681pPIirg2za3VXYiNWk="; + rev = "b8fa26320fa0ae88390215140d57f9cca937f691"; + hash = "sha256-acXsotvKWuffrLbrG9YJ8yZc5E6WC8N0qCFCAiX6N0Q="; }; lispLibs = with self; [ - alexandria - babel - chipz - closer-mop - ieee-floats - flexi-streams - local-time - local-time-duration - md5 - salza2 - st-json - time-interval + alexandria babel chipz closer-mop ieee-floats flexi-streams local-time + local-time-duration md5 salza2 st-json time-interval trivial-extensible-sequences ]; }; - trivial-clock = build-asdf-system { - pname = "trivial-clock"; - version = "trunk"; - src = pkgs.fetchFromGitHub { - owner = "ak-coram"; - repo = "cl-trivial-clock"; - rev = "641e12ab1763914996beb1ceee67aabc9f1a3b1e"; - hash = "sha256-mltQEJ2asxyQ/aS/9BuWmN3XZ9bGmmkopcF5YJU1cPk="; - }; - systems = [ "trivial-clock" "trivial-clock/test" ]; - lispLibs = [ self.cffi self.fiveam ]; - }; - - frugal-uuid = build-asdf-system { - pname = "frugal-uuid"; - version = "trunk"; - src = pkgs.fetchFromGitHub { - owner = "ak-coram"; - repo = "cl-frugal-uuid"; - rev = "be27972333a16fc3f16bc7fbf9e3013b2123d75c"; - hash = "sha256-rWO43vWMibF8/OxL70jle5nhd9oRWC7+MI44KWrQD48="; - }; - systems = [ "frugal-uuid" - "frugal-uuid/non-frugal" - "frugal-uuid/benchmark" - "frugal-uuid/test" ]; - lispLibs = with self; [ - babel - bordeaux-threads - fiveam + frugal-uuid = super.frugal-uuid.overrideLispAttrs (o: { + systems = [ + "frugal-uuid" + "frugal-uuid/non-frugal" + "frugal-uuid/benchmark" + "frugal-uuid/test" + ]; + lispLibs = o.lispLibs ++ (with self; [ ironclad - trivial-benchmark + babel trivial-clock - ]; - }; + trivial-benchmark + fiveam + ]); + }); - duckdb = build-asdf-system { - pname = "duckdb"; - version = "trunk"; - src = pkgs.fetchFromGitHub { - owner = "ak-coram"; - repo = "cl-duckdb"; - rev = "3ed1df5ba5c738a0b7fed7aa73632ec86f558d09"; - hash = "sha256-AJMxhtDACe6WTwEOxLsC8y6uBaPqjt8HLRw/eIZI02E="; - }; + duckdb = super.duckdb.overrideLispAttrs (o: { systems = [ "duckdb" "duckdb/test" "duckdb/benchmark" ]; - lispLibs = with self; [ - bordeaux-threads - cffi-libffi - cl-ascii-table - cl-spark - cl-ppcre - frugal-uuid - let-plus - local-time - local-time-duration - periods - float-features - ]; - nativeLibs = with pkgs; [ - duckdb libffi - ]; - }; + }); polyclot = build-asdf-system { pname = "polyclot"; version = "trunk"; src = pkgs.fetchfossil { - url = "https://fossil.turtleware.eu/polyclot"; - rev = "e678b3c3e002f53b446780406c9ed13f8451309d22a1dc50ced4dbeedf08a1ec"; - sha256 = "sha256-J08bU9HSVbzEivYtQsyIYPZJTrugj+jJSa4LglS0Olg="; + url = "https://fossil.turtleware.eu/fossil.turtleware.eu/polyclot"; + rev = "18500c968b1fc1e2a915b5c70b8cddc4a2b54de51da4eedc5454e42bfea3b479"; + sha256 = "sha256-KgBL1QQN4iG6d8E9GlKAuxSwkrY6Zy7e1ZzEDGKad+A="; }; systems = [ "eu.turtleware.polyclot" "eu.turtleware.polyclot/demo" ]; lispLibs = with self; [ clim mcclim mcclim-layouts ]; @@ -473,29 +366,18 @@ let src = pkgs.fetchFromGitHub { owner = "kaveh808"; repo = "kons-9"; - rev = "95ad44fac0566f445c4b7bd040339dcff75ee992"; - sha256 = "19rl7372j9f1cv2kl55r8vyf4dhcz4way4hkjgysbxzrb1psp17n"; + rev = "08770e7fbb839b91fd035f1cd4a50ecc81b42d57"; + sha256 = "sha256-Tit/qmOU5+zp43/ecIXGbh4CtgWzltWM7tHdVWkga0k="; }; systems = [ "kons-9" "kons-9/testsuite" ]; + patches = [ ./patches/kons-9-fix-testsuite-compilation.patch ]; lispLibs = with self; [ closer-mop trivial-main-thread trivial-backtrace cffi cl-opengl cl-glu - cl-glfw3 cl-paths-ttf zpb-ttf cl-vectors origin clobber + cl-glfw3 cl-paths-ttf zpb-ttf cl-vectors origin clobber shasht org_dot_melusina_dot_confidence ]; }; - sb-cga = build-asdf-system { - pname = "sb-cga"; - version = "1.0.1"; - src = pkgs.fetchFromGitHub { - owner = "nikodemus"; - repo = "sb-cga"; - rev = "9a554ea1c01cac998ff7eaa5f767bc5bcdc4c094"; - sha256 = "sha256-iBM+VXu6JRqGmeIFzfXbGot+elvangmfSpDB7DjFpPg"; - }; - lispLibs = [ self.alexandria ]; - }; - nsb-cga = super.nsb-cga.overrideLispAttrs (oa: { lispLibs = oa.lispLibs ++ [ self.sb-cga ]; }); @@ -560,30 +442,8 @@ let meta.mainProgram = "qlot"; }; - misc-extensions = super.misc-extensions.overrideLispAttrs (old: rec { - version = "4.0.3"; - src = pkgs.fetchFromGitLab { - domain = "gitlab.common-lisp.net"; - owner = "misc-extensions"; - repo = "misc-extensions"; - rev = "v${version}"; - hash = "sha256-bDNI4mIaNw/rf7ZwvwolKo6+mUUxsgubGUd/988sHAo="; - }; - }); - - fset = super.fset.overrideLispAttrs (old: rec { - version = "1.4.0"; - src = pkgs.fetchFromGitHub { - owner = "slburson"; - repo = "fset"; - rev = "v${version}"; - hash = "sha256-alO8Ek5Xpyl5N99/LgyIZ50aoRbY7bKh3XBntFV6Q5k="; - }; - lispLibs = with super; [ - self.misc-extensions - mt19937 - named-readtables - ]; + fset = super.fset.overrideLispAttrs (oa: { + systems = [ "fset" "fset/test" ]; meta = { description = "functional collections library"; homepage = "https://gitlab.common-lisp.net/fset/fset/-/wikis/home"; @@ -591,32 +451,25 @@ let }; }); - coalton = build-asdf-system { - pname = "coalton"; - version = "trunk"; - src = pkgs.fetchFromGitHub { - owner = "coalton-lang"; - repo = "coalton"; - rev = "05111b8a59e3f7346b175ce1ec621bff588e1e1f"; - hash = "sha256-L9o7Y3zDx9qLXGe/70c1LWEKUWsSRgBQru66mIuaCFw="; - }; - lispLibs = with super; [ - alexandria - eclector-concrete-syntax-tree - fiasco - float-features - self.fset - named-readtables - trivial-garbage + thih-coalton = self.coalton; + quil-coalton = self.coalton; + coalton = super.coalton.overrideLispAttrs (oa: { + systems = [ + "coalton" + "thih-coalton" + "quil-coalton" + "thih-coalton/tests" + "quil-coalton/tests" + "coalton/tests" ]; + lispLibs = oa.lispLibs ++ [ self.fiasco ]; nativeLibs = [ pkgs.mpfr ]; - systems = [ "coalton" "coalton/tests" ]; meta = { description = "statically typed functional programming language that supercharges Common Lisp"; homepage = "https://coalton-lang.github.io"; license = pkgs.lib.licenses.mit; }; - }; + }); }); diff --git a/pkgs/development/lisp-modules/patches/cephes-make.patch b/pkgs/development/lisp-modules/patches/cephes-make.patch index b67b5f70ad3c..10446972a115 100644 --- a/pkgs/development/lisp-modules/patches/cephes-make.patch +++ b/pkgs/development/lisp-modules/patches/cephes-make.patch @@ -1,22 +1,21 @@ --- a/cephes.asd +++ b/cephes.asd -@@ -5,7 +5,7 @@ - (defclass makefile (source-file) ((type :initform "m"))) - (defmethod perform ((o load-op) (c makefile)) t) - (defmethod perform ((o compile-op) (c makefile)) -- (let* ((lib-dir (system-relative-pathname "cephes" "scipy-cephes")) -+ (let* ((lib-dir #P"@out@/scipy-cephes") - (lib (make-pathname :directory `(:relative ,(namestring lib-dir)) - :name "libmd" - :type #+darwin "dylib" #+(and unix (not darwin)) "so" #+(or windows win32) "dll")) -@@ -14,7 +14,7 @@ - (format *error-output* "Library ~S exists, skipping build" lib) - (format *error-output* "Building ~S~%" lib)) - (unless built -- (chdir (native-namestring lib-dir)) -+ (chdir "scipy-cephes") - (run-program "make" :output t)))) +@@ -16,7 +16,7 @@ + (defclass makefile (source-file) ((type :initform "m"))) + (defmethod perform ((o load-op) (c makefile)) t) + (defmethod perform ((o compile-op) (c makefile)) +- (let* ((lib-dir (system-relative-pathname "cephes" "scipy-cephes/")) ++ (let* ((lib-dir #P"@out@/scipy-cephes/") + (lib (make-pathname :directory (pathname-directory lib-dir) + :name #+(or (and unix (not darwin)) windows win32) "libmd" + #+(and darwin arm64) "libmd-arm64" +@@ -30,7 +30,7 @@ + (format *error-output* "Library ~S exists, skipping build" lib) + (format *error-output* "Building ~S~%" lib)) + (unless built +- (chdir (native-namestring lib-dir)) ++ (chdir "scipy-cephes") + (run-program "make" :output t))))) (defsystem "cephes" -Diff finished. Thu Mar 28 08:13:30 2024 diff --git a/pkgs/development/lisp-modules/patches/kons-9-fix-testsuite-compilation.patch b/pkgs/development/lisp-modules/patches/kons-9-fix-testsuite-compilation.patch new file mode 100644 index 000000000000..afc0a3aa17c9 --- /dev/null +++ b/pkgs/development/lisp-modules/patches/kons-9-fix-testsuite-compilation.patch @@ -0,0 +1,22 @@ +--- a/testsuite/assertions.lisp ++++ b/testsuite/assertions.lisp +@@ -13,7 +13,7 @@ + relation when computing with floating point numbers. Two floating point numbers are + essentially equal when they are in a neighbourhood whose size is based + on the magnitude orders of these floating point numbers and the inaccuracy." +- (:report ++ :report + (lambda (stream) + (flet ((maybe-report (name float1 float2) + (unless (float-is-essentially-equal (p:y point1) (p:y point2) :inaccuracy inaccuracy) +@@ -29,7 +29,7 @@ + inaccuracy (confidence::float-comparison-threshold 'single-float max inaccuracy float1 float2))))) + (maybe-report "X" (p:x point1) (p:x point2)) + (maybe-report "Y" (p:y point1) (p:y point2)) +- (maybe-report "Z" (p:z point1) (p:z point2))))) ++ (maybe-report "Z" (p:z point1) (p:z point2)))) + (and (float-is-essentially-equal (p:x point1) (p:x point2) :inaccuracy inaccuracy) + (float-is-essentially-equal (p:y point1) (p:y point2) :inaccuracy inaccuracy) + (float-is-essentially-equal (p:z point1) (p:z point2) :inaccuracy inaccuracy))) + +Diff finished. Sun Oct 20 03:05:54 2024 diff --git a/pkgs/development/lisp-modules/patches/magicl-dont-build-fortran-twice.patch b/pkgs/development/lisp-modules/patches/magicl-dont-build-fortran-twice.patch deleted file mode 100644 index f63b6949b1fd..000000000000 --- a/pkgs/development/lisp-modules/patches/magicl-dont-build-fortran-twice.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/magicl.asd -+++ b/magicl.asd -@@ -143,6 +143,7 @@ - (shared-object (make-pathname :type #+darwin "dylib" #-darwin "so" - :name "libexpokit" - :defaults fortran-file))) -+ (unless (probe-file (nn shared-object)) - (uiop:run-program - (list "gfortran" "-fPIC" "-std=legacy" - "-c" -@@ -155,7 +156,7 @@ - (nn object-file) - #+darwin "-lblas" - #+darwin "-llapack")) -- (delete-file object-file)))) -+ (delete-file object-file))))) - - - (asdf:defsystem #:magicl/ext-expokit - -Diff finished. Mon Oct 10 22:03:54 2022 diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix index 91a458c0ef08..88e3b3b4d274 100644 --- a/pkgs/development/lisp-modules/ql.nix +++ b/pkgs/development/lisp-modules/ql.nix @@ -65,7 +65,7 @@ let nativeLibs = [ pkgs.sqlite ]; }); cl-webkit2 = super.cl-webkit2.overrideLispAttrs (o: { - nativeLibs = [ pkgs.webkitgtk ]; + nativeLibs = [ pkgs.webkitgtk_4_0 ]; }); dbd-mysql = super.dbd-mysql.overrideLispAttrs (o: { nativeLibs = [ pkgs.mariadb.client ]; @@ -86,7 +86,7 @@ let cffi-libffi = super.cffi-libffi.overrideLispAttrs (o: { nativeBuildInputs = [ pkgs.libffi ]; nativeLibs = [ pkgs.libffi ]; - patches = lib.optionals stdenv.isDarwin [ ./patches/cffi-libffi-darwin-ffi-h.patch ]; + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./patches/cffi-libffi-darwin-ffi-h.patch ]; }); cl-rabbit = super.cl-rabbit.overrideLispAttrs (o: { nativeBuildInputs = [ pkgs.rabbitmq-c ]; @@ -98,6 +98,9 @@ let sqlite = super.sqlite.overrideLispAttrs (o: { nativeLibs = [ pkgs.sqlite ]; }); + duckdb = super.duckdb.overrideLispAttrs (o: { + nativeLibs = [ pkgs.duckdb ]; + }); cl-libuv = super.cl-libuv.overrideLispAttrs (o: { nativeBuildInputs = [ pkgs.libuv ]; nativeLibs = [ pkgs.libuv ]; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 66711d3709c9..8074651f393c 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -437,16 +437,16 @@ buildLuarocksPackage { fennel = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "fennel"; - version = "1.5.0-1"; + version = "1.5.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fennel-1.5.0-1.rockspec"; - sha256 = "0h3a8pinazcp3r3pwkm5inh0aynq9iizljhpk6sj8zhhp0s0bi4g"; + url = "mirror://luarocks/fennel-1.5.1-1.rockspec"; + sha256 = "02wq1rlgv2zl1x30vqpdf5nmblxv7kkwx9lwplj4rj1fp9s3m8mh"; }).outPath; src = fetchFromGitHub { owner = "bakpakin"; repo = "Fennel"; - rev = "1.5.0"; - hash = "sha256-4jF22lpfapxQvwH/vQh/ePiEfOc8pP2b7roOzPXZRTQ="; + rev = "1.5.1"; + hash = "sha256-ciXElwX/F8YCFA6C0F3+8lnUPQlKYpcdpagAjoXZpyY="; }; disabled = luaOlder "5.1"; @@ -555,14 +555,14 @@ buildLuarocksPackage { fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "fzf-lua"; - version = "0.0.1457-1"; + version = "0.0.1479-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fzf-lua-0.0.1457-1.rockspec"; - sha256 = "1b1bad930cyicv9g0rd9k5hzk93kgxqk9gqw7adr7a9srb5gm431"; + url = "mirror://luarocks/fzf-lua-0.0.1479-1.rockspec"; + sha256 = "1xj0vw2y9y0ff88gcsh1q8vg9lsrsak435pzx8bizpcxkpaqizc4"; }).outPath; src = fetchzip { - url = "https://github.com/ibhagwan/fzf-lua/archive/f513524561060f2b9e3bd6d36ff046bfa03ca114.zip"; - sha256 = "0rqh2bvh1bp5i4y1xrvggi0d27a6qbpkvcinrq0c6s9k8g84d7wy"; + url = "https://github.com/ibhagwan/fzf-lua/archive/ce1e24f2a48089b65deefcb0a71a9856839002b5.zip"; + sha256 = "0nfihl95bxrjmkin8wj6d8sznch695fk2wxkwk6wd92v5dlapypx"; }; disabled = luaOlder "5.1"; @@ -606,8 +606,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "1ef74b546732f185d0f806860fa5404df7614f28"; - hash = "sha256-s3y8ZuLV00GIhizcK/zqsJOTKecql7Xn3LGYmH7NLsQ="; + rev = "ee7634ab4f0a6606438fe13e16cbf2065589a5ed"; + hash = "sha256-jR7/rX2bsOMkWc4MHMRlBDdELgl8JOVjGOcx6bl/nYw="; }; disabled = lua.luaversion != "5.1"; @@ -622,14 +622,14 @@ buildLuarocksPackage { haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "haskell-tools.nvim"; - version = "4.0.1-1"; + version = "4.3.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/haskell-tools.nvim-4.0.1-1.rockspec"; - sha256 = "1kz93jm9fx5qga4nszb0g3rgravzrz4qb8fbns87hl5qidrh20rq"; + url = "mirror://luarocks/haskell-tools.nvim-4.3.1-1.rockspec"; + sha256 = "1aw8rs6b384qp33j615ixp2iz8qpfs9nwv5psgknb38pswh9ldly"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/4.0.1.zip"; - sha256 = "160mnzjf6f5aw2k9fb2g416wxj3fqhpig1myppglp1586hm7b3fl"; + url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v4.3.1.zip"; + sha256 = "1ssgwms4jipl7j3v51wzmhllg1bm4k1nd3j5i8rwmjcv704izik9"; }; disabled = luaOlder "5.1"; @@ -853,16 +853,16 @@ buildLuarocksPackage { llscheck = callPackage({ ansicolors, argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, lua-cjson, luaOlder, luafilesystem, penlight }: buildLuarocksPackage { pname = "llscheck"; - version = "0.5.0-1"; + version = "0.6.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/llscheck-0.5.0-1.rockspec"; - sha256 = "1bcyg1gphlgwmra8l1503yaw6wfihs1fksdvvp1y38zryhkvj0dy"; + url = "mirror://luarocks/llscheck-0.6.0-1.rockspec"; + sha256 = "1scgsjgsjbapqgwvwcd9l378sipin2w85mcjdi0fzgldsx87gwni"; }).outPath; src = fetchFromGitHub { owner = "jeffzi"; repo = "llscheck"; - rev = "v0.5.0"; - hash = "sha256-cG/FNzOwvLvrAEut4OvXI8WWSVzNEl4r3OgiSnp3S5c="; + rev = "v0.6.0"; + hash = "sha256-XYfcVPiYCDrmuHyR1TN4QvsWIvbs86FN3UQYfrRHPiI="; }; disabled = luaOlder "5.1"; @@ -1534,16 +1534,16 @@ buildLuarocksPackage { lua-yajl = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lua-yajl"; - version = "2.0-1"; + version = "2.1-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-yajl-2.0-1.rockspec"; - sha256 = "0h600zgq5qc9z3cid1kr35q3qb98alg0m3qf0a3mfj33hya6pcxp"; + url = "mirror://luarocks/lua-yajl-2.1-0.rockspec"; + sha256 = "02jlgd4583p3q4w6hjgmdfkasxhamaj58byyrbmnch0qii61in9r"; }).outPath; src = fetchFromGitHub { owner = "brimworks"; repo = "lua-yajl"; - rev = "v2.0"; - hash = "sha256-/UhdjTUzd5ZsQG3CaS6i0cYOgkLR4TJCUAcw5yYhYEI="; + rev = "v2.1"; + hash = "sha256-zHBNedJkGEm47HpbeJvcm6JNUUfA1OunLHPJulR8rF8="; }; disabled = luaOlder "5.1"; @@ -1992,16 +1992,16 @@ buildLuarocksPackage { luaprompt = callPackage({ argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "luaprompt"; - version = "0.8-1"; + version = "0.9-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luaprompt-0.8-1.rockspec"; - sha256 = "17v7yqkvm4rxszqvqk3f6a6vqysh80p18l1ryif79bc7ic948br4"; + url = "mirror://luarocks/luaprompt-0.9-1.rockspec"; + sha256 = "0bh4fpfrqbg9bappnrfr6blvl3lzc99plq7jac67mhph1bjki7rk"; }).outPath; src = fetchFromGitHub { owner = "dpapavas"; repo = "luaprompt"; - rev = "v0.8"; - hash = "sha256-GdI5sj7FBeb9q23oxVOzT+yVhMYTnggaN8Xt/z/2xZo="; + rev = "v0.9"; + hash = "sha256-S6bzlIY1KlMK3wy01wGuRujGFgPxcNWmCaISQ87EBGs="; }; disabled = luaOlder "5.1"; @@ -2064,16 +2064,16 @@ buildLuarocksPackage { luarocks-build-rust-mlua = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }: buildLuarocksPackage { pname = "luarocks-build-rust-mlua"; - version = "0.2.2-1"; + version = "0.2.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luarocks-build-rust-mlua-0.2.2-1.rockspec"; - sha256 = "0y9ms0cf0jp4b26m6qbxsj4s4ng4z112qq4wc79q7xm7zw9dha4p"; + url = "mirror://luarocks/luarocks-build-rust-mlua-0.2.3-1.rockspec"; + sha256 = "0vkbl2xcjjpi5gn7v2fr7nyyd7fg91zknrgm61cz91mwp4x5i3pf"; }).outPath; src = fetchFromGitHub { owner = "mlua-rs"; repo = "luarocks-build-rust-mlua"; - rev = "0.2.2"; - hash = "sha256-vyFX5LFGrC+RXjmwLgBdmVawOCNatJva53MFvKa7ozM="; + rev = "0.2.3"; + hash = "sha256-SktU54lLaa9x6ntsyeaomsvCQJOtkJhIK/q5uDDFHqY="; }; @@ -2492,14 +2492,14 @@ buildLuarocksPackage { lz-n = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "lz.n"; - version = "2.6.1-1"; + version = "2.9.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lz.n-2.6.1-1.rockspec"; - sha256 = "01zg2hhwy8fd60h8akh7rc3b4wmdjrn0hxm11gqrnla80dvww91c"; + url = "mirror://luarocks/lz.n-2.9.1-1.rockspec"; + sha256 = "0x2xgmgxj9zvpa9x57981j3g21wm3zsylpwidk0wsbln7nag6b92"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/lz.n/archive/v2.6.1.zip"; - sha256 = "0j4pbaibf6zry4m15rb5xkx6ivycdfkfq0x2hdiwi82abir3ycaz"; + url = "https://github.com/nvim-neorocks/lz.n/archive/v2.9.1.zip"; + sha256 = "1xk4m8i61aiwcd9k5xp3wpn3frxkkjy5fk2921qkma1vsadd83yk"; }; disabled = luaOlder "5.1"; @@ -2515,14 +2515,14 @@ buildLuarocksPackage { lze = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "lze"; - version = "0.1.1-1"; + version = "0.4.4-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lze-0.1.1-1.rockspec"; - sha256 = "0rih9kgx846qhp1fmsqlnp8y08kv4hp8gl9dwykz4zr0zljy94j3"; + url = "mirror://luarocks/lze-0.4.4-1.rockspec"; + sha256 = "1qky68bg003d0n57pfb04l4q5sxbwp54kpbwdrwln6qnwbb93fcy"; }).outPath; src = fetchzip { - url = "https://github.com/BirdeeHub/lze/archive/v0.1.1.zip"; - sha256 = "1s6n61jabsv94s37xd5g0y7fxhficc4rwsklgsmzajravpgy60a8"; + url = "https://github.com/BirdeeHub/lze/archive/v0.4.4.zip"; + sha256 = "18g865sii3k09dk7ynhy37m27br3lwy003zl1x0fgqpnqd47114j"; }; disabled = luaOlder "5.1"; @@ -2718,17 +2718,41 @@ buildLuarocksPackage { }; }) {}; +neorg = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua-utils-nvim, luaOlder, nui-nvim, nvim-nio, pathlib-nvim, plenary-nvim }: +buildLuarocksPackage { + pname = "neorg"; + version = "9.1.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/neorg-9.1.1-1.rockspec"; + sha256 = "0zafy1hkrvh41vlx1g4rqlcvc4x9pi8dcji30qi0b8lj45pldyr3"; + }).outPath; + src = fetchzip { + url = "https://github.com/nvim-neorg/neorg/archive/v9.1.1.zip"; + sha256 = "18lk22lfzwwn4hy2s035g3kslqmvrr28lm5w9k3dazqwj5nlka3z"; + }; + + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ lua-utils-nvim nui-nvim nvim-nio pathlib-nvim plenary-nvim ]; + + meta = { + homepage = "https://github.com/nvim-neorg/neorg"; + description = "Modernity meets insane extensibility. The future of organizing your life in Neovim."; + maintainers = with lib.maintainers; [ GaetanLepage ]; + license.fullName = "GPL-3.0"; + }; +}) {}; + neotest = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, plenary-nvim }: buildLuarocksPackage { pname = "neotest"; - version = "5.4.1-1"; + version = "5.6.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/neotest-5.4.1-1.rockspec"; - sha256 = "0js7f2z6bsww9wlzzc1xrimrzz35nxhsn01hj3yhn4m0x7da20wi"; + url = "mirror://luarocks/neotest-5.6.1-1.rockspec"; + sha256 = "08r740v4yxhjxrh3xcbi9974d28h786lkbzff6x0bixdsvnysdwy"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neotest/neotest/archive/808cc4e2290c5e7c2440d32876ca15d580b01d04.zip"; - sha256 = "1xc9mmpkjcxv64rx0b73mm3wlniyyiyhs73s7n6pl4cxc93f2vpl"; + url = "https://github.com/nvim-neotest/neotest/archive/6d3d22cdad49999ef774ebe1bc250a4994038964.zip"; + sha256 = "10zac93v1i9iqbwwy4hb1q4wmwxg1nf9dmlywx6qmlkq0scnqg80"; }; disabled = luaOlder "5.1"; @@ -2797,8 +2821,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "ae644feb7b67bf1ce4260c231d1d4300b19c6f30"; - hash = "sha256-NcodgUp8obTsjgc+5j2dKr0f3FelYikQTJngfZXRZzo="; + rev = "29fb4854573355792df9e156cb779f0d31308796"; + hash = "sha256-dAsXxv1RtgMc1i5QrR2xqOeK6aRgYNqdYyTXVBXhVJ4="; }; disabled = luaOlder "5.1" || luaAtLeast "5.4"; @@ -2889,8 +2913,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683"; - hash = "sha256-5Jf2mWFVDofXBcXLbMa417mqlEPWLA+cQIZH/vNEV1g="; + rev = "2d9b06177a975543726ce5c73fca176cedbffe9d"; + hash = "sha256-bmmPekAvuBvLQmrnnX0n+FRBqfVxBsObhxIEkDGAla4="; }; disabled = luaOlder "5.1" || luaAtLeast "5.4"; @@ -2952,14 +2976,14 @@ buildLuarocksPackage { rest-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, luaOlder, mimetypes, nvim-nio, xml2lua }: buildLuarocksPackage { pname = "rest.nvim"; - version = "3.7.0-1"; + version = "3.8.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rest.nvim-3.7.0-1.rockspec"; - sha256 = "192vhinbvnj040xn6zclrf147f6ymiqah5lc8ijmx1yd8p0f730w"; + url = "mirror://luarocks/rest.nvim-3.8.3-1.rockspec"; + sha256 = "0xz2h3z1ifydhlyrv2h13s26y2amx1x5xqppd6sq4bcg4zk82qv3"; }).outPath; src = fetchzip { - url = "https://github.com/rest-nvim/rest.nvim/archive/v3.7.0.zip"; - sha256 = "03sfij7k1myz0nb6hy16wan3s64dk1vhq24akpmgw7xb1dasn3ay"; + url = "https://github.com/rest-nvim/rest.nvim/archive/v3.8.3.zip"; + sha256 = "0cjck6c2qpa13rll3n1i0a97kpzlzpmk93nl2c4lvgplc3xp6zkf"; }; disabled = luaOlder "5.1"; @@ -2976,14 +3000,14 @@ buildLuarocksPackage { rocks-config-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, rocks-nvim }: buildLuarocksPackage { pname = "rocks-config.nvim"; - version = "2.3.1-1"; + version = "3.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-config.nvim-2.3.1-1.rockspec"; - sha256 = "01pk8k2a81rxg5raysw3wbs0azk10ghh1f2nk2k4khnzw0b6xzpp"; + url = "mirror://luarocks/rocks-config.nvim-3.0.0-1.rockspec"; + sha256 = "08jg5v1jnmg0ig395d6lmsdpa2vw8m9w3barvar0s77a7lkxgywg"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v2.3.1.zip"; - sha256 = "0arvwb7c55mhcmngh3x2j56qbxfx9vp87nsxyzrsvd31ldgbsqdn"; + url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v3.0.0.zip"; + sha256 = "16836pxg0bq6f8qj6kn73v75kbwlr533pmv9dal4h53qldqjn9hh"; }; disabled = luaOlder "5.1"; @@ -3024,14 +3048,14 @@ buildLuarocksPackage { rocks-git-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim }: buildLuarocksPackage { pname = "rocks-git.nvim"; - version = "2.2.0-1"; + version = "2.5.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-git.nvim-2.2.0-1.rockspec"; - sha256 = "07pfqirhyphz283b5hs6ggwb2xlnigj3vj17hwhmb2fcv9ib3f61"; + url = "mirror://luarocks/rocks-git.nvim-2.5.0-1.rockspec"; + sha256 = "1qxmwl7b21d9cxbai24pg1pymd8pii4bgikkc017qi3dafk7baqk"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v2.2.0.zip"; - sha256 = "10cp3bdy04m4x0yrcivkgnqbs65rcrkgf14awc87wn727drs68sz"; + url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v2.5.0.zip"; + sha256 = "1nvq3yhmnab2frfkf5yh6ffq7rqw3rmxsbj0hbm28vg3rr9c2zjw"; }; disabled = luaOlder "5.1"; @@ -3048,14 +3072,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.40.0-1"; + version = "2.41.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks.nvim-2.40.0-1.rockspec"; - sha256 = "11cjx1cm4nynrs099r556a5yhkah9hxpylx5r6sqy0vwccvwplxp"; + url = "mirror://luarocks/rocks.nvim-2.41.0-1.rockspec"; + sha256 = "1srhz85sfhkzlsy68mvwhdixvwz0awhrn530sny0287zhnrxrilp"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.40.0.zip"; - sha256 = "00x5mn83w19ssahwg1bsmn3m5j4pmlg1caqlfpgx3b2hczas1v7l"; + url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.41.0.zip"; + sha256 = "0j44chcziimqn6jm2ckbwmn97nin0dwhnnrdpm87j754kbqsj21a"; }; disabled = luaOlder "5.1"; @@ -3095,14 +3119,14 @@ buildLuarocksPackage { rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "rustaceanvim"; - version = "5.4.2-1"; + version = "5.13.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rustaceanvim-5.4.2-1.rockspec"; - sha256 = "114ydzvchla7vam2ijihr66x88p5ww3r58zdb3fgc6dbbpcxjnrb"; + url = "mirror://luarocks/rustaceanvim-5.13.0-1.rockspec"; + sha256 = "1r0b3haiix45ngl570dld84h1y36lpw2lc1vsf5z08xms45c5fay"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/rustaceanvim/archive/5.4.2.zip"; - sha256 = "1nq9s0fnqjgbj1vcwf15512lp6i3w0axmca2hskmalyj65k157y1"; + url = "https://github.com/mrcjkb/rustaceanvim/archive/v5.13.0.zip"; + sha256 = "1prlsh1fl1a3r8fcshmzwbjk3imbxg2z43xl8fwbsginpizl8g09"; }; disabled = luaOlder "5.1"; @@ -3314,8 +3338,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "927c10f748e49c543b2d544c321a1245302ff324"; - hash = "sha256-dF6O5elMbm5JOeMI7UAyrwhq8Ng52/yBwpNJRWNAizQ="; + rev = "37dc9233a473dd6c3f54456ef9994d8f77c80211"; + hash = "sha256-zidYSt0WrnATuCpSGGhYuafNpPPN6dJ6hEuCgFytfEk="; }; disabled = lua.luaversion != "5.1"; @@ -3331,16 +3355,16 @@ buildLuarocksPackage { tiktoken_core = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, luarocks-build-rust-mlua }: buildLuarocksPackage { pname = "tiktoken_core"; - version = "0.2.1-1"; + version = "0.2.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/tiktoken_core-0.2.1-1.rockspec"; - sha256 = "0mdmrpg82vmk0cqiqdayyk4vvl299z0xqrg58q18dfs5nc27wkla"; + url = "mirror://luarocks/tiktoken_core-0.2.2-1.rockspec"; + sha256 = "1bx1kj47d6di1iflhccm5p7z2ry5c83f59pqi5jsf1r2h000p4n5"; }).outPath; src = fetchFromGitHub { owner = "gptlang"; repo = "lua-tiktoken"; - rev = "0.2.1"; - hash = "sha256-drSAVGHrdDdaWUEAfCE/2ZCI2nuffpbupO+TVWv/l4Y="; + rev = "v0.2.2"; + hash = "sha256-H83kk9dsH/cWBEx2AXQQ82l8sNfhzO864jwDd7vwAQc="; }; disabled = luaOlder "5.1"; @@ -3382,21 +3406,21 @@ buildLuarocksPackage { toml-edit = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luarocks-build-rust-mlua }: buildLuarocksPackage { pname = "toml-edit"; - version = "0.4.1-1"; + version = "0.6.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/toml-edit-0.4.1-1.rockspec"; - sha256 = "180zdqrzffr7jr9xls895gj5hrx6pfs98rlxwzg71382jy1n79qi"; + url = "mirror://luarocks/toml-edit-0.6.1-1.rockspec"; + sha256 = "0crvmigffka3n7583r1a7fgcjfq5b0819a7d155q50m52b7afc4z"; }).outPath; src = fetchzip { - url = "https://github.com/vhyrro/toml-edit.lua/archive/v0.4.1.zip"; - sha256 = "1322p490p6yza3lczfzmwf5nkfj4ra6m9g6hvr2qgay405wnpgy7"; + url = "https://github.com/nvim-neorocks/toml-edit.lua/archive/v0.6.1.zip"; + sha256 = "03gxfj2km4j08cx8yv70wvzwynnlwai6cdprrxnbf76mwy877hpg"; }; disabled = luaOlder "5.1"; nativeBuildInputs = [ luarocks-build-rust-mlua ]; meta = { - homepage = "https://github.com/vhyrro/toml-edit.lua"; + homepage = "https://github.com/nvim-neorocks/toml-edit.lua"; description = "TOML Parser + Formatting and Comment-Preserving Editor"; maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "MIT"; diff --git a/pkgs/development/lua-modules/nfd/default.nix b/pkgs/development/lua-modules/nfd/default.nix index 0bd421ede7ce..66624c6f0955 100644 --- a/pkgs/development/lua-modules/nfd/default.nix +++ b/pkgs/development/lua-modules/nfd/default.nix @@ -24,7 +24,7 @@ buildLuarocksPackage { luarocksConfig.variables.LUA_LIBDIR = "${lua}/lib"; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; postInstall = '' find $out -name nfd_zenity.so -execdir mv {} nfd.so \; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 228572dd9f25..5e9adc307a2a 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -246,7 +246,7 @@ in if luaAtLeast "5.1" && luaOlder "5.2" then { version = "20120430.51-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/lmathx-20120430.51-1.rockspec"; + url = "mirror://luarocks/lmathx-20120430.51-1.rockspec"; sha256 = "148vbv2g3z5si2db7rqg5bdily7m4sjyh9w6r3jnx3csvfaxyhp0"; }).outPath; src = fetchurl { @@ -257,7 +257,7 @@ in if luaAtLeast "5.2" && luaOlder "5.3" then { version = "20120430.52-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/lmathx-20120430.52-1.rockspec"; + url = "mirror://luarocks/lmathx-20120430.52-1.rockspec"; sha256 = "14rd625sipakm72wg6xqsbbglaxyjba9nsajsfyvhg0sz8qjgdya"; }).outPath; src = fetchurl { @@ -356,7 +356,7 @@ in luadbi-postgresql = prev.luadbi-postgresql.overrideAttrs (oa: { buildInputs = oa.buildInputs ++ [ - postgresql + (lib.getDev postgresql) ]; }); @@ -461,7 +461,7 @@ in ]; }); - luasystem = prev.luasystem.overrideAttrs (oa: lib.optionalAttrs stdenv.isLinux { + luasystem = prev.luasystem.overrideAttrs (oa: lib.optionalAttrs stdenv.hostPlatform.isLinux { buildInputs = [ glibc.out ]; }); @@ -503,7 +503,7 @@ in # 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; + meta.broken = stdenv.hostPlatform.isDarwin; }); lush-nvim = prev.lush-nvim.overrideAttrs (drv: { @@ -555,7 +555,7 @@ in }); neotest = prev.neotest.overrideAttrs(oa: { - doCheck = true; + doCheck = stdenv.isLinux; nativeCheckInputs = oa.nativeCheckInputs ++ [ final.nlua final.busted neovim-unwrapped ]; @@ -583,7 +583,15 @@ in export HOME=$(mktemp -d) busted --lua=nlua runHook postCheck - ''; + ''; + }); + + neorg = prev.neorg.overrideAttrs (oa: { + postConfigure = '' + substituteInPlace ''${rockspecFilename} \ + --replace-fail "'nvim-nio ~> 1.7'," "'nvim-nio >= 1.7'," \ + --replace-fail "'plenary.nvim == 0.1.4'," "'plenary.nvim'," + ''; }); plenary-nvim = prev.plenary-nvim.overrideAttrs (oa: { @@ -635,7 +643,7 @@ in buildInputs = [ libuv final.lua ]; nativeBuildInputs = [ pkg-config cmake ] - ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; }; luv = prev.luv.overrideAttrs (oa: { @@ -776,7 +784,7 @@ in }); sqlite = prev.sqlite.overrideAttrs (drv: { - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; nativeCheckInputs = [ final.plenary-nvim neovim-unwrapped ]; # the plugin loads the library from either the LIBSQLITE env @@ -814,7 +822,7 @@ in tiktoken_core = prev.tiktoken_core.overrideAttrs (oa: { cargoDeps = rustPlatform.fetchCargoTarball { src = oa.src; - hash = "sha256-YApsOGfAw34zp069lyGR6FGjxty1bE23+Tic07f8zI4="; + hash = "sha256-pKqG8aiV8BvvDO6RE6J3HEA/S4E4QunbO4WBpV5jUYk="; }; nativeBuildInputs = oa.nativeBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ]; }); @@ -823,10 +831,10 @@ in cargoDeps = rustPlatform.fetchCargoTarball { src = oa.src; - hash = "sha256-PLihirhJshcUQI3L1eTcnQiZvocDl29eQHhdBwJQRU8="; + hash = "sha256-lguGj8fDqztrvqvEYVcJLmiuxPDaCpXU8aztInKjF+E="; }; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin (if lua.pkgs.isLuaJIT then "-lluajit-${lua.luaversion}" else "-llua"); nativeBuildInputs = oa.nativeBuildInputs ++ [ diff --git a/pkgs/development/lua-modules/toml.patch b/pkgs/development/lua-modules/toml.patch deleted file mode 100644 index e04fc5d630f9..000000000000 --- a/pkgs/development/lua-modules/toml.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ab3884c..c0fd356 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -38,32 +38,23 @@ include(FetchContent) - - FetchContent_Declare( - ${TOML++} -- GIT_REPOSITORY "https://github.com/marzer/tomlplusplus.git" -- GIT_SHALLOW ON -- GIT_SUBMODULES "" -- GIT_TAG "v3.3.0" -+ DOWNLOAD_COMMAND true - ) - - FetchContent_Declare( - ${SOL2} -- GIT_REPOSITORY "https://github.com/ThePhD/sol2.git" -- GIT_SHALLOW ON -- GIT_SUBMODULES "" -- GIT_TAG "v3.3.0" -+ DOWNLOAD_COMMAND true - ) - - FetchContent_Declare( - ${MAGIC_ENUM} -- GIT_REPOSITORY "https://github.com/Neargye/magic_enum.git" -- GIT_SHALLOW ON -- GIT_SUBMODULES "" -- GIT_TAG "v0.8.2" -+ DOWNLOAD_COMMAND true - ) - - FetchContent_GetProperties(${TOML++}) - if(NOT ${TOML++}_POPULATED) - message(STATUS "Cloning ${TOML++}") -- FetchContent_Populate(${TOML++}) -+ FetchContent_Populate(${TOML++}) - FetchContent_MakeAvailable(${TOML++}) - endif() - -@@ -113,7 +104,7 @@ if(NOT LUA_INCLUDE_DIR OR (WIN32 AND NOT LUA_LIBRARIES)) - find_package(Lua) - endif() - --include_directories(${LUA_INCLUDE_DIR} src src/include ${${TOML++}_SOURCE_DIR} ${${SOL2}_SOURCE_DIR}/include ${${MAGIC_ENUM}_SOURCE_DIR}/include) -+include_directories(${LUA_INCLUDE_DIR} src src/include TOML_PLUS_PLUS_SRC ${${SOL2}_SOURCE_DIR}/include MAGIC_ENUM_SRC) - - set(SOURCES - src/toml.cpp -@@ -129,8 +120,8 @@ source_group(src FILES ${SOURCES}) - - if(WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") - target_link_options(toml.lua PUBLIC ${PROJECT_SOURCE_DIR}\\libs\\lua51.lib) --else() -- target_link_libraries(toml.lua ${LUA_LIBRARIES}) -+else() -+ target_link_libraries(toml.lua ${LUA_LIBRARIES}) - endif() - - if (LINK_FLAGS) diff --git a/pkgs/development/lua-modules/zip.patch b/pkgs/development/lua-modules/zip.patch deleted file mode 100644 index c3f88f451e8d..000000000000 --- a/pkgs/development/lua-modules/zip.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/Makefile 2007-10-30 01:59:10.000000000 +0300 -+++ b/Makefile 2014-09-18 11:04:53.176320021 +0400 -@@ -6,10 +6,6 @@ - - include $(CONFIG) - --ifeq "$(LUA_VERSION_NUM)" "500" --COMPAT_O= $(COMPAT_DIR)/compat-5.1.o --endif -- - SRCS= src/lua$T.c - OBJS= src/lua$T.o $(COMPAT_O) - -@@ -19,9 +15,6 @@ - src/$(LIBNAME): $(OBJS) - export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS) -lzzip - --$(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c -- $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c -- - install: src/$(LIBNAME) - mkdir -p $(LUA_LIBDIR) - cp src/$(LIBNAME) $(LUA_LIBDIR) diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index 0d856a44878b..10bc020a34a4 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "C runtime library for AVR microcontrollers"; homepage = "https://github.com/avrdudes/avr-libc"; + changelog = "https://github.com/avrdudes/avr-libc/blob/avr-libc-${finalAttrs.tag_version}-release/NEWS"; license = licenses.bsd3; platforms = [ "avr-none" ]; maintainers = with maintainers; [ mguentner emilytrau ]; diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix deleted file mode 100644 index 0ee98bb954d4..000000000000 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, runtimeShell }: - -stdenv.mkDerivation rec { - pname = "avr8-burn-omat"; - version = "2.1.2"; - - src = fetchurl { - url = "http://avr8-burn-o-mat.aaabbb.de/AVR8_Burn-O-Mat_${lib.replaceStrings ["."] ["_"] version}.zip"; - sha256 = "02k0fd0cd3y1yqip36wr3bkxbywp8913w4y7jdg6qwqxjnii58ln"; - }; - - nativeBuildInputs = [ unzip ]; - - # move to nix-support to not create that many symlinks.. - # TODO burnomat tries to read /usr/local/etc/avrdude.conf (but you can edit it within the settings dialog) - installPhase = '' - mkdir -p $out/{nix-support,bin} - mv *.jar license_gpl-3.0.txt lib *.xml *.png $out/nix-support - cat >> $out/bin/avr8-burn-omat << EOF - #!${runtimeShell} - cd $out/nix-support; exec java -jar AVR8_Burn_O_Mat.jar - EOF - chmod +x $out/bin/avr8-burn-omat - ''; - - meta = with lib; { - description = "GUI tool for avrdude"; - mainProgram = "avr8-burn-omat"; - homepage = "http://avr8-burn-o-mat.aaabbb.de/avr8_burn_o_mat_avrdude_gui_en.html"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = lib.licenses.gpl3; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/misc/breakpad/default.nix b/pkgs/development/misc/breakpad/default.nix deleted file mode 100644 index 0b5f4e52f39f..000000000000 --- a/pkgs/development/misc/breakpad/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchgit, zlib }: -let - lss = fetchgit { - url = "https://chromium.googlesource.com/linux-syscall-support"; - rev = "v2022.10.12"; - hash = "sha256-rF10v5oH4u9i9vnmFCVVl2Ew3h+QTiOsW64HeB0nRQU="; - }; -in stdenv.mkDerivation (finalAttrs: { - pname = "breakpad"; - - version = "2023.01.27"; - - src = fetchgit { - url = "https://chromium.googlesource.com/breakpad/breakpad"; - rev = "v${finalAttrs.version}"; - hash = "sha256-8msKz0K10r13TwM3oS6GCIlMdf8k8HBKfKJkPmrUrIs="; - }; - - buildInputs = [ zlib ]; - - postUnpack = '' - ln -s ${lss} $sourceRoot/src/third_party/lss - ''; - - meta = with lib; { - description = "Open-source multi-platform crash reporting system"; - homepage = "https://chromium.googlesource.com/breakpad"; - license = licenses.bsd3; - maintainers = with maintainers; [ berberman ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix deleted file mode 100644 index 3540c29e78ad..000000000000 --- a/pkgs/development/misc/brev-cli/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "brev-cli"; - version = "0.6.287"; - - src = fetchFromGitHub { - owner = "brevdev"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-5P0cZ7zbzEqWLQTi1kMGcC0R0BQa2gJrLzEcw17GATA="; - }; - - vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; - - CGO_ENABLED = 0; - subPackages = [ "." ]; - - ldflags = [ - "-s" - "-w" - "-X github.com/brevdev/brev-cli/pkg/cmd/version.Version=${src.rev}" - ]; - - postInstall = '' - mv $out/bin/brev-cli $out/bin/brev - ''; - - meta = with lib; { - description = "Connect your laptop to cloud computers"; - mainProgram = "brev"; - homepage = "https://github.com/brevdev/brev-cli"; - license = licenses.mit; - maintainers = with maintainers; [ dit7ya ]; - }; -} diff --git a/pkgs/development/misc/cppreference-doc/default.nix b/pkgs/development/misc/cppreference-doc/default.nix deleted file mode 100644 index dc0dcc687443..000000000000 --- a/pkgs/development/misc/cppreference-doc/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenvNoCC, fetchurl }: - -stdenvNoCC.mkDerivation rec { - pname = "cppreference-doc"; - version = "20240610"; - - src = fetchurl { - url = "https://github.com/PeterFeicht/${pname}/releases/download/v${version}/html-book-${version}.tar.xz"; - hash = "sha256-vCQSper39glNTrcPdlvfj2SeZUqKq/IBYMWoFpdoR2E="; - }; - - sourceRoot = "."; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/cppreference/doc - mv reference $out/share/cppreference/doc/html - - runHook postInstall - ''; - - passthru = { inherit pname version; }; - - meta = with lib; { - description = "C++ standard library reference"; - homepage = "https://en.cppreference.com"; - license = licenses.cc-by-sa-30; - maintainers = with maintainers; [ panicgh ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/misc/datafusion/default.nix b/pkgs/development/misc/datafusion/default.nix deleted file mode 100644 index 78b8023c5f6d..000000000000 --- a/pkgs/development/misc/datafusion/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "datafusion-cli"; - version = "33.0.0"; - - src = fetchFromGitHub { - name = "datafusion-cli-source"; - owner = "apache"; - repo = "arrow-datafusion"; - rev = version; - sha256 = "sha256-ywyzvk50Fr9TSaCrqd14lSi1PJ9ggA1YQ/X0aFGFk1M="; - }; - - sourceRoot = "${src.name}/datafusion-cli"; - - cargoHash = "sha256-0a/O9nNi3JLufQxG+5EgCXtV0y03X7R6UY+f/tVGB90="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - checkFlags = [ - # fails even outside the Nix sandbox - "--skip=object_storage::tests::s3_region_validation" - # broken - "--skip=exec::tests::create_object_store_table_gcs" - ]; - - meta = with lib; { - description = "cli for Apache Arrow DataFusion"; - mainProgram = "datafusion-cli"; - homepage = "https://arrow.apache.org/datafusion"; - changelog = "https://github.com/apache/arrow-datafusion/blob/${version}/datafusion/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; - }; -} diff --git a/pkgs/development/misc/gokrazy/default.nix b/pkgs/development/misc/gokrazy/default.nix deleted file mode 100644 index dfc29a0af08e..000000000000 --- a/pkgs/development/misc/gokrazy/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "gokrazy"; - version = "unstable-2023-08-12"; - - src = fetchFromGitHub { - owner = "gokrazy"; - repo = "tools"; - rev = "23cde3b0d858497a63c21e93ad30859bf197995f"; - hash = "sha256-oqtkC04TaOkcXkGAZzATCBA0XnFsx7bSGP9ODyhgAxQ="; - }; - - vendorHash = "sha256-rIIMqYMgLNCMYEH+44v79i8yGbHDmUY21X3h1E2jP9Q="; - - ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; - - subPackages = [ "cmd/gok" ]; - - meta = with lib; { - description = "Turn your Go program(s) into an appliance running on the Raspberry Pi 3, Pi 4, Pi Zero 2 W, or amd64 PCs!"; - homepage = "https://github.com/gokrazy/gokrazy"; - license = licenses.bsd3; - maintainers = with maintainers; [ shayne ]; - mainProgram = "gok"; - }; -} diff --git a/pkgs/development/misc/juce/default.nix b/pkgs/development/misc/juce/default.nix index 0899a948019e..476913f0e7ca 100644 --- a/pkgs/development/misc/juce/default.nix +++ b/pkgs/development/misc/juce/default.nix @@ -13,7 +13,7 @@ , freetype , curl , libglvnd -, webkitgtk +, webkitgtk_4_0 , pcre , darwin }: @@ -46,13 +46,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ freetype # libfreetype.so curl # libcurl.so - stdenv.cc.cc.lib # libstdc++.so libgcc_s.so + (lib.getLib stdenv.cc.cc) # libstdc++.so libgcc_s.so pcre # libpcre2.pc - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # libasound.so libglvnd # libGL.so - webkitgtk # webkit2gtk-4.0 - ] ++ lib.optionals stdenv.isDarwin [ + webkitgtk_4_0 # webkit2gtk-4.0 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.MetalKit darwin.apple_sdk.frameworks.WebKit @@ -63,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "juceaide"; longDescription = "JUCE is an open-source cross-platform C++ application framework for desktop and mobile applications, including VST, VST3, AU, AUv3, RTAS and AAX audio plug-ins"; homepage = "https://github.com/juce-framework/JUCE"; + changelog = "https://github.com/juce-framework/JUCE/blob/${finalAttrs.version}/CHANGE_LIST.md"; license = with licenses; [ isc gpl3Plus ]; maintainers = with maintainers; [ kashw2 ]; platforms = platforms.all; diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix deleted file mode 100644 index 113bf9e76da5..000000000000 --- a/pkgs/development/misc/loc/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - version = "0.4.1"; - pname = "loc"; - - src = fetchFromGitHub { - owner = "cgag"; - repo = "loc"; - rev = "v${version}"; - sha256 = "0086asrx48qlmc484pjz5r5znli85q6qgpfbd81gjlzylj7f57gg"; - }; - - cargoHash = "sha256-/YnU7vLz37Y9gggGx+vKWvtxBH0fjBwXGc+UWyOG2OE="; - - 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 = lib.platforms.unix; - }; -} - diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix index 18462c456ce2..c24ca3b0c262 100644 --- a/pkgs/development/misc/msp430/mspdebug.nix +++ b/pkgs/development/misc/msp430/mspdebug.nix @@ -10,7 +10,7 @@ , enableMspds ? false }: -assert stdenv.isDarwin -> hidapi != null && pkg-config != null; +assert stdenv.hostPlatform.isDarwin -> hidapi != null && pkg-config != null; assert enableReadline -> readline != null; assert enableMspds -> mspds != null; @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = lib.optional stdenv.isDarwin pkg-config - ++ lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin pkg-config + ++ lib.optional (enableMspds && stdenv.hostPlatform.isLinux) autoPatchelfHook; buildInputs = [ libusb-compat-0_1 ] - ++ lib.optional stdenv.isDarwin hidapi + ++ lib.optional stdenv.hostPlatform.isDarwin hidapi ++ lib.optional enableReadline readline; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # TODO: remove once a new 0.26+ release is made substituteInPlace drivers/tilib_api.c --replace .so ${stdenv.hostPlatform.extensions.sharedLibrary} @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # TODO: wrap with MSPDEBUG_TILIB_PATH env var instead of these rpath fixups in 0.26+ runtimeDependencies = lib.optional enableMspds mspds; - postFixup = lib.optionalString (enableMspds && stdenv.isDarwin) '' + postFixup = lib.optionalString (enableMspds && stdenv.hostPlatform.isDarwin) '' # autoPatchelfHook only works on linux so... for dep in $runtimeDependencies; do install_name_tool -add_rpath $dep/lib $out/bin/$pname @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "INSTALL=install" ]; makeFlags = [ "UNAME_S=$(unameS)" ] ++ lib.optional (!enableReadline) "WITHOUT_READLINE=1"; - unameS = lib.optionalString stdenv.isDarwin "Darwin"; + unameS = lib.optionalString stdenv.hostPlatform.isDarwin "Darwin"; meta = with lib; { description = "Free programmer, debugger, and gdb proxy for MSP430 MCUs"; diff --git a/pkgs/development/misc/msp430/mspds/binary.nix b/pkgs/development/misc/msp430/mspds/binary.nix index 3558599c2de0..4dc3ec869bda 100644 --- a/pkgs/development/misc/msp430/mspds/binary.nix +++ b/pkgs/development/misc/msp430/mspds/binary.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, unzip, autoPatchelfHook }: let - archPostfix = lib.optionalString (stdenv.is64bit && !stdenv.isDarwin) "_64"; + archPostfix = lib.optionalString (stdenv.hostPlatform.is64bit && !stdenv.hostPlatform.isDarwin) "_64"; in stdenv.mkDerivation rec { pname = "msp-debug-stack-bin"; version = "3.15.1.1"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { else "libmsp430${archPostfix}${stdenv.hostPlatform.extensions.sharedLibrary}"; nativeBuildInputs = [ unzip ] - ++ lib.optional stdenv.isLinux autoPatchelfHook; + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; buildInputs = [ stdenv.cc.cc ]; installPhase = '' diff --git a/pkgs/development/misc/msp430/mspds/default.nix b/pkgs/development/misc/msp430/mspds/default.nix index 75dd08805f3f..17ee5cd76c50 100644 --- a/pkgs/development/misc/msp430/mspds/default.nix +++ b/pkgs/development/misc/msp430/mspds/default.nix @@ -6,10 +6,10 @@ , libusb1 ? null }: -assert stdenv.isLinux -> libusb1 != null; +assert stdenv.hostPlatform.isLinux -> libusb1 != null; let - hidapiDriver = lib.optionalString stdenv.isLinux "-libusb"; + hidapiDriver = lib.optionalString stdenv.hostPlatform.isLinux "-libusb"; in stdenv.mkDerivation { pname = "msp-debug-stack"; @@ -32,7 +32,7 @@ in stdenv.mkDerivation { preBuild = '' rm ThirdParty/src/pugixml.cpp rm ThirdParty/include/pugi{config,xml}.hpp - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' makeFlagsArray+=(OUTNAME="-install_name ") ''; @@ -43,7 +43,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ unzip ]; buildInputs = [ boost hidapi pugixml ] - ++ lib.optional stdenv.isLinux libusb1; + ++ lib.optional stdenv.hostPlatform.isLinux libusb1; meta = with lib; { description = "TI MSP430 FET debug driver"; diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix index f9490ac1d2bf..644017a886da 100644 --- a/pkgs/development/misc/newlib/default.nix +++ b/pkgs/development/misc/newlib/default.nix @@ -86,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-newlib-retargetable-locking" ]); + enableParallelBuilding = true; dontDisableStatic = true; # apply necessary nano changes from https://developer.arm.com/-/media/Files/downloads/gnu/12.2.rel1/manifest/copy_nano_libraries.sh?rev=4c50be6ccb9c4205a5262a3925317073&hash=1375A7B0A1CD0DB9B9EB0D2B574ADF66 diff --git a/pkgs/development/misc/rappel/default.nix b/pkgs/development/misc/rappel/default.nix deleted file mode 100644 index 6a4ff7133e5c..000000000000 --- a/pkgs/development/misc/rappel/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ fetchFromGitHub -, libedit -, makeWrapper -, nasm -, lib, stdenv -}: - -stdenv.mkDerivation rec { - pname = "rappel"; - version = "unstable-2019-09-09"; - - src = fetchFromGitHub { - owner = "yrp604"; - repo = "rappel"; - rev = "31a06762d34880ff2ed7176ca71bd8a6b91b10d5"; - sha256 = "0wj3hypqfrjra8mwmn32hs5qs6ic81cq3gn1v0b2fba6vkqcsqfy"; - }; - - buildInputs = [ libedit ]; - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - install -Dm755 -t $out/bin bin/rappel - wrapProgram $out/bin/rappel --prefix PATH : "${nasm}/bin" - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/yrp604/rappel"; - description = "Pretty janky assembly REPL"; - mainProgram = "rappel"; - license = licenses.bsdOriginal; - maintainers = [ maintainers.pamplemousse ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index 9b2d0ad78100..9fb98de3a248 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -66,6 +66,7 @@ in python27.pkgs.buildPythonApplication { meta = with lib; { description = "Resolve external shell-script dependencies"; homepage = "https://github.com/abathur/resholve"; + changelog = "https://github.com/abathur/resholve/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ abathur ]; platforms = platforms.all; diff --git a/pkgs/development/misc/resholve/test.nix b/pkgs/development/misc/resholve/test.nix index ab61884963aa..654f8a4577f5 100644 --- a/pkgs/development/misc/resholve/test.nix +++ b/pkgs/development/misc/resholve/test.nix @@ -234,7 +234,7 @@ rec { ncurses procps ps - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ nixos-install-tools nixos-rebuild ]; @@ -258,7 +258,7 @@ rec { tset fake args ps fake args top fake args - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' nixos-generate-config fake args nixos-rebuild fake args ''); @@ -279,7 +279,7 @@ rec { inherit shunit2; inherit xdg-utils; inherit yadm; -} // lib.optionalAttrs stdenv.isLinux { +} // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit arch-install-scripts; inherit dgoss; inherit rancid; @@ -287,6 +287,6 @@ rec { inherit wgnord; inherit wsl-vpnkit; inherit zxfer; -} // lib.optionalAttrs (stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64)) { +} // lib.optionalAttrs (stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64)) { inherit s0ix-selftest-tool; } diff --git a/pkgs/development/misc/rpiboot/default.nix b/pkgs/development/misc/rpiboot/default.nix deleted file mode 100644 index 69ea80db109f..000000000000 --- a/pkgs/development/misc/rpiboot/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libusb1, pkg-config }: - -stdenv.mkDerivation rec { - pname = "rpiboot"; - version = "20221215-105525"; - - src = fetchFromGitHub { - owner = "raspberrypi"; - repo = "usbboot"; - rev = version; - hash = "sha256-Y77IrDblXmnpZleJ3zTyiGDYLZ7gNxASXpqUzwS1NCU="; - }; - - buildInputs = [ libusb1 ]; - nativeBuildInputs = [ pkg-config ]; - - patchPhase = '' - sed -i "s@/usr/@$out/@g" main.c - ''; - - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/rpiboot - cp rpiboot $out/bin - cp -r msd $out/share/rpiboot - ''; - - meta = with lib; { - homepage = "https://github.com/raspberrypi/usbboot"; - description = "Utility to boot a Raspberry Pi CM/CM3/CM4/Zero over USB"; - mainProgram = "rpiboot"; - license = licenses.asl20; - maintainers = with maintainers; [ cartr flokli ]; - platforms = [ "aarch64-linux" "aarch64-darwin" "armv7l-linux" "armv6l-linux" "x86_64-linux" "x86_64-darwin" ]; - }; -} diff --git a/pkgs/development/misc/umr/default.nix b/pkgs/development/misc/umr/default.nix deleted file mode 100644 index aa9b63c3d0d7..000000000000 --- a/pkgs/development/misc/umr/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv - -, fetchFromGitLab - -, cmake -, pkg-config - -, libdrm -, mesa # libgbm -, libpciaccess -, llvmPackages -, nanomsg -, ncurses -, SDL2 -, bash-completion - -, nix-update-script -}: - -stdenv.mkDerivation rec { - pname = "umr"; - version = "1.0.8"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "tomstdenis"; - repo = "umr"; - rev = version; - hash = "sha256-ODkTYHDrKWNvjiEeIyfsCByf7hyr5Ps9ytbKb3253bU="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - libdrm - mesa - libpciaccess - llvmPackages.llvm - nanomsg - ncurses - SDL2 - - bash-completion # Tries to create bash-completions in /var/empty otherwise? - ]; - - # Remove static libraries (there are no dynamic libraries in there) - postInstall = '' - rm -r $out/lib - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Userspace debugging and diagnostic tool for AMD GPUs"; - homepage = "https://gitlab.freedesktop.org/tomstdenis/umr"; - license = licenses.mit; - maintainers = with maintainers; [ Flakebi ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix deleted file mode 100644 index 4ad4b4e806ff..000000000000 --- a/pkgs/development/misc/yelp-tools/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, fetchurl -, libxml2 -, libxslt -, itstool -, gnome -, pkg-config -, meson -, ninja -, python3 -, yelp-xsl -}: - -python3.pkgs.buildPythonApplication rec { - pname = "yelp-tools"; - version = "42.1"; - - format = "other"; - - src = fetchurl { - url = "mirror://gnome/sources/yelp-tools/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PklqQCDUFFuZ/VCKJfoJM2pQOk6JAAKEIecsaksR+QU="; - }; - - nativeBuildInputs = [ - pkg-config - meson - ninja - ]; - - propagatedBuildInputs = [ - libxml2 # xmllint required by yelp-check. - libxslt # xsltproc required by yelp-build and yelp-check. - ]; - - buildInputs = [ - itstool # build script checks for its presence but I am not sure if anything uses it - yelp-xsl - ]; - - pythonPath = [ - python3.pkgs.lxml - ]; - - strictDeps = false; # TODO: Meson cannot find xmllint oherwise. Maybe add it to machine file? - - doCheck = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/yelp-tools"; - description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation"; - maintainers = teams.gnome.members ++ (with maintainers; [ domenkozar ]); - license = licenses.gpl2Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix deleted file mode 100644 index 85181cdf459f..000000000000 --- a/pkgs/development/mobile/abootimg/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, cpio, findutils, gzip, makeWrapper, util-linux }: - -stdenv.mkDerivation rec { - pname = "abootimg"; - version = "0.6"; - - src = fetchFromGitHub { - owner = "ggrandou"; - repo = "abootimg"; - rev = "7e127fee6a3981f6b0a50ce9910267cd501e09d4"; - sha256 = "1qgx9fxwhylgnixzkz2mzv2707f65qq7rar2rsqak536vhig1z9a"; - }; - - strictDeps = true; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ util-linux ]; - - postPatch = '' - cat <<EOF > version.h - #define VERSION_STR "${version}" - EOF - ''; - - installPhase = '' - mkdir -p $out/bin - install -D -m 755 abootimg $out/bin - install -D -m444 ./debian/abootimg.1 $out/share/man/man1/abootimg.1; - - install -D -m 755 abootimg-pack-initrd $out/bin - wrapProgram $out/bin/abootimg-pack-initrd --prefix PATH : ${lib.makeBinPath [ coreutils cpio findutils gzip ]} - - install -D -m 755 abootimg-unpack-initrd $out/bin - wrapProgram $out/bin/abootimg-unpack-initrd --prefix PATH : ${lib.makeBinPath [ cpio gzip ]} - ''; - - meta = with lib; { - homepage = "https://github.com/ggrandou/abootimg"; - description = "Manipulate Android Boot Images"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.flokli ]; - }; -} diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix deleted file mode 100644 index e959b88c6c6a..000000000000 --- a/pkgs/development/mobile/adbfs-rootless/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, fuse -, android-tools -}: - -stdenv.mkDerivation rec { - pname = "adbfs-rootless"; - version = "unstable-2023-03-21"; - - src = fetchFromGitHub { - owner = "spion"; - repo = pname; - rev = "fd56381af4dc9ae2f09b904c295686871a46ed0f"; - sha256 = "atiVjRfqvhTlm8Q+3iTNNPQiNkLIaHDLg5HZDJvpl2Q="; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ fuse ]; - - postPatch = '' - # very ugly way of replacing the adb calls - substituteInPlace adbfs.cpp \ - --replace '"adb ' '"${android-tools}/bin/adb ' - ''; - - installPhase = '' - runHook preInstall - install -D adbfs $out/bin/adbfs - runHook postInstall - ''; - - meta = with lib; { - description = "Mount Android phones on Linux with adb, no root required"; - mainProgram = "adbfs"; - inherit (src.meta) homepage; - license = licenses.bsd3; - maintainers = with maintainers; [ aleksana ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/mobile/androidenv/cmake.nix b/pkgs/development/mobile/androidenv/cmake.nix index 7df24ad4cc22..833c96a2691c 100644 --- a/pkgs/development/mobile/androidenv/cmake.nix +++ b/pkgs/development/mobile/androidenv/cmake.nix @@ -2,7 +2,7 @@ deployAndroidPackage { inherit package os; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = lib.optionals (os == "linux") [ pkgs.stdenv.cc.libc pkgs.stdenv.cc.cc pkgs.ncurses5 ]; patchInstructions = lib.optionalString (os == "linux") '' autoPatchelf $packageBaseDir/bin diff --git a/pkgs/development/mobile/androidenv/cmdline-tools.nix b/pkgs/development/mobile/androidenv/cmdline-tools.nix index 0279b948a7ab..b2d89ed741b5 100644 --- a/pkgs/development/mobile/androidenv/cmdline-tools.nix +++ b/pkgs/development/mobile/androidenv/cmdline-tools.nix @@ -4,7 +4,7 @@ deployAndroidPackage { name = "androidsdk"; inherit package os; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; patchInstructions = '' ${lib.optionalString (os == "linux") '' @@ -18,14 +18,14 @@ deployAndroidPackage { # Wrap all scripts that require JAVA_HOME find $ANDROID_SDK_ROOT/${package.path}/bin -maxdepth 1 -type f -executable | while read program; do if grep -q "JAVA_HOME" $program; then - wrapProgram $program --prefix PATH : ${pkgs.jdk11}/bin \ + wrapProgram $program --prefix PATH : ${pkgs.jdk17}/bin \ --prefix ANDROID_SDK_ROOT : $ANDROID_SDK_ROOT fi done # Wrap sdkmanager script wrapProgram $ANDROID_SDK_ROOT/${package.path}/bin/sdkmanager \ - --prefix PATH : ${lib.makeBinPath [ pkgs.jdk11 ]} \ + --prefix PATH : ${lib.makeBinPath [ pkgs.jdk17 ]} \ --add-flags "--sdk_root=$ANDROID_SDK_ROOT" # Patch all script shebangs diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 72dc64a7e0c2..ff9e591330ba 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -4,8 +4,8 @@ { cmdLineToolsVersion ? "13.0" , toolsVersion ? "26.1.1" -, platformToolsVersion ? "35.0.1" -, buildToolsVersions ? [ "34.0.0" ] +, platformToolsVersion ? "35.0.2" +, buildToolsVersions ? [ "35.0.0" ] , includeEmulator ? false , emulatorVersion ? "35.1.4" , platformVersions ? [] @@ -15,7 +15,7 @@ , abiVersions ? [ "x86" "x86_64" "armeabi-v7a" "arm64-v8a" ] , cmakeVersions ? [ ] , includeNDK ? false -, ndkVersion ? "26.3.11579264" +, ndkVersion ? "27.0.12077973" , ndkVersions ? [ndkVersion] , useGoogleAPIs ? false , useGoogleTVAddOns ? false @@ -27,8 +27,8 @@ let # Determine the Android os identifier from Nix's system identifier - os = if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "macosx" + os = if stdenv.hostPlatform.isLinux then "linux" + else if stdenv.hostPlatform.isDarwin then "macosx" else throw "No Android SDK tarballs are available for system architecture: ${stdenv.system}"; # Uses mkrepo.rb to create a repo spec. diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 6c6f974be706..fbababf9af2c 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -16,11 +16,17 @@ rec { }; androidPkgs = composeAndroidPackages { - platformVersions = [ "28" "29" "30" "31" "32" "33" "34" ]; + platformVersions = [ "28" "29" "30" "31" "32" "33" "34" "35" ]; includeEmulator = true; includeSystemImages = true; includeNDK = true; }; test-suite = pkgs.callPackage ./test-suite.nix {}; + + meta = with pkgs.lib; { + description = "Android SDK & sdkmanager"; + homepage = "https://developer.android.com/tools/sdkmanager"; + maintainers = with maintainers; [ numinit hadilq ]; + }; } diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index e4b3af304fa9..94bf0084ed27 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -1,8 +1,8 @@ { composeAndroidPackages, stdenv, lib, runtimeShell }: { name , app ? null -, platformVersion ? "33" -, abiVersion ? "armeabi-v7a" +, platformVersion ? "35" +, abiVersion ? "x86" , systemImageType ? "default" , enableGPU ? false # Enable GPU acceleration. It's deprecated, instead use `configOptions` below. , configOptions ? ( diff --git a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix index 637dbc58f4dd..0a710e45843c 100644 --- a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix +++ b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix @@ -26,9 +26,9 @@ let # Declaration of versions for everything. This is useful since these # versions may be used in multiple places in this Nix expression. android = { - platforms = [ "34" ]; + platforms = [ "35" ]; systemImageTypes = [ "google_apis" ]; - abis = [ "arm64-v8a" "x86_64" ]; + abis = [ "x86_64" ]; }; # If you copy this example out of nixpkgs, something like this will work: @@ -116,10 +116,9 @@ pkgs.mkShell rec { echo "installed_packages_section: ''${installed_packages_section}" packages=( - "build-tools;34.0.0" "cmdline-tools;11.0" \ - "emulator" "patcher;v4" "platform-tools" "platforms;android-34" \ - "system-images;android-34;google_apis;arm64-v8a" \ - "system-images;android-34;google_apis;x86_64" + "build-tools;35.0.0" "cmdline-tools;13.0" \ + "emulator" "patcher;v4" "platform-tools" "platforms;android-35" \ + "system-images;android-35;google_apis;x86_64" ) for package in "''${packages[@]}"; do @@ -142,7 +141,7 @@ pkgs.mkShell rec { excluded_packages=( "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" \ "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" \ - "platforms;android-31" "platforms;android-32" "platforms;android-33" \ + "platforms;android-31" "platforms;android-32" "platforms;android-33" "platforms;android-34" \ "sources;android-23" "sources;android-24" "sources;android-25" "sources;android-26" \ "sources;android-27" "sources;android-28" "sources;android-29" "sources;android-30" \ "sources;android-31" "sources;android-32" "sources;android-33" "sources;android-34" \ @@ -169,7 +168,7 @@ pkgs.mkShell rec { nativeBuildInputs = [ androidSdk androidEmulator jdk ]; } '' avdmanager delete avd -n testAVD || true - echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-34;google_apis;x86_64' + echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-35;google_apis;x86_64' result=$(avdmanager list avd) if [[ ! $result =~ "Name: testAVD" ]]; then diff --git a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix index a1308a9c1088..25b90e6d21a0 100644 --- a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix +++ b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix @@ -26,11 +26,11 @@ let # versions may be used in multiple places in this Nix expression. android = { versions = { - cmdLineToolsVersion = "11.0"; - platformTools = "34.0.5"; - buildTools = "34.0.0"; + cmdLineToolsVersion = "13.0"; + platformTools = "35.0.2"; + buildTools = "35.0.0"; }; - platforms = [ "34" ]; + platforms = [ "35" ]; }; # If you copy this example out of nixpkgs, something like this will work: @@ -113,8 +113,8 @@ pkgs.mkShell rec { echo "installed_packages_section: ''${installed_packages_section}" packages=( - "build-tools;34.0.0" "cmdline-tools;11.0" \ - "patcher;v4" "platform-tools" "platforms;android-34" + "build-tools;35.0.0" "cmdline-tools;13.0" \ + "patcher;v4" "platform-tools" "platforms;android-35" ) for package in "''${packages[@]}"; do diff --git a/pkgs/development/mobile/androidenv/examples/shell.nix b/pkgs/development/mobile/androidenv/examples/shell.nix index 0f4c0589adb0..7f08389e7e31 100644 --- a/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/pkgs/development/mobile/androidenv/examples/shell.nix @@ -26,17 +26,17 @@ let android = { versions = { cmdLineToolsVersion = "13.0"; - platformTools = "35.0.1"; - buildTools = "34.0.0"; + platformTools = "35.0.2"; + buildTools = "35.0.0"; ndk = [ - "26.3.11579264" + "27.0.12077973" ]; cmake = "3.6.4111459"; emulator = "35.1.4"; }; - platforms = [ "23" "24" "25" "26" "27" "28" "29" "30" "31" "32" "33" "34" ]; - abis = ["armeabi-v7a" "arm64-v8a"]; + platforms = [ "23" "24" "25" "26" "27" "28" "29" "30" "31" "32" "33" "34" "35" ]; + abis = [ "x86_64" ]; extras = ["extras;google;gcm"]; }; @@ -163,21 +163,24 @@ pkgs.mkShell rec { output="$(sdkmanager --list)" installed_packages_section=$(echo "''${output%%Available Packages*}" | awk 'NR>4 {print $1}') + # FIXME couldn't find platforms;android-34, even though it's in the correct directory!! sdkmanager's bug?! packages=( - "build-tools;34.0.0" "platform-tools" \ + "build-tools;35.0.0" "platform-tools" \ "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" \ "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" \ - "platforms;android-31" "platforms;android-32" "platforms;android-33" "platforms;android-34" \ + "platforms;android-31" "platforms;android-32" "platforms;android-33" "platforms;android-35" \ "sources;android-23" "sources;android-24" "sources;android-25" "sources;android-26" \ "sources;android-27" "sources;android-28" "sources;android-29" "sources;android-30" \ "sources;android-31" "sources;android-32" "sources;android-33" "sources;android-34" \ - "system-images;android-28;google_apis_playstore;arm64-v8a" \ - "system-images;android-29;google_apis_playstore;arm64-v8a" \ - "system-images;android-30;google_apis_playstore;arm64-v8a" \ - "system-images;android-31;google_apis_playstore;arm64-v8a" \ - "system-images;android-32;google_apis_playstore;arm64-v8a" \ - "system-images;android-33;google_apis_playstore;arm64-v8a" \ - "system-images;android-34;google_apis_playstore;arm64-v8a" + "sources;android-35" \ + "system-images;android-28;google_apis_playstore;x86_64" \ + "system-images;android-29;google_apis_playstore;x86_64" \ + "system-images;android-30;google_apis_playstore;x86_64" \ + "system-images;android-31;google_apis_playstore;x86_64" \ + "system-images;android-32;google_apis_playstore;x86_64" \ + "system-images;android-33;google_apis_playstore;x86_64" \ + "system-images;android-34;google_apis;x86_64" \ + "system-images;android-35;google_apis_playstore_ps16k;x86_64" ) for package in "''${packages[@]}"; do diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index 30a2e8171acc..f72fa0c8bd4a 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -10,9 +10,9 @@ in deployAndroidPackage rec { inherit package os; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; autoPatchelfIgnoreMissingDeps = [ "*" ]; - buildInputs = lib.optionals (os == "linux") [ pkgs.zlib pkgs.libcxx stdenv.cc.cc.lib ]; + buildInputs = lib.optionals (os == "linux") [ pkgs.zlib pkgs.libcxx (lib.getLib stdenv.cc.cc) ]; patchElfBnaries = '' # Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling @@ -71,7 +71,7 @@ deployAndroidPackage rec { ''; patchInstructions = patchOsAgnostic - + lib.optionalString stdenv.isLinux patchElfBnaries; + + lib.optionalString stdenv.hostPlatform.isLinux patchElfBnaries; noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script } diff --git a/pkgs/development/mobile/androidenv/patcher.nix b/pkgs/development/mobile/androidenv/patcher.nix index c0252839cf23..f525033d236a 100644 --- a/pkgs/development/mobile/androidenv/patcher.nix +++ b/pkgs/development/mobile/androidenv/patcher.nix @@ -2,7 +2,7 @@ deployAndroidPackage { inherit package os; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; patchInstructions = lib.optionalString (os == "linux") '' autoPatchelf $packageBaseDir/bin ''; diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 4ed98e7a7d7f..05542ae6dc02 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -3,7 +3,7 @@ deployAndroidPackage { inherit package os; nativeBuildInputs = lib.optionals (os == "linux") [ autoPatchelfHook ]; - buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc.lib pkgs.zlib pkgs.ncurses5 ]; + buildInputs = lib.optionals (os == "linux") [ pkgs.glibc (lib.getLib pkgs.stdenv.cc.cc) pkgs.zlib pkgs.ncurses5 ]; patchInstructions = lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib64 diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json index 0cf9ea53ceb6..82f7c5f48404 100644 --- a/pkgs/development/mobile/androidenv/repo.json +++ b/pkgs/development/mobile/androidenv/repo.json @@ -11,7 +11,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-10", @@ -64,7 +64,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-11", @@ -110,7 +110,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-12", @@ -161,7 +161,7 @@ } ], "displayName": "Google TV Addon", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-12", @@ -198,7 +198,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-13", @@ -249,7 +249,7 @@ } ], "displayName": "Google TV Addon", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-13", @@ -286,7 +286,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-14", @@ -339,7 +339,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-15", @@ -399,7 +399,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-16", @@ -459,7 +459,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-17", @@ -519,7 +519,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-18", @@ -579,7 +579,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-19", @@ -639,7 +639,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-21", @@ -699,7 +699,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-22", @@ -759,7 +759,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-23", @@ -819,7 +819,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-24", @@ -879,7 +879,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-25", @@ -939,7 +939,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-3", @@ -985,7 +985,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-4", @@ -1031,7 +1031,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-5", @@ -1077,7 +1077,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-6", @@ -1123,7 +1123,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-7", @@ -1169,7 +1169,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-8", @@ -1215,7 +1215,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-9", @@ -1262,7 +1262,7 @@ } ], "displayName": "Android Support Repository", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-android-m2repository", "path": "extras/android/m2repository", @@ -1292,7 +1292,7 @@ } ], "displayName": "Android Emulator hypervisor driver (installer)", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-Android_Emulator_Hypervisor_Driver", "path": "extras/google/Android_Emulator_Hypervisor_Driver", @@ -1322,7 +1322,7 @@ } ], "displayName": "Google AdMob Ads SDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-admob_ads_sdk", "path": "extras/google/admob_ads_sdk", @@ -1350,7 +1350,7 @@ } ], "displayName": "Google Analytics App Tracking SDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-analytics_sdk_v2", "path": "extras/google/analytics_sdk_v2", @@ -1378,7 +1378,7 @@ } ], "displayName": "Google Cloud Messaging for Android Library", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-gcm", "path": "extras/google/gcm", @@ -1413,7 +1413,7 @@ } }, "displayName": "Google Play services", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-google_play_services", "path": "extras/google/google_play_services", @@ -1441,7 +1441,7 @@ } ], "displayName": "Google Play services for Froyo", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-google_play_services_froyo", "path": "extras/google/google_play_services_froyo", @@ -1469,7 +1469,7 @@ } ], "displayName": "Google Play Instant Development SDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-instantapps", "path": "extras/google/instantapps", @@ -1506,7 +1506,7 @@ } }, "displayName": "Google Repository", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-m2repository", "path": "extras/google/m2repository", @@ -1534,7 +1534,7 @@ } ], "displayName": "Google Play APK Expansion library", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-market_apk_expansion", "path": "extras/google/market_apk_expansion", @@ -1562,7 +1562,7 @@ } ], "displayName": "Google Play Licensing Library", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-market_licensing", "path": "extras/google/market_licensing", @@ -1591,7 +1591,7 @@ } ], "displayName": "Android Auto API Simulators", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-simulators", "path": "extras/google/simulators", @@ -1619,7 +1619,7 @@ } ], "displayName": "Google USB Driver", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-usb_driver", "path": "extras/google/usb_driver", @@ -1647,7 +1647,7 @@ } ], "displayName": "Google Web Driver", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras-google-webdriver", "path": "extras/google/webdriver", @@ -2316,7 +2316,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-10-default-armeabi-v7a", "path": "system-images/android-10/default/armeabi-v7a", @@ -2354,7 +2354,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-10-default-x86", "path": "system-images/android-10/default/x86", @@ -2394,7 +2394,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-10-google_apis-armeabi-v7a", "path": "system-images/android-10/google_apis/armeabi-v7a", @@ -2435,7 +2435,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-10-google_apis-x86", "path": "system-images/android-10/google_apis/x86", @@ -2473,7 +2473,7 @@ } ], "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-14-default-armeabi-v7a", "path": "system-images/android-14/default/armeabi-v7a", @@ -2515,7 +2515,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-15-default-armeabi-v7a", "path": "system-images/android-15/default/armeabi-v7a", @@ -2553,7 +2553,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-15-default-x86", "path": "system-images/android-15/default/x86", @@ -2593,7 +2593,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-15-google_apis-armeabi-v7a", "path": "system-images/android-15/google_apis/armeabi-v7a", @@ -2634,7 +2634,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-15-google_apis-x86", "path": "system-images/android-15/google_apis/x86", @@ -2679,7 +2679,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-16-default-armeabi-v7a", "path": "system-images/android-16/default/armeabi-v7a", @@ -2710,7 +2710,7 @@ } ], "displayName": "MIPS System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "mips-android-sysimage-license", "name": "system-image-16-default-mips", "path": "system-images/android-16/default/mips", @@ -2748,7 +2748,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-16-default-x86", "path": "system-images/android-16/default/x86", @@ -2788,7 +2788,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-16-google_apis-armeabi-v7a", "path": "system-images/android-16/google_apis/armeabi-v7a", @@ -2829,7 +2829,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-16-google_apis-x86", "path": "system-images/android-16/google_apis/x86", @@ -2874,7 +2874,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-17-default-armeabi-v7a", "path": "system-images/android-17/default/armeabi-v7a", @@ -2905,7 +2905,7 @@ } ], "displayName": "MIPS System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "mips-android-sysimage-license", "name": "system-image-17-default-mips", "path": "system-images/android-17/default/mips", @@ -2943,7 +2943,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-17-default-x86", "path": "system-images/android-17/default/x86", @@ -2986,7 +2986,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-17-google_apis-armeabi-v7a", "path": "system-images/android-17/google_apis/armeabi-v7a", @@ -3027,7 +3027,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-17-google_apis-x86", "path": "system-images/android-17/google_apis/x86", @@ -3072,7 +3072,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-18-default-armeabi-v7a", "path": "system-images/android-18/default/armeabi-v7a", @@ -3110,7 +3110,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-18-default-x86", "path": "system-images/android-18/default/x86", @@ -3150,7 +3150,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-18-google_apis-armeabi-v7a", "path": "system-images/android-18/google_apis/armeabi-v7a", @@ -3191,7 +3191,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-18-google_apis-x86", "path": "system-images/android-18/google_apis/x86", @@ -3236,7 +3236,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-19-default-armeabi-v7a", "path": "system-images/android-19/default/armeabi-v7a", @@ -3274,7 +3274,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-19-default-x86", "path": "system-images/android-19/default/x86", @@ -3314,7 +3314,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-19-google_apis-armeabi-v7a", "path": "system-images/android-19/google_apis/armeabi-v7a", @@ -3355,7 +3355,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-19-google_apis-x86", "path": "system-images/android-19/google_apis/x86", @@ -3393,7 +3393,7 @@ } ], "displayName": "Android TV ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-21-android-tv-armeabi-v7a", "path": "system-images/android-21/android-tv/armeabi-v7a", @@ -3423,7 +3423,7 @@ } ], "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-21-android-tv-x86", "path": "system-images/android-21/android-tv/x86", @@ -3455,7 +3455,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-21-default-arm64-v8a", "path": "system-images/android-21/default/arm64-v8a", @@ -3493,7 +3493,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-21-default-armeabi-v7a", "path": "system-images/android-21/default/armeabi-v7a", @@ -3531,7 +3531,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-21-default-x86", "path": "system-images/android-21/default/x86", @@ -3569,7 +3569,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-21-default-x86_64", "path": "system-images/android-21/default/x86_64", @@ -3602,7 +3602,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-21-google_apis-arm64-v8a", "path": "system-images/android-21/google_apis/arm64-v8a", @@ -3643,7 +3643,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-21-google_apis-armeabi-v7a", "path": "system-images/android-21/google_apis/armeabi-v7a", @@ -3684,7 +3684,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-21-google_apis-x86", "path": "system-images/android-21/google_apis/x86", @@ -3725,7 +3725,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-21-google_apis-x86_64", "path": "system-images/android-21/google_apis/x86_64", @@ -3763,7 +3763,7 @@ } ], "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-22-android-tv-x86", "path": "system-images/android-22/android-tv/x86", @@ -3795,7 +3795,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-22-default-arm64-v8a", "path": "system-images/android-22/default/arm64-v8a", @@ -3833,7 +3833,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-22-default-armeabi-v7a", "path": "system-images/android-22/default/armeabi-v7a", @@ -3871,7 +3871,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-22-default-x86", "path": "system-images/android-22/default/x86", @@ -3909,7 +3909,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-22-default-x86_64", "path": "system-images/android-22/default/x86_64", @@ -3942,7 +3942,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-22-google_apis-arm64-v8a", "path": "system-images/android-22/google_apis/arm64-v8a", @@ -3983,7 +3983,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-22-google_apis-armeabi-v7a", "path": "system-images/android-22/google_apis/armeabi-v7a", @@ -4024,7 +4024,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-22-google_apis-x86", "path": "system-images/android-22/google_apis/x86", @@ -4065,7 +4065,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-22-google_apis-x86_64", "path": "system-images/android-22/google_apis/x86_64", @@ -4103,7 +4103,7 @@ } ], "displayName": "Android TV ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-23-android-tv-armeabi-v7a", "path": "system-images/android-23/android-tv/armeabi-v7a", @@ -4140,7 +4140,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-23-android-tv-x86", "path": "system-images/android-23/android-tv/x86", @@ -4172,7 +4172,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-23-default-arm64-v8a", "path": "system-images/android-23/default/arm64-v8a", @@ -4210,7 +4210,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-23-default-armeabi-v7a", "path": "system-images/android-23/default/armeabi-v7a", @@ -4248,7 +4248,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-23-default-x86", "path": "system-images/android-23/default/x86", @@ -4286,7 +4286,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-23-default-x86_64", "path": "system-images/android-23/default/x86_64", @@ -4319,7 +4319,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-23-google_apis-arm64-v8a", "path": "system-images/android-23/google_apis/arm64-v8a", @@ -4360,7 +4360,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-23-google_apis-armeabi-v7a", "path": "system-images/android-23/google_apis/armeabi-v7a", @@ -4401,7 +4401,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-23-google_apis-x86", "path": "system-images/android-23/google_apis/x86", @@ -4442,7 +4442,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-23-google_apis-x86_64", "path": "system-images/android-23/google_apis/x86_64", @@ -4487,7 +4487,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-24-android-tv-x86", "path": "system-images/android-24/android-tv/x86", @@ -4519,7 +4519,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-24-default-arm64-v8a", "path": "system-images/android-24/default/arm64-v8a", @@ -4557,7 +4557,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-24-default-armeabi-v7a", "path": "system-images/android-24/default/armeabi-v7a", @@ -4595,7 +4595,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-24-default-x86", "path": "system-images/android-24/default/x86", @@ -4633,7 +4633,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-24-default-x86_64", "path": "system-images/android-24/default/x86_64", @@ -4673,7 +4673,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-24-google_apis-arm64-v8a", "path": "system-images/android-24/google_apis/arm64-v8a", @@ -4714,7 +4714,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-24-google_apis-x86", "path": "system-images/android-24/google_apis/x86", @@ -4755,7 +4755,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-24-google_apis-x86_64", "path": "system-images/android-24/google_apis/x86_64", @@ -4798,7 +4798,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-24-google_apis_playstore-x86", "path": "system-images/android-24/google_apis_playstore/x86", @@ -4843,7 +4843,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-android-tv-x86", "path": "system-images/android-25/android-tv/x86", @@ -4882,7 +4882,7 @@ } }, "displayName": "Android Wear ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-android-wear-armeabi-v7a", "path": "system-images/android-25/android-wear/armeabi-v7a", @@ -4919,7 +4919,7 @@ } }, "displayName": "Android Wear Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-android-wear-x86", "path": "system-images/android-25/android-wear/x86", @@ -4951,7 +4951,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-default-arm64-v8a", "path": "system-images/android-25/default/arm64-v8a", @@ -4989,7 +4989,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-default-x86", "path": "system-images/android-25/default/x86", @@ -5027,7 +5027,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-default-x86_64", "path": "system-images/android-25/default/x86_64", @@ -5060,7 +5060,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-google_apis-arm64-v8a", "path": "system-images/android-25/google_apis/arm64-v8a", @@ -5101,7 +5101,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-google_apis-armeabi-v7a", "path": "system-images/android-25/google_apis/armeabi-v7a", @@ -5142,7 +5142,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-google_apis-x86", "path": "system-images/android-25/google_apis/x86", @@ -5183,7 +5183,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-google_apis-x86_64", "path": "system-images/android-25/google_apis/x86_64", @@ -5226,7 +5226,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-25-google_apis_playstore-x86", "path": "system-images/android-25/google_apis_playstore/x86", @@ -5286,7 +5286,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-26-android-tv-x86", "path": "system-images/android-26/android-tv/x86", @@ -5325,7 +5325,7 @@ } }, "displayName": "Android Wear Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-26-android-wear-x86", "path": "system-images/android-26/android-wear/x86", @@ -5369,7 +5369,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-26-default-arm64-v8a", "path": "system-images/android-26/default/arm64-v8a", @@ -5406,7 +5406,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-26-default-x86", "path": "system-images/android-26/default/x86", @@ -5443,7 +5443,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-26-default-x86_64", "path": "system-images/android-26/default/x86_64", @@ -5487,7 +5487,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-26-google_apis-arm64-v8a", "path": "system-images/android-26/google_apis/arm64-v8a", @@ -5543,7 +5543,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-26-google_apis-x86", "path": "system-images/android-26/google_apis/x86", @@ -5599,7 +5599,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-26-google_apis-x86_64", "path": "system-images/android-26/google_apis/x86_64", @@ -5657,7 +5657,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-26-google_apis_playstore-x86", "path": "system-images/android-26/google_apis_playstore/x86", @@ -5702,7 +5702,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-27-android-tv-x86", "path": "system-images/android-27/android-tv/x86", @@ -5746,7 +5746,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-27-default-arm64-v8a", "path": "system-images/android-27/default/arm64-v8a", @@ -5783,7 +5783,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-27-default-x86", "path": "system-images/android-27/default/x86", @@ -5820,7 +5820,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-27-default-x86_64", "path": "system-images/android-27/default/x86_64", @@ -5864,7 +5864,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-27-google_apis-arm64-v8a", "path": "system-images/android-27/google_apis/arm64-v8a", @@ -5920,7 +5920,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-27-google_apis-x86", "path": "system-images/android-27/google_apis/x86", @@ -5978,7 +5978,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-27-google_apis_playstore-x86", "path": "system-images/android-27/google_apis_playstore/x86", @@ -6023,7 +6023,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-28-android-tv-x86", "path": "system-images/android-28/android-tv/x86", @@ -6062,7 +6062,7 @@ } }, "displayName": "Wear OS Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-28-android-wear-x86", "path": "system-images/android-28/android-wear/x86", @@ -6106,7 +6106,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-28-default-arm64-v8a", "path": "system-images/android-28/default/arm64-v8a", @@ -6136,7 +6136,7 @@ } ], "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-28-default-x86", "path": "system-images/android-28/default/x86", @@ -6166,7 +6166,7 @@ } ], "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-28-default-x86_64", "path": "system-images/android-28/default/x86_64", @@ -6210,7 +6210,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-28-google_apis-arm64-v8a", "path": "system-images/android-28/google_apis/arm64-v8a", @@ -6266,7 +6266,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis-x86", "path": "system-images/android-28/google_apis/x86", @@ -6322,7 +6322,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-28-google_apis-x86_64", "path": "system-images/android-28/google_apis/x86_64", @@ -6370,7 +6370,7 @@ } }, "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis_playstore-arm64-v8a", "path": "system-images/android-28/google_apis_playstore/arm64-v8a", @@ -6426,7 +6426,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86", "path": "system-images/android-28/google_apis_playstore/x86", @@ -6482,7 +6482,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86_64", "path": "system-images/android-28/google_apis_playstore/x86_64", @@ -6542,7 +6542,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-29-android-tv-x86", "path": "system-images/android-29/android-tv/x86", @@ -6574,7 +6574,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-29-default-arm64-v8a", "path": "system-images/android-29/default/arm64-v8a", @@ -6628,7 +6628,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-29-default-x86", "path": "system-images/android-29/default/x86", @@ -6682,7 +6682,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-29-default-x86_64", "path": "system-images/android-29/default/x86_64", @@ -6726,7 +6726,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis-arm64-v8a", "path": "system-images/android-29/google_apis/arm64-v8a", @@ -6772,7 +6772,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-29-google_apis-x86", "path": "system-images/android-29/google_apis/x86", @@ -6818,7 +6818,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-29-google_apis-x86_64", "path": "system-images/android-29/google_apis/x86_64", @@ -6872,7 +6872,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis_playstore-arm64-v8a", "path": "system-images/android-29/google_apis_playstore/arm64-v8a", @@ -6940,7 +6940,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86", "path": "system-images/android-29/google_apis_playstore/x86", @@ -7008,7 +7008,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86_64", "path": "system-images/android-29/google_apis_playstore/x86_64", @@ -7068,7 +7068,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-30-android-tv-x86", "path": "system-images/android-30/android-tv/x86", @@ -7107,7 +7107,7 @@ } }, "displayName": "Wear OS 3 ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-30-android-wear-arm64-v8a", "path": "system-images/android-30/android-wear/arm64-v8a", @@ -7144,7 +7144,7 @@ } }, "displayName": "Wear OS 3 Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-30-android-wear-x86", "path": "system-images/android-30/android-wear/x86", @@ -7176,7 +7176,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-30-default-arm64-v8a", "path": "system-images/android-30/default/arm64-v8a", @@ -7218,7 +7218,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-30-default-x86_64", "path": "system-images/android-30/default/x86_64", @@ -7244,9 +7244,9 @@ "archives": [ { "os": "all", - "sha1": "c3575404189a32f1d77ef0f080a09b8697ebb14b", - "size": 1244307632, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-30_r13.zip" + "sha1": "0e66987d6b4db2e278af83d453ce5d74a7e6ced3", + "size": 1244324730, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-30_r16.zip" } ], "dependencies": { @@ -7262,13 +7262,13 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, - "license": "android-sdk-license", + "last-available-day": 19954, + "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis-arm64-v8a", "path": "system-images/android-30/google_apis/arm64-v8a", "revision": "30-google_apis-arm64-v8a", "revision-details": { - "major:0": "13" + "major:0": "16" }, "type-details": { "abi:3": "arm64-v8a", @@ -7290,9 +7290,9 @@ "archives": [ { "os": "all", - "sha1": "c1d3209b861461e9c37273710bc4140ce2ae6056", - "size": 1240622989, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-30_r12.zip" + "sha1": "a58447e540a8581394dd04ee419c6771d62723d8", + "size": 1240551553, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-30_r16.zip" } ], "dependencies": { @@ -7318,13 +7318,13 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19823, - "license": "android-sdk-arm-dbt-license", + "last-available-day": 19954, + "license": "android-sdk-license", "name": "system-image-30-google_apis-x86", "path": "system-images/android-30/google_apis/x86", "revision": "30-google_apis-x86", "revision-details": { - "major:0": "12" + "major:0": "16" }, "type-details": { "abi:3": "x86", @@ -7346,9 +7346,9 @@ "archives": [ { "os": "all", - "sha1": "efb07cd6268d93d7e2be88883bc9249a00b378b3", - "size": 1438275289, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-30_r12.zip" + "sha1": "6ae21030eaadc041078444d3798e4b399f3e787d", + "size": 1438186618, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-30_r16.zip" } ], "dependencies": { @@ -7374,13 +7374,13 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, - "license": "android-sdk-arm-dbt-license", + "last-available-day": 19954, + "license": "android-sdk-license", "name": "system-image-30-google_apis-x86_64", "path": "system-images/android-30/google_apis/x86_64", "revision": "30-google_apis-x86_64", "revision-details": { - "major:0": "12" + "major:0": "16" }, "type-details": { "abi:3": "x86_64", @@ -7428,7 +7428,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis_playstore-arm64-v8a", "path": "system-images/android-30/google_apis_playstore/arm64-v8a", @@ -7496,7 +7496,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-30-google_apis_playstore-x86", "path": "system-images/android-30/google_apis_playstore/x86", @@ -7564,7 +7564,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis_playstore-x86_64", "path": "system-images/android-30/google_apis_playstore/x86_64", @@ -7624,7 +7624,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-31-android-tv-arm64-v8a", "path": "system-images/android-31/android-tv/arm64-v8a", @@ -7676,7 +7676,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-31-android-tv-x86", "path": "system-images/android-31/android-tv/x86", @@ -7720,7 +7720,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-31-default-arm64-v8a", "path": "system-images/android-31/default/arm64-v8a", @@ -7762,7 +7762,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-31-default-x86_64", "path": "system-images/android-31/default/x86_64", @@ -7816,7 +7816,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis-arm64-v8a", "path": "system-images/android-31/google_apis/arm64-v8a", @@ -7872,7 +7872,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-31-google_apis-x86_64", "path": "system-images/android-31/google_apis/x86_64", @@ -7936,7 +7936,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis_playstore-arm64-v8a", "path": "system-images/android-31/google_apis_playstore/arm64-v8a", @@ -7992,7 +7992,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis_playstore-x86_64", "path": "system-images/android-31/google_apis_playstore/x86_64", @@ -8042,7 +8042,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-32-default-arm64-v8a", "path": "system-images/android-32/default/arm64-v8a", @@ -8084,7 +8084,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-32-default-x86_64", "path": "system-images/android-32/default/x86_64", @@ -8138,7 +8138,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-32-google_apis-arm64-v8a", "path": "system-images/android-32/google_apis/arm64-v8a", @@ -8194,7 +8194,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-32-google_apis-x86_64", "path": "system-images/android-32/google_apis/x86_64", @@ -8258,7 +8258,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-32-google_apis_playstore-arm64-v8a", "path": "system-images/android-32/google_apis_playstore/arm64-v8a", @@ -8326,7 +8326,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-32-google_apis_playstore-x86_64", "path": "system-images/android-32/google_apis_playstore/x86_64", @@ -8386,7 +8386,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-33-android-tv-arm64-v8a", "path": "system-images/android-33/android-tv/arm64-v8a", @@ -8438,7 +8438,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-33-android-tv-x86", "path": "system-images/android-33/android-tv/x86", @@ -8477,7 +8477,7 @@ } }, "displayName": "Wear OS 4 ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-33-android-wear-arm64-v8a", "path": "system-images/android-33/android-wear/arm64-v8a", @@ -8514,7 +8514,7 @@ } }, "displayName": "Wear OS 4 Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-33-android-wear-x86_64", "path": "system-images/android-33/android-wear/x86_64", @@ -8558,7 +8558,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-33-default-arm64-v8a", "path": "system-images/android-33/default/arm64-v8a", @@ -8600,7 +8600,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-33-default-x86_64", "path": "system-images/android-33/default/x86_64", @@ -8626,9 +8626,9 @@ "archives": [ { "os": "all", - "sha1": "9e314318536875458eaf68d02d411c59a386ab59", - "size": 1629980162, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-33_r15.zip" + "sha1": "8143bc8b517db20f1f34dd5d93a021b131d73720", + "size": 1751160645, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-33_r16.zip" } ], "dependencies": { @@ -8654,13 +8654,13 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis-arm64-v8a", "path": "system-images/android-33/google_apis/arm64-v8a", "revision": "33-google_apis-arm64-v8a", "revision-details": { - "major:0": "15" + "major:0": "16" }, "type-details": { "abi:3": "arm64-v8a", @@ -8682,9 +8682,9 @@ "archives": [ { "os": "all", - "sha1": "966eadeb61cd888a79477851e51349eed103e5c8", - "size": 1545118291, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-33_r15.zip" + "sha1": "a18ba5146f8a10e6f3c1d45df4a8d22c68306ee3", + "size": 1697603005, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-33_r16.zip" } ], "dependencies": { @@ -8710,13 +8710,13 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, - "license": "android-sdk-arm-dbt-license", + "last-available-day": 19954, + "license": "android-sdk-license", "name": "system-image-33-google_apis-x86_64", "path": "system-images/android-33/google_apis/x86_64", "revision": "33-google_apis-x86_64", "revision-details": { - "major:0": "15" + "major:0": "16" }, "type-details": { "abi:3": "x86_64", @@ -8774,7 +8774,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis_playstore-arm64-v8a", "path": "system-images/android-33/google_apis_playstore/arm64-v8a", @@ -8830,7 +8830,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-33-google_apis_playstore-x86_64", "path": "system-images/android-33/google_apis_playstore/x86_64", @@ -8862,9 +8862,9 @@ "archives": [ { "os": "all", - "sha1": "81b98fc5c3521a3a872667851c7f6bf61dfcdd5a", - "size": 883278287, - "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-34_r02.zip" + "sha1": "a31d0d8326f2c82787f95dd387614274082a96a0", + "size": 815200224, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-34_r03.zip" } ], "dependencies": { @@ -8890,13 +8890,13 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-34-android-tv-arm64-v8a", "path": "system-images/android-34/android-tv/arm64-v8a", "revision": "34-android-tv-arm64-v8a", "revision-details": { - "major:0": "2" + "major:0": "3" }, "type-details": { "abi:2": "arm64-v8a", @@ -8914,9 +8914,9 @@ "archives": [ { "os": "all", - "sha1": "3be0ccf9611c7125e9c43083ae3ca6abba5f45b7", - "size": 880214246, - "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-34_r02.zip" + "sha1": "8de1dcb502b0b4080e6f363828db64e609b3aa2a", + "size": 809947873, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-34_r03.zip" } ], "dependencies": { @@ -8942,13 +8942,13 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-34-android-tv-x86", "path": "system-images/android-34/android-tv/x86", "revision": "34-android-tv-x86", "revision-details": { - "major:0": "2" + "major:0": "3" }, "type-details": { "abi:2": "x86", @@ -8963,6 +8963,68 @@ } } }, + "android-wear": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "29a733a9e6d89a70f26dabff7525edc657be6b07", + "size": 1215167945, + "url": "https://dl.google.com/android/repository/sys-img/android-wear/arm64-v8a-34_r01.zip" + } + ], + "displayName": "Wear OS 5 ARM 64 v8a System Image", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "system-image-34-android-wear-arm64-v8a", + "path": "system-images/android-34/android-wear/arm64-v8a", + "revision": "34-android-wear-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "34", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Wear OS 5", + "id:0": "android-wear" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "851c223ddf735d692d3cca96fdffa4c1f7ca4316", + "size": 1209506837, + "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86_64-34_r01.zip" + } + ], + "displayName": "Wear OS 5 Intel x86_64 Atom System Image", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "system-image-34-android-wear-x86_64", + "path": "system-images/android-34/android-wear/x86_64", + "revision": "34-android-wear-x86_64", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "34", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Wear OS 5", + "id:0": "android-wear" + } + } + } + }, "default": { "arm64-v8a": { "archives": [ @@ -8986,7 +9048,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-34-default-arm64-v8a", "path": "system-images/android-34/default/arm64-v8a", @@ -9028,7 +9090,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-34-default-x86_64", "path": "system-images/android-34/default/x86_64", @@ -9054,9 +9116,9 @@ "archives": [ { "os": "all", - "sha1": "0981c5416516d609b1df5f29d3781c99d9fe061c", - "size": 1588261149, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-34_r12.zip" + "sha1": "2fe8b46d419a3400e30f31b0152b241b50c8b99f", + "size": 1610393229, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-34_r14.zip" } ], "dependencies": { @@ -9082,13 +9144,13 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-34-google_apis-arm64-v8a", "path": "system-images/android-34/google_apis/arm64-v8a", "revision": "34-google_apis-arm64-v8a", "revision-details": { - "major:0": "12" + "major:0": "14" }, "type-details": { "abi:3": "arm64-v8a", @@ -9110,9 +9172,9 @@ "archives": [ { "os": "all", - "sha1": "3392de02e09144d61e3a789c0f17ce447b70b191", - "size": 1541568922, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-34_r12.zip" + "sha1": "e0f6c9a0691aa27bd597d0deb1bcfdc943ac8ca7", + "size": 1563721130, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-34_r14.zip" } ], "dependencies": { @@ -9138,13 +9200,13 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, - "license": "android-sdk-arm-dbt-license", + "last-available-day": 19954, + "license": "android-sdk-license", "name": "system-image-34-google_apis-x86_64", "path": "system-images/android-34/google_apis/x86_64", "revision": "34-google_apis-x86_64", "revision-details": { - "major:0": "12" + "major:0": "14" }, "type-details": { "abi:3": "x86_64", @@ -9168,9 +9230,9 @@ "archives": [ { "os": "all", - "sha1": "a4fec7b9035d6f182fad788a4c1e5fef0fa94cb1", - "size": 1549222105, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-34-ext8_r02.zip" + "sha1": "c307c3301dc52635ebc78b943c39b3c377856ebc", + "size": 1548905381, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-34_r14.zip" }, { "os": "macosx", @@ -9208,13 +9270,13 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-34-google_apis_playstore-arm64-v8a", - "path": "system-images/android-34-ext10/google_apis_playstore/arm64-v8a", + "path": "system-images/android-34-ext12/google_apis_playstore/arm64-v8a", "revision": "34-google_apis_playstore-arm64-v8a", "revision-details": { - "major:0": "2" + "major:0": "1" }, "type-details": { "abi:2": "arm64-v8a", @@ -9265,13 +9327,13 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-34-google_apis_playstore-x86_64", - "path": "system-images/android-34-ext10/google_apis_playstore/x86_64", + "path": "system-images/android-34-ext12/google_apis_playstore/x86_64", "revision": "34-google_apis_playstore-x86_64", "revision-details": { - "major:0": "2" + "major:0": "1" }, "type-details": { "abi:2": "x86_64", @@ -9292,6 +9354,218 @@ } } }, + "35": { + "google_apis": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "4bb0111ce3e386f40337c652c0230524d97a05ae", + "size": 1766503283, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-35_r07.zip" + } + ], + "displayName": "Google APIs ARM 64 v8a System Image", + "last-available-day": 19954, + "license": "android-sdk-arm-dbt-license", + "name": "system-image-35-google_apis-arm64-v8a", + "path": "system-images/android-35/google_apis/arm64-v8a", + "revision": "35-google_apis-arm64-v8a", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "35", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "febd4186e0d234d60fecd50a37aaabf07bac6605", + "size": 1689421014, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-35_r07.zip" + } + ], + "displayName": "Google APIs Intel x86_64 Atom System Image", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "system-image-35-google_apis-x86_64", + "path": "system-images/android-35/google_apis/x86_64", + "revision": "35-google_apis-x86_64", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "35", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, + "google_apis_playstore": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "ecb2b9dbedda0e8aca02b23bc069c462499731ce", + "size": 1776691122, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-35_r07.zip" + } + ], + "displayName": "Google Play Experimental 16k Page Size ARM 64 v8a System Image", + "last-available-day": 19954, + "license": "android-sdk-arm-dbt-license", + "name": "system-image-35-google_apis_playstore-arm64-v8a", + "path": "system-images/android-35/google_apis_playstore_ps16k/arm64-v8a", + "revision": "35-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "35", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs PlayStore", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "b06db9ec697e40e2acd301653ff76bb6b2abe1d8", + "size": 1714146193, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-35_r07.zip" + } + ], + "displayName": "Google Play Experimental 16k Page Size Intel x86_64 Atom System Image", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "system-image-35-google_apis_playstore-x86_64", + "path": "system-images/android-35/google_apis_playstore_ps16k/x86_64", + "revision": "35-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "35", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs PlayStore", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, + "page_size_16kb": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "bcb011c34aa3ae9f198b5adf728430d5c0cafc25", + "size": 1522862879, + "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/arm64-v8a-ps16k-35_r03.zip" + } + ], + "displayName": "Pre-Release 16 KB Page Size Google APIs ARM 64 v8a System Image", + "last-available-day": 19954, + "license": "android-sdk-arm-dbt-license", + "name": "system-image-35-page_size_16kb-arm64-v8a", + "path": "system-images/android-35/google_apis_ps16k/arm64-v8a", + "revision": "35-page_size_16kb-arm64-v8a", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "35", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "16 KB Page Size", + "id:0": "page_size_16kb" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "e5ba89f23ee36ec6c46bd06df332ab876f123b13", + "size": 1444723260, + "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/x86_64-ps16k-35_r03.zip" + } + ], + "displayName": "Pre-Release 16 KB Page Size Google APIs Intel x86_64 Atom System Image", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "system-image-35-page_size_16kb-x86_64", + "path": "system-images/android-35/google_apis_ps16k/x86_64", + "revision": "35-page_size_16kb-x86_64", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "35", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "16 KB Page Size", + "id:0": "page_size_16kb" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + } + }, "TiramisuPrivacySandbox": { "google_apis": { "arm64-v8a": { @@ -9316,7 +9590,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-TiramisuPrivacySandbox-google_apis-arm64-v8a", "path": "system-images/android-TiramisuPrivacySandbox/google_apis/arm64-v8a", @@ -9363,7 +9637,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-TiramisuPrivacySandbox-google_apis-x86_64", "path": "system-images/android-TiramisuPrivacySandbox/google_apis/x86_64", @@ -9428,7 +9702,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a", "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/arm64-v8a", @@ -9485,7 +9759,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-x86_64", "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/x86_64", @@ -9772,7 +10046,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-UpsideDownCakePrivacySandbox-google_apis_playstore-arm64-v8a", "path": "system-images/android-UpsideDownCakePrivacySandbox/google_apis_playstore/arm64-v8a", @@ -9829,7 +10103,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "system-image-UpsideDownCakePrivacySandbox-google_apis_playstore-x86_64", "path": "system-images/android-UpsideDownCakePrivacySandbox/google_apis_playstore/x86_64", @@ -9862,22 +10136,23 @@ "archives": [ { "os": "all", - "sha1": "d87d6bb8cc98e91bd76a3585fed3f3616ad3140b", - "size": 1852895338, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-VanillaIceCream_r03.zip" + "sha1": "896dec0aaae40954e2da30527f0763f292511217", + "size": 1737853248, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-VanillaIceCream_r05.zip" } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-VanillaIceCream-google_apis-arm64-v8a", "path": "system-images/android-VanillaIceCream/google_apis/arm64-v8a", "revision": "VanillaIceCream-google_apis-arm64-v8a", "revision-details": { - "major:0": "3" + "major:0": "5" }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "34", "codename:1": "VanillaIceCream", "element-attributes": { @@ -9886,6 +10161,10 @@ "tag:2": { "display:1": "Google APIs", "id:0": "google_apis" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, @@ -9893,22 +10172,23 @@ "archives": [ { "os": "all", - "sha1": "f64e861db5568cfb0e6392dd4b34d78e41c1be8c", - "size": 1648708425, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-VanillaIceCream_r03.zip" + "sha1": "2efa686b5a420f3b9cb30e45a1e0e78a10a5fba8", + "size": 1682110854, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-VanillaIceCream_r05.zip" } ], "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-VanillaIceCream-google_apis-x86_64", "path": "system-images/android-VanillaIceCream/google_apis/x86_64", "revision": "VanillaIceCream-google_apis-x86_64", "revision-details": { - "major:0": "3" + "major:0": "5" }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "34", "codename:1": "VanillaIceCream", "element-attributes": { @@ -9917,6 +10197,10 @@ "tag:2": { "display:1": "Google APIs", "id:0": "google_apis" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -9926,22 +10210,23 @@ "archives": [ { "os": "all", - "sha1": "d0b5b5d7a7df6df55aa41b49460936ecf72625d1", - "size": 1863404889, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-VanillaIceCream_r03.zip" + "sha1": "41c8b6df52b60c76881fa5f819363678f9ef096c", + "size": 1745670932, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-VanillaIceCream_r05.zip" } ], "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-arm-dbt-license", "name": "system-image-VanillaIceCream-google_apis_playstore-arm64-v8a", "path": "system-images/android-VanillaIceCream/google_apis_playstore/arm64-v8a", "revision": "VanillaIceCream-google_apis_playstore-arm64-v8a", "revision-details": { - "major:0": "3" + "major:0": "5" }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "34", "codename:1": "VanillaIceCream", "element-attributes": { @@ -9950,6 +10235,10 @@ "tag:2": { "display:1": "Google Play", "id:0": "google_apis_playstore" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, @@ -9957,22 +10246,23 @@ "archives": [ { "os": "all", - "sha1": "3bfcf04fc5476d65588fbfc51798a9bbc94b5e19", - "size": 1673530237, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-VanillaIceCream_r03.zip" + "sha1": "0d4c047003eaa8c78698f9aea0708e71b0895248", + "size": 1704139494, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-VanillaIceCream_r05.zip" } ], "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "system-image-VanillaIceCream-google_apis_playstore-x86_64", "path": "system-images/android-VanillaIceCream/google_apis_playstore/x86_64", "revision": "VanillaIceCream-google_apis_playstore-x86_64", "revision-details": { - "major:0": "3" + "major:0": "5" }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "34", "codename:1": "VanillaIceCream", "element-attributes": { @@ -9981,6 +10271,82 @@ "tag:2": { "display:1": "Google Play", "id:0": "google_apis_playstore" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, + "page_size_16kb": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "167fc0f1baae778d3382a7ec4a463a1bfbc3253c", + "size": 1392391828, + "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/arm64-v8a-ps16k-VanillaIceCream_r01.zip" + } + ], + "displayName": "Pre-Release 16 KB Page Size Google APIs ARM 64 v8a System Image", + "last-available-day": 19954, + "license": "android-sdk-arm-dbt-license", + "name": "system-image-VanillaIceCream-page_size_16kb-arm64-v8a", + "path": "system-images/android-VanillaIceCream/google_apis_ps16k/arm64-v8a", + "revision": "VanillaIceCream-page_size_16kb-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:4": "arm64-v8a", + "api-level:0": "34", + "codename:1": "VanillaIceCream", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:2": { + "display:1": "16 KB Page Size", + "id:0": "page_size_16kb" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "4a48eab34ea526f9a4cd60948ed7e6698b3e5cfd", + "size": 1332306731, + "url": "https://dl.google.com/android/repository/sys-img/page_size_16kb/x86_64-ps16k-VanillaIceCream_r01.zip" + } + ], + "displayName": "Pre-Release 16 KB Page Size Google APIs Intel x86_64 Atom System Image", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "system-image-VanillaIceCream-page_size_16kb-x86_64", + "path": "system-images/android-VanillaIceCream/google_apis_ps16k/x86_64", + "revision": "VanillaIceCream-page_size_16kb-x86_64", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:4": "x86_64", + "api-level:0": "34", + "codename:1": "VanillaIceCream", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:2": { + "display:1": "16 KB Page Size", + "id:0": "page_size_16kb" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -10044,7 +10410,7 @@ } }, "displayName": "Android SDK Build-Tools 17", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10090,7 +10456,7 @@ } }, "displayName": "Android SDK Build-Tools 18.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10136,7 +10502,7 @@ } }, "displayName": "Android SDK Build-Tools 18.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10182,7 +10548,7 @@ } }, "displayName": "Android SDK Build-Tools 18.1.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10228,7 +10594,7 @@ } }, "displayName": "Android SDK Build-Tools 19", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10274,7 +10640,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10320,7 +10686,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10366,7 +10732,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10412,7 +10778,7 @@ } }, "displayName": "Android SDK Build-Tools 19.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/19.1.0", @@ -10457,7 +10823,7 @@ } }, "displayName": "Android SDK Build-Tools 20", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/20.0.0", @@ -10502,7 +10868,7 @@ } }, "displayName": "Android SDK Build-Tools 21", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10548,7 +10914,7 @@ } }, "displayName": "Android SDK Build-Tools 21.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10594,7 +10960,7 @@ } }, "displayName": "Android SDK Build-Tools 21.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10640,7 +11006,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10686,7 +11052,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10732,7 +11098,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/21.1.2", @@ -10777,7 +11143,7 @@ } }, "displayName": "Android SDK Build-Tools 22", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10823,7 +11189,7 @@ } }, "displayName": "Android SDK Build-Tools 22.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/22.0.1", @@ -10868,7 +11234,7 @@ } }, "displayName": "Android SDK Build-Tools 23", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10914,7 +11280,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.1", @@ -10959,7 +11325,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.2", @@ -11004,7 +11370,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.3", @@ -11049,7 +11415,7 @@ } }, "displayName": "Android SDK Build-Tools 24", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.0", @@ -11094,7 +11460,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.1", @@ -11139,7 +11505,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.2", @@ -11184,7 +11550,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.3", @@ -11229,7 +11595,7 @@ } }, "displayName": "Android SDK Build-Tools 25", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.0", @@ -11274,7 +11640,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.1", @@ -11319,7 +11685,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.2", @@ -11364,7 +11730,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.3", @@ -11409,7 +11775,7 @@ } }, "displayName": "Android SDK Build-Tools 26", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.0", @@ -11454,7 +11820,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.1", @@ -11499,7 +11865,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.2", @@ -11544,7 +11910,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.3", @@ -11589,7 +11955,7 @@ } }, "displayName": "Android SDK Build-Tools 27", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.0", @@ -11634,7 +12000,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.1", @@ -11679,7 +12045,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.2", @@ -11724,7 +12090,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.3", @@ -11769,7 +12135,7 @@ } }, "displayName": "Android SDK Build-Tools 28", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.0", @@ -11814,7 +12180,7 @@ } }, "displayName": "Android SDK Build-Tools 28-rc1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -11861,7 +12227,7 @@ } }, "displayName": "Android SDK Build-Tools 28-rc2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -11908,7 +12274,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.1", @@ -11953,7 +12319,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.2", @@ -11998,7 +12364,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.3", @@ -12043,7 +12409,7 @@ } }, "displayName": "Android SDK Build-Tools 29", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.0", @@ -12088,7 +12454,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -12135,7 +12501,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -12182,7 +12548,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -12229,7 +12595,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.1", @@ -12274,7 +12640,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.2", @@ -12319,7 +12685,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.3", @@ -12364,7 +12730,7 @@ } }, "displayName": "Android SDK Build-Tools 30", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.0", @@ -12409,7 +12775,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.1", @@ -12454,7 +12820,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.2", @@ -12499,7 +12865,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.3", @@ -12537,7 +12903,7 @@ } ], "displayName": "Android SDK Build-Tools 31", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/31.0.0", @@ -12575,7 +12941,7 @@ } ], "displayName": "Android SDK Build-Tools 32", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/32.0.0", @@ -12613,7 +12979,7 @@ } ], "displayName": "Android SDK Build-Tools 32.1-rc1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/32.1.0-rc1", @@ -12652,7 +13018,7 @@ } ], "displayName": "Android SDK Build-Tools 33", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.0", @@ -12690,7 +13056,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.1", @@ -12728,7 +13094,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.2", @@ -12766,7 +13132,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.3", @@ -12804,7 +13170,7 @@ } ], "displayName": "Android SDK Build-Tools 34", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/34.0.0", @@ -12842,7 +13208,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc1", @@ -12881,7 +13247,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc2", @@ -12920,7 +13286,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc3", @@ -12976,6 +13342,44 @@ } } }, + "35.0.0": { + "archives": [ + { + "os": "linux", + "sha1": "2cfaa0bbb2336e9ec18ed3ecea84fa2e2af607bc", + "size": 61958799, + "url": "https://dl.google.com/android/repository/build-tools_r35_linux.zip" + }, + { + "os": "windows", + "sha1": "af059bb67cf7786f45ee0db85e2d24985df1b4b6", + "size": 59878107, + "url": "https://dl.google.com/android/repository/build-tools_r35_windows.zip" + }, + { + "os": "macosx", + "sha1": "93ab8ce91230e067b5add4bfa79919c52b27f072", + "size": 76857898, + "url": "https://dl.google.com/android/repository/build-tools_r35_macosx.zip" + } + ], + "displayName": "Android SDK Build-Tools 35", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "build-tools", + "path": "build-tools/35.0.0", + "revision": "35.0.0", + "revision-details": { + "major:0": "35", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "35.0.0-rc1": { "archives": [ { @@ -12998,7 +13402,7 @@ } ], "displayName": "Android SDK Build-Tools 35-rc1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/35.0.0-rc1", @@ -13037,7 +13441,7 @@ } ], "displayName": "Android SDK Build-Tools 35-rc2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/35.0.0-rc2", @@ -13053,6 +13457,84 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "35.0.0-rc3": { + "archives": [ + { + "os": "linux", + "sha1": "25a13fd75a525385d77864f5470db9c1c48b5a40", + "size": 62746687, + "url": "https://dl.google.com/android/repository/build-tools_r35-rc3_linux.zip" + }, + { + "os": "windows", + "sha1": "f04f402d7d92edc14502e7b94034d1a1695ac12e", + "size": 59812048, + "url": "https://dl.google.com/android/repository/build-tools_r35-rc3_windows.zip" + }, + { + "os": "macosx", + "sha1": "f0d2a565d3634d2fd7a22838eafad792e8538c0a", + "size": 78263822, + "url": "https://dl.google.com/android/repository/build-tools_r35-rc3_macosx.zip" + } + ], + "displayName": "Android SDK Build-Tools 35-rc3", + "last-available-day": 19954, + "license": "android-sdk-preview-license", + "name": "build-tools", + "path": "build-tools/35.0.0-rc3", + "revision": "35.0.0-rc3", + "revision-details": { + "major:0": "35", + "micro:2": "0", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "35.0.0-rc4": { + "archives": [ + { + "os": "linux", + "sha1": "08049ed693a2ba9bf6b9fa0edec897abac9f85ed", + "size": 61882448, + "url": "https://dl.google.com/android/repository/build-tools_r35-rc4_linux.zip" + }, + { + "os": "windows", + "sha1": "e08195bf5ce51105aca15f9eba758fceeb7b4b5d", + "size": 59901374, + "url": "https://dl.google.com/android/repository/build-tools_r35-rc4_windows.zip" + }, + { + "os": "macosx", + "sha1": "d9ce6ae1b0d720d7c2abd6510843c881f9d65188", + "size": 76832786, + "url": "https://dl.google.com/android/repository/build-tools_r35-rc4_macosx.zip" + } + ], + "displayName": "Android SDK Build-Tools 35-rc4", + "last-available-day": 19954, + "license": "android-sdk-preview-license", + "name": "build-tools", + "path": "build-tools/35.0.0-rc4", + "revision": "35.0.0-rc4", + "revision-details": { + "major:0": "35", + "micro:2": "0", + "minor:1": "0", + "preview:3": "4" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "cmake": { @@ -13078,7 +13560,7 @@ } ], "displayName": "CMake 3.10.2.4988404", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.10.2.4988404", @@ -13116,7 +13598,7 @@ } ], "displayName": "CMake 3.18.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.18.1", @@ -13154,7 +13636,7 @@ } ], "displayName": "CMake 3.22.1", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.22.1", @@ -13192,7 +13674,7 @@ } ], "displayName": "CMake 3.6.4111459", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.6.4111459", @@ -13232,7 +13714,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/1.0", @@ -13269,7 +13751,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/10.0", @@ -13344,7 +13826,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/11.0", @@ -13457,7 +13939,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/12.0", @@ -13532,7 +14014,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/13.0", @@ -13569,7 +14051,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/13.0-rc01", @@ -13607,7 +14089,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/14.0-alpha01", @@ -13623,6 +14105,44 @@ } } }, + "16.0-rc01": { + "archives": [ + { + "os": "linux", + "sha1": "818d632f1d727edaecd4ff94aa5f86b5a8a129a6", + "size": 165618743, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-12172612_latest.zip" + }, + { + "os": "macosx", + "sha1": "8c7e4cc8fa9b2594ab8b56343bf56618ebdf04b9", + "size": 143967294, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-12172612_latest.zip" + }, + { + "os": "windows", + "sha1": "b2ae4d96dca0f10358a041adc9b79eedf399779b", + "size": 143481957, + "url": "https://dl.google.com/android/repository/commandlinetools-win-12172612_latest.zip" + } + ], + "displayName": "Android SDK Command-line Tools", + "last-available-day": 19954, + "license": "android-sdk-preview-license", + "name": "cmdline-tools", + "path": "cmdline-tools/16.0-alpha01", + "revision": "16.0-rc01", + "revision-details": { + "major:0": "16", + "minor:1": "0", + "preview:2": "01" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "2.0": { "archives": [ { @@ -13645,7 +14165,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "obsolete": "true", @@ -13683,7 +14203,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/2.1", @@ -13720,7 +14240,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/3.0", @@ -13757,7 +14277,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/4.0", @@ -13794,7 +14314,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/5.0", @@ -13831,7 +14351,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/6.0", @@ -13868,7 +14388,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/7.0", @@ -13905,7 +14425,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/8.0", @@ -13942,7 +14462,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/9.0", @@ -14599,6 +15119,82 @@ } } }, + "34.2.16": { + "archives": [ + { + "os": "linux", + "sha1": "fe7a96bf6fbe7b026555dd7f76b713f22a07ec8b", + "size": 292750827, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-12038310.zip" + }, + { + "os": "macosx", + "sha1": "8da9494f5a08c2a04f50aeef543fd32ca8424f12", + "size": 387388734, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-12038310.zip" + }, + { + "os": "windows", + "sha1": "76a5cbca04dc11bc04421e30392e78ab3b744d33", + "size": 412503831, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-12038310.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "emulator", + "path": "emulator", + "revision": "34.2.16", + "revision-details": { + "major:0": "34", + "micro:2": "16", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "35.1.19": { + "archives": [ + { + "os": "linux", + "sha1": "728fb67266a7648aee58c1f4eaadeb8781c646d8", + "size": 295185796, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-12171648.zip" + }, + { + "os": "macosx", + "sha1": "a7c61d2f057186e54f41e0573f5cb5659daca9c4", + "size": 390781280, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-12171648.zip" + }, + { + "os": "windows", + "sha1": "a954a95bf3f49907ea8e3b4dbeda8f963394540c", + "size": 420058404, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-12171648.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "emulator", + "path": "emulator", + "revision": "35.1.19", + "revision-details": { + "major:0": "35", + "micro:2": "19", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "35.1.2": { "archives": [ { @@ -14712,6 +15308,44 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "35.2.5": { + "archives": [ + { + "os": "linux", + "sha1": "cc22b6fb2d6dbb17f436af29364929aba5f776ae", + "size": 301992613, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-12205771.zip" + }, + { + "os": "macosx", + "sha1": "32e32d993b1af0c4c93a3aed775baeed881e0ce7", + "size": 399727915, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-12205771.zip" + }, + { + "os": "windows", + "sha1": "739dd017682373c745ec60189d2cb52be016181d", + "size": 426685873, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-12205771.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 19954, + "license": "android-sdk-preview-license", + "name": "emulator", + "path": "emulator", + "revision": "35.2.5", + "revision-details": { + "major:0": "35", + "micro:2": "5", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "extras": { @@ -14737,7 +15371,7 @@ } ], "displayName": "Android Auto Desktop Head Unit Emulator", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras", "path": "extras/google/auto", @@ -14774,7 +15408,7 @@ } ], "displayName": "Android Auto Desktop Head Unit Emulator", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "extras", "path": "extras/google/auto", @@ -14820,7 +15454,7 @@ } }, "displayName": "NDK (Side by side) 16.1.4479499", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/16.1.4479499", @@ -14865,7 +15499,7 @@ } }, "displayName": "NDK (Side by side) 17.2.4988734", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/17.2.4988734", @@ -14910,7 +15544,7 @@ } }, "displayName": "NDK (Side by side) 18.1.5063045", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/18.1.5063045", @@ -14955,7 +15589,7 @@ } }, "displayName": "NDK (Side by side) 19.0.5232133", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "obsolete": "true", @@ -15001,7 +15635,7 @@ } }, "displayName": "NDK (Side by side) 19.2.5345600", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/19.2.5345600", @@ -15046,7 +15680,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5392854", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "obsolete": "true", @@ -15093,7 +15727,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5471264", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "obsolete": "true", @@ -15140,7 +15774,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5594570", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.0.5594570", @@ -15185,7 +15819,7 @@ } }, "displayName": "NDK (Side by side) 20.1.5948944", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.1.5948944", @@ -15230,7 +15864,7 @@ } }, "displayName": "NDK (Side by side) 21.0.6011959", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.0.6011959", @@ -15276,7 +15910,7 @@ } }, "displayName": "NDK (Side by side) 21.0.6113669", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.0.6113669", @@ -15321,7 +15955,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6210238", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6210238", @@ -15367,7 +16001,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6273396", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6273396", @@ -15413,7 +16047,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6352462", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.1.6352462", @@ -15458,7 +16092,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6363665", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6363665", @@ -15504,7 +16138,7 @@ } }, "displayName": "NDK (Side by side) 21.2.6472646", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.2.6472646", @@ -15549,7 +16183,7 @@ } }, "displayName": "NDK (Side by side) 21.3.6528147", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.3.6528147", @@ -15594,7 +16228,7 @@ } }, "displayName": "NDK (Side by side) 21.4.7075529", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.4.7075529", @@ -15639,7 +16273,7 @@ } }, "displayName": "NDK (Side by side) 22.0.6917172", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/22.0.6917172", @@ -15685,7 +16319,7 @@ } }, "displayName": "NDK (Side by side) 22.0.7026061", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.0.7026061", @@ -15730,7 +16364,7 @@ } }, "displayName": "NDK (Side by side) 22.1.7171670", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.1.7171670", @@ -15775,7 +16409,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7123448", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7123448", @@ -15821,7 +16455,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7196353", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7196353", @@ -15867,7 +16501,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7272597", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7272597", @@ -15913,7 +16547,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7344513", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7344513", @@ -15959,7 +16593,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7421159", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7421159", @@ -16005,7 +16639,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7530507", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7530507", @@ -16051,7 +16685,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7599858", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.0.7599858", @@ -16096,7 +16730,7 @@ } }, "displayName": "NDK (Side by side) 23.1.7779620", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.1.7779620", @@ -16141,7 +16775,7 @@ } }, "displayName": "NDK (Side by side) 23.2.8568313", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.2.8568313", @@ -16186,7 +16820,7 @@ } }, "displayName": "NDK (Side by side) 24.0.7856742", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7856742", @@ -16232,7 +16866,7 @@ } }, "displayName": "NDK (Side by side) 24.0.7956693", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7956693", @@ -16278,7 +16912,7 @@ } }, "displayName": "NDK (Side by side) 24.0.8079956", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.8079956", @@ -16324,7 +16958,7 @@ } }, "displayName": "NDK (Side by side) 24.0.8215888", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/24.0.8215888", @@ -16369,7 +17003,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8151533", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8151533", @@ -16415,7 +17049,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8221429", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8221429", @@ -16461,7 +17095,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8355429", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8355429", @@ -16507,7 +17141,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8528842", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8528842", @@ -16553,7 +17187,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8775105", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.0.8775105", @@ -16598,7 +17232,7 @@ } }, "displayName": "NDK (Side by side) 25.1.8937393", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.1.8937393", @@ -16643,7 +17277,7 @@ } }, "displayName": "NDK (Side by side) 25.2.9519653", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.2.9519653", @@ -16688,7 +17322,7 @@ } }, "displayName": "NDK (Side by side) 26.0.10404224", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/26.0.10404224", @@ -16727,7 +17361,7 @@ } ], "displayName": "NDK (Side by side) 26.0.10636728", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/26.0.10636728", @@ -16766,7 +17400,7 @@ } ], "displayName": "NDK (Side by side) 26.0.10792818", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.0.10792818", @@ -16804,7 +17438,7 @@ } ], "displayName": "NDK (Side by side) 26.1.10909125", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.1.10909125", @@ -16842,7 +17476,7 @@ } ], "displayName": "NDK (Side by side) 26.2.11394342", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.2.11394342", @@ -16880,7 +17514,7 @@ } ], "displayName": "NDK (Side by side) 26.3.11579264", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.3.11579264", @@ -16895,6 +17529,122 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "27.0.11718014-rc1": { + "archives": [ + { + "os": "linux", + "sha1": "35a78f7544ccc72d8438d8ea2feb7f252a062abe", + "size": 658958615, + "url": "https://dl.google.com/android/repository/android-ndk-r27-beta1-linux.zip" + }, + { + "os": "macosx", + "sha1": "0206d7e1c4255c40acc691fad8bf943f055e627e", + "size": 841636299, + "url": "https://dl.google.com/android/repository/android-ndk-r27-beta1-darwin.zip" + }, + { + "os": "windows", + "sha1": "147b5b333cc57875e34b88ccd29efbe58963264d", + "size": 785017110, + "url": "https://dl.google.com/android/repository/android-ndk-r27-beta1-windows.zip" + } + ], + "displayName": "NDK (Side by side) 27.0.11718014", + "last-available-day": 19954, + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/27.0.11718014", + "revision": "27.0.11718014-rc1", + "revision-details": { + "major:0": "27", + "micro:2": "11718014", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "27.0.11902837-rc2": { + "archives": [ + { + "os": "linux", + "sha1": "93103e182405b9d7757231a1d9dad58937a6374b", + "size": 662398163, + "url": "https://dl.google.com/android/repository/android-ndk-r27-beta2-linux.zip" + }, + { + "os": "macosx", + "sha1": "48af6bb62dbfff2f68b39cf118494ebd5ba3b8ad", + "size": 836162827, + "url": "https://dl.google.com/android/repository/android-ndk-r27-beta2-darwin.zip" + }, + { + "os": "windows", + "sha1": "30f4103bc32fd28a5b93bb610db0130cfe9ff125", + "size": 781461627, + "url": "https://dl.google.com/android/repository/android-ndk-r27-beta2-windows.zip" + } + ], + "displayName": "NDK (Side by side) 27.0.11902837", + "last-available-day": 19954, + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/27.0.11902837", + "revision": "27.0.11902837-rc2", + "revision-details": { + "major:0": "27", + "micro:2": "11902837", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "27.0.12077973": { + "archives": [ + { + "os": "linux", + "sha1": "5e5cd517bdb98d7e0faf2c494a3041291e71bdcc", + "size": 663957918, + "url": "https://dl.google.com/android/repository/android-ndk-r27-linux.zip" + }, + { + "os": "macosx", + "sha1": "1a4a8c39c018430ff170657fc1673d895f5e4570", + "size": 836135405, + "url": "https://dl.google.com/android/repository/android-ndk-r27-darwin.zip" + }, + { + "os": "windows", + "sha1": "0ea2756e6815356831bda3af358cce4cdb6a981e", + "size": 781482169, + "url": "https://dl.google.com/android/repository/android-ndk-r27-windows.zip" + } + ], + "displayName": "NDK (Side by side) 27.0.12077973", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/27.0.12077973", + "revision": "27.0.12077973", + "revision-details": { + "major:0": "27", + "micro:2": "12077973", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "ndk-bundle": { @@ -16927,7 +17677,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16972,7 +17722,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17017,7 +17767,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17062,7 +17812,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "obsolete": "true", @@ -17108,7 +17858,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17153,7 +17903,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "obsolete": "true", @@ -17200,7 +17950,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "obsolete": "true", @@ -17247,7 +17997,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17292,7 +18042,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17337,7 +18087,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17383,7 +18133,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17428,7 +18178,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17474,7 +18224,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17520,7 +18270,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17565,7 +18315,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17611,7 +18361,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17656,7 +18406,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17701,7 +18451,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17746,7 +18496,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17792,7 +18542,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17837,7 +18587,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17882,7 +18632,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17928,7 +18678,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -17974,7 +18724,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -18020,7 +18770,7 @@ } }, "displayName": "NDK", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -18254,6 +19004,44 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "35.0.2": { + "archives": [ + { + "os": "linux", + "sha1": "f6406982a79d67e40b1ca3cb9e5e2cc783c0f232", + "size": 7472902, + "url": "https://dl.google.com/android/repository/platform-tools_r35.0.2-linux.zip" + }, + { + "os": "macosx", + "sha1": "f6b3158097ca0e9d6fe2024b790ac68af3f2faf2", + "size": 13335867, + "url": "https://dl.google.com/android/repository/platform-tools_r35.0.2-darwin.zip" + }, + { + "os": "windows", + "sha1": "6d204cdff21bce8a39c1d2367084e6174f854c2c", + "size": 6700829, + "url": "https://dl.google.com/android/repository/platform-tools_r35.0.2-win.zip" + } + ], + "displayName": "Android SDK Platform-Tools", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "platform-tools", + "path": "platform-tools", + "revision": "35.0.2", + "revision-details": { + "major:0": "35", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "platforms": { @@ -18267,7 +19055,7 @@ } ], "displayName": "Android SDK Platform 10", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-10", @@ -18299,7 +19087,7 @@ } ], "displayName": "Android SDK Platform 11", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-11", @@ -18331,7 +19119,7 @@ } ], "displayName": "Android SDK Platform 12", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-12", @@ -18363,7 +19151,7 @@ } ], "displayName": "Android SDK Platform 13", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-13", @@ -18395,7 +19183,7 @@ } ], "displayName": "Android SDK Platform 14", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-14", @@ -18427,7 +19215,7 @@ } ], "displayName": "Android SDK Platform 15", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-15", @@ -18459,7 +19247,7 @@ } ], "displayName": "Android SDK Platform 16", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-16", @@ -18491,7 +19279,7 @@ } ], "displayName": "Android SDK Platform 17", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-17", @@ -18523,7 +19311,7 @@ } ], "displayName": "Android SDK Platform 18", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-18", @@ -18555,7 +19343,7 @@ } ], "displayName": "Android SDK Platform 19", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-19", @@ -18599,7 +19387,7 @@ } ], "displayName": "Android SDK Platform 2", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -18632,7 +19420,7 @@ } ], "displayName": "Android SDK Platform 20", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-20", @@ -18664,7 +19452,7 @@ } ], "displayName": "Android SDK Platform 21", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-21", @@ -18696,7 +19484,7 @@ } ], "displayName": "Android SDK Platform 22", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-22", @@ -18728,7 +19516,7 @@ } ], "displayName": "Android SDK Platform 23", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-23", @@ -18760,7 +19548,7 @@ } ], "displayName": "Android SDK Platform 24", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-24", @@ -18792,7 +19580,7 @@ } ], "displayName": "Android SDK Platform 25", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-25", @@ -18824,7 +19612,7 @@ } ], "displayName": "Android SDK Platform 26", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-26", @@ -18856,7 +19644,7 @@ } ], "displayName": "Android SDK Platform 27", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-27", @@ -18888,7 +19676,7 @@ } ], "displayName": "Android SDK Platform 28", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-28", @@ -18920,7 +19708,7 @@ } ], "displayName": "Android SDK Platform 29", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-29", @@ -18964,7 +19752,7 @@ } ], "displayName": "Android SDK Platform 3", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -18997,7 +19785,7 @@ } ], "displayName": "Android SDK Platform 30", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-30", @@ -19029,7 +19817,7 @@ } ], "displayName": "Android SDK Platform 31", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-31", @@ -19061,7 +19849,7 @@ } ], "displayName": "Android SDK Platform 32", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-32", @@ -19093,7 +19881,7 @@ } ], "displayName": "Android SDK Platform 33-ext5", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-33", @@ -19124,8 +19912,8 @@ "url": "https://dl.google.com/android/repository/platform-34-ext7_r02.zip" } ], - "displayName": "Android SDK Platform 34-ext10", - "last-available-day": 19823, + "displayName": "Android SDK Platform 34-ext12", + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -19141,6 +19929,11 @@ "element-attributes": { "xsi:type": "ns11:platformDetailsType" }, + "layoutlib:1": { + "element-attributes": { + "api": "15" + } + }, "layoutlib:2": { "element-attributes": { "api": "15" @@ -19148,6 +19941,36 @@ } } }, + "35": { + "archives": [ + { + "os": "all", + "sha1": "c84ed39cecaeec13bc06c67639fcf86734013d98", + "size": 64281654, + "url": "https://dl.google.com/android/repository/platform-35_r01.zip" + } + ], + "displayName": "Android SDK Platform 35", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-35", + "revision": "35", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "35", + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:1": { + "element-attributes": { + "api": "15" + } + } + } + }, "4": { "archives": [ { @@ -19170,7 +19993,7 @@ } ], "displayName": "Android SDK Platform 4", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -19215,7 +20038,7 @@ } ], "displayName": "Android SDK Platform 5", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -19260,7 +20083,7 @@ } ], "displayName": "Android SDK Platform 6", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -19293,7 +20116,7 @@ } ], "displayName": "Android SDK Platform 7", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-7", @@ -19325,7 +20148,7 @@ } ], "displayName": "Android SDK Platform 8", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-8", @@ -19357,7 +20180,7 @@ } ], "displayName": "Android SDK Platform 9", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-9", @@ -19389,7 +20212,7 @@ } ], "displayName": "Android SDK Platform TiramisuPrivacySandbox", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-TiramisuPrivacySandbox", @@ -19420,7 +20243,7 @@ } ], "displayName": "Android SDK Platform UpsideDownCake", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -19452,7 +20275,7 @@ } ], "displayName": "Android SDK Platform UpsideDownCakePrivacySandbox", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-UpsideDownCakePrivacySandbox", @@ -19477,19 +20300,19 @@ "archives": [ { "os": "all", - "sha1": "b95f5a8a2bb908f8d13b6f874ab622e194c5aa20", - "size": 64097940, - "url": "https://dl.google.com/android/repository/platform-VanillaIceCream_r02.zip" + "sha1": "593df928592daf8e8b904a1680f54be715b32e98", + "size": 64462100, + "url": "https://dl.google.com/android/repository/platform-VanillaIceCream_r04.zip" } ], "displayName": "Android SDK Platform VanillaIceCream", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-VanillaIceCream", "revision": "VanillaIceCream", "revision-details": { - "major:0": "2" + "major:0": "4" }, "type-details": { "api-level:0": "34", @@ -19564,7 +20387,7 @@ } ], "displayName": "Layout Inspector image server for API S", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/2", @@ -19600,7 +20423,7 @@ } ], "displayName": "Layout Inspector image server for API 31-35", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/3", @@ -19636,7 +20459,7 @@ } ], "displayName": "Layout Inspector image server for API 29-30", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/1", @@ -19662,7 +20485,7 @@ } ], "displayName": "Sources for Android 14", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "obsolete": "true", @@ -19690,7 +20513,7 @@ } ], "displayName": "Sources for Android 15", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-15", @@ -19717,7 +20540,7 @@ } ], "displayName": "Sources for Android 16", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-16", @@ -19744,7 +20567,7 @@ } ], "displayName": "Sources for Android 17", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-17", @@ -19771,7 +20594,7 @@ } ], "displayName": "Sources for Android 18", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-18", @@ -19798,7 +20621,7 @@ } ], "displayName": "Sources for Android 19", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-19", @@ -19825,7 +20648,7 @@ } ], "displayName": "Sources for Android 20", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-20", @@ -19852,7 +20675,7 @@ } ], "displayName": "Sources for Android 21", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-21", @@ -19879,7 +20702,7 @@ } ], "displayName": "Sources for Android 22", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-22", @@ -19906,7 +20729,7 @@ } ], "displayName": "Sources for Android 23", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-23", @@ -19933,7 +20756,7 @@ } ], "displayName": "Sources for Android 24", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-24", @@ -19960,7 +20783,7 @@ } ], "displayName": "Sources for Android 25", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-25", @@ -19987,7 +20810,7 @@ } ], "displayName": "Sources for Android 26", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-26", @@ -20014,7 +20837,7 @@ } ], "displayName": "Sources for Android 27", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-27", @@ -20041,7 +20864,7 @@ } ], "displayName": "Sources for Android 28", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-28", @@ -20068,7 +20891,7 @@ } ], "displayName": "Sources for Android 29", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-29", @@ -20095,7 +20918,7 @@ } ], "displayName": "Sources for Android 30", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-30", @@ -20122,7 +20945,7 @@ } ], "displayName": "Sources for Android 31", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-31", @@ -20149,7 +20972,7 @@ } ], "displayName": "Sources for Android 32", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-32", @@ -20176,7 +20999,7 @@ } ], "displayName": "Sources for Android 33", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-33", @@ -20203,7 +21026,7 @@ } ], "displayName": "Sources for Android 34", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "sources", "path": "sources/android-34", @@ -20219,6 +21042,33 @@ "xsi:type": "ns11:sourceDetailsType" } } + }, + "35": { + "archives": [ + { + "os": "all", + "sha1": "c2770115a5f5ad787c8b298b93687a27eebb85b9", + "size": 48616636, + "url": "https://dl.google.com/android/repository/source-35_r01.zip" + } + ], + "displayName": "Sources for Android 35", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-35", + "revision": "35", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "35", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } } }, "tools": { @@ -20267,7 +21117,7 @@ } }, "displayName": "Android SDK Tools", - "last-available-day": 19823, + "last-available-day": 19954, "license": "android-sdk-license", "name": "tools", "obsolete": "true", diff --git a/pkgs/development/mobile/checkra1n/default.nix b/pkgs/development/mobile/checkra1n/default.nix deleted file mode 100644 index a44a6d8b2b8d..000000000000 --- a/pkgs/development/mobile/checkra1n/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "checkra1n"; - version = "0.12.4"; - - src = fetchurl { - url = "https://assets.checkra.in/downloads/linux/cli/x86_64/dac9968939ea6e6bfbdedeb41d7e2579c4711dc2c5083f91dced66ca397dc51d/checkra1n"; - sha256 = "07f5glwwlrpdvj8ky265q8fp3i3r4mz1vd6yvvxnnvpa764rdjfs"; - }; - - dontUnpack = true; - - installPhase = '' - install -dm755 "$out/bin" - install -m755 $src $out/bin/${pname} - ''; - - meta = with lib; { - description = "Jailbreak for iPhone 5s though iPhone X, iOS 12.0 and up"; - homepage = "https://checkra.in/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ onny ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/mobile/cordova/default.nix b/pkgs/development/mobile/cordova/default.nix deleted file mode 100644 index 0a4fec58c2c5..000000000000 --- a/pkgs/development/mobile/cordova/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "cordova"; - version = "12.0.0"; - - src = fetchFromGitHub { - owner = "apache"; - repo = "cordova-cli"; - rev = version; - hash = "sha256-fEV7NlRcRpyeRplsdXHI2U4/89DsvKQpVwHD5juiNPo="; - }; - - npmDepsHash = "sha256-ZMxZiwCgqzOBwDXeTfIEwqFVdM9ysWeE5AbX7rUdwIc="; - - dontNpmBuild = true; - - meta = { - description = "Build native mobile applications using HTML, CSS and JavaScript"; - homepage = "https://github.com/apache/cordova-cli"; - license = lib.licenses.asl20; - mainProgram = "cordova"; - maintainers = with lib.maintainers; [ flosse ]; - }; -} diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix deleted file mode 100644 index 63000e5a1ce4..000000000000 --- a/pkgs/development/mobile/genymotion/default.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ stdenv, lib, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon -, xdg-utils, libXrender, fontconfig, freetype, systemd, libpulseaudio -, cairo, gdk-pixbuf, gtk3, pixman -# For glewinfo -, libXmu, libXi, libXext }: - -let - packages = [ - stdenv.cc.cc - zlib - glib - xorg.libX11 - libxkbcommon - libXmu - libXi - libXext - libGL - libXrender - fontconfig - freetype - systemd - libpulseaudio - cairo - gdk-pixbuf - gtk3 - pixman - ]; - libPath = lib.makeLibraryPath packages; -in -stdenv.mkDerivation rec { - pname = "genymotion"; - version = "3.7.1"; - src = fetchurl { - url = "https://dl.genymotion.com/releases/genymotion-${version}/genymotion-${version}-linux_x64.bin"; - name = "genymotion-${version}-linux_x64.bin"; - sha256 = "sha256-nWQZcYN2rxmN7J1OYkM+Oa2UIHztdAJ/eGY5MxNDX90="; - }; - - nativeBuildInputs = [ makeWrapper which xdg-utils ]; - - unpackPhase = '' - mkdir -p phony-home $out/share/applications - export HOME=$TMP/phony-home - - mkdir ${pname} - echo "y" | sh $src -d ${pname} - sourceRoot=${pname} - - substitute phony-home/.local/share/applications/genymobile-genymotion.desktop \ - $out/share/applications/genymobile-genymotion.desktop --replace "$TMP/${pname}" "$out/libexec" - ''; - - installPhase = '' - mkdir -p $out/bin $out/libexec - mv genymotion $out/libexec/ - ln -s $out/libexec/genymotion/{genymotion,player} $out/bin - ''; - - fixupPhase = '' - patchInterpreter() { - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - "$out/libexec/genymotion/$1" - } - - patchExecutable() { - patchInterpreter "$1" - wrapProgram "$out/libexec/genymotion/$1" \ - --set "LD_LIBRARY_PATH" "${libPath}" \ - --unset "QML2_IMPORT_PATH" \ - --unset "QT_PLUGIN_PATH" - } - - patchTool() { - patchInterpreter "tools/$1" - wrapProgram "$out/libexec/genymotion/tools/$1" \ - --set "LD_LIBRARY_PATH" "${libPath}" - } - - patchExecutable genymotion - patchExecutable player - patchInterpreter qemu/x86_64/bin/qemu-img - patchInterpreter qemu/x86_64/bin/qemu-system-x86_64 - - patchTool adb - patchTool aapt - patchTool glewinfo - - rm $out/libexec/genymotion/libxkbcommon* - ''; - - meta = with lib; { - description = "Fast and easy Android emulation"; - longDescription = '' - Genymotion is a relatively fast Android emulator which comes with - pre-configured Android (x86 with OpenGL hardware acceleration) images, - suitable for application testing. - ''; - homepage = "https://www.genymotion.com/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = ["x86_64-linux"]; - maintainers = [ maintainers.puffnfresh ]; - }; -} diff --git a/pkgs/development/mobile/gomobile/default.nix b/pkgs/development/mobile/gomobile/default.nix index c234c81d3894..61e3bb75617c 100644 --- a/pkgs/development/mobile/gomobile/default.nix +++ b/pkgs/development/mobile/gomobile/default.nix @@ -26,7 +26,7 @@ buildGoModule { doCheck = false; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals stdenv.isDarwin [ xcodeWrapper ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodeWrapper ]; # Prevent a non-deterministic temporary directory from polluting the resulting object files postPatch = '' diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/development/mobile/imgpatchtools/default.nix deleted file mode 100644 index 737457a64650..000000000000 --- a/pkgs/development/mobile/imgpatchtools/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, bzip2, openssl, zlib }: - -stdenv.mkDerivation rec { - pname = "imgpatchtools"; - version = "0.3"; - - src = fetchFromGitHub { - owner = "erfanoabdi"; - repo = "imgpatchtools"; - rev = version; - sha256 = "sha256-7TOkqaXPui14VcSmMmYJ1Wg+s85wrgp+E0XcCB0Ml7M="; - }; - - buildInputs = [ bzip2 openssl zlib ]; - - installPhase = "install -Dt $out/bin bin/*"; - - meta = with lib; { - description = "Tools to manipulate Android OTA archives"; - longDescription = '' - This package is useful for Android development. In particular, it can be - used to extract ext4 /system image from Android distribution ZIP archives - such as those distributed by LineageOS and Replicant, via BlockImageUpdate - utility. It also includes other, related, but arguably more advanced tools - for OTA manipulation. - ''; - homepage = "https://github.com/erfanoabdi/imgpatchtools"; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/mobile/titanium-alloy/default.nix b/pkgs/development/mobile/titanium-alloy/default.nix deleted file mode 100644 index e0e534db5d53..000000000000 --- a/pkgs/development/mobile/titanium-alloy/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "alloy"; - version = "2.0.2"; - - src = fetchFromGitHub { - owner = "tidev"; - repo = "alloy"; - rev = version; - hash = "sha256-s1hAbbUy7k/GacBIk8OMD48/1IUcRcpV3LnrCCZim1A="; - }; - - npmDepsHash = "sha256-YNyFrO6+oFluyk3TlUf/0vdHrgTJ3l5DN801wnpBa6s="; - - dontNpmBuild = true; - - meta = { - changelog = "https://github.com/tidev/alloy/blob/${src.rev}/CHANGELOG.md"; - description = "MVC framework for the Appcelerator Titanium SDK"; - homepage = "https://github.com/tidev/alloy"; - license = lib.licenses.asl20; - mainProgram = "alloy"; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/mobile/titanium/default.nix b/pkgs/development/mobile/titanium/default.nix deleted file mode 100644 index 28a92af107d1..000000000000 --- a/pkgs/development/mobile/titanium/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "titanium"; - version = "6.1.1"; - - src = fetchFromGitHub { - owner = "tidev"; - repo = "titanium-cli"; - rev = "v${version}"; - hash = "sha256-eJHf4vbapCaIVk0Xc0sml14jkFCsS/Gv7ftaFakB5rI="; - }; - - npmDepsHash = "sha256-60r+zqUCSDvQgrjg5SGfZiv87AoGx1XcnbW1ki1sbCM="; - - dontNpmBuild = true; - - meta = { - changelog = "https://github.com/tidev/titanium-cli/blob/${src.rev}/CHANGELOG.md"; - description = "Command Line Tool for creating and building Titanium Mobile applications and modules"; - homepage = "https://github.com/tidev/titanium-cli"; - license = lib.licenses.asl20; - mainProgram = "titanium"; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 42b70c64abe9..ef36dced9a31 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation ({ buildPhase = '' ${preBuild} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' # Hack that provides a writable alloy package on macOS. Without it the build fails because of a file permission error. alloy=$(dirname $(type -p alloy))/.. cp -rv $alloy/* alloy @@ -76,7 +76,7 @@ stdenv.mkDerivation ({ export GRADLE_USER_HOME=$TMPDIR/gradle ${if release then '' - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' # Signing the app does not work with OpenJDK on macOS, use host SDK instead export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)" ''} diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index 6120025d5e3e..2d9a295b86ab 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation ({ # Do the building export LD=/usr/bin/clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works - xcodebuild -target ${_target} -configuration ${_configuration} ${lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${lib.optionalString (generateIPA || generateXCArchive) "-archivePath \"${name}.xcarchive\" archive"} ${lib.optionalString release '' PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"''} ${xcodeFlags} + xcodebuild -target ${_target} -configuration ${_configuration} ${lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${lib.optionalString (generateIPA || generateXCArchive) "-archivePath \"${name}.xcarchive\" archive"} ${lib.optionalString release ''PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"''} ${xcodeFlags} ${lib.optionalString release '' ${lib.optionalString generateIPA '' diff --git a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix index 5a888fb13b29..13c8e6e81827 100644 --- a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix +++ b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix @@ -3,7 +3,7 @@ writeShellScriptBin }: { versions ? [ ] , xcodeBaseDir ? "/Applications/Xcode.app" }: -assert stdenv.isDarwin; +assert stdenv.hostPlatform.isDarwin; let xcodebuildPath = "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild"; diff --git a/pkgs/development/mobile/xpwn/default.nix b/pkgs/development/mobile/xpwn/default.nix deleted file mode 100644 index efd8d538c090..000000000000 --- a/pkgs/development/mobile/xpwn/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, zlib, libpng, bzip2, libusb-compat-0_1, openssl }: - -stdenv.mkDerivation rec { - pname = "xpwn"; - version = "0.5.8git"; - - src = fetchFromGitHub { - owner = "planetbeing"; - repo = pname; - rev = "ac362d4ffe4d0489a26144a1483ebf3b431da899"; - sha256 = "1qw9vbk463fpnvvvfgzxmn9add2p30k832s09mlycr7z1hrh3wyf"; - }; - - # Workaround build failure on -fno-common toolchains: - # ld: ../ipsw-patch/libxpwn.a(libxpwn.c.o):(.bss+0x4): multiple definition of - # `endianness'; CMakeFiles/xpwn-bin.dir/src/xpwn.cpp.o:(.bss+0x0): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - preConfigure = '' - rm BUILD # otherwise `mkdir build` fails on case insensitive file systems - sed -r -i \ - -e 's/(install.*TARGET.*DESTINATION )\.\)/\1bin)/' \ - -e 's!(install.*(FILE|DIR).*DESTINATION )([^)]*)!\1share/xpwn/\3!' \ - */CMakeLists.txt - sed -i -e '/install/d' CMakeLists.txt - ''; - - strictDeps = true; - nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib libpng bzip2 libusb-compat-0_1 openssl ]; - - meta = with lib; { - broken = stdenv.isDarwin; - homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn"; - description = "Custom NOR firmware loader/IPSW generator for the iPhone"; - license = licenses.gpl3Plus; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index e1c3fcb5eec3..6d1dcd366593 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -63,6 +63,7 @@ mapAliases { inherit (pkgs) bash-language-server; # added 2024-06-07 bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30 bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25 + inherit (pkgs) bower2nix; # added 2024-08-23 inherit (pkgs) btc-rpc-explorer; # added 2023-08-17 inherit (pkgs) carbon-now-cli; # added 2023-08-17 inherit (pkgs) carto; # added 2023-08-17 @@ -70,9 +71,14 @@ mapAliases { inherit (pkgs) clean-css-cli; # added 2023-08-18 inherit (pkgs) clubhouse-cli; # added 2023-08-18 inherit (pkgs) coc-clangd; # added 2024-06-29 + inherit (pkgs) coc-css; # added 2024-06-29 inherit (pkgs) coc-diagnostic; # added 2024-06-29 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 inherit (pkgs) coc-pyright; # added 2024-07-14 + coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16 + coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15 + coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 + coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 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 @@ -133,10 +139,13 @@ mapAliases { node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21 inherit (pkgs) node-gyp; # added 2024-08-13 inherit (pkgs) node-pre-gyp; # added 2024-08-05 + inherit (pkgs) node-red; # added 2024-10-06 inherit (pkgs) nodemon; # added 2024-06-28 + npm = pkgs.nodejs.overrideAttrs (old: { meta = old.meta // { mainProgram = "npm"; }; }); # added 2024-10-04 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 = self.parcel; # added 2023-09-04 + inherit (pkgs) patch-package; # added 2024-06-29 pkg = pkgs.vercel-pkg; # added 2023-10-04 inherit (pkgs) pm2; # added 2024-01-22 inherit (pkgs) pnpm; # added 2024-06-26 @@ -153,7 +162,9 @@ mapAliases { inherit (pkgs) rtlcss; # added 2023-08-29 s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18 inherit (pkgs) serverless; # Added 2023-11-29 + shout = throw "shout was removed because it was deprecated upstream in favor of thelounge."; # Added 2024-10-19 inherit (pkgs) snyk; # Added 2023-08-30 + inherit (pkgs) sql-formatter; # added 2024-06-29 "@squoosh/cli" = throw "@squoosh/cli was removed because it was abandoned upstream"; # added 2023-09-02 ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21 stf = throw "stf was removed because it was broken"; # added 2023-08-21 @@ -198,6 +209,7 @@ mapAliases { 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) yalc; # added 2024-06-29 inherit (pkgs) yaml-language-server; # added 2023-09-05 inherit (pkgs) yarn; # added 2024-08-13 inherit (pkgs) yo; # added 2023-08-20 diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix index 2e54104d7dce..4bd736ddc723 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.cctools or pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; in import ./node-packages.nix { diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index bc1e36628ac8..4123ca029664 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -3,9 +3,6 @@ {lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: let - # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master - utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; - python = if nodejs ? python then nodejs.python else python2; # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise @@ -499,8 +496,8 @@ let stdenv.mkDerivation ({ name = "${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux + ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool ++ buildInputs; inherit nodejs; @@ -591,8 +588,8 @@ let name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux + ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -662,7 +659,7 @@ let stdenv.mkDerivation ({ name = "node-shell-${name}${if version == null then "" else "-${version}"}"; - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <<EOF diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index bb694d4507a3..d5de56d929ba 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -21,14 +21,12 @@ , "aws-cdk" , "awesome-lint" , "bower" -, "bower2nix" , "browserify" , "browser-sync" , "cdk8s-cli" , "cdktf-cli" , "clipboard-cli" , "coc-cmake" -, "coc-css" , "coc-docker" , "coc-emmet" , "coc-eslint" @@ -45,10 +43,8 @@ , "coc-lists" , "coc-ltex" , "coc-markdownlint" -, "coc-metals" , "coc-pairs" , "coc-prettier" -, "coc-python" , "coc-r-lsp" , "coc-rls" , "coc-rust-analyzer" @@ -63,8 +59,6 @@ , "coc-tabnine" , "coc-texlab" , "coc-toml" -, "coc-tslint" -, "coc-tslint-plugin" , "coc-tsserver" , "coc-ultisnips" , "coc-vetur" @@ -146,16 +140,13 @@ , "neovim" , "nijs" , "node-gyp-build" -, "node-red" , "node2nix" , "np" -, "npm" , "npm-merge-driver" , "nrm" , "orval" , "parcel" , "parsoid" -, "patch-package" , "peerflix" , "peerflix-server" , "poor-mans-t-sql-formatter-cli" @@ -179,12 +170,10 @@ , "sass" , "semver" , "serve" -, "shout" , "sloc" , "smartdc" , "socket.io" , "speed-test" -, "sql-formatter" , "stackdriver-statsd-backend" , "svelte-check" , "svgo" @@ -247,5 +236,4 @@ , "webtorrent-cli" , "wring" , "@yaegassy/coc-nginx" -, "yalc" ] diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 6e8950921563..94112fd7dd24 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -21335,15 +21335,6 @@ let sha512 = "Cuia7IBvmSanM+7ZmKYtP9hq+Du7n7mv2cpCt8GiEIkUDni0ecSlVCFJUL6HWwGzqLX03uA49xVOZOjwnabWmQ=="; }; }; - "discontinuous-range-1.0.0" = { - name = "discontinuous-range"; - packageName = "discontinuous-range"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz"; - sha512 = "c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ=="; - }; - }; "dlnacasts-0.1.0" = { name = "dlnacasts"; packageName = "dlnacasts"; @@ -32344,15 +32335,6 @@ let sha512 = "0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g=="; }; }; - "klaw-sync-6.0.0" = { - name = "klaw-sync"; - packageName = "klaw-sync"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz"; - sha512 = "nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ=="; - }; - }; "kleur-3.0.3" = { name = "kleur"; packageName = "kleur"; @@ -36863,15 +36845,6 @@ let sha512 = "HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ=="; }; }; - "moo-0.5.2" = { - name = "moo"; - packageName = "moo"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz"; - sha512 = "iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q=="; - }; - }; "morgan-1.10.0" = { name = "morgan"; packageName = "morgan"; @@ -37295,15 +37268,6 @@ let sha512 = "51cECUJMT0rUZNQa09EoKsnFeDL4x2dHRT0VR5U2H5ZgEcm95ZDWcMA5JShroXjHOejmAD/fg8+H+OvUnVXz2g=="; }; }; - "nearley-2.20.1" = { - name = "nearley"; - packageName = "nearley"; - version = "2.20.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz"; - sha512 = "+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ=="; - }; - }; "nedb-1.8.0" = { name = "nedb"; packageName = "nedb"; @@ -38358,15 +38322,6 @@ let sha512 = "KCfK3Vi2F+PH1klYauoQzg81GQ8/GGjQRKYY6tRnpQUPKTs/1gBZSRWtTEd7jGdSn1LZL7gpAmJT+BcS55k2XQ=="; }; }; - "npm-packlist-2.2.2" = { - name = "npm-packlist"; - packageName = "npm-packlist"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz"; - sha512 = "Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg=="; - }; - }; "npm-packlist-8.0.2" = { name = "npm-packlist"; packageName = "npm-packlist"; @@ -42984,15 +42939,6 @@ let sha512 = "1s5BQAy643nfjtnZZrH8V2fhj3snKrKkwp8cDaf2KfjW4/auwB+qffSEsvs1/iOuKiOr5vK7R0HQ0dQ1zituiQ=="; }; }; - "railroad-diagrams-1.0.0" = { - name = "railroad-diagrams"; - packageName = "railroad-diagrams"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz"; - sha512 = "cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A=="; - }; - }; "ramda-0.27.2" = { name = "ramda"; packageName = "ramda"; @@ -43002,15 +42948,6 @@ let sha512 = "SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA=="; }; }; - "randexp-0.4.6" = { - name = "randexp"; - packageName = "randexp"; - version = "0.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz"; - sha512 = "80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ=="; - }; - }; "random-access-file-2.2.1" = { name = "random-access-file"; packageName = "random-access-file"; @@ -59113,140 +59050,6 @@ in bypassCache = true; reconstructLock = true; }; - bower2nix = nodeEnv.buildNodePackage { - name = "bower2nix"; - packageName = "bower2nix"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.2.0.tgz"; - sha512 = "oNHyIWiU5OpUoDCSSRCZQ6JkXyBgtyi+odbv+XSmO6/KCn3B4SRT3/d+QKNj5UQ8KRsrBAI0Ry7CG2OtqrFE1A=="; - }; - dependencies = [ - sources."argparse-1.0.4" - sources."array-find-index-1.0.2" - sources."balanced-match-1.0.2" - sources."bower-1.8.14" - sources."bower-endpoint-parser-0.2.1" - sources."bower-json-0.6.0" - sources."bower-logger-0.2.1" - sources."brace-expansion-1.1.11" - sources."camelcase-2.1.1" - sources."camelcase-keys-2.1.0" - sources."concat-map-0.0.1" - sources."currently-unhandled-0.4.1" - sources."debug-2.6.9" - sources."decamelize-1.2.0" - sources."deep-extend-0.4.2" - sources."ends-with-0.2.0" - sources."error-ex-1.3.2" - sources."ext-list-2.2.2" - sources."ext-name-3.0.0" - sources."find-up-1.1.2" - (sources."fs-extra-0.26.7" // { - dependencies = [ - sources."graceful-fs-4.2.11" - ]; - }) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.2" - sources."get-stdin-4.0.1" - sources."glob-6.0.4" - sources."graceful-fs-3.0.12" - sources."hasown-2.0.2" - sources."hosted-git-info-2.8.9" - sources."indent-string-2.1.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."intersect-1.0.1" - sources."is-arrayish-0.2.1" - sources."is-core-module-2.15.1" - sources."is-finite-1.1.0" - sources."is-plain-obj-1.1.0" - sources."is-utf8-0.2.1" - (sources."jsonfile-2.4.0" // { - dependencies = [ - sources."graceful-fs-4.2.11" - ]; - }) - (sources."klaw-1.3.1" // { - dependencies = [ - sources."graceful-fs-4.2.11" - ]; - }) - (sources."load-json-file-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.2.11" - ]; - }) - sources."lodash-4.2.1" - sources."loud-rejection-1.6.0" - sources."map-obj-1.0.1" - sources."meow-3.7.0" - sources."mime-db-1.53.0" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."ms-2.0.0" - sources."natives-1.1.6" - sources."normalize-package-data-2.5.0" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."os-tmpdir-1.0.2" - sources."parse-json-2.2.0" - sources."path-exists-2.1.0" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - (sources."path-type-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.2.11" - ]; - }) - sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."promised-temp-0.1.0" - sources."q-1.5.1" - sources."read-pkg-1.1.0" - sources."read-pkg-up-1.0.1" - sources."redent-1.0.0" - sources."repeating-2.0.1" - sources."resolve-1.22.8" - (sources."rimraf-2.7.1" // { - dependencies = [ - sources."glob-7.2.3" - ]; - }) - sources."semver-5.7.2" - sources."signal-exit-3.0.7" - sources."sort-keys-1.1.2" - sources."sort-keys-length-1.0.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.20" - sources."sprintf-js-1.0.3" - sources."strip-bom-2.0.0" - sources."strip-indent-1.0.1" - sources."supports-preserve-symlinks-flag-1.0.0" - (sources."temp-0.8.3" // { - dependencies = [ - sources."rimraf-2.2.8" - ]; - }) - sources."trim-newlines-1.0.0" - sources."validate-npm-package-license-3.0.4" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Generate nix expressions to fetch bower dependencies"; - homepage = "https://github.com/rvl/bower2nix"; - license = "GPL-3.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; @@ -60672,23 +60475,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-css = nodeEnv.buildNodePackage { - name = "coc-css"; - packageName = "coc-css"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-css/-/coc-css-2.1.0.tgz"; - sha512 = "4DG6chaAQg5pQ4B4WLff04+AzKrQo9+WRDJIl0j0Mmcx7IOPP4QE+m00mDuyowsw4eZvaQ/Mc8bwtg5MbPdIcQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Css extension for coc.nvim"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-docker = nodeEnv.buildNodePackage { name = "coc-docker"; packageName = "coc-docker"; @@ -61089,250 +60875,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-metals = nodeEnv.buildNodePackage { - name = "coc-metals"; - packageName = "coc-metals"; - version = "1.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.14.tgz"; - sha512 = "zFExh1wGAZl4LXSp76NAjWORO9Tyhfw8WtALnhDv741p4tjWjVSEl6GmXTQN0U0tXz8UZ8ln2rL2OaxOdgMCTA=="; - }; - dependencies = [ - sources."@chemzqm/msgpack-lite-0.1.29" - sources."@chemzqm/neovim-5.9.5" - sources."@tootallnate/once-1.1.2" - sources."agent-base-6.0.2" - sources."arch-2.2.0" - sources."array-buffer-byte-length-1.0.1" - sources."arraybuffer.prototype.slice-1.0.3" - sources."async-2.6.4" - sources."available-typed-arrays-1.0.7" - sources."await-semaphore-0.1.3" - sources."balanced-match-1.0.2" - sources."big-integer-1.6.52" - sources."binary-0.3.0" - sources."bluebird-3.4.7" - sources."brace-expansion-1.1.11" - sources."bser-2.1.1" - sources."buffer-indexof-polyfill-1.0.2" - sources."buffers-0.1.1" - sources."bytes-3.1.2" - sources."call-bind-1.0.7" - sources."chainsaw-0.1.0" - sources."chownr-2.0.0" - sources."clipboardy-2.3.0" - sources."coc.nvim-0.0.79" - sources."concat-map-0.0.1" - sources."content-disposition-0.5.4" - sources."core-util-is-1.0.3" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.2" - sources."which-1.3.1" - ]; - }) - sources."data-view-buffer-1.0.1" - sources."data-view-byte-length-1.0.1" - sources."data-view-byte-offset-1.0.0" - sources."date-format-4.0.14" - sources."debounce-1.2.1" - sources."debug-4.3.7" - sources."deep-extend-0.6.0" - sources."define-data-property-1.1.4" - sources."define-properties-1.2.1" - sources."duplexer2-0.1.4" - sources."encoding-0.1.13" - sources."end-of-stream-1.4.4" - sources."es-abstract-1.23.3" - sources."es-define-property-1.0.0" - sources."es-errors-1.3.0" - sources."es-object-atoms-1.0.0" - sources."es-set-tostringtag-2.0.3" - sources."es-to-primitive-1.2.1" - sources."execa-1.0.0" - sources."fast-diff-1.3.0" - sources."fb-watchman-2.0.2" - sources."flatted-3.3.1" - sources."follow-redirects-1.15.9" - sources."for-each-0.3.3" - sources."fp-ts-2.16.9" - sources."fs-extra-8.1.0" - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."fs.realpath-1.0.0" - (sources."fstream-1.0.12" // { - dependencies = [ - sources."mkdirp-0.5.6" - sources."rimraf-2.7.1" - ]; - }) - sources."function-bind-1.1.2" - sources."function.prototype.name-1.1.6" - sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.2.4" - sources."get-stream-4.1.0" - sources."get-symbol-description-1.0.2" - sources."glob-7.2.3" - sources."globalthis-1.0.4" - sources."gopd-1.0.1" - sources."graceful-fs-4.2.11" - sources."has-bigints-1.0.2" - sources."has-property-descriptors-1.0.2" - sources."has-proto-1.0.3" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.2" - sources."hasown-2.0.2" - sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.1" - sources."iconv-lite-0.6.3" - sources."ieee754-1.2.1" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."int64-buffer-0.1.10" - sources."internal-slot-1.0.7" - sources."is-array-buffer-3.0.4" - sources."is-bigint-1.0.4" - sources."is-boolean-object-1.1.2" - sources."is-callable-1.2.7" - sources."is-data-view-1.0.1" - sources."is-date-object-1.0.5" - sources."is-docker-2.2.1" - sources."is-negative-zero-2.0.3" - sources."is-number-object-1.0.7" - sources."is-regex-1.1.4" - sources."is-shared-array-buffer-1.0.3" - 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" - sources."is-weakref-1.0.2" - sources."is-wsl-2.2.0" - sources."isarray-2.0.5" - sources."isexe-2.0.0" - sources."isuri-2.0.3" - sources."jsonc-parser-2.3.1" - sources."jsonfile-4.0.0" - sources."listenercount-1.0.1" - (sources."locate-java-home-1.1.2" // { - dependencies = [ - sources."semver-5.7.2" - ]; - }) - sources."lodash-4.17.21" - sources."log4js-6.9.1" - sources."metals-languageclient-0.4.2" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."minipass-5.0.0" - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."mkdirp-1.0.4" - sources."ms-2.1.3" - (sources."mv-2.1.1" // { - dependencies = [ - sources."glob-6.0.4" - sources."mkdirp-0.5.6" - sources."rimraf-2.4.5" - ]; - }) - sources."ncp-2.0.0" - sources."nice-try-1.0.5" - sources."node-fetch-2.7.0" - sources."node-int64-0.4.0" - sources."npm-run-path-2.0.2" - sources."object-inspect-1.13.2" - sources."object-keys-1.1.1" - sources."object.assign-4.1.5" - sources."once-1.4.0" - sources."p-finally-1.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."possible-typed-array-names-1.0.0" - sources."process-nextick-args-2.0.1" - sources."promise.prototype.finally-3.1.8" - sources."promisify-child-process-4.1.1" - sources."pump-3.0.2" - sources."rc-1.2.8" - (sources."readable-stream-2.3.8" // { - dependencies = [ - sources."isarray-1.0.0" - sources."safe-buffer-5.1.2" - ]; - }) - sources."regexp.prototype.flags-1.5.2" - sources."rfc-3986-1.0.1" - sources."rfdc-1.4.1" - sources."rimraf-3.0.2" - sources."safe-array-concat-1.1.2" - sources."safe-buffer-5.2.1" - sources."safe-regex-test-1.0.3" - sources."safer-buffer-2.1.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" - 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" - sources."streamroller-3.1.5" - 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."strip-eof-1.0.0" - sources."strip-json-comments-2.0.1" - sources."tar-6.2.1" - sources."tr46-0.0.3" - sources."traverse-0.3.9" - sources."tslib-2.7.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."unbox-primitive-1.0.2" - sources."universalify-0.1.2" - sources."unzipper-0.10.14" - sources."util-deprecate-1.0.2" - sources."uuid-7.0.3" - sources."vscode-jsonrpc-5.0.1" - (sources."vscode-languageserver-protocol-3.15.3" // { - dependencies = [ - sources."vscode-languageserver-types-3.15.1" - ]; - }) - sources."vscode-languageserver-textdocument-1.0.12" - sources."vscode-languageserver-types-3.17.5" - sources."vscode-uri-2.1.2" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."which-2.0.2" - sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.15" - sources."wrappy-1.0.2" - sources."yallist-4.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "coc.nvim extension for Metals, the Scala language server"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-pairs = nodeEnv.buildNodePackage { name = "coc-pairs"; packageName = "coc-pairs"; @@ -61372,24 +60914,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-python = nodeEnv.buildNodePackage { - name = "coc-python"; - packageName = "coc-python"; - version = "1.2.13"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-python/-/coc-python-1.2.13.tgz"; - sha512 = "thsXkbwwJMpiGa/1GiPvFnbWtC5K8QcZvcUtoc4lU8Hf38LbywK5qRp6M7tOAabJOq5dYcIYYbPZWzGwhoZEiw=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Python extension for coc.nvim, forked from vscode-python."; - homepage = "https://github.com/neoclide/coc-python#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-r-lsp = nodeEnv.buildNodePackage { name = "coc-r-lsp"; packageName = "coc-r-lsp"; @@ -62155,102 +61679,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-tslint = nodeEnv.buildNodePackage { - name = "coc-tslint"; - packageName = "coc-tslint"; - version = "1.0.17"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-tslint/-/coc-tslint-1.0.17.tgz"; - sha512 = "5Zxv2Adtb6Mlpv2YdKErhf8ntxiBl1UyrbEqo7gR9nFIAfi3o0Ue6TJTpZfOhQViFQxLjJAS65IQVRaNlbhkxw=="; - }; - dependencies = [ - sources."@babel/code-frame-7.24.7" - sources."@babel/helper-validator-identifier-7.24.7" - sources."@babel/highlight-7.24.7" - sources."ansi-styles-3.2.1" - sources."argparse-1.0.10" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."builtin-modules-1.1.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."commander-2.20.3" - sources."concat-map-0.0.1" - sources."diff-4.0.2" - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.2" - sources."glob-7.2.3" - sources."has-flag-3.0.0" - sources."hasown-2.0.2" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-core-module-2.15.1" - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - sources."picocolors-1.1.0" - sources."resolve-1.22.8" - sources."semver-5.7.2" - sources."sprintf-js-1.0.3" - sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."tslib-1.14.1" - sources."tslint-5.20.1" - sources."tsutils-2.29.0" - sources."typescript-3.9.10" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "tslint extension for coc.nvim"; - homepage = "https://github.com/neoclide/coc-tslint#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; - coc-tslint-plugin = nodeEnv.buildNodePackage { - name = "coc-tslint-plugin"; - packageName = "coc-tslint-plugin"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-tslint-plugin/-/coc-tslint-plugin-1.2.0.tgz"; - sha512 = "WEl0FM8ui0Oip6YqyOYApf8vErXFudj2ftjSYqm5WNLNuPq53JSNi+5w+WNqHwX2UWE8MOB2mQszqwU2fyE8Ag=="; - }; - dependencies = [ - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."concat-map-0.0.1" - sources."get-caller-file-1.0.3" - sources."minimatch-3.1.2" - sources."mock-require-3.0.3" - sources."normalize-path-2.1.1" - sources."remove-trailing-separator-1.1.0" - sources."typescript-tslint-plugin-0.5.4" - sources."vscode-jsonrpc-4.0.0" - sources."vscode-languageserver-5.2.1" - sources."vscode-languageserver-protocol-3.14.1" - sources."vscode-languageserver-types-3.14.0" - sources."vscode-uri-1.0.8" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "TSLint extension for coc.nvim as tsserver plugin"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; @@ -75729,421 +75157,6 @@ in bypassCache = true; reconstructLock = true; }; - node-red = nodeEnv.buildNodePackage { - name = "node-red"; - packageName = "node-red"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-4.0.3.tgz"; - sha512 = "6ZYh54FKqkEANoFgUBNgHm4LaUg5m3eW/01Dslf3cf3aeaRPa9mpS63sRiFC75JuJCxN29LH1/As91/1lSOxYA=="; - }; - dependencies = [ - sources."@babel/runtime-7.25.6" - 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.1.0" - 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.3" // { - dependencies = [ - sources."mime-3.0.0" - ]; - }) - sources."@node-red/editor-client-4.0.3" - (sources."@node-red/nodes-4.0.3" // { - dependencies = [ - sources."iconv-lite-0.6.3" - sources."media-typer-1.1.0" - ]; - }) - sources."@node-red/registry-4.0.3" - sources."@node-red/runtime-4.0.3" - sources."@node-red/util-4.0.3" - 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-22.5.5" - (sources."@types/readable-stream-4.0.15" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."@types/ws-8.5.12" - sources."abbrev-1.1.1" - sources."abort-controller-3.0.0" - sources."accepts-1.3.8" - sources."acorn-8.12.1" - sources."acorn-walk-8.3.4" - (sources."agent-base-6.0.2" // { - dependencies = [ - sources."debug-4.3.7" - sources."ms-2.1.3" - ]; - }) - sources."ajv-8.17.1" - 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."argparse-2.0.1" - sources."array-flatten-1.1.1" - sources."async-mutex-0.5.0" - sources."asynckit-0.4.0" - sources."axios-1.7.7" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - (sources."basic-auth-2.0.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."bcryptjs-2.4.3" - sources."bl-6.0.15" - sources."body-parser-1.20.3" - sources."boolbase-1.0.0" - 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" - sources."bytes-3.1.2" - sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.14" - sources."call-bind-1.0.7" - sources."cheerio-1.0.0-rc.10" - sources."cheerio-select-1.6.0" - sources."chownr-3.0.0" - sources."cli-table-0.3.11" - sources."clone-2.1.2" - 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-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.6.0" - (sources."cookie-parser-1.4.6" // { - dependencies = [ - sources."cookie-0.4.1" - ]; - }) - sources."cookie-signature-1.0.6" - 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."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) - sources."defer-to-connect-2.0.1" - sources."define-data-property-1.1.4" - sources."delayed-stream-1.0.0" - sources."denque-2.1.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."dom-serializer-1.4.1" - sources."domelementtype-2.3.0" - sources."domhandler-4.3.1" - sources."domutils-2.8.0" - sources."eastasianwidth-0.2.0" - sources."ee-first-1.1.1" - sources."emoji-regex-9.2.2" - sources."encodeurl-2.0.0" - 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."event-target-shim-5.0.1" - sources."events-3.3.0" - sources."express-4.21.0" - (sources."express-session-1.18.0" // { - dependencies = [ - sources."cookie-signature-1.0.7" - ]; - }) - sources."fast-deep-equal-3.1.3" - sources."fast-unique-numbers-8.0.13" - sources."fast-uri-3.0.1" - sources."finalhandler-1.3.1" - sources."follow-redirects-1.15.9" - sources."foreground-child-3.3.0" - 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.2.0" - sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.4" - sources."get-stream-6.0.1" - 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."hash-sum-2.0.0" - sources."hasown-2.0.2" - sources."help-me-5.0.0" - sources."hpagent-1.2.0" - sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.1" - sources."http-errors-2.0.0" - sources."http2-wrapper-2.2.1" - (sources."https-proxy-agent-5.0.1" // { - dependencies = [ - sources."debug-4.3.7" - sources."ms-2.1.3" - ]; - }) - sources."i18next-21.10.0" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - 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-2.0.5" - sources."jsonfile-6.1.0" - sources."keyv-4.5.4" - sources."lodash.clonedeep-4.5.0" - sources."lowercase-keys-3.0.0" - sources."lru-cache-6.0.0" - sources."media-typer-0.3.0" - (sources."memorystore-1.6.7" // { - dependencies = [ - sources."debug-4.3.7" - sources."lru-cache-4.1.5" - sources."ms-2.1.3" - sources."yallist-2.1.2" - ]; - }) - sources."merge-descriptors-1.0.3" - 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-4.0.0" - sources."minimatch-9.0.5" - sources."minimist-1.2.8" - sources."minipass-7.1.2" - sources."minizlib-3.0.1" - sources."mkdirp-0.5.6" - sources."moment-2.30.1" - sources."moment-timezone-0.5.45" - (sources."mqtt-5.7.0" // { - dependencies = [ - sources."debug-4.3.7" - sources."lru-cache-10.4.3" - sources."ms-2.1.3" - sources."ws-8.18.0" - ]; - }) - (sources."mqtt-packet-9.0.0" // { - dependencies = [ - sources."debug-4.3.7" - sources."ms-2.1.3" - ]; - }) - sources."ms-2.0.0" - (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-1.0.0" - sources."negotiator-0.6.3" - sources."node-gyp-build-4.8.2" - sources."node-red-admin-4.0.1" - sources."node-watch-0.7.4" - sources."nopt-5.0.0" - sources."normalize-url-8.0.1" - sources."nth-check-2.1.1" - (sources."number-allocator-1.0.14" // { - dependencies = [ - sources."debug-4.3.7" - sources."ms-2.1.3" - ]; - }) - sources."oauth2orize-1.12.0" - sources."object-assign-4.1.1" - sources."object-inspect-1.13.2" - sources."on-finished-2.4.1" - sources."on-headers-1.0.2" - 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.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-key-3.1.1" - (sources."path-scurry-1.11.1" // { - dependencies = [ - sources."lru-cache-10.4.3" - ]; - }) - sources."path-to-regexp-0.1.10" - 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."qs-6.13.0" - sources."quick-lru-5.1.1" - sources."random-bytes-1.0.0" - sources."range-parser-1.2.1" - sources."raw-body-2.5.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" - sources."resolve-alpn-1.2.1" - sources."responselike-3.0.0" - sources."rfdc-1.4.1" - sources."rimraf-5.0.10" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."sax-1.4.1" - sources."semver-7.5.4" - (sources."send-0.19.0" // { - dependencies = [ - sources."encodeurl-1.0.2" - sources."ms-2.1.3" - ]; - }) - sources."serve-static-1.16.2" - 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-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."ansi-regex-6.1.0" - sources."strip-ansi-7.1.0" - ]; - }) - (sources."string-width-cjs-4.2.3" // { - dependencies = [ - sources."emoji-regex-8.0.0" - ]; - }) - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-ansi-cjs-6.0.1" - (sources."tar-7.2.0" // { - dependencies = [ - sources."mkdirp-3.0.1" - sources."yallist-5.0.0" - ]; - }) - sources."tldts-6.1.47" - sources."tldts-core-6.1.47" - sources."toidentifier-1.0.1" - sources."tough-cookie-5.0.0" - sources."tslib-2.7.0" - 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."undici-types-6.19.8" - sources."universalify-2.0.1" - sources."unpipe-1.0.0" - 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."vary-1.1.2" - 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.1.0" - 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-4.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Low-code programming for event-driven applications"; - homepage = "https://nodered.org"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; @@ -76829,24 +75842,6 @@ in bypassCache = true; reconstructLock = true; }; - npm = nodeEnv.buildNodePackage { - name = "npm"; - packageName = "npm"; - version = "10.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-10.8.3.tgz"; - sha512 = "0IQlyAYvVtQ7uOhDFYZCGK8kkut2nh8cpAdA9E6FvRSJaTgtZRZgNjlC5ZCct//L73ygrpY93CxXpRJDtNqPVg=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "a package manager for JavaScript"; - homepage = "https://docs.npmjs.com/"; - license = "Artistic-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; npm-merge-driver = nodeEnv.buildNodePackage { name = "npm-merge-driver"; packageName = "npm-merge-driver"; @@ -78023,90 +77018,6 @@ in bypassCache = true; reconstructLock = true; }; - patch-package = nodeEnv.buildNodePackage { - name = "patch-package"; - packageName = "patch-package"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/patch-package/-/patch-package-8.0.0.tgz"; - sha512 = "da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA=="; - }; - dependencies = [ - sources."@yarnpkg/lockfile-1.1.0" - sources."ansi-styles-4.3.0" - sources."at-least-node-1.0.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."braces-3.0.3" - sources."call-bind-1.0.7" - sources."chalk-4.1.2" - sources."ci-info-3.9.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."concat-map-0.0.1" - sources."cross-spawn-7.0.3" - sources."define-data-property-1.1.4" - sources."es-define-property-1.0.0" - sources."es-errors-1.3.0" - sources."fill-range-7.1.1" - sources."find-yarn-workspace-root-2.0.0" - sources."fs-extra-9.1.0" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.4" - sources."glob-7.2.3" - 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."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-docker-2.2.1" - sources."is-number-7.0.0" - sources."is-wsl-2.2.0" - sources."isarray-2.0.5" - sources."isexe-2.0.0" - sources."json-stable-stringify-1.1.1" - sources."jsonfile-6.1.0" - sources."jsonify-0.0.1" - sources."klaw-sync-6.0.0" - sources."micromatch-4.0.8" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."object-keys-1.1.1" - sources."once-1.4.0" - sources."open-7.4.2" - sources."os-tmpdir-1.0.2" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."picomatch-2.3.1" - sources."rimraf-2.7.1" - sources."semver-7.6.3" - sources."set-function-length-1.2.2" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."slash-2.0.0" - sources."supports-color-7.2.0" - sources."tmp-0.0.33" - sources."to-regex-range-5.0.1" - sources."universalify-2.0.1" - sources."which-2.0.2" - sources."wrappy-1.0.2" - sources."yaml-2.5.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Fix broken node modules with no fuss"; - homepage = "https://github.com/ds300/patch-package#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; peerflix = nodeEnv.buildNodePackage { name = "peerflix"; packageName = "peerflix"; @@ -80414,253 +79325,6 @@ in bypassCache = true; reconstructLock = true; }; - shout = nodeEnv.buildNodePackage { - name = "shout"; - packageName = "shout"; - version = "0.53.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shout/-/shout-0.53.0.tgz"; - sha512 = "WX6Be8BtHxMskOZkxEx96cy7Qs+DTsasvmITJDa28OMkGQS59EuR7LPVq4BB1O5uvvjxvIi1rF1WqZwbF/PfKQ=="; - }; - dependencies = [ - sources."CSSselect-0.4.1" - sources."CSSwhat-0.4.7" - sources."accepts-1.3.8" - sources."after-0.8.1" - sources."ajv-6.12.6" - sources."array-flatten-1.1.1" - sources."arraybuffer.slice-0.0.6" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.13.2" - sources."base64-arraybuffer-0.1.2" - sources."base64id-0.1.0" - sources."bcrypt-nodejs-0.0.3" - sources."bcrypt-pbkdf-1.0.2" - sources."better-assert-1.0.2" - sources."blob-0.0.2" - sources."body-parser-1.20.3" - sources."bytes-3.1.2" - sources."call-bind-1.0.7" - sources."callsite-1.0.0" - sources."caseless-0.12.0" - sources."cheerio-0.17.0" - sources."combined-stream-1.0.8" - sources."commander-2.20.3" - sources."component-bind-1.0.0" - sources."component-emitter-1.1.2" - sources."component-inherit-0.0.3" - sources."content-disposition-0.5.4" - sources."content-type-1.0.5" - sources."cookie-0.6.0" - sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.3" - sources."dashdash-1.14.1" - sources."debug-2.6.9" - sources."define-data-property-1.1.4" - sources."delayed-stream-1.0.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - (sources."dom-serializer-0.0.1" // { - dependencies = [ - sources."domelementtype-1.1.3" - ]; - }) - sources."domelementtype-1.3.1" - sources."domhandler-2.2.1" - sources."domutils-1.4.3" - sources."duplexer-0.1.2" - sources."ecc-jsbn-0.1.2" - sources."ee-first-1.1.1" - sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" - sources."encodeurl-2.0.0" - (sources."engine.io-1.3.1" // { - dependencies = [ - sources."debug-0.6.0" - ]; - }) - (sources."engine.io-client-1.3.1" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) - sources."engine.io-parser-1.0.6" - sources."entities-1.1.2" - 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."event-stream-3.3.5" - sources."express-4.21.0" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."finalhandler-1.3.1" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."from-0.1.7" - sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.4" - sources."getpass-0.1.7" - sources."global-https://github.com/component/global/archive/v2.0.1.tar.gz" - sources."gopd-1.0.1" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-binary-data-0.1.1" - sources."has-cors-1.0.3" - 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."htmlparser2-3.7.3" // { - dependencies = [ - sources."domutils-1.5.1" - sources."entities-1.0.0" - ]; - }) - sources."http-errors-2.0.0" - sources."http-signature-1.2.0" - sources."iconv-lite-0.4.24" - sources."indexof-0.0.1" - sources."inherits-2.0.4" - sources."ipaddr.js-1.9.1" - sources."irc-replies-2.0.1" - sources."is-typedarray-1.0.0" - sources."isarray-0.0.1" - sources."isstream-0.1.2" - 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."json3-3.2.6" - sources."jsprim-1.4.2" - sources."linewise-0.0.3" - sources."lodash-2.4.2" - sources."map-stream-0.0.7" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.3" - sources."methods-1.1.2" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."moment-2.7.0" - sources."ms-2.0.0" - sources."mute-stream-0.0.8" - sources."nan-0.3.2" - sources."negotiator-0.6.3" - sources."oauth-sign-0.9.0" - sources."object-component-0.0.3" - sources."object-inspect-1.13.2" - sources."on-finished-2.4.1" - sources."options-0.0.6" - sources."parsejson-0.0.1" - sources."parseqs-0.0.2" - sources."parseuri-0.0.2" - sources."parseurl-1.3.3" - sources."path-to-regexp-0.1.10" - sources."pause-stream-0.0.11" - sources."performance-now-2.1.0" - sources."proxy-addr-2.0.7" - sources."psl-1.9.0" - sources."punycode-2.3.1" - sources."qs-6.13.0" - sources."range-parser-1.2.1" - sources."raw-body-2.5.2" - sources."read-1.0.7" - sources."readable-stream-1.1.14" - (sources."request-2.88.2" // { - dependencies = [ - sources."qs-6.5.3" - ]; - }) - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - (sources."send-0.19.0" // { - dependencies = [ - sources."encodeurl-1.0.2" - sources."ms-2.1.3" - ]; - }) - sources."serve-static-1.16.2" - sources."set-function-length-1.2.2" - sources."setprototypeof-1.2.0" - sources."side-channel-1.0.6" - sources."slate-irc-0.7.3" - (sources."slate-irc-parser-0.0.2" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) - (sources."socket.io-1.0.6" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) - (sources."socket.io-adapter-0.2.0" // { - dependencies = [ - sources."debug-0.7.4" - sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" - sources."socket.io-parser-2.1.2" - ]; - }) - (sources."socket.io-client-1.0.6" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) - (sources."socket.io-parser-2.2.0" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) - sources."split-1.0.1" - sources."sshpk-1.18.0" - sources."statuses-2.0.1" - sources."stream-combiner-0.2.2" - sources."string_decoder-0.10.31" - sources."through-2.3.8" - sources."tinycolor-0.0.1" - sources."to-array-0.1.3" - sources."toidentifier-1.0.1" - sources."tough-cookie-2.5.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-is-1.6.18" - sources."unpipe-1.0.0" - sources."uri-js-4.4.1" - sources."utf8-2.0.0" - sources."utils-merge-1.0.1" - sources."uuid-3.4.0" - sources."vary-1.1.2" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - (sources."ws-0.4.31" // { - dependencies = [ - sources."commander-0.6.1" - ]; - }) - sources."xmlhttprequest-https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "The self-hosted Web IRC client"; - homepage = "https://github.com/erming/shout#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; sloc = nodeEnv.buildNodePackage { name = "sloc"; packageName = "sloc"; @@ -81048,35 +79712,6 @@ in bypassCache = true; reconstructLock = true; }; - sql-formatter = nodeEnv.buildNodePackage { - name = "sql-formatter"; - packageName = "sql-formatter"; - version = "15.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.4.2.tgz"; - sha512 = "Pw4aAgfuyml/SHMlhbJhyOv+GR+Z1HNb9sgX3CVBVdN5YNM+v2VWkYJ3NNbYS7cu37GY3vP/PgnwoVynCuXRxg=="; - }; - dependencies = [ - sources."argparse-2.0.1" - sources."commander-2.20.3" - sources."discontinuous-range-1.0.0" - sources."get-stdin-8.0.0" - sources."moo-0.5.2" - sources."nearley-2.20.1" - sources."railroad-diagrams-1.0.0" - sources."randexp-0.4.6" - sources."ret-0.1.15" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Format whitespace in a SQL query to make it more readable"; - homepage = "https://github.com/sql-formatter-org/sql-formatter#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; stackdriver-statsd-backend = nodeEnv.buildNodePackage { name = "stackdriver-statsd-backend"; packageName = "stackdriver-statsd-backend"; @@ -86148,65 +84783,4 @@ in bypassCache = true; reconstructLock = true; }; - yalc = nodeEnv.buildNodePackage { - name = "yalc"; - packageName = "yalc"; - version = "1.0.0-pre.53"; - src = fetchurl { - url = "https://registry.npmjs.org/yalc/-/yalc-1.0.0-pre.53.tgz"; - sha512 = "tpNqBCpTXplnduzw5XC+FF8zNJ9L/UXmvQyyQj7NKrDNavbJtHvzmZplL5ES/RCnjX7JR7W9wz5GVDXVP3dHUQ=="; - }; - dependencies = [ - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."chalk-4.1.2" - sources."cliui-7.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."concat-map-0.0.1" - sources."detect-indent-6.1.0" - sources."emoji-regex-8.0.0" - sources."escalade-3.2.0" - sources."fs-extra-8.1.0" - sources."fs.realpath-1.0.0" - sources."get-caller-file-2.0.5" - sources."glob-7.2.3" - sources."graceful-fs-4.2.11" - sources."has-flag-4.0.0" - sources."ignore-5.3.2" - sources."ignore-walk-3.0.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-2.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."jsonfile-4.0.0" - sources."minimatch-3.1.2" - sources."npm-bundled-1.1.2" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-packlist-2.2.2" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."require-directory-2.1.1" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."supports-color-7.2.0" - sources."universalify-0.1.2" - 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.9" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Work with npm/yarn packages locally like a boss."; - homepage = "https://github.com/whitecolor/yalc"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; } diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 68e91ca81853..a9108d934d43 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -36,18 +36,9 @@ final: prev: { buildInputs = [ final.node-gyp-build ]; }; - bower2nix = prev.bower2nix.override { - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - postInstall = '' - for prog in bower2nix fetch-bower; do - wrapProgram "$out/bin/$prog" --prefix PATH : ${lib.makeBinPath [ pkgs.git pkgs.nix ]} - done - ''; - }; - expo-cli = prev."expo-cli".override (oldAttrs: { # The traveling-fastlane-darwin optional dependency aborts build on Linux. - dependencies = builtins.filter (d: d.packageName != "@expo/traveling-fastlane-${if stdenv.isLinux then "darwin" else "linux"}") oldAttrs.dependencies; + dependencies = builtins.filter (d: d.packageName != "@expo/traveling-fastlane-${if stdenv.hostPlatform.isLinux then "darwin" else "linux"}") oldAttrs.dependencies; }); fast-cli = prev.fast-cli.override { @@ -92,7 +83,7 @@ final: prev: { nativeBuildInputs = [ pkgs.pkg-config (pkgs.python3.withPackages (ps: [ ps.setuptools ])) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.xcbuild ]; buildInputs = with pkgs; [ @@ -107,7 +98,7 @@ final: prev: { pixman cairo pango - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security ]; @@ -128,7 +119,7 @@ final: prev: { meta = oldAttrs.meta // { # ModuleNotFoundError: No module named 'distutils' - broken = stdenv.isDarwin; # still broken on darwin + broken = stdenv.hostPlatform.isDarwin; # still broken on darwin }; }); @@ -151,7 +142,7 @@ final: prev: { pixman cairo pango - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreText ]; }; @@ -160,14 +151,10 @@ final: prev: { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postFixup = '' wrapProgram "$out/bin/makam" --prefix PATH : ${lib.makeBinPath [ nodejs ]} - ${lib.optionalString stdenv.isLinux "patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\""} + ${lib.optionalString stdenv.hostPlatform.isLinux "patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\""} ''; }; - node-red = prev.node-red.override { - buildInputs = [ pkgs.node-pre-gyp ]; - }; - node2nix = prev.node2nix.override { # Get latest commit for misc fixes src = fetchFromGitHub { @@ -243,10 +230,10 @@ final: prev: { in{ nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; dependencies = oldAttrs.dependencies - ++ lib.optional (stdenv.isLinux && stdenv.isx86_64) esbuild-linux-x64 - ++ lib.optional (stdenv.isLinux && stdenv.isAarch64) esbuild-linux-arm64 - ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) esbuild-darwin-x64 - ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) esbuild-darwin-arm64; + ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) esbuild-linux-x64 + ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) esbuild-linux-arm64 + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) esbuild-darwin-x64 + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) esbuild-darwin-arm64; postInstall = '' wrapProgram "$out/bin/postcss" \ --prefix NODE_PATH : ${final.postcss}/lib/node_modules \ @@ -353,7 +340,7 @@ final: prev: { cairo pango libjpeg - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreText ]; }; @@ -383,7 +370,7 @@ final: prev: { pixman cairo pango - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreText ]; }; diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix index fb93fd2f1875..7b993168e167 100644 --- a/pkgs/development/ocaml-modules/apron/default.nix +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure - ./configure -prefix $out ${lib.optionalString stdenv.isDarwin "--no-strip"} + ./configure -prefix $out ${lib.optionalString stdenv.hostPlatform.isDarwin "--no-strip"} mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs runHook postConfigure ''; diff --git a/pkgs/development/ocaml-modules/arp/default.nix b/pkgs/development/ocaml-modules/arp/default.nix index a4facc6cddfc..b8cc579e5661 100644 --- a/pkgs/development/ocaml-modules/arp/default.nix +++ b/pkgs/development/ocaml-modules/arp/default.nix @@ -47,7 +47,7 @@ buildDunePackage rec { ]; ## NOTE: As of 18 april 2023 and ARP version 3.0.0, tests fail on Darwin. - doCheck = ! stdenv.isDarwin; + doCheck = ! stdenv.hostPlatform.isDarwin; checkInputs = [ alcotest mirage-clock-unix diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index a8e8a9cc847f..822c4056e259 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -1,20 +1,20 @@ { lib, buildDunePackage, fetchurl -, cstruct, zarith, bigarray-compat, stdlib-shims, ptime, alcotest +, ptime +, alcotest }: buildDunePackage rec { minimalOCamlVersion = "4.08"; - duneVersion = "3"; pname = "asn1-combinators"; - version = "0.2.6"; + version = "0.3.1"; src = fetchurl { - url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-v${version}.tbz"; - sha256 = "sha256-ASreDYhp72IQY3UsHPjqAm9rxwL+0Q35r1ZojikbGpE="; + url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-${version}.tbz"; + hash = "sha256-+imExupuHhxP4gM/AWWvYRljwkAM4roFEAS3ffxVfE4="; }; - propagatedBuildInputs = [ cstruct zarith bigarray-compat stdlib-shims ptime ]; + propagatedBuildInputs = [ ptime ]; doCheck = true; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/augeas/default.nix b/pkgs/development/ocaml-modules/augeas/default.nix new file mode 100644 index 000000000000..b06471a495d1 --- /dev/null +++ b/pkgs/development/ocaml-modules/augeas/default.nix @@ -0,0 +1,60 @@ +{ + stdenv, + fetchurl, + fetchDebianPatch, + autoreconfHook, + makeWrapper, + pkg-config, + ocaml, + findlib, + libxml2, + augeas, + lib, +}: + +stdenv.mkDerivation rec { + pname = "ocaml-augeas"; + version = "0.6"; + + src = fetchurl { + url = "https://people.redhat.com/~rjones/augeas/files/ocaml-augeas-0.6.tar.gz"; + sha256 = "04bn62hqdka0658fgz0p0fil2fyic61i78plxvmni1yhmkfrkfla"; + }; + + patches = [ + (fetchDebianPatch { + inherit pname version; + debianRevision = "1"; + patch = "0001-Use-ocamlopt-g-option.patch"; + hash = "sha256-EMd/EfWO2ni0AMonfS7G5FENpVVq0+q3gUPd4My+Upg="; + }) + (fetchDebianPatch { + inherit pname version; + debianRevision = "1"; + patch = "0002-caml_named_value-returns-const-value-pointer-in-OCam.patch"; + hash = "sha256-Y53UHwrTVeV3hnsvABmWxlPi2Fanm0Iy1OR8Zql5Ub8="; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook + makeWrapper + pkg-config + ]; + + buildInputs = [ + ocaml + findlib + augeas + libxml2 + ]; + + createFindlibDestdir = true; + + meta = with lib; { + homepage = "https://people.redhat.com/~rjones/augeas/"; + description = "OCaml bindings for Augeas"; + license = with licenses; lgpl21Plus; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix index 9cdc9e4cad2a..02e789de5672 100644 --- a/pkgs/development/ocaml-modules/awa/default.nix +++ b/pkgs/development/ocaml-modules/awa/default.nix @@ -1,31 +1,26 @@ { lib, buildDunePackage, fetchurl -, ppx_sexp_conv , mirage-crypto, mirage-crypto-ec, mirage-crypto-rng, mirage-crypto-pk -, x509, cstruct, cstruct-unix, cstruct-sexp, sexplib, eqaf-cstruct +, x509, cstruct, cstruct-unix, eqaf , mtime, logs, fmt, cmdliner, base64 , zarith }: buildDunePackage rec { pname = "awa"; - version = "0.3.1"; + version = "0.4.0"; minimalOCamlVersion = "4.10"; src = fetchurl { url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-${version}.tbz"; - hash = "sha256-VejHFn07B/zoEG4LjLaen24ig9kAXtERl/pRo6UZCQk="; + hash = "sha256-uATKGr+J18jBx5vErB93Q9+BCR7ezi1Q+ueQGolpybQ="; }; - postPatch = '' - substituteInPlace lib/dune --replace-warn eqaf.cstruct eqaf-cstruct - ''; - propagatedBuildInputs = [ mirage-crypto mirage-crypto-ec mirage-crypto-rng mirage-crypto-pk x509 - cstruct cstruct-sexp sexplib mtime + cstruct mtime logs base64 zarith - ppx_sexp_conv eqaf-cstruct + eqaf ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/awa/mirage.nix b/pkgs/development/ocaml-modules/awa/mirage.nix index ebf3ad23fc5b..8513e5741048 100644 --- a/pkgs/development/ocaml-modules/awa/mirage.nix +++ b/pkgs/development/ocaml-modules/awa/mirage.nix @@ -8,8 +8,6 @@ buildDunePackage { inherit (awa) version src; - duneVersion = "3"; - propagatedBuildInputs = [ awa cstruct mtime lwt mirage-flow mirage-clock logs duration mirage-time diff --git a/pkgs/development/ocaml-modules/backoff/default.nix b/pkgs/development/ocaml-modules/backoff/default.nix index 5f8f7a12d79b..75ee51ede5c7 100644 --- a/pkgs/development/ocaml-modules/backoff/default.nix +++ b/pkgs/development/ocaml-modules/backoff/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "backoff"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { url = "https://github.com/ocaml-multicore/backoff/releases/download/${version}/backoff-${version}.tbz"; - hash = "sha256-EaSseCKekNE03gaNiqh5Y11r8TF9XulR9AZboPWMIwA="; + hash = "sha256-AL6jEbInsbwKVYedpNzjix/YRHtOTizxk6aVNzesnwM="; }; doCheck = true; @@ -20,5 +20,5 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; }; - minimalOCamlVersion = "4.13"; + minimalOCamlVersion = "4.12"; } diff --git a/pkgs/development/ocaml-modules/bjack/default.nix b/pkgs/development/ocaml-modules/bjack/default.nix index 197d31638d61..21052759233a 100644 --- a/pkgs/development/ocaml-modules/bjack/default.nix +++ b/pkgs/development/ocaml-modules/bjack/default.nix @@ -11,7 +11,7 @@ buildDunePackage rec { hash = "sha256-jIxxqBVWphWYyLh+24rTxk4WWfPPdGCvNdevFJEKw70="; }; - buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreAudio ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreAudio ]; propagatedBuildInputs = [ libsamplerate libjack2 ]; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix index 308fcf3ac4c9..9956dacf8885 100644 --- a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix @@ -7,20 +7,19 @@ , logs , fmt , bos -, astring , cmdliner , alcotest }: buildDunePackage rec { pname = "ca-certs-nss"; - version = "3.101"; + version = "3.103"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-${version}.tbz"; - hash = "sha256-XE3201P5JXWMRLhCwAa6zwMHEwZjg3ORIKii7tmx/hI="; + hash = "sha256-ZBwPBUwYuBBuzukgocEHBoqorotLmzHkjUYCmWRqYAw="; }; propagatedBuildInputs = [ @@ -33,7 +32,6 @@ buildDunePackage rec { logs fmt bos - astring cmdliner ]; diff --git a/pkgs/development/ocaml-modules/ca-certs/default.nix b/pkgs/development/ocaml-modules/ca-certs/default.nix index 185944f412e6..85539cdc3dd6 100644 --- a/pkgs/development/ocaml-modules/ca-certs/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs/default.nix @@ -5,17 +5,15 @@ buildDunePackage rec { pname = "ca-certs"; - version = "0.2.3"; + version = "1.0.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-${version}.tbz"; - hash = "sha256-0tjWRX2RXvbXg974Lzvl7C9W+S4gIU9Y7dY8nC/GDpw="; + hash = "sha256-hpDyMSNGckeZ8tihtoTsFrYnsCfUFkgDoOK34kYsCnI="; }; - duneVersion = "3"; - propagatedBuildInputs = [ bos fpath ptime mirage-crypto x509 astring logs ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix index 0b560f2004f6..eefac702d7ef 100644 --- a/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -14,9 +14,9 @@ buildDunePackage rec { useDune2 = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ cairo dune-configurator ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; + buildInputs = [ cairo dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; - doCheck = !(stdenv.isDarwin + doCheck = !(stdenv.hostPlatform.isDarwin # https://github.com/Chris00/ocaml-cairo/issues/19 || lib.versionAtLeast ocaml.version "4.10"); diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index e4856062adb1..94e858ff9fb4 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -36,7 +36,7 @@ let params = hash = "sha256-HklX+VPD0Ta3Knv++dBT2rhsDSlDRH90k4Cj1YtWIa8="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin darwin.sigtool; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.sigtool; propagatedBuildInputs = [ camlp-streams dune-site ]; }; diff --git a/pkgs/development/ocaml-modules/cfstream/default.nix b/pkgs/development/ocaml-modules/cfstream/default.nix index 204128adec22..e5de1b648534 100644 --- a/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/pkgs/development/ocaml-modules/cfstream/default.nix @@ -1,10 +1,10 @@ -{ lib, buildDunePackage, fetchFromGitHub, ocaml, m4, camlp-streams, core_kernel, ounit }: +{ lib, buildDunePackage, fetchFromGitHub, m4, camlp-streams, core_kernel, ounit }: buildDunePackage rec { pname = "cfstream"; version = "1.3.2"; - minimalOCamlVersion = "4.07"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "biocaml"; @@ -15,13 +15,11 @@ buildDunePackage rec { patches = [ ./git_commit.patch ./janestreet-0.17.patch ]; - strictDeps = true; - nativeBuildInputs = [ m4 ]; checkInputs = [ ounit ]; propagatedBuildInputs = [ camlp-streams core_kernel ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/chacha/default.nix b/pkgs/development/ocaml-modules/chacha/default.nix index 28aaad1c46d8..c72ab59e3f7b 100644 --- a/pkgs/development/ocaml-modules/chacha/default.nix +++ b/pkgs/development/ocaml-modules/chacha/default.nix @@ -26,9 +26,6 @@ buildDunePackage rec { sha256 = "sha256-y7X9toFDrgdv3qmFmUs7K7QS+Gy45rRLulKy48m7uqc="; })]; - minimalOCamlVersion = "4.02"; - duneVersion = "3"; - propagatedBuildInputs = [ cstruct mirage-crypto ]; # alcotest isn't available for OCaml < 4.05 due to fmt @@ -45,5 +42,6 @@ buildDunePackage rec { ''; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fufexan ]; + broken = true; # Not compatible with mirage-crypto ≥ 1.0 }; } diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix index 76e5cfb09cfa..5d9475dbe0c5 100644 --- a/pkgs/development/ocaml-modules/conduit/async.nix +++ b/pkgs/development/ocaml-modules/conduit/async.nix @@ -1,5 +1,5 @@ -{ buildDunePackage, async, async_ssl ? null, ppx_sexp_conv, ppx_here, uri, conduit -, core, ipaddr, ipaddr-sexp, sexplib +{ buildDunePackage, async, ppx_sexp_conv, ppx_here, uri, conduit +, core, ipaddr, ipaddr-sexp, sexplib0 }: buildDunePackage { @@ -13,13 +13,12 @@ buildDunePackage { propagatedBuildInputs = [ async - async_ssl conduit uri ipaddr ipaddr-sexp core - sexplib + sexplib0 ]; meta = conduit.meta // { diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index f904fda36a14..602e3919cb1f 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,20 +1,20 @@ { lib, fetchurl, buildDunePackage -, ppx_sexp_conv, sexplib, astring, uri +, ppx_sexp_conv, sexplib0, astring, uri , ipaddr, ipaddr-sexp }: buildDunePackage rec { pname = "conduit"; - version = "6.2.3"; + version = "7.0.0"; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.13"; src = fetchurl { url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz"; - hash = "sha256-OkaEuxSFsfJH1ghN0KNW4QJ+ksLNRns1yr1Zp2RCPnk="; + hash = "sha256-Pg7ChIlqldF42NE1eS56Rssk+csK8OqWTQXO4avLEhg="; }; - propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ppx_sexp_conv ]; + propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib0 uri ppx_sexp_conv ]; meta = { description = "Network connection establishment library"; diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index 144325e6c2b9..4e614bfd40cb 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -1,6 +1,6 @@ { buildDunePackage , conduit-lwt, ppx_sexp_conv, lwt, uri, ipaddr, ipaddr-sexp, ca-certs, logs -, lwt_ssl, tls, lwt_log, ssl +, lwt_ssl, lwt_log, ssl }: buildDunePackage { @@ -15,7 +15,6 @@ buildDunePackage { uri ipaddr ipaddr-sexp - tls ca-certs logs lwt_ssl diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix index bc64a7869e57..a81114ec4f77 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, ppx_sexp_conv, conduit, lwt, sexplib }: +{ buildDunePackage, ppx_sexp_conv, conduit, lwt, sexplib0 }: buildDunePackage { pname = "conduit-lwt"; @@ -6,7 +6,7 @@ buildDunePackage { buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = [ conduit lwt sexplib ]; + propagatedBuildInputs = [ conduit lwt sexplib0 ]; meta = conduit.meta // { description = "Network connection establishment library for Lwt"; diff --git a/pkgs/development/ocaml-modules/conduit/mirage.nix b/pkgs/development/ocaml-modules/conduit/mirage.nix index c4a7b304a6e8..02bb1e6649f4 100644 --- a/pkgs/development/ocaml-modules/conduit/mirage.nix +++ b/pkgs/development/ocaml-modules/conduit/mirage.nix @@ -1,6 +1,6 @@ { buildDunePackage, conduit-lwt -, ppx_sexp_conv, sexplib, uri, cstruct, mirage-flow -, mirage-flow-combinators, mirage-random, mirage-time, mirage-clock +, ppx_sexp_conv, sexplib0, uri, cstruct, mirage-flow +, mirage-flow-combinators, mirage-crypto-rng-mirage, mirage-time, mirage-clock , dns-client-mirage, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp , tcpip, ca-certs-nss }: @@ -13,8 +13,8 @@ buildDunePackage { nativeBuildInputs = [ ppx_sexp_conv ]; propagatedBuildInputs = [ - sexplib uri cstruct mirage-clock mirage-flow - mirage-flow-combinators mirage-random mirage-time + sexplib0 uri cstruct mirage-clock mirage-flow + mirage-flow-combinators mirage-crypto-rng-mirage mirage-time dns-client-mirage conduit-lwt vchan xenstore tls tls-mirage ipaddr ipaddr-sexp tcpip ca-certs-nss ]; diff --git a/pkgs/development/ocaml-modules/cpu/default.nix b/pkgs/development/ocaml-modules/cpu/default.nix index a61a597b2093..ee16765c1bcf 100644 --- a/pkgs/development/ocaml-modules/cpu/default.nix +++ b/pkgs/development/ocaml-modules/cpu/default.nix @@ -20,7 +20,7 @@ buildDunePackage rec { nativeBuildInputs = [ autoconf ]; - hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow"; + hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "strictoverflow"; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/crowbar/default.nix b/pkgs/development/ocaml-modules/crowbar/default.nix index d321abfe9daa..24ef96f57331 100644 --- a/pkgs/development/ocaml-modules/crowbar/default.nix +++ b/pkgs/development/ocaml-modules/crowbar/default.nix @@ -20,7 +20,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ocplib-endian cmdliner afl-persistent ]; checkInputs = [ calendar fpath pprint uutf uunf uucp ]; # uunf is broken on aarch64 - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; meta = with lib; { description = "Property fuzzing for OCaml"; diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index fa7bf6a587f0..cb6414a7a4cf 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -10,13 +10,13 @@ buildDunePackage rec { pname = "ctypes"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "ocamllabs"; repo = "ocaml-ctypes"; rev = version; - hash = "sha256-xgDKupQuakjHTbjoap/r2aAjNQUpH9K4HmeLbbgw1x4="; + hash = "sha256-fZfTsOMppHiI7BVvgICVt/9ofGFAfYjXzHSDA7L4vZk="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix b/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix index f0d5e04a4a99..171b08482940 100644 --- a/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix +++ b/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix @@ -28,7 +28,7 @@ buildDunePackage rec { ctypes ppx_expect ]; - doCheck = !(stdenv.isLinux && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); meta = { description = "Js_of_ocaml Javascript stubs for the OCaml ctypes library"; diff --git a/pkgs/development/ocaml-modules/curly/default.nix b/pkgs/development/ocaml-modules/curly/default.nix index 5d5cdb360f47..229ad666cb24 100644 --- a/pkgs/development/ocaml-modules/curly/default.nix +++ b/pkgs/development/ocaml-modules/curly/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { doCheck = lib.versionAtLeast ocaml.version "4.08" # Some test fails in macOS sandbox # > Fatal error: exception Unix.Unix_error(Unix.EPERM, "bind", "") - && !stdenv.isDarwin; + && !stdenv.hostPlatform.isDarwin; postPatch = '' substituteInPlace src/curly.ml \ diff --git a/pkgs/development/ocaml-modules/dns/certify.nix b/pkgs/development/ocaml-modules/dns/certify.nix index 3260e139fbbb..fff97dafed32 100644 --- a/pkgs/development/ocaml-modules/dns/certify.nix +++ b/pkgs/development/ocaml-modules/dns/certify.nix @@ -1,6 +1,6 @@ { buildDunePackage, dns, dns-tsig, dns-mirage, randomconv, x509 -, mirage-random, mirage-time, mirage-clock -, logs, mirage-crypto-pk, mirage-crypto-rng, mirage-crypto-ec, lwt +, mirage-time, mirage-clock +, logs, mirage-crypto-pk, mirage-crypto-rng-mirage, mirage-crypto-ec, lwt , tcpip }: @@ -8,7 +8,6 @@ buildDunePackage { pname = "dns-certify"; inherit (dns) version src; - duneVersion = "3"; propagatedBuildInputs = [ dns @@ -16,12 +15,11 @@ buildDunePackage { dns-mirage randomconv x509 - mirage-random mirage-time mirage-clock logs mirage-crypto-pk - mirage-crypto-rng + mirage-crypto-rng-mirage mirage-crypto-ec lwt tcpip diff --git a/pkgs/development/ocaml-modules/dns/cli.nix b/pkgs/development/ocaml-modules/dns/cli.nix index 8c1ff57bc9b3..e08a29756a2f 100644 --- a/pkgs/development/ocaml-modules/dns/cli.nix +++ b/pkgs/development/ocaml-modules/dns/cli.nix @@ -1,6 +1,6 @@ { buildDunePackage, dns, dns-tsig, dns-client-lwt, dns-server, dns-certify, dnssec , bos, cmdliner, fpath, x509, mirage-crypto, mirage-crypto-pk -, mirage-crypto-rng, hex, ptime, mtime, logs, fmt, ipaddr, lwt +, mirage-crypto-rng, ohex, ptime, mtime, logs, fmt, ipaddr, lwt , randomconv, alcotest }: @@ -10,7 +10,6 @@ buildDunePackage { minimalOCamlVersion = "4.08"; inherit (dns) version src; - duneVersion = "3"; # no need to propagate as this is primarily # an executable package @@ -28,7 +27,7 @@ buildDunePackage { mirage-crypto mirage-crypto-pk mirage-crypto-rng - hex + ohex ptime mtime logs diff --git a/pkgs/development/ocaml-modules/dns/client-lwt.nix b/pkgs/development/ocaml-modules/dns/client-lwt.nix index 107e574f5925..3c9c126e1d1b 100644 --- a/pkgs/development/ocaml-modules/dns/client-lwt.nix +++ b/pkgs/development/ocaml-modules/dns/client-lwt.nix @@ -1,5 +1,5 @@ { buildDunePackage, dns, dns-client, lwt -, mirage-crypto-rng, mtime +, mirage-crypto-rng-lwt, mtime , ipaddr, alcotest , ca-certs , happy-eyeballs @@ -21,7 +21,7 @@ buildDunePackage { happy-eyeballs-lwt tls-lwt mtime - mirage-crypto-rng + mirage-crypto-rng-lwt ]; checkInputs = [ alcotest ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/dns/client-mirage.nix b/pkgs/development/ocaml-modules/dns/client-mirage.nix index c400a7145cdb..f9159df2f940 100644 --- a/pkgs/development/ocaml-modules/dns/client-mirage.nix +++ b/pkgs/development/ocaml-modules/dns/client-mirage.nix @@ -1,5 +1,5 @@ { buildDunePackage, dns, dns-client, lwt, mirage-clock, mirage-time -, mirage-random +, mirage-crypto-rng-mirage , domain-name, ipaddr , ca-certs-nss , happy-eyeballs @@ -17,7 +17,7 @@ buildDunePackage { domain-name ipaddr lwt - mirage-random + mirage-crypto-rng-mirage mirage-time mirage-clock ca-certs-nss diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index dd5a5d786dc3..bcc67a6f6ebf 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -2,7 +2,6 @@ , buildDunePackage , fetchurl , alcotest -, cstruct , domain-name , duration , gmap @@ -13,20 +12,21 @@ , ptime , fmt , base64 +, ohex }: buildDunePackage rec { pname = "dns"; - version = "8.0.0"; + version = "9.1.0"; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.13"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz"; - hash = "sha256-CIIGG8W/p1FasmyEyoBiMjrFkxs/iuKVJ5SwySfYhU4="; + hash = "sha256-jz7JWs8U9XQhm1RAponq4azCpJyx2KBm+bI6esaPRPA="; }; - propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics base64 ]; + propagatedBuildInputs = [ fmt logs ptime domain-name gmap ipaddr lru duration metrics base64 ohex ]; doCheck = true; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/dns/dnssec.nix b/pkgs/development/ocaml-modules/dns/dnssec.nix index de2a76052384..16a5f3449041 100644 --- a/pkgs/development/ocaml-modules/dns/dnssec.nix +++ b/pkgs/development/ocaml-modules/dns/dnssec.nix @@ -1,5 +1,4 @@ { buildDunePackage -, cstruct , dns , mirage-crypto , mirage-crypto-pk @@ -14,10 +13,8 @@ buildDunePackage { pname = "dnssec"; inherit (dns) version src; - duneVersion = "3"; propagatedBuildInputs = [ - cstruct dns mirage-crypto mirage-crypto-pk diff --git a/pkgs/development/ocaml-modules/dns/mirage.nix b/pkgs/development/ocaml-modules/dns/mirage.nix index aba32efe5245..2040a56a6766 100644 --- a/pkgs/development/ocaml-modules/dns/mirage.nix +++ b/pkgs/development/ocaml-modules/dns/mirage.nix @@ -4,7 +4,6 @@ buildDunePackage { pname = "dns-mirage"; inherit (dns) version src; - duneVersion = "3"; propagatedBuildInputs = [ dns diff --git a/pkgs/development/ocaml-modules/dns/resolver.nix b/pkgs/development/ocaml-modules/dns/resolver.nix index dd46a1534ed3..04611a738d74 100644 --- a/pkgs/development/ocaml-modules/dns/resolver.nix +++ b/pkgs/development/ocaml-modules/dns/resolver.nix @@ -20,7 +20,6 @@ buildDunePackage { pname = "dns-resolver"; inherit (dns) version src; - duneVersion = "3"; propagatedBuildInputs = [ dns diff --git a/pkgs/development/ocaml-modules/dns/server.nix b/pkgs/development/ocaml-modules/dns/server.nix index 049cf507e3ac..09019bf655aa 100644 --- a/pkgs/development/ocaml-modules/dns/server.nix +++ b/pkgs/development/ocaml-modules/dns/server.nix @@ -17,7 +17,6 @@ buildDunePackage { pname = "dns-server"; inherit (dns) version src; - duneVersion = "3"; propagatedBuildInputs = [ dns diff --git a/pkgs/development/ocaml-modules/dns/stub.nix b/pkgs/development/ocaml-modules/dns/stub.nix index 343f4925b18f..23ad5539c586 100644 --- a/pkgs/development/ocaml-modules/dns/stub.nix +++ b/pkgs/development/ocaml-modules/dns/stub.nix @@ -1,13 +1,12 @@ { buildDunePackage, dns, dns-client-mirage, dns-mirage, dns-resolver, dns-tsig , dns-server, duration, randomconv, lwt, mirage-time, mirage-clock -, mirage-random, tcpip, metrics +, mirage-crypto-rng-mirage, tcpip, metrics }: buildDunePackage { pname = "dns-stub"; inherit (dns) version src; - duneVersion = "3"; propagatedBuildInputs = [ dns @@ -21,7 +20,7 @@ buildDunePackage { lwt mirage-time mirage-clock - mirage-random + mirage-crypto-rng-mirage tcpip metrics ]; diff --git a/pkgs/development/ocaml-modules/dns/tsig.nix b/pkgs/development/ocaml-modules/dns/tsig.nix index 3ecc90d39853..2d967301d25a 100644 --- a/pkgs/development/ocaml-modules/dns/tsig.nix +++ b/pkgs/development/ocaml-modules/dns/tsig.nix @@ -1,13 +1,12 @@ -{ buildDunePackage, dns, mirage-crypto, base64, alcotest }: +{ buildDunePackage, dns, digestif, base64, alcotest }: buildDunePackage { pname = "dns-tsig"; inherit (dns) version src; - duneVersion = "3"; propagatedBuildInputs = [ - mirage-crypto + digestif dns base64 ]; diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix index fede56388a77..ccecc8a33f76 100644 --- a/pkgs/development/ocaml-modules/dolmen/default.nix +++ b/pkgs/development/ocaml-modules/dolmen/default.nix @@ -1,22 +1,23 @@ { lib, fetchurl, buildDunePackage , menhir, menhirLib , fmt +, hmap , qcheck }: buildDunePackage rec { pname = "dolmen"; - version = "0.9"; + version = "0.10"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/Gbury/dolmen/releases/download/v${version}/dolmen-${version}.tbz"; - hash = "sha256-AD21OFS6zDoz+lXtac95gXwQNppPfGvpRK8dzDZXigo="; + hash = "sha256-xchfd+OSTzeOjYLxZu7+QTG04EG/nN7KRnQQ8zxx+mE="; }; nativeBuildInputs = [ menhir ]; - propagatedBuildInputs = [ menhirLib fmt ]; + propagatedBuildInputs = [ menhirLib fmt hmap ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/dolmen/loop.nix b/pkgs/development/ocaml-modules/dolmen/loop.nix index 19349bcb6e6a..572c161edc49 100644 --- a/pkgs/development/ocaml-modules/dolmen/loop.nix +++ b/pkgs/development/ocaml-modules/dolmen/loop.nix @@ -1,6 +1,7 @@ { buildDunePackage, dolmen, dolmen_type , gen , pp_loc +, mdx }: buildDunePackage { @@ -9,6 +10,10 @@ buildDunePackage { propagatedBuildInputs = [ dolmen dolmen_type gen pp_loc ]; + doCheck = true; + nativeCheckInputs = [ mdx.bin ]; + checkInputs = [ mdx ]; + meta = dolmen.meta // { description = "Tool library for automated deduction tools"; }; diff --git a/pkgs/development/ocaml-modules/eigen/default.nix b/pkgs/development/ocaml-modules/eigen/default.nix index 5c75c4cb1044..0b02539d64cb 100644 --- a/pkgs/development/ocaml-modules/eigen/default.nix +++ b/pkgs/development/ocaml-modules/eigen/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.02"; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; propagatedBuildInputs = [ ctypes ]; diff --git a/pkgs/development/ocaml-modules/eio-ssl/default.nix b/pkgs/development/ocaml-modules/eio-ssl/default.nix new file mode 100644 index 000000000000..087a667d4e2d --- /dev/null +++ b/pkgs/development/ocaml-modules/eio-ssl/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildDunePackage +, fetchurl +, eio +, ssl +}: + +buildDunePackage rec { + pname = "eio-ssl"; + version = "0.3.0"; + + src = fetchurl { + url = "https://github.com/anmonteiro/eio-ssl/releases/download/${version}/eio-ssl-${version}.tbz"; + hash = "sha256-m4CiUQtXVSMfLthbDsAftpiOsr24I5IGiU1vv7Rz8go="; + }; + + propagatedBuildInputs = [ eio ssl ]; + + meta = { + homepage = "https://github.com/anmonteiro/eio-ssl"; + description = "OpenSSL binding to EIO"; + license = lib.licenses.lgpl21; + }; +} diff --git a/pkgs/development/ocaml-modules/eio/main.nix b/pkgs/development/ocaml-modules/eio/main.nix index a65b27b8db41..48c15e99ae0c 100644 --- a/pkgs/development/ocaml-modules/eio/main.nix +++ b/pkgs/development/ocaml-modules/eio/main.nix @@ -16,7 +16,7 @@ buildDunePackage { propagatedBuildInputs = [ eio_posix - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ eio_linux ]; } diff --git a/pkgs/development/ocaml-modules/eio/posix.nix b/pkgs/development/ocaml-modules/eio/posix.nix index c18cdd506141..fa63c1ea713b 100644 --- a/pkgs/development/ocaml-modules/eio/posix.nix +++ b/pkgs/development/ocaml-modules/eio/posix.nix @@ -16,7 +16,7 @@ buildDunePackage { dontStrip = true; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; }; diff --git a/pkgs/development/ocaml-modules/elina/default.nix b/pkgs/development/ocaml-modules/elina/default.nix index de000f8aaf83..de3f1094143d 100644 --- a/pkgs/development/ocaml-modules/elina/default.nix +++ b/pkgs/development/ocaml-modules/elina/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "--use-opam" "--apron-prefix" apron ] - ++ lib.optional stdenv.isDarwin "--absolute-dylibs" + ++ lib.optional stdenv.hostPlatform.isDarwin "--absolute-dylibs" ; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 205fa78371fb..64c6b54eb73f 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -17,13 +17,13 @@ buildDunePackage rec { pname = "eliom"; - version = "11.0.0"; + version = "11.0.1"; src = fetchFromGitHub { owner = "ocsigen"; repo = "eliom"; rev = version; - hash = "sha256-RgIK3xkKdX+zOurhML4370rsO4blJrWoEla09Nfe9Mw="; + hash = "sha256-SUzfJ1R/J0jKaMC0wmXB+sNfG1VfFaFbDJql1OPdRpg="; }; nativeBuildInputs = [ @@ -54,15 +54,17 @@ buildDunePackage rec { homepage = "http://ocsigen.org/eliom/"; description = "OCaml Framework for programming Web sites and client/server Web applications"; - longDescription = ''Eliom is a framework for programming Web sites - and client/server Web applications. It introduces new concepts to - simplify programming common behaviours and uses advanced static - typing features of OCaml to check many properties of the Web site - at compile time. If you want to write a Web application, Eliom - makes possible to write the whole application as a single program - (client and server parts). A syntax extension is used to - distinguish both parts and the client side is compiled to JS using - Ocsigen Js_of_ocaml.''; + longDescription = '' + Eliom is a framework for programming Web sites + and client/server Web applications. It introduces new concepts to + simplify programming common behaviours and uses advanced static + typing features of OCaml to check many properties of the Web site + at compile time. If you want to write a Web application, Eliom + makes possible to write the whole application as a single program + (client and server parts). A syntax extension is used to + distinguish both parts and the client side is compiled to JS using + Ocsigen Js_of_ocaml. + ''; license = lib.licenses.lgpl21; diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index f9ee8ca6a193..29ee03b9df04 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -8,7 +8,7 @@ , ppxlib, ppx_deriving , ppxlib_0_15, ppx_deriving_0_15 , coqPackages -, version ? if lib.versionAtLeast ocaml.version "4.08" then "1.18.1" +, version ? if lib.versionAtLeast ocaml.version "4.08" then "1.20.0" else "1.15.2" }: @@ -16,7 +16,9 @@ let p5 = camlp5; in let camlp5 = p5.override { legacy = true; }; in let fetched = coqPackages.metaFetch ({ + release."1.20.0".sha256 = "sha256-lctZAIQgOg5d+LfILtWsBVcsemV3zTZYfJfDlCxHtcA="; release."1.19.2".sha256 = "sha256-dBj5Ek7PWq/8Btq/dggJUqa8cUtfvbi6EWo/lJEDOU4="; + release."1.18.2".sha256 = "sha256-usOYukHQ/h4YBxlhYrAkMTVjNm97hq4IArI9bvDzy/k="; release."1.18.1".sha256 = "sha256-rrIv/mVC0Ez3nU7fpnzwduIC3tI6l73DjgAbv1gd2v0="; release."1.17.0".sha256 = "sha256-J8FJBeaB+2HtHjrkgNzOZJngZ2AcYU+npL9Y1HNPnzo="; release."1.15.2".sha256 = "sha256-+sQYQiN3n+dlzXzi5opOjhkJZqpkNwlHZcUjaUM6+xQ="; diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix index 452499aa401f..d60c4684b3d9 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -1,21 +1,21 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, camlp4, ocamlbuild -, erm_xml, mirage-crypto, mirage-crypto-rng, base64 +, erm_xml, mirage-crypto, mirage-crypto-rng, base64, digestif }: stdenv.mkDerivation rec { - version = "0.3+20220404"; + version = "0.3+20241009"; pname = "ocaml${ocaml.version}-erm_xmpp"; src = fetchFromGitHub { owner = "hannesm"; repo = "xmpp"; - rev = "e54d54e142ac9770c37e144693473692bf473530"; - sha256 = "sha256-Ize8Em4LI54Cy1Xuzr9BjQGV7JMr3W6KI1YzI8G1q/U="; + rev = "54418f77abf47b175e9c1b68a4f745a12b640d6a"; + sha256 = "sha256-AbzZjNkW1VH/FOnzNruvelZeo3IYg/Usr3enQEknTQs="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ]; buildInputs = [ camlp4 ]; - propagatedBuildInputs = [ erm_xml mirage-crypto mirage-crypto-rng base64 ]; + propagatedBuildInputs = [ erm_xml mirage-crypto mirage-crypto-rng base64 digestif ]; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix index 58055aa6698c..4d8555613177 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix @@ -14,7 +14,7 @@ buildDunePackage { inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix index 8f268d4d5ec2..85f03825cdbd 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix @@ -15,7 +15,7 @@ buildDunePackage { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] - ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix index c8a1bf9de5a1..f966706cc737 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix @@ -21,7 +21,7 @@ buildDunePackage { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit AudioToolbox AVFoundation diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix index 89d982483986..1f9ded9bd024 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix @@ -17,7 +17,7 @@ buildDunePackage { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] - ++ lib.optionals stdenv.isDarwin [ AppKit CoreImage OpenGL VideoToolbox ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreImage OpenGL VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix index 8e299a536f63..8374304fe488 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix @@ -12,7 +12,7 @@ buildDunePackage { inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox VideoToolbox ]; propagatedBuildInputs = [ ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix index d21e0d02ad4c..5fda062454f0 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix @@ -13,7 +13,7 @@ buildDunePackage { inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix index b03d87596b03..518f18b1509b 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix @@ -13,7 +13,7 @@ buildDunePackage { inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/gen_js_api/default.nix b/pkgs/development/ocaml-modules/gen_js_api/default.nix index 1901bfa59bfc..1c0cd9c5bdbf 100644 --- a/pkgs/development/ocaml-modules/gen_js_api/default.nix +++ b/pkgs/development/ocaml-modules/gen_js_api/default.nix @@ -10,13 +10,13 @@ buildDunePackage rec { pname = "gen_js_api"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "LexiFi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tplbnQ/1dzZq8m/ibMAkGqY8RHQRmBPHOwh0dGuZCJM="; + sha256 = "sha256-9xYSxiPKZP7U1wbnw3/FiLhF/JmTA12rlrr4jSynA3k="; }; minimalOCamlVersion = "4.11"; diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 980a3efa9bd0..40be36100b65 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -2,19 +2,19 @@ , alcotest, mirage-crypto-rng, git-binary , angstrom, astring, cstruct, decompress, digestif, encore, fmt, checkseum , ke, logs, lwt, ocamlgraph, uri, rresult, base64, hxd -, result, bigstringaf, optint, mirage-flow, domain-name, emile +, bigstringaf, optint, mirage-flow, domain-name, emile , mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt, cmdliner }: buildDunePackage rec { pname = "git"; - version = "3.16.1"; + version = "3.17.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - hash = "sha256-wDW9zM2eTS9IxtnNxl5h/BCDjs8dim8qN2riCoqSSAM="; + hash = "sha256-7yANBBLtGlOFJdBQEpiJDguJPgIFKAlNajrhI1n9AmU="; }; buildInputs = [ @@ -22,7 +22,7 @@ buildDunePackage rec { ]; propagatedBuildInputs = [ angstrom astring checkseum cstruct decompress digestif encore fmt - ke logs lwt ocamlgraph uri rresult result bigstringaf optint mirage-flow + ke logs lwt ocamlgraph uri rresult bigstringaf optint mirage-flow domain-name emile mimic carton carton-lwt carton-git ipaddr psq hxd ]; nativeCheckInputs = [ @@ -31,7 +31,7 @@ buildDunePackage rec { checkInputs = [ alcotest alcotest-lwt mirage-crypto-rng crowbar cmdliner ]; - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; meta = { description = "Git format and protocol in pure OCaml"; diff --git a/pkgs/development/ocaml-modules/git/paf.nix b/pkgs/development/ocaml-modules/git/paf.nix index 09e64bb064a3..b4b3c499bd26 100644 --- a/pkgs/development/ocaml-modules/git/paf.nix +++ b/pkgs/development/ocaml-modules/git/paf.nix @@ -9,7 +9,6 @@ , lwt , mirage-clock , mirage-time -, result , rresult , tls , uri @@ -34,7 +33,6 @@ buildDunePackage { ca-certs-nss fmt lwt - result rresult ipaddr logs diff --git a/pkgs/development/ocaml-modules/git/unix.nix b/pkgs/development/ocaml-modules/git/unix.nix index adad5dc0792e..9423f23b5101 100644 --- a/pkgs/development/ocaml-modules/git/unix.nix +++ b/pkgs/development/ocaml-modules/git/unix.nix @@ -1,12 +1,12 @@ { buildDunePackage, git -, rresult, result, bigstringaf +, rresult, bigstringaf , fmt, bos, fpath, uri, digestif, logs, lwt -, mirage-clock, mirage-clock-unix, astring, awa, cmdliner +, mirage-clock, mirage-clock-unix, astring, cmdliner , decompress, domain-name, ipaddr, mtime -, tcpip, awa-mirage, mirage-flow, mirage-unix +, tcpip, mirage-flow, mirage-unix , alcotest, alcotest-lwt, base64, cstruct , ke, mirage-crypto-rng, git-binary -, ptime, mimic, ca-certs-nss, tls, tls-mirage +, mimic, tls , cacert, happy-eyeballs-lwt, git-mirage }: @@ -17,19 +17,17 @@ buildDunePackage { minimalOCamlVersion = "4.08"; buildInputs = [ - awa - awa-mirage cmdliner mirage-clock tcpip ]; propagatedBuildInputs = [ - rresult result bigstringaf + rresult bigstringaf fmt bos fpath digestif logs lwt astring decompress domain-name ipaddr mirage-flow mirage-unix - cstruct ptime mimic ca-certs-nss - tls tls-mirage git happy-eyeballs-lwt + cstruct mimic + tls git happy-eyeballs-lwt git-mirage mirage-clock-unix ]; checkInputs = [ diff --git a/pkgs/development/ocaml-modules/gsl/default.nix b/pkgs/development/ocaml-modules/gsl/default.nix index 27791d6aa5f3..fc81d53f1717 100644 --- a/pkgs/development/ocaml-modules/gsl/default.nix +++ b/pkgs/development/ocaml-modules/gsl/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator gsl ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; meta = with lib; { homepage = "https://mmottl.github.io/gsl-ocaml/"; diff --git a/pkgs/development/ocaml-modules/gstreamer/default.nix b/pkgs/development/ocaml-modules/gstreamer/default.nix index 34407299914a..689603c8e19c 100644 --- a/pkgs/development/ocaml-modules/gstreamer/default.nix +++ b/pkgs/development/ocaml-modules/gstreamer/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AppKit Foundation ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Foundation ]; propagatedBuildInputs = [ glib.dev gst_all_1.gstreamer.dev gst_all_1.gst-plugins-base ]; CFLAGS_COMPILE = [ diff --git a/pkgs/development/ocaml-modules/h2/default.nix b/pkgs/development/ocaml-modules/h2/default.nix index f65aeaf0e461..12aebd57774d 100644 --- a/pkgs/development/ocaml-modules/h2/default.nix +++ b/pkgs/development/ocaml-modules/h2/default.nix @@ -5,7 +5,7 @@ , faraday , base64 , psq -, httpaf +, httpun-types , alcotest , yojson , hex @@ -34,7 +34,7 @@ buildDunePackage rec { base64 psq hpack - httpaf + httpun-types ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/h2/eio.nix b/pkgs/development/ocaml-modules/h2/eio.nix new file mode 100644 index 000000000000..0beb6f3e086e --- /dev/null +++ b/pkgs/development/ocaml-modules/h2/eio.nix @@ -0,0 +1,18 @@ +{ buildDunePackage +, h2 +, eio +, gluten-eio +}: + +buildDunePackage { + pname = "h2-eio"; + + inherit (h2) src version; + + propagatedBuildInputs = [ eio gluten-eio h2 ]; + + meta = h2.meta // { + description = "EIO support for h2"; + }; +} + diff --git a/pkgs/development/ocaml-modules/hacl-star/raw.nix b/pkgs/development/ocaml-modules/hacl-star/raw.nix index 15dde10e7f26..e481fea3866b 100644 --- a/pkgs/development/ocaml-modules/hacl-star/raw.nix +++ b/pkgs/development/ocaml-modules/hacl-star/raw.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-hacl-star-raw"; - version = "0.7.1"; + version = "0.7.2"; src = fetchzip { url = "https://github.com/cryspen/hacl-packages/releases/download/ocaml-v${version}/hacl-star.${version}.tar.gz"; - hash = "sha256-TcAEaJou4BOVXSz5DYewzKfvIpjXmhLAlgF0hlq3ToQ="; + hash = "sha256-6WPbdkT9IsX0Q8mF2vLBJMktEES8tU45JztOPepAL0o="; stripRoot = false; }; @@ -25,10 +25,7 @@ stdenv.mkDerivation rec { # strictoverflow is disabled because it breaks aarch64-darwin hardeningDisable = [ "strictoverflow" ]; - # Compatibility with ctypes ≥ 0.21 - # see: https://github.com/cryspen/hacl-packages/commit/81303b83a54a92d3b5f54f1b8ddbea60438cc2bf postPatch = '' - substituteInPlace hacl-star-raw/META --replace-warn 'requires="ctypes"' 'requires="ctypes ctypes.stubs"' patchShebangs ./ ''; diff --git a/pkgs/development/ocaml-modules/hkdf/default.nix b/pkgs/development/ocaml-modules/hkdf/default.nix index 3df9ad5307c0..9faa6d02b897 100644 --- a/pkgs/development/ocaml-modules/hkdf/default.nix +++ b/pkgs/development/ocaml-modules/hkdf/default.nix @@ -1,19 +1,18 @@ -{ lib, buildDunePackage, fetchurl, cstruct, mirage-crypto, alcotest }: +{ lib, buildDunePackage, fetchurl, digestif, alcotest, ohex }: buildDunePackage rec { pname = "hkdf"; - version = "1.0.4"; + version = "2.0.0"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchurl { - url = "https://github.com/hannesm/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - hash = "sha256-uSbW2krEWquZlzXdK7/R91ETFnENeRr6NhAGtv42/Vs="; + url = "https://github.com/hannesm/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + hash = "sha256-VLBxJ5viTTn1nK0QNIAGq/8961x0/RGHZN/C/7ITWNM="; }; - propagatedBuildInputs = [ cstruct mirage-crypto ]; - checkInputs = [ alcotest ]; + propagatedBuildInputs = [ digestif ]; + checkInputs = [ alcotest ohex ]; doCheck = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/hpack/default.nix b/pkgs/development/ocaml-modules/hpack/default.nix index eb42f5158589..c6c52a38dffd 100644 --- a/pkgs/development/ocaml-modules/hpack/default.nix +++ b/pkgs/development/ocaml-modules/hpack/default.nix @@ -7,11 +7,11 @@ buildDunePackage rec { pname = "hpack"; - version = "0.11.0"; + version = "0.13.0"; src = fetchurl { url = "https://github.com/anmonteiro/ocaml-h2/releases/download/${version}/h2-${version}.tbz"; - hash = "sha256-GdXwazlgDurjzy7ekLpuMkCii8W+F/jl/IBv/WTHgFM="; + hash = "sha256-DYm28XgXUpTnogciO+gdW4P8Mbl1Sb7DTwQyo7KoBw8="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/http-mirage-client/default.nix b/pkgs/development/ocaml-modules/http-mirage-client/default.nix index 84b27dc69ff1..d5c1cb39cfc5 100644 --- a/pkgs/development/ocaml-modules/http-mirage-client/default.nix +++ b/pkgs/development/ocaml-modules/http-mirage-client/default.nix @@ -16,13 +16,13 @@ buildDunePackage rec { pname = "http-mirage-client"; - version = "0.0.6"; + version = "0.0.8"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/roburio/http-mirage-client/releases/download/v${version}/http-mirage-client-${version}.tbz"; - hash = "sha256-rtl76NJRYwSRNgN57v0KwUlcDsGQ2MR+y5ZDVf4Otjs="; + hash = "sha256-/1eguh2dYLDVNW+XWNKcwm5IgQWfEFUuQRYS205Ox+c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/httpun-ws/default.nix b/pkgs/development/ocaml-modules/httpun-ws/default.nix new file mode 100644 index 000000000000..89ac696301b3 --- /dev/null +++ b/pkgs/development/ocaml-modules/httpun-ws/default.nix @@ -0,0 +1,40 @@ +{ lib +, fetchurl +, buildDunePackage +, angstrom +, base64 +, bigstringaf +, faraday +, gluten +, httpun +, alcotest +}: + +buildDunePackage rec { + pname = "httpun-ws"; + version = "0.2.0"; + + src = fetchurl { + url = "https://github.com/anmonteiro/httpun-ws/releases/download/${version}/httpun-ws-${version}.tbz"; + hash = "sha256-6uDNLg61tPyctthitxFqbw/IUDsuQ5BGvw5vTLLCl/0="; + }; + + propagatedBuildInputs = [ + angstrom + base64 + bigstringaf + faraday + gluten + httpun + ]; + + doCheck = true; + checkInputs = [ alcotest ]; + + meta = { + description = "Websocket implementation for httpun"; + license = lib.licenses.bsd3; + homepage = "https://github.com/anmonteiro/httpun-ws"; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/httpun/default.nix b/pkgs/development/ocaml-modules/httpun/default.nix new file mode 100644 index 000000000000..f45ffe5eca2e --- /dev/null +++ b/pkgs/development/ocaml-modules/httpun/default.nix @@ -0,0 +1,22 @@ +{ buildDunePackage +, httpun-types +, angstrom +, bigstringaf +, faraday +, alcotest +}: + +buildDunePackage { + pname = "httpun"; + + inherit (httpun-types) src version; + + propagatedBuildInputs = [ angstrom bigstringaf faraday httpun-types ]; + + doCheck = true; + checkInputs = [ alcotest ]; + + meta = httpun-types.meta // { + description = "A high-performance, memory-efficient, and scalable HTTP library for OCaml"; + }; +} diff --git a/pkgs/development/ocaml-modules/httpun/eio.nix b/pkgs/development/ocaml-modules/httpun/eio.nix new file mode 100644 index 000000000000..1b3160d699f1 --- /dev/null +++ b/pkgs/development/ocaml-modules/httpun/eio.nix @@ -0,0 +1,16 @@ +{ buildDunePackage +, httpun +, gluten-eio +}: + +buildDunePackage { + pname = "httpun-eio"; + + inherit (httpun) src version; + + propagatedBuildInputs = [ gluten-eio httpun ]; + + meta = httpun.meta // { + description = "EIO support for httpun"; + }; +} diff --git a/pkgs/development/ocaml-modules/httpun/types.nix b/pkgs/development/ocaml-modules/httpun/types.nix new file mode 100644 index 000000000000..f69535129a31 --- /dev/null +++ b/pkgs/development/ocaml-modules/httpun/types.nix @@ -0,0 +1,24 @@ +{ lib +, buildDunePackage +, fetchurl +, faraday +}: + +buildDunePackage rec { + pname = "httpun-types"; + version = "0.2.0"; + + src = fetchurl { + url = "https://github.com/anmonteiro/httpun/releases/download/${version}/httpun-${version}.tbz"; + hash = "sha256-os4n70yFro4cEAjR49Xok9ayEbk0WGod0pQvfbaHvSw="; + }; + + propagatedBuildInputs = [ faraday ]; + + meta = { + description = "Common HTTP/1.x types"; + homepage = "https://github.com/anmonteiro/httpun"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index 10675364396f..6a0e4fb58fd3 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -246,7 +246,7 @@ with self; pname = "cohttp_async_websocket"; hash = "0d0smavnxpnwrmhlcf3b5a3cm3n9kz1y8fh6l28xv6zrn4sc7ik8"; meta.description = "Websocket library for use with cohttp and async"; - propagatedBuildInputs = [ async_websocket cohttp-async ppx_jane uri-sexp ]; + propagatedBuildInputs = [ async_ssl async_websocket cohttp-async ppx_jane uri-sexp ]; }; cohttp_static_handler = janePackage { diff --git a/pkgs/development/ocaml-modules/janestreet/0.16.nix b/pkgs/development/ocaml-modules/janestreet/0.16.nix index 59cd7539d1f1..325e182b48b1 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.16.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.16.nix @@ -264,7 +264,7 @@ with self; pname = "cohttp_async_websocket"; hash = "sha256-OBtyKMyvfz0KNG4SWmvoTMVPnVTpO12N38q+kEbegJE="; meta.description = "Websocket library for use with cohttp and async"; - propagatedBuildInputs = [ async_websocket cohttp-async ppx_jane uri-sexp ]; + propagatedBuildInputs = [ async_ssl async_websocket cohttp-async ppx_jane uri-sexp ]; }; cohttp_static_handler = janePackage { diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix index 35f49bf6d02f..d000b57b0e22 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.17.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix @@ -402,6 +402,7 @@ with self; hash = "sha256-0InGCF34LWQes9S4OgbR6w+6cylThYuj1Dj0aQyTnuY="; meta.description = "Websocket library for use with cohttp and async"; propagatedBuildInputs = [ + async_ssl async_websocket cohttp-async ppx_jane diff --git a/pkgs/development/ocaml-modules/kdf/default.nix b/pkgs/development/ocaml-modules/kdf/default.nix new file mode 100644 index 000000000000..8bd7f3bf306f --- /dev/null +++ b/pkgs/development/ocaml-modules/kdf/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildDunePackage +, fetchurl +, digestif +, mirage-crypto +, alcotest +, ohex +}: + +buildDunePackage rec { + pname = "kdf"; + version = "1.0.0"; + + src = fetchurl { + url = "https://github.com/robur-coop/kdf/releases/download/v${version}/kdf-${version}.tbz"; + hash = "sha256-0WFYKw7+ZtlY3WuMnCEGjp9kVM4hg3fWz4eCPexi4M4="; + }; + + propagatedBuildInputs = [ digestif mirage-crypto ]; + + checkInputs = [ alcotest ohex ]; + doCheck = true; + + meta = { + description = "Key Derivation Functions: HKDF RFC 5869, PBKDF RFC 2898, SCRYPT RFC 7914"; + homepage = "https://github.com/robur-coop/kdf"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index 1fb45ebdd8df..780213ad0792 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ ocaml findlib makeWrapper ]; - buildInputs = [ tcl tk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ tcl tk ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ]; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix index e8d0e966c40f..e747b64de6e2 100644 --- a/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/pkgs/development/ocaml-modules/lacaml/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ lapack blas ] ++ - lib.optionals stdenv.isDarwin + lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/lambdasoup/default.nix b/pkgs/development/ocaml-modules/lambdasoup/default.nix index 8af5c5f43dc8..c8c6c545cbaa 100644 --- a/pkgs/development/ocaml-modules/lambdasoup/default.nix +++ b/pkgs/development/ocaml-modules/lambdasoup/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "lambdasoup"; - version = "1.1.0"; + version = "1.1.1"; minimalOCamlVersion = "4.03"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "aantron"; repo = pname; rev = version; - hash = "sha256-HUYE29nhoBjG5OZSV4n0C5yLq8yDtP+wsmxYyWsF3lc="; + hash = "sha256-+d1JPU7OyQgt8pDTlwZraqPHH+OBQD1ycsELKpHT95Y="; }; propagatedBuildInputs = [ camlp-streams markup ]; diff --git a/pkgs/development/ocaml-modules/letsencrypt/app.nix b/pkgs/development/ocaml-modules/letsencrypt/app.nix index c3807a04061a..2f43c8c5b788 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/app.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/app.nix @@ -11,12 +11,10 @@ , bos , fpath , randomconv -, cstruct }: buildDunePackage { pname = "letsencrypt-app"; - duneVersion = "3"; minimalOCamlVersion = "4.08"; inherit (letsencrypt) @@ -37,7 +35,6 @@ buildDunePackage { bos fpath randomconv - cstruct ]; meta = letsencrypt.meta // { diff --git a/pkgs/development/ocaml-modules/letsencrypt/default.nix b/pkgs/development/ocaml-modules/letsencrypt/default.nix index a5e0c8a6ffd2..fc4ccaaf00bd 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -1,9 +1,9 @@ { buildDunePackage , lib , fetchurl -, asn1-combinators , uri , base64 +, digestif , logs , fmt , lwt @@ -12,23 +12,21 @@ , mirage-crypto-pk , x509 , yojson -, ounit +, ounit2 , ptime , domain-name -, cstruct }: buildDunePackage rec { pname = "letsencrypt"; - version = "0.5.1"; + version = "1.0.0"; src = fetchurl { url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-${version}.tbz"; - hash = "sha256-uQOHpdyPg5kms+negxpQMxfhow6auZ0ipt5ksoXYo1w="; + hash = "sha256-koNG19aoLY28Hb7GyuPuJUyrCAE59n2vjbH4z0ykGvA="; }; minimalOCamlVersion = "4.08"; - duneVersion = "3"; buildInputs = [ fmt @@ -41,17 +39,16 @@ buildDunePackage rec { yojson lwt base64 + digestif mirage-crypto mirage-crypto-ec mirage-crypto-pk - asn1-combinators x509 uri - cstruct ]; doCheck = true; - checkInputs = [ ounit ]; + checkInputs = [ ounit2 ]; meta = { description = "ACME implementation in OCaml"; diff --git a/pkgs/development/ocaml-modules/letsencrypt/dns.nix b/pkgs/development/ocaml-modules/letsencrypt/dns.nix index 26802cf0cb34..c263b6c12806 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/dns.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/dns.nix @@ -10,7 +10,6 @@ buildDunePackage { pname = "letsencrypt-dns"; - duneVersion = "3"; minimalOCamlVersion = "4.08"; inherit (letsencrypt) diff --git a/pkgs/development/ocaml-modules/letsencrypt/mirage.nix b/pkgs/development/ocaml-modules/letsencrypt/mirage.nix index f43ab9812c7e..038e75932da0 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/mirage.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/mirage.nix @@ -10,8 +10,6 @@ buildDunePackage { inherit (letsencrypt) version src; - duneVersion = "3"; - propagatedBuildInputs = [ emile http-mirage-client letsencrypt paf ]; meta = letsencrypt.meta // { diff --git a/pkgs/development/ocaml-modules/linol/default.nix b/pkgs/development/ocaml-modules/linol/default.nix index dc7ee4835801..97630cc3db93 100644 --- a/pkgs/development/ocaml-modules/linol/default.nix +++ b/pkgs/development/ocaml-modules/linol/default.nix @@ -12,7 +12,13 @@ rec { hash = "sha256-MwEisPJdzZN1VRnssotvExNMYOQdffS+Y2B8ZSUDVfo="; }; - propagatedBuildInputs = [ yojson logs lsp ppx_yojson_conv_lib trace ]; + propagatedBuildInputs = [ + yojson + logs + (lsp.override { version = "1.18.0"; }) + ppx_yojson_conv_lib + trace + ]; meta = with lib; { description = "LSP server library"; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 773b0ea81eba..e8cf9e4f85ba 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "lwt"; - version = "5.7.0"; + version = "5.8.0"; minimalOCamlVersion = "4.08"; @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "ocsigen"; repo = "lwt"; rev = version; - hash = "sha256-o0wPK6dPdnsr/LzwcSwbIGcL85wkDjdFuEcAxuS/UEs="; + hash = "sha256-GX5CSJuTajvZJ0TgG95aHeOCBi2B9Aw2URLZRCdp91A="; }; nativeBuildInputs = [ cppo ]; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 7057d8980652..154c740bf001 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -1,23 +1,22 @@ -{ lib, fetchurl, buildDunePackage, ounit2, dune-configurator, eqaf-cstruct, pkg-config +{ lib, fetchurl, buildDunePackage, ohex, ounit2, dune-configurator, eqaf-cstruct , withFreestanding ? false , ocaml-freestanding }: buildDunePackage rec { - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.13"; pname = "mirage-crypto"; - version = "0.11.3"; + version = "1.1.0"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-${version}.tbz"; - sha256 = "sha256-v7Uw+hac2QXrx+JEnzQHz71nAjrAspG4tvShQ3pdlbE="; + hash = "sha256-xxiXZ6fq1UkjyrAg85zQw0r31LBId2k52U8Cir9TY1M="; }; doCheck = true; - checkInputs = [ ounit2 ]; + checkInputs = [ ohex ounit2 ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ eqaf-cstruct @@ -25,11 +24,6 @@ buildDunePackage rec { ocaml-freestanding ]; - # Compatibility with eqaf 0.10 - postPatch = '' - substituteInPlace src/dune --replace-warn eqaf.cstruct eqaf-cstruct - ''; - meta = with lib; { homepage = "https://github.com/mirage/mirage-crypto"; description = "Simple symmetric cryptography for the modern age"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix index f1312f58146d..4fa3d2389f7b 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix @@ -3,12 +3,12 @@ , mirage-crypto , dune-configurator , pkg-config -, cstruct , mirage-crypto-rng , mirage-crypto-pk -, hex , alcotest , asn1-combinators +, ohex +, ounit2 , ppx_deriving_yojson , ppx_deriving , yojson @@ -23,14 +23,11 @@ buildDunePackage rec { src version; - duneVersion = "3"; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ - cstruct mirage-crypto mirage-crypto-rng ] ++ lib.optionals withFreestanding [ @@ -41,9 +38,10 @@ buildDunePackage rec { doCheck = true; checkInputs = [ - hex alcotest asn1-combinators + ohex + ounit2 ppx_deriving_yojson ppx_deriving yojson diff --git a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix index 11f09dfd5161..3b647e90b37b 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix @@ -1,21 +1,17 @@ -{ buildDunePackage, ounit2, randomconv, mirage-crypto, mirage-crypto-rng -, cstruct, sexplib0, zarith, eqaf-cstruct, gmp }: +{ buildDunePackage, ohex, ounit2, randomconv, mirage-crypto, mirage-crypto-rng +, sexplib0, zarith, gmp }: buildDunePackage rec { pname = "mirage-crypto-pk"; inherit (mirage-crypto) version src; - postPatch = '' - substituteInPlace pk/dune --replace-warn eqaf.cstruct eqaf-cstruct - ''; - buildInputs = [ gmp ]; - propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng - zarith eqaf-cstruct sexplib0 ]; + propagatedBuildInputs = [ mirage-crypto mirage-crypto-rng + zarith sexplib0 ]; doCheck = true; - checkInputs = [ ounit2 randomconv ]; + checkInputs = [ ohex ounit2 randomconv ]; meta = mirage-crypto.meta // { description = "Simple public-key cryptography for the modern age"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix index 3e0cde29c52d..78c64d981297 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix @@ -1,18 +1,18 @@ -{ buildDunePackage, mirage-crypto-rng, duration, cstruct, mirage-runtime +{ buildDunePackage, mirage-crypto-rng, duration, mirage-runtime , mirage-time, mirage-clock, mirage-unix, mirage-time-unix, mirage-clock-unix , logs, lwt +, ohex }: buildDunePackage rec { pname = "mirage-crypto-rng-mirage"; inherit (mirage-crypto-rng) version src; - duneVersion = "3"; doCheck = true; - checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ]; + checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ohex ]; - propagatedBuildInputs = [ duration cstruct mirage-crypto-rng mirage-runtime + propagatedBuildInputs = [ duration mirage-crypto-rng mirage-runtime mirage-time mirage-clock logs lwt ]; meta = mirage-crypto-rng.meta // { diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix index 79ff29a05de4..b1c4be4a6234 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix @@ -1,5 +1,5 @@ -{ buildDunePackage, mirage-crypto, ounit2, randomconv, dune-configurator -, cstruct, duration, logs }: +{ buildDunePackage, mirage-crypto, ohex, ounit2, randomconv, dune-configurator +, digestif, duration, logs }: buildDunePackage rec { pname = "mirage-crypto-rng"; @@ -7,12 +7,10 @@ buildDunePackage rec { inherit (mirage-crypto) version src; doCheck = true; - checkInputs = [ ounit2 randomconv ]; + checkInputs = [ ohex ounit2 randomconv ]; buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ cstruct mirage-crypto duration logs ]; - - strictDeps = true; + propagatedBuildInputs = [ digestif mirage-crypto duration logs ]; meta = mirage-crypto.meta // { description = "Cryptographically secure PRNG"; diff --git a/pkgs/development/ocaml-modules/mlbdd/default.nix b/pkgs/development/ocaml-modules/mlbdd/default.nix new file mode 100644 index 000000000000..dfdd1fdc8f3f --- /dev/null +++ b/pkgs/development/ocaml-modules/mlbdd/default.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchFromGitHub, + buildDunePackage, + ounit, +}: + +buildDunePackage { + pname = "mlbdd"; + version = "0.7.3"; + + minimalOCamlVersion = "4.04"; + + src = fetchFromGitHub { + owner = "arlencox"; + repo = "mlbdd"; + rev = "v0.7.3"; + hash = "sha256-TUdgx+B5341VJsnP7iTHID7hNC+5G/I2xNM5F3mdb/A="; + }; + + checkInputs = [ ounit ]; + + doCheck = true; + + meta = { + homepage = "https://github.com/arlencox/mlbdd"; + description = "A not-quite-so-simple Binary Decision Diagrams implementation for OCaml"; + maintainers = with lib.maintainers; [ katrinafyi ]; + }; +} diff --git a/pkgs/development/ocaml-modules/mm/default.nix b/pkgs/development/ocaml-modules/mm/default.nix index a9a393faf5d9..b0896d2fd6a7 100644 --- a/pkgs/development/ocaml-modules/mm/default.nix +++ b/pkgs/development/ocaml-modules/mm/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "mm"; - version = "0.8.5"; + version = "0.8.6"; duneVersion = "3"; @@ -14,7 +14,7 @@ buildDunePackage rec { owner = "savonet"; repo = "ocaml-mm"; rev = "v${version}"; - sha256 = "sha256-/83coQdUoaa1+5yapF/joV87uYpVsmWU7LH867Vmmo0="; + sha256 = "sha256-ME6Naza7OvZ/63zEjrPeKq5JwMoMfV2fpkCuZdtCZ/c="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/mrmime/default.nix b/pkgs/development/ocaml-modules/mrmime/default.nix index 8e9a3e1049e1..758d27e45f1c 100644 --- a/pkgs/development/ocaml-modules/mrmime/default.nix +++ b/pkgs/development/ocaml-modules/mrmime/default.nix @@ -57,7 +57,8 @@ buildDunePackage rec { jsonm mirage-crypto-rng ]; - doCheck = true; + # Checks are not compatible with mirage-crypto-rng ≥ 1.0 + doCheck = false; meta = { description = "Parser and generator of mail in OCaml"; diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index ff53efb9d9a4..902a1dbeefc7 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -5,11 +5,11 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-mtime"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { url = "https://erratique.ch/software/mtime/releases/mtime-${version}.tbz"; - sha256 = "Pz2g6gBts0RlsDCE3npYqxWg8W9HgoxQC+U63fHgROs="; + sha256 = "sha256-CXyygC43AerZVy4bSD1aKMbi8KOUSfqvm0StiomDTYg="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index 67741516af19..e27fbca0a4a0 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config findlib perl ocaml ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit ]; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix index 9e512e35f304..d9a21225cbb1 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix @@ -9,6 +9,7 @@ , dot-merlin-reader , spawn , ocamlc-loc +, merlin , merlin-lib , astring , camlp-streams @@ -25,6 +26,22 @@ let lsp_v = let lsp = lsp_v; in +# Use merlin < 4.17 for OCaml < 5.2 +let merlin-lib_v = + if lib.versions.majorMinor ocaml.version == "4.14" + then merlin-lib.override { + merlin = merlin.override { + version = "4.16-414"; + }; + } else if lib.versions.majorMinor ocaml.version == "5.1" + then merlin-lib.override { + merlin = merlin.override { + version = "4.16-501"; + }; + } else merlin-lib +; in +let merlin-lib = merlin-lib_v; in + buildDunePackage rec { pname = "ocaml-lsp-server"; inherit (lsp) version src preBuild; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index 6ad8420fc134..1a2a97d21f2b 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -8,7 +8,9 @@ , lib , ocaml , version ? - if lib.versionAtLeast ocaml.version "4.14" then + if lib.versionAtLeast ocaml.version "5.02" then + "1.19.0" + else if lib.versionAtLeast ocaml.version "4.14" then "1.18.0" else if lib.versionAtLeast ocaml.version "4.13" then "1.10.5" @@ -19,6 +21,11 @@ }: let params = { + "1.19.0" = { + name = "lsp"; + minimalOCamlVersion = "5.02"; + sha256 = "sha256-54PZ8af4nOG/TJFIqjSiKDaL0Um7zKQ96AtFkiHe5ew="; + }; "1.18.0" = { name = "lsp"; minimalOCamlVersion = "4.14"; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index c77d1ed40453..9787c67bbd7c 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -22,7 +22,9 @@ , ocamlformat-rpc-lib , ocaml , version ? - if lib.versionAtLeast ocaml.version "4.14" then + if lib.versionAtLeast ocaml.version "5.02" then + "1.19.0" + else if lib.versionAtLeast ocaml.version "4.14" then "1.18.0" else if lib.versionAtLeast ocaml.version "4.13" then "1.10.5" @@ -83,7 +85,7 @@ buildDunePackage rec { stdune ] else if lib.versionAtLeast version "1.7.0" then - [ pp re ppx_yojson_conv_lib octavius dune-build-info omd cmdliner ocamlformat-rpc-lib ] + [ re octavius dune-build-info omd cmdliner ocamlformat-rpc-lib ] else [ ppx_yojson_conv_lib @@ -111,7 +113,7 @@ buildDunePackage rec { ] else if lib.versionAtLeast version "1.7.0" then [ csexp jsonrpc - pp + (pp.override { version = "1.2.0"; }) ppx_yojson_conv_lib result uutf diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix index c475cc7a97d0..a8a998299a95 100644 --- a/pkgs/development/ocaml-modules/ocaml-version/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ocaml-version"; - version = "3.6.8"; + version = "3.6.9"; src = fetchurl { url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz"; - hash = "sha256-mCIeXsvpea/iFuJkvearu6wr804qFPCcH4WOaUKYC9k="; + hash = "sha256-NcelYCcDPooOP7GfWr2m27GDikKiMqezcvRfFmBzlYY="; }; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix deleted file mode 100644 index a2071a9dfaad..000000000000 --- a/pkgs/development/ocaml-modules/ocamlmake/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{stdenv, lib, fetchurl}: - -let - - version = "6.37.0"; - sha256 = "99ff58080ed154cc4bd70f915fe4760dffb026a1c0447caa0b3bdb982b24b0a8"; - -in stdenv.mkDerivation { - pname = "ocaml-make"; - inherit version; - - src = fetchurl { - url = "https://bitbucket.org/mmottl/ocaml-makefile/downloads/ocaml-makefile-${version}.tar.gz"; - inherit sha256; - }; - - installPhase = '' - mkdir -p "$out/include/" - cp OCamlMakefile "$out/include/" - ''; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = "http://www.ocaml.info/home/ocaml_sources.html"; - description = "Generic OCaml Makefile for GNU Make"; - license = "LGPL"; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh b/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh deleted file mode 100644 index 6d9504370165..000000000000 --- a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addOcamlMakefile () { - export OCAMLMAKEFILE="@out@/include/OCamlMakefile" -} - -addEnvHooks "$targetOffset" addOcamlMakefile diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix index 5e3c76be1a33..137589308e2b 100644 --- a/pkgs/development/ocaml-modules/ocf/default.nix +++ b/pkgs/development/ocaml-modules/ocf/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "ocf"; - version = "0.8.0"; + version = "0.9.0"; duneVersion = "3"; minimalOCamlVersion = "4.03"; src = fetchFromGitLab { @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "zoggy"; repo = "ocf"; rev = version; - sha256 = "sha256:00ap3q5yjqmpk87lxqv1j2wkc7583ynhjr1jjrfn9r0j2h9pfd60"; + sha256 = "sha256-tTNpvncLO/WfcMbjqRfqzcdPv2Bd877fOU5AZlkkcXA="; }; propagatedBuildInputs = [ yojson ]; diff --git a/pkgs/development/ocaml-modules/ohex/default.nix b/pkgs/development/ocaml-modules/ohex/default.nix new file mode 100644 index 000000000000..49bf6005c686 --- /dev/null +++ b/pkgs/development/ocaml-modules/ohex/default.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchurl, + buildDunePackage, + alcotest, +}: + +buildDunePackage rec { + pname = "ohex"; + version = "0.2.0"; + + src = fetchurl { + url = "https://github.com/ocaml/opam-source-archives/raw/main/ohex-${version}.tar.gz"; + hash = "sha256-prV7rbo0sAx3S2t4YtjniJEVq43uLXK8ZMsqoMzn2Ow="; + }; + + doCheck = true; + checkInputs = [ alcotest ]; + + meta = { + description = "Hexadecimal encoding and decoding"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/opium/default.nix b/pkgs/development/ocaml-modules/opium/default.nix index b11ab3a8ec95..ceae3c4867cf 100644 --- a/pkgs/development/ocaml-modules/opium/default.nix +++ b/pkgs/development/ocaml-modules/opium/default.nix @@ -23,7 +23,6 @@ buildDunePackage rec { pname = "opium"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; inherit (rock) src version; @@ -57,5 +56,6 @@ buildDunePackage rec { homepage = "https://github.com/rgrinberg/opium"; license = lib.licenses.mit; maintainers = [ lib.maintainers.pmahoney ]; + broken = true; # Not compatible with mirage-crypto ≥ 1.0 }; } diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix index 108f4b79d782..ef4743be9ac9 100644 --- a/pkgs/development/ocaml-modules/otr/default.nix +++ b/pkgs/development/ocaml-modules/otr/default.nix @@ -1,21 +1,19 @@ { lib, fetchurl, buildDunePackage -, cstruct, sexplib0, mirage-crypto, mirage-crypto-pk, astring, base64 +, digestif, sexplib0, mirage-crypto, mirage-crypto-pk, astring, base64 }: buildDunePackage rec { pname = "otr"; - version = "0.3.10"; + version = "1.0.0"; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.13"; src = fetchurl { - url = "https://github.com/hannesm/ocaml-otr/releases/download/v${version}/otr-v${version}.tbz"; - hash = "sha256:0dssc7p6s7z53n0mddyipjghzr8ld8bb7alaxqrx9gdpspwab1gq"; + url = "https://github.com/hannesm/ocaml-otr/releases/download/v${version}/otr-${version}.tbz"; + hash = "sha256-/CcVqLbdylB+LqpKNETkpvQ8SEAIcEFCO1MZqvdmJWU="; }; - duneVersion = "3"; - - propagatedBuildInputs = [ cstruct sexplib0 mirage-crypto mirage-crypto-pk + propagatedBuildInputs = [ digestif sexplib0 mirage-crypto mirage-crypto-pk astring base64 ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/paf/default.nix b/pkgs/development/ocaml-modules/paf/default.nix index ca04e6bcfe37..7ac80079933a 100644 --- a/pkgs/development/ocaml-modules/paf/default.nix +++ b/pkgs/development/ocaml-modules/paf/default.nix @@ -19,15 +19,16 @@ , uri , alcotest-lwt , cstruct +, httpaf }: buildDunePackage rec { pname = "paf"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz"; - hash = "sha256-uvNezux0V4mwbxU07zCfCYXOgCYKPxshOKiiAjLef9k="; + hash = "sha256-w2lGs+DYY08BUKumWFxPFTLQKvdRPu7H1FdQOIjDQyE="; }; minimalOCamlVersion = "4.08"; @@ -43,6 +44,7 @@ buildDunePackage rec { tls cstruct tcpip + httpaf ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/pbkdf/default.nix b/pkgs/development/ocaml-modules/pbkdf/default.nix index d6b9bdb7e758..27b269b369e8 100644 --- a/pkgs/development/ocaml-modules/pbkdf/default.nix +++ b/pkgs/development/ocaml-modules/pbkdf/default.nix @@ -1,25 +1,24 @@ { lib , buildDunePackage , fetchzip -, cstruct +, digestif , mirage-crypto , alcotest +, ohex }: buildDunePackage rec { pname = "pbkdf"; - version = "1.2.0"; - - duneVersion = "3"; + version = "2.0.0"; src = fetchzip { url = "https://github.com/abeaumont/ocaml-pbkdf/archive/${version}.tar.gz"; - sha256 = "sha256-dGi4Vw+7VBpK/NpJ6zdpogm+E6G/oJovXCksJBSmqjI="; + hash = "sha256-D2dXpf1D/wsJrcajU3If37tuLYjahoA/+QoXZKr1vQs="; }; minimalOCamlVersion = "4.08"; - propagatedBuildInputs = [ cstruct mirage-crypto ]; - checkInputs = [ alcotest ]; + propagatedBuildInputs = [ digestif mirage-crypto ]; + checkInputs = [ alcotest ohex ]; doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/piaf/default.nix b/pkgs/development/ocaml-modules/piaf/default.nix index 991764336657..9c2e481b76e4 100644 --- a/pkgs/development/ocaml-modules/piaf/default.nix +++ b/pkgs/development/ocaml-modules/piaf/default.nix @@ -1,52 +1,57 @@ -{ alcotest-lwt +{ alcotest , buildDunePackage -, ocaml -, bigarray-compat -, dune-site , fetchurl -, gluten-lwt-unix +, eio-ssl +, faraday +, h2-eio +, httpun-eio +, httpun-ws +, ipaddr +, ke , lib , logs , magic-mime -, mrmime -, psq -, rresult +, pecu +, prettym +, unstrctrd , uri +, uutf +, dune-site +, eio_main }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") - "piaf is not available for OCaml ${ocaml.version}" - buildDunePackage rec { pname = "piaf"; - version = "0.1.0"; + version = "0.2.0"; src = fetchurl { url = "https://github.com/anmonteiro/piaf/releases/download/${version}/piaf-${version}.tbz"; - hash = "sha256-AMO+ptGox33Bi7u/H0SaeCU88XORrRU3UbLof3EwcmU="; + hash = "sha256-B/qQCaUvrqrm2GEW51AH9SebGFx7x8laq5RV8hBzcPs="; }; - postPatch = '' - substituteInPlace ./vendor/dune --replace "mrmime.prettym" "prettym" - ''; - propagatedBuildInputs = [ - bigarray-compat + eio-ssl + faraday + h2-eio + httpun-eio + httpun-ws + ipaddr logs magic-mime - mrmime - psq - rresult + pecu + prettym + unstrctrd uri - gluten-lwt-unix + uutf ]; - nativeCheckInputs = [ - alcotest-lwt + # Some test cases fail + doCheck = false; + checkInputs = [ + alcotest dune-site + eio_main ]; - # Check fails with OpenSSL 3 - doCheck = false; meta = { description = "HTTP library with HTTP/2 support written entirely in OCaml"; diff --git a/pkgs/development/ocaml-modules/pp/default.nix b/pkgs/development/ocaml-modules/pp/default.nix index 19f446ad85d5..5851c758cf31 100644 --- a/pkgs/development/ocaml-modules/pp/default.nix +++ b/pkgs/development/ocaml-modules/pp/default.nix @@ -1,16 +1,23 @@ -{ buildDunePackage, fetchurl, ppx_expect, lib }: +{ lib +, buildDunePackage +, fetchurl +, ppx_expect +, version ? "2.0.0" +}: buildDunePackage rec { pname = "pp"; - version = "1.2.0"; + inherit version; src = fetchurl { url = "https://github.com/ocaml-dune/pp/releases/download/${version}/pp-${version}.tbz"; - hash = "sha256-pegiVzxVr7Qtsp7FbqzR8qzY9lzy3yh44pHeN0zmkJw="; + hash = { + "2.0.0" = "sha256-hlE1FRiwkrSi3vTggXHCdhUvkvtqhKixm2uSnM20RBk="; + "1.2.0" = "sha256-pegiVzxVr7Qtsp7FbqzR8qzY9lzy3yh44pHeN0zmkJw="; + }."${version}"; }; - duneVersion = "3"; minimalOCamlVersion = "4.08"; checkInputs = [ ppx_expect ]; diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix index b9665ecc0552..62ac0769d6eb 100644 --- a/pkgs/development/ocaml-modules/ppx_blob/default.nix +++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "ppx_blob"; version = "0.9.0"; - duneVersion = "3"; + minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/johnwhitington/${pname}/releases/download/${version}/ppx_blob-${version}.tbz"; @@ -13,7 +13,7 @@ buildDunePackage rec { checkInputs = [ alcotest ]; propagatedBuildInputs = [ ppxlib ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; meta = with lib; { homepage = "https://github.com/johnwhitington/ppx_blob"; diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index bc849fa1ece3..b64a5301fc32 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -3,7 +3,7 @@ if lib.versionAtLeast ocaml.version "4.07" then if lib.versionAtLeast ocaml.version "4.08" then if lib.versionAtLeast ocaml.version "4.11" - then "0.32.1" else "0.24.0" else "0.15.0" else "0.13.0" + then "0.33.0" else "0.24.0" else "0.15.0" else "0.13.0" , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio , stdlib-shims, ocaml-migrate-parsetree-2 }: @@ -67,6 +67,10 @@ let param = { sha256 = "sha256-nbrYvLHItPPfP1i8pgpe0j2GUx8No0tBlshr1YXAnX8="; min_version = "4.07"; }; + "0.33.0" = { + sha256 = "sha256-/6RO9VHyO3XiHb1pijAxBDE4Gq8UC5/kuBwucKLSxjo="; + min_version = "4.07"; + }; }."${version}"; in if param ? max_version && lib.versionAtLeast ocaml.version param.max_version diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix index fe7e655ba60c..ea99dfcd81de 100644 --- a/pkgs/development/ocaml-modules/printbox/default.nix +++ b/pkgs/development/ocaml-modules/printbox/default.nix @@ -2,17 +2,15 @@ buildDunePackage rec { pname = "printbox"; - version = "0.11"; + version = "0.12"; - useDune2 = true; - - minimalOCamlVersion = "4.03"; + minimalOCamlVersion = "4.04"; src = fetchFromGitHub { owner = "c-cube"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f5iTesEakULlLdDGtX+5i3vesUIbFLjcV3kJ7ZPia0Y="; + sha256 = "sha256-PQbr2sjASoWz0OHAMV6buAJERpnUJxVpLAigIVnADIc="; }; nativeCheckInputs = [ mdx.bin ]; diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index 1f23194582a0..7110a66c8f60 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -11,12 +11,12 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") "ptime is not available for OCaml ${ocaml.version}" stdenv.mkDerivation (finalAttrs: { - version = "1.1.0"; + version = "1.2.0"; pname = "ocaml${ocaml.version}-ptime"; src = fetchurl { url = "https://erratique.ch/software/ptime/releases/ptime-${finalAttrs.version}.tbz"; - hash = "sha256-y/WxVFT7JxBeLDNAI+HhHY+TnXF4hw9cvo7SbfcBPrE="; + hash = "sha256-lhZ0f99JDsNugCTKsn7gHjoK9XfYojImY4+kA03nOrA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix index 84355d916085..7f51f8235d48 100644 --- a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix +++ b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "qcheck-multicoretests-util"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "ocaml-multicore"; repo = "multicoretests"; rev = version; - hash = "sha256-0fbMDksC23jojJV+aegBoSwKf1hNzDUvDEbo31HUDoM="; + hash = "sha256-5UyQs99x2CWK9ncsRwdvA5iGhry9JnMs5nKoFSRHg3M="; }; propagatedBuildInputs = [ qcheck-core ]; diff --git a/pkgs/development/ocaml-modules/randomconv/default.nix b/pkgs/development/ocaml-modules/randomconv/default.nix index 45f52ba5bded..e3e7f8ceb99d 100644 --- a/pkgs/development/ocaml-modules/randomconv/default.nix +++ b/pkgs/development/ocaml-modules/randomconv/default.nix @@ -1,18 +1,16 @@ -{ lib, buildDunePackage, fetchurl, cstruct }: +{ lib, buildDunePackage, fetchurl }: buildDunePackage rec { pname = "randomconv"; - version = "0.1.3"; + version = "0.2.0"; - duneVersion = "3"; + minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/hannesm/randomconv/releases/download/v${version}/randomconv-v${version}.tbz"; - sha256 = "1iv3r0s5kqxs893b0d55f0r62k777haiahfkkvvfbqwgqsm6la4v"; + url = "https://github.com/hannesm/randomconv/releases/download/v${version}/randomconv-${version}.tbz"; + hash = "sha256-sxce3wfjQaRGj5L/wh4qiGO4LtXDb3R3zJja8F1bY+o="; }; - propagatedBuildInputs = [ cstruct ]; - meta = { homepage = "https://github.com/hannesm/randomconv"; description = "Convert from random bytes to random native numbers"; diff --git a/pkgs/development/ocaml-modules/res/default.nix b/pkgs/development/ocaml-modules/res/default.nix index 779a3c3d8a5f..b7a4edd69f8e 100644 --- a/pkgs/development/ocaml-modules/res/default.nix +++ b/pkgs/development/ocaml-modules/res/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "res"; - version = "5.0.1"; + version = "5.0.2"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mmottl/res/releases/download/${version}/res-${version}.tbz"; - hash = "sha256-rSrDMQBfnbWAr2LuajP3fveOtOwLyRbKPkaTKsnocQ4="; + hash = "sha256-hQxRETCYxy7ZHah5cg+XHtH3wCj/ofq1VHxsPHu91FU="; }; doCheck = true; diff --git a/pkgs/development/ocaml-modules/riot/default.nix b/pkgs/development/ocaml-modules/riot/default.nix index a5c37a292930..7b5008d9b1b0 100644 --- a/pkgs/development/ocaml-modules/riot/default.nix +++ b/pkgs/development/ocaml-modules/riot/default.nix @@ -47,5 +47,6 @@ buildDunePackage rec { changelog = "https://github.com/leostera/riot/blob/${version}/CHANGES.md"; license = lib.licenses.mit; maintainers = [ ]; + broken = true; # Not compatible with mirage-crypto ≥ 1.0 }; } diff --git a/pkgs/development/ocaml-modules/sail/default.nix b/pkgs/development/ocaml-modules/sail/default.nix index c7df6ef50308..56a7ef2ece2f 100644 --- a/pkgs/development/ocaml-modules/sail/default.nix +++ b/pkgs/development/ocaml-modules/sail/default.nix @@ -52,12 +52,12 @@ buildDunePackage rec { # This doesnt work in this case, as sail includes multiple packages in the same source tree buildPhase = '' runHook preBuild - dune build --release ''${enableParallelBuild:+-j $NIX_BUILD_CORES} + dune build --release ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} runHook postBuild ''; checkPhase = '' runHook preCheck - dune runtest ''${enableParallelBuild:+-j $NIX_BUILD_CORES} + dune runtest ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} runHook postCheck ''; installPhase = '' diff --git a/pkgs/development/ocaml-modules/semaphore-compat/default.nix b/pkgs/development/ocaml-modules/semaphore-compat/default.nix index a686ef42e708..adbff78d5945 100644 --- a/pkgs/development/ocaml-modules/semaphore-compat/default.nix +++ b/pkgs/development/ocaml-modules/semaphore-compat/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "semaphore-compat"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "https://github.com/mirage/semaphore-compat/releases/download/${version}/semaphore-compat-${version}.tbz"; - sha256 = "139c5rxdp4dg1jcwyyxvhxr8213l1xdl2ab0mc288rfcppsiyxrb"; + sha256 = "sha256-4CnZ2vX17IPpnlA7CNeuxZEKfA5HFoeQvwH0tCKNRnY="; }; useDune2 = true; @@ -14,7 +14,7 @@ buildDunePackage rec { meta = with lib; { description = "Compatibility Semaphore module"; homepage = "https://github.com/mirage/semaphore-compat"; - license = licenses.lgpl21Only; + license = with licenses; [ lgpl21Plus ocamlLgplLinkingException ]; maintainers = [ maintainers.sternenseemann ]; }; } diff --git a/pkgs/development/ocaml-modules/sodium/default.nix b/pkgs/development/ocaml-modules/sodium/default.nix index 87fb82adcbeb..a3777f7d8aec 100644 --- a/pkgs/development/ocaml-modules/sodium/default.nix +++ b/pkgs/development/ocaml-modules/sodium/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow"; + hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "strictoverflow"; meta = with lib; { homepage = "https://github.com/dsheets/ocaml-sodium"; diff --git a/pkgs/development/ocaml-modules/spacetime_lib/spacetime.diff b/pkgs/development/ocaml-modules/spacetime_lib/spacetime.diff deleted file mode 100644 index baad34ce08b5..000000000000 --- a/pkgs/development/ocaml-modules/spacetime_lib/spacetime.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/elf_locations.ml b/src/elf_locations.ml -index a08b359..0db9274 100644 ---- a/src/elf_locations.ml -+++ b/src/elf_locations.ml -@@ -37,7 +37,8 @@ let resolve_from_dwarf t ~program_counter = - | Some section -> - let body = Owee_buf.cursor (Owee_elf.section_body t.map section) in - let rec aux () = -- match Owee_debug_line.read_chunk body with -+ let pointers_to_other_sections = Owee_elf.debug_line_pointers t.map t.sections in -+ match Owee_debug_line.read_chunk body ~pointers_to_other_sections with - | None -> () - | Some (header, chunk) -> - (* CR-soon mshinwell: fix owee .mli to note that [state] is diff --git a/pkgs/development/ocaml-modules/tcpip/default.nix b/pkgs/development/ocaml-modules/tcpip/default.nix index 45702c493fea..9920f8f8576b 100644 --- a/pkgs/development/ocaml-modules/tcpip/default.nix +++ b/pkgs/development/ocaml-modules/tcpip/default.nix @@ -1,7 +1,7 @@ { lib, buildDunePackage, fetchurl , pkg-config , cstruct, cstruct-lwt, mirage-net, mirage-clock -, mirage-random, mirage-time +, mirage-crypto-rng-mirage, mirage-time , macaddr, macaddr-cstruct, fmt , lwt, lwt-dllist, logs, duration, randomconv, ethernet , alcotest, mirage-flow, mirage-vnetif, pcap-format @@ -13,11 +13,11 @@ buildDunePackage rec { pname = "tcpip"; - version = "8.1.0"; + version = "8.2.0"; src = fetchurl { url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - hash = "sha256-hrpdkvkHi93GUxL2O19M40/SVw12VDOyOiJquE11qcA="; + hash = "sha256-kW5oirqJdnbERNuBKfSWOtc5+NG+Yx2eAJxiKLS31u0="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ buildDunePackage rec { cstruct-lwt mirage-net mirage-clock - mirage-random + mirage-crypto-rng-mirage mirage-time ipaddr-cstruct macaddr diff --git a/pkgs/development/ocaml-modules/theora/default.nix b/pkgs/development/ocaml-modules/theora/default.nix index 6849056d2ded..0fc9048a09ce 100644 --- a/pkgs/development/ocaml-modules/theora/default.nix +++ b/pkgs/development/ocaml-modules/theora/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "theora"; - version = "0.4.0"; + version = "0.4.1"; duneVersion = "3"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "savonet"; repo = "ocaml-theora"; rev = "v${version}"; - hash = "sha256-VN1XYqxMCO0W9tMTqSAwWKv7GErTtRZgnC2SnmmV7+k="; + hash = "sha256-2FXB5BOBRQhnpEmdlYBdZZXuXW9K+1cu7akJQDuDAMc="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/tls/async.nix b/pkgs/development/ocaml-modules/tls/async.nix index 338658cabbdb..ef4f72ec15a9 100644 --- a/pkgs/development/ocaml-modules/tls/async.nix +++ b/pkgs/development/ocaml-modules/tls/async.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, tls, async, cstruct-async, core, cstruct, mirage-crypto-rng-async }: +{ buildDunePackage, tls, async, cstruct-async, core, mirage-crypto-rng-async }: buildDunePackage rec { pname = "tls-async"; @@ -12,7 +12,6 @@ buildDunePackage rec { propagatedBuildInputs = [ async core - cstruct cstruct-async mirage-crypto-rng-async tls diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 745712cbab52..7953e817e245 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -1,31 +1,29 @@ { lib, fetchurl, buildDunePackage -, cstruct, domain-name, fmt, logs, hkdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, mirage-crypto-rng, ptime, x509 +, domain-name, fmt, logs, kdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, mirage-crypto-rng, x509 , ipaddr -, alcotest, cstruct-unix, ounit2 +, alcotest, ounit2 }: buildDunePackage rec { pname = "tls"; - version = "0.17.5"; + version = "1.0.2"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-${version}.tbz"; - hash = "sha256-iRCIV786b4VyKSWo1KP1nCkdY4wPLi/EXw/a+JKuSBk="; + hash = "sha256-ohdRIAyzFG/+FUf11t4Ye1FH6O5r7RKwnVLAAtQrP+s="; }; minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ - cstruct domain-name fmt logs - hkdf + kdf mirage-crypto mirage-crypto-ec mirage-crypto-pk mirage-crypto-rng - ptime x509 ipaddr ]; @@ -33,7 +31,6 @@ buildDunePackage rec { doCheck = true; checkInputs = [ alcotest - cstruct-unix ounit2 ]; diff --git a/pkgs/development/ocaml-modules/tls/lwt.nix b/pkgs/development/ocaml-modules/tls/lwt.nix index b86f41aeaa07..113a705381ca 100644 --- a/pkgs/development/ocaml-modules/tls/lwt.nix +++ b/pkgs/development/ocaml-modules/tls/lwt.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, tls, lwt, mirage-crypto-rng-lwt, x509 }: +{ buildDunePackage, tls, lwt, mirage-crypto-rng-lwt }: buildDunePackage rec { pname = "tls-lwt"; @@ -13,6 +13,5 @@ buildDunePackage rec { lwt mirage-crypto-rng-lwt tls - x509 ]; } diff --git a/pkgs/development/ocaml-modules/tls/mirage.nix b/pkgs/development/ocaml-modules/tls/mirage.nix index 49d2967b27ee..b302a90aecfd 100644 --- a/pkgs/development/ocaml-modules/tls/mirage.nix +++ b/pkgs/development/ocaml-modules/tls/mirage.nix @@ -1,5 +1,5 @@ { buildDunePackage, tls -, fmt, lwt, mirage-clock, mirage-crypto, mirage-crypto-pk, mirage-flow, mirage-kv, ptime, x509 +, fmt, lwt, mirage-clock, mirage-crypto, mirage-crypto-pk, mirage-flow, mirage-kv, ptime }: buildDunePackage { @@ -16,7 +16,6 @@ buildDunePackage { mirage-kv ptime tls - x509 ]; meta = tls.meta // { diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix index f24a4fe96819..83446cdf0e17 100644 --- a/pkgs/development/ocaml-modules/torch/default.nix +++ b/pkgs/development/ocaml-modules/torch/default.nix @@ -57,7 +57,7 @@ buildDunePackage rec { preBuild = "export LIBTORCH=${torch.dev}/"; - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 2d35f76d5bf0..0e4b1cf83e2c 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -7,7 +7,7 @@ else let pname = "tsdl"; - version = "1.0.0"; + version = "1.1.0"; webpage = "https://erratique.ch/software/${pname}"; in @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - hash = "sha256-XdgzCj9Uqplt/8Jk8rSFaQf8zu+9SZa8b9ZIlW/gjyE="; + hash = "sha256-ZN4+trqesU1IREKcwm1Ro37jszKG8XcVigoE4BdGhzs="; }; strictDeps = true; @@ -25,7 +25,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ocaml findlib ocamlbuild topkg ]; buildInputs = [ topkg ]; propagatedBuildInputs = [ SDL2 ctypes ctypes-foreign ] - ++ lib.optionals stdenv.isDarwin [ AudioToolbox Cocoa CoreAudio CoreVideo ForceFeedback ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox Cocoa CoreAudio CoreVideo ForceFeedback ]; preConfigure = '' # The following is done to avoid an additional dependency (ncurses) diff --git a/pkgs/development/ocaml-modules/unisim_archisec/default.nix b/pkgs/development/ocaml-modules/unisim_archisec/default.nix index 8db9abd3630b..f29ea64f4f10 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.8"; + version = "0.0.9"; src = fetchurl { - url = "https://github.com/binsec/unisim_archisec/releases/download/0.0.8/unisim_archisec-0.0.8.tbz"; - sha256 = "sha256-D8DumHaQnLsMaVHoUL7w8KgGRTh9Rk+22NNSa0a/qII="; + url = "https://github.com/binsec/unisim_archisec/releases/download/0.0.9/unisim_archisec-0.0.9.tbz"; + sha256 = "sha256-K7nBQQvnsGUgzGMLGO71P9L1P43yDol3e17glI8y35E="; }; duneVersion = "3"; diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index 1703cac867f7..10b4cc4ff4e6 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -2,7 +2,7 @@ let pname = "uucp"; - version = "15.1.0"; + version = "16.0.0"; webpage = "https://erratique.ch/software/${pname}"; minimalOCamlVersion = "4.03"; doCheck = true; @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - hash = "sha256-qR5LiAZHt4oD3ak0x17GqbYXNaJmJxFk/WGoxT+yWYc="; + hash = "sha256-5//UGI4u3OROYdxtwz9K2vCTzYiN16mOyEFhUQWtgEQ="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 83b8cacc77a0..cf354c5e898d 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -1,20 +1,21 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner +, version ? if lib.versionAtLeast ocaml.version "4.14" then "0.9.9" else "0.9.8" +}: lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") "uuidm is not available for OCaml ${ocaml.version}" -stdenv.mkDerivation rec { - version = "0.9.8"; +stdenv.mkDerivation { + inherit version; pname = "uuidm"; src = fetchurl { url = "https://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz"; - sha256 = "sha256-/GZbkJVDQu1UY8SliK282kUWAVMfOnpQadUlRT/tJrM="; + hash = { + "0.9.9" = "sha256-jOgNF05dpoU/XQEefSZhn3zSlQ1BA1b/U4Ib9j2mvFo="; + "0.9.8" = "sha256-/GZbkJVDQu1UY8SliK282kUWAVMfOnpQadUlRT/tJrM="; + }."${version}"; }; - postPatch = '' - substituteInPlace pkg/META --replace "bytes" "" - ''; - strictDeps = true; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index 2d473a4b8351..ae2d8d6c2987 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf, cmdliner , cmdlinerSupport ? lib.versionAtLeast cmdliner.version "1.1" -, version ? if lib.versionAtLeast ocaml.version "4.14" then "15.1.0" else "15.0.0" +, version ? if lib.versionAtLeast ocaml.version "4.14" then "16.0.0" else "15.0.0" }: let @@ -8,7 +8,7 @@ let webpage = "https://erratique.ch/software/${pname}"; hash = { "15.0.0" = "sha256-B/prPAwfqS8ZPS3fyDDIzXWRbKofwOCyCfwvh9veuug="; - "15.1.0" = "sha256-D8yvb7hVWaYxMqMZ5089/5tWDfvyGXKUOjhfU/4zSeQ="; + "16.0.0" = "sha256-iQNkT1av6ONJXn3yWbNbEVV8lKGYOKh/nPU0tkUdX64="; }."${version}"; in @@ -31,7 +31,7 @@ stdenv.mkDerivation { strictDeps = true; - prePatch = lib.optionalString stdenv.isAarch64 "ulimit -s 16384"; + prePatch = lib.optionalString stdenv.hostPlatform.isAarch64 "ulimit -s 16384"; buildPhase = '' runHook preBuild diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 9a8cfa29491f..44a58ab49a59 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uucp, uutf, cmdliner -, version ? if lib.versionAtLeast ocaml.version "4.14" then "15.1.0" else "15.0.0" +, version ? if lib.versionAtLeast ocaml.version "4.14" then "16.0.0" else "15.0.0" , cmdlinerSupport ? lib.versionAtLeast cmdliner.version "1.1" }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; hash = { - "15.1.0" = "sha256-IPI3Wd51HzX4n+uGcgc04us29jMjnKbGgVEAdp0CVMU="; + "16.0.0" = "sha256-WAP9uyofhtw6ag6/U4GQAanIFoKWvyA4NgeVweTs/iQ="; "15.0.0" = "sha256-q8x3bia1QaKpzrWFxUmLWIraKqby7TuPNGvbSjkY4eM="; }."${version}"; }; diff --git a/pkgs/development/ocaml-modules/vchan/default.nix b/pkgs/development/ocaml-modules/vchan/default.nix index e1be60da8bd7..51aae9b59b34 100644 --- a/pkgs/development/ocaml-modules/vchan/default.nix +++ b/pkgs/development/ocaml-modules/vchan/default.nix @@ -32,6 +32,6 @@ buildDunePackage rec { description = "Xen Vchan implementation"; homepage = "https://github.com/mirage/ocaml-vchan"; license = licenses.isc; - maintainers = [ maintainers.sternenseemann ]; + maintainers = teams.xen.members ++ [ maintainers.sternenseemann ]; }; } diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index aca71e2dfc17..9c71df2e8f65 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -1,24 +1,22 @@ { lib, fetchurl, buildDunePackage -, alcotest, cstruct-unix +, alcotest , asn1-combinators, domain-name, fmt, gmap, pbkdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, ipaddr -, logs, base64 +, logs, base64, ohex }: buildDunePackage rec { minimalOCamlVersion = "4.08"; pname = "x509"; - version = "0.16.5"; - - duneVersion = "3"; + version = "1.0.2"; src = fetchurl { url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-${version}.tbz"; - hash = "sha256-FJ4lpf6jf2GfsmkL7lwA8BydzzHTNfj/yqs5p1OMzZk="; + hash = "sha256-LrUYbLLJTNCWvEZtRXUv5LHdEya2oNTtAbrfm7EE2Bg="; }; - checkInputs = [ alcotest cstruct-unix ]; - propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk mirage-crypto-ec pbkdf logs base64 ipaddr ]; + checkInputs = [ alcotest ]; + propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk mirage-crypto-ec pbkdf logs base64 ipaddr ohex ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/xenstore/default.nix b/pkgs/development/ocaml-modules/xenstore/default.nix index 296597a6a629..2955755ccb41 100644 --- a/pkgs/development/ocaml-modules/xenstore/default.nix +++ b/pkgs/development/ocaml-modules/xenstore/default.nix @@ -25,10 +25,7 @@ buildDunePackage rec { meta = with lib; { description = "Xenstore protocol in pure OCaml"; license = licenses.lgpl21Only; - maintainers = with maintainers; [ - sternenseemann - sigmasquadron - ]; + maintainers = teams.xen.members ++ [ maintainers.sternenseemann ]; homepage = "https://github.com/mirage/ocaml-xenstore"; }; } diff --git a/pkgs/development/ocaml-modules/xenstore_transport/default.nix b/pkgs/development/ocaml-modules/xenstore_transport/default.nix index f0867b4ec314..5ef03349e68a 100644 --- a/pkgs/development/ocaml-modules/xenstore_transport/default.nix +++ b/pkgs/development/ocaml-modules/xenstore_transport/default.nix @@ -23,5 +23,6 @@ buildDunePackage rec { description = "Low-level libraries for connecting to a xenstore service on a xen host"; license = licenses.lgpl21Only; homepage = "https://github.com/xapi-project/ocaml-xenstore-clients"; + maintainers = teams.xen.members; }; } diff --git a/pkgs/development/ocaml-modules/zelus/default.nix b/pkgs/development/ocaml-modules/zelus/default.nix index 07d268d45de9..4d52640d53bc 100644 --- a/pkgs/development/ocaml-modules/zelus/default.nix +++ b/pkgs/development/ocaml-modules/zelus/default.nix @@ -20,7 +20,7 @@ buildDunePackage rec { }; # ./configure: cannot execute: required file not found - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' patchShebangs configure ''; diff --git a/pkgs/development/octave-modules/gsl/default.nix b/pkgs/development/octave-modules/gsl/default.nix index e050f381a914..2ce92f43d618 100644 --- a/pkgs/development/octave-modules/gsl/default.nix +++ b/pkgs/development/octave-modules/gsl/default.nix @@ -25,6 +25,6 @@ buildOctavePackage rec { description = "Octave bindings to the GNU Scientific Library"; # error: use of undeclared identifier 'feval'; did you mean 'octave::feval'? # error: no member named 'is_real_type' in 'octave_value' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/octave-modules/ocl/default.nix b/pkgs/development/octave-modules/ocl/default.nix index eb20f7dc7c77..72242d165543 100644 --- a/pkgs/development/octave-modules/ocl/default.nix +++ b/pkgs/development/octave-modules/ocl/default.nix @@ -24,6 +24,6 @@ buildOctavePackage rec { using available OpenCL hardware and drivers. ''; # error: structure has no member 'dir' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/octave-modules/signal/default.nix b/pkgs/development/octave-modules/signal/default.nix index 0c4c2d9c6e23..1693d8360628 100644 --- a/pkgs/development/octave-modules/signal/default.nix +++ b/pkgs/development/octave-modules/signal/default.nix @@ -6,11 +6,11 @@ buildOctavePackage rec { pname = "signal"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-VVreL/gPcRiQk5XDNAXwoXpPvNIrxtL7nD9/Rf72SOc="; + sha256 = "sha256-lO74/qeMiWCfjd9tX/i/wuDauTK0P4bOkRR0pYtcce4="; }; requiredOctavePackages = [ diff --git a/pkgs/development/octave-modules/strings/default.nix b/pkgs/development/octave-modules/strings/default.nix index 35887d249576..fbf7aec786af 100644 --- a/pkgs/development/octave-modules/strings/default.nix +++ b/pkgs/development/octave-modules/strings/default.nix @@ -40,6 +40,6 @@ buildOctavePackage rec { maintainers = with maintainers; [ KarlJoad ]; description = "Additional functions for manipulation and analysis of strings"; # Some pcre symbols claimed to be missing - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/octave-modules/video/default.nix b/pkgs/development/octave-modules/video/default.nix index c95d78590cc0..798607fb34be 100644 --- a/pkgs/development/octave-modules/video/default.nix +++ b/pkgs/development/octave-modules/video/default.nix @@ -3,7 +3,7 @@ , lib , fetchFromGitHub , pkg-config -, ffmpeg_7 +, ffmpeg }: buildOctavePackage rec { @@ -22,7 +22,7 @@ buildOctavePackage rec { ]; propagatedBuildInputs = [ - ffmpeg_7 + ffmpeg ]; meta = with lib; { diff --git a/pkgs/development/perl-modules/ImageExifTool/default.nix b/pkgs/development/perl-modules/ImageExifTool/default.nix index 08d207e3bbac..46efb33f23ca 100644 --- a/pkgs/development/perl-modules/ImageExifTool/default.nix +++ b/pkgs/development/perl-modules/ImageExifTool/default.nix @@ -18,9 +18,9 @@ buildPerlPackage rec { hash = "sha256-sfSnx5bS7vI0KIhBOpB5VYzP6g8oi0rR7mUTxxNWEA0="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/exiftool ''; diff --git a/pkgs/development/perl-modules/NetRemctl/default.nix b/pkgs/development/perl-modules/NetRemctl/default.nix new file mode 100644 index 000000000000..78ee5dfdffcb --- /dev/null +++ b/pkgs/development/perl-modules/NetRemctl/default.nix @@ -0,0 +1,20 @@ +{ + buildPerlModule, + remctl, + TestPod, +}: + +buildPerlModule { + pname = "NetRemctl"; + + inherit (remctl) meta src version; + + postPatch = '' + cp -R tests/tap/perl/Test perl/t/lib + cd perl + ''; + + buildInputs = [ remctl ]; + + checkInputs = [ TestPod ]; +} diff --git a/pkgs/development/perl-modules/Po4a/default.nix b/pkgs/development/perl-modules/Po4a/default.nix index f15697fbf379..dee562e6820c 100644 --- a/pkgs/development/perl-modules/Po4a/default.nix +++ b/pkgs/development/perl-modules/Po4a/default.nix @@ -10,6 +10,7 @@ , docbook_sgml_dtd_41 , opensp , bash +, fetchpatch , perl , buildPerlPackage , ModuleBuild @@ -25,11 +26,11 @@ buildPerlPackage rec { pname = "po4a"; - version = "0.71"; + version = "0.73"; src = fetchurl { url = "https://github.com/mquinson/po4a/releases/download/v${version}/po4a-${version}.tar.gz"; - hash = "sha256-xXJAHknMEXV8bTBgkW/ftagzJR7R1K65ibZnBLzyg/k="; + hash = "sha256-bxj4LYyyo3c5QTfqOWzD6BldbNbkVP4CGKoPDjYDjqA="; }; strictDeps = true; @@ -55,6 +56,13 @@ buildPerlPackage rec { kpsewhich-stub glibcLocales ]; + patches = [ + # Needs a patch for 5.40 until the next release + (fetchpatch { + url = "https://github.com/mquinson/po4a/commit/28fe52651eb8096d97d6bd3a97b3168522ba5306.patch"; + hash = "sha256-QUXxkSzcnwRvU+2y2KoBXmtfE8qTZ2BV0StkJHqZehQ="; + }) + ]; # TODO: TermReadKey was temporarily removed from propagatedBuildInputs to unfreeze the build propagatedBuildInputs = lib.optionals (!stdenv.hostPlatform.isMusl) [ diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix index cba9ef986362..0669f5b7c7af 100644 --- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix +++ b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix @@ -22,14 +22,14 @@ buildPerlPackage rec { sha256 = "9Z4fv2B0AnwtYsp7h9phnRMmHtBOMObIJvK8DmKQRxs="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ LWP LWPProtocolHttps DataDump JSON ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/youtube-viewer ''; diff --git a/pkgs/development/perl-modules/encode-imaputf7.patch b/pkgs/development/perl-modules/encode-imaputf7.patch new file mode 100644 index 000000000000..93842cf288bc --- /dev/null +++ b/pkgs/development/perl-modules/encode-imaputf7.patch @@ -0,0 +1,13 @@ +diff --git a/lib/Encode/IMAPUTF7.pm b/lib/Encode/IMAPUTF7.pm +index 07835b9..411c57f 100644 +--- a/lib/Encode/IMAPUTF7.pm ++++ b/lib/Encode/IMAPUTF7.pm +@@ -9,6 +9,8 @@ __PACKAGE__->Define('IMAP-UTF-7', 'imap-utf-7'); + our $VERSION = '1.05'; + use MIME::Base64; + use Encode; ++use Exporter 'import'; ++our @EXPORT_OK = qw(encode decode); + + # + # Algorithms taken from Unicode::String by Gisle Aas diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index e7afedf5d63c..73c09f4dbe9f 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -43,7 +43,7 @@ lib.throwIf (attrs ? name) "buildPerlPackage: `name` (\"${attrs.name}\") is depr builder = ./builder.sh; buildInputs = buildInputs ++ [ perl ]; - nativeBuildInputs = nativeBuildInputs ++ (if stdenv.buildPlatform != stdenv.hostPlatform then [ perl.mini ] else [ perl ]); + nativeBuildInputs = nativeBuildInputs ++ (if !(stdenv.buildPlatform.canExecute stdenv.hostPlatform) then [ perl.mini ] else [ perl ]); inherit outputs src doCheck checkTarget enableParallelBuilding; env = { diff --git a/pkgs/development/perl-modules/net-snmp-add-sha-algorithms.patch b/pkgs/development/perl-modules/net-snmp-add-sha-algorithms.patch new file mode 100644 index 000000000000..be732a1b80de --- /dev/null +++ b/pkgs/development/perl-modules/net-snmp-add-sha-algorithms.patch @@ -0,0 +1,913 @@ +From https://github.com/openbsd/ports/blob/master/net/p5-Net-SNMP/patches/patch-lib_Net_SNMP_Security_USM_pm +Tests for the additional algorithms have also been added. + +diff --git a/MANIFEST b/MANIFEST +index 3430564..d3dd7f0 100644 +--- a/MANIFEST ++++ b/MANIFEST +@@ -40,3 +40,7 @@ t/usm-sha1-3des.t + t/usm-sha1-aes.t + t/usm-sha1-cfb192aes.t + t/usm-sha1-des.t ++t/usm-sha224-aes.t ++t/usm-sha256-aes.t ++t/usm-sha384-aes.t ++t/usm-sha512-aes.t +diff --git a/lib/Net/SNMP/Security/USM.pm b/lib/Net/SNMP/Security/USM.pm +index a76ef56..0bcd52c 100644 +--- a/lib/Net/SNMP/Security/USM.pm ++++ b/lib/Net/SNMP/Security/USM.pm +@@ -26,8 +26,9 @@ use Net::SNMP::Message qw( + use Crypt::DES(); + use Digest::MD5(); + use Digest::SHA(); +-use Digest::HMAC_MD5(); +-use Digest::HMAC_SHA1(); ++ ++use Digest::SHA qw( hmac_sha1 hmac_sha224 hmac_sha256 hmac_sha384 hmac_sha512 ); ++use Digest::HMAC_MD5 qw ( hmac_md5 ); + + ## Version of the Net::SNMP::Security::USM module + +@@ -41,7 +42,9 @@ our @EXPORT_OK; + + our %EXPORT_TAGS = ( + authprotos => [ +- qw( AUTH_PROTOCOL_NONE AUTH_PROTOCOL_HMACMD5 AUTH_PROTOCOL_HMACSHA ) ++ qw( AUTH_PROTOCOL_NONE AUTH_PROTOCOL_HMACMD5 AUTH_PROTOCOL_HMACSHA ++ AUTH_PROTOCOL_HMACSHA224 AUTH_PROTOCOL_HMACSHA256 ++ AUTH_PROTOCOL_HMACSHA384 AUTH_PROTOCOL_HMACSHA512 ) + ], + levels => [ + qw( SECURITY_LEVEL_NOAUTHNOPRIV SECURITY_LEVEL_AUTHNOPRIV +@@ -64,9 +67,13 @@ $EXPORT_TAGS{ALL} = [ @EXPORT_OK ]; + + ## RCC 3414 - Authentication protocols + +-sub AUTH_PROTOCOL_NONE { '1.3.6.1.6.3.10.1.1.1' } # usmNoAuthProtocol +-sub AUTH_PROTOCOL_HMACMD5 { '1.3.6.1.6.3.10.1.1.2' } # usmHMACMD5AuthProtocol +-sub AUTH_PROTOCOL_HMACSHA { '1.3.6.1.6.3.10.1.1.3' } # usmHMACSHAAuthProtocol ++sub AUTH_PROTOCOL_NONE { '1.3.6.1.6.3.10.1.1.1' } # usmNoAuthProtocol ++sub AUTH_PROTOCOL_HMACMD5 { '1.3.6.1.6.3.10.1.1.2' } # usmHMACMD5AuthProtocol ++sub AUTH_PROTOCOL_HMACSHA { '1.3.6.1.6.3.10.1.1.3' } # usmHMACSHAAuthProtocol ++sub AUTH_PROTOCOL_HMACSHA224 { '1.3.6.1.6.3.10.1.1.4' } # usmHMAC128SHA224AuthProtocol ++sub AUTH_PROTOCOL_HMACSHA256 { '1.3.6.1.6.3.10.1.1.5' } # usmHMAC192SHA256AuthProtocol ++sub AUTH_PROTOCOL_HMACSHA384 { '1.3.6.1.6.3.10.1.1.6' } # usmHMAC256SHA384AuthProtocol ++sub AUTH_PROTOCOL_HMACSHA512 { '1.3.6.1.6.3.10.1.1.7' } # usmHMAC384SHA512AuthProtocol + + ## RFC 3414 - Privacy protocols + +@@ -125,6 +132,7 @@ sub new + '_time_epoc' => time(), # snmpEngineBoots epoc + '_user_name' => q{}, # securityName + '_auth_data' => undef, # Authentication data ++ '_auth_maclen' => undef, # MAC length + '_auth_key' => undef, # authKey + '_auth_password' => undef, # Authentication password + '_auth_protocol' => AUTH_PROTOCOL_HMACMD5, # authProtocol +@@ -281,10 +289,10 @@ sub generate_request_msg + if ($pdu->security_level() > SECURITY_LEVEL_NOAUTHNOPRIV) { + + # Save the location to fill in msgAuthenticationParameters later +- $auth_location = $msg->length() + 12 + length $pdu_buffer; ++ $auth_location = $msg->length() + $this->{_auth_maclen} + length $pdu_buffer; + + # Set the msgAuthenticationParameters to all zeros +- $auth_params = pack 'x12'; ++ $auth_params = pack "x$this->{_auth_maclen}"; + } + + if (!defined $msg->prepare(OCTET_STRING, $auth_params)) { +@@ -419,12 +427,12 @@ sub process_incoming_msg + # to compute the HMAC properly. + + if (my $len = length $auth_params) { +- if ($len != 12) { ++ if ($len != $this->{_auth_maclen}) { + return $this->_error( + 'The msgAuthenticationParameters length of %d is invalid', $len + ); + } +- substr ${$msg->reference}, ($msg->index() - 12), 12, pack 'x12'; ++ substr ${$msg->reference}, ($msg->index() - $this->{_auth_maclen}), $this->{_auth_maclen}, pack "x$this->{_auth_maclen}"; + } + + # msgPrivacyParameters::=OCTET STRING +@@ -748,6 +756,18 @@ sub _auth_password + quotemeta AUTH_PROTOCOL_HMACMD5, AUTH_PROTOCOL_HMACMD5, + '(?:hmac-)?sha(?:-?1|-96)?', AUTH_PROTOCOL_HMACSHA, + quotemeta AUTH_PROTOCOL_HMACSHA, AUTH_PROTOCOL_HMACSHA, ++ '(?:hmac-)?sha(?:-?224)', AUTH_PROTOCOL_HMACSHA224, ++ 'usmHMAC128SHA224AuthProtocol', AUTH_PROTOCOL_HMACSHA224, ++ quotemeta AUTH_PROTOCOL_HMACSHA224,AUTH_PROTOCOL_HMACSHA224, ++ '(?:hmac-)?sha(?:-?256)', AUTH_PROTOCOL_HMACSHA256, ++ 'usmHMAC192SHA256AuthProtocol', AUTH_PROTOCOL_HMACSHA256, ++ quotemeta AUTH_PROTOCOL_HMACSHA256,AUTH_PROTOCOL_HMACSHA256, ++ '(?:hmac-)?sha(?:-?384)', AUTH_PROTOCOL_HMACSHA384, ++ 'usmHMAC256SHA384AuthProtocol', AUTH_PROTOCOL_HMACSHA384, ++ quotemeta AUTH_PROTOCOL_HMACSHA384,AUTH_PROTOCOL_HMACSHA384, ++ '(?:hmac-)?sha(?:-?512)', AUTH_PROTOCOL_HMACSHA512, ++ 'usmHMAC384SHA512AuthProtocol', AUTH_PROTOCOL_HMACSHA512, ++ quotemeta AUTH_PROTOCOL_HMACSHA512,AUTH_PROTOCOL_HMACSHA512, + }; + + sub _auth_protocol +@@ -1100,7 +1120,7 @@ sub _authenticate_outgoing_msg + } + + # Set the msgAuthenticationParameters +- substr ${$msg->reference}, -$auth_location, 12, $this->_auth_hmac($msg); ++ substr ${$msg->reference}, -$auth_location, $this->{_auth_maclen}, $this->_auth_hmac($msg); + + return TRUE; + } +@@ -1126,7 +1146,7 @@ sub _auth_hmac + return q{} if (!defined($this->{_auth_data}) || !defined $msg); + + return substr +- $this->{_auth_data}->reset()->add(${$msg->reference()})->digest(), 0, 12; ++ $this->{_auth_data}(${$msg->reference()}, $this->{_auth_key}), 0, $this->{_auth_maclen}; + } + + sub _auth_data_init +@@ -1141,16 +1161,35 @@ sub _auth_data_init + + if ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACMD5) { + +- $this->{_auth_data} = +- Digest::HMAC_MD5->new($this->{_auth_key}); ++ $this->{_auth_data} = \&hmac_md5; ++ $this->{_auth_maclen} = 12; + + } elsif ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACSHA) { + +- $this->{_auth_data} = +- Digest::HMAC_SHA1->new($this->{_auth_key}); ++ $this->{_auth_data} = \&hmac_sha1; ++ $this->{_auth_maclen} = 12; ++ ++ } elsif ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACSHA224) { ++ ++ $this->{_auth_data} = \&hmac_sha224; ++ $this->{_auth_maclen} = 16; ++ ++ } elsif ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACSHA256) { ++ ++ $this->{_auth_data} = \&hmac_sha256; ++ $this->{_auth_maclen} = 24; ++ ++ } elsif ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACSHA384) { ++ ++ $this->{_auth_data} = \&hmac_sha384; ++ $this->{_auth_maclen} = 32; ++ ++ } elsif ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACSHA512) { ++ ++ $this->{_auth_data} = \&hmac_sha512; ++ $this->{_auth_maclen} = 48; + + } else { +- + return $this->_error( + 'The authProtocol "%s" is unknown', $this->{_auth_protocol} + ); +@@ -1628,6 +1667,10 @@ sub _auth_key_validate + { + AUTH_PROTOCOL_HMACMD5, [ 16, 'HMAC-MD5' ], + AUTH_PROTOCOL_HMACSHA, [ 20, 'HMAC-SHA1' ], ++ AUTH_PROTOCOL_HMACSHA224, [ 28, 'HMAC-SHA224' ], ++ AUTH_PROTOCOL_HMACSHA256, [ 32, 'HMAC-SHA256' ], ++ AUTH_PROTOCOL_HMACSHA384, [ 48, 'HMAC-SHA384' ], ++ AUTH_PROTOCOL_HMACSHA512, [ 64, 'HMAC-SHA512' ], + }; + + if (!exists $key_len->{$this->{_auth_protocol}}) { +@@ -1783,8 +1826,12 @@ sub _password_localize + + my $digests = + { +- AUTH_PROTOCOL_HMACMD5, 'Digest::MD5', +- AUTH_PROTOCOL_HMACSHA, 'Digest::SHA', ++ AUTH_PROTOCOL_HMACMD5, ['Digest::MD5', ], ++ AUTH_PROTOCOL_HMACSHA, ['Digest::SHA', 1], ++ AUTH_PROTOCOL_HMACSHA224, ['Digest::SHA', 224], ++ AUTH_PROTOCOL_HMACSHA256, ['Digest::SHA', 256], ++ AUTH_PROTOCOL_HMACSHA384, ['Digest::SHA', 384], ++ AUTH_PROTOCOL_HMACSHA512, ['Digest::SHA', 512], + }; + + if (!exists $digests->{$this->{_auth_protocol}}) { +@@ -1793,7 +1840,12 @@ sub _password_localize + ); + } + +- my $digest = $digests->{$this->{_auth_protocol}}->new; ++ my $digest; ++ if (!defined($digests->{$this->{_auth_protocol}}[1])) { ++ $digest = $digests->{$this->{_auth_protocol}}[0]->new; ++ } else { ++ $digest = $digests->{$this->{_auth_protocol}}[0]->new($digests->{$this->{_auth_protocol}}[1]); ++ } + + # Create the initial digest using the password + +diff --git a/t/usm-sha224-aes.t b/t/usm-sha224-aes.t +new file mode 100644 +index 0000000..e7d118e +--- /dev/null ++++ b/t/usm-sha224-aes.t +@@ -0,0 +1,169 @@ ++# -*- mode: perl -*- ++# ============================================================================ ++ ++# Test of the SNMPv3 User-based Security Model. ++ ++# Copyright (c) 2001-2009 David M. Town <dtown@cpan.org>. ++# Copyright (c) 2024 Michal Josef Špaček <skim@cpan.org>. ++# All rights reserved. ++ ++# This program is free software; you may redistribute it and/or modify it ++# under the same terms as the Perl 5 programming language system itself. ++ ++# ============================================================================ ++ ++use strict; ++use Test; ++ ++BEGIN ++{ ++ $| = 1; ++ $^W = 1; ++ plan tests => 7 ++} ++ ++use Net::SNMP::Message qw(SEQUENCE OCTET_STRING FALSE); ++ ++# ++# Load the Net::SNMP::Security::USM module ++# ++ ++eval 'use Net::SNMP::Security::USM; use Crypt::Rijndael;'; ++ ++my $skip = ($@ =~ /locate (:?\S+\.pm)/) ? $@ : FALSE; ++ ++# ++# 1. Create the Net::SNMP::Security::USM object ++# ++ ++my ($u, $e); ++ ++eval ++{ ++ ($u, $e) = Net::SNMP::Security::USM->new( ++ -username => 'dtown', ++ -authpassword => 'maplesyrup', ++ -authprotocol => 'sha224', ++ -privpassword => 'maplesyrup', ++ -privprotocol => 'aes', ++ ); ++ ++ # "Perform" discovery... ++ $u->_engine_id_discovery(pack 'x11H2', '02'); ++ ++ # ...and synchronization ++ $u->_synchronize(10, time); ++}; ++ ++skip( ++ $skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Security::USM object' ++); ++ ++# ++# 2. Check the localized authKey ++# ++ ++eval ++{ ++ $e = unpack 'H*', $u->auth_key(); ++}; ++ ++skip( ++ $skip, ++ ($@ || $e), ++ '0bd8827c6e29f8065e08e09237f177e410f69b90e1782be682075674', ++ 'Invalid authKey calculated' ++); ++ ++# ++# 3. Check the localized privKey ++# ++ ++eval ++{ ++ $e = unpack 'H*', $u->priv_key(); ++}; ++ ++skip( ++ $skip, ++ ($@ || $e), ++ '0bd8827c6e29f8065e08e09237f177e4', ++ 'Invalid privKey calculated' ++); ++ ++# ++# 4. Create and initialize a Message ++# ++ ++my $m; ++ ++eval ++{ ++ ($m, $e) = Net::SNMP::Message->new(); ++ $m->prepare(SEQUENCE, pack('H*', 'deadbeef') x 8); ++ $e = $m->error(); ++}; ++ ++skip($skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Message object'); ++ ++# ++# 5. Calculate the HMAC ++# ++ ++my $h; ++ ++eval ++{ ++ $h = unpack 'H*', $u->_auth_hmac($m); ++}; ++ ++skip($skip, $@, q{}, 'Calculate the HMAC failed'); ++ ++# ++# 6. Encrypt/descrypt the Message ++# ++ ++my $henc; ++ ++eval ++{ ++ my $engine_boots = 0; ++ my $engine_time = 1710186219; ++ my $salt; ++ my $len = $m->length(); ++ my $buff = $m->clear(); ++ $u->{_engine_boots} = $engine_boots; ++ $u->{_engine_time} = $engine_time; ++ my $encrypted = $u->_encrypt_data($m, $salt, $buff); ++ $henc = unpack 'H*', $encrypted; ++ $m->append($encrypted); ++ substr $salt, 0, 0, pack 'NN', $engine_boots, $engine_time; ++ $u->_decrypt_data($m, $salt, $m->process(OCTET_STRING)); ++ $e = $u->error(); ++ # Remove padding if necessary ++ if ($len -= $m->length()) { ++ substr ${$m->reference()}, $len, -$len, q{}; ++ } ++}; ++ ++skip( ++ $skip, ++ ($@ || $e || $henc), ++ '042228c5467793ab001f4be546de4b990f90998b09d43f2baaffb52a5d36457cef3b5ab7', ++ 'Privacy failed', ++); ++ ++# ++# 7. Check the HMAC ++# ++ ++my $h2; ++ ++eval ++{ ++ $h2 = unpack 'H*', $u->_auth_hmac($m); ++}; ++ ++skip($skip, ($@ || $h2), $h, 'Authentication failed'); ++ ++# ============================================================================ +diff --git a/t/usm-sha256-aes.t b/t/usm-sha256-aes.t +new file mode 100644 +index 0000000..4521187 +--- /dev/null ++++ b/t/usm-sha256-aes.t +@@ -0,0 +1,169 @@ ++# -*- mode: perl -*- ++# ============================================================================ ++ ++# Test of the SNMPv3 User-based Security Model. ++ ++# Copyright (c) 2001-2009 David M. Town <dtown@cpan.org>. ++# Copyright (c) 2024 Michal Josef Špaček <skim@cpan.org>. ++# All rights reserved. ++ ++# This program is free software; you may redistribute it and/or modify it ++# under the same terms as the Perl 5 programming language system itself. ++ ++# ============================================================================ ++ ++use strict; ++use Test; ++ ++BEGIN ++{ ++ $| = 1; ++ $^W = 1; ++ plan tests => 7 ++} ++ ++use Net::SNMP::Message qw(SEQUENCE OCTET_STRING FALSE); ++ ++# ++# Load the Net::SNMP::Security::USM module ++# ++ ++eval 'use Net::SNMP::Security::USM; use Crypt::Rijndael;'; ++ ++my $skip = ($@ =~ /locate (:?\S+\.pm)/) ? $@ : FALSE; ++ ++# ++# 1. Create the Net::SNMP::Security::USM object ++# ++ ++my ($u, $e); ++ ++eval ++{ ++ ($u, $e) = Net::SNMP::Security::USM->new( ++ -username => 'dtown', ++ -authpassword => 'maplesyrup', ++ -authprotocol => 'sha256', ++ -privpassword => 'maplesyrup', ++ -privprotocol => 'aes', ++ ); ++ ++ # "Perform" discovery... ++ $u->_engine_id_discovery(pack 'x11H2', '02'); ++ ++ # ...and synchronization ++ $u->_synchronize(10, time); ++}; ++ ++skip( ++ $skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Security::USM object' ++); ++ ++# ++# 2. Check the localized authKey ++# ++ ++eval ++{ ++ $e = unpack 'H*', $u->auth_key(); ++}; ++ ++skip( ++ $skip, ++ ($@ || $e), ++ '8982e0e549e866db361a6b625d84cccc11162d453ee8ce3a6445c2d6776f0f8b', ++ 'Invalid authKey calculated' ++); ++ ++# ++# 3. Check the localized privKey ++# ++ ++eval ++{ ++ $e = unpack 'H*', $u->priv_key(); ++}; ++ ++skip( ++ $skip, ++ ($@ || $e), ++ '8982e0e549e866db361a6b625d84cccc', ++ 'Invalid privKey calculated' ++); ++ ++# ++# 4. Create and initialize a Message ++# ++ ++my $m; ++ ++eval ++{ ++ ($m, $e) = Net::SNMP::Message->new(); ++ $m->prepare(SEQUENCE, pack('H*', 'deadbeef') x 8); ++ $e = $m->error(); ++}; ++ ++skip($skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Message object'); ++ ++# ++# 5. Calculate the HMAC ++# ++ ++my $h; ++ ++eval ++{ ++ $h = unpack 'H*', $u->_auth_hmac($m); ++}; ++ ++skip($skip, $@, q{}, 'Calculate the HMAC failed'); ++ ++# ++# 6. Encrypt/descrypt the Message ++# ++ ++my $henc; ++ ++eval ++{ ++ my $engine_boots = 0; ++ my $engine_time = 1710186219; ++ my $salt; ++ my $len = $m->length(); ++ my $buff = $m->clear(); ++ $u->{_engine_boots} = $engine_boots; ++ $u->{_engine_time} = $engine_time; ++ my $encrypted = $u->_encrypt_data($m, $salt, $buff); ++ $henc = unpack 'H*', $encrypted; ++ $m->append($encrypted); ++ substr $salt, 0, 0, pack 'NN', $engine_boots, $engine_time; ++ $u->_decrypt_data($m, $salt, $m->process(OCTET_STRING)); ++ $e = $u->error(); ++ # Remove padding if necessary ++ if ($len -= $m->length()) { ++ substr ${$m->reference()}, $len, -$len, q{}; ++ } ++}; ++ ++skip( ++ $skip, ++ ($@ || $e || $henc), ++ '0422863d06faf464369a298b66062e54374ba3b4a0f862162d25ba72130038f8befc9e21', ++ 'Privacy failed', ++); ++ ++# ++# 7. Check the HMAC ++# ++ ++my $h2; ++ ++eval ++{ ++ $h2 = unpack 'H*', $u->_auth_hmac($m); ++}; ++ ++skip($skip, ($@ || $h2), $h, 'Authentication failed'); ++ ++# ============================================================================ +diff --git a/t/usm-sha384-aes.t b/t/usm-sha384-aes.t +new file mode 100644 +index 0000000..e88ca4a +--- /dev/null ++++ b/t/usm-sha384-aes.t +@@ -0,0 +1,169 @@ ++# -*- mode: perl -*- ++# ============================================================================ ++ ++# Test of the SNMPv3 User-based Security Model. ++ ++# Copyright (c) 2001-2009 David M. Town <dtown@cpan.org>. ++# Copyright (c) 2024 Michal Josef Špaček <skim@cpan.org>. ++# All rights reserved. ++ ++# This program is free software; you may redistribute it and/or modify it ++# under the same terms as the Perl 5 programming language system itself. ++ ++# ============================================================================ ++ ++use strict; ++use Test; ++ ++BEGIN ++{ ++ $| = 1; ++ $^W = 1; ++ plan tests => 7 ++} ++ ++use Net::SNMP::Message qw(SEQUENCE OCTET_STRING FALSE); ++ ++# ++# Load the Net::SNMP::Security::USM module ++# ++ ++eval 'use Net::SNMP::Security::USM; use Crypt::Rijndael;'; ++ ++my $skip = ($@ =~ /locate (:?\S+\.pm)/) ? $@ : FALSE; ++ ++# ++# 1. Create the Net::SNMP::Security::USM object ++# ++ ++my ($u, $e); ++ ++eval ++{ ++ ($u, $e) = Net::SNMP::Security::USM->new( ++ -username => 'dtown', ++ -authpassword => 'maplesyrup', ++ -authprotocol => 'sha384', ++ -privpassword => 'maplesyrup', ++ -privprotocol => 'aes', ++ ); ++ ++ # "Perform" discovery... ++ $u->_engine_id_discovery(pack 'x11H2', '02'); ++ ++ # ...and synchronization ++ $u->_synchronize(10, time); ++}; ++ ++skip( ++ $skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Security::USM object' ++); ++ ++# ++# 2. Check the localized authKey ++# ++ ++eval ++{ ++ $e = unpack 'H*', $u->auth_key(); ++}; ++ ++skip( ++ $skip, ++ ($@ || $e), ++ '3b298f16164a11184279d5432bf169e2d2a48307de02b3d3f7e2b4f36eb6f0455a53689a3937eea07319a633d2ccba78', ++ 'Invalid authKey calculated' ++); ++ ++# ++# 3. Check the localized privKey ++# ++ ++eval ++{ ++ $e = unpack 'H*', $u->priv_key(); ++}; ++ ++skip( ++ $skip, ++ ($@ || $e), ++ '3b298f16164a11184279d5432bf169e2', ++ 'Invalid privKey calculated' ++); ++ ++# ++# 4. Create and initialize a Message ++# ++ ++my $m; ++ ++eval ++{ ++ ($m, $e) = Net::SNMP::Message->new(); ++ $m->prepare(SEQUENCE, pack('H*', 'deadbeef') x 8); ++ $e = $m->error(); ++}; ++ ++skip($skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Message object'); ++ ++# ++# 5. Calculate the HMAC ++# ++ ++my $h; ++ ++eval ++{ ++ $h = unpack 'H*', $u->_auth_hmac($m); ++}; ++ ++skip($skip, $@, q{}, 'Calculate the HMAC failed'); ++ ++# ++# 6. Encrypt/descrypt the Message ++# ++ ++my $henc; ++ ++eval ++{ ++ my $engine_boots = 0; ++ my $engine_time = 1710186219; ++ my $salt; ++ my $len = $m->length(); ++ my $buff = $m->clear(); ++ $u->{_engine_boots} = $engine_boots; ++ $u->{_engine_time} = $engine_time; ++ my $encrypted = $u->_encrypt_data($m, $salt, $buff); ++ $henc = unpack 'H*', $encrypted; ++ $m->append($encrypted); ++ substr $salt, 0, 0, pack 'NN', $engine_boots, $engine_time; ++ $u->_decrypt_data($m, $salt, $m->process(OCTET_STRING)); ++ $e = $u->error(); ++ # Remove padding if necessary ++ if ($len -= $m->length()) { ++ substr ${$m->reference()}, $len, -$len, q{}; ++ } ++}; ++ ++skip( ++ $skip, ++ ($@ || $e || $henc), ++ '0422850967bbff81be49aefadf9b6ee3eedb9093609fcfc813a21bdf09b469965923bfc0', ++ 'Privacy failed', ++); ++ ++# ++# 7. Check the HMAC ++# ++ ++my $h2; ++ ++eval ++{ ++ $h2 = unpack 'H*', $u->_auth_hmac($m); ++}; ++ ++skip($skip, ($@ || $h2), $h, 'Authentication failed'); ++ ++# ============================================================================ +diff --git a/t/usm-sha512-aes.t b/t/usm-sha512-aes.t +new file mode 100644 +index 0000000..c5eadf3 +--- /dev/null ++++ b/t/usm-sha512-aes.t +@@ -0,0 +1,169 @@ ++# -*- mode: perl -*- ++# ============================================================================ ++ ++# Test of the SNMPv3 User-based Security Model. ++ ++# Copyright (c) 2001-2009 David M. Town <dtown@cpan.org>. ++# Copyright (c) 2024 Michal Josef Špaček <skim@cpan.org>. ++# All rights reserved. ++ ++# This program is free software; you may redistribute it and/or modify it ++# under the same terms as the Perl 5 programming language system itself. ++ ++# ============================================================================ ++ ++use strict; ++use Test; ++ ++BEGIN ++{ ++ $| = 1; ++ $^W = 1; ++ plan tests => 7 ++} ++ ++use Net::SNMP::Message qw(SEQUENCE OCTET_STRING FALSE); ++ ++# ++# Load the Net::SNMP::Security::USM module ++# ++ ++eval 'use Net::SNMP::Security::USM; use Crypt::Rijndael;'; ++ ++my $skip = ($@ =~ /locate (:?\S+\.pm)/) ? $@ : FALSE; ++ ++# ++# 1. Create the Net::SNMP::Security::USM object ++# ++ ++my ($u, $e); ++ ++eval ++{ ++ ($u, $e) = Net::SNMP::Security::USM->new( ++ -username => 'dtown', ++ -authpassword => 'maplesyrup', ++ -authprotocol => 'sha512', ++ -privpassword => 'maplesyrup', ++ -privprotocol => 'aes', ++ ); ++ ++ # "Perform" discovery... ++ $u->_engine_id_discovery(pack 'x11H2', '02'); ++ ++ # ...and synchronization ++ $u->_synchronize(10, time); ++}; ++ ++skip( ++ $skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Security::USM object' ++); ++ ++# ++# 2. Check the localized authKey ++# ++ ++eval ++{ ++ $e = unpack 'H*', $u->auth_key(); ++}; ++ ++skip( ++ $skip, ++ ($@ || $e), ++ '22a5a36cedfcc085807a128d7bc6c2382167ad6c0dbc5fdff856740f3d84c099ad1ea87a8db096714d9788bd544047c9021e4229ce27e4c0a69250adfcffbb0b', ++ 'Invalid authKey calculated' ++); ++ ++# ++# 3. Check the localized privKey ++# ++ ++eval ++{ ++ $e = unpack 'H*', $u->priv_key(); ++}; ++ ++skip( ++ $skip, ++ ($@ || $e), ++ '22a5a36cedfcc085807a128d7bc6c238', ++ 'Invalid privKey calculated' ++); ++ ++# ++# 4. Create and initialize a Message ++# ++ ++my $m; ++ ++eval ++{ ++ ($m, $e) = Net::SNMP::Message->new(); ++ $m->prepare(SEQUENCE, pack('H*', 'deadbeef') x 8); ++ $e = $m->error(); ++}; ++ ++skip($skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Message object'); ++ ++# ++# 5. Calculate the HMAC ++# ++ ++my $h; ++ ++eval ++{ ++ $h = unpack 'H*', $u->_auth_hmac($m); ++}; ++ ++skip($skip, $@, q{}, 'Calculate the HMAC failed'); ++ ++# ++# 6. Encrypt/descrypt the Message ++# ++ ++my $henc; ++ ++eval ++{ ++ my $engine_boots = 0; ++ my $engine_time = 1710186219; ++ my $salt; ++ my $len = $m->length(); ++ my $buff = $m->clear(); ++ $u->{_engine_boots} = $engine_boots; ++ $u->{_engine_time} = $engine_time; ++ my $encrypted = $u->_encrypt_data($m, $salt, $buff); ++ $henc = unpack 'H*', $encrypted; ++ $m->append($encrypted); ++ substr $salt, 0, 0, pack 'NN', $engine_boots, $engine_time; ++ $u->_decrypt_data($m, $salt, $m->process(OCTET_STRING)); ++ $e = $u->error(); ++ # Remove padding if necessary ++ if ($len -= $m->length()) { ++ substr ${$m->reference()}, $len, -$len, q{}; ++ } ++}; ++ ++skip( ++ $skip, ++ ($@ || $e || $henc), ++ '0422bae4cdb263a0936b189051e9b1759183b16d07c9a7d8bf633d6dd2e817a2ac2fe742', ++ 'Privacy failed', ++); ++ ++# ++# 7. Check the HMAC ++# ++ ++my $h2; ++ ++eval ++{ ++ $h2 = unpack 'H*', $u->_auth_hmac($m); ++}; ++ ++skip($skip, ($@ || $h2), $h, 'Authentication failed'); ++ ++# ============================================================================ diff --git a/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/pkgs/development/perl-modules/strip-nondeterminism/default.nix index e50d61b87898..fe6328ea3946 100644 --- a/pkgs/development/perl-modules/strip-nondeterminism/default.nix +++ b/pkgs/development/perl-modules/strip-nondeterminism/default.nix @@ -24,7 +24,7 @@ buildPerlPackage rec { }; strictDeps = true; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ shortenPerlShebang ]; buildInputs = [ ArchiveZip ArchiveCpio @@ -45,7 +45,7 @@ buildPerlPackage rec { # we don’t need the debhelper script rm $out/bin/dh_strip_nondeterminism rm $out/share/man/man1/dh_strip_nondeterminism.1 - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/strip-nondeterminism ''; @@ -56,7 +56,7 @@ buildPerlPackage rec { ''; # running shortenPerlShebang in postBuild results in non-functioning binary 'exec format error' - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; doInstallCheck = true; meta = with lib; { diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix index b9831c854a6d..0cdb680def16 100644 --- a/pkgs/development/php-packages/castor/default.nix +++ b/pkgs/development/php-packages/castor/default.nix @@ -9,16 +9,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "castor"; - version = "0.17.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "jolicode"; repo = "castor"; rev = "v${finalAttrs.version}"; - hash = "sha256-ng32vuGlGffpkzf3hXu0sNbj0PCDu4DpZnMnbDV9pZk="; + hash = "sha256-f+vz3SFXnZS67dyHQyycONBtfydMVh2XjB/4r9QIak8="; }; - vendorHash = "sha256-0aDT0hPhoPl0U/QbstiGmUHaqDdQb1ReY2hy9FEnzwM="; + vendorHash = "sha256-U/L+iJ/DKCiUEbSUc/BgYeKakv0BdK6Eq5BJjtwb1Yk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index f8838ba83475..1c430e5c2629 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -15,13 +15,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "composer"; - version = "2.7.9"; + version = "2.8.1"; # Hash used by ../../../build-support/php/pkgs/composer-phar.nix to # use together with the version from this package to keep the # bootstrap phar file up-to-date together with the end user composer # package. - passthru.pharHash = "sha256-tt5eZcGZ2AuhGJf74TZOBj6FjUg/aoGhdsTWDysdY0c="; + passthru.pharHash = "sha256-kws3b70hR6Yj6ntwTrnTuLDWBymSIHqgU1qiH28FN44="; composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix { inherit (finalAttrs) version; @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "composer"; repo = "composer"; rev = finalAttrs.version; - hash = "sha256-aVD3hB7a/Ji1sEsfo0EQ7SDBqjVg6+FRi1dpO94VtZs="; + hash = "sha256-5UcbEx1d5jEz73mTFTacifl6ykxm6yQw3wvkJQtINHs="; }; nativeBuildInputs = [ makeBinaryWrapper ]; @@ -86,7 +86,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-iNx7AXNsfiDeEaGYKVi+kzzPpMeg+R18WYquful5E0o="; + outputHash = "sha256-FfFwx5E2LVDSqo2P31fqtvk2P30XnTm+TUqhNSHTt/M="; }; installPhase = '' diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix index 2ed284fe6079..381ec3734243 100644 --- a/pkgs/development/php-packages/couchbase/default.nix +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -5,6 +5,7 @@ libcouchbase, zlib, substituteAll, + php, }: let pname = "couchbase"; @@ -40,5 +41,6 @@ buildPecl { license = licenses.asl20; homepage = "https://docs.couchbase.com/php-sdk/current/project-docs/sdk-release-notes.html"; maintainers = teams.php.members; + broken = lib.versionAtLeast php.version "8.3"; }; } diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix index 15b16582435d..3cc5732adca7 100644 --- a/pkgs/development/php-packages/datadog_trace/default.nix +++ b/pkgs/development/php-packages/datadog_trace/default.nix @@ -38,11 +38,11 @@ buildPecl rec { cargo rustc ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ rustPlatform.bindgenHook rustPlatform.cargoSetupHook ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.rustPlatform.bindgenHook darwin.apple_sdk_11_0.rustPlatform.cargoSetupHook ]; @@ -52,7 +52,7 @@ buildPecl rec { curl pcre2 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security libiconv diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix index bbf4f9856f3d..1b85b25671ae 100644 --- a/pkgs/development/php-packages/memcached/default.nix +++ b/pkgs/development/php-packages/memcached/default.nix @@ -11,13 +11,13 @@ buildPecl rec { pname = "memcached"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "php-memcached-dev"; repo = "php-memcached"; rev = "v${version}"; - sha256 = "sha256-g9IzGSZUxLlOE32o9ZJOa3erb5Qs1ntR8nzS3kRd/EU="; + sha256 = "sha256-V4d6bY0m1nuEfjZjt3qio4/HOBcSlD9+XMEl1GPfbhs="; }; internalDeps = [ php.extensions.session ]; diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 03487e15dbb3..edb6d900c99a 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -16,13 +16,13 @@ buildPecl rec { pname = "mongodb"; - version = "1.19.4"; + version = "1.20.0"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-php-driver"; rev = version; - hash = "sha256-71CS9boQzW2NMmkQeOQjGaTx2CN3bkcfgO5NwV9J9JI="; + hash = "sha256-+Q/z5xrhiKTh2hVT6sdpI6sY6E7MTtTJQZBGASy5tAU="; fetchSubmodules = true; }; @@ -36,7 +36,7 @@ buildPecl rec { zlib pcre2 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security darwin.apple_sdk_11_0.Libsystem libiconv diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix index 83c59fb3212c..0a56b3f0e774 100644 --- a/pkgs/development/php-packages/openswoole/default.nix +++ b/pkgs/development/php-packages/openswoole/default.nix @@ -5,6 +5,7 @@ valgrind, pcre2, fetchFromGitHub, + php, }: let @@ -21,7 +22,7 @@ buildPecl { hash = "sha256-Z26E1PdKypB/MImCHFgA3rJW5LvVaLZsQUxRv0RcFuo="; }; - buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; + buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ valgrind ]; meta = with lib; { changelog = "https://github.com/openswoole/swoole-src/releases/tag/v${version}"; @@ -34,5 +35,6 @@ buildPecl { You can use the sync or async, Coroutine API to write whole applications or create thousands of light weight Coroutines within one Linux process. ''; maintainers = teams.php.members; + broken = lib.versionAtLeast php.version "8.4"; }; } diff --git a/pkgs/development/php-packages/opentelemetry/default.nix b/pkgs/development/php-packages/opentelemetry/default.nix index dadc828e5fe1..8ce92a6781f1 100644 --- a/pkgs/development/php-packages/opentelemetry/default.nix +++ b/pkgs/development/php-packages/opentelemetry/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.1.0beta2"; + version = "1.1.0"; in buildPecl rec { inherit version; @@ -15,7 +15,7 @@ buildPecl rec { owner = "open-telemetry"; repo = "opentelemetry-php-instrumentation"; rev = version; - hash = "sha256-gZby9wr5FN5mNG9YNVqQFYloxd4ws91Mz6IPn5OAGjs="; + hash = "sha256-X3rGzKDI16W21O9BaCuvVCreuce6is+URFSa1FNcznM="; }; sourceRoot = "${src.name}/ext"; diff --git a/pkgs/development/php-packages/parallel/default.nix b/pkgs/development/php-packages/parallel/default.nix new file mode 100644 index 000000000000..abb5da0bb888 --- /dev/null +++ b/pkgs/development/php-packages/parallel/default.nix @@ -0,0 +1,20 @@ +{ + buildPecl, + lib, + php, +}: + +buildPecl { + pname = "parallel"; + version = "1.2.4"; + hash = "sha256-s9W9aZpQsJLdzZ/d2E1iGDsMTAAjeWbOgWeKP6nNp0A="; + meta = { + description = "Parallel concurrency API"; + # parallel extension requires PHP with ZTS enabled + # we mark extension as broken if ZTS support isn't enabled + broken = !php.ztsSupport; + homepage = "https://pecl.php.net/package/parallel"; + license = lib.licenses.php301; + maintainers = lib.teams.php.members; + }; +} diff --git a/pkgs/development/php-packages/pcov/default.nix b/pkgs/development/php-packages/pcov/default.nix index 1ee88135b3b1..02af71c12e6e 100644 --- a/pkgs/development/php-packages/pcov/default.nix +++ b/pkgs/development/php-packages/pcov/default.nix @@ -4,6 +4,7 @@ php, pcre2, fetchFromGitHub, + fetchpatch, }: let @@ -22,6 +23,14 @@ buildPecl { buildInputs = [ pcre2 ]; + patches = [ + # Allow building for PHP 8.4 + (fetchpatch { + url = "https://github.com/krakjoe/pcov/commit/7d764c7c2555e8287351961d72be3ebec4d8743f.patch"; + sha256 = "sha256-5wIHrrCwUXQpPdUg+3Kwyop5yvOzQQ3qc4pQXU8q2OM="; + }) + ]; + meta = with lib; { changelog = "https://github.com/krakjoe/pcov/releases/tag/v${version}"; description = "Self contained php-code-coverage compatible driver for PHP"; diff --git a/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/pkgs/development/php-packages/pdo_sqlsrv/default.nix index 7da343ac5564..1b61f74d4094 100644 --- a/pkgs/development/php-packages/pdo_sqlsrv/default.nix +++ b/pkgs/development/php-packages/pdo_sqlsrv/default.nix @@ -15,7 +15,7 @@ buildPecl { internalDeps = [ php.extensions.pdo ]; - buildInputs = [ unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ unixODBC ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; meta = with lib; { description = "Microsoft Drivers for PHP for SQL Server"; diff --git a/pkgs/development/php-packages/phalcon/default.nix b/pkgs/development/php-packages/phalcon/default.nix index b5d89ee6a0d2..e571c746f652 100644 --- a/pkgs/development/php-packages/phalcon/default.nix +++ b/pkgs/development/php-packages/phalcon/default.nix @@ -33,5 +33,6 @@ buildPecl rec { license = licenses.bsd3; homepage = "https://phalcon.io"; maintainers = teams.php.members ++ [ maintainers.krzaczek ]; + broken = lib.versionAtLeast php.version "8.4"; }; } diff --git a/pkgs/development/php-packages/phing/composer.lock b/pkgs/development/php-packages/phing/composer.lock deleted file mode 100644 index 6192f6283f9a..000000000000 --- a/pkgs/development/php-packages/phing/composer.lock +++ /dev/null @@ -1,7486 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", - "This file is @generated automatically" - ], - "content-hash": "7e86eda0b257a035484cd3adbe76b555", - "packages": [ - { - "name": "psr/container", - "version": "1.1.2", - "source": { - "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", - "shasum": "" - }, - "require": { - "php": ">=7.4.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Psr\\Container\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", - "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" - ], - "support": { - "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.2" - }, - "time": "2021-11-05T16:50:12+00:00" - }, - { - "name": "sebastian/version", - "version": "3.0.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "c6c1022351a901512170118436c764e473f6de8c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c", - "reference": "c6c1022351a901512170118436c764e473f6de8c", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library that helps with managing the version number of Git-hosted PHP projects", - "homepage": "https://github.com/sebastianbergmann/version", - "support": { - "issues": "https://github.com/sebastianbergmann/version/issues", - "source": "https://github.com/sebastianbergmann/version/tree/3.0.2" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-09-28T06:39:44+00:00" - }, - { - "name": "symfony/console", - "version": "v5.4.35", - "source": { - "type": "git", - "url": "https://github.com/symfony/console.git", - "reference": "dbdf6adcb88d5f83790e1efb57ef4074309d3931" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/dbdf6adcb88d5f83790e1efb57ef4074309d3931", - "reference": "dbdf6adcb88d5f83790e1efb57ef4074309d3931", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php73": "^1.9", - "symfony/polyfill-php80": "^1.16", - "symfony/service-contracts": "^1.1|^2|^3", - "symfony/string": "^5.1|^6.0" - }, - "conflict": { - "psr/log": ">=3", - "symfony/dependency-injection": "<4.4", - "symfony/dotenv": "<5.1", - "symfony/event-dispatcher": "<4.4", - "symfony/lock": "<4.4", - "symfony/process": "<4.4" - }, - "provide": { - "psr/log-implementation": "1.0|2.0" - }, - "require-dev": { - "psr/log": "^1|^2", - "symfony/config": "^4.4|^5.0|^6.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/event-dispatcher": "^4.4|^5.0|^6.0", - "symfony/lock": "^4.4|^5.0|^6.0", - "symfony/process": "^4.4|^5.0|^6.0", - "symfony/var-dumper": "^4.4|^5.0|^6.0" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/lock": "", - "symfony/process": "" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Console\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Eases the creation of beautiful and testable command line interfaces", - "homepage": "https://symfony.com", - "keywords": [ - "cli", - "command-line", - "console", - "terminal" - ], - "support": { - "source": "https://github.com/symfony/console/tree/v5.4.35" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-23T14:28:09+00:00" - }, - { - "name": "symfony/deprecation-contracts", - "version": "v2.5.2", - "source": { - "type": "git", - "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "2.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "files": [ - "function.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "A generic function and convention to trigger deprecation notices", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-01-02T09:53:40+00:00" - }, - { - "name": "symfony/polyfill-ctype", - "version": "v1.29.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "provide": { - "ext-ctype": "*" - }, - "suggest": { - "ext-ctype": "For best performance" - }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Gert de Pagter", - "email": "BackEndTea@gmail.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for ctype functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "ctype", - "polyfill", - "portable" - ], - "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-29T20:11:03+00:00" - }, - { - "name": "symfony/polyfill-intl-grapheme", - "version": "v1.29.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", - "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "suggest": { - "ext-intl": "For best performance" - }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for intl's grapheme_* functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "grapheme", - "intl", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-29T20:11:03+00:00" - }, - { - "name": "symfony/polyfill-intl-normalizer", - "version": "v1.29.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "suggest": { - "ext-intl": "For best performance" - }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for intl's Normalizer class and related functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "intl", - "normalizer", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-29T20:11:03+00:00" - }, - { - "name": "symfony/polyfill-mbstring", - "version": "v1.29.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "provide": { - "ext-mbstring": "*" - }, - "suggest": { - "ext-mbstring": "For best performance" - }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for the Mbstring extension", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "mbstring", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-29T20:11:03+00:00" - }, - { - "name": "symfony/polyfill-php73", - "version": "v1.29.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "21bd091060673a1177ae842c0ef8fe30893114d2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2", - "reference": "21bd091060673a1177ae842c0ef8fe30893114d2", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.29.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-29T20:11:03+00:00" - }, - { - "name": "symfony/polyfill-php80", - "version": "v1.29.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-29T20:11:03+00:00" - }, - { - "name": "symfony/service-contracts", - "version": "v2.5.2", - "source": { - "type": "git", - "url": "https://github.com/symfony/service-contracts.git", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "psr/container": "^1.1", - "symfony/deprecation-contracts": "^2.1|^3" - }, - "conflict": { - "ext-psr": "<1.1|>=2" - }, - "suggest": { - "symfony/service-implementation": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "2.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Contracts\\Service\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Generic abstractions related to writing services", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], - "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-05-30T19:17:29+00:00" - }, - { - "name": "symfony/string", - "version": "v5.4.35", - "source": { - "type": "git", - "url": "https://github.com/symfony/string.git", - "reference": "c209c4d0559acce1c9a2067612cfb5d35756edc2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/c209c4d0559acce1c9a2067612cfb5d35756edc2", - "reference": "c209c4d0559acce1c9a2067612cfb5d35756edc2", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-intl-grapheme": "~1.0", - "symfony/polyfill-intl-normalizer": "~1.0", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "~1.15" - }, - "conflict": { - "symfony/translation-contracts": ">=3.0" - }, - "require-dev": { - "symfony/error-handler": "^4.4|^5.0|^6.0", - "symfony/http-client": "^4.4|^5.0|^6.0", - "symfony/translation-contracts": "^1.1|^2", - "symfony/var-exporter": "^4.4|^5.0|^6.0" - }, - "type": "library", - "autoload": { - "files": [ - "Resources/functions.php" - ], - "psr-4": { - "Symfony\\Component\\String\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", - "homepage": "https://symfony.com", - "keywords": [ - "grapheme", - "i18n", - "string", - "unicode", - "utf-8", - "utf8" - ], - "support": { - "source": "https://github.com/symfony/string/tree/v5.4.35" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-23T13:51:25+00:00" - }, - { - "name": "symfony/yaml", - "version": "v5.4.35", - "source": { - "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "e78db7f5c70a21f0417a31f414c4a95fe76c07e4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/e78db7f5c70a21f0417a31f414c4a95fe76c07e4", - "reference": "e78db7f5c70a21f0417a31f414c4a95fe76c07e4", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-ctype": "^1.8" - }, - "conflict": { - "symfony/console": "<5.3" - }, - "require-dev": { - "symfony/console": "^5.3|^6.0" - }, - "suggest": { - "symfony/console": "For validating YAML files using the lint command" - }, - "bin": [ - "Resources/bin/yaml-lint" - ], - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Yaml\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Loads and dumps YAML files", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/yaml/tree/v5.4.35" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-23T13:51:25+00:00" - } - ], - "packages-dev": [ - { - "name": "aws/aws-crt-php", - "version": "v1.2.4", - "source": { - "type": "git", - "url": "https://github.com/awslabs/aws-crt-php.git", - "reference": "eb0c6e4e142224a10b08f49ebf87f32611d162b2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/eb0c6e4e142224a10b08f49ebf87f32611d162b2", - "reference": "eb0c6e4e142224a10b08f49ebf87f32611d162b2", - "shasum": "" - }, - "require": { - "php": ">=5.5" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35||^5.6.3||^9.5", - "yoast/phpunit-polyfills": "^1.0" - }, - "suggest": { - "ext-awscrt": "Make sure you install awscrt native extension to use any of the functionality." - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "AWS SDK Common Runtime Team", - "email": "aws-sdk-common-runtime@amazon.com" - } - ], - "description": "AWS Common Runtime for PHP", - "homepage": "https://github.com/awslabs/aws-crt-php", - "keywords": [ - "amazon", - "aws", - "crt", - "sdk" - ], - "support": { - "issues": "https://github.com/awslabs/aws-crt-php/issues", - "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.4" - }, - "time": "2023-11-08T00:42:13+00:00" - }, - { - "name": "aws/aws-sdk-php", - "version": "3.300.0", - "source": { - "type": "git", - "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "67a0c22a70bdcc99ca41028b78be3d5496481c14" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/67a0c22a70bdcc99ca41028b78be3d5496481c14", - "reference": "67a0c22a70bdcc99ca41028b78be3d5496481c14", - "shasum": "" - }, - "require": { - "aws/aws-crt-php": "^1.2.3", - "ext-json": "*", - "ext-pcre": "*", - "ext-simplexml": "*", - "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5", - "guzzlehttp/promises": "^1.4.0 || ^2.0", - "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", - "mtdowling/jmespath.php": "^2.6", - "php": ">=7.2.5", - "psr/http-message": "^1.0 || ^2.0" - }, - "require-dev": { - "andrewsville/php-token-reflection": "^1.4", - "aws/aws-php-sns-message-validator": "~1.0", - "behat/behat": "~3.0", - "composer/composer": "^1.10.22", - "dms/phpunit-arraysubset-asserts": "^0.4.0", - "doctrine/cache": "~1.4", - "ext-dom": "*", - "ext-openssl": "*", - "ext-pcntl": "*", - "ext-sockets": "*", - "nette/neon": "^2.3", - "paragonie/random_compat": ">= 2", - "phpunit/phpunit": "^5.6.3 || ^8.5 || ^9.5", - "psr/cache": "^1.0", - "psr/simple-cache": "^1.0", - "sebastian/comparator": "^1.2.3 || ^4.0", - "yoast/phpunit-polyfills": "^1.0" - }, - "suggest": { - "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications", - "doctrine/cache": "To use the DoctrineCacheAdapter", - "ext-curl": "To send requests using cURL", - "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages", - "ext-sockets": "To use client-side monitoring" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "files": [ - "src/functions.php" - ], - "psr-4": { - "Aws\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Amazon Web Services", - "homepage": "http://aws.amazon.com" - } - ], - "description": "AWS SDK for PHP - Use Amazon Web Services in your PHP project", - "homepage": "http://aws.amazon.com/sdkforphp", - "keywords": [ - "amazon", - "aws", - "cloud", - "dynamodb", - "ec2", - "glacier", - "s3", - "sdk" - ], - "support": { - "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", - "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.300.0" - }, - "time": "2024-02-19T19:08:33+00:00" - }, - { - "name": "composer/pcre", - "version": "3.1.1", - "source": { - "type": "git", - "url": "https://github.com/composer/pcre.git", - "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", - "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", - "shasum": "" - }, - "require": { - "php": "^7.4 || ^8.0" - }, - "require-dev": { - "phpstan/phpstan": "^1.3", - "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Composer\\Pcre\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - } - ], - "description": "PCRE wrapping library that offers type-safe preg_* replacements.", - "keywords": [ - "PCRE", - "preg", - "regex", - "regular expression" - ], - "support": { - "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.1" - }, - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2023-10-11T07:11:09+00:00" - }, - { - "name": "composer/semver", - "version": "3.4.0", - "source": { - "type": "git", - "url": "https://github.com/composer/semver.git", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", - "shasum": "" - }, - "require": { - "php": "^5.3.2 || ^7.0 || ^8.0" - }, - "require-dev": { - "phpstan/phpstan": "^1.4", - "symfony/phpunit-bridge": "^4.2 || ^5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Composer\\Semver\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nils Adermann", - "email": "naderman@naderman.de", - "homepage": "http://www.naderman.de" - }, - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - }, - { - "name": "Rob Bast", - "email": "rob.bast@gmail.com", - "homepage": "http://robbast.nl" - } - ], - "description": "Semver library that offers utilities, version constraint parsing and validation.", - "keywords": [ - "semantic", - "semver", - "validation", - "versioning" - ], - "support": { - "irc": "ircs://irc.libera.chat:6697/composer", - "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.4.0" - }, - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2023-08-31T09:50:34+00:00" - }, - { - "name": "composer/xdebug-handler", - "version": "3.0.3", - "source": { - "type": "git", - "url": "https://github.com/composer/xdebug-handler.git", - "reference": "ced299686f41dce890debac69273b47ffe98a40c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", - "reference": "ced299686f41dce890debac69273b47ffe98a40c", - "shasum": "" - }, - "require": { - "composer/pcre": "^1 || ^2 || ^3", - "php": "^7.2.5 || ^8.0", - "psr/log": "^1 || ^2 || ^3" - }, - "require-dev": { - "phpstan/phpstan": "^1.0", - "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^6.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Composer\\XdebugHandler\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "John Stevenson", - "email": "john-stevenson@blueyonder.co.uk" - } - ], - "description": "Restarts a process without Xdebug.", - "keywords": [ - "Xdebug", - "performance" - ], - "support": { - "irc": "irc://irc.freenode.org/composer", - "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" - }, - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2022-02-25T21:32:43+00:00" - }, - { - "name": "cweagans/composer-patches", - "version": "1.7.3", - "source": { - "type": "git", - "url": "https://github.com/cweagans/composer-patches.git", - "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/e190d4466fe2b103a55467dfa83fc2fecfcaf2db", - "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0 || ^2.0", - "php": ">=5.3.0" - }, - "require-dev": { - "composer/composer": "~1.0 || ~2.0", - "phpunit/phpunit": "~4.6" - }, - "type": "composer-plugin", - "extra": { - "class": "cweagans\\Composer\\Patches" - }, - "autoload": { - "psr-4": { - "cweagans\\Composer\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Cameron Eagans", - "email": "me@cweagans.net" - } - ], - "description": "Provides a way to patch Composer packages.", - "support": { - "issues": "https://github.com/cweagans/composer-patches/issues", - "source": "https://github.com/cweagans/composer-patches/tree/1.7.3" - }, - "time": "2022-12-20T22:53:13+00:00" - }, - { - "name": "doctrine/instantiator", - "version": "1.5.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/instantiator.git", - "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", - "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "doctrine/coding-standard": "^9 || ^11", - "ext-pdo": "*", - "ext-phar": "*", - "phpbench/phpbench": "^0.16 || ^1", - "phpstan/phpstan": "^1.4", - "phpstan/phpstan-phpunit": "^1", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.30 || ^5.4" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "https://ocramius.github.io/" - } - ], - "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://www.doctrine-project.org/projects/instantiator.html", - "keywords": [ - "constructor", - "instantiate" - ], - "support": { - "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.5.0" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", - "type": "tidelift" - } - ], - "time": "2022-12-30T00:15:36+00:00" - }, - { - "name": "ergebnis/composer-normalize", - "version": "2.42.0", - "source": { - "type": "git", - "url": "https://github.com/ergebnis/composer-normalize.git", - "reference": "02cf2b69ad2a74c6f11a8c3f5f054b8f949df910" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ergebnis/composer-normalize/zipball/02cf2b69ad2a74c6f11a8c3f5f054b8f949df910", - "reference": "02cf2b69ad2a74c6f11a8c3f5f054b8f949df910", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^2.0.0", - "ergebnis/json": "^1.2.0", - "ergebnis/json-normalizer": "^4.5.0", - "ergebnis/json-printer": "^3.5.0", - "ext-json": "*", - "justinrainbow/json-schema": "^5.2.12", - "localheinz/diff": "^1.1.1", - "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" - }, - "require-dev": { - "composer/composer": "^2.6.6", - "ergebnis/license": "^2.4.0", - "ergebnis/php-cs-fixer-config": "^6.20.0", - "ergebnis/phpunit-slow-test-detector": "^2.9.0", - "fakerphp/faker": "^1.23.1", - "infection/infection": "~0.26.6", - "phpunit/phpunit": "^9.6.16", - "psalm/plugin-phpunit": "~0.18.4", - "rector/rector": "~0.19.2", - "symfony/filesystem": "^5.4.25", - "vimeo/psalm": "^5.20.0" - }, - "type": "composer-plugin", - "extra": { - "class": "Ergebnis\\Composer\\Normalize\\NormalizePlugin", - "composer-normalize": { - "indent-size": 2, - "indent-style": "space" - }, - "plugin-optional": true - }, - "autoload": { - "psr-4": { - "Ergebnis\\Composer\\Normalize\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Andreas Möller", - "email": "am@localheinz.com", - "homepage": "https://localheinz.com" - } - ], - "description": "Provides a composer plugin for normalizing composer.json.", - "homepage": "https://github.com/ergebnis/composer-normalize", - "keywords": [ - "composer", - "normalize", - "normalizer", - "plugin" - ], - "support": { - "issues": "https://github.com/ergebnis/composer-normalize/issues", - "security": "https://github.com/ergebnis/composer-normalize/blob/main/.github/SECURITY.md", - "source": "https://github.com/ergebnis/composer-normalize" - }, - "time": "2024-01-30T11:54:02+00:00" - }, - { - "name": "ergebnis/json", - "version": "1.2.0", - "source": { - "type": "git", - "url": "https://github.com/ergebnis/json.git", - "reference": "a457f25a5ba7ea11fc94f84d53678c5211abfce0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json/zipball/a457f25a5ba7ea11fc94f84d53678c5211abfce0", - "reference": "a457f25a5ba7ea11fc94f84d53678c5211abfce0", - "shasum": "" - }, - "require": { - "ext-json": "*", - "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" - }, - "require-dev": { - "ergebnis/data-provider": "^3.2.0", - "ergebnis/license": "^2.4.0", - "ergebnis/php-cs-fixer-config": "^6.20.0", - "ergebnis/phpunit-slow-test-detector": "^2.9.0", - "fakerphp/faker": "^1.23.1", - "infection/infection": "~0.26.6", - "phpunit/phpunit": "^9.6.16", - "psalm/plugin-phpunit": "~0.18.4", - "rector/rector": "~0.19.2", - "vimeo/psalm": "^5.20.0" - }, - "type": "library", - "extra": { - "composer-normalize": { - "indent-size": 2, - "indent-style": "space" - } - }, - "autoload": { - "psr-4": { - "Ergebnis\\Json\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Andreas Möller", - "email": "am@localheinz.com", - "homepage": "https://localheinz.com" - } - ], - "description": "Provides a Json value object for representing a valid JSON string.", - "homepage": "https://github.com/ergebnis/json", - "keywords": [ - "json" - ], - "support": { - "issues": "https://github.com/ergebnis/json/issues", - "security": "https://github.com/ergebnis/json/blob/main/.github/SECURITY.md", - "source": "https://github.com/ergebnis/json" - }, - "time": "2024-01-29T15:09:24+00:00" - }, - { - "name": "ergebnis/json-normalizer", - "version": "4.5.0", - "source": { - "type": "git", - "url": "https://github.com/ergebnis/json-normalizer.git", - "reference": "f0ee9e70739f121b27fac8b743e4a52b23de2152" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/f0ee9e70739f121b27fac8b743e4a52b23de2152", - "reference": "f0ee9e70739f121b27fac8b743e4a52b23de2152", - "shasum": "" - }, - "require": { - "ergebnis/json": "^1.2.0", - "ergebnis/json-pointer": "^3.4.0", - "ergebnis/json-printer": "^3.5.0", - "ergebnis/json-schema-validator": "^4.2.0", - "ext-json": "*", - "justinrainbow/json-schema": "^5.2.12", - "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" - }, - "require-dev": { - "composer/semver": "^3.4.0", - "ergebnis/data-provider": "^3.2.0", - "ergebnis/license": "^2.4.0", - "ergebnis/php-cs-fixer-config": "^6.20.0", - "ergebnis/phpunit-slow-test-detector": "^2.9.0", - "fakerphp/faker": "^1.23.1", - "infection/infection": "~0.26.6", - "phpunit/phpunit": "^9.6.16", - "psalm/plugin-phpunit": "~0.18.4", - "rector/rector": "~0.19.4", - "vimeo/psalm": "^5.20.0" - }, - "suggest": { - "composer/semver": "If you want to use ComposerJsonNormalizer or VersionConstraintNormalizer" - }, - "type": "library", - "autoload": { - "psr-4": { - "Ergebnis\\Json\\Normalizer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Andreas Möller", - "email": "am@localheinz.com", - "homepage": "https://localheinz.com" - } - ], - "description": "Provides generic and vendor-specific normalizers for normalizing JSON documents.", - "homepage": "https://github.com/ergebnis/json-normalizer", - "keywords": [ - "json", - "normalizer" - ], - "support": { - "issues": "https://github.com/ergebnis/json-normalizer/issues", - "security": "https://github.com/ergebnis/json-normalizer/blob/main/.github/SECURITY.md", - "source": "https://github.com/ergebnis/json-normalizer" - }, - "time": "2024-01-30T09:10:15+00:00" - }, - { - "name": "ergebnis/json-pointer", - "version": "3.4.0", - "source": { - "type": "git", - "url": "https://github.com/ergebnis/json-pointer.git", - "reference": "b654757d873050622c2166f55ab25d04685261c5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-pointer/zipball/b654757d873050622c2166f55ab25d04685261c5", - "reference": "b654757d873050622c2166f55ab25d04685261c5", - "shasum": "" - }, - "require": { - "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" - }, - "require-dev": { - "ergebnis/data-provider": "^3.2.0", - "ergebnis/license": "^2.4.0", - "ergebnis/php-cs-fixer-config": "^6.20.0", - "ergebnis/phpunit-slow-test-detector": "^2.9.0", - "fakerphp/faker": "^1.23.1", - "infection/infection": "~0.26.6", - "phpunit/phpunit": "^9.6.16", - "psalm/plugin-phpunit": "~0.18.4", - "rector/rector": "~0.19.2", - "vimeo/psalm": "^5.20.0" - }, - "type": "library", - "extra": { - "composer-normalize": { - "indent-size": 2, - "indent-style": "space" - } - }, - "autoload": { - "psr-4": { - "Ergebnis\\Json\\Pointer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Andreas Möller", - "email": "am@localheinz.com", - "homepage": "https://localheinz.com" - } - ], - "description": "Provides an abstraction of a JSON pointer.", - "homepage": "https://github.com/ergebnis/json-pointer", - "keywords": [ - "RFC6901", - "json", - "pointer" - ], - "support": { - "issues": "https://github.com/ergebnis/json-pointer/issues", - "security": "https://github.com/ergebnis/json-pointer/blob/main/.github/SECURITY.md", - "source": "https://github.com/ergebnis/json-pointer" - }, - "time": "2024-01-29T16:37:15+00:00" - }, - { - "name": "ergebnis/json-printer", - "version": "3.5.0", - "source": { - "type": "git", - "url": "https://github.com/ergebnis/json-printer.git", - "reference": "549e16fe6de34b8c3aee7b421be12caa552f3ced" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-printer/zipball/549e16fe6de34b8c3aee7b421be12caa552f3ced", - "reference": "549e16fe6de34b8c3aee7b421be12caa552f3ced", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-mbstring": "*", - "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" - }, - "require-dev": { - "ergebnis/data-provider": "^3.2.0", - "ergebnis/license": "^2.4.0", - "ergebnis/php-cs-fixer-config": "^6.20.0", - "ergebnis/phpunit-slow-test-detector": "^2.9.0", - "fakerphp/faker": "^1.23.1", - "infection/infection": "~0.26.6", - "phpunit/phpunit": "^9.6.16", - "psalm/plugin-phpunit": "~0.18.4", - "rector/rector": "~0.19.2", - "vimeo/psalm": "^5.20.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Ergebnis\\Json\\Printer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Andreas Möller", - "email": "am@localheinz.com", - "homepage": "https://localheinz.com" - } - ], - "description": "Provides a JSON printer, allowing for flexible indentation.", - "homepage": "https://github.com/ergebnis/json-printer", - "keywords": [ - "formatter", - "json", - "printer" - ], - "support": { - "issues": "https://github.com/ergebnis/json-printer/issues", - "security": "https://github.com/ergebnis/json-printer/blob/main/.github/SECURITY.md", - "source": "https://github.com/ergebnis/json-printer" - }, - "time": "2024-01-29T15:33:37+00:00" - }, - { - "name": "ergebnis/json-schema-validator", - "version": "4.2.0", - "source": { - "type": "git", - "url": "https://github.com/ergebnis/json-schema-validator.git", - "reference": "10ed514fdc3f9b71f8a92c567afea21a2f6fa1ef" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-schema-validator/zipball/10ed514fdc3f9b71f8a92c567afea21a2f6fa1ef", - "reference": "10ed514fdc3f9b71f8a92c567afea21a2f6fa1ef", - "shasum": "" - }, - "require": { - "ergebnis/json": "^1.2.0", - "ergebnis/json-pointer": "^3.4.0", - "ext-json": "*", - "justinrainbow/json-schema": "^5.2.12", - "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" - }, - "require-dev": { - "ergebnis/data-provider": "^3.2.0", - "ergebnis/license": "^2.4.0", - "ergebnis/php-cs-fixer-config": "^6.20.0", - "ergebnis/phpunit-slow-test-detector": "^2.9.0", - "fakerphp/faker": "^1.23.1", - "infection/infection": "~0.26.6", - "phpunit/phpunit": "^9.6.16", - "psalm/plugin-phpunit": "~0.18.4", - "rector/rector": "~0.19.2", - "vimeo/psalm": "^5.20.0" - }, - "type": "library", - "extra": { - "composer-normalize": { - "indent-size": 2, - "indent-style": "space" - } - }, - "autoload": { - "psr-4": { - "Ergebnis\\Json\\SchemaValidator\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Andreas Möller", - "email": "am@localheinz.com", - "homepage": "https://localheinz.com" - } - ], - "description": "Provides a JSON schema validator, building on top of justinrainbow/json-schema.", - "homepage": "https://github.com/ergebnis/json-schema-validator", - "keywords": [ - "json", - "schema", - "validator" - ], - "support": { - "issues": "https://github.com/ergebnis/json-schema-validator/issues", - "security": "https://github.com/ergebnis/json-schema-validator/blob/main/.github/SECURITY.md", - "source": "https://github.com/ergebnis/json-schema-validator" - }, - "time": "2024-01-29T16:50:15+00:00" - }, - { - "name": "friendsofphp/php-cs-fixer", - "version": "v3.49.0", - "source": { - "type": "git", - "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "8742f7aa6f72a399688b65e4f58992c2d4681fc2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/8742f7aa6f72a399688b65e4f58992c2d4681fc2", - "reference": "8742f7aa6f72a399688b65e4f58992c2d4681fc2", - "shasum": "" - }, - "require": { - "composer/semver": "^3.4", - "composer/xdebug-handler": "^3.0.3", - "ext-filter": "*", - "ext-json": "*", - "ext-tokenizer": "*", - "php": "^7.4 || ^8.0", - "sebastian/diff": "^4.0 || ^5.0", - "symfony/console": "^5.4 || ^6.0 || ^7.0", - "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0", - "symfony/filesystem": "^5.4 || ^6.0 || ^7.0", - "symfony/finder": "^5.4 || ^6.0 || ^7.0", - "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0", - "symfony/polyfill-mbstring": "^1.28", - "symfony/polyfill-php80": "^1.28", - "symfony/polyfill-php81": "^1.28", - "symfony/process": "^5.4 || ^6.0 || ^7.0", - "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0" - }, - "require-dev": { - "facile-it/paraunit": "^1.3 || ^2.0", - "justinrainbow/json-schema": "^5.2", - "keradus/cli-executor": "^2.1", - "mikey179/vfsstream": "^1.6.11", - "php-coveralls/php-coveralls": "^2.7", - "php-cs-fixer/accessible-object": "^1.1", - "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4", - "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4", - "phpunit/phpunit": "^9.6 || ^10.5.5", - "symfony/yaml": "^5.4 || ^6.0 || ^7.0" - }, - "suggest": { - "ext-dom": "For handling output formats in XML", - "ext-mbstring": "For handling non-UTF8 characters." - }, - "bin": [ - "php-cs-fixer" - ], - "type": "application", - "autoload": { - "psr-4": { - "PhpCsFixer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Dariusz Rumiński", - "email": "dariusz.ruminski@gmail.com" - } - ], - "description": "A tool to automatically fix PHP code style", - "keywords": [ - "Static code analysis", - "fixer", - "standards", - "static analysis" - ], - "support": { - "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.49.0" - }, - "funding": [ - { - "url": "https://github.com/keradus", - "type": "github" - } - ], - "time": "2024-02-02T00:41:40+00:00" - }, - { - "name": "guzzlehttp/guzzle", - "version": "7.8.1", - "source": { - "type": "git", - "url": "https://github.com/guzzle/guzzle.git", - "reference": "41042bc7ab002487b876a0683fc8dce04ddce104" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104", - "reference": "41042bc7ab002487b876a0683fc8dce04ddce104", - "shasum": "" - }, - "require": { - "ext-json": "*", - "guzzlehttp/promises": "^1.5.3 || ^2.0.1", - "guzzlehttp/psr7": "^1.9.1 || ^2.5.1", - "php": "^7.2.5 || ^8.0", - "psr/http-client": "^1.0", - "symfony/deprecation-contracts": "^2.2 || ^3.0" - }, - "provide": { - "psr/http-client-implementation": "1.0" - }, - "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.2", - "ext-curl": "*", - "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", - "php-http/message-factory": "^1.1", - "phpunit/phpunit": "^8.5.36 || ^9.6.15", - "psr/log": "^1.1 || ^2.0 || ^3.0" - }, - "suggest": { - "ext-curl": "Required for CURL handler support", - "ext-intl": "Required for Internationalized Domain Name (IDN) support", - "psr/log": "Required for using the Log middleware" - }, - "type": "library", - "extra": { - "bamarni-bin": { - "bin-links": true, - "forward-command": false - } - }, - "autoload": { - "files": [ - "src/functions_include.php" - ], - "psr-4": { - "GuzzleHttp\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" - }, - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Jeremy Lindblom", - "email": "jeremeamia@gmail.com", - "homepage": "https://github.com/jeremeamia" - }, - { - "name": "George Mponos", - "email": "gmponos@gmail.com", - "homepage": "https://github.com/gmponos" - }, - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://github.com/sagikazarmark" - }, - { - "name": "Tobias Schultze", - "email": "webmaster@tubo-world.de", - "homepage": "https://github.com/Tobion" - } - ], - "description": "Guzzle is a PHP HTTP client library", - "keywords": [ - "client", - "curl", - "framework", - "http", - "http client", - "psr-18", - "psr-7", - "rest", - "web service" - ], - "support": { - "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.8.1" - }, - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://github.com/Nyholm", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle", - "type": "tidelift" - } - ], - "time": "2023-12-03T20:35:24+00:00" - }, - { - "name": "guzzlehttp/promises", - "version": "2.0.2", - "source": { - "type": "git", - "url": "https://github.com/guzzle/promises.git", - "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223", - "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223", - "shasum": "" - }, - "require": { - "php": "^7.2.5 || ^8.0" - }, - "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.36 || ^9.6.15" - }, - "type": "library", - "extra": { - "bamarni-bin": { - "bin-links": true, - "forward-command": false - } - }, - "autoload": { - "psr-4": { - "GuzzleHttp\\Promise\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" - }, - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" - }, - { - "name": "Tobias Schultze", - "email": "webmaster@tubo-world.de", - "homepage": "https://github.com/Tobion" - } - ], - "description": "Guzzle promises library", - "keywords": [ - "promise" - ], - "support": { - "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.2" - }, - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://github.com/Nyholm", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", - "type": "tidelift" - } - ], - "time": "2023-12-03T20:19:20+00:00" - }, - { - "name": "guzzlehttp/psr7", - "version": "2.6.2", - "source": { - "type": "git", - "url": "https://github.com/guzzle/psr7.git", - "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221", - "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221", - "shasum": "" - }, - "require": { - "php": "^7.2.5 || ^8.0", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.1 || ^2.0", - "ralouphie/getallheaders": "^3.0" - }, - "provide": { - "psr/http-factory-implementation": "1.0", - "psr/http-message-implementation": "1.0" - }, - "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.2", - "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.36 || ^9.6.15" - }, - "suggest": { - "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" - }, - "type": "library", - "extra": { - "bamarni-bin": { - "bin-links": true, - "forward-command": false - } - }, - "autoload": { - "psr-4": { - "GuzzleHttp\\Psr7\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" - }, - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "George Mponos", - "email": "gmponos@gmail.com", - "homepage": "https://github.com/gmponos" - }, - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://github.com/sagikazarmark" - }, - { - "name": "Tobias Schultze", - "email": "webmaster@tubo-world.de", - "homepage": "https://github.com/Tobion" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://sagikazarmark.hu" - } - ], - "description": "PSR-7 message implementation that also provides common utility methods", - "keywords": [ - "http", - "message", - "psr-7", - "request", - "response", - "stream", - "uri", - "url" - ], - "support": { - "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.6.2" - }, - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://github.com/Nyholm", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", - "type": "tidelift" - } - ], - "time": "2023-12-03T20:05:35+00:00" - }, - { - "name": "jawira/plantuml-client", - "version": "v1.0.3", - "source": { - "type": "git", - "url": "https://github.com/jawira/plantuml-client.git", - "reference": "28ca92b4e0825bd7f3a82fed10c7f3dbe0657fd5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jawira/plantuml-client/zipball/28ca92b4e0825bd7f3a82fed10c7f3dbe0657fd5", - "reference": "28ca92b4e0825bd7f3a82fed10c7f3dbe0657fd5", - "shasum": "" - }, - "require": { - "jawira/plantuml-encoding": "^1.0", - "php": ">=7.4" - }, - "require-dev": { - "ergebnis/composer-normalize": "^2.13", - "ext-fileinfo": "*", - "jawira/skeleton": "^2.16", - "phpstan/phpstan": "^1.8", - "phpunit/phpunit": "^9.5" - }, - "suggest": { - "pds/skeleton": "Standard PHP package skeleton." - }, - "type": "library", - "autoload": { - "psr-4": { - "Jawira\\PlantUmlClient\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jawira Portugal", - "email": "dev@tugal.be" - } - ], - "description": "Convert PlantUML diagrams into images.", - "keywords": [ - "diagram", - "image", - "plantuml", - "uml" - ], - "support": { - "issues": "https://github.com/jawira/plantuml-client/issues", - "source": "https://github.com/jawira/plantuml-client/tree/v1.0.3" - }, - "time": "2022-11-08T23:48:25+00:00" - }, - { - "name": "jawira/plantuml-encoding", - "version": "v1.1.0", - "source": { - "type": "git", - "url": "https://github.com/jawira/plantuml-encoding.git", - "reference": "cec097dfc062e7e13655d9594eacce5f9df639ad" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jawira/plantuml-encoding/zipball/cec097dfc062e7e13655d9594eacce5f9df639ad", - "reference": "cec097dfc062e7e13655d9594eacce5f9df639ad", - "shasum": "" - }, - "require": { - "ext-zlib": "*", - "php": ">=7.0" - }, - "require-dev": { - "jawira/skeleton": "^2.14", - "phpstan/phpstan": "^1.0", - "vimeo/psalm": "^4.0" - }, - "type": "library", - "autoload": { - "files": [ - "src/plantuml_functions.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jawira Portugal", - "homepage": "https://jawira.com" - } - ], - "description": "PlantUML encoding functions", - "keywords": [ - "encodep", - "encoding", - "functions", - "plantuml", - "uml" - ], - "support": { - "issues": "https://github.com/jawira/plantuml-encoding/issues", - "source": "https://github.com/jawira/plantuml-encoding/tree/v1.1.0" - }, - "time": "2022-05-31T18:58:21+00:00" - }, - { - "name": "justinrainbow/json-schema", - "version": "v5.2.13", - "source": { - "type": "git", - "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", - "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", - "json-schema/json-schema-test-suite": "1.2.0", - "phpunit/phpunit": "^4.8.35" - }, - "bin": [ - "bin/validate-json" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "JsonSchema\\": "src/JsonSchema/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bruno Prieto Reis", - "email": "bruno.p.reis@gmail.com" - }, - { - "name": "Justin Rainbow", - "email": "justin.rainbow@gmail.com" - }, - { - "name": "Igor Wiedler", - "email": "igor@wiedler.ch" - }, - { - "name": "Robert Schönthal", - "email": "seroscho@googlemail.com" - } - ], - "description": "A library to validate a json schema.", - "homepage": "https://github.com/justinrainbow/json-schema", - "keywords": [ - "json", - "schema" - ], - "support": { - "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13" - }, - "time": "2023-09-26T02:20:38+00:00" - }, - { - "name": "localheinz/diff", - "version": "1.1.1", - "source": { - "type": "git", - "url": "https://github.com/localheinz/diff.git", - "reference": "851bb20ea8358c86f677f5f111c4ab031b1c764c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/localheinz/diff/zipball/851bb20ea8358c86f677f5f111c4ab031b1c764c", - "reference": "851bb20ea8358c86f677f5f111c4ab031b1c764c", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^7.5 || ^8.0", - "symfony/process": "^4.2 || ^5" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - } - ], - "description": "Fork of sebastian/diff for use with ergebnis/composer-normalize", - "homepage": "https://github.com/localheinz/diff", - "keywords": [ - "diff", - "udiff", - "unidiff", - "unified diff" - ], - "support": { - "source": "https://github.com/localheinz/diff/tree/main" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-07-06T04:49:32+00:00" - }, - { - "name": "mehr-als-nix/parallel", - "version": "v1.0.0", - "source": { - "type": "git", - "url": "https://github.com/MehrAlsNix/Parallel.git", - "reference": "14a71eb1a8f851108bed4a5b32d1c1027976e8f3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/MehrAlsNix/Parallel/zipball/14a71eb1a8f851108bed4a5b32d1c1027976e8f3", - "reference": "14a71eb1a8f851108bed4a5b32d1c1027976e8f3", - "shasum": "" - }, - "require-dev": { - "phpunit/phpunit": "^6.5" - }, - "type": "library", - "autoload": { - "psr-4": { - "MehrAlsNix\\Parallel\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "siad007", - "email": "siad.ardroumli@gmail.com" - } - ], - "description": "This package is a port of PhpDumentor/Parallel", - "support": { - "source": "https://github.com/MehrAlsNix/Parallel/tree/master" - }, - "time": "2017-12-10T12:33:51+00:00" - }, - { - "name": "mikey179/vfsstream", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/bovigo/vfsStream.git", - "reference": "dd9277d9d27b5406f903e6b06df99825c32ea3b2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/dd9277d9d27b5406f903e6b06df99825c32ea3b2", - "reference": "dd9277d9d27b5406f903e6b06df99825c32ea3b2", - "shasum": "" - }, - "require": { - "php": "^7.2|^8.0" - }, - "require-dev": { - "bovigo/assert": "^6.2", - "bovigo/callmap": "^6.2.1", - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1", - "doctrine/coding-standard": "^8.2.1", - "phpstan/phpstan": "^0.12.94", - "phpstan/phpstan-deprecation-rules": "^0.12.6", - "phpstan/phpstan-phpunit": "^0.12.21", - "phpunit/phpunit": "^9.5.8", - "squizlabs/php_codesniffer": "^3.6.0" - }, - "default-branch": true, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "bovigo\\vfs\\": "src", - "org\\bovigo\\vfs\\": "org/bovigo/vfs" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Frank Kleine", - "homepage": "http://frankkleine.de/", - "role": "Developer" - } - ], - "description": "Virtual file system to mock the real file system in unit tests.", - "homepage": "http://vfs.bovigo.org/", - "support": { - "issues": "https://github.com/bovigo/vfsStream/issues", - "source": "https://github.com/bovigo/vfsStream/tree/master", - "wiki": "https://github.com/bovigo/vfsStream/wiki" - }, - "time": "2022-07-26T07:37:46+00:00" - }, - { - "name": "monolog/monolog", - "version": "2.9.2", - "source": { - "type": "git", - "url": "https://github.com/Seldaek/monolog.git", - "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", - "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", - "shasum": "" - }, - "require": { - "php": ">=7.2", - "psr/log": "^1.0.1 || ^2.0 || ^3.0" - }, - "provide": { - "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0" - }, - "require-dev": { - "aws/aws-sdk-php": "^2.4.9 || ^3.0", - "doctrine/couchdb": "~1.0@dev", - "elasticsearch/elasticsearch": "^7 || ^8", - "ext-json": "*", - "graylog2/gelf-php": "^1.4.2 || ^2@dev", - "guzzlehttp/guzzle": "^7.4", - "guzzlehttp/psr7": "^2.2", - "mongodb/mongodb": "^1.8", - "php-amqplib/php-amqplib": "~2.4 || ^3", - "phpspec/prophecy": "^1.15", - "phpstan/phpstan": "^0.12.91", - "phpunit/phpunit": "^8.5.14", - "predis/predis": "^1.1 || ^2.0", - "rollbar/rollbar": "^1.3 || ^2 || ^3", - "ruflin/elastica": "^7", - "swiftmailer/swiftmailer": "^5.3|^6.0", - "symfony/mailer": "^5.4 || ^6", - "symfony/mime": "^5.4 || ^6" - }, - "suggest": { - "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", - "doctrine/couchdb": "Allow sending log messages to a CouchDB server", - "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", - "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", - "ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler", - "ext-mbstring": "Allow to work properly with unicode symbols", - "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", - "ext-openssl": "Required to send log messages using SSL", - "ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)", - "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", - "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", - "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", - "rollbar/rollbar": "Allow sending log messages to Rollbar", - "ruflin/elastica": "Allow sending log messages to an Elastic Search server" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Monolog\\": "src/Monolog" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "https://seld.be" - } - ], - "description": "Sends your logs to files, sockets, inboxes, databases and various web services", - "homepage": "https://github.com/Seldaek/monolog", - "keywords": [ - "log", - "logging", - "psr-3" - ], - "support": { - "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.9.2" - }, - "funding": [ - { - "url": "https://github.com/Seldaek", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", - "type": "tidelift" - } - ], - "time": "2023-10-27T15:25:26+00:00" - }, - { - "name": "mtdowling/jmespath.php", - "version": "2.7.0", - "source": { - "type": "git", - "url": "https://github.com/jmespath/jmespath.php.git", - "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/bbb69a935c2cbb0c03d7f481a238027430f6440b", - "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b", - "shasum": "" - }, - "require": { - "php": "^7.2.5 || ^8.0", - "symfony/polyfill-mbstring": "^1.17" - }, - "require-dev": { - "composer/xdebug-handler": "^3.0.3", - "phpunit/phpunit": "^8.5.33" - }, - "bin": [ - "bin/jp.php" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev" - } - }, - "autoload": { - "files": [ - "src/JmesPath.php" - ], - "psr-4": { - "JmesPath\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" - }, - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "Declaratively specify how to extract elements from a JSON document", - "keywords": [ - "json", - "jsonpath" - ], - "support": { - "issues": "https://github.com/jmespath/jmespath.php/issues", - "source": "https://github.com/jmespath/jmespath.php/tree/2.7.0" - }, - "time": "2023-08-25T10:54:48+00:00" - }, - { - "name": "myclabs/deep-copy", - "version": "1.11.1", - "source": { - "type": "git", - "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0" - }, - "conflict": { - "doctrine/collections": "<1.6.8", - "doctrine/common": "<2.13.3 || >=3,<3.2.2" - }, - "require-dev": { - "doctrine/collections": "^1.6.8", - "doctrine/common": "^2.13.3 || ^3.2.2", - "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" - }, - "type": "library", - "autoload": { - "files": [ - "src/DeepCopy/deep_copy.php" - ], - "psr-4": { - "DeepCopy\\": "src/DeepCopy/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Create deep copies (clones) of your objects", - "keywords": [ - "clone", - "copy", - "duplicate", - "object", - "object graph" - ], - "support": { - "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" - }, - "funding": [ - { - "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", - "type": "tidelift" - } - ], - "time": "2023-03-08T13:26:56+00:00" - }, - { - "name": "nikic/php-parser", - "version": "v5.0.0", - "source": { - "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4a21235f7e56e713259a6f76bf4b5ea08502b9dc", - "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc", - "shasum": "" - }, - "require": { - "ext-ctype": "*", - "ext-json": "*", - "ext-tokenizer": "*", - "php": ">=7.4" - }, - "require-dev": { - "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" - }, - "bin": [ - "bin/php-parse" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0-dev" - } - }, - "autoload": { - "psr-4": { - "PhpParser\\": "lib/PhpParser" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Nikita Popov" - } - ], - "description": "A PHP parser written in PHP", - "keywords": [ - "parser", - "php" - ], - "support": { - "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.0" - }, - "time": "2024-01-07T17:17:35+00:00" - }, - { - "name": "pdepend/pdepend", - "version": "2.16.2", - "source": { - "type": "git", - "url": "https://github.com/pdepend/pdepend.git", - "reference": "f942b208dc2a0868454d01b29f0c75bbcfc6ed58" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/f942b208dc2a0868454d01b29f0c75bbcfc6ed58", - "reference": "f942b208dc2a0868454d01b29f0c75bbcfc6ed58", - "shasum": "" - }, - "require": { - "php": ">=5.3.7", - "symfony/config": "^2.3.0|^3|^4|^5|^6.0|^7.0", - "symfony/dependency-injection": "^2.3.0|^3|^4|^5|^6.0|^7.0", - "symfony/filesystem": "^2.3.0|^3|^4|^5|^6.0|^7.0", - "symfony/polyfill-mbstring": "^1.19" - }, - "require-dev": { - "easy-doc/easy-doc": "0.0.0|^1.2.3", - "gregwar/rst": "^1.0", - "squizlabs/php_codesniffer": "^2.0.0" - }, - "bin": [ - "src/bin/pdepend" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } - }, - "autoload": { - "psr-4": { - "PDepend\\": "src/main/php/PDepend" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Official version of pdepend to be handled with Composer", - "keywords": [ - "PHP Depend", - "PHP_Depend", - "dev", - "pdepend" - ], - "support": { - "issues": "https://github.com/pdepend/pdepend/issues", - "source": "https://github.com/pdepend/pdepend/tree/2.16.2" - }, - "funding": [ - { - "url": "https://tidelift.com/funding/github/packagist/pdepend/pdepend", - "type": "tidelift" - } - ], - "time": "2023-12-17T18:09:59+00:00" - }, - { - "name": "pear/archive_tar", - "version": "1.4.14", - "source": { - "type": "git", - "url": "https://github.com/pear/Archive_Tar.git", - "reference": "4d761c5334c790e45ef3245f0864b8955c562caa" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/4d761c5334c790e45ef3245f0864b8955c562caa", - "reference": "4d761c5334c790e45ef3245f0864b8955c562caa", - "shasum": "" - }, - "require": { - "pear/pear-core-minimal": "^1.10.0alpha2", - "php": ">=5.2.0" - }, - "require-dev": { - "phpunit/phpunit": "*" - }, - "suggest": { - "ext-bz2": "Bz2 compression support.", - "ext-xz": "Lzma2 compression support.", - "ext-zlib": "Gzip compression support." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4.x-dev" - } - }, - "autoload": { - "psr-0": { - "Archive_Tar": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "./" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Vincent Blavet", - "email": "vincent@phpconcept.net" - }, - { - "name": "Greg Beaver", - "email": "greg@chiaraquartet.net" - }, - { - "name": "Michiel Rook", - "email": "mrook@php.net" - } - ], - "description": "Tar file management class with compression support (gzip, bzip2, lzma2)", - "homepage": "https://github.com/pear/Archive_Tar", - "keywords": [ - "archive", - "tar" - ], - "support": { - "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Archive_Tar", - "source": "https://github.com/pear/Archive_Tar" - }, - "funding": [ - { - "url": "https://github.com/mrook", - "type": "github" - }, - { - "url": "https://www.patreon.com/michielrook", - "type": "patreon" - } - ], - "time": "2021-07-20T13:53:39+00:00" - }, - { - "name": "pear/console_getopt", - "version": "v1.4.3", - "source": { - "type": "git", - "url": "https://github.com/pear/Console_Getopt.git", - "reference": "a41f8d3e668987609178c7c4a9fe48fecac53fa0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/a41f8d3e668987609178c7c4a9fe48fecac53fa0", - "reference": "a41f8d3e668987609178c7c4a9fe48fecac53fa0", - "shasum": "" - }, - "type": "library", - "autoload": { - "psr-0": { - "Console": "./" - } - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "./" - ], - "license": [ - "BSD-2-Clause" - ], - "authors": [ - { - "name": "Andrei Zmievski", - "email": "andrei@php.net", - "role": "Lead" - }, - { - "name": "Stig Bakken", - "email": "stig@php.net", - "role": "Developer" - }, - { - "name": "Greg Beaver", - "email": "cellog@php.net", - "role": "Helper" - } - ], - "description": "More info available on: http://pear.php.net/package/Console_Getopt", - "support": { - "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Console_Getopt", - "source": "https://github.com/pear/Console_Getopt" - }, - "time": "2019-11-20T18:27:48+00:00" - }, - { - "name": "pear/mail", - "version": "v1.6.0", - "source": { - "type": "git", - "url": "https://github.com/pear/Mail.git", - "reference": "4fda3292ac6bf226d8841cfd8ee3cf4e28395c01" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pear/Mail/zipball/4fda3292ac6bf226d8841cfd8ee3cf4e28395c01", - "reference": "4fda3292ac6bf226d8841cfd8ee3cf4e28395c01", - "shasum": "" - }, - "require": { - "pear/pear-core-minimal": "~1.9", - "php": ">=5.2.1" - }, - "require-dev": { - "pear/pear": "*" - }, - "suggest": { - "pear/net_smtp": "Install optionally via your project's composer.json" - }, - "type": "library", - "autoload": { - "psr-0": { - "Mail": "./" - } - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "./" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Chuck Hagenbuch", - "email": "chuck@horde.org", - "role": "Lead" - }, - { - "name": "Armin Graefe", - "email": "schengawegga@gmail.com", - "role": "Lead" - }, - { - "name": "Richard Heyes", - "email": "richard@phpguru.org", - "role": "Developer" - }, - { - "name": "Aleksander Machniak", - "email": "alec@alec.pl", - "role": "Developer" - } - ], - "description": "Class that provides multiple interfaces for sending emails.", - "homepage": "http://pear.php.net/package/Mail", - "support": { - "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Mail", - "source": "https://github.com/pear/Mail" - }, - "time": "2023-11-01T21:31:59+00:00" - }, - { - "name": "pear/mail_mime", - "version": "1.10.11", - "source": { - "type": "git", - "url": "https://github.com/pear/Mail_Mime.git", - "reference": "d4fb9ce61201593d0f8c6db629c45e29c3409c14" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pear/Mail_Mime/zipball/d4fb9ce61201593d0f8c6db629c45e29c3409c14", - "reference": "d4fb9ce61201593d0f8c6db629c45e29c3409c14", - "shasum": "" - }, - "require": { - "pear/pear-core-minimal": "*", - "php": ">=5.2.0" - }, - "type": "library", - "autoload": { - "psr-0": { - "Mail": "./" - } - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "./" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Cipriano Groenendal", - "email": "cipri@php.net", - "role": "Lead" - }, - { - "name": "Aleksander Machniak", - "email": "alec@php.net", - "role": "Lead" - } - ], - "description": "Mail_Mime provides classes to create MIME messages", - "homepage": "http://pear.php.net/package/Mail_Mime", - "support": { - "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Mail_Mime", - "source": "https://github.com/pear/Mail_Mime" - }, - "time": "2021-09-05T08:42:45+00:00" - }, - { - "name": "pear/net_ftp", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/pear/Net_FTP.git", - "reference": "b5bd376359df4b9ef9c3140a21d2d2e790c9bdb7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pear/Net_FTP/zipball/b5bd376359df4b9ef9c3140a21d2d2e790c9bdb7", - "reference": "b5bd376359df4b9ef9c3140a21d2d2e790c9bdb7", - "shasum": "" - }, - "require": { - "pear/pear_exception": "*" - }, - "require-dev": { - "phpunit/phpunit": "*" - }, - "default-branch": true, - "type": "library", - "autoload": { - "psr-0": { - "Net": "./" - } - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "./" - ], - "license": [ - "PHP License" - ], - "authors": [ - { - "name": "Jorrit Schippers", - "email": "jschippers@php.net", - "role": "Lead" - }, - { - "name": "Tobias Schlitt", - "email": "toby@php.net", - "role": "Lead" - } - ], - "description": "More info available on: http://pear.php.net/package/Net_FTP", - "support": { - "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Net_FTP", - "source": "https://github.com/pear/Net_FTP" - }, - "time": "2023-10-18T12:09:44+00:00" - }, - { - "name": "pear/net_growl", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/pear/Net_Growl.git", - "reference": "9e828a6dde4f85337358209bd98bd260a558e4a9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pear/Net_Growl/zipball/9e828a6dde4f85337358209bd98bd260a558e4a9", - "reference": "9e828a6dde4f85337358209bd98bd260a558e4a9", - "shasum": "" - }, - "require": { - "pear/pear_exception": "*", - "php": ">=5.6" - }, - "require-dev": { - "phpunit/phpunit": "<6.0" - }, - "default-branch": true, - "type": "library", - "autoload": { - "psr-0": { - "Net": "./" - } - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "./" - ], - "license": [ - "BSD License" - ], - "authors": [ - { - "name": "Laurent Laville", - "email": "pear@laurent-laville.org", - "role": "Lead" - }, - { - "name": "Bertrand Mansion", - "email": "bmansion@mamasam.com", - "role": "Lead" - }, - { - "name": "Brian Dunnington", - "role": "Helper" - } - ], - "description": "More info available on: http://pear.php.net/package/Net_Growl", - "support": { - "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Net_Growl", - "source": "https://github.com/pear/Net_Growl" - }, - "time": "2019-03-05T14:25:46+00:00" - }, - { - "name": "pear/pear-core-minimal", - "version": "v1.10.14", - "source": { - "type": "git", - "url": "https://github.com/pear/pear-core-minimal.git", - "reference": "a86fc145edb5caedbf96527214ce3cadc9de4a32" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/a86fc145edb5caedbf96527214ce3cadc9de4a32", - "reference": "a86fc145edb5caedbf96527214ce3cadc9de4a32", - "shasum": "" - }, - "require": { - "pear/console_getopt": "~1.4", - "pear/pear_exception": "~1.0", - "php": ">=5.4" - }, - "replace": { - "rsky/pear-core-min": "self.version" - }, - "type": "library", - "autoload": { - "psr-0": { - "": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "src/" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Christian Weiske", - "email": "cweiske@php.net", - "role": "Lead" - } - ], - "description": "Minimal set of PEAR core files to be used as composer dependency", - "support": { - "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR", - "source": "https://github.com/pear/pear-core-minimal" - }, - "time": "2023-11-26T16:15:38+00:00" - }, - { - "name": "pear/pear_exception", - "version": "v1.0.2", - "source": { - "type": "git", - "url": "https://github.com/pear/PEAR_Exception.git", - "reference": "b14fbe2ddb0b9f94f5b24cf08783d599f776fff0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/b14fbe2ddb0b9f94f5b24cf08783d599f776fff0", - "reference": "b14fbe2ddb0b9f94f5b24cf08783d599f776fff0", - "shasum": "" - }, - "require": { - "php": ">=5.2.0" - }, - "require-dev": { - "phpunit/phpunit": "<9" - }, - "type": "class", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "PEAR/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "." - ], - "license": [ - "BSD-2-Clause" - ], - "authors": [ - { - "name": "Helgi Thormar", - "email": "dufuz@php.net" - }, - { - "name": "Greg Beaver", - "email": "cellog@php.net" - } - ], - "description": "The PEAR Exception base class.", - "homepage": "https://github.com/pear/PEAR_Exception", - "keywords": [ - "exception" - ], - "support": { - "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR_Exception", - "source": "https://github.com/pear/PEAR_Exception" - }, - "time": "2021-03-21T15:43:46+00:00" - }, - { - "name": "pear/versioncontrol_git", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/pear/VersionControl_Git.git", - "reference": "c32d75d237974297f052ceb781dfc2eb817f7b59" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pear/VersionControl_Git/zipball/c32d75d237974297f052ceb781dfc2eb817f7b59", - "reference": "c32d75d237974297f052ceb781dfc2eb817f7b59", - "shasum": "" - }, - "require": { - "pear/pear-core-minimal": "^1.9", - "pear/pear_exception": "~1.0.0", - "php": "^7.3 || ^7.4 || ^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^9.5" - }, - "default-branch": true, - "type": "library", - "autoload": { - "psr-0": { - "VersionControl": "./" - } - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "./" - ], - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Kousuke Ebihara", - "email": "ebihara@php.net", - "role": "Lead" - } - ], - "description": "VersionControl_Git is a library that provides OO interface to handle Git repository.", - "support": { - "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=VersionControl_Git", - "source": "https://github.com/pear/VersionControl_Git" - }, - "time": "2023-03-22T19:55:38+00:00" - }, - { - "name": "pear/versioncontrol_svn", - "version": "0.7.0", - "source": { - "type": "git", - "url": "https://github.com/pear/VersionControl_SVN.git", - "reference": "226ec8cb136a88f5093f650193d9c1d2230d2938" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pear/VersionControl_SVN/zipball/226ec8cb136a88f5093f650193d9c1d2230d2938", - "reference": "226ec8cb136a88f5093f650193d9c1d2230d2938", - "shasum": "" - }, - "require": { - "pear/pear-core-minimal": "^1.10", - "pear/pear_exception": "*@dev", - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "*" - }, - "type": "library", - "autoload": { - "psr-0": { - "VersionControl_": "./" - } - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "./" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Clay Loveless", - "email": "clay@loveless.net", - "role": "Lead" - }, - { - "name": "Michiel Rook", - "email": "mrook@php.net", - "role": "Lead" - } - ], - "description": "More info available on: http://pear.php.net/package/VersionControl_SVN", - "support": { - "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=VersionControl_SVN", - "source": "https://github.com/pear/VersionControl_SVN" - }, - "funding": [ - { - "url": "https://github.com/mrook", - "type": "github" - }, - { - "url": "https://www.patreon.com/michielrook", - "type": "patreon" - } - ], - "time": "2021-06-01T12:01:18+00:00" - }, - { - "name": "phar-io/manifest", - "version": "2.0.3", - "source": { - "type": "git", - "url": "https://github.com/phar-io/manifest.git", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-phar": "*", - "ext-xmlwriter": "*", - "phar-io/version": "^3.0.1", - "php": "^7.2 || ^8.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - }, - { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" - } - ], - "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "support": { - "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.3" - }, - "time": "2021-07-20T11:28:43+00:00" - }, - { - "name": "phar-io/version", - "version": "3.2.1", - "source": { - "type": "git", - "url": "https://github.com/phar-io/version.git", - "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74", - "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - }, - { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" - } - ], - "description": "Library for handling version information and constraints", - "support": { - "issues": "https://github.com/phar-io/version/issues", - "source": "https://github.com/phar-io/version/tree/3.2.1" - }, - "time": "2022-02-21T01:04:05+00:00" - }, - { - "name": "phing/phing-composer-configurator", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/phingofficial/phing-composer-configurator.git", - "reference": "4ae5639bbecc82d849374139895092de528b8803" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phingofficial/phing-composer-configurator/zipball/4ae5639bbecc82d849374139895092de528b8803", - "reference": "4ae5639bbecc82d849374139895092de528b8803", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.1|^2.0", - "php": ">= 7.3" - }, - "require-dev": { - "composer/composer": "~2.1.9 || ~2.3.0 || ~2.5.0", - "ergebnis/composer-normalize": "^2.0.2", - "ergebnis/phpstan-rules": "^0.14.2|^0.15.0", - "mikey179/vfsstream": "^1.6.8", - "pepakriz/phpstan-exception-rules": "^0.10.1|^0.11.0", - "phpstan/phpstan": "^0.12.4", - "phpstan/phpstan-beberlei-assert": "^0.12.2", - "phpstan/phpstan-deprecation-rules": "^0.12.1", - "phpstan/phpstan-phpunit": "^0.12.5", - "phpstan/phpstan-strict-rules": "^0.12.1", - "phpunit/phpunit": "^8.5.0|^9.4.2", - "roave/security-advisories": "dev-latest", - "squizlabs/php_codesniffer": "^3.5.3" - }, - "default-branch": true, - "type": "composer-plugin", - "extra": { - "class": [ - "Phing\\PhingComposerConfigurator\\ExtensionInstallerPlugin" - ] - }, - "autoload": { - "psr-4": { - "Phing\\PhingComposerConfigurator\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL-3.0-only" - ], - "authors": [ - { - "name": "Siad Ardroumli", - "email": "siad.ardroumli@gmail.com" - }, - { - "name": "Phing Community", - "homepage": "https://github.com/phingofficial/phing/blob/master/CREDITS.md" - } - ], - "description": "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant.", - "homepage": "https://www.phing.info/", - "keywords": [ - "ant", - "build", - "build-automation", - "build-tool", - "make", - "phing", - "php", - "task", - "tool" - ], - "support": { - "docs": "https://www.phing.info/docs/guide/stable/", - "irc": "irc://irc.freenode.net/phing", - "issues": "https://github.com/phingofficial/phing-composer-configurator/issues", - "slack": "https://www.phing.info/slack", - "source": "https://github.com/phingofficial/phing-composer-configurator/" - }, - "time": "2022-12-20T14:31:40+00:00" - }, - { - "name": "phpmd/phpmd", - "version": "2.15.0", - "source": { - "type": "git", - "url": "https://github.com/phpmd/phpmd.git", - "reference": "74a1f56e33afad4128b886e334093e98e1b5e7c0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpmd/phpmd/zipball/74a1f56e33afad4128b886e334093e98e1b5e7c0", - "reference": "74a1f56e33afad4128b886e334093e98e1b5e7c0", - "shasum": "" - }, - "require": { - "composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0", - "ext-xml": "*", - "pdepend/pdepend": "^2.16.1", - "php": ">=5.3.9" - }, - "require-dev": { - "easy-doc/easy-doc": "0.0.0 || ^1.3.2", - "ext-json": "*", - "ext-simplexml": "*", - "gregwar/rst": "^1.0", - "mikey179/vfsstream": "^1.6.8", - "squizlabs/php_codesniffer": "^2.9.2 || ^3.7.2" - }, - "bin": [ - "src/bin/phpmd" - ], - "type": "library", - "autoload": { - "psr-0": { - "PHPMD\\": "src/main/php" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Manuel Pichler", - "email": "github@manuel-pichler.de", - "homepage": "https://github.com/manuelpichler", - "role": "Project Founder" - }, - { - "name": "Marc Würth", - "email": "ravage@bluewin.ch", - "homepage": "https://github.com/ravage84", - "role": "Project Maintainer" - }, - { - "name": "Other contributors", - "homepage": "https://github.com/phpmd/phpmd/graphs/contributors", - "role": "Contributors" - } - ], - "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.", - "homepage": "https://phpmd.org/", - "keywords": [ - "dev", - "mess detection", - "mess detector", - "pdepend", - "phpmd", - "pmd" - ], - "support": { - "irc": "irc://irc.freenode.org/phpmd", - "issues": "https://github.com/phpmd/phpmd/issues", - "source": "https://github.com/phpmd/phpmd/tree/2.15.0" - }, - "funding": [ - { - "url": "https://tidelift.com/funding/github/packagist/phpmd/phpmd", - "type": "tidelift" - } - ], - "time": "2023-12-11T08:22:20+00:00" - }, - { - "name": "phpstan/phpstan", - "version": "1.10.58", - "source": { - "type": "git", - "url": "https://github.com/phpstan/phpstan.git", - "reference": "a23518379ec4defd9e47cbf81019526861623ec2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a23518379ec4defd9e47cbf81019526861623ec2", - "reference": "a23518379ec4defd9e47cbf81019526861623ec2", - "shasum": "" - }, - "require": { - "php": "^7.2|^8.0" - }, - "conflict": { - "phpstan/phpstan-shim": "*" - }, - "bin": [ - "phpstan", - "phpstan.phar" - ], - "type": "library", - "autoload": { - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "PHPStan - PHP Static Analysis Tool", - "keywords": [ - "dev", - "static analysis" - ], - "support": { - "docs": "https://phpstan.org/user-guide/getting-started", - "forum": "https://github.com/phpstan/phpstan/discussions", - "issues": "https://github.com/phpstan/phpstan/issues", - "security": "https://github.com/phpstan/phpstan/security/policy", - "source": "https://github.com/phpstan/phpstan-src" - }, - "funding": [ - { - "url": "https://github.com/ondrejmirtes", - "type": "github" - }, - { - "url": "https://github.com/phpstan", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", - "type": "tidelift" - } - ], - "time": "2024-02-12T20:02:57+00:00" - }, - { - "name": "phpunit/php-code-coverage", - "version": "9.2.30", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089", - "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-libxml": "*", - "ext-xmlwriter": "*", - "nikic/php-parser": "^4.18 || ^5.0", - "php": ">=7.3", - "phpunit/php-file-iterator": "^3.0.3", - "phpunit/php-text-template": "^2.0.2", - "sebastian/code-unit-reverse-lookup": "^2.0.2", - "sebastian/complexity": "^2.0", - "sebastian/environment": "^5.1.2", - "sebastian/lines-of-code": "^1.0.3", - "sebastian/version": "^3.0.1", - "theseer/tokenizer": "^1.2.0" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "suggest": { - "ext-pcov": "PHP extension that provides line coverage", - "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "9.2-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", - "homepage": "https://github.com/sebastianbergmann/php-code-coverage", - "keywords": [ - "coverage", - "testing", - "xunit" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.30" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-12-22T06:47:57+00:00" - }, - { - "name": "phpunit/php-file-iterator", - "version": "3.0.6", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", - "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "FilterIterator implementation that filters files based on a list of suffixes.", - "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", - "keywords": [ - "filesystem", - "iterator" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2021-12-02T12:48:52+00:00" - }, - { - "name": "phpunit/php-invoker", - "version": "3.1.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-invoker.git", - "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67", - "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "ext-pcntl": "*", - "phpunit/phpunit": "^9.3" - }, - "suggest": { - "ext-pcntl": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Invoke callables with a timeout", - "homepage": "https://github.com/sebastianbergmann/php-invoker/", - "keywords": [ - "process" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-invoker/issues", - "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-09-28T05:58:55+00:00" - }, - { - "name": "phpunit/php-text-template", - "version": "2.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", - "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Simple template engine.", - "homepage": "https://github.com/sebastianbergmann/php-text-template/", - "keywords": [ - "template" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-text-template/issues", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-10-26T05:33:50+00:00" - }, - { - "name": "phpunit/php-timer", - "version": "5.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", - "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", - "keywords": [ - "timer" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-10-26T13:16:10+00:00" - }, - { - "name": "phpunit/phpunit", - "version": "9.6.16", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3767b2c56ce02d01e3491046f33466a1ae60a37f", - "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.3.1 || ^2", - "ext-dom": "*", - "ext-json": "*", - "ext-libxml": "*", - "ext-mbstring": "*", - "ext-xml": "*", - "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", - "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.28", - "phpunit/php-file-iterator": "^3.0.5", - "phpunit/php-invoker": "^3.1.1", - "phpunit/php-text-template": "^2.0.3", - "phpunit/php-timer": "^5.0.2", - "sebastian/cli-parser": "^1.0.1", - "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.8", - "sebastian/diff": "^4.0.3", - "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.5", - "sebastian/global-state": "^5.0.1", - "sebastian/object-enumerator": "^4.0.3", - "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.2", - "sebastian/version": "^3.0.2" - }, - "suggest": { - "ext-soap": "To be able to generate mocks based on WSDL files", - "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" - }, - "bin": [ - "phpunit" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "9.6-dev" - } - }, - "autoload": { - "files": [ - "src/Framework/Assert/Functions.php" - ], - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "The PHP Unit Testing framework.", - "homepage": "https://phpunit.de/", - "keywords": [ - "phpunit", - "testing", - "xunit" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.16" - }, - "funding": [ - { - "url": "https://phpunit.de/sponsors.html", - "type": "custom" - }, - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", - "type": "tidelift" - } - ], - "time": "2024-01-19T07:03:14+00:00" - }, - { - "name": "psr/event-dispatcher", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/event-dispatcher.git", - "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", - "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", - "shasum": "" - }, - "require": { - "php": ">=7.2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\EventDispatcher\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Standard interfaces for event handling.", - "keywords": [ - "events", - "psr", - "psr-14" - ], - "support": { - "issues": "https://github.com/php-fig/event-dispatcher/issues", - "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" - }, - "time": "2019-01-08T18:20:26+00:00" - }, - { - "name": "psr/http-client", - "version": "1.0.3", - "source": { - "type": "git", - "url": "https://github.com/php-fig/http-client.git", - "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90", - "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90", - "shasum": "" - }, - "require": { - "php": "^7.0 || ^8.0", - "psr/http-message": "^1.0 || ^2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Http\\Client\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common interface for HTTP clients", - "homepage": "https://github.com/php-fig/http-client", - "keywords": [ - "http", - "http-client", - "psr", - "psr-18" - ], - "support": { - "source": "https://github.com/php-fig/http-client" - }, - "time": "2023-09-23T14:17:50+00:00" - }, - { - "name": "psr/http-factory", - "version": "1.0.2", - "source": { - "type": "git", - "url": "https://github.com/php-fig/http-factory.git", - "reference": "e616d01114759c4c489f93b099585439f795fe35" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", - "reference": "e616d01114759c4c489f93b099585439f795fe35", - "shasum": "" - }, - "require": { - "php": ">=7.0.0", - "psr/http-message": "^1.0 || ^2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Http\\Message\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common interfaces for PSR-7 HTTP message factories", - "keywords": [ - "factory", - "http", - "message", - "psr", - "psr-17", - "psr-7", - "request", - "response" - ], - "support": { - "source": "https://github.com/php-fig/http-factory/tree/1.0.2" - }, - "time": "2023-04-10T20:10:41+00:00" - }, - { - "name": "psr/http-message", - "version": "1.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/http-message.git", - "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", - "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Http\\Message\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for HTTP messages", - "homepage": "https://github.com/php-fig/http-message", - "keywords": [ - "http", - "http-message", - "psr", - "psr-7", - "request", - "response" - ], - "support": { - "source": "https://github.com/php-fig/http-message/tree/1.1" - }, - "time": "2023-04-04T09:50:52+00:00" - }, - { - "name": "psr/log", - "version": "1.1.4", - "source": { - "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Log\\": "Psr/Log/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common interface for logging libraries", - "homepage": "https://github.com/php-fig/log", - "keywords": [ - "log", - "psr", - "psr-3" - ], - "support": { - "source": "https://github.com/php-fig/log/tree/1.1.4" - }, - "time": "2021-05-03T11:20:27+00:00" - }, - { - "name": "ralouphie/getallheaders", - "version": "3.0.3", - "source": { - "type": "git", - "url": "https://github.com/ralouphie/getallheaders.git", - "reference": "120b605dfeb996808c31b6477290a714d356e822" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", - "reference": "120b605dfeb996808c31b6477290a714d356e822", - "shasum": "" - }, - "require": { - "php": ">=5.6" - }, - "require-dev": { - "php-coveralls/php-coveralls": "^2.1", - "phpunit/phpunit": "^5 || ^6.5" - }, - "type": "library", - "autoload": { - "files": [ - "src/getallheaders.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ralph Khattar", - "email": "ralph.khattar@gmail.com" - } - ], - "description": "A polyfill for getallheaders.", - "support": { - "issues": "https://github.com/ralouphie/getallheaders/issues", - "source": "https://github.com/ralouphie/getallheaders/tree/develop" - }, - "time": "2019-03-08T08:55:37+00:00" - }, - { - "name": "roave/security-advisories", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "624324975ceed0b788160bdec5b7f22125d8de14" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/624324975ceed0b788160bdec5b7f22125d8de14", - "reference": "624324975ceed0b788160bdec5b7f22125d8de14", - "shasum": "" - }, - "conflict": { - "3f/pygmentize": "<1.2", - "admidio/admidio": "<4.2.13", - "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3", - "aheinze/cockpit": "<2.2", - "aimeos/aimeos-typo3": "<19.10.12|>=20,<20.10.5", - "airesvsg/acf-to-rest-api": "<=3.1", - "akaunting/akaunting": "<2.1.13", - "akeneo/pim-community-dev": "<5.0.119|>=6,<6.0.53", - "alextselegidis/easyappointments": "<1.5", - "alterphp/easyadmin-extension-bundle": ">=1.2,<1.2.11|>=1.3,<1.3.1", - "amazing/media2click": ">=1,<1.3.3", - "amphp/artax": "<1.0.6|>=2,<2.0.6", - "amphp/http": "<1.0.1", - "amphp/http-client": ">=4,<4.4", - "anchorcms/anchor-cms": "<=0.12.7", - "andreapollastri/cipi": "<=3.1.15", - "andrewhaine/silverstripe-form-capture": ">=0.2,<=0.2.3|>=1,<1.0.2|>=2,<2.2.5", - "apache-solr-for-typo3/solr": "<2.8.3", - "apereo/phpcas": "<1.6", - "api-platform/core": ">=2.2,<2.2.10|>=2.3,<2.3.6|>=2.6,<2.7.10|>=3,<3.0.12|>=3.1,<3.1.3", - "appwrite/server-ce": "<=1.2.1", - "arc/web": "<3", - "area17/twill": "<1.2.5|>=2,<2.5.3", - "artesaos/seotools": "<0.17.2", - "asymmetricrypt/asymmetricrypt": "<9.9.99", - "athlon1600/php-proxy": "<=5.1", - "athlon1600/php-proxy-app": "<=3", - "austintoddj/canvas": "<=3.4.2", - "automad/automad": "<=1.10.9", - "awesome-support/awesome-support": "<=6.0.7", - "aws/aws-sdk-php": "<3.288.1", - "azuracast/azuracast": "<0.18.3", - "backdrop/backdrop": "<1.24.2", - "backpack/crud": "<3.4.9", - "bacula-web/bacula-web": "<8.0.0.0-RC2-dev", - "badaso/core": "<2.7", - "bagisto/bagisto": "<1.3.2", - "barrelstrength/sprout-base-email": "<1.2.7", - "barrelstrength/sprout-forms": "<3.9", - "barryvdh/laravel-translation-manager": "<0.6.2", - "barzahlen/barzahlen-php": "<2.0.1", - "baserproject/basercms": "<4.8", - "bassjobsen/bootstrap-3-typeahead": ">4.0.2", - "bigfork/silverstripe-form-capture": ">=3,<3.1.1", - "billz/raspap-webgui": "<2.9.5", - "bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3", - "bmarshall511/wordpress_zero_spam": "<5.2.13", - "bolt/bolt": "<3.7.2", - "bolt/core": "<=4.2", - "bottelet/flarepoint": "<2.2.1", - "bref/bref": "<2.1.13", - "brightlocal/phpwhois": "<=4.2.5", - "brotkrueml/codehighlight": "<2.7", - "brotkrueml/schema": "<1.13.1|>=2,<2.5.1", - "brotkrueml/typo3-matomo-integration": "<1.3.2", - "buddypress/buddypress": "<7.2.1", - "bugsnag/bugsnag-laravel": ">=2,<2.0.2", - "bytefury/crater": "<6.0.2", - "cachethq/cachet": "<2.5.1", - "cakephp/cakephp": "<3.10.3|>=4,<4.0.10|>=4.1,<4.1.4|>=4.2,<4.2.12|>=4.3,<4.3.11|>=4.4,<4.4.10", - "cakephp/database": ">=4.2,<4.2.12|>=4.3,<4.3.11|>=4.4,<4.4.10", - "cardgate/magento2": "<2.0.33", - "cardgate/woocommerce": "<=3.1.15", - "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4", - "cartalyst/sentry": "<=2.1.6", - "catfan/medoo": "<1.7.5", - "cecil/cecil": "<7.47.1", - "centreon/centreon": "<22.10.0.0-beta1", - "cesnet/simplesamlphp-module-proxystatistics": "<3.1", - "chriskacerguis/codeigniter-restserver": "<=2.7.1", - "civicrm/civicrm-core": ">=4.2,<4.2.9|>=4.3,<4.3.3", - "ckeditor/ckeditor": "<4.17", - "cockpit-hq/cockpit": "<=2.6.3", - "codeception/codeception": "<3.1.3|>=4,<4.1.22", - "codeigniter/framework": "<3.1.9", - "codeigniter4/framework": "<=4.4.2", - "codeigniter4/shield": "<1.0.0.0-beta8", - "codiad/codiad": "<=2.8.4", - "composer/composer": "<1.10.27|>=2,<2.2.23|>=2.3,<2.7", - "concrete5/concrete5": "<9.2.5", - "concrete5/core": "<8.5.8|>=9,<9.1", - "contao-components/mediaelement": ">=2.14.2,<2.21.1", - "contao/contao": ">=4,<4.4.56|>=4.5,<4.9.40|>=4.10,<4.11.7|>=4.13,<4.13.21|>=5.1,<5.1.4", - "contao/core": ">=2,<3.5.39", - "contao/core-bundle": ">=3,<3.5.35|>=4,<4.9.42|>=4.10,<4.13.28|>=5,<5.1.10", - "contao/listing-bundle": ">=4,<4.4.8", - "contao/managed-edition": "<=1.5", - "corveda/phpsandbox": "<1.3.5", - "cosenary/instagram": "<=2.3", - "craftcms/cms": "<4.6.2", - "croogo/croogo": "<4", - "cuyz/valinor": "<0.12", - "czproject/git-php": "<4.0.3", - "darylldoyle/safe-svg": "<1.9.10", - "datadog/dd-trace": ">=0.30,<0.30.2", - "datatables/datatables": "<1.10.10", - "david-garcia/phpwhois": "<=4.3.1", - "dbrisinajumi/d2files": "<1", - "dcat/laravel-admin": "<=2.1.3.0-beta", - "derhansen/fe_change_pwd": "<2.0.5|>=3,<3.0.3", - "derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1|>=7,<7.4", - "desperado/xml-bundle": "<=0.1.7", - "directmailteam/direct-mail": "<6.0.3|>=7,<7.0.3|>=8,<9.5.2", - "doctrine/annotations": "<1.2.7", - "doctrine/cache": ">=1,<1.3.2|>=1.4,<1.4.2", - "doctrine/common": "<2.4.3|>=2.5,<2.5.1", - "doctrine/dbal": ">=2,<2.0.8|>=2.1,<2.1.2|>=3,<3.1.4", - "doctrine/doctrine-bundle": "<1.5.2", - "doctrine/doctrine-module": "<=0.7.1", - "doctrine/mongodb-odm": "<1.0.2", - "doctrine/mongodb-odm-bundle": "<3.0.1", - "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4", - "dolibarr/dolibarr": "<18.0.2", - "dompdf/dompdf": "<2.0.4", - "doublethreedigital/guest-entries": "<3.1.2", - "drupal/core": ">=6,<6.38|>=7,<7.96|>=8,<10.1.8|>=10.2,<10.2.2", - "drupal/drupal": ">=5,<5.11|>=6,<6.38|>=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4", - "duncanmcclean/guest-entries": "<3.1.2", - "dweeves/magmi": "<=0.7.24", - "ec-cube/ec-cube": "<2.4.4", - "ecodev/newsletter": "<=4", - "ectouch/ectouch": "<=2.7.2", - "elefant/cms": "<2.0.7", - "elgg/elgg": "<3.3.24|>=4,<4.0.5", - "elijaa/phpmemcacheadmin": "<=1.3", - "encore/laravel-admin": "<=1.8.19", - "endroid/qr-code-bundle": "<3.4.2", - "enshrined/svg-sanitize": "<0.15", - "erusev/parsedown": "<1.7.2", - "ether/logs": "<3.0.4", - "evolutioncms/evolution": "<=3.2.3", - "exceedone/exment": "<4.4.3|>=5,<5.0.3", - "exceedone/laravel-admin": "<2.2.3|==3", - "ezsystems/demobundle": ">=5.4,<5.4.6.1-dev", - "ezsystems/ez-support-tools": ">=2.2,<2.2.3", - "ezsystems/ezdemo-ls-extension": ">=5.4,<5.4.2.1-dev", - "ezsystems/ezfind-ls": ">=5.3,<5.3.6.1-dev|>=5.4,<5.4.11.1-dev|>=2017.12,<2017.12.0.1-dev", - "ezsystems/ezplatform": "<=1.13.6|>=2,<=2.5.24", - "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6|>=1.5,<1.5.29|>=2.3,<2.3.26", - "ezsystems/ezplatform-admin-ui-assets": ">=4,<4.2.1|>=5,<5.0.1|>=5.1,<5.1.1", - "ezsystems/ezplatform-graphql": ">=1.0.0.0-RC1-dev,<1.0.13|>=2.0.0.0-beta1,<2.3.12", - "ezsystems/ezplatform-kernel": "<1.2.5.1-dev|>=1.3,<1.3.34", - "ezsystems/ezplatform-rest": ">=1.2,<=1.2.2|>=1.3,<1.3.8", - "ezsystems/ezplatform-richtext": ">=2.3,<2.3.7.1-dev", - "ezsystems/ezplatform-solr-search-engine": ">=1.7,<1.7.12|>=2,<2.0.2|>=3.3,<3.3.15", - "ezsystems/ezplatform-user": ">=1,<1.0.1", - "ezsystems/ezpublish-kernel": "<6.13.8.2-dev|>=7,<7.5.31", - "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.6,<=2019.03.5.1", - "ezsystems/platform-ui-assets-bundle": ">=4.2,<4.2.3", - "ezsystems/repository-forms": ">=2.3,<2.3.2.1-dev|>=2.5,<2.5.15", - "ezyang/htmlpurifier": "<4.1.1", - "facade/ignition": "<1.16.15|>=2,<2.4.2|>=2.5,<2.5.2", - "facturascripts/facturascripts": "<=2022.08", - "feehi/cms": "<=2.1.1", - "feehi/feehicms": "<=2.1.1", - "fenom/fenom": "<=2.12.1", - "filegator/filegator": "<7.8", - "firebase/php-jwt": "<6", - "fixpunkt/fp-masterquiz": "<2.2.1|>=3,<3.5.2", - "fixpunkt/fp-newsletter": "<1.1.1|>=2,<2.1.2|>=2.2,<3.2.6", - "flarum/core": "<1.8.5", - "flarum/framework": "<1.8.5", - "flarum/mentions": "<1.6.3", - "flarum/sticky": ">=0.1.0.0-beta14,<=0.1.0.0-beta15", - "flarum/tags": "<=0.1.0.0-beta13", - "floriangaerber/magnesium": "<0.3.1", - "fluidtypo3/vhs": "<5.1.1", - "fof/byobu": ">=0.3.0.0-beta2,<1.1.7", - "fof/upload": "<1.2.3", - "foodcoopshop/foodcoopshop": ">=3.2,<3.6.1", - "fooman/tcpdf": "<6.2.22", - "forkcms/forkcms": "<5.11.1", - "fossar/tcpdf-parser": "<6.2.22", - "francoisjacquet/rosariosis": "<11", - "frappant/frp-form-answers": "<3.1.2|>=4,<4.0.2", - "friendsofsymfony/oauth2-php": "<1.3", - "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2", - "friendsofsymfony/user-bundle": ">=1.2,<1.3.5", - "friendsoftypo3/mediace": ">=7.6.2,<7.6.5", - "friendsoftypo3/openid": ">=4.5,<4.5.31|>=4.7,<4.7.16|>=6,<6.0.11|>=6.1,<6.1.6", - "froala/wysiwyg-editor": "<3.2.7|>=4.0.1,<=4.1.1", - "froxlor/froxlor": "<=2.1.1", - "fuel/core": "<1.8.1", - "funadmin/funadmin": "<=3.2|>=3.3.2,<=3.3.3", - "gaoming13/wechat-php-sdk": "<=1.10.2", - "genix/cms": "<=1.1.11", - "getgrav/grav": "<1.7.44", - "getkirby/cms": "<3.5.8.3-dev|>=3.6,<3.6.6.3-dev|>=3.7,<3.7.5.2-dev|>=3.8,<3.8.4.1-dev|>=3.9,<3.9.6", - "getkirby/kirby": "<=2.5.12", - "getkirby/panel": "<2.5.14", - "getkirby/starterkit": "<=3.7.0.2", - "gilacms/gila": "<=1.15.4", - "gleez/cms": "<=1.2|==2", - "globalpayments/php-sdk": "<2", - "gogentooss/samlbase": "<1.2.7", - "google/protobuf": "<3.15", - "gos/web-socket-bundle": "<1.10.4|>=2,<2.6.1|>=3,<3.3", - "gree/jose": "<2.2.1", - "gregwar/rst": "<1.0.3", - "grumpydictator/firefly-iii": "<6.1.7", - "gugoan/economizzer": "<=0.9.0.0-beta1", - "guzzlehttp/guzzle": "<6.5.8|>=7,<7.4.5", - "guzzlehttp/psr7": "<1.9.1|>=2,<2.4.5", - "haffner/jh_captcha": "<=2.1.3|>=3,<=3.0.2", - "harvesthq/chosen": "<1.8.7", - "helloxz/imgurl": "<=2.31", - "hhxsv5/laravel-s": "<3.7.36", - "hillelcoren/invoice-ninja": "<5.3.35", - "himiklab/yii2-jqgrid-widget": "<1.0.8", - "hjue/justwriting": "<=1", - "hov/jobfair": "<1.0.13|>=2,<2.0.2", - "httpsoft/http-message": "<1.0.12", - "hyn/multi-tenant": ">=5.6,<5.7.2", - "ibexa/admin-ui": ">=4.2,<4.2.3", - "ibexa/core": ">=4,<4.0.7|>=4.1,<4.1.4|>=4.2,<4.2.3|>=4.5,<4.5.4", - "ibexa/graphql": ">=2.5,<2.5.31|>=3.3,<3.3.28|>=4.2,<4.2.3", - "ibexa/post-install": "<=1.0.4", - "ibexa/solr": ">=4.5,<4.5.4", - "ibexa/user": ">=4,<4.4.3", - "icecoder/icecoder": "<=8.1", - "idno/known": "<=1.3.1", - "illuminate/auth": "<5.5.10", - "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<=4.1.99999|>=4.2,<=4.2.99999|>=5,<=5.0.99999|>=5.1,<=5.1.99999|>=5.2,<=5.2.99999|>=5.3,<=5.3.99999|>=5.4,<=5.4.99999|>=5.5,<=5.5.49|>=5.6,<=5.6.99999|>=5.7,<=5.7.99999|>=5.8,<=5.8.99999|>=6,<6.18.31|>=7,<7.22.4", - "illuminate/database": "<6.20.26|>=7,<7.30.5|>=8,<8.40", - "illuminate/encryption": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15", - "illuminate/view": "<6.20.42|>=7,<7.30.6|>=8,<8.75", - "impresscms/impresscms": "<=1.4.5", - "impresspages/impresspages": "<=1.0.12", - "in2code/femanager": "<5.5.3|>=6,<6.3.4|>=7,<7.2.3", - "in2code/ipandlanguageredirect": "<5.1.2", - "in2code/lux": "<17.6.1|>=18,<24.0.2", - "innologi/typo3-appointments": "<2.0.6", - "intelliants/subrion": "<4.2.2", - "islandora/islandora": ">=2,<2.4.1", - "ivankristianto/phpwhois": "<=4.3", - "jackalope/jackalope-doctrine-dbal": "<1.7.4", - "james-heinrich/getid3": "<1.9.21", - "james-heinrich/phpthumb": "<1.7.12", - "jasig/phpcas": "<1.3.3", - "jcbrand/converse.js": "<3.3.3", - "joomla/application": "<1.0.13", - "joomla/archive": "<1.1.12|>=2,<2.0.1", - "joomla/filesystem": "<1.6.2|>=2,<2.0.1", - "joomla/filter": "<1.4.4|>=2,<2.0.1", - "joomla/framework": "<1.5.7|>=2.5.4,<=3.8.12", - "joomla/input": ">=2,<2.0.2", - "joomla/joomla-cms": ">=2.5,<3.9.12", - "joomla/session": "<1.3.1", - "joyqi/hyper-down": "<=2.4.27", - "jsdecena/laracom": "<2.0.9", - "jsmitty12/phpwhois": "<5.1", - "juzaweb/cms": "<=3.4", - "kazist/phpwhois": "<=4.2.6", - "kelvinmo/simplexrd": "<3.1.1", - "kevinpapst/kimai2": "<1.16.7", - "khodakhah/nodcms": "<=3", - "kimai/kimai": "<2.1", - "kitodo/presentation": "<3.2.3|>=3.3,<3.3.4", - "klaviyo/magento2-extension": ">=1,<3", - "knplabs/knp-snappy": "<=1.4.2", - "kohana/core": "<3.3.3", - "krayin/laravel-crm": "<1.2.2", - "kreait/firebase-php": ">=3.2,<3.8.1", - "la-haute-societe/tcpdf": "<6.2.22", - "laminas/laminas-diactoros": "<2.18.1|==2.19|==2.20|==2.21|==2.22|==2.23|>=2.24,<2.24.2|>=2.25,<2.25.2", - "laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1", - "laminas/laminas-http": "<2.14.2", - "laravel/fortify": "<1.11.1", - "laravel/framework": "<6.20.44|>=7,<7.30.6|>=8,<8.75", - "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", - "latte/latte": "<2.10.8", - "lavalite/cms": "<=9", - "lcobucci/jwt": ">=3.4,<3.4.6|>=4,<4.0.4|>=4.1,<4.1.5", - "league/commonmark": "<0.18.3", - "league/flysystem": "<1.1.4|>=2,<2.1.1", - "league/oauth2-server": ">=8.3.2,<8.4.2|>=8.5,<8.5.3", - "lexik/jwt-authentication-bundle": "<2.10.7|>=2.11,<2.11.3", - "librenms/librenms": "<2017.08.18", - "liftkit/database": "<2.13.2", - "limesurvey/limesurvey": "<3.27.19", - "livehelperchat/livehelperchat": "<=3.91", - "livewire/livewire": ">2.2.4,<2.2.6", - "lms/routes": "<2.1.1", - "localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2", - "luyadev/yii-helpers": "<1.2.1", - "magento/community-edition": "<2.4.3.0-patch3|>=2.4.4,<2.4.5", - "magento/core": "<=1.9.4.5", - "magento/magento1ce": "<1.9.4.3-dev", - "magento/magento1ee": ">=1,<1.14.4.3-dev", - "magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.2.0-patch2", - "magneto/core": "<1.9.4.4-dev", - "maikuolan/phpmussel": ">=1,<1.6", - "mainwp/mainwp": "<=4.4.3.3", - "mantisbt/mantisbt": "<=2.25.7", - "marcwillmann/turn": "<0.3.3", - "matyhtf/framework": "<3.0.6", - "mautic/core": "<4.3", - "mediawiki/core": "<1.36.2", - "mediawiki/matomo": "<2.4.3", - "mediawiki/semantic-media-wiki": "<4.0.2", - "melisplatform/melis-asset-manager": "<5.0.1", - "melisplatform/melis-cms": "<5.0.1", - "melisplatform/melis-front": "<5.0.1", - "mezzio/mezzio-swoole": "<3.7|>=4,<4.3", - "mgallegos/laravel-jqgrid": "<=1.3", - "microsoft/microsoft-graph": ">=1.16,<1.109.1|>=2,<2.0.1", - "microsoft/microsoft-graph-beta": "<2.0.1", - "microsoft/microsoft-graph-core": "<2.0.2", - "microweber/microweber": "<=2.0.4", - "miniorange/miniorange-saml": "<1.4.3", - "mittwald/typo3_forum": "<1.2.1", - "mobiledetect/mobiledetectlib": "<2.8.32", - "modx/revolution": "<=2.8.3.0-patch", - "mojo42/jirafeau": "<4.4", - "mongodb/mongodb": ">=1,<1.9.2", - "monolog/monolog": ">=1.8,<1.12", - "moodle/moodle": "<4.3.0.0-RC2-dev", - "mos/cimage": "<0.7.19", - "movim/moxl": ">=0.8,<=0.10", - "mpdf/mpdf": "<=7.1.7", - "munkireport/comment": "<4.1", - "munkireport/managedinstalls": "<2.6", - "munkireport/munkireport": ">=2.5.3,<5.6.3", - "mustache/mustache": ">=2,<2.14.1", - "namshi/jose": "<2.2", - "neoan3-apps/template": "<1.1.1", - "neorazorx/facturascripts": "<2022.04", - "neos/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6", - "neos/form": ">=1.2,<4.3.3|>=5,<5.0.9|>=5.1,<5.1.3", - "neos/media-browser": "<7.3.19|>=8,<8.0.16|>=8.1,<8.1.11|>=8.2,<8.2.11|>=8.3,<8.3.9", - "neos/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.9.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<5.3.10|>=7,<7.0.9|>=7.1,<7.1.7|>=7.2,<7.2.6|>=7.3,<7.3.4|>=8,<8.0.2", - "neos/swiftmailer": ">=4.1,<4.1.99|>=5.4,<5.4.5", - "netgen/tagsbundle": ">=3.4,<3.4.11|>=4,<4.0.15", - "nette/application": ">=2,<2.0.19|>=2.1,<2.1.13|>=2.2,<2.2.10|>=2.3,<2.3.14|>=2.4,<2.4.16|>=3,<3.0.6", - "nette/nette": ">=2,<2.0.19|>=2.1,<2.1.13", - "nilsteampassnet/teampass": "<3.0.10", - "nonfiction/nterchange": "<4.1.1", - "notrinos/notrinos-erp": "<=0.7", - "noumo/easyii": "<=0.9", - "nukeviet/nukeviet": "<4.5.02", - "nyholm/psr7": "<1.6.1", - "nystudio107/craft-seomatic": "<3.4.12", - "nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1", - "october/backend": "<1.1.2", - "october/cms": "<1.0.469|==1.0.469|==1.0.471|==1.1.1", - "october/october": "<=3.4.4", - "october/rain": "<1.0.472|>=1.1,<1.1.2", - "october/system": "<1.0.476|>=1.1,<1.1.12|>=2,<2.2.34|>=3,<3.5.2", - "omeka/omeka-s": "<4.0.3", - "onelogin/php-saml": "<2.10.4", - "oneup/uploader-bundle": ">=1,<1.9.3|>=2,<2.1.5", - "open-web-analytics/open-web-analytics": "<1.7.4", - "opencart/opencart": "<=3.0.3.7|>=4,<4.0.2.3-dev", - "openid/php-openid": "<2.3", - "openmage/magento-lts": "<20.2", - "opensource-workshop/connect-cms": "<1.7.2|>=2,<2.3.2", - "orchid/platform": ">=9,<9.4.4|>=14.0.0.0-alpha4,<14.5", - "oro/calendar-bundle": ">=4.2,<=4.2.6|>=5,<=5.0.6|>=5.1,<5.1.1", - "oro/commerce": ">=4.1,<5.0.11|>=5.1,<5.1.1", - "oro/crm": ">=1.7,<1.7.4|>=3.1,<4.1.17|>=4.2,<4.2.7", - "oro/crm-call-bundle": ">=4.2,<=4.2.5|>=5,<5.0.4|>=5.1,<5.1.1", - "oro/customer-portal": ">=4.2,<=4.2.8|>=5,<5.0.11|>=5.1,<5.1.1", - "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<=4.2.10|>=5,<5.0.8", - "oxid-esales/oxideshop-ce": "<4.5", - "packbackbooks/lti-1-3-php-library": "<5", - "padraic/humbug_get_contents": "<1.1.2", - "pagarme/pagarme-php": "<3", - "pagekit/pagekit": "<=1.0.18", - "paragonie/random_compat": "<2", - "passbolt/passbolt_api": "<2.11", - "paypal/merchant-sdk-php": "<3.12", - "pear/archive_tar": "<1.4.14", - "pear/auth": "<1.2.4", - "pear/crypt_gpg": "<1.6.7", - "pear/pear": "<=1.10.1", - "pegasus/google-for-jobs": "<1.5.1|>=2,<2.1.1", - "personnummer/personnummer": "<3.0.2", - "phanan/koel": "<5.1.4", - "phenx/php-svg-lib": "<0.5.1", - "php-mod/curl": "<2.3.2", - "phpbb/phpbb": "<3.2.10|>=3.3,<3.3.1", - "phpems/phpems": ">=6,<=6.1.3", - "phpfastcache/phpfastcache": "<6.1.5|>=7,<7.1.2|>=8,<8.0.7", - "phpmailer/phpmailer": "<6.5", - "phpmussel/phpmussel": ">=1,<1.6", - "phpmyadmin/phpmyadmin": "<5.2.1", - "phpmyfaq/phpmyfaq": "<3.2.5", - "phpoffice/phpexcel": "<1.8", - "phpoffice/phpspreadsheet": "<1.16", - "phpseclib/phpseclib": "<2.0.31|>=3,<3.0.34", - "phpservermon/phpservermon": "<3.6", - "phpsysinfo/phpsysinfo": "<3.4.3", - "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5.0.10,<5.6.3", - "phpwhois/phpwhois": "<=4.2.5", - "phpxmlrpc/extras": "<0.6.1", - "phpxmlrpc/phpxmlrpc": "<4.9.2", - "pi/pi": "<=2.5", - "pimcore/admin-ui-classic-bundle": "<1.3.3", - "pimcore/customer-management-framework-bundle": "<4.0.6", - "pimcore/data-hub": "<1.2.4", - "pimcore/demo": "<10.3", - "pimcore/ecommerce-framework-bundle": "<1.0.10", - "pimcore/perspective-editor": "<1.5.1", - "pimcore/pimcore": "<11.1.1", - "pixelfed/pixelfed": "<0.11.11", - "plotly/plotly.js": "<2.25.2", - "pocketmine/bedrock-protocol": "<8.0.2", - "pocketmine/pocketmine-mp": "<=4.23|>=5,<5.3.1", - "pocketmine/raklib": ">=0.14,<0.14.6|>=0.15,<0.15.1", - "pressbooks/pressbooks": "<5.18", - "prestashop/autoupgrade": ">=4,<4.10.1", - "prestashop/blockreassurance": "<=5.1.3", - "prestashop/blockwishlist": ">=2,<2.1.1", - "prestashop/contactform": ">=1.0.1,<4.3", - "prestashop/gamification": "<2.3.2", - "prestashop/prestashop": "<8.1.3", - "prestashop/productcomments": "<5.0.2", - "prestashop/ps_emailsubscription": "<2.6.1", - "prestashop/ps_facetedsearch": "<3.4.1", - "prestashop/ps_linklist": "<3.1", - "privatebin/privatebin": "<1.4", - "processwire/processwire": "<=3.0.210", - "propel/propel": ">=2.0.0.0-alpha1,<=2.0.0.0-alpha7", - "propel/propel1": ">=1,<=1.7.1", - "pterodactyl/panel": "<1.7", - "ptheofan/yii2-statemachine": ">=2.0.0.0-RC1-dev,<=2", - "ptrofimov/beanstalk_console": "<1.7.14", - "pubnub/pubnub": "<6.1", - "pusher/pusher-php-server": "<2.2.1", - "pwweb/laravel-core": "<=0.3.6.0-beta", - "pyrocms/pyrocms": "<=3.9.1", - "rainlab/blog-plugin": "<1.4.1", - "rainlab/debugbar-plugin": "<3.1", - "rainlab/user-plugin": "<=1.4.5", - "rankmath/seo-by-rank-math": "<=1.0.95", - "rap2hpoutre/laravel-log-viewer": "<0.13", - "react/http": ">=0.7,<1.9", - "really-simple-plugins/complianz-gdpr": "<6.4.2", - "remdex/livehelperchat": "<3.99", - "reportico-web/reportico": "<=7.1.21", - "rhukster/dom-sanitizer": "<1.0.7", - "rmccue/requests": ">=1.6,<1.8", - "robrichards/xmlseclibs": ">=1,<3.0.4", - "roots/soil": "<4.1", - "rudloff/alltube": "<3.0.3", - "s-cart/core": "<6.9", - "s-cart/s-cart": "<6.9", - "sabberworm/php-css-parser": ">=1,<1.0.1|>=2,<2.0.1|>=3,<3.0.1|>=4,<4.0.1|>=5,<5.0.9|>=5.1,<5.1.3|>=5.2,<5.2.1|>=6,<6.0.2|>=7,<7.0.4|>=8,<8.0.1|>=8.1,<8.1.1|>=8.2,<8.2.1|>=8.3,<8.3.1", - "sabre/dav": ">=1.6,<1.7.11|>=1.8,<1.8.9", - "scheb/two-factor-bundle": "<3.26|>=4,<4.11", - "sensiolabs/connect": "<4.2.3", - "serluck/phpwhois": "<=4.2.6", - "sfroemken/url_redirect": "<=1.2.1", - "sheng/yiicms": "<=1.2", - "shopware/core": "<=6.5.7.3", - "shopware/platform": "<=6.5.7.3", - "shopware/production": "<=6.3.5.2", - "shopware/shopware": "<=5.7.17", - "shopware/storefront": "<=6.4.8.1", - "shopxo/shopxo": "<2.2.6", - "showdoc/showdoc": "<2.10.4", - "silverstripe-australia/advancedreports": ">=1,<=2", - "silverstripe/admin": "<1.13.19|>=2,<2.1.8", - "silverstripe/assets": ">=1,<1.11.1", - "silverstripe/cms": "<4.11.3", - "silverstripe/comments": ">=1.3,<1.9.99|>=2,<2.9.99|>=3,<3.1.1", - "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3", - "silverstripe/framework": "<4.13.39|>=5,<5.1.11", - "silverstripe/graphql": ">=2,<2.0.5|>=3,<3.8.2|>=4,<4.3.7|>=5,<5.1.3", - "silverstripe/hybridsessions": ">=1,<2.4.1|>=2.5,<2.5.1", - "silverstripe/recipe-cms": ">=4.5,<4.5.3", - "silverstripe/registry": ">=2.1,<2.1.2|>=2.2,<2.2.1", - "silverstripe/restfulserver": ">=1,<1.0.9|>=2,<2.0.4", - "silverstripe/silverstripe-omnipay": "<2.5.2|>=3,<3.0.2|>=3.1,<3.1.4|>=3.2,<3.2.1", - "silverstripe/subsites": ">=2,<2.6.1", - "silverstripe/taxonomy": ">=1.3,<1.3.1|>=2,<2.0.1", - "silverstripe/userforms": "<3", - "silverstripe/versioned-admin": ">=1,<1.11.1", - "simple-updates/phpwhois": "<=1", - "simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4|==5.0.0.0-alpha12", - "simplesamlphp/simplesamlphp": "<1.18.6", - "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", - "simplesamlphp/simplesamlphp-module-openid": "<1", - "simplesamlphp/simplesamlphp-module-openidprovider": "<0.9", - "simplesamlphp/xml-security": "==1.6.11", - "simplito/elliptic-php": "<1.0.6", - "sitegeist/fluid-components": "<3.5", - "sjbr/sr-freecap": "<2.4.6|>=2.5,<2.5.3", - "slim/psr7": "<1.4.1|>=1.5,<1.5.1|>=1.6,<1.6.1", - "slim/slim": "<2.6", - "slub/slub-events": "<3.0.3", - "smarty/smarty": "<3.1.48|>=4,<4.3.1", - "snipe/snipe-it": "<=6.2.2", - "socalnick/scn-social-auth": "<1.15.2", - "socialiteproviders/steam": "<1.1", - "spatie/browsershot": "<3.57.4", - "spipu/html2pdf": "<5.2.8", - "spoon/library": "<1.4.1", - "spoonity/tcpdf": "<6.2.22", - "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1", - "ssddanbrown/bookstack": "<22.02.3", - "statamic/cms": "<4.46", - "stormpath/sdk": "<9.9.99", - "studio-42/elfinder": "<2.1.62", - "subhh/libconnect": "<7.0.8|>=8,<8.1", - "sukohi/surpass": "<1", - "sulu/sulu": "<1.6.44|>=2,<2.4.16|>=2.5,<2.5.12", - "sumocoders/framework-user-bundle": "<1.4", - "superbig/craft-audit": "<3.0.2", - "swag/paypal": "<5.4.4", - "swiftmailer/swiftmailer": ">=4,<5.4.5", - "swiftyedit/swiftyedit": "<1.2", - "sylius/admin-bundle": ">=1,<1.0.17|>=1.1,<1.1.9|>=1.2,<1.2.2", - "sylius/grid": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1", - "sylius/grid-bundle": "<1.10.1", - "sylius/paypal-plugin": ">=1,<1.2.4|>=1.3,<1.3.1", - "sylius/resource-bundle": ">=1,<1.3.14|>=1.4,<1.4.7|>=1.5,<1.5.2|>=1.6,<1.6.4", - "sylius/sylius": "<1.9.10|>=1.10,<1.10.11|>=1.11,<1.11.2", - "symbiote/silverstripe-multivaluefield": ">=3,<3.0.99", - "symbiote/silverstripe-queuedjobs": ">=3,<3.0.2|>=3.1,<3.1.4|>=4,<4.0.7|>=4.1,<4.1.2|>=4.2,<4.2.4|>=4.3,<4.3.3|>=4.4,<4.4.3|>=4.5,<4.5.1|>=4.6,<4.6.4", - "symbiote/silverstripe-seed": "<6.0.3", - "symbiote/silverstripe-versionedfiles": "<=2.0.3", - "symfont/process": ">=0", - "symfony/cache": ">=3.1,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8", - "symfony/dependency-injection": ">=2,<2.0.17|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", - "symfony/error-handler": ">=4.4,<4.4.4|>=5,<5.0.4", - "symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1", - "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7|>=5.3.14,<=5.3.14|>=5.4.3,<=5.4.3|>=6.0.3,<=6.0.3", - "symfony/http-foundation": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7", - "symfony/http-kernel": ">=2,<4.4.50|>=5,<5.4.20|>=6,<6.0.20|>=6.1,<6.1.12|>=6.2,<6.2.6", - "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", - "symfony/maker-bundle": ">=1.27,<1.29.2|>=1.30,<1.31.1", - "symfony/mime": ">=4.3,<4.3.8", - "symfony/phpunit-bridge": ">=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", - "symfony/polyfill": ">=1,<1.10", - "symfony/polyfill-php55": ">=1,<1.10", - "symfony/proxy-manager-bridge": ">=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", - "symfony/routing": ">=2,<2.0.19", - "symfony/security": ">=2,<2.7.51|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.8", - "symfony/security-bundle": ">=2,<4.4.50|>=5,<5.4.20|>=6,<6.0.20|>=6.1,<6.1.12|>=6.2,<6.2.6", - "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.9", - "symfony/security-csrf": ">=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", - "symfony/security-guard": ">=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8", - "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7|>=5.1,<5.2.8|>=5.3,<5.3.2|>=5.4,<5.4.31|>=6,<6.3.8", - "symfony/serializer": ">=2,<2.0.11|>=4.1,<4.4.35|>=5,<5.3.12", - "symfony/symfony": ">=2,<4.4.51|>=5,<5.4.31|>=6,<6.3.8", - "symfony/translation": ">=2,<2.0.17", - "symfony/twig-bridge": ">=2,<4.4.51|>=5,<5.4.31|>=6,<6.3.8", - "symfony/ux-autocomplete": "<2.11.2", - "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3", - "symfony/var-exporter": ">=4.2,<4.2.12|>=4.3,<4.3.8", - "symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4", - "symfony/webhook": ">=6.3,<6.3.8", - "symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7|>=2.2.0.0-beta1,<2.2.0.0-beta2", - "symphonycms/symphony-2": "<2.6.4", - "t3/dce": "<0.11.5|>=2.2,<2.6.2", - "t3g/svg-sanitizer": "<1.0.3", - "t3s/content-consent": "<1.0.3|>=2,<2.0.2", - "tastyigniter/tastyigniter": "<3.3", - "tcg/voyager": "<=1.4", - "tecnickcom/tcpdf": "<6.2.22", - "terminal42/contao-tablelookupwizard": "<3.3.5", - "thelia/backoffice-default-template": ">=2.1,<2.1.2", - "thelia/thelia": ">=2.1,<2.1.3", - "theonedemon/phpwhois": "<=4.2.5", - "thinkcmf/thinkcmf": "<=5.1.7", - "thorsten/phpmyfaq": "<3.2.2", - "tikiwiki/tiki-manager": "<=17.1", - "tinymce/tinymce": "<5.10.9|>=6,<6.7.3", - "tinymighty/wiki-seo": "<1.2.2", - "titon/framework": "<9.9.99", - "tobiasbg/tablepress": "<=2.0.0.0-RC1", - "topthink/framework": "<6.0.14", - "topthink/think": "<=6.1.1", - "topthink/thinkphp": "<=3.2.3", - "tpwd/ke_search": "<4.0.3|>=4.1,<4.6.6|>=5,<5.0.2", - "tribalsystems/zenario": "<=9.4.59197", - "truckersmp/phpwhois": "<=4.3.1", - "ttskch/pagination-service-provider": "<1", - "twig/twig": "<1.44.7|>=2,<2.15.3|>=3,<3.4.3", - "typo3/cms": "<9.5.29|>=10,<10.4.35|>=11,<11.5.23|>=12,<12.2", - "typo3/cms-backend": "<4.1.14|>=4.2,<4.2.15|>=4.3,<4.3.7|>=4.4,<4.4.4|>=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1", - "typo3/cms-core": "<=8.7.56|>=9,<=9.5.45|>=10,<=10.4.42|>=11,<=11.5.34|>=12,<=12.4.10|==13", - "typo3/cms-extbase": "<6.2.24|>=7,<7.6.8|==8.1.1", - "typo3/cms-fluid": "<4.3.4|>=4.4,<4.4.1", - "typo3/cms-form": ">=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1", - "typo3/cms-frontend": "<4.3.9|>=4.4,<4.4.5", - "typo3/cms-install": "<4.1.14|>=4.2,<4.2.16|>=4.3,<4.3.9|>=4.4,<4.4.5|>=12.2,<12.4.8", - "typo3/cms-rte-ckeditor": ">=9.5,<9.5.42|>=10,<10.4.39|>=11,<11.5.30", - "typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6", - "typo3/html-sanitizer": ">=1,<=1.5.2|>=2,<=2.1.3", - "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.3.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<3.3.23|>=4,<4.0.17|>=4.1,<4.1.16|>=4.2,<4.2.12|>=4.3,<4.3.3", - "typo3/phar-stream-wrapper": ">=1,<2.1.1|>=3,<3.1.1", - "typo3/swiftmailer": ">=4.1,<4.1.99|>=5.4,<5.4.5", - "typo3fluid/fluid": ">=2,<2.0.8|>=2.1,<2.1.7|>=2.2,<2.2.4|>=2.3,<2.3.7|>=2.4,<2.4.4|>=2.5,<2.5.11|>=2.6,<2.6.10", - "ua-parser/uap-php": "<3.8", - "uasoft-indonesia/badaso": "<=2.9.7", - "unisharp/laravel-filemanager": "<2.6.4", - "userfrosting/userfrosting": ">=0.3.1,<4.6.3", - "usmanhalalit/pixie": "<1.0.3|>=2,<2.0.2", - "uvdesk/community-skeleton": "<=1.1.1", - "vanilla/safecurl": "<0.9.2", - "verot/class.upload.php": "<=2.1.6", - "vova07/yii2-fileapi-widget": "<0.1.9", - "vrana/adminer": "<4.8.1", - "waldhacker/hcaptcha": "<2.1.2", - "wallabag/tcpdf": "<6.2.22", - "wallabag/wallabag": "<2.6.7", - "wanglelecc/laracms": "<=1.0.3", - "web-auth/webauthn-framework": ">=3.3,<3.3.4", - "webbuilders-group/silverstripe-kapost-bridge": "<0.4", - "webcoast/deferred-image-processing": "<1.0.2", - "webklex/laravel-imap": "<5.3", - "webklex/php-imap": "<5.3", - "webpa/webpa": "<3.1.2", - "wikibase/wikibase": "<=1.39.3", - "wikimedia/parsoid": "<0.12.2", - "willdurand/js-translation-bundle": "<2.1.1", - "winter/wn-backend-module": "<1.2.4", - "winter/wn-system-module": "<1.2.4", - "wintercms/winter": "<1.2.3", - "woocommerce/woocommerce": "<6.6", - "wp-cli/wp-cli": ">=0.12,<2.5", - "wp-graphql/wp-graphql": "<=1.14.5", - "wpanel/wpanel4-cms": "<=4.3.1", - "wpcloud/wp-stateless": "<3.2", - "wwbn/avideo": "<=12.4", - "xataface/xataface": "<3", - "xpressengine/xpressengine": "<3.0.15", - "yeswiki/yeswiki": "<4.1", - "yetiforce/yetiforce-crm": "<=6.4", - "yidashi/yii2cmf": "<=2", - "yii2mod/yii2-cms": "<1.9.2", - "yiisoft/yii": "<1.1.29", - "yiisoft/yii2": "<2.0.38", - "yiisoft/yii2-authclient": "<2.2.15", - "yiisoft/yii2-bootstrap": "<2.0.4", - "yiisoft/yii2-dev": "<2.0.43", - "yiisoft/yii2-elasticsearch": "<2.0.5", - "yiisoft/yii2-gii": "<=2.2.4", - "yiisoft/yii2-jui": "<2.0.4", - "yiisoft/yii2-redis": "<2.0.8", - "yikesinc/yikes-inc-easy-mailchimp-extender": "<6.8.6", - "yoast-seo-for-typo3/yoast_seo": "<7.2.3", - "yourls/yourls": "<=1.8.2", - "yuan1994/tpadmin": "<=1.3.12", - "zencart/zencart": "<=1.5.7.0-beta", - "zendesk/zendesk_api_client_php": "<2.2.11", - "zendframework/zend-cache": ">=2.4,<2.4.8|>=2.5,<2.5.3", - "zendframework/zend-captcha": ">=2,<2.4.9|>=2.5,<2.5.2", - "zendframework/zend-crypt": ">=2,<2.4.9|>=2.5,<2.5.2", - "zendframework/zend-db": "<2.2.10|>=2.3,<2.3.5", - "zendframework/zend-developer-tools": ">=1.2.2,<1.2.3", - "zendframework/zend-diactoros": "<1.8.4", - "zendframework/zend-feed": "<2.10.3", - "zendframework/zend-form": ">=2,<2.2.7|>=2.3,<2.3.1", - "zendframework/zend-http": "<2.8.1", - "zendframework/zend-json": ">=2.1,<2.1.6|>=2.2,<2.2.6", - "zendframework/zend-ldap": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.8|>=2.3,<2.3.3", - "zendframework/zend-mail": ">=2,<2.4.11|>=2.5,<2.7.2", - "zendframework/zend-navigation": ">=2,<2.2.7|>=2.3,<2.3.1", - "zendframework/zend-session": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.9|>=2.3,<2.3.4", - "zendframework/zend-validator": ">=2.3,<2.3.6", - "zendframework/zend-view": ">=2,<2.2.7|>=2.3,<2.3.1", - "zendframework/zend-xmlrpc": ">=2.1,<2.1.6|>=2.2,<2.2.6", - "zendframework/zendframework": "<=3", - "zendframework/zendframework1": "<1.12.20", - "zendframework/zendopenid": "<2.0.2", - "zendframework/zendrest": "<2.0.2", - "zendframework/zendservice-amazon": "<2.0.3", - "zendframework/zendservice-api": "<1", - "zendframework/zendservice-audioscrobbler": "<2.0.2", - "zendframework/zendservice-nirvanix": "<2.0.2", - "zendframework/zendservice-slideshare": "<2.0.2", - "zendframework/zendservice-technorati": "<2.0.2", - "zendframework/zendservice-windowsazure": "<2.0.2", - "zendframework/zendxml": ">=1,<1.0.1", - "zenstruck/collection": "<0.2.1", - "zetacomponents/mail": "<1.8.2", - "zf-commons/zfc-user": "<1.2.2", - "zfcampus/zf-apigility-doctrine": ">=1,<1.0.3", - "zfr/zfr-oauth2-server-module": "<0.1.2", - "zoujingli/thinkadmin": "<=6.1.53" - }, - "type": "metapackage", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "role": "maintainer" - }, - { - "name": "Ilya Tribusean", - "email": "slash3b@gmail.com", - "role": "maintainer" - } - ], - "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "keywords": [ - "dev" - ], - "support": { - "issues": "https://github.com/Roave/SecurityAdvisories/issues", - "source": "https://github.com/Roave/SecurityAdvisories/tree/latest" - }, - "funding": [ - { - "url": "https://github.com/Ocramius", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/roave/security-advisories", - "type": "tidelift" - } - ], - "time": "2024-02-19T06:05:04+00:00" - }, - { - "name": "scssphp/scssphp", - "version": "v1.11.1", - "source": { - "type": "git", - "url": "https://github.com/scssphp/scssphp.git", - "reference": "ace2503684bab0dcc817d7614c8a54b865122414" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/scssphp/scssphp/zipball/ace2503684bab0dcc817d7614c8a54b865122414", - "reference": "ace2503684bab0dcc817d7614c8a54b865122414", - "shasum": "" - }, - "require": { - "ext-ctype": "*", - "ext-json": "*", - "php": ">=5.6.0" - }, - "require-dev": { - "bamarni/composer-bin-plugin": "^1.4", - "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3 || ^9.4", - "sass/sass-spec": "*", - "squizlabs/php_codesniffer": "~3.5", - "symfony/phpunit-bridge": "^5.1", - "thoughtbot/bourbon": "^7.0", - "twbs/bootstrap": "~5.0", - "twbs/bootstrap4": "4.6.1", - "zurb/foundation": "~6.7.0" - }, - "suggest": { - "ext-iconv": "Can be used as fallback when ext-mbstring is not available", - "ext-mbstring": "For best performance, mbstring should be installed as it is faster than ext-iconv" - }, - "bin": [ - "bin/pscss" - ], - "type": "library", - "extra": { - "bamarni-bin": { - "forward-command": false, - "bin-links": false - } - }, - "autoload": { - "psr-4": { - "ScssPhp\\ScssPhp\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Anthon Pang", - "email": "apang@softwaredevelopment.ca", - "homepage": "https://github.com/robocoder" - }, - { - "name": "Cédric Morin", - "email": "cedric@yterium.com", - "homepage": "https://github.com/Cerdic" - } - ], - "description": "scssphp is a compiler for SCSS written in PHP.", - "homepage": "http://scssphp.github.io/scssphp/", - "keywords": [ - "css", - "less", - "sass", - "scss", - "stylesheet" - ], - "support": { - "issues": "https://github.com/scssphp/scssphp/issues", - "source": "https://github.com/scssphp/scssphp/tree/v1.11.1" - }, - "time": "2023-09-24T13:38:17+00:00" - }, - { - "name": "sebastian/cli-parser", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library for parsing CLI options", - "homepage": "https://github.com/sebastianbergmann/cli-parser", - "support": { - "issues": "https://github.com/sebastianbergmann/cli-parser/issues", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-09-28T06:08:49+00:00" - }, - { - "name": "sebastian/code-unit", - "version": "1.0.8", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit.git", - "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120", - "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Collection of value objects that represent the PHP code units", - "homepage": "https://github.com/sebastianbergmann/code-unit", - "support": { - "issues": "https://github.com/sebastianbergmann/code-unit/issues", - "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-10-26T13:08:54+00:00" - }, - { - "name": "sebastian/code-unit-reverse-lookup", - "version": "2.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", - "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Looks up which function or method a line of code belongs to", - "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "support": { - "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-09-28T05:30:19+00:00" - }, - { - "name": "sebastian/comparator", - "version": "4.0.8", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "fa0f136dd2334583309d32b62544682ee972b51a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", - "reference": "fa0f136dd2334583309d32b62544682ee972b51a", - "shasum": "" - }, - "require": { - "php": ">=7.3", - "sebastian/diff": "^4.0", - "sebastian/exporter": "^4.0" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" - } - ], - "description": "Provides the functionality to compare PHP values for equality", - "homepage": "https://github.com/sebastianbergmann/comparator", - "keywords": [ - "comparator", - "compare", - "equality" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2022-09-14T12:41:17+00:00" - }, - { - "name": "sebastian/complexity", - "version": "2.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a", - "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a", - "shasum": "" - }, - "require": { - "nikic/php-parser": "^4.18 || ^5.0", - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library for calculating the complexity of PHP code units", - "homepage": "https://github.com/sebastianbergmann/complexity", - "support": { - "issues": "https://github.com/sebastianbergmann/complexity/issues", - "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-12-22T06:19:30+00:00" - }, - { - "name": "sebastian/diff", - "version": "4.0.5", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", - "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3", - "symfony/process": "^4.2 || ^5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - } - ], - "description": "Diff implementation", - "homepage": "https://github.com/sebastianbergmann/diff", - "keywords": [ - "diff", - "udiff", - "unidiff", - "unified diff" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-05-07T05:35:17+00:00" - }, - { - "name": "sebastian/environment", - "version": "5.1.5", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", - "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "suggest": { - "ext-posix": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.1-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides functionality to handle HHVM/PHP environments", - "homepage": "http://www.github.com/sebastianbergmann/environment", - "keywords": [ - "Xdebug", - "environment", - "hhvm" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-02-03T06:03:51+00:00" - }, - { - "name": "sebastian/exporter", - "version": "4.0.5", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", - "shasum": "" - }, - "require": { - "php": ">=7.3", - "sebastian/recursion-context": "^4.0" - }, - "require-dev": { - "ext-mbstring": "*", - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Provides the functionality to export PHP variables for visualization", - "homepage": "https://www.github.com/sebastianbergmann/exporter", - "keywords": [ - "export", - "exporter" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2022-09-14T06:03:37+00:00" - }, - { - "name": "sebastian/global-state", - "version": "5.0.6", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bde739e7565280bda77be70044ac1047bc007e34" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", - "reference": "bde739e7565280bda77be70044ac1047bc007e34", - "shasum": "" - }, - "require": { - "php": ">=7.3", - "sebastian/object-reflector": "^2.0", - "sebastian/recursion-context": "^4.0" - }, - "require-dev": { - "ext-dom": "*", - "phpunit/phpunit": "^9.3" - }, - "suggest": { - "ext-uopz": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Snapshotting of global state", - "homepage": "http://www.github.com/sebastianbergmann/global-state", - "keywords": [ - "global state" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-08-02T09:26:13+00:00" - }, - { - "name": "sebastian/lines-of-code", - "version": "1.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5", - "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5", - "shasum": "" - }, - "require": { - "nikic/php-parser": "^4.18 || ^5.0", - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library for counting the lines of code in PHP source code", - "homepage": "https://github.com/sebastianbergmann/lines-of-code", - "support": { - "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-12-22T06:20:34+00:00" - }, - { - "name": "sebastian/object-enumerator", - "version": "4.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "5c9eeac41b290a3712d88851518825ad78f45c71" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71", - "reference": "5c9eeac41b290a3712d88851518825ad78f45c71", - "shasum": "" - }, - "require": { - "php": ">=7.3", - "sebastian/object-reflector": "^2.0", - "sebastian/recursion-context": "^4.0" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Traverses array structures and object graphs to enumerate all referenced objects", - "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "support": { - "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-10-26T13:12:34+00:00" - }, - { - "name": "sebastian/object-reflector", - "version": "2.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", - "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Allows reflection of object attributes, including inherited and non-public ones", - "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "support": { - "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-10-26T13:14:26+00:00" - }, - { - "name": "sebastian/recursion-context", - "version": "4.0.5", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", - "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" - } - ], - "description": "Provides functionality to recursively process PHP variables", - "homepage": "https://github.com/sebastianbergmann/recursion-context", - "support": { - "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-02-03T06:07:39+00:00" - }, - { - "name": "sebastian/resource-operations", - "version": "3.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides a list of PHP built-in functions that operate on resources", - "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-09-28T06:45:17+00:00" - }, - { - "name": "sebastian/type", - "version": "3.2.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/type.git", - "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", - "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Collection of value objects that represent the types of the PHP type system", - "homepage": "https://github.com/sebastianbergmann/type", - "support": { - "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.2.1" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-02-03T06:13:03+00:00" - }, - { - "name": "siad007/versioncontrol_hg", - "version": "v1.0.3", - "source": { - "type": "git", - "url": "https://github.com/siad007/versioncontrol_hg.git", - "reference": "bdeb5515f14a6ccd1abdc69e8d0c9e8e0bb75ec3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/siad007/versioncontrol_hg/zipball/bdeb5515f14a6ccd1abdc69e8d0c9e8e0bb75ec3", - "reference": "bdeb5515f14a6ccd1abdc69e8d0c9e8e0bb75ec3", - "shasum": "" - }, - "require": { - "php": ">=5.4" - }, - "require-dev": { - "codeclimate/php-test-reporter": "dev-master", - "mehr-als-nix/assumptions": "~1", - "phpunit/phpunit": "~4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Siad007\\VersionControl\\HG\\": "src", - "Siad007\\VersionControl\\HG\\Tests\\": "tests" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Siad Ardroumli", - "email": "siad.ardroumli@gmail.com", - "role": "Lead" - } - ], - "description": "VersionControl_HG is a library that provides an OO interface to handle Mercurial repositories.", - "support": { - "issues": "https://github.com/siad007/versioncontrol_hg/issues", - "source": "https://github.com/siad007/versioncontrol_hg/tree/v1.0.3" - }, - "time": "2021-01-22T20:43:06+00:00" - }, - { - "name": "smarty/smarty", - "version": "v3.1.48", - "source": { - "type": "git", - "url": "https://github.com/smarty-php/smarty.git", - "reference": "2fc443806cdcaee4441be4d0bb09f8fa56a17f2c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/smarty-php/smarty/zipball/2fc443806cdcaee4441be4d0bb09f8fa56a17f2c", - "reference": "2fc443806cdcaee4441be4d0bb09f8fa56a17f2c", - "shasum": "" - }, - "require": { - "php": "^5.2 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^7.5 || ^6.5 || ^5.7 || ^4.8", - "smarty/smarty-lexer": "^3.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1.x-dev" - } - }, - "autoload": { - "classmap": [ - "libs/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL-3.0" - ], - "authors": [ - { - "name": "Monte Ohrt", - "email": "monte@ohrt.com" - }, - { - "name": "Uwe Tews", - "email": "uwe.tews@googlemail.com" - }, - { - "name": "Rodney Rehm", - "email": "rodney.rehm@medialize.de" - } - ], - "description": "Smarty - the compiling PHP template engine", - "homepage": "http://www.smarty.net", - "keywords": [ - "templating" - ], - "support": { - "forum": "http://www.smarty.net/forums/", - "irc": "irc://irc.freenode.org/smarty", - "issues": "https://github.com/smarty-php/smarty/issues", - "source": "https://github.com/smarty-php/smarty/tree/v3.1.48" - }, - "time": "2023-03-28T19:45:54+00:00" - }, - { - "name": "squizlabs/php_codesniffer", - "version": "3.9.0", - "source": { - "type": "git", - "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b", - "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b", - "shasum": "" - }, - "require": { - "ext-simplexml": "*", - "ext-tokenizer": "*", - "ext-xmlwriter": "*", - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" - }, - "bin": [ - "bin/phpcbf", - "bin/phpcs" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Greg Sherwood", - "role": "Former lead" - }, - { - "name": "Juliette Reinders Folmer", - "role": "Current lead" - }, - { - "name": "Contributors", - "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" - } - ], - "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", - "keywords": [ - "phpcs", - "standards", - "static analysis" - ], - "support": { - "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", - "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", - "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", - "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" - }, - "funding": [ - { - "url": "https://github.com/PHPCSStandards", - "type": "github" - }, - { - "url": "https://github.com/jrfnl", - "type": "github" - }, - { - "url": "https://opencollective.com/php_codesniffer", - "type": "open_collective" - } - ], - "time": "2024-02-16T15:06:51+00:00" - }, - { - "name": "symfony/config", - "version": "v5.4.35", - "source": { - "type": "git", - "url": "https://github.com/symfony/config.git", - "reference": "6b763438a22a4f20885e994ad6702f6a3f25430e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/6b763438a22a4f20885e994ad6702f6a3f25430e", - "reference": "6b763438a22a4f20885e994ad6702f6a3f25430e", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/filesystem": "^4.4|^5.0|^6.0", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-php80": "^1.16", - "symfony/polyfill-php81": "^1.22" - }, - "conflict": { - "symfony/finder": "<4.4" - }, - "require-dev": { - "symfony/event-dispatcher": "^4.4|^5.0|^6.0", - "symfony/finder": "^4.4|^5.0|^6.0", - "symfony/messenger": "^4.4|^5.0|^6.0", - "symfony/service-contracts": "^1.1|^2|^3", - "symfony/yaml": "^4.4|^5.0|^6.0" - }, - "suggest": { - "symfony/yaml": "To use the yaml reference dumper" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Config\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/config/tree/v5.4.35" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-23T13:51:25+00:00" - }, - { - "name": "symfony/dependency-injection", - "version": "v5.4.35", - "source": { - "type": "git", - "url": "https://github.com/symfony/dependency-injection.git", - "reference": "45474d527212ca67cdb93f6c5e6da68f4bc67118" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/45474d527212ca67cdb93f6c5e6da68f4bc67118", - "reference": "45474d527212ca67cdb93f6c5e6da68f4bc67118", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "psr/container": "^1.1.1", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-php80": "^1.16", - "symfony/polyfill-php81": "^1.22", - "symfony/service-contracts": "^1.1.6|^2" - }, - "conflict": { - "ext-psr": "<1.1|>=2", - "symfony/config": "<5.3", - "symfony/finder": "<4.4", - "symfony/proxy-manager-bridge": "<4.4", - "symfony/yaml": "<4.4.26" - }, - "provide": { - "psr/container-implementation": "1.0", - "symfony/service-implementation": "1.0|2.0" - }, - "require-dev": { - "symfony/config": "^5.3|^6.0", - "symfony/expression-language": "^4.4|^5.0|^6.0", - "symfony/yaml": "^4.4.26|^5.0|^6.0" - }, - "suggest": { - "symfony/config": "", - "symfony/expression-language": "For using expressions in service container configuration", - "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required", - "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", - "symfony/yaml": "" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\DependencyInjection\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Allows you to standardize and centralize the way objects are constructed in your application", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v5.4.35" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-29T20:37:36+00:00" - }, - { - "name": "symfony/event-dispatcher", - "version": "v5.4.35", - "source": { - "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "7a69a85c7ea5bdd1e875806a99c51a87d3a74b38" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7a69a85c7ea5bdd1e875806a99c51a87d3a74b38", - "reference": "7a69a85c7ea5bdd1e875806a99c51a87d3a74b38", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/event-dispatcher-contracts": "^2|^3", - "symfony/polyfill-php80": "^1.16" - }, - "conflict": { - "symfony/dependency-injection": "<4.4" - }, - "provide": { - "psr/event-dispatcher-implementation": "1.0", - "symfony/event-dispatcher-implementation": "2.0" - }, - "require-dev": { - "psr/log": "^1|^2|^3", - "symfony/config": "^4.4|^5.0|^6.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/error-handler": "^4.4|^5.0|^6.0", - "symfony/expression-language": "^4.4|^5.0|^6.0", - "symfony/http-foundation": "^4.4|^5.0|^6.0", - "symfony/service-contracts": "^1.1|^2|^3", - "symfony/stopwatch": "^4.4|^5.0|^6.0" - }, - "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\EventDispatcher\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.35" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-23T13:51:25+00:00" - }, - { - "name": "symfony/event-dispatcher-contracts", - "version": "v2.5.2", - "source": { - "type": "git", - "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1", - "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "psr/event-dispatcher": "^1" - }, - "suggest": { - "symfony/event-dispatcher-implementation": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "2.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Contracts\\EventDispatcher\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Generic abstractions related to dispatching event", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], - "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-01-02T09:53:40+00:00" - }, - { - "name": "symfony/filesystem", - "version": "v5.4.35", - "source": { - "type": "git", - "url": "https://github.com/symfony/filesystem.git", - "reference": "5a553607d4ffbfa9c0ab62facadea296c9db7086" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/5a553607d4ffbfa9c0ab62facadea296c9db7086", - "reference": "5a553607d4ffbfa9c0ab62facadea296c9db7086", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.8", - "symfony/polyfill-php80": "^1.16" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Filesystem\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides basic utilities for the filesystem", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.35" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-23T13:51:25+00:00" - }, - { - "name": "symfony/finder", - "version": "v5.4.35", - "source": { - "type": "git", - "url": "https://github.com/symfony/finder.git", - "reference": "abe6d6f77d9465fed3cd2d029b29d03b56b56435" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/abe6d6f77d9465fed3cd2d029b29d03b56b56435", - "reference": "abe6d6f77d9465fed3cd2d029b29d03b56b56435", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-php80": "^1.16" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Finder\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Finds files and directories via an intuitive fluent interface", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.35" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-23T13:51:25+00:00" - }, - { - "name": "symfony/options-resolver", - "version": "v5.4.21", - "source": { - "type": "git", - "url": "https://github.com/symfony/options-resolver.git", - "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", - "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-php73": "~1.0", - "symfony/polyfill-php80": "^1.16" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\OptionsResolver\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides an improved replacement for the array_replace PHP function", - "homepage": "https://symfony.com", - "keywords": [ - "config", - "configuration", - "options" - ], - "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.4.21" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-02-14T08:03:56+00:00" - }, - { - "name": "symfony/polyfill-php81", - "version": "v1.29.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d", - "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php81\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-29T20:11:03+00:00" - }, - { - "name": "symfony/process", - "version": "v5.4.35", - "source": { - "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "cbc28e34015ad50166fc2f9c8962d28d0fe861eb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/cbc28e34015ad50166fc2f9c8962d28d0fe861eb", - "reference": "cbc28e34015ad50166fc2f9c8962d28d0fe861eb", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "symfony/polyfill-php80": "^1.16" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Process\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Executes commands in sub-processes", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/process/tree/v5.4.35" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-23T13:51:25+00:00" - }, - { - "name": "symfony/stopwatch", - "version": "v5.4.35", - "source": { - "type": "git", - "url": "https://github.com/symfony/stopwatch.git", - "reference": "887762aa99ff16f65dc8b48aafead415f942d407" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/887762aa99ff16f65dc8b48aafead415f942d407", - "reference": "887762aa99ff16f65dc8b48aafead415f942d407", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "symfony/service-contracts": "^1|^2|^3" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Stopwatch\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides a way to profile code", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.4.35" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-23T13:51:25+00:00" - }, - { - "name": "symplify/monorepo-builder", - "version": "11.2.20", - "source": { - "type": "git", - "url": "https://github.com/symplify/monorepo-builder.git", - "reference": "444efe08701776cb1a03b9f3600e715697519aa6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symplify/monorepo-builder/zipball/444efe08701776cb1a03b9f3600e715697519aa6", - "reference": "444efe08701776cb1a03b9f3600e715697519aa6", - "shasum": "" - }, - "require": { - "php": ">=7.2" - }, - "bin": [ - "bin/monorepo-builder" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "10.3-dev" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Prefixed version of Not only Composer tools to build a Monorepo.", - "support": { - "issues": "https://github.com/symplify/monorepo-builder/issues", - "source": "https://github.com/symplify/monorepo-builder/tree/11.2.20" - }, - "funding": [ - { - "url": "https://www.paypal.me/rectorphp", - "type": "custom" - }, - { - "url": "https://github.com/tomasvotruba", - "type": "github" - } - ], - "time": "2023-11-17T08:30:16+00:00" - }, - { - "name": "tedivm/jshrink", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/tedious/JShrink.git", - "reference": "7a35f5a4651ca2ce77295eb8a3b4e133ba47e19e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/tedious/JShrink/zipball/7a35f5a4651ca2ce77295eb8a3b4e133ba47e19e", - "reference": "7a35f5a4651ca2ce77295eb8a3b4e133ba47e19e", - "shasum": "" - }, - "require": { - "php": "^7.0|^8.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^3.14", - "php-coveralls/php-coveralls": "^2.5.0", - "phpunit/phpunit": "^9|^10" - }, - "type": "library", - "autoload": { - "psr-0": { - "JShrink": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Robert Hafner", - "email": "tedivm@tedivm.com" - } - ], - "description": "Javascript Minifier built in PHP", - "homepage": "http://github.com/tedious/JShrink", - "keywords": [ - "javascript", - "minifier" - ], - "support": { - "issues": "https://github.com/tedious/JShrink/issues", - "source": "https://github.com/tedious/JShrink/tree/v1.7.0" - }, - "funding": [ - { - "url": "https://github.com/tedivm", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/tedivm/jshrink", - "type": "tidelift" - } - ], - "time": "2023-10-04T17:23:23+00:00" - }, - { - "name": "theseer/tokenizer", - "version": "1.2.2", - "source": { - "type": "git", - "url": "https://github.com/theseer/tokenizer.git", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-tokenizer": "*", - "ext-xmlwriter": "*", - "php": "^7.2 || ^8.0" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - } - ], - "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "support": { - "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.2" - }, - "funding": [ - { - "url": "https://github.com/theseer", - "type": "github" - } - ], - "time": "2023-11-20T00:12:19+00:00" - } - ], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": { - "mikey179/vfsstream": 20, - "pear/net_ftp": 20, - "pear/net_growl": 20, - "pear/versioncontrol_git": 20, - "phing/phing-composer-configurator": 20, - "roave/security-advisories": 20 - }, - "prefer-stable": true, - "prefer-lowest": false, - "platform": { - "php": ">= 7.4", - "ext-dom": "*", - "ext-json": "*", - "ext-libxml": "*", - "ext-simplexml": "*", - "ext-xml": "*" - }, - "platform-dev": { - "ext-curl": "*", - "ext-iconv": "*", - "ext-openssl": "*", - "ext-pdo_sqlite": "*", - "ext-phar": "*", - "ext-sockets": "*", - "ext-xsl": "*", - "ext-zip": "*" - }, - "platform-overrides": { - "php": "7.4" - }, - "plugin-api-version": "2.6.0" -} diff --git a/pkgs/development/php-packages/phing/default.nix b/pkgs/development/php-packages/phing/default.nix index dfda99220f9b..de9de209f1ba 100644 --- a/pkgs/development/php-packages/phing/default.nix +++ b/pkgs/development/php-packages/phing/default.nix @@ -1,28 +1,26 @@ { lib, - fetchFromGitHub, + fetchgit, php, }: -(php.withExtensions ({ enabled, all }: enabled ++ (with all; [ xsl ]))).buildComposerProject +(php.withExtensions ({ enabled, all }: enabled ++ (with all; [ xsl ]))).buildComposerProject2 (finalAttrs: { pname = "phing"; - version = "3.0.0-rc6"; + version = "3.0.0"; - src = fetchFromGitHub { - owner = "phingofficial"; - repo = "phing"; - rev = finalAttrs.version; - hash = "sha256-pOt6uQaz69WuHKYZhq6FFbjyHGrEc+Bf0Sw9uCS3Nrc="; + # Upstream no longer provides the composer.lock in their release artifact + src = fetchgit { + url = "https://github.com/phingofficial/phing"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-PEJuEsVl6H4tdqOUvkuazVmyvsRvhBD5AA7EWkMHmFk="; }; - # TODO: Open a PR against https://github.com/phingofficial/phing - # Their `composer.lock` is out of date therefore, we need to provide one - composerLock = ./composer.lock; - vendorHash = "sha256-ueTbbz3FGyRcRvlcJNirHdC77Tko4RKtYMFB3+4JdnQ="; + vendorHash = "sha256-P829cADIJ5Hl5gHXbgTkpWHGF1pCtUKvx1GMrbPLkik="; meta = { description = "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant"; + changelog = "https://github.com/phingofficial/phing/releases/tag/${finalAttrs.version}"; homepage = "https://github.com/phingofficial/phing"; license = lib.licenses.lgpl3; mainProgram = "phing"; diff --git a/pkgs/development/php-packages/php-cs-fixer/composer.lock b/pkgs/development/php-packages/php-cs-fixer/composer.lock index d33ffb2e20a7..8efc933a551d 100644 --- a/pkgs/development/php-packages/php-cs-fixer/composer.lock +++ b/pkgs/development/php-packages/php-cs-fixer/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "787d06b680629dbd19e87f55f7aa69b5", + "content-hash": "be2f5ad8d4924b5a637b10da80386f8e", "packages": [ { "name": "clue/ndjson-react", @@ -72,30 +72,38 @@ }, { "name": "composer/pcre", - "version": "3.1.4", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "04229f163664973f68f38f6f73d917799168ef24" + "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/04229f163664973f68f38f6f73d917799168ef24", - "reference": "04229f163664973f68f38f6f73d917799168ef24", + "url": "https://api.github.com/repos/composer/pcre/zipball/63aaeac21d7e775ff9bc9d45021e1745c97521c4", + "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4", "shasum": "" }, "require": { "php": "^7.4 || ^8.0" }, + "conflict": { + "phpstan/phpstan": "<1.11.10" + }, "require-dev": { - "phpstan/phpstan": "^1.3", + "phpstan/phpstan": "^1.11.10", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^5" + "phpunit/phpunit": "^8 || ^9" }, "type": "library", "extra": { "branch-alias": { "dev-main": "3.x-dev" + }, + "phpstan": { + "includes": [ + "extension.neon" + ] } }, "autoload": { @@ -123,7 +131,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.4" + "source": "https://github.com/composer/pcre/tree/3.3.1" }, "funding": [ { @@ -139,28 +147,28 @@ "type": "tidelift" } ], - "time": "2024-05-27T13:40:54+00:00" + "time": "2024-08-27T18:44:43+00:00" }, { "name": "composer/semver", - "version": "3.4.0", + "version": "3.4.3", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", + "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", "shasum": "" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^1.4", - "symfony/phpunit-bridge": "^4.2 || ^5" + "phpstan/phpstan": "^1.11", + "symfony/phpunit-bridge": "^3 || ^7" }, "type": "library", "extra": { @@ -204,7 +212,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.4.0" + "source": "https://github.com/composer/semver/tree/3.4.3" }, "funding": [ { @@ -220,7 +228,7 @@ "type": "tidelift" } ], - "time": "2023-08-31T09:50:34+00:00" + "time": "2024-09-19T14:15:21+00:00" }, { "name": "composer/xdebug-handler", @@ -337,16 +345,16 @@ }, { "name": "fidry/cpu-core-counter", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42" + "reference": "8520451a140d3f46ac33042715115e290cf5785f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42", - "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f", + "reference": "8520451a140d3f46ac33042715115e290cf5785f", "shasum": "" }, "require": { @@ -386,7 +394,7 @@ ], "support": { "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0" + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0" }, "funding": [ { @@ -394,7 +402,7 @@ "type": "github" } ], - "time": "2024-02-07T09:43:46+00:00" + "time": "2024-08-06T10:04:20+00:00" }, { "name": "psr/container", @@ -702,28 +710,28 @@ }, { "name": "react/dns", - "version": "v1.12.0", + "version": "v1.13.0", "source": { "type": "git", "url": "https://github.com/reactphp/dns.git", - "reference": "c134600642fa615b46b41237ef243daa65bb64ec" + "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/dns/zipball/c134600642fa615b46b41237ef243daa65bb64ec", - "reference": "c134600642fa615b46b41237ef243daa65bb64ec", + "url": "https://api.github.com/repos/reactphp/dns/zipball/eb8ae001b5a455665c89c1df97f6fb682f8fb0f5", + "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5", "shasum": "" }, "require": { "php": ">=5.3.0", "react/cache": "^1.0 || ^0.6 || ^0.5", "react/event-loop": "^1.2", - "react/promise": "^3.0 || ^2.7 || ^1.2.1" + "react/promise": "^3.2 || ^2.7 || ^1.2.1" }, "require-dev": { "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36", - "react/async": "^4 || ^3 || ^2", - "react/promise-timer": "^1.9" + "react/async": "^4.3 || ^3 || ^2", + "react/promise-timer": "^1.11" }, "type": "library", "autoload": { @@ -766,7 +774,7 @@ ], "support": { "issues": "https://github.com/reactphp/dns/issues", - "source": "https://github.com/reactphp/dns/tree/v1.12.0" + "source": "https://github.com/reactphp/dns/tree/v1.13.0" }, "funding": [ { @@ -774,7 +782,7 @@ "type": "open_collective" } ], - "time": "2023-11-29T12:41:06+00:00" + "time": "2024-06-13T14:18:03+00:00" }, { "name": "react/event-loop", @@ -923,31 +931,31 @@ }, { "name": "react/socket", - "version": "v1.15.0", + "version": "v1.16.0", "source": { "type": "git", "url": "https://github.com/reactphp/socket.git", - "reference": "216d3aec0b87f04a40ca04f481e6af01bdd1d038" + "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/socket/zipball/216d3aec0b87f04a40ca04f481e6af01bdd1d038", - "reference": "216d3aec0b87f04a40ca04f481e6af01bdd1d038", + "url": "https://api.github.com/repos/reactphp/socket/zipball/23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1", + "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1", "shasum": "" }, "require": { "evenement/evenement": "^3.0 || ^2.0 || ^1.0", "php": ">=5.3.0", - "react/dns": "^1.11", + "react/dns": "^1.13", "react/event-loop": "^1.2", - "react/promise": "^3 || ^2.6 || ^1.2.1", - "react/stream": "^1.2" + "react/promise": "^3.2 || ^2.6 || ^1.2.1", + "react/stream": "^1.4" }, "require-dev": { "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36", - "react/async": "^4 || ^3 || ^2", + "react/async": "^4.3 || ^3.3 || ^2", "react/promise-stream": "^1.4", - "react/promise-timer": "^1.10" + "react/promise-timer": "^1.11" }, "type": "library", "autoload": { @@ -991,7 +999,7 @@ ], "support": { "issues": "https://github.com/reactphp/socket/issues", - "source": "https://github.com/reactphp/socket/tree/v1.15.0" + "source": "https://github.com/reactphp/socket/tree/v1.16.0" }, "funding": [ { @@ -999,20 +1007,20 @@ "type": "open_collective" } ], - "time": "2023-12-15T11:02:10+00:00" + "time": "2024-07-26T10:38:09+00:00" }, { "name": "react/stream", - "version": "v1.3.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/reactphp/stream.git", - "reference": "6fbc9672905c7d5a885f2da2fc696f65840f4a66" + "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/stream/zipball/6fbc9672905c7d5a885f2da2fc696f65840f4a66", - "reference": "6fbc9672905c7d5a885f2da2fc696f65840f4a66", + "url": "https://api.github.com/repos/reactphp/stream/zipball/1e5b0acb8fe55143b5b426817155190eb6f5b18d", + "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d", "shasum": "" }, "require": { @@ -1022,7 +1030,7 @@ }, "require-dev": { "clue/stream-filter": "~1.2", - "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35" + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36" }, "type": "library", "autoload": { @@ -1069,7 +1077,7 @@ ], "support": { "issues": "https://github.com/reactphp/stream/issues", - "source": "https://github.com/reactphp/stream/tree/v1.3.0" + "source": "https://github.com/reactphp/stream/tree/v1.4.0" }, "funding": [ { @@ -1077,33 +1085,33 @@ "type": "open_collective" } ], - "time": "2023-06-16T10:52:11+00:00" + "time": "2024-06-11T12:45:25+00:00" }, { "name": "sebastian/diff", - "version": "5.1.1", + "version": "6.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e" + "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e", - "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/b4ccd857127db5d41a5b676f24b51371d76d8544", + "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0", - "symfony/process": "^6.4" + "phpunit/phpunit": "^11.0", + "symfony/process": "^4.2 || ^5" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "5.1-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -1136,7 +1144,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", "security": "https://github.com/sebastianbergmann/diff/security/policy", - "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1" + "source": "https://github.com/sebastianbergmann/diff/tree/6.0.2" }, "funding": [ { @@ -1144,51 +1152,50 @@ "type": "github" } ], - "time": "2024-03-02T07:15:17+00:00" + "time": "2024-07-03T04:53:05+00:00" }, { "name": "symfony/console", - "version": "v6.4.8", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "be5854cee0e8c7b110f00d695d11debdfa1a2a91" + "reference": "bb5192af6edc797cbab5c8e8ecfea2fe5f421e57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/be5854cee0e8c7b110f00d695d11debdfa1a2a91", - "reference": "be5854cee0e8c7b110f00d695d11debdfa1a2a91", + "url": "https://api.github.com/repos/symfony/console/zipball/bb5192af6edc797cbab5c8e8ecfea2fe5f421e57", + "reference": "bb5192af6edc797cbab5c8e8ecfea2fe5f421e57", "shasum": "" }, "require": { - "php": ">=8.1", - "symfony/deprecation-contracts": "^2.5|^3", + "php": ">=8.2", "symfony/polyfill-mbstring": "~1.0", "symfony/service-contracts": "^2.5|^3", - "symfony/string": "^5.4|^6.0|^7.0" + "symfony/string": "^6.4|^7.0" }, "conflict": { - "symfony/dependency-injection": "<5.4", - "symfony/dotenv": "<5.4", - "symfony/event-dispatcher": "<5.4", - "symfony/lock": "<5.4", - "symfony/process": "<5.4" + "symfony/dependency-injection": "<6.4", + "symfony/dotenv": "<6.4", + "symfony/event-dispatcher": "<6.4", + "symfony/lock": "<6.4", + "symfony/process": "<6.4" }, "provide": { "psr/log-implementation": "1.0|2.0|3.0" }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0|^7.0", - "symfony/dependency-injection": "^5.4|^6.0|^7.0", - "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/config": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/event-dispatcher": "^6.4|^7.0", "symfony/http-foundation": "^6.4|^7.0", "symfony/http-kernel": "^6.4|^7.0", - "symfony/lock": "^5.4|^6.0|^7.0", - "symfony/messenger": "^5.4|^6.0|^7.0", - "symfony/process": "^5.4|^6.0|^7.0", - "symfony/stopwatch": "^5.4|^6.0|^7.0", - "symfony/var-dumper": "^5.4|^6.0|^7.0" + "symfony/lock": "^6.4|^7.0", + "symfony/messenger": "^6.4|^7.0", + "symfony/process": "^6.4|^7.0", + "symfony/stopwatch": "^6.4|^7.0", + "symfony/var-dumper": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -1222,7 +1229,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.8" + "source": "https://github.com/symfony/console/tree/v7.1.6" }, "funding": [ { @@ -1238,7 +1245,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-10-09T08:46:59+00:00" }, { "name": "symfony/deprecation-contracts", @@ -1309,24 +1316,24 @@ }, { "name": "symfony/event-dispatcher", - "version": "v6.4.8", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "8d7507f02b06e06815e56bb39aa0128e3806208b" + "reference": "87254c78dd50721cfd015b62277a8281c5589702" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8d7507f02b06e06815e56bb39aa0128e3806208b", - "reference": "8d7507f02b06e06815e56bb39aa0128e3806208b", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/87254c78dd50721cfd015b62277a8281c5589702", + "reference": "87254c78dd50721cfd015b62277a8281c5589702", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/event-dispatcher-contracts": "^2.5|^3" }, "conflict": { - "symfony/dependency-injection": "<5.4", + "symfony/dependency-injection": "<6.4", "symfony/service-contracts": "<2.5" }, "provide": { @@ -1335,13 +1342,13 @@ }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0|^7.0", - "symfony/dependency-injection": "^5.4|^6.0|^7.0", - "symfony/error-handler": "^5.4|^6.0|^7.0", - "symfony/expression-language": "^5.4|^6.0|^7.0", - "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/config": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/error-handler": "^6.4|^7.0", + "symfony/expression-language": "^6.4|^7.0", + "symfony/http-foundation": "^6.4|^7.0", "symfony/service-contracts": "^2.5|^3", - "symfony/stopwatch": "^5.4|^6.0|^7.0" + "symfony/stopwatch": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -1369,7 +1376,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.8" + "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.6" }, "funding": [ { @@ -1385,7 +1392,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -1465,25 +1472,25 @@ }, { "name": "symfony/filesystem", - "version": "v6.4.8", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "4d37529150e7081c51b3c5d5718c55a04a9503f3" + "reference": "c835867b3c62bb05c7fe3d637c871c7ae52024d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/4d37529150e7081c51b3c5d5718c55a04a9503f3", - "reference": "4d37529150e7081c51b3c5d5718c55a04a9503f3", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/c835867b3c62bb05c7fe3d637c871c7ae52024d4", + "reference": "c835867b3c62bb05c7fe3d637c871c7ae52024d4", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.8" }, "require-dev": { - "symfony/process": "^5.4|^6.4|^7.0" + "symfony/process": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -1511,7 +1518,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.8" + "source": "https://github.com/symfony/filesystem/tree/v7.1.6" }, "funding": [ { @@ -1527,27 +1534,27 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-10-25T15:11:02+00:00" }, { "name": "symfony/finder", - "version": "v6.4.8", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "3ef977a43883215d560a2cecb82ec8e62131471c" + "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/3ef977a43883215d560a2cecb82ec8e62131471c", - "reference": "3ef977a43883215d560a2cecb82ec8e62131471c", + "url": "https://api.github.com/repos/symfony/finder/zipball/2cb89664897be33f78c65d3d2845954c8d7a43b8", + "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "symfony/filesystem": "^6.0|^7.0" + "symfony/filesystem": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -1575,7 +1582,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.4.8" + "source": "https://github.com/symfony/finder/tree/v7.1.6" }, "funding": [ { @@ -1591,24 +1598,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-10-01T08:31:23+00:00" }, { "name": "symfony/options-resolver", - "version": "v6.4.8", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "22ab9e9101ab18de37839074f8a1197f55590c1b" + "reference": "85e95eeede2d41cd146146e98c9c81d9214cae85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/22ab9e9101ab18de37839074f8a1197f55590c1b", - "reference": "22ab9e9101ab18de37839074f8a1197f55590c1b", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/85e95eeede2d41cd146146e98c9c81d9214cae85", + "reference": "85e95eeede2d41cd146146e98c9c81d9214cae85", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/deprecation-contracts": "^2.5|^3" }, "type": "library", @@ -1642,7 +1649,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v6.4.8" + "source": "https://github.com/symfony/options-resolver/tree/v7.1.6" }, "funding": [ { @@ -1658,24 +1665,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-ctype": "*" @@ -1721,7 +1728,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" }, "funding": [ { @@ -1737,24 +1744,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", - "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -1799,7 +1806,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" }, "funding": [ { @@ -1815,24 +1822,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" + "reference": "3833d7255cc303546435cb650316bff708a1c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", + "reference": "3833d7255cc303546435cb650316bff708a1c75c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -1880,7 +1887,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" }, "funding": [ { @@ -1896,24 +1903,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-mbstring": "*" @@ -1960,7 +1967,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" }, "funding": [ { @@ -1976,24 +1983,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -2040,7 +2047,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" }, "funding": [ { @@ -2056,24 +2063,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d" + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d", - "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -2116,7 +2123,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0" }, "funding": [ { @@ -2132,24 +2139,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/process", - "version": "v6.4.8", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5" + "reference": "6aaa189ddb4ff6b5de8fa3210f2fb42c87b4d12e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/8d92dd79149f29e89ee0f480254db595f6a6a2c5", - "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5", + "url": "https://api.github.com/repos/symfony/process/zipball/6aaa189ddb4ff6b5de8fa3210f2fb42c87b4d12e", + "reference": "6aaa189ddb4ff6b5de8fa3210f2fb42c87b4d12e", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "type": "library", "autoload": { @@ -2177,7 +2184,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.8" + "source": "https://github.com/symfony/process/tree/v7.1.6" }, "funding": [ { @@ -2193,7 +2200,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/service-contracts", @@ -2280,20 +2287,20 @@ }, { "name": "symfony/stopwatch", - "version": "v6.4.8", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "63e069eb616049632cde9674c46957819454b8aa" + "reference": "8b4a434e6e7faf6adedffb48783a5c75409a1a05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/63e069eb616049632cde9674c46957819454b8aa", - "reference": "63e069eb616049632cde9674c46957819454b8aa", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/8b4a434e6e7faf6adedffb48783a5c75409a1a05", + "reference": "8b4a434e6e7faf6adedffb48783a5c75409a1a05", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/service-contracts": "^2.5|^3" }, "type": "library", @@ -2322,7 +2329,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v6.4.8" + "source": "https://github.com/symfony/stopwatch/tree/v7.1.6" }, "funding": [ { @@ -2338,24 +2345,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/string", - "version": "v6.4.8", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d" + "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/a147c0f826c4a1f3afb763ab8e009e37c877a44d", - "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d", + "url": "https://api.github.com/repos/symfony/string/zipball/61b72d66bf96c360a727ae6232df5ac83c71f626", + "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", @@ -2365,11 +2372,12 @@ "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^5.4|^6.0|^7.0", - "symfony/http-client": "^5.4|^6.0|^7.0", - "symfony/intl": "^6.2|^7.0", + "symfony/emoji": "^7.1", + "symfony/error-handler": "^6.4|^7.0", + "symfony/http-client": "^6.4|^7.0", + "symfony/intl": "^6.4|^7.0", "symfony/translation-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^5.4|^6.0|^7.0" + "symfony/var-exporter": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -2408,7 +2416,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.8" + "source": "https://github.com/symfony/string/tree/v7.1.6" }, "funding": [ { @@ -2424,39 +2432,36 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-25T14:20:29+00:00" } ], "packages-dev": [ { "name": "colinodell/json5", - "version": "v2.3.0", + "version": "v3.0.0", "source": { "type": "git", "url": "https://github.com/colinodell/json5.git", - "reference": "15b063f8cb5e6deb15f0cd39123264ec0d19c710" + "reference": "5724d21bc5c910c2560af1b8915f0cc0163579c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/colinodell/json5/zipball/15b063f8cb5e6deb15f0cd39123264ec0d19c710", - "reference": "15b063f8cb5e6deb15f0cd39123264ec0d19c710", + "url": "https://api.github.com/repos/colinodell/json5/zipball/5724d21bc5c910c2560af1b8915f0cc0163579c8", + "reference": "5724d21bc5c910c2560af1b8915f0cc0163579c8", "shasum": "" }, "require": { "ext-json": "*", "ext-mbstring": "*", - "php": "^7.1.3|^8.0" - }, - "conflict": { - "scrutinizer/ocular": "1.7.*" + "php": "^8.0" }, "require-dev": { - "mikehaertl/php-shellcommand": "^1.2.5", - "phpstan/phpstan": "^1.4", - "scrutinizer/ocular": "^1.6", - "squizlabs/php_codesniffer": "^2.3 || ^3.0", - "symfony/finder": "^4.4|^5.4|^6.0", - "symfony/phpunit-bridge": "^5.4|^6.0" + "mikehaertl/php-shellcommand": "^1.7.0", + "phpstan/phpstan": "^1.10.57", + "scrutinizer/ocular": "^1.9", + "squizlabs/php_codesniffer": "^3.8.1", + "symfony/finder": "^6.0|^7.0", + "symfony/phpunit-bridge": "^7.0.3" }, "bin": [ "bin/json5" @@ -2464,7 +2469,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "4.0-dev" } }, "autoload": { @@ -2497,7 +2502,7 @@ ], "support": { "issues": "https://github.com/colinodell/json5/issues", - "source": "https://github.com/colinodell/json5/tree/v2.3.0" + "source": "https://github.com/colinodell/json5/tree/v3.0.0" }, "funding": [ { @@ -2517,20 +2522,20 @@ "type": "patreon" } ], - "time": "2022-12-27T16:44:40+00:00" + "time": "2024-02-09T13:06:12+00:00" }, { "name": "facile-it/paraunit", - "version": "2.3.3", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/facile-it/paraunit.git", - "reference": "f43232db312b55f7f36f918cff4dc4e0b60b314f" + "reference": "032bb2d404e8449b672c489f826c207d6e52a282" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facile-it/paraunit/zipball/f43232db312b55f7f36f918cff4dc4e0b60b314f", - "reference": "f43232db312b55f7f36f918cff4dc4e0b60b314f", + "url": "https://api.github.com/repos/facile-it/paraunit/zipball/032bb2d404e8449b672c489f826c207d6e52a282", + "reference": "032bb2d404e8449b672c489f826c207d6e52a282", "shasum": "" }, "require": { @@ -2538,8 +2543,8 @@ "ext-json": "*", "jean85/pretty-package-versions": "^1.5.1||^2.0.1", "php": "^8.1", - "phpunit/php-code-coverage": "^10.0||11.0", - "phpunit/php-file-iterator": "^4.0||5.0", + "phpunit/php-code-coverage": "^10.0||^11.0", + "phpunit/php-file-iterator": "^4.0||^5.0", "phpunit/phpunit": "^10.5.4||^11.0", "psr/event-dispatcher": "^1.0", "symfony/console": "^4.4||^5.0||^6.0||^7.0", @@ -2557,12 +2562,12 @@ "phpspec/prophecy": "dev-master as 1.19", "phpspec/prophecy-phpunit": "dev-master#0604e27 as 2.2.1", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "1.11.3", + "phpstan/phpstan": "1.12.4", "phpstan/phpstan-phpunit": "^1.1", "phpunit/php-invoker": "^4.0||^5.0", "psalm/plugin-phpunit": "^0.19", "psalm/plugin-symfony": "^5.0", - "rector/rector": "1.1.0", + "rector/rector": "1.2.5", "symfony/expression-language": "^4.4||^5.0||^6.0||^7.0", "symfony/phpunit-bridge": "^6.4||^7.0", "vimeo/psalm": "^5.5.0" @@ -2608,28 +2613,28 @@ ], "support": { "issues": "https://github.com/facile-it/paraunit/issues", - "source": "https://github.com/facile-it/paraunit/tree/2.3.3" + "source": "https://github.com/facile-it/paraunit/tree/2.4.0" }, - "time": "2024-06-06T12:44:27+00:00" + "time": "2024-09-25T13:11:25+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "7.8.1", + "version": "7.9.2", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "41042bc7ab002487b876a0683fc8dce04ddce104" + "reference": "d281ed313b989f213357e3be1a179f02196ac99b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104", - "reference": "41042bc7ab002487b876a0683fc8dce04ddce104", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b", + "reference": "d281ed313b989f213357e3be1a179f02196ac99b", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5.3 || ^2.0.1", - "guzzlehttp/psr7": "^1.9.1 || ^2.5.1", + "guzzlehttp/promises": "^1.5.3 || ^2.0.3", + "guzzlehttp/psr7": "^2.7.0", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -2640,9 +2645,9 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", "ext-curl": "*", - "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", + "guzzle/client-integration-tests": "3.0.2", "php-http/message-factory": "^1.1", - "phpunit/phpunit": "^8.5.36 || ^9.6.15", + "phpunit/phpunit": "^8.5.39 || ^9.6.20", "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { @@ -2720,7 +2725,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.8.1" + "source": "https://github.com/guzzle/guzzle/tree/7.9.2" }, "funding": [ { @@ -2736,20 +2741,20 @@ "type": "tidelift" } ], - "time": "2023-12-03T20:35:24+00:00" + "time": "2024-07-24T11:22:20+00:00" }, { "name": "guzzlehttp/promises", - "version": "2.0.2", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223" + "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223", - "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223", + "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455", + "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455", "shasum": "" }, "require": { @@ -2757,7 +2762,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.36 || ^9.6.15" + "phpunit/phpunit": "^8.5.39 || ^9.6.20" }, "type": "library", "extra": { @@ -2803,7 +2808,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.2" + "source": "https://github.com/guzzle/promises/tree/2.0.4" }, "funding": [ { @@ -2819,20 +2824,20 @@ "type": "tidelift" } ], - "time": "2023-12-03T20:19:20+00:00" + "time": "2024-10-17T10:06:22+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.6.2", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221" + "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221", - "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201", + "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201", "shasum": "" }, "require": { @@ -2847,8 +2852,8 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.36 || ^9.6.15" + "http-interop/http-factory-tests": "0.9.0", + "phpunit/phpunit": "^8.5.39 || ^9.6.20" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" @@ -2919,7 +2924,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.6.2" + "source": "https://github.com/guzzle/psr7/tree/2.7.0" }, "funding": [ { @@ -2935,7 +2940,7 @@ "type": "tidelift" } ], - "time": "2023-12-03T20:05:35+00:00" + "time": "2024-07-18T11:15:46+00:00" }, { "name": "infection/abstract-testframework-adapter", @@ -3116,20 +3121,20 @@ }, { "name": "infection/infection", - "version": "0.27.11", + "version": "0.29.7", "source": { "type": "git", "url": "https://github.com/infection/infection.git", - "reference": "6d55979c457eef2a5d0d80446c67ca533f201961" + "reference": "243d501ab48a028f714993bc0c217f023af7cdbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/infection/infection/zipball/6d55979c457eef2a5d0d80446c67ca533f201961", - "reference": "6d55979c457eef2a5d0d80446c67ca533f201961", + "url": "https://api.github.com/repos/infection/infection/zipball/243d501ab48a028f714993bc0c217f023af7cdbc", + "reference": "243d501ab48a028f714993bc0c217f023af7cdbc", "shasum": "" }, "require": { - "colinodell/json5": "^2.2", + "colinodell/json5": "^2.2 || ^3.0", "composer-runtime-api": "^2.0", "composer/xdebug-handler": "^2.0 || ^3.0", "ext-dom": "*", @@ -3140,8 +3145,9 @@ "infection/abstract-testframework-adapter": "^0.5.0", "infection/extension-installer": "^0.1.0", "infection/include-interceptor": "^0.2.5", - "justinrainbow/json-schema": "^5.2.10", - "nikic/php-parser": "^4.15.1", + "infection/mutator": "^0.4", + "justinrainbow/json-schema": "^5.3", + "nikic/php-parser": "^5.0", "ondram/ci-detector": "^4.1.0", "php": "^8.1", "sanmai/later": "^0.1.1", @@ -3160,20 +3166,17 @@ "phpunit/php-code-coverage": ">9,<9.1.4 || >9.2.17,<9.2.21" }, "require-dev": { - "brianium/paratest": "^6.11", "ext-simplexml": "*", "fidry/makefile": "^1.0", "helmich/phpunit-json-assert": "^3.0", - "phpspec/prophecy": "^1.15", - "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "^1.1.0", "phpstan/phpstan": "^1.10.15", "phpstan/phpstan-phpunit": "^1.0.0", "phpstan/phpstan-strict-rules": "^1.1.0", "phpstan/phpstan-webmozart-assert": "^1.0.2", - "phpunit/phpunit": "^9.6", - "rector/rector": "^0.16.0", - "sidz/phpstan-rules": "^0.4.0", + "phpunit/phpunit": "^10.5", + "rector/rector": "^1.0", + "sidz/phpstan-rules": "^0.4", "symfony/yaml": "^5.4 || ^6.0 || ^7.0", "thecodingmachine/phpstan-safe-rule": "^1.2.0" }, @@ -3231,7 +3234,60 @@ ], "support": { "issues": "https://github.com/infection/infection/issues", - "source": "https://github.com/infection/infection/tree/0.27.11" + "source": "https://github.com/infection/infection/tree/0.29.7" + }, + "funding": [ + { + "url": "https://github.com/infection", + "type": "github" + }, + { + "url": "https://opencollective.com/infection", + "type": "open_collective" + } + ], + "time": "2024-10-06T12:20:00+00:00" + }, + { + "name": "infection/mutator", + "version": "0.4.0", + "source": { + "type": "git", + "url": "https://github.com/infection/mutator.git", + "reference": "51d6d01a2357102030aee9d603063c4bad86b144" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/infection/mutator/zipball/51d6d01a2357102030aee9d603063c4bad86b144", + "reference": "51d6d01a2357102030aee9d603063c4bad86b144", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^5.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.6 || ^10" + }, + "type": "library", + "autoload": { + "psr-4": { + "Infection\\Mutator\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Maks Rafalko", + "email": "maks.rafalko@gmail.com" + } + ], + "description": "Mutator interface to implement custom mutators (mutation operators) for Infection", + "support": { + "issues": "https://github.com/infection/mutator/issues", + "source": "https://github.com/infection/mutator/tree/0.4.0" }, "funding": [ { @@ -3243,7 +3299,7 @@ "type": "open_collective" } ], - "time": "2024-03-20T07:48:57+00:00" + "time": "2024-05-14T22:39:59+00:00" }, { "name": "jean85/pretty-package-versions", @@ -3306,20 +3362,20 @@ }, { "name": "justinrainbow/json-schema", - "version": "v5.2.13", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/jsonrainbow/json-schema.git", - "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" + "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", - "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8", + "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "require-dev": { "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", @@ -3330,11 +3386,6 @@ "bin/validate-json" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0.x-dev" - } - }, "autoload": { "psr-4": { "JsonSchema\\": "src/JsonSchema/" @@ -3370,9 +3421,9 @@ ], "support": { "issues": "https://github.com/jsonrainbow/json-schema/issues", - "source": "https://github.com/jsonrainbow/json-schema/tree/v5.2.13" + "source": "https://github.com/jsonrainbow/json-schema/tree/5.3.0" }, - "time": "2023-09-26T02:20:38+00:00" + "time": "2024-07-06T21:00:26+00:00" }, { "name": "keradus/cli-executor", @@ -3423,23 +3474,24 @@ }, { "name": "mikey179/vfsstream", - "version": "v1.6.11", + "version": "v1.6.12", "source": { "type": "git", "url": "https://github.com/bovigo/vfsStream.git", - "reference": "17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f" + "reference": "fe695ec993e0a55c3abdda10a9364eb31c6f1bf0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f", - "reference": "17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f", + "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/fe695ec993e0a55c3abdda10a9364eb31c6f1bf0", + "reference": "fe695ec993e0a55c3abdda10a9364eb31c6f1bf0", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=7.1.0" }, "require-dev": { - "phpunit/phpunit": "^4.5|^5.0" + "phpunit/phpunit": "^7.5||^8.5||^9.6", + "yoast/phpunit-polyfills": "^2.0" }, "type": "library", "extra": { @@ -3470,20 +3522,20 @@ "source": "https://github.com/bovigo/vfsStream/tree/master", "wiki": "https://github.com/bovigo/vfsStream/wiki" }, - "time": "2022-02-23T02:02:42+00:00" + "time": "2024-08-29T18:43:31+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.11.1", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", "shasum": "" }, "require": { @@ -3491,11 +3543,12 @@ }, "conflict": { "doctrine/collections": "<1.6.8", - "doctrine/common": "<2.13.3 || >=3,<3.2.2" + "doctrine/common": "<2.13.3 || >=3 <3.2.2" }, "require-dev": { "doctrine/collections": "^1.6.8", "doctrine/common": "^2.13.3 || ^3.2.2", + "phpspec/prophecy": "^1.10", "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "type": "library", @@ -3521,7 +3574,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" }, "funding": [ { @@ -3529,29 +3582,31 @@ "type": "tidelift" } ], - "time": "2023-03-08T13:26:56+00:00" + "time": "2024-06-12T14:39:25+00:00" }, { "name": "nikic/php-parser", - "version": "v4.19.1", + "version": "v5.3.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b" + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b", - "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b", + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b", "shasum": "" }, "require": { + "ext-ctype": "*", + "ext-json": "*", "ext-tokenizer": "*", - "php": ">=7.1" + "php": ">=7.4" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^9.0" }, "bin": [ "bin/php-parse" @@ -3559,7 +3614,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.9-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -3583,9 +3638,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1" }, - "time": "2024-03-17T08:10:35+00:00" + "time": "2024-10-08T18:51:32+00:00" }, { "name": "ondram/ci-detector", @@ -4008,35 +4063,35 @@ }, { "name": "phpunit/php-code-coverage", - "version": "10.1.14", + "version": "11.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b" + "reference": "f7f08030e8811582cc459871d28d6f5a1a4d35ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b", - "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f7f08030e8811582cc459871d28d6f5a1a4d35ca", + "reference": "f7f08030e8811582cc459871d28d6f5a1a4d35ca", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.18 || ^5.0", - "php": ">=8.1", - "phpunit/php-file-iterator": "^4.0", - "phpunit/php-text-template": "^3.0", - "sebastian/code-unit-reverse-lookup": "^3.0", - "sebastian/complexity": "^3.0", - "sebastian/environment": "^6.0", - "sebastian/lines-of-code": "^2.0", - "sebastian/version": "^4.0", - "theseer/tokenizer": "^1.2.0" + "nikic/php-parser": "^5.3.1", + "php": ">=8.2", + "phpunit/php-file-iterator": "^5.1.0", + "phpunit/php-text-template": "^4.0.1", + "sebastian/code-unit-reverse-lookup": "^4.0.1", + "sebastian/complexity": "^4.0.1", + "sebastian/environment": "^7.2.0", + "sebastian/lines-of-code": "^3.0.1", + "sebastian/version": "^5.0.2", + "theseer/tokenizer": "^1.2.3" }, "require-dev": { - "phpunit/phpunit": "^10.1" + "phpunit/phpunit": "^11.4.1" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", @@ -4045,7 +4100,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "10.1-dev" + "dev-main": "11.0.x-dev" } }, "autoload": { @@ -4074,7 +4129,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.14" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.7" }, "funding": [ { @@ -4082,32 +4137,32 @@ "type": "github" } ], - "time": "2024-03-12T15:33:41+00:00" + "time": "2024-10-09T06:21:38+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "4.1.0", + "version": "5.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c" + "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c", - "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/118cfaaa8bc5aef3287bf315b6060b1174754af6", + "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "4.0-dev" + "dev-main": "5.0-dev" } }, "autoload": { @@ -4135,7 +4190,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0" + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/5.1.0" }, "funding": [ { @@ -4143,28 +4198,28 @@ "type": "github" } ], - "time": "2023-08-31T06:24:48+00:00" + "time": "2024-08-27T05:02:59+00:00" }, { "name": "phpunit/php-invoker", - "version": "4.0.0", + "version": "5.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-invoker.git", - "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7" + "reference": "c1ca3814734c07492b3d4c5f794f4b0995333da2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7", - "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/c1ca3814734c07492b3d4c5f794f4b0995333da2", + "reference": "c1ca3814734c07492b3d4c5f794f4b0995333da2", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { "ext-pcntl": "*", - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "suggest": { "ext-pcntl": "*" @@ -4172,7 +4227,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "4.0-dev" + "dev-main": "5.0-dev" } }, "autoload": { @@ -4198,7 +4253,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-invoker/issues", - "source": "https://github.com/sebastianbergmann/php-invoker/tree/4.0.0" + "security": "https://github.com/sebastianbergmann/php-invoker/security/policy", + "source": "https://github.com/sebastianbergmann/php-invoker/tree/5.0.1" }, "funding": [ { @@ -4206,32 +4262,32 @@ "type": "github" } ], - "time": "2023-02-03T06:56:09+00:00" + "time": "2024-07-03T05:07:44+00:00" }, { "name": "phpunit/php-text-template", - "version": "3.0.1", + "version": "4.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748" + "reference": "3e0404dc6b300e6bf56415467ebcb3fe4f33e964" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748", - "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/3e0404dc6b300e6bf56415467ebcb3fe4f33e964", + "reference": "3e0404dc6b300e6bf56415467ebcb3fe4f33e964", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "4.0-dev" } }, "autoload": { @@ -4258,7 +4314,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-text-template/issues", "security": "https://github.com/sebastianbergmann/php-text-template/security/policy", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1" + "source": "https://github.com/sebastianbergmann/php-text-template/tree/4.0.1" }, "funding": [ { @@ -4266,32 +4322,32 @@ "type": "github" } ], - "time": "2023-08-31T14:07:24+00:00" + "time": "2024-07-03T05:08:43+00:00" }, { "name": "phpunit/php-timer", - "version": "6.0.0", + "version": "7.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d" + "reference": "3b415def83fbcb41f991d9ebf16ae4ad8b7837b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/e2a2d67966e740530f4a3343fe2e030ffdc1161d", - "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3b415def83fbcb41f991d9ebf16ae4ad8b7837b3", + "reference": "3b415def83fbcb41f991d9ebf16ae4ad8b7837b3", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "6.0-dev" + "dev-main": "7.0-dev" } }, "autoload": { @@ -4317,7 +4373,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/6.0.0" + "security": "https://github.com/sebastianbergmann/php-timer/security/policy", + "source": "https://github.com/sebastianbergmann/php-timer/tree/7.0.1" }, "funding": [ { @@ -4325,20 +4382,20 @@ "type": "github" } ], - "time": "2023-02-03T06:57:52+00:00" + "time": "2024-07-03T05:09:35+00:00" }, { "name": "phpunit/phpunit", - "version": "10.5.20", + "version": "11.4.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3" + "reference": "e8e8ed1854de5d36c088ec1833beae40d2dedd76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/547d314dc24ec1e177720d45c6263fb226cc2ae3", - "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e8e8ed1854de5d36c088ec1833beae40d2dedd76", + "reference": "e8e8ed1854de5d36c088ec1833beae40d2dedd76", "shasum": "" }, "require": { @@ -4348,26 +4405,25 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", - "php": ">=8.1", - "phpunit/php-code-coverage": "^10.1.5", - "phpunit/php-file-iterator": "^4.0", - "phpunit/php-invoker": "^4.0", - "phpunit/php-text-template": "^3.0", - "phpunit/php-timer": "^6.0", - "sebastian/cli-parser": "^2.0", - "sebastian/code-unit": "^2.0", - "sebastian/comparator": "^5.0", - "sebastian/diff": "^5.0", - "sebastian/environment": "^6.0", - "sebastian/exporter": "^5.1", - "sebastian/global-state": "^6.0.1", - "sebastian/object-enumerator": "^5.0", - "sebastian/recursion-context": "^5.0", - "sebastian/type": "^4.0", - "sebastian/version": "^4.0" + "myclabs/deep-copy": "^1.12.0", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", + "php": ">=8.2", + "phpunit/php-code-coverage": "^11.0.7", + "phpunit/php-file-iterator": "^5.1.0", + "phpunit/php-invoker": "^5.0.1", + "phpunit/php-text-template": "^4.0.1", + "phpunit/php-timer": "^7.0.1", + "sebastian/cli-parser": "^3.0.2", + "sebastian/code-unit": "^3.0.1", + "sebastian/comparator": "^6.1.1", + "sebastian/diff": "^6.0.2", + "sebastian/environment": "^7.2.0", + "sebastian/exporter": "^6.1.3", + "sebastian/global-state": "^7.0.2", + "sebastian/object-enumerator": "^6.0.1", + "sebastian/type": "^5.1.0", + "sebastian/version": "^5.0.2" }, "suggest": { "ext-soap": "To be able to generate mocks based on WSDL files" @@ -4378,7 +4434,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "10.5-dev" + "dev-main": "11.4-dev" } }, "autoload": { @@ -4410,7 +4466,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.20" + "source": "https://github.com/sebastianbergmann/phpunit/tree/11.4.3" }, "funding": [ { @@ -4426,7 +4482,7 @@ "type": "tidelift" } ], - "time": "2024-04-24T06:32:35+00:00" + "time": "2024-10-28T13:07:50+00:00" }, { "name": "psr/http-client", @@ -4698,16 +4754,16 @@ }, { "name": "sanmai/pipeline", - "version": "v6.10", + "version": "v6.11", "source": { "type": "git", "url": "https://github.com/sanmai/pipeline.git", - "reference": "cbd2ea30ba8bef596b8dad1adb9c92fb2987e430" + "reference": "a5fa2a6c6ca93efa37e7c24aab72f47448a6b110" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sanmai/pipeline/zipball/cbd2ea30ba8bef596b8dad1adb9c92fb2987e430", - "reference": "cbd2ea30ba8bef596b8dad1adb9c92fb2987e430", + "url": "https://api.github.com/repos/sanmai/pipeline/zipball/a5fa2a6c6ca93efa37e7c24aab72f47448a6b110", + "reference": "a5fa2a6c6ca93efa37e7c24aab72f47448a6b110", "shasum": "" }, "require": { @@ -4751,7 +4807,7 @@ "description": "General-purpose collections pipeline", "support": { "issues": "https://github.com/sanmai/pipeline/issues", - "source": "https://github.com/sanmai/pipeline/tree/v6.10" + "source": "https://github.com/sanmai/pipeline/tree/v6.11" }, "funding": [ { @@ -4759,32 +4815,32 @@ "type": "github" } ], - "time": "2024-03-16T01:33:30+00:00" + "time": "2024-06-15T03:11:19+00:00" }, { "name": "sebastian/cli-parser", - "version": "2.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084" + "reference": "15c5dd40dc4f38794d383bb95465193f5e0ae180" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/c34583b87e7b7a8055bf6c450c2c77ce32a24084", - "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/15c5dd40dc4f38794d383bb95465193f5e0ae180", + "reference": "15c5dd40dc4f38794d383bb95465193f5e0ae180", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -4808,7 +4864,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/cli-parser/issues", "security": "https://github.com/sebastianbergmann/cli-parser/security/policy", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.1" + "source": "https://github.com/sebastianbergmann/cli-parser/tree/3.0.2" }, "funding": [ { @@ -4816,32 +4872,32 @@ "type": "github" } ], - "time": "2024-03-02T07:12:49+00:00" + "time": "2024-07-03T04:41:36+00:00" }, { "name": "sebastian/code-unit", - "version": "2.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit.git", - "reference": "a81fee9eef0b7a76af11d121767abc44c104e503" + "reference": "6bb7d09d6623567178cf54126afa9c2310114268" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/a81fee9eef0b7a76af11d121767abc44c104e503", - "reference": "a81fee9eef0b7a76af11d121767abc44c104e503", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/6bb7d09d6623567178cf54126afa9c2310114268", + "reference": "6bb7d09d6623567178cf54126afa9c2310114268", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -4864,7 +4920,8 @@ "homepage": "https://github.com/sebastianbergmann/code-unit", "support": { "issues": "https://github.com/sebastianbergmann/code-unit/issues", - "source": "https://github.com/sebastianbergmann/code-unit/tree/2.0.0" + "security": "https://github.com/sebastianbergmann/code-unit/security/policy", + "source": "https://github.com/sebastianbergmann/code-unit/tree/3.0.1" }, "funding": [ { @@ -4872,32 +4929,32 @@ "type": "github" } ], - "time": "2023-02-03T06:58:43+00:00" + "time": "2024-07-03T04:44:28+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", - "version": "3.0.0", + "version": "4.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d" + "reference": "183a9b2632194febd219bb9246eee421dad8d45e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5e3a687f7d8ae33fb362c5c0743794bbb2420a1d", - "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/183a9b2632194febd219bb9246eee421dad8d45e", + "reference": "183a9b2632194febd219bb9246eee421dad8d45e", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "4.0-dev" } }, "autoload": { @@ -4919,7 +4976,8 @@ "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", "support": { "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/3.0.0" + "security": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/security/policy", + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/4.0.1" }, "funding": [ { @@ -4927,36 +4985,36 @@ "type": "github" } ], - "time": "2023-02-03T06:59:15+00:00" + "time": "2024-07-03T04:45:54+00:00" }, { "name": "sebastian/comparator", - "version": "5.0.1", + "version": "6.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "2db5010a484d53ebf536087a70b4a5423c102372" + "reference": "5ef523a49ae7a302b87b2102b72b1eda8918d686" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372", - "reference": "2db5010a484d53ebf536087a70b4a5423c102372", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5ef523a49ae7a302b87b2102b72b1eda8918d686", + "reference": "5ef523a49ae7a302b87b2102b72b1eda8918d686", "shasum": "" }, "require": { "ext-dom": "*", "ext-mbstring": "*", - "php": ">=8.1", - "sebastian/diff": "^5.0", - "sebastian/exporter": "^5.0" + "php": ">=8.2", + "sebastian/diff": "^6.0", + "sebastian/exporter": "^6.0" }, "require-dev": { - "phpunit/phpunit": "^10.3" + "phpunit/phpunit": "^11.3" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "5.0-dev" + "dev-main": "6.1-dev" } }, "autoload": { @@ -4996,7 +5054,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1" + "source": "https://github.com/sebastianbergmann/comparator/tree/6.1.1" }, "funding": [ { @@ -5004,33 +5062,33 @@ "type": "github" } ], - "time": "2023-08-14T13:18:12+00:00" + "time": "2024-10-18T15:00:48+00:00" }, { "name": "sebastian/complexity", - "version": "3.2.0", + "version": "4.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "68ff824baeae169ec9f2137158ee529584553799" + "reference": "ee41d384ab1906c68852636b6de493846e13e5a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799", - "reference": "68ff824baeae169ec9f2137158ee529584553799", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/ee41d384ab1906c68852636b6de493846e13e5a0", + "reference": "ee41d384ab1906c68852636b6de493846e13e5a0", "shasum": "" }, "require": { - "nikic/php-parser": "^4.18 || ^5.0", - "php": ">=8.1" + "nikic/php-parser": "^5.0", + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.2-dev" + "dev-main": "4.0-dev" } }, "autoload": { @@ -5054,7 +5112,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", "security": "https://github.com/sebastianbergmann/complexity/security/policy", - "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0" + "source": "https://github.com/sebastianbergmann/complexity/tree/4.0.1" }, "funding": [ { @@ -5062,27 +5120,27 @@ "type": "github" } ], - "time": "2023-12-21T08:37:17+00:00" + "time": "2024-07-03T04:49:50+00:00" }, { "name": "sebastian/environment", - "version": "6.1.0", + "version": "7.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "8074dbcd93529b357029f5cc5058fd3e43666984" + "reference": "855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984", - "reference": "8074dbcd93529b357029f5cc5058fd3e43666984", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5", + "reference": "855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "suggest": { "ext-posix": "*" @@ -5090,7 +5148,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "6.1-dev" + "dev-main": "7.2-dev" } }, "autoload": { @@ -5118,7 +5176,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", "security": "https://github.com/sebastianbergmann/environment/security/policy", - "source": "https://github.com/sebastianbergmann/environment/tree/6.1.0" + "source": "https://github.com/sebastianbergmann/environment/tree/7.2.0" }, "funding": [ { @@ -5126,34 +5184,34 @@ "type": "github" } ], - "time": "2024-03-23T08:47:14+00:00" + "time": "2024-07-03T04:54:44+00:00" }, { "name": "sebastian/exporter", - "version": "5.1.2", + "version": "6.1.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "955288482d97c19a372d3f31006ab3f37da47adf" + "reference": "c414673eee9a8f9d51bbf8d61fc9e3ef1e85b20e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/955288482d97c19a372d3f31006ab3f37da47adf", - "reference": "955288482d97c19a372d3f31006ab3f37da47adf", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c414673eee9a8f9d51bbf8d61fc9e3ef1e85b20e", + "reference": "c414673eee9a8f9d51bbf8d61fc9e3ef1e85b20e", "shasum": "" }, "require": { "ext-mbstring": "*", - "php": ">=8.1", - "sebastian/recursion-context": "^5.0" + "php": ">=8.2", + "sebastian/recursion-context": "^6.0" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.2" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "5.1-dev" + "dev-main": "6.1-dev" } }, "autoload": { @@ -5196,7 +5254,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", "security": "https://github.com/sebastianbergmann/exporter/security/policy", - "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.2" + "source": "https://github.com/sebastianbergmann/exporter/tree/6.1.3" }, "funding": [ { @@ -5204,35 +5262,35 @@ "type": "github" } ], - "time": "2024-03-02T07:17:12+00:00" + "time": "2024-07-03T04:56:19+00:00" }, { "name": "sebastian/global-state", - "version": "6.0.2", + "version": "7.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9" + "reference": "3be331570a721f9a4b5917f4209773de17f747d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/987bafff24ecc4c9ac418cab1145b96dd6e9cbd9", - "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/3be331570a721f9a4b5917f4209773de17f747d7", + "reference": "3be331570a721f9a4b5917f4209773de17f747d7", "shasum": "" }, "require": { - "php": ">=8.1", - "sebastian/object-reflector": "^3.0", - "sebastian/recursion-context": "^5.0" + "php": ">=8.2", + "sebastian/object-reflector": "^4.0", + "sebastian/recursion-context": "^6.0" }, "require-dev": { "ext-dom": "*", - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "6.0-dev" + "dev-main": "7.0-dev" } }, "autoload": { @@ -5258,7 +5316,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", "security": "https://github.com/sebastianbergmann/global-state/security/policy", - "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.2" + "source": "https://github.com/sebastianbergmann/global-state/tree/7.0.2" }, "funding": [ { @@ -5266,33 +5324,33 @@ "type": "github" } ], - "time": "2024-03-02T07:19:19+00:00" + "time": "2024-07-03T04:57:36+00:00" }, { "name": "sebastian/lines-of-code", - "version": "2.0.2", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0" + "reference": "d36ad0d782e5756913e42ad87cb2890f4ffe467a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0", - "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/d36ad0d782e5756913e42ad87cb2890f4ffe467a", + "reference": "d36ad0d782e5756913e42ad87cb2890f4ffe467a", "shasum": "" }, "require": { - "nikic/php-parser": "^4.18 || ^5.0", - "php": ">=8.1" + "nikic/php-parser": "^5.0", + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -5316,7 +5374,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2" + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/3.0.1" }, "funding": [ { @@ -5324,34 +5382,34 @@ "type": "github" } ], - "time": "2023-12-21T08:38:20+00:00" + "time": "2024-07-03T04:58:38+00:00" }, { "name": "sebastian/object-enumerator", - "version": "5.0.0", + "version": "6.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906" + "reference": "f5b498e631a74204185071eb41f33f38d64608aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/202d0e344a580d7f7d04b3fafce6933e59dae906", - "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/f5b498e631a74204185071eb41f33f38d64608aa", + "reference": "f5b498e631a74204185071eb41f33f38d64608aa", "shasum": "" }, "require": { - "php": ">=8.1", - "sebastian/object-reflector": "^3.0", - "sebastian/recursion-context": "^5.0" + "php": ">=8.2", + "sebastian/object-reflector": "^4.0", + "sebastian/recursion-context": "^6.0" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "5.0-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -5373,7 +5431,8 @@ "homepage": "https://github.com/sebastianbergmann/object-enumerator/", "support": { "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/5.0.0" + "security": "https://github.com/sebastianbergmann/object-enumerator/security/policy", + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/6.0.1" }, "funding": [ { @@ -5381,32 +5440,32 @@ "type": "github" } ], - "time": "2023-02-03T07:08:32+00:00" + "time": "2024-07-03T05:00:13+00:00" }, { "name": "sebastian/object-reflector", - "version": "3.0.0", + "version": "4.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "24ed13d98130f0e7122df55d06c5c4942a577957" + "reference": "6e1a43b411b2ad34146dee7524cb13a068bb35f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/24ed13d98130f0e7122df55d06c5c4942a577957", - "reference": "24ed13d98130f0e7122df55d06c5c4942a577957", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/6e1a43b411b2ad34146dee7524cb13a068bb35f9", + "reference": "6e1a43b411b2ad34146dee7524cb13a068bb35f9", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "4.0-dev" } }, "autoload": { @@ -5428,7 +5487,8 @@ "homepage": "https://github.com/sebastianbergmann/object-reflector/", "support": { "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/3.0.0" + "security": "https://github.com/sebastianbergmann/object-reflector/security/policy", + "source": "https://github.com/sebastianbergmann/object-reflector/tree/4.0.1" }, "funding": [ { @@ -5436,32 +5496,32 @@ "type": "github" } ], - "time": "2023-02-03T07:06:18+00:00" + "time": "2024-07-03T05:01:32+00:00" }, { "name": "sebastian/recursion-context", - "version": "5.0.0", + "version": "6.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "05909fb5bc7df4c52992396d0116aed689f93712" + "reference": "694d156164372abbd149a4b85ccda2e4670c0e16" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/05909fb5bc7df4c52992396d0116aed689f93712", - "reference": "05909fb5bc7df4c52992396d0116aed689f93712", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/694d156164372abbd149a4b85ccda2e4670c0e16", + "reference": "694d156164372abbd149a4b85ccda2e4670c0e16", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "5.0-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -5491,7 +5551,8 @@ "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.0" + "security": "https://github.com/sebastianbergmann/recursion-context/security/policy", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/6.0.2" }, "funding": [ { @@ -5499,32 +5560,32 @@ "type": "github" } ], - "time": "2023-02-03T07:05:40+00:00" + "time": "2024-07-03T05:10:34+00:00" }, { "name": "sebastian/type", - "version": "4.0.0", + "version": "5.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "462699a16464c3944eefc02ebdd77882bd3925bf" + "reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/462699a16464c3944eefc02ebdd77882bd3925bf", - "reference": "462699a16464c3944eefc02ebdd77882bd3925bf", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/461b9c5da241511a2a0e8f240814fb23ce5c0aac", + "reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.3" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "4.0-dev" + "dev-main": "5.1-dev" } }, "autoload": { @@ -5547,7 +5608,8 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/4.0.0" + "security": "https://github.com/sebastianbergmann/type/security/policy", + "source": "https://github.com/sebastianbergmann/type/tree/5.1.0" }, "funding": [ { @@ -5555,29 +5617,29 @@ "type": "github" } ], - "time": "2023-02-03T07:10:45+00:00" + "time": "2024-09-17T13:12:04+00:00" }, { "name": "sebastian/version", - "version": "4.0.1", + "version": "5.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/version.git", - "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17" + "reference": "c687e3387b99f5b03b6caa64c74b63e2936ff874" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c51fa83a5d8f43f1402e3f32a005e6262244ef17", - "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c687e3387b99f5b03b6caa64c74b63e2936ff874", + "reference": "c687e3387b99f5b03b6caa64c74b63e2936ff874", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "4.0-dev" + "dev-main": "5.0-dev" } }, "autoload": { @@ -5600,7 +5662,8 @@ "homepage": "https://github.com/sebastianbergmann/version", "support": { "issues": "https://github.com/sebastianbergmann/version/issues", - "source": "https://github.com/sebastianbergmann/version/tree/4.0.1" + "security": "https://github.com/sebastianbergmann/version/security/policy", + "source": "https://github.com/sebastianbergmann/version/tree/5.0.2" }, "funding": [ { @@ -5608,38 +5671,38 @@ "type": "github" } ], - "time": "2023-02-07T11:34:05+00:00" + "time": "2024-10-09T05:16:32+00:00" }, { "name": "symfony/config", - "version": "v6.4.8", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "12e7e52515ce37191b193cf3365903c4f3951e35" + "reference": "5c6152766251ff45a44b76affadd5287e253fb27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/12e7e52515ce37191b193cf3365903c4f3951e35", - "reference": "12e7e52515ce37191b193cf3365903c4f3951e35", + "url": "https://api.github.com/repos/symfony/config/zipball/5c6152766251ff45a44b76affadd5287e253fb27", + "reference": "5c6152766251ff45a44b76affadd5287e253fb27", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/deprecation-contracts": "^2.5|^3", - "symfony/filesystem": "^5.4|^6.0|^7.0", + "symfony/filesystem": "^7.1", "symfony/polyfill-ctype": "~1.8" }, "conflict": { - "symfony/finder": "<5.4", + "symfony/finder": "<6.4", "symfony/service-contracts": "<2.5" }, "require-dev": { - "symfony/event-dispatcher": "^5.4|^6.0|^7.0", - "symfony/finder": "^5.4|^6.0|^7.0", - "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher": "^6.4|^7.0", + "symfony/finder": "^6.4|^7.0", + "symfony/messenger": "^6.4|^7.0", "symfony/service-contracts": "^2.5|^3", - "symfony/yaml": "^5.4|^6.0|^7.0" + "symfony/yaml": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -5667,7 +5730,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v6.4.8" + "source": "https://github.com/symfony/config/tree/v7.1.6" }, "funding": [ { @@ -5683,44 +5746,43 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-10-25T15:11:02+00:00" }, { "name": "symfony/dependency-injection", - "version": "v6.4.8", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "d3b618176e8c3a9e5772151c51eba0c52a0c771c" + "reference": "1f12f9d580ef8dd09e3b756aa111cc2d5f311bfd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/d3b618176e8c3a9e5772151c51eba0c52a0c771c", - "reference": "d3b618176e8c3a9e5772151c51eba0c52a0c771c", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/1f12f9d580ef8dd09e3b756aa111cc2d5f311bfd", + "reference": "1f12f9d580ef8dd09e3b756aa111cc2d5f311bfd", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "psr/container": "^1.1|^2.0", "symfony/deprecation-contracts": "^2.5|^3", - "symfony/service-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^6.2.10|^7.0" + "symfony/service-contracts": "^3.5", + "symfony/var-exporter": "^6.4|^7.0" }, "conflict": { "ext-psr": "<1.1|>=2", - "symfony/config": "<6.1", - "symfony/finder": "<5.4", - "symfony/proxy-manager-bridge": "<6.3", - "symfony/yaml": "<5.4" + "symfony/config": "<6.4", + "symfony/finder": "<6.4", + "symfony/yaml": "<6.4" }, "provide": { "psr/container-implementation": "1.1|2.0", "symfony/service-implementation": "1.1|2.0|3.0" }, "require-dev": { - "symfony/config": "^6.1|^7.0", - "symfony/expression-language": "^5.4|^6.0|^7.0", - "symfony/yaml": "^5.4|^6.0|^7.0" + "symfony/config": "^6.4|^7.0", + "symfony/expression-language": "^6.4|^7.0", + "symfony/yaml": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -5748,7 +5810,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.4.8" + "source": "https://github.com/symfony/dependency-injection/tree/v7.1.6" }, "funding": [ { @@ -5764,38 +5826,36 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-10-25T15:11:02+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.8", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "ad23ca4312395f0a8a8633c831ef4c4ee542ed25" + "reference": "cb5bd55a6b8c2c1c7fb68b0aeae0e257948a720c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ad23ca4312395f0a8a8633c831ef4c4ee542ed25", - "reference": "ad23ca4312395f0a8a8633c831ef4c4ee542ed25", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/cb5bd55a6b8c2c1c7fb68b0aeae0e257948a720c", + "reference": "cb5bd55a6b8c2c1c7fb68b0aeae0e257948a720c", "shasum": "" }, "require": { - "php": ">=8.1", - "symfony/deprecation-contracts": "^2.5|^3", + "php": ">=8.2", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/console": "<5.4" + "symfony/console": "<6.4" }, "require-dev": { "ext-iconv": "*", - "symfony/console": "^5.4|^6.0|^7.0", - "symfony/error-handler": "^6.3|^7.0", - "symfony/http-kernel": "^5.4|^6.0|^7.0", - "symfony/process": "^5.4|^6.0|^7.0", - "symfony/uid": "^5.4|^6.0|^7.0", - "twig/twig": "^2.13|^3.0.4" + "symfony/console": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/process": "^6.4|^7.0", + "symfony/uid": "^6.4|^7.0", + "twig/twig": "^3.0.4" }, "bin": [ "Resources/bin/var-dump-server" @@ -5833,7 +5893,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.8" + "source": "https://github.com/symfony/var-dumper/tree/v7.1.6" }, "funding": [ { @@ -5849,30 +5909,29 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/var-exporter", - "version": "v6.4.8", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "792ca836f99b340f2e9ca9497c7953948c49a504" + "reference": "90173ef89c40e7c8c616653241048705f84130ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/792ca836f99b340f2e9ca9497c7953948c49a504", - "reference": "792ca836f99b340f2e9ca9497c7953948c49a504", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/90173ef89c40e7c8c616653241048705f84130ef", + "reference": "90173ef89c40e7c8c616653241048705f84130ef", "shasum": "" }, "require": { - "php": ">=8.1", - "symfony/deprecation-contracts": "^2.5|^3" + "php": ">=8.2" }, "require-dev": { "symfony/property-access": "^6.4|^7.0", "symfony/serializer": "^6.4|^7.0", - "symfony/var-dumper": "^5.4|^6.0|^7.0" + "symfony/var-dumper": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -5910,7 +5969,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.4.8" + "source": "https://github.com/symfony/var-exporter/tree/v7.1.6" }, "funding": [ { @@ -5926,32 +5985,31 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/yaml", - "version": "v6.4.8", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "52903de178d542850f6f341ba92995d3d63e60c9" + "reference": "3ced3f29e4f0d6bce2170ff26719f1fe9aacc671" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/52903de178d542850f6f341ba92995d3d63e60c9", - "reference": "52903de178d542850f6f341ba92995d3d63e60c9", + "url": "https://api.github.com/repos/symfony/yaml/zipball/3ced3f29e4f0d6bce2170ff26719f1fe9aacc671", + "reference": "3ced3f29e4f0d6bce2170ff26719f1fe9aacc671", "shasum": "" }, "require": { - "php": ">=8.1", - "symfony/deprecation-contracts": "^2.5|^3", + "php": ">=8.2", "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "symfony/console": "<5.4" + "symfony/console": "<6.4" }, "require-dev": { - "symfony/console": "^5.4|^6.0|^7.0" + "symfony/console": "^6.4|^7.0" }, "bin": [ "Resources/bin/yaml-lint" @@ -5982,7 +6040,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.4.8" + "source": "https://github.com/symfony/yaml/tree/v7.1.6" }, "funding": [ { @@ -5998,7 +6056,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "thecodingmachine/safe", @@ -6250,7 +6308,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, "platform": { @@ -6259,6 +6317,6 @@ "ext-json": "*", "ext-tokenizer": "*" }, - "platform-dev": [], + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index ffb58ccaccf2..782d1744ca63 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -4,21 +4,21 @@ php, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "php-cs-fixer"; - version = "3.58.1"; + version = "3.64.0"; src = fetchFromGitHub { owner = "PHP-CS-Fixer"; repo = "PHP-CS-Fixer"; rev = "v${finalAttrs.version}"; - hash = "sha256-MBNFTHhApANDeHY0tTKbIP2EfVDH7mxwA42PKihzPug="; + hash = "sha256-N2m3U0HjwQtm7loqYfEl7kstqljXC8evp6GEh+Cd9Hs="; }; - # Missing `composer.lock` from the repository. - # Issue open at https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7590 + # Upstream doesn't provide a composer.lock. + # More info at https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7590 composerLock = ./composer.lock; - vendorHash = "sha256-dryqtCUr2xkZgDRLKpQjyEpLGz8WiHtLY4fF/pCR10w="; + vendorHash = "sha256-cOKfvNjFl9QKwPZp81IHaRurRhmXgbydhdTWYknlGBM="; meta = { changelog = "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/development/php-packages/psysh/default.nix b/pkgs/development/php-packages/psysh/default.nix index e30fc51cfd8b..ffa163168286 100644 --- a/pkgs/development/php-packages/psysh/default.nix +++ b/pkgs/development/php-packages/psysh/default.nix @@ -19,7 +19,7 @@ let composerLock = fetchurl { name = "composer.lock"; url = "https://github.com/bobthecow/psysh/releases/download/v${version}/composer-v${version}.lock"; - hash = "sha256-ur6mzla3uXeFL6aEHAPdpxGdvcgzOgTLW/CKPbNqeCg="; + hash = "sha256-PQDWShzvTY8yF+OUPVJAV0HMx0/KnA03TDhZUM7ppXw="; }; in php.buildComposerProject2 (finalAttrs: { @@ -45,7 +45,7 @@ php.buildComposerProject2 (finalAttrs: { composer update --lock --no-install ''; - vendorHash = "sha256-mW276lzOTCY68EnvSVR+tD+gh3Y61GrWchVJHDZ4dpg="; + vendorHash = "sha256-tKy2A3dGGmZZzZF0JxtG6NYMfG/paQsuxAO1y3GfCsA="; }; meta = { diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix index 56d826cb4b94..4a3f21a08a90 100644 --- a/pkgs/development/php-packages/relay/default.nix +++ b/pkgs/development/php-packages/relay/default.nix @@ -77,8 +77,8 @@ stdenv.mkDerivation (finalAttrs: { system = stdenv.hostPlatform.system; phpMajor = lib.versions.majorMinor php.version; }; - nativeBuildInputs = lib.optionals (!stdenv.isDarwin) [ autoPatchelfHook ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ + nativeBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ autoPatchelfHook ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl zstd lz4 @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { chmod +w $out/lib/php/extensions/relay.so '' + ( - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then let args = lib.strings.concatMapStrings diff --git a/pkgs/development/php-packages/snuffleupagus/default.nix b/pkgs/development/php-packages/snuffleupagus/default.nix index d9c201e67a2d..8a2e5a45f7f1 100644 --- a/pkgs/development/php-packages/snuffleupagus/default.nix +++ b/pkgs/development/php-packages/snuffleupagus/default.nix @@ -22,7 +22,7 @@ buildPecl rec { buildInputs = [ pcre2 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreFoundation darwin.apple_sdk_11_0.Libsystem libiconv diff --git a/pkgs/development/php-packages/spx/default.nix b/pkgs/development/php-packages/spx/default.nix index caab4d59335a..d861eab67a0b 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.16"; + version = "0.4.17"; in buildPecl { inherit version; @@ -16,7 +16,7 @@ buildPecl { owner = "NoiseByNorthwest"; repo = "php-spx"; rev = "v${version}"; - hash = "sha256-1HOLMbCuV1bxi4DV26QOhi93VsBF3NJymk4SMn2ze4g="; + hash = "sha256-MH/0G9KKmwcVsJKpe6uE1xjvykBEWuYU0DIOGfXiLAw="; }; configureFlags = [ "--with-zlib-dir=${zlib.dev}" ]; diff --git a/pkgs/development/php-packages/sqlsrv/default.nix b/pkgs/development/php-packages/sqlsrv/default.nix index 303f2327d1e5..08c59275c848 100644 --- a/pkgs/development/php-packages/sqlsrv/default.nix +++ b/pkgs/development/php-packages/sqlsrv/default.nix @@ -12,7 +12,7 @@ buildPecl { version = "5.10.1"; sha256 = "sha256-XNrttNiihjQ+azuZmS2fy0So+2ndAqpde8IOsupeWdI="; - buildInputs = [ unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ unixODBC ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; meta = with lib; { description = "Microsoft Drivers for PHP for SQL Server"; diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix index f519522a8357..7b52c838f473 100644 --- a/pkgs/development/php-packages/swoole/default.nix +++ b/pkgs/development/php-packages/swoole/default.nix @@ -22,7 +22,7 @@ buildPecl { hash = "sha256-WTsntvauiooj081mOoFcK6CVpnCCR/cEQtJbsOIJ/wo="; }; - buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; + buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ valgrind ]; # tests require internet access doCheck = false; @@ -33,5 +33,6 @@ buildPecl { homepage = "https://www.swoole.com"; license = lib.licenses.asl20; maintainers = lib.teams.php.members; + broken = lib.versionAtLeast php.version "8.4"; }; } diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 84ac38f6c4b8..56fff995095e 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -1,6 +1,7 @@ { buildPecl, lib, + php, fetchFromGitHub, }: @@ -29,5 +30,6 @@ buildPecl { homepage = "https://xdebug.org/"; license = lib.licenses.php301; maintainers = lib.teams.php.members; + broken = lib.versionAtLeast php.version "8.4"; }; } diff --git a/pkgs/development/python-modules/a2wsgi/default.nix b/pkgs/development/python-modules/a2wsgi/default.nix index 4706c97c9bc4..99c6253d0977 100644 --- a/pkgs/development/python-modules/a2wsgi/default.nix +++ b/pkgs/development/python-modules/a2wsgi/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "a2wsgi"; - version = "1.10.4"; + version = "1.10.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-UOgaxVqmCfosZm5CuswlxCTIiEzmBy8afpAhFLfuXWM="; + hash = "sha256-zkYv9+HarAvFcYPG+ADwmnHCp6mN3VzeyhSePqvzM44="; }; nativeBuildInputs = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/aardwolf/default.nix b/pkgs/development/python-modules/aardwolf/default.nix index 72d309cd3298..c4807df9a90c 100644 --- a/pkgs/development/python-modules/aardwolf/default.nix +++ b/pkgs/development/python-modules/aardwolf/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { tqdm unicrypto winsspi - ] ++ lib.optionals (stdenv.isDarwin) [ iconv ]; + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ iconv ]; # Module doesn't have tests doCheck = false; diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index 4b1bfa910981..870131a4fb54 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -1,9 +1,9 @@ { - buildPythonPackage, lib, + buildPythonPackage, fetchPypi, setuptools, - six, + pythonOlder, }: buildPythonPackage rec { @@ -11,21 +11,24 @@ buildPythonPackage rec { version = "2.1.0"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; hash = "sha256-eCB5DvuzFnOc3otOGTVyQ/w2CKFSAkKIUT3ZaNfZWf8="; }; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; # checks use bazel; should be revisited doCheck = false; + pythonImportsCheck = [ "absl" ]; + meta = { description = "Abseil Python Common Libraries"; homepage = "https://github.com/abseil/abseil-py"; + changelog = "https://github.com/abseil/abseil-py/blob/v${version}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index 566908cfa3b5..ea8efbcad1b1 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -12,6 +12,7 @@ setuptools, # dependencies + huggingface-hub, numpy, packaging, psutil, @@ -30,14 +31,14 @@ buildPythonPackage rec { pname = "accelerate"; - version = "0.34.2"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "accelerate"; rev = "refs/tags/v${version}"; - hash = "sha256-4kDNLta6gGev16A4hNOArTpoD8p6LMRwqwHS/DZjtz0="; + hash = "sha256-GBNe4zomy8dmfvYrk/9Q77Z6r+JJA+2dgAhJx2opqAc="; }; buildInputs = [ llvmPackages.openmp ]; @@ -45,6 +46,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ + huggingface-hub numpy packaging psutil @@ -96,7 +98,7 @@ buildPythonPackage rec { "test_dynamo_extract_model" "test_send_to_device_compiles" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # usual aarch64-linux RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly "CheckpointTest" # TypeError: unsupported operand type(s) for /: 'NoneType' and 'int' (it seems cpuinfo doesn't work here) @@ -106,20 +108,45 @@ buildPythonPackage rec { # requires ptxas from cudatoolkit, which is unfree "test_dynamo_extract_model" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # RuntimeError: 'accelerate-launch /nix/store/a7vhm7b74a7bmxc35j26s9iy1zfaqjs... "test_accelerate_test" "test_init_trackers" "test_init_trackers" "test_log" "test_log_with_tensor" + + # After enabling MPS in pytorch, these tests started failing + "test_accelerated_optimizer_step_was_skipped" + "test_auto_wrap_policy" + "test_autocast_kwargs" + "test_automatic_loading" + "test_backward_prefetch" + "test_can_resume_training" + "test_can_resume_training_checkpoints_relative_path" + "test_can_resume_training_with_folder" + "test_can_unwrap_model_fp16" + "test_checkpoint_deletion" + "test_cpu_offload" + "test_cpu_ram_efficient_loading" + "test_grad_scaler_kwargs" + "test_invalid_registration" + "test_map_location" + "test_mixed_precision" + "test_mixed_precision_buffer_autocast_override" + "test_project_dir" + "test_project_dir_with_config" + "test_sharding_strategy" + "test_state_dict_type" + "test_with_save_limit" + "test_with_scheduler" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # RuntimeError: torch_shm_manager: execl failed: Permission denied "CheckpointTest" ]; - disabledTestPaths = lib.optionals (!(stdenv.isLinux && stdenv.isx86_64)) [ + disabledTestPaths = lib.optionals (!(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64)) [ # numerous instances of torch.multiprocessing.spawn.ProcessRaisedException: "tests/test_cpu.py" "tests/test_grad_sync.py" diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix index f8f9897a6b3a..35d39fed9a6f 100644 --- a/pkgs/development/python-modules/accupy/default.nix +++ b/pkgs/development/python-modules/accupy/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. - env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; + env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "Agg"; # performance tests aren't useful to us and disabling them allows us to # decouple ourselves from an unnecessary build dep diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix deleted file mode 100644 index 67941fd6dedf..000000000000 --- a/pkgs/development/python-modules/acoustics/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - flit-core, - matplotlib, - numpy, - pandas, - pytestCheckHook, - pythonOlder, - scipy, - tabulate, -}: - -buildPythonPackage rec { - pname = "acoustics"; - version = "0.2.6-unstable-2023-08-20"; - pyproject = true; - - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "python-acoustics"; - repo = "python-acoustics"; - rev = "99d79206159b822ea2f4e9d27c8b2fbfeb704d38"; - hash = "sha256-/4bVjlhj8ihpAFHEWPaZ/xBILi3rb8f0NmwAexJCg+o="; - }; - - nativeBuildInputs = [ flit-core ]; - - propagatedBuildInputs = [ - matplotlib - numpy - pandas - scipy - tabulate - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - preCheck = '' - export HOME=$TMPDIR - mkdir -p $HOME/.matplotlib - echo "backend: ps" > $HOME/.matplotlib/matplotlibrc - ''; - - pytestFlagsArray = [ "-Wignore::DeprecationWarning" ]; - - pythonImportsCheck = [ "acoustics" ]; - - meta = with lib; { - description = "Python package for acousticians"; - license = with licenses; [ bsd3 ]; - homepage = "https://github.com/python-acoustics/python-acoustics"; - }; -} diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index ca5f1c39a608..2157e0fc7b20 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { dissect-target ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ dissect-target minio @@ -52,7 +52,7 @@ buildPythonPackage rec { ] ++ dissect-target.optional-dependencies.full; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.full; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full; pythonImportsCheck = [ "acquire" ]; diff --git a/pkgs/development/python-modules/adafruit-io/default.nix b/pkgs/development/python-modules/adafruit-io/default.nix index 3177c7804766..e0f1122a464e 100644 --- a/pkgs/development/python-modules/adafruit-io/default.nix +++ b/pkgs/development/python-modules/adafruit-io/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "adafruit-io"; - version = "2.7.2"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "adafruit"; repo = "Adafruit_IO_Python"; rev = "refs/tags/${version}"; - hash = "sha256-JBpF08WGe1pMK1y7HZLH/jSQkJtbWdiTGYHWRd39UIk="; + hash = "sha256-OwTHMyc2ePSdYVuY1h3PY+uDBl6/7fTMXiZC3sZm8fU="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 5f433ee5bfc3..f457e46b88d8 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.74.0"; + version = "3.75.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "adafruit_platformdetect"; inherit version; - hash = "sha256-rVmtqpVjQgovAsVCu3+hgglga9LJPGT8zzlhySmpba8="; + hash = "sha256-5Awvnzw0tgZhRXVshTOuzerdORJ+5QCH3PDB7pbjCB0="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index a7347c080d78..b37440c51c8b 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { rsa ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiofiles async-timeout @@ -46,7 +46,7 @@ buildPythonPackage rec { mock pycryptodome pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "adb_shell" ]; diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index 7faeab491f62..67170159f348 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreFoundation Security diff --git a/pkgs/development/python-modules/adjusttext/default.nix b/pkgs/development/python-modules/adjusttext/default.nix index 334a10de460b..550fd5f9db30 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.2.0"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,15 +21,15 @@ buildPythonPackage rec { owner = "Phlya"; repo = "adjusttext"; rev = "refs/tags/v${version}"; - hash = "sha256-2EaFKvRdFPGnDlO8owjP1vCIY1hTQ3tep5oXV/JeU9M="; + hash = "sha256-WMWT2os3ADQOc1ogoCFKBEWnb6/CxgtiWmY45bYomks="; }; - nativeBuildInputs = [ + build-system = [ packaging setuptools ]; - propagatedBuildInputs = [ + dependencies = [ matplotlib numpy scipy diff --git a/pkgs/development/python-modules/aerosandbox/default.nix b/pkgs/development/python-modules/aerosandbox/default.nix index f108219b6b08..17bf01626067 100644 --- a/pkgs/development/python-modules/aerosandbox/default.nix +++ b/pkgs/development/python-modules/aerosandbox/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aerosandbox"; - version = "4.2.5"; + version = "4.2.6"; format = "wheel"; src = fetchPypi { @@ -25,7 +25,7 @@ buildPythonPackage rec { python = "py3"; dist = "py3"; - hash = "sha256-9WxeXmcOZpKpNn8r6REudQlDRXavym52tvKajYJIfXA="; + hash = "sha256-jS1Eh/+2WXZkQC4pt1Rwvw7plJC1NFFC08gqzEyGir4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix index a7e5ee143667..d74c96288335 100644 --- a/pkgs/development/python-modules/aesara/default.nix +++ b/pkgs/development/python-modules/aesara/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "aesara"; - version = "2.9.3"; + version = "2.9.4"; pyproject = true; # Python 3.12 is not supported: https://github.com/aesara-devs/aesara/issues/1520 @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = "aesara"; rev = "refs/tags/rel-${version}"; - hash = "sha256-aO0+O7Ts9phsV4ghunNolxfAruGBbC+tHjVkmFedcCI="; + hash = "sha256-V34uP50TfH6cLU7nWOx+8oXY1QawtaoIaKQpbLnz7eo="; }; build-system = [ @@ -108,6 +108,6 @@ buildPythonPackage rec { changelog = "https://github.com/aesara-devs/aesara/releases/tag/rel-${version}"; license = licenses.bsd3; maintainers = with maintainers; [ Etjean ]; - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/pkgs/development/python-modules/aetcd/default.nix b/pkgs/development/python-modules/aetcd/default.nix index 77cd49ad8029..bc8fc1ce325e 100644 --- a/pkgs/development/python-modules/aetcd/default.nix +++ b/pkgs/development/python-modules/aetcd/default.nix @@ -5,6 +5,7 @@ grpcio, protobuf, pytest-asyncio, + pytest-cov-stub, pytest-mock, pytestCheckHook, pythonOlder, @@ -29,22 +30,23 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace-fail "setuptools_scm==6.3.2" "setuptools_scm" - substituteInPlace setup.cfg \ - --replace-fail "--cov=aetcd" "" ''; - nativeBuildInputs = [ + pythonRelaxDeps = [ "protobuf" ]; + + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ grpcio protobuf ]; nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytest-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index a0b9efec09c1..3181ecda7639 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -1,52 +1,47 @@ { lib, stdenv, + # Enables some expensive tests, useful for verifying an update + afdko, + antlr4_9, + booleanoperations, buildPythonPackage, - fetchFromGitHub, - pythonOlder, - fonttools, + cmake, defcon, - lxml, - fs, - unicodedata2, - zopfli, - brotlipy, - fontpens, - brotli, + fetchFromGitHub, fontmath, + fontpens, + fonttools, + libxml2, mutatormath, - booleanoperations, - ufoprocessor, - ufonormalizer, - tqdm, - setuptools-scm, - scikit-build, - cmake, ninja, - antlr4_9, - libxml2, pytestCheckHook, - # Enables some expensive tests, useful for verifying an update + pythonOlder, runAllTests ? false, - afdko, + scikit-build, + setuptools-scm, + tqdm, + ufonormalizer, + ufoprocessor, }: buildPythonPackage rec { pname = "afdko"; version = "4.0.1"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "adobe-type-tools"; - repo = pname; + repo = "afdko"; rev = "refs/tags/${version}"; hash = "sha256-I5GKPkbyQX8QNSZgNB3wPKdWwpx8Xkklesu1M7nhgp8="; }; + build-system = [ setuptools-scm ]; + nativeBuildInputs = [ - setuptools-scm scikit-build cmake ninja @@ -78,23 +73,23 @@ buildPythonPackage rec { # setup.py will always (re-)execute cmake in buildPhase dontConfigure = true; - propagatedBuildInputs = [ - booleanoperations - fonttools - lxml # fonttools[lxml], defcon[lxml] extra - fs # fonttools[ufo] extra - unicodedata2 # fonttools[unicode] extra - brotlipy # fonttools[woff] extra - zopfli # fonttools[woff] extra - fontpens - brotli - defcon - fontmath - mutatormath - ufoprocessor - ufonormalizer - tqdm - ]; + dependencies = + [ + booleanoperations + defcon + fontmath + fontpens + fonttools + mutatormath + tqdm + ufonormalizer + ufoprocessor + ] + ++ defcon.optional-dependencies.lxml + ++ fonttools.optional-dependencies.lxml + ++ fonttools.optional-dependencies.ufo + ++ fonttools.optional-dependencies.unicode + ++ fonttools.optional-dependencies.woff; # Use system libxml2 FORCE_SYSTEM_LIBXML2 = true; @@ -115,6 +110,12 @@ buildPythonPackage rec { "test_hinting_data" "test_waterfallplot" ] + ++ lib.optionals (stdenv.cc.isGNU) [ + # broke in the gcc 13 -> 14 update + "test_dump" + "test_input_formats" + "test_other_input_formats" + ] ++ lib.optionals (!runAllTests) [ # Disable slow tests, reduces test time ~25 % "test_report" @@ -140,10 +141,10 @@ buildPythonPackage rec { }; meta = with lib; { - changelog = "https://github.com/adobe-type-tools/afdko/blob/${version}/NEWS.md"; description = "Adobe Font Development Kit for OpenType"; + changelog = "https://github.com/adobe-type-tools/afdko/blob/${version}/NEWS.md"; homepage = "https://adobe-type-tools.github.io/afdko"; license = licenses.asl20; - maintainers = [ maintainers.sternenseemann ]; + maintainers = with maintainers; [ sternenseemann ]; }; } diff --git a/pkgs/development/python-modules/agent-py/default.nix b/pkgs/development/python-modules/agent-py/default.nix index eb1702d32709..8c9ef8be3c58 100644 --- a/pkgs/development/python-modules/agent-py/default.nix +++ b/pkgs/development/python-modules/agent-py/default.nix @@ -1,33 +1,33 @@ { aiohttp, buildPythonPackage, - fetchPypi, - isPy3k, + fetchFromGitHub, lib, - python, - requests, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { pname = "agent-py"; - version = "0.0.23"; - format = "setuptools"; + version = "0.0.24"; + pyproject = true; - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "1hx88m8b8kfb2gm6hii5ldjv7hlvqf99cz0w2vj0d0grrxcbn5cz"; + src = fetchFromGitHub { + owner = "ispysoftware"; + repo = "agent-py"; + rev = "refs/tags/agent-py.${version}"; + hash = "sha256-PP4gQ3AFYLJPUt9jhhiV9HkfBhIzd+JIsGpgK6FNmaE="; }; - propagatedBuildInputs = [ - requests - aiohttp - ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; + + doCheck = false; # only test is outdated + + nativeCheckInputs = [ pytestCheckHook ]; - checkPhase = '' - ${python.interpreter} tests/test_agent.py - ''; + pythonImportsCheck = [ "agent" ]; meta = with lib; { description = "Python wrapper around the Agent REST API"; diff --git a/pkgs/development/python-modules/aggdraw/default.nix b/pkgs/development/python-modules/aggdraw/default.nix index 06e092b4a605..5eaa52f72676 100644 --- a/pkgs/development/python-modules/aggdraw/default.nix +++ b/pkgs/development/python-modules/aggdraw/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "aggdraw"; - version = "1.3.18"; + version = "1.3.19"; format = "pyproject"; src = fetchFromGitHub { owner = "pytroll"; repo = pname; rev = "v${version}"; - hash = "sha256-dM6yLR6xsZerpqY+BMxIjrJ3fQty9CFUWhxl2zkTgRA="; + hash = "sha256-J9+mxlUxOoRBFdz+p8me2T93jaov5rNvKbAZ2YX/VhA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aggregate6/0001-setup-remove-nose-coverage.patch b/pkgs/development/python-modules/aggregate6/0001-setup-remove-nose-coverage.patch new file mode 100644 index 000000000000..feaddc465032 --- /dev/null +++ b/pkgs/development/python-modules/aggregate6/0001-setup-remove-nose-coverage.patch @@ -0,0 +1,31 @@ +From d20c7039316ea7c76da86963b266d3c34001b9f7 Mon Sep 17 00:00:00 2001 +From: Marcel <me@m4rc3l.de> +Date: Sat, 2 Nov 2024 21:13:37 +0100 +Subject: [PATCH] setup: remove nose, coverage + +--- + setup.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index b880f27..7a47360 100644 +--- a/setup.py ++++ b/setup.py +@@ -70,7 +70,7 @@ setup( + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.6' + ], +- setup_requires=["nose", "coverage", "mock"], ++ setup_requires=["mock"], + install_requires=["py-radix==0.10.0"] + ( + ["future", "ipaddress"] if sys.version_info.major == 2 else [] + ), +@@ -78,5 +78,4 @@ setup( + entry_points={'console_scripts': + ['aggregate6 = aggregate6.aggregate6:main']}, + data_files = [('man/man7', ['aggregate6.7'])], +- test_suite='nose.collector' + ) +-- +2.44.1 + diff --git a/pkgs/development/python-modules/aggregate6/default.nix b/pkgs/development/python-modules/aggregate6/default.nix new file mode 100644 index 000000000000..2be5f07a85ac --- /dev/null +++ b/pkgs/development/python-modules/aggregate6/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + py-radix-sr, + pytestCheckHook, + mock, +}: + +buildPythonPackage rec { + pname = "aggregate6"; + version = "1.0.12"; + pyproject = true; + + src = fetchFromGitHub { + owner = "job"; + repo = "aggregate6"; + rev = version; + hash = "sha256-tBo9LSmEu/0KPSeg17dlh7ngUvP9GyW6b01qqpr5Bx0="; + }; + + patches = [ ./0001-setup-remove-nose-coverage.patch ]; + + # py-radix-sr is a fork, with fixes + postPatch = '' + substituteInPlace setup.py --replace-fail 'py-radix==0.10.0' 'py-radix-sr' + ''; + + build-system = [ setuptools ]; + + dependencies = [ py-radix-sr ]; + + nativeCheckInputs = [ + pytestCheckHook + mock + ]; + + pythonImportsCheck = [ "aggregate6" ]; + + meta = { + description = "IPv4 and IPv6 prefix aggregation tool"; + mainProgram = "aggregate6"; + homepage = "https://github.com/job/aggregate6"; + license = with lib.licenses; [ bsd2 ]; + maintainers = lib.teams.wdz.members ++ (with lib.maintainers; [ marcel ]); + }; +} diff --git a/pkgs/development/python-modules/ahocorasick-rs/default.nix b/pkgs/development/python-modules/ahocorasick-rs/default.nix index 63c849e3537b..2f81eb4ccc4d 100644 --- a/pkgs/development/python-modules/ahocorasick-rs/default.nix +++ b/pkgs/development/python-modules/ahocorasick-rs/default.nix @@ -1,11 +1,13 @@ { lib, buildPythonPackage, + pythonOlder, fetchPypi, rustPlatform, pytestCheckHook, pyahocorasick, hypothesis, + typing-extensions, pytest-benchmark, }: @@ -32,6 +34,8 @@ buildPythonPackage rec { cargoSetupHook ]; + dependencies = lib.optionals (pythonOlder "3.12") [ typing-extensions ]; + nativeCheckInputs = [ pytest-benchmark pytestCheckHook diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 30998bc2ad47..3fb23cba1ce0 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.118"; + version = "9.2.127"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-wpH3hO5ge6WiUe3DxVMPylzTdTuqrmK4+ky1JkwGBY0="; + hash = "sha256-yd4O4REUjTRYZ3lODlsxmbbPHY7Z2X217wQWSn3Uv3U="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix index 4034699d2d29..0f1a069056f8 100644 --- a/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -15,23 +15,25 @@ buildPythonPackage rec { pname = "aio-geojson-client"; - version = "0.20"; + version = "0.21"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-client"; rev = "refs/tags/v${version}"; - hash = "sha256-GASjsOCZ4lSK0+VtIuVxFNxjMCbHkUGy/KSBtGLSaXw="; + hash = "sha256-zHgqsl278XBr2X8oQOsnIQxfyYuB5G8NLcTNy4oerUI="; }; + pythonRelaxDeps = [ "geojson" ]; + __darwinAllowLocalNetworking = true; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp geojson haversine @@ -50,7 +52,7 @@ buildPythonPackage rec { description = "Python module for accessing GeoJSON feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-client"; changelog = "https://github.com/exxamalte/python-aio-geojson-client/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix index c47ea3e7cf57..6ca27df746f6 100644 --- a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix @@ -15,30 +15,28 @@ buildPythonPackage rec { pname = "aio-geojson-generic-client"; - version = "0.4"; + version = "0.5"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-generic-client"; rev = "refs/tags/v${version}"; - hash = "sha256-065aPocJFOTn+naedxRJ7U/b7hjrYViu2MEUsBpQ9cY="; + hash = "sha256-/I/n/XXRvm7G16WqVmU+KkyP5DeadqhEpy2EAtDFlCk="; }; __darwinAllowLocalNetworking = true; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; pythonRelaxDeps = [ # geojson>=2.4.0,<3, but we have 3.x "geojson" ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp aio-geojson-client geojson @@ -57,7 +55,7 @@ buildPythonPackage rec { description = "Python library for accessing GeoJSON feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-generic-client"; changelog = "https://github.com/exxamalte/python-aio-geojson-generic-client/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix index f9dd37f5653a..be94149d8263 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix @@ -14,28 +14,26 @@ buildPythonPackage rec { pname = "aio-geojson-geonetnz-quakes"; - version = "0.16"; + version = "0.17"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-quakes"; rev = "refs/tags/v${version}"; - hash = "sha256-8OpmA3yHjUY+N5Obri4RWeuJiW916xGSWUYUgdpmjkw="; + hash = "sha256-RZ+wgLYMl7y3CdmlipsfZGcew1pYSMEhkyyeLqIwVwI="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aio-geojson-client aiohttp pytz ]; - __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ aioresponses pytest-asyncio @@ -44,11 +42,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "aio_geojson_geonetnz_quakes" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Python module for accessing the GeoNet NZ Quakes GeoJSON feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes"; changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix index 6050107c9acf..2726a9493576 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix @@ -16,28 +16,26 @@ buildPythonPackage rec { pname = "aio-geojson-geonetnz-volcano"; - version = "0.9"; + version = "0.10"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-volcano"; rev = "refs/tags/v${version}"; - hash = "sha256-ZmGDO9EROFMlxdj5txNh719M+3l/0jRFbB2h2AyZAdI="; + hash = "sha256-B+jULYeel7efk7fB26zXQyS1ZCsmFVKlOkfnKWFQFJ4="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aio-geojson-client aiohttp pytz ]; - __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ aioresponses mock @@ -48,11 +46,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "aio_geojson_geonetnz_volcano" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Python module for accessing the GeoNet NZ Volcanic GeoJSON feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano"; changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix index 2341e515a01e..2e4903ab4910 100644 --- a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix +++ b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aio-geojson-nsw-rfs-incidents"; - version = "0.7"; + version = "0.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,19 +23,17 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-nsw-rfs-incidents"; rev = "refs/tags/v${version}"; - hash = "sha256-HksiKfXhLASAgU81x7YiOXFmBLIkqJ9ldWLLY1ZbZlk="; + hash = "sha256-JOvmUWrmYQt2hJ9u08Aliv9ImI3AOTk4uBx3Pv8/7/c="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aio-geojson-client aiohttp pytz ]; - __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ aioresponses pytest-asyncio @@ -44,11 +42,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "aio_geojson_nsw_rfs_incidents" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Python module for accessing the NSW Rural Fire Service incidents feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-nsw-rfs-incidents"; changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix index 55a67843f1e9..b2386179b9bc 100644 --- a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aio-geojson-usgs-earthquakes"; - version = "0.3"; + version = "0.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,33 +23,32 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-usgs-earthquakes"; rev = "refs/tags/v${version}"; - hash = "sha256-Q9vBy5R5N5ihJdSMALo88qVYcFVs2/33lYRPdLej4S8="; + hash = "sha256-UzLnctft/D38bqClqyyJ4b5GvVXM4CFSd6TypuLo0Y4="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aio-geojson-client aiohttp pytz ]; - __darwinAllowLocalNetworking = true; - - nativeCheckInputs = [ pytestCheckHook ]; - - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio + pytestCheckHook ]; pythonImportsCheck = [ "aio_geojson_usgs_earthquakes" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { - description = "Python module for accessing the U.S. Geological Survey Earthquake Hazards Program feeds"; + description = "Module for accessing the U.S. Geological Survey Earthquake Hazards Program feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-usgs-earthquakes"; changelog = "https://github.com/exxamalte/python-aio-geojson-usgs-earthquakes/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index 06964c3c9cb9..685e50650602 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.6.5"; + version = "0.6.10"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-+F1kcs3XBBRNSmiuobFIFHsZOHEFjwYq0oxkHViuWXw="; + hash = "sha256-H78vlCGJhIE1/utX4Dh1vssOwYnQxCytsEs+hpOPVtM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 34bdc5b65dd1..21d831c9e24e 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.9.3"; + version = "0.9.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone"; rev = "refs/tags/${version}"; - hash = "sha256-ThmHiZmXbpzTJ0JBm6gVsxZgmdzRqQfjNrJSFbwOIdU="; + hash = "sha256-LFMHueSz0ddZNYUL0uuC91dw1ppYcdE/EjKX0ikc+J0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioaseko/default.nix b/pkgs/development/python-modules/aioaseko/default.nix index 54ab5e62bcf3..15822fe46e53 100644 --- a/pkgs/development/python-modules/aioaseko/default.nix +++ b/pkgs/development/python-modules/aioaseko/default.nix @@ -1,32 +1,34 @@ { lib, aiohttp, + apischema, buildPythonPackage, fetchFromGitHub, + gql, pythonOlder, setuptools, - pyjwt, }: buildPythonPackage rec { pname = "aioaseko"; - version = "0.2.0"; - format = "pyproject"; + version = "1.0.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "milanmeu"; - repo = pname; + repo = "aioaseko"; rev = "refs/tags/v${version}"; - hash = "sha256-X2H+5roq5yNXET23Q3QNmYmG1oAFfvuvSsInsJi42/s="; + hash = "sha256-jUvpu/lOFKRUwEuYD1zRp0oODjf4AgH84fnGngtv9jw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp - pyjwt + apischema + gql ]; # Module has no tests @@ -38,7 +40,7 @@ buildPythonPackage rec { description = "Module to interact with the Aseko Pool Live API"; homepage = "https://github.com/milanmeu/aioaseko"; changelog = "https://github.com/milanmeu/aioaseko/releases/tag/v${version}"; - license = with licenses; [ lgpl3Plus ]; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index c3a4ec04b50c..9caf6af5bbbf 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -9,14 +9,16 @@ poetry-core, pyjwt, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, syrupy, + tzlocal, }: buildPythonPackage rec { pname = "aioautomower"; - version = "2024.9.1"; + version = "2024.10.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,14 +27,13 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-MdsK+QP8YdMceTiNwhuf84KARIHCyn7/g6WKrDB6yCc="; + hash = "sha256-kLsHJBmNxh+PmJQ9Y9Ve/CACovzsRZyzVjor/VKUmYk="; }; postPatch = '' # Upstream doesn't set a version substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' \ - --replace-fail "--cov" "" + --replace-fail 'version = "0.0.0"' 'version = "${version}"' ''; build-system = [ poetry-core ]; @@ -42,11 +43,13 @@ buildPythonPackage rec { ical mashumaro pyjwt + tzlocal ]; nativeCheckInputs = [ freezegun pytest-asyncio + pytest-cov-stub pytestCheckHook syrupy ]; diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 75fa1cc5b5dc..c21b2e2ad4dc 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.13.1"; + version = "2.15.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,25 +30,23 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiobotocore"; rev = "refs/tags/${version}"; - hash = "sha256-tSxCRms/YstYXWCJWirzhf87ZH4WUav/n7QfMvBwj2s="; + hash = "sha256-kPSkvvXBBwnWrdf0jmDNiTG6T1qpm5pNcPDHpnMFdmc="; }; # Relax version constraints: aiobotocore works with newer botocore versions # the pinning used to match some `extras_require` we're not using. - postPatch = '' - sed -i "s/'botocore>=.*'/'botocore'/" setup.py - ''; + pythonRelaxDeps = [ "botocore" ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp aioitertools botocore wrapt ]; - passthru.optional-dependencies = { + optional-dependencies = { awscli = [ awscli ]; boto3 = [ boto3 ]; }; diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index 54a2bfb88ef7..d1e87d08deaa 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -7,33 +7,29 @@ marshmallow, msgpack, pkgs, - pythonOlder, pytest-asyncio, + pytest-cov-stub, pytest-mock, pytestCheckHook, + pythonOlder, redis, setuptools, }: buildPythonPackage rec { pname = "aiocache"; - version = "0.12.2"; + version = "0.12.3"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiocache"; rev = "refs/tags/v${version}"; - hash = "sha256-yvXDNJL8uxReaU81klVWudJwh1hmvg5GeeILcNpm/YA="; + hash = "sha256-4QYCRXMWlt9fsiWgUTc2pKzXG7AG/zGmd4HT5ggIZNM="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail "--cov=aiocache --cov=tests/ --cov-report term" "" - ''; - build-system = [ setuptools ]; optional-dependencies = { @@ -46,6 +42,7 @@ buildPythonPackage rec { aiohttp marshmallow pytest-asyncio + pytest-cov-stub pytest-mock pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix index 51a73cc4ecbf..4cc00dd93d2b 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.10"; + version = "0.4.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,12 +28,12 @@ buildPythonPackage rec { owner = "chrysn"; repo = "aiocoap"; rev = "refs/tags/${version}"; - hash = "sha256-sKDkbv8OyPewfQpunFxezP0wjy3EAQxsQ0UfUm0REPM="; + hash = "sha256-a2qhMDFkRbMK4+xvPc140i0lPaWbTWeFlpvdLaNtOxA="; }; build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { oscore = [ cbor2 cryptography diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index c79904c5d05f..a3cdc57503be 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -6,38 +6,35 @@ fetchFromGitHub, pint, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "aiocomelit"; - version = "0.9.1"; + version = "0.10.0"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "chemelli74"; repo = "aiocomelit"; rev = "refs/tags/v${version}"; - hash = "sha256-3r9DyvzqtQ88VwKCghAC9nn5kXbBzbR8drTFTnWC/bM="; + hash = "sha256-5XyCc/OMFA99qwVjsVLCA4NedvcDBSSBzG8TvSg4sk0="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov=aiocomelit --cov-report=term-missing:skip-covered" "" - ''; + build-system = [ poetry-core ]; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ + dependencies = [ aiohttp + colorlog pint ]; nativeCheckInputs = [ - colorlog + pytest-cov-stub pytestCheckHook ]; @@ -46,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to control Comelit Simplehome"; homepage = "https://github.com/chemelli74/aiocomelit"; - changelog = "https://github.com/chemelli74/aiocomelit/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/chemelli74/aiocomelit/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index b374d2e51930..7b8bc059e731 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -18,7 +18,7 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = "aioconsole"; rev = "refs/tags/v${version}"; - hash = "sha256-gexVeMlDRxZXcBi/iIYPip0DZIKvxCxKmTd+9jm0ud8="; + hash = "sha256-gFkRhewuRScEhXy0lv2R0kHfaHT1gSp3TVrqL36cRVs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiodhcpwatcher/default.nix b/pkgs/development/python-modules/aiodhcpwatcher/default.nix index 16989e989305..f7fde19dc644 100644 --- a/pkgs/development/python-modules/aiodhcpwatcher/default.nix +++ b/pkgs/development/python-modules/aiodhcpwatcher/default.nix @@ -39,6 +39,10 @@ buildPythonPackage rec { pytestCheckHook ]; + preCheck = '' + export HOME=$TMPDIR + ''; + pythonImportsCheck = [ "aiodhcpwatcher" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index 90dcca8a4c2c..d81acb340b7f 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -8,16 +8,17 @@ fetchFromGitHub, ifaddr, netifaces, + poetry-core, pyroute2, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, - setuptools, }: buildPythonPackage rec { pname = "aiodiscover"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,12 +27,12 @@ buildPythonPackage rec { owner = "bdraco"; repo = "aiodiscover"; rev = "refs/tags/v${version}"; - hash = "sha256-+DcROb6jR0veD3oSKgyJHUi1VtCT54yBKvVqir5y+R4="; + hash = "sha256-A12YeNIm9Pv4zpzaejTk8VvLzKLHxZV2EzVpchLX1k8="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ async-timeout aiodns cached-ipaddress @@ -43,6 +44,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiodukeenergy/default.nix b/pkgs/development/python-modules/aiodukeenergy/default.nix new file mode 100644 index 000000000000..01e0fa7cae1a --- /dev/null +++ b/pkgs/development/python-modules/aiodukeenergy/default.nix @@ -0,0 +1,49 @@ +{ + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + lib, + poetry-core, + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, + yarl, +}: + +buildPythonPackage rec { + pname = "aiodukeenergy"; + version = "0.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "hunterjm"; + repo = "aiodukeenergy"; + rev = "refs/tags/v${version}"; + hash = "sha256-aDBleEp3ZlY1IfFCbsUEU+wzYgjNaJeip8crHlh5qHE="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + yarl + ]; + + pythonImportsCheck = [ "aiodukeenergy" ]; + + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytest-cov-stub + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/hunterjm/aiodukeenergy/blob/${src.rev}/CHANGELOG.md"; + description = "Asyncio Duke Energy"; + homepage = "https://github.com/hunterjm/aiodukeenergy"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 8e13ca9d212b..461fe2c4ff43 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "25.3.2"; + version = "27.0.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "esphome"; repo = "aioesphomeapi"; rev = "refs/tags/v${version}"; - hash = "sha256-ITNXPwQTKOyH0TXYr8v/VI5rPNCvKGb/zIE1q+Ja8j0="; + hash = "sha256-bcwChHWH621UoGHkP+xPNzmj+Uh18rWgkMSrtW9zFF8="; }; build-system = [ @@ -70,6 +70,11 @@ buildPythonPackage rec { "test_start_connection_can_only_increase_buffer_size_to_262144" ]; + disabledTestPaths = [ + # benchmarking requires pytest-codespeed + "tests/test_bluetooth_benchmarks.py" + ]; + pythonImportsCheck = [ "aioesphomeapi" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aiofile/default.nix b/pkgs/development/python-modules/aiofile/default.nix index 0ed8b3fa7a34..0f9b5966805e 100644 --- a/pkgs/development/python-modules/aiofile/default.nix +++ b/pkgs/development/python-modules/aiofile/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiofile" ]; disabledTests = [ - # Tests (SystemError) fails randomly during nix-review + # Tests (SystemError) fails randomly during nixpkgs-review "test_async_open_fp" "test_async_open_iter_chunked" "test_async_open_iter_chunked" diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index dd9e903a4369..8334a339d2eb 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -1,6 +1,6 @@ { - stdenv, lib, + stdenv, buildPythonPackage, fetchFromGitHub, hatchling, @@ -11,26 +11,26 @@ buildPythonPackage rec { pname = "aiofiles"; - version = "23.2.1"; - format = "pyproject"; + version = "24.1.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Tinche"; - repo = pname; + repo = "aiofiles"; rev = "refs/tags/v${version}"; - hash = "sha256-EbRQD/AoTMWAlPOMWmD0UdFjRyjt5MUBkJtcydUCdHM="; + hash = "sha256-uDKDMSNbMIlAaifpEBh1+q2bdZNUia8pPb30IOIgOAE="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_sendfile_file" # require loopback networking: @@ -45,6 +45,8 @@ buildPythonPackage rec { meta = with lib; { description = "File support for asyncio"; homepage = "https://github.com/Tinche/aiofiles"; - license = with licenses; [ asl20 ]; + changelog = "https://github.com/Tinche/aiofiles/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/aioflo/default.nix b/pkgs/development/python-modules/aioflo/default.nix index 13b51bf8ad21..a67453821a8d 100644 --- a/pkgs/development/python-modules/aioflo/default.nix +++ b/pkgs/development/python-modules/aioflo/default.nix @@ -15,34 +15,29 @@ buildPythonPackage rec { pname = "aioflo"; version = "2021.11.0"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bachya"; - repo = pname; - rev = version; + repo = "aioflo"; + rev = "refs/tags/${version}"; hash = "sha256-7NrOoc1gi8YzZaKvCnHnzAKPlMnMhqxjdyZGN5H/8TQ="; }; patches = [ - # This patch removes references to setuptools and wheel that are no longer - # necessary and changes poetry to poetry-core, so that we don't need to add - # unnecessary nativeBuildInputs. - # - # https://github.com/bachya/aioflo/pull/65 - # (fetchpatch { + # Clean-up, https://github.com/bachya/aioflo/pull/65 name = "clean-up-build-dependencies.patch"; url = "https://github.com/bachya/aioflo/commit/f38d3f6427777ab0eeb56177943679e2570f0634.patch"; hash = "sha256-iLgklhEZ61rrdzQoO6rp1HGZcqLsqGNitwIiPNLNHQ4="; }) ]; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ aiohttp ]; + dependencies = [ aiohttp ]; __darwinAllowLocalNetworking = true; @@ -55,10 +50,16 @@ buildPythonPackage rec { pythonImportsCheck = [ "aioflo" ]; + disabledTests = [ + # test is out-dated + "test_system_modes" + ]; + meta = with lib; { description = "Python library for Flo by Moen Smart Water Detectors"; homepage = "https://github.com/bachya/aioflo"; - license = with licenses; [ mit ]; + changelog = "https://github.com/bachya/aioflo/releases/tag/${version}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index bd448f41c849..9d3778b864b5 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -5,6 +5,7 @@ buildPythonPackage, fetchPypi, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -14,37 +15,31 @@ buildPythonPackage rec { pname = "aioftp"; - version = "0.22.3"; + version = "0.23.1"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-uqKxMYaqAWIuS4LyfC9I9Nr7SORXprGPzamakl4NwnA="; + hash = "sha256-uA6t2MqV0ru8+r594Vy+AawRey50Z3FzdN5Ge62TVws="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov" "" - ''; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ siosocks ]; - - passthru.optional-dependencies = { + optional-dependencies = { socks = [ siosocks ]; }; nativeCheckInputs = [ async-timeout pytest-asyncio + pytest-cov-stub pytestCheckHook trustme - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # uses 127.0.0.2, which macos doesn't like "test_pasv_connection_pasv_forced_response_address" ]; diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index 35c8cb8359c2..afd1bcd6258f 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -28,16 +28,16 @@ buildPythonPackage rec { pname = "aiogram"; - version = "3.13.0"; + version = "3.14.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "aiogram"; repo = "aiogram"; rev = "refs/tags/v${version}"; - hash = "sha256-P/W47IhVL7wvYI+v6OvnFJt79KPrgY6d1jdOk477MdM="; + hash = "sha256-SEq88e5MLNqssJhxPPwI2ZdpNdTCBomNpI0xmbmz3Pw="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/aiohappyeyeballs/default.nix b/pkgs/development/python-modules/aiohappyeyeballs/default.nix index 9ff8b61feed8..51b923c86df6 100644 --- a/pkgs/development/python-modules/aiohappyeyeballs/default.nix +++ b/pkgs/development/python-modules/aiohappyeyeballs/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aiohappyeyeballs"; - version = "2.3.6"; + version = "2.4.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "aiohappyeyeballs"; rev = "refs/tags/v${version}"; - hash = "sha256-3cin755WD3e75l+mm//KG+g2UEkHvdYYEFvkJ9j9D6s="; + hash = "sha256-ZHxAup3Qf+ejW5Lz9ucuiWAQAwSG0Rf5giPSwk9A0ww="; }; outputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { "doc" ]; - nativeBuildInputs = [ poetry-core ] ++ optional-dependencies.docs; + build-system = [ poetry-core ] ++ optional-dependencies.docs; optional-dependencies = { docs = [ diff --git a/pkgs/development/python-modules/aiohasupervisor/default.nix b/pkgs/development/python-modules/aiohasupervisor/default.nix index 04755463bf61..2f906fef1954 100644 --- a/pkgs/development/python-modules/aiohasupervisor/default.nix +++ b/pkgs/development/python-modules/aiohasupervisor/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "aiohasupervisor"; - version = "0.1.0b1"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.12"; src = fetchPypi { inherit pname version; - hash = "sha256-INpyN5jdXOzTC6t18PvbkbDM7n4Y4rejb08UfyJyFSk="; + hash = "sha256-oSQhZf0lV5bJYdrfu4j8Hw1F+EQfivEPQomatHixy9k="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index ca0204fe1257..1887ed1cebf1 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.2.3"; + version = "3.2.6"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = "aiohomekit"; rev = "refs/tags/${version}"; - hash = "sha256-gWuFCL78hcOflXlDwYDSu3+G/F8D5najtoTgKKzod1Y="; + hash = "sha256-2mo7huHnac17FzBK0z1iCFOTkTUBohvOVUJ1226w7Ks="; }; build-system = [ poetry-core ]; @@ -49,8 +49,6 @@ buildPythonPackage rec { zeroconf ]; - doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; - nativeCheckInputs = [ pytest-aiohttp pytestCheckHook @@ -61,17 +59,6 @@ buildPythonPackage rec { "tests/test_ip_pairing.py" ]; - disabledTests = [ - # AttributeError: 'MockedAsyncServiceInfo' object has no attribute '_set_properties' - "test_discover_find_one_unpaired" - "test_find_device_id_case_lower" - "test_find_device_id_case_upper" - "test_discover_missing_csharp" - "test_discover_csharp_case" - "test_discover_device_id_case_lower" - "test_discover_device_id_case_upper" - ]; - pythonImportsCheck = [ "aiohomekit" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aiohttp-basicauth/default.nix b/pkgs/development/python-modules/aiohttp-basicauth/default.nix index ee3e5483a1e4..eede039d4854 100644 --- a/pkgs/development/python-modules/aiohttp-basicauth/default.nix +++ b/pkgs/development/python-modules/aiohttp-basicauth/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiohttp-basicauth"; - version = "1.0.0"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "romis2012"; repo = "aiohttp-basicauth"; - rev = "v${version}"; - hash = "sha256-UaRzauHmBHYwXFqRwDn1py79BScqq5j5SWALM4dQBP4="; + rev = "refs/tags/v${version}"; + hash = "sha256-DjwrMlkVVceA5kDzm0c/on0VMOxyMMA3Hu4Y2Tiu0lI="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/aiohttp-client-cache/default.nix b/pkgs/development/python-modules/aiohttp-client-cache/default.nix index 6f3116938465..e7e1812db0ff 100644 --- a/pkgs/development/python-modules/aiohttp-client-cache/default.nix +++ b/pkgs/development/python-modules/aiohttp-client-cache/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aiohttp-client-cache"; - version = "0.11.1"; + version = "0.12.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "aiohttp_client_cache"; inherit version; - hash = "sha256-MuY60hAkD4Ik8+Encv5TrBAs8kx88Y3bhqy7n9+eS28="; + hash = "sha256-5g/oFhNrWx1m87trJyq4HZeFTqHk2bVwhaNgQmln0mU="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index eb275e0af22e..43ffc4d3c249 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -2,8 +2,8 @@ lib, aiohttp, buildPythonPackage, - fetchPypi, - flit, + fetchFromGitHub, + flit-core, pytest-aiohttp, pytest-cov-stub, pytestCheckHook, @@ -13,20 +13,26 @@ buildPythonPackage rec { pname = "aiohttp-remotes"; - version = "1.2.0"; - format = "pyproject"; + version = "1.3.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; - src = fetchPypi { - pname = "aiohttp_remotes"; - inherit version; - sha256 = "f95c3a6be5e2de746a85ce9af49ec548da6db8378d7e81bb171ec77b13562a6c"; + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "aiohttp-remotes"; + rev = "refs/tags/v${version}"; + hash = "sha256-/bcYrpZfO/sXc0Tcpr67GBqCu4ZSAVmUj9kzupIHHnM="; }; - nativeBuildInputs = [ flit ]; + build-system = [ + flit-core + ]; - propagatedBuildInputs = [ aiohttp ] ++ lib.optionals (pythonOlder "3.7") [ typing-extensions ]; + dependencies = [ + aiohttp + typing-extensions + ]; nativeCheckInputs = [ pytest-aiohttp @@ -36,12 +42,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiohttp_remotes" ]; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" - "--asyncio-mode=auto" - ]; - __darwinAllowLocalNetworking = true; meta = with lib; { diff --git a/pkgs/development/python-modules/aiohttp-session/default.nix b/pkgs/development/python-modules/aiohttp-session/default.nix index d52634972165..78d044573bcd 100644 --- a/pkgs/development/python-modules/aiohttp-session/default.nix +++ b/pkgs/development/python-modules/aiohttp-session/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "aiohttp-session"; - version = "2.12.0"; + version = "2.12.1"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiohttp-session"; - rev = "v${version}"; - hash = "sha256-7MNah4OIQnoxLoZkLOdeu5uCwSyPMhc6Wsht8dFconc="; + rev = "refs/tags/v${version}"; + hash = "sha256-mGWtHo/+jdCmv3TmUUv42hWSiLzPiP5ytB25pVyvZig="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index 9a4820ccf2e4..a742c77d1504 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { aiohttp attrs python-socks - ]; + ] ++ python-socks.optional-dependencies.asyncio; # Checks needs internet access doCheck = false; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 75db6b645291..86cb1b427734 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, substituteAll, python, + isPy310, # build-system cython, @@ -39,7 +40,7 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.10.5"; + version = "3.10.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -48,7 +49,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiohttp"; rev = "refs/tags/v${version}"; - hash = "sha256-HN2TJ8hVbClakV3ldTOn3wbrhCuf2Qn9EjWCSlSyJpw="; + hash = "sha256-c2mnt2ZQ7d7WO7Z8eDaUo9y+v0V0JwXUa1WJI9bwGTM="; }; patches = [ @@ -113,8 +114,13 @@ buildPythonPackage rec { # don't run benchmarks "test_import_time" ] - ++ lib.optionals stdenv.is32bit [ "test_cookiejar" ] - ++ lib.optionals stdenv.isDarwin [ + # these tests fail with python310 but succeeds with 11+ + ++ lib.optionals isPy310 [ + "test_https_proxy_unsupported_tls_in_tls" + "test_tcp_connector_raise_connector_ssl_error" + ] + ++ lib.optionals stdenv.hostPlatform.is32bit [ "test_cookiejar" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572, remove >= v4.0.0 "test_close" ]; @@ -129,7 +135,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Work around "OSError: AF_UNIX path too long" export TMPDIR="/tmp" ''; diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix index 6d59d99d14c8..879d1d5c6b52 100644 --- a/pkgs/development/python-modules/aioitertools/default.nix +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -16,19 +16,19 @@ buildPythonPackage rec { pname = "aioitertools"; - version = "0.11.0"; - format = "pyproject"; + version = "0.12.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-QsaLjdOmnCv38iM7999LtYtVe8pSUqwC7VGHu8Z9aDE="; + hash = "sha256-wqkFW0+7dwX1YbnYYFPor10QzIRdIsMgCMQ0kLLY3Ws="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; + dependencies = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; nativeCheckInputs = [ unittestCheckHook ]; @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables"; homepage = "https://aioitertools.omnilib.dev/"; + changelog = "https://github.com/omnilib/aioitertools/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/aiojellyfin/default.nix b/pkgs/development/python-modules/aiojellyfin/default.nix index 886346f92bbe..5bf409ed276e 100644 --- a/pkgs/development/python-modules/aiojellyfin/default.nix +++ b/pkgs/development/python-modules/aiojellyfin/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "aiojellyfin"; - version = "0.10.0"; + version = "0.10.1"; pyproject = true; src = fetchFromGitHub { owner = "Jc2k"; repo = "aiojellyfin"; - rev = "v${version}"; - hash = "sha256-D4/DlhCeeI4CggW7KGauZ57fHY92JM/kZSUODyNVcNg="; + rev = "refs/tags/v${version}"; + hash = "sha256-A+uvM1/7HntRMIdknfHr0TMGIjHk7BCwsZopXdVoEO8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix index 437e5a3ce0ce..4d976b0819cf 100644 --- a/pkgs/development/python-modules/aiojobs/default.nix +++ b/pkgs/development/python-modules/aiojobs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiojobs"; - version = "1.2.1"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiojobs"; rev = "refs/tags/v${version}"; - hash = "sha256-LwFXb/SHP6bbqPg1tqYwE03FKHf4Mv1PPOxnPdESH0I="; + hash = "sha256-FNc71YyAjtR+hd0UOqFAy6XW0PwHSlM76C3ecPM5vsU="; }; patches = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ async-timeout ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; }; @@ -45,7 +45,7 @@ buildPythonPackage rec { pytestCheckHook pytest-aiohttp pytest-cov-stub - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "aiojobs" ]; diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/pkgs/development/python-modules/aiokafka/default.nix index c44bf8e44468..131f0c041323 100644 --- a/pkgs/development/python-modules/aiokafka/default.nix +++ b/pkgs/development/python-modules/aiokafka/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "aiokafka"; - version = "0.11.0"; + version = "0.12.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiokafka"; rev = "refs/tags/v${version}"; - hash = "sha256-CeEPRCsf2SFI5J5FuQlCRRtlOPcCtRiGXJUIQOAbyCc="; + hash = "sha256-OU/Kept3TvMfGvVCjSthfZnfTX6/T0Fy3PS/ynrV3Cg="; }; build-system = [ diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 76d690b16c9c..e0d39956b7b5 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.5.5"; + version = "0.5.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-Q4PlEnbdEUWYG/odD+xSG975lsRQqhOgFb//hk+PWIw="; + hash = "sha256-q3PAQbx3ch3Cq3634wxR1V3sLQom17V+oiJyjU2F7wY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aiolip/default.nix b/pkgs/development/python-modules/aiolip/default.nix deleted file mode 100644 index 06c23bc68bea..000000000000 --- a/pkgs/development/python-modules/aiolip/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pytestCheckHook, - setuptools, - pythonOlder, -}: - -buildPythonPackage rec { - pname = "aiolip"; - version = "1.1.6"; - pyproject = true; - disabled = pythonOlder "3.5"; - - src = fetchFromGitHub { - owner = "bdraco"; - repo = "aiolip"; - rev = version; - sha256 = "1bgmcl8q1p6f2xm3w2qylvla6vf6bd1p2hfwj4l8w6w0w04vr02g"; - }; - - build-system = [ setuptools ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - postPatch = '' - substituteInPlace setup.py --replace-fail "'pytest-runner'," "" - ''; - - pythonImportsCheck = [ "aiolip" ]; - - meta = with lib; { - description = "Python module for the Lutron Integration Protocol"; - homepage = "https://github.com/bdraco/aiolip"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/aiomealie/default.nix b/pkgs/development/python-modules/aiomealie/default.nix index e6ea538d2453..ee4ad62a1baf 100644 --- a/pkgs/development/python-modules/aiomealie/default.nix +++ b/pkgs/development/python-modules/aiomealie/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aiomealie"; - version = "0.9.2"; + version = "0.9.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-mealie"; rev = "refs/tags/v${version}"; - hash = "sha256-rvizMeV1+tsBQiZl2Am4SjLrFkyhR/SvvLFwOTVP6wI="; + hash = "sha256-FJhmipWE3DE4PRWkEq8/j9iz9HQ7G7J5I9hwjU6e3FA="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index 8f3050f3ed48..a9dabfd3ee2a 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { dependencies = [ colorlog ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ] - ++ lib.optionals stdenv.isLinux [ logging-journald ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ logging-journald ]; nativeCheckInputs = [ aiocontextvars @@ -45,9 +45,9 @@ buildPythonPackage rec { fastapi pytestCheckHook setproctitle - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; #asgi = [ aiohttp-asgi ]; cron = [ croniter ]; diff --git a/pkgs/development/python-modules/aiomodernforms/default.nix b/pkgs/development/python-modules/aiomodernforms/default.nix index 4727fa2b46a5..97e7f60eadf5 100644 --- a/pkgs/development/python-modules/aiomodernforms/default.nix +++ b/pkgs/development/python-modules/aiomodernforms/default.nix @@ -34,6 +34,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # https://github.com/wonderslug/aiomodernforms/issues/273 + "test_connection_error" + "test_empty_response" + ]; + pythonImportsCheck = [ "aiomodernforms" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix index bb6227377203..963ddc56eaad 100644 --- a/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioopenexchangerates"; - version = "0.6.2"; + version = "0.6.8"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aioopenexchangerates"; rev = "refs/tags/v${version}"; - hash = "sha256-XsNeIUgHFPatGAhxcwtfSXUi+0sCQf9E6GH5C8OrpJg="; + hash = "sha256-O7Hq+dtonh527eJI4/YSIF58P3TWsdFlUYDd0vzA2yo="; }; pythonRelaxDeps = [ "pydantic" ]; diff --git a/pkgs/development/python-modules/aiooui/default.nix b/pkgs/development/python-modules/aiooui/default.nix index bc087915bf4f..ec2dfb2f035c 100644 --- a/pkgs/development/python-modules/aiooui/default.nix +++ b/pkgs/development/python-modules/aiooui/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiooui"; - version = "0.1.6"; + version = "0.1.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "aiooui"; rev = "refs/tags/v${version}"; - hash = "sha256-dsMVKfY9o1krzp100/7JtClgPrpsFTVNwMnYMqOVFIU="; + hash = "sha256-vnO3Lh+d/8mES2i4jKTH4RviURUFqb3Vj6u5sxUGf1o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aioprometheus/default.nix b/pkgs/development/python-modules/aioprometheus/default.nix index 0c74e4a6ac25..2dc49ae5b1f8 100644 --- a/pkgs/development/python-modules/aioprometheus/default.nix +++ b/pkgs/development/python-modules/aioprometheus/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { quantile-python ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; starlette = [ starlette ]; quart = [ quart ]; @@ -46,7 +46,7 @@ buildPythonPackage rec { httpx fastapi uvicorn - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "aioprometheus" ]; diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index 7056d56f8599..d38b0f88960c 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.9.0"; + version = "0.9.25"; pyproject = true; disabled = pythonOlder "3.12"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiortm"; rev = "refs/tags/v${version}"; - hash = "sha256-fGUD0Ne7S2MyR4ilKy6GGzuWE+nO/DWMnBex4YZbXc8="; + hash = "sha256-rw86RzP8AI+zWchC9c01vdedc6r4gfF5A8DltWW5YRY="; }; pythonRelaxDeps = [ "typer" ]; diff --git a/pkgs/development/python-modules/aiortsp/default.nix b/pkgs/development/python-modules/aiortsp/default.nix index 4bdf43d38766..0e3920cfd6a8 100644 --- a/pkgs/development/python-modules/aiortsp/default.nix +++ b/pkgs/development/python-modules/aiortsp/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "aiortsp"; - version = "1.3.7"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "marss"; repo = "aiortsp"; - rev = version; - hash = "sha256-bxfnKAzMYh0lhS3he617eGhO7hmNbiwEYHh8k/PZ6r4="; + rev = "refs/tags/v${version}"; + hash = "sha256-/ydsu+53WOocdWk3AW0/cXBEx1qAlhIC0LUDy459pbQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix index 26d02803c4d7..53cfadb2118a 100644 --- a/pkgs/development/python-modules/aiorun/default.nix +++ b/pkgs/development/python-modules/aiorun/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - fetchpatch, flit-core, pygments, pytestCheckHook, @@ -12,7 +11,7 @@ buildPythonPackage rec { pname = "aiorun"; - version = "2023.7.2"; + version = "2024.5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,18 +20,9 @@ buildPythonPackage rec { owner = "cjrh"; repo = "aiorun"; rev = "refs/tags/v${version}"; - hash = "sha256-3AGsT8IUNi5SZHBsBfd7akj8eQ+xb0mrR7ydIr3T8gs="; + hash = "sha256-7wgsj44sX2Be/QyvG7KgQ/xSgsr+WPh7eeROeICSHGw="; }; - patches = [ - # Raise flit-core version constrains - (fetchpatch { - # https://github.com/cjrh/aiorun/pull/85 - url = "https://github.com/cjrh/aiorun/commit/a0c027ea331167712738e35ca70fefcd794e16d5.patch"; - hash = "sha256-M1rcrkdFcoFa3IncPnJaRhnXbelyk56QnMGtmgB6bvk="; - }) - ]; - build-system = [ flit-core ]; dependencies = [ pygments ]; @@ -42,7 +32,6 @@ buildPythonPackage rec { uvloop ]; - # allow for writable directory for darwin preBuild = '' export HOME=$TMPDIR ''; diff --git a/pkgs/development/python-modules/aiorussound/default.nix b/pkgs/development/python-modules/aiorussound/default.nix index 3e700c818985..6e702e7927cb 100644 --- a/pkgs/development/python-modules/aiorussound/default.nix +++ b/pkgs/development/python-modules/aiorussound/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aiorussound"; - version = "3.0.5"; + version = "4.0.5"; pyproject = true; # requires newer f-strings introduced in 3.12 @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "noahhusby"; repo = "aiorussound"; rev = "refs/tags/${version}"; - hash = "sha256-tv/Box8YqmFXvnezp44lKrPscK9K24+mXBv9aZw/3M4="; + hash = "sha256-W0vhVK1SmnTsNuXpDn2e1BrBnsdBwgiNyXucC+ASg1M="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index a7d2a5349852..34f6b0d45677 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -1,6 +1,7 @@ { lib, aiohttp, + aioresponses, bluetooth-data-tools, buildPythonPackage, fetchFromGitHub, @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "11.4.2"; + version = "12.0.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioshelly"; rev = "refs/tags/${version}"; - hash = "sha256-aJA+iE8cyUPrL2n72N8/HI8//h0qR6k/hgD34vpwI+0="; + hash = "sha256-DO3y3tn+hsrTQfiBj3DtQG19SvIbXN7MuVPKlyZ4vP0="; }; build-system = [ setuptools ]; @@ -38,6 +39,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + aioresponses pytest-asyncio pytestCheckHook ]; @@ -48,7 +50,7 @@ buildPythonPackage rec { description = "Python library to control Shelly"; homepage = "https://github.com/home-assistant-libs/aioshelly"; changelog = "https://github.com/home-assistant-libs/aioshelly/releases/tag/${version}"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/aioskybell/default.nix b/pkgs/development/python-modules/aioskybell/default.nix index 922d60f4c33c..d67a770f18fd 100644 --- a/pkgs/development/python-modules/aioskybell/default.nix +++ b/pkgs/development/python-modules/aioskybell/default.nix @@ -47,6 +47,13 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # aiohttp compat issues + "test_get_devices" + "test_errors" + "test_async_change_setting" + ]; + pythonImportsCheck = [ "aioskybell" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix index 0f6d21d3aefb..037c74bc9b99 100644 --- a/pkgs/development/python-modules/aioslimproto/default.nix +++ b/pkgs/development/python-modules/aioslimproto/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aioslimproto"; - version = "3.0.1"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioslimproto"; rev = "refs/tags/${version}"; - hash = "sha256-K7z34fT0PQ5qcV+66VbhYTUhCjqW/OjPnrygBFKIW1k="; + hash = "sha256-3soqvZld92ohCEwTFaMIOC+cvOjBQyVQOoLmKr53aMA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiosonic/default.nix b/pkgs/development/python-modules/aiosonic/default.nix index e4dd72e700cd..b5f4e5406b8b 100644 --- a/pkgs/development/python-modules/aiosonic/default.nix +++ b/pkgs/development/python-modules/aiosonic/default.nix @@ -90,7 +90,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiosonic" ]; disabledTests = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ # need network "test_simple_get" "test_get_python" @@ -132,7 +132,7 @@ buildPythonPackage rec { "test_get_with_cookies" "test_proxy_request" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # "FAILED tests/test_proxy.py::test_proxy_request - Exception: port 8865 never got active" "test_proxy_request" ]; diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix index 5f587ef0159c..415eeaeb271e 100644 --- a/pkgs/development/python-modules/aiosql/default.nix +++ b/pkgs/development/python-modules/aiosql/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiosql"; - version = "10.4"; + version = "12.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "nackjicholson"; repo = "aiosql"; rev = "refs/tags/${version}"; - hash = "sha256-TETZxIbC7pdak3m1rBwDg7L1yah/bin6iOZD/uANh48="; + hash = "sha256-Ouk1bzoczkUeYG0JKOgleLuyu9ll2y17AN7gsUI3SRo="; }; sphinxRoot = "docs/source"; diff --git a/pkgs/development/python-modules/aiostream/default.nix b/pkgs/development/python-modules/aiostream/default.nix index e6f7900a0b93..701278b299c8 100644 --- a/pkgs/development/python-modules/aiostream/default.nix +++ b/pkgs/development/python-modules/aiostream/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -11,29 +12,25 @@ buildPythonPackage rec { pname = "aiostream"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "vxgmichel"; repo = "aiostream"; rev = "refs/tags/v${version}"; - hash = "sha256-uMK3WFO4IvrI7QBGiu1MOInRfGgdWufe4zefmT1Bjv0="; + hash = "sha256-MssA4gDo79mlHjVwQAxhX6DZPHB4Quo6V05Nye91oJg="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov aiostream" "" - ''; - build-system = [ setuptools ]; dependencies = [ typing-extensions ]; nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiostreammagic/default.nix b/pkgs/development/python-modules/aiostreammagic/default.nix index fdee19ddc1f8..cc8f71f1a851 100644 --- a/pkgs/development/python-modules/aiostreammagic/default.nix +++ b/pkgs/development/python-modules/aiostreammagic/default.nix @@ -1,6 +1,5 @@ { lib, - aiohttp, buildPythonPackage, fetchFromGitHub, mashumaro, @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "aiostreammagic"; - version = "2.4.0"; + version = "2.8.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "noahhusby"; repo = "aiostreammagic"; rev = "refs/tags/${version}"; - hash = "sha256-TWGDviQ1SYLlzuIsot7JgB5XIEZES54ERJ3tv7+9DNc="; + hash = "sha256-TleCQjx1s8S1YTxh/d1T3oozQAwzPTCurzjLjDCebik="; }; pythonRelaxDeps = [ "websockets" ]; @@ -30,7 +29,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; dependencies = [ - aiohttp mashumaro orjson websockets diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 421e8ebc9b3c..08cbff77d200 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "4.0.3"; + version = "4.4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "TomerFi"; repo = "aioswitcher"; rev = "refs/tags/${version}"; - hash = "sha256-QSnroxVHlfZd6QDaqUTMyoctiEsxWmGmFxzql1YIAD0="; + hash = "sha256-O1wKw6jv2aRPLZ2hSYv3MwneeNcjO+2/RKzQ7xXWHtY="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/aiovlc/default.nix b/pkgs/development/python-modules/aiovlc/default.nix index 329cfee05257..126661bc1e17 100644 --- a/pkgs/development/python-modules/aiovlc/default.nix +++ b/pkgs/development/python-modules/aiovlc/default.nix @@ -8,13 +8,12 @@ pytest-timeout, pytestCheckHook, pythonOlder, - rich, typer, }: buildPythonPackage rec { pname = "aiovlc"; - version = "0.5.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,22 +22,21 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiovlc"; rev = "refs/tags/v${version}"; - hash = "sha256-F66HGfbsve/jYyUEapUTVtLxaEIW63r3eNNk7mXOx5Y="; + hash = "sha256-NnctcSgEHWEJUB0yDrSYMochh20CfT5jgtcALKmDjdo="; }; build-system = [ poetry-core ]; - dependencies = [ - rich - typer - ]; + optional-dependencies = { + cli = [ typer ]; + }; nativeCheckInputs = [ pytest-asyncio pytest-cov-stub pytest-timeout pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "aiovlc" ]; diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix index fc5b91f13a1b..c7665fc0ba6c 100644 --- a/pkgs/development/python-modules/aiovodafone/default.nix +++ b/pkgs/development/python-modules/aiovodafone/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiovodafone"; - version = "0.6.1"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiovodafone"; rev = "refs/tags/v${version}"; - hash = "sha256-ZBy3lo7rb361aysi2ezryd5H47r6sgSqmYNeAI+wXeQ="; + hash = "sha256-BVuDnIp9K+f4jZPPfCABMD+fpPXDQE6/RWTZ8k7ftMI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiowithings/default.nix b/pkgs/development/python-modules/aiowithings/default.nix index e2794d241193..2cbebe9352ec 100644 --- a/pkgs/development/python-modules/aiowithings/default.nix +++ b/pkgs/development/python-modules/aiowithings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiowithings"; - version = "3.0.3"; + version = "3.1.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-withings"; rev = "refs/tags/v${version}"; - hash = "sha256-YM+7raD5Wp+pC+R4DV92QN5E+TlNoMnt5M+n6Ax0W9k="; + hash = "sha256-OCdnHV2g6v5uPjtva9K3AtxEkY3oWSHJbZrhlinQU2Y="; }; postPatch = '' @@ -31,9 +31,9 @@ buildPythonPackage rec { --replace "--cov" "" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp yarl ]; @@ -47,6 +47,29 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiowithings" ]; + pytestFlagsArray = [ "--snapshot-update" ]; + + disabledTests = [ + # Tests require network access + "test_creating_own_session" + "test_error_codes" + "test_get_activities" + "test_get_devices" + "test_get_goals" + "test_get_measurement" + "test_get_new_device" + "test_get_sleep_summary" + "test_get_sleep" + "test_get_workouts" + "test_list_all_subscriptions" + "test_list_subscriptions" + "test_putting_in_own_session" + "test_revoking" + "test_subscribing" + "test_timeout" + "test_unexpected_server_response" + ]; + meta = with lib; { description = "Module to interact with Withings"; homepage = "https://github.com/joostlek/python-withings"; diff --git a/pkgs/development/python-modules/airgradient/default.nix b/pkgs/development/python-modules/airgradient/default.nix index 2eed753ffa90..d737d48a23c8 100644 --- a/pkgs/development/python-modules/airgradient/default.nix +++ b/pkgs/development/python-modules/airgradient/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "airgradient"; - version = "0.8.0"; + version = "0.9.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "airgradienthq"; repo = "python-airgradient"; rev = "refs/tags/v${version}"; - hash = "sha256-NONOfM61oCtiNgmKCXvkEvCzSjumwjaeuzg9l/7hX8M="; + hash = "sha256-al0DLsub3xLU1BWLNn0cMI87O0mcQJ0Y4Boj2Xwk1r0="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix index 766e321f45ea..854ab37120a2 100644 --- a/pkgs/development/python-modules/airthings-ble/default.nix +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "airthings-ble"; - version = "0.9.1"; + version = "0.9.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "vincegio"; repo = "airthings-ble"; rev = "refs/tags/${version}"; - hash = "sha256-pk/S0ufzirH4Xny0+nFVH366d0imqB2K6NvkGP7jAU4="; + hash = "sha256-m2jsXLrj2yS2Wi2dSwyxBv/nXmU738gd5iJ1JVfakUg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix index aea9b5ab6954..31058f42ba2b 100644 --- a/pkgs/development/python-modules/albucore/default.nix +++ b/pkgs/development/python-modules/albucore/default.nix @@ -6,32 +6,32 @@ setuptools, pytestCheckHook, numpy, - opencv4, - typing-extensions, + opencv-python, + stringzilla, }: buildPythonPackage rec { pname = "albucore"; - version = "0.0.14"; + version = "0.0.19"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "albumentations-team"; repo = "albucore"; rev = "refs/tags/${version}"; - hash = "sha256-6c6QiChP3SLTEj1SKlb/AcjQbLX4L9Fdlxem70cxiXM="; + hash = "sha256-GwT7Py7pKbpHxx4avj37/hRjSJXdH5uBU11nCITysVw="; }; - pythonRemoveDeps = [ "opencv-python" ]; + pythonRelaxDeps = [ "opencv-python" ]; build-system = [ setuptools ]; dependencies = [ numpy - opencv4 - typing-extensions + opencv-python + stringzilla ]; pythonImportsCheck = [ "albucore" ]; diff --git a/pkgs/development/python-modules/albumentations/default.nix b/pkgs/development/python-modules/albumentations/default.nix index a7bc2d525140..327bde178777 100644 --- a/pkgs/development/python-modules/albumentations/default.nix +++ b/pkgs/development/python-modules/albumentations/default.nix @@ -11,12 +11,17 @@ albucore, eval-type-backport, numpy, - opencv4, + opencv-python, pydantic, pyyaml, scikit-image, - scikit-learn, + scipy, + # optional dependencies + huggingface-hub, + pillow, + + # tests deepdiff, pytestCheckHook, pytest-mock, @@ -26,7 +31,7 @@ buildPythonPackage rec { pname = "albumentations"; - version = "1.4.11"; + version = "1.4.20"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,10 +40,14 @@ buildPythonPackage rec { owner = "albumentations-team"; repo = "albumentations"; rev = "refs/tags/${version}"; - hash = "sha256-1070V9+EZ4qrhxmbMyvTbu89pLoonrn0Peb8nwp2lwA="; + hash = "sha256-lyYbkO2J3kpZGk8Q3FYfRiQh+BdolCfeEcjlI3W/rIw="; }; - pythonRemoveDeps = [ "opencv-python" ]; + patches = [ + ./dont-check-for-updates.patch + ]; + + pythonRelaxDeps = [ "opencv-python" ]; build-system = [ setuptools ]; @@ -46,13 +55,18 @@ buildPythonPackage rec { albucore eval-type-backport numpy - opencv4 + opencv-python pydantic pyyaml scikit-image - scikit-learn + scipy ]; + optional-dependencies = { + hub = [ huggingface-hub ]; + text = [ pillow ]; + }; + nativeCheckInputs = [ deepdiff pytestCheckHook @@ -62,6 +76,7 @@ buildPythonPackage rec { ]; disabledTests = [ + "test_pca_inverse_transform" # this test hangs up "test_transforms" ]; diff --git a/pkgs/development/python-modules/albumentations/dont-check-for-updates.patch b/pkgs/development/python-modules/albumentations/dont-check-for-updates.patch new file mode 100644 index 000000000000..617ce259ca2b --- /dev/null +++ b/pkgs/development/python-modules/albumentations/dont-check-for-updates.patch @@ -0,0 +1,12 @@ +diff --git a/albumentations/__init__.py b/albumentations/__init__.py +index 0b3b531..7c69c65 100644 +--- a/albumentations/__init__.py ++++ b/albumentations/__init__.py +@@ -7,7 +7,3 @@ from .augmentations import * + from .core.composition import * + from .core.serialization import * + from .core.transforms_interface import * +- +-# Perform the version check after all other initializations +-if os.getenv("NO_ALBUMENTATIONS_UPDATE", "").lower() not in {"true", "1"}: +- check_for_updates() diff --git a/pkgs/development/python-modules/ale-py/default.nix b/pkgs/development/python-modules/ale-py/default.nix index cdf2363a52f1..852a94ed3ada 100644 --- a/pkgs/development/python-modules/ale-py/default.nix +++ b/pkgs/development/python-modules/ale-py/default.nix @@ -30,16 +30,14 @@ buildPythonPackage rec { pname = "ale-py"; - version = "0.9.1"; + version = "0.10.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "Farama-Foundation"; repo = "Arcade-Learning-Environment"; rev = "refs/tags/v${version}"; - hash = "sha256-MpumAQ5OW/+fRIvrBlRWkgioxMVceb5LxEH2JjRk5zY="; + hash = "sha256-MDMCYnyLZYbQXwyr5VuPeVEop825nD++yQ7hhsW4BX8="; }; build-system = [ @@ -64,12 +62,8 @@ buildPythonPackage rec { postPatch = # Relax the pybind11 version '' - substituteInPlace src/python/CMakeLists.txt \ + substituteInPlace src/ale/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; @@ -93,6 +87,6 @@ buildPythonPackage rec { changelog = "https://github.com/Farama-Foundation/Arcade-Learning-Environment/releases/tag/v${version}"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ billhuang ]; - broken = stdenv.isDarwin; # fails to link with missing library + broken = stdenv.hostPlatform.isDarwin; # fails to link with missing library }; } diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 4d41cc11a636..f56ce509b5ce 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.13.1"; + version = "1.13.3"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-STLIVYv2jy7pK5u8uCGGccYnBk1bCJOUN69td9wF5ZU="; + hash = "sha256-IDUDEXQVVh4gOqFFQXQGQ6YR9kFRfwIJ/K5j6foJ8aI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix index f68dec2eeb82..9fdbb0c65f22 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-core"; - version = "2.15.2"; + version = "2.16.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VPZqU+GTxhxeFupFBaDKtDVD+K0u8igz9pxNXlFRwX0="; + hash = "sha256-ZRyq1ZfrOdT61s+FEz3/6Sg31TvfYtudjzfatlCLuPk="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/alpha-vantage/default.nix b/pkgs/development/python-modules/alpha-vantage/default.nix index 3e39efa7d384..7830701eabee 100644 --- a/pkgs/development/python-modules/alpha-vantage/default.nix +++ b/pkgs/development/python-modules/alpha-vantage/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { pandas = [ pandas ]; @@ -49,7 +49,7 @@ buildPythonPackage rec { aioresponses requests-mock pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # Starting with 3.0.0 most tests require an API key doCheck = false; diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index f195c3b080ba..e34910b67aca 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -2,56 +2,57 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - - # Runtime dependencies hatchling, - toolz, - numpy, - jsonschema, - typing-extensions, - pandas, + ipython, + ipywidgets, jinja2, + jsonschema, + narwhals, + numpy, packaging, - - # Build, dev and test dependencies - anywidget, - ipython, + pandas, + polars, + pytest-xdist, pytestCheckHook, + pythonOlder, + toolz, + typing-extensions, vega-datasets, - sphinx, }: buildPythonPackage rec { pname = "altair"; - version = "5.3.0"; - format = "pyproject"; + version = "5.4.1"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "altair-viz"; repo = "altair"; rev = "refs/tags/v${version}"; - hash = "sha256-VGtH+baIKObJY8/44JCyKi+XrIddSqOtpNeMCO+8o9M="; + hash = "sha256-7C51ACaBuNtOSXqLpuCI5bnLyE9U64vNXlD4/msPq2k="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ jinja2 jsonschema + narwhals numpy packaging pandas toolz - ] ++ lib.optional (pythonOlder "3.11") typing-extensions; + ] ++ lib.optional (pythonOlder "3.14") typing-extensions; nativeCheckInputs = [ - anywidget ipython - sphinx - vega-datasets + ipywidgets + polars + pytest-xdist pytestCheckHook + vega-datasets ]; pythonImportsCheck = [ "altair" ]; diff --git a/pkgs/development/python-modules/amaranth-boards/default.nix b/pkgs/development/python-modules/amaranth-boards/default.nix index a010d3570b7c..cfd76b23a8ad 100644 --- a/pkgs/development/python-modules/amaranth-boards/default.nix +++ b/pkgs/development/python-modules/amaranth-boards/default.nix @@ -3,38 +3,36 @@ buildPythonPackage, fetchFromGitHub, amaranth, - setuptools, - setuptools-scm, + pdm-backend, unstableGitUpdater, }: buildPythonPackage rec { pname = "amaranth-boards"; - version = "0-unstable-2024-05-01"; + version = "0-unstable-2024-10-18"; pyproject = true; - # python setup.py --version - realVersion = "0.1.dev202+g${lib.substring 0 7 src.rev}"; + # from `pdm show` + realVersion = + let + tag = builtins.elemAt (lib.splitString "-" version) 0; + rev = lib.substring 0 7 src.rev; + in + "${tag}1.dev1+g${rev}"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-boards"; - rev = "aba2300dc83216523e1c98fdb22471cb4bac5027"; + rev = "23c66d68045831de0a372c8c237274d74c71ef4e"; # these files change depending on git branch status postFetch = "rm -f $out/.git_archival.txt $out/.gitattributes"; - hash = "sha256-jldXyMJtuSGcZKmtwpZBYrR/UBe4ufblPYRYpBmReM8="; + hash = "sha256-cC7uvj9+6h3RPbFdu3/T1t/jhw5CuLOF8aKwDSkRE54="; }; - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; - dependencies = [ - setuptools - amaranth - ]; + build-system = [ pdm-backend ]; + dependencies = [ amaranth ]; preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" + export PDM_BUILD_SCM_VERSION="${realVersion}" ''; # no tests diff --git a/pkgs/development/python-modules/amaranth-soc/default.nix b/pkgs/development/python-modules/amaranth-soc/default.nix index 597a1829161f..a33128a376d1 100644 --- a/pkgs/development/python-modules/amaranth-soc/default.nix +++ b/pkgs/development/python-modules/amaranth-soc/default.nix @@ -9,22 +9,24 @@ buildPythonPackage rec { pname = "amaranth-soc"; - version = "0.1a-unstable-2024-06-10"; + version = "0.1a-unstable-2024-10-12"; pyproject = true; # from `pdm show` - realVersion = let - tag = builtins.elemAt (lib.splitString "-" version) 0; - rev = lib.substring 0 7 src.rev; - in "${tag}1.dev1+g${rev}"; + realVersion = + let + tag = builtins.elemAt (lib.splitString "-" version) 0; + rev = lib.substring 0 7 src.rev; + in + "${tag}1.dev1+g${rev}"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-soc"; - rev = "e1b842800533f44924f21c3867bc2290084d100f"; - hash = "sha256-GAGQEncONY566v8hLjGeZ7CRlOt36vHg+0a5xcB+g1Y="; + rev = "5c43cf58f15d9cd9c69ff83c97997708d386b2dc"; + hash = "sha256-o9xjH/nmV7ovw6bQ6PaFGLcjz5gDGb+eQ9eGNRPnBV8="; }; - nativeBuildInputs = [ pdm-backend ]; + build-system = [ pdm-backend ]; dependencies = [ amaranth ]; preBuild = '' diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index bac25d70f040..ebb79d5e9ba9 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -21,20 +21,25 @@ buildPythonPackage rec { pname = "amaranth"; format = "pyproject"; - version = "0.5.2"; + version = "0.5.3"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth"; rev = "refs/tags/v${version}"; - hash = "sha256-pf9X1B60FgqTbSw7D80ERHp4GCvCe5lqrlS96xPXLNo="; + hash = "sha256-lPQw7fAVM7URdyC/9c/UIYsRxVXrLjvHODvhYBdlkkg="; }; - nativeBuildInputs = [ - git - pdm-backend - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail \ + "pdm-backend~=2.3.0" \ + "pdm-backend>=2.3.0" + ''; + + nativeBuildInputs = [ git ]; + build-system = [ pdm-backend ]; dependencies = [ diff --git a/pkgs/development/python-modules/ambee/default.nix b/pkgs/development/python-modules/ambee/default.nix deleted file mode 100644 index 91cf9f27b2e1..000000000000 --- a/pkgs/development/python-modules/ambee/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - buildPythonPackage, - pythonOlder, - fetchFromGitHub, - aiohttp, - poetry-core, - yarl, - aresponses, - pytest-asyncio, - pytest-cov-stub, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "ambee"; - version = "0.4.0"; - disabled = pythonOlder "3.8"; - pyproject = true; - - src = fetchFromGitHub { - owner = "frenck"; - repo = "python-ambee"; - rev = "v${version}"; - hash = "sha256-2wX2CLr6kdVw2AGPW6DmYI2OBfQFI/iWVorok2d3wx4="; - }; - - build-system = [ poetry-core ]; - - dependencies = [ - aiohttp - yarl - ]; - - nativeCheckInputs = [ - aresponses - pytest-asyncio - pytest-cov-stub - pytestCheckHook - ]; - - postPatch = '' - # Upstream doesn't set a version for the pyproject.toml - substituteInPlace pyproject.toml \ - --replace-fail "0.0.0" "${version}" - ''; - - pythonImportsCheck = [ "ambee" ]; - - meta = with lib; { - description = "Python client for Ambee API"; - homepage = "https://github.com/frenck/python-ambee"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/ancp-bids/default.nix b/pkgs/development/python-modules/ancp-bids/default.nix index 77978e6cd19c..8dd6dc28eeec 100644 --- a/pkgs/development/python-modules/ancp-bids/default.nix +++ b/pkgs/development/python-modules/ancp-bids/default.nix @@ -6,15 +6,15 @@ pythonOlder, pytestCheckHook, setuptools, - wheel, numpy, pandas, }: buildPythonPackage rec { pname = "ancp-bids"; - version = "0.2.4"; - format = "pyproject"; + version = "0.2.5"; + pyproject = true; + disabled = pythonOlder "3.7"; # `tests/data` dir missing from PyPI dist @@ -22,22 +22,10 @@ buildPythonPackage rec { owner = "ANCPLabOldenburg"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-c6X1gCYAezgZQP6xfQPfKW8V35F1cnTdbryEp3sZ4jw="; + hash = "sha256-bfHphFecPHKoVow8v+20LuQt6X1BGGtoTK4T9vhIkSc="; }; - patches = [ - # https://github.com/ANCPLabOldenburg/ancp-bids/pull/78 - (fetchpatch { - name = "unpin-wheel-build-dependency.patch"; - url = "https://github.com/ANCPLabOldenburg/ancp-bids/commit/6e7a0733002845aacb0152c5aacfb42054a9b65e.patch"; - hash = "sha256-WbQRwb8Wew46OJu+zo7n4qBtgtH/Lr6x3YHAyN9ko9M="; - }) - ]; - - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; nativeCheckInputs = [ numpy @@ -54,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://ancpbids.readthedocs.io"; description = "Read/write/validate/query BIDS datasets"; + changelog = "https://github.com/ANCPLabOldenburg/ancp-bids/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index c5a4300736ee..a688939a84f2 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -16,10 +16,7 @@ pyqt5, pyperclip, pytestCheckHook, - mock, python-magic, - codecov, - coverage, qt5, # 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. @@ -73,9 +70,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - codecov - coverage - mock pyperclip pyqt5 python-magic @@ -88,10 +82,10 @@ buildPythonPackage rec { makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; - meta = with lib; { + meta = { description = "Tool and Python library to interact with Android Files"; homepage = "https://github.com/androguard/androguard"; - license = licenses.asl20; - maintainers = with maintainers; [ pmiddend ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pmiddend ]; }; } diff --git a/pkgs/development/python-modules/androguard/fix-tests.patch b/pkgs/development/python-modules/androguard/fix-tests.patch index b971b46c6244..267f839eb91b 100644 --- a/pkgs/development/python-modules/androguard/fix-tests.patch +++ b/pkgs/development/python-modules/androguard/fix-tests.patch @@ -1,8 +1,21 @@ +diff --git a/tests/dataflow_test.py b/tests/dataflow_test.py +index e9ac3cdb..edef8200 100644 +--- a/tests/dataflow_test.py ++++ b/tests/dataflow_test.py +@@ -5,7 +5,7 @@ import sys + sys.path.append('.') + + import collections +-import mock ++from unittest import mock + import unittest + from androguard.decompiler.dad import dataflow + from androguard.decompiler.dad import graph diff --git a/tests/test_types.py b/tests/test_types.py -index 127dfc20eb..f1c89f0712 100644 +index 127dfc20..f1c89f07 100644 --- a/tests/test_types.py +++ b/tests/test_types.py -@@ -182,7 +182,7 @@ +@@ -182,7 +182,7 @@ class TypesTest(unittest.TestCase): for i in filter(lambda x: 'const' in x.get_name(), method.get_instructions()): i.show(0) # ins should only have one literal diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index 799306fa30f0..d07c2530a450 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -9,29 +9,32 @@ pure-python-adb, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "androidtv"; - version = "0.0.73"; - format = "setuptools"; + version = "0.0.75"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "JeffLIrion"; repo = "python-androidtv"; - rev = "v${version}"; - hash = "sha256-FJUTJfS9jiC7KDf6XcGVRNXf75bVUOBPZe8y9M39Uak="; + rev = "refs/tags/v${version}"; + hash = "sha256-2WFfGGEZkM3fWyTo5P6H3ha04Qyx2OiYetlGWv0jXac="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ adb-shell async-timeout pure-python-adb ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiofiles ]; inherit (adb-shell.optional-dependencies) usb; }; @@ -39,7 +42,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.async ++ passthru.optional-dependencies.usb; + ] ++ optional-dependencies.async ++ optional-dependencies.usb; disabledTests = [ # Requires git but fails anyway diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index f9039ea24a8e..68f100536e5e 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.118"; + version = "9.2.127"; pyproject = true; disabled = pythonOlder "3.11"; @@ -45,15 +45,22 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-vysSt1YAXjmzhhP6ZYwaxI7K8x844YBSSg9Wp2xH1pI="; + hash = "sha256-hGKxLgXOL+PhhYxxJJQIMcEmFjG4WC9PQE4yP+/QuBg="; }; - pythonRelaxDeps = [ "capstone" ]; + postPatch = '' + # unicorn is also part of build-system + substituteInPlace pyproject.toml \ + --replace-fail "unicorn==2.0.1.post1" "unicorn" + ''; - build-system = [ - setuptools + pythonRelaxDeps = [ + "capstone" + "unicorn" ]; + build-system = [ setuptools ]; + dependencies = [ ailment archinfo @@ -84,11 +91,11 @@ buildPythonPackage rec { unique-log-filter ]; - passthru.optional-dependencies = { + optional-dependencies = { AngrDB = [ sqlalchemy ]; }; - setupPyBuildFlags = lib.optionals stdenv.isLinux [ + setupPyBuildFlags = lib.optionals stdenv.hostPlatform.isLinux [ "--plat-name" "linux" ]; @@ -110,5 +117,7 @@ buildPythonPackage rec { homepage = "https://angr.io/"; license = with licenses; [ bsd2 ]; maintainers = with maintainers; [ fab ]; + # angr is pining unicorn + broken = versionAtLeast unicorn.version "2.0.1.post1"; }; } diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index d822f66800d5..02cb4798f5e3 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.2.10"; + version = "9.2.11"; pyproject = true; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angrop"; rev = "refs/tags/v${version}"; - hash = "sha256-+epX+tCSv5Kit4lncDNtjokehCSl+tO7rbi3L+RrI+E="; + hash = "sha256-wL6H4UqBqOHMQU91q0uJrgeS/wVvIbinpF9IBtli3Ig="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/anitopy/default.nix b/pkgs/development/python-modules/anitopy/default.nix index 95f3af2b7cb5..d7d3f2a0e56b 100644 --- a/pkgs/development/python-modules/anitopy/default.nix +++ b/pkgs/development/python-modules/anitopy/default.nix @@ -16,7 +16,6 @@ buildPythonPackage rec { }; pythonImportsCheck = [ "anitopy" ]; - doCheck = true; meta = with lib; { description = "Python library for parsing anime video filenames"; diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix index 8b133595ebbd..3cc5eaf4b693 100644 --- a/pkgs/development/python-modules/annexremote/default.nix +++ b/pkgs/development/python-modules/annexremote/default.nix @@ -3,26 +3,23 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - pythonOlder, setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "annexremote"; - version = "1.6.5"; + version = "1.6.6"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "Lykos153"; repo = "AnnexRemote"; rev = "refs/tags/v${version}"; - hash = "sha256-8WAa5EO5n/dccNW0TUwFgcRjvDFt8QfpHIX2arM4HGc="; + hash = "sha256-RShDcqAjG+ujGzWu5S9za24WSsIWctqi3nWQ8EU4DTo="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/ansible-builder/default.nix b/pkgs/development/python-modules/ansible-builder/default.nix index 064de3b127ad..84d32152864b 100644 --- a/pkgs/development/python-modules/ansible-builder/default.nix +++ b/pkgs/development/python-modules/ansible-builder/default.nix @@ -10,36 +10,38 @@ bindep, buildPythonPackage, }: + buildPythonPackage rec { pname = "ansible-builder"; - version = "3.0.1"; - format = "pyproject"; + version = "3.1.0"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-rxyhgj9Cad751tPAptCTLCtXQLUXaRYv39bkoFzzjOk="; + pname = "ansible_builder"; + inherit version; + hash = "sha256-0txXPianvVCV6YrrN+6bALyfUAWr6nFH10IpwPNCb8s="; }; - nativeBuildInputs = [ + patchPhase = '' + # the upper limits of setuptools are unnecessary + # See https://github.com/ansible/ansible-builder/issues/639 + sed -i 's/, <=[0-9.]*//g' pyproject.toml + ''; + + build-system = [ setuptools setuptools-scm ]; buildInputs = [ bindep ]; - propagatedBuildInputs = [ + dependencies = [ podman jsonschema requirements-parser pyyaml ]; - patchPhase = '' - # the upper limits of setuptools are unnecessary - # See https://github.com/ansible/ansible-builder/issues/639 - sed -i 's/, <=[0-9.]*//g' pyproject.toml - ''; - meta = with lib; { description = "Ansible execution environment builder"; homepage = "https://ansible-builder.readthedocs.io/en/stable/"; diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 0e1a3b8ca7a2..11d0f37773e4 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -89,7 +89,7 @@ buildPythonPackage rec { "test/integration/test_runner.py" "test/unit/test_runner.py" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Integration tests on Darwin are not regularly passing in ansible-runner's own CI "test/integration" # These tests write to `/tmp` which is not writable on Darwin diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index fc0e5f9ab36e..42b60a1b59f3 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -30,12 +30,12 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.17.4"; + version = "2.17.5"; src = fetchPypi { pname = "ansible_core"; inherit version; - hash = "sha256-RKHzAHZ5ZTa6JFXK0Y025ihw8E5jLjyi6+lw176s8k0="; + hash = "sha256-rn9R/RPcnVfJvNQ+8j+cJVyo8Y9LXAARpPm3JNksWo4="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 03d7e6c23519..6f8e44822ba1 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -22,7 +22,7 @@ let pname = "ansible"; - version = "10.2.0"; + version = "10.4.0"; in buildPythonPackage { inherit pname version; @@ -32,7 +32,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-iqBim6js7WRl4s60kCnpPTN8Sm/Fo+bpiCXCWN1qcFc="; + hash = "sha256-XBIEiDGmaQ/IZd/gPcirYcO6CLXQGySaFrJHrZmmC8A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ansitable/default.nix b/pkgs/development/python-modules/ansitable/default.nix index 3f0ecc839a9b..e722d504d61f 100644 --- a/pkgs/development/python-modules/ansitable/default.nix +++ b/pkgs/development/python-modules/ansitable/default.nix @@ -7,29 +7,31 @@ colored, pytestCheckHook, numpy, + pandas, }: buildPythonPackage rec { pname = "ansitable"; - version = "0.10.0"; + version = "0.11.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ehPPpZ9C/Nrly9WoJJfZtv2YfZ9MEcQsKtuxNpcJe7U="; + hash = "sha256-navayezkSSHgwOysC3fbgTQahRZjIV24JzIAQl+X5Jk="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ colored ]; + dependencies = [ colored ]; pythonImportsCheck = [ "ansitable" ]; nativeCheckInputs = [ pytestCheckHook numpy + pandas ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ansiwrap/default.nix b/pkgs/development/python-modules/ansiwrap/default.nix index f45f8c0ccaf0..48963155d0c0 100644 --- a/pkgs/development/python-modules/ansiwrap/default.nix +++ b/pkgs/development/python-modules/ansiwrap/default.nix @@ -9,7 +9,6 @@ setuptools, textwrap3, }: - buildPythonPackage rec { pname = "ansiwrap"; version = "0.8.4"; @@ -47,5 +46,7 @@ buildPythonPackage rec { changelog = "https://github.com/jonathaneunice/ansiwrap/blob/master/CHANGES.yml"; license = licenses.asl20; maintainers = [ ]; + + broken = true; }; } diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index 014b1feaa0f6..dc5f11c6ad71 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.34.0"; + version = "0.39.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-UjwBxuhXuwJfWewg9si/oIuXgiqbNAYm4lK2f+C6VJU="; + hash = "sha256-lpW+waHvwgbhK7EnPZy/XI8gK3a8JjFflPqUFbDN1z8="; }; build-system = [ @@ -50,7 +50,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { vertex = [ google-auth ]; }; diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 296fbcdc3563..c5e13ea20f1c 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "4.4.0"; + version = "4.6.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = "anyio"; rev = "refs/tags/${version}"; - hash = "sha256-Sz/wWOT59T7LOAq68fBujgkTaY9ydMsIoSxeP3fBaoY="; + hash = "sha256-8QLOAjQpiNtbd+YSHfqcBVdtMSGJFRevOcacZErKuso="; }; build-system = [ setuptools-scm ]; @@ -56,7 +56,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { trio = [ trio ]; }; @@ -69,7 +69,7 @@ buildPythonPackage rec { pytestCheckHook trustme uvloop - ] ++ passthru.optional-dependencies.trio; + ] ++ optional-dependencies.trio; pytestFlagsArray = [ "-W" @@ -78,10 +78,19 @@ buildPythonPackage rec { "'not network'" ]; - disabledTests = lib.optionals stdenv.isDarwin [ - # PermissionError: [Errno 1] Operation not permitted: '/dev/console' - "test_is_block_device" - ]; + disabledTests = + [ + # TypeError: __subprocess_run() got an unexpected keyword argument 'umask' + "test_py39_arguments" + # AttributeError: 'module' object at __main__ has no attribute '__file__' + "test_nonexistent_main_module" + # 3 second timeout expired + "test_keyboardinterrupt_during_test" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # PermissionError: [Errno 1] Operation not permitted: '/dev/console' + "test_is_block_device" + ]; disabledTestPaths = [ # lots of DNS lookups diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index f1ad42c81d9c..f41771016676 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -49,14 +49,14 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.56.0"; + version = "2.59.0"; pyproject = true; src = fetchFromGitHub { owner = "apache"; repo = "beam"; rev = "refs/tags/v${version}"; - hash = "sha256-SD+93duc3vTIlS/LPOuzXeiUSpwX+GNrqW3GTJMVgKY="; + hash = "sha256-JeVYfXAx/GBGXQKAt6pSpnxH83oyeDylEY12EDzMxnw="; }; patches = [ diff --git a/pkgs/development/python-modules/apeye-core/default.nix b/pkgs/development/python-modules/apeye-core/default.nix index 3a6d8cbec834..d86560254517 100644 --- a/pkgs/development/python-modules/apeye-core/default.nix +++ b/pkgs/development/python-modules/apeye-core/default.nix @@ -29,8 +29,6 @@ buildPythonPackage rec { idna ]; - nativeCheckInputs = [ ]; - meta = { description = "Core (offline) functionality for the apeye library."; homepage = "https://github.com/domdfcoding/apyey-core"; diff --git a/pkgs/development/python-modules/apischema/default.nix b/pkgs/development/python-modules/apischema/default.nix index 1034d1d02160..59ba920c1577 100644 --- a/pkgs/development/python-modules/apischema/default.nix +++ b/pkgs/development/python-modules/apischema/default.nix @@ -6,12 +6,13 @@ pytest-asyncio, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "apischema"; - version = "0.18.1"; - format = "setuptools"; + version = "0.18.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,23 +20,32 @@ buildPythonPackage rec { owner = "wyfo"; repo = "apischema"; rev = "refs/tags/v${version}"; - hash = "sha256-omw6znk09r2SigPfaVrtA6dd8KeSfjaPgGfK12ty23g="; + hash = "sha256-YFJbNxCwDrJb603Bf8PDrvhVt4T53PNWOYs716c0f1I="; }; - passthru.optional-dependencies = { + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools==75.1.0" "setuptools" \ + --replace-fail "wheel~=0.44.0" "wheel" + ''; + + build-system = [ setuptools ]; + + optional-dependencies = { graphql = [ graphql-core ]; }; nativeCheckInputs = [ pytest-asyncio pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "apischema" ]; meta = with lib; { description = "JSON (de)serialization, GraphQL and JSON schema generation using typing"; homepage = "https://github.com/wyfo/apischema"; + changelog = "https://github.com/wyfo/apischema/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 2ca9be416c8f..9c487d1dd6f3 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging ]; - passthru.optional-dependencies = { + optional-dependencies = { marshmallow = [ marshmallow ]; yaml = [ pyyaml ]; validation = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "apispec" ]; diff --git a/pkgs/development/python-modules/app-model/default.nix b/pkgs/development/python-modules/app-model/default.nix index da4854d547b0..8378cbfea5ee 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.8"; + version = "0.3.0"; 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-vGSFo2ZckIDI3TjBSTKZagTEYdILt1/5Wyws3P7FNiQ="; + hash = "sha256-PvQ9l2sCi1NaF/SWApWqt6a5AHI5A+zmJRo8gR3ng6Y="; }; build-system = [ diff --git a/pkgs/development/python-modules/appdirs/default.nix b/pkgs/development/python-modules/appdirs/default.nix index dff911c89dae..d3e71a5f9051 100644 --- a/pkgs/development/python-modules/appdirs/default.nix +++ b/pkgs/development/python-modules/appdirs/default.nix @@ -2,21 +2,34 @@ lib, buildPythonPackage, fetchPypi, + pythonOlder, + setuptools, + unittestCheckHook, }: buildPythonPackage rec { pname = "appdirs"; version = "1.4.4"; - format = "setuptools"; + pypoject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"; + hash = "sha256-fV0BZ7KxuoIWR2Fq9Gp0nRxlN0DdDSQVEA/ibiev30E="; }; + build-system = [ setuptools ]; + + nativeCheckInputs = [ unittestCheckHook ]; + + pythonImportsCheck = [ "appdirs" ]; + meta = { description = "Python module for determining appropriate platform-specific dirs"; homepage = "https://github.com/ActiveState/appdirs"; + changelog = "https://github.com/ActiveState/appdirs/releases/tag/${version}"; license = lib.licenses.mit; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/appimage/default.nix b/pkgs/development/python-modules/appimage/default.nix new file mode 100644 index 000000000000..c8de232e73c4 --- /dev/null +++ b/pkgs/development/python-modules/appimage/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "appimage"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ssh-mitm"; + repo = "appimage"; + rev = "refs/tags/${version}"; + hash = "sha256-d8LwZ4iZ+fwFaBP/IFoKImI/TsYtVD0rllbYN9XP/es="; + }; + + build-system = [ hatchling ]; + + # Module has no test + doCheck = false; + + pythonImportsCheck = [ "appimage" ]; + + meta = { + description = "AppImage start scripts"; + homepage = "https://github.com/ssh-mitm/appimage"; + changelog = "https://github.com/ssh-mitm/appimage/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/apple-weatherkit/default.nix b/pkgs/development/python-modules/apple-weatherkit/default.nix index 60cfd6d9e71e..d7d21ad746fc 100644 --- a/pkgs/development/python-modules/apple-weatherkit/default.nix +++ b/pkgs/development/python-modules/apple-weatherkit/default.nix @@ -11,8 +11,8 @@ buildPythonPackage rec { pname = "apple-weatherkit"; - version = "1.1.2"; - format = "pyproject"; + version = "1.1.3"; + pyproject = true; disabled = pythonOlder "3.11"; @@ -20,12 +20,12 @@ buildPythonPackage rec { owner = "tjhorner"; repo = "python-weatherkit"; rev = "refs/tags/v${version}"; - hash = "sha256-w3KinicaF01I6fIidI7XYHpB8eq52RTUw/BMLrx6Grk="; + hash = "sha256-JvN8GmlTxz9VGttIFVG6q//c+BhP2pt1tBOhnJhNwJg="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp aiohttp-retry pyjwt diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 657537bbc568..95b77a94b673 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -11,7 +11,6 @@ markdown, paho-mqtt, pytest-mock, - pytest-xdist, pytestCheckHook, pythonOlder, pyyaml, @@ -23,14 +22,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.8.1"; + version = "1.9.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CKIP5yZyt+kPeWnVuHnWV8Li2zhaiowQ9Uy6VlvyN/I="; + hash = "sha256-tck6/WMxr+S2OlXRzqkHbke+y0uom1YrGBwT4luwx9Y="; }; nativeBuildInputs = [ installShellFiles ]; @@ -53,30 +52,9 @@ buildPythonPackage rec { gntp paho-mqtt pytest-mock - pytest-xdist pytestCheckHook ]; - disabledTests = [ - "test_apprise_cli_nux_env" - # 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 = '' installManPage packaging/man/apprise.1 ''; diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index ed93d5dc2792..aa9fd60a8a4c 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "6.0.14"; + version = "6.1.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-Xm/2AHV4r6SmKK1wZS20xh9xRO3zhdEB/hpRT1o3z2Q="; + hash = "sha256-FISV+wEpoRVfHNjN/fZw7aqFp5XDvB21ZhQhRQvCnHY="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/apscheduler/default.nix b/pkgs/development/python-modules/apscheduler/default.nix index d409a535b463..7005690b53ef 100644 --- a/pkgs/development/python-modules/apscheduler/default.nix +++ b/pkgs/development/python-modules/apscheduler/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { "test_add_pending_job" "test_shutdown" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_submit_job" "test_max_instances" ]; diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index aec388af308a..d2effb1ae435 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { "testVFSWithWAL" # no lines in errout.txt "testWriteUnraisable" - ] ++ lib.optionals stdenv.isDarwin [ "testzzForkChecker" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "testzzForkChecker" ]; pythonImportsCheck = [ "apsw" ]; diff --git a/pkgs/development/python-modules/arabic-reshaper/default.nix b/pkgs/development/python-modules/arabic-reshaper/default.nix index 36c9aaf01395..6e1610e6f0cd 100644 --- a/pkgs/development/python-modules/arabic-reshaper/default.nix +++ b/pkgs/development/python-modules/arabic-reshaper/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-ucSC5aTvpnlAVQcT0afVecnoN3hIZKtzUhEQ6Qg0jQM="; }; - passthru.optional-dependencies = { + optional-dependencies = { with-fonttools = [ fonttools ]; }; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 6d64836ee055..7b0f033ec87f 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.118"; + version = "9.2.127"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-ravf2/FyPxGw7eThzkVRTLD8zhjX5vUXzb+LVO+KVxU="; + hash = "sha256-hIjL0pa4/TNnyFq61R0ND8o2mEjeRwUJ/S1wP1VglYg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix index 7ecdc1bb8a93..0b5c3cbcf1e1 100644 --- a/pkgs/development/python-modules/arelle/default.nix +++ b/pkgs/development/python-modules/arelle/default.nix @@ -1,87 +1,160 @@ { - gui ? true, + lib, buildPythonPackage, fetchFromGitHub, - lib, - sphinx, - lxml, + + setuptools, + setuptools-scm, + + certifi, + filelock, isodate, + lxml, numpy, openpyxl, - tkinter ? null, - py3to2, - isPy3k, - python, - ... + pyparsing, + python-dateutil, + regex, + + gui ? true, + tkinter, + + pycryptodome, + pg8000, + pymysql, + pyodbc, + rdflib, + holidays, + pytz, + tinycss2, + graphviz, + cheroot, + cherrypy, + tornado, + + sphinxHook, + sphinx-autodoc2, + myst-parser, + sphinx-copybutton, + furo, + + pytestCheckHook, + boto3, }: buildPythonPackage rec { pname = "arelle${lib.optionalString (!gui) "-headless"}"; - version = "18.3"; - format = "setuptools"; - - disabled = !isPy3k; + version = "2.30.25"; + pyproject = true; - # Releases are published at http://arelle.org/download/ but sadly no - # tags are published on github. src = fetchFromGitHub { owner = "Arelle"; repo = "Arelle"; - rev = "edgr${version}"; - sha256 = "12a94ipdp6xalqyds7rcp6cjwps6fbj3byigzfy403hlqc9n1g33"; + rev = "refs/tags/${version}"; + hash = "sha256-xzTrFie97HDIqPZ4nzCh+0p/w0bTK12cS0FSsuIi7tY="; }; + outputs = [ "out" "doc" ]; - patches = [ ./tests.patch ]; - postPatch = "rm testParser2.py"; - nativeBuildInputs = [ - sphinx - py3to2 + + postPatch = '' + substituteInPlace pyproject.toml --replace-fail \ + 'requires = ["setuptools~=73.0", "wheel~=0.44", "setuptools_scm[toml]~=8.1"]' \ + 'requires = ["setuptools", "wheel", "setuptools_scm[toml]"]' + + # Darwin currently doesn't have the native `_decimal` module + # Instead, we'll use the wrapper `decimal` module that can fall back to python based implementation + # These lines can be removed after https://github.com/NixOS/nixpkgs/pull/354125 hits master + substituteInPlace arelle/Validate{DuplicateFacts,XbrlCalcs}.py tests/unit_tests/arelle/test_{xmlvalidate,validatexbrlcalcs}.py \ + --replace-fail 'from _decimal import' 'from decimal import' + ''; + + build-system = [ + setuptools + setuptools-scm ]; - propagatedBuildInputs = [ - lxml + + dependencies = [ + certifi + filelock isodate + lxml numpy openpyxl + pyparsing + python-dateutil + regex ] ++ lib.optionals gui [ tkinter ]; - # arelle-gui is useless without gui dependencies, so delete it when !gui. - postInstall = - lib.optionalString (!gui) '' - find $out/bin -name "*arelle-gui*" -delete - '' - + - # By default, not the entirety of the src dir is copied. This means we don't - # copy the `images` dir, which is needed for the gui version. - lib.optionalString (gui) '' - targetDir=$out/${python.sitePackages} - cp -vr $src/arelle $targetDir - ''; - - # Documentation - postBuild = '' - (cd apidocs && make html && cp -r _build $doc) + optional-dependencies = { + crypto = [ pycryptodome ]; + db = [ + pg8000 + pymysql + pyodbc + rdflib + ]; + efm = [ + holidays + pytz + ]; + esef = [ tinycss2 ]; + objectmaker = [ graphviz ]; + webserver = [ + cheroot + cherrypy + tornado + ]; + }; + + nativeBuildInputs = [ + # deps for docs + sphinxHook + sphinx-autodoc2 + myst-parser + sphinx-copybutton + furo + ]; + + # the arelleGUI executable doesn't work when the gui option is false + postInstall = lib.optionalString (!gui) '' + find $out/bin -name "*arelleGUI*" -delete ''; - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + boto3 + ] ++ lib.flatten (lib.attrValues optional-dependencies); - checkPhase = '' - py.test + preCheck = '' + export HOME=$(mktemp -d) ''; - meta = with lib; { - description = - '' - An open source facility for XBRL, the eXtensible Business Reporting - Language supporting various standards, exposed through a Python or - REST API'' - + lib.optionalString gui " and a graphical user interface"; + disabledTestPaths = + [ + "tests/integration_tests" + ] + ++ lib.optionals (!gui) [ + # these tests import tkinter + "tests/unit_tests/arelle/test_updater.py" + "tests/unit_tests/arelle/test_import.py" + ]; + + meta = { + description = "Open source XBRL platform"; + longDescription = '' + An open source facility for XBRL, the eXtensible Business Reporting + Language supporting various standards, exposed through a Python or + REST API ${lib.optionalString gui " and a graphical user interface"}. + ''; mainProgram = "arelle"; homepage = "http://arelle.org/"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ roberth ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + tomasajt + roberth + ]; }; } diff --git a/pkgs/development/python-modules/arelle/tests.patch b/pkgs/development/python-modules/arelle/tests.patch deleted file mode 100644 index e34cda99b251..000000000000 --- a/pkgs/development/python-modules/arelle/tests.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git c/arelle/CntlrProfiler.py i/arelle/CntlrProfiler.py -index a64bb1b..dc0299d 100644 ---- c/arelle/CntlrProfiler.py -+++ i/arelle/CntlrProfiler.py -@@ -1,5 +1,6 @@ - --import Cntlr, ModelManager, FileSource, time -+from arelle import Cntlr, ModelManager, FileSource -+import time - from optparse import OptionParser - import cProfile - import gettext -diff --git c/arelle/ValidateFilingText.py i/arelle/ValidateFilingText.py -index 12dbbbb..c0e98c3 100644 diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 969acd0b1c45..d8a96b231c03 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -9,19 +9,19 @@ buildPythonPackage rec { pname = "argcomplete"; - version = "3.4.0"; + version = "3.5.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "kislyuk"; - repo = pname; + repo = "argcomplete"; rev = "refs/tags/v${version}"; - hash = "sha256-4JMyBixc6LcSdpvvLmK4nyyqZMK2kuFcPU7OXhJLpoc="; + hash = "sha256-um8iFzEHExTRV1BAl86/XKLc7vmf2Ws1dB83agfvoec="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; @@ -32,10 +32,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "argcomplete" ]; meta = with lib; { - changelog = "https://github.com/kislyuk/argcomplete/blob/v${version}/Changes.rst"; description = "Bash tab completion for argparse"; - downloadPage = "https://github.com/kislyuk/argcomplete"; homepage = "https://kislyuk.github.io/argcomplete/"; + changelog = "https://github.com/kislyuk/argcomplete/blob/v${version}/Changes.rst"; + downloadPage = "https://github.com/kislyuk/argcomplete"; license = licenses.asl20; maintainers = with maintainers; [ womfoo ]; }; diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index 50ea4cbb74f8..c767e7ca3eed 100644 --- a/pkgs/development/python-modules/argilla/default.nix +++ b/pkgs/development/python-modules/argilla/default.nix @@ -106,7 +106,7 @@ buildPythonPackage rec { typer ]; - passthru.optional-dependencies = { + optional-dependencies = { server = [ aiofiles @@ -178,7 +178,7 @@ buildPythonPackage rec { pytest-mock pytest-asyncio factory-boy - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ "tests/server/datasets/test_dao.py" ]; diff --git a/pkgs/development/python-modules/argostranslate/default.nix b/pkgs/development/python-modules/argostranslate/default.nix index 69e3bf1cc0f8..f3121e90dd5b 100644 --- a/pkgs/development/python-modules/argostranslate/default.nix +++ b/pkgs/development/python-modules/argostranslate/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, @@ -54,10 +55,12 @@ buildPythonPackage rec { "argostranslate.translate" ]; - meta = with lib; { + meta = { description = "Open-source offline translation library written in Python"; homepage = "https://www.argosopentech.com"; - license = licenses.mit; - maintainers = with maintainers; [ misuzu ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ misuzu ]; + # Segfaults at import + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/development/python-modules/argparse-manpage/default.nix b/pkgs/development/python-modules/argparse-manpage/default.nix index 77bd37acd6f6..e3423a8c56e3 100644 --- a/pkgs/development/python-modules/argparse-manpage/default.nix +++ b/pkgs/development/python-modules/argparse-manpage/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "argparse_manpage" ]; - passthru.optional-dependencies = { + optional-dependencies = { setuptools = [ setuptools ]; }; diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 132f467e0499..b2ac4e967398 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { websocket-client ]; - passthru.optional-dependencies = { + optional-dependencies = { tui = [ asciimatics pyperclip @@ -64,7 +64,7 @@ buildPythonPackage rec { responses psutil uvicorn - ] ++ passthru.optional-dependencies.tui; + ] ++ optional-dependencies.tui; disabledTests = [ # require a running display server diff --git a/pkgs/development/python-modules/arnparse/default.nix b/pkgs/development/python-modules/arnparse/default.nix deleted file mode 100644 index f9795be59283..000000000000 --- a/pkgs/development/python-modules/arnparse/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "arnparse"; - version = "0.0.2"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "PokaInc"; - repo = "arnparse"; - rev = version; - hash = "sha256-2+wxzYoS/KJXjYM6lZguxbr2Oxobo0eFNnzWZHLi0WM="; - }; - - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "arnparse" ]; - - meta = with lib; { - description = "Parse ARNs using Python"; - homepage = "https://github.com/PokaInc/arnparse"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/array-api-compat/default.nix b/pkgs/development/python-modules/array-api-compat/default.nix index 6de3c073b43a..b373fb558972 100644 --- a/pkgs/development/python-modules/array-api-compat/default.nix +++ b/pkgs/development/python-modules/array-api-compat/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "array-api-compat"; - version = "1.8"; + version = "1.9.1"; pyproject = true; src = fetchFromGitHub { owner = "data-apis"; repo = "array-api-compat"; rev = "refs/tags/${version}"; - hash = "sha256-DZs51yWgeMX7lmzR6jily0S3MRD4AVlk7BP8aU99Zp8="; + hash = "sha256-X6y6hX/HdkiLZkj9AOEYsZOlYhR7wUt9kQjHfMfWqIc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/art/default.nix b/pkgs/development/python-modules/art/default.nix index 0f43d311f88c..b0d50295a8aa 100644 --- a/pkgs/development/python-modules/art/default.nix +++ b/pkgs/development/python-modules/art/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, }: buildPythonPackage rec { pname = "art"; - version = "6.2"; - format = "setuptools"; + version = "6.3"; + pyproject = true; src = fetchFromGitHub { owner = "sepandhaghighi"; repo = "art"; rev = "refs/tags/v${version}"; - hash = "sha256-lFe6J3R+A1WE+LGywupjOGwhOcrUH5JE26Cit0DaT/4="; + hash = "sha256-9kz6uyLdcrQqgWzT9g2qI9a+IituY/OFmbot+HlQsCE="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "art" ]; # TypeError: art() missing 1 required positional argument: 'artname' diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index 2d43abfd70b2..0406894c8b05 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -1,7 +1,7 @@ { lib, + stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -9,7 +9,6 @@ setuptools, # dependencies - dm-tree, h5netcdf, matplotlib, numpy, @@ -39,16 +38,14 @@ buildPythonPackage rec { pname = "arviz"; - version = "0.19.0"; + version = "0.20.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "arviz-devs"; repo = "arviz"; rev = "refs/tags/v${version}"; - hash = "sha256-fwDCl1KWClIOBWIL/ETw3hJUyHdpVpLnRmZoZXL3QXI="; + hash = "sha256-6toqOGwk8YbatfiDCTEG4r0z3zZAA8zcNVZJqqssYrY="; }; build-system = [ @@ -57,7 +54,6 @@ buildPythonPackage rec { ]; dependencies = [ - dm-tree h5netcdf matplotlib numpy @@ -104,6 +100,9 @@ buildPythonPackage rec { "test_plot_pair" ]; + # Tests segfault on darwin + doCheck = !stdenv.isDarwin; + pythonImportsCheck = [ "arviz" ]; meta = { diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 6e936c6635ed..9d640100a1ff 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "asdf"; - version = "3.2.0"; + version = "3.4.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "asdf-format"; repo = "asdf"; rev = "refs/tags/${version}"; - hash = "sha256-r+cEv6g7fq3I/h2mlszzJRQcazy7qP9pg0hfYG/Sa9E="; + hash = "sha256-2ugrByX2eSac68RGc4mhPiYP8qnYoPwbhrMmvUr2FYg="; }; build-system = [ diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index 326d51f55a64..dbdcbce06753 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { flask pillow psycopg2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ tkinter ]; diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index fecc4b98f490..1fdb7f50ae31 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pytest-asyncio ]; - disabledTests = lib.optionals stdenv.isDarwin [ "test_multiprocessing" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_multiprocessing" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix index cd0b3a0895bb..8ca21fece147 100644 --- a/pkgs/development/python-modules/asn1tools/default.nix +++ b/pkgs/development/python-modules/asn1tools/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "asn1tools"; - version = "0.166.0"; + version = "0.167.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,17 +23,17 @@ buildPythonPackage rec { owner = "eerimoq"; repo = "asn1tools"; rev = "refs/tags/${version}"; - hash = "sha256-TWAOML6nsLX3TYqoQ9fcSjrUmC4byXOfczfkmSaSa0k="; + hash = "sha256-86bdBYlAVJfd3EY8s0t6ZDRA/qZVWuHD4Jxa1n1Ke5E="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ bitstruct pyparsing ]; - passthru.optional-depdendencies = { + optional-dependencies = { shell = [ prompt-toolkit ]; cache = [ diskcache ]; }; @@ -41,7 +41,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-xdist pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-depdendencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "asn1tools" ]; @@ -53,10 +53,10 @@ buildPythonPackage rec { meta = with lib; { description = "ASN.1 parsing, encoding and decoding"; - mainProgram = "asn1tools"; homepage = "https://github.com/eerimoq/asn1tools"; changelog = "https://github.com/eerimoq/asn1tools/releases/tag/${version}"; license = licenses.mit; maintainers = [ ]; + mainProgram = "asn1tools"; }; } diff --git a/pkgs/development/python-modules/aspy-refactor-imports/default.nix b/pkgs/development/python-modules/aspy-refactor-imports/default.nix index bcfb80b32e81..dbc97cca6efb 100644 --- a/pkgs/development/python-modules/aspy-refactor-imports/default.nix +++ b/pkgs/development/python-modules/aspy-refactor-imports/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; # fails on darwin due to case-insensitive file system - disabledTests = lib.optionals stdenv.isDarwin [ "test_application_directory_case" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_application_directory_case" ]; meta = with lib; { description = "Utilities for refactoring imports in python-like syntax"; diff --git a/pkgs/development/python-modules/assay/default.nix b/pkgs/development/python-modules/assay/default.nix index 25108a26d404..b71a3b9be090 100644 --- a/pkgs/development/python-modules/assay/default.nix +++ b/pkgs/development/python-modules/assay/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "assay"; - version = "unstable-2022-01-19"; + version = "0-unstable-2024-05-09"; format = "setuptools"; src = fetchFromGitHub { owner = "brandon-rhodes"; repo = pname; - rev = "bb62d1f7d51d798b05a88045fff3a2ff92c299c3"; - hash = "sha256-FuAD74mFJ9F9AMgB3vPmODAlZKgPR7FQ4yn7HEBS5Rw="; + rev = "74617d70e77afa09f58b3169cf496679ac5d5621"; + hash = "sha256-zYpLtcXZ16EJWKSCqxFkSz/G9PwIZEQGBrYiJKuqnc4="; }; pythonImportsCheck = [ "assay" ]; @@ -24,6 +24,5 @@ buildPythonPackage rec { description = "Attempt to write a Python testing framework I can actually stand"; license = licenses.mit; maintainers = with maintainers; [ zane ]; - broken = pythonAtLeast "3.11"; }; } diff --git a/pkgs/development/python-modules/asteroid-filterbanks/default.nix b/pkgs/development/python-modules/asteroid-filterbanks/default.nix index 9c4181642175..e7dc0cba9798 100644 --- a/pkgs/development/python-modules/asteroid-filterbanks/default.nix +++ b/pkgs/development/python-modules/asteroid-filterbanks/default.nix @@ -5,7 +5,6 @@ setuptools, wheel, black, - codecov, coverage, librosa, numpy, @@ -34,7 +33,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ black - codecov coverage librosa numpy diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index 43872ff90ed3..5ec7d2b59b64 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.4"; + version = "1.0.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "lmfit"; repo = "asteval"; rev = "refs/tags/${version}"; - hash = "sha256-rq8qZqTtnKyVclX5R+yRouLz1FySRgc7DMN9W9UBkyI="; + hash = "sha256-PRmTbP3zRnkCxdeb45LBz5m/Ymoi4lq2poKuG9Esg9g="; }; postPatch = '' diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 200dc13e989f..5bf0ab7dfe04 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "3.2.2"; # Check whether the version is compatible with pylint + version = "3.3.4"; # Check whether the version is compatible with pylint pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "astroid"; rev = "refs/tags/v${version}"; - hash = "sha256-Fc/AjMOz9D9SgkxXvMAhvJcZtj9BsPykg0DX4hEqdB8="; + hash = "sha256-/VpGniyKzFToDNSnnbYvpUFJjx0Rx9N7x56BJnR0lpk="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/astropy-iers-data/default.nix b/pkgs/development/python-modules/astropy-iers-data/default.nix index e1cdd1febe46..62c728f2f931 100644 --- a/pkgs/development/python-modules/astropy-iers-data/default.nix +++ b/pkgs/development/python-modules/astropy-iers-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "astropy-iers-data"; - version = "0.2024.06.17.00.31.35"; + version = "0.2024.9.23.0.31.43"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "astropy"; repo = "astropy-iers-data"; rev = "refs/tags/v${version}"; - hash = "sha256-hFlDXnxhKuhlCFrF+Uip3Xjc9Jt8UFJcDCST90BmAlg="; + hash = "sha256-PGr8meqVs9l15+k5DHmcPcGK96ydN0nRUOBVfvCtRUg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index c88029cb09a8..8315d4454280 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -1,17 +1,15 @@ { lib, fetchPypi, - fetchpatch, buildPythonPackage, pythonOlder, # build time astropy-extension-helpers, cython, - jinja2, - oldest-supported-numpy, + setuptools, setuptools-scm, - wheel, + # testing pytestCheckHook, stdenv, @@ -28,39 +26,29 @@ buildPythonPackage rec { pname = "astropy"; - version = "6.1.1"; + version = "6.1.4"; pyproject = true; - disabled = pythonOlder "3.8"; # according to setup.cfg + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-5cb0XZEcMKy41VbH+O2ZSuxxsQjmHu5QZ/AK8eTjYTg="; + hash = "sha256-NhVY4rCTqZvr5p8f1H+shqGSYHpMFu05ugqACyq2DDQ="; }; - patches = [ - (fetchpatch { - name = "drop-usage-known-bad-actor-cdn.patch"; - url = "https://github.com/astropy/astropy/commit/d329cb38e49584ad0ff5244fd2fff74cfa1f92f1.patch"; - hash = "sha256-+DbDwYeyR+mMDLRB4jiyol/5WO0LwqSCCEwjgflxoTk="; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "numpy>=2.0.0" "numpy" ''; - nativeBuildInputs = [ + build-system = [ astropy-extension-helpers cython - jinja2 - oldest-supported-numpy + setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ + dependencies = [ astropy-iers-data numpy packaging @@ -87,10 +75,6 @@ buildPythonPackage rec { # https://github.com/astropy/astropy/issues/15441 "TestUnifiedOutputRegistry" - # fail due to pytest>=8 - # https://github.com/astropy/astropy/issues/15960#issuecomment-1913654471 - "test_distortion_header" - # flaky "test_timedelta_conversion" # More flaky tests, see: https://github.com/NixOS/nixpkgs/issues/294392 @@ -99,7 +83,10 @@ buildPythonPackage rec { "test_datetime_to_timedelta" "test_datetime_difference_agrees_with_timedelta_no_hypothesis" - ] ++ lib.optionals stdenv.isDarwin [ "test_sidereal_lat_independent" ]; + + # SAMPProxyError 1: 'Timeout expired!' + "TestStandardProfile.test_main" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_sidereal_lat_independent" ]; meta = { description = "Astronomy/Astrophysics library for Python"; diff --git a/pkgs/development/python-modules/async-cache/default.nix b/pkgs/development/python-modules/async-cache/default.nix new file mode 100644 index 000000000000..d54fb2d48c7a --- /dev/null +++ b/pkgs/development/python-modules/async-cache/default.nix @@ -0,0 +1,24 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, +}: + +buildPythonPackage rec { + pname = "async-cache"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "iamsinghrajat"; + repo = "async-cache"; + rev = "9925f07920e6b585dc6345f49b7f477b3e1b8c2c"; # doesn't tag releases :( + hash = "sha256-AVSdtWPs1c8AE5PNOq+BdXzBXkI0aeFVzxxPl/ATyU0="; + }; + + meta = with lib; { + description = "Caching solution for asyncio"; + homepage = "https://github.com/iamsinghrajat/async-cache"; + license = licenses.mit; + maintainers = [ maintainers.lukegb ]; + }; +} diff --git a/pkgs/development/python-modules/async-stagger/default.nix b/pkgs/development/python-modules/async-stagger/default.nix index 51c18ed36773..27bf138c375a 100644 --- a/pkgs/development/python-modules/async-stagger/default.nix +++ b/pkgs/development/python-modules/async-stagger/default.nix @@ -1,8 +1,9 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, + setuptools, pytestCheckHook, pytest-asyncio, pytest-mock, @@ -10,17 +11,20 @@ buildPythonPackage rec { pname = "async-stagger"; - version = "0.3.1"; - format = "setuptools"; + version = "0.4.0.post1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.11"; - src = fetchPypi { - pname = "async_stagger"; - inherit version; - hash = "sha256-qp81fp79J36aUWqUvegSStXkZ+m8Zcn62qrJjpVqQ9Y="; + src = fetchFromGitHub { + owner = "twisteroidambassador"; + repo = "async_stagger"; + rev = "refs/tags/v${version}"; + hash = "sha256-uJohc3EsAKevqT0J+N0Cqop3xy0PCM5jsP6YYtx+HuQ="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook pytest-asyncio @@ -28,8 +32,8 @@ buildPythonPackage rec { ]; disabledTests = [ - # RuntimeError: Logic bug in... - "test_stagger_coro_gen" + # "OSError: [Errno 0] fileno not supported" during teardown + "test_create_connected_sock_normal" ]; pythonImportsCheck = [ "async_stagger" ]; diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 18969f48233d..a19d99c2f8ac 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.40.0"; + version = "0.41.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = "refs/tags/${version}"; - hash = "sha256-KaX1TNP6IP2wAijR2y9cqI+Pyc+Ygk3LqKwu5Yrv5LM="; + hash = "sha256-36pMEyLnyl8PS8ZVt+yNdpJGAVpoWTxfTxr+WQw/Go8="; }; pythonRelaxDeps = [ "defusedxml" ]; @@ -57,7 +57,7 @@ buildPythonPackage rec { # socket.gaierror: [Errno -2] Name or service not known "test_async_get_local_ip" "test_get_local_ip" - ] ++ lib.optionals stdenv.isDarwin [ "test_deferred_callback_url" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_deferred_callback_url" ]; disabledTestPaths = [ # Tries to bind to multicast socket and fails to find proper interface diff --git a/pkgs/development/python-modules/asynccmd/default.nix b/pkgs/development/python-modules/asynccmd/default.nix index 0cfbf87fc4d3..d9ffae1cf701 100644 --- a/pkgs/development/python-modules/asynccmd/default.nix +++ b/pkgs/development/python-modules/asynccmd/default.nix @@ -4,20 +4,21 @@ fetchFromGitHub, fetchpatch, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "asynccmd"; version = "0.2.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "valentinmk"; - repo = pname; - rev = version; - sha256 = "02sa0k0zgwv0y8k00pd1yh4x7k7xqhdikk2c0avpih1204lcw26h"; + repo = "asynccmd"; + rev = "refs/tags/${version}"; + hash = "sha256-0AjOKAEiwHi3AkzMGRvE/czTCfShXQAm8mDz98EESgs="; }; patches = [ @@ -25,10 +26,12 @@ buildPythonPackage rec { (fetchpatch { name = "deprecation-python-38.patch"; url = "https://github.com/valentinmk/asynccmd/commit/12afa60ac07db17e96755e266061f2c88cb545ff.patch"; - sha256 = "0l6sk93gj51qqrpw01a8iiyz14k6dd2z68vr9l9w9vx76l8725yf"; + hash = "sha256-zhdxEDWn78QTTXkj80VrZpLwfYxIBcBvxjgU+Uaa2lA="; }) ]; + build-system = [ setuptools ]; + # Tests are outdated doCheck = false; @@ -37,7 +40,8 @@ buildPythonPackage rec { meta = with lib; { description = "Asyncio implementation of Cmd Python library"; homepage = "https://github.com/valentinmk/asynccmd"; - license = with licenses; [ asl20 ]; + changelog = "https://github.com/valentinmk/asynccmd/releases/tag/${version}"; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/asyncinotify/default.nix b/pkgs/development/python-modules/asyncinotify/default.nix index 24837d824d6c..c144b7da381f 100644 --- a/pkgs/development/python-modules/asyncinotify/default.nix +++ b/pkgs/development/python-modules/asyncinotify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asyncinotify"; - version = "4.0.9"; + version = "4.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "absperf"; repo = "asyncinotify"; rev = "refs/tags/v${version}"; - hash = "sha256-Pmv1BXmKUNjFE5h99GR0GmjYKYmTi8ECKAUCKwIAMzc="; + hash = "sha256-SzsPYVA5fBXVcv7vE3FB4jFkIRr6NBlTeHrPxf5d8Ks="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix index cdd6ac9b9781..5608a8632e47 100644 --- a/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ]; # OSError: AF_UNIX path too long - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTests = [ "test_protocol_pause_resume" diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix index d095b203d72f..59c42fd02838 100644 --- a/pkgs/development/python-modules/asyncua/default.nix +++ b/pkgs/development/python-modules/asyncua/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { disabledTests = [ # Failed: DID NOT RAISE <class 'asyncio.exceptions.TimeoutError'> "test_publish" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.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/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index f2c341a3b593..460ab2684ec9 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -2,19 +2,19 @@ lib, buildPythonPackage, fetchFromGitHub, + hatchling, pytest-asyncio, pytest-mock, pytestCheckHook, python-socks, pythonOlder, - setuptools, tldextract, whodap, }: buildPythonPackage rec { pname = "asyncwhois"; - version = "1.1.4"; + version = "1.1.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,21 +23,16 @@ buildPythonPackage rec { owner = "pogzyb"; repo = "asyncwhois"; rev = "refs/tags/v${version}"; - hash = "sha256-BjHGp94vad5qTvffiU8ZEOxYeXNzQHlNq1SaxviYfps="; + hash = "sha256-y5JmAbrk9qJeNYejNcz5nI5bghaetUw1xkD8qgwOkao="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "python-socks[asyncio]" "python-socks" - ''; - - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ python-socks tldextract whodap - ]; + ] ++ python-socks.optional-dependencies.asyncio; nativeCheckInputs = [ pytest-asyncio @@ -68,7 +63,7 @@ buildPythonPackage rec { description = "Python module for retrieving WHOIS information"; homepage = "https://github.com/pogzyb/asyncwhois"; changelog = "https://github.com/pogzyb/asyncwhois/releases/tag/v${version}"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix index f60b281112cd..b34b1c46c1ad 100644 --- a/pkgs/development/python-modules/atenpdu/default.nix +++ b/pkgs/development/python-modules/atenpdu/default.nix @@ -10,24 +10,19 @@ buildPythonPackage rec { pname = "atenpdu"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; - disabled = pythonOlder "3."; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-KzRoE4tE/tQkKYroq5PbWKREmEl8AwbIOg3IHRZZtsQ="; + hash = "sha256-BcCw5y5LB0jLp9dRP0ZsAObTZ07kS+h+Hm8PZ0NwU3E="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail pysnmp-lextudio pysnmp - ''; + build-system = [ poetry-core ]; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ + dependencies = [ async-timeout pysnmp ]; @@ -39,10 +34,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to control ATEN PE PDUs"; - mainProgram = "pductl"; homepage = "https://github.com/mtdcr/pductl"; changelog = "https://github.com/mtdcr/pductl/releases/tag/${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "pductl"; }; } diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 5d1a30895382..20e01126b974 100644 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.41.15"; + version = "3.41.16"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DnsDulCbkilfD51r8x/L3RJXTDclAi4gYNktfuQC0w8="; + hash = "sha256-HhFGM8EPGCT3WqVf6WP6VvwsppvzFvHg+ys7GhUUwW0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index f858eb07be9a..6bb934508214 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "atom"; - version = "0.10.5"; + version = "0.11.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "nucleic"; repo = "atom"; rev = "refs/tags/${version}"; - hash = "sha256-wRVmCyqMwDs1thnRXYH6z1a/qCubw8CVUhaEMqLtiSM="; + hash = "sha256-3Xk4CM8Cnkc0lIdjJUYs/6UTqqpPALrUa3DpKD40og8="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index 96d6b5d0c96a..80da6cfefa31 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -4,29 +4,29 @@ buildPythonPackage, fetchPypi, pythonOlder, + substituteAll, hatchling, }: buildPythonPackage rec { pname = "attrs"; - version = "23.2.0"; + version = "24.2.0"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-k13DtSnCYvbPduUId9NaS9PB3hlP1B9HoreujxmXHzA="; + hash = "sha256-XPsbkUi1sIZWm67APyDXtr87ysyaQr6/h/+qyjYvY0Y="; }; patches = [ - # hatch-vcs and hatch-fancy-pypi-readme depend on pytest, which depends on attrs - ./remove-hatch-plugins.patch + (substituteAll { + # hatch-vcs and hatch-fancy-pypi-readme depend on pytest, which depends on attrs + src = ./remove-hatch-plugins.patch; + inherit version; + }) ]; - postPatch = '' - substituteAllInPlace pyproject.toml - ''; - nativeBuildInputs = [ hatchling ]; outputs = [ diff --git a/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch b/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch index cf743ba9ee05..b5b8889338aa 100644 --- a/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch +++ b/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch @@ -1,5 +1,5 @@ diff --git a/pyproject.toml b/pyproject.toml -index 1c72fc2..ae45740 100644 +index 93b3f40..e34ff5d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ @@ -11,7 +11,7 @@ index 1c72fc2..ae45740 100644 build-backend = "hatchling.build" -@@ -26,7 +26,8 @@ classifiers = [ +@@ -27,7 +27,8 @@ classifiers = [ "Typing :: Typed", ] dependencies = ["importlib_metadata;python_version<'3.8'"] @@ -21,10 +21,11 @@ index 1c72fc2..ae45740 100644 [project.optional-dependencies] tests-mypy = [ -@@ -70,54 +71,9 @@ Funding = "https://github.com/sponsors/hynek" +@@ -76,54 +77,9 @@ GitHub = "https://github.com/python-attrs/attrs" + Funding = "https://github.com/sponsors/hynek" Tidelift = "https://tidelift.com/subscription/pkg/pypi-attrs?utm_source=pypi-attrs&utm_medium=pypi" - +- -[tool.hatch.version] -source = "vcs" -raw-options = { local_scheme = "no-local-version" } @@ -64,15 +65,14 @@ index 1c72fc2..ae45740 100644 - ---- - --[Full changelog](https://www.attrs.org/en/stable/changelog.html) +-[Full changelog →](https://www.attrs.org/en/stable/changelog.html) -""" - -# Point sponsor image URLs to versions. -[[tool.hatch.metadata.hooks.fancy-pypi-readme.substitutions]] --pattern = '\/latest\/_static/sponsors' --replacement = '/$HFPR_VERSION/_static/sponsors' -- +-pattern = 'docs\/_static\/sponsors' +-replacement = 'https://www.attrs.org/en/$HFPR_VERSION/_static/sponsors' - - [tool.pytest.ini_options] - addopts = ["-ra", "--strict-markers", "--strict-config"] - xfail_strict = true + [[tool.sponcon.sponsors]] + title = "Variomedia AG" + url = "https://www.variomedia.de/" diff --git a/pkgs/development/python-modules/aubio/default.nix b/pkgs/development/python-modules/aubio/default.nix index 88d2d9af3434..64b89bb1897f 100644 --- a/pkgs/development/python-modules/aubio/default.nix +++ b/pkgs/development/python-modules/aubio/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { }) ]; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Accelerate diff --git a/pkgs/development/python-modules/audible/default.nix b/pkgs/development/python-modules/audible/default.nix index 1eb984dcbc16..87a809bfe1ed 100644 --- a/pkgs/development/python-modules/audible/default.nix +++ b/pkgs/development/python-modules/audible/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "audible"; - version = "0.9.1"; + version = "0.10.0"; pyproject = true; src = fetchFromGitHub { owner = "mkb79"; repo = "Audible"; rev = "refs/tags/v${version}"; - hash = "sha256-qLU8FjJBPKFgjpumPqRiiMBwZi+zW46iEmWM8UerMgs="; + hash = "sha256-ILGhjuPIxpRxu/dVDmz531FUgMWosk4P+onPJltuPIs="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/audiotools/default.nix b/pkgs/development/python-modules/audiotools/default.nix index a6b485d7b2c9..b714062be313 100644 --- a/pkgs/development/python-modules/audiotools/default.nix +++ b/pkgs/development/python-modules/audiotools/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox AudioUnit CoreServices diff --git a/pkgs/development/python-modules/auroranoaa/default.nix b/pkgs/development/python-modules/auroranoaa/default.nix index 82820fc05f33..8dcec269dced 100644 --- a/pkgs/development/python-modules/auroranoaa/default.nix +++ b/pkgs/development/python-modules/auroranoaa/default.nix @@ -4,31 +4,37 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "auroranoaa"; - version = "0.0.3"; - format = "setuptools"; + version = "0.0.5"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "djtimca"; repo = "aurora-api"; - rev = version; - hash = "sha256-ho0O5aEHCKaTuWh2eW2kY5a7dVGIGBLm4nKxAMq0bZ4="; + rev = "refs/tags/${version}"; + hash = "sha256-bQDFSbYFsGtvPuJNMykynOpBTIeloUoCVRtIuHXR4n0="; }; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; # Project has no tests doCheck = false; + pythonImportsCheck = [ "auroranoaa" ]; meta = with lib; { description = "Python wrapper for the Aurora API"; homepage = "https://github.com/djtimca/aurora-api"; - license = with licenses; [ asl20 ]; + changelog = "https://github.com/djtimca/aurora-api/releases/tag/${version}"; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/autarco/default.nix b/pkgs/development/python-modules/autarco/default.nix index c6afff489d65..50b7f6602fe5 100644 --- a/pkgs/development/python-modules/autarco/default.nix +++ b/pkgs/development/python-modules/autarco/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "autarco"; - version = "3.0.0"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-autarco"; rev = "refs/tags/v${version}"; - hash = "sha256-7Q6kvJxhds0myu3pMOLSCJKwoGPzHjNSo8H3ctgFvjM="; + hash = "sha256-zSqIEtQucrrAFEY7pBJ14Cevq8xbcGOheEmEE7Jd4qk="; }; pythonRelaxDeps = [ "orjson" ]; diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 08187be3a2e8..fe6ee9f8f9ba 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -1,70 +1,48 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, attrs, argon2-cffi, - base58, cbor2, cffi, - click, cryptography, - ecdsa, - eth-abi, - eth-account, flatbuffers, - jinja2, - hkdf, hyperlink, - mnemonic, mock, msgpack, passlib, - py-ecc, - # , py-eth-sig-utils - py-multihash, py-ubjson, pynacl, pygobject3, pyopenssl, qrcode, - pytest-asyncio_0_21, + pytest-asyncio, python-snappy, pytestCheckHook, pythonOlder, - # , pytrie - rlp, service-identity, setuptools, - spake2, twisted, txaio, ujson, - # , web3 - # , wsaccel - # , xbr - yapf, - # , zlmdb zope-interface, }@args: buildPythonPackage rec { pname = "autobahn"; - version = "23.6.2"; + version = "24.4.2"; pyproject = true; disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-7JQhxSohAzZNHvBGgDbmAZ7oT3FyHoazb+Ga1pZsEYE="; + src = fetchFromGitHub { + owner = "crossbario"; + repo = "autobahn-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-aeTE4a37zr83KZ+v947XikzFrHAhkZ4mj4tXdkQnB84="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "pytest>=2.8.6,<3.3.0" "pytest" - ''; - build-system = [ setuptools ]; dependencies = [ @@ -74,25 +52,26 @@ buildPythonPackage rec { txaio ]; - nativeCheckInputs = - [ - mock - pytest-asyncio_0_21 - pytestCheckHook - ] - ++ optional-dependencies.scram ++ optional-dependencies.serialization ++ optional-dependencies.xbr; + nativeCheckInputs = [ + mock + pytest-asyncio + pytestCheckHook + ] ++ optional-dependencies.scram ++ optional-dependencies.serialization; preCheck = '' # Run asyncio tests (requires twisted) export USE_ASYNCIO=1 ''; - pytestFlagsArray = [ "--pyargs autobahn" ]; + pytestFlagsArray = [ + "--ignore=./autobahn/twisted" + "./autobahn" + ]; pythonImportsCheck = [ "autobahn" ]; optional-dependencies = rec { - all = accelerate ++ compress ++ encryption ++ nvx ++ serialization ++ scram ++ twisted ++ ui ++ xbr; + all = accelerate ++ compress ++ encryption ++ nvx ++ serialization ++ scram ++ twisted ++ ui; accelerate = [ # wsaccel ]; @@ -122,25 +101,10 @@ buildPythonPackage rec { zope-interface ]; ui = [ pygobject3 ]; - xbr = [ - base58 - cbor2 - click - ecdsa - eth-abi - jinja2 - hkdf - mnemonic - py-ecc # py-eth-sig-utils - py-multihash - rlp - spake2 - twisted # web3 xbr - yapf # zlmdb - ]; }; meta = with lib; { + changelog = "https://github.com/crossbario/autobahn-python/blob/${src.rev}/docs/changelog.rst"; description = "WebSocket and WAMP in Python for Twisted and asyncio"; homepage = "https://crossbar.io/autobahn"; license = licenses.mit; diff --git a/pkgs/development/python-modules/autograd/default.nix b/pkgs/development/python-modules/autograd/default.nix index 2b7569d8f745..e8be58101302 100644 --- a/pkgs/development/python-modules/autograd/default.nix +++ b/pkgs/development/python-modules/autograd/default.nix @@ -2,37 +2,36 @@ lib, buildPythonPackage, fetchPypi, + hatchling, numpy, - future, + pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "autograd"; - version = "1.6.2"; - format = "setuptools"; + version = "1.7.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-hzHgigxOOJ2GlaQAcq2kUSZBwRO2ys6PTPvo636a7es="; + hash = "sha256-3nQ/02jW31I803MF3NFxhhqXUqFESTZ30sn1pWmD/y8="; }; - propagatedBuildInputs = [ - numpy - future - ]; + build-system = [ hatchling ]; - # Currently, the PyPI tarball doesn't contain the tests. When that has been - # fixed, enable testing. See: https://github.com/HIPS/autograd/issues/404 - doCheck = false; + dependencies = [ numpy ]; + + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "autograd" ]; meta = with lib; { - homepage = "https://github.com/HIPS/autograd"; description = "Compute derivatives of NumPy code efficiently"; + homepage = "https://github.com/HIPS/autograd"; + changelog = "https://github.com/HIPS/autograd/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index 05d612256e43..7833eb27f57c 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -11,14 +11,13 @@ let automat = buildPythonPackage rec { - version = "22.10.0"; - format = "setuptools"; + version = "24.8.1"; + format = "pyproject"; pname = "automat"; src = fetchPypi { - pname = "Automat"; - inherit version; - hash = "sha256-5WvrhO2tGdzBHTDo2biV913ute9elrhKRnBms7hLsE4="; + inherit pname version; + hash = "sha256-s0Inz2P2MluK0jme3ngGdQg+Q5sgwyPTdjc9juYwbYg="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/automower-ble/default.nix b/pkgs/development/python-modules/automower-ble/default.nix new file mode 100644 index 000000000000..5a2dbd5d8c30 --- /dev/null +++ b/pkgs/development/python-modules/automower-ble/default.nix @@ -0,0 +1,39 @@ +{ + lib, + bleak, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "automower-ble"; + version = "0.2.0"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "alistair23"; + repo = "AutoMower-BLE"; + rev = "refs/tags/${version}"; + hash = "sha256-BWfRXz78e1Xq0fNOGJ2IFnjNqfH3oD5VIGMxyCPtEUw="; + }; + + build-system = [ setuptools ]; + + dependencies = [ bleak ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "automower_ble" ]; + + meta = { + description = "Module to connect to Husqvarna Automower Connect"; + homepage = "https://github.com/alistair23/AutoMower-BLE"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 4088b131d4e3..57a377ada235 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "autopep8"; - version = "2.0.4-unstable-2023-10-27"; + version = "2.3.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hhatto"; repo = "autopep8"; - rev = "af7399d90926f2fe99a71f15197a08fa197f73a1"; - hash = "sha256-psGl9rXxTQGHyXf1VskJ/I/goVH5hRRP5bUXQdaT/8M="; + rev = "refs/tags/v${version}"; + hash = "sha256-znZw9SnnVMN8XZjko11J5GK/LAk+gmRkTgPEO9+ntJ8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/autotrash/default.nix b/pkgs/development/python-modules/autotrash/default.nix deleted file mode 100644 index 6c628b392535..000000000000 --- a/pkgs/development/python-modules/autotrash/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - poetry-core, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "autotrash"; - version = "0.4.7"; - pyproject = true; - - src = fetchFromGitHub { - owner = "bneijt"; - repo = "autotrash"; - rev = "refs/tags/${version}"; - hash = "sha256-qMU3jjBL5+fd9vKX5BIqES5AM8D/54aBOmdHFiBtfEo="; - }; - - build-system = [ poetry-core ]; - - pythonImportsCheck = [ "autotrash" ]; - nativeCheckInputs = [ pytestCheckHook ]; - - meta = { - description = "Tool to automatically purge old trashed files"; - license = lib.licenses.gpl3Plus; - homepage = "https://bneijt.nl/pr/autotrash"; - 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 a030344e8f4c..249c5af0bec2 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -6,7 +6,7 @@ fetchFromGitHub, fetchurl, linkFarm, - ffmpeg_6-headless, + ffmpeg-headless, numpy, pillow, pkg-config, @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "av"; - version = "12.3.0"; + version = "13.0.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "PyAV-Org"; repo = "PyAV"; rev = "refs/tags/v${version}"; - hash = "sha256-ezeYv55UzNnnYDjrMz5YS5g2pV6U/Fxx3e2bCoPP3eI="; + hash = "sha256-blvtHSUqSl9xAM4t+dFJWmXiOjtnAUC9nicMaUY1zuU="; }; build-system = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ffmpeg_6-headless ]; + buildInputs = [ ffmpeg-headless ]; preCheck = let @@ -63,7 +63,7 @@ buildPythonPackage rec { ]; # `__darwinAllowLocalNetworking` doesn’t work for these; not sure why. - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_timeout.py" ]; diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index ec07daa2880c..512377ff053c 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -10,25 +10,19 @@ buildPythonPackage rec { pname = "avro"; - version = "1.11.3"; + version = "1.12.0"; pyproject = true; - # distutils usage: https://github.com/search?q=repo%3Aapache%2Favro%20distutils&type=code - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-M5O7UTn5zweR0gV1bOHjmltYWGr1sVPWo7WhmWEOnRc="; + hash = "sha256-ytnFOyPO7Wmceva93O1C4sVy/WtAjCV6fU/E6M8uLWs="; }; - postPatch = lib.optionalString (!pythonOlder "3.12") '' - substituteInPlace avro/test/test_tether_word_count.py \ - --replace-fail 'distutils' 'setuptools._distutils' - ''; + build-system = [ setuptools ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ typing-extensions ]; - - nativeBuildInputs = [ setuptools ]; + dependencies = lib.optionals (pythonOlder "3.8") [ typing-extensions ]; nativeCheckInputs = [ pytest7CheckHook ]; @@ -43,10 +37,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python serialization and RPC framework"; - mainProgram = "avro"; homepage = "https://github.com/apache/avro"; changelog = "https://github.com/apache/avro/releases/tag/release-${version}"; license = licenses.asl20; maintainers = with maintainers; [ zimbatm ]; + mainProgram = "avro"; }; } diff --git a/pkgs/development/python-modules/avwx-engine/default.nix b/pkgs/development/python-modules/avwx-engine/default.nix index af6162dc9263..aaae9c534eb7 100644 --- a/pkgs/development/python-modules/avwx-engine/default.nix +++ b/pkgs/development/python-modules/avwx-engine/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "avwx-engine"; - version = "1.9.0"; + version = "1.9.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "avwx-rest"; repo = "avwx-engine"; rev = "refs/tags/${version}"; - hash = "sha256-CUnUz2SsXtWaqGzaB1PH+EoHqebSue6e8GXhRZRcXLs="; + hash = "sha256-gDhZlrxiIyj15nxMBFFzuCAHtkDfqYowDZc5g4pQ+i8="; }; build-system = [ hatchling ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { xmltodict ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ numpy rapidfuzz @@ -61,7 +61,7 @@ buildPythonPackage rec { pytest-cov-stub pytestCheckHook time-machine - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "avwx" ]; diff --git a/pkgs/development/python-modules/aw-client/default.nix b/pkgs/development/python-modules/aw-client/default.nix index 42c51ed2f806..bec43cbf2dbe 100644 --- a/pkgs/development/python-modules/aw-client/default.nix +++ b/pkgs/development/python-modules/aw-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aw-client"; - version = "0.5.13"; + version = "0.5.14"; format = "pyproject"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ActivityWatch"; repo = "aw-client"; rev = "v${version}"; - sha256 = "sha256-A9f1Wj4F6qRvCVj3iRQvsnILewJK1L5tfI2MnAXZ4nY="; + sha256 = "sha256-HTyhQz/RaNdCtJIV6YHEd6Yhu9VRJ8E9XdN7NcoO8ao="; }; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/aw-core/default.nix b/pkgs/development/python-modules/aw-core/default.nix index 84b13c6f100d..591c862597d5 100644 --- a/pkgs/development/python-modules/aw-core/default.nix +++ b/pkgs/development/python-modules/aw-core/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aw-core"; - version = "0.5.16"; + version = "0.5.17"; format = "pyproject"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "ActivityWatch"; repo = "aw-core"; rev = "v${version}"; - sha256 = "sha256-7xT7bOGzH5G4WpgNo8pDyiQqX0dWNLNHpgssozUa9kQ="; + sha256 = "sha256-bKxf+fqm+6V3JgDluKVpqq5hRL3Z+x8SHMRQmNe8vUA="; }; disabled = pythonOlder "3.8"; @@ -51,7 +51,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "platformdirs" - "iso8601" ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -65,11 +64,11 @@ buildPythonPackage rec { passthru.updateScript = gitUpdater { rev-prefix = "v"; }; - meta = with lib; { + meta = { description = "Core library for ActivityWatch"; mainProgram = "aw-cli"; homepage = "https://github.com/ActivityWatch/aw-core"; - maintainers = with maintainers; [ huantian ]; - license = licenses.mpl20; + maintainers = with lib.maintainers; [ huantian ]; + license = lib.licenses.mpl20; }; } diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index f503f2ad0af5..bebc46bbd89f 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "38"; + version = "39"; pyproject = true; src = fetchPypi { pname = "awkward_cpp"; inherit version; - hash = "sha256-l0SVah14fD0hXqE8WqG2EQnIk/Ad0e/i2mj1jt6K0Vs="; + hash = "sha256-YdoAEZnqIJRITijKB0WR0uxmDxF+mperieYNpAUnI4U="; }; build-system = [ @@ -36,7 +36,6 @@ buildPythonPackage rec { meta = { description = "CPU kernels and compiled extensions for Awkward Array"; homepage = "https://github.com/scikit-hep/awkward"; - changelog = "https://github.com/scikit-hep/awkward/releases/tag/v${version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index ffadf4d180ca..086bd6a47035 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.6.8"; + version = "2.6.9"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "awkward"; rev = "refs/tags/v${version}"; - hash = "sha256-2VhG4Elv1neBEfogfhjwlPltQK64wjaLUMhDg7xB/Ow="; + hash = "sha256-kYDihmfzMH5LPXSgXpC64qMPqxIX59VzflhP0gWu92Y="; }; build-system = [ @@ -72,7 +72,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # no support for darwin jax jaxlib @@ -82,7 +82,7 @@ buildPythonPackage rec { disabledTestPaths = [ "tests-cuda" # Disable tests dependending on jax on darwin - ] ++ lib.optionals stdenv.isDarwin [ "tests/test_2603_custom_behaviors_with_jax.py" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_2603_custom_behaviors_with_jax.py" ]; disabledTests = [ # AssertionError: Regex pattern did not match. diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 97257d6108ff..c95866a9b584 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.50.0"; + version = "1.51.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-GXpyO+Qd6NP5yxWn1kw34x+P5uyR0rcNlzwivT6eHdE="; + hash = "sha256-9EmhOehkXf6aUu6GLhzE0nkfyx+8ovv+Hr7w7DszXTg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index c36c24553ece..c1ccbc754242 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -12,13 +12,14 @@ pytestCheckHook, pythonOlder, pyyaml, + setuptools, typing-extensions, }: buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.89.0"; - format = "setuptools"; + version = "1.91.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "aws"; repo = "serverless-application-model"; rev = "refs/tags/v${version}"; - hash = "sha256-wqM3n99lD0s/E9nd55q19Us31XgFtU/bBYJR1HTnnvk="; + hash = "sha256-jcRpn9STkfg1xTwYzkpoYyuG0Hrv0XnbW1h6+SxzEjA="; }; postPatch = '' @@ -34,7 +35,9 @@ buildPythonPackage rec { rm pytest.ini ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ boto3 jsonschema pydantic diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index f856473c7b7d..02cc8115386f 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,22 +12,22 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.21.5"; + version = "0.22.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fsKmevMPvzhklN8Au9+Zb3AkAA32sBqxYAFK/vK5EAU="; + hash = "sha256-TKKwtJMo8D9aPd4tVlEy34rXTLonNSYS7Nn+JQXh13A="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; - nativeBuildInputs = [ cmake ] ++ lib.optionals (!stdenv.isDarwin) [ perl ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ perl ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index f208c5048767..e72e6baa6247 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage rec { pname = "awslambdaric"; - version = "2.1.0"; + version = "2.2.1"; pyproject = true; disabled = isPy27; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-lambda-python-runtime-interface-client"; rev = "refs/tags/${version}"; - sha256 = "sha256-FHZ7ZTCOzElW/DM07TScp6bfOOFe4b307q/ALVX1fWQ="; + sha256 = "sha256-IA2Kx4+U0+8lPl9TTTZC46Y3WhSUb5HR5Hr9QZSJIDU="; }; propagatedBuildInputs = [ simplejson ]; @@ -55,7 +55,7 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; description = "AWS Lambda Runtime Interface Client for Python"; homepage = "https://github.com/aws/aws-lambda-python-runtime-interface-client"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index 3f770c272c55..5ef6e53e6743 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { requests-aws4auth ]; - passthru.optional-dependencies = { + optional-dependencies = { sqlserver = [ pyodbc ]; sparql = [ sparqlwrapper ]; }; diff --git a/pkgs/development/python-modules/ax-platform/default.nix b/pkgs/development/python-modules/ax-platform/default.nix index f0d274ef85ae..ec033ec962b3 100644 --- a/pkgs/development/python-modules/ax-platform/default.nix +++ b/pkgs/development/python-modules/ax-platform/default.nix @@ -1,35 +1,42 @@ { lib, + botorch, buildPythonPackage, fetchFromGitHub, - botorch, + hypothesis, ipywidgets, jinja2, + jupyter, + mercurial, pandas, plotly, - setuptools, - setuptools-scm, - typeguard, - hypothesis, - mercurial, pyfakefs, + pyre-extensions, pytestCheckHook, + pythonOlder, + setuptools-scm, + setuptools, + sqlalchemy, + typeguard, yappi, - pyre-extensions, }: buildPythonPackage rec { pname = "ax-platform"; - version = "0.4.1"; + version = "0.4.3"; pyproject = true; + disabled = pythonOlder "3.10"; + src = fetchFromGitHub { owner = "facebook"; repo = "ax"; rev = "refs/tags/${version}"; - hash = "sha256-ygMMMKY5XsoQGp9yUMFAQqkSUlXNBJCb8xgGE10db4U="; + hash = "sha256-jmBjrtxqg4Iu3Qr0HRqjVfwURXzbJaGm+DBFNHYk/vA="; }; + env.ALLOW_BOTORCH_LATEST = "1"; + build-system = [ setuptools setuptools-scm @@ -45,7 +52,10 @@ buildPythonPackage rec { pyre-extensions ]; - env.ALLOW_BOTORCH_LATEST = "1"; + optional-dependencies = { + mysql = [ sqlalchemy ]; + notebook = [ jupyter ]; + }; nativeCheckInputs = [ hypothesis @@ -53,20 +63,23 @@ buildPythonPackage rec { pyfakefs pytestCheckHook yappi - ]; - pytestFlagsArray = [ - "--ignore=ax/benchmark" - "--ignore=ax/runners/tests/test_torchx.py" + ] ++ lib.flatten (builtins.attrValues optional-dependencies); + + disabledTestPaths = [ + "ax/benchmark" + "ax/runners/tests/test_torchx.py" # requires pyre_extensions - "--ignore=ax/telemetry/tests" - "--ignore=ax/core/tests/test_utils.py" - "--ignore=ax/early_stopping/tests/test_strategies.py" + "ax/telemetry/tests" + "ax/core/tests/test_utils.py" + "ax/early_stopping/tests/test_strategies.py" # broken with sqlalchemy 2 - "--ignore=ax/service/tests/test_ax_client.py" - "--ignore=ax/service/tests/test_scheduler.py" - "--ignore=ax/service/tests/test_with_db_settings_base.py" - "--ignore=ax/storage" + "ax/core/tests/test_experiment.py" + "ax/service/tests/test_ax_client.py" + "ax/service/tests/test_scheduler.py" + "ax/service/tests/test_with_db_settings_base.py" + "ax/storage" ]; + disabledTests = [ # exact comparison of floating points "test_optimize_l0_homotopy" @@ -77,13 +90,14 @@ buildPythonPackage rec { # uses torch.equal "test_convert_observations" ]; + pythonImportsCheck = [ "ax" ]; - 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"; + meta = { + description = "Platform for understanding, managing, deploying, and automating adaptive experiments"; homepage = "https://ax.dev/"; - license = licenses.mit; - maintainers = with maintainers; [ veprbl ]; + changelog = "https://github.com/facebook/Ax/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/python-modules/axis/default.nix b/pkgs/development/python-modules/axis/default.nix index e0a316317ef3..766e8ff1026a 100644 --- a/pkgs/development/python-modules/axis/default.nix +++ b/pkgs/development/python-modules/axis/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "axis"; - version = "62"; + version = "63"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "axis"; rev = "refs/tags/v${version}"; - hash = "sha256-ey0yt+AIbMO74brHepnCFtekDS4XscTKswshlTrS41A="; + hash = "sha256-XqNzYd7WgSDho3jyCHF1lDZWWpBEZFqGFmVOAUlm50o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/axisregistry/default.nix b/pkgs/development/python-modules/axisregistry/default.nix index f4760c620076..e0379c127e6c 100644 --- a/pkgs/development/python-modules/axisregistry/default.nix +++ b/pkgs/development/python-modules/axisregistry/default.nix @@ -5,8 +5,8 @@ fonttools, protobuf, pytestCheckHook, - setuptools-scm, pythonOlder, + setuptools-scm, }: buildPythonPackage rec { @@ -27,6 +27,8 @@ buildPythonPackage rec { # in the closure of fontbakery. It seems to be compatible enough. pythonRelaxDeps = [ "protobuf" ]; + env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + build-system = [ setuptools-scm ]; dependencies = [ diff --git a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix index de43b8c642ac..df170b4e7992 100644 --- a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix +++ b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ayla-iot-unofficial"; - version = "1.3.1"; + version = "1.4.3"; pyproject = true; src = fetchFromGitHub { owner = "rewardone"; repo = "ayla-iot-unofficial"; rev = "refs/tags/v${version}"; - hash = "sha256-WfaDTKht+WEnozVFWGYwNvrC8Rr/IePxjNp5O7jz/9A="; + hash = "sha256-y2SjnM48OYyXhBxLHE8R9di4ErORUgS87m/FKs21NLU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 67178fac58aa..c79f8bb18305 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -20,7 +20,7 @@ }: buildPythonPackage rec { - version = "1.30.2"; + version = "1.31.0"; pname = "azure-core"; pyproject = true; @@ -29,8 +29,9 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; src = fetchPypi { - inherit pname version; - hash = "sha256-oU3CEO/NYIghqkctn7jo0DXSm2iZOBkUe8KQqKwiRHI="; + pname = "azure_core"; + inherit version; + hash = "sha256-ZWoN1h4YabFQa3xqOzHWLxWYSxpXPWMm9qovPkEjKEs="; }; nativeBuildInputs = [ setuptools ]; @@ -41,7 +42,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { aio = [ aiohttp ]; }; @@ -54,7 +55,7 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook trio - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # test server needs to be available preCheck = '' @@ -75,7 +76,7 @@ buildPythonPackage rec { # disable 8 tests failing on some darwin machines with errors: # azure.core.polling.base_polling.BadStatus: Invalid return status 403 for 'GET' operation # azure.core.exceptions.HttpResponseError: Operation returned an invalid status 'Forbidden' - ] ++ lib.optionals stdenv.isDarwin [ "location_polling_fail" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "location_polling_fail" ]; disabledTestPaths = [ # requires testing modules which aren't published, and likely to create cyclic dependencies diff --git a/pkgs/development/python-modules/azure-functions-devops-build/default.nix b/pkgs/development/python-modules/azure-functions-devops-build/default.nix deleted file mode 100644 index a07ca228b92e..000000000000 --- a/pkgs/development/python-modules/azure-functions-devops-build/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - jinja2, - msrest, - vsts, -}: - -buildPythonPackage rec { - version = "0.0.22"; - format = "setuptools"; - pname = "azure-functions-devops-build"; - - src = fetchFromGitHub { - owner = "Azure"; - repo = "azure-functions-devops-build"; - # rev picked based on pypi release date - rev = "c8249670acc77333e3de8b21dec60faf7ecf0951"; - sha256 = "1slc7jd92v9q1qg1yacnrpi2a7hi7iw61wzbzfd6wx9q63pw9yqi"; - }; - - propagatedBuildInputs = [ - jinja2 - msrest - vsts - ]; - - # circular dependency with azure-cli-core - doCheck = false; - - meta = with lib; { - 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 = [ ]; - }; -} diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index 6f89cacb08bd..b6c9eea8be3a 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -7,25 +7,31 @@ cryptography, msal, msal-extensions, + typing-extensions, + setuptools, }: buildPythonPackage rec { pname = "azure-identity"; - version = "1.17.0"; - format = "setuptools"; + version = "1.18.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-oRaPIjstf6OWg2K3iv/RV6Hzdy8xCozc6IPMUVxsiZg="; + pname = "azure_identity"; + inherit version; + hash = "sha256-9WdXmmXYky+pE8du3fMwUQGhXlcnpeSqXfZJoPVT1MM="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-core cryptography msal msal-extensions + typing-extensions ]; pythonImportsCheck = [ "azure.identity" ]; @@ -36,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Identity Library for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-identity_${version}/sdk/identity/azure-identity/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ kamadorueda ]; diff --git a/pkgs/development/python-modules/azure-iot-device/default.nix b/pkgs/development/python-modules/azure-iot-device/default.nix new file mode 100644 index 000000000000..cae7ceb73efc --- /dev/null +++ b/pkgs/development/python-modules/azure-iot-device/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + + setuptools, + + urllib3, + deprecation, + paho-mqtt, + requests, + requests-unixsocket2, + janus, + pysocks, + typing-extensions, +}: +buildPythonPackage rec { + pname = "azure-iot-device"; + version = "2.14.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit version; + pname = "azure_iot_device"; + hash = "sha256-ttSNSTLCQAJXNqzlRMTnG8SaFXasmY6h3neK+CSW/84="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + urllib3 + deprecation + paho-mqtt + requests + requests-unixsocket2 + janus + pysocks + typing-extensions + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "azure.iot.device" + "azure.iot.device.aio" + ]; + + meta = with lib; { + description = "Microsoft Azure IoT Device Library for Python"; + homepage = "https://github.com/Azure/azure-iot-sdk-python"; + license = licenses.mit; + maintainers = with maintainers; [ mikut ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix index 9fc23174d60d..d933f721da39 100644 --- a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix @@ -11,20 +11,20 @@ buildPythonPackage rec { pname = "azure-mgmt-appconfiguration"; - version = "3.0.0"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - hash = "sha256-FJhuVgqNjdRIegP4vUISrAtHvvVle5VQFVITPm4HLEw="; - extension = "zip"; + pname = "azure_mgmt_appconfiguration"; + inherit version; + hash = "sha256-BZbwnn54Qb6R3eHIGBNBALv6EkSG4GiJ0jndWHdEtHw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ azure-common azure-mgmt-core isodate diff --git a/pkgs/development/python-modules/azure-mgmt-automation/default.nix b/pkgs/development/python-modules/azure-mgmt-automation/default.nix new file mode 100644 index 000000000000..8de27d0b7fcc --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-automation/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + msrest, + azure-common, + azure-mgmt-core, +}: + +buildPythonPackage rec { + pname = "azure-mgmt-automation"; + version = "1.0.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + hash = "sha256-pJ0tQT/vVwEMs2Fh5bwFZgG418bQW9PLBaE1Eu8pHh4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + msrest + azure-common + azure-mgmt-core + ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "azure.mgmt.automation" ]; + + meta = with lib; { + description = "This is the Microsoft Azure Automation Client Library"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/automation/azure-mgmt-automation"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-automation_${version}/sdk/automation/azure-mgmt-automation/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ wfdewith ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix index e6020399fdf8..e098d8f63755 100644 --- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -11,14 +11,15 @@ buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "17.3.0"; + version = "18.0.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - hash = "sha256-/JSIGmrNuKlTPzcbb3stPq6heJ65VQFLJKkI1t/nWZE="; + pname = "azure_mgmt_batch"; + inherit version; + hash = "sha256-MF61H7P3OyCSfvR7O2+T6eMtyTmHbARflwvThsB7p5w="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/pkgs/development/python-modules/azure-mgmt-billing/default.nix index db243f585759..dfef1554ecc4 100644 --- a/pkgs/development/python-modules/azure-mgmt-billing/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-billing/default.nix @@ -1,45 +1,46 @@ { lib, - buildPythonPackage, - fetchPypi, - msrestazure, azure-common, azure-mgmt-core, - azure-mgmt-nspkg, + buildPythonPackage, + fetchPypi, + isodate, + pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "azure-mgmt-billing"; - version = "6.0.0"; # pypi's 0.2.0 doesn't build ootb - format = "setuptools"; + version = "7.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - sha256 = "d4f5c5a4188a456fe1eb32b6c45f55ca2069c74be41eb76921840b39f2f5c07f"; - extension = "zip"; + pname = "azure_mgmt_billing"; + inherit version; + hash = "sha256-jgplxlEQtTpCk35b7WrgDvydYgaXLZa/1KdOgMhcLXs="; }; - propagatedBuildInputs = [ - msrestazure + build-system = [ setuptools ]; + + dependencies = [ azure-common azure-mgmt-core - azure-mgmt-nspkg + isodate + typing-extensions ]; - preBuild = '' - rm -rf azure_bdist_wheel.py - substituteInPlace setup.cfg \ - --replace "azure-namespace-package = azure-mgmt-nspkg" "" - ''; - pythonNamespaces = [ "azure.mgmt" ]; - # has no tests + # Module has no tests doCheck = false; meta = with lib; { description = "This is the Microsoft Azure Billing Client Library"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/billing/azure-mgmt-billing"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-billing_${version}/sdk/billing/azure-mgmt-billing/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 876c7f25fdec..305f98a6459d 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "32.0.0"; + version = "32.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_mgmt_containerservice"; inherit version; - hash = "sha256-zLWHR52Kk+x49xYlkK3ILk+6TeduStw0GfM60iXvspI="; + hash = "sha256-rxOS1MT1F0tbt+OyjpITfSmPOt1U5AJ3LfKvzPEmO6A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix index b166ab5ea0f7..3fda65ab7524 100644 --- a/pkgs/development/python-modules/azure-mgmt-dns/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix @@ -1,43 +1,48 @@ { lib, - buildPythonPackage, - fetchPypi, - msrest, - msrestazure, azure-common, azure-mgmt-core, + buildPythonPackage, + fetchPypi, + isodate, + pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "azure-mgmt-dns"; - version = "8.1.0"; - format = "setuptools"; + version = "8.2.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - extension = "zip"; - hash = "sha256-2DedS7kZS4G3nlKE2HX6bfgHBzRvLLtcVJGiDzUmb9A="; + pname = "azure_mgmt_dns"; + inherit version; + hash = "sha256-Ynueo98L94qJWsrcUUjeyEwomAY7+qv/+LFLqpg7WW4="; }; - propagatedBuildInputs = [ - msrest - msrestazure + build-system = [ setuptools ]; + + dependencies = [ azure-common azure-mgmt-core + isodate + typing-extensions ]; # this is still needed for when the version is overrided pythonNamespaces = [ "azure.mgmt" ]; - # has no tests + # Tests are only available in the mono-repo doCheck = false; meta = with lib; { description = "This is the Microsoft Azure DNS Management Client Library"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/network/azure-mgmt-dns"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-dns_${version}/sdk/network/azure-mgmt-dns/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ - maxwilson - ]; + maintainers = with maintainers; [ maxwilson ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix index 7ce3bf66c5d6..efa62109277e 100644 --- a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix @@ -1,32 +1,35 @@ { lib, - buildPythonPackage, - fetchPypi, - msrest, - msrestazure, azure-common, azure-mgmt-core, + buildPythonPackage, + fetchPypi, + isodate, pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "azure-mgmt-eventhub"; - version = "11.0.0"; - format = "setuptools"; + version = "11.1.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - extension = "zip"; - hash = "sha256-FxB9ToXd6PZ1eUrMWDAtbOmKclTuA/QdP72WsG7za5Y="; + pname = "azure_mgmt_eventhub"; + inherit version; + hash = "sha256-47j+CauuZ8XaiE57bw3kTi+CfFuACaZSuVH7LSD8s5I="; }; - propagatedBuildInputs = [ - msrest - msrestazure + build-system = [ setuptools ]; + + dependencies = [ azure-common azure-mgmt-core + isodate + typing-extensions ]; # has no tests @@ -34,7 +37,8 @@ buildPythonPackage rec { meta = with lib; { description = "This is the Microsoft Azure EventHub Management Client Library"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/eventhub/azure-mgmt-eventhub"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-eventhub_${version}/sdk/eventhub/azure-mgmt-eventhub/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 0a5ca8dcfefc..dfe2a9772b89 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -11,14 +11,15 @@ buildPythonPackage rec { pname = "azure-mgmt-netapp"; - version = "13.2.0"; + version = "13.3.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-31wzzDeQrs04AL8Qsz050RY/AllvXwy+8Ng+QbUihjo="; + pname = "azure_mgmt_netapp"; + inherit version; + hash = "sha256-N0Fnnigw6sk5M2Cx9T2CtMAe0S64WN73shukkWMkiEk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 735184f21b1a..17b767ef22d4 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -11,19 +11,20 @@ buildPythonPackage rec { pname = "azure-mgmt-network"; - version = "26.0.0"; + version = "27.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-TeZ2GEGVBT/bEGpuoQQqiU5wxzGm08imM9UvUin07hs="; + pname = "azure_mgmt_network"; + inherit version; + hash = "sha256-XBxh2LsTrUD3iKJv11acHZ1g6y5MsZwqG12cAq6GIxY="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ azure-common azure-mgmt-core isodate diff --git a/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix b/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix index 9e3f437ced84..aeb519515beb 100644 --- a/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix @@ -5,30 +5,32 @@ buildPythonPackage, fetchPypi, isodate, - msrest, pythonOlder, + setuptools, typing-extensions, }: buildPythonPackage rec { pname = "azure-mgmt-privatedns"; - version = "1.1.0"; - format = "setuptools"; + version = "1.2.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-MtucYFpKj/ANNON1UdXrBrTsJnq53iph3SJ1ypWj+5g="; - extension = "zip"; + pname = "azure_mgmt_privatedns"; + inherit version; + hash = "sha256-NCMYcvAblPYZXY7lQo4XRpJS7QTqCCjVIyXr578KEgs="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-common azure-mgmt-core isodate - msrest - ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + typing-extensions + ]; # no tests included doCheck = false; @@ -40,7 +42,8 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure DNS Private Zones Client Library for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/network/azure-mgmt-privatedns"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-privatedns_${version}/sdk/network/azure-mgmt-privatedns/CHANGELOG.md"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 6e622d51794d..997d52e12897 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -1,35 +1,33 @@ { lib, - azure-common, azure-core, buildPythonPackage, fetchPypi, isodate, - msrest, pythonOlder, typing-extensions, - uamqp, + setuptools, }: buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.12.2"; - format = "setuptools"; + version = "7.12.3"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-pqPF957VvvEB2ePjyYahA7IA4mxJU8R6UvVSx1fkXso="; + pname = "azure_servicebus"; + inherit version; + hash = "sha256-PwdZcxrSIRxo60sh5byimCf31v8Ccr3H7vEDwcE/gyI="; }; - propagatedBuildInputs = [ - azure-common + build-system = [ setuptools ]; + + dependencies = [ azure-core isodate - msrest typing-extensions - uamqp ]; # Tests require dev-tools @@ -39,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Service Bus Client Library"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/servicebus/azure-servicebus"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-servicebus_${version}/sdk/servicebus/azure-servicebus/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index fa2876123e97..9ee0c634a554 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -6,22 +6,26 @@ fetchPypi, isodate, pythonOlder, + setuptools, typing-extensions, }: buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.20.0"; - format = "setuptools"; + version = "12.23.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-7rkSVuQdS1ubrWqH/QqK3gfdWKpSNE4sjSdG4noBfTs="; + pname = "azure_storage_blob"; + inherit version; + hash = "sha256-pYflTU450qJ711EJ2xZP+iBY/hlAYeVEbFqJvKkYJy8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-core cryptography isodate diff --git a/pkgs/development/python-modules/azure-storage-file-datalake/default.nix b/pkgs/development/python-modules/azure-storage-file-datalake/default.nix new file mode 100644 index 000000000000..03dcddfe569d --- /dev/null +++ b/pkgs/development/python-modules/azure-storage-file-datalake/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + azure-core, + azure-storage-blob, + isodate, + typing-extensions, +}: + +buildPythonPackage rec { + pname = "azure-storage-file-datalake"; + version = "12.17.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-python"; + rev = "refs/tags/azure-storage-file-datalake_${version}"; + hash = "sha256-FT51a7yuSMLJSnMFK9N09Rc8p/uaoYCcj9WliSvY6UA="; + }; + + sourceRoot = "${src.name}/sdk/storage/azure-storage-file-datalake"; + + build-system = [ setuptools ]; + + dependencies = [ + azure-core + azure-storage-blob + isodate + typing-extensions + ]; + + optional-dependencies = { + aio = [ azure-core ] ++ azure-core.optional-dependencies.aio; + }; + + pythonImportsCheck = [ "azure.storage.filedatalake" ]; + + # require devtools_testutils which is a internal package for azure-sdk + doCheck = false; + + meta = { + description = "Microsoft Azure File DataLake Storage Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/storage/azure-storage-file-datalake"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} 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 377b77975b84..04e4ee8bf5a8 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.18.0"; + version = "12.19.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_storage_file_share"; inherit version; - hash = "sha256-CoHa7l4TWYrM3jxzsa7Mxu39zsXpV79AFQwGIvuV3HY="; + hash = "sha256-6npBdNxsUvUKyMMPIoFZ/MNnXR+Lp3G40O/LwxB0Ang="; }; build-system = [ setuptools ]; @@ -32,7 +32,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { aio = [ azure-core ] ++ azure-core.optional-dependencies.aio; }; diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix index 86f757e0ab44..dbeb4286bbfe 100644 --- a/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { aio = [ azure-core ] ++ azure-core.optional-dependencies.aio; }; diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index 3bcca268dab3..df3a868e2e85 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "2.4.0"; + version = "2.5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "Backblaze"; repo = "b2-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-SaoQzP7vtzVWmkUTw0vCeneeSMTmBTIr5kiMXGcgm9g="; + hash = "sha256-oS037l5pQW/z4GX5+hb/mCUA219cGHE7lyiG8aos21k="; }; build-system = [ pdm-backend ]; @@ -54,7 +54,7 @@ buildPythonPackage rec { pytest-mock pytestCheckHook tqdm - ] ++ lib.optionals stdenv.isLinux [ glibcLocales ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glibcLocales ]; disabledTestPaths = [ # requires aws s3 auth @@ -71,6 +71,7 @@ buildPythonPackage rec { "test_files_headers" "test_large_file" "test_file_info_b2_attributes" + "test_sync_folder" ]; pythonImportsCheck = [ "b2sdk" ]; diff --git a/pkgs/development/python-modules/babel/default.nix b/pkgs/development/python-modules/babel/default.nix index de68774a358b..0499c1f52c94 100644 --- a/pkgs/development/python-modules/babel/default.nix +++ b/pkgs/development/python-modules/babel/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "babel"; - version = "2.15.0"; + version = "2.16.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ja8OJl0FdovGx6MUzxMh6aEjr8MozGNcGGIqLzCgRBM="; + hash = "sha256-0fNVTKJmBf4XPz3gxl91D1pC+SRJm/E03mQjWCKY4xY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/babelfont/default.nix b/pkgs/development/python-modules/babelfont/default.nix index cc64639537e1..cfaad9242396 100644 --- a/pkgs/development/python-modules/babelfont/default.nix +++ b/pkgs/development/python-modules/babelfont/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "babelfont"; - version = "3.0.5"; + version = "3.0.6"; pyproject = true; # PyPI source tarballs omit tests, fetch from Github instead @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "simoncozens"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9PEOkkm7qH4ExiJJKrTZX5Ph/urtOyFsy7jjtFepncU="; + hash = "sha256-kbL6z5610A41bfbDm0nyyh1tv+7SeXx8vvXxwLcTZL0="; }; build-system = [ diff --git a/pkgs/development/python-modules/bambi/default.nix b/pkgs/development/python-modules/bambi/default.nix index f2447b2c9d12..e85ae6b888fa 100644 --- a/pkgs/development/python-modules/bambi/default.nix +++ b/pkgs/development/python-modules/bambi/default.nix @@ -1,36 +1,36 @@ { lib, + arviz, + blackjax, buildPythonPackage, - pythonOlder, fetchFromGitHub, - setuptools, - arviz, formulae, graphviz, + numpyro, pandas, pymc, - blackjax, - numpyro, pytestCheckHook, + pythonOlder, + setuptools-scm, }: buildPythonPackage rec { pname = "bambi"; - version = "0.13.0"; + version = "0.14.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bambinos"; repo = "bambi"; rev = "refs/tags/${version}"; - hash = "sha256-9+uTyV3mQlHOKAjXohwkhTzNe/+I5XR/LuH1ZYvhc8I="; + hash = "sha256-kxrNNbZfC96/XHb1I7aUHYZdFJvGR80ZI8ell/0FQXc="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ arviz formulae graphviz @@ -38,9 +38,10 @@ buildPythonPackage rec { pymc ]; - preCheck = '' - export HOME=$(mktemp -d) - ''; + # bayeux-ml is not available in nixpkgs + # optional-dependencies = { + # jax = [ bayeux-ml ]; + # }; nativeCheckInputs = [ blackjax @@ -48,6 +49,10 @@ buildPythonPackage rec { pytestCheckHook ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + disabledTests = [ # Tests require network access "test_alias_equal_to_name" @@ -65,29 +70,38 @@ buildPythonPackage rec { "test_group_effects" "test_hdi_prob" "test_legend" + "test_model_with_group_specific_effects" + "test_model_with_intercept" + "test_model_without_intercept" "test_non_distributional_model" "test_normal_with_splines" - "test_predict_offset" - "test_predict_new_groups" "test_predict_new_groups_fail" + "test_predict_new_groups" + "test_predict_offset" "test_set_alias_warnings" "test_subplot_kwargs" "test_transforms" "test_use_hdi" - "test_with_groups" "test_with_group_and_panel" + "test_with_groups" "test_with_user_values" ]; + disabledTestPaths = [ + # bayeux-ml is not available + "tests/test_alternative_samplers.py" + # Tests require network access + "tests/test_interpret.py" + "tests/test_interpret_messages.py" + ]; + pythonImportsCheck = [ "bambi" ]; meta = with lib; { - homepage = "https://bambinos.github.io/bambi"; description = "High-level Bayesian model-building interface"; + homepage = "https://bambinos.github.io/bambi"; changelog = "https://github.com/bambinos/bambi/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; - # https://github.com/NixOS/nixpkgs/issues/310940 - broken = true; }; } diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix index 8495ccf626f7..bb91d65287bf 100644 --- a/pkgs/development/python-modules/bandit/default.nix +++ b/pkgs/development/python-modules/bandit/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "bandit"; - version = "1.7.9"; + version = "1.7.10"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-fDlaQ2dDAY974KTLsKTqm5ArbYcmTd7PjP3HO094/2E="; + hash = "sha256-We1cr12Stq2kv2W8ZDf+6kqdoQkzhERf7U1HKsxs/3s="; }; nativeBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/base2048/default.nix b/pkgs/development/python-modules/base2048/default.nix index e092fecc1c1c..9deaf973f793 100644 --- a/pkgs/development/python-modules/base2048/default.nix +++ b/pkgs/development/python-modules/base2048/default.nix @@ -39,9 +39,9 @@ buildPythonPackage rec { rustc ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - passthru.optional-dependencies = { + optional-dependencies = { fuzz = [ frelatage ]; }; diff --git a/pkgs/development/python-modules/base58/default.nix b/pkgs/development/python-modules/base58/default.nix index f3eaa3b3e858..c3a615af3e08 100644 --- a/pkgs/development/python-modules/base58/default.nix +++ b/pkgs/development/python-modules/base58/default.nix @@ -5,19 +5,23 @@ pyhamcrest, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "base58"; version = "2.1.1"; - format = "setuptools"; - disabled = pythonOlder "3.5"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - sha256 = "c5d0cb3f5b6e81e8e35da5754388ddcc6d0d14b6c6a132cb93d69ed580a7278c"; + hash = "sha256-xdDLP1tugejjXaV1Q4jdzG0NFLbGoTLLk9ae1YCnJ4w="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pyhamcrest pytestCheckHook @@ -33,9 +37,10 @@ buildPythonPackage rec { meta = with lib; { description = "Base58 and Base58Check implementation"; - mainProgram = "base58"; homepage = "https://github.com/keis/base58"; + changelog = "https://github.com/keis/base58/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ nyanloutre ]; + mainProgram = "base58"; }; } diff --git a/pkgs/development/python-modules/basemap-data-hires/default.nix b/pkgs/development/python-modules/basemap-data-hires/default.nix new file mode 100644 index 000000000000..44d352a8822a --- /dev/null +++ b/pkgs/development/python-modules/basemap-data-hires/default.nix @@ -0,0 +1,30 @@ +{ + lib, + buildPythonPackage, + setuptools, + basemap, +}: + +buildPythonPackage rec { + pname = "basemap-data-hires"; + pyproject = true; + inherit (basemap) version src; + + sourceRoot = "${src.name}/packages/basemap_data_hires"; + + build-system = [ + setuptools + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "mpl_toolkits.basemap_data" ]; + + meta = { + homepage = "https://matplotlib.org/basemap/"; + description = "High-resolution data assets for matplotlib basemap"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ moraxyc ]; + }; +} diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix index 24b86e8f224b..c5a7bcfd0a81 100644 --- a/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -1,38 +1,41 @@ { - stdenv, lib, + stdenv, buildPythonPackage, fetchFromGitHub, + + # build-system poetry-core, + + # dependencies scikit-learn, numpy, scipy, colorama, + + # tests jupyter, matplotlib, nbconvert, nbformat, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "bayesian-optimization"; - version = "1.5.1"; + version = "2.0.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "bayesian-optimization"; repo = "BayesianOptimization"; rev = "refs/tags/v${version}"; - hash = "sha256-pDgvdQhlJ5aMRGdi2qXRXVCdJRvrOP/Nr0SSZyHH1WM="; + hash = "sha256-XAO+UeHsOFAmUXqzMY/Iws1E738ZnU4Wz7E4YNIeGKY="; }; build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ scikit-learn numpy scipy @@ -49,14 +52,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "bayes_opt" ]; - meta = with lib; { - broken = stdenv.isLinux && stdenv.isAarch64; - description = '' - A Python implementation of global optimization with gaussian processes - ''; + __darwinAllowLocalNetworking = true; + + meta = { + description = "Python implementation of global optimization with gaussian processes"; homepage = "https://github.com/bayesian-optimization/BayesianOptimization"; changelog = "https://github.com/bayesian-optimization/BayesianOptimization/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ maintainers.juliendehos ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.juliendehos ]; }; } diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index f392cdfbbc7a..8794cd387c54 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.16"; + version = "1.5.18"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; rev = "refs/tags/${version}"; - hash = "sha256-SXwaZv7aki+lQvRe6S5SLF7UFvf3n9MaUFqw2Um8ENg="; + hash = "sha256-5PGEpdCMS9AerX9GZDFen7nhwPY393g1zo9Th9lUOE0="; }; build-system = [ setuptools ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { unidiff ]; - passthru.optional-dependencies = { + optional-dependencies = { word_list = [ pyahocorasick ]; gibberish = [ gibberish-detector ]; }; @@ -47,7 +47,7 @@ buildPythonPackage rec { pkgs.gitMinimal pytestCheckHook responses - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export HOME=$(mktemp -d); diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 396a9668b777..89ff93e94309 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "bcrypt"; - version = "4.1.3"; + version = "4.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-LuFd10n1lS/j8EMND/a3QILhWcUDMqFBPVG1aJzwZiM="; + hash = "sha256-z2nq9Rhf1Y8mj4BbUFzjH5ufwtZLN2ZCFk6SRFQMEiE="; }; cargoRoot = "src/_bcrypt"; @@ -36,7 +36,7 @@ buildPythonPackage rec { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-Uag1pUuis5lpnus2p5UrMLa4HP7VQLhKxR5TEMfpK0s="; + hash = "sha256-dOS9A3pTwXYkzPFFNh5emxJw7pSdDyY+mNIoHdwNdmg="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; # Remove when https://github.com/NixOS/nixpkgs/pull/190093 lands. - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/beancount-black/default.nix b/pkgs/development/python-modules/beancount-black/default.nix index c229ec89cea2..4ee5b85f0091 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.4"; + version = "1.0.5"; disabled = pythonOlder "3.9"; format = "pyproject"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beancount-black"; rev = "refs/tags/${version}"; - hash = "sha256-GrdQCxVsAzCusxxfQHF48doWG8OVrqBayCFof9RHTkE="; + hash = "sha256-vo11mlgDhyc8YFnULJ4AFrANWmGpAMNX5jJ6QaUNqk0="; }; buildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/beanhub-cli/default.nix b/pkgs/development/python-modules/beanhub-cli/default.nix index c798ada3ff0b..b6175e4cda4b 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.4.0"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beanhub-cli"; rev = "refs/tags/${version}"; - hash = "sha256-P6XypAiMHaxOzGn+R7G6o/1c+lIOV/LqUmeRaMOVLNg="; + hash = "sha256-ZPRQLdNDp/LOXmxU9H6fh9raPPiDsTiEW3j8ncgt8sY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix index f9382892a51d..0059210356b9 100644 --- a/pkgs/development/python-modules/beartype/default.nix +++ b/pkgs/development/python-modules/beartype/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - setuptools, + hatchling, pytestCheckHook, pythonOlder, typing-extensions, @@ -10,17 +10,17 @@ buildPythonPackage rec { pname = "beartype"; - version = "0.18.5"; - format = "setuptools"; + version = "0.19.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Jk3cLx2p7JT/Y5FB++M9IuEqn3WqhjuDtwRv//E4GSc="; + hash = "sha256-3kLfwbpcNxD95sMALjvSytI27U0qq+h2NFqwtCNKZXM="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ hatchling ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index 4ebcfd4128df..a0fbb4ade834 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch, chardet, hatchling, html5lib, @@ -37,6 +38,14 @@ buildPythonPackage rec { hash = "sha256-dOPRko7cBw0hdIGFxG4/szSQ8i9So63e6a7g9Pd4EFE="; }; + patches = [ + (fetchpatch { + name = "tests.patch"; + url = "https://git.launchpad.net/beautifulsoup/patch/?id=9786a62726de5a8caba10021c4d4a58c8a3e9e3f"; + hash = "sha256-FOMoJjT0RgqKjbTLN/qCuc0HjhKeenMcgwb9Fp8atAY="; + }) + ]; + nativeBuildInputs = [ hatchling sphinxHook @@ -47,14 +56,14 @@ buildPythonPackage rec { soupsieve ]; - passthru.optional-dependencies = { + optional-dependencies = { html5lib = [ html5lib ]; lxml = [ lxml ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "bs4" ]; diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index e7a9de7f1bc0..30f6c81c851d 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -60,7 +60,9 @@ buildPythonPackage rec { # timing-based test flaky on Darwin # https://github.com/NixOS/nixpkgs/pull/97737#issuecomment-691489824 - disabledTests = lib.optionals stdenv.isDarwin [ "test_step_decorator_async_run_until_complete" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + "test_step_decorator_async_run_until_complete" + ]; postCheck = '' ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' features/ diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index e75685b74768..cbfea2399312 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.40.6"; + version = "0.42.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-c0ebEulI1wY/ws6eqgkMQbprq5bzv+hJW0WDPkW/sys="; + hash = "sha256-knWCCshsFvnMXknzpzYLCqb/ADB1Vl4RH5PBbxD5WgE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix index f7d480485c69..b8a5dbb48d35 100644 --- a/pkgs/development/python-modules/bentoml/default.nix +++ b/pkgs/development/python-modules/bentoml/default.nix @@ -74,7 +74,7 @@ }: let - version = "1.3.3"; + version = "1.3.7"; aws = [ fs-s3fs ]; grpc = [ grpcio @@ -128,7 +128,7 @@ buildPythonPackage { owner = "bentoml"; repo = "BentoML"; rev = "refs/tags/v${version}"; - hash = "sha256-PjmXPSPukLJ+iCpBdUynhcWCfFqplmdsgj0LYpodE/c="; + hash = "sha256-98SVW7f/Yn+NMfS6UIicQcoatMSm4XSJzbuJ0S/p3sg="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/berkeleydb/default.nix b/pkgs/development/python-modules/berkeleydb/default.nix index bf6c93b633d3..01135c55dbbf 100644 --- a/pkgs/development/python-modules/berkeleydb/default.nix +++ b/pkgs/development/python-modules/berkeleydb/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchPypi, setuptools, @@ -19,6 +20,10 @@ buildPythonPackage rec { build-system = [ setuptools ]; + # Every test currently fails with: + # berkeleydb.db.DBRunRecoveryError: (-30973, 'BDB0087 DB_RUNRECOVERY: Fatal error, run database recovery -- BDB1546 unable to join the environment') + doCheck = !stdenv.isDarwin; + checkPhase = '' ${python.interpreter} test.py ''; diff --git a/pkgs/development/python-modules/betamax/default.nix b/pkgs/development/python-modules/betamax/default.nix index dab6fcd1d4f2..a65c4d330715 100644 --- a/pkgs/development/python-modules/betamax/default.nix +++ b/pkgs/development/python-modules/betamax/default.nix @@ -2,26 +2,46 @@ lib, buildPythonPackage, fetchPypi, + pytestCheckHook, + pythonOlder, requests, + setuptools, }: buildPythonPackage rec { pname = "betamax"; version = "0.9.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; hash = "sha256-gjFuFnm8aHnjyDMY0Ba1S3ySJf8IxEYt5IE+IgONX5Q="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "betamax" ]; - doCheck = false; + disabledTestPaths = [ + # Tests require network access + "tests/integration/test_hooks.py" + "tests/integration/test_placeholders.py" + "tests/integration/test_record_modes.py" + "tests/integration/test_unicode.py" + "tests/regression/test_gzip_compression.py" + "tests/regression/test_requests_2_11_body_matcher.py" + ]; meta = with lib; { - homepage = "https://betamax.readthedocs.org/en/latest/"; - description = "VCR imitation for requests"; + description = "A VCR imitation for requests"; + homepage = "https://betamax.readthedocs.org/"; + changelog = "https://github.com/betamaxpy/betamax/blob/${version}/HISTORY.rst"; license = licenses.asl20; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/development/python-modules/better-exceptions/default.nix b/pkgs/development/python-modules/better-exceptions/default.nix new file mode 100644 index 000000000000..622292c9bf40 --- /dev/null +++ b/pkgs/development/python-modules/better-exceptions/default.nix @@ -0,0 +1,33 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, +}: + +buildPythonPackage rec { + pname = "better-exceptions"; + version = "0.3.3"; + pyproject = true; + + src = fetchPypi { + pname = "better_exceptions"; + inherit version; + hash = "sha256-5Oa8GERNXwTm6JSxA4Hl6SHT1UQkBBgWLH21fp6zRTs="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "better_exceptions" ]; + + # As noted by @WolfangAukang, some check files need to be disabled because of various errors, same with some tests. + # After disabling and running the build, no tests are collected. + doCheck = false; + + meta = { + description = "Pretty and more helpful exceptions in Python, automatically"; + homepage = "https://github.com/qix-/better-exceptions"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.alex-nt ]; + }; +} diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix index 5f42d46b1e58..ab36e1dda562 100644 --- a/pkgs/development/python-modules/betterproto/default.nix +++ b/pkgs/development/python-modules/betterproto/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies.compiler = [ + optional-dependencies.compiler = [ black jinja2 isort @@ -54,7 +54,7 @@ buildPythonPackage rec { pytest-mock pytest7CheckHook tomlkit - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "betterproto" ]; diff --git a/pkgs/development/python-modules/beziers/default.nix b/pkgs/development/python-modules/beziers/default.nix index 2af89a69c9fd..e0fdaaca9c0a 100644 --- a/pkgs/development/python-modules/beziers/default.nix +++ b/pkgs/development/python-modules/beziers/default.nix @@ -24,7 +24,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyclipper ]; - doCheck = true; nativeCheckInputs = [ dotmap matplotlib diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index f954d7c4ab67..3162ba276cf7 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bids-validator"; - version = "1.14.6"; + version = "1.14.7.post0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "bids_validator"; inherit version; - hash = "sha256-3ytrXRqq1h00zK0ElPLtc84wgoJa2jGVTE4UwlONSFw="; + hash = "sha256-5gBaUAt1+KlhWT+2fUYIUQfa2xFvWaXDtSSqBpeUW2Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index 75e799ce44b9..8fbdd5541f78 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -1,30 +1,46 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, - pythonOlder, - poetry-core, - protobuf, + rustPlatform, pytestCheckHook, + libiconv, }: buildPythonPackage rec { pname = "biliass"; - version = "1.3.11"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + version = "2.1.0"; + pyproject = true; src = fetchFromGitHub { owner = "yutto-dev"; - repo = "biliass"; - rev = "refs/tags/v${version}"; - hash = "sha256-hBorYAqtxTZ4LElxxJOGxC2g7sBRhRKVv6HOVHZn9FA="; + repo = "yutto"; + rev = "refs/tags/biliass@${version}"; + hash = "sha256-PlZD+988KdJqYC1I1K7i+YAH1Tzr6zfXcJFR/M4mQRA="; + }; + + sourceRoot = "source/packages/biliass"; + cargoRoot = "rust"; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit + pname + version + src + ; + sourceRoot = "${sourceRoot}/${cargoRoot}"; + hash = "sha256-DMKUbJSVME5siSPybdO5bOluPn3obVq1/6822uoSsDQ="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; - propagatedBuildInputs = [ protobuf ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; doCheck = false; # test artifacts missing diff --git a/pkgs/development/python-modules/bilibili-api-python/default.nix b/pkgs/development/python-modules/bilibili-api-python/default.nix index 8adb7b664894..0d6cfd6f3bf3 100644 --- a/pkgs/development/python-modules/bilibili-api-python/default.nix +++ b/pkgs/development/python-modules/bilibili-api-python/default.nix @@ -14,7 +14,6 @@ pyyaml, qrcode, qrcode-terminal, - requests, rsa, setuptools, setuptools-scm, @@ -23,12 +22,13 @@ }: buildPythonPackage rec { pname = "bilibili-api-python"; - version = "16.2.0"; + version = "16.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-ecv9lzp2L13seBosahgnglaZP8YZCD/13nlTPP8LCs0="; + pname = "bilibili_api_python"; + inherit version; + hash = "sha256-mwhyFc3b1qA7W76gaBcAup+Wca6gQAdRwZJaZXOHqCw="; }; postPatch = '' @@ -51,7 +51,6 @@ buildPythonPackage rec { brotli httpx qrcode - requests apscheduler rsa pillow diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index ef3ecbd638d4..8958095a9cd4 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.16.3"; + version = "0.16.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-IrGOhUnWTtCI5juFFuNdWSWxeFr7s8bRNT8sUludGo0="; + hash = "sha256-1Ef+8G30LdMtmOKOPoN3Xa7yhlHLBQvwoiPHJazu3c4="; }; build-system = [ @@ -44,7 +44,7 @@ buildPythonPackage rec { pyjwt ]; - passthru.optional-dependencies = { + optional-dependencies = { china = [ pillow ]; }; @@ -57,7 +57,7 @@ buildPythonPackage rec { pytestCheckHook respx time-machine - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ # presumably regressed in pytest-asyncio 0.23.0 diff --git a/pkgs/development/python-modules/binance-connector/default.nix b/pkgs/development/python-modules/binance-connector/default.nix index 5e76268d7cf4..cec5c8b4a4ad 100644 --- a/pkgs/development/python-modules/binance-connector/default.nix +++ b/pkgs/development/python-modules/binance-connector/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "binance-connector"; - version = "3.8.1"; + version = "3.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "binance"; repo = "${pname}-python"; rev = "refs/tags/v${version}"; - hash = "sha256-VUv9n+GePixsJ2Bqy4YOJpHEVkOjEO1HkBK+jxmkZpA="; + hash = "sha256-i0dJ7UO7HZ9bWhWtWBZ5OwloRBUiZgUKRXab4sm2w/o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index 25365c67fbde..c5b8160bf7ef 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -20,19 +20,20 @@ pyqtgraph, pyqt5, pytestCheckHook, + yaffshiv, visualizationSupport ? false, }: buildPythonPackage rec { pname = "binwalk${lib.optionalString visualizationSupport "-full"}"; - version = "2.4.2"; + version = "2.4.3"; pyproject = true; src = fetchFromGitHub { owner = "OSPG"; repo = "binwalk"; rev = "refs/tags/v${version}"; - hash = "sha256-IFq/XotW3bbf3obWXRK6Nw1KQDqyFHb4tcA09Twg8SQ="; + hash = "sha256-kabibUMh5HyAJCXOyZo3QSNIVz8fER4Xivuv9E3CfEE="; }; build-system = [ setuptools ]; @@ -49,13 +50,14 @@ buildPythonPackage rec { squashfsTools xz pycrypto + yaffshiv ] ++ lib.optionals visualizationSupport [ matplotlib pyqtgraph pyqt5 ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ cramfsprogs cramfsswap sasquatch diff --git a/pkgs/development/python-modules/biopandas/default.nix b/pkgs/development/python-modules/biopandas/default.nix index fcb3bbe926d1..49808c6ee686 100644 --- a/pkgs/development/python-modules/biopandas/default.nix +++ b/pkgs/development/python-modules/biopandas/default.nix @@ -8,37 +8,20 @@ numpy, pandas, pytestCheckHook, - fetchpatch2, }: buildPythonPackage rec { pname = "biopandas"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "BioPandas"; repo = "biopandas"; rev = "refs/tags/v${version}"; - hash = "sha256-1c78baBBsDyvAWrNx5mZI/Q75wyXv0DAwAdWm3EwX/I="; + hash = "sha256-dUeGjDDz9VA1NrFLGKy0ebaa+MU4c1tHi5YYkAspLRk="; }; - 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" ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/biothings-client/default.nix b/pkgs/development/python-modules/biothings-client/default.nix new file mode 100644 index 000000000000..67334498240c --- /dev/null +++ b/pkgs/development/python-modules/biothings-client/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, + requests, +}: +buildPythonPackage rec { + pname = "biothings-client"; + version = "0.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "biothings"; + repo = "biothings_client.py"; + rev = "v${version}"; + hash = "sha256-rCpzBX2H+7R8ulnJgtVlBA45ASa4DaY5jQ1bO2+bAC8="; + }; + + build-system = [ setuptools ]; + dependencies = [ requests ]; + pythonImportsCheck = [ "biothings_client" ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ + # All other tests make network requests to exercise the API + "tests/gene.py::TestGeneClient::test_http" + "tests/test.py::TestBiothingsClient::test_generate_settings_from_url" + "tests/variant.py::TestVariantClient::test_format_hgvs" + ]; + + meta = { + changelog = "https://github.com/biothings/biothings_client.py/blob/v${version}/CHANGES.txt"; + description = "Wrapper to access Biothings.api-based backend services"; + homepage = "https://github.com/biothings/biothings_client.py"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ rayhem ]; + }; +} diff --git a/pkgs/development/python-modules/bite-parser/default.nix b/pkgs/development/python-modules/bite-parser/default.nix index 76abaebf6364..1b00a055a1f2 100644 --- a/pkgs/development/python-modules/bite-parser/default.nix +++ b/pkgs/development/python-modules/bite-parser/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, pythonOlder, - fetchPypi, + fetchFromGitHub, poetry-core, pytest-asyncio, pytestCheckHook, @@ -10,19 +10,19 @@ buildPythonPackage rec { pname = "bite-parser"; - version = "0.2.4"; + version = "0.2.5"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; - format = "pyproject"; - - src = fetchPypi { - pname = "bite_parser"; - inherit version; - hash = "sha256-Uq2FDoo5gztMRqtdkKYX0RULhjFgy+DeujC6BTZ3CZI="; + src = fetchFromGitHub { + owner = "jgosmann"; + repo = "bite-parser"; + rev = "refs/tags/v${version}"; + hash = "sha256-C508csRbjCeLgkp66TwDuxUtMITTmub5/TFv8x80HLA="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ pytest-asyncio @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = { description = "Asynchronous parser taking incremental bites out of your byte input stream"; homepage = "https://github.com/jgosmann/bite-parser"; - changelog = "https://github.com/jgosmann/bite-parser/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/jgosmann/bite-parser/blob/${src.rev}/CHANGELOG.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix index 9bfc4a89784f..90dde389144e 100644 --- a/pkgs/development/python-modules/bitsandbytes/default.nix +++ b/pkgs/development/python-modules/bitsandbytes/default.nix @@ -1,31 +1,34 @@ { lib, + torch, + symlinkJoin, buildPythonPackage, fetchFromGitHub, - python, - pythonOlder, + cmake, setuptools, - wheel, - torch, scipy, - symlinkJoin, }: let pname = "bitsandbytes"; - version = "0.43.1"; + version = "0.44.1"; + + inherit (torch) cudaPackages cudaSupport; + inherit (cudaPackages) cudaVersion; - inherit (torch) cudaCapabilities cudaPackages cudaSupport; - inherit (cudaPackages) backendStdenv cudaVersion; + cudaVersionString = lib.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor cudaVersion); # NOTE: torchvision doesn't use cudnn; torch does! # For this reason it is not included. cuda-common-redist = with cudaPackages; [ - cuda_cccl # <thrust/*> - libcublas # cublas_v2.h + (lib.getDev cuda_cccl) # <thrust/*> + (lib.getDev libcublas) # cublas_v2.h + (lib.getLib libcublas) libcurand libcusolver # cusolverDn.h - libcusparse # cusparse.h + (lib.getDev libcusparse) # cusparse.h + (lib.getLib libcusparse) # cusparse.h + (lib.getDev cuda_cudart) # cuda_runtime.h cuda_runtime_api.h ]; cuda-native-redist = symlinkJoin { @@ -33,7 +36,9 @@ let paths = with cudaPackages; [ - cuda_cudart # cuda_runtime.h cuda_runtime_api.h + (lib.getDev cuda_cudart) # cuda_runtime.h cuda_runtime_api.h + (lib.getLib cuda_cudart) + (lib.getStatic cuda_cudart) cuda_nvcc ] ++ cuda-common-redist; @@ -48,47 +53,55 @@ buildPythonPackage { inherit pname version; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "TimDettmers"; repo = "bitsandbytes"; rev = "refs/tags/${version}"; - hash = "sha256-GFbFKPdV96DXPA+PZO4h0zdBclN670fb0PGv4QPHWHU="; + hash = "sha256-yvxD5ymMK5p4Xg7Csx/90mPV3yxUC6QUuF/8BKO2p0k="; }; - postPatch = - '' - substituteInPlace Makefile --replace "/usr/bin/g++" "g++" --replace "lib64" "lib" - substituteInPlace bitsandbytes/cuda_setup/main.py \ - --replace "binary_path = package_dir / self.binary_name" \ - "binary_path = Path('$out/${python.sitePackages}/${pname}')/self.binary_name" - '' - + lib.optionalString torch.cudaSupport '' - substituteInPlace bitsandbytes/cuda_setup/main.py \ - --replace "/usr/local/cuda/lib64" "${cuda-native-redist}/lib" - ''; - - CUDA_HOME = "${cuda-native-redist}"; - - preBuild = - if torch.cudaSupport then - with torch.cudaPackages; - let - cudaVersion = lib.concatStrings (lib.splitVersion torch.cudaPackages.cudaMajorMinorVersion); - in - ''make CUDA_VERSION=${cudaVersion} cuda${cudaMajorVersion}x'' - else - ''make CUDA_VERSION=CPU cpuonly''; + # By default, which library is loaded depends on the result of `torch.cuda.is_available()`. + # When `cudaSupport` is enabled, bypass this check and load the cuda library unconditionnally. + # Indeed, in this case, only `libbitsandbytes_cuda124.so` is built. `libbitsandbytes_cpu.so` is not. + # Also, hardcode the path to the previously built library instead of relying on + # `get_cuda_bnb_library_path(cuda_specs)` which relies on `torch.cuda` too. + # + # WARNING: The cuda library is currently named `libbitsandbytes_cudaxxy` for cuda version `xx.y`. + # This upstream convention could change at some point and thus break the following patch. + postPatch = lib.optionalString cudaSupport '' + substituteInPlace bitsandbytes/cextension.py \ + --replace-fail "if cuda_specs:" "if True:" \ + --replace-fail \ + "cuda_binary_path = get_cuda_bnb_library_path(cuda_specs)" \ + "cuda_binary_path = PACKAGE_DIR / 'libbitsandbytes_cuda${cudaVersionString}.so'" + ''; nativeBuildInputs = [ + cmake + cudaPackages.cuda_nvcc + ]; + + build-system = [ setuptools - wheel - ] ++ lib.optionals torch.cudaSupport [ cuda-native-redist ]; + ]; + + buildInputs = lib.optionals cudaSupport [ cuda-redist ]; + + cmakeFlags = [ + (lib.cmakeFeature "COMPUTE_BACKEND" (if cudaSupport then "cuda" else "cpu")) + ]; + CUDA_HOME = "${cuda-native-redist}"; + NVCC_PREPEND_FLAGS = lib.optionals cudaSupport [ + "-I${cuda-native-redist}/include" + "-L${cuda-native-redist}/lib" + ]; - buildInputs = lib.optionals torch.cudaSupport [ cuda-redist ]; + preBuild = '' + make -j $NIX_BUILD_CORES + cd .. # leave /build/source/build + ''; - propagatedBuildInputs = [ + dependencies = [ scipy torch ]; @@ -97,11 +110,11 @@ buildPythonPackage { pythonImportsCheck = [ "bitsandbytes" ]; - meta = with lib; { + meta = { description = "8-bit CUDA functions for PyTorch"; homepage = "https://github.com/TimDettmers/bitsandbytes"; changelog = "https://github.com/TimDettmers/bitsandbytes/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 06b53f599e30..f0cdcf2c2ea4 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "black"; - version = "24.4.2"; + version = "24.8.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-yHK1MFfwAAhdpmoZxV1o9vjdysJkI5KtOjVYeEBvvU0="; + hash = "sha256-JQCUVCC2eEw4ue6IWvA59edHHvKEqwP6Nezd5GiM2D8="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { colorama = [ colorama ]; d = [ aiohttp ]; uvloop = [ uvloop ]; @@ -71,7 +71,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook parameterized - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ "-W" @@ -86,7 +86,7 @@ buildPythonPackage rec { # Make /build the project root for black tests to avoid excluding files. touch ../.git '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Work around https://github.com/psf/black/issues/2105 export TMPDIR="/tmp" ''; @@ -96,7 +96,7 @@ buildPythonPackage rec { # requires network access "test_gen_check_output" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # fails on darwin "test_expression_diff" # Fail on Hydra, see https://github.com/NixOS/nixpkgs/pull/130785 @@ -104,7 +104,7 @@ buildPythonPackage rec { "test_skip_magic_trailing_comma" ]; # multiple tests exceed max open files on hydra builders - doCheck = !(stdenv.isLinux && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); meta = with lib; { description = "Uncompromising Python code formatter"; diff --git a/pkgs/development/python-modules/blacken-docs/default.nix b/pkgs/development/python-modules/blacken-docs/default.nix new file mode 100644 index 000000000000..7370471c2604 --- /dev/null +++ b/pkgs/development/python-modules/blacken-docs/default.nix @@ -0,0 +1,42 @@ +{ + black, + buildPythonPackage, + fetchFromGitHub, + lib, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "blacken-docs"; + version = "1.15.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "adamchainz"; + repo = "blacken-docs"; + rev = version; + hash = "sha256-3FGuFOAHCcybPwujWlh58NWtuF5CebaKTgBWgCGpSL8="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + black + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + homepage = "https://github.com/adamchainz/blacken-docs"; + changelog = "https://github.com/adamchainz/blacken-docs/blob/${src.rev}/CHANGELOG.rst"; + description = "Run Black on Python code blocks in documentation files"; + license = licenses.mit; + maintainers = with maintainers; [ l0b0 ]; + mainProgram = "blacken-docs"; + }; +} diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix index 9f7917738665..7fd97a4c2707 100644 --- a/pkgs/development/python-modules/blackjax/default.nix +++ b/pkgs/development/python-modules/blackjax/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -24,16 +23,14 @@ buildPythonPackage rec { pname = "blackjax"; - version = "1.2.3"; + version = "1.2.4"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "blackjax-devs"; repo = "blackjax"; rev = "refs/tags/${version}"; - hash = "sha256-f1piE79TLVLtIe9/DaLhXss/ifhU719nEylyl70SVJc="; + hash = "sha256-qaQBbRAKExRHr4Uhm5/Q1Ydon6ePsjG2PWbwSdR9QZM="; }; build-system = [ setuptools-scm ]; @@ -54,7 +51,7 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/test_benchmarks.py" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # Assertion errors on numerical values "tests/mcmc/test_integrators.py" ]; @@ -64,7 +61,7 @@ buildPythonPackage rec { # too slow "test_adaptive_tempered_smc" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # Numerical test (AssertionError) # https://github.com/blackjax-devs/blackjax/issues/668 "test_chees_adaptation" diff --git a/pkgs/development/python-modules/blake3/Cargo.lock b/pkgs/development/python-modules/blake3/Cargo.lock new file mode 100644 index 000000000000..7b8ef04d66e1 --- /dev/null +++ b/pkgs/development/python-modules/blake3/Cargo.lock @@ -0,0 +1,412 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "arrayref" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "blake3" +version = "0.4.1" +dependencies = [ + "blake3 1.5.4", + "hex", + "pyo3", + "rayon", +] + +[[package]] +name = "blake3" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", + "memmap2", + "rayon-core", +] + +[[package]] +name = "cc" +version = "1.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + +[[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-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[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 = "memmap2" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[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", +] + +[[package]] +name = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[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 = "pyo3" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset", + "parking_lot", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[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-ffi" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" +dependencies = [ + "heck", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[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-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +dependencies = [ + "bitflags", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +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", + "windows_x86_64_msvc", +] + +[[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.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[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.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[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.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +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/blake3/default.nix b/pkgs/development/python-modules/blake3/default.nix new file mode 100644 index 000000000000..c59998b8fb96 --- /dev/null +++ b/pkgs/development/python-modules/blake3/default.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + libiconv, + numpy, + pytestCheckHook, + rustPlatform, +}: + +buildPythonPackage rec { + pname = "blake3"; + version = "0.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "oconnor663"; + repo = "blake3-py"; + rev = "refs/tags/${version}"; + hash = "sha256-Ju40ea8IQMOPg9BiN47BMmr/WU8HptbqqzVI+jNGpA8="; + }; + + postPatch = '' + ln -s '${./Cargo.lock}' Cargo.lock + ''; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + nativeCheckInputs = [ + pytestCheckHook + numpy + ]; + + pythonImportsCheck = [ "blake3" ]; + + meta = { + description = "Python bindings for the BLAKE3 cryptographic hash function"; + homepage = "https://github.com/oconnor663/blake3-py"; + changelog = "https://github.com/oconnor663/blake3-py/releases/tag/${version}"; + license = with lib.licenses; [ + cc0 + asl20 + ]; + maintainers = with lib.maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 00fcd0bf9125..5adbde446d95 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { webencodings ]; - passthru.optional-dependencies = { + optional-dependencies = { css = [ tinycss2 ]; }; diff --git a/pkgs/development/python-modules/bleak-esphome/default.nix b/pkgs/development/python-modules/bleak-esphome/default.nix index c313abbe8260..61ce7059aa05 100644 --- a/pkgs/development/python-modules/bleak-esphome/default.nix +++ b/pkgs/development/python-modules/bleak-esphome/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bleak-esphome"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = "bleak-esphome"; rev = "refs/tags/v${version}"; - hash = "sha256-zz7vh+UIahHtb6ZjR/eRrS9RGur2klqbgKoeJpMrH/k="; + hash = "sha256-+84ODCx2XzREhSSt5Uu0+Bj55bfU+i33qf3wFMwu3wA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index 1cc552f2aafb..f06a56eb9799 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "3.5.0"; + version = "3.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bleak-retry-connector"; rev = "refs/tags/v${version}"; - hash = "sha256-oqc997siTg43Ulrc539G3utfQvHjcBZJgQ8/CfcSduc="; + hash = "sha256-WjowXfj9kPlMmfs3aJBHIux5/w6te7zpXXqXPaz2pks="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index aef8d84b43f1..9fde15cf9d6a 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.22.2"; + version = "0.22.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "hbldh"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-O8EvF+saJ0UBZ8MESM5gIRmk2wbA4HUDADiVUtXzXrY="; + hash = "sha256-kPeKQcJETZE6+btQsmCgb37yRI2Klg0lZ1ZIrm8ODow="; }; postPatch = '' diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix new file mode 100644 index 000000000000..e3ca43c8cd22 --- /dev/null +++ b/pkgs/development/python-modules/blivet/default.nix @@ -0,0 +1,109 @@ +{ + lib, + pkgs, + python, + buildPythonPackage, + fetchFromGitHub, + pygobject3, + libblockdev, + bytesize, + pyudev, + dbus-python, + util-linux, + kmod, + libndctl, + nvme-cli, + dosfstools, + e2fsprogs, + hfsprogs, + xfsprogs, + f2fs-tools, + ntfs3g, + btrfs-progs, + reiserfsprogs, + mdadm, + lvm2, + gfs2-utils, + cryptsetup, + multipath-tools, + dracut, + stratisd, +}: + +let + libblockdevPython = (libblockdev.override { python3 = python; }).python; +in +buildPythonPackage rec { + pname = "blivet"; + version = "3.10.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "storaged-project"; + repo = "blivet"; + rev = "blivet-${version}"; + hash = "sha256-Ooc63mf03ZO7zxm8s/Tm8jSQg5LWyKnHAqbyvn1UHB8="; + }; + + postPatch = '' + find blivet -name '*.py' | while IFS= read -r i ; do + substituteInPlace "$i" \ + --replace \ + 'gi.require_version("BlockDev",' \ + 'import gi.repository + gi.require_version("GIRepository", "2.0") + from gi.repository import GIRepository + GIRepository.Repository.prepend_search_path("${libblockdev}/lib/girepository-1.0") + gi.require_version("BlockDev",' + done + ''; + + propagatedBuildInputs = [ + pygobject3 + libblockdevPython + bytesize + pyudev + dbus-python + util-linux + kmod + libndctl + nvme-cli + pkgs.systemd + dosfstools + e2fsprogs + hfsprogs + xfsprogs + f2fs-tools + ntfs3g + btrfs-progs + reiserfsprogs + mdadm + lvm2 + gfs2-utils + cryptsetup + multipath-tools + dracut + stratisd + ]; + + pythonImportsCheck = [ "blivet" ]; + + # Even unit tests require a system D-Bus. + # TODO: Write a NixOS VM test? + doCheck = false; + + # Fails with: TypeError: don't know how to make test from: + # <blivet.static_data.luks_data.LUKS_Data object at 0x7ffff4a34b90> + dontUseSetuptoolsCheck = true; + + meta = { + description = "Python module for system storage configuration"; + homepage = "https://github.com/storaged-project/blivet"; + license = [ + lib.licenses.gpl2Plus + lib.licenses.lgpl2Plus + ]; + maintainers = with lib.maintainers; [ cybershadow ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/blobfile/default.nix b/pkgs/development/python-modules/blobfile/default.nix index 3e4c1dc7da63..9208381cc9e4 100644 --- a/pkgs/development/python-modules/blobfile/default.nix +++ b/pkgs/development/python-modules/blobfile/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "blobfile"; - version = "2.1.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "christopher-hesse"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VBh1JMP+8FEqD0uXpxA5RRMFH9XIUb4FUgsPq3vZWHM="; + hash = "sha256-/v48rLvlN4lsfWKJvXRNuIO6jdsCgRcSPlJzdOfl3xk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix index 394589c86f42..9cf2ca34a2f7 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.6"; + version = "2.0.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "CravateRouge"; repo = "bloodyAD"; rev = "refs/tags/v${version}"; - hash = "sha256-o035D6GYG1Uf59tFAAMsMF9kiY3yE15EDOCkg4V4tr4="; + hash = "sha256-GpBhLFjae/RSB5qllYCaVsCCqVu9wxxqAGywShbW1/s="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix index db948e8098bc..f72a50eb26d3 100644 --- a/pkgs/development/python-modules/blosc2/default.nix +++ b/pkgs/development/python-modules/blosc2/default.nix @@ -19,6 +19,7 @@ # propagates msgpack, ndindex, + numexpr, numpy, py-cpuinfo, rich, @@ -31,21 +32,25 @@ buildPythonPackage rec { pname = "blosc2"; - version = "2.5.1"; + version = "2.7.1"; pyproject = true; src = fetchFromGitHub { owner = "Blosc"; repo = "python-blosc2"; rev = "refs/tags/v${version}"; - hash = "sha256-yBgnNJU1q+FktIkpQn74LuRP19Ta/fNC60Z8TxzlWPk="; + hash = "sha256-2aLfyd+/I8cy9OqdU4yNXY/bkf0AdXu+hZPLDdM3g5g="; }; postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "numpy>=2.0.0" "numpy" substituteInPlace requirements-runtime.txt \ --replace "pytest" "" ''; + pythonRelaxDeps = [ "numpy" ]; + nativeBuildInputs = [ cmake cython @@ -65,6 +70,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ msgpack ndindex + numexpr numpy py-cpuinfo rich diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index 4b56028b75d9..515c3f167e91 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -10,6 +10,7 @@ mac-vendor-lookup, myst-parser, poetry-core, + pytest-asyncio, pytestCheckHook, pythonOlder, sphinx-rtd-theme, @@ -20,7 +21,7 @@ buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.19.4"; + version = "0.20.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +30,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bluetooth-adapters"; rev = "refs/tags/v${version}"; - hash = "sha256-XpPC7FVWzdEki6kdZDu0vV7iD1DZzGbI1f9VKxsjKUQ="; + hash = "sha256-dQjoaBK+WMHQss/7nQRRCE8Jv4S0iq6awa/t3SMGUiE="; }; postPatch = '' @@ -60,9 +61,12 @@ buildPythonPackage rec { usb-devices ]; - pythonImportsCheck = [ "bluetooth_adapters" ]; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; - nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "bluetooth_adapters" ]; meta = with lib; { description = "Tools to enumerate and find Bluetooth Adapters"; diff --git a/pkgs/development/python-modules/boiboite-opener-framework/default.nix b/pkgs/development/python-modules/boiboite-opener-framework/default.nix index 9be58802c5e3..79442baf25b4 100644 --- a/pkgs/development/python-modules/boiboite-opener-framework/default.nix +++ b/pkgs/development/python-modules/boiboite-opener-framework/default.nix @@ -34,7 +34,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "bof" ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # Race condition, https://github.com/secdev/scapy/pull/4558 + # pythonImportsCheck = [ "bof" ]; disabledTests = [ # Tests are using netcat and cat to do UDP connections diff --git a/pkgs/development/python-modules/bokeh-sampledata/default.nix b/pkgs/development/python-modules/bokeh-sampledata/default.nix new file mode 100644 index 000000000000..e4bba2b69f1c --- /dev/null +++ b/pkgs/development/python-modules/bokeh-sampledata/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + # build-system + setuptools, + setuptools-git-versioning, + + # dependencies + icalendar, + pandas, +}: + +buildPythonPackage rec { + pname = "bokeh-sampledata"; + version = "2024.2"; + pyproject = true; + + src = fetchPypi { + pname = "bokeh_sampledata"; + inherit version; + hash = "sha256-5j2qluedVj7IuE8gZy/+lPkFshRV+rjYPuM05G2jNiQ="; + }; + + build-system = [ + setuptools + setuptools-git-versioning + ]; + + dependencies = [ + icalendar + pandas + ]; + + pythonImportsCheck = [ + "bokeh_sampledata" + ]; + + meta = { + description = "Sample datasets for Bokeh examples"; + homepage = "https://pypi.org/project/bokeh-sampledata"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 62c537e8de7a..f53d8396c6e0 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -46,14 +46,14 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "3.5.2"; + version = "3.6.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-A6VKZ9tne4iBg0JxxiCngbODrlk69cPqIUkWR1REDQc="; + hash = "sha256-ADLcHnatCXsHYm5RWEaF/0jGVIH7qq0QVmOxBGFlhno="; }; src_test = fetchFromGitHub { diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index a9a437af05ff..6ca2997257c9 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "boltztrap2"; - version = "24.1.1"; + version = "24.9.4"; pyproject = true; build-system = [ setuptools ]; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "BoltzTraP2"; inherit version; - hash = "sha256-kgv4lPBxcBmRKihaTwPRz8bHTWAWUOGZADtJUb3y+C4="; + hash = "sha256-BfGR7sY0E9r+RXA1fC9uy1GXC+EFV1RKOvMyvGcf+aE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bonsai/default.nix b/pkgs/development/python-modules/bonsai/default.nix index 0f2c5f180f05..ad14127686ce 100644 --- a/pkgs/development/python-modules/bonsai/default.nix +++ b/pkgs/development/python-modules/bonsai/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { openldap ]; - passthru.optional-dependencies = { + optional-dependencies = { gevent = [ gevent ]; tornado = [ tornado ]; trio = [ trio ]; diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index de4224d13ee7..83f534e71345 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -3,31 +3,46 @@ fetchPypi, buildPythonPackage, pythonOlder, + cmake, + pybind11, + nanobind, + ninja, + setuptools-scm, boost, numpy, pytestCheckHook, pytest-benchmark, - setuptools-scm, + scikit-build-core, }: buildPythonPackage rec { pname = "boost-histogram"; - version = "1.4.1"; - format = "setuptools"; + version = "1.5.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "boost_histogram"; inherit version; - hash = "sha256-lxRvc19GfVBpdqBH8/I3zlmECpUv0jH19DH4l/sAbN0="; + hash = "sha256-BiPwEObFLl0Bh2dyOVloYJDbB/ww8NHYR1tdZjxd2yw="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ cmake ]; + + dontUseCmakeConfigure = true; + + build-system = [ + pybind11 + nanobind + ninja + scikit-build-core + setuptools-scm + ]; buildInputs = [ boost ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/bootstrap/flit-core/default.nix b/pkgs/development/python-modules/bootstrap/flit-core/default.nix index bdd4a0f535ff..01e9e43f3acd 100644 --- a/pkgs/development/python-modules/bootstrap/flit-core/default.nix +++ b/pkgs/development/python-modules/bootstrap/flit-core/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta ; - sourceRoot = "${src.name}/flit_core"; + postPatch = "cd flit_core"; buildPhase = '' runHook preBuild diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index ba4c5d9e9e20..36585fcf29c7 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.91"; + version = "0.2.95"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = "boschshcpy"; rev = "refs/tags/${version}"; - hash = "sha256-lQDYJrla2iDk1MbLHjBGP3ZcZ1djD3bWhz15RaBFMgg="; + hash = "sha256-5kPC6UxqysJEHNWDoXhg7oo/hQSKICuqWmOdjlljoLs="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index d5c4c1f37efc..d9c249fef4ad 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.160"; + version = "1.35.29"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-xrHf6zyuZz7tWW8BQJM54uC5VaUkGhbO5p8pMD2bN94="; + hash = "sha256-bl8IL3zQKL3zv8V8nbO3hOD27CIysQSChZqRnWzWv8k="; }; build-system = [ setuptools ]; @@ -378,7 +378,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { accessanalyzer = [ mypy-boto3-accessanalyzer ]; account = [ mypy-boto3-account ]; acm = [ mypy-boto3-acm ]; diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index f6998d6400a2..5f57bbc0042e 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -1,14 +1,19 @@ { lib, - botocore, buildPythonPackage, fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + botocore, jmespath, + s3transfer, + + # tests pytest-xdist, pytestCheckHook, - pythonOlder, - s3transfer, - setuptools, }: buildPythonPackage rec { @@ -16,22 +21,18 @@ buildPythonPackage rec { inherit (botocore) version; # N.B: botocore, boto3, awscli needs to be updated in lockstep, bump botocore version for updating these. pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "boto"; repo = "boto3"; rev = "refs/tags/${version}"; - hash = "sha256-fiUguOzNF9T3CcGD1mYl2b5QFbvBG8wNOd3Or2NR66E="; + hash = "sha256-b08tC8EA6iW0O/7rseD9pTkKh/cJ2fe3xJZkEqxS6VI="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; pythonRelaxDeps = [ "s3transfer" ]; - propagatedBuildInputs = [ + dependencies = [ botocore jmespath s3transfer @@ -49,20 +50,20 @@ buildPythonPackage rec { "tests/integration" ]; - passthru.optional-dependencies = { + optional-dependencies = { crt = [ botocore.optional-dependencies.crt ]; }; - meta = with lib; { + meta = { description = "AWS SDK for Python"; homepage = "https://github.com/boto/boto3"; changelog = "https://github.com/boto/boto3/blob/${version}/CHANGELOG.rst"; - license = licenses.asl20; + license = lib.licenses.asl20; longDescription = '' Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for Python, which allows Python developers to write software that makes use of services like Amazon S3 and Amazon EC2. ''; - maintainers = with maintainers; [ anthonyroussel ]; + maintainers = with lib.maintainers; [ anthonyroussel ]; }; } diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 980ab4873062..119c5345ef93 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - poetry-core, + setuptools, pythonOlder, types-awscrt, typing-extensions, @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.160"; + version = "1.35.29"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,10 +18,10 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-kAlT8/km0gVQV3ZTX9ExBH74lRlzTx5TZdA+y67FPNk="; + hash = "sha256-QNTPX8Un+604G+GM+DdADW8WiogOJu55TIwE+go+YsU="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ types-awscrt diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 68a1ae7c68dc..501ca538b4e8 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -3,34 +3,35 @@ awscrt, buildPythonPackage, fetchPypi, + + # build-system + setuptools, + + # dependencies jmespath, - jsonschema, - pytestCheckHook, python-dateutil, - pythonOlder, - setuptools, urllib3, + + # tests + jsonschema, + pytestCheckHook, }: buildPythonPackage rec { pname = "botocore"; - version = "1.34.131"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.35.30"; # N.B: if you change this, change boto3 and awscli to a matching version pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { inherit pname version; - hash = "sha256-UC3a/h1if88eTAB8hkVOXdAR26fFi9jopTaKefPjh9w="; + hash = "sha256-q1NQ6KUOSNNx+i1RfWXCmkDEN4jLmhU4f5PqxaI98P0="; }; pythonRelaxDeps = [ "urllib3" ]; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ jmespath python-dateutil urllib3 @@ -51,15 +52,15 @@ buildPythonPackage rec { pythonImportsCheck = [ "botocore" ]; - passthru.optional-dependencies = { + optional-dependencies = { crt = [ awscrt ]; }; - meta = with lib; { + meta = { description = "Low-level interface to a growing number of Amazon Web Services"; homepage = "https://github.com/boto/botocore"; changelog = "https://github.com/boto/botocore/blob/${version}/CHANGELOG.rst"; - license = licenses.asl20; - maintainers = with maintainers; [ anthonyroussel ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ anthonyroussel ]; }; } diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix index 7a860437c1b8..9970378d3741 100644 --- a/pkgs/development/python-modules/botorch/default.nix +++ b/pkgs/development/python-modules/botorch/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "botorch"; - version = "0.11.3"; + version = "0.12.0"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "botorch"; rev = "refs/tags/v${version}"; - hash = "sha256-AtRU5KC8KlkxMCU0OUAHDFK7BsPO3TbRmmzDGV7+yVk="; + hash = "sha256-CKlerCUadObpPq4jQAiFDBOZMHZ4QccAKQz30OFe64E="; }; build-system = [ @@ -58,6 +58,11 @@ buildPythonPackage rec { ++ lib.optionals (stdenv.buildPlatform.system == "x86_64-linux") [ # stuck tests on hydra "test_moo_predictive_entropy_search" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.isAarch64) [ + # Numerical error slightly above threshold + # AssertionError: Tensor-likes are not close! + "test_model_list_gpytorch_model" ]; pythonImportsCheck = [ "botorch" ]; @@ -65,11 +70,11 @@ buildPythonPackage rec { # needs lots of undisturbed CPU time or prone to getting stuck requiredSystemFeatures = [ "big-parallel" ]; - meta = with lib; { + meta = { changelog = "https://github.com/pytorch/botorch/blob/${src.rev}/CHANGELOG.md"; description = "Bayesian Optimization in PyTorch"; homepage = "https://botorch.org"; - license = licenses.mit; - maintainers = with maintainers; [ veprbl ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index 2b7bff14c007..d1d69f252daa 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "bottle"; - version = "0.12.25"; + version = "0.13.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-4anJSXCubXELP7RSYpTf64byy0qB7/OkuY3ED7Dl4CE="; + hash = "sha256-pIhS3HoFE1PT5N491VkM0l3jcLz9lKciN1YeMUzrDIg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/bpycv/default.nix b/pkgs/development/python-modules/bpycv/default.nix index 97fd086b1f5c..923c4d0ced49 100644 --- a/pkgs/development/python-modules/bpycv/default.nix +++ b/pkgs/development/python-modules/bpycv/default.nix @@ -8,7 +8,7 @@ fetchFromGitHub, fetchPypi, minexr, - opencv4, + opencv-python, requests, runCommand, zcs, @@ -29,14 +29,10 @@ buildPythonPackage rec { minexr zcs requests - opencv4 + opencv-python boxx ]; - postPatch = '' - sed -i 's/opencv-python//g' requirements.txt - ''; - # pythonImportsCheck = [ "bpycv" ]; # this import depends on bpy that is only available inside blender doCheck = false; @@ -61,7 +57,7 @@ buildPythonPackage rec { homepage = "https://github.com/DIYer22/bpycv"; license = licenses.mit; maintainers = [ maintainers.lucasew ]; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; inherit (blender.meta) platforms; }; } diff --git a/pkgs/development/python-modules/bracex/default.nix b/pkgs/development/python-modules/bracex/default.nix index 8149d1ad60f3..2e3e847cfadd 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.5"; + version = "2.5.post1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ByXaUEXo036pWSqzYU2LVh4iw8X945ZGmb5nLgcqthE="; + hash = "sha256-EsUJUkFb+nc9LZzLjnllG4zbHzGkL2CRuAT2uitKZrY="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 4564364bfe5e..27fef0c6a5b9 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -46,6 +46,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # tests fail with sphinx 7.4.x + "tests/test_renderer.py" + ]; + pythonImportsCheck = [ "breathe" ]; meta = { diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index de779d7f3e4c..759af9e47b87 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { setuptools-rust ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; propagatedBuildInputs = [ @@ -71,9 +71,15 @@ buildPythonPackage rec { tzlocal urllib3 ] - ++ passthru.optional-dependencies.launchpad - ++ passthru.optional-dependencies.fastimport - ++ passthru.optional-dependencies.github; + ++ optional-dependencies.launchpad + ++ optional-dependencies.fastimport + ++ optional-dependencies.github; + + optional-dependencies = { + launchpad = [ launchpadlib ]; + fastimport = [ fastimport ]; + github = [ pygithub ]; + }; nativeCheckInputs = [ testtools ]; @@ -107,11 +113,6 @@ buildPythonPackage rec { package = breezy; command = "HOME=$TMPDIR brz --version"; }; - optional-dependencies = { - launchpad = [ launchpadlib ]; - fastimport = [ fastimport ]; - github = [ pygithub ]; - }; }; meta = with lib; { diff --git a/pkgs/development/python-modules/brian2/default.nix b/pkgs/development/python-modules/brian2/default.nix index c6a31766078b..a0021585cfc5 100644 --- a/pkgs/development/python-modules/brian2/default.nix +++ b/pkgs/development/python-modules/brian2/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "brian2"; - version = "2.7.0"; + version = "2.7.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-d9GDWp8CGIjeprWf4TtchVd36gmo36HBRkBOLaRXbpo="; + hash = "sha256-mp1xo6ooYm21s6FYcegQdsHmVgH81usV9IfIM0GM7lc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bring-api/default.nix b/pkgs/development/python-modules/bring-api/default.nix index 596b17315114..feb21946c0ec 100644 --- a/pkgs/development/python-modules/bring-api/default.nix +++ b/pkgs/development/python-modules/bring-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bring-api"; - version = "0.8.1"; + version = "0.9.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "miaucl"; repo = "bring-api"; rev = "refs/tags/${version}"; - hash = "sha256-w7DV+Idcg7OobFx+ECimngQKk0SCzd5F+DTg+WcnJwA="; + hash = "sha256-wPplw1yYJ5xR2CzhDXXjhMFJ7swGf2AARI4a1kE8MRw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index e6b79fb3bcdd..84ad97686b48 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "brother"; - version = "4.3.0"; + version = "4.3.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = "brother"; rev = "refs/tags/${version}"; - hash = "sha256-JnIJgR8OiN6y6ib0Y+FXa98Q/4dtvJ8q2r6tgQSRvN4="; + hash = "sha256-fWa5FNBGV8tnJ3CozMicXLGsDvnTjNzU8PdV266MeeQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/brotlipy/default.nix b/pkgs/development/python-modules/brotlipy/default.nix index c72021871784..0c8a0ba0e166 100644 --- a/pkgs/development/python-modules/brotlipy/default.nix +++ b/pkgs/development/python-modules/brotlipy/default.nix @@ -1,47 +1,51 @@ { lib, buildPythonPackage, - fetchPypi, cffi, - enum34, construct, - pytest, + fetchPypi, hypothesis, + pytest, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "brotlipy"; version = "0.7.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "36def0b859beaf21910157b4c33eb3b06d8ce459c942102f16988cca6ea164df"; + hash = "sha256-Nt7wuFm+ryGRAVe0wz6zsG2M5FnJQhAvFpiMym6hZN8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + propagatedNativeBuildInputs = [ cffi ]; + + dependencies = [ cffi - enum34 construct ]; - propagatedNativeBuildInputs = [ cffi ]; - nativeCheckInputs = [ - pytest hypothesis + pytestCheckHook ]; - checkPhase = '' - py.test - ''; - # Missing test files doCheck = false; + pythonImportsCheck = [ "brotli" ]; + meta = { description = "Python bindings for the reference Brotli encoder/decoder"; homepage = "https://github.com/python-hyper/brotlipy/"; license = lib.licenses.mit; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/bsdiff4/default.nix b/pkgs/development/python-modules/bsdiff4/default.nix index 1ad855c1a11a..5d3bf14d7506 100644 --- a/pkgs/development/python-modules/bsdiff4/default.nix +++ b/pkgs/development/python-modules/bsdiff4/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bsdiff4"; - version = "1.2.4"; + version = "1.2.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HXEpqBIYYHMejM4pAdMYPhSuxwJE9k6PdFYyddw4gGc="; + hash = "sha256-zdg/gg7Ljx72ek5fCxUsYdMnyver81qpp2NBORWyE2g="; }; pythonImportsCheck = [ "bsdiff4" ]; diff --git a/pkgs/development/python-modules/btchip-python/default.nix b/pkgs/development/python-modules/btchip-python/default.nix index 66c22bafac3e..a15708b79394 100644 --- a/pkgs/development/python-modules/btchip-python/default.nix +++ b/pkgs/development/python-modules/btchip-python/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ecdsa ]; - passthru.optional-dependencies.smartcard = [ pyscard ]; + optional-dependencies.smartcard = [ pyscard ]; # tests requires hardware doCheck = false; diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index e6d92d31f3e5..2ba7e1e848d4 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -12,15 +12,14 @@ buildPythonPackage rec { pname = "btrees"; - version = "6.0"; + version = "6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "BTrees"; - inherit version; - hash = "sha256-9puM3TNDThPhgCFruCrgt80x+t+3zFWWlcs3MZyjX/A="; + inherit pname version; + hash = "sha256-4YdG+GQYaaIPRTKMm1+X3GxxoRlZYDVq72O3X1yNRF8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index bfb6f582dd3a..cb883efaa2f3 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -5,24 +5,27 @@ fetchPypi, flask, pythonOlder, + setuptools, webob, }: buildPythonPackage rec { pname = "bugsnag"; version = "4.7.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; hash = "sha256-mECP4X1KfzAKVlNUB6ZEi5hE2bUoxEUnkIho/DZG6HM="; }; - propagatedBuildInputs = [ webob ]; + build-system = [ setuptools ]; - passthru.optional-dependencies = { + dependencies = [ webob ]; + + optional-dependencies = { flask = [ blinker flask diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix index ada42fb4b4e3..6510ce721f6c 100644 --- a/pkgs/development/python-modules/bugwarrior/default.nix +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -7,7 +7,7 @@ twiggy, requests, offtrac, - bugzilla, + python-bugzilla, taskw, python-dateutil, pytz, @@ -39,7 +39,7 @@ buildPythonPackage rec { twiggy requests offtrac - bugzilla + python-bugzilla taskw python-dateutil pytz diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix deleted file mode 100644 index 3125ed30624f..000000000000 --- a/pkgs/development/python-modules/bugzilla/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - requests, - pytestCheckHook, - glibcLocalesUtf8, -}: - -buildPythonPackage rec { - pname = "bugzilla"; - version = "3.2.0"; - format = "setuptools"; - - src = fetchPypi { - pname = "python-${pname}"; - inherit version; - sha256 = "TvyM+il4N8nk6rIg4ZcXZxW9Ye4zzsLBsPJ5DweGA4c="; - }; - - propagatedBuildInputs = [ requests ]; - - nativeCheckInputs = [ - pytestCheckHook - glibcLocalesUtf8 - ]; - - preCheck = '' - mkdir -p check-phase - export HOME=$(pwd)/check-phase - ''; - - meta = with lib; { - homepage = "https://github.com/python-bugzilla/python-bugzilla"; - description = "Bugzilla XMLRPC access module"; - mainProgram = "bugzilla"; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = with maintainers; [ pierron ]; - }; -} diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index b3a8c905bc8b..75b9e2a4703e 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -15,12 +15,13 @@ pythonOlder, setuptools, tomli, + virtualenv, wheel, }: buildPythonPackage rec { pname = "build"; - version = "1.2.1"; + version = "1.2.2.post1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +30,7 @@ buildPythonPackage rec { owner = "pypa"; repo = "build"; rev = "refs/tags/${version}"; - hash = "sha256-G0g+1v19sQMUuQlZKGELZOwwX07i7TIdEdaYzr8bKtI="; + hash = "sha256-PHS7CjdKo5u4VTpbo409zLQAOmslV9bX0j0S83Gdv1U="; }; postPatch = '' @@ -65,6 +66,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook setuptools + virtualenv wheel ]; @@ -85,8 +87,11 @@ buildPythonPackage rec { "test_init" "test_output" "test_wheel_metadata" + # Tests require network access to run pip install + "test_verbose_output" + "test_requirement_installation" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Expects Apple's Python and its quirks "test_can_get_venv_paths_with_conflicting_default_scheme" ]; diff --git a/pkgs/development/python-modules/bx-py-utils/default.nix b/pkgs/development/python-modules/bx-py-utils/default.nix index ccb98329a3b4..757b2d7e9f21 100644 --- a/pkgs/development/python-modules/bx-py-utils/default.nix +++ b/pkgs/development/python-modules/bx-py-utils/default.nix @@ -74,7 +74,7 @@ buildPythonPackage rec { disabledTestPaths = [ "bx_py_utils_tests/tests/test_project_setup.py" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # processify() doesn't work under darwin # https://github.com/boxine/bx_py_utils/issues/80 "bx_py_utils_tests/tests/test_processify.py" diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix index 869440098f1d..4267e09fd538 100644 --- a/pkgs/development/python-modules/bx-python/default.nix +++ b/pkgs/development/python-modules/bx-python/default.nix @@ -3,6 +3,7 @@ fetchFromGitHub, buildPythonPackage, numpy, + pyparsing, cython, zlib, python-lzo, @@ -13,14 +14,14 @@ buildPythonPackage rec { pname = "bx-python"; - version = "0.12.0"; + version = "0.13.0"; pyproject = true; src = fetchFromGitHub { owner = "bxlab"; repo = "bx-python"; rev = "refs/tags/v${version}"; - hash = "sha256-ZpZjh7OXdUY7rd692h7VYHzC3qCrDKFme6r+wuG7GP4="; + hash = "sha256-I5yc8i9xoievaZbgwHSQQSVvs1VnNa66Q883T4dCYYw="; }; postPatch = '' @@ -37,7 +38,10 @@ buildPythonPackage rec { buildInputs = [ zlib ]; - dependencies = [ numpy ]; + dependencies = [ + numpy + pyparsing + ]; nativeCheckInputs = [ python-lzo diff --git a/pkgs/development/python-modules/bytecode/default.nix b/pkgs/development/python-modules/bytecode/default.nix index 7c7a86baca43..80fbbd0ced30 100644 --- a/pkgs/development/python-modules/bytecode/default.nix +++ b/pkgs/development/python-modules/bytecode/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "bytecode"; - version = "0.15.1"; + version = "0.16.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "vstinner"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Jzsh0m00SiJjTP7hXMDmuR4XHmsCYdURuFDkVopGyIE="; + hash = "sha256-Nj/GKZC+zZt1M4Qd7CMXQCLwTIu64aidasH4PwBLtzw="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/bytewax/default.nix b/pkgs/development/python-modules/bytewax/default.nix index 22d022c454be..d7fe5f9a00ec 100644 --- a/pkgs/development/python-modules/bytewax/default.nix +++ b/pkgs/development/python-modules/bytewax/default.nix @@ -74,7 +74,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jsonpickle ]; - passthru.optional-dependencies = { + optional-dependencies = { kafka = [ confluent-kafka ]; }; @@ -85,7 +85,7 @@ buildPythonPackage rec { checkInputs = [ myst-docutils pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ # dependens on an old myst-docutils version @@ -104,6 +104,6 @@ buildPythonPackage rec { kfollesdal ]; # mismatched type expected u8, found i8 - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index fe81e6742449..1f749cfb3132 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { filecache = [ filelock ]; redis = [ redis ]; }; @@ -46,7 +46,7 @@ buildPythonPackage rec { mock pytestCheckHook requests - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "cachecontrol" ]; diff --git a/pkgs/development/python-modules/cached-ipaddress/default.nix b/pkgs/development/python-modules/cached-ipaddress/default.nix index d36b620710bf..b00a6b5df4ef 100644 --- a/pkgs/development/python-modules/cached-ipaddress/default.nix +++ b/pkgs/development/python-modules/cached-ipaddress/default.nix @@ -8,11 +8,12 @@ pytestCheckHook, pythonOlder, setuptools, + propcache, }: buildPythonPackage rec { pname = "cached-ipaddress"; - version = "0.5.0"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "cached-ipaddress"; rev = "refs/tags/v${version}"; - hash = "sha256-Ec2tW1X0iYdQFd5XFRABwUTPjqxV5lhwT6UEimmF+/o="; + hash = "sha256-VD5z9lKECglx77VYDUeI4iD6mbncSutSlavxY+f3OVo="; }; build-system = [ @@ -30,6 +31,8 @@ buildPythonPackage rec { setuptools ]; + dependencies = [ propcache ]; + nativeCheckInputs = [ pytest-cov-stub pytestCheckHook diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index c5098463552f..55a083807c79 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -3,29 +3,25 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - - # build-system setuptools, - - # tests pytestCheckHook, }: buildPythonPackage rec { pname = "cachetools"; - version = "5.3.2"; + version = "5.5.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tkem"; - repo = pname; + repo = "cachetools"; rev = "refs/tags/v${version}"; - hash = "sha256-CmyAW9uV63OV/zZsWwZkXOWbHfHAJdYFGJsRhpqQ1f4="; + hash = "sha256-WG9PiUMVGaEXXHKbtOFEGjLiSbNnpSI2fXCogpGj1PI="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -35,7 +31,7 @@ buildPythonPackage rec { description = "Extensible memoizing collections and decorators"; homepage = "https://github.com/tkem/cachetools"; changelog = "https://github.com/tkem/cachetools/blob/v${version}/CHANGELOG.rst"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/cachier/default.nix b/pkgs/development/python-modules/cachier/default.nix index 93a0def9973c..e040c536c54e 100644 --- a/pkgs/development/python-modules/cachier/default.nix +++ b/pkgs/development/python-modules/cachier/default.nix @@ -4,6 +4,7 @@ pythonOlder, fetchFromGitHub, setuptools, + click, watchdog, portalocker, pytestCheckHook, @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "cachier"; - version = "3.0.1"; + version = "3.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "python-cachier"; repo = "cachier"; rev = "refs/tags/v${version}"; - hash = "sha256-VApP1DRs+mjx+SELpdDOm2Sa7zBYHDqD/htFF/eNLu0="; + hash = "sha256-siighT6hMicN+F/LIXfUAPQ2kkRiyk7CtjqmyC/qCFg="; }; pythonRemoveDeps = [ "setuptools" ]; @@ -38,6 +39,8 @@ buildPythonPackage rec { dependencies = [ watchdog portalocker + # not listed as dep, but needed to run main script entrypoint + click ]; nativeCheckInputs = [ @@ -63,6 +66,10 @@ buildPythonPackage rec { # don't test formatting "test_flake8" + + # timing sensitive + "test_being_calc_next_time" + "test_pickle_being_calculated" ]; preBuild = '' @@ -73,6 +80,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/python-cachier/cachier"; + changelog = "https://github.com/python-cachier/cachier/releases/tag/v${version}"; description = "Persistent, stale-free, local and cross-machine caching for functions"; mainProgram = "cachier"; maintainers = with lib.maintainers; [ pbsds ]; diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index a2f64cb79c99..0d81670d4493 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -50,12 +50,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "cairosvg" ]; - meta = with lib; { + meta = { homepage = "https://cairosvg.org"; changelog = "https://github.com/Kozea/CairoSVG/releases/tag/${version}"; - license = licenses.lgpl3Plus; + license = lib.licenses.lgpl3Plus; description = "SVG converter based on Cairo"; mainProgram = "cairosvg"; - maintainers = [ ]; + maintainers = [ lib.maintainers.sarahec ]; }; } diff --git a/pkgs/development/python-modules/camel-converter/default.nix b/pkgs/development/python-modules/camel-converter/default.nix index 80bd4e14db8b..aeaccaee7e21 100644 --- a/pkgs/development/python-modules/camel-converter/default.nix +++ b/pkgs/development/python-modules/camel-converter/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - poetry-core, + hatchling, pydantic, pytestCheckHook, pytest-cov-stub, @@ -11,28 +11,28 @@ buildPythonPackage rec { pname = "camel-converter"; - version = "3.1.2"; + version = "4.0.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "sanders41"; repo = "camel-converter"; rev = "refs/tags/v${version}"; - hash = "sha256-CJbflRI3wfUmPoVuLwZDYcobESmySvnS99PdpSDhDLk="; + hash = "sha256-cHrMaf5PyFWacoi4t+Clow9qFAxbdn71p8ckuYMt27w="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; - passthru.optional-dependencies = { + optional-dependencies = { pydantic = [ pydantic ]; }; nativeCheckInputs = [ pytestCheckHook pytest-cov-stub - ] ++ passthru.optional-dependencies.pydantic; + ] ++ optional-dependencies.pydantic; pythonImportsCheck = [ "camel_converter" ]; @@ -42,10 +42,10 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Client for the Meilisearch API"; + description = "Module to convert strings from snake case to camel case or camel case to snake case"; homepage = "https://github.com/sanders41/camel-converter"; changelog = "https://github.com/sanders41/camel-converter/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/can-isotp/default.nix b/pkgs/development/python-modules/can-isotp/default.nix new file mode 100644 index 000000000000..90dba000d395 --- /dev/null +++ b/pkgs/development/python-modules/can-isotp/default.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "can-isotp"; + version = "2.0.6"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pylessard"; + repo = "python-can-isotp"; + rev = "refs/tags/v${version}"; + hash = "sha256-wfZMVfLBdYkFbb0DiDWmGaraykJ/QL64Zkl2/nBu4lY="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ + # we don't support socket tests + "test/test_can_stack.py" + "test/test_layer_vs_socket.py" + "test/test_socket.py" + + # behaves inconsistently due to timing + "test/test_transport_layer.py" + "test/test_helper_classes.py" + ]; + + pythonImportsCheck = [ "isotp" ]; + + meta = with lib; { + description = "Python package that provides support for ISO-TP (ISO-15765) protocol"; + homepage = "https://github.com/pylessard/python-can-isotp"; + changelog = "https://github.com/pylessard/python-can-isotp/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ + jacobkoziej + ]; + }; +} diff --git a/pkgs/development/python-modules/canals/default.nix b/pkgs/development/python-modules/canals/default.nix index 938a6279e002..a57300a77b84 100644 --- a/pkgs/development/python-modules/canals/default.nix +++ b/pkgs/development/python-modules/canals/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { docs = [ mkdocs-material mkdocs-mermaid2-plugin @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ # Test requires internet connection to mermaid.ink diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix index 634eec1da39d..42f9c1757a93 100644 --- a/pkgs/development/python-modules/canmatrix/default.nix +++ b/pkgs/development/python-modules/canmatrix/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { six ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { arxml = [ lxml ]; fibex = [ lxml ]; kcd = [ lxml ]; @@ -65,7 +65,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pytestFlagsArray = [ # long_envvar_name_imports requires stable key value pair ordering diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix index a2a65df02e91..2fa525773a63 100644 --- a/pkgs/development/python-modules/cantools/default.nix +++ b/pkgs/development/python-modules/cantools/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "cantools"; - version = "39.4.5"; + version = "39.4.8"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-WU8q6A3q24xrCOjhMi1C4lj0DULIDWiG2E4BQ/kLWiM="; + hash = "sha256-kzgDr+l96R2ScFOwJ+KhZeTOiRq/jkLWtAmnt9/vqA0="; }; nativeBuildInputs = [ @@ -42,12 +42,12 @@ buildPythonPackage rec { textparser ]; - passthru.optional-dependencies.plot = [ matplotlib ]; + optional-dependencies.plot = [ matplotlib ]; nativeCheckInputs = [ parameterized pytestCheckHook - ] ++ passthru.optional-dependencies.plot; + ] ++ optional-dependencies.plot; pythonImportsCheck = [ "cantools" ]; diff --git a/pkgs/development/python-modules/capstone/4.nix b/pkgs/development/python-modules/capstone/4.nix index 66b57a01bcb2..b7c31d336091 100644 --- a/pkgs/development/python-modules/capstone/4.nix +++ b/pkgs/development/python-modules/capstone/4.nix @@ -30,7 +30,7 @@ buildPythonPackage { # aarch64 only available from MacOS SDK 11 onwards, so fix the version tag. # otherwise, bdist_wheel may detect "macosx_10_6_arm64" which doesn't make sense. - setupPyBuildFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + setupPyBuildFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "--plat-name" "macosx_11_0" ]; diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index 74035c9bef30..e869c9567d63 100644 --- a/pkgs/development/python-modules/capstone/default.nix +++ b/pkgs/development/python-modules/capstone/default.nix @@ -4,7 +4,6 @@ capstone, stdenv, setuptools, - fetchpatch, }: buildPythonPackage rec { @@ -13,15 +12,6 @@ buildPythonPackage rec { 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. @@ -33,7 +23,7 @@ buildPythonPackage rec { # aarch64 only available from MacOS SDK 11 onwards, so fix the version tag. # otherwise, bdist_wheel may detect "macosx_10_6_arm64" which doesn't make sense. - setupPyBuildFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + setupPyBuildFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "--plat-name" "macosx_11_0" ]; @@ -42,8 +32,10 @@ buildPythonPackage rec { checkPhase = '' mv capstone capstone.hidden - patchShebangs test_* - make check + pushd tests + patchShebangs test_* + make -f ../Makefile check + popd ''; meta = with lib; { diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix index 856da1f95369..b9895dd18f97 100644 --- a/pkgs/development/python-modules/capturer/default.nix +++ b/pkgs/development/python-modules/capturer/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ humanfriendly ]; # hangs on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/carbon/default.nix b/pkgs/development/python-modules/carbon/default.nix index 74440cc504de..4b253740d6d6 100644 --- a/pkgs/development/python-modules/carbon/default.nix +++ b/pkgs/development/python-modules/carbon/default.nix @@ -1,19 +1,24 @@ { lib, buildPythonPackage, + cachetools, fetchPypi, + nixosTests, + pytestCheckHook, + pythonOlder, + setuptools, twisted, - whisper, txamqp, - cachetools, urllib3, - nixosTests, + whisper, }: buildPythonPackage rec { pname = "carbon"; version = "1.1.10"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; @@ -21,28 +26,41 @@ buildPythonPackage rec { }; # Carbon-s default installation is /opt/graphite. This env variable ensures - # carbon is installed as a regular python module. + # carbon is installed as a regular Python module. GRAPHITE_NO_PREFIX = "True"; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "cf.readfp(f, 'setup.cfg')" "cf.read(f, 'setup.cfg')" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + cachetools twisted - whisper txamqp - cachetools urllib3 + whisper ]; + # Tests are not shipped with PyPI + doCheck = false; + passthru.tests = { inherit (nixosTests) graphite; }; + pythonImportsCheck = [ "carbon" ]; + meta = with lib; { - homepage = "http://graphiteapp.org/"; description = "Backend data caching and persistence daemon for Graphite"; + homepage = "https://github.com/graphite-project/carbon"; + changelog = "https://github.com/graphite-project/carbon/releases/tag/${version}"; + license = licenses.asl20; maintainers = with maintainers; [ offline basvandijk ]; - license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index dbd7659ab81e..79059c7d53f5 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -1,55 +1,50 @@ { lib, buildPythonPackage, - pythonOlder, + cython, fetchpatch, fetchPypi, - cython, - setuptools-scm, + fontconfig, + gdal, geos, - proj, matplotlib, numpy, - pyproj, - pyshp, - shapely, owslib, pillow, - gdal, - scipy, - fontconfig, + proj, + pyproj, + pyshp, pytest-mpl, pytestCheckHook, + pythonOlder, + scipy, + setuptools-scm, + shapely, }: buildPythonPackage rec { pname = "cartopy"; - version = "0.23.0"; - - disabled = pythonOlder "3.8"; + version = "0.24.1"; + pyproject = true; - format = "setuptools"; + disabled = pythonOlder "3.10"; src = fetchPypi { - inherit version; - pname = "Cartopy"; - hash = "sha256-Ix83s1cB8rox2UlZzKdebaBMLuo6fxTOHHXuOw6udnY="; + inherit pname version; + hash = "sha256-AckQ1WNMaafv3sRuChfUc9Iyh2fwAdTcC1xLSOWFyL0="; }; - patches = [ - # Some tests in the 0.23.0 release are failing due to missing network markers. Revisit after update. - (fetchpatch { - name = "mnt-add-missing-needs-network-markers.patch"; - url = "https://github.com/SciTools/cartopy/commit/2403847ea69c3d95e899ad5d0cab32ac6017df0e.patch"; - hash = "sha256-aGBUX4jFn7GgoqmHVC51DmS+ga3GcQGKfkut++x67Q0="; - }) - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "numpy>=2.0.0rc1" "numpy" + ''; + + build-system = [ setuptools-scm ]; nativeBuildInputs = [ cython geos # for geos-config proj - setuptools-scm ]; buildInputs = [ @@ -57,7 +52,7 @@ buildPythonPackage rec { proj ]; - propagatedBuildInputs = [ + dependencies = [ matplotlib numpy pyproj @@ -65,7 +60,7 @@ buildPythonPackage rec { shapely ]; - passthru.optional-dependencies = { + optional-dependencies = { ows = [ owslib pillow @@ -80,7 +75,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-mpl pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = '' export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf @@ -101,9 +96,10 @@ buildPythonPackage rec { meta = with lib; { description = "Process geospatial data to create maps and perform analyses"; - mainProgram = "feature_download"; - license = licenses.lgpl3Plus; homepage = "https://scitools.org.uk/cartopy/docs/latest/"; + changelog = "https://github.com/SciTools/cartopy/releases/tag/v${version}"; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ ]; + mainProgram = "feature_download"; }; } diff --git a/pkgs/development/python-modules/cashews/default.nix b/pkgs/development/python-modules/cashews/default.nix index d5f0801c358f..3b9166d70096 100644 --- a/pkgs/development/python-modules/cashews/default.nix +++ b/pkgs/development/python-modules/cashews/default.nix @@ -19,19 +19,19 @@ buildPythonPackage rec { pname = "cashews"; - version = "7.2.0"; + version = "7.3.1"; pyproject = true; src = fetchFromGitHub { owner = "Krukov"; repo = "cashews"; rev = "refs/tags/${version}"; - hash = "sha256-7T9M8ioeTjW7OmcHyxZ6awNfp9kVU8Hi+Lgy17jXxK4="; + hash = "sha256-GS6QnWCVUgxj5uiH13jUDvRBadAB0xcZd4pb0+4q6gk="; }; build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { dill = [ dill ]; diskcache = [ diskcache ]; redis = [ redis ]; diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 9548bd1214d8..b72fd7d8a525 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { pytz pyyaml sure - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); # This is used to determine the version of cython that can be used CASS_DRIVER_ALLOWED_CYTHON_VERSION = cython.version; @@ -86,7 +86,7 @@ buildPythonPackage rec { # Make /etc/protocols accessible to allow socket.getprotobyname('tcp') in sandbox, # also /etc/resolv.conf is referenced by some tests preCheck = - (lib.optionalString stdenv.isLinux '' + (lib.optionalString stdenv.hostPlatform.isLinux '' echo "nameserver 127.0.0.1" > resolv.conf export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) export LD_PRELOAD=${libredirect}/lib/libredirect.so @@ -127,7 +127,7 @@ buildPythonPackage rec { "test_nts_token_performance" ]; - passthru.optional-dependencies = { + optional-dependencies = { cle = [ cryptography ]; eventlet = [ eventlet ]; gevent = [ gevent ]; diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix index 98e4f0869ccb..d0fc77b70038 100644 --- a/pkgs/development/python-modules/catboost/default.nix +++ b/pkgs/development/python-modules/catboost/default.nix @@ -3,15 +3,18 @@ buildPythonPackage, catboost, python, + + # build-system + setuptools, + + # dependencies graphviz, matplotlib, numpy, pandas, plotly, scipy, - setuptools, six, - wheel, }: buildPythonPackage rec { @@ -21,16 +24,15 @@ buildPythonPackage rec { src meta ; - format = "pyproject"; + pyproject = true; sourceRoot = "${src.name}/catboost/python-package"; - nativeBuildInputs = [ + build-system = [ setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ graphviz matplotlib numpy diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix index 2e48750ccb1e..b3bd55484b0f 100644 --- a/pkgs/development/python-modules/cattrs/default.nix +++ b/pkgs/development/python-modules/cattrs/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, cbor2, fetchFromGitHub, + fetchpatch2, exceptiongroup, hatchling, hatch-vcs, @@ -11,6 +12,7 @@ immutables, motor, msgpack, + msgspec, orjson, pytest-xdist, pytestCheckHook, @@ -23,7 +25,7 @@ buildPythonPackage rec { pname = "cattrs"; - version = "23.2.3"; + version = "24.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,9 +34,27 @@ buildPythonPackage rec { owner = "python-attrs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zWM5zmZr2EiJb/4Dc6KjDL89p0C1V0Dsz949byz5OVM="; + hash = "sha256-LSP8a/JduK0h9GytfbN7/CjFlnGGChaa3VbbCHQ3AFE="; }; + patches = [ + # https://github.com/python-attrs/cattrs/pull/576 + (fetchpatch2 { + name = "attrs-24_2-compatibility1.patch"; + url = "https://github.com/python-attrs/cattrs/commit/2d37226ff19506e23bbc291125a29ce514575819.patch"; + excludes = [ + "pyproject.toml" + "pdm.lock" + ]; + hash = "sha256-nbk7rmOFk42DXYdOgw4Oe3gl3HbxNEtaJ7ZiVSBb3YA="; + }) + (fetchpatch2 { + name = "attrs-24_2-compatibility2.patch"; + url = "https://github.com/python-attrs/cattrs/commit/4bd6dde556042241c6381e1993cedd6514921f58.patch"; + hash = "sha256-H1xSAYjvVUI8/jON3LWg2F2TlSxejf6TU1jpCeqly6I="; + }) + ]; + nativeBuildInputs = [ hatchling hatch-vcs @@ -53,6 +73,7 @@ buildPythonPackage rec { immutables motor msgpack + msgspec orjson pytest-xdist pytestCheckHook @@ -87,6 +108,9 @@ buildPythonPackage rec { "test_orjson" # tomlkit is pinned to an older version and newer versions raise InvalidControlChar exception "test_tomlkit" + # msgspec causes a segmentation fault for some reason + "test_simple_classes" + "test_msgspec_json_converter" ]; pythonImportsCheck = [ "cattr" ]; diff --git a/pkgs/development/python-modules/causal-conv1d/default.nix b/pkgs/development/python-modules/causal-conv1d/default.nix new file mode 100644 index 000000000000..0653959ed6da --- /dev/null +++ b/pkgs/development/python-modules/causal-conv1d/default.nix @@ -0,0 +1,69 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + ninja, + setuptools, + torch, + cudaPackages, + rocmPackages, + config, + cudaSupport ? config.cudaSupport, + which, +}: + +buildPythonPackage rec { + pname = "causal-conv1d"; + version = "1.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Dao-AILab"; + repo = "causal-conv1d"; + rev = "refs/tags/v${version}"; + hash = "sha256-p5x5u3zEmEMN3mWd88o3jmcpKUnovTvn7I9jIOj/ie0="; + }; + + build-system = [ + ninja + setuptools + torch + ]; + + nativeBuildInputs = [ which ]; + + buildInputs = ( + lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_cudart # cuda_runtime.h, -lcudart + cuda_cccl + libcusparse # cusparse.h + libcusolver # cusolverDn.h + cuda_nvcc + libcublas + ] + ) + ); + + dependencies = [ + torch + ]; + + # pytest tests not enabled due to nvidia GPU dependency + pythonImportsCheck = [ "causal_conv1d" ]; + + env = { + CAUSAL_CONV1D_FORCE_BUILD = "TRUE"; + } // lib.optionalAttrs cudaSupport { CUDA_HOME = "${lib.getDev cudaPackages.cuda_nvcc}"; }; + + meta = with lib; { + description = "Causal depthwise conv1d in CUDA with a PyTorch interface"; + homepage = "https://github.com/Dao-AILab/causal-conv1d"; + license = licenses.bsd3; + maintainers = with maintainers; [ cfhammill ]; + # The package requires CUDA or ROCm, the ROCm build hasn't + # been completed or tested, so broken if not using cuda. + broken = !cudaSupport; + }; +} diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index aee2824d2926..a376fd413d47 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -10,6 +10,7 @@ # tests hypothesis, + pytest-cov-stub, pytestCheckHook, }: @@ -25,12 +26,7 @@ buildPythonPackage rec { hash = "sha256-HFM8UN3oa+8caVBgIFSg/6PDduiw4gx7j1sQh5P2mD4="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov" "" - ''; - - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; @@ -39,6 +35,7 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cdcs/default.nix b/pkgs/development/python-modules/cdcs/default.nix index 38c643cd10a4..05be12f05226 100644 --- a/pkgs/development/python-modules/cdcs/default.nix +++ b/pkgs/development/python-modules/cdcs/default.nix @@ -44,6 +44,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "cdcs" ]; + disabledTests = [ + # Test is out-dated + "test_head" + ]; + meta = with lib; { description = "Python client for performing REST calls to configurable data curation system (CDCS) databases"; homepage = "https://github.com/usnistgov/pycdcs"; diff --git a/pkgs/development/python-modules/celery-redbeat/default.nix b/pkgs/development/python-modules/celery-redbeat/default.nix index 0e6d7f5b868f..2635818a9b37 100644 --- a/pkgs/development/python-modules/celery-redbeat/default.nix +++ b/pkgs/development/python-modules/celery-redbeat/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "celery-redbeat"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = "sibson"; repo = "redbeat"; - rev = "v${version}"; - hash = "sha256-WW/OYa7TWEKkata1eULir29wHaCnavBJebn4GrBzmWY="; + rev = "refs/tags/v${version}"; + hash = "sha256-lAEbhRTp0jYrCgHaTvPrl+lW1NRezmmTqAnUmLdpVwY="; }; patches = [ diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index d5c372c5d498..1ab0ee43a711 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { vine ]; - passthru.optional-dependencies = { + optional-dependencies = { gcs = [ google-cloud-storage ]; mongodb = [ pymongo ]; msgpack = [ msgpack ]; @@ -71,7 +71,7 @@ buildPythonPackage rec { pytest-timeout pytest-xdist pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ # test_eventlet touches network @@ -97,7 +97,7 @@ buildPythonPackage rec { "test_stamping_headers_in_options" "test_stamping_with_replace" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Too many open files on hydra "test_cleanup" "test_with_autoscaler_file_descriptor_safety" diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index bfdbd7635200..7a3ba89b8041 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.14"; + version = "2.2.16"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "refs/tags/v${version}"; - hash = "sha256-3evll1Ll8krvAfelGoJHOrmH7RvkeM/ZU1j13cTuXR4="; + hash = "sha256-OP7+jSt4xS71Kcjy5hFzeZ5rlTPtDx22rPr3UwjI5dk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/certbot-dns-google/default.nix b/pkgs/development/python-modules/certbot-dns-google/default.nix index 1717a573a9d0..8e3f51299081 100644 --- a/pkgs/development/python-modules/certbot-dns-google/default.nix +++ b/pkgs/development/python-modules/certbot-dns-google/default.nix @@ -28,9 +28,8 @@ buildPythonPackage rec { pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" - - # Monitor https://github.com/certbot/certbot/issues/9606 for a solution - "-W 'ignore:pkg_resources is deprecated as an API:DeprecationWarning'" + # https://github.com/certbot/certbot/issues/9988 + "-Wignore::DeprecationWarning" ]; meta = certbot.meta // { diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index ea1873e2c589..f04d2b2a793b 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -4,6 +4,7 @@ python, runCommand, fetchFromGitHub, + fetchpatch, configargparse, acme, configobj, @@ -33,11 +34,20 @@ buildPythonPackage rec { hash = "sha256-Qee7lUjgliG5fmUWWPm3MzpGJHUF/DXZ08UA6kkWjjk="; }; - sourceRoot = "${src.name}/${pname}"; + patches = [ + (fetchpatch { + name = "CSR_support_in_pyOpenSSL_is_deprecated.patch"; + url = "https://github.com/certbot/certbot/commit/f005045d87b25f1922774685646e57765aa202ad.patch"; + includes = [ "pytest.ini" ]; + hash = "sha256-YcQbZb7DLU+AXxNyqJRYZIC18DuT6X8kGbfdYtUrHiA="; + }) + ]; + + postPatch = "cd ${pname}"; # using sourceRoot would interfere with patches - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ configargparse acme configobj @@ -61,7 +71,11 @@ buildPythonPackage rec { pytest-xdist ]; - pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ]; + pytestFlagsArray = [ + "-o cache_dir=$(mktemp -d)" + "-W" + "ignore::DeprecationWarning" + ]; makeWrapperArgs = [ "--prefix PATH : ${dialog}/bin" ]; diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index e72fc1b07e45..8665e8f7b7b1 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "certifi"; - version = "2024.07.04"; + version = "2024.08.30"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = pname; repo = "python-certifi"; rev = version; - hash = "sha256-ArJB19tPpwTT1LjYo8OF1+Mo//l8FaMHTpvSvlfve3Q="; + hash = "sha256-E3Ykb7KLWWVlJ8kFGC9X/6I1SlyNxUXUPb3xN8CwlHI="; }; patches = [ diff --git a/pkgs/development/python-modules/certipy/default.nix b/pkgs/development/python-modules/certipy/default.nix index 908edc32db69..911de68d4182 100644 --- a/pkgs/development/python-modules/certipy/default.nix +++ b/pkgs/development/python-modules/certipy/default.nix @@ -1,29 +1,44 @@ { lib, buildPythonPackage, + cryptography, fetchPypi, - pyopenssl, + flask, + pytestCheckHook, + pythonOlder, + requests, + setuptools-scm, }: buildPythonPackage rec { pname = "certipy"; - version = "0.1.3"; - format = "setuptools"; + version = "0.2.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0n980gqpzh0fm58h3i4mi2i10wgj606lscm1r5sk60vbf6vh8mv9"; + hash = "sha256-DA6nslJItC+5MPMBc6eMAp5rpn4u+VmMpEcNiXXJy7Y="; }; - propagatedBuildInputs = [ pyopenssl ]; + build-system = [ setuptools-scm ]; + + dependencies = [ cryptography ]; + + nativeCheckInputs = [ + flask + pytestCheckHook + requests + ]; - doCheck = false; # no tests were included + pythonImportsCheck = [ "certipy" ]; meta = with lib; { + description = "Utility to create and sign CAs and certificates"; homepage = "https://github.com/LLNL/certipy"; - description = "wrapper for pyOpenSSL"; - mainProgram = "certipy"; license = licenses.bsd3; maintainers = with maintainers; [ isgy ]; + mainProgram = "certipy"; }; } diff --git a/pkgs/development/python-modules/certomancer/default.nix b/pkgs/development/python-modules/certomancer/default.nix index e9311df36e82..b04866a54607 100644 --- a/pkgs/development/python-modules/certomancer/default.nix +++ b/pkgs/development/python-modules/certomancer/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { tzlocal ]; - passthru.optional-dependencies = { + optional-dependencies = { requests-mocker = [ requests-mock ]; web-api = [ jinja2 @@ -73,7 +73,7 @@ buildPythonPackage rec { pytestCheckHook pytz requests - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ # pyhanko_certvalidator.errors.DisallowedAlgorithmError diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix index a60f3f0e4aef..3cee465537b2 100644 --- a/pkgs/development/python-modules/cf-xarray/default.nix +++ b/pkgs/development/python-modules/cf-xarray/default.nix @@ -16,7 +16,7 @@ rich, shapely, - # checks + # tests dask, pytestCheckHook, scipy, @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "cf-xarray"; - version = "0.9.5"; + version = "0.10.0"; pyproject = true; src = fetchFromGitHub { owner = "xarray-contrib"; repo = "cf-xarray"; rev = "refs/tags/v${version}"; - hash = "sha256-Rz0E7GBaN/7zb0dqAxo0SJ4Bd+eQuOOv6x1WubIUh6A="; + hash = "sha256-lAVH2QGdMyU5A6QTLKujeAh8n1AkCsAtdyKQEqLahTk="; }; build-system = [ diff --git a/pkgs/development/python-modules/cffconvert/default.nix b/pkgs/development/python-modules/cffconvert/default.nix index befd378ac31d..c7dba79bb5cb 100644 --- a/pkgs/development/python-modules/cffconvert/default.nix +++ b/pkgs/development/python-modules/cffconvert/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { "tests/cli/test_rawify_url.py" ]; - pythonImportsCheckHook = [ "cffconvert" ]; + pythonImportsCheck = [ "cffconvert" ]; meta = { changelog = "https://github.com/citation-file-format/cffconvert/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 9fbbdd371f9b..cd0e1c143a7f 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -19,12 +19,12 @@ if isPyPy then else buildPythonPackage rec { pname = "cffi"; - version = "1.17.0"; + version = "1.17.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-8xV2JLdVi5FMsDn9Gvc15egEmofIF8whUQmtHId533Y="; + hash = "sha256-HDnGAWwyvEjdVFYZUOvWg24WcPKuRhKPZ89J54nFKCQ="; }; patches = @@ -49,7 +49,7 @@ else ./clang-pointer-substraction-warning.diff ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Remove setup.py impurities substituteInPlace setup.py \ --replace "'-iwithsysroot/usr/include/ffi'" "" \ @@ -57,14 +57,13 @@ else --replace '/usr/include/libffi' '${lib.getDev libffi}/include' ''; - nativeBuildInputs = [ - pkg-config - setuptools - ]; + nativeBuildInputs = [ pkg-config ]; + + build-system = [ setuptools ]; buildInputs = [ libffi ]; - propagatedBuildInputs = [ pycparser ]; + dependencies = [ pycparser ]; # The tests use -Werror but with python3.6 clang detects some unreachable code. env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument -Wno-unreachable-code -Wno-c++11-narrowing"; diff --git a/pkgs/development/python-modules/cffsubr/default.nix b/pkgs/development/python-modules/cffsubr/default.nix index c9642235e37e..46dabb2711af 100644 --- a/pkgs/development/python-modules/cffsubr/default.nix +++ b/pkgs/development/python-modules/cffsubr/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "cffsubr" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; changelog = "https://github.com/adobe-type-tools/cffsubr/releases/tag/v${version}"; description = "Standalone CFF subroutinizer based on AFDKO tx"; mainProgram = "cffsubr"; diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index d0325a5c21ea..dad77f086a45 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -2,6 +2,7 @@ lib, aws-sam-translator, buildPythonPackage, + defusedxml, fetchFromGitHub, jschema-to-python, jsonpatch, @@ -15,13 +16,14 @@ pyyaml, regex, sarif-om, + setuptools, sympy, }: buildPythonPackage rec { pname = "cfn-lint"; - version = "0.87.7"; - format = "setuptools"; + version = "1.18.1"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -29,10 +31,12 @@ buildPythonPackage rec { owner = "aws-cloudformation"; repo = "cfn-lint"; rev = "refs/tags/v${version}"; - hash = "sha256-em6Vi9zIn8ikmcHVbljA1vr+R3t8ZpJ57p3Ix3bqMYU="; + hash = "sha256-e06ytX1scIsmw/SezIVVnGn0day1l6kQ/wb05E8O7h0="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aws-sam-translator jschema-to-python jsonpatch @@ -46,11 +50,26 @@ buildPythonPackage rec { sympy ]; + optional-dependencies = { + graph = [ pydot ]; + junit = [ junit-xml ]; + sarif = [ + jschema-to-python + sarif-om + ]; + full = [ + jschema-to-python + junit-xml + pydot + sarif-om + ]; + }; + nativeCheckInputs = [ + defusedxml mock - pydot pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export PATH=$out/bin:$PATH @@ -68,6 +87,8 @@ buildPythonPackage rec { "test_override_parameters" "test_positional_template_parameters" "test_template_config" + # Assertion error + "test_build_graph" ]; pythonImportsCheck = [ "cfnlint" ]; diff --git a/pkgs/development/python-modules/cgal/default.nix b/pkgs/development/python-modules/cgal/default.nix new file mode 100644 index 000000000000..303addccd06e --- /dev/null +++ b/pkgs/development/python-modules/cgal/default.nix @@ -0,0 +1,89 @@ +{ + lib, + stdenv, + python, + buildPythonPackage, + fetchFromGitHub, + setuptools, + boost, + cgal, + cmake, + gmp, + tbb, + LAStools, + eigen, + mpfr, + numpy, + swig, + zlib, + withLAS ? false, # unfree +}: + +buildPythonPackage rec { + pname = "cgal"; + version = "6.0.1.post202410241521"; + pyproject = true; + + src = fetchFromGitHub { + owner = "CGAL"; + repo = "cgal-swig-bindings"; + rev = "refs/tags/v${version}"; + hash = "sha256-MnUsl4ozMamKcQ13TV6mtoG7VKq8BuiDSIVq1RPn2rs="; + }; + + dontUseCmakeConfigure = true; + + build-system = [ + setuptools + cmake + swig + ]; + + buildInputs = + [ + cgal + gmp + mpfr + boost + zlib + tbb + eigen + ] + ++ lib.optionals withLAS [ + LAStools + ]; + + dependencies = [ + numpy + ]; + + pythonImportsCheck = [ "CGAL" ]; + + postFixup = lib.optionalString stdenv.hostPlatform.isElf '' + mv $out/${python.sitePackages}/{lib,CGAL/_lib} + for file in $out/${python.sitePackages}/CGAL/_*.so; do + patchelf "$file" --add-rpath $out/${python.sitePackages}/CGAL/_lib + done + ''; + + checkPhase = '' + runHook preCheck + (cd examples/python/ + bash ./test.sh + cat error.txt + if grep -qi ' run error$' <error.txt; then + false + fi + ) + runHook postCheck + ''; + + meta = { + description = "CGAL bindings using SWIG"; + homepage = "https://github.com/CGAL/cgal-swig-bindings"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ pbsds ]; + # error: no template named 'unary_function' in namespace 'boost::functional::detail' + broken = stdenv.hostPlatform.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/channels-redis/default.nix b/pkgs/development/python-modules/channels-redis/default.nix index 73538fcdce4c..e6743a93bf68 100644 --- a/pkgs/development/python-modules/channels-redis/default.nix +++ b/pkgs/development/python-modules/channels-redis/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { msgpack ]; - passthru.optional-dependencies = { + optional-dependencies = { cryptography = [ cryptography ]; }; diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 01773d1c20cf..2b4c9f427acb 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { "tls" # touches network "peercreds_unix_sock" # test urls no longer allowed ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "http_over_https_error" "bind_addr_unix" "test_ssl_env" diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 71d9a9aedfb5..7f3bd134f29f 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -101,15 +101,17 @@ buildPythonPackage rec { "test_1_Ram_Concurrency" "test_2_File_Concurrency" ] - ++ lib.optionals stdenv.isDarwin [ "test_block" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_block" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ "cherrypy/test/test_config_server.py" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + "cherrypy/test/test_config_server.py" + ]; __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "cherrypy" ]; - passthru.optional-dependencies = { + optional-dependencies = { json = [ simplejson ]; memcached_session = [ python-memcached ]; routes_dispatcher = [ routes ]; diff --git a/pkgs/development/python-modules/chess/default.nix b/pkgs/development/python-modules/chess/default.nix index 50cb9306969f..b8d6cfcafc2e 100644 --- a/pkgs/development/python-modules/chess/default.nix +++ b/pkgs/development/python-modules/chess/default.nix @@ -2,14 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, - python, + setuptools, pythonOlder, + pytestCheckHook, }: buildPythonPackage rec { pname = "chess"; - version = "1.10.0"; - format = "setuptools"; + version = "1.11.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,14 +18,16 @@ buildPythonPackage rec { owner = "niklasf"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-jfPg1W9Qp0DlAbMXaFqZ6Ri2zMOW6EKUHwi7Azn/yl0="; + hash = "sha256-OAYQ/XtM4AHfbpA+gVa/AjB3tyMtvgykpHc39WaU2CI="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "chess" ]; - checkPhase = '' - ${python.interpreter} ./test.py -v - ''; + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "test.py" ]; meta = with lib; { description = "Chess library with move generation, move validation, and support for common formats"; diff --git a/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix index 803c352c7154..3f52a6ac3311 100644 --- a/pkgs/development/python-modules/chex/default.nix +++ b/pkgs/development/python-modules/chex/default.nix @@ -1,40 +1,43 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, + + # build-system setuptools, + + # dependencies absl-py, - cloudpickle, - dm-tree, jax, jaxlib, numpy, - pytestCheckHook, toolz, typing-extensions, + + # tests + cloudpickle, + dm-tree, + pytestCheckHook, }: buildPythonPackage rec { pname = "chex"; - version = "0.1.86"; + version = "0.1.87"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "deepmind"; repo = "chex"; rev = "refs/tags/v${version}"; - hash = "sha256-Z5Ns4fG5pC99I4xdGjDMKX6YZpTtd1y0TWcIOtr7dug="; + hash = "sha256-TPh7XLWHk0y/VLXxHLANUiDmfveHPeMLks9QKf16doo="; }; build-system = [ setuptools ]; dependencies = [ absl-py - jaxlib jax + jaxlib numpy toolz typing-extensions @@ -48,11 +51,11 @@ buildPythonPackage rec { pytestCheckHook ]; - meta = with lib; { + meta = { description = "Chex is a library of utilities for helping to write reliable JAX code"; homepage = "https://github.com/deepmind/chex"; changelog = "https://github.com/google-deepmind/chex/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ ndl ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ndl ]; }; } diff --git a/pkgs/development/python-modules/chispa/default.nix b/pkgs/development/python-modules/chispa/default.nix index 980f02b4229d..27369e9d76c7 100644 --- a/pkgs/development/python-modules/chispa/default.nix +++ b/pkgs/development/python-modules/chispa/default.nix @@ -5,11 +5,12 @@ poetry-core, pythonOlder, setuptools, + prettytable, }: buildPythonPackage rec { pname = "chispa"; - version = "0.10.0"; + version = "0.10.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,12 +19,15 @@ buildPythonPackage rec { owner = "MrPowers"; repo = "chispa"; rev = "refs/tags/v${version}"; - hash = "sha256-r3/Uae/Bu/+ZpWt19jetfIRpew1hBB24WWQRJIcYqFs="; + hash = "sha256-WPtn8YGlj67MEy2onxoU5SctQ7NcvTImaU0VgMoz2B4="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ setuptools ]; + dependencies = [ + setuptools + prettytable + ]; # Tests require a spark installation doCheck = false; diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index 7416e254769f..f562bbcaf709 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -9,13 +9,13 @@ darwin, fastapi, fetchFromGitHub, - fetchpatch, grpcio, httpx, hypothesis, importlib-resources, kubernetes, mmh3, + nixosTests, numpy, onnxruntime, openssl, @@ -28,6 +28,7 @@ pkg-config, posthog, protobuf, + psutil, pulsar-client, pydantic, pypika, @@ -38,8 +39,8 @@ requests, rustc, rustPlatform, - setuptools, setuptools-scm, + setuptools, tenacity, tokenizers, tqdm, @@ -47,12 +48,11 @@ typing-extensions, uvicorn, zstd, - nixosTests, }: buildPythonPackage rec { pname = "chromadb"; - version = "0.5.5"; + version = "0.5.18"; pyproject = true; disabled = pythonOlder "3.9"; @@ -61,29 +61,15 @@ buildPythonPackage rec { owner = "chroma-core"; repo = "chroma"; rev = "refs/tags/${version}"; - hash = "sha256-e6ZctUFeq9hHXWaxGdVTiqFpwaU7A+EKn2EdQPI7DHE="; + hash = "sha256-kJzBwUaA46HenwTn24AMy0xfgVmBtubJUujDS5/kYXs="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-3FmnQEpknYNzI3WlQ3kc8qa4LFcn1zpxKDbkATU7/48="; + hash = "sha256-iW68C3Vp9C1gR7hF2x4VhBIKWX9wlnT8jPj+zMRUC7w="; }; - patches = [ - # Remove these on the next release - (fetchpatch { - name = "pydantic19-fastapi1.patch"; - url = "https://github.com/chroma-core/chroma/commit/d62c13da29b7bff77bd7dee887123e3c57e2c19e.patch"; - hash = "sha256-E3xmh9vQZH3NCfG6phvzM65NGwlcHmPgfU6FERKAJ60="; - }) - (fetchpatch { - name = "no-union-types-pydantic1.patch"; - url = "https://github.com/chroma-core/chroma/commit/2fd5b27903dffcf8bdfbb781a25bcecc17b27672.patch"; - hash = "sha256-nmiA/lKZVrHKXumc+J4uVRiMwrnFrz2tgMpfcay5hhw="; - }) - ]; - pythonRelaxDeps = [ "chroma-hnswlib" "orjson" @@ -105,7 +91,7 @@ buildPythonPackage rec { buildInputs = [ openssl zstd - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; dependencies = [ bcrypt @@ -141,6 +127,7 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis + psutil pytest-asyncio pytestCheckHook ]; @@ -162,6 +149,8 @@ buildPythonPackage rec { # Tests are laky / timing sensitive "test_fastapi_server_token_authn_allows_when_it_should_allow" "test_fastapi_server_token_authn_rejects_when_it_should_reject" + # Issue with event loop + "test_http_client_bw_compatibility" ]; disabledTestPaths = [ @@ -188,6 +177,6 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "chroma"; - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix index b87e4c42568b..392a056df64f 100644 --- a/pkgs/development/python-modules/circus/default.nix +++ b/pkgs/development/python-modules/circus/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; # On darwin: Too many open files - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' ulimit -n 1024 ''; @@ -83,11 +83,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "circus" ]; - meta = with lib; { + __darwinAllowLocalNetworking = true; + + meta = { description = "Process and socket manager"; homepage = "https://github.com/circus-tent/circus"; changelog = "https://github.com/circus-tent/circus/releases/tag/${version}"; - license = licenses.asl20; - maintainers = [ ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/cirq-aqt/default.nix b/pkgs/development/python-modules/cirq-aqt/default.nix index 1bead28588e3..6e20f84d26e6 100644 --- a/pkgs/development/python-modules/cirq-aqt/default.nix +++ b/pkgs/development/python-modules/cirq-aqt/default.nix @@ -3,21 +3,24 @@ cirq-core, requests, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "cirq-aqt"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ - --replace "requests~=2.18" "requests" + --replace-fail "requests~=2.18" "requests" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cirq-core requests ]; diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix index b2cf178596b5..c2e85c1f238d 100644 --- a/pkgs/development/python-modules/cirq-core/default.nix +++ b/pkgs/development/python-modules/cirq-core/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { version = "1.4.1"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "quantumlib"; @@ -47,7 +47,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "matplotlib~=3.0" "matplotlib" + --replace-fail "matplotlib~=3.0" "matplotlib" ''; build-system = [ setuptools ]; @@ -89,10 +89,15 @@ buildPythonPackage rec { "cirq/_version_test.py" ]; - disabledTests = lib.optionals stdenv.isAarch64 [ - # https://github.com/quantumlib/Cirq/issues/5924 - "test_prepare_two_qubit_state_using_sqrt_iswap" - ]; + disabledTests = + [ + # Assertion error + "test_parameterized_cphase" + ] + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ + # https://github.com/quantumlib/Cirq/issues/5924 + "test_prepare_two_qubit_state_using_sqrt_iswap" + ]; meta = with lib; { description = "Framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits"; diff --git a/pkgs/development/python-modules/cirq-google/default.nix b/pkgs/development/python-modules/cirq-google/default.nix index b7b70b00afed..6c84cd1440e6 100644 --- a/pkgs/development/python-modules/cirq-google/default.nix +++ b/pkgs/development/python-modules/cirq-google/default.nix @@ -15,11 +15,9 @@ buildPythonPackage rec { sourceRoot = "${src.name}/${pname}"; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cirq-core google-api-core protobuf diff --git a/pkgs/development/python-modules/cirq-ionq/default.nix b/pkgs/development/python-modules/cirq-ionq/default.nix index b4fa84636623..518334432441 100644 --- a/pkgs/development/python-modules/cirq-ionq/default.nix +++ b/pkgs/development/python-modules/cirq-ionq/default.nix @@ -3,21 +3,24 @@ cirq-core, requests, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "cirq-ionq"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ - --replace "requests~=2.18" "requests" + --replace-fail "requests~=2.18" "requests" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cirq-core requests ]; diff --git a/pkgs/development/python-modules/cirq-pasqal/default.nix b/pkgs/development/python-modules/cirq-pasqal/default.nix index ea13cb2cc4da..62d946ea4617 100644 --- a/pkgs/development/python-modules/cirq-pasqal/default.nix +++ b/pkgs/development/python-modules/cirq-pasqal/default.nix @@ -3,21 +3,24 @@ cirq-core, requests, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "cirq-pasqal"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ - --replace "requests~=2.18" "requests" + --replace-fail "requests~=2.18" "requests" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cirq-core requests ]; diff --git a/pkgs/development/python-modules/cirq-rigetti/default.nix b/pkgs/development/python-modules/cirq-rigetti/default.nix index aaf29a81755c..5791950fc136 100644 --- a/pkgs/development/python-modules/cirq-rigetti/default.nix +++ b/pkgs/development/python-modules/cirq-rigetti/default.nix @@ -1,36 +1,21 @@ { + lib, buildPythonPackage, cirq-core, fetchpatch2, - lib, - pytestCheckHook, - attrs, - certifi, - h11, - httpcore, - idna, - httpx, - iso8601, - pydantic, - pyjwt, pyquil, - python-dateutil, + pytestCheckHook, pythonOlder, - qcs-api-client, - retrying, - rfc3339, - rfc3986, - six, - sniffio, - toml, + qcs-sdk-python, + setuptools, }: buildPythonPackage rec { pname = "cirq-rigetti"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; patches = [ # https://github.com/quantumlib/Cirq/pull/6734 @@ -44,46 +29,19 @@ buildPythonPackage rec { sourceRoot = "${src.name}/${pname}"; - pythonRelaxDeps = [ - "attrs" - "certifi" - "h11" - "httpcore" - "httpx" - "idna" - "iso8601" - "pydantic" - "pyjwt" - "pyquil" - "qcs-api-client" - "rfc3986" - ]; + pythonRelaxDeps = [ "pyquil" ]; postPatch = '' # Remove outdated test rm cirq_rigetti/service_test.py ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cirq-core - attrs - certifi - h11 - httpcore - httpx - idna - iso8601 - pydantic - pyjwt pyquil - python-dateutil - qcs-api-client - retrying - rfc3339 - rfc3986 - six - sniffio - toml + qcs-sdk-python ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cirq-web/default.nix b/pkgs/development/python-modules/cirq-web/default.nix index 95af99b1360b..782aec95c4ef 100644 --- a/pkgs/development/python-modules/cirq-web/default.nix +++ b/pkgs/development/python-modules/cirq-web/default.nix @@ -2,16 +2,19 @@ buildPythonPackage, cirq-core, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "cirq-web"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; - propagatedBuildInputs = [ cirq-core ]; + build-system = [ setuptools ]; + + dependencies = [ cirq-core ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index 54eee66b5f20..0d755c34b767 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -8,14 +8,17 @@ cirq-rigetti, cirq-web, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "cirq"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src meta; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cirq-aqt cirq-core cirq-ionq diff --git a/pkgs/development/python-modules/clarabel/default.nix b/pkgs/development/python-modules/clarabel/default.nix index d81f01b34fc5..f6e4e09edc7c 100644 --- a/pkgs/development/python-modules/clarabel/default.nix +++ b/pkgs/development/python-modules/clarabel/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; propagatedBuildInputs = [ numpy diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index 57006c8d7938..9751552d04c2 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.8.6"; + version = "10.9.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-lCFjZcPp4ih2fKaRXQxyxBkgRRPSaTOawiMqeXg25cg="; + hash = "sha256-XJqbZicRQCiykdXn2R8tOzWPbtrso9IwZYpcTcY7vio="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 6b39d48513d6..124e5cd8d987 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "clarifai"; - version = "10.8.0"; + version = "10.8.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python"; rev = "refs/tags/${version}"; - hash = "sha256-dRhFZACfdMW0cIBDVUOSGDl5fai0gFXDPyfDil+itwQ="; + hash = "sha256-/fHNRFtxyNa9VdEi5wQ+YA+9mFv3ZpRFJQnWkuxQd5I="; }; pythonRelaxDeps = [ @@ -52,7 +52,7 @@ buildPythonPackage rec { tritonclient ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ pycocotools ]; }; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 618624295907..1b474003ad60 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.118"; + version = "9.2.127"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-1VIWdKQD6wtYd6LHQ7vW1Ol3W+ZGB+xHhSMZ9EiNev8="; + hash = "sha256-uiB67+5zfLig1TgAzniWaRhibJKmdOPMDAfDVVfMs/0="; }; # 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 6f7614aa917d..c87cad4fade9 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -18,14 +18,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.118"; + version = "9.2.127"; # 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-3XucYC7FKJ0WQI6fsKxMTCIdROjZcnTKpTi3ZRfiQkU="; + hash = "sha256-EgkYynllp/UGMRJmshQRpnMdwhdOkYHgoMlTiqdtZO1="; }; in buildPythonPackage rec { @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-izDaikc4WR/6fdgrc3TJze+DLe7NOtSNWue9HrTz18Q="; + hash = "sha256-DcfFOzP7Ylms1/kAX5CIhujzj6Vpma8sb0Qyq6tSJq0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cleanlab/default.nix b/pkgs/development/python-modules/cleanlab/default.nix index e5f227f7545e..66bcee0c48ba 100644 --- a/pkgs/development/python-modules/cleanlab/default.nix +++ b/pkgs/development/python-modules/cleanlab/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -15,6 +14,7 @@ pandas, # test dependencies + cleanvision, datasets, fasttext, hypothesis, @@ -31,16 +31,14 @@ buildPythonPackage rec { pname = "cleanlab"; - version = "2.6.6"; + version = "2.7.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "cleanlab"; repo = "cleanlab"; rev = "refs/tags/v${version}"; - hash = "sha256-08ePFTCRuggr4hTCfr/gbzMhLozz4KCywhPFSKYDNng="; + hash = "sha256-0kCEIHNOXIkdwDH5zCVWnR/W79ppc/1PFsJ/a4goGzk="; }; build-system = [ setuptools ]; @@ -61,6 +59,7 @@ buildPythonPackage rec { doCheck = true; nativeCheckInputs = [ + cleanvision datasets fasttext hypothesis diff --git a/pkgs/development/python-modules/cleanvision/default.nix b/pkgs/development/python-modules/cleanvision/default.nix new file mode 100644 index 000000000000..e82ebeb52f7c --- /dev/null +++ b/pkgs/development/python-modules/cleanvision/default.nix @@ -0,0 +1,79 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + fsspec, + imagehash, + matplotlib, + numpy, + pandas, + pillow, + tabulate, + tqdm, + + # tests + datasets, + psutil, + pytestCheckHook, + torchvision, +}: + +buildPythonPackage rec { + pname = "cleanvision"; + version = "0.3.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cleanlab"; + repo = "cleanvision"; + rev = "refs/tags/v${version}"; + hash = "sha256-QAydDqLJx/jYKXqxRUElTdM5dOFA6nZag8rNAjPZjRg="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + fsspec + imagehash + matplotlib + numpy + pandas + pillow + tabulate + tqdm + ]; + + pythonImportsCheck = [ "cleanvision" ]; + + nativeCheckInputs = [ + datasets + psutil + pytestCheckHook + torchvision + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTests = [ + # Requires accessing s3 (online) + "test_s3_dataset" + ]; + + meta = { + description = "Automatically find issues in image datasets and practice data-centric computer vision"; + homepage = "https://github.com/cleanlab/cleanvision"; + changelog = "https://github.com/cleanlab/cleanvision/releases/tag/v${version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ GaetanLepage ]; + # Fatal Python error: Aborted + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix index eb9c003c913f..91372bca1be7 100644 --- a/pkgs/development/python-modules/clevercsv/default.nix +++ b/pkgs/development/python-modules/clevercsv/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { packaging ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ faust-cchardet pandas @@ -46,7 +46,7 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.full; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full; pythonImportsCheck = [ "clevercsv" diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index 1d1e2c741b6c..e043ff31da29 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { tabulate ] ++ tabulate.optional-dependencies.widechars; - passthru.optional-dependencies = { + optional-dependencies = { styles = [ pygments ]; }; nativeCheckInputs = [ pytestCheckHook mock - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = with lib; { description = "Python helpers for common CLI tasks"; diff --git a/pkgs/development/python-modules/click-aliases/default.nix b/pkgs/development/python-modules/click-aliases/default.nix index 51b5b40a140c..cf1a33cf3140 100644 --- a/pkgs/development/python-modules/click-aliases/default.nix +++ b/pkgs/development/python-modules/click-aliases/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "click-aliases"; - version = "1.0.4"; + version = "1.0.5"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "click-contrib"; repo = "click-aliases"; rev = "v${version}"; - hash = "sha256-3/O5odibSjo5inlLCvUlotphhMVLBdaND/M2f40pMyM="; + hash = "sha256-vR5MUbgQfgownnq/VuEB/Jreibh/SB8wbDWGOmareRU="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/click-odoo-contrib/default.nix b/pkgs/development/python-modules/click-odoo-contrib/default.nix index ebb626aabf8c..03263e7fed21 100644 --- a/pkgs/development/python-modules/click-odoo-contrib/default.nix +++ b/pkgs/development/python-modules/click-odoo-contrib/default.nix @@ -12,12 +12,13 @@ buildPythonPackage rec { pname = "click-odoo-contrib"; - version = "1.18.1"; + version = "1.19"; format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-3gusvy3d6kgmyBY+bmXB6lbWk7qxJIuHALZtug1WLzo="; + pname = "click_odoo_contrib"; + inherit version; + hash = "sha256-Tg3C/mdgkB1TtQZaUOX4ZjpD3InI8CxoNUSfotRqbg0="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index 117e5c0c4196..170ffd907128 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -1,30 +1,31 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchFromGitea, flake8, click, pyyaml, six, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { pname = "clickclick"; - version = "1.2.2"; + version = "20.10.2"; format = "setuptools"; - src = fetchFromGitHub { + src = fetchFromGitea { + domain = "codeberg.org"; owner = "hjacobs"; repo = "python-clickclick"; rev = version; - sha256 = "1rij9ws9nhsmagiy1vclzliiqfkxi006rf65qvrw1k3sm2s8p5g0"; + hash = "sha256-gefU6CI4ibtvonsaKZmuffuUNUioBn5ODs72BI5zXOw="; }; nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; propagatedBuildInputs = [ flake8 @@ -38,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Click command line utilities"; - homepage = "https://github.com/hjacobs/python-clickclick/"; + homepage = "https://codeberg.org/hjacobs/python-clickclick/"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/clickgen/default.nix b/pkgs/development/python-modules/clickgen/default.nix index 50b2f1b1d241..a8109184f251 100644 --- a/pkgs/development/python-modules/clickgen/default.nix +++ b/pkgs/development/python-modules/clickgen/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { maintainers = with maintainers; [ AdsonCicilioti ]; # fails with: # ld: unknown option: -zdefs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix index d5300b5499a8..f338744bbae9 100644 --- a/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -24,7 +24,7 @@ }: buildPythonPackage rec { pname = "clickhouse-connect"; - version = "0.7.12"; + version = "0.8.0"; format = "setuptools"; @@ -34,7 +34,7 @@ buildPythonPackage rec { repo = "clickhouse-connect"; owner = "ClickHouse"; rev = "refs/tags/v${version}"; - hash = "sha256-UJSg/ADxVsO4xuym8NGjbgQafWmu7J3Is2hKvObYhU8="; + hash = "sha256-Jx+lbCs1zsU11D76COIiMxwqHlYKC1DOMegM4RsQkVg="; }; nativeBuildInputs = [ cython ]; @@ -53,7 +53,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-dotenv - ] ++ passthru.optional-dependencies.sqlalchemy ++ passthru.optional-dependencies.numpy; + ] ++ optional-dependencies.sqlalchemy ++ optional-dependencies.numpy; # these tests require a running clickhouse instance disabledTestPaths = [ @@ -68,14 +68,12 @@ buildPythonPackage rec { "clickhouse_connect.driverc.npconv" ]; - passthru = { - optional-dependencies = { - sqlalchemy = [ sqlalchemy ]; - numpy = [ numpy ]; - pandas = [ pandas ]; - arrow = [ pyarrow ]; - orjson = [ orjson ]; - }; + optional-dependencies = { + sqlalchemy = [ sqlalchemy ]; + numpy = [ numpy ]; + pandas = [ pandas ]; + arrow = [ pyarrow ]; + orjson = [ orjson ]; }; meta = with lib; { diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix index 0ecca4ea0fa8..7231d0e44e76 100644 --- a/pkgs/development/python-modules/clikit/default.nix +++ b/pkgs/development/python-modules/clikit/default.nix @@ -1,57 +1,39 @@ { lib, buildPythonPackage, + crashtest, fetchFromGitHub, - isPy27, - pythonAtLeast, + pastel, poetry-core, - - # propagates pylev, - pastel, - - # python36+ - crashtest, - - # python2 - typing, - enum34, - - # tests pytest-mock, pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "clikit"; version = "0.6.2"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sdispater"; - repo = pname; + repo = "clikit"; rev = "refs/tags/${version}"; hash = "sha256-xAsUNhVQBjtSFHyjjnicAKRC3+Tdn3AdGDUYhmOOIdA="; }; - postPatch = '' - substituteInPlace pyproject.toml --replace \ - 'crashtest = { version = "^0.3.0", python = "^3.6" }' \ - 'crashtest = { version = "*", python = "^3.6" }' - ''; + pythonRelaxDeps = [ "crashtest" ]; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = - [ - pylev - pastel - ] - ++ lib.optionals (pythonAtLeast "3.6") [ crashtest ] - ++ lib.optionals isPy27 [ - typing - enum34 - ]; + dependencies = [ + crashtest + pastel + pylev + ]; nativeCheckInputs = [ pytest-mock @@ -61,8 +43,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "clikit" ]; meta = with lib; { - homepage = "https://github.com/sdispater/clikit"; description = "Group of utilities to build beautiful and testable command line interfaces"; + homepage = "https://github.com/sdispater/clikit"; + changelog = "https://github.com/sdispater/clikit/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; }; diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix index 3689a9d0dab4..133277a0a228 100644 --- a/pkgs/development/python-modules/cloudpathlib/default.nix +++ b/pkgs/development/python-modules/cloudpathlib/default.nix @@ -4,46 +4,46 @@ pythonOlder, fetchFromGitHub, flit-core, - importlib-metadata, typing-extensions, - cloudpathlib, azure-storage-blob, + azure-storage-file-datalake, google-cloud-storage, boto3, psutil, pydantic, - pytest7CheckHook, + pytestCheckHook, pytest-cases, - pytest-cov, + pytest-cov-stub, pytest-xdist, python-dotenv, shortuuid, + tenacity, }: buildPythonPackage rec { pname = "cloudpathlib"; - version = "0.18.1"; + version = "0.19.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "drivendataorg"; repo = "cloudpathlib"; rev = "refs/tags/v${version}"; - hash = "sha256-RrdRUqQ3QyMUpTi1FEsSXK6WS37r77SdPBH1oVVvSw0="; + hash = "sha256-VjoQc9nzwcMh9kiqWXsJNE5X7e7/sVGId5jgFTLZQy4="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ - importlib-metadata - typing-extensions - ]; + dependencies = lib.optional (pythonOlder "3.11") typing-extensions; - passthru.optional-dependencies = { - all = [ cloudpathlib ]; - azure = [ azure-storage-blob ]; + optional-dependencies = { + all = optional-dependencies.azure ++ optional-dependencies.gs ++ optional-dependencies.s3; + azure = [ + azure-storage-blob + azure-storage-file-datalake + ]; gs = [ google-cloud-storage ]; s3 = [ boto3 ]; }; @@ -51,18 +51,16 @@ buildPythonPackage rec { pythonImportsCheck = [ "cloudpathlib" ]; nativeCheckInputs = [ - azure-storage-blob - boto3 - google-cloud-storage psutil pydantic - pytest7CheckHook + pytestCheckHook pytest-cases - pytest-cov + pytest-cov-stub pytest-xdist python-dotenv shortuuid - ]; + tenacity + ] ++ optional-dependencies.all; meta = with lib; { description = "Python pathlib-style classes for cloud storage services such as Amazon S3, Azure Blob Storage, and Google Cloud Storage"; diff --git a/pkgs/development/python-modules/clr-loader/default.nix b/pkgs/development/python-modules/clr-loader/default.nix index 583cf34320e4..90006a6fe44e 100644 --- a/pkgs/development/python-modules/clr-loader/default.nix +++ b/pkgs/development/python-modules/clr-loader/default.nix @@ -36,9 +36,7 @@ buildPythonPackage { format = "pyproject"; - buildInputs = [ - dotnetCorePackages.sdk_6_0.packages - ] ++ dotnet-build.nugetDeps; + buildInputs = dotnetCorePackages.sdk_6_0.packages ++ dotnet-build.nugetDeps; nativeBuildInputs = [ setuptools diff --git a/pkgs/development/python-modules/cltk/default.nix b/pkgs/development/python-modules/cltk/default.nix new file mode 100644 index 000000000000..7635ace28648 --- /dev/null +++ b/pkgs/development/python-modules/cltk/default.nix @@ -0,0 +1,92 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + boltons, + gensim, + gitpython, + greek-accentuation, + nltk, + pyyaml, + rapidfuzz, + requests, + scikit-learn, + scipy, + spacy, + stanza, + stringcase, + torch, + tqdm, + + # tests + pytestCheckHook, +}: +buildPythonPackage rec { + pname = "cltk"; + version = "1.3.0"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "cltk"; + repo = "cltk"; + rev = "refs/tags/v${version}"; + hash = "sha256-/rdv96lnSGN+aJJmPSIan79zoXxnStokFEAjBtCLKy4="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "poetry>=1.1.13" poetry-core \ + --replace-fail "poetry.masonry.api" "poetry.core.masonry.api" \ + --replace-fail 'scipy = "<1.13.0"' 'scipy = "^1"' \ + --replace-fail 'boltons = "^21.0.0"' 'boltons = "^24.0.0"' + ''; + + build-system = [ poetry-core ]; + + pythonRelaxDeps = [ + "spacy" + ]; + + dependencies = [ + boltons + gensim + gitpython + greek-accentuation + nltk + pyyaml + rapidfuzz + requests + scikit-learn + scipy + spacy + stanza + stringcase + torch + tqdm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # Most of tests fail as they require local files to be present and also internet access + doCheck = false; + + meta = { + description = "Natural language processing (NLP) framework for pre-modern languages"; + homepage = "https://cltk.org"; + changelog = "https://github.com/cltk/cltk/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kmein ]; + }; +} diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index 9c166af7f550..f52f290be8d5 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Scalable Python framework for cluster administration"; homepage = "https://cea-hpc.github.io/clustershell"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index c78eda407871..75b2d0547909 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { '' sed -i "/--cov/d" setup.cfg '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Fake the impure dependencies pbpaste and pbcopy mkdir bin echo '#!${stdenv.shell}' > bin/pbpaste @@ -69,7 +69,7 @@ buildPythonPackage rec { export PATH=$(realpath bin):$PATH ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "cmd2" ]; diff --git a/pkgs/development/python-modules/cmdstanpy/default.nix b/pkgs/development/python-modules/cmdstanpy/default.nix index cb31be20a170..6fcf618bafef 100644 --- a/pkgs/development/python-modules/cmdstanpy/default.nix +++ b/pkgs/development/python-modules/cmdstanpy/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { stanio ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ xarray ]; }; @@ -59,7 +59,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.all; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all; disabledTestPaths = [ # No need to test these when using Nix @@ -77,7 +77,7 @@ buildPythonPackage rec { "test_pathfinder_threads" "test_save_profile" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_init_types" # CmdStan error: error during processing Operation not permitted ]; diff --git a/pkgs/development/python-modules/cmigemo/default.nix b/pkgs/development/python-modules/cmigemo/default.nix index 599f91f14106..9237631c0532 100644 --- a/pkgs/development/python-modules/cmigemo/default.nix +++ b/pkgs/development/python-modules/cmigemo/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "cmigemo" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/mooz/python-cmigemo"; description = "Pure python binding for C/Migemo"; license = licenses.mit; diff --git a/pkgs/development/python-modules/cmsdials/default.nix b/pkgs/development/python-modules/cmsdials/default.nix index eaf436af2eed..25788393515e 100644 --- a/pkgs/development/python-modules/cmsdials/default.nix +++ b/pkgs/development/python-modules/cmsdials/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "cmsdials"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "cms-DQM"; repo = "dials-py"; rev = "refs/tags/v${version}"; - hash = "sha256-tV802rz8V9zkjxOoGDXuYGD9FNWjdPb3Grp2khwxC9I="; + hash = "sha256-/5XgNPtjJgJEOaqvq7Z7XCXh2n+DbZqFbqnZddxxFpc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/pkgs/development/python-modules/cmsis-pack-manager/default.nix index 85ef05db3e52..c1ce182aa6c5 100644 --- a/pkgs/development/python-modules/cmsis-pack-manager/default.nix +++ b/pkgs/development/python-modules/cmsis-pack-manager/default.nix @@ -37,7 +37,9 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; propagatedNativeBuildInputs = [ cffi ]; - buildInputs = [ libiconv ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + buildInputs = [ + libiconv + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; propagatedBuildInputs = [ appdirs pyyaml diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index b477d447c562..b1dec7aab5de 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "cocotb"; - version = "1.8.1"; + version = "1.9.1"; format = "setuptools"; # pypi source doesn't include tests @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "cocotb"; repo = "cocotb"; rev = "refs/tags/v${version}"; - hash = "sha256-B7SePM8muEL3KFVOY7+OAgQVIRvTs6k29xASK9lgCB4="; + hash = "sha256-+pS+y9rmyJ4laDK5evAtoqr5D0GuHGaX6DpK1qtumnA="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix deleted file mode 100644 index 8bac2ebf313c..000000000000 --- a/pkgs/development/python-modules/codecov/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - buildPythonPackage, - coverage, - ddt, - fetchFromGitHub, - mock, - pytestCheckHook, - requests, -}: - -buildPythonPackage rec { - pname = "codecov"; - version = "2.1.13"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "codecov"; - repo = "codecov-python"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-cZEpAw8uv/XGiGzdBZ9MnabNaTP0did2GT+BkKMJM/E="; - }; - - propagatedBuildInputs = [ - requests - coverage - ]; - - nativeCheckInputs = [ - ddt - mock - pytestCheckHook - ]; - - pytestFlagsArray = [ "tests/test.py" ]; - - disabledTests = [ - # No git repo available and network - "test_bowerrc_none" - "test_prefix" - "test_send" - ]; - - pythonImportsCheck = [ "codecov" ]; - - meta = with lib; { - description = "Python report uploader for Codecov"; - mainProgram = "codecov"; - homepage = "https://codecov.io/"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index 91e270c7046d..9f148a4beabe 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -43,16 +42,14 @@ buildPythonPackage rec { pname = "coffea"; - version = "2024.8.3"; + version = "2024.10.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "CoffeaTeam"; repo = "coffea"; rev = "refs/tags/v${version}"; - hash = "sha256-aOe1U0IWQIgTJgUAs6WZWQmYnOTzdS+hRlK9QgU3qqk="; + hash = "sha256-n17L/IuJGjDdYhVxW7Q0Qgeg+Y+pz9GphUxpLY4vXDM="; }; build-system = [ diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 61bf159a4b5b..a7a7758656ae 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -7,7 +7,6 @@ poetry-core, # dependencies - boto3, fastavro, httpx, httpx-sse, @@ -22,20 +21,19 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.9.2"; + version = "5.11.3"; pyproject = true; src = fetchFromGitHub { owner = "cohere-ai"; repo = "cohere-python"; rev = "refs/tags/${version}"; - hash = "sha256-7vyaKrMpD1DPe8qptprsAK24kzAwSL4fu53uEqJ1VWE="; + hash = "sha256-0Y/zSw2pdrwsYpBctiV/tVf2xPhf3jG7c18frSjBass="; }; build-system = [ poetry-core ]; dependencies = [ - boto3 fastavro httpx httpx-sse diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index 26272d385cb7..cff80702d5fa 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.8.20.13"; + version = "2024.10.15.19"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-IBfHHAmT1BTgA6eMkZf8ggfiknNYp7mfELSRyFARWNk="; + hash = "sha256-TNpF8OihU0Z/mAUF/5hxpZgaqIBRUfX7zhwZAKd7OEo="; }; pythonRelaxDeps = [ "typer" ]; @@ -48,14 +48,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-mock - ] ++ passthru.optional-dependencies.pandas; + ] ++ optional-dependencies.pandas; pythonImportsCheck = [ "coinmetrics.api_client" ]; - passthru = { - optional-dependencies = { - pandas = [ pandas ]; - }; + optional-dependencies = { + pandas = [ pandas ]; }; meta = with lib; { diff --git a/pkgs/development/python-modules/colbert-ai/default.nix b/pkgs/development/python-modules/colbert-ai/default.nix new file mode 100644 index 000000000000..a7d707d38370 --- /dev/null +++ b/pkgs/development/python-modules/colbert-ai/default.nix @@ -0,0 +1,69 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + # build-system + setuptools, + + # dependencies + bitarray, + datasets, + flask, + python-dotenv, + ninja, + scipy, + tqdm, + transformers, + ujson, + gitpython, + torch, + faiss, +}: + +buildPythonPackage rec { + pname = "colbert-ai"; + version = "0.2.21"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "colbert_ai"; + hash = "sha256-qNb9tOInLysI7Tf45QlgchYNhBXR5AWFdRiYt35iW6s="; + }; + + pythonRemoveDeps = [ "git-python" ]; + + build-system = [ + setuptools + ]; + + dependencies = [ + bitarray + datasets + faiss + flask + gitpython + python-dotenv + ninja + scipy + torch + tqdm + transformers + ujson + ]; + + pythonImportsCheck = [ "colbert" ]; + + # There is no tests + doCheck = false; + + meta = { + description = "Fast and accurate retrieval model, enabling scalable BERT-based search over large text collections in tens of milliseconds"; + homepage = "https://github.com/stanford-futuredata/ColBERT"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + bachp + ]; + }; +} diff --git a/pkgs/development/python-modules/collidoscope/default.nix b/pkgs/development/python-modules/collidoscope/default.nix index a8bec5c5cdcd..2ad63e83c081 100644 --- a/pkgs/development/python-modules/collidoscope/default.nix +++ b/pkgs/development/python-modules/collidoscope/default.nix @@ -30,7 +30,6 @@ buildPythonPackage rec { uharfbuzz ]; - doCheck = true; nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix index 348d4080498d..182c5c370624 100644 --- a/pkgs/development/python-modules/coloredlogs/default.nix +++ b/pkgs/development/python-modules/coloredlogs/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { # capturer is broken on darwin / py38, so we skip the test until a fix for # https://github.com/xolox/python-capturer/issues/10 is released. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' # Required for the CLI test diff --git a/pkgs/development/python-modules/commandlines/default.nix b/pkgs/development/python-modules/commandlines/default.nix index b216858a584c..aa5da9c0d37f 100644 --- a/pkgs/development/python-modules/commandlines/default.nix +++ b/pkgs/development/python-modules/commandlines/default.nix @@ -18,7 +18,6 @@ buildPythonPackage rec { hash = "sha256-x3iUeOTAaTKNW5Y5foMPMJcWVxu52uYZoY3Hhe3UvQ4="; }; - doCheck = true; nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix index 17e10e8c0f42..039880f363dd 100644 --- a/pkgs/development/python-modules/commitizen/default.nix +++ b/pkgs/development/python-modules/commitizen/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "commitizen"; - version = "3.29.0"; + version = "3.30.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "commitizen-tools"; repo = "commitizen"; rev = "refs/tags/v${version}"; - hash = "sha256-7EQFip8r2Ey7Rbbwns1gvhsBOj7Hjm94NYhq8aANDIo="; + hash = "sha256-8ULIoFKrDAGHwz0EZzYJtl/4h6UVUECLUDbvTJbdD60="; }; pythonRelaxDeps = [ @@ -77,8 +77,6 @@ buildPythonPackage rec { pytest7CheckHook ]; - doCheck = true; - pythonImportsCheck = [ "commitizen" ]; # The tests require a functional git installation diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 359f1935f2fc..3e8c1eb0182e 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { "test_walk_can_walk_non_utf8_path_from_unicode_path" "test_resource_iter_can_walk_non_utf8_path_from_unicode_path_with_dirs" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # expected result is tailored towards the quirks of upstream's # CI environment on darwin "test_searchable_paths" diff --git a/pkgs/development/python-modules/compressai/default.nix b/pkgs/development/python-modules/compressai/default.nix index 4848df28167f..66fa915ebef6 100644 --- a/pkgs/development/python-modules/compressai/default.nix +++ b/pkgs/development/python-modules/compressai/default.nix @@ -1,54 +1,63 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, + + # build-system pybind11, setuptools, - wheel, + + # dependencies + einops, numpy, matplotlib, + pandas, pytorch-msssim, scipy, torch, + torch-geometric, torchvision, + + # optional-dependencies ipywidgets, jupyter, + + # tests plotly, pytestCheckHook, }: buildPythonPackage rec { pname = "compressai"; - version = "1.2.4"; + version = "1.2.6"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "InterDigitalInc"; repo = "CompressAI"; rev = "refs/tags/v${version}"; - hash = "sha256-nT2vd7t67agIWobJalORbRuns0UJGRGGbTX2/8vbTiY="; + hash = "sha256-xvzhhLn0iBzq3h1nro8/83QWEQe9K4zRa3RSZk+hy3Y="; fetchSubmodules = true; }; - nativeBuildInputs = [ + build-system = [ pybind11 setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ + einops numpy matplotlib + pandas pytorch-msssim scipy torch + torch-geometric torchvision ]; - passthru.optional-dependencies = { + optional-dependencies = { tutorials = [ ipywidgets jupyter @@ -81,10 +90,10 @@ buildPythonPackage rec { "test_pretrained" ]; - meta = with lib; { + meta = { description = "PyTorch library and evaluation platform for end-to-end compression research"; homepage = "https://github.com/InterDigitalInc/CompressAI"; - license = licenses.bsd3Clear; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.bsd3Clear; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/conda-inject/default.nix b/pkgs/development/python-modules/conda-inject/default.nix new file mode 100644 index 000000000000..78d57f748bb1 --- /dev/null +++ b/pkgs/development/python-modules/conda-inject/default.nix @@ -0,0 +1,47 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + pyyaml, +}: + +buildPythonPackage rec { + pname = "conda-inject"; + version = "1.3.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "koesterlab"; + repo = "conda-inject"; + rev = "refs/tags/v${version}"; + hash = "sha256-M4+bz7ZuHlcF8tF5kSCUjjkIHG75eCCW1IJxcwxNL6o="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + pyyaml + ]; + + pythonImportsCheck = [ + "conda_inject" + ]; + + # no tests + doCheck = false; + + meta = { + description = "Helper functions for injecting a conda environment into the current python environment"; + homepage = "https://github.com/koesterlab/conda-inject"; + changelog = "https://github.com/koesterlab/conda-inject/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/pkgs/development/python-modules/conda-libmamba-solver/default.nix index c2038f77e1bb..eb4a1515e026 100644 --- a/pkgs/development/python-modules/conda-libmamba-solver/default.nix +++ b/pkgs/development/python-modules/conda-libmamba-solver/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "conda-libmamba-solver"; - version = "24.7.0"; + version = "24.9.0"; pyproject = true; src = fetchFromGitHub { @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "conda"; repo = "conda-libmamba-solver"; rev = "refs/tags/${version}"; - hash = "sha256-HBbApS6hyIbRyxOpOwbC1+IalIYk17rYRo6HLcwKKW4="; + hash = "sha256-hHuuRMx9PQ3mMdxpSRTtg81xeq2XLmxhz1/gtnq54qg="; }; diff --git a/pkgs/development/python-modules/conda-package-handling/default.nix b/pkgs/development/python-modules/conda-package-handling/default.nix index 75ccc6039fff..2c5563d2ea1f 100644 --- a/pkgs/development/python-modules/conda-package-handling/default.nix +++ b/pkgs/development/python-modules/conda-package-handling/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { pname = "conda-package-handling"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "conda"; repo = "conda-package-handling"; rev = "refs/tags/${version}"; - hash = "sha256-Mo3qCNA/NtVtrsJmJ96ST6GMt2basSh5KlFBkrJ4pGE="; + hash = "sha256-AvuxHl3gUH7zIyMhZGeXqpMy0rJ99wj1/SrdTvlaX9A="; }; pyproject = true; diff --git a/pkgs/development/python-modules/conda-package-streaming/default.nix b/pkgs/development/python-modules/conda-package-streaming/default.nix index 462660cce15f..ef4b6f3fa9d2 100644 --- a/pkgs/development/python-modules/conda-package-streaming/default.nix +++ b/pkgs/development/python-modules/conda-package-streaming/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { pname = "conda-package-streaming"; - version = "0.10.0"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "conda"; repo = "conda-package-streaming"; rev = "refs/tags/v${version}"; - hash = "sha256-3TSjVISnUTReyKtt58RXCD30VodhiDDfJssM3PkP5Yk="; + hash = "sha256-Y0moewJROhybbyo263akbO20Q6As245ULKJikkWU4XE="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix index a02e75987d76..523110cf03ab 100644 --- a/pkgs/development/python-modules/conda/default.nix +++ b/pkgs/development/python-modules/conda/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - hostPlatform, + stdenv, fetchFromGitHub, # build dependencies hatchling, @@ -72,7 +72,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "conda" ]; # menuinst is currently not packaged - pythonRemoveDeps = lib.optionals (!hostPlatform.isWindows) [ "menuinst" ]; + pythonRemoveDeps = lib.optionals (!stdenv.hostPlatform.isWindows) [ "menuinst" ]; meta = { description = "OS-agnostic, system-level binary package manager"; diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 59f89df05231..9a1cdb8798d4 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { hash = "sha256-m77MY0IZ1AJkd4/Y7ltApvdF9y17Lgn92WZPYTCU9tA="; }; - passthru.optional-dependencies = { + optional-dependencies = { yaml = [ pyyaml ]; }; nativeCheckInputs = [ pytestCheckHook mock - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "configargparse" ]; diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix index 02228f5f2fc0..ecc629fe13a4 100644 --- a/pkgs/development/python-modules/configobj/default.nix +++ b/pkgs/development/python-modules/configobj/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "configobj"; - version = "5.0.8"; + version = "5.0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "DiffSK"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-t3Q0FEBibkAM5PAG4fjXwNH/71RqSSDj/Mn27ri0iDU="; + hash = "sha256-duPCGBaHCXp4A6ZHLnyL1SZtR7K4FJ4hs5wCE1V9WB4="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index d078fceee371..00f6079d4b3c 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "configparser"; - version = "7.0.0"; + version = "7.1.0"; pyproject = true; src = fetchFromGitHub { owner = "jaraco"; repo = "configparser"; rev = "refs/tags/v${version}"; - hash = "sha256-OqlmAmBt4x+cJtK89dxsU7+Vn9wmGR9Djc59/ewHSxs="; + hash = "sha256-6B1I/kS60opMDpCzy2tnlnV65Qo500G0zPHP1I5TDWA="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; preConfigure = '' - export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 + export LC_ALL=${if stdenv.hostPlatform.isDarwin then "en_US" else "C"}.UTF-8 ''; meta = with lib; { diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 95cf2c7bf0b6..ecdcd5759349 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -13,12 +13,13 @@ rdkafka, requests, requests-mock, + setuptools, }: buildPythonPackage rec { pname = "confluent-kafka"; - version = "2.4.0"; - format = "setuptools"; + version = "2.5.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,30 +27,36 @@ buildPythonPackage rec { owner = "confluentinc"; repo = "confluent-kafka-python"; rev = "refs/tags/v${version}"; - hash = "sha256-JlPWh46WjY4GHRKtamB+qigVvVzvbRagbigyCol6lfg="; + hash = "sha256-b9RTz4wUtDzGkoeB0cp5vbZEBk8jSw2JiXEx6tUuPVw="; }; buildInputs = [ rdkafka ]; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { avro = [ avro fastavro + requests ]; json = [ jsonschema pyrsistent + requests ]; - protobuf = [ protobuf ]; + protobuf = [ + protobuf + requests + ]; + schema-registry = [ requests ]; }; nativeCheckInputs = [ pyflakes pytestCheckHook requests-mock - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "confluent_kafka" ]; diff --git a/pkgs/development/python-modules/confusable-homoglyphs/default.nix b/pkgs/development/python-modules/confusable-homoglyphs/default.nix new file mode 100644 index 000000000000..109bf574c11e --- /dev/null +++ b/pkgs/development/python-modules/confusable-homoglyphs/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pytestCheckHook, + pythonOlder, + setuptools, + click, +}: + +let + libName = "confusable-homoglyphs"; + snakeLibName = builtins.replaceStrings [ "-" ] [ "_" ] libName; +in +buildPythonPackage rec { + pname = libName; + version = "3.3.1"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = snakeLibName; + hash = "sha256-uZUAHJsuG0zqDPXzhAp8eRiKjLutBT1pNXK9jBwexGA="; + }; + + build-system = [ setuptools ]; + + disabled = pythonOlder "3.7"; + + optional-dependencies = { + cli = [ click ]; + }; + + pythonImportsCheck = [ snakeLibName ]; + + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.cli; + + disabledTests = [ + "test_generate_categories" # touches network + "test_generate_confusables" # touches network + ]; + + meta = + let + inherit (lib) licenses maintainers; + in + { + description = "Detect confusable usage of unicode homoglyphs, prevent homograph attacks"; + homepage = "https://sr.ht/~valhalla/confusable_homoglyphs/"; + changelog = "https://confusable-homoglyphs.readthedocs.io/en/latest/history.html"; + license = licenses.mit; + maintainers = with maintainers; [ ajaxbits ]; + }; +} diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 0e599c2945c3..bd19ae31caa2 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -37,18 +37,18 @@ buildPythonPackage rec { version = "3.1.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "spec-first"; - repo = pname; + repo = "connexion"; rev = "refs/tags/${version}"; hash = "sha256-rngQDU9kXw/Z+Al0SCVnWN8xnphueTtZ0+xPBR5MbEM="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ asgiref httpx inflection @@ -62,7 +62,7 @@ buildPythonPackage rec { werkzeug ]; - passthru.optional-dependencies = { + optional-dependencies = { flask = [ a2wsgi flask @@ -75,11 +75,15 @@ buildPythonPackage rec { pytest-aiohttp pytestCheckHook testfixtures - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "connexion" ]; disabledTests = [ + "test_build_example" + "test_mock_resolver_no_example" + # Tests require network access + "test_remote_api" # AssertionError "test_headers" # waiter.acquire() deadlock @@ -91,9 +95,10 @@ buildPythonPackage rec { meta = with lib; { description = "Swagger/OpenAPI First framework on top of Flask"; - mainProgram = "connexion"; homepage = "https://github.com/spec-first/connexion"; changelog = "https://github.com/spec-first/connexion/releases/tag/${version}"; license = licenses.asl20; + maintainers = [ ]; + mainProgram = "connexion"; }; } diff --git a/pkgs/development/python-modules/consolekit/default.nix b/pkgs/development/python-modules/consolekit/default.nix index 45f3caf7d22a..cd1a76e840a6 100644 --- a/pkgs/development/python-modules/consolekit/default.nix +++ b/pkgs/development/python-modules/consolekit/default.nix @@ -12,12 +12,12 @@ }: buildPythonPackage rec { pname = "consolekit"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Dqi84qeUGirw4z1ay3burLeHESeNK2DDPtPnpJzD/Qw=A"; + hash = "sha256-TU5sufqJ0znCD/QOidrT7jB1NCXJ1p8Z7FPFNPp97qg="; }; build-system = [ flit-core ]; @@ -31,8 +31,6 @@ buildPythonPackage rec { typing-extensions ]; - nativeCheckInputs = [ ]; - meta = { description = "Additional utilities for click."; homepage = "https://pypi.org/project/consolekit"; diff --git a/pkgs/development/python-modules/consonance/default.nix b/pkgs/development/python-modules/consonance/default.nix index dca06fcf55d6..c19fb148e56b 100644 --- a/pkgs/development/python-modules/consonance/default.nix +++ b/pkgs/development/python-modules/consonance/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, + setuptools, dissononce, python-axolotl-curve25519, transitions, @@ -14,14 +15,14 @@ buildPythonPackage rec { pname = "consonance"; version = "0.1.5"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tgalal"; repo = "consonance"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-BhgxLxjKZ4dSL7DqkaoS+wBPCd1SYZomRKrtDLdGmYQ="; }; @@ -34,7 +35,15 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + env = { + # make protobuf compatible with old versions + # https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates + PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + }; + + build-system = [ setuptools ]; + + dependencies = [ dissononce python-axolotl-curve25519 transitions @@ -47,10 +56,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "consonance" ]; - meta = with lib; { + meta = { description = "WhatsApp's handshake implementation using Noise Protocol"; homepage = "https://github.com/tgalal/consonance"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index 729d6df5644d..b0fdf8d7c326 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { lz4 ]; - passthru.optional-dependencies = { + optional-dependencies = { extras = [ arrow cloudpickle @@ -47,11 +47,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "construct" ]; - disabledTests = [ "test_benchmarks" ] ++ lib.optionals stdenv.isDarwin [ "test_multiprocessing" ]; + disabledTests = [ + "test_benchmarks" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_multiprocessing" ]; meta = with lib; { description = "Powerful declarative parser (and builder) for binary data"; diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix index b72e9a2ec99e..01edc594a594 100644 --- a/pkgs/development/python-modules/contextlib2/default.nix +++ b/pkgs/development/python-modules/contextlib2/default.nix @@ -1,34 +1,36 @@ { lib, buildPythonPackage, - fetchPypi, - pythonAtLeast, + fetchFromGitHub, + setuptools, pythonOlder, unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "contextlib2"; - version = "21.6.0"; - format = "setuptools"; + version = "21.6.0-unstable-2024-05-23"; + pyproject = true; - # Python 3.11 not currently supported - # https://github.com/jazzband/contextlib2/issues/43 - disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-qx4r/h0B2Wjht+jZAjvFHvNQm7ohe7cwzuOCfh7oKGk="; + src = fetchFromGitHub { + owner = "jazzband"; + repo = "contextlib2"; + rev = "f64cf04df8a1f6a32ce2095192b4638d229ff25e"; + hash = "sha256-HX9N8G8jl6cpEwdJ80pDcoo4osTO/f8fz5sNcY/R1Nk="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "contextlib2" ]; - meta = with lib; { + meta = { description = "Backports and enhancements for the contextlib module"; homepage = "https://contextlib2.readthedocs.org/"; - license = licenses.psfl; - maintainers = [ ]; + license = lib.licenses.psfl; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix index 4d668412f674..de2f96a8a93d 100644 --- a/pkgs/development/python-modules/contourpy/default.nix +++ b/pkgs/development/python-modules/contourpy/default.nix @@ -27,7 +27,7 @@ let contourpy = buildPythonPackage rec { pname = "contourpy"; - version = "1.2.1"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -36,17 +36,18 @@ let owner = "contourpy"; repo = "contourpy"; rev = "refs/tags/v${version}"; - hash = "sha256-Qd6FC7SgFyC/BvOPWVkr2ZfKVMVAknLlidNRq3zcWU0="; + hash = "sha256-QvAIV2Y8H3oPZCF5yaqy2KWfs7aMyRX6aAU5t8E9Vpo="; }; nativeBuildInputs = [ meson - meson-python ninja pybind11 ]; - propagatedBuildInputs = [ numpy ]; + build-system = [ meson-python ]; + + dependencies = [ numpy ]; passthru.optional-depdendencies = { bokeh = [ diff --git a/pkgs/development/python-modules/corner/default.nix b/pkgs/development/python-modules/corner/default.nix index 68446453e200..50ab12a81f9a 100644 --- a/pkgs/development/python-modules/corner/default.nix +++ b/pkgs/development/python-modules/corner/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { dependencies = [ matplotlib ]; - passthru.optional-dependencies = { + optional-dependencies = { arviz = [ arviz ]; docs = [ arviz @@ -66,7 +66,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "corner" ]; - nativeCheckInputs = [ pytestCheckHook ] ++ corner.passthru.optional-dependencies.test; + nativeCheckInputs = [ pytestCheckHook ] ++ corner.optional-dependencies.test; # matplotlib.testing.exceptions.ImageComparisonFailure: images not close disabledTests = [ @@ -79,13 +79,18 @@ buildPythonPackage rec { "test_extended_overplotting" "test_hist_bin_factor" "test_labels" + "test_levels2" "test_lowNfilled" "test_no_fill_contours" + "test_overplot" "test_overplot_log" "test_pandas" "test_quantiles" "test_range_fig_arg" + "test_reverse" "test_reverse_overplotting" + "test_reverse_truths" + "test_smooth1" "test_tight" "test_title_quantiles" "test_title_quantiles_default" diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix index ac144b26450b..fb3a138627ad 100644 --- a/pkgs/development/python-modules/cot/default.nix +++ b/pkgs/development/python-modules/cot/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { "test_serial_fixup_stubbed" "test_serial_fixup_stubbed_create" "test_serial_fixup_stubbed_vm_not_found" - ] ++ lib.optionals stdenv.isDarwin [ "test_serial_fixup_invalid_host" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_serial_fixup_invalid_host" ]; pythonImportsCheck = [ "COT" ]; diff --git a/pkgs/development/python-modules/courlan/default.nix b/pkgs/development/python-modules/courlan/default.nix index 3941911ac620..8037c9c1085a 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.3.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-OGjziBIvKwnRVIAgQ/6S39YsPqenAOquirwFGYz4vCU="; + hash = "sha256-EIWKtoZHCjsdh0jXuIGZYHyU5066PIredZukqVdtNm4="; }; # Tests try to write to /tmp directly. use $TMPDIR instead. diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 7e366cf49725..f708ae1dcea5 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "coverage"; - version = "7.5.3"; + version = "7.6.1"; pyproject = true; # uses f strings @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-BK78pRkNHcelOkwaWn+FaIETBteo7iMcQvtpIVVxlE8="; + hash = "sha256-lTUQ37exKradIBNaBmI5fwd8WbHmN5p2jpfFnYUu5R0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/cpe/default.nix b/pkgs/development/python-modules/cpe/default.nix index 5aa48feea09d..a608f7717b88 100644 --- a/pkgs/development/python-modules/cpe/default.nix +++ b/pkgs/development/python-modules/cpe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "cpe"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "nilp0inter"; repo = "cpe"; rev = "refs/tags/v${version}"; - hash = "sha256-nHFgsFNoDf1VJI7XOe62NOuL67AZCP/LFsymt7Q8L2U="; + hash = "sha256-QI5XHy2TDSUqK6BZBoFWViBcOKfo+zg0ulzEzF4eg4w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cpyparsing/default.nix b/pkgs/development/python-modules/cpyparsing/default.nix index aa83e9a434d0..96fe9a569abc 100644 --- a/pkgs/development/python-modules/cpyparsing/default.nix +++ b/pkgs/development/python-modules/cpyparsing/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "cpyparsing"; - version = "2.4.7.2.4.0"; + version = "2.4.7.2.4.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7j0vJicSrSUqZAExaH0bJZhRJ6XZui4SAPMBcWXy7n0="; + hash = "sha256-2RfwGnSz/GFPk565n8MooIybHeWAlWYMDylZd0S/HTA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index 04c488586c9e..d51a12f46cb9 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -10,12 +10,13 @@ fetchFromGitHub, git, hypothesis, + license-expression, nix-update-script, - pydantic-yaml, pyfakefs, pygit2, pytest-check, pytest-mock, + pytest-subprocess, pytestCheckHook, pythonOlder, pyyaml, @@ -26,7 +27,7 @@ buildPythonPackage rec { pname = "craft-application"; - version = "3.2.0"; + version = "4.2.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -35,12 +36,12 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-application"; rev = "refs/tags/${version}"; - hash = "sha256-2JfCe7FJtuObC/4miA+OC/ctGy1fhdgI7DsowNYjQk8="; + hash = "sha256-Y/Eci0ByE1HxUcxWhpQq0F2Ef1xkXZMBDGmUSIyPKII="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools==70.1.0" "setuptools" + --replace-fail "setuptools==74.1.1" "setuptools" ''; build-system = [ setuptools-scm ]; @@ -56,7 +57,7 @@ buildPythonPackage rec { craft-grammar craft-parts craft-providers - pydantic-yaml + license-expression pygit2 pyyaml snap-helpers @@ -68,6 +69,7 @@ buildPythonPackage rec { pyfakefs pytest-check pytest-mock + pytest-subprocess pytestCheckHook responses ]; @@ -96,7 +98,7 @@ buildPythonPackage rec { # Tests expecting pytest-time "test_monitor_builds_success" ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # These tests have hardcoded "amd64" strings which fail on aarch64 "test_process_grammar_build_for" "test_process_grammar_platform" diff --git a/pkgs/development/python-modules/craft-archives/default.nix b/pkgs/development/python-modules/craft-archives/default.nix index 6369acc78208..f401b5fb5294 100644 --- a/pkgs/development/python-modules/craft-archives/default.nix +++ b/pkgs/development/python-modules/craft-archives/default.nix @@ -6,7 +6,7 @@ launchpadlib, lazr-restfulclient, overrides, - pydantic_1, + pydantic, setuptools, setuptools-scm, tabulate, @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "craft-archives"; - version = "1.2.0"; + version = "2.0.0"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-archives"; rev = "refs/tags/${version}"; - hash = "sha256-4BYRwuBDKFbVvK805e+L4ZR8wtS8GHHYteexH4YZmSE="; + hash = "sha256-BrKyOdfbwt9qU5Bt/kX/+GgxH7LCFmmFg4mevBWVp2I="; }; postPatch = '' @@ -36,16 +36,13 @@ buildPythonPackage rec { --replace-fail "setuptools==67.7.2" "setuptools" ''; - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ launchpadlib lazr-restfulclient overrides - pydantic_1 + pydantic tabulate ]; diff --git a/pkgs/development/python-modules/craft-grammar/default.nix b/pkgs/development/python-modules/craft-grammar/default.nix index 6b920aaa7a4a..1aeb3c32e10e 100644 --- a/pkgs/development/python-modules/craft-grammar/default.nix +++ b/pkgs/development/python-modules/craft-grammar/default.nix @@ -4,15 +4,15 @@ fetchFromGitHub, nix-update-script, overrides, - setuptools, + setuptools-scm, pytestCheckHook, - pydantic_1, + pydantic, pyyaml, }: buildPythonPackage rec { pname = "craft-grammar"; - version = "1.2.0"; + version = "2.0.1"; pyproject = true; @@ -20,17 +20,17 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-grammar"; rev = "refs/tags/${version}"; - hash = "sha256-YQpxgdmUxYLkhAXDLlkLAK6VpjIEycLFY3nsE/M4o2g="; + hash = "sha256-xex+7rCXqRegnws470VtVltM49fx7fSHzWDZawRmOdM="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ overrides ]; + dependencies = [ overrides ]; pythonImportsCheck = [ "craft_grammar" ]; nativeCheckInputs = [ - pydantic_1 + pydantic pytestCheckHook pyyaml ]; diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix index 2ad66a7d4a75..f7dc9635df4e 100644 --- a/pkgs/development/python-modules/craft-parts/default.nix +++ b/pkgs/development/python-modules/craft-parts/default.nix @@ -4,8 +4,7 @@ fetchFromGitHub, nix-update-script, overrides, - pydantic_1, - pydantic-yaml, + pydantic, pyxdg, pyyaml, requests, @@ -17,6 +16,7 @@ pytest-subprocess, requests-mock, hypothesis, + jsonschema, git, squashfsTools, setuptools-scm, @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "craft-parts"; - version = "1.33.0"; + version = "2.1.2"; pyproject = true; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-parts"; rev = "refs/tags/${version}"; - hash = "sha256-SP2mkaXsU0btnA3aanSA18GkdW6ReLgImOWdpnwZiyU="; + hash = "sha256-QSD43rTy0GsGoUymhoBv1gdS6TMoln5PNsmeycKnXnw="; }; patches = [ ./bash-path.patch ]; @@ -43,12 +43,12 @@ buildPythonPackage rec { pythonRelaxDeps = [ "requests" "urllib3" + "pydantic" ]; dependencies = [ overrides - pydantic_1 - pydantic-yaml + pydantic pyxdg pyyaml requests @@ -61,6 +61,7 @@ buildPythonPackage rec { nativeCheckInputs = [ git hypothesis + jsonschema pytest-check pytest-mock pytest-subprocess @@ -96,7 +97,7 @@ buildPythonPackage rec { "tests/unit/packages/test_deb.py" "tests/unit/packages/test_chisel.py" ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # These tests have hardcoded "amd64" strings which fail on aarch64 "tests/unit/executor/test_environment.py" "tests/unit/features/overlay/test_executor_environment.py" @@ -105,7 +106,6 @@ 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 index f183449961d3..8b5e5cc5b0f9 100644 --- a/pkgs/development/python-modules/craft-platforms/default.nix +++ b/pkgs/development/python-modules/craft-platforms/default.nix @@ -5,16 +5,16 @@ distro, fetchFromGitHub, nix-update-script, + hypothesis, pytest-check, pytestCheckHook, pythonOlder, - setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "craft-platforms"; - version = "0.2.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,17 +23,14 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-platforms"; rev = "refs/tags/${version}"; - hash = "sha256-chCPuncy+//Y5iohTh0d8qRNaEno6Sqze2Zoas3uwPQ="; + hash = "sha256-MzHjnOvsloT1Vf5NjI5jyFBvCo3v5ovvpWuwOJ/O/0A="; }; postPatch = '' substituteInPlace craft_platforms/__init__.py --replace-fail "dev" "${version}" ''; - build-system = [ - setuptools - setuptools-scm - ]; + build-system = [ setuptools-scm ]; dependencies = [ annotated-types @@ -41,6 +38,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + hypothesis pytestCheckHook pytest-check ]; diff --git a/pkgs/development/python-modules/craft-providers/default.nix b/pkgs/development/python-modules/craft-providers/default.nix index 8b91b0005ed5..7dcf2fff8b52 100644 --- a/pkgs/development/python-modules/craft-providers/default.nix +++ b/pkgs/development/python-modules/craft-providers/default.nix @@ -5,10 +5,9 @@ nix-update-script, packaging, platformdirs, - pydantic_1, + pydantic, pyyaml, requests-unixsocket, - setuptools, setuptools-scm, urllib3, pytest-check, @@ -22,7 +21,7 @@ buildPythonPackage rec { pname = "craft-providers"; - version = "1.24.2"; + version = "2.0.3"; pyproject = true; @@ -30,7 +29,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-providers"; rev = "refs/tags/${version}"; - hash = "sha256-2629Xk2KB1WX3JzAupBWmKg+Ztp5FFJ0x9Xa/w+8tns="; + hash = "sha256-DTUXT5vFIDI06oxka3diWJ5E5oqiX6GXB4ivq6+VrDk="; }; patches = [ @@ -52,21 +51,18 @@ buildPythonPackage rec { # The urllib3 incompat: https://github.com/msabramo/requests-unixsocket/pull/69 # This is already patched in nixpkgs. substituteInPlace pyproject.toml \ - --replace-fail "setuptools==" "setuptools>=" \ + --replace-fail "setuptools==73.0.1" "setuptools" \ --replace-fail "urllib3<2" "urllib3" ''; pythonRelaxDeps = [ "requests" ]; - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ packaging platformdirs - pydantic_1 + pydantic pyyaml requests-unixsocket urllib3 diff --git a/pkgs/development/python-modules/craft-store/default.nix b/pkgs/development/python-modules/craft-store/default.nix index 4011b01d60d0..f9f8f73e8eb0 100644 --- a/pkgs/development/python-modules/craft-store/default.nix +++ b/pkgs/development/python-modules/craft-store/default.nix @@ -7,7 +7,7 @@ setuptools-scm, pytest-check, pytest-mock, - pydantic_1, + pydantic, pyyaml, pytestCheckHook, keyring_24, @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "craft-store"; - version = "2.6.2"; + version = "3.0.2"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-store"; rev = "refs/tags/${version}"; - hash = "sha256-QKfXOgAWMV1mVm32ZP3HQTJmWKm82dEDmy3fo5d67TU="; + hash = "sha256-l8WnuaMJN4/nZRkWoU6omgbd4hKR2m7YC+YVcvAqzcA="; }; postPatch = '' @@ -36,16 +36,13 @@ buildPythonPackage rec { --replace-fail "setuptools==" "setuptools>=" ''; - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ keyring_24 macaroonbakery overrides - pydantic_1 + pydantic pyxdg requests requests-toolbelt @@ -56,7 +53,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "craft_store" ]; nativeCheckInputs = [ - pydantic_1 + pydantic pytest-check pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/cram/default.nix b/pkgs/development/python-modules/cram/default.nix index 13ed15f5246d..1f92211953ca 100644 --- a/pkgs/development/python-modules/cram/default.nix +++ b/pkgs/development/python-modules/cram/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ jluttine ]; # Tests fail on i686: https://hydra.nixos.org/build/52896671/nixlog/4 - broken = stdenv.isi686; + broken = stdenv.hostPlatform.isi686; }; } diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix index e61e75da117f..34571f05f774 100644 --- a/pkgs/development/python-modules/cramjam/default.nix +++ b/pkgs/development/python-modules/cramjam/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; nativeCheckInputs = [ hypothesis diff --git a/pkgs/development/python-modules/crcelk/default.nix b/pkgs/development/python-modules/crcelk/default.nix new file mode 100644 index 000000000000..f082899cfe03 --- /dev/null +++ b/pkgs/development/python-modules/crcelk/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "crcelk"; + version = "1.3"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "zeroSteiner"; + repo = "crcelk"; + rev = "refs/tags/v${version}"; + hash = "sha256-eJt0qcG0ejTQJyjOSi6Au2jH801KOMnk7f6cLbd7ADw="; + }; + + build-system = [ setuptools ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "crcelk" ]; + + meta = { + description = "Implementation of the CRC algorithm"; + homepage = "https://github.com/zeroSteiner/crcelk"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/cron-descriptor/default.nix b/pkgs/development/python-modules/cron-descriptor/default.nix index f15b250c6b53..27d8dabd7af0 100644 --- a/pkgs/development/python-modules/cron-descriptor/default.nix +++ b/pkgs/development/python-modules/cron-descriptor/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cron-descriptor"; - version = "1.4.4"; + version = "1.4.5"; pyproject = true; src = fetchFromGitHub { owner = "Salamek"; repo = "cron-descriptor"; rev = "refs/tags/${version}"; - hash = "sha256-NKAfNwIRnND4ume27CSPJoib9DysbpdD905SNP+wx0A="; + hash = "sha256-ElYma6RH2u1faIgOvGpMQA26dSIibWcO4mWU6NAA5PQ="; }; # remove tests_require, as we don't do linting anyways diff --git a/pkgs/development/python-modules/cronsim/default.nix b/pkgs/development/python-modules/cronsim/default.nix index 2ecb45c3a73a..f924a13dc253 100644 --- a/pkgs/development/python-modules/cronsim/default.nix +++ b/pkgs/development/python-modules/cronsim/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cronsim"; - version = "2.5"; + version = "2.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "cuu508"; repo = "cronsim"; rev = "refs/tags/${version}"; - hash = "sha256-TSVFkMCMmrMXaPJPPNjIML+z98i1iIYuKH7hHiZnJkg="; + hash = "sha256-WJ3v2cqAKZkXp1u8xJ0aFuyHPq0gn24DRxpnq5cH/90="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cryptg/default.nix b/pkgs/development/python-modules/cryptg/default.nix index 43e5ac7e6163..73d5258efbe3 100644 --- a/pkgs/development/python-modules/cryptg/default.nix +++ b/pkgs/development/python-modules/cryptg/default.nix @@ -7,14 +7,15 @@ cargo, rustPlatform, rustc, + setuptools, setuptools-rust, libiconv, }: buildPythonPackage rec { pname = "cryptg"; - version = "0.4"; - format = "setuptools"; + version = "0.5.post0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,28 +23,36 @@ buildPythonPackage rec { owner = "cher-nov"; repo = pname; rev = "v${version}"; - hash = "sha256-2HP1mKGPr8wOL5B0APJks3EVBicX2iMFI7vLJGTa1PM="; + hash = "sha256-GCTVxCJQvpvHpzaU+OaFM/AKoRvxLyA0u6VIV+94UTY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-AqSVFOB9Lfvk9h3GtoYlEOXBEt7YZYLhCDNKM9upQ2U="; + hash = "sha256-BqtswBTurZoKw7DR3S7woDKLqAqIjKdSS5TBwCI+Bps="; }; - nativeBuildInputs = [ + build-system = [ + setuptools setuptools-rust + ]; + + nativeBuildInputs = [ rustPlatform.cargoSetupHook rustc cargo ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # has no tests doCheck = false; pythonImportsCheck = [ "cryptg" ]; + postPatch = '' + substituteInPlace pyproject.toml --replace-fail "setuptools[core]" "setuptools" + ''; + meta = with lib; { description = "Official Telethon extension to provide much faster cryptography for Telegram API requests"; homepage = "https://github.com/cher-nov/cryptg"; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 29076051578e..63f6bf2850e7 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -24,21 +24,21 @@ buildPythonPackage rec { pname = "cryptography"; - version = "43.0.0"; # Also update the hash in vectors.nix + version = "43.0.1"; # Also update the hash in vectors.nix pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uIB1raLVGqnxgoNTLJ9g5yFwBBu6iNfzfknLsQJ1KZ4="; + hash = "sha256-ID6Sp1cW2M+0kdxHx54X0NkgfM/8vLNfWY++RjrjRE0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-TEQy8PrIaZshiBFTqR/OJp3e/bVM1USjcmpDYcjPJPM="; + hash = "sha256-wiAHM0ucR1X7GunZX8V0Jk2Hsi+dVdGgDKqcYjSdD7Q="; }; postPatch = '' @@ -57,7 +57,7 @@ buildPythonPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ] diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index d0f635df8b9e..4f296b036265 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-XJ0JpzLVQzzt4VQqluzXCoDhIq8EfudAS83x88y45wI="; + hash = "sha256-aKD8GP4nswnpM6KTpU8zVreKFMFSB+lsn/hWga8FCd4="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/css-inline/default.nix b/pkgs/development/python-modules/css-inline/default.nix index b9faf71842b6..a108599eb6ba 100644 --- a/pkgs/development/python-modules/css-inline/default.nix +++ b/pkgs/development/python-modules/css-inline/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security SystemConfiguration @@ -70,7 +70,7 @@ buildPythonPackage rec { "test_cache" "test_remote_stylesheet" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # pyo3_runtime.PanicException: event loop thread panicked "test_invalid_href" ]; diff --git a/pkgs/development/python-modules/csv2md/default.nix b/pkgs/development/python-modules/csv2md/default.nix index 43d3c816aa95..a8d62dd33fcf 100644 --- a/pkgs/development/python-modules/csv2md/default.nix +++ b/pkgs/development/python-modules/csv2md/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "csv2md"; - version = "1.3.0"; + version = "1.4.0"; format = "setuptools"; src = fetchFromGitHub { owner = "lzakharov"; repo = "csv2md"; rev = "v${version}"; - hash = "sha256-INwZRbyJmyDd5SV7PBdqUc/3FO91upTgaxBfP/Giaw4="; + hash = "sha256-CzURejGIxsD7IBSbAYXz0kj5oX47e+uN13fqd56CM1A="; }; pythonImportsCheck = [ "csv2md" ]; diff --git a/pkgs/development/python-modules/ctap-keyring-device/default.nix b/pkgs/development/python-modules/ctap-keyring-device/default.nix index 07cf1b616027..ce81bfa36bca 100644 --- a/pkgs/development/python-modules/ctap-keyring-device/default.nix +++ b/pkgs/development/python-modules/ctap-keyring-device/default.nix @@ -4,28 +4,40 @@ fetchPypi, setuptools-scm, # install requirements + six, fido2, keyring, cryptography, # test requirements pytestCheckHook, + unittestCheckHook, + mock, }: let fido2_0 = fido2.overridePythonAttrs (oldAttrs: rec { version = "0.9.3"; - format = "setuptools"; src = fetchPypi { inherit (oldAttrs) pname; inherit version; hash = "sha256-tF6JphCc/Lfxu1E3dqotZAjpXEgi+DolORi5RAg0Zuw="; }; + postPatch = '' + substituteInPlace setup.py test/test_attestation.py \ + --replace-fail "distutils.version" "setuptools._distutils.version" + ''; + build-system = [ setuptools-scm ]; + dependencies = oldAttrs.dependencies ++ [ six ]; + nativeCheckInputs = [ + unittestCheckHook + mock + ]; }); in buildPythonPackage rec { pname = "ctap-keyring-device"; version = "1.0.6"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit version pname; @@ -38,16 +50,14 @@ buildPythonPackage rec { --replace "--flake8 --black --cov" "" ''; - nativeBuildInputs = [ - setuptools-scm - ]; - pythonRemoveDeps = [ # This is a darwin requirement missing pyobjc "pyobjc-framework-LocalAuthentication" ]; - propagatedBuildInputs = [ + build-system = [ setuptools-scm ]; + + dependencies = [ keyring fido2_0 cryptography @@ -55,7 +65,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ctap_keyring_device" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # Disabled tests that needs pyobjc or windows diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 8435c1e988dd..e0f3e8311db1 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -42,7 +42,7 @@ let in buildPythonPackage rec { pname = "cupy"; - version = "13.2.0"; + version = "13.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -50,8 +50,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cupy"; repo = "cupy"; - rev = "v13.2.0"; - hash = "sha256-vZAtpIZztmsYeJeuq7yl7kgZse2azrIM3efHDmUswJI="; + rev = "refs/tags/v${version}"; + hash = "sha256-eQZwOGCaWZ4b0JCHZlrPHVQVXQwSkibHb02j0czAMt8="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix index 087d85405e26..434af5cb974a 100644 --- a/pkgs/development/python-modules/curio/default.nix +++ b/pkgs/development/python-modules/curio/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { "test_unix_echo" # socket bind error on hydra when built with other packages "test_unix_ssl_server" # socket bind error on hydra when built with other packages ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # connects to python.org:1, expects an OsError, hangs in the darwin sandbox "test_create_bad_connection" ]; diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix index 28f8eb2da729..38a11e353d74 100644 --- a/pkgs/development/python-modules/curl-cffi/default.nix +++ b/pkgs/development/python-modules/curl-cffi/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, buildPythonPackage, fetchFromGitHub, @@ -6,31 +7,39 @@ curl-impersonate-chrome, cffi, certifi, + typing-extensions, }: buildPythonPackage rec { pname = "curl-cffi"; - version = "0.7.1"; + version = "0.7.2"; + pyproject = true; src = fetchFromGitHub { - owner = "yifeikong"; + owner = "lexiforest"; repo = "curl_cffi"; rev = "refs/tags/v${version}"; - hash = "sha256-fVmZ5DKgkjnO1CPYVSa9qei26B0mXqZMtVGhtNGfEpY="; + hash = "sha256-s8P/7erdAeGZuykUrgpCcm0a4ym3Y8F6kKFXoDXsOdQ="; }; patches = [ ./use-system-libs.patch ]; buildInputs = [ curl-impersonate-chrome ]; - format = "pyproject"; - build-system = [ setuptools ]; + build-system = [ + cffi + setuptools + ]; - nativeBuildInputs = [ cffi ]; - propagatedBuildInputs = [ + dependencies = [ cffi certifi + typing-extensions ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + pythonImportsCheck = [ "curl_cffi" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index b2467a02e09b..7be20c559019 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { changelog = "https://github.com/bpython/curtsies/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ flokli ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/cvelib/default.nix b/pkgs/development/python-modules/cvelib/default.nix index 121a9d166c9c..b55279325b17 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.5.0"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "RedHatProductSecurity"; repo = "cvelib"; rev = "refs/tags/${version}"; - hash = "sha256-me61A1SyktPTd9u0t51kF4237/t9wiHqz+IVoyojMXY="; + hash = "sha256-yDsnw7jw1NDs3dy5RUY4a+dWZzORyFG9kpR4WaJNbEE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cvss/default.nix b/pkgs/development/python-modules/cvss/default.nix index 5cbd7ab56bf4..c4b0dce62587 100644 --- a/pkgs/development/python-modules/cvss/default.nix +++ b/pkgs/development/python-modules/cvss/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cvss"; - version = "3.2"; + version = "3.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "RedHatProductSecurity"; repo = "cvss"; rev = "refs/tags/v${version}"; - hash = "sha256-r4IWaOEZUX+3wW47rX8+lsixIjr14zAaXfFIFcbLVMM="; + hash = "sha256-+8aKNPcHFPcDyBvOO9QCVb1OIbpQHAEeJgt8fob0+lM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 7ed3c7563777..4e49046a1e23 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -21,7 +21,7 @@ # checks pytestCheckHook, - useOpenmp ? (!stdenv.isDarwin), + useOpenmp ? (!stdenv.hostPlatform.isDarwin), }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix index d8e05e3e70fe..ea2d9d1b0ca6 100644 --- a/pkgs/development/python-modules/cx-freeze/default.nix +++ b/pkgs/development/python-modules/cx-freeze/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "cx-freeze"; - version = "7.2.0"; + version = "7.2.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,15 +22,14 @@ buildPythonPackage rec { src = fetchPypi { pname = "cx_freeze"; inherit version; - hash = "sha256-xX9xAbTTUTJGSx7IjLiUjDt8W07OS7NUwWCRWJyzNYM="; + hash = "sha256-6bLEvWjr9PuZtq8v8oHA5TewSa7pSIBcxKAo4XGKvGo="; }; postPatch = '' sed -i /patchelf/d pyproject.toml # Build system requirements substituteInPlace pyproject.toml \ - --replace-fail "setuptools>=65.6.3,<71" "setuptools" \ - --replace-fail "wheel>=0.42.0,<=0.43.0" "wheel" + --replace-fail "setuptools>=70.1,<75" "setuptools" ''; build-system = [ diff --git a/pkgs/development/python-modules/cxxheaderparser/default.nix b/pkgs/development/python-modules/cxxheaderparser/default.nix index ba53da3679a2..54754299e488 100644 --- a/pkgs/development/python-modules/cxxheaderparser/default.nix +++ b/pkgs/development/python-modules/cxxheaderparser/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cxxheaderparser"; - version = "1.3.4"; + version = "1.4.1"; pyproject = true; src = fetchFromGitHub { owner = "robotpy"; repo = "cxxheaderparser"; rev = version; - hash = "sha256-Cyo+18mH1p5Zy4dWP3mjZRIkZZOyb61ABedk/amDi0g="; + hash = "sha256-oUZI5mPTc+/FkXimZ6ZnjOC9wk3sPuQRTFjVv3lgqg4="; }; postPatch = '' @@ -35,5 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/robotpy/cxxheaderparser"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 09689a844751..d6b6b5c60843 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.6.1"; + version = "7.6.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; rev = "refs/tags/v${version}"; - hash = "sha256-KvP3msV2qIn26pSLv0XrxnwqRx7uWcllLTJg9vig5V0="; + hash = "sha256-nklizCiu7Nmynjd5WU5oX/v2TWy9xFVF4GkmCwFKZLI="; }; pythonRelaxDeps = [ "py-serializable" ]; @@ -52,7 +52,7 @@ buildPythonPackage rec { types-toml ]; - passthru.optional-dependencies = { + optional-dependencies = { validation = [ jsonschema lxml @@ -69,7 +69,7 @@ buildPythonPackage rec { ddt pytestCheckHook xmldiff - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "cyclonedx" ]; diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 5948f958438e..703a139ed7ff 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.9"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; rev = "refs/tags/v${version}"; - hash = "sha256-gU/oqFrOzA6PQTwwGS9si19F+LIondO3MozNDwPDtgs="; + hash = "sha256-aTFas+3+veky+pyz2T1SytMNGwxlF9dAc3E03PKqvrM="; }; build-system = [ diff --git a/pkgs/development/python-modules/cymruwhois/default.nix b/pkgs/development/python-modules/cymruwhois/default.nix new file mode 100644 index 000000000000..8e399069f8f1 --- /dev/null +++ b/pkgs/development/python-modules/cymruwhois/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + python-memcached, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "cymruwhois"; + version = "1.6"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "JustinAzoff"; + repo = "python-cymruwhois"; + rev = "refs/tags/${version}"; + hash = "sha256-d9m668JYI9mxUycoVWyaDCR7SOca+ebymZxWtgSPWNU="; + }; + + build-system = [ setuptools ]; + + optional-dependencies = { + CACHE = [ python-memcached ]; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "cymruwhois" ]; + + disabledTests = [ + # Tests require network access + "test_asn" + # AssertionError + "test_doctest" + ]; + + meta = { + description = "Python client for the whois.cymru.com service"; + homepage = "https://github.com/JustinAzoff/python-cymruwhois"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index f987ee07a64e..384d8d07c278 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, python, - fetchpatch, fetchPypi, pari, gmp, @@ -16,24 +15,14 @@ buildPythonPackage rec { pname = "cypari2"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.1.5"; + version = "2.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-GiWGXDTyCx3JWDB5jjSrZDbieLjgyA3HvwqzTF2wOrg="; + hash = "sha256-gXYGv2YbcdM+HQEkIZB6T4+wndgbfT464Xmzl4Agu/E="; }; - patches = [ - # patch to avoid some segfaults in sage's totallyreal.pyx test. - # (https://trac.sagemath.org/ticket/27267). - (fetchpatch { - name = "use-trashcan-for-gen.patch"; - url = "https://raw.githubusercontent.com/sagemath/sage/b6ea17ef8e4d652de0a85047bac8d41e90b25555/build/pkgs/cypari/patches/trashcan.patch"; - hash = "sha256-w4kktWb9/aR9z4CjrUvAMOxEwRN2WkubaKzQttN8rU8="; - }) - ]; - preBuild = '' # generate cythonized extensions (auto_paridecl.pxd is crucial) ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace diff --git a/pkgs/development/python-modules/cython/0.nix b/pkgs/development/python-modules/cython/0.nix index 8dc7db31fe3f..a484892c0040 100644 --- a/pkgs/development/python-modules/cython/0.nix +++ b/pkgs/development/python-modules/cython/0.nix @@ -24,8 +24,8 @@ let # Some tests in the test suite isn't working on aarch64. Disable them for # now until upstream finds a workaround. # Upstream issue here: https://github.com/cython/cython/issues/2308 - ++ lib.optionals stdenv.isAarch64 [ "numpy_memoryview" ] - ++ lib.optionals stdenv.isi686 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "numpy_memoryview" ] + ++ lib.optionals stdenv.hostPlatform.isi686 [ "future_division" "overflow_check_longlong" ]; @@ -87,7 +87,7 @@ buildPythonPackage rec { # https://github.com/cython/cython/issues/2785 # Temporary solution doCheck = false; - # doCheck = !stdenv.isDarwin; + # doCheck = !stdenv.hostPlatform.isDarwin; # force regeneration of generated code in source distributions # https://github.com/cython/cython/issues/5089 diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix index 2d3333ecec6a..2ce92a1786b7 100644 --- a/pkgs/development/python-modules/cython/default.nix +++ b/pkgs/development/python-modules/cython/default.nix @@ -1,46 +1,28 @@ { lib, - stdenv, buildPythonPackage, - fetchPypi, - setuptools, - python, - pkg-config, + fetchFromGitHub, gdb, - numpy, ncurses, - - # Reverse dependency - sage, + numpy, + pkg-config, + pygame-ce, + python, + sage, # Reverse dependency + setuptools, + stdenv, }: -let - excludedTests = - [ "reimport_from_subinterpreter" ] - # cython's testsuite is not working very well with libc++ - # We are however optimistic about things outside of testsuite still working - ++ lib.optionals (stdenv.cc.isClang or false) [ - "cpdef_extern_func" - "libcpp_algo" - ] - # Some tests in the test suite isn't working on aarch64. Disable them for - # now until upstream finds a workaround. - # Upstream issue here: https://github.com/cython/cython/issues/2308 - ++ lib.optionals stdenv.isAarch64 [ "numpy_memoryview" ] - ++ lib.optionals stdenv.isi686 [ - "future_division" - "overflow_check_longlong" - ]; -in buildPythonPackage rec { pname = "cython"; - version = "3.0.11"; + version = "3.0.11-1"; pyproject = true; - src = fetchPypi { - pname = "cython"; - inherit version; - hash = "sha256-cUbdKvhoK0ymEzGFHmrrzp/lFY51MAND+AwHyoCx+v8="; + src = fetchFromGitHub { + owner = "cython"; + repo = "cython"; + rev = "refs/tags/${version}"; + hash = "sha256-P2k21uNC6X+R6a1dWAIspGnUc6JwAzRXUleVfZG+vqY="; }; build-system = [ @@ -56,34 +38,87 @@ buildPythonPackage rec { env.LC_ALL = "en_US.UTF-8"; - checkPhase = '' - export HOME="$NIX_BUILD_TOP" - ${python.interpreter} runtests.py -j$NIX_BUILD_CORES \ - --no-code-style \ - ${ - lib.optionalString ( - builtins.length excludedTests != 0 - ) ''--exclude="(${builtins.concatStringsSep "|" excludedTests})"'' - } - ''; - # https://github.com/cython/cython/issues/2785 # Temporary solution doCheck = false; - # doCheck = !stdenv.isDarwin; + + strictDeps = true; + + checkPhase = + let + excludedTests = + [ "reimport_from_subinterpreter" ] + # cython's testsuite is not working very well with libc++ + # We are however optimistic about things outside of testsuite still working + ++ lib.optionals (stdenv.cc.isClang or false) [ + "cpdef_extern_func" + "libcpp_algo" + ] + # Some tests in the test suite aren't working on aarch64. + # Disable them for now until upstream finds a workaround. + # Upstream issue: https://github.com/cython/cython/issues/2308 + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "numpy_memoryview" ] + ++ lib.optionals stdenv.hostPlatform.isi686 [ + "future_division" + "overflow_check_longlong" + ]; + commandline = builtins.concatStringsSep " " ( + [ + "-j$NIX_BUILD_CORES" + "--no-code-style" + ] + ++ lib.optionals (builtins.length excludedTests != 0) [ + ''--exclude="(${builtins.concatStringsSep "|" excludedTests})"'' + ] + ); + in + '' + runHook preCheck + export HOME="$NIX_BUILD_TOP" + ${python.interpreter} runtests.py ${commandline} + runHook postCheck + ''; passthru.tests = { - inherit sage; + inherit pygame-ce sage; }; - # force regeneration of generated code in source distributions + # Force code regeneration in source distributions # https://github.com/cython/cython/issues/5089 setupHook = ./setup-hook.sh; meta = { - changelog = "https://github.com/cython/cython/blob/${version}/CHANGES.rst"; - description = "Optimising static compiler for both the Python programming language and the extended Cython programming language"; homepage = "https://cython.org"; + description = "Optimising static compiler for both the Python and the extended Cython programming languages"; + longDescription = '' + Cython is an optimising static compiler for both the Python programming + language and the extended Cython programming language (based on Pyrex). It + makes writing C extensions for Python as easy as Python itself. + + Cython gives you the combined power of Python and C to let you: + + - write Python code that calls back and forth from and to C or C++ code + natively at any point. + - easily tune readable Python code into plain C performance by adding + static type declarations, also in Python syntax. + - use combined source code level debugging to find bugs in your Python, + Cython and C code. + - interact efficiently with large data sets, e.g. using multi-dimensional + NumPy arrays. + - quickly build your applications within the large, mature and widely used + CPython ecosystem. + - integrate natively with existing code and data from legacy, low-level or + high-performance libraries and applications. + + The Cython language is a superset of the Python language that additionally + supports calling C functions and declaring C types on variables and class + attributes. This allows the compiler to generate very efficient C code + from Cython code. + ''; + changelog = "https://github.com/cython/cython/blob/${version}/CHANGES.rst"; license = lib.licenses.asl20; + mainProgram = "cython"; + maintainers = with lib.maintainers; [ AndersonTorres ]; }; } +# TODO: investigate recursive loop when doCheck is true diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index befb71963c79..574e717759e7 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "cytoolz"; - version = "0.12.3"; + version = "1.0.0"; pyproject = true; disabled = isPy27 || isPyPy; src = fetchPypi { inherit pname version; - hash = "sha256-RQPcWfTO1TpUZDJyxh3DBdHbv719a98paUjenzTDooI="; + hash = "sha256-60U7MBghUvmRelGJt9mQRrbOkM34rrD+/0smg+YA3v0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/daltonlens/default.nix b/pkgs/development/python-modules/daltonlens/default.nix new file mode 100644 index 000000000000..5410f4d2ab2e --- /dev/null +++ b/pkgs/development/python-modules/daltonlens/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + setuptools-git, + numpy, + pillow, + pytestCheckHook, +}: +buildPythonPackage rec { + pname = "daltonlens"; + version = "0.1.5"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-T7fXlRdFtcVw5WURPqZhCmulUi1ZnCfCXgcLtTHeNas="; + }; + + build-system = [ + setuptools + setuptools-git + ]; + + dependencies = [ + numpy + pillow + ]; + + pythonImportsCheck = [ + "daltonlens" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/" + ]; + + disabledTestPaths = [ + "tests/test_generate.py" + ]; + + meta = { + description = "R&D companion package for the desktop application DaltonLens"; + homepage = "https://github.com/DaltonLens/DaltonLens-Python"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aleksana ]; + }; +} diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index 0cae95af4c80..7e85adb0c29d 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { ]; # Most tests fail on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "daphne" ]; diff --git a/pkgs/development/python-modules/darkdetect/default.nix b/pkgs/development/python-modules/darkdetect/default.nix index fe38977f2ac0..c51f22fb368d 100644 --- a/pkgs/development/python-modules/darkdetect/default.nix +++ b/pkgs/development/python-modules/darkdetect/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "darkdetect" ]; - postPatch = lib.optionalString (stdenv.isLinux) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isLinux) '' substituteInPlace darkdetect/_linux_detect.py \ --replace "'gsettings'" "'${glib.bin}/bin/gsettings'" ''; diff --git a/pkgs/development/python-modules/dash-bootstrap-components/default.nix b/pkgs/development/python-modules/dash-bootstrap-components/default.nix index 9e6cfa1daaea..ce39e11af1f5 100644 --- a/pkgs/development/python-modules/dash-bootstrap-components/default.nix +++ b/pkgs/development/python-modules/dash-bootstrap-components/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchPypi, dash, setuptools, pythonOlder, @@ -14,11 +14,10 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - src = fetchFromGitHub { - owner = "facultyai"; - repo = "dash-bootstrap-components"; - rev = "refs/tags/${version}"; - hash = "sha256-6tx7rOB5FVj44NbTznyZd1Q0HOc8QdxiZOhja5kgpAE="; + src = fetchPypi { + inherit version; + pname = "dash_bootstrap_components"; + hash = "sha256-lgoeyTl1dHkvSagkECT6POzeD1kwyXGj/IHwFsvrEJU="; }; build-system = [ setuptools ]; @@ -28,8 +27,7 @@ buildPythonPackage rec { # Tests a additional requirements doCheck = false; - # Circular import - # pythonImportsCheck = [ "dash_bootstrap_components" ]; + pythonImportsCheck = [ "dash_bootstrap_components" ]; meta = with lib; { description = "Bootstrap components for Plotly Dash"; diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 3ba13153d123..d514c8b454e7 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "dash"; - version = "2.18.0"; + version = "2.18.1"; pyproject = true; src = fetchFromGitHub { owner = "plotly"; repo = "dash"; rev = "refs/tags/v${version}"; - hash = "sha256-4/MiiS2uspjfGg0KIrgzShG7eW10Be6CoISCOnXSou0="; + hash = "sha256-2LwM1lrJNdekoDN+wDHgaSlGOnpK618r65UHj7cP59E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index 959d83b96bcd..18bf0952ca2b 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -28,20 +27,16 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2024.7.0"; + version = "2024.9.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-awkward"; rev = "refs/tags/${version}"; - hash = "sha256-xy3rq/gXQUtquvyWSCcBjZ+gUYT3RzxMgXThyT6Fwec="; + hash = "sha256-4CwixPj0bJHVjnwZ7fPkRdiDHs8/IzvNlwSPynXvcAo="; }; - pythonRelaxDeps = [ "awkward" ]; - build-system = [ hatch-vcs hatchling @@ -76,6 +71,8 @@ buildPythonPackage rec { "test_from_text" # ValueError: not a ROOT file: first four bytes... "test_basic_root_works" + # Flaky. https://github.com/dask-contrib/dask-awkward/issues/506. + "test_distance_behavior" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index 750ef7613197..5f66528967e0 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -21,16 +20,14 @@ buildPythonPackage rec { pname = "dask-expr"; - version = "1.1.11"; + version = "1.1.16"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "dask"; repo = "dask-expr"; rev = "refs/tags/v${version}"; - hash = "sha256-D26b8HkcRqsMuzSTZdmDmS59dlAbj4F93kfY27UAhKw="; + hash = "sha256-HHoUQ6LfrlUnZNvvbPbQbNW6WLabGa88RsC9M8hlARI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dask-gateway-server/default.nix b/pkgs/development/python-modules/dask-gateway-server/default.nix index 8935e536996a..f1aa0dbc6fb3 100644 --- a/pkgs/development/python-modules/dask-gateway-server/default.nix +++ b/pkgs/development/python-modules/dask-gateway-server/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { traitlets ]; - passthru.optional-dependencies = { + optional-dependencies = { kerberos = [ pykerberos ]; jobqueue = [ sqlalchemy ]; local = [ sqlalchemy ]; diff --git a/pkgs/development/python-modules/dask-histogram/default.nix b/pkgs/development/python-modules/dask-histogram/default.nix index 26ca90ab020f..032f978cdef9 100644 --- a/pkgs/development/python-modules/dask-histogram/default.nix +++ b/pkgs/development/python-modules/dask-histogram/default.nix @@ -2,31 +2,37 @@ lib, buildPythonPackage, fetchFromGitHub, - boost-histogram, - dask, + + # build-system hatchling, hatch-vcs, + + # dependencies + boost-histogram, + dask, + + # tests pytestCheckHook, }: buildPythonPackage rec { pname = "dask-histogram"; - version = "2024.3.0"; + version = "2024.9.1"; pyproject = true; src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-histogram"; rev = "refs/tags/${version}"; - hash = "sha256-RqZMAEGFqEXNmNv7SWCyQw9cI+I+Oa6s8O/7Jp+9id8="; + hash = "sha256-k+hD5y9K6Jsm++H+IAWJ/Z3wlCN4fV8RIcyAnvOvem0="; }; - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs ]; - propagatedBuildInputs = [ + dependencies = [ boost-histogram dask ]; @@ -35,11 +41,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "dask_histogram" ]; - meta = with lib; { + meta = { description = "Histograms with task scheduling"; homepage = "https://dask-histogram.readthedocs.io/"; changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${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/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index 55a528499d44..8c43fc9f260f 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -1,8 +1,7 @@ { lib, + stdenv, buildPythonPackage, - pythonOlder, - pythonAtLeast, fetchFromGitHub, # build-system @@ -20,17 +19,14 @@ buildPythonPackage rec { pname = "dask-jobqueue"; - version = "0.8.5"; + version = "0.9.0"; pyproject = true; - # Python 3.12 support should be added in 0.8.6 - disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; - src = fetchFromGitHub { owner = "dask"; repo = "dask-jobqueue"; rev = "refs/tags/${version}"; - hash = "sha256-NBFfPTNIXezwv7f1P3VRnkBYlOutD30+8rdiBBssHDE="; + hash = "sha256-YujfhjOJzl4xsjjsyrQkEu/CBR04RwJ79c1iSTcMIgw="; }; build-system = [ setuptools ]; @@ -46,46 +42,54 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # Require some unavailable pytest fixtures - "test_adapt" - "test_adaptive" - "test_adaptive_cores_mem" - "test_adaptive_grouped" - "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_command_template" - "test_complex_cancel_command" - "test_config" - "test_dashboard_link" - "test_default_number_of_worker_processes" - "test_deprecation_env_extra" - "test_deprecation_extra" - "test_deprecation_job_extra" - "test_different_interfaces_on_scheduler_and_workers" - "test_docstring_cluster" - "test_extra_args_broken_cancel" - "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" - "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" - "test_wrong_parameter_error" - ]; + disabledTests = + [ + # Require some unavailable pytest fixtures + "test_adapt" + "test_adaptive" + "test_adaptive_cores_mem" + "test_adaptive_grouped" + "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_command_template" + "test_complex_cancel_command" + "test_config" + "test_dashboard_link" + "test_default_number_of_worker_processes" + "test_deprecation_env_extra" + "test_deprecation_extra" + "test_deprecation_job_extra" + "test_different_interfaces_on_scheduler_and_workers" + "test_docstring_cluster" + "test_extra_args_broken_cancel" + "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" + "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" + "test_wrong_parameter_error" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # ValueError: invalid operation on non-started TCPListener + "test_header" + "test_lsf_unit_detection" + "test_lsf_unit_detection_without_file" + "test_runner" + ]; pythonImportsCheck = [ "dask_jobqueue" ]; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 0aa358b334af..014f8947d35b 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -34,22 +34,19 @@ pytest-rerunfailures, pytest-xdist, pytestCheckHook, - pythonOlder, }: let self = buildPythonPackage rec { pname = "dask"; - version = "2024.8.1"; + version = "2024.10.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-ztB5T8VFc1WoQB7lWQlonAyq7duqft9OE5FYvmjZd48="; + hash = "sha256-UB/LqgDRXnjJ/RjEke9eBDyVAy+Dtak7wYJB63xmDd4="; }; build-system = [ setuptools ]; @@ -126,14 +123,14 @@ let ]; disabledTests = - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ # Test requires features of python3Packages.psutil that are # blocked in sandboxed-builds "test_auto_blocksize_csv" # AttributeError: 'str' object has no attribute 'decode' "test_read_dir_nometa" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # concurrent.futures.process.BrokenProcessPool: A process in the process pool terminated abpruptly... "test_foldby_tree_reduction" "test_to_bag" diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index 33fd15cded4b..55f3489a0144 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sqlalchemy ]; - passthru.optional-dependencies = { + optional-dependencies = { postgresql = [ asyncpg ]; asyncpg = [ asyncpg ]; aiopg = [ aiopg ]; diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 7f06b59df3e2..bd2f6ba83cfa 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "11.3.33"; + version = "11.3.40"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KcqJ2B2df85H/VIx4ToX0pJ7rYbjDRp3eR7jAFW67do="; + hash = "sha256-rSuW/6fSro1pAxDj2tZ+EYvO0zf0yCWXNaS9Ls7xJfw="; }; sourceRoot = "."; diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix new file mode 100644 index 000000000000..57bf4844601c --- /dev/null +++ b/pkgs/development/python-modules/databricks-sdk/default.nix @@ -0,0 +1,89 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + google-auth, + requests, + + # tests + langchain-openai, + openai, + pyfakefs, + pytestCheckHook, + pytest-mock, + requests-mock, +}: + +buildPythonPackage rec { + pname = "databricks-sdk"; + version = "0.35.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "databricks"; + repo = "databricks-sdk-py"; + rev = "refs/tags/v${version}"; + hash = "sha256-CEv/+3E7KWV9LXzFPvDQIL1v8iFgbsS3/cTS/4obWas="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + google-auth + requests + ]; + + pythonImportsCheck = [ + "databricks.sdk" + ]; + + nativeCheckInputs = [ + langchain-openai + openai + pyfakefs + pytestCheckHook + pytest-mock + requests-mock + ]; + + disabledTests = + [ + # Require internet access + # ValueError: default auth: cannot configure default credentials, please chec... + "test_azure_cli_does_not_specify_tenant_id_with_msi" + "test_azure_cli_fallback" + "test_azure_cli_user_no_management_access" + "test_azure_cli_user_with_management_access" + "test_azure_cli_with_warning_on_stderr" + "test_azure_cli_workspace_header_present" + "test_config_azure_cli_host" + "test_config_azure_cli_host_and_resource_id" + "test_config_azure_cli_host_and_resource_i_d_configuration_precedence" + "test_load_azure_tenant_id_404" + "test_load_azure_tenant_id_happy_path" + "test_load_azure_tenant_id_no_location_header" + "test_load_azure_tenant_id_unparsable_location_header" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # requests.exceptions.ChunkedEncodingError: ("Connection broken: ConnectionResetError(54, 'Connection reset by peer')", ConnectionResetError(54, 'Connection reset by peer')) + "test_github_oidc_flow_works_with_azure" + ]; + + __darwinAllowLocalNetworking = true; + + meta = { + description = "Databricks SDK for Python"; + homepage = "https://github.com/databricks/databricks-sdk-py"; + changelog = "https://github.com/databricks/databricks-sdk-py/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index b48284aae321..2c3243a11576 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -16,12 +16,11 @@ thrift, requests, urllib3, - fetchpatch, }: buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "3.3.0"; + version = "3.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,19 +29,12 @@ buildPythonPackage rec { owner = "databricks"; repo = "databricks-sql-python"; rev = "refs/tags/v${version}"; - hash = "sha256-a3OeKJ3c2UCClsPMah7iJY2YvIVLfHmmBuHAx8vdXZs="; + hash = "sha256-8q5qWN+i2mGbzXvkop/G6mjZegzZ/6kr1Fl7FaHwLYA="; }; - patches = [ - (fetchpatch { - name = "fix-pandas.patch"; - url = "https://patch-diff.githubusercontent.com/raw/databricks/databricks-sql-python/pull/416.patch"; - sha256 = "sha256-sNCp8xSSmKP2yNzDK4wyWC5Hoe574AeHnKTeNcIxaek="; - }) - ]; - pythonRelaxDeps = [ "pyarrow" + "thrift" ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dataclass-wizard/default.nix b/pkgs/development/python-modules/dataclass-wizard/default.nix index 39f0f0aa39fa..2a063482fe17 100644 --- a/pkgs/development/python-modules/dataclass-wizard/default.nix +++ b/pkgs/development/python-modules/dataclass-wizard/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ] ++ lib.optionals (pythonOlder "3.9") [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { timedelta = [ pytimeparse ]; yaml = [ pyyaml ]; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-mock - ] ++ passthru.optional-dependencies.timedelta ++ passthru.optional-dependencies.yaml; + ] ++ optional-dependencies.timedelta ++ optional-dependencies.yaml; disabledTests = [ ] diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix index e73d37c4486c..9badd981aed4 100644 --- a/pkgs/development/python-modules/datafusion/default.nix +++ b/pkgs/development/python-modules/datafusion/default.nix @@ -8,10 +8,12 @@ libiconv, numpy, protobuf, + protoc, pyarrow, Security, SystemConfiguration, typing-extensions, + pythonOlder, }: let @@ -19,16 +21,16 @@ let name = "arrow-testing"; owner = "apache"; repo = "arrow-testing"; - rev = "5bab2f264a23f5af68f69ea93d24ef1e8e77fc88"; - hash = "sha256-Pxx8ohUpXb5u1995IvXmxQMqWiDJ+7LAll/AjQP7ph8="; + rev = "4d209492d514c2d3cb2d392681b9aa00e6d8da1c"; + hash = "sha256-IkiCbuy0bWyClPZ4ZEdkEP7jFYLhM7RCuNLd6Lazd4o="; }; parquet-testing = fetchFromGitHub { name = "parquet-testing"; owner = "apache"; repo = "parquet-testing"; - rev = "e13af117de7c4f0a4d9908ae3827b3ab119868f3"; - hash = "sha256-rVI9zyk9IRDlKv4u8BeMb0HRdWLfCpqOlYCeUdA7BB8="; + rev = "50af3d8ce206990d81014b1862e5ce7380dc3e08"; + hash = "sha256-edyv/r5olkj09aHtm8LHZY0b3jUtLNUcufwI41qKYaY="; }; in @@ -54,11 +56,12 @@ buildPythonPackage rec { nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook + protoc ]; buildInputs = [ protobuf ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security SystemConfiguration @@ -66,8 +69,7 @@ buildPythonPackage rec { dependencies = [ pyarrow - typing-extensions - ]; + ] ++ lib.optionals (pythonOlder "3.13") [ typing-extensions ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/datalad-gooey/default.nix b/pkgs/development/python-modules/datalad-gooey/default.nix index a84e6c7a2be7..fcc3fa376330 100644 --- a/pkgs/development/python-modules/datalad-gooey/default.nix +++ b/pkgs/development/python-modules/datalad-gooey/default.nix @@ -37,7 +37,7 @@ buildPythonPackage { datalad-next outdated datalad - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppleScriptKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppleScriptKit ]; pythonRemoveDeps = [ "applescript" ]; diff --git a/pkgs/development/python-modules/dataproperty/default.nix b/pkgs/development/python-modules/dataproperty/default.nix index b82fa0900fbb..f988112c533f 100644 --- a/pkgs/development/python-modules/dataproperty/default.nix +++ b/pkgs/development/python-modules/dataproperty/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { tcolorpy ] ++ typepy.optional-dependencies.datetime; - passthru.optional-dependencies = { + optional-dependencies = { logging = [ loguru ]; }; diff --git a/pkgs/development/python-modules/datasalad/default.nix b/pkgs/development/python-modules/datasalad/default.nix index 66303c1ff0cd..4216dd180cf2 100644 --- a/pkgs/development/python-modules/datasalad/default.nix +++ b/pkgs/development/python-modules/datasalad/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "datasalad"; - version = "0.2.1"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "datalad"; repo = "datasalad"; rev = "refs/tags/v${version}"; - hash = "sha256-qgHWTokNBzJcBbEPCA/YfklzqyX1lM2yro7ElqBfrig="; + hash = "sha256-UIrbvFz674+HarFbv1eF++flj1hOR0cZyqKQSl+G7xY="; }; build-system = [ diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 14779ee62cab..20147a78fb60 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "datasets"; - version = "2.20.0"; + version = "2.21.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9mB4RXJVkmaK+fLEmyZAdf64YKGoAhE3RzMoj4/8K98="; + hash = "sha256-b84Y7PixZUG1VXW11Q4fKxEcsWJjpXEHZIYugf2MSUU="; }; # remove pyarrow<14.0.1 vulnerability fix diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 29cf78eeed88..dbc9828c5803 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -6,17 +6,19 @@ asgi-csrf, click, click-default-group, + flexcache, + flexparser, + httpx, + hupper, itsdangerous, janus, jinja2, - hupper, mergedeep, - pint, + platformdirs, pluggy, - python-baseconv, pyyaml, + typing-extensions, uvicorn, - httpx, pytestCheckHook, pytest-asyncio, pytest-timeout, @@ -30,8 +32,8 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.64.8"; - format = "setuptools"; + version = "0.65"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +41,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Nt/e0j1mF5Qkpp/dRa9W7En1WoGD2MsR3iREv9IQu5E="; + hash = "sha256-POdw2vB0D2B5SyrC/HkFqlsMlWtbdC3cRM/cfDhv7Z4="; }; postPatch = '' @@ -47,23 +49,31 @@ buildPythonPackage rec { --replace '"pytest-runner"' "" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + pythonRemoveDeps = [ + "pip" + "setuptools" + ]; + + dependencies = [ aiofiles asgi-csrf asgiref click click-default-group + flexcache + flexparser httpx hupper itsdangerous janus jinja2 mergedeep - pint + platformdirs pluggy - python-baseconv pyyaml - setuptools + typing-extensions uvicorn ]; diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index c7e3237a1f65..7940e62cb371 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "datashader"; - version = "0.16.2"; + version = "0.16.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eJmXm0wa26a0/S6GyqP175TE5qsjTLtzBspr/iQ/xN8="; + hash = "sha256-nQBAx4h/elpe3TdMKXQC/SCKYr9oReh2MbVPA7muR50="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/datashaper/default.nix b/pkgs/development/python-modules/datashaper/default.nix index 1da7346f2669..3ad28d2228ed 100644 --- a/pkgs/development/python-modules/datashaper/default.nix +++ b/pkgs/development/python-modules/datashaper/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, pythonOlder, - pythonRelaxDepsHook, poetry-core, dacite, diskcache, @@ -26,8 +25,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - pythonRelaxDeps = [ "pyarrow" ]; dependencies = [ diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix index 6a7c80ada33e..1608ec12e8f2 100644 --- a/pkgs/development/python-modules/datatable/default.nix +++ b/pkgs/development/python-modules/datatable/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ]; LLVM = llvm; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; # test suite is very cpu intensive, only run small subset to ensure package is working as expected pytestFlagsArray = [ "tests/test-sets.py" ]; diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 3f1fec78aeb3..e2f6436f0cfb 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { tzlocal ]; - passthru.optional-dependencies = { + optional-dependencies = { calendars = [ hijri-converter convertdate @@ -60,7 +60,7 @@ buildPythonPackage rec { parsel requests ruamel-yaml - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = '' export HOME="$TEMPDIR" @@ -73,6 +73,10 @@ buildPythonPackage rec { # access network "test_custom_language_detect_fast_text_0" "test_custom_language_detect_fast_text_1" + + # breaks with latest tzdata: https://github.com/scrapinghub/dateparser/issues/1237 + # FIXME: look into this more + "test_relative_base" ]; pythonImportsCheck = [ "dateparser" ]; diff --git a/pkgs/development/python-modules/dbf/darwin.patch b/pkgs/development/python-modules/dbf/darwin.patch new file mode 100644 index 000000000000..92c96c7f1c98 --- /dev/null +++ b/pkgs/development/python-modules/dbf/darwin.patch @@ -0,0 +1,12 @@ +diff --git a/dbf/test.py b/dbf/test.py +index 117f611..34a9507 100755 +--- a/dbf/test.py ++++ b/dbf/test.py +@@ -4814,6 +4814,7 @@ def test_index_search(self): + self.assertEqual(sorted.index_search('jul', partial=True), 9) + self.assertTrue(sorted.index_search('jul', partial=True)) + ++ @unittest.skipIf(sys.platform == 'darwin', 'fails on case-insensitive filesystems') + def test_mismatched_extensions(self): + old_memo_name = self.dbf_table._meta.memoname + new_memo_name = old_memo_name[:-3] + 'Dbt' diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index 0be997c9fc2a..cdecd4e85c8f 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -19,10 +19,15 @@ buildPythonPackage rec { hash = "sha256-MFEi1U0RNvrfDtV4HpvPgKTCibAh76z7Gnmj32IubYw="; }; + # Workaround for https://github.com/ethanfurman/dbf/issues/48 + patches = lib.optional python.stdenv.isDarwin ./darwin.patch; + propagatedBuildInputs = [ aenum ]; checkPhase = '' + runHook preCheck ${python.interpreter} -m dbf.test + runHook postCheck ''; pythonImportsCheck = [ "dbf" ]; diff --git a/pkgs/development/python-modules/dbt-adapters/default.nix b/pkgs/development/python-modules/dbt-adapters/default.nix index d39b68a3f7df..b116a6e8f1b8 100644 --- a/pkgs/development/python-modules/dbt-adapters/default.nix +++ b/pkgs/development/python-modules/dbt-adapters/default.nix @@ -1,31 +1,36 @@ { lib, + agate, buildPythonPackage, + dbt-common, fetchFromGitHub, hatchling, - agate, - dbt-common, mashumaro, protobuf, + pytestCheckHook, + pythonOlder, pytz, typing-extensions, - pytestCheckHook, }: buildPythonPackage rec { pname = "dbt-adapters"; - version = "1.6.1"; + version = "1.7.0"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-adapters"; rev = "refs/tags/v${version}"; - hash = "sha256-i5sGgkFrW/37PH5XnH2bf/bTNgCZwEgNZT9IMbOJwLQ="; + hash = "sha256-I3A3rIMpT+MAq+ebid9RMr6I3W1l4ir78UmfeEr5U3U="; }; build-system = [ hatchling ]; + pythonRelaxDeps = [ "protobuf" ]; + dependencies = [ agate dbt-common diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index 0bb43248db08..66ff5dc526ef 100644 --- a/pkgs/development/python-modules/dbt-common/default.nix +++ b/pkgs/development/python-modules/dbt-common/default.nix @@ -1,42 +1,60 @@ { lib, - agate, + fetchFromGitHub, buildPythonPackage, + pythonOlder, + + # build-system + hatchling, + + # dependencies + agate, colorama, deepdiff, - fetchPypi, - hatchling, isodate, jinja2, jsonschema, mashumaro, pathspec, protobuf, - pytest-mock, - pytest-xdist, - pytestCheckHook, python-dateutil, - pythonOlder, requests, typing-extensions, + + # tests + pytestCheckHook, + pytest-mock, + pytest-xdist, }: buildPythonPackage rec { pname = "dbt-common"; - version = "1.8.0"; + version = "1.12.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; - src = fetchPypi { - pname = "dbt_common"; - inherit version; - hash = "sha256-ehZ+a3zznnWMY9NJx9LfRtkV1vHiIH0HEhsYWfMbmb4="; + src = fetchFromGitHub { + owner = "dbt-labs"; + repo = "dbt-common"; + # Unfortunately, upstream doesn't tag commits on GitHub, and the pypi source + # doesn't include tests. TODO: Write an update script that will detect the + # version from `dbt_common/__about__.py`. + rev = "5a401a9e8dd46e4582ac4edd2883e34714e77530"; + hash = "sha256-SIMg6ewnE6kY+drqcPlYrxt1XlWBurZU62FI/QnHAHY="; }; + patches = [ + # https://github.com/dbt-labs/dbt-common/pull/211 + ./protobuf_5.patch + ]; + build-system = [ hatchling ]; - pythonRelaxDeps = [ "agate" ]; + pythonRelaxDeps = [ + "agate" + "deepdiff" + ]; dependencies = [ agate @@ -53,13 +71,17 @@ buildPythonPackage rec { typing-extensions ] ++ mashumaro.optional-dependencies.msgpack; - # Upstream stopped to tag the source fo rnow - doCheck = false; - nativeCheckInputs = [ - pytest-mock - pytest-xdist pytestCheckHook + pytest-xdist + pytest-mock + ]; + + disabledTests = [ + # Assertion errors (TODO: Notify upstream) + "test_create_print_json" + "test_events" + "test_extra_dict_on_event" ]; pythonImportsCheck = [ "dbt_common" ]; diff --git a/pkgs/development/python-modules/dbt-common/protobuf_5.patch b/pkgs/development/python-modules/dbt-common/protobuf_5.patch new file mode 100644 index 000000000000..4573011301ef --- /dev/null +++ b/pkgs/development/python-modules/dbt-common/protobuf_5.patch @@ -0,0 +1,113 @@ +From f7c480139015cb8746f3fa751dc72b788d0ce8a0 Mon Sep 17 00:00:00 2001 +From: Eric Hauser <ewhauser@gmail.com> +Date: Sat, 19 Oct 2024 15:52:16 -0600 +Subject: [PATCH] upgrade protobuf to >=5,<6 + +--- + dbt_common/events/base_types.py | 7 +++++-- + dbt_common/events/functions.py | 2 +- + dbt_common/events/types_pb2.py | 18 ++++++++++++++---- + pyproject.toml | 4 ++-- + 4 files changed, 22 insertions(+), 9 deletions(-) + +diff --git a/dbt_common/events/base_types.py b/dbt_common/events/base_types.py +index 781b2a0e..2f11e4c7 100644 +--- a/dbt_common/events/base_types.py ++++ b/dbt_common/events/base_types.py +@@ -91,15 +91,18 @@ def __getattr__(self, key): + + def to_dict(self): + return MessageToDict( +- self.pb_msg, preserving_proto_field_name=True, including_default_value_fields=True ++ self.pb_msg, ++ preserving_proto_field_name=True, ++ always_print_fields_with_no_presence=True, + ) + + def to_json(self) -> str: + return MessageToJson( + self.pb_msg, + preserving_proto_field_name=True, +- including_default_value_fields=True, ++ always_print_fields_with_no_presence=True, + indent=None, ++ sort_keys=True, + ) + + def level_tag(self) -> EventLevel: +diff --git a/dbt_common/events/functions.py b/dbt_common/events/functions.py +index 4e055aa4..86d68237 100644 +--- a/dbt_common/events/functions.py ++++ b/dbt_common/events/functions.py +@@ -97,7 +97,7 @@ def msg_to_dict(msg: EventMsg) -> dict: + msg_dict = MessageToDict( + msg, + preserving_proto_field_name=True, +- including_default_value_fields=True, # type: ignore ++ always_print_fields_with_no_presence=True, + ) + except Exception as exc: + event_type = type(msg).__name__ +diff --git a/dbt_common/events/types_pb2.py b/dbt_common/events/types_pb2.py +index 6574462e..1a3b91a5 100644 +--- a/dbt_common/events/types_pb2.py ++++ b/dbt_common/events/types_pb2.py +@@ -1,12 +1,22 @@ + # -*- coding: utf-8 -*- + # Generated by the protocol buffer compiler. DO NOT EDIT! ++# NO CHECKED-IN PROTOBUF GENCODE + # source: types.proto +-# Protobuf Python Version: 4.25.2 ++# Protobuf Python Version: 5.28.2 + """Generated protocol buffer code.""" + from google.protobuf import descriptor as _descriptor + from google.protobuf import descriptor_pool as _descriptor_pool ++from google.protobuf import runtime_version as _runtime_version + from google.protobuf import symbol_database as _symbol_database + from google.protobuf.internal import builder as _builder ++_runtime_version.ValidateProtobufRuntimeVersion( ++ _runtime_version.Domain.PUBLIC, ++ 5, ++ 28, ++ 2, ++ '', ++ 'types.proto' ++) + # @@protoc_insertion_point(imports) + + _sym_db = _symbol_database.Default() +@@ -20,9 +30,9 @@ + _globals = globals() + _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) + _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'types_pb2', _globals) +-if _descriptor._USE_C_DESCRIPTORS == False: +- DESCRIPTOR._options = None +- _globals['_EVENTINFO_EXTRAENTRY']._options = None ++if not _descriptor._USE_C_DESCRIPTORS: ++ DESCRIPTOR._loaded_options = None ++ _globals['_EVENTINFO_EXTRAENTRY']._loaded_options = None + _globals['_EVENTINFO_EXTRAENTRY']._serialized_options = b'8\001' + _globals['_EVENTINFO']._serialized_start=62 + _globals['_EVENTINFO']._serialized_end=335 +diff --git a/pyproject.toml b/pyproject.toml +index 2e40385c..c2878d15 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -36,7 +36,7 @@ dependencies = [ + "Jinja2>=3.1.3,<4", + "mashumaro[msgpack]>=3.9,<4.0", + "pathspec>=0.9,<0.13", +- "protobuf>=4.0.0,<5.0.0", ++ "protobuf>=5.0,<6.0", + "python-dateutil>=2.0,<3.0", + "requests<3.0.0", # needs to match dbt-core + "typing-extensions>=4.4,<5.0", +@@ -52,7 +52,7 @@ lint = [ + "pytest>=7.3,<8.0", # needed for linting tests + "types-Jinja2>=2.11,<3.0", + "types-jsonschema>=4.17,<5.0", +- "types-protobuf>=4.24,<5.0", ++ "types-protobuf>=5.0,<6.0", + "types-python-dateutil>=2.8,<3.0", + "types-PyYAML>=6.0,<7.0", + "types-requests" diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index 1f06cf0faf12..aa57d59ee42f 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -29,28 +29,31 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.8.6"; + version = "1.8.8"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-core"; rev = "refs/tags/v${version}"; - hash = "sha256-Zd1qPTfJgoGpkrMSt0K1jAdYAxICdru9vIXXqbmZryo="; + hash = "sha256-M9O9jLjIr9kolkye5RwaS2jK6dpncEOo1rtxY7WXS7U="; }; sourceRoot = "${src.name}/core"; pythonRelaxDeps = [ + "protobuf" "agate" "click" + "dbt-common" "dbt-semantic-interfaces" + "logbook" "mashumaro" "networkx" - "logbook" "pathspec" + "protobuf" "urllib3" ]; diff --git a/pkgs/development/python-modules/dbt-extractor/default.nix b/pkgs/development/python-modules/dbt-extractor/default.nix index 2e3eecc5dfcd..89066e5c9c50 100644 --- a/pkgs/development/python-modules/dbt-extractor/default.nix +++ b/pkgs/development/python-modules/dbt-extractor/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # no python tests exist doCheck = false; diff --git a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix index 9eb306074a57..94d21ce3ecef 100644 --- a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix +++ b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "dbt-semantic-interfaces"; - version = "0.6.2"; + version = "0.7.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-semantic-interfaces"; rev = "refs/tags/v${version}"; - hash = "sha256-V6yMT9Fkug+T3smBEu0Szg5GPMRxEOZc4gtJybWXbrs="; + hash = "sha256-LHcNitkrDQNz2971iMn13eELUyuJbjUK/u+u83JRIBk="; }; pythonRelaxDeps = [ "importlib-metadata" ]; diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 552207472c4d..89358afbf5f0 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "2.24.0"; + version = "2.24.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "dbus-fast"; rev = "refs/tags/v${version}"; - hash = "sha256-8M2SRyAkuxNbwT5NRN6cwJ82OtprfBZXi9Yqwh1NLVY="; + hash = "sha256-RRVQCah44YTgRoGKtTDFU3dsaFbiUnKze3tZoCLM4uk="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix index 117fa8c08948..038186c8d3aa 100644 --- a/pkgs/development/python-modules/dbus-next/default.nix +++ b/pkgs/development/python-modules/dbus-next/default.nix @@ -6,7 +6,7 @@ setuptools, dbus, pytest, - pytest-cov, + pytest-cov-stub, pytest-asyncio, pytest-timeout, }: @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeCheckInputs = [ dbus pytest - pytest-cov + pytest-cov-stub pytest-asyncio pytest-timeout ]; diff --git a/pkgs/development/python-modules/debuglater/default.nix b/pkgs/development/python-modules/debuglater/default.nix index 503dc862497b..fcb0b4f1f945 100644 --- a/pkgs/development/python-modules/debuglater/default.nix +++ b/pkgs/development/python-modules/debuglater/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ colorama ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ dill ]; }; @@ -34,7 +34,7 @@ buildPythonPackage rec { numpy pandas pytestCheckHook - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; pythonImportsCheck = [ "debuglater" ]; diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 18e9acec9b57..d9b3dfce72a5 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.8.5"; + version = "1.8.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "debugpy"; rev = "refs/tags/v${version}"; - hash = "sha256-SmSYhmLnVpBPEPO2o40wIv+e3cBbmZXSz+IKMRcnScw="; + hash = "sha256-zkNV+tFRAxTdl+lCPD4XYI1Oz0dVyX4GGuNdfzy2sJU="; }; patches = @@ -58,14 +58,14 @@ buildPythonPackage rec { # - https://github.com/NixOS/nixpkgs/issues/251045 ./skip-attach-pid-tests.patch ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ # Hard code GDB path (used to attach to process) (substituteAll { src = ./hardcode-gdb.patch; inherit gdb; }) ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Hard code LLDB path (used to attach to process) (substituteAll { src = ./hardcode-lldb.patch; @@ -73,13 +73,12 @@ buildPythonPackage rec { }) ]; - # Remove pre-compiled "attach" libraries and recompile for host platform - # Compile flags taken from linux_and_mac/compile_linux.sh & linux_and_mac/compile_mac.sh + # Compile attach library for host platform + # Derived from linux_and_mac/compile_linux.sh & linux_and_mac/compile_mac.sh preBuild = '' ( set -x cd src/debugpy/_vendored/pydevd/pydevd_attach_to_process - rm *.so *.dylib *.dll *.exe *.pdb $CXX linux_and_mac/attach.cpp -Ilinux_and_mac -std=c++11 -fPIC -nostartfiles ${ { "x86_64-linux" = "-shared -o attach_linux_amd64.so"; @@ -119,12 +118,12 @@ buildPythonPackage rec { export DEBUGPY_PROCESS_SPAWN_TIMEOUT=0 export DEBUGPY_PROCESS_EXIT_TIMEOUT=0 '' - + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 export no_proxy='*'; ''; - postCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + postCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' unset no_proxy ''; diff --git a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch index 5cc68b21b3c6..d977f78771f5 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch @@ -1,13 +1,13 @@ diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -index 85f3353b..56fab577 100644 +index a1a852a0..0bb91807 100644 --- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -@@ -410,7 +410,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show +@@ -412,7 +412,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show is_debug = 0 # Note that the space in the beginning of each line in the multi-line is important! cmd = [ -- 'gdb', +- "gdb", + '@gdb@/bin/gdb', - '--nw', # no gui interface - '--nh', # no ~/.gdbinit - '--nx', # no .gdbinit + "--nw", # no gui interface + "--nh", # no ~/.gdbinit + "--nx", # no .gdbinit diff --git a/pkgs/development/python-modules/debugpy/hardcode-lldb.patch b/pkgs/development/python-modules/debugpy/hardcode-lldb.patch index 215e7ee0f9ca..5edbe3545695 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-lldb.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-lldb.patch @@ -1,13 +1,13 @@ diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -index 56fab577..989ede03 100644 +index 0bb91807..8026a5ad 100644 --- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -@@ -500,7 +500,7 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d +@@ -503,7 +503,7 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d is_debug = 0 # Note that the space in the beginning of each line in the multi-line is important! cmd = [ -- 'lldb', +- "lldb", + '@lldb@/bin/lldb', - '--no-lldbinit', # Do not automatically parse any '.lldbinit' files. + "--no-lldbinit", # Do not automatically parse any '.lldbinit' files. # '--attach-pid', # str(pid), diff --git a/pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch b/pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch index a993940f7266..cef0a97eb300 100644 --- a/pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch +++ b/pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch @@ -12,7 +12,7 @@ index dc60d0ae..cf4a06a3 100644 log.info("Attaching {0} to {1} by PID.", session, target) diff --git a/tests/debugpy/test_attach.py b/tests/debugpy/test_attach.py -index afabc1ac..2fff3982 100644 +index 017d7f59..63e86328 100644 --- a/tests/debugpy/test_attach.py +++ b/tests/debugpy/test_attach.py @@ -151,8 +151,7 @@ def test_reattach(pyfile, target, run): diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index af4500ffd580..3b46cf4aac9c 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -2,10 +2,20 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonOlder, + + # build-system + setuptools, + + # dependencies click, - ordered-set, + orderly-set, orjson, + + # optional-dependencies clevercsv, + + # tests jsonpickle, numpy, pytestCheckHook, @@ -13,13 +23,14 @@ pyyaml, toml, tomli-w, - pythonOlder, + polars, + pandas, }: buildPythonPackage rec { pname = "deepdiff"; - version = "7.0.1"; - format = "setuptools"; + version = "8.0.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,21 +38,26 @@ buildPythonPackage rec { owner = "seperman"; repo = "deepdiff"; rev = "refs/tags/${version}"; - hash = "sha256-HqmAE5sLwyjyUahIUeRIJW0c5eliq/qEzE2FydHwc70="; + hash = "sha256-e6eTPSGoJ8r/4vGi/iGVFW/BruBADtVMtnO001Qs0IQ="; }; - postPatch = '' - substituteInPlace tests/test_command.py \ - --replace '/tmp/' "$TMPDIR/" - ''; + build-system = [ + setuptools + ]; - propagatedBuildInputs = [ + dependencies = [ click - ordered-set + orderly-set orjson ]; + pythonRelaxDeps = [ + # Upstream develops this package as well, and from some reason pins this + # dependency to a patch version below this one. No significant changes + # happend in that relase, so we shouldn't worry, especially if tests pass. + "orderly-set" + ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ clevercsv click @@ -56,22 +72,30 @@ buildPythonPackage rec { pytestCheckHook python-dateutil tomli-w - ] ++ passthru.optional-dependencies.cli; + polars + pandas + ] ++ optional-dependencies.cli; disabledTests = [ # not compatible with pydantic 2.x "test_pydantic1" "test_pydantic2" + # Require pytest-benchmark + "test_cache_deeply_nested_a1" + "test_lfu" ]; pythonImportsCheck = [ "deepdiff" ]; - meta = with lib; { + meta = { description = "Deep Difference and Search of any Python object/data"; mainProgram = "deep"; homepage = "https://github.com/seperman/deepdiff"; changelog = "https://github.com/seperman/deepdiff/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ mic92 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + mic92 + doronbehar + ]; }; } diff --git a/pkgs/development/python-modules/deepface/default.nix b/pkgs/development/python-modules/deepface/default.nix new file mode 100644 index 000000000000..6565d98cdf75 --- /dev/null +++ b/pkgs/development/python-modules/deepface/default.nix @@ -0,0 +1,80 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fire, + flask, + flask-cors, + gdown, + gunicorn, + mtcnn, + numpy, + opencv4, + pandas, + pillow, + pythonOlder, + requests, + retinaface, + setuptools, + tensorflow, + tqdm, +}: + +buildPythonPackage rec { + pname = "deepface"; + version = "0.0.92"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "serengil"; + repo = "deepface"; + rev = "refs/tags/v${version}"; + hash = "sha256-Vjm8lfpGyJ7/1CUwIvxXxHqwmv0+iKewYV3vE08gpPQ="; + }; + + postPatch = '' + # prevent collisions + substituteInPlace setup.py \ + --replace-fail "data_files=[(\"\", [\"README.md\", \"requirements.txt\", \"package_info.json\"])]," "" \ + --replace-fail "install_requires=requirements," "" + + substituteInPlace deepface/detectors/OpenCv.py \ + --replace-fail "opencv_home = cv2.__file__" "opencv_home = os.readlink(cv2.__file__)" \ + --replace-fail "folders = opencv_home.split(os.path.sep)[0:-1]" "folders = opencv_home.split(os.path.sep)[0:-4]" \ + --replace-fail "return path + \"/data/\"" "return path + \"/share/opencv4/haarcascades/\"" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + fire + flask + flask-cors + gdown + gunicorn + mtcnn + numpy + opencv4 + pandas + pillow + requests + retinaface + tensorflow + tqdm + ]; + + # requires internet connection + doCheck = false; + + pythonImportsCheck = [ "deepface" ]; + + meta = { + description = "Lightweight Face Recognition and Facial Attribute Analysis (Age, Gender, Emotion and Race) Library for Python"; + homepage = "https://github.com/serengil/deepface"; + changelog = "https://github.com/serengil/deepface/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ derdennisop ]; + }; +} diff --git a/pkgs/development/python-modules/deepsearch-toolkit/default.nix b/pkgs/development/python-modules/deepsearch-toolkit/default.nix new file mode 100644 index 000000000000..92a88b601507 --- /dev/null +++ b/pkgs/development/python-modules/deepsearch-toolkit/default.nix @@ -0,0 +1,93 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + certifi, + docling-core, + platformdirs, + pluggy, + pydantic, + pydantic-settings, + python-dateutil, + python-dotenv, + requests, + six, + tabulate, + tqdm, + typer, + urllib3, + anyio, + fastapi, + uvicorn, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "deepsearch-toolkit"; + version = "1.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "DS4SD"; + repo = "deepsearch-toolkit"; + rev = "refs/tags/v${version}"; + hash = "sha256-7XiI/VtXX4lRMreqUh6hJvdIULGvsCEdrd+zV5Jrne0="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + certifi + docling-core + platformdirs + pluggy + pydantic + pydantic-settings + python-dateutil + python-dotenv + requests + six + tabulate + tqdm + typer + urllib3 + ]; + + pythonRelaxDeps = [ + "urllib3" + ]; + + optional-dependencies = rec { + all = api; + api = [ + anyio + fastapi + uvicorn + ]; + }; + + pythonImportsCheck = [ + "deepsearch" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Tests require the creation of a deepsearch profile + "test_project_listing" + "test_system_info" + ]; + + meta = { + changelog = "https://github.com/DS4SD/deepsearch-toolkit/blob/${src.rev}/CHANGELOG.md"; + description = "Interact with the Deep Search platform for new knowledge explorations and discoveries"; + homepage = "https://github.com/DS4SD/deepsearch-toolkit"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index e0b4b3907c37..78d31ec97224 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, httpx, poetry-core, + pytest-cov-stub, pytest-mock, pytest-vcr, pytestCheckHook, @@ -14,35 +15,29 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "7.0.0"; + version = "7.1.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "browniebroke"; repo = "deezer-python"; rev = "refs/tags/v${version}"; - hash = "sha256-V4M6qRTa7XKbl962Z3y70+v3YCeW65VjeSIv/1Oxnws="; + hash = "sha256-d+cN6f6jw8D+noxyYl/TpDAkeTb8Krt+r0/Ai65cvdU="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov=deezer" "" - ''; - build-system = [ poetry-core ]; - dependencies = [ - httpx - tornado - ]; + dependencies = [ httpx ]; nativeCheckInputs = [ environs + pytest-cov-stub pytest-mock pytest-vcr pytestCheckHook + tornado ]; pythonImportsCheck = [ "deezer" ]; diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix index 309b02d14fa1..4e2c4d9b75e2 100644 --- a/pkgs/development/python-modules/defcon/default.nix +++ b/pkgs/development/python-modules/defcon/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "defcon" ]; - passthru.optional-dependencies = { + optional-dependencies = { pens = [ fontpens ]; lxml = [ fonttools ] ++ fonttools.optional-dependencies.lxml; }; diff --git a/pkgs/development/python-modules/dehinter/default.nix b/pkgs/development/python-modules/dehinter/default.nix index e621b2979bcc..55dc1c503fb4 100644 --- a/pkgs/development/python-modules/dehinter/default.nix +++ b/pkgs/development/python-modules/dehinter/default.nix @@ -21,7 +21,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ fonttools ]; - doCheck = true; nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/deltalake/default.nix b/pkgs/development/python-modules/deltalake/default.nix index a30d199a2287..c61c1cd3b41d 100644 --- a/pkgs/development/python-modules/deltalake/default.nix +++ b/pkgs/development/python-modules/deltalake/default.nix @@ -19,17 +19,17 @@ buildPythonPackage rec { pname = "deltalake"; - version = "0.19.1"; + version = "0.20.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Xgn6uyIfuB6YnCg8FieOr/tuhXBtmDZKvNpcDGynNZg="; + hash = "sha256-serMb6Rirmw+QLpET3NT2djBoFBW/TGu1/5qYjiYpKE="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-ebX51/ztIdhY81sd0fdPsKvaGtCEk8oofrj/Nrt8nfA="; + hash = "sha256-NkXovFsX+qbca+gYeBMQnacNzubloWNW/GrXNeWquE8="; }; env.OPENSSL_NO_VENDOR = 1; @@ -41,7 +41,7 @@ buildPythonPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration libiconv diff --git a/pkgs/development/python-modules/demesdraw/default.nix b/pkgs/development/python-modules/demesdraw/default.nix index d4fe828315d3..6a3c4d44e99a 100644 --- a/pkgs/development/python-modules/demesdraw/default.nix +++ b/pkgs/development/python-modules/demesdraw/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. - env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; + env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "Agg"; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/demoji/default.nix b/pkgs/development/python-modules/demoji/default.nix index 4538f6c9c8be..b63b2c12a1c0 100644 --- a/pkgs/development/python-modules/demoji/default.nix +++ b/pkgs/development/python-modules/demoji/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { ujson = [ ujson ]; }; diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix index 8cc15b7210c7..37336cddb4a7 100644 --- a/pkgs/development/python-modules/dendropy/default.nix +++ b/pkgs/development/python-modules/dendropy/default.nix @@ -7,12 +7,12 @@ pythonOlder, nix-update-script, setuptools, - paup, + paup-cli, paupIntegration ? false, }: let - paupPath = if paupIntegration then lib.getExe paup else "NONE"; + paupPath = if paupIntegration then lib.getExe paup-cli else "NONE"; in buildPythonPackage rec { pname = "dendropy"; diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 5f113865c388..4c668367fb00 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -6,6 +6,7 @@ buildPythonPackage, defusedxml, fetchFromGitHub, + fetchpatch2, ftfy, httpx, netifaces, @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "denonavr"; - version = "0.11.6"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,14 +29,22 @@ buildPythonPackage rec { owner = "ol-iver"; repo = "denonavr"; rev = "refs/tags/${version}"; - hash = "sha256-VxoRK1qeGrIunsiCzeZJUHxW/sxk+PFpntInL+G/yI8="; + hash = "sha256-/K2pz3B4H205grDeuMWZmEeA4wJqKhP0XdpmbqFguTM="; }; + patches = [ + (fetchpatch2 { + name = "pytest-httpx-compat.patch"; + url = "https://github.com/ol-iver/denonavr/commit/5320aadae91135a8c208c83d82688ddf26eb6498.patch"; + hash = "sha256-F9R5GJ1XK3lHWLY+OgzKu3+xCosK3nX4EII9J1jhlys="; + }) + ]; + pythonRelaxDeps = [ "defusedxml" ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ asyncstdlib attrs defusedxml @@ -57,7 +66,7 @@ buildPythonPackage rec { description = "Automation Library for Denon AVR receivers"; homepage = "https://github.com/ol-iver/denonavr"; changelog = "https://github.com/ol-iver/denonavr/releases/tag/${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ colemickens ]; }; } diff --git a/pkgs/development/python-modules/dep-logic/default.nix b/pkgs/development/python-modules/dep-logic/default.nix index e29decc1002f..ac7980462465 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.4.6"; + version = "0.4.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pdm-project"; repo = "dep-logic"; rev = "refs/tags/${version}"; - hash = "sha256-z5PXecu63/9sO73ruYX6+ZIq2DSVYljd3bKapJIemDA="; + hash = "sha256-5PEHkxwIgDz3Qs993qI4eaQZ5Him4i/MAnUam820AWc="; }; nativeBuildInputs = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index be655a971dd4..57280fd95468 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -14,46 +14,41 @@ pythonOlder, pyyaml, scipy, - six, + setuptools, }: buildPythonPackage rec { pname = "dependency-injector"; - version = "4.41.0"; - format = "setuptools"; + version = "4.42.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ets-labs"; repo = "python-dependency-injector"; - rev = version; - hash = "sha256-U3U/L8UuYrfpm4KwVNmViTbam7QdZd2vp1p+ENtOJlw="; + rev = "refs/tags/${version}"; + hash = "sha256-ryPNmiIKQzR4WSjt7hi4C+iTsYvfj5TYGy+9PJxX+10="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; pydantic = [ pydantic ]; flask = [ flask ]; yaml = [ pyyaml ]; }; - nativeCheckInputs = - [ - fastapi - httpx - mypy-boto3-s3 - numpy - pytest-asyncio - pytestCheckHook - scipy - ] - ++ passthru.optional-dependencies.aiohttp - ++ passthru.optional-dependencies.pydantic - ++ passthru.optional-dependencies.yaml - ++ passthru.optional-dependencies.flask; + nativeCheckInputs = [ + fastapi + httpx + mypy-boto3-s3 + numpy + pytest-asyncio + pytestCheckHook + scipy + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "dependency_injector" ]; @@ -61,6 +56,8 @@ buildPythonPackage rec { # Exclude tests for EOL Python releases "tests/unit/ext/test_aiohttp_py35.py" "tests/unit/wiring/test_*_py36.py" + "tests/unit/providers/configuration/test_from_pydantic_py36.py" + "tests/unit/providers/configuration/test_pydantic_settings_in_init_py36.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/deploykit/default.nix b/pkgs/development/python-modules/deploykit/default.nix index 01183b27a8d7..e2882a7fa7f5 100644 --- a/pkgs/development/python-modules/deploykit/default.nix +++ b/pkgs/development/python-modules/deploykit/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ "test_ssh" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_ssh" ]; # don't swallow stdout/stderr pytestFlagsArray = [ "-s" ]; diff --git a/pkgs/development/python-modules/deprecation-alias/default.nix b/pkgs/development/python-modules/deprecation-alias/default.nix index da60ac253a23..0d97bb0b4413 100644 --- a/pkgs/development/python-modules/deprecation-alias/default.nix +++ b/pkgs/development/python-modules/deprecation-alias/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { packaging ]; - nativeCheckInputs = [ ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index a6260c35ad5f..30c5275edbf9 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { bidict packaging ] - ++ lib.optionals stdenv.isLinux [ dbus-fast ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus-fast ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rubicon-objc ]; # no tests available, do the imports check instead diff --git a/pkgs/development/python-modules/detectron2/default.nix b/pkgs/development/python-modules/detectron2/default.nix index 2247b4581a4d..42b8f0a6f43c 100644 --- a/pkgs/development/python-modules/detectron2/default.nix +++ b/pkgs/development/python-modules/detectron2/default.nix @@ -99,7 +99,7 @@ buildPythonPackage { pydot # no idea why this is not in their setup.py ]; - passthru.optional-dependencies = optional-dependencies; + optional-dependencies = optional-dependencies; nativeCheckInputs = [ av @@ -163,7 +163,7 @@ buildPythonPackage { "test_overlay_instances_no_boxes" "test_get_bounding_box" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ "test_build_batch_dataloader_inference" "test_build_dataloader_inference" "test_build_iterable_dataloader_inference" diff --git a/pkgs/development/python-modules/devgoldyutils/default.nix b/pkgs/development/python-modules/devgoldyutils/default.nix index fb70dba6d40c..db7b236e19ee 100644 --- a/pkgs/development/python-modules/devgoldyutils/default.nix +++ b/pkgs/development/python-modules/devgoldyutils/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Collection of utility functions for Python used by mov-cli"; homepage = "https://github.com/THEGOLDENPRO/devgoldyutils"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ roshaen ]; + maintainers = with lib.maintainers; [ youhaveme9 ]; }; } diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index 95ec86ff5eb3..47340bd1325c 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -100,18 +100,18 @@ buildPythonPackage rec { "test_subdomainset_mpi" "test_subdomains_mpi" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - assert False "test_v0" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # FAILED tests/test_caching.py::TestCaching::test_special_symbols - ValueError: not enough values to unpack (expected 3, got 2) "test_special_symbols" # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - codepy.CompileError: module compilation failed "test_v0" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Numerical tests "test_lm_fb" "test_lm_ds" @@ -127,7 +127,9 @@ buildPythonPackage rec { "tests/test_dse.py" "tests/test_gradient.py" ] - ++ lib.optionals ((stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin) [ "tests/test_dle.py" ]; + ++ lib.optionals ( + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin + ) [ "tests/test_dle.py" ]; pythonImportsCheck = [ "devito" ]; diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix index da12ca39dbd0..d88de025c3fe 100644 --- a/pkgs/development/python-modules/devolo-plc-api/default.nix +++ b/pkgs/development/python-modules/devolo-plc-api/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "protobuf>=4.22.0" "protobuf" + --replace-fail "protobuf>=4.22.0" "protobuf" ''; nativeBuildInputs = [ setuptools-scm ]; @@ -53,6 +53,11 @@ buildPythonPackage rec { syrupy ]; + disabledTests = [ + # pytest-httpx compat issue + "test_wrong_password_type" + ]; + pythonImportsCheck = [ "devolo_plc_api" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 218db0fe558d..7197be7d2336 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -10,6 +10,7 @@ setuptools-changelog-shortener, setuptools, tomli, + nix-update-script, }: buildPythonPackage rec { @@ -41,6 +42,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "devpi_common" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://github.com/devpi/devpi"; description = "Utilities jointly used by devpi-server and devpi-client"; diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix index 0e12fe09c775..a3b123f84302 100644 --- a/pkgs/development/python-modules/dicom2nifti/default.nix +++ b/pkgs/development/python-modules/dicom2nifti/default.nix @@ -8,6 +8,8 @@ nibabel, numpy, pydicom, + pylibjpeg, + pylibjpeg-libjpeg, scipy, setuptools, }: @@ -37,16 +39,16 @@ buildPythonPackage rec { scipy ]; - # python-gdcm just builds the python interface provided by the "gdcm" package, so - # we should be able to replace "python-gdcm" with "gdcm" but this doesn't work - # (similar to https://github.com/NixOS/nixpkgs/issues/84774) postPatch = '' - substituteInPlace setup.py --replace-fail "python-gdcm" "" substituteInPlace tests/test_generic.py --replace-fail "from common" "from dicom2nifti.common" substituteInPlace tests/test_ge.py --replace-fail "import convert_generic" "import dicom2nifti.convert_generic as convert_generic" ''; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pylibjpeg + pylibjpeg-libjpeg + ]; pythonImportsCheck = [ "dicom2nifti" ]; diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix index 6887f8a13ac7..f00a973275cd 100644 --- a/pkgs/development/python-modules/dict2xml/default.nix +++ b/pkgs/development/python-modules/dict2xml/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "dict2xml"; - version = "1.7.5"; + version = "1.7.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "delfick"; repo = "python-dict2xml"; rev = "refs/tags/release-${version}"; - hash = "sha256-GNvG1VFz/qkkTrKleMrq8n6kcIYtfhUlQMyCqH9uQzw="; + hash = "sha256-5GnIVpG2xHKYv27sSjjmm8JsZ1YR9Mvc3SqE4SnE84o="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/diff-match-patch/default.nix b/pkgs/development/python-modules/diff-match-patch/default.nix index 7c7936ec8816..a794308df314 100644 --- a/pkgs/development/python-modules/diff-match-patch/default.nix +++ b/pkgs/development/python-modules/diff-match-patch/default.nix @@ -8,15 +8,16 @@ buildPythonPackage rec { pname = "diff-match-patch"; - version = "20230430"; - format = "pyproject"; + version = "20241021"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-lTAZzbnJ0snke1sSvP889HRvxFmOtAYHb6H8J+ah8Vw="; + pname = "diff_match_patch"; + inherit version; + hash = "sha256-vq5XqZ+kgIRTKTXuKWi4Zh24YYYuyCxvIfSs3W2DUHM="; }; - nativeBuildInputs = [ flit-core ]; + dependencies = [ flit-core ]; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/diffenator2/default.nix b/pkgs/development/python-modules/diffenator2/default.nix index e5297364fc18..111cf8aa2a83 100644 --- a/pkgs/development/python-modules/diffenator2/default.nix +++ b/pkgs/development/python-modules/diffenator2/default.nix @@ -27,19 +27,23 @@ buildPythonPackage rec { pname = "diffenator2"; - version = "0.4.3"; + version = "0.4.5"; pyproject = true; src = fetchFromGitHub { owner = "googlefonts"; repo = "diffenator2"; rev = "refs/tags/v${version}"; - hash = "sha256-zeNcNR14ieY6Inp4kOwIPXd6S+/wFdMFp6wbiqgB/iA="; + hash = "sha256-Iu6ZA8s6XnOYSOwlt8WTmYW6oUTvcm4vLhYvVATOlBA="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; + env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; - pythonRelaxDeps = [ "protobuf" ]; + pythonRelaxDeps = [ + "protobuf" + "python-bidi" + "youseedee" + ]; build-system = [ poetry-core diff --git a/pkgs/development/python-modules/diffsync/default.nix b/pkgs/development/python-modules/diffsync/default.nix index 28ea4eb3a9f5..fbfb03ca6802 100644 --- a/pkgs/development/python-modules/diffsync/default.nix +++ b/pkgs/development/python-modules/diffsync/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "diffsync"; - version = "2.0.0"; + version = "2.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "networktocode"; repo = "diffsync"; rev = "refs/tags/v${version}"; - hash = "sha256-4LS18FPrnGE1tM0pFzAw0+ajDaw9g7MCgIwS2ptrX9c="; + hash = "sha256-T3kcZcRm28WeXZTXBBCpaMxjgB0KmqvWO4gdILH5hCA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix index ee540ee7e9c8..7b4c38096f23 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.30.0"; + version = "0.30.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "diffusers"; rev = "refs/tags/v${version}"; - hash = "sha256-fry16HDAjpuosSHSDDm/Y5dTNkpsGM6S33hOJ3n2x7M="; + hash = "sha256-/3lHJdsNblKb6xX03OluSCApMK3EXJbRLboBk8CjobE="; }; build-system = [ setuptools ]; @@ -65,7 +65,7 @@ buildPythonPackage rec { safetensors ]; - passthru.optional-dependencies = { + optional-dependencies = { flax = [ flax jax @@ -102,7 +102,7 @@ buildPythonPackage rec { sentencepiece torchsde transformers - ] ++ passthru.optional-dependencies.torch; + ] ++ optional-dependencies.torch; preCheck = let diff --git a/pkgs/development/python-modules/digi-xbee/default.nix b/pkgs/development/python-modules/digi-xbee/default.nix index 8ba90f4d8ac5..319239b24123 100644 --- a/pkgs/development/python-modules/digi-xbee/default.nix +++ b/pkgs/development/python-modules/digi-xbee/default.nix @@ -9,13 +9,14 @@ buildPythonPackage rec { pname = "digi-xbee"; - version = "1.4.1"; + version = "1.5.0"; format = "setuptools"; disabled = isPy27; src = fetchPypi { - inherit pname version; - sha256 = "3b10e749431f406d80c189d872f4673b8d3cd510f7b411f817780a0e72499cd2"; + pname = "digi_xbee"; + inherit version; + hash = "sha256-amUrhHIpeRHuShD0cxb2sbbRTpJQZ9/b8otsa1Bo+bI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index 790cb9ce0cd6..33f0ccd2acca 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dill"; - version = "0.3.8"; + version = "0.3.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "uqfoundation"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-r65JgQH+5raiRX8NYELUB9B0zLy4z606EkFJaNpapNc="; + hash = "sha256-p+W0ppNMfSgplKsQjaTnTrMvQ5poF/E/xSzsiLf9h58="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/dinghy/default.nix b/pkgs/development/python-modules/dinghy/default.nix index 451f4c6578f6..a59b541282be 100644 --- a/pkgs/development/python-modules/dinghy/default.nix +++ b/pkgs/development/python-modules/dinghy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "dinghy"; - version = "1.3.2"; + version = "1.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "nedbat"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0U08QHQuNm7qaxhU8sNxeN0fZ4S8N0RYRsWjFUqhZSU="; + hash = "sha256-fn8SRzhFJyyr2Wr9/cp8Sm6kbVARq2LEeKSE0HU9V74="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/diofant/default.nix b/pkgs/development/python-modules/diofant/default.nix index 9fa09e0df070..03566cf27dc1 100644 --- a/pkgs/development/python-modules/diofant/default.nix +++ b/pkgs/development/python-modules/diofant/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ mpmath ]; - passthru.optional-dependencies = { + optional-dependencies = { exports = [ cython numpy diff --git a/pkgs/development/python-modules/dipy/default.nix b/pkgs/development/python-modules/dipy/default.nix index d1f9fdd4209c..6ef4d2494502 100644 --- a/pkgs/development/python-modules/dipy/default.nix +++ b/pkgs/development/python-modules/dipy/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + meson-python, packaging, cython, numpy, @@ -10,33 +11,43 @@ h5py, nibabel, tqdm, + trx-python, }: buildPythonPackage rec { pname = "dipy"; - version = "1.7.0"; - format = "setuptools"; + version = "1.9.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "dipy"; - repo = pname; + repo = "dipy"; rev = "refs/tags/${version}"; - hash = "sha256-sfqCK2r9Io1gDDHL9s9R37J0h9KcOQML3B2zJx2+QuA="; + hash = "sha256-6cpxuk2PL43kjQ+6UGiUHUXC7pC9OlW9kZvGOdEXyzw="; }; - nativeBuildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "numpy==" "numpy>=" + ''; + + build-system = [ cython + meson-python + numpy packaging ]; - propagatedBuildInputs = [ + dependencies = [ numpy scipy h5py nibabel + packaging tqdm + trx-python ]; # disable tests for now due to: @@ -53,7 +64,6 @@ buildPythonPackage rec { "dipy.reconst" "dipy.io" "dipy.viz" - "dipy.boots" "dipy.data" "dipy.utils" "dipy.segment" diff --git a/pkgs/development/python-modules/directv/default.nix b/pkgs/development/python-modules/directv/default.nix index 66526a2d0975..43a1a1d0e655 100644 --- a/pkgs/development/python-modules/directv/default.nix +++ b/pkgs/development/python-modules/directv/default.nix @@ -32,6 +32,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # ValueError: Host '#' cannot contain '#' (at position 0) + "test_client_error" + ]; + pythonImportsCheck = [ "directv" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dirigera/default.nix b/pkgs/development/python-modules/dirigera/default.nix index 7ad69d67384b..6350bbdb9fdb 100644 --- a/pkgs/development/python-modules/dirigera/default.nix +++ b/pkgs/development/python-modules/dirigera/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dirigera"; - version = "1.1.9"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Leggin"; repo = "dirigera"; rev = "refs/tags/v${version}"; - hash = "sha256-5vvWBJhTIFmYKIPQqZ1q2zSkru32SyPll8WNgOAdZwU="; + hash = "sha256-fjVMdBIU1MCfiv1UGgjVonlvU+xESQPn4HIbEhOGclc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/dirty-equals/default.nix b/pkgs/development/python-modules/dirty-equals/default.nix index aa3434a05089..72ecda8521c4 100644 --- a/pkgs/development/python-modules/dirty-equals/default.nix +++ b/pkgs/development/python-modules/dirty-equals/default.nix @@ -13,23 +13,24 @@ let dirty-equals = buildPythonPackage rec { pname = "dirty-equals"; - version = "0.7.1-post0"; - format = "pyproject"; + version = "0.8.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "samuelcolvin"; - repo = pname; + repo = "dirty-equals"; rev = "refs/tags/v${version}"; - hash = "sha256-U6DNluthDgxzh6IOaKrN/JhX4u+ztY/jVp9IKh0iP34="; + hash = "sha256-DZuzZ8cLYpVdivMh+zNJKpHe+0fpxM3ulKiCpN2S6co="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ pytz ]; + dependencies = [ pytz ]; doCheck = false; + passthru.tests.pytest = dirty-equals.overrideAttrs { doCheck = true; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/discum/default.nix b/pkgs/development/python-modules/discum/default.nix index acc3a6e49a03..50254162ff06 100644 --- a/pkgs/development/python-modules/discum/default.nix +++ b/pkgs/development/python-modules/discum/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, setuptools, - pythonRelaxDepsHook, brotli, colorama, filetype, @@ -28,8 +27,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - dependencies = [ brotli colorama @@ -40,7 +37,7 @@ buildPythonPackage rec { websocket-client ]; - passthru.optional-dependencies = { + optional-dependencies = { ra = [ pycryptodome pypng diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index c2a18535a763..8211267f2eb0 100644 --- a/pkgs/development/python-modules/diskcache/default.nix +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; # Darwin sandbox causes most tests to fail - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTests = [ # Very time sensitive, can fail on over subscribed machines diff --git a/pkgs/development/python-modules/dissect-btrfs/default.nix b/pkgs/development/python-modules/dissect-btrfs/default.nix index ef7f8fdd9f4a..e6f208d1b436 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.4"; + version = "1.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.btrfs"; rev = "refs/tags/${version}"; - hash = "sha256-cQC9lY80JOgLJZpNCwpvDldWjfbbI14uc9q/miAOBGM="; + hash = "sha256-k5GckcnWsXM6WC129zLXjUxNVcNRmLPp72gSUJBtExo="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { dissect-util ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ python-lzo zstandard diff --git a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix index 973cd01a7aa4..ef8e70ef1305 100644 --- a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix +++ b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix @@ -5,6 +5,8 @@ dissect-util, fetchFromGitHub, flow-record, + hatch-vcs, + hatchling, httpx, lark, pycryptodome, @@ -13,13 +15,11 @@ pytestCheckHook, pythonOlder, rich, - setuptools, - setuptools-scm, }: buildPythonPackage rec { pname = "dissect-cobaltstrike"; - version = "1.0.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,12 +28,12 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cobaltstrike"; rev = "refs/tags/v${version}"; - hash = "sha256-CS50c3r7sdxp3CRS6XJ4QUmUFtmhFg6rSdKfYzJSOV4="; + hash = "sha256-GMpMTsI4mepaOGhw7/cSymkcxzn4mlNS1ZKYGYut+LM="; }; build-system = [ - setuptools - setuptools-scm + hatch-vcs + hatchling ]; dependencies = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { lark ]; - passthru.optional-dependencies = { + optional-dependencies = { c2 = [ flow-record httpx @@ -68,7 +68,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-httpserver pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "dissect.cobaltstrike" ]; @@ -78,8 +78,5 @@ buildPythonPackage rec { changelog = "https://github.com/fox-it/dissect.cobaltstrike/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; - # Compatibility with dissect.struct 4.x - # https://github.com/fox-it/dissect.cobaltstrike/issues/53 - broken = versionAtLeast dissect-cstruct.version "4"; }; } diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index 05127c50e84d..3f020492ff67 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 = "4.1"; + version = "4.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cstruct"; rev = "refs/tags/${version}"; - hash = "sha256-8CEvn2TJTXm0t4GBG9OQo9TgSy1+sTZIusaiiGNu05M="; + hash = "sha256-HYBt1ok2ytqBodHwpBPQqjm9fNPkE6ID2j9Bn2sm7wA="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index 26cf663c5ae2..4a1cb39782d3 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { dissect-util ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ pycryptodome rich diff --git a/pkgs/development/python-modules/dissect-jffs/default.nix b/pkgs/development/python-modules/dissect-jffs/default.nix index a8c9fed87a46..aad42728587a 100644 --- a/pkgs/development/python-modules/dissect-jffs/default.nix +++ b/pkgs/development/python-modules/dissect-jffs/default.nix @@ -33,9 +33,6 @@ buildPythonPackage rec { dissect-util ]; - # Test file handling fails - doCheck = true; - pythonImportsCheck = [ "dissect.jffs" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dissect-squashfs/default.nix b/pkgs/development/python-modules/dissect-squashfs/default.nix index 88f7f3ab8467..a85b51abcf19 100644 --- a/pkgs/development/python-modules/dissect-squashfs/default.nix +++ b/pkgs/development/python-modules/dissect-squashfs/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { dissect-util ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ lz4 python-lzo diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index d2c632a1f564..259d2e7d077d 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.18"; + version = "3.19"; pyproject = true; disabled = pythonOlder "3.9"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.target"; rev = "refs/tags/${version}"; - hash = "sha256-jR+f4t0QXmm007lrGdMyF9vFa3NW35gZxs7pe9sdjfg="; + hash = "sha256-D5YgCAKcnPyBrZTpcSuvKfWfIIcCxKGxn+mj8Jqzmws="; }; postPatch = '' @@ -80,7 +80,7 @@ buildPythonPackage rec { structlog ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ asn1crypto dissect-btrfs @@ -102,12 +102,12 @@ buildPythonPackage rec { yara-python zstandard ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - yara = [ yara-python ] ++ passthru.optional-dependencies.full; - smb = [ impacket ] ++ passthru.optional-dependencies.full; - mqtt = [ paho-mqtt ] ++ passthru.optional-dependencies.full; + yara = [ yara-python ] ++ optional-dependencies.full; + smb = [ impacket ] ++ optional-dependencies.full; + mqtt = [ paho-mqtt ] ++ optional-dependencies.full; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.full; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full; pythonImportsCheck = [ "dissect.target" ]; @@ -138,6 +138,8 @@ buildPythonPackage rec { "test_systemd_basic_syntax" "test_target_cli_unicode_argparse" "test_target_query" + "test_target_info" + "test_yara" ] ++ # test is broken on Darwin diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix index a303691f3dd8..a9f020a0c7c5 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.17"; + version = "3.18"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.util"; rev = "refs/tags/${version}"; - hash = "sha256-uCmHvpZ5/TjUb9A8+GhaTAAEfCM9LxQdUDPWAvd7P7w="; + hash = "sha256-w7anXPlZZgGtpGhBuu+sA7mz02QgpUdePyJp7f03jOA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix index 3a094cbd7880..06903d466c50 100644 --- a/pkgs/development/python-modules/dissect-volume/default.nix +++ b/pkgs/development/python-modules/dissect-volume/default.nix @@ -12,24 +12,24 @@ buildPythonPackage rec { pname = "dissect-volume"; - version = "3.11"; + version = "3.12"; pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.volume"; rev = "refs/tags/${version}"; - hash = "sha256-eHIInoquuyukKuPVvVB6qtovx1NloHHVGKfFBHxVd+o="; + hash = "sha256-IhG2FZdCmYrGxHc2i+ERhphxP/uGgOY67epHEWnQXb0="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; @@ -42,8 +42,10 @@ buildPythonPackage rec { # gzip.BadGzipFile: Not a gzipped file "test_ddf_read" "test_dm_thin" + "test_lvm" "test_lvm_mirro" "test_lvm_thin" + "test_lvm" "test_md_raid0_zones" "test_md_read" ]; diff --git a/pkgs/development/python-modules/dist-meta/default.nix b/pkgs/development/python-modules/dist-meta/default.nix index 6b7520440a3d..a6d6119429c5 100644 --- a/pkgs/development/python-modules/dist-meta/default.nix +++ b/pkgs/development/python-modules/dist-meta/default.nix @@ -25,8 +25,6 @@ buildPythonPackage rec { packaging ]; - nativeCheckInputs = [ ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' diff --git a/pkgs/development/python-modules/distrax/default.nix b/pkgs/development/python-modules/distrax/default.nix index 83a4a16d650e..bae7ef5ffb93 100644 --- a/pkgs/development/python-modules/distrax/default.nix +++ b/pkgs/development/python-modules/distrax/default.nix @@ -74,6 +74,20 @@ buildPythonPackage rec { "distrax/_src/distributions/transformed_test.py" "distrax/_src/distributions/uniform_test.py" "distrax/_src/utils/transformations_test.py" + # https://github.com/google-deepmind/distrax/pull/270 + "distrax/_src/distributions/deterministic_test.py" + "distrax/_src/distributions/epsilon_greedy_test.py" + "distrax/_src/distributions/gamma_test.py" + "distrax/_src/distributions/greedy_test.py" + "distrax/_src/distributions/gumbel_test.py" + "distrax/_src/distributions/logistic_test.py" + "distrax/_src/distributions/log_stddev_normal_test.py" + "distrax/_src/distributions/mvn_diag_test.py" + "distrax/_src/distributions/mvn_full_covariance_test.py" + "distrax/_src/distributions/mvn_tri_test.py" + "distrax/_src/distributions/one_hot_categorical_test.py" + "distrax/_src/distributions/softmax_test.py" + "distrax/_src/utils/hmm_test.py" ]; meta = with lib; { @@ -81,8 +95,5 @@ buildPythonPackage rec { homepage = "https://github.com/deepmind/distrax"; license = licenses.asl20; maintainers = with maintainers; [ onny ]; - # Several tests fail with: - # AssertionError: [Chex] Assertion assert_type failed: Error in type compatibility check - broken = true; }; } diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 78610bb9a9a6..e652d8276034 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -1,40 +1,41 @@ { lib, buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + versioneer, + + # dependencies click, cloudpickle, dask, - fetchFromGitHub, jinja2, locket, msgpack, packaging, psutil, - pythonOlder, pyyaml, - setuptools, - setuptools-scm, sortedcontainers, tblib, toolz, tornado, urllib3, - versioneer, zict, }: buildPythonPackage rec { pname = "distributed"; - version = "2024.8.2"; + version = "2024.10.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "dask"; repo = "distributed"; rev = "refs/tags/${version}"; - hash = "sha256-RvaWczbj/afOqTo9WPLJBkPG6li/TUwe84NS08zQMtY="; + hash = "sha256-pdVqPzz66CueGuha66RTykrLtEGx9i6aScR+NHIYWg0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/distutils/default.nix b/pkgs/development/python-modules/distutils/default.nix index 4e0a2d10d26e..64c721824bb9 100644 --- a/pkgs/development/python-modules/distutils/default.nix +++ b/pkgs/development/python-modules/distutils/default.nix @@ -5,6 +5,8 @@ setuptools-scm, setuptools, python, + jaraco-collections, + jaraco-functools, jaraco-envs, jaraco-path, jaraco-text, @@ -22,12 +24,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pypa"; repo = "distutils"; - rev = "813ab9868b353991ec7324eb09619ee5beb9183f"; - hash = "sha256-/YtITDuZlTJRisqsQ6SrgRRUrqLZpj+k3drrouURZlc="; + rev = "378984e02edae91d5f49425da8436f8dd9152b8a"; # correlate commit from setuptools version + hash = "sha256-31sPPVY6tr+OwpiFiaKw82KyhDNBVW3Foea49dCa6pA="; }; build-system = [ setuptools-scm ]; + dependencies = [ jaraco-functools ]; + postInstall = '' rm -r $out/${python.sitePackages}/distutils ln -s ${setuptools}/${python.sitePackages}/setuptools/_distutils $out/${python.sitePackages}/distutils @@ -36,6 +40,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "distutils" ]; nativeCheckInputs = [ + jaraco-collections jaraco-envs jaraco-path jaraco-text diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix index aee96dfd6cc7..542950750d62 100644 --- a/pkgs/development/python-modules/dj-database-url/default.nix +++ b/pkgs/development/python-modules/dj-database-url/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "dj-database-url"; - version = "2.2.0"; + version = "2.3.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "jazzband"; repo = "dj-database-url"; rev = "refs/tags/v${version}"; - hash = "sha256-i2btutob+5R+FFPlGwRSNF01MTfxVop8xaePDHxnqLE="; + hash = "sha256-Q0A9wA/k1xObw0e8+9qVTfpxBNL4W9rXisi0ge+R3DM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index 1f0ac3747c87..9dddc459a3cc 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -40,13 +40,13 @@ buildPythonPackage rec { dependencies = [ djangorestframework ]; - passthru.optional-dependencies.with_social = [ django-allauth ]; + optional-dependencies.with_social = [ django-allauth ]; nativeCheckInputs = [ djangorestframework-simplejwt responses unittest-xml-reporting - ] ++ passthru.optional-dependencies.with_social; + ] ++ optional-dependencies.with_social; preCheck = '' # Test connects to graph.facebook.com diff --git a/pkgs/development/python-modules/django-admin-datta/default.nix b/pkgs/development/python-modules/django-admin-datta/default.nix index 8b12a79aea2e..35e3d880da4d 100644 --- a/pkgs/development/python-modules/django-admin-datta/default.nix +++ b/pkgs/development/python-modules/django-admin-datta/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "django-admin-datta"; - version = "1.0.10"; + version = "1.0.11"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VV7mb3501aZVuXUqzVqQYUttvkYa4pAECYWn7HksOmI="; + hash = "sha256-jcX0PKyE2gHfaVJhXRvshJuZMfRJTloqIncNBLp3auc="; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index fb7eb5ffac84..4b75865cf326 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { preBuild = "${python.interpreter} -m django compilemessages"; - passthru.optional-dependencies = { + optional-dependencies = { saml = [ python3-saml ]; mfa = [ qrcode ]; }; @@ -71,7 +71,7 @@ buildPythonPackage rec { pillow pytestCheckHook pytest-django - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ # Tests require network access diff --git a/pkgs/development/python-modules/django-app-helper/default.nix b/pkgs/development/python-modules/django-app-helper/default.nix new file mode 100644 index 000000000000..f0c829ff05b5 --- /dev/null +++ b/pkgs/development/python-modules/django-app-helper/default.nix @@ -0,0 +1,63 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + django, + pythonOlder, + setuptools, + docopt, + dj-database-url, + python, + django-filer, + six, + django-app-helper, +}: + +buildPythonPackage rec { + pname = "django-app-helper"; + version = "3.3.4"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "nephila"; + repo = "django-app-helper"; + rev = "refs/tags/${version}"; + hash = "sha256-4nFg8B1uxGJVY1jcGr0e2Oi14lqXcFOi0HJ+ogE2ikg="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + dj-database-url + docopt + six + ]; + + checkInputs = [ django-filer ]; + + # Tests depend on django-filer, which depends on this package. + # To avoid infinite recursion, we only enable tests when building passthru.tests. + doCheck = false; + + checkPhase = '' + ${python.interpreter} helper.py + ''; + + pythonImportsCheck = [ "app_helper" ]; + + passthru.tests = { + runTests = django-app-helper.overrideAttrs (_: { + doCheck = true; + }); + }; + + meta = { + description = "Helper for Django applications development"; + homepage = "https://django-app-helper.readthedocs.io"; + changelog = "https://github.com/nephila/django-app-helper/releases/tag/${version}"; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index 0abd5d344e41..2e688abdfb07 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { homepage = "https://github.com/django-auth-ldap/django-auth-ldap"; license = licenses.bsd2; maintainers = with maintainers; [ mmai ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/python-modules/django-axes/default.nix b/pkgs/development/python-modules/django-axes/default.nix new file mode 100644 index 000000000000..b3c2f8cd6ac0 --- /dev/null +++ b/pkgs/development/python-modules/django-axes/default.nix @@ -0,0 +1,46 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + setuptools-scm, + django, + django-ipware, + pytestCheckHook, + pytest-cov-stub, + pytest-django, +}: + +buildPythonPackage rec { + pname = "django-axes"; + version = "7.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jazzband"; + repo = "django-axes"; + rev = version; + hash = "sha256-xcA5PN8gznY6BQwHXT42WcOLnIlUACRh33zOlsCpRHE="; + }; + + build-system = [ setuptools-scm ]; + + dependencies = [ django ]; + + nativeCheckInputs = [ + django-ipware + pytestCheckHook + pytest-cov-stub + pytest-django + ]; + + env.DJANGO_SETTINGS_MODULE = "tests.settings"; + + pythonImportsCheck = [ "axes" ]; + + meta = { + description = "Keep track of failed login attempts in Django-powered sites"; + homepage = "https://github.com/jazzband/django-axes"; + maintainers = with lib.maintainers; [ sikmir ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/django-bootstrap3/default.nix b/pkgs/development/python-modules/django-bootstrap3/default.nix index a20b282c6450..fb8a2bca0de9 100644 --- a/pkgs/development/python-modules/django-bootstrap3/default.nix +++ b/pkgs/development/python-modules/django-bootstrap3/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "django-bootstrap3"; - version = "24.2"; + version = "24.3"; format = "pyproject"; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap3"; rev = "refs/tags/v${version}"; - hash = "sha256-5nBJ5vfsoGoaG1s3K1hCHcSnGf51ZirYYg+uJGsBmG8="; + hash = "sha256-7aHGTa98NaHg6C+fxuQsrPk/8XjHB3awp+gAWysOhAw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-bootstrap4/default.nix b/pkgs/development/python-modules/django-bootstrap4/default.nix index e34ce0f4b624..7aa95c471777 100644 --- a/pkgs/development/python-modules/django-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-bootstrap4/default.nix @@ -15,35 +15,39 @@ # tests python, + pytest-django, + pytestCheckHook, }: buildPythonPackage rec { pname = "django-bootstrap4"; - version = "24.3"; - format = "pyproject"; + version = "24.4"; + pyproject = true; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap4"; rev = "refs/tags/v${version}"; - hash = "sha256-sZY/0f1PbYQu9fN65H6H7xLvsdE9AXK0cMt9TyAKuUw="; + hash = "sha256-9URZ+10GVX171Zht49UQEDkVOZ7LfOtUvapLydzNAlk="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ beautifulsoup4 ]; + dependencies = [ beautifulsoup4 ]; pythonImportsCheck = [ "bootstrap4" ]; - nativeCheckInputs = [ (django.override { withGdal = true; }) ]; + nativeCheckInputs = [ + (django.override { withGdal = true; }) + pytest-django + pytestCheckHook + ]; - checkPhase = '' - runHook preCheck - ${python.interpreter} manage.py test -v1 --noinput - runHook postCheck + preCheck = '' + export DJANGO_SETTINGS_MODULE=tests.app.settings ''; meta = with lib; { diff --git a/pkgs/development/python-modules/django-cachalot/default.nix b/pkgs/development/python-modules/django-cachalot/default.nix index 95772d937b6c..44a680f4f3dc 100644 --- a/pkgs/development/python-modules/django-cachalot/default.nix +++ b/pkgs/development/python-modules/django-cachalot/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "django-cachalot"; - version = "2.6.3"; + version = "2.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "noripyt"; repo = "django-cachalot"; rev = "refs/tags/v${version}"; - hash = "sha256-q4w2goxdDqivGVZCRDGOvYARbzmx6P8Gnw9YlYn9Few="; + hash = "sha256-Fi5UvqH2bVb4v/GWDkEYIcBMBVos+35g4kcEnZTOQvw="; }; patches = [ diff --git a/pkgs/development/python-modules/django-choices-field/default.nix b/pkgs/development/python-modules/django-choices-field/default.nix new file mode 100644 index 000000000000..ea115e5c6258 --- /dev/null +++ b/pkgs/development/python-modules/django-choices-field/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + django, + typing-extensions, + pytestCheckHook, + pytest-cov-stub, + pytest-django, +}: + +buildPythonPackage rec { + pname = "django-choices-field"; + version = "2.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bellini666"; + repo = "django-choices-field"; + rev = "v${version}"; + hash = "sha256-2oLMUM/aE4aY0eEU+CLIjTNQJAMUt/GK5Fw26QN7t34="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + django + typing-extensions + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + pytest-django + ]; + + pythonImportsCheck = [ "django_choices_field" ]; + + meta = { + description = "Django field that set/get django's new TextChoices/IntegerChoices enum"; + homepage = "https://github.com/bellini666/django-choices-field"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ minijackson ]; + }; +} diff --git a/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix b/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix index eb533ddec43f..9ffebcdc2213 100644 --- a/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "django-crispy-bootstrap4"; - version = "2024.1"; + version = "2024.10"; pyproject = true; src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "crispy-bootstrap4"; rev = "refs/tags/${version}"; - hash = "sha256-upHrNDhoY+8qD+aeXPcY452xUIyYjW0apf8mVo6pqY4="; + hash = "sha256-lBm48krF14WuUMX9lgx9a++UhJWHWPxOhj3R1j4QTOs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix b/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix index 87ccaa6a9e6a..8e14ac5c96e8 100644 --- a/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix +++ b/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "django-crispy-bootstrap5"; - version = "2024.2"; + version = "2024.10"; pyproject = true; src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "crispy-bootstrap5"; rev = "refs/tags/${version}"; - hash = "sha256-ehcDwy53pZCqouvUm6qJG2FJzlFZaygTZxNYPOqH1q0="; + hash = "sha256-p2sc6rajy9A0YNnv1A0wphjm7Kc6HoNf7LM3Gu21PKI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-crossdomainmedia/default.nix b/pkgs/development/python-modules/django-crossdomainmedia/default.nix new file mode 100644 index 000000000000..3f2134e42239 --- /dev/null +++ b/pkgs/development/python-modules/django-crossdomainmedia/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + django, + pytestCheckHook, + pytest-django, + python, +}: + +buildPythonPackage rec { + pname = "django-crossdomainmedia"; + version = "0.0.4"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "stefanw"; + repo = "django-crossdomainmedia"; + # Release is not tagged yet + # https://github.com/stefanw/django-crossdomainmedia/issues/1 + # rev = "refs/tags/v${version}"; + rev = "45af45a82e2630d99381758c7660fe9bdad06d2d"; + hash = "sha256-nwFUm+cxokZ38c5D77z15gIO/kg49oRACOl6+eGGEtQ="; + }; + + dependencies = [ django ]; + + checkPhase = '' + ${python.interpreter} manage.py test + ''; + + # django.core.exceptions.ImproperlyConfigured: Requested setting DEBUG, but settings are not configured. + # pythonImportsCheck = [ "crossdomainmedia" ]; + + meta = { + description = "Django application to retrieve user's IP address"; + homepage = "https://github.com/stefanw/django-crossdomainmedia"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/pkgs/development/python-modules/django-cte/default.nix b/pkgs/development/python-modules/django-cte/default.nix new file mode 100644 index 000000000000..1ccf00d9aaea --- /dev/null +++ b/pkgs/development/python-modules/django-cte/default.nix @@ -0,0 +1,64 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + unittestCheckHook, + setuptools, + django, +}: + +buildPythonPackage rec { + pname = "django-cte"; + version = "1.3.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dimagi"; + repo = "django-cte"; + rev = "refs/tags/v${version}"; + hash = "sha256-OCENg94xHBeeE4A2838Cu3q2am2im2X4SkFSjc6DuhE="; + }; + + build-system = [ setuptools ]; + + dependencies = [ django ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTests = [ + # Require Database connection + "test_cte_queryset" + "test_experimental_left_outer_join" + "test_explain" + "test_left_outer_join_on_empty_result_set_cte" + "test_named_ctes" + "test_named_simple_ctes" + "test_non_cte_subquery" + "test_outerref_in_cte_query" + "test_simple_cte_query" + "test_update_cte_query" + "test_update_with_subquery" + "test_heterogeneous_filter_in_cte" + "test_raw_cte_sql" + "test_alias_as_subquery" + "test_alias_change_in_annotation" + "test_attname_should_not_mask_col_name" + "test_pickle_recursive_cte_queryset" + "test_recursive_cte_query" + "test_recursive_cte_reference_in_condition" + "test_union_with_first" + "test_union_with_select_related_and_first" + "test_union_with_select_related_and_order" + ]; + + pythonImportsCheck = [ "django_cte" ]; + + meta = { + description = "Common Table Expressions (CTE) for Django"; + homepage = "https://github.com/dimagi/django-cte"; + changelog = "https://github.com/dimagi/django-cte/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix b/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix new file mode 100644 index 000000000000..55664730b5e7 --- /dev/null +++ b/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + elasticsearch-dsl, + django, + pythonOlder, + elastic-transport, + setuptools, +}: + +buildPythonPackage rec { + pname = "django-elasticsearch-dsl"; + version = "8.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "django-es"; + repo = "django-elasticsearch-dsl"; + rev = "refs/tags/${version}"; + hash = "sha256-GizdFOM4UjI870XdE33D7uXHXkuv/bLYbyi9yyNjti8="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + django + elasticsearch-dsl + elastic-transport + ]; + + # Tests require running Elasticsearch daemon + doCheck = false; + + pythonImportsCheck = [ "django_elasticsearch_dsl" ]; + + meta = { + description = "Wrapper around elasticsearch-dsl-py for Django models"; + homepage = "https://github.com/sabricot/django-elasticsearch-dsl"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/pkgs/development/python-modules/django-filer/default.nix b/pkgs/development/python-modules/django-filer/default.nix new file mode 100644 index 000000000000..e87125cd9514 --- /dev/null +++ b/pkgs/development/python-modules/django-filer/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + django, + pythonOlder, + pytestCheckHook, + django-polymorphic, + setuptools, + python, + easy-thumbnails, + pillow-heif, + django-app-helper, + distutils, +}: + +buildPythonPackage rec { + pname = "django-filer"; + version = "3.2.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "django-cms"; + repo = "django-filer"; + rev = "refs/tags/${version}"; + hash = "sha256-PoUBnfNymighCsGoJE+iu31lxA9wqVXimFPCytQtPLg="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + django + django-polymorphic + easy-thumbnails + ]; + + optional-dependencies = { + heif = [ pillow-heif ]; + }; + + checkInputs = [ + distutils + django-app-helper + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} tests/settings.py + runHook postCheck + ''; + + meta = { + description = "File management application for Django"; + homepage = "https://github.com/django-cms/django-filer"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/pkgs/development/python-modules/django-gravatar2/default.nix b/pkgs/development/python-modules/django-gravatar2/default.nix index 214a5ed4ddd0..fd6fdb0b47c5 100644 --- a/pkgs/development/python-modules/django-gravatar2/default.nix +++ b/pkgs/development/python-modules/django-gravatar2/default.nix @@ -2,20 +2,26 @@ lib, buildPythonPackage, fetchPypi, + setuptools, }: buildPythonPackage rec { pname = "django-gravatar2"; - version = "1.4.4"; - format = "setuptools"; + version = "1.4.5"; + pyproject = true; src = fetchPypi { - inherit pname version; - sha256 = "1vn921fb6jjx7rf5dzhy66rkb71nwmh9ydd0xs9ys72icw4jh4y8"; + pname = "django_gravatar2"; + inherit version; + hash = "sha256-LbtWRl45Xdizkg1AF+J6R1aRLMKtmxG6SM8UOHGoA2Q="; }; + build-system = [ setuptools ]; + doCheck = false; + pythonImportsCheck = [ "django_gravatar" ]; + meta = with lib; { description = "Essential Gravatar support for Django"; homepage = "https://github.com/twaddington/django-gravatar"; diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix index f74215dd1e8d..1ee1380b48f4 100644 --- a/pkgs/development/python-modules/django-haystack/default.nix +++ b/pkgs/development/python-modules/django-haystack/default.nix @@ -1,32 +1,27 @@ { lib, buildPythonPackage, - pythonOlder, - fetchPypi, - - # build dependencies - setuptools, - setuptools-scm, - - # dependencies django, - packaging, - - # tests elasticsearch, + fetchPypi, geopy, + packaging, pysolr, python-dateutil, + pythonOlder, requests, + setuptools-scm, + setuptools, + stdenv, whoosh, }: buildPythonPackage rec { pname = "django-haystack"; version = "3.3.0"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "django_haystack"; @@ -40,12 +35,16 @@ buildPythonPackage rec { ]; buildInputs = [ django ]; - propagatedBuildInputs = [ packaging ]; + + dependencies = [ packaging ]; optional-dependencies = { elasticsearch = [ elasticsearch ]; }; + # tests fail and get stuck on darwin + doCheck = !stdenv.hostPlatform.isDarwin; + nativeCheckInputs = [ geopy pysolr @@ -54,7 +53,6 @@ buildPythonPackage rec { whoosh ] ++ optional-dependencies.elasticsearch; - checkPhase = '' runHook preCheck python test_haystack/run_tests.py @@ -64,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pluggable search for Django"; homepage = "http://haystacksearch.org/"; + changelog = "https://github.com/django-haystack/django-haystack/releases/tag/v${version}"; license = licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index 5900e4a42ff5..a0568b478ce2 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -1,59 +1,44 @@ { lib, fetchFromGitHub, - fetchNpmDeps, buildPythonPackage, nix-update-script, # build-system flit-gettext, flit-scm, - nodejs, - npmHooks, # dependencies django, # tests + pytest-cov-stub, pytest-django, pytestCheckHook, }: buildPythonPackage rec { pname = "django-hijack"; - version = "3.6.0"; + version = "3.7.0"; pyproject = true; src = fetchFromGitHub { owner = "django-hijack"; repo = "django-hijack"; rev = "refs/tags/${version}"; - hash = "sha256-uece+tR3Nd32nfKn1gtcWqckN4z5iUP+C0dJxyDPXBA="; - }; - - postPatch = '' - sed -i "/addopts/d" pyproject.toml - - # missing integrity hashes for yocto-queue, yargs-parser - cp ${./package-lock.json} package-lock.json - ''; - - npmDeps = fetchNpmDeps { - inherit src postPatch; - hash = "sha256-npAFpdqGdttE4facBimS/y2SqwnCvOHJhd60SPR/IaA="; + hash = "sha256-WQ6s5s4Gccog78++tZX2IZ1605OHGhYSb2aTuU7LyBc="; }; build-system = [ flit-gettext flit-scm - nodejs - npmHooks.npmConfigHook ]; dependencies = [ django ]; nativeCheckInputs = [ pytestCheckHook + pytest-cov-stub pytest-django ]; diff --git a/pkgs/development/python-modules/django-hijack/package-lock.json b/pkgs/development/python-modules/django-hijack/package-lock.json deleted file mode 100644 index 74de400e4d82..000000000000 --- a/pkgs/development/python-modules/django-hijack/package-lock.json +++ /dev/null @@ -1,7875 +0,0 @@ -{ - "name": "django-hijack", - "version": "1.0.0", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "django-hijack", - "version": "1.0.0", - "license": "MIT", - "devDependencies": { - "jest": "*", - "jest-environment-jsdom": "*", - "standard": "*", - "stylelint": "*", - "stylelint-config-standard-scss": "*", - "stylelint-scss": "*" - } - }, - "node_modules/@ampproject/remapping": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", - "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", - "dev": true, - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.24" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/code-frame": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", - "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", - "dev": true, - "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.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz", - "integrity": "sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/core": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.7.tgz", - "integrity": "sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==", - "dev": true, - "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/generator": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz", - "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==", - "dev": true, - "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.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz", - "integrity": "sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==", - "dev": true, - "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-environment-visitor": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz", - "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==", - "dev": true, - "dependencies": { - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-function-name": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz", - "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==", - "dev": true, - "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.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz", - "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==", - "dev": true, - "dependencies": { - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-imports": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", - "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", - "dev": true, - "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.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz", - "integrity": "sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==", - "dev": true, - "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.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz", - "integrity": "sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-simple-access": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", - "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", - "dev": true, - "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.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz", - "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==", - "dev": true, - "dependencies": { - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-string-parser": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz", - "integrity": "sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", - "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-option": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz", - "integrity": "sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helpers": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz", - "integrity": "sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==", - "dev": true, - "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.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", - "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", - "dev": true, - "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/highlight/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/highlight/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "node_modules/@babel/highlight/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/@babel/highlight/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/parser": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz", - "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-bigint": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", - "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-import-meta": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", - "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz", - "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz", - "integrity": "sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==", - "dev": true, - "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.npmjs.org/@babel/template/-/template-7.24.7.tgz", - "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==", - "dev": true, - "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.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz", - "integrity": "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==", - "dev": true, - "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.npmjs.org/@babel/types/-/types-7.24.7.tgz", - "integrity": "sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==", - "dev": true, - "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/@bcoe/v8-coverage": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", - "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", - "dev": true - }, - "node_modules/@csstools/css-parser-algorithms": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.7.0.tgz", - "integrity": "sha512-qvBMcOU/uWFCH/VO0MYe0AMs0BGMWAt6FTryMbFIKYtZtVnqTZtT8ktv5o718llkaGZWomJezJZjq3vJDHeJNQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/csstools" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - } - ], - "engines": { - "node": "^14 || ^16 || >=18" - }, - "peerDependencies": { - "@csstools/css-tokenizer": "^2.3.2" - } - }, - "node_modules/@csstools/css-tokenizer": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.3.2.tgz", - "integrity": "sha512-0xYOf4pQpAaE6Sm2Q0x3p25oRukzWQ/O8hWVvhIt9Iv98/uu053u2CGm/g3kJ+P0vOYTAYzoU8Evq2pg9ZPXtw==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/csstools" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - } - ], - "engines": { - "node": "^14 || ^16 || >=18" - } - }, - "node_modules/@csstools/media-query-list-parser": { - "version": "2.1.12", - "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.12.tgz", - "integrity": "sha512-t1/CdyVJzOQUiGUcIBXRzTAkWTFPxiPnoKwowKW2z9Uj78c2bBWI/X94BeVfUwVq1xtCjD7dnO8kS6WONgp8Jw==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/csstools" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - } - ], - "engines": { - "node": "^14 || ^16 || >=18" - }, - "peerDependencies": { - "@csstools/css-parser-algorithms": "^2.7.0", - "@csstools/css-tokenizer": "^2.3.2" - } - }, - "node_modules/@csstools/selector-specificity": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.1.1.tgz", - "integrity": "sha512-a7cxGcJ2wIlMFLlh8z2ONm+715QkPHiyJcxwQlKOz/03GPw1COpfhcmC9wm4xlZfp//jWHNNMwzjtqHXVWU9KA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/csstools" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - } - ], - "engines": { - "node": "^14 || ^16 || >=18" - }, - "peerDependencies": { - "postcss-selector-parser": "^6.0.13" - } - }, - "node_modules/@dual-bundle/import-meta-resolve": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz", - "integrity": "sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^3.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" - } - }, - "node_modules/@eslint-community/regexpp": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz", - "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==", - "dev": true, - "engines": { - "node": "^12.0.0 || ^14.0.0 || >=16.0.0" - } - }, - "node_modules/@eslint/eslintrc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", - "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", - "dev": true, - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@eslint/eslintrc/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@eslint/eslintrc/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/@eslint/eslintrc/node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@eslint/js": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", - "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.11.14", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", - "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", - "deprecated": "Use @eslint/config-array instead", - "dev": true, - "dependencies": { - "@humanwhocodes/object-schema": "^2.0.2", - "debug": "^4.3.1", - "minimatch": "^3.0.5" - }, - "engines": { - "node": ">=10.10.0" - } - }, - "node_modules/@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true, - "engines": { - "node": ">=12.22" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, - "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", - "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", - "deprecated": "Use @eslint/object-schema instead", - "dev": true - }, - "node_modules/@istanbuljs/load-nyc-config": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", - "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", - "dev": true, - "dependencies": { - "camelcase": "^5.3.1", - "find-up": "^4.1.0", - "get-package-type": "^0.1.0", - "js-yaml": "^3.13.1", - "resolve-from": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@istanbuljs/schema": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", - "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/@jest/console": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", - "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", - "dev": true, - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0", - "slash": "^3.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/core": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", - "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", - "dev": true, - "dependencies": { - "@jest/console": "^29.7.0", - "@jest/reporters": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "jest-changed-files": "^29.7.0", - "jest-config": "^29.7.0", - "jest-haste-map": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-resolve": "^29.7.0", - "jest-resolve-dependencies": "^29.7.0", - "jest-runner": "^29.7.0", - "jest-runtime": "^29.7.0", - "jest-snapshot": "^29.7.0", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "jest-watcher": "^29.7.0", - "micromatch": "^4.0.4", - "pretty-format": "^29.7.0", - "slash": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "peerDependencies": { - "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" - }, - "peerDependenciesMeta": { - "node-notifier": { - "optional": true - } - } - }, - "node_modules/@jest/environment": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", - "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", - "dev": true, - "dependencies": { - "@jest/fake-timers": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "jest-mock": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/expect": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", - "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", - "dev": true, - "dependencies": { - "expect": "^29.7.0", - "jest-snapshot": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/expect-utils": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", - "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", - "dev": true, - "dependencies": { - "jest-get-type": "^29.6.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/fake-timers": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", - "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", - "dev": true, - "dependencies": { - "@jest/types": "^29.6.3", - "@sinonjs/fake-timers": "^10.0.2", - "@types/node": "*", - "jest-message-util": "^29.7.0", - "jest-mock": "^29.7.0", - "jest-util": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/globals": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", - "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", - "dev": true, - "dependencies": { - "@jest/environment": "^29.7.0", - "@jest/expect": "^29.7.0", - "@jest/types": "^29.6.3", - "jest-mock": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/reporters": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", - "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", - "dev": true, - "dependencies": { - "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@jridgewell/trace-mapping": "^0.3.18", - "@types/node": "*", - "chalk": "^4.0.0", - "collect-v8-coverage": "^1.0.0", - "exit": "^0.1.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^6.0.0", - "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^4.0.0", - "istanbul-reports": "^3.1.3", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0", - "jest-worker": "^29.7.0", - "slash": "^3.0.0", - "string-length": "^4.0.1", - "strip-ansi": "^6.0.0", - "v8-to-istanbul": "^9.0.1" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "peerDependencies": { - "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" - }, - "peerDependenciesMeta": { - "node-notifier": { - "optional": true - } - } - }, - "node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.27.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/source-map": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", - "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", - "dev": true, - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.18", - "callsites": "^3.0.0", - "graceful-fs": "^4.2.9" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/test-result": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", - "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", - "dev": true, - "dependencies": { - "@jest/console": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "collect-v8-coverage": "^1.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/test-sequencer": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", - "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", - "dev": true, - "dependencies": { - "@jest/test-result": "^29.7.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "slash": "^3.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/transform": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", - "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", - "dev": true, - "dependencies": { - "@babel/core": "^7.11.6", - "@jest/types": "^29.6.3", - "@jridgewell/trace-mapping": "^0.3.18", - "babel-plugin-istanbul": "^6.1.1", - "chalk": "^4.0.0", - "convert-source-map": "^2.0.0", - "fast-json-stable-stringify": "^2.1.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "micromatch": "^4.0.4", - "pirates": "^4.0.4", - "slash": "^3.0.0", - "write-file-atomic": "^4.0.2" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", - "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", - "dev": true, - "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.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "dev": true, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/set-array": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", - "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", - "dev": true, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", - "dev": true - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.25", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", - "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", - "dev": true, - "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } - }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true - }, - "node_modules/@sinonjs/commons": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", - "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", - "dev": true, - "dependencies": { - "type-detect": "4.0.8" - } - }, - "node_modules/@sinonjs/fake-timers": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", - "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^3.0.0" - } - }, - "node_modules/@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", - "dev": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/@types/babel__core": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", - "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", - "dev": true, - "dependencies": { - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", - "@types/babel__generator": "*", - "@types/babel__template": "*", - "@types/babel__traverse": "*" - } - }, - "node_modules/@types/babel__generator": { - "version": "7.6.8", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", - "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", - "dev": true, - "dependencies": { - "@babel/types": "^7.0.0" - } - }, - "node_modules/@types/babel__template": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", - "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", - "dev": true, - "dependencies": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0" - } - }, - "node_modules/@types/babel__traverse": { - "version": "7.20.6", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz", - "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==", - "dev": true, - "dependencies": { - "@babel/types": "^7.20.7" - } - }, - "node_modules/@types/graceful-fs": { - "version": "4.1.9", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz", - "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/istanbul-lib-coverage": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", - "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", - "dev": true - }, - "node_modules/@types/istanbul-lib-report": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", - "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", - "dev": true, - "dependencies": { - "@types/istanbul-lib-coverage": "*" - } - }, - "node_modules/@types/istanbul-reports": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", - "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", - "dev": true, - "dependencies": { - "@types/istanbul-lib-report": "*" - } - }, - "node_modules/@types/jsdom": { - "version": "20.0.1", - "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz", - "integrity": "sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==", - "dev": true, - "dependencies": { - "@types/node": "*", - "@types/tough-cookie": "*", - "parse5": "^7.0.0" - } - }, - "node_modules/@types/json5": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", - "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", - "dev": true - }, - "node_modules/@types/node": { - "version": "20.14.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz", - "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==", - "dev": true, - "dependencies": { - "undici-types": "~5.26.4" - } - }, - "node_modules/@types/stack-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", - "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", - "dev": true - }, - "node_modules/@types/tough-cookie": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz", - "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==", - "dev": true - }, - "node_modules/@types/yargs": { - "version": "17.0.32", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz", - "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==", - "dev": true, - "dependencies": { - "@types/yargs-parser": "*" - } - }, - "node_modules/@types/yargs-parser": { - "version": "21.0.3", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", - "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", - "dev": true - }, - "node_modules/@ungap/structured-clone": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", - "dev": true - }, - "node_modules/abab": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", - "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", - "deprecated": "Use your platform's native atob() and btoa() methods instead", - "dev": true - }, - "node_modules/acorn": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz", - "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-globals": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz", - "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==", - "dev": true, - "dependencies": { - "acorn": "^8.1.0", - "acorn-walk": "^8.0.2" - } - }, - "node_modules/acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "peerDependencies": { - "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/acorn-walk": { - "version": "8.3.3", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz", - "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==", - "dev": true, - "dependencies": { - "acorn": "^8.11.0" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "dev": true, - "dependencies": { - "type-fest": "^0.21.3" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, - "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/array-buffer-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", - "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.5", - "is-array-buffer": "^3.0.4" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array-includes": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", - "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", - "es-object-atoms": "^1.0.0", - "get-intrinsic": "^1.2.4", - "is-string": "^1.0.7" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/array.prototype.findlast": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz", - "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.0.0", - "es-shim-unscopables": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array.prototype.findlastindex": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz", - "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.0.0", - "es-shim-unscopables": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array.prototype.flat": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", - "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array.prototype.flatmap": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", - "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array.prototype.toreversed": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz", - "integrity": "sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0" - } - }, - "node_modules/array.prototype.tosorted": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz", - "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.3", - "es-errors": "^1.3.0", - "es-shim-unscopables": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/arraybuffer.prototype.slice": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", - "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", - "dev": true, - "dependencies": { - "array-buffer-byte-length": "^1.0.1", - "call-bind": "^1.0.5", - "define-properties": "^1.2.1", - "es-abstract": "^1.22.3", - "es-errors": "^1.2.1", - "get-intrinsic": "^1.2.3", - "is-array-buffer": "^3.0.4", - "is-shared-array-buffer": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/astral-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true - }, - "node_modules/available-typed-arrays": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", - "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", - "dev": true, - "dependencies": { - "possible-typed-array-names": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/babel-jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", - "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", - "dev": true, - "dependencies": { - "@jest/transform": "^29.7.0", - "@types/babel__core": "^7.1.14", - "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^29.6.3", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "slash": "^3.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "peerDependencies": { - "@babel/core": "^7.8.0" - } - }, - "node_modules/babel-plugin-istanbul": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^5.0.4", - "test-exclude": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", - "dev": true, - "dependencies": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/babel-plugin-jest-hoist": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", - "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", - "dev": true, - "dependencies": { - "@babel/template": "^7.3.3", - "@babel/types": "^7.3.3", - "@types/babel__core": "^7.1.14", - "@types/babel__traverse": "^7.0.6" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/babel-preset-current-node-syntax": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", - "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", - "dev": true, - "dependencies": { - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-bigint": "^7.8.3", - "@babel/plugin-syntax-class-properties": "^7.8.3", - "@babel/plugin-syntax-import-meta": "^7.8.3", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.8.3", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-top-level-await": "^7.8.3" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/babel-preset-jest": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", - "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", - "dev": true, - "dependencies": { - "babel-plugin-jest-hoist": "^29.6.3", - "babel-preset-current-node-syntax": "^1.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, - "dependencies": { - "fill-range": "^7.1.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/browserslist": { - "version": "4.23.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz", - "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==", - "dev": true, - "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/bser": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", - "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", - "dev": true, - "dependencies": { - "node-int64": "^0.4.0" - } - }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true - }, - "node_modules/builtins": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz", - "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==", - "dev": true, - "dependencies": { - "semver": "^7.0.0" - } - }, - "node_modules/builtins/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/call-bind": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", - "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", - "dev": true, - "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/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/caniuse-lite": { - "version": "1.0.30001639", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001639.tgz", - "integrity": "sha512-eFHflNTBIlFwP2AIKaYuBQN/apnUoKNhBdza8ZnW/h2di4LCZ4xFqYlxUxo+LQ76KFI1PGcC1QDxMbxTZpSCAg==", - "dev": true, - "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": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "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/char-regex": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", - "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "engines": { - "node": ">=8" - } - }, - "node_modules/cjs-module-lexer": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz", - "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==", - "dev": true - }, - "node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", - "dev": true, - "engines": { - "iojs": ">= 1.0.0", - "node": ">= 0.12.0" - } - }, - "node_modules/collect-v8-coverage": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", - "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", - "dev": true - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/colord": { - "version": "2.9.3", - "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz", - "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==", - "dev": true - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true - }, - "node_modules/convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true - }, - "node_modules/cosmiconfig": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", - "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==", - "dev": true, - "dependencies": { - "env-paths": "^2.2.1", - "import-fresh": "^3.3.0", - "js-yaml": "^4.1.0", - "parse-json": "^5.2.0" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/d-fischer" - }, - "peerDependencies": { - "typescript": ">=4.9.5" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/cosmiconfig/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "node_modules/cosmiconfig/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/create-jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", - "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", - "dev": true, - "dependencies": { - "@jest/types": "^29.6.3", - "chalk": "^4.0.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "jest-config": "^29.7.0", - "jest-util": "^29.7.0", - "prompts": "^2.0.1" - }, - "bin": { - "create-jest": "bin/create-jest.js" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/css-functions-list": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.2.tgz", - "integrity": "sha512-c+N0v6wbKVxTu5gOBBFkr9BEdBWaqqjQeiJ8QvSRIJOf+UxlJh930m8e6/WNeODIK0mYLFkoONrnj16i2EcvfQ==", - "dev": true, - "engines": { - "node": ">=12 || >=16" - } - }, - "node_modules/css-tree": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz", - "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==", - "dev": true, - "dependencies": { - "mdn-data": "2.0.30", - "source-map-js": "^1.0.1" - }, - "engines": { - "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" - } - }, - "node_modules/cssesc": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", - "dev": true, - "bin": { - "cssesc": "bin/cssesc" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/cssom": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz", - "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==", - "dev": true - }, - "node_modules/cssstyle": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", - "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", - "dev": true, - "dependencies": { - "cssom": "~0.3.6" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cssstyle/node_modules/cssom": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", - "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", - "dev": true - }, - "node_modules/data-urls": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz", - "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==", - "dev": true, - "dependencies": { - "abab": "^2.0.6", - "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^11.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/data-view-buffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", - "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.6", - "es-errors": "^1.3.0", - "is-data-view": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/data-view-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", - "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "es-errors": "^1.3.0", - "is-data-view": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/data-view-byte-offset": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", - "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.6", - "es-errors": "^1.3.0", - "is-data-view": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/debug": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz", - "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/decimal.js": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", - "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==", - "dev": true - }, - "node_modules/dedent": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz", - "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==", - "dev": true, - "peerDependencies": { - "babel-plugin-macros": "^3.1.0" - }, - "peerDependenciesMeta": { - "babel-plugin-macros": { - "optional": true - } - } - }, - "node_modules/deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true - }, - "node_modules/deepmerge": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", - "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/define-data-property": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", - "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", - "dev": true, - "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-properties": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", - "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", - "dev": true, - "dependencies": { - "define-data-property": "^1.0.1", - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/detect-newline": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", - "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/diff-sequences": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", - "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", - "dev": true, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/domexception": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz", - "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==", - "deprecated": "Use your platform's native DOMException instead", - "dev": true, - "dependencies": { - "webidl-conversions": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/electron-to-chromium": { - "version": "1.4.815", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.815.tgz", - "integrity": "sha512-OvpTT2ItpOXJL7IGcYakRjHCt8L5GrrN/wHCQsRB4PQa1X9fe+X9oen245mIId7s14xvArCGSTIq644yPUKKLg==", - "dev": true - }, - "node_modules/emittery": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", - "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sindresorhus/emittery?sponsor=1" - } - }, - "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", - "dev": true, - "engines": { - "node": ">=0.12" - }, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, - "node_modules/env-paths": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "dependencies": { - "is-arrayish": "^0.2.1" - } - }, - "node_modules/es-abstract": { - "version": "1.23.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz", - "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==", - "dev": true, - "dependencies": { - "array-buffer-byte-length": "^1.0.1", - "arraybuffer.prototype.slice": "^1.0.3", - "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", - "data-view-buffer": "^1.0.1", - "data-view-byte-length": "^1.0.1", - "data-view-byte-offset": "^1.0.0", - "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.0.0", - "es-set-tostringtag": "^2.0.3", - "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.6", - "get-intrinsic": "^1.2.4", - "get-symbol-description": "^1.0.2", - "globalthis": "^1.0.3", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.2", - "has-proto": "^1.0.3", - "has-symbols": "^1.0.3", - "hasown": "^2.0.2", - "internal-slot": "^1.0.7", - "is-array-buffer": "^3.0.4", - "is-callable": "^1.2.7", - "is-data-view": "^1.0.1", - "is-negative-zero": "^2.0.3", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.3", - "is-string": "^1.0.7", - "is-typed-array": "^1.1.13", - "is-weakref": "^1.0.2", - "object-inspect": "^1.13.1", - "object-keys": "^1.1.1", - "object.assign": "^4.1.5", - "regexp.prototype.flags": "^1.5.2", - "safe-array-concat": "^1.1.2", - "safe-regex-test": "^1.0.3", - "string.prototype.trim": "^1.2.9", - "string.prototype.trimend": "^1.0.8", - "string.prototype.trimstart": "^1.0.8", - "typed-array-buffer": "^1.0.2", - "typed-array-byte-length": "^1.0.1", - "typed-array-byte-offset": "^1.0.2", - "typed-array-length": "^1.0.6", - "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.15" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/es-define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", - "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.2.4" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-iterator-helpers": { - "version": "1.0.19", - "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz", - "integrity": "sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.3", - "es-errors": "^1.3.0", - "es-set-tostringtag": "^2.0.3", - "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.4", - "globalthis": "^1.0.3", - "has-property-descriptors": "^1.0.2", - "has-proto": "^1.0.3", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.7", - "iterator.prototype": "^1.1.2", - "safe-array-concat": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-object-atoms": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", - "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", - "dev": true, - "dependencies": { - "es-errors": "^1.3.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-set-tostringtag": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", - "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.2.4", - "has-tostringtag": "^1.0.2", - "hasown": "^2.0.1" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-shim-unscopables": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", - "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", - "dev": true, - "dependencies": { - "hasown": "^2.0.0" - } - }, - "node_modules/es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "dependencies": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/escodegen": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", - "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", - "dev": true, - "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/eslint": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", - "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", - "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.0", - "@humanwhocodes/config-array": "^0.11.14", - "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", - "ajv": "^6.12.4", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-config-standard": { - "version": "17.1.0", - "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz", - "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "eslint": "^8.0.1", - "eslint-plugin-import": "^2.25.2", - "eslint-plugin-n": "^15.0.0 || ^16.0.0 ", - "eslint-plugin-promise": "^6.0.0" - } - }, - "node_modules/eslint-config-standard-jsx": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz", - "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "peerDependencies": { - "eslint": "^8.8.0", - "eslint-plugin-react": "^7.28.0" - } - }, - "node_modules/eslint-import-resolver-node": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", - "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", - "dev": true, - "dependencies": { - "debug": "^3.2.7", - "is-core-module": "^2.13.0", - "resolve": "^1.22.4" - } - }, - "node_modules/eslint-import-resolver-node/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/eslint-module-utils": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz", - "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==", - "dev": true, - "dependencies": { - "debug": "^3.2.7" - }, - "engines": { - "node": ">=4" - }, - "peerDependenciesMeta": { - "eslint": { - "optional": true - } - } - }, - "node_modules/eslint-module-utils/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/eslint-plugin-es": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz", - "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==", - "dev": true, - "dependencies": { - "eslint-utils": "^2.0.0", - "regexpp": "^3.0.0" - }, - "engines": { - "node": ">=8.10.0" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=4.19.1" - } - }, - "node_modules/eslint-plugin-es/node_modules/eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^1.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/eslint-plugin-import": { - "version": "2.29.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz", - "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==", - "dev": true, - "dependencies": { - "array-includes": "^3.1.7", - "array.prototype.findlastindex": "^1.2.3", - "array.prototype.flat": "^1.3.2", - "array.prototype.flatmap": "^1.3.2", - "debug": "^3.2.7", - "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.9", - "eslint-module-utils": "^2.8.0", - "hasown": "^2.0.0", - "is-core-module": "^2.13.1", - "is-glob": "^4.0.3", - "minimatch": "^3.1.2", - "object.fromentries": "^2.0.7", - "object.groupby": "^1.0.1", - "object.values": "^1.1.7", - "semver": "^6.3.1", - "tsconfig-paths": "^3.15.0" - }, - "engines": { - "node": ">=4" - }, - "peerDependencies": { - "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" - } - }, - "node_modules/eslint-plugin-import/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/eslint-plugin-import/node_modules/doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/eslint-plugin-n": { - "version": "15.7.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz", - "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==", - "dev": true, - "dependencies": { - "builtins": "^5.0.1", - "eslint-plugin-es": "^4.1.0", - "eslint-utils": "^3.0.0", - "ignore": "^5.1.1", - "is-core-module": "^2.11.0", - "minimatch": "^3.1.2", - "resolve": "^1.22.1", - "semver": "^7.3.8" - }, - "engines": { - "node": ">=12.22.0" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=7.0.0" - } - }, - "node_modules/eslint-plugin-n/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/eslint-plugin-promise": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.2.0.tgz", - "integrity": "sha512-QmAqwizauvnKOlifxyDj2ObfULpHQawlg/zQdgEixur9vl0CvZGv/LCJV2rtj3210QCoeGBzVMfMXqGAOr/4fA==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - }, - "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0" - } - }, - "node_modules/eslint-plugin-react": { - "version": "7.34.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.3.tgz", - "integrity": "sha512-aoW4MV891jkUulwDApQbPYTVZmeuSyFrudpbTAQuj5Fv8VL+o6df2xIGpw8B0hPjAaih1/Fb0om9grCdyFYemA==", - "dev": true, - "dependencies": { - "array-includes": "^3.1.8", - "array.prototype.findlast": "^1.2.5", - "array.prototype.flatmap": "^1.3.2", - "array.prototype.toreversed": "^1.1.2", - "array.prototype.tosorted": "^1.1.4", - "doctrine": "^2.1.0", - "es-iterator-helpers": "^1.0.19", - "estraverse": "^5.3.0", - "jsx-ast-utils": "^2.4.1 || ^3.0.0", - "minimatch": "^3.1.2", - "object.entries": "^1.1.8", - "object.fromentries": "^2.0.8", - "object.hasown": "^1.1.4", - "object.values": "^1.2.0", - "prop-types": "^15.8.1", - "resolve": "^2.0.0-next.5", - "semver": "^6.3.1", - "string.prototype.matchall": "^4.0.11" - }, - "engines": { - "node": ">=4" - }, - "peerDependencies": { - "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" - } - }, - "node_modules/eslint-plugin-react/node_modules/doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/eslint-plugin-react/node_modules/resolve": { - "version": "2.0.0-next.5", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", - "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", - "dev": true, - "dependencies": { - "is-core-module": "^2.13.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^2.0.0" - }, - "engines": { - "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=5" - } - }, - "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "node_modules/eslint/node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/eslint/node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", - "dev": true, - "dependencies": { - "acorn": "^8.9.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/esquery": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", - "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", - "dev": true, - "dependencies": { - "estraverse": "^5.1.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "dependencies": { - "estraverse": "^5.2.0" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, - "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/exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/expect": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", - "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", - "dev": true, - "dependencies": { - "@jest/expect-utils": "^29.7.0", - "jest-get-type": "^29.6.3", - "jest-matcher-utils": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "node_modules/fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/fast-glob/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true - }, - "node_modules/fastest-levenshtein": { - "version": "1.0.16", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", - "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", - "dev": true, - "engines": { - "node": ">= 4.9.1" - } - }, - "node_modules/fastq": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", - "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", - "dev": true, - "dependencies": { - "reusify": "^1.0.4" - } - }, - "node_modules/fb-watchman": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", - "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", - "dev": true, - "dependencies": { - "bser": "2.1.1" - } - }, - "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "dependencies": { - "flat-cache": "^3.0.4" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", - "dev": true, - "dependencies": { - "flatted": "^3.2.9", - "keyv": "^4.5.3", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", - "dev": true - }, - "node_modules/for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", - "dev": true, - "dependencies": { - "is-callable": "^1.1.3" - } - }, - "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true - }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/function.prototype.name": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", - "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "functions-have-names": "^1.2.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/functions-have-names": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/get-intrinsic": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", - "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", - "dev": true, - "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-package-type": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", - "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", - "dev": true, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/get-stdin": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", - "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/get-symbol-description": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", - "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.5", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/global-modules": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", - "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", - "dev": true, - "dependencies": { - "global-prefix": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/global-prefix": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", - "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", - "dev": true, - "dependencies": { - "ini": "^1.3.5", - "kind-of": "^6.0.2", - "which": "^1.3.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/global-prefix/node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "which": "bin/which" - } - }, - "node_modules/globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/globalthis": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", - "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", - "dev": true, - "dependencies": { - "define-properties": "^1.2.1", - "gopd": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/globjoin": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz", - "integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==", - "dev": true - }, - "node_modules/gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.1.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true - }, - "node_modules/graphemer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true - }, - "node_modules/has-bigints": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/has-property-descriptors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", - "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", - "dev": true, - "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.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", - "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-tostringtag": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", - "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/html-encoding-sniffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", - "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==", - "dev": true, - "dependencies": { - "whatwg-encoding": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/html-escaper": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true - }, - "node_modules/html-tags": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz", - "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dev": true, - "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true, - "engines": { - "node": ">=10.17.0" - } - }, - "node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ignore": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", - "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/import-fresh/node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/import-local": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", - "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", - "dev": true, - "dependencies": { - "pkg-dir": "^4.2.0", - "resolve-cwd": "^3.0.0" - }, - "bin": { - "import-local-fixture": "fixtures/cli.js" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true, - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", - "dev": true, - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "node_modules/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true - }, - "node_modules/internal-slot": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", - "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", - "dev": true, - "dependencies": { - "es-errors": "^1.3.0", - "hasown": "^2.0.0", - "side-channel": "^1.0.4" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-array-buffer": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", - "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true - }, - "node_modules/is-async-function": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", - "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", - "dev": true, - "dependencies": { - "has-bigints": "^1.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-boolean-object": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-callable": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", - "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-core-module": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz", - "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==", - "dev": true, - "dependencies": { - "hasown": "^2.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-data-view": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", - "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", - "dev": true, - "dependencies": { - "is-typed-array": "^1.1.13" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-finalizationregistry": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", - "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-generator-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", - "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/is-generator-function": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", - "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-map": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", - "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-negative-zero": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", - "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/is-number-object": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-plain-object": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", - "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-potential-custom-element-name": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", - "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", - "dev": true - }, - "node_modules/is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-set": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", - "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-shared-array-buffer": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", - "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-typed-array": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", - "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", - "dev": true, - "dependencies": { - "which-typed-array": "^1.1.14" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-weakmap": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", - "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-weakref": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-weakset": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", - "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "get-intrinsic": "^1.2.4" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true - }, - "node_modules/istanbul-lib-coverage": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", - "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-instrument": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", - "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", - "dev": true, - "dependencies": { - "@babel/core": "^7.23.9", - "@babel/parser": "^7.23.9", - "@istanbuljs/schema": "^0.1.3", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^7.5.4" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/istanbul-lib-report": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", - "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", - "dev": true, - "dependencies": { - "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^4.0.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/istanbul-lib-source-maps": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", - "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", - "dev": true, - "dependencies": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^3.0.0", - "source-map": "^0.6.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/istanbul-reports": { - "version": "3.1.7", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", - "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", - "dev": true, - "dependencies": { - "html-escaper": "^2.0.0", - "istanbul-lib-report": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/iterator.prototype": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz", - "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==", - "dev": true, - "dependencies": { - "define-properties": "^1.2.1", - "get-intrinsic": "^1.2.1", - "has-symbols": "^1.0.3", - "reflect.getprototypeof": "^1.0.4", - "set-function-name": "^2.0.1" - } - }, - "node_modules/jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", - "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", - "dev": true, - "dependencies": { - "@jest/core": "^29.7.0", - "@jest/types": "^29.6.3", - "import-local": "^3.0.2", - "jest-cli": "^29.7.0" - }, - "bin": { - "jest": "bin/jest.js" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "peerDependencies": { - "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" - }, - "peerDependenciesMeta": { - "node-notifier": { - "optional": true - } - } - }, - "node_modules/jest-changed-files": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", - "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", - "dev": true, - "dependencies": { - "execa": "^5.0.0", - "jest-util": "^29.7.0", - "p-limit": "^3.1.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-circus": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", - "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", - "dev": true, - "dependencies": { - "@jest/environment": "^29.7.0", - "@jest/expect": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "co": "^4.6.0", - "dedent": "^1.0.0", - "is-generator-fn": "^2.0.0", - "jest-each": "^29.7.0", - "jest-matcher-utils": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-runtime": "^29.7.0", - "jest-snapshot": "^29.7.0", - "jest-util": "^29.7.0", - "p-limit": "^3.1.0", - "pretty-format": "^29.7.0", - "pure-rand": "^6.0.0", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-cli": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", - "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", - "dev": true, - "dependencies": { - "@jest/core": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/types": "^29.6.3", - "chalk": "^4.0.0", - "create-jest": "^29.7.0", - "exit": "^0.1.2", - "import-local": "^3.0.2", - "jest-config": "^29.7.0", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "yargs": "^17.3.1" - }, - "bin": { - "jest": "bin/jest.js" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "peerDependencies": { - "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" - }, - "peerDependenciesMeta": { - "node-notifier": { - "optional": true - } - } - }, - "node_modules/jest-config": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", - "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", - "dev": true, - "dependencies": { - "@babel/core": "^7.11.6", - "@jest/test-sequencer": "^29.7.0", - "@jest/types": "^29.6.3", - "babel-jest": "^29.7.0", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "deepmerge": "^4.2.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-circus": "^29.7.0", - "jest-environment-node": "^29.7.0", - "jest-get-type": "^29.6.3", - "jest-regex-util": "^29.6.3", - "jest-resolve": "^29.7.0", - "jest-runner": "^29.7.0", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "micromatch": "^4.0.4", - "parse-json": "^5.2.0", - "pretty-format": "^29.7.0", - "slash": "^3.0.0", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "peerDependencies": { - "@types/node": "*", - "ts-node": ">=9.0.0" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - }, - "ts-node": { - "optional": true - } - } - }, - "node_modules/jest-diff": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", - "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "diff-sequences": "^29.6.3", - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-docblock": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", - "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", - "dev": true, - "dependencies": { - "detect-newline": "^3.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-each": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", - "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", - "dev": true, - "dependencies": { - "@jest/types": "^29.6.3", - "chalk": "^4.0.0", - "jest-get-type": "^29.6.3", - "jest-util": "^29.7.0", - "pretty-format": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-environment-jsdom": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz", - "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==", - "dev": true, - "dependencies": { - "@jest/environment": "^29.7.0", - "@jest/fake-timers": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/jsdom": "^20.0.0", - "@types/node": "*", - "jest-mock": "^29.7.0", - "jest-util": "^29.7.0", - "jsdom": "^20.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "peerDependencies": { - "canvas": "^2.5.0" - }, - "peerDependenciesMeta": { - "canvas": { - "optional": true - } - } - }, - "node_modules/jest-environment-node": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", - "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", - "dev": true, - "dependencies": { - "@jest/environment": "^29.7.0", - "@jest/fake-timers": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "jest-mock": "^29.7.0", - "jest-util": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-get-type": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", - "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", - "dev": true, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-haste-map": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", - "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", - "dev": true, - "dependencies": { - "@jest/types": "^29.6.3", - "@types/graceful-fs": "^4.1.3", - "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "graceful-fs": "^4.2.9", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "jest-worker": "^29.7.0", - "micromatch": "^4.0.4", - "walker": "^1.0.8" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "optionalDependencies": { - "fsevents": "^2.3.2" - } - }, - "node_modules/jest-leak-detector": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", - "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", - "dev": true, - "dependencies": { - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-matcher-utils": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", - "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "jest-diff": "^29.7.0", - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-message-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", - "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^29.6.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^29.7.0", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-mock": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", - "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", - "dev": true, - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "jest-util": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-pnp-resolver": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", - "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", - "dev": true, - "engines": { - "node": ">=6" - }, - "peerDependencies": { - "jest-resolve": "*" - }, - "peerDependenciesMeta": { - "jest-resolve": { - "optional": true - } - } - }, - "node_modules/jest-regex-util": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", - "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", - "dev": true, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-resolve": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", - "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-pnp-resolver": "^1.2.2", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "resolve": "^1.20.0", - "resolve.exports": "^2.0.0", - "slash": "^3.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-resolve-dependencies": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", - "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", - "dev": true, - "dependencies": { - "jest-regex-util": "^29.6.3", - "jest-snapshot": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-runner": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", - "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", - "dev": true, - "dependencies": { - "@jest/console": "^29.7.0", - "@jest/environment": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "emittery": "^0.13.1", - "graceful-fs": "^4.2.9", - "jest-docblock": "^29.7.0", - "jest-environment-node": "^29.7.0", - "jest-haste-map": "^29.7.0", - "jest-leak-detector": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-resolve": "^29.7.0", - "jest-runtime": "^29.7.0", - "jest-util": "^29.7.0", - "jest-watcher": "^29.7.0", - "jest-worker": "^29.7.0", - "p-limit": "^3.1.0", - "source-map-support": "0.5.13" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-runtime": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", - "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", - "dev": true, - "dependencies": { - "@jest/environment": "^29.7.0", - "@jest/fake-timers": "^29.7.0", - "@jest/globals": "^29.7.0", - "@jest/source-map": "^29.6.3", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "cjs-module-lexer": "^1.0.0", - "collect-v8-coverage": "^1.0.0", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-mock": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-resolve": "^29.7.0", - "jest-snapshot": "^29.7.0", - "jest-util": "^29.7.0", - "slash": "^3.0.0", - "strip-bom": "^4.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-snapshot": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", - "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", - "dev": true, - "dependencies": { - "@babel/core": "^7.11.6", - "@babel/generator": "^7.7.2", - "@babel/plugin-syntax-jsx": "^7.7.2", - "@babel/plugin-syntax-typescript": "^7.7.2", - "@babel/types": "^7.3.3", - "@jest/expect-utils": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "babel-preset-current-node-syntax": "^1.0.0", - "chalk": "^4.0.0", - "expect": "^29.7.0", - "graceful-fs": "^4.2.9", - "jest-diff": "^29.7.0", - "jest-get-type": "^29.6.3", - "jest-matcher-utils": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0", - "natural-compare": "^1.4.0", - "pretty-format": "^29.7.0", - "semver": "^7.5.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "dependencies": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-validate": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", - "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", - "dev": true, - "dependencies": { - "@jest/types": "^29.6.3", - "camelcase": "^6.2.0", - "chalk": "^4.0.0", - "jest-get-type": "^29.6.3", - "leven": "^3.1.0", - "pretty-format": "^29.7.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-validate/node_modules/camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/jest-watcher": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", - "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", - "dev": true, - "dependencies": { - "@jest/test-result": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "emittery": "^0.13.1", - "jest-util": "^29.7.0", - "string-length": "^4.0.1" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-worker": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", - "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", - "dev": true, - "dependencies": { - "@types/node": "*", - "jest-util": "^29.7.0", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-worker/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, - "node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/jsdom": { - "version": "20.0.3", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz", - "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==", - "dev": true, - "dependencies": { - "abab": "^2.0.6", - "acorn": "^8.8.1", - "acorn-globals": "^7.0.0", - "cssom": "^0.5.0", - "cssstyle": "^2.3.0", - "data-urls": "^3.0.2", - "decimal.js": "^10.4.2", - "domexception": "^4.0.0", - "escodegen": "^2.0.0", - "form-data": "^4.0.0", - "html-encoding-sniffer": "^3.0.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.1", - "is-potential-custom-element-name": "^1.0.1", - "nwsapi": "^2.2.2", - "parse5": "^7.1.1", - "saxes": "^6.0.0", - "symbol-tree": "^3.2.4", - "tough-cookie": "^4.1.2", - "w3c-xmlserializer": "^4.0.0", - "webidl-conversions": "^7.0.0", - "whatwg-encoding": "^2.0.0", - "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^11.0.0", - "ws": "^8.11.0", - "xml-name-validator": "^4.0.0" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "canvas": "^2.5.0" - }, - "peerDependenciesMeta": { - "canvas": { - "optional": true - } - } - }, - "node_modules/jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true, - "bin": { - "jsesc": "bin/jsesc" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/json-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true - }, - "node_modules/json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", - "dev": true - }, - "node_modules/json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true - }, - "node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "node_modules/json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true - }, - "node_modules/json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true, - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/jsx-ast-utils": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", - "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", - "dev": true, - "dependencies": { - "array-includes": "^3.1.6", - "array.prototype.flat": "^1.3.1", - "object.assign": "^4.1.4", - "object.values": "^1.1.6" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/keyv": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", - "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "dev": true, - "dependencies": { - "json-buffer": "3.0.1" - } - }, - "node_modules/kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/kleur": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", - "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/known-css-properties": { - "version": "0.31.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.31.0.tgz", - "integrity": "sha512-sBPIUGTNF0czz0mwGGUoKKJC8Q7On1GPbCSFPfyEsfHb2DyBG0Y4QtV+EVWpINSaiGKZblDNuF5AezxSgOhesQ==", - "dev": true - }, - "node_modules/leven": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", - "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "dependencies": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true - }, - "node_modules/load-json-file": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz", - "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.15", - "parse-json": "^4.0.0", - "pify": "^4.0.1", - "strip-bom": "^3.0.0", - "type-fest": "^0.3.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/load-json-file/node_modules/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", - "dev": true, - "dependencies": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/load-json-file/node_modules/strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/load-json-file/node_modules/type-fest": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", - "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, - "node_modules/lodash.truncate": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==", - "dev": true - }, - "node_modules/loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dev": true, - "dependencies": { - "js-tokens": "^3.0.0 || ^4.0.0" - }, - "bin": { - "loose-envify": "cli.js" - } - }, - "node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "dependencies": { - "yallist": "^3.0.2" - } - }, - "node_modules/make-dir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", - "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", - "dev": true, - "dependencies": { - "semver": "^7.5.3" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/make-dir/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/makeerror": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", - "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", - "dev": true, - "dependencies": { - "tmpl": "1.0.5" - } - }, - "node_modules/mathml-tag-names": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz", - "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==", - "dev": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/mdn-data": { - "version": "2.0.30", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz", - "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==", - "dev": true - }, - "node_modules/meow": { - "version": "13.2.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-13.2.0.tgz", - "integrity": "sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==", - "dev": true, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", - "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", - "dev": true, - "dependencies": { - "braces": "^3.0.3", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, - "node_modules/natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true - }, - "node_modules/node-int64": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", - "dev": true - }, - "node_modules/node-releases": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", - "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", - "dev": true - }, - "node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, - "dependencies": { - "path-key": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/nwsapi": { - "version": "2.2.10", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.10.tgz", - "integrity": "sha512-QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ==", - "dev": true - }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-inspect": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", - "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object.assign": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", - "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.5", - "define-properties": "^1.2.1", - "has-symbols": "^1.0.3", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object.entries": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz", - "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object.fromentries": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", - "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object.groupby": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz", - "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object.hasown": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.4.tgz", - "integrity": "sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg==", - "dev": true, - "dependencies": { - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object.values": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", - "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "dependencies": { - "mimic-fn": "^2.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/optionator": { - "version": "0.9.4", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", - "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", - "dev": true, - "dependencies": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.5" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/p-locate/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "dependencies": { - "callsites": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/parse5": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", - "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", - "dev": true, - "dependencies": { - "entities": "^4.4.0" - }, - "funding": { - "url": "https://github.com/inikulin/parse5?sponsor=1" - } - }, - "node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/picocolors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", - "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==", - "dev": true - }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/pirates": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", - "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/pkg-conf": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz", - "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==", - "dev": true, - "dependencies": { - "find-up": "^3.0.0", - "load-json-file": "^5.2.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/pkg-conf/node_modules/find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "dependencies": { - "locate-path": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/pkg-conf/node_modules/locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "dependencies": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/pkg-conf/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pkg-conf/node_modules/p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "dependencies": { - "p-limit": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/pkg-conf/node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "dependencies": { - "find-up": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/possible-typed-array-names": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", - "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/postcss": { - "version": "8.4.39", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz", - "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "nanoid": "^3.3.7", - "picocolors": "^1.0.1", - "source-map-js": "^1.2.0" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, - "node_modules/postcss-media-query-parser": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", - "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==", - "dev": true - }, - "node_modules/postcss-resolve-nested-selector": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz", - "integrity": "sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==", - "dev": true - }, - "node_modules/postcss-safe-parser": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-7.0.0.tgz", - "integrity": "sha512-ovehqRNVCpuFzbXoTb4qLtyzK3xn3t/CUBxOs8LsnQjQrShaB4lKiHoVqY8ANaC0hBMHq5QVWk77rwGklFUDrg==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss-safe-parser" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "engines": { - "node": ">=18.0" - }, - "peerDependencies": { - "postcss": "^8.4.31" - } - }, - "node_modules/postcss-scss": { - "version": "4.0.9", - "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.9.tgz", - "integrity": "sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss-scss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "engines": { - "node": ">=12.0" - }, - "peerDependencies": { - "postcss": "^8.4.29" - } - }, - "node_modules/postcss-selector-parser": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz", - "integrity": "sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==", - "dev": true, - "dependencies": { - "cssesc": "^3.0.0", - "util-deprecate": "^1.0.2" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/postcss-value-parser": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", - "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", - "dev": true - }, - "node_modules/prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/pretty-format": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", - "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", - "dev": true, - "dependencies": { - "@jest/schemas": "^29.6.3", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/pretty-format/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/prompts": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", - "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", - "dev": true, - "dependencies": { - "kleur": "^3.0.3", - "sisteransi": "^1.0.5" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/prop-types": { - "version": "15.8.1", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", - "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", - "dev": true, - "dependencies": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.13.1" - } - }, - "node_modules/prop-types/node_modules/react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "dev": true - }, - "node_modules/psl": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", - "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", - "dev": true - }, - "node_modules/punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/pure-rand": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz", - "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/dubzzz" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/fast-check" - } - ] - }, - "node_modules/querystringify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", - "dev": true - }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "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/react-is": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", - "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", - "dev": true - }, - "node_modules/reflect.getprototypeof": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz", - "integrity": "sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.1", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4", - "globalthis": "^1.0.3", - "which-builtin-type": "^1.1.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/regexp.prototype.flags": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", - "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.6", - "define-properties": "^1.2.1", - "es-errors": "^1.3.0", - "set-function-name": "^2.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/regexpp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", - "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", - "dev": true - }, - "node_modules/resolve": { - "version": "1.22.8", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", - "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", - "dev": true, - "dependencies": { - "is-core-module": "^2.13.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/resolve-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", - "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", - "dev": true, - "dependencies": { - "resolve-from": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/resolve.exports": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz", - "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "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": { - "queue-microtask": "^1.2.2" - } - }, - "node_modules/safe-array-concat": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", - "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "get-intrinsic": "^1.2.4", - "has-symbols": "^1.0.3", - "isarray": "^2.0.5" - }, - "engines": { - "node": ">=0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/safe-regex-test": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", - "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.6", - "es-errors": "^1.3.0", - "is-regex": "^1.1.4" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "node_modules/saxes": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", - "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==", - "dev": true, - "dependencies": { - "xmlchars": "^2.2.0" - }, - "engines": { - "node": ">=v12.22.7" - } - }, - "node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/set-function-length": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", - "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", - "dev": true, - "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/set-function-name": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", - "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", - "dev": true, - "dependencies": { - "define-data-property": "^1.1.4", - "es-errors": "^1.3.0", - "functions-have-names": "^1.2.3", - "has-property-descriptors": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/side-channel": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", - "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", - "dev": true, - "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": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "node_modules/sisteransi": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true - }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", - "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", - "dev": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true - }, - "node_modules/stack-utils": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", - "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", - "dev": true, - "dependencies": { - "escape-string-regexp": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/standard": { - "version": "17.1.0", - "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.0.tgz", - "integrity": "sha512-jaDqlNSzLtWYW4lvQmU0EnxWMUGQiwHasZl5ZEIwx3S/ijZDjZOzs1y1QqKwKs5vqnFpGtizo4NOYX2s0Voq/g==", - "dev": true, - "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": { - "eslint": "^8.41.0", - "eslint-config-standard": "17.1.0", - "eslint-config-standard-jsx": "^11.0.0", - "eslint-plugin-import": "^2.27.5", - "eslint-plugin-n": "^15.7.0", - "eslint-plugin-promise": "^6.1.1", - "eslint-plugin-react": "^7.32.2", - "standard-engine": "^15.0.0", - "version-guard": "^1.1.1" - }, - "bin": { - "standard": "bin/cmd.cjs" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, - "node_modules/standard-engine": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz", - "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==", - "dev": true, - "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": { - "get-stdin": "^8.0.0", - "minimist": "^1.2.6", - "pkg-conf": "^3.1.0", - "xdg-basedir": "^4.0.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, - "node_modules/string-length": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", - "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", - "dev": true, - "dependencies": { - "char-regex": "^1.0.2", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/string.prototype.matchall": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz", - "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.0.0", - "get-intrinsic": "^1.2.4", - "gopd": "^1.0.1", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.7", - "regexp.prototype.flags": "^1.5.2", - "set-function-name": "^2.0.2", - "side-channel": "^1.0.6" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/string.prototype.trim": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", - "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.0", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/string.prototype.trimend": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz", - "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-object-atoms": "^1.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/string.prototype.trimstart": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", - "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/stylelint": { - "version": "16.6.1", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.6.1.tgz", - "integrity": "sha512-yNgz2PqWLkhH2hw6X9AweV9YvoafbAD5ZsFdKN9BvSDVwGvPh+AUIrn7lYwy1S7IHmtFin75LLfX1m0D2tHu8Q==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/stylelint" - }, - { - "type": "github", - "url": "https://github.com/sponsors/stylelint" - } - ], - "dependencies": { - "@csstools/css-parser-algorithms": "^2.6.3", - "@csstools/css-tokenizer": "^2.3.1", - "@csstools/media-query-list-parser": "^2.1.11", - "@csstools/selector-specificity": "^3.1.1", - "@dual-bundle/import-meta-resolve": "^4.1.0", - "balanced-match": "^2.0.0", - "colord": "^2.9.3", - "cosmiconfig": "^9.0.0", - "css-functions-list": "^3.2.2", - "css-tree": "^2.3.1", - "debug": "^4.3.4", - "fast-glob": "^3.3.2", - "fastest-levenshtein": "^1.0.16", - "file-entry-cache": "^9.0.0", - "global-modules": "^2.0.0", - "globby": "^11.1.0", - "globjoin": "^0.1.4", - "html-tags": "^3.3.1", - "ignore": "^5.3.1", - "imurmurhash": "^0.1.4", - "is-plain-object": "^5.0.0", - "known-css-properties": "^0.31.0", - "mathml-tag-names": "^2.1.3", - "meow": "^13.2.0", - "micromatch": "^4.0.7", - "normalize-path": "^3.0.0", - "picocolors": "^1.0.1", - "postcss": "^8.4.38", - "postcss-resolve-nested-selector": "^0.1.1", - "postcss-safe-parser": "^7.0.0", - "postcss-selector-parser": "^6.1.0", - "postcss-value-parser": "^4.2.0", - "resolve-from": "^5.0.0", - "string-width": "^4.2.3", - "strip-ansi": "^7.1.0", - "supports-hyperlinks": "^3.0.0", - "svg-tags": "^1.0.0", - "table": "^6.8.2", - "write-file-atomic": "^5.0.1" - }, - "bin": { - "stylelint": "bin/stylelint.mjs" - }, - "engines": { - "node": ">=18.12.0" - } - }, - "node_modules/stylelint-config-recommended": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-14.0.1.tgz", - "integrity": "sha512-bLvc1WOz/14aPImu/cufKAZYfXs/A/owZfSMZ4N+16WGXLoX5lOir53M6odBxvhgmgdxCVnNySJmZKx73T93cg==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/stylelint" - }, - { - "type": "github", - "url": "https://github.com/sponsors/stylelint" - } - ], - "engines": { - "node": ">=18.12.0" - }, - "peerDependencies": { - "stylelint": "^16.1.0" - } - }, - "node_modules/stylelint-config-recommended-scss": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-14.0.0.tgz", - "integrity": "sha512-HDvpoOAQ1RpF+sPbDOT2Q2/YrBDEJDnUymmVmZ7mMCeNiFSdhRdyGEimBkz06wsN+HaFwUh249gDR+I9JR7Onw==", - "dev": true, - "dependencies": { - "postcss-scss": "^4.0.9", - "stylelint-config-recommended": "^14.0.0", - "stylelint-scss": "^6.0.0" - }, - "engines": { - "node": ">=18.12.0" - }, - "peerDependencies": { - "postcss": "^8.3.3", - "stylelint": "^16.0.2" - }, - "peerDependenciesMeta": { - "postcss": { - "optional": true - } - } - }, - "node_modules/stylelint-config-standard": { - "version": "36.0.1", - "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-36.0.1.tgz", - "integrity": "sha512-8aX8mTzJ6cuO8mmD5yon61CWuIM4UD8Q5aBcWKGSf6kg+EC3uhB+iOywpTK4ca6ZL7B49en8yanOFtUW0qNzyw==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/stylelint" - }, - { - "type": "github", - "url": "https://github.com/sponsors/stylelint" - } - ], - "dependencies": { - "stylelint-config-recommended": "^14.0.1" - }, - "engines": { - "node": ">=18.12.0" - }, - "peerDependencies": { - "stylelint": "^16.1.0" - } - }, - "node_modules/stylelint-config-standard-scss": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-13.1.0.tgz", - "integrity": "sha512-Eo5w7/XvwGHWkeGLtdm2FZLOMYoZl1omP2/jgFCXyl2x5yNz7/8vv4Tj6slHvMSSUNTaGoam/GAZ0ZhukvalfA==", - "dev": true, - "dependencies": { - "stylelint-config-recommended-scss": "^14.0.0", - "stylelint-config-standard": "^36.0.0" - }, - "engines": { - "node": ">=18.12.0" - }, - "peerDependencies": { - "postcss": "^8.3.3", - "stylelint": "^16.3.1" - }, - "peerDependenciesMeta": { - "postcss": { - "optional": true - } - } - }, - "node_modules/stylelint-scss": { - "version": "6.3.2", - "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-6.3.2.tgz", - "integrity": "sha512-pNk9mXOVKkQtd+SROPC9io8ISSgX+tOVPhFdBE+LaKQnJMLdWPbGKAGYv4Wmf/RrnOjkutunNTN9kKMhkdE5qA==", - "dev": true, - "dependencies": { - "known-css-properties": "^0.31.0", - "postcss-media-query-parser": "^0.2.3", - "postcss-resolve-nested-selector": "^0.1.1", - "postcss-selector-parser": "^6.1.0", - "postcss-value-parser": "^4.2.0" - }, - "engines": { - "node": ">=18.12.0" - }, - "peerDependencies": { - "stylelint": "^16.0.2" - } - }, - "node_modules/stylelint/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/stylelint/node_modules/balanced-match": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", - "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==", - "dev": true - }, - "node_modules/stylelint/node_modules/file-entry-cache": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-9.0.0.tgz", - "integrity": "sha512-6MgEugi8p2tiUhqO7GnPsmbCCzj0YRCwwaTbpGRyKZesjRSzkqkAE9fPp7V2yMs5hwfgbQLgdvSSkGNg1s5Uvw==", - "dev": true, - "dependencies": { - "flat-cache": "^5.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/stylelint/node_modules/flat-cache": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-5.0.0.tgz", - "integrity": "sha512-JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ==", - "dev": true, - "dependencies": { - "flatted": "^3.3.1", - "keyv": "^4.5.4" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/stylelint/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/stylelint/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/stylelint/node_modules/write-file-atomic": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", - "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", - "dev": true, - "dependencies": { - "imurmurhash": "^0.1.4", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/supports-hyperlinks": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.0.0.tgz", - "integrity": "sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0", - "supports-color": "^7.0.0" - }, - "engines": { - "node": ">=14.18" - } - }, - "node_modules/supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/svg-tags": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz", - "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==", - "dev": true - }, - "node_modules/symbol-tree": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", - "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", - "dev": true - }, - "node_modules/table": { - "version": "6.8.2", - "resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz", - "integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==", - "dev": true, - "dependencies": { - "ajv": "^8.0.1", - "lodash.truncate": "^4.4.2", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/table/node_modules/ajv": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz", - "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.3", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.4.1" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/table/node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "node_modules/test-exclude": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", - "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", - "dev": true, - "dependencies": { - "@istanbuljs/schema": "^0.1.2", - "glob": "^7.1.4", - "minimatch": "^3.0.4" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true - }, - "node_modules/tmpl": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", - "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", - "dev": true - }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/tough-cookie": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz", - "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==", - "dev": true, - "dependencies": { - "psl": "^1.1.33", - "punycode": "^2.1.1", - "universalify": "^0.2.0", - "url-parse": "^1.5.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/tr46": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", - "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", - "dev": true, - "dependencies": { - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/tsconfig-paths": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", - "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", - "dev": true, - "dependencies": { - "@types/json5": "^0.0.29", - "json5": "^1.0.2", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" - } - }, - "node_modules/tsconfig-paths/node_modules/json5": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", - "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", - "dev": true, - "dependencies": { - "minimist": "^1.2.0" - }, - "bin": { - "json5": "lib/cli.js" - } - }, - "node_modules/tsconfig-paths/node_modules/strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "dependencies": { - "prelude-ls": "^1.2.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/typed-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", - "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "es-errors": "^1.3.0", - "is-typed-array": "^1.1.13" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/typed-array-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", - "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/typed-array-byte-offset": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", - "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", - "dev": true, - "dependencies": { - "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/typed-array-length": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz", - "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13", - "possible-typed-array-names": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/unbox-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", - "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-bigints": "^1.0.2", - "has-symbols": "^1.0.3", - "which-boxed-primitive": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "dev": true - }, - "node_modules/universalify": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", - "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", - "dev": true, - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/update-browserslist-db": { - "version": "1.0.16", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz", - "integrity": "sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==", - "dev": true, - "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/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/url-parse": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", - "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", - "dev": true, - "dependencies": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true - }, - "node_modules/v8-to-istanbul": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", - "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", - "dev": true, - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.12", - "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^2.0.0" - }, - "engines": { - "node": ">=10.12.0" - } - }, - "node_modules/version-guard": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.2.tgz", - "integrity": "sha512-D8d+YxCUpoqtCnQzDxm6SF7DLU3gr2535T4khAtMq4osBahsQnmSxuwXFdrbAdDGG8Uokzfis/jvyeFPdmlc7w==", - "dev": true, - "engines": { - "node": ">=0.10.48" - } - }, - "node_modules/w3c-xmlserializer": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz", - "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==", - "dev": true, - "dependencies": { - "xml-name-validator": "^4.0.0" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/walker": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", - "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", - "dev": true, - "dependencies": { - "makeerror": "1.0.12" - } - }, - "node_modules/webidl-conversions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", - "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/whatwg-encoding": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", - "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", - "dev": true, - "dependencies": { - "iconv-lite": "0.6.3" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/whatwg-mimetype": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", - "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/whatwg-url": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", - "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", - "dev": true, - "dependencies": { - "tr46": "^3.0.0", - "webidl-conversions": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dev": true, - "dependencies": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/which-builtin-type": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz", - "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==", - "dev": true, - "dependencies": { - "function.prototype.name": "^1.1.5", - "has-tostringtag": "^1.0.0", - "is-async-function": "^2.0.0", - "is-date-object": "^1.0.5", - "is-finalizationregistry": "^1.0.2", - "is-generator-function": "^1.0.10", - "is-regex": "^1.1.4", - "is-weakref": "^1.0.2", - "isarray": "^2.0.5", - "which-boxed-primitive": "^1.0.2", - "which-collection": "^1.0.1", - "which-typed-array": "^1.1.9" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/which-collection": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", - "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", - "dev": true, - "dependencies": { - "is-map": "^2.0.3", - "is-set": "^2.0.3", - "is-weakmap": "^2.0.2", - "is-weakset": "^2.0.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/which-typed-array": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", - "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", - "dev": true, - "dependencies": { - "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/word-wrap": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", - "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "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/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true - }, - "node_modules/write-file-atomic": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", - "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", - "dev": true, - "dependencies": { - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.7" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/ws": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", - "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", - "dev": true, - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, - "node_modules/xdg-basedir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", - "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/xml-name-validator": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", - "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/xmlchars": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", - "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", - "dev": true - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - }, - "node_modules/yargs": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dev": true, - "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - } - } -} diff --git a/pkgs/development/python-modules/django-htmx/default.nix b/pkgs/development/python-modules/django-htmx/default.nix new file mode 100644 index 000000000000..0e60a5ae5aef --- /dev/null +++ b/pkgs/development/python-modules/django-htmx/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + asgiref, + django, + pytestCheckHook, + pytest-django, +}: + +buildPythonPackage rec { + pname = "django-htmx"; + version = "1.19.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "adamchainz"; + repo = "django-htmx"; + rev = version; + hash = "sha256-nSutErUkFafKjBswhC+Lrn39MgCbCrzttAx1a+qt1so="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + asgiref + django + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-django + ]; + + pythonImportsCheck = [ "django_htmx" ]; + + meta = { + description = "Extensions for using Django with htmx"; + homepage = "https://github.com/adamchainz/django-htmx"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ minijackson ]; + }; +} diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index 52f1ff4d5b4c..d2d65daa6689 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { tablib ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ tablib ] ++ tablib.optional-dependencies.all; cli = [ tablib ] ++ tablib.optional-dependencies.cli; ods = [ tablib ] ++ tablib.optional-dependencies.ods; @@ -52,7 +52,7 @@ buildPythonPackage rec { chardet psycopg2 pytz - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/django-js-reverse/default.nix b/pkgs/development/python-modules/django-js-reverse/default.nix index 3e344f881395..49a6e3cb6b5b 100644 --- a/pkgs/development/python-modules/django-js-reverse/default.nix +++ b/pkgs/development/python-modules/django-js-reverse/default.nix @@ -7,7 +7,6 @@ django, packaging, nodejs, - js2py, six, }: @@ -25,9 +24,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ] ++ lib.optionals (pythonAtLeast "3.7") [ packaging ]; + # Js2py is needed for tests but it's unmaintained and insecure + doCheck = false; + nativeCheckInputs = [ nodejs - js2py six ]; diff --git a/pkgs/development/python-modules/django-json-widget/default.nix b/pkgs/development/python-modules/django-json-widget/default.nix new file mode 100644 index 000000000000..c42f778d61a6 --- /dev/null +++ b/pkgs/development/python-modules/django-json-widget/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + django, + pythonOlder, + setuptools, + python, + pytestCheckHook, + pytest-django, +}: + +buildPythonPackage rec { + pname = "django-json-widget"; + version = "2.0.1"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "jmrivas86"; + repo = "django-json-widget"; + rev = "refs/tags/v${version}"; + hash = "sha256-GY6rYY//n8kkWCJZk6OY+EOBv62ocNovNmE/ai8VCn4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ django ]; + + nativeCheckInputs = [ + pytest-django + pytestCheckHook + ]; + + preCheck = '' + export DJANGO_SETTINGS_MODULE=tests.settings + ''; + + pythonImportCheck = [ "django_json_widget" ]; + + meta = { + description = "Alternative widget that makes it easy to edit the jsonfield field of django"; + homepage = "https://github.com/jmrivas86/django-json-widget"; + changelog = "https://github.com/jmrivas86/django-json-widget/blob/v${version}/CHANGELOG.rst"; + # Contradictory license specifications + # https://github.com/jmrivas86/django-json-widget/issues/93 + license = lib.licenses.mit; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index d139e4666842..9a10d0bcf355 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -21,15 +21,17 @@ buildPythonPackage rec { pname = "django-mailman3"; - version = "1.3.12"; + version = "1.3.15"; pyproject = true; src = fetchPypi { pname = "django_mailman3"; inherit version; - hash = "sha256-MnQlT5ElNnStLUKyOXnI7ZDDaBwfp+h9tbOC+cwB0es="; + hash = "sha256-+ZFrJpy5xdW6Yde/XEvxoAN8+TSQdiI0PfjZ7bHG0Rs="; }; + pythonRelaxDeps = [ "django-allauth" ]; + build-system = [ pdm-backend ]; dependencies = [ diff --git a/pkgs/development/python-modules/django-markup/default.nix b/pkgs/development/python-modules/django-markup/default.nix index dce53f40ad93..61ce9fd91cec 100644 --- a/pkgs/development/python-modules/django-markup/default.nix +++ b/pkgs/development/python-modules/django-markup/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { dependencies = [ django ]; - passthru.optional-dependencies = { + optional-dependencies = { all_filter_dependencies = [ bleach docutils @@ -63,7 +63,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-django pytestCheckHook - ] ++ passthru.optional-dependencies.all_filter_dependencies; + ] ++ optional-dependencies.all_filter_dependencies; preCheck = '' export DJANGO_SETTINGS_MODULE=django_markup.tests diff --git a/pkgs/development/python-modules/django-mdeditor/Bump-KaTeX-and-replace-bootcdn-with-jsdelivr.patch b/pkgs/development/python-modules/django-mdeditor/Bump-KaTeX-and-replace-bootcdn-with-jsdelivr.patch new file mode 100644 index 000000000000..28f7b182809f --- /dev/null +++ b/pkgs/development/python-modules/django-mdeditor/Bump-KaTeX-and-replace-bootcdn-with-jsdelivr.patch @@ -0,0 +1,63 @@ +From c5af641cccf663dffb4a47d32e28404f609badce Mon Sep 17 00:00:00 2001 +From: Tomo <tomodachi94@protonmail.com> +Date: Sat, 12 Oct 2024 03:39:12 +0000 +Subject: [PATCH 1/2] chore(KaTeX): bump to 0.7.1 + +Many bugfixes. This KaTeX is still quite old, +but versions beyond this have backwards-incompatibilities +(starting in 0.8). +--- + mdeditor/static/mdeditor/js/editormd.js | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mdeditor/static/mdeditor/js/editormd.js b/mdeditor/static/mdeditor/js/editormd.js +index be0005d..8aacb56 100644 +--- a/mdeditor/static/mdeditor/js/editormd.js ++++ b/mdeditor/static/mdeditor/js/editormd.js +@@ -4179,8 +4179,8 @@ + // 使用国外的CDN，加载速度有时会很慢，或者自定义URL + // You can custom KaTeX load url. + editormd.katexURL = { +- css : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.3.0/katex.min", +- js : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.3.0/katex.min" ++ css : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.7.1/katex.min", ++ js : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.7.1/katex.min" + }; + + editormd.kaTeXLoaded = false; +-- +2.46.2 + + +From 3d082a738262b057d33b9aa8c777d50113143952 Mon Sep 17 00:00:00 2001 +From: Tomo <tomodachi94@protonmail.com> +Date: Mon, 7 Oct 2024 17:44:39 -0700 +Subject: [PATCH 2/2] fix(KaTeX): Use jsdelivr instead of bootcdn + +Bootcdn was compromised by a malicious actor: +https://sansec.io/research/polyfill-supply-chain-attack + +KaTeX recommends using jsdelivr, so I used that: +https://katex.org/docs/browser +--- + mdeditor/static/mdeditor/js/editormd.js | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mdeditor/static/mdeditor/js/editormd.js b/mdeditor/static/mdeditor/js/editormd.js +index 8aacb56..a31e817 100644 +--- a/mdeditor/static/mdeditor/js/editormd.js ++++ b/mdeditor/static/mdeditor/js/editormd.js +@@ -4179,8 +4179,8 @@ + // 使用国外的CDN，加载速度有时会很慢，或者自定义URL + // You can custom KaTeX load url. + editormd.katexURL = { +- css : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.7.1/katex.min", +- js : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.7.1/katex.min" ++ css : "//cdn.jsdelivr.net/npm/katex@0.7.1/dist/katex.min.css", ++ js : "//cdn.jsdelivr.net/npm/katex@0.7.1/dist/katex.min.js" + }; + + editormd.kaTeXLoaded = false; +-- +2.46.2 + diff --git a/pkgs/development/python-modules/django-mdeditor/default.nix b/pkgs/development/python-modules/django-mdeditor/default.nix index 96b5c93bae2d..a495b41c892d 100644 --- a/pkgs/development/python-modules/django-mdeditor/default.nix +++ b/pkgs/development/python-modules/django-mdeditor/default.nix @@ -18,6 +18,10 @@ buildPythonPackage { hash = "sha256-t57j1HhjNQtBwlbqe4mAHQ9WiNcIhMKYmrZkiqh+k5k="; }; + patches = [ + ./Bump-KaTeX-and-replace-bootcdn-with-jsdelivr.patch + ]; + propagatedBuildInputs = [ django ]; # no tests diff --git a/pkgs/development/python-modules/django-mfa3/default.nix b/pkgs/development/python-modules/django-mfa3/default.nix new file mode 100644 index 000000000000..c0ed1e4f287b --- /dev/null +++ b/pkgs/development/python-modules/django-mfa3/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + django, + setuptools, + pyotp, + fido2, + qrcode, + python, +}: + +buildPythonPackage rec { + pname = "django-mfa3"; + version = "0.13.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xi"; + repo = "django-mfa3"; + rev = "refs/tags/${version}"; + hash = "sha256-O8po7VevqyHlP2isnNnLbpgfs1p4sFezxIZKMTgnwuY="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + django + pyotp + fido2 + qrcode + ]; + + # qrcode 8.0 not supported yet + # See https://github.com/xi/django-mfa3/pull/14 + pythonRelaxDeps = [ "qrcode" ]; + + checkPhase = '' + ${python.interpreter} -m django test --settings tests.settings + ''; + + meta = { + description = "Multi factor authentication for Django"; + homepage = "https://github.com/xi/django-mfa3"; + changelog = "https://github.com/xi/django-mfa3/blob/${src.rev}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/pkgs/development/python-modules/django-modelcluster/default.nix b/pkgs/development/python-modules/django-modelcluster/default.nix index a7efa70261fb..ed4f3a05a764 100644 --- a/pkgs/development/python-modules/django-modelcluster/default.nix +++ b/pkgs/development/python-modules/django-modelcluster/default.nix @@ -1,27 +1,22 @@ { lib, buildPythonPackage, - fetchFromGitHub, - pythonOlder, - - # dependencies - django, - pytz, - - # optionals django-taggit, - - # tests + django, + fetchFromGitHub, pytest-django, pytestCheckHook, + pythonOlder, + pytz, + setuptools, }: buildPythonPackage rec { pname = "django-modelcluster"; version = "6.3"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "wagtail"; @@ -30,28 +25,28 @@ buildPythonPackage rec { hash = "sha256-AUVl2aidjW7Uu//3HlAod7pxzj6Gs1Xd0uTt3NrrqAU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django pytz ]; - passthru.optional-dependencies.taggit = [ django-taggit ]; + optional-dependencies.taggit = [ django-taggit ]; env.DJANGO_SETTINGS_MODULE = "tests.settings"; nativeCheckInputs = [ pytest-django pytestCheckHook - ] ++ passthru.optional-dependencies.taggit; + ] ++ optional-dependencies.taggit; - # https://github.com/wagtail/django-modelcluster/issues/173 - disabledTests = lib.optionals (lib.versionAtLeast django.version "4.2") [ - "test_formfield_callback" - ]; + pythonImportsCheck = [ "modelcluster" ]; meta = with lib; { description = "Django extension to allow working with 'clusters' of models as a single unit, independently of the database"; homepage = "https://github.com/torchbox/django-modelcluster/"; + changelog = "https://github.com/wagtail/django-modelcluster/blob/v${version}/CHANGELOG.txt"; license = licenses.bsd2; maintainers = with maintainers; [ desiderius ]; }; diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix index 3b7cd55b494c..1fb63c59cd4c 100644 --- a/pkgs/development/python-modules/django-modeltranslation/default.nix +++ b/pkgs/development/python-modules/django-modeltranslation/default.nix @@ -13,7 +13,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.9"; + version = "0.19.10"; in buildPythonPackage { pname = "django-modeltranslation"; @@ -23,7 +23,7 @@ buildPythonPackage { owner = "deschler"; repo = "django-modeltranslation"; rev = "refs/tags/v${version}"; - hash = "sha256-2GTz+niXfEsi++KyL6+HtwdzO1YFhpKQsDK3F8GAl4A="; + hash = "sha256-E3CaQx5SGOnxqjLFY0opcKZF4DMl2HKSUD0gOnA25RA="; }; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/django-mptt/default.nix b/pkgs/development/python-modules/django-mptt/default.nix index 419bb9c8eebc..404b6df1bc90 100644 --- a/pkgs/development/python-modules/django-mptt/default.nix +++ b/pkgs/development/python-modules/django-mptt/default.nix @@ -2,35 +2,34 @@ lib, buildPythonPackage, fetchFromGitHub, + hatchling, django, django-js-asset, - python, }: buildPythonPackage rec { pname = "django-mptt"; - version = "0.13.4"; - format = "setuptools"; + version = "0.16"; + pyproject = true; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "django-mptt"; + repo = "django-mptt"; rev = version; - sha256 = "12y3chxhqxk2yxin055f0f45nabj0s8hil12hw0lwzlbax6k9ss6"; + hash = "sha256-vWnXKWzaa5AWoNaIc8NA1B2mnzKXRliQmi5VdrRMadE="; }; - propagatedBuildInputs = [ + build-system = [ hatchling ]; + + dependencies = [ django django-js-asset ]; pythonImportsCheck = [ "mptt" ]; - checkPhase = '' - runHook preCheck - ${python.interpreter} tests/manage.py test - runHook postCheck - ''; + # No pytest checks, since they depend on model_mommy, which is deprecated + doCheck = false; meta = with lib; { description = "Utilities for implementing a modified pre-order traversal tree in Django"; diff --git a/pkgs/development/python-modules/django-multiselectfield/default.nix b/pkgs/development/python-modules/django-multiselectfield/default.nix index 9e7da31291a7..ad365b7062f3 100644 --- a/pkgs/development/python-modules/django-multiselectfield/default.nix +++ b/pkgs/development/python-modules/django-multiselectfield/default.nix @@ -3,26 +3,37 @@ buildPythonPackage, fetchPypi, django, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "django-multiselectfield"; - version = "0.1.12"; - format = "setuptools"; + version = "0.1.13"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "1ygra8s394d1szgj7yawlca17q08hygsrzvq2k3k48zvd0awg96h"; + pname = "django_multiselectfield"; + inherit version; + hash = "sha256-Q31yYy9MDKQWlRkXYyUpw9HUK2K7bDwD4zlvpQJlvpQ="; }; - propagatedBuildInputs = [ django ]; + build-system = [ setuptools ]; + + dependencies = [ django ]; # No tests doCheck = false; + pythonImportsCheck = [ "multiselectfield" ]; + meta = { - description = "django-multiselectfield"; + description = "Multiple Choice model field for Django"; homepage = "https://github.com/goinnn/django-multiselectfield"; - license = lib.licenses.lgpl3; + changelog = "https://github.com/goinnn/django-multiselectfield/blob/master/CHANGES.rst"; + license = lib.licenses.lgpl3Plus; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index ae4a56d8790b..30007c812b3c 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, # propagates django, @@ -11,6 +12,7 @@ # tests djangorestframework, + pytest-cov-stub, pytest-django, pytest-mock, pytestCheckHook, @@ -18,35 +20,34 @@ buildPythonPackage rec { pname = "django-oauth-toolkit"; - version = "2.4.0"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "jazzband"; - repo = pname; + repo = "django-oauth-toolkit"; rev = "refs/tags/${version}"; - hash = "sha256-nfLjjVp+6OsjFdJHUZ2gzZic/E/sCklj+YeFyb/EZdw="; + hash = "sha256-Ya0KlX+vtLXN2Fgk0Gv7KemJCUTwkaH+4GQA1ByUlBY="; }; - postPatch = '' - sed -i '/cov/d' tox.ini - ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ django jwcrypto oauthlib requests ]; - pythonRelaxDeps = [ "django" ]; - - DJANGO_SETTINGS_MODULE = "tests.settings"; + preCheck = '' + export DJANGO_SETTINGS_MODULE=tests.settings + ''; # xdist is disabled right now because it can cause race conditions on high core machines # https://github.com/jazzband/django-oauth-toolkit/issues/1300 nativeCheckInputs = [ djangorestframework + pytest-cov-stub pytest-django # pytest-xdist pytest-mock @@ -58,10 +59,11 @@ buildPythonPackage rec { "test_response_when_auth_server_response_return_404" ]; - meta = with lib; { + meta = { description = "OAuth2 goodies for the Djangonauts"; homepage = "https://github.com/jazzband/django-oauth-toolkit"; - license = licenses.bsd2; - maintainers = with maintainers; [ mmai ]; + changelog = "https://github.com/jazzband/django-oauth-toolkit/django-filer/blob/${version}/CHANGELOG.md"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ mmai ]; }; } diff --git a/pkgs/development/python-modules/django-otp-webauthn/default.nix b/pkgs/development/python-modules/django-otp-webauthn/default.nix index 304d6f543ae4..ba7df273d615 100644 --- a/pkgs/development/python-modules/django-otp-webauthn/default.nix +++ b/pkgs/development/python-modules/django-otp-webauthn/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "django-otp-webauthn"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; src = fetchPypi { inherit version; pname = "django_otp_webauthn"; - hash = "sha256-+Y46/PDeXL9zayoZykaU63faQmnLHzYPmqJJeRBx+hs="; + hash = "sha256-BXwIjQjynTjFK+bNML5i35qxQ7TJeb4Xc+duS6Y+5Fk="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/django-parler/default.nix b/pkgs/development/python-modules/django-parler/default.nix index b963f709a4d3..73e52c187cca 100644 --- a/pkgs/development/python-modules/django-parler/default.nix +++ b/pkgs/development/python-modules/django-parler/default.nix @@ -5,12 +5,13 @@ fetchFromGitHub, pythonOlder, python, + setuptools, }: buildPythonPackage rec { pname = "django-parler"; version = "2.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +22,16 @@ buildPythonPackage rec { hash = "sha256-tRGifFPCXF3aa3PQWKw3tl1H1TY+lgcChUP1VdwG1cE="; }; - propagatedBuildInputs = [ django ]; + build-system = [ setuptools ]; + + dependencies = [ django ]; + + # Disable failing test: article.tests.AdminArticleTestCase.test_admin_add + # AssertionError: '<h1>Ajout de Article (Hollandais)</h1>' not found in ... + # https://github.com/django-parler/django-parler/issues/358 + preCheck = lib.optionalString (lib.versionAtLeast django.version "5.0") '' + rm example/article/tests.py + ''; checkPhase = '' runHook preCheck @@ -29,11 +39,11 @@ buildPythonPackage rec { runHook postCheck ''; - meta = with lib; { + meta = { description = "Simple Django model translations without nasty hacks"; homepage = "https://github.com/django-parler/django-parler"; changelog = "https://github.com/django-parler/django-parler/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ derdennisop ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ derdennisop ]; }; } diff --git a/pkgs/development/python-modules/django-pgactivity/default.nix b/pkgs/development/python-modules/django-pgactivity/default.nix new file mode 100644 index 000000000000..69af00e6d0ff --- /dev/null +++ b/pkgs/development/python-modules/django-pgactivity/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + django, + psycopg, +}: + +buildPythonPackage rec { + pname = "django-pgactivity"; + version = "1.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Opus10"; + repo = "django-pgactivity"; + rev = "refs/tags/${version}"; + hash = "sha256-jOpm/vYy3Ubi+NfvARH19ozZMUgyGD/ZztqxKNvAoLQ="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + django + psycopg + ]; + + pythonImportsCheck = [ "pgactivity" ]; + + meta = { + description = "View, filter, and kill Postgres queries"; + homepage = "https://github.com/Opus10/django-pgactivity"; + changelog = "https://github.com/Opus10/django-pgactivity/blob/${version}/CHANGELOG.md"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/development/python-modules/django-pglock/default.nix b/pkgs/development/python-modules/django-pglock/default.nix new file mode 100644 index 000000000000..06ca731c76be --- /dev/null +++ b/pkgs/development/python-modules/django-pglock/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + django, + django-pgactivity, +}: + +buildPythonPackage rec { + pname = "django-pglock"; + version = "1.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Opus10"; + repo = "django-pglock"; + rev = "refs/tags/${version}"; + hash = "sha256-KCB00W3sUyEERgK/DfDPl051uFkc0IRdbOJusUVs5SA="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + django + django-pgactivity + ]; + + pythonImportsCheck = [ "pglock" ]; + + meta = { + description = "Postgres advisory locks, table locks, and blocking lock management"; + homepage = "https://github.com/Opus10/django-pglock"; + changelog = "https://github.com/Opus10/django-pglock/blob/${version}/CHANGELOG.md"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index b313276bbf6b..86bc344fd070 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, python, django, dj-database-url, @@ -19,10 +20,21 @@ buildPythonPackage rec { hash = "sha256-JJY+FoMPSnWuSsNIas2JedGJpdm6RfPE3E1VIjGuXIc="; }; + patches = [ + # Spelling of assertQuerySetEqual changed in Django >= 4.2 + (fetchpatch { + url = "https://github.com/jazzband/django-polymorphic/commit/63d291f8771847e716a37652f239e3966a3360e1.patch"; + hash = "sha256-rvvD9zfjm8bgH1460BA5K44Oobzv1FRAYq9Rgg291B8="; + }) + ]; + propagatedBuildInputs = [ django ]; nativeCheckInputs = [ dj-database-url ]; + # Tests fail for Django >= 5.1.0 + doCheck = lib.versionOlder django.version "5.1.0"; + checkPhase = '' ${python.interpreter} runtests.py ''; diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix index d3fb086fc417..cf9685e0b2ac 100644 --- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix +++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { six ]; - doCheck = !stdenv.isDarwin; # could not create shared memory segment: Operation not permitted + doCheck = !stdenv.hostPlatform.isDarwin; # could not create shared memory segment: Operation not permitted nativeCheckInputs = [ djangorestframework diff --git a/pkgs/development/python-modules/django-pwa/default.nix b/pkgs/development/python-modules/django-pwa/default.nix index 134a84852f66..0e8d3c9c5953 100644 --- a/pkgs/development/python-modules/django-pwa/default.nix +++ b/pkgs/development/python-modules/django-pwa/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - pyImportCheck = [ "pwa" ]; + pythonImportsCheck = [ "pwa" ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix index 99b8aec53a36..0cc7ea246e8c 100644 --- a/pkgs/development/python-modules/django-q/default.nix +++ b/pkgs/development/python-modules/django-q/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { "test_mongo" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Multiprocessing distributed task queue for Django"; diff --git a/pkgs/development/python-modules/django-redis/default.nix b/pkgs/development/python-modules/django-redis/default.nix index eefb715e1708..6d84ad60fe38 100644 --- a/pkgs/development/python-modules/django-redis/default.nix +++ b/pkgs/development/python-modules/django-redis/default.nix @@ -14,6 +14,7 @@ # testing pkgs, + pytest-cov-stub, pytest-django, pytest-mock, pytestCheckHook, @@ -33,11 +34,7 @@ buildPythonPackage rec { hash = "sha256-m7z3c7My24vrSSnyfDQ/LlWhy7pV4U0L8LATMvkfczc="; }; - postPatch = '' - sed -i '/-cov/d' setup.cfg - ''; - - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; propagatedBuildInputs = [ django @@ -46,15 +43,15 @@ buildPythonPackage rec { redis ]; - passthru.optional-dependencies = { + optional-dependencies = { hiredis = [ redis ] ++ redis.optional-dependencies.hiredis; }; pythonImportsCheck = [ "django_redis" ]; - DJANGO_SETTINGS_MODULE = "tests.settings.sqlite"; - preCheck = '' + export DJANGO_SETTINGS_MODULE=tests.settings.sqlite + ${pkgs.redis}/bin/redis-server & REDIS_PID=$! ''; @@ -64,10 +61,11 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ + pytest-cov-stub pytest-django pytest-mock pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ "-W" diff --git a/pkgs/development/python-modules/django-rest-registration/default.nix b/pkgs/development/python-modules/django-rest-registration/default.nix index eb6fcafac1d0..b62c60d70372 100644 --- a/pkgs/development/python-modules/django-rest-registration/default.nix +++ b/pkgs/development/python-modules/django-rest-registration/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "django-rest-registration"; - version = "0.8.3"; + version = "0.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "apragacz"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RDegK+1A01kfpit3LX+ToViqPlTiZ3dIve38ea7lNxE="; + hash = "sha256-EaS1qN7GpfPPeSLwwQdVWSRO2dv0DG5LD7vnXckz4Bg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-reversion/default.nix b/pkgs/development/python-modules/django-reversion/default.nix index 9d795c934647..2c0328883703 100644 --- a/pkgs/development/python-modules/django-reversion/default.nix +++ b/pkgs/development/python-modules/django-reversion/default.nix @@ -9,19 +9,20 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "5.0.12"; + version = "5.1.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-wEfMmanxukqubbicOsJDR41t6Y7Ipgxwc/zIddicXNs="; + pname = "django_reversion"; + inherit version; + hash = "sha256-MwmCHltvzu3M5raXXxqcf6tq58fQ4SdqkONFlG+g3Lg="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ django ]; + dependencies = [ django ]; # Tests assume the availability of a mysql/postgresql database doCheck = false; diff --git a/pkgs/development/python-modules/django-rosetta/default.nix b/pkgs/development/python-modules/django-rosetta/default.nix index a2ae0c0b34ae..98234ebb575a 100644 --- a/pkgs/development/python-modules/django-rosetta/default.nix +++ b/pkgs/development/python-modules/django-rosetta/default.nix @@ -6,12 +6,13 @@ polib, pythonOlder, requests, + setuptools, }: buildPythonPackage rec { pname = "django-rosetta"; - version = "0.9.9"; - format = "setuptools"; + version = "0.10.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,10 +20,12 @@ buildPythonPackage rec { owner = "mbi"; repo = "django-rosetta"; rev = "refs/tags/v${version}"; - hash = "sha256-OuKgqGYBlzQNKKAJYFhNi+LnONB/mxINMj4VBAVWjqI="; + hash = "sha256-b+iCUA3i3Ej6S5XcGQhBIEIJFx6vOL2sq3xkkA9wqek="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django polib requests diff --git a/pkgs/development/python-modules/django-silk/default.nix b/pkgs/development/python-modules/django-silk/default.nix index 0825ee658b93..dc7372d59c16 100644 --- a/pkgs/development/python-modules/django-silk/default.nix +++ b/pkgs/development/python-modules/django-silk/default.nix @@ -25,16 +25,16 @@ buildPythonPackage rec { pname = "django-silk"; - version = "5.2.0"; + version = "5.3.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "jazzband"; repo = "django-silk"; rev = "refs/tags/${version}"; - hash = "sha256-wSQ0yV9+UyjgsaQGNn+MdeUkx9eeRqaHvDpUxIGRmGM="; + hash = "sha256-teDvQzNmzCOWdPOqlm2GRhhlilOjM+VAcfOXPw/Rq44="; }; # "test_time_taken" tests aren't suitable for reproducible execution, but Django's diff --git a/pkgs/development/python-modules/django-soft-delete/default.nix b/pkgs/development/python-modules/django-soft-delete/default.nix index 05f2ebeb1c27..ef55f085d2be 100644 --- a/pkgs/development/python-modules/django-soft-delete/default.nix +++ b/pkgs/development/python-modules/django-soft-delete/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "django-soft-delete"; - version = "1.0.13"; + version = "1.0.14"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-RDwApUwG0jb/iAbDJgJD13XMU2WB1zd8J4UICxBBzh0="; + hash = "sha256-Qo31bqT7sT9C1PdS8R8qUXqjGsPRtFDmt4xMXV2d/Ds="; }; dependencies = [ django ]; diff --git a/pkgs/development/python-modules/django-split-settings/default.nix b/pkgs/development/python-modules/django-split-settings/default.nix new file mode 100644 index 000000000000..31ac1836b5dc --- /dev/null +++ b/pkgs/development/python-modules/django-split-settings/default.nix @@ -0,0 +1,45 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + poetry-core, + django, + pytestCheckHook, + pytest-cov-stub, +}: + +buildPythonPackage rec { + pname = "django-split-settings"; + version = "1.3.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "wemake-services"; + repo = "django-split-settings"; + rev = version; + hash = "sha256-Bk2/DU+K524mCUvteWT0fIQH5ZgeMHiufMTF+dJYVtc="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "poetry.masonry" "poetry.core.masonry" + ''; + + build-system = [ poetry-core ]; + + dependencies = [ django ]; + + pythonImportsCheck = [ "split_settings" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; + + meta = { + description = "Organize Django settings into multiple files and directories"; + homepage = "https://github.com/wemake-services/django-split-settings"; + maintainers = with lib.maintainers; [ sikmir ]; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 84378ee311a8..161012236047 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -15,6 +15,8 @@ pythonOlder, rsa, setuptools, + pynacl, + fetchpatch, }: buildPythonPackage rec { @@ -31,11 +33,21 @@ buildPythonPackage rec { hash = "sha256-nlM/XPot3auLzNsnHCVtog2WmiaibDRgbPOw9A5F9QI="; }; - nativeBuildInputs = [ setuptools ]; + patches = [ + # Add Moto 5 support + # https://github.com/jschneier/django-storages/pull/1464 + (fetchpatch { + url = "https://github.com/jschneier/django-storages/commit/e1aedcf2d137f164101d31f2f430f1594eedd78c.patch"; + hash = "sha256-jSb/uJ0RXvPsXl+WUAzAgDvJl9Y3ad2F30X1SbsCc04="; + name = "add_moto_5_support.patch"; + }) + ]; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ django ]; + dependencies = [ django ]; - passthru.optional-dependencies = { + optional-dependencies = { azure = [ azure-storage-blob ]; boto3 = [ boto3 ]; dropbox = [ dropbox ]; @@ -50,7 +62,9 @@ buildPythonPackage rec { moto pytestCheckHook rsa - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); + + checkInputs = [ pynacl ]; pythonImportsCheck = [ "storages" ]; @@ -58,20 +72,16 @@ buildPythonPackage rec { disabledTests = [ # AttributeError: 'str' object has no attribute 'universe_domain' + # https://github.com/jschneier/django-storages/issues/1463 "test_storage_save_gzip" ]; - disabledTestPaths = [ - # ImportError: cannot import name 'mock_s3' from 'moto' - "tests/test_s3.py" - ]; - - meta = with lib; { + meta = { description = "Collection of custom storage backends for Django"; changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst"; downloadPage = "https://github.com/jschneier/django-storages/"; homepage = "https://django-storages.readthedocs.io"; - license = licenses.bsd3; - maintainers = with maintainers; [ mmai ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mmai ]; }; } diff --git a/pkgs/development/python-modules/django-stubs-ext/default.nix b/pkgs/development/python-modules/django-stubs-ext/default.nix index 557e6410daea..d0caecd45776 100644 --- a/pkgs/development/python-modules/django-stubs-ext/default.nix +++ b/pkgs/development/python-modules/django-stubs-ext/default.nix @@ -3,15 +3,17 @@ buildPythonPackage, django, fetchPypi, + oracledb, pytestCheckHook, pythonOlder, + redis, setuptools, typing-extensions, }: buildPythonPackage rec { pname = "django-stubs-ext"; - version = "5.0.4"; + version = "5.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,16 +21,21 @@ buildPythonPackage rec { src = fetchPypi { pname = "django_stubs_ext"; inherit version; - hash = "sha256-hdoGUiQgR3Qgi+KcfQK0SC1aaSGKcoRlwvvkFyX9yBk="; + hash = "sha256-23Nk5PUK5+U2CZPb1Yo6V+pLLn5bqw+9UlzNs+eXXRw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ django typing-extensions ]; + optional-dependencies = { + redis = [ redis ]; + oracle = [ oracledb ]; + }; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "django_stubs_ext" ]; diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix index 0bdd73e77488..9b955fcfff7e 100644 --- a/pkgs/development/python-modules/django-stubs/default.nix +++ b/pkgs/development/python-modules/django-stubs/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "django-stubs"; - version = "5.0.4"; + version = "5.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,12 +24,12 @@ buildPythonPackage rec { src = fetchPypi { pname = "django_stubs"; inherit version; - hash = "sha256-eON2RIj9/SaV8SUCE2VI7CL41LF4BUGoNQQrgjjRFRQ="; + hash = "sha256-hhKMIotl5smoXl3FbrHG9BElkX2uDiHmz+zfGyfmMMU="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ django django-stubs-ext types-pytz @@ -37,13 +37,13 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { compatible-mypy = [ mypy ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "django-stubs" ]; diff --git a/pkgs/development/python-modules/django-tables2/default.nix b/pkgs/development/python-modules/django-tables2/default.nix index cb1f2307d527..b5692c1d0f6d 100644 --- a/pkgs/development/python-modules/django-tables2/default.nix +++ b/pkgs/development/python-modules/django-tables2/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - passthru.optional-dependencies = { + optional-dependencies = { tablib = [ tablib ] ++ tablib.optional-dependencies.xls ++ tablib.optional-dependencies.yaml; }; @@ -53,7 +53,7 @@ buildPythonPackage rec { pyyaml pytest-django pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTestPaths = [ # requires django-filters diff --git a/pkgs/development/python-modules/django-tenants/default.nix b/pkgs/development/python-modules/django-tenants/default.nix new file mode 100644 index 000000000000..f759a1458205 --- /dev/null +++ b/pkgs/development/python-modules/django-tenants/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + django, + psycopg, +}: + +buildPythonPackage rec { + pname = "django-tenants"; + version = "3.7.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "django-tenants"; + repo = "django-tenants"; + rev = "refs/tags/v${version}"; + hash = "sha256-QdEONKVFW/DWBjXWRTG+ahvirw9BP8M6PztUMZGZ33Q="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + django + psycopg + ]; + + pythonImportsCheck = [ "django_tenants" ]; + + meta = { + description = "Django tenants using PostgreSQL Schemas"; + homepage = "https://github.com/django-tenants/django-tenants"; + changelog = "https://github.com/django-tenants/django-tenants/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/development/python-modules/django-tinymce/default.nix b/pkgs/development/python-modules/django-tinymce/default.nix new file mode 100644 index 000000000000..a0eb660c1da9 --- /dev/null +++ b/pkgs/development/python-modules/django-tinymce/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + django, + pythonOlder, + setuptools, + pytestCheckHook, + pytest-django, +}: + +buildPythonPackage rec { + pname = "django-tinymce"; + version = "4.1.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit version; + pname = "django_tinymce"; + hash = "sha256-AuO3DpQP0pnw++9DFa7lwYVmTh64zTlrF2ljlU5DV8k="; + }; + + build-system = [ setuptools ]; + + dependencies = [ django ]; + + DJANGO_SETTINGS_MODULE = "tests.settings"; + + checkInputs = [ + pytest-django + pytestCheckHook + ]; + + pythonImportsCheck = [ "tinymce" ]; + + meta = { + description = "Django application that contains a widget to render a form field as a TinyMCE editor"; + homepage = "https://github.com/jazzband/django-tinymce"; + changelog = "https://github.com/jazzband/django-tinymce/blob/${version}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/pkgs/development/python-modules/django-two-factor-auth/default.nix b/pkgs/development/python-modules/django-two-factor-auth/default.nix index 718d2206700b..91c78393be57 100644 --- a/pkgs/development/python-modules/django-two-factor-auth/default.nix +++ b/pkgs/development/python-modules/django-two-factor-auth/default.nix @@ -29,13 +29,14 @@ buildPythonPackage rec { hash = "sha256-Sr7L3ioeofyADHb1NSgs0GmVbzX7rro7yhhG9Gq6GJE="; }; - nativeBuildInputs = [ - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - pythonRelaxDeps = [ "django-phonenumber-field" ]; + pythonRelaxDeps = [ + "django-phonenumber-field" + "qrcode" + ]; - propagatedBuildInputs = [ + dependencies = [ django django-formtools django-otp @@ -43,7 +44,7 @@ buildPythonPackage rec { qrcode ]; - passthru.optional-dependencies = { + optional-dependencies = { call = [ twilio ]; sms = [ twilio ]; webauthn = [ diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 99d71f2b38b1..3e79caf80134 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -94,7 +94,7 @@ buildPythonPackage rec { sqlparse ]; - passthru.optional-dependencies = { + optional-dependencies = { argon2 = [ argon2-cffi ]; bcrypt = [ bcrypt ]; }; @@ -116,9 +116,9 @@ buildPythonPackage rec { selenium tblib tzdata - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' # make sure the installed library gets imported diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index dd124f49e152..456cae7155a9 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { pname = "django"; - version = "5.1.1"; + version = "5.1.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -52,7 +52,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-4w5MSu3xdF9Pl0iRcD6bOgUF0tLMiZdCWt3JKsx/Rqc="; + hash = "sha256-TqOVe+QkwNx/SpI/6X/AQaqLHk3LDSupoRl3RKL6kac="; }; patches = @@ -114,7 +114,7 @@ buildPythonPackage rec { tzdata ] ++ lib.flatten (lib.attrValues optional-dependencies); - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' # make sure the installed library gets imported diff --git a/pkgs/development/python-modules/djangorestframework-csv/default.nix b/pkgs/development/python-modules/djangorestframework-csv/default.nix new file mode 100644 index 000000000000..a7aa1abbd6f8 --- /dev/null +++ b/pkgs/development/python-modules/djangorestframework-csv/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + django, + pythonOlder, + djangorestframework, + pytestCheckHook, + pytest-django, + python, +}: + +buildPythonPackage rec { + pname = "djangorestframework-csv"; + version = "3.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "mjumbewu"; + repo = "django-rest-framework-csv"; + rev = "refs/tags/${version}"; + hash = "sha256-XtMkSucB7+foRpTaRfGF1Co0n3ONNGyzex6MXR4xM5c="; + }; + + dependencies = [ + django + djangorestframework + ]; + + checkInputs = [ + pytestCheckHook + pytest-django + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} manage.py test + runHook postCheck + ''; + + pythonImportsCheck = [ "rest_framework_csv" ]; + + meta = { + description = "CSV Tools for Django REST Framework"; + homepage = "https://github.com/mjumbewu/django-rest-framework-csv"; + changelog = "https://github.com/mjumbewu/django-rest-framework-csv/releases/tag/${version}"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/pkgs/development/python-modules/djangorestframework-guardian2/default.nix b/pkgs/development/python-modules/djangorestframework-guardian2/default.nix index 4356d8226235..60991060b328 100644 --- a/pkgs/development/python-modules/djangorestframework-guardian2/default.nix +++ b/pkgs/development/python-modules/djangorestframework-guardian2/default.nix @@ -4,18 +4,19 @@ fetchFromGitHub, django-guardian, djangorestframework, + setuptools, }: buildPythonPackage rec { pname = "djangorestframework-guardian2"; - version = "0.5.0"; - format = "setuptools"; + version = "0.7.0"; + pyproject = true; src = fetchFromGitHub { owner = "johnthagen"; repo = "django-rest-framework-guardian2"; - rev = "v${version}"; - hash = "sha256-aW20xEmVTAgwayWMJsabmyKNW65NftJyQANtT6JV74U="; + rev = "refs/tags/v${version}"; + hash = "sha256-LrIhOoBWC3HttjAGbul4zof++OW35pGMyFGZzUpG1Tk="; }; postPatch = '' @@ -23,7 +24,9 @@ buildPythonPackage rec { patchShebangs manage.py ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django-guardian djangorestframework ]; diff --git a/pkgs/development/python-modules/djangorestframework-jsonp/default.nix b/pkgs/development/python-modules/djangorestframework-jsonp/default.nix new file mode 100644 index 000000000000..af0b28037d7f --- /dev/null +++ b/pkgs/development/python-modules/djangorestframework-jsonp/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + django, + python, + pytest-django, + pytestCheckHook, + djangorestframework, + setuptools, +}: + +buildPythonPackage rec { + pname = "djangorestframework-jsonp"; + version = "1.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jpadilla"; + repo = "django-rest-framework-jsonp"; + rev = "refs/tags/${version}"; + hash = "sha256-4mIO69GhtvbQBtztHVQYIDDDSZpKg0g7BFNHEupiYTs="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + django + djangorestframework + ]; + + checkInputs = [ + pytestCheckHook + pytest-django + ]; + + # Test fail with Django >=4 + # https://github.com/jpadilla/django-rest-framework-jsonp/issues/14 + doCheck = false; + + checkPhase = '' + runHook preCheck + rm tests/test_renderers.py + ${python.interpreter} runtests.py + runHook postCheck + ''; + + pythonImportsCheck = [ "rest_framework_jsonp" ]; + + meta = { + description = "JSONP support for Django REST Framework"; + homepage = "https://jpadilla.github.io/django-rest-framework-jsonp/"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index abf6c29ed81b..dc91ad35fa03 100644 --- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pyjwt ]; - passthru.optional-dependencies = { + optional-dependencies = { python-jose = [ python-jose ]; crypto = [ cryptography ]; }; diff --git a/pkgs/development/python-modules/djangorestframework-stubs/default.nix b/pkgs/development/python-modules/djangorestframework-stubs/default.nix index 19e771ebbeec..826bb862248c 100644 --- a/pkgs/development/python-modules/djangorestframework-stubs/default.nix +++ b/pkgs/development/python-modules/djangorestframework-stubs/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { compatible-mypy = [ mypy ] ++ django-stubs.optional-dependencies.compatible-mypy; coreapi = [ coreapi ]; markdown = [ types-markdown ]; @@ -51,7 +51,7 @@ buildPythonPackage rec { py pytest-mypy-plugins pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # Upstream recommends mypy > 1.7 which we don't have yet, thus all testsare failing with 3.14.5 and below doCheck = false; diff --git a/pkgs/development/python-modules/djangosaml2/default.nix b/pkgs/development/python-modules/djangosaml2/default.nix new file mode 100644 index 000000000000..ff484907e69f --- /dev/null +++ b/pkgs/development/python-modules/djangosaml2/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + defusedxml, + django, + pysaml2, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "djangosaml2"; + version = "1.9.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "IdentityPython"; + repo = "djangosaml2"; + rev = "refs/tags/v${version}"; + hash = "sha256-rbmEJuG2mgozpCFOXZUJFxv8v52IRQeaeAKfeUDACeU="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + django + defusedxml + pysaml2 + ]; + + # Falsely complains that 'defusedxml>=0.4.1 not satisfied by version 0.8.0rc2' + pythonRelaxDeps = [ "defusedxml" ]; + + pythonImportsCheck = [ "djangosaml2" ]; + + checkPhase = '' + runHook preCheck + + python tests/run_tests.py + + runHook postCheck + ''; + + meta = { + description = "Django SAML2 Service Provider based on pySAML2"; + homepage = "https://github.com/IdentityPython/djangosaml2"; + changelog = "https://github.com/IdentityPython/djangosaml2/blob/v${version}/CHANGES"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ melvyn2 ]; + }; +} diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix index f66fe4bf484f..5faf143daab5 100644 --- a/pkgs/development/python-modules/dlib/default.nix +++ b/pkgs/development/python-modules/dlib/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, dlib, python, - pytest, + pytestCheckHook, more-itertools, sse4Support ? stdenv.hostPlatform.sse4_1Support, avxSupport ? stdenv.hostPlatform.avxSupport, @@ -24,7 +24,7 @@ buildPythonPackage { patches = [ ./build-cores.patch ]; nativeCheckInputs = [ - pytest + pytestCheckHook more-itertools ]; @@ -34,13 +34,6 @@ buildPythonPackage { --replace "pytest==3.8" "pytest" ''; - # although AVX can be enabled, we never test with it. Some Hydra machines - # fail because of this, however their build results are probably used on hardware - # with AVX support. - checkPhase = '' - ${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS - ''; - setupPyBuildFlags = [ "--set USE_SSE4_INSTRUCTIONS=${if sse4Support then "yes" else "no"}" "--set USE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" diff --git a/pkgs/development/python-modules/dlinfo/default.nix b/pkgs/development/python-modules/dlinfo/default.nix index bb9c849592dd..1b774b8e85c0 100644 --- a/pkgs/development/python-modules/dlinfo/default.nix +++ b/pkgs/development/python-modules/dlinfo/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { homepage = "https://github.com/cloudflightio/python-dlinfo"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/dm-control/default.nix b/pkgs/development/python-modules/dm-control/default.nix index 567b79ab9bd7..28a8b717d4f8 100644 --- a/pkgs/development/python-modules/dm-control/default.nix +++ b/pkgs/development/python-modules/dm-control/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -30,16 +29,14 @@ buildPythonPackage rec { pname = "dm-control"; - version = "1.0.22"; + version = "1.0.25"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "google-deepmind"; repo = "dm_control"; rev = "refs/tags/${version}"; - hash = "sha256-Tw4VZmunSeb0H7ltPnLCEidSZ2cvcoWLei1DB32vWpw="; + hash = "sha256-eP85aKECvIu8nxPcSjc3PcCR9sWeTmaVJ7gBtVis0PY="; }; build-system = [ diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index 7290b31b7f37..06b01a447843 100644 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { wrapt ] ++ etils.optional-dependencies.epath; - passthru.optional-dependencies = { + optional-dependencies = { tensorflow = [ tensorflow ]; }; diff --git a/pkgs/development/python-modules/dm-tree/default.nix b/pkgs/development/python-modules/dm-tree/default.nix index 6062d202a3ce..909cd3aa523a 100644 --- a/pkgs/development/python-modules/dm-tree/default.nix +++ b/pkgs/development/python-modules/dm-tree/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { patches = [ patchCMakeAbseil patchCMakePybind - ] ++ (lib.optional stdenv.isDarwin ./0003-don-t-configure-apple.patch); + ] ++ (lib.optional stdenv.hostPlatform.isDarwin ./0003-don-t-configure-apple.patch); dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/dmgbuild/default.nix b/pkgs/development/python-modules/dmgbuild/default.nix new file mode 100644 index 000000000000..e0a8f3ef1138 --- /dev/null +++ b/pkgs/development/python-modules/dmgbuild/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + ds-store, + importlib-resources, + mac-alias, +}: + +buildPythonPackage rec { + pname = "dmgbuild"; + version = "1.6.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dmgbuild"; + repo = "dmgbuild"; + rev = "refs/tags/v${version}"; + hash = "sha256-PozYxmXumFnptIgb4FM4b/Q5tx0MIS2bVw2kCuGucA8="; + }; + + postPatch = '' + # relax all deps + substituteInPlace pyproject.toml \ + --replace-fail "==" ">=" + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + ds-store + importlib-resources + mac-alias + ]; + + pythonImportsCheck = [ + "dmgbuild" + ]; + + # require permissions to access TextEditor.app + # https://github.com/dmgbuild/dmgbuild/blob/refs/tags/v1.6.2/tests/examples/settings.py#L17 + doCheck = false; + + meta = { + description = "MacOS command line utility to build disk images"; + homepage = "https://github.com/dmgbuild/dmgbuild"; + changelog = "https://github.com/dmgbuild/dmgbuild/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ moraxyc ]; + mainProgram = "dmgbuild"; + platforms = lib.platforms.darwin; + }; +} diff --git a/pkgs/development/python-modules/dmt-core/default.nix b/pkgs/development/python-modules/dmt-core/default.nix new file mode 100644 index 000000000000..1a3532ec36bd --- /dev/null +++ b/pkgs/development/python-modules/dmt-core/default.nix @@ -0,0 +1,84 @@ +{ + buildPythonPackage, + colormath, + cycler, + fetchPypi, + h5py, + joblib, + lib, + more-itertools, + numpy, + pandas, + pint, + pyarrow, + pytest, + pyyaml, + reprint, + requests, + scikit-rf, + scipy, + semver, + setuptools, + verilogae, +}: + +buildPythonPackage rec { + pname = "dmt-core"; + version = "2.1.0"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "DMT_core"; + hash = "sha256-489E+uNn4NgyCwxsUMEPH/1ZuM+5uNq4zx8F88rkHMU="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + colormath + cycler + h5py + joblib + more-itertools + pandas + pint + pyarrow + pytest + pyyaml + requests + scikit-rf + scipy + setuptools + numpy + semver + ]; + + nativeBuildInputs = [ + reprint + verilogae + ]; + + preConfigure = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ + "DMT.core" + "reprint" + "verilogae" + ]; + + meta = { + changelog = "https://gitlab.com/dmt-development/dmt-core/-/blob/Version_${version}/CHANGELOG?ref_type=tags"; + description = "Tool to help modeling engineers extract model parameters, run circuit and TCAD simulations and automate infrastructure"; + homepage = "https://gitlab.com/dmt-development/dmt-core"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + jasonodoom + jleightcap + ]; + }; +} diff --git a/pkgs/development/python-modules/dncil/default.nix b/pkgs/development/python-modules/dncil/default.nix new file mode 100644 index 000000000000..d57e491a7876 --- /dev/null +++ b/pkgs/development/python-modules/dncil/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "dncil"; + version = "1.0.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "mandiant"; + repo = "dncil"; + rev = "refs/tags/v${version}"; + hash = "sha256-bndkiXkIYTd071J+mgkmJmA+9J5yJ+9/oDfAypN7wYo="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "dncil" ]; + + meta = { + description = "Module to disassemble Common Intermediate Language (CIL) instructions"; + homepage = "https://github.com/mandiant/dncil"; + changelog = "https://github.com/mandiant/dncil/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dns-lexicon/default.nix b/pkgs/development/python-modules/dns-lexicon/default.nix index 225a04ee5342..89f98539f7a4 100644 --- a/pkgs/development/python-modules/dns-lexicon/default.nix +++ b/pkgs/development/python-modules/dns-lexicon/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { tldextract ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { route53 = [ boto3 ]; localzone = [ localzone ]; softlayer = [ softlayer ]; @@ -66,7 +66,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-vcr - ] ++ passthru.optional-dependencies.full; + ] ++ optional-dependencies.full; pytestFlagsArray = [ "tests/" ]; diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index 56098c6250c5..fa2a2565e916 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -21,19 +21,19 @@ buildPythonPackage rec { pname = "dnspython"; - version = "2.6.1"; + version = "2.7.0"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-6PD5wjp7fLmd7WTmw6bz5wHXj1DFXgArg53qciXP98w="; + hash = "sha256-zpxDLtoNyRz2GKXO3xpOFCZRGWu80sgOie1akH5c+vE="; }; nativeBuildInputs = [ hatchling ]; - passthru.optional-dependencies = { + optional-dependencies = { DOH = [ httpx h2 @@ -53,7 +53,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - checkInputs = [ cacert ] ++ passthru.optional-dependencies.DNSSEC; + checkInputs = [ cacert ] ++ optional-dependencies.DNSSEC; disabledTests = [ # dns.exception.SyntaxError: protocol not found diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index 68c9377d3bff..566a60d47f2e 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, chardet, docutils, - fetchpatch, fetchPypi, pbr, pygments, @@ -17,25 +16,16 @@ buildPythonPackage rec { pname = "doc8"; - version = "1.1.1"; + version = "1.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2XqT6PWi78RxOggEZX3trYN0XMpM0diN6Rhvd/l3YAQ="; + hash = "sha256-EiXzAUThzJfjiNuvf+PpltKJdHOlOm2uJo3d4hw1S5g="; }; - patches = [ - # https://github.com/PyCQA/doc8/pull/146 - (fetchpatch { - name = "remove-setuptools-scm-git-archive.patch"; - url = "https://github.com/PyCQA/doc8/commit/06416e95041db92e4295b13ab596351618f6b32e.patch"; - hash = "sha256-IIE3cDNOx+6RLjidGrokyazaX7MOVbMKUb7yQIM5sI0="; - }) - ]; - nativeBuildInputs = [ setuptools-scm wheel diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix index 16b8a420f4a7..6002ccf76949 100644 --- a/pkgs/development/python-modules/docker-pycreds/default.nix +++ b/pkgs/development/python-modules/docker-pycreds/default.nix @@ -1,28 +1,44 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, six, + pythonAtLeast, + distutils, }: buildPythonPackage rec { pname = "docker-pycreds"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "6ce3270bcaf404cc4c3e27e4b6c70d3521deae82fb508767870fdbf772d584d4"; + src = fetchFromGitHub { + owner = "shin-"; + repo = "dockerpy-creds"; + rev = "refs/tags/${version}"; + hash = "sha256-yYsMsRW6Bb8vmwT0mPjs0pRqBbznGtHnGb3JNHjLjys="; }; + build-system = [ + setuptools + ]; + + dependencies = + [ six ] + ++ lib.optionals (pythonAtLeast "3.12") [ + distutils + ]; + + pythonImportsCheck = [ "dockerpycreds" ]; + # require docker-credential-helpers binaries doCheck = false; - propagatedBuildInputs = [ six ]; - - meta = with lib; { + meta = { description = "Python bindings for the docker credentials store API"; homepage = "https://github.com/shin-/dockerpy-creds"; - license = licenses.asl20; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 7a36c27e8e22..bcc56c0259f4 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -14,7 +14,7 @@ requests, urllib3, - # optional-dependenices + # optional-dependencies paramiko, websocket-client, @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; optional-dependencies = { - ssh = [ paramiko ]; + ssh = [ paramiko paramiko.optional-dependencies.ed25519 ]; tls = []; websockets = [ websocket-client ]; }; @@ -62,7 +62,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/unit" ]; # Deselect socket tests on Darwin because it hits the path length limit for a Unix domain socket - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "api_test" "stream_response" "socket_file" diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix new file mode 100644 index 000000000000..b790ca13ab86 --- /dev/null +++ b/pkgs/development/python-modules/docling-core/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + jsonref, + jsonschema, + pandas, + pillow, + pydantic, + tabulate, + jsondiff, + requests, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "docling-core"; + version = "2.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "DS4SD"; + repo = "docling-core"; + rev = "refs/tags/v${version}"; + hash = "sha256-yNsmMAeR1sbZsddpjMFWZy2UAbIWWiZmdW4/lwLvCbM="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + jsonref + jsonschema + pandas + pillow + pydantic + tabulate + ]; + + pythonImportsCheck = [ + "docling_core" + ]; + + nativeCheckInputs = [ + jsondiff + pytestCheckHook + requests + ]; + + meta = { + changelog = "https://github.com/DS4SD/docling-core/blob/${version}/CHANGELOG.md"; + description = "Python library to define and validate data types in Docling"; + homepage = "https://github.com/DS4SD/docling-core"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/docling-ibm-models/default.nix b/pkgs/development/python-modules/docling-ibm-models/default.nix new file mode 100644 index 000000000000..dbd7b4e819ec --- /dev/null +++ b/pkgs/development/python-modules/docling-ibm-models/default.nix @@ -0,0 +1,75 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + huggingface-hub, + jsonlines, + lxml, + mean-average-precision, + numpy, + opencv-python-headless, + pillow, + torch, + torchvision, + tqdm, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "docling-ibm-models"; + version = "2.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "DS4SD"; + repo = "docling-ibm-models"; + rev = "refs/tags/v${version}"; + hash = "sha256-vSEW1+mFTjUvjjUOoX3aGgT/y8iwP3JGIZaPh9RbX5I="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + huggingface-hub + jsonlines + lxml + mean-average-precision + numpy + opencv-python-headless + pillow + torch + torchvision + tqdm + ]; + + pythonRelaxDeps = [ + "lxml" + "mean_average_precision" + "torchvision" + ]; + + pythonImportsCheck = [ + "docling_ibm_models" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Requires network access + "test_layoutpredictor" + "test_tf_predictor" + ]; + + meta = { + changelog = "https://github.com/DS4SD/docling-ibm-models/blob/${src.rev}/CHANGELOG.md"; + description = "Docling IBM models"; + homepage = "https://github.com/DS4SD/docling-ibm-models"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/docling-parse/default.nix b/pkgs/development/python-modules/docling-parse/default.nix new file mode 100644 index 000000000000..745d010ed1b5 --- /dev/null +++ b/pkgs/development/python-modules/docling-parse/default.nix @@ -0,0 +1,81 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + cmake, + pkg-config, + cxxopts, + poetry-core, + pybind11, + tabulate, + zlib, + nlohmann_json, + utf8cpp, + libjpeg, + qpdf, + loguru-cpp, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "docling-parse"; + version = "2.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "DS4SD"; + repo = "docling-parse"; + rev = "refs/tags/v${version}"; + hash = "sha256-pZJ7lneg4ftAoWS5AOflkkKCwZGF4TJIuqDjq4W4VBw="; + }; + + dontUseCmakeConfigure = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + build-system = [ + poetry-core + ]; + + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev utf8cpp}/include/utf8cpp"; + + buildInputs = [ + pybind11 + cxxopts + libjpeg + loguru-cpp + nlohmann_json + qpdf + utf8cpp + zlib + ]; + + env.USE_SYSTEM_DEPS = true; + + cmakeFlags = [ + "-DUSE_SYSTEM_DEPS=True" + ]; + + dependencies = [ + tabulate + ]; + + pythonImportsCheck = [ + "docling_parse" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/DS4SD/docling-parse/blob/${src.rev}/CHANGELOG.md"; + description = "Simple package to extract text with coordinates from programmatic PDFs"; + homepage = "https://github.com/DS4SD/docling-parse"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index 464552809ddb..5df0b3daf56c 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.27.239"; + version = "2.28.240"; pyproject = true; # No source available from official repo src = fetchPypi { inherit pname version; - hash = "sha256-Ug5+jDBBbamqd0JebzHvjLZoTRRPYWQiJl6g8BK0aMQ="; + hash = "sha256-wN5AfjP4cJu0zZG27+uW/Yi/7L3OLK7FGvt5JTveb/U="; }; postPatch = '' diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index cdfb53572213..695d351f03ca 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -37,7 +37,7 @@ let # Only Darwin needs LANG, but we could set it in general. # It's done here conditionally to prevent mass-rebuilds. checkPhase = - lib.optionalString stdenv.isDarwin ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + lib.optionalString stdenv.hostPlatform.isDarwin ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + '' ${python.interpreter} test/alltests.py ''; diff --git a/pkgs/development/python-modules/dohq-artifactory/default.nix b/pkgs/development/python-modules/dohq-artifactory/default.nix index 839bfd2f38f3..2e44d4464791 100644 --- a/pkgs/development/python-modules/dohq-artifactory/default.nix +++ b/pkgs/development/python-modules/dohq-artifactory/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "dohq-artifactory"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "devopshq"; repo = "artifactory"; rev = version; - hash = "sha256-gccVwshGBgbhTSX4o0vANIRct1isqDj+gWeZZxExj9Q="; + hash = "sha256-lMT1b6JUDT01fJzQrVc0lMqeGrJnvk6ms4KIYtfTQps="; }; # https://github.com/devopshq/artifactory/issues/430 diff --git a/pkgs/development/python-modules/doit/default.nix b/pkgs/development/python-modules/doit/default.nix index 4b49ba50fe47..188fb1ddbb3b 100644 --- a/pkgs/development/python-modules/doit/default.nix +++ b/pkgs/development/python-modules/doit/default.nix @@ -30,11 +30,14 @@ let hash = "sha256-cdB8zJUUyyL+WdmJmVd2ZeqrV+FvZE0EM2rgtLriNLw="; }; - propagatedBuildInputs = [ - cloudpickle - importlib-metadata - toml - ] ++ lib.optional stdenv.isLinux pyinotify ++ lib.optional stdenv.isDarwin macfsevents; + propagatedBuildInputs = + [ + cloudpickle + importlib-metadata + toml + ] + ++ lib.optional stdenv.hostPlatform.isLinux pyinotify + ++ lib.optional stdenv.hostPlatform.isDarwin macfsevents; nativeCheckInputs = [ configclass @@ -51,7 +54,7 @@ let passthru.tests = { # hangs on darwin check = doit.overridePythonAttrs (_: { - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; }); }; diff --git a/pkgs/development/python-modules/dom-toml/default.nix b/pkgs/development/python-modules/dom-toml/default.nix index 36dafc9a86cc..99ff069ce49f 100644 --- a/pkgs/development/python-modules/dom-toml/default.nix +++ b/pkgs/development/python-modules/dom-toml/default.nix @@ -27,8 +27,6 @@ buildPythonPackage rec { tomli ]; - nativeCheckInputs = [ ]; - meta = { description = "Dom's tools for Tom's Obvious, Minimal Language."; homepage = "https://github.com/domdfcoding/dom_toml"; diff --git a/pkgs/development/python-modules/domdf-python-tools/default.nix b/pkgs/development/python-modules/domdf-python-tools/default.nix index bf73369c19c3..832674256a0e 100644 --- a/pkgs/development/python-modules/domdf-python-tools/default.nix +++ b/pkgs/development/python-modules/domdf-python-tools/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { typing-extensions ]; - nativeCheckInputs = [ ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' diff --git a/pkgs/development/python-modules/doorbirdpy/default.nix b/pkgs/development/python-modules/doorbirdpy/default.nix index acb4fab9c31b..1c6034c8e2e4 100644 --- a/pkgs/development/python-modules/doorbirdpy/default.nix +++ b/pkgs/development/python-modules/doorbirdpy/default.nix @@ -4,6 +4,7 @@ fetchFromGitLab, setuptools, aiohttp, + tenacity, aioresponses, pytest-asyncio, pytestCheckHook, @@ -11,19 +12,22 @@ buildPythonPackage rec { pname = "doorbirdpy"; - version = "3.0.3"; + version = "3.0.8"; pyproject = true; src = fetchFromGitLab { owner = "klikini"; repo = "doorbirdpy"; rev = "refs/tags/${version}"; - hash = "sha256-0UvzMFYKM/Sb9B2XwZwl+a9v7lTxAc1H59vR88VwDww="; + hash = "sha256-UayXJhfiiwB2aXCa5V1U/LnNiV7KX4lpIG9hNG6iCm0="; }; build-system = [ setuptools ]; - dependencies = [ aiohttp ]; + dependencies = [ + aiohttp + tenacity + ]; nativeCheckInputs = [ aioresponses diff --git a/pkgs/development/python-modules/dparse/default.nix b/pkgs/development/python-modules/dparse/default.nix index 59a19b30caeb..cbe4b8518763 100644 --- a/pkgs/development/python-modules/dparse/default.nix +++ b/pkgs/development/python-modules/dparse/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { # FIXME pipenv = [ pipenv ]; conda = [ pyyaml ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "dparse" ]; diff --git a/pkgs/development/python-modules/draftjs-exporter/default.nix b/pkgs/development/python-modules/draftjs-exporter/default.nix index 29205e3d5dd4..0573af0c60a3 100644 --- a/pkgs/development/python-modules/draftjs-exporter/default.nix +++ b/pkgs/development/python-modules/draftjs-exporter/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "sha256-4MmCVRx350p6N9XqTZSo8ROI/OJ0s4aKSYH9+Oxgvf4="; }; - passthru.optional-dependencies = { + optional-dependencies = { lxml = [ lxml ]; html5lib = [ beautifulsoup4 @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; }; - checkInputs = passthru.optional-dependencies.lxml ++ passthru.optional-dependencies.html5lib; + checkInputs = optional-dependencies.lxml ++ optional-dependencies.html5lib; checkPhase = '' # 2 tests in this file randomly fail because they depend on the order of diff --git a/pkgs/development/python-modules/dragonfly/default.nix b/pkgs/development/python-modules/dragonfly/default.nix index 072192a23b5d..9ae5f9c4b816 100644 --- a/pkgs/development/python-modules/dragonfly/default.nix +++ b/pkgs/development/python-modules/dragonfly/default.nix @@ -1,69 +1,76 @@ { lib, buildPythonPackage, - fetchFromGitHub, decorator, + fetchFromGitHub, + json-rpc, + kaldi-active-grammar, + lark, packaging, + psutil, pynput, - regex, - lark, - enum34, pyperclip, - six, + pythonOlder, + regex, requests, - psutil, - json-rpc, - werkzeug, - kaldi-active-grammar, + setuptools, + six, sounddevice, webrtcvad, - setuptools, - xdotool, + werkzeug, wmctrl, + xdotool, xorg, }: buildPythonPackage rec { pname = "dragonfly"; version = "0.35.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dictation-toolbox"; - repo = pname; - rev = version; + repo = "dragonfly"; + rev = "refs/tags/${version}"; hash = "sha256-sqEEEr5/KG3cn4rmOGJt9zMNAjeLO6h3NJgg0EyewrM="; }; postPatch = '' - substituteInPlace setup.py --replace 'lark-parser == 0.8.*' 'lark' substituteInPlace dragonfly/actions/keyboard/_x11_xdotool.py \ - --replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' + --replace-fail 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' substituteInPlace dragonfly/windows/x11_window.py \ - --replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' \ - --replace 'xprop = "xprop"'${" "}'xprop = "${xorg.xprop}/bin/xprop"' \ - --replace 'wmctrl = "wmctrl"'${" "}'wmctrl = "${wmctrl}/bin/wmctrl"' + --replace-fail 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' \ + --replace-fail 'xprop = "xprop"'${" "}'xprop = "${xorg.xprop}/bin/xprop"' \ + --replace-fail 'wmctrl = "wmctrl"'${" "}'wmctrl = "${wmctrl}/bin/wmctrl"' ''; + pythonRemoveDeps = [ "lark-parser" ]; + propagatedBuildInputs = [ decorator + json-rpc + lark packaging + psutil pynput - regex - lark - enum34 pyperclip - six + regex requests - psutil - json-rpc - werkzeug - kaldi-active-grammar # for the Kaldi engine - sounddevice - webrtcvad setuptools # needs pkg_resources at runtime + six + werkzeug ]; + optional-dependencies = { + kaldi = [ + kaldi-active-grammar + sounddevice + webrtcvad + ]; + }; + # Too many tests fail because of the unusual environment or # because of the missing dependencies for some of the engines. doCheck = false; @@ -73,6 +80,7 @@ buildPythonPackage rec { meta = with lib; { description = "Speech recognition framework allowing powerful Python-based scripting"; homepage = "https://github.com/dictation-toolbox/dragonfly"; + changelog = "https://github.com/dictation-toolbox/dragonfly/blob/${version}/CHANGELOG.rst"; license = licenses.lgpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/dramatiq/default.nix b/pkgs/development/python-modules/dramatiq/default.nix index b44873e99f9a..6e7ff2f8afc8 100644 --- a/pkgs/development/python-modules/dramatiq/default.nix +++ b/pkgs/development/python-modules/dramatiq/default.nix @@ -10,27 +10,30 @@ pylibmc, pytestCheckHook, redis, + setuptools, watchdog, watchdog-gevent, }: buildPythonPackage rec { pname = "dramatiq"; - version = "1.17.0"; - format = "setuptools"; + version = "1.17.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Bogdanp"; repo = "dramatiq"; rev = "refs/tags/v${version}"; - hash = "sha256-xKHTBo2AirxDXe/CLSqo++3AgxP4pVkGTNdgS5CCZ3c="; + hash = "sha256-NeUGhG+H6r+JGd2qnJxRUbQ61G7n+3tsuDugTin3iJ4="; }; - propagatedBuildInputs = [ prometheus-client ]; + build-system = [ setuptools ]; - passthru.optional-dependencies = { + dependencies = [ prometheus-client ]; + + optional-dependencies = { all = [ gevent pika @@ -88,7 +91,7 @@ buildPythonPackage rec { "test_rabbitmq_process_10k_fib_with_cli" "test_rabbitmq_process_1k_latency_with_cli" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Takes too long for darwin ofborg "test_retry_exceptions_can_specify_a_delay" ]; diff --git a/pkgs/development/python-modules/drawsvg/default.nix b/pkgs/development/python-modules/drawsvg/default.nix index 8feb1a1151ea..d6df1c87a2dc 100644 --- a/pkgs/development/python-modules/drawsvg/default.nix +++ b/pkgs/development/python-modules/drawsvg/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ numpy imageio diff --git a/pkgs/development/python-modules/drf-extra-fields/default.nix b/pkgs/development/python-modules/drf-extra-fields/default.nix new file mode 100644 index 000000000000..76966803cf29 --- /dev/null +++ b/pkgs/development/python-modules/drf-extra-fields/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + django, + djangorestframework, + filetype, + pillow, + psycopg2, + pytestCheckHook, + pytest-django, +}: + +buildPythonPackage rec { + pname = "drf-extra-fields"; + version = "3.7.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "hipo"; + repo = "drf-extra-fields"; + rev = "v${version}"; + hash = "sha256-Ym4vnZ/t0ZdSxU53BC0ducJl1YiTygRSWql/35PNbOU"; + }; + + build-system = [ setuptools ]; + + dependencies = [ + django + djangorestframework + filetype + ]; + + optional-dependencies = { + Base64ImageField = [ pillow ]; + }; + + nativeCheckInputs = [ + (django.override { withGdal = true; }) + psycopg2 + pytestCheckHook + pytest-django + ] ++ optional-dependencies.Base64ImageField; + + pythonImportsCheck = [ "drf_extra_fields" ]; + + meta = { + description = "Extra Fields for Django Rest Framework"; + homepage = "https://github.com/Hipo/drf-extra-fields"; + changelog = "https://github.com/Hipo/drf-extra-fields/releases/tag/${src.rev}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ felbinger ]; + }; +} diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix index cb9adc54051d..546e672dd938 100644 --- a/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/pkgs/development/python-modules/drf-spectacular/default.nix @@ -93,6 +93,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "drf_spectacular" ]; + optional-dependencies.sidecar = [ drf-spectacular-sidecar ]; + meta = with lib; { description = "Sane and flexible OpenAPI 3 schema generation for Django REST framework"; homepage = "https://github.com/tfranzel/drf-spectacular"; diff --git a/pkgs/development/python-modules/drf-writable-nested/default.nix b/pkgs/development/python-modules/drf-writable-nested/default.nix index 2211073b3235..1f62492ee483 100644 --- a/pkgs/development/python-modules/drf-writable-nested/default.nix +++ b/pkgs/development/python-modules/drf-writable-nested/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "drf-writable-nested"; - version = "0.7.0"; + version = "0.7.1"; format = "setuptools"; src = fetchFromGitHub { owner = "beda-software"; repo = "drf-writable-nested"; rev = "refs/tags/v${version}"; - hash = "sha256-/7MZAw0clzzlBdYchUVKldWT7WqtwdSe+016QAP0hqk="; + hash = "sha256-+I5HsqkjCrkF9MV90NGQuUhmLcDVsv20QIyDK9WxwdQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix index 1463ae7880b9..98046f8b5174 100644 --- a/pkgs/development/python-modules/drf-yasg/default.nix +++ b/pkgs/development/python-modules/drf-yasg/default.nix @@ -2,25 +2,29 @@ lib, buildPythonPackage, fetchPypi, - inflection, - ruamel-yaml, + setuptools, setuptools-scm, - six, - coreapi, + django, djangorestframework, - pytestCheckHook, - pytest-django, + inflection, + packaging, + pytz, + pyyaml, + uritemplate, datadiff, + dj-database-url, + pytest-django, + pytestCheckHook, }: buildPythonPackage rec { pname = "drf-yasg"; - version = "1.21.7"; - format = "setuptools"; + version = "1.21.8"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-TDuTBos9/KaWmrERFV5N1vey1oC5h3jej9Rgt4N72w0="; + hash = "sha256-y7f4HD0UDyIHOStLxd3mU4TutY4bfuoabWQd7C9zUqk="; }; postPatch = '' @@ -28,23 +32,35 @@ buildPythonPackage rec { sed -i "/packaging/d" requirements/base.txt ''; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ - six - inflection - ruamel-yaml - coreapi + dependencies = [ + django djangorestframework + inflection + packaging + pytz + pyyaml + uritemplate ]; nativeCheckInputs = [ pytestCheckHook pytest-django datadiff + dj-database-url ]; - # ImportError: No module named 'testproj.settings' + env.DJANGO_SETTINGS_MODULE = "testproj.settings.local"; + + preCheck = '' + cd testproj + ''; + + # a lot of libraries are missing doCheck = false; pythonImportsCheck = [ "drf_yasg" ]; diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix index e2f2c295a37a..f079e61d6579 100644 --- a/pkgs/development/python-modules/drms/default.nix +++ b/pkgs/development/python-modules/drms/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "drms"; - version = "0.7.1"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2VtAGRx0OnYdATK/ngNhffmQDjZfELYeTTPCdfkHAAc="; + hash = "sha256-LgHu7mTgiL3n2lVaOhppdWfQiM0CFkK+6z6eBkLxmKY="; }; nativeBuildInputs = [ @@ -44,16 +44,19 @@ buildPythonPackage rec { pytest-doctestplus ]; - disabledTests = [ "test_query_hexadecimal_strings" ]; + disabledTests = [ + "test_query_hexadecimal_strings" + "test_jsocinfoconstants" # Need network + ]; disabledTestPaths = [ "docs/tutorial.rst" ]; pythonImportsCheck = [ "drms" ]; - meta = with lib; { + meta = { description = "Access HMI, AIA and MDI data with Python"; homepage = "https://github.com/sunpy/drms"; - license = licenses.bsd2; - maintainers = [ ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; }; } diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 73a551a5c278..05ffb2f6c00d 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -52,8 +52,6 @@ buildPythonPackage rec { --replace "'pytest-runner==5.2.0'," "" ''; - doCheck = true; - pythonImportsCheck = [ "dropbox" ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dsnap/default.nix b/pkgs/development/python-modules/dsnap/default.nix index f14636df0654..1908de7692e8 100644 --- a/pkgs/development/python-modules/dsnap/default.nix +++ b/pkgs/development/python-modules/dsnap/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ typer ]; scannerd = [ aws-sam-cli @@ -55,7 +55,7 @@ buildPythonPackage rec { moto mypy-boto3-ebs pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # https://github.com/RhinoSecurityLabs/dsnap/issues/26 # ImportError: cannot import name 'mock_iam' from 'moto' diff --git a/pkgs/development/python-modules/dtschema/default.nix b/pkgs/development/python-modules/dtschema/default.nix index d4875e0da8aa..2dffd2d5bc95 100644 --- a/pkgs/development/python-modules/dtschema/default.nix +++ b/pkgs/development/python-modules/dtschema/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { broken = ( # Library not loaded: @rpath/libfdt.1.dylib - stdenv.isDarwin + stdenv.hostPlatform.isDarwin || # see https://github.com/devicetree-org/dt-schema/issues/108 diff --git a/pkgs/development/python-modules/dtw-python/default.nix b/pkgs/development/python-modules/dtw-python/default.nix index a8481e78c744..7021d576bab4 100644 --- a/pkgs/development/python-modules/dtw-python/default.nix +++ b/pkgs/development/python-modules/dtw-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dtw-python"; - version = "1.4.4"; + version = "1.5.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "DynamicTimeWarping"; repo = "dtw-python"; rev = "refs/tags/v${version}"; - hash = "sha256-9+0NxQAvhVeH9RcBPTr1CjIjTqTsiUz68UIne5dErvw="; + hash = "sha256-Q2TffroAGS6DeU5hUE/M2Luuxa5VfU+wxbGdfhcioSA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ducc0/default.nix b/pkgs/development/python-modules/ducc0/default.nix index d42085999e85..1b8e6e733c40 100644 --- a/pkgs/development/python-modules/ducc0/default.nix +++ b/pkgs/development/python-modules/ducc0/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ducc0"; - version = "0.34.0"; + version = "0.35.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mtr"; repo = "ducc"; rev = "ducc0_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-lxNqB3Lt+n4vIH7cVW4DAwhjuPn49y+/3RLKVO8IuJM="; + hash = "sha256-LfN+rwJp5euVpR/5sUBG3XqBhF7/KbgW/485eufJtMQ="; }; buildInputs = [ pybind11 ]; @@ -34,6 +34,8 @@ buildPythonPackage rec { pytestFlagsArray = [ "python/test" ]; pythonImportsCheck = [ "ducc0" ]; + DUCC0_OPTIMIZATION = "portable-strip"; + meta = with lib; { homepage = "https://gitlab.mpcdf.mpg.de/mtr/ducc"; description = "Efficient algorithms for Fast Fourier transforms and more"; diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index 1a560f24f770..6c77fc97c016 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -5,9 +5,11 @@ pytestCheckHook, pythonAtLeast, pythonOlder, + python, duckdb, hypothesis, pandas, + pyarrow, poetry-core, pytest-remotedata, snapshottest, @@ -17,7 +19,7 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.13.2"; + version = "0.13.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +28,7 @@ buildPythonPackage rec { repo = "duckdb_engine"; owner = "Mause"; rev = "refs/tags/v${version}"; - hash = "sha256-zao8kzzQbnjwJqjHyqDkgmXa3E9nlBH2W0wh7Kjk/qw="; + hash = "sha256-B9vh8OILmRZKKznBbEkkm3zlAwGwMGdiuc378msiywE="; }; nativeBuildInputs = [ poetry-core ]; @@ -47,6 +49,7 @@ buildPythonPackage rec { pandas pytest-remotedata typing-extensions + pyarrow ] ++ lib.optionals (pythonOlder "3.12") [ # requires wasmer which is broken for python 3.12 # https://github.com/wasmerio/wasmer-python/issues/778 @@ -63,6 +66,15 @@ buildPythonPackage rec { "duckdb_engine/tests/test_datatypes.py" ]; + disabledTests = [ + # incompatible with duckdb 1.1.1 + "test_with_cache" + ] ++ lib.optionals (python.pythonVersion == "3.11") [ + # incompatible with duckdb 1.1.1 + "test_all_types_reflection" + "test_nested_types" + ]; + pythonImportsCheck = [ "duckdb_engine" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index 132f72d70ee5..77b348e271f0 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { ]; # test flags from .github/workflows/Python.yml - pytestFlagsArray = [ "--verbose" ] ++ lib.optionals stdenv.isDarwin [ "tests/fast" ]; + pytestFlagsArray = [ "--verbose" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "tests/fast" ]; disabledTestPaths = [ # avoid dependency on mypy diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix index ca69dba4338f..f46263cc70b2 100644 --- a/pkgs/development/python-modules/duckduckgo-search/default.nix +++ b/pkgs/development/python-modules/duckduckgo-search/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, pythonOlder, setuptools, - pyreqwest-impersonate, + primp, # Optional dependencies lxml, @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "duckduckgo-search"; - version = "6.1.12"; + version = "6.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,14 +22,14 @@ buildPythonPackage rec { owner = "deedy5"; repo = "duckduckgo_search"; rev = "refs/tags/v${version}"; - hash = "sha256-HidBPd69Fihx6+fGifil0PSZ7lGfW+qStzma8Npfmes="; + hash = "sha256-5AuPAv78ePrnCr5L4CfIu/fq7Ha19zC78zg8JLu3U2A="; }; build-system = [ setuptools ]; dependencies = [ click - pyreqwest-impersonate + primp ]; optional-dependencies = { diff --git a/pkgs/development/python-modules/dukpy/default.nix b/pkgs/development/python-modules/dukpy/default.nix index 453d68e8534e..7b684658d0f7 100644 --- a/pkgs/development/python-modules/dukpy/default.nix +++ b/pkgs/development/python-modules/dukpy/default.nix @@ -21,6 +21,12 @@ buildPythonPackage rec { hash = "sha256-8RDMz9SfBoUe7LQ9/atsZlJ/2uwLUb0hZxeYdsUOGpU="; }; + postPatch = '' + substituteInPlace tests/test_webassets_filter.py \ + --replace-fail "class PyTestTemp" "class _Temp" \ + --replace-fail "PyTestTemp" "Temp" + ''; + build-system = [ setuptools ]; dependencies = [ mutf8 ]; diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 0618a1b2aaea..91a1869099c8 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -76,12 +76,9 @@ buildPythonPackage rec { # ImportError: attempted relative import beyond top-level package rm tests/test_greenthreads.py - - # git crashes; https://github.com/jelmer/dulwich/issues/1359 - rm tests/compat/test_pack.py ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "dulwich" ]; diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix index 3ee9866f98c5..e565ae8b85d3 100644 --- a/pkgs/development/python-modules/dunamai/default.nix +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dunamai"; - version = "1.21.1"; + version = "1.22.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = "dunamai"; rev = "refs/tags/v${version}"; - hash = "sha256-dsL1MhlL1Yjj06D0z2FzZ53Frfp4U+5dXA9vPjU+pvY="; + hash = "sha256-oOchPGBRHf3PT1Ynci56CF/eW4TkRVPV9inVNX2QQrk="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 3a725f625c4f..902e3e3428bb 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.16.5"; + version = "3.16.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-data"; rev = "refs/tags/${version}"; - hash = "sha256-QTsKjF7aVUUFi/6WtuLDVaKOOEzkbkQKpT9L2Mg6724="; + hash = "sha256-HT+IcfUA1QMkWhQKNwjKexzG04WJj+WTyHV+15DDoCI="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix index 2cab268fecf6..749abe71e0bc 100644 --- a/pkgs/development/python-modules/dvc-render/default.nix +++ b/pkgs/development/python-modules/dvc-render/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { table = [ flatten-dict tabulate @@ -46,9 +46,9 @@ buildPythonPackage rec { pytestCheckHook pytest-mock pytest-test-utils - ] ++ passthru.optional-dependencies.table ++ passthru.optional-dependencies.markdown; + ] ++ optional-dependencies.table ++ optional-dependencies.markdown; - disabledTestPaths = lib.optionals stdenv.isDarwin [ "tests/test_vega.py" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_vega.py" ]; pythonImportsCheck = [ "dvc_render" ]; diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix index 63b2ed18e41c..6c4ea111ce53 100644 --- a/pkgs/development/python-modules/dvc-task/default.nix +++ b/pkgs/development/python-modules/dvc-task/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-task"; - version = "0.4.0"; + version = "0.40.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-task"; rev = "refs/tags/${version}"; - hash = "sha256-zSPv+eMGSsGXKtgi9r4EiGY1ZURXeJXWBKvR2GnfP8I="; + hash = "sha256-bRQJLncxCigYPEtlvKjUtKqhcBkB7erEtoJQ30yGamE="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index 284de4ad026b..9e572eb3d964 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.55.2"; + version = "3.56.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -66,7 +66,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc"; rev = "refs/tags/${version}"; - hash = "sha256-yNnOSYh4lCefTnIgNstsKaRbrPCgSiWEgKeF66KD66k="; + hash = "sha256-9TV+YQ9UFgqr3IoM0indUYa48O+mhfNxzAI56UtB3+Y="; }; pythonRelaxDeps = [ @@ -124,14 +124,14 @@ buildPythonPackage rec { voluptuous zc-lockfile ] - ++ lib.optionals enableGoogle passthru.optional-dependencies.gs - ++ lib.optionals enableAWS passthru.optional-dependencies.s3 - ++ lib.optionals enableAzure passthru.optional-dependencies.azure - ++ lib.optionals enableSSH passthru.optional-dependencies.ssh + ++ lib.optionals enableGoogle optional-dependencies.gs + ++ lib.optionals enableAWS optional-dependencies.s3 + ++ lib.optionals enableAzure optional-dependencies.azure + ++ lib.optionals enableSSH optional-dependencies.ssh ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; - passthru.optional-dependencies = { + optional-dependencies = { azure = [ dvc-azure ]; gdrive = [ dvc-gdrive ]; gs = [ dvc-gs ]; diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 7973a0e76967..6124823fce59 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { pynvml ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ jsonargparse lightgbm diff --git a/pkgs/development/python-modules/e3-core/0001-use-distro-over-ld.patch b/pkgs/development/python-modules/e3-core/0001-use-distro-over-ld.patch deleted file mode 100644 index 15548b7aec1c..000000000000 --- a/pkgs/development/python-modules/e3-core/0001-use-distro-over-ld.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 189681bbfb703a7026ca7bbb3b21ef554807b144 Mon Sep 17 00:00:00 2001 -From: tali auster <taliauster@gmail.com> -Date: Wed, 15 Nov 2023 12:15:34 -0700 -Subject: [PATCH] use distro over ld - -The `ld` module (linux distribution) was renamed to `distro`, presumably -so as not to subsume binutils name. - ---- - setup.py | 2 +- - src/e3/os/platform.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index c32f46f..de1ada6 100644 ---- a/setup.py -+++ b/setup.py -@@ -25,7 +25,7 @@ for p in ("darwin", "linux", "linux2", "win32"): - platform_string = ":sys_platform=='%s'" % p - extras_require[platform_string] = ["psutil"] - if p in ("linux", "linux2"): -- extras_require[platform_string].append("ld") -+ extras_require[platform_string].append("distro") - - # Get e3 version from the VERSION file. - version_file = os.path.join(os.path.dirname(__file__), "VERSION") -diff --git a/src/e3/os/platform.py b/src/e3/os/platform.py -index 2d4e174..a9d12d3 100644 ---- a/src/e3/os/platform.py -+++ b/src/e3/os/platform.py -@@ -78,7 +78,7 @@ class SystemInfo: - - # Fetch linux distribution info on linux OS - if cls.uname.system == "Linux": # linux-only -- import ld -+ import distro as ld - - cls.ld_info = { - "name": ld.name(), --- -2.40.1 - diff --git a/pkgs/development/python-modules/e3-core/default.nix b/pkgs/development/python-modules/e3-core/default.nix index 6b2f8ad763af..9f37786ba4d6 100644 --- a/pkgs/development/python-modules/e3-core/default.nix +++ b/pkgs/development/python-modules/e3-core/default.nix @@ -1,18 +1,19 @@ { + lib, + stdenv, autoPatchelfHook, buildPythonPackage, colorama, distro, fetchFromGitHub, - lib, packaging, psutil, python-dateutil, + pythonOlder, pyyaml, - requests, requests-cache, requests-toolbelt, - stdenv, + requests, setuptools, stevedore, tqdm, @@ -20,38 +21,37 @@ buildPythonPackage rec { pname = "e3-core"; - version = "22.5.0"; + version = "22.6.0"; pyproject = true; + disabled = pythonOlder "3.6"; + src = fetchFromGitHub { owner = "AdaCore"; repo = "e3-core"; rev = "refs/tags/v${version}"; - hash = "sha256-7csZYohU89uavSMPOKGJ8HClmtiweGSghyR7QgFfSY8="; + hash = "sha256-6rClGDo8KhBbOg/Rw0nVISVtOAACf5cwSafNInlBGCw="; }; - patches = [ ./0001-use-distro-over-ld.patch ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ - autoPatchelfHook - setuptools - ]; + nativeBuildInputs = [ autoPatchelfHook ]; - propagatedBuildInputs = + dependencies = [ colorama packaging - pyyaml python-dateutil + pyyaml requests requests-cache requests-toolbelt - tqdm stevedore + tqdm ] - ++ lib.optional stdenv.isLinux [ - # See setup.py:24. These are required only on Linux. Darwin has its own set - # of requirements. + ++ lib.optional stdenv.hostPlatform.isLinux [ + # See https://github.com/AdaCore/e3-core/blob/v22.6.0/pyproject.toml#L37-L42 + # These are required only on Linux. Darwin has its own set of requirements psutil distro ]; diff --git a/pkgs/development/python-modules/e3-testsuite/default.nix b/pkgs/development/python-modules/e3-testsuite/default.nix index bf8ba8850a3d..d1b61186195e 100644 --- a/pkgs/development/python-modules/e3-testsuite/default.nix +++ b/pkgs/development/python-modules/e3-testsuite/default.nix @@ -1,8 +1,9 @@ { + lib, buildPythonPackage, e3-core, fetchFromGitHub, - lib, + pythonOlder, setuptools, }: @@ -11,23 +12,25 @@ buildPythonPackage rec { version = "26.0"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchFromGitHub { owner = "AdaCore"; repo = "e3-testsuite"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-V20tX0zi2DRHO42udUcW/CDMyBxh1uSTgac0zZGubsI="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ e3-core ]; + dependencies = [ e3-core ]; pythonImportsCheck = [ "e3" ]; meta = with lib; { - changelog = "https://github.com/AdaCore/e3-testsuite/releases/tag/${src.rev}"; - homepage = "https://github.com/AdaCore/e3-testsuite/"; description = "Generic testsuite framework in Python"; + changelog = "https://github.com/AdaCore/e3-testsuite/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; + homepage = "https://github.com/AdaCore/e3-testsuite/"; license = licenses.gpl3Only; maintainers = with maintainers; [ heijligen ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 9c801e132f8b..9af1c37cbd33 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -2,42 +2,63 @@ lib, buildPythonPackage, django, - fetchPypi, + fetchFromGitHub, pillow, pythonOlder, reportlab, svglib, + pytestCheckHook, + pytest-django, + setuptools, + testfixtures, }: buildPythonPackage rec { pname = "easy-thumbnails"; - version = "2.8.5"; - format = "setuptools"; + version = "2.10.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-fk6RJgn8m2Czof72VX7BXd+cT5RiZ6kuaSDf1N12XjU="; + src = fetchFromGitHub { + owner = "SmileyChris"; + repo = "easy-thumbnails"; + rev = "refs/tags/${version}"; + hash = "sha256-8JTHYQIBbu/4fknK2ZEQeDSgaxKGDfflxumcFMpaGQk="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django pillow - svglib reportlab + svglib + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-django + ]; + + checkInputs = [ testfixtures ]; + + disabledTests = [ + # AssertionError: 'ERROR' != 'INFO' + "test_postprocessor" ]; - # Tests require a Django instance which is setup - doCheck = false; + preCheck = '' + export DJANGO_SETTINGS_MODULE="easy_thumbnails.tests.settings" + ''; pythonImportsCheck = [ "easy_thumbnails" ]; - meta = with lib; { + meta = { description = "Easy thumbnails for Django"; homepage = "https://github.com/SmileyChris/easy-thumbnails"; changelog = "https://github.com/SmileyChris/easy-thumbnails/blob/${version}/CHANGES.rst"; - license = licenses.bsd3; - maintainers = [ ]; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.onny ]; }; } diff --git a/pkgs/development/python-modules/easyocr/default.nix b/pkgs/development/python-modules/easyocr/default.nix index 170ff96c35c8..a75434c018ae 100644 --- a/pkgs/development/python-modules/easyocr/default.nix +++ b/pkgs/development/python-modules/easyocr/default.nix @@ -2,10 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, hdf5, numpy, - onnx, - opencv4, + opencv-python-headless, pillow, pyaml, pyclipper, @@ -16,12 +16,13 @@ shapely, torch, torchvision, + python, }: buildPythonPackage rec { pname = "easyocr"; - version = "1.7.1"; - format = "setuptools"; + version = "1.7.2"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -29,19 +30,25 @@ buildPythonPackage rec { owner = "JaidedAI"; repo = "EasyOCR"; rev = "refs/tags/v${version}"; - hash = "sha256-EiiJ2LJ3uYIvgPd2y25MraV5kTa47JalDR7SLbkM9UI="; + hash = "sha256-9mrAxt2lphYtLW81lGO5SYHsnMnSA/VpHiY2NffD/Js="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "opencv-python-headless" "" \ - --replace "ninja" "" - ''; + build-system = [ + setuptools + ]; + + pythonRelaxDeps = [ + "torchvision" + ]; + + pythonRemoveDeps = [ + "ninja" + ]; - propagatedBuildInputs = [ + dependencies = [ hdf5 numpy - opencv4 + opencv-python-headless pillow pyaml pyclipper @@ -53,7 +60,19 @@ buildPythonPackage rec { torchvision ]; - nativeCheckInputs = [ onnx ]; + checkPhase = '' + runHook preCheck + + export HOME="$(mktemp -d)" + pushd unit_test + ${python.interpreter} run_unit_test.py --easyocr "$out/${python.sitePackages}/easyocr" + popd + + runHook postCheck + ''; + + # downloads detection model from the internet + doCheck = false; pythonImportsCheck = [ "easyocr" ]; diff --git a/pkgs/development/python-modules/echo/default.nix b/pkgs/development/python-modules/echo/default.nix index a07f10e8a4b1..376938a55cbe 100644 --- a/pkgs/development/python-modules/echo/default.nix +++ b/pkgs/development/python-modules/echo/default.nix @@ -11,7 +11,7 @@ qtpy, pyqt6, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -51,7 +51,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "echo" ]; diff --git a/pkgs/development/python-modules/ecos/default.nix b/pkgs/development/python-modules/ecos/default.nix index 6daec8eb775d..b6be5dbc540c 100644 --- a/pkgs/development/python-modules/ecos/default.nix +++ b/pkgs/development/python-modules/ecos/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ecos"; - version = "2.0.13"; + version = "2.0.14"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,10 +20,15 @@ buildPythonPackage rec { owner = "embotech"; repo = "ecos-python"; rev = "refs/tags/v${version}"; - hash = "sha256-3NcZBZ7fnwiMelGssa74b5PgmXmNZhP4etNRpyrCkpo="; + hash = "sha256-nfu1FicWr233r+VHxkQf1vqh2y4DGymJRmik8RJYJkA="; fetchSubmodules = true; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "numpy >= 2.0.0" numpy + ''; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix index e710689aaa26..25af1e1e6ded 100644 --- a/pkgs/development/python-modules/edalize/default.nix +++ b/pkgs/development/python-modules/edalize/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 ]; - passthru.optional-dependencies = { + optional-dependencies = { reporting = [ pandas pyparsing @@ -52,7 +52,7 @@ buildPythonPackage rec { pytestCheckHook which yosys - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "edalize" ]; diff --git a/pkgs/development/python-modules/editdistpy/default.nix b/pkgs/development/python-modules/editdistpy/default.nix index f6b18b372149..e4c6fcbfdaba 100644 --- a/pkgs/development/python-modules/editdistpy/default.nix +++ b/pkgs/development/python-modules/editdistpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "editdistpy"; - version = "0.1.4"; + version = "0.1.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "mammothb"; repo = "editdistpy"; rev = "refs/tags/v${version}"; - hash = "sha256-OSJXiuJtZ4w1IiRaZQZH2DDxA0AGoRHp0BKXdysff0Y="; + hash = "sha256-kTaJkx1fdd2Rl4uhzxdZAFP/ArsM0qTPweJ1jlUcjxQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 41479c4f2659..67a309fcee04 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.21.11"; + version = "0.22.2"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "refs/tags/v${version}"; - hash = "sha256-5d/IEa7IGbQ2FIAl6Y8tBJIzCNDPibmhy35CSpcWQ8A="; + hash = "sha256-rauk8rY3i5fWUrE8lszyC9KBVjTZ7zhXO98cMhIiiz8="; }; build-system = [ diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index e45b5424a4b0..cb4fcf18f263 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "eigenpy"; - version = "3.9.1"; + version = "3.10.1"; pyproject = false; # Built with cmake src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "eigenpy"; rev = "refs/tags/v${version}"; - hash = "sha256-nRslQMnVaVN7S20RuJDp+e9p+oMhsR03EjHYpvkuBYk="; + hash = "sha256-9hKYCCKgPn1IJDezX/ARJHr5+0ridmGd1b3k/ZaVRG0="; }; outputs = [ @@ -50,7 +50,6 @@ buildPythonPackage rec { numpy ]; - doCheck = true; pythonImportsCheck = [ "eigenpy" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/einx/default.nix b/pkgs/development/python-modules/einx/default.nix new file mode 100644 index 000000000000..0f181b5051aa --- /dev/null +++ b/pkgs/development/python-modules/einx/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + wheel, + numpy, + sympy, + frozendict, +}: + +buildPythonPackage rec { + pname = "einx"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fferflo"; + repo = "einx"; + rev = "v${version}"; + hash = "sha256-lbcf47h1tW1fj94NLG4iJPEs6ziGPkcX1Q+wn59PvS8="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + numpy + sympy + frozendict + ]; + + pythonImportsCheck = [ + "einx" + ]; + + meta = { + description = "Universal Tensor Operations in Einstein-Inspired Notation for Python"; + homepage = "https://github.com/fferflo/einx"; + changelog = "https://github.com/fferflo/einx/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index 6fb1abd35fdb..fb27b98608dd 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -85,7 +85,7 @@ buildPythonPackage rec { # Exclude tornado tests "tests/contrib/asyncio/tornado/tornado_tests.py" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Flaky tests on Darwin "tests/utils/threading_tests.py" ]; diff --git a/pkgs/development/python-modules/elastic-transport/default.nix b/pkgs/development/python-modules/elastic-transport/default.nix index 4f569fc29a53..2e333376bb93 100644 --- a/pkgs/development/python-modules/elastic-transport/default.nix +++ b/pkgs/development/python-modules/elastic-transport/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "elastic-transport"; - version = "8.13.1"; + version = "8.15.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "elastic-transport-python"; rev = "refs/tags/v${version}"; - hash = "sha256-zxx5BvqQf5ipaOANKpThWUTsfhDkNMJqUejAWH68wpo="; + hash = "sha256-5bNsJd0td3aQR+PvDBHg0/f+qPyt/ckWmeDrQJzxhYY="; }; postPatch = '' @@ -77,6 +77,7 @@ buildPythonPackage rec { "test_debug_logging_no_body" "test_httpbin" "test_sniffed_nodes_added_to_pool" + "test_async_transport_httpbin" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index bd9b460356cb..4c5abd162b56 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -1,28 +1,39 @@ { lib, buildPythonPackage, - fetchPypi, elasticsearch, + fetchPypi, python-dateutil, - six, + pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "elasticsearch-dsl"; - version = "8.14.0"; - format = "setuptools"; + version = "8.15.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-MmxtzPMvH/PUyEiJOIWQd4REuhj3cK3uUvJHIcuXxMc="; + pname = "elasticsearch_dsl"; + inherit version; + hash = "sha256-QAX6Gr71wK3FJmiWwxd9Dpj/WsSWA8Nt2pBY1hb3klc="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ elasticsearch python-dateutil - six + typing-extensions ]; + optional-dependencies = { + async = [ elasticsearch ] ++ elasticsearch.optional-dependencies.async; + }; + # ImportError: No module named test_elasticsearch_dsl # Tests require a local instance of elasticsearch doCheck = false; @@ -35,6 +46,7 @@ buildPythonPackage rec { the official low-level client (elasticsearch-py). ''; homepage = "https://github.com/elasticsearch/elasticsearch-dsl-py"; + changelog = "https://github.com/elastic/elasticsearch-dsl-py/blob/v${version}/Changelog.rst"; license = licenses.asl20; maintainers = with maintainers; [ desiderius ]; }; diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 562d66e9bc2a..9133ae2d9694 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -2,36 +2,36 @@ lib, aiohttp, buildPythonPackage, - certifi, elastic-transport, fetchPypi, + hatchling, + orjson, + pyarrow, pythonOlder, requests, - urllib3, }: buildPythonPackage rec { pname = "elasticsearch"; - version = "8.14.0"; - format = "setuptools"; + version = "8.15.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-qiSQAp3Zb0AVszPBgnqiH9bApNIjsA37D+kzuNCaURs="; + hash = "sha256-QMDTEvit+L3IF5W8FqC1Rt31RMsfkOgpokTkeAxNv9g="; }; - nativeBuildInputs = [ elastic-transport ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ - urllib3 - certifi - ]; + dependencies = [ elastic-transport ]; - passthru.optional-dependencies = { + optional-dependencies = { requests = [ requests ]; async = [ aiohttp ]; + orjson = [ orjson ]; + pyarrow = [ pyarrow ]; }; pythonImportsCheck = [ "elasticsearch" ]; diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix index 3d3594ae4b34..662c36e6709b 100644 --- a/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/pkgs/development/python-modules/elasticsearch8/default.nix @@ -4,29 +4,29 @@ buildPythonPackage, elastic-transport, fetchPypi, + hatchling, orjson, pythonOlder, requests, - setuptools, }: buildPythonPackage rec { pname = "elasticsearch8"; - version = "8.14.0"; + version = "8.15.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JiiJSjdWAocHvQ9RCGTUJD05hoSE23LYxvzMlELJUfM="; + hash = "sha256-DLxNuA25hQ5p1I2QSrrpLid6EI/0hmaF+zFYE1pS2SE="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ elastic-transport ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiohttp ]; requests = [ requests ]; orjson = [ orjson ]; diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix index d2d661cb3b0f..cd29238f4bbd 100644 --- a/pkgs/development/python-modules/elevenlabs/default.nix +++ b/pkgs/development/python-modules/elevenlabs/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "elevenlabs"; - version = "1.8.0"; + version = "1.9.0"; pyproject = true; src = fetchFromGitHub { owner = "elevenlabs"; repo = "elevenlabs-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-puYRVPWMNV+nOHwa//hZQAq1pAkNeU5CFjlMls9C7MM="; + rev = "refs/tags/${version}"; + hash = "sha256-0fkt2Z05l95b2S+xoyyy9VGAUZDI1SM8kdcP1PCrUg8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix index e5f447b233c6..04cb574509c2 100644 --- a/pkgs/development/python-modules/eliot/default.nix +++ b/pkgs/development/python-modules/eliot/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { pytestCheckHook testtools twisted - ] ++ lib.optionals stdenv.isLinux [ daemontools ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ daemontools ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index a1c04262a5bb..d97651c8e4a6 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -3,7 +3,7 @@ async-timeout, buildPythonPackage, fetchFromGitHub, - poetry-core, + hatchling, pyserial-asyncio-fast, pytest-asyncio, pytestCheckHook, @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "2.2.7"; + version = "2.2.10"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,10 +21,10 @@ buildPythonPackage rec { owner = "gwww"; repo = "elkm1"; rev = "refs/tags/${version}"; - hash = "sha256-5YdmZO/8HimQ9Ft/K/I6xu0Av2SjUBp3+poBe7aVUpM="; + hash = "sha256-8B3icNW1QTTjFeWllPKzVgRFz+gUzUV6o3wOBXx2Zws="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ async-timeout diff --git a/pkgs/development/python-modules/embrace/default.nix b/pkgs/development/python-modules/embrace/default.nix index 7572e77728b2..4ad658d7736c 100644 --- a/pkgs/development/python-modules/embrace/default.nix +++ b/pkgs/development/python-modules/embrace/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { # Some test for hot-reload fails on Darwin, but the rest of the library # should remain usable. (https://todo.sr.ht/~olly/embrace-sql/4) - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Embrace SQL keeps your SQL queries in SQL files"; diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index d6f1fd245931..91140f18a26e 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "emoji"; - version = "2.12.1"; + version = "2.13.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "carpedm20"; - repo = pname; + repo = "emoji"; rev = "refs/tags/v${version}"; - hash = "sha256-m9V9ryIE2U+KsyzFhAoMCGYMkPCBUl/ex1Ue5OUwslc="; + hash = "sha256-1oFzuIA2HFoBw50HHYi8bGZTAAeC6fesSnLReuXUZcM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/empy/default.nix b/pkgs/development/python-modules/empy/default.nix index 018e0240ca65..347a8145ba24 100644 --- a/pkgs/development/python-modules/empy/default.nix +++ b/pkgs/development/python-modules/empy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "empy"; - version = "4.1"; + version = "4.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-nXEul8E5WFm+E9K0V4jJGGzZfxwE2sUQOZEw8yhkM2c="; + hash = "sha256-hvFeHal0Pnmi6bLLrPGhPQt/sYNbYlTrJTyXi3Iof08="; }; pythonImportsCheck = [ "em" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index d08c69cee9e5..9a7c3955d0e1 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "enaml"; - version = "0.17.0"; + version = "0.18.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "nucleic"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DYLDQ9QwdK/a8eY0bFX31UNgxm8FUOaeNAnisFcyFNI="; + hash = "sha256-XwBvPABg4DomI5JNuqaRTINsPgjn8h67rO/ZkSRQ39o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index 826e9fbe7805..ca0916c610a4 100644 --- a/pkgs/development/python-modules/enlighten/default.nix +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { "test_floats_prefixed" "test_subcounter_prefixed" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/Rockhopper-Technologies/enlighten/issues/44 "test_autorefresh" ]; diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index 6b0b760b978f..c3c0a9c0bc1b 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "ephem"; - version = "4.1.5"; + version = "4.1.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-DGSoqkAVdMdZQgRbmvcNFlbhTFNmFRwMu0AMvu3CNio="; + hash = "sha256-DtLk6nb52z7t4iBK2rivPxcIIBx8BO6FEecQpUymQl8="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/ephemeral-port-reserve/default.nix b/pkgs/development/python-modules/ephemeral-port-reserve/default.nix index 2a7e328f978b..d582c5cfc37c 100644 --- a/pkgs/development/python-modules/ephemeral-port-reserve/default.nix +++ b/pkgs/development/python-modules/ephemeral-port-reserve/default.nix @@ -23,7 +23,7 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # can't find hostname in our darwin build environment "test_fqdn" ]; diff --git a/pkgs/development/python-modules/eq3btsmart/default.nix b/pkgs/development/python-modules/eq3btsmart/default.nix index 5fc267fe2e21..908dc2ac979e 100644 --- a/pkgs/development/python-modules/eq3btsmart/default.nix +++ b/pkgs/development/python-modules/eq3btsmart/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "eq3btsmart"; - version = "1.1.9"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "EuleMitKeule"; repo = "eq3btsmart"; rev = "refs/tags/${version}"; - hash = "sha256-7kJqPygX2Oc7fz31qZWrS1ZA+kANZr8vxOwarUzgp/M="; + hash = "sha256-Z3GfUTh3qp5ICJAYsCO6ufw/Jd5FDjOaQE9SaD3H0IU="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix index 80f1b114f473..b1cdd8d36fb0 100644 --- a/pkgs/development/python-modules/equinox/default.nix +++ b/pkgs/development/python-modules/equinox/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "equinox"; - version = "0.11.7"; + version = "0.11.8"; pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "equinox"; rev = "refs/tags/v${version}"; - hash = "sha256-0waIpsVWoABtf4M0IOie9nJDk+e75ArTVmGqYg9AlnI="; + hash = "sha256-lZb2NobSELz8kviPd4Z8PPEEaydaEC5Z6eb9pzC7Ki8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/es-client/default.nix b/pkgs/development/python-modules/es-client/default.nix index f997ff471ef9..e50716358b98 100644 --- a/pkgs/development/python-modules/es-client/default.nix +++ b/pkgs/development/python-modules/es-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "es-client"; - version = "8.14.4"; + version = "8.15.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "untergeek"; repo = "es_client"; rev = "refs/tags/v${version}"; - hash = "sha256-CJhiSDmIlhTWV7LLWd2ZCzuj5cWXwgh0lkKJvhmaDFw="; + hash = "sha256-t/d+aZ11JU9vhZIRkZcsahW8HzEkxbgIc5Zua4WPMjg="; }; pythonRelaxDeps = true; @@ -69,6 +69,8 @@ buildPythonPackage rec { "test_multiple_hosts_raises" "test_non_dict_passed" "test_skip_version_check" + # Test wants to handle credentials + "test_logging_options_from_config_file" # es_client.exceptions.ConfigurationError: Must populate both username and password, or leave both empty "test_exit_if_not_master " ]; diff --git a/pkgs/development/python-modules/esig/default.nix b/pkgs/development/python-modules/esig/default.nix index 68af34c82e3a..ba89418c0b69 100644 --- a/pkgs/development/python-modules/esig/default.nix +++ b/pkgs/development/python-modules/esig/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { iisignature = [ iisignature ]; }; diff --git a/pkgs/development/python-modules/essentials-openapi/default.nix b/pkgs/development/python-modules/essentials-openapi/default.nix index 7438c2ef6e98..b6cc24262073 100644 --- a/pkgs/development/python-modules/essentials-openapi/default.nix +++ b/pkgs/development/python-modules/essentials-openapi/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { markupsafe ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ click jinja2 diff --git a/pkgs/development/python-modules/etcd3/default.nix b/pkgs/development/python-modules/etcd3/default.nix index e105afb48ae4..366306d6302c 100644 --- a/pkgs/development/python-modules/etcd3/default.nix +++ b/pkgs/development/python-modules/etcd3/default.nix @@ -11,12 +11,13 @@ pytestCheckHook, six, tenacity, + setuptools, }: buildPythonPackage rec { pname = "etcd3"; version = "0.12.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "kragniz"; @@ -25,7 +26,15 @@ buildPythonPackage rec { hash = "sha256-YM72+fkCDYXl6DORJa/O0sqXqHDWQcFLv2ifQ9kEHBo="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + env = { + # make protobuf compatible with old versions + # https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates + PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + }; + + dependencies = [ grpcio protobuf six @@ -49,10 +58,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "etcd3" ]; - meta = with lib; { + meta = { description = "Python client for the etcd API v3"; homepage = "https://github.com/kragniz/python-etcd3"; - license = licenses.asl20; - maintainers = [ ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ moraxyc ]; }; } diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix index 18d5488bee36..5157aa329dcd 100644 --- a/pkgs/development/python-modules/etebase/default.nix +++ b/pkgs/development/python-modules/etebase/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; propagatedBuildInputs = [ msgpack ]; @@ -76,7 +76,7 @@ buildPythonPackage rec { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://www.etebase.com/"; description = "Python client library for Etebase"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index c53e052b76fc..241a4260e43a 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest ] - ++ passthru.optional-dependencies.pycryptodome + ++ optional-dependencies.pycryptodome # eth-hash can use either safe-pysha3 or pycryptodome; # safe-pysha3 requires Python 3.9+ while pycryptodome does not. # https://github.com/ethereum/eth-hash/issues/46#issuecomment-1314029211 - ++ lib.optional (pythonAtLeast "3.9") passthru.optional-dependencies.pysha3; + ++ lib.optional (pythonAtLeast "3.9") optional-dependencies.pysha3; checkPhase = '' @@ -38,7 +38,7 @@ buildPythonPackage rec { pytest tests/backends/pysha3/ ''; - passthru.optional-dependencies = { + optional-dependencies = { pycryptodome = [ pycryptodome ]; pysha3 = [ safe-pysha3 ]; }; diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix index 964f4f08326d..c64470a2c485 100644 --- a/pkgs/development/python-modules/eth-keys/default.nix +++ b/pkgs/development/python-modules/eth-keys/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pyasn1 pytestCheckHook ] - ++ passthru.optional-dependencies.coincurve + ++ optional-dependencies.coincurve ++ lib.optional (!isPyPy) eth-hash.optional-dependencies.pysha3 ++ lib.optional isPyPy eth-hash.optional-dependencies.pycryptodome; @@ -63,7 +63,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "eth_keys" ]; - passthru.optional-dependencies = { + optional-dependencies = { coincurve = [ coincurve ]; }; diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index a78831b4aedf..6b853fd9d9bf 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -29,19 +29,19 @@ buildPythonPackage rec { pname = "etils"; - version = "1.9.4"; + version = "1.10.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-+tlQQU8KHKWMcMcJFbABT5lT3ZvPiqlRoPdf+b7L6yQ="; + hash = "sha256-Tqqdckj9Tut15E1HyimHWlzOoETMFKF0NXlL+KwRagU="; }; nativeBuildInputs = [ flit-core ]; - passthru.optional-dependencies = rec { + optional-dependencies = rec { array-types = enp; eapp = [ absl-py # FIXME package simple-parsing @@ -91,7 +91,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook yapf - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; disabledTests = [ "test_public_access" # requires network access diff --git a/pkgs/development/python-modules/evaluate/default.nix b/pkgs/development/python-modules/evaluate/default.nix index 9eeb02422a47..b4ca54649850 100644 --- a/pkgs/development/python-modules/evaluate/default.nix +++ b/pkgs/development/python-modules/evaluate/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "evaluate"; - version = "0.4.2"; + version = "0.4.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "evaluate"; rev = "refs/tags/v${version}"; - hash = "sha256-CGBluY7wFr+RdUW4QTUN18z1WKAB104ayrkzzPZHZ/w="; + hash = "sha256-G/SK0nMpkpCEzX8AX/IJqpOPZWAQhP8tyr7TJ+F0NCE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 5fa638ddddd5..88bb8a599aba 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.35.2"; + version = "0.37.0"; pyproject = true; src = fetchFromGitHub { owner = "eventlet"; repo = "eventlet"; - rev = "v${version}"; - hash = "sha256-jMbCxqIn9f9+16rFwpQdkBHj6NwTNkQxnSVV4qQ1fjM="; + rev = "refs/tags/${version}"; + hash = "sha256-R/nRHsz4z4phG51YYDwkGqvnXssGoiJxIPexuhAf0BI="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { # libredirect is not available on darwin # tests hang on pypy indefinitely - doCheck = !stdenv.isDarwin && !isPyPy; + doCheck = !stdenv.hostPlatform.isDarwin && !isPyPy; preCheck = lib.optionalString doCheck '' echo "nameserver 127.0.0.1" > resolv.conf diff --git a/pkgs/development/python-modules/evtx/default.nix b/pkgs/development/python-modules/evtx/default.nix index d0d8f753ea69..a31b963462a3 100644 --- a/pkgs/development/python-modules/evtx/default.nix +++ b/pkgs/development/python-modules/evtx/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix index c39354ac24cc..4c2fcebe39a9 100644 --- a/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/pkgs/development/python-modules/exceptiongroup/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "exceptiongroup"; - version = "1.2.1"; + version = "1.2.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = "exceptiongroup"; rev = "refs/tags/${version}"; - hash = "sha256-87HmZsbsoV7QPHux50sYsFY2RaIc3627dH3WAwqXfQU="; + hash = "sha256-k88+9FpB/aBun73SnsN6GsBceSUekT8Ig1XBt3hO4ok="; }; nativeBuildInputs = [ flit-scm ]; diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 5be910888a8e..0f6e58d0cb2c 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { tzlocal ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; - passthru.optional-dependencies = { + optional-dependencies = { complete = [ requests-gssapi # requests-negotiate-sspi diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix index e9bdb9bf737c..1c20e1b16d28 100644 --- a/pkgs/development/python-modules/executing/default.nix +++ b/pkgs/development/python-modules/executing/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, pythonAtLeast, pythonOlder, @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "executing"; - version = "2.0.1"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,12 +28,15 @@ buildPythonPackage rec { owner = "alexmojaki"; repo = pname; rev = "v${version}"; - hash = "sha256-PBvfkv9GQ5Vj5I5SygtmHXtqqHMJ4XgNV1/I+lSU0/U="; + hash = "sha256-epgKMPOvPdkpRp0n5A22gZ5DeXLyI60bqzLTx5JFlLk="; }; patches = [ - # TODO: replace after the PR is merged or tagged - ./get_iter.patch + (fetchpatch { + name = "python-3.12.6.patch"; + url = "https://github.com/alexmojaki/executing/commit/3f11fdcd7a017fbdca8a3a9de23dab18d3ba2100.patch"; + hash = "sha256-ZnTO9lT+bj4nekPx4D0DxjhJOCkZn6lDm5xdLrziB+4="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/executing/get_iter.patch b/pkgs/development/python-modules/executing/get_iter.patch deleted file mode 100644 index c8d5bc7a1d56..000000000000 --- a/pkgs/development/python-modules/executing/get_iter.patch +++ /dev/null @@ -1,192 +0,0 @@ -https://github.com/alexmojaki/executing/pull/83#pullrequestreview-2244302661 - - -From 0b913873b9db8c157a8dd581e8771242bcb8864b Mon Sep 17 00:00:00 2001 -From: Frank Hoffmann <15r10nk-git@polarbit.de> -Date: Fri, 16 Aug 2024 22:51:32 +0200 -Subject: [PATCH 1/4] fix: backward compatibility fix for changed source - positions in 3.12.5 (#82) - ---- - executing/_position_node_finder.py | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) - -diff --git a/executing/_position_node_finder.py b/executing/_position_node_finder.py -index 8ca21a6..9a3f8b3 100644 ---- a/executing/_position_node_finder.py -+++ b/executing/_position_node_finder.py -@@ -156,6 +156,8 @@ def __init__(self, frame: FrameType, stmts: Set[EnhancedAST], tree: ast.Module, - typ=typ, - ) - -+ self.result = self.fix_result(self.result, self.instruction(lasti)) -+ - self.known_issues(self.result, self.instruction(lasti)) - - self.test_for_decorator(self.result, lasti) -@@ -213,6 +215,31 @@ def test_for_decorator(self, node: EnhancedAST, index: int) -> None: - if sys.version_info < (3, 12): - index += 4 - -+ def fix_result( -+ self, node: EnhancedAST, instruction: dis.Instruction -+ ) -> EnhancedAST: -+ if ( -+ sys.version_info >= (3, 12, 5) -+ and instruction.opname in ("GET_ITER", "FOR_ITER") -+ and isinstance(node, ast.For) -+ ): -+ # node positions have changed in 3.13 -+ # https://github.com/python/cpython/issues/93691#event-13151024246 -+ # `for` calls __iter__ and __next__ during execution, the calling -+ # expression of these calls was the ast.For node since cpython 3.11 (see test_iter). -+ # cpython 3.13 changed this to the `iter` node of the loop, to make tracebacks easier to read. -+ # This keeps backward compatibility with older executing versions. -+ -+ # there are also cases like: -+ # -+ # for a in iter(l): pass -+ # -+ # where `iter(l)` would be otherwise the resulting node for the `iter()` call and the __iter__ call of the for implementation. -+ # keeping the old behaviour makes it possible to distinguish both cases. -+ -+ return self.result.parent -+ return node -+ - def known_issues(self, node: EnhancedAST, instruction: dis.Instruction) -> None: - if instruction.opname in ("COMPARE_OP", "IS_OP", "CONTAINS_OP") and isinstance( - node, types_cmp_issue - -From d421795d8213abb4fea30067af0149d3a767fed4 Mon Sep 17 00:00:00 2001 -From: Frank Hoffmann <15r10nk-git@polarbit.de> -Date: Tue, 4 Jun 2024 19:46:57 +0200 -Subject: [PATCH 2/4] feat!: dropped support for 3.5, 3.6 and 3.7 - ---- - .github/workflows/test.yml | 2 +- - setup.cfg | 5 +---- - tox.ini | 4 ++-- - 3 files changed, 4 insertions(+), 7 deletions(-) - -diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml -index 8fca81a..140de04 100644 ---- a/.github/workflows/test.yml -+++ b/.github/workflows/test.yml -@@ -12,7 +12,7 @@ jobs: - runs-on: ubuntu-20.04 - strategy: - matrix: -- python-version: [3.5, 3.6, 3.7, 3.8, 3.9, '3.10', 3.11, 3.12-dev, pypy-3.6] -+ python-version: [3.8, 3.9, '3.10', 3.11, 3.12-dev] - - steps: - - uses: actions/checkout@v2 -diff --git a/setup.cfg b/setup.cfg -index fdf901f..ed446d0 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -11,9 +11,6 @@ classifiers = - License :: OSI Approved :: MIT License - Programming Language :: Python - Programming Language :: Python :: 3 -- Programming Language :: Python :: 3.5 -- Programming Language :: Python :: 3.6 -- Programming Language :: Python :: 3.7 - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 -@@ -25,7 +22,7 @@ packages = executing - zip_safe = False - include_package_data = True - setup_requires = setuptools; setuptools_scm[toml] --python_requires = >=3.5 -+python_requires = >=3.8 - - [options.extras_require] - tests= -diff --git a/tox.ini b/tox.ini -index 3566691..6c68c4e 100644 ---- a/tox.ini -+++ b/tox.ini -@@ -1,5 +1,5 @@ - [tox] --envlist = py35,py36,py37,py38,py39,py310,py311,py312,pypy35,pypy36 -+envlist = py38,py39,py310,py311,py312,pypy35,pypy36 - - [testenv] - commands = -@@ -10,7 +10,7 @@ passenv = - ADD_EXECUTING_TESTS - EXECUTING_SLOW_TESTS - --[testenv:generate_small_sample-py{35,36,37,38,39,310,311}] -+[testenv:generate_small_sample-py{38,39,310,311,312}] - extras = tests - deps = pysource-minimize - commands = - -From 3c5ae436a4cff833606ce22c637d088481442154 Mon Sep 17 00:00:00 2001 -From: Frank Hoffmann <15r10nk-git@polarbit.de> -Date: Sat, 17 Aug 2024 11:32:44 +0200 -Subject: [PATCH 3/4] test: skip module tests for python.py - ---- - tests/test_main.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/tests/test_main.py b/tests/test_main.py -index bc015cd..84b1305 100644 ---- a/tests/test_main.py -+++ b/tests/test_main.py -@@ -810,6 +810,9 @@ def test_module_files(self): - or 'pyparsing.py' in filename - or 'enum' in filename - ) -+ or sys.version_info < (3,11) and ( -+ 'python.py' in filename -+ ) - ): - continue - - -From f15a55201be20f30664df4381f4a81407e0d25fb Mon Sep 17 00:00:00 2001 -From: Frank Hoffmann <15r10nk-git@polarbit.de> -Date: Sun, 18 Aug 2024 14:02:30 +0200 -Subject: [PATCH 4/4] refactor: review changes - ---- - executing/_position_node_finder.py | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/executing/_position_node_finder.py b/executing/_position_node_finder.py -index 9a3f8b3..7a0cca6 100644 ---- a/executing/_position_node_finder.py -+++ b/executing/_position_node_finder.py -@@ -221,13 +221,14 @@ def fix_result( - if ( - sys.version_info >= (3, 12, 5) - and instruction.opname in ("GET_ITER", "FOR_ITER") -- and isinstance(node, ast.For) -+ and isinstance(node.parent, ast.For) -+ and node is node.parent.iter - ): -- # node positions have changed in 3.13 -- # https://github.com/python/cpython/issues/93691#event-13151024246 -+ # node positions have changed in 3.12.5 -+ # https://github.com/python/cpython/issues/93691 - # `for` calls __iter__ and __next__ during execution, the calling - # expression of these calls was the ast.For node since cpython 3.11 (see test_iter). -- # cpython 3.13 changed this to the `iter` node of the loop, to make tracebacks easier to read. -+ # cpython 3.12.5 changed this to the `iter` node of the loop, to make tracebacks easier to read. - # This keeps backward compatibility with older executing versions. - - # there are also cases like: -@@ -237,7 +238,7 @@ def fix_result( - # where `iter(l)` would be otherwise the resulting node for the `iter()` call and the __iter__ call of the for implementation. - # keeping the old behaviour makes it possible to distinguish both cases. - -- return self.result.parent -+ return node.parent - return node - - def known_issues(self, node: EnhancedAST, instruction: dis.Instruction) -> None: diff --git a/pkgs/development/python-modules/expiring-dict/default.nix b/pkgs/development/python-modules/expiring-dict/default.nix index ba846ebbab32..8001dadabb5e 100644 --- a/pkgs/development/python-modules/expiring-dict/default.nix +++ b/pkgs/development/python-modules/expiring-dict/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "expiring-dict"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-PEBK2x5DaUaMt+Ub+8nEcNfi6GPv4qHHXU7XBtDc4aY="; + hash = "sha256-J3lC7cYNWxI0V8GkaGmMlJI9v6yNQLJjuSHATmlA3Ak="; }; propagatedBuildInputs = [ sortedcontainers ]; diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index 391881204e29..6f1b346274a2 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -2,54 +2,61 @@ lib, buildPythonPackage, fetchFromGitHub, - antlr4, - antlr4-python3-runtime, igraph, pygments, + scikit-build-core, + pybind11, + ninja, + ruff, + cmake, pytestCheckHook, setuptools, }: buildPythonPackage rec { pname = "explorerscript"; - version = "0.1.5"; + version = "0.2.1.post2"; pyproject = true; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-dGbzZYEFEWE5bUz+647pPzP4Z/XmrJU82jNT4ZBRNHk="; + hash = "sha256-cKEceWr7XmZbuomPOmjQ32ptAjz3LZDQBWAgZEFadDY="; + # Include a pinned antlr4 fork used as a C++ library + fetchSubmodules = true; }; nativeBuildInputs = [ - antlr4 setuptools + scikit-build-core + ninja + cmake + ruff ]; - pythonRelaxDeps = [ - # antlr output is rebuilt in postPatch step. - "antlr4-python3-runtime" - # igraph > 0.10.4 was marked as incompatible by upstream - # due to a breaking change introduced in 0.10.5. Later versions reverted - # this change, and introduced a deprecation warning instead. - # - # https://github.com/igraph/python-igraph/issues/693 - "igraph" - ]; + # The source include some auto-generated ANTLR code that could be recompiled, but trying that resulted in a crash while decompiling unionall.ssb. + # We thus do not rebuild them. postPatch = '' - antlr -Dlanguage=Python3 -visitor explorerscript/antlr/{ExplorerScript,SsbScript}.g4 + substituteInPlace Makefile \ + --replace-fail ./generate_parser_bindings.py "python3 ./generate_parser_bindings.py" + + # Doesn’t detect that package for some reason + substituteInPlace pyproject.toml \ + --replace-fail "\"scikit-build-core<=0.9.8\"," "" ''; + dontUseCmakeConfigure = true; + propagatedBuildInputs = [ - antlr4-python3-runtime igraph + pybind11 ]; - passthru.optional-dependencies.pygments = [ pygments ]; + optional-dependencies.pygments = [ pygments ]; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.pygments; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.pygments; pythonImportsCheck = [ "explorerscript" ]; diff --git a/pkgs/development/python-modules/extension-helpers/default.nix b/pkgs/development/python-modules/extension-helpers/default.nix index d8429d0869ee..01ba9fd55a2a 100644 --- a/pkgs/development/python-modules/extension-helpers/default.nix +++ b/pkgs/development/python-modules/extension-helpers/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "extension-helpers"; - version = "1.1.1"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "astropy"; repo = "extension-helpers"; rev = "refs/tags/v${version}"; - hash = "sha256-pYCSLb6uuQ9ZtMZOQH0DxLlfgFv3tgH+AL35IN71cNI="; + hash = "sha256-qneulhSYB2gYiCdgoU7Dqg1luLWhVouFVihcKeOA37E="; }; build-system = [ diff --git a/pkgs/development/python-modules/extract-msg/default.nix b/pkgs/development/python-modules/extract-msg/default.nix index 9ed39dae6783..5fd8e5ff6df7 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.49.0"; + version = "0.52.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "TeamMsgExtractor"; repo = "msg-extractor"; rev = "refs/tags/v${version}"; - hash = "sha256-o9kf88IYYpjZDpg1liIaIpxzg0cfFepRx0BdxeLRTz0="; + hash = "sha256-4jvzZkGa/xI5Sl9TBIm/BD3tGl+MZvwir6m/zrvA4tQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix index 350ff622f6c2..6d9ff4548eb4 100644 --- a/pkgs/development/python-modules/extractcode/default.nix +++ b/pkgs/development/python-modules/extractcode/default.nix @@ -10,13 +10,14 @@ pythonOlder, setuptools-scm, six, + setuptools, typecode, }: buildPythonPackage rec { pname = "extractcode"; version = "31.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -33,9 +34,9 @@ buildPythonPackage rec { dontConfigure = true; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ typecode patch extractcode-libarchive @@ -67,16 +68,18 @@ buildPythonPackage rec { "test_patch_info_patch_patches_windows_plugin_explorer_patch" # AssertionError: assert [['linux-2.6...._end;', ...]]] == [['linux-2.6...._end;', ...]]] "test_patch_info_patch_patches_misc_linux_st710x_patches_motorola_rootdisk_c_patch" + # extractcode.libarchive2.ArchiveErrorRetryable: Damaged tar archive + "test_extract_python_testtar_tar_archive_with_special_files" ]; pythonImportsCheck = [ "extractcode" ]; meta = with lib; { description = "Universal archive extractor using z7zip, libarchive, other libraries and the Python standard library"; - mainProgram = "extractcode"; - homepage = "https://github.com/nexB/extractcode"; - changelog = "https://github.com/nexB/extractcode/releases/tag/v${version}"; + homepage = "https://github.com/aboutcode-org/extractcode"; + changelog = "https://github.com/aboutcode-org/extractcode/releases/tag/v${version}"; license = licenses.asl20; maintainers = [ ]; + mainProgram = "extractcode"; }; } diff --git a/pkgs/development/python-modules/facedancer/default.nix b/pkgs/development/python-modules/facedancer/default.nix index 516eb08e4f46..8c92b3dbed46 100644 --- a/pkgs/development/python-modules/facedancer/default.nix +++ b/pkgs/development/python-modules/facedancer/default.nix @@ -1,37 +1,57 @@ { lib, buildPythonPackage, - fetchPypi, - isPy3k, + fetchFromGitHub, + pythonOlder, pyusb, pyserial, + prompt-toolkit, + libusb1, + setuptools, }: buildPythonPackage rec { pname = "facedancer"; - version = "2019.3.2"; - format = "setuptools"; + version = "3.0.4"; + pyproject = true; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - sha256 = "1zhwnlfksblgp54njd9gjsrr5ibg12cx1x9xxcqkcdfhn3m2kmm0"; + src = fetchFromGitHub { + owner = "greatscottgadgets"; + repo = "facedancer"; + rev = "refs/tags/${version}"; + hash = "sha256-Cl6cohelJkpr2Nokfwwm7GQIg7ZipPL3v44JVWsHUNI="; }; - disabled = !isPy3k; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"setuptools-git-versioning<2"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + ''; + + build-system = [ + setuptools + ]; - propagatedBuildInputs = [ + dependencies = [ pyusb pyserial + prompt-toolkit + libusb1 ]; - preBuild = '' - echo "$version" > VERSION - ''; + pythonImportsCheck = [ + "facedancer" + ]; - meta = with lib; { - description = "library for emulating usb devices"; - homepage = "https://greatscottgadgets.com/greatfet/"; - license = licenses.bsd3; - maintainers = with maintainers; [ mog ]; + meta = { + changelog = "https://github.com/greatscottgadgets/facedancer/releases/tag/${version}"; + description = "Implement your own USB device in Python, supported by a hardware peripheral such as Cynthion or GreatFET"; + homepage = "https://github.com/greatscottgadgets/facedancer"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + mog + carlossless + ]; }; } diff --git a/pkgs/development/python-modules/factory-boy/default.nix b/pkgs/development/python-modules/factory-boy/default.nix index 8b93fec4f8d9..b7362eb13913 100644 --- a/pkgs/development/python-modules/factory-boy/default.nix +++ b/pkgs/development/python-modules/factory-boy/default.nix @@ -9,42 +9,44 @@ mongoengine, pytestCheckHook, pythonOlder, + mongomock, sqlalchemy, sqlalchemy-utils, + setuptools, }: buildPythonPackage rec { pname = "factory-boy"; - version = "3.3.0"; - format = "setuptools"; + version = "3.3.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "factory_boy"; inherit version; - hash = "sha256-vHbZfRplu9mEKm1yKIIJjrVJ7I7hCB+fsuj/KfDDAPE="; + hash = "sha256-gxeqUonN/EX5yuVw/rB6YXcxbILjTRTfPC4fIvJqvvA="; }; - postPatch = '' - substituteInPlace tests/test_version.py \ - --replace '"3.2.1.dev0")' '"${version}")' - ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ faker ]; + dependencies = [ faker ]; nativeCheckInputs = [ django flask flask-sqlalchemy mongoengine + mongomock pytestCheckHook sqlalchemy sqlalchemy-utils ]; - # Checks for MongoDB requires an a running DB - disabledTests = [ "MongoEngineTestCase" ]; + disabledTests = [ + # Test checks for MongoDB requires an a running DB + "MongoEngineTestCase" + ]; disabledTestPaths = [ # incompatible with latest flask-sqlalchemy @@ -57,7 +59,7 @@ buildPythonPackage rec { description = "Python package to create factories for complex objects"; homepage = "https://github.com/rbarrois/factory_boy"; changelog = "https://github.com/FactoryBoy/factory_boy/blob/${version}/docs/changelog.rst"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/fairscale/default.nix b/pkgs/development/python-modules/fairscale/default.nix index 4472d6e24a4f..e870e2c934e7 100644 --- a/pkgs/development/python-modules/fairscale/default.nix +++ b/pkgs/development/python-modules/fairscale/default.nix @@ -11,7 +11,7 @@ # check inputs pytestCheckHook, parameterized, - pytest-cov, + pytest-cov-stub, pytest-timeout, remote-pdb, }: @@ -51,7 +51,7 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook parameterized - pytest-cov + pytest-cov-stub pytest-timeout remote-pdb ]; diff --git a/pkgs/development/python-modules/faiss/default.nix b/pkgs/development/python-modules/faiss/default.nix index f6eee8cc5e32..39e34a1879e8 100644 --- a/pkgs/development/python-modules/faiss/default.nix +++ b/pkgs/development/python-modules/faiss/default.nix @@ -7,7 +7,6 @@ packaging, setuptools, pip, - wheel, }: buildPythonPackage { @@ -24,7 +23,6 @@ buildPythonPackage { build-system = [ setuptools pip - wheel ]; dependencies = [ diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix index 138c7ab0980d..3d15da8d064b 100644 --- a/pkgs/development/python-modules/fake-useragent/default.nix +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -27,22 +27,25 @@ buildPythonPackage rec { sed -i '/addopts/d' pytest.ini ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = - [ ] - ++ lib.optionals (pythonOlder "3.10") [ importlib-resources ] + dependencies = + lib.optionals (pythonOlder "3.10") [ importlib-resources ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "fake_useragent" ]; - meta = with lib; { + disabledTests = lib.optionals (pythonOlder "3.12") [ + "test_utils_load_pkg_resource_fallback" + ]; + + meta = { + changelog = "https://github.com/fake-useragent/fake-useragent/releases/tag/${version}"; description = "Up to date simple useragent faker with real world database"; homepage = "https://github.com/hellysmile/fake-useragent"; - changelog = "https://github.com/fake-useragent/fake-useragent/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ evanjs ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ evanjs ]; }; } diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index babcc2423d35..504589a33ca3 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "faker"; - version = "25.8.0"; + version = "25.9.2"; pyproject = true; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-vexfL7BX0kTr724O0xj+pNy98yw6GgEHZvxF9daPxo0="; + hash = "sha256-ypSENgCkCJqROUAj/vAUu0H+5Qn4xL7vFTABg3PncPs="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index fa62b1754893..4a98f804f9cb 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -12,12 +12,13 @@ pytestCheckHook, pythonOlder, redis, + redis-server, sortedcontainers, }: buildPythonPackage rec { pname = "fakeredis"; - version = "2.23.5"; + version = "2.25.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-gwTOtwBOHl6FNL0ekOq2rewwT/XoQ31+cyxU/OCBOTA="; + hash = "sha256-HjId4SueqkbC319Eel8G85ZOj72ZKEVEH2D8V/GfXi4="; }; build-system = [ poetry-core ]; @@ -43,7 +44,7 @@ buildPythonPackage rec { pytestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { lua = [ lupa ]; json = [ jsonpath-ng ]; bf = [ pyprobables ]; @@ -53,6 +54,17 @@ buildPythonPackage rec { pythonImportsCheck = [ "fakeredis" ]; + pytestFlagsArray = [ "-m 'not slow'" ]; + + preCheck = '' + ${lib.getExe' redis-server "redis-server"} --port 6390 & + REDIS_PID=$! + ''; + + postCheck = '' + kill $REDIS_PID + ''; + disabledTests = [ # AssertionError "test_command" 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 a9ce3ef4a451..0eec5c5cb6e0 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.7.1"; + version = "1.7.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "faraday_agent_parameters_types"; inherit version; - hash = "sha256-ypr5/6mnATFswZPX4aeusH8PoYRa+yVL1gk+pdz7r0w="; + hash = "sha256-9+scGbRITK25XLJOMsMzPj/y5Wi05mB0dcXDhon9Cf4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fast-histogram/default.nix b/pkgs/development/python-modules/fast-histogram/default.nix index d0621c1b539e..3a3ada743a4e 100644 --- a/pkgs/development/python-modules/fast-histogram/default.nix +++ b/pkgs/development/python-modules/fast-histogram/default.nix @@ -10,7 +10,7 @@ numpy, wheel, hypothesis, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook hypothesis - pytest-cov + pytest-cov-stub ]; pytestFlagsArray = [ "${builtins.placeholder "out"}/${python.sitePackages}" ]; diff --git a/pkgs/development/python-modules/fastai/default.nix b/pkgs/development/python-modules/fastai/default.nix index 620b992fb202..ede86f1341e8 100644 --- a/pkgs/development/python-modules/fastai/default.nix +++ b/pkgs/development/python-modules/fastai/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "fastai"; - version = "2.7.15"; + version = "2.7.17"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8swg/RjN9exzjMVtKdVN51iH1IrRX501z1DDjTqFaSM="; + hash = "sha256-g1UwIkdXO5X9jx5zgjbTYBkA0CEDgCKY9rhz8qXU2Io="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastapi-cli/default.nix b/pkgs/development/python-modules/fastapi-cli/default.nix index bfbfa0509a21..071b1cd0c9cf 100644 --- a/pkgs/development/python-modules/fastapi-cli/default.nix +++ b/pkgs/development/python-modules/fastapi-cli/default.nix @@ -13,25 +13,27 @@ let self = buildPythonPackage rec { pname = "fastapi-cli"; - version = "0.0.4"; + version = "0.0.5"; pyproject = true; src = fetchFromGitHub { owner = "tiangolo"; repo = "fastapi-cli"; - rev = version; - hash = "sha256-eWvZn7ZeLnQZAvGOzY77o6oO5y+QV2cx+peBov9YpJE="; + rev = "refs/tags/${version}"; + hash = "sha256-hUS9zkDJJB51X+e31RvyxcGAP8j4oulAPFAvEMPiIn8="; }; build-system = [ pdm-backend ]; - dependencies = [ typer ]; + dependencies = [ + typer + uvicorn + ] ++ uvicorn.optional-dependencies.standard; optional-dependencies = { standard = [ - fastapi uvicorn - ]; + ] ++ uvicorn.optional-dependencies.standard; }; doCheck = false; diff --git a/pkgs/development/python-modules/fastapi-sso/default.nix b/pkgs/development/python-modules/fastapi-sso/default.nix index c5ca2e98e2b0..103376e4ad40 100644 --- a/pkgs/development/python-modules/fastapi-sso/default.nix +++ b/pkgs/development/python-modules/fastapi-sso/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "fastapi-sso"; - version = "0.15.0"; + version = "0.17.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "tomasvotava"; repo = "fastapi-sso"; rev = "refs/tags/${version}"; - hash = "sha256-jSUogf2Dup8k4BOQAXJwg8R96Blgieg82/X/n1TLnL0="; + hash = "sha256-CkYAF2GmVCooyHt3Tua6ClYMbgyLosqSa8z/zkV2eIE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 81e51b02150f..e9ed6eb2e2ea 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -16,6 +16,7 @@ # tests dirty-equals, flask, + inline-snapshot, passlib, pyjwt, pytest-asyncio, @@ -39,7 +40,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.112.0"; + version = "0.115.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -48,7 +49,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "fastapi"; rev = "refs/tags/${version}"; - hash = "sha256-M09yte0BGC5w3AZSwDUr9qKUrotqVklO8mwyms9B95Y="; + hash = "sha256-JIaPgZVbz887liVwd3YtubJm+L4tFCM9Jcn9/smjiKo="; }; build-system = [ pdm-backend ]; @@ -86,6 +87,7 @@ buildPythonPackage rec { nativeCheckInputs = [ dirty-equals flask + inline-snapshot passlib pyjwt pytestCheckHook @@ -104,24 +106,20 @@ buildPythonPackage rec { disabledTests = [ # Coverage test "test_fastapi_cli" - # ResourceWarning: Unclosed <MemoryObjectSendStream> - "test_openapi_schema" ]; disabledTestPaths = [ # Don't test docs and examples "docs_src" - # databases is incompatible with SQLAlchemy 2.0 - "tests/test_tutorial/test_async_sql_databases" "tests/test_tutorial/test_sql_databases" ]; pythonImportsCheck = [ "fastapi" ]; meta = with lib; { - changelog = "https://github.com/tiangolo/fastapi/releases/tag/${version}"; + changelog = "https://github.com/fastapi/fastapi/releases/tag/${version}"; description = "Web framework for building APIs"; - homepage = "https://github.com/tiangolo/fastapi"; + homepage = "https://github.com/fastapi/fastapi"; license = licenses.mit; maintainers = with maintainers; [ wd15 ]; }; diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 0aacc52e3f76..cc13fa17e153 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.7.9"; + version = "1.7.19"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-OGqd+pLM3THcPD3JtccjH6sgpVEhcNVnGbIbyMFfqTU="; + hash = "sha256-CJG/cKgqdUrJcYV5pgGjrnoXzRAj3xya7LwvchNGrPU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/fastcrc/default.nix b/pkgs/development/python-modules/fastcrc/default.nix new file mode 100644 index 000000000000..78076c652709 --- /dev/null +++ b/pkgs/development/python-modules/fastcrc/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + rustPlatform, + pytestCheckHook, + pytest-benchmark, + nix-update-script, +}: +let + pname = "fastcrc"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "overcat"; + repo = "fastcrc"; + rev = "refs/tags/v${version}"; + hash = "sha256-yLrv/zqsjgygJAIJtztwxlm4s9o9EBVsCyx1jUXd7hA="; + }; +in +buildPythonPackage { + inherit pname version src; + pyproject = true; + + disabled = pythonOlder "3.7"; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-wSE7548L+ymNjN9TfygAGY1BrssXOPGXlmE83wV7zb4="; + }; + + pythonImportsCheck = [ "fastcrc" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-benchmark + ]; + + # Python source files interfere with testing + preCheck = '' + rm -r fastcrc + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Hyper-fast Python module for computing CRC(8, 16, 32, 64) checksum"; + homepage = "https://fastcrc.readthedocs.io/en/latest/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pluiedev ]; + }; +} diff --git a/pkgs/development/python-modules/fastdiff/default.nix b/pkgs/development/python-modules/fastdiff/default.nix index 1096add5b627..4b906c6d6c1d 100644 --- a/pkgs/development/python-modules/fastdiff/default.nix +++ b/pkgs/development/python-modules/fastdiff/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = [ ]; # resulting compiled object panics at import - broken = stdenv.is32bit; + broken = stdenv.hostPlatform.is32bit; }; } diff --git a/pkgs/development/python-modules/faster-whisper/default.nix b/pkgs/development/python-modules/faster-whisper/default.nix index 8dff7f5a3944..42ae02fea649 100644 --- a/pkgs/development/python-modules/faster-whisper/default.nix +++ b/pkgs/development/python-modules/faster-whisper/default.nix @@ -19,13 +19,14 @@ buildPythonPackage rec { pname = "faster-whisper"; - version = "1.0.3"; + version = "unstable-2024-07-26"; pyproject = true; src = fetchFromGitHub { owner = "SYSTRAN"; repo = "faster-whisper"; - rev = "refs/tags/v${version}"; + # rev = "refs/tags/v${version}"; + rev = "d57c5b40b06e59ec44240d93485a95799548af50"; hash = "sha256-C/O+wt3dykQJmH+VsVkpQwEAdyW8goMUMKR0Z3Y7jdo="; }; @@ -33,7 +34,10 @@ buildPythonPackage rec { setuptools ]; - pythonRelaxDeps = [ "tokenizers" ]; + pythonRelaxDeps = [ + "av" + "tokenizers" + ]; dependencies = [ av diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix index e3f69aad972c..4b518e5f8ef1 100644 --- a/pkgs/development/python-modules/fastjsonschema/default.nix +++ b/pkgs/development/python-modules/fastjsonschema/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { "remote ref" "definitions" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_compile_to_code_custom_format" # cannot import temporary module created during test ]; diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 4add91da0926..5beafcea7a1c 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { pandas ]; - passthru.optional-dependencies = { + optional-dependencies = { lzo = [ python-lzo ]; }; diff --git a/pkgs/development/python-modules/fasttext-predict/default.nix b/pkgs/development/python-modules/fasttext-predict/default.nix index 6bfddc120c6f..bdd19640609e 100644 --- a/pkgs/development/python-modules/fasttext-predict/default.nix +++ b/pkgs/development/python-modules/fasttext-predict/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { hash = "sha256-rMbf09pCHvVYI9g/aq74+PcsuU2LezpmDz4b/w9vRyc="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace setup.py \ --replace-fail "-flto" "" ''; diff --git a/pkgs/development/python-modules/ffcv/default.nix b/pkgs/development/python-modules/ffcv/default.nix index 344c7257024a..158050a9af77 100644 --- a/pkgs/development/python-modules/ffcv/default.nix +++ b/pkgs/development/python-modules/ffcv/default.nix @@ -6,7 +6,7 @@ lib, libjpeg, numba, - opencv4, + opencv-python, pandas, pkg-config, pytorch-pfn-extras, @@ -40,7 +40,6 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace-fail "'assertpy'," "" \ --replace-fail "'fastargs'," "" \ - --replace-fail "'opencv-python'," "" \ --replace-fail "'psutil'," "" \ ''; @@ -48,7 +47,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjpeg ]; propagatedBuildInputs = [ - opencv4 + opencv-python numba pandas pytorch-pfn-extras @@ -111,6 +110,6 @@ buildPythonPackage rec { ]; # OSError: dlopen(libc.so.6, 0x0006): tried: '/usr/lib/libc.so.6' (no such file, not in dyld cache), # 'libc.so.6' (no such file), '/usr/local/lib/libc.so.6' (no such file), '/usr/lib/libc.so.6' (no such file, not in dyld cache) - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index 288389dea837..4f3baf7fe8db 100644 --- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ffmpeg-progress-yield"; - version = "0.7.8"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-muauX4Mq58ew9lGPE0H+bu4bqPydNADLocujjy6qRh4="; + hash = "sha256-n6zHi6M9SyrNm8MhQ9xvBo2OIzoQYJ4yhgujW5C6QWY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ffmpeg-python/default.nix b/pkgs/development/python-modules/ffmpeg-python/default.nix index c337d64dc7ee..b7ae441c9f7e 100644 --- a/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -2,12 +2,12 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, fetchpatch2, setuptools, pytestCheckHook, pytest-mock, - ffmpeg_7, + ffmpeg, }: buildPythonPackage { @@ -23,10 +23,7 @@ buildPythonPackage { }; patches = [ - (substituteAll { - src = ./ffmpeg-location.patch; - ffmpeg = ffmpeg_7; - }) + (replaceVars ./ffmpeg-location.patch { inherit ffmpeg; }) # Remove dependency on `future` # https://github.com/kkroening/ffmpeg-python/pull/795 diff --git a/pkgs/development/python-modules/ffmpy/default.nix b/pkgs/development/python-modules/ffmpy/default.nix index 00a8a73aadad..ec639f9ef821 100644 --- a/pkgs/development/python-modules/ffmpy/default.nix +++ b/pkgs/development/python-modules/ffmpy/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { go ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # expects a FFExecutableNotFoundError, gets a NotADirectoryError raised by os "test_invalid_executable_path" ]; diff --git a/pkgs/development/python-modules/fhir-py/default.nix b/pkgs/development/python-modules/fhir-py/default.nix index 518687e15d7e..d847ee08e9ed 100644 --- a/pkgs/development/python-modules/fhir-py/default.nix +++ b/pkgs/development/python-modules/fhir-py/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fhir-py"; - version = "2.0.4"; + version = "2.0.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "beda-software"; repo = "fhir-py"; rev = "refs/tags/v${version}"; - hash = "sha256-WDYDQqeNwt4cKEgF+HqMOuEwUezS10YUOZp+eAui6nM="; + hash = "sha256-ts4BT/YVfejyemEy8B9aAJuA9h1a5F/SoIAkDVem7mQ="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index 8b5a06c4a1fc..0dd47d31ed70 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { dependencies = [ cryptography ]; - passthru.optional-dependencies = { + optional-dependencies = { pcsc = [ pyscard ]; }; diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 7edfa503f2e9..3aa7faeae458 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -4,6 +4,7 @@ fetchPypi, hatch-vcs, hatchling, + pytest-asyncio, pytest-mock, pytestCheckHook, pythonOlder, @@ -11,26 +12,34 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.15.1"; - format = "pyproject"; + version = "3.16.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-WKJUmv354C4Qcg6qTURw9WOG16b3Lt19BZYzevjtetg="; + hash = "sha256-wkn7/NXbR+Xi1tYhmOVlR17mXkgx4lYcjjE/p+uWFDU="; }; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling ]; nativeCheckInputs = [ + pytest-asyncio pytest-mock pytestCheckHook ]; + pythonImportsCheck = [ "filelock" ]; + + disabledTestPaths = [ + # Circular dependency with virtualenv + "tests/test_virtualenv.py" + ]; + meta = with lib; { changelog = "https://github.com/tox-dev/py-filelock/releases/tag/${version}"; description = "Platform independent file lock for Python"; diff --git a/pkgs/development/python-modules/findimports/default.nix b/pkgs/development/python-modules/findimports/default.nix index 7eb31b29b69b..7a03e9aeea71 100644 --- a/pkgs/development/python-modules/findimports/default.nix +++ b/pkgs/development/python-modules/findimports/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "findimports"; - version = "2.5.0"; + version = "2.5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,10 +18,10 @@ buildPythonPackage rec { owner = "mgedmin"; repo = "findimports"; rev = "refs/tags/${version}"; - hash = "sha256-kHm0TiLe7zvUnU6+MR1M0xOt0gpMDJ5FJ5+HgY0LPeo="; + hash = "sha256-0HD5n9kxlXB86w8zkti6MkVZxEgGRrXzM6f+g0H/jrs="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; pythonImportsCheck = [ "findimports" ]; @@ -36,7 +36,6 @@ buildPythonPackage rec { meta = with lib; { description = "Module for the analysis of Python import statements"; - mainProgram = "findimports"; homepage = "https://github.com/mgedmin/findimports"; changelog = "https://github.com/mgedmin/findimports/blob/${version}/CHANGES.rst"; license = with licenses; [ @@ -44,5 +43,6 @@ buildPythonPackage rec { gpl3Only ]; maintainers = with maintainers; [ fab ]; + mainProgram = "findimports"; }; } diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix index 140c912543ed..16cb43c7d198 100644 --- a/pkgs/development/python-modules/findpython/default.nix +++ b/pkgs/development/python-modules/findpython/default.nix @@ -16,7 +16,7 @@ let pname = "findpython"; - version = "0.6.1"; + version = "0.6.2"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-VuUrQJqSvL1JXPmByFrPE387PlHMdptG66IZuxq3Uzw="; + hash = "sha256-4MdbqfNaf5u0Qj6zG9FzWMzPFXYbaDcxdxkXeu/0ZyM="; }; nativeBuildInputs = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/finetuning-scheduler/default.nix b/pkgs/development/python-modules/finetuning-scheduler/default.nix index 7d9cf816c7ba..808c8e1ab696 100644 --- a/pkgs/development/python-modules/finetuning-scheduler/default.nix +++ b/pkgs/development/python-modules/finetuning-scheduler/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { "test_fts_dynamo_resume" "test_fts_dynamo_intrafit" ] - ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ # slightly exceeds numerical tolerance on aarch64-linux: "test_fts_frozen_bn_track_running_stats" ]; @@ -58,6 +58,6 @@ buildPythonPackage rec { 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; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index f63a5a37324c..deaaf1fd1adf 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -13,7 +13,7 @@ }: buildPythonPackage rec { - version = "4.1.0"; + version = "4.2.0"; pname = "fints"; pyproject = true; @@ -23,14 +23,10 @@ buildPythonPackage rec { owner = "raphaelm"; repo = "python-fints"; rev = "v${version}"; - hash = "sha256-1k6ZeYlv0vxNkqQse9vi/NT6ag3DJONKCWB594LvER0="; + hash = "sha256-BM57Ov36DEJVH5DBm/mJife16iaFfjlQrF0IXRziM2A="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "enum-tools~=0.9.0" "" - sed -i "/document_enum/d" fints/formals.py - ''; + pythonRemoveDeps = [ "enum-tools" ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/finvizfinance/default.nix b/pkgs/development/python-modules/finvizfinance/default.nix index 0c3ff788d468..4796f53037be 100644 --- a/pkgs/development/python-modules/finvizfinance/default.nix +++ b/pkgs/development/python-modules/finvizfinance/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "finvizfinance"; - version = "1.0.1"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.5"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "lit26"; repo = "finvizfinance"; rev = "refs/tags/v${version}"; - hash = "sha256-4aR1x9GgbxnJUpn1+i95djZEVBFTAIzhMLxHe2FaciY="; + hash = "sha256-HCxq8jCT3aHOXeYue7KP5sYzO6nJnB9Sy8gKGZpZHbc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix index 17f148f39f7c..2be37738ebb1 100644 --- a/pkgs/development/python-modules/fipy/default.nix +++ b/pkgs/development/python-modules/fipy/default.nix @@ -45,9 +45,9 @@ buildPythonPackage rec { future scikit-fmm openssh - ] ++ lib.optionals (!stdenv.isDarwin) [ gmsh ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gmsh ]; - nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ gmsh ]; + nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ gmsh ]; # NOTE: Two of the doctests in fipy.matrices.scipyMatrix._ScipyMatrix.CSR fail, and there is no # clean way to disable them. diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix index 05a94d1f2dc3..aa29025c3f24 100644 --- a/pkgs/development/python-modules/fire/default.nix +++ b/pkgs/development/python-modules/fire/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "fire"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "google"; repo = "python-fire"; rev = "refs/tags/v${version}"; - hash = "sha256-tBmsy0MuJu0Ei+4lUy/XfKoOU+OuH4xqmjPv/uKVuwg="; + hash = "sha256-cYlkMnZOa0J6dOiWsWZplk/MajVRiCYe8tK3641fD0w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/firebase-messaging/default.nix b/pkgs/development/python-modules/firebase-messaging/default.nix index 0d6118e44c4e..a64bc19ea2e6 100644 --- a/pkgs/development/python-modules/firebase-messaging/default.nix +++ b/pkgs/development/python-modules/firebase-messaging/default.nix @@ -6,8 +6,9 @@ buildPythonPackage, cryptography, fetchFromGitHub, + hatchling, http-ece, - poetry-core, + myst-parser, protobuf, pytest-asyncio, pytest-mock, @@ -23,16 +24,16 @@ buildPythonPackage rec { pname = "firebase-messaging"; - version = "0.3.0"; + version = "0.4.4"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "sdb9696"; repo = "firebase-messaging"; rev = "refs/tags/${version}"; - hash = "sha256-pZpnekJ11yx3L8l56vZOa4uS+jJMxUkYODgNAqysVeY="; + hash = "sha256-duUqDioIBo2QQP/4VGGwklDt4F8pDm/sHrvOx4wcTWQ="; }; outputs = [ @@ -40,20 +41,28 @@ buildPythonPackage rec { "doc" ]; + build-system = [ + hatchling + ]; + nativeBuildInputs = [ - poetry-core sphinxHook - ] ++ passthru.optional-dependencies.docs; + ] ++ optional-dependencies.docs; + + pythonRelaxDeps = [ + "http-ece" + ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp cryptography http-ece protobuf ]; - passthru.optional-dependencies = { + optional-dependencies = { docs = [ + myst-parser sphinx sphinx-autodoc-typehints sphinx-rtd-theme diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix index a14f24cb8e5f..ca122ad9c7db 100644 --- a/pkgs/development/python-modules/fixtures/default.nix +++ b/pkgs/development/python-modules/fixtures/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ pbr ]; - passthru.optional-dependencies = { + optional-dependencies = { streams = [ testtools ]; }; nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.streams; + ] ++ optional-dependencies.streams; meta = { description = "Reusable state for writing clean tests and more"; diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index 64efa21f8ced..b5e02f5b7c6b 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "4.5.0"; + version = "4.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - hash = "sha256-CoQ5/pOR1xy71koUm1uwTJDLTDROTjJQMW9ZcgtzV50="; + hash = "sha256-S2EmfYgCmZFZUcbNEghW4Qc0TO6KEb6DJyXCH5vcX1k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix index 46e225783493..6618e130067d 100644 --- a/pkgs/development/python-modules/flask-assets/default.nix +++ b/pkgs/development/python-modules/flask-assets/default.nix @@ -1,7 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + fetchpatch2, setuptools, flask, webassets, @@ -13,35 +14,37 @@ buildPythonPackage rec { version = "2.1.0"; pyproject = true; - src = fetchPypi { - pname = "Flask-Assets"; - inherit version; - hash = "sha256-+E1lMv/lnJ/zUoheh0D/TaJcC8+s2AXwqAaBXkQ1SBM="; + src = fetchFromGitHub { + owner = "miracle2k"; + repo = "flask-assets"; + rev = "refs/tags/${version}"; + hash = "sha256-R6cFTT+r/i5j5/QQ+cCFmeuO7SNTiV1F+e0JTxwIUGY="; }; - patchPhase = '' - substituteInPlace tests/test_integration.py --replace 'static_path=' 'static_url_path=' - substituteInPlace tests/test_integration.py --replace "static_folder = '/'" "static_folder = '/x'" - substituteInPlace tests/test_integration.py --replace "'/foo'" "'/x/foo'" - ''; + patches = [ + # On master branch but not in a release. + (fetchpatch2 { + name = "refactor-with-pytest.patch"; + url = "https://github.com/miracle2k/flask-assets/commit/56e06dbb160c165e0289ac97496354786fe3f3fd.patch?full_index=1"; + hash = "sha256-Feo7gHHmHtWRB+3XvlECdU4i5rpyjyKEYEUCuy24rf4="; + }) + ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ flask webassets ]; - doCheck = false; # tests are broken with webassets 2.0 - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "flask_assets" ]; - meta = with lib; { + meta = { homepage = "https://github.com/miracle2k/flask-assets"; description = "Asset management for Flask, to compress and merge CSS and Javascript files"; - license = licenses.bsd2; - maintainers = with maintainers; [ abbradar ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/python-modules/flask-babelex/default.nix b/pkgs/development/python-modules/flask-babelex/default.nix deleted file mode 100644 index 6fc4381c602f..000000000000 --- a/pkgs/development/python-modules/flask-babelex/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - flask, - babel, - speaklater, - jinja2, - pytestCheckHook, - pytz, -}: - -buildPythonPackage rec { - pname = "flask-babelex"; - version = "0.9.4"; - format = "setuptools"; - - src = fetchPypi { - inherit version; - pname = "Flask-BabelEx"; - sha256 = "09yfr8hlwvpgvq8kp1y7qbnnl0q28hi0348bv199ssiqx779r99r"; - }; - - propagatedBuildInputs = [ - flask - babel - speaklater - jinja2 - ]; - - nativeCheckInputs = [ - pytestCheckHook - pytz - ]; - - pytestFlagsArray = [ "tests/tests.py" ]; - - disabledTests = [ - # Disabled 3 tests failing due to string representations of dates: - # Like "12. April 2010 um 15:46:00 MESZ" != 12. "April 2010 15:46:00 MESZ" - "test_init_app" - "test_custom_locale_selector" - "test_basics" - "test_non_initialized" - "test_refreshing" - ]; - - meta = with lib; { - description = "Adds i18n/l10n support to Flask applications"; - homepage = "https://github.com/mrjoes/flask-babelex"; - license = licenses.bsd3; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index 0f733a1b9a38..29e997acdf9a 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { "Redis" "Memcache" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # ignore flaky test "test_cache_timeout_dynamic" "test_cached_view_class" diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index 130c767c39f4..c0239f2a6c86 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -6,6 +6,7 @@ setuptools, setuptools-scm, flask, + flask-caching, zstandard, brotli, brotlicffi, @@ -13,7 +14,7 @@ }: buildPythonPackage rec { - version = "1.15"; + version = "1.17"; pname = "flask-compress"; pyproject = true; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "colour-science"; repo = "flask-compress"; rev = "refs/tags/v${version}"; - hash = "sha256-J7d/OIUsDWM6DoXS0P4EOE3k6txXKm6m4Yq/EJk6FRE="; + hash = "sha256-87fjJxaS7eJbOkSUljnhqFIeahoS4L2tAOhmv4ryVUM="; }; build-system = [ @@ -34,7 +35,10 @@ buildPythonPackage rec { zstandard ] ++ lib.optionals (!isPyPy) [ brotli ] ++ lib.optionals isPyPy [ brotlicffi ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + flask-caching + ]; pythonImportsCheck = [ "flask_compress" ]; diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index b9d62fcbd8e0..cd788642dd5c 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "flask-cors"; - version = "4.0.1"; + version = "4.0.2"; pyproject = true; src = fetchFromGitHub { owner = "corydolphin"; repo = "flask-cors"; rev = "refs/tags/${version}"; - hash = "sha256-ISot5KglCjfbJNsnveDLK44vVaapHRAFdS+1tOd08pw="; + hash = "sha256-I1iCnUT0+ZThf+c9Vm9GgH5hYL/pcBReOjKJGRNsRrg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index d05524e905fb..00c986235587 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -31,11 +31,11 @@ buildPythonPackage rec { werkzeug ]; - passthru.optional-dependencies.asymmetric_crypto = [ cryptography ]; + optional-dependencies.asymmetric_crypto = [ cryptography ]; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "flask_jwt_extended" ]; diff --git a/pkgs/development/python-modules/flask-mail/default.nix b/pkgs/development/python-modules/flask-mail/default.nix index 104d6f3da2b0..0f1e4e227e6b 100644 --- a/pkgs/development/python-modules/flask-mail/default.nix +++ b/pkgs/development/python-modules/flask-mail/default.nix @@ -31,6 +31,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ + # Broken by fix for CVE-2023-27043. + # Reported upstream in https://github.com/pallets-eco/flask-mail/issues/233 + "test_unicode_sender_tuple" + "test_unicode_sender" + ]; + meta = { description = "Flask extension providing simple email sending capabilities"; homepage = "https://github.com/pallets-eco/flask-mail"; diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix index 69ad443789ed..68ce1cd451ed 100644 --- a/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -25,21 +25,21 @@ buildPythonPackage rec { hash = "sha256-GQLkt/CJf/QI8emvlW8xSRziGnncwfMSxBccW0Bb8I0="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ flask marshmallow ]; - passthru.optional-dependencies = { + optional-dependencies = { sqlalchemy = [ flask-sqlalchemy marshmallow-sqlalchemy ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.sqlalchemy; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.sqlalchemy; pythonImportsCheck = [ "flask_marshmallow" ]; diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index 65ba830e9103..8fa9a2333561 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { mongoengine ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { wtf = [ flask-wtf wtforms diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index ca27a3292c05..5b25b9fc610e 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -59,6 +59,9 @@ buildPythonPackage rec { # Broke in werkzeug 2.3 upgrade "test_media_types_method" "test_media_types_q" + # time shenanigans + "test_iso8601_date_field_with_offset" + "test_rfc822_date_field_with_offset" ]; pythonImportsCheck = [ "flask_restful" ]; diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index 55f41f6f7737..a817e75cb91b 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { "--deselect=tests/test_inputs.py::EmailTest::test_valid_value_check" "--deselect=tests/test_logging.py::LoggingTest::test_override_app_level" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--deselect=tests/test_inputs.py::EmailTest::test_invalid_values_check" ]; @@ -73,6 +73,12 @@ buildPythonPackage rec { # broken in werkzeug 2.3 upgrade "test_media_types_method" "test_media_types_q" + # erroneous use of pytz + # https://github.com/python-restx/flask-restx/issues/620 + # two fixes are proposed: one fixing just tests, and one removing pytz altogether. + # we disable the tests in the meanwhile and let upstream decide + "test_rfc822_value" + "test_iso8601_value" ]; pythonImportsCheck = [ "flask_restx" ]; diff --git a/pkgs/development/python-modules/flask-session-captcha/default.nix b/pkgs/development/python-modules/flask-session-captcha/default.nix index 675afdcb2b38..b1ef27fb3c67 100644 --- a/pkgs/development/python-modules/flask-session-captcha/default.nix +++ b/pkgs/development/python-modules/flask-session-captcha/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "flask-session-captcha"; - version = "1.4.2"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Tethik"; repo = "flask-session-captcha"; rev = "refs/tags/v${version}"; - hash = "sha256-hf6ifTrsWvgvUHFAPdS8ns8aKN02zquLGCq5ouQF0ck="; + hash = "sha256-2JPJx8yQIl0bbcbshONJtja7BnSiieHzHi64A6jLpc0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/flask-simpleldap/default.nix b/pkgs/development/python-modules/flask-simpleldap/default.nix new file mode 100644 index 000000000000..9ba36f1b4d25 --- /dev/null +++ b/pkgs/development/python-modules/flask-simpleldap/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + flask, + python-ldap, + setuptools, +}: + +buildPythonPackage rec { + pname = "flask-simpleldap"; + version = "2.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "alexferl"; + repo = "flask-simpleldap"; + rev = "refs/tags/v${version}"; + hash = "sha256-WcedTtEwaSc3BYFE3L0FZrtKKdbwk7r3qSPP8evtYlc="; + }; + + build-system = [ + setuptools + ]; + dependencies = [ + flask + python-ldap + ]; + + pythonImportsCheck = [ "flask_simpleldap" ]; + + meta = with lib; { + description = "LDAP authentication extension for Flask"; + homepage = "https://github.com/alexferl/flask-simpleldap"; + license = licenses.mit; + maintainers = with maintainers; [ kip93 ]; + }; +} diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index 75a8044d85b0..6235c3ebac39 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flask-socketio"; - version = "5.3.7"; + version = "5.4.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "Flask-SocketIO"; rev = "refs/tags/v${version}"; - hash = "sha256-3vqhxz+NPrpjTxNt4scZtPxaFfnM3+gyE+jegwgan2E="; + hash = "sha256-owlgbw0QBUz2wCBxd1rjMI+4nPVTZ6JgmU2tL+vIj5g="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/flask-testing/default.nix b/pkgs/development/python-modules/flask-testing/default.nix index 6574dcf1613e..07d410fa1b17 100644 --- a/pkgs/development/python-modules/flask-testing/default.nix +++ b/pkgs/development/python-modules/flask-testing/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ]; # Some of the tests use localhost networking on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTests = [ # RuntimeError and NotImplementedError diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index 487c2c997b8e..09fa23575fa4 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { wtforms ]; - passthru.optional-dependencies = { + optional-dependencies = { email = [ email-validator ]; }; diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index d8effec2045e..850dba14f28e 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { werkzeug ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ asgiref ]; dotenv = [ python-dotenv ]; }; @@ -58,7 +58,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ greenlet ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (builtins.attrValues optional-dependencies); passthru.tests = { inherit diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index 098e6cf28e6b..9ee281ed5dba 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -21,26 +21,31 @@ # checks cloudpickle, einops, + flaxlib, keras, - pytest-xdist, pytestCheckHook, + pytest-xdist, + sphinx, tensorflow, treescope, # optional-dependencies matplotlib, + + writeScript, + tomlq, }: buildPythonPackage rec { pname = "flax"; - version = "0.9.0"; + version = "0.10.1"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "flax"; rev = "refs/tags/v${version}"; - hash = "sha256-iDWuUJKO7V4QrbVsS4ALgy6fbllOC43o7W4mhjtZ9xc="; + hash = "sha256-+URbQGnmqmSNgucEyWvI5DMnzXjpmJzLA+Pho2lX+S4="; }; build-system = [ @@ -60,7 +65,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ matplotlib ]; }; @@ -69,9 +74,11 @@ buildPythonPackage rec { nativeCheckInputs = [ cloudpickle einops + flaxlib keras - pytest-xdist pytestCheckHook + pytest-xdist + sphinx tensorflow treescope ]; @@ -108,6 +115,14 @@ buildPythonPackage rec { "test_vmap_and_cond_passthrough_error" # AssertionError: "at vmap.*'broadcast'.*got axis spec ... ]; + passthru = { + updateScript = writeScript "update.sh" '' + nix-update flax # does not --build by default + nix-build . -A flax.src # src is essentially a passthru + nix-update flaxlib --version="$(${lib.getExe tomlq} <result/Cargo.toml .something.version)" --commit + ''; + }; + meta = { description = "Neural network library for JAX"; homepage = "https://github.com/google/flax"; diff --git a/pkgs/development/python-modules/flaxlib/default.nix b/pkgs/development/python-modules/flaxlib/default.nix new file mode 100644 index 000000000000..bb49634b6034 --- /dev/null +++ b/pkgs/development/python-modules/flaxlib/default.nix @@ -0,0 +1,65 @@ +{ + lib, + buildPythonPackage, + flax, + tomlq, + rustPlatform, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "flaxlib"; + version = "0.0.1-a1"; + pyproject = true; + + inherit (flax) src; + + sourceRoot = "${src.name}/flaxlib"; + + postPatch = '' + expected_version="$version" + actual_version=$(${lib.getExe tomlq} --file Cargo.toml "package.version") + + if [ "$actual_version" != "$expected_version" ]; then + echo -e "\n\tERROR:" + echo -e "\tThe version of the flaxlib python package ($expected_version) does not match the one in its Cargo.toml file ($actual_version)" + echo -e "\tPlease update the version attribute of the nix python3Packages.flaxlib package." + exit 1 + fi + ''; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit + pname + version + src + sourceRoot + ; + hash = "sha256-RPbMHnRdJaWKLU9Rkz39lmfibO20dnfZmLZqehHM3w4="; + }; + + nativeBuildInputs = [ + rustPlatform.maturinBuildHook + rustPlatform.cargoSetupHook + ]; + + pythonImportsCheck = [ "flaxlib" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # This package does not have tests (yet ?) + doCheck = false; + + passthru = { + inherit (flax) updateScript; + }; + + meta = { + description = "Rust library used internally by flax"; + homepage = "https://github.com/google/flax/tree/main/flaxlib"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/flet/default.nix b/pkgs/development/python-modules/flet/default.nix index 7857ff562737..d35a99194358 100644 --- a/pkgs/development/python-modules/flet/default.nix +++ b/pkgs/development/python-modules/flet/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "cookiecutter" "packaging" + "qrcode" "watchdog" "websockets" ]; diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/pkgs/development/python-modules/flickrapi/default.nix index 9f55251a2c99..9bbd11bd65b6 100644 --- a/pkgs/development/python-modules/flickrapi/default.nix +++ b/pkgs/development/python-modules/flickrapi/default.nix @@ -9,23 +9,32 @@ pytestCheckHook, responses, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "flickrapi"; version = "2.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sybrenstuvel"; - repo = pname; + repo = "flickrapi"; rev = "version-${version}"; hash = "sha256-vRZrlXKI0UDdmDevh3XUngH4X8G3VlOCSP0z/rxhIgw="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace tests/test_tokencache.py \ + --replace-fail "assertEquals" "assertEqual" \ + --replace-fail "assertNotEquals" "assertNotEqual" + ''; + + build-system = [ setuptools ]; + + dependencies = [ requests requests-toolbelt requests-oauthlib @@ -61,6 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to the Flickr API"; homepage = "https://stuvel.eu/flickrapi"; + changelog = "https://github.com/sybrenstuvel/flickrapi/blob/version-${version}/CHANGELOG.md"; license = licenses.psfl; maintainers = with maintainers; [ obadz ]; }; diff --git a/pkgs/development/python-modules/flit-core/default.nix b/pkgs/development/python-modules/flit-core/default.nix index 05157efb8648..628234d2955f 100644 --- a/pkgs/development/python-modules/flit-core/default.nix +++ b/pkgs/development/python-modules/flit-core/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { inherit (flit) src patches; - sourceRoot = "${src.name}/flit_core"; + postPatch = "cd flit_core"; # Tests are run in the "flit" package. doCheck = false; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 9284de7d1184..825e4435535a 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -28,6 +28,11 @@ buildPythonPackage rec { hash = "sha256-yl2+PcKr7xRW4oIBWl+gzh/nKhSNu5GH9fWKRGgaNHU="; }; + patches = [ + # https://github.com/pypa/flit/commit/6ab62c91d0db451b5e9ab000f0dba5471550b442.patch + ./python314-compat.patch + ]; + nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flit/python314-compat.patch b/pkgs/development/python-modules/flit/python314-compat.patch new file mode 100644 index 000000000000..439592e3a63b --- /dev/null +++ b/pkgs/development/python-modules/flit/python314-compat.patch @@ -0,0 +1,41 @@ +From 6ab62c91d0db451b5e9ab000f0dba5471550b442 Mon Sep 17 00:00:00 2001 +From: Thomas A Caswell <tcaswell@gmail.com> +Date: Tue, 28 May 2024 10:25:13 -0400 +Subject: [PATCH] MNT: fix compatibility with Python 3.14 + +The ast.Str class was deprecated in 3.8 and will be removed in 3.14 +--- + flit_core/flit_core/common.py | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/flit_core/flit_core/common.py b/flit_core/flit_core/common.py +index 6625224b..8bcda3fb 100644 +--- a/flit_core/flit_core/common.py ++++ b/flit_core/flit_core/common.py +@@ -148,6 +148,10 @@ def get_docstring_and_version_via_ast(target): + with target_path.open('rb') as f: + node = ast.parse(f.read()) + for child in node.body: ++ if sys.version_info >= (3, 8): ++ target_type = ast.Constant ++ else: ++ target_type = ast.Str + # Only use the version from the given module if it's a simple + # string assignment to __version__ + is_version_str = ( +@@ -157,10 +161,13 @@ def get_docstring_and_version_via_ast(target): + and target.id == "__version__" + for target in child.targets + ) +- and isinstance(child.value, ast.Str) ++ and isinstance(child.value, target_type) + ) + if is_version_str: +- version = child.value.s ++ if sys.version_info >= (3, 8): ++ version = child.value.value ++ else: ++ version = child.value.s + break + return ast.get_docstring(node), version + diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index d9c61a791615..268c7387502b 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -1,30 +1,35 @@ { lib, buildPythonPackage, + duckdb, + elastic-transport, elasticsearch, fastavro, fetchFromGitHub, + httpx, lz4, + maxminddb, msgpack, pytest7CheckHook, pythonOlder, - setuptools, + pytz, setuptools-scm, + setuptools, zstandard, }: buildPythonPackage rec { pname = "flow-record"; - version = "3.15"; + version = "3.17"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "flow.record"; rev = "refs/tags/${version}"; - hash = "sha256-j5N66p7feB9Ae+Fu5RhVzh8XCHiq55jJMg0Fe+C6Jvg="; + hash = "sha256-fFP2bdO4wTR9Y+9no3FabtVmLicTD76Jw5aWDMPOB0w="; }; build-system = [ @@ -34,18 +39,25 @@ buildPythonPackage rec { dependencies = [ msgpack ]; - passthru.optional-dependencies = { + optional-dependencies = { compression = [ lz4 zstandard ]; + duckdb = [ + duckdb + pytz + ]; elastic = [ elasticsearch ]; + geoip = [ maxminddb ]; avro = [ fastavro ] ++ fastavro.optional-dependencies.snappy; + splunk = [ httpx ]; }; nativeCheckInputs = [ + elastic-transport pytest7CheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "flow.record" ]; diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index 3c1b2ce83efd..f11178381f4b 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -5,7 +5,7 @@ fetchPypi, hatchling, psutil, - pytest-cov, + pytest-cov-stub, pytestCheckHook, pythonOlder, sybil, @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub sybil ]; diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 291b56d32cb6..79fd9f10f266 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -6,14 +6,15 @@ webcolors, pythonOlder, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "flux-led"; version = "1.0.4"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Danielhiversen"; @@ -22,29 +23,42 @@ buildPythonPackage rec { hash = "sha256-enYo2hZ1C8jqO+8xZhSmIOJQAyrtVUJ9S/e2Bxzhv0I="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace setup.py \ + --replace-fail '"pytest-runner>=5.2",' "" + # webcolors API change, https://github.com/Danielhiversen/flux_led/issues/401 + substituteInPlace flux_led/utils.py \ + --replace-fail "CSS2_HEX_TO_NAMES.values()" 'names("css2")' \ + --replace-fail "CSS21_HEX_TO_NAMES.values()" 'names("css21")' \ + --replace-fail "CSS3_HEX_TO_NAMES.values()" 'names("css3")' \ + --replace-fail "HTML4_HEX_TO_NAMES.values()" 'names("html4")' + ''; + + build-system = [ setuptools ]; + + dependencies = [ async-timeout webcolors ]; nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace '"pytest-runner>=5.2",' "" - ''; - pytestFlagsArray = [ "tests.py" ]; pythonImportsCheck = [ "flux_led" ]; + # disabledTests = [ + # # AttributeError: module 'webcolors' has no attribute 'CSS2_HEX_TO_NAMES' + # "test_get_color_names_list" + # ]; + meta = with lib; { description = "Python library to communicate with the flux_led smart bulbs"; - mainProgram = "flux_led"; homepage = "https://github.com/Danielhiversen/flux_led"; changelog = "https://github.com/Danielhiversen/flux_led/releases/tag/${version}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ colemickens ]; platforms = platforms.linux; + mainProgram = "flux_led"; }; } diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 8be25eafc613..d8e2e317dbba 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "folium"; - version = "0.17.0"; + version = "0.18.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "python-visualization"; repo = "folium"; rev = "refs/tags/v${version}"; - hash = "sha256-uKT6WqT3pI3rqfV/3CA+mXBk3F7h4RWW1h2FPIy0JH4="; + hash = "sha256-TNj3javEETjWpI3xs1y/AuKHqFwnTBmWORZK2fafKqI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/font-v/default.nix b/pkgs/development/python-modules/font-v/default.nix index 4f1a22a640d0..945f77698ef7 100644 --- a/pkgs/development/python-modules/font-v/default.nix +++ b/pkgs/development/python-modules/font-v/default.nix @@ -26,7 +26,6 @@ buildPythonPackage rec { gitpython ]; - doCheck = true; nativeCheckInputs = [ git pytestCheckHook diff --git a/pkgs/development/python-modules/fontbakery/default.nix b/pkgs/development/python-modules/fontbakery/default.nix index c875392e62f3..5d7a30fdfa50 100644 --- a/pkgs/development/python-modules/fontbakery/default.nix +++ b/pkgs/development/python-modules/fontbakery/default.nix @@ -47,16 +47,18 @@ buildPythonPackage rec { pname = "fontbakery"; - version = "0.12.9"; + version = "0.12.10"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Cl0jRQqF83IIldkp1VuVSS4ZeVsQH1NNpyEkpMJqhA8="; + hash = "sha256-+9O7cAE6CUATvybG22qULNNHi94zSGqU9UjhvrF9R8k="; }; + env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + pythonRelaxDeps = [ "collidoscope" "protobuf" @@ -127,7 +129,7 @@ buildPythonPackage rec { ''; disabledTests = [ - # These require network access: + # These require network access "test_check_description_broken_links" "test_check_description_family_update" "test_check_metadata_designer_profiles" @@ -138,6 +140,8 @@ buildPythonPackage rec { "test_check_cjk_vertical_metrics" "test_check_cjk_vertical_metrics_regressions" "test_check_fontbakery_version_live_apis" + # AssertionError + "test_check_shape_languages" ]; postInstall = '' diff --git a/pkgs/development/python-modules/fontfeatures/default.nix b/pkgs/development/python-modules/fontfeatures/default.nix index b6a4482b4ba4..11943c36e05b 100644 --- a/pkgs/development/python-modules/fontfeatures/default.nix +++ b/pkgs/development/python-modules/fontfeatures/default.nix @@ -31,7 +31,6 @@ buildPythonPackage rec { youseedee ]; - doCheck = true; nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ # These tests require babelfont but we have to leave it out and skip them diff --git a/pkgs/development/python-modules/fontmath/default.nix b/pkgs/development/python-modules/fontmath/default.nix index e37bdd0ade4d..95392c1aa5b6 100644 --- a/pkgs/development/python-modules/fontmath/default.nix +++ b/pkgs/development/python-modules/fontmath/default.nix @@ -10,15 +10,14 @@ buildPythonPackage rec { pname = "fontmath"; - version = "0.9.3"; + version = "0.9.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "fontMath"; - inherit version; - hash = "sha256-alOHy3/rEFlY2y9c7tyHhRPMNb83FeJiCQ8FV74MGxw="; + inherit pname version; + hash = "sha256-H9kZDJ14ThMFw8SXcbkdkQ8kakt8RO3iGcmaB+167aQ="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix index d8eb655b4924..21a89983447e 100644 --- a/pkgs/development/python-modules/fontparts/default.nix +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -21,33 +21,23 @@ buildPythonPackage rec { pname = "fontparts"; - version = "0.12.1"; + version = "0.12.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "fontParts"; - inherit version; - hash = "sha256-eeU13S1IcC+bsiK3YDlT4rVDeXDGcxx1wY/is8t5pCA="; + inherit pname version; + hash = "sha256-d41ZVJOiCPITRjgGajBZh2JhnV345yPTCiTEGJzPoQ0="; extension = "zip"; }; - patches = [ - (fetchpatch2 { - # replace remaining usage of assertEquals for Python 3.12 support - # https://github.com/robotools/fontParts/pull/720 - url = "https://github.com/robotools/fontParts/commit/d7484cd98051aa1588683136da0bb99eac31523b.patch"; - hash = "sha256-maoUgbmXY/RC4TUZI4triA9OIfB4T98qjUaQ94uhsbg="; - }) - ]; - - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = + dependencies = [ booleanoperations defcon diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index c57065ec64fb..555c9cb9bf7b 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.53.1"; + version = "4.54.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "fonttools"; repo = "fonttools"; rev = "refs/tags/${version}"; - hash = "sha256-9fxC6OKXZkhih3BFyBqO4t6sKXyarYfFIqBk+WOSiRY="; + hash = "sha256-iYd3EiziaLR7zS0UQAje0QfShNfnhHPdH2+noCQ2yto="; }; build-system = [ @@ -61,7 +61,7 @@ buildPythonPackage rec { ]; plot = [ matplotlib ]; symfont = [ sympy ]; - type1 = lib.optional stdenv.isDarwin xattr; + type1 = lib.optional stdenv.hostPlatform.isDarwin xattr; pathops = [ skia-pathops ]; repacker = [ uharfbuzz ]; }; diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index 246c97aa9c01..3cf3b2beb1b8 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "foolscap"; - version = "23.3.0"; + version = "24.9.0"; pyproject = true; build-system = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-Vu7oXC1brsgBwr2q59TAgx8j1AFRbi5mjRNIWZTbkUU="; + hash = "sha256-vWsAdUDbWQuG3e0oAtLq8rA4Ys2wg38fD/h+E1ViQQg="; }; postPatch = '' @@ -42,7 +42,7 @@ buildPythonPackage rec { pyopenssl ] ++ twisted.optional-dependencies.tls; - passthru.optional-dependencies = { + optional-dependencies = { i2p = [ txi2p-tahoe ]; tor = [ txtorcon ]; }; @@ -50,7 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "foolscap" ]; diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix index af7edb24ae95..f9faef8be2bd 100644 --- a/pkgs/development/python-modules/foxdot/default.nix +++ b/pkgs/development/python-modules/foxdot/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { [ tkinter ] # we currently build SuperCollider only on Linux # but FoxDot is totally usable on macOS with the official SuperCollider binary - ++ lib.optionals stdenv.isLinux [ supercollider ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ supercollider ]; # Requires a running SuperCollider instance doCheck = false; diff --git a/pkgs/development/python-modules/fpdf2/default.nix b/pkgs/development/python-modules/fpdf2/default.nix index 2cd654ded25a..cc452a0ccb1c 100644 --- a/pkgs/development/python-modules/fpdf2/default.nix +++ b/pkgs/development/python-modules/fpdf2/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "fpdf2"; - version = "2.7.9"; + version = "2.8.1"; pyproject = true; src = fetchFromGitHub { owner = "py-pdf"; repo = "fpdf2"; rev = "refs/tags/${version}"; - hash = "sha256-8CuK8ZFn4msOSNIdgOFjD3ygVeiBUw4/Bc3w1J6Kn9U="; + hash = "sha256-MYurl/nEZhdhGxeNalwTWnZ8lr9SYJBR7hIjBZLOrJU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/free-proxy/default.nix b/pkgs/development/python-modules/free-proxy/default.nix index 4d67d2896149..8db5b1483af7 100644 --- a/pkgs/development/python-modules/free-proxy/default.nix +++ b/pkgs/development/python-modules/free-proxy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "free-proxy"; - version = "1.1.2"; + version = "1.1.3"; pyproject = true; src = fetchFromGitHub { owner = "jundymek"; repo = "free-proxy"; rev = "refs/tags/v${version}"; - hash = "sha256-5eYioshdqUC5QWHqMIU6+GvInihSOJxWvMlJ/xad/3I="; + hash = "sha256-8SxKGGifQTU0CUrtUQUtrmeq+Do4GIqNUWAdCt++eUA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/freud/default.nix b/pkgs/development/python-modules/freud/default.nix index a681bd1f14b1..9fa555e28170 100644 --- a/pkgs/development/python-modules/freud/default.nix +++ b/pkgs/development/python-modules/freud/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { matplotlib sympy ]; - disabledTests = lib.optionals stdenv.isAarch64 [ + disabledTests = lib.optionals stdenv.hostPlatform.isAarch64 [ # https://github.com/glotzerlab/freud/issues/961 "test_docstring" ]; diff --git a/pkgs/development/python-modules/frida-python/default.nix b/pkgs/development/python-modules/frida-python/default.nix index d73e5645e517..8bef789110cf 100644 --- a/pkgs/development/python-modules/frida-python/default.nix +++ b/pkgs/development/python-modules/frida-python/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ typing-extensions ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 4ed60bd8a704..84afd730f495 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -6,25 +6,28 @@ pytestCheckHook, requests, segno, + setuptools, }: buildPythonPackage rec { pname = "fritzconnection"; - version = "1.13.2"; - format = "setuptools"; + version = "1.14.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kbr"; - repo = pname; + repo = "fritzconnection"; rev = "refs/tags/${version}"; - hash = "sha256-nWXtXhF2pUBxHdrivi4DA7+bFiZPyxb2nqsiN3j4HdI="; + hash = "sha256-1LLfSEOKqUIhWIR/RQEG0Bp41d908hAKDlslJlWCHys="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; - passthru.optional-dependencies = { + dependencies = [ requests ]; + + optional-dependencies = { qr = [ segno ]; }; diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index 6e1d469ba34f..092cf21301c7 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "frozendict"; - version = "2.4.4"; + version = "2.4.6"; pyproject = true; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Marco-Sulla"; repo = "python-frozendict"; rev = "refs/tags/v${version}"; - hash = "sha256-TgXhffUvx74fU2SgDV04R1yS9xGbiP/ksQ+3KGT5bdQ="; + hash = "sha256-cdKI0wIr0w6seV12cigqyJL6PSkLVzwVxASUB8n7lFY="; }; # build C version if it exists diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 5941243645ef..9d1fded19c1b 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -1,56 +1,50 @@ { lib, - glibcLocales, + stdenv, + appdirs, buildPythonPackage, fetchPypi, - setuptools, - six, - appdirs, - scandir ? null, - backports_os ? null, - typing ? null, - pytz, - enum34, - pyftpdlib, - psutil, + glibcLocales, mock, - pythonAtLeast, - isPy3k, + psutil, + pyftpdlib, pytestCheckHook, - stdenv, + pythonAtLeast, + pythonOlder, + pytz, + setuptools, + six, }: buildPythonPackage rec { pname = "fs"; version = "2.4.16"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; hash = "sha256-rpfH1RIT9LcLapWCklMCiQkN46fhWEHhCPvhRPBp0xM="; }; + build-system = [ setuptools ]; + buildInputs = [ glibcLocales ]; - # strong cycle with parameterized - doCheck = false; + dependencies = [ + six + appdirs + pytz + setuptools + ]; + nativeCheckInputs = [ pyftpdlib mock psutil pytestCheckHook ]; - propagatedBuildInputs = - [ - six - appdirs - pytz - setuptools - ] - ++ lib.optionals (!isPy3k) [ backports_os ] - ++ lib.optionals (!pythonAtLeast "3.6") [ typing ] - ++ lib.optionals (!pythonAtLeast "3.5") [ scandir ] - ++ lib.optionals (!pythonAtLeast "3.5") [ enum34 ]; LC_ALL = "en_US.utf-8"; @@ -58,11 +52,14 @@ buildPythonPackage rec { HOME=$(mktemp -d) ''; + # strong cycle with parameterized + doCheck = false; + pytestFlagsArray = [ "--ignore=tests/test_opener.py" ]; disabledTests = [ "user_data_repr" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # remove if https://github.com/PyFilesystem/pyfilesystem2/issues/430#issue-707878112 resolved "test_ftpfs" ] @@ -77,6 +74,7 @@ buildPythonPackage rec { meta = with lib; { description = "Filesystem abstraction"; homepage = "https://github.com/PyFilesystem/pyfilesystem2"; + changelog = "https://github.com/PyFilesystem/pyfilesystem2/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/fschat/default.nix b/pkgs/development/python-modules/fschat/default.nix index d086073f1a4d..d86fd4d91062 100644 --- a/pkgs/development/python-modules/fschat/default.nix +++ b/pkgs/development/python-modules/fschat/default.nix @@ -63,7 +63,7 @@ buildPythonPackage { # ] ++ markdown2.optional-dependencies.all; ]; - passthru.optional-dependencies = { + optional-dependencies = { llm_judge = [ anthropic openai diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index e423f32d799e..8f6e77800b56 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { tqdm ]; - passthru.optional-dependencies = { + optional-dependencies = { entrypoints = [ ]; abfs = [ adlfs ]; adl = [ adlfs ]; @@ -110,10 +110,10 @@ buildPythonPackage rec { "test_urlpath_inference_errors" "test_mismatch" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # works locally on APFS, fails on hydra with AssertionError comparing timestamps # darwin hydra builder uses HFS+ and has only one second timestamp resolution - # this two tests however, assume nanosecond resolution + # this two tests however, assume nanosecond resolution "test_modified" "test_touch" # tries to access /home, ignores $HOME diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index d51041828a64..ec5aca9062a6 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, # build-system - poetry-core, + hatchling, # dependencies wcwidth, @@ -17,17 +17,19 @@ buildPythonPackage rec { pname = "ftfy"; - version = "6.2.3"; + version = "6.3.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ebUFmI8p1XelipBpr+dVU6AqRuQt5gkcBmDNxngSutw="; + src = fetchFromGitHub { + owner = "rspeer"; + repo = "python-ftfy"; + rev = "refs/tags/v${version}"; + hash = "sha256-TmwDJeUDcF+uOB2X5tMmnf9liCI9rP6dYJVmJoaqszo="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ wcwidth ]; @@ -42,12 +44,8 @@ buildPythonPackage rec { export PATH=$out/bin:$PATH ''; - disabledTestPaths = [ - # Calls poetry and fails to match output exactly - "tests/test_cli.py" - ]; - meta = with lib; { + changelog = "https://github.com/rspeer/python-ftfy/blob/${src.rev}/CHANGELOG.md"; description = "Given Unicode text, make its representation consistent and possibly less broken"; mainProgram = "ftfy"; homepage = "https://github.com/LuminosoInsight/python-ftfy"; diff --git a/pkgs/development/python-modules/fugashi/default.nix b/pkgs/development/python-modules/fugashi/default.nix index 99c0853b461c..ab617d626473 100644 --- a/pkgs/development/python-modules/fugashi/default.nix +++ b/pkgs/development/python-modules/fugashi/default.nix @@ -34,9 +34,9 @@ buildPythonPackage rec { nativeCheckInputs = [ ipadic pytestCheckHook - ] ++ passthru.optional-dependencies.unidic-lite; + ] ++ optional-dependencies.unidic-lite; - passthru.optional-dependencies = { + optional-dependencies = { unidic-lite = [ unidic-lite ]; unidic = [ unidic ]; }; diff --git a/pkgs/development/python-modules/funsor/default.nix b/pkgs/development/python-modules/funsor/default.nix index 6afeeb9e4cda..dda85f2c798d 100644 --- a/pkgs/development/python-modules/funsor/default.nix +++ b/pkgs/development/python-modules/funsor/default.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { # TODO: Try to re-enable this test at next release "test_torch_save" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Failures related to JIT # RuntimeError: required keyword attribute 'Subgraph' has the wrong type "test_local_param_ok" diff --git a/pkgs/development/python-modules/furl/default.nix b/pkgs/development/python-modules/furl/default.nix index 4b4f81d1a2aa..8fcaeb27d04a 100644 --- a/pkgs/development/python-modules/furl/default.nix +++ b/pkgs/development/python-modules/furl/default.nix @@ -36,8 +36,9 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals (pythonAtLeast "3.12") [ + disabledTests = [ # AssertionError: assert '//////path' == '////path' + # https://github.com/gruns/furl/issues/176 "test_odd_urls" ]; diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix index 26eab2292967..36e2f47663ed 100644 --- a/pkgs/development/python-modules/furo/default.nix +++ b/pkgs/development/python-modules/furo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "furo"; - version = "2024.5.6"; + version = "2024.8.6"; format = "wheel"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-SQoA0IwKN+zJDeA66SJ+jrXW9/dQ7fmAfzmKK98jWN4="; + hash = "sha256-bNl8WLR4E9NhnmPpCBFpiA++Mx8MqIPIcf8fPxGBT1w="; }; diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix index ddd6d394cd0c..35eab496d91b 100644 --- a/pkgs/development/python-modules/fuse-python/default.nix +++ b/pkgs/development/python-modules/fuse-python/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "fuse" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Python bindings for FUSE"; homepage = "https://github.com/libfuse/python-fuse"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/fusepy/default.nix b/pkgs/development/python-modules/fusepy/default.nix index 35718a54d635..01c858c72906 100644 --- a/pkgs/development/python-modules/fusepy/default.nix +++ b/pkgs/development/python-modules/fusepy/default.nix @@ -23,9 +23,9 @@ buildPythonPackage rec { # On macOS, users are expected to install macFUSE. This means fusepy should # be able to find libfuse in /usr/local/lib. - patchPhase = lib.optionalString (!stdenv.isDarwin) '' + patchPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace fuse.py --replace \ - "find_library('fuse')" "'${pkgs.fuse}/lib/libfuse.so'" + "find_library('fuse')" "'${lib.getLib pkgs.fuse}/lib/libfuse.so'" ''; meta = with lib; { diff --git a/pkgs/development/python-modules/fvcore/default.nix b/pkgs/development/python-modules/fvcore/default.nix index 6d00d662b055..a3f359bad457 100644 --- a/pkgs/development/python-modules/fvcore/default.nix +++ b/pkgs/development/python-modules/fvcore/default.nix @@ -52,7 +52,7 @@ buildPythonPackage { pythonImportsCheck = [ "fvcore" ]; - passthru.optional-dependencies = optional-dependencies; + optional-dependencies = optional-dependencies; meta = with lib; { description = "Collection of common code that's shared among different research projects in FAIR computer vision team"; diff --git a/pkgs/development/python-modules/fyta-cli/default.nix b/pkgs/development/python-modules/fyta-cli/default.nix index e3cf900417ac..ad3a255e58c0 100644 --- a/pkgs/development/python-modules/fyta-cli/default.nix +++ b/pkgs/development/python-modules/fyta-cli/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "fyta-cli"; - version = "0.6.6"; + version = "0.6.10"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "dontinelli"; repo = "fyta_cli"; rev = "refs/tags/v${version}"; - hash = "sha256-yuTfrWiGxoiEmQ1zaYM2ZrlrssZ+hCupPxar9SUP4uU="; + hash = "sha256-sPbN6gMPtNzYTYQ5F8w59m5DKobx/TV6v5v8Q9u1rXQ="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/gardena-bluetooth/default.nix b/pkgs/development/python-modules/gardena-bluetooth/default.nix index 38ad47244f22..b80c83d774c7 100644 --- a/pkgs/development/python-modules/gardena-bluetooth/default.nix +++ b/pkgs/development/python-modules/gardena-bluetooth/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gardena-bluetooth"; - version = "1.4.3"; + version = "1.4.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "elupus"; repo = "gardena-bluetooth"; rev = "refs/tags/${version}"; - hash = "sha256-H2v96G/mu17puq8jNyk6L9iuWUvRombPd+s6byNQ4Zw="; + hash = "sha256-BV4chGkVp9H7gJQGKQZ0e4IiizMjCbDAU5MMf7hS9mE="; }; build-system = [ poetry-core ]; @@ -34,7 +34,7 @@ buildPythonPackage rec { tzlocal ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ asyncclick ]; }; diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 1d1585521b23..0ea4c8d2cfcd 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.19"; + version = "0.2.20"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-v3Z6cUHqE52BJUgfyWMojwdbxWIEyNR8c/oNS9QEFeA="; + hash = "sha256-PFasW2rOfKwAjkqd690UXE3NNIjO3njBVYy5m+aXcfk="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/gb-io/default.nix b/pkgs/development/python-modules/gb-io/default.nix index 72504c986d2e..233d12f3eac6 100644 --- a/pkgs/development/python-modules/gb-io/default.nix +++ b/pkgs/development/python-modules/gb-io/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "gb_io" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/althonos/gb-io.py"; description = "Python interface to gb-io, a fast GenBank parser written in Rust"; license = licenses.mit; diff --git a/pkgs/development/python-modules/gbinder-python/default.nix b/pkgs/development/python-modules/gbinder-python/default.nix index d5ba3d6ad82c..24bf6109e8ac 100644 --- a/pkgs/development/python-modules/gbinder-python/default.nix +++ b/pkgs/development/python-modules/gbinder-python/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/erfanoabdi/gbinder-python"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ mcaju ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/gbulb/default.nix b/pkgs/development/python-modules/gbulb/default.nix deleted file mode 100644 index 8c4252e49029..000000000000 --- a/pkgs/development/python-modules/gbulb/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - stdenv, - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools-scm, - pygobject3, - pytestCheckHook, - gtk3, - gobject-introspection, -}: - -buildPythonPackage rec { - pname = "gbulb"; - version = "0.6.5"; - pyproject = true; - - src = fetchFromGitHub { - owner = "beeware"; - repo = "gbulb"; - rev = "refs/tags/v${version}"; - hash = "sha256-03Ott+V3Y4+Y72Llsug5coqG3C+pjAdLkPYbaY/6Uow="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "==" ">=" - ''; - - build-system = [ setuptools-scm ]; - - dependencies = [ pygobject3 ]; - - buildInputs = [ gtk3 ]; - - nativeCheckInputs = [ - pytestCheckHook - gobject-introspection - ]; - - disabledTests = [ - "test_glib_events.TestBaseGLibEventLoop" # Somtimes fail due to imprecise timing - ]; - - pythonImportsCheck = [ "gbulb" ]; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "GLib implementation of PEP 3156"; - homepage = "https://github.com/beeware/gbulb"; - license = licenses.asl20; - maintainers = with maintainers; [ marius851000 ]; - }; -} diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix index 2c42a1008ad1..07b255e804fc 100644 --- a/pkgs/development/python-modules/gcal-sync/default.nix +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "6.1.4"; + version = "6.2.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-aKLuv/hH9ZVM8WeUwCtJ6BB2/aQh6NHJKh890hR23eM="; + hash = "sha256-424PRKjQnpb6fH+iSAqkoOhlvugW7W3wjUxCHTc/A20="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index c6ec91b5946b..0344d56a5dfe 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -7,22 +7,25 @@ lxml, pygments, pythonOlder, + setuptools, tomli, }: buildPythonPackage rec { pname = "gcovr"; - version = "7.2"; - format = "setuptools"; + version = "8.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-4+lctWyojbvnQctdaaor5JTrL8KgnuT2UWRKZw7lrrM="; + hash = "sha256-mh3d1FhdE+x3VV211rajHugVh+pvxgT/n80jLLB4LfU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ colorlog jinja2 lxml @@ -41,10 +44,10 @@ buildPythonPackage rec { 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 = lib.licenses.bsd0; maintainers = with lib.maintainers; [ sigmanificient ]; + mainProgram = "gcovr"; }; } diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix index 84e5eea81583..a6aad3f63261 100644 --- a/pkgs/development/python-modules/gehomesdk/default.nix +++ b/pkgs/development/python-modules/gehomesdk/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "gehomesdk"; - version = "0.5.28"; + version = "0.5.29"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-TAPuP0VFhKuWDzko/+Upq6GDGZJO9y6GuuV6GsSqi2I="; + hash = "sha256-sV5V+D0K02qmP9Z0WqYSvNsKTeXkdrY9CsRtvYq1JcE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 61ce59689b64..c13babd7e4d9 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -1,9 +1,10 @@ { lib, buildPythonPackage, - cython, + cython_0, + oldest-supported-numpy, + setuptools, fetchPypi, - fetchpatch, mock, numpy, scipy, @@ -15,29 +16,24 @@ buildPythonPackage rec { pname = "gensim"; - version = "4.3.2"; - format = "setuptools"; + version = "4.3.3"; + pyproject = true; - disabled = pythonOlder "3.8"; + # C code generated with CPython3.12 does not work cython_0. + disabled = !(pythonOlder "3.12"); src = fetchPypi { inherit pname version; - hash = "sha256-maxq9v/UBoLnAVXtn5Lsv0OE1Z+1CvEg00PqXuGzCKs="; + hash = "sha256-hIUgdqaj2I19rFviReJMIcO4GbVl4UwbYfo+Xudtz1c="; }; - patches = [ - # https://github.com/piskvorky/gensim/pull/3524 - # Import deprecated scipy.linalg.triu from numpy.triu. remove on next update - (fetchpatch { - name = "scipi-linalg-triu-fix.patch"; - url = "https://github.com/piskvorky/gensim/commit/ad68ee3f105fc37cf8db333bfb837fe889ff74ac.patch"; - hash = "sha256-Ij6HvVD8M2amzcjihu5bo8Lk0iCPl3iIq0lcOnI6G2s="; - }) + build-system = [ + cython_0 + oldest-supported-numpy + setuptools ]; - nativeBuildInputs = [ cython ]; - - propagatedBuildInputs = [ + dependencies = [ smart-open numpy scipy @@ -49,6 +45,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonRelaxDeps = [ + "scipy" + ]; + pythonImportsCheck = [ "gensim" ]; # Test setup takes several minutes diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index 45b9545397ab..d7440c5c43e8 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -3,15 +3,16 @@ aiohttp, buildPythonPackage, fetchPypi, - setuptools, - setuptools-scm, + h11, maxminddb, mocket, pytestCheckHook, pythonAtLeast, pythonOlder, - requests, requests-mock, + requests, + setuptools-scm, + setuptools, urllib3, }: @@ -40,6 +41,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + h11 mocket requests-mock pytestCheckHook diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index e8e78f80acc6..4b8f06c50b08 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -13,6 +13,17 @@ pyproj, rtree, shapely, + + # optional-dependencies + folium, + geoalchemy2, + geopy, + mapclassify, + matplotlib, + psycopg, + pyarrow, + sqlalchemy, + xyzservices, }: buildPythonPackage rec { @@ -39,12 +50,32 @@ buildPythonPackage rec { shapely ]; + optional-dependencies = { + all = [ + # prevent infinite recursion + (folium.overridePythonAttrs (prevAttrs: { + doCheck = false; + })) + geoalchemy2 + geopy + # prevent infinite recursion + (mapclassify.overridePythonAttrs (prevAttrs: { + doCheck = false; + })) + matplotlib + psycopg + pyarrow + sqlalchemy + xyzservices + ]; + }; + nativeCheckInputs = [ pytestCheckHook rtree - ]; + ] ++ optional-dependencies.all; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' export HOME=$(mktemp -d); diff --git a/pkgs/development/python-modules/getjump/default.nix b/pkgs/development/python-modules/getjump/default.nix index 153f25ad2cb1..6b6994db5071 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.5.0"; + version = "2.6.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-3VxsKum6aB35XYjz9ZKkUBdPuofOWzG+ttkX9pnzu7U="; + hash = "sha256-WuAsTfOe38i90jWqOpIBYbizmb9gLtXD+ttZ1WAFDes="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 1e38def4560e..02df1ed58604 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, fetchPypi, buildPythonPackage, @@ -54,6 +55,10 @@ buildPythonPackage rec { zope-interface ] ++ lib.optionals (!isPyPy) [ greenlet ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + # Bunch of failures. doCheck = false; diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index 230d8f300e29..3e9c51c7dcd1 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; # lots of: [Errno 48] Address already in use: ('127.0.0.1', 54323) - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/gflanguages/default.nix b/pkgs/development/python-modules/gflanguages/default.nix index 058f241d37d7..21bfb3f5da39 100644 --- a/pkgs/development/python-modules/gflanguages/default.nix +++ b/pkgs/development/python-modules/gflanguages/default.nix @@ -5,6 +5,7 @@ protobuf, pytestCheckHook, pythonOlder, + regex, setuptools, setuptools-scm, uharfbuzz, @@ -13,36 +14,49 @@ buildPythonPackage rec { pname = "gflanguages"; - version = "0.6.2"; + version = "0.6.5"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-v93mXDwHT/8Tau78ApLUR+dQCpL9jmRQp0BT5y/sfq4="; + hash = "sha256-wMhRVWdjKiEfzswnAWqKfzHrpJj0U4q8tzDBGshNryo="; }; - pyproject = true; - # 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" ]; + env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + build-system = [ setuptools setuptools-scm ]; - dependencies = [ protobuf ]; + dependencies = [ + protobuf + regex + ]; nativeCheckInputs = [ pytestCheckHook + regex uharfbuzz youseedee ]; + pythonImportsCheck = [ "gflanguages" ]; + + disabledTests = [ + # AssertionError + "test_exemplars_are_in_script" + "test_sample_texts_are_in_script" + ]; + meta = with lib; { description = "Python library for Google Fonts language metadata"; homepage = "https://github.com/googlefonts/lang"; diff --git a/pkgs/development/python-modules/gfsubsets/default.nix b/pkgs/development/python-modules/gfsubsets/default.nix index ff2db29a1eb2..ade037605dc2 100644 --- a/pkgs/development/python-modules/gfsubsets/default.nix +++ b/pkgs/development/python-modules/gfsubsets/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "gfsubsets"; - version = "2024.5.9"; + version = "2024.9.25"; gitTag = "v2024.02.05"; src = fetchPypi { inherit pname version; - hash = "sha256-OgpdcOJWX0o0Hy6LjRsxsZMAVWgKziM+bqe/FfJniZY="; + hash = "sha256-jEuIBNQ89Le3Rbk0W4PLl9LE7rP0IcE6RAzyfhZb7lY="; }; pyproject = true; diff --git a/pkgs/development/python-modules/gftools/default.nix b/pkgs/development/python-modules/gftools/default.nix index 9418d7c1acd4..dbed4711f54f 100644 --- a/pkgs/development/python-modules/gftools/default.nix +++ b/pkgs/development/python-modules/gftools/default.nix @@ -61,14 +61,14 @@ let in buildPythonPackage rec { pname = "gftools"; - version = "0.9.68"; + version = "0.9.71"; pyproject = true; src = fetchFromGitHub { owner = "googlefonts"; repo = "gftools"; rev = "refs/tags/v${version}"; - hash = "sha256-xdpfRCtZDxRmrGodXUg8J0T5l5gd7Mvl290BXwNLzvY="; + hash = "sha256-YVuTozuONZbBtrst4Q+NmHxqEZa/YPVRMiagjmjcW9U="; }; postPatch = '' @@ -114,6 +114,8 @@ buildPythonPackage rec { --replace-fail "'gftools" "'${placeholder "out"}t/bin/gftools" ''; + env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + pythonRelaxDeps = [ "protobuf" "pygit2" diff --git a/pkgs/development/python-modules/gguf/default.nix b/pkgs/development/python-modules/gguf/default.nix index 64b96698cc62..c3cb68d64fc0 100644 --- a/pkgs/development/python-modules/gguf/default.nix +++ b/pkgs/development/python-modules/gguf/default.nix @@ -6,23 +6,25 @@ poetry-core, pythonOlder, tqdm, + pyyaml, }: buildPythonPackage rec { pname = "gguf"; - version = "0.9.1"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9ecJh+FbGcVF9qn3UztAM/swYzDrHzxclf0osUw/0zs="; + hash = "sha256-UqMO8mMotBn/xH2SafxYDCOO3xyKGbXqFDwyPgSgOME="; }; dependencies = [ numpy poetry-core tqdm + pyyaml ]; meta = with lib; { diff --git a/pkgs/development/python-modules/gin-config/default.nix b/pkgs/development/python-modules/gin-config/default.nix index a64a1683d373..4259da579642 100644 --- a/pkgs/development/python-modules/gin-config/default.nix +++ b/pkgs/development/python-modules/gin-config/default.nix @@ -2,31 +2,39 @@ lib, buildPythonPackage, fetchPypi, - six, - enum34, + pythonOlder, + setuptools, + tensorflow, + torch, }: buildPythonPackage rec { pname = "gin-config"; version = "0.5.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0c6ea5026ded927c8c93c990b01c695257c1df446e45e549a158cfbc79e19ed6"; + hash = "sha256-DG6lAm3tknyMk8mQsBxpUlfB30RuReVJoVjPvHnhntY="; }; - propagatedBuildInputs = [ - six - enum34 - ]; + build-system = [ setuptools ]; + + optional-dependencies = { + tensorflow = [ tensorflow ]; + torch = [ torch ]; + }; # PyPI archive does not ship with tests doCheck = false; + pythonImportsCheck = [ "gin" ]; + meta = with lib; { - homepage = "https://github.com/google/gin-config"; description = "Gin provides a lightweight configuration framework for Python, based on dependency injection"; + homepage = "https://github.com/google/gin-config"; license = licenses.asl20; maintainers = with maintainers; [ jethro ]; }; diff --git a/pkgs/development/python-modules/gios/default.nix b/pkgs/development/python-modules/gios/default.nix index 0a5632ad31de..952056492c70 100644 --- a/pkgs/development/python-modules/gios/default.nix +++ b/pkgs/development/python-modules/gios/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "gios"; - version = "4.0.0"; + version = "5.0.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = "gios"; rev = "refs/tags/${version}"; - hash = "sha256-rjC4zWWtaPxuBcjiO9dVsXD4dTa47iwkKuSFx+QXeXw="; + hash = "sha256-J+LCu7wMuc3dYghvkKq58GcBAa76X5IPUWe7qCQwjjI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index 7778ecd9ca88..e84c2321aaee 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -65,9 +65,11 @@ buildPythonPackage rec { disabledTests = [ # KeyError and AssertionError + "test_annex_keys" + "test_batchjson_metadata" + "test_file_tree" "test_jsonprocess_annex_metadata_batch" "test_process_annex_metadata_batch" - "test_batchjson_metadata" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/git-dummy/default.nix b/pkgs/development/python-modules/git-dummy/default.nix new file mode 100644 index 000000000000..2fffa2d6e06c --- /dev/null +++ b/pkgs/development/python-modules/git-dummy/default.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + installShellFiles, + setuptools, + gitpython, + typer, + pydantic-settings, +}: + +buildPythonPackage rec { + pname = "git-dummy"; + version = "0.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "initialcommit-com"; + repo = "git-dummy"; + rev = "v${version}"; + hash = "sha256-viybxn2J7SO7NgSvjwlP+tgtm+H6QrACafIy82d9XEk="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + gitpython + typer + pydantic-settings + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = + # https://github.com/NixOS/nixpkgs/issues/308283 + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd git-dummy \ + --bash <($out/bin/git-dummy --show-completion bash) \ + --fish <($out/bin/git-dummy --show-completion fish) \ + --zsh <($out/bin/git-dummy --show-completion zsh) + ''; + + meta = { + homepage = "https://github.com/initialcommit-com/git-dummy"; + description = "Generate dummy Git repositories populated with the desired number of commits, branches, and structure"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ mathiassven ]; + }; +} diff --git a/pkgs/development/python-modules/git-filter-repo/default.nix b/pkgs/development/python-modules/git-filter-repo/default.nix index 5591d87dd5a3..af9b80ad38b6 100644 --- a/pkgs/development/python-modules/git-filter-repo/default.nix +++ b/pkgs/development/python-modules/git-filter-repo/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { docs_version = "71d71d4be238628bf9cb9b27be79b8bb824ed1a9"; pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.9"; src = fetchPypi { pname = "git_filter_repo"; @@ -34,10 +34,9 @@ buildPythonPackage rec { installManPage ${docs}/man1/git-filter-repo.1 ''; - nativeBuildInputs = [ - setuptools-scm - installShellFiles - ]; + build-system = [ setuptools-scm ]; + + nativeBuildInputs = [ installShellFiles ]; # Project has no tests doCheck = false; diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index d27a9e672da2..7a0fae0991f9 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "githubkit"; - version = "0.11.10"; + version = "0.11.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "yanyongyu"; repo = "githubkit"; rev = "refs/tags/v${version}"; - hash = "sha256-04Cy4NtC3+/qv4kFcDB1aszmO6x1TguhCOF0CqxYPtw="; + hash = "sha256-nZzsBxPRmqHTaYVogWsdaGbzwBsVr08qcvAekk3O4FM="; }; pythonRelaxDeps = [ "hishel" ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ anyio pyjwt @@ -59,7 +59,7 @@ buildPythonPackage rec { pytestCheckHook pytest-cov-stub pytest-xdist - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "githubkit" ]; diff --git a/pkgs/development/python-modules/glad2/default.nix b/pkgs/development/python-modules/glad2/default.nix index f5aeb9925431..c2eb38490cc5 100644 --- a/pkgs/development/python-modules/glad2/default.nix +++ b/pkgs/development/python-modules/glad2/default.nix @@ -3,19 +3,22 @@ buildPythonPackage, fetchPypi, jinja2, + setuptools, }: buildPythonPackage rec { pname = "glad2"; - version = "2.0.6"; - format = "setuptools"; + version = "2.0.8"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-CGFa7TIZ6hx3WEvVlh2CO6sib4rDgx0JrfZcb6h3+Ow="; + hash = "sha256-uEB5ufpATzcXG5Yb3R2NohNw5sgY3vuEgcWz/j1kNto="; }; - propagatedBuildInputs = [ jinja2 ]; + build-system = [ setuptools ]; + + dependencies = [ jinja2 ]; # no python tests doCheck = false; diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index bceb44eb0b6f..0f0f22280579 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, httpx, poetry-core, pytest-asyncio, @@ -24,6 +25,14 @@ buildPythonPackage rec { hash = "sha256-QAnwFX53jf7yWWa308/XTARNw5Qeo9K2zfD+6+HiFuM="; }; + patches = [ + (fetchpatch2 { + name = "pytest-httpx-compat.patch"; + url = "https://github.com/home-assistant-ecosystem/python-glances-api/commit/f193472a25469e7e4b946f9a1c3a7a95949c6c04.patch"; + hash = "sha256-hFeWv2WdbdeoaHgAOmwtBwWwPLjJzyurTZDV98qR7F8="; + }) + ]; + build-system = [ poetry-core ]; dependencies = [ httpx ]; diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index 5dea3e473665..11b7157f4b12 100644 --- a/pkgs/development/python-modules/glean-sdk/default.nix +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "glean" ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Telemetry client libraries and are a part of the Glean project"; homepage = "https://mozilla.github.io/glean/book/index.html"; license = lib.licenses.mpl20; diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 6f6256650872..ecace1bee238 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.41.0"; + version = "3.45.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,11 +24,15 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-FQO1D960mg0G/zYMo4J5MtJbPID4oE8UWNpTPKWtsic="; + hash = "sha256-EBYhT2RLHjvSwnSMbx+Xo3Fmxc9jttEPeljjlKbQd8Q="; }; build-system = [ setuptools ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + dependencies = [ cryptography requests @@ -44,10 +48,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "globus_sdk" ]; - meta = with lib; { + meta = { description = "Interface to Globus REST APIs, including the Transfer API and the Globus Auth API"; homepage = "https://github.com/globus/globus-sdk-python"; changelog = "https://github.com/globus/globus-sdk-python/releases/tag/${version}"; - license = licenses.asl20; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; }; } diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix index f54ccc14df0c..b9a37779603c 100644 --- a/pkgs/development/python-modules/glymur/default.nix +++ b/pkgs/development/python-modules/glymur/default.nix @@ -37,12 +37,12 @@ buildPythonPackage rec { }) ]; - postPatch = lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace glymur/lib/tiff.py \ --replace-fail "glymur_config('c')" "ctypes.CDLL('${lib.getLib glibc}/lib/libc.so.6')" ''; - __propagatedImpureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libc.dylib"; + __propagatedImpureHostDeps = lib.optional stdenv.hostPlatform.isDarwin "/usr/lib/libc.dylib"; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/glyphsets/default.nix b/pkgs/development/python-modules/glyphsets/default.nix index e918de58ae85..e95a1a3ecb83 100644 --- a/pkgs/development/python-modules/glyphsets/default.nix +++ b/pkgs/development/python-modules/glyphsets/default.nix @@ -1,16 +1,17 @@ { lib, buildPythonPackage, - fetchPypi, defcon, + fetchPypi, fonttools, gflanguages, glyphslib, pytestCheckHook, + pythonOlder, pyyaml, requests, - setuptools, setuptools-scm, + setuptools, unicodedata2, }: @@ -19,11 +20,15 @@ buildPythonPackage rec { version = "1.0.0"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchPypi { inherit pname version; hash = "sha256-fa+W1IGIZcn1P1xNKm1Yb/TOuf4QdDVnIvlDkOLOcLY="; }; + env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + postPatch = '' substituteInPlace setup.py \ --replace-fail "setuptools_scm>=8.0.4,<8.1" "setuptools_scm" @@ -53,13 +58,16 @@ buildPythonPackage rec { disabledTests = [ # This "test" just tries to connect to PyPI and look for newer releases. Not needed. "test_dependencies" + # AssertionError + "test_definitions" ]; meta = with lib; { description = "Google Fonts glyph set metadata"; - mainProgram = "glyphsets"; homepage = "https://github.com/googlefonts/glyphsets"; + changelog = "https://github.com/googlefonts/glyphsets/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ danc86 ]; + mainProgram = "glyphsets"; }; } diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index f490c9328fb1..895e9f1ab25e 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.8.2"; + version = "6.9.0"; format = "pyproject"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "glyphsLib"; rev = "refs/tags/v${version}"; - hash = "sha256-AcAk9lFueIWYsDK1ESSK6D0/i1qW7udDfUa1pFRqGQs="; + hash = "sha256-NanqjZZkxrhPaBsR+FrARvsO3vdT2MYnWFtkO0hpbQg="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix index 58f4cc08f672..713cb42faef8 100644 --- a/pkgs/development/python-modules/gmpy2/default.nix +++ b/pkgs/development/python-modules/gmpy2/default.nix @@ -52,12 +52,12 @@ buildPythonPackage rec { ]; disabledTests = - lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # issue with some overflow logic "test_mpz_to_bytes" "test_mpz_from_bytes" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # TypeError: mpq() requires numeric or string argument # not sure why it only fails on Darwin "test_mpq_from_Decimal" diff --git a/pkgs/development/python-modules/go2rtc-client/default.nix b/pkgs/development/python-modules/go2rtc-client/default.nix new file mode 100644 index 000000000000..8d110afbbee3 --- /dev/null +++ b/pkgs/development/python-modules/go2rtc-client/default.nix @@ -0,0 +1,67 @@ +{ + lib, + aiohttp, + aioresponses, + awesomeversion, + buildPythonPackage, + fetchFromGitHub, + hatchling, + mashumaro, + orjson, + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, + pythonOlder, + syrupy, + webrtc-models, +}: + +buildPythonPackage rec { + pname = "go2rtc-client"; + version = "0.1.0"; + pyproject = true; + + disabled = pythonOlder "3.12"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "python-go2rtc-client"; + rev = "refs/tags/${version}"; + hash = "sha256-oVPZtPRlm3CmTBfxXm66BOOZVQ39DsR+WmkoAdHp4eQ="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.0.0"' 'version = "${version}"' + ''; + + pythonRelaxDeps = [ "orjson" ]; + + build-system = [ hatchling ]; + + dependencies = [ + aiohttp + awesomeversion + mashumaro + orjson + webrtc-models + ]; + + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytest-cov-stub + pytestCheckHook + syrupy + ]; + + pythonImportsCheck = [ "go2rtc_client" ]; + + meta = { + description = "Module for interacting with go2rtc"; + homepage = "https://github.com/home-assistant-libs/python-go2rtc-client"; + changelog = "https://github.com/home-assistant-libs/python-go2rtc-client/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/gocardless-pro/default.nix b/pkgs/development/python-modules/gocardless-pro/default.nix index c87af7633b86..575a7a0bc2d2 100644 --- a/pkgs/development/python-modules/gocardless-pro/default.nix +++ b/pkgs/development/python-modules/gocardless-pro/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "gocardless-pro"; - version = "1.53.0"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "gocardless"; repo = "gocardless-pro-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Z58akjaYuvKVQWFfiP5TZlM/+4CB/vmLzd4eWmnWV90="; + hash = "sha256-RHvGrBIDtjnLax2x7FPu0S5vizUW7dQMaQsyGPXqEh4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index 662631c36fb2..162500b8f568 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -17,14 +17,15 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.6.7"; + version = "0.6.12"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-6eLvojtiwxGPhkFu75zEgBkjDScVxVWsYfnh6oBQMTI="; + pname = "google_ai_generativelanguage"; + inherit version; + hash = "sha256-v6A3iIAwYcgMAF4o+rXZb0Zfzxx9KKHu+xYx+0oqtn8="; }; 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 ccfeaa3debac..c9cfaeae73fd 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, google-auth, googleapis-common-protos, grpcio, @@ -19,14 +19,16 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.19.0"; + version = "2.20.0"; pyproject = true; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-zxt8JpQEeIbSrxEooDrpnjkRCKCIBPh8/TWXDknJzRA="; + src = fetchFromGitHub { + owner = "googleapis"; + repo = "python-api-core"; + rev = "v${version}"; + hash = "sha256-ccjkGQNaPRefI6+j/O+NwdBGEVNuZ5q5m1d8EAJGcbs="; }; nativeBuildInputs = [ setuptools ]; @@ -39,7 +41,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { grpc = [ grpcio grpcio-status 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 3cb93fc57419..90cbc2f43753 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -14,14 +14,15 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.135.0"; + version = "2.147.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-tVKigSPtlUkwNWmNuA6O14yRBqi0IuY6F1FQubVbcE4="; + pname = "google_api_python_client"; + inherit version; + hash = "sha256-6GTCz2HTTADwUni4vbcrk7b6NPDenq1R0gQ187Zfkb4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 3f1b3a06d0d4..2d4e0bed73ac 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { # Flaky test. See https://github.com/NixOS/nixpkgs/issues/288424#issuecomment-1941609973. "test_run_local_server_occupied_port" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # This test fails if the hostname is not associated with an IP (e.g., in `/etc/hosts`). "test_run_local_server_bind_addr" ]; diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 5556429082f1..35dd5b86b9fb 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -27,14 +27,15 @@ buildPythonPackage rec { pname = "google-auth"; - version = "2.30.0"; + version = "2.35.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-q2MKEyD2cgkJrXan29toQc31xmsyjWkAJ+SGe9+xZog="; + pname = "google_auth"; + inherit version; + hash = "sha256-9MZO1OAejotkbvNMAY+L8zON8MjjfYs7ukDn9XSjJ4o="; }; nativeBuildInputs = [ setuptools ]; @@ -45,7 +46,7 @@ buildPythonPackage rec { rsa ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp requests @@ -75,16 +76,16 @@ buildPythonPackage rec { pytestCheckHook responses ] - ++ passthru.optional-dependencies.aiohttp - ++ passthru.optional-dependencies.enterprise_cert - ++ passthru.optional-dependencies.reauth; + ++ optional-dependencies.aiohttp + ++ optional-dependencies.enterprise_cert + ++ optional-dependencies.reauth; pythonImportsCheck = [ "google.auth" "google.oauth2" ]; - disabledTestPaths = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Disable tests using pyOpenSSL as it does not build on M1 Macs "tests/transport/test__mtls_helper.py" "tests/transport/test_requests.py" 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 3f4a7b9e52ff..c67815b9d7ab 100644 --- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix +++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-artifact-registry"; - version = "1.11.5"; + version = "1.12.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_artifact_registry"; inherit version; - hash = "sha256-lNWDbgu9DDNRSh7cC1TfiYvy237bH16QduskPzQt9Mg="; + hash = "sha256-XuPps4IBJxIfF+9qmqDYzZDw3BOrZeVUznk/3af33XQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 5f6c9c54f2b4..f692306f62d8 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.26.4"; + version = "3.27.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_asset"; inherit version; - hash = "sha256-c/xmHAD8zXdi+2ifs4bHWPS2B49Fcnr4RqLfrpGwQzs="; + hash = "sha256-AuFuc3Qu1N2iWtNlYKhNQX2ETwjLB2e8ydrGO9ozR+E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 83e861edd52d..e78652373f0c 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.13.5"; + version = "2.14.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_automl"; inherit version; - hash = "sha256-ypmK9Gq7HF2ozS6OFbAJZDPiW8sngucN86b5FHLuiTE="; + hash = "sha256-CpVwnxU1DAdU7VGY1LjkOlv5ki2ZxlA0sWd9vsR5rkI="; }; build-system = [ setuptools ]; 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 e830e78dd09d..384dcd6d0edd 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.15.7"; + version = "3.16.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_bigquery_datatransfer"; inherit version; - hash = "sha256-GLarRvI2eud/iNwj7ujZwIpK/b0ClhO0XUdBi4J9Lp0="; + hash = "sha256-EyYdNDLDmIPyBZ9zYLASahS0gUrJ9SXhdjokKKWZ4lU="; }; build-system = [ setuptools ]; 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 7f671c9eff4e..81739ef91b60 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.4.5"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_bigquery_logging"; inherit version; - hash = "sha256-XrBXr0Y1vpxWceSR59ERQJKziMBI4+QBoHWK0Wt1cec="; + hash = "sha256-4eDfCpkZBDZySWq92C/fr0FKeKdbkymN6sbl+/qzKfg="; }; build-system = [ setuptools ]; 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 4eae86bbbf46..7e71adc6791d 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.26.0"; + version = "2.27.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_bigquery_storage"; inherit version; - hash = "sha256-hAJ1vQpLIHwKyCG8xnQUBv+zte+UD6BQiakOtEA0U/o="; + hash = "sha256-Ui+rqaaL6n6YVwccM/r85e5SC3sXXaAEiQFyQq3o7Cc="; }; build-system = [ setuptools ]; @@ -34,7 +34,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { fastavro = [ fastavro ]; pandas = [ pandas ]; pyarrow = [ pyarrow ]; diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index d9ea0eba51ba..82018221e002 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -30,14 +30,15 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.25.0"; + version = "3.26.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-Wyr/MgWoVEgRF0NoNq4UA/EfJZTmgQqYiGr9V+2ihQk="; + pname = "google_cloud_bigquery"; + inherit version; + hash = "sha256-7b3HiL7qZZ4EwK9/5NzW2RVTRLmJUaDVBVvS8V2kuiM="; }; build-system = [ setuptools ]; @@ -54,7 +55,7 @@ buildPythonPackage rec { python-dateutil ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { bqstorage = [ google-cloud-bigquery-storage grpcio @@ -78,7 +79,7 @@ buildPythonPackage rec { google-cloud-storage pytestCheckHook pytest-xdist - ] ++ passthru.optional-dependencies.pandas ++ passthru.optional-dependencies.ipython; + ] ++ optional-dependencies.pandas ++ optional-dependencies.ipython; # prevent google directory from shadowing google imports preCheck = '' diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 91896114390e..fe8e5f496360 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { libcst = [ libcst ]; }; diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix index 7535e9f3f8c1..83e5ae9ea3d9 100644 --- a/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.19.2"; + version = "1.20.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_compute"; inherit version; - hash = "sha256-P86Cq+FOdvqqgSNNmnvh5jSy7Yon9V/u/PKxRkZ/f6s="; + hash = "sha256-q32xYqLCWV+tpJKgBnAV3DDjWCxPFOTtbMdDNyHIcp0="; }; 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 386b240f6b1f..218d0fe52c0c 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.51.0"; + version = "2.53.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_container"; inherit version; - hash = "sha256-q1F+/uzyVY10pP/XrF1sL0+6o7uKfITSuZTc+NqA/Zw="; + hash = "sha256-vgvcpw8DrBwRbpVkywpNYZGXagpNhV2BO9+CSt1LFVA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index bd5fbf7ee044..e0b052ba2fb0 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { google-api-core ]; - passthru.optional-dependencies = { + optional-dependencies = { grpc = [ grpcio ]; }; nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.grpc; + ] ++ optional-dependencies.grpc; # prevent google directory from shadowing google imports preCheck = '' diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 74cce025116a..ac8e29c31132 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.20.1"; + version = "3.21.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_datacatalog"; inherit version; - hash = "sha256-ggzQ85PzgEk4nnD9ykYd1VGPmtf2T6guAzv51SLlkmI="; + hash = "sha256-JH3WW8v1VrTebNyEy7EDL9nvMaRf2gQTf6fnWbqMbCA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 34e3ab0ceae1..480bf6f76d87 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.11.0"; + version = "5.12.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_dataproc"; inherit version; - hash = "sha256-6jiAOYf9eBjRMyQ9tvR3EWfnqk1MfYIUTm98Plnfkhg="; + hash = "sha256-S1jXIPAgxONTeKKeqHzoKGr2Mes7w4LMvL/zncAZnik="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 15bbab8155a3..8c8b720c097d 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.22.0"; + version = "3.23.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_dlp"; inherit version; - hash = "sha256-SabiX00pD91acxz83PdkDnPynLp5L9MAqKGY/IIUDAU="; + hash = "sha256-NKH24p2jfjhbs73jHB/lWDk5P1Uin/Mp5TANR3fquzg="; }; build-system = [ setuptools ]; 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 56e898a15bfd..503cb06d33f8 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -16,14 +16,15 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.11.0"; + version = "1.11.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-+oeVT/ag00BEObbqzkC/EazEwnrWvRURnz3gnCBbn4k="; + pname = "google_cloud_error_reporting"; + inherit version; + hash = "sha256-1ir8o3jwzmfi7E8QPTn3E6RGtTOL9KM05NRaMRYzh5A="; }; build-system = [ setuptools ]; @@ -38,8 +39,8 @@ buildPythonPackage rec { nativeCheckInputs = [ google-cloud-testutils mock - pytestCheckHook pytest-asyncio + pytestCheckHook ]; disabledTests = [ diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 0a3547af87c1..2c3dcdf79063 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.18.0"; + version = "2.19.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_firestore"; inherit version; - hash = "sha256-PbXdQjNLmQTYKzeGcDpaS1doEPtQ9huPqD7PTxe3/a4="; + hash = "sha256-Gyzm4LeRruiaHk8HK+uhASJH6Juso2Hu1yH7Rn/gVLA="; }; build-system = [ setuptools ]; 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 a5fd7575a29c..0c5e110d23d9 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.3.5"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_iam_logging"; inherit version; - hash = "sha256-B/OE8m6CpTddR+nAv9OP/y1V1c32/cUZPzfptAOuMrw="; + hash = "sha256-+7rRPIPXmxMbcTRqKTfYXciH1Op760Vm2d969zqJNnM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index 0b3f31b643b7..e0d771425c65 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -3,30 +3,40 @@ buildPythonPackage, fetchPypi, google-api-core, + google-auth, + grpc-google-iam-v1, libcst, mock, proto-plus, + protobuf, pytest-asyncio, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.15.0"; - format = "setuptools"; + version = "2.15.2"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-6TgaGCPlFi9owoBI/xowe6Og5Tja9getfUHP47dWpvA="; + pname = "google_cloud_iam"; + inherit version; + hash = "sha256-CbE12Wuiz2+Ap+2AEUNuidJYjouyPNYUXEdjAvSHGoI="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ google-api-core + google-auth + grpc-google-iam-v1 libcst proto-plus + protobuf ] ++ google-api-core.optional-dependencies.grpc; nativeCheckInputs = [ @@ -47,8 +57,8 @@ buildPythonPackage rec { meta = with lib; { description = "IAM Service Account Credentials API client library"; - homepage = "https://github.com/googleapis/python-iam"; - changelog = "https://github.com/googleapis/python-iam/releases/tag/v${version}"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-iam"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-iam-v${version}/packages/google-cloud-iam/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ austinbutler ]; }; diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index 4cd4dc257fda..73ece34efc16 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -39,6 +39,15 @@ buildPythonPackage rec { pytestCheckHook ]; + # including_default_value_fields was deprecated, the new version is called + # always_print_fields_with_no_presence + postPatch = '' + substituteInPlace "tests/unit/gapic/iot_v1/test_device_manager.py" \ + --replace-fail "including_default_value_fields" "always_print_fields_with_no_presence" + substituteInPlace "google/cloud/iot_v1/services/device_manager/transports/rest.py" \ + --replace-fail "including_default_value_fields" "always_print_fields_with_no_presence" + ''; + disabledTests = [ # requires credentials "test_list_device_registries" diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index ff28fe3dfcb6..7c879b7235d3 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -15,14 +15,15 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.23.0"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-UrX8b3CxY1FvrWEKr8CI++eI9QHVu+HV9FjNw/y6/Sw="; + pname = "google_cloud_kms"; + inherit version; + hash = "sha256-suyMBB/cl8hkW/w7S2TNFJ32JFl8dbSuS8qmIU7oSus="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index cd8eab718411..3a2bdd3b850e 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.11.2"; + version = "3.11.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_logging"; inherit version; - hash = "sha256-SJdEHCt09u2pGBwjqIFyI7YUWUMxSoIdZLcp0wdmyys="; + hash = "sha256-CnPNlBGIdTh9RTU3HZ6UJoYe3vjkT7oSYehngtW41U8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix index eaa3d4e435e0..e36b0cc2fab3 100644 --- a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix +++ b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-network-connectivity"; - version = "2.4.5"; + version = "2.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "google_cloud_network_connectivity"; - hash = "sha256-g2N39pKk0HG8f9NkSh/iOmDQNapnTyMf85mPBM0LIe4="; + hash = "sha256-+qCSCQJCsmtRtyEu6m9TnOa40bZGKISw/7+yHUMSXD0="; }; build-system = [ setuptools ]; 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 ab2af5b45cbf..a7ab5c1aec0e 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.17.5"; + version = "1.18.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_os_config"; inherit version; - hash = "sha256-O4yGoidanx9zdMb+KhjTljEjaXTC0A2kbejzL0VWTCg="; + hash = "sha256-Xx83zfz+zBUtlZKGqO4gBbRmy/8F1TE5AvizqHEIF7M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index a564a85d45d6..df1d6704dacb 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -5,9 +5,11 @@ google-api-core, google-cloud-testutils, grpc-google-iam-v1, - grpcio, grpcio-status, + grpcio, libcst, + opentelemetry-api, + opentelemetry-sdk, proto-plus, protobuf, pytest-asyncio, @@ -18,7 +20,7 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.23.1"; + version = "2.25.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_pubsub"; inherit version; - hash = "sha256-4f3nm1tktyEpCvTAIpB6/LuDUS2S9OXDNMORz7sCKss="; + hash = "sha256-Kg/RYQDBbHE3Q45G1M42y++kvXnPk8h3aruf3oPPWQQ="; }; build-system = [ setuptools ]; @@ -37,11 +39,13 @@ buildPythonPackage rec { grpcio grpcio-status libcst + opentelemetry-api + opentelemetry-sdk proto-plus protobuf ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { libcst = [ libcst ]; }; diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 7944da13d932..a3f45ce57f5d 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.15.5"; + version = "2.16.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_redis"; inherit version; - hash = "sha256-0k3Ww3mznGAUQ4uQMAA+/5gTr71a8rj730cz3GXzZ2A="; + hash = "sha256-bQjLUjstRlekL8/kMt41zfjq+XnnUUhPHaJ6lwRpAZY="; }; build-system = [ setuptools ]; 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 d1dd18cd342a..5ae9acb7e4bd 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.12.5"; + version = "1.13.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_resource_manager"; inherit version; - hash = "sha256-t69CVEAe1O+jq6OpKcs924A/prr5GnhIXkVYNZfeWJE="; + hash = "sha256-rkv2lEPxSzcAfU2EFQEVsJQuiwFlD9eh/G/03Bdg5cQ="; }; build-system = [ setuptools ]; 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 c89f4d0576fa..86f2378b0929 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.20.2"; + version = "2.21.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_secret_manager"; inherit version; - hash = "sha256-u+JIJeM0+eZ56CXnDZMhGKf/U25nwc6wSNpEERyHpFw="; + hash = "sha256-0a6E7PmM/DGcmj8QEjVc69GTF7ZizJ3/Giw2I0WAgHs="; }; 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 fb6365ec61b2..c70c830aaae6 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.34.0"; + version = "1.35.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_securitycenter"; inherit version; - hash = "sha256-GDvl7W6gFe3c8MHtAOyjzDw/ByNnkxHe2NjgviP10LI="; + hash = "sha256-hTOh2RpiRls+nrcEcOewZ0EvGoljBj5tm3iGLbnP7do="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-shell/default.nix b/pkgs/development/python-modules/google-cloud-shell/default.nix index 1e9bbb918ff1..21a97ef6593f 100644 --- a/pkgs/development/python-modules/google-cloud-shell/default.nix +++ b/pkgs/development/python-modules/google-cloud-shell/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-shell"; - version = "1.9.5"; + version = "1.10.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_shell"; inherit version; - hash = "sha256-UpDomrWUTrsiI+OdrI5nJKC/J+eaZiNDmMt0QgcP5Fw=="; + hash = "sha256-xhwDKKtksCVXrLEiefPg6aYgWZlNZ2QYFs1AmBIJNjw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 14527a19a43a..da4dbf120eb1 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { sqlparse ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { libcst = [ libcst ]; }; diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 38e430bca5dd..443d3ebb48b0 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.27.0"; + version = "2.28.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_speech"; inherit version; - hash = "sha256-YXTTIcyBpYs2veboOZ11MdUBI5OVOHKkaMtmTkKGg4U="; + hash = "sha256-cGvKg647ru1cz1HM+7BkIqyUTPfjepPdm/KygwXqdEU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 4a5081468f9c..9d0f35e4f330 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -18,30 +18,29 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "2.17.0"; + version = "2.18.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-STeKv/VO9la1Lcpe8PLrqaqD3CsscseHFLA6GpX+k4g="; + pname = "google_cloud_storage"; + inherit version; + hash = "sha256-qves1wza2fJ00pMyZz/KuYcI0OH03OtaU1aq7wavTZk="; }; - nativeBuildInputs = [ - setuptools - ]; - pythonRelaxDeps = [ "google-auth" ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ google-auth google-cloud-core google-resumable-media requests ]; - passthru.optional-dependencies = { + optional-dependencies = { protobuf = [ protobuf ]; }; @@ -53,21 +52,22 @@ buildPythonPackage rec { pytestCheckHook ]; - # Disable tests which require credentials and network access disabledTests = [ + # Disable tests which require credentials and network access "create" "download" "get" "post" - "upload" + "test_anonymous_client_access_to_public_bucket" "test_build_api_url" "test_ctor_mtls" + "test_ctor_w_api_endpoint_override" + "test_ctor_w_custom_endpoint_use_auth" "test_hmac_key_crud" "test_list_buckets" "test_open" - "test_anonymous_client_access_to_public_bucket" - "test_ctor_w_custom_endpoint_use_auth" - "test_ctor_w_api_endpoint_override" + "test_set_api_request_attr" + "upload" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index a5388a85cf08..22e3c2454ade 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.16.5"; + version = "2.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_tasks"; inherit version; - hash = "sha256-i9wpSgnjRkfhIKLkDdfsIIcwJNX04JOLL/DDn/N07aw="; + hash = "sha256-5tcJsIrzsXO2w/uA/wK2bi1ZVPkulNVHTYCzA4R6OME="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 5387654ffc7c..8164ebb27137 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.17.2"; + version = "2.18.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_texttospeech"; inherit version; - hash = "sha256-hRzD46MqUA/edzeEBh6c6l6ZYKxXaIOid19w1hNZhQo="; + hash = "sha256-jR91d6b4btSDNeEIFGgCYeKXbaVIiMih1YYETuGRlvQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index c1c89e10081b..354a822af121 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.7.4"; + version = "3.8.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_vision"; inherit version; - hash = "sha256-gLZ/Ci3Fh6MddILT0mkqdz8l+9CUaP2d5F0AtnGq2Zk="; + hash = "sha256-WRydHKJjCPEFV/0LH+zOuqemUZn3Ant33HMRggQAcgs="; }; build-system = [ setuptools ]; 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 8bdcc432a84b..20ce956e2cf2 100644 --- a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix +++ b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-vpc-access"; - version = "1.10.5"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_vpc_access"; inherit version; - hash = "sha256-ee0O0MDo3VEUuansbm0Io35g/8aRA2ShoZh+IfwQAww="; + hash = "sha256-WtgnMVuQHXSpSKSP9mRT9gXkjszF/bOjcdiJlxFUZiE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-webrisk/default.nix b/pkgs/development/python-modules/google-cloud-webrisk/default.nix index 0a11573eb682..97f5ced69221 100644 --- a/pkgs/development/python-modules/google-cloud-webrisk/default.nix +++ b/pkgs/development/python-modules/google-cloud-webrisk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-webrisk"; - version = "1.14.5"; + version = "1.15.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_webrisk"; inherit version; - hash = "sha256-zlJhVcoqagtodRCVUVlWZODH+C7/H1KIj7vBYkZUs2A="; + hash = "sha256-7nTkIgAfn7c9XGJFnq7fNRExNV4Kfdjv4Trrc+nRW6k="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 880802fdbd6f..63ae6795e081 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.14.5"; + version = "1.15.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_websecurityscanner"; inherit version; - hash = "sha256-H2yBAljtBaJ23+Y0AAi9wu5mC6sohvuJSOTNqtvGAjs="; + hash = "sha256-6D3OcAe5KUqExfvJHL7LJv8rPn4XUyyqhoB+fJXVwCo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-workflows/default.nix b/pkgs/development/python-modules/google-cloud-workflows/default.nix index 9d77226951ea..8ce558e29d4e 100644 --- a/pkgs/development/python-modules/google-cloud-workflows/default.nix +++ b/pkgs/development/python-modules/google-cloud-workflows/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-workflows"; - version = "1.14.5"; + version = "1.15.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_workflows"; inherit version; - hash = "sha256-HNur2TEVRf8+sg6r8qmE62ZsOP0lF2ma1Fpp85lmfoM="; + hash = "sha256-rR3VbImKo4Vk0TxQeEUCy3faAnH74os0nN0sTs0DPyw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-workstations/default.nix b/pkgs/development/python-modules/google-cloud-workstations/default.nix index 7fb70589b718..ffcfcb48ca0f 100644 --- a/pkgs/development/python-modules/google-cloud-workstations/default.nix +++ b/pkgs/development/python-modules/google-cloud-workstations/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-workstations"; - version = "0.5.8"; + version = "0.5.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_workstations"; inherit version; - hash = "sha256-Xu7oL5R/K3oHMea1xCwRLPoxgPNMFRSMYCQ73K9sMgQ="; + hash = "sha256-9bxYupNFRYenfGUOOAeeWIIkUEh3o9umnMzijXesQyE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-crc32c/default.nix b/pkgs/development/python-modules/google-crc32c/default.nix index fc6bcf95b4a2..c4dd1040ff64 100644 --- a/pkgs/development/python-modules/google-crc32c/default.nix +++ b/pkgs/development/python-modules/google-crc32c/default.nix @@ -1,27 +1,33 @@ { lib, buildPythonPackage, - fetchFromGitHub, cffi, crc32c, + fetchFromGitHub, pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "google-crc32c"; - version = "1.5.0"; - format = "setuptools"; + version = "1.6.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "googleapis"; repo = "python-crc32c"; - rev = "v${version}"; - hash = "sha256-Tx7UBIwKzSBbpuqdqGiXTbmBE+1MDRknVe3Zee0UHKQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-uGW4gWIpTVQ+f52WBA9H+K3+sHNa4JdgO9qi1Ds7WEU="; }; + build-system = [ setuptools ]; + buildInputs = [ crc32c ]; - propagatedBuildInputs = [ cffi ]; + dependencies = [ cffi ]; LDFLAGS = "-L${crc32c}/lib"; CFLAGS = "-I${crc32c}/include"; @@ -34,8 +40,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "google_crc32c" ]; meta = with lib; { - homepage = "https://github.com/googleapis/python-crc32c"; description = "Wrapper the google/crc32c hardware-based implementation of the CRC32C hashing algorithm"; + homepage = "https://github.com/googleapis/python-crc32c"; + changelog = "https://github.com/googleapis/python-crc32c/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ freezeboy ]; }; diff --git a/pkgs/development/python-modules/google-generativeai/default.nix b/pkgs/development/python-modules/google-generativeai/default.nix index ae1bdc82ae7f..ae82378dfa06 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.2"; + version = "0.8.3"; 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-KVKoPCpMaaVMU6VqYXD7vHmhv1AS5slRobRVDDuaDHc="; + hash = "sha256-XHYO2bH95Naoha2ZLpkP0YCq60qqiQPz+YzU6O4pInQ="; }; pythonRelaxDeps = [ "google-ai-generativelanguage" ]; diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 699430682d4b..6bdda8efbc1d 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "5.0.1"; + version = "6.1.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-oooWPQ4O7+FjCzIoBwm+jgGTkG7eFwekbIAEbJh44I4="; + hash = "sha256-F/vpyg3EYgKCsq/0yL3uP+1azu8bbHOMsf85Yabl0KQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-photos-library-api/default.nix b/pkgs/development/python-modules/google-photos-library-api/default.nix new file mode 100644 index 000000000000..49feac0a0be2 --- /dev/null +++ b/pkgs/development/python-modules/google-photos-library-api/default.nix @@ -0,0 +1,49 @@ +{ + aiohttp, + buildPythonPackage, + fetchFromGitHub, + google-api-python-client, + google-auth, + lib, + mashumaro, + pytest-aiohttp, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "google-photos-library-api"; + version = "0.12.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "allenporter"; + repo = "python-google-photos-library-api"; + rev = "refs/tags/${version}"; + hash = "sha256-xSwUzVwC7RPpmC9M1x/WYIaoiUlcF2h2fwiP6FYA6sw="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + google-api-python-client + google-auth + mashumaro + ]; + + pythonImportsCheck = [ "google_photos_library_api" ]; + + nativeCheckInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/allenporter/python-google-photos-library-api/releases/tag/${version}"; + description = "Python client library for Google Photos Library API"; + homepage = "https://github.com/allenporter/python-google-photos-library-api"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/google-reauth/default.nix b/pkgs/development/python-modules/google-reauth/default.nix deleted file mode 100644 index 854fee050697..000000000000 --- a/pkgs/development/python-modules/google-reauth/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - mock, - oauth2client, - pytestCheckHook, - pythonOlder, - pyu2f, -}: - -buildPythonPackage rec { - pname = "google-reauth"; - version = "0.1.1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "Google"; - repo = "google-reauth-python"; - rev = "refs/tags/${version}"; - hash = "sha256-J7GVh+iY+69rFzf4hN/KLFZMZ1/S3CL5TZ7SsP5Oy3g="; - }; - - propagatedBuildInputs = [ - oauth2client - pyu2f - ]; - - nativeCheckInputs = [ - mock - pytestCheckHook - ]; - - pythonImportsCheck = [ "google_reauth" ]; - - meta = with lib; { - description = "Auth plugin allowing use the use of OAuth 2.0 credentials for Google Cloud Storage"; - homepage = "https://github.com/Google/google-reauth-python"; - changelog = "https://github.com/google/google-reauth-python/releases/tag/${version}"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 504987669e7e..d8ea529bb1d8 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -11,26 +11,30 @@ pytestCheckHook, pythonOlder, requests, + setuptools, }: buildPythonPackage rec { pname = "google-resumable-media"; - version = "2.7.1"; - format = "setuptools"; + version = "2.7.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-6uRRp7LizbqqD9LrAMyKHuXpXha1VZc1nLw9J9fZDjM="; + pname = "google_resumable_media"; + inherit version; + hash = "sha256-UoCu1GKfK2C4R7DUL5hX/Uk1wRryZnRN8z2AdMrpL+A="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ google-auth google-crc32c ]; - passthru.optional-dependencies = { + optional-dependencies = { requests = [ requests ]; aiohttp = [ aiohttp ]; }; @@ -40,7 +44,7 @@ buildPythonPackage rec { mock pytest-asyncio pytestCheckHook - ] ++ passthru.optional-dependencies.requests; + ] ++ optional-dependencies.requests; preCheck = '' # prevent shadowing imports diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index eb4d8e5944ae..5dcbe2d2ed84 100644 --- a/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -2,24 +2,28 @@ lib, buildPythonPackage, fetchPypi, - setuptools, grpc, protobuf, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.63.1"; + version = "1.65.0"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchPypi { - inherit pname version; - hash = "sha256-xkQvegprKoA2lFfXnmZyu33LqriOCEgwJJfj7IB4Cmo="; + pname = "googleapis_common_protos"; + inherit version; + hash = "sha256-M0op0Hzdw6oB3uSYj5r9mykW7i/0nWt1cVXcDRl4UsA="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ grpc protobuf ]; @@ -38,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Common protobufs used in Google APIs"; homepage = "https://github.com/googleapis/python-api-common-protos"; + changelog = "https://github.com/googleapis/python-api-common-protos/releases/tag/v${version}"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/googlemaps/default.nix b/pkgs/development/python-modules/googlemaps/default.nix index 0e936dd7e183..c4396a52ae30 100644 --- a/pkgs/development/python-modules/googlemaps/default.nix +++ b/pkgs/development/python-modules/googlemaps/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - pytest-cov, + pytest-cov-stub, pytestCheckHook, pythonOlder, requests, @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; nativeCheckInputs = [ - pytest-cov + pytest-cov-stub pytestCheckHook responses ]; diff --git a/pkgs/development/python-modules/gotailwind/default.nix b/pkgs/development/python-modules/gotailwind/default.nix index 8593c49ddc11..bc77ffb251d1 100644 --- a/pkgs/development/python-modules/gotailwind/default.nix +++ b/pkgs/development/python-modules/gotailwind/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "gotailwind"; - version = "0.2.3"; + version = "0.2.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-gotailwind"; rev = "refs/tags/v${version}"; - hash = "sha256-FRFcFn5aRg+H9M6ZwEfLO1Dwcybvs0ODQv2ruCG+4v0="; + hash = "sha256-g4wYjMJXSm7cjb5Zck1O0A+ETfqMTmiI8In26mcGhNw="; }; postPatch = '' @@ -51,7 +51,7 @@ buildPythonPackage rec { zeroconf ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ typer ]; }; diff --git a/pkgs/development/python-modules/gotenberg-client/default.nix b/pkgs/development/python-modules/gotenberg-client/default.nix index e86eb4e6e0e4..bb18da52f951 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.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "stumpylog"; repo = "gotenberg-client"; rev = "refs/tags/${version}"; - hash = "sha256-rF4msWYWgNUtOnMAB11vdAPNWZeAoeglnzMPWEM503I="; + hash = "sha256-pkxu9WIsyHW2iTepv5B2naKkK+yw8lT+i3EwobE+u1M="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/govee-local-api/default.nix b/pkgs/development/python-modules/govee-local-api/default.nix index e2e6976b602e..3c9a3684c056 100644 --- a/pkgs/development/python-modules/govee-local-api/default.nix +++ b/pkgs/development/python-modules/govee-local-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "govee-local-api"; - version = "1.5.2"; + version = "1.5.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Galorhallen"; repo = "govee-local-api"; rev = "refs/tags/v${version}"; - hash = "sha256-sxxw/XAPENtNeY/64+pxnPgMBBM7+lpF52ixRm18d48="; + hash = "sha256-qBT0Xub+eL7rfF+lQWlheBJSahEKWjREGJQD6sHjTPk="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix index cd6ce736d2a6..9399e547a050 100644 --- a/pkgs/development/python-modules/gpapi/default.nix +++ b/pkgs/development/python-modules/gpapi/default.nix @@ -6,34 +6,51 @@ protobuf, pycryptodome, requests, + protobuf_27, + setuptools, }: buildPythonPackage rec { version = "0.4.4"; - format = "setuptools"; pname = "gpapi"; + pyproject = true; src = fetchPypi { inherit version pname; - sha256 = "0ampvsv97r3hy1cakif4kmyk1ynf3scbvh4fbk02x7xrxn4kl38w"; + sha256 = "sha256-HA06ie25ny7AXI7AvZgezvowfZ3ExalY8HDkk7betyo="; }; - # package doesn't contain unit tests - # scripts in ./test require networking - doCheck = false; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail 'PROTOC_EXEC = "protoc"' 'PROTOC_EXEC = "${lib.getExe protobuf_27}"' + ''; - pythonImportsCheck = [ "gpapi.googleplay" ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + buildInputs = [ + protobuf_27 + ]; + + dependencies = [ cryptography protobuf pycryptodome requests ]; - meta = with lib; { + preBuild = '' + export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION="python" + ''; + + # package doesn't contain unit tests + # scripts in ./test require networking + doCheck = false; + + pythonImportsCheck = [ "gpapi.googleplay" ]; + + meta = { homepage = "https://github.com/NoMore201/googleplay-api"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; description = "Google Play Unofficial Python API"; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index f0a7efc0005f..9bca05da8e5a 100644 --- a/pkgs/development/python-modules/gpy/default.nix +++ b/pkgs/development/python-modules/gpy/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { done ''; - disabledTests = lib.optionals (stdenv.isDarwin && stdenv.hostPlatform.isx86_64) [ + disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # Rounding difference break comparison "TestGradientMultiOutputGPModel" ]; diff --git a/pkgs/development/python-modules/gpytorch/default.nix b/pkgs/development/python-modules/gpytorch/default.nix index cb449dc56d61..4cdf9ccfb4e4 100644 --- a/pkgs/development/python-modules/gpytorch/default.nix +++ b/pkgs/development/python-modules/gpytorch/default.nix @@ -2,51 +2,46 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, + jaxtyping, linear-operator, + mpmath, scikit-learn, + scipy, setuptools, setuptools-scm, - wheel, torch, pytestCheckHook, }: buildPythonPackage rec { pname = "gpytorch"; - version = "1.12"; - format = "pyproject"; + version = "1.13"; + pyproject = true; src = fetchFromGitHub { owner = "cornellius-gp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8W0QSiXl+C86m5yaI9KfGN92uA2VGjGwQt6DI/1NaQE="; + hash = "sha256-jdEJdUFIyM7TTKUHY8epjyZCGolH8nrr7FCyfw+x56s="; }; - patches = [ - (fetchpatch { - # https://github.com/cornellius-gp/gpytorch/pull/2545 - name = "scipy-1.14-compatibility.patch"; - url = "https://github.com/cornellius-gp/gpytorch/commit/2562be472521b8aec366de2619e3130a96fab982.patch"; - excludes = [ "setup.py" ]; - hash = "sha256-znOFpN6go2iIxP24VjJLKF3Laxcr4xV/IyP2y36g4QY="; - }) - ]; - - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ + pythonRelaxDeps = [ "jaxtyping" ]; + + dependencies = [ + jaxtyping linear-operator + mpmath scikit-learn + scipy torch ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "gpytorch" ]; @@ -56,6 +51,7 @@ buildPythonPackage rec { # flaky numerical tests "test_classification_error" "test_matmul_matrix_broadcast" + "test_optimization_optimal_error" # https://github.com/cornellius-gp/gpytorch/issues/2396 "test_t_matmul_matrix" ]; diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix index 1a664c0e936e..f6067dab3b6d 100644 --- a/pkgs/development/python-modules/gql/default.nix +++ b/pkgs/development/python-modules/gql/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "graphql-python"; - repo = pname; + repo = "gql"; rev = "refs/tags/v${version}"; hash = "sha256-jm0X+X8gQyQYn03gT14bdr79+Wd5KL9ryvrU/0VUtEU="; }; @@ -88,44 +88,37 @@ buildPythonPackage rec { export PATH=$out/bin:$PATH ''; - pytestFlagsArray = [ "--asyncio-mode=auto" ]; + pytestFlagsArray = [ + "--asyncio-mode=auto" + "-m 'not online'" + ]; disabledTests = [ # Tests requires network access + "test_async_client_validation_fetch_schema_from_server_valid_query" "test_execute_result_error" + "test_get_introspection_query_ast" + "test_header_query" + "test_hero_name_query" "test_http_transport" + "test_named_query" + "test_query_with_variable" ]; disabledTestPaths = [ # Exclude linter tests "gql-checker/tests/test_flake8_linter.py" "gql-checker/tests/test_pylama_linter.py" - # Tests require network access - "tests/custom_scalars/test_money.py" - "tests/test_aiohttp.py" - "tests/test_appsync_http.py" - "tests/test_appsync_websockets.py" - "tests/test_async_client_validation.py" - "tests/test_graphqlws_exceptions.py" - "tests/test_graphqlws_subscription.py" - "tests/test_phoenix_channel_exceptions.py" - "tests/test_phoenix_channel_exceptions.py" - "tests/test_phoenix_channel_query.py" - "tests/test_phoenix_channel_subscription.py" - "tests/test_requests.py" - "tests/test_websocket_exceptions.py" - "tests/test_websocket_query.py" - "tests/test_websocket_subscription.py" ]; pythonImportsCheck = [ "gql" ]; meta = with lib; { description = "GraphQL client in Python"; - mainProgram = "gql-cli"; homepage = "https://github.com/graphql-python/gql"; changelog = "https://github.com/graphql-python/gql/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "gql-cli"; }; } diff --git a/pkgs/development/python-modules/grad-cam/default.nix b/pkgs/development/python-modules/grad-cam/default.nix index e632650a40a6..09c3473a2038 100644 --- a/pkgs/development/python-modules/grad-cam/default.nix +++ b/pkgs/development/python-modules/grad-cam/default.nix @@ -6,7 +6,7 @@ setuptools, matplotlib, numpy, - opencv4, + opencv-python, pillow, scikit-learn, torch, @@ -17,21 +17,16 @@ buildPythonPackage rec { pname = "grad-cam"; - version = "1.5.2"; + version = "1.5.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-WhC3QjMDh4E8NnO8SyCtg9rFgDJkYP6/xdWNcTvlKFU="; + hash = "sha256-q9PcG836Az+2o1XqeKNh0+z9GN9UGinmGyOAhD5B3Zw="; }; - postPatch = '' - substituteInPlace requirements.txt\ - --replace "opencv-python" "opencv" - ''; - nativeBuildInputs = [ ]; @@ -46,7 +41,7 @@ buildPythonPackage rec { dependencies = [ matplotlib numpy - opencv4 + opencv-python pillow scikit-learn torchvision diff --git a/pkgs/development/python-modules/gradio-pdf/default.nix b/pkgs/development/python-modules/gradio-pdf/default.nix index abceb8b1c5c0..d35698c9f77e 100644 --- a/pkgs/development/python-modules/gradio-pdf/default.nix +++ b/pkgs/development/python-modules/gradio-pdf/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "gradio-pdf"; - version = "0.0.15"; - format = "pyproject"; + version = "0.0.17"; + pyproject = true; src = fetchPypi { pname = "gradio_pdf"; inherit version; - hash = "sha256-R+4CDJo84/+PUTTxoz9CsZlHUVsldgjufWsRkALrfN4="; + hash = "sha256-LoVcwE7eGcK5Nc6qKTnrnI+rNlsDbekhKUP+Fzq2SQ8="; }; - nativeBuildInputs = [ + build-system = [ hatch-fancy-pypi-readme hatch-requirements-txt hatchling @@ -36,10 +36,10 @@ buildPythonPackage rec { # tested in `gradio` doCheck = false; - meta = with lib; { + meta = { description = "Python library for easily interacting with trained machine learning models"; homepage = "https://pypi.org/project/gradio-pdf/"; - license = licenses.asl20; - maintainers = with maintainers; [ pbsds ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pbsds ]; }; } diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix index 327a242a6a21..aa869e445c54 100644 --- a/pkgs/development/python-modules/gradio/client.nix +++ b/pkgs/development/python-modules/gradio/client.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "gradio-client"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { # not to be confused with @gradio/client@${version} rev = "refs/tags/gradio_client@${version}"; sparseCheckout = [ "client/python" ]; - hash = "sha256-UZQWguUN3l0cj2wb2f7A61RTLy9nPYcIEwHIo+F1kR0="; + hash = "sha256-pS7yrqBuq/Pe7sEfReAM6OL2qFQVA+vWra36UuhyDkk="; }; prePatch = '' cd client/python @@ -92,7 +92,7 @@ buildPythonPackage rec { #"-x" "-W" "ignore" # uncomment for debugging help ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # flaky: OSError: Cannot find empty port in range: 7860-7959 "test_layout_components_in_output" "test_layout_and_state_components_in_output" @@ -108,10 +108,11 @@ buildPythonPackage rec { extraArgs = [ "--version-regex" "gradio_client@(.*)" ]; }; - meta = with lib; { + meta = { homepage = "https://www.gradio.app/"; + changelog = "https://github.com/gradio-app/gradio/releases/tag/gradio_client@${version}"; description = "Lightweight library to use any Gradio app as an API"; - license = licenses.asl20; - maintainers = with maintainers; [ pbsds ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pbsds ]; }; } diff --git a/pkgs/development/python-modules/gradio/conftest-skip-network-errors.py b/pkgs/development/python-modules/gradio/conftest-skip-network-errors.py index eb2385bca8d6..a34ee1bbcd87 100644 --- a/pkgs/development/python-modules/gradio/conftest-skip-network-errors.py +++ b/pkgs/development/python-modules/gradio/conftest-skip-network-errors.py @@ -28,6 +28,8 @@ def pytest_runtest_makereport(item, call): for exc in iterate_exc_chain(call.excinfo.value): if isinstance(exc, NixNetworkAccessDeniedError): tr.outcome, tr.wasxfail = 'skipped', "reason: Requires network access." + if isinstance(exc, socket.gaierror): + tr.outcome, tr.wasxfail = 'skipped', "reason: Requires network access." if isinstance(exc, httpx.ConnectError): tr.outcome, tr.wasxfail = 'skipped', "reason: Requires network access." if isinstance(exc, FileNotFoundError): # gradio specific diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index f805f52cb106..1b9e20496f6d 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -64,15 +64,15 @@ buildPythonPackage rec { pname = "gradio"; - version = "4.44.0"; - format = "pyproject"; + version = "5.1.0"; + pyproject = true; disabled = pythonOlder "3.7"; # We use the Pypi release, since it provides prebuilt webui assets src = fetchPypi { inherit pname version; - hash = "sha256-ovjRJ52giPZxVCOv8TuD3kcbgHbDTBqaSBNrrTN1MkE="; + hash = "sha256-0hU2aObeLfegG7M/AaB0/HcW7IY8QPRy2OQ5Q57x4VM="; }; # fix packaging.ParserSyntaxError, which can't handle comments @@ -83,7 +83,11 @@ buildPythonPackage rec { rm -rf venv/ ''; - pythonRelaxDeps = [ "tomlkit" ]; + pythonRelaxDeps = [ + "tomlkit" + "aiofiles" + "markupsafe" + ]; pythonRemoveDeps = [ # our package is presented as a binary, not a python lib - and @@ -91,7 +95,7 @@ buildPythonPackage rec { "ruff" ]; - nativeBuildInputs = [ + build-system = [ hatchling hatch-requirements-txt hatch-fancy-pypi-readme @@ -127,7 +131,7 @@ buildPythonPackage rec { tomlkit ]; - passthru.optional-dependencies.oauth = [ + optional-dependencies.oauth = [ authlib itsdangerous ]; @@ -151,7 +155,7 @@ buildPythonPackage rec { # mock calls to `shutil.which(...)` (writeShellScriptBin "npm" "false") - ] ++ passthru.optional-dependencies.oauth ++ pydantic.optional-dependencies.email; + ] ++ optional-dependencies.oauth ++ pydantic.optional-dependencies.email; # Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail). # We additionally xfail FileNotFoundError, since the gradio devs often fail to upload test assets to pypi. @@ -160,7 +164,7 @@ buildPythonPackage rec { export HOME=$TMPDIR cat ${./conftest-skip-network-errors.py} >> test/conftest.py '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # OSError: [Errno 24] Too many open files ulimit -n 4096 ''; @@ -168,6 +172,7 @@ buildPythonPackage rec { disabledTests = [ # Actually broken "test_mount_gradio_app" + "test_processing_utils_backwards_compatibility" # type error # requires network, it caught our xfail exception "test_error_analytics_successful" @@ -195,7 +200,7 @@ buildPythonPackage rec { # tests if pip and other tools are installed "test_get_executable_path" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # flaky on darwin (depend on port availability) "test_all_status_messages" "test_async_generators" @@ -280,14 +285,16 @@ buildPythonPackage rec { pythonRemoveDeps = (old.pythonRemoveDeps or [ ]) ++ [ "gradio-client" ]; doInstallCheck = false; doCheck = false; + preCheck = ""; pythonImportsCheck = null; dontCheckRuntimeDeps = true; }); - meta = with lib; { + meta = { homepage = "https://www.gradio.app/"; + changelog = "https://github.com/gradio-app/gradio/releases/tag/gradio@${version}"; description = "Python library for easily interacting with trained machine learning models"; - license = licenses.asl20; - maintainers = with maintainers; [ pbsds ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pbsds ]; }; } diff --git a/pkgs/development/python-modules/graph-tool/default.nix b/pkgs/development/python-modules/graph-tool/default.nix index 4d639639e3fe..ff0ab4f62787 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.77"; + version = "2.78"; format = "other"; src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - hash = "sha256-mu/6r1Uo836ZTxuIL3UdsKvuUz+H1FZY9Y3ZbEBK0LQ="; + hash = "sha256-gG9TWKRJISOowRIXI1/ROTIwrVwhxFtMOextXqN6KiU="; }; # Remove error messages about tput during build process without adding ncurses, diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index 254b2ae16a53..2ebc4dbfe9a2 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { "test_should_multiplechoicefield_convert_to_list_of_enum" "test_perform_mutate_success_with_enum_choice_field" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # this test touches files in the "/" directory and fails in darwin sandbox "test_should_filepath_convert_string" ]; diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index 7986f0cd3246..57043658c744 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "graphql-core"; - version = "3.2.3"; + version = "3.2.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LtBbHA5r6/YNh2gKX0+NqQjrpKuMioyOYWT0R59SIL4="; + hash = "sha256-LWmUrkYZuyzQ89Z3dXrce1xk3NODXrHWvWG9zAYTUi0="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/graphrag/default.nix b/pkgs/development/python-modules/graphrag/default.nix index a5c1589a0348..0bc8f6f59dc0 100644 --- a/pkgs/development/python-modules/graphrag/default.nix +++ b/pkgs/development/python-modules/graphrag/default.nix @@ -12,27 +12,25 @@ datashaper, devtools, environs, - fastparquet, graspologic, json-repair, lancedb, + matplotlib, networkx, nltk, - numba, numpy, openai, + pandas, pyaml-env, + pyarrow, pydantic, python-dotenv, pyyaml, rich, - scipy, - swifter, tenacity, - textual, tiktoken, typing-extensions, - uvloop, + umap-learn, nbformat, pytest-asyncio, pytestCheckHook, @@ -40,14 +38,14 @@ buildPythonPackage rec { pname = "graphrag"; - version = "0.3.3"; + version = "0.3.6"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "graphrag"; rev = "refs/tags/v${version}"; - hash = "sha256-x1boxBF3fO+IqHnJx85mjYQHhEG8h03H90T0dtc3CNQ="; + hash = "sha256-H5ITK4m3l+rlIEYXoMIpsE9faCu6rRZuB5zaZQeArOU="; }; build-system = [ @@ -66,27 +64,25 @@ buildPythonPackage rec { datashaper devtools environs - fastparquet graspologic json-repair lancedb + matplotlib networkx nltk - numba numpy openai + pandas pyaml-env + pyarrow pydantic python-dotenv pyyaml rich - scipy - swifter tenacity - textual tiktoken typing-extensions - uvloop + umap-learn ]; env.NUMBA_CACHE_DIR = "$TMPDIR"; diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index 2bf0cfe01c11..7ce60f9f06ff 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { ''; # Too many failures due to attempting to connect to com.apple.fonts daemon - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Simple Python interface for Graphviz"; diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index c6a72fc6ee34..7833df472eb7 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -42,7 +42,11 @@ buildPythonPackage rec { poetry-dynamic-versioning ]; - pythonRelaxDeps = [ "scipy" ]; + pythonRelaxDeps = [ + "beartype" + "hyppo" + "scipy" + ]; dependencies = [ anytree @@ -83,8 +87,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://graspologic-org.github.io/graspologic"; description = "Package for graph statistical algorithms"; + homepage = "https://graspologic-org.github.io/graspologic"; + changelog = "https://github.com/graspologic-org/graspologic/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/great-expectations/default.nix b/pkgs/development/python-modules/great-expectations/default.nix new file mode 100644 index 000000000000..04a180c15eb3 --- /dev/null +++ b/pkgs/development/python-modules/great-expectations/default.nix @@ -0,0 +1,135 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + altair, + cryptography, + jinja2, + jsonschema, + marshmallow, + mistune, + numpy, + packaging, + pandas, + posthog, + pydantic, + pyparsing, + python-dateutil, + requests, + ruamel-yaml, + scipy, + tqdm, + tzlocal, + + # test + pytestCheckHook, + pytest-mock, + pytest-order, + pytest-random-order, + click, + flaky, + freezegun, + invoke, + moto, + psycopg2, + requirements-parser, + responses, + sqlalchemy, +}: + +buildPythonPackage rec { + pname = "great-expectations"; + version = "1.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "great-expectations"; + repo = "great_expectations"; + rev = "refs/tags/${version}"; + hash = "sha256-TV07vmc0XdP6ICv7Kws79zACCsahZ6FlhplJHbpDFNk="; + }; + + postPatch = '' + substituteInPlace tests/conftest.py --replace 'locale.setlocale(locale.LC_ALL, "en_US.UTF-8")' "" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + altair + cryptography + jinja2 + jsonschema + marshmallow + mistune + numpy + packaging + pandas + posthog + pydantic + pyparsing + python-dateutil + requests + ruamel-yaml + scipy + tqdm + tzlocal + ]; + + pythonRelaxDeps = [ + "altair" + "pandas" + "posthog" + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + pytest-order + pytest-random-order + click + flaky + freezegun + invoke + moto + psycopg2 + requirements-parser + responses + sqlalchemy + ] ++ moto.optional-dependencies.s3 ++ moto.optional-dependencies.sns; + + disabledTestPaths = [ + # try to access external URLs: + "tests/integration/cloud/rest_contracts" + "tests/integration/spark" + + # moto-related import errors: + "tests/actions" + "tests/data_context" + "tests/datasource" + "tests/execution_engine" + + # locale-related rendering issues, mostly: + "tests/core/test__docs_decorators.py" + "tests/expectations/test_expectation_atomic_renderers.py" + "tests/render" + ]; + + disabledTests = [ + # tries to access network: + "test_checkpoint_run_with_data_docs_and_slack_actions_emit_page_links" + "test_checkpoint_run_with_slack_action_no_page_links" + ]; + + pythonImportsCheck = [ "great_expectations" ]; + pytestFlagsArray = [ "-m 'not spark and not postgresql and not snowflake'" ]; + + meta = { + description = "Library for writing unit tests for data validation"; + homepage = "https://docs.greatexpectations.io"; + changelog = "https://github.com/great-expectations/great_expectations/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/great-tables/default.nix b/pkgs/development/python-modules/great-tables/default.nix index bca215084c16..ec2a4dac5028 100644 --- a/pkgs/development/python-modules/great-tables/default.nix +++ b/pkgs/development/python-modules/great-tables/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "great-tables"; - version = "0.11.1"; + version = "0.12.0"; pyproject = true; src = fetchFromGitHub { owner = "posit-dev"; repo = "great-tables"; rev = "refs/tags/v${version}"; - hash = "sha256-IlukgnhOT8NF1WxRJCnNuNEI31DByWoNzbk/x458atA="; + hash = "sha256-+n8s8cmsQizEUuRGzFrOxhWL0C9OQO506msiHD58jGQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix index 2ed9792df3b2..1e7385851094 100644 --- a/pkgs/development/python-modules/greatfet/default.nix +++ b/pkgs/development/python-modules/greatfet/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "greatfet"; - version = "2024.0.2"; + version = "2024.0.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "greatscottgadgets"; repo = "greatfet"; rev = "refs/tags/v${version}"; - hash = "sha256-1GfyhxwA6Nhf/umvllR/hkh5hyn42141QOT7+6IGAis="; + hash = "sha256-jdOTEOotLiIxA9TxmFGOjP8IZ/8xo7mzXSJRg3A5Ri4="; }; sourceRoot = "${src.name}/host"; diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index 3970ef993cb5..50aa51e82e92 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Discover, connect and control Gree based minisplit systems"; homepage = "https://github.com/cmroche/greeclimate"; changelog = "https://github.com/cmroche/greeclimate/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/development/python-modules/greek-accentuation/default.nix b/pkgs/development/python-modules/greek-accentuation/default.nix new file mode 100644 index 000000000000..a40448f569a9 --- /dev/null +++ b/pkgs/development/python-modules/greek-accentuation/default.nix @@ -0,0 +1,19 @@ +{ + buildPythonPackage, + lib, + fetchPypi, +}: +buildPythonPackage rec { + pname = "greek-accentuation"; + version = "1.2.0"; + src = fetchPypi { + inherit pname version; + hash = "sha256-l2HZXdqlLubvy2bWhhZVYGMpF0DXVKTDFehkcGF5xdk="; + }; + meta = with lib; { + description = "Python 3 library for accenting (and analyzing the accentuation of) Ancient Greek words"; + homepage = "https://github.com/jtauber/greek-accentuation"; + license = licenses.mit; + maintainers = with maintainers; [ kmein ]; + }; +} diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 2ea828cd4174..2dd2b9d8fa43 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -16,20 +16,15 @@ let greenlet = buildPythonPackage rec { pname = "greenlet"; - version = "3.0.3"; + version = "3.1.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-QzdEQjUyWVVM4zWZ2otpLVqpb4l21WfUut8mM3H75JE="; + hash = "sha256-TOOsbNtq33lGR11+8xd3wm2UvMw3fgcKeYa9LVxRVGc="; }; - patches = [ - # https://github.com/python-greenlet/greenlet/pull/396 - ./python-3.13-compat.patch - ]; - - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # tests in passthru, infinite recursion via objgraph/graphviz doCheck = false; diff --git a/pkgs/development/python-modules/greenlet/python-3.13-compat.patch b/pkgs/development/python-modules/greenlet/python-3.13-compat.patch deleted file mode 100644 index 9f5488b831d3..000000000000 --- a/pkgs/development/python-modules/greenlet/python-3.13-compat.patch +++ /dev/null @@ -1,313 +0,0 @@ -Port of https://github.com/python-greenlet/greenlet/pull/396 - -From 94979488f841fcb41bd2bd3b80b5c0b011af4c94 Mon Sep 17 00:00:00 2001 -From: Victor Stinner <vstinner@python.org> -Date: Wed, 14 Feb 2024 16:37:42 +0100 -Subject: [PATCH 1/5] Fix #392: Port to Python 3.13 - -* Replace C_RECURSION_LIMIT with Py_C_RECURSION_LIMIT. -* Add Py_C_RECURSION_LIMIT for Python 3.12 and older. -* Disable GREENLET_USE_CFRAME on Python 3.13. -* Define Py_BUILD_CORE to include pycore_frame.h. ---- - src/greenlet/TPythonState.cpp | 10 +++++++--- - src/greenlet/greenlet_cpython_compat.hpp | 13 +++++++++++-- - src/greenlet/greenlet_greenlet.hpp | 1 + - 3 files changed, 19 insertions(+), 5 deletions(-) - -diff --git a/src/greenlet/TPythonState.cpp b/src/greenlet/TPythonState.cpp -index 465d4174..c0dbf703 100644 ---- a/src/greenlet/TPythonState.cpp -+++ b/src/greenlet/TPythonState.cpp -@@ -130,11 +130,13 @@ void PythonState::operator<<(const PyThreadState *const tstate) noexcept - #if GREENLET_PY311 - #if GREENLET_PY312 - this->py_recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining; -- this->c_recursion_depth = C_RECURSION_LIMIT - tstate->c_recursion_remaining; -+ this->c_recursion_depth = Py_C_RECURSION_LIMIT - tstate->c_recursion_remaining; - #else // not 312 - this->recursion_depth = tstate->recursion_limit - tstate->recursion_remaining; - #endif // GREENLET_PY312 -+ #if GREENLET_USE_CFRAME - this->current_frame = tstate->cframe->current_frame; -+ #endif - this->datastack_chunk = tstate->datastack_chunk; - this->datastack_top = tstate->datastack_top; - this->datastack_limit = tstate->datastack_limit; -@@ -199,12 +201,14 @@ void PythonState::operator>>(PyThreadState *const tstate) noexcept - #if GREENLET_PY311 - #if GREENLET_PY312 - tstate->py_recursion_remaining = tstate->py_recursion_limit - this->py_recursion_depth; -- tstate->c_recursion_remaining = C_RECURSION_LIMIT - this->c_recursion_depth; -+ tstate->c_recursion_remaining = Py_C_RECURSION_LIMIT - this->c_recursion_depth; - this->unexpose_frames(); - #else // \/ 3.11 - tstate->recursion_remaining = tstate->recursion_limit - this->recursion_depth; - #endif // GREENLET_PY312 -+ #if GREENLET_USE_CFRAME - tstate->cframe->current_frame = this->current_frame; -+ #endif - tstate->datastack_chunk = this->datastack_chunk; - tstate->datastack_top = this->datastack_top; - tstate->datastack_limit = this->datastack_limit; -@@ -238,7 +242,7 @@ void PythonState::set_initial_state(const PyThreadState* const tstate) noexcept - #if GREENLET_PY312 - this->py_recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining; - // XXX: TODO: Comment from a reviewer: -- // Should this be ``C_RECURSION_LIMIT - tstate->c_recursion_remaining``? -+ // Should this be ``Py_C_RECURSION_LIMIT - tstate->c_recursion_remaining``? - // But to me it looks more like that might not be the right - // initialization either? - this->c_recursion_depth = tstate->py_recursion_limit - tstate->py_recursion_remaining; -diff --git a/src/greenlet/greenlet_cpython_compat.hpp b/src/greenlet/greenlet_cpython_compat.hpp -index cdc1617f..c0fb94c5 100644 ---- a/src/greenlet/greenlet_cpython_compat.hpp -+++ b/src/greenlet/greenlet_cpython_compat.hpp -@@ -12,19 +12,24 @@ - - #if PY_VERSION_HEX >= 0x30A00B1 - # define GREENLET_PY310 1 -+#else -+# define GREENLET_PY310 0 -+#endif -+ - /* - Python 3.10 beta 1 changed tstate->use_tracing to a nested cframe member. - See https://github.com/python/cpython/pull/25276 - We have to save and restore this as well. -+ -+Python 3.13 removed PyThreadState.cframe (GH-108035). - */ -+#if GREENLET_PY310 && PY_VERSION_HEX < 0x30D0000 - # define GREENLET_USE_CFRAME 1 - #else - # define GREENLET_USE_CFRAME 0 --# define GREENLET_PY310 0 - #endif - - -- - #if PY_VERSION_HEX >= 0x30B00A4 - /* - Greenlet won't compile on anything older than Python 3.11 alpha 4 (see -@@ -124,4 +129,8 @@ static inline void PyThreadState_LeaveTracing(PyThreadState *tstate) - } - #endif - -+#if !defined(Py_C_RECURSION_LIMIT) && defined(C_RECURSION_LIMIT) -+# define Py_C_RECURSION_LIMIT C_RECURSION_LIMIT -+#endif -+ - #endif /* GREENLET_CPYTHON_COMPAT_H */ -diff --git a/src/greenlet/greenlet_greenlet.hpp b/src/greenlet/greenlet_greenlet.hpp -index d52ce1fd..6da6841f 100644 ---- a/src/greenlet/greenlet_greenlet.hpp -+++ b/src/greenlet/greenlet_greenlet.hpp -@@ -23,6 +23,7 @@ using greenlet::refs::BorrowedGreenlet; - #endif - - #if GREENLET_PY312 -+# define Py_BUILD_CORE - # include "internal/pycore_frame.h" - #endif - - -From 00611d7567d09869973fe314f60575674cc877d8 Mon Sep 17 00:00:00 2001 -From: Victor Stinner <vstinner@python.org> -Date: Mon, 3 Jun 2024 10:55:14 +0200 -Subject: [PATCH 3/5] Support delete_later - ---- - src/greenlet/TPythonState.cpp | 14 ++++++++++++-- - src/greenlet/greenlet.cpp | 4 ++++ - src/greenlet/greenlet_cpython_compat.hpp | 6 ++++++ - src/greenlet/greenlet_greenlet.hpp | 4 ++++ - 4 files changed, 26 insertions(+), 2 deletions(-) - -diff --git a/src/greenlet/TPythonState.cpp b/src/greenlet/TPythonState.cpp -index c0dbf703..bfb40cac 100644 ---- a/src/greenlet/TPythonState.cpp -+++ b/src/greenlet/TPythonState.cpp -@@ -18,7 +18,11 @@ PythonState::PythonState() - #else - ,recursion_depth(0) - #endif -+#if GREENLET_PY313 -+ ,delete_later(nullptr) -+#else - ,trash_delete_nesting(0) -+#endif - #if GREENLET_PY311 - ,current_frame(nullptr) - ,datastack_chunk(nullptr) -@@ -145,7 +149,9 @@ void PythonState::operator<<(const PyThreadState *const tstate) noexcept - Py_XDECREF(frame); // PyThreadState_GetFrame gives us a new - // reference. - this->_top_frame.steal(frame); -- #if GREENLET_PY312 -+ #if GREENLET_PY313 -+ this->delete_later = Py_XNewRef(tstate->delete_later); -+ #elif GREENLET_PY312 - this->trash_delete_nesting = tstate->trash.delete_nesting; - #else // not 312 - this->trash_delete_nesting = tstate->trash_delete_nesting; -@@ -213,7 +219,11 @@ void PythonState::operator>>(PyThreadState *const tstate) noexcept - tstate->datastack_top = this->datastack_top; - tstate->datastack_limit = this->datastack_limit; - this->_top_frame.relinquish_ownership(); -- #if GREENLET_PY312 -+ #if GREENLET_PY313 -+ Py_XDECREF(tstate->delete_later); -+ tstate->delete_later = this->delete_later; -+ Py_CLEAR(this->delete_later); -+ #elif GREENLET_PY312 - tstate->trash.delete_nesting = this->trash_delete_nesting; - #else // not 3.12 - tstate->trash_delete_nesting = this->trash_delete_nesting; -diff --git a/src/greenlet/greenlet.cpp b/src/greenlet/greenlet.cpp -index 5a9818e8..dfc748a8 100644 ---- a/src/greenlet/greenlet.cpp -+++ b/src/greenlet/greenlet.cpp -@@ -1328,6 +1328,7 @@ mod_enable_optional_cleanup(PyObject* UNUSED(module), PyObject* flag) - Py_RETURN_NONE; - } - -+#if !GREENLET_PY313 - PyDoc_STRVAR(mod_get_tstate_trash_delete_nesting_doc, - "get_tstate_trash_delete_nesting() -> Integer\n" - "\n" -@@ -1343,6 +1344,7 @@ mod_get_tstate_trash_delete_nesting(PyObject* UNUSED(module)) - return PyLong_FromLong(tstate->trash_delete_nesting); - #endif - } -+#endif - - static PyMethodDef GreenMethods[] = { - {"getcurrent", -@@ -1356,7 +1358,9 @@ static PyMethodDef GreenMethods[] = { - {"get_total_main_greenlets", (PyCFunction)mod_get_total_main_greenlets, METH_NOARGS, mod_get_total_main_greenlets_doc}, - {"get_clocks_used_doing_optional_cleanup", (PyCFunction)mod_get_clocks_used_doing_optional_cleanup, METH_NOARGS, mod_get_clocks_used_doing_optional_cleanup_doc}, - {"enable_optional_cleanup", (PyCFunction)mod_enable_optional_cleanup, METH_O, mod_enable_optional_cleanup_doc}, -+#if !GREENLET_PY313 - {"get_tstate_trash_delete_nesting", (PyCFunction)mod_get_tstate_trash_delete_nesting, METH_NOARGS, mod_get_tstate_trash_delete_nesting_doc}, -+#endif - {NULL, NULL} /* Sentinel */ - }; - -diff --git a/src/greenlet/greenlet_cpython_compat.hpp b/src/greenlet/greenlet_cpython_compat.hpp -index c0fb94c5..ce5fd882 100644 ---- a/src/greenlet/greenlet_cpython_compat.hpp -+++ b/src/greenlet/greenlet_cpython_compat.hpp -@@ -55,6 +55,12 @@ Greenlet won't compile on anything older than Python 3.11 alpha 4 (see - # define GREENLET_PY312 0 - #endif - -+#if PY_VERSION_HEX >= 0x30D0000 -+# define GREENLET_PY313 1 -+#else -+# define GREENLET_PY313 0 -+#endif -+ - #ifndef Py_SET_REFCNT - /* Py_REFCNT and Py_SIZE macros are converted to functions - https://bugs.python.org/issue39573 */ -diff --git a/src/greenlet/greenlet_greenlet.hpp b/src/greenlet/greenlet_greenlet.hpp -index 6da6841f..fbfdfbfc 100644 ---- a/src/greenlet/greenlet_greenlet.hpp -+++ b/src/greenlet/greenlet_greenlet.hpp -@@ -111,7 +111,11 @@ namespace greenlet - #else - int recursion_depth; - #endif -+#if GREENLET_PY313 -+ PyObject *delete_later; -+#else - int trash_delete_nesting; -+#endif - #if GREENLET_PY311 - _PyInterpreterFrame* current_frame; - _PyStackChunk* datastack_chunk; - -From b65558ec962d3d81ae09787ebca8686d233e2a4c Mon Sep 17 00:00:00 2001 -From: Victor Stinner <vstinner@python.org> -Date: Wed, 5 Jun 2024 12:04:21 +0200 -Subject: [PATCH 4/5] Fix current_frame - ---- - src/greenlet/TPythonState.cpp | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/greenlet/TPythonState.cpp b/src/greenlet/TPythonState.cpp -index bfb40cac..82eb34f0 100644 ---- a/src/greenlet/TPythonState.cpp -+++ b/src/greenlet/TPythonState.cpp -@@ -138,7 +138,9 @@ void PythonState::operator<<(const PyThreadState *const tstate) noexcept - #else // not 312 - this->recursion_depth = tstate->recursion_limit - tstate->recursion_remaining; - #endif // GREENLET_PY312 -- #if GREENLET_USE_CFRAME -+ #if GREENLET_PY313 -+ this->current_frame = tstate->current_frame; -+ #elif GREENLET_USE_CFRAME - this->current_frame = tstate->cframe->current_frame; - #endif - this->datastack_chunk = tstate->datastack_chunk; -@@ -212,7 +214,9 @@ void PythonState::operator>>(PyThreadState *const tstate) noexcept - #else // \/ 3.11 - tstate->recursion_remaining = tstate->recursion_limit - this->recursion_depth; - #endif // GREENLET_PY312 -- #if GREENLET_USE_CFRAME -+ #if GREENLET_PY313 -+ tstate->current_frame = this->current_frame; -+ #elif GREENLET_USE_CFRAME - tstate->cframe->current_frame = this->current_frame; - #endif - tstate->datastack_chunk = this->datastack_chunk; - -From b7cfc1748766cac351fe5fca32fa7c8cacdea2ae Mon Sep 17 00:00:00 2001 -From: Victor Stinner <vstinner@python.org> -Date: Wed, 5 Jun 2024 12:17:28 +0200 -Subject: [PATCH 5/5] Update tests - ---- - src/greenlet/tests/test_greenlet.py | 4 +++- - src/greenlet/tests/test_greenlet_trash.py | 9 +++++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/src/greenlet/tests/test_greenlet.py b/src/greenlet/tests/test_greenlet.py -index 51849cd6..259707ae 100644 ---- a/src/greenlet/tests/test_greenlet.py -+++ b/src/greenlet/tests/test_greenlet.py -@@ -471,7 +471,9 @@ def creator(): - # Unfortunately, this doesn't actually clear the references, they're in the - # fast local array. - if not wait_for_cleanup: -- result[0].gr_frame.f_locals.clear() -+ # f_locals has no clear method in Python 3.13 -+ if hasattr(result[0].gr_frame.f_locals, 'clear'): -+ result[0].gr_frame.f_locals.clear() - else: - self.assertIsNone(result[0].gr_frame) - -diff --git a/src/greenlet/tests/test_greenlet_trash.py b/src/greenlet/tests/test_greenlet_trash.py -index 8d9716e9..2bce8fd0 100644 ---- a/src/greenlet/tests/test_greenlet_trash.py -+++ b/src/greenlet/tests/test_greenlet_trash.py -@@ -29,8 +29,17 @@ - - import unittest - -+try: -+ from greenlet._greenlet import get_tstate_trash_delete_nesting -+except ImportError: -+ get_tstate_trash_delete_nesting = None -+ -+ - class TestTrashCanReEnter(unittest.TestCase): - -+ # Python 3.13 has not "trash delete nesting" anymore (but "delete later") -+ @unittest.skipIf(get_tstate_trash_delete_nesting is None, -+ 'need get_tstate_trash_delete_nesting()') - def test_it(self): - # Try several times to trigger it, because it isn't 100% - # reliable. diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix index f6539af40f5f..78b823296725 100644 --- a/pkgs/development/python-modules/gremlinpython/default.nix +++ b/pkgs/development/python-modules/gremlinpython/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "gremlinpython"; - version = "3.7.1"; + version = "3.7.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "apache"; repo = "tinkerpop"; rev = "refs/tags/${version}"; - hash = "sha256-2viZXksHNFynOm6+1Vo2a8xrXl4pQcAxAVgehp5y6us="; + hash = "sha256-Yc0l3kE+6dM9v4QUZPFpm/yjDCrqVO35Vy5srEjAExE="; }; sourceRoot = "${src.name}/gremlin-python/src/main/python"; diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index ddb9195df7f8..aed63cf3ef41 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "1.3.1"; + version = "1.5.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-aRztItjmCTAJuA/ZkQBJFx/uyH64Us2h5ad1kVsmKlY="; + hash = "sha256-DeXmKswapXPYGTiJLq2yvCwJywCNl79XYHSau0VCCIY="; }; build-system = [ pdm-backend ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { pytestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiofiles ]; }; 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 17ede6dee378..0f0062f4a344 100644 --- a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix +++ b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "grpc-google-iam-v1"; - version = "0.13.0"; + version = "0.13.1"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-grpc-google-iam-v1"; rev = "refs/tags/v${version}"; - hash = "sha256-pmwHDzOaXrgqXZiaxIn01CtiAG+XRBGr8BgzbG/F1uw="; + hash = "sha256-FLDx2zbM0qqLa+k/7xexyv5/YHlSOdikrbU2eYbxDM0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix index 3c72da10f9d8..c1e6a20f17bf 100644 --- a/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -7,15 +7,18 @@ protobuf, }: +# This package should be updated together with the main grpc package and other +# related python grpc packages. +# nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-channelz"; - version = "1.65.4"; + version = "1.67.0"; pyproject = true; src = fetchPypi { pname = "grpcio_channelz"; inherit version; - hash = "sha256-Ia92P8FT3+bv18k402znrt3QTDovPBCgCJ/Eqm8WDic="; + hash = "sha256-F2Jfq6lOYn4RsjP9Ay21G67F6HkGeY3SIEk26Z0BWnE="; }; 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 f23b61a8b803..ff73160db9a8 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -6,15 +6,18 @@ protobuf, }: +# This package should be updated together with the main grpc package and other +# related python grpc packages. +# nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.65.4"; + version = "1.67.0"; format = "setuptools"; src = fetchPypi { pname = "grpcio_health_checking"; inherit version; - hash = "sha256-HoQfbbBaAFGmLMSNQN0tzJ5xdYS7GQSa1R+2cygbnEo="; + hash = "sha256-PepxXVboJQ/wW6Se9RF/g2skD/N5vkY2DCbO/ZydsRo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index 3ed0064e081f..b00a0bb51b73 100644 --- a/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -7,15 +7,18 @@ protobuf, }: +# This package should be updated together with the main grpc package and other +# related python grpc packages. +# nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-reflection"; - version = "1.65.4"; + version = "1.67.0"; pyproject = true; src = fetchPypi { pname = "grpcio_reflection"; inherit version; - hash = "sha256-jGuWDD9DBoHoivWfafq1pXW3eyn1xqHXFuqsXPHBpJ0="; + hash = "sha256-xHFDc4sYl7bOSvXg4zjIXJruX9y7M1XTaKjcrkbYkzw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index 2486ba8aa7cd..27de864281cb 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -8,9 +8,12 @@ pythonOlder, }: +# This package should be updated together with the main grpc package and other +# related python grpc packages. +# nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-status"; - version = "1.64.1"; + version = "1.67.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_status"; inherit version; - hash = "sha256-xQvRTrZQbYWApsVTvqRj18CEmbLA6T9tGGTF6Oq7EGY="; + hash = "sha256-w+Wob6AH6eJjzV+YioqQdITaTKq1godOoqSmCSc0BGs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index 7e4c7d8b206e..1a174b5ba587 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -8,9 +8,12 @@ setuptools, }: +# This package should be updated together with the main grpc package and other +# related python grpc packages. +# nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.65.4"; + version = "1.67.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_testing"; inherit version; - hash = "sha256-iCbY9Ika+NWuBuFqt+FG+8VZTvQZMj4wMW9NDdBnWcY="; + hash = "sha256-YVRnu0aObDSfYCIKlrvMKin70hmwDdip96I+Qyi7+Dw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index acd09b1eb425..51b1012a972e 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -7,15 +7,18 @@ setuptools, }: +# This package should be updated together with the main grpc package and other +# related python grpc packages. +# nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.65.1"; + version = "1.67.0"; pyproject = true; src = fetchPypi { pname = "grpcio_tools"; inherit version; - hash = "sha256-JM/+i8kPuCN/C88kC9bHAwQlX+J7adsyYBSZoEP4cb4="; + hash = "sha256-GBs9TmG4MULBguw2bzB5sAI1CXQ5huVMlGXKOMrCVfg="; }; outputs = [ diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 44c591d783a2..c8c98cd8a031 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -2,28 +2,30 @@ lib, stdenv, buildPythonPackage, - fetchPypi, - grpc, - six, - protobuf, - enum34 ? null, - futures ? null, - isPy27, - pkg-config, - cython, c-ares, + cython, + fetchPypi, openssl, + pkg-config, + protobuf, + pythonOlder, + setuptools, zlib, }: +# This package should be updated together with the main grpc package and other +# related python grpc packages. +# nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio"; - format = "setuptools"; - version = "1.64.1"; + version = "1.67.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-jVHdHFnV+g80JmuAo4BewpofJkJcKlRzYTP22H/Eloo="; + hash = "sha256-4JCyVT4Noch1RJyOdQc91EFd1xyb3mpAYkD99MDuRnw="; }; outputs = [ @@ -31,6 +33,8 @@ buildPythonPackage rec { "dev" ]; + build-system = [ setuptools ]; + nativeBuildInputs = [ cython pkg-config @@ -41,15 +45,8 @@ buildPythonPackage rec { openssl zlib ]; - propagatedBuildInputs = - [ - six - protobuf - ] - ++ lib.optionals (isPy27) [ - enum34 - futures - ]; + + dependencies = [ protobuf ]; preBuild = '' @@ -58,7 +55,7 @@ buildPythonPackage rec { GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS=1 fi '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' unset AR ''; @@ -76,8 +73,9 @@ buildPythonPackage rec { meta = with lib; { description = "HTTP/2-based RPC framework"; - license = licenses.asl20; homepage = "https://grpc.io/grpc/python/"; + changelog = "https://github.com/grpc/grpc/releases/tag/v${version}"; + license = licenses.asl20; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index e0b270c95c07..28c9a5aa3d25 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gsd"; - version = "3.3.2"; + version = "3.4.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = "gsd"; rev = "refs/tags/v${version}"; - hash = "sha256-4NxZPu4DrwQW6qHeYairefabfN7J0+48tvVwi6ti4vk="; + hash = "sha256-4HJZZ5UUENHhKePfau6KT4E4qA9YCGpe/IMLyf5egsk="; }; build-system = [ diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index efcc03f3bc2b..b6c427894587 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "gspread"; - version = "6.1.2"; + version = "6.1.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "burnash"; repo = "gspread"; rev = "refs/tags/v${version}"; - hash = "sha256-hvT4e1l3MTT3WMDSfKvZ7BU8dzkzgPROHrnx5mKyCR4="; + hash = "sha256-xW0PoWMLOtg6+0oqRJxhraNrkndvlbSzyActxjnvUmw="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 08683996db8d..525cfa3208a6 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -53,10 +53,10 @@ buildPythonPackage rec { dependencies = [ decorator ]; - buildInputs = lib.optionals stdenv.isDarwin [ GSS ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ GSS ]; # k5test is marked as broken on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ k5test diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 27d4d0f86964..5c0b7f3146e7 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "gst-python"; - version = "1.24.3"; + version = "1.24.7"; format = "other"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-python/${pname}-${version}.tar.xz"; - hash = "sha256-7Ns+K6lOosgrk6jHFdWn4E+XJqiDjAprF2lJKP0ehZU="; + hash = "sha256-bD7gKyDICobiQkWwYQLa4A4BdobydAdib0TcA6w8pTo="; }; # Python 2.x is not supported. @@ -53,8 +53,6 @@ buildPythonPackage rec { "-Dpython=${python.pythonOnBuildForHost.interpreter}" ]; - doCheck = true; - # TODO: Meson setup hook does not like buildPythonPackage # https://github.com/NixOS/nixpkgs/issues/47390 installCheckPhase = "meson test --print-errorlogs"; diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix index d4d724c4b8c5..74e24d1c8470 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.3"; + version = "2.5.4"; pyproject = true; src = fetchFromGitHub { owner = "pndurette"; repo = "gTTS"; rev = "refs/tags/v${version}"; - hash = "sha256-8FPKAMVXqw/4X050tAnOAx/wGboZPPJs72VwwaOEamE="; + hash = "sha256-ryTR7cESDO9pH5r2FBz+6JuNMEQr39hil/FSklgaIGg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/guidance/default.nix b/pkgs/development/python-modules/guidance/default.nix index f930e4ddd4e7..cb153aab3b64 100644 --- a/pkgs/development/python-modules/guidance/default.nix +++ b/pkgs/development/python-modules/guidance/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "guidance"; - version = "0.1.11"; + version = "0.1.16"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "guidance-ai"; repo = "guidance"; rev = "refs/tags/${version}"; - hash = "sha256-dvIJeSur3DdNBhrEPNPghxqmDEEig59Iz83LWksim6U="; + hash = "sha256-dPakdT97cuLv4OwdaUFncopD5X6uXGyUjwzqn9fxnhU="; }; nativeBuildInputs = [ pybind11 ]; @@ -79,6 +79,9 @@ buildPythonPackage rec { "test_recursion_error" "test_openai_class_detection" "test_openai_chat_without_roles" + + # flaky tests + "test_remote_mock_gen" # frequently fails when building packages in parallel ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/guidata/default.nix b/pkgs/development/python-modules/guidata/default.nix new file mode 100644 index 000000000000..3026e968846f --- /dev/null +++ b/pkgs/development/python-modules/guidata/default.nix @@ -0,0 +1,96 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + numpy, + qtpy, + h5py, + requests, + tomli, + + # tests + pytestCheckHook, + qt6, + pyqt6, + + # passthru.tests + guidata, + pyside6, + qt5, + pyqt5, + pyside2, +}: + +buildPythonPackage rec { + pname = "guidata"; + version = "3.7.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "PlotPyStack"; + repo = "guidata"; + rev = "refs/tags/v${version}"; + hash = "sha256-Qao10NyqFLysx/9AvORX+EIrQlnQJQhSYkVHeTwIutQ="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + numpy + qtpy + h5py + requests + tomli + ]; + + nativeCheckInputs = [ + pytestCheckHook + # Not propagating this, to allow one to choose to choose a pyqt / pyside + # implementation. + pyqt6 + ]; + + preCheck = '' + export QT_PLUGIN_PATH="${lib.getBin qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}" + export QT_QPA_PLATFORM=offscreen + ''; + + pythonImportsCheck = [ "guidata" ]; + + passthru = { + tests = { + # Should be compatible with all of these Qt implementations + withPyQt6 = guidata.override { + pyqt6 = pyqt6; + qt6 = qt6; + }; + withPySide6 = guidata.override { + pyqt6 = pyside6; + qt6 = qt6; + }; + withPyQt5 = guidata.override { + pyqt6 = pyqt5; + qt6 = qt5; + }; + withPySide2 = guidata.override { + pyqt6 = pyside2; + qt6 = qt5; + }; + }; + }; + + meta = { + description = "Python library generating graphical user interfaces for easy dataset editing and display"; + homepage = "https://github.com/PlotPyStack/guidata"; + changelog = "https://github.com/PlotPyStack/guidata/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/gumath/default.nix b/pkgs/development/python-modules/gumath/default.nix index 83b45412b0ff..f478acffb27e 100644 --- a/pkgs/development/python-modules/gumath/default.nix +++ b/pkgs/development/python-modules/gumath/default.nix @@ -50,7 +50,7 @@ buildPythonPackage { 'add_runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]' ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath ${libgumath}/lib $out/${python.sitePackages}/gumath/_gumath.*.so ''; diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 45a7b6862421..d6130ef31287 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -17,7 +17,7 @@ setproctitle, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -50,7 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ] ++ lib.flatten (lib.attrValues optional-dependencies); meta = { diff --git a/pkgs/development/python-modules/gymnasium/default.nix b/pkgs/development/python-modules/gymnasium/default.nix index 5cb114c51490..b730ef5c5a9d 100644 --- a/pkgs/development/python-modules/gymnasium/default.nix +++ b/pkgs/development/python-modules/gymnasium/default.nix @@ -1,48 +1,53 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, - numpy, + + # dependencies cloudpickle, - gym-notices, - jax-jumpy, - typing-extensions, farama-notifications, - importlib-metadata, + numpy, + typing-extensions, pythonOlder, - ffmpeg, + importlib-metadata, + + # tests + dill, + flax, jax, jaxlib, matplotlib, + mujoco, moviepy, opencv4, pybox2d, pygame, pytestCheckHook, scipy, - stdenv, }: buildPythonPackage rec { pname = "gymnasium"; - version = "0.29.1"; - format = "pyproject"; + version = "1.0.0"; + + pyproject = true; src = fetchFromGitHub { owner = "Farama-Foundation"; repo = "gymnasium"; rev = "refs/tags/v${version}"; - hash = "sha256-L7fn9FaJzXwQhjDKwI9hlFpbPuQdwynU+Xjd8bbjxiw="; + hash = "sha256-Qchuz08yJ0giVrtKLC9vBgr28JrHQyAOCuoS239ivVw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cloudpickle farama-notifications - gym-notices - jax-jumpy numpy typing-extensions ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; @@ -50,11 +55,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "gymnasium" ]; nativeCheckInputs = [ - ffmpeg + dill + flax jax jaxlib matplotlib moviepy + mujoco opencv4 pybox2d pygame @@ -66,23 +73,33 @@ buildPythonPackage rec { # marked as broken and throws an error during evaluation if the package is evaluated anyway. # disabling checks on Darwin avoids this and allows the package to be built. # if jaxlib is ever fixed on Darwin, remove this. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTestPaths = [ - # mujoco is required for those tests but the mujoco python bindings are not packaged in nixpkgs. + # Unpackaged `mujoco-py` (Openai's mujoco) is required for these tests. "tests/envs/mujoco/test_mujoco_custom_env.py" + "tests/envs/mujoco/test_mujoco_rendering.py" + "tests/envs/mujoco/test_mujoco_v5.py" - # Those tests need to write on the filesystem which cause them to fail. - "tests/experimental/wrappers/test_record_video.py" + # Rendering tests failing in the sandbox + "tests/wrappers/vector/test_human_rendering.py" + + # These tests need to write on the filesystem which cause them to fail. "tests/utils/test_save_video.py" "tests/wrappers/test_record_video.py" - "tests/wrappers/test_video_recorder.py" ]; - meta = with lib; { + disabledTests = [ + # Succeeds for most environments but `test_render_modes[Reacher-v4]` fails because it requires + # OpenGL access which is not possible inside the sandbox. + "test_render_mode" + ]; + + meta = { description = "Standard API for reinforcement learning and a diverse set of reference environments (formerly Gym)"; homepage = "https://github.com/Farama-Foundation/Gymnasium"; - license = licenses.mit; - maintainers = with maintainers; [ GaetanLepage ]; + changelog = "https://github.com/Farama-Foundation/Gymnasium/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/gyp/default.nix b/pkgs/development/python-modules/gyp/default.nix index ad9fb88eb7ba..b8d52cd944c4 100644 --- a/pkgs/development/python-modules/gyp/default.nix +++ b/pkgs/development/python-modules/gyp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { hash = "sha256-LUlF2VhRnuDwJLdITgmXIQV/IuKdx1KXQkiPVHKrl4Q="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./no-darwin-cflags.patch ./no-xcode.patch ]; diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index cc43f6d6dff2..1af2e93f7bc6 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "h5netcdf"; - version = "1.3.0"; + version = "1.4.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-oXHAJ9rrNLJMJKO2MEGVuOq7tvEMdIJW7Tz+GYBjg88="; + hash = "sha256-6VnDtb08p5Zc5fQ4Ok4Dj/y1UDTGPXkYKb0zpaw4qWI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 13a464dccb4c..cd60ecd9100a 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -1,21 +1,18 @@ { lib, fetchPypi, - fetchpatch, buildPythonPackage, pythonOlder, setuptools, numpy, hdf5, - pythonRelaxDepsHook, - cython_0, + cython, pkgconfig, mpi4py ? null, openssh, pytestCheckHook, pytest-mpi, cached-property, - stdenv, }: assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi; @@ -25,7 +22,7 @@ let mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "3.11.0"; + version = "3.12.1"; pname = "h5py"; pyproject = true; @@ -33,30 +30,24 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-e36PeAcqLt7IfJg28l80ID/UkqRHVwmhi0F6M8+yH6k="; + hash = "sha256-Mm1wtT0xuqYfALiqX5XC/LliGj7oNl13DFUaE9u8v98="; }; - patches = [ - # Unlock an overly strict locking of mpi4py version (seems not to be necessary). - # See also: https://github.com/h5py/h5py/pull/2418/files#r1589372479 - ./mpi4py-requirement.patch - # Fix 16-bit float dtype and tests on darwin (remove in next release) - (fetchpatch { - url = "https://github.com/h5py/h5py/commit/a27a1f49ce92d985e14b8a24fa80d30e5174add2.patch"; - hash = "sha256-7TcmNSJucknq+Vnv4ViT6S0nWeH1+krarWxq6WXLYEA="; - }) - ]; + pythonRelaxDeps = [ "mpi4py" ]; - # avoid strict pinning of numpy, can't be replaced with pythonRelaxDepsHook, - # see: https://github.com/NixOS/nixpkgs/issues/327941 + # avoid strict pinning of numpy and mpi4py, 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" + --replace-fail "numpy >=2.0.0, <3" "numpy" + substituteInPlace setup.py \ + --replace-fail "mpi4py ==3.1.6" "mpi4py" ''; - pythonRelaxDeps = [ "mpi4py" ]; - HDF5_DIR = "${hdf5}"; - HDF5_MPI = if mpiSupport then "ON" else "OFF"; + env = { + HDF5_DIR = "${hdf5}"; + HDF5_MPI = if mpiSupport then "ON" else "OFF"; + }; postConfigure = '' # Needed to run the tests reliably. See: @@ -66,16 +57,16 @@ buildPythonPackage rec { preBuild = lib.optionalString mpiSupport "export CC=${lib.getDev mpi}/bin/mpicc"; - nativeBuildInputs = [ - pythonRelaxDepsHook - cython_0 + build-system = [ + cython + numpy pkgconfig setuptools ]; buildInputs = [ hdf5 ] ++ lib.optional mpiSupport mpi; - propagatedBuildInputs = + dependencies = [ numpy ] ++ lib.optionals mpiSupport [ mpi4py diff --git a/pkgs/development/python-modules/h5py/mpi4py-requirement.patch b/pkgs/development/python-modules/h5py/mpi4py-requirement.patch deleted file mode 100644 index b32e804ebe5f..000000000000 --- a/pkgs/development/python-modules/h5py/mpi4py-requirement.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index b1463422..7f0c7b10 100755 ---- a/setup.py -+++ b/setup.py -@@ -47,7 +47,7 @@ if setup_configure.mpi_enabled(): - # incompatible with newer setuptools. - RUN_REQUIRES.append('mpi4py >=3.1.1') - SETUP_REQUIRES.append("mpi4py ==3.1.1; python_version<'3.11'") -- SETUP_REQUIRES.append("mpi4py ==3.1.4; python_version>='3.11'") -+ SETUP_REQUIRES.append("mpi4py >=3.1.4; python_version>='3.11'") - - # Set the environment variable H5PY_SETUP_REQUIRES=0 if we need to skip - # setup_requires for any reason. diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index 991eaf9f602b..c765c22428ff 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, async-timeout, setuptools, @@ -9,19 +9,21 @@ buildPythonPackage rec { pname = "ha-ffmpeg"; - version = "3.2.0"; + version = "3.2.2"; pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-FW8WlrhVL+ryupHAKii8fKBku/6uxdw1uLCKUszkP50="; + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "ha-ffmpeg"; + rev = "refs/tags/${version}"; + hash = "sha256-TbSoKoOiLx3O7iykiTri5GBHGj7WoB8iSCpFIrV4ZgU="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ async-timeout ]; + dependencies = [ async-timeout ]; # only manual tests doCheck = false; diff --git a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix index 32024f892556..deff078edf85 100644 --- a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix +++ b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "ha-mqtt-discoverable"; - version = "0.14.0"; + version = "0.16.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "unixorn"; repo = "ha-mqtt-discoverable"; rev = "refs/tags/v${version}"; - hash = "sha256-vL4EzeU+8nUPyLR22MJtLhknWF4DWMo49EKvkIqIWhA="; + hash = "sha256-IdyrcqRX5YXS6tx5qP7vOnAJpvy5sOsCwFpWMdyYaeI="; }; pythonRelaxDeps = [ "pyaml" ]; diff --git a/pkgs/development/python-modules/habitipy/default.nix b/pkgs/development/python-modules/habitipy/default.nix index 980dc0726991..44548561b349 100644 --- a/pkgs/development/python-modules/habitipy/default.nix +++ b/pkgs/development/python-modules/habitipy/default.nix @@ -12,15 +12,14 @@ buildPythonPackage rec { pname = "habitipy"; - version = "0.3.1"; + version = "0.3.3"; pyproject = true; src = fetchFromGitHub { owner = "ASMfreaK"; repo = "habitipy"; - # TODO: https://github.com/ASMfreaK/habitipy/issues/27 - rev = "faaca8840575fe8b807bf17acea6266d5ce92a99"; - hash = "sha256-BGFUAntSNH0YYWn9nfKjIlpevF7MFs0csCPSp6IT6Ro="; + rev = "refs/tags/v${version}"; + hash = "sha256-AEeTCrxLXkokRRnNUfW4y23Qdh8ek1F88GmCPLGb84A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index a23e54ff53fd..fb5757ae114f 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "3.4.0"; + version = "3.6.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-qmb7hfrcKWSs1dkyozuTPsVbI0cjVAJ9Em0JIIKsyck="; + hash = "sha256-ypE/PvJV29+P389wLKZUErqLRvy935dAZYeap7n1z4M="; }; build-system = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 37c13fdfe1a5..4fd81b39ee74 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2024.8.13"; + version = "2024.10.17"; pyproject = true; disabled = pythonOlder "3.12"; @@ -25,15 +25,14 @@ buildPythonPackage rec { owner = "danielperna84"; repo = "hahomematic"; rev = "refs/tags/${version}"; - hash = "sha256-dojgIKF3AGkJm2USspV0rm8UZnTLxYf4dgt86WwonQk="; + hash = "sha256-7VCmZcs2WtS9rlWby40dZGXcFY8E+3q+QH2URJkOLLQ="; }; __darwinAllowLocalNetworking = true; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools~=69.2.0" "setuptools" \ - --replace-fail "wheel~=0.43.0" "wheel" + --replace-fail "setuptools==75.1.0" "setuptools" \ ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/hakuin/default.nix b/pkgs/development/python-modules/hakuin/default.nix index d8b9ff2441d0..6aab63e498fa 100644 --- a/pkgs/development/python-modules/hakuin/default.nix +++ b/pkgs/development/python-modules/hakuin/default.nix @@ -3,24 +3,27 @@ aiohttp, buildPythonPackage, fetchFromGitHub, + hatchling, jinja2, nltk, - setuptools, + pythonOlder, }: buildPythonPackage rec { pname = "hakuin"; - version = "0-unstable-2024-03-31"; + version = "0.1.10"; pyproject = true; + disabled = pythonOlder "3.11"; + src = fetchFromGitHub { owner = "pruzko"; repo = "hakuin"; - rev = "3b7b76dcbfb8ab2b98e6dee08df02158327af772"; - hash = "sha256-tRjo9a0ZCBjKxbXTkiKFzfL4pL5awF5vXmsJlYxwoIw="; + rev = "refs/tags/${version}"; + hash = "sha256-l5YnGRPUZUQqOaRvQd4l4eowWGpuPBignjkDDT9q7fg="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ aiohttp diff --git a/pkgs/development/python-modules/handy-archives/default.nix b/pkgs/development/python-modules/handy-archives/default.nix index 079d2bc99555..6bafb066cb57 100644 --- a/pkgs/development/python-modules/handy-archives/default.nix +++ b/pkgs/development/python-modules/handy-archives/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { [ ]; - nativeCheckInputs = [ ]; - meta = { description = "Some handy archive helpers for Python."; homepage = "https://github.com/domdfcoding/handy-archives"; diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index 97b5c1f480e3..533a6d040a8b 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -13,24 +13,27 @@ pytest-timeout, pytestCheckHook, pythonOlder, + setuptools, zeroconf, }: buildPythonPackage rec { pname = "hap-python"; - version = "4.9.1"; - format = "setuptools"; + version = "4.9.2"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ikalchev"; repo = "HAP-python"; rev = "refs/tags/${version}"; - hash = "sha256-nnh8PSEcuPN1qGuInJ7uYe83zdne8axbTrHd4g1xoJs="; + hash = "sha256-mBjVUfNHuGSeLRisqu9ALpTDwpxHir+6X0scq+HrzxA="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ async-timeout chacha20poly1305-reuseable cryptography @@ -39,7 +42,7 @@ buildPythonPackage rec { zeroconf ]; - passthru.optional-dependencies.QRCode = [ + optional-dependencies.QRCode = [ base36 pyqrcode ]; @@ -48,7 +51,7 @@ buildPythonPackage rec { pytest-asyncio pytest-timeout pytestCheckHook - ] ++ passthru.optional-dependencies.QRCode; + ] ++ optional-dependencies.QRCode; disabledTestPaths = [ # Disable tests requiring network access diff --git a/pkgs/development/python-modules/harlequin-bigquery/default.nix b/pkgs/development/python-modules/harlequin-bigquery/default.nix new file mode 100644 index 000000000000..e43e00a4b3b2 --- /dev/null +++ b/pkgs/development/python-modules/harlequin-bigquery/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + google-cloud-bigquery, + google-cloud-bigquery-storage, +}: + +buildPythonPackage rec { + pname = "harlequin-bigquery"; + version = "1.0.2"; + pyproject = true; + + src = fetchPypi { + pname = "harlequin_bigquery"; + inherit version; + hash = "sha256-uIPYhK4R6N7pqsKY2GozkG76WI+gru2unsK5BxO4+/Y="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + google-cloud-bigquery + google-cloud-bigquery-storage + ]; + + # To prevent circular dependency + # as harlequin-bigquery requires harlequin which requires harlequin-bigquery + doCheck = false; + pythonRemoveDeps = [ + "harlequin" + ]; + + meta = { + description = "A Harlequin adapter for Google BigQuery"; + homepage = "https://pypi.org/project/harlequin-bigquery/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pcboy ]; + }; +} diff --git a/pkgs/development/python-modules/harlequin-postgres/default.nix b/pkgs/development/python-modules/harlequin-postgres/default.nix new file mode 100644 index 000000000000..65ec22fb04aa --- /dev/null +++ b/pkgs/development/python-modules/harlequin-postgres/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + psycopg, +}: + +buildPythonPackage rec { + pname = "harlequin-postgres"; + version = "0.4.0"; + pyproject = true; + + src = fetchPypi { + pname = "harlequin_postgres"; + inherit version; + hash = "sha256-1y8S3z6ZTt+PZg75aB/bKnEPdAtqjZ2IqyBtUBk8IFA="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + psycopg + psycopg.pool + ]; + + # To prevent circular dependency + # as harlequin-postgres requires harlequin which requires harlequin-postgres + doCheck = false; + pythonRemoveDeps = [ + "harlequin" + ]; + + meta = { + description = "A Harlequin adapter for Postgres"; + homepage = "https://pypi.org/project/harlequin-postgres/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pcboy ]; + }; +} diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 62ccb7ef91d0..bfe31c016bc3 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -17,26 +17,26 @@ setuptools, snitun, syrupy, + webrtc-models, xmltodict, }: buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.81.1"; + version = "0.83.0"; pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "nabucasa"; repo = "hass-nabucasa"; rev = "refs/tags/${version}"; - hash = "sha256-/sY/JijBCcGcbMjoX0yuhFIWvU+TFVN8sRxBx+CDVVs="; + hash = "sha256-1l0nLSY+r5ujYo3pHzicqnmZ49OH8elVLGpK3lqCaTo="; }; pythonRelaxDeps = [ "acme" ]; - build-system = [ setuptools ]; dependencies = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { pycognito pyjwt snitun + webrtc-models ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/haystack-ai/default.nix b/pkgs/development/python-modules/haystack-ai/default.nix index 65227f54d5ab..f1ac68d9374a 100644 --- a/pkgs/development/python-modules/haystack-ai/default.nix +++ b/pkgs/development/python-modules/haystack-ai/default.nix @@ -42,7 +42,7 @@ pylint, pytest, pytest-asyncio, - pytest-cov, + pytest-cov-stub, # , pytest-custom-exit-code python-multipart, reno, @@ -91,14 +91,14 @@ buildPythonPackage rec { pname = "haystack-ai"; - version = "2.2.3"; + version = "2.5.1"; pyproject = true; src = fetchFromGitHub { owner = "deepset-ai"; repo = "haystack"; rev = "refs/tags/v${version}"; - hash = "sha256-vaZ8bn36Eezf3/SnJ6ao0CvFZaHrpgbX+nM0IOqG2oo="; + hash = "sha256-9lhAiM9uqa6CLb8A59mPVffA1Bnfs4A37/+kKA94cCQ="; }; nativeBuildInputs = [ @@ -138,7 +138,7 @@ buildPythonPackage rec { env.HOME = "$(mktemp -d)"; - passthru.optional-dependencies = { + optional-dependencies = { # all = [ # farm-haystack # ]; @@ -167,7 +167,7 @@ buildPythonPackage rec { pylint pytest pytest-asyncio - pytest-cov + pytest-cov-stub # pytest-custom-exit-code python-multipart reno diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index f3e0ae54c4ab..eb9be89cd857 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.2.1"; + version = "2.3.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3Bcvj+VkIdoU2AiGtbkgwrqwgb8RjHMqQxjBf03iWG4="; + hash = "sha256-6QHSmLES8dLUVo2DAPPOGd/ngr3vP/nEFwJqgeFu6VY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/hcs-utils/default.nix b/pkgs/development/python-modules/hcs-utils/default.nix index 646e6a636cce..0a424e7424bd 100644 --- a/pkgs/development/python-modules/hcs-utils/default.nix +++ b/pkgs/development/python-modules/hcs-utils/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "hcs-utils"; - version = "2.0"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "hcs_utils"; inherit version; - hash = "sha256-4sKcSgSYz+bFYKdOEQh3UsKrCANqX3RnchRpn2EyuBM="; + hash = "sha256-a2xO+hdyJQjgIEcjtmDZLicyz2kzKRjtpEhge5yaa7M="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index e56d4fd17123..31b060c56d54 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.37"; + version = "0.8.38.post1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-3EeHE0DRhT5WnF2Pb4/IB+nDEx7dKRafx3pHBnSqibA="; + hash = "sha256-X726L/tamai1L6KRVljO1r7Vn00NX0CxxnNkbJKKrAs="; }; pythonRemoveDeps = [ "cython" ]; diff --git a/pkgs/development/python-modules/hepunits/default.nix b/pkgs/development/python-modules/hepunits/default.nix index 8664d4b23665..abd89713aa05 100644 --- a/pkgs/development/python-modules/hepunits/default.nix +++ b/pkgs/development/python-modules/hepunits/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "hepunits"; - version = "2.3.4"; + version = "2.3.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-qEK4hqZ7oFY6NHFVJ3z9yPtnAggjNmG8urnyip34zWA="; + hash = "sha256-lDTNLWpyLJSenp4ivQtZWH9pAlvTc1blxwY18bNwNtg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/herepy/default.nix b/pkgs/development/python-modules/herepy/default.nix index 64c39bb8f830..617a2be4493d 100644 --- a/pkgs/development/python-modules/herepy/default.nix +++ b/pkgs/development/python-modules/herepy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "herepy"; - version = "3.6.3"; + version = "3.6.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "abdullahselek"; repo = "HerePy"; rev = "refs/tags/${version}"; - hash = "sha256-ht4EZBfREU7tDNo6tCPyECjm0H+yuhjsfJ60M4ss0jE="; + hash = "sha256-XefoRAaWq5sPQsrqek6kibRjKU+ZImQmt32jutfptNw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix index 698bf15e02ec..eb4596e89bd8 100644 --- a/pkgs/development/python-modules/heudiconv/default.nix +++ b/pkgs/development/python-modules/heudiconv/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "heudiconv"; - version = "1.1.6"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-hCHG5zpoEx4w7Jq842RWwMtsn5NskPq/Wahp4neOun4="; + hash = "sha256-qrDYl6hB8BPJz3VKl7jklDaAafsCf1M+3VgFbnGxCTU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hf-transfer/default.nix b/pkgs/development/python-modules/hf-transfer/default.nix new file mode 100644 index 000000000000..6a526c59be7d --- /dev/null +++ b/pkgs/development/python-modules/hf-transfer/default.nix @@ -0,0 +1,68 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + cargo, + pkg-config, + rustPlatform, + rustc, + + # buildInputs + openssl, + stdenv, + darwin, + libiconv, +}: + +buildPythonPackage rec { + pname = "hf-transfer"; + version = "0.1.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "huggingface"; + repo = "hf_transfer"; + rev = "refs/tags/v${version}"; + hash = "sha256-Uh8q14OeN0fYsywYyNrH8C3wq/qRjQKEAIufi/a5RXA="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-I4APdz1r2KJ8pTfKAg8g240wYy8gtMlHwmBye4796Tk="; + }; + + build-system = [ + cargo + pkg-config + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc + ]; + + buildInputs = + [ + openssl + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + libiconv + ]; + + pythonImportsCheck = [ "hf_transfer" ]; + + env = { + OPENSSL_NO_VENDOR = true; + }; + + meta = { + description = "High speed download python library"; + homepage = "https://github.com/huggingface/hf_transfer"; + changelog = "https://github.com/huggingface/hf_transfer/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/hfst/default.nix b/pkgs/development/python-modules/hfst/default.nix index 06e2ed94bb03..37869ffad3e3 100644 --- a/pkgs/development/python-modules/hfst/default.nix +++ b/pkgs/development/python-modules/hfst/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { setupPyBuildFlags = [ "--inplace" ]; # Find foma in Darwin tests - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH="${foma}/lib" ''; diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix index 25ed4d5d9505..2a4c67d100b4 100644 --- a/pkgs/development/python-modules/hg-git/default.nix +++ b/pkgs/development/python-modules/hg-git/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "hg-git"; - version = "1.1.2"; + version = "1.1.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "hg_git"; inherit version; - hash = "sha256-BZzcElZa0pMBSGXSiSB+d+YFhJMM5PAdT2Txq5qLZCU="; + hash = "sha256-lqnCi4MjdPVCIXdYAIDGdRY5zcU5QPrSHzy+NKysMtc="; }; build-system = [ diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index ee69705614c9..5c1fdda9484f 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -5,7 +5,6 @@ fetchPypi, xcbuild, cython_0, - libusb1, udev, darwin, }: @@ -20,14 +19,11 @@ buildPythonPackage rec { sha256 = "sha256-bA6XumsFmjCdUbSVqPDV77zqh1a2QNmLb2u5/e8kWKw="; }; - nativeBuildInputs = [ cython_0 ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; + nativeBuildInputs = [ cython_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; propagatedBuildInputs = - lib.optionals stdenv.isLinux [ - libusb1 - udev - ] - ++ lib.optionals stdenv.isDarwin ( + lib.optionals stdenv.hostPlatform.isLinux [ udev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ AppKit @@ -36,13 +32,6 @@ buildPythonPackage rec { ] ); - # Fix the USB backend library lookup - postPatch = lib.optionalString stdenv.isLinux '' - libusb=${libusb1.dev}/include/libusb-1.0 - test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } - sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py - ''; - pythonImportsCheck = [ "hid" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/highdicom/default.nix b/pkgs/development/python-modules/highdicom/default.nix index 25148892a0b4..7f1d6d1eb243 100644 --- a/pkgs/development/python-modules/highdicom/default.nix +++ b/pkgs/development/python-modules/highdicom/default.nix @@ -22,7 +22,7 @@ let in buildPythonPackage rec { pname = "highdicom"; - version = "0.22.0"; + version = "0.23.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "MGHComputationalPathology"; repo = "highdicom"; rev = "refs/tags/v${version}"; - hash = "sha256-KHSJWEnm8u0xHkeeLF/U7MY4FfiWb6Q0GQQy2w1mnKw="; + hash = "sha256-WXNmkaAdbjyPdNtjV6vpxUWGtdPLvrMr5t/5aMKGSLc="; }; propagatedBuildInputs = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { pydicom ]; - passthru.optional-dependencies = { + optional-dependencies = { libjpeg = [ pylibjpeg pylibjpeg-libjpeg @@ -49,7 +49,7 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.libjpeg; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.libjpeg; preCheck = '' export HOME=$TMP/test-home mkdir -p $HOME/.pydicom/ diff --git a/pkgs/development/python-modules/hikari-lightbulb/default.nix b/pkgs/development/python-modules/hikari-lightbulb/default.nix index 9fb3952ce0a7..9b3cb4002750 100644 --- a/pkgs/development/python-modules/hikari-lightbulb/default.nix +++ b/pkgs/development/python-modules/hikari-lightbulb/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "hikari-lightbulb"; - version = "2.3.5"; + version = "2.3.5.post1"; pyproject = true; src = fetchFromGitHub { owner = "tandemdude"; repo = "hikari-lightbulb"; - rev = version; - hash = "sha256-gqbbex2xj48LZqW4bVSPDW1UZEFVeOHbNQVM6nhpl1Y="; + rev = "refs/tags/${version}"; + hash = "sha256-sxBrOgMgUcPjqtNuuq5+NfyxR5V812dfHnGoO9DhdXU="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ hikari ]; - passthru.optional-dependencies = { + optional-dependencies = { crontrigger = [ croniter ]; }; diff --git a/pkgs/development/python-modules/hikari/default.nix b/pkgs/development/python-modules/hikari/default.nix index dbc853b926aa..92a26c231d0c 100644 --- a/pkgs/development/python-modules/hikari/default.nix +++ b/pkgs/development/python-modules/hikari/default.nix @@ -16,13 +16,13 @@ }: buildPythonPackage rec { pname = "hikari"; - version = "2.0.0.dev126"; + version = "2.1.0"; src = fetchFromGitHub { owner = "hikari-py"; repo = "hikari"; - rev = version; - hash = "sha256-KpF9P92IciILV7zlYTCgtMqhudT9uOR2SQJdWDtxYaA="; + rev = "refs/tags/${version}"; + hash = "sha256-/A3D3nG1lSCQU92dM+6YroxWlGKrv47ntkZaJZTAJUA="; # 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, @@ -45,7 +45,7 @@ buildPythonPackage rec { pythonRelaxDeps = true; - passthru.optional-dependencies = { + optional-dependencies = { server = [ pynacl ]; }; diff --git a/pkgs/development/python-modules/hiredis/default.nix b/pkgs/development/python-modules/hiredis/default.nix index d9a6917ae5d8..4125f1c19817 100644 --- a/pkgs/development/python-modules/hiredis/default.nix +++ b/pkgs/development/python-modules/hiredis/default.nix @@ -4,14 +4,17 @@ fetchFromGitHub, pythonOlder, - # tested using + # build-system + setuptools, + + # tests pytestCheckHook, }: buildPythonPackage rec { pname = "hiredis"; - version = "2.3.2"; - format = "setuptools"; + version = "2.4.0"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -20,9 +23,11 @@ buildPythonPackage rec { repo = "hiredis-py"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-7hTGXHNECy+dSsop0ULsNZvGFecCIEv+q46s7t/K7k8="; + hash = "sha256-PnCSf7ZEPNtweQEnWTHCCVCvg5QGxGeBSAZCFHOziDQ="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "hiredis" ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/hishel/default.nix b/pkgs/development/python-modules/hishel/default.nix index e86b6382a83f..f997fba130ac 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.31"; + version = "0.0.33"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "karpetrosyan"; repo = "hishel"; rev = "refs/tags/${version}"; - hash = "sha256-mJPvzGmu0veFlG7jlWdf919qOp3KfGv6SPRcFVFjhnc="; + hash = "sha256-zi+13X7u2pk9w2EoYjfl3/Y8O5hHpA0wZx3sSv2vU6U="; }; build-system = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { dependencies = [ httpx ]; - passthru.optional-dependencies = { + optional-dependencies = { redis = [ redis ]; s3 = [ boto3 ]; sqlite = [ anysqlite ]; @@ -49,7 +49,7 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook trio - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "hishel" ]; diff --git a/pkgs/development/python-modules/hist/default.nix b/pkgs/development/python-modules/hist/default.nix index 063bc93b6aa8..521762308c4b 100644 --- a/pkgs/development/python-modules/hist/default.nix +++ b/pkgs/development/python-modules/hist/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "hist"; - version = "2.7.3"; + version = "2.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+fm1aAmxkLtUZph4nMDX0ECTT8UUHSdjxuSdZegdvAs="; + hash = "sha256-Cj5gLdHSchvX8iKfRWcJ3eMj9vdJUvE7pOWYbDJ193s="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/histoprint/default.nix b/pkgs/development/python-modules/histoprint/default.nix index 14551898283e..080197e88386 100644 --- a/pkgs/development/python-modules/histoprint/default.nix +++ b/pkgs/development/python-modules/histoprint/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "histoprint"; - version = "2.4.0"; + version = "2.5.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "328f789d186e3bd76882d57b5aad3fa08c7870a856cc83bcdbad9f4aefbda94d"; + sha256 = "sha256-kJfnOWqzqag8kW9+U8Ri6kbk9kXBrZFgRzjy2Dg+/U8="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/hiyapyco/default.nix b/pkgs/development/python-modules/hiyapyco/default.nix index 1e2b45a7dc60..e65e8e87f4eb 100644 --- a/pkgs/development/python-modules/hiyapyco/default.nix +++ b/pkgs/development/python-modules/hiyapyco/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hiyapyco"; - version = "0.6.1"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "zerwes"; repo = pname; rev = "refs/tags/release-${version}"; - hash = "sha256-KB/KFrR7IScIWyYbsU+4BbV0+SCeeWxYDD8lbxosRLc="; + hash = "sha256-uF5DblAg4q8L1tZKopcjJ14NIQVQF5flNHdZ/jnw71M="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/hkdf/default.nix b/pkgs/development/python-modules/hkdf/default.nix deleted file mode 100644 index f04e486fd73c..000000000000 --- a/pkgs/development/python-modules/hkdf/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - nose, - setuptools, -}: - -buildPythonPackage { - pname = "hkdf"; - version = "0.0.3"; - pyproject = true; - - src = fetchFromGitHub { - owner = "casebeer"; - repo = "python-hkdf"; - rev = "cc3c9dbf0a271b27a7ac5cd04cc1485bbc3b4307"; - hash = "sha256-i3vJzUI7dpZbgZkz7Agd5RAeWisNWftdk/mkJBZkkLg="; - }; - - build-system = [ setuptools ]; - - pythonImportsCheck = [ "hkdf" ]; - - nativeCheckInputs = [ nose ]; - - checkPhase = '' - runHook preCheck - - nosetests - - runHook postCheck - ''; - - meta = with lib; { - description = "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)"; - homepage = "https://github.com/casebeer/python-hkdf"; - license = licenses.bsd2; - }; -} diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 12c868ea1f44..926ecee1b3f0 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.57"; + version = "0.60"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-/aijcDD0gzg217NuD7A9qdgArek1fHWjb2SfA2H4gww="; + hash = "sha256-Ws+SSzQyfPjjwkXYT1plRtuhMATQYCvH3AKG8llWCGo="; }; build-system = [ diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index eb17dd053400..dfadc6952ea4 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -1,28 +1,37 @@ { lib, buildPythonPackage, - colorcet, fetchPypi, + pythonOlder, + + # build-system hatch-vcs, hatchling, + + # dependencies + colorcet, numpy, pandas, panel, param, - pythonOlder, pyviz-comms, + + # tests + pytestCheckHook, + pytest-cov, + flaky, }: buildPythonPackage rec { pname = "holoviews"; - version = "1.19.0"; + version = "1.19.1"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-yrFSL3WptGN3+TZLZ1vv15gS4iAFlxRHCljiFHXVMbo="; + hash = "sha256-uehejAcnWkVsDvjQa8FX0Cs37/Zvs2AqoS9chvCEhlw="; }; build-system = [ @@ -39,16 +48,32 @@ buildPythonPackage rec { pyviz-comms ]; - # tests not fully included with pypi release - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov + flaky + ]; + + disabledTests = [ + # All the below fail due to some change in flaky API + "test_periodic_param_fn_non_blocking" + "test_callback_cleanup" + "test_poly_edit_callback" + "test_launch_server_with_complex_plot" + "test_launch_server_with_stream" + "test_launch_simple_server" + "test_server_dynamicmap_with_dims" + "test_server_dynamicmap_with_stream" + "test_server_dynamicmap_with_stream_dims" + ]; pythonImportsCheck = [ "holoviews" ]; - meta = with lib; { + meta = { description = "Python data analysis and visualization seamless and simple"; mainProgram = "holoviews"; homepage = "https://www.holoviews.org/"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index fc288114c374..c289b781a598 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.12.2"; + version = "1.13.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "home-assistant-bluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-WAsgiOmYqmt/PCKp+vZA2To95YZAgnYCF8ysCn5N9nc="; + hash = "sha256-+2bw4im09TyjJ5/7ct42ZCFwU7yKWQnbSo7b+44VtpE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index 04e71d133e19..6d54eb16104c 100644 --- a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -1,23 +1,22 @@ { lib, buildPythonPackage, - fetchPypi, + home-assistant-chip-wheels, aenum, dacite, }: buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2024.7.0"; + inherit (home-assistant-chip-wheels) version; format = "wheel"; - src = fetchPypi { - inherit format version; - pname = "home_assistant_chip_clusters"; - dist = "py3"; - python = "py3"; - hash = "sha256-1yR8Z+R16u099XtxPasmocFbdQPH1Rr6sqngNpWmuWE="; - }; + src = home-assistant-chip-wheels; + + # format=wheel needs src to be a wheel not a folder of wheels + preUnpack = '' + src=($src/home_assistant_chip_clusters*.whl) + ''; propagatedBuildInputs = [ aenum @@ -38,6 +37,5 @@ buildPythonPackage rec { changelog = "https://github.com/home-assistant-libs/chip-wheels/releases/tag/${version}"; license = licenses.asl20; maintainers = teams.home-assistant.members; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index c9c18a722d1c..229f6867d38c 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -1,70 +1,35 @@ { lib, - stdenv, buildPythonPackage, - fetchPypi, pythonOlder, - - # build - autoPatchelfHook, - - # runtime - glib, - libnl, - - # propagates aenum, + home-assistant-chip-wheels, coloredlogs, construct, cryptography, dacite, + deprecation, ecdsa, - rich, - pyyaml, ipdb, - deprecation, mobly, pygobject3, + pyyaml, + rich, }: buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2024.7.0"; + inherit (home-assistant-chip-wheels) version; format = "wheel"; disabled = pythonOlder "3.7"; - src = - let - system = - { - "aarch64-linux" = { - name = "aarch64"; - hash = "sha256-omEYZXAqkB5+trALBTqJ8SBGasTHD2mT2km6FizBvS8="; - }; - "x86_64-linux" = { - name = "x86_64"; - hash = "sha256-mTMXCpYRon8SqZB+0+P4IM+NUUOKBfxjf/NmLTElB+A="; - }; - } - .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); - in - fetchPypi { - pname = "home_assistant_chip_core"; - inherit version format; - dist = "cp37"; - python = "cp37"; - abi = "abi3"; - platform = "manylinux_2_31_${system.name}"; - hash = system.hash; - }; + src = home-assistant-chip-wheels; - nativeBuildInputs = [ autoPatchelfHook ]; - - buildInputs = [ - glib - libnl - ]; + # format=wheel needs src to be a wheel not a folder of wheels + preUnpack = '' + src=($src/home_assistant_chip_core*.whl) + ''; propagatedBuildInputs = [ aenum @@ -79,7 +44,7 @@ buildPythonPackage rec { deprecation mobly pygobject3 - ]; + ] ++ home-assistant-chip-wheels.propagatedBuildInputs; pythonNamespaces = [ "chip" @@ -104,10 +69,5 @@ buildPythonPackage rec { changelog = "https://github.com/home-assistant-libs/chip-wheels/releases/tag/${version}"; license = licenses.asl20; maintainers = teams.home-assistant.members; - platforms = [ - "aarch64-linux" - "x86_64-linux" - ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix new file mode 100644 index 000000000000..469905525324 --- /dev/null +++ b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix @@ -0,0 +1,289 @@ +{ + appdirs, + appnope, + black, + build, + clang-tools, + click, + colorama, + coloredlogs, + coverage, + cryptography, + diskcache, + fetchFromGitHub, + glib, + gn, + googleapis-common-protos, + google-cloud-storage, + ipython, + jinja2, + json5, + jsonschema, + lark, + lib, + libnl, + mobly, + mypy, + mypy-extensions, + mypy-protobuf, + ninja, + openssl, + packaging, + parameterized, + pip-tools, + pkg-config, + prompt-toolkit, + protobuf, + psutil, + ptpython, + pyelftools, + pygments, + pykwalify, + pylint, + pyperclip, + pyserial, + python3, + python-daemon, + pyyaml, + requests, + setuptools, + six, + sphinx, + sphinx-argparse, + sphinx-design, + stdenv, + stringcase, + toml, + tornado, + types-protobuf, + types-pyyaml, + types-requests, + types-setuptools, + watchdog, + websockets, + wheel, + yapf, + zap-chip, +}: + +stdenv.mkDerivation rec { + pname = "home-assistant-chip-wheels"; + version = "2024.9.0"; + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "chip-wheels"; + rev = version; + fetchSubmodules = false; + leaveDotGit = true; + hash = "sha256-T0G6mxb/5wFOxPLL92Ay34oP+9Xvk9w0YV9VSzWJuzw="; + postFetch = '' + cd $out + # Download connectedhomeip. + git fetch + git reset --hard HEAD + git submodule update --init --depth 1 connectedhomeip + + # Initialize only necessary submodules. + cd connectedhomeip + ${python3}/bin/python3 scripts/checkout_submodules.py --platform linux --shallow + + # Keep the output deterministic. + cd $out + # in case python decided to leave a .pyc file, for example + git clean -fxd + rm -rf .git/ + ''; + }; + + strictDeps = true; + + nativeBuildInputs = [ + gn + pkg-config + ninja + clang-tools + zap-chip + # gdbus-codegen + glib + python3 + # dependencies of build scripts + click + jinja2 + lark + setuptools + stringcase + build + pip-tools + black + yapf + ]; + + propagatedBuildInputs = [ + openssl + glib + libnl + ]; + + postPatch = '' + cd connectedhomeip + export HOME=$(mktemp -d) + + patchShebangs --build scripts + + for patch in ../*.patch; do + patch -p1 < $patch + done + + # unpin dependencies + # there are many files to modify, in different formats + sed -i 's/==.*$//' third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/virtualenv_setup/python_base_requirements.txt + sed -i 's/==[^;]*//' scripts/setup/constraints.txt + sed -i 's/\(^ \+[a-zA-Z0-9-]*\)[=~><]=[^;]*/\1/' third_party/pigweed/repo/pw_protobuf_compiler/py/setup.cfg third_party/pigweed/repo/pw_protobuf/py/setup.cfg third_party/pigweed/repo/pw_protobuf_compiler/py/setup.cfg + # remove a few dependencies not packaged in nixpkgs and which are apparently + # not needed to build the python bindings of chip + sed -i -e '/sphinxcontrib-mermaid/d' -e '/types-six/d' -e '/types-pygment/d' -e '/types-pyserial/d' third_party/pigweed/repo/*/py/setup.cfg + + # obtained by running a build in nix-shell with internet access + cp ${./pigweed_environment.gni} build_overrides/pigweed_environment.gni + + # some code is generated by a templating tool (zap-cli) + scripts/codepregen.py ./zzz_pregenerated/ + ''; + + # the python parts of the build system work as follows + # gn calls pigweed to read a dozen different files to generate + # a file looking like requirements.txt. It then calls pip + # to install this computed list of dependencies into a virtualenv. + # Of course, pip fails in the sandbox, because it cannot download + # the python packages. + # The documented way of doing offline builds is to create a folder + # with wheel files for all dependencies and point pip to it + # via its configuration file or environment variables. + # https://pigweed.dev/python_build.html#installing-offline + # The wheel of a python package foo is available as foo.dist. + # So that would be easy, but we also need wheels for transitive dependencies. + # the function saturateDependencies below computes this transitive closure. + # + # yes this list of dependencies contains both build tools and proper dependencies. + env.PIP_NO_INDEX = "1"; + env.PIP_FIND_LINKS = + let + dependencies = [ + appdirs + appnope + black + build + colorama + coloredlogs + coverage + click + cryptography + diskcache + googleapis-common-protos + google-cloud-storage + ipython + jinja2 + json5 + jsonschema + lark + mobly + mypy + mypy-extensions + mypy-protobuf + packaging + parameterized + pip-tools + prompt-toolkit + protobuf + psutil + ptpython + pyelftools + pygments + pykwalify + pylint + pyperclip + pyserial + python-daemon + pyyaml + requests + setuptools + six + sphinx + sphinx-argparse + sphinx-design + stringcase + toml + tornado + types-protobuf + types-pyyaml + types-requests + types-setuptools + watchdog + websockets + wheel + yapf + ]; + depListToAttrs = + list: + builtins.listToAttrs ( + map (dep: { + name = dep.name; + value = dep; + }) (lib.filter (x: x != null) list) + ); + saturateDependencies = + deps: + let + before = deps; + new = lib.mergeAttrsList ( + map (dep: depListToAttrs (dep.propagatedBuildInputs or [ ])) (lib.attrValues before) + ); + after = before // new; + in + if lib.attrNames before != lib.attrNames after then saturateDependencies after else before; + saturateDependencyList = list: lib.attrValues (saturateDependencies (depListToAttrs list)); + saturatedDependencyList = lib.filter (drv: drv ? dist) (saturateDependencyList dependencies); + in + lib.concatMapStringsSep " " (dep: "file://${dep.dist}") saturatedDependencyList; + + gnFlags = [ + ''chip_project_config_include_dirs=["//.."]'' + ''chip_crypto="openssl"'' + ''enable_rtti=true'' + ''chip_config_memory_debug_checks=false'' + ''chip_config_memory_debug_dmalloc=false'' + ''chip_mdns="minimal"'' + ''chip_minmdns_default_policy="libnl"'' + ''chip_python_version="${lib.versions.majorMinor python3.version}"'' + ''chip_python_platform_tag="any"'' + ''chip_python_package_prefix="home-assistant-chip"'' + ''custom_toolchain="custom"'' + ''target_cc="${stdenv.cc.targetPrefix}cc"'' + ''target_cxx="${stdenv.cc.targetPrefix}c++"'' + ''target_ar="${stdenv.cc.targetPrefix}ar"'' + ]; + + preBuild = '' + export NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags glib-2.0) -O2 -Wno-error" + export NIX_CFLAGS_LINK="$($PKG_CONFIG --libs gio-2.0) $($PKG_CONFIG --libs gobject-2.0) $($PKG_CONFIG --libs glib-2.0)" + ''; + + ninjaFlags = [ "chip-repl" ]; + + installPhase = '' + runHook preInstall + + cp -r controller/python $out + + runHook postInstall + ''; + + meta = { + description = "Python wheels for APIs and tools related to CHIP"; + homepage = "https://github.com/home-assistant-libs/chip-wheels"; + changelog = "https://github.com/home-assistant-libs/chip-wheels/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = lib.teams.home-assistant.members; + }; + +} diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/pigweed_environment.gni b/pkgs/development/python-modules/home-assistant-chip-wheels/pigweed_environment.gni new file mode 100644 index 000000000000..df404dacf394 --- /dev/null +++ b/pkgs/development/python-modules/home-assistant-chip-wheels/pigweed_environment.gni @@ -0,0 +1,12 @@ +# This file is automatically generated by Pigweed's environment setup. Do not +# edit it manually or check it in. + +# Relative paths are interpreted with respect to this file, which helps +# determine the correct path even if the source root changes. +declare_args() { + pw_env_setup_CIPD_ARM = get_path_info("../.environment/cipd/packages/arm", "abspath") + pw_env_setup_CIPD_PIGWEED = get_path_info("../.environment/cipd/packages/pigweed", "abspath") + pw_env_setup_CIPD_PYTHON = get_path_info("../.environment/cipd/packages/python", "abspath") + pw_env_setup_CIPD_ZAP = get_path_info("../.environment/cipd/packages/zap", "abspath") + pw_env_setup_VIRTUAL_ENV = get_path_info("../.environment/pigweed-venv", "abspath") +} diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 12de293358e8..baf3e4581e58 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.9.1"; + version = "2024.11.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = "hstspreload"; rev = "refs/tags/${version}"; - hash = "sha256-mpHJG2TqhlTNZ9fbyOZsoKusAvx8EiiP7dATCZh19dQ="; + hash = "sha256-Gm0jZbJwVdoU19gkTuzJ9Mop1qsPDboTg53Yiocb3Rc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/htmldate/default.nix b/pkgs/development/python-modules/htmldate/default.nix index 3f504f7729b6..ca648b7790d7 100644 --- a/pkgs/development/python-modules/htmldate/default.nix +++ b/pkgs/development/python-modules/htmldate/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "htmldate"; - version = "1.9.0"; + version = "1.9.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "adbar"; repo = "htmldate"; rev = "refs/tags/v${version}"; - hash = "sha256-sddPlVaYenR8sQG/ronkYIcVH5nyQzcjF8rfeMr5I78="; + hash = "sha256-VjOqttpbHp1wQARyHieAZie/yO74+S2mDbBXx00PKWM="; }; build-system = [ setuptools ]; @@ -38,7 +38,7 @@ buildPythonPackage rec { urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { speed = [ faust-cchardet diff --git a/pkgs/development/python-modules/htseq/default.nix b/pkgs/development/python-modules/htseq/default.nix index f5327c0edb40..fc965bbae573 100644 --- a/pkgs/development/python-modules/htseq/default.nix +++ b/pkgs/development/python-modules/htseq/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, swig, cython, matplotlib, @@ -15,25 +14,16 @@ }: buildPythonPackage rec { pname = "htseq"; - version = "2.0.4"; + version = "2.0.9"; pyproject = true; src = fetchFromGitHub { owner = "htseq"; repo = "htseq"; rev = "release_${version}"; - hash = "sha256-7ocrmuj9LOtPz9XbI5rKGcdE5JbFz/pZh00Nie65XxE="; + hash = "sha256-i83BY7/p98/pfYzebolNW/6yNwtb2R5ARCSG3rAq2/M="; }; - patches = [ - # https://github.com/htseq/htseq/pull/84 - (fetchpatch { - name = "replace-distutils-with-sysconfig.patch"; - url = "https://github.com/htseq/htseq/commit/f0f1e464ee9aee56f0b44f905e7b3355b0bb8f29.patch"; - hash = "sha256-yDYkXCPy+YFgnk1rnXwCB998aZwVd5nJeejZIgeEzAo="; - }) - ]; - nativeBuildInputs = [ swig ]; build-system = [ diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index 4b670b4c17bd..ef9fe211f55c 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { werkzeug ]; - passthru.optional-dependencies = { + optional-dependencies = { mainapp = [ gunicorn gevent diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index b1d64e6526be..9883280006ed 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "httpcore"; - version = "1.0.5"; + version = "1.0.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,20 +33,20 @@ buildPythonPackage rec { owner = "encode"; repo = "httpcore"; rev = "refs/tags/${version}"; - hash = "sha256-05jYLrBiPRg1qQEz8mRvYJKHFsfneh7z9yHIXuYYa5o="; + hash = "sha256-sF/ymIoEnqWRX9b8knojIw+ySci/obXSttaNJLb+/nE="; }; - nativeBuildInputs = [ + build-system = [ hatchling hatch-fancy-pypi-readme ]; - propagatedBuildInputs = [ + dependencies = [ certifi h11 ]; - passthru.optional-dependencies = { + optional-dependencies = { asyncio = [ anyio ]; http2 = [ h2 ]; socks = [ socksio ]; @@ -59,7 +59,7 @@ buildPythonPackage rec { pytest-httpbin pytest-trio pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "httpcore" ]; diff --git a/pkgs/development/python-modules/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix index 5370a1e87009..c5d776302319 100644 --- a/pkgs/development/python-modules/httpie/default.nix +++ b/pkgs/development/python-modules/httpie/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "httpie"; - version = "3.2.3"; + version = "3.2.4"; pyproject = true; src = fetchFromGitHub { owner = "httpie"; repo = "httpie"; rev = "refs/tags/${version}"; - hash = "sha256-ogUqhMVY1fm+hKCMFYqfYsqHX+Gj6y8CMOUsxA3q29g="; + hash = "sha256-uZKkUUrPPnLHPHL8YrZgfsyCsSOR0oZ2eFytiV0PIUY="; }; pythonRelaxDeps = [ @@ -102,7 +102,7 @@ buildPythonPackage rec { "test_binary_suppresses_when_not_terminal_but_pretty" "test_binary_included_and_correct_when_suitable" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Test is flaky "test_daemon_runner" ]; diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 67e38601cfa5..a6c3e42a5317 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { "test_head_301" "test_303" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # fails with "ConnectionResetError: [Errno 54] Connection reset by peer" "test_connection_close" # fails with HTTP 408 Request Timeout, instead of expected 200 OK diff --git a/pkgs/development/python-modules/httpserver/default.nix b/pkgs/development/python-modules/httpserver/default.nix index 9b65a6341ced..222933a85dd6 100644 --- a/pkgs/development/python-modules/httpserver/default.nix +++ b/pkgs/development/python-modules/httpserver/default.nix @@ -1,30 +1,49 @@ { lib, - fetchPypi, buildPythonPackage, docopt, + fetchPypi, + freezegun, + pytestCheckHook, + pythonOlder, + selenium, + setuptools, }: buildPythonPackage rec { pname = "httpserver"; version = "1.1.0"; - format = "setuptools"; - - buildInputs = [ docopt ]; + pyproject = true; - # Tests pull in lots of other dependencies to emulate different web - # drivers. - doCheck = false; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1q62g324dvb0hqdwwrnj41sqr4d3ly78v9nc26rz1whj4pwdmhsv"; + hash = "sha256-W8Pa+CUS8vCzEcymjY6no5GMdSDSZs4bhmDtRsR4wuA="; }; + build-system = [ setuptools ]; + + dependencies = [ docopt ]; + + nativeCheckInputs = [ + freezegun + selenium + pytestCheckHook + ]; + + pythonImportsCheck = [ "httpserver" ]; + + disabledTestPaths = [ + # Tests want driver for Firefox + "tests/test_selenium.py" + ]; + meta = { description = "Asyncio implementation of an HTTP server"; - mainProgram = "httpserver"; homepage = "https://github.com/thomwiggers/httpserver"; license = with lib.licenses; [ bsd3 ]; + maintainers = [ ]; + mainProgram = "httpserver"; }; } diff --git a/pkgs/development/python-modules/httpx-oauth/default.nix b/pkgs/development/python-modules/httpx-oauth/default.nix new file mode 100644 index 000000000000..1be59926112d --- /dev/null +++ b/pkgs/development/python-modules/httpx-oauth/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fastapi, + fetchFromGitHub, + hatchling, + hatch-regex-commit, + httpx, + pytest-asyncio, + pytest-cov-stub, + pytest-mock, + pytestCheckHook, + respx, +}: + +buildPythonPackage rec { + pname = "httpx-oauth"; + version = "0.15.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "frankie567"; + repo = "httpx-oauth"; + rev = "refs/tags/v${version}"; + hash = "sha256-f3X3kSw7elTScCA3bNggwXyyHORre6Xzup/D0kgn4DQ="; + }; + + build-system = [ + hatchling + hatch-regex-commit + ]; + + dependencies = [ httpx ]; + + nativeCheckInputs = [ + fastapi + pytest-asyncio + pytest-cov-stub + pytest-mock + pytestCheckHook + respx + ]; + + pythonImportsCheck = [ "httpx_oauth" ]; + + meta = with lib; { + description = "Async OAuth client using HTTPX"; + homepage = "https://github.com/frankie567/httpx-oauth"; + changelog = "https://github.com/frankie567/httpx-oauth/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index 64049235003a..4d46ed9b4588 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "httpx-socks"; - version = "0.9.1"; + version = "0.9.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,18 +31,18 @@ buildPythonPackage rec { owner = "romis2012"; repo = "httpx-socks"; rev = "refs/tags/v${version}"; - hash = "sha256-9v5DfxEtM7jq+b8wR0M1klTSnSdFjQ4aDl8ZSZWxbFA="; + hash = "sha256-PUiciSuDCO4r49st6ye5xPLCyvYMKfZY+yHAkp5j3ZI="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ httpx httpcore python-socks - ]; + ] ++ python-socks.optional-dependencies.asyncio; - passthru.optional-dependencies = { + optional-dependencies = { asyncio = [ async-timeout ]; trio = [ trio ]; }; diff --git a/pkgs/development/python-modules/httpx-ws/default.nix b/pkgs/development/python-modules/httpx-ws/default.nix index fd02d918f04f..6150c2d09b54 100644 --- a/pkgs/development/python-modules/httpx-ws/default.nix +++ b/pkgs/development/python-modules/httpx-ws/default.nix @@ -1,31 +1,31 @@ { lib, + anyio, buildPythonPackage, fetchFromGitHub, - pythonOlder, hatchling, - anyio, httpcore, httpx, - wsproto, pytestCheckHook, + pythonOlder, starlette, trio, uvicorn, + wsproto, }: buildPythonPackage rec { pname = "httpx-ws"; - version = "0.6.0"; + version = "0.6.2"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "frankie567"; repo = "httpx-ws"; rev = "refs/tags/v${version}"; - hash = "sha256-eDc21FiGHi98doS4Zbubb/MVw4IjQ1q496TFHCX4xB4="; + hash = "sha256-VsIYOGNEdX4rxjEa01M77arA3ddJS3cPFxXlf13QTuE="; }; # we don't need to use the hatch-regex-commit plugin @@ -46,8 +46,6 @@ buildPythonPackage rec { wsproto ]; - pythonImportsCheck = [ "httpx_ws" ]; - nativeCheckInputs = [ pytestCheckHook starlette @@ -55,6 +53,8 @@ buildPythonPackage rec { uvicorn ]; + pythonImportsCheck = [ "httpx_ws" ]; + disabledTestPaths = [ # hang "tests/test_api.py" @@ -63,6 +63,8 @@ buildPythonPackage rec { meta = with lib; { description = "WebSocket support for HTTPX"; homepage = "https://github.com/frankie567/httpx-ws"; + changelog = "https://github.com/frankie567/httpx-ws/releases/tag/v${version}"; license = licenses.mit; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 4d4c264ea015..f4572167049f 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -27,11 +27,12 @@ pytest-trio, trustme, uvicorn, + zstandard, }: buildPythonPackage rec { pname = "httpx"; - version = "0.27.0"; + version = "0.27.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -40,10 +41,10 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-13EnSzrCkseK6s6Yz9OpLzqo/2PTFiB31m5fAIJLoZg="; + hash = "sha256-N0ztVA/KMui9kKIovmOfNTwwrdvSimmNkSvvC+3gpck="; }; - nativeBuildInputs = [ + build-system = [ hatch-fancy-pypi-readme hatchling ]; @@ -56,19 +57,20 @@ buildPythonPackage rec { sniffio ]; - passthru.optional-dependencies = { - http2 = [ h2 ]; - socks = [ socksio ]; + optional-dependencies = { brotli = if isPyPy then [ brotlicffi ] else [ brotli ]; cli = [ click rich pygments ]; + http2 = [ h2 ]; + socks = [ socksio ]; + zstd = [ zstandard ]; }; # trustme uses pyopenssl - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); nativeCheckInputs = [ chardet @@ -78,7 +80,7 @@ buildPythonPackage rec { pytest-trio trustme uvicorn - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # testsuite wants to find installed packages for testing entrypoint preCheck = '' diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix index 11d41ca0334d..5b50ba6b2566 100644 --- a/pkgs/development/python-modules/huey/default.nix +++ b/pkgs/development/python-modules/huey/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "huey"; - version = "2.5.1"; + version = "2.5.2"; format = "pyproject"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0oiYmLOwUsZjq7mR0nXwS00VVsLWOXY25whw6262uEo="; + hash = "sha256-0X4gUIFqkE4GLW5Eqbolpk7KZdsvjkRxD20YmLPG11A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index bec0a7fefc25..00fab837e3ce 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.25.0"; + version = "0.26.2"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-N/c/aTUWHolQ1TWVOoyfQ3eCLOSX3/6qtXk1T918/wg="; + hash = "sha256-F2E8P0Hq3Ee+RXUEN4t2JtfBtK36aMsHQCnid9VWdLk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index dbc0bdf1caef..e8fba82004d1 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "humanize"; - version = "4.10.0"; + version = "4.11.0"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "python-humanize"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-zzasFAaWH284IEnWwWKvCL1lt/ItNfdbWhq1K30gSPU="; + hash = "sha256-C6u7t7RedInHJtN4yHli22Wc7llnrxn4YeKssyQ+hS4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index a7a6525e942d..0c69762ec8f1 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -19,7 +19,9 @@ buildPythonPackage rec { # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent # segfaults in the testsuite that end up failing the tests in a background thread (in myapp) - nativeCheckInputs = [ pytestCheckHook ] ++ lib.optionals (!stdenv.isDarwin) [ watchdog ]; + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ watchdog ]; disabledTestPaths = [ # Doesn't work with an exported home, RuntimeError: timeout waiting for change to file=/build/tmpgfn145cx diff --git a/pkgs/development/python-modules/huum/default.nix b/pkgs/development/python-modules/huum/default.nix index 7e8d4ff033b7..8eb7b4567459 100644 --- a/pkgs/development/python-modules/huum/default.nix +++ b/pkgs/development/python-modules/huum/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "huum"; - version = "0.7.10"; + version = "0.7.11"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "frwickst"; repo = "pyhuum"; rev = "refs/tags/${version}"; - hash = "sha256-INW6d/Zc5UZZOgN6wW+Xbm/wH1K/V6bviu3mID1R+BY="; + hash = "sha256-anYVrisn68EFpMsZXQb4PMsDKpRzUomoaJpOFtYVzhc="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index 7884f61cbcb6..4831f14335c0 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -1,28 +1,45 @@ { lib, - bokeh, buildPythonPackage, - colorcet, fetchPypi, - holoviews, - pandas, pythonOlder, + + # build-system setuptools-scm, + + # dependencies + bokeh, + colorcet, + holoviews, + pandas, + + # tests + pytestCheckHook, + dask, + xarray, + bokeh-sampledata, + parameterized, + selenium, + matplotlib, + scipy, + plotly, }: buildPythonPackage rec { pname = "hvplot"; - version = "0.10.0"; + version = "0.11.1"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-6HSGqVv+FRq1LvFjpek9nL0EOZLPC3Vcyt0r82/t03Y="; + hash = "sha256-mJ7QOJGJrcR+3NJgHS6rGL82bnSwf14oc+AhMjxKFLs="; }; - build-system = [ setuptools-scm ]; + build-system = [ + setuptools-scm + ]; dependencies = [ bokeh @@ -31,16 +48,34 @@ buildPythonPackage rec { pandas ]; - # Many tests require a network connection - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + dask + xarray + bokeh-sampledata + parameterized + selenium + matplotlib + scipy + plotly + ]; + + disabledTestPaths = [ + # All of the following below require xarray.tutorial files that require + # downloading files from the internet (not possible in the sandbox). + "hvplot/tests/testgeo.py" + "hvplot/tests/testinteractive.py" + "hvplot/tests/testui.py" + "hvplot/tests/testutil.py" + ]; pythonImportsCheck = [ "hvplot.pandas" ]; - meta = with lib; { + meta = { description = "High-level plotting API for the PyData ecosystem built on HoloViews"; homepage = "https://hvplot.pyviz.org"; changelog = "https://github.com/holoviz/hvplot/releases/tag/v${version}"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/hy/default.nix b/pkgs/development/python-modules/hy/default.nix index 8a8b29315f8e..a07181cdcd2e 100644 --- a/pkgs/development/python-modules/hy/default.nix +++ b/pkgs/development/python-modules/hy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hy"; - version = "0.29.0"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "hylang"; repo = "hy"; rev = "refs/tags/${version}"; - hash = "sha256-8b2V78mwzSThmVl1SfMGBw8VSpE5rCuucnIyD0nq5To="; + hash = "sha256-o6txdC8TOdaILAJP9LDAhJ587p+mw0bUEGLneQQYW9c="; }; # https://github.com/hylang/hy/blob/1.0a4/get_version.py#L9-L10 diff --git a/pkgs/development/python-modules/hydrus-api/default.nix b/pkgs/development/python-modules/hydrus-api/default.nix index 9d62af64cea7..ac833579a09e 100644 --- a/pkgs/development/python-modules/hydrus-api/default.nix +++ b/pkgs/development/python-modules/hydrus-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "hydrus-api"; - version = "5.0.1"; + version = "5.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "hydrus_api"; inherit version; - hash = "sha256-3Roeab9/woGF/aZYm9nbqrcyYN8CKA1k66cTRxx6jM4="; + hash = "sha256-oA3DbdX+MRZiInCKXurBdKlUFQ4jeU+jHr9NxMEHQmI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/hypothesis-auto/default.nix b/pkgs/development/python-modules/hypothesis-auto/default.nix index eca2ca101457..13457576cdb4 100644 --- a/pkgs/development/python-modules/hypothesis-auto/default.nix +++ b/pkgs/development/python-modules/hypothesis-auto/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "hypothesis-auto"; version = "1.1.5"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -23,14 +23,22 @@ buildPythonPackage rec { hash = "sha256-U0vcOB9jXmUV5v2IwybVu2arY1FpPnKkP7m2kbD1kRw="; }; - nativeBuildInputs = [ poetry-core ]; + pythonRelaxDeps = [ + "hypothesis" + "pydantic" + ]; - propagatedBuildInputs = [ - pydantic + build-system = [ poetry-core ]; + + dependencies = [ hypothesis - pytest + pydantic ]; + optional-dependencies = { + pytest = [ pytest ]; + }; + pythonImportsCheck = [ "hypothesis_auto" ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -38,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Enables fully automatic tests for type annotated functions"; homepage = "https://github.com/timothycrosley/hypothesis-auto/"; + changelog = "https://github.com/timothycrosley/hypothesis-auto/blob/master/CHANGELOG.md"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 4379303f3dba..efada0d391d0 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.108.5"; + version = "6.112.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-APZTI7AxbtLT+2mkxUapr1sPcq4ViMXy1J6g0I30s5A="; + hash = "sha256-KVi4BAgrswvhZxArYVnYQ6ksvCf84aSEZbJcRSlwsZE="; }; # I tried to package sphinx-selective-exclude, but it throws diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index c53c3c2e3670..fa40d34c8a82 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -45,6 +45,8 @@ buildPythonPackage rec { disabledTests = [ # super slow "test_source_code_from_libcst_node_type" + # https://github.com/Zac-HD/hypothesmith/issues/38 + "test_black_autoformatter_from_grammar" ]; pythonImportsCheck = [ "hypothesmith" ]; diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix index 2d3f2563ad01..5288be1c30a3 100644 --- a/pkgs/development/python-modules/hyppo/default.nix +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -1,31 +1,32 @@ { lib, + autograd, buildPythonPackage, - pythonOlder, fetchFromGitHub, - setuptools, - pytestCheckHook, - autograd, + future, + matplotlib, numba, numpy, + pytestCheckHook, + pythonOlder, scikit-learn, scipy, - matplotlib, seaborn, + setuptools, }: buildPythonPackage rec { pname = "hyppo"; - version = "0.4.0"; + version = "0.5.1"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "neurodata"; - repo = pname; + repo = "hyppo"; rev = "refs/tags/v${version}"; - hash = "sha256-QRE3oSxTEobTQ/7DzCAUOdjzIZmWUn9bgPmJWj6JuZg="; + hash = "sha256-bYxqYSOOifQE3gbw8vNk/A13D5TPx7ERSgFvRHMXKGM="; }; # some of the doctests (4/21) are broken, e.g. unbound variables, nondeterministic with insufficient tolerance, etc. @@ -36,8 +37,9 @@ buildPythonPackage rec { build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ autograd + future numba numpy scikit-learn diff --git a/pkgs/development/python-modules/hyrule/default.nix b/pkgs/development/python-modules/hyrule/default.nix index 3229e5137ea1..d62e3ab517a1 100644 --- a/pkgs/development/python-modules/hyrule/default.nix +++ b/pkgs/development/python-modules/hyrule/default.nix @@ -4,27 +4,24 @@ fetchFromGitHub, hy, pytestCheckHook, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "hyrule"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "hylang"; repo = "hyrule"; rev = "refs/tags/${version}"; - hash = "sha256-pmJhhOpNxVEUH8YwBUKSywYgYu43oLSmpWJM4HXGMiI="; + hash = "sha256-w1Q2w/P1bDt/F1+zTkUFi5PxycXXE3p0qadfBcyWElg="; }; build-system = [ setuptools ]; - propagatedBuildInputs = [ hy ]; + dependencies = [ hy ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index abaabb11f1bb..ac33fe0bc15d 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -5,20 +5,18 @@ pythonOlder, pytestCheckHook, atpublic, - bidict, black, clickhouse-connect, - dask, datafusion, db-dtypes, duckdb, + fetchpatch, filelock, geopandas, google-cloud-bigquery, google-cloud-bigquery-storage, graphviz, hypothesis, - multipledispatch, numpy, oracledb, packaging, @@ -57,9 +55,7 @@ }: let testBackends = [ - "datafusion" "duckdb" - "pandas" "sqlite" ]; @@ -67,15 +63,15 @@ let name = "ibis-testing-data"; owner = "ibis-project"; repo = "testing-data"; - # https://github.com/ibis-project/ibis/blob/9.1.0/nix/overlay.nix#L20-L26 - rev = "6737d1cb5951cabaccd095a3ae62a93dbd11ecb9"; - hash = "sha256-MoVTZPWh4KVlrICYACrgfeLdl/fqoa1iweNg3zUtdrs="; + # https://github.com/ibis-project/ibis/blob/9.5.0/nix/overlay.nix#L20-L26 + rev = "b26bd40cf29004372319df620c4bbe41420bb6f8"; + hash = "sha256-1fenQNQB+Q0pbb0cbK2S/UIwZDE4PXXG15MH3aVbyLU="; }; in buildPythonPackage rec { pname = "ibis-framework"; - version = "9.1.0"; + version = "9.5.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -85,10 +81,30 @@ buildPythonPackage rec { repo = "ibis"; owner = "ibis-project"; rev = "refs/tags/${version}"; - hash = "sha256-GmzmXzYMs7K7B//is3ZoD4muPAkb0tM56zFBbsA+NEo="; + hash = "sha256-6ebw/E3jZFMHKqC5ZY//2Ke0NrklyoGp5JGKBfDxy40="; }; - nativeBuildInputs = [ + patches = [ + # remove after the 10.0 release + (fetchpatch { + name = "ibis-framework-duckdb-1.1.1.patch"; + url = "https://github.com/ibis-project/ibis/commit/a54eceabac1d6592e9f6ab0ca7749e37a748c2ad.patch"; + hash = "sha256-j5BPYVqnEF9GQV5N3/VhFUCdsEwAIOQC0KfZ5LNBSRg="; + }) + + # remove after the 10.0 release + (fetchpatch { + name = "ibis-framework-arrow-18.patch"; + url = "https://github.com/ibis-project/ibis/commit/5dc549b22c2eca29a11a31fb29deef7c1466a204.patch"; + hash = "sha256-4i/g2uixdlkbE6x659wzZJ91FZpzwOVkF6ZeXkiCP3I="; + excludes = [ + "poetry.lock" + "requirements-dev.txt" + ]; + }) + ]; + + build-system = [ poetry-core poetry-dynamic-versioning ]; @@ -96,18 +112,11 @@ buildPythonPackage rec { dontBypassPoetryDynamicVersioning = true; env.POETRY_DYNAMIC_VERSIONING_BYPASS = lib.head (lib.strings.splitString "-" version); - propagatedBuildInputs = [ + dependencies = [ atpublic - bidict - multipledispatch - numpy - pandas parsy - pyarrow - pyarrow-hotfix python-dateutil pytz - rich sqlglot toolz typing-extensions @@ -124,11 +133,12 @@ buildPythonPackage rec { pytest-randomly pytest-snapshot pytest-timeout + # this dependency is still needed due to use of strict markers and + # `pytest.mark.xdist_group` in the ibis codebase pytest-xdist - ] ++ lib.concatMap (name: passthru.optional-dependencies.${name}) testBackends; + ] ++ lib.concatMap (name: optional-dependencies.${name}) testBackends; pytestFlagsArray = [ - "--dist=loadgroup" "-m" "'${lib.concatStringsSep " or " testBackends} or core'" ]; @@ -142,6 +152,7 @@ buildPythonPackage rec { "test_register_sqlite" # requires network connection "test_s3_403_fallback" + "test_hugging_face" # requires pytest 8.2+ "test_roundtrip_delta" ]; @@ -167,54 +178,139 @@ buildPythonPackage rec { pythonImportsCheck = [ "ibis" ] ++ map (backend: "ibis.backends.${backend}") testBackends; - passthru = { - optional-dependencies = { - bigquery = [ - db-dtypes - google-cloud-bigquery - google-cloud-bigquery-storage - pydata-google-auth - ]; - clickhouse = [ clickhouse-connect ]; - dask = [ - dask - regex - packaging - ]; - datafusion = [ datafusion ]; - druid = [ pydruid ]; - duckdb = [ duckdb ]; - flink = [ ]; - geospatial = [ - geopandas - shapely - ]; - mssql = [ pyodbc ]; - mysql = [ pymysql ]; - oracle = [ - oracledb - packaging - ]; - pandas = [ - regex - packaging - ]; - polars = [ - polars - packaging - ]; - postgres = [ psycopg2 ]; - pyspark = [ - pyspark - packaging - ]; - snowflake = [ snowflake-connector-python ]; - sqlite = [ regex ]; - trino = [ trino-python-client ]; - visualization = [ graphviz ]; - decompiler = [ black ]; - examples = [ pins ] ++ pins.optional-dependencies.gcs; - }; + optional-dependencies = { + bigquery = [ + db-dtypes + google-cloud-bigquery + google-cloud-bigquery-storage + pyarrow + pyarrow-hotfix + pydata-google-auth + numpy + pandas + rich + ]; + clickhouse = [ + clickhouse-connect + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + datafusion = [ + datafusion + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + druid = [ + pydruid + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + duckdb = [ + duckdb + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + flink = [ + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + geospatial = [ + geopandas + shapely + ]; + mssql = [ + pyodbc + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + mysql = [ + pymysql + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + oracle = [ + oracledb + packaging + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + polars = [ + polars + packaging + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + postgres = [ + psycopg2 + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + pyspark = [ + pyspark + packaging + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + snowflake = [ + snowflake-connector-python + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + sqlite = [ + regex + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + trino = [ + trino-python-client + pyarrow + pyarrow-hotfix + numpy + pandas + rich + ]; + visualization = [ graphviz ]; + decompiler = [ black ]; + examples = [ pins ] ++ pins.optional-dependencies.gcs; }; meta = with lib; { 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 9acf56259bc8..f301901ef5f7 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -7,7 +7,6 @@ python-dateutil, pythonAtLeast, pythonOlder, - pythonRelaxDepsHook, requests, responses, setuptools, @@ -15,22 +14,21 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.20.1"; + version = "3.21.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-nE1JIlYlJ5O3L7FQD5L+JvLnVs7nq4Ff6dmHvgXjj0M="; + pname = "ibm_cloud_sdk_core"; + inherit version; + hash = "sha256-G3LvZ13f/aJbCMQ7hLi25U0rXiGvHhvT6FB6LSVxpUQ="; }; pythonRelaxDeps = [ "requests" ]; build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - dependencies = [ pyjwt python-dateutil diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 1170485bf39f..fb88bcfebc84 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -2,17 +2,19 @@ lib, buildPythonPackage, fetchFromGitHub, + replaceVars, pythonOlder, - setuptools, + hatch-vcs, + hatchling, backports-zoneinfo, python-dateutil, - pytz, + tzdata, hypothesis, pytestCheckHook, }: buildPythonPackage rec { - version = "5.0.13"; + version = "6.0.1"; pname = "icalendar"; pyproject = true; @@ -20,14 +22,23 @@ buildPythonPackage rec { owner = "collective"; repo = "icalendar"; rev = "refs/tags/v${version}"; - hash = "sha256-2gpWfLXR4HThw23AWxY2rY9oiK6CF3Qiad8DWHCs4Qk="; + hash = "sha256-pcTiXRiHtx7jVzxDkY6WDhzo8sg8fPecqTpRSRIdvfs="; }; - build-system = [ setuptools ]; + patches = [ + (replaceVars ./no-dynamic-version.patch { + inherit version; + }) + ]; + + build-system = [ + hatch-vcs + hatchling + ]; dependencies = [ python-dateutil - pytz + tzdata ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/icalendar/no-dynamic-version.patch b/pkgs/development/python-modules/icalendar/no-dynamic-version.patch new file mode 100644 index 000000000000..4754b6441a5f --- /dev/null +++ b/pkgs/development/python-modules/icalendar/no-dynamic-version.patch @@ -0,0 +1,17 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 9730e46..9834686 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -34,11 +34,7 @@ maintainers = [ + { name="Christian Geier" }, + { name="Jaca", email="vitouejj@gmail.com" }, + ] +-# These attributes are dynamically generated by hatch-vcs +-dynamic = [ +- "urls", +- "version" +-] ++version = "@version@" + description = "iCalendar parser/generator" + readme = { file = "README.rst", content-type = "text/x-rst" } + diff --git a/pkgs/development/python-modules/icalevents/default.nix b/pkgs/development/python-modules/icalevents/default.nix index 8c0839590676..b5303060948c 100644 --- a/pkgs/development/python-modules/icalevents/default.nix +++ b/pkgs/development/python-modules/icalevents/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, pythonOlder, pytestCheckHook, poetry-core, @@ -25,6 +26,14 @@ buildPythonPackage rec { hash = "sha256-Bp+Wz88q65Gem8LyRz0A4xE5hIgOD+iZ7E1UlnfFiD4="; }; + patches = [ + (fetchpatch2 { + name = "icalendar-v6-compat.patch"; + url = "https://github.com/jazzband/icalevents/commit/fa925430bd63e46b0941b84a1ae2c9a063f2f720.patch"; + hash = "sha256-MeRC3iJ5raKvl9udzv/44Vs34LxSzq1S6VVKAVFSpiY="; + }) + ]; + build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/icontract/default.nix b/pkgs/development/python-modules/icontract/default.nix index b372a31b2c25..090886d2ddda 100644 --- a/pkgs/development/python-modules/icontract/default.nix +++ b/pkgs/development/python-modules/icontract/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "icontract"; - version = "2.7.0"; + version = "2.7.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Parquery"; repo = "icontract"; rev = "refs/tags/v${version}"; - hash = "sha256-+0h3Zb7lTxtaWTv2/MmvQCcccUKhTOxGqbqKELE8mQY="; + hash = "sha256-7mRQ1g2mllHIaZh0jEd/iCgaDja1KJXuRnamhDo/Pbo="; }; preCheck = '' diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index e44da7b58abe..a3fff70db1b4 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "idna"; - version = "3.7"; + version = "3.10"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Ao/zqt8GCcH9J42OowiSmUEqeoub0AXdCLn4KFvLXPw="; + hash = "sha256-EvZcm0cKvabcNc+OY8xXSxxSsR3yyGAwrwrAmwGxPqk="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index 6e17149079cf..c9b5183e4f9e 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -1,67 +1,200 @@ { lib, stdenv, + testers, buildPythonPackage, + pythonOlder, + python, + pytestCheckHook, + # fetchers fetchFromGitHub, - gcc10, + gitUpdater, + # build tools cmake, + swig, + # native dependencies + eigen, boost179, + cgal, + gmp, + hdf5, icu, - swig, - pcre, + libaec, + libxml2, + mpfr, + nlohmann_json, opencascade-occt_7_6, opencollada, - libxml2, + pcre, + zlib, + + # python deps + ## tools + setuptools, + build, + pytest, + ## dependencies + isodate, + lark, + numpy, + python-dateutil, + shapely, + typing-extensions, + ## additional deps for tests + ifcopenshell, + lxml, + mathutils, + networkx, + tabulate, + xmlschema, + xsdata, }: let opencascade-occt = opencascade-occt_7_6; in buildPythonPackage rec { pname = "ifcopenshell"; - version = "240611"; - format = "other"; + version = "0.8.0"; + pyproject = false; src = fetchFromGitHub { owner = "IfcOpenShell"; repo = "IfcOpenShell"; - rev = "refs/tags/blenderbim-${version}"; + rev = "refs/tags/ifcopenshell-python-${version}"; fetchSubmodules = true; - hash = "sha256-fCgxSambC01qb14EoZTrVxNNw8H3nX8oMi6gk0O/HmQ="; + hash = "sha256-tnj14lBEkUZNDM9J1sRhNA7OkWTWa5JPTSF8hui3q7k="; }; nativeBuildInputs = [ - gcc10 + # c++ cmake + swig + # python + build + setuptools ]; buildInputs = [ + # ifcopenshell needs stdc++ + (lib.getLib stdenv.cc.cc) boost179 + cgal + eigen + gmp + hdf5 icu - pcre + libaec libxml2 + mpfr + nlohmann_json + opencascade-occt + opencollada + pcre ]; - preConfigure = '' - cd cmake - ''; + propagatedBuildInputs = [ + isodate + lark + numpy + python-dateutil + shapely + typing-extensions + ]; + + # list taken from .github/workflows/ci.yml:49 + nativeCheckInputs = [ + lxml + mathutils + networkx + pytest + tabulate + xmlschema + xsdata + + pytestCheckHook + ]; + + pythonImportsCheck = [ "ifcopenshell" ]; PYTHONUSERBASE = "."; + + # We still build with python to generate ifcopenshell_wrapper.py and ifcopenshell_wrapper.so cmakeFlags = [ "-DUSERSPACE_PYTHON_PREFIX=ON" + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_IFCPYTHON=ON" + "-DCITYJSON_SUPPORT=OFF" + "-DEIGEN_DIR=${eigen}/include/eigen3" + "-DJSON_INCLUDE_DIR=${nlohmann_json}/include/" "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" - "-DOCC_LIBRARY_DIR=${opencascade-occt}/lib" + "-DOCC_LIBRARY_DIR=${lib.getLib opencascade-occt}/lib" "-DOPENCOLLADA_INCLUDE_DIR=${opencollada}/include/opencollada" - "-DOPENCOLLADA_LIBRARY_DIR=${opencollada}/lib/opencollada" + "-DOPENCOLLADA_LIBRARY_DIR=${lib.getLib opencollada}/lib/opencollada" "-DSWIG_EXECUTABLE=${swig}/bin/swig" "-DLIBXML2_INCLUDE_DIR=${libxml2.dev}/include/libxml2" - "-DLIBXML2_LIBRARIES=${libxml2.out}/lib/libxml2${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DLIBXML2_LIBRARIES=${lib.getLib libxml2}/lib/libxml2${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DGMP_LIBRARY_DIR=${lib.getLib gmp}/lib/" + "-DMPFR_LIBRARY_DIR=${lib.getLib mpfr}/lib/" + # HDF5 support is currently not optional, see https://github.com/IfcOpenShell/IfcOpenShell/issues/1815 + "-DHDF5_SUPPORT=ON" + "-DHDF5_INCLUDE_DIR=${hdf5.dev}/include/" + "-DHDF5_LIBRARIES=${lib.getLib hdf5}/lib/libhdf5_cpp.so;${lib.getLib hdf5}/lib/libhdf5.so;${lib.getLib zlib}/lib/libz.so;${lib.getLib libaec}/lib/libaec.so;" ]; + postPatch = '' + pushd src/ifcopenshell-python + # The build process is here: https://github.com/IfcOpenShell/IfcOpenShell/blob/v0.8.0/src/ifcopenshell-python/Makefile#L131 + # NOTE: it has changed a *lot* between 0.7.0 and 0.8.0, it *may* change again (look for mathutils and basically all the things this Makefile does manually) + substituteInPlace pyproject.toml --replace-fail "0.0.0" "${version}" + # NOTE: the following is directly inspired by https://github.com/IfcOpenShell/IfcOpenShell/blob/v0.8.0/src/ifcopenshell-python/Makefile#L123 + cp ../../README.md README.md + popd + ''; + + preConfigure = '' + cd cmake + ''; + + preCheck = '' + pushd ../../src/ifcopenshell-python + # let's test like done in .github/workflows/ci.yml + # installing the python wrapper and the .so, both are needed to be able to test + cp -v $out/${python.sitePackages}/ifcopenshell/ifcopenshell_wrapper.py ./ifcopenshell + cp $out/${python.sitePackages}/ifcopenshell/_ifcopenshell_wrapper.cpython-${ + lib.versions.major python.version + lib.versions.minor python.version + }-${stdenv.targetPlatform.system}-gnu.so ./ifcopenshell + pushd ../../test + PYTHONPATH=../src/ifcopenshell-python/ python tests.py + popd + ''; + + pytestFlagsArray = [ + "-p no:pytest-blender" + ]; + + disabledTestPaths = [ + "test/test_open.py" + ]; + + postCheck = '' + popd + ''; + + passthru = { + updateScript = gitUpdater { rev-prefix = "ifcopenshell-python-"; }; + tests = { + version = testers.testVersion { + command = "IfcConvert --version"; + package = ifcopenshell; + }; + }; + }; + meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Open source IFC library and geometry engine"; homepage = "http://ifcopenshell.org/"; license = licenses.lgpl3; - maintainers = with maintainers; [ fehnomenal ]; + maintainers = with maintainers; [ autra ]; }; } diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index 8d6145d9ad84..26009c97d47e 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -97,6 +97,6 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.bcdarwin ]; # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix index 3f13cf77b729..48983a575805 100644 --- a/pkgs/development/python-modules/igraph/default.nix +++ b/pkgs/development/python-modules/igraph/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { dependencies = [ texttable ]; - passthru.optional-dependencies = { + optional-dependencies = { cairo = [ cairocffi ]; matplotlib = [ matplotlib ]; plotly = [ plotly ]; @@ -58,7 +58,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ "testAuthorityScore" diff --git a/pkgs/development/python-modules/ihcsdk/default.nix b/pkgs/development/python-modules/ihcsdk/default.nix index 7750e89c27fa..8c141695b6be 100644 --- a/pkgs/development/python-modules/ihcsdk/default.nix +++ b/pkgs/development/python-modules/ihcsdk/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ihcsdk"; - version = "2.8.6"; + version = "2.8.7"; pyproject = true; src = fetchFromGitHub { owner = "dingusdk"; repo = "PythonIhcSdk"; rev = "refs/tags/v${version}"; - hash = "sha256-0meYr/SywtRfp/TBW3t8QUMlenb5KnzvKfn6c7Przpc="; + hash = "sha256-Ct+ONqvvm1OcZKi+5P3o5ievfVK0pg8DpjNwkbuczCE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ihm/default.nix b/pkgs/development/python-modules/ihm/default.nix index fe73c3ece177..1d07533f536a 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.4"; + version = "1.7"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-ihm"; rev = "refs/tags/${version}"; - hash = "sha256-Ls0o/PkJlHt9kx0IvR2Tpwo2QgXxug+Y+LVziTXXDpY="; + hash = "sha256-jQm8Xl2yyR+y1Leyz8naT1rFJpgK5XdUd7YgnhDuBWo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/imagecodecs-lite/default.nix b/pkgs/development/python-modules/imagecodecs-lite/default.nix index cca83672a31d..b21b80c7c694 100644 --- a/pkgs/development/python-modules/imagecodecs-lite/default.nix +++ b/pkgs/development/python-modules/imagecodecs-lite/default.nix @@ -29,7 +29,8 @@ buildPythonPackage rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "Block-oriented, in-memory buffer transformation, compression, and decompression functions"; homepage = "https://www.lfd.uci.edu/~gohlke/"; maintainers = [ maintainers.tbenst ]; diff --git a/pkgs/development/python-modules/imagecorruptions/default.nix b/pkgs/development/python-modules/imagecorruptions/default.nix index fa92484160e1..280770b8a63e 100644 --- a/pkgs/development/python-modules/imagecorruptions/default.nix +++ b/pkgs/development/python-modules/imagecorruptions/default.nix @@ -5,7 +5,7 @@ numpy, scikit-image, lib, - opencv4, + opencv-python, }: buildPythonPackage rec { @@ -18,14 +18,12 @@ buildPythonPackage rec { sha256 = "044e173f24d5934899bdbf3596bfbec917e8083e507eed583ab217abebbe084d"; }; - pythonRemoveDeps = [ "opencv-python" ]; - build-system = [ setuptools ]; dependencies = [ numpy scikit-image - opencv4 + opencv-python ]; doCheck = false; diff --git a/pkgs/development/python-modules/imagehash/default.nix b/pkgs/development/python-modules/imagehash/default.nix index 782aab2360d4..c53243e48f00 100644 --- a/pkgs/development/python-modules/imagehash/default.nix +++ b/pkgs/development/python-modules/imagehash/default.nix @@ -2,41 +2,52 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, numpy, - six, - scipy, pillow, + pytestCheckHook, + pythonOlder, pywavelets, + scipy, + setuptools, + six, }: buildPythonPackage rec { pname = "imagehash"; - version = "4.3.1"; - format = "setuptools"; + version = "4.3.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "JohannesBuchner"; repo = "imagehash"; - rev = "v${version}"; - hash = "sha256-Tsq10TZqnzNTuO4goKjdylN4Eqy7DNbHLjr5n3+nidM="; + rev = "refs/tags/v${version}"; + hash = "sha256-/kYINT26ROlB3fIcyyR79nHKg9FsJRQsXQx0Bvl14ec="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numpy - six scipy pillow pywavelets ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + six + ]; + + pythonImportsCheck = [ "imagehash" ]; meta = with lib; { description = "Python Perceptual Image Hashing Module"; - mainProgram = "find_similar_images.py"; homepage = "https://github.com/JohannesBuchner/imagehash"; + changelog = "https://github.com/JohannesBuchner/imagehash/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ e1mo ]; + mainProgram = "find_similar_images.py"; }; } diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 145d08730fe4..8ce6d5d4f4ec 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, isPyPy, substituteAll, @@ -32,19 +31,17 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.35.1"; + version = "2.36.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "imageio"; repo = "imageio"; rev = "refs/tags/v${version}"; - hash = "sha256-WeoZE2TPBAhzBBcZNQqoiqvribMCLSZWk/XpdMydvCQ="; + hash = "sha256-dQrAVPXtDdibaxxfqW29qY7j5LyegvmI0Y7/btXmsyY="; }; - patches = lib.optionals (!stdenv.isDarwin) [ + patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [ (substituteAll { src = ./libgl-path.patch; libgl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}"; @@ -100,15 +97,21 @@ buildPythonPackage rec { "tests/test_swf.py" ]; - disabledTests = lib.optionals stdenv.isDarwin [ - # Segmentation fault - "test_bayer_write" - # RuntimeError: No valid H.264 encoder was found with the ffmpeg installation - "test_writer_file_properly_closed" - "test_writer_pixelformat_size_verbose" - "test_writer_ffmpeg_params" - "test_reverse_read" - ]; + disabledTests = + [ + # Pillow 11.0.0 compat + # https://github.com/imageio/imageio/issues/1104 + "test_gif" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Segmentation fault + "test_bayer_write" + # RuntimeError: No valid H.264 encoder was found with the ffmpeg installation + "test_writer_file_properly_closed" + "test_writer_pixelformat_size_verbose" + "test_writer_ffmpeg_params" + "test_reverse_read" + ]; meta = { description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats"; diff --git a/pkgs/development/python-modules/imantics/default.nix b/pkgs/development/python-modules/imantics/default.nix index 2204450bed74..9727da3837f6 100644 --- a/pkgs/development/python-modules/imantics/default.nix +++ b/pkgs/development/python-modules/imantics/default.nix @@ -4,7 +4,7 @@ lib, setuptools, numpy, - opencv4, + opencv-python, lxml, xmljson, pytestCheckHook, @@ -22,13 +22,11 @@ buildPythonPackage rec { sha256 = "1zv2gj8cbakhh2fyr2611cbqhfk37a56x973ny9n43y70n26pzm8"; }; - pythonRemoveDeps = [ "opencv-python" ]; - build-system = [ setuptools ]; dependencies = [ numpy - opencv4 + opencv-python lxml xmljson ]; diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index d914f72b94bc..c6c0f3f43897 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "1.7.2"; + version = "1.7.4"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "refs/tags/v${version}"; - hash = "sha256-KW6YyArM3rHOkhXJCRWWy9OSwMwRFr16njeN+EcSGz0="; + hash = "sha256-2qSmnJnjwXNysUh0xeXshLZklCIOd92aM3gXtL8JhlI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index e3bdcc2a059e..09ebc40b7abb 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.12.3"; + version = "0.12.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-WwB5agFBnpECvUJeJ8MZ1Y0fbPLfp1HgLtf07fZ8PBs="; + hash = "sha256-gVO6OF0pawfZfgkBomJKhsBrSMlML5LaOlNUgnaXt6M="; }; nativeBuildInputs = [ setuptools ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { threadpoolctl ]; - passthru.optional-dependencies = { + optional-dependencies = { optional = [ keras pandas diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 1a887a87d29b..62efb51697af 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { (substituteAll { src = ./default-icc-profile.patch; srgbProfile = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then "/System/Library/ColorSync/Profiles/sRGB Profile.icc" else # break runtime dependency chain all of colord dependencies @@ -65,7 +65,9 @@ buildPythonPackage rec { # FIXME: Only add "sRGB Profile.icc" to __impureHostDeps once # https://github.com/NixOS/nix/issues/9301 is fixed. - __impureHostDeps = lib.optionals stdenv.isDarwin [ "/System/Library/ColorSync/Profiles" ]; + __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ + "/System/Library/ColorSync/Profiles" + ]; nativeCheckInputs = [ exiftool diff --git a/pkgs/development/python-modules/imgtool/default.nix b/pkgs/development/python-modules/imgtool/default.nix deleted file mode 100644 index ba083666336f..000000000000 --- a/pkgs/development/python-modules/imgtool/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - pythonOlder, - setuptools, - cbor2, - click, - cryptography, - intelhex, - pyyaml, -}: - -buildPythonPackage rec { - pname = "imgtool"; - version = "2.1.0"; - pyproject = true; - - disabled = pythonOlder "3.6"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-T3+831PETqqmImUEUQzLUvfvAMmXUDz5STSzMMlge2A="; - }; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ - cbor2 - click - cryptography - intelhex - pyyaml - ]; - - pythonImportsCheck = [ "imgtool" ]; - - meta = with lib; { - description = "MCUboot's image signing and key management"; - mainProgram = "imgtool"; - homepage = "https://github.com/mcu-tools/mcuboot"; - license = licenses.asl20; - maintainers = with maintainers; [ samueltardieu ]; - }; -} diff --git a/pkgs/development/python-modules/imgw-pib/default.nix b/pkgs/development/python-modules/imgw-pib/default.nix index f7ca3a58c29a..996f1afc87e3 100644 --- a/pkgs/development/python-modules/imgw-pib/default.nix +++ b/pkgs/development/python-modules/imgw-pib/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "imgw-pib"; - version = "1.0.5"; + version = "1.0.6"; pyproject = true; src = fetchFromGitHub { owner = "bieniu"; repo = "imgw-pib"; rev = "refs/tags/${version}"; - hash = "sha256-2t1dzumDVUr+Lma1lnri8l2x6fUx1LKEQne7Qzh7pwc="; + hash = "sha256-0ttGUsu00y/uuTXzPYkgh1QLMYOwPI/m8Qwk5Ty0Y3A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index 477e6f06a124..af1a63f42951 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.29.1"; + version = "2.30.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-R00Q6y+SS5Mg9vcJPkwUnQo4wSTQQZwSoHo+ypQt4CU="; + hash = "sha256-KBW/3rjn94GF8xa3Xi1LGdD2mTvcX/AzUu03twp5Y2A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/import-expression/default.nix b/pkgs/development/python-modules/import-expression/default.nix index 369495b96e29..4bed24b4bdae 100644 --- a/pkgs/development/python-modules/import-expression/default.nix +++ b/pkgs/development/python-modules/import-expression/default.nix @@ -3,38 +3,43 @@ buildPythonPackage, fetchPypi, pytestCheckHook, - astunparse, + pythonOlder, setuptools, + typing-extensions, }: + buildPythonPackage rec { pname = "import-expression"; - version = "2.0.0"; + version = "2.1.0.post1"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchPypi { - inherit version; pname = "import_expression"; - hash = "sha256-Biw7dIOPKbDcqYJSCyeqC/seREcVihSZuaKNFfgjTew="; + inherit version; + hash = "sha256-mclYGeuISXUDrOS1mhpVgDp1439KnHAwzHKIbRtdibQ="; }; build-system = [ setuptools ]; - dependencies = [ astunparse ]; + + dependencies = [ typing-extensions ]; + nativeCheckInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "tests.py" ]; - pythonImportsCheck = [ - "import_expression" - "import_expression._codec" - ]; + pythonImportsCheck = [ "import_expression" ]; meta = { description = "Transpiles a superset of python to allow easy inline imports"; homepage = "https://github.com/ioistired/import-expression-parser"; + changelog = "https://github.com/ioistired/import-expression/releases/tag/v${version}"; license = with lib.licenses; [ mit psfl ]; - mainProgram = "import-expression"; maintainers = with lib.maintainers; [ ]; + mainProgram = "import-expression"; }; } diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index c5de999be223..2d6164d53d8c 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -15,23 +15,23 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "7.1.0"; - format = "pyproject"; + version = "8.5.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-t4k4uSbujV8CD8R3LUhwRYBaVd260uzyHG1gk43H/NI="; + hash = "sha256-cVImVvCrrOHQcrnlSBpI8HwTjgDwecOMj4g4I/nCa9c="; }; - nativeBuildInputs = [ + build-system = [ setuptools # otherwise cross build fails setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ toml zipp ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index eea1111ff05e..b9f05dda461c 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "importlib-resources"; - version = "6.4.0"; + version = "6.4.5"; pyproject = true; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_resources"; inherit version; - hash = "sha256-zbK0U7gEbKTjeY6x2E88zhRGoOjnte9O+2APGfw5gUU="; + hash = "sha256-mAhiodFsnhR6WWA2d/oqpf2CuH8iO2y4cGlbz86DAGU="; }; build-system = [ diff --git a/pkgs/development/python-modules/inference-gym/default.nix b/pkgs/development/python-modules/inference-gym/default.nix new file mode 100644 index 000000000000..dd1a854b92c9 --- /dev/null +++ b/pkgs/development/python-modules/inference-gym/default.nix @@ -0,0 +1,31 @@ +{ + lib, + buildPythonPackage, + fetchPypi, +}: + +buildPythonPackage rec { + pname = "inference-gym"; + version = "0.0.4"; + format = "wheel"; + + src = fetchPypi { + inherit format version; + pname = "inference_gym"; + dist = "py3"; + python = "py3"; + hash = "sha256-bpi/IB8PuLPIKoTjmBeVl/4XGvE/yyG8WYxNqNcruvE="; + }; + + pythonImportsCheck = [ "inference_gym" ]; + + # The package does not ship any test. + doCheck = false; + + meta = { + description = "Place to exercise inference methods to help make them faster, leaner and more robust"; + homepage = "https://github.com/tensorflow/probability/tree/main/spinoffs/inference_gym"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 50d7deb1660b..bfff7bcd5cb7 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "inflect"; - version = "7.3.1"; + version = "7.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "jaraco"; repo = "inflect"; rev = "refs/tags/v${version}"; - hash = "sha256-J0XgSKPzZIt/7WnMGARXpyYzagBGiqRiuNmNnGKDBrs="; + hash = "sha256-3I5AdMuxwKtztnrF0lbvBIUxfqn0WlY2Pv6GYitFrA8="; }; build-system = [ diff --git a/pkgs/development/python-modules/inflection/default.nix b/pkgs/development/python-modules/inflection/default.nix index effa0f2cd4e2..ed8cc71addac 100644 --- a/pkgs/development/python-modules/inflection/default.nix +++ b/pkgs/development/python-modules/inflection/default.nix @@ -24,10 +24,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/jpvanhal/inflection"; description = "Port of Ruby on Rails inflector to Python"; - maintainers = with lib.maintainers; [ - NikolaMandic - ilya-kolpakov - ]; + maintainers = with lib.maintainers; [ ilya-kolpakov ]; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 0bf65299a561..712be1f3410a 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.46.0"; + version = "1.47.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-oq6VXsCizqs7ZGocFWvD6SK1HRgQerlAEDW6+SBoM+A="; + hash = "sha256-1QWy+mdVttowdbIBmtW6gYwkJ4p9sL0D+DxsHk3xgvc="; }; build-system = [ setuptools ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiocsv aiohttp diff --git a/pkgs/development/python-modules/injector/default.nix b/pkgs/development/python-modules/injector/default.nix index 7ce90c23f622..734b3b3f6d33 100644 --- a/pkgs/development/python-modules/injector/default.nix +++ b/pkgs/development/python-modules/injector/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, typing-extensions, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "injector" ]; diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix index c796a0136953..2435c7e46786 100644 --- a/pkgs/development/python-modules/inkex/default.nix +++ b/pkgs/development/python-modules/inkex/default.nix @@ -68,7 +68,7 @@ buildPythonPackage { "test_extract_multiple" "test_lookup_and" ] - ++ lib.optional stdenv.isDarwin [ + ++ lib.optional stdenv.hostPlatform.isDarwin [ "test_image_extract" "test_path_number_nodes" "test_plotter" # Hangs diff --git a/pkgs/development/python-modules/inline-snapshot/default.nix b/pkgs/development/python-modules/inline-snapshot/default.nix index 37e365781573..bf9f8fe408dd 100644 --- a/pkgs/development/python-modules/inline-snapshot/default.nix +++ b/pkgs/development/python-modules/inline-snapshot/default.nix @@ -7,8 +7,9 @@ dirty-equals, executing, fetchFromGitHub, + hatchling, hypothesis, - poetry-core, + pydantic, pyright, pytest-subtests, pytest-xdist, @@ -18,11 +19,12 @@ time-machine, toml, types-toml, + typing-extensions, }: buildPythonPackage rec { pname = "inline-snapshot"; - version = "0.10.2"; + version = "0.13.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -31,24 +33,29 @@ buildPythonPackage rec { owner = "15r10nk"; repo = "inline-snapshot"; rev = "refs/tags/v${version}"; - hash = "sha256-19rvhqYkM3QiD0La5TRi/2uKza8HW/bnXeGAhOZ/bgs="; + hash = "sha256-hwt/EFYedrml0x58Rd1AjqrIlELAXp1ku8v7glhCebE="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; - dependencies = [ - asttokens - black - click - executing - rich - toml - types-toml - ]; + dependencies = + [ + asttokens + black + click + executing + rich + typing-extensions + ] + ++ lib.optionals (pythonOlder "3.11") [ + types-toml + toml + ]; nativeCheckInputs = [ dirty-equals hypothesis + pydantic pyright pytest-subtests pytest-xdist diff --git a/pkgs/development/python-modules/inotify/default.nix b/pkgs/development/python-modules/inotify/default.nix index 6e8e7f0aba67..b5e3fd5acff8 100644 --- a/pkgs/development/python-modules/inotify/default.nix +++ b/pkgs/development/python-modules/inotify/default.nix @@ -2,31 +2,44 @@ lib, buildPythonPackage, fetchFromGitHub, - nose, + pytestCheckHook, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage { pname = "inotify"; version = "unstable-2020-08-27"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "dsoprea"; repo = "PyInotify"; rev = "f77596ae965e47124f38d7bd6587365924dcd8f7"; - sha256 = "X0gu4s1R/Kg+tmf6s8SdZBab2HisJl4FxfdwKktubVc="; - fetchSubmodules = false; + hash = "sha256-X0gu4s1R/Kg+tmf6s8SdZBab2HisJl4FxfdwKktubVc="; }; - nativeCheckInputs = [ nose ]; + postPatch = '' + # Needed because assertEquals was removed in python 3.12 + substituteInPlace tests/test_inotify.py \ + --replace-fail "assertEquals" "assertEqual" \ + ''; - # dunno what's wrong but the module works regardless - doCheck = false; + build-system = [ setuptools ]; - meta = with lib; { + nativeCheckInputs = [ pytestCheckHook ]; + + # Disable these tests as they're flaky. + # The returned list can be in a different order, which causes the tests to fail. + disabledTests = [ + "test__automatic_new_watches_on_new_paths" + "test__cycle" + "test__renames" + ]; + + meta = { homepage = "https://github.com/dsoprea/PyInotify"; description = "Monitor filesystems events on Linux platforms with inotify"; - license = licenses.gpl2; - platforms = platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index 63db32d65b53..331b98809bef 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "inquirer"; - version = "3.3.0"; + version = "3.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "magmax"; repo = "python-inquirer"; rev = "refs/tags/v${version}"; - hash = "sha256-M4EgQ/DX00CtAXRNvXoVKVWxj1jRpnNdG4qxOv20/MI="; + hash = "sha256-vIW/rD22PFND9EPjS0YPbIauKgh9KHh1gXf1L8g/f10="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/insightface/default.nix b/pkgs/development/python-modules/insightface/default.nix index 1199e09eae0d..41be9460fded 100644 --- a/pkgs/development/python-modules/insightface/default.nix +++ b/pkgs/development/python-modules/insightface/default.nix @@ -12,11 +12,14 @@ onnx, onnxruntime, opencv4, + pillow, prettytable, pythonOlder, + requests, + setuptools, + scipy, scikit-image, scikit-learn, - tensorboard, testers, tqdm, stdenv, @@ -34,38 +37,49 @@ buildPythonPackage rec { hash = "sha256-8ZH3GWEuuzcBj0GTaBRQBUTND4bm/NZ2wCPzVMZo3fc="; }; - build-system = [ cython ]; + build-system = [ + cython + setuptools + ]; dependencies = [ + albumentations easydict matplotlib - mxnet + mxnet # used in insightface/commands/rec_add_mask_param.py numpy onnx onnxruntime opencv4 + pillow + prettytable + requests scikit-learn scikit-image - tensorboard + scipy tqdm - albumentations - prettytable ]; + # aarch64-linux tries to get cpu information from /sys, which isn't available + # inside the nix build sandbox. + dontUsePythonImportsCheck = stdenv.buildPlatform.system == "aarch64-linux"; + + passthru.tests = lib.optionalAttrs (stdenv.buildPlatform.system != "aarch64-linux") { + version = testers.testVersion { + package = insightface; + command = "insightface-cli --help"; + # Doesn't support --version but we still want to make sure the cli is executable + # and returns the help output + version = "help"; + }; + }; + pythonImportsCheck = [ "insightface" "insightface.app" "insightface.data" ]; - passthru.tests.version = testers.testVersion { - package = insightface; - command = "insightface-cli --help"; - # Doesn't support --version but we still want to make sure the cli is executable - # and returns the help output - version = "help"; - }; - doCheck = false; # Upstream has no tests meta = { @@ -74,7 +88,5 @@ buildPythonPackage rec { homepage = "https://github.com/deepinsight/insightface"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ oddlama ]; - # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException' - broken = stdenv.system == "aarch64-linux"; }; } diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix index 31207450761f..af7c9581e7eb 100644 --- a/pkgs/development/python-modules/instructor/default.nix +++ b/pkgs/development/python-modules/instructor/default.nix @@ -1,38 +1,43 @@ { lib, - aiohttp, - anthropic, buildPythonPackage, - docstring-parser, fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + aiohttp, + docstring-parser, jiter, openai, - poetry-core, pydantic, - pytest-examples, - pytest-asyncio, - pytestCheckHook, - fastapi, - diskcache, - redis, - pythonOlder, rich, tenacity, typer, + + # tests + anthropic, + diskcache, + fastapi, + google-generativeai, + jinja2, + pytest-asyncio, + pytestCheckHook, + python-dotenv, + redis, }: buildPythonPackage rec { pname = "instructor"; - version = "1.3.7"; + version = "1.6.3"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "jxnl"; repo = "instructor"; rev = "refs/tags/${version}"; - hash = "sha256-XouTXv8wNPPBKVs2mCue1o4hfHlPlq6uXBuDXiZLIHI="; + hash = "sha256-L/7oErXu0U2G20pFfEReSKAK3P1BseybnPHazA7w6cM="; }; pythonRelaxDeps = [ @@ -57,12 +62,14 @@ buildPythonPackage rec { nativeCheckInputs = [ anthropic - fastapi - redis diskcache + fastapi + google-generativeai + jinja2 pytest-asyncio - pytest-examples pytestCheckHook + python-dotenv + redis ]; pythonImportsCheck = [ "instructor" ]; @@ -72,6 +79,9 @@ buildPythonPackage rec { "successfully" "test_mode_functions_deprecation_warning" "test_partial" + + # Requires unpackaged `vertexai` + "test_json_preserves_description_of_non_english_characters_in_json_mode" ]; disabledTestPaths = [ @@ -80,12 +90,13 @@ buildPythonPackage rec { "tests/llm/" ]; - meta = with lib; { + meta = { + broken = lib.versionOlder pydantic.version "2"; # ImportError: cannot import name 'TypeAdapter' from 'pydantic' description = "Structured outputs for llm"; homepage = "https://github.com/jxnl/instructor"; - changelog = "https://github.com/jxnl/instructor/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ mic92 ]; + changelog = "https://github.com/jxnl/instructor/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mic92 ]; mainProgram = "instructor"; }; } diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 80907730ffcf..1422752b3230 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, - appdirs, + platformdirs, bokeh, buildPythonPackage, dask, @@ -19,7 +19,9 @@ pytestCheckHook, python-snappy, pythonOlder, + pythonAtLeast, pyyaml, + networkx, requests, setuptools, setuptools-scm, @@ -28,7 +30,7 @@ buildPythonPackage rec { pname = "intake"; - version = "2.0.3"; + version = "2.0.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +39,7 @@ buildPythonPackage rec { owner = "intake"; repo = "intake"; rev = "refs/tags/${version}"; - hash = "sha256-Fyv85HkoE9OPOoSHR1sgCG0iAFuSiQMT7cyZcQyLvv0="; + hash = "sha256-F13jbAQP3G3cKeAegM1w/t32xyC0BgL9/67aIlzA4SE="; }; nativeBuildInputs = [ @@ -46,7 +48,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - appdirs + platformdirs dask entrypoints fsspec @@ -54,14 +56,15 @@ buildPythonPackage rec { jinja2 pandas pyyaml + networkx ]; nativeCheckInputs = [ intake-parquet pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); - passthru.optional-dependencies = { + optional-dependencies = { server = [ msgpack python-snappy @@ -124,11 +127,18 @@ buildPythonPackage rec { # Timing-based, flaky on darwin and possibly others "test_idle_timer" ] - ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") - [ - # Flaky with older low-res mtime on darwin < 10.13 (#143987) - "test_second_load_timestamp" - ]; + ++ lib.optionals (pythonAtLeast "3.12") [ + # Require deprecated distutils + "test_which" + "test_load" + ] + ++ + lib.optionals + (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") + [ + # Flaky with older low-res mtime on darwin < 10.13 (#143987) + "test_second_load_timestamp" + ]; pythonImportsCheck = [ "intake" ]; diff --git a/pkgs/development/python-modules/intbitset/default.nix b/pkgs/development/python-modules/intbitset/default.nix index 4c3d1d477c5a..3e275c3c1308 100644 --- a/pkgs/development/python-modules/intbitset/default.nix +++ b/pkgs/development/python-modules/intbitset/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "intbitset"; - version = "3.1.0"; + version = "4.0.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-boPFun/aJSCqhWVCi7r4Qt63KT1mXzzYKByzklTS/3E="; + hash = "sha256-wUHtqhwXuRwph1N+Jp2VWra9w5Zq89624eDSDtvQndI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index f6f93c25a773..bd0816bbdc27 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - docopt, fetchFromGitHub, pytestCheckHook, requests, @@ -17,7 +16,7 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "4.1.0"; + version = "5.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,14 +25,13 @@ buildPythonPackage rec { owner = "jjjake"; repo = "internetarchive"; rev = "refs/tags/v${version}"; - hash = "sha256-CqfwAKhrq4VEBU258x19JT8+ay2vOYIzVoFWjAzh3wY="; + hash = "sha256-0+tD+CtbR9MdqXH2CXWsXxyr5YM9gToExFnDQZa+gWM="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ tqdm - docopt requests jsonpatch schema diff --git a/pkgs/development/python-modules/invisible-watermark/default.nix b/pkgs/development/python-modules/invisible-watermark/default.nix index 968669ec92bc..d7ad922cf538 100644 --- a/pkgs/development/python-modules/invisible-watermark/default.nix +++ b/pkgs/development/python-modules/invisible-watermark/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - opencv4, + opencv-python, torch, onnx, onnxruntime, @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ - opencv4 + opencv-python torch pillow pywavelets @@ -42,8 +42,6 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.py \ - --replace 'opencv-python>=4.1.0.25' 'opencv' substituteInPlace imwatermark/rivaGan.py --replace \ 'You can install it with pip: `pip install onnxruntime`.' \ 'You can install it with an override: `python3Packages.invisible-watermark.override { withOnnx = true; };`.' @@ -72,7 +70,8 @@ buildPythonPackage rec { let testName = "${if withOnnx then "withOnnx" else "withoutOnnx"}-${method}"; # This test fails in the sandbox on aarch64-linux, see https://github.com/microsoft/onnxruntime/issues/10038 - skipTest = stdenv.isLinux && stdenv.isAarch64 && withOnnx && method == "rivaGan"; + skipTest = + stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64 && withOnnx && method == "rivaGan"; in lib.optionalAttrs (!skipTest) { "${testName}" = callPackage ./tests/cli.nix { diff --git a/pkgs/development/python-modules/iocapture/default.nix b/pkgs/development/python-modules/iocapture/default.nix index a36a01eeeead..0e44cad6916b 100644 --- a/pkgs/development/python-modules/iocapture/default.nix +++ b/pkgs/development/python-modules/iocapture/default.nix @@ -4,7 +4,7 @@ fetchPypi, flexmock, pytest, - pytest-cov, + pytest-cov-stub, six, }: @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeCheckInputs = [ flexmock pytest - pytest-cov + pytest-cov-stub six ]; diff --git a/pkgs/development/python-modules/iopath/default.nix b/pkgs/development/python-modules/iopath/default.nix index 53159f5a8457..66ea7ae87f2e 100644 --- a/pkgs/development/python-modules/iopath/default.nix +++ b/pkgs/development/python-modules/iopath/default.nix @@ -52,7 +52,7 @@ buildPythonPackage { pythonImportsCheck = [ "iopath" ]; - passthru.optional-dependencies = { + optional-dependencies = { aws = [ boto3 ]; }; diff --git a/pkgs/development/python-modules/iosbackup/default.nix b/pkgs/development/python-modules/iosbackup/default.nix new file mode 100644 index 000000000000..41904c36336c --- /dev/null +++ b/pkgs/development/python-modules/iosbackup/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + nskeyedunarchiver, + pycrypto, +}: + +buildPythonPackage rec { + pname = "iosbackup"; + version = "0.9.925"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "iOSbackup"; + hash = "sha256-M1Rakknls/qq3x7ngv5r3823D64N77oazuM2pl+T0co="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pycrypto + nskeyedunarchiver + ]; + + pythonImportsCheck = [ "iOSbackup" ]; + + meta = { + description = "Reads and extracts files from password-encrypted iOS backups"; + homepage = "https://github.com/avibrazil/iOSbackup"; + license = lib.licenses.lgpl2Only; + maintainers = with lib.maintainers; [ PapayaJackal ]; + }; +} diff --git a/pkgs/development/python-modules/ipfshttpclient/default.nix b/pkgs/development/python-modules/ipfshttpclient/default.nix index e44127372172..263870816dab 100644 --- a/pkgs/development/python-modules/ipfshttpclient/default.nix +++ b/pkgs/development/python-modules/ipfshttpclient/default.nix @@ -8,7 +8,7 @@ py-multiaddr, requests, pytestCheckHook, - pytest-cov, + pytest-cov-stub, pytest-dependency, pytest-localserver, pytest-mock, @@ -42,7 +42,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub pytest-dependency pytest-localserver pytest-mock diff --git a/pkgs/development/python-modules/ipwhois/default.nix b/pkgs/development/python-modules/ipwhois/default.nix index bd69e5ccd514..abdcb10e9eb2 100644 --- a/pkgs/development/python-modules/ipwhois/default.nix +++ b/pkgs/development/python-modules/ipwhois/default.nix @@ -2,6 +2,7 @@ lib, stdenv, buildPythonPackage, + defusedxml, dnspython, fetchFromGitHub, fetchpatch, @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "ipwhois"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,33 +24,25 @@ buildPythonPackage rec { owner = "secynic"; repo = "ipwhois"; rev = "refs/tags/v${version}"; - hash = "sha256-2CfRRHlIIaycUtzKeMBKi6pVPeBCb1nW3/1hoxQU1YM="; + hash = "sha256-PY3SUPELcCvS/o5kfko4OD1BlTc9DnyqfkSFuzcAOSY="; }; - patches = [ - # Use assertEqual instead of assertEquals, https://github.com/secynic/ipwhois/pull/316 - (fetchpatch { - name = "assert-equal.patch"; - url = "https://github.com/secynic/ipwhois/commit/fce2761354af99bc169e6cd08057e838fcc40f75.patch"; - hash = "sha256-7Ic4xWTAmklk6MvnZ/WsH9SW/4D9EG/jFKt5Wi89Xtc="; - }) - ]; - __darwinAllowLocalNetworking = true; pythonRelaxDeps = [ "dnspython" ]; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ dnspython ]; + dependencies = [ + defusedxml + dnspython + ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "ipwhois" ]; - preCheck = lib.optionalString stdenv.isLinux '' + preCheck = lib.optionalString stdenv.hostPlatform.isLinux '' echo "nameserver 127.0.0.1" > resolv.conf export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \ LD_PRELOAD=${libredirect}/lib/libredirect.so diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index dabad2fa8e13..4da948088c9a 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { pyzmq tornado traitlets - ] ++ lib.optionals stdenv.isDarwin [ appnope ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ appnope ]; # check in passthru.tests.pytest to escape infinite recursion with ipyparallel doCheck = false; diff --git a/pkgs/development/python-modules/ipykernel/tests.nix b/pkgs/development/python-modules/ipykernel/tests.nix index 4d96d4c6787d..89ac0be2d3d6 100644 --- a/pkgs/development/python-modules/ipykernel/tests.nix +++ b/pkgs/development/python-modules/ipykernel/tests.nix @@ -46,7 +46,7 @@ buildPythonPackage { # traitlets.config.configurable.MultipleInstanceError: An incompatible siblin... "test_install_kernelspec" ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( [ # see https://github.com/NixOS/nixpkgs/issues/76197 "test_subprocess_print" diff --git a/pkgs/development/python-modules/ipyniivue/default.nix b/pkgs/development/python-modules/ipyniivue/default.nix index 52bb55afff10..58e9e0829bab 100644 --- a/pkgs/development/python-modules/ipyniivue/default.nix +++ b/pkgs/development/python-modules/ipyniivue/default.nix @@ -1,8 +1,11 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + fetchNpmDeps, pythonOlder, + nodejs, + npmHooks, hatchling, hatch-vcs, anywidget, @@ -16,15 +19,32 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-C0mYkguN4ZfxSLqETH3dUwXeoNcicrmAgp6e9IIT43s="; + src = fetchFromGitHub { + owner = "niivue"; + repo = "ipyniivue"; + rev = "v${version}"; + hash = "sha256-6DZmHVVxJspjUhJ9pzTmTvwAnQfvTp8OL2xZONz2XbU="; + }; + + npmDeps = fetchNpmDeps { + name = "${pname}-${version}-npm-deps"; + inherit src; + hash = "sha256-ZJRBGMNn5clxMavimfl6Jwqf7M2pRo+WLne0gUWOiJ8="; }; # We do not need the build hooks, because we do not need to # build any JS components; these are present already in the PyPI artifact. env.HATCH_BUILD_NO_HOOKS = true; + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + ]; + + preBuild = '' + npm run build + ''; + build-system = [ hatchling hatch-vcs @@ -32,7 +52,7 @@ buildPythonPackage rec { dependencies = [ anywidget ]; - nativeCheckImports = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "ipyniivue" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ipytablewidgets/default.nix b/pkgs/development/python-modules/ipytablewidgets/default.nix index 0f54bb310567..e536861e1061 100644 --- a/pkgs/development/python-modules/ipytablewidgets/default.nix +++ b/pkgs/development/python-modules/ipytablewidgets/default.nix @@ -12,20 +12,18 @@ pandas, setuptools, traitlets, - traittypes, - wheel, }: buildPythonPackage rec { pname = "ipytablewidgets"; - version = "0.3.1"; - format = "pyproject"; + version = "0.3.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-14vIih+r/PHLxhgG29YtwuosSBLpewD2CluWpH2+pLc="; + hash = "sha256-CGkb//mLUmkyv+hmVJX5+04JGCfw+TtfBxMTXW0bhsw="; }; # Opened https://github.com/progressivis/ipytablewidgets/issues/3 to ask if @@ -37,20 +35,18 @@ buildPythonPackage rec { --replace 'jupyterlab>=3.0.0,<3.7' 'jupyterlab>=3.0.0' ''; - nativeBuildInputs = [ + build-system = [ jupyter-packaging jupyterlab setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ ipywidgets lz4 numpy pandas traitlets - traittypes ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index e13f14a2411e..45cd52fdbac3 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -42,13 +42,13 @@ buildPythonPackage rec { pname = "ipython"; - version = "8.26.0"; + version = "8.29.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-HOwPu6hASvE/rOvoPQRDanQ0x0AOWfR6z0Z8ZKvQlWw="; + hash = "sha256-QLYOFbIlkUUO73PkCgJ893vWUudXUj7rxb18fEmCkOs="; }; build-system = [ setuptools ]; @@ -102,7 +102,7 @@ buildPythonPackage rec { # UnboundLocalError: local variable 'child' referenced before assignment "test_system_interrupt" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # FileNotFoundError: [Errno 2] No such file or directory: 'pbpaste' "test_clipboard_get" ]; diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index c7408868ad91..d81577d40bbf 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -11,18 +11,19 @@ pythonOlder, pytz, setuptools-scm, + importlib-resources, }: buildPythonPackage rec { pname = "irc"; - version = "20.4.3"; + version = "20.5.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-dXguOB679BBEP3kU/XTKF/vcRBTRTUjaVhSZ6wlY0AI="; + hash = "sha256-jdv9GfcSBM7Ount8cnJLFbP6h7q16B5Fp1vvc2oaPHY="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -34,10 +35,12 @@ buildPythonPackage rec { jaraco-stream jaraco-text pytz - ]; + ] ++ lib.optionals (pythonOlder "3.12") [ importlib-resources ]; nativeCheckInputs = [ pytestCheckHook ]; + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "irc" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ircrobots/default.nix b/pkgs/development/python-modules/ircrobots/default.nix index 370040f2b6fe..7fcb1280987f 100644 --- a/pkgs/development/python-modules/ircrobots/default.nix +++ b/pkgs/development/python-modules/ircrobots/default.nix @@ -2,33 +2,31 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, + setuptools, anyio, asyncio-rlock, asyncio-throttle, ircstates, async-stagger, async-timeout, - python, + unittestCheckHook, }: buildPythonPackage rec { pname = "ircrobots"; - version = "0.6.6"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + version = "0.7.2"; + pyproject = true; src = fetchFromGitHub { owner = "jesopo"; repo = pname; rev = "v${version}"; - hash = "sha256-mIh3tERwHtGH9eA0AT8Lcnwp1Wn9lQhKkUjuZcOXO/c="; + hash = "sha256-slz4AH2Mi21N3aV+OrnoXoQsseS7arW2NuUZARQJsf0="; }; - postPatch = '' - # too specific pins https://github.com/jesopo/ircrobots/issues/3 - sed -iE 's/anyio.*/anyio/' requirements.txt - ''; + build-system = [ setuptools ]; + + pythonRelaxDeps = true; propagatedBuildInputs = [ anyio @@ -39,9 +37,7 @@ buildPythonPackage rec { async-timeout ]; - checkPhase = '' - ${python.interpreter} -m unittest test - ''; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "ircrobots" ]; diff --git a/pkgs/development/python-modules/ircstates/default.nix b/pkgs/development/python-modules/ircstates/default.nix index ab28fb911aa3..3efe469fe093 100644 --- a/pkgs/development/python-modules/ircstates/default.nix +++ b/pkgs/development/python-modules/ircstates/default.nix @@ -2,36 +2,36 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, + setuptools, irctokens, pendulum, freezegun, - python, + unittestCheckHook, }: buildPythonPackage rec { pname = "ircstates"; - version = "0.12.1"; - format = "setuptools"; - disabled = pythonOlder "3.6"; # f-strings + version = "0.13.0"; + pyproject = true; src = fetchFromGitHub { owner = "jesopo"; repo = pname; rev = "v${version}"; - hash = "sha256-F9yOY3YBacyoUzNTvPs7pxp6yNx08tiq1jWQKhGiagc="; + hash = "sha256-Mq9aOj6PXzPjaz3ofoPcAbur59oUWffmEg8aHt0v+0Q="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ irctokens pendulum ]; - nativeCheckInputs = [ freezegun ]; - - checkPhase = '' - ${python.interpreter} -m unittest test - ''; + nativeCheckInputs = [ + freezegun + unittestCheckHook + ]; pythonImportsCheck = [ "ircstates" ]; diff --git a/pkgs/development/python-modules/irctokens/default.nix b/pkgs/development/python-modules/irctokens/default.nix index 5ad937806155..1e2b962d0f6a 100644 --- a/pkgs/development/python-modules/irctokens/default.nix +++ b/pkgs/development/python-modules/irctokens/default.nix @@ -3,14 +3,16 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + setuptools, pyyaml, - python, + unittestCheckHook, }: buildPythonPackage rec { pname = "irctokens"; version = "2.0.2"; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.6"; # f-strings src = fetchFromGitHub { @@ -20,10 +22,12 @@ buildPythonPackage rec { hash = "sha256-Y9NBqxGUkt48hnXxsmfydHkJmWWb+sRrElV8C7l9bpw="; }; - nativeCheckInputs = [ pyyaml ]; - checkPhase = '' - ${python.interpreter} -m unittest test - ''; + build-system = [ setuptools ]; + + nativeCheckInputs = [ + pyyaml + unittestCheckHook + ]; pythonImportsCheck = [ "irctokens" ]; diff --git a/pkgs/development/python-modules/isal/default.nix b/pkgs/development/python-modules/isal/default.nix index 3a7ca9a07a2b..0594330edaf8 100644 --- a/pkgs/development/python-modules/isal/default.nix +++ b/pkgs/development/python-modules/isal/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "isal"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; src = fetchFromGitHub { owner = "pycompression"; repo = "python-isal"; rev = "v${version}"; - hash = "sha256-wasybbNWBa6Zd0JI2/lBNUkvEOY3/iBqsVWh/4WPM2s="; + hash = "sha256-KLnSE7QLM3q8DdoWnCEN6dOxsMr8eSH9k3FqFquZFlE="; }; patches = [ diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 8bf7e67b9ecd..627bdeadfc1e 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - pytest-cov, + pytest-cov-stub, setuptools, }: @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; pytestFlagsArray = [ "isbnlib/test/" ]; diff --git a/pkgs/development/python-modules/itemloaders/default.nix b/pkgs/development/python-modules/itemloaders/default.nix index bd6e8b884ac1..de2b1e902702 100644 --- a/pkgs/development/python-modules/itemloaders/default.nix +++ b/pkgs/development/python-modules/itemloaders/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "itemloaders"; - version = "1.3.1"; + version = "1.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "scrapy"; repo = "itemloaders"; rev = "refs/tags/v${version}"; - hash = "sha256-u0/WsvLn2YlYd/FuH26T9qEGRGscipnOQbV9uPv4F+M="; + hash = "sha256-Hs3FodJAWZGeo+kMmcto5WW433RekwVuucaJl8TKc+0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix index 61e835890c32..9d193a2dbd64 100644 --- a/pkgs/development/python-modules/iterm2/default.nix +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "iterm2"; - version = "2.7"; + version = "2.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-9vC+xGwyzsr3vn/YIpbsRpfUvyEB8MSqskzBI5kfojA="; + hash = "sha256-kNPobWr12VXDGZk8g1LPPpPHoMkZ7Ysq1VGnQrh+iJs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/iwlib/default.nix b/pkgs/development/python-modules/iwlib/default.nix index 01f83b80a003..08348a6de3ab 100644 --- a/pkgs/development/python-modules/iwlib/default.nix +++ b/pkgs/development/python-modules/iwlib/default.nix @@ -23,7 +23,6 @@ buildPythonPackage rec { nativeBuildInputs = [ pytest ]; pythonImportsCheck = [ "iwlib" ]; - doCheck = true; checkInputs = [ pytest ]; checkPhase = "python iwlib/_iwlib_build.py; pytest -v"; diff --git a/pkgs/development/python-modules/jalali-core/default.nix b/pkgs/development/python-modules/jalali-core/default.nix new file mode 100644 index 000000000000..69c613d0417c --- /dev/null +++ b/pkgs/development/python-modules/jalali-core/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "jalali-core"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "jalali_core"; + inherit version; + hash = "sha256-9Ch8cMYwMj3PCjqybfkFuk1FHiMKwfZbO7L3d5eJSis="; + }; + + build-system = [ setuptools ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "jalali_core" ]; + + meta = { + description = "Module to convert Gregorian to Jalali and inverse dates"; + homepage = "https://pypi.org/project/jalali-core/"; + license = lib.licenses.lgpl2Only; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/jaraco-abode/default.nix b/pkgs/development/python-modules/jaraco-abode/default.nix index 666f527fce40..0b96700f267d 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.1"; + version = "6.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-1omRBbUNS2/U2laK7E1M0uZfejZVMdGezG5oIGILj70="; + hash = "sha256-t5AI2wpSM6xMzULEZYkUgGvcODM8PVxdd2Vy/PV0Ga4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jaraco-collections/default.nix b/pkgs/development/python-modules/jaraco-collections/default.nix index 5b08f94e984d..128592ba047d 100644 --- a/pkgs/development/python-modules/jaraco-collections/default.nix +++ b/pkgs/development/python-modules/jaraco-collections/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "jaraco-collections"; - version = "5.0.1"; - format = "pyproject"; + version = "5.1.0"; + pyproject = true; src = fetchPypi { - pname = "jaraco.collections"; + pname = "jaraco_collections"; inherit version; - hash = "sha256-gIYxsXS4Sk4qWSSQ1i9i38FdgEeg9xVyYJjcQ7gabPo="; + hash = "sha256-DkgpQJ05rRikCqZ1T+4nZ/TZcwxLpm3J34nx0nVplMI="; }; postPatch = '' @@ -24,12 +24,12 @@ buildPythonPackage rec { sed -i "/'jaraco.text',/d" setup.cfg ''; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ jaraco-classes jaraco-text ]; diff --git a/pkgs/development/python-modules/jaraco-context/default.nix b/pkgs/development/python-modules/jaraco-context/default.nix index c0ea092b0fc1..6021e74f4c69 100644 --- a/pkgs/development/python-modules/jaraco-context/default.nix +++ b/pkgs/development/python-modules/jaraco-context/default.nix @@ -9,21 +9,21 @@ buildPythonPackage rec { pname = "jaraco-context"; - version = "5.3.0"; - format = "pyproject"; + version = "6.0.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.context"; rev = "refs/tags/v${version}"; - hash = "sha256-Caj51qBLHbuiey023iLc+N2M8QiJKH8G/Pzu1v3AToU="; + hash = "sha256-WXZX2s9Qehp0F3bSv2c5lGxhhn6HKFkABbtYKizG1/8="; }; pythonNamespaces = [ "jaraco" ]; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; dependencies = lib.optionals (pythonOlder "3.12") [ backports-tarfile ]; diff --git a/pkgs/development/python-modules/jaraco-functools/default.nix b/pkgs/development/python-modules/jaraco-functools/default.nix index 4af7e125b83d..bbc107fdda4f 100644 --- a/pkgs/development/python-modules/jaraco-functools/default.nix +++ b/pkgs/development/python-modules/jaraco-functools/default.nix @@ -1,31 +1,43 @@ { lib, + stdenv, buildPythonPackage, fetchPypi, + jaraco-classes, more-itertools, - setuptools, + pytestCheckHook, setuptools-scm, + setuptools, + pythonOlder, }: buildPythonPackage rec { pname = "jaraco-functools"; - version = "4.0.1"; + version = "4.1.0"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchPypi { pname = "jaraco_functools"; inherit version; - hash = "sha256-0z+nZTdMBhG1L4s6eV+JAIaaqIyEdp1NF0bNaPsow+g="; + hash = "sha256-cPfg4q4HZJjiElYjJegFIE/Akte0wX4OhslZ4klwGp0="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ more-itertools ]; + dependencies = [ more-itertools ]; + + nativeCheckInputs = [ + jaraco-classes + pytestCheckHook + ]; - doCheck = false; + # test is flaky on darwin + disabledTests = if stdenv.isDarwin then [ "test_function_throttled" ] else null; pythonNamespaces = [ "jaraco" ]; @@ -34,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Additional functools in the spirit of stdlib's functools"; homepage = "https://github.com/jaraco/jaraco.functools"; + changelog = "https://github.com/jaraco/jaraco.functools/blob/v${version}/NEWS.rst"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/jaraco-net/default.nix b/pkgs/development/python-modules/jaraco-net/default.nix index c5554812cbe8..de22f3eda857 100644 --- a/pkgs/development/python-modules/jaraco-net/default.nix +++ b/pkgs/development/python-modules/jaraco-net/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { python-dateutil pathvalidate jsonpickle - ] ++ lib.optionals stdenv.isDarwin [ ifconfig-parser ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ifconfig-parser ]; pythonImportsCheck = [ "jaraco.net" ]; @@ -78,7 +78,7 @@ buildPythonPackage rec { importlib-resources pyparsing requests-mock - ] ++ lib.optionals stdenv.isDarwin [ nettools ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ nettools ]; disabledTestPaths = [ # doesn't actually contain tests diff --git a/pkgs/development/python-modules/jaraco-path/default.nix b/pkgs/development/python-modules/jaraco-path/default.nix index 5537811d592d..48ee8b4fdd2b 100644 --- a/pkgs/development/python-modules/jaraco-path/default.nix +++ b/pkgs/development/python-modules/jaraco-path/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/jaraco.path"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; - broken = stdenv.isDarwin; # pyobjc is missing + broken = stdenv.hostPlatform.isDarwin; # pyobjc is missing }; } diff --git a/pkgs/development/python-modules/jaraco-stream/default.nix b/pkgs/development/python-modules/jaraco-stream/default.nix index a516bf33b0b3..33b0ea2e9d33 100644 --- a/pkgs/development/python-modules/jaraco-stream/default.nix +++ b/pkgs/development/python-modules/jaraco-stream/default.nix @@ -1,24 +1,42 @@ { + lib, buildPythonPackage, fetchPypi, + more-itertools, + pytestCheckHook, + pythonOlder, setuptools-scm, - six, + setuptools, }: buildPythonPackage rec { pname = "jaraco-stream"; - version = "3.0.3"; - format = "setuptools"; + version = "3.0.4"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { - pname = "jaraco.stream"; + pname = "jaraco_stream"; inherit version; - sha256 = "3af4b0441090ee65bd6dde930d29f93f50c4a2fe6048e2a9d288285f5e4dc441"; + sha256 = "sha256-4rxQKOch7SzIUrluyaM/K3Zk6bLb+H7vvmF9EmZBk0s="; }; + build-system = [ setuptools-scm ]; + + propagatedBuildInputs = [ more-itertools ]; + pythonNamespaces = [ "jaraco" ]; - doCheck = false; - buildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ six ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "jaraco.stream" ]; + + meta = with lib; { + description = "Module with routines for handling streaming data"; + homepage = "https://github.com/jaraco/jaraco.stream"; + changelog = "https://github.com/jaraco/jaraco.stream/blob/v${version}/NEWS.rst"; + license = licenses.mit; + maintainers = [ ]; + }; } diff --git a/pkgs/development/python-modules/jaraco-text/default.nix b/pkgs/development/python-modules/jaraco-text/default.nix index 5ff8b117eb80..06dc0fef613a 100644 --- a/pkgs/development/python-modules/jaraco-text/default.nix +++ b/pkgs/development/python-modules/jaraco-text/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "jaraco-text"; - version = "3.12.1"; + version = "3.14.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jaraco_text"; inherit version; - hash = "sha256-tplJH50HS0/q/f2gQH+lu8XYP0hWB6AS6TRyuhYfaEM="; + hash = "sha256-7RTk33dT5A/e88oOtT9r6fXvl0gYBult4mw6cunCk/Y="; }; pythonNamespaces = [ "jaraco" ]; diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index ec8c53daab46..ba9a621b1eab 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { # PermissionError: [Errno 13] Permission denied: '/tmp/back_compat_testdata/test_*.py' # See https://github.com/google/jax/blob/jaxlib-v0.4.27/jax/_src/internal_test_util/export_back_compat_test_util.py#L240-L241 # NOTE: this doesn't seem to be an issue on linux - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export TEST_UNDECLARED_OUTPUTS_DIR=$(mktemp -d) ''; @@ -108,7 +108,7 @@ buildPythonPackage rec { "test_custom_root_with_aux" "testEigvalsGrad_shape" ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # See https://github.com/google/jax/issues/14793. "test_for_loop_fixpoint_correctly_identifies_loop_varying_residuals_unrolled_for_loop" "testQdwhWithRandomMatrix3" @@ -131,7 +131,7 @@ buildPythonPackage rec { # Segmentation fault. See https://gist.github.com/zimbatm/e9b61891f3bcf5e4aaefd13f94344fba "tests/linalg_test.py" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # RuntimeWarning: invalid value encountered in cast "tests/lax_test.py" ]; diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index 3104cee90e1c..5b7fb2d88a93 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -186,10 +186,10 @@ buildPythonPackage { # Prebuilt wheels are dynamically linked against things that nix can't find. # Run `autoPatchelfHook` to automagically fix them. nativeBuildInputs = - lib.optionals stdenv.isLinux [ autoPatchelfHook ] + lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] ++ lib.optionals cudaSupport [ autoAddDriverRunpath ]; # Dynamic link dependencies - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; # jaxlib contains shared libraries that open other shared libraries via dlopen # and these implicit dependencies are not recognized by ldd or @@ -238,12 +238,12 @@ buildPythonPackage { broken = !(cudaSupport -> lib.versionAtLeast cudaVersion "11.1") || !(cudaSupport -> lib.versionAtLeast cudaPackages.cudnn.version "8.2") - || !(cudaSupport -> stdenv.isLinux) + || !(cudaSupport -> stdenv.hostPlatform.isLinux) || !(cudaSupport -> (gpuSrcs ? "cuda${cudaVersion}-${pythonVersion}")) # Fails at pythonImportsCheckPhase: # ...-python-imports-check-hook.sh/nix-support/setup-hook: line 10: 28017 Illegal instruction: 4 # /nix/store/5qpssbvkzfh73xih07xgmpkj5r565975-python3-3.11.9/bin/python3.11 -c # 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ["pythonImportsCheck"].split()))' - || (stdenv.isDarwin && stdenv.isx86_64); + || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); }; } diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 0fc50fa9243f..de7fea0a26e8 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -240,7 +240,7 @@ let wheel build which - ] ++ lib.optionals effectiveStdenv.isDarwin [ cctools ]; + ] ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = [ @@ -259,8 +259,8 @@ let snappy zlib ] - ++ lib.optionals effectiveStdenv.isDarwin [ IOKit ] - ++ lib.optionals (!effectiveStdenv.isDarwin) [ nsync ]; + ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ IOKit ] + ++ lib.optionals (!effectiveStdenv.hostPlatform.isDarwin) [ nsync ]; # We don't want to be quite so picky regarding bazel version postPatch = '' @@ -406,7 +406,7 @@ let TF_SYSTEM_LIBS = lib.concatStringsSep "," ( tf_system_libs - ++ lib.optionals (!effectiveStdenv.isDarwin) [ + ++ lib.optionals (!effectiveStdenv.hostPlatform.isDarwin) [ "nsync" # fails to build on darwin ] ); @@ -414,7 +414,7 @@ let # Note: we cannot do most of this patching at `patch` phase as the deps # are not available yet. Framework search paths aren't added by bintools # hook. See https://github.com/NixOS/nixpkgs/pull/41914. - preBuild = lib.optionalString effectiveStdenv.isDarwin '' + preBuild = lib.optionalString effectiveStdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -F${IOKit}/Library/Frameworks" substituteInPlace ../output/external/rules_cc/cc/private/toolchain/osx_cc_wrapper.sh.tpl \ --replace "/usr/bin/install_name_tool" "${cctools}/bin/install_name_tool" diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix index 8159533fc203..b617e21c1c27 100644 --- a/pkgs/development/python-modules/jaxopt/default.nix +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { # https://github.com/google/jaxopt/issues/592 "test_solve_sparse" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # https://github.com/google/jaxopt/issues/577 "test_binary_logit_log_likelihood" "test_solve_sparse" @@ -87,7 +87,7 @@ buildPythonPackage rec { # AssertionError: Array(0.01411963, dtype=float32) not less than or equal to 0.01 "test_multiclass_logreg6" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Fatal Python error: Aborted "test_dtype_consistency" diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index 553500c47be6..acc5dca6a825 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -2,29 +2,33 @@ lib, buildPythonPackage, fetchPypi, - six, + jalali-core, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "jdatetime"; version = "5.0.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; hash = "sha256-LMYD2RPA2OMokoRU09KVJhywN+mVAif2fJYpq0cQ/fk="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ jalali-core ]; pythonImportsCheck = [ "jdatetime" ]; meta = with lib; { description = "Jalali datetime binding"; homepage = "https://github.com/slashmili/python-jalali"; + changelog = "https://github.com/slashmili/python-jalali/blob/v${version}/CHANGELOG.md"; license = licenses.psfl; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix index 096c327ae986..235c6291275a 100644 --- a/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/pkgs/development/python-modules/jedi-language-server/default.nix @@ -1,37 +1,45 @@ { lib, + stdenv, buildPythonPackage, - docstring-to-markdown, fetchFromGitHub, + pythonOlder, + + # build-system + poetry-core, + + # dependencies + docstring-to-markdown, jedi, lsprotocol, - poetry-core, - pygls, pydantic, - pyhamcrest, + pygls, + + # tests pytestCheckHook, + pyhamcrest, python-lsp-jsonrpc, - pythonOlder, - stdenv, }: buildPythonPackage rec { pname = "jedi-language-server"; - version = "0.41.4"; - format = "pyproject"; + version = "0.42.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pappasam"; - repo = pname; + repo = "jedi-language-server"; rev = "refs/tags/v${version}"; - hash = "sha256-RDLwL9AZ3G8CzVwDtWqFFZNH/ulpHeFBhglbWNv/ZIk="; + hash = "sha256-KWkKIKiaRR26CctDFrHJAITM+nmRKGxLeC5HHwVZz4s="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ + poetry-core + ]; - propagatedBuildInputs = [ + dependencies = [ docstring-to-markdown jedi lsprotocol @@ -49,7 +57,7 @@ buildPythonPackage rec { HOME="$(mktemp -d)" ''; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/pappasam/jedi-language-server/issues/313 "test_publish_diagnostics_on_change" "test_publish_diagnostics_on_save" @@ -57,12 +65,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "jedi_language_server" ]; - meta = with lib; { + meta = { description = "Language Server for the latest version(s) of Jedi"; mainProgram = "jedi-language-server"; homepage = "https://github.com/pappasam/jedi-language-server"; - changelog = "https://github.com/pappasam/jedi-language-server/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ doronbehar ]; + changelog = "https://github.com/pappasam/jedi-language-server/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index ddc0caea5555..b88dc9311e91 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { # sensitive to platform, causes false negatives on darwin "test_import" ] - ++ lib.optionals (stdenv.isAarch64 && pythonOlder "3.9") [ + ++ lib.optionals (stdenv.hostPlatform.isAarch64 && pythonOlder "3.9") [ # AssertionError: assert 'foo' in ['setup'] "test_init_extension_module" ] diff --git a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix index 739a0937a4aa..9fb7c6ccbd3b 100644 --- a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix +++ b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix @@ -2,34 +2,39 @@ lib, buildPythonPackage, certifi, - fetchPypi, + fetchFromGitHub, pythonOlder, + setuptools, requests, urllib3, websocket-client, + pytestCheckHook, }: buildPythonPackage rec { pname = "jellyfin-apiclient-python"; - version = "1.9.2"; - format = "setuptools"; + version = "1.10.0"; + pyproject = true; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-vMzZeoiWli3HjM8Dqr5RhNfR7gcjPqoXG3b/aNNlx2Q="; + src = fetchFromGitHub { + owner = "jellyfin"; + repo = "jellyfin-apiclient-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-H1FqypNuVIZ17cFdNDEmmKICswxJkUGq2LhlingbCVk="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ certifi requests urllib3 websocket-client ]; - # Module has no test - doCheck = false; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "jellyfin_apiclient_python" ]; diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index 4210f5499d28..8517c239de44 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { cargoSetupHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 6e4cb647e865..a1ac389acdee 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "6.3.0"; + version = "6.4.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-RD9VQFlwLJ3TiReKty+q056CjsOnSD2J2bpASmqHIEM="; + hash = "sha256-Re7rNAcm0cpSx1tmSzTjfDlW7y236lzFKFjVw0uUTmw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index da220641dbe2..995f436a8242 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -35,15 +35,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ markupsafe ]; - passthru.optional-dependencies = { + optional-dependencies = { i18n = [ babel ]; }; # Multiple tests run out of stack space on 32bit systems with python2. # See https://github.com/pallets/jinja/issues/1158 - doCheck = !stdenv.is32bit; + doCheck = !stdenv.hostPlatform.is32bit; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.i18n; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.i18n; disabledTests = lib.optionals (pythonAtLeast "3.13") [ # https://github.com/pallets/jinja/issues/1900 diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 2e2ff91c8b0a..dae3210280e3 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ ipython keyring diff --git a/pkgs/development/python-modules/jiter/Cargo.lock b/pkgs/development/python-modules/jiter/Cargo.lock index d19633c580b9..c18b820841c1 100644 --- a/pkgs/development/python-modules/jiter/Cargo.lock +++ b/pkgs/development/python-modules/jiter/Cargo.lock @@ -23,9 +23,9 @@ checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "bencher" @@ -47,13 +47,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.104" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -64,9 +64,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "codspeed" -version = "2.6.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a104ac948e0188b921eb3fcbdd55dcf62e542df4c7ab7e660623f6288302089" +checksum = "450a0e9df9df1c154156f4344f99d8f6f6e69d0fc4de96ef6e2e68b2ec3bce97" dependencies = [ "colored", "libc", @@ -75,9 +75,9 @@ dependencies = [ [[package]] name = "codspeed-bencher-compat" -version = "2.6.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceaba84ea2634603a0f199c07fa39ff4dda61f89a3f9149fb89b035bc317b671" +checksum = "025afeee31b5b589484a884c7eb92bf80e0a5420bc4cb1f00d3a08c000211558" dependencies = [ "bencher", "codspeed", @@ -107,7 +107,7 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "fuzz" -version = "0.5.0" +version = "0.6.1" dependencies = [ "indexmap", "jiter", @@ -131,9 +131,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" [[package]] name = "heck" @@ -143,9 +143,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "indexmap" -version = "2.2.6" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", "hashbrown", @@ -165,7 +165,7 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jiter" -version = "0.5.0" +version = "0.6.1" dependencies = [ "ahash", "bencher", @@ -184,7 +184,7 @@ dependencies = [ [[package]] name = "jiter-python" -version = "0.5.0" +version = "0.6.1" dependencies = [ "jiter", "pyo3", @@ -192,9 +192,9 @@ dependencies = [ [[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", ] @@ -237,9 +237,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.155" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libfuzzer-sys" @@ -253,6 +253,12 @@ dependencies = [ ] [[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] name = "memoffset" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -291,9 +297,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "paste" @@ -303,24 +309,24 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.22.0" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1962a33ed2a201c637fc14a4e0fd4e06e6edfdeee6a5fede0dab55507ad74cf7" +checksum = "3d922163ba1f79c04bc49073ba7b32fd5a8d3b76a87c955921234b8e77333c51" dependencies = [ "cfg-if", "indoc", @@ -337,19 +343,20 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.22.0" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab7164b2202753bd33afc7f90a10355a719aa973d1f94502c50d06f3488bc420" +checksum = "bc38c5feeb496c8321091edf3d63e9a6829eab4b863b4a6a65f26f3e9cc6b179" dependencies = [ "once_cell", + "python3-dll-a", "target-lexicon", ] [[package]] name = "pyo3-ffi" -version = "0.22.0" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6424906ca49013c0829c5c1ed405e20e2da2dc78b82d198564880a704e6a7b7" +checksum = "94845622d88ae274d2729fcefc850e63d7a3ddff5e3ce11bd88486db9f1d357d" dependencies = [ "libc", "pyo3-build-config", @@ -357,9 +364,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.22.0" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2f19e153122d64afd8ce7aaa72f06a00f52e34e1d1e74b6d71baea396460a" +checksum = "e655aad15e09b94ffdb3ce3d217acf652e26bbc37697ef012f5e5e348c716e5e" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -369,9 +376,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.22.0" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd698c04cac17cf0fe63d47790ab311b8b25542f5cb976b65c374035c50f1eef" +checksum = "ae1e3f09eecd94618f60a455a23def79f79eba4dc561a97324bf9ac8c6df30ce" dependencies = [ "heck", "proc-macro2", @@ -381,10 +388,19 @@ dependencies = [ ] [[package]] +name = "python3-dll-a" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0b78171a90d808b319acfad166c4790d9e9759bbc14ac8273fe133673dd41b" +dependencies = [ + "cc", +] + +[[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -403,18 +419,18 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ "proc-macro2", "quote", @@ -423,17 +439,24 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "indexmap", "itoa", + "memchr", "ryu", "serde", ] [[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -447,9 +470,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "syn" -version = "2.0.68" +version = "2.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" dependencies = [ "proc-macro2", "quote", @@ -464,15 +487,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[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 = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unindent" @@ -482,9 +505,9 @@ checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" [[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" diff --git a/pkgs/development/python-modules/jiter/default.nix b/pkgs/development/python-modules/jiter/default.nix index 4f23966dcc16..5aed4511b50c 100644 --- a/pkgs/development/python-modules/jiter/default.nix +++ b/pkgs/development/python-modules/jiter/default.nix @@ -6,18 +6,19 @@ libiconv, dirty-equals, pytestCheckHook, + nix-update-script, }: buildPythonPackage rec { pname = "jiter"; - version = "0.5.0"; + version = "0.6.1"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "jiter"; rev = "refs/tags/v${version}"; - hash = "sha256-EgovddXbwutLaVkosdbJ2Y3BpEms+RoeaO8ghBRNdio="; + hash = "sha256-XYOdy7jduPak8XBL2hdAQfBxrmPq/nyzNlA4RygCtK0="; }; postPatch = '' @@ -41,6 +42,8 @@ buildPythonPackage rec { pytestCheckHook ]; + passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; }; + meta = { description = "Fast iterable JSON parser"; homepage = "https://github.com/pydantic/jiter/"; diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 65b728b34e9a..0cd4182d4241 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { "test_parallel_call_cached_function_defined_in_jupyter" # jupyter not available during tests "test_nested_parallel_warnings" # tests is flaky under load ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_dispatch_multiprocessing" # test_dispatch_multiprocessing is broken only on Darwin. ] ++ lib.optionals (pythonAtLeast "3.12") [ diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix index 19d02b118987..1704fc6b9a61 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -1,41 +1,45 @@ { lib, stdenv, - fetchFromGitHub, buildPythonPackage, - rustPlatform, - pkg-config, - pcsclite, - nettle, + fetchFromGitHub, httpx, + libiconv, + nettle, + PCSC, + pcsclite, + pkg-config, pytestCheckHook, pythonOlder, + rustPlatform, vcrpy, - PCSC, - libiconv, }: buildPythonPackage rec { pname = "johnnycanencrypt"; - version = "0.14.1"; + version = "0.15.0"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "kushaldas"; repo = "johnnycanencrypt"; - rev = "v${version}"; - hash = "sha256-13zIC+zH/BebMplUfdtiwEEVODS+jTURC1vudbmQPlA="; + rev = "refs/tags/v${version}"; + hash = "sha256-tbHW3x+vwFz0nqFGWvgxjhw8XH6/YKz1uagU339SZyk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-u3qKli76XGS0Ijg15BQzbFlfLPpBPFKh++EZLfnO9ps="; + hash = "sha256-vDlMdzZgmaRkviEk8IjIN+Q5x95gnpQiW5c8fT+dats="; }; - format = "pyproject"; - - propagatedBuildInputs = [ httpx ]; + build-system = with rustPlatform; [ + bindgenHook + cargoSetupHook + maturinBuildHook + ]; nativeBuildInputs = [ pkg-config ] @@ -47,12 +51,14 @@ buildPythonPackage rec { buildInputs = [ nettle ] - ++ lib.optionals stdenv.isLinux [ pcsclite ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ PCSC libiconv ]; + dependencies = [ httpx ]; + nativeCheckInputs = [ pytestCheckHook vcrpy @@ -66,9 +72,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "johnnycanencrypt" ]; meta = with lib; { + description = "Python module for OpenPGP written in Rust"; homepage = "https://github.com/kushaldas/johnnycanencrypt"; changelog = "https://github.com/kushaldas/johnnycanencrypt/blob/v${version}/changelog.md"; - description = "Python module for OpenPGP written in Rust"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ _0x4A6F ]; }; diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index 955bc33cc223..b1aa721e1305 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, cryptography, fetchPypi, + fetchpatch, poetry-core, pyopenssl, pytestCheckHook, @@ -21,6 +22,15 @@ buildPythonPackage rec { hash = "sha256-MIs7+c6CWtTUu6djcs8ZtdwcLOlqnSmPlkKXXmS9E90="; }; + patches = [ + # don't fail tests on openssl deprecation warning, upstream is working on proper fix + # FIXME: remove for next update + (fetchpatch { + url = "https://github.com/certbot/josepy/commit/350410fc1d38c4ac8422816b6865ac8cd9c60fc7.diff"; + hash = "sha256-QGbzonXb5BtTTWDeDqnZhbS6gHce99vIOm/H8QYeGXY="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/js2py/default.nix b/pkgs/development/python-modules/js2py/default.nix deleted file mode 100644 index fd28870e0e76..000000000000 --- a/pkgs/development/python-modules/js2py/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - fetchPypi, - buildPythonPackage, - pythonAtLeast, - setuptools, - tzlocal, - six, - pyjsparser, -}: - -buildPythonPackage rec { - pname = "js2py"; - version = "0.74"; - pyproject = true; - - # broken with Python 3.12 - # https://github.com/PiotrDabkowski/Js2Py/issues/317 - disabled = pythonAtLeast "3.12"; - - src = fetchPypi { - pname = "Js2Py"; - inherit version; - hash = "sha256-OfOmqoRpGA77o8hncnHfJ8MTMv0bRx3xryr1i4e4ly8="; - }; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ - pyjsparser - six - tzlocal - ]; - - # Test require network connection - doCheck = false; - - pythonImportsCheck = [ "js2py" ]; - - meta = with lib; { - description = "JavaScript to Python Translator & JavaScript interpreter written in 100% pure Python"; - homepage = "https://github.com/PiotrDabkowski/Js2Py"; - license = licenses.mit; - maintainers = with maintainers; [ onny ]; - }; -} diff --git a/pkgs/development/python-modules/json-repair/default.nix b/pkgs/development/python-modules/json-repair/default.nix index 1a7ef06797b9..a99b356ad5e1 100644 --- a/pkgs/development/python-modules/json-repair/default.nix +++ b/pkgs/development/python-modules/json-repair/default.nix @@ -8,21 +8,24 @@ buildPythonPackage rec { pname = "json-repair"; - version = "0.27.2"; + version = "0.29.6"; pyproject = true; src = fetchFromGitHub { owner = "mangiucugna"; repo = "json_repair"; - rev = "refs/tags/${version}"; - hash = "sha256-NYY76sIp4XirVifOPOs6iEzP93ERzNIHAvpgU4+fi24="; + rev = "refs/tags/v${version}"; + hash = "sha256-EP8uaH9vbpbgWtQTm+c2mbO2h1t6aK1ENpVw/Dkx2/U="; }; build-system = [ setuptools ]; nativeBuildInputs = [ pytestCheckHook ]; - disabledTestPaths = [ "tests/test_performance.py" ]; + disabledTestPaths = [ + "tests/test_performance.py" + "tests/test_coverage.py" + ]; pythonImportsCheck = [ "json_repair" ]; diff --git a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix index 9a65903e384d..86473e609bfe 100644 --- a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix +++ b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { wheel ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # Tests depend on json-stream, which depends on this package. # To avoid infinite recursion, we only enable tests when building passthru.tests. diff --git a/pkgs/development/python-modules/json-stream/default.nix b/pkgs/development/python-modules/json-stream/default.nix index 26b7ef5f8ea2..fd5f61399f18 100644 --- a/pkgs/development/python-modules/json-stream/default.nix +++ b/pkgs/development/python-modules/json-stream/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - buildInputs = lib.optionals stdenv.isDarwin [ iconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ iconv ]; propagatedBuildInputs = [ requests diff --git a/pkgs/development/python-modules/json5/default.nix b/pkgs/development/python-modules/json5/default.nix index fd8fb22ac0ea..b5ac94fb0009 100644 --- a/pkgs/development/python-modules/json5/default.nix +++ b/pkgs/development/python-modules/json5/default.nix @@ -1,31 +1,37 @@ { + lib, buildPythonPackage, fetchFromGitHub, - lib, pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "json5"; - version = "0.9.14"; - format = "setuptools"; + version = "0.9.25"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dpranke"; repo = "pyjson5"; - rev = "v${version}"; - hash = "sha256-cshP1kraLENqWuQTlm4HPAP/0ywRRLFOJI8mteWcjR4="; + rev = "refs/tags/v${version}"; + hash = "sha256-2JAZHayPyi2RI4apODQ9QDXSUI8n54SwQAxZiBhuJrE="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "json5" ]; meta = with lib; { - homepage = "https://github.com/dpranke/pyjson5"; description = "Python implementation of the JSON5 data format"; - mainProgram = "pyjson5"; + homepage = "https://github.com/dpranke/pyjson5"; license = licenses.asl20; maintainers = with maintainers; [ veehaitch ]; + mainProgram = "pyjson5"; }; } diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix index f1c26abd3767..87f735079ce2 100644 --- a/pkgs/development/python-modules/jsonargparse/default.nix +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "jsonargparse"; - version = "4.32.1"; + version = "4.33.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -32,14 +32,14 @@ buildPythonPackage rec { owner = "omni-us"; repo = "jsonargparse"; rev = "refs/tags/v${version}"; - hash = "sha256-DardzvEiydlsaOY60p2fNR6cGGvombSSUXCxHHFT7b0="; + hash = "sha256-yY/j4UwAoe/qQjBQXgFSrv2BX7DB5EyGCdVYoioyKr8="; }; build-system = [ setuptools ]; dependencies = [ pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ argcomplete fsspec diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix index 5b5f67ce5264..2ddfd381f64d 100644 --- a/pkgs/development/python-modules/jsondiff/default.nix +++ b/pkgs/development/python-modules/jsondiff/default.nix @@ -1,25 +1,43 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + + # dependencies + pyyaml, + + # tests + hypothesis, + pytestCheckHook, }: buildPythonPackage rec { pname = "jsondiff"; - version = "2.0.0"; - format = "setuptools"; + version = "2.2.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-J5WETvB17IorjThcTVn16kiwjnGA/OPLJ4e+DbALH7Q="; + src = fetchFromGitHub { + owner = "xlwings"; + repo = "jsondiff"; + rev = "refs/tags/${version}"; + hash = "sha256-0EnI7f5t7Ftl/8UcsRdA4iVQ78mxvPucCJjFJ8TMwww="; }; - postPatch = '' - sed -e "/'jsondiff=jsondiff.cli:main_deprecated',/d" -i setup.py - ''; + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ pyyaml ]; - # No tests - doCheck = false; + nativeCheckInputs = [ + hypothesis + pytestCheckHook + ]; meta = { description = "Diff JSON and JSON-like structures in Python"; diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index dfb40be4bb61..c64949de233c 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "3.2.1"; + version = "3.3.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-S212QJdBmfes+QNSlTZbWhpxqREJ7/oVuhcPu0jPhxw="; + hash = "sha256-q0Z+YB5bGhzXbxgZ0BR5UWXaBxdE7zC/N4bpvFSd4lo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index b0db522f61e9..1cbae4a0b4ef 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -29,27 +29,27 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "4.22.0"; - format = "pyproject"; + version = "4.23.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-WyLUNKRZNRGa+ZBVLIYuXW1WTo9mASBrMFph/fZhorc="; + hash = "sha256-1xSX/vJjUaMyZTN/p3/+uCQj8+ohKDzZRnuwOZkma8Q="; }; postPatch = '' patchShebangs json/bin/jsonschema_suite ''; - nativeBuildInputs = [ + build-system = [ hatch-fancy-pypi-readme hatch-vcs hatchling ]; - propagatedBuildInputs = + dependencies = [ attrs jsonschema-specifications @@ -61,7 +61,7 @@ buildPythonPackage rec { pkgutil-resolve-name ]; - passthru.optional-dependencies = { + optional-dependencies = { format = [ fqdn idna @@ -93,9 +93,10 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of JSON Schema validation"; - mainProgram = "jsonschema"; homepage = "https://github.com/python-jsonschema/jsonschema"; + changelog = "https://github.com/python-jsonschema/jsonschema/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; + mainProgram = "jsonschema"; }; } diff --git a/pkgs/development/python-modules/jsonstreams/default.nix b/pkgs/development/python-modules/jsonstreams/default.nix index 58c3513e1ee0..49ffcee24b82 100644 --- a/pkgs/development/python-modules/jsonstreams/default.nix +++ b/pkgs/development/python-modules/jsonstreams/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests --doctest-modules jsonstreams" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "JSON streaming writer"; homepage = "https://github.com/dcbaker/jsonstreams"; license = licenses.mit; diff --git a/pkgs/development/python-modules/jupysql-plugin/default.nix b/pkgs/development/python-modules/jupysql-plugin/default.nix index 40ddfaab803f..4ca16978ac1b 100644 --- a/pkgs/development/python-modules/jupysql-plugin/default.nix +++ b/pkgs/development/python-modules/jupysql-plugin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "jupysql-plugin"; - version = "0.4.4"; + version = "0.4.5"; pyproject = true; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupysql_plugin"; inherit version; - hash = "sha256-kuaKknbc00nLGwCUsULgUFT52yoptUH2mnUyGYbYYKk="; + hash = "sha256-cIXheImO4BL00zn101ZDIzKl2qkIDsTNswZOCs54lNY="; }; build-system = [ diff --git a/pkgs/development/python-modules/jupysql/default.nix b/pkgs/development/python-modules/jupysql/default.nix index ec9f51237679..01fa1c0f3163 100644 --- a/pkgs/development/python-modules/jupysql/default.nix +++ b/pkgs/development/python-modules/jupysql/default.nix @@ -22,7 +22,6 @@ grpcio, ipython, ipywidgets, - js2py, matplotlib, numpy, pandas, @@ -69,7 +68,6 @@ buildPythonPackage rec { grpcio ipython ipywidgets - js2py matplotlib numpy pandas @@ -86,6 +84,21 @@ buildPythonPackage rec { disabledTests = [ # AttributeError: 'DataFrame' object has no attribute 'frame_equal' "test_resultset_polars_dataframe" + # all of these are broken with later versions of duckdb; see + # https://github.com/ploomber/jupysql/issues/1030 + "test_resultset_getitem" + "test_resultset_dict" + "test_resultset_len" + "test_resultset_dicts" + "test_resultset_dataframe" + "test_resultset_csv" + "test_resultset_str" + "test_resultset_repr_html_when_feedback_is_2" + "test_resultset_repr_html_with_reduced_feedback" + "test_invalid_operation_error" + "test_resultset_config_autolimit_dict" + # fails due to strict warnings + "test_calling_legacy_plotting_functions_displays_warning" ]; disabledTestPaths = [ @@ -101,6 +114,9 @@ buildPythonPackage rec { "src/tests/test_plot.py" "src/tests/test_magic.py" "src/tests/test_magic_plot.py" + + # require js2py (which is unmaintained and insecure) + "src/tests/test_widget.py" ]; preCheck = '' diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index 47e36e157eb1..c787e16c5cdf 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -3,7 +3,11 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + + # build-system flit-core, + + # dependencies click, jinja2, jsonschema, @@ -22,17 +26,19 @@ sphinx-togglebutton, sphinxcontrib-bibtex, sphinx-multitoc-numbering, - pytestCheckHook, - texsoup, + + # tests jupytext, pytest-regressions, pytest-xdist, + pytestCheckHook, sphinx-inline-tabs, + texsoup, }: buildPythonPackage rec { pname = "jupyter-book"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -41,7 +47,7 @@ buildPythonPackage rec { owner = "jupyter-book"; repo = "jupyter-book"; rev = "refs/tags/v${version}"; - hash = "sha256-NlCMfkfvquonqf7FdaJ7AC9ebM7VSifn+zM7gWh32LQ="; + hash = "sha256-MBSf2/+4+efWHJ530jdezeh5OLTtUZlAEOl5SqoWOuE="; }; build-system = [ flit-core ]; @@ -108,12 +114,14 @@ buildPythonPackage rec { "tests/test_pdf.py" ]; - meta = with lib; { + __darwinAllowLocalNetworking = true; + + meta = { description = "Build a book with Jupyter Notebooks and Sphinx"; homepage = "https://jupyterbook.org/"; changelog = "https://github.com/jupyter-book/jupyter-book/blob/${src.rev}/CHANGELOG.md"; - license = licenses.bsd3; - maintainers = teams.jupyter.members; + license = lib.licenses.bsd3; + maintainers = lib.teams.jupyter.members; mainProgram = "jupyter-book"; }; } diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix index 82778299c799..e05209dd80d5 100644 --- a/pkgs/development/python-modules/jupyter-client/default.nix +++ b/pkgs/development/python-modules/jupyter-client/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "jupyter-client"; - version = "8.6.2"; + version = "8.6.3"; pyproject = true; src = fetchPypi { pname = "jupyter_client"; inherit version; - hash = "sha256-K9oU1V7lulhVKoxTrkPSFa2YaIU0iSE/N9oGDO1U2N8="; + hash = "sha256-NbOglHxKbp1Ynrl9fUzV6Q+RDucxAWEfASg3Mr1tlBk="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix b/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix new file mode 100644 index 000000000000..2e571e222c25 --- /dev/null +++ b/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + hatch-jupyter-builder, + jupyter-collaboration, +}: + +buildPythonPackage rec { + pname = "jupyter-collaboration-ui"; + version = "1.0.0"; + pyproject = true; + + src = fetchPypi { + pname = "jupyter_collaboration_ui"; + inherit version; + hash = "sha256-hTyUmLzRvexNTZxTv4Mbflm+OTW9j0HReLpAJuk/WnY="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail ', "jupyterlab>=4.0.0"' "" + ''; + + build-system = [ + hatchling + hatch-jupyter-builder + ]; + + pythonImportsCheck = [ "jupyter_collaboration_ui" ]; + + # no tests + doCheck = false; + + passthru.tests = jupyter-collaboration.tests; + + meta = { + description = "JupyterLab/Jupyter Notebook 7+ extension providing user interface integration for real time collaboration"; + homepage = "https://github.com/jupyterlab/jupyter-collaboration/tree/main/projects/jupyter-collaboration-ui"; + license = lib.licenses.bsd3; + maintainers = lib.teams.jupyter.members; + }; +} diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix index 4e4bfd7b456c..4f6e29fee66d 100644 --- a/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -1,84 +1,51 @@ { lib, buildPythonPackage, - pythonOlder, fetchPypi, - hatch-jupyter-builder, - hatch-nodejs-version, + + # build-system hatchling, - jsonschema, - jupyter-events, - jupyter-server, - jupyter-server-fileid, - jupyter-ydoc, - jupyterlab, - pycrdt-websocket, - pytest-jupyter, - pytestCheckHook, - websockets, + + # dependencies + jupyter-collaboration-ui, + jupyter-docprovider, + jupyter-server-ydoc, + + # tests + callPackage, }: buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "2.1.2"; + version = "3.0.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { pname = "jupyter_collaboration"; inherit version; - hash = "sha256-uLbNYzszaSLnU4VcaDr5KBcRN+Xm/B471s+W9qJibsk="; + hash = "sha256-eewAsh/EI8DV4FNWgjEhT61RUbaYE6suOAny4bf1CCw="; }; - postPatch = '' - sed -i "/^timeout/d" pyproject.toml - ''; - - build-system = [ - hatch-jupyter-builder - hatch-nodejs-version - hatchling - jupyterlab - ]; + build-system = [ hatchling ]; dependencies = [ - jsonschema - jupyter-events - jupyter-server - jupyter-server-fileid - jupyter-ydoc - pycrdt-websocket - ]; - - nativeCheckInputs = [ - pytest-jupyter - pytestCheckHook - websockets + jupyter-collaboration-ui + jupyter-docprovider + jupyter-server-ydoc ]; pythonImportsCheck = [ "jupyter_collaboration" ]; - preCheck = '' - export HOME=$TEMP - ''; - - pytestFlagsArray = [ "-Wignore::DeprecationWarning" ]; - - disabledTests = [ - # ExceptionGroup: unhandled errors in a TaskGroup (1 sub-exception) - "test_dirty" - # causes a hang - "test_rooms" - ]; + # no tests + doCheck = false; - __darwinAllowLocalNetworking = true; + passthru.tests = callPackage ./test.nix { }; - meta = with lib; { + meta = { description = "JupyterLab Extension enabling Real-Time Collaboration"; homepage = "https://github.com/jupyterlab/jupyter_collaboration"; changelog = "https://github.com/jupyterlab/jupyter_collaboration/blob/v${version}/CHANGELOG.md"; - license = licenses.bsd3; - maintainers = teams.jupyter.members; + license = lib.licenses.bsd3; + maintainers = lib.teams.jupyter.members; }; } diff --git a/pkgs/development/python-modules/jupyter-collaboration/test.nix b/pkgs/development/python-modules/jupyter-collaboration/test.nix new file mode 100644 index 000000000000..044b923a723d --- /dev/null +++ b/pkgs/development/python-modules/jupyter-collaboration/test.nix @@ -0,0 +1,39 @@ +{ + stdenvNoCC, + fetchFromGitHub, + jupyter-collaboration, + pytest-jupyter, + pytestCheckHook, + websockets, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "jupyter-collaboration-test"; + inherit (jupyter-collaboration) version; + + src = fetchFromGitHub { + owner = "jupyterlab"; + repo = "jupyter-collaboration"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-6hDYB1uC0WraB37s9EKLJF7jyFu0B3xLocuLYyKj4hs="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "timeout = 300" "" + ''; + + installPhase = '' + touch $out + ''; + + env.HOME = "$TMPDIR"; + + doCheck = true; + + nativeCheckInputs = [ + jupyter-collaboration + pytest-jupyter + pytestCheckHook + websockets + ]; +}) diff --git a/pkgs/development/python-modules/jupyter-console/default.nix b/pkgs/development/python-modules/jupyter-console/default.nix index 5ae844ad91ed..e699d4d25187 100644 --- a/pkgs/development/python-modules/jupyter-console/default.nix +++ b/pkgs/development/python-modules/jupyter-console/default.nix @@ -1,11 +1,13 @@ { lib, buildPythonPackage, - fetchPypi, - pythonOlder, + fetchFromGitHub, + + # build-system hatchling, + + # dependencies ipykernel, - exceptiongroup, ipython, jupyter-client, jupyter-core, @@ -13,6 +15,8 @@ pygments, pyzmq, traitlets, + + # tests flaky, pexpect, pytestCheckHook, @@ -21,27 +25,29 @@ buildPythonPackage rec { pname = "jupyter-console"; version = "6.6.3"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "jupyter_console"; - inherit version; - hash = "sha256-VmpL8xyHrb+t8izfhG4wabWace1dpx1rpNiqrRSlNTk="; + src = fetchFromGitHub { + owner = "jupyter"; + repo = "jupyter_console"; + rev = "refs/tags/v${version}"; + hash = "sha256-jdSeZCspcjEQVBpJyxVnwJ5SAq+SS1bW9kqp/F/zwCQ="; }; - nativeBuildInputs = [ hatchling ]; + postPatch = + # Use wrapped executable in tests + let + binPath = "${placeholder "out"}/bin/jupyter-console"; + in + '' + substituteInPlace jupyter_console/tests/test_console.py \ + --replace-fail "'-m', 'jupyter_console', " "" \ + --replace-fail "sys.executable" "'${binPath}'" + ''; - postPatch = '' - # use wrapped executable in tests - substituteInPlace jupyter_console/tests/test_console.py \ - --replace "args = ['-m', 'jupyter_console', '--colors=NoColor']" "args = ['--colors=NoColor']" \ - --replace "cmd = sys.executable" "cmd = '${placeholder "out"}/bin/jupyter-console'" \ - --replace "check_output([sys.executable, '-m', 'jupyter_console'," "check_output(['${placeholder "out"}/bin/jupyter-console'," - ''; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ ipykernel ipython jupyter-client @@ -50,7 +56,7 @@ buildPythonPackage rec { pygments pyzmq traitlets - ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; + ]; pythonImportsCheck = [ "jupyter_console" ]; @@ -64,6 +70,14 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; + disabledTests = [ + # Flaky: pexpect.exceptions.TIMEOUT: Timeout exceeded + "test_console_starts" + "test_display_text" + ]; + + __darwinAllowLocalNetworking = true; + meta = { description = "Jupyter terminal console"; mainProgram = "jupyter-console"; diff --git a/pkgs/development/python-modules/jupyter-docprovider/default.nix b/pkgs/development/python-modules/jupyter-docprovider/default.nix new file mode 100644 index 000000000000..d32dc1b31140 --- /dev/null +++ b/pkgs/development/python-modules/jupyter-docprovider/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + hatch-jupyter-builder, + jupyter-collaboration, +}: + +buildPythonPackage rec { + pname = "jupyter-docprovider"; + version = "1.0.0"; + pyproject = true; + + src = fetchPypi { + pname = "jupyter_docprovider"; + inherit version; + hash = "sha256-EcO3GqdbhRxawHwfSnjOHfFmYjpZy2NuuGc5CSW/xlY="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail ', "jupyterlab>=4.0.0"' "" + ''; + + build-system = [ + hatchling + hatch-jupyter-builder + ]; + + pythonImportsCheck = [ "jupyter_docprovider" ]; + + # no tests + doCheck = false; + + passthru.tests = jupyter-collaboration.tests; + + meta = { + description = "JupyterLab/Jupyter Notebook 7+ extension integrating collaborative shared models"; + homepage = "https://github.com/jupyterlab/jupyter-collaboration/tree/main/projects/jupyter-docprovider"; + license = lib.licenses.bsd3; + maintainers = lib.teams.jupyter.members; + }; +} diff --git a/pkgs/development/python-modules/jupyter-events/default.nix b/pkgs/development/python-modules/jupyter-events/default.nix index 66de5a91ff5f..6a5431fd1abf 100644 --- a/pkgs/development/python-modules/jupyter-events/default.nix +++ b/pkgs/development/python-modules/jupyter-events/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { traitlets ] ++ jsonschema.optional-dependencies.format-nongpl; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click rich @@ -59,7 +59,7 @@ buildPythonPackage rec { pytest-asyncio pytest-console-scripts pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export PATH="$out/bin:$PATH" diff --git a/pkgs/development/python-modules/jupyter-packaging/default.nix b/pkgs/development/python-modules/jupyter-packaging/default.nix index b4220824ae93..622e923d1c27 100644 --- a/pkgs/development/python-modules/jupyter-packaging/default.nix +++ b/pkgs/development/python-modules/jupyter-packaging/default.nix @@ -47,6 +47,8 @@ buildPythonPackage rec { pytest-timeout ]; + pytestFlagsArray = [ "-Wignore::DeprecationWarning" ]; + preCheck = '' export HOME=$(mktemp -d) ''; diff --git a/pkgs/development/python-modules/jupyter-server-ydoc/default.nix b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix new file mode 100644 index 000000000000..1e988383621b --- /dev/null +++ b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + jsonschema, + jupyter-events, + jupyter-server, + jupyter-server-fileid, + jupyter-ydoc, + pycrdt, + pycrdt-websocket, + jupyter-collaboration, +}: + +buildPythonPackage rec { + pname = "jupyter-server-ydoc"; + version = "1.0.0"; + pyproject = true; + + src = fetchPypi { + pname = "jupyter_server_ydoc"; + inherit version; + hash = "sha256-MBdSTB2gaIFbdIyPHr5+wI7aBH/Fl85ywSWxgAmjkek="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + jsonschema + jupyter-events + jupyter-server + jupyter-server-fileid + jupyter-ydoc + pycrdt + pycrdt-websocket + ]; + + pythonImportsCheck = [ "jupyter_server_ydoc" ]; + + # no tests + doCheck = false; + + passthru.tests = jupyter-collaboration.tests; + + meta = { + description = "Jupyter-server extension integrating collaborative shared models"; + homepage = "https://github.com/jupyterlab/jupyter-collaboration/tree/main/projects/jupyter-server-ydoc"; + license = lib.licenses.bsd3; + maintainers = lib.teams.jupyter.members; + }; +} diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index a367bc3c0f35..071b3707225b 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { ]; # https://github.com/NixOS/nixpkgs/issues/299427 - stripExclude = lib.optionals stdenv.isDarwin [ "favicon.ico" ]; + stripExclude = lib.optionals stdenv.hostPlatform.isDarwin [ "favicon.ico" ]; nativeCheckInputs = [ ipykernel @@ -102,13 +102,13 @@ buildPythonPackage rec { # test is presumable broken in sandbox "test_authorized_requests" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # attempts to use trashcan, build env doesn't allow this "test_delete" # Insufficient access privileges for operation "test_regression_is_hidden" ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ # Failed: DID NOT RAISE <class 'tornado.web.HTTPError'> "test_copy_big_dir" ]; diff --git a/pkgs/development/python-modules/jupyter-sphinx/default.nix b/pkgs/development/python-modules/jupyter-sphinx/default.nix index cc5769b7c759..89fc4fe88bf5 100644 --- a/pkgs/development/python-modules/jupyter-sphinx/default.nix +++ b/pkgs/development/python-modules/jupyter-sphinx/default.nix @@ -44,6 +44,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ + # https://github.com/jupyter/jupyter-sphinx/issues/280" + "test_builder_priority" + ]; + preCheck = '' export HOME=$TMPDIR ''; diff --git a/pkgs/development/python-modules/jupyter-ydoc/default.nix b/pkgs/development/python-modules/jupyter-ydoc/default.nix index 41ba6312e405..5fa69f424fbd 100644 --- a/pkgs/development/python-modules/jupyter-ydoc/default.nix +++ b/pkgs/development/python-modules/jupyter-ydoc/default.nix @@ -2,35 +2,37 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, + + # build-system hatch-nodejs-version, hatchling, - importlib-metadata, + + # dependencies pycrdt, pytestCheckHook, + + # tests websockets, ypy-websocket, }: buildPythonPackage rec { pname = "jupyter-ydoc"; - version = "2.1.1"; + version = "3.0.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "jupyter_ydoc"; inherit version; - hash = "sha256-HcvxOGGzZ4AA1pr07zi0njoS+AgbqFHGgDk8Lhi8S4Q="; + hash = "sha256-nPOU7nxpVSh+6tERJq2DYIOpyjze8uJyIdxN/gW7arE="; }; - nativeBuildInputs = [ + build-system = [ hatch-nodejs-version hatchling ]; - propagatedBuildInputs = [ pycrdt ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; + dependencies = [ pycrdt ]; pythonImportsCheck = [ "jupyter_ydoc" ]; diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix index c4da40729c0f..79c5c99ff99e 100644 --- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix +++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -1,32 +1,52 @@ { lib, buildPythonPackage, + fetchFromGitHub, + setuptools, jupyterhub, ldap3, - fetchPypi, + traitlets, + pytestCheckHook, + pytest-asyncio, }: buildPythonPackage rec { pname = "jupyterhub-ldapauthenticator"; - version = "1.3.2"; - format = "setuptools"; + version = "2.0.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "758081bbdb28b26313bb18c9d8aa2b8fcdc9162e4d3ab196c626567e64f1ab8b"; + src = fetchFromGitHub { + owner = "jupyterhub"; + repo = "ldapauthenticator"; + rev = "refs/tags/${version}"; + hash = "sha256-pb1d0dqu3VGCsuibpYgncbqCM9fz09yyoKGcKb14f4k="; }; - # No tests implemented - doCheck = false; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ jupyterhub ldap3 + traitlets + ]; + + pythonImportsCheck = [ "ldapauthenticator" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = [ + # touch the socket + "test_allow_config" + "test_ldap_auth" ]; meta = with lib; { description = "Simple LDAP Authenticator Plugin for JupyterHub"; homepage = "https://github.com/jupyterhub/ldapauthenticator"; + changelog = "https://github.com/jupyterhub/ldapauthenticator/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix index c40866fd3d82..ebcbfb71d7c5 100644 --- a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix +++ b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "jupyterhub-systemdspawner"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jupyterhub"; repo = "systemdspawner"; rev = "refs/tags/v${version}"; - hash = "sha256-2Pxswa472umovHBUVTIX1l+Glj6bzzgBLsu+p4IA6jA="; + hash = "sha256-obM8HGCHsisRV1+kHMWdA7d6eb6awwPMBuDUAf3k0uI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 38a2fc97a662..5fb9cc969b59 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pname = "jupyterhub"; - version = "5.1.0"; + version = "5.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -51,12 +51,12 @@ buildPythonPackage rec { owner = "jupyterhub"; repo = "jupyterhub"; rev = "refs/tags/${version}"; - hash = "sha256-3L83FLhLCdTgOuFRgRMbz316cYbai0Z+hJwxXUCYB2Y="; + hash = "sha256-zOWcXpByJRzI9sTjTl+w/vo99suKOEN0TvPn1ZWlNmc="; }; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-b7j6iGYXrwco4YruqRPEEi4yWRF6otTUD2jKCEPcLTE="; + hash = "sha256-My7WUAqIvOrbbVTxSnA6a5NviM6u95+iyykx1xbudpw="; }; postPatch = '' @@ -171,6 +171,6 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = teams.jupyter.members; # darwin: E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index c539c052d4b5..1ab347130ae1 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "jupyterlab-git"; - version = "0.50.1"; + version = "0.50.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyterlab_git"; inherit version; - hash = "sha256-v08Go/vCsquE6l1SMmqg4LjM9OmjNX+jGKEZVg4cak0="; + hash = "sha256-zu/chWMsr0maBItDRFnQO15iFmWAHp23GXvUhvXTNDM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 4708b5363141..df0fc676633f 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/external" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # requires access to trash "test_load_save_rename" ]; diff --git a/pkgs/development/python-modules/jwt/default.nix b/pkgs/development/python-modules/jwt/default.nix index fc058f7d7004..2da80c7e183c 100644 --- a/pkgs/development/python-modules/jwt/default.nix +++ b/pkgs/development/python-modules/jwt/default.nix @@ -6,7 +6,7 @@ cryptography, freezegun, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook freezegun - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "jwt" ]; diff --git a/pkgs/development/python-modules/kafka-python-ng/default.nix b/pkgs/development/python-modules/kafka-python-ng/default.nix index 4e3997d5ed1f..79d253cacc8e 100644 --- a/pkgs/development/python-modules/kafka-python-ng/default.nix +++ b/pkgs/development/python-modules/kafka-python-ng/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { crc32c = [ crc32c ]; lz4 = [ lz4 ]; snappy = [ python-snappy ]; @@ -44,7 +44,7 @@ buildPythonPackage rec { pytest-mock pytestCheckHook xxhash - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = { changelog = "https://github.com/wbarnha/kafka-python-ng/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/kaleido/default.nix b/pkgs/development/python-modules/kaleido/default.nix index 9e9fff6af84d..ef889a0aa715 100644 --- a/pkgs/development/python-modules/kaleido/default.nix +++ b/pkgs/development/python-modules/kaleido/default.nix @@ -97,7 +97,7 @@ buildPythonPackage rec { #ln -s ${lato}/share/fonts/lato/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato/ ''; - passthru.tests = lib.optionalAttrs (!stdenv.isDarwin) { + passthru.tests = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { kaleido = callPackage ./tests.nix { }; }; diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix index 5dbd5f77fbbc..8d78b4fab0ef 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "karton-core"; - version = "5.5.0"; + version = "5.5.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = "karton"; rev = "refs/tags/v${version}"; - hash = "sha256-fjzZPq98AwNT+tiTvKZY2QsSD+FRUFx+oY84hPP7QdI="; + hash = "sha256-KaEXBNGcJN88gIv7suKcr1pK4ih/QbByxEy3nZFlIgk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/keep/default.nix b/pkgs/development/python-modules/keep/default.nix index f4e0ab5f1250..6023df467420 100644 --- a/pkgs/development/python-modules/keep/default.nix +++ b/pkgs/development/python-modules/keep/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "keep"; - version = "2.10.1"; + version = "2.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "3abbe445347711cecd9cbb80dab4a0777418972fc14a14e9387d0d2ae4b6adb7"; + sha256 = "sha256-Brwvu/Zevr8sOE3KAwakDDzVMc2VoFxIb1orXAes2U0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index ac5d47623a8a..bb5a0bdc2ed4 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -19,21 +18,18 @@ packaging, rich, tensorflow, - tf-keras, }: buildPythonPackage rec { pname = "keras"; - version = "3.5.0"; + version = "3.6.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "keras-team"; repo = "keras"; rev = "refs/tags/v${version}"; - hash = "sha256-hp+kKsKI2Jmh30/KeUZ+uBW0MG49+QgsyR5yCS63p08="; + hash = "sha256-zbeGa4g2psAofYAVuM7BNWI2gI21e739N5ZtxVfnVUg="; }; build-system = [ @@ -52,7 +48,6 @@ buildPythonPackage rec { packaging rich tensorflow - tf-keras ]; pythonImportsCheck = [ @@ -68,6 +63,6 @@ buildPythonPackage rec { homepage = "https://keras.io"; changelog = "https://github.com/keras-team/keras/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ NikolaMandic ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index d16fa7232c2c..b18c84866227 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "keyring"; - version = "25.4.0"; + version = "25.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "jaraco"; repo = "keyring"; rev = "refs/tags/v${version}"; - hash = "sha256-B1uU4INod2iSXIftPlDOr7mzWPY3FTpLhUuInl1Hg/M="; + hash = "sha256-5MK7f6/e8ZJ7azm5WX8T2+/6R3P3Y8XaN7jze2MgiJA="; }; build-system = [ setuptools-scm ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { jaraco-context jaraco-functools ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ jeepney secretstorage ] @@ -68,7 +68,7 @@ buildPythonPackage rec { 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"; + ++ lib.optional stdenv.hostPlatform.isDarwin "tests/test_multiprocess.py"; meta = with lib; { description = "Store and access your passwords safely"; diff --git a/pkgs/development/python-modules/keyring_24/default.nix b/pkgs/development/python-modules/keyring_24/default.nix index 9739a6f7b20a..05fbb3178147 100644 --- a/pkgs/development/python-modules/keyring_24/default.nix +++ b/pkgs/development/python-modules/keyring_24/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { jaraco-context jaraco-functools ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ jeepney secretstorage ] @@ -68,7 +68,7 @@ buildPythonPackage rec { 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"; + ++ lib.optional stdenv.hostPlatform.isDarwin "tests/test_multiprocess.py"; meta = with lib; { description = "Store and access your passwords safely"; diff --git a/pkgs/development/python-modules/keyrings-cryptfile/default.nix b/pkgs/development/python-modules/keyrings-cryptfile/default.nix index 4db10bd0ed5a..528d4becda6b 100644 --- a/pkgs/development/python-modules/keyrings-cryptfile/default.nix +++ b/pkgs/development/python-modules/keyrings-cryptfile/default.nix @@ -2,7 +2,7 @@ lib, argon2-cffi, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, keyring, pycryptodome, @@ -13,15 +13,16 @@ buildPythonPackage rec { pname = "keyrings-cryptfile"; - version = "1.3.9"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.5"; - src = fetchPypi { - pname = "keyrings.cryptfile"; - inherit version; - hash = "sha256-fCpFPKuZhUJrjCH3rVSlfkn/joGboY4INAvYgBrPAJE="; + src = fetchFromGitHub { + owner = "frispete"; + repo = "keyrings.cryptfile"; + rev = "refs/tags/v${version}"; + hash = "sha256-cDXx0s3o8hNqgzX4oNkjGhNcaUX5vi1uN2d9sdbiZwk="; }; build-system = [ setuptools ]; @@ -40,8 +41,10 @@ buildPythonPackage rec { ]; disabledTests = [ - # FileNotFoundError: [Errno 2] No such file or directory: '/build/... - "test_versions" + # correct raise `ValueError`s which pytest fails to catch for some reason: + "test_empty_username" + # TestEncryptedFileKeyring::test_file raises 'ValueError: Incorrect Password' for some reason, maybe mock related: + "TestEncryptedFileKeyring" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/keystone-engine/default.nix b/pkgs/development/python-modules/keystone-engine/default.nix index 61e27473ec98..4e526346dced 100644 --- a/pkgs/development/python-modules/keystone-engine/default.nix +++ b/pkgs/development/python-modules/keystone-engine/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1xahdr6bh3dw5swrc2r8kqa8ljhqlb7k2kxv5mrw5rhcmcnzcyig"; }; - setupPyBuildFlags = lib.optionals stdenv.isLinux [ + setupPyBuildFlags = lib.optionals stdenv.hostPlatform.isLinux [ "--plat-name" "linux" ]; diff --git a/pkgs/development/python-modules/kinparse/default.nix b/pkgs/development/python-modules/kinparse/default.nix index a925347da318..8ddde08f68d8 100644 --- a/pkgs/development/python-modules/kinparse/default.nix +++ b/pkgs/development/python-modules/kinparse/default.nix @@ -19,7 +19,6 @@ buildPythonPackage { sha256 = "1nrjnybwzy93c79yylcwmb4lvkx7hixavnjwffslz0zwn32l0kx3"; }; - doCheck = true; pythonImportsCheck = [ "kinparse" ]; nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/kivy/default.nix b/pkgs/development/python-modules/kivy/default.nix index f71c8288c74e..26a1bba38bce 100644 --- a/pkgs/development/python-modules/kivy/default.nix +++ b/pkgs/development/python-modules/kivy/default.nix @@ -49,11 +49,11 @@ buildPythonPackage rec { SDL2_ttf SDL2_mixer ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ mesa mtdev ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate ApplicationServices AVFoundation @@ -84,9 +84,9 @@ buildPythonPackage rec { # prefer pkg-config over hardcoded framework paths USE_OSX_FRAMEWORKS = 0; # work around python distutils compiling C++ with $CC (see issue #26709) - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace kivy/lib/mtdev.py \ --replace "LoadLibrary('libmtdev.so.1')" "LoadLibrary('${mtdev}/lib/libmtdev.so.1')" ''; diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index d71b613b58b8..5496c062acde 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -11,17 +11,17 @@ buildPythonPackage rec { pname = "kiwisolver"; - version = "1.4.5"; + version = "1.4.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5X5WOlf7IqFC2jTziswvwaXIZLwpyhUXqIq8lj5g1uw="; + hash = "sha256-mJP/gb1xB/e2hdMBfMZYParbT8JuSoiDUN9TDkGYCmA="; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/knocki/default.nix b/pkgs/development/python-modules/knocki/default.nix index 953eaf9b10f5..bcdc986033e8 100644 --- a/pkgs/development/python-modules/knocki/default.nix +++ b/pkgs/development/python-modules/knocki/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "knocki"; - version = "0.3.2"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "swan-solutions"; repo = "knocki-homeassistant"; rev = "refs/tags/v${version}"; - hash = "sha256-WdX/RvLjxkElgDXVMXcslYWlupQ7RDns5F+Y5XGQk5w="; + hash = "sha256-Eh/ykTbR2NMZ9Mjgcc53OU3+2EsX6FWV93DmwCDvsRg="; }; postPatch = '' @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asynchronous Python client for Knocki vibration / door sensors"; homepage = "https://github.com/swan-solutions/knocki-homeassistant"; + changelog = "https://github.com/swan-solutions/knocki-homeassistant/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ mindstorms6 ]; }; diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 696860862b11..1d04da99d071 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -19,8 +19,10 @@ pythonOlder, pyyaml, redis, + setuptools, sqlalchemy, typing-extensions, + tzdata, urllib3, vine, }: @@ -28,22 +30,22 @@ buildPythonPackage rec { pname = "kombu"; version = "5.4.2"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; hash = "sha256-7vVy3S/Z/GFLN1gOPK6v3Vr0bB7/Mef7qJE4zbQG8s8="; }; - propagatedBuildInputs = - [ - amqp - vine - ] - ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ] - ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; + build-system = [ setuptools ]; + + propagatedBuildInputs = [ + amqp + tzdata + vine + ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; optional-dependencies = { msgpack = [ msgpack ]; @@ -79,6 +81,8 @@ buildPythonPackage rec { disabledTests = [ # Disable pyro4 test "test_driver_version" + # AssertionError: assert [call('WATCH'..., 'test-tag')] ==... + "test_global_keyprefix_transaction" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/kornia/default.nix b/pkgs/development/python-modules/kornia/default.nix index 013ccbd9010f..93a783bdba7c 100644 --- a/pkgs/development/python-modules/kornia/default.nix +++ b/pkgs/development/python-modules/kornia/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "kornia"; - version = "0.7.3"; + version = "0.7.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-iEg27b2JVLtAYLFncaSqIh5FyvmmitKAKP7Tl0WWNdk="; + hash = "sha256-Ecps1KniiL1WOGk+i/UAVuXJ2W7cgHSzAKCkZokyWIM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/krb5/default.nix b/pkgs/development/python-modules/krb5/default.nix index f64b73447ac0..5b4de628d7ca 100644 --- a/pkgs/development/python-modules/krb5/default.nix +++ b/pkgs/development/python-modules/krb5/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "krb5"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cSugkvvjoo7BiCC7Gx7SzBA3t1xccDP5cMaoyXu9Egk="; + hash = "sha256-ajCPLhfRUcOVsk5q7Hvf9qVv42J6MgQvyG1BI5ipLd0="; }; build-system = [ @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/jborean93/pykrb5"; license = licenses.mit; maintainers = teams.deshaw.members; - broken = stdenv.isDarwin; # TODO: figure out how to build on Darwin + broken = stdenv.hostPlatform.isDarwin; # TODO: figure out how to build on Darwin }; } diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix index f4aa517c4ef8..c0f878a78ed4 100644 --- a/pkgs/development/python-modules/kserve/default.nix +++ b/pkgs/development/python-modules/kserve/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -9,7 +8,6 @@ poetry-core, # dependencies - async-timeout, cloudevents, fastapi, grpcio, @@ -18,25 +16,31 @@ numpy, orjson, pandas, + uvicorn, + + # optional-dependencies + azure-identity, + azure-storage-blob, + azure-storage-file-share, + boto3, + google-cloud-storage, + huggingface-hub, + asgi-logger, + ray, + prometheus-client, protobuf, + requests, psutil, pydantic, python-dateutil, pyyaml, - ray, six, tabulate, timing-asgi, - uvicorn, - # checks + # tests avro, - azure-storage-blob, - azure-storage-file-share, - boto3, - botocore, - google-cloud-storage, grpcio-testing, pytest-asyncio, pytestCheckHook, @@ -45,27 +49,33 @@ buildPythonPackage rec { pname = "kserve"; - version = "0.13.1"; + version = "0.14.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "kserve"; repo = "kserve"; rev = "refs/tags/v${version}"; - hash = "sha256-wGS001PK+k21oCOaQCiAtytTDjfe0aiTVJ9spyOucYA="; + hash = "sha256-N/IgiTiyBNw7WQWxcUJlXU+Q9o3UUaduD9ZBKwu0uRE="; }; sourceRoot = "${src.name}/python/kserve"; + pythonRelaxDeps = [ + "fastapi" + "httpx" + "prometheus-client" + "protobuf" + "uvicorn" + "psutil" + ]; + build-system = [ deprecation poetry-core ]; dependencies = [ - async-timeout cloudevents fastapi grpcio @@ -80,37 +90,35 @@ buildPythonPackage rec { pydantic python-dateutil pyyaml - ray six tabulate timing-asgi uvicorn - ] ++ ray.optional-dependencies.serve-deps; - - pythonRelaxDeps = [ - "fastapi" - "httpx" - "prometheus-client" - "protobuf" - "ray" - "uvicorn" - "psutil" ]; - pythonImportsCheck = [ "kserve" ]; + optional-dependencies = { + storage = [ + azure-identity + azure-storage-blob + azure-storage-file-share + boto3 + huggingface-hub + google-cloud-storage + requests + ]; + logging = [ asgi-logger ]; + ray = [ ray ]; + }; nativeCheckInputs = [ avro - azure-storage-blob - azure-storage-file-share - boto3 - botocore - google-cloud-storage grpcio-testing pytest-asyncio pytestCheckHook tomlkit - ]; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); + + pythonImportsCheck = [ "kserve" ]; disabledTestPaths = [ # Looks for a config file at the root of the repository @@ -119,9 +127,11 @@ buildPythonPackage rec { disabledTests = [ # Require network access - "test_health_handler" - "test_infer" - "test_infer_v2" + "test_infer_graph_endpoint" + "test_infer_path_based_routing" + + # Tries to access `/tmp` (hardcoded) + "test_local_path_with_out_dir_exist" ]; meta = { diff --git a/pkgs/development/python-modules/kubernetes-asyncio/default.nix b/pkgs/development/python-modules/kubernetes-asyncio/default.nix new file mode 100644 index 000000000000..56d3e58b7a46 --- /dev/null +++ b/pkgs/development/python-modules/kubernetes-asyncio/default.nix @@ -0,0 +1,69 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + coreutils, + + # build-system + setuptools, + + # dependencies + aiohttp, + certifi, + python-dateutil, + pyyaml, + six, + urllib3, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "kubernetes-asyncio"; + version = "31.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tomplus"; + repo = "kubernetes_asyncio"; + rev = "refs/tags/${version}"; + hash = "sha256-YKBqhUeLqLiQ6bK235zTm4salnSLUxl4DUiFLQSjWqw="; + }; + + postPatch = '' + substituteInPlace kubernetes_asyncio/config/google_auth_test.py \ + --replace-fail "/bin/echo" "${lib.getExe' coreutils "echo"}" + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + aiohttp + certifi + python-dateutil + pyyaml + six + urllib3 + ]; + + pythonImportsCheck = [ + "kubernetes_asyncio" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + __darwinAllowLocalNetworking = true; + + meta = { + description = "Python asynchronous client library for Kubernetes http://kubernetes.io"; + homepage = "https://github.com/tomplus/kubernetes_asyncio"; + changelog = "https://github.com/tomplus/kubernetes_asyncio/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index b7387675c954..66a295dcc5a7 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # AssertionError: <class 'urllib3.poolmanager.ProxyManager'> != <class 'urllib3.poolmanager.Poolmanager'> "test_rest_proxycare" ]; diff --git a/pkgs/development/python-modules/kurbopy/default.nix b/pkgs/development/python-modules/kurbopy/default.nix index 3542fb60b281..3ced53fcde02 100644 --- a/pkgs/development/python-modules/kurbopy/default.nix +++ b/pkgs/development/python-modules/kurbopy/default.nix @@ -29,7 +29,6 @@ buildPythonPackage rec { hash = "sha256-W0BebCXC1wqwtQP+zHjISxSJjXHD9U6p9eNS12Nfb2Y="; }; - doCheck = true; nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' # pytestCheckHook puts . at the front of Python's sys.path, due to: diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 759923d78c23..b81962cd7d9d 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -10,7 +10,7 @@ nbconvert, nbformat, numpy, - opencv4, + opencv-python-headless, pillow, pydantic, pyproj, @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "labelbox"; - version = "4.0.0"; + version = "5.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,14 +40,15 @@ buildPythonPackage rec { owner = "Labelbox"; repo = "labelbox-python"; rev = "refs/tags/v.${version}"; - hash = "sha256-jIbSKT/jRWVyN2LH6Ih0VFc5QKICR7cYONzGpZ9bJvM="; + hash = "sha256-vfhlzkCTm1fhvCpzwAaXWPyXE8/2Yx63fTVHl5CWon4="; }; sourceRoot = "${src.name}/libs/labelbox"; - pythonRelaxDeps = [ "python-dateutil" ]; - - pythonRemoveDeps = [ "opencv-python-headless" ]; + pythonRelaxDeps = [ + "mypy" + "python-dateutil" + ]; build-system = [ hatchling ]; @@ -67,7 +68,7 @@ buildPythonPackage rec { shapely numpy pillow - opencv4 + opencv-python-headless typeguard imagesize pyproj diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index f37cbae31a33..0902bbd60a8d 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "labgrid"; - version = "24.0.1"; + version = "24.0.2"; pyproject = true; src = fetchFromGitHub { owner = "labgrid-project"; repo = "labgrid"; rev = "refs/tags/v${version}"; - hash = "sha256-KZO6HeB1Kkc3r6OI0ZXIL1WvGLYL5SLxaOn+EX5akOE="; + hash = "sha256-rW9peT4zoPzVR6Kl/E8G4qBig/x/lvxpCtvNtwIIL+U="; }; build-system = [ diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index a263fa60c152..f589399afa14 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.11.0"; + version = "1.12.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "ail-project"; repo = "LacusCore"; rev = "refs/tags/v${version}"; - hash = "sha256-O9nB+hxMrIJDeK6BrxmX/yr0OoIXxshKJxz9fU6b2V0="; + hash = "sha256-83OD/oGzjLsW0FRFyW6Yh9pwh/lcCfZDIe6uahhTRVc="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/lammps/default.nix b/pkgs/development/python-modules/lammps/default.nix index b9e0f45402d0..1267792855b0 100644 --- a/pkgs/development/python-modules/lammps/default.nix +++ b/pkgs/development/python-modules/lammps/default.nix @@ -12,8 +12,11 @@ buildPythonPackage { inherit (lammps) pname version src; env = { + # Needed for tests inherit LAMMPS_SHARED_LIB; }; + # Don't perform checks if GPU is enabled - because libcuda.so cannot be opened in the sandbox + doCheck = if lammps.passthru.packages ? GPU then !lammps.passthru.packages.GPU else true; preConfigure = '' cd python # Upstream assumes that the shared library is located in the same directory diff --git a/pkgs/development/python-modules/lancedb/Cargo.lock b/pkgs/development/python-modules/lancedb/Cargo.lock index 9fd06f89770b..b3a01fc8f1df 100644 --- a/pkgs/development/python-modules/lancedb/Cargo.lock +++ b/pkgs/development/python-modules/lancedb/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -127,9 +127,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.88" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arbitrary" @@ -162,6 +162,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76" [[package]] +name = "arrayref" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" + +[[package]] name = "arrow" version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -307,7 +313,7 @@ dependencies = [ "arrow-schema", "chrono", "half", - "indexmap 2.5.0", + "indexmap 2.6.0", "lexical-core", "num", "serde", @@ -385,9 +391,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429" dependencies = [ "flate2", "futures-core", @@ -447,7 +453,7 @@ dependencies = [ "derive_builder", "futures", "rand", - "reqwest 0.12.7", + "reqwest", "reqwest-eventsource", "secrecy", "serde", @@ -476,18 +482,18 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -519,15 +525,15 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-config" -version = "1.5.6" +version = "1.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848d7b9b605720989929279fa644ce8f244d0ce3146fcca5b70e4eb7b3c020fc" +checksum = "7198e6f03240fdceba36656d8be440297b6b82270325908c7381f37d826a74f6" dependencies = [ "aws-credential-types", "aws-runtime", @@ -593,9 +599,9 @@ dependencies = [ [[package]] name = "aws-sdk-dynamodb" -version = "1.45.0" +version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f3d9e807092149e3df266e3f4d9760dac439b90f82d8438e5b2c0bbe62007f" +checksum = "ab0ade000608877169533a54326badd6b5a707d2faf876cfc3976a7f9d7e5329" dependencies = [ "aws-credential-types", "aws-runtime", @@ -616,9 +622,9 @@ dependencies = [ [[package]] name = "aws-sdk-kms" -version = "1.43.0" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f7cb482caa5444d445c94417b9c74e49a849beb09ede4f2f4c3c15f8157387" +checksum = "e33590e8d45206fdc4273ded8a1f292bcceaadd513037aa790fc67b237bc30ee" dependencies = [ "aws-credential-types", "aws-runtime", @@ -638,9 +644,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.49.0" +version = "1.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e518950d4ac43508c8bfc2fe4e24b0752d99eab80134461d5e162dcda0214b55" +checksum = "e2f2a62020f3e06f9b352b2a23547f6e1d110b6bf1e18a6b588ae36114eaf6e2" dependencies = [ "ahash", "aws-credential-types", @@ -673,9 +679,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.42.0" +version = "1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27bf24cd0d389daa923e974b0e7c38daf308fc21e963c049f57980235017175e" +checksum = "e33ae899566f3d395cbf42858e433930682cc9c1889fa89318896082fef45efb" dependencies = [ "aws-credential-types", "aws-runtime", @@ -695,9 +701,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.43.0" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43b3220f1c46ac0e9dcc0a97d94b93305dacb36d1dd393996300c6b9b74364" +checksum = "f39c09e199ebd96b9f860b0fce4b6625f211e064ad7c8693b72ecf7ef03881e0" dependencies = [ "aws-credential-types", "aws-runtime", @@ -717,9 +723,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.42.0" +version = "1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c46924fb1add65bba55636e12812cae2febf68c0f37361766f627ddcca91ce" +checksum = "3d95f93a98130389eb6233b9d615249e543f6c24a68ca1f109af9ca5164a8765" dependencies = [ "aws-credential-types", "aws-runtime", @@ -852,9 +858,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1ce695746394772e7000b39fe073095db6d45a862d0767dd5ad0ac0d7f8eb87" +checksum = "a065c0fe6fdbdf9f11817eb68582b2ab4aff9e9c39e986ae48f7ec576c6322db" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -896,9 +902,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.6" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03701449087215b5369c7ea17fef0dd5d24cb93439ec5af0c7615f58c3f22605" +checksum = "147100a7bea70fa20ef224a6bad700358305f5dc0f84649c53769761395b355b" dependencies = [ "base64-simd", "bytes", @@ -1113,13 +1119,13 @@ dependencies = [ [[package]] name = "bytemuck_derive" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" +checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1130,9 +1136,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bytes-utils" @@ -1162,7 +1168,7 @@ dependencies = [ "byteorder", "gemm", "half", - "memmap2 0.9.4", + "memmap2 0.9.5", "num-traits", "num_cpus", "rand", @@ -1232,9 +1238,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.18" +version = "1.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" dependencies = [ "jobserver", "libc", @@ -1586,7 +1592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1616,7 +1622,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1627,7 +1633,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1644,10 +1650,24 @@ dependencies = [ ] [[package]] +name = "dashmap" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] name = "datafusion" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9d55a9cd2634818953809f75ebe5248b00dd43c3227efb2a51a2d5feaad54e" +checksum = "e4fd4a99fc70d40ef7e52b243b4a399c3f8d353a40d5ecb200deee05e49c61bb" dependencies = [ "ahash", "arrow", @@ -1657,24 +1677,26 @@ dependencies = [ "async-trait", "bytes", "chrono", - "dashmap", + "dashmap 6.1.0", + "datafusion-catalog", "datafusion-common", "datafusion-common-runtime", "datafusion-execution", "datafusion-expr", "datafusion-functions", "datafusion-functions-aggregate", - "datafusion-functions-array", + "datafusion-functions-nested", "datafusion-optimizer", "datafusion-physical-expr", "datafusion-physical-expr-common", + "datafusion-physical-optimizer", "datafusion-physical-plan", "datafusion-sql", "futures", "glob", "half", "hashbrown 0.14.5", - "indexmap 2.5.0", + "indexmap 2.6.0", "itertools 0.12.1", "log", "num_cpus", @@ -1683,7 +1705,7 @@ dependencies = [ "paste", "pin-project-lite", "rand", - "sqlparser 0.47.0", + "sqlparser 0.49.0", "tempfile", "tokio", "url", @@ -1691,10 +1713,24 @@ dependencies = [ ] [[package]] +name = "datafusion-catalog" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13b3cfbd84c6003594ae1972314e3df303a27ce8ce755fcea3240c90f4c0529" +dependencies = [ + "arrow-schema", + "async-trait", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-plan", +] + +[[package]] name = "datafusion-common" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def66b642959e7f96f5d2da22e1f43d3bd35598f821e5ce351a0553e0f1b7367" +checksum = "44fdbc877e3e40dcf88cc8f283d9f5c8851f0a3aa07fee657b1b75ac1ad49b9c" dependencies = [ "ahash", "arrow", @@ -1708,27 +1744,27 @@ dependencies = [ "libc", "num_cpus", "object_store", - "sqlparser 0.47.0", + "sqlparser 0.49.0", ] [[package]] name = "datafusion-common-runtime" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f104bb9cb44c06c9badf8a0d7e0855e5f7fa5e395b887d7f835e8a9457dc1352" +checksum = "8a7496d1f664179f6ce3a5cbef6566056ccaf3ea4aa72cc455f80e62c1dd86b1" dependencies = [ "tokio", ] [[package]] name = "datafusion-execution" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac0fd8b5d80bbca3fc3b6f40da4e9f6907354824ec3b18bbd83fee8cf5c3c3e" +checksum = "799e70968c815b611116951e3dd876aef04bf217da31b72eec01ee6a959336a1" dependencies = [ "arrow", "chrono", - "dashmap", + "dashmap 6.1.0", "datafusion-common", "datafusion-expr", "futures", @@ -1743,9 +1779,9 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2103d2cc16fb11ef1fa993a6cac57ed5cb028601db4b97566c90e5fa77aa1e68" +checksum = "1c1841c409d9518c17971d15c9bae62e629eb937e6fb6c68cd32e9186f8b30d2" dependencies = [ "ahash", "arrow", @@ -1755,18 +1791,19 @@ dependencies = [ "datafusion-common", "paste", "serde_json", - "sqlparser 0.47.0", + "sqlparser 0.49.0", "strum", "strum_macros 0.26.4", ] [[package]] name = "datafusion-functions" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a369332afd0ef5bd565f6db2139fb9f1dfdd0afa75a7f70f000b74208d76994f" +checksum = "a8e481cf34d2a444bd8fa09b65945f0ce83dc92df8665b761505b3d9f351bebb" dependencies = [ "arrow", + "arrow-buffer", "base64 0.22.1", "chrono", "datafusion-common", @@ -1784,9 +1821,9 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92718db1aff70c47e5abf9fc975768530097059e5db7c7b78cd64b5e9a11fc77" +checksum = "2b4ece19f73c02727e5e8654d79cd5652de371352c1df3c4ac3e419ecd6943fb" dependencies = [ "ahash", "arrow", @@ -1797,14 +1834,14 @@ dependencies = [ "datafusion-physical-expr-common", "log", "paste", - "sqlparser 0.47.0", + "sqlparser 0.49.0", ] [[package]] -name = "datafusion-functions-array" -version = "40.0.0" +name = "datafusion-functions-nested" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bb80f46ff3dcf4bb4510209c2ba9b8ce1b716ac8b7bf70c6bf7dca6260c831" +checksum = "a1474552cc824e8c9c88177d454db5781d4b66757d4aca75719306b8343a5e8d" dependencies = [ "arrow", "arrow-array", @@ -1819,13 +1856,14 @@ dependencies = [ "itertools 0.12.1", "log", "paste", + "rand", ] [[package]] name = "datafusion-optimizer" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82f34692011bec4fdd6fc18c264bf8037b8625d801e6dd8f5111af15cb6d71d3" +checksum = "791ff56f55608bc542d1ea7a68a64bdc86a9413f5a381d06a39fd49c2a3ab906" dependencies = [ "arrow", "async-trait", @@ -1834,7 +1872,7 @@ dependencies = [ "datafusion-expr", "datafusion-physical-expr", "hashbrown 0.14.5", - "indexmap 2.5.0", + "indexmap 2.6.0", "itertools 0.12.1", "log", "paste", @@ -1843,9 +1881,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45538630defedb553771434a437f7ca8f04b9b3e834344aafacecb27dc65d5e5" +checksum = "9a223962b3041304a3e20ed07a21d5de3d88d7e4e71ca192135db6d24e3365a4" dependencies = [ "ahash", "arrow", @@ -1863,7 +1901,7 @@ dependencies = [ "half", "hashbrown 0.14.5", "hex", - "indexmap 2.5.0", + "indexmap 2.6.0", "itertools 0.12.1", "log", "paste", @@ -1873,9 +1911,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d8a72b0ca908e074aaeca52c14ddf5c28d22361e9cb6bc79bb733cd6661b536" +checksum = "db5e7d8532a1601cd916881db87a70b0a599900d23f3db2897d389032da53bc6" dependencies = [ "ahash", "arrow", @@ -1886,10 +1924,22 @@ dependencies = [ ] [[package]] +name = "datafusion-physical-optimizer" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb9c78f308e050f5004671039786a925c3fee83b90004e9fcfd328d7febdcc0" +dependencies = [ + "datafusion-common", + "datafusion-execution", + "datafusion-physical-expr", + "datafusion-physical-plan", +] + +[[package]] name = "datafusion-physical-plan" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b504eae6107a342775e22e323e9103f7f42db593ec6103b28605b7b7b1405c4a" +checksum = "8d1116949432eb2d30f6362707e2846d942e491052a206f2ddcb42d08aea1ffe" dependencies = [ "ahash", "arrow", @@ -1909,7 +1959,7 @@ dependencies = [ "futures", "half", "hashbrown 0.14.5", - "indexmap 2.5.0", + "indexmap 2.6.0", "itertools 0.12.1", "log", "once_cell", @@ -1921,9 +1971,9 @@ dependencies = [ [[package]] name = "datafusion-sql" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5db33f323f41b95ae201318ba654a9bf11113e58a51a1dff977b1a836d3d889" +checksum = "b45d0180711165fe94015d7c4123eb3e1cf5fb60b1506453200b8d1ce666bef0" dependencies = [ "arrow", "arrow-array", @@ -1932,7 +1982,7 @@ dependencies = [ "datafusion-expr", "log", "regex", - "sqlparser 0.47.0", + "sqlparser 0.49.0", "strum", ] @@ -1984,38 +2034,38 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "derive_builder" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "derive_builder_macro" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2058,7 +2108,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2151,7 +2201,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2163,7 +2213,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2342,9 +2392,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -2357,6 +2407,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + +[[package]] name = "foreign-types" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2398,9 +2454,9 @@ dependencies = [ [[package]] name = "fsst" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26212c1db7eee3ec0808bd99107cf62ba4d3edd3489df601e2d0c73c5d739aec" +checksum = "6b1d2a2da56a2bf2dea67567e50c066c9323db26c78d9051b98e552b236f15fe" dependencies = [ "rand", ] @@ -2413,9 +2469,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -2428,9 +2484,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -2438,15 +2494,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -2455,9 +2511,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -2476,26 +2532,26 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-timer" @@ -2505,9 +2561,9 @@ checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -2664,9 +2720,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" @@ -2697,7 +2753,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.5.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -2716,7 +2772,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.5.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -2755,6 +2811,17 @@ dependencies = [ ] [[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] + +[[package]] name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2883,9 +2950,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -2969,7 +3036,7 @@ dependencies = [ "http 1.1.0", "hyper 1.4.1", "hyper-util", - "rustls 0.23.13", + "rustls 0.23.14", "rustls-native-certs 0.8.0", "rustls-pki-types", "tokio", @@ -2979,22 +3046,25 @@ dependencies = [ [[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.30", + "http-body-util", + "hyper 1.4.1", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", ] [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes", "futures-channel", @@ -3005,7 +3075,6 @@ dependencies = [ "pin-project-lite", "socket2 0.5.7", "tokio", - "tower", "tower-service", "tracing", ] @@ -3021,9 +3090,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3071,12 +3140,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "serde", ] @@ -3124,9 +3193,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" @@ -3217,18 +3286,18 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "0cb94a0ffd3f3ee755c20f7d8752f45cac88605a4dcf808abcff72873296ec7b" dependencies = [ "wasm-bindgen", ] [[package]] name = "lance" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a427160737dd74d2d4f566f3111027edc63927106541d173459d010209371c42" +checksum = "4c4a02330c306f5cdb4ae1f54f413f81710fe2bb8d0f09e10898f16ff28906ae" dependencies = [ "arrow", "arrow-arith", @@ -3246,7 +3315,7 @@ dependencies = [ "byteorder", "bytes", "chrono", - "dashmap", + "dashmap 5.5.3", "datafusion", "datafusion-functions", "datafusion-physical-expr", @@ -3285,9 +3354,9 @@ dependencies = [ [[package]] name = "lance-arrow" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f1cfebe08c64b1edabe9b6ccd6f8ea1bc6349d0870d47f2db8cdadf02ab8e2" +checksum = "164a8935b3b093f5e7a4935de8e115ac738d193bf3fe94aa0e9ea3a0f5f5c30d" dependencies = [ "arrow-array", "arrow-buffer", @@ -3303,9 +3372,9 @@ dependencies = [ [[package]] name = "lance-core" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243aa2323dee6fcab6bb9bb3a21ae8f040c98a5de9bbfb7ab8484a036176185a" +checksum = "b02e4e248390e11b092e546fb1117d50b0d278b178b82d8438cda26eb65edd75" dependencies = [ "arrow-array", "arrow-buffer", @@ -3341,9 +3410,9 @@ dependencies = [ [[package]] name = "lance-datafusion" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0a69d039f93a43477245b51a8f1ce58a1f41485f8ded946f53031a11ded8c97" +checksum = "e7a7597b224cf428762187f7b70d775b7e29d65b90c9df82e677de85e88f165a" dependencies = [ "arrow", "arrow-array", @@ -3368,10 +3437,11 @@ dependencies = [ [[package]] name = "lance-encoding" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b713e49ce6039d0ca0f88e8ded66ee64d89c42f85107bc9e684fbff41386a65" +checksum = "b7cf8fa33073f9ad592638f522103eca150594e4648721e7c17a308334d9ccdd" dependencies = [ + "arrayref", "arrow", "arrow-arith", "arrow-array", @@ -3380,6 +3450,7 @@ dependencies = [ "arrow-data", "arrow-schema", "arrow-select", + "bytemuck", "bytes", "fsst", "futures", @@ -3390,10 +3461,12 @@ dependencies = [ "lance-core", "log", "num-traits", + "paste", "prost", "prost-build", "prost-types", "rand", + "seq-macro", "snafu", "tokio", "tracing", @@ -3402,9 +3475,9 @@ dependencies = [ [[package]] name = "lance-file" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0eaebd40c77f8f06a0cbadcd07f9344aea616dcd4d8712f6cad81c2eda14d5" +checksum = "d21247b1f8579ebf0d7f938d930c0c89d2b35cd503fc3b94adfb8bf5eb40acc3" dependencies = [ "arrow-arith", "arrow-array", @@ -3438,9 +3511,9 @@ dependencies = [ [[package]] name = "lance-index" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1ad5a42b9a4909749ee62fc94c64d19259c2aadca7c8446f42ee8e9c7a097d3" +checksum = "fecf46eef5a2d4b1a44b2d01b98fb45e7923fe9471d8d2f907f485e12dddac4e" dependencies = [ "arrow", "arrow-array", @@ -3491,9 +3564,9 @@ dependencies = [ [[package]] name = "lance-io" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f334f2c279f80f19803141cf7f98c6b82e6ace3c7f75c8740f1df7a73bb720" +checksum = "48071e1d45f4dda04d8660d6378a7e23825faae46b4717170dbf1fd0ba583e2c" dependencies = [ "arrow", "arrow-arith", @@ -3532,9 +3605,9 @@ dependencies = [ [[package]] name = "lance-linalg" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fa019770a0afb287360a4ea919cff482371ad43318607d1e797534c819bf356" +checksum = "5944b11e2fef3b992c5609eb20b6336de622f468c2ae4d40f746498f910551f5" dependencies = [ "arrow-array", "arrow-ord", @@ -3557,9 +3630,9 @@ dependencies = [ [[package]] name = "lance-table" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fa39bede133d578431db3f77b0c2c63fcaff12a088000648014c27266830a2" +checksum = "98106c7a29e810cb08b943bc3039a706577183366ffc27a4933c3a12e3a8334c" dependencies = [ "arrow", "arrow-array", @@ -3598,9 +3671,9 @@ dependencies = [ [[package]] name = "lance-testing" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4eae0993cda6130cfd75d3d9d11830dd4ec8d4c66cf81def939837c419d4bc" +checksum = "4cdadadeae5c76fc70b0345ea2248f9ce4b7944d7b0df5db9385f7c0d30fcac6" dependencies = [ "arrow-array", "arrow-schema", @@ -3611,7 +3684,7 @@ dependencies = [ [[package]] name = "lancedb" -version = "0.10.0-beta.1" +version = "0.11.0-beta.1" dependencies = [ "arrow", "arrow-array", @@ -3632,10 +3705,13 @@ dependencies = [ "candle-nn", "candle-transformers", "chrono", + "datafusion-common", "datafusion-physical-plan", "futures", "half", "hf-hub", + "http 1.1.0", + "http-body 1.0.1", "lance", "lance-datafusion", "lance-encoding", @@ -3645,6 +3721,7 @@ dependencies = [ "lance-testing", "lazy_static", "log", + "moka", "num-traits", "object_store", "pin-project", @@ -3653,7 +3730,7 @@ dependencies = [ "rand", "random_word", "regex", - "reqwest 0.11.27", + "reqwest", "serde", "serde_json", "serde_with", @@ -3668,7 +3745,7 @@ dependencies = [ [[package]] name = "lancedb-jni" -version = "0.4.18" +version = "0.10.0" dependencies = [ "arrow", "arrow-schema", @@ -3684,7 +3761,7 @@ dependencies = [ [[package]] name = "lancedb-node" -version = "0.10.0-beta.1" +version = "0.11.0-beta.1" dependencies = [ "arrow-array", "arrow-ipc", @@ -3709,7 +3786,7 @@ dependencies = [ [[package]] name = "lancedb-nodejs" -version = "0.0.0" +version = "0.11.0-beta.1" dependencies = [ "arrow-ipc", "futures", @@ -3722,13 +3799,12 @@ dependencies = [ [[package]] name = "lancedb-python" -version = "0.13.0" +version = "0.14.0" dependencies = [ "arrow", "env_logger 0.10.2", "futures", "lancedb", - "lzma-sys", "pin-project", "pyo3", "pyo3-asyncio-0-21", @@ -3814,9 +3890,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libloading" @@ -3884,27 +3960,27 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.0", ] [[package]] name = "lz4" -version = "1.27.0" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a231296ca742e418c43660cb68e082486ff2538e8db432bc818580f3965025ed" +checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725" dependencies = [ "lz4-sys", ] [[package]] name = "lz4-sys" -version = "1.11.0" +version = "1.11.1+lz4-1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb44a01837a858d47e5a630d2ccf304c8efcc4b83b8f9f75b7a9ee4fcc6e57d" +checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6" dependencies = [ "cc", "libc", @@ -3992,9 +4068,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", "stable_deref_trait", @@ -4104,7 +4180,7 @@ checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4143,9 +4219,9 @@ checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b" [[package]] name = "napi" -version = "2.16.10" +version = "2.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04409e8c2d61995696e44d2181b79b68c1dd41f7e24a17cde60bbd9f54ddddef" +checksum = "53575dfa17f208dd1ce3a2da2da4659aae393b256a472f2738a8586a6c4107fd" dependencies = [ "bitflags 2.6.0", "ctor", @@ -4172,7 +4248,7 @@ dependencies = [ "napi-derive-backend", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4187,7 +4263,7 @@ dependencies = [ "quote", "regex", "semver 1.0.23", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4394,7 +4470,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4405,9 +4481,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] @@ -4431,9 +4507,9 @@ dependencies = [ "percent-encoding", "quick-xml", "rand", - "reqwest 0.12.7", + "reqwest", "ring", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.2.0", "serde", "serde_json", "snafu", @@ -4445,9 +4521,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oneshot" @@ -4500,7 +4576,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4628,7 +4704,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.5.0", + "indexmap 2.6.0", ] [[package]] @@ -4671,22 +4747,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4713,9 +4789,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "planus" @@ -4821,7 +4897,7 @@ dependencies = [ "comfy-table", "either", "hashbrown 0.14.5", - "indexmap 2.5.0", + "indexmap 2.6.0", "num-traits", "once_cell", "polars-arrow", @@ -4919,7 +4995,7 @@ dependencies = [ "either", "hashbrown 0.14.5", "hex", - "indexmap 2.5.0", + "indexmap 2.6.0", "memchr", "num-traits", "polars-arrow", @@ -5063,11 +5139,11 @@ dependencies = [ "ahash", "bytemuck", "hashbrown 0.14.5", - "indexmap 2.5.0", + "indexmap 2.6.0", "num-traits", "once_cell", "polars-error", - "raw-cpuid 11.1.0", + "raw-cpuid 11.2.0", "rayon", "smartstring", "stacker", @@ -5093,9 +5169,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "powerfmt" @@ -5119,7 +5195,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5133,9 +5209,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" dependencies = [ "unicode-ident", ] @@ -5167,7 +5243,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.77", + "syn 2.0.79", "tempfile", ] @@ -5181,7 +5257,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5307,7 +5383,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5320,7 +5396,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config 0.21.2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5341,9 +5417,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.36.1" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "memchr", "serde", @@ -5360,7 +5436,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash 2.0.0", - "rustls 0.23.13", + "rustls 0.23.14", "socket2 0.5.7", "thiserror", "tokio", @@ -5377,7 +5453,7 @@ dependencies = [ "rand", "ring", "rustc-hash 2.0.0", - "rustls 0.23.13", + "rustls 0.23.14", "slab", "thiserror", "tinyvec", @@ -5483,9 +5559,9 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "11.1.0" +version = "11.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d" +checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0" dependencies = [ "bitflags 2.6.0", ] @@ -5544,14 +5620,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b" dependencies = [ "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -5569,9 +5645,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", @@ -5581,9 +5657,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -5598,60 +5674,20 @@ checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.11.27" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" 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", -] - -[[package]] -name = "reqwest" -version = "0.12.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" -dependencies = [ "base64 0.22.1", "bytes", + "encoding_rs", "futures-core", "futures-util", "h2 0.4.6", @@ -5660,25 +5696,29 @@ dependencies = [ "http-body-util", "hyper 1.4.1", "hyper-rustls 0.27.3", + "hyper-tls", "hyper-util", "ipnet", "js-sys", "log", "mime", "mime_guess", + "native-tls", "once_cell", "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.13", - "rustls-native-certs 0.7.3", - "rustls-pemfile 2.1.3", + "rustls 0.23.14", + "rustls-native-certs 0.8.0", + "rustls-pemfile 2.2.0", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper", + "system-configuration", "tokio", + "tokio-native-tls", "tokio-rustls 0.26.0", "tokio-util", "tower-service", @@ -5702,7 +5742,7 @@ dependencies = [ "mime", "nom", "pin-project-lite", - "reqwest 0.12.7", + "reqwest", "thiserror", ] @@ -5820,9 +5860,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.13" +version = "0.23.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" dependencies = [ "log", "once_cell", @@ -5847,25 +5887,12 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -dependencies = [ - "openssl-probe", - "rustls-pemfile 2.1.3", - "rustls-pki-types", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-native-certs" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", "security-framework", @@ -5882,19 +5909,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" [[package]] name = "rustls-webpki" @@ -5950,9 +5976,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ "windows-sys 0.59.0", ] @@ -6021,9 +6047,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -6076,7 +6102,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6114,15 +6140,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.5.0", + "indexmap 2.6.0", "serde", "serde_derive", "serde_json", @@ -6132,14 +6158,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6200,9 +6226,9 @@ dependencies = [ [[package]] name = "simdutf8" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "siphasher" @@ -6341,9 +6367,9 @@ dependencies = [ [[package]] name = "sqlparser" -version = "0.47.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295e9930cd7a97e58ca2a070541a3ca502b17f5d1fa7157376d0fabd85324f25" +checksum = "a4a404d0e14905361b918cb8afdb73605e25c1d5029312bd9785142dcb3aa49e" dependencies = [ "log", "sqlparser_derive", @@ -6357,7 +6383,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6443,7 +6469,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6456,7 +6482,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6478,9 +6504,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -6500,12 +6526,6 @@ dependencies = [ [[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" @@ -6521,7 +6541,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6554,20 +6574,20 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", @@ -6604,7 +6624,7 @@ dependencies = [ "lru", "lz4_flex", "measure_time", - "memmap2 0.9.4", + "memmap2 0.9.5", "num_cpus", "once_cell", "oneshot", @@ -6740,9 +6760,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand 2.1.1", @@ -6762,22 +6782,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6892,7 +6912,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6921,7 +6941,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.13", + "rustls 0.23.14", "rustls-pki-types", "tokio", ] @@ -6958,37 +6978,16 @@ checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" [[package]] name = "toml_edit" -version = "0.22.20" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - -[[package]] name = "tower-service" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7013,7 +7012,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -7027,9 +7026,9 @@ dependencies = [ [[package]] name = "triomphe" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" +checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" [[package]] name = "try-lock" @@ -7064,9 +7063,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" @@ -7076,9 +7075,9 @@ checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] @@ -7103,15 +7102,15 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode_categories" @@ -7142,7 +7141,7 @@ dependencies = [ "log", "native-tls", "once_cell", - "rustls 0.23.13", + "rustls 0.23.14", "rustls-pki-types", "serde", "serde_json", @@ -7240,9 +7239,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "ef073ced962d62984fb38a36e5fdc1a2b23c9e0e1fa0689bb97afa4202ef6887" dependencies = [ "cfg-if", "once_cell", @@ -7251,24 +7250,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "c4bfab14ef75323f4eb75fa52ee0a3fb59611977fd3240da19b2cf36ff85030e" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "65471f79c1022ffa5291d33520cbbb53b7687b01c2f8e83b57d102eed7ed479d" dependencies = [ "cfg-if", "js-sys", @@ -7278,9 +7277,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "a7bec9830f60924d9ceb3ef99d55c155be8afa76954edffbb5936ff4509474e7" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7288,28 +7287,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "4c74f6e152a76a2ad448e223b0fc0b6b5747649c3d769cc6bf45737bf97d0ed6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "a42f6c679374623f295a8623adfe63d9284091245c3504bde47c17a3ce2777d9" [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" dependencies = [ "futures-util", "js-sys", @@ -7320,9 +7319,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "44188d185b5bdcae1052d08bcbcf9091a5524038d4572cc4f4f2bb9d5554ddd9" dependencies = [ "js-sys", "wasm-bindgen", @@ -7330,9 +7329,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.5" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" dependencies = [ "rustls-pki-types", ] @@ -7633,24 +7632,14 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" 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 = "wyz" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7691,7 +7680,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "synstructure", ] @@ -7713,7 +7702,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -7733,7 +7722,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "synstructure", ] @@ -7753,7 +7742,7 @@ dependencies = [ "crc32fast", "crossbeam-utils", "displaydoc", - "indexmap 2.5.0", + "indexmap 2.6.0", "num_enum", "thiserror", ] diff --git a/pkgs/development/python-modules/lancedb/default.nix b/pkgs/development/python-modules/lancedb/default.nix index bf2f407be877..950a67d1d334 100644 --- a/pkgs/development/python-modules/lancedb/default.nix +++ b/pkgs/development/python-modules/lancedb/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, darwin, libiconv, + openssl, pkg-config, protobuf, attrs, @@ -28,14 +29,14 @@ buildPythonPackage rec { pname = "lancedb"; - version = "0.13.0"; + version = "0.14.0"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lancedb"; rev = "refs/tags/python-v${version}"; - hash = "sha256-6E20WgyoEALdxmiOfgq89dCkqovvIMzc/wy+kvjDWwU="; + hash = "sha256-lw2tZ26Py6JUxuetaokJKnxOv/WoLK4spxssLKxvxJA="; }; buildAndTestSubdir = "python"; @@ -50,15 +51,16 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config + protobuf rustPlatform.cargoSetupHook ]; buildInputs = [ libiconv - protobuf + openssl ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ IOKit @@ -96,14 +98,21 @@ buildPythonPackage rec { pytestFlagsArray = [ "-m 'not slow'" ]; - disabledTests = [ - # require tantivy which is not packaged in nixpkgs - "test_basic" + disabledTests = + [ + # require tantivy which is not packaged in nixpkgs + "test_basic" - # polars.exceptions.ComputeError: TypeError: _scan_pyarrow_dataset_impl() got multiple values for argument 'batch_size' - # https://github.com/lancedb/lancedb/issues/1539 - "test_polars" - ]; + # polars.exceptions.ComputeError: TypeError: _scan_pyarrow_dataset_impl() got multiple values for argument 'batch_size' + # https://github.com/lancedb/lancedb/issues/1539 + "test_polars" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # fail with darwin sandbox + "test_async_remote_db" + "test_http_error" + "test_retry_error" + ]; disabledTestPaths = [ # touch the network diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix index 767f2262c287..0ec1aec1d3d2 100644 --- a/pkgs/development/python-modules/langchain-aws/default.nix +++ b/pkgs/development/python-modules/langchain-aws/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "langchain-aws"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-P9CfAVpKh7djhUQc3DyyJTWqs9RbrTeLyynLei0x00o="; + hash = "sha256-LHhyEkgu1sjOk4E4WMy4vYGyikqdVD3WvRPjoAP1CfA="; }; postPatch = '' @@ -45,6 +45,11 @@ buildPythonPackage rec { numpy ]; + pythonRelaxDeps = [ + # Boto @ 1.35 has outstripped the version requirement + "boto3" + ]; + nativeCheckInputs = [ langchain-standard-tests pytest-asyncio diff --git a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix index 9bf287ea2c34..84e899b288f1 100644 --- a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix +++ b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-azure-dynamic-sessions==${version}"; - hash = "sha256-tgvoOSr4tpi+tFBan+kw8FZUfUJHcQXv9e1nyeGP0so="; + hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20="; }; sourceRoot = "${src.name}/libs/partners/azure-dynamic-sessions"; @@ -74,6 +74,9 @@ buildPythonPackage rec { 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 ]; + maintainers = with lib.maintainers; [ + natsukium + sarahec + ]; }; } diff --git a/pkgs/development/python-modules/langchain-chroma/001-async-test.patch b/pkgs/development/python-modules/langchain-chroma/001-async-test.patch new file mode 100644 index 000000000000..178fd37199f8 --- /dev/null +++ b/pkgs/development/python-modules/langchain-chroma/001-async-test.patch @@ -0,0 +1,13 @@ +diff --git a/libs/partners/chroma/tests/integration_tests/test_vectorstores.py b/libs/partners/chroma/tests/integration_tests/test_vectorstores.py +index 382b24cb5..f99a34112 100644 +--- a/tests/integration_tests/test_vectorstores.py ++++ b/tests/integration_tests/test_vectorstores.py +@@ -36,7 +36,7 @@ def test_chroma() -> None: + + assert output == [Document(page_content="foo")] + +- ++@pytest.mark.asyncio + async def test_chroma_async() -> None: + """Test end to end construction and search.""" + texts = ["foo", "bar", "baz"] diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix index f9a35e759c8e..1ec6ce71ed5d 100644 --- a/pkgs/development/python-modules/langchain-chroma/default.nix +++ b/pkgs/development/python-modules/langchain-chroma/default.nix @@ -7,6 +7,7 @@ numpy, poetry-core, pytestCheckHook, + pytest-asyncio, }: buildPythonPackage rec { @@ -23,6 +24,8 @@ buildPythonPackage rec { sourceRoot = "${src.name}/libs/partners/chroma"; + patches = [ ./001-async-test.patch ]; + build-system = [ poetry-core ]; pythonRelaxDeps = [ "chromadb" ]; @@ -35,7 +38,15 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_chroma" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = [ + # Bad integration test, not used or vetted by the langchain team + "test_chroma_update_document" + ]; passthru = { inherit (langchain-core) updateScript; @@ -46,6 +57,9 @@ buildPythonPackage rec { 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 ]; + maintainers = with lib.maintainers; [ + natsukium + sarahec + ]; }; } diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 54de5416be18..cccbca601e32 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -38,21 +38,24 @@ buildPythonPackage rec { pname = "langchain-community"; - version = "0.3.0"; + version = "0.3.6"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "refs/tags/langchain-community==${version}"; - hash = "sha256-8kF7KlXcWbquRtp8EumkFYhGd0onxifVZsts0SU1dzE="; + rev = "refs/tags/langchain-core==${version}"; + hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20="; }; sourceRoot = "${src.name}/libs/community"; build-system = [ poetry-core ]; - pythonRelaxDeps = [ "pydantic-settings" ]; + pythonRelaxDeps = [ + "pydantic-settings" + "tenacity" + ]; dependencies = [ aiohttp diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index a29bf68137a1..8bdc7ededc7b 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -34,20 +34,22 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.3.0"; + version = "0.3.15"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-core==${version}"; - hash = "sha256-BCqrJuy7R2jT3QmTvYwn8gHX7bc6Tq8HArK+F3PjBhw="; + hash = "sha256-lSXAqjjnihuucTZOSwQJk8gtrtFbUOTHN4J587iLKy0="; }; sourceRoot = "${src.name}/libs/core"; build-system = [ poetry-core ]; + pythonRelaxDeps = [ "tenacity" ]; + dependencies = [ jsonpatch langsmith @@ -117,8 +119,17 @@ buildPythonPackage rec { # TypeError: exceptions must be derived from Warning, not <class 'NoneType'> "test_chat_prompt_template_variable_names" "test_create_model_v2" + + # Comparison with magic strings + "test_prompt_with_chat_model" + "test_prompt_with_chat_model_async" + "test_prompt_with_llm" + "test_prompt_with_llm_parser" + "test_prompt_with_llm_and_async_lambda" + "test_prompt_with_chat_model_and_parser" + "test_combining_sequences" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.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" @@ -132,6 +143,9 @@ buildPythonPackage rec { homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/core"; changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ natsukium ]; + maintainers = with lib.maintainers; [ + natsukium + sarahec + ]; }; } diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix index 91866b412112..074f87ee135e 100644 --- a/pkgs/development/python-modules/langchain-huggingface/default.nix +++ b/pkgs/development/python-modules/langchain-huggingface/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "langchain-huggingface"; - version = "0.1.0"; + version = "0.1.2"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-huggingface==${version}"; - hash = "sha256-ESWhhjWjCbBV/3KjeSwEQzvK6os1mmc3at+8gonfGt4="; + hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20="; }; sourceRoot = "${src.name}/libs/partners/huggingface"; @@ -80,6 +80,9 @@ buildPythonPackage rec { 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 ]; + maintainers = with lib.maintainers; [ + natsukium + sarahec + ]; }; } diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix index 0a064621887c..0c1422bbeb59 100644 --- a/pkgs/development/python-modules/langchain-mongodb/default.nix +++ b/pkgs/development/python-modules/langchain-mongodb/default.nix @@ -65,6 +65,9 @@ buildPythonPackage rec { 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 ]; + maintainers = with lib.maintainers; [ + natsukium + sarahec + ]; }; } diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix index 82f0a776208a..e58b03a7d2cd 100644 --- a/pkgs/development/python-modules/langchain-openai/default.nix +++ b/pkgs/development/python-modules/langchain-openai/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "langchain-openai"; - version = "0.2.0"; + version = "0.2.5"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-openai==${version}"; - hash = "sha256-3wTSvvPOMZciEqPxpcjrcqEpK//qwsEmvZnlZBfjltQ="; + hash = "sha256-Gm7MAOuG+kYQ3TRTRdQXJ+HcoUz+iL9j+pTXz+zAySg="; }; sourceRoot = "${src.name}/libs/partners/openai"; @@ -96,6 +96,9 @@ buildPythonPackage rec { 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 ]; + maintainers = with lib.maintainers; [ + natsukium + sarahec + ]; }; } diff --git a/pkgs/development/python-modules/langchain-standard-tests/default.nix b/pkgs/development/python-modules/langchain-standard-tests/default.nix index 3bec0ee76be3..34a7b5c2adcc 100644 --- a/pkgs/development/python-modules/langchain-standard-tests/default.nix +++ b/pkgs/development/python-modules/langchain-standard-tests/default.nix @@ -21,12 +21,11 @@ buildPythonPackage rec { pname = "langchain-standard-tests"; - version = "0.1.1"; pyproject = true; # this is an internal library, so there are no tags # sync source with langchain-core for easy updates - inherit (langchain-core) src; + inherit (langchain-core) src version; sourceRoot = "${src.name}/libs/standard-tests"; build-system = [ poetry-core ]; @@ -51,6 +50,9 @@ buildPythonPackage rec { description = "Build context-aware reasoning applications"; homepage = "https://github.com/langchain-ai/langchain"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ natsukium ]; + maintainers = with lib.maintainers; [ + natsukium + sarahec + ]; }; } diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index a19f3ceb7d7e..aed23439349e 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -17,23 +17,21 @@ buildPythonPackage rec { pname = "langchain-text-splitters"; - version = "0.3.0"; + version = "0.3.2"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-text-splitters==${version}"; - hash = "sha256-Z0UAUhOjC0wgCY/f1aWsnjFyOPYz/6JnloEKT6b6Ii0="; + hash = "sha256-TaK8lnPxKUqwvKLtQIfzg2l8McQ1fd0g9vocHM0+kjY="; }; sourceRoot = "${src.name}/libs/text-splitters"; build-system = [ poetry-core ]; - dependencies = [ - langchain-core - ]; + dependencies = [ langchain-core ]; pythonImportsCheck = [ "langchain_text_splitters" ]; @@ -54,6 +52,9 @@ buildPythonPackage rec { 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"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fab ]; + maintainers = with lib.maintainers; [ + fab + sarahec + ]; }; } diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index c2184e84254f..ad7821606b96 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -12,6 +12,7 @@ # dependencies aiohttp, + httpx-sse, langchain-core, langchain-text-splitters, langsmith, @@ -42,14 +43,14 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.3.0"; + version = "0.3.7"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain==${version}"; - hash = "sha256-2dHsZWn1MN/gLnUdYp84gbtWkvB0j0iieij4W9tzPzY="; + hash = "sha256-TaK8lnPxKUqwvKLtQIfzg2l8McQ1fd0g9vocHM0+kjY="; }; sourceRoot = "${src.name}/libs/langchain"; @@ -58,8 +59,11 @@ buildPythonPackage rec { buildInputs = [ bash ]; + pythonRelaxDeps = [ "tenacity" ]; + dependencies = [ aiohttp + httpx-sse langchain-core langchain-text-splitters langsmith diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index 981b90bbc5ec..342459baea45 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "langcodes"; - version = "3.4.0"; + version = "3.4.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-rlp30aAdDR6RhUpnGJCJK3zpq7YBq3Mn/FyHT4meGXk="; + hash = "sha256-okh5/tI4ATrDryQkudESTji0o4sgRP0pfI/zjlkS5xg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix index 84879b365973..8319c140be52 100644 --- a/pkgs/development/python-modules/langfuse/default.nix +++ b/pkgs/development/python-modules/langfuse/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "langfuse"; - version = "2.45.1"; + version = "2.53.3"; pyproject = true; src = fetchFromGitHub { owner = "langfuse"; repo = "langfuse-python"; rev = "refs/tags/v${version}"; - hash = "sha256-CErrC5hVBrdUFYxN3JxAIo5eb/OGnISWfzClSwrrYLM="; + hash = "sha256-uhbCLDjOU13KAJcCXz03IPNICG5ZI16KIShY2sXPkp4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix new file mode 100644 index 000000000000..b40afc694f52 --- /dev/null +++ b/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + langgraph-checkpoint, + aiosqlite, + duckdb, + pytest-asyncio, + pytestCheckHook, + langgraph-sdk, + poetry-core, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "langgraph-checkpoint-duckdb"; + version = "2.0.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langgraph"; + rev = "refs/tags/checkpointduckdb==${version}"; + hash = "sha256-wSrlFBfTcTgyE46uwv9GCyxRT1xVafgWyP2g87KUTAU="; + }; + + sourceRoot = "${src.name}/libs/checkpoint-duckdb"; + + build-system = [ poetry-core ]; + + dependencies = [ + aiosqlite + duckdb + langgraph-checkpoint + ]; + + pythonImportsCheck = [ "langgraph.checkpoint.duckdb" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = [ "test_basic_store_ops" ]; # depends on networking + + passthru = { + updateScript = langgraph-sdk.updateScript; + }; + + meta = { + changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpointduckdb==${version}"; + description = "Library with a DuckDB implementation of LangGraph checkpoint saver"; + homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/checkpoint-duckdb"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + drupol + sarahec + ]; + }; +} diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix index adcd0856f027..ce958ca954f2 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "langgraph-checkpoint-postgres"; - version = "1.0.6"; + version = "2.0.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/checkpointpostgres==${version}"; - hash = "sha256-F9sgZQQBFs5hDUsaR5BI9ERve9L8LTUvEKOgyz5ioqY="; + hash = "sha256-E3gdHWUYelR/xI3Cv3T2uVwsyt+tOkw9MjX7I2RAuiQ="; }; postgresqlTestSetupPost = '' @@ -48,7 +48,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "psycopg-pool" ]; - doCheck = !(stdenvNoCC.isDarwin); + doCheck = !(stdenvNoCC.hostPlatform.isDarwin); pythonImportsCheck = [ "langgraph.checkpoint.postgres" ]; diff --git a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix index e94cca80eb54..9d4df9530640 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "langgraph-checkpoint-sqlite"; - version = "1.0.3"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/checkpointsqlite==${version}"; - hash = "sha256-/pHJtK691anqn2It4ZstCGXJS0JGtdKZvqS9f3ly+FQ="; + hash = "sha256-dh+cjcOp6rGFntz82VNfVyetcrQBdBFdXk5xFb0aR5c="; }; sourceRoot = "${src.name}/libs/checkpoint-sqlite"; diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix index 3857de5bd735..eccfbe11935c 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix @@ -5,15 +5,17 @@ fetchFromGitHub, langchain-core, langgraph-sdk, + msgpack, poetry-core, pytest-asyncio, + pytest-mock, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "langgraph-checkpoint"; - version = "1.0.9"; + version = "2.0.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +24,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/checkpoint==${version}"; - hash = "sha256-3gm+L67pPAKpY1kqnX1lPnca40KoBVZdRZ1Cy6D0dzU="; + hash = "sha256-Mjo6NJ6vYb2E7nk0D/2M7jzr39xRvRRhUZE4tP247to="; }; sourceRoot = "${src.name}/libs/checkpoint"; @@ -31,11 +33,16 @@ buildPythonPackage rec { dependencies = [ langchain-core ]; + propagatedBuildInputs = [ msgpack ]; + + pythonRelaxDeps = [ "msgpack" ]; # Can drop after msgpack 1.0.10 lands in nixpkgs + pythonImportsCheck = [ "langgraph.checkpoint" ]; nativeCheckInputs = [ dataclasses-json pytest-asyncio + pytest-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix index 710433dfe134..e2fa8f480fd8 100644 --- a/pkgs/development/python-modules/langgraph-sdk/default.nix +++ b/pkgs/development/python-modules/langgraph-sdk/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "langgraph-sdk"; - version = "0.1.30"; + version = "0.1.35"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/sdk==${version}"; - hash = "sha256-gI12XuxFplqIKVlVjeO60YxT7WG/SSsZ0aWfjg5bHIs="; + hash = "sha256-HWUGRoe5S0HPfOEbqUnFYLVrHe3SJtk3U8cy1JON050="; }; sourceRoot = "${src.name}/libs/sdk-py"; @@ -40,15 +40,15 @@ buildPythonPackage rec { 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 + set -eu -o pipefail +e nix-update --commit --version-regex '(.*)' python3Packages.langgraph nix-update --commit --version-regex 'sdk==(.*)' python3Packages.langgraph-sdk nix-update --commit --version-regex 'checkpoint==(.*)' python3Packages.langgraph-checkpoint + nix-update --commit --version-regex 'checkpointduckdb==(.*)' python3Packages.langgraph-checkpoint-duckdb nix-update --commit --version-regex 'checkpointpostgres==(.*)' python3Packages.langgraph-checkpoint-postgres nix-update --commit --version-regex 'checkpointsqlite==(.*)' python3Packages.langgraph-checkpoint-sqlite ''; diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix index 80e2faa68258..3750ff262179 100644 --- a/pkgs/development/python-modules/langgraph/default.nix +++ b/pkgs/development/python-modules/langgraph/default.nix @@ -10,12 +10,14 @@ # dependencies langchain-core, langgraph-checkpoint, + langgraph-sdk, # tests aiosqlite, dataclasses-json, grandalf, httpx, + langgraph-checkpoint-duckdb, langgraph-checkpoint-postgres, langgraph-checkpoint-sqlite, langsmith, @@ -29,21 +31,18 @@ syrupy, postgresql, postgresqlTestHook, - - # passthru - langgraph-sdk, }: buildPythonPackage rec { pname = "langgraph"; - version = "0.2.21"; + version = "0.2.43"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/${version}"; - hash = "sha256-1Ch2V85omAKnXK9rMihNtyjIoOvmVUm8Dbdo5GBoik4="; + hash = "sha256-8xTjWBq6GSl6X2IId3roS3ZNM/h76EGPitS08YQ4e7Y="; }; postgresqlTestSetupPost = '' @@ -58,19 +57,21 @@ buildPythonPackage rec { dependencies = [ langchain-core langgraph-checkpoint + langgraph-sdk ]; pythonImportsCheck = [ "langgraph" ]; # postgresql doesn't play nicely with the darwin sandbox: # FATAL: could not create shared memory segment: Operation not permitted - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ aiosqlite dataclasses-json grandalf httpx + langgraph-checkpoint-duckdb langgraph-checkpoint-postgres langgraph-checkpoint-sqlite langsmith @@ -88,7 +89,10 @@ buildPythonPackage rec { ]; disabledTests = [ - "test_doesnt_warn_valid_schema" # test is flaky due to pydantic error on the exception + # test is flaky due to pydantic error on the exception + "test_doesnt_warn_valid_schema" + "test_tool_node_inject_store" + # Disabling tests that requires to create new random databases "test_cancel_graph_astream" "test_cancel_graph_astream_events_v2" @@ -110,9 +114,7 @@ buildPythonPackage rec { "tests/test_pregel.py" ]; - passthru = { - updateScript = langgraph-sdk.updateScript; - }; + passthru.updateScript = langgraph-sdk.updateScript; meta = { description = "Build resilient language agents as graphs"; diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index f7bd15615c85..83c78c9bbc07 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -8,16 +8,17 @@ poetry-core, # dependencies + httpx, orjson, pydantic, requests, + requests-toolbelt, # tests anthropic, dataclasses-json, fastapi, freezegun, - httpx, instructor, pytest-asyncio, pytestCheckHook, @@ -27,14 +28,14 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.125"; + version = "0.1.137"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-0/ych7iP7G75R2kGaXzsxSy4jRYCvxeqd8aBq4QhRgI="; + hash = "sha256-nR3fb3MHBxFvI4qrsTpElLWTDUESZ8J78GsVoCGTIyQ="; }; sourceRoot = "${src.name}/python"; @@ -44,9 +45,11 @@ buildPythonPackage rec { build-system = [ poetry-core ]; dependencies = [ + httpx orjson pydantic requests + requests-toolbelt ]; nativeCheckInputs = [ @@ -54,12 +57,11 @@ buildPythonPackage rec { dataclasses-json fastapi freezegun - httpx instructor pytest-asyncio pytestCheckHook uvicorn - ] ++ lib.optionals stdenv.isLinux [ attr ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ attr ]; disabledTests = [ # These tests require network access diff --git a/pkgs/development/python-modules/lark/default.nix b/pkgs/development/python-modules/lark/default.nix index df891d96ed79..152cdd92598e 100644 --- a/pkgs/development/python-modules/lark/default.nix +++ b/pkgs/development/python-modules/lark/default.nix @@ -3,22 +3,19 @@ buildPythonPackage, fetchFromGitHub, regex, - pytestCheckHook, - pythonOlder, - js2py, setuptools, }: buildPythonPackage rec { pname = "lark"; - version = "1.1.9"; + version = "1.2.2"; format = "pyproject"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = "refs/tags/${version}"; - hash = "sha256-pWLKjELy10VNumpBHjBYCO2TltKsZx1GhQcGMHsYJNk="; + hash = "sha256-02NX/2bHTYSVTDLLudJmEU2DcQNn0Ke+5ayilKLlwqA="; }; nativeBuildInputs = [ setuptools ]; @@ -33,13 +30,8 @@ buildPythonPackage rec { "lark.grammars" ]; - # Js2py is not supported on 3.12 - doCheck = pythonOlder "3.12"; - - nativeCheckInputs = [ - js2py - pytestCheckHook - ]; + # Js2py is needed for tests but it's unmaintained and insecure + doCheck = false; meta = with lib; { description = "Modern parsing library for Python, implementing Earley & LALR(1) and an easy interface"; diff --git a/pkgs/development/python-modules/latexrestricted/default.nix b/pkgs/development/python-modules/latexrestricted/default.nix index 394176397b74..dfccf69e0563 100644 --- a/pkgs/development/python-modules/latexrestricted/default.nix +++ b/pkgs/development/python-modules/latexrestricted/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "latexrestricted"; - version = "0.4.0"; + version = "0.6.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-AMfDTruJKejDdXW98VkeeEwELql5566bsL1SutLDpso="; + hash = "sha256-/N5eC32OVN6qxWZAwAUlCIrMV2ARitiX3gaCPiSCRHs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/layoutparser/default.nix b/pkgs/development/python-modules/layoutparser/default.nix index 3b6b8165aea2..e6c5fcda855c 100644 --- a/pkgs/development/python-modules/layoutparser/default.nix +++ b/pkgs/development/python-modules/layoutparser/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build inputs numpy, - opencv4, + opencv-python, scipy, pandas, pillow, @@ -40,7 +40,7 @@ let torchvision effdet ]; - # paddledetection = [ paddlepaddle ] + # paddledetection = [ paddlepaddle ] }; in buildPythonPackage { @@ -54,14 +54,9 @@ buildPythonPackage { hash = "sha256-qBzcIUmgnGy/Xn/B+7UrLrRhCvCkapL+ymqGS2sMVgA="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "opencv-python" "opencv" - ''; - propagatedBuildInputs = [ numpy - opencv4 + opencv-python scipy pandas pillow @@ -96,7 +91,7 @@ buildPythonPackage { "tests_deps/test_only_paddledetection.py" # requires paddlepaddle not yet packaged ]; - passthru.optional-dependencies = optional-dependencies; + optional-dependencies = optional-dependencies; meta = with lib; { description = "Unified toolkit for Deep Learning Based Document Image Analysis"; diff --git a/pkgs/development/python-modules/lcd-i2c/default.nix b/pkgs/development/python-modules/lcd-i2c/default.nix index 27d9716cd128..554b30b9bfd0 100644 --- a/pkgs/development/python-modules/lcd-i2c/default.nix +++ b/pkgs/development/python-modules/lcd-i2c/default.nix @@ -1,9 +1,10 @@ { lib, - fetchPypi, buildPythonPackage, - smbus2, + fetchPypi, poetry-core, + pythonOlder, + smbus2, }: buildPythonPackage rec { @@ -11,14 +12,24 @@ buildPythonPackage rec { version = "0.2.3"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchPypi { inherit pname version; hash = "sha256-NYBaCXBmuTziT0WYEqrW10HRmRy3jpjH3YWQh5Y/TdQ="; }; - nativeBuildInputs = [ poetry-core ]; + pythonRelaxDeps = [ "smbus2" ]; + + build-system = [ poetry-core ]; + + dependencies = [ smbus2 ]; + + # Module has no tests + doCheck = false; - propagatedBuildInputs = [ smbus2 ]; + # Needs /dev/i2c-1 + # pythonImportsCheck = [ "lcd_i2c" ]; meta = with lib; { description = "Library for interacting with an I2C LCD screen through Python"; diff --git a/pkgs/development/python-modules/lcn-frontend/default.nix b/pkgs/development/python-modules/lcn-frontend/default.nix index 2ddb12711b41..206f6720f634 100644 --- a/pkgs/development/python-modules/lcn-frontend/default.nix +++ b/pkgs/development/python-modules/lcn-frontend/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "lcn-frontend"; - version = "0.1.6"; + version = "0.2.1"; pyproject = true; src = fetchPypi { pname = "lcn_frontend"; inherit version; - hash = "sha256-bOR2BFYHZjRVhlH72ljqp4WKtWdqBkzZNyrmtuIzmIM="; + hash = "sha256-GParXVKAbYI8zjBWjf7+uBCpMzLszp2nMxXhJkf4Ln4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/lcov-cobertura/default.nix b/pkgs/development/python-modules/lcov-cobertura/default.nix index 0f1697c7f62f..d04302c6a18e 100644 --- a/pkgs/development/python-modules/lcov-cobertura/default.nix +++ b/pkgs/development/python-modules/lcov-cobertura/default.nix @@ -3,12 +3,14 @@ buildPythonPackage, fetchPypi, pythonOlder, + setuptools, + distutils, }: buildPythonPackage rec { pname = "lcov-cobertura"; version = "2.0.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { @@ -17,7 +19,9 @@ buildPythonPackage rec { hash = "sha256-xs40e/PuZ/jV0CDNZiYmo1lM8r5yfMY0qg0R+j9/E3Q="; }; - doCheck = true; + build-system = [ setuptools ]; + dependencies = [ distutils ]; + pythonImportsCheck = [ "lcov_cobertura" ]; meta = { diff --git a/pkgs/development/python-modules/leaone-ble/default.nix b/pkgs/development/python-modules/leaone-ble/default.nix new file mode 100644 index 000000000000..5df616e5f8d6 --- /dev/null +++ b/pkgs/development/python-modules/leaone-ble/default.nix @@ -0,0 +1,52 @@ +{ + lib, + bluetooth-data-tools, + bluetooth-sensor-state-data, + buildPythonPackage, + fetchFromGitHub, + home-assistant-bluetooth, + poetry-core, + pytest-cov-stub, + pytestCheckHook, + pythonOlder, + sensor-state-data, +}: + +buildPythonPackage rec { + pname = "leaone-ble"; + version = "0.1.0"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "bluetooth-devices"; + repo = "leaone-ble"; + rev = "refs/tags/v${version}"; + hash = "sha256-usFjI0zU89dEAbmx9mVemoxlYS8mmLTKIMhH26Rvkeg="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + bluetooth-data-tools + bluetooth-sensor-state-data + home-assistant-bluetooth + sensor-state-data + ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; + + pythonImportsCheck = [ "leaone_ble" ]; + + meta = { + description = "Bluetooth parser for LeaOne devices"; + homepage = "https://github.com/bluetooth-devices/leaone-ble"; + changelog = "https://github.com/bluetooth-devices/leaone-ble/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 5010d8153032..4885fa14524e 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { python-gnupg python-u2flib-host websocket-client - ] ++ lib.optionals stdenv.isLinux [ bleak ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bleak ]; # No tests doCheck = false; diff --git a/pkgs/development/python-modules/ledgerwallet/default.nix b/pkgs/development/python-modules/ledgerwallet/default.nix index 8afa1ea14cb5..0cbc048ee670 100644 --- a/pkgs/development/python-modules/ledgerwallet/default.nix +++ b/pkgs/development/python-modules/ledgerwallet/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { buildInputs = [ setuptools setuptools-scm - ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; propagatedBuildInputs = [ cryptography click diff --git a/pkgs/development/python-modules/lektricowifi/default.nix b/pkgs/development/python-modules/lektricowifi/default.nix new file mode 100644 index 000000000000..b6b4a5142c3c --- /dev/null +++ b/pkgs/development/python-modules/lektricowifi/default.nix @@ -0,0 +1,58 @@ +{ + async-timeout, + buildPythonPackage, + fetchFromGitHub, + httpx, + lib, + pydantic, + pytest-asyncio, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "lektricowifi"; + version = "0.0.43"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Lektrico"; + repo = "lektricowifi"; + rev = "refs/tags/v.${version}"; + hash = "sha256-NwM1WpH6tS0iAVpG2gSFJpDPPn9nECHAzpOnWzeYPH4="; + }; + + postPatch = '' + substituteInPlace tests/test_mocked_devices.py \ + --replace-fail "from asyncmock import AsyncMock" "from unittest.mock import AsyncMock" + ''; + + build-system = [ setuptools ]; + + pythonRelaxDeps = [ + "pydantic" + ]; + + dependencies = [ + async-timeout + httpx + pydantic + ]; + + pythonImportsCheck = [ "lektricowifi" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + # AttributeError: type object 'InfoForCharger' has no attribute 'from_dict' + doCheck = false; + + meta = { + description = "Communication with Lektrico's chargers"; + homepage = "https://github.com/Lektrico/lektricowifi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index dab384316fb7..09e7f36d7f86 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -4,32 +4,34 @@ cmake, cython, fetchFromGitHub, + ninja, pytestCheckHook, pythonOlder, rapidfuzz, rapidfuzz-cpp, - scikit-build, + scikit-build-core, }: buildPythonPackage rec { pname = "levenshtein"; - version = "0.25.1"; + version = "0.26.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "Levenshtein"; rev = "refs/tags/v${version}"; - hash = "sha256-ye2XQL/ZQPlA4dy3tlr03WyGhfl7SaOXMt10cWHnW5o="; + hash = "sha256-uLOOAmJ8Y0z+tuIIOSnI8qZoZ+IA2+tNBX1lDCvc8+A="; fetchSubmodules = true; # # for vendored `rapidfuzz-cpp` }; - nativeBuildInputs = [ + build-system = [ cmake cython - scikit-build + ninja + scikit-build-core ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index 5338d892df34..6859fa08574f 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, libarchive, glibcLocales, mock, @@ -21,6 +22,14 @@ buildPythonPackage rec { sha256 = "sha256-CO9llPIbVTuE74AeohrMAu5ICkuT/MorRlYEEFne6Uk="; }; + patches = [ + (fetchpatch { + name = "fix-tests-with-recent-libarchive.patch"; + url = "https://github.com/Changaco/python-libarchive-c/commit/a56e9402c76c2fb9631651de7bae07b5fbb0b624.patch"; + hash = "sha256-OLwJQurEFAmwZJbQfhkibrR7Rcnc9vpWwBuhKxgmT7g="; + }) + ]; + LC_ALL = "en_US.UTF-8"; postPatch = '' diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 316c604750ab..ce56a19501cc 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { ''; meta = with lib; { + broken = true; description = "Communication library between internal components for Ultimaker software"; homepage = "https://github.com/Ultimaker/libArcus"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/libasyncns/default.nix b/pkgs/development/python-modules/libasyncns/default.nix index 730d1a9217d5..b81e67f8f926 100644 --- a/pkgs/development/python-modules/libasyncns/default.nix +++ b/pkgs/development/python-modules/libasyncns/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { patches = [ ./libasyncns-fix-res-consts.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace resquery.c \ --replace '<arpa/nameser.h>' '<arpa/nameser_compat.h>' ''; diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index a0863f9bfd1c..01dab0b558c6 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -23,23 +23,23 @@ buildPythonPackage rec { pname = "libcst"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { - owner = "instagram"; - repo = "libcst"; + owner = "Instagram"; + repo = "LibCST"; rev = "refs/tags/v${version}"; - hash = "sha256-H0YO8ILWOyhYdosNRWQQ9wziFk0syKSG3vF2zuYkL2k="; + hash = "sha256-0r2xQ8QVmA4I6eZHBWd/U1fQ8nK5rdblIoMACudOYPY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${src.name}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-AcqHn3A7WCVyVnOBD96k4pxokhzgmCWOipK/DrIAQkU="; + hash = "sha256-mexXuOsL1+F/GL2wMf/pwK7bJLFRgPtPSYE4W3E0VQ0="; }; cargoRoot = "native"; @@ -55,7 +55,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; dependencies = [ typing-extensions @@ -92,7 +92,7 @@ buildPythonPackage rec { meta = { description = "Concrete Syntax Tree (CST) parser and serializer library for Python"; - homepage = "https://github.com/Instagram/libcst"; + homepage = "https://github.com/Instagram/LibCST"; changelog = "https://github.com/Instagram/LibCST/blob/v${version}/CHANGELOG.md"; license = with lib.licenses; [ mit diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix index 7d0ce1a2ed28..abaccdefa96f 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.4.0"; + version = "3.4.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-BtESc9BIZeDNNPJYyMLTeMsNHm+xBcLueyJ7/1iXFos="; + hash = "sha256-NJmOm2PIbH4GeDN1XlKKeLePHGatDQlWDPJtn5tUO3s="; }; postPatch = '' diff --git a/pkgs/development/python-modules/libmambapy/default.nix b/pkgs/development/python-modules/libmambapy/default.nix index 37ed199cd8a9..40133e8d7079 100644 --- a/pkgs/development/python-modules/libmambapy/default.nix +++ b/pkgs/development/python-modules/libmambapy/default.nix @@ -22,14 +22,14 @@ }: buildPythonPackage rec { pname = "libmambapy"; - version = "2024.08.31"; + version = "2024.09.25"; pyproject = true; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = "refs/tags/${version}"; - hash = "sha256-RRHu0JM1okFprNIrQLLIYN7xZdZ+A6OuCZM5E1oPoFg="; + hash = "sha256-65XyIlIiUxLGoj11p9fNjauknlVyHPmaTK3LxY+XRV4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/librespot/default.nix b/pkgs/development/python-modules/librespot/default.nix index 628f2ab1922f..642b67cdac31 100644 --- a/pkgs/development/python-modules/librespot/default.nix +++ b/pkgs/development/python-modules/librespot/default.nix @@ -6,7 +6,9 @@ protobuf, pycryptodomex, pyogg, + pythonOlder, requests, + setuptools, websocket-client, zeroconf, }: @@ -14,7 +16,9 @@ buildPythonPackage rec { pname = "librespot"; version = "0.0.9"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "kokarare1212"; @@ -23,10 +27,13 @@ buildPythonPackage rec { hash = "sha256-k9qVsxjRlUZ7vCBx00quiAR7S+YkfyoZiAKVnOOG4xM="; }; + env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + pythonRelaxDeps = true; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ defusedxml protobuf pycryptodomex diff --git a/pkgs/development/python-modules/libretranslate/default.nix b/pkgs/development/python-modules/libretranslate/default.nix index 39a2b99ddf0d..dc02429a68f6 100644 --- a/pkgs/development/python-modules/libretranslate/default.nix +++ b/pkgs/development/python-modules/libretranslate/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "libretranslate"; - version = "1.6.1"; + version = "1.6.2"; pyproject = true; src = fetchFromGitHub { owner = "LibreTranslate"; repo = "LibreTranslate"; rev = "refs/tags/v${version}"; - hash = "sha256-c/MbO8KST2QnP32Y2FfXjJcfh6O7hqQFcZOn1U0FqRM="; + hash = "sha256-u0m9dTxwSGU50YplV24daSO+WY/At648OpIEZYMmqqo="; }; build-system = [ diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 9b015e335b75..2c9e2447e33c 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies.matplotlib = [ matplotlib ]; + optional-dependencies.matplotlib = [ matplotlib ]; # check that import works, this allows to capture errors like https://github.com/librosa/librosa/issues/1160 pythonImportsCheck = [ "librosa" ]; @@ -90,7 +90,7 @@ buildPythonPackage rec { pytestCheckHook resampy samplerate - ] ++ passthru.optional-dependencies.matplotlib; + ] ++ optional-dependencies.matplotlib; preCheck = '' export HOME=$TMPDIR @@ -106,7 +106,7 @@ buildPythonPackage rec { "test_cite_badversion" "test_cite_unreleased" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # crashing the python interpreter "test_unknown_time_unit" "test_unknown_wavaxis" diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix index 77c0d00d0fed..fc26b3248404 100644 --- a/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/pkgs/development/python-modules/libsoundtouch/default.nix @@ -2,28 +2,37 @@ lib, buildPythonPackage, fetchFromGitHub, - enum-compat, requests, websocket-client, zeroconf, pytestCheckHook, + setuptools, + pythonOlder, }: buildPythonPackage rec { pname = "libsoundtouch"; version = "0.8.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CharlesBlonde"; repo = "libsoundtouch"; - rev = version; - sha256 = "1wl2w5xfdkrv0qzsz084z2k6sycfyq62mqqgciycha3dywf2fvva"; + rev = "refs/tags/${version}"; + hash = "sha256-am8nHPdtKMh8ZA/jKgz2jnltpvgEga8/BjvP5nrhgvI="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "'enum-compat>=0.0.2'," "" + ''; + + build-system = [ setuptools ]; + + dependencies = [ requests - enum-compat websocket-client zeroconf ]; @@ -36,9 +45,12 @@ buildPythonPackage rec { "test_snapshot_restore" ]; + pythonImportsCheck = [ "libsoundtouch" ]; + meta = with lib; { description = "Bose Soundtouch Python library"; homepage = "https://github.com/CharlesBlonde/libsoundtouch"; license = licenses.asl20; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 0bb5cb5cda28..917b20ef077f 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -47,12 +47,12 @@ buildPythonPackage rec { # Assertion error "test_capture_pane_start" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # tests/test_pane.py:113: AssertionError "test_capture_pane_start" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_test.py" ]; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index 6dbb2c867112..d2a4acd7277e 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.5.0"; + version = "10.9.0"; pyproject = true; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - hash = "sha256-dPjT9PRoUzNrY79yejAW/sbkMr0fpLif7IKZIW/K3KI="; + hash = "sha256-/kjpB19X90btIewW+hjLjLagJvI5X2oIHXpcSZVtu2I="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix index 7e2233034389..c94dbe57e0fa 100644 --- a/pkgs/development/python-modules/license-expression/default.nix +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "license-expression"; - version = "30.3.1"; + version = "30.4.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { - owner = "nexB"; + owner = "aboutcode-org"; repo = "license-expression"; rev = "refs/tags/v${version}"; - hash = "sha256-+hINYDfUrNsCmXOIa4XO/ML1fJoB8/n6iQ4UGdw5ClE="; + hash = "sha256-RAgGg0Xekcw5H13YHmkgfL7eybK+4tA8EAvVTuWFRck="; }; dontConfigure = true; @@ -34,8 +34,8 @@ buildPythonPackage rec { meta = with lib; { description = "Utility library to parse, normalize and compare License expressions"; - homepage = "https://github.com/nexB/license-expression"; - changelog = "https://github.com/nexB/license-expression/blob/v${version}/CHANGELOG.rst"; + homepage = "https://github.com/aboutcode-org/license-expression"; + changelog = "https://github.com/aboutcode-org/license-expression/blob/v${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/lifelines/default.nix b/pkgs/development/python-modules/lifelines/default.nix index ec823cf5fbf4..1543ce87a885 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.29.0"; + version = "0.30.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "CamDavidsonPilon"; repo = "lifelines"; rev = "refs/tags/v${version}"; - hash = "sha256-9ZmecbFjUnWGNf4P3yphiMqG+/ktOYyvMtoZ6sEp1xY="; + hash = "sha256-rbt0eON8Az5jDvj97RDn3ppWyjbrSa/xumbwhq21g6g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 6e07d603b1b4..231b9e5c258c 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -29,7 +29,7 @@ boost, ocl-icd, opencl-headers, - gpuSupport ? stdenv.isLinux && !cudaSupport, + gpuSupport ? stdenv.hostPlatform.isLinux && !cudaSupport, cudaSupport ? config.cudaSupport, cudaPackages, }: @@ -84,7 +84,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - passthru.optional-dependencies = { + optional-dependencies = { arrow = [ cffi pyarrow diff --git a/pkgs/development/python-modules/lightning-utilities/default.nix b/pkgs/development/python-modules/lightning-utilities/default.nix index 4d437ac67c54..99a00df4ea0c 100644 --- a/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/pkgs/development/python-modules/lightning-utilities/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build @@ -19,14 +18,14 @@ buildPythonPackage rec { pname = "lightning-utilities"; - version = "0.11.7"; + version = "0.11.8"; pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "utilities"; rev = "refs/tags/v${version}"; - hash = "sha256-0XxBDe9OGQLfl4viuUm5Hx8WvZhSj+J0FoDqD/JOiZM="; + hash = "sha256-1npXzPqasgtI5KLq791hfneKFO5GrSiRdqfRd13//6M="; }; postPatch = '' diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index b7b634d38b1e..d1f78b740643 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -90,6 +90,12 @@ buildPythonPackage rec { async-etcd = [ aetcd ]; }; + env = { + # make protobuf compatible with old versions + # https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates + PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + }; + doCheck = pythonOlder "3.12"; # SystemError in protobuf nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 4c19f6e772c9..3e53e25e0b1d 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2024.5.30"; + version = "2024.8.26"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-uKJMeC1dXhQp1CGbtdnqmELFO64VWblhABGfpKHGCZQ="; + hash = "sha256-X1Nvm7bccwHn9KIKQuRb+mLzUwEdeiLNkzyxKa2Jk8Y="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/line-profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix index 0873eff17d0f..dce3a93374e0 100644 --- a/pkgs/development/python-modules/line-profiler/default.nix +++ b/pkgs/development/python-modules/line-profiler/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { scikit-build ]; - passthru.optional-dependencies = { + optional-dependencies = { ipython = [ ipython ]; }; nativeCheckInputs = [ pytestCheckHook ubelt - ] ++ passthru.optional-dependencies.ipython; + ] ++ optional-dependencies.ipython; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/linear-garage-door/default.nix b/pkgs/development/python-modules/linear-garage-door/default.nix index 1a8bfb796410..f3ea213b038b 100644 --- a/pkgs/development/python-modules/linear-garage-door/default.nix +++ b/pkgs/development/python-modules/linear-garage-door/default.nix @@ -23,14 +23,10 @@ buildPythonPackage rec { hash = "sha256-ibOCqy7krIVC7N75SwEyUII3Tknb60nwA+zGbjOENv4="; }; - postPatch = '' - sed -i pyproject.toml \ - -e "/--cov/d" \ - -e "/--no-cov/d" - ''; - build-system = [ poetry-core ]; + pythonRelaxDeps = [ "tenacity" ]; + dependencies = [ aiohttp dnspython diff --git a/pkgs/development/python-modules/linear-operator/default.nix b/pkgs/development/python-modules/linear-operator/default.nix index ab402c37aa79..e32b3f2c8f7b 100644 --- a/pkgs/development/python-modules/linear-operator/default.nix +++ b/pkgs/development/python-modules/linear-operator/default.nix @@ -9,35 +9,36 @@ setuptools-scm, torch, typeguard, - wheel, }: buildPythonPackage rec { pname = "linear-operator"; - version = "0.5.2"; - format = "pyproject"; + version = "0.5.3"; + pyproject = true; src = fetchFromGitHub { owner = "cornellius-gp"; repo = "linear_operator"; rev = "refs/tags/v${version}"; - hash = "sha256-OuE6jx9Q4IU+b2a+mrglRdBOReN1tt/thetNXxwk1GI="; + hash = "sha256-fKDVaHyaneV6MafJd/RT2InZO5cuYoC36YgzQhfIH8g="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ + dependencies = [ jaxtyping scipy torch typeguard ]; - pythonRelaxDeps = [ "typeguard" ]; + pythonRelaxDeps = [ + "jaxtyping" + "typeguard" + ]; pythonImportsCheck = [ "linear_operator" ]; @@ -46,6 +47,7 @@ buildPythonPackage rec { disabledTests = [ # flaky numerical tests "test_matmul_matrix_broadcast" + "test_solve_matrix_broadcast" "test_svd" ]; diff --git a/pkgs/development/python-modules/lineax/default.nix b/pkgs/development/python-modules/lineax/default.nix new file mode 100644 index 000000000000..2680211c58fa --- /dev/null +++ b/pkgs/development/python-modules/lineax/default.nix @@ -0,0 +1,66 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies + equinox, + jax, + jaxtyping, + typing-extensions, + + # tests + beartype, + pytest, + python, +}: + +buildPythonPackage rec { + pname = "lineax"; + version = "0.0.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "patrick-kidger"; + repo = "lineax"; + rev = "refs/tags/v${version}"; + hash = "sha256-HcFI55Ww/y7ZaUkawj7xWSb7VDTBec3u0ulWL8kTm2c="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + equinox + jax + jaxtyping + typing-extensions + ]; + + pythonImportsCheck = [ "lineax" ]; + + nativeCheckInputs = [ + beartype + pytest + ]; + + # Intentionaly not using pytest directly as it leads to JAX out-of-memory'ing + # https://github.com/patrick-kidger/lineax/blob/1909d190c1963d5f2d991508c1b2714f2266048b/tests/README.md + checkPhase = '' + runHook preCheck + + ${python.interpreter} -m tests + + runHook postCheck + ''; + + meta = { + description = "Linear solvers in JAX and Equinox"; + homepage = "https://github.com/patrick-kidger/lineax"; + changelog = "https://github.com/patrick-kidger/lineax/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/linien-common/default.nix b/pkgs/development/python-modules/linien-common/default.nix index f95b9af606cf..c2dfa51bbf2a 100644 --- a/pkgs/development/python-modules/linien-common/default.nix +++ b/pkgs/development/python-modules/linien-common/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "linien-common"; - version = "2.0.4"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "linien-org"; repo = "linien"; rev = "refs/tags/v${version}"; - hash = "sha256-TCQ1jLZpeQlG/ZyWY0qrHceMJ1TH7AYO7toYc74ZWq4="; + hash = "sha256-j6oiP/usLfV5HZtKLcXQ5pHhhxRG05kP2FMwingiWm0="; }; sourceRoot = "${src.name}/linien-common"; diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index c05d3bbc75a2..e98a78f9bc1d 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -6,6 +6,7 @@ setuptools, requests, polling, + deprecated, pytestCheckHook, mock, httpretty, @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "linode-api"; - version = "5.16.0"; + version = "5.22.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "linode"; repo = "python-linode-api"; rev = "refs/tags/v${version}"; - hash = "sha256-B90BfuAqyncJPIvcni7bthiwSfmeL9CqeTYT1/y5TNY="; + hash = "sha256-f9v9xhlOfSCKEWHmzi/tpoMIXccGwA6isoAAIZOf3r4="; }; nativeBuildInputs = [ setuptools ]; @@ -31,6 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests polling + deprecated ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/lit/default.nix b/pkgs/development/python-modules/lit/default.nix index bce9db1f7ec3..a70b9ba08f73 100644 --- a/pkgs/development/python-modules/lit/default.nix +++ b/pkgs/development/python-modules/lit/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "lit"; - version = "18.1.7"; + version = "18.1.8"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Ld2b4mvcxtoDrqPsRWxpRetaCdveVI01AL/5uO1HY7s="; + hash = "sha256-R8F0oYaUGugw8E3tdqNERgC+Z9Xl+4KCw3g/umccTts="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index decda0e7425b..89f32222a762 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.47.0"; + version = "1.51.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-onFBSClB+FDbpc7VYkm2jks8G6L/LGsZq9tyFW+uHZc="; + hash = "sha256-jC5BiD4JFfsiyNOSlY6rH6l3Dk6AKKXJ8+Q6MTGYTpM="; }; build-system = [ poetry-core ]; @@ -65,7 +65,7 @@ buildPythonPackage rec { tokenizers ]; - passthru.optional-dependencies = { + optional-dependencies = { proxy = [ apscheduler backoff diff --git a/pkgs/development/python-modules/littleutils/default.nix b/pkgs/development/python-modules/littleutils/default.nix index b4c4eb4ac3c2..a349c0ded16d 100644 --- a/pkgs/development/python-modules/littleutils/default.nix +++ b/pkgs/development/python-modules/littleutils/default.nix @@ -3,20 +3,27 @@ buildPythonPackage, fetchPypi, pythonOlder, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "littleutils"; - version = "0.2.2"; - format = "setuptools"; + version = "0.2.4"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5srjpCA+Uw1RyWZ+0xD/47GUjyh249aWBbPeS32WkW8="; + hash = "sha256-x4NbAQIM7ULikRGLfXj7FrwtmhtPP0LzyzeHu02lPRk="; }; + build-system = [ + setuptools + setuptools-scm + ]; + # Module has no tests doCheck = false; diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index 8e409c9fe79a..1da515654a97 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-cloud"; - version = "0.0.17"; + version = "0.1.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_cloud"; inherit version; - hash = "sha256-f9aFe7u5GTdTVXLMtI2qOBifVc3XQRGF2Ag9qym6Epk="; + hash = "sha256-bwFVl5vZYWCVHLgSxIg28frOA3vHnM/Y0YWxjvTJ+vg="; }; build-system = [ poetry-core ]; 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 434d12ba8ff8..4835a3240510 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.3.1"; + version = "0.3.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_agent_openai"; inherit version; - hash = "sha256-QcmqW3zrxQQ63ds0QuMWfpeXFYlGbjZEjgTgp2f1uao="; + hash = "sha256-gONAjZcSG+vKP6P/0UtRKFhwwcPHPU7gTT0Yz+YEBGY="; }; pythonRelaxDeps = [ "llama-index-llms-openai" ]; diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index bf0c5af4b8c4..be4eef72fa7e 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -6,13 +6,13 @@ deprecated, dirtyjson, fetchFromGitHub, - fetchzip, fsspec, jsonpath-ng, llamaindex-py-client, nest-asyncio, networkx, nltk, + nltk-data, numpy, openai, pandas, @@ -33,21 +33,9 @@ typing-inspect, }: -let - stopwords = fetchzip { - url = "https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/stopwords.zip"; - hash = "sha256-tX1CMxSvFjr0nnLxbbycaX/IBnzHFxljMZceX5zElPY="; - }; - - punkt = fetchzip { - url = "https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/tokenizers/punkt.zip"; - hash = "sha256-SKZu26K17qMUg7iCFZey0GTECUZ+sTTrF/pqeEgJCos="; - }; -in - buildPythonPackage rec { pname = "llama-index-core"; - version = "0.11.10"; + version = "0.11.20"; pyproject = true; disabled = pythonOlder "3.8"; @@ -56,7 +44,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-6wQs6hB609Du5/n5sKJT5E0OJCj3dMKvpKxJ9C75HpI="; + hash = "sha256-r4xedtxoYv6CcxtDrgwau9LY3kOBg3jXlQm1g59L7x4="; }; sourceRoot = "${src.name}/${pname}"; @@ -67,14 +55,16 @@ buildPythonPackage rec { # Setting `NLTK_DATA` to a writable path can also solve this problem, but it needs to be done in # every package that depends on `llama-index-core` for `pythonImportsCheck` not to fail, so this # solution seems more elegant. - patchPhase = '' + postPatch = '' mkdir -p llama_index/core/_static/nltk_cache/corpora/stopwords/ - cp -r ${stopwords}/* llama_index/core/_static/nltk_cache/corpora/stopwords/ + cp -r ${nltk-data.stopwords}/corpora/stopwords/* llama_index/core/_static/nltk_cache/corpora/stopwords/ mkdir -p llama_index/core/_static/nltk_cache/tokenizers/punkt/ - cp -r ${punkt}/* llama_index/core/_static/nltk_cache/tokenizers/punkt/ + cp -r ${nltk-data.punkt}/tokenizers/punkt/* llama_index/core/_static/nltk_cache/tokenizers/punkt/ ''; + pythonRelaxDeps = [ "tenacity" ]; + build-system = [ poetry-core ]; dependencies = [ @@ -139,6 +129,8 @@ buildPythonPackage rec { # Tests require network access "test_from_namespaced_persist_dir" "test_from_persist_dir" + # asyncio.exceptions.InvalidStateError: invalid state + "test_workflow_context_to_dict_mid_run" ]; meta = with lib; { 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 76dcdacb5c1e..7bd5e2d40021 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-gemini"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_gemini"; inherit version; - hash = "sha256-7ftu+Gh8Ar9+yrFkUldlAvUfVtAw+xzrmyzqr7TeQdc="; + hash = "sha256-TA3dm1+NZ0Km9Li9cswzm5fusVYXTRqA9W3U4OgT92I="; }; pythonRelaxDeps = [ "google-generativeai" ]; 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 62fe9f466002..9b16410ab4f4 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.3.2"; + version = "0.3.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neo4j"; inherit version; - hash = "sha256-O/iTlpbREmN1tbojbaqZ7gLAN2JdKmKEzhKCnpth6S0="; + hash = "sha256-r3/bxG4EZmeJ5fa4mmE2OTlbvGN780rsze5HoKQssiY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix index b731a56dcbce..81592cb086e7 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neptune"; - version = "0.2.0"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neptune"; inherit version; - hash = "sha256-dIbleh/I90xo7rYFXhCck2kfkywAYTlrawlPP0gDqIY="; + hash = "sha256-0dT1T5DJEXBvCilwf4YZVZ2H43piI6xkpUGGpKu8GsY="; }; 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 5df8e8d96046..7445ff6453ae 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 @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-indices-managed-llama-cloud"; - version = "0.3.1"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_indices_managed_llama_cloud"; inherit version; - hash = "sha256-9ifxAtFZBfFWGFIrbsKJWM2G17mzebmXLa7YkQU0LR0="; + hash = "sha256-++v/eHaiGbarlokq58QyqSmRlfq49n1KSg6/baIQskI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-legacy/default.nix b/pkgs/development/python-modules/llama-index-legacy/default.nix index f51ae416bb1d..5ab6bd06bba3 100644 --- a/pkgs/development/python-modules/llama-index-legacy/default.nix +++ b/pkgs/development/python-modules/llama-index-legacy/default.nix @@ -20,6 +20,8 @@ buildPythonPackage rec { hash = "sha256-9pafEIXvsKvr1jZ+RvNRICDz9rnAhvRYpRmDDdYeggY="; }; + pythonRelaxDeps = [ "tenacity" ]; + build-system = [ poetry-core ]; dependencies = [ llama-index-core ]; 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 27fb27b54028..04bb0ddd0caa 100644 --- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-ollama"; - version = "0.3.2"; + version = "0.3.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_ollama"; inherit version; - hash = "sha256-t0W9a3vZAEI9IttLIcza/WwjvjG/0C8jdwahejCPipw="; + hash = "sha256-Vt9uGIcIGvRSL57DK+LUYy2NTyYZ9yqnHqYJZiMeVKA="; }; build-system = [ poetry-core ]; 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 8b113fe587a1..3ac980fd6ac3 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.2.9"; + version = "0.2.16"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-VjdvOeOkAlO1xPuQ0Ptq8JPyG7KTWSVhXwwooo0CgYc="; + hash = "sha256-fGZt0nBWwnigef9F1T8fv8jtNjdkqnuu7i4D30f5Byo="; }; pythonRemoveDeps = [ 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 aa71aea79b97..333780fc2f68 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.2.1"; + version = "0.2.3"; 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-G1vmkdX6KGH9S1oHGIPclNgts+HH/2hthN2EBIo1THs="; + hash = "sha256-jrm38f85Vu8JeeIbyD5qiF5AmHtxmfGV5GUl0G465AI="; }; build-system = [ poetry-core ]; 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 e25ec90e1fef..7a12cf4bf4ab 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.2.1"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-x/kgdISfxZsQBJ1JakrlJmmr/LFZoZnZoROFKi/tcLg="; + hash = "sha256-SEWfkJYLhjc3FHtm7YOv7JzomE+O2iVhttJQAhQ2XbI="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix index 6ab0835a135c..629d27c8e554 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-chroma"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_chroma"; inherit version; - hash = "sha256-n6fGNgXB4pbhea1e5QT0Co/sVnd8r3L5+pVCut5U2Uw="; + hash = "sha256-3vFadjVLtGWLFrrbklN6cudmJz1eVmsFdUYQBdpThH8="; }; build-system = [ poetry-core ]; 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 9a93709fb11c..dae67d644021 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.2.5"; + version = "0.2.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_postgres"; inherit version; - hash = "sha256-JLJygIsklBM9B3mOeQP8fu6YuHo104rvJKNj83eAQc4="; + hash = "sha256-x6KOZMZ5W8F8FATH3ZAwAeyrZ/rvjzrEooaFgQsSATQ="; }; 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 b45bfd7c0bd5..92fe05098613 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.3.0"; + version = "0.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_qdrant"; inherit version; - hash = "sha256-mWY86wyS3aVd+cBhY8pCvn6w86Z0AdWrjOlz987Wg6I="; + hash = "sha256-YpecQB3OHi7id/Mvu73dn+gcXjXzVZR5+Sr0KwkIbDs="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix index 9026edb15344..bc8719d4de36 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.5.6"; + version = "0.5.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-PHTaEkbJvdYdY7f8ISBA6i29IY1H/JhqGOOXTmRZG4A="; + hash = "sha256-4kFgbPNXRCXfdsD10BoxqVx5LG+++AqvcvjtZEi9FxU="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 4fa525fa4db2..a110a8082c14 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { ''; # On Darwin, the test requires macFUSE to be installed outside of Nix. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ pytestCheckHook which diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix index bd5a3e34a4a4..568c57683215 100644 --- a/pkgs/development/python-modules/llm/default.nix +++ b/pkgs/development/python-modules/llm/default.nix @@ -1,19 +1,16 @@ { lib, - buildPythonApplication, buildPythonPackage, fetchFromGitHub, - makeWrapper, pytestCheckHook, - python, pythonOlder, - ruff, setuptools, click-default-group, numpy, openai, pip, pluggy, + puremagic, pydantic, python-ulid, pyyaml, @@ -25,7 +22,7 @@ let llm = buildPythonPackage rec { pname = "llm"; - version = "0.16"; + version = "0.17.1"; pyproject = true; build-system = [ setuptools ]; @@ -36,7 +33,7 @@ let owner = "simonw"; repo = "llm"; rev = "refs/tags/${version}"; - hash = "sha256-ew8080Lv1ObjUaGicaGrj8IXXA7rtdgcWhp41O8gfVE="; + hash = "sha256-6OO0SIIxChM5HRJoUM4CYGbsINmc3i+iyL/oahLHhrY="; }; patches = [ ./001-disable-install-uninstall-commands.patch ]; @@ -47,6 +44,7 @@ let openai pip pluggy + puremagic pydantic python-ulid pyyaml diff --git a/pkgs/development/python-modules/llmx/default.nix b/pkgs/development/python-modules/llmx/default.nix index d5ddcfdaec42..aa1b526782da 100644 --- a/pkgs/development/python-modules/llmx/default.nix +++ b/pkgs/development/python-modules/llmx/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { web = [ fastapi uvicorn diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 9d76e64fde35..19941cd4b4a3 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { cd $out ''; - __impureHostDeps = lib.optionals stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; + __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ "/usr/lib/libm.dylib" ]; passthru = lib.optionalAttrs (!withStaticLLVM) { inherit llvm; }; diff --git a/pkgs/development/python-modules/lm-format-enforcer/default.nix b/pkgs/development/python-modules/lm-format-enforcer/default.nix index f615bea4926c..3abbc92bcc5c 100644 --- a/pkgs/development/python-modules/lm-format-enforcer/default.nix +++ b/pkgs/development/python-modules/lm-format-enforcer/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "lm-format-enforcer"; - version = "0.10.7"; + version = "0.10.9"; pyproject = true; src = fetchFromGitHub { owner = "noamgat"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-25/qnSKBXbyAnasNYuv+LV2U2KLipKtH6B+wXlH6eRs="; + hash = "sha256-8+hve/6YezM07+4BmmBEAPZ0B2d8xDguXoHf7FuQWP8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index 4ebb8c0b4185..35dcd72230f2 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -2,13 +2,17 @@ lib, buildPythonPackage, fetchPypi, + setuptools, + setuptools-scm, dill, dnslib, dnspython, plux, pyaes, + pyotp, python-jose, requests, + python-dateutil, tabulate, # Sensitive downstream dependencies @@ -17,41 +21,40 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "3.5.0"; - format = "setuptools"; + version = "3.7.2"; + pyproject = true; src = fetchPypi { pname = "localstack_ext"; inherit version; - hash = "sha256-tJNgNqCzlebbDOOgkScOKaf04bLTVIjP+BaFiDLo/Gs="; + hash = "sha256-gd+HyZnezgtKrSKJOYtxUZHTPMrrpKWQHGvaIs9FyVs="; }; - postPatch = '' - # Avoid circular dependency - sed -i '/localstack>=/d' setup.cfg - - # Pip is unable to resolve attr logic, so it will emit version as 0.0.0 - substituteInPlace setup.cfg \ - --replace "version = attr: localstack_ext.__version__" "version = ${version}" - cat setup.cfg + build-system = [ + setuptools + setuptools-scm + ]; - substituteInPlace setup.cfg \ - --replace "dill==0.3.2" "dill~=0.3.0" \ - --replace "requests>=2.20.0,<2.26" "requests~=2.20" - ''; + pythonRemoveDeps = [ + # Avoid circular dependency + "localstack" + "build" + ]; - propagatedBuildInputs = [ + dependencies = [ dill dnslib dnspython plux pyaes + pyotp python-jose requests tabulate - ]; + python-dateutil + ] ++ python-jose.optional-dependencies.cryptography; - pythonImportsCheck = [ "localstack_ext" ]; + pythonImportsCheck = [ "localstack" ]; # No tests in repo doCheck = false; @@ -60,10 +63,10 @@ buildPythonPackage rec { inherit localstack; }; - meta = with lib; { + meta = { description = "Extensions for LocalStack"; homepage = "https://github.com/localstack/localstack"; - license = licenses.asl20; + license = lib.licenses.asl20; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/development/python-modules/localstack/default.nix index 637e411ea65e..08f03e1856f8 100644 --- a/pkgs/development/python-modules/localstack/default.nix +++ b/pkgs/development/python-modules/localstack/default.nix @@ -19,22 +19,26 @@ rich, semver, setuptools, + setuptools-scm, tailer, }: buildPythonPackage rec { pname = "localstack"; - version = "3.6.0"; + version = "3.7.2"; pyproject = true; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; rev = "refs/tags/v${version}"; - hash = "sha256-MAECVYO6+1JqSZN8PFvHcMWizeYBUnU+7o7l48uwpv4="; + hash = "sha256-8xdP/qpmfqmXDt1gNhzkAGlBR6dJYznKr9+/Un6N7mA="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ apispec @@ -77,5 +81,6 @@ buildPythonPackage rec { homepage = "https://github.com/localstack/localstack"; license = licenses.asl20; maintainers = [ ]; + mainProgram = "localstack"; }; } diff --git a/pkgs/development/python-modules/logbook/default.nix b/pkgs/development/python-modules/logbook/default.nix index 62a00fa1c8fa..5750985977a3 100644 --- a/pkgs/development/python-modules/logbook/default.nix +++ b/pkgs/development/python-modules/logbook/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { execnet = [ execnet ]; sqlalchemy = [ sqlalchemy ]; redis = [ redis ]; @@ -52,7 +52,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index b3ec041169fe..216a20663381 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/test_type_hinting.py" # avoid dependency on mypy - ] ++ lib.optionals stdenv.isDarwin [ "tests/test_multiprocessing.py" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_multiprocessing.py" ]; disabledTests = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { # Slow test "test_time_rotation" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" diff --git a/pkgs/development/python-modules/logutils/default.nix b/pkgs/development/python-modules/logutils/default.nix index eb0e1ebd5368..df79cc9dc3e4 100644 --- a/pkgs/development/python-modules/logutils/default.nix +++ b/pkgs/development/python-modules/logutils/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { "test_hashandlers" ]; - disabledTestPaths = lib.optionals (stdenv.isDarwin) [ + disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin) [ # Exception: unable to connect to Redis server "tests/test_redis.py" ]; diff --git a/pkgs/development/python-modules/loompy/default.nix b/pkgs/development/python-modules/loompy/default.nix new file mode 100644 index 000000000000..1240a01be03a --- /dev/null +++ b/pkgs/development/python-modules/loompy/default.nix @@ -0,0 +1,56 @@ +{ + lib, + fetchPypi, + buildPythonPackage, + h5py, + numpy, + scipy, + numba, + click, + numpy-groupies, + setuptools, + pytestCheckHook, +}: +let + finalAttrs = { + pname = "loompy"; + version = "3.0.7"; + pyproject = true; + + src = fetchPypi { + inherit (finalAttrs) pname version; + hash = "sha256-tc33tUc0xr7ToYHRGUevcK8sbg3K3AL9Docd8jL6qPQ="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + h5py + numpy + scipy + numba + click + numpy-groupies + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + # Deprecated numpy attributes access + disabledTests = [ + "test_scan_with_default_ordering" + "test_get" + ]; + + pythonImportsCheck = [ "loompy" ]; + + meta = { + changelog = "https://github.com/linnarsson-lab/loompy/releases"; + description = "Python implementation of the Loom file format"; + homepage = "https://github.com/linnarsson-lab/loompy"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ theobori ]; + mainProgram = "loompy"; + }; + }; +in +buildPythonPackage finalAttrs diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index b2f376ef48b6..067d8b06c969 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.19.10"; + version = "1.20.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "refs/tags/v${version}"; - hash = "sha256-3DDL3r7pApDyBQd/eUEbR0KG3cpVOmozNcCsKyGx67Y="; + hash = "sha256-1CxcA9/FvKP3P0Q02by0hBHQTAcbfLCp3AualHhZyvY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix index 27bfd2092388..f85a1f134eba 100644 --- a/pkgs/development/python-modules/lsassy/default.nix +++ b/pkgs/development/python-modules/lsassy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "lsassy"; - version = "3.1.11"; + version = "3.1.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Hackndo"; repo = "lsassy"; rev = "refs/tags/v${version}"; - hash = "sha256-boPFrmPqaHpezxXM3VM50i+n+n+gXkuwP4ErpMpN/AI="; + hash = "sha256-Idel52GAzir+SVgKfMU+e8Z0EkMf+PBdIcaQd0o8qJE="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/ltpycld2/default.nix b/pkgs/development/python-modules/ltpycld2/default.nix index 7635b631170c..510259d72d6e 100644 --- a/pkgs/development/python-modules/ltpycld2/default.nix +++ b/pkgs/development/python-modules/ltpycld2/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { homepage = "https://github.com/LibreTranslate/pycld2"; license = licenses.asl20; maintainers = with maintainers; [ misuzu ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index cabfcea92cc3..b5e957b54d65 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.5.3"; + version = "0.5.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-ccLWHjgxG/si08ie1F409FUmefuzVjNwcTt9Og4TU68="; + hash = "sha256-ekemsCs3Ils8ovDTzyi6aQ4Z0bnfTKpuQYBeh1MA94Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lxml-html-clean/default.nix b/pkgs/development/python-modules/lxml-html-clean/default.nix index 3b0308fe24c7..1a5990bb8423 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.2.2"; + version = "0.3.1"; 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-DiHbO2m/JckdXFMU7/LAW2hkyskqWtrQ93sgsVcdDSo="; + hash = "sha256-LNfsqvBYxhUANiftDp6aYb5UWnP7/NvDEZcSSn+l20Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index bc09e20503e9..0a0bef5219ca 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "lxml"; - version = "5.2.2"; + version = "5.3.0"; pyproject = true; src = fetchFromGitHub { owner = "lxml"; repo = "lxml"; rev = "refs/tags/lxml-${version}"; - hash = "sha256-c9r2uqjXmQOXyPCsJTzi1OatkQ9rhJbKqpxaoFz2l18="; + hash = "sha256-xhKtqsh5FfgXt1fKUhN/Aib/004P7epArv3/XxDSBtw="; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs @@ -33,7 +33,7 @@ buildPythonPackage rec { libxslt.dev cython setuptools - ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ]; buildInputs = [ libxml2 libxslt diff --git a/pkgs/development/python-modules/lzallright/default.nix b/pkgs/development/python-modules/lzallright/default.nix index 697acafb6ed6..ee5be2d8dc44 100644 --- a/pkgs/development/python-modules/lzallright/default.nix +++ b/pkgs/development/python-modules/lzallright/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; pythonImportsCheck = [ "lzallright" ]; diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index 75f1e94f3bb2..e9615872fdaf 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -12,15 +12,14 @@ buildPythonPackage rec { pname = "m2crypto"; - version = "0.41.0"; + version = "0.42.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "M2Crypto"; - inherit version; - hash = "sha256-OhNYx+6EkEbZF4Knd/F4a/AnocHVG1+vjxlDW/w/FJU="; + inherit pname version; + hash = "sha256-QrYt8sr2IxYbHWQ6cjVGTC/ioxBQSevEmKbUfcCPZLQ="; }; build-system = [ setuptools ]; @@ -31,7 +30,7 @@ buildPythonPackage rec { env = { - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ "-Wno-error=implicit-function-declaration" "-Wno-error=incompatible-pointer-types" ]); diff --git a/pkgs/development/python-modules/macholib/default.nix b/pkgs/development/python-modules/macholib/default.nix new file mode 100644 index 000000000000..6bf2ec3eeeb7 --- /dev/null +++ b/pkgs/development/python-modules/macholib/default.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + unittestCheckHook, + altgraph, + setuptools, + typing-extensions, + pyinstaller, +}: + +buildPythonPackage rec { + pname = "macholib"; + version = "1.16.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ronaldoussoren"; + repo = pname; + rev = "v${version}"; + hash = "sha256-bTql10Ceny4fBCxnEWz1m1wi03EWMDW9u99IQiWYbnY="; + }; + + build-system = [ setuptools ]; + + dependencies = + [ + altgraph + ] + ++ lib.optionals (pythonOlder "3.11") [ + typing-extensions + ]; + + # Checks assume to find darwin specific libraries + doCheck = stdenv.buildPlatform.isDarwin; + nativeCheckInputs = [ + unittestCheckHook + ]; + + passthru.tests = { + inherit pyinstaller; # Requires macholib for darwin + }; + + preCheck = '' + export PATH="$PATH:$out/bin" + ''; + + meta = with lib; { + description = "Analyze and edit Mach-O headers, the executable format used by Mac OS X."; + homepage = "https://github.com/ronaldoussoren/macholib"; + changelog = "https://github.com/ronaldoussoren/macholib/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ eveeifyeve ]; + }; +} 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 55bc5da3fd35..d98cfa259579 100644 --- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { mock ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # these tests fail in Darwin's sandbox "src/wormhole_mailbox_server/test/test_web.py" ]; 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 bf8b990fe0d9..761e7deff0e9 100644 --- a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -4,23 +4,28 @@ fetchPypi, setuptools, autobahn, - mock, twisted, - pythonOlder, - pythonAtLeast, + python, pytestCheckHook, }: buildPythonPackage rec { pname = "magic-wormhole-transit-relay"; - version = "0.2.1"; + version = "0.4.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-y0gBtGiQ6v+XKG4OP+xi0dUv/jF9FACDtjNqH7To+l4="; + hash = "sha256-kS2DXaIbESZsdxEdybXlgAJj/AuY8KF5liJn30GBnow="; }; + postPatch = '' + # Passing the environment to twistd is necessary to preserve Python's site path. + substituteInPlace src/wormhole_transit_relay/test/test_backpressure.py --replace-fail \ + 'reactor.spawnProcess(proto, exe, args)' \ + 'reactor.spawnProcess(proto, exe, args, None)' + ''; + build-system = [ setuptools ]; dependencies = [ @@ -33,19 +38,21 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - mock twisted ]; __darwinAllowLocalNetworking = true; + postCheck = '' + # Avoid collision with twisted's plugin cache (#164775). + rm "$out/${python.sitePackages}/twisted/plugins/dropin.cache" + ''; + 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 e765a52cc76f..87404ab5b21e 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -2,7 +2,7 @@ lib, stdenv, buildPythonPackage, - fetchPypi, + fetchFromGitHub, # build-system setuptools, @@ -36,12 +36,14 @@ buildPythonPackage rec { pname = "magic-wormhole"; - version = "0.15.0"; + version = "0.17.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-viVjtcVUe6MzvGYI8EgATI821VYTm/L/49n0HaJ5cAY="; + src = fetchFromGitHub { + owner = "magic-wormhole"; + repo = "magic-wormhole"; + rev = "refs/tags/${version}"; + hash = "sha256-BxPF4iQ91wLBagdvQ/Y89VIZBkMxFiEHnK+BU55Bwr4="; }; postPatch = @@ -52,7 +54,7 @@ buildPythonPackage rec { 'return "${placeholder "out"}/bin/wormhole"' '' # fix the location of the ifconfig binary - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py ''; @@ -74,21 +76,25 @@ buildPythonPackage rec { zipstream-ng ] ++ autobahn.optional-dependencies.twisted ++ twisted.optional-dependencies.tls; - passthru.optional-dependencies = { + optional-dependencies = { dilation = [ noiseprotocol ]; }; 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 ] + lib.optionals + (!magic-wormhole-mailbox-server.meta.broken && !magic-wormhole-transit-relay.meta.broken) + [ + magic-wormhole-mailbox-server + magic-wormhole-transit-relay + ] ++ [ mock pytestCheckHook ] - ++ passthru.optional-dependencies.dilation - ++ lib.optionals stdenv.isDarwin [ unixtools.locale ]; + ++ optional-dependencies.dilation + ++ lib.optionals stdenv.hostPlatform.isDarwin [ unixtools.locale ]; __darwinAllowLocalNetworking = true; @@ -101,10 +107,10 @@ buildPythonPackage rec { "src/wormhole/test/dilate/test_full.py" "src/wormhole/test/test_args.py" "src/wormhole/test/test_cli.py" + "src/wormhole/test/test_transit.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/magicgui/default.nix b/pkgs/development/python-modules/magicgui/default.nix index 06476b9d9243..a996573f3078 100644 --- a/pkgs/development/python-modules/magicgui/default.nix +++ b/pkgs/development/python-modules/magicgui/default.nix @@ -1,37 +1,46 @@ { lib, buildPythonPackage, + docstring-parser, fetchFromGitHub, - setuptools-scm, + hatch-vcs, + hatchling, + napari, # a reverse-dependency, for tests + psygnal, + pyside2, pytestCheckHook, + pythonOlder, + superqt, typing-extensions, - qtpy, - pyside2, - psygnal, - docstring-parser, - napari, # a reverse-dependency, for tests }: + buildPythonPackage rec { pname = "magicgui"; - version = "0.5.1"; + version = "0.9.1"; + pyproject = true; - format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "napari"; + owner = "pyapp-kit"; repo = "magicgui"; rev = "refs/tags/v${version}"; - hash = "sha256-fVfBQaaT8/lUGqZRXjOPgvkC01Izb8Sxqn7RCqnW9bo="; + hash = "sha256-6ye29HtGQ8iwYE2kQ1wWIBC+bzFsMZmJR4eTXWwu7+U="; }; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ + build-system = [ + hatch-vcs + hatchling + ]; + + dependencies = [ typing-extensions - qtpy + superqt pyside2 psygnal docstring-parser ]; + nativeCheckInputs = [ pytestCheckHook ]; doCheck = false; # Reports "Fatal Python error" @@ -43,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Build GUIs from python functions, using magic. (napari/magicgui)"; homepage = "https://github.com/napari/magicgui"; + changelog = "https://github.com/pyapp-kit/magicgui/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ SomeoneSerge ]; }; diff --git a/pkgs/development/python-modules/magika/default.nix b/pkgs/development/python-modules/magika/default.nix index 0c670a813741..444f4d844ea3 100644 --- a/pkgs/development/python-modules/magika/default.nix +++ b/pkgs/development/python-modules/magika/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { maintainers = with maintainers; [ mihaimaruseac ]; mainProgram = "magika"; # Currently, disabling on AArch64 as it onnx runtime crashes on ofborg - broken = stdenv.isAarch64 && stdenv.isLinux; + broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux; }; } diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index 144aae89c79d..307ed168acdb 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -49,10 +49,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "mahotas" ]; - disabled = stdenv.isi686; # Failing tests + disabled = stdenv.hostPlatform.isi686; # Failing tests meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Computer vision package based on numpy"; homepage = "https://mahotas.readthedocs.io/"; maintainers = with maintainers; [ luispedro ]; diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index 5a3084ae84cf..226fe1878de2 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -4,33 +4,45 @@ python, glibcLocales, fetchFromGitHub, + pytest-cov-stub, + pytestCheckHook, + setuptools, six, - simplejson, }: buildPythonPackage rec { pname = "mail-parser"; - version = "3.15.0"; - format = "setuptools"; + version = "4.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "SpamScope"; - repo = pname; - rev = "v${version}"; - sha256 = "0da2qr4p8jnjw6jdhbagm6slfcjnjyyjkszwfcfqvcywh1zm1sdw"; + repo = "mail-parser"; + rev = "refs/tags/${version}"; + hash = "sha256-WpV1WJFwzAquPXimew86YpEp++dnkIiBe5E4lMBDl7w="; }; LC_ALL = "en_US.utf-8"; nativeBuildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ - simplejson + + build-system = [ setuptools ]; + + pythonRemoveDeps = [ "ipaddress" ]; + + dependencies = [ six ]; + pythonImportsCheck = [ "mailparser" ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; + # Taken from .travis.yml - checkPhase = '' - ${python.interpreter} tests/test_main.py + postCheck = '' ${python.interpreter} -m mailparser -v ${python.interpreter} -m mailparser -h ${python.interpreter} -m mailparser -f tests/mails/mail_malformed_3 -j diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index 06aabd241b55..af96457afa4e 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "6.0.9"; + version = "6.0.11"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8X6Qf/5vb67cJD9X6wyclR9h3smvjpaSLB3NCTOJuI0="; + hash = "sha256-vySQ4mo6msOFdgg44/zHMhpr4ZgP2tV0bQe2OgZHmqI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mailsuite/default.nix b/pkgs/development/python-modules/mailsuite/default.nix index 4b0aeca1431b..f6cb1a2a2330 100644 --- a/pkgs/development/python-modules/mailsuite/default.nix +++ b/pkgs/development/python-modules/mailsuite/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "mailsuite"; - version = "1.9.15"; + version = "1.9.16"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-R4nAphydamZojQR7pro5Y3dZg3nYK0+X5lFBMJUpCfw="; + hash = "sha256-rfavOOivttXXmdA/Nl3jUmXIUQrjxDDZ8cHcNIJQL6U="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix index 6a727d666f59..dfbf49de3da6 100644 --- a/pkgs/development/python-modules/makefun/default.nix +++ b/pkgs/development/python-modules/makefun/default.nix @@ -13,20 +13,20 @@ buildPythonPackage rec { pname = "makefun"; - version = "1.15.4"; + version = "1.15.6"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-n5uZBOfDl3WTdKiPTFd4H7qypFjex430s+5ics2fsBA="; + hash = "sha256-JrxjRCphgvt17+2LUXQd0tHbLxdr7Ixk4gpYYla48Uk="; }; postPatch = '' - substituteInPlace setup.cfg \ - --replace "pytest-runner" "" + substituteInPlace pyproject.toml \ + --replace-fail '"setuptools>=39.2,<72"' '"setuptools"' ''; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/mako/default.nix b/pkgs/development/python-modules/mako/default.nix index 5e58f90b58d8..0735cf8f2c9e 100644 --- a/pkgs/development/python-modules/mako/default.nix +++ b/pkgs/development/python-modules/mako/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ markupsafe ]; - passthru.optional-dependencies = { + optional-dependencies = { babel = [ babel ]; lingua = [ lingua ]; }; @@ -48,7 +48,7 @@ buildPythonPackage rec { chameleon mock pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = lib.optionals isPyPy [ diff --git a/pkgs/development/python-modules/mamba-ssm/default.nix b/pkgs/development/python-modules/mamba-ssm/default.nix new file mode 100644 index 000000000000..11ac68c1e19d --- /dev/null +++ b/pkgs/development/python-modules/mamba-ssm/default.nix @@ -0,0 +1,77 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + causal-conv1d, + einops, + ninja, + setuptools, + torch, + transformers, + triton, + cudaPackages, + rocmPackages, + config, + cudaSupport ? config.cudaSupport, + which, +}: + +buildPythonPackage rec { + pname = "mamba"; + version = "2.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "state-spaces"; + repo = "mamba"; + rev = "refs/tags/v${version}"; + hash = "sha256-R702JjM3AGk7upN7GkNK8u1q4ekMK9fYQkpO6Re45Ng="; + }; + + build-system = [ + ninja + setuptools + torch + ]; + + nativeBuildInputs = [ which ]; + + buildInputs = ( + lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_cudart # cuda_runtime.h, -lcudart + cuda_cccl + libcusparse # cusparse.h + libcusolver # cusolverDn.h + cuda_nvcc + libcublas + ] + ) + ); + + dependencies = [ + causal-conv1d + einops + torch + transformers + triton + ]; + + env = { + MAMBA_FORCE_BUILD = "TRUE"; + } // lib.optionalAttrs cudaSupport { CUDA_HOME = "${lib.getDev cudaPackages.cuda_nvcc}"; }; + + # pytest tests not enabled due to nvidia GPU dependency + pythonImportsCheck = [ "mamba_ssm" ]; + + meta = with lib; { + description = "Linear-Time Sequence Modeling with Selective State Spaces"; + homepage = "https://github.com/state-spaces/mamba"; + license = licenses.asl20; + maintainers = with maintainers; [ cfhammill ]; + # The package requires CUDA or ROCm, the ROCm build hasn't + # been completed or tested, so broken if not using cuda. + broken = !cudaSupport; + }; +} diff --git a/pkgs/development/python-modules/mando/default.nix b/pkgs/development/python-modules/mando/default.nix index 9d60bf3eddb8..d6b8055a730c 100644 --- a/pkgs/development/python-modules/mando/default.nix +++ b/pkgs/development/python-modules/mando/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mando"; - version = "0.7.1"; + version = "0.8.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "rubik"; repo = "mando"; rev = "v${version}"; - hash = "sha256-Ylrrfo57jqGuWEqCa5RyTT9AagBpUvAfviHkyJPFv08="; + hash = "sha256-FuQZ53ojrQO++0TN0C3hk0LXH+mcfRqtGq8VvfYDufg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/mandown/default.nix b/pkgs/development/python-modules/mandown/default.nix index 942643cc457c..17c8b691b4a8 100644 --- a/pkgs/development/python-modules/mandown/default.nix +++ b/pkgs/development/python-modules/mandown/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { typer ]; - passthru.optional-dependencies = { + optional-dependencies = { gui = [ pyside6 ]; updateScript = nix-update-script { }; }; diff --git a/pkgs/development/python-modules/manga-ocr/default.nix b/pkgs/development/python-modules/manga-ocr/default.nix index 03de5065e011..e5ee0bf3c36a 100644 --- a/pkgs/development/python-modules/manga-ocr/default.nix +++ b/pkgs/development/python-modules/manga-ocr/default.nix @@ -1,48 +1,30 @@ { lib, fetchFromGitHub, - buildPythonPackage, - fire, - fugashi, - jaconv, - loguru, - numpy, - pillow, - pyperclip, - torch, - transformers, - unidic-lite, - pythonOlder, + python3Packages, }: + +with python3Packages; + buildPythonPackage rec { pname = "manga-ocr"; - version = "0.1.11"; + version = "0.1.12"; disabled = pythonOlder "3.7"; + format = "pyproject"; src = fetchFromGitHub { owner = "kha-white"; - repo = pname; + repo = "manga-ocr"; rev = "refs/tags/v${version}"; - hash = "sha256-cLmgHBt6HvhY6Hb9yQ425Gk181axnMr+Mp2LxSmPoDg="; + hash = "sha256-uSWnrHS59fNcF7ve3imMwwNJ+/dmplBAavbDoBkEgGc="; }; - preBuild = '' - # remove subproject dedicated to model training - rm -rf manga_ocr_dev - # copy assets/example.jpg inside the package - # required by https://github.com/kha-white/manga-ocr/blob/ba1b0d94a8ef6676b618ba4e5ffe8ce2ab655270/manga_ocr/ocr.py#L27-L30 - # see also package_data.patch - mkdir manga_ocr/assets - cp assets/example.jpg manga_ocr/assets/example.jpg - ''; - - patches = [ - # instruct setuptool to copy assets/example.jpg to package when building wheel - ./package_data.patch + build-system = [ + setuptools + setuptools-scm ]; - propagatedBuildInputs = [ - # taken from requirements.txt + dependencies = [ fire fugashi jaconv diff --git a/pkgs/development/python-modules/manga-ocr/package_data.patch b/pkgs/development/python-modules/manga-ocr/package_data.patch deleted file mode 100644 index 6c643f669d3c..000000000000 --- a/pkgs/development/python-modules/manga-ocr/package_data.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/setup.py b/setup.py ---- a/setup.py -+++ b/setup.py -@@ -18,6 +18,9 @@ setup( - ], - packages=['manga_ocr'], - include_package_data=True, -+ package_data={ -+ 'manga_ocr': ['assets/example.jpg'], -+ }, - install_requires=[ - "fire", \ No newline at end of file diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix index d1ca10b9e81c..940dc355e482 100644 --- a/pkgs/development/python-modules/manhole/default.nix +++ b/pkgs/development/python-modules/manhole/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { # {test_locals,test_socket_path} fail to remove /tmp/manhole-socket # on the x86_64-darwin builder. # - # TODO: change this back to `doCheck = stdenv.isLinux` after + # TODO: change this back to `doCheck = stdenv.hostPlatform.isLinux` after # https://github.com/ionelmc/python-manhole/issues/54 is fixed doCheck = false; diff --git a/pkgs/development/python-modules/manifest-ml/default.nix b/pkgs/development/python-modules/manifest-ml/default.nix index 7eeec2a60fee..80d80d51f934 100644 --- a/pkgs/development/python-modules/manifest-ml/default.nix +++ b/pkgs/development/python-modules/manifest-ml/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { xxhash ]; - passthru.optional-dependencies = { + optional-dependencies = { api = [ accelerate # deepspeed @@ -84,7 +84,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix index b52039bf7fba..ceaef4f91f14 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.8"; + version = "1.8.1"; format = "pyproject"; src = fetchPypi { inherit version; pname = "manifestoo_core"; - hash = "sha256-AjvwG9j2TILslTR4GwK6eHfql4l7I+QIwUd6XQ2ojmg="; + hash = "sha256-aULT5xxkWEndzEBVcpwvWlIXQYxwfF0VxoI6EHC3JAs="; }; nativeBuildInputs = [ hatch-vcs ]; diff --git a/pkgs/development/python-modules/manifold3d/default.nix b/pkgs/development/python-modules/manifold3d/default.nix new file mode 100644 index 000000000000..62852fe60a0c --- /dev/null +++ b/pkgs/development/python-modules/manifold3d/default.nix @@ -0,0 +1,86 @@ +{ + lib, + buildPythonPackage, + python, + fetchFromGitHub, + scikit-build-core, + cmake, + ninja, + nanobind, + pkg-config, + numpy, + clipper2, + tbb, + glm, + pytestCheckHook, + trimesh, +}: + +let + # archived library, but manifold3d has removed this on master + thrust-src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "thrust"; + rev = "refs/tags/2.1.0"; + hash = "sha256-U9WgRZva7R/bNOF5VZTvIwIQDQDD3/bRO08j2TPLl9Q="; + fetchSubmodules = true; + }; + +in + +buildPythonPackage rec { + pname = "manifold3d"; + version = "2.5.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "elalish"; + repo = "manifold"; + rev = "refs/tags/v${version}"; + hash = "sha256-0zjS4ygt85isP1jyiTCeD/umhQ8ffIN+u2CeLeybX9U="; + fetchSubmodules = true; + }; + + dontUseCmakeConfigure = true; + + build-system = [ + scikit-build-core + cmake + ninja + nanobind + pkg-config + ]; + + dependencies = [ + numpy + ]; + + buildInputs = [ + glm + tbb + clipper2 + ]; + + env.SKBUILD_CMAKE_DEFINE = "FETCHCONTENT_SOURCE_DIR_THRUST=${thrust-src}"; + + nativeCheckInputs = [ + pytestCheckHook + trimesh + ]; + + preCheck = '' + ${python.interpreter} bindings/python/examples/run_all.py + ''; + + pythonImportsCheck = [ + "manifold3d" + ]; + + meta = { + description = "Geometry library for topological robustness"; + homepage = "https://github.com/elalish/manifold"; + changelog = "https://github.com/elalish/manifold/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/development/python-modules/manim-slides/default.nix b/pkgs/development/python-modules/manim-slides/default.nix index 0ef0941b2ba3..e1d349a8e848 100644 --- a/pkgs/development/python-modules/manim-slides/default.nix +++ b/pkgs/development/python-modules/manim-slides/default.nix @@ -15,7 +15,7 @@ jinja2, lxml, numpy, - opencv4, + opencv-python, pillow, pydantic, pydantic-extra-types, @@ -35,7 +35,7 @@ }: buildPythonPackage rec { pname = "manim-slides"; - version = "5.1.7"; + version = "5.1.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "jeertmans"; repo = "manim-slides"; rev = "refs/tags/v${version}"; - hash = "sha256-egQYL4Qvs1fQcJ5WEM461TSYqs2XN39wbyfx9uEFeIs="; + hash = "sha256-0csCUJpIeq3EyER9gqiUgqrfHL9WSzX144Y0djL3dqQ="; }; build-system = [ @@ -52,8 +52,6 @@ buildPythonPackage rec { hatch-fancy-pypi-readme ]; - pythonRemoveDeps = [ "opencv-python" ]; - pythonRelaxDeps = [ "rtoml" "qtpy" @@ -67,7 +65,7 @@ buildPythonPackage rec { jinja2 lxml numpy - opencv4 + opencv-python pillow pydantic pydantic-extra-types diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix index d96b03dfd35a..8ebb32020b1f 100644 --- a/pkgs/development/python-modules/manim/default.nix +++ b/pkgs/development/python-modules/manim/default.nix @@ -12,12 +12,8 @@ texliveInfraOnly, click, - click-default-group, cloup, - colour, - grpcio, - grpcio-tools, - importlib-metadata, + decorator, isosurfaces, jupyterlab, manimpango, @@ -25,6 +21,7 @@ moderngl, moderngl-window, networkx, + notebook, numpy, pillow, pycairo, @@ -37,6 +34,7 @@ srt, svgelements, tqdm, + typing-extensions, watchdog, }: @@ -188,7 +186,7 @@ buildPythonPackage rec { hash = "sha256-o+Wl3NMK6yopcsRVFtZuUE9c1GABa5d8rbQNHDJ4OiQ="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; @@ -205,20 +203,18 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace "--no-cov-on-fail --cov=manim --cov-report xml --cov-report term" "" + + substituteInPlace manim/_config/default.cfg \ + --replace "ffmpeg_executable = ffmpeg" "ffmpeg_executable = ${lib.getExe ffmpeg}" ''; buildInputs = [ cairo ]; - propagatedBuildInputs = [ + dependencies = [ click - click-default-group cloup - colour - grpcio - grpcio-tools - importlib-metadata + decorator isosurfaces - jupyterlab manimpango mapbox-earcut moderngl @@ -236,9 +232,19 @@ buildPythonPackage rec { srt svgelements tqdm + typing-extensions watchdog ]; + optional-dependencies = { + jupyterlab = [ + jupyterlab + notebook + ]; + # TODO package dearpygui + # gui = [ dearpygui ]; + }; + makeWrapperArgs = [ "--prefix" "PATH" diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index c0f8e475b365..9197d44043e8 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -3,44 +3,46 @@ stdenv, buildPythonPackage, fetchFromGitHub, - python, pkg-config, + setuptools, pango, cython, AppKit, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "manimpango"; - version = "0.5.0"; - format = "setuptools"; + version = "0.6.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ManimCommunity"; - repo = pname; + repo = "manimpango"; rev = "refs/tags/v${version}"; - hash = "sha256-EBSbvjQyQIXOzvQMbuTwOoV8xSAOYDlCBZ56NLneuQI="; + hash = "sha256-nN+XOnki8fG7URMy2Fhs2X+yNi8Y7wDo53d61xaRa3w="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pango ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = [ pango ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; - propagatedBuildInputs = [ cython ]; + build-system = [ + setuptools + cython + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov --no-cov-on-fail" "" - ''; - - preBuild = '' - ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace + preCheck = '' + rm -r manimpango ''; pythonImportsCheck = [ "manimpango" ]; diff --git a/pkgs/development/python-modules/mapbox/default.nix b/pkgs/development/python-modules/mapbox/default.nix deleted file mode 100644 index 80555ea8c008..000000000000 --- a/pkgs/development/python-modules/mapbox/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - buildPythonPackage, - boto3, - cachecontrol, - fetchFromGitHub, - iso3166, - python-dateutil, - requests, - responses, - polyline, - pytestCheckHook, - uritemplate, -}: - -buildPythonPackage rec { - pname = "mapbox"; - version = "0.18.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "mapbox"; - repo = "mapbox-sdk-py"; - rev = "0.18.0"; - sha256 = "123wsa4j11ps5pkjgylbmw4gnzh2vi22swgmvy50w26glkszh075"; - }; - - propagatedBuildInputs = [ - boto3 - cachecontrol - iso3166 - python-dateutil - requests - polyline - uritemplate - ]; - nativeCheckInputs = [ - pytestCheckHook - responses - ]; - - meta = with lib; { - homepage = "https://github.com/mapbox/mapbox-sdk-py"; - license = licenses.mit; - description = "Mapbox SDK for Python"; - longDescription = "Low-level client API for Mapbox web services."; - maintainers = with maintainers; [ ersin ]; - # ImportError: cannot import name 'Mapping' from 'collections' - # and archived upstreamed - broken = true; - }; -} diff --git a/pkgs/development/python-modules/mapclassify/default.nix b/pkgs/development/python-modules/mapclassify/default.nix index 67fac8b840f2..9a01fd479016 100644 --- a/pkgs/development/python-modules/mapclassify/default.nix +++ b/pkgs/development/python-modules/mapclassify/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mapclassify"; - version = "2.8.0"; + version = "2.8.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "pysal"; repo = "mapclassify"; rev = "refs/tags/v${version}"; - hash = "sha256-JrFKWkMUu8rjJJb1KK8+R9ANkLhTPf1EmWpzhfE7MAE="; + hash = "sha256-VClkMOR8P9sX3slVjJ2xYYLVnvZuOgVYZiCGrBxoZEc="; }; build-system = [ setuptools-scm ]; @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = { description = "Classification Schemes for Choropleth Maps"; homepage = "https://pysal.org/mapclassify/"; + changelog = "https://github.com/pysal/mapclassify/releases/tag/v${version}"; license = lib.licenses.bsd3; maintainers = lib.teams.geospatial.members; }; diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 5ed9926e1063..3d135bd357f0 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -2,13 +2,17 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, - setuptools, + + # build-system + hatchling, + + # dependencies click, docutils, itsdangerous, jedi, markdown, + narwhals, packaging, psutil, pygments, @@ -19,25 +23,25 @@ uvicorn, websockets, pyyaml, - pytestCheckHook, + + # tests + versionCheckHook, }: buildPythonPackage rec { pname = "marimo"; - version = "0.8.15"; + version = "0.9.14"; pyproject = true; - disabled = pythonOlder "3.8"; - + # The github archive does not include the static assets src = fetchPypi { inherit pname version; - hash = "sha256-S+lhoyM8s6wLFq1oGJMdzq+s+Uhn76qMgbkMUwpVr44="; + hash = "sha256-Q3dnRuAS8B4cWvF04GGg5OOZtmAJPKa2fHwnoO2DXDs="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; - # ruff is not packaged as a python module in nixpkgs - pythonRemoveDeps = [ "ruff" ]; + pythonRelaxDeps = [ "websockets" ]; dependencies = [ click @@ -45,6 +49,7 @@ buildPythonPackage rec { itsdangerous jedi markdown + narwhals packaging psutil pygments @@ -57,17 +62,21 @@ buildPythonPackage rec { pyyaml ]; - nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "marimo" ]; - meta = with lib; { + # The pypi archive does not contain tests so we do not use `pytestCheckHook` + nativeCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + + meta = { description = "Reactive Python notebook that's reproducible, git-friendly, and deployable as scripts or apps"; homepage = "https://github.com/marimo-team/marimo"; changelog = "https://github.com/marimo-team/marimo/releases/tag/${version}"; - license = licenses.asl20; + license = lib.licenses.asl20; mainProgram = "marimo"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ akshayka dmadisetti ]; diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index 1754ec45b76e..3f0af08d192a 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -50,17 +50,17 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-regressions pytestCheckHook - ] ++ passthru.optional-dependencies.linkify; + ] ++ optional-dependencies.linkify; # disable and remove benchmark tests preCheck = '' rm -r benchmarking ''; - doCheck = !stdenv.isi686; + doCheck = !stdenv.hostPlatform.isi686; pythonImportsCheck = [ "markdown_it" ]; - passthru.optional-dependencies = { + optional-dependencies = { compare = [ commonmark markdown diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index f0858ca0da90..f99269fb3608 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "markdown"; - version = "3.6"; + version = "3.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Python-Markdown"; repo = "markdown"; rev = "refs/tags/${version}"; - hash = "sha256-jGo9/ZS2EhMDl/o1ref7Owqckuc7am578Ojmcz2aWIE="; + hash = "sha256-bIBen693MC56k4LZ+8vhbvP+E3myFXoaXpNHOlnIdG8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix index 77f5fe0fc656..25412d4c0009 100644 --- a/pkgs/development/python-modules/markdown2/default.nix +++ b/pkgs/development/python-modules/markdown2/default.nix @@ -35,12 +35,10 @@ buildPythonPackage rec { runHook postCheck ''; - passthru.optional-dependencies = { + optional-dependencies = { code_syntax_highlighting = [ pygments ]; wavedrom = [ wavedrom ]; - all = lib.flatten ( - lib.attrValues (lib.filterAttrs (n: v: n != "all") passthru.optional-dependencies) - ); + all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); }; meta = with lib; { diff --git a/pkgs/development/python-modules/markdownify/default.nix b/pkgs/development/python-modules/markdownify/default.nix index b6d8fa20ba6c..12a3fcac60c6 100644 --- a/pkgs/development/python-modules/markdownify/default.nix +++ b/pkgs/development/python-modules/markdownify/default.nix @@ -2,26 +2,32 @@ lib, beautifulsoup4, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, pythonOlder, setuptools, + setuptools-scm, six, }: buildPythonPackage rec { pname = "markdownify"; - version = "0.12.1"; + version = "0.13.1"; pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-H7CMYYsw4O56MaObmY9EoY+yirJU9V9K8GttNaIXnic="; + src = fetchFromGitHub { + owner = "matthewwithanm"; + repo = "python-markdownify"; + rev = "refs/tags/${version}"; + hash = "sha256-EqQ4DKIGaMNivw9cWCSP/Mh+1YxyTaHGPYRjGxPFOnA="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ beautifulsoup4 diff --git a/pkgs/development/python-modules/marko/default.nix b/pkgs/development/python-modules/marko/default.nix new file mode 100644 index 000000000000..d5aaf83d76c0 --- /dev/null +++ b/pkgs/development/python-modules/marko/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pdm-backend, + pygments, + objprint, + python-slugify, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "marko"; + version = "2.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "frostming"; + repo = "marko"; + rev = "refs/tags/v${version}"; + hash = "sha256-KqdBYmlVs00atXy7MSsriRBnL7w13io2oFZ0IyJ2Om4="; + }; + + build-system = [ + pdm-backend + ]; + + optional-dependencies = { + codehilite = [ + pygments + ]; + repr = [ + objprint + ]; + toc = [ + python-slugify + ]; + }; + + pythonImportsCheck = [ + "marko" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ optional-dependencies.toc ++ optional-dependencies.codehilite; + + meta = { + changelog = "https://github.com/frostming/marko/blob/${src.rev}/CHANGELOG.md"; + description = "Markdown parser with high extensibility"; + homepage = "https://github.com/frostming/marko"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index 5b4a039ae280..6e69ea0488c4 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, # build-system @@ -19,18 +19,19 @@ buildPythonPackage rec { pname = "markupsafe"; - version = "2.1.5"; + version = "3.0.2"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "MarkupSafe"; - inherit version; - hash = "sha256-0oPTeokLpMGuc/+t+ARkNcdue8Ike7tjwAvRpwnGVEs="; + src = fetchFromGitHub { + owner = "pallets"; + repo = "markupsafe"; + rev = "refs/tags/${version}"; + hash = "sha256-BqCkQqPhjEx3qB/k3d3fSirR/HDBa7e4kpx3/VSwXJM="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -46,7 +47,7 @@ buildPythonPackage rec { }; meta = with lib; { - changelog = "https://markupsafe.palletsprojects.com/en/${versions.majorMinor version}.x/changes/#version-${ + changelog = "https://markupsafe.palletsprojects.com/page/changes/#version-${ replaceStrings [ "." ] [ "-" ] version }"; description = "Implements a XML/HTML/XHTML Markup safe string"; diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 587e81985532..ae7e59177af8 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -7,13 +7,13 @@ marshmallow, packaging, sqlalchemy, - pytest-lazy-fixture, + pytest-lazy-fixtures, pytestCheckHook, }: buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "marshmallow_sqlalchemy"; inherit version; - hash = "sha256-IKDy/N1b3chkRPoBRh8X+bahKo3dTKjJs0/i8uNdAKI="; + hash = "sha256-KrCS2iadr6igXVGlhAmvcajSGDlYukcUMSfdI54DWdg="; }; build-system = [ flit-core ]; @@ -35,7 +35,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "marshmallow_sqlalchemy" ]; nativeCheckInputs = [ - pytest-lazy-fixture + pytest-lazy-fixtures pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix index 153eb0298fce..2b28c29da244 100644 --- a/pkgs/development/python-modules/mashumaro/default.nix +++ b/pkgs/development/python-modules/mashumaro/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mashumaro"; - version = "3.13.1"; + version = "3.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,14 +27,14 @@ buildPythonPackage rec { owner = "Fatal1ty"; repo = "mashumaro"; rev = "refs/tags/v${version}"; - hash = "sha256-Km3RuDU77L3N2RQBhpcEztOjYtQhTXFZoGKu70g5EPU="; + hash = "sha256-0THj22KdMvD5O3dNwXKxs2wRIJziPmojLo4BPa3fZ3Y="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ typing-extensions ]; + dependencies = [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { orjson = [ orjson ]; msgpack = [ msgpack ]; yaml = [ pyyaml ]; @@ -46,7 +46,7 @@ buildPythonPackage rec { pendulum pytest-mock pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "mashumaro" ]; diff --git a/pkgs/development/python-modules/mastodon-py/default.nix b/pkgs/development/python-modules/mastodon-py/default.nix index b8b93bc84eaa..e8c80177cbf5 100644 --- a/pkgs/development/python-modules/mastodon-py/default.nix +++ b/pkgs/development/python-modules/mastodon-py/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { six ]; - passthru.optional-dependencies = { + optional-dependencies = { blurhash = [ blurhash ]; webpush = [ http-ece @@ -58,7 +58,7 @@ buildPythonPackage rec { pytest-vcr requests-mock setuptools - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ "test_notifications_dismiss_pre_2_9_2" diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 7dc7dcd2d431..f942fadb403f 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -96,8 +96,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ - # Frequently fails when exiftool is updated and adds support for new metadata. - "test_all_parametred" + # libmat2.pdf.cairo.MemoryError: out of memory + "test_all" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix index b1e11ba6de23..2e7af7b89b1f 100644 --- a/pkgs/development/python-modules/materialx/default.nix +++ b/pkgs/development/python-modules/materialx/default.nix @@ -5,13 +5,14 @@ fetchFromGitHub, cmake, setuptools, - darwin, libX11, libXt, libGL, openimageio, imath, python, + darwinMinVersionHook, + apple-sdk_14, }: buildPythonPackage rec { @@ -37,14 +38,11 @@ buildPythonPackage rec { openimageio imath ] - ++ lib.optionals stdenv.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - OpenGL - Cocoa - ] - ) - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_14 + (darwinMinVersionHook "10.15") + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libX11 libXt libGL @@ -53,8 +51,9 @@ buildPythonPackage rec { 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))) + (lib.cmakeBool "MATERIALX_BUILD_GEN_MSL" ( + stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin + )) ]; pythonImportsCheck = [ "MaterialX" ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 2bcf4d246c45..f07acb53dc69 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -52,7 +52,7 @@ # Tk # Darwin has its own "MacOSX" backend, PyPy has tkagg backend and does not support tkinter - enableTk ? (!stdenv.isDarwin && !isPyPy), + enableTk ? (!stdenv.hostPlatform.isDarwin && !isPyPy), tcl, tk, tkinter, @@ -89,7 +89,7 @@ let in buildPythonPackage rec { - version = "3.9.1"; + version = "3.9.2"; pname = "matplotlib"; pyproject = true; @@ -97,7 +97,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-3gaxm425XdM9DcF8kmx8nr7Z9XIHS2+sT2UGimgU0BA="; + hash = "sha256-lqtDkGJpymSmNmk0EG+gFTRFSmnkcbe/PXkIOYGqq5I="; }; env.XDG_RUNTIME_DIR = "/tmp"; @@ -114,7 +114,7 @@ buildPythonPackage rec { --replace-fail '"numpy>=2.0.0rc1,<2.3",' "" patchShebangs tools '' - + lib.optionalString (stdenv.isLinux && interactive) '' + + lib.optionalString (stdenv.hostPlatform.isLinux && interactive) '' # fix paths to libraries in dlopen calls (headless detection) substituteInPlace src/_c_internal_utils.cpp \ --replace-fail libX11.so.6 ${libX11}/lib/libX11.so.6 \ @@ -139,10 +139,10 @@ buildPythonPackage rec { tcl tk ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; # clang-11: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument] - hardeningDisable = lib.optionals stdenv.isDarwin [ "strictoverflow" ]; + hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "strictoverflow" ]; build-system = [ certifi diff --git a/pkgs/development/python-modules/matplotx/default.nix b/pkgs/development/python-modules/matplotx/default.nix index 978e35e2404e..17bf869e874a 100644 --- a/pkgs/development/python-modules/matplotx/default.nix +++ b/pkgs/development/python-modules/matplotx/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ networkx pypng @@ -45,9 +45,9 @@ buildPythonPackage rec { # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. - env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; + env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "Agg"; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.all; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all; disabledTestPaths = [ "tests/test_spy.py" # Requires meshzoo (non-free) and pytest-codeblocks (not packaged) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 537a80408c66..9375c81a32a5 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - poetry-core, + setuptools, # dependencies aiofiles, @@ -44,14 +44,14 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.25.0"; + version = "0.25.2"; pyproject = true; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = "refs/tags/${version}"; - hash = "sha256-wk1UjnazBdK4BCWXRG5Bn9Rasrk+yy3qqideS8tEAk8="; + hash = "sha256-ZNYK5D4aDKE+N62A/hPmTphir+UsWvj3BW2EPG1z+R4="; }; patches = [ @@ -59,7 +59,7 @@ buildPythonPackage rec { ./allow-tests-without-olm.patch ]; - build-system = [ poetry-core ]; + build-system = [ setuptools ]; dependencies = [ aiofiles diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix index d510be3b3a2c..0dffe5503122 100644 --- a/pkgs/development/python-modules/maxminddb/default.nix +++ b/pkgs/development/python-modules/maxminddb/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { # The multiprocessing tests fail on Darwin because multiprocessing uses spawn instead of fork, # resulting in an exception when it can’t pickle the `lookup` local function. - disabledTests = lib.optionals stdenv.isDarwin [ "multiprocessing" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "multiprocessing" ]; meta = with lib; { description = "Reader for the MaxMind DB format"; diff --git a/pkgs/development/python-modules/mayim/default.nix b/pkgs/development/python-modules/mayim/default.nix index 49d4a23c80e1..44630b5121e4 100644 --- a/pkgs/development/python-modules/mayim/default.nix +++ b/pkgs/development/python-modules/mayim/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { wheel ]; - passthru.optional-dependencies = { + optional-dependencies = { postgres = [ psycopg ] ++ psycopg.optional-dependencies.pool; mysql = [ asyncmy ]; sqlite = [ aiosqlite ]; @@ -45,7 +45,7 @@ buildPythonPackage rec { pytest-asyncio pytest-cov-stub ] - ++ (with passthru.optional-dependencies; [ + ++ (with optional-dependencies; [ postgres mysql sqlite diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index d7cf61de83b7..91b5772901db 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 = "3.0.0"; + version = "3.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "KyleKing"; repo = "mdformat-mkdocs"; rev = "refs/tags/v${version}"; - hash = "sha256-Af15Xs8K/QSeIxQNgi1n8xZ+SyyzNs5JL3wse0+LoyE="; + hash = "sha256-MO/YMvvpsEarc8CjELByHUqR5xFtYqhkKkJrFy0PNvU="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix index 28df80388d87..29f62b9f6893 100644 --- a/pkgs/development/python-modules/mdformat/default.nix +++ b/pkgs/development/python-modules/mdformat/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mdformat"; - version = "0.7.17"; + version = "0.7.18"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,12 +21,12 @@ buildPythonPackage rec { owner = "executablebooks"; repo = "mdformat"; rev = "refs/tags/${version}"; - hash = "sha256-umtfbhN6sDR/rFr1LwmJ21Ph9bK1Qq43bmMVzGCPD5s="; + hash = "sha256-t2yx8cIq8es3XOc2nbHPKjUUium5+RPZuD8oNWZxVV0="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = + dependencies = [ markdown-it-py ] ++ lib.optionals (pythonOlder "3.11") [ tomli ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix index 730b78a7b42d..7287175c665b 100644 --- a/pkgs/development/python-modules/mdit-py-plugins/default.nix +++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mdit-py-plugins"; - version = "0.4.1"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xIbP2zHvHWV+2wW17i78vxc5npCvRBYP6QuL/mCBIww="; + hash = "sha256-aY2DMLh1OkWVcN6A29FLba1ETerf/EOqSjHVpsdE21M="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/mean-average-precision/default.nix b/pkgs/development/python-modules/mean-average-precision/default.nix new file mode 100644 index 000000000000..24a4d65aaf67 --- /dev/null +++ b/pkgs/development/python-modules/mean-average-precision/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + numpy, + pandas, +}: + +buildPythonPackage rec { + pname = "mean-average-precision"; + version = "2024.01.05.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bes-dev"; + repo = "mean_average_precision"; + rev = "refs/tags/${version}"; + hash = "sha256-qo160L+oJsHERVOV0qdiRIZPMjvSlUmMTrAzThfrQSs="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + numpy + pandas + ]; + + pythonImportsCheck = [ + "mean_average_precision" + ]; + + # No tests + doCheck = false; + + meta = { + description = "Mean Average Precision for Object Detection"; + homepage = "https://github.com/bes-dev/mean_average_precision"; + changelog = "https://github.com/bes-dev/mean_average_precision/blob/${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/medallion/default.nix b/pkgs/development/python-modules/medallion/default.nix new file mode 100644 index 000000000000..04972dc1eb06 --- /dev/null +++ b/pkgs/development/python-modules/medallion/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + flask, + flask-httpauth, + pytz, + six, + pymongo, +}: + +buildPythonPackage rec { + pname = "medallion"; + version = "3.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "oasis-open"; + repo = "cti-taxii-server"; + rev = "refs/tags/v${version}"; + hash = "sha256-+fWifWi/XR6MSOLhWXn2CFpItVdkOpzQItlrZkjapAk="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + flask + flask-httpauth + pymongo + pytz + six + ]; + + pythonImportsCheck = [ "medallion" ]; + + meta = with lib; { + description = "Minimal implementation of a TAXII 2.1 Server in Python"; + homepage = "https://medallion.readthedocs.io/en/latest/"; + changelog = "https://github.com/oasis-open/cti-taxii-server/blob/v${version}/CHANGES.txt"; + license = licenses.bsd3; + maintainers = with maintainers; [ PapayaJackal ]; + }; +} diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix index d034595d03e4..ab8e238dc6d0 100644 --- a/pkgs/development/python-modules/meep/default.nix +++ b/pkgs/development/python-modules/meep/default.nix @@ -18,7 +18,6 @@ harminv, libctl, libGDSII, - openssh, guile, python, numpy, @@ -122,10 +121,8 @@ buildPythonPackage rec { (calls `sim.run()`), as only then MPI will be initialised and MPI linking errors can be caught. */ - doCheck = true; nativeCheckInputs = [ mpiCheckPhaseHook - openssh ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index 59252dddc7c1..c0e12faa851f 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.5"; + version = "0.31.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; rev = "refs/tags/v${version}"; - hash = "sha256-br+FnUnwDt64dvZAMEK/oqESCWZuOUt9Lp9HGcIPqxc="; + hash = "sha256-YMKspKryhcxecIDLg3PiKHJoRtQBsIi8N//ZtAMBvMg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/melnor-bluetooth/default.nix b/pkgs/development/python-modules/melnor-bluetooth/default.nix new file mode 100644 index 000000000000..649433f99795 --- /dev/null +++ b/pkgs/development/python-modules/melnor-bluetooth/default.nix @@ -0,0 +1,64 @@ +{ + lib, + aioconsole, + bleak-retry-connector, + bleak, + buildPythonPackage, + deprecated, + fetchFromGitHub, + freezegun, + poetry-core, + poetry-dynamic-versioning, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + syrupy, + tzdata, + tzlocal, +}: + +buildPythonPackage rec { + pname = "melnor-bluetooth"; + version = "0.0.25"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "vanstinator"; + repo = "melnor-bluetooth"; + rev = "refs/tags/v${version}"; + hash = "sha256-BQKXQrPT/+qm9cRO7pfScPwW0iwdhliTfX4XJ/kRQG0="; + }; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = [ + aioconsole + bleak + bleak-retry-connector + deprecated + tzdata + tzlocal + ]; + + nativeCheckInputs = [ + freezegun + pytest-asyncio + pytestCheckHook + syrupy + ]; + + pythonImportsCheck = [ "melnor_bluetooth" ]; + + meta = { + description = "Module to interact with Melnor and Eden bluetooth watering timers"; + homepage = "https://github.com/vanstinator/melnor-bluetooth"; + changelog = "https://github.com/vanstinator/melnor-bluetooth/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index 7cd761f987aa..d6ab3cc7fc55 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.50.0"; + version = "1.51.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-tKtfshAsKtXPkkDY13+QWRaWduQCBhor4+ReLjarwLA="; + hash = "sha256-3JUUTi+6oe+mDn4n9NtlWXji4j3E6AZODZZ+PEvSSzg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mercadopago/default.nix b/pkgs/development/python-modules/mercadopago/default.nix index 2a760b321eff..4f5ba6fe2c44 100644 --- a/pkgs/development/python-modules/mercadopago/default.nix +++ b/pkgs/development/python-modules/mercadopago/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "mercadopago"; - version = "2.2.1"; + version = "2.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mercadopago"; repo = "sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-ABxYGYUBOzeOSE0yK8jym+ldinDUCTpqO165OWhszgs="; + hash = "sha256-u4/e/shfTyrucf+uj5nqAkeugX9JZjXBrNtoOkpff8c="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix index d8a195f5f724..b205fe8496a4 100644 --- a/pkgs/development/python-modules/mesa/default.nix +++ b/pkgs/development/python-modules/mesa/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mesa"; - version = "2.3.0"; + version = "2.4.0"; format = "setuptools"; # According to their docs, this library is for Python 3+. @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mesa"; inherit version; - hash = "sha256-wXHCyUk05Ez4ye5a1rKXCyKPZMK7bR7xZ5rpD5mEaUw="; + hash = "sha256-FlQlyNvtMXRSFT3kMwCEAjAH4b+ZCsxliUiPgbRsSgc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index eb83f1c17165..e2bc68074ee4 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.5.0"; + version = "2.5.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-f2nMbX2qCOwI5N6VunVSFncrEVpYMpc5o7hEZ0sg7rU="; + hash = "sha256-A1C+xkQFjoEMKyz9S7T/GzZYrcznpi/9yjBmue1Ahu4="; }; pythonRelaxDeps = [ @@ -75,7 +75,7 @@ buildPythonPackage rec { webencodings ]; - passthru.optional-dependencies = { + optional-dependencies = { tunnel = [ pytap2 ]; }; @@ -84,7 +84,7 @@ buildPythonPackage rec { hypothesis pytestCheckHook riden - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export PATH="$PATH:$out/bin"; diff --git a/pkgs/development/python-modules/meson-python/add-build-flags.sh b/pkgs/development/python-modules/meson-python/add-build-flags.sh index d9327960eb1d..e1b2588f07fc 100644 --- a/pkgs/development/python-modules/meson-python/add-build-flags.sh +++ b/pkgs/development/python-modules/meson-python/add-build-flags.sh @@ -1,9 +1,9 @@ mesonPythonBuildFlagsHook() { # Add all of mesonFlags to -Csetup-args for pypa builds for f in $mesonFlags; do - pypaBuildFlags+=" -Csetup-args=$f" + appendToVar pypaBuildFlags "-Csetup-args=$f" # This requires pip>23.0.1, see: https://meson-python.readthedocs.io/en/latest/how-to-guides/config-settings.html - pipBuildFlags+=" --config-settings=setup-args=$f" + appendToVar pipBuildFlags "--config-settings=setup-args=$f" done } diff --git a/pkgs/development/python-modules/meteoswiss-async/default.nix b/pkgs/development/python-modules/meteoswiss-async/default.nix index b837f49c08c6..a10bbafb9d43 100644 --- a/pkgs/development/python-modules/meteoswiss-async/default.nix +++ b/pkgs/development/python-modules/meteoswiss-async/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { hash = "sha256-xFvfyLZvBfnbzShKN+94piNUVjV1cfi4jWpc/Xw6XG4="; }; + pythonRelaxDeps = [ "aiohttp" ]; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/mhcflurry/default.nix b/pkgs/development/python-modules/mhcflurry/default.nix index 29c00af47c23..e27c94704edc 100644 --- a/pkgs/development/python-modules/mhcflurry/default.nix +++ b/pkgs/development/python-modules/mhcflurry/default.nix @@ -15,20 +15,19 @@ tqdm, # tests - nose, pytestCheckHook, }: buildPythonPackage rec { pname = "mhcflurry"; - version = "2.1.3"; + version = "2.1.4"; pyproject = true; src = fetchFromGitHub { owner = "openvax"; repo = "mhcflurry"; rev = "refs/tags/v${version}"; - hash = "sha256-Xz3Myd+pifNQMTH1BC2qsQEy7UorYNQNj+7ysMVmCOs="; + hash = "sha256-dxCGCPnk1IFKg8ZVqMJsojQL0KlNirKlHJoaaOYIzMU="; }; # keras and tensorflow are not in the official setup.py requirements but are required for the CLI utilities to run. @@ -44,8 +43,9 @@ buildPythonPackage rec { tqdm ]; + # Tests currently depend on nose; see + # <https://github.com/openvax/mhcflurry/pull/244>. nativeCheckInputs = [ - nose pytestCheckHook ]; 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 9f4fb1e4b8f7..864b6c8cc5a6 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.3.2"; + version = "1.3.3"; 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-Unscul4mznB3yJmn8Y/Zcvbk59V1WLqdSgmEhCUgkeA="; + hash = "sha256-J+wX2vF1LZHq88RDhda6NDeYioZzAz2BxovVFz2xxfw="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/microsoft-security-utilities-secret-masker/default.nix b/pkgs/development/python-modules/microsoft-security-utilities-secret-masker/default.nix new file mode 100644 index 000000000000..ef2012371dd3 --- /dev/null +++ b/pkgs/development/python-modules/microsoft-security-utilities-secret-masker/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + wheel, +}: + +buildPythonPackage rec { + pname = "microsoft-security-utilities-secret-masker"; + version = "1.0.0b3"; + pyproject = true; + + src = fetchPypi { + pname = "microsoft_security_utilities_secret_masker"; + inherit version; + hash = "sha256-0EVIIwxno70stGCyjnH+bKwWj0jwbXapadnKR732c0M="; + }; + + build-system = [ + setuptools + wheel + ]; + + pythonImportsCheck = [ + "microsoft_security_utilities_secret_masker" + ]; + + meta = { + description = "A tool for detecting and masking secrets"; + homepage = "https://pypi.org/project/microsoft-security-utilities-secret-masker/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix index 3f372790702a..7aedc6cd2155 100644 --- a/pkgs/development/python-modules/millheater/default.nix +++ b/pkgs/development/python-modules/millheater/default.nix @@ -5,12 +5,13 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "millheater"; - version = "0.11.8"; - format = "setuptools"; + version = "0.12.0"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -18,10 +19,12 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pymill"; rev = "refs/tags/${version}"; - hash = "sha256-BSrnUhe6SFtalUGldC24eJTqJAF5FdUWo3rwWNT1uCw="; + hash = "sha256-8PrTypJuWNuFz1NZLuyqOpWFsN5OLshj7S10YgcGusQ="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp async-timeout ]; diff --git a/pkgs/development/python-modules/minari/default.nix b/pkgs/development/python-modules/minari/default.nix index dd6373a58c56..7d8cee4b8ea6 100644 --- a/pkgs/development/python-modules/minari/default.nix +++ b/pkgs/development/python-modules/minari/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -30,16 +29,14 @@ buildPythonPackage rec { pname = "minari"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "Farama-Foundation"; repo = "Minari"; rev = "refs/tags/v${version}"; - hash = "sha256-SVt93d0GbCxeZXhh5vMPvnsBAeJAfGWNceFi0W9RgeM="; + hash = "sha256-LriUPl9lrIDz5tzZIOxhj8C2q0LZr6AgJGRw/cWp4Fs="; }; build-system = [ diff --git a/pkgs/development/python-modules/mindsdb-evaluator/default.nix b/pkgs/development/python-modules/mindsdb-evaluator/default.nix index 423f3401da68..00c54bde3245 100644 --- a/pkgs/development/python-modules/mindsdb-evaluator/default.nix +++ b/pkgs/development/python-modules/mindsdb-evaluator/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mindsdb-evaluator"; - version = "0.0.13"; + version = "0.0.15"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mindsdb_evaluator"; inherit version; - hash = "sha256-SW3GYe9ykbs6ZViScdAgwiBAP9ix4v1VbSm/kJK2jDA="; + hash = "sha256-/3xRPrKzYAdSlY+sQxwCUzKhf3NJBSyWG2Q0ZKb6v3U="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index e7e98b265e2d..0f86ee525000 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox CoreAudio ]; diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index b65a4ccdcf06..51b70234dde1 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -22,16 +22,16 @@ buildPythonPackage rec { pname = "minio"; - version = "7.2.8"; + version = "7.2.10"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "minio"; repo = "minio-py"; rev = "refs/tags/${version}"; - hash = "sha256-BWzG8qYfTxk59lRAAL78YFCuHku8L2VxCSNpbi8Dr3k="; + hash = "sha256-vPIMYaCt2f1OXPUtaw0OXMEADHNCv4DxpueZSyJiYqA="; }; postPatch = '' @@ -39,9 +39,9 @@ buildPythonPackage rec { --replace-fail "assertEquals" "assertEqual" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ argon2-cffi certifi urllib3 diff --git a/pkgs/development/python-modules/miniupnpc/default.nix b/pkgs/development/python-modules/miniupnpc/default.nix index a23ef91c8a81..04d8a08bf1c3 100644 --- a/pkgs/development/python-modules/miniupnpc/default.nix +++ b/pkgs/development/python-modules/miniupnpc/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-KwpNVl+tZTZHHZKW9p3a/S0nZJW6lZftjBK9ECkRUMo="; }; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools which ]; diff --git a/pkgs/development/python-modules/mip/default.nix b/pkgs/development/python-modules/mip/default.nix index 16ecf80905aa..a2c6e80e3f16 100644 --- a/pkgs/development/python-modules/mip/default.nix +++ b/pkgs/development/python-modules/mip/default.nix @@ -79,7 +79,7 @@ buildPythonPackage rec { # Tests that rely on Gurobi are activated only when Gurobi support is enabled disabledTests = lib.optional (!gurobiSupport) "gurobi"; - passthru.optional-dependencies = { + optional-dependencies = { inherit gurobipy numpy; }; @@ -89,7 +89,7 @@ buildPythonPackage rec { downloadPage = "https://github.com/coin-or/python-mip/releases"; changelog = "https://github.com/coin-or/python-mip/releases/tag/${version}"; license = licenses.epl20; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; maintainers = with maintainers; [ nessdoor ]; }; } diff --git a/pkgs/development/python-modules/mirakuru/default.nix b/pkgs/development/python-modules/mirakuru/default.nix index e208daa625ef..58c74cd3cad1 100644 --- a/pkgs/development/python-modules/mirakuru/default.nix +++ b/pkgs/development/python-modules/mirakuru/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, buildPythonPackage, fetchFromGitHub, @@ -13,18 +14,23 @@ buildPythonPackage rec { pname = "mirakuru"; - version = "2.5.2"; + version = "2.5.3"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "ClearcodeHQ"; repo = "mirakuru"; rev = "refs/tags/v${version}"; - hash = "sha256-I1TKP0ESuBMTcReZf0tryjvGpSpwzofwmOiQqhyr6Zg="; + hash = "sha256-blk4Oclb3+Cj3RH7BhzacfoPFDBIP/zgv4Ct7fawGnQ="; }; + patches = [ + # https://github.com/ClearcodeHQ/mirakuru/pull/810 + ./tmpdir.patch + ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ psutil ]; @@ -37,6 +43,20 @@ buildPythonPackage rec { ]; pythonImportsCheck = [ "mirakuru" ]; + # Necessary for the tests to pass on Darwin with sandbox enabled. + __darwinAllowLocalNetworking = true; + + # Those are failing in the darwin sandbox with: + # > ps: %mem: requires entitlement + # > ps: vsz: requires entitlement + # > ps: rss: requires entitlement + # > ps: time: requires entitlement + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + "test_forgotten_stop" + "test_mirakuru_cleanup" + "test_daemons_killing" + ]; + meta = with lib; { homepage = "https://pypi.org/project/mirakuru"; description = "Process orchestration tool designed for functional and integration tests"; diff --git a/pkgs/development/python-modules/mirakuru/tmpdir.patch b/pkgs/development/python-modules/mirakuru/tmpdir.patch new file mode 100644 index 000000000000..2fd6fcfd2741 --- /dev/null +++ b/pkgs/development/python-modules/mirakuru/tmpdir.patch @@ -0,0 +1,19 @@ +--- a/tests/executors/test_unixsocket_executor.py ++++ b/tests/executors/test_unixsocket_executor.py +@@ -4,6 +4,7 @@ Some of these tests run ``nc``: when running Debian, make sure the + ``netcat-openbsd`` package is used, not ``netcat-traditional``. + """ + ++import os + import sys + + import pytest +@@ -12,7 +13,7 @@ from mirakuru import TimeoutExpired + from mirakuru.unixsocket import UnixSocketExecutor + from tests import TEST_SOCKET_SERVER_PATH + +-SOCKET_PATH = "/tmp/mirakuru.sock" ++SOCKET_PATH = os.path.join(os.getenv("TMPDIR", "/tmp"), "mirakuru.sock") + + SOCKET_SERVER_CMD = f"{sys.executable} {TEST_SOCKET_SERVER_PATH} {SOCKET_PATH}" + diff --git a/pkgs/development/python-modules/mitmproxy-macos/default.nix b/pkgs/development/python-modules/mitmproxy-macos/default.nix index 08228102cf1b..5178b9584e92 100644 --- a/pkgs/development/python-modules/mitmproxy-macos/default.nix +++ b/pkgs/development/python-modules/mitmproxy-macos/default.nix @@ -1,29 +1,26 @@ { lib, buildPythonPackage, - fetchFromGitHub, - hatchling, + fetchPypi, pythonOlder, }: buildPythonPackage rec { pname = "mitmproxy-macos"; - version = "0.5.1"; - pyproject = true; + version = "0.9.2"; + format = "wheel"; disabled = pythonOlder "3.10"; - src = fetchFromGitHub { - owner = "mitmproxy"; - repo = "mitmproxy_rs"; - rev = "refs/tags/${version}"; - hash = "sha256-nrm1T2yaGVmYsubwNJHPnPDC/A/jYiKVzwBKmuc9MD4="; + src = fetchPypi { + pname = "mitmproxy_macos"; + inherit version; + format = "wheel"; + dist = "py3"; + python = "py3"; + hash = "sha256-Q19gQF6qnoF0TDmeZIxu90A5/ur7N7sDcoeBi2LaNrg="; }; - sourceRoot = "${src.name}/mitmproxy-macos"; - - nativeBuildInputs = [ hatchling ]; - pythonImportsCheck = [ "mitmproxy_macos" ]; meta = with lib; { @@ -33,6 +30,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ boltzmannrain ]; platforms = platforms.darwin; - broken = true; # last successful build 2023-12-04 + sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; } diff --git a/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock b/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock index c5fad70fb845..a558f0e00222 100644 --- a/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock +++ b/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock @@ -93,9 +93,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" dependencies = [ "backtrace", ] @@ -146,6 +146,23 @@ dependencies = [ ] [[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[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.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -153,18 +170,17 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" -version = "0.6.20" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", - "bitflags 1.3.2", "bytes", "futures-util", "http", "http-body", - "hyper", + "http-body-util", "itoa", "matchit", "memchr", @@ -173,7 +189,7 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper", + "sync_wrapper 1.0.1", "tower", "tower-layer", "tower-service", @@ -181,17 +197,20 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" dependencies = [ "async-trait", "bytes", "futures-util", "http", "http-body", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", ] @@ -224,6 +243,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 = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -262,8 +287,7 @@ dependencies = [ [[package]] name = "boringtun" version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "751787b019c674b9ac353f4eaa285e6711c21badb421cd8c199bf2c83b727f29" +source = "git+https://github.com/cloudflare/boringtun?rev=e3252d9c4f4c8fc628995330f45369effd4660a1#e3252d9c4f4c8fc628995330f45369effd4660a1" dependencies = [ "aead", "base64 0.13.1", @@ -279,7 +303,7 @@ dependencies = [ "rand_core", "ring", "tracing", - "untrusted 0.9.0", + "untrusted", "x25519-dalek", ] @@ -302,6 +326,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.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -395,6 +425,21 @@ dependencies = [ [[package]] name = "clap" +version = "3.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +dependencies = [ + "atty", + "bitflags 1.3.2", + "clap_lex 0.2.4", + "indexmap 1.9.3", + "strsim", + "termcolor", + "textwrap", +] + +[[package]] +name = "clap" version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" @@ -409,7 +454,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" dependencies = [ "anstyle", - "clap_lex", + "clap_lex 0.7.1", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", ] [[package]] @@ -420,11 +474,11 @@ checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "cocoa" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "block", "cocoa-foundation", "core-foundation", @@ -436,11 +490,11 @@ dependencies = [ [[package]] name = "cocoa-foundation" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "block", "core-foundation", "core-graphics-types", @@ -456,9 +510,9 @@ checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "console-api" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a257c22cd7e487dd4a13d413beabc512c5052f0bc048db0da6a84c3d8a6142fd" +checksum = "86ed14aa9c9f927213c6e4f3ef75faaad3406134efe84ba2cb7983431d5f0931" dependencies = [ "futures-core", "prost", @@ -469,9 +523,9 @@ dependencies = [ [[package]] name = "console-subscriber" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c4cc54bae66f7d9188996404abdf7fdfa23034ef8e43478c8810828abad758" +checksum = "e2e3a111a37f3333946ebf9da370ba5c5577b18eb342ec683eb488dd21980302" dependencies = [ "console-api", "crossbeam-channel", @@ -479,6 +533,7 @@ dependencies = [ "futures-task", "hdrhistogram", "humantime", + "hyper-util", "prost", "prost-types", "serde", @@ -494,9 +549,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" dependencies = [ "core-foundation-sys", "libc", @@ -504,17 +559,17 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" -version = "0.23.2" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-graphics-types", "foreign-types", @@ -523,11 +578,11 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "libc", ] @@ -559,10 +614,10 @@ dependencies = [ "anes", "cast", "ciborium", - "clap", + "clap 4.5.8", "criterion-plot", "is-terminal", - "itertools 0.10.5", + "itertools", "num-traits", "once_cell", "oorandom", @@ -583,7 +638,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools 0.10.5", + "itertools", ] [[package]] @@ -639,15 +694,14 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-rc.3" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436ace70fc06e06f7f689d2624dc4e2f0ea666efb5aa704215f7249ae6e047a7" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "fiat-crypto", - "platforms", "rustc_version", "subtle", "zeroize", @@ -752,9 +806,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", @@ -799,9 +853,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.1.20" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "filetime" @@ -985,15 +1039,15 @@ checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "h2" -version = "0.3.26" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", "http", "indexmap 2.2.6", "slab", @@ -1064,6 +1118,15 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[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.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" @@ -1161,9 +1224,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1172,12 +1235,24 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", + "futures-util", "http", + "http-body", "pin-project-lite", ] @@ -1201,13 +1276,12 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.29" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", "h2", "http", @@ -1216,23 +1290,42 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" dependencies = [ "hyper", + "hyper-util", "pin-project-lite", "tokio", - "tokio-io-timeout", + "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", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -1257,12 +1350,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", "num-traits", "png", "tiff", @@ -1320,6 +1413,12 @@ dependencies = [ ] [[package]] +name = "inventory" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" + +[[package]] name = "ip_network" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1365,7 +1464,7 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", "windows-sys 0.52.0", ] @@ -1386,15 +1485,6 @@ dependencies = [ ] [[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] name = "itoa" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1472,7 +1562,7 @@ checksum = "9106e1d747ffd48e6be5bb2d97fa706ed25b144fbee4d5c02eae110cd8d6badd" [[package]] name = "macos-certificate-truster" -version = "0.6.3" +version = "0.9.2" dependencies = [ "security-framework", ] @@ -1552,18 +1642,19 @@ dependencies = [ [[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", + "windows-sys 0.52.0", ] [[package]] name = "mitm-wg-test-client" -version = "0.6.3" +version = "0.9.2" dependencies = [ "anyhow", "boringtun", @@ -1574,7 +1665,7 @@ dependencies = [ [[package]] name = "mitmproxy" -version = "0.6.3" +version = "0.9.2" dependencies = [ "anyhow", "boringtun", @@ -1601,6 +1692,7 @@ dependencies = [ "rand_core", "security-framework", "smoltcp", + "socket2", "sysinfo", "tokio", "tokio-util", @@ -1610,7 +1702,7 @@ dependencies = [ [[package]] name = "mitmproxy_rs" -version = "0.6.3" +version = "0.9.2" dependencies = [ "anyhow", "boringtun", @@ -1687,16 +1779,6 @@ dependencies = [ ] [[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 = "objc" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1733,6 +1815,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] +name = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" + +[[package]] name = "parking_lot" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1794,12 +1882,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "platforms" -version = "3.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4c7666f2019727f9e8e14bf14456e99c707d780922869f1ba473eee101fa49" - -[[package]] name = "plotters" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1910,9 +1992,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.6" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" dependencies = [ "bytes", "prost-derive", @@ -1920,12 +2002,12 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.6" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools", "proc-macro2", "quote", "syn 2.0.68", @@ -1933,9 +2015,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" dependencies = [ "prost", ] @@ -1965,14 +2047,28 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fde289486f7d5cee0ac7c20b2637a0657654681079cc5eedc90d9a2a79af1e5" dependencies = [ + "clap 3.2.25", "futures", + "inventory", "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.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2167,17 +2263,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.16.20" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", + "getrandom", "libc", - "once_cell", "spin", - "untrusted 0.7.1", - "web-sys", - "winapi", + "untrusted", + "windows-sys 0.52.0", ] [[package]] @@ -2237,9 +2333,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.11.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "f9d0283c0a4a22a0f1b0e4edca251aa20b92fc96eaa09b84bec052f9415e9d71" dependencies = [ "bitflags 2.6.0", "core-foundation", @@ -2250,9 +2346,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -2361,9 +2457,9 @@ dependencies = [ [[package]] name = "spin" -version = "0.5.2" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "stable_deref_trait" @@ -2372,6 +2468,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] name = "subtle" version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2384,6 +2486,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", + "quote", "unicode-ident", ] @@ -2405,6 +2508,12 @@ 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 = "sysinfo" version = "0.29.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2421,9 +2530,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", "libc", @@ -2437,6 +2546,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" + +[[package]] name = "thiserror" version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2523,38 +2647,27 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", "tracing", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", @@ -2574,9 +2687,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -2596,23 +2709,26 @@ dependencies = [ [[package]] name = "tonic" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" +checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401" dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.7", + "base64 0.22.1", "bytes", "h2", "http", "http-body", + "http-body-util", "hyper", "hyper-timeout", + "hyper-util", "percent-encoding", "pin-project", "prost", + "socket2", "tokio", "tokio-stream", "tower", @@ -2751,12 +2867,6 @@ dependencies = [ [[package]] name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "untrusted" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" @@ -3000,7 +3110,7 @@ dependencies = [ [[package]] name = "windows-redirector" -version = "0.6.3" +version = "0.9.2" dependencies = [ "anyhow", "env_logger", @@ -3184,9 +3294,9 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0-rc.3" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7fae07da688e17059d5886712c933bb0520f15eff2e09cfa18e30968f4e63a" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", "rand_core", diff --git a/pkgs/development/python-modules/mitmproxy-rs/default.nix b/pkgs/development/python-modules/mitmproxy-rs/default.nix index bc2ed1694071..e9c475e390d6 100644 --- a/pkgs/development/python-modules/mitmproxy-rs/default.nix +++ b/pkgs/development/python-modules/mitmproxy-rs/default.nix @@ -12,21 +12,22 @@ buildPythonPackage rec { pname = "mitmproxy-rs"; - version = "0.6.3"; + version = "0.9.2"; pyproject = true; src = fetchFromGitHub { owner = "mitmproxy"; repo = "mitmproxy_rs"; - rev = version; - hash = "sha256-rnM2MNJ9ZVmwFjhXU8kPEQjpqNIzVZ3bVtm43WvGj5E="; + rev = "v${version}"; + hash = "sha256-Cp0AbwRNLuLzmF4EAK/2Fzq5I9Iq7gqg6OLbK1B8fGY="; }; cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; outputHashes = { + "boringtun-0.6.0" = "sha256-fx2lY6q1ZdO5STvf7xnbVG64tn0BC4yWPFy4ICPJgEg="; "smoltcp-0.11.0" = "sha256-KC9nTKd2gfZ1ICjrkLK//M2bbqYlfcCK18gBdN0RqWQ="; }; - lockFile = ./Cargo.lock; }; buildAndTestSubdir = "mitmproxy-rs"; @@ -36,8 +37,9 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.AppKit libiconv mitmproxy-macos ]; diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 2c4d1da6e629..93a77b49a8e2 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "10.4.2"; + version = "11.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -54,7 +54,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "mitmproxy"; rev = "refs/tags/v${version}"; - hash = "sha256-1OMVgV6dFKoG/upv+RWbYqftqejeQLBlsycuy2+Na6E="; + hash = "sha256-f5TudaLlHtIMAvS7s5mWgqpdi7/vWNF0EdlYNuG67hM="; }; @@ -91,7 +91,7 @@ buildPythonPackage rec { urwid wsproto zstandard - ] ++ lib.optionals stdenv.isDarwin [ mitmproxy-macos ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ mitmproxy-macos ]; nativeCheckInputs = [ hypothesis diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix index 1e159a90fd1a..29fea1295d23 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.10"; + version = "0.3.18"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mitogen-hq"; repo = "mitogen"; rev = "refs/tags/v${version}"; - hash = "sha256-ndT5bAiUpjkgD2oeS0s/u69a4bBHI4zoXbudcWogTAU="; + hash = "sha256-dSG8yBeutd2loIuoeLC1B3bC9kIeVitK3jD1J27E0SM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index 92ced96774e0..4e985885890a 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -13,22 +12,20 @@ pandas, scipy, - # checks + # tests pytestCheckHook, }: buildPythonPackage rec { pname = "mizani"; - version = "0.12.2"; + version = "0.13.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "has2k1"; repo = "mizani"; rev = "refs/tags/v${version}"; - hash = "sha256-aTc8LC/2zLrrTfOXABWs049m752PctpvlguA6qhyhp8="; + hash = "sha256-UzedAhYGgGLOMUyZe3ew4a2gh1UgYHaLsIe9k85rOkg="; }; build-system = [ setuptools-scm ]; 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 26afc10604c5..0f489b4c14c5 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 @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mkdocs-git-revision-date-localized-plugin"; - version = "1.2.7"; + version = "1.2.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "timvink"; repo = "mkdocs-git-revision-date-localized-plugin"; rev = "refs/tags/v${version}"; - hash = "sha256-dzFxNAVBQ5a4opdxSz42VCns49DlZyrglUaQTzfLnW8="; + hash = "sha256-1SuENREPkU9W5ldMIXDCALLMx0AiTs4dNYJYjrkaegc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-jupyter/default.nix b/pkgs/development/python-modules/mkdocs-jupyter/default.nix index dd0c300ab175..c0286491927c 100644 --- a/pkgs/development/python-modules/mkdocs-jupyter/default.nix +++ b/pkgs/development/python-modules/mkdocs-jupyter/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mkdocs-jupyter"; - version = "0.25.0"; + version = "0.25.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mkdocs_jupyter"; inherit version; - hash = "sha256-4mwdNBkWvFf5bqP5PY0KiPx3yH1M7iIvZtIAd5jZJPU="; + hash = "sha256-DpJy/0lH4OxoPJJCOkv7QqJkd8EDqxpquCd+LcyPev4="; }; pythonRelaxDeps = [ "nbconvert" ]; diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 45b009ad9293..1d78557d796e 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.35"; + version = "9.5.39"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "squidfunk"; repo = "mkdocs-material"; rev = "refs/tags/${version}"; - hash = "sha256-iiukdgkC2B8xWf8abtiSWjEBiCwk/2+1iJqkV9d43VQ="; + hash = "sha256-ArCd7NbqvPw3kHJd4MG62FplgXwW1gFTfdCHZqfxuqU="; }; nativeBuildInputs = [ @@ -61,7 +61,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { recommended = [ mkdocs-minify-plugin mkdocs-redirects diff --git a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix index 42455ed84cc6..c71d16a7b238 100644 --- a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mkdocs-rss-plugin"; - version = "1.15.0"; + version = "1.16.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Guts"; repo = "mkdocs-rss-plugin"; rev = "refs/tags/${version}"; - hash = "sha256-sGm6uWlZeW65uorfTK8pk8ZT2AE9nmsZhe+UYVrSr+8="; + hash = "sha256-6FTOJQqK9lKYt6cVpKvMcNUrhSwX26032Vr4JyZ6sI8="; }; postPatch = '' 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 36863323f968..bc00f655059a 100644 --- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; - version = "0.6.10"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Blueswen"; repo = "mkdocs-swagger-ui-tag"; rev = "refs/tags/v${version}"; - hash = "sha256-Wfctu8rqj2HxPgXYMeL5Hovet8yjol7RfLH233Gl+v4="; + hash = "sha256-hxf7onjH26QsdB19r71NSC/67u+pEYdJo3e4OvWGgtI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index 654991775885..da196135439b 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -66,14 +66,14 @@ buildPythonPackage rec { watchdog ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { i18n = [ babel ] ++ lib.optionals (pythonAtLeast "3.12") [ setuptools ]; }; nativeCheckInputs = [ unittestCheckHook mock - ] ++ passthru.optional-dependencies.i18n; + ] ++ optional-dependencies.i18n; unittestFlagsArray = [ "-v" diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 1b741ff73315..efb5e612e0a7 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.11.1"; + version = "1.12.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-g6F6xIFKLzNqgbWGZXdJeoqQz/GIlC3XmrG9Kjkr1rU="; + hash = "sha256-dc9RXbrwZS/7eAF0BrGS2kJxG62rB5RLxf3yNZ6+g4Q="; }; build-system = [ pdm-backend ]; @@ -38,6 +38,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "mkdocstrings_handlers" ]; + disabledTests = [ + # Tests fails with AssertionError + "test_windows_root_conversion" + ]; + meta = with lib; { description = "Python handler for mkdocstrings"; homepage = "https://github.com/mkdocstrings/python"; diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index b0bfc0ca1554..2cc0277d6cc6 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.26.1"; + version = "0.26.2"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "mkdocstrings"; repo = "mkdocstrings"; rev = "refs/tags/${version}"; - hash = "sha256-YV9Cncry+RXXGxRYN4dXp5E2msGA4Kq2QSvcPywWV2c="; + hash = "sha256-xZKE8+bNHL+GSQS00MlShOl/3p7+mRV558Pel50ipOI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/pkgs/development/python-modules/mkl-service/default.nix index fd5e8e992775..f4e52431ed4b 100644 --- a/pkgs/development/python-modules/mkl-service/default.nix +++ b/pkgs/development/python-modules/mkl-service/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "mkl-service"; - version = "2.4.1"; + version = "2.4.2"; pyproject = true; src = fetchFromGitHub { owner = "IntelPython"; repo = "mkl-service"; rev = "refs/tags/v${version}"; - hash = "sha256-4UPiQt1hVVlPFZnuKlMK3FLv2cIEXToHKxnyYLXR/sY="; + hash = "sha256-o5mjZhqQc7tu44EjrScuGzv6pZNlnZnndMIAhl8pY5o="; }; build-system = [ diff --git a/pkgs/development/python-modules/mktestdocs/default.nix b/pkgs/development/python-modules/mktestdocs/default.nix index 94ecadee5fcb..f1a1b654bf12 100644 --- a/pkgs/development/python-modules/mktestdocs/default.nix +++ b/pkgs/development/python-modules/mktestdocs/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mktestdocs"; - version = "0.2.1"; + version = "0.2.3"; pyproject = true; src = fetchFromGitHub { owner = "koaning"; repo = "mktestdocs"; rev = "refs/tags/${version}"; - hash = "sha256-snlt6SDiDYr04b2b2NgBC/1IBffpei034vFx3fnYUOc="; + hash = "sha256-egLlgq0lQOk0cPBly01zQ0rkl7D7Rf/bZ4en5oG+wlE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ml-dtypes/default.nix b/pkgs/development/python-modules/ml-dtypes/default.nix index 0fd14edd7b21..b23ca450327c 100644 --- a/pkgs/development/python-modules/ml-dtypes/default.nix +++ b/pkgs/development/python-modules/ml-dtypes/default.nix @@ -1,26 +1,29 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, + + # build-system setuptools, + + # dependencies numpy, - pytestCheckHook, + + # tests absl-py, + pytestCheckHook, }: buildPythonPackage rec { pname = "ml-dtypes"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "jax-ml"; repo = "ml_dtypes"; rev = "refs/tags/v${version}"; - hash = "sha256-3qZ1lS1IdSXNLRNE9tyuO9qauVBDlECZvmmwaOffD30="; + hash = "sha256-+6job9fEHVguh9JBE/NUv+QezwQohuKPO8DlhbaawZ4="; # Since this upstream patch (https://github.com/jax-ml/ml_dtypes/commit/1bfd097e794413b0d465fa34f2eff0f3828ff521), # the attempts to use the nixpkgs packaged eigen dependency have failed. # Hence, we rely on the bundled eigen library. @@ -29,20 +32,17 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "numpy~=1.21.2" "numpy" \ - --replace "numpy~=1.23.3" "numpy" \ - --replace "numpy~=1.26.0" "numpy" \ - --replace "numpy==2.0.0rc1" "numpy" \ - --replace "setuptools~=68.1.0" "setuptools" + --replace-fail "numpy~=2.0" "numpy" \ + --replace-fail "setuptools~=73.0.1" "setuptools" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ - pytestCheckHook absl-py + pytestCheckHook ]; preCheck = '' @@ -53,12 +53,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "ml_dtypes" ]; - meta = with lib; { + meta = { description = "Stand-alone implementation of several NumPy dtype extensions used in machine learning libraries"; homepage = "https://github.com/jax-ml/ml_dtypes"; changelog = "https://github.com/jax-ml/ml_dtypes/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage samuela ]; diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 7032d0e91d51..ab01d055627f 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -1,20 +1,24 @@ { lib, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies alembic, buildPythonPackage, cachetools, click, cloudpickle, - databricks-cli, + databricks-sdk, docker, - entrypoints, - fetchPypi, flask, gitpython, - gorilla, graphene, gunicorn, importlib-metadata, + jinja2, markdown, matplotlib, numpy, @@ -22,33 +26,58 @@ opentelemetry-sdk, packaging, pandas, - prometheus-flask-exporter, protobuf, - python-dateutil, - pythonOlder, pyarrow, - pytz, pyyaml, - querystring-parser, requests, - setuptools, scikit-learn, scipy, - simplejson, sqlalchemy, sqlparse, + + # tests + aiohttp, + azure-core, + azure-storage-blob, + azure-storage-file, + boto3, + botocore, + catboost, + datasets, + fastapi, + google-cloud-storage, + httpx, + jwt, + keras, + langchain, + librosa, + moto, + opentelemetry-exporter-otlp, + optuna, + pydantic, + pyspark, + pytestCheckHook, + pytorch-lightning, + sentence-transformers, + starlette, + statsmodels, + tensorflow, + torch, + transformers, + uvicorn, + xgboost, }: buildPythonPackage rec { pname = "mlflow"; - version = "2.14.3"; + version = "2.16.2"; pyproject = true; - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-KSyuS4NXSgyyIxF+IkyqZ5iTMHivAjNxnCthK+pkVhc="; + src = fetchFromGitHub { + owner = "mlflow"; + repo = "mlflow"; + rev = "refs/tags/v${version}"; + hash = "sha256-7W1gpVgJSN/iXoW987eCHfcOeE3D/ZJ2W/eilDdzOww="; }; # Remove currently broken dependency `shap`, a model explainability package. @@ -57,25 +86,28 @@ buildPythonPackage rec { pythonRemoveDeps = [ "shap" ]; pythonRelaxDeps = [ "gunicorn" + "importlib-metadata" "packaging" + "protobuf" "pytz" "pyarrow" ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ alembic cachetools click cloudpickle - databricks-cli + databricks-sdk docker - entrypoints flask gitpython - gorilla graphene gunicorn importlib-metadata + jinja2 markdown matplotlib numpy @@ -83,36 +115,87 @@ buildPythonPackage rec { opentelemetry-sdk packaging pandas - prometheus-flask-exporter protobuf pyarrow - python-dateutil - pytz pyyaml - querystring-parser requests scikit-learn scipy - setuptools - #shap - simplejson sqlalchemy sqlparse ]; pythonImportsCheck = [ "mlflow" ]; - # no tests in PyPI dist - # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config - # also, tests use conda so can't run on NixOS without buildFHSEnv + nativeCheckInputs = [ + aiohttp + azure-core + azure-storage-blob + azure-storage-file + boto3 + botocore + catboost + datasets + fastapi + google-cloud-storage + httpx + jwt + keras + langchain + librosa + moto + opentelemetry-exporter-otlp + optuna + pydantic + pyspark + pytestCheckHook + pytorch-lightning + sentence-transformers + starlette + statsmodels + tensorflow + torch + transformers + uvicorn + xgboost + ]; + + disabledTestPaths = [ + # Requires unpackaged `autogen` + "tests/autogen/test_autogen_autolog.py" + + # Requires unpackaged `diviner` + "tests/diviner/test_diviner_model_export.py" + + # Requires unpackaged `sktime` + "examples/sktime/test_sktime_model_export.py" + + # Requires `fastai` which would cause a circular dependency + "tests/fastai/test_fastai_autolog.py" + "tests/fastai/test_fastai_model_export.py" + + # Requires `spacy` which would cause a circular dependency + "tests/spacy/test_spacy_model_export.py" + + # Requires `tensorflow.keras` which is not included in our outdated version of `tensorflow` (2.13.0) + "tests/gateway/providers/test_ai21labs.py" + "tests/tensorflow/test_keras_model_export.py" + "tests/tensorflow/test_keras_pyfunc_model_works_with_all_input_types.py" + "tests/tensorflow/test_mlflow_callback.py" + ]; + + # I (@GaetanLepage) gave up at enabling tests: + # - They require a lot of dependencies (some unpackaged); + # - Many errors occur at collection time; + # - Most (all ?) tests require internet access anyway. doCheck = false; - meta = with lib; { + meta = { description = "Open source platform for the machine learning lifecycle"; mainProgram = "mlflow"; homepage = "https://github.com/mlflow/mlflow"; changelog = "https://github.com/mlflow/mlflow/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ tbenst ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ tbenst ]; }; } diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix index 614aed274ba0..ac90ebb89808 100644 --- a/pkgs/development/python-modules/mlx/default.nix +++ b/pkgs/development/python-modules/mlx/default.nix @@ -28,13 +28,13 @@ let in buildPythonPackage rec { pname = "mlx"; - version = "0.15.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "ml-explore"; repo = "mlx"; rev = "refs/tags/v${version}"; - hash = "sha256-+vgHEt+L91YJLpQo4bps+Rnm/TS1PAPXNohdICGK6GE="; + hash = "sha256-eFKjCrutqrmhZKzRrLq5nYl0ieqLvoXpbnTxA1NEhWo="; }; pyproject = true; diff --git a/pkgs/development/python-modules/mmcv/default.nix b/pkgs/development/python-modules/mmcv/default.nix index d552736a6920..ba3a72976f58 100644 --- a/pkgs/development/python-modules/mmcv/default.nix +++ b/pkgs/development/python-modules/mmcv/default.nix @@ -21,35 +21,12 @@ tifffile, lmdb, mmengine, - symlinkJoin, }: let inherit (torch) cudaCapabilities cudaPackages cudaSupport; - inherit (cudaPackages) backendStdenv cudaVersion; + inherit (cudaPackages) backendStdenv; - cuda-common-redist = with cudaPackages; [ - cuda_cccl # <thrust/*> - libcublas # cublas_v2.h - libcusolver # cusolverDn.h - libcusparse # cusparse.h - ]; - - cuda-native-redist = symlinkJoin { - name = "cuda-native-redist-${cudaVersion}"; - paths = - with cudaPackages; - [ - cuda_cudart # cuda_runtime.h - cuda_nvcc - ] - ++ cuda-common-redist; - }; - - cuda-redist = symlinkJoin { - name = "cuda-redist-${cudaVersion}"; - paths = cuda-common-redist; - }; in buildPythonPackage rec { pname = "mmcv"; @@ -65,6 +42,8 @@ buildPythonPackage rec { hash = "sha256-NNF9sLJWV1q6uBE73LUW4UWwYm4TBMTBJjJkFArBmsc="; }; + env.CUDA_HOME = lib.optionalString cudaSupport (lib.getDev cudaPackages.cuda_nvcc); + preConfigure = '' export MMCV_WITH_OPS=1 @@ -77,7 +56,7 @@ buildPythonPackage rec { ''; postPatch = '' - substituteInPlace setup.py --replace "cpu_use = 4" "cpu_use = $NIX_BUILD_CORES" + substituteInPlace setup.py --replace-fail "cpu_use = 4" "cpu_use = $NIX_BUILD_CORES" ''; preCheck = '' @@ -102,12 +81,23 @@ buildPythonPackage rec { nativeBuildInputs = [ ninja which - ] ++ lib.optionals cudaSupport [ cuda-native-redist ]; + ]; - buildInputs = [ - pybind11 - torch - ] ++ lib.optionals cudaSupport [ cuda-redist ]; + buildInputs = + [ + pybind11 + torch + ] + ++ lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_cudart # cuda_runtime.h + cuda_cccl # <thrust/*> + libcublas # cublas_v2.h + libcusolver # cusolverDn.h + libcusparse # cusparse.h + ] + ); nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/mmengine/default.nix b/pkgs/development/python-modules/mmengine/default.nix index ff07caeb877e..78d3198e4155 100644 --- a/pkgs/development/python-modules/mmengine/default.nix +++ b/pkgs/development/python-modules/mmengine/default.nix @@ -1,24 +1,33 @@ { lib, - addict, + stdenv, buildPythonPackage, - coverage, fetchFromGitHub, - lmdb, + fetchpatch2, + + # build-system + setuptools, + + # dependencies + addict, matplotlib, - mlflow, numpy, opencv4, - parameterized, - pytestCheckHook, - pythonOlder, pyyaml, rich, - setuptools, - stdenv, termcolor, - torch, yapf, + + # checks + bitsandbytes, + coverage, + dvclive, + lion-pytorch, + lmdb, + mlflow, + parameterized, + pytestCheckHook, + transformers, }: buildPythonPackage rec { @@ -26,15 +35,28 @@ buildPythonPackage rec { version = "0.10.5"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "open-mmlab"; repo = "mmengine"; rev = "refs/tags/v${version}"; - hash = "sha256-+YDtYHp3BwKvzhmHC6hAZ3Qtc9uRZMo/TpWqdpm2hn0="; + hash = "sha256-bZ6O4UOYUCwq11YmgRWepOIngYxYD/fNfM/VmcyUv9k="; }; + patches = [ + (fetchpatch2 { + name = "mmengine-torch-2.5-compat.patch"; + url = "https://github.com/open-mmlab/mmengine/commit/4c22f78cdea2981a2b48a167e9feffe4721f8901.patch"; + hash = "sha256-k+IFLeqTEVUGGiqmZg56LK64H/UTvpGN20GJT59wf4A="; + }) + (fetchpatch2 { + # Bug reported upstream in https://github.com/open-mmlab/mmengine/issues/1575 + # PR: https://github.com/open-mmlab/mmengine/pull/1589 + name = "adapt-to-pytest-breaking-change"; + url = "https://patch-diff.githubusercontent.com/raw/open-mmlab/mmengine/pull/1589.patch"; + hash = "sha256-lyKf1GCLOPMpDttJ4s9hbATIGCVkiQhtyLfH9WzMWrw="; + }) + ]; + build-system = [ setuptools ]; dependencies = [ @@ -49,17 +71,20 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + bitsandbytes coverage + dvclive + lion-pytorch lmdb mlflow parameterized pytestCheckHook - torch + transformers ]; preCheck = '' - export HOME=$TMPDIR + export HOME=$(mktemp -d) '' # Otherwise, the backprop hangs forever. More precisely, this exact line: # https://github.com/open-mmlab/mmengine/blob/02f80e8bdd38f6713e04a872304861b02157905a/tests/test_runner/test_activation_checkpointing.py#L46 @@ -77,14 +102,6 @@ buildPythonPackage rec { "tests/test_runner/test_activation_checkpointing.py" # missing dependencies "tests/test_visualizer/test_vis_backend.py" - # Tests are outdated (runTest instead of run_test) - "mmengine/testing/_internal" - "tests/test_dist/test_dist.py" - "tests/test_dist/test_utils.py" - "tests/test_hooks/test_sync_buffers_hook.py" - "tests/test_model/test_wrappers/test_model_wrapper.py" - "tests/test_optim/test_optimizer/test_optimizer.py" - "tests/test_optim/test_optimizer/test_optimizer_wrapper.py" ]; disabledTests = [ @@ -108,12 +125,13 @@ buildPythonPackage rec { "test_close" ]; - meta = with lib; { + meta = { description = "Library for training deep learning models based on PyTorch"; homepage = "https://github.com/open-mmlab/mmengine"; changelog = "https://github.com/open-mmlab/mmengine/releases/tag/v${version}"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ rxiao ]; - broken = stdenv.isDarwin || (stdenv.isLinux && stdenv.isAarch64); + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ rxiao ]; + broken = + stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 460d128f5a9e..3493806d5fe4 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "1.7.1"; + version = "1.8.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = "mne-python"; rev = "refs/tags/v${version}"; - hash = "sha256-piCFynpKh7gTWIGh2g0gJICLS+eg/0XAxaDkyu7v5vs="; + hash = "sha256-WPRTX8yB4oP/L5DjSq9M6WOmHJDpQv0sAbuosp7ZGVw="; }; postPatch = '' @@ -40,12 +40,12 @@ buildPythonPackage rec { --replace-fail "--cov-branch" "" ''; - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs ]; - propagatedBuildInputs = [ + dependencies = [ numpy scipy matplotlib @@ -57,7 +57,7 @@ buildPythonPackage rec { lazy-loader ]; - passthru.optional-dependencies.hdf5 = [ + optional-dependencies.hdf5 = [ h5io pymatreader ]; @@ -65,7 +65,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-timeout - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export HOME=$(mktemp -d) @@ -74,8 +74,10 @@ buildPythonPackage rec { ''; disabledTests = [ - # Fails due to changes in Numpy types - "mne.stats._adjacency.combine_adjacency" + # requires qtbot which is unmaintained/not in Nixpkgs: + "test_plotting_scalebars" + # tries to write a datetime object to hdf5, which fails: + "test_hitachi_basic" ]; pythonImportsCheck = [ "mne" ]; diff --git a/pkgs/development/python-modules/mobly/default.nix b/pkgs/development/python-modules/mobly/default.nix index 046edf9a3da1..c4d400cae107 100644 --- a/pkgs/development/python-modules/mobly/default.nix +++ b/pkgs/development/python-modules/mobly/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -21,14 +22,14 @@ buildPythonPackage rec { pname = "mobly"; - version = "1.12.3"; + version = "1.12.4"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "mobly"; rev = "refs/tags/${version}"; - hash = "sha256-hhI1jrHJk4wo49MK8J4VTS2dGmHG2kwzgZeSWBXdXkA="; + hash = "sha256-77wZK5dqxXUkOgWE7NBpGJBbbtYYxRCJwPbtwLIX09I="; }; build-system = [ setuptools ]; @@ -47,6 +48,13 @@ buildPythonPackage rec { pytz ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # cannot access /usr/bin/pgrep from the sandbox + "test_stop_standing_subproc" + "test_stop_standing_subproc_and_descendants" + "test_stop_standing_subproc_without_pipe" + ]; + __darwinAllowLocalNetworking = true; meta = with lib; { diff --git a/pkgs/development/python-modules/mock-ssh-server/default.nix b/pkgs/development/python-modules/mock-ssh-server/default.nix index abf911588ba2..72fef03db247 100644 --- a/pkgs/development/python-modules/mock-ssh-server/default.nix +++ b/pkgs/development/python-modules/mock-ssh-server/default.nix @@ -4,23 +4,26 @@ fetchFromGitHub, paramiko, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "mock-ssh-server"; version = "0.9.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "carletes"; - repo = pname; + repo = "mock-ssh-server"; rev = "refs/tags/${version}"; hash = "sha256-yJd+WDidW5ouofytAKTlSiZhIQg2cLs8BvEp15qwtjo="; }; - propagatedBuildInputs = [ paramiko ]; + build-system = [ setuptools ]; + + dependencies = [ paramiko ]; # Tests are running into a timeout on Hydra, they work locally doCheck = false; diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index eb5ffb2b244f..b80549db4c13 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -26,6 +26,7 @@ httpx, psutil, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, redis, redis-server, @@ -36,12 +37,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.12.8"; + version = "3.13.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-++zGXLtQ01srmF0EqUFqaxh+mnNzW8IzYG1RzNGTXkw="; + hash = "sha256-GFzIDSE+09L4RC5w4h3fqgq9lkyOVjq5JN++ZNbHWc8="; }; nativeBuildInputs = [ hatchling ]; @@ -53,7 +54,7 @@ buildPythonPackage rec { urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { pook = [ pook ]; speedups = [ xxhash ]; }; @@ -66,20 +67,21 @@ buildPythonPackage rec { httpx psutil pytest-asyncio + pytest-cov-stub pytestCheckHook redis requests sure ] ++ lib.optionals (pythonOlder "3.12") [ aiohttp ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (builtins.attrValues optional-dependencies); - preCheck = lib.optionalString stdenv.isLinux '' + preCheck = lib.optionalString stdenv.hostPlatform.isLinux '' ${redis-server}/bin/redis-server & REDIS_PID=$! ''; - postCheck = lib.optionalString stdenv.isLinux '' + postCheck = lib.optionalString stdenv.hostPlatform.isLinux '' kill $REDIS_PID ''; @@ -98,7 +100,7 @@ buildPythonPackage rec { "test_no_dangling_fds" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ "tests/main/test_redis.py" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/main/test_redis.py" ]; pythonImportsCheck = [ "mocket" ]; diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix index 709a358c368c..4a5dc1a60be1 100644 --- a/pkgs/development/python-modules/mockito/default.nix +++ b/pkgs/development/python-modules/mockito/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "mockito"; - version = "1.5.0"; + version = "1.5.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-A2Eo2n2vLaiaC2N71zMh6ZL/ZbqKOYdsojPuwX63fo8="; + hash = "sha256-QFYkCRcVzDlU4vo5zFDlCNWXeNTS+1bI23v6X1k9MwM="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/model-bakery/default.nix b/pkgs/development/python-modules/model-bakery/default.nix index 464b2920a799..2a3a02e483da 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.19.5"; + version = "1.20.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "model-bakers"; repo = "model_bakery"; rev = "refs/tags/${version}"; - hash = "sha256-hOXE3mddGmRRgO9qAlj3bnmco8QTg2rD0sgui3J9pp8="; + hash = "sha256-71c5p6FypqbwUUoYu4dTamYnBlks1fiXTp7dUfc0ZQs="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/modelcif/default.nix b/pkgs/development/python-modules/modelcif/default.nix index 5604a067734d..04f94f5810cf 100644 --- a/pkgs/development/python-modules/modelcif/default.nix +++ b/pkgs/development/python-modules/modelcif/default.nix @@ -3,34 +3,33 @@ buildPythonPackage, fetchFromGitHub, setuptools, - wheel, ihm, pytestCheckHook, }: buildPythonPackage rec { pname = "modelcif"; - version = "1.0"; + version = "1.2"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-modelcif"; rev = "refs/tags/${version}"; - hash = "sha256-zJLwBdyUyWnH1hBx9Kejl5NfY7zJUxeGb//swBT02Dw="; + hash = "sha256-sduhRLtuJ/0BNsqmrhCr0lSrLMaOfE+TCWN4zj62aCQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools - wheel ]; - propagatedBuildInputs = [ ihm ]; + dependencies = [ ihm ]; nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # require network access + "test_associated_example" "test_validate_mmcif_example" "test_validate_modbase_example" ]; diff --git a/pkgs/development/python-modules/modeled/default.nix b/pkgs/development/python-modules/modeled/default.nix index 04655a61378f..43459fc5a598 100644 --- a/pkgs/development/python-modules/modeled/default.nix +++ b/pkgs/development/python-modules/modeled/default.nix @@ -34,7 +34,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "modeled" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "Universal data modeling for Python"; homepage = "https://github.com/modeled/modeled"; license = licenses.lgpl3Only; diff --git a/pkgs/development/python-modules/moderngl-window/default.nix b/pkgs/development/python-modules/moderngl-window/default.nix index 27fd4ef9663d..073c99026b9a 100644 --- a/pkgs/development/python-modules/moderngl-window/default.nix +++ b/pkgs/development/python-modules/moderngl-window/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pyrr ]; - passthru.optional-dependencies = { + optional-dependencies = { trimesh = [ trimesh scipy @@ -72,6 +72,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ c0deaddict ]; inherit (mesa.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/molecule/plugins.nix b/pkgs/development/python-modules/molecule/plugins.nix index b87c3b121b54..3d98ecd03980 100644 --- a/pkgs/development/python-modules/molecule/plugins.nix +++ b/pkgs/development/python-modules/molecule/plugins.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { docker = [ docker ]; vagrant = [ python-vagrant ]; }; diff --git a/pkgs/development/python-modules/momepy/default.nix b/pkgs/development/python-modules/momepy/default.nix index 6b551d58a909..7d6ffd6ff94d 100644 --- a/pkgs/development/python-modules/momepy/default.nix +++ b/pkgs/development/python-modules/momepy/default.nix @@ -19,15 +19,15 @@ buildPythonPackage rec { pname = "momepy"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "pysal"; repo = "momepy"; - rev = "v${version}"; - hash = "sha256-r2iGzk54MsrkYB3Sp9/B1QGKnvqPGUj3MQhk6yqIoXE="; + rev = "refs/tags/v${version}"; + hash = "sha256-9GVX+OaBkLb3Q/RRHbGOlAJ3gu2K+V07ez6v9dWU6JU="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/monai/default.nix b/pkgs/development/python-modules/monai/default.nix index d190facc17e7..1119f0b7993c 100644 --- a/pkgs/development/python-modules/monai/default.nix +++ b/pkgs/development/python-modules/monai/default.nix @@ -5,8 +5,8 @@ fetchpatch, pythonOlder, ninja, - ignite, numpy, + packaging, pybind11, torch, which, @@ -14,41 +14,38 @@ buildPythonPackage rec { pname = "monai"; - version = "1.3.2"; + version = "1.4.0"; pyproject = true; - disabled = pythonOlder "3.8"; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Project-MONAI"; repo = "MONAI"; rev = "refs/tags/${version}"; - hash = "sha256-wm4n3FuIXbE99RRLsGnZDeHtR/Tmj6C0s29pvflZg+o="; + hash = "sha256-PovYyRLgoYwxqGeCBpWxX/kdClYtYK1bgy8yRa9eue8="; + # note: upstream consistently seems to modify the tag shortly after release, + # so best to wait a few days before updating }; - patches = [ - (fetchpatch { - name = "remove-distutils"; - url = "https://github.com/Project-MONAI/MONAI/commit/87862f0d5730d42d282e779fc1450f18b4869863.patch"; - hash = "sha256-wApYfugDPWcuxwmd91peNqc0+l+SoMlT8hhx99oI2Co="; - }) - ]; - preBuild = '' export MAX_JOBS=$NIX_BUILD_CORES; ''; - nativeBuildInputs = [ + build-system = [ ninja which ]; + buildInputs = [ pybind11 ]; - propagatedBuildInputs = [ + + dependencies = [ numpy + packaging torch - ignite ]; - BUILD_MONAI = 1; + env.BUILD_MONAI = 1; doCheck = false; # takes too long; tries to download data diff --git a/pkgs/development/python-modules/monero/default.nix b/pkgs/development/python-modules/monero/default.nix index a0ef05cb3b05..4fdab49a521e 100644 --- a/pkgs/development/python-modules/monero/default.nix +++ b/pkgs/development/python-modules/monero/default.nix @@ -9,7 +9,7 @@ six, varint, pytestCheckHook, - pytest-cov, + pytest-cov-stub, responses, }: @@ -44,7 +44,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub responses ]; diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index 9dd7ff86968b..c548add2b7ce 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mongoengine"; - version = "0.28.2"; + version = "0.29.1"; format = "setuptools"; disabled = isPy27; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "MongoEngine"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5wcviRqUTOKqaeusHxS4Er3LD1BpTMW02Tip3d4zAPM="; + hash = "sha256-trWCKmCa+q+qtzF0HKCZMnko1cvvpwJvczLFuKtB83E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mongomock/default.nix b/pkgs/development/python-modules/mongomock/default.nix index 8c74f998f820..608422286622 100644 --- a/pkgs/development/python-modules/mongomock/default.nix +++ b/pkgs/development/python-modules/mongomock/default.nix @@ -2,29 +2,35 @@ lib, buildPythonPackage, fetchPypi, + hatch-vcs, + hatchling, packaging, - pbr, pytestCheckHook, pythonOlder, + pytz, sentinels, }: buildPythonPackage rec { pname = "mongomock"; - version = "4.1.2"; - format = "setuptools"; + version = "4.2.0.post1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-8GzWKvuK4+9jujE0mr0iCmV+8N1PAkOilYfFIT+TG30="; + hash = "sha256-kkHSzscnS5c22+jtrLGVKP9mrzs3ebMk157MQgEifzE="; }; - nativeBuildInputs = [ pbr ]; + build-system = [ + hatch-vcs + hatchling + ]; - propagatedBuildInputs = [ + dependencies = [ packaging + pytz sentinels ]; @@ -33,8 +39,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "mongomock" ]; meta = with lib; { - homepage = "https://github.com/mongomock/mongomock"; description = "Fake pymongo stub for testing simple MongoDB-dependent code"; + homepage = "https://github.com/mongomock/mongomock"; + changelog = "https://github.com/mongomock/mongomock/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ gador ]; }; diff --git a/pkgs/development/python-modules/monkeytype/default.nix b/pkgs/development/python-modules/monkeytype/default.nix new file mode 100644 index 000000000000..1f24608c8d17 --- /dev/null +++ b/pkgs/development/python-modules/monkeytype/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + libcst, + mypy-extensions, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "monkeytype"; + version = "23.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Instagram"; + repo = "MonkeyType"; + rev = "refs/tags/v${version}"; + hash = "sha256-DQ/3go53+0PQkhZcL2dX8MI/z4Iq7kTYd5EbacMNxT4="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + libcst + mypy-extensions + ]; + + pythonImportsCheck = [ + "monkeytype" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Disable broken tests + "test_excludes_site_packages" + "test_callee_throws_recovers" + "test_nested_callee_throws_recovers" + "test_caller_handles_callee_exception" + "test_generator_trace" + "test_return_none" + "test_access_property" + ]; + + meta = { + description = "Python library that generates static type annotations by collecting runtime types"; + homepage = "https://github.com/Instagram/MonkeyType/"; + changelog = "https://github.com/Instagram/MonkeyType/blob/${src.rev}/CHANGES.rst"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/monotonic/default.nix b/pkgs/development/python-modules/monotonic/default.nix index 8b138a383080..46e8e0f35492 100644 --- a/pkgs/development/python-modules/monotonic/default.nix +++ b/pkgs/development/python-modules/monotonic/default.nix @@ -15,9 +15,9 @@ buildPythonPackage rec { sha256 = "3a55207bcfed53ddd5c5bae174524062935efed17792e9de2ad0205ce9ad63f7"; }; - __propagatedImpureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libc.dylib"; + __propagatedImpureHostDeps = lib.optional stdenv.hostPlatform.isDarwin "/usr/lib/libc.dylib"; - patchPhase = lib.optionalString stdenv.isLinux '' + patchPhase = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace monotonic.py --replace \ "ctypes.util.find_library('c')" "'${stdenv.cc.libc}/lib/libc.so'" ''; diff --git a/pkgs/development/python-modules/monzopy/default.nix b/pkgs/development/python-modules/monzopy/default.nix index 799f788d6f12..817a553581d4 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.2"; + version = "1.4.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-9Gj0312NOumoIWN/ES+dgPL3IblgvBSCPZA97OKuhZQ="; + hash = "sha256-yO0mdqdoRdyl6BDT1vBuTh83zECck3atQtdtWhQCh9s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index ea2b3c43509d..602c2399fa8f 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "10.3.0"; + version = "10.5.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-5dk+9BEiT7zvNmpujdxMV4G8Y1nUNBKmXdWWTkYRFGM="; + hash = "sha256-VIK/73hJwl3Dxt1Tphc65HldoqQagPrqZwDZ9YRsXaY="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/morecantile/default.nix b/pkgs/development/python-modules/morecantile/default.nix index 0a8a5001c003..948d74284584 100644 --- a/pkgs/development/python-modules/morecantile/default.nix +++ b/pkgs/development/python-modules/morecantile/default.nix @@ -17,15 +17,15 @@ buildPythonPackage rec { pname = "morecantile"; - version = "5.4.2"; + version = "6.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "developmentseed"; repo = "morecantile"; - rev = version; - hash = "sha256-kUAde+6IUu95tFHFCB6kWoYsRf9GxR+gRJki/tvhIaY="; + rev = "refs/tags/${version}"; + hash = "sha256-l+fQQXOrhqRanB695nR4okfmPYP05NdrGOvgG+jK2uo="; }; nativeBuildInputs = [ flit ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { rasterio ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/developmentseed/morecantile/issues/156 "test_tiles_when_tms_bounds_and_provided_bounds_cross_antimeridian" ]; diff --git a/pkgs/development/python-modules/motionblindsble/default.nix b/pkgs/development/python-modules/motionblindsble/default.nix index 0b87622e4c38..81c1964f06fc 100644 --- a/pkgs/development/python-modules/motionblindsble/default.nix +++ b/pkgs/development/python-modules/motionblindsble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "motionblindsble"; - version = "0.1.1"; + version = "0.1.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "LennP"; repo = "motionblindsble"; rev = "refs/tags/${version}"; - hash = "sha256-GKCSPiwtE3O1vVFzamFkURc+V0w6u19B0vdvkpLY9ZE="; + hash = "sha256-MBO8tiGTd5qF7zGp+RkkV8nJHP9TJvk3LdWsZqlsl50="; }; postPatch = '' diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix index 1d27f9e0dbbb..487de3c3228c 100644 --- a/pkgs/development/python-modules/motioneye-client/default.nix +++ b/pkgs/development/python-modules/motioneye-client/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/dermotduffy/motioneye-client"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 3f5ae8133936..e4cee7571da9 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -1,57 +1,50 @@ { lib, - buildPythonPackage, - fetchPypi, - pythonOlder, - - # build-system - setuptools, - - # dependencies - boto3, - botocore, - cryptography, - jinja2, - python-dateutil, - requests, - responses, - werkzeug, - xmltodict, - - # optional-dependencies antlr4-python3-runtime, aws-xray-sdk, + boto3, + botocore, + buildPythonPackage, cfn-lint, - flask, - flask-cors, + crc32c, + cryptography, docker, + fetchPypi, + flask-cors, + flask, + freezegun, graphql-core, + jinja2, joserfc, - jsonpath-ng, jsondiff, + jsonpath-ng, multipart, openapi-spec-validator, py-partiql-parser, pyparsing, - pyyaml, - - # tests - freezegun, - pytestCheckHook, pytest-order, pytest-xdist, + pytestCheckHook, + python-dateutil, + pythonOlder, + pyyaml, + requests, + responses, + setuptools, + werkzeug, + xmltodict, }: buildPythonPackage rec { pname = "moto"; - version = "5.0.12"; + version = "5.0.18"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-EL1DS/2jKWOf6VKUcMTCeTgGTBOZhAJOamJRPlCv9Cc="; + hash = "sha256-inrS9ToubMnbL/ZcDg1LXX54vAC4Jcnh/2zDlDceduk="; }; build-system = [ setuptools ]; @@ -69,7 +62,6 @@ buildPythonPackage rec { ]; optional-dependencies = { - # non-exhaustive list of extras, that was cobbled together for testing all = [ antlr4-python3-runtime aws-xray-sdk @@ -83,21 +75,112 @@ buildPythonPackage rec { jsonpath-ng multipart openapi-spec-validator + py-partiql-parser + pyparsing + pyyaml + setuptools + ]; + proxy = [ + antlr4-python3-runtime + aws-xray-sdk + cfn-lint + docker + graphql-core + joserfc + jsondiff + jsonpath-ng + multipart + openapi-spec-validator + py-partiql-parser pyparsing + pyyaml + setuptools + ]; + server = [ + antlr4-python3-runtime + aws-xray-sdk + cfn-lint + docker + flask + flask-cors + graphql-core + joserfc + jsondiff + jsonpath-ng + openapi-spec-validator py-partiql-parser + pyparsing pyyaml setuptools ]; cognitoidp = [ joserfc ]; + apigateway = [ + pyyaml + joserfc + openapi-spec-validator + ]; + apigatewayv2 = [ + pyyaml + openapi-spec-validator + ]; + cloudformation = [ + aws-xray-sdk + cfn-lint + docker + graphql-core + joserfc + jsondiff + openapi-spec-validator + py-partiql-parser + pyparsing + pyyaml + setuptools + ]; + dynamodb = [ + docker + py-partiql-parser + ]; + dynamodbstreams = [ + docker + py-partiql-parser + ]; + events = [ jsonpath-ng ]; + glue = [ pyparsing ]; + iotdata = [ jsondiff ]; + resourcegroupstaggingapi = [ + cfn-lint + docker + graphql-core + joserfc + jsondiff + openapi-spec-validator + py-partiql-parser + pyparsing + pyyaml + ]; + s3 = [ + pyyaml + py-partiql-parser + ]; + sns = [ ]; + stepfunctions = [ + antlr4-python3-runtime + jsonpath-ng + ]; + s3crc32c = [ + pyyaml + py-partiql-parser + crc32c + ]; }; __darwinAllowLocalNetworking = true; nativeCheckInputs = [ freezegun - pytestCheckHook pytest-order pytest-xdist + pytestCheckHook ] ++ optional-dependencies.all; # Some tests depend on AWS credentials environment variables to be set. @@ -111,36 +194,44 @@ buildPythonPackage rec { # Matches upstream configuration, presumably due to expensive setup/teardown. "--dist" "loadscope" + ]; + disabledTests = [ # Fails at local name resolution - "--deselect=tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header" - "--deselect=tests/test_s3/test_server.py::test_s3_server_post_cors_multiple_origins" - "--deselect=tests/test_s3/test_s3_file_handles.py::TestS3FileHandleClosuresUsingMocks::test_create_multipart" - "--deselect=tests/test_core/test_responses_module.py::TestResponsesMockWithPassThru::test_aws_and_http_requests" - "--deselect=tests/test_core/test_responses_module.py::TestResponsesMockWithPassThru::test_http_requests" + "test_with_custom_request_header" + "test_s3_server_post_cors_multiple_origins" + "test_create_multipart" + "test_aws_and_http_requests" + "test_http_requests" # Fails at resolving google.com - "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_http_destination" - "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination" + "test_put_record_http_destination" + "test_put_record_batch_http_destination" # Fails at resolving s3.amazonaws.com - "--deselect=tests/test_core/test_request_passthrough.py::test_passthrough_calls_for_wildcard_urls" - "--deselect=tests/test_core/test_request_passthrough.py::test_passthrough_calls_for_specific_url" - "--deselect=tests/test_core/test_request_passthrough.py::test_passthrough_calls_for_entire_service" + "test_passthrough_calls_for_wildcard_urls" + "test_passthrough_calls_for_specific_url" + "test_passthrough_calls_for_entire_service" # Download recordings returns faulty JSON - "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_ec2_instance_creation_recording_on" - "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_ec2_instance_creation__recording_off" + "test_ec2_instance_creation_recording_on" + "test_ec2_instance_creation__recording_off" # Connection Reset by Peer, when connecting to localhost:5678 - "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_replay" + "test_replay" # Flaky under parallel execution - "--deselect=tests/test_cloudformation/test_server.py::test_cloudformation_server_get" - "--deselect=tests/test_core/test_moto_api.py::TestModelDataResetForClassDecorator::test_should_find_bucket" + "test_cloudformation_server_get" + "test_should_find_bucket" # AssertionError: assert ResourceWarning not in [<class 'ResourceWarning'>, <class 'ResourceWarning'>] - "--deselect=ests/test_s3/test_s3_file_handles.py::TestS3FileHandleClosuresUsingMocks::test_delete_object_with_version" + "test_delete_object_with_version" + + # KeyError beucase of ap-southeast-5-apse5-az + "test_zoneId_in_availability_zones" + + # Parameter validation fails + "test_conditional_write" ]; disabledTestPaths = [ @@ -164,11 +255,11 @@ buildPythonPackage rec { "tests/test_cognitoidp/test_cognitoidp.py" ]; - meta = with lib; { + meta = { description = "Allows your tests to easily mock out AWS Services"; homepage = "https://github.com/getmoto/moto"; changelog = "https://github.com/getmoto/moto/blob/${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = [ ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ onny ]; }; } diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix index 1a8aa99a3679..1d003b77fa3a 100644 --- a/pkgs/development/python-modules/motor/default.nix +++ b/pkgs/development/python-modules/motor/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "motor"; - version = "3.5.1"; + version = "3.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mongodb"; repo = "motor"; rev = "refs/tags/${version}"; - hash = "sha256-mg31FzMF0xEEhfLKAdF2pzEkULESFFGaXnE0uospXqE="; + hash = "sha256-fSHb39C4WaQVt7jT714kxwkpUw3mV9jNgkdUyVnD+S4="; }; build-system = [ diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 1c9e917b60ab..74fadd5d2e49 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { tqdm ]; - passthru.optional-dependencies = { + optional-dependencies = { optionals = [ matplotlib scikit-image @@ -62,7 +62,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "moviepy" ]; diff --git a/pkgs/development/python-modules/mozart-api/default.nix b/pkgs/development/python-modules/mozart-api/default.nix index 053b922c148b..f84ad7a37a86 100644 --- a/pkgs/development/python-modules/mozart-api/default.nix +++ b/pkgs/development/python-modules/mozart-api/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mozart-api"; - version = "3.4.1.8.8"; + version = "4.1.1.116.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mozart_api"; inherit version; - hash = "sha256-Lonv9f7/FSEdisKOuL+T1gKbxpog22DcNZTaK9L84Mc="; + hash = "sha256-QVh1MplzUL0LO3gPvxC/5uJjFoK57j2WdT2oMsneIkA="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix index 3f8b44f5dcf7..7ca19c597c16 100644 --- a/pkgs/development/python-modules/mpd2/default.nix +++ b/pkgs/development/python-modules/mpd2/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { twisted = [ twisted ]; }; - nativeCheckInputs = [ unittestCheckHook ] ++ passthru.optional-dependencies.twisted; + nativeCheckInputs = [ unittestCheckHook ] ++ optional-dependencies.twisted; meta = with lib; { changelog = "https://github.com/Mic92/python-mpd2/blob/v${version}/doc/changes.rst"; diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 1aba82440888..e8d3ac8be8ac 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -5,23 +5,20 @@ cython, setuptools, mpi, - openssh, pytestCheckHook, mpiCheckPhaseHook, }: buildPythonPackage rec { pname = "mpi4py"; - # 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"; + version = "4.0.1"; pyproject = true; src = fetchFromGitHub { repo = "mpi4py"; owner = "mpi4py"; - rev = "e9a59719bbce1b9c351e1e30ecd3be3b459e97cd"; - hash = "sha256-C/nidWGr8xsLV73u7HRtnXoQgYmoRJkD45DFrdXXTPI="; + rev = version; + hash = "sha256-pH4z+hyoFOSAUlXv9EKO54/SM5HyLxv7B+18xBidH2Q="; }; build-system = [ @@ -37,13 +34,9 @@ buildPythonPackage rec { 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; + doCheck = true; disabledTestPaths = [ # Almost all tests in this file fail (TODO: Report about this upstream..) "test/test_spawn.py" diff --git a/pkgs/development/python-modules/mplhep-data/default.nix b/pkgs/development/python-modules/mplhep-data/default.nix index 0c6baa8b3e3e..f70992714977 100644 --- a/pkgs/development/python-modules/mplhep-data/default.nix +++ b/pkgs/development/python-modules/mplhep-data/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mplhep-data"; - version = "0.0.3"; + version = "0.0.4"; format = "pyproject"; src = fetchPypi { pname = "mplhep_data"; inherit version; - hash = "sha256-tU0lfz9TyTpELNp6ZoHOJnJ34JFzwLQf14gg94Mhdy8="; + hash = "sha256-zR8606+dv/M67550BtITDWJKC9HVqllw/HE6ZCEWWk4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix index 6f0f289e853b..308b57376dce 100644 --- a/pkgs/development/python-modules/mpmath/default.nix +++ b/pkgs/development/python-modules/mpmath/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { gmpy = lib.optionals (!isPyPy) [ gmpy2 ]; }; diff --git a/pkgs/development/python-modules/mrjob/default.nix b/pkgs/development/python-modules/mrjob/default.nix index 669fee8887fb..35af2272ff58 100644 --- a/pkgs/development/python-modules/mrjob/default.nix +++ b/pkgs/development/python-modules/mrjob/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { aws = [ boto3 botocore @@ -60,7 +60,7 @@ buildPythonPackage rec { pyspark unittestCheckHook warcio - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); unittestFlagsArray = [ "-v" ]; diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index 7fa2d3fccf0e..bfbaabb54505 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.30.0"; + version = "1.31.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tL8AhQCS5GUVfYFO+iShj3iChMmkeUkQJNYpAwheovs="; + hash = "sha256-LE8YnPnMjwDIAEX2bTm3wPPtRYc/09Hyr58i2y4S/0s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index 8824d519544c..a6c4893007b0 100644 --- a/pkgs/development/python-modules/msgpack/default.nix +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -1,26 +1,28 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, - pythonOlder, setuptools, + cython, borgbackup, }: buildPythonPackage rec { pname = "msgpack"; - version = "1.0.8"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-lcArDifnBuSNDlQm0XEMp44PBijW6J1bWluRpfEidPM="; + version = "1.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "msgpack"; + repo = "msgpack-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-yKQcQi0oSJ33gzsx1Q6ME3GbuSaHR091n7maU6F5QlU="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; + + nativeBuildInputs = [ cython ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -32,6 +34,10 @@ buildPythonPackage rec { inherit borgbackup; }; + preBuild = '' + make cython + ''; + meta = with lib; { description = "MessagePack serializer implementation"; homepage = "https://github.com/msgpack/msgpack-python"; diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix index 411b434bbac7..717c03e50ea6 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.3"; + version = "1.1.6"; 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-n0mAMuTRNEN+bCOvKoDFwL7nlv2mboO65nn6fDCITk4="; + hash = "sha256-W1tttt4jWGftW8zzklHV3SrAyugi6XZv0PYGs3T5gZ4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 1a8e6c78c56e..b851ad6c8ece 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.8.0"; + version = "1.12.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Vud/MaRmY/xmTJXofF8BHpl3TRxfrxlUdX0xDHKpwIA="; + hash = "sha256-RB5DxcddMmByWZ4XA/SaIVVxPXdqSRCUbTeWIR5YW2g="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/msprime/default.nix b/pkgs/development/python-modules/msprime/default.nix index 087ee01fdc55..c0cd877ccaaa 100644 --- a/pkgs/development/python-modules/msprime/default.nix +++ b/pkgs/development/python-modules/msprime/default.nix @@ -18,16 +18,22 @@ buildPythonPackage rec { pname = "msprime"; - version = "1.3.1"; + version = "1.3.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-s/Ys1RatLkPIQS6h8kKsrRvJOTkc/pyqGWJYdOLjSDU="; + hash = "sha256-2K55gHYWf2Mrj9fszVCJ+qqEyQNMppQi+IZCX5SlsBs="; }; + postPatch = '' + # build-time constriant, used to ensure forward and backward compat + substituteInPlace pyproject.toml \ + --replace-fail "numpy>=2" "numpy" + ''; + nativeBuildInputs = [ gsl oldest-supported-numpy diff --git a/pkgs/development/python-modules/mss/default.nix b/pkgs/development/python-modules/mss/default.nix index b94269a4a3b8..8be69129140f 100644 --- a/pkgs/development/python-modules/mss/default.nix +++ b/pkgs/development/python-modules/mss/default.nix @@ -3,27 +3,63 @@ buildPythonPackage, fetchPypi, pythonOlder, + stdenv, + substituteAll, + + # build-system + hatchling, + + # native dependencies + xorg, + + # tests + lsof, + pillow, + pytest-cov-stub, + pytest, + pyvirtualdisplay, + xvfb-run, }: buildPythonPackage rec { pname = "mss"; - version = "9.0.1"; - format = "setuptools"; + version = "9.0.2"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-bre5AIzydCiBH6M66zXzM024Hj98wt1J7HxuWpSznxI="; + hash = "sha256-yWpOxzIk2n2yK8B+88+qGPi4aQDRhy4pETu87wCToh4="; }; - prePatch = '' - # By default it attempts to build Windows-only functionality - rm src/mss/windows.py - ''; + patches = lib.optionals stdenv.isLinux [ + (substituteAll { + src = ./linux-paths.patch; + x11 = "${xorg.libX11}/lib/libX11.so"; + xfixes = "${xorg.libXfixes}/lib/libXfixes.so"; + xrandr = "${xorg.libXrandr}/lib/libXrandr.so"; + }) + ]; - # Skipping tests due to most relying on DISPLAY being set - doCheck = false; + build-system = [ hatchling ]; + + doCheck = stdenv.isLinux; + + nativeCheckInputs = [ + lsof + pillow + pytest-cov-stub + pytest + pyvirtualdisplay + xvfb-run + ]; + + checkPhase = '' + runHook preCheck + xvfb-run pytest -k "not test_grab_with_tuple and not test_grab_with_tuple_percents and not test_resource_leaks" + runHook postCheck + ''; pythonImportsCheck = [ "mss" ]; diff --git a/pkgs/development/python-modules/mss/linux-paths.patch b/pkgs/development/python-modules/mss/linux-paths.patch new file mode 100644 index 000000000000..e8727d80b20f --- /dev/null +++ b/pkgs/development/python-modules/mss/linux-paths.patch @@ -0,0 +1,17 @@ +diff --git a/src/mss/linux.py b/src/mss/linux.py +index 6dac52b..c90bd93 100644 +--- a/src/mss/linux.py ++++ b/src/mss/linux.py +@@ -185,9 +185,9 @@ class XWindowAttributes(Structure): + + + _ERROR = {} +-_X11 = find_library("X11") +-_XFIXES = find_library("Xfixes") +-_XRANDR = find_library("Xrandr") ++_X11 = "@x11@" ++_XFIXES = "@xfixes@" ++_XRANDR = "@xrandr@" + + + @CFUNCTYPE(c_int, POINTER(Display), POINTER(XErrorEvent)) diff --git a/pkgs/development/python-modules/mtcnn/default.nix b/pkgs/development/python-modules/mtcnn/default.nix new file mode 100644 index 000000000000..a82f386c6e5d --- /dev/null +++ b/pkgs/development/python-modules/mtcnn/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + opencv-python, + pytestCheckHook, + pythonOlder, + setuptools, + tensorflow, +}: + +buildPythonPackage { + pname = "mtcnn"; + version = "0.1.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ipazc"; + repo = "mtcnn"; + # No tags / releases; using commit: https://github.com/ipazc/mtcnn/commit/3208d443a8f01d317c65d7c97a03bc0a6143c41d + rev = "3208d443a8f01d317c65d7c97a03bc0a6143c41d"; + hash = "sha256-GXUrLJ5XD6V2hT/gjyYSuh/CMMw2xIXKBsYFvQmbLYs="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "setup, setuptools" "setup, find_packages"\ + --replace-fail "setuptools.find_packages" "find_packages"\ + --replace-fail "keras>=2.0.0" ""\ + --replace-fail "tests_require=['nose']," "" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + opencv-python + tensorflow + ]; + + pythonImportsCheck = [ "mtcnn" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "MTCNN face detection implementation for TensorFlow"; + homepage = "https://github.com/ipazc/mtcnn"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ derdennisop ]; + }; +} diff --git a/pkgs/development/python-modules/mujoco/default.nix b/pkgs/development/python-modules/mujoco/default.nix index 6416d75a3848..41396500a9fd 100644 --- a/pkgs/development/python-modules/mujoco/default.nix +++ b/pkgs/development/python-modules/mujoco/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { # in the project's CI. src = fetchPypi { inherit pname version; - hash = "sha256-3WF/QMHARPXff7yTM9MJTTyIYp1OPYYiTly0LeQKaos="; + hash = "sha256-CJHREBSY5zft9UsKmniB0P4sGKSls1cUDdl1TZE2rUM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 0321c5deba97..416df76262f4 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -1,37 +1,45 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "multidict"; - version = "6.0.5"; + version = "6.1.0"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-9+MBB17a9QUA8LNBVDxBGU2N865cr0cC8glfPKc92No="; + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "multidict"; + rev = "refs/tags/v${version}"; + hash = "sha256-rvL1XzMNBVBlElE5wznecL3Ku9h4tG9VeqGRd04iPXw="; }; postPatch = '' - substituteInPlace pytest.ini \ - --replace-fail "-p pytest_cov" "" - sed -i '/--cov/d' pytest.ini # `python3 -I -c "import multidict"` fails with ModuleNotFoundError substituteInPlace tests/test_circular_imports.py \ --replace-fail '"-I",' "" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + dependencies = lib.optionals (pythonOlder "3.11") [ + typing-extensions + ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; preCheck = '' # import from $out diff --git a/pkgs/development/python-modules/multipart/default.nix b/pkgs/development/python-modules/multipart/default.nix index 312699ecda41..46ccd9bfa8f3 100644 --- a/pkgs/development/python-modules/multipart/default.nix +++ b/pkgs/development/python-modules/multipart/default.nix @@ -1,28 +1,31 @@ { lib, buildPythonPackage, - fetchPypi, - setuptools, + fetchFromGitHub, + flit-core, pytestCheckHook, }: buildPythonPackage rec { pname = "multipart"; - version = "0.2.5"; + version = "1.1.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-+piDjUDJZ7sZWJYmoPuKXEDEId2i/r4bA1H89ibiRlE="; + src = fetchFromGitHub { + owner = "defnull"; + repo = "multipart"; + rev = "refs/tags/v${version}"; + hash = "sha256-RaHAV1LapYf0zRW7cxxbe7ysAJ5xB6EvF1bsCbCWS0U="; }; - build-system = [ setuptools ]; + build-system = [ flit-core ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "multipart" ]; meta = { + changelog = "https://github.com/defnull/multipart/blob/${src.rev}/README.rst#changelog"; description = "Parser for multipart/form-data"; homepage = "https://github.com/defnull/multipart"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/multiscale-spatial-image/default.nix b/pkgs/development/python-modules/multiscale-spatial-image/default.nix index 41b4a720fc50..fbd798d3f419 100644 --- a/pkgs/development/python-modules/multiscale-spatial-image/default.nix +++ b/pkgs/development/python-modules/multiscale-spatial-image/default.nix @@ -9,7 +9,6 @@ python-dateutil, spatial-image, xarray, - xarray-datatree, zarr, dask-image, fsspec, @@ -23,7 +22,7 @@ buildPythonPackage rec { pname = "multiscale-spatial-image"; - version = "1.0.1"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +31,7 @@ buildPythonPackage rec { owner = "spatial-image"; repo = "multiscale-spatial-image"; rev = "refs/tags/v${version}"; - hash = "sha256-s/88N8IVkj+9MZYAtEJSpmmDdjIxf4S6U5gYr86Ikrw="; + hash = "sha256-oxxPXzItM7uXtyLoLyUHVf4YOoAYvI40kU7lVgp4gAg="; }; build-system = [ hatchling ]; @@ -43,7 +42,6 @@ buildPythonPackage rec { python-dateutil spatial-image xarray - xarray-datatree zarr ]; diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix index 1bdc53e90d01..4a81bbe55954 100644 --- a/pkgs/development/python-modules/mwclient/default.nix +++ b/pkgs/development/python-modules/mwclient/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, mock, + pytest-cov-stub, pytestCheckHook, pythonOlder, requests, @@ -12,7 +13,7 @@ }: buildPythonPackage rec { - version = "0.10.1"; + version = "0.11.0"; pname = "mwclient"; format = "setuptools"; @@ -21,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mwclient"; repo = "mwclient"; - rev = "v${version}"; - sha256 = "120snnsh9n5svfwkyj1w9jrxf99jnqm0jk282yypd3lpyca1l9hj"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-qnWVQEG1Ri0z4RYmmG/fxYrlIFFf/6PnP5Dnv0cZb5I="; }; propagatedBuildInputs = [ @@ -33,15 +34,11 @@ buildPythonPackage rec { nativeCheckInputs = [ mock + pytest-cov-stub pytestCheckHook responses ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace " --cov mwclient test" "" - ''; - pythonImportsCheck = [ "mwclient" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mwoauth/default.nix b/pkgs/development/python-modules/mwoauth/default.nix index e592420111d6..ed1b59ddb32e 100644 --- a/pkgs/development/python-modules/mwoauth/default.nix +++ b/pkgs/development/python-modules/mwoauth/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mwoauth"; - version = "0.3.8"; + version = "0.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CNr07auqD5WoRfmOVwfecxaoODqWJfIK52iwNZkcNqw="; + hash = "sha256-IuNAPnSOcBRvjszBQw/lQsn5xP9nfv9CSlLmRPbY98U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix index 9ee368551103..3b9f692d7205 100644 --- a/pkgs/development/python-modules/mxnet/default.nix +++ b/pkgs/development/python-modules/mxnet/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, pkgs, + setuptools, + distutils, requests, numpy, graphviz, @@ -12,16 +14,23 @@ buildPythonPackage { inherit (pkgs.mxnet) pname version src; + pyproject = true; - format = "setuptools"; + build-system = [ setuptools ]; buildInputs = [ pkgs.mxnet ]; - propagatedBuildInputs = [ + + dependencies = [ + distutils requests numpy graphviz ]; + pythonRelaxDeps = [ + "graphviz" + ]; + LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.mxnet ]; doCheck = !isPy3k; @@ -29,9 +38,7 @@ buildPythonPackage { postPatch = '' # Required to support numpy >=1.24 where np.bool is removed in favor of just bool substituteInPlace python/mxnet/numpy/utils.py \ - --replace "bool = onp.bool" "bool = bool" - substituteInPlace python/setup.py \ - --replace "graphviz<0.9.0," "graphviz" + --replace-fail "bool = onp.bool" "bool = bool" ''; preConfigure = '' diff --git a/pkgs/development/python-modules/myjwt/default.nix b/pkgs/development/python-modules/myjwt/default.nix index 78e368360a41..094065310854 100644 --- a/pkgs/development/python-modules/myjwt/default.nix +++ b/pkgs/development/python-modules/myjwt/default.nix @@ -68,6 +68,6 @@ buildPythonPackage rec { license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; # Build failures - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 66a865f3c719..d900824c4867 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -58,16 +58,16 @@ rec { "sha256-kdakfB1uRg5K+FZyeNSQxvBYj0+ztJrDTq4Dkh6dqAA="; mypy-boto3-acm-pca = - buildMypyBoto3Package "acm-pca" "1.35.0" - "sha256-YU4Djb4Z9//5WYvkSgv9vlv4oG8Da6dP/Oktpuff4q0="; + buildMypyBoto3Package "acm-pca" "1.35.38" + "sha256-9hJo5ZV8ckN5+V/L6MOowyWr2eZoroVRmzooMDDA6WE="; mypy-boto3-amp = - buildMypyBoto3Package "amp" "1.35.0" - "sha256-Pm/KyqcUUAQBZjQKaVhuL/9c+qfkgfeD51esgE+EgQw="; + buildMypyBoto3Package "amp" "1.35.53" + "sha256-kPQ6DAbf1hEmDyDu8SFAL4WwTrmhEkNsg3ndEbhgJvg="; mypy-boto3-amplify = - buildMypyBoto3Package "amplify" "1.35.19" - "sha256-EP342ZP67DkGOrA2hLiv0iE1mL6SpaUOY8BHCdhaqRE="; + buildMypyBoto3Package "amplify" "1.35.41" + "sha256-s17sJsHlnr6L8SGyhVUtdb8xJNsO441QzidzxgoK99I="; mypy-boto3-amplifybackend = buildMypyBoto3Package "amplifybackend" "1.35.0" @@ -78,8 +78,8 @@ rec { "sha256-/muCi4o6A3bmAvc4w5lSla9ZtE3rMkJoL3LlEjzKoms="; mypy-boto3-apigateway = - buildMypyBoto3Package "apigateway" "1.35.0" - "sha256-C+E2aFhPewVkNm0bIAdX2g19A+UoTIFaPM+cE8Khy3A="; + buildMypyBoto3Package "apigateway" "1.35.25" + "sha256-6jtBmuho1j8GE+6sxqdYYf1XtonWoUu3Vi7tMDkTpa4="; mypy-boto3-apigatewaymanagementapi = buildMypyBoto3Package "apigatewaymanagementapi" "1.35.0" @@ -90,8 +90,8 @@ rec { "sha256-yZy38db9vBO64Bw01X2iDEQFb4dBGik+3qLntaG4538="; mypy-boto3-appconfig = - buildMypyBoto3Package "appconfig" "1.35.8" - "sha256-YLoxt3nGjbgDjjyfyRX/qQamX5LpuXhCU6i9msGl/aI="; + buildMypyBoto3Package "appconfig" "1.35.48" + "sha256-rNPWvmbvopDcCfY2ntjpZYG/fL6xu8dHejtKcp4Gsm4="; mypy-boto3-appconfigdata = buildMypyBoto3Package "appconfigdata" "1.35.0" @@ -102,8 +102,8 @@ rec { "sha256-jwjD2mkz6YpUEOwEHMNiIzBNoVwYUUONQjKZemGFEl8="; mypy-boto3-appflow = - buildMypyBoto3Package "appflow" "1.35.0" - "sha256-tNCfrUzsRHhpfIY+D2Y+OscMnYw7lGeYhFvs+wHq9zk="; + buildMypyBoto3Package "appflow" "1.35.39" + "sha256-W5GJoGRQUcjTBUYAWJjBgMKcAKRdn63deVsyU6ezRIU="; mypy-boto3-appintegrations = buildMypyBoto3Package "appintegrations" "1.35.0" @@ -114,8 +114,8 @@ rec { "sha256-JsQYZqlzCM64Uxk3btQZm8dX/oSHsy1l29dUG7n025s="; mypy-boto3-application-insights = - buildMypyBoto3Package "application-insights" "1.35.0" - "sha256-PQcqaUxzDx91mwL55prFG2EFdQQw278ugQUAVhgzLX8="; + buildMypyBoto3Package "application-insights" "1.35.45" + "sha256-rXdCTd/cv1F+VWlWnT0VBPdE0JZzXnI5QJu7Tk1rq4Y="; mypy-boto3-applicationcostprofiler = buildMypyBoto3Package "applicationcostprofiler" "1.35.0" @@ -130,28 +130,28 @@ rec { "sha256-NDA1+HZ+Srs5XyNTnHxOjsUPAPRPXgeum0Q6h3Ca7zo="; mypy-boto3-appstream = - buildMypyBoto3Package "appstream" "1.35.0" - "sha256-KuDlcfOuF3krMocvgR2LaP2+xKeYl2CMPKRewN8inj4="; + buildMypyBoto3Package "appstream" "1.35.32" + "sha256-HK2Eh7uNihu+st+A51z+3uYlPacOkpp7Ic3+xIWHhJ0="; mypy-boto3-appsync = - buildMypyBoto3Package "appsync" "1.35.12" - "sha256-mHIUStFvFUTvHYWdZUNcIIOI//vNACI0veXXNLAAOVY="; + buildMypyBoto3Package "appsync" "1.35.52" + "sha256-KT61EeM5e0ZioxRrWW0EbKdmDuEgsWbuZoWz9FGLIt0="; mypy-boto3-arc-zonal-shift = buildMypyBoto3Package "arc-zonal-shift" "1.35.0" "sha256-l5hKmbwel2Z5BvQbuKXRsfusKU28laF5mVDDPW+Ij0g="; mypy-boto3-athena = - buildMypyBoto3Package "athena" "1.35.0" - "sha256-f/q3R4ZvUQ2+r/XXdGT/MFqiilKaCmdRwj7QuCJ1ZJo="; + buildMypyBoto3Package "athena" "1.35.44" + "sha256-2eDPfyD3gm+kOyVUOn83aAAEPO+IzTahq3CPkaICqJI="; mypy-boto3-auditmanager = buildMypyBoto3Package "auditmanager" "1.35.0" "sha256-nr00I/1oqR16ZIw3+iA2BrS0C0Wr7UlJ48VnuOFIcb0="; mypy-boto3-autoscaling = - buildMypyBoto3Package "autoscaling" "1.35.4" - "sha256-XRAj8UYVmjQ0GjAevPGs1/g2XRsoCElCNaj1kPrWyCo="; + buildMypyBoto3Package "autoscaling" "1.35.56" + "sha256-UmJt7Yp7Nf5M/PV6c077GMYVdKbFT9XGV/o6Y7HSbs0="; mypy-boto3-autoscaling-plans = buildMypyBoto3Package "autoscaling-plans" "1.35.0" @@ -166,8 +166,8 @@ rec { "sha256-8IRkY4sMGkj2ZxZBM4n/7clzQHwuon8wmXIOAGa4nEI="; mypy-boto3-batch = - buildMypyBoto3Package "batch" "1.35.0" - "sha256-LVwSfDll7H0xxvF6b2wlqr/gQ5nR4oqtev4ZT4hgJX0="; + buildMypyBoto3Package "batch" "1.35.57" + "sha256-1tWJD780ioswhtdCB1ETlRwEVExCJbwjtLcDg1x/HG0="; mypy-boto3-billingconductor = buildMypyBoto3Package "billingconductor" "1.35.0" @@ -178,8 +178,8 @@ rec { "sha256-6iUVQMXsam6ALxL+g7o/l3KIQLjnBlp3qgkuarPW/SU="; mypy-boto3-budgets = - buildMypyBoto3Package "budgets" "1.35.0" - "sha256-scTtp5URLSljLwCJHu80+bUBL4LNW8zL+rOa9vBmPJE="; + buildMypyBoto3Package "budgets" "1.35.26" + "sha256-WJ0Vjppi+dDYwqL3Xu+VWc+KIbhc9CHzAU3C5x5eTHA="; mypy-boto3-ce = buildMypyBoto3Package "ce" "1.35.22" @@ -194,8 +194,8 @@ rec { "sha256-BAHAhOT7WanSavOe4iNVeJ0I4+QW2Ymn6C915sTQbwU="; mypy-boto3-chime-sdk-media-pipelines = - buildMypyBoto3Package "chime-sdk-media-pipelines" "1.35.0" - "sha256-eXgK8DJugHC1r9qPVK5ajdr/ppDnfxBHxB0tSld0icw="; + buildMypyBoto3Package "chime-sdk-media-pipelines" "1.35.57" + "sha256-VmHywaRFz8GJW/wde6ULj6iDfMH8+qDcoH6FamN77Dg="; mypy-boto3-chime-sdk-meetings = buildMypyBoto3Package "chime-sdk-meetings" "1.35.0" @@ -210,8 +210,8 @@ rec { "sha256-O7mrqn+S0rDcOnhxXI10mB/NHzI+f23HqNXoO5gxiPc="; mypy-boto3-cleanrooms = - buildMypyBoto3Package "cleanrooms" "1.35.0" - "sha256-+RAqaRHKax8sUaOoIaaT+HvW/EGir2daS+aqDWNoDwA="; + buildMypyBoto3Package "cleanrooms" "1.35.56" + "sha256-9klgPrVKNaG6PWOIZkvsXNP98+TOgJfVPT5aPV3SDtI="; mypy-boto3-cloud9 = buildMypyBoto3Package "cloud9" "1.35.0" @@ -222,12 +222,12 @@ rec { "sha256-T7rLgdtj8PUAZ6WRRkFYH/I6bqq+NA29kddxeI72UVU="; mypy-boto3-clouddirectory = - buildMypyBoto3Package "clouddirectory" "1.35.0" - "sha256-pU73zcHpJjazGSsHDUcWQezvdQfrP8mV4CROICuQOq8="; + buildMypyBoto3Package "clouddirectory" "1.35.30" + "sha256-D64DZgrma3/kvhyH6ZbPtD8nlRrzFVM8WT8Ex2fTZLM="; mypy-boto3-cloudformation = - buildMypyBoto3Package "cloudformation" "1.35.0" - "sha256-DQN9nWvbQ5qE4jkbqYek4D/O360OiB2xzw94YdJ1kHw="; + buildMypyBoto3Package "cloudformation" "1.35.41" + "sha256-ElaYUwcYs2/Z5CoTzclkAoMERA2AknrfLh389eN2g54="; mypy-boto3-cloudfront = buildMypyBoto3Package "cloudfront" "1.35.0" @@ -250,8 +250,8 @@ rec { "sha256-8QLyd1uCh26njr6VnNBFROHWFXMSvpO7WRzV8DFZ01U="; mypy-boto3-cloudtrail = - buildMypyBoto3Package "cloudtrail" "1.35.0" - "sha256-WaPWi1L120XKto1TPWqPKs92/tV4vnzYpJKbndbK2tY="; + buildMypyBoto3Package "cloudtrail" "1.35.27" + "sha256-EZzFE8myIt72X3Mxr+ZZ4lx8O+nTARvm93OhT4ekYpE="; mypy-boto3-cloudtrail-data = buildMypyBoto3Package "cloudtrail-data" "1.35.0" @@ -262,12 +262,12 @@ rec { "sha256-DXAn45lDLDoA5T7yDRRYwz7HI0l2SYxB6TZAsXZS2oY="; mypy-boto3-codeartifact = - buildMypyBoto3Package "codeartifact" "1.35.0" - "sha256-NXttDVG1iAGoYefRXROKaXiQUnRXxiOcOUad7ZuA2xE="; + buildMypyBoto3Package "codeartifact" "1.35.31" + "sha256-wCjyRnd7RlnLRQrADd2Xmh74IsQxBfUgLIJuaZW7kjw="; mypy-boto3-codebuild = - buildMypyBoto3Package "codebuild" "1.35.21" - "sha256-sCIMOBe3VppVALMDc4BV3rK+RYlCbxK80YUKPnckvT8="; + buildMypyBoto3Package "codebuild" "1.35.55" + "sha256-qZ0POshM6WseOoeinzEkGiZP4UxkRvyf2Y83Vv6UYas="; mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.35.0" @@ -294,8 +294,8 @@ rec { "sha256-UJmPVW20ofQmmer9/IYwaFIU2+xhXcT+0s2aUxFDGZY="; mypy-boto3-codepipeline = - buildMypyBoto3Package "codepipeline" "1.35.13" - "sha256-tLQEsxoPyDA5cFlsm3HAOQPCyZApCQOBJMxVPDH6Q+w="; + buildMypyBoto3Package "codepipeline" "1.35.40" + "sha256-r5yVdmlR32GRRdtsKcZ+KucAeCeIW9ValznnX3aB9J4="; mypy-boto3-codestar = buildMypyBoto3Package "codestar" "1.35.0" @@ -338,8 +338,8 @@ rec { "sha256-1pS2EkJapoNVi5lUEftaxbdoN4fd7XSFjWyLXH1noL0="; mypy-boto3-connect = - buildMypyBoto3Package "connect" "1.35.13" - "sha256-sL2WWzsUFA6dbKR3XUEoy+CbWT6TWVQCxfdQ8mZTmbo="; + buildMypyBoto3Package "connect" "1.35.52" + "sha256-Y9vBiRNCWaZBjKUyxWVEwsws6pFBdXJBKe6jEiH9AhU="; mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.35.0" @@ -366,24 +366,24 @@ rec { "sha256-YEm3nBfWCSzwPZ3Yvm4Nf3cMxaTccvHdBrs84g7KE4g="; mypy-boto3-customer-profiles = - buildMypyBoto3Package "customer-profiles" "1.35.0" - "sha256-j+L/GV/1l1OGQk1T6X4ieErbTkfAhHUl+zSTiSoo/QE="; + buildMypyBoto3Package "customer-profiles" "1.35.29" + "sha256-RBT3HkjCx8HpPIn/CMLiW1zA29B1F1skhxnfxYzfMNM="; mypy-boto3-databrew = buildMypyBoto3Package "databrew" "1.35.0" "sha256-zzd0tw46A9NwxUJ+7tz3Xlb4RbVTY3v7szDG4/189Ng="; mypy-boto3-dataexchange = - buildMypyBoto3Package "dataexchange" "1.35.0" - "sha256-DZ8sYkjFA0yFfRKNQbEW2YA3Dl04FbG6Hu8myRuFlUs="; + buildMypyBoto3Package "dataexchange" "1.35.43" + "sha256-DkxAJiOhOgID1DzOAwNNqx3Yk/H5P9j130fZyB9fxwc="; mypy-boto3-datapipeline = buildMypyBoto3Package "datapipeline" "1.35.0" "sha256-JlarWblBOzB64JV7866QjxIWqQH17qH4Lcig2g7WsAw="; mypy-boto3-datasync = - buildMypyBoto3Package "datasync" "1.35.0" - "sha256-lUzOmIoPNgEbJC54tre1m5ddhca05GyTSPOG4uIfumk="; + buildMypyBoto3Package "datasync" "1.35.52" + "sha256-KPDVvfCr9qffzjjyxhI49YIDVzNraiarljFaJLfsbeI="; mypy-boto3-dax = buildMypyBoto3Package "dax" "1.35.0" @@ -414,16 +414,16 @@ rec { "sha256-yJ3ApQy6xeEdxNcRQG5mekfK1aP7FPdR79TfbRZkESo="; mypy-boto3-dms = - buildMypyBoto3Package "dms" "1.35.0" - "sha256-mTwE5mn8GTCMuidyk8cYnZEk3PkrnP2ykVZgn2geMTo="; + buildMypyBoto3Package "dms" "1.35.45" + "sha256-+15k+ChWuPK+fBeSbYtraNugtJOI1mcjDU45ohDLauM="; mypy-boto3-docdb = buildMypyBoto3Package "docdb" "1.35.0" "sha256-gRSlQ63BPat6gxy+jZP/vtZIn6a4fXN0tx6oPvvgROo="; mypy-boto3-docdb-elastic = - buildMypyBoto3Package "docdb-elastic" "1.35.0" - "sha256-bmhGGMR9x0QKFl2p0p4xhxtE+A5PZQ/HO1FdLuAgLtI="; + buildMypyBoto3Package "docdb-elastic" "1.35.54" + "sha256-LMkXVrDNmfJPB5rl32i4OQSm0Q5gqdpV7PR4vNe0iIQ="; mypy-boto3-drs = buildMypyBoto3Package "drs" "1.35.0" @@ -434,8 +434,8 @@ rec { "sha256-OgK+ZM7wn7Elp6xzb1YnZtYP+eARgsP+BIYkQb+E4YE="; mypy-boto3-dynamodb = - buildMypyBoto3Package "dynamodb" "1.35.24" - "sha256-Vb+Jeh0ONUV57bBQAfS8T0crlFK63Z2ySHbDG98/cqE="; + buildMypyBoto3Package "dynamodb" "1.35.54" + "sha256-qzd/6OxI0XBt8Z1s5bzlRbM27o/O1ZDfR98uqsH69sA="; mypy-boto3-dynamodbstreams = buildMypyBoto3Package "dynamodbstreams" "1.35.0" @@ -446,8 +446,8 @@ rec { "sha256-wBJ7PnAlsi88AZIRPoNgbzOhPwUAJBegtwk+tw1lOwU="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.35.8" - "sha256-9M2+Uk/0A5ZozBaOPG+caASEgasz37D12JK78kKNHvI="; + buildMypyBoto3Package "ec2" "1.35.52" + "sha256-nvj7AYDTPDNLpAOcWOl5vGbtfEscLDwhVHTdCtK9X5g="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.35.0" @@ -462,24 +462,24 @@ rec { "sha256-KXtN44KAIDXjMgv3ICG8rXYfEjcZ85pQ+qdvN2Yiq3g="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.35.21" - "sha256-DSmCf9/TXUfoEYppEZOxAJOxuOCZK5p6GRIKWIa3aPQ="; + buildMypyBoto3Package "ecs" "1.35.52" + "sha256-hSTuuzjGARNBBmT+s1tzQKZLz7nIYttbtCb1w+cgqWQ="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.35.0" "sha256-6o825Pz7Vbg/xuFXR7mTLv3zWcLoRIqbFqjRcQtZOJ8="; mypy-boto3-eks = - buildMypyBoto3Package "eks" "1.35.0" - "sha256-w+uJ5Jqfbnj3ykj59C8sbhitp5MyTIE+PnZXrlIkOag="; + buildMypyBoto3Package "eks" "1.35.57" + "sha256-efYfxn51rtR6LCnAU3k7ct78OuNnSecGSwYi0OIidt8="; mypy-boto3-elastic-inference = - buildMypyBoto3Package "elastic-inference" "1.35.0" - "sha256-GpOOU/ritDu+hDZL8adN5fLYhYt0bgBTqCv2mDjt1T0="; + buildMypyBoto3Package "elastic-inference" "1.35.38" + "sha256-D+Ecu2+03ua8vs8C2NdGtDVSUpyM0SozHIb2PbRO2+g="; mypy-boto3-elasticache = - buildMypyBoto3Package "elasticache" "1.35.0" - "sha256-m80E+gaUJNpmrY9k4TuKaMbaAm+fCDqUbgH5IVgrArw="; + buildMypyBoto3Package "elasticache" "1.35.36" + "sha256-pLGZiHH9nyv0jzS4kWUw9BUMjsSR9X/i0VKIUkIeohs="; mypy-boto3-elasticbeanstalk = buildMypyBoto3Package "elasticbeanstalk" "1.35.0" @@ -494,20 +494,20 @@ rec { "sha256-fw/vfzKXXQSG7xj9FolkJgzciHBz4ELlFh2MlEJ6wQI="; mypy-boto3-elbv2 = - buildMypyBoto3Package "elbv2" "1.35.18" - "sha256-BlHZi/WM1rKK0QWbAYfHmdpZmgm8ZpWZPZQ4gz0k4oY="; + buildMypyBoto3Package "elbv2" "1.35.53" + "sha256-MQYmmlnrK7sbbO9AiVavD79ImyUZIMavuHz/rn1gTTs="; mypy-boto3-emr = - buildMypyBoto3Package "emr" "1.35.18" - "sha256-yXm2k6pDyJ1N93q6ltz6jvQy17AKpKsKhVFMpS1oGaI="; + buildMypyBoto3Package "emr" "1.35.39" + "sha256-PAVHgUn9cbnu7EPOO2+SNbT+WrayTP/mmIoqt3Kw29E="; mypy-boto3-emr-containers = buildMypyBoto3Package "emr-containers" "1.35.4" "sha256-ARmcy8oINHgph9PqNtQYyBVEVshBuSHDeju2ynNSqQ8="; mypy-boto3-emr-serverless = - buildMypyBoto3Package "emr-serverless" "1.35.0" - "sha256-50WhDh7x/5EPaxeZzNAZrM6FbwvNQlSVpobfSvdBl04="; + buildMypyBoto3Package "emr-serverless" "1.35.25" + "sha256-9aQOr3oGVejk34AInlyoS9//4DBIR0JBbHGumvanOtw="; mypy-boto3-entityresolution = buildMypyBoto3Package "entityresolution" "1.35.3" @@ -534,16 +534,16 @@ rec { "sha256-KQqb3NdsN8SloK7kIbJoy5I3zhO5CUr9rB8ZqtVLaDc="; mypy-boto3-firehose = - buildMypyBoto3Package "firehose" "1.35.0" - "sha256-7ibqWrvc1mwCDzsm/tqha/2Y2EbfxTpsf7omIZg/EbM="; + buildMypyBoto3Package "firehose" "1.35.57" + "sha256-QsLASn6dGIQs/nedmPXwzHeZRPIEqWjPqfDKMbaFOmM="; mypy-boto3-fis = buildMypyBoto3Package "fis" "1.35.12" "sha256-rm0PB0oie7q+8pl+efohmHe8StLZVvSWYgLIajxd3Fo="; mypy-boto3-fms = - buildMypyBoto3Package "fms" "1.35.0" - "sha256-Y+FKtBDxQ2SyN8uHLkt7KKylo8uOa6mCHUwf98TsBRg="; + buildMypyBoto3Package "fms" "1.35.45" + "sha256-tcegJLaem1b74dGFSatTjmQzt59L8Nu0thNnqes1TC8="; mypy-boto3-forecast = buildMypyBoto3Package "forecast" "1.35.0" @@ -558,8 +558,8 @@ rec { "sha256-dUbtx84rCJ5zRHxmdpGFAychNH/F98eviwdwqmslPLk="; mypy-boto3-fsx = - buildMypyBoto3Package "fsx" "1.35.0" - "sha256-GG3k2Lrl8zTgYcwxt2ccb30KE7Fm8o41zVxbvEeYIy0="; + buildMypyBoto3Package "fsx" "1.35.27" + "sha256-rPVWNk0+Xt9kMAl8xD0xM/EIbiYPSUL8Yc8b+2RcD4o="; mypy-boto3-gamelift = buildMypyBoto3Package "gamelift" "1.35.13" @@ -574,8 +574,8 @@ rec { "sha256-RJEZBr3yU/lGEainrpidLsdYBvVOPMq3cIaIpsTAziQ="; mypy-boto3-glue = - buildMypyBoto3Package "glue" "1.35.23" - "sha256-v0uU9EREtfyjbUazDMPPWod/qFITlQrWgnPJoghJXZk="; + buildMypyBoto3Package "glue" "1.35.53" + "sha256-eUXh24klobdPHgxu3Wjg638PeAu3ArlO3tsxewthfDo="; mypy-boto3-grafana = buildMypyBoto3Package "grafana" "1.35.0" @@ -594,8 +594,8 @@ rec { "sha256-U0sYInE/1XsjwQCxmcYLVvmEQf4R6drtdSqTr0b+3OM="; mypy-boto3-guardduty = - buildMypyBoto3Package "guardduty" "1.35.22" - "sha256-+Ro4QM8DwrDlbroFb6YV6fZGYPieHB0B5+EgdNrnIzQ="; + buildMypyBoto3Package "guardduty" "1.35.55" + "sha256-4iTPGfSTkel+xJtH/7/oPxbtmuZJk6p9FrZR3rKMaLA="; mypy-boto3-health = buildMypyBoto3Package "health" "1.35.0" @@ -614,8 +614,8 @@ rec { "sha256-wHm7wHBhEX3c29MwZtbZPXH1su5MsAzLmj5h8V3/3V0="; mypy-boto3-imagebuilder = - buildMypyBoto3Package "imagebuilder" "1.35.0" - "sha256-yL54l1/+3Lz4C0Um47rsybbYujc1nde2jirX/DUeSIY="; + buildMypyBoto3Package "imagebuilder" "1.35.46" + "sha256-eWIWfLQql7QVkg1CfOrfs46h3UqIQxpmpn4+yYsUZRQ="; mypy-boto3-importexport = buildMypyBoto3Package "importexport" "1.35.0" @@ -634,12 +634,12 @@ rec { "sha256-BWNccaLrGmm5liiAOHCeFqSlkDk8wnj+/ipExaVZVis="; mypy-boto3-iot = - buildMypyBoto3Package "iot" "1.35.20" - "sha256-3D1VjhsSVOedLhn7W6Huch4aowjlJgCuotUyln71n6k="; + buildMypyBoto3Package "iot" "1.35.33" + "sha256-4+EVog8UUrl70ixcAviqrLUJVMqmXjyX80fzAn80hso="; mypy-boto3-iot-data = - buildMypyBoto3Package "iot-data" "1.35.0" - "sha256-6Dy72Ui8OI7ROdKCBEKvHTGco33OcI30QpXErPz7MPg="; + buildMypyBoto3Package "iot-data" "1.35.34" + "sha256-A12VYkybT23+1iCquQ9hY0voaqFdVCP7MQBdYLNzqhk="; mypy-boto3-iot-jobs-data = buildMypyBoto3Package "iot-jobs-data" "1.35.0" @@ -658,8 +658,8 @@ rec { "sha256-jVb/qDhi0onfEMXDnJHodqKrEgXqPrUTseiGIUwCPWk="; mypy-boto3-iotdeviceadvisor = - buildMypyBoto3Package "iotdeviceadvisor" "1.35.0" - "sha256-mo5rWGiyoaWRsaCZsGVmnHalVpV4WlcM+SKEXm0y6eY="; + buildMypyBoto3Package "iotdeviceadvisor" "1.35.32" + "sha256-IkrcHVBgqzpi+J/H2axVxV4oJCp3lFf8CbZIiY5Jq6Q="; mypy-boto3-iotevents = buildMypyBoto3Package "iotevents" "1.35.0" @@ -674,8 +674,8 @@ rec { "sha256-Hse02blZttIxqJovJ3h6yCEi+jN3e+pfznIXjBAid1k="; mypy-boto3-iotfleetwise = - buildMypyBoto3Package "iotfleetwise" "1.35.0" - "sha256-VQCFJX2wZYKWey8yxEBoAK29uDxb/xn5+EuZH739DV8="; + buildMypyBoto3Package "iotfleetwise" "1.35.51" + "sha256-ZfS7CCrU0ZJipWUuyle1uws3IgN27XWOOwR4SAAO+zg="; mypy-boto3-iotsecuretunneling = buildMypyBoto3Package "iotsecuretunneling" "1.35.0" @@ -698,12 +698,12 @@ rec { "sha256-e4a8Na1spmmaUVAiAWPvn7DqzYHzEL4EatCewrRxJKE="; mypy-boto3-ivs = - buildMypyBoto3Package "ivs" "1.35.19" - "sha256-CXQnPKSn8oMyj2V2+iTjcqPEGykM2mOrRDVTkYEX/Jo="; + buildMypyBoto3Package "ivs" "1.35.41" + "sha256-U4GiLc6Tdk6qCKrLxVPikRKkcAWxnp1DIV8nOi/XQH8="; mypy-boto3-ivs-realtime = - buildMypyBoto3Package "ivs-realtime" "1.35.15" - "sha256-pO8W60U+c56/1F7LECM4AcOMIW7sHifSd9Ov+HJ4TpQ="; + buildMypyBoto3Package "ivs-realtime" "1.35.32" + "sha256-mAK3wz82f8X/02mvPnDycDa934wAbFeSySX99H1nvEQ="; mypy-boto3-ivschat = buildMypyBoto3Package "ivschat" "1.35.19" @@ -726,12 +726,12 @@ rec { "sha256-lBZ9MJQsuM0vRyrDcelDXTIhP9sex6CjnRjYY3qjIdE="; mypy-boto3-keyspaces = - buildMypyBoto3Package "keyspaces" "1.35.0" - "sha256-ZtixXownfAnqUfNY53sVGbDZTQ2Q+Hhzgs1Txuyn3gM="; + buildMypyBoto3Package "keyspaces" "1.35.52" + "sha256-R3DERqUmmKGjXyJROJDYU+JTIzmrjiXmYCau0rpWujQ="; mypy-boto3-kinesis = - buildMypyBoto3Package "kinesis" "1.35.0" - "sha256-3mLfRa0u1TUcjau4iQrUsOVmukFOoUCQglJeNqYfkp8="; + buildMypyBoto3Package "kinesis" "1.35.26" + "sha256-hl8ml/Yt/H0EBSQ2qSW98NOakxfN6MaYGmrEbmWcHH8="; mypy-boto3-kinesis-video-archived-media = buildMypyBoto3Package "kinesis-video-archived-media" "1.35.0" @@ -766,12 +766,12 @@ rec { "sha256-oGpeVJ4uuNUAIsZwc2k0QKLtzLSHC+ULM1f3Pcm+ZPk="; mypy-boto3-lakeformation = - buildMypyBoto3Package "lakeformation" "1.35.0" - "sha256-d6dz+lqK8RJ4kwDvK8WYf5U3N9oic5s+4KJgW08/3oU="; + buildMypyBoto3Package "lakeformation" "1.35.55" + "sha256-QuVCDfj8bAtFhEnrsGqDYHFbl6awqAjLDjeJn5Rq0IM="; mypy-boto3-lambda = - buildMypyBoto3Package "lambda" "1.35.23" - "sha256-I70ebuqU7cWYu+rAWqaUbNNiXdq9JZL/dm8++OiJxao="; + buildMypyBoto3Package "lambda" "1.35.57" + "sha256-m6zdSyQbRTiCuoWH7GX7CQnZe0A2SMPb8gglgzzldYc="; mypy-boto3-lex-models = buildMypyBoto3Package "lex-models" "1.35.0" @@ -810,8 +810,8 @@ rec { "sha256-6Vs5eRibHCZvDDIcIEThPa6T1OmfJXjLg4GAZlworsM="; mypy-boto3-logs = - buildMypyBoto3Package "logs" "1.35.12" - "sha256-H+B1dxaGAAwAqWU5/WKKYz1HT9wKmvjVEg57kGvTDh0="; + buildMypyBoto3Package "logs" "1.35.54" + "sha256-RnHt15tR/cGO0w9mLYbCW0T82fyhVsJbBkfxSwDZItw="; mypy-boto3-lookoutequipment = buildMypyBoto3Package "lookoutequipment" "1.35.0" @@ -826,8 +826,8 @@ rec { "sha256-0Tz/X8RIuLvbDRXmZ+g0aEOcO7Qyg7ZKDLW1bN4yfJA="; mypy-boto3-m2 = - buildMypyBoto3Package "m2" "1.35.0" - "sha256-rn9xCU8qtkR/zRzi5MM9dNInJOa30VrYRj2hBLN9Zao="; + buildMypyBoto3Package "m2" "1.35.46" + "sha256-l/wsUpF+LBX9AZWBGgMzry9LdO/zuPq/fEm2do16YcY="; mypy-boto3-machinelearning = buildMypyBoto3Package "machinelearning" "1.35.0" @@ -878,8 +878,8 @@ rec { "sha256-ur1A0iPMGgfI0XNSOiXX4VF5nR6XJcnpk0KM62Ujp/0="; mypy-boto3-mediapackagev2 = - buildMypyBoto3Package "mediapackagev2" "1.35.0" - "sha256-b8TqRWLKSkN74xBzyCeABdd69s0ET2QTSNsTZaJXPfc="; + buildMypyBoto3Package "mediapackagev2" "1.35.50" + "sha256-kvY0A+v7yJ/NUiqy8HnA4EmGOnbqlQI8lj70S4k5+dk="; mypy-boto3-mediastore = buildMypyBoto3Package "mediastore" "1.35.0" @@ -898,8 +898,8 @@ rec { "sha256-u+GgBEtw2AVonu+XqL8gDIJig9foiUufz1++qmrfx00="; mypy-boto3-memorydb = - buildMypyBoto3Package "memorydb" "1.35.0" - "sha256-hulSiv/A/GXV9rCjjSSIGKQSZqeBkKUKZuuKGwl8/aU="; + buildMypyBoto3Package "memorydb" "1.35.36" + "sha256-WLbTMLs4KXOtoesqSm6X4MK/BcCAqcCxH7mbBBisYzQ="; mypy-boto3-meteringmarketplace = buildMypyBoto3Package "meteringmarketplace" "1.35.0" @@ -950,8 +950,8 @@ rec { "sha256-Epx+p5M+3x0plFaXdc8Rsz+p18ZnxbNlr4IhH5STvZM="; mypy-boto3-network-firewall = - buildMypyBoto3Package "network-firewall" "1.35.0" - "sha256-41zAgq4F07hIl7I6S+M7ngxdFOKjmUB3BFhncLel7ZI="; + buildMypyBoto3Package "network-firewall" "1.35.52" + "sha256-i4h13QqDO65bSTlxdt5hN6iXag578jc3Mv7bOHBZkpQ="; mypy-boto3-networkmanager = buildMypyBoto3Package "networkmanager" "1.35.0" @@ -970,12 +970,12 @@ rec { "sha256-CwD0stU2217XD+SXTp+WRyf/qH3EOA5PuBSdTWcXOGU="; mypy-boto3-opensearch = - buildMypyBoto3Package "opensearch" "1.35.0" - "sha256-AQLU4or4flXLxTrZJy0XHIn9MFRTmgHjUWjLzuP2pXA="; + buildMypyBoto3Package "opensearch" "1.35.52" + "sha256-6a9zygN6Al1yEaOwUvO2Hq/swESKrLW315diz/sgH6c="; mypy-boto3-opensearchserverless = - buildMypyBoto3Package "opensearchserverless" "1.35.2" - "sha256-df8udPQOjXo5GEo6Gk5G6oKx7pBW4c0A82wkC1PA0BI="; + buildMypyBoto3Package "opensearchserverless" "1.35.52" + "sha256-d7SehQ8mnD17WsZhucdKnEE2v+sI/cdoaMhYCBkj7nY="; mypy-boto3-opsworks = buildMypyBoto3Package "opsworks" "1.35.0" @@ -986,16 +986,16 @@ rec { "sha256-qyUZN9Gz8Q6TBDg1LW+M58TLwDlmqJ9aCr4021LbSL0="; mypy-boto3-organizations = - buildMypyBoto3Package "organizations" "1.35.20" - "sha256-SqZDiV8VrLmcdW+cO7LjCFipeJtPlL04uXx58UDgsg0="; + buildMypyBoto3Package "organizations" "1.35.28" + "sha256-lT/74MV0ZKA1rBoHOuZBM0uAf4/aOQ2V5AMxzGY5RFM="; mypy-boto3-osis = buildMypyBoto3Package "osis" "1.35.0" "sha256-PdOH3KaQn9d455qCR565qFlyCb8t7R8x8wXBebHgtt8="; mypy-boto3-outposts = - buildMypyBoto3Package "outposts" "1.35.0" - "sha256-CFULIBMCKb4mUQ7ogh5hvfewDMpsP1jnQEJmtuArCck="; + buildMypyBoto3Package "outposts" "1.35.38" + "sha256-Adb8A8DVn3T00xuEtXXT+LHxwM4jh0IG3JLUiAi02ds="; mypy-boto3-panorama = buildMypyBoto3Package "panorama" "1.35.0" @@ -1006,8 +1006,8 @@ rec { "sha256-b9gTTuQxsXE4CjZgRgbZn4xGSC7N/4v3eF4fF9fFSow="; mypy-boto3-payment-cryptography-data = - buildMypyBoto3Package "payment-cryptography-data" "1.35.0" - "sha256-tHHuRkz2nA550ldsMbiUS7XJGMHgx3rRt5scFV7tFNM="; + buildMypyBoto3Package "payment-cryptography-data" "1.35.45" + "sha256-9FxAmPtuL14Y18X05pMj3uPoJqAyHJAJLDmGgoU79uY="; mypy-boto3-pca-connector-ad = buildMypyBoto3Package "pca-connector-ad" "1.35.0" @@ -1042,20 +1042,20 @@ rec { "sha256-AYfD/JY1//vPw1obZAmwqW3NYwSpqg1zjQqTpIk80Rw="; mypy-boto3-pinpoint-sms-voice-v2 = - buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.35.0" - "sha256-1jcgBWd/AU6AcmSzbZ2cAr3TkfCtEEuh+s22j02jrso="; + buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.35.57" + "sha256-pjvecs9LfkOQXiobtZ/OQVMKXGl/ATMy7ZiRjNJFclQ="; mypy-boto3-pipes = - buildMypyBoto3Package "pipes" "1.35.16" - "sha256-Mur45GAzHsGamKaooUdGwuydMbfaQCSTVrRwwENbmFs="; + buildMypyBoto3Package "pipes" "1.35.43" + "sha256-ue5t9EUm1PKFCCwkAq2A1CRl3rWFuo5IhrG0SHddUWk="; mypy-boto3-polly = buildMypyBoto3Package "polly" "1.35.7" "sha256-aIKpT15gBmM2gkkSbmzs5pVvAIfessdzlQTspmvK+LQ="; mypy-boto3-pricing = - buildMypyBoto3Package "pricing" "1.35.0" - "sha256-imX//FkRBbNmc69jJINlSIPB0WZc0AvIRH+/c3PRSn8="; + buildMypyBoto3Package "pricing" "1.35.30" + "sha256-THSL/TxygrV/E4XO4YQQBS5p2xU7MyPFdR2ZkVx2o0k="; mypy-boto3-privatenetworks = buildMypyBoto3Package "privatenetworks" "1.35.0" @@ -1074,8 +1074,8 @@ rec { "sha256-mtpp+ro3b7tOrN4TrWr8BjLzaPo264ty8Sng6wtciMs="; mypy-boto3-quicksight = - buildMypyBoto3Package "quicksight" "1.35.23" - "sha256-ljk8uB17CDpGT9TIAncsrZBGbI9UrPAPU3HQ9Cz2zYE="; + buildMypyBoto3Package "quicksight" "1.35.56" + "sha256-wiAo7FwQYo4oL8qiE3KOlpeuo4uOCacLZwBf5vel88M="; mypy-boto3-ram = buildMypyBoto3Package "ram" "1.35.0" @@ -1086,56 +1086,56 @@ rec { "sha256-85yUjKQ8oiECUYHhmmYrDssyFSQb6itfIRY2iuwCZdo="; mypy-boto3-rds = - buildMypyBoto3Package "rds" "1.35.22" - "sha256-moU0RLvQFknHPerOQcvXSZw+9CdZ/5Yeno4dZVoXfNo="; + buildMypyBoto3Package "rds" "1.35.50" + "sha256-doZ8u+pU5akzuLCa1T+qns/fxOakvsJR5Fj4TsrraBs="; mypy-boto3-rds-data = - buildMypyBoto3Package "rds-data" "1.35.0" - "sha256-yLKWipyD8l1Zyh840Ixp70maQBz/aDcnJEznpGaXt+E="; + buildMypyBoto3Package "rds-data" "1.35.28" + "sha256-XPb/7sVSVFkDjPQ2x6w7tJmIBiS1YH10805lv/eGsyw="; mypy-boto3-redshift = - buildMypyBoto3Package "redshift" "1.35.0" - "sha256-8YX4mAvSCQgacJy+BLxuW6+gojDz0oT3wMtJG5P/WP0="; + buildMypyBoto3Package "redshift" "1.35.52" + "sha256-quOZw+mVY3pNXvhWRN4eU9LySeFsrJzSK6FwS0h5Z3E="; mypy-boto3-redshift-data = - buildMypyBoto3Package "redshift-data" "1.35.10" - "sha256-LP5RjvMCfCsFD6z/0mIZJEWN3y+z35aZzboz6KaFlZQ="; + buildMypyBoto3Package "redshift-data" "1.35.51" + "sha256-wCF9VqKH8GBgmKHsJZfAbNefu/zLw2piSJpuOaQ4nMo="; mypy-boto3-redshift-serverless = - buildMypyBoto3Package "redshift-serverless" "1.35.0" - "sha256-uHY9c+p407QBVS18N0lEshdB1mXV+LONhTXSIr+NiV4="; + buildMypyBoto3Package "redshift-serverless" "1.35.52" + "sha256-/7yPEPa19Vyhfsb/WBrSXid/VlOwdaqu2SugU4GccDI="; mypy-boto3-rekognition = buildMypyBoto3Package "rekognition" "1.35.0" "sha256-mG3TeywuB5+87Z3nhqjFwf0y2WO49oETPMz+oL0LbOA="; mypy-boto3-resiliencehub = - buildMypyBoto3Package "resiliencehub" "1.35.0" - "sha256-MKlBdSJGl7WCnD66fx5nCPhGAtLtLjoahe08KHTT+KM="; + buildMypyBoto3Package "resiliencehub" "1.35.41" + "sha256-zqBEwEnaCrmUl9xRlYOQHFSwZcXR1zj42Pd0Lik9SIQ="; mypy-boto3-resource-explorer-2 = - buildMypyBoto3Package "resource-explorer-2" "1.35.0" - "sha256-SWlnIn6Xn5rhngjMTHQWPyqfzZieE9WN1iCB5WxCsnM="; + buildMypyBoto3Package "resource-explorer-2" "1.35.56" + "sha256-b6H2qsCgpX9j7yWWtPTV2CcPbtXit4HLaCH8YwAJH1A="; mypy-boto3-resource-groups = - buildMypyBoto3Package "resource-groups" "1.35.0" - "sha256-5l6yFERWSvAgeguBrQmx7fzRmSFW95As0NIqo91VTmw="; + buildMypyBoto3Package "resource-groups" "1.35.30" + "sha256-f+4F+0VuLAmx+3+qBwNj8jit9DYC/Dfrhd5/L0ledW4="; mypy-boto3-resourcegroupstaggingapi = buildMypyBoto3Package "resourcegroupstaggingapi" "1.35.0" "sha256-3DVLn61w42L8qwyQB1WbOPjOZXqXalLZ9rITcmcDkQI="; mypy-boto3-robomaker = - buildMypyBoto3Package "robomaker" "1.35.0" - "sha256-Yl7v7zQHeixpG244Qld1vceR8ZazGjcUc26LUuane3I="; + buildMypyBoto3Package "robomaker" "1.35.39" + "sha256-kh/KojcYdBfGA7BRorshz34R/Lx8e/WTa0kWpW78PcY="; mypy-boto3-rolesanywhere = buildMypyBoto3Package "rolesanywhere" "1.35.0" "sha256-Ss85x4OJ+RtOmP7LzIIMcikxjMvMyi3VUT9WLvxODSM="; mypy-boto3-route53 = - buildMypyBoto3Package "route53" "1.35.4" - "sha256-gPor5Roaoo3i0zJa4xXIIb1SOar80KQvVi5h003vGZM="; + buildMypyBoto3Package "route53" "1.35.52" + "sha256-O6P/xxxzAxBhmm5MTsK162moBRno/EhdUvrF12ZQR18="; mypy-boto3-route53-recovery-cluster = buildMypyBoto3Package "route53-recovery-cluster" "1.35.0" @@ -1154,28 +1154,28 @@ rec { "sha256-pM5+b6he5Gp9DuD2Uz/x+SYmVzxhZIh/gJ626S9I19g="; mypy-boto3-route53resolver = - buildMypyBoto3Package "route53resolver" "1.35.0" - "sha256-F0ixOVQ8zmCrspV3+a5QmuJdvc5NOV8WiWdepiIeW9E="; + buildMypyBoto3Package "route53resolver" "1.35.38" + "sha256-MVADJUXYj6HvnJIZZJVfi/rMRCJFE1BZfcoQKvlg69Y="; mypy-boto3-rum = buildMypyBoto3Package "rum" "1.35.0" "sha256-RwPNNFntNChLqbr86wd1bwp6OqWvs3oj3V+4X71J3Hw="; mypy-boto3-s3 = - buildMypyBoto3Package "s3" "1.35.22" - "sha256-n2ThGW/+zCxqt77pXoSGkrX0ZKHfFCETYepru8IDg4c="; + buildMypyBoto3Package "s3" "1.35.46" + "sha256-8Ah6N2XRA7LbVlzYBl68Kw9w8t1OksEy9kuJRd2GmUA="; mypy-boto3-s3control = - buildMypyBoto3Package "s3control" "1.35.12" - "sha256-GpZ3lr2WenLA+FNOBnot9X7DQKtmxWxvP85bTM5l1+g="; + buildMypyBoto3Package "s3control" "1.35.55" + "sha256-9gTlb+iIU+IT+2jAIU7l62gN4VenI4JLaTEFJCbgiAc="; mypy-boto3-s3outposts = buildMypyBoto3Package "s3outposts" "1.35.0" "sha256-P2Yg3qvcdAcjY+uwPg2DpTgT6ZXb1XYCOeu4bVfgFKI="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.35.24" - "sha256-VLhoJLXWsQIWK+N9KC2nNi2VDC5SUeN/FJJJLefWix8="; + buildMypyBoto3Package "sagemaker" "1.35.53" + "sha256-Vj7lAt1eU47vE7XZ95QJBe95302681tJuy4nw02Bibc="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.35.0" @@ -1222,12 +1222,12 @@ rec { "sha256-w30YExW6ENhUaHIwTX8mbnRhQpsI5jUHwjzFCMPvQmQ="; mypy-boto3-securityhub = - buildMypyBoto3Package "securityhub" "1.35.16" - "sha256-qDb5EGz/of/glrIKMz5xkPbatIhjRjs9L4tzW0ckJKw="; + buildMypyBoto3Package "securityhub" "1.35.29" + "sha256-RQXlvvSr0DNC2eXEVTQjx4TCR6A/v9qsRArIfg9Mq+w="; mypy-boto3-securitylake = - buildMypyBoto3Package "securitylake" "1.35.0" - "sha256-cI6Ei0p1LtQ+QuM4URYu+k2kJiUUjyEs8rbeX5c7Vvk="; + buildMypyBoto3Package "securitylake" "1.35.40" + "sha256-w0Usj5BpCAYbX6/0uNoIqH3EBd8fgru4RwQHuF2OEyQ="; mypy-boto3-serverlessrepo = buildMypyBoto3Package "serverlessrepo" "1.35.0" @@ -1254,8 +1254,8 @@ rec { "sha256-+TyI+ffXN0M9HVWA3iQfg3T/xF49wslYFx9MTxHCfYw="; mypy-boto3-sesv2 = - buildMypyBoto3Package "sesv2" "1.35.0" - "sha256-bKrU7HufafU0Elt05TLZrPycs3kxEHdJcKp6iwWB7ek="; + buildMypyBoto3Package "sesv2" "1.35.53" + "sha256-jIxFFcXYJgwxH78gnMHxIaQWeF88DT7tH1pukUEpDc4="; mypy-boto3-shield = buildMypyBoto3Package "shield" "1.35.0" @@ -1322,12 +1322,12 @@ rec { "sha256-aTKMQz0w0d0WOWHGU3HIqSb3z6PvbuSqtX+saBIIRog="; mypy-boto3-stepfunctions = - buildMypyBoto3Package "stepfunctions" "1.35.9" - "sha256-wIirZ3Ueg3xdtAWT1su3BQXI5W4OBPsyoCQeebsigSs="; + buildMypyBoto3Package "stepfunctions" "1.35.54" + "sha256-LueUCqK9oEYZfilqW6nA58zFNQtQn9eog/BmfBg+O/4="; mypy-boto3-storagegateway = - buildMypyBoto3Package "storagegateway" "1.35.18" - "sha256-RiAqxt45cMOkbGjWVWufiqZcCKQm++RE3FOdZ5BFkuE="; + buildMypyBoto3Package "storagegateway" "1.35.50" + "sha256-60qxUQtbi+Dl2osn7zkSmpTuXf8DjTKDa3XXVsJynKE="; mypy-boto3-sts = buildMypyBoto3Package "sts" "1.35.0" @@ -1346,16 +1346,16 @@ rec { "sha256-72VjJGOWAphFUZfMxzSaYyycUtoL1St08G/SAEhDriQ="; mypy-boto3-synthetics = - buildMypyBoto3Package "synthetics" "1.35.18" - "sha256-p/jKkj4a1vUkgfmUAkKY6nbDKKaBNAJeuFOea7Uvq7M="; + buildMypyBoto3Package "synthetics" "1.35.56" + "sha256-QRYicbaZ/2a7aXB42v9WrHR56O4A+4eEnoaoo7OMaGc="; mypy-boto3-textract = buildMypyBoto3Package "textract" "1.35.0" "sha256-i0NmNRPwEypr4m0vNtJDXHEAbCcqdxTexY3MDaltvh8="; mypy-boto3-timestream-query = - buildMypyBoto3Package "timestream-query" "1.35.0" - "sha256-sOjhGZ2h77NOLcoQX2AdLae9cB2VbBYSx+W8ge9oqwA="; + buildMypyBoto3Package "timestream-query" "1.35.46" + "sha256-kdbDOZuuccSC9k+X0VXRkCUkdpKyeD9ge3bj/JxLBlQ="; mypy-boto3-timestream-write = buildMypyBoto3Package "timestream-write" "1.35.0" @@ -1370,16 +1370,16 @@ rec { "sha256-pRyowqpW9cqiZe0aCDvcJAqIaRkEhG8DFRxP89daIPo="; mypy-boto3-transfer = - buildMypyBoto3Package "transfer" "1.35.0" - "sha256-at9iKdpW8fCiOOX6smp8lDg8xWT9M6RdHJr7Qtpzrbo="; + buildMypyBoto3Package "transfer" "1.35.40" + "sha256-uJ15ZsA5oQgzjNTqX2Zhg+K29HBfyK40BVlG0GicyRA="; mypy-boto3-translate = buildMypyBoto3Package "translate" "1.35.0" "sha256-j9ZU1UHzKNo1+gb+uUYiMTIwjGi9OEg0jAmKGx+mGno="; mypy-boto3-verifiedpermissions = - buildMypyBoto3Package "verifiedpermissions" "1.35.0" - "sha256-98NHM9PlT4c9jCcm8kKaEsOHHvFdhmAca/LRmW8biTo="; + buildMypyBoto3Package "verifiedpermissions" "1.35.55" + "sha256-ptQXmGLaWRtOqAL3iunKubP5gQHHAezQAubG3Z3m6BI="; mypy-boto3-voice-id = buildMypyBoto3Package "voice-id" "1.35.0" @@ -1398,8 +1398,8 @@ rec { "sha256-rqjBKxMMg/gkt9PJyFyE3g2msAiTtiMZWF4TY3/grcs="; mypy-boto3-wafv2 = - buildMypyBoto3Package "wafv2" "1.35.9" - "sha256-snz65w4vU7DMSVJmhWHvQay38q17RYkmbk3986HlXT8="; + buildMypyBoto3Package "wafv2" "1.35.45" + "sha256-Soz9RxhGf4ss41NLcVT0UUjRcPv0sKzjcx1bo5MLC44="; mypy-boto3-wellarchitected = buildMypyBoto3Package "wellarchitected" "1.35.0" @@ -1418,16 +1418,16 @@ rec { "sha256-AgK4Xg1dloJmA+h4+mcBQQVTvYKjLCk5tPDbl/ItCVQ="; mypy-boto3-workmail = - buildMypyBoto3Package "workmail" "1.35.0" - "sha256-1hjejKCAu9pNPzJ0gaz8mbyQLFkzEUB0mO7g7Da06mk="; + buildMypyBoto3Package "workmail" "1.35.52" + "sha256-bYfSCYypmTs/NVbLtazSZBgWWotLl+t0B7vm1tdaiZI="; mypy-boto3-workmailmessageflow = buildMypyBoto3Package "workmailmessageflow" "1.35.0" "sha256-Om/TFPBZh3xr0inpGzCpvTNij9DTPq8dV1ikX8g4YtE="; mypy-boto3-workspaces = - buildMypyBoto3Package "workspaces" "1.35.24" - "sha256-j7eEUDul3+bMWN80+gH+/gFBWqQHVQ2yN+YBx5VFZNM="; + buildMypyBoto3Package "workspaces" "1.35.43" + "sha256-l6Jfcb3+7RbUuXBsQvtYGqffbVobjFldwscGSIJR6Cs="; mypy-boto3-workspaces-web = buildMypyBoto3Package "workspaces-web" "1.35.23" diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 0f264d2c86a1..e43f0e1bd1a2 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch2, gitUpdater, pythonAtLeast, pythonOlder, @@ -32,17 +33,28 @@ buildPythonPackage rec { pname = "mypy"; - version = "1.10.1"; + version = "1.11.2"; pyproject = true; - disabled = pythonOlder "3.8"; + # mypy doesn't support python313 yet + # https://github.com/python/mypy/issues/17264 + disabled = pythonOlder "3.8" || pythonAtLeast "3.13"; src = fetchFromGitHub { owner = "python"; repo = "mypy"; rev = "refs/tags/v${version}"; - hash = "sha256-joV+elRaAICNQHkYuYtTDjvOUkHPsRkG1OLRvdxeIHc="; + hash = "sha256-5gfqIBtI/G5HARYdXHjYNYNRxeNgrk9dnpSgvMSu9bw="; }; + + patches = [ + (fetchpatch2 { + name = "python3.12.7-compat.patch"; + url = "https://github.com/python/mypy/commit/1a2c8e2a4df21532e4952191cad74ae50083f4ad.patch"; + hash = "sha256-GBQPTkdoLeErjbRUjZBFEwvCcN/WzC3OYVvou6M+f80="; + }) + ]; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; @@ -131,6 +143,7 @@ buildPythonPackage rec { meta = with lib; { description = "Optional static typing for Python"; homepage = "https://www.mypy-lang.org"; + changelog = "https://github.com/python/mypy/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; mainProgram = "mypy"; maintainers = with maintainers; [ lnl7 ]; diff --git a/pkgs/development/python-modules/myst-nb/default.nix b/pkgs/development/python-modules/myst-nb/default.nix index 97628a5e3e87..520919e7fa46 100644 --- a/pkgs/development/python-modules/myst-nb/default.nix +++ b/pkgs/development/python-modules/myst-nb/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "myst-nb"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "myst_nb"; - hash = "sha256-dCJ8EfdtA0lPQ7d4hlmxYblPTe3vIwopEkEryMPJ5VM="; + hash = "sha256-lhtABWVwKcqJiSpMde2/CFbFTOr2FyNotGv3Z2wfdwA="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix index c17dfe1510e0..ceec033bb047 100644 --- a/pkgs/development/python-modules/myst-parser/default.nix +++ b/pkgs/development/python-modules/myst-parser/default.nix @@ -20,23 +20,21 @@ }: buildPythonPackage rec { pname = "myst-parser"; - version = "3.0.1"; + version = "4.0.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "executablebooks"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TKo1lanZNM+XrOKZ0ZmtlhEPoAYQUspkyHXZm1wNTFE="; + hash = "sha256-QbFENC/Msc4pkEOPdDztjyl+2TXtAbMTHPJNAsUB978="; }; - nativeBuildInputs = [ - flit-core - ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ docutils jinja2 mdit-py-plugins @@ -59,6 +57,7 @@ buildPythonPackage rec { # sphinx 7.4 compat "test_gettext" "test_gettext_additional_targets" + "test_amsmath" ]; pythonImportsCheck = [ "myst_parser" ]; diff --git a/pkgs/development/python-modules/nanobind/default.nix b/pkgs/development/python-modules/nanobind/default.nix index 66df98f351bc..f08378fdec68 100644 --- a/pkgs/development/python-modules/nanobind/default.nix +++ b/pkgs/development/python-modules/nanobind/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, @@ -52,6 +53,8 @@ buildPythonPackage rec { make -j $NIX_BUILD_CORES ''; + # skip testing on platforms disabled for tensorflow-bin + doCheck = !(builtins.elem stdenv.hostPlatform.system tensorflow-bin.meta.badPlatforms); nativeCheckInputs = [ pytestCheckHook numpy diff --git a/pkgs/development/python-modules/napari-npe2/default.nix b/pkgs/development/python-modules/napari-npe2/default.nix index 1affda693c99..e4f97dcd58dd 100644 --- a/pkgs/development/python-modules/napari-npe2/default.nix +++ b/pkgs/development/python-modules/napari-npe2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "napari-npe2"; - version = "0.7.2-unstable-2023-10-20"; + version = "0.7.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,19 +27,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "napari"; repo = "npe2"; - rev = "9d29e4d6dbbec75c2d36273647efd9ddfb59ded0"; - hash = "sha256-JLu/5pXijPdpKY2z2rREtSKPiP33Yy4viegbxUiQg7Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-HjMf5J1n5NKqtunRQ7cqZiTZMTNmcq5j++O03Sxwvqw="; }; - # fix this in the next release - env.SETUPTOOLS_SCM_PRETEND_VERSION = "0.7.2"; - - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs ]; - propagatedBuildInputs = [ + dependencies = [ appdirs build magicgui @@ -59,9 +56,9 @@ buildPythonPackage rec { meta = with lib; { description = "Plugin system for napari (the image visualizer)"; - mainProgram = "npe2"; homepage = "https://github.com/napari/npe2"; license = licenses.bsd3; maintainers = with maintainers; [ SomeoneSerge ]; + mainProgram = "npe2"; }; } diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 93252b0e9109..8d3a0bf5b824 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -40,7 +40,7 @@ mkDerivationWith buildPythonPackage rec { pname = "napari"; - version = "0.4.19.post1"; + version = "0.5.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -49,11 +49,11 @@ mkDerivationWith buildPythonPackage rec { owner = "napari"; repo = "napari"; rev = "refs/tags/v${version}"; - hash = "sha256-qw5WdFPySNkmm+dNu+hqsmr+csBpHnSl9bMpb4nKEqI="; + hash = "sha256-wJifLRrHlDzPgBU7OOPqjdzYpr9M+Klc+yAc/IpyZN8="; }; postPatch = '' - substituteInPlace setup.cfg \ + substituteInPlace pyproject.toml \ --replace-fail "scikit-image[data]>=0.19.1" "scikit-image" ''; diff --git a/pkgs/development/python-modules/narwhals/default.nix b/pkgs/development/python-modules/narwhals/default.nix new file mode 100644 index 000000000000..52ef9d3ba733 --- /dev/null +++ b/pkgs/development/python-modules/narwhals/default.nix @@ -0,0 +1,71 @@ +{ + lib, + buildPythonPackage, + # cudf, + dask, + dask-expr, + duckdb, + fetchFromGitHub, + hatchling, + hypothesis, + # modin, + pandas, + polars, + pyarrow, + pytest-env, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "narwhals"; + version = "1.9.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "narwhals-dev"; + repo = "narwhals"; + rev = "refs/tags/v${version}"; + hash = "sha256-KUtmkDaHPaJ917/hVhJrt+x64JJYm06fyDfCV2nSa3s="; + }; + + build-system = [ + hatchling + ]; + + optional-dependencies = { + # cudf = [ cudf ]; + dask = [ + dask + dask-expr + ]; + # modin = [ modin ]; + pandas = [ pandas ]; + polars = [ polars ]; + pyarrow = [ pyarrow ]; + }; + + nativeCheckInputs = [ + duckdb + hypothesis + pytest-env + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues optional-dependencies); + + pythonImportsCheck = [ "narwhals" ]; + + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + ]; + + meta = { + description = "Lightweight and extensible compatibility layer between dataframe libraries"; + homepage = "https://github.com/narwhals-dev/narwhals"; + changelog = "https://github.com/narwhals-dev/narwhals/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix index e96ba513b131..ffd604f6daec 100644 --- a/pkgs/development/python-modules/nats-py/default.nix +++ b/pkgs/development/python-modules/nats-py/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { dependencies = [ ed25519 ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; nkeys = [ nkeys ]; # fast_parse = [ @@ -58,7 +58,7 @@ buildPythonPackage rec { "test_ordered_consumer_larger_streams" "test_object_file_basics" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_subscribe_iterate_next_msg" "test_buf_size_force_flush_timeout" ]; diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 07baf52739fd..b11d97f30ec9 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.3"; + version = "5.0.4"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = "refs/tags/${version}"; - hash = "sha256-p7BRUf0YECI8xW3GVOCXHKtKs/4MFKUZR3k1XmTKMZI="; + hash = "sha256-5UFhR5WYxHJSRk2G5ik1IuNW1ra/IHoU/LNqiA95R94="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 11f3424083cb..3a8812b5426c 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ncclient"; - version = "0.6.15"; + version = "0.6.16"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,14 +20,14 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mdFoSTUS4QhY05rY0fqKTpRQTR9oLvOMTVr4kWJbiUQ="; + hash = "sha256-IMCMlGt5/G4PRz525ZomsovU55vBnGhHndBtC7ym6lc="; }; propagatedBuildInputs = [ paramiko lxml six - ]; + ] ++ paramiko.optional-dependencies.ed25519; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ndindex/default.nix b/pkgs/development/python-modules/ndindex/default.nix index 5bd31f3042a1..9c4ce4387e20 100644 --- a/pkgs/development/python-modules/ndindex/default.nix +++ b/pkgs/development/python-modules/ndindex/default.nix @@ -5,6 +5,7 @@ # build-system cython, + setuptools, # optional numpy, @@ -13,36 +14,45 @@ hypothesis, pytest-cov-stub, pytestCheckHook, + sympy, }: buildPythonPackage rec { pname = "ndindex"; - version = "1.8"; - format = "setuptools"; + version = "1.9.2"; + pyproject = true; src = fetchFromGitHub { owner = "Quansight-Labs"; repo = "ndindex"; rev = "refs/tags/${version}"; - hash = "sha256-F52ly3NkrZ0H9XoomMqmWfLl+8X0z26Yx67DB8DUqyU="; + hash = "sha256-5S4HN5MFLgURImwFsyyTOxDhrZJ5Oe+Ln/TA/bsCsek="; }; - nativeBuildInputs = [ cython ]; + build-system = [ + cython + setuptools + ]; postPatch = '' substituteInPlace pytest.ini \ --replace "--flakes" "" ''; - passthru.optional-dependencies.arrays = [ numpy ]; + optional-dependencies.arrays = [ numpy ]; pythonImportsCheck = [ "ndindex" ]; + preCheck = '' + cd $out + ''; + nativeCheckInputs = [ hypothesis pytest-cov-stub pytestCheckHook - ] ++ passthru.optional-dependencies.arrays; + sympy + ] ++ optional-dependencies.arrays; meta = with lib; { description = ""; diff --git a/pkgs/development/python-modules/ndtypes/default.nix b/pkgs/development/python-modules/ndtypes/default.nix index 55ec525d4420..d3eb0a25ed01 100644 --- a/pkgs/development/python-modules/ndtypes/default.nix +++ b/pkgs/development/python-modules/ndtypes/default.nix @@ -36,7 +36,7 @@ buildPythonPackage { mkdir $out/include cp python/ndtypes/*.h $out/include '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath ${libndtypes}/lib $out/${python.sitePackages}/ndtypes/_ndtypes.*.so ''; diff --git a/pkgs/development/python-modules/nebula3-python/default.nix b/pkgs/development/python-modules/nebula3-python/default.nix index c746e8c52180..3f208bd9f359 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.2"; + version = "3.8.3"; 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-XwrrT5Vuwqw57u3Xt9nS4NjmFG2VD62gWSVfeek2478="; + hash = "sha256-p2dXpcOwVKbdfRKKTAc4LhaNuTjvPd8BBBI8aUivaZ4="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 498e644a05e5..0aa2309df04b 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.24.0"; + version = "5.26.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-bkLz+4eOS+c1qUC2PbPNcn19sJqUqONSgKhAe1Ga1U8="; + hash = "sha256-4rvs313MU4EXqpnxRZPKy5Z64OJmQnsWRq9T0MIoaOo="; }; postPatch = '' @@ -41,7 +41,7 @@ buildPythonPackage rec { tomlkit ]; - passthru.optional-dependencies = { + optional-dependencies = { numpy = [ numpy ]; pandas = [ numpy diff --git a/pkgs/development/python-modules/netbox-bgp/default.nix b/pkgs/development/python-modules/netbox-bgp/default.nix new file mode 100644 index 000000000000..0cc1d41fcc5f --- /dev/null +++ b/pkgs/development/python-modules/netbox-bgp/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + netbox, + pytestCheckHook, + python, +}: + +buildPythonPackage rec { + pname = "netbox-bgp"; + version = "0.14.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "netbox-community"; + repo = "netbox-bgp"; + rev = "v${version}"; + hash = "sha256-O/kvohyQRhAkDKN5smygyrldINkTQX6yY4eTHn7zSPU"; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ netbox ]; + + preFixup = '' + export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH + ''; + + dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion; + + pythonImportsCheck = [ "netbox_bgp" ]; + + meta = { + description = "NetBox plugin for BGP related objects documentation"; + homepage = "https://github.com/netbox-community/netbox-bgp"; + changelog = "https://github.com/netbox-community/netbox-bgp/releases/tag/${src.rev}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ felbinger ]; + }; +} diff --git a/pkgs/development/python-modules/netbox-documents/default.nix b/pkgs/development/python-modules/netbox-documents/default.nix new file mode 100644 index 000000000000..099911166d03 --- /dev/null +++ b/pkgs/development/python-modules/netbox-documents/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + drf-extra-fields, + python, + netbox, +}: + +buildPythonPackage rec { + pname = "netbox-documents"; + version = "0.7.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jasonyates"; + repo = "netbox-documents"; + rev = "v${version}"; + hash = "sha256-Uijdaicbx9A9fBgFx3zyhhFlokFdb9TSolnExbfkkc4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ drf-extra-fields ]; + + nativeCheckInputs = [ netbox ]; + + preFixup = '' + export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH + ''; + + dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion; + pythonImportsCheck = [ "netbox_documents" ]; + + meta = { + description = "Plugin designed to faciliate the storage of site, circuit, device type and device specific documents within NetBox"; + homepage = "https://github.com/jasonyates/netbox-documents"; + changelog = "https://github.com/jasonyates/netbox-documents/releases/tag/${src.rev}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ felbinger ]; + }; +} diff --git a/pkgs/development/python-modules/netbox-reorder-rack/default.nix b/pkgs/development/python-modules/netbox-reorder-rack/default.nix index bb079f2eda34..27dd562480d2 100644 --- a/pkgs/development/python-modules/netbox-reorder-rack/default.nix +++ b/pkgs/development/python-modules/netbox-reorder-rack/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "netbox-reorder-rack"; - version = "1.0.0"; + version = "1.1.2"; pyproject = true; src = fetchFromGitHub { owner = "netbox-community"; repo = "netbox-reorder-rack"; - rev = "v${version}"; - hash = "sha256-UbTq3DHxSczDxQIUyAHCVJG3SZdqgyS9ULNvuDKQvEY="; + rev = "refs/tags/v${version}"; + hash = "sha256-0572pj1OA08Zxl4vhMmFHvQA/K24hG/GhKEbo+hbW5Q="; }; build-system = [ diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 911ea8afefd9..056949ef2f97 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -1,53 +1,57 @@ { lib, - stdenv, buildPythonPackage, + certifi, + cftime, + curl, + cython, fetchPypi, + hdf5, isPyPy, - python, + libjpeg, + netcdf, + numpy, oldest-supported-numpy, - setuptools, + python, + pythonOlder, + setuptools-scm, + stdenv, wheel, - certifi, - numpy, zlib, - netcdf, - hdf5, - curl, - libjpeg, - cython, - cftime, }: buildPythonPackage rec { pname = "netcdf4"; - version = "1.6.5"; - format = "pyproject"; + version = "1.7.1.post2"; + pyproject = true; - disabled = isPyPy; + disabled = isPyPy || pythonOlder "3.8"; src = fetchPypi { - pname = "netCDF4"; - inherit version; - hash = "sha256-gkiB0KrP3lvZgtat7dhXQlnIVVN4HnuD4M6CuJC/oO8="; + inherit pname version; + hash = "sha256-N9VX42ZUiJ1wIBkr+1b51fk4lMsymX64N65YbFOP17Y="; }; - nativeBuildInputs = [ + postPatch = '' + sed -i "/numpy>=/d" pyproject.toml + ''; + + build-system = [ cython oldest-supported-numpy - setuptools + setuptools-scm wheel ]; propagatedBuildInputs = [ certifi cftime - numpy - zlib - netcdf - hdf5 curl + hdf5 libjpeg + netcdf + numpy + zlib ]; checkPhase = '' diff --git a/pkgs/development/python-modules/netifaces2/default.nix b/pkgs/development/python-modules/netifaces2/default.nix new file mode 100644 index 000000000000..379e1efc14dd --- /dev/null +++ b/pkgs/development/python-modules/netifaces2/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + rustPlatform, + fetchFromGitHub, + pythonOlder, + pytestCheckHook, +}: +let + pname = "netifaces2"; + version = "0.0.22"; + + src = fetchFromGitHub { + owner = "SamuelYvon"; + repo = "netifaces-2"; + rev = "refs/tags/V${version}"; + hash = "sha256-XO3HWq8FOVzvpbK8mIBOup6hFMnhDpqOK/5bPziPZQ8="; + }; +in +buildPythonPackage { + inherit pname version src; + pyproject = true; + + disabled = pythonOlder "3.7"; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit pname version src; + hash = "sha256-dkqI0P61ciGqPtBc/6my7osaxxO9pEgovZhlpo1HdkU="; + }; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "netifaces" ]; + + meta = { + description = "Portable network interface information"; + homepage = "https://github.com/SamuelYvon/netifaces-2"; + license = with lib.licenses; [ mit ]; + platforms = with lib.platforms; unix ++ windows; + maintainers = with lib.maintainers; [ pluiedev ]; + }; +} diff --git a/pkgs/development/python-modules/netmiko/default.nix b/pkgs/development/python-modules/netmiko/default.nix index 868de524a05e..9af5bca959ef 100644 --- a/pkgs/development/python-modules/netmiko/default.nix +++ b/pkgs/development/python-modules/netmiko/default.nix @@ -2,33 +2,33 @@ lib, buildPythonPackage, fetchPypi, - - # build-system - poetry-core, - - # dependencies ntc-templates, paramiko, + poetry-core, pyserial, + pythonOlder, pyyaml, scp, + setuptools, textfsm, }: buildPythonPackage rec { pname = "netmiko"; - version = "4.3.0"; + version = "4.4.0"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchPypi { inherit pname version; - hash = "sha256-2pD2798ztBQOts1/InJ3PCzhRPp0rDTV7KwbTUYH8fs="; + hash = "sha256-Jf8SN5dqo/8srPBJSTFGOMiZIgoWdb0CnjGwfOIM47Y="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "poetry==1.3.2" "poetry-core" \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" + --replace-fail "poetry>=1.6.1" "poetry-core" \ + --replace-fail "poetry.masonry.api" "poetry.core.masonry.api" ''; nativeBuildInputs = [ poetry-core ]; @@ -39,15 +39,19 @@ buildPythonPackage rec { pyserial pyyaml scp + setuptools textfsm ]; - # tests require closed-source pyats and genie packages + # Tests require closed-source pyats and genie packages doCheck = false; + pythonImportsCheck = [ "netmiko" ]; + meta = with lib; { description = "Multi-vendor library to simplify Paramiko SSH connections to network devices"; homepage = "https://github.com/ktbyers/netmiko/"; + changelog = "https://github.com/ktbyers/netmiko/releases/tag/v${version}"; license = licenses.mit; maintainers = [ maintainers.astro ]; }; diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index 04ab642d75d6..f1c1a4f383a0 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { dependencies = [ jsonschema ]; - passthru.optional-dependencies.optionals = [ + optional-dependencies.optionals = [ jsonschema napalm ]; diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index eb3051d8e14b..46ba43afb139 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { default = [ numpy scipy diff --git a/pkgs/development/python-modules/nexusformat/default.nix b/pkgs/development/python-modules/nexusformat/default.nix index 7a9ea2e698be..ae685948c3a0 100644 --- a/pkgs/development/python-modules/nexusformat/default.nix +++ b/pkgs/development/python-modules/nexusformat/default.nix @@ -2,31 +2,28 @@ lib, buildPythonPackage, fetchPypi, - - # build-system - setuptools, - setuptools-scm, - - # tests - pytestCheckHook, - - # dependencies h5py, hdf5plugin, numpy, + pytestCheckHook, + pythonOlder, scipy, + setuptools-scm, + setuptools, }: buildPythonPackage rec { pname = "nexusformat"; - version = "1.0.6"; + version = "1.0.7"; + pyproject = true; + + disabled = pythonOlder "3.10"; + src = fetchPypi { inherit pname version; - hash = "sha256-UxU3PA/2r/uamdysbfC0L2JinHgfkXhssHIo2hf3zlA="; + hash = "sha256-SSS6LTOdqLTHNGpBRO7UELF9qJb/sG8EwrE/azxk7wM="; }; - pyproject = true; - build-system = [ setuptools setuptools-scm @@ -39,14 +36,14 @@ buildPythonPackage rec { scipy ]; - pythonImportsCheck = [ "nexusformat.nexus" ]; - nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "nexusformat.nexus" ]; + meta = with lib; { description = "Python API to open, create, and manipulate NeXus data written in the HDF5 format"; homepage = "https://github.com/nexpy/nexusformat"; - changelog = "https://github.com/nexpy/nexusformat/releases/tag/${version}"; + changelog = "https://github.com/nexpy/nexusformat/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ oberth-effect ]; }; diff --git a/pkgs/development/python-modules/nh3/default.nix b/pkgs/development/python-modules/nh3/default.nix index 1699b18c182d..f438525e5182 100644 --- a/pkgs/development/python-modules/nh3/default.nix +++ b/pkgs/development/python-modules/nh3/default.nix @@ -34,7 +34,7 @@ buildPythonPackage { maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/python-modules/niaaml/default.nix b/pkgs/development/python-modules/niaaml/default.nix index 30197c168339..e457b9c79b4c 100644 --- a/pkgs/development/python-modules/niaaml/default.nix +++ b/pkgs/development/python-modules/niaaml/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + loguru, niapy, numpy, pandas, @@ -10,6 +11,7 @@ pythonOlder, scikit-learn, toml-adapt, + typer, }: buildPythonPackage rec { @@ -34,10 +36,12 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + loguru niapy numpy pandas scikit-learn + typer ]; # create scikit-learn and niapy deps version consistent diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix index 31060540d170..9295c45cd23c 100644 --- a/pkgs/development/python-modules/niaarm/default.nix +++ b/pkgs/development/python-modules/niaarm/default.nix @@ -6,15 +6,17 @@ nltk, numpy, pandas, + plotly, poetry-core, pytestCheckHook, pythonOlder, + scikit-learn, tomli, }: buildPythonPackage rec { pname = "niaarm"; - version = "0.3.9"; + version = "0.3.12"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,9 +25,11 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "NiaARM"; rev = "refs/tags/${version}"; - hash = "sha256-J3126RSJYBCSyxoPsvsDgmx9E+9fP2h6avPiCHISL7c="; + hash = "sha256-rYFfLtPJgIdSjRIzDIQeHwoQm9NrI6nM3/BF7wAMr1Y="; }; + pythonRelaxDeps = [ "scikit-learn" ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ @@ -33,6 +37,8 @@ buildPythonPackage rec { nltk numpy pandas + plotly + scikit-learn ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; disabledTests = [ diff --git a/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix index f7cfecd8a5c1..575ee5043044 100644 --- a/pkgs/development/python-modules/niapy/default.nix +++ b/pkgs/development/python-modules/niapy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "niapy"; - version = "2.3.1"; + version = "2.5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "NiaOrg"; repo = "NiaPy"; rev = "refs/tags/v${version}"; - hash = "sha256-cT5CU1r3LZ9ValJwRUA0PaISmF6kXAz40alXbWYogGA="; + hash = "sha256-+5tXwubKdhkcv5NjO/DglK+WJfsJ3AzVx/Y/byDBmGo="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 1fb80ed06f34..c0a51cd1dd39 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { packaging ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; - passthru.optional-dependencies = rec { + optional-dependencies = rec { all = dicom ++ dicomfs ++ minc2 ++ spm ++ zstd; dicom = [ pydicom ]; dicomfs = [ pillow ] ++ dicom; @@ -59,7 +59,7 @@ buildPythonPackage rec { pytest-httpserver pytest-xdist pytest7CheckHook - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; preCheck = '' export PATH=$out/bin:$PATH diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index c08da4abe517..b1538e871a66 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "nibe"; - version = "2.12.0"; + version = "2.13.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = "nibe"; rev = "refs/tags/${version}"; - hash = "sha256-Sqwwk++iA/PsAKZRkUPjXuzgSrhnH4N02c072pIVEyw="; + hash = "sha256-azAVvVAlG74wgH/96+sc6S9XQLRFZgR4aU6d4gy43PQ="; }; build-system = [ setuptools ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { tenacity ]; - passthru.optional-dependencies = { + optional-dependencies = { convert = [ pandas python-slugify @@ -53,7 +53,7 @@ buildPythonPackage rec { aresponses pytest-asyncio pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "nibe" ]; diff --git a/pkgs/development/python-modules/nice-go/default.nix b/pkgs/development/python-modules/nice-go/default.nix index 946d129e95c4..6e80edf9ba4d 100644 --- a/pkgs/development/python-modules/nice-go/default.nix +++ b/pkgs/development/python-modules/nice-go/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "nice-go"; - version = "0.3.9"; + version = "0.3.10"; pyproject = true; src = fetchFromGitHub { owner = "IceBotYT"; repo = "nice-go"; rev = "refs/tags/${version}"; - hash = "sha256-Gb6VDHADtqmVXMPwic0NokWm5GmhTpy7g+o/rYxrBZk="; + hash = "sha256-LPH6U0D/JSi8zASlirfkNgfWOh/ArPHoccniNjy2hJc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index da8452a437ed..a6a7a45edef1 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -29,7 +29,6 @@ simplejson, traits, xvfbwrapper, - codecov, # other dependencies which, bash, @@ -56,7 +55,6 @@ buildPythonPackage rec { --replace "/usr/bin/env bash" "${bash}/bin/bash" ''; - pythonRelaxDeps = [ "traits" ]; propagatedBuildInputs = [ @@ -83,7 +81,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pybids - codecov glibcLocales mock pytest @@ -93,7 +90,7 @@ buildPythonPackage rec { ]; # checks on darwin inspect memory which doesn't work in build environment - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # ignore tests which incorrect fail to detect xvfb checkPhase = '' LC_ALL="en_US.UTF-8" pytest nipype/tests -k 'not display and not test_no_et_multiproc' diff --git a/pkgs/development/python-modules/nitime/default.nix b/pkgs/development/python-modules/nitime/default.nix index 6cc35b662c00..35b8eb4c46fc 100644 --- a/pkgs/development/python-modules/nitime/default.nix +++ b/pkgs/development/python-modules/nitime/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - doCheck = !stdenv.isDarwin; # tests hang indefinitely + doCheck = !stdenv.hostPlatform.isDarwin; # tests hang indefinitely pythonImportsCheck = [ "nitime" ]; diff --git a/pkgs/development/python-modules/nitrokey/default.nix b/pkgs/development/python-modules/nitrokey/default.nix new file mode 100644 index 000000000000..b39d6d344061 --- /dev/null +++ b/pkgs/development/python-modules/nitrokey/default.nix @@ -0,0 +1,61 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchPypi, + poetry-core, + cryptography, + fido2, + requests, + tlv8, + pyserial, + protobuf5, + semver, + crcmod, + hidapi, + ecdsa, +}: + +buildPythonPackage rec { + pname = "nitrokey"; + version = "0.2.2"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-tG6+diyrauJEzpPG33+S5o1ik3n44/443szR7vXH4gE="; + }; + + disabled = pythonOlder "3.9"; + + build-system = [ poetry-core ]; + + dependencies = [ + fido2 + requests + semver + tlv8 + crcmod + cryptography + hidapi + ecdsa + protobuf5 + pyserial + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "nitrokey" ]; + + meta = with lib; { + description = "Python SDK for Nitrokey devices"; + homepage = "https://github.com/Nitrokey/nitrokey-sdk-py"; + changelog = "https://github.com/Nitrokey/nitrokey-sdk-py/releases/tag/v${version}"; + license = with licenses; [ + asl20 + mit + ]; + maintainers = with maintainers; [ panicgh ]; + }; +} diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 34dd91898287..1e0472fb7802 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.5.3"; + version = "0.5.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-7LzReT1iuCbZYNJWjDriMaCljLzpyKWfCX6HjTt18ls="; + hash = "sha256-4dHxwTHDe8aE/FFtf9jhOO1Wf3uU7KjBa/ngj8o5iMY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/norfair/default.nix b/pkgs/development/python-modules/norfair/default.nix index c3c50cd13334..24376e28863f 100644 --- a/pkgs/development/python-modules/norfair/default.nix +++ b/pkgs/development/python-modules/norfair/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { scipy ]; - passthru.optional-dependencies = { + optional-dependencies = { metrics = [ motmetrics ]; video = [ opencv4 ]; }; 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 deleted file mode 100644 index 67a671a8ae5f..000000000000 --- a/pkgs/development/python-modules/nose/0001-nose-python-3.12-fixes.patch +++ /dev/null @@ -1,576 +0,0 @@ -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 deleted file mode 100644 index 308039cc61d7..000000000000 --- a/pkgs/development/python-modules/nose/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - isPy3k, - isPyPy, - python, - python312, - coverage, - setuptools, -}: - -buildPythonPackage rec { - version = "1.3.7"; - pname = "nose"; - pyproject = true; - - src = fetchPypi { - inherit pname version; - sha256 = "f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98"; - }; - - build-system = [ setuptools ]; - - patches = lib.optional isPy3k [ ./0001-nose-python-3.12-fixes.patch ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace "'use_2to3': True," "" - - substituteInPlace setup3lib.py \ - --replace "from setuptools.command.build_py import Mixin2to3" "from distutils.util import Mixin2to3" - ''; - - # 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 ]; - - doCheck = false; # lot's of transient errors, too much hassle - checkPhase = - if isPy3k then - '' - ${python.pythonOnBuildForHost.interpreter} setup.py build_tests - '' - else - "" - + '' - rm functional_tests/test_multiprocessing/test_concurrent_shared.py* # see https://github.com/nose-devs/nose/commit/226bc671c73643887b36b8467b34ad485c2df062 - ${python.pythonOnBuildForHost.interpreter} selftest.py - ''; - - meta = with lib; { - broken = isPyPy; # missing 2to3 conversion utility - description = "Unittest-based testing framework for python that makes writing and running tests easier"; - mainProgram = "nosetests"; - homepage = "https://nose.readthedocs.io/"; - license = licenses.lgpl3; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index b2a65a5648ef..cbf66277951b 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { coverage = [ coverage ]; }; @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ unittestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); meta = with lib; { changelog = "https://github.com/nose-devs/nose2/blob/${version}/docs/changelog.rst"; diff --git a/pkgs/development/python-modules/nose2pytest/default.nix b/pkgs/development/python-modules/nose2pytest/default.nix index a1aaa748db0b..72f554e8a501 100644 --- a/pkgs/development/python-modules/nose2pytest/default.nix +++ b/pkgs/development/python-modules/nose2pytest/default.nix @@ -5,8 +5,7 @@ fetchpatch2, setuptools, fissix, - pytestCheckHook, - nose, + pytest, }: let @@ -37,16 +36,13 @@ buildPythonPackage { build-system = [ setuptools ]; - dependencies = [ fissix ]; - - nativeCheckInputs = [ - pytestCheckHook - nose + dependencies = [ + fissix + pytest ]; - preCheck = '' - export HOME=$(mktemp -d) - ''; + # Tests depend on nose! + doCheck = false; pythonImportsCheck = [ "nose2pytest.assert_tools" ]; diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix index 38f4ff5af140..cc46dbe77fdf 100644 --- a/pkgs/development/python-modules/notify-py/default.nix +++ b/pkgs/development/python-modules/notify-py/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { }; patches = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ # hardcode paths to aplay and notify-send (substituteAll { src = ./linux-paths.patch; @@ -39,7 +39,7 @@ buildPythonPackage rec { notifysend = "${libnotify}/bin/notify-send"; }) ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # hardcode path to which (substituteAll { src = ./darwin-paths.patch; @@ -53,19 +53,19 @@ buildPythonPackage rec { pythonRelaxDeps = [ "loguru" ]; - propagatedBuildInputs = [ loguru ] ++ lib.optionals stdenv.isLinux [ jeepney ]; + propagatedBuildInputs = [ loguru ] ++ lib.optionals stdenv.hostPlatform.isLinux [ jeepney ]; - nativeCheckInputs = [ pytest ] ++ lib.optionals stdenv.isLinux [ dbus ]; + nativeCheckInputs = [ pytest ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus ]; checkPhase = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then '' # Tests search for "afplay" binary which is built in to macOS and not available in nixpkgs mkdir $TMP/bin ln -s ${coreutils}/bin/true $TMP/bin/afplay PATH="$TMP/bin:$PATH" pytest '' - else if stdenv.isLinux then + else if stdenv.hostPlatform.isLinux then '' dbus-run-session \ --config-file=${dbus}/share/dbus-1/session.conf \ diff --git a/pkgs/development/python-modules/notion-client/default.nix b/pkgs/development/python-modules/notion-client/default.nix index 6ec520c3ae47..12500e9fe854 100644 --- a/pkgs/development/python-modules/notion-client/default.nix +++ b/pkgs/development/python-modules/notion-client/default.nix @@ -43,6 +43,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "notion_client" ]; + disabledTests = [ + # requires network access + "test_api_http_response_error" + ]; + meta = with lib; { description = "Python client for the official Notion API"; homepage = "https://github.com/ramnes/notion-sdk-py"; diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix index 2f60f1199180..2751d971c175 100644 --- a/pkgs/development/python-modules/nox/default.nix +++ b/pkgs/development/python-modules/nox/default.nix @@ -5,55 +5,64 @@ colorlog, fetchFromGitHub, hatchling, - importlib-metadata, jinja2, packaging, pytestCheckHook, pythonOlder, + tomli, tox, - typing-extensions, + uv, virtualenv, }: buildPythonPackage rec { pname = "nox"; - version = "2024.04.15"; - format = "pyproject"; + version = "2024.10.09"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "wntrblm"; - repo = pname; + repo = "nox"; rev = "refs/tags/${version}"; - hash = "sha256-PagZR2IdS1gS/ukl4b0Al9sdEsFnFwP8oy0eOGKJHMs="; + hash = "sha256-GdNz34A8IKwPG/270sY5t3SoggGCZMWfDq/Wyhk0ez8="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = + dependencies = [ argcomplete colorlog packaging virtualenv ] - ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions - importlib-metadata + ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; - nativeCheckInputs = [ - jinja2 - tox - pytestCheckHook - ]; + optional-dependencies = { + tox_to_nox = [ + jinja2 + tox + ]; + uv = [ uv ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); + + preCheck = '' + export HOME=$(mktemp -d) + ''; pythonImportsCheck = [ "nox" ]; disabledTests = [ # our conda is not available on 3.11 "test__create_venv_options" + # Assertion errors + "test_uv" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/nskeyedunarchiver/default.nix b/pkgs/development/python-modules/nskeyedunarchiver/default.nix new file mode 100644 index 000000000000..ed4e5ac35f5c --- /dev/null +++ b/pkgs/development/python-modules/nskeyedunarchiver/default.nix @@ -0,0 +1,29 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + setuptools, +}: + +buildPythonPackage rec { + pname = "nskeyedunarchiver"; + version = "1.2"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "NSKeyedUnArchiver"; + hash = "sha256-OZWPGH8ggYYKxeg6CGyft6ZM9Yx/43z7YylzXlQcTVg="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "NSKeyedUnArchiver" ]; + + meta = { + description = "Unserializes plist data into a usable Python dict"; + homepage = "https://github.com/avibrazil/NSKeyedUnArchiver"; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ PapayaJackal ]; + }; +} diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 10f622b37722..18bd264c5d76 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { "dldir = [ '${addDriverRunpath.driverLink}/lib', " ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; build-system = [ setuptools diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index 23f49c77ad43..403d5ea16051 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -2,85 +2,68 @@ lib, stdenv, buildPythonPackage, - fetchpatch, fetchPypi, + python, + pythonOlder, + + # build-system setuptools, setuptools-scm, cython, + py-cpuinfo, + + # dependencies numpy, + + # tests msgpack, - py-cpuinfo, pytestCheckHook, - python, - pythonOlder, + importlib-metadata, }: buildPythonPackage rec { pname = "numcodecs"; - version = "0.12.1"; + version = "0.13.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-BdkaQzcz5+7yaNfoDsImoCMtokQolhSo84JpAa7BCY4="; + hash = "sha256-o883iB3wiY86nA1Ed9+IEz/oUYW//le6MbzC+iB3Cbw="; }; - patches = [ - # https://github.com/zarr-developers/numcodecs/pull/487 - (fetchpatch { - name = "fix-tests.patch"; - url = "https://github.com/zarr-developers/numcodecs/commit/4896680087d3ff1f959401c51cf5aea0fd56554e.patch"; - hash = "sha256-+lMWK5IsNzJ7H2SmLckgxbSSRIIcC7FtGYSBKQtuo+Y="; - }) - ]; - - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm cython py-cpuinfo ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { msgpack = [ msgpack ]; # zfpy = [ zfpy ]; }; - preBuild = - if (stdenv.hostPlatform.isx86 && !stdenv.hostPlatform.avx2Support) then - '' - export DISABLE_NUMCODECS_AVX2= - '' - else - null; + preBuild = lib.optionalString (stdenv.hostPlatform.isx86 && !stdenv.hostPlatform.avx2Support) '' + export DISABLE_NUMCODECS_AVX2=1 + ''; nativeCheckInputs = [ pytestCheckHook msgpack + importlib-metadata ]; + # https://github.com/NixOS/nixpkgs/issues/255262 pytestFlagsArray = [ "$out/${python.sitePackages}/numcodecs" ]; - disabledTests = [ - "test_backwards_compatibility" - - "test_encode_decode" - "test_legacy_codec_broken" - "test_bytes" - - # ValueError: setting an array element with a sequence. The requested array has an inhomogeneous shape after 1 dimensions. The detected shape was (3,) + inhomogeneous part. - # with numpy 1.24 - "test_non_numpy_inputs" - ]; - - meta = with lib; { + meta = { homepage = "https://github.com/zarr-developers/numcodecs"; - license = licenses.mit; + license = lib.licenses.mit; description = "Buffer compression and transformation codecs for use in data storage and communication applications"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index f54dcb03b526..3681e0d9c73a 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -1,35 +1,50 @@ { lib, buildPythonPackage, + dos2unix, fetchPypi, + fetchpatch2, numpy, pytestCheckHook, setuptools, - wheel, }: buildPythonPackage rec { pname = "numexpr"; - version = "2.10.0"; + version = "2.10.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-yJ6TB1JjnfBAU5FgMm2PmahBWbvqQZQ6uOlgWR7arvA="; + hash = "sha256-m7qZ01SmXxoAiri4fwfYRATGaOZrq2JN9ba1NzQDz4E="; }; + patches = [ + (fetchpatch2 { + # https://github.com/pydata/numexpr/pull/491 + name = "fix-test.patch"; + url = "https://github.com/pydata/numexpr/commit/2c7bb85e117147570db5619ed299497a42af9f54.patch"; + hash = "sha256-cv2logZ8dKeWNB5+bPmPfpfiWaV7k8+2sE9lZa+dUsA="; + }) + ]; + + prePatch = '' + dos2unix numexpr/tests/test_numexpr.py + ''; + # patch for compatibility with numpy < 2.0 # see more details, https://numpy.org/devdocs/numpy_2_0_migration_guide.html#c-api-changes postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "numpy>=2.0.0rc1" "numpy" + --replace-fail "numpy>=2.0.0" "numpy" sed -i "1i#define PyDataType_SET_ELSIZE(descr, elsize)" numexpr/interpreter.cpp sed -i "1i#define PyDataType_ELSIZE(descr) ((descr)->elsize)" numexpr/interpreter.cpp ''; + nativeBuildInputs = [ dos2unix ]; + build-system = [ setuptools - wheel numpy ]; diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index fd1911a81875..bf7bac7f9950 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,28 +2,32 @@ lib, buildPythonPackage, cython, - enum34, fetchPypi, - nine, numpy, pytestCheckHook, python-utils, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "numpy-stl"; - version = "3.1.1"; - format = "setuptools"; + version = "3.1.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-947qYsgJOL9T6pFPpbbJL0SPDqtWCeDlpzfd4DlAQzQ="; + pname = "numpy_stl"; + inherit version; + hash = "sha256-crRpUN+jZC3xx7hzz6eKVIUzckuQdHjFZ9tC/fV+49I="; }; - propagatedBuildInputs = [ - cython - enum34 - nine + build-system = [ setuptools ]; + + nativeBuildInputs = [ cython ]; + + dependencies = [ numpy python-utils ]; @@ -35,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to make reading, writing and modifying both binary and ascii STL files easy"; homepage = "https://github.com/WoLpH/numpy-stl/"; + changelog = "https://github.com/wolph/numpy-stl/releases/tag/v${version}"; license = licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/numpy/1.nix b/pkgs/development/python-modules/numpy/1.nix index ade66d14b829..795f24e5eefa 100644 --- a/pkgs/development/python-modules/numpy/1.nix +++ b/pkgs/development/python-modules/numpy/1.nix @@ -105,7 +105,7 @@ buildPythonPackage rec { meson-python pkg-config ] - ++ lib.optionals (stdenv.isDarwin) [ xcbuild.xcrun ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ xcbuild.xcrun ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ]; buildInputs = [ @@ -155,13 +155,17 @@ buildPythonPackage rec { # https://github.com/numpy/numpy/issues/24548 disabledTests = - lib.optionals stdenv.isi686 [ + [ + # Tries to import numpy.distutils.msvccompiler, removed in setuptools 74.0 + "test_api_importable" + ] + ++ lib.optionals stdenv.hostPlatform.isi686 [ "test_new_policy" # AssertionError: assert False "test_identityless_reduction_huge_array" # ValueError: Maximum allowed dimension exceeded "test_float_remainder_overflow" # AssertionError: FloatingPointError not raised by divmod "test_int" # AssertionError: selectedintkind(19): expected 16 but got -1 ] - ++ lib.optionals stdenv.isAarch32 [ + ++ lib.optionals stdenv.hostPlatform.isAarch32 [ "test_impossible_feature_enable" # AssertionError: Failed to generate error "test_features" # AssertionError: Failure Detection "test_new_policy" # AssertionError: assert False @@ -173,10 +177,10 @@ buildPythonPackage rec { "test_big_arrays" # ValueError: array is too big; `arr.size * arr.dtype.itemsize` is larger tha... "test_multinomial_pvals_float32" # Failed: DID NOT RAISE <class 'ValueError'> ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test_big_arrays" # OOM on a 16G machine ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # can fail on virtualized machines confused over their cpu identity "test_dispatcher" ]; diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix index 5b71602d72c2..5acc21db4538 100644 --- a/pkgs/development/python-modules/numpy/2.nix +++ b/pkgs/development/python-modules/numpy/2.nix @@ -59,7 +59,7 @@ let in buildPythonPackage rec { pname = "numpy"; - version = "2.1.1"; + version = "2.1.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -67,7 +67,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-0M99VbEFE4eAdAWziY76+oYpl7TLqKpdvmV755Sv6v0="; + hash = "sha256-E1MqCIIX+mJMmbhD7rVGQN4js0FLFKpm0COAXrcxBmw="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ @@ -90,7 +90,7 @@ buildPythonPackage rec { meson-python pkg-config ] - ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ]; # we default openblas to build with 64 threads @@ -140,11 +140,15 @@ buildPythonPackage rec { ]; disabledTests = - lib.optionals (pythonAtLeast "3.13") [ + [ + # Tries to import numpy.distutils.msvccompiler, removed in setuptools 74.0 + "test_api_importable" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ # https://github.com/numpy/numpy/issues/26713 "test_iter_refcount" ] - ++ lib.optionals stdenv.isAarch32 [ + ++ lib.optionals stdenv.hostPlatform.isAarch32 [ # https://github.com/numpy/numpy/issues/24548 "test_impossible_feature_enable" # AssertionError: Failed to generate error "test_features" # AssertionError: Failure Detection @@ -157,7 +161,7 @@ buildPythonPackage rec { "test_big_arrays" # ValueError: array is too big; `arr.size * arr.dtype.itemsize` is larger tha... "test_multinomial_pvals_float32" # Failed: DID NOT RAISE <class 'ValueError'> ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # AssertionError: (np.int64(0), np.longdouble('9.9999999999999994515e-21'), np.longdouble('3.9696755572509052902e+20'), 'arctanh') "test_loss_of_precision" ]; diff --git a/pkgs/development/python-modules/nutils-poly/default.nix b/pkgs/development/python-modules/nutils-poly/default.nix index 3acda2fe55f1..e15b2fcd2a27 100644 --- a/pkgs/development/python-modules/nutils-poly/default.nix +++ b/pkgs/development/python-modules/nutils-poly/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { nativeBuildInputs = [ rustPlatform.cargoSetupHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; build-system = [ rustPlatform.maturinBuildHook ]; diff --git a/pkgs/development/python-modules/nutpie/default.nix b/pkgs/development/python-modules/nutpie/default.nix new file mode 100644 index 000000000000..6c31d823c625 --- /dev/null +++ b/pkgs/development/python-modules/nutpie/default.nix @@ -0,0 +1,98 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, + + # build-system + cargo, + rustc, + + # buildInputs + libiconv, + + # dependencies + arviz, + pandas, + pyarrow, + xarray, + + # tests + # bridgestan, (not packaged) + jax, + jaxlib, + numba, + pymc, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "nutpie"; + version = "0.13.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pymc-devs"; + repo = "nutpie"; + rev = "refs/tags/v${version}"; + hash = "sha256-XyUMCnHm5V7oFaf3W+nGpcHfq1ZFppeGMIMCU5OB87s="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-9lM1S42Bmnlb0opstZN2aOKYhBnP87Frq+fQxk0ez+c="; + }; + + build-system = [ + cargo + rustPlatform.bindgenHook + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + dependencies = [ + arviz + pandas + pyarrow + xarray + ]; + + pythonImportsCheck = [ "nutpie" ]; + + nativeCheckInputs = [ + # bridgestan + numba + jax + jaxlib + pymc + pytestCheckHook + setuptools + ]; + + disabledTestPaths = [ + # Require unpackaged bridgestan + "tests/test_stan.py" + + # KeyError: "duplicate registration for <class 'numba.core.types.misc.SliceType'>" + "tests/test_pymc.py" + ]; + + # Currently, no test are working... + doCheck = false; + + meta = { + description = "Python wrapper for nuts-rs"; + homepage = "https://github.com/pymc-devs/nutpie"; + changelog = "https://github.com/pymc-devs/nutpie/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/nvidia-ml-py/default.nix b/pkgs/development/python-modules/nvidia-ml-py/default.nix index b620f209337e..08beac0daf50 100644 --- a/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -4,17 +4,21 @@ buildPythonPackage, substituteAll, addDriverRunpath, + setuptools, + cudaPackages, + nvidia-ml-py, }: buildPythonPackage rec { pname = "nvidia-ml-py"; - version = "12.555.43"; - format = "setuptools"; + version = "12.560.30"; + + pyproject = true; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-6efxLvHsI0uw3CLSvcdi/6+rOUvcRyoHpDd8lbv5Ov4="; + hash = "sha256-8CVNx0AGR2gKBy7gJQm/1GECtgvf7KMhV21NSBfn/pc="; }; patches = [ @@ -24,16 +28,38 @@ buildPythonPackage rec { }) ]; + build-system = [ + setuptools + ]; + # no tests doCheck = false; pythonImportsCheck = [ "pynvml" ]; + passthru.tests.tester-nvmlInit = + cudaPackages.writeGpuTestPython { libraries = [ nvidia-ml-py ]; } + '' + from pynvml import ( + nvmlInit, + nvmlSystemGetDriverVersion, + nvmlDeviceGetCount, + nvmlDeviceGetHandleByIndex, + nvmlDeviceGetName, + ) + + nvmlInit() + print(f"Driver Version: {nvmlSystemGetDriverVersion()}") + + for i in range(nvmlDeviceGetCount()): + handle = nvmlDeviceGetHandleByIndex(i) + print(f"Device {i} : {nvmlDeviceGetName(handle)}") + ''; + meta = { description = "Python Bindings for the NVIDIA Management Library"; homepage = "https://pypi.org/project/nvidia-ml-py"; license = lib.licenses.bsd3; - platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index e87edd391028..95d9a582587a 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "17.0.0"; + version = "17.1.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0eRfcuI+GuhgF0myZPy8ZcL4kBCLv6PcGEk+92J+GZ0="; + hash = "sha256-2RWsrS+W09AY9wWvvM/pYzsM0xzqcwWZYSv4BCsegiw="; }; build-system = [ setuptools ]; @@ -44,7 +44,7 @@ buildPythonPackage rec { traitlets ]; - passthru.optional-dependencies = { + optional-dependencies = { googlegroups = [ google-api-python-client google-auth-oauthlib @@ -57,7 +57,7 @@ buildPythonPackage rec { pytest-cov-stub pytestCheckHook requests-mock - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ # Tests are outdated, https://github.com/jupyterhub/oauthenticator/issues/432 diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index 84fc4a2627b8..fbbc8a6a1ad9 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { rsa = [ cryptography ]; signedtoken = [ cryptography @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ # https://github.com/oauthlib/oauthlib/issues/877 diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index 231c14e4ceff..bdd104518852 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { ipython = [ graphviz ]; }; diff --git a/pkgs/development/python-modules/objprint/default.nix b/pkgs/development/python-modules/objprint/default.nix new file mode 100644 index 000000000000..f7721b6afac8 --- /dev/null +++ b/pkgs/development/python-modules/objprint/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "objprint"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "gaogaotiantian"; + repo = "objprint"; + rev = "refs/tags/${version}"; + hash = "sha256-+OS034bikrKy4F27b6ic97fHTW6rSMxQ0dx4caF6cUM="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "objprint" ]; + + meta = { + description = "Library that can print Python objects in human readable format"; + homepage = "https://github.com/gaogaotiantian/objprint"; + changelog = "https://github.com/gaogaotiantian/objprint/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index d02ff6c5cccc..5bf872e73b66 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.134.0"; + version = "2.135.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-EHqXwTsUy2bWQ1OzogL0wQhodgcm4v6T3fz7Y+d4o4w="; + hash = "sha256-PAEHJ92aspRYMqFR9upFmILcqAWCVnR9yiOoLys0GWA="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index 3b28a9d8ee07..fbef31e9f50a 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -1,41 +1,54 @@ { lib, nix-update-script, - fetchPypi, + fetchFromGitHub, buildPythonPackage, + setuptools, deprecated, regex, - pip, + pytest-cov-stub, + pytest-forked, + pytest-random-order, + pytestCheckHook, }: buildPythonPackage rec { pname = "oelint-parser"; - version = "4.0.2"; - format = "setuptools"; + version = "5.1.0"; + pyproject = true; - src = fetchPypi { - inherit version; - pname = "oelint_parser"; - hash = "sha256-HBUrOyLvFKSp6OCN1hxEGhHLRYuBBcH725JjlCEzy8g="; + src = fetchFromGitHub { + owner = "priv-kweihmann"; + repo = "oelint-parser"; + rev = "refs/tags/${version}"; + hash = "sha256-0cCcbnipijQgWH+08eZbE6Cqcx5cenrb+bQlf3h04tw="; }; - buildInputs = [ pip ]; - propagatedBuildInputs = [ - deprecated + pythonRelaxDeps = [ "regex" ]; + + build-system = [ setuptools ]; + + dependencies = [ regex + deprecated + ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytest-forked + pytest-random-order + pytestCheckHook ]; - pythonImportsCheck = [ "oelint_parser" ]; - # Fail to run inside the code the build. - doCheck = false; + pythonImportsCheck = [ "oelint_parser" ]; passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Alternative parser for bitbake recipes"; homepage = "https://github.com/priv-kweihmann/oelint-parser"; changelog = "https://github.com/priv-kweihmann/oelint-parser/releases/tag/${version}"; - license = licenses.bsd2; - maintainers = with maintainers; [ otavio ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ otavio ]; }; } diff --git a/pkgs/development/python-modules/okonomiyaki/default.nix b/pkgs/development/python-modules/okonomiyaki/default.nix index 816b93c833a7..bdcddc59c7a7 100644 --- a/pkgs/development/python-modules/okonomiyaki/default.nix +++ b/pkgs/development/python-modules/okonomiyaki/default.nix @@ -1,64 +1,86 @@ { - buildPythonPackage, - stdenv, - fetchFromGitHub, lib, + stdenv, attrs, + buildPythonPackage, distro, + fetchFromGitHub, + parameterized, jsonschema, - six, - zipfile2, - hypothesis, mock, packaging, + pytestCheckHook, + pythonOlder, + setuptools, testfixtures, - pythonAtLeast, + zipfile2, }: buildPythonPackage rec { pname = "okonomiyaki"; - version = "1.4.0"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "enthought"; - repo = pname; + repo = "okonomiyaki"; rev = "refs/tags/${version}"; - hash = "sha256-MEll1H7l41m8uz2/WK/Ilm7Dubg0uqYwe+ZgakO1aXQ="; + hash = "sha256-JQZhw0H4iSdxoyS6ODICJz1vAZsOISQitX7wTgSS1xc="; + }; + + postPatch = '' + # Fixed for >= 2.0.0 + substituteInPlace setup.cfg \ + --replace-fail "long_description_content_type = rst" "long_description_content_type = text/x-rst" + ''; + + build-system = [ setuptools ]; + + optional-dependencies = { + all = [ + attrs + distro + jsonschema + zipfile2 + ]; + platforms = [ + attrs + distro + ]; + formats = [ + attrs + distro + jsonschema + zipfile2 + ]; }; - propagatedBuildInputs = [ - distro - attrs - jsonschema - six - zipfile2 - ]; + nativeCheckInputs = [ + packaging + parameterized + pytestCheckHook + testfixtures + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' substituteInPlace okonomiyaki/runtimes/tests/test_runtime.py \ - --replace 'runtime_info = PythonRuntime.from_running_python()' 'raise unittest.SkipTest() #' + --replace-fail 'runtime_info = PythonRuntime.from_running_python()' 'raise unittest.SkipTest() #' '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace okonomiyaki/platforms/tests/test_pep425.py \ - --replace 'self.assertEqual(platform_tag, self.tag.platform)' 'raise unittest.SkipTest()' + --replace-fail 'self.assertEqual(platform_tag, self.tag.platform)' 'raise unittest.SkipTest()' ''; - checkInputs = [ - hypothesis - mock - packaging - testfixtures - ]; - pythonImportsCheck = [ "okonomiyaki" ]; meta = with lib; { - homepage = "https://github.com/enthought/okonomiyaki"; description = "Experimental library aimed at consolidating a lot of low-level code used for Enthought's eggs"; + homepage = "https://github.com/enthought/okonomiyaki"; + changelog = "https://github.com/enthought/okonomiyaki/releases/tag/${version}"; maintainers = with maintainers; [ genericnerdyusername ]; license = licenses.bsd3; - broken = pythonAtLeast "3.12"; # multiple tests are failing }; } diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix index 42d459d56230..dc75dfd84b56 100644 --- a/pkgs/development/python-modules/okta/default.nix +++ b/pkgs/development/python-modules/okta/default.nix @@ -18,6 +18,7 @@ python-jose, pythonOlder, pyyaml, + setuptools, xmltodict, yarl, }: @@ -25,7 +26,7 @@ buildPythonPackage rec { pname = "okta"; version = "2.9.8"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -34,7 +35,11 @@ buildPythonPackage rec { hash = "sha256-RDnRiPsc4p5yI9jFzOtRI+r00tvska8x4uCSjl+cWvo="; }; - propagatedBuildInputs = [ + pythonRelaxDeps = [ "aenum" ]; + + build-system = [ setuptools ]; + + dependencies = [ aenum aiohttp flatdict @@ -66,6 +71,7 @@ buildPythonPackage rec { "test_update_org_contact_user" "test_get_role_subscription" "test_subscribe_unsubscribe" + "test_client_invalid_url" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/ome-zarr/default.nix b/pkgs/development/python-modules/ome-zarr/default.nix index 297d35fb0deb..ae082ec7d857 100644 --- a/pkgs/development/python-modules/ome-zarr/default.nix +++ b/pkgs/development/python-modules/ome-zarr/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { requests scikit-image toolz - ] ++ fsspec.passthru.optional-dependencies.s3; + ] ++ fsspec.optional-dependencies.s3; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/omniorbpy/default.nix b/pkgs/development/python-modules/omniorbpy/default.nix new file mode 100644 index 000000000000..c541ddd2ba7d --- /dev/null +++ b/pkgs/development/python-modules/omniorbpy/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchurl, + omniorb, + pkg-config, + python, +}: + +buildPythonPackage rec { + pname = "omniorbpy"; + version = "4.3.2"; + pyproject = false; + + src = fetchurl { + url = "http://downloads.sourceforge.net/omniorb/omniORBpy-${version}.tar.bz2"; + hash = "sha256-y1cX1BKhAbr0MPWYysfWkjGITa5DctjirfPd7rxffrs="; + }; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ pkg-config ]; + + propagatedBuildInputs = [ omniorb ]; + + configureFlags = [ + "--with-omniorb=${omniorb}" + "PYTHON_PREFIX=$out" + "PYTHON=${python.interpreter}" + ]; + + # Transform omniidl_be into a PEP420 namespace + postInstall = '' + rm $out/${python.sitePackages}/omniidl_be/__init__.py + rm $out/${python.sitePackages}/omniidl_be/__pycache__/__init__.*.pyc + ''; + + # Ensure both python & cxx backends are available + pythonImportsCheck = [ + "omniidl_be.cxx" + "omniidl_be.python" + "omniORB" + ]; + + meta = with lib; { + description = "Python backend for omniorb"; + homepage = "http://omniorb.sourceforge.net"; + license = with licenses; [ + gpl2Plus + lgpl21Plus + ]; + maintainers = with maintainers; [ nim65s ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/onecache/default.nix b/pkgs/development/python-modules/onecache/default.nix index 03a8520bbfe0..fb1aa5c65484 100644 --- a/pkgs/development/python-modules/onecache/default.nix +++ b/pkgs/development/python-modules/onecache/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pytest-asyncio ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # test fails due to unknown reason on darwin "test_lru_and_ttl_refresh" ]; diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index a0cc441e2e50..0af451607af3 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -1,23 +1,27 @@ { lib, - stdenv, buildPythonPackage, - cmake, fetchFromGitHub, + + # build-system + cmake, + pybind11, + setuptools, + + # buildInputs + abseil-cpp, + protobuf, gtest, - nbval, + + # dependencies numpy, + + google-re2, + nbval, parameterized, - protobuf_21, - pybind11, + pillow, pytestCheckHook, - pythonOlder, tabulate, - typing-extensions, - abseil-cpp, - google-re2, - pillow, - protobuf, }: let @@ -25,64 +29,54 @@ let in buildPythonPackage rec { pname = "onnx"; - version = "1.16.2"; - format = "setuptools"; - - disabled = pythonOlder "3.8"; + version = "1.17.0"; + pyproject = true; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "onnx"; + repo = "onnx"; rev = "refs/tags/v${version}"; - hash = "sha256-JmxnsHRrzj2QzPz3Yndw0MmgZJ8MDYxHjuQ7PQkQsDg="; + hash = "sha256-9oORW0YlQ6SphqfbjcYb0dTlHc+1gzy9quH/Lj6By8Q="; }; build-system = [ cmake - pybind11 + protobuf + setuptools ]; buildInputs = [ abseil-cpp - protobuf - google-re2 gtestStatic - pillow + pybind11 ]; dependencies = [ - protobuf_21 protobuf numpy - typing-extensions ]; nativeCheckInputs = [ + google-re2 nbval parameterized + pillow pytestCheckHook tabulate ]; postPatch = '' + rm -r third_party + chmod +x tools/protoc-gen-mypy.sh.in patchShebangs tools/protoc-gen-mypy.sh.in - - substituteInPlace setup.py \ - --replace 'setup_requires.append("pytest-runner")' "" - - # prevent from fetching & building own gtest - substituteInPlace CMakeLists.txt \ - --replace 'include(googletest)' "" - substituteInPlace cmake/unittest.cmake \ - --replace 'googletest)' ')' ''; preConfigure = '' # Set CMAKE_INSTALL_LIBDIR to lib explicitly, because otherwise it gets set # to lib64 and cmake incorrectly looks for the protobuf library in lib64 export CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib -DONNX_USE_PROTOBUF_SHARED_LIBS=ON" - export CMAKE_ARGS+=" -Dgoogletest_STATIC_LIBRARIES=${gtestStatic}/lib/libgtest.a -Dgoogletest_INCLUDE_DIRS=${lib.getDev gtestStatic}/include" + export CMAKE_ARGS+=" -Dgoogletest_STATIC_LIBRARIES=${gtestStatic}/lib/libgtest.a" export ONNX_BUILD_TESTS=1 ''; @@ -107,37 +101,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "onnx/test" - "onnx/examples" - ]; - - disabledTests = - [ - # attempts to fetch data from web - "test_bvlc_alexnet_cpu" - "test_densenet121_cpu" - "test_inception_v1_cpu" - "test_inception_v2_cpu" - "test_resnet50_cpu" - "test_shufflenet_cpu" - "test_squeezenet_cpu" - "test_vgg19_cpu" - "test_zfnet512_cpu" - ] - ++ lib.optionals stdenv.isAarch64 [ - # AssertionError: Output 0 of test 0 in folder - "test__pytorch_converted_Conv2d_depthwise_padded" - "test__pytorch_converted_Conv2d_dilated" - "test_dft" - "test_dft_axis" - # AssertionError: Mismatch in test 'test_Conv2d_depthwise_padded' - "test_xor_bcast4v4d" - # AssertionError: assert 1 == 0 - "test_ops_tested" - ]; - - disabledTestPaths = [ - # Unexpected output fields from running code: {'stderr'} - "onnx/examples/np_array_tensorproto.ipynb" + "examples" ]; __darwinAllowLocalNetworking = true; @@ -149,10 +113,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "onnx" ]; - meta = with lib; { + meta = { description = "Open Neural Network Exchange"; homepage = "https://onnx.ai"; - license = licenses.asl20; - maintainers = with maintainers; [ acairncross ]; + changelog = "https://github.com/onnx/onnx/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ acairncross ]; }; } diff --git a/pkgs/development/python-modules/onnxconverter-common/default.nix b/pkgs/development/python-modules/onnxconverter-common/default.nix index 94cc0b881351..87d83797fbfd 100644 --- a/pkgs/development/python-modules/onnxconverter-common/default.nix +++ b/pkgs/development/python-modules/onnxconverter-common/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, numpy, packaging, protobuf, @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "onnxconverter-common"; version = "1.14.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "microsoft"; @@ -23,7 +24,13 @@ buildPythonPackage rec { hash = "sha256-NbHyjLcr/Gq1zRiJW3ZBpEVQGVQGhp7SmfVd5hBIi2o="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + pythonRelaxDeps = [ "protobuf" ]; + + dependencies = [ numpy packaging protobuf diff --git a/pkgs/development/python-modules/onnxruntime/default.nix b/pkgs/development/python-modules/onnxruntime/default.nix index c0227ee831f0..48c342c1626f 100644 --- a/pkgs/development/python-modules/onnxruntime/default.nix +++ b/pkgs/development/python-modules/onnxruntime/default.nix @@ -35,7 +35,7 @@ buildPythonPackage { chmod +w dist ''; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; # This project requires fairly large dependencies such as sympy which we really don't always need. pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/open-clip-torch/default.nix b/pkgs/development/python-modules/open-clip-torch/default.nix index dc3bf4d78591..3299a577305c 100644 --- a/pkgs/development/python-modules/open-clip-torch/default.nix +++ b/pkgs/development/python-modules/open-clip-torch/default.nix @@ -11,6 +11,7 @@ huggingface-hub, protobuf, regex, + safetensors, sentencepiece, timm, torch, @@ -28,14 +29,14 @@ }: buildPythonPackage rec { pname = "open-clip-torch"; - version = "2.26.1"; + version = "2.29.0"; pyproject = true; src = fetchFromGitHub { owner = "mlfoundations"; repo = "open_clip"; rev = "refs/tags/v${version}"; - hash = "sha256-XjPOsGet8VNzwEwzz14f1nF3XOgpkb4OERIc6VrDDZ8="; + hash = "sha256-X5nOWdGhIv+HiiauIezIkPh3G1Odtxr0HPygRp/D184="; }; build-system = [ pdm-backend ]; @@ -45,6 +46,7 @@ buildPythonPackage rec { huggingface-hub protobuf regex + safetensors sentencepiece timm torch @@ -79,7 +81,7 @@ buildPythonPackage rec { # fails due to type errors "test_num_shards" ] - ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ "test_training" "test_training_coca" "test_training_unfreezing_vit" diff --git a/pkgs/development/python-modules/open-interpreter/default.nix b/pkgs/development/python-modules/open-interpreter/default.nix index 12e4cabb0768..d771128a7903 100644 --- a/pkgs/development/python-modules/open-interpreter/default.nix +++ b/pkgs/development/python-modules/open-interpreter/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { pythonRemoveDeps = [ "git-python" ]; pythonRelaxDeps = [ + "google-generativeai" "psutil" "pynput" "yaspin" diff --git a/pkgs/development/python-modules/open-meteo/default.nix b/pkgs/development/python-modules/open-meteo/default.nix index 88d54404cf1f..1e62aef80a26 100644 --- a/pkgs/development/python-modules/open-meteo/default.nix +++ b/pkgs/development/python-modules/open-meteo/default.nix @@ -8,6 +8,7 @@ orjson, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -29,8 +30,7 @@ buildPythonPackage rec { postPatch = '' # Upstream doesn't set a version for the pyproject.toml substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" + --replace-fail "0.0.0" "${version}" \ ''; nativeBuildInputs = [ poetry-core ]; @@ -44,9 +44,15 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook ]; + disabledTests = [ + # aiohttp api breakage + "test_timeout" + ]; + pythonImportsCheck = [ "open_meteo" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix index 06d4a1f55d9a..871182550d2a 100644 --- a/pkgs/development/python-modules/openai-whisper/default.nix +++ b/pkgs/development/python-modules/openai-whisper/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "whisper"; - version = "20231117"; + version = "20240930"; pyproject = true; src = fetchFromGitHub { owner = "openai"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MJ1XjB/GuYUiECCuuHS0NWHvvs+ko0oTvLuDI7zLNiY="; + hash = "sha256-6wfHJM2pg+y1qUfVF1VRG86G3CtQ+UNIwMXR8pPi2k4="; }; patches = [ diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 5583f0a42614..3777a84bdb7f 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.46.0"; + version = "1.52.1"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-f8t/6T7IwWgt3WjMMdx04dunR7i4j6FBDN/abuGlEU0="; + hash = "sha256-TTbwhs7rXWIJWOU5bC0wGjXZkBpfBAXb4ycOR9xjTpw="; }; build-system = [ @@ -63,7 +63,7 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals (pythonOlder "3.8") [ cached-property ]; - passthru.optional-dependencies = { + optional-dependencies = { datalib = [ numpy pandas diff --git a/pkgs/development/python-modules/openant/default.nix b/pkgs/development/python-modules/openant/default.nix index a4a54e9a879d..34ccb51cd7d0 100644 --- a/pkgs/development/python-modules/openant/default.nix +++ b/pkgs/development/python-modules/openant/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyusb ]; - passthru.optional-dependencies = { + optional-dependencies = { serial = [ pyserial ]; influx = [ influxdb-client ]; }; diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index d7effd7ab68e..bb9f310497c3 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "openapi-core"; - version = "0.19.3"; + version = "0.19.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = "openapi-core"; rev = "refs/tags/${version}"; - hash = "sha256-UJkfAVorALGRqeoGr4136n98iTyPt9qzQxwnhkKgRNM="; + hash = "sha256-JvWusDokov8G0UO9oOkGicAI7wYZTnNywbvKMZKQWiQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/openapi3/default.nix b/pkgs/development/python-modules/openapi3/default.nix index ed2b1d5904aa..1ddd3a9bbfb6 100644 --- a/pkgs/development/python-modules/openapi3/default.nix +++ b/pkgs/development/python-modules/openapi3/default.nix @@ -2,11 +2,16 @@ lib, buildPythonPackage, pythonOlder, - fetchPypi, + fetchFromGitHub, requests, pyyaml, setuptools, pytestCheckHook, + pytest-asyncio, + uvloop, + hypercorn, + starlette, + pydantic_1, }: buildPythonPackage rec { @@ -15,9 +20,11 @@ buildPythonPackage rec { pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ohpJBXPYnKaa2ny+WFrbL8pJZCV/bzod9THxKBVFXSw="; + src = fetchFromGitHub { + owner = "Dorthu"; + repo = "openapi3"; + rev = version; + hash = "sha256-Crn+nRbptRycnWJzH8Tm/BBLcBSRCcNtLX8NoKnSDdA="; }; nativeBuildInputs = [ setuptools ]; @@ -27,7 +34,19 @@ buildPythonPackage rec { pyyaml ]; - nativeCheckinputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + pydantic_1 + uvloop + hypercorn + starlette + ]; + + disabledTestPaths = [ + # tests old fastapi behaviour + "tests/fastapi_test.py" + ]; pythonImportsCheck = [ "openapi3" ]; diff --git a/pkgs/development/python-modules/opencontainers/default.nix b/pkgs/development/python-modules/opencontainers/default.nix index b5672a5590f2..c3dbd0e1bfde 100644 --- a/pkgs/development/python-modules/opencontainers/default.nix +++ b/pkgs/development/python-modules/opencontainers/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { sed -i "/pytest-runner/d" setup.py ''; - passthru.optional-dependencies.reggie = [ requests ]; + optional-dependencies.reggie = [ requests ]; pythonImportsCheck = [ "opencontainers" ]; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.reggie; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.reggie; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/opencv-python-headless/default.nix b/pkgs/development/python-modules/opencv-python-headless/default.nix new file mode 100644 index 000000000000..7a379d39b879 --- /dev/null +++ b/pkgs/development/python-modules/opencv-python-headless/default.nix @@ -0,0 +1,14 @@ +{ + mkPythonMetaPackage, + opencv4, +}: + +mkPythonMetaPackage { + pname = "opencv-python-headless"; + inherit (opencv4) version; + dependencies = [ opencv4 ]; + optional-dependencies = opencv4.optional-dependencies or { }; + meta = { + inherit (opencv4.meta) description homepage; + }; +} diff --git a/pkgs/development/python-modules/opencv-python/default.nix b/pkgs/development/python-modules/opencv-python/default.nix new file mode 100644 index 000000000000..ee875421a96c --- /dev/null +++ b/pkgs/development/python-modules/opencv-python/default.nix @@ -0,0 +1,14 @@ +{ + mkPythonMetaPackage, + opencv4, +}: + +mkPythonMetaPackage { + pname = "opencv-python"; + inherit (opencv4) version; + dependencies = [ opencv4 ]; + optional-dependencies = opencv4.optional-dependencies or { }; + meta = { + inherit (opencv4.meta) description homepage; + }; +} diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index 7fdf319f9e61..602cdd29e825 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "3.1.2"; + version = "3.1.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,12 +24,12 @@ buildPythonPackage rec { owner = "openpyxl"; repo = "openpyxl"; rev = "refs/tags/${version}"; - hash = "sha256-SWRbjA83AOLrfe6on2CSb64pH5EWXkfyYcTqWJNBEP0="; + hash = "sha256-vp+TIWcHCAWlDaBcmC7w/kV7DZTZpa6463NusaJmqKo="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ et-xmlfile ]; + dependencies = [ et-xmlfile ]; nativeCheckInputs = [ lxml @@ -42,6 +42,7 @@ buildPythonPackage rec { "-W" "ignore::DeprecationWarning" ]; + disabledTests = [ # Tests broken since lxml 2.12; https://foss.heptapod.net/openpyxl/openpyxl/-/issues/2116 diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index 2d5db38d963a..a54f14c99602 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub }: rec { - version = "3.8.0"; + version = "3.9.0"; pyproject = true; src = fetchFromGitHub { owner = "openrazer"; repo = "openrazer"; rev = "v${version}"; - hash = "sha256-eV5xDFRQi0m95pL6e2phvblUbh5GEJ1ru1a62TnbGNk="; + hash = "sha256-MLwhqLPWdjg1ZUZP5Sig37RgZEeHlU+DyELpyMif6iY="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/openrgb-python/default.nix b/pkgs/development/python-modules/openrgb-python/default.nix index 90b710c6e035..48ac9a55aedc 100644 --- a/pkgs/development/python-modules/openrgb-python/default.nix +++ b/pkgs/development/python-modules/openrgb-python/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "openrgb-python"; - version = "0.3.0"; + version = "0.3.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2eeb2XHYvBaHkHHs9KxZKDGXtcLaT28c/aLC9pxrRmM="; + hash = "sha256-euWcot6OfGOSzueA3B4L3h+G2Gv97ZZUiSTABQh8kSc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/opensearch-py/default.nix b/pkgs/development/python-modules/opensearch-py/default.nix index c20daff074c8..0914a8ca6701 100644 --- a/pkgs/development/python-modules/opensearch-py/default.nix +++ b/pkgs/development/python-modules/opensearch-py/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { events ]; - passthru.optional-dependencies.async = [ aiohttp ]; + optional-dependencies.async = [ aiohttp ]; nativeCheckInputs = [ botocore @@ -60,7 +60,7 @@ buildPythonPackage rec { pytestCheckHook pyyaml pytz - ] ++ passthru.optional-dependencies.async; + ] ++ optional-dependencies.async; disabledTestPaths = [ # require network diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix index bd5b97ab2852..bfaa8b8f1b73 100644 --- a/pkgs/development/python-modules/opensfm/default.nix +++ b/pkgs/development/python-modules/opensfm/default.nix @@ -113,7 +113,7 @@ buildPythonPackage rec { [ "test_run_all" # Matplotlib issues. Broken integration is less useless than a broken build ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_reconstruction_incremental" "test_reconstruction_triangulation" ]; @@ -121,7 +121,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "opensfm" ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = [ lib.maintainers.SomeoneSerge ]; license = lib.licenses.bsd2; changelog = "https://github.com/mapillary/OpenSfM/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/development/python-modules/openslide/default.nix b/pkgs/development/python-modules/openslide/default.nix new file mode 100644 index 000000000000..9878366a7250 --- /dev/null +++ b/pkgs/development/python-modules/openslide/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + openslide, + pillow, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "openslide"; + version = "1.3.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "openslide"; + repo = "openslide-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-GokWpRuon8lnxNzxsYGYrQBQDhGPxl8HDaO7fR+2Ldo="; + }; + + postPatch = '' + substituteInPlace openslide/lowlevel.py \ + --replace-fail "return cdll.LoadLibrary(name)" "return cdll.LoadLibrary(f'${lib.getLib openslide}/lib/{name}')" + ''; + + build-system = [ setuptools ]; + + dependencies = [ pillow ]; + + pythonImportsCheck = [ "openslide" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + preCheck = ''rm -rf openslide/''; + + meta = { + description = "Python bindings to the OpenSlide library for reading whole-slide microscopy images"; + homepage = "https://github.com/openslide/openslide-python"; + changelog = "https://github.com/openslide/openslide-python/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix index b316a7aaeee2..7391fb37ba7a 100644 --- a/pkgs/development/python-modules/openstackdocstheme/default.nix +++ b/pkgs/development/python-modules/openstackdocstheme/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "openstackdocstheme"; - version = "3.3.0"; + version = "3.4.0"; pyproject = true; # breaks on import due to distutils import through pbr.packaging @@ -19,13 +19,11 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-wmZJmX5bQKM1uwqWxynkY5jPJaBn+Y2eqSRkE2Ub0qM="; + hash = "sha256-YA3nY7Q6UM9sviGRUh08EwwLEjneO2KAh4Hsr/hn25U="; }; postPatch = '' - # only a small portion of the listed packages are actually needed for running the tests - # so instead of removing them one by one remove everything - rm test-requirements.txt + patchShebangs bin/ ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/openstacksdk/tests.nix b/pkgs/development/python-modules/openstacksdk/tests.nix index be333be87665..c5bbc68e3d6c 100644 --- a/pkgs/development/python-modules/openstacksdk/tests.nix +++ b/pkgs/development/python-modules/openstacksdk/tests.nix @@ -39,7 +39,7 @@ buildPythonPackage { '' stestr run -e <(echo " '' - + lib.optionalString stdenv.isAarch64 '' + + lib.optionalString stdenv.hostPlatform.isAarch64 '' openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_node_set_provision_state_with_retries openstack.tests.unit.cloud.test_role_assignment.TestRoleAssignment.test_grant_role_user_domain_exists openstack.tests.unit.cloud.test_volume_backups.TestVolumeBackups.test_delete_volume_backup_force diff --git a/pkgs/development/python-modules/openstep-plist/default.nix b/pkgs/development/python-modules/openstep-plist/default.nix index 28680e26b091..775467ef30a6 100644 --- a/pkgs/development/python-modules/openstep-plist/default.nix +++ b/pkgs/development/python-modules/openstep-plist/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "openstep-plist"; - version = "0.3.1"; + version = "0.4.0"; pyproject = true; src = fetchPypi { pname = "openstep_plist"; inherit version; - hash = "sha256-Au6taO+57Ost4slTlwc86A/ImFXZerZRab2S/ENo5PI="; + hash = "sha256-RTpWzfU0xvQtJJNNLtf5W8d8PRqKy8GIGkqgYafWAaI="; }; build-system = [ diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index fdaa41d289ef..08d5458968c8 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -14,7 +14,7 @@ let self = buildPythonPackage rec { pname = "opentelemetry-api"; - version = "1.26.0"; + version = "1.27.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ let owner = "open-telemetry"; repo = "opentelemetry-python"; rev = "refs/tags/v${version}"; - hash = "sha256-slb1ZKGnfJRZiBh++S20en7U6RckspHHuMohHOz2Hts="; + hash = "sha256-5m6VGdt90Aw6ODUWG7A7b0kV8FsDtg+oPkNUKRbzDX4="; }; sourceRoot = "${src.name}/opentelemetry-api"; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-botocore/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-botocore/default.nix new file mode 100644 index 000000000000..caa6d327dfeb --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-botocore/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + hatchling, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-semantic-conventions, + botocore, + moto, + opentelemetry-test-utils, + opentelemetry-propagator-aws-xray, + pytestCheckHook, + aws-xray-sdk, +}: + +buildPythonPackage rec { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-botocore"; + pyproject = true; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-botocore"; + + build-system = [ hatchling ]; + + dependencies = [ + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-propagator-aws-xray + opentelemetry-semantic-conventions + ]; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + checkInputs = [ + aws-xray-sdk + moto + ]; + + optional-dependencies = { + instruments = [ botocore ]; + }; + + pythonImportsCheck = [ "opentelemetry.instrumentation.botocore" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-botocore"; + description = "Botocore instrumentation for OpenTelemetry"; + }; +} diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-celery/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-celery/default.nix new file mode 100644 index 000000000000..bb6c9e5716ef --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-celery/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + hatchling, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-semantic-conventions, + opentelemetry-test-utils, + billiard, + celery, + pytestCheckHook, +}: + +buildPythonPackage rec { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-celery"; + pyproject = true; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-celery"; + + build-system = [ hatchling ]; + + dependencies = [ + billiard + celery + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-semantic-conventions + ]; + + optional-dependencies = { + instruments = [ celery ]; + }; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.celery" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-celery"; + description = "Celery instrumentation for OpenTelemetry"; + }; +} diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix index 5a85e42a04d3..a8b14f1cfd2c 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { opentelemetry-util-http ]; - passthru.optional-dependencies = { + optional-dependencies = { asgi = [ opentelemetry-instrumentation-asgi ]; }; nativeCheckInputs = [ opentelemetry-test-utils pytestCheckHook - ] ++ passthru.optional-dependencies.asgi; + ] ++ optional-dependencies.asgi; pythonImportsCheck = [ "opentelemetry.instrumentation.django" ]; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix index 9cf347c046ac..9716dbc767c2 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix @@ -42,7 +42,7 @@ buildPythonPackage { wrapt ]; - passthru.optional-dependencies = { + optional-dependencies = { instruments = [ grpcio ]; }; @@ -52,7 +52,7 @@ buildPythonPackage { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # RuntimeError: Failed to bind to address "TestOpenTelemetryServerInterceptorUnix" ]; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix new file mode 100644 index 000000000000..5d0e946bd1b5 --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + hatchling, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-test-utils, + pytestCheckHook, +}: + +buildPythonPackage rec { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-logging"; + pyproject = true; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-logging"; + + build-system = [ hatchling ]; + + dependencies = [ + opentelemetry-api + opentelemetry-instrumentation + ]; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.logging" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-logging"; + description = "Logging instrumentation for OpenTelemetry"; + }; +} diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-redis/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-redis/default.nix new file mode 100644 index 000000000000..7c86cb48876f --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-redis/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-semantic-conventions, + wrapt, + redis, + opentelemetry-test-utils, + pythonOlder, + pytestCheckHook, + fakeredis, +}: + +buildPythonPackage rec { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-redis"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-redis"; + + build-system = [ hatchling ]; + + dependencies = [ + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-semantic-conventions + wrapt + ]; + + nativeCheckInputs = [ + fakeredis + opentelemetry-test-utils + pytestCheckHook + ]; + + optional-dependencies = { + instruments = [ redis ]; + }; + + pythonImportsCheck = [ "opentelemetry.instrumentation.redis" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-redis"; + description = "Redis instrumentation for OpenTelemetry"; + }; +} diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-requests/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-requests/default.nix new file mode 100644 index 000000000000..fb01247ccfe0 --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-requests/default.nix @@ -0,0 +1,46 @@ +{ + buildPythonPackage, + requests, + hatchling, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-semantic-conventions, + opentelemetry-util-http, + httpretty, + opentelemetry-test-utils, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-requests"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-requests"; + + build-system = [ hatchling ]; + + dependencies = [ + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-semantic-conventions + opentelemetry-util-http + requests + ]; + + nativeCheckInputs = [ + httpretty + opentelemetry-test-utils + pytestCheckHook + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.requests" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-requests"; + description = "Requests instrumentation for OpenTelemetry"; + }; +} diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 8c8ae9534ae6..73845247a0c2 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "opentelemetry-instrumentation"; - version = "0.47b0"; + version = "0.48b0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; rev = "refs/tags/v${version}"; - hash = "sha256-XtJ4u891vI7wDtReoucm+qk3BkKJ+aZrYy7zfxmqfgk="; + hash = "sha256-RsOOCDbxT0e0WGfI8Ibv6E51ei+sTg07F8d+30+JrVU="; }; sourceRoot = "${src.name}/opentelemetry-instrumentation"; diff --git a/pkgs/development/python-modules/opentelemetry-propagator-aws-xray/default.nix b/pkgs/development/python-modules/opentelemetry-propagator-aws-xray/default.nix new file mode 100644 index 000000000000..47d67c2b100a --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-propagator-aws-xray/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + hatchling, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-semantic-conventions, + opentelemetry-instrumentation-botocore, + opentelemetry-test-utils, + pytestCheckHook, + requests, + pytest-benchmark, +}: + +buildPythonPackage rec { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-propagator-aws-xray"; + pyproject = true; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/propagator/opentelemetry-propagator-aws-xray"; + + build-system = [ hatchling ]; + + dependencies = [ opentelemetry-api ]; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + checkInputs = [ + pytest-benchmark + requests + ]; + + pythonImportsCheck = [ "opentelemetry.propagators.aws" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/propagator/opentelemetry-propagator-aws-xray"; + description = "AWS X-Ray Propagator for OpenTelemetry"; + }; +} diff --git a/pkgs/development/python-modules/opentelemetry-proto/default.nix b/pkgs/development/python-modules/opentelemetry-proto/default.nix index 8fcaf2a3b516..ee972ff524d9 100644 --- a/pkgs/development/python-modules/opentelemetry-proto/default.nix +++ b/pkgs/development/python-modules/opentelemetry-proto/default.nix @@ -16,6 +16,8 @@ buildPythonPackage { sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-proto"; + pythonRelaxDeps = [ "protobuf" ]; + build-system = [ hatchling ]; dependencies = [ protobuf ]; diff --git a/pkgs/development/python-modules/opentypespec/default.nix b/pkgs/development/python-modules/opentypespec/default.nix index ea4f2ca3530d..81fc60e5dc55 100644 --- a/pkgs/development/python-modules/opentypespec/default.nix +++ b/pkgs/development/python-modules/opentypespec/default.nix @@ -15,7 +15,6 @@ buildPythonPackage rec { hash = "sha256-fOEHmtlCkFhn1jyIA+CsHIfud7x3PPb7UWQsnrVyDqY="; }; - doCheck = true; nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index f281bc352d1b..f44a712aaf80 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -51,26 +51,27 @@ in buildPythonPackage rec { pname = "openusd"; - version = "24.05"; + version = "24.08"; + pyproject = false; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenUSD"; rev = "refs/tags/v${version}"; - hash = "sha256-akwLIB5YUbnDiaQXX/K5YLXzWlTYWZG51dtxbSFxPt0="; + hash = "sha256-slBJleeDi0mCVThty4NUX4M9vaCLV+E8rnp1Ab77TmE="; }; - stdenv = if python.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; + stdenv = + if python.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; outputs = [ "out" ] ++ lib.optional withDocs "doc"; - format = "other"; - patches = [ (fetchpatch { name = "port-to-embree-4.patch"; - url = "https://github.com/PixarAnimationStudios/OpenUSD/pull/2266/commits/4b6c23d459c602fdac5e0ebc9b7722cbd5475e86.patch"; - hash = "sha256-yjqdGAVqfEsOX1W/tG6c+GgQLYya5U9xgUe/sNIuDbw="; + # https://github.com/PixarAnimationStudios/OpenUSD/pull/2266 + url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/c8fec1342e05dca98a1afd4ea93c7a5f0b41e25b.patch?full_index=1"; + hash = "sha256-pK1TUwmVv9zsZkOypq25pl+FJDxJJvozUtVP9ystGtI="; }) ]; @@ -92,7 +93,7 @@ buildPythonPackage rec { (lib.cmakeBool "PXR_BUILD_USDVIEW" withUsdView) (lib.cmakeBool "PXR_BUILD_USD_TOOLS" withTools) (lib.cmakeBool "PXR_ENABLE_MATERIALX_SUPPORT" true) - (lib.cmakeBool "PXR_ENABLE_OSL_SUPPORT" (!stdenv.isDarwin && withOsl)) + (lib.cmakeBool "PXR_ENABLE_OSL_SUPPORT" (!stdenv.hostPlatform.isDarwin && withOsl)) ]; nativeBuildInputs = @@ -124,15 +125,15 @@ buildPythonPackage rec { ptex tbb ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libGL libX11 libXt ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa ]) + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa ]) ++ lib.optionals withOsl [ osl ] ++ lib.optionals withUsdView [ qt6.qtbase ] - ++ lib.optionals (withUsdView && stdenv.isLinux) [ + ++ lib.optionals (withUsdView && stdenv.hostPlatform.isLinux) [ qt6.qtbase qt6.qtwayland ]; @@ -174,7 +175,10 @@ buildPythonPackage rec { for interchange between graphics applications. ''; homepage = "https://openusd.org/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ shaddydc ]; + license = lib.licenses.tost; + maintainers = with lib.maintainers; [ + shaddydc + gador + ]; }; } diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index cdebc992b2fb..7c3d47dffe03 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.8.0"; + version = "0.8.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-gDd2Ht8SgUkqD1t5AY/zg/J/YG5Gyje8gbPp+5rP+M0="; + hash = "sha256-3GzShdYNfaBxu1azPW8eUR5rDn8rrGiE/MhTmwzLOg8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/opt-einsum/default.nix b/pkgs/development/python-modules/opt-einsum/default.nix index 801c1b49841a..131d11d310c4 100644 --- a/pkgs/development/python-modules/opt-einsum/default.nix +++ b/pkgs/development/python-modules/opt-einsum/default.nix @@ -1,39 +1,35 @@ { lib, buildPythonPackage, - fetchpatch, fetchPypi, - setuptools, + hatch-fancy-pypi-readme, + hatch-vcs, + hatchling, numpy, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { - version = "3.3.0"; + version = "3.4.0"; pname = "opt-einsum"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "opt_einsum"; inherit version; - hash = "sha256-WfZHX3e7w33PfNdIUZwOxgci6R5jyhFOaIIcDFSkZUk="; + hash = "sha256-lspy8biG0UgkE0h4NJgZTFd/owqPqsEIWGsU8bpEc6w="; }; - patches = [ - # https://github.com/dgasmith/opt_einsum/pull/208 - (fetchpatch { - name = "python312-compatibility.patch"; - url = "https://github.com/dgasmith/opt_einsum/commit/0beacf96923bbb2dd1939a9c59398a38ce7a11b1.patch"; - hash = "sha256-dmmEzhy17huclo1wOubpBUDc2L7vqEU5b/6a5loM47A="; - }) + build-system = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/optimistix/default.nix b/pkgs/development/python-modules/optimistix/default.nix new file mode 100644 index 000000000000..5e2809133764 --- /dev/null +++ b/pkgs/development/python-modules/optimistix/default.nix @@ -0,0 +1,63 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies + equinox, + jax, + jaxtyping, + lineax, + typing-extensions, + + # checks + beartype, + jaxlib, + optax, + pytestCheckHook, + pytest-xdist, +}: + +buildPythonPackage rec { + pname = "optimistix"; + version = "0.0.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "patrick-kidger"; + repo = "optimistix"; + rev = "refs/tags/v${version}"; + hash = "sha256-s8MRPyPObTpgLRm4bxU8F4Su7FKH+MHqtQsxIHb/DN4="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + equinox + jax + jaxtyping + lineax + typing-extensions + ]; + + pythonImportsCheck = [ "optimistix" ]; + + nativeCheckInputs = [ + beartype + jaxlib + optax + pytestCheckHook + pytest-xdist + ]; + + meta = { + description = "Nonlinear optimisation (root-finding, least squares, ...) in JAX+Equinox"; + homepage = "https://github.com/patrick-kidger/optimistix"; + changelog = "https://github.com/patrick-kidger/optimistix/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index d23fe4ab529b..02485462a8b1 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.22.0"; + version = "1.23.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-fVpSoa6s7puYO8BiA6aSAhSOTfiZJgaX5iwYkd9VdVo="; + hash = "sha256-1A430tvuUsMiVmDbISdj2g5l05D6FswGKsjdUBpZrP0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/optree/default.nix b/pkgs/development/python-modules/optree/default.nix index c1f9085e5bea..a9eb9d9a3626 100644 --- a/pkgs/development/python-modules/optree/default.nix +++ b/pkgs/development/python-modules/optree/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "optree"; - version = "0.12.1"; + version = "0.13.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "metaopt"; repo = "optree"; rev = "refs/tags/v${version}"; - hash = "sha256-4GvB9Z7qnEjsUSl+x5wd8czV80F50MwJdlNdylUU0zY="; + hash = "sha256-HuzfQ1arAF/DbJd9MF0jAxfzWvOHtAfkEMUF+aPfaII="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index dfdca6fe6d94..37675f4b5807 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -27,7 +27,6 @@ pyyaml, redis, scikit-learn, - scikit-optimize, scipy, setuptools, shap, @@ -71,7 +70,7 @@ buildPythonPackage rec { pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { integration = [ botorch catboost @@ -83,7 +82,6 @@ buildPythonPackage rec { # pytorch-ignite pytorch-lightning scikit-learn - scikit-optimize shap tensorflow torch @@ -115,7 +113,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook scipy - ] ++ fakeredis.optional-dependencies.lua ++ passthru.optional-dependencies.optional; + ] ++ fakeredis.optional-dependencies.lua ++ optional-dependencies.optional; pytestFlagsArray = [ "-m 'not integration'" ]; diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix index cac6da956644..65006e4753fe 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.3.0"; + version = "2.4.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ubDE7CgLEAY+Z4m+0j3cJDWumFaevmTguaJweAuRA9U="; + hash = "sha256-vVl2vvDkZuD50bn2Ux+1uBcdyFNHF8ywSybmgLbHVx0="; }; build-system = [ diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix index 523e4f857af2..3db1f35784bd 100644 --- a/pkgs/development/python-modules/orange-canvas-core/default.nix +++ b/pkgs/development/python-modules/orange-canvas-core/default.nix @@ -94,6 +94,6 @@ buildPythonPackage rec { license = [ lib.licenses.gpl3 ]; maintainers = [ lib.maintainers.lucasew ]; # Segmentation fault during tests - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/orange-widget-base/default.nix b/pkgs/development/python-modules/orange-widget-base/default.nix index 50a1e956919a..28c97fdb4238 100644 --- a/pkgs/development/python-modules/orange-widget-base/default.nix +++ b/pkgs/development/python-modules/orange-widget-base/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pyqtgraph pyqtwebengine typing-extensions - ] ++ lib.optionals stdenv.isDarwin [ appnope ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ appnope ]; pythonImportsCheck = [ "orangewidget" ]; diff --git a/pkgs/development/python-modules/oras/default.nix b/pkgs/development/python-modules/oras/default.nix index 987b41dfaa2d..62343729fed9 100644 --- a/pkgs/development/python-modules/oras/default.nix +++ b/pkgs/development/python-modules/oras/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "oras"; - version = "0.1.30"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "oras-project"; repo = "oras-py"; rev = "refs/tags/${version}"; - hash = "sha256-qdWGqa5W+WI+lQ2TDZUuJF7PSmkc1Kv7UbWL6+Rfyio="; + hash = "sha256-fylc6uKQs+jbssY8PRo/o4EnBxDcvupjEWmr5ypZbrY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index ccf370682b5b..511542d0a490 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { "orbax.checkpoint" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Probably failing because of a filesystem impurity # self.assertFalse(os.path.exists(dst_dir)) # AssertionError: True is not false diff --git a/pkgs/development/python-modules/orderly-set/default.nix b/pkgs/development/python-modules/orderly-set/default.nix new file mode 100644 index 000000000000..93f164a5b603 --- /dev/null +++ b/pkgs/development/python-modules/orderly-set/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + + # build-system + setuptools, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "orderly-set"; + version = "5.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "seperman"; + repo = "orderly-set"; + rev = "refs/tags/${version}"; + hash = "sha256-ZDo5fSHD0lCn9CRQtWK10QeZoOhuXG3LR3KA/to9gpE="; + }; + patches = [ + # https://github.com/seperman/orderly-set/pull/5 + (fetchpatch { + name = "do-not-import-mypy.patch"; + url = "https://github.com/seperman/orderly-set/commit/34362084868a081b8ebaaf1f13c93a7a798ef557.patch"; + hash = "sha256-eKbnA31ykm5fH0om6cfOaMpy+ZNNWRDkHieaUIHF8OM="; + }) + ]; + + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ + "orderly_set" + ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + disabledTests = [ + # Statically analyzes types, can be disabled so that mypy won't be needed. + "test_typing_mypy" + ]; + + meta = { + description = "Orderly Set previously known as Ordered Set"; + homepage = "https://github.com/seperman/orderly-set"; + changelog = "https://github.com/seperman/orderly-set/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 650d8a634d51..98ce76ed1480 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.6"; + version = "3.10.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,13 +40,13 @@ buildPythonPackage rec { owner = "ijl"; repo = "orjson"; rev = "refs/tags/${version}"; - hash = "sha256-K3wCzwaGOsaiCm2LW4Oc4XOnp6agrdTxCxqEIMq0fuU="; + hash = "sha256-+ofDblSbaG8CjRXFfF0QFpq2yGmLF/2yILqk2m8PSl8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-SNdwqb47dJ084TMNsm2Btks1UCDerjSmSrQQUiGbx50="; + hash = "sha256-MACmdptHmnifBTfB5s+CY6npAOFIrh0zvrIImYghGsw="; }; maturinBuildFlags = [ "--interpreter ${python.executable}" ]; @@ -58,7 +58,7 @@ buildPythonPackage rec { maturinBuildHook ]); - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeCheckInputs = [ numpy diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index a2ef75c52bb1..6c2634bb56c1 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { postgresql = [ asyncpg ]; postgres = [ asyncpg ]; aiopg = [ aiopg ]; @@ -89,7 +89,7 @@ buildPythonPackage rec { httpx nest-asyncio pytest-asyncio - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; disabledTestPaths = [ "benchmarks/test_benchmark_*.py" ]; @@ -145,5 +145,6 @@ buildPythonPackage rec { changelog = "https://github.com/collerek/ormar/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ andreasfelix ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/oryx/default.nix b/pkgs/development/python-modules/oryx/default.nix new file mode 100644 index 000000000000..fdf4780a801d --- /dev/null +++ b/pkgs/development/python-modules/oryx/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + jax, + jaxlib, + tensorflow-probability, + + # tests + inference-gym, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "oryx"; + version = "0.2.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jax-ml"; + repo = "oryx"; + rev = "refs/tags/v${version}"; + hash = "sha256-1n7ogGuFNAeOyXWe0/pAouhg2+aA3MXxlCcsrfqRTdU="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + jax + jaxlib + tensorflow-probability + ]; + + pythonImportsCheck = [ "oryx" ]; + + nativeCheckInputs = [ + inference-gym + pytestCheckHook + ]; + + meta = { + description = "Library for probabilistic programming and deep learning built on top of Jax"; + homepage = "https://github.com/jax-ml/oryx"; + changelog = "https://github.com/jax-ml/oryx/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/osc-placement/default.nix b/pkgs/development/python-modules/osc-placement/default.nix new file mode 100644 index 000000000000..8165e098ddd3 --- /dev/null +++ b/pkgs/development/python-modules/osc-placement/default.nix @@ -0,0 +1,73 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + keystoneauth1, + openstackdocstheme, + osc-lib, + oslo-serialization, + oslo-utils, + oslotest, + pbr, + pythonOlder, + setuptools, + sphinxHook, + stestr, +}: + +buildPythonPackage rec { + pname = "osc-placement"; + version = "4.5.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "openstack"; + repo = "osc-placement"; + rev = "refs/tags/${version}"; + hash = "sha256-PUwyYOg1dymlnnTr6TnxS42ISmbS00YfOdkL+5MbYFI="; + }; + + env.PBR_VERSION = version; + + build-system = [ + pbr + setuptools + ]; + + nativeBuildInputs = [ + openstackdocstheme + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + dependencies = [ + keystoneauth1 + osc-lib + oslo-utils + pbr + ]; + + nativeCheckInputs = [ + oslo-serialization + oslotest + stestr + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "osc_placement" ]; + + meta = { + homepage = "https://opendev.org/openstack/osc-placement"; + description = "OpenStackClient plugin for the Placement service"; + license = lib.licenses.asl20; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/osc-sdk-python/default.nix b/pkgs/development/python-modules/osc-sdk-python/default.nix index 0bbfc103b041..f296d8307106 100644 --- a/pkgs/development/python-modules/osc-sdk-python/default.nix +++ b/pkgs/development/python-modules/osc-sdk-python/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "osc-sdk-python"; - version = "0.29.0"; + version = "0.30.1"; pyproject = true; src = fetchFromGitHub { owner = "outscale"; repo = "osc-sdk-python"; - rev = "v${version}"; - hash = "sha256-WtKG2ujEGUW0nhYWxfYDkxicN/uEqBxKCh9FcCfjmHM="; + rev = "refs/tags/v${version}"; + hash = "sha256-HOYIt4kLKAR8zYmIhjLQoibL3qp9uruFKgkgfnmZOfc="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index f794b91fb0cb..bb16aa7d40e0 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { preCheck = "HOME=$TOP/tmp"; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/openSUSE/osc"; description = "opensuse-commander with svn like handling"; mainProgram = "osc"; diff --git a/pkgs/development/python-modules/oscrypto/default.nix b/pkgs/development/python-modules/oscrypto/default.nix index fe80b0ac42d4..ef90df289af6 100644 --- a/pkgs/development/python-modules/oscrypto/default.nix +++ b/pkgs/development/python-modules/oscrypto/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "oscrypto" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTests = [ # Tests require network access diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index b6cdf9661953..81a9bd5b8e4b 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { oslo-utils pbr python-dateutil - ] ++ lib.optionals stdenv.isLinux [ pyinotify ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pyinotify ]; nativeCheckInputs = [ eventlet diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index dab2af567be3..578e2dfdbf9a 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -15,7 +15,7 @@ pbr, pyparsing, pytz, - qemu, + qemu-utils, setuptools, stestr, testscenarios, @@ -64,7 +64,7 @@ buildPythonPackage rec { eventlet fixtures oslotest - qemu + qemu-utils stestr testscenarios pyyaml diff --git a/pkgs/development/python-modules/ospd/default.nix b/pkgs/development/python-modules/ospd/default.nix index e18bc804cfda..ad9bb84c747e 100644 --- a/pkgs/development/python-modules/ospd/default.nix +++ b/pkgs/development/python-modules/ospd/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { version = "21.4.4"; format = "setuptools"; - disabled = pythonOlder "3.7" || stdenv.isDarwin; + disabled = pythonOlder "3.7" || stdenv.hostPlatform.isDarwin; src = fetchFromGitHub { owner = "greenbone"; diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index d3dbb48df72f..ef8db9f8b297 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -16,28 +16,35 @@ buildPythonPackage rec { pname = "osqp"; - version = "0.6.7"; + version = "0.6.7.post1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-O3ARmFV6SZxg67U9fyUBkGSFXHMvTz+84gVdeJ5Tph0="; + hash = "sha256-VUqhDcqEgZeLTTNOKCAfJO0Y8pTFqENQziAiqLePTXI="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "numpy >= 2.0.0" numpy + ''; + dontUseCmakeConfigure = true; nativeBuildInputs = [ cmake + numpy oldest-supported-numpy setuptools-scm ]; - pythonRelaxDeps = [ "scipy" ]; + pythonRelaxDeps = [ + "scipy" + ]; propagatedBuildInputs = [ - future numpy qdldl scipy diff --git a/pkgs/development/python-modules/osxphotos/default.nix b/pkgs/development/python-modules/osxphotos/default.nix index ab4f7e0c0520..f22e7e34d9aa 100644 --- a/pkgs/development/python-modules/osxphotos/default.nix +++ b/pkgs/development/python-modules/osxphotos/default.nix @@ -77,6 +77,7 @@ buildPythonPackage rec { "more-itertools" "objexplore" "textx" + "tenacity" ]; pythonImportsCheck = [ "osxphotos" ]; @@ -107,6 +108,6 @@ buildPythonPackage rec { changelog = "https://github.com/RhetTbull/osxphotos/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/ots-python/default.nix b/pkgs/development/python-modules/ots-python/default.nix index 7aba8368fd8b..9c0ae3625c21 100644 --- a/pkgs/development/python-modules/ots-python/default.nix +++ b/pkgs/development/python-modules/ots-python/default.nix @@ -32,7 +32,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ opentype-sanitizer ]; nativeBuildInputs = [ setuptools-scm ]; - doCheck = true; nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/overly/default.nix b/pkgs/development/python-modules/overly/default.nix index f234c910865e..ea3b291700a0 100644 --- a/pkgs/development/python-modules/overly/default.nix +++ b/pkgs/development/python-modules/overly/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/theelous3/overly"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; - broken = stdenv.isDarwin; # https://github.com/theelous3/overly/issues/2 + broken = stdenv.hostPlatform.isDarwin; # https://github.com/theelous3/overly/issues/2 }; } diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 53f7f9f24e07..4d2d4f24071e 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -2,46 +2,48 @@ lib, buildPythonPackage, fetchFromGitHub, - lxml, - pyproj, + pytest-cov-stub, pytestCheckHook, python-dateutil, pythonOlder, - pytz, pyyaml, requests, + setuptools, }: buildPythonPackage rec { pname = "owslib"; - version = "0.31.0"; - format = "setuptools"; + version = "0.32.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "geopython"; repo = "OWSLib"; - rev = version; - hash = "sha256-vjJsLavVOqTTrVtYbtA0G+nl0HanKeGtzNFFj92Frw8="; + rev = "refs/tags/${version}"; + hash = "sha256-q2O9FNBszNWfL1ekcohSd1RbdLFu8c+zxi+UFeQ7/mk="; }; postPatch = '' substituteInPlace tox.ini \ - --replace " --doctest-modules --doctest-glob 'tests/**/*.txt' --cov-report term-missing --cov owslib" "" + --replace-fail " --doctest-modules --doctest-glob 'tests/**/*.txt'" "" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ lxml - pyproj python-dateutil - pytz pyyaml requests ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "owslib" ]; @@ -51,10 +53,15 @@ buildPythonPackage rec { ''; pytestFlagsArray = [ - # disable tests which require network access + # Disable tests which require network access "-m 'not online'" ]; + disabledTestPaths = [ + # Tests requires network access + "tests/test_ogcapi_connectedsystems_osh.py" + ]; + meta = with lib; { description = "Client for Open Geospatial Consortium web service interface standards"; homepage = "https://www.osgeo.org/projects/owslib/"; diff --git a/pkgs/development/python-modules/p1monitor/default.nix b/pkgs/development/python-modules/p1monitor/default.nix index c164b7c6542d..a5ef8d16bb7f 100644 --- a/pkgs/development/python-modules/p1monitor/default.nix +++ b/pkgs/development/python-modules/p1monitor/default.nix @@ -7,13 +7,14 @@ poetry-core, pytest-asyncio, pytestCheckHook, + syrupy, pythonOlder, yarl, }: buildPythonPackage rec { pname = "p1monitor"; - version = "3.0.1"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-p1monitor"; rev = "refs/tags/v${version}"; - hash = "sha256-WEvNPtaKGJsbHLjGjSl0/9BewmLLMFLoN9SHMdEBoAM="; + hash = "sha256-vr/JLvn593cgZ2KEsfDW1lS4QlGiymr0qZ8130zo6Ec="; }; postPatch = '' @@ -31,9 +32,9 @@ buildPythonPackage rec { --replace 'addopts = "--cov"' "" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp yarl ]; @@ -42,6 +43,7 @@ buildPythonPackage rec { aresponses pytest-asyncio pytestCheckHook + syrupy ]; pythonImportsCheck = [ "p1monitor" ]; @@ -50,7 +52,7 @@ buildPythonPackage rec { description = "Module for interacting with the P1 Monitor"; homepage = "https://github.com/klaasnicolaas/python-p1monitor"; changelog = "https://github.com/klaasnicolaas/python-p1monitor/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix index 03ffee785ce9..c3d4e4e792ba 100644 --- a/pkgs/development/python-modules/packageurl-python/default.nix +++ b/pkgs/development/python-modules/packageurl-python/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "packageurl-python"; - version = "0.15.6"; + version = "0.16.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "packageurl_python"; inherit version; - hash = "sha256-y8ia/RXV9NBdtPG2EpfluXpD9h8oeZ9tKCr/Rn7S7pY="; + hash = "sha256-aeO/ijky/pwkAPVqrrn4aRHs7i+TmNvhtY7DQ0C+Nl0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/packvers/default.nix b/pkgs/development/python-modules/packvers/default.nix index 50bdaff9db6f..4f7cc686d9e6 100644 --- a/pkgs/development/python-modules/packvers/default.nix +++ b/pkgs/development/python-modules/packvers/default.nix @@ -6,23 +6,26 @@ pyparsing, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "packvers"; version = "21.5"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nexB"; - repo = pname; + repo = "packvers"; rev = "refs/tags/${version}"; hash = "sha256-nCSYL0g7mXi9pGFt24pOXbmmYsaRuB+rRZrygf8DTLE="; }; - propagatedBuildInputs = [ pyparsing ]; + build-system = [ setuptools ]; + + dependencies = [ pyparsing ]; nativeCheckInputs = [ pretend @@ -31,9 +34,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "packvers" ]; + disabledTests = [ + # Failed: DID NOT RAISE <class 'packvers.requirements.InvalidRequirement'> + "test_invalid_file_urls" + ]; + meta = with lib; { description = "Module for version handling of modules"; - homepage = "https://github.com/nexB/dparse2"; + homepage = "https://github.com/aboutcode-org/packvers"; changelog = "https://github.com/nexB/packvers/blob/${version}/CHANGELOG.rst"; license = with licenses; [ asl20 # and diff --git a/pkgs/development/python-modules/paddle2onnx/default.nix b/pkgs/development/python-modules/paddle2onnx/default.nix index ee429fb164d0..7149360304a8 100644 --- a/pkgs/development/python-modules/paddle2onnx/default.nix +++ b/pkgs/development/python-modules/paddle2onnx/default.nix @@ -9,7 +9,7 @@ }: let pname = "paddle2onnx"; - version = "1.2.4"; + version = "1.2.9"; format = "wheel"; pyShortVersion = "cp${builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion}"; src = fetchPypi { @@ -18,7 +18,7 @@ let python = pyShortVersion; abi = pyShortVersion; platform = "manylinux_2_12_x86_64.manylinux2010_x86_64"; - hash = "sha256-2muP4Y1zvqYVxvN6I9wjdMY+YE2d0nRmIwFFI/BsIKE="; + hash = "sha256-52U6F2UGteEOV7muLB2vfDHazb0sTy/17Il39kA5XZs="; }; in buildPythonPackage { diff --git a/pkgs/development/python-modules/paddleocr/default.nix b/pkgs/development/python-modules/paddleocr/default.nix index 8033d8c79e6d..6cca9b459556 100644 --- a/pkgs/development/python-modules/paddleocr/default.nix +++ b/pkgs/development/python-modules/paddleocr/default.nix @@ -10,11 +10,10 @@ lmdb, lxml, numpy, - opencv4, + opencv-python, openpyxl, pdf2docx, pillow, - premailer, pyclipper, pymupdf, python-docx, @@ -28,7 +27,7 @@ }: let - version = "2.7.5"; + version = "2.8.1"; in buildPythonPackage { pname = "paddleocr"; @@ -39,7 +38,7 @@ buildPythonPackage { owner = "PaddlePaddle"; repo = "PaddleOCR"; rev = "refs/tags/v${version}"; - hash = "sha256-8mnSV4ga6G2cbYCX84XJRFiLCoXstTAtqvg9QqVN6GI="; + hash = "sha256-TLNpb+CwLKvtmPppDuUbGyJorhmkVVW01J61+XUICYk="; }; patches = [ @@ -59,7 +58,6 @@ buildPythonPackage { pythonRemoveDeps = [ "imgaug" "visualdl" - "opencv-python" "opencv-contrib-python" ]; @@ -72,11 +70,10 @@ buildPythonPackage { lmdb lxml numpy - opencv4 + opencv-python openpyxl pdf2docx pillow - premailer pyclipper pymupdf python-docx diff --git a/pkgs/development/python-modules/paddlepaddle/default.nix b/pkgs/development/python-modules/paddlepaddle/default.nix index 238880794042..8263ae8ec8c5 100644 --- a/pkgs/development/python-modules/paddlepaddle/default.nix +++ b/pkgs/development/python-modules/paddlepaddle/default.nix @@ -76,7 +76,7 @@ buildPythonPackage { ) ); - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' function fixRunPath { p=$(patchelf --print-rpath $1) patchelf --set-rpath "$p:$libraryPath" $1 diff --git a/pkgs/development/python-modules/paho-mqtt/1.nix b/pkgs/development/python-modules/paho-mqtt/1.nix index 83582102767b..437f7899fad0 100644 --- a/pkgs/development/python-modules/paho-mqtt/1.nix +++ b/pkgs/development/python-modules/paho-mqtt/1.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { six ] ++ lib.optionals (!isPy3k) [ mock ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "paho.mqtt" ]; diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix index 437aa9884beb..890cf28a7462 100644 --- a/pkgs/development/python-modules/paho-mqtt/default.nix +++ b/pkgs/development/python-modules/paho-mqtt/default.nix @@ -37,7 +37,7 @@ in buildPythonPackage rec { pytestCheckHook ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "paho.mqtt" ]; diff --git a/pkgs/development/python-modules/pamela/default.nix b/pkgs/development/python-modules/pamela/default.nix index 5f02936d9252..746beca0a9cf 100644 --- a/pkgs/development/python-modules/pamela/default.nix +++ b/pkgs/development/python-modules/pamela/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pamela"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-1LE5/mAOGS4Xaio2gFkgemv/oOeHmHmxP0/LoBY0gb4="; + hash = "sha256-DqbiqZ3e2Md4OkoG8tMfW9ytiU15EB6PCTIuOHo0qs8="; }; postUnpack = '' diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix index 62cefd16c3cd..f216673fc7f0 100644 --- a/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/pkgs/development/python-modules/pandas-stubs/default.nix @@ -89,10 +89,10 @@ buildPythonPackage rec { "test_timedelta_cmp" "test_timestamp_cmp" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_clipboard" # FileNotFoundError: [Errno 2] No such file or directory: 'pbcopy' ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.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` diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 3323c5c9a83b..9c707351f209 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -3,14 +3,12 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonAtLeast, pythonOlder, # build-system cython, meson-python, meson, - oldest-supported-numpy, pkg-config, versioneer, wheel, @@ -66,7 +64,7 @@ let pandas = buildPythonPackage rec { pname = "pandas"; - version = "2.2.2"; + version = "2.2.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -75,29 +73,25 @@ let owner = "pandas-dev"; repo = "pandas"; rev = "refs/tags/v${version}"; - hash = "sha256-+zQKrsJmP3FJeOiYwNH1u96+/ECDHQF39evzur3cKjc="; + hash = "sha256-6YUROcqOV2P1AbJF9IMBIqTt7/PSTeXDwGgE4uI9GME="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "Cython==3.0.5" "Cython>=3.0.5" \ --replace-fail "meson-python==0.13.1" "meson-python>=0.13.1" \ --replace-fail "meson==1.2.1" "meson>=1.2.1" \ - --replace-fail "numpy>=2.0.0rc1" "numpy" + --replace-fail "numpy>=2.0" "numpy" ''; - nativeBuildInputs = - [ - cython - meson-python - meson - numpy - pkg-config - versioneer - wheel - ] - ++ versioneer.optional-dependencies.toml - ++ lib.optionals (pythonOlder "3.12") [ oldest-supported-numpy ]; + nativeBuildInputs = [ + cython + meson-python + meson + numpy + pkg-config + versioneer + wheel + ] ++ versioneer.optional-dependencies.toml; enableParallelBuilding = true; @@ -108,7 +102,7 @@ let tzdata ]; - passthru.optional-dependencies = + optional-dependencies = let extras = { aws = [ s3fs ]; @@ -183,12 +177,12 @@ let pytest-xdist pytestCheckHook ] - ++ lib.flatten (lib.attrValues passthru.optional-dependencies) - ++ lib.optionals (stdenv.isLinux) [ + ++ lib.flatten (lib.attrValues optional-dependencies) + ++ lib.optionals (stdenv.hostPlatform.isLinux) [ # for locale executable glibc ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # for locale executable adv_cmds ]; @@ -213,13 +207,13 @@ let # AssertionError: Did not see expected warning of class 'FutureWarning' "test_parsing_tzlocal_deprecated" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # tests/generic/test_finalize.py::test_binops[and_-args4-right] - AssertionError: assert {} == {'a': 1} "test_binops" # These tests are unreliable on aarch64-darwin. See https://github.com/pandas-dev/pandas/issues/38921. "test_rolling" ] - ++ lib.optional stdenv.is32bit [ + ++ lib.optional stdenv.hostPlatform.is32bit [ # https://github.com/pandas-dev/pandas/issues/37398 "test_rolling_var_numerical_issues" ]; @@ -234,7 +228,7 @@ let '' # TODO: Get locale and clipboard support working on darwin. # Until then we disable the tests. - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Fake the impure dependencies pbpaste and pbcopy echo "#!${runtimeShell}" > pbcopy echo "#!${runtimeShell}" > pbpaste @@ -246,7 +240,7 @@ let meta = with lib; { # pandas devs no longer test i686, it's commonly broken - # broken = stdenv.isi686; + # broken = stdenv.hostPlatform.isi686; changelog = "https://pandas.pydata.org/docs/whatsnew/index.html"; description = "Powerful data structures for data analysis, time series, and statistics"; downloadPage = "https://github.com/pandas-dev/pandas"; diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index d37aa9bdc684..ab7927abbc28 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "panel"; - version = "1.4.4"; + version = "1.5.1"; format = "wheel"; @@ -25,7 +25,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-tJu5Z2VnsMBzC/aTSMBXJHCAgRrsVjZN1Pz7qA5eCaA="; + hash = "sha256-cglT8X3x6tb5ewWluKdTNDi4lFUQqeJQIBSmHGAGDmI="; dist = "py3"; python = "py3"; }; diff --git a/pkgs/development/python-modules/panphon/default.nix b/pkgs/development/python-modules/panphon/default.nix index 10c7e50099a7..6190a4bc9ad2 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.21.1"; + version = "0.21.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Zgug40R1my1BPOoV9iOkbzouMKeQsc0YYFmBIoypDqk="; + hash = "sha256-FpYHbkEeQzyPfbpigZ1EMNlzLLFWB/wNcGHYFYiEE2k="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 2a5352b9d058..bf81409491ce 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { ansicolors ] ++ lib.optionals (pythonAtLeast "3.12") [ aiohttp ]; - passthru.optional-dependencies = { + optional-dependencies = { azure = [ azure-datalake-store azure-identity @@ -69,16 +69,12 @@ buildPythonPackage rec { s3 = [ boto3 ]; }; - nativeCheckInputs = - [ - ipykernel - moto - pytest-mock - pytestCheckHook - ] - ++ passthru.optional-dependencies.azure - ++ passthru.optional-dependencies.s3 - ++ passthru.optional-dependencies.gcs; + nativeCheckInputs = [ + ipykernel + moto + pytest-mock + pytestCheckHook + ] ++ optional-dependencies.azure ++ optional-dependencies.s3 ++ optional-dependencies.gcs; preCheck = '' export HOME=$(mktemp -d) @@ -91,7 +87,7 @@ buildPythonPackage rec { # pytest 8 compat "test_read_with_valid_file_extension" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # might fail due to the sandbox "test_end2end_autosave_slow_notebook" ]; diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 06c4f97cde5e..f7f36edfb201 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -100,7 +100,7 @@ buildPythonPackage rec { "test_valid_dblp_key" "test_validate_arxivid" "test_yaml" - ] ++ lib.optionals stdenv.isDarwin [ "test_default_opener" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_default_opener" ]; pythonImportsCheck = [ "papis" ]; diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index 248dc1f51318..ca46a101158b 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -11,18 +11,19 @@ mock, pyasn1, pynacl, + pytest-relaxed, pytestCheckHook, - six, + setuptools, }: buildPythonPackage rec { pname = "paramiko"; - version = "3.4.0"; - format = "setuptools"; + version = "3.5.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-qsCPJqMdxN/9koIVJ9FoLZnVL572hRloEUqHKPPCdNM="; + hash = "sha256-rRHlQNpPVc7dpSkx8aP4Eqgjinr39ipg3lOM2AuygSQ="; }; patches = [ @@ -32,29 +33,22 @@ buildPythonPackage rec { url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch"; hash = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA="; }) - (fetchpatch { - name = "paramiko-pytest8-compat.patch"; - url = "https://github.com/paramiko/paramiko/commit/d71046151d9904df467ff72709585cde39cdd4ca.patch"; - hash = "sha256-4CTIZ9BmzRdh+HOwxSzfM9wkUGJOnndctK5swqqsIvU="; - }) ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ bcrypt cryptography - pyasn1 - six - ] ++ passthru.optional-dependencies.ed25519; # remove on 3.0 update + pynacl + ]; - passthru.optional-dependencies = { + optional-dependencies = { gssapi = [ pyasn1 gssapi ]; - ed25519 = [ - pynacl - bcrypt - ]; + ed25519 = [ ]; invoke = [ invoke ]; }; @@ -62,29 +56,24 @@ buildPythonPackage rec { icecream mock pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - - disabledTestPaths = [ - # disable tests that require pytest-relaxed, which is broken - "tests/test_client.py" - "tests/test_ssh_gss.py" - ]; + pytest-relaxed + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "paramiko" ]; __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { homepage = "https://github.com/paramiko/paramiko/"; changelog = "https://github.com/paramiko/paramiko/blob/${version}/sites/www/changelog.rst"; description = "Native Python SSHv2 protocol library"; - license = licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; longDescription = '' Library for making SSH2 connections (client or server). Emphasis is on using SSH2 as an alternative to SSL for making secure connections between python scripts. All major ciphers and hash methods are supported. SFTP client and server mode are both supported too. ''; - maintainers = [ ]; + maintainers = lib.teams.helsinki-systems.members; }; } diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index 712cce60a5e6..8b5149011112 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -1,46 +1,37 @@ { lib, buildPythonPackage, - fetchpatch, - fetchPypi, - setuptools, + decorator, + fetchFromGitHub, numpy, + pytestCheckHook, + pythonOlder, scipy, + setuptools, six, - decorator, - pytestCheckHook, }: buildPythonPackage rec { pname = "paramz"; - version = "0.9.5"; + version = "0.9.6"; pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "0917211c0f083f344e7f1bc997e0d713dbc147b6380bc19f606119394f820b9a"; - }; + disabled = pythonOlder "3.7"; - patches = [ - (fetchpatch { - name = "remove-deprecated-numpy-uses"; - url = "https://github.com/sods/paramz/pull/38/commits/a5a0be15b12c5864b438d870b519ad17cc72cd12.patch"; - hash = "sha256-vj/amEXL9QJ7VdqJmyhv/lj8n+yuiZEARQBYWw6lgBA="; - }) - (fetchpatch { - name = "_raveled_index_for.patch"; - url = "https://github.com/sods/paramz/pull/40/commits/dd68a81cfd28edb48354c6a9b493ef711f00fb5b.patch"; - hash = "sha256-nbnW3lYJDT1WXko3Y28YyELhO0QIAA1Tx0CJ57T1Nq0="; - }) - ]; + src = fetchFromGitHub { + owner = "sods"; + repo = "paramz"; + rev = "refs/tags/v${version}"; + hash = "sha256-SWmx70G5mm3eUmH2UIEmg5C7u9VDHiFw5aYCIr8UjPs="; + }; build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ + decorator numpy scipy six - decorator ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -64,11 +55,18 @@ buildPythonPackage rec { "paramz/tests/verbose_optimize_tests.py" ]; + disabledTests = [ + # TypeError: arrays to stack must be passed as a "sequence" type such as list... + "test_raveled_index" + "test_regular_expression_misc" + ]; + pythonImportsCheck = [ "paramz" ]; meta = with lib; { description = "Parameterization framework for parameterized model creation and handling"; homepage = "https://github.com/sods/paramz"; + changelog = "https://github.com/sods/paramz/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index 07696140e7b3..61ec964340d4 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -41,14 +41,14 @@ let in buildPythonPackage rec { pname = "parsedmarc"; - version = "8.12.0"; + version = "8.15.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mscc3TRMYuaTqrrxGPCVVKa2fg5sXwK/BglpbvLXbLc="; + hash = "sha256-Z2KF8jv/D/SvwQWd1PGSlsAfowmYOd5CvvcC4kVuLos="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/parselmouth/default.nix b/pkgs/development/python-modules/parselmouth/default.nix new file mode 100644 index 000000000000..78417fe48c0b --- /dev/null +++ b/pkgs/development/python-modules/parselmouth/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + cmake, + fetchFromGitHub, + future, + numpy, + pytest-lazy-fixture, + pytestCheckHook, + pythonOlder, + scikit-build, + setuptools, +}: + +buildPythonPackage rec { + pname = "parselmouth"; + version = "0.4.5"; + pyproject = true; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "YannickJadoul"; + repo = "Parselmouth"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-/Hde/DpSbmHs8WF3PAk4esYuMgOX6SxMaYJrrHYr/ZU="; + }; + + configurePhase = '' + # doesn't happen automatically + export MAKEFLAGS=-j$NIX_BUILD_CORES + ''; + + build-system = [ + cmake + scikit-build + setuptools + ]; + + dontUseCmakeConfigure = true; + + dependencies = [ numpy ]; + + nativeCheckInputs = [ + future + pytest-lazy-fixture + pytestCheckHook + ]; + + pythonImportsCheck = [ "parselmouth" ]; + + meta = { + description = "Praat in Python, the Pythonic way"; + homepage = "https://github.com/YannickJadoul/Parselmouth"; + changelog = "https://github.com/YannickJadoul/Parselmouth/releases/tag/v${version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ derdennisop ]; + }; +} diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index 0dd614644d2d..ac75974739b2 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { toolz ]; - passthru.optional-dependencies = { + optional-dependencies = { complete = [ blosc2 numpy diff --git a/pkgs/development/python-modules/particle/default.nix b/pkgs/development/python-modules/particle/default.nix index 112b733ed284..96dbf62e4166 100644 --- a/pkgs/development/python-modules/particle/default.nix +++ b/pkgs/development/python-modules/particle/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "particle"; - version = "0.25.1"; + version = "0.25.2"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-lwZ0jpWnBt/9SUJts5MpgZf+GvgZchxdLG5RV2Sh+wE="; + hash = "sha256-H6S77ji/6u8IpAsnebTDDFzk+ihloQwCrP6QZ5tOYek="; }; postPatch = '' diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index 29d1b111e921..98be7873032a 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -1,28 +1,36 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitLab, argon2-cffi, bcrypt, cryptography, pytestCheckHook, pythonOlder, pytest-xdist, + setuptools, }: buildPythonPackage rec { pname = "passlib"; version = "1.7.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-3v1Q9ytlxUAqssVzgwppeOXyAq0NmEeTyN3ixBUuvgQ"; + src = fetchFromGitLab { + domain = "foss.heptapod.net"; + owner = "python-libs"; + repo = "passlib"; + rev = "refs/tags/${version}"; + hash = "sha256-Mx2Xg/KAEfvfep2B/gWATTiAPJc+f22MTcsEdRpt3n8="; }; - passthru.optional-dependencies = { + build-system = [ setuptools ]; + + dependencies = [ setuptools ]; + + optional-dependencies = { argon2 = [ argon2-cffi ]; bcrypt = [ bcrypt ]; totp = [ cryptography ]; @@ -35,14 +43,10 @@ buildPythonPackage rec { "version = getattr(getattr(_bcrypt, '__about__', _bcrypt), '__version__', '<unknown>')" ''; - nativeCheckInputs = - [ - pytestCheckHook - pytest-xdist - ] - ++ passthru.optional-dependencies.argon2 - ++ passthru.optional-dependencies.bcrypt - ++ passthru.optional-dependencies.totp; + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + ] ++ optional-dependencies.argon2 ++ optional-dependencies.bcrypt ++ optional-dependencies.totp; pythonImportsCheck = [ "passlib" ]; @@ -61,10 +65,11 @@ buildPythonPackage rec { "--deselect=passlib/tests/test_handlers.py::sha256_crypt_os_crypt_test::test_82_crypt_support" ]; - meta = with lib; { + meta = { + changelog = "https://foss.heptapod.net/python-libs/passlib/-/blob/${version}/docs/history/${lib.versions.majorMinor version}.rst"; description = "Password hashing library for Python"; homepage = "https://foss.heptapod.net/python-libs/passlib"; - license = licenses.bsdOriginal; - maintainers = [ ]; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index b7ac8fefb3a8..40a921726a67 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "paste"; version = "3.10.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "cdent"; + owner = "pasteorg"; repo = "paste"; rev = "refs/tags/${version}"; hash = "sha256-NY/h6hbpluEu1XAv3o4mqoG+l0LXfM1dw7+G0Rm1E4o="; @@ -26,7 +26,9 @@ buildPythonPackage rec { patchShebangs tests/cgiapp_data/ ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ setuptools six ]; @@ -43,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tools for using a Web Server Gateway Interface stack"; homepage = "https://pythonpaste.readthedocs.io/"; - changelog = "https://github.com/cdent/paste/blob/${version}/docs/news.txt"; + changelog = "https://github.com/pasteorg/paste/blob/${version}/docs/news.txt"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index a68134dfdc31..7d1eacb847e0 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -4,27 +4,30 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pastedeploy"; - version = "3.0.1"; - format = "setuptools"; + version = "3.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Pylons"; - repo = pname; + repo = "pastedeploy"; rev = "refs/tags/${version}"; hash = "sha256-8MNeOcYPEYAfghZN/K/1v/tAAdgz/fCvuVnBoru+81Q="; }; postPatch = '' substituteInPlace pytest.ini \ - --replace " --cov" "" + --replace-fail " --cov" "" ''; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "paste.deploy" ]; diff --git a/pkgs/development/python-modules/patch-ng/default.nix b/pkgs/development/python-modules/patch-ng/default.nix index 1298fa3a1e26..cf0d81c7bd9e 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.18.0"; # note: `conan` package may require a hardcoded one + version = "1.18.1"; # note: `conan` package may require a hardcoded one format = "setuptools"; pname = "patch-ng"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2gZ2KNbV/Z3FpV6rN5UdRr2VZhtyGfqzZLcRNmq8xpA="; + sha256 = "sha256-Uv1G7kb2yGZ2kmgsH9cTTtxlotLQhOvsHSlaYIf8ApE="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/path/default.nix b/pkgs/development/python-modules/path/default.nix index d7f28f166a05..d99c52a1861e 100644 --- a/pkgs/development/python-modules/path/default.nix +++ b/pkgs/development/python-modules/path/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "path"; - version = "16.14.0"; + version = "16.16.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-26qn79RgL9a6jYKJDceCPWnl3nQKboQtmRmw+q8rao4="; + hash = "sha256-pqbZFskQ3Bfg3ciDNYdWxaM9G2299dbehlVPOZBTr1g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pathlib-abc/default.nix b/pkgs/development/python-modules/pathlib-abc/default.nix index c1a8c632cbc6..accc436e7968 100644 --- a/pkgs/development/python-modules/pathlib-abc/default.nix +++ b/pkgs/development/python-modules/pathlib-abc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pathlib-abc"; - version = "0.1.1"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pathlib_abc"; inherit version; - hash = "sha256-CE573ZGbD3d0kUqeZM2GobOYYPgfeB3XJCWGMfKRWr4="; + hash = "sha256-gROV0nk6HGdf95wyRtPWtBoPlqOhR5wulsVrClFAIic="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index b548dd3c6f0b..b82f3319426c 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pathos"; - version = "0.3.2"; + version = "0.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "uqfoundation"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-b4HCiAvBGkFMxWh2PHC2kZ9G4PsQqVhKeIxLBKj09jU="; + hash = "sha256-J3rwnsn/3DXmChydwNC5yvsdSk1mzvPSnSo21BwkhSE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pathvalidate/default.nix b/pkgs/development/python-modules/pathvalidate/default.nix index 773f9372edbc..be229401f035 100644 --- a/pkgs/development/python-modules/pathvalidate/default.nix +++ b/pkgs/development/python-modules/pathvalidate/default.nix @@ -3,22 +3,22 @@ buildPythonPackage, fetchPypi, pythonOlder, - setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "pathvalidate"; - version = "3.2.0"; - format = "pyproject"; + version = "3.2.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XoN4z2cSv/Z/vnqDB9mfqMGgyyiqR3BW+Pw3Tw3/JK0="; + hash = "sha256-9dB7HiN0GHBAYSofzSvLKRn42xgN8lTJWBu5C/kDN30="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools-scm ]; # Requires `pytest-md-report`, causing infinite recursion. doCheck = false; diff --git a/pkgs/development/python-modules/patool/default.nix b/pkgs/development/python-modules/patool/default.nix index feaef66da2b7..578b64208adc 100644 --- a/pkgs/development/python-modules/patool/default.nix +++ b/pkgs/development/python-modules/patool/default.nix @@ -38,15 +38,15 @@ let in buildPythonPackage rec { pname = "patool"; - version = "2.1.1"; + version = "2.4.0"; format = "setuptools"; #pypi doesn't have test data src = fetchFromGitHub { owner = "wummel"; repo = pname; - rev = "upstream/${version}"; - hash = "sha256-B2P6JldMOAxr4WS+wST+kRVvEm41zH3Nh5LLKoFOws4="; + rev = "refs/tags/${version}"; + hash = "sha256-dWyC8uTVUb06liNcJaG4oK9wqIDmwAl6i6cg4XRRRdQ="; }; postPatch = '' @@ -61,7 +61,7 @@ buildPythonPackage rec { "test_unzip_file" "test_zip" "test_zip_file" - ] ++ lib.optionals stdenv.isDarwin [ "test_ar" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_ar" ]; meta = with lib; { description = "portable archive file manager"; diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 1c215cb307ca..bd45d03af892 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -1,22 +1,28 @@ { lib, buildPythonPackage, + callPackage, fetchPypi, setuptools, - callPackage, + six, }: buildPythonPackage rec { pname = "pbr"; - version = "6.0.0"; + version = "6.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-0TdxIqWgDi+UDuSCmZUY7+FtdF1COmcMJ3c9+8PJp9k="; + hash = "sha256-eIGD44Lj0ddwfbCJeCOZZei55OXtQmab9HWBhnNNXyQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; + + dependencies = [ + setuptools # for pkg_resources + six + ]; # check in passthru.tests.pytest to escape infinite recursion with fixtures doCheck = false; diff --git a/pkgs/development/python-modules/pbr/tests.nix b/pkgs/development/python-modules/pbr/tests.nix index 70e768814db9..c464983fa31a 100644 --- a/pkgs/development/python-modules/pbr/tests.nix +++ b/pkgs/development/python-modules/pbr/tests.nix @@ -46,6 +46,9 @@ buildPythonPackage { pbr.tests.test_core.TestCore.test_console_script_install pbr.tests.test_wsgi.TestWsgiScripts.test_with_argument pbr.tests.test_wsgi.TestWsgiScripts.test_wsgi_script_run + # Tests are failing because of fixture timeouts + pbr.tests.test_packaging.TestPEP517Support.test_pep_517_support + pbr.tests.test_packaging.TestRequirementParsing.test_requirement_parsing ") ''; } diff --git a/pkgs/development/python-modules/pbs-installer/default.nix b/pkgs/development/python-modules/pbs-installer/default.nix index 8404c8bc0b90..576ec488241c 100644 --- a/pkgs/development/python-modules/pbs-installer/default.nix +++ b/pkgs/development/python-modules/pbs-installer/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pbs-installer"; - version = "2024.09.09"; + version = "2024.10.08"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "frostming"; repo = "pbs-installer"; rev = "refs/tags/${version}"; - hash = "sha256-c9jd85CLQPrwA1HmsedGhbBoQIuEWiPsZN0Srq+DyVE="; + hash = "sha256-fftrY1r84o9Vj9Hw18WYItGRRjgKarF1tXmDV2tERXQ="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix deleted file mode 100644 index 7e56799e9e29..000000000000 --- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - lib, - boost, - buildPythonPackage, - cmake, - cryptography, - fetchFromGitHub, - git, - pc-ble-driver, - pythonOlder, - scikit-build, - setuptools, - swig, - wrapt, -}: - -buildPythonPackage rec { - pname = "pc-ble-driver-py"; - version = "0.17.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "NordicSemiconductor"; - repo = "pc-ble-driver-py"; - rev = "refs/tags/v${version}"; - hash = "sha256-brC33ar2Jq3R2xdrklvVsQKf6pcnKwD25PO4TIvXgTg="; - }; - - nativeBuildInputs = [ - cmake - swig - git - setuptools - scikit-build - ]; - - buildInputs = [ - boost - pc-ble-driver - ]; - - propagatedBuildInputs = [ - cryptography - wrapt - ]; - - dontUseCmakeConfigure = true; - - # doCheck tries to write to the global python directory to install things - doCheck = false; - - pythonImportsCheck = [ "pc_ble_driver_py" ]; - - meta = with lib; { - description = "Bluetooth Low Energy nRF5 SoftDevice serialization"; - homepage = "https://github.com/NordicSemiconductor/pc-ble-driver-py"; - changelog = "https://github.com/NordicSemiconductor/pc-ble-driver-py/releases/tag/v${version}"; - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ gebner ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/python-modules/pdf2docx/default.nix b/pkgs/development/python-modules/pdf2docx/default.nix index af91594808b5..b54cde4adde3 100644 --- a/pkgs/development/python-modules/pdf2docx/default.nix +++ b/pkgs/development/python-modules/pdf2docx/default.nix @@ -2,18 +2,17 @@ stdenv, lib, fetchFromGitHub, - python, buildPythonPackage, - imagemagick, pip, pytestCheckHook, pymupdf, fire, fonttools, numpy, - opencv4, + opencv-python-headless, tkinter, python-docx, + setuptools, }: let version = "0.5.8"; @@ -21,43 +20,31 @@ in buildPythonPackage { pname = "pdf2docx"; inherit version; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { - owner = "dothinking"; + owner = "ArtifexSoftware"; repo = "pdf2docx"; rev = "refs/tags/v${version}"; hash = "sha256-tMITDm2NkxWS+H/hhd2LlaPbyuI86ZKaALqqHJqb8V0="; }; - nativeBuildInputs = [ + build-system = [ pip - imagemagick + setuptools ]; - pythonRemoveDeps = [ "opencv-python" ]; - preBuild = "echo '${version}' > version.txt"; - propagatedBuildInputs = [ - tkinter + dependencies = [ pymupdf fire fonttools numpy - opencv4 + opencv-python-headless python-docx ]; - postInstall = lib.optionalString stdenv.isLinux '' - # on linux the icon file can only be xbm format - convert $out/${python.sitePackages}/pdf2docx/gui/icon.ico \ - $out/${python.sitePackages}/pdf2docx/gui/icon.xbm - substituteInPlace $out/${python.sitePackages}/pdf2docx/gui/App.py \ - --replace 'icon.ico' 'icon.xbm' \ - --replace 'iconbitmap(icon_path)' "iconbitmap(f'@{icon_path}')" - ''; - nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ @@ -71,9 +58,9 @@ buildPythonPackage { meta = with lib; { description = "Convert PDF to DOCX"; mainProgram = "pdf2docx"; - homepage = "https://github.com/dothinking/pdf2docx"; - changelog = "https://github.com/dothinking/pdf2docx/releases/tag/v${version}"; - license = licenses.gpl3Only; + homepage = "https://github.com/ArtifexSoftware/pdf2docx"; + changelog = "https://github.com/ArtifexSoftware/pdf2docx/releases/tag/v${version}"; + license = licenses.agpl3Only; maintainers = with maintainers; [ happysalada ]; }; } diff --git a/pkgs/development/python-modules/pdfx/default.nix b/pkgs/development/python-modules/pdfx/default.nix deleted file mode 100644 index c8759c4601fe..000000000000 --- a/pkgs/development/python-modules/pdfx/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pdfminer-six, - chardet, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "pdfx"; - version = "1.4.1"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "metachris"; - repo = "pdfx"; - rev = "v${version}"; - hash = "sha256-POpP6XwcqwvImrtIiDjpnHoNE0MKapuPjxojo+ocBK0="; - }; - - postPatch = '' - substituteInPlace requirements.txt \ - --replace "chardet==4.0.0" "chardet" \ - --replace "pdfminer.six==20201018" "pdfminer.six" - ''; - - propagatedBuildInputs = [ - pdfminer-six - chardet - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Extract references (pdf, url, doi, arxiv) and metadata from a PDF"; - mainProgram = "pdfx"; - license = licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix index 64ad22dd1651..b7a7f87a4fd0 100644 --- a/pkgs/development/python-modules/pdm-backend/default.nix +++ b/pkgs/development/python-modules/pdm-backend/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pdm-backend"; - version = "2.3.3"; + version = "2.4.3"; pyproject = true; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-backend"; rev = "refs/tags/${version}"; - hash = "sha256-gM8Sx6nMiq84e3sLJn35shF2jy6Ce1qPlERi2XpS89k="; + hash = "sha256-XbHlzt00R0kB8I6nRvteAgpFlUTAvBcF5iaQD5V30ok="; }; env.PDM_BUILD_SCM_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { # tests require a configured git identity export HOME=$TMPDIR + git config --global user.name nixbld git config --global user.email nixbld@localhost ''; diff --git a/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix b/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix index 3a653ec5f49a..9e74fa519175 100644 --- a/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix +++ b/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; pythonImportsCheck = [ "pdoc_pyo3_sample_library" ]; diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix index f979e9b7510b..a372d124ac3a 100644 --- a/pkgs/development/python-modules/pdoc/default.nix +++ b/pkgs/development/python-modules/pdoc/default.nix @@ -8,15 +8,15 @@ pdoc-pyo3-sample-library, pygments, markupsafe, - astunparse, pytestCheckHook, hypothesis, + nix-update-script, }: buildPythonPackage rec { pname = "pdoc"; - version = "14.7.0"; - disabled = pythonOlder "3.8"; + version = "15.0.0"; + disabled = pythonOlder "3.9"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "pdoc"; rev = "v${version}"; - hash = "sha256-U6gLEuyKvGGP5yKXb+bWDGJqmHTdPYLLPgHLVySAJ6I="; + hash = "sha256-6XEcHhaKkxY/FU748f+OsTcSgrM4iQTmJAL8rJ3EqnY="; }; nativeBuildInputs = [ setuptools ]; @@ -33,7 +33,7 @@ buildPythonPackage rec { jinja2 pygments markupsafe - ] ++ lib.optional (pythonOlder "3.9") astunparse; + ]; nativeCheckInputs = [ pytestCheckHook @@ -54,6 +54,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "pdoc" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { changelog = "https://github.com/mitmproxy/pdoc/blob/${src.rev}/CHANGELOG.md"; homepage = "https://pdoc.dev/"; diff --git a/pkgs/development/python-modules/pebble/default.nix b/pkgs/development/python-modules/pebble/default.nix index 827e45f12590..ea618df3293f 100644 --- a/pkgs/development/python-modules/pebble/default.nix +++ b/pkgs/development/python-modules/pebble/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "pebble" ]; diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index e1c9505b40df..422f427c6ed6 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.6"; + version = "3.17.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = "peewee"; rev = "refs/tags/${version}"; - hash = "sha256-HluoCXblqwaOb+gtAhvaYshTj9CtHoegn0QUaq0V+eA="; + hash = "sha256-j10c3mnrHISk04l65ieUB11jt3a3iiQsroTt/L0tKaw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/peft/default.nix b/pkgs/development/python-modules/peft/default.nix index 73a1d47855d3..bd9fffeffc80 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.12.0"; + version = "0.13.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7LYlqWiOPTvQyJgpUZeZ5Wl17RswhYyit0/MaHyN5Ak="; + hash = "sha256-LKVrkNFY5Ar5Zl1q3heU+Z0ZKNnMz7VBR/WLrYkAg6Y="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 9f77c7546ac1..0472bf106c50 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -29,6 +29,8 @@ watchfiles, # tests + beautifulsoup4, + lxml, mock, pytestCheckHook, pytest-xdist, @@ -36,7 +38,7 @@ buildPythonPackage rec { pname = "pelican"; - version = "4.9.1"; + version = "4.10.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -45,7 +47,7 @@ buildPythonPackage rec { owner = "getpelican"; repo = "pelican"; rev = "refs/tags/${version}"; - hash = "sha256-nz2OnxJ4mGgnafz4Xp8K/BTyVgXNpNYqteNL1owP8Hk="; + hash = "sha256-RWzOMp3H0QbZyGsXd8cakeRqZhVH7d6ftxZHBA4cPSA="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -58,9 +60,7 @@ buildPythonPackage rec { --replace "'git'" "'${git}/bin/git'" ''; - nativeBuildInputs = [ - pdm-backend - ]; + build-system = [ pdm-backend ]; pythonRelaxDeps = [ "unidecode" ]; @@ -72,7 +72,7 @@ buildPythonPackage rec { typogrify ]; - propagatedBuildInputs = [ + dependencies = [ blinker docutils feedgenerator @@ -84,13 +84,19 @@ buildPythonPackage rec { tzdata unidecode watchfiles - ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; + ]; + + optional-dependencies = { + markdown = [ markdown ]; + }; nativeCheckInputs = [ + beautifulsoup4 + lxml mock + pandoc pytest-xdist pytestCheckHook - pandoc ]; pytestFlagsArray = [ @@ -104,6 +110,10 @@ buildPythonPackage rec { "test_custom_generation_works" "test_custom_locale_generation_works" "test_deprecated_attribute" + # AttributeError + "test_wp_custpost_true_dirpage_false" + "test_can_toggle_raw_html_code_parsing" + "test_dirpage_directive_for_page_kind" ]; env.LC_ALL = "en_US.UTF-8"; @@ -122,6 +132,7 @@ buildPythonPackage rec { meta = with lib; { description = "Static site generator that requires no database or server-side logic"; homepage = "https://getpelican.com/"; + changelog = "https://github.com/getpelican/pelican/blob/${version}/docs/changelog.rst"; license = licenses.agpl3Only; maintainers = with maintainers; [ offline diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index 627769ff18c8..bd74e66c6915 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { rustPlatform.cargoSetupHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ iconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ iconv ]; propagatedBuildInputs = [ @@ -82,7 +82,7 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/benchmarks" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # PermissionError: [Errno 1] Operation not permitted: '/etc/localtime' "tests/testing/test_time_travel.py" ]; diff --git a/pkgs/development/python-modules/pepit/default.nix b/pkgs/development/python-modules/pepit/default.nix new file mode 100644 index 000000000000..37017f445e9e --- /dev/null +++ b/pkgs/development/python-modules/pepit/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + cvxpy, + numpy, + pandas, + scipy, + matplotlib, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pepit"; + version = "0.3.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "PerformanceEstimation"; + repo = "PEPit"; + rev = version; + hash = "sha256-Gdymdfi0Iv9KXBNSbAEWGYIQ4k5EONnbyWs+99L5D/A="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + cvxpy + numpy + pandas + scipy + matplotlib + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "PEPit" + ]; + + meta = { + description = "Performance Estimation in Python"; + changelog = "https://pepit.readthedocs.io/en/latest/whatsnew/${version}.html"; + homepage = "https://pepit.readthedocs.io/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ wegank ]; + }; +} diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index 78cd6bdaf999..e71358857354 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. - env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; + env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "Agg"; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index 59892262e697..060e3ff8ef72 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "persim"; - version = "0.3.5"; + version = "0.3.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qyly3kIx9HQ7zDT0SfUlsqZGqibdXsfW1dL9HNpQZJg="; + hash = "sha256-dvcpj7ekbNvsc2+FSXfx4Xlt3y1pdO2n2FnKKEf032Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index 644ac8d2e517..18fc8b244fbb 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -16,19 +16,24 @@ buildPythonPackage rec { pname = "persistent"; - version = "6.0"; + version = "6.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CDZQwP/ty4gDKJY8KUuVEaArawXkIec3p9Vfnu2I+18="; + hash = "sha256-qhfm5ISXONCAcG6+bHnsjbD0qyyHl1+bNCSer3qWWGc="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools<74" "setuptools" + ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ zope-interface zope-deferredimport ] diff --git a/pkgs/development/python-modules/pesq/default.nix b/pkgs/development/python-modules/pesq/default.nix new file mode 100644 index 000000000000..d8111f3a4531 --- /dev/null +++ b/pkgs/development/python-modules/pesq/default.nix @@ -0,0 +1,77 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + cython, + numpy, + setuptools, + + # tests + pytestCheckHook, + scipy, +}: + +buildPythonPackage rec { + pname = "pesq"; + version = "0.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ludlows"; + repo = "PESQ"; + rev = "refs/tags/v${version}"; + hash = "sha256-JuwZ+trFKGMetS3cC3pEQsV+wbj6+klFnC3THOd8bPE="; + }; + + postPatch = + # pythonRemoveDeps does not work for removing pytest-runner + '' + substituteInPlace setup.py \ + --replace-fail ", 'pytest-runner'" "" + '' + # Flaky tests: numerical equality is not satisfied on ARM platforms + + '' + substituteInPlace tests/test_pesq.py \ + --replace-fail \ + "assert score == 1.6072081327438354" \ + "assert abs(score - 1.6072081327438354) < 1e-5" \ + --replace-fail \ + "assert score == [1.6072081327438354]" \ + "assert np.allclose(np.array(score), np.array([1.6072081327438354]))" + ''; + + build-system = [ + cython + setuptools + numpy + ]; + + dependencies = [ + numpy + ]; + + pythonImportsCheck = [ + "pesq" + "pesq.cypesq" + ]; + + # Prevents importing the `pesq` module from the source files (which lack the cypesq extension) + preCheck = '' + rm -rf pesq + ''; + + nativeCheckInputs = [ + pytestCheckHook + scipy + ]; + + meta = { + description = "PESQ (Perceptual Evaluation of Speech Quality) Wrapper for Python Users"; + homepage = "https://github.com/ludlows/PESQ"; + changelog = "https://github.com/ludlows/PESQ/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/pettingzoo/default.nix b/pkgs/development/python-modules/pettingzoo/default.nix index 1e03c7734dde..f388de21a026 100644 --- a/pkgs/development/python-modules/pettingzoo/default.nix +++ b/pkgs/development/python-modules/pettingzoo/default.nix @@ -17,7 +17,7 @@ pre-commit, pynput, pytest, - pytest-cov, + pytest-cov-stub, pytest-markdown-docs, pytest-xdist, pytestCheckHook, @@ -48,7 +48,7 @@ buildPythonPackage rec { numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ chess # multi-agent-ale-py @@ -87,7 +87,7 @@ buildPythonPackage rec { pre-commit pynput pytest - pytest-cov + pytest-cov-stub pytest-markdown-docs pytest-xdist ]; @@ -117,7 +117,7 @@ buildPythonPackage rec { # ImportError: cannot import name 'pytest_plugins' from 'pettingzoo.classic' "test_chess" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Crashes on darwin: `Fatal Python error: Aborted` "test_multi_episode_parallel_env_wrapper" ]; diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 2df4dd4b8ff0..f5cb793b6c50 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.12.1"; + version = "2.20.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KBD9sRqtQT02RfyXurUiGy28bucB7l/irF/fPmVeGwc="; + hash = "sha256-JvZiVb/qzkILBaALrCU2rldUgSgSD1eo4AqMPgEdJ50="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pgcli/default.nix b/pkgs/development/python-modules/pgcli/default.nix index 38bbed27eef5..ce812bcdf225 100644 --- a/pkgs/development/python-modules/pgcli/default.nix +++ b/pkgs/development/python-modules/pgcli/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { disabledTests = [ # requires running postgres "test_application_name_in_env" - ] ++ lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_application_name_db_uri" ]; meta = with lib; { description = "Command-line interface for PostgreSQL"; diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 02a11e0f01a7..0efd11578651 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -2,22 +2,22 @@ lib, buildPythonPackage, fetchPypi, + pytest-cov-stub, + pytest, pythonOlder, setuptools, - pytest, - pytest-cov-stub, }: buildPythonPackage rec { pname = "pglast"; - version = "6.2"; + version = "6.6"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mGP7o52Wun6AdE2jMAJBmLR10EmN50qzbMzB06BFXMg="; + hash = "sha256-NMM/O7SIunsfh1aSKArAmcXQR638HwBFrMjva+muDt8="; }; build-system = [ setuptools ]; @@ -41,8 +41,8 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/lelit/pglast"; description = "PostgreSQL Languages AST and statements prettifier"; + homepage = "https://github.com/lelit/pglast"; changelog = "https://github.com/lelit/pglast/blob/v${version}/CHANGES.rst"; license = licenses.gpl3Plus; maintainers = [ ]; diff --git a/pkgs/development/python-modules/pgmpy/default.nix b/pkgs/development/python-modules/pgmpy/default.nix index 1217f573cdcd..810f1aa26859 100644 --- a/pkgs/development/python-modules/pgmpy/default.nix +++ b/pkgs/development/python-modules/pgmpy/default.nix @@ -20,7 +20,7 @@ # tests pytestCheckHook, - pytest-cov, + pytest-cov-stub, coverage, mock, black, @@ -69,7 +69,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook # xdoctest - pytest-cov + pytest-cov-stub coverage mock black diff --git a/pkgs/development/python-modules/pgsanity/default.nix b/pkgs/development/python-modules/pgsanity/default.nix index 7f1c482977a3..df957c92c686 100644 --- a/pkgs/development/python-modules/pgsanity/default.nix +++ b/pkgs/development/python-modules/pgsanity/default.nix @@ -20,6 +20,9 @@ buildPythonPackage rec { unittestCheckHook postgresql ]; + + unittestFlagsArray = [ "test" ]; + propagatedBuildInputs = [ postgresql ]; meta = with lib; { diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix index 114a16888632..561088b606d8 100644 --- a/pkgs/development/python-modules/phonemizer/default.nix +++ b/pkgs/development/python-modules/phonemizer/default.nix @@ -10,22 +10,22 @@ dlinfo, typing-extensions, espeak-ng, + setuptools, + pytest, }: buildPythonPackage rec { pname = "phonemizer"; - version = "3.2.1"; - format = "setuptools"; + version = "3.3.0"; + pyproject = true; + + build-system = [ setuptools ]; src = fetchPypi { inherit pname version; - hash = "sha256-Bo+F+FqKmtxjijeHrqyvcaU+R1eLEtdzwJdDNQDNiSs="; + hash = "sha256-Xgw4Ei7/4LMxok5nSv8laHTs4WnXCpzxEgM3tW+OPQw="; }; - postPatch = '' - sed -i '/pytest-runner/d' setup.py - ''; - patches = [ (substituteAll { src = ./backend-paths.patch; @@ -46,12 +46,12 @@ buildPythonPackage rec { # so let's disable related tests. doCheck = false; - meta = with lib; { + meta = { homepage = "https://github.com/bootphon/phonemizer"; changelog = "https://github.com/bootphon/phonemizer/blob/v${version}/CHANGELOG.md"; description = "Simple text to phones converter for multiple languages"; mainProgram = "phonemize"; - license = licenses.gpl3Plus; - maintainers = [ ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; }; } diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 8df6d6fc3d90..17d232e97f7e 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -4,20 +4,23 @@ fetchPypi, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "phonenumbers"; - version = "8.13.39"; - format = "setuptools"; + version = "8.13.46"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-23yklw0gayBWIxEFMAdTsaWyKfQ0FvjCswEOY/u2jXc="; + hash = "sha256-lL8Yupclu2ho0pRzsT947wHiWFxctWHsAgC+dnbndFI="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests/*.py" ]; diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index 38b239651b7c..a00929e3d16c 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -11,21 +11,35 @@ pytestCheckHook, pythonOlder, setuptools, + scikit-build-core, + cmake, + setuptools-scm, + ninja, + pkg-config, + nanobind, }: buildPythonPackage rec { pname = "phonopy"; - version = "2.24.3"; + version = "2.29.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VHtifCC28GKIE+0oz1wMgmZ9G6+rT8nF0PG6tYkhjG8="; + hash = "sha256-MabBtEOyM82R0NbdVaY+2f9GT8rT44xjOi/o38GSRp8="; }; - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = [ + setuptools + scikit-build-core + nanobind + setuptools-scm + ninja + cmake + ]; + dontUseCmakeConfigure = true; propagatedBuildInputs = [ h5py diff --git a/pkgs/development/python-modules/photutils/default.nix b/pkgs/development/python-modules/photutils/default.nix index 68c5148f7eb4..f81ba4f5ec4d 100644 --- a/pkgs/development/python-modules/photutils/default.nix +++ b/pkgs/development/python-modules/photutils/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "photutils"; - version = "1.13.0"; + version = "2.0.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -32,12 +32,12 @@ buildPythonPackage rec { owner = "astropy"; repo = "photutils"; rev = "refs/tags/${version}"; - hash = "sha256-J1i1H7AfQdiUIyBpgJK3dkH6C8MoEOwug4YQP+NEPbk="; + hash = "sha256-gXtC6O8rXBBa8VMuqxshnJieAahv3bCY2C1BXNmJxb4="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "'numpy>=2.0.0rc1'," "" + --replace-fail "'numpy>=2.0.0'," "" ''; build-system = [ @@ -55,9 +55,10 @@ buildPythonPackage rec { dependencies = [ astropy numpy + scipy ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ bottleneck gwcs @@ -65,7 +66,6 @@ buildPythonPackage rec { rasterio scikit-image scikit-learn - scipy shapely tqdm ]; diff --git a/pkgs/development/python-modules/piccolo-theme/default.nix b/pkgs/development/python-modules/piccolo-theme/default.nix index 49dd8b2c3c4d..5c8bf351b525 100644 --- a/pkgs/development/python-modules/piccolo-theme/default.nix +++ b/pkgs/development/python-modules/piccolo-theme/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "piccolo-theme"; - version = "0.23.0"; + version = "0.24.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "piccolo_theme"; inherit version; - hash = "sha256-jlnKZK2wuEM+n+3Y59U6+LyQJRBUwQAn0NarAGlNdx0="; + hash = "sha256-Cc9w9Lttuk680UlmVQwpIznBHZMclTMiHNPb/+sdG9k="; }; dependencies = [ sphinx ]; diff --git a/pkgs/development/python-modules/picosvg/default.nix b/pkgs/development/python-modules/picosvg/default.nix index 2e938d5115d8..f147b22ad97e 100644 --- a/pkgs/development/python-modules/picosvg/default.nix +++ b/pkgs/development/python-modules/picosvg/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; # a few tests are failing on aarch64 - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; meta = with lib; { description = "Tool to simplify SVGs"; diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix index b0bb834a302f..0add8799be8b 100644 --- a/pkgs/development/python-modules/pid/default.nix +++ b/pkgs/development/python-modules/pid/default.nix @@ -29,8 +29,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - doCheck = true; - meta = with lib; { description = "Pidfile featuring stale detection and file-locking"; homepage = "https://github.com/trbs/pid/"; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 2f3ace4dd7e5..da280313c9e9 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "9.1.1"; + version = "9.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,14 +33,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pikepdf"; repo = "pikepdf"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; # The content of .git_archival.txt is substituted upon tarball creation, # which creates indeterminism if master no longer points to the tag. # See https://github.com/jbarlow83/OCRmyPDF/issues/841 postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-++je4tKnXr504Yl9VBH9dc9fycDrMstRN5hu4s/oe9w="; + hash = "sha256-k50Wg/JvHgOULocUsYRjYH+q1M+5DTFLBZzHC6io+To="; }; patches = [ diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index d512839a797c..caa81ce9720b 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch2, # build-system cmake, @@ -29,24 +28,16 @@ buildPythonPackage rec { pname = "pillow-heif"; - version = "0.17.0"; + version = "0.20.0"; pyproject = true; src = fetchFromGitHub { owner = "bigcat88"; repo = "pillow_heif"; rev = "refs/tags/v${version}"; - hash = "sha256-fKh4UbTVj74YxH2vvL24DNmMxg10GSYAmduwuRneE+0="; + hash = "sha256-a1qCxI+mMuEYsCk2CUYGNKCe+SONuvVizqUvmQKy3sE="; }; - 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 ''; @@ -55,9 +46,10 @@ buildPythonPackage rec { cmake nasm pkg-config - setuptools ]; + build-system = [ setuptools ]; + dontUseCmakeConfigure = true; buildInputs = [ @@ -74,7 +66,7 @@ buildPythonPackage rec { RELEASE_FULL_FLAG = 1; }; - propagatedBuildInputs = [ pillow ]; + dependencies = [ pillow ]; pythonImportsCheck = [ "pillow_heif" ]; @@ -90,12 +82,12 @@ buildPythonPackage rec { # Time based "test_decode_threads" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/bigcat88/pillow_heif/issues/89 # not reproducible in nixpkgs "test_opencv_crash" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # RuntimeError: Encoder plugin generated an error: Unsupported bit depth: Bit depth not supported by x265 "test_open_heif_compare_non_standard_modes_data" "test_open_save_disable_16bit" diff --git a/pkgs/development/python-modules/pillow-jpls/default.nix b/pkgs/development/python-modules/pillow-jpls/default.nix index 7aebaf432c00..a55d6d6740e6 100644 --- a/pkgs/development/python-modules/pillow-jpls/default.nix +++ b/pkgs/development/python-modules/pillow-jpls/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { pypaBuildFlags = [ "-C" - "cmake.args='--preset=sysdeps'" + "cmake.args=--preset=sysdeps" ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix deleted file mode 100644 index e913a10b4fbf..000000000000 --- a/pkgs/development/python-modules/pillow-simd/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - lib, - stdenv, - buildPythonPackage, - fetchFromGitHub, - isPyPy, - isPy3k, - olefile, - freetype, - libjpeg, - zlib, - libtiff, - libwebp, - libxcrypt, - tcl, - lcms2, - libxcb, - tk, - libX11, - openjpeg, - libimagequant, - pyroma, - numpy, - defusedxml, - pytestCheckHook, - setuptools, -}@args: - -import ../pillow/generic.nix ( - rec { - pname = "Pillow-SIMD"; - # check for release version on https://pypi.org/project/Pillow-SIMD/#history - # does not match the latest pillow release version! - version = "9.0.0.post1"; - format = "setuptools"; - - disabled = !isPy3k; - - src = fetchFromGitHub { - owner = "uploadcare"; - repo = "pillow-simd"; - rev = "v${version}"; - hash = "sha256-qTZYhgHjVMXqoYl3mG1xVrFaWrPidSY8HlyFQizV27Y="; - }; - - meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; - homepage = "https://python-pillow.github.io/pillow-perf/"; - description = "Friendly PIL fork - SIMD version"; - longDescription = '' - Pillow-SIMD is "following" Pillow. Pillow-SIMD versions are 100% compatible drop-in replacements for Pillow of the same version. - - SIMD stands for "single instruction, multiple data" and its essence is in performing the same operation on multiple data points simultaneously by using multiple processing elements. Common CPU SIMD instruction sets are MMX, SSE-SSE4, AVX, AVX2, AVX512, NEON. - - Currently, Pillow-SIMD can be compiled with SSE4 (default) or AVX2 support. - ''; - license = licenses.hpnd; - maintainers = [ ]; - }; - } - // args -) diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index b5257f5101d2..30d741052a09 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -3,26 +3,35 @@ stdenv, buildPythonPackage, pythonOlder, - fetchPypi, - isPyPy, - defusedxml, - olefile, + fetchFromGitHub, + + # build-system + setuptools, + pkg-config, + + # native dependencies freetype, + lcms2, + libimagequant, libjpeg, - zlib, + libraqm, libtiff, libwebp, - libxcrypt, - tcl, - lcms2, - tk, - libX11, libxcb, openjpeg, - libimagequant, + tkinter, + zlib, + + # optional dependencies + defusedxml, + olefile, + typing-extensions, + + # tests numpy, + pytest-cov-stub, pytestCheckHook, - setuptools, + # for passthru.tests imageio, matplotlib, @@ -30,45 +39,112 @@ pydicom, reportlab, sage, -}@args: - -import ./generic.nix ( - rec { - pname = "pillow"; - version = "10.4.0"; - format = "pyproject"; - - disabled = pythonOlder "3.8"; - - src = fetchPypi { - pname = "pillow"; - inherit version; - hash = "sha256-Fmwc1NJDCbMNYfefSpEUt7IxPXRQkSJ3hV/139fNSgY="; - }; - - passthru.tests = { - inherit - imageio - matplotlib - pilkit - pydicom - reportlab - sage - ; - }; - - meta = with lib; { - homepage = "https://python-pillow.org/"; - description = "Friendly PIL fork (Python Imaging Library)"; - longDescription = '' - The Python Imaging Library (PIL) adds image processing - capabilities to your Python interpreter. This library - supports many file formats, and provides powerful image - processing and graphics capabilities. - ''; - license = licenses.hpnd; - maintainers = with maintainers; [ prikhi ]; - }; - } - // args -) +}: + +buildPythonPackage rec { + pname = "pillow"; + version = "11.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "python-pillow"; + repo = "pillow"; + rev = "refs/tags/${version}"; + hash = "sha256-vWNqzA2ZfJcWexXw790RgyYtP8WDtahoQIX16otCRnk="; + }; + + build-system = [ setuptools ]; + + nativeBuildInputs = [ pkg-config ]; + + # https://pillow.readthedocs.io/en/latest/installation/building-from-source.html#building-from-source + buildInputs = [ + freetype + lcms2 + libimagequant + libjpeg + libraqm + libtiff + libwebp + libxcb + openjpeg + tkinter + zlib + ]; + + pypaBuildFlags = [ + # Disable platform guessing, which tries various FHS paths + "--config=setting=--disable-platform-guessing" + ]; + + preConfigure = + let + getLibAndInclude = pkg: ''"${pkg.out}/lib", "${lib.getDev pkg}/include"''; + in + '' + # The build process fails to find the pkg-config files for these dependencies + substituteInPlace setup.py \ + --replace-fail 'IMAGEQUANT_ROOT = None' 'IMAGEQUANT_ROOT = ${getLibAndInclude libimagequant}' \ + --replace-fail 'JPEG2K_ROOT = None' 'JPEG2K_ROOT = ${getLibAndInclude openjpeg}' + + # Build with X11 support + export LDFLAGS="$LDFLAGS -L${libxcb}/lib" + export CFLAGS="$CFLAGS -I${libxcb.dev}/include" + ''; + + optional-dependencies = { + fpx = [ olefile ]; + mic = [ olefile ]; + typing = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; + xmp = [ defusedxml ]; + }; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + numpy + ] ++ lib.flatten (lib.attrValues optional-dependencies); + + disabledTests = + [ + # Code quality mismathch 9 vs 10 + "test_pyroma" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Disable darwin tests which require executables: `iconutil` and `screencapture` + "test_grab" + "test_grabclipboard" + "test_save" + ]; + + disabledTestPaths = lib.optionals stdenv.isDarwin [ + # Crashes the interpreter + "Tests/test_imagetk.py" + ]; + + passthru.tests = { + inherit + imageio + matplotlib + pilkit + pydicom + reportlab + sage + ; + }; + + meta = with lib; { + homepage = "https://python-pillow.org"; + changelog = "https://pillow.readthedocs.io/en/stable/releasenotes/${version}.html"; + description = "Friendly PIL fork (Python Imaging Library)"; + longDescription = '' + The Python Imaging Library (PIL) adds image processing + capabilities to your Python interpreter. This library + supports many file formats, and provides powerful image + processing and graphics capabilities. + ''; + license = licenses.mit-cmu; + maintainers = with maintainers; [ hexa ]; + }; + +} diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix deleted file mode 100644 index 36fe5b0421fe..000000000000 --- a/pkgs/development/python-modules/pillow/generic.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ - pname, - version, - src, - patches ? [ ], - meta, - passthru ? { }, - ... -}@args: - -with args; - -buildPythonPackage rec { - inherit - pname - version - format - src - meta - passthru - patches - ; - - # Disable imagefont tests, because they don't work well with infinality: - # https://github.com/python-pillow/Pillow/issues/1259 - postPatch = '' - rm Tests/test_imagefont.py - ''; - - disabledTests = - [ - # Code quality mismathch 9 vs 10 - "test_pyroma" - - # pillow-simd - "test_roundtrip" - "test_basic" - "test_custom_metadata" - ] - ++ lib.optionals stdenv.isDarwin [ - # Disable darwin tests which require executables: `iconutil` and `screencapture` - "test_grab" - "test_grabclipboard" - "test_save" - ]; - - propagatedBuildInputs = [ - olefile - ] ++ lib.optionals (lib.versionAtLeast version "8.2.0") [ defusedxml ]; - - nativeCheckInputs = [ - pytestCheckHook - numpy - ]; - - nativeBuildInputs = [ setuptools ]; - - buildInputs = - [ - freetype - libjpeg - openjpeg - libimagequant - zlib - libtiff - libwebp - libxcrypt - tcl - lcms2 - ] - ++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ] - ++ lib.optionals (isPyPy) [ - tk - libX11 - ]; - - # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. - # NOTE: The Pillow install script will, by default, add paths like /usr/lib - # and /usr/include to the search paths. This can break things when building - # on a non-NixOS system that has some libraries installed that are not - # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't - # build Pillow with this support). We patch the `disable_platform_guessing` - # setting here, instead of passing the `--disable-platform-guessing` - # command-line option, since the command-line option doesn't work when we run - # tests. - preConfigure = - let - libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; - libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; - in - '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; - s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; - s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; - s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; - s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; - s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ; - s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;' - export LDFLAGS="$LDFLAGS -L${libwebp}/lib" - export CFLAGS="$CFLAGS -I${libwebp}/include" - '' - + lib.optionalString (lib.versionAtLeast version "7.1.0") '' - export LDFLAGS="$LDFLAGS -L${libxcb}/lib" - export CFLAGS="$CFLAGS -I${libxcb.dev}/include" - ''; -} diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone-client/default.nix index 38ec710a14f4..a22aa39aa82e 100644 --- a/pkgs/development/python-modules/pinecone-client/default.nix +++ b/pkgs/development/python-modules/pinecone-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pinecone-client"; - version = "4.1.1"; + version = "4.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pinecone_client"; inherit version; - hash = "sha256-sueMKd5QwYDb/nXhXwjIfsGjpPG8ayvh8Myu4atENPo="; + hash = "sha256-+onGBXkuyU3jbUyVhSULR7C2Q0B0VwU+yokAhCS+YoE="; }; pythonRelaxDeps = [ "urllib3" ]; diff --git a/pkgs/development/python-modules/pins/default.nix b/pkgs/development/python-modules/pins/default.nix index 30f9c503c34b..34d224669b3c 100644 --- a/pkgs/development/python-modules/pins/default.nix +++ b/pkgs/development/python-modules/pins/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { xxhash ]; - passthru.optional-dependencies = { + optional-dependencies = { aws = [ s3fs ]; azure = [ adlfs ]; gcs = [ gcsfs ]; @@ -71,7 +71,7 @@ buildPythonPackage rec { pytest-cases pytest-parallel pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "pins" ]; diff --git a/pkgs/development/python-modules/pint-pandas/default.nix b/pkgs/development/python-modules/pint-pandas/default.nix index 3e7f18366266..67e1f109c8e0 100644 --- a/pkgs/development/python-modules/pint-pandas/default.nix +++ b/pkgs/development/python-modules/pint-pandas/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Pandas support for pint"; license = lib.licenses.bsd3; homepage = "https://github.com/hgrecco/pint-pandas"; diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index 51ef03ffc7dd..1339b39505a9 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pint"; - version = "0.24.1"; + version = "0.24.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "hgrecco"; repo = "pint"; rev = "refs/tags/${version}"; - hash = "sha256-PQAQvjMi7pFgNhUbw20vc306aTyEbCQNHGef/pxxpXo="; + hash = "sha256-PJEgwshTBIqmKMEro+IT+7v4dab3qD7I45OuTOJloR0="; }; build-system = [ diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 10f83a4203d8..9d44c2e383e0 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { tomli-w ]; - preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + preCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 export no_proxy='*'; ''; diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 2ba2d47cae9e..559fc84fc3de 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.1"; + version = "2.23.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,9 +25,16 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-yEiehHcJcVC0hjb9NFgsrSxmAsxNki8HNGKk8dEk75s="; + hash = "sha256-wK3RaVq5PwDVAKotkDVEeAMImJxJVN1GceyoKBGBkOY="; }; + postPatch = '' + # only set to ensure py3.13 compat + # https://github.com/tox-dev/pipdeptree/pull/406 + substituteInPlace pyproject.toml \ + --replace-fail '"pip>=24.2"' '"pip"' + ''; + build-system = [ hatchling hatch-vcs @@ -38,7 +45,7 @@ buildPythonPackage rec { packaging ]; - passthru.optional-dependencies = { + optional-dependencies = { graphviz = [ graphviz ]; }; @@ -47,7 +54,7 @@ buildPythonPackage rec { pytest-mock pytestCheckHook virtualenv - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "pipdeptree" ]; diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index 68f3bcd56291..02290a60328e 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.9"; + version = "0.5.10"; 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-oV3HdqDuC0t6manVlBqf4cxAWx6U6CbNpCUsBwfAn+o="; + hash = "sha256-ROi5Yj4Ht91Go2jkm6BQZyaJWtBKHk4ar1ly8jAPGlc="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index a5ad0d280fd8..471aa322d1bf 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pkgs, qtbase, qmake, @@ -10,16 +11,18 @@ buildPythonPackage rec { pname = "pivy"; - version = "0.6.8"; - format = "setuptools"; + version = "0.6.9"; + pyproject = true; src = fetchFromGitHub { owner = "coin3d"; repo = "pivy"; rev = "refs/tags/${version}"; - hash = "sha256-y72nzZAelyRDR2JS73/0jo2x/XiDZpsERPZV3gzIhAI="; + hash = "sha256-wWM8eKTehWCIbRxxWkZ4YrYyeIJuzQaBOUMrW9a5MVo="; }; + build-system = [ setuptools ]; + dontUseCmakeConfigure = true; nativeBuildInputs = with pkgs; [ @@ -60,6 +63,8 @@ buildPythonPackage rec { \$'{Coin_INCLUDE_DIR}'\;\$'{SoQt_INCLUDE_DIRS}' ''; + pythonImportsCheck = [ "pivy" ]; + meta = with lib; { homepage = "https://github.com/coin3d/pivy/"; description = "Python binding for Coin"; diff --git a/pkgs/development/python-modules/pixel-font-builder/default.nix b/pkgs/development/python-modules/pixel-font-builder/default.nix index b080d9f6b627..aab3ba2d8c8f 100644 --- a/pkgs/development/python-modules/pixel-font-builder/default.nix +++ b/pkgs/development/python-modules/pixel-font-builder/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pixel-font-builder"; - version = "0.0.26"; + version = "0.0.28"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pixel_font_builder"; inherit version; - hash = "sha256-bgs2FbOA5tcUXe5+KuVztWGAv5yFxQNBaiZMeZ+ic+8="; + hash = "sha256-2dWouHAldkjPqn/87q2/a47cCFUdf8Kw6tuMUGT/XDc="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix index f94b8382274d..e99565720026 100644 --- a/pkgs/development/python-modules/pkg-about/default.nix +++ b/pkgs/development/python-modules/pkg-about/default.nix @@ -13,15 +13,16 @@ buildPythonPackage rec { pname = "pkg-about"; - version = "1.1.5"; + version = "1.1.8"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "pkg_about"; + inherit version; extension = "zip"; - hash = "sha256-B5u+iJuqHtv4BlGhdWqYxBfS89/S01OXmLyDOQraHfo="; + hash = "sha256-GVV3l0rU8gkxedOiMVVAt0bEqCtyO+1LSHxIKjBlbPk="; }; # tox is listed in build requirements but not actually used to build diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 29a5c749ab98..a1ecf82c6309 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 = "24.0.0"; + version = "27.0.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "plaid_python"; inherit version; - hash = "sha256-0LtYs2S1fGunmmPFl3cGa/lMtE7Ng+Xb4FruowjdWGM="; + hash = "sha256-nMDAJs9W2L3/wB7lOP5hMYF0ytqMVgDLOYzn9UsUVEw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix index 3585d4a7721b..0651404dc477 100644 --- a/pkgs/development/python-modules/plaster/default.nix +++ b/pkgs/development/python-modules/plaster/default.nix @@ -2,7 +2,7 @@ buildPythonPackage, fetchPypi, pytest, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -21,6 +21,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest - pytest-cov + pytest-cov-stub ]; } diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index 4a91f11da2a2..89ec53073e43 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "4.2.2"; + version = "4.3.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "platformdirs"; repo = "platformdirs"; rev = "refs/tags/${version}"; - hash = "sha256-WsHB+Si8RnJ9b8dYA9m7YRin3UYdJlL1v6/v8SExXtY="; + hash = "sha256-Zo1fEqiUbrI3pbVp3ndjV8gd+sbcGgUm1PJhQudmiMQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index 6ad0fe9b1dc6..08462f56a616 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -74,9 +74,12 @@ buildPythonPackage rec { git setuptools-scm setuptools - ] ++ lib.optionals stdenv.isLinux [ auditwheel ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ auditwheel ]; - pythonRelaxDeps = [ "pyee" ]; + pythonRelaxDeps = [ + "greenlet" + "pyee" + ]; propagatedBuildInputs = [ greenlet @@ -99,7 +102,7 @@ buildPythonPackage rec { driver = playwright-driver; browsers = playwright-driver.browsers; } - // lib.optionalAttrs stdenv.isLinux { + // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) playwright-python; }; updateScript = ./update.sh; diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 8717bfa11759..6b2be979b101 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,16 +22,16 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.26.0"; + version = "1.27.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-v6n+zsiLEQHeAeSALDxu4FWwwQaD/zu3rwxIjR57Ly4="; + hash = "sha256-cfgNeUZh492SkgfSJZyaDDeqxC3vHopdIe5UcKHFVck="; }; pythonRelaxDeps = [ @@ -61,7 +61,7 @@ buildPythonPackage rec { w3lib ]; - passthru.optional-dependencies = { + optional-dependencies = { recaptcha = [ speechrecognition pydub diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 38b4ed40dca2..ab177fa01b32 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -1,23 +1,43 @@ { lib, + stdenv, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, packaging, tenacity, kaleido, + pytestCheckHook, + pandas, + requests, + matplotlib, + xarray, + pillow, + scipy, + statsmodels, + ipython, + ipywidgets, + which, + nbformat, + scikit-image, + orca, + psutil, }: buildPythonPackage rec { pname = "plotly"; - version = "5.23.0"; + version = "5.24.1"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-ieV9ADoRYwOjTeZwCGI5E2fdVkIiq3H4Ux33Ann8AZM="; + src = fetchFromGitHub { + owner = "plotly"; + repo = "plotly.py"; + rev = "refs/tags/v${version}"; + hash = "sha256-ONuX5/GlirPF8+7bZtib1Xsv5llcXcSelFfGyeTc5L8="; }; + sourceRoot = "${src.name}/packages/python/plotly"; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "\"jupyterlab~=3.0;python_version>='3.6'\"," "" @@ -33,16 +53,65 @@ buildPythonPackage rec { kaleido ]; - pythonImportsCheck = [ "plotly" ]; + # packages/python/plotly/optional-requirements.txt + optional-dependencies = { + orca = [ + orca + requests + psutil + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + pandas + requests + matplotlib + xarray + pillow + scipy + statsmodels + ipython + ipywidgets + which + nbformat + scikit-image + ]; - # No tests in archive - doCheck = false; + disabledTests = [ + # failed pinning test, sensitive to dep versions + "test_legend_dots" + "test_linestyle" + # test bug, i assume sensitive to dep versions + "test_sanitize_json" + # requires vaex and polars, vaex is not packaged + "test_build_df_from_vaex_and_polars" + "test_build_df_with_hover_data_from_vaex_and_polars" + # lazy loading error, could it be the sandbox PYTHONPATH? + # AssertionError: assert "plotly" not in sys.modules + "test_dependencies_not_imported" + "test_lazy_imports" + ]; + disabledTestPaths = + [ + # unable to locate orca binary, adding the package does not fix it + "plotly/tests/test_orca/" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # requires local networking + "plotly/tests/test_io/test_renderers.py" + # fails to launch kaleido subprocess + "plotly/tests/test_optional/test_kaleido" + ]; + + pythonImportsCheck = [ "plotly" ]; - meta = with lib; { + meta = { description = "Python plotting library for collaborative, interactive, publication-quality graphs"; - downloadPage = "https://github.com/plotly/plotly.py"; homepage = "https://plot.ly/python/"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ pandapip1 ]; + downloadPage = "https://github.com/plotly/plotly.py"; + changelog = "https://github.com/plotly/plotly.py/blob/master/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pandapip1 ]; }; } diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index f94ac77898f3..4490f4c5855e 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -2,31 +2,34 @@ lib, buildPythonPackage, fetchFromGitHub, - geopandas, + + # build-system + setuptools-scm, + + # dependencies matplotlib, mizani, pandas, patsy, - pytestCheckHook, - pythonOlder, - scikit-misc, scipy, - setuptools-scm, statsmodels, + + # tests + geopandas, + pytestCheckHook, + scikit-misc, }: buildPythonPackage rec { pname = "plotnine"; - version = "0.13.6"; + version = "0.14.1"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "has2k1"; repo = "plotnine"; rev = "refs/tags/v${version}"; - hash = "sha256-/yxRYK3ZTrYj+l3TQhFllyICnJjCZPd4ebNurCLZAYg="; + hash = "sha256-K2Feqg3UiffZ4izYzrCW+iu7dH61sItOUVtwvzTMth0="; }; postPatch = '' @@ -36,8 +39,6 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; - pythonRelaxDeps = [ "mizani" ]; - dependencies = [ matplotlib mizani diff --git a/pkgs/development/python-modules/plotpy/default.nix b/pkgs/development/python-modules/plotpy/default.nix new file mode 100644 index 000000000000..081a9bc25f95 --- /dev/null +++ b/pkgs/development/python-modules/plotpy/default.nix @@ -0,0 +1,117 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + cython_0, + setuptools, + + # dependencies + guidata, + numpy, + pillow, + pythonqwt, + scikit-image, + scipy, + tifffile, + + # tests + pytestCheckHook, + qt6, + pyqt6, + + # passthru.tests + plotpy, + pyside6, + qt5, + pyqt5, + pyside2, +}: + +buildPythonPackage rec { + pname = "plotpy"; + version = "2.6.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "PlotPyStack"; + repo = "PlotPy"; + rev = "refs/tags/v${version}"; + hash = "sha256-kMVq8X6XP18B5x35BTuC7Q5uFFwds1JxCaxlDuD/UfE="; + }; + + build-system = [ + cython_0 + setuptools + ]; + # Both numpy versions are supported, see: + # https://github.com/PlotPyStack/PlotPy/blob/v2.6.2/pyproject.toml#L8-L9 + postConfigure = '' + substituteInPlace pyproject.toml \ + --replace-fail 'numpy >= 2.0.0' numpy + ''; + + dependencies = [ + guidata + numpy + pillow + pythonqwt + scikit-image + scipy + tifffile + ]; + + nativeCheckInputs = [ + pytestCheckHook + # Not propagating this, to allow one to choose to choose a pyqt / pyside + # implementation. + pyqt6 + ]; + + preCheck = '' + export QT_PLUGIN_PATH="${lib.getBin qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}" + export QT_QPA_PLATFORM=offscreen + # https://github.com/NixOS/nixpkgs/issues/255262 + cd $out + ''; + + pythonImportsCheck = [ + "plotpy" + "plotpy.tests" + ]; + + passthru = { + tests = { + # Upstream doesn't officially supports all of them, although they use + # qtpy, see: https://github.com/PlotPyStack/PlotPy/issues/20 . When this + # package was created, all worked besides withPySide2, with which there + # was a peculiar segmentation fault during the tests. In anycase, PySide2 + # shouldn't be used for modern applications. + withPyQt6 = plotpy.override { + pyqt6 = pyqt6; + qt6 = qt6; + }; + withPySide6 = plotpy.override { + pyqt6 = pyside6; + qt6 = qt6; + }; + withPyQt5 = plotpy.override { + pyqt6 = pyqt5; + qt6 = qt5; + }; + withPySide2 = plotpy.override { + pyqt6 = pyside2; + qt6 = qt5; + }; + }; + }; + + meta = { + description = "Curve and image plotting tools for Python/Qt applications"; + homepage = "https://github.com/PlotPyStack/PlotPy"; + changelog = "https://github.com/PlotPyStack/PlotPy/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index df9072936676..8bfa57692252 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-CVgcqyg5DDtEJxE/oen5MJP+mV4B+Sq0uopEZTOCfV0="; + hash = "sha256-WcoHK8UZ7qOVoUBCSoTDZ+6fC568AyXFCBys/7sjJx8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index 42a9234a08d0..4f2227563068 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -2,46 +2,47 @@ lib, buildPythonPackage, fetchFromGitHub, - hatchling, hatch-vcs, - openssh, - ps, + hatchling, + paramiko, psutil, + pytest-cov-stub, pytest-mock, pytest-timeout, pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "plumbum"; - version = "1.8.3"; - format = "pyproject"; + version = "1.9.0"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "tomerfiliba"; repo = "plumbum"; rev = "refs/tags/v${version}"; - hash = "sha256-k2H/FBQAWrCN1P587s/OhiCGNasMKEFJYIBIU808rlE="; + hash = "sha256-3PAvSjZ0+BMq+/g4qNNZl27KnAm01fWFYxBBY+feNTU="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace '"--cov-config=setup.cfg", ' "" - ''; - - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs ]; + optional-dependencies = { + ssh = [ paramiko ]; + }; + nativeCheckInputs = [ - openssh - ps psutil + pytest-cov-stub pytest-mock pytest-timeout pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export HOME=$TMP @@ -63,9 +64,9 @@ buildPythonPackage rec { ]; meta = with lib; { + description = "Module Shell Combinators"; changelog = "https://github.com/tomerfiliba/plumbum/releases/tag/v${version}"; - description = " Plumbum: Shell Combinators"; - homepage = " https://github.com/tomerfiliba/plumbum "; + homepage = " https://github.com/tomerfiliba/plumbum"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/plyer/default.nix b/pkgs/development/python-modules/plyer/default.nix index 6a77e4a56005..f0398ac86235 100644 --- a/pkgs/development/python-modules/plyer/default.nix +++ b/pkgs/development/python-modules/plyer/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "plyer" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Plyer is a platform-independent api to use features commonly found on various platforms"; homepage = "https://github.com/kivy/plyer"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pmdsky-debug-py/default.nix b/pkgs/development/python-modules/pmdsky-debug-py/default.nix index 81b37969126c..436a8bbd15dd 100644 --- a/pkgs/development/python-modules/pmdsky-debug-py/default.nix +++ b/pkgs/development/python-modules/pmdsky-debug-py/default.nix @@ -8,7 +8,7 @@ #This package is auto-generated. It could totally be possible to generate it from upstream, but seems unecessary buildPythonPackage rec { pname = "pmdsky-debug-py"; - version = "8.0.4"; + version = "10.0.21"; pyproject = true; # SkyTemple specifically require this version. This is used when patching the binary, # and risk to be a bit problematic if using the latest version, given it doesn’t follow semver. @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "sha256-D81vXhYGxwvy26PvicniCLiS58LmrSP9ppzXKRzQSJc="; + sha256 = "sha256-uhLmEViiJ5+2Aw9MJP8GL7nhk8lMPcRZRB8WTDFXe+s="; }; prePatch = "cd src"; diff --git a/pkgs/development/python-modules/pocketsphinx/default.nix b/pkgs/development/python-modules/pocketsphinx/default.nix new file mode 100644 index 000000000000..16a173efc62d --- /dev/null +++ b/pkgs/development/python-modules/pocketsphinx/default.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + buildPythonPackage, + cmake, + cython, + fetchFromGitHub, + memory-profiler, + ninja, + pathspec, + pocketsphinx, + pytestCheckHook, + scikit-build, + scikit-build-core, + sounddevice, +}: + +buildPythonPackage rec { + inherit (pocketsphinx) version src; + pname = "pocketsphinx"; + pyproject = true; + + dontUseCmakeConfigure = true; + + env.CMAKE_ARGS = lib.cmakeBool "USE_INSTALLED_POCKETSPHINX" true; + + buildInputs = [ pocketsphinx ]; + + build-system = [ + cmake + cython + ninja + pathspec + scikit-build-core + ]; + + dependencies = [ sounddevice ]; + + nativeCheckInputs = [ + memory-profiler + pytestCheckHook + ]; + + pythonImportsCheck = [ "pocketsphinx" ]; + + meta = with lib; { + description = "Small speech recognizer"; + homepage = "https://github.com/cmusphinx/pocketsphinx"; + changelog = "https://github.com/cmusphinx/pocketsphinx/blob/v${version}/NEWS"; + license = with licenses; [ + bsd2 + bsd3 + mit + ]; + maintainers = with maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix index 11f3a62535b4..14525a16d8d8 100644 --- a/pkgs/development/python-modules/podman/default.nix +++ b/pkgs/development/python-modules/podman/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { urllib3 ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { progress_bar = [ rich ]; }; diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index fec055b429bd..e3a0ffe1e75c 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.9.0"; - format = "pyproject"; + version = "1.9.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python-poetry"; - repo = pname; - rev = version; - hash = "sha256-vvwKbzGlvv2LTbXfJxQVM3nUXFGntgJxsku6cbRxCzw="; + repo = "poetry-core"; + rev = "refs/tags/${version}"; + hash = "sha256-L8lR9sUdRYqjkDCQ0XHXZm5X6xD40t1gxlGiovvb/+8="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index 690a155d056e..7071303df807 100644 --- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "poetry-dynamic-versioning"; - version = "1.4.0"; + version = "1.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dhAqDRMRcIYUluYgBlhyPPDZTnLlDrhcAOnT0dHk3Mo="; + hash = "sha256-2iC665bOCr5JEcuypgr57bHSRYc3PuetJ9uPvFLsgZM="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/polars/Cargo.lock b/pkgs/development/python-modules/polars/Cargo.lock index 94a0a87e3d8c..37d2c8c3717e 100644 --- a/pkgs/development/python-modules/polars/Cargo.lock +++ b/pkgs/development/python-modules/polars/Cargo.lock @@ -1,23 +1,17 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] name = "adler2" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -36,7 +30,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "const-random", "getrandom", "once_cell", "version_check", @@ -102,9 +95,9 @@ checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "apache-avro" @@ -134,9 +127,9 @@ dependencies = [ [[package]] name = "arboard" -version = "3.4.0" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" +checksum = "df099ccb16cd014ff054ac1bf392c67feeef57164b05c42f037cd40f5d4357f4" dependencies = [ "clipboard-win", "log", @@ -164,9 +157,9 @@ checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76" [[package]] name = "arrayref" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" @@ -175,51 +168,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] -name = "arrow-array" -version = "52.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f4a9468c882dc66862cef4e1fd8423d47e67972377d85d80e022786427768c" -dependencies = [ - "ahash", - "arrow-buffer", - "arrow-data", - "arrow-schema", - "chrono", - "half", - "hashbrown", - "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-data" -version = "52.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd9d6f18c65ef7a2573ab498c374d8ae364b4a4edf67105357491c031f716ca5" -dependencies = [ - "arrow-buffer", - "arrow-schema", - "half", - "num", -] - -[[package]] -name = "arrow-schema" -version = "52.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e972cd1ff4a4ccd22f86d3e53e835c2ed92e0eea6a3e8eadb72b4f1ac802cf8" - -[[package]] name = "arrow2" version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -241,9 +189,9 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" dependencies = [ "async-stream-impl", "futures-core", @@ -252,24 +200,24 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] @@ -295,9 +243,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "avro-schema" @@ -317,9 +265,9 @@ dependencies = [ [[package]] name = "aws-config" -version = "1.5.5" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e95816a168520d72c0e7680c405a5a8c1fb6a035b4bc4b9d7b0de8e1a941697" +checksum = "8191fb3091fa0561d1379ef80333c3c7191c6f0435d986e85821bcf7acbd1126" dependencies = [ "aws-credential-types", "aws-runtime", @@ -347,9 +295,9 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16838e6c9e12125face1c1eff1343c75e3ff540de98ff7ebd61874a89bcfeb9" +checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -359,15 +307,16 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.4.0" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f42c2d4218de4dcd890a109461e2f799a1a2ba3bcd2cde9af88360f5df9266c6" +checksum = "a10d5c055aa540164d9561a0e2e74ad30f0dcf7393c3a92f6733ddf9c5762468" dependencies = [ "aws-credential-types", "aws-sigv4", "aws-smithy-async", "aws-smithy-eventstream", "aws-smithy-http", + "aws-smithy-runtime", "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", @@ -419,9 +368,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.39.0" +version = "1.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11822090cf501c316c6f75711d77b96fba30658e3867a7762e5e2f5d32d31e81" +checksum = "0b90cfe6504115e13c41d3ea90286ede5aa14da294f3fe077027a6e83850843c" dependencies = [ "aws-credential-types", "aws-runtime", @@ -441,9 +390,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.40.0" +version = "1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a2a06ff89176123945d1bbe865603c4d7101bea216a550bb4d2e4e9ba74d74" +checksum = "167c0fad1f212952084137308359e8e4c4724d1c643038ce163f06de9662c1d0" dependencies = [ "aws-credential-types", "aws-runtime", @@ -463,9 +412,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.39.0" +version = "1.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20a91795850826a6f456f4a48eff1dfa59a0e69bdbf5b8c50518fd372106574" +checksum = "2cb5f98188ec1435b68097daa2a37d74b9d17c9caa799466338a8d1544e71b9d" dependencies = [ "aws-credential-types", "aws-runtime", @@ -486,9 +435,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.2.3" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5df1b0fa6be58efe9d4ccc257df0a53b89cd8909e86591a13ca54817c87517be" +checksum = "cc8db6904450bafe7473c6ca9123f88cc11089e41a025408f992db4e22d3be68" dependencies = [ "aws-credential-types", "aws-smithy-eventstream", @@ -547,9 +496,9 @@ dependencies = [ [[package]] name = "aws-smithy-eventstream" -version = "0.60.4" +version = "0.60.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858" +checksum = "cef7d0a272725f87e51ba2bf89f8c21e4df61b9e49ae1ac367a6d69916ef7c90" dependencies = [ "aws-smithy-types", "bytes", @@ -558,9 +507,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.60.9" +version = "0.60.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9cd0ae3d97daa0a2bf377a4d8e8e1362cae590c4a1aad0d40058ebca18eb91e" +checksum = "5c8bc3e8fdc6b8d07d976e301c02fe553f72a39b7a9fea820e023268467d7ab6" dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", @@ -598,9 +547,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.6.3" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0abbf454960d0db2ad12684a1640120e7557294b0ff8e2f11236290a1b293225" +checksum = "d1ce695746394772e7000b39fe073095db6d45a862d0767dd5ad0ac0d7f8eb87" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -642,9 +591,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.2" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cee7cadb433c781d3299b916fbf620fea813bf38f49db282fb6858141a05cc8" +checksum = "147100a7bea70fa20ef224a6bad700358305f5dc0f84649c53769761395b355b" dependencies = [ "base64-simd", "bytes", @@ -668,9 +617,9 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.60.8" +version = "0.60.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d123fbc2a4adc3c301652ba8e149bf4bc1d1725affb9784eb20c953ace06bf55" +checksum = "ab0b0166827aa700d3dc519f72f8b3a91c35d0b8d042dc5d643a91e6f80648fc" dependencies = [ "xmlparser", ] @@ -691,17 +640,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide 0.7.4", + "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -823,17 +772,6 @@ dependencies = [ ] [[package]] -name = "built" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" -dependencies = [ - "cargo-lock", - "chrono", - "git2", -] - -[[package]] name = "bumpalo" version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -841,9 +779,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" dependencies = [ "bytemuck_derive", ] @@ -856,7 +794,7 @@ checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] @@ -867,9 +805,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bytes-utils" @@ -882,18 +820,6 @@ dependencies = [ ] [[package]] -name = "cargo-lock" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" -dependencies = [ - "semver", - "serde", - "toml", - "url", -] - -[[package]] name = "casey" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -919,9 +845,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.14" +version = "1.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932" +checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" dependencies = [ "jobserver", "libc", @@ -998,18 +924,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" dependencies = [ "anstyle", "clap_lex", @@ -1073,30 +999,10 @@ 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 = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "core-foundation" @@ -1125,9 +1031,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -1402,7 +1308,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] @@ -1433,9 +1339,9 @@ dependencies = [ [[package]] name = "error-code" -version = "3.2.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" +checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f" [[package]] name = "ethnum" @@ -1473,13 +1379,13 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "libz-ng-sys", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -1498,6 +1404,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + +[[package]] name = "foreign_vec" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1578,7 +1490,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] @@ -1646,22 +1558,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - -[[package]] -name = "git2" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" -dependencies = [ - "bitflags", - "libc", - "libgit2-sys", - "log", - "url", -] +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "glob" @@ -1726,7 +1625,6 @@ checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", - "num-traits", ] [[package]] @@ -1735,7 +1633,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8588661a8607108a5ca69cab034063441a0413a0b041c13618a7dd348021ef6f" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", "serde", ] @@ -1758,6 +1656,19 @@ dependencies = [ ] [[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", + "rayon", + "serde", +] + +[[package]] name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1863,9 +1774,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -1941,16 +1852,16 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http 1.1.0", "hyper 1.4.1", "hyper-util", - "rustls 0.23.12", - "rustls-native-certs 0.7.2", + "rustls 0.23.13", + "rustls-native-certs 0.8.0", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -1959,9 +1870,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.7" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes", "futures-channel", @@ -1972,16 +1883,15 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", "tower-service", "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2012,12 +1922,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.0", "serde", ] @@ -2035,9 +1945,9 @@ checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is-terminal" @@ -2136,74 +2046,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[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.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libflate" @@ -2245,30 +2091,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d" dependencies = [ "core2", - "hashbrown", + "hashbrown 0.14.5", "rle-decode-fast", ] [[package]] -name = "libgit2-sys" -version = "0.17.0+1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" -dependencies = [ - "cc", - "libc", - "libz-sys", - "pkg-config", -] - -[[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.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -2298,18 +2132,6 @@ dependencies = [ ] [[package]] -name = "libz-sys" -version = "1.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] name = "linux-raw-sys" version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2337,24 +2159,23 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", ] [[package]] name = "lz4" -version = "1.26.0" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958b4caa893816eea05507c20cfe47574a43d9a697138a7872990bba8a0ece68" +checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725" dependencies = [ - "libc", "lz4-sys", ] [[package]] name = "lz4-sys" -version = "1.10.0" +version = "1.11.1+lz4-1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868" +checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6" dependencies = [ "cc", "libc", @@ -2430,15 +2251,6 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" @@ -2512,20 +2324,6 @@ dependencies = [ ] [[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" @@ -2561,28 +2359,6 @@ dependencies = [ ] [[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" @@ -2707,9 +2483,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.3" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -2735,7 +2511,7 @@ dependencies = [ "rand", "reqwest", "ring", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.2.0", "serde", "serde_json", "snafu", @@ -2747,9 +2523,12 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" +dependencies = [ + "portable-atomic", +] [[package]] name = "oorandom" @@ -2804,16 +2583,6 @@ dependencies = [ ] [[package]] -name = "parquet-format-safe" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1131c54b167dd4e4799ce762e1ab01549ebb94d5bdd13e6ec1b467491c378e1f" -dependencies = [ - "async-trait", - "futures", -] - -[[package]] name = "parse-zoneinfo" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2867,26 +2636,6 @@ dependencies = [ ] [[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.76", -] - -[[package]] name = "pin-project-lite" version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2910,9 +2659,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "planus" @@ -2925,9 +2674,9 @@ dependencies = [ [[package]] name = "plotters" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" dependencies = [ "num-traits", "plotters-backend", @@ -2938,15 +2687,15 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" [[package]] name = "plotters-svg" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" +checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" dependencies = [ "plotters-backend", ] @@ -2957,7 +2706,6 @@ version = "0.43.1" dependencies = [ "ahash", "apache-avro", - "arrow-buffer", "avro-schema", "either", "ethnum", @@ -2986,10 +2734,6 @@ name = "polars-arrow" version = "0.43.1" dependencies = [ "ahash", - "arrow-array", - "arrow-buffer", - "arrow-data", - "arrow-schema", "async-stream", "atoi", "atoi_simd", @@ -3007,7 +2751,7 @@ dependencies = [ "flate2", "futures", "getrandom", - "hashbrown", + "hashbrown 0.15.0", "hex", "indexmap", "itoa", @@ -3023,7 +2767,7 @@ dependencies = [ "proptest", "rand", "regex", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", "ryu", "sample-arrow2", "sample-std", @@ -3032,6 +2776,7 @@ dependencies = [ "simdutf8", "streaming-iterator", "strength_reduce", + "strum_macros", "tokio", "tokio-util", "version_check", @@ -3070,7 +2815,6 @@ name = "polars-core" version = "0.43.1" dependencies = [ "ahash", - "arrow-array", "bincode", "bitflags", "bytemuck", @@ -3078,7 +2822,8 @@ dependencies = [ "chrono-tz", "comfy-table", "either", - "hashbrown", + "hashbrown 0.14.5", + "hashbrown 0.15.0", "indexmap", "ndarray", "num-traits", @@ -3095,6 +2840,7 @@ dependencies = [ "regex", "serde", "serde_json", + "strum_macros", "thiserror", "version_check", "xxhash-rust", @@ -3132,6 +2878,8 @@ version = "0.43.1" dependencies = [ "ahash", "bitflags", + "hashbrown 0.15.0", + "num-traits", "once_cell", "polars-arrow", "polars-compute", @@ -3140,6 +2888,7 @@ dependencies = [ "polars-json", "polars-ops", "polars-plan", + "polars-row", "polars-time", "polars-utils", "rayon", @@ -3169,7 +2918,7 @@ dependencies = [ "fs4", "futures", "glob", - "hashbrown", + "hashbrown 0.15.0", "home", "itoa", "memchr", @@ -3186,6 +2935,7 @@ dependencies = [ "polars-schema", "polars-time", "polars-utils", + "pyo3", "rayon", "regex", "reqwest", @@ -3209,7 +2959,7 @@ dependencies = [ "chrono", "chrono-tz", "fallible-streaming-iterator", - "hashbrown", + "hashbrown 0.15.0", "indexmap", "itoa", "num-traits", @@ -3282,7 +3032,7 @@ dependencies = [ "chrono", "chrono-tz", "either", - "hashbrown", + "hashbrown 0.15.0", "hex", "indexmap", "jsonpath_lib_polars_vendor", @@ -3299,8 +3049,10 @@ dependencies = [ "rand_distr", "rayon", "regex", + "regex-syntax 0.8.5", "serde", "serde_json", + "strum_macros", "unicode-reverse", "version_check", ] @@ -3318,14 +3070,14 @@ dependencies = [ "fallible-streaming-iterator", "flate2", "futures", - "hashbrown", + "hashbrown 0.15.0", "lz4", "lz4_flex", "num-traits", - "parquet-format-safe", "polars-arrow", "polars-compute", "polars-error", + "polars-parquet-format", "polars-utils", "rand", "serde", @@ -3337,6 +3089,15 @@ dependencies = [ ] [[package]] +name = "polars-parquet-format" +version = "2.10.0" +source = "git+https://github.com/pola-rs/parquet-format#b96e00d2b054739ee02da06987bcd7f44b82a4ef" +dependencies = [ + "async-trait", + "futures", +] + +[[package]] name = "polars-pipe" version = "0.43.1" dependencies = [ @@ -3344,7 +3105,7 @@ dependencies = [ "crossbeam-queue", "enum_dispatch", "futures", - "hashbrown", + "hashbrown 0.15.0", "num-traits", "polars-arrow", "polars-compute", @@ -3374,9 +3135,10 @@ dependencies = [ "ciborium", "either", "futures", - "hashbrown", + "hashbrown 0.15.0", "libloading", "memmap2", + "num-traits", "once_cell", "percent-encoding", "polars-arrow", @@ -3417,8 +3179,10 @@ dependencies = [ "polars", "polars-core", "polars-error", + "polars-expr", "polars-io", "polars-lazy", + "polars-mem-engine", "polars-ops", "polars-parquet", "polars-plan", @@ -3517,6 +3281,7 @@ dependencies = [ "polars-utils", "regex", "serde", + "strum_macros", ] [[package]] @@ -3527,13 +3292,14 @@ dependencies = [ "bytemuck", "bytes", "compact_str", - "hashbrown", + "hashbrown 0.15.0", "indexmap", "libc", "memmap2", "num-traits", "once_cell", "polars-error", + "pyo3", "rand", "raw-cpuid", "rayon", @@ -3545,9 +3311,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "powerfmt" @@ -3585,7 +3351,7 @@ dependencies = [ "rand", "rand_chacha", "rand_xorshift", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", "unarray", ] @@ -3614,18 +3380,17 @@ dependencies = [ [[package]] name = "psm" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" dependencies = [ "cc", ] [[package]] name = "py-polars" -version = "1.7.1" +version = "1.12.0" dependencies = [ - "built", "jemallocator", "libc", "mimalloc", @@ -3683,7 +3448,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] @@ -3696,20 +3461,20 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] name = "quad-rand" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658fa1faf7a4cc5f057c9ee5ef560f717ad9d8dc66d975267f709624d6e1ab88" +checksum = "b76f1009795ca44bb5aaae8fd3f18953e209259c33d9b059b1f53d58ab7511db" [[package]] name = "quick-xml" -version = "0.36.1" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "memchr", "serde", @@ -3728,16 +3493,16 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", "rustc-hash 2.0.0", - "rustls 0.23.12", + "rustls 0.23.13", "socket2", "thiserror", "tokio", @@ -3754,7 +3519,7 @@ dependencies = [ "rand", "ring", "rustc-hash 2.0.0", - "rustls 0.23.12", + "rustls 0.23.13", "slab", "thiserror", "tinyvec", @@ -3763,15 +3528,15 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" dependencies = [ "libc", "once_cell", "socket2", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3844,9 +3609,9 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "11.1.0" +version = "11.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d" +checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0" dependencies = [ "bitflags", ] @@ -3894,14 +3659,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b" dependencies = [ "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags", ] @@ -3923,30 +3688,30 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", ] [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", ] [[package]] @@ -3963,15 +3728,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.12.7" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ "base64 0.22.1", "bytes", @@ -3983,7 +3748,7 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "hyper 1.4.1", - "hyper-rustls 0.27.2", + "hyper-rustls 0.27.3", "hyper-util", "ipnet", "js-sys", @@ -3993,9 +3758,9 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.12", - "rustls-native-certs 0.7.2", - "rustls-pemfile 2.1.3", + "rustls 0.23.13", + "rustls-native-certs 0.8.0", + "rustls-pemfile 2.2.0", "rustls-pki-types", "serde", "serde_json", @@ -4065,18 +3830,18 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags", "errno", @@ -4099,14 +3864,14 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.102.6", + "rustls-webpki 0.102.8", "subtle", "zeroize", ] @@ -4125,12 +3890,12 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", "security-framework", @@ -4147,19 +3912,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" [[package]] name = "rustls-webpki" @@ -4173,9 +3937,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -4251,11 +4015,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4303,9 +4067,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -4316,15 +4080,12 @@ name = "semver" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" -dependencies = [ - "serde", -] [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -4340,20 +4101,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "indexmap", "itoa", @@ -4363,15 +4124,6 @@ dependencies = [ ] [[package]] -name = "serde_spanned" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" -dependencies = [ - "serde", -] - -[[package]] name = "serde_urlencoded" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4432,14 +4184,13 @@ dependencies = [ [[package]] name = "simd-json" -version = "0.13.10" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "570c430b3d902ea083097e853263ae782dfe40857d93db019a12356c8e8143fa" +checksum = "05f0b376aada35f30a0012f5790e50aed62f91804a0682669aefdbe81c7fcb91" dependencies = [ "ahash", "getrandom", "halfbrown", - "lexical-core", "once_cell", "ref-cast", "serde", @@ -4450,9 +4201,9 @@ dependencies = [ [[package]] name = "simdutf8" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "siphasher" @@ -4549,15 +4300,15 @@ dependencies = [ [[package]] name = "stacker" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a5daa25ea337c85ed954c0496e3bdd2c7308cc3b24cf7b50d04876654c579f" +checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b" dependencies = [ "cc", "cfg-if", "libc", "psm", - "windows-sys 0.36.1", + "windows-sys 0.59.0", ] [[package]] @@ -4603,7 +4354,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] @@ -4625,9 +4376,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.76" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -4645,9 +4396,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.31.3" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b92e0bdf838cbc1c4c9ba14f9c97a7ec6cdcd1ae66b10e1e42775a25553f45d" +checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be" dependencies = [ "core-foundation-sys", "libc", @@ -4670,9 +4421,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", @@ -4683,22 +4434,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] @@ -4732,15 +4483,6 @@ 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 = "tinytemplate" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4767,9 +4509,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.3" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -4790,7 +4532,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] @@ -4809,16 +4551,16 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.12", + "rustls 0.23.13", "rustls-pki-types", "tokio", ] [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -4829,61 +4571,6 @@ dependencies = [ ] [[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - -[[package]] name = "tower-service" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4908,7 +4595,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] @@ -4953,7 +4640,7 @@ checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] @@ -4970,21 +4657,21 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] @@ -5000,15 +4687,15 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unindent" @@ -5051,9 +4738,9 @@ dependencies = [ [[package]] name = "value-trait" -version = "0.8.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad8db98c1e677797df21ba03fca7d3bf9bec3ca38db930954e4fe6e1ea27eb4" +checksum = "bcaa56177466248ba59d693a048c0959ddb67f1151b963f904306312548cf392" dependencies = [ "float-cmp", "halfbrown", @@ -5062,12 +4749,6 @@ dependencies = [ ] [[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" @@ -5126,7 +4807,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", "wasm-bindgen-shared", ] @@ -5160,7 +4841,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5173,9 +4854,9 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" dependencies = [ "futures-util", "js-sys", @@ -5264,7 +4945,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] @@ -5275,7 +4956,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] @@ -5319,19 +5000,6 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - -[[package]] -name = "windows-sys" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" @@ -5393,12 +5061,6 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" @@ -5411,12 +5073,6 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" @@ -5435,12 +5091,6 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" @@ -5453,12 +5103,6 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" @@ -5483,12 +5127,6 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" @@ -5500,15 +5138,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 = "x11rb" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5555,7 +5184,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index 7535ae218c54..e552bd6941cc 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -2,98 +2,304 @@ lib, stdenv, buildPythonPackage, - rustPlatform, + cargo, cmake, - libiconv, + darwin, fetchFromGitHub, + pkg-config, + pkgs, # zstd hidden by python3Packages.zstd + pytestCheckHook, + pytest-codspeed ? null, # Not in Nixpkgs + pytest-cov, + pytest-xdist, + pytest-benchmark, + rustc, + rustPlatform, + runCommand, + + mimalloc, jemalloc, rust-jemalloc-sys, - darwin, + # Another alternative is to try `mimalloc` + polarsMemoryAllocator ? mimalloc, # polarsJemalloc, + polarsJemalloc ? + let + jemalloc' = rust-jemalloc-sys.override { + jemalloc = jemalloc.override { + # "libjemalloc.so.2: cannot allocate memory in static TLS block" + + # https://github.com/pola-rs/polars/issues/5401#issuecomment-1300998316 + disableInitExecTls = true; + }; + }; + in + assert builtins.elem "--disable-initial-exec-tls" jemalloc'.configureFlags; + jemalloc', + + polars, + python, }: let - rust-jemalloc-sys' = rust-jemalloc-sys.override { - jemalloc = jemalloc.override { disableInitExecTls = true; }; - }; + version = "1.12.0"; + + # Hide symbols to prevent accidental use + rust-jemalloc-sys = throw "polars: use polarsMemoryAllocator over rust-jemalloc-sys"; + jemalloc = throw "polars: use polarsMemoryAllocator over jemalloc"; in -buildPythonPackage rec { +buildPythonPackage { pname = "polars"; - version = "1.7.1"; - pyproject = true; + inherit version; src = fetchFromGitHub { owner = "pola-rs"; repo = "polars"; - rev = "refs/tags/py-${version}"; - hash = "sha256-vbligrFrCd7BiPV8n1iRIlurPNirJKOiD4/P5qEpirg="; + rev = "py-${version}"; + hash = "sha256-q//vt8FvVKY9N/BOIoOwxaSB/F/tNX1Zl/9jd0AzSH4="; }; - # Cargo.lock file is sometimes behind actual release which throws an error, - # thus the `sed` command - # Make sure to check that the right substitutions are made when updating the package - preBuild = '' - #sed -i 's/version = "0.18.0"/version = "${version}"/g' Cargo.lock + # Do not type-check assertions because some of them use unstable features (`is_none_or`) + postPatch = '' + while IFS= read -r -d "" path ; do + sed -i 's \(\s*\)debug_assert! \1#[cfg(debug_assertions)]\n\1debug_assert! ' "$path" + done < <( find -iname '*.rs' -print0 ) ''; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { "numpy-0.21.0" = "sha256-u0Z+6L8pXSPaA3cE1sUpY6sCoaU1clXUcj/avnNzmsw="; + "polars-parquet-format-2.10.0" = "sha256-iB3KZ72JSp7tJCLn9moukpDEGf9MUos04rIQ9rDGWfI="; }; }; - buildAndTestSubdir = "py-polars"; + requiredSystemFeatures = [ "big-parallel" ]; - # Revisit this whenever package or Rust is upgraded - RUSTC_BOOTSTRAP = 1; + build-system = [ rustPlatform.maturinBuildHook ]; - # trick taken from the polars repo since there seems to be a problem - # with simd enabled with our stable rust (instead of nightly). - maturinBuildFlags = [ - "--no-default-features" - "--all-features" + nativeBuildInputs = [ + cargo + pkg-config + cmake # libz-ng-sys + rustPlatform.cargoSetupHook + rustPlatform.cargoBuildHook + rustPlatform.cargoInstallHook + rustc ]; - dontUseCmakeConfigure = true; - - nativeBuildInputs = + buildInputs = [ - # needed for libz-ng-sys - # TODO: use pkgs.zlib-ng - cmake + polarsMemoryAllocator + (pkgs.__splicedPackages.zstd or pkgs.zstd) ] - ++ (with rustPlatform; [ - cargoSetupHook - maturinBuildHook - ]); - - buildInputs = - [ rust-jemalloc-sys' ] ++ lib.optionals stdenv.isDarwin [ - libiconv darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration ]; - # nativeCheckInputs = [ - # pytestCheckHook - # fixtures - # graphviz - # matplotlib - # networkx - # numpy - # pydot - # ]; + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + + # https://github.com/NixOS/nixpkgs/blob/5c38beb516f8da3a823d94b746dd3bf3c6b9bbd7/doc/languages-frameworks/rust.section.md#using-community-maintained-rust-toolchains-using-community-maintained-rust-toolchains + # https://discourse.nixos.org/t/nixpkgs-rustplatform-and-nightly/22870 + RUSTC_BOOTSTRAP = true; + + # Several `debug_assert!` statements use the unstable `Option::is_none_or` method + RUSTFLAGS = lib.concatStringsSep " " ( + [ + "-Cdebug_assertions=n" + ] + ++ lib.optionals (polarsMemoryAllocator.pname == "mimalloc") [ + "--cfg use_mimalloc" + ] + ); + RUST_BACKTRACE = true; + }; + + dontUseCmakeConfigure = true; + + maturinBuildFlags = [ + "-m" + "py-polars/Cargo.toml" + ]; - pythonImportsCheck = [ "polars" ]; + postInstall = '' + # Move polars.abi3.so -> polars.so + local polarsSo="" + local soName="" + while IFS= read -r -d "" p ; do + polarsSo=$p + soName="$(basename "$polarsSo")" + [[ "$soName" == polars.so ]] && break + done < <( find "$out" -iname "polars*.so" -print0 ) + [[ -z "''${polarsSo:-}" ]] && echo "polars.so not found" >&2 && exit 1 + if [[ "$soName" != polars.so ]] ; then + mv "$polarsSo" "$(dirname "$polarsSo")/polars.so" + fi + ''; + + pythonImportsCheck = [ + "polars" + ]; + + passthru.tests.dynloading-1 = + runCommand "polars-dynloading-1" + { + nativeBuildInputs = [ + (python.withPackages (ps: [ + ps.pyarrow + polars + ])) + ]; + } + '' + ((LD_DEBUG=libs python) |& tee $out | tail) << \EOF + import pyarrow + import polars + EOF + touch $out + ''; + passthru.tests.dynloading-2 = + runCommand "polars-dynloading-2" + { + nativeBuildInputs = [ + (python.withPackages (ps: [ + ps.pyarrow + polars + ])) + ]; + failureHook = '' + sed "s/^/ /" $out >&2 + ''; + } + '' + ((LD_DEBUG=libs python) |& tee $out | tail) << \EOF + import polars + import pyarrow + EOF + ''; + passthru.tests.pytest = stdenv.mkDerivation { + pname = "${polars.pname}-pytest"; + + inherit (polars) version src; + + requiredSystemFeatures = [ "big-parallel" ]; + + sourceRoot = "source/py-polars"; + postPatch = '' + for f in * ; do + [[ "$f" == "tests" ]] || \ + [[ "$f" == "pyproject.toml" ]] || \ + rm -rf "$f" + done + for pat in "__pycache__" "*.pyc" ; do + find -iname "$pat" -exec rm "{}" ";" + done + ''; + dontConfigure = true; + dontBuild = true; + + doCheck = true; + checkPhase = "pytestCheckPhase"; + nativeBuildInputs = [ + (python.withPackages (ps: [ + polars + ps.aiosqlite + ps.altair + ps.boto3 + ps.deltalake + ps.flask + ps.flask-cors + ps.fsspec + ps.gevent + ps.hypothesis + ps.jax + ps.jaxlib + (ps.kuzu or null) + ps.moto + ps.nest-asyncio + ps.numpy + ps.openpyxl + ps.pandas + ps.pyarrow + ps.pydantic + (ps.pyiceberg or null) + ps.sqlalchemy + ps.torch + ps.xlsx2csv + ps.xlsxwriter + ps.zstandard + ps.cloudpickle + ])) + ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-codspeed + pytest-cov + pytest-xdist + pytest-benchmark + ]; + + pytestFlagsArray = [ + "-n auto" + "--dist loadgroup" + ''-m "slow or not slow"'' + ]; + disabledTests = [ + "test_read_kuzu_graph_database" # kuzu + "test_read_database_cx_credentials" # connectorx + + # adbc_driver_.* + "test_write_database_append_replace" + "test_write_database_create" + "test_write_database_create_quoted_tablename" + "test_write_database_adbc_temporary_table" + "test_write_database_create" + "test_write_database_append_replace" + "test_write_database_errors" + "test_write_database_errors" + "test_write_database_create_quoted_tablename" + + # Internet access: + "test_read_web_file" + + # Untriaged + "test_pickle_lazyframe_nested_function_udf" + "test_serde_udf" + "test_hash_struct" + ]; + disabledTestPaths = [ + "tests/benchmark" + "tests/docs" + + "tests/unit/io/test_iceberg.py" # Package pyiceberg + "tests/unit/io/test_spreadsheet.py" # Package fastexcel + + # Wrong altair version + "tests/unit/operations/namespaces/test_plot.py" + + # adbc + "tests/unit/io/database/test_read.py" + + # Untriaged + "tests/unit/cloud/test_prepare_cloud_plan.py" + "tests/unit/io/cloud/test_cloud.py" + ]; + + installPhase = "touch $out"; + }; meta = { - description = "Fast multi-threaded DataFrame library"; + description = "Dataframes powered by a multithreaded, vectorized query engine, written in Rust"; homepage = "https://github.com/pola-rs/polars"; - changelog = "https://github.com/pola-rs/polars/releases/tag/py-${version}"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ happysalada ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + happysalada + SomeoneSerge + ]; + mainProgram = "polars"; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/python-modules/polyswarm-api/default.nix b/pkgs/development/python-modules/polyswarm-api/default.nix index 089505631840..3bce5e796233 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.9.0"; + version = "3.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "polyswarm"; repo = "polyswarm-api"; rev = "refs/tags/${version}"; - hash = "sha256-RjzB7S3qTCl6fo+qZ+mVCsQg6CLUnSwutNse5QPQOHU="; + hash = "sha256-3K0FdqsEjt5cTymgxmt0Ohud/+bsILe9bDclZXJqPV8="; }; pythonRelaxDeps = [ "future" ]; diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index be7697d0d6ab..9e244b696ece 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "portalocker"; - version = "2.8.2"; + version = "2.10.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KwNap4KORsWOmzE5DuHxabmOEGarELmmqGH+fiXuTzM="; + hash = "sha256-7xv4ROh4qwiu5+QBhBVuEVHyKPEDqlxr0HJMwzCWD48="; }; postPatch = '' diff --git a/pkgs/development/python-modules/portion/default.nix b/pkgs/development/python-modules/portion/default.nix index 6af448dccd05..f609b6040ea3 100644 --- a/pkgs/development/python-modules/portion/default.nix +++ b/pkgs/development/python-modules/portion/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "portion"; - version = "2.5.0"; + version = "2.6.0"; pyproject = true; src = fetchFromGitHub { owner = "AlexandreDecan"; repo = "portion"; rev = "refs/tags/${version}"; - hash = "sha256-sNOieFenrWh6iDXCyCBedx+qIsS+daAr+WVBpkc8yVQ="; + hash = "sha256-TBCnlkGZZ/3tWEojxDGNYcXtYHhrooJkaWBsRkadXEE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index cf4e6803391b..fdd93de663bf 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -1,45 +1,44 @@ { lib, + backoff, buildPythonPackage, fetchFromGitHub, - # build inputs - requests, - six, + freezegun, + mock, monotonic, - backoff, - python-dateutil, - # check inputs pytestCheckHook, - mock, - freezegun, + python-dateutil, + requests, + setuptools, + six, }: -let + +buildPythonPackage rec { pname = "posthog"; - version = "3.5.2"; -in -buildPythonPackage { - inherit pname version; - format = "setuptools"; + version = "3.7.0"; + pyproject = true; src = fetchFromGitHub { owner = "PostHog"; repo = "posthog-python"; rev = "refs/tags/v${version}"; - hash = "sha256-DhTX28j8RcEONEVIRoYHBk63Qw1Wff9qdQ/Ymbb9xHE="; + hash = "sha256-1evqG/rdHBs0bAHM+bIHyT4tFE6tAE+aJyu5r0QqAMk="; }; - propagatedBuildInputs = [ - requests - six - monotonic + build-system = [ setuptools ]; + + dependencies = [ backoff + monotonic python-dateutil + requests + six ]; nativeCheckInputs = [ - pytestCheckHook - mock freezegun + mock + pytestCheckHook ]; pythonImportsCheck = [ "posthog" ]; @@ -47,12 +46,14 @@ buildPythonPackage { disabledTests = [ "test_load_feature_flags_wrong_key" # Tests require network access + "test_excepthook" "test_request" + "test_trying_to_use_django_integration" "test_upload" ]; meta = with lib; { - description = "Official PostHog python library"; + description = "Module for interacting with PostHog"; homepage = "https://github.com/PostHog/posthog-python"; changelog = "https://github.com/PostHog/posthog-python/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index 6e1f724a35dd..76bab717715f 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { python-hglib pygit2 pyuv - ] ++ lib.optionals (!stdenv.isDarwin) [ i3ipc ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ i3ipc ]; # tests are travis-specific doCheck = false; diff --git a/pkgs/development/python-modules/pox/default.nix b/pkgs/development/python-modules/pox/default.nix index ffcf9616cb59..43c30cd6d574 100644 --- a/pkgs/development/python-modules/pox/default.nix +++ b/pkgs/development/python-modules/pox/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pox"; - version = "0.3.4"; + version = "0.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FubsqE8b7DgoIQsGsFKt8EzyqyDCL9b77194Mgyab+0="; + hash = "sha256-gSDuTJTpUObgSD4FCk8OVgduWQugqa3RlSTCVL0jwtE="; }; # Test sare failing the sandbox diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index 53eaa5657e7a..b9616b0c9230 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -10,20 +10,20 @@ buildPythonPackage rec { pname = "ppft"; - version = "1.7.6.8"; + version = "1.7.6.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dqQpp9e3TE10P226g1HljWK2Qy7WXfn+IEeQFg2rmW0="; + hash = "sha256-cxYcZ0dOqdgdBLza0WbTmc/z8ITV0twh691GwHW7wmU="; }; propagatedBuildInputs = [ six ]; # darwin seems to hang - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 0017582e25cc..131928baba25 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { six ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click ]; flex = [ flex ]; icu = [ pyicu ]; @@ -54,7 +54,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-cov-stub pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); # Disable tests that require network disabledTestPaths = [ "tests/test_convert.py" ]; diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 08fb2795bd17..cab8bc38092f 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -1,10 +1,11 @@ { lib, - betamax, betamax-matchers, betamax-serializers, + betamax, buildPythonPackage, fetchFromGitHub, + flit-core, mock, prawcore, pytestCheckHook, @@ -16,19 +17,21 @@ buildPythonPackage rec { pname = "praw"; - version = "7.7.1"; - format = "setuptools"; + version = "7.8.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "praw-dev"; - repo = pname; + repo = "praw"; rev = "refs/tags/v${version}"; - hash = "sha256-L7wTHD/ypXVc8GMfl9u16VNb9caLJoXpaMEIzaVVUgo="; + hash = "sha256-jxF7rlMwKIKwyYv35vYWAdtClsVhnIkywoyMQeggGBc="; }; - propagatedBuildInputs = [ + build-system = [ flit-core ]; + + dependencies = [ mock prawcore update-checker diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix index 646d2b343518..55058f846d08 100644 --- a/pkgs/development/python-modules/pre-commit-hooks/default.nix +++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { # Note: this is not likely to ever work on Darwin # https://github.com/pre-commit/pre-commit-hooks/pull/655 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # the tests require a functional git installation which requires a valid HOME # directory. diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix deleted file mode 100644 index dd6eec493338..000000000000 --- a/pkgs/development/python-modules/premailer/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - isPy27, - cssselect, - cssutils, - lxml, - mock, - nose, - requests, - cachetools, -}: - -buildPythonPackage rec { - pname = "premailer"; - version = "3.10.0"; - format = "setuptools"; - disabled = isPy27; # no longer compatible with urllib - - src = fetchPypi { - inherit pname version; - sha256 = "d1875a8411f5dc92b53ef9f193db6c0f879dc378d618e0ad292723e388bfe4c2"; - }; - - buildInputs = [ - mock - nose - ]; - propagatedBuildInputs = [ - cachetools - cssselect - cssutils - lxml - requests - ]; - - meta = { - description = "Turns CSS blocks into style attributes"; - homepage = "https://github.com/peterbe/premailer"; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 53143aa47fbf..b5cecedd6388 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -12,24 +12,24 @@ buildPythonPackage rec { pname = "prettytable"; - version = "3.10.1"; - format = "pyproject"; + version = "3.11.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "jazzband"; repo = "prettytable"; rev = "refs/tags/${version}"; - hash = "sha256-S23nUCA2WTxnCKKKFrtN9HYjP0SHUBPPsVNAc4SYlVg="; + hash = "sha256-LtphoD5gCMgWgDcFghinq9zjUD69XudEeGIToqqmVPs="; }; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling ]; - propagatedBuildInputs = [ wcwidth ]; + dependencies = [ wcwidth ]; nativeCheckInputs = [ pytest-lazy-fixtures diff --git a/pkgs/development/python-modules/primer3/default.nix b/pkgs/development/python-modules/primer3/default.nix index 336042e595d4..83f57c4a70e3 100644 --- a/pkgs/development/python-modules/primer3/default.nix +++ b/pkgs/development/python-modules/primer3/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython setuptools - ] ++ lib.optionals stdenv.isDarwin [ gcc ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ]; nativeCheckInputs = [ click diff --git a/pkgs/development/python-modules/primp/default.nix b/pkgs/development/python-modules/primp/default.nix new file mode 100644 index 000000000000..97db576116cd --- /dev/null +++ b/pkgs/development/python-modules/primp/default.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, + pytest, + runCommand, + boringssl, + libiconv, + SystemConfiguration, + patchelf, + gcc-unwrapped, + python, +}: + +let + # boring-sys expects the static libraries in build/ instead of lib/ + boringssl-wrapper = runCommand "boringssl-wrapper" { } '' + mkdir $out + cd $out + ln -s ${boringssl.out}/lib build + ln -s ${boringssl.dev}/include include + ''; +in +buildPythonPackage rec { + pname = "primp"; + version = "0.6.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "deedy5"; + repo = "primp"; + rev = "refs/tags/v${version}"; + hash = "sha256-wCD99eEU4RW8kUJY72cXhJh5124PVd6kJt+HZjm/hFI="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-iY6TSc7GU6OWVUpW6qpwH4g9/eGKhP/YZ5PQoO8NmVc="; + }; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + # TODO: Can we improve this? + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' + ${lib.getExe patchelf} --add-rpath ${lib.getLib gcc-unwrapped.lib} --add-needed libstdc++.so.6 $out/${python.sitePackages}/primp/primp.abi3.so + ''; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + SystemConfiguration + ]; + + env.BORING_BSSL_PATH = boringssl-wrapper; + + optional-dependencies = { + dev = [ pytest ]; + }; + + # Test use network + doCheck = false; + + pythonImportsCheck = [ "primp" ]; + + meta = { + changelog = "https://github.com/deedy5/primp/releases/tag/${version}"; + description = "PRIMP (Python Requests IMPersonate). The fastest python HTTP client that can impersonate web browsers."; + homepage = "https://github.com/deedy5/primp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 314f55047593..b10e37b9d461 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "4.4.2"; + version = "4.5.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-P9ouDGBpNgCmWFp4TJ07xOHaxX6Z4TP4wPXIzz3zdKI="; + hash = "sha256-ZmLLYkiG7THrlNr2HidYO1FE68c4Ohe64Hb49PWQiPs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/prometheus-async/default.nix b/pkgs/development/python-modules/prometheus-async/default.nix index 95d2277697d6..22627f161fa2 100644 --- a/pkgs/development/python-modules/prometheus-async/default.nix +++ b/pkgs/development/python-modules/prometheus-async/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { wrapt ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix index 9f0704d7a3d0..3c465a430a29 100644 --- a/pkgs/development/python-modules/prometheus-client/default.nix +++ b/pkgs/development/python-modules/prometheus-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "prometheus-client"; - version = "0.20.0"; + version = "0.21.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "prometheus"; repo = "client_python"; rev = "refs/tags/v${version}"; - hash = "sha256-IMw0mpOUzjXBy4bMTeSFMc5pdibI5lGxZHKiufjPLbM="; + hash = "sha256-LrCBCfIcpxNjy/yjwCG4J34eJO4AdUr21kp9FBwSeAY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index c66dd4499ee4..caa4e679ea71 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.47"; + version = "3.0.48"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - hash = "sha256-Hhspy1gICx5p8gfIk6GnvxbRJ6XDDJ0Xolpdd3kuU2A="; + hash = "sha256-1mI6sEd6gN905ka9vJNiEUP1yvEEIGqikpTVPeGgPZA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/propcache/default.nix b/pkgs/development/python-modules/propcache/default.nix new file mode 100644 index 000000000000..7dc515ef6fee --- /dev/null +++ b/pkgs/development/python-modules/propcache/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + cython, + expandvars, + fetchFromGitHub, + pytest-cov-stub, + pytest-xdist, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "propcache"; + version = "0.2.0"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "propcache"; + rev = "refs/tags/v${version}"; + hash = "sha256-S0u5/HJYtZCWB9X+Nlnz+oSFb3o98mGWWwsNLodzS9g="; + }; + + build-system = [ + cython + expandvars + setuptools + ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytest-xdist + pytestCheckHook + ]; + + pythonImportsCheck = [ "propcache" ]; + + meta = { + description = "Fast property caching"; + homepage = "https://github.com/aio-libs/propcache"; + changelog = "https://github.com/aio-libs/propcache/blob/${src.rev}/CHANGES.rst"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/property-manager/default.nix b/pkgs/development/python-modules/property-manager/default.nix index e1eee500812e..71fa0e1aeddb 100644 --- a/pkgs/development/python-modules/property-manager/default.nix +++ b/pkgs/development/python-modules/property-manager/default.nix @@ -6,7 +6,7 @@ verboselogs, coloredlogs, pytest, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ pytest - pytest-cov + pytest-cov-stub ]; meta = with lib; { diff --git a/pkgs/development/python-modules/prophet/default.nix b/pkgs/development/python-modules/prophet/default.nix index 8f33fc7aa808..4ccfdb7fc726 100644 --- a/pkgs/development/python-modules/prophet/default.nix +++ b/pkgs/development/python-modules/prophet/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { importlib-resources ]; - passthru.optional-dependencies.parallel = [ + optional-dependencies.parallel = [ dask distributed ] ++ dask.optional-dependencies.dataframe; diff --git a/pkgs/development/python-modules/prosemirror/default.nix b/pkgs/development/python-modules/prosemirror/default.nix new file mode 100644 index 000000000000..2457d8b60cf2 --- /dev/null +++ b/pkgs/development/python-modules/prosemirror/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + setuptools-scm, + pytestCheckHook, + fetchPypi, + lxml, + cssselect, +}: + +buildPythonPackage rec { + pname = "prosemirror"; + version = "0.5.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-AwhPJHPDuuQW7NlUs7KL0SLTAH9F+E8RzRbsRnHraiI="; + }; + + build-system = [ setuptools-scm ]; + + dependencies = [ + lxml + cssselect + ]; + + pythonImportsCheck = [ "prosemirror" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Python implementation of core ProseMirror modules for collaborative editing"; + homepage = "https://pypi.org/project/prosemirror"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index df76396f68e3..ae3cd88eeef7 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.23.0"; + version = "1.24.0"; format = "setuptools"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-iQdRce8RmIs/oVf129i5zwnWX//ul+Kc5APNje+6GdI="; + hash = "sha256-MLcqXsr+RAaw0znbNbVsQFkGTmkie4w72nRiOX+WZEU="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/protobuf/4.nix b/pkgs/development/python-modules/protobuf/4.nix index 9d10deca12a5..2d1a3f9d861f 100644 --- a/pkgs/development/python-modules/protobuf/4.nix +++ b/pkgs/development/python-modules/protobuf/4.nix @@ -4,6 +4,7 @@ fetchpatch, isPyPy, lib, + stdenv, numpy, protobuf, pytestCheckHook, @@ -84,15 +85,21 @@ buildPythonPackage { 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" - ]; + 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" + ] + ++ lib.optionals stdenv.hostPlatform.is32bit [ + # OverflowError: timestamp out of range for platform time_t + "testTimezoneAwareDatetimeConversionWhereTimestampLosesPrecision" + "testTimezoneNaiveDatetimeConversionWhereTimestampLosesPrecision" + ]; disabledTestPaths = lib.optionals (lib.versionAtLeast protobuf.version "23") [ @@ -124,8 +131,6 @@ buildPythonPackage { 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 049833dc1b09..8e0cc3cc7a51 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -3,20 +3,25 @@ fetchPypi, lib, setuptools, + protobuf, }: buildPythonPackage rec { pname = "protobuf"; - version = "5.28.0"; + version = "5.28.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-3edK8Pp3T6mIkiCZkila2/uR2j+pjI9nqIr+j1o0mt0="; + hash = "sha256-ZLrbxJGApeQB83P5znqx0Ytj991KnNxDySufC0gc73s="; }; build-system = [ setuptools ]; + propagatedNativeBuildInputs = [ + protobuf + ]; + # the pypi source archive does not ship tests doCheck = false; @@ -30,10 +35,11 @@ buildPythonPackage rec { "google._upb._message" ]; - meta = with lib; { + meta = { description = "Protocol Buffers are Google's data interchange format"; homepage = "https://developers.google.com/protocol-buffers/"; - license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + changelog = "https://github.com/protocolbuffers/protobuf/releases/v${version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/proton-core/default.nix b/pkgs/development/python-modules/proton-core/default.nix index 12df2934bff2..91bffd81e2ce 100644 --- a/pkgs/development/python-modules/proton-core/default.nix +++ b/pkgs/development/python-modules/proton-core/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "proton-core"; - version = "0.2.0"; + version = "0.3.3"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-core"; rev = "refs/tags/v${version}"; - hash = "sha256-IiKmtgcCSe2q3qaNuUSaC/D/vSQzVq7w8VN2Xq81+tQ="; + hash = "sha256-2Drlai/PYzi1z1CtDYfNhol2wamb/HNrvUhj0XsiyHg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix b/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix deleted file mode 100644 index 4bb419d21b20..000000000000 --- a/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - proton-keyring-linux, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-keyring-linux-secretservice"; - version = "0.0.2"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-keyring-linux-secretservice"; - rev = "refs/tags/v${version}"; - hash = "sha256-IZPT2bL/1YD2TH/djwIQHUE1RRbYMTkQDacjjoqDQWo="; - }; - - build-system = [ setuptools ]; - - dependencies = [ proton-keyring-linux ]; - - pythonImportsCheck = [ "proton.keyring_linux" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "ProtonVPN component to access Linux's keyring secret service API"; - homepage = "https://github.com/ProtonVPN/python-proton-keyring-linux-secretservice"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-keyring-linux/default.nix b/pkgs/development/python-modules/proton-keyring-linux/default.nix index 51617e71a0f8..56bd41fea4a6 100644 --- a/pkgs/development/python-modules/proton-keyring-linux/default.nix +++ b/pkgs/development/python-modules/proton-keyring-linux/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "proton-keyring-linux"; - version = "0.0.2"; + version = "0.1.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-keyring-linux"; rev = "refs/tags/v${version}"; - hash = "sha256-c2wdbd8Hkz2hF9zYMy4/V/W6uZRItz7tWqLJqTsJoHU="; + hash = "sha256-feIgRC0U7d96gFcmHqRF3/8k/bsxlPJs1/K+ki7uXys="; }; build-system = [ setuptools ]; @@ -28,7 +28,10 @@ buildPythonPackage rec { proton-core ]; - pythonImportsCheck = [ "proton.keyring_linux.core" ]; + pythonImportsCheck = [ + "proton.keyring_linux.core" + "proton.keyring_linux" + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix index 219dd94b3142..135c147c13dd 100644 --- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix +++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix @@ -2,12 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, + cryptography, setuptools, + jinja2, proton-core, - proton-vpn-connection, - proton-vpn-logger, - proton-vpn-killswitch, - proton-vpn-session, + pynacl, + aiohttp, + pyopenssl, + pytest-asyncio, + requests, sentry-sdk, distro, pytestCheckHook, @@ -16,36 +19,47 @@ buildPythonPackage rec { pname = "proton-vpn-api-core"; - version = "0.32.2"; + version = "0.36.4"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-api-core"; rev = "v${version}"; - hash = "sha256-n4TZkp2ZMSJ1w1wQUMsAhX8kmWu59udlsXXEhIM83mI="; + hash = "sha256-K2uti5QPSK+er8pLiSTrdxRZeKtAaGPj/N3zoIpJhHw="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + ]; dependencies = [ + cryptography distro + jinja2 + pynacl proton-core - proton-vpn-connection - proton-vpn-logger - proton-vpn-killswitch - proton-vpn-session sentry-sdk ]; - pythonImportsCheck = [ "proton.vpn.core" ]; + pythonImportsCheck = [ + "proton.vpn.core" + "proton.vpn.connection" + "proton.vpn.killswitch.interface" + "proton.vpn.logging" + "proton.vpn.session" + ]; nativeCheckInputs = [ + aiohttp + pyopenssl + pytest-asyncio + requests pytestCheckHook pytest-cov-stub ]; - preCheck = '' + postInstall = '' # Needed for Permission denied: '/homeless-shelter' export HOME=$(mktemp -d) ''; @@ -53,6 +67,7 @@ buildPythonPackage rec { disabledTests = [ # Permission denied: '/run' "test_ensure_configuration_file_is_created" + "test_ovpnconfig_with_certificate" "test_ovpnconfig_with_settings" "test_wireguard_config_content_generation" "test_wireguard_with_non_certificate" diff --git a/pkgs/development/python-modules/proton-vpn-connection/default.nix b/pkgs/development/python-modules/proton-vpn-connection/default.nix deleted file mode 100644 index 7da811dc3a31..000000000000 --- a/pkgs/development/python-modules/proton-vpn-connection/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - proton-core, - proton-vpn-killswitch, - proton-vpn-logger, - jinja2, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-connection"; - version = "0.14.4"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-connection"; - rev = "refs/tags/v${version}"; - hash = "sha256-Ze/te0G0tDzyZPGVVqvuJlZoHWJqJ36LnHO+Cy5nxx8="; - }; - - build-system = [ setuptools ]; - - dependencies = [ - jinja2 - proton-core - proton-vpn-killswitch - proton-vpn-logger - ]; - - pythonImportsCheck = [ "proton.vpn.connection" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - disabledTests = [ - # Permission denied: '/run' - "test_ensure_configuration_file_is_deleted" - "test_ensure_generate_is_returning_expected_content" - "test_ensure_same_configuration_file_in_case_of_duplicate" - "test_ensure_configuration_file_is_created" - "test_wireguard_config_content_generation" - "test_wireguard_with_malformed_credentials" - "test_wireguard_with_non_certificate" - "test_wireguard_without_settings" - # Neiter udp or tcp are working - "test_ovpnconfig_with_settings" - "test_ovpnconfig_with_missing_settings_applies_expected_defaults" - "test_ovpnconfig_with_malformed_params" - "test_ovpnconfig_with_certificate_and_malformed_credentials" - "test_ovpnconfig_with_malformed_server" - "test_ovpnconfig_with_malformed_server_and_credentials" - ]; - - meta = { - description = "Defines the interface that VPN connection backends should implement"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-connection"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix deleted file mode 100644 index 8ff9321fc57c..000000000000 --- a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - gobject-introspection, - setuptools, - networkmanager, - proton-vpn-api-core, - proton-vpn-killswitch, - proton-vpn-logger, - pycairo, - pygobject3, - pytestCheckHook, - iproute2, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-killswitch-network-manager-wireguard"; - version = "0.1.4"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-killswitch-network-manager-wireguard"; - rev = "v${version}"; - hash = "sha256-4sYD2X1U066FMjrtbTb31wvkCDWAw+eXod+pi0gGsCQ="; - }; - - nativeBuildInputs = [ - # Solves ImportError: cannot import name NM, introspection typelib not found - gobject-introspection - ]; - - build-system = [ - setuptools - ]; - - dependencies = [ - # Needed here for the NM namespace - networkmanager - proton-vpn-api-core - proton-vpn-killswitch - proton-vpn-logger - pycairo - pygobject3 - ]; - - postPatch = '' - substituteInPlace proton/vpn/killswitch/backend/linux/wireguard/killswitch_connection_handler.py \ - --replace '/usr/sbin/ip' '${iproute2}/bin/ip' - ''; - - pythonImportsCheck = [ "proton.vpn.killswitch.backend.linux.wireguard" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Implementation of the proton-vpn-killswitch interface using Network Manager with wireguard-protocol"; - homepage = "https://github.com/ProtonVPN/proton-vpn-killswitch-network-manager-wireguard"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix deleted file mode 100644 index c8d30741930c..000000000000 --- a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - gobject-introspection, - setuptools, - networkmanager, - proton-vpn-api-core, - proton-vpn-killswitch, - proton-vpn-logger, - pycairo, - pygobject3, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-killswitch-network-manager"; - version = "0.5.4"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-killswitch-network-manager"; - rev = "refs/tags/v${version}"; - hash = "sha256-iUm+hpqgI4jG+1Cd9F6pBjodxHpq9/2ovXRT877biXQ="; - }; - - nativeBuildInputs = [ - # Solves ImportError: cannot import name NM, introspection typelib not found - gobject-introspection - ]; - - build-system = [ - setuptools - ]; - - dependencies = [ - # Needed here for the NM namespace - networkmanager - proton-vpn-api-core - proton-vpn-killswitch - proton-vpn-logger - pycairo - pygobject3 - ]; - - pythonImportsCheck = [ "proton.vpn.killswitch.backend.linux.networkmanager" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Implementation of the proton-vpn-killswitch interface using Network Manager"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-killswitch-network-manager"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-vpn-killswitch/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch/default.nix deleted file mode 100644 index ae83dd1e5baa..000000000000 --- a/pkgs/development/python-modules/proton-vpn-killswitch/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - proton-core, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-killswitch"; - version = "0.4.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-killswitch"; - rev = "v${version}"; - hash = "sha256-XZqjAhxgIiATJd3JcW2WWUMC1b6+cfZRhXlIPyMUFH8="; - }; - - build-system = [ setuptools ]; - - dependencies = [ proton-core ]; - - pythonImportsCheck = [ "proton.vpn.killswitch.interface" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Defines the ProtonVPN kill switch interface"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-killswitch"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-vpn-logger/default.nix b/pkgs/development/python-modules/proton-vpn-logger/default.nix deleted file mode 100644 index 402b6e0e4910..000000000000 --- a/pkgs/development/python-modules/proton-vpn-logger/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - proton-core, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-logger"; - version = "0.2.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-logger"; - rev = "refs/tags/v${version}"; - hash = "sha256-/LfMjyTs/EusgnKEQugsdJzqDZBvaAhbsTUVLDCRw0I="; - }; - - build-system = [ - setuptools - ]; - - dependencies = [ proton-core ]; - - pythonImportsCheck = [ "proton.vpn.logging" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - preCheck = '' - # Needed for Permission denied: '/homeless-shelter' - export HOME=$(mktemp -d) - ''; - - meta = { - description = "General purpose logging package for the entire ProtonVPN Linux client"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-logger"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix index 2103b9c14855..8575a37f7816 100644 --- a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix +++ b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix @@ -3,11 +3,13 @@ buildPythonPackage, fetchFromGitHub, gobject-introspection, + apt, + iproute2, setuptools, networkmanager, proton-core, proton-vpn-api-core, - proton-vpn-connection, + proton-vpn-local-agent, pycairo, pygobject3, pytest-asyncio, @@ -17,14 +19,14 @@ buildPythonPackage rec { pname = "proton-vpn-network-manager"; - version = "0.6.3"; + version = "0.9.4"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-network-manager"; rev = "refs/tags/v${version}"; - hash = "sha256-fbA3kvhU3l20+7irThiTk/fDe60yR4aWxhE3Ol2K7ow="; + hash = "sha256-9VoJyQfT9rUXK1vkQrUPvWogVYTbDLhSq3JDu3gJwg8="; }; nativeBuildInputs = [ @@ -41,12 +43,23 @@ buildPythonPackage rec { networkmanager proton-core proton-vpn-api-core - proton-vpn-connection + proton-vpn-local-agent pycairo pygobject3 ]; - pythonImportsCheck = [ "proton.vpn.backend.linux.networkmanager" ]; + postPatch = '' + substituteInPlace proton/vpn/backend/linux/networkmanager/killswitch/wireguard/killswitch_connection_handler.py \ + --replace '/usr/sbin/ip' '${iproute2}/bin/ip' + substituteInPlace proton/vpn/backend/linux/networkmanager/killswitch/wireguard/wgkillswitch.py \ + --replace '/usr/bin/apt' '${apt}/bin/apt' + ''; + + pythonImportsCheck = [ + "proton.vpn.backend.linux.networkmanager" + "proton.vpn.backend.linux.networkmanager.killswitch.default" + "proton.vpn.backend.linux.networkmanager.killswitch.wireguard" + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/proton-vpn-session/default.nix b/pkgs/development/python-modules/proton-vpn-session/default.nix deleted file mode 100644 index ee27bfb9b466..000000000000 --- a/pkgs/development/python-modules/proton-vpn-session/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - cryptography, - distro, - proton-core, - proton-vpn-logger, - pynacl, - aiohttp, - pyopenssl, - pytest-asyncio, - requests, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-session"; - version = "0.6.7"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-session"; - rev = "refs/tags/v${version}"; - hash = "sha256-/5ju/2bxhqK6JWchkxFe3amBKHtO98GCVQWIrUsn+nQ="; - }; - - build-system = [ - setuptools - ]; - - dependencies = [ - cryptography - distro - proton-core - proton-vpn-logger - pynacl - ]; - - pythonImportsCheck = [ "proton.vpn.session" ]; - - postInstall = '' - # Needed for Permission denied: '/homeless-shelter' - export HOME=$(mktemp -d) - ''; - - nativeCheckInputs = [ - aiohttp - pyopenssl - pytest-asyncio - requests - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Provides utility classes to manage VPN sessions"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-session"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/prox-tv/default.nix b/pkgs/development/python-modules/prox-tv/default.nix index 7502d2daf3cc..ee2862361081 100644 --- a/pkgs/development/python-modules/prox-tv/default.nix +++ b/pkgs/development/python-modules/prox-tv/default.nix @@ -41,7 +41,7 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ "test_tvp_1d" ] ++ lib.optionals stdenv.isDarwin [ "test_tv2_1d" ]; + disabledTests = [ "test_tvp_1d" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_tv2_1d" ]; meta = with lib; { homepage = "https://github.com/albarji/proxTV"; diff --git a/pkgs/development/python-modules/proxy-py/default.nix b/pkgs/development/python-modules/proxy-py/default.nix index 4679e894e008..df174a125588 100644 --- a/pkgs/development/python-modules/proxy-py/default.nix +++ b/pkgs/development/python-modules/proxy-py/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "proxy-py"; - version = "2.4.5"; + version = "2.4.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "abhinavsingh"; repo = "proxy.py"; rev = "refs/tags/v${version}"; - hash = "sha256-pn4YYGntG9C8mhECb7PYgN5wwicdlPcZu6Xn2M3iIKA="; + hash = "sha256-VQjK4wNOuUk3KhlvSlDbyclC+RUjeEIVvPN+bKq0fFc="; }; postPatch = '' @@ -62,6 +62,8 @@ buildPythonPackage rec { requests ]; + __darwinAllowLocalNetworking = true; + preCheck = '' export HOME=$(mktemp -d); ''; @@ -77,6 +79,8 @@ buildPythonPackage rec { "test_gen_public_key" # Tests run into a timeout "integration" + # Crashes + "test_grout" ]; pythonImportsCheck = [ "proxy" ]; diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index 9782458b4ccb..605936dd8637 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -8,7 +8,7 @@ fs, # for fonttools extras setuptools-scm, pytestCheckHook, - pytest-cov, + pytest-cov-stub, pytest-xdist, runAllTests ? false, psautohint, # for passthru.tests @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub pytest-xdist ]; disabledTests = lib.optionals (!runAllTests) [ diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index f6ffef6ea727..f196ef52a1ea 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + setuptools, attrs, docopt, pillow, @@ -11,15 +12,15 @@ numpy, aggdraw, pytestCheckHook, - pytest-cov, + pytest-cov-stub, ipython, cython, }: buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.34"; - format = "setuptools"; + version = "1.10.2"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,20 +28,18 @@ buildPythonPackage rec { owner = "psd-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UFdprXoHFsbH3Tbui44n8FTdbkynnYVL1LHtFzFInio="; + hash = "sha256-vBDFKWNksF8/h5Jp1VOxVWgAzPdOLhv0iDrNDVXzm54="; }; - postPatch = '' - sed -i "/addopts =/d" pyproject.toml - ''; - - nativeBuildInputs = [ cython ]; + build-system = [ + setuptools + cython + ]; - propagatedBuildInputs = [ + dependencies = [ aggdraw attrs docopt - ipython numpy pillow scikit-image @@ -49,7 +48,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub + ipython ]; pythonImportsCheck = [ "psd_tools" ]; diff --git a/pkgs/development/python-modules/psrpcore/default.nix b/pkgs/development/python-modules/psrpcore/default.nix index 72c8da5f5407..8003780b86c2 100644 --- a/pkgs/development/python-modules/psrpcore/default.nix +++ b/pkgs/development/python-modules/psrpcore/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { changelog = "https://github.com/jborean93/psrpcore/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 4c0a93d2faa4..ee3f390b79af 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { buildInputs = # workaround for https://github.com/NixOS/nixpkgs/issues/146760 - lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ CoreFoundation ] - ++ lib.optionals stdenv.isDarwin [ IOKit ]; + lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ CoreFoundation ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; nativeCheckInputs = [ pytestCheckHook ]; # Segfaults on darwin: # https://github.com/giampaolo/psutil/issues/1715 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # In addition to the issues listed above there are some that occure due to # our sandboxing which we can work around by disabling some tests: diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index e74f113f3c84..3338ad86ce2e 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -35,13 +35,13 @@ let pname = "psycopg"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "psycopg"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Udysl00lB6rxmQByME6PI3KL4tlzIZ0/CZNWLVKssS8="; + hash = "sha256-vcUZvQeD5MnEM02phk73I9dpf0Eug95V7Rspi0s6S2M="; }; patches = [ @@ -161,7 +161,7 @@ buildPythonPackage rec { "psycopg_pool" ]; - passthru.optional-dependencies = { + optional-dependencies = { c = [ psycopg-c ]; pool = [ psycopg-pool ]; }; @@ -174,9 +174,9 @@ buildPythonPackage rec { pytestCheckHook postgresql ] - ++ lib.optional (stdenv.isLinux) postgresqlTestHook - ++ passthru.optional-dependencies.c - ++ passthru.optional-dependencies.pool; + ++ lib.optional (stdenv.hostPlatform.isLinux) postgresqlTestHook + ++ optional-dependencies.c + ++ optional-dependencies.pool; env = { postgresqlEnableTCP = 1; @@ -188,7 +188,7 @@ buildPythonPackage rec { '' cd .. '' - + lib.optionalString (stdenv.isLinux) '' + + lib.optionalString (stdenv.hostPlatform.isLinux) '' export PSYCOPG_TEST_DSN="host=/build/run/postgresql user=$PGUSER" ''; @@ -205,13 +205,16 @@ buildPythonPackage rec { # Mypy typing test "tests/test_typing.py" "tests/crdb/test_typing.py" + # https://github.com/psycopg/psycopg/pull/915 + "tests/test_notify.py" + "tests/test_notify_async.py" ]; pytestFlagsArray = [ "-o" "cache_dir=$TMPDIR" "-m" - "'not refcount and not timing'" + "'not refcount and not timing and not flakey'" # pytest.PytestRemovedIn9Warning: Marks applied to fixtures have no effect "-W" "ignore::pytest.PytestRemovedIn9Warning" diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index c8959b948fd7..aaab94547a02 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { sphinx-better-theme ]; - buildInputs = [ postgresql ] ++ lib.optionals stdenv.isDarwin [ openssl ]; + buildInputs = [ postgresql ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ openssl ]; sphinxRoot = "doc/src"; diff --git a/pkgs/development/python-modules/psycopg2cffi/default.nix b/pkgs/development/python-modules/psycopg2cffi/default.nix index b8c86c970a84..4201bd154071 100644 --- a/pkgs/development/python-modules/psycopg2cffi/default.nix +++ b/pkgs/development/python-modules/psycopg2cffi/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ]; # FATAL: could not create shared memory segment: Operation not permitted - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ postgresqlTestHook diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 3103506106df..826e97b476c4 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.2.20240920"; + version = "1.0.2.20241102"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LZDAepnKR2/BfU/grBE1Aw3wXwt9atAPu3dfh9KZ9tE="; + hash = "sha256-dNnGnAybp11y8WGSvXiP0MNFRmw5TQgnrVBQGqwsDSQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 72c97923f1de..66ada4405dbb 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "8.1.0"; + version = "9.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "pubnub"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-c6NSwDl0rV5t9dELuVVbRiLXYzxcYhiLc6yV4QoErTs="; + hash = "sha256-v3tFbq2YvQJRvRu9+8yzWLkFo+7AMsJDlqjMK2Q/FAE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pulsectl-asyncio/default.nix b/pkgs/development/python-modules/pulsectl-asyncio/default.nix index 8b7c70dc79eb..ce5216428dd7 100644 --- a/pkgs/development/python-modules/pulsectl-asyncio/default.nix +++ b/pkgs/development/python-modules/pulsectl-asyncio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pulsectl-asyncio"; - version = "1.2.1"; + version = "1.2.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mhthies"; repo = "pulsectl-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-VmogNphVZNJSUKUqp7xADRl78Ooofhl1YYrtYz5MBYc="; + hash = "sha256-lHVLrkFdNM8Y4t6TcXYnX8sQ4COrW3vV2sTDWeI4xZU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index abdc439fd611..756826b4500a 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "24.4.0"; + version = "24.8.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-aX7VDn1FLnhniuOOKrk1hDAIvsRIlVKDzQ+zYoZ+MWU="; + hash = "sha256-sFFQbQ1z08xDV879PeF7uFnX7PAE6ZSw98+oeFG8cVY="; }; patches = [ diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index 837c83854919..888ffca9a13d 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,10 +12,8 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "6.51.0"; - + version = "6.54.1"; pyproject = true; - build-system = [ setuptools ]; disabled = pythonOlder "3.8"; @@ -23,12 +21,14 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-aEyi4zFj0Q3KNBXjUX5J7nmmPCcnYn5w0mIC02gbGJc="; + hash = "sha256-OFkXLH8r4BSvALv8kd7vm8k5TDJPBJSuJ04FzNdsrF8="; }; sourceRoot = "${src.name}/sdk/python"; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ parver pulumi semver diff --git a/pkgs/development/python-modules/pulumi-hcloud/default.nix b/pkgs/development/python-modules/pulumi-hcloud/default.nix new file mode 100644 index 000000000000..315bc20c8873 --- /dev/null +++ b/pkgs/development/python-modules/pulumi-hcloud/default.nix @@ -0,0 +1,48 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + parver, + pulumi, + pythonOlder, + semver, + setuptools, +}: + +buildPythonPackage rec { + pname = "pulumi-hcloud"; + version = "1.20.4"; + + pyproject = true; + build-system = [ setuptools ]; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "pulumi"; + repo = "pulumi-hcloud"; + rev = "refs/tags/v${version}"; + hash = "sha256-m9MRXDTSC0K1raoH9gKPuxdwvUEnZ/ulp32xlY1Hsdo="; + }; + + sourceRoot = "${src.name}/sdk/python"; + + # The upstream repository does not contain tests + doCheck = false; + + dependencies = [ + parver + pulumi + semver + ]; + + pythonImportsCheck = [ "pulumi_hcloud" ]; + + meta = with lib; { + description = "Pulumi python hetzner web services provider"; + homepage = "https://github.com/pulumi/pulumi-hcloud"; + changelog = "https://github.com/pulumi/pulumi-hcloud/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ albertodvp ]; + }; +} diff --git a/pkgs/development/python-modules/pulumi/default.nix b/pkgs/development/python-modules/pulumi/default.nix index 7353649c5a56..1f835c0f9325 100644 --- a/pkgs/development/python-modules/pulumi/default.nix +++ b/pkgs/development/python-modules/pulumi/default.nix @@ -65,5 +65,7 @@ buildPythonPackage rec { homepage = "https://github.com/pulumi/pulumi"; license = licenses.asl20; maintainers = with maintainers; [ teto ]; + # https://github.com/pulumi/pulumi/issues/16828 + broken = versionAtLeast protobuf.version "5"; }; } diff --git a/pkgs/development/python-modules/pure-protobuf/default.nix b/pkgs/development/python-modules/pure-protobuf/default.nix index df72926be397..87dcc8812f85 100644 --- a/pkgs/development/python-modules/pure-protobuf/default.nix +++ b/pkgs/development/python-modules/pure-protobuf/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pure-protobuf"; - version = "3.1.2"; + version = "3.1.3"; 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-up/01Q2IdaW41Ple+nCRpWjYnl/IAlOppdGcg4djRZY="; + hash = "sha256-AsiJDi3SF3nlWKFvZujUsoHY8AJ21JKzEuTdR9FtFQI="; }; build-system = [ diff --git a/pkgs/development/python-modules/pure-python-adb/default.nix b/pkgs/development/python-modules/pure-python-adb/default.nix index 39ca6addf008..9b861f821a4a 100644 --- a/pkgs/development/python-modules/pure-python-adb/default.nix +++ b/pkgs/development/python-modules/pure-python-adb/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { sha256 = "0kdr7w2fhgjpcf1k3l6an9im583iqkr6v8hb4q1zw30nh3bqkk0f"; }; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiofiles ]; }; doCheck = pythonOlder "3.10"; # all tests result in RuntimeError on 3.10 - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.async; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.async; pythonImportsCheck = [ "ppadb.client" ] ++ lib.optionals doCheck [ "ppadb.client_async" ]; diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index 3012925d4103..9881df2a4c43 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.27"; + version = "1.28"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "puremagic"; rev = "refs/tags/${version}"; - hash = "sha256-93akHgfkNbYGDJxXXJTk9yobvpiycqdroVBEeOzDiFQ="; + hash = "sha256-a7jRQUSbH3E6eJiXNKr4ikdSXRZ6+/csl/EMiKXMzmk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index 1731d2cd0730..e9237152d0a0 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "pvlib"; - version = "0.11.0"; + version = "0.11.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iLMcRNwH8ENa8eLV3crAZ+bOFZFyUanycDZvYem9AVs="; + hash = "sha256-0C29pRXyvlTv0uMoOVJ8D4Lp+ZAotGBWX6ytBorIV0o="; }; build-system = [ diff --git a/pkgs/development/python-modules/pwkit/default.nix b/pkgs/development/python-modules/pwkit/default.nix index 6a4e3de6badd..99e6378a5d00 100644 --- a/pkgs/development/python-modules/pwkit/default.nix +++ b/pkgs/development/python-modules/pwkit/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pwkit"; - version = "1.2.1"; + version = "1.2.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkgw"; repo = "pwkit"; rev = "refs/tags/pwkit@${version}"; - hash = "sha256-X3nQPtPrY1+HH0Cs7PrFLqMP3fUEcwXQGap1F/3Aom0="; + hash = "sha256-FEMPHdXj2XCV5fCcdJsVpDMsJntP6zp1yFkjv1ov478="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pwlf/default.nix b/pkgs/development/python-modules/pwlf/default.nix index 95dbc3ac83b8..c5341cd1cd75 100644 --- a/pkgs/development/python-modules/pwlf/default.nix +++ b/pkgs/development/python-modules/pwlf/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pwlf"; - version = "2.2.1"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "cjekel"; repo = "piecewise_linear_fit_py"; - rev = "v${version}"; - hash = "sha256-gjdahulpHjBmOlKOCPF9WmrWe4jn/+0oVI4o09EX7qE="; + rev = "refs/tags/v${version}"; + hash = "sha256-FAH38mSaABdNR8lpxxA/YVo5ec2WYOMEsAQqravbM9k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 390c65120854..228b89890f96 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -33,12 +33,12 @@ let in buildPythonPackage rec { pname = "pwntools"; - version = "4.13.0"; + version = "4.13.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-HVyiU4PsEPtk4o0ULB2Gj5HqHFOpPTUx0wFdgwgo08M="; + hash = "sha256-szInJftQMdwwll44VQc2CNmr900qv5enLGfUSq3843w="; }; postPatch = '' @@ -82,7 +82,7 @@ buildPythonPackage rec { installShellCompletion --bash extra/bash_completion.d/shellcraft ''; - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p "$out/bin" makeWrapper "${debugger}/bin/${debuggerName}" "$out/bin/pwntools-gdb" ''; diff --git a/pkgs/development/python-modules/py-aosmith/default.nix b/pkgs/development/python-modules/py-aosmith/default.nix index 5b504e647ea6..0a7ad4b872cb 100644 --- a/pkgs/development/python-modules/py-aosmith/default.nix +++ b/pkgs/development/python-modules/py-aosmith/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "py-aosmith"; - version = "1.0.8"; + version = "1.0.10"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,12 +19,14 @@ buildPythonPackage rec { owner = "bdr99"; repo = "py-aosmith"; rev = "refs/tags/${version}"; - hash = "sha256-TjBjyWxBPrZEY/o1DZ+GiFTHTW37WwFN0oyJSyGru28="; + hash = "sha256-6wgPj3e3nbv0LM4qgZsj70F4nKy9LmY3RCvs++n1KbE="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + pythonRelaxDeps = [ "tenacity" ]; + + dependencies = [ aiohttp tenacity ]; diff --git a/pkgs/development/python-modules/py-bip39-bindings/default.nix b/pkgs/development/python-modules/py-bip39-bindings/default.nix index 24521f5289ac..72ea11e58522 100644 --- a/pkgs/development/python-modules/py-bip39-bindings/default.nix +++ b/pkgs/development/python-modules/py-bip39-bindings/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/py-cpuinfo/default.nix b/pkgs/development/python-modules/py-cpuinfo/default.nix index cf734872942d..8485fe8c2837 100644 --- a/pkgs/development/python-modules/py-cpuinfo/default.nix +++ b/pkgs/development/python-modules/py-cpuinfo/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; # On Darwin sysctl is used to read CPU information. - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cpuinfo/cpuinfo.py \ --replace "len(_program_paths('sysctl')) > 0" "True" \ --replace "_run_and_get_stdout(['sysctl'" "_run_and_get_stdout(['${sysctl}/bin/sysctl'" diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix index 311d4fdac065..dd4837ed3cb9 100644 --- a/pkgs/development/python-modules/py-desmume/default.nix +++ b/pkgs/development/python-modules/py-desmume/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "py-desmume"; - version = "0.0.6"; + version = "0.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "SkyTemple"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AgUdILCqpmuVI3uMSdGl+lIfUVXnIo/egm/48FMRF3M="; + hash = "sha256-aH7f/BI89VLUGqwA8Y7ThSpmKxWffYRETT/+EjPVTg8="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/py-improv-ble-client/default.nix b/pkgs/development/python-modules/py-improv-ble-client/default.nix new file mode 100644 index 000000000000..7f983cf534c5 --- /dev/null +++ b/pkgs/development/python-modules/py-improv-ble-client/default.nix @@ -0,0 +1,50 @@ +{ + lib, + bleak-retry-connector, + bleak, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "py-improv-ble-client"; + version = "1.0.4"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "py-improv-ble-client"; + rev = "refs/tags/${version}"; + hash = "sha256-leYSDB5/jFqlvX78OYzlFkkVxIkJ7iOUoLHBuVj7tAo="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools~=65.6" "setuptools" \ + --replace-fail "wheel~=0.37.1" "wheel" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + bleak + bleak-retry-connector + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "improv_ble_client" ]; + + meta = { + description = "Module to provision devices which implement Improv via BLE"; + homepage = "https://github.com/home-assistant-libs/py-improv-ble-client"; + changelog = "https://github.com/home-assistant-libs/py-improv-ble-client/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/py-libzfs/default.nix b/pkgs/development/python-modules/py-libzfs/default.nix index 1400a066c522..b5d8e7f4ab29 100644 --- a/pkgs/development/python-modules/py-libzfs/default.nix +++ b/pkgs/development/python-modules/py-libzfs/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { buildInputs = [ zfs ]; # Passing CFLAGS in configureFlags does not work, see https://github.com/truenas/py-libzfs/issues/107 - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace configure \ --replace-fail \ 'CFLAGS="-DCYTHON_FALLTHROUGH"' \ diff --git a/pkgs/development/python-modules/py-madvr2/default.nix b/pkgs/development/python-modules/py-madvr2/default.nix index 05799d43226a..32eb2a7c6667 100644 --- a/pkgs/development/python-modules/py-madvr2/default.nix +++ b/pkgs/development/python-modules/py-madvr2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "py-madvr2"; - version = "1.6.32"; + version = "1.6.33"; pyproject = true; src = fetchFromGitHub { owner = "iloveicedgreentea"; repo = "py-madvr"; - rev = "refs/tags/${version}"; - hash = "sha256-yD8DNhYG9oauEGKnX8Qnh0oSwG/AZa8FIRtHVq4DyTE="; + rev = "refs/tags/v${version}"; + hash = "sha256-z+PVLz9eApGJ94I/Jp0MyqNpKQwIemk8j+OyqFmIbgI="; }; build-system = [ setuptools ]; @@ -28,11 +28,8 @@ buildPythonPackage rec { pytestCheckHook ]; - # https://github.com/iloveicedgreentea/py-madvr/issues/12 - doCheck = false; - meta = { - changelog = "https://github.com/iloveicedgreentea/py-madvr/releases/tag/${version}"; + changelog = "https://github.com/iloveicedgreentea/py-madvr/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; description = "Control MadVR Envy over IP"; homepage = "https://github.com/iloveicedgreentea/py-madvr"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/py-ocsf-models/default.nix b/pkgs/development/python-modules/py-ocsf-models/default.nix new file mode 100644 index 000000000000..03fbc02e3687 --- /dev/null +++ b/pkgs/development/python-modules/py-ocsf-models/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + cryptography, + email-validator, + fetchFromGitHub, + poetry-core, + pydantic, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "py-ocsf-models"; + version = "0.2.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "prowler-cloud"; + repo = "py-ocsf-models"; + rev = "refs/tags/${version}"; + hash = "sha256-cFtWPO78KRh7IY+ePTzXpLPbZm+EtNvuJkhZZzKKjaA="; + }; + + pythonRelaxDeps = true; + + build-system = [ poetry-core ]; + + dependencies = [ + cryptography + email-validator + pydantic + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + # Tests are outdated + doCheck = false; + + pythonImportsCheck = [ "py_ocsf_models" ]; + + meta = { + description = "OCSF models in Python using Pydantic"; + homepage = "https://github.com/prowler-cloud/py-ocsf-models"; + changelog = "https://github.com/prowler-cloud/py-ocsf-models/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/py-opensonic/default.nix b/pkgs/development/python-modules/py-opensonic/default.nix index 22f3ebe7ecc8..3a7bb3244536 100644 --- a/pkgs/development/python-modules/py-opensonic/default.nix +++ b/pkgs/development/python-modules/py-opensonic/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "py-opensonic"; - version = "5.1.1"; + version = "5.2.1"; pyproject = true; src = fetchFromGitHub { owner = "khers"; repo = "py-opensonic"; - rev = "v${version}"; - hash = "sha256-wXTXuX+iIMEoALxsciopucmvBxAyEeiOgjJPrbD63gM="; + rev = "refs/tags/v${version}"; + hash = "sha256-lVErs5f2LoCrMNr+f8Bm2Q6xQRNuisloqyRHchYTukk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/py-partiql-parser/default.nix b/pkgs/development/python-modules/py-partiql-parser/default.nix index f3978e4fb695..a240fbcd8085 100644 --- a/pkgs/development/python-modules/py-partiql-parser/default.nix +++ b/pkgs/development/python-modules/py-partiql-parser/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "py-partiql-parser"; - version = "0.5.4"; + version = "0.5.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "getmoto"; repo = "py-partiql-parser"; rev = "refs/tags/${version}"; - hash = "sha256-BSqc3xibStb3J6Rua4dDp/eRD5/ns/dU1vGa4vL1Cyo="; + hash = "sha256-uEpgcY2bBaeFaK/0gWg1ef81FmKJy7m5G21aETW9QXU="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/py-serializable/default.nix b/pkgs/development/python-modules/py-serializable/default.nix index 6754d656e23f..a9d4988c6fe9 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.1.1"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "madpah"; repo = "serializable"; rev = "refs/tags/v${version}"; - hash = "sha256-8ciRzanrcb7DMAcWzIxRkgeCRGw+Ji8Epnw67cylGeQ="; + hash = "sha256-2A+QjokZ7gtgstclZ7PFSPymYjQYKsLVXy9xbFOfxLo="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/py-sr25519-bindings/default.nix b/pkgs/development/python-modules/py-sr25519-bindings/default.nix index 51915de513a7..123562c8d21a 100644 --- a/pkgs/development/python-modules/py-sr25519-bindings/default.nix +++ b/pkgs/development/python-modules/py-sr25519-bindings/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index 7fe3f1f61f4d..8361171fc261 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "2.5.2"; + version = "2.5.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mib1185"; repo = "py-synologydsm-api"; rev = "refs/tags/v${version}"; - hash = "sha256-c1qNCOmGEiI+bHDGxJ7OtdmPFcdkev+5U9cuDC8O5iQ="; + hash = "sha256-3DpgJqL8pSiAK/t/Qe2CxntQStTqDumkivhnPKHVlnE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/py3dns/default.nix b/pkgs/development/python-modules/py3dns/default.nix index 14ad16771655..a036ba2707cf 100644 --- a/pkgs/development/python-modules/py3dns/default.nix +++ b/pkgs/development/python-modules/py3dns/default.nix @@ -2,24 +2,20 @@ lib, buildPythonPackage, fetchPypi, + flit-core, }: buildPythonPackage rec { pname = "py3dns"; - version = "3.2.1"; - format = "setuptools"; + version = "4.0.2"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "1r25f0ys5p37bhld7m7n4gb0lrysaym3w318w2f8bncq7r3d81qz"; + hash = "sha256-mGUugOzsFDxg948OazQWMcqadWDt2N3fyGTAKQJhijk="; }; - preConfigure = '' - sed -i \ - -e '/import DNS/d' \ - -e 's/DNS.__version__/"${version}"/g' \ - setup.py - ''; + build-system = [ flit-core ]; doCheck = false; diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index 38bdf6c4c18d..e9f0efe24030 100644 --- a/pkgs/development/python-modules/py3exiv2/default.nix +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; # Work around Python distutils compiling C++ with $CC (see issue #26709) - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; pythonImportsCheck = [ "pyexiv2" ]; @@ -35,7 +35,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Python binding to the library exiv2"; homepage = "https://launchpad.net/py3exiv2"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/py3langid/default.nix b/pkgs/development/python-modules/py3langid/default.nix index 248a3bfa2088..b4e001b20a24 100644 --- a/pkgs/development/python-modules/py3langid/default.nix +++ b/pkgs/development/python-modules/py3langid/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "py3langid"; - version = "0.2.2"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-tN4B2tfnAfKdIWoJNeheCWzIZ1kD0j6oRFsrtfCQuW8="; + hash = "sha256-CodaAxpYqvnb2nu4KF/XXoAae9J2IW/6vgN5AdS0Sew="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index d762008e2ff2..5090946a1268 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.58"; + version = "3.59"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-SJScEz9WsqB0jRAHmUHpmnAbuqnRnHUUgc1rDN0tScw="; + hash = "sha256-3m/34xfPpe8T4yicbTtQtTqfq5Zz2T0AZl8fCKRg/CE="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index b131b1b11bb9..77d33a7d9b79 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.22.0"; + version = "4.23.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,12 +29,12 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-hP9MXv3/754ouvPgyOZKzBtEU2BugHUUE/e8biZPLFY="; + hash = "sha256-R/RbkiKkhcZd17hgDJnEpr3OCVMvn744YM+lmzSXKWs="; }; build-system = [ hatchling ]; - passthru.optional-dependencies = { + optional-dependencies = { json = [ ujson ]; PIL = [ pillow ]; redis = [ redis ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook requests - ] ++ passthru.optional-dependencies.watchdog ++ passthru.optional-dependencies.aiohttp; + ] ++ optional-dependencies.watchdog ++ optional-dependencies.aiohttp; pythonImportsCheck = [ "telebot" ]; diff --git a/pkgs/development/python-modules/pyais/default.nix b/pkgs/development/python-modules/pyais/default.nix index 2ed166b9a78b..7fe8e47b694f 100644 --- a/pkgs/development/python-modules/pyais/default.nix +++ b/pkgs/development/python-modules/pyais/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyais"; - version = "2.8.0"; + version = "2.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "M0r13n"; repo = "pyais"; rev = "refs/tags/v${version}"; - hash = "sha256-qggtwz6cSz5mLKLVY0i7gWs09EcOoxlWWQoHZv+TDc8="; + hash = "sha256-aIpIeDJGMfNVzeXY8GaPOYKam2HxcdHgSOhOoGmGDoc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index 9b5b39489313..df3d22aaf0ca 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.7.0"; + version = "24.9.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-XQ/fnmgQNvsmOng9Apj8OvWApuKmzxozFP/EjcPZHMs="; + hash = "sha256-543uiw1P7Va7n6EainhY5vreHscKmhIs7mc276w+abU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix index 6c81a3f081b8..d77b60248132 100644 --- a/pkgs/development/python-modules/pyannotate/default.nix +++ b/pkgs/development/python-modules/pyannotate/default.nix @@ -4,14 +4,16 @@ fetchPypi, mypy-extensions, pytestCheckHook, + pythonAtLeast, pythonOlder, + setuptools, six, }: buildPythonPackage rec { pname = "pyannotate"; version = "1.2.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +22,9 @@ buildPythonPackage rec { hash = "sha256-BO1YBLqzgVPVmB/JLYPc9qIog0U3aFYfBX53flwFdZk="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ six mypy-extensions ]; @@ -32,11 +36,20 @@ buildPythonPackage rec { "pyannotate_tools" ]; + disabledTestPaths = + [ + "pyannotate_runtime/tests/test_collect_types.py" + ] + ++ lib.optionals (pythonAtLeast "3.11") [ + # Tests are using lib2to3 + "pyannotate_tools/fixes/tests/test_annotate*.py" + ]; + meta = with lib; { description = "Auto-generate PEP-484 annotations"; - mainProgram = "pyannotate"; homepage = "https://github.com/dropbox/pyannotate"; license = licenses.mit; maintainers = [ ]; + mainProgram = "pyannotate"; }; } diff --git a/pkgs/development/python-modules/pyannote-audio/default.nix b/pkgs/development/python-modules/pyannote-audio/default.nix index 3a3ee228bcc8..bc9181ab54f0 100644 --- a/pkgs/development/python-modules/pyannote-audio/default.nix +++ b/pkgs/development/python-modules/pyannote-audio/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pyannote-audio"; - version = "3.3.0"; + version = "3.3.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "pyannote"; repo = "pyannote-audio"; rev = "refs/tags/${version}"; - hash = "sha256-AFBT6vpOgEIqEn778TWJ04gai7UOyfOeZdmtliYJLvs="; + hash = "sha256-85whRoc3JoDSE4DqivY/3hfvLHcvgsubR/DLCPtLEP0="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 3c9b1d3bc211..ba171e372c8b 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -80,7 +80,6 @@ buildPythonPackage rec { PARQUET_HOME = arrow-cpp; ARROW_TEST_DATA = lib.optionalString doCheck arrow-cpp.ARROW_TEST_DATA; - doCheck = true; dontUseCmakeConfigure = true; @@ -122,7 +121,7 @@ buildPythonPackage rec { # expects arrow-cpp headers to be bundled "--deselect=pyarrow/tests/test_cpp_internals.py::test_pyarrow_include" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Requires loopback networking "--deselect=pyarrow/tests/test_ipc.py::test_socket_" "--deselect=pyarrow/tests/test_flight.py::test_never_sends_data" @@ -136,7 +135,7 @@ buildPythonPackage rec { # Repr output is printing number instead of enum name so these tests fail "--deselect=pyarrow/tests/test_fs.py::test_get_file_info" ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ # this test requires local networking "--deselect=pyarrow/tests/test_fs.py::test_filesystem_from_uri_gcs" ]; @@ -152,7 +151,7 @@ buildPythonPackage rec { mv pyarrow/conftest.py pyarrow/tests/parent_conftest.py substituteInPlace pyarrow/tests/conftest.py --replace ..conftest .parent_conftest '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # OSError: [Errno 24] Too many open files ulimit -n 1024 ''; diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index 7c7b4b360070..32f1a6b9736c 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, setuptools, pyasn1, pytestCheckHook, @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "pyasn1-modules"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,9 +20,18 @@ buildPythonPackage rec { owner = "pyasn1"; repo = "pyasn1-modules"; rev = "refs/tags/v${version}"; - hash = "sha256-UJycVfj08+3zjHPji5Qlh3yqeS30dEwu1pyrN1yo1Vc="; + hash = "sha256-7tCmhADC8LuswonL4QQ01/DD0RzeRLFJrsU49On4fqY="; }; + patches = [ + # Stop using pyasn1.compat.octets, https://github.com/pyasn1/pyasn1-modules/pull/22 + (fetchpatch { + name = "pyasn1-compat.patch"; + url = "https://github.com/pyasn1/pyasn1-modules/commit/079c176eb00ed7352c9696efa12a0577beeecd71.patch"; + hash = "sha256-k/7P0RnhK57BUFZFFBDyFvroFF9lhonNhD/XXNGoiMk="; + }) + ]; + build-system = [ setuptools ]; dependencies = [ pyasn1 ]; diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix index 4c9f519fe28a..a12b1ff8bb55 100644 --- a/pkgs/development/python-modules/pyasn1/default.nix +++ b/pkgs/development/python-modules/pyasn1/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyasn1"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OjWrLEte+Y4X397IqwdARvvaduKBxacGzNgjKM/I9kw="; + hash = "sha256-b1gNK92ENlOAgwrPRVUPJRFGn2c8tKWuOFejFwEosDQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index bf3fe63b474b..43432a2d1428 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -25,12 +25,13 @@ srptools, stdenv, tabulate, + tinytag, zeroconf, }: buildPythonPackage rec { pname = "pyatv"; - version = "0.15.1"; + version = "0.16.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +40,7 @@ buildPythonPackage rec { owner = "postlund"; repo = "pyatv"; rev = "refs/tags/v${version}"; - hash = "sha256-8ODhDuc4jaLtrLZYd1yJlpYygO6KaguyR/yLWb/rMR4="; + hash = "sha256-yjPbSTmHoKnVwNArZw5mGf3Eh4Ei1+DkY9y2XRRy4YA="; }; postPatch = '' @@ -77,6 +78,7 @@ buildPythonPackage rec { requests srptools tabulate + tinytag zeroconf ]; @@ -95,7 +97,7 @@ buildPythonPackage rec { # https://github.com/postlund/pyatv/issues/2365 "test_simple_dispatch" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # tests/protocols/raop/test_raop_functional.py::test_stream_retransmission[raop_properties2-2-True] - assert False "test_stream_retransmission" ]; diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index 6972373eea32..5af9c6561a0d 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -1,33 +1,42 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "pybase64"; - version = "1.3.2"; - format = "setuptools"; + version = "1.4.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-Mu+ZPFWCHayavXZ+5GVqUBOy7YvxElyruufoTSuZEDg="; + src = fetchFromGitHub { + owner = "mayeut"; + repo = "pybase64"; + rev = "refs/tags/v${version}"; + fetchSubmodules = true; + hash = "sha256-Yl0P9Ygy6IirjSFrutl+fmn4BnUL1nXzbQgADNQFg3I="; }; - nativeCheckInputs = [ pytestCheckHook ]; + build-system = [ setuptools ]; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ]; pythonImportsCheck = [ "pybase64" ]; - meta = with lib; { + meta = { description = "Fast Base64 encoding/decoding"; mainProgram = "pybase64"; homepage = "https://github.com/mayeut/pybase64"; - changelog = "https://github.com/mayeut/pybase64/releases/tag/v${version}"; - license = licenses.bsd2; + changelog = "https://github.com/mayeut/pybase64/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; + license = lib.licenses.bsd2; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 3d150e82a501..80db75b9551a 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "pybids"; - version = "0.16.5"; + version = "0.17.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-5MAp5CYlOh1WxsXOE/LHVNm/K4VGFaLKWaaKYwKjQIM="; + hash = "sha256-4MpFXGh2uOHCjMa213CF6QzKCyEQNiN1moyNolEcySQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 6dab8d700d1e..8c09e3ff61c6 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -33,7 +33,7 @@ let # support for C++17 aligned allocations on macOS. # Tell clang we’re targeting 10.13 on x86_64-darwin while continuing to use the default SDK. stdenv' = - if stdenv.isDarwin && stdenv.isx86_64 then + if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then python.stdenv.override (oldStdenv: { buildPlatform = oldStdenv.buildPlatform // { darwinMinVersion = "10.13"; @@ -50,14 +50,14 @@ let in buildPythonPackage rec { pname = "pybind11"; - version = "2.13.5"; + version = "2.13.6"; pyproject = true; src = fetchFromGitHub { owner = "pybind"; repo = "pybind11"; - rev = "v${version}"; - hash = "sha256-cpxhrTFihA+gWmX62a+EQF3lccUyvu+d1MU2IC/CN6Q="; + rev = "refs/tags/v${version}"; + hash = "sha256-SNLdtrOjaC3lGHN9MAqTf51U9EzNKQLyTMNPe0GcdrU="; }; build-system = [ @@ -115,7 +115,7 @@ buildPythonPackage rec { "tests/extra_setuptools/test_setuphelper.py" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # expects KeyError, gets RuntimeError # https://github.com/pybind/pybind11/issues/4243 "test_cross_module_exception_translator" diff --git a/pkgs/development/python-modules/pyblu/default.nix b/pkgs/development/python-modules/pyblu/default.nix index fdabb3f9ef67..c149661969ea 100644 --- a/pkgs/development/python-modules/pyblu/default.nix +++ b/pkgs/development/python-modules/pyblu/default.nix @@ -12,16 +12,18 @@ buildPythonPackage rec { pname = "pyblu"; - version = "1.0.2"; + version = "1.0.4"; pyproject = true; src = fetchFromGitHub { owner = "LouisChrist"; repo = "pyblu"; rev = "refs/tags/v${version}"; - hash = "sha256-olQZ7e4RmjL1KVtJvPsXICgL2VCOIFnZCW8WjKO3X+Q="; + hash = "sha256-BDuptBC72XG+q/5MlbPMjYDIhWKg4gfEo2pLOflwQaM="; }; + pythonRelaxDeps = [ "aiohttp" ]; + build-system = [ poetry-core ]; dependencies = [ diff --git a/pkgs/development/python-modules/pybluez/default.nix b/pkgs/development/python-modules/pybluez/default.nix index d3842358db2f..ca745113c592 100644 --- a/pkgs/development/python-modules/pybluez/default.nix +++ b/pkgs/development/python-modules/pybluez/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/pybluez/pybluez"; license = licenses.gpl2; maintainers = with maintainers; [ leenaars ]; - broken = stdenv.isDarwin; # requires pyobjc-core, pyobjc-framework-Cocoa + broken = stdenv.hostPlatform.isDarwin; # requires pyobjc-core, pyobjc-framework-Cocoa }; } diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 4f4859e007c3..6eac9f1b72d3 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pycairo"; - version = "1.26.0"; + version = "1.27.0"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pygobject"; repo = "pycairo"; rev = "refs/tags/v${version}"; - hash = "sha256-AUnMPsGFkCgVKUdQfym35ZqrA48wq31BNsvc2puoCl8="; + hash = "sha256-P9AC8+WlokAxoy6KTJqAz7kOYK/FQVjIKWuj8jQw2OA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index caca2f9f3d0a..65768bdc806f 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -43,8 +43,6 @@ buildPythonPackage { configureScript = "./autogen.sh"; - doCheck = true; - meta = with lib; { description = "Python wrapper to libcangjie"; homepage = "http://cangjians.github.io/projects/pycangjie/"; diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index 0707726f58e9..7eee56d744f1 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pycaption"; - version = "2.2.12"; + version = "2.2.15"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pbs"; repo = "pycaption"; rev = "refs/tags/${version}"; - hash = "sha256-vdSoqNWEubK0np14EiI/hRbrEx0722qg6Ggcpmhz8FM="; + hash = "sha256-07Llsp2Cvvo9WueeTBJnAos3uynhYL0gT5U21EI9dHY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index f14248b781b0..dba7ba778363 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pychromecast"; - version = "14.0.1"; + version = "14.0.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyChromecast"; inherit version; - hash = "sha256-4W4Kf5SIMZGRuLT6IcoL60vxLu2lyb9kAkEYjyvqCj4="; + hash = "sha256-qGce5OpKcJXi4GcOIhUUXsHj4KoHN/901kiuTcJosrE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyclip/default.nix b/pkgs/development/python-modules/pyclip/default.nix index 65f9afc40903..78dc831ccc65 100644 --- a/pkgs/development/python-modules/pyclip/default.nix +++ b/pkgs/development/python-modules/pyclip/default.nix @@ -30,23 +30,23 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ xclip xvfb-run ]; checkPhase = '' runHook preCheck - ${lib.optionalString stdenv.isLinux "xvfb-run -s '-screen 0 800x600x24'"} pytest tests + ${lib.optionalString stdenv.hostPlatform.isLinux "xvfb-run -s '-screen 0 800x600x24'"} pytest tests runHook postCheck ''; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Cross-platform clipboard utilities supporting both binary and text data"; mainProgram = "pyclip"; homepage = "https://github.com/spyoungtech/pyclip"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ mcaju ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix index edde76cd28d8..d016c8bd7003 100644 --- a/pkgs/development/python-modules/pyclipper/default.nix +++ b/pkgs/development/python-modules/pyclipper/default.nix @@ -2,27 +2,26 @@ lib, fetchFromGitHub, buildPythonPackage, + setuptools, setuptools-scm, cython, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "pyclipper"; - version = "1.3.0.post5"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "1.3.0.post6"; + pyproject = true; src = fetchFromGitHub { owner = "fonttools"; - repo = pname; + repo = "pyclipper"; rev = "refs/tags/${version}"; - hash = "sha256-FKpP+tgJFzhij3wDQsAgwrTNnny7lgmN+tlSQ9JgG+Q="; + hash = "sha256-s2D0ipDatAaF7A1RYOKyI31nkfc/WL3vHWsAMbo+WcY="; }; - nativeBuildInputs = [ + build-system = [ + setuptools setuptools-scm cython ]; diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index 9c6133207a3c..8f987478655d 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, pythonOlder, - fetchPypi, + fetchFromGitHub, lib, python, pytestCheckHook, @@ -15,14 +15,16 @@ buildPythonPackage rec { format = "setuptools"; - src = fetchPypi { - inherit pname version; - hash = "sha256-RC+VAUG09D33Ut0wNRH/3tOgTCtvt/ZZgFdPDDHm55w="; + src = fetchFromGitHub { + owner = "PyCQA"; + repo = "pycodestyle"; + rev = version; + hash = "sha256-YN1KOJ8f+VY9vJTWm3aTOOai66dveKOKOpeBkZKkC2A="; }; pythonImportsCheck = [ "pycodestyle" ]; - nativCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # https://github.com/PyCQA/pycodestyle/blob/2.11.0/tox.ini#L16 postCheck = '' diff --git a/pkgs/development/python-modules/pycookiecheat/default.nix b/pkgs/development/python-modules/pycookiecheat/default.nix index be5d6f82cba6..e40731c554f0 100644 --- a/pkgs/development/python-modules/pycookiecheat/default.nix +++ b/pkgs/development/python-modules/pycookiecheat/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "pycookiecheat"; - version = "0.7.0"; + version = "0.8.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "n8henrie"; repo = "pycookiecheat"; rev = "refs/tags/v${version}"; - hash = "sha256-x568e4M7fz93hq0y06Grz9GlrjGV38GxWd+PhNiAyBY="; + hash = "sha256-jOyTfh2ZhKW/pMU7T5tfxaM0l/g59N+mirnbc0FLPbQ="; }; pythonRelaxDeps = [ @@ -62,7 +62,7 @@ buildPythonPackage rec { "test_load_firefox_cookie_db" "test_no_cookies" "test_warns_for_string_browser" - ] ++ lib.optionals stdenv.isDarwin [ "test_slack_config" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_slack_config" ]; meta = with lib; { description = "Borrow cookies from your browser's authenticated session for use in Python scripts"; diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix index 67bbfa1c3d97..4372afb0efe1 100644 --- a/pkgs/development/python-modules/pycparser/default.nix +++ b/pkgs/development/python-modules/pycparser/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, unittestCheckHook, pythonOlder, }: @@ -9,13 +10,15 @@ buildPythonPackage rec { pname = "pycparser"; version = "2.22"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-SRyL6cBA9TkPW/RKWwd1K9B/Vu35kjgbBccBQ57sEPY="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ unittestCheckHook ]; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/pycrdt-websocket/default.nix b/pkgs/development/python-modules/pycrdt-websocket/default.nix index 3d7d3d45a19e..008c72dd209f 100644 --- a/pkgs/development/python-modules/pycrdt-websocket/default.nix +++ b/pkgs/development/python-modules/pycrdt-websocket/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -27,16 +26,14 @@ buildPythonPackage rec { pname = "pycrdt-websocket"; - version = "0.14.2"; + version = "0.15.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt-websocket"; rev = "refs/tags/v${version}"; - hash = "sha256-YsAeEUFxCwu7KA2d83J/rb1IlZTQZZecHJAewh+TqWs="; + hash = "sha256-O0GRk81at8bgv+/4au8A55dZK2A28+ghy3sitAAZQBI="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index a2182a11dc06..efdd3eec91de 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", @@ -32,9 +32,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "bitflags" @@ -71,9 +71,9 @@ checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "dashmap" -version = "6.0.1" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ "cfg-if", "crossbeam-utils", @@ -152,18 +152,18 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] [[package]] name = "libc" -version = "0.2.158" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "lock_api" @@ -198,15 +198,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot_core" @@ -223,28 +223,28 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] [[package]] name = "pycrdt" -version = "0.9.11" +version = "0.10.6" dependencies = [ "pyo3", "yrs", @@ -252,9 +252,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.22.2" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" +checksum = "3d922163ba1f79c04bc49073ba7b32fd5a8d3b76a87c955921234b8e77333c51" dependencies = [ "cfg-if", "indoc", @@ -270,9 +270,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.22.2" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" +checksum = "bc38c5feeb496c8321091edf3d63e9a6829eab4b863b4a6a65f26f3e9cc6b179" dependencies = [ "once_cell", "target-lexicon", @@ -280,9 +280,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.22.2" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" +checksum = "94845622d88ae274d2729fcefc850e63d7a3ddff5e3ce11bd88486db9f1d357d" dependencies = [ "libc", "pyo3-build-config", @@ -290,9 +290,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.22.2" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" +checksum = "e655aad15e09b94ffdb3ce3d217acf652e26bbc37697ef012f5e5e348c716e5e" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -302,9 +302,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.22.2" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" +checksum = "ae1e3f09eecd94618f60a455a23def79f79eba4dc561a97324bf9ac8c6df30ce" dependencies = [ "heck", "proc-macro2", @@ -324,9 +324,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags", ] @@ -345,18 +345,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.209" +version = "1.0.213" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.213" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5" dependencies = [ "proc-macro2", "quote", @@ -365,9 +365,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", "memchr", @@ -392,9 +392,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" dependencies = [ "proc-macro2", "quote", @@ -409,18 +409,18 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", @@ -429,9 +429,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unindent" @@ -447,9 +447,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -458,9 +458,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", @@ -473,9 +473,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -483,9 +483,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", @@ -496,9 +496,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "windows-targets" @@ -566,9 +566,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "yrs" -version = "0.21.1" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6eac182a01ef4cbf4edb5e71e2c560a34144ae82680aab66a62c172b7ae2a2" +checksum = "81de5913bca29f43a1d12ca92a7b39a2945e9420e01602a7563917c7bfc60f70" dependencies = [ "arc-swap", "async-lock", diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index f95b0d7d21d4..a7704735a3cb 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -3,27 +3,34 @@ stdenv, buildPythonPackage, fetchFromGitHub, + + # buildInputs libiconv, + + # nativeBuildInputs rustPlatform, + + # tests anyio, objsize, pydantic, pytestCheckHook, trio, y-py, + nix-update-script, }: buildPythonPackage rec { pname = "pycrdt"; - version = "0.9.11"; + version = "0.10.6"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt"; - rev = "refs/tags/v${version}"; - hash = "sha256-62r3AO+x9du6UjIdtqDPmwJ30/YmQxbPcCXgOaGNtL0="; + rev = "refs/tags/${version}"; + hash = "sha256-TKSBTpOvAr1/HBn3HnwNdEwM1hgbvPdice8bcVhVmH0="; }; postPatch = '' @@ -37,7 +44,7 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; dependencies = [ anyio ]; diff --git a/pkgs/development/python-modules/pycron/default.nix b/pkgs/development/python-modules/pycron/default.nix index a5bd2ee07467..e885e0895a28 100644 --- a/pkgs/development/python-modules/pycron/default.nix +++ b/pkgs/development/python-modules/pycron/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, + poetry-core, arrow, delorean, pendulum, @@ -13,17 +13,17 @@ buildPythonPackage rec { pname = "pycron"; - version = "3.0.0"; + version = "3.1.1"; pyproject = true; src = fetchFromGitHub { owner = "kipe"; repo = "pycron"; - rev = version; - hash = "sha256-+67yU2o31SdgnV3CtiEkLHDltQYgosnqxEuO51rGE4o="; + rev = "refs/tags/${version}"; + hash = "sha256-t53u18lCk6tF4Hr/BrEM2gWG+QOFIEkjyEKNXIr3ibs="; }; - build-system = [ setuptools ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ arrow diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix index 5509173bd985..96aad663367f 100644 --- a/pkgs/development/python-modules/pyct/default.nix +++ b/pkgs/development/python-modules/pyct/default.nix @@ -2,41 +2,57 @@ lib, buildPythonPackage, fetchPypi, - param, - pytestCheckHook, pythonAtLeast, + + # build-system + setuptools, + + # dependencies + param, pyyaml, requests, + + # tests + pytestCheckHook, }: buildPythonPackage rec { pname = "pyct"; version = "0.5.0"; - format = "setuptools"; - - disabled = pythonAtLeast "3.12"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-3Z9KxcvY43w1LAQDYGLTxfZ+/sdtQEdh7xawy/JqpqA="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ param pyyaml requests ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + # Only the command line doesn't work on with Python 3.12, due to usage of + # deprecated distutils module. Not disabling it totally. + disabledTestPaths = lib.optionals (pythonAtLeast "3.12") [ + "pyct/tests/test_cmd.py" + ]; pythonImportsCheck = [ "pyct" ]; - meta = with lib; { + meta = { description = "ClI for Python common tasks for users"; mainProgram = "pyct"; homepage = "https://github.com/pyviz/pyct"; changelog = "https://github.com/pyviz-dev/pyct/releases/tag/v${version}"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix index 79c1646b1059..8a89193a64eb 100644 --- a/pkgs/development/python-modules/pycups/default.nix +++ b/pkgs/development/python-modules/pycups/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-hD44XB2/aUmWyoTvAqfzDCg3YDVYj1++rNa64AXPfI0="; }; - buildInputs = [ cups ] ++ lib.optional stdenv.isDarwin libiconv; + buildInputs = [ cups ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; # Wants to connect to CUPS doCheck = false; diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 689e23e3c1ae..2d18e7110a7b 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -4,30 +4,48 @@ buildPythonPackage, isPyPy, fetchPypi, + fetchpatch, pythonOlder, curl, openssl, bottle, pytestCheckHook, flaky, + setuptools, }: buildPythonPackage rec { pname = "pycurl"; version = "7.45.3"; - format = "setuptools"; - disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208 + pyproject = true; + + disabled = isPyPy || pythonOlder "3.8"; # https://github.com/pycurl/pycurl/issues/208 src = fetchPypi { inherit pname version; hash = "sha256-jCRxr5B5rXmOFkXsCw09QiPbaHN50X3TanBjdEn4HWs="; }; + patches = [ + # Don't use -flat_namespace on macOS + # https://github.com/pycurl/pycurl/pull/855 remove on next update + (fetchpatch { + name = "no_flat_namespace.patch"; + url = "https://github.com/pycurl/pycurl/commit/7deb85e24981e23258ea411dcc79ca9b527a297d.patch"; + hash = "sha256-tk0PQy3cHyXxFnoVYNQV+KD/07i7AUYHNJnrw6H8tHk="; + }) + ]; + + __darwinAllowLocalNetworking = true; + preConfigure = '' - substituteInPlace setup.py --replace '--static-libs' '--libs' + substituteInPlace setup.py \ + --replace-fail '--static-libs' '--libs' export PYCURL_SSL_LIBRARY=openssl ''; + build-system = [ setuptools ]; + buildInputs = [ curl openssl @@ -35,12 +53,10 @@ buildPythonPackage rec { nativeBuildInputs = [ curl ]; - __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ bottle - pytestCheckHook flaky + pytestCheckHook ]; pytestFlagsArray = [ @@ -52,6 +68,8 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; + pythonImportsCheck = [ "pycurl" ]; + disabledTests = [ # tests that require network access @@ -76,15 +94,23 @@ buildPythonPackage rec { "test_request_with_verifypeer" # https://github.com/pycurl/pycurl/issues/836 "test_proxy_tlsauth" + # AssertionError: 'Москва' != '\n... + "test_encoded_unicode_header" + # https://github.com/pycurl/pycurl/issues/856 + "test_multi_info_read" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Fatal Python error: Segmentation fault "cadata_test" ]; meta = with lib; { - homepage = "http://pycurl.io/"; description = "Python Interface To The cURL library"; + homepage = "http://pycurl.io/"; + changelog = + "https://github.com/pycurl/pycurl/blob/REL_" + + replaceStrings [ "." ] [ "_" ] version + + "/ChangeLog"; license = with licenses; [ lgpl2Only mit diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix index 698a9e20595a..5dc9dec21247 100644 --- a/pkgs/development/python-modules/pycyphal/default.nix +++ b/pkgs/development/python-modules/pycyphal/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nunavut ]; - passthru.optional-dependencies = { + optional-dependencies = { transport-can-pythoncan = [ python-can ] ++ python-can.optional-dependencies.serial; transport-serial = [ cobs @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-asyncio - ] ++ builtins.foldl' (x: y: x ++ y) [ ] (builtins.attrValues passthru.optional-dependencies); + ] ++ builtins.foldl' (x: y: x ++ y) [ ] (builtins.attrValues optional-dependencies); preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix index 48e8f7188bce..716d9584b0d6 100644 --- a/pkgs/development/python-modules/pydantic-core/default.nix +++ b/pkgs/development/python-modules/pydantic-core/default.nix @@ -18,14 +18,14 @@ let pydantic-core = buildPythonPackage rec { pname = "pydantic-core"; - version = "2.20.1"; + version = "2.23.4"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-core"; rev = "refs/tags/v${version}"; - hash = "sha256-iFyCFkFzvTL6es3L96pyq/s6SS7h1mn+bS0SPcsxXxA="; + hash = "sha256-WSSwiqmdQN4zB7fqaniHyh4SHmrGeDHdCGpiSJZT7Mg="; }; patches = [ ./01-remove-benchmark-flags.patch ]; @@ -33,7 +33,7 @@ let cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-4v4g9/8ZsQUqkwA29/S/BXn2Ea4eSOnMhEbhDvsGuQU="; + hash = "sha256-dX3wDnKQLmC+FabC0van3czkQLRcrBbtp9b90PgepZs="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ let typing-extensions ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; dependencies = [ typing-extensions ]; diff --git a/pkgs/development/python-modules/pydantic-extra-types/default.nix b/pkgs/development/python-modules/pydantic-extra-types/default.nix index b9da2b299ecf..588ed7b5312e 100644 --- a/pkgs/development/python-modules/pydantic-extra-types/default.nix +++ b/pkgs/development/python-modules/pydantic-extra-types/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, hatchling, @@ -46,6 +47,14 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all; + disabledTests = [ + # outdated jsonschema fixture + "test_json_schema" + ]; + + # PermissionError accessing '/etc/localtime' + disabledTestPaths = lib.optionals stdenv.isDarwin [ "tests/test_pendulum_dt.py" ]; + meta = with lib; { changelog = "https://github.com/pydantic/pydantic-extra-types/blob/${src.rev}/HISTORY.md"; description = "Extra Pydantic types"; diff --git a/pkgs/development/python-modules/pydantic-settings/default.nix b/pkgs/development/python-modules/pydantic-settings/default.nix index 86dd243ac6ae..6c17b126a805 100644 --- a/pkgs/development/python-modules/pydantic-settings/default.nix +++ b/pkgs/development/python-modules/pydantic-settings/default.nix @@ -14,7 +14,7 @@ let self = buildPythonPackage rec { pname = "pydantic-settings"; - version = "2.3.4"; + version = "2.5.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ let owner = "pydantic"; repo = "pydantic-settings"; rev = "refs/tags/v${version}"; - hash = "sha256-tLF7LvsXryhbThaNl6koM0bGM8EOaA+aH2fGqzR8GKE="; + hash = "sha256-VkvkF7tJfFknYCXz7tq1578ebW79Ovx1tOFO8o8wK/I="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pydantic-yaml/default.nix b/pkgs/development/python-modules/pydantic-yaml/default.nix index 50f14837476a..bb7f1726a69e 100644 --- a/pkgs/development/python-modules/pydantic-yaml/default.nix +++ b/pkgs/development/python-modules/pydantic-yaml/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydantic-yaml"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "NowanIlfideme"; repo = "pydantic-yaml"; rev = "refs/tags/v${version}"; - hash = "sha256-Kv1nLR91iwShmCgduXA07+a+2EP1nnvaC7fBAn/ufEM="; + hash = "sha256-xlFSczMCEkSDhtzSl8qzZwwZd0IelPmjTEV+Jk9G0fI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pydantic/1.nix b/pkgs/development/python-modules/pydantic/1.nix index 2b268d2bf543..cfd0df8c7603 100644 --- a/pkgs/development/python-modules/pydantic/1.nix +++ b/pkgs/development/python-modules/pydantic/1.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { dotenv = [ python-dotenv ]; email = [ email-validator ]; }; @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-mock pytest7CheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ # https://github.com/pydantic/pydantic/issues/4817 diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 5ee65602794b..9e008f9565e1 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -20,6 +20,7 @@ cloudpickle, email-validator, dirty-equals, + jsonschema, pytestCheckHook, pytest-mock, eval-type-backport, @@ -28,7 +29,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "2.8.2"; + version = "2.9.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +38,7 @@ buildPythonPackage rec { owner = "pydantic"; repo = "pydantic"; rev = "refs/tags/v${version}"; - hash = "sha256-9Tbm5Y1wSPa3lTdI8y95csYHua7nKUIYAfxSn+3J5zI="; + hash = "sha256-Eb/9k9bNizRyGhjbW/LAE/2R0Ino4DIRDy5ZrQuzJ7o="; }; buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; @@ -61,6 +62,7 @@ buildPythonPackage rec { [ cloudpickle dirty-equals + jsonschema pytest-mock pytestCheckHook rich diff --git a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index 1cd06c0d2be6..6bb1c8386bce 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.4"; + version = "0.16.0"; format = "wheel"; @@ -24,7 +24,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; - hash = "sha256-ITatDpUA0JSflhZ+Y/PimGIAQK6o+cdGIZWe2l1M+OY="; + hash = "sha256-GMgQ7k5n4FKB43HhVsH7W7D6HydHJARhsiUnL32NV9g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydeako/default.nix b/pkgs/development/python-modules/pydeako/default.nix new file mode 100644 index 000000000000..6fabf92f5f84 --- /dev/null +++ b/pkgs/development/python-modules/pydeako/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + mock, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + setuptools, + zeroconf, +}: + +buildPythonPackage rec { + pname = "pydeako"; + version = "0.5.4"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "DeakoLights"; + repo = "pydeako"; + rev = "refs/tags/${version}"; + hash = "sha256-Z0H5VhWfjmvvCGTX//hds9dwk2wJSPXckNac1PkQZNA="; + }; + + build-system = [ setuptools ]; + + dependencies = [ zeroconf ]; + + # Module has no tests + #doCheck = false; + + nativeCheckInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "pydeako" ]; + + meta = { + description = "Module used to discover and communicate with Deako devices over the network locally"; + homepage = "https://github.com/DeakoLights/pydeako"; + changelog = "https://github.com/DeakoLights/pydeako/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pydeck/default.nix b/pkgs/development/python-modules/pydeck/default.nix index e0c77c5a2ce1..51cb247a5179 100644 --- a/pkgs/development/python-modules/pydeck/default.nix +++ b/pkgs/development/python-modules/pydeck/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { carto = [ # pydeck-carto ]; @@ -61,7 +61,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pandas - ] ++ passthru.optional-dependencies.jupyter; + ] ++ optional-dependencies.jupyter; # tries to start a jupyter server disabledTests = [ "test_nbconvert" ]; diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 68e31e000270..55923513fbfc 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "116"; + version = "118"; pyproject = true; disabled = pythonOlder "3.12"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-XtcAs+xKSTJcQN0mCj6ewkT7owvA7nlZ8PhWfL9NZh8="; + hash = "sha256-CbV/LGj09TfLYvaVGr2+LV76DRkz0kw7qsGbtL5A45g="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index 23f9353ac9ca..f2633d060b14 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -13,23 +13,23 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.12.20"; + version = "2.0.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "thebjorn"; repo = "pydeps"; rev = "refs/tags/v${version}"; - hash = "sha256-d6EeeNem+HfuipKF5ZOI48c11j0ozGrBP4XlqTx+fJ4="; + hash = "sha256-ZLFcaWzu8iYBnbSh1Ua4fvFyYD5q71R/iIqzRUKRn1E="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; buildInputs = [ graphviz ]; - propagatedBuildInputs = [ + dependencies = [ graphviz stdlib-list ]; @@ -55,10 +55,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python module dependency visualization"; - mainProgram = "pydeps"; homepage = "https://github.com/thebjorn/pydeps"; changelog = "https://github.com/thebjorn/pydeps/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ fab ]; + mainProgram = "pydeps"; }; } diff --git a/pkgs/development/python-modules/pydevd/default.nix b/pkgs/development/python-modules/pydevd/default.nix index 8cb99dd9806f..207e5e5c9edf 100644 --- a/pkgs/development/python-modules/pydevd/default.nix +++ b/pkgs/development/python-modules/pydevd/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { # https://github.com/fabioz/PyDev.Debugger/issues/269 "test_evaluate_expression" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_multiprocessing_simple" "test_evaluate_exception_trace" ]; diff --git a/pkgs/development/python-modules/pydexcom/default.nix b/pkgs/development/python-modules/pydexcom/default.nix index 996fce70df66..29a250160add 100644 --- a/pkgs/development/python-modules/pydexcom/default.nix +++ b/pkgs/development/python-modules/pydexcom/default.nix @@ -2,32 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, + hatch-vcs, + hatchling, pythonOlder, requests, - setuptools, - setuptools-scm, }: buildPythonPackage rec { pname = "pydexcom"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "gagebenne"; repo = "pydexcom"; rev = "refs/tags/${version}"; - hash = "sha256-gMUdVdO2Yy41Nl+mn9dEegb6/IRBwoBviPhuz3CMfS8="; + hash = "sha256-cf3AhqaA5aij2NCeFqruoeE0ovJSgZgEnVHcE3iXJ1s="; }; - nativeBuildInputs = [ - setuptools - setuptools-scm + build-system = [ + hatchling + hatch-vcs ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; # Tests are interacting with the Dexcom API doCheck = false; @@ -38,7 +38,7 @@ buildPythonPackage rec { description = "Python API to interact with Dexcom Share service"; homepage = "https://github.com/gagebenne/pydexcom"; changelog = "https://github.com/gagebenne/pydexcom/releases/tag/${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pydicom-seg/default.nix b/pkgs/development/python-modules/pydicom-seg/default.nix index 9f06d7b44dd0..35dd22e94538 100644 --- a/pkgs/development/python-modules/pydicom-seg/default.nix +++ b/pkgs/development/python-modules/pydicom-seg/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchpatch, pythonOlder, - pytestCheckHook, + pytest7CheckHook, poetry-core, jsonschema, numpy, @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pydicom-seg"; version = "0.4.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -38,18 +38,16 @@ buildPythonPackage rec { pythonRelaxDeps = [ "jsonschema" ]; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ jsonschema numpy pydicom simpleitk ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytest7CheckHook ]; pythonImportsCheck = [ "pydicom_seg" ]; diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index e2d86333c1cc..94822a24d444 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -66,11 +66,11 @@ buildPythonPackage { # tries to remove a dicom inside $HOME/.pydicom/data/ and download it again "test_fetch_data_files" ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # https://github.com/pydicom/pydicom/issues/1386 "test_array" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # flaky, hard to reproduce failure outside hydra "test_time_check" ]; diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix index 8e53cf086501..47abe284a867 100644 --- a/pkgs/development/python-modules/pydocstyle/default.nix +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -42,9 +42,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ snowballstemmer ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies.toml = [ tomli ]; + optional-dependencies.toml = [ tomli ]; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.toml; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.toml; disabledTestPaths = [ "src/tests/test_integration.py" # runs pip install diff --git a/pkgs/development/python-modules/pydrive2/default.nix b/pkgs/development/python-modules/pydrive2/default.nix index f96380877ecc..a72dcdefabb8 100644 --- a/pkgs/development/python-modules/pydrive2/default.nix +++ b/pkgs/development/python-modules/pydrive2/default.nix @@ -17,30 +17,29 @@ buildPythonPackage rec { pname = "pydrive2"; - version = "1.19.0"; + version = "1.20.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - pname = "PyDrive2"; - inherit version; - hash = "sha256-Ia6n2idjXCw/cFDgICBhkfOwMFxlUDFebo491Sb4tTE="; + inherit pname version; + hash = "sha256-Foum622DybCC8FvIy5Xuk85iOJ2ztVn/DnabW7iysQo="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ google-api-python-client oauth2client pyopenssl pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { fsspec = [ appdirs fsspec diff --git a/pkgs/development/python-modules/pydruid/default.nix b/pkgs/development/python-modules/pydruid/default.nix index 69ba702507b0..37838c6fed9d 100644 --- a/pkgs/development/python-modules/pydruid/default.nix +++ b/pkgs/development/python-modules/pydruid/default.nix @@ -41,17 +41,15 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pycurl - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "pydruid" ]; - passthru = { - optional-dependencies = { - pandas = [ pandas ]; - async = [ tornado ]; - sqlalchemy = [ sqlalchemy ]; - # druid has a `cli` extra, but it doesn't work with nixpkgs pygments - }; + optional-dependencies = { + pandas = [ pandas ]; + async = [ tornado ]; + sqlalchemy = [ sqlalchemy ]; + # druid has a `cli` extra, but it doesn't work with nixpkgs pygments }; meta = with lib; { diff --git a/pkgs/development/python-modules/pydsdl/default.nix b/pkgs/development/python-modules/pydsdl/default.nix index d74657c16784..c7351b52fb52 100644 --- a/pkgs/development/python-modules/pydsdl/default.nix +++ b/pkgs/development/python-modules/pydsdl/default.nix @@ -2,33 +2,35 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { pname = "pydsdl"; - version = "1.18.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "1.22.0"; + pyproject = true; src = fetchFromGitHub { owner = "OpenCyphal"; - repo = pname; + repo = "pydsdl"; rev = "refs/tags/${version}"; - hash = "sha256-sn7KoJmJbr7Y+N9PAXyhJnts/hW+Gi06nrHj5VIDZMU="; + hash = "sha256-Q6Zt7qiFZvTK2pF4nWfHbjwQHZffzKOad6X/HQ94EUo="; }; + build-system = [ setuptools ]; + # allow for writable directory for darwin preBuild = '' export HOME=$TMPDIR ''; - # Module doesn't contain tests - doCheck = false; - pythonImportsCheck = [ "pydsdl" ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "pydsdl/_test.py" ]; + meta = with lib; { description = "Library to process Cyphal DSDL"; longDescription = '' diff --git a/pkgs/development/python-modules/pyduotecno/default.nix b/pkgs/development/python-modules/pyduotecno/default.nix index 7333019c9055..283cb30f8ab1 100644 --- a/pkgs/development/python-modules/pyduotecno/default.nix +++ b/pkgs/development/python-modules/pyduotecno/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyduotecno"; - version = "2024.9.0"; + version = "2024.10.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "pyDuotecno"; rev = "refs/tags/${version}"; - hash = "sha256-h4OB4V4O645QAPdtO+OtLWffTuA7xlzIveIl+Cyhg3w="; + hash = "sha256-I/ZA2ooa6nunUr/4K+FWAGMOdcJDfGzE99jJ8zTe2Po="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyeclib/default.nix b/pkgs/development/python-modules/pyeclib/default.nix index 0ada1b1306bd..9cad362d2243 100644 --- a/pkgs/development/python-modules/pyeclib/default.nix +++ b/pkgs/development/python-modules/pyeclib/default.nix @@ -12,21 +12,17 @@ buildPythonPackage rec { pname = "pyeclib"; - version = "1.6.1"; + version = "1.6.2"; pyproject = true; src = fetchFromGitHub { owner = "openstack"; repo = "pyeclib"; rev = "refs/tags/${version}"; - hash = "sha256-pa3majZ68+DQGtgGCpZVRshof+w9jvpxreo4dkckLXk="; + hash = "sha256-LZQNJU7QEoHo+RWvHnQkNxBg6t322u/c3PyBhy1eVZc="; }; postPatch = '' - # patch dlopen call - substituteInPlace src/c/pyeclib_c/pyeclib_c.c \ - --replace-fail "liberasurecode.so" "${liberasurecode}/lib/liberasurecode.so" - # python's platform.platform() doesn't return "Darwin" (anymore?) substituteInPlace setup.py \ --replace-fail '"Darwin"' '"macOS"' @@ -39,7 +35,8 @@ buildPythonPackage rec { preBuild = let - ldLibraryPathEnvName = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + ldLibraryPathEnvName = + if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' # required for the custom _find_library function in setup.py diff --git a/pkgs/development/python-modules/pyeconet/default.nix b/pkgs/development/python-modules/pyeconet/default.nix index 137ca9d57757..fd68e98504c7 100644 --- a/pkgs/development/python-modules/pyeconet/default.nix +++ b/pkgs/development/python-modules/pyeconet/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyeconet"; - version = "0.1.22"; + version = "0.1.23"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "w1ll1am23"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-R6PA/i35vo253J4yowe2fPRZEqStAqmm98k81KDHLQk="; + hash = "sha256-zpaKUEg78vzvuTtVauCUUt0U92NXVyNhEfgKVrRzdnM="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyenvisalink/default.nix b/pkgs/development/python-modules/pyenvisalink/default.nix index 84167f4ae58d..1e2489afa191 100644 --- a/pkgs/development/python-modules/pyenvisalink/default.nix +++ b/pkgs/development/python-modules/pyenvisalink/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyenvisalink"; - version = "4.7"; + version = "4.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-b5v/7+B/yyCnKrWCs0scAuIgV1wSLk6cVa57n+HncUw="; + hash = "sha256-IgYOlH0mYqhRLTO3McBAstChqYWHQkwuOVPL8gKdcTo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyevtk/default.nix b/pkgs/development/python-modules/pyevtk/default.nix index 16081d1cc613..1e84651b6de3 100644 --- a/pkgs/development/python-modules/pyevtk/default.nix +++ b/pkgs/development/python-modules/pyevtk/default.nix @@ -1,23 +1,22 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchPypi, setuptools, numpy, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { pname = "pyevtk"; - version = "1.2.0"; + version = "1.6.0"; pyproject = true; - src = fetchFromGitHub { - owner = "pyscience-projects"; - repo = "pyevtk"; - rev = "refs/tags/v${version}"; - hash = "sha256-HrodoVxjREZiutgRJ3ZUrART29+gAZfpR9f4A4SRh4Q="; + src = fetchPypi { + inherit pname version; + + hash = "sha256-H2vnh2o6AFyCWIYVUdpP5+RP8aLn/yqT1txR3u39pfQ="; }; postPatch = '' @@ -30,7 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "pyevtk" ]; @@ -38,7 +37,6 @@ buildPythonPackage rec { 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-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix index c372ca08adf1..81bcc8ade772 100644 --- a/pkgs/development/python-modules/pyexcel-xls/default.nix +++ b/pkgs/development/python-modules/pyexcel-xls/default.nix @@ -8,7 +8,7 @@ xlwt, pyexcel, pytestCheckHook, - pytest-cov, + pytest-cov-stub, setuptools, }: @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pyexcel - pytest-cov + pytest-cov-stub ]; postPatch = '' diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 68352b43aa74..e353a3ceadae 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.35"; + version = "0.2.54"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-lwsLP29lQmb7MJYPrOfgspdj4qepx7TirEksMASqrb4="; + hash = "sha256-TJ2cjYadXqaX31UXY99/pCeH0T2nFj83AiLdX0SMC3U="; }; build-system = [ setuptools ]; @@ -35,8 +35,8 @@ buildPythonPackage rec { meta = with lib; { description = "Library to fetch the most recent exploit-database"; - homepage = "https://github.com/GoVanguard/pyExploitDb"; - changelog = "https://github.com/GoVanguard/pyExploitDb/blob/master/ChangeLog.md"; + homepage = "https://github.com/Hackman238/pyExploitDb"; + changelog = "https://github.com/Hackman238/pyExploitDb/blob/master/ChangeLog.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index b3cb0f886bd7..eca3180a6176 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -1,26 +1,28 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, glibcLocales, importlib-metadata, - numpy, + packaging, + htslib, + fsspec, pytestCheckHook, - pythonOlder, + biopython, setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "pyfaidx"; - version = "0.8.1.2"; + version = "0.8.1.3"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-2EUkcEVbHnePk5aUR9uOok3rRiTHxAdpUWRZy2+HvDM="; + src = fetchFromGitHub { + owner = "mdshw5"; + repo = "pyfaidx"; + rev = "refs/tags/v${version}"; + hash = "sha256-PKcopIu/0ko4Jl2+G0ZivZXvMwACeIFFFlPt5dlDDfQ="; }; build-system = [ @@ -28,27 +30,31 @@ buildPythonPackage rec { setuptools-scm ]; - dependencies = [ importlib-metadata ]; + dependencies = [ + importlib-metadata + packaging + ]; nativeCheckInputs = [ - glibcLocales - numpy pytestCheckHook - ]; - - disabledTestPaths = [ - # FileNotFoundError: [Errno 2] No such file or directory: 'data/genes.fasta.gz' - "tests/test_Fasta_bgzip.py" + biopython + htslib + fsspec + glibcLocales ]; pythonImportsCheck = [ "pyfaidx" ]; - meta = with lib; { + preCheck = '' + bgzip --keep tests/data/genes.fasta + ''; + + meta = { description = "Python classes for indexing, retrieval, and in-place modification of FASTA files using a samtools compatible index"; homepage = "https://github.com/mdshw5/pyfaidx"; changelog = "https://github.com/mdshw5/pyfaidx/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ jbedo ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jbedo ]; mainProgram = "faidx"; }; } diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index ff29175870ab..1bfef336848b 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pyfakefs"; - version = "5.5.0"; + version = "5.6.0"; pyproject = true; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-dEiqoHFC+JLQpOtSpe0yBqnwLGWZ5obNl9YkwYl5wVQ="; + hash = "sha256-elSbMoZaqX2LplOChak4FpQdm3NZvilUrGDsNrJ36Hk="; }; postPatch = @@ -35,7 +35,7 @@ buildPythonPackage rec { --replace "test_path_links_not_resolved" "notest_path_links_not_resolved" \ --replace "test_append_mode_tell_linux_windows" "notest_append_mode_tell_linux_windows" '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' # this test fails on darwin due to case-insensitive file system substituteInPlace pyfakefs/tests/fake_os_test.py \ --replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir" diff --git a/pkgs/development/python-modules/pyfibaro/default.nix b/pkgs/development/python-modules/pyfibaro/default.nix index 1ce5d605f020..ec974f24f6e9 100644 --- a/pkgs/development/python-modules/pyfibaro/default.nix +++ b/pkgs/development/python-modules/pyfibaro/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyfibaro"; - version = "0.7.8"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "rappenze"; repo = "pyfibaro"; rev = "refs/tags/${version}"; - hash = "sha256-gid+qbl4RgT47zC5i1Usw2Zco+jb2LJeeMkKvni/aDM="; + hash = "sha256-7hn5iFuN86sdqLi5MIEwBYLYbPg7J1BbADHYdjYBCNA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix index 4dd6aa9b6dd6..93bfb7a8ec36 100644 --- a/pkgs/development/python-modules/pyftgl/default.nix +++ b/pkgs/development/python-modules/pyftgl/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, stdenv, + setuptools, boost, freetype, ftgl, @@ -12,29 +13,30 @@ }: let - pythonVersion = with lib.versions; "${major python.version}${minor python.version}"; in - buildPythonPackage rec { pname = "pyftgl"; version = "0.4b"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "umlaeute"; - repo = "${pname}-${version}"; - rev = version; - sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r"; + repo = "pyftgl"; + rev = "refs/tags/${version}"; + sha256 = "sha256-mbzXpIPMNe6wfwaAAw/Ri8xaW6Z6kuNUhFFyzsiW7Is="; }; - postPatch = '' - sed -i "s,'boost_python','boost_python${pythonVersion}',g" setup.py - ''; + build-system = [ setuptools ]; - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_COMPILE = "-L${libGL}/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries"; - }; + postPatch = + '' + substituteInPlace setup.py \ + --replace-fail boost_python boost_python${pythonVersion} + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + export NIX_CFLAGS_COMPILE+=" -L$SDKROOT/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries" + ''; buildInputs = [ boost @@ -44,8 +46,8 @@ buildPythonPackage rec { libGL ]; - meta = with lib; { + meta = { description = "Python bindings for FTGL (FreeType for OpenGL)"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index efe1c179777b..24ec863842f2 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { dependencies = [ pysendfile ]; - passthru.optional-dependencies = { + optional-dependencies = { ssl = [ pyopenssl ]; }; diff --git a/pkgs/development/python-modules/pyfxa/default.nix b/pkgs/development/python-modules/pyfxa/default.nix index 5f5ba161f5e7..d3a4dcfac3ed 100644 --- a/pkgs/development/python-modules/pyfxa/default.nix +++ b/pkgs/development/python-modules/pyfxa/default.nix @@ -12,24 +12,23 @@ pythonOlder, requests, responses, - setuptools, - six, + hatchling, + parameterized, }: buildPythonPackage rec { pname = "pyfxa"; - version = "0.7.8"; + version = "0.7.9"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "PyFxA"; - inherit version; - hash = "sha256-DMFZl1hbYNaScOTWkAbK2nKti6wD5SS5A30q7TW5vO4="; + inherit pname version; + hash = "sha256-dTsWFWaqX6YypNJz9WSlcxJlYOstmTu2ZgOG3RPSViw="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ cryptography @@ -37,8 +36,6 @@ buildPythonPackage rec { pybrowserid pyjwt requests - setuptools # imports pkg_resources - six ]; nativeCheckInputs = [ @@ -46,6 +43,7 @@ buildPythonPackage rec { mock responses pytestCheckHook + parameterized ]; pythonImportsCheck = [ "fxa" ]; diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index c16eae5e8e51..2eef6797cbf5 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + pythonOlder, # build-system setuptools, @@ -20,24 +21,26 @@ buildPythonPackage rec { pname = "pygal"; - version = "3.0.4"; + version = "3.0.5"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchPypi { inherit pname version; - hash = "sha256-bF2jPxBB6LMMvJgPijSRDZ7cWEuDMkApj2ol32VCUok="; + hash = "sha256-wKDzTlvBwBl1wr+4NCrVIeKTrULlJWmd0AxNelLBS3E="; }; postPatch = '' substituteInPlace setup.py \ - --replace pytest-runner "" + --replace-fail pytest-runner "" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ importlib-metadata ]; + dependencies = [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { lxml = [ lxml ]; png = [ cairosvg ]; }; @@ -45,7 +48,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pyquery pytestCheckHook - ] ++ passthru.optional-dependencies.png; + ] ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = '' # necessary on darwin to pass the testsuite @@ -53,12 +56,12 @@ buildPythonPackage rec { ''; meta = with lib; { + description = "Module for dynamic SVG charting"; + homepage = "http://www.pygal.org"; changelog = "https://github.com/Kozea/pygal/blob/${version}/docs/changelog.rst"; downloadPage = "https://github.com/Kozea/pygal"; - description = "Sexy and simple python charting"; - mainProgram = "pygal_gen.py"; - homepage = "http://www.pygal.org"; license = licenses.lgpl3Plus; maintainers = [ ]; + mainProgram = "pygal_gen.py"; }; } diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index c4af9f668e72..80c0d153b72d 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -24,11 +24,13 @@ SDL2_mixer, SDL2_ttf, numpy, + + pygame-gui, }: buildPythonPackage rec { pname = "pygame-ce"; - version = "2.5.1"; + version = "2.5.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +39,7 @@ buildPythonPackage rec { owner = "pygame-community"; repo = "pygame-ce"; rev = "refs/tags/${version}"; - hash = "sha256-bt/6ukXZU79CWFqov9JON9ktQ/c4NKLxhX4Jif3Enxs="; + hash = "sha256-9e02ZfBfk18jsVDKKhMwEJiTGMG7VdBEgVh4unMJguY="; # Unicode file cause different checksums on HFS+ vs. other filesystems postFetch = "rm -rf $out/docs/reST"; }; @@ -67,17 +69,17 @@ buildPythonPackage rec { '' # cython was pinned to fix windows build hangs (pygame-community/pygame-ce/pull/3015) substituteInPlace pyproject.toml \ - --replace-fail '"cython<=3.0.10",' '"cython",' \ - --replace-fail '"meson<=1.5.0",' '"meson",' \ - --replace-fail '"sphinx<=7.2.6",' "" \ - --replace-fail '"ninja<=1.11.1.1",' "" + --replace-fail '"meson<=1.5.1",' '"meson",' \ + --replace-fail '"ninja<=1.11.1.1",' "" \ + --replace-fail '"cython<=3.0.11",' '"cython",' \ + --replace-fail '"sphinx<=7.2.6",' "" substituteInPlace buildconfig/config_{unix,darwin}.py \ --replace-fail 'from distutils' 'from setuptools._distutils' substituteInPlace src_py/sysfont.py \ --replace-fail 'path="fc-list"' 'path="${fontconfig}/bin/fc-list"' \ --replace-fail /usr/X11/bin/fc-list ${fontconfig}/bin/fc-list '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # flaky rm test/system_test.py substituteInPlace test/meson.build \ @@ -102,7 +104,7 @@ buildPythonPackage rec { SDL2_image SDL2_mixer SDL2_ttf - ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; nativeCheckInputs = [ numpy @@ -151,12 +153,16 @@ buildPythonPackage rec { "pygame.version" ]; - meta = with lib; { + passthru.tests = { + inherit pygame-gui; + }; + + meta = { description = "Pygame Community Edition (CE) - library for multimedia application built on SDL"; homepage = "https://pyga.me/"; changelog = "https://github.com/pygame-community/pygame-ce/releases/tag/${version}"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ pbsds ]; - platforms = platforms.unix; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.pbsds ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix index 5906a6f9a9cb..6c8261a06b3a 100644 --- a/pkgs/development/python-modules/pygame-gui/default.nix +++ b/pkgs/development/python-modules/pygame-gui/default.nix @@ -1,6 +1,7 @@ { lib, pkgs, + stdenv, buildPythonPackage, nix-update-script, fetchFromGitHub, @@ -53,6 +54,11 @@ buildPythonPackage rec { "test_process_event_text_ctrl_v_select_range" "test_process_event_text_ctrl_a" "test_process_event_text_ctrl_x" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # fails to determine "/" as an existing path + # https://github.com/MyreMylar/pygame_gui/issues/644 + "test_process_event" ]; disabledTestPaths = [ "tests/test_performance/test_text_performance.py" ]; diff --git a/pkgs/development/python-modules/pygame-sdl2/default.nix b/pkgs/development/python-modules/pygame-sdl2/default.nix index f788c969a8f4..43ce26585f30 100644 --- a/pkgs/development/python-modules/pygame-sdl2/default.nix +++ b/pkgs/development/python-modules/pygame-sdl2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage { src = fetchurl { url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}+renpy${renpy_version}.tar.gz"; - hash = "sha256-Zib39NyQ1pGVCWPrK5/Tl3dAylUlmKZKxU8pf+OpAdY="; + hash = "sha256-bcTrdXWLTCnZQ/fP5crKIPoqJiyz+o6s0PzRChV7TQE="; }; # force rebuild of headers needed for install diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 65315b3243b8..4c035988ae4b 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pygame"; - version = "2.5.2"; + version = "2.6.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -43,7 +43,7 @@ buildPythonPackage rec { # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The documentation # has such files and will be removed. - hash = "sha256-+gRv3Rim+2aL2uhPPGfVD0QDgB013lTf6wPx8rOwgXg="; + hash = "sha256-wNXcmH0IIuAOoomIdmhAPxe4TiEzes3Kq+Vth2r4/IA="; postFetch = "rm -rf $out/docs/reST"; }; @@ -65,15 +65,9 @@ buildPythonPackage rec { ]) buildInputs ); }) - # Skip tests that should be disabled without video driver - ./skip-surface-tests.patch - - # removes distutils unbreaking py312, part of https://github.com/pygame/pygame/pull/4211 - (fetchpatch { - name = "remove-distutils.patch"; - url = "https://github.com/pygame/pygame/commit/6038e7d6583a7a25fcc6e15387cf6240e427e5a7.patch"; - hash = "sha256-HxcYjjhsu/Y9HiK9xDvY4X5dgWPP4XFLxdYGXC6tdWM="; - }) + + # mixer queue test returns busy queue when it shouldn't + ./skip-mixer-test.patch ]; postPatch = '' @@ -99,7 +93,7 @@ buildPythonPackage rec { SDL2_image SDL2_mixer SDL2_ttf - ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; preConfigure = '' ${python.pythonOnBuildForHost.interpreter} buildconfig/config.py diff --git a/pkgs/development/python-modules/pygame/skip-mixer-test.patch b/pkgs/development/python-modules/pygame/skip-mixer-test.patch new file mode 100644 index 000000000000..3a316ca41c50 --- /dev/null +++ b/pkgs/development/python-modules/pygame/skip-mixer-test.patch @@ -0,0 +1,12 @@ +diff --git a/test/mixer_test.py b/test/mixer_test.py +index 0b11c5a3..2d5b2cd5 100644 +--- a/test/mixer_test.py ++++ b/test/mixer_test.py +@@ -809,6 +809,7 @@ class ChannelTypeTest(unittest.TestCase): + with self.assertRaisesRegex(pygame.error, "mixer not initialized"): + channel.unpause() + ++ @unittest.skip("call to get_busy() returns true") + def test_queue(self): + """ + Ensure the Channel.queue() works correctly diff --git a/pkgs/development/python-modules/pygame/skip-surface-tests.patch b/pkgs/development/python-modules/pygame/skip-surface-tests.patch deleted file mode 100644 index 21d9c9060f3b..000000000000 --- a/pkgs/development/python-modules/pygame/skip-surface-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/test/surface_test.py b/test/surface_test.py -index 5ce78b6e..8b8f7ed5 100644 ---- a/test/surface_test.py -+++ b/test/surface_test.py -@@ -1091,6 +1091,10 @@ class GeneralSurfaceTests(unittest.TestCase): - finally: - pygame.display.quit() - -+ @unittest.skipIf( -+ os.environ.get("SDL_VIDEODRIVER") == "dummy", -+ 'requires a non-"dummy" SDL_VIDEODRIVER', -+ ) - def test_convert_init(self): - """Ensure initialization exceptions are raised - for surf.convert().""" -@@ -1118,6 +1122,10 @@ class GeneralSurfaceTests(unittest.TestCase): - finally: - pygame.display.quit() - -+ @unittest.skipIf( -+ os.environ.get("SDL_VIDEODRIVER") == "dummy", -+ 'requires a non-"dummy" SDL_VIDEODRIVER', -+ ) - def test_convert_alpha_init(self): - """Ensure initialization exceptions are raised - for surf.convert_alpha().""" diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 80cd4b04b409..f9310c711e5f 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -16,17 +16,17 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.15.0"; + version = "1.16.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-pjVSX/x0EoZp3i9jRgqUydVgljSkh1wKr85RD97sF6w="; + hash = "sha256-eymmeWuqFfyJ1EOsjVF3VBHZseWwbcQNRYxWyFdrSKI="; }; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH="${libgit2}/lib" ''; diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix index 2b674559b604..1bd193e0cc32 100644 --- a/pkgs/development/python-modules/pygitguardian/default.nix +++ b/pkgs/development/python-modules/pygitguardian/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pygitguardian"; - version = "1.16.0"; + version = "1.17.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "GitGuardian"; repo = "py-gitguardian"; rev = "refs/tags/v${version}"; - hash = "sha256-2yuYu02Nd9B3UfzrM0p19hDM5HmvigBf48gu+ZSO0kU="; + hash = "sha256-+L0rF5wy4iL/6nPdLSXwYazxsobH2G3pCATrqYe9B6U="; }; pythonRelaxDeps = [ @@ -71,6 +71,7 @@ buildPythonPackage rec { "test_read_metadata_bad_response" "test_read_metadata_no_remediation_message" "test_read_metadata_remediation_message" + "test_retrieve_secret_incident" "test_sca_client_scan_diff" "test_sca_scan_all_with_params" "test_sca_scan_directory_invalid_tar" diff --git a/pkgs/development/python-modules/pyglm/default.nix b/pkgs/development/python-modules/pyglm/default.nix index 2afcae3d3bb4..48831497a082 100644 --- a/pkgs/development/python-modules/pyglm/default.nix +++ b/pkgs/development/python-modules/pyglm/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyglm"; - version = "2.7.1-rev1"; + version = "2.7.2-rev1"; pyproject = true; src = fetchFromGitHub { owner = "Zuzu-Typ"; repo = "PyGLM"; rev = "refs/tags/${version}"; - hash = "sha256-MA/NoeKv6yxXL9A36SBqU7GNuPbCKDvxpOkWP8OmED4="; + hash = "sha256-vQ4g2bBr6xV36DYrszcJnaJ8lj1uD1KyUblSL4u+U/E="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix index c75cf68715ed..48791db6a275 100644 --- a/pkgs/development/python-modules/pygls/default.nix +++ b/pkgs/development/python-modules/pygls/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { typeguard ]; - passthru.optional-dependencies = { + optional-dependencies = { ws = [ websockets ]; }; @@ -52,7 +52,7 @@ buildPythonPackage rec { # Fixes hanging tests on Darwin __darwinAllowLocalNetworking = true; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # Darwin issue: OSError: [Errno 24] Too many open files ulimit -n 1024 ''; diff --git a/pkgs/development/python-modules/pygmars/default.nix b/pkgs/development/python-modules/pygmars/default.nix index 11bd26ee9531..634788bdf9a1 100644 --- a/pkgs/development/python-modules/pygmars/default.nix +++ b/pkgs/development/python-modules/pygmars/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "pygmars"; - version = "0.8.1"; + version = "0.9.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "nexB"; repo = "pygmars"; rev = "refs/tags/v${version}"; - hash = "sha256-RwAZ1ZLh0zgGshSv7LleBHMotKapDFtD69ptqQnr0EA="; + hash = "sha256-OhmTD83p/4tCMoCXy35/0fy8Tw1usn27dJyzpOeGlkU="; }; dontConfigure = true; @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python lexing and parsing library"; homepage = "https://github.com/nexB/pygmars"; - changelog = "https://github.com/nexB/pygmars/releases/tag/v${version}"; + changelog = "https://github.com/aboutcode-org/pygmars/blob/v${version}/CHANGELOG.rst"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index 77d2669ee0ac..7bba01e4e44e 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, pythonOlder, buildPythonPackage, fetchFromGitHub, @@ -19,7 +18,7 @@ buildPythonPackage rec { pname = "pygmt"; - version = "0.11.0"; + version = "0.13.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,12 +27,12 @@ buildPythonPackage rec { owner = "GenericMappingTools"; repo = "pygmt"; rev = "refs/tags/v${version}"; - hash = "sha256-DbewB/lP44bpNSQ4ht7n0coS2Ml7qmEU4CP91p5YtZg="; + hash = "sha256-DO9KUlmt5EV+ioOSQ/BOcx4pP409f94dzmFwqK2MwMY="; }; postPatch = '' substituteInPlace pygmt/clib/loading.py \ - --replace "env.get(\"GMT_LIBRARY_PATH\", \"\")" "env.get(\"GMT_LIBRARY_PATH\", \"${gmt}/lib\")" + --replace-fail "env.get(\"GMT_LIBRARY_PATH\")" "env.get(\"GMT_LIBRARY_PATH\", \"${gmt}/lib\")" ''; nativeBuildInputs = [ setuptools-scm ]; @@ -67,8 +66,6 @@ buildPythonPackage rec { homepage = "https://github.com/GenericMappingTools/pygmt"; license = licenses.bsd3; changelog = "https://github.com/GenericMappingTools/pygmt/releases/tag/v${version}"; - # pygmt.exceptions.GMTCLibNotFoundError: Error loading the GMT shared library '/nix/store/r3xnnqgl89vrnq0kzxx0bmjwzks45mz8-gmt-6.1.1/lib/libgmt.dylib' - broken = stdenv.isDarwin; - maintainers = with maintainers; [ sikmir ]; + maintainers = with maintainers; teams.geospatial.members; }; } diff --git a/pkgs/development/python-modules/pygobject-stubs/default.nix b/pkgs/development/python-modules/pygobject-stubs/default.nix index d4a9b4f81036..90e0bb9ba185 100644 --- a/pkgs/development/python-modules/pygobject-stubs/default.nix +++ b/pkgs/development/python-modules/pygobject-stubs/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pygobject-stubs"; - version = "2.11.0"; + version = "2.12.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pygobject"; repo = "pygobject-stubs"; rev = "refs/tags/v${version}"; - hash = "sha256-HOAG5c0fjF6RzULc1IDk7hRSlKTqtdXEM6acyJeV0DE="; + hash = "sha256-Y9tqfv2DP2daxxafcQAtxH33pR3FHE8av0PkzEcs0RU="; }; build-system = [ setuptools ]; @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "PEP 561 Typing Stubs for PyGObject"; homepage = "https://github.com/pygobject/pygobject-stubs"; - changelog = "https://github.com/pygobject/pygobject-stubs/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/pygobject/pygobject-stubs/blob/v${version}/CHANGELOG.md"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ hacker1024 ]; }; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 185e7fd5ddf8..88dfb1e1abb3 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -18,20 +18,20 @@ buildPythonPackage rec { pname = "pygobject"; - version = "3.48.2"; + version = "3.50.0"; outputs = [ "out" "dev" ]; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-B5SutKm+MaCSrCBiG19U7CgPkYWUPTKLEFza5imK0ac="; + hash = "sha256-jYNudbWogdRX7hYiyuSjK826KKC6ViGTrbO7tHJHIhI="; }; depsBuildBuild = [ pkg-config ]; @@ -46,7 +46,7 @@ buildPythonPackage rec { buildInputs = [ cairo glib - ] ++ lib.optionals stdenv.isDarwin [ ncurses ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ncurses ]; propagatedBuildInputs = [ pycairo diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 201902949cf2..028f69488777 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pygraphviz"; - version = "1.13"; + version = "1.14"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pygraphviz"; repo = "pygraphviz"; rev = "refs/tags/pygraphviz-${version}"; - hash = "sha256-/H7eHgs3jtbgat8//1Y1S3iV5s0UBKW+J+zK+f8qGqI="; + hash = "sha256-RyUmT2djj2GnVG82xO9HULMAJZb2LYMUGDRvCwaYBg8="; }; patches = [ diff --git a/pkgs/development/python-modules/pygreat/default.nix b/pkgs/development/python-modules/pygreat/default.nix index 6f66c9eb5dc7..d10685b810c5 100644 --- a/pkgs/development/python-modules/pygreat/default.nix +++ b/pkgs/development/python-modules/pygreat/default.nix @@ -1,41 +1,59 @@ { lib, buildPythonPackage, - isPy3k, fetchFromGitHub, + setuptools, + pythonOlder, future, pyusb, }: -buildPythonPackage { +buildPythonPackage rec { pname = "pygreat"; - version = "2019.5.1.dev0"; - format = "setuptools"; + version = "2024.0.2"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "libgreat"; - rev = "14c00b7c8f036f4d467e4b1a324ffa3566b126fa"; - sha256 = "1h0z83k1k4z8j36z936h61l8j3cjr3wsxr86k91v5c5h93g9dkqh"; + rev = "refs/tags/v${version}"; + hash = "sha256-yYp+2y4QIOykkrObWaXbZMMc2fsRn/+tGWqySA7V534="; }; - propagatedBuildInputs = [ + sourceRoot = "${src.name}/host"; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"setuptools-git-versioning<2"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + ''; + + build-system = [ + setuptools + ]; + + pythonRemoveDeps = [ + "backports.functools-lru-cache" + ]; + + dependencies = [ future pyusb ]; - disabled = !isPy3k; + # has no tests + doCheck = false; - preBuild = '' - cd host - substituteInPlace setup.py --replace "'backports.functools_lru_cache'" "" - substituteInPlace pygreat/comms.py --replace "from backports.functools_lru_cache import lru_cache as memoize_with_lru_cache" "from functools import lru_cache as memoize_with_lru_cache" - echo "$version" > ../VERSION - ''; + pythonImportsCheck = [ + "pygreat" + ]; - meta = with lib; { + meta = { + changelog = "https://github.com/greatscottgadgets/libgreat/releases/tag/v${version}"; description = "Python library for talking with libGreat devices"; - homepage = "https://greatscottgadgets.com/greatfet/"; - license = with licenses; [ bsd3 ]; + homepage = "https://github.com/greatscottgadgets/libgreat/"; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ carlossless ]; }; } diff --git a/pkgs/development/python-modules/pygsl/default.nix b/pkgs/development/python-modules/pygsl/default.nix index 7726badc8197..792342dbd9bf 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.4.0"; + version = "2.4.1"; format = "setuptools"; src = fetchFromGitHub { owner = "pygsl"; repo = "pygsl"; rev = "refs/tags/v${version}"; - hash = "sha256-7agGgfDUgY6mRry7d38vGGNLJC4dFUniy2M/cnejDDs="; + hash = "sha256-85j57gzvomhBX/+Dif8IoMpNE9vJvyHPFHchKRF9OQM="; }; # error: no member named 'n' in 'gsl_bspline_workspace' diff --git a/pkgs/development/python-modules/pygtail/default.nix b/pkgs/development/python-modules/pygtail/default.nix index a2d4a41c80ae..8ef39af5c314 100644 --- a/pkgs/development/python-modules/pygtail/default.nix +++ b/pkgs/development/python-modules/pygtail/default.nix @@ -2,25 +2,27 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { pname = "pygtail"; - version = "0.8.0"; - format = "setuptools"; + version = "0.14.0"; + pyproject = true; src = fetchFromGitHub { owner = "bgreenlee"; - repo = pname; + repo = "pygtail"; rev = version; - sha256 = "1f8qlijiwn10jxg1bsi6q42fznbg8rw039yaxfh6rzbaj2gaxbz1"; + hash = "sha256-TlXTlxeGDd+elGpMjxcJCmRuJmp5k9xj6MrViRzcST4="; }; - # remove at next bump, tag is one commit early for 0.8.0 - postPatch = '' - substituteInPlace pygtail/core.py \ - --replace 0.7.0 0.8.0 - ''; + build-system = [ setuptools ]; + + pythonImportsCheck = [ "pygtail" ]; + + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Library for reading log file lines that have not been read"; diff --git a/pkgs/development/python-modules/pyhanko/default.nix b/pkgs/development/python-modules/pyhanko/default.nix index f8cf0d88cbf2..cf46658aec26 100644 --- a/pkgs/development/python-modules/pyhanko/default.nix +++ b/pkgs/development/python-modules/pyhanko/default.nix @@ -130,6 +130,6 @@ buildPythonPackage rec { maintainers = [ ]; # Most tests fail with: # OSError: One or more parameters passed to a function were not valid. - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/pyheck/default.nix b/pkgs/development/python-modules/pyheck/default.nix index 7b7e5205447f..fca55ff984b5 100644 --- a/pkgs/development/python-modules/pyheck/default.nix +++ b/pkgs/development/python-modules/pyheck/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix index 7161ad2fcfb6..ade8cac689ea 100644 --- a/pkgs/development/python-modules/pyhepmc/default.nix +++ b/pkgs/development/python-modules/pyhepmc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyhepmc"; - version = "2.13.2"; + version = "2.13.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-M18Bq6WrAINpgPx5+uh8dufPBxIklRHpbBWUYMC8v10="; + hash = "sha256-86LDk0G9ckbV+/pNtLJa9EsA6plxerKI3ygxq680IKo="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/pyhomeworks/default.nix b/pkgs/development/python-modules/pyhomeworks/default.nix index 72b4c432de08..48726ee97260 100644 --- a/pkgs/development/python-modules/pyhomeworks/default.nix +++ b/pkgs/development/python-modules/pyhomeworks/default.nix @@ -20,7 +20,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools~=69.2.0" "setuptools" + --replace-fail "setuptools~=69.2.0" "setuptools" \ + --replace-fail ', "wheel~=0.43.0"' "" ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index 62d57ef65362..9492aa948478 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pyinfra"; - version = "3.1"; + version = "3.1.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Fizzadar"; repo = "pyinfra"; rev = "refs/tags/v${version}"; - hash = "sha256-uTGJX92AIaMLLLq0XPpfIhL9kFPR+aJgMxxoKYJf0PM="; + hash = "sha256-NHQpYOXlqFU4BtiwiESGV8pM0O8kqCz2TpXOGz8T4zQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix index c3bfee647617..92900abd88f1 100644 --- a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix +++ b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyinstaller-hooks-contrib"; - version = "2024.8"; + version = "2024.9"; pyproject = true; src = fetchPypi { pname = "pyinstaller_hooks_contrib"; inherit version; - hash = "sha256-KbaNh4q3OelnBVtWqT65tY5SnVsFT7q3ovK6z4DO8+I="; + hash = "sha256-R5OGnzcNHcSAbBAe/SiQ48PnA0Z9jSe7Wj2wBev7AI0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyinstaller/default.nix b/pkgs/development/python-modules/pyinstaller/default.nix index c8b4d4697202..b76b5bc2440a 100644 --- a/pkgs/development/python-modules/pyinstaller/default.nix +++ b/pkgs/development/python-modules/pyinstaller/default.nix @@ -1,50 +1,59 @@ { - lib -, buildPythonPackage -, fetchPypi -, setuptools -, zlib -, altgraph -, packaging -, pyinstaller-hooks-contrib -, testers -, pyinstaller -, glibc -, binutils -, installShellFiles + lib, + stdenv, + buildPythonPackage, + fetchPypi, + + # build-system + setuptools, + + # native dependencies + zlib, + + # dependencies + altgraph, + macholib, + packaging, + pyinstaller-hooks-contrib, + + # tests + binutils, + glibc, + pyinstaller, + testers, }: buildPythonPackage rec { pname = "pyinstaller"; - version = "6.9.0"; + version = "6.11.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-9KdcVS+swuKjcPHkIrlxteXNtAWP84zqAjWqIfwLN48="; + hash = "sha256-y01DOj2zDZ0Xz18s97tN+Ap4jUk8HWfdgi3FeR2YZK8="; }; - build-system = [ setuptools ]; - nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ zlib.dev ]; dependencies = [ altgraph packaging + macholib pyinstaller-hooks-contrib ]; - makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ glibc binutils ]) + makeWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ + glibc + binutils + ]) ]; - postInstall = '' - installManPage doc/pyinstaller.1 doc/pyi-makespec.1 - ''; - pythonImportsCheck = [ "PyInstaller" ]; passthru.tests.version = testers.testVersion { diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix index 284fb8368ffd..e3d051ab07d9 100644 --- a/pkgs/development/python-modules/pyipp/default.nix +++ b/pkgs/development/python-modules/pyipp/default.nix @@ -12,12 +12,13 @@ pytest-asyncio, pytestCheckHook, pythonOlder, + syrupy, yarl, }: buildPythonPackage rec { pname = "pyipp"; - version = "0.16.0"; + version = "0.17.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-ipp"; rev = "refs/tags/${version}"; - hash = "sha256-ddI9K0lJDZbVgO+hptP4I+EH//5vOoFDYXWxGALF8Ik="; + hash = "sha256-B3x6WkTSTGlZWMAK2BTA2EVVz+IvB3QL+arZGBAkZsE="; }; postPatch = '' @@ -49,6 +50,7 @@ buildPythonPackage rec { aresponses pytest-asyncio pytestCheckHook + syrupy ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/pyiskra/default.nix b/pkgs/development/python-modules/pyiskra/default.nix new file mode 100644 index 000000000000..844299d01bc6 --- /dev/null +++ b/pkgs/development/python-modules/pyiskra/default.nix @@ -0,0 +1,41 @@ +{ + aiohttp, + buildPythonPackage, + fetchFromGitHub, + lib, + pymodbus, + setuptools, +}: + +buildPythonPackage rec { + pname = "pyiskra"; + version = "0.1.14"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Iskramis"; + repo = "pyiskra"; + rev = "refs/tags/v${version}"; + hash = "sha256-OLNUa11UULiW6E8nVy5rUyN7iAD7KdM+R76m2zaDOgc="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + pymodbus + ]; + + pythonImportsCheck = [ "pyiskra" ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/Iskramis/pyiskra/releases/tag/v${version}"; + description = "Python Iskra devices interface"; + homepage = "https://github.com/Iskramis/pyiskra"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyjson5/default.nix b/pkgs/development/python-modules/pyjson5/default.nix index ea68a8ae8cf7..b1145f872496 100644 --- a/pkgs/development/python-modules/pyjson5/default.nix +++ b/pkgs/development/python-modules/pyjson5/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyjson5"; - version = "1.6.6"; + version = "1.6.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Kijewski"; repo = "pyjson5"; rev = "refs/tags/v${version}"; - hash = "sha256-LNcz9JEOw6HO9eIf71w4NJdPOB4yixBfBeD7B/NLbfE="; + hash = "sha256-QggO1go9iQIy235I9CYOeC6JCoOT2sfDsrbSySN3mMw="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/pyjsparser/default.nix b/pkgs/development/python-modules/pyjsparser/default.nix index 0b6eab26b5c3..b0988585e21b 100644 --- a/pkgs/development/python-modules/pyjsparser/default.nix +++ b/pkgs/development/python-modules/pyjsparser/default.nix @@ -3,7 +3,6 @@ fetchFromGitHub, buildPythonPackage, pytestCheckHook, - js2py, }: let @@ -21,18 +20,11 @@ let nativeCheckInputs = [ pytestCheckHook - js2py ]; - # escape infinite recursion with js2py + # js2py is needed for tests but it's unmaintained and insecure doCheck = false; - passthru.tests = { - check = pyjsparser.overridePythonAttrs (_: { - doCheck = true; - }); - }; - pythonImportsCheck = [ "pyjsparser" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pykcs11/default.nix b/pkgs/development/python-modules/pykcs11/default.nix index b4fdeb938147..fe3cd809bcca 100644 --- a/pkgs/development/python-modules/pykcs11/default.nix +++ b/pkgs/development/python-modules/pykcs11/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pykcs11"; - version = "1.5.16"; + version = "1.5.17"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Q9dGsGd/Q8xjS598Tastm6axqDuTHiWYJHBi+P9kHgc="; + hash = "sha256-e2Z+lZ+gtq0HULA+IIGgWcvppieJdmFD5Q+QmIoziZQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pykoplenti/default.nix b/pkgs/development/python-modules/pykoplenti/default.nix index a4f605692c5f..cbca76c7467d 100644 --- a/pkgs/development/python-modules/pykoplenti/default.nix +++ b/pkgs/development/python-modules/pykoplenti/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pydantic ]; - passthru.optional-dependencies = { + optional-dependencies = { CLI = [ click prompt-toolkit diff --git a/pkgs/development/python-modules/pylacus/default.nix b/pkgs/development/python-modules/pylacus/default.nix index 436056cf66c7..5846e23b98c7 100644 --- a/pkgs/development/python-modules/pylacus/default.nix +++ b/pkgs/development/python-modules/pylacus/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pylacus"; - version = "1.10.0"; + version = "1.11.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "PyLacus"; rev = "refs/tags/v${version}"; - hash = "sha256-HPd/kF79Xb5kyYdOpm6ny6/rRNeu8WkTv7rM1Kpb7YI="; + hash = "sha256-kCYpv6rCvjeXlyB+x6AgT9DY9EvccoQKaWpR19ZJhLc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pylance/Cargo.lock b/pkgs/development/python-modules/pylance/Cargo.lock index 781104da1ac5..b0871f8c68c4 100644 --- a/pkgs/development/python-modules/pylance/Cargo.lock +++ b/pkgs/development/python-modules/pylance/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -78,9 +78,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.88" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arc-swap" @@ -90,9 +90,9 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayref" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" @@ -150,7 +150,7 @@ dependencies = [ "chrono", "chrono-tz", "half", - "hashbrown", + "hashbrown 0.14.5", "num", ] @@ -347,9 +347,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429" dependencies = [ "bzip2", "flate2", @@ -467,7 +467,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -504,13 +504,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -536,15 +536,15 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-config" -version = "1.5.6" +version = "1.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848d7b9b605720989929279fa644ce8f244d0ce3146fcca5b70e4eb7b3c020fc" +checksum = "7198e6f03240fdceba36656d8be440297b6b82270325908c7381f37d826a74f6" dependencies = [ "aws-credential-types", "aws-runtime", @@ -609,9 +609,9 @@ dependencies = [ [[package]] name = "aws-sdk-dynamodb" -version = "1.45.0" +version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f3d9e807092149e3df266e3f4d9760dac439b90f82d8438e5b2c0bbe62007f" +checksum = "ab0ade000608877169533a54326badd6b5a707d2faf876cfc3976a7f9d7e5329" dependencies = [ "aws-credential-types", "aws-runtime", @@ -632,9 +632,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.42.0" +version = "1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27bf24cd0d389daa923e974b0e7c38daf308fc21e963c049f57980235017175e" +checksum = "e33ae899566f3d395cbf42858e433930682cc9c1889fa89318896082fef45efb" dependencies = [ "aws-credential-types", "aws-runtime", @@ -654,9 +654,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.43.0" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43b3220f1c46ac0e9dcc0a97d94b93305dacb36d1dd393996300c6b9b74364" +checksum = "f39c09e199ebd96b9f860b0fce4b6625f211e064ad7c8693b72ecf7ef03881e0" dependencies = [ "aws-credential-types", "aws-runtime", @@ -676,9 +676,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.42.0" +version = "1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c46924fb1add65bba55636e12812cae2febf68c0f37361766f627ddcca91ce" +checksum = "3d95f93a98130389eb6233b9d615249e543f6c24a68ca1f109af9ca5164a8765" dependencies = [ "aws-credential-types", "aws-runtime", @@ -816,9 +816,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.6" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03701449087215b5369c7ea17fef0dd5d24cb93439ec5af0c7615f58c3f22605" +checksum = "147100a7bea70fa20ef224a6bad700358305f5dc0f84649c53769761395b355b" dependencies = [ "base64-simd", "bytes", @@ -1024,9 +1024,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bytes-utils" @@ -1092,9 +1092,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.18" +version = "1.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" dependencies = [ "jobserver", "libc", @@ -1332,7 +1332,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "dashmap" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -1340,9 +1354,9 @@ dependencies = [ [[package]] name = "datafusion" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9d55a9cd2634818953809f75ebe5248b00dd43c3227efb2a51a2d5feaad54e" +checksum = "e4fd4a99fc70d40ef7e52b243b4a399c3f8d353a40d5ecb200deee05e49c61bb" dependencies = [ "ahash", "arrow", @@ -1354,24 +1368,26 @@ dependencies = [ "bytes", "bzip2", "chrono", - "dashmap", + "dashmap 6.1.0", + "datafusion-catalog", "datafusion-common", "datafusion-common-runtime", "datafusion-execution", "datafusion-expr", "datafusion-functions", "datafusion-functions-aggregate", - "datafusion-functions-array", + "datafusion-functions-nested", "datafusion-optimizer", "datafusion-physical-expr", "datafusion-physical-expr-common", + "datafusion-physical-optimizer", "datafusion-physical-plan", "datafusion-sql", "flate2", "futures", "glob", "half", - "hashbrown", + "hashbrown 0.14.5", "indexmap", "itertools 0.12.1", "log", @@ -1393,10 +1409,24 @@ dependencies = [ ] [[package]] +name = "datafusion-catalog" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13b3cfbd84c6003594ae1972314e3df303a27ce8ce755fcea3240c90f4c0529" +dependencies = [ + "arrow-schema", + "async-trait", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-plan", +] + +[[package]] name = "datafusion-common" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def66b642959e7f96f5d2da22e1f43d3bd35598f821e5ce351a0553e0f1b7367" +checksum = "44fdbc877e3e40dcf88cc8f283d9f5c8851f0a3aa07fee657b1b75ac1ad49b9c" dependencies = [ "ahash", "arrow", @@ -1405,7 +1435,7 @@ dependencies = [ "arrow-schema", "chrono", "half", - "hashbrown", + "hashbrown 0.14.5", "instant", "libc", "num_cpus", @@ -1416,26 +1446,26 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f104bb9cb44c06c9badf8a0d7e0855e5f7fa5e395b887d7f835e8a9457dc1352" +checksum = "8a7496d1f664179f6ce3a5cbef6566056ccaf3ea4aa72cc455f80e62c1dd86b1" dependencies = [ "tokio", ] [[package]] name = "datafusion-execution" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac0fd8b5d80bbca3fc3b6f40da4e9f6907354824ec3b18bbd83fee8cf5c3c3e" +checksum = "799e70968c815b611116951e3dd876aef04bf217da31b72eec01ee6a959336a1" dependencies = [ "arrow", "chrono", - "dashmap", + "dashmap 6.1.0", "datafusion-common", "datafusion-expr", "futures", - "hashbrown", + "hashbrown 0.14.5", "log", "object_store", "parking_lot", @@ -1446,9 +1476,9 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2103d2cc16fb11ef1fa993a6cac57ed5cb028601db4b97566c90e5fa77aa1e68" +checksum = "1c1841c409d9518c17971d15c9bae62e629eb937e6fb6c68cd32e9186f8b30d2" dependencies = [ "ahash", "arrow", @@ -1465,11 +1495,12 @@ dependencies = [ [[package]] name = "datafusion-functions" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a369332afd0ef5bd565f6db2139fb9f1dfdd0afa75a7f70f000b74208d76994f" +checksum = "a8e481cf34d2a444bd8fa09b65945f0ce83dc92df8665b761505b3d9f351bebb" dependencies = [ "arrow", + "arrow-buffer", "base64 0.22.1", "blake2", "blake3", @@ -1477,7 +1508,7 @@ dependencies = [ "datafusion-common", "datafusion-execution", "datafusion-expr", - "hashbrown", + "hashbrown 0.14.5", "hex", "itertools 0.12.1", "log", @@ -1491,9 +1522,9 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92718db1aff70c47e5abf9fc975768530097059e5db7c7b78cd64b5e9a11fc77" +checksum = "2b4ece19f73c02727e5e8654d79cd5652de371352c1df3c4ac3e419ecd6943fb" dependencies = [ "ahash", "arrow", @@ -1508,10 +1539,10 @@ dependencies = [ ] [[package]] -name = "datafusion-functions-array" -version = "40.0.0" +name = "datafusion-functions-nested" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bb80f46ff3dcf4bb4510209c2ba9b8ce1b716ac8b7bf70c6bf7dca6260c831" +checksum = "a1474552cc824e8c9c88177d454db5781d4b66757d4aca75719306b8343a5e8d" dependencies = [ "arrow", "arrow-array", @@ -1526,13 +1557,14 @@ dependencies = [ "itertools 0.12.1", "log", "paste", + "rand", ] [[package]] name = "datafusion-optimizer" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82f34692011bec4fdd6fc18c264bf8037b8625d801e6dd8f5111af15cb6d71d3" +checksum = "791ff56f55608bc542d1ea7a68a64bdc86a9413f5a381d06a39fd49c2a3ab906" dependencies = [ "arrow", "async-trait", @@ -1540,7 +1572,7 @@ dependencies = [ "datafusion-common", "datafusion-expr", "datafusion-physical-expr", - "hashbrown", + "hashbrown 0.14.5", "indexmap", "itertools 0.12.1", "log", @@ -1550,9 +1582,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45538630defedb553771434a437f7ca8f04b9b3e834344aafacecb27dc65d5e5" +checksum = "9a223962b3041304a3e20ed07a21d5de3d88d7e4e71ca192135db6d24e3365a4" dependencies = [ "ahash", "arrow", @@ -1568,7 +1600,7 @@ dependencies = [ "datafusion-expr", "datafusion-physical-expr-common", "half", - "hashbrown", + "hashbrown 0.14.5", "hex", "indexmap", "itertools 0.12.1", @@ -1580,23 +1612,35 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d8a72b0ca908e074aaeca52c14ddf5c28d22361e9cb6bc79bb733cd6661b536" +checksum = "db5e7d8532a1601cd916881db87a70b0a599900d23f3db2897d389032da53bc6" dependencies = [ "ahash", "arrow", "datafusion-common", "datafusion-expr", - "hashbrown", + "hashbrown 0.14.5", "rand", ] [[package]] +name = "datafusion-physical-optimizer" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb9c78f308e050f5004671039786a925c3fee83b90004e9fcfd328d7febdcc0" +dependencies = [ + "datafusion-common", + "datafusion-execution", + "datafusion-physical-expr", + "datafusion-physical-plan", +] + +[[package]] name = "datafusion-physical-plan" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b504eae6107a342775e22e323e9103f7f42db593ec6103b28605b7b7b1405c4a" +checksum = "8d1116949432eb2d30f6362707e2846d942e491052a206f2ddcb42d08aea1ffe" dependencies = [ "ahash", "arrow", @@ -1615,7 +1659,7 @@ dependencies = [ "datafusion-physical-expr-common", "futures", "half", - "hashbrown", + "hashbrown 0.14.5", "indexmap", "itertools 0.12.1", "log", @@ -1628,9 +1672,9 @@ dependencies = [ [[package]] name = "datafusion-sql" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5db33f323f41b95ae201318ba654a9bf11113e58a51a1dff977b1a836d3d889" +checksum = "b45d0180711165fe94015d7c4123eb3e1cf5fb60b1506453200b8d1ce666bef0" dependencies = [ "arrow", "arrow-array", @@ -1645,9 +1689,9 @@ dependencies = [ [[package]] name = "datafusion-substrait" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434e52fbff22e6e04e6c787f603a6aba4961a7e249a29c743c5d4f609ec2dcef" +checksum = "bf0a0055aa98246c79f98f0d03df11f16cb7adc87818d02d4413e3f3cdadbbee" dependencies = [ "arrow-buffer", "async-recursion", @@ -1874,9 +1918,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -1909,7 +1953,7 @@ dependencies = [ [[package]] name = "fsst" -version = "0.17.0" +version = "0.18.2" dependencies = [ "rand", ] @@ -1922,9 +1966,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1937,9 +1981,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1947,15 +1991,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1964,9 +2008,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -1998,32 +2042,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -2062,9 +2106,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" @@ -2144,6 +2188,12 @@ dependencies = [ ] [[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + +[[package]] name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2266,9 +2316,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -2352,7 +2402,7 @@ dependencies = [ "http 1.1.0", "hyper 1.4.1", "hyper-util", - "rustls 0.23.13", + "rustls 0.23.14", "rustls-native-certs 0.8.0", "rustls-pki-types", "tokio", @@ -2362,9 +2412,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes", "futures-channel", @@ -2375,7 +2425,6 @@ dependencies = [ "pin-project-lite", "socket2 0.5.7", "tokio", - "tower", "tower-service", "tracing", ] @@ -2391,9 +2440,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2424,12 +2473,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.0", ] [[package]] @@ -2475,9 +2524,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" @@ -2561,7 +2610,7 @@ dependencies = [ [[package]] name = "lance" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-arith", @@ -2579,7 +2628,7 @@ dependencies = [ "byteorder", "bytes", "chrono", - "dashmap", + "dashmap 5.5.3", "datafusion", "datafusion-functions", "datafusion-physical-expr", @@ -2619,7 +2668,7 @@ dependencies = [ [[package]] name = "lance-arrow" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow-array", "arrow-buffer", @@ -2635,7 +2684,7 @@ dependencies = [ [[package]] name = "lance-core" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow-array", "arrow-buffer", @@ -2671,7 +2720,7 @@ dependencies = [ [[package]] name = "lance-datafusion" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-array", @@ -2697,7 +2746,7 @@ dependencies = [ [[package]] name = "lance-datagen" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-array", @@ -2712,8 +2761,9 @@ dependencies = [ [[package]] name = "lance-encoding" -version = "0.17.0" +version = "0.18.2" dependencies = [ + "arrayref", "arrow", "arrow-arith", "arrow-array", @@ -2722,6 +2772,7 @@ dependencies = [ "arrow-data", "arrow-schema", "arrow-select", + "bytemuck", "bytes", "fsst", "futures", @@ -2732,10 +2783,12 @@ dependencies = [ "lance-core", "log", "num-traits", + "paste", "prost 0.12.6", "prost-build 0.12.6", "prost-types 0.12.6", "rand", + "seq-macro", "snafu", "tokio", "tracing", @@ -2744,7 +2797,7 @@ dependencies = [ [[package]] name = "lance-file" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow-arith", "arrow-array", @@ -2778,7 +2831,7 @@ dependencies = [ [[package]] name = "lance-index" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-array", @@ -2829,7 +2882,7 @@ dependencies = [ [[package]] name = "lance-io" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-arith", @@ -2868,7 +2921,7 @@ dependencies = [ [[package]] name = "lance-linalg" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow-array", "arrow-ord", @@ -2891,7 +2944,7 @@ dependencies = [ [[package]] name = "lance-table" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-array", @@ -3006,9 +3059,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libm" @@ -3064,7 +3117,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -3130,9 +3183,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -3352,9 +3405,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] @@ -3380,7 +3433,7 @@ dependencies = [ "rand", "reqwest", "ring", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.2.0", "serde", "serde_json", "snafu", @@ -3392,9 +3445,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oneshot" @@ -3494,7 +3547,7 @@ dependencies = [ "flate2", "futures", "half", - "hashbrown", + "hashbrown 0.14.5", "lz4_flex", "num", "num-bigint", @@ -3629,22 +3682,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3672,9 +3725,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "polling" @@ -3709,9 +3762,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "powerfmt" @@ -3745,7 +3798,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3816,7 +3869,7 @@ dependencies = [ "prost 0.12.6", "prost-types 0.12.6", "regex", - "syn 2.0.77", + "syn 2.0.79", "tempfile", ] @@ -3843,7 +3896,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3877,7 +3930,7 @@ dependencies = [ [[package]] name = "pylance" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-array", @@ -3964,7 +4017,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3977,7 +4030,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3998,9 +4051,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.36.1" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "memchr", "serde", @@ -4017,7 +4070,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash 2.0.0", - "rustls 0.23.13", + "rustls 0.23.14", "socket2 0.5.7", "thiserror", "tokio", @@ -4034,7 +4087,7 @@ dependencies = [ "rand", "ring", "rustc-hash 2.0.0", - "rustls 0.23.13", + "rustls 0.23.14", "slab", "thiserror", "tinyvec", @@ -4155,9 +4208,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -4175,9 +4228,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", @@ -4187,9 +4240,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -4204,9 +4257,9 @@ checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "regress" @@ -4214,15 +4267,15 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eae2a1ebfecc58aff952ef8ccd364329abe627762f5bf09ff42eb9d98522479" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", "memchr", ] [[package]] name = "reqwest" -version = "0.12.7" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ "base64 0.22.1", "bytes", @@ -4243,9 +4296,9 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.13", - "rustls-native-certs 0.7.3", - "rustls-pemfile 2.1.3", + "rustls 0.23.14", + "rustls-native-certs 0.8.0", + "rustls-pemfile 2.2.0", "rustls-pki-types", "serde", "serde_json", @@ -4366,9 +4419,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.13" +version = "0.23.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" dependencies = [ "log", "once_cell", @@ -4393,25 +4446,12 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -dependencies = [ - "openssl-probe", - "rustls-pemfile 2.1.3", - "rustls-pki-types", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-native-certs" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", "security-framework", @@ -4428,19 +4468,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" [[package]] name = "rustls-webpki" @@ -4486,9 +4525,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ "windows-sys 0.59.0", ] @@ -4523,7 +4562,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4557,9 +4596,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -4597,7 +4636,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4608,7 +4647,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4632,7 +4671,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4805,9 +4844,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "sqlparser" -version = "0.47.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295e9930cd7a97e58ca2a070541a3ca502b17f5d1fa7157376d0fabd85324f25" +checksum = "a4a404d0e14905361b918cb8afdb73605e25c1d5029312bd9785142dcb3aa49e" dependencies = [ "log", "sqlparser_derive", @@ -4821,7 +4860,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4867,7 +4906,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4889,7 +4928,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "syn 2.0.77", + "syn 2.0.79", "typify", "walkdir", ] @@ -4913,9 +4952,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -5086,9 +5125,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", "libc", @@ -5103,9 +5142,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand 2.1.1", @@ -5154,22 +5193,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5273,7 +5312,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5292,7 +5331,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.13", + "rustls 0.23.14", "rustls-pki-types", "tokio", ] @@ -5322,27 +5361,6 @@ dependencies = [ ] [[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - -[[package]] name = "tower-service" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5367,7 +5385,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5418,9 +5436,9 @@ dependencies = [ [[package]] name = "triomphe" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" +checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" [[package]] name = "try-lock" @@ -5469,7 +5487,7 @@ dependencies = [ "semver", "serde", "serde_json", - "syn 2.0.77", + "syn 2.0.79", "thiserror", "unicode-ident", ] @@ -5487,7 +5505,7 @@ dependencies = [ "serde", "serde_json", "serde_tokenstream", - "syn 2.0.77", + "syn 2.0.79", "typify-impl", ] @@ -5502,9 +5520,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" @@ -5514,24 +5532,24 @@ checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unindent" @@ -5561,7 +5579,7 @@ dependencies = [ "flate2", "log", "once_cell", - "rustls 0.23.13", + "rustls 0.23.14", "rustls-pki-types", "url", "webpki-roots", @@ -5677,7 +5695,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-shared", ] @@ -5711,7 +5729,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5724,9 +5742,9 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" dependencies = [ "futures-util", "js-sys", @@ -5747,9 +5765,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.5" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" dependencies = [ "rustls-pki-types", ] @@ -6037,7 +6055,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix index 95e9cc8326cd..1fba795132bf 100644 --- a/pkgs/development/python-modules/pylance/default.nix +++ b/pkgs/development/python-modules/pylance/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "pylance"; - version = "0.17.0"; + version = "0.18.2"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance"; rev = "refs/tags/v${version}"; - hash = "sha256-E+29CbVNbzmrQnBZt0860IvL4xYZqzE+uzSuKDwgxzg="; + hash = "sha256-CIIZbeRrraTqWronkspDpBVP/Z4JVoaiS5iBIXfsZGg="; }; buildAndTestSubdir = "python"; @@ -55,6 +55,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config + protobuf # for protoc rustPlatform.cargoSetupHook ]; @@ -65,7 +66,7 @@ buildPythonPackage rec { libiconv protobuf ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security @@ -100,16 +101,21 @@ buildPythonPackage rec { cd python/python/tests ''; - disabledTests = lib.optionals stdenv.isDarwin [ - # AttributeError: module 'torch.distributed' has no attribute 'is_initialized' - "test_convert_int_tensors" - "test_ground_truth" - "test_index_cast_centroids" - "test_index_with_no_centroid_movement" - "test_iter_filter" - "test_iter_over_dataset_fixed_shape_tensor" - "test_iter_over_dataset_fixed_size_lists" - ]; + disabledTests = + lib.optionals stdenv.hostPlatform.isDarwin [ + # AttributeError: module 'torch.distributed' has no attribute 'is_initialized' + "test_convert_int_tensors" + "test_ground_truth" + "test_index_cast_centroids" + "test_index_with_no_centroid_movement" + "test_iter_filter" + "test_iter_over_dataset_fixed_shape_tensor" + "test_iter_over_dataset_fixed_size_lists" + ] + ++ [ + # incompatible with duckdb 1.1.1 + "test_duckdb_pushdown_extension_types" + ]; passthru.updateScript = nix-update-script { extraArgs = [ @@ -127,6 +133,6 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ natsukium ]; # test_indices.py ...sss.Fatal Python error: Fatal Python error: Illegal instructionIllegal instruction # File "/nix/store/wiiccrs0vd1qbh4j6ki9p40xmamsjix3-python3.12-pylance-0.17.0/lib/python3.12/site-packages/lance/indices.py", line 237 in train_ivf - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix index 892e24c62122..62a5f7e81318 100644 --- a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pylibjpeg-libjpeg"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pydicom"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-iU40QdAY5931YM3h3P+WCbiBfX88iVi2QdUvZLptsFs="; + hash = "sha256-g4dGIGHo0J+F0KTVA6yjgfwiYVn6iU69jgHhvEQGwOc="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix index 33f1b807ac50..e7b1fa52a871 100644 --- a/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix @@ -71,6 +71,7 @@ buildPythonPackage rec { 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; + broken = + (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index cac67ca5051a..170fb0af1d60 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -14,23 +14,23 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.5.4"; + version = "2.6.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint-django"; rev = "refs/tags/v${version}"; - hash = "sha256-MNgu3LvFoohXA+JzUiHIaYFw0ssEe+H5T8Ea56LcGuI="; + hash = "sha256-Rnty8ryKd5PxFFVYcvB8p9VS3qlHCprxR8+/ySY5qC8="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ pylint-plugin-utils ]; + dependencies = [ pylint-plugin-utils ]; - passthru.optional-dependencies = { + optional-dependencies = { with_django = [ django ]; }; diff --git a/pkgs/development/python-modules/pylint-venv/default.nix b/pkgs/development/python-modules/pylint-venv/default.nix index 47d294f15317..de5daa466fdf 100644 --- a/pkgs/development/python-modules/pylint-venv/default.nix +++ b/pkgs/development/python-modules/pylint-venv/default.nix @@ -8,19 +8,19 @@ buildPythonPackage rec { pname = "pylint-venv"; - version = "3.0.3"; - format = "pyproject"; + version = "3.0.4"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jgosmann"; - repo = pname; + repo = "pylint-venv"; rev = "refs/tags/v${version}"; - hash = "sha256-dsVEHJawsTNKVCVmeOa61wOU5GPeyzAU/eUDFrK9PPg="; + hash = "sha256-dJWVfltze4zT0CowBZSn3alqR2Y8obKUCmO8Nfw+ahs="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; # Module has no tests doCheck = false; @@ -31,7 +31,7 @@ buildPythonPackage rec { description = "Module to make pylint respect virtual environments"; homepage = "https://github.com/jgosmann/pylint-venv/"; changelog = "https://github.com/jgosmann/pylint-venv/blob/v${version}/CHANGES.md"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 73976a1d60e0..9b98543b3004 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "pylint"; - version = "3.2.5"; + version = "3.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "pylint-dev"; repo = "pylint"; rev = "refs/tags/v${version}"; - hash = "sha256-b3KkSgTmN6ojMJaVQGwvHIa41M2eZS9prxcL5peX/xU="; + hash = "sha256-cnMYHHtIRxIySfZV0jTn+OFji+72cOReyNNDiJ9pbAg="; }; build-system = [ setuptools ]; @@ -101,7 +101,7 @@ buildPythonPackage rec { # AssertionError: assert [('specializa..., 'Ancestor')] == [('aggregatio..., 'Ancestor')] "test_functional_relation_extraction" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_parallel_execution" "test_py3k_jobs_option" ]; diff --git a/pkgs/development/python-modules/pylitejet/default.nix b/pkgs/development/python-modules/pylitejet/default.nix new file mode 100644 index 000000000000..b55bf38bd513 --- /dev/null +++ b/pkgs/development/python-modules/pylitejet/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pyserial, + pythonOlder, + setuptools-scm, +}: + +buildPythonPackage rec { + pname = "pylitejet"; + version = "0.6.3"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "joncar"; + repo = "pylitejet"; + rev = "refs/tags/v${version}"; + hash = "sha256-LHNMKU7aMDtSi4K+pZqRF9vAL3EKOFRFFNXKsQJVP2Y="; + }; + + build-system = [ setuptools-scm ]; + + dependencies = [ pyserial ]; + + # Only custom tests which uses the CLi are available + doCheck = false; + + pythonImportsCheck = [ "pylitejet" ]; + + meta = { + description = "Library for interfacing with the LiteJet lighting system"; + homepage = "https://github.com/joncar/pylitejet"; + changelog = "https://github.com/joncar/pylitejet/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pylsl/default.nix b/pkgs/development/python-modules/pylsl/default.nix new file mode 100644 index 000000000000..f58a67956e36 --- /dev/null +++ b/pkgs/development/python-modules/pylsl/default.nix @@ -0,0 +1,43 @@ +{ + lib, + liblsl, + fetchFromGitHub, + buildPythonPackage, + setuptools, + wheel, +}: + +buildPythonPackage rec { + pname = "pylsl"; + version = "1.16.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "labstreaminglayer"; + repo = "pylsl"; + rev = "v${version}"; + hash = "sha256-rReoPirf1rdQppKEBfHMk3J2htdsnFfIdlNQIprOoUg="; + }; + + postPatch = '' + substituteInPlace pylsl/pylsl.py \ + --replace "def find_liblsl_libraries(verbose=False):" "$(echo -e "def find_liblsl_libraries(verbose=False):\n yield '${liblsl}/lib/liblsl.so'")" + ''; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + buildImputs = [ liblsl ]; + + pythonImportsCheck = [ "pylsl" ]; + + meta = with lib; { + description = "Python bindings (pylsl) for liblsl"; + homepage = "https://github.com/labstreaminglayer/pylsl"; + license = licenses.mit; + maintainers = with maintainers; [ abcsds ]; + mainProgram = "pylsl"; + }; +} diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 2bd1368ffb02..960f1e9afcba 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.21.1"; + version = "0.22.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,14 +25,14 @@ buildPythonPackage rec { owner = "gurumitts"; repo = "pylutron-caseta"; rev = "refs/tags/v${version}"; - hash = "sha256-u2FPWDWBSoS5mJPnYAkLTQR6K8YLDs77djdWL+7840o="; + hash = "sha256-8NO1IAm16b5jxjVPSQqOSx5hJjAOAXyOknqwkgPT5Zo="; }; nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ cryptography ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click xdg diff --git a/pkgs/development/python-modules/pylutron/default.nix b/pkgs/development/python-modules/pylutron/default.nix index f051004a490c..4de059acab08 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.15"; + version = "0.2.16"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1UUW3Ym11jR4dxSS1OOVPl6h69I6H782Q4ZeVitty0c="; + hash = "sha256-SuG5x8GWTsCOve3jj1hrtsm37yNRHVFuFjapQafHTbA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 005a65b63169..2b133f061bf3 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2024.7.18"; + version = "2024.9.17.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,9 +40,14 @@ buildPythonPackage rec { owner = "materialsproject"; repo = "pymatgen"; rev = "refs/tags/v${version}"; - hash = "sha256-LL3cZO3LkmBuGGcO7dhO2Wtgqx9nxLureFpC8EqvS3M"; + hash = "sha256-o76bGItldcLfgZ5KDw2uL0GJvyljQJEwISR0topVR44="; }; + prePatch = '' + # Upstream switched to building against numpy2 but should still be compatible with numpy1 + substituteInPlace pyproject.toml --replace-fail "numpy>=2.1.0" "numpy>=1.26.0" + ''; + build-system = [ setuptools ]; nativeBuildInputs = [ @@ -69,7 +74,7 @@ buildPythonPackage rec { uncertainties ]; - passthru.optional-dependencies = { + optional-dependencies = { ase = [ ase ]; joblib = [ joblib ]; seekpath = [ seekpath ]; @@ -78,7 +83,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-xdist - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' # ensure tests can find these @@ -87,20 +92,6 @@ buildPythonPackage rec { export PATH=$out/bin:$PATH ''; - disabledTests = [ - # presumably won't work with our dir layouts - "test_egg_sources_txt_is_complete" - # borderline precision failure - "test_thermal_conductivity" - # AssertionError - "test_dict_functionality" - "test_mean_field" - "test_potcar_not_found" - "test_read_write_lobsterin" - "test_snl" - "test_unconverged" - ]; - pythonImportsCheck = [ "pymatgen" ]; meta = with lib; { @@ -109,6 +100,5 @@ buildPythonPackage rec { changelog = "https://github.com/materialsproject/pymatgen/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; - 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 c390123e4c5a..a8622f2e9bd5 100644 --- a/pkgs/development/python-modules/pymaven-patch/default.nix +++ b/pkgs/development/python-modules/pymaven-patch/default.nix @@ -7,7 +7,7 @@ six, lxml, pytestCheckHook, - pytest-cov, + pytest-cov-stub, mock, }: buildPythonPackage rec { @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub mock ]; diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index beb8ab6461ef..7b145228b4cf 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.41"; + version = "2.4.42"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-7TIlzphdBhA6qyUa/Ig9BKmKHW21xzmV595MqssfZs0="; + hash = "sha256-3+BECLV0JeJlOKa0vZd/dyObyM5hiGF0VnsaJD98PXY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix index bc5292e6d15e..b68bf1c6ef16 100644 --- a/pkgs/development/python-modules/pymbolic/default.nix +++ b/pkgs/development/python-modules/pymbolic/default.nix @@ -1,18 +1,23 @@ { lib, + astunparse, buildPythonPackage, - fetchPypi, fetchpatch, + fetchPypi, + immutabledict, matchpy, + numpy, pytestCheckHook, pythonOlder, pytools, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "pymbolic"; version = "2022.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -29,24 +34,34 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ pytools ]; - - nativeCheckInputs = [ - matchpy - pytestCheckHook - ]; - postPatch = '' # pytest is a test requirement not a run-time one substituteInPlace setup.py \ --replace '"pytest>=2.3",' "" ''; + build-system = [ setuptools ]; + + dependencies = [ + astunparse + immutabledict + pytools + typing-extensions + ]; + + optional-dependencies = { + matchpy = [ matchpy ]; + numpy = [ numpy ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); + pythonImportsCheck = [ "pymbolic" ]; meta = with lib; { description = "Package for symbolic computation"; homepage = "https://documen.tician.de/pymbolic/"; + changelog = "https://github.com/inducer/pymbolic/releases/tag/v${version}"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 30161191dd59..f843876f7000 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system setuptools, + versioneer, # dependencies arviz, @@ -22,16 +22,14 @@ buildPythonPackage rec { pname = "pymc"; - version = "5.16.2"; + version = "5.18.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-vOU5P45AJPULGWj9lscZKP3JqfSpkPDnq1Fyq9lIawc="; + hash = "sha256-rH6sh05rSrhakcfdc+BSR37kQYO/QEPuw8hHMZZGwdE="; }; postPatch = '' @@ -39,7 +37,10 @@ buildPythonPackage rec { --replace-fail ', "pytest-cov"' "" ''; - build-system = [ setuptools ]; + build-system = [ + setuptools + versioneer + ]; dependencies = [ arviz diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix index 627d5ad562dc..38774edd1971 100644 --- a/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, hatchling, pytestCheckHook, markdown, @@ -46,24 +45,16 @@ let in buildPythonPackage rec { pname = "pymdown-extensions"; - version = "10.8.1"; + version = "10.11.2"; pyproject = true; src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; rev = "refs/tags/${version}"; - hash = "sha256-No0RDBgr40xSOiKXQRLRZnMdV+5i4eM8Jwp7c2Jw/ZY="; + hash = "sha256-1AuN2kp7L6w8RvKky3IoX4ht9uQL6o2nm6dTDo/INC0="; }; - patches = [ - (fetchpatch2 { - name = "pymdown-extensions-pygments-compat.patch"; - url = "https://github.com/facelessuser/pymdown-extensions/commit/f1e2fad862c9738e420b8451dfdfbd9e90e849fc.patch"; - hash = "sha256-ENYTRXBJ76VPhhab8MdOh+bkcQNRklXT3thvPi+gHIY="; - }) - ]; - build-system = [ hatchling ]; dependencies = [ @@ -79,6 +70,8 @@ buildPythonPackage rec { disabledTests = [ # test artifact mismatch "test_toc_tokens" + # Tests fails with AssertionError + "test_windows_root_conversion" ]; pythonImportsCheck = map (ext: "pymdownx.${ext}") extensions; diff --git a/pkgs/development/python-modules/pymdstat/default.nix b/pkgs/development/python-modules/pymdstat/default.nix index ecc913b075b1..f447d15e45af 100644 --- a/pkgs/development/python-modules/pymdstat/default.nix +++ b/pkgs/development/python-modules/pymdstat/default.nix @@ -2,27 +2,30 @@ lib, buildPythonPackage, fetchFromGitHub, - python, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { pname = "pymdstat"; - version = "0.4.2"; - format = "setuptools"; + version = "0.4.3"; + pyproject = true; src = fetchFromGitHub { owner = "nicolargo"; - repo = pname; + repo = "pymdstat"; rev = "v${version}"; - sha256 = "01hj8vyd9f7610sqvzphpr033rvnazbwvl11gi18ia3yqlnlncp0"; + hash = "sha256-ifQZXc+it/UTltHc1ZL2zxJu7GvAxYzzmB4D+mCqEoE="; }; - checkPhase = '' - ${python.interpreter} $src/unitest.py - ''; + build-system = [ setuptools ]; pythonImportsCheck = [ "pymdstat" ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "unitest.py" ]; + meta = with lib; { description = "Pythonic library to parse Linux /proc/mdstat file"; homepage = "https://github.com/nicolargo/pymdstat"; diff --git a/pkgs/development/python-modules/pymee/default.nix b/pkgs/development/python-modules/pymee/default.nix index 7c07ff13e5fc..18be89f33a66 100644 --- a/pkgs/development/python-modules/pymee/default.nix +++ b/pkgs/development/python-modules/pymee/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pymee"; - version = "2.2.0"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "FreshlyBrewedCode"; repo = "pymee"; rev = "refs/tags/v${version}"; - hash = "sha256-4XKd0lZ6RAsG2zXjKMUeST6cNcg+SjT371gxLIhxkAA="; + hash = "sha256-VNKIA/1juhkn11nkW52htvE4daXJoySeEyevWbboUek="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix index c80f512e7498..6f570f8d8306 100644 --- a/pkgs/development/python-modules/pymemcache/default.nix +++ b/pkgs/development/python-modules/pymemcache/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { sed -i "/--cov/d" setup.cfg ''; - disabledTests = lib.optionals stdenv.is32bit [ + disabledTests = lib.optionals stdenv.hostPlatform.is32bit [ # test_compressed_complex is broken on 32-bit platforms # this can be removed on the next version bump # see also https://github.com/pinterest/pymemcache/pull/480 diff --git a/pkgs/development/python-modules/pymilter/default.nix b/pkgs/development/python-modules/pymilter/default.nix index 6f0c4291d4d5..634f437b810f 100644 --- a/pkgs/development/python-modules/pymilter/default.nix +++ b/pkgs/development/python-modules/pymilter/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, libmilter, berkeleydb, - pydns, + py3dns, iana-etc, libredirect, pyasyncore, @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pyasyncore ]; dependencies = [ berkeleydb - pydns + py3dns ]; preBuild = '' diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 38411beca94b..d1243d08bf4b 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "3.6.9"; + version = "3.7.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "pymodbus-dev"; repo = "pymodbus"; rev = "refs/tags/v${version}"; - hash = "sha256-ScqxDO0hif8p3C6+vvm7FgSEQjCXBwUPOc7Y/3OfkoI="; + hash = "sha256-y+WNXYqKkr8WQUNSmcWNRjF6yWkxD+l6++K1fiBOHek="; }; postPatch = '' @@ -39,7 +39,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { repl = [ aiohttp typer @@ -57,7 +57,7 @@ buildPythonPackage rec { redis sqlalchemy twisted - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' pushd test diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index c64d22d66cb9..97487b91d90d 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pymongo"; - version = "4.8.0"; + version = "4.9.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "pymongo"; - hash = "sha256-RU8ilYdXRNxw8YgeSy65nNrQCKM1dLyKrxIFMPZsDN4="; + hash = "sha256-t/LTQ5Cs9g4inDADfRRz/PafRTbNf0j294wMkxxhxQU="; }; build-system = [ diff --git a/pkgs/development/python-modules/pymoo/default.nix b/pkgs/development/python-modules/pymoo/default.nix index fc044a935812..86eb3e81b294 100644 --- a/pkgs/development/python-modules/pymoo/default.nix +++ b/pkgs/development/python-modules/pymoo/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "pymoo"; - version = "0.6.0.1"; + version = "0.6.1.3"; pyproject = true; src = fetchFromGitHub { owner = "anyoptimization"; repo = "pymoo"; - rev = version; - hash = "sha256-+qtW7hfSo266n1SRzAgHIu99W5Sl+NYbKOHXv/JI9IA="; + rev = "refs/tags/${version}"; + hash = "sha256-CbeJwv51lu4cABgGieqy/8DCDJCb8wOPPVqUHk8Jb7E="; }; pymoo_data = fetchFromGitHub { @@ -70,7 +70,6 @@ buildPythonPackage rec { scipy ]; - doCheck = true; preCheck = '' substituteInPlace pymoo/config.py \ --replace-fail "https://raw.githubusercontent.com/anyoptimization/pymoo-data/main/" \ diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix index b75c7e8b5af1..a75ac083f7b8 100644 --- a/pkgs/development/python-modules/pympler/default.nix +++ b/pkgs/development/python-modules/pympler/default.nix @@ -3,45 +3,42 @@ stdenv, bottle, buildPythonPackage, - fetchpatch, fetchPypi, pytestCheckHook, pythonAtLeast, + setuptools, }: buildPythonPackage rec { pname = "pympler"; - version = "1.0.1"; + version = "1.1"; + pyproject = true; src = fetchPypi { - pname = "Pympler"; - inherit version; - sha256 = "993f1a3599ca3f4fcd7160c7545ad06310c9e12f70174ae7ae8d4e25f6c5d3fa"; + inherit pname version; + hash = "sha256-HqqGfLiZLCGEMPFwj9rM2lPfBkFE0cVlax5vHuYABCQ="; }; - patches = [ - # Fixes a TypeError on Python 3.11 - # (see https://github.com/pympler/pympler/issues/148) - # https://github.com/pympler/pympler/pull/149 - (fetchpatch { - name = "Pympler-python-3.11-compat.patch"; - url = "https://github.com/pympler/pympler/commit/0fd8ad8da39207bd0dcb28bdac0407e04744c965.patch"; - hash = "sha256-6MK0AuhVhQkUzlk29HUh1+mSbfsVTBJ1YBtYNIFhh7U="; - }) - ]; - - nativeCheckInputs = [ pytestCheckHook ]; + build-system = [ setuptools ]; # There is a version of bottle bundled with Pympler, but it is broken on # Python 3.11. Fortunately, Pympler will preferentially import an external # bottle if it is available, so we make it an explicit dependency. - propagatedBuildInputs = [ bottle ]; + dependencies = [ bottle ]; + + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # 'AssertionError: 'function (test.muppy.test_summary.func)' != 'function (muppy.test_summary.func)' # https://github.com/pympler/pympler/issues/134 "test_repr_function" + # Stuck + "test_locals" + "test_globals" + "test_traceback" + "test_otracker_diff" + "test_stracker_store_summary" ] ++ lib.optionals (pythonAtLeast "3.11") [ # https://github.com/pympler/pympler/issues/148 @@ -54,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool to measure, monitor and analyze memory behavior"; - homepage = "https://pythonhosted.org/Pympler/"; + homepage = "https://github.com/pympler/pympler"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/pymssql/default.nix b/pkgs/development/python-modules/pymssql/default.nix index e234606d1c86..02e3f670f1c9 100644 --- a/pkgs/development/python-modules/pymssql/default.nix +++ b/pkgs/development/python-modules/pymssql/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "pymssql"; - version = "2.3.0"; + version = "2.3.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-8DTka1aAYdFxSPHe3qZI+dX2tzQOjP/g7bqhcTy0q6s="; + hash = "sha256-3e4VxMGT4UyS/izXIMqb4duh4PQXgkA4C49fbwDaBMY="; }; build-system = [ diff --git a/pkgs/development/python-modules/pymumble/default.nix b/pkgs/development/python-modules/pymumble/default.nix index bc15652d7027..e6214b6a9023 100644 --- a/pkgs/development/python-modules/pymumble/default.nix +++ b/pkgs/development/python-modules/pymumble/default.nix @@ -7,29 +7,28 @@ pytestCheckHook, pycrypto, pythonOlder, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pymumble"; - version = "1.6.1"; # Don't upgrade to 1.7, version was yanked - format = "setuptools"; + version = "unstable-2024-10-20"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "azlux"; + owner = "tjni"; repo = "pymumble"; - rev = "refs/tags/${version}"; - hash = "sha256-+sT5pqdm4A2rrUcUUmvsH+iazg80+/go0zM1vr9oeuE="; + rev = "3241e84e5ce162a20597e4df6a9c443122357fec"; + hash = "sha256-9lfWvfrS+vUFTf9jo4T+VHkm9u/hVjsDszLBQIEZVcQ="; }; - postPatch = '' - # Changes all `library==x.y.z` statements to just `library` - # So that we aren't constrained to a specific version - sed -i 's/\(.*\)==.*/\1/' requirements.txt - ''; + build-system = [ + setuptools + ]; - propagatedBuildInputs = [ + dependencies = [ opuslib protobuf ]; @@ -46,9 +45,11 @@ buildPythonPackage rec { meta = with lib; { description = "Library to create mumble bots"; - homepage = "https://github.com/azlux/pymumble"; - changelog = "https://github.com/azlux/pymumble/releases/tag/${version}"; + homepage = "https://github.com/tjni/pymumble"; license = licenses.gpl3Only; - maintainers = with maintainers; [ thelegy ]; + maintainers = with maintainers; [ + thelegy + tjni + ]; }; } diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index cb23141284d7..212e8e54dd24 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi ]; - buildInputs = lib.optionals stdenv.isDarwin [ ApplicationServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; preBuild = '' ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace diff --git a/pkgs/development/python-modules/pymupdf-fonts/default.nix b/pkgs/development/python-modules/pymupdf-fonts/default.nix new file mode 100644 index 000000000000..b50e49e703de --- /dev/null +++ b/pkgs/development/python-modules/pymupdf-fonts/default.nix @@ -0,0 +1,31 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, +}: + +buildPythonPackage rec { + pname = "pymupdf-fonts"; + version = "1.0.5"; + pyproject = true; + + src = fetchPypi { + pname = "pymupdf_fonts"; + inherit version; + hash = "sha256-rBLj7Er/o16aCsopE170HCO9vldYwzVdrCNphjCea8Y="; + }; + + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ "pymupdf_fonts" ]; + + meta = { + description = "Collection of optional fonts for PyMuPDF"; + homepage = "https://github.com/pymupdf/pymupdf-fonts"; + license = lib.licenses.ofl; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index f54a8b7a8462..0b30312c480e 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -25,8 +25,10 @@ mupdf, # tests - fonttools, pytestCheckHook, + fonttools, + pillow, + pymupdf-fonts, }: let @@ -40,7 +42,7 @@ let in buildPythonPackage rec { pname = "pymupdf"; - version = "1.24.8"; + version = "1.24.10"; pyproject = true; disabled = pythonOlder "3.7"; @@ -49,7 +51,7 @@ buildPythonPackage rec { owner = "pymupdf"; repo = "PyMuPDF"; rev = "refs/tags/${version}"; - hash = "sha256-NG4ZJYMYTQHiqpnaOz7hxf5UW417UKawe5EqXaBnKJ8="; + hash = "sha256-QAcQPWzPTnTg3l5lGJ8me4FUbK7xgXgyYHep+rF3wf4="; }; # swig is not wrapped as Python package @@ -88,7 +90,7 @@ buildPythonPackage rec { }; # TODO: manually add mupdf rpath until upstream fixes it - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' for lib in */*.so $out/${python.sitePackages}/*/*.so; do install_name_tool -add_rpath ${lib.getLib mupdf-cxx}/lib "$lib" done @@ -96,96 +98,33 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + ]; + + checkInputs = [ fonttools + pillow + pymupdf-fonts ]; - preCheck = '' - export PATH="$PATH:$out/bin"; - ''; + disabledTests = [ + # Do not lint code + "test_codespell" + "test_pylint" + "test_flake8" + # Upstream recommends disabling these when not using bundled MuPDF build + "test_color_count" + "test_3050" + "test_textbox3" + ]; - disabledTests = - [ - # Fails in release tarballs without .git - "test_codespell" - "test_pylint" - # fails for indeterminate reasons - "test_2548" - "test_2753" - "test_3020" - "test_3050" - "test_3058" - "test_3177" - "test_3186" - "test_color_count" - "test_pilsave" - "test_fz_write_pixmap_as_jpeg" - # NotImplementedError - "test_1824" - "test_2093" - "test_2093" - "test_2108" - "test_2182" - "test_2182" - "test_2246" - "test_2270" - "test_2270" - "test_2391" - "test_2788" - "test_2861" - "test_2871" - "test_2886" - "test_2904" - "test_2922" - "test_2934" - "test_2957" - "test_2969" - "test_3070" - "test_3131" - "test_3140" - "test_3209" - "test_3209" - "test_3301" - "test_3347" - "test_caret" - "test_deletion" - "test_file_info" - "test_line" - "test_page_links_generator" - "test_polyline" - "test_redact" - "test_techwriter_append" - "test_text2" - # Issue with FzArchive - "test_htmlbox" - "test_2246" - "test_3140" - "test_3400" - "test_707560" - "test_open" - "test_objectstream1" - "test_objectstream2" - "test_objectstream3" - "test_fit_springer" - "test_write_stabilized_with_links" - "test_textbox" - "test_delete_image" - # Fonts not available - "test_fontarchive" - "test_subset_fonts" - # Exclude lint tests - "test_flake8" - ] - ++ lib.optionals stdenv.isDarwin [ - # darwin does not support OCR right now - "test_tesseract" - ]; - - disabledTestPaths = [ - # Issue with FzArchive - "tests/test_docs_samples.py" + pythonImportsCheck = [ + "pymupdf" + "fitz" ]; - pythonImportsCheck = [ "fitz" ]; + preCheck = '' + export PATH="$out/bin:$PATH"; + ''; meta = { description = "Python bindings for MuPDF's rendering library"; diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix index df42f2a4cc37..9178399610b3 100644 --- a/pkgs/development/python-modules/pymysensors/default.nix +++ b/pkgs/development/python-modules/pymysensors/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { voluptuous ]; - passthru.optional-dependencies = { + optional-dependencies = { mqtt-client = [ paho-mqtt ]; }; diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index cd556861748c..781fa2bd24e8 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -4,6 +4,7 @@ botocore, buildPythonPackage, fetchFromGitHub, + freezegun, pytest-env, pytest-mock, pytestCheckHook, @@ -14,8 +15,8 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "6.0.0"; - format = "setuptools"; + version = "6.0.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "pynamodb"; repo = "PynamoDB"; rev = "refs/tags/${version}"; - hash = "sha256-Ag/ivZ2SDYX0kwXbExt3kE/pMJgfoGc6gWoy+Rr6GTw="; + hash = "sha256-OcrES+1F95KjhRXpEukzbuDfTXU4hyJqxGjD1xMcdKE="; }; build-system = [ setuptools ]; @@ -35,6 +36,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + freezegun pytest-env pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/pync/default.nix b/pkgs/development/python-modules/pync/default.nix index 9206787f4973..46af3ed5db2f 100644 --- a/pkgs/development/python-modules/pync/default.nix +++ b/pkgs/development/python-modules/pync/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeCheckInputs = [ which ]; propagatedBuildInputs = [ python-dateutil ]; - preInstall = lib.optionalString stdenv.isDarwin '' + preInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.terminal-notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py ''; diff --git a/pkgs/development/python-modules/pynecil/default.nix b/pkgs/development/python-modules/pynecil/default.nix index 2066dc3ec02b..70a5a432af1a 100644 --- a/pkgs/development/python-modules/pynecil/default.nix +++ b/pkgs/development/python-modules/pynecil/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pynecil"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { owner = "tr4nt0r"; repo = "pynecil"; rev = "refs/tags/v${version}"; - hash = "sha256-57TPgEC7NY75iVj31tdpCOrXUOcsFBy/4XltEHxlNFk="; + hash = "sha256-ZltGA3O6DDOiOddKHMalqmOYrp3IbhAGN7wGfPBP2aA="; }; build-system = [ diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix index 14ce4a0de929..e7ff03c15a49 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.4.0"; + version = "7.4.1"; pyproject = true; src = fetchFromGitHub { owner = "netbox-community"; repo = "pynetbox"; rev = "refs/tags/v${version}"; - hash = "sha256-JOUgQvOtvXRDM79Sp472OHPh1YEoA82T3R9aZFes8SI="; + hash = "sha256-pP4DEHf4Dj3sQ7qx7tU0B0PaMCuzUM9R2pIYRI1Fpso="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix index 7082611f6716..9e92fab07151 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.2.0"; + version = "7.2.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-TkOvmy8hzu2NITeXAo/ogjAD8YW0l5Lk04MwI2XIFRU="; + hash = "sha256-UJIbCcsQzKmFeH8gvfxFVN4ovT7eCnSHBsCCooInm/E="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pynitrokey/default.nix b/pkgs/development/python-modules/pynitrokey/default.nix index a144da100369..5334ff2bbfdc 100644 --- a/pkgs/development/python-modules/pynitrokey/default.nix +++ b/pkgs/development/python-modules/pynitrokey/default.nix @@ -16,21 +16,21 @@ python-dateutil, pyusb, requests, - spsdk, tqdm, tlv8, typing-extensions, - pyserial, - protobuf, click-aliases, semver, nethsm, importlib-metadata, + nitrokey, + pyscard, + asn1crypto, }: let pname = "pynitrokey"; - version = "0.4.50"; + version = "0.6.0"; mainProgram = "nitropy"; in @@ -40,10 +40,14 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-BIBwIYxoUcK7E69REcu/qmrpNlyYwnA7Im3iRSsWlnA="; + hash = "sha256-pY6ATORZDPGRnkN6dse1s/DzQRpplDbPAGUHU4E7U9M="; }; - propagatedBuildInputs = [ + nativeBuildInputs = [ installShellFiles ]; + + build-system = [ flit-core ]; + + dependencies = [ certifi cffi click @@ -55,21 +59,16 @@ buildPythonPackage { python-dateutil pyusb requests - spsdk tqdm tlv8 typing-extensions - pyserial - protobuf click-aliases semver nethsm importlib-metadata - ]; - - nativeBuildInputs = [ - flit-core - installShellFiles + nitrokey + pyscard + asn1crypto ]; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/pynmeagps/default.nix b/pkgs/development/python-modules/pynmeagps/default.nix index 562e5ab869e4..417b80b29779 100644 --- a/pkgs/development/python-modules/pynmeagps/default.nix +++ b/pkgs/development/python-modules/pynmeagps/default.nix @@ -3,32 +3,31 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + pytest-cov-stub, pythonOlder, setuptools, }: buildPythonPackage rec { pname = "pynmeagps"; - version = "1.0.41"; + version = "1.0.43"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "semuconsulting"; repo = "pynmeagps"; rev = "refs/tags/v${version}"; - hash = "sha256-c80OACBwohlTBGvBZValv+AMOKLd32PrPf/JzqETjDU="; + hash = "sha256-U5AI6iQiMvlCfL0SMAl0PkwC/orCr57royWvHKvWpAI="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "--cov --cov-report html --cov-fail-under 98" "" - ''; - build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; pythonImportsCheck = [ "pynmeagps" ]; diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix index ed6b964f0ca5..6d73c35e5ba6 100644 --- a/pkgs/development/python-modules/pynput/default.nix +++ b/pkgs/development/python-modules/pynput/default.nix @@ -44,11 +44,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ evdev xlib ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ ApplicationServices @@ -61,7 +61,7 @@ buildPythonPackage rec { nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Library to control and monitor input devices"; homepage = "https://github.com/moses-palmer/pynput"; license = licenses.lgpl3; diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix index c17df5386938..5a2ff7cd0cd9 100644 --- a/pkgs/development/python-modules/pynvim/default.nix +++ b/pkgs/development/python-modules/pynvim/default.nix @@ -4,44 +4,40 @@ fetchFromGitHub, setuptools, msgpack, + isPyPy, greenlet, pythonOlder, - isPyPy, + typing-extensions, }: buildPythonPackage rec { pname = "pynvim"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "neovim"; repo = "pynvim"; rev = "refs/tags/${version}"; - hash = "sha256-3LqgKENFzdfCjMlD6Xzv5W23yvIkNMUYo2+LlzKZ3cc="; + hash = "sha256-YVAWu+i2pElq8OhibSqh9ogk+xWDRCZT4niDF/oMnzY="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace " + pytest_runner" "" - ''; - - buildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ msgpack ] ++ lib.optionals (!isPyPy) [ greenlet ]; + dependencies = + [ msgpack ] + ++ lib.optionals (!isPyPy) [ greenlet ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ]; # Tests require pkgs.neovim which we cannot add because of circular dependency doCheck = false; pythonImportsCheck = [ "pynvim" ]; - meta = with lib; { + meta = { description = "Python client for Neovim"; homepage = "https://github.com/neovim/pynvim"; changelog = "https://github.com/neovim/pynvim/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/development/python-modules/pynvml/default.nix b/pkgs/development/python-modules/pynvml/default.nix index 936a4f5ce847..d7a554205e43 100644 --- a/pkgs/development/python-modules/pynvml/default.nix +++ b/pkgs/development/python-modules/pynvml/default.nix @@ -4,7 +4,6 @@ cudaPackages, fetchFromGitHub, substituteAll, - pythonOlder, addDriverRunpath, setuptools, pytestCheckHook, @@ -14,15 +13,14 @@ buildPythonPackage rec { pname = "pynvml"; - version = "11.5.0"; + version = "11.5.3"; pyproject = true; - disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "gpuopenanalytics"; repo = "pynvml"; rev = "refs/tags/${version}"; - hash = "sha256-K3ZENjgi+TVDxr55dRK1y8SwzfgVIzcnD4oEI+KHRa4="; + hash = "sha256-8NkYBRpcW3dvxVc6z17TMRPqA0YK/J/CdjuqgdcTdy8="; }; patches = [ @@ -37,7 +35,7 @@ buildPythonPackage rec { rm versioneer.py ''; - nativeBuildInputs = [ + build-system = [ setuptools versioneer ]; @@ -59,10 +57,10 @@ buildPythonPackage rec { print(f"{pynvml.nvmlInit()=}") ''; - meta = with lib; { + meta = { description = "Python bindings for the NVIDIA Management Library"; homepage = "https://github.com/gpuopenanalytics/pynvml"; - license = licenses.bsd3; - maintainers = [ maintainers.bcdarwin ]; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.bcdarwin ]; }; } diff --git a/pkgs/development/python-modules/pyocd/default.nix b/pkgs/development/python-modules/pyocd/default.nix index 15a0a2dbdbfa..bb10f1881118 100644 --- a/pkgs/development/python-modules/pyocd/default.nix +++ b/pkgs/development/python-modules/pyocd/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { pyusb pyyaml typing-extensions - ] ++ lib.optionals (!stdenv.isLinux) [ hidapi ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ hidapi ]; pythonImportsCheck = [ "pyocd" ]; diff --git a/pkgs/development/python-modules/pyogg/default.nix b/pkgs/development/python-modules/pyogg/default.nix index 62e5509d2e44..03d51fef67fa 100644 --- a/pkgs/development/python-modules/pyogg/default.nix +++ b/pkgs/development/python-modules/pyogg/default.nix @@ -12,7 +12,6 @@ }: buildPythonPackage rec { - pname = "pyogg"; version = "0.6.14a1"; @@ -29,7 +28,7 @@ buildPythonPackage rec { libopus ]; - propagatedBuidInputs = [ + propagatedBuildInputs = [ libvorbis flac libogg diff --git a/pkgs/development/python-modules/pyogrio/default.nix b/pkgs/development/python-modules/pyogrio/default.nix index 63f798d21d85..64c692a2d945 100644 --- a/pkgs/development/python-modules/pyogrio/default.nix +++ b/pkgs/development/python-modules/pyogrio/default.nix @@ -17,15 +17,15 @@ buildPythonPackage rec { pname = "pyogrio"; - version = "0.9.0"; + version = "0.10.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "geopandas"; repo = "pyogrio"; - rev = "v${version}"; - hash = "sha256-HC7+dDehDwEIDQnCMYrsC1jE78AyfHqEhfOZLYSzTIw="; + rev = "refs/tags/v${version}"; + hash = "sha256-AyKBktZWzUxD1HKKp89gQ97c4WPB5PkXnkFqN+RHx7c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 6ec97843fa8f..3af43a63a73c 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -27,11 +27,11 @@ let os-specific-buildInputs = - if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.OpenCL ] else [ ocl-icd ]; + if stdenv.hostPlatform.isDarwin then [ darwin.apple_sdk.frameworks.OpenCL ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2024.2.7"; + version = "2024.3"; pyproject = true; src = fetchFromGitHub { @@ -39,7 +39,7 @@ buildPythonPackage rec { repo = "pyopencl"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-VeaEDYnGfMYf9/WqMIZ9g4KounD48eWF3Romt79RMEQ="; + hash = "sha256-HE7dARgKnZxqjAXX4iI1ml0N2BalyTo+ZAzjC2ThEN8="; }; build-system = [ @@ -92,6 +92,6 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; # ld: symbol(s) not found for architecture arm64 - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index a66fcc6463a4..a4c4b1cbf21d 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { let ext = stdenv.hostPlatform.extensions.sharedLibrary; in - lib.optionalString (!stdenv.isDarwin) '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # Theses lines are patching the name of dynamic libraries # so pyopengl can find them at runtime. substituteInPlace OpenGL/platform/glx.py \ diff --git a/pkgs/development/python-modules/pyopengltk/default.nix b/pkgs/development/python-modules/pyopengltk/default.nix index 2f0440d83daf..b50780336e50 100644 --- a/pkgs/development/python-modules/pyopengltk/default.nix +++ b/pkgs/development/python-modules/pyopengltk/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ sigmanificient ]; license = lib.licenses.mit; # not supported yet, see: https://github.com/jonwright/pyopengltk/issues/12 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index b9691b2a2827..4d9ecb6152c2 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -2,7 +2,7 @@ lib, stdenv, buildPythonPackage, - fetchPypi, + fetchFromGitHub, openssl, setuptools, cryptography, @@ -15,13 +15,14 @@ buildPythonPackage rec { pname = "pyopenssl"; - version = "24.1.0"; + version = "24.2.1"; pyproject = true; - src = fetchPypi { - pname = "pyOpenSSL"; - inherit version; - hash = "sha256-yr7Uv6pd+fGhbA72Sgy2Uxi1zQd6ftp9aXATHKL0Gm8="; + src = fetchFromGitHub { + owner = "pyca"; + repo = "pyopenssl"; + rev = "refs/tags/${version}"; + hash = "sha256-/TQnDWdycN4hQ7ZGvBhMJEZVafmL+0wy9eJ8hC6rfio="; }; outputs = [ @@ -30,19 +31,17 @@ buildPythonPackage rec { "doc" ]; + build-system = [ setuptools ]; + nativeBuildInputs = [ openssl - setuptools sphinxHook sphinx-rtd-theme ]; - postPatch = '' - # remove cryptography pin - sed -i "/cryptography/ s/,<[0-9]*//g" setup.py - ''; + pythonRelaxDeps = [ "cryptography" ]; - propagatedBuildInputs = [ cryptography ]; + dependencies = [ cryptography ]; nativeCheckInputs = [ pretend @@ -90,7 +89,7 @@ buildPythonPackage rec { "test_dump_certificate_request" "test_export_text" ] - ++ lib.optionals stdenv.is32bit [ + ++ lib.optionals stdenv.hostPlatform.is32bit [ # https://github.com/pyca/pyopenssl/issues/974 "test_verify_with_time" ]; diff --git a/pkgs/development/python-modules/pyopenweathermap/default.nix b/pkgs/development/python-modules/pyopenweathermap/default.nix index 6b316dd72cc7..4076913dc9e5 100644 --- a/pkgs/development/python-modules/pyopenweathermap/default.nix +++ b/pkgs/development/python-modules/pyopenweathermap/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyopenweathermap"; - version = "0.1.1"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { @@ -24,7 +24,7 @@ buildPythonPackage rec { repo = "pyopenweathermap"; # https://github.com/freekode/pyopenweathermap/issues/2 rev = "refs/tags/v${version}"; - hash = "sha256-OGalKlZP4pKKWKypjM5nVesvFAGLgvvRjMWzrEIp+VQ="; + hash = "sha256-UcnELAJf0Ltf0xJOlyzsHb4HQGSBTJ+/mOZ/XSTkA0w="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index fabca6700316..68b7d44064ed 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "pyosmium"; - version = "4.0.0"; + version = "4.0.2"; pyproject = true; disabled = pythonOlder "3.7" || isPyPy; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "osmcode"; repo = "pyosmium"; rev = "refs/tags/v${version}"; - hash = "sha256-HYp1MzXSa0tx0hY0JyMf2bmEvm5YuS2R+o25TsO8J6I="; + hash = "sha256-pW2w/M4P4DtGhnTy72w0wjMtpLtSgvYGaemme/rRrwM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyotgw/default.nix b/pkgs/development/python-modules/pyotgw/default.nix index 03a07846b89b..b3d9b6702207 100644 --- a/pkgs/development/python-modules/pyotgw/default.nix +++ b/pkgs/development/python-modules/pyotgw/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyotgw"; - version = "2.2.0"; + version = "2.2.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mvn23"; repo = "pyotgw"; rev = "refs/tags/${version}"; - hash = "sha256-SowM+glni1PGkM87JT9+QWTD4Tu9XmsfXg99GZzSCJM="; + hash = "sha256-BQgRWXBSmB9AzpPeTJP7motJeKF2G0tyqJpbwIwnxwk="; }; build-system = [ setuptools ]; @@ -34,6 +34,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyotgw" ]; + disabledTests = [ + # Tests require network access + "connect_timeouterror" + ]; + meta = with lib; { description = "Python module to interact the OpenTherm Gateway"; homepage = "https://github.com/mvn23/pyotgw"; diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index e0efa2fd575f..8b7a742e6971 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.14.1"; + version = "1.14.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-mpD8seRGZZ+1Rgg1ADFiFgYZ1JmLRNdscRwfXIK6Pr4="; + hash = "sha256-6ytfmdyVd7AFIWLSKCDpPHEKCy/EsGnOS+1i/bTO0Xs="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index ac2e1be377f0..171bf42ab203 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyparsing"; - version = "3.1.2"; + version = "3.1.4"; format = "pyproject"; src = fetchFromGitHub { owner = "pyparsing"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0B8DjO4kLgvt4sYsk8CZI+5icdKy73XE2tWeqVLqO5A="; + hash = "sha256-caHkwMFL1IFCQ+yZTp9o4yXfemoPx1xL4Nvb85oJzEI="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index ebdd762b6d06..24acecdaf8c2 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path| ' tests/test__ped_ped.py '' - + lib.optionalString stdenv.isi686 '' + + lib.optionalString stdenv.hostPlatform.isi686 '' # remove some integers in this test case which overflow on 32bit systems sed -i -r -e '/class *UnitGetSizeTestCase/,/^$/{/[0-9]{11}/d}' \ tests/test__ped_ped.py diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix index 784a5e213c3b..1b9dc08d6720 100644 --- a/pkgs/development/python-modules/pypass/default.nix +++ b/pkgs/development/python-modules/pypass/default.nix @@ -74,7 +74,7 @@ buildPythonPackage rec { disabledTests = [ "test_show_clip" ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Password manager pass in Python"; mainProgram = "pypass"; homepage = "https://github.com/aviau/python-pass"; diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index d2ee3050522f..a24b786a30c3 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.7.23"; + version = "0.7.24"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "alengwenus"; repo = "pypck"; rev = "refs/tags/${version}"; - hash = "sha256-CaDwmVx6otBRuPMVpQxaZH/wqkrLgMkq/OnbkkT+VcM="; + hash = "sha256-DWdQUnURL3WBi916vOTawtBqq+SHTu4iLViGczwAWQE="; }; postPatch = '' @@ -38,7 +38,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "--asyncio-mode=auto" ]; - disabledTests = lib.optionals stdenv.isDarwin [ "test_connection_lost" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_connection_lost" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index 23c90f841ac5..9666821f8692 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, pythonOlder, # build-system @@ -27,16 +28,18 @@ buildPythonPackage rec { pname = "pypdf"; - version = "4.3.1"; + version = "5.1.0"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "py-pdf"; repo = "pypdf"; rev = "refs/tags/${version}"; # fetch sample files used in tests fetchSubmodules = true; - hash = "sha256-wSF20I5WaxRoN0n0jxB5O3mAAIOxP/TclYBTRAUwYHo="; + hash = "sha256-ziJTYl7MQUCE8US0yeiq6BPDVbBsxWhti0NyiDnKtfE="; }; outputs = [ @@ -44,21 +47,20 @@ buildPythonPackage rec { "doc" ]; - nativeBuildInputs = [ - flit-core + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--disable-socket" "" + ''; + + build-system = [ flit-core ]; - # docs + nativeBuildInputs = [ sphinxHook sphinx-rtd-theme myst-parser ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "--disable-socket" "" - ''; - - propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ typing-extensions ]; + dependencies = lib.optionals (pythonOlder "3.11") [ typing-extensions ]; optional-dependencies = rec { full = crypto ++ image; diff --git a/pkgs/development/python-modules/pyperscan/default.nix b/pkgs/development/python-modules/pyperscan/default.nix index fae3060a744a..7f2bde698eb8 100644 --- a/pkgs/development/python-modules/pyperscan/default.nix +++ b/pkgs/development/python-modules/pyperscan/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; - buildInputs = [ vectorscan ] ++ lib.optional stdenv.isDarwin libiconv; + buildInputs = [ vectorscan ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; pythonImportsCheck = [ "pyperscan" ]; diff --git a/pkgs/development/python-modules/pypiserver/default.nix b/pkgs/development/python-modules/pypiserver/default.nix index 563f0311ee94..6202ae3156cf 100644 --- a/pkgs/development/python-modules/pypiserver/default.nix +++ b/pkgs/development/python-modules/pypiserver/default.nix @@ -13,11 +13,13 @@ watchdog, webtest, wheel, + build, + importlib-resources, }: buildPythonPackage rec { pname = "pypiserver"; - version = "2.0.1"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +28,7 @@ buildPythonPackage rec { owner = "pypiserver"; repo = "pypiserver"; rev = "refs/tags/v${version}"; - hash = "sha256-Eh/3URt7pcJhoDDLRP8iHyjlPsE5E9M/0Hixqi5YNdg="; + hash = "sha256-5GJthS3kWOyWvYW+mYnIcNKD3fgSVexABZ+DpVh7qkE="; }; build-system = [ @@ -38,7 +40,7 @@ buildPythonPackage rec { dependencies = [ distutils pip - ]; + ] ++ lib.optionals (pythonOlder "3.12") [ importlib-resources ]; optional-dependencies = { passlib = [ passlib ]; @@ -51,6 +53,7 @@ buildPythonPackage rec { setuptools twine webtest + build ] ++ lib.flatten (builtins.attrValues optional-dependencies); __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/pypoint/default.nix b/pkgs/development/python-modules/pypoint/default.nix index e0e5aab54350..c144811f9a03 100644 --- a/pkgs/development/python-modules/pypoint/default.nix +++ b/pkgs/development/python-modules/pypoint/default.nix @@ -2,26 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, - authlib, - httpx, + setuptools, + aiohttp, }: buildPythonPackage rec { pname = "pypoint"; - version = "2.3.2"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "fredrike"; repo = "pypoint"; - rev = "v${version}"; - hash = "sha256-tQ5rQs6ECn9O9dVXKWhmy9BBpOzgqSmwpmbIRbJn2CQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-9z9VcY42uHIksIvDU1Vz+kvXNmrCu08fGB/waQahmyg="; }; - propagatedBuildInputs = [ - authlib - httpx - ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; # upstream has no tests doCheck = false; diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix index 0013a3dbe726..d3f663f08172 100644 --- a/pkgs/development/python-modules/pyprecice/default.nix +++ b/pkgs/development/python-modules/pyprecice/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyprecice"; - version = "3.1.1"; + version = "3.1.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "precice"; repo = "python-bindings"; rev = "refs/tags/v${version}"; - hash = "sha256-qeDWj03Uo0Kf75MN0eI+DBwa94v7GRe6+FKYtVOM6vs="; + hash = "sha256-/atuMJVgvY4kgvrB+LuQZmJuSK4O8TJdguC7NCiRS2Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 4b3a6fedd030..56cbbf37bc7b 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pyproj"; - version = "3.6.1"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyproj4"; repo = "pyproj"; rev = "refs/tags/${version}"; - hash = "sha256-ynAhu89VpvtQJRkIeVyffQHhd+OvWSiZzaI/7nd6fXA="; + hash = "sha256-uCoWmJ0xtbJ/DHts5+9KR6d6p8vmZqDrI4RFjXQn2fM="; }; # force pyproj to use ${proj} @@ -37,12 +37,6 @@ buildPythonPackage rec { proj = proj; projdev = proj.dev; }) - - # fix test failure caused by update of EPSG DB - (fetchpatch { - url = "https://github.com/pyproj4/pyproj/commit/3f7c7e5bcec33d9b2f37ceb03c484ea318dff3ce.patch"; - hash = "sha256-0J8AlInuhFDAYIBJAJ00XbqIanJY/D8xPVwlOapmLDE="; - }) ]; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/pyproject-api/default.nix b/pkgs/development/python-modules/pyproject-api/default.nix index 746fd660e0d2..2ec956f7da40 100644 --- a/pkgs/development/python-modules/pyproject-api/default.nix +++ b/pkgs/development/python-modules/pyproject-api/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pyproject-api"; - version = "1.7.1"; + version = "1.8.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pyproject-api"; rev = "refs/tags/${version}"; - hash = "sha256-TQ6cRkGnZpNchu+eL8gyUYbzp/7NWhG+LWeI8Hq52ok="; + hash = "sha256-zFV44xqbwe1QsIVurvsjqY+zxC+X2hCljZ5u70kNTSU="; }; outputs = [ @@ -67,6 +67,8 @@ buildPythonPackage rec { disabledTests = [ # requires eol python2 interpreter "test_can_build_on_python_2" + # different formatting for version specifier + "test_setuptools_prepare_metadata_for_build_wheel" ]; pythonImportsCheck = [ "pyproject_api" ]; diff --git a/pkgs/development/python-modules/pyproject-hooks/default.nix b/pkgs/development/python-modules/pyproject-hooks/default.nix index 28db88a18cf8..180886e462d0 100644 --- a/pkgs/development/python-modules/pyproject-hooks/default.nix +++ b/pkgs/development/python-modules/pyproject-hooks/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyproject-hooks"; - version = "1.0.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi rec { pname = "pyproject_hooks"; inherit version; - hash = "sha256-8nGymLl/WVXVP7ErcsH7GUjCLBprcLMVxUztrKAmTvU="; + hash = "sha256-HoWb1cQPrpRIZC3Yca30WeXiCEGG6NLCp5qCTJcNofg="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/pyproject-parser/default.nix b/pkgs/development/python-modules/pyproject-parser/default.nix index 246146a1c5a2..a3b6ca4b0319 100644 --- a/pkgs/development/python-modules/pyproject-parser/default.nix +++ b/pkgs/development/python-modules/pyproject-parser/default.nix @@ -34,8 +34,6 @@ buildPythonPackage rec { shippinglabel typing-extensions ]; - - nativeCheckInputs = [ ]; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' diff --git a/pkgs/development/python-modules/pypsrp/default.nix b/pkgs/development/python-modules/pypsrp/default.nix index faddf2906f5f..286b8a2ad902 100644 --- a/pkgs/development/python-modules/pypsrp/default.nix +++ b/pkgs/development/python-modules/pypsrp/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { xmldiff ]; - passthru.optional-dependencies = { + optional-dependencies = { credssp = [ requests-credssp ]; kerberos = pyspnego.optional-dependencies.kerberos; named_pipe = [ psutil ]; diff --git a/pkgs/development/python-modules/pyqldb/default.nix b/pkgs/development/python-modules/pyqldb/default.nix index ce8daa6c2887..892d43038bb7 100644 --- a/pkgs/development/python-modules/pyqldb/default.nix +++ b/pkgs/development/python-modules/pyqldb/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyqldb"; - version = "3.2.3"; + version = "3.2.4"; format = "setuptools"; src = fetchFromGitHub { owner = "awslabs"; repo = "amazon-qldb-driver-python"; rev = "refs/tags/v${version}"; - hash = "sha256-TyIXvk3ZJn5J2SBFDTPJpSnGFOFheXIqR2daL5npOk8="; + hash = "sha256-u8wI8ThD/BA+WI62OvNFmYvcqr018wgrh+5J+p2A6hM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyqt-builder/default.nix b/pkgs/development/python-modules/pyqt-builder/default.nix index ef00791037b3..867d0b58c04a 100644 --- a/pkgs/development/python-modules/pyqt-builder/default.nix +++ b/pkgs/development/python-modules/pyqt-builder/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pyqt-builder"; - version = "1.16.2"; + version = "1.16.4"; format = "pyproject"; src = fetchPypi { pname = "pyqt_builder"; inherit version; - hash = "sha256-v3I823zSPSUS4qzae8a4HwD7BczF6aiEa9NNR1FM3bk="; + hash = "sha256-RRXkGuN5vi5U+IqJ7PR81uTKxD6GLEq/3hg4nCZmr98="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 2fdd86b3b5ea..5e1c96673555 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -23,7 +23,7 @@ withSerialPort ? false, withTools ? false, pkgsBuildTarget, - dbusSupport ? !stdenv.isDarwin, + dbusSupport ? !stdenv.hostPlatform.isDarwin, }: buildPythonPackage rec { @@ -59,7 +59,7 @@ buildPythonPackage rec { # Due to bug in SIP .whl name generation we have to bump minimal macos sdk upto 11.0 for # aarch64-darwin. This patch can be removed once SIP will fix it in upstream, # see https://github.com/NixOS/nixpkgs/pull/186612#issuecomment-1214635456. - + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' minimum-macos-version = "11.0" '' + '' diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index 8c5653826d25..b1bf34abd489 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -25,17 +25,15 @@ buildPythonPackage rec { pname = "pyqt6"; - version = "6.7.0.dev2404081550"; + version = "6.8.0.dev2410141303"; format = "pyproject"; disabled = pythonOlder "3.6"; + # This is dangerous, how can we get web archive to archive the URL? src = fetchurl { - urls = [ - "https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz" - "http://web.archive.org/web/20240411124842if_/https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz" - ]; - hash = "sha256-H5qZ/rnruGh+UVSXLZyTSvjagmmli/iYq+7BaIzl1YQ="; + url = "https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz"; + hash = "sha256-eHYqj22us07uFkErJD2d0y0wueZxtQTwTFW9cI7yoK4="; }; patches = [ @@ -55,8 +53,11 @@ buildPythonPackage rec { verbose = true EOF + # pythonRelaxDeps doesn't work and the wanted versions are not released AFAIK substituteInPlace pyproject.toml \ - --replace-fail 'version = "${version}"' 'version = "${lib.versions.pad 3 version}"' + --replace-fail 'version = "${version}"' 'version = "${lib.versions.pad 3 version}"' \ + --replace-fail "sip >=6.9, <7" "sip >=6.8.6, <7" \ + --replace-fail 'PyQt-builder >=1.17, <2' "PyQt-builder >=1.16, <2" ''; enableParallelBuilding = true; @@ -118,7 +119,7 @@ buildPythonPackage rec { setuptools ] # ld: library not found for -lcups - ++ lib.optionals (withPrintSupport && stdenv.isDarwin) [ cups ]; + ++ lib.optionals (withPrintSupport && stdenv.hostPlatform.isDarwin) [ cups ]; passthru = { inherit sip pyqt6-sip; @@ -129,7 +130,6 @@ buildPythonPackage rec { dontConfigure = true; # Checked using pythonImportsCheck, has no tests - doCheck = true; pythonImportsCheck = [ @@ -145,7 +145,7 @@ buildPythonPackage rec { # ++ lib.optional withConnectivity "PyQt6.QtConnectivity" ++ lib.optional withLocation "PyQt6.QtPositioning"; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-address-of-temporary"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-address-of-temporary"; meta = with lib; { description = "Python bindings for Qt6"; diff --git a/pkgs/development/python-modules/pyqt6-webengine/default.nix b/pkgs/development/python-modules/pyqt6-webengine/default.nix index 5ea0b8b1941d..59a2a1eeab86 100644 --- a/pkgs/development/python-modules/pyqt6-webengine/default.nix +++ b/pkgs/development/python-modules/pyqt6-webengine/default.nix @@ -73,7 +73,6 @@ buildPythonPackage rec { dontConfigure = true; # Checked using pythonImportsCheck, has no tests - doCheck = true; pythonImportsCheck = [ "PyQt6.QtWebEngineCore" diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index 6bfa11c30fcb..629f96d76df4 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { # https://github.com/pyqtgraph/pyqtgraph/issues/2110 "test_PolyLineROI" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # https://github.com/pyqtgraph/pyqtgraph/issues/2645 "test_rescaleData" ]; diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index 60801a0c966f..11d0f847d832 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -60,7 +60,9 @@ buildPythonPackage ( setuptools ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ libsForQt5.qtdeclarative ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + autoSignDarwinBinariesHook + ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pyquery/default.nix b/pkgs/development/python-modules/pyquery/default.nix index e066b9258411..9f11804f2cf0 100644 --- a/pkgs/development/python-modules/pyquery/default.nix +++ b/pkgs/development/python-modules/pyquery/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pyquery"; - version = "2.0.0"; + version = "2.0.1"; disabled = pythonOlder "3.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-lj6NTpAmL/bY3sBy6pcoXcN0ovacrXd29AgqvPah2K4="; + hash = "sha256-AZS7JwaxLQN9sSxRko/p67NrctnnGVZdq6WmxZUyL68="; }; # https://github.com/gawel/pyquery/issues/248 diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix index 6e9c6ca53f26..84e97f2bf050 100644 --- a/pkgs/development/python-modules/pyquil/default.nix +++ b/pkgs/development/python-modules/pyquil/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pyquil"; - version = "4.14.2"; + version = "4.14.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = "pyquil"; rev = "refs/tags/v${version}"; - hash = "sha256-9P2AJPr65jNOHsKuF9qYcF/8s8IIIb9WeNUfAwrnlgE="; + hash = "sha256-kGrOvec2q1GoVweu5tTbz8kvnjG6RAfjlF64Uf3RTxw="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pyramid-multiauth/default.nix b/pkgs/development/python-modules/pyramid-multiauth/default.nix index 2bf668f94e35..71017e270bec 100644 --- a/pkgs/development/python-modules/pyramid-multiauth/default.nix +++ b/pkgs/development/python-modules/pyramid-multiauth/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyramid-multiauth"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "mozilla-services"; repo = "pyramid_multiauth"; rev = "refs/tags/${version}"; - hash = "sha256-+Aa+Vc4qCqDe/W5m/RBpYAyOMJkBv+ZGSqElJlkHqs4="; + hash = "sha256-Bz53iCGsl6WZASIvBQ1pFfcGLra82vA2OLWjhLVdkrw="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index 3564c0bd1aea..d30f96b67d66 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -9,18 +9,20 @@ plaster, plaster-pastedeploy, repoze-lru, + setuptools, translationstring, venusian, webob, zope-deprecation, zope-interface, pythonOlder, + pytestCheckHook, }: buildPythonPackage rec { pname = "pyramid"; version = "2.0.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -29,12 +31,15 @@ buildPythonPackage rec { hash = "sha256-NyE4pzjkIWU1zHbczm7d1aGqypUTDyNU+4NCZMBvGN4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ hupper pastedeploy plaster plaster-pastedeploy repoze-lru + setuptools # for pkg_resources translationstring venusian webob @@ -45,6 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ webtest zope-component + pytestCheckHook ]; pythonImportsCheck = [ "pyramid" ]; diff --git a/pkgs/development/python-modules/pyrdfa3/default.nix b/pkgs/development/python-modules/pyrdfa3/default.nix index bebc20c63e96..a1b7c05a31ee 100644 --- a/pkgs/development/python-modules/pyrdfa3/default.nix +++ b/pkgs/development/python-modules/pyrdfa3/default.nix @@ -11,25 +11,27 @@ buildPythonPackage rec { pname = "pyrdfa3"; - version = "3.6.2"; + version = "3.6.4"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit version; - pname = "pyRdfa3"; - hash = "sha256-c2gdq5V/YJAWlnZziLlWpXaccwvEUdpv+y8ONvGDFMI="; + inherit pname version; + hash = "sha256-ZHEtGkvyGCllKzlxW62m58A7zxnLSfliwZCjj0YXIkM="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ rdflib html5lib requests ]; + # Module has no tests + doCheck = false; + pythonImportsCheck = [ "pyRdfa" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyre-extensions/default.nix b/pkgs/development/python-modules/pyre-extensions/default.nix index 3a51946a81d7..aa5f70da4a91 100644 --- a/pkgs/development/python-modules/pyre-extensions/default.nix +++ b/pkgs/development/python-modules/pyre-extensions/default.nix @@ -9,7 +9,7 @@ }: let pname = "pyre-extensions"; - version = "0.0.30"; + version = "0.0.31"; in buildPythonPackage { inherit pname version; @@ -18,8 +18,9 @@ buildPythonPackage { disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-unkjxIbgia+zehBiOo9K6C1zz/QkJtcRxIrwcOW8MbI="; + inherit version; + pname = "pyre_extensions"; # changed pname on 0.0.31? + hash = "sha256-lFgG3TMCeFbPbkHJxK2s/6srVpk/h2L/TqeCb5XbBIE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix index 12262cdff9cb..56894f1c4df4 100644 --- a/pkgs/development/python-modules/pyreadstat/default.nix +++ b/pkgs/development/python-modules/pyreadstat/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { setuptools ]; - buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; dependencies = [ readstat diff --git a/pkgs/development/python-modules/pyreqwest-impersonate/default.nix b/pkgs/development/python-modules/pyreqwest-impersonate/default.nix deleted file mode 100644 index 1dc215bf0ee8..000000000000 --- a/pkgs/development/python-modules/pyreqwest-impersonate/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - lib, - stdenv, - buildPythonPackage, - fetchFromGitHub, - rustPlatform, - pytest, - runCommand, - boringssl, - libiconv, - SystemConfiguration, -}: - -let - # boring-sys expects the static libraries in build/ instead of lib/ - boringssl-wrapper = runCommand "boringssl-wrapper" { } '' - mkdir $out - cd $out - ln -s ${boringssl.out}/lib build - ln -s ${boringssl.dev}/include include - ''; -in -buildPythonPackage rec { - pname = "pyreqwest-impersonate"; - version = "0.4.9"; - pyproject = true; - - src = fetchFromGitHub { - owner = "deedy5"; - repo = "pyreqwest_impersonate"; - rev = "v${version}"; - hash = "sha256-U22NNYN8p3IQIAVb6dOrErFvuJ5m5yXi2ELbyuaNlFc="; - }; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-rj9tfOzhzfWBoxBGlTXHAmiH5qxyoLnHhlEijy/q+Ws="; - }; - - nativeBuildInputs = [ - rustPlatform.bindgenHook - rustPlatform.cargoSetupHook - rustPlatform.maturinBuildHook - ]; - - buildInputs = lib.optionals stdenv.isDarwin [ - libiconv - SystemConfiguration - ]; - - env.BORING_BSSL_PATH = boringssl-wrapper; - - passthru.optional-dependencies = { - dev = [ pytest ]; - }; - - # Test use network - doCheck = false; - - pythonImportsCheck = [ "pyreqwest_impersonate" ]; - - meta = { - description = "HTTP client that can impersonate web browsers (Chrome/Edge/OkHttp/Safari), mimicking their headers and TLS/JA3/JA4/HTTP2 fingerprints"; - homepage = "https://github.com/deedy5/pyreqwest_impersonate"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ drupol ]; - }; -} diff --git a/pkgs/development/python-modules/pyrisco/default.nix b/pkgs/development/python-modules/pyrisco/default.nix index faec26a7fe31..f8d85bc28614 100644 --- a/pkgs/development/python-modules/pyrisco/default.nix +++ b/pkgs/development/python-modules/pyrisco/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyrisco"; - version = "0.6.4"; + version = "0.6.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "OnFreund"; repo = "pyrisco"; rev = "refs/tags/v${version}"; - hash = "sha256-Xd6m7P/9ZB0tY6io59kCr8n4H8PXMO3nyMRmm8rpgJs="; + hash = "sha256-V+Wez9r/AoyNkR77yJTV3/9Kl0PHGw9kbQbzGauWEfc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 4f94e2ce63fe..4860c6e0d264 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -41,6 +41,11 @@ buildPythonPackage rec { "pyroute2.protocols" ]; + postPatch = '' + patchShebangs util + make VERSION + ''; + meta = with lib; { description = "Python Netlink library"; homepage = "https://github.com/svinota/pyroute2"; diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 51ed8f0cc31f..621f70399296 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { xmlschema ]; - passthru.optional-dependencies = { + optional-dependencies = { s2repoze = [ paste repoze-who diff --git a/pkgs/development/python-modules/pysatochip/default.nix b/pkgs/development/python-modules/pysatochip/default.nix index 5b2856984cbe..0921aa790e80 100644 --- a/pkgs/development/python-modules/pysatochip/default.nix +++ b/pkgs/development/python-modules/pysatochip/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, certifi, cryptography, ecdsa, @@ -13,22 +13,17 @@ buildPythonPackage rec { pname = "pysatochip"; - version = "0.14.2"; + version = "0.15.1"; format = "setuptools"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-+Z3D6ITZouhLbEotvJ9MDfg6QOhjGVKrLi1QL1kOdkE="; + src = fetchFromGitHub { + owner = "toporin"; + repo = "pysatochip"; + rev = "v${version}"; + hash = "sha256-7wA9erk2OA1FyNSzOSWJzjyp9QeYq6C+YA8B0Dk2iQE="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "cryptography==3.3.2" "cryptography" \ - --replace "ecdsa==0.15" "ecdsa" \ - --replace "pyopenssl==20.0.0" "pyopenssl" - ''; - propagatedBuildInputs = [ cryptography ecdsa diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix index 667ba0390323..54a79bff3909 100644 --- a/pkgs/development/python-modules/pysc2/default.nix +++ b/pkgs/development/python-modules/pysc2/default.nix @@ -3,7 +3,6 @@ lib, fetchFromGitHub, absl-py, - enum34, future, mock, mpyq, @@ -40,7 +39,6 @@ buildPythonPackage { propagatedBuildInputs = [ absl-py - enum34 future mock mpyq diff --git a/pkgs/development/python-modules/pyscaffold/default.nix b/pkgs/development/python-modules/pyscaffold/default.nix index 7b3bc447ef48..5a0b13086071 100644 --- a/pkgs/development/python-modules/pyscaffold/default.nix +++ b/pkgs/development/python-modules/pyscaffold/default.nix @@ -23,7 +23,7 @@ certifi, flake8, pytest, - pytest-cov, + pytest-cov-stub, pytest-randomly, pytest-xdist, sphinx, @@ -32,13 +32,12 @@ buildPythonPackage rec { pname = "pyscaffold"; - version = "4.5"; + version = "4.6"; pyproject = true; src = fetchPypi { - pname = "PyScaffold"; - inherit version; - hash = "sha256-2En5ouFb3PFl4Z+Wg18LF+Gi1Z1MVhxEW4J6CB3m0mI="; + inherit pname version; + hash = "sha256-QIW43pIAufMZ32+Op5lyiPFZqOSyhLBi2bKk1qnBI0w="; }; nativeBuildInputs = [ @@ -62,7 +61,7 @@ buildPythonPackage rec { tomlkit ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ pre-commit pyscaffoldext-cookiecutter @@ -81,7 +80,7 @@ buildPythonPackage rec { flake8 pre-commit pytest - pytest-cov + pytest-cov-stub pytest-randomly pytest-xdist setuptools diff --git a/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix b/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix index bcc4ed68bfdd..d5ba7c9b6d82 100644 --- a/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix @@ -11,7 +11,7 @@ configupdater, pre-commit, pytest, - pytest-cov, + pytest-cov-stub, pytest-xdist, tox, virtualenv, @@ -39,12 +39,12 @@ buildPythonPackage rec { pyscaffold ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit pytest - pytest-cov + pytest-cov-stub pytest-xdist setuptools-scm tox diff --git a/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix b/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix index f487b25c9eea..0ee14743b5e9 100644 --- a/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix @@ -11,7 +11,7 @@ pyscaffold, pre-commit, pytest, - pytest-cov, + pytest-cov-stub, pytest-xdist, tox, virtualenv, @@ -40,12 +40,12 @@ buildPythonPackage rec { pyscaffold ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit pytest - pytest-cov + pytest-cov-stub pytest-xdist setuptools-scm tox diff --git a/pkgs/development/python-modules/pyscaffoldext-django/default.nix b/pkgs/development/python-modules/pyscaffoldext-django/default.nix index c85e01e09925..6270dbc2d1d5 100644 --- a/pkgs/development/python-modules/pyscaffoldext-django/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-django/default.nix @@ -10,7 +10,7 @@ configupdater, pre-commit, pytest, - pytest-cov, + pytest-cov-stub, pytest-xdist, tox, virtualenv, @@ -37,12 +37,12 @@ buildPythonPackage rec { pyscaffold ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit pytest - pytest-cov + pytest-cov-stub pytest-xdist setuptools-scm tox diff --git a/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix b/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix index 5f2cd21069fe..cc70d4098ab8 100644 --- a/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix @@ -11,7 +11,7 @@ configupdater, pre-commit, pytest, - pytest-cov, + pytest-cov-stub, pytest-xdist, tox, virtualenv, @@ -39,12 +39,12 @@ buildPythonPackage rec { pyscaffoldext-markdown ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit pytest - pytest-cov + pytest-cov-stub pytest-xdist setuptools-scm tox diff --git a/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix b/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix index 82b25bac417c..d84320a77a95 100644 --- a/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix @@ -11,7 +11,7 @@ configupdater, pre-commit, pytest, - pytest-cov, + pytest-cov-stub, pytest-xdist, tox, twine, @@ -41,12 +41,12 @@ buildPythonPackage rec { wheel ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit pytest - pytest-cov + pytest-cov-stub pytest-xdist setuptools-scm tox diff --git a/pkgs/development/python-modules/pyscaffoldext-travis/default.nix b/pkgs/development/python-modules/pyscaffoldext-travis/default.nix index 46d27e7480b4..4eeaafd14c22 100644 --- a/pkgs/development/python-modules/pyscaffoldext-travis/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-travis/default.nix @@ -10,7 +10,7 @@ configupdater, pre-commit, pytest, - pytest-cov, + pytest-cov-stub, pytest-xdist, tox, virtualenv, @@ -37,12 +37,12 @@ buildPythonPackage rec { pyscaffold ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit pytest - pytest-cov + pytest-cov-stub pytest-xdist setuptools-scm tox diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 3fd9d3c2fbd4..a5b4d28b4a7d 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -13,19 +13,19 @@ let # Package does not support configuring the pcsc library. - withApplePCSC = stdenv.isDarwin; + withApplePCSC = stdenv.hostPlatform.isDarwin; in buildPythonPackage rec { pname = "pyscard"; - version = "2.0.9"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "LudovicRousseau"; repo = "pyscard"; rev = "refs/tags/${version}"; - hash = "sha256-DO4Ea+mlrWPpOLI8Eki+03UnsOXEhN2PAl0+gdN5sTo="; + hash = "sha256-yZeP4Tcxnwb2My+XOsMtj+H8mNIf6JYf5tpOVUYjev0="; }; build-system = [ setuptools ]; @@ -37,36 +37,31 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; postPatch = - if withApplePCSC then - '' - substituteInPlace smartcard/scard/winscarddll.c \ - --replace-fail "/System/Library/Frameworks/PCSC.framework/PCSC" \ - "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" - '' - else - '' - substituteInPlace setup.py --replace "pkg-config" "$PKG_CONFIG" - substituteInPlace smartcard/scard/winscarddll.c \ - --replace-fail "libpcsclite.so.1" \ - "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" - ''; + '' + substituteInPlace pyproject.toml \ + --replace-fail 'requires = ["setuptools","swig"]' 'requires = ["setuptools"]' + '' + + ( + if withApplePCSC then + '' + substituteInPlace src/smartcard/scard/winscarddll.c \ + --replace-fail "/System/Library/Frameworks/PCSC.framework/PCSC" \ + "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" + '' + else + '' + substituteInPlace setup.py --replace-fail "pkg-config" "$PKG_CONFIG" + substituteInPlace src/smartcard/scard/winscarddll.c \ + --replace-fail "libpcsclite.so.1" \ + "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" + '' + ); - preCheck = '' - # remove src module, so tests use the installed module instead - rm -r smartcard - ''; - - disabledTests = [ - # AssertionError - "test_hresult" - "test_low_level" - ]; - - meta = with lib; { + meta = { description = "Smartcard library for python"; homepage = "https://pyscard.sourceforge.io/"; changelog = "https://github.com/LudovicRousseau/pyscard/releases/tag/${version}"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ layus ]; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ layus ]; }; } diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix index 5866abddf4cf..e7a85d773080 100644 --- a/pkgs/development/python-modules/pyscf/default.nix +++ b/pkgs/development/python-modules/pyscf/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pyscf"; - version = "2.6.2"; + version = "2.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "pyscf"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gudkKhC5Cpd6ZM9mJ1SfemqmwDqhDmpAfYE8XGFpzmA="; + hash = "sha256-lXOREy0BABcjpAkxIMy245SAX8HfJKj/QSHGob14GgI="; }; # setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake. diff --git a/pkgs/development/python-modules/pysequoia/default.nix b/pkgs/development/python-modules/pysequoia/default.nix index 3fb8236f9b71..f2c07cd5e418 100644 --- a/pkgs/development/python-modules/pysequoia/default.nix +++ b/pkgs/development/python-modules/pysequoia/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { openssl pcsclite ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security libiconv @@ -62,6 +62,6 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ doronbehar ]; # Broken since the 0.1.20 update according to ofborg. The errors are not clear... - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix index ba92fdaebd28..7e4cff21d181 100644 --- a/pkgs/development/python-modules/pyshark/default.nix +++ b/pkgs/development/python-modules/pyshark/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { # KeyError: 'Packet of index 0 does not exist in capture' "test_getting_packet_summary" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # fails on darwin # _pickle.PicklingError: logger cannot be pickled "test_iterate_empty_psml_capture" diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index d66ef9a52257..41da67e108e2 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -1,6 +1,5 @@ { python, - pythonAtLeast, fetchurl, lib, stdenv, @@ -12,11 +11,11 @@ }: stdenv.mkDerivation rec { pname = "pyside2"; - version = "5.15.14"; + version = "5.15.15"; src = fetchurl { url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz"; - hash = "sha256-MmURlPamt7zkLwTmixQBrSCH5HiaTI8/uGSehhicY3I="; + hash = "sha256-IdaBiwZINLCFARgOSIkOX9h98vs3afgMWBQ0V/VIxAg="; }; patches = [ @@ -35,28 +34,9 @@ stdenv.mkDerivation rec { ./Modify-sendCommand-signatures.patch ]; - 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 - ''; + postPatch = '' + cd sources/pyside2 + ''; cmakeFlags = [ "-DBUILD_TESTS=OFF" @@ -69,8 +49,12 @@ stdenv.mkDerivation rec { cmake ninja qt5.qmake - python - python.pkgs.setuptools + (python.withPackages ( + ps: with ps; [ + distutils + setuptools + ] + )) ]; buildInputs = @@ -113,6 +97,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.qt.io/Qt_for_Python"; maintainers = with maintainers; [ gebner ]; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix index 2dc0078c369a..840af05e4bab 100644 --- a/pkgs/development/python-modules/pyside6/default.nix +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, cmake, cups, ninja, @@ -10,8 +11,6 @@ shiboken6, llvmPackages, symlinkJoin, - libGL, - darwin, }: let packages = with python.pkgs.qt6; [ @@ -57,12 +56,18 @@ stdenv.mkDerivation (finalAttrs: { inherit (shiboken6) version src; - sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/pyside6"; + sourceRoot = "pyside-setup-everywhere-src-6.8.0/sources/pyside6"; + + patches = [ + # Manual backport of https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=cacc9c5803a6dec820dd46211a836453183c8dab + # to fit our structure. + # FIXME: remove for 6.8.1 + ./fix-installing-docs.patch + ]; # 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. # 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 @@ -71,43 +76,37 @@ stdenv.mkDerivation (finalAttrs: { 'string(FIND "''${_module_dir}" "''${_core_abs_dir}" found_basepath)' \ 'set (found_basepath 0)' '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.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"; }; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + LLVM_INSTALL_DIR = "${lib.getLib llvmPackages.libclang}/lib"; + }; nativeBuildInputs = [ cmake ninja python pythonImportsCheckHook - ] ++ lib.optionals stdenv.isDarwin [ moveBuildTree ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ]; buildInputs = - 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 - ]; + python.pkgs.qt6.darwinVersionInputs + ++ ( + if stdenv.hostPlatform.isLinux then + # qtwebengine fails under darwin + # see https://github.com/NixOS/nixpkgs/pull/312987 + packages ++ [ python.pkgs.qt6.qtwebengine ] + else + [ + qt_linked + cups + ] + ); propagatedBuildInputs = [ shiboken6 ]; diff --git a/pkgs/development/python-modules/pyside6/fix-installing-docs.patch b/pkgs/development/python-modules/pyside6/fix-installing-docs.patch new file mode 100644 index 000000000000..4d8178f153e6 --- /dev/null +++ b/pkgs/development/python-modules/pyside6/fix-installing-docs.patch @@ -0,0 +1,25 @@ +--- a/cmake/Macros/PySideModules.cmake ++++ b/cmake/Macros/PySideModules.cmake +@@ -176,6 +176,14 @@ macro(create_pyside_module) + set(${module_NAME}_glue_dependency ${${module_NAME}_glue}) + endif() + ++ # Install module doc files. ++ set(${module_NAME}_doc "${CMAKE_CURRENT_SOURCE_DIR}/../doc/${lower_module_name}.rst") ++ set(${module_name}_doc_dependency "") ++ if(EXISTS ${${module_NAME}_doc}) ++ install(FILES ${${module_NAME}_doc} DESTINATION share/PySide6${pyside6_SUFFIX}/doc) ++ set(${module_NAME}_doc_dependency ${${module_NAME}_doc}) ++ endif() ++ + # Install standalone glue files into typesystems subfolder, so that the resolved relative + # paths remain correct. + if (module_GLUE_SOURCES) +@@ -245,6 +253,7 @@ macro(create_pyside_module) + DEPENDS ${total_type_system_files} + ${module_GLUE_SOURCES} + ${${module_NAME}_glue_dependency} ++ ${${module_NAME}_doc_dependency} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMENT "Running generator for ${module_NAME}...") + \ No newline at end of file diff --git a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix index f80113fa1bb1..eceaf8893813 100644 --- a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma-backend-elasticsearch"; - version = "1.1.2"; + version = "1.1.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-elasticsearch"; rev = "refs/tags/v${version}"; - hash = "sha256-7XecgpZ2DQr2f/Ge7skbielK7qwuGoy/KAoxzNvk9w4="; + hash = "sha256-6T3OnT6Row2dUmQ3xOu/00vcjD75+rfBSP7WyM4sQqA="; }; postPatch = '' @@ -42,6 +42,8 @@ buildPythonPackage rec { disabledTests = [ # Tests requires network access "test_connect_lucene" + # AssertionError + "correlation_rule_stats" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix index b062ff435606..9ecc23541ce6 100644 --- a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-insightidr"; - version = "0.2.3"; + version = "0.2.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-insightidr"; rev = "refs/tags/v${version}"; - hash = "sha256-wQMnnJ0KU+53MS3PIBkwIhUiyUdCrDbdUT6upk2Pp/8="; + hash = "sha256-dc25zDYQeU9W9qwrRz7zsM2wOl8kMapDvwFhB6VOwhY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix index 2e2249fd9c54..5c689f81c0d6 100644 --- a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pysigma-backend-opensearch"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-opensearch"; rev = "refs/tags/v${version}"; - hash = "sha256-VEMt9CKbhPRj1182WcLOqF9JOEzorrz9Yyqp0+FAA88="; + hash = "sha256-whAvUgjPdZ0ePt0LkREJxJnLacNyQDWupdAinK3kJww="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix b/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix index 0cb08550f864..3fd051e53b59 100644 --- a/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma-backend-sqlite"; - version = "0.1.2"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-sqlite"; rev = "refs/tags/v${version}"; - hash = "sha256-wbFSgtsiP5k1aGJx8PWDl0N28r0dgn6Fduk0PuM8x3w="; + hash = "sha256-PQByKARf0OOMC9LRTz3XVrFZp6ODSggMJeA6PNK/AuA="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index 8987f9820e84..426738401999 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.11.14"; + version = "0.11.17"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-jxVTXw3WZcOL5IDUHs+DRGoXDRFn99UWOz5j5mCEf8A="; + hash = "sha256-2+iLUuGZV+6sdeLvRE6lORQYVKVn53n2NQaGamkxspU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pysilero-vad/default.nix b/pkgs/development/python-modules/pysilero-vad/default.nix index bee85a4b2bc3..020677f05e6a 100644 --- a/pkgs/development/python-modules/pysilero-vad/default.nix +++ b/pkgs/development/python-modules/pysilero-vad/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { # what(): /build/source/include/onnxruntime/core/common/logging/logging.h:294 static const onnxruntime::logging::Logger& onnxruntime::logging::LoggingManager::DefaultLogger() Attempt to use DefaultLogger but none has been registered. - broken = stdenv.isAarch64 && stdenv.isLinux; + broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux; description = "Pre-packaged voice activity detector using silero-vad"; homepage = "https://github.com/rhasspy/pysilero-vad"; changelog = "https://github.com/rhasspy/pysilero-vad/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix index 5a2733c30205..d58336d0019c 100644 --- a/pkgs/development/python-modules/pysmb/default.nix +++ b/pkgs/development/python-modules/pysmb/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pyasn1, pythonOlder, tqdm, @@ -9,8 +10,8 @@ buildPythonPackage rec { pname = "pysmb"; - version = "1.2.9.1"; - format = "setuptools"; + version = "1.2.10"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,10 +19,12 @@ buildPythonPackage rec { owner = "miketeo"; repo = "pysmb"; rev = "refs/tags/pysmb-${version}"; - hash = "sha256-psV6fYymE6k2YqxOvFM2s7JTG51fI5pSqmkZnvfmprw="; + hash = "sha256-Zid6KGNr7BBuyHaxdXkhRC/Ug93HmVXKMtreFf+M7OE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pyasn1 tqdm ]; diff --git a/pkgs/development/python-modules/pysmi/default.nix b/pkgs/development/python-modules/pysmi/default.nix index 69aac0ffc10f..c1284b2c793e 100644 --- a/pkgs/development/python-modules/pysmi/default.nix +++ b/pkgs/development/python-modules/pysmi/default.nix @@ -13,7 +13,7 @@ }: buildPythonPackage rec { - version = "1.5.0"; + version = "1.5.4"; pname = "pysmi"; pyproject = true; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "lextudio"; repo = "pysmi"; rev = "refs/tags/v${version}"; - hash = "sha256-9yAsseMI50RhVeyFvuTo/pN9ftrvvUWYCacy2v3VVT8="; + hash = "sha256-QKxUV2QTaGkCQmWTS8GBeaXKsKTIsrDVZFwidTqLdh0="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pysml/default.nix b/pkgs/development/python-modules/pysml/default.nix index febe4a190b0b..d4d5f9f87eef 100644 --- a/pkgs/development/python-modules/pysml/default.nix +++ b/pkgs/development/python-modules/pysml/default.nix @@ -12,28 +12,28 @@ buildPythonPackage rec { pname = "pysml"; - version = "0.1.2"; - format = "pyproject"; + version = "0.1.4"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mtdcr"; - repo = pname; + repo = "pysml"; rev = "refs/tags/${version}"; - hash = "sha256-TLIpc0bVx1As2oLyYD+BBMalwJiKdvBCcrd1tUNyh6Y="; + hash = "sha256-G4t0cHbJWMmDODeldj064SlKGagOfUnnRiGRwLu1bF0="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout bitstring pyserial-asyncio ]; - # Project has no tests + # Module has no tests doCheck = false; pythonImportsCheck = [ "sml" ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for EDL21 smart meters using Smart Message Language (SML)"; homepage = "https://github.com/mtdcr/pysml"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pysmlight/default.nix b/pkgs/development/python-modules/pysmlight/default.nix index d334e099908f..316908f546c0 100644 --- a/pkgs/development/python-modules/pysmlight/default.nix +++ b/pkgs/development/python-modules/pysmlight/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pysmlight"; - version = "0.1.1"; + version = "0.1.3"; pyproject = true; src = fetchFromGitHub { owner = "smlight-tech"; repo = "pysmlight"; rev = "refs/tags/v${version}"; - hash = "sha256-b1f17jOEDQFtwBJa2zhbI8j2rRoMNJy8/WsVWanf6BI="; + hash = "sha256-U5/pKlnRt+OQeE/RQabTcnZLiLBIGqBinXdI7yc//30="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix index 3fa3a1dfe700..540d1fbff830 100644 --- a/pkgs/development/python-modules/pysnmp/default.nix +++ b/pkgs/development/python-modules/pysnmp/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "pysnmp"; - version = "6.2.5"; + version = "6.2.6"; pyproject = true; src = fetchFromGitHub { owner = "lextudio"; repo = "pysnmp"; rev = "refs/tags/v${version}"; - hash = "sha256-EGMUTUN95wykU756GJSiXwr8Hi3kyaLPfqhuDgvhbBE="; + hash = "sha256-+FfXvsfn8XzliaGUKZlzqbozoo6vDxUkgC87JOoVasY="; }; pythonRemoveDeps = [ "pytest-cov" ]; @@ -67,7 +67,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SNMP library"; homepage = "https://github.com/lextudio/pysnmp"; - changelog = "https://github.com/lextudio/pysnmp/blob/${src.rev}/CHANGES.txt"; + changelog = "https://github.com/lextudio/pysnmp/blob/${src.rev}/CHANGES.rst"; license = licenses.bsd2; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/pysnmp/setup.py-Fix-the-setuptools-version-check.patch b/pkgs/development/python-modules/pysnmp/setup.py-Fix-the-setuptools-version-check.patch deleted file mode 100644 index 784ddd3f3427..000000000000 --- a/pkgs/development/python-modules/pysnmp/setup.py-Fix-the-setuptools-version-check.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5f843f7c8554e2feab7f57d8718231408196fd80 Mon Sep 17 00:00:00 2001 -From: Michael Weiss <dev.primeos@gmail.com> -Date: Fri, 1 Nov 2019 18:47:14 +0100 -Subject: [PATCH] setup.py: Fix the setuptools version check - -This broke the Nix build after setuptools.__version__ changed from -"41.2.0" to "41.4.0.post20191022". ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 0d987d5c..4f625d7c 100644 ---- a/setup.py -+++ b/setup.py -@@ -63,7 +63,7 @@ try: - - setup, Command = setuptools.setup, setuptools.Command - -- observed_version = [int(x) for x in setuptools.__version__.split('.')] -+ observed_version = [int(x) for x in setuptools.__version__.split('.')[0:3]] - required_version = [36, 2, 0] - - # NOTE(etingof): require fresh setuptools to build proper wheels --- -2.23.0 - diff --git a/pkgs/development/python-modules/pysnooper/default.nix b/pkgs/development/python-modules/pysnooper/default.nix index c8f3ca8bb96e..f8ce981e1d38 100644 --- a/pkgs/development/python-modules/pysnooper/default.nix +++ b/pkgs/development/python-modules/pysnooper/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pysnooper"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "PySnooper"; - hash = "sha256-gQZp4WKiUKBm2GYuVzrbxa93DpN8W1V48ou3NV0chZs="; + hash = "sha256-2DLd8myARAqUVrOmZNr/lX9zfnMTxAt2JQ69tczbajE="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pysnow/default.nix b/pkgs/development/python-modules/pysnow/default.nix index f69e18f43137..1a7c541daea0 100644 --- a/pkgs/development/python-modules/pysnow/default.nix +++ b/pkgs/development/python-modules/pysnow/default.nix @@ -9,6 +9,7 @@ poetry-core, python-magic, pytz, + six, pytestCheckHook, requests-oauthlib, }: @@ -25,6 +26,8 @@ buildPythonPackage rec { hash = "sha256-nKOPCkS2b3ObmBnk/7FTv4o4vwUX+tOtZI5OQQ4HSTY="; }; + pythonRelaxDeps = [ "requests-oauthlib" ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ @@ -32,6 +35,7 @@ buildPythonPackage rec { ijson python-magic pytz + six requests-oauthlib ]; @@ -54,6 +58,10 @@ buildPythonPackage rec { --replace 'ijson = "^2.5.1"' 'ijson = "*"' \ --replace 'pytz = "^2019.3"' 'pytz = "*"' \ --replace 'oauthlib = "^3.1.0"' 'oauthlib = "*"' + + # https://github.com/rbw/pysnow/pull/201 doesn't apply via fetchpatch, so we recreate it + substituteInPlace tests/test_client.py tests/test_oauth_client.py tests/test_params_builder.py tests/test_resource.py \ + --replace-fail "self.assertEquals" "self.assertEqual" ''; pythonImportsCheck = [ "pysnow" ]; diff --git a/pkgs/development/python-modules/pysol-cards/default.nix b/pkgs/development/python-modules/pysol-cards/default.nix index 2db75c3f2820..b9612be0978c 100644 --- a/pkgs/development/python-modules/pysol-cards/default.nix +++ b/pkgs/development/python-modules/pysol-cards/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pysol-cards"; - version = "0.16.0"; + version = "0.18.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "pysol_cards"; - hash = "sha256-C4fKez+ZFVzM08/XOfc593RNb4GYIixtSToDSj1FcMM="; + hash = "sha256-KRlurdUaVKe/hT0K7LoWiFOQOiSAO4VUcT6Mf8xzLCw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysolr/default.nix b/pkgs/development/python-modules/pysolr/default.nix index 0ea9ceb5eca9..5a9a711f2815 100644 --- a/pkgs/development/python-modules/pysolr/default.nix +++ b/pkgs/development/python-modules/pysolr/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pysolr"; - version = "3.9.0"; + version = "3.10.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1rj5jmscvxjwcmlfi6hmkj44l4x6n3ln5p7d8d18j566hzmmzw3f"; + sha256 = "sha256-EntKLdFpI0rLFYZkOmzR4+lLkXkh5pv1adeyoqoO9Ak="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 7ffcf52bea8a..e06ab2932483 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyspark"; - version = "3.5.1"; + version = "3.5.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3WVp5Uc2Xq3E+Ie/V/FT5NWCpoxLSQ3kddVbmYFmSRA="; + hash = "sha256-aLfMDAxXCn2GRPSfQNLahwmwHTDJEmzIz5O0+E89l0c="; }; # pypandoc is broken with pandoc2, so we just lose docs. @@ -42,7 +42,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ py4j ]; - passthru.optional-dependencies = { + optional-dependencies = { ml = [ numpy ]; mllib = [ numpy ]; sql = [ diff --git a/pkgs/development/python-modules/pyspf/default.nix b/pkgs/development/python-modules/pyspf/default.nix index 8e69a942665f..cdedf35b93a5 100644 --- a/pkgs/development/python-modules/pyspf/default.nix +++ b/pkgs/development/python-modules/pyspf/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - pydns, + py3dns, }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0bmimlmwrq9glnjc4i6pwch30n3y5wyqmkjfyayxqxkfrixqwydi"; }; - propagatedBuildInputs = [ pydns ]; + propagatedBuildInputs = [ py3dns ]; # requires /etc/resolv.conf to exist doCheck = false; diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix index 992318ff0667..e1b716245a5d 100644 --- a/pkgs/development/python-modules/pyspnego/default.nix +++ b/pkgs/development/python-modules/pyspnego/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyspnego"; - version = "0.10.2"; + version = "0.11.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,14 +24,14 @@ buildPythonPackage rec { owner = "jborean93"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-60aIRrhRynbuuFZzzBhJTlmU74CWuao8jWhr126cPrc="; + hash = "sha256-8u4gAIM2HZiDooUoIM0zAUq6IJkJHMzr16p42v6ekBQ="; }; nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ cryptography ]; - passthru.optional-dependencies = { + optional-dependencies = { kerberos = [ gssapi krb5 diff --git a/pkgs/development/python-modules/pysptk/default.nix b/pkgs/development/python-modules/pysptk/default.nix index f6f0de014d36..e148d8af8b06 100644 --- a/pkgs/development/python-modules/pysptk/default.nix +++ b/pkgs/development/python-modules/pysptk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pysptk" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Wrapper for Speech Signal Processing Toolkit (SPTK)"; homepage = "https://pysptk.readthedocs.io/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix index 06b755717601..cd43bb9211e6 100644 --- a/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/pkgs/development/python-modules/pysqueezebox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pysqueezebox"; - version = "0.9.2"; + version = "10.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "rajlaud"; repo = "pysqueezebox"; rev = "refs/tags/v${version}"; - hash = "sha256-gHv1dSWU0erzesneodMhCR1LQYutpDVithZ5M1lgk3I="; + hash = "sha256-p9EwzkKkNi/jGMXx4sPTSpPk3Uq3Na8WElolNryu2N4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pystac-client/default.nix b/pkgs/development/python-modules/pystac-client/default.nix index 841e0f91b45e..e554cf140167 100644 --- a/pkgs/development/python-modules/pystac-client/default.nix +++ b/pkgs/development/python-modules/pystac-client/default.nix @@ -18,15 +18,15 @@ buildPythonPackage rec { pname = "pystac-client"; - version = "0.8.3"; + version = "0.8.4"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "stac-utils"; repo = "pystac-client"; - rev = "v${version}"; - hash = "sha256-tzfpvNtj+KkKjA75En+OwxYQWGzxHLACLkzWT2j/ThU="; + rev = "refs/tags/v${version}"; + hash = "sha256-EetS0MD5DLBR+ht9YfD+oRdfHbVONuVHdSZj3FQ5Sm8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pystac/default.nix b/pkgs/development/python-modules/pystac/default.nix index eb7f653db9de..3f118b581a5c 100644 --- a/pkgs/development/python-modules/pystac/default.nix +++ b/pkgs/development/python-modules/pystac/default.nix @@ -7,7 +7,7 @@ html5lib, jsonschema, - pytest-cov, + pytest-cov-stub, pytest-mock, pytest-recording, python-dateutil, @@ -17,15 +17,15 @@ buildPythonPackage rec { pname = "pystac"; - version = "1.10.1"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "stac-utils"; repo = "pystac"; - rev = "v${version}"; - hash = "sha256-zJGDhKRX50Muo1YDEzfwypMLISnYBYKkPvUULYkUf68="; + rev = "refs/tags/v${version}"; + hash = "sha256-yuAam/sXaGMFp1Kwxd28v3nOV05GC3sUY+gKJ4nLwTs="; }; build-system = [ setuptools ]; @@ -36,7 +36,7 @@ buildPythonPackage rec { html5lib jsonschema pytestCheckHook - pytest-cov + pytest-cov-stub pytest-mock pytest-recording requests-mock diff --git a/pkgs/development/python-modules/pystatgrab/default.nix b/pkgs/development/python-modules/pystatgrab/default.nix index 04d460bdf558..942fe48d95b5 100644 --- a/pkgs/development/python-modules/pystatgrab/default.nix +++ b/pkgs/development/python-modules/pystatgrab/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { buildInputs = [ libstatgrab - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]); + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]); nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/pysuez/default.nix b/pkgs/development/python-modules/pysuez/default.nix index e78c7f36d81e..8c04887f758c 100644 --- a/pkgs/development/python-modules/pysuez/default.nix +++ b/pkgs/development/python-modules/pysuez/default.nix @@ -10,26 +10,21 @@ buildPythonPackage rec { pname = "pysuez"; - version = "0.2.0"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "ooii"; + owner = "jb101010-2"; repo = "pySuez"; - rev = "refs/tags/v${version}"; - hash = "sha256-Xgd0E/oFO2yyytBjuwr1vDJfKWC0Iw8P6GStCuCni/g="; + rev = "refs/tags/${version}"; + hash = "sha256-+pLknJDF0SsC6OsmP64D/yZeu0sGNtKo8EBGlDewBug="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace ", 'datetime'" "" - ''; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ + dependencies = [ regex requests ]; @@ -42,8 +37,8 @@ buildPythonPackage rec { meta = with lib; { description = "Module to get water consumption data from Suez"; mainProgram = "pysuez"; - homepage = "https://github.com/ooii/pySuez"; - changelog = "https://github.com/ooii/pySuez/releases/tag/v${version}"; + homepage = "https://github.com/jb101010-2/pySuez"; + changelog = "https://github.com/jb101010-2/pySuez/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index 3df9edb39f9c..24c75bf05e81 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -29,15 +29,18 @@ buildPythonPackage rec { patches = [ ./replace-python-first.patch ]; - buildInputs = [ - bash - subversion - apr - aprutil - expat - neon - openssl - ] ++ lib.optionals stdenv.isLinux [ e2fsprogs ] ++ lib.optionals stdenv.isDarwin [ gcc ]; + buildInputs = + [ + bash + subversion + apr + aprutil + expat + neon + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ e2fsprogs ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ]; preConfigure = '' cd Source @@ -84,6 +87,6 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; # g++: command not found - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index bb46fdeb5d37..e960018bd61a 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -8,6 +8,7 @@ fetchFromGitHub, pyopenssl, pythonOlder, + pytest-asyncio, pytestCheckHook, requests, setuptools, @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.48.2"; + version = "0.51.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-5hoV7tM02dLrGvZ47ReVITayLFf2ceRVXOKbNa2t9iM="; + hash = "sha256-Ti+3f6UGn/A9MdLJVUT9hnAiS8Ce6D8FrSryrGxMV6s="; }; build-system = [ setuptools ]; @@ -38,11 +39,9 @@ buildPythonPackage rec { requests ]; - nativeCheckInputs = [ pytestCheckHook ]; - - disabledTests = [ - # mismatch in expected data structure - "test_parse_advertisement_data_curtain" + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook ]; pythonImportsCheck = [ "switchbot" ]; diff --git a/pkgs/development/python-modules/pysyncobj/default.nix b/pkgs/development/python-modules/pysyncobj/default.nix index 33671fb43314..f12ac02bdb92 100644 --- a/pkgs/development/python-modules/pysyncobj/default.nix +++ b/pkgs/development/python-modules/pysyncobj/default.nix @@ -3,22 +3,25 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pysyncobj"; - version = "0.3.12"; - format = "setuptools"; + version = "0.3.13"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bakwc"; repo = "PySyncObj"; - rev = "refs/tags/${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-ZWzvvv13g/iypm+MIl5q0Y8ekqzZEY5upSTPk3MFTPI="; }; + build-system = [ setuptools ]; + # Tests require network features doCheck = false; @@ -26,10 +29,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for replicating your class"; - mainProgram = "syncobj_admin"; homepage = "https://github.com/bakwc/PySyncObj"; - changelog = "https://github.com/bakwc/PySyncObj/releases/tag/${version}"; - license = with licenses; [ mit ]; + changelog = "https://github.com/bakwc/PySyncObj/releases/tag/v${version}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "syncobj_admin"; }; } diff --git a/pkgs/development/python-modules/pytablewriter/default.nix b/pkgs/development/python-modules/pytablewriter/default.nix index 1b074f1b8584..d7996053a7b4 100644 --- a/pkgs/development/python-modules/pytablewriter/default.nix +++ b/pkgs/development/python-modules/pytablewriter/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { typepy ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ dominate elasticsearch @@ -84,7 +84,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "pathvalidate" ]; diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix index 13e41ed77a5e..0e396cd4f85c 100644 --- a/pkgs/development/python-modules/pytado/default.nix +++ b/pkgs/development/python-modules/pytado/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytado"; - version = "0.17.6"; + version = "0.17.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "wmalgadey"; repo = "PyTado"; rev = "refs/tags/${version}"; - hash = "sha256-KcYxUKQuO7TLS4YPg2mrBjP+DMnvZeJokGzwmeM/CvE="; + hash = "sha256-WpGznYNVpis1pM9PRXHnQVev3JW6baUT5J9iPxwd0Uk="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index 1cc1d8f5d180..7cec1417bfc8 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.30"; + version = "3.3.32"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zSeDeGD/78bIoKm6B8BN4qWQE1ivNgyvnrGtgsekM3M="; + hash = "sha256-OYRcgX30O0/F+0H4x2jbPyVNh6xVeBSdfqbtuqUgoNE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytask/default.nix b/pkgs/development/python-modules/pytask/default.nix new file mode 100644 index 000000000000..260b9634b311 --- /dev/null +++ b/pkgs/development/python-modules/pytask/default.nix @@ -0,0 +1,85 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + hatchling, + hatch-vcs, + attrs, + click, + click-default-group, + networkx, + optree, + packaging, + pluggy, + rich, + sqlalchemy, + universal-pathlib, + pytestCheckHook, + nbmake, + pexpect, + pytest-xdist, + syrupy, + git, + tomli, +}: +buildPythonPackage rec { + pname = "pytask"; + version = "0.5.1"; + pyproject = true; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "pytask-dev"; + repo = "pytask"; + rev = "v${version}"; + hash = "sha256-b+sS+l0Rp5bb8Dh6UBv3xHYTYKFp3dD5AuLqxB3n6Go="; + }; + + build-system = [ + hatchling + hatch-vcs + ]; + + dependencies = [ + attrs + click + click-default-group + networkx + optree + packaging + pluggy + rich + sqlalchemy + universal-pathlib + ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + + nativeCheckInputs = [ + pytestCheckHook + git + nbmake + pexpect + pytest-xdist + syrupy + ]; + + # The test suite runs the installed command for e2e tests + preCheck = '' + export PATH="$PATH:$out/bin"; + ''; + + disabledTests = [ + # This accesses the network + "test_download_file" + # Racy + "test_more_nested_pytree_and_python_node_as_return_with_names" + ]; + + meta = with lib; { + description = "Workflow management system that facilitates reproducible data analyses"; + homepage = "https://github.com/pytask-dev/pytask"; + changelog = "https://github.com/pytask-dev/pytask/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ erooke ]; + }; +} diff --git a/pkgs/development/python-modules/pytautulli/default.nix b/pkgs/development/python-modules/pytautulli/default.nix index 2b97ceb8fb0d..7fa18fb19491 100644 --- a/pkgs/development/python-modules/pytautulli/default.nix +++ b/pkgs/development/python-modules/pytautulli/default.nix @@ -27,11 +27,11 @@ buildPythonPackage rec { # Upstream is releasing with the help of a CI to PyPI, GitHub releases # are not in their focus substituteInPlace setup.py \ - --replace 'version="main",' 'version="${version}",' + --replace-fail 'version="main",' 'version="${version}",' # yarl 1.9.4 requires ports to be ints substituteInPlace pytautulli/models/host_configuration.py \ - --replace "str(self.port)" "int(self.port)" + --replace-fail "str(self.port)" "int(self.port)" ''; propagatedBuildInputs = [ aiohttp ]; @@ -43,7 +43,10 @@ buildPythonPackage rec { pytest-asyncio ]; - pytestFlagsArray = [ "--asyncio-mode=auto" ]; + disabledTests = [ + # api url mismatch (port missing) + "test_api_url" + ]; pythonImportsCheck = [ "pytautulli" ]; diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix index 216b9d38b52b..0110008ae3dd 100644 --- a/pkgs/development/python-modules/pyte/default.nix +++ b/pkgs/development/python-modules/pyte/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyte"; - version = "0.8.1"; + version = "0.8.2"; format = "setuptools"; src = fetchFromGitHub { owner = "selectel"; repo = pname; rev = version; - hash = "sha256-gLvsW4ou6bGq9CxT6XdX+r2ViMk7z+aejemrdLwJb3M="; + hash = "sha256-u24ltX/LEteiZ2a/ioKqxV2AZgrFmKOHXmySmw21sLE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 67b963f50f92..d61bc800d3a8 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.5.1"; + version = "1.5.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "tenable"; repo = "pyTenable"; rev = "refs/tags/${version}"; - hash = "sha256-xiFpwwlQfhpljRbJeytO3Sjh4ue0cSpKgJ9bqUul7rk="; + hash = "sha256-kau350L2WCyuxwsmnD85iWte6LIIqprSVe0yNn+BikE="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index 328d21ebe8d2..21dd73ae2524 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -22,7 +22,6 @@ numba, pytest-mock, pytestCheckHook, - pythonOlder, tensorflow-probability, nix-update-script, @@ -30,16 +29,14 @@ buildPythonPackage rec { pname = "pytensor"; - version = "2.25.4"; + version = "2.25.5"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "pymc-devs"; repo = "pytensor"; rev = "refs/tags/rel-${version}"; - hash = "sha256-NPMUfSbujT1qHsdpCazDX2xF54HvFJkOaxHSUG/FQwM="; + hash = "sha256-tEIDuMAY+rMBqzHLnhbSqOoWzjIbZKCWWMx/uej2pOU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 8d3b1bfdeb76..bc8106a999a6 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { "test_connection_failure_v2" "test_connection_failure_extra_inventory_v2" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # These tests fail in the Darwin sandbox "test_ansible_facts" "test_func" @@ -74,7 +74,7 @@ buildPythonPackage rec { # Test want s to execute pytest in a subprocess "tests/integration/test_molecule.py" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # These tests fail in the Darwin sandbox "tests/test_adhoc.py" "tests/test_adhoc_result.py" diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index 70dc1d0f7fb1..585092787483 100644 --- a/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ py-cpuinfo ]; - passthru.optional-dependencies = { + optional-dependencies = { aspect = [ aspectlib ]; histogram = [ pygal ]; elasticsearch = [ elasticsearch ]; @@ -70,7 +70,7 @@ buildPythonPackage rec { mercurial pytestCheckHook pytest-xdist - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ "-W" diff --git a/pkgs/development/python-modules/pytest-cases/default.nix b/pkgs/development/python-modules/pytest-cases/default.nix index 8741af9da335..d74ffcb45d2a 100644 --- a/pkgs/development/python-modules/pytest-cases/default.nix +++ b/pkgs/development/python-modules/pytest-cases/default.nix @@ -11,21 +11,22 @@ buildPythonPackage rec { pname = "pytest-cases"; - version = "3.8.5"; + version = "3.8.6"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - hash = "sha256-ySBUGHhHp9MNirZwn7FnCoMOThkjS+cAyFyWttcQLBY="; + pname = "pytest_cases"; + inherit version; + hash = "sha256-XCTgqwy2+OgCpGm3llkGozPTuruHRYbrxW9+LL4afEQ="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; buildInputs = [ pytest ]; - propagatedBuildInputs = [ + dependencies = [ decopatch makefun ]; diff --git a/pkgs/development/python-modules/pytest-cid/default.nix b/pkgs/development/python-modules/pytest-cid/default.nix index b73648e2a673..ae5b5e848855 100644 --- a/pkgs/development/python-modules/pytest-cid/default.nix +++ b/pkgs/development/python-modules/pytest-cid/default.nix @@ -6,7 +6,7 @@ flit-core, py-cid, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "pytest_cid" ]; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 71e6e66c5b5b..63032480164a 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -7,17 +7,18 @@ setuptools-scm, django-configurations, pytest, - pytest-xdist, pytestCheckHook, }: + buildPythonPackage rec { pname = "pytest-django"; - version = "4.8.0"; + version = "4.9.0"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-XQVP4BHFbzsQ+Xj0Go77Llrfx+aA7zb7VxraHyR3nZA="; + pname = "pytest_django"; + inherit version; + hash = "sha256-i/e8NYya5vb8UbbOuxkP4gISGW5oBxIfEb1qOwNCgxQ="; }; build-system = [ @@ -31,23 +32,18 @@ buildPythonPackage rec { nativeCheckInputs = [ django-configurations - pytest-xdist + # pytest-xidst causes random errors in the form of: django.db.utils.OperationalError: no such table: app_item pytestCheckHook ]; preCheck = '' # bring pytest_django_test module into PYTHONPATH - export PYTHONPATH="$(pwd):$PYTHONPATH" + export PYTHONPATH="$PWD:$PYTHONPATH" # test the lightweight sqlite flavor export DJANGO_SETTINGS_MODULE="pytest_django_test.settings_sqlite" ''; - disabledTests = [ - # AttributeError: type object 'TestLiveServer' has no attribute '_test_settings_before_run' - "test_settings_restored" - ]; - __darwinAllowLocalNetworking = true; meta = with lib; { @@ -55,5 +51,6 @@ buildPythonPackage rec { description = "Pytest plugin for testing of Django applications"; homepage = "https://pytest-django.readthedocs.org/en/latest/"; license = licenses.bsd3; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-env/default.nix b/pkgs/development/python-modules/pytest-env/default.nix index c013b583a012..e2a4f0e4a8ab 100644 --- a/pkgs/development/python-modules/pytest-env/default.nix +++ b/pkgs/development/python-modules/pytest-env/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pytest-env"; - version = "1.1.3"; + version = "1.1.5"; format = "pyproject"; src = fetchPypi { pname = "pytest_env"; inherit version; - hash = "sha256-/NfcI7tx79PTVjK94bvl7oyNxEidZhf7AQZ0iA2WIWs="; + hash = "sha256-kSCYQKoOQzhQc6xGSlVK0pR8wv1mOp3r+I0DsB4Mwc8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix index 9908c3b2b4ff..cdb9765243c0 100644 --- a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix +++ b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, pytest, - pytest-cov, + pytest-cov-stub, pytest-doctestplus, pytestCheckHook, pythonOlder, @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytest-doctestplus - pytest-cov + pytest-cov-stub ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index f45abf0941fa..16d75ace33c2 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "pytest-flake8"; - version = "1.2.2"; + version = "1.3.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "coherent-oss"; repo = "pytest-flake8"; rev = "refs/tags/v${version}"; - hash = "sha256-FsJysBj5S5HHGay+YZKMgb9RdUN637J+FfNl+m9l6ik="; + hash = "sha256-uc5DOqqdoLfhzI2ogDOqhbJOHzdu+uqSOojIH+S1LZI="; }; build-system = [ setuptools-scm ]; @@ -29,8 +29,6 @@ buildPythonPackage rec { 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/coherent-oss/pytest-flake8"; diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix index 477be61ebefd..cc0096db1fd7 100644 --- a/pkgs/development/python-modules/pytest-flask/default.nix +++ b/pkgs/development/python-modules/pytest-flask/default.nix @@ -36,7 +36,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "pytest_flask" ]; - pytestFlagsArray = lib.optionals stdenv.isDarwin [ "--ignore=tests/test_live_server.py" ]; + pytestFlagsArray = lib.optionals stdenv.hostPlatform.isDarwin [ + "--ignore=tests/test_live_server.py" + ]; meta = with lib; { description = "Set of pytest fixtures to test Flask applications"; diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index 64c43164a01b..6a508417e2e1 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { ]; disabledTests = - if (pythonAtLeast "3.12" && stdenv.isDarwin && stdenv.isx86_64) then + if (pythonAtLeast "3.12" && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) then [ # non reproducible test failure on hydra, works on community builder # https://hydra.nixos.org/build/252537267 diff --git a/pkgs/development/python-modules/pytest-forked/setup-hook.sh b/pkgs/development/python-modules/pytest-forked/setup-hook.sh index e613feadf834..0eff690e9079 100644 --- a/pkgs/development/python-modules/pytest-forked/setup-hook.sh +++ b/pkgs/development/python-modules/pytest-forked/setup-hook.sh @@ -16,10 +16,17 @@ pytestForkedHook() { # until we have dependency mechanism in generic builder, we need to use this ugly hack. if [ -z "${dontUsePytestForked-}" ] && [ -z "${dontUsePytestCheck-}" ]; then - if [[ " ${preDistPhases:-} " =~ " pytestCheckPhase " ]]; then - preDistPhases+=" " - preDistPhases="${preDistPhases/ pytestCheckPhase / pytestForkedHook pytestCheckPhase }" + if [[ " ${preDistPhases[*]:-} " =~ " pytestCheckPhase " ]]; then + _preDistPhases="${preDistPhases[*]} " + _preDistPhases="${_preDistPhases/ pytestCheckPhase / pytestForkedHook pytestCheckPhase }" + if [[ -n "${__structuredAttrs-}" ]]; then + preDistPhases=() + else + preDistPhases="" + fi + appendToVar preDistPhases $_preDistPhases + unset _preDistPhases else - preDistPhases+=" pytestForkedHook" + appendToVar preDistPhases pytestForkedHook fi fi diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix index 152223f2ea5c..3bed5314cfb9 100644 --- a/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytest-httpserver"; - version = "1.0.10"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "csernazs"; repo = "pytest-httpserver"; rev = "refs/tags/${version}"; - hash = "sha256-KCsZs4MGENByF/wB+aj3yvMp7lssHNVKx8jLhDQ1u4k="; + hash = "sha256-BkdbCrpZKjHYikZk1mL4iSGe5gRjWUVN/w222QkmFLQ="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index 59a5a76e2eb5..032631ca3bde 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.30.0"; + version = "0.32.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Colin-b"; repo = "pytest_httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-JfyqeOCHNHO4IEHVrh47TdWvb8lcy/1Prqnfphs0ufM="; + hash = "sha256-YwpNwtSTyCd78Q4zjvdCoXxpFd1XItcV5dq/O9z1dMw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-jupyter/default.nix b/pkgs/development/python-modules/pytest-jupyter/default.nix index 36e45343a308..560f17f02592 100644 --- a/pkgs/development/python-modules/pytest-jupyter/default.nix +++ b/pkgs/development/python-modules/pytest-jupyter/default.nix @@ -40,7 +40,7 @@ let propagatedBuildInputs = [ jupyter-core ]; - passthru.optional-dependencies = { + optional-dependencies = { client = [ jupyter-client nbformat @@ -59,7 +59,7 @@ let nativeCheckInputs = [ pytest-timeout pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); passthru.tests = { check = self.overridePythonAttrs (_: { diff --git a/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix b/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix index 236e6dad3bfe..66a267be113e 100644 --- a/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pytest-lazy-fixtures"; - version = "1.0.7"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "dev-petrov"; repo = "pytest-lazy-fixtures"; - rev = version; - hash = "sha256-BOKUg5HPBQfteKOEsdZ30h/hWbVZPuHMhtGXF3KfMXg="; + rev = "refs/tags/${version}"; + hash = "sha256-2gaGIv4vfMdhLXQeYMbbx9B6tIsCGw4rytaO8bfRuEI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index 8549d394b984..009615455970 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -5,26 +5,31 @@ fetchPypi, werkzeug, pythonOlder, + setuptools-scm, }: buildPythonPackage rec { pname = "pytest-localserver"; - version = "0.8.1"; - format = "setuptools"; + version = "0.9.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - hash = "sha256-ZlacNP7zGldQsW7/0c0SiKepC1kVXQBef5FqzNPe5PE="; + pname = "pytest_localserver"; + inherit version; + hash = "sha256-+voCggk37n050B11D9Bc6xl/xfPIlfgbysOCbbCQh+0="; }; - propagatedBuildInputs = [ - aiosmtpd - werkzeug - ]; + build-system = [ setuptools-scm ]; - # all tests access network: does not work in sandbox + dependencies = [ werkzeug ]; + + optional-dependencies = { + smtp = [ aiosmtpd ]; + }; + + # All tests access network: does not work in sandbox doCheck = false; pythonImportsCheck = [ "pytest_localserver" ]; diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index fd26b16b6508..d5bfa4402cbe 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -2,52 +2,58 @@ lib, buildPythonPackage, fetchPypi, + setuptools, setuptools-scm, pytest, jinja2, matplotlib, + packaging, pillow, - pytest7CheckHook, + pytestCheckHook, }: buildPythonPackage rec { pname = "pytest-mpl"; - version = "0.16.1"; - format = "setuptools"; + version = "0.17.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-LVcWgRJOj/X04rnA0EfTfQSZ1rbY8vSaG1DN2ZMQRGk="; + hash = "sha256-++8F1+ZktLM0UvtpisGI5SJ5HzJ9405+o329/p1SysY="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; buildInputs = [ pytest ]; - propagatedBuildInputs = [ + dependencies = [ jinja2 matplotlib + packaging pillow ]; - nativeCheckInputs = [ pytest7CheckHook ]; - - disabledTests = [ - # Broken since b6e98f18950c2b5dbdc725c1181df2ad1be19fee - "test_hash_fails" - "test_hash_missing" - ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ # Following are broken since at least a1548780dbc79d76360580691dc1bb4af4e837f6 "tests/subtests/test_subtest.py" ]; + # need to set MPLBACKEND=agg for headless matplotlib for darwin + # https://github.com/matplotlib/matplotlib/issues/26292 + # The default tolerance is too strict in our build environment + # https://github.com/matplotlib/pytest-mpl/pull/9 + # https://github.com/matplotlib/pytest-mpl/issues/225 preCheck = '' - export HOME=$(mktemp -d) - mkdir -p $HOME/.config/matplotlib - echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc - ln -s $HOME/.config/matplotlib $HOME/.matplotlib + export MPLBACKEND=agg + substituteInPlace pytest_mpl/plugin.py \ + --replace-fail "DEFAULT_TOLERANCE = 2" "DEFAULT_TOLERANCE = 10" + substituteInPlace tests/test_pytest_mpl.py \ + --replace-fail "DEFAULT_TOLERANCE = 10 if WIN else 2" "DEFAULT_TOLERANCE = 10" ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-notebook/default.nix b/pkgs/development/python-modules/pytest-notebook/default.nix index 21f40beb6a89..f66f42081c58 100644 --- a/pkgs/development/python-modules/pytest-notebook/default.nix +++ b/pkgs/development/python-modules/pytest-notebook/default.nix @@ -12,7 +12,7 @@ black, coverage, ipykernel, - pytest-cov, + pytest-cov-stub, pytest-regressions, pytestCheckHook, }: @@ -54,7 +54,7 @@ buildPythonPackage rec { black coverage ipykernel - pytest-cov + pytest-cov-stub pytest-regressions pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-recording/default.nix b/pkgs/development/python-modules/pytest-recording/default.nix index 23471054526c..dd9e84b3517e 100644 --- a/pkgs/development/python-modules/pytest-recording/default.nix +++ b/pkgs/development/python-modules/pytest-recording/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { disabledTests = [ "test_block_network_with_allowed_hosts" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Missing socket.AF_NETLINK "test_other_socket" ]; diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index 5e47e2e1c6d5..bb1584aa162e 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { "pytest_regressions.plugin" ]; - passthru.optional-dependencies = { + optional-dependencies = { dataframe = [ pandas numpy diff --git a/pkgs/development/python-modules/pytest-ruff/default.nix b/pkgs/development/python-modules/pytest-ruff/default.nix new file mode 100644 index 000000000000..0d9239e7114f --- /dev/null +++ b/pkgs/development/python-modules/pytest-ruff/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + poetry-dynamic-versioning, + + # dependencies + pytest, + ruff, + + # tests + pytestCheckHook, + pytest-mock, +}: + +buildPythonPackage rec { + pname = "pytest-ruff"; + version = "0.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "businho"; + repo = "pytest-ruff"; + rev = "refs/tags/v${version}"; + hash = "sha256-Ol+W5mDGMCwptuBa0b+Plkm64UUBf9bmr9YBo8g93Ok="; + }; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = [ + pytest + ruff + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + ]; + + pythonImportsCheck = [ "pytest_ruff" ]; + + meta = { + description = "A pytest plugin to run ruff"; + homepage = "https://github.com/businho/pytest-ruff"; + changelog = "https://github.com/businho/pytest-ruff/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ baloo ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix index 664e0609080d..ee0bd0220226 100644 --- a/pkgs/development/python-modules/pytest-subtests/default.nix +++ b/pkgs/development/python-modules/pytest-subtests/default.nix @@ -17,14 +17,15 @@ buildPythonPackage rec { pname = "pytest-subtests"; - version = "0.12.1"; + version = "0.13.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-1mBdy4hkfgt8GInQJ/jvHBfXosYJJ+v9wJx7DYEgR20="; + pname = "pytest_subtests"; + inherit version; + hash = "sha256-mJ448PHAG8fGsuBNt9n9hZ2zXXfCwaQwyDGnDL8/3i0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh index 4c6473cea64d..9819e0d3ec7d 100644 --- a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh +++ b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh @@ -8,10 +8,17 @@ pytestXdistHook() { # until we have dependency mechanism in generic builder, we need to use this ugly hack. if [ -z "${dontUsePytestXdist-}" ] && [ -z "${dontUsePytestCheck-}" ]; then - if [[ " ${preDistPhases:-} " =~ " pytestCheckPhase " ]]; then - preDistPhases+=" " - preDistPhases="${preDistPhases/ pytestCheckPhase / pytestXdistHook pytestCheckPhase }" + if [[ " ${preDistPhases[*]:-} " =~ " pytestCheckPhase " ]]; then + _preDistPhases="${preDistPhases[*]} " + _preDistPhases="${_preDistPhases/ pytestCheckPhase / pytestXdistHook pytestCheckPhase }" + if [[ -n "${__structuredAttrs-}" ]]; then + preDistPhases=() + else + preDistPhases="" + fi + appendToVar preDistPhases $_preDistPhases + unset _preDistPhases else - preDistPhases+=" pytestXdistHook" + appendToVar preDistPhases pytestXdistHook fi fi diff --git a/pkgs/development/python-modules/pytest/7.nix b/pkgs/development/python-modules/pytest/7.nix index 8ca33b158e5c..3abbffcf3d9d 100644 --- a/pkgs/development/python-modules/pytest/7.nix +++ b/pkgs/development/python-modules/pytest/7.nix @@ -22,7 +22,6 @@ argcomplete, hypothesis, mock, - nose, pygments, requests, xmlschema, @@ -60,13 +59,12 @@ let tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ argcomplete attrs hypothesis mock - nose pygments requests setuptools @@ -87,7 +85,7 @@ let pytestcachePhase() { find $out -name .pytest_cache -type d -exec rm -rf {} + } - preDistPhases+=" pytestcachePhase" + appendToVar preDistPhases pytestcachePhase # pytest generates it's own bytecode files to improve assertion messages. # These files similar to cpython's bytecode files but are never laoded @@ -100,7 +98,7 @@ let # https://github.com/pytest-dev/pytest/blob/7.2.1/src/_pytest/assertion/rewrite.py#L51-L53 find $out -name "*-pytest-*.py[co]" -delete } - preDistPhases+=" pytestRemoveBytecodePhase" + appendToVar preDistPhases pytestRemoveBytecodePhase ''; pythonImportsCheck = [ "pytest" ]; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index fc5ca9c2a37b..986c7aef8f0e 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -29,12 +29,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "8.3.2"; + version = "8.3.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-wTI0XRLOVRJCyHJp3oEkg/W8yHzbtHIuSEh7oZT5/c4="; + hash = "sha256-cLmBB71kgwinlSsG5sqaULxmC+IY1TwlfMH8lP2hAYE="; }; outputs = [ @@ -58,7 +58,7 @@ buildPythonPackage rec { tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ argcomplete attrs @@ -84,7 +84,7 @@ buildPythonPackage rec { pytestcachePhase() { find $out -name .pytest_cache -type d -exec rm -rf {} + } - preDistPhases+=" pytestcachePhase" + appendToVar preDistPhases pytestcachePhase # pytest generates it's own bytecode files to improve assertion messages. # These files similar to cpython's bytecode files but are never laoded @@ -97,7 +97,7 @@ buildPythonPackage rec { # https://github.com/pytest-dev/pytest/blob/7.2.1/src/_pytest/assertion/rewrite.py#L51-L53 find $out -name "*-pytest-*.py[co]" -delete } - preDistPhases+=" pytestRemoveBytecodePhase" + appendToVar preDistPhases pytestRemoveBytecodePhase ''; pythonImportsCheck = [ "pytest" ]; diff --git a/pkgs/development/python-modules/python-aodhclient/default.nix b/pkgs/development/python-modules/python-aodhclient/default.nix new file mode 100644 index 000000000000..9c3b015a5374 --- /dev/null +++ b/pkgs/development/python-modules/python-aodhclient/default.nix @@ -0,0 +1,82 @@ +{ + lib, + buildPythonPackage, + cliff, + fetchFromGitHub, + keystoneauth1, + openstackdocstheme, + osc-lib, + oslo-i18n, + oslo-serialization, + oslo-utils, + oslotest, + osprofiler, + pbr, + pyparsing, + pythonOlder, + setuptools, + sphinxHook, + stestr, +}: + +buildPythonPackage rec { + pname = "python-aodhclient"; + version = "3.6.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "openstack"; + repo = "python-aodhclient"; + rev = "refs/tags/${version}"; + hash = "sha256-FArXBkDOY0Weu3Fm/M0Qgg0XHTy95MqlUidZ/hUZfB8="; + }; + + env.PBR_VERSION = version; + + build-system = [ + pbr + setuptools + ]; + + nativeBuildInputs = [ + openstackdocstheme + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + dependencies = [ + cliff + keystoneauth1 + osc-lib + oslo-i18n + oslo-serialization + oslo-utils + osprofiler + pbr + pyparsing + ]; + + nativeCheckInputs = [ + oslotest + stestr + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "aodhclient" ]; + + meta = { + homepage = "https://opendev.org/openstack/python-aodhclient"; + description = "Client library for OpenStack Aodh API"; + license = lib.licenses.asl20; + mainProgram = "aodh"; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix index 95e73ca2bb52..2242b0b7c891 100644 --- a/pkgs/development/python-modules/python-arango/default.nix +++ b/pkgs/development/python-modules/python-arango/default.nix @@ -33,7 +33,7 @@ in buildPythonPackage rec { pname = "python-arango"; - version = "8.1.1"; + version = "8.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "arangodb"; repo = "python-arango"; rev = "refs/tags/${version}"; - hash = "sha256-C2qFC0KOPO8I2CIDgFl0L7LyPgvqfqEeYdPAvwIJ+PY="; + hash = "sha256-EK1jZajACdc5IWF/Tgg3albUAH566G0IwUsHk4dZpoQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix index cb2185845e65..6dfdab632d04 100644 --- a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix +++ b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix @@ -2,22 +2,34 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch, + setuptools, }: buildPythonPackage rec { pname = "python-axolotl-curve25519"; version = "0.4.1.post2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "0705a66297ebd2f508a60dc94e22881c754301eb81db93963322f6b3bdcb63a3"; }; - meta = with lib; { + patches = [ + # https://github.com/tgalal/python-axolotl-curve25519/pull/26 + (fetchpatch { + url = "https://github.com/tgalal/python-axolotl-curve25519/commit/901f4fb12e1290b72fbd26ea1f40755b079fa241.patch"; + hash = "sha256-hdhaOysRXI9q5D9e/bfy0887bpEFSvUyrbl32nBgteQ="; + }) + ]; + + build-system = [ setuptools ]; + + meta = { homepage = "https://github.com/tgalal/python-axolotl-curve25519"; description = "Curve25519 with ed25519 signatures"; - maintainers = with maintainers; [ abbradar ]; - license = licenses.gpl3; + maintainers = with lib.maintainers; [ abbradar ]; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/development/python-modules/python-barbicanclient/default.nix b/pkgs/development/python-modules/python-barbicanclient/default.nix index 7188c8381605..9c65649a2336 100644 --- a/pkgs/development/python-modules/python-barbicanclient/default.nix +++ b/pkgs/development/python-modules/python-barbicanclient/default.nix @@ -60,8 +60,6 @@ buildPythonPackage rec { requests ]; - doCheck = true; - nativeCheckInputs = [ requests-mock stestr diff --git a/pkgs/development/python-modules/python-barcode/default.nix b/pkgs/development/python-modules/python-barcode/default.nix index 214e074ffd7a..432a910b95c6 100644 --- a/pkgs/development/python-modules/python-barcode/default.nix +++ b/pkgs/development/python-modules/python-barcode/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { images = [ pillow ]; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { --replace "--no-cov-on-fail" "" ''; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.images; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.images; pythonImportsCheck = [ "barcode" ]; diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index 055a993ca013..5f488ef1741e 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -25,31 +25,29 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.33.2"; + version = "0.34.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fabiocaccamo"; repo = "python-benedict"; rev = "refs/tags/${version}"; - hash = "sha256-1/eLJFXACn1W5Yz43BIhdqqUVk3t9285d8aLwH+VmAE="; + hash = "sha256-HQ9VVgRfF5qA36yOyKT63gXuKNLLjouqYKz5EuqGA2E="; }; pythonRelaxDeps = [ "boto3" ]; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ python-fsutil python-slugify requests ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ beautifulsoup4 boto3 @@ -95,7 +93,7 @@ buildPythonPackage rec { orjson pytestCheckHook python-decouple - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ # Tests require network access diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 97885c27a952..2ab21191104c 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ msgpack ruamel-yaml @@ -47,7 +47,7 @@ buildPythonPackage rec { msgpack = [ msgpack ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.all; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all; pythonImportsCheck = [ "box" ]; diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index b6312d2c0178..42e9abe85c3b 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -6,9 +6,10 @@ backoff, buildPythonPackage, fetchFromGitHub, + mashumaro, + orjson, packaging, poetry-core, - mashumaro, pytest-asyncio, pytest-cov-stub, pytest-mock, @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "0.6.2"; + version = "0.6.4"; pyproject = true; disabled = pythonOlder "3.12"; @@ -28,7 +29,7 @@ buildPythonPackage rec { owner = "liudger"; repo = "python-bsblan"; rev = "refs/tags/v${version}"; - hash = "sha256-/rdYCd5eyFqW96XaIzQOhsApzcTkrI46Gt226sLTLUQ="; + hash = "sha256-mOVX65YRDUac0GoB9+tHIYtvNDGyxT0BSsj8I3OzuBI="; }; postPatch = '' @@ -43,8 +44,9 @@ buildPythonPackage rec { aiohttp async-timeout backoff - packaging mashumaro + orjson + packaging yarl ]; diff --git a/pkgs/development/python-modules/python-bugzilla/default.nix b/pkgs/development/python-modules/python-bugzilla/default.nix new file mode 100644 index 000000000000..1aa40b81c0fb --- /dev/null +++ b/pkgs/development/python-modules/python-bugzilla/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + requests, + responses, + pytestCheckHook, + glibcLocalesUtf8, +}: + +buildPythonPackage rec { + pname = "python-bugzilla"; + version = "3.3.0"; + pyproject = true; + + src = fetchPypi { + pname = "python_bugzilla"; + inherit version; + hash = "sha256-4YIgFx4DPrO6YAxNE5NZ0BqhrOwdrrxDCJEORQdj3kc="; + }; + + build-system = [ setuptools ]; + + dependencies = [ requests ]; + + nativeCheckInputs = [ + pytestCheckHook + glibcLocalesUtf8 + responses + ]; + + preCheck = '' + mkdir -p check-phase + export HOME=$(pwd)/check-phase + ''; + + meta = with lib; { + homepage = "https://github.com/python-bugzilla/python-bugzilla"; + description = "Bugzilla XMLRPC access module"; + mainProgram = "bugzilla"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ pierron ]; + }; +} diff --git a/pkgs/development/python-modules/python-can/default.nix b/pkgs/development/python-modules/python-can/default.nix index 26bd3a27474e..d762c5f0ed69 100644 --- a/pkgs/development/python-modules/python-can/default.nix +++ b/pkgs/development/python-modules/python-can/default.nix @@ -9,6 +9,7 @@ parameterized, msgpack, pyserial, + pytest-cov-stub, pytest-timeout, pytestCheckHook, pythonOlder, @@ -32,21 +33,18 @@ buildPythonPackage rec { hash = "sha256-p3B1LWSygDX0UhIx4XhXv15H7Hwn9UB20jFIPDZnuNs="; }; - postPatch = '' - substituteInPlace tox.ini \ - --replace " --cov=can --cov-config=tox.ini --cov-report=lcov --cov-report=term" "" - ''; + pythonRelaxDeps = [ "msgpack" ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ msgpack packaging typing-extensions wrapt ]; - passthru.optional-dependencies = { + optional-dependencies = { serial = [ pyserial ]; seeedstudio = [ pyserial ]; pcan = [ uptime ]; @@ -56,9 +54,10 @@ buildPythonPackage rec { future hypothesis parameterized + pytest-cov-stub pytest-timeout pytestCheckHook - ] ++ passthru.optional-dependencies.serial; + ] ++ optional-dependencies.serial; disabledTestPaths = [ # We don't support all interfaces @@ -74,7 +73,7 @@ buildPythonPackage rec { "test_pack_unpack" "test_receive" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # timing sensitive "test_general" "test_gap" diff --git a/pkgs/development/python-modules/python-crontab/default.nix b/pkgs/development/python-modules/python-crontab/default.nix index 55522bc960b5..c89cd3d07bda 100644 --- a/pkgs/development/python-modules/python-crontab/default.nix +++ b/pkgs/development/python-modules/python-crontab/default.nix @@ -10,19 +10,20 @@ buildPythonPackage rec { pname = "python-crontab"; - version = "3.1.0"; + version = "3.2.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-9OoWBdJFM7Z/p6Y07ybLWaXy55VPbmd9LXoiKZWaL8g="; + pname = "python_crontab"; + inherit version; + hash = "sha256-QAZ9HdOa3jRgsq2FV8dlFRTNOFHe//9hxcYOEifFw2s="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ python-dateutil ]; + dependencies = [ python-dateutil ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index 9092a49d7690..d39f44084d50 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, runCommand, # build-system @@ -30,16 +31,29 @@ let in buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.31.1"; + version = "0.32.2"; pyproject = true; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DdV78o089Jkc7mSsGvlJgVpv8kPpMILo7lC6EbLxkxg="; + hash = "sha256-TOs6wAZDcSD1eP+Hbj78YXoAtKbReC5di5QSpQdwp8E="; }; + patches = [ + (fetchpatch { + name = "musl.patch"; + url = "https://github.com/martinpitt/python-dbusmock/commit/1a8d8722068ef7e5f061336047a72d1a0f253b98.patch"; + hash = "sha256-0j3UXsTMDh1+UolkmoLQXlwHXve81yKiGJ7gDWNZVPY="; + }) + (fetchpatch { + name = "os-release.patch"; + url = "https://github.com/martinpitt/python-dbusmock/commit/4b99cff50e8c741f20aef4527b27ccdb2a4053d2.patch"; + hash = "sha256-Xcovv44JeuTvPAtXWJvWE+MxlyloClSJGKZz+C3P5bE="; + }) + ]; + build-system = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/python-ecobee-api/default.nix b/pkgs/development/python-modules/python-ecobee-api/default.nix index 4a99321dc880..079aa23b8ad7 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.19"; + version = "0.2.20"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "nkgilley"; repo = "python-ecobee-api"; rev = "refs/tags/${version}"; - hash = "sha256-osEqDUVf7fU5DWRUQyFaM8jOi2OgSqbtMaLSWMKQMPw="; + hash = "sha256-ffCd109hweeKJn+nnsVo/kDVg3bam/WONZWJOA2EibE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index a7eb7fe8dd17..28bf7840a30b 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { dependencies = [ simple-websocket ]; - passthru.optional-dependencies = { + optional-dependencies = { client = [ requests websocket-client @@ -53,9 +53,9 @@ buildPythonPackage rec { pytestCheckHook ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; - preCheck = lib.optionalString stdenv.isLinux '' + preCheck = lib.optionalString stdenv.hostPlatform.isLinux '' echo "nameserver 127.0.0.1" > resolv.conf export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \ LD_PRELOAD=${libredirect}/lib/libredirect.so diff --git a/pkgs/development/python-modules/python-etcd/default.nix b/pkgs/development/python-modules/python-etcd/default.nix index 27d768c4e96e..031efa7b31e3 100644 --- a/pkgs/development/python-modules/python-etcd/default.nix +++ b/pkgs/development/python-modules/python-etcd/default.nix @@ -39,7 +39,7 @@ buildPythonPackage { ]; # arm64 is an unsupported platform on etcd 3.4. should be able to be removed on >= etcd 3.5 - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; preCheck = '' for file in "test_auth" "integration/test_simple"; do diff --git a/pkgs/development/python-modules/python-ffmpeg/default.nix b/pkgs/development/python-modules/python-ffmpeg/default.nix index 3eba0ddb1d22..1991f7492667 100644 --- a/pkgs/development/python-modules/python-ffmpeg/default.nix +++ b/pkgs/development/python-modules/python-ffmpeg/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { 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 ]; + maintainers = with lib.maintainers; [ youhaveme9 ]; }; } diff --git a/pkgs/development/python-modules/python-flirt/default.nix b/pkgs/development/python-modules/python-flirt/default.nix index 8034a621f8b2..47fdc3cfa08d 100644 --- a/pkgs/development/python-modules/python-flirt/default.nix +++ b/pkgs/development/python-modules/python-flirt/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildAndTestSubdir = "pyflirt"; diff --git a/pkgs/development/python-modules/python-fx/default.nix b/pkgs/development/python-modules/python-fx/default.nix index 0d906cd2e379..40b09992d749 100644 --- a/pkgs/development/python-modules/python-fx/default.nix +++ b/pkgs/development/python-modules/python-fx/default.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { ]; # FAILED tests/test_event_loops.py::TwistedEventLoopTest::test_run - AssertionError: 'callback called with future outcome: True' not found in ['... - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "pyfx" ]; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 33a15d52d7ed..6b9323e44e47 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "4.11.1"; + version = "4.12.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "python_gitlab"; inherit version; - hash = "sha256-evovnDBhi8Pa7pXSGGoG4c8Yyi+peJDrVf2N3E4zmBI="; + hash = "sha256-jBQKJgOtjv9/yrbz+qv1/Iuquo3vEl6zCaMtaqOiOlY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-glanceclient/default.nix b/pkgs/development/python-modules/python-glanceclient/default.nix index ad872d465fa9..dc456f383e11 100644 --- a/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/pkgs/development/python-modules/python-glanceclient/default.nix @@ -24,12 +24,20 @@ let pname = "python-glanceclient"; version = "4.7.0"; + # Skip tests which require networking. disabledTests = [ "test_http_chunked_response" "test_v1_download_has_no_stray_output_to_stdout" "test_v2_requests_valid_cert_verification" "test_download_has_no_stray_output_to_stdout" + "test_v1_requests_cert_verification_no_compression" + "test_v1_requests_cert_verification" "test_v2_download_has_no_stray_output_to_stdout" + "test_v2_requests_bad_ca" + "test_v2_requests_bad_cert" + "test_v2_requests_cert_verification_no_compression" + "test_v2_requests_cert_verification" + "test_v2_requests_valid_cert_no_key" "test_v2_requests_valid_cert_verification_no_compression" "test_log_request_id_once" ]; diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index 763999be86ad..6d346d6c638b 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { # No running SSH available "test_connect_error" "test_feed_xml_error" - ] ++ lib.optionals stdenv.isDarwin [ "test_feed_xml_error" ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_feed_xml_error" ]; pythonImportsCheck = [ "gvm" ]; diff --git a/pkgs/development/python-modules/python-hcl2/default.nix b/pkgs/development/python-modules/python-hcl2/default.nix index 36ac08291140..49e35976fe12 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.5"; + version = "5.0.0"; pyproject = true; src = fetchFromGitHub { owner = "amplify-education"; repo = "python-hcl2"; rev = "refs/tags/v${version}"; - hash = "sha256-Pz1FS1g0OYSThpxFcs6UCOAzGnF4kOuRwhx2KIl9sv4="; + hash = "sha256-aUPjW3yQci5aG85qIRHPiKiX01cFw8jWKJY5RuRATvQ="; }; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix index b4626a8d02db..4433e441b6cb 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.7.0"; + version = "0.8.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-HPimk401tRBwszWvkyUEAcuLeYeEu0JUld16PESXkbo="; + hash = "sha256-vyJseIYFmbxUYieZB0r3Z3j6/ZHmgs7ONa5YKQTwAXw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-ipmi/default.nix b/pkgs/development/python-modules/python-ipmi/default.nix index 2e644fa1dc82..af7cd125befb 100644 --- a/pkgs/development/python-modules/python-ipmi/default.nix +++ b/pkgs/development/python-modules/python-ipmi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python-ipmi"; - version = "0.5.5"; + version = "0.5.7"; pyproject = true; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "kontron"; repo = "python-ipmi"; rev = "refs/tags/${version}"; - hash = "sha256-G5FcFHtyN8bXMjj/yfJgzcfmV1mxQ9lu3GM3XMeTWVU="; + hash = "sha256-vwjVUkTeVC1On1I1BtM0kBbne6CbX/6Os1+HA8WN9jU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-ipware/default.nix b/pkgs/development/python-modules/python-ipware/default.nix index 9e63a766bc0f..394f114b095f 100644 --- a/pkgs/development/python-modules/python-ipware/default.nix +++ b/pkgs/development/python-modules/python-ipware/default.nix @@ -3,12 +3,13 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - unittestCheckHook, setuptools, + unittestCheckHook, }: + buildPythonPackage rec { pname = "python-ipware"; - version = "2.0.0"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -16,16 +17,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "un33k"; repo = "python-ipware"; - rev = "v${version}"; - hash = "sha256-j43uAcb1dyKe/SHQLLR+QJS6hKGB5qxjb9NiJaUPj8Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-S8/HbRztYGzrpLQRTHcvO7Zv3mNn/0+y5PNBYLpd++E="; }; - nativeBuildInputs = [ setuptools ]; - - pythonImportsCheck = [ "python_ipware" ]; + build-system = [ setuptools ]; nativeCheckInputs = [ unittestCheckHook ]; + pythonImportsCheck = [ "python_ipware" ]; + meta = with lib; { description = "Python package for server applications to retrieve client's IP address"; homepage = "https://github.com/un33k/python-ipware"; diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix index 8afb965dbaca..e06a0760fbdd 100644 --- a/pkgs/development/python-modules/python-jenkins/default.nix +++ b/pkgs/development/python-modules/python-jenkins/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { # test uses timeout mechanism unsafe for use with the "spawn" # multiprocessing backend used on macos - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace tests/test_jenkins_sockets.py \ --replace test_jenkins_open_no_timeout dont_test_jenkins_open_no_timeout ''; diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index 449fec2d7d07..037b352ccc7e 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { rsa ]; - passthru.optional-dependencies = { + optional-dependencies = { cryptography = [ cryptography ]; pycrypto = [ pycrypto ]; pycryptodome = [ pycryptodome ]; @@ -69,7 +69,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ # https://github.com/mpdavis/python-jose/issues/348 diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index dd82fbca2cb4..729d98a9e0ce 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -2,46 +2,54 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, mock, - pytest-cov, - coverage, - future, + pytest-cov-stub, + pytestCheckHook, + pythonOlder, + setuptools, ujson, + versioneer, }: buildPythonPackage rec { pname = "python-jsonrpc-server"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "palantir"; repo = "python-jsonrpc-server"; - rev = version; - sha256 = "0pcf50qvcxqnz3db58whqd8z89cdph19pfs1whgfm0zmwbwk0lw6"; + rev = "refs/tags/${version}"; + hash = "sha256-hlMw+eL1g+oe5EG7mwK8jSX0UcOQo7La+BZ3tjEojl0="; }; postPatch = '' - sed -i "s/version=versioneer.get_version(),/version=\"$version\",/g" setup.py + # Remove vendorized versioneer.py + rm versioneer.py ''; + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ ujson ]; + nativeCheckInputs = [ - pytestCheckHook mock - pytest-cov - coverage + pytest-cov-stub + pytestCheckHook ]; - propagatedBuildInputs = [ - future - ujson - ]; + pythonImportsCheck = [ "pyls_jsonrpc" ]; meta = with lib; { + description = "Module for erver implementation of the JSON RPC 2.0 protocol"; homepage = "https://github.com/palantir/python-jsonrpc-server"; - description = "Python 2 and 3 asynchronous JSON RPC server"; + changelog = "https://github.com/palantir/python-jsonrpc-server/releases/tag/${version}"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index b5d389bced40..796b3e601f38 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -14,6 +14,7 @@ pytest-asyncio, pytest-freezer, pytest-mock, + pytest-socket, pytestCheckHook, pythonOlder, rich, @@ -22,7 +23,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.7.3"; + version = "0.7.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +32,7 @@ buildPythonPackage rec { owner = "python-kasa"; repo = "python-kasa"; rev = "refs/tags/${version}"; - hash = "sha256-41FY1KaPDQxOHtxgaKRakNbiBm/qPYCICpvzxVAmSD8="; + hash = "sha256-405FrKG1jZNrxTmz/K8vqwPhiOqrxURWVCpyFQRJeXc="; }; build-system = [ hatchling ]; @@ -48,11 +49,12 @@ buildPythonPackage rec { pytest-asyncio pytest-freezer pytest-mock + pytest-socket pytestCheckHook voluptuous ]; - passthru.optional-dependencies = { + optional-dependencies = { shell = [ ptpython rich diff --git a/pkgs/development/python-modules/python-ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix index 4f1c9bd9636e..97e8967e8fd6 100644 --- a/pkgs/development/python-modules/python-ldap/default.nix +++ b/pkgs/development/python-modules/python-ldap/default.nix @@ -13,12 +13,12 @@ openldap, cyrus_sasl, - # dependencies pyasn1, pyasn1-modules, # tests pytestCheckHook, + jaraco-functools, }: buildPythonPackage rec { @@ -50,7 +50,10 @@ buildPythonPackage rec { pyasn1-modules ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + jaraco-functools + pytestCheckHook + ]; preCheck = '' # Needed by tests to setup a mockup ldap server. @@ -65,13 +68,14 @@ buildPythonPackage rec { "test_tls_ext_noca" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { - changelog = "https://github.com/python-ldap/python-ldap/releases/tag/python-ldap-${version}"; description = "Python modules for implementing LDAP clients"; downloadPage = "https://github.com/python-ldap/python-ldap"; homepage = "https://www.python-ldap.org/"; + changelog = "https://github.com/python-ldap/python-ldap/releases/tag/python-ldap-${version}"; license = licenses.psfl; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-libnmap/default.nix b/pkgs/development/python-modules/python-libnmap/default.nix index 3e3937051aaf..464716040693 100644 --- a/pkgs/development/python-modules/python-libnmap/default.nix +++ b/pkgs/development/python-modules/python-libnmap/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-cI8wdOvTmRy2cxLBkJn7vXRBRvewDMNl/tkIiRGhZJ8="; }; - passthru.optional-dependencies = { + optional-dependencies = { defusedxml = [ defusedxml ]; }; diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix index 0b66eb44f892..37ccb0932569 100644 --- a/pkgs/development/python-modules/python-linkplay/default.nix +++ b/pkgs/development/python-modules/python-linkplay/default.nix @@ -15,20 +15,18 @@ buildPythonPackage rec { pname = "python-linkplay"; - version = "0.0.10"; + version = "0.0.17"; pyproject = true; src = fetchFromGitHub { owner = "Velleman"; repo = "python-linkplay"; rev = "refs/tags/v${version}"; - hash = "sha256-uenFr86WXSFzo3PlDz/KyMgG06QDzm69z0TM59UP6pg="; + hash = "sha256-TJ5QWt5bCDy9L4EShf1rW1TDIrF0LfeThEv9PiCPEp8="; }; build-system = [ setuptools ]; - pythonRelaxDeps = [ "aiofiles" ]; - dependencies = [ aiofiles aiohttp diff --git a/pkgs/development/python-modules/python-lorem/default.nix b/pkgs/development/python-modules/python-lorem/default.nix new file mode 100644 index 000000000000..e60991c79357 --- /dev/null +++ b/pkgs/development/python-modules/python-lorem/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + pytestCheckHook, +}: +buildPythonPackage rec { + pname = "python-lorem"; + version = "1.3.0.post3"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "python_lorem"; + hash = "sha256-Vw1TKheXg+AkhksnmWUfdIo+Jt7X7m1pS2f0Kfe8pv0="; + }; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "lorem" + ]; + + meta = { + description = "Pythonic lorem ipsum generator"; + homepage = "https://github.com/JarryShaw/lorem"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ aleksana ]; + }; +} diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index eed723f10d8e..c06251663e0b 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ./python-mapnik_std_optional.patch ]; - stdenv = if python.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; + stdenv = if python.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; build-system = [ setuptools ]; @@ -103,7 +103,7 @@ buildPythonPackage rec { # import from $out rm -r mapnik '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Replace the hardcoded /tmp references with $TMPDIR sed -i "s,/tmp,$TMPDIR,g" test/python_tests/*.py ''; @@ -114,7 +114,7 @@ buildPythonPackage rec { "test_passing_pycairo_context_pdf" "test_pdf_printing" "test_render_with_scale_factor" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_passing_pycairo_context_png" "test_passing_pycairo_context_svg" "test_pycairo_pdf_surface1" diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index 453bf9b8b7c2..11ac0d27545e 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -14,7 +14,6 @@ aiorun, async-timeout, coloredlogs, - dacite, orjson, home-assistant-chip-clusters, @@ -24,6 +23,7 @@ zeroconf, # tests + aioresponses, python, pytest, pytest-aiohttp, @@ -55,7 +55,7 @@ in buildPythonPackage rec { pname = "python-matter-server"; - version = "6.3.0"; + version = "6.6.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -64,7 +64,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-/e7U0knkWQq9PnTimA2/ncNTyekx7QOcFEdtJHUcb9I="; + hash = "sha256-g+97a/X0FSapMLfdW6iNf1akkHGLqCmHYimQU/M6loo="; }; patches = [ @@ -91,7 +91,6 @@ buildPythonPackage rec { aiorun async-timeout coloredlogs - dacite orjson home-assistant-chip-clusters ]; @@ -105,6 +104,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + aioresponses pytest-aiohttp pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); @@ -117,12 +117,6 @@ buildPythonPackage rec { export PYTHONPATH=${pythonEnv}/${python.sitePackages} ''; - pytestFlagsArray = [ - # Upstream theymselves limit the test scope - # https://github.com/home-assistant-libs/python-matter-server/blob/main/.github/workflows/test.yml#L65 - "tests/server" - ]; - meta = with lib; { changelog = "https://github.com/home-assistant-libs/python-matter-server/releases/tag/${version}"; description = "Python server to interact with Matter"; diff --git a/pkgs/development/python-modules/python-motionmount/default.nix b/pkgs/development/python-modules/python-motionmount/default.nix index 6335a612a545..a97d7be87769 100644 --- a/pkgs/development/python-modules/python-motionmount/default.nix +++ b/pkgs/development/python-modules/python-motionmount/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-motionmount"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "vogelsproducts"; repo = "python-MotionMount"; rev = "refs/tags/${version}"; - hash = "sha256-BOzv0IuEXK0uzJuO1F1k8baL8KmzV/KFWcKJPSHORsU="; + hash = "sha256-07wTlyfUSt44dBwOXjkXADA+HDy8531KYxJAKqBWKeQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix index 3703e1275762..12b1e19f2c5b 100644 --- a/pkgs/development/python-modules/python-multipart/default.nix +++ b/pkgs/development/python-modules/python-multipart/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "python-multipart"; - version = "0.0.9"; + version = "0.0.12"; pyproject = true; src = fetchPypi { pname = "python_multipart"; inherit version; - hash = "sha256-A/VGiMZj8beXcQXwIQQ7B5MVHkyxwanUoR/BPWIsQCY="; + hash = "sha256-BF4fmNcZwc4IXtf34e+djMyMAroCtVZtX3UhQQztWMs="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/python-musicpd/default.nix b/pkgs/development/python-modules/python-musicpd/default.nix index 72ba24cc0aeb..e5ed4cd9b2b3 100644 --- a/pkgs/development/python-modules/python-musicpd/default.nix +++ b/pkgs/development/python-modules/python-musicpd/default.nix @@ -7,20 +7,17 @@ buildPythonPackage rec { pname = "python-musicpd"; - version = "0.9.0"; + version = "0.9.1"; + pyproject = true; src = fetchPypi { - inherit pname; + pname = "python_musicpd"; inherit version; - hash = "sha256-/FdM0UolVqhJNpS60Q/nra1hSHKL/LiSMX7/Hcipwco="; + hash = "sha256-zKjazEIxja6/tPWFXQhEYlLd1Jl8py9wirKsoDXeGu4="; }; - pyproject = true; - build-system = [ setuptools ]; - doCheck = true; - meta = with lib; { description = "MPD (Music Player Daemon) client library written in pure Python"; homepage = "https://gitlab.com/kaliko/python-musicpd"; diff --git a/pkgs/development/python-modules/python-on-whales/default.nix b/pkgs/development/python-modules/python-on-whales/default.nix index 590ec69df624..6f8d8785cbcb 100644 --- a/pkgs/development/python-modules/python-on-whales/default.nix +++ b/pkgs/development/python-modules/python-on-whales/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-on-whales"; - version = "0.69.0"; + version = "0.73.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,12 +21,12 @@ buildPythonPackage rec { owner = "gabrieldemarmiesse"; repo = "python-on-whales"; rev = "refs/tags/v${version}"; - hash = "sha256-2ZrbiHvcYwerhGQmtC/903W/WpuqgYqapRzLpu30sRs="; + hash = "sha256-i2lctR5V4hF/cS46d+TW73iKZ+2G/UwiHMNbtP/Z7xo="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pydantic requests tqdm @@ -34,6 +34,7 @@ buildPythonPackage rec { ]; doCheck = false; # majority of tests require Docker and/or network access + pythonImportsCheck = [ "python_on_whales" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/python-opendata-transport/default.nix b/pkgs/development/python-modules/python-opendata-transport/default.nix index 0473b5dcfe19..d94ed2604721 100644 --- a/pkgs/development/python-modules/python-opendata-transport/default.nix +++ b/pkgs/development/python-modules/python-opendata-transport/default.nix @@ -10,20 +10,20 @@ buildPythonPackage rec { pname = "python-opendata-transport"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchPypi { pname = "python_opendata_transport"; inherit version; - hash = "sha256-2lEKPu5vjyqNUqz1NGmZ5b6YP3oWnCgoubDdiQCbdps="; + hash = "sha256-CtYsks7Q33ww0Mr9ehhq7+fJhCsj4gxKytiCZ6G4Aqc="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp urllib3 ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { description = "Python client for interacting with transport.opendata.ch"; homepage = "https://github.com/home-assistant-ecosystem/python-opendata-transport"; changelog = "https://github.com/home-assistant-ecosystem/python-opendata-transport/releases/tag/${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 890fc02a1a88..2933fa619b55 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -5,7 +5,9 @@ ddt, openstackdocstheme, osc-lib, + osc-placement, pbr, + python-aodhclient, python-barbicanclient, python-cinderclient, python-designateclient, @@ -20,6 +22,7 @@ python-watcherclient, python-zaqarclient, python-zunclient, + pythonOlder, requests-mock, requests, setuptools, @@ -31,12 +34,14 @@ buildPythonPackage rec { pname = "python-openstackclient"; - version = "7.1.0"; + version = "7.2.0"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchPypi { inherit pname version; - hash = "sha256-nv/CmcVpQiC65Fd3jmzZsjrqG8O/zQTjoE+NhjhaBVQ="; + hash = "sha256-9je3W78PU3iZJjzVMSPXPxBZ0vMYY5xSLJA9zBJ7O5I="; }; build-system = [ @@ -70,23 +75,26 @@ buildPythonPackage rec { pythonImportsCheck = [ "openstackclient" ]; + optional-dependencies = { + # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst + cli-plugins = [ + osc-placement + python-aodhclient + python-barbicanclient + python-designateclient + python-heatclient + python-ironicclient + python-magnumclient + python-manilaclient + python-mistralclient + python-neutronclient + python-watcherclient + python-zaqarclient + python-zunclient + ]; + }; + 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-magnumclient - python-manilaclient - python-mistralclient - python-neutronclient - python-watcherclient - python-zaqarclient - python-zunclient - ]; - }; tests.version = testers.testVersion { package = python-openstackclient; command = "openstack --version"; diff --git a/pkgs/development/python-modules/python-osc/default.nix b/pkgs/development/python-modules/python-osc/default.nix index ee782b7362a7..bb388ab450db 100644 --- a/pkgs/development/python-modules/python-osc/default.nix +++ b/pkgs/development/python-modules/python-osc/default.nix @@ -12,15 +12,16 @@ buildPythonPackage rec { pname = "python-osc"; - version = "1.8.3"; + version = "1.9.0"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-pc4bpWyNgt9Ryz8pRrXdM6cFInkazEuFZOYtKyCtnKo="; + pname = "python_osc"; + inherit version; + hash = "sha256-q1D2axoZ79W/9yLyarZFDfGc3YS6ho8IyaM+fHhRRFY="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; pythonImportsCheck = [ "pythonosc" ]; diff --git a/pkgs/development/python-modules/python-poppler/default.nix b/pkgs/development/python-modules/python-poppler/default.nix new file mode 100644 index 000000000000..85609035f009 --- /dev/null +++ b/pkgs/development/python-modules/python-poppler/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + pytestCheckHook, + setuptools, + meson-python, + ninja, + meson, + poppler, + pkg-config, + pybind11, +}: + +buildPythonPackage rec { + pname = "python-poppler"; + version = "0.4.1"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit version; + pname = "python_poppler"; + hash = "sha256-5spcI+wCNQvyzvhaa/nxsmF5ZDbbR4F2+dJPsU7uzGo="; + }; + + patches = [ + # Prevent Meson from downloading pybind11, use system version instead + ./use_system_pybind11.patch + ]; + + build-system = [ meson-python ]; + + buildInputs = [ pybind11 ]; + + nativeBuildInputs = [ + ninja + pkg-config + ]; + + propagatedBuildInputs = [ poppler ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportCheck = [ "poppler" ]; + + meta = { + description = "Python binding to poppler-cpp"; + homepage = "https://github.com/cbrunet/python-poppler"; + changelog = "https://cbrunet.net/python-poppler/changelog.html"; + # Contradictory license definition + # https://github.com/cbrunet/python-poppler/issues/90 + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/pkgs/development/python-modules/python-poppler/use_system_pybind11.patch b/pkgs/development/python-modules/python-poppler/use_system_pybind11.patch new file mode 100644 index 000000000000..a84d26e85a23 --- /dev/null +++ b/pkgs/development/python-modules/python-poppler/use_system_pybind11.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index c1ac57a..1d1ad1f 100644 +--- a/meson.build ++++ b/meson.build +@@ -13,7 +13,6 @@ poppler_dep = dependency('poppler-cpp', version: '>=0.26.0') + python_mod = import('python') + python3 = python_mod.find_installation('python3', pure: false) + +-pybind11_proj = subproject('pybind11') +-pybind11_dep = pybind11_proj.get_variable('pybind11_dep') ++pybind11_dep = dependency('pybind11') + + subdir('src') diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index e50bbeff87ce..a891f0a0e48c 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { # For Django tests preCheck = "export DJANGO_SETTINGS_MODULE=test_project.settings"; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # fail on Darwin because it defaults to multiprocessing `spawn` "test_reset_signalizes" "test_reset_all_signalizes" diff --git a/pkgs/development/python-modules/python-registry/default.nix b/pkgs/development/python-modules/python-registry/default.nix index 04c6e81d3911..b08d82bb3e48 100644 --- a/pkgs/development/python-modules/python-registry/default.nix +++ b/pkgs/development/python-modules/python-registry/default.nix @@ -1,29 +1,33 @@ { lib, buildPythonPackage, - enum-compat, fetchFromGitHub, pytestCheckHook, unicodecsv, + pythonOlder, + setuptools, six, }: buildPythonPackage rec { pname = "python-registry"; version = "1.4"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "williballenthin"; - repo = pname; - rev = version; - sha256 = "0gwx5jcribgmmbz0ikhz8iphz7yj2d2nmk24nkdrjd3y5irly11s"; + repo = "python-registry"; + rev = "refs/tags/${version}"; + hash = "sha256-OgRPcyx+NJnbtETMakUT0p8Pb0Qfzgj+qvWtmJksnT8="; }; - propagatedBuildInputs = [ - enum-compat - unicodecsv - ]; + pythonRemoveDeps = [ "enum-compat" ]; + + build-system = [ setuptools ]; + + dependencies = [ unicodecsv ]; nativeCheckInputs = [ pytestCheckHook @@ -35,8 +39,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "Registry" ]; meta = with lib; { - description = "Pure Python parser for Windows Registry hives"; + description = "Module to parse the Windows Registry hives"; homepage = "https://github.com/williballenthin/python-registry"; + changelog = "https://github.com/williballenthin/python-registry/releases/tag/${version}"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index add99dfb341d..9cfebbbbaa90 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.6.0"; + version = "2.7.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-Mszy1p7TOEynCePCEiLhwdWiKXfFnlo3/a3vc9TxGeY="; + hash = "sha256-sPG3AqVrv+BiB+copgaghWDT/Rb/WU0R+Y8Z2J6l+7E="; }; postPatch = '' @@ -49,7 +49,7 @@ buildPythonPackage rec { dacite paho-mqtt pycryptodome - ] ++ lib.optionals stdenv.isDarwin [ pycryptodomex ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pycryptodomex ]; nativeCheckInputs = [ pytest-asyncio diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix index f29a3097c631..818eeb919b29 100644 --- a/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/pkgs/development/python-modules/python-rtmidi/default.nix @@ -43,11 +43,11 @@ buildPythonPackage rec { buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libjack2 alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio CoreMIDI CoreServices diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index c640a7287325..142e5883cf8a 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ text-unidecode ]; - passthru.optional-dependencies = { + optional-dependencies = { unidecode = [ unidecode ]; }; diff --git a/pkgs/development/python-modules/python-snap7/default.nix b/pkgs/development/python-modules/python-snap7/default.nix index fcbd2f98060c..80422b7cf258 100644 --- a/pkgs/development/python-modules/python-snap7/default.nix +++ b/pkgs/development/python-modules/python-snap7/default.nix @@ -9,8 +9,8 @@ buildPythonPackage rec { pname = "python-snap7"; - version = "1.3"; - format = "setuptools"; + version = "1.4.1"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -18,17 +18,17 @@ buildPythonPackage rec { owner = "gijzelaerr"; repo = "python-snap7"; rev = "refs/tags/${version}"; - hash = "sha256-90WwgqPHsHbuQUY49cSQblN1jfoLydiG0dm1aMF/NCA="; + hash = "sha256-CqLG5/U2k7WdZL5LfcFAnV1Q8HcIU7l36gi51lgB39s="; }; - propagatedBuildInputs = [ setuptools ]; - prePatch = '' substituteInPlace snap7/common.py \ --replace "lib_location = None" "lib_location = '${snap7}/lib/libsnap7.so'" ''; - # Tests require root privileges to open privilaged ports + build-system = [ setuptools ]; + + # Tests require root privileges to open privileged ports doCheck = false; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/pkgs/development/python-modules/python-snappy/default.nix index 806f067173df..eb6e12df362c 100644 --- a/pkgs/development/python-modules/python-snappy/default.nix +++ b/pkgs/development/python-modules/python-snappy/default.nix @@ -10,12 +10,13 @@ buildPythonPackage rec { pname = "python-snappy"; - version = "0.7.1"; + version = "0.7.3"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-G8KdNiEdRLufBPPXzPuurrvC9ittQPT8Tt0fsWvFLBM="; + pname = "python_snappy"; + inherit version; + hash = "sha256-QCFsG637LTiseB7LFiodDsQPjul0fmELz+/fp5SGzuM="; }; build-system = [ diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 9ecfd72e38de..c59201a466cd 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { python-engineio ]; - passthru.optional-dependencies = { + optional-dependencies = { client = [ requests websocket-client @@ -58,7 +58,7 @@ buildPythonPackage rec { pytestCheckHook uvicorn simple-websocket - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "socketio" ]; diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index 0796ea2b3c96..41664ad7d9eb 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -10,6 +10,7 @@ pytest-trio, pythonOlder, pytestCheckHook, + setuptools, trio, trustme, yarl, @@ -17,8 +18,8 @@ buildPythonPackage rec { pname = "python-socks"; - version = "2.4.4"; - format = "setuptools"; + version = "2.5.2"; + pyproject = true; disabled = pythonOlder "3.6.2"; @@ -28,15 +29,24 @@ buildPythonPackage rec { owner = "romis2012"; repo = "python-socks"; rev = "refs/tags/v${version}"; - hash = "sha256-c1fjSHi7LvaOeZwTOTSY/ZVr27/j03CdAra1PSa9Jt0="; + hash = "sha256-8qh7ohErK10RlVh4Zi1jBVmafWkGmLcGZsTDqE3dldY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ trio curio async-timeout ]; + optional-dependencies = { + asyncio = lib.optionals (pythonOlder "3.11") [ async-timeout ]; + trio = [ trio ]; + curio = [ curio ]; + anyio = [ anyio ]; + }; + doCheck = false; # requires tiny_proxy module nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 2a2b5d714dee..15647160b525 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { SOAP = [ zeep ]; }; diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index b664291e2c85..2cc7a7c95595 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "21.6"; + version = "21.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "python-telegram-bot"; repo = "python-telegram-bot"; rev = "refs/tags/v${version}"; - hash = "sha256-FwAlceRqQfTjCCi+Mqrf0LCxSZD4mV/CVN6YPs947c4="; + hash = "sha256-I8pSUL1nR1x+WUBYK31RlwFE/ATh2tCteYNWEg8XQjg="; }; build-system = [ diff --git a/pkgs/development/python-modules/python-toolbox/default.nix b/pkgs/development/python-modules/python-toolbox/default.nix index 3a91ae373788..230ff86d7fc0 100644 --- a/pkgs/development/python-modules/python-toolbox/default.nix +++ b/pkgs/development/python-modules/python-toolbox/default.nix @@ -3,22 +3,27 @@ buildPythonPackage, docutils, fetchFromGitHub, - isPy27, pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { - version = "1.0.10"; - pname = "python_toolbox"; - disabled = isPy27; + pname = "python-toolbox"; + version = "1.0.11"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "cool-RR"; - repo = pname; - rev = version; - sha256 = "1hpls1hwisdjx1g15cq052bdn9fvh43r120llws8bvgvj9ivnaha"; + repo = "python_toolbox"; + rev = "refs/tags/${version}"; + hash = "sha256-Y9RmVndgsBESrUCEORUwAdaFYBiunY3kWArhB9d7bw4="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ docutils pytestCheckHook @@ -30,9 +35,15 @@ buildPythonPackage rec { "test_python_toolbox/test_cute_profile/test_cute_profile.py" ]; + disabledTests = [ + # AssertionError + "test_repr" + ]; + meta = with lib; { description = "Tools for testing PySnooper"; homepage = "https://github.com/cool-RR/python_toolbox"; + changelog = "https://github.com/cool-RR/python_toolbox/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ seqizz ]; }; diff --git a/pkgs/development/python-modules/python-troveclient/default.nix b/pkgs/development/python-modules/python-troveclient/default.nix index 891a907e55bf..05d5ce033cea 100644 --- a/pkgs/development/python-modules/python-troveclient/default.nix +++ b/pkgs/development/python-modules/python-troveclient/default.nix @@ -20,11 +20,12 @@ sphinxcontrib-apidoc, sphinxHook, stestr, + stevedore, }: buildPythonPackage rec { pname = "python-troveclient"; - version = "8.5.0"; + version = "8.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +34,7 @@ buildPythonPackage rec { owner = "openstack"; repo = "python-troveclient"; rev = "refs/tags/${version}"; - hash = "sha256-lfnAmQ/IxEdc+XxC0dYxK2FgY7csNewGPuQuq0dNffM="; + hash = "sha256-6JviPG2ikKRqvW/eqPIHMvpV6GjqbaXYHhcOOpaIS4U="; }; env.PBR_VERSION = version; @@ -61,6 +62,7 @@ buildPythonPackage rec { python-openstackclient python-swiftclient requests + stevedore ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/python-u2flib-server/default.nix b/pkgs/development/python-modules/python-u2flib-server/default.nix index e1b44777dfee..fa93cb83fce8 100644 --- a/pkgs/development/python-modules/python-u2flib-server/default.nix +++ b/pkgs/development/python-modules/python-u2flib-server/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { six ]; - passthru.optional-dependencies = { + optional-dependencies = { u2f_server = [ webob ]; }; @@ -42,7 +42,7 @@ buildPythonPackage rec { "u2flib_server.u2f" ]; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.u2f_server; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.u2f_server; meta = with lib; { description = "Python based U2F server library"; diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 6fabd9a81763..8b86add14493 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, loguru, pytest-asyncio, pytestCheckHook, @@ -11,8 +12,8 @@ buildPythonPackage rec { pname = "python-utils"; - version = "3.8.2"; - format = "setuptools"; + version = "3.9.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "WoLpH"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2scWyj0Fz39Thu0T0+UirT+he6tPYKGsvmYzzpD+/ls="; + hash = "sha256-ZmCT41VMz8BkIqF8Od5PqteyXToA4xASs0qCPD0cNc8="; }; postPatch = '' @@ -29,16 +30,18 @@ buildPythonPackage rec { -e '/--mypy/d' ''; - propagatedBuildInputs = [ typing-extensions ]; + build-system = [ setuptools ]; - passthru.optional-dependencies = { + dependencies = [ typing-extensions ]; + + optional-dependencies = { loguru = [ loguru ]; }; nativeCheckInputs = [ pytest-asyncio pytestCheckHook - ] ++ passthru.optional-dependencies.loguru; + ] ++ optional-dependencies.loguru; pythonImportsCheck = [ "python_utils" ]; diff --git a/pkgs/development/python-modules/python-watcherclient/default.nix b/pkgs/development/python-modules/python-watcherclient/default.nix index b3cc4267f30c..05b2d315d2af 100644 --- a/pkgs/development/python-modules/python-watcherclient/default.nix +++ b/pkgs/development/python-modules/python-watcherclient/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "python-watcherclient"; - version = "4.4.0"; + version = "4.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -66,7 +66,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "watcherclient" ]; meta = { - homepage = "https://opendev.org/openstack/python-watcherclient"; + homepage = "https://github.com/openstack/python-watcherclient"; description = "Client library for OpenStack Watcher API"; license = lib.licenses.asl20; mainProgram = "watcher"; diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix index edcb3e0047e7..f5594e983ace 100644 --- a/pkgs/development/python-modules/python-xmp-toolkit/default.nix +++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -35,7 +35,7 @@ buildPythonPackage { ''; # hangs on darwin + sandbox - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' rm test/{test_exempi,test_files}.py diff --git a/pkgs/development/python-modules/python-youtube/default.nix b/pkgs/development/python-modules/python-youtube/default.nix index 3b48fde0c3e9..660a97ec891d 100644 --- a/pkgs/development/python-modules/python-youtube/default.nix +++ b/pkgs/development/python-modules/python-youtube/default.nix @@ -12,14 +12,14 @@ }: buildPythonPackage rec { pname = "python-youtube"; - version = "0.9.4"; + version = "0.9.6"; format = "pyproject"; src = fetchFromGitHub { owner = "sns-sdks"; repo = "python-youtube"; rev = "refs/tags/v${version}"; - hash = "sha256-OesJfnXI1w2d5moJyqvrWU3sCxDaqnk1bAhtK6SPjFw="; + hash = "sha256-IuVnXVe54D0g+7S+AuTGtBlwcmxHpkk1e9Vt8laEV2c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-zaqarclient/default.nix b/pkgs/development/python-modules/python-zaqarclient/default.nix index ee8c99b6b642..84c70240cc7d 100644 --- a/pkgs/development/python-modules/python-zaqarclient/default.nix +++ b/pkgs/development/python-modules/python-zaqarclient/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "python-zaqarclient"; - version = "2.7.0"; + version = "2.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "openstack"; repo = "python-zaqarclient"; rev = "refs/tags/${version}"; - hash = "sha256-WphTlqhrwxg5g88NH1W4b3uLAxLImnS34hDrlJjWeEU="; + hash = "sha256-vfu1GYd9eoVpmBtlnRTiqpiqlgxqPnwpFC9YC1UuvLM="; }; env.PBR_VERSION = version; @@ -74,7 +74,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "zaqarclient" ]; meta = { - homepage = "https://opendev.org/openstack/python-zaqarclient"; + homepage = "https://github.com/openstack/python-zaqarclient"; description = "Client library for OpenStack Zaqar API"; license = lib.licenses.asl20; maintainers = lib.teams.openstack.members; diff --git a/pkgs/development/python-modules/python-zunclient/default.nix b/pkgs/development/python-modules/python-zunclient/default.nix index f538cdbac638..a9f62457090d 100644 --- a/pkgs/development/python-modules/python-zunclient/default.nix +++ b/pkgs/development/python-modules/python-zunclient/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-zunclient"; - version = "5.0.0"; + version = "5.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "openstack"; repo = "python-zunclient"; rev = "refs/tags/${version}"; - hash = "sha256-EVfrxSc/eHYZR0FGFnNAxFCiXangt8uRkAC2zpwWqcA="; + hash = "sha256-2gC2aMaMI//QKIpbDNT9cii17680g4X1c0rgrgPbAsg="; }; env.PBR_VERSION = version; @@ -83,7 +83,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "zunclient" ]; meta = { - homepage = "https://opendev.org/openstack/python-zunclient"; + homepage = "https://github.com/openstack/python-zunclient"; description = "Client library for OpenStack Zun API"; license = lib.licenses.asl20; mainProgram = "zun"; diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix index 1261da097fe0..3af465ba2de1 100644 --- a/pkgs/development/python-modules/pythonfinder/default.nix +++ b/pkgs/development/python-modules/pythonfinder/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.8") [ cached-property ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click ]; }; nativeCheckInputs = [ pytest-timeout pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "pythonfinder" ]; diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix index 9119f1a27268..765db395d0bc 100644 --- a/pkgs/development/python-modules/pythonnet/default.nix +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -1,6 +1,6 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, pytestCheckHook, pycparser, @@ -13,17 +13,20 @@ let pname = "pythonnet"; - version = "3.0.3"; - src = fetchPypi { - pname = "pythonnet"; - inherit version; - hash = "sha256-jUsulxWKAjh1+GR0WKWPOIF/T+Oa9gq91rDYrfHXfnU="; + version = "3.0.4"; + src = fetchFromGitHub { + owner = "pythonnet"; + repo = "pythonnet"; + rev = "v${version}"; + hash = "sha256-QdgcBFQDFxmFxuXsDlHcu+L/VWw2aKfyWDqPrawyhOs="; }; # This buildDotnetModule is used only to get nuget sources, the actual # build is done in `buildPythonPackage` below. dotnet-build = buildDotnetModule { inherit pname version src; + projectFile = "src/runtime/Python.Runtime.csproj"; + testProjectFile = "src/testing/Python.Test.csproj"; nugetDeps = ./deps.nix; }; in @@ -59,14 +62,6 @@ buildPythonPackage { psutil # needed for memory leak tests ]; - # Perform dotnet restore based on the nuget-source - preConfigure = '' - dotnet restore \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --source "$nugetSource" - ''; - # Rerun this when updating to refresh Nuget dependencies passthru.fetch-deps = dotnet-build.fetch-deps; diff --git a/pkgs/development/python-modules/pythonnet/deps.nix b/pkgs/development/python-modules/pythonnet/deps.nix index 2cbc3430b432..e58bb47b7447 100644 --- a/pkgs/development/python-modules/pythonnet/deps.nix +++ b/pkgs/development/python-modules/pythonnet/deps.nix @@ -4,948 +4,138 @@ { fetchNuGet }: [ (fetchNuGet { - pname = "BenchmarkDotNet"; - version = "0.13.1"; - sha256 = "1kgypxfp34vjy9kvqq8csznsjbnv37pp4r0457i5l1j6zrsm76rp"; - }) - (fetchNuGet { - pname = "BenchmarkDotNet.Annotations"; - version = "0.13.1"; - sha256 = "0fizarpvdajwcvfhd45c35xrnrci5rbn5ksf3zvlw4q300hnlsir"; - }) - (fetchNuGet { - pname = "CommandLineParser"; - version = "2.4.3"; - sha256 = "1aca3q25n3dg55v4j3kzlzfzd5k2jpy6zhp8x7g74pdfdqzrhg55"; - }) - (fetchNuGet { - pname = "Iced"; - version = "1.8.0"; - sha256 = "12cgd9p3jm81wd7m8bp3pm20gmrmbad2hcwzynhz644h3062nn24"; - }) - (fetchNuGet { pname = "Lost.Compat.NullabilityAttributes"; version = "0.0.4"; - sha256 = "1h8m1n4x1p69xh86ia1rf4dcr17w965fpxws7d3458r4w1wl143a"; + hash = "sha256-apBAeeAko0JGO5r364pJ/ITMGnE5qGgQ7Mnc0IkNFcE="; }) (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.1.1"; - sha256 = "1bb5p4zlnfn88skkvymxfsn0jybqncl4356hwnic9jxdq2d4fz1w"; - }) - (fetchNuGet { - pname = "Microsoft.CodeAnalysis.Analyzers"; - version = "2.6.1"; - sha256 = "1plk343h9fyxg08b9bcnlqyaq00cbnc1v73pj9nbcyphmgf5bqfp"; - }) - (fetchNuGet { - pname = "Microsoft.CodeAnalysis.Common"; - version = "2.10.0"; - sha256 = "1l690xqrhmkasns5ghz0vqj8n2xyl5yrwan5gs52hwfxdwahqaaj"; - }) - (fetchNuGet { - pname = "Microsoft.CodeAnalysis.CSharp"; - version = "2.10.0"; - sha256 = "0saabsr81crawdzs2cnzyjp5cgg2hk5k6q7n0i0pxghswb0m4dxk"; - }) - (fetchNuGet { - pname = "Microsoft.CodeCoverage"; - version = "16.11.0"; - sha256 = "0f41l3kks6wk5vjaxpjh8m2flnrvlbvqgqflamhv8rfz4y8ifgdv"; - }) - (fetchNuGet { - pname = "Microsoft.CodeCoverage"; - version = "17.0.0"; - sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; - }) - (fetchNuGet { - pname = "Microsoft.CodeCoverage"; - version = "17.6.2"; - sha256 = "1wwmg6hn4dp2mvwn2bm81wccdw149lq17xdnpz17mvg4zcwmax7g"; + hash = "sha256-PHxHmsCty8Si5dCUQSizeHkJrHa9+j2nRsg6Sz+5Za0="; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; - sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; - }) - (fetchNuGet { - pname = "Microsoft.Diagnostics.NETCore.Client"; - version = "0.2.61701"; - sha256 = "1ic1607jj4ln8dbibf1fz5v9svk9x2kqlgvhndc6ijaqnbc4wcr1"; - }) - (fetchNuGet { - pname = "Microsoft.Diagnostics.Runtime"; - version = "1.1.126102"; - sha256 = "0w7jcxkd4cix6dbh0szawilmykjmdc1rqysllrpwb7ivrxzazypn"; - }) - (fetchNuGet { - pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; - version = "2.0.61"; - sha256 = "0gq51l4yyyn8dir6w41im9fwhw9r6jz6n7jm4zhmvvway5ijbcac"; - }) - (fetchNuGet { - pname = "Microsoft.DotNet.InternalAbstractions"; - version = "1.0.0"; - sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; - }) - (fetchNuGet { - pname = "Microsoft.DotNet.PlatformAbstractions"; - version = "2.1.0"; - sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; + hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; }) (fetchNuGet { pname = "Microsoft.Net.Compilers.Toolset"; version = "4.0.1"; - sha256 = "08njbdnmjzjd6phys94w0di3vcxfq7pniad6s3jc5f65r9s1f0w2"; - }) - (fetchNuGet { - pname = "Microsoft.NET.Test.Sdk"; - version = "16.11.0"; - sha256 = "1a2y6vw6p9xp3w72zq2lwrjl8bxv87s9d7zd2dh4zwbzh1c5slxl"; - }) - (fetchNuGet { - pname = "Microsoft.NET.Test.Sdk"; - version = "17.0.0"; - sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; - }) - (fetchNuGet { - pname = "Microsoft.NET.Test.Sdk"; - version = "17.6.2"; - sha256 = "1a658bnh5q3lfkrr81h3lyx1mc3hggnjr1bpmim71rr2s42ad70v"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Platforms"; - version = "1.0.1"; - sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; + hash = "sha256-ggMXdMrFuMLk0KapaO/BrrM9YgOcJO3hNU1+WW1b0iI="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Targets"; - version = "1.0.1"; - sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; + hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; - }) - (fetchNuGet { - pname = "Microsoft.NETFramework.ReferenceAssemblies"; - version = "1.0.0"; - sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; - }) - (fetchNuGet { - pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; - version = "1.0.0"; - sha256 = "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1"; - }) - (fetchNuGet { - pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; - version = "1.0.0"; - sha256 = "1bqinq2nxnpqxziypg1sqy3ly0nymxxjpn8fwkn3rl4vl6gdg3rc"; + hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.1.1"; - sha256 = "0xkdqs7az2cprar7jzjlgjpd64l6f8ixcmwmpkdm03fyb4s5m0bg"; + hash = "sha256-b4FaNFneDVDbvJVX1iNyhhLTrnxUfnmyypeJr47GbXY="; }) (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.1.1"; - sha256 = "099y35f2npvva3jk1zp8hn0vb9pwm2l0ivjasdly6y2idv53s5yy"; - }) - (fetchNuGet { - pname = "Microsoft.TestPlatform.ObjectModel"; - version = "16.11.0"; - sha256 = "1fc0ghk1cny4i8w43b94pxhl0srxisv6kaflkkp30ncsa9szhkxh"; - }) - (fetchNuGet { - pname = "Microsoft.TestPlatform.ObjectModel"; - version = "17.6.2"; - sha256 = "0asbrbdyyig1p034smf79lszzbfv1cn6q181i7d4p2vsiqpjp9sj"; - }) - (fetchNuGet { - pname = "Microsoft.TestPlatform.TestHost"; - version = "16.11.0"; - sha256 = "0hp1vndf2jhyg1f3miq4g2068z5kpfzy6nmswm25vymghxp1ws4k"; - }) - (fetchNuGet { - pname = "Microsoft.TestPlatform.TestHost"; - version = "17.6.2"; - sha256 = "0lcj8kkcnxbwiaw6j0xf4fxqpa6z0s41nq52spvckfg4367lg4fg"; - }) - (fetchNuGet { - pname = "Microsoft.Win32.Primitives"; - version = "4.3.0"; - sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; - }) - (fetchNuGet { - pname = "Microsoft.Win32.Registry"; - version = "4.3.0"; - sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; - }) - (fetchNuGet { - pname = "Microsoft.Win32.Registry"; - version = "4.5.0"; - sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; - }) - (fetchNuGet { - pname = "NETStandard.Library"; - version = "2.0.0"; - sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; + hash = "sha256-3hc9ym5ReONp00ruCKio/Ka1gYXo/jDlUHtfK1wZPiU="; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; - sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; - }) - (fetchNuGet { - pname = "Newtonsoft.Json"; - version = "13.0.1"; - sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; - }) - (fetchNuGet { - pname = "Newtonsoft.Json"; - version = "9.0.1"; - sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; + hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; }) (fetchNuGet { pname = "NonCopyableAnalyzer"; version = "0.7.0"; - sha256 = "1jry36p53fkk3fn9pawgg7qiv79j30y0kvd4xrnd58d7zg7zzdj0"; - }) - (fetchNuGet { - pname = "NuGet.Frameworks"; - version = "5.0.0"; - sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; - }) - (fetchNuGet { - pname = "NuGet.Frameworks"; - version = "6.5.0"; - sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; - }) - (fetchNuGet { - pname = "NUnit"; - version = "3.12.0"; - sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2"; - }) - (fetchNuGet { - pname = "NUnit"; - version = "3.13.3"; - sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; - }) - (fetchNuGet { - pname = "NUnit3TestAdapter"; - version = "3.16.1"; - sha256 = "1pzhmapfdszsfza7zjr3zrlz4fssdxsyiwmlj76a40mbhxhfa4q9"; - }) - (fetchNuGet { - pname = "NUnit3TestAdapter"; - version = "3.17.0"; - sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; - }) - (fetchNuGet { - pname = "NUnit3TestAdapter"; - version = "4.5.0"; - sha256 = "1srx1629s0k1kmf02nmz251q07vj6pv58mdafcr5dr0bbn1fh78i"; - }) - (fetchNuGet { - pname = "Perfolizer"; - version = "0.2.1"; - sha256 = "012aqqi3y3nfikqmn26yajpwd52c04zlzp0p91iyslw7mf26qncy"; - }) - (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"; + hash = "sha256-QLb/z/unodJs7qTtCTwYMp0d8XmPq5usG3O6Ua4ZPss="; }) (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; - sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; + hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) (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"; + hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) (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"; + hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) (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"; + hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) (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"; + hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) (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"; + hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; - sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; - }) - (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.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.Microsoft.Win32.Primitives"; - version = "4.3.0"; - sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; - }) - (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"; + hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) (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"; - sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; - }) - (fetchNuGet { - pname = "System.AppContext"; - version = "4.3.0"; - sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; - }) - (fetchNuGet { - pname = "System.Buffers"; - version = "4.3.0"; - sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; - }) - (fetchNuGet { - pname = "System.Buffers"; - version = "4.4.0"; - sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; - }) - (fetchNuGet { - pname = "System.Collections"; - version = "4.0.11"; - sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; - }) - (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.5.0"; - sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; - }) - (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.EventBasedAsync"; - version = "4.3.0"; - sha256 = "1rv9bkb8yyhqqqrx6x95njv6mdxlbvv527b44mrd93g8fmgkifl7"; - }) - (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.3.0"; - sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; - }) - (fetchNuGet { - pname = "System.Diagnostics.Debug"; - version = "4.0.11"; - sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; - }) - (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.Process"; - version = "4.3.0"; - sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; - }) - (fetchNuGet { - pname = "System.Diagnostics.StackTrace"; - version = "4.3.0"; - sha256 = "0ash4h9k0m7xsm0yl79r0ixrdz369h7y922wipp5gladmlbvpyjd"; - }) - (fetchNuGet { - pname = "System.Diagnostics.Tools"; - version = "4.0.1"; - sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; - }) - (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.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.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) - (fetchNuGet { - pname = "System.Globalization.Extensions"; - version = "4.3.0"; - sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; - }) - (fetchNuGet { - pname = "System.IO"; - version = "4.1.0"; - sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) (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.0.1"; - sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; - }) - (fetchNuGet { - pname = "System.IO.FileSystem"; - version = "4.3.0"; - sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; - }) - (fetchNuGet { - pname = "System.IO.FileSystem.Primitives"; - version = "4.0.1"; - sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; - }) - (fetchNuGet { - pname = "System.IO.FileSystem.Primitives"; - version = "4.3.0"; - sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; - }) - (fetchNuGet { - pname = "System.Linq"; - version = "4.1.0"; - sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; - }) - (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.Management"; - version = "4.5.0"; - sha256 = "19z5x23n21xi94bgl531l9hrm64nyw9d5fpd7klfvr5xfsbh9jwr"; - }) - (fetchNuGet { - pname = "System.Memory"; - version = "4.5.3"; - sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; - }) - (fetchNuGet { - pname = "System.Numerics.Vectors"; - version = "4.4.0"; - sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; - }) - (fetchNuGet { - pname = "System.ObjectModel"; - version = "4.0.12"; - sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; - sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; - }) - (fetchNuGet { - pname = "System.Reflection"; - version = "4.1.0"; - sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; - }) - (fetchNuGet { - pname = "System.Reflection.Emit"; - version = "4.0.1"; - sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; - sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; - }) - (fetchNuGet { - pname = "System.Reflection.Emit.ILGeneration"; - version = "4.0.1"; - sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; + hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) (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.3.0"; - sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; - }) - (fetchNuGet { - pname = "System.Reflection.Metadata"; - version = "1.6.0"; - sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; + hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) (fetchNuGet { pname = "System.Reflection.Primitives"; - version = "4.0.1"; - sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; - }) - (fetchNuGet { - pname = "System.Reflection.Primitives"; - version = "4.3.0"; - sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; - }) - (fetchNuGet { - pname = "System.Reflection.TypeExtensions"; - version = "4.1.0"; - sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; - }) - (fetchNuGet { - pname = "System.Reflection.TypeExtensions"; - version = "4.3.0"; - sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; - }) - (fetchNuGet { - pname = "System.Resources.ResourceManager"; - version = "4.0.1"; - sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; - }) - (fetchNuGet { - pname = "System.Resources.ResourceManager"; version = "4.3.0"; - sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; - }) - (fetchNuGet { - pname = "System.Runtime"; - version = "4.1.0"; - sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; - }) - (fetchNuGet { - pname = "System.Runtime.CompilerServices.Unsafe"; - version = "4.5.2"; - sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; - }) - (fetchNuGet { - pname = "System.Runtime.Extensions"; - version = "4.1.0"; - sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; - }) - (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.3.0"; - sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; - }) - (fetchNuGet { - pname = "System.Runtime.InteropServices"; - version = "4.1.0"; - sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; - }) - (fetchNuGet { - pname = "System.Runtime.InteropServices"; - version = "4.3.0"; - sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; - }) - (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.Runtime.Numerics"; - version = "4.3.0"; - sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; - }) - (fetchNuGet { - pname = "System.Runtime.Serialization.Primitives"; - version = "4.1.1"; - sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; - }) - (fetchNuGet { - pname = "System.Security.AccessControl"; - version = "4.5.0"; - sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.Algorithms"; - version = "4.3.0"; - sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.Encoding"; - version = "4.3.0"; - sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; - }) - (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.Security.Principal.Windows"; - version = "4.5.0"; - sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; - }) - (fetchNuGet { - pname = "System.Text.Encoding"; - version = "4.0.11"; - sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) (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.0.11"; - sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; - }) - (fetchNuGet { - pname = "System.Text.Encoding.Extensions"; - version = "4.3.0"; - sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; - }) - (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.Threading"; - version = "4.0.11"; - sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; - }) - (fetchNuGet { - pname = "System.Threading"; - version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; - }) - (fetchNuGet { - pname = "System.Threading.Tasks"; - version = "4.0.11"; - sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) (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.3.0"; - sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; - }) - (fetchNuGet { - pname = "System.Threading.Tasks.Extensions"; - version = "4.5.2"; - sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj"; - }) - (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.Threading.ThreadPool"; - version = "4.3.0"; - sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; - }) - (fetchNuGet { - pname = "System.ValueTuple"; - version = "4.5.0"; - sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; - }) - (fetchNuGet { - pname = "System.Xml.ReaderWriter"; - version = "4.0.11"; - sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; - }) - (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.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 = "System.Xml.XPath.XmlDocument"; - version = "4.3.0"; - sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; + hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) ] diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index f01fb4ca467e..755834eecd32 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { libXi fontconfig rapidjson - ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; cmakeFlags = [ "-Wno-dev" diff --git a/pkgs/development/python-modules/pythonqwt/default.nix b/pkgs/development/python-modules/pythonqwt/default.nix new file mode 100644 index 000000000000..8888d8d1e1e3 --- /dev/null +++ b/pkgs/development/python-modules/pythonqwt/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + numpy, + qtpy, + + # tests + pyqt6, + qt6, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pythonqwt"; + version = "0.14.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "PlotPyStack"; + repo = "PythonQwt"; + rev = "refs/tags/v${version}"; + hash = "sha256-apvUilKx6Xl2PluvmQVW5Lkoub2He/75EdYv10jMR+k="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + qtpy + numpy + ]; + nativeCheckInputs = [ + pytestCheckHook + # Not propagating this, to allow one to choose to either choose a pyqt / + # pyside implementation + pyqt6 + ]; + + preCheck = '' + export QT_PLUGIN_PATH="${lib.getBin qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}" + export QT_QPA_PLATFORM=offscreen + ''; + + pythonImportsCheck = [ "qwt" ]; + + meta = { + description = "Qt plotting widgets for Python (pure Python reimplementation of Qwt C++ library)"; + homepage = "https://github.com/PlotPyStack/PythonQwt"; + changelog = "https://github.com/PlotPyStack/PythonQwt/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index e74a9d62b210..2146c8c02245 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -25,14 +25,14 @@ let in buildPythonPackage rec { pname = "pythran"; - version = "0.15.0"; + version = "0.16.1"; pyproject = true; src = fetchFromGitHub { owner = "serge-sans-paille"; repo = "pythran"; rev = "refs/tags/${version}"; - hash = "sha256-TpD8YZnnv48PKYrUqR0/qvJG1XRbcMBcrkcERh6Q4q0="; + hash = "sha256-wiQmShniYZmB8hk/MC5FWFf1s5vqEHiYBkXTo4OeZ+E="; }; patches = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { (substituteAll { src = ./0001-hardcode-path-to-libgomp.patch; gomp = "${ - if stdenv.cc.isClang then openmp else stdenv.cc.cc.lib + if stdenv.cc.isClang then openmp else (lib.getLib stdenv.cc.cc) }/lib/libgomp${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 94810bfac05d..fe2802278269 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.30.2"; + version = "0.30.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-9Tnn68RxKwEruYEGo2pZQTQTlYnVMfa3MRzA55HlBRc="; + hash = "sha256-kk5i477xLzKePNs1B4lUjKxS4HlA5FCw7pImnESh9Y8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytomorrowio/default.nix b/pkgs/development/python-modules/pytomorrowio/default.nix index b749a805eb27..2e3a5f4afbc3 100644 --- a/pkgs/development/python-modules/pytomorrowio/default.nix +++ b/pkgs/development/python-modules/pytomorrowio/default.nix @@ -29,6 +29,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # aiohttp 3.10.6 compat + "test_errors" + ]; + pythonImportsCheck = [ "pytomorrowio" ]; meta = { diff --git a/pkgs/development/python-modules/pytoolconfig/default.nix b/pkgs/development/python-modules/pytoolconfig/default.nix index bec278f08e6f..563d1e4d2ecd 100644 --- a/pkgs/development/python-modules/pytoolconfig/default.nix +++ b/pkgs/development/python-modules/pytoolconfig/default.nix @@ -46,11 +46,11 @@ buildPythonPackage rec { sphinx-autodoc-typehints sphinx-rtd-theme sphinxHook - ] ++ passthru.optional-dependencies.doc; + ] ++ optional-dependencies.doc; propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { validation = [ pydantic ]; global = [ platformdirs ]; doc = [ @@ -63,7 +63,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = with lib; { description = "Python tool configuration"; diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 6f276f104f9e..5eb1d0fdb601 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -2,30 +2,37 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, - decorator, numpy, platformdirs, - typing-extensions, pytestCheckHook, + pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "pytools"; - version = "2024.1.6"; - format = "setuptools"; - disabled = pythonOlder "3.6"; + version = "2024.1.14"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-u9t1BrCWakShd8XlVWdb7OHmXhW7sRFPNwsiPgaTIrk="; + hash = "sha256-OeW7r4H6Qy5oi4LdCYAhLRj5eyPlGox6/nWSJJ/kCrE="; }; - propagatedBuildInputs = [ - decorator - numpy + build-system = [ setuptools ]; + + dependencies = [ platformdirs - ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; + typing-extensions + ]; + + optional-dependencies = { + numpy = [ numpy ]; + # siphash = [ siphash ]; + }; nativeCheckInputs = [ pytestCheckHook ]; @@ -35,9 +42,18 @@ buildPythonPackage rec { "pytools.lex" ]; + disabledTests = [ + # siphash is not available + "test_class_hashing" + "test_dataclass_hashing" + "test_datetime_hashing" + "test_hash_function" + ]; + meta = { - homepage = "https://github.com/inducer/pytools/"; description = "Miscellaneous Python lifesavers"; + homepage = "https://github.com/inducer/pytools/"; + changelog = "https://github.com/inducer/pytools/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ artuuge ]; }; diff --git a/pkgs/development/python-modules/pytorch-bench/default.nix b/pkgs/development/python-modules/pytorch-bench/default.nix new file mode 100644 index 000000000000..e705028b1db8 --- /dev/null +++ b/pkgs/development/python-modules/pytorch-bench/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + colorama, + matplotlib, + numpy, + pynvml, + torch, + torchprofile, +}: + +buildPythonPackage { + pname = "pytorch-bench"; + version = "unstable-2024-07-18"; + pyproject = true; + + src = fetchFromGitHub { + owner = "MaximeGloesener"; + repo = "torch-benchmark"; + rev = "405a3fc2d147b43b4c1f7edb7aca0a60ba343ac5"; + hash = "sha256-KU3dAf97A6lkMNTKRay23BMFQfn1ReAFNaJ0kG2RfnA="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + colorama + matplotlib + numpy + pynvml + torch + torchprofile + ]; + + pythonImportsCheck = [ + "pytorch_bench" + ]; + + meta = { + description = "Benchmarking tool for torch"; + homepage = "https://github.com/MaximeGloesener/torch-benchmark"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index 832f2e6666d3..6c110d8fb35e 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; disabled = isPy27; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xlTqUUF+tUIbULd1B8XR18Kxd7kl2TRKdbp0GoAfi4g="; + hash = "sha256-mxAl4GMyAWtvocc68Ac3z1+W13k9OOK7aQFfB7X0f9c="; }; build-system = [ @@ -83,7 +83,7 @@ buildPythonPackage rec { "test_get_nearest_neighbors" "test_list_of_text" "test_untrained_indexer" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # AttributeError: module 'torch.distributed' has no attribute 'init_process_group' "test_single_proc" ] ++ lib.optionals cudaSupport [ diff --git a/pkgs/development/python-modules/pytorch3d/default.nix b/pkgs/development/python-modules/pytorch3d/default.nix new file mode 100644 index 000000000000..2a92a51ec8bf --- /dev/null +++ b/pkgs/development/python-modules/pytorch3d/default.nix @@ -0,0 +1,71 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + wheel, + torch, + iopath, + cudaPackages, + config, + cudaSupport ? config.cudaSupport, +}: + +assert cudaSupport -> torch.cudaSupport; + +buildPythonPackage rec { + pname = "pytorch3d"; + version = "0.7.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = "pytorch3d"; + rev = "V${version}"; + hash = "sha256-DEEWWfjwjuXGc0WQInDTmtnWSIDUifyByxdg7hpdHlo="; + }; + + nativeBuildInputs = lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; + build-system = [ + setuptools + wheel + ]; + dependencies = [ + torch + iopath + ]; + buildInputs = [ (lib.getOutput "cxxdev" torch) ]; + + env = + { + FORCE_CUDA = cudaSupport; + } + // lib.optionalAttrs cudaSupport { + TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" torch.cudaCapabilities}"; + }; + + pythonImportsCheck = [ "pytorch3d" ]; + + passthru.tests.rotations-cuda = + cudaPackages.writeGpuTestPython { libraries = ps: [ ps.pytorch3d ]; } + '' + import pytorch3d.transforms as p3dt + + M = p3dt.random_rotations(n=10, device="cuda") + assert "cuda" in M.device.type + angles = p3dt.matrix_to_euler_angles(M, "XYZ") + assert "cuda" in angles.device.type + assert angles.shape == (10, 3), angles.shape + print(angles) + ''; + + meta = { + description = "FAIR's library of reusable components for deep learning with 3D data"; + homepage = "https://github.com/facebookresearch/pytorch3d"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + pbsds + SomeoneSerge + ]; + }; +} diff --git a/pkgs/development/python-modules/pytouchlinesl/default.nix b/pkgs/development/python-modules/pytouchlinesl/default.nix index 3a6e0db6b04d..845b734fc59c 100644 --- a/pkgs/development/python-modules/pytouchlinesl/default.nix +++ b/pkgs/development/python-modules/pytouchlinesl/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytouchlinesl"; - version = "0.1.5"; + version = "0.1.8"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jnsgruk"; repo = "pytouchlinesl"; rev = "refs/tags/${version}"; - hash = "sha256-kdLMuxA1Ig85mH7s9rlmVjEsItXxRlDA1JTFasnJogg="; + hash = "sha256-BSffzy/MKmpPdvk55Ff76i+p4/cY0OHjS/NOc9tEGwo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix index 9e710823127a..8227ac484641 100644 --- a/pkgs/development/python-modules/pytradfri/default.nix +++ b/pkgs/development/python-modules/pytradfri/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ pydantic ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiocoap dtlssocket ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.async; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.async; pythonImportsCheck = [ "pytradfri" ]; diff --git a/pkgs/development/python-modules/pytransportnswv2/default.nix b/pkgs/development/python-modules/pytransportnswv2/default.nix index e2e8c0c81e24..6b048aa8195a 100644 --- a/pkgs/development/python-modules/pytransportnswv2/default.nix +++ b/pkgs/development/python-modules/pytransportnswv2/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytransportnswv2"; - version = "0.4.0"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LbFBzC7kGa2qz+XQZDmjhE2FhmScesx5jtLtkV0hlg8="; + hash = "sha256-hpbq1Krv+DklSXBMJsyRZd8d0yj+vaRjlu2pu6sLV0Y="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyttsx3/default.nix b/pkgs/development/python-modules/pyttsx3/default.nix index deeddc6b6d52..ba9afeb6be85 100644 --- a/pkgs/development/python-modules/pyttsx3/default.nix +++ b/pkgs/development/python-modules/pyttsx3/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyttsx3"; - version = "2.97"; + version = "2.98"; format = "wheel"; src = fetchPypi { inherit pname version format; - sha256 = "sha256-GM4wZDtnutHZc2H7s6PHyo/MdQ7Y6YrCJuu2I7AeSw8="; + sha256 = "sha256-s/tMpNWuT45oNtaze/X+4P1R0Vf/on+5Bkvm5749o3o="; dist = "py3"; python = "py3"; }; diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix index a42273fee7cc..343bcca0a965 100644 --- a/pkgs/development/python-modules/pytubefix/default.nix +++ b/pkgs/development/python-modules/pytubefix/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/JuanBindez/pytubefix"; description = "Pytube fork with additional features and fixes"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ roshaen ]; + maintainers = with lib.maintainers; [ youhaveme9 ]; }; } diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index d99da5d17d18..2d69cfdb0cfb 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "pytz"; - version = "2024.1"; + version = "2024.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KilzXqnBi68UtEiEa95aSAMO0mdXhHLYlVzQ50Q6mBI="; + hash = "sha256-KqNVCDxQoPk/pYFwnerAya1lzKip6b6sZgrcvUk8eYo="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index 13073a59f481..f7b75f0ff22e 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-LpRUJ6IWdIk7uXYyQB22ITnZHOoe6WE3zHsHrSIZj8c="; }; - postPatch = lib.optionalString stdenvNoCC.isLinux '' + postPatch = lib.optionalString stdenvNoCC.hostPlatform.isLinux '' substituteInPlace src/pyudev/_ctypeslib/utils.py \ --replace "find_library(name)" "'${lib.getLib udev}/lib/libudev.so'" ''; diff --git a/pkgs/development/python-modules/pyunbound/default.nix b/pkgs/development/python-modules/pyunbound/default.nix index a5d33cbfa440..13357faec593 100644 --- a/pkgs/development/python-modules/pyunbound/default.nix +++ b/pkgs/development/python-modules/pyunbound/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { rm -r $out/bin $out/share $out/include $out/etc/unbound '' # patchelf is only available on Linux and no patching is needed on darwin - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --replace-needed libunbound.so.8 $out/${python.sitePackages}/libunbound.so.8 $out/${python.sitePackages}/_unbound.so ''; diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix deleted file mode 100644 index bfbd39ce5cc4..000000000000 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ - lib, - aiofiles, - aiohttp, - aioshutil, - async-timeout, - buildPythonPackage, - dateparser, - fetchFromGitHub, - ffmpeg, - hatch-vcs, - hatchling, - ipython, - orjson, - packaging, - pillow, - platformdirs, - py, - pydantic, - pyjwt, - pytest-aiohttp, - pytest-asyncio, - pytest-benchmark, - pytest-timeout, - pytest-xdist, - pytestCheckHook, - python-dotenv, - pythonOlder, - pytz, - termcolor, - typer, -}: - -buildPythonPackage rec { - pname = "pyunifiprotect"; - version = "5.1.2"; - pyproject = true; - - disabled = pythonOlder "3.9"; - - src = fetchFromGitHub { - owner = "briis"; - repo = "pyunifiprotect"; - rev = "refs/tags/v${version}"; - hash = "sha256-DtQm6u3O0kdVJ23Ch+hJQ6HTOt5iAMdhCzC1K/oICWk="; - }; - - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "--strict-markers -ra -Wd --ignore=.* --no-cov-on-fail --cov=pyunifiprotect --cov-append --maxfail=10 -n=auto" "" - ''; - - build-system = [ - hatch-vcs - hatchling - ]; - - dependencies = [ - aiofiles - aiohttp - aioshutil - dateparser - orjson - packaging - pillow - platformdirs - pydantic - pyjwt - pytz - typer - ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; - - passthru.optional-dependencies = { - shell = [ - ipython - python-dotenv - termcolor - ]; - }; - - nativeCheckInputs = [ - ffmpeg # Required for command ffprobe - py - pytest-aiohttp - pytest-asyncio - pytest-benchmark - pytest-timeout - pytest-xdist - pytestCheckHook - ]; - - pythonImportsCheck = [ "pyunifiprotect" ]; - - pytestFlagsArray = [ "--benchmark-disable" ]; - - meta = with lib; { - description = "Library for interacting with the Unifi Protect API"; - mainProgram = "unifi-protect"; - homepage = "https://github.com/briis/pyunifiprotect"; - changelog = "https://github.com/AngellusMortis/pyunifiprotect/releases/tag/v${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index a98538cc43ea..6c079b11712f 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/pkgs/development/python-modules/pyutil/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { versioneer ]; - passthru.optional-dependencies = { + optional-dependencies = { jsonutil = [ simplejson ]; # Module not available # randcookie = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { mock twisted pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "pyutil" ]; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 4fe56684d50e..acebbd90ef9f 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.118"; + version = "9.2.127"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-LRJSecKAQAg5Axfi8h//cc3xozOiPUkZD49VJIE6shE="; + hash = "sha256-pBbbYtI2ITky6xw09/MSMvCk7HZUCJaMP86GSFkSa1o="; }; build-system = [ setuptools ]; @@ -30,12 +30,12 @@ buildPythonPackage rec { pycparser ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace vex/Makefile-gcc \ --replace-fail '/usr/bin/ar' 'ar' ''; - setupPyBuildFlags = lib.optionals stdenv.isLinux [ + setupPyBuildFlags = lib.optionals stdenv.hostPlatform.isLinux [ "--plat-name" "linux" ]; diff --git a/pkgs/development/python-modules/pyvicare-neo/default.nix b/pkgs/development/python-modules/pyvicare-neo/default.nix deleted file mode 100644 index 5980fca223f2..000000000000 --- a/pkgs/development/python-modules/pyvicare-neo/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - authlib, - buildPythonPackage, - fetchFromGitHub, - lib, - poetry-core, - pytestCheckHook, - requests, - types-requests, -}: - -buildPythonPackage rec { - pname = "pyvicare-neo"; - version = "0.3.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "CFenner"; - repo = "PyViCare"; - rev = "refs/tags/v${version}"; - hash = "sha256-QjFrBf58uM5OProKsesyY43MuE1MnIVIVqs5rWUTmes="; - }; - - build-system = [ poetry-core ]; - - propagatedBuildInputs = [ - authlib - requests - types-requests - ]; - - pythonImportsCheck = [ "PyViCare" ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - meta = { - changelog = "https://github.com/CFenner/PyViCare/releases/tag/v${version}"; - description = "Library to communicate with the Viessmann ViCare API"; - homepage = "https://github.com/CFenner/PyViCare"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix new file mode 100644 index 000000000000..2d60fc3af1f2 --- /dev/null +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -0,0 +1,51 @@ +{ + lib, + authlib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + requests, + pytest-cov-stub, + pytestCheckHook, + simplejson, +}: + +buildPythonPackage rec { + pname = "pyvicare"; + version = "2.35.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "openviess"; + repo = "PyViCare"; + rev = "refs/tags/${version}"; + hash = "sha256-5VvbbCQTc2EG7YsQlPd3BRwDtJzIuEX2yLs2RWFeFDM="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.1.0"' 'version = "${version}"' + ''; + + build-system = [ poetry-core ]; + + dependencies = [ + authlib + requests + ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; + + pythonImportsCheck = [ "PyViCare" ]; + + meta = with lib; { + changelog = "https://github.com/openviess/PyViCare/releases/tag/${version}"; + description = "Python Library to access Viessmann ViCare API"; + homepage = "https://github.com/somm15/PyViCare"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 7fc07f20a61a..8a428bce2e09 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -1,33 +1,33 @@ { + lib, stdenv, buildPythonPackage, - pythonOlder, + cffi, fetchFromGitHub, - pytestCheckHook, glib, - vips, - cffi, - pkgconfig, # from pythonPackages pkg-config, # from pkgs - lib, + pkgconfig, # from pythonPackages + pytestCheckHook, + pythonOlder, + setuptools, + vips, }: buildPythonPackage rec { pname = "pyvips"; - version = "2.2.1"; - format = "setuptools"; + version = "2.2.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "libvips"; repo = "pyvips"; - rev = "v${version}"; - hash = "sha256-9S7h3bkm+QP78cpemYS7l3c8t+wXsJ5MUAP2T50R/Mc="; + rev = "refs/tags/v${version}"; + hash = "sha256-EGB1cOR1pVCXGjRj1NLj4Mk3kIy8luRqk3gGJqVNs7U="; }; nativeBuildInputs = [ - pkgconfig pkg-config ]; @@ -36,7 +36,12 @@ buildPythonPackage rec { vips ]; - propagatedBuildInputs = [ cffi ]; + build-system = [ + pkgconfig + setuptools + ]; + + dependencies = [ cffi ]; env = lib.optionalAttrs stdenv.cc.isClang { NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; diff --git a/pkgs/development/python-modules/pyvirtualdisplay/default.nix b/pkgs/development/python-modules/pyvirtualdisplay/default.nix index 0574c5706338..fcbb8c0de00b 100644 --- a/pkgs/development/python-modules/pyvirtualdisplay/default.nix +++ b/pkgs/development/python-modules/pyvirtualdisplay/default.nix @@ -1,16 +1,28 @@ { lib, + stdenv, buildPythonPackage, fetchPypi, + substituteAll, + xorg, + + # build-system + setuptools, + + # tests easyprocess, + entrypoint2, + pillow, + psutil, + pytest-xdist, + pytestCheckHook, + vncdo, }: buildPythonPackage rec { pname = "pyvirtualdisplay"; version = "3.0"; - format = "setuptools"; - - propagatedBuildInputs = [ easyprocess ]; + pyproject = true; src = fetchPypi { pname = "PyVirtualDisplay"; @@ -18,8 +30,30 @@ buildPythonPackage rec { hash = "sha256-CXVbw86263JfsH7KVCX0PyNY078I4A0qm3kqGu3RYVk="; }; - # requires X server - doCheck = false; + patches = lib.optionals stdenv.isLinux [ + (substituteAll { + src = ./paths.patch; + xauth = lib.getExe xorg.xauth; + xdpyinfo = lib.getExe xorg.xdpyinfo; + }) + ]; + + build-system = [ setuptools ]; + + doCheck = stdenv.isLinux; + + nativeCheckInputs = [ + easyprocess + entrypoint2 + pillow + psutil + pytest-xdist + pytestCheckHook + (vncdo.overridePythonAttrs { doCheck = false; }) + xorg.xorgserver + xorg.xmessage + xorg.xvfb + ]; meta = with lib; { description = "Python wrapper for Xvfb, Xephyr and Xvnc"; diff --git a/pkgs/development/python-modules/pyvirtualdisplay/paths.patch b/pkgs/development/python-modules/pyvirtualdisplay/paths.patch new file mode 100644 index 000000000000..d447cd622802 --- /dev/null +++ b/pkgs/development/python-modules/pyvirtualdisplay/paths.patch @@ -0,0 +1,35 @@ +diff --git a/pyvirtualdisplay/abstractdisplay.py b/pyvirtualdisplay/abstractdisplay.py +index dd93943..c694209 100644 +--- a/pyvirtualdisplay/abstractdisplay.py ++++ b/pyvirtualdisplay/abstractdisplay.py +@@ -242,7 +242,7 @@ class AbstractDisplay(object): + + try: + xdpyinfo = subprocess.Popen( +- ["xdpyinfo"], ++ ["@xdpyinfo@"], + env=self._env(), + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +diff --git a/pyvirtualdisplay/xauth.py b/pyvirtualdisplay/xauth.py +index ce0f804..7734e21 100644 +--- a/pyvirtualdisplay/xauth.py ++++ b/pyvirtualdisplay/xauth.py +@@ -14,7 +14,7 @@ def is_installed(): + """ + try: + xauth = subprocess.Popen( +- ["xauth", "-V"], ++ ["@xauth@", "-V"], + # env=self._env(), + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +@@ -43,7 +43,7 @@ def call(*args): + Call xauth with the given args. + """ + xauth = subprocess.Popen( +- ["xauth"] + list(args), ++ ["@xauth@"] + list(args), + # env=self._env(), + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix index 4a2b39a87ab2..aec66ed08f4a 100644 --- a/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/pkgs/development/python-modules/pyvisa-py/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { gpib-ctypes = [ gpib-ctypes ]; serial = [ pyserial ]; usb = [ pyusb ]; diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix index 0bfb49ebc383..73973a6ad989 100644 --- a/pkgs/development/python-modules/pyvlx/default.nix +++ b/pkgs/development/python-modules/pyvlx/default.nix @@ -13,21 +13,21 @@ buildPythonPackage rec { pname = "pyvlx"; - version = "0.2.23"; + version = "0.2.25"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "Julius2342"; repo = "pyvlx"; rev = "refs/tags/${version}"; - hash = "sha256-J+oJQHsULrJQNdZqYsl2hufNubMwV1KtG10jZH0jbU4="; + hash = "sha256-c0HlmqLvpIn2GXorOArBKJ0YzvWz1spmhWwm6Gow2iU="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pyyaml typing-extensions zeroconf @@ -45,8 +45,8 @@ buildPythonPackage rec { ''; homepage = "https://github.com/Julius2342/pyvlx"; changelog = "https://github.com/Julius2342/pyvlx/releases/tag/${version}"; - license = with licenses; [ lgpl2Only ]; + license = licenses.lgpl2Only; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index 16260ed5de0a..80a8f5832a10 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { six ]; - passthru.optional-dependencies = { + optional-dependencies = { sso = [ lxml pyopenssl diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index f5f79271998c..fbab09765810 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyvo"; - version = "1.5.2"; + version = "1.5.3"; pyproject = true; disabled = pythonOlder "3.8"; # according to setup.cfg src = fetchPypi { inherit pname version; - hash = "sha256-uKJMRNrOXGB7HZOv0CV9FfoQnx6GV3I0fqlJ7qAcj3E="; + hash = "sha256-/ShNDoT1KucV4YVUeUz8BP33nsQF4YlpvbFs6vCxmH4="; }; build-system = [ diff --git a/pkgs/development/python-modules/pywavefront/default.nix b/pkgs/development/python-modules/pywavefront/default.nix index 534b5647c046..676f2aaab661 100644 --- a/pkgs/development/python-modules/pywavefront/default.nix +++ b/pkgs/development/python-modules/pywavefront/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies.visualization = [ pyglet ]; + optional-dependencies.visualization = [ pyglet ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix index 149b9fb57fd8..e3350c4e624d 100644 --- a/pkgs/development/python-modules/pywavelets/default.nix +++ b/pkgs/development/python-modules/pywavelets/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pywavelets"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,12 +20,12 @@ buildPythonPackage rec { owner = "PyWavelets"; repo = "pywt"; rev = "refs/tags/v${version}"; - hash = "sha256-Dr6LWGVlYGDD21l1RQ7elScovcen5uuFdJJXe3deB5o="; + hash = "sha256-oWAF8YDvb0SdlRzSjG2BNEekBkvR3U6KQ+e2FoIs+tw="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail '"numpy>=2.0.0rc1,<2.3",' "" + --replace-fail "numpy>=2.0.0" "numpy" ''; build-system = [ diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix index cc00679867f3..71ba2f75af49 100644 --- a/pkgs/development/python-modules/pywebpush/default.nix +++ b/pkgs/development/python-modules/pywebpush/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pywebpush"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-A8zD6XW2A3S3Y0xJVZVha+Ujvyx9oNl26E/amsjGMwE="; + hash = "sha256-cuNYauyJoGNzwFheb5fG/QuBUZ5B8yiWo2OZCez0XbA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index db508d3e5ef9..6346c96c62fc 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pywebview"; - version = "5.0.5"; + version = "5.2"; pyproject = true; disabled = pythonOlder "3.5"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "r0x0r"; repo = "pywebview"; rev = "refs/tags/${version}"; - hash = "sha256-Mep4r5OujsefXFQA09OospqnzgQ3xn8HHdZFKNo3oM4="; + hash = "sha256-PNnsqb+gyeFfQwMFj7cYaiv54cZ+H5IF9+DS9RN/qB4="; }; nativeBuildInputs = [ @@ -50,21 +50,17 @@ buildPythonPackage rec { ]; checkPhase = '' - # Cannot create directory /homeless-shelter/.... Error: FILE_ERROR_ACCESS_DENIED - export HOME=$TMPDIR - # QStandardPaths: XDG_RUNTIME_DIR not set - export XDG_RUNTIME_DIR=$HOME/xdg-runtime-dir + # a Qt wrapper is required to run the Qt backend + # since the upstream script does not have a way to disable tests individually pytest is used directly instead + makeQtWrapper "$(command -v pytest)" tests/run.sh \ + --set PYWEBVIEW_LOG debug \ + --add-flags "--deselect tests/test_js_api.py::test_concurrent" - pushd tests - substituteInPlace run.sh \ - --replace "PYTHONPATH=.." "PYTHONPATH=$PYTHONPATH" \ - --replace "pywebviewtest test_js_api.py::test_concurrent ''${PYTEST_OPTIONS}" "# skip flaky test_js_api.py::test_concurrent" - - patchShebangs run.sh - wrapQtApp run.sh - - xvfb-run -s '-screen 0 800x600x24' ./run.sh - popd + # HOME and XDG directories are required for the tests + env \ + HOME=$TMPDIR \ + XDG_RUNTIME_DIR=$TMPDIR/xdg-runtime-dir \ + xvfb-run -s '-screen 0 800x600x24' tests/run.sh ''; pythonImportsCheck = [ "webview" ]; diff --git a/pkgs/development/python-modules/pyytlounge/default.nix b/pkgs/development/python-modules/pyytlounge/default.nix new file mode 100644 index 000000000000..bbb3ba23163f --- /dev/null +++ b/pkgs/development/python-modules/pyytlounge/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + aiohttp, + pytest, + pytestCheckHook, + pytest-mock, + pytest-asyncio, +}: + +buildPythonPackage rec { + pname = "pyytlounge"; + version = "2.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "FabioGNR"; + repo = "pyytlounge"; + rev = "v${version}"; + hash = "sha256-0QPa3EzOBv5fuw3FGgmoN4KiC4KHo1Z+Svjcneoe0pc="; + }; + + build-system = [ hatchling ]; + + dependencies = [ aiohttp ]; + + nativeCheckInputs = [ + pytest + pytestCheckHook + pytest-mock + pytest-asyncio + ]; + + meta = with lib; { + description = "Python YouTube Lounge API"; + homepage = "https://github.com/FabioGNR/pyytlounge"; + license = licenses.gpl3Only; + maintainers = [ maintainers.lukegb ]; + }; +} diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 6c4b8076294f..e47570dd9b06 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -15,23 +15,23 @@ # checks pytestCheckHook, - python, pythonOlder, tornado, + libsodium, zeromq, pytest-asyncio, }: buildPythonPackage rec { pname = "pyzmq"; - version = "26.0.3"; + version = "26.2.0"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-26fZ8uBH36K8o7AfT4SqUkZyUgPWKE43kPLKFfumtAo="; + hash = "sha256-BwZywlhYHI5PZAtRWSl1gKmXSwJgQ71KsEcL6e0yTx8="; }; build-system = [ @@ -44,7 +44,10 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - buildInputs = [ zeromq ]; + buildInputs = [ + libsodium + zeromq + ]; dependencies = lib.optionals isPyPy [ cffi ]; @@ -56,13 +59,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "zmq" ]; - pytestFlagsArray = [ - "$out/${python.sitePackages}/zmq/tests/" # Folder with tests - # pytest.ini is missing in pypi's sdist - # https://github.com/zeromq/pyzmq/issues/1853#issuecomment-1592731986 - "--asyncio-mode auto" - "--ignore=$out/lib/python3.12/site-packages/zmq/tests/test_mypy.py" - ]; + preCheck = '' + rm -r zmq + ''; disabledTests = [ # Tests hang diff --git a/pkgs/development/python-modules/pyzx/default.nix b/pkgs/development/python-modules/pyzx/default.nix index d39d2b48ef24..27371dc2bbd6 100644 --- a/pkgs/development/python-modules/pyzx/default.nix +++ b/pkgs/development/python-modules/pyzx/default.nix @@ -38,7 +38,10 @@ buildPythonPackage rec { typing-extensions ]; - pythonRelaxDeps = [ "ipywidgets" ]; + pythonRelaxDeps = [ + "ipywidgets" + "lark" + ]; nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/qbittorrent-api/default.nix b/pkgs/development/python-modules/qbittorrent-api/default.nix index f38927594aa7..550ce775a572 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.9.66"; + version = "2024.10.68"; pyproject = true; src = fetchPypi { pname = "qbittorrent_api"; inherit version; - hash = "sha256-Vx5ShmEARDfQtIldTQuL0LkLUdo0QE/ANsLa4yq3OXo="; + hash = "sha256-nOw/XtHx21njbXAr1fXSuRdn2UY2yoGkJqlZVXLkf3o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index e5a2688d0011..71cfa490452b 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "qcelemental" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Periodic table, physical constants and molecule parsing for quantum chemistry"; homepage = "https://github.com/MolSSI/QCElemental"; changelog = "https://github.com/MolSSI/QCElemental/blob/v${version}/docs/changelog.rst"; diff --git a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix index 4c2db9b41f5c..d6bd8c809582 100644 --- a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix +++ b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix @@ -50,11 +50,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "qcodes_contrib_drivers" ]; disabledTests = - lib.optionals (stdenv.isDarwin) [ + lib.optionals (stdenv.hostPlatform.isDarwin) [ # At index 13 diff: 'sour6:volt 0.29000000000000004' != 'sour6:volt 0.29' "test_stability_diagram_external" ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # AssertionError: assert ['outp:trig4:...9999996', ...] == ['outp:trig4:...t 0.266', ...] "test_stability_diagram_external" ]; diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index e10eb77d2816..01ae8380228c 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/pkgs/development/python-modules/qcodes/default.nix @@ -6,7 +6,6 @@ # build-system setuptools, versioningit, - wheel, # dependencies broadbean, @@ -45,8 +44,6 @@ sphinx, sphinx-issues, towncrier, - opencensus, - opencensus-ext-azure, # checks deepdiff, @@ -62,20 +59,19 @@ buildPythonPackage rec { pname = "qcodes"; - version = "0.48.0"; + version = "0.49.0"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "Qcodes"; rev = "refs/tags/v${version}"; - hash = "sha256-Q1WyuK1mCbs75kGY1Aaw7S5EfFRjwqzZnhNyeSx7qc8="; + hash = "sha256-AlrQH0yKbEz+ICdvWWjMD7LQvWl36cFWlp+fegAmtL8="; }; build-system = [ setuptools versioningit - wheel ]; dependencies = [ @@ -125,10 +121,6 @@ buildPythonPackage rec { loop = [ # qcodes-loop ]; - opencensus = [ - opencensus - opencensus-ext-azure - ]; refactor = [ libcst ]; diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 34984ec5755e..9d903f4fe064 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { "httpx" "iso8601" "pydantic" + "tenacity" ]; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/qcs-sdk-python/default.nix b/pkgs/development/python-modules/qcs-sdk-python/default.nix index 4d0d1ffe38c7..854ed41a3437 100644 --- a/pkgs/development/python-modules/qcs-sdk-python/default.nix +++ b/pkgs/development/python-modules/qcs-sdk-python/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { tracing-opentelemetry = [ opentelemetry-api ]; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration libiconv diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index d54ac47473a5..a42bdab7c1ab 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.11.2"; + version = "1.11.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = "qdrant-client"; rev = "refs/tags/v${version}"; - hash = "sha256-DVyaBQ8r52H9q2NNDsplfPxoxwZeK3pHNfnyw9a9hvw="; + hash = "sha256-1tBlWwD2GaphwupWUWRYwYrqGV9cTfG4k1L9N5mub/Q="; }; build-system = [ poetry-core ]; @@ -52,7 +52,7 @@ buildPythonPackage rec { # Tests require network access doCheck = false; - passthru.optional-dependencies = { + optional-dependencies = { fastembed = [ fastembed ]; }; diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 18bd47bf5bf7..62c404ff9720 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.13.3"; + version = "0.15.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = "refs/tags/${version}"; - hash = "sha256-xE5P4o6/I8Y/trK0e8GQ0oAOAyMvYWfzyuVvAoZExwk="; + hash = "sha256-TrGoeyn6K5MGtkenEE9zz4S1xdOthskdRykzppfkZag="; }; postPatch = '' diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index a5744586b1a5..a51ad99805b9 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { [ "test_tensored_meas_cal_on_circuit" # Flaky test, occasionally returns result outside bounds ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test_fitters" # Fails check that arrays are close. Might be due to aarch64 math issues. ]; diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index 44ae18a933d0..eb433a22e8ef 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { rustPlatform.cargoSetupHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 84d68da4b937..9b0ca55c8eb0 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -33,7 +33,7 @@ in buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "1.0.1"; + version = "1.2.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit"; rev = "refs/tags/${version}"; - hash = "sha256-Cjfn+9h8W08FcAlVC7b7O8Z+VGx5UeHosSgYJin/evE="; + hash = "sha256-QbJcpJAtMMfJF71moQ1kEqP2lnZXmg69Zk2mjCJDg/Q="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index 468099e7b59e..af278cea4c09 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -20,14 +20,14 @@ }: buildPythonPackage rec { pname = "qpsolvers"; - version = "4.3.3"; + version = "4.4.0"; pyproject = true; src = fetchFromGitHub { owner = "qpsolvers"; repo = "qpsolvers"; rev = "refs/tags/v${version}"; - hash = "sha256-AQHd3tBfPzISQXsXHQQyh59nmym5gt8Jfogd6gRG3EM="; + hash = "sha256-/yIFLxy2gjEFg/J9A5pcbrVmq4A3Tz2efEAntH0Twk8="; }; nativeBuildInputs = [ flit-core ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { scipy ]; - passthru.optional-dependencies = { + optional-dependencies = { # FIXME commented out solvers have not been packaged yet clarabel = [ clarabel ]; cvxopt = [ cvxopt ]; @@ -55,7 +55,7 @@ buildPythonPackage rec { quadprog = [ quadprog ]; scs = [ scs ]; open_source_solvers = - with passthru.optional-dependencies; + with optional-dependencies; lib.flatten [ clarabel cvxopt @@ -68,7 +68,7 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ unittestCheckHook ] ++ passthru.optional-dependencies.open_source_solvers; + nativeCheckInputs = [ unittestCheckHook ] ++ optional-dependencies.open_source_solvers; meta = with lib; { changelog = "https://github.com/qpsolvers/qpsolvers/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix index 2c7df77b33a1..5099900a29a1 100644 --- a/pkgs/development/python-modules/qrcode/default.nix +++ b/pkgs/development/python-modules/qrcode/default.nix @@ -2,42 +2,47 @@ lib, buildPythonPackage, fetchPypi, - mock, + pythonAtLeast, + + # build-system + poetry-core, + + # dependencies pillow, pypng, + + # tests + mock, pytestCheckHook, - pythonAtLeast, qrcode, - setuptools, testers, - typing-extensions, }: buildPythonPackage rec { pname = "qrcode"; - version = "7.4.2"; + version = "8.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ndlpRUgn4Sfb2TaWsgdHI55tVA4IKTfJDxSslbMPWEU="; + hash = "sha256-AlzisVD3/kKW0Rbum61FWmZDq09ufc5UFhOkdYy840c="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - typing-extensions - pypng - # imports pkg_resouces in console_scripts.py - setuptools - ]; - - passthru.optional-dependencies.pil = [ pillow ]; + optional-dependencies = { + pil = [ pillow ]; + png = [ pypng ]; + all = [ + pypng + pillow + ]; + }; nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.pil; + ] ++ lib.flatten (lib.attrValues optional-dependencies); passthru.tests = { version = testers.testVersion { diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix index bab2320b0d6f..2ef0d3280f83 100644 --- a/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pythonPackages.setuptools ]; buildInputs = [ qtbase ]; - propagatedBuildInputs = [ pyqt5 ] ++ lib.optionals stdenv.isDarwin [ qtmacextras ]; + propagatedBuildInputs = [ pyqt5 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ]; dontWrapQtApps = true; @@ -47,7 +47,7 @@ buildPythonPackage rec { echo 'sip-include-dirs = [ "${pyqt5}/${python.sitePackages}/PyQt5/bindings"]' \ >> pyproject.toml '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace project.py \ --replace \ "if self.project.qsci_external_lib: diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 858785307a47..fcda25cc9ff2 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "5.6.0"; + version = "5.6.1"; pyproject = true; src = fetchFromGitHub { owner = "jupyter"; repo = "qtconsole"; rev = "refs/tags/${version}"; - hash = "sha256-V82tGAmpvfGeUoewtJXXsBBXx2HNcV9/IMJxJg3bJL8="; + hash = "sha256-esCt7UQ0va/FJ0gdSrcc/k/FgyBVqKy7ttrN6E6mx+E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index 90f439317884..6157a058dee9 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.28.1"; + version = "0.29.0"; pyproject = true; src = fetchFromGitHub { owner = "elParaguayo"; repo = "qtile-extras"; rev = "refs/tags/v${version}"; - hash = "sha256-rF9tRzOdMiISN8vupBt9+1d3pWJqbNS83odtm5SzXZI="; + hash = "sha256-QkcLts2cqhA49/L9nuekf0n+ZRBxKdGL9Ql1sgtyTiw="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index 6baaa6c47da2..dc437906d953 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.28.1"; + version = "0.29.0"; pyproject = true; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "refs/tags/v${version}"; - hash = "sha256-r8cAht40r1/6rG1xrfx34YEPuPeyBCuSvX7MarLTTCc="; + hash = "sha256-EqrvBXigMjevPERTcz3EXSRaZP2xSEsOxjuiJ/5QOz0="; }; patches = [ diff --git a/pkgs/development/python-modules/quadprog/default.nix b/pkgs/development/python-modules/quadprog/default.nix index d592c443e1d5..17faac7d13d4 100644 --- a/pkgs/development/python-modules/quadprog/default.nix +++ b/pkgs/development/python-modules/quadprog/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "quadprog"; - version = "0.1.12"; + version = "0.1.13"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "quadprog"; repo = "quadprog"; rev = "v${version}"; - hash = "sha256-3S846PaNfZ4j3r6Vi2o6+Jk+2kC/P7tMSQQiB/Kx8nI="; + hash = "sha256-8gPuqDY3ajw/+B6kJdtpq+HL+Oq2Nsy/O7m+IWzxP38="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/quamash/default.nix b/pkgs/development/python-modules/quamash/default.nix deleted file mode 100644 index b920d7421f8e..000000000000 --- a/pkgs/development/python-modules/quamash/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pytest, - isPy3k, - pyqt5, - pyqt ? pyqt5, - fetchpatch, -}: - -buildPythonPackage rec { - pname = "quamash"; - version = "0.6.1"; - format = "setuptools"; - - disabled = !isPy3k; - - # No tests in PyPi tarball - src = fetchFromGitHub { - owner = "harvimt"; - repo = "quamash"; - rev = "version-${version}"; - sha256 = "117rp9r4lz0kfz4dmmpa35hp6nhbh6b4xq0jmgvqm68g9hwdxmqa"; - }; - - patches = [ - # add 3.10 compatibility, merged remove on next update - (fetchpatch { - url = "https://github.com/harvimt/quamash/pull/126/commits/1e9047bec739dbc9d6ab337fc1a111a8b1090244.patch"; - hash = "sha256-6gomY82AOKkrt32SEBKnRugzhnC5FAyKDs6K5xaxnRM="; - }) - ]; - - propagatedBuildInputs = [ pyqt ]; - - nativeCheckInputs = [ pytest ]; - checkPhase = '' - pytest -k 'test_qthreadexec.py' # the others cause the test execution to be aborted, I think because of asyncio - ''; - - meta = with lib; { - description = "Implementation of the PEP 3156 event-loop (asyncio) api using the Qt Event-Loop"; - homepage = "https://github.com/harvimt/quamash"; - license = licenses.bsd2; - maintainers = with maintainers; [ borisbabic ]; - }; -} diff --git a/pkgs/development/python-modules/quart/default.nix b/pkgs/development/python-modules/quart/default.nix index 0388b58a34c9..17c7a65ec387 100644 --- a/pkgs/development/python-modules/quart/default.nix +++ b/pkgs/development/python-modules/quart/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "quart"; - version = "0.19.6"; + version = "0.19.8"; pyproject = true; src = fetchFromGitHub { owner = "pallets"; repo = "quart"; rev = "refs/tags/${version}"; - hash = "sha256-oR03Qu93F+pcWywbdYgMKIAdohBNezlGz04ws3yGAxs="; + hash = "sha256-A23+25bDzK2GlGNTCul6HbsjNujrnhpzTxdnV3Ig028="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/qudida/default.nix b/pkgs/development/python-modules/qudida/default.nix index 7e0bac314b25..6900eef961c7 100644 --- a/pkgs/development/python-modules/qudida/default.nix +++ b/pkgs/development/python-modules/qudida/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, numpy, - opencv4, + opencv-python, pythonOlder, scikit-learn, typing-extensions, @@ -21,12 +21,9 @@ buildPythonPackage rec { hash = "sha256-2xmOKIerDJqgAj5WWvv/Qd+3azYfhf1eE/eA11uhjMg="; }; - - pythonRemoveDeps = [ "opencv-python" ]; - propagatedBuildInputs = [ numpy - opencv4 + opencv-python scikit-learn typing-extensions ]; diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix index ea6844159930..9663e8e1fdd1 100644 --- a/pkgs/development/python-modules/questionary/default.nix +++ b/pkgs/development/python-modules/questionary/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' ulimit -n 1024 ''; diff --git a/pkgs/development/python-modules/quil/default.nix b/pkgs/development/python-modules/quil/default.nix index 79f6a4c6ed06..98175f1cbbda 100644 --- a/pkgs/development/python-modules/quil/default.nix +++ b/pkgs/development/python-modules/quil/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; dependencies = [ numpy ]; diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 8cc5ccba6c30..4907fd550759 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "qutip"; - version = "5.0.2"; + version = "5.0.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,9 +29,15 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-lMPzgmUaoEQB5TzmqEJFiFTuS3AGpyMMjPHlPUKTLvk="; + hash = "sha256-KT5Mk0w6EKTUZzGRnQ6XQPZfH5ZXVuiD+EwSflNqHNo="; }; + postPatch = '' + # build-time constriant, used to ensure forward and backward compat + substituteInPlace pyproject.toml setup.cfg \ + --replace-fail "numpy>=2.0.0" "numpy" + ''; + nativeBuildInputs = [ cython_0 setuptools @@ -47,7 +53,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-rerunfailures - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # QuTiP tries to access the home directory to create an rc file for us. # We need to go to another directory to run the tests from there. @@ -68,7 +74,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "qutip" ]; - passthru.optional-dependencies = { + optional-dependencies = { graphics = [ matplotlib ]; ipython = [ ipython ]; semidefinite = [ diff --git a/pkgs/development/python-modules/radios/default.nix b/pkgs/development/python-modules/radios/default.nix index 241e95a18985..ee5d92533524 100644 --- a/pkgs/development/python-modules/radios/default.nix +++ b/pkgs/development/python-modules/radios/default.nix @@ -15,12 +15,13 @@ yarl, aresponses, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, }: buildPythonPackage rec { pname = "radios"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,23 +29,20 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frenck"; repo = "python-radios"; - rev = "v${version}"; - hash = "sha256-c0zfpfEdZvjvKtwGcNLLgEkBihhtz/wouHuYRLCxtBY="; + rev = "refs/tags/v${version}"; + hash = "sha256-GXiLwwjZ/pN3HquzLLWq/2EfhmrJyCXq0sovIGRB3uQ="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" + --replace-fail 'version = "0.0.0"' 'version = "${version}"' ''; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - pythonRelaxDeps = [ "pycountry" ]; - - propagatedBuildInputs = [ + dependencies = [ aiodns aiohttp awesomeversion @@ -59,6 +57,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/radon/default.nix b/pkgs/development/python-modules/radon/default.nix index 5d494b4c2996..6a9baf65e6a6 100644 --- a/pkgs/development/python-modules/radon/default.nix +++ b/pkgs/development/python-modules/radon/default.nix @@ -45,7 +45,11 @@ buildPythonPackage rec { colorama ]; - passthru.optional-dependencies = { + pythonRelaxDeps = [ + "mando" + ]; + + optional-dependencies = { toml = [ tomli ]; }; diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 02ef0d753fae..495eff4e4670 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -7,7 +7,7 @@ cmake, cython, ninja, - scikit-build, + scikit-build-core, setuptools, numpy, hypothesis, @@ -19,21 +19,20 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.9.7"; + version = "3.10.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-hyjzY9ogroUa4nGSG8HOyr5FxifX9d7Hf8ezKq6zxVk="; + hash = "sha256-0L8nkjgWdP/w//M69ZRxYk9If3CIEcnAl9mkJKJ4o1g="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "scikit-build~=0.18.0" "scikit-build" \ --replace-fail "Cython >=3.0.11, <3.1.0" "Cython" ''; @@ -41,8 +40,7 @@ buildPythonPackage rec { cmake cython ninja - scikit-build - setuptools + scikit-build-core ]; dontUseCmakeConfigure = true; @@ -56,12 +54,12 @@ buildPythonPackage rec { '' export RAPIDFUZZ_BUILD_EXTENSION=1 '' - + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' export CMAKE_ARGS="-DCMAKE_CXX_COMPILER_AR=$AR -DCMAKE_CXX_COMPILER_RANLIB=$RANLIB" ''; - passthru.optional-dependencies = { - full = [ numpy ]; + optional-dependencies = { + all = [ numpy ]; }; preCheck = '' @@ -74,7 +72,7 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # segfaults "test_cdist" ]; diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix index eef3e3b975ce..49ec5f4a5b8b 100644 --- a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix +++ b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix @@ -10,7 +10,7 @@ setuptools, pyclipper, - opencv4, + opencv-python, numpy, six, shapely, @@ -90,7 +90,7 @@ buildPythonPackage { dependencies = [ pyclipper - opencv4 + opencv-python numpy six shapely @@ -99,9 +99,6 @@ buildPythonPackage { onnxruntime ]; - # Remove because we have adopted the `opencv4` as an attribute name. - pythonRemoveDeps = [ "opencv-python" ]; - pythonImportsCheck = [ "rapidocr_onnxruntime" ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -115,7 +112,7 @@ buildPythonPackage { meta = { # This seems to be related to https://github.com/microsoft/onnxruntime/issues/10038 # Also some related issue: https://github.com/NixOS/nixpkgs/pull/319053#issuecomment-2167713362 - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); changelog = "https://github.com/RapidAI/RapidOCR/releases/tag/v${version}"; description = "Cross platform OCR Library based on OnnxRuntime"; homepage = "https://github.com/RapidAI/RapidOCR"; diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 8536f1bc981c..30dd05cffbdd 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -15,6 +15,7 @@ click-plugins, cligj, cython, + fsspec, gdal, hypothesis, ipython, @@ -32,7 +33,7 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.3.11"; + version = "1.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,17 +42,13 @@ buildPythonPackage rec { owner = "rasterio"; repo = "rasterio"; rev = "refs/tags/${version}"; - hash = "sha256-Yh3n2oyARf7LAtJU8Oa3WWc+oscl7e2N7jpW0v1uTVk="; + hash = "sha256-A8o8FYuhlzL6Wl6sfB7D2KRAKZl28E6K2AdUik9zmgs="; }; postPatch = '' - # remove useless import statement requiring distutils to be present at the runtime - substituteInPlace rasterio/rio/calc.py \ - --replace-fail "from distutils.version import LooseVersion" "" - # relax numpy dependency substituteInPlace pyproject.toml \ - --replace-fail "numpy>=2.0.0,<3.0" "numpy" + --replace-fail "numpy>=2" "numpy" ''; nativeBuildInputs = [ @@ -73,7 +70,7 @@ buildPythonPackage rec { snuggs ]; - passthru.optional-dependencies = { + optional-dependencies = { ipython = [ ipython ]; plot = [ matplotlib ]; s3 = [ boto3 ]; @@ -81,6 +78,7 @@ buildPythonPackage rec { nativeCheckInputs = [ boto3 + fsspec hypothesis packaging pytestCheckHook @@ -88,8 +86,6 @@ buildPythonPackage rec { shapely ]; - doCheck = true; - preCheck = '' rm -r rasterio # prevent importing local rasterio ''; @@ -99,7 +95,11 @@ buildPythonPackage rec { disabledTests = [ # flaky "test_outer_boundless_pixel_fidelity" - ] ++ lib.optionals stdenv.isDarwin [ "test_reproject_error_propagation" ]; + # network access + "test_issue1982" + "test_opener_fsspec_http_fs" + "test_fsspec_http_msk_sidecar" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_reproject_error_propagation" ]; pythonImportsCheck = [ "rasterio" ]; diff --git a/pkgs/development/python-modules/ratarmountcore/default.nix b/pkgs/development/python-modules/ratarmountcore/default.nix index b966e0a319be..dbeb62305b59 100644 --- a/pkgs/development/python-modules/ratarmountcore/default.nix +++ b/pkgs/development/python-modules/ratarmountcore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ratarmountcore"; - version = "0.7.2"; + version = "0.15.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mxmlnkn"; repo = "ratarmount"; - rev = "core-v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-2LPGKdofx2ID8BU0dZhGiZ3tUkd+niEVGvTSBFX4InU="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix index 88727591db83..ac4f03faaa78 100644 --- a/pkgs/development/python-modules/raven/default.nix +++ b/pkgs/development/python-modules/raven/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "raven" ]; - passthru.optional-dependencies = { + optional-dependencies = { flask = [ blinker flask diff --git a/pkgs/development/python-modules/ray/binary-hashes.nix b/pkgs/development/python-modules/ray/binary-hashes.nix index 5d5a474d49dd..bab6c0695e54 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-LaTzHub21e+qDQs4/sxCIVzaE8leAVs8y4P1jighkT8="; + hash = "sha256-On1vcVm85BF7/o+cPQtl/yclf+LdjXN9rQ84aWZkQNo="; }; cp311 = { - hash = "sha256-Iym0IdxjsC4w5GV497RQfufdjMV/NbdGgQG9xkdy+js="; + hash = "sha256-7OgCzzocECtT9juLyQ2UeXHEs4feryM8Ik7Y7zSh88s="; }; cp312 = { - hash = "sha256-KXAxrkdyHKzX9pgpTTZ2PiwsXEeac0BFG6dQOkJ0seU="; + hash = "sha256-B1B9L5lh6NU5DA62Bt8kkhbvWvsf+BhVgfPpIEHWYpM="; }; } diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index a2fe1808201b..41bfd53c9bf0 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -56,7 +56,7 @@ let pname = "ray"; - version = "2.36.0"; + version = "2.38.0"; in buildPythonPackage rec { inherit pname version; @@ -162,6 +162,7 @@ buildPythonPackage rec { changelog = "https://github.com/ray-project/ray/releases/tag/ray-${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ billhuang ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/python-modules/raylib-python-cffi/default.nix b/pkgs/development/python-modules/raylib-python-cffi/default.nix index 6069a6bdfe55..eaaa13c96cb3 100644 --- a/pkgs/development/python-modules/raylib-python-cffi/default.nix +++ b/pkgs/development/python-modules/raylib-python-cffi/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { physac raygui ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenGL Cocoa IOKit diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index b0f2b4c7cd2a..72f6e8c8d485 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -23,7 +23,7 @@ # tests pip, - pytest-cov, + pytest-cov-stub, pytest7CheckHook, setuptools, }: @@ -50,7 +50,7 @@ buildPythonPackage rec { pyparsing ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { html = [ html5lib ]; networkx = [ networkx ]; }; @@ -59,11 +59,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pip - pytest-cov + pytest-cov-stub # Failed: DID NOT WARN. No warnings of type (<class 'UserWarning'>,) were emitted. pytest7CheckHook setuptools - ] ++ passthru.optional-dependencies.networkx ++ passthru.optional-dependencies.html; + ] ++ optional-dependencies.networkx ++ optional-dependencies.html; pytestFlagsArray = [ # requires network access @@ -82,7 +82,7 @@ buildPythonPackage rec { "test_guess_format_for_parse" "rdflib.extras.infixowl" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Require loopback network access "TestGraphHTTP" ]; diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index 248f212f0abe..ec98f19c271f 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -30,8 +30,8 @@ let yaehmop = fetchFromGitHub { owner = "greglandrum"; repo = "yaehmop"; - rev = "v2023.03.1"; - hash = "sha256-K9//cDN69U4sLETfIZq9NUaBE3RXOReH53qfiCzutqM="; + rev = "v2024.03.1"; + hash = "sha256-rhR7Ev+9Fk/Ks7R2x2SjWu1L/48a4zHDHUBohx1Dw/M="; }; freesasa = fetchFromGitHub { owner = "mittinatten"; @@ -39,11 +39,18 @@ let rev = "2.0.3"; hash = "sha256-7E+imvfDAJFnXQRWb5hNaSu+Xrf9NXeIKc9fl+o3yHQ="; }; + pubchem-align3d = fetchFromGitHub { + owner = "ncbi"; + repo = "pubchem-align3d"; + rev = "daefab3dd0c90ca56da9d3d5e375fe4d651e6be3"; + hash = "sha256-tQB4wqza9rlSoy4Uj9bA99ddawjxGyN9G7DYbcv/Qdo="; + }; }; + boost' = boost.override { enableNumpy = true; }; in buildPythonPackage rec { pname = "rdkit"; - version = "2023.09.5"; + version = "2024.09.1"; pyproject = false; src = @@ -51,10 +58,10 @@ buildPythonPackage rec { versionTag = lib.replaceStrings [ "." ] [ "_" ] version; in fetchFromGitHub { - owner = pname; - repo = pname; + owner = "rdkit"; + repo = "rdkit"; rev = "Release_${versionTag}"; - hash = "sha256-ZYNAHNBHQPx8rBJSvEWFEpdSpYyXcoqJ+nBA7tpHwQs="; + hash = "sha256-UsyPlAJ8FISblF8szEmRqWansunIhW/gbEBZx13YM+A="; }; unpackPhase = '' @@ -74,6 +81,7 @@ buildPythonPackage rec { chmod +w External/FreeSASA/freesasa/src cp External/FreeSASA/freesasa2.c External/FreeSASA/freesasa/src + ln -s ${external.pubchem-align3d} External/pubchem_shape/pubchem-align3d ln -s ${rapidjson} External/rapidjson-1.1.0 ln -s ${comic-neue}/share/fonts/truetype/ComicNeue-Regular.ttf Data/Fonts/ ''; @@ -81,12 +89,16 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake ]; buildInputs = [ - boost + boost' cairo catch2_3 + coordgenlibs + eigen + inchi + maeparser ] ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook ]; - propagatedBuildInputs = [ + dependencies = [ numpy pandas pillow @@ -94,45 +106,29 @@ buildPythonPackage rec { hardeningDisable = [ "format" ]; # required by yaehmop - dontUseSetuptoolsBuild = true; - dontUsePipInstall = true; - dontUseSetuptoolsCheck = true; - - preConfigure = '' - # Since we can't expand with bash in cmakeFlags - appendToVar cmakeFlags "-DPYTHON_NUMPY_INCLUDE_PATH=$(${python}/bin/python -c 'import numpy; print(numpy.get_include())')" - appendToVar cmakeFlags "-DFREESASA_DIR=$PWD/External/FreeSASA/freesasa" - appendToVar cmakeFlags "-DFREESASA_SRC_DIR=$PWD/External/FreeSASA/freesasa" - appendToVar cmakeFlags "-DAVALONTOOLS_DIR=$PWD/External/AvalonTools/avalon" - ''; - cmakeFlags = [ - "-DINCHI_LIBRARY=${inchi}/lib/libinchi.so" - "-DINCHI_LIBRARIES=${inchi}/lib/libinchi.so" - "-DINCHI_INCLUDE_DIR=${inchi}/include/inchi" - "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3" - "-DRDK_INSTALL_INTREE=OFF" - "-DRDK_INSTALL_STATIC_LIBS=OFF" - "-DRDK_BUILD_INCHI_SUPPORT=ON" - "-DRDK_BUILD_AVALON_SUPPORT=ON" - "-DRDK_BUILD_FREESASA_SUPPORT=ON" - "-DRDK_BUILD_YAEHMOP_SUPPORT=ON" - "-DRDK_BUILD_MAEPARSER_SUPPORT=ON" - "-DMAEPARSER_DIR=${maeparser}" - "-DRDK_BUILD_COORDGEN_SUPPORT=ON" - "-DCOORDGEN_DIR=${coordgenlibs}" - "-DRDK_USE_URF=OFF" - "-DRDK_USE_FLEXBISON=OFF" - "-DRDK_BUILD_CAIRO_SUPPORT=ON" - "-DRDK_BUILD_THREADSAFE_SSS=ON" - "-DRDK_TEST_MULTITHREADED=ON" - "-DRDK_BUILD_CPP_TESTS=ON" - "-DRDK_TEST_MULTITHREADED=ON" - "-DPYTHON_EXECUTABLE=${python}/bin/python" - "-DBOOST_ROOT=${boost}" - "-DBoost_NO_SYSTEM_PATHS=ON" - "-DBoost_NO_BOOST_CMAKE=TRUE" - "-DCMAKE_SKIP_BUILD_RPATH=ON" # fails to find libs in pythonImportsCheckPhase otherwise + (lib.cmakeBool "Boost_NO_BOOST_CMAKE" true) + (lib.cmakeBool "Boost_NO_SYSTEM_PATHS" true) + (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) # fails to find libs in pythonImportsCheckPhase otherwise + (lib.cmakeBool "RDK_BUILD_AVALON_SUPPORT" true) + (lib.cmakeBool "RDK_BUILD_CAIRO_SUPPORT" true) + (lib.cmakeBool "RDK_BUILD_COORDGEN_SUPPORT" true) + (lib.cmakeBool "RDK_BUILD_CPP_TESTS" true) + (lib.cmakeBool "RDK_BUILD_FREESASA_SUPPORT" true) + (lib.cmakeBool "RDK_BUILD_INCHI_SUPPORT" true) + (lib.cmakeBool "RDK_BUILD_MAEPARSER_SUPPORT" true) + (lib.cmakeBool "RDK_BUILD_THREADSAFE_SSS" true) + (lib.cmakeBool "RDK_BUILD_YAEHMOP_SUPPORT" true) + (lib.cmakeBool "RDK_INSTALL_INTREE" false) + (lib.cmakeBool "RDK_INSTALL_STATIC_LIBS" false) + (lib.cmakeBool "RDK_TEST_MULTITHREADED" true) + (lib.cmakeBool "RDK_TEST_MULTITHREADED" true) + (lib.cmakeBool "RDK_USE_FLEXBISON" false) + (lib.cmakeBool "RDK_USE_URF" false) + (lib.cmakeFeature "AVALONTOOLS_DIR" "avalon") + (lib.cmakeFeature "FREESASA_SRC_DIR" "freesasa") + (lib.cmakeFeature "INCHI_INCLUDE_DIR" "${inchi}/include/inchi") + (lib.cmakeFeature "PUBCHEMSHAPE_DIR" "External/pubchem_shape/pubchem-align3d") ]; checkPhase = '' diff --git a/pkgs/development/python-modules/readability-lxml/default.nix b/pkgs/development/python-modules/readability-lxml/default.nix index e676918cb698..7c75c32be269 100644 --- a/pkgs/development/python-modules/readability-lxml/default.nix +++ b/pkgs/development/python-modules/readability-lxml/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { timeout-decorator ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Test is broken on darwin. Fix in master from https://github.com/buriy/python-readability/pull/178 "test_many_repeated_spaces" ]; diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix index b9d80f945c25..29c4f5d0bd2d 100644 --- a/pkgs/development/python-modules/readchar/default.nix +++ b/pkgs/development/python-modules/readchar/default.nix @@ -7,13 +7,14 @@ setuptools, # tests + pytest-cov-stub, pytestCheckHook, pexpect, }: buildPythonPackage rec { pname = "readchar"; - version = "4.0.6"; + version = "4.2.0"; pyproject = true; # Don't use wheels on PyPI @@ -21,32 +22,33 @@ buildPythonPackage rec { owner = "magmax"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-XowLJ9YAHhP9nInFVYtoLEOmlWBRWQX259vwm9SVVZU="; + hash = "sha256-xha3bGuDYt4gLcK3x62ym+zCAQVyZjlV1HyKh8kHe64="; }; postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=readchar" "" \ - --replace "attr: readchar.__version__" "${version}" + # Tags on GitHub still have a postfix (-dev0) + sed -i 's/\(version = "\)[^"]*\(".*\)/\1${version}\2/' pyproject.toml # run Linux tests on Darwin as well # see https://github.com/magmax/python-readchar/pull/99 for why this is not upstreamed substituteInPlace tests/linux/conftest.py \ --replace 'sys.platform.startswith("linux")' 'sys.platform.startswith(("darwin", "linux"))' ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; pythonImportsCheck = [ "readchar" ]; nativeCheckInputs = [ + pytest-cov-stub pytestCheckHook pexpect ]; meta = with lib; { - homepage = "https://github.com/magmax/python-readchar"; description = "Python library to read characters and key strokes"; + homepage = "https://github.com/magmax/python-readchar"; + changelog = "https://github.com/magmax/python-readchar/releases/tag/v${version}"; license = licenses.mit; - maintainers = [ maintainers.mmahut ]; + maintainers = with maintainers; [ mmahut ]; }; } diff --git a/pkgs/development/python-modules/readme-renderer/default.nix b/pkgs/development/python-modules/readme-renderer/default.nix index 2ffce823140c..f2642aff1c2c 100644 --- a/pkgs/development/python-modules/readme-renderer/default.nix +++ b/pkgs/development/python-modules/readme-renderer/default.nix @@ -13,15 +13,15 @@ buildPythonPackage rec { pname = "readme-renderer"; - version = "43.0"; + version = "44.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { pname = "readme_renderer"; inherit version; - hash = "sha256-GBjdKBQIE1Ce7tjWJof3zU97rZDU21hgAcXcCdT94xE="; + hash = "sha256-hxIDTqu/poBcrPFAK07rKnMCj3LRFm1vXLf5wEfF0eE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/recipe-scrapers/default.nix b/pkgs/development/python-modules/recipe-scrapers/default.nix index dc72a492a20e..eba4cd32df88 100644 --- a/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "recipe-scrapers"; - version = "15.1.0"; + version = "15.2.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "hhursev"; repo = "recipe-scrapers"; rev = "refs/tags/${version}"; - hash = "sha256-PCtvDd/1eAbo1aHUPMu0XHNHMwBTbjZmdSNrY2PmxQc="; + hash = "sha256-2rwy7tfTKaUmPJv59WMVGAOUP+vGWquJbF/3BbS3kkA="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/reconplogger/default.nix b/pkgs/development/python-modules/reconplogger/default.nix index 6b1800c7052b..0881bc5c3c05 100644 --- a/pkgs/development/python-modules/reconplogger/default.nix +++ b/pkgs/development/python-modules/reconplogger/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ flask requests diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index 3be853d2fc5e..0b4776b0f383 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "3.3.0"; + version = "3.3.3"; disabled = pythonOlder "3.8"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; - rev = "v${version}"; - hash = "sha256-1Ggxi61epge6Rxc/vJ7OuuNjjeaQYReEPeOZV8DLghk="; + rev = "refs/tags/v${version}"; + hash = "sha256-gEatTTpRiqtDAn+JtoJuVHPYKmEkc5saw3hy4ZYZfX8="; }; build-system = [ setuptools ]; @@ -47,12 +47,6 @@ buildPythonPackage rec { pygments ]; - disabledTests = lib.optionals (lib.versionOlder icalendar.version "6") [ - # ModuleNotFoundError: No module named 'icalendar.timezone' - "test_can_import_zoneinfo" - "test_documentation_file" - ]; - pythonImportsCheck = [ "recurring_ical_events" ]; meta = { diff --git a/pkgs/development/python-modules/redis-om/default.nix b/pkgs/development/python-modules/redis-om/default.nix index c3f6455c725d..089e3c72ec16 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.2"; + version = "0.3.3"; 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-FN39Db94Z7z3luCDKi8b4Ku7bFwxEOXtBT5aXbDGVtw="; + hash = "sha256-Pp404HaFpYEPie9xknoabotFrqcI2ibDlPTM+MmnMbg="; }; build-system = [ diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index a55e5b293bb4..8ad583fcf7b1 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "redis"; - version = "5.0.6"; + version = "5.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OEc818Y4mtPkSpH0w+r2vLip90YAfym/T7IIJP8LIZc="; + hash = "sha256-9smXUh/tuuUzhzB8XQv3hNmswo2fHQWKvqxWbsTb7XI="; }; propagatedBuildInputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { hiredis = [ hiredis ]; ocsp = [ cryptography diff --git a/pkgs/development/python-modules/referencing/default.nix b/pkgs/development/python-modules/referencing/default.nix index 3e7063e42ecc..89159a4f80c1 100644 --- a/pkgs/development/python-modules/referencing/default.nix +++ b/pkgs/development/python-modules/referencing/default.nix @@ -15,7 +15,7 @@ let self = buildPythonPackage rec { pname = "referencing"; - version = "0.34.0"; + version = "0.35.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ let repo = "referencing"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-Vx+WVgt09I04Z/sIYsLLtPCwuo5wW0Z2o2OTH2V17UY="; + hash = "sha256-Ix0cpdOs7CtersdfW9daF/+BEJaV/na1WRTlYywUJV8="; }; build-system = [ diff --git a/pkgs/development/python-modules/reflex-chakra/default.nix b/pkgs/development/python-modules/reflex-chakra/default.nix index 5e0e34f8923c..866aa775b7f5 100644 --- a/pkgs/development/python-modules/reflex-chakra/default.nix +++ b/pkgs/development/python-modules/reflex-chakra/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "reflex-chakra"; - version = "0.5.10"; + version = "0.6.2"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "reflex-dev"; repo = "reflex-chakra"; rev = "refs/tags/v${version}"; - hash = "sha256-EEU2BdkAJ3jPGMUCfXprUIGTXRbOK+uFtoWmjrBsclY="; + hash = "sha256-VMFCaJh7HA/bsOV1ONuPJCzhzpQrcppOnPIcIIpeaSs="; }; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix index 4477af34fad9..a0b7767fd1bb 100644 --- a/pkgs/development/python-modules/reflex/default.nix +++ b/pkgs/development/python-modules/reflex/default.nix @@ -23,6 +23,7 @@ pydantic, pytest-asyncio, pytest-mock, + playwright, pytestCheckHook, python-engineio, python-multipart, @@ -46,16 +47,16 @@ buildPythonPackage rec { pname = "reflex"; - version = "0.5.10"; + version = "0.6.2.post1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "reflex-dev"; repo = "reflex"; rev = "refs/tags/v${version}"; - hash = "sha256-8nwVB5FthDbhQRO663vRTqT8KPtStbdSgEoZ75EnhmE="; + hash = "sha256-JW1hebcoBMMEirJkJ5Cquh23p9Gv3RU5AxPbXUcwPK4="; }; pythonRelaxDeps = [ @@ -106,6 +107,7 @@ buildPythonPackage rec { pytestCheckHook pytest-asyncio pytest-mock + playwright attrs numpy plotly @@ -114,11 +116,16 @@ buildPythonPackage rec { unzip ]; + preCheck = '' + export HOME="$(mktemp -d)" + ''; + disabledTests = [ - # Tests touche network + # Tests touch network "test_find_and_check_urls" "test_event_actions" "test_upload_file" + "test_node_version" # /proc is too funky in nix sandbox "test_get_cpu_info" # broken @@ -130,7 +137,7 @@ buildPythonPackage rec { disabledTestPaths = [ "benchmarks/" - "integration/" + "tests/integration/" ]; pythonImportsCheck = [ "reflex" ]; @@ -138,7 +145,7 @@ buildPythonPackage rec { meta = with lib; { description = "Web apps in pure Python"; homepage = "https://github.com/reflex-dev/reflex"; - changelog = "https://github.com/reflex-dev/reflex/releases/tag/${src.rev}"; + changelog = "https://github.com/reflex-dev/reflex/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ pbsds ]; mainProgram = "reflex"; diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 4434ff860134..bc1a60eea098 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "regex"; - version = "2024.5.15"; + version = "2024.9.11"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-0+4C2eX0gsyDCRNKke6qy90iYboRGw/vN0jutJE+aiw="; + hash = "sha256-bBiMMH6EM7y2PcGRUCLetVO0IDpwci/FQsNjvxIKAf0="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index 95bdca651be5..f1877c11e12e 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -3,7 +3,7 @@ fetchPypi, buildPythonPackage, sphinx, - pytest-cov, + pytest-cov-stub, pytest, mako, numpy, @@ -16,17 +16,17 @@ buildPythonPackage rec { pname = "reikna"; - version = "0.8.0"; + version = "0.9.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-fpa1Pfo5EAafg7Pgha17G6k5G13fdErjclv0On/uYyI="; + hash = "sha256-uzIoGCkIINgmO+r0vAzmihS14GWv5ygakMz3tKIG3zA="; }; nativeCheckInputs = [ sphinx - pytest-cov + pytest-cov-stub pytest ]; diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 458633c1a36a..1a45c719e061 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { lxml ]; - passthru.optional-dependencies = { + optional-dependencies = { chart = [ # pycha pyyaml @@ -36,7 +36,7 @@ buildPythonPackage rec { fodt = [ python-magic ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.fodt; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.fodt; pythonImportsCheck = [ "relatorio" ]; diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix index dedab0bbc95e..6f978a397a3a 100644 --- a/pkgs/development/python-modules/remarshal/default.nix +++ b/pkgs/development/python-modules/remarshal/default.nix @@ -8,8 +8,11 @@ # propagates cbor2, + colorama, python-dateutil, pyyaml, + rich-argparse, + ruamel-yaml, tomlkit, u-msgpack-python, @@ -19,26 +22,25 @@ buildPythonPackage rec { pname = "remarshal"; - version = "0.17.1"; - format = "pyproject"; + version = "0.20.0"; + pyproject = true; src = fetchFromGitHub { owner = "dbohdan"; - repo = pname; + repo = "remarshal"; rev = "refs/tags/v${version}"; - hash = "sha256-2WxMh5P/8NvElymnMU3JzQU0P4DMXFF6j15OxLaS+VA="; + hash = "sha256-Fy+K0fM+vjZp8u7C0ElFa1xQM/CIMqFALe42gZRBNOs="; }; - nativeBuildInputs = [ - poetry-core - ]; - - pythonRelaxDeps = [ "pytest" ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ cbor2 + colorama python-dateutil pyyaml + rich-argparse + ruamel-yaml tomlkit u-msgpack-python ]; diff --git a/pkgs/development/python-modules/remctl/default.nix b/pkgs/development/python-modules/remctl/default.nix new file mode 100644 index 000000000000..3e672e9e56d2 --- /dev/null +++ b/pkgs/development/python-modules/remctl/default.nix @@ -0,0 +1,21 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + remctl-c, # remctl from pkgs, not from pythonPackages + typing, +}: + +buildPythonPackage { + inherit (remctl-c) + meta + pname + src + version + ; + setSourceRoot = "sourceRoot=$(echo */python)"; + + buildInputs = [ remctl-c ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.5") [ typing ]; +} diff --git a/pkgs/development/python-modules/renson-endura-delta/default.nix b/pkgs/development/python-modules/renson-endura-delta/default.nix index 03914c36dba2..0e1a5d7fb9e6 100644 --- a/pkgs/development/python-modules/renson-endura-delta/default.nix +++ b/pkgs/development/python-modules/renson-endura-delta/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "'pytest-runner'" "" + --replace-fail "'pytest-runner'" "" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index fd4d306c1c82..e2bce0c56d9c 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -5,6 +5,7 @@ buildPythonPackage, fetchFromGitHub, orjson, + pycryptodomex, pythonOlder, setuptools, typing-extensions, @@ -12,16 +13,16 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.9.10"; + version = "0.11.0b1"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-wN2rWoRuxP5uLl2TkSnxlEwl29z6C8dDo9UkJ7amExo="; + hash = "sha256-kLrdhwIUdmZh08I7XOHT2ciiVn8JE9lcfVcMJf05bkk="; }; build-system = [ setuptools ]; @@ -30,6 +31,7 @@ buildPythonPackage rec { aiohttp aiortsp orjson + pycryptodomex typing-extensions ]; diff --git a/pkgs/development/python-modules/replicate/default.nix b/pkgs/development/python-modules/replicate/default.nix new file mode 100644 index 000000000000..f2b6f3d00b4c --- /dev/null +++ b/pkgs/development/python-modules/replicate/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + httpx, + packaging, + pydantic, + typing-extensions, + pytestCheckHook, + pytest-asyncio, + pytest-recording, + respx, +}: + +buildPythonPackage rec { + pname = "replicate"; + version = "1.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "replicate"; + repo = "replicate-python"; + rev = "refs/tags/${version}"; + hash = "sha256-q//RV4Y9k2KXXgZGfBF/XObxsBfAHE50oG+r/Vvu9BY="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + httpx + packaging + pydantic + typing-extensions + ]; + + pythonImportsCheck = [ "replicate" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + pytest-recording + respx + ]; + + meta = { + description = "Python client for Replicate"; + homepage = "https://replicate.com/"; + changelog = "https://github.com/replicate/replicate-python/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jokatzke ]; + }; +} diff --git a/pkgs/development/python-modules/repocheck/default.nix b/pkgs/development/python-modules/repocheck/default.nix deleted file mode 100644 index d5df17ae89fd..000000000000 --- a/pkgs/development/python-modules/repocheck/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, -}: - -buildPythonPackage rec { - pname = "repocheck"; - version = "2015-08-05"; - format = "setuptools"; - - src = fetchFromGitHub { - sha256 = "1jc4v5zy7z7xlfmbfzvyzkyz893f5x2k6kvb3ni3rn2df7jqhc81"; - rev = "ee48d0e88d3f5814d24a8d1f22d5d83732824688"; - repo = "repocheck"; - owner = "kynikos"; - }; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Check the status of code repositories under a root directory"; - mainProgram = "repocheck"; - license = licenses.gpl3Plus; - }; -} diff --git a/pkgs/development/python-modules/reportlab-qrcode/default.nix b/pkgs/development/python-modules/reportlab-qrcode/default.nix index b540fd219caf..67d69ef8cf0f 100644 --- a/pkgs/development/python-modules/reportlab-qrcode/default.nix +++ b/pkgs/development/python-modules/reportlab-qrcode/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { reportlab ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ pillow pytest diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 186b02c60375..4a1991adefdf 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.2"; + version = "4.2.4"; pyproject = true; # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-dl7svdaEkcVpR+KcOLi2m4NO5du90vt0CfCOvevwRCg="; + hash = "sha256-oAtXKS4VanvahO3zHWDCVXgVMHbI+5YzHQxZ7d2gUsg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/reprint/default.nix b/pkgs/development/python-modules/reprint/default.nix new file mode 100644 index 000000000000..5981e3abb4b2 --- /dev/null +++ b/pkgs/development/python-modules/reprint/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + colorama, + six, +}: + +buildPythonPackage rec { + pname = "reprint"; + version = "0.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Yinzo"; + repo = "reprint"; + rev = "${version}"; + hash = "sha256-99FC12LcvvRRwNAxDSvWo9vRYmieL0JHSaCJqO/UGEs="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "'backports.shutil_get_terminal_size', " "" + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + colorama + six + ]; + + pythonImportsCheck = [ + "reprint" + ]; + + meta = { + description = "Module for binding variables and refreshing multi-line output in terminal"; + homepage = "https://github.com/Yinzo/reprint"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + jasonodoom + jleightcap + ]; + }; +} diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index 09a1c303c520..aad655cc13e7 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -69,14 +69,14 @@ buildPythonPackage rec { xmltodict ]; - passthru.optional-dependencies = { + optional-dependencies = { ghostwriter = [ gql ] ++ gql.optional-dependencies.aiohttp; translate = [ deepl ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index 3df15dd5ca4e..aa8b918ca8c1 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { url-normalize ]; - passthru.optional-dependencies = { + optional-dependencies = { dynamodb = [ boto3 botocore @@ -79,7 +79,7 @@ buildPythonPackage rec { tenacity time-machine timeout-decorator - ] ++ passthru.optional-dependencies.json ++ passthru.optional-dependencies.security; + ] ++ optional-dependencies.json ++ optional-dependencies.security; preCheck = '' export HOME=$(mktemp -d); diff --git a/pkgs/development/python-modules/requests-credssp/default.nix b/pkgs/development/python-modules/requests-credssp/default.nix index f6be7b9908f2..428b4ac18777 100644 --- a/pkgs/development/python-modules/requests-credssp/default.nix +++ b/pkgs/development/python-modules/requests-credssp/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { kerberos = pyspnego.optional-dependencies.kerberos; }; diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix index ffa706fcd58b..70a5eebacdb5 100644 --- a/pkgs/development/python-modules/requests-kerberos/default.nix +++ b/pkgs/development/python-modules/requests-kerberos/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pyspnego ] # Avoid broken Python krb5 package on Darwin - ++ lib.optionals (!stdenv.isDarwin) pyspnego.optional-dependencies.kerberos; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) pyspnego.optional-dependencies.kerberos; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/requests-unixsocket2/default.nix b/pkgs/development/python-modules/requests-unixsocket2/default.nix new file mode 100644 index 000000000000..83de0579a020 --- /dev/null +++ b/pkgs/development/python-modules/requests-unixsocket2/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + pbr, + + requests, + poetry-core, + + pytestCheckHook, + waitress, +}: + +buildPythonPackage rec { + pname = "requests-unixsocket2"; + version = "0.4.2"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "requests_unixsocket2"; + hash = "sha256-kpxY7MWYHz0SdmHOueyMduDwjTHFLkSrFGKsDc1VtfU="; + }; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ + requests + poetry-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + waitress + ]; + + pythonImportsCheck = [ "requests_unixsocket" ]; + + meta = with lib; { + description = "Use requests to talk HTTP via a UNIX domain socket"; + homepage = "https://gitlab.com/thelabnyc/requests-unixsocket2"; + license = licenses.bsd0; + maintainers = with maintainers; [ mikut ]; + }; +} diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index c8ec3c490ecf..6ffe869c0a6a 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -72,13 +72,13 @@ buildPythonPackage rec { "TestRequests" "TestTimeout" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Fatal Python error: Aborted "test_basic_response" "test_text_response" ]; - disabledTestPaths = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Fatal Python error: Aborted "tests/test_lowlevel.py" ]; diff --git a/pkgs/development/python-modules/rerun-sdk/default.nix b/pkgs/development/python-modules/rerun-sdk/default.nix index add95c23c9a1..13b7226782ba 100644 --- a/pkgs/development/python-modules/rerun-sdk/default.nix +++ b/pkgs/development/python-modules/rerun-sdk/default.nix @@ -75,7 +75,7 @@ buildPythonPackage { ]; inherit (rerun) addDlopenRunpaths addDlopenRunpathsPhase; - postPhases = lib.optionals stdenv.isLinux [ "addDlopenRunpathsPhase" ]; + postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "addDlopenRunpathsPhase" ]; disabledTestPaths = [ # "fixture 'benchmark' not found" diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 615234474a6a..c5b24010d3de 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, pytest-asyncio, pytest-httpserver, pytestCheckHook, @@ -19,7 +18,7 @@ buildPythonPackage rec { pname = "responses"; - version = "0.25.0"; + version = "0.25.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,17 +29,9 @@ buildPythonPackage rec { owner = "getsentry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FHtuZ6NUmCveAJOXEajfTLRMR8W1Jz/pjFKdE6PHW2g="; + hash = "sha256-+iRrmRAe8RWcts2LMFvykroQ5sL7+hW6Wrs7Kd1mzBM="; }; - patches = [ - (fetchpatch2 { - # adds missing pytest asyncio markers - url = "https://github.com/getsentry/responses/commit/d5e7402f1782692d04742562370abaca8d54a972.patch"; - hash = "sha256-A/DYSKvuangolkcQX4k/uom//AQ9in7BsTmVtlCqmXQ="; - }) - ]; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index daba92a14a6c..7455eb58eeb3 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -11,17 +11,21 @@ buildPythonPackage rec { pname = "restrictedpython"; - version = "7.2"; + version = "7.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "RestrictedPython"; - inherit version; - hash = "sha256-TR0w9wmmYhynxCNvCLZ7cyplHICZFF8TcHjH3UvtPSE="; + inherit pname version; + hash = "sha256-gbYpJHE9vSgJF/zq7K8hD+96Sd3fGgjIwhSjYT++tCU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools<74" setuptools + ''; + build-system = [ setuptools ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/retinaface/default.nix b/pkgs/development/python-modules/retinaface/default.nix new file mode 100644 index 000000000000..f727d3f31158 --- /dev/null +++ b/pkgs/development/python-modules/retinaface/default.nix @@ -0,0 +1,64 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + gdown, + numpy, + opencv4, + pillow, + pytestCheckHook, + pythonOlder, + setuptools, + tensorflow, +}: + +buildPythonPackage rec { + pname = "retinaface"; + version = "0.0.17"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "serengil"; + repo = "retinaface"; + rev = "refs/tags/v${version}"; + hash = "sha256-0s1CSGlK2bF1F2V/IuG2ZqD7CkNfHGvp1M5C3zDnuKs="; + }; + + postPatch = '' + # prevent collisions + substituteInPlace setup.py \ + --replace-fail "data_files=[(\"\", [\"README.md\", \"requirements.txt\", \"package_info.json\"])]," "" \ + --replace-fail "install_requires=requirements," "" + ''; + + # requires internet connection + disabledTestPaths = [ + "tests/test_actions.py" + "tests/test_align_first.py" + "tests/test_expand_face_area.py" + ]; + + build-system = [ setuptools ]; + + dependencies = [ + gdown + numpy + opencv4 + pillow + tensorflow + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "retinaface" ]; + + meta = { + description = "Deep Face Detection Library for Python"; + homepage = "https://github.com/serengil/retinaface"; + changelog = "https://github.com/serengil/retinaface/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ derdennisop ]; + }; +} diff --git a/pkgs/development/python-modules/retry2/default.nix b/pkgs/development/python-modules/retry2/default.nix new file mode 100644 index 000000000000..f0724f472a3c --- /dev/null +++ b/pkgs/development/python-modules/retry2/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + decorator, + fetchFromGitHub, + pbr, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "retry2"; + version = "0.9.5"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "eSAMTrade"; + repo = "retry"; + rev = "refs/tags/${version}"; + hash = "sha256-RxOEekkmMRl2OQW2scFWbMQiFXcH0sbd+k9R8uul0uY="; + }; + + env.PBR_VERSION = version; + + build-system = [ pbr ]; + + dependencies = [ decorator ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "retry" ]; + + meta = { + description = "Retry decorator"; + homepage = "https://github.com/eSAMTrade/retry"; + changelog = "https://github.com/eSAMTrade/retry/blob/${src.rev}/ChangeLog"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/rfc8785/default.nix b/pkgs/development/python-modules/rfc8785/default.nix index c3505ebc460e..e4eb48964d08 100644 --- a/pkgs/development/python-modules/rfc8785/default.nix +++ b/pkgs/development/python-modules/rfc8785/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "rfc8785"; - version = "0.1.3"; + version = "0.1.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "trailofbits"; repo = "rfc8785.py"; rev = "refs/tags/v${version}"; - hash = "sha256-hMH//DpxgNoNLZJ8XL8SikcTfj0w0FvlBMfnPCkqzZ4="; + hash = "sha256-0Gze3voFXEhf13DuTuBWDbYPmqHXs0FSRn2NprFWoB8="; }; build-system = [ diff --git a/pkgs/development/python-modules/rich-argparse/default.nix b/pkgs/development/python-modules/rich-argparse/default.nix index 8edcfa9fbd95..061394e5fc3f 100644 --- a/pkgs/development/python-modules/rich-argparse/default.nix +++ b/pkgs/development/python-modules/rich-argparse/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rich-argparse"; - version = "1.5.2"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "hamdanal"; repo = "rich-argparse"; rev = "refs/tags/v${version}"; - hash = "sha256-kHGNjVx3d+JSsN/BpNua2rGD5S5sBfJvh1NyqQnziBI="; + hash = "sha256-ae++npgZ8jZazwARwlPw73uhpQ8IT+7OekNl2vfu4Z0="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index e32427b7b1e4..34913e526d78 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -19,6 +19,7 @@ attrs, pytestCheckHook, setuptools, + which, # for passthru.tests enrich, @@ -29,7 +30,7 @@ buildPythonPackage rec { pname = "rich"; - version = "13.7.1"; + version = "13.8.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -38,7 +39,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7LvmPrCpHfPEfJ1r8IFnQhYkBstvtIrWYhGwcchlc0s="; + hash = "sha256-k+a64GDGzRDprvJz7s9Sm4z8jDV5TZ+CZLMgXKXXonM="; }; nativeBuildInputs = [ poetry-core ]; @@ -48,7 +49,7 @@ buildPythonPackage rec { pygments ] ++ lib.optionals (pythonOlder "3.9") [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { jupyter = [ ipywidgets ]; }; @@ -56,6 +57,7 @@ buildPythonPackage rec { attrs pytestCheckHook setuptools + which ]; disabledTests = [ diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix index 4bfbc9d1e54a..5d90f66de655 100644 --- a/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/pkgs/development/python-modules/ring-doorbell/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "ring-doorbell"; - version = "0.9.5"; + version = "0.9.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ring_doorbell"; inherit version; - hash = "sha256-NnKcUr0SExXRDkNCIGU3LtwU1LIMAZzurn2Aoua1lzA="; + hash = "sha256-BxddSIADkXNbsAohWtAv93x685vCTj9FyKfwSUemY+I="; }; pythonRelaxDeps = [ "requests-oauthlib" ]; @@ -42,16 +42,13 @@ buildPythonPackage rec { aiofiles aiohttp asyncclick + firebase-messaging oauthlib pytz typing-extensions websockets ]; - optional-dependencies = { - listen = [ firebase-messaging ]; - }; - nativeCheckInputs = [ aioresponses freezegun diff --git a/pkgs/development/python-modules/rio-tiler/default.nix b/pkgs/development/python-modules/rio-tiler/default.nix index 88e126d4d5cc..99c7f3d12df8 100644 --- a/pkgs/development/python-modules/rio-tiler/default.nix +++ b/pkgs/development/python-modules/rio-tiler/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "rio-tiler"; - version = "6.7.0"; + version = "7.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "cogeotiff"; repo = "rio-tiler"; rev = "refs/tags/${version}"; - hash = "sha256-i70Bh7RHPgLLaqBo9vHRrJylsNE3Ly3xJq9j12Ch58E="; + hash = "sha256-E8gKXPj1n9HZ+zvQPcG28+2Vuif4B6NBhtuS009x6rU="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/rioxarray/default.nix b/pkgs/development/python-modules/rioxarray/default.nix index 10a6c15d3cf1..0f8111f089ac 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.17.0"; + version = "0.18.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "corteva"; repo = "rioxarray"; rev = "refs/tags/${version}"; - hash = "sha256-mOXyfkreQ55vWmPCG2U/ijcKZqzHoQQLfKArSh2fDmA="; + hash = "sha256-0YsGu8JuYrb6lWuC3RQ4jCkulxxFpnd0eaRajCwtFHo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix b/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix index 93a6308099c8..8507883ff81e 100644 --- a/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix +++ b/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix @@ -5,37 +5,37 @@ jsonschema, pytestCheckHook, python-dateutil, - python-socketio, pythonOlder, requests, + setuptools, + typing-extensions, websocket-client, }: buildPythonPackage rec { pname = "ripe-atlas-cousteau"; version = "2.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "RIPE-NCC"; - repo = pname; + repo = "ripe-atlas-cousteau"; rev = "refs/tags/v${version}"; hash = "sha256-z8ZXOiCVYughrbmXfnwtks7NPmYpII2BA0+8mr1cdSQ="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "websocket-client~=1.3.1" "websocket-client" - ''; + pythonRelaxDeps = [ "websocket-client" ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ python-dateutil requests - python-socketio + typing-extensions websocket-client - ] ++ python-socketio.optional-dependencies.client; + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix index c6d36a7b8849..014f651e18c3 100644 --- a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix +++ b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pytz ]; - passthru.optional-dependencies = { + optional-dependencies = { fast = [ ujson ]; }; diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix index 318282f763a0..d67de41c6d75 100644 --- a/pkgs/development/python-modules/ripser/default.nix +++ b/pkgs/development/python-modules/ripser/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "ripser"; - version = "0.6.8"; + version = "0.6.10"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-J5ctOvGtmg/e2ls7fN59LR4AbHedC9gKk6f8jIDIoFI="; + hash = "sha256-3Mr6+XrSOVvGbLN25fvg9vJkNyspj9CT5BBxMsH3lIQ="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/rising/default.nix b/pkgs/development/python-modules/rising/default.nix index 0e876aecbb05..49b38e2e3426 100644 --- a/pkgs/development/python-modules/rising/default.nix +++ b/pkgs/development/python-modules/rising/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly: "test_progressive_resize_integration" ]; diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index ccf537e9a20e..9373a7d4acdc 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.7.8"; + version = "0.8.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-2UXkfijLeMOpyurR1Bz0dbQxKO7efRp3UcqXIUWRjs0="; + hash = "sha256-3Eif3AVpjNH803XXkPGQ5ZgSpVwV1W4DDm9rYBj6AEo="; }; patches = [ @@ -49,6 +49,9 @@ buildPythonPackage rec { homepage = "https://github.com/markqvist/Reticulum"; changelog = "https://github.com/markqvist/Reticulum/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ + fab + qbit + ]; }; } diff --git a/pkgs/development/python-modules/roadlib/default.nix b/pkgs/development/python-modules/roadlib/default.nix index eaaf3eff9faf..9d45400b7dc7 100644 --- a/pkgs/development/python-modules/roadlib/default.nix +++ b/pkgs/development/python-modules/roadlib/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "roadlib"; - version = "0.26.0"; + version = "0.27.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qh+xVBqQ/bkXl7Xa6w+SIkQRwIUW5ut4yosGko+8xrY="; + hash = "sha256-k2ePgxWLbDGjMNfA/cQabSx98FRVrsdV9WANXuIGD+E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/roadrecon/default.nix b/pkgs/development/python-modules/roadrecon/default.nix index 87db63bab3a8..688d1902fc2c 100644 --- a/pkgs/development/python-modules/roadrecon/default.nix +++ b/pkgs/development/python-modules/roadrecon/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "roadrecon"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OEftVwU30tLP091Z5CIl67hkjjcqY+Qo04/wHZlbuFc="; + hash = "sha256-hDIMDNmvGQAcpPMet31MbuJtOU2JCrbLlpAu19skNVg="; }; pythonRelaxDeps = [ "flask" ]; diff --git a/pkgs/development/python-modules/roadtx/default.nix b/pkgs/development/python-modules/roadtx/default.nix index d390acea281d..c1e2803a6dc7 100644 --- a/pkgs/development/python-modules/roadtx/default.nix +++ b/pkgs/development/python-modules/roadtx/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "roadtx"; - version = "1.8.2"; + version = "1.10.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BJYBQBxgYbozY0rPgxpiduUxb6wEFBJxXY8TRVlLz5M="; + hash = "sha256-TtmpqNlDRsjGPhWPhqDw/ApvR9lK6cSlu/HGntgZ68A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index ddc6071451c5..a20d602ebbd2 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "robotframework"; - version = "7.1"; + version = "7.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "robotframework"; rev = "refs/tags/v${version}"; - hash = "sha256-nzkgJdSWbFcAnAqRTq4+Wy1lqdz+Xxf2i4RKnj/A5SA="; + hash = "sha256-AJMJb8FN+KynxJXI7s7PwyM/+UpXCtWTcRK/fhCg+io="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/rocketchat-api/default.nix b/pkgs/development/python-modules/rocketchat-api/default.nix index 4593f30b8db2..b5b527b2b402 100644 --- a/pkgs/development/python-modules/rocketchat-api/default.nix +++ b/pkgs/development/python-modules/rocketchat-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "rocketchat-api"; - version = "1.32.0"; + version = "1.33.0"; pyproject = true; src = fetchFromGitHub { owner = "jadolg"; repo = "rocketchat_API"; rev = "refs/tags/${version}"; - hash = "sha256-mzcesoBU8sOznAgvi2u8NsUheyLXPZuyIkGghbc556c="; + hash = "sha256-t1t0uksmdPTrksDF0K3/f3KxAv0fX2W8wDIIcWAPEVs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ropgadget/default.nix b/pkgs/development/python-modules/ropgadget/default.nix index 53908cb4db73..eba60378a796 100644 --- a/pkgs/development/python-modules/ropgadget/default.nix +++ b/pkgs/development/python-modules/ropgadget/default.nix @@ -2,14 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, capstone, pythonOlder, }: buildPythonPackage rec { pname = "ropgadget"; - version = "7.4"; - format = "setuptools"; + version = "7.5"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,10 +18,12 @@ buildPythonPackage rec { owner = "JonathanSalwan"; repo = "ROPgadget"; rev = "refs/tags/v${version}"; - hash = "sha256-6m8opcTM4vrK+VCPXxNhZttUq6YmS8swLUDhjyfinWE="; + hash = "sha256-n7nVtR2HMAZeeSX/hNtDzmpEsnHbgDNO5gdzmPrgSuk="; }; - propagatedBuildInputs = [ capstone ]; + build-system = [ setuptools ]; + + dependencies = [ capstone ]; # Test suite is working with binaries doCheck = false; diff --git a/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/pkgs/development/python-modules/rotary-embedding-torch/default.nix index 3f314290871d..6dcbe3c0e897 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.8.3"; + version = "0.8.4"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "rotary-embedding-torch"; rev = "refs/tags/${version}"; - hash = "sha256-oxlWx3cB+gsFwSre+e8e792Y012zOzhUrO0wxEwzrgI="; + hash = "sha256-VHaCpoASy+pYmfx5X7hrH7hMnP0OTxD/5EPPZy7POaA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rouge-score/default.nix b/pkgs/development/python-modules/rouge-score/default.nix index adc543b1d907..59d05016720c 100644 --- a/pkgs/development/python-modules/rouge-score/default.nix +++ b/pkgs/development/python-modules/rouge-score/default.nix @@ -52,8 +52,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - doCheck = true; - disabledTests = [ # https://github.com/google-research/google-research/issues/1203 "testRougeLSumSentenceSplitting" diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index 1fd58cb565fe..582e35508502 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -87,7 +87,7 @@ buildPythonPackage rec { simplegeneric ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # https://github.com/rpy2/rpy2/issues/1111 disabledTests = [ diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index a9873de90632..4035fd5e9e1c 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "rpyc"; - version = "6.0.0"; + version = "6.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tomerfiliba"; repo = "rpyc"; rev = "refs/tags/${version}"; - hash = "sha256-BvXEXZlVbOmKBwnSBCDksUkbT7JPcMX48KZe/Gd5Y8Q="; + hash = "sha256-ZYGOwg2IJtVVxHV2hC3inliTLP4BBFOnOz7VPhRpcgg="; }; build-system = [ hatchling ]; @@ -59,7 +59,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "rpyc" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Remote Python Call (RPyC), a transparent and symmetric RPC library"; diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index a403db708681..206f9192d92a 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Disabled until https://github.com/rstcheck/rstcheck-core/issues/19 is resolved. "test_error_without_config_file_macos" "test_file_1_is_bad_without_config_macos" diff --git a/pkgs/development/python-modules/rstr/default.nix b/pkgs/development/python-modules/rstr/default.nix index 7bf0eb244fb9..cf2a5ef42212 100644 --- a/pkgs/development/python-modules/rstr/default.nix +++ b/pkgs/development/python-modules/rstr/default.nix @@ -23,7 +23,6 @@ buildPythonPackage rec { setuptools-scm ]; - doCheck = true; nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/rtfde/default.nix b/pkgs/development/python-modules/rtfde/default.nix index d436f19a45eb..6c8be8f8f5b7 100644 --- a/pkgs/development/python-modules/rtfde/default.nix +++ b/pkgs/development/python-modules/rtfde/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { build-system = [ setuptools ]; + pythonRelaxDeps = [ "lark" ]; + dependencies = [ lark oletools @@ -39,15 +41,15 @@ buildPythonPackage rec { pythonImportsCheck = [ "RTFDE" ]; disabledTests = [ - # Content mismatch - "test_bin_data_captured" + # Malformed encapsulated RTF discovered + "test_encoded_bytes_stay_encoded_character" ]; - meta = with lib; { + meta = { + changelog = "https://github.com/seamustuohy/RTFDE/releases/tag/${version}"; description = "Library for extracting encapsulated HTML and plain text content from the RTF bodies"; homepage = "https://github.com/seamustuohy/RTFDE"; - changelog = "https://github.com/seamustuohy/RTFDE/releases/tag/${version}"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/rtmidi-python/default.nix b/pkgs/development/python-modules/rtmidi-python/default.nix index 6d8bf78b6d3c..cdb87a0c8657 100644 --- a/pkgs/development/python-modules/rtmidi-python/default.nix +++ b/pkgs/development/python-modules/rtmidi-python/default.nix @@ -26,8 +26,8 @@ buildPythonPackage rec { nativeBuildInputs = [ cython_0 ]; buildInputs = - lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio CoreMIDI CoreServices diff --git a/pkgs/development/python-modules/rtmixer/default.nix b/pkgs/development/python-modules/rtmixer/default.nix index 994cd103c18f..a93caf9aab83 100644 --- a/pkgs/development/python-modules/rtmixer/default.nix +++ b/pkgs/development/python-modules/rtmixer/default.nix @@ -2,6 +2,7 @@ fetchFromGitHub, buildPythonPackage, isPy27, + setuptools, cython, portaudio, cffi, @@ -12,22 +13,28 @@ buildPythonPackage rec { pname = "rtmixer"; - version = "0.1.4"; - format = "setuptools"; + version = "0.1.7"; + pyproject = true; disabled = isPy27; src = fetchFromGitHub { owner = "spatialaudio"; repo = "python-rtmixer"; rev = "refs/tags/${version}"; - hash = "sha256-S8aVfxoG0o5GarDX5ZIDQ3GKOT32NtttQJ449FI9Fy0="; + hash = "sha256-K5w6XWnDdA5HrzDOMhqinlxrg/09AF6c5CWZEsfVHb4="; fetchSubmodules = true; }; + build-system = [ setuptools ]; + buildInputs = [ portaudio ]; - nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ + cython + cffi + ]; + + dependencies = [ cffi pa-ringbuffer sounddevice diff --git a/pkgs/development/python-modules/ruff-api/Cargo.lock b/pkgs/development/python-modules/ruff-api/Cargo.lock index e6be1c5b10f6..e6aabc596990 100644 --- a/pkgs/development/python-modules/ruff-api/Cargo.lock +++ b/pkgs/development/python-modules/ruff-api/Cargo.lock @@ -1548,7 +1548,7 @@ dependencies = [ [[package]] name = "ruff-api" -version = "0.0.8" +version = "0.1.0" dependencies = [ "glob", "pyo3", diff --git a/pkgs/development/python-modules/ruff-api/default.nix b/pkgs/development/python-modules/ruff-api/default.nix index 13bcdefa3496..eb4e1234a57b 100644 --- a/pkgs/development/python-modules/ruff-api/default.nix +++ b/pkgs/development/python-modules/ruff-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "ruff-api"; - version = "0.0.8"; + version = "0.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "amyreese"; repo = "ruff-api"; rev = "refs/tags/v${version}"; - hash = "sha256-BW/qXq4HemqxhvjIKrrn07eqGJwAbYei7e+I+oHxujU="; + hash = "sha256-1XULyxu3XujhAcFnvqI5zMiXOc0axx1LS4EevjhoGDc="; }; cargoDeps = rustPlatform.importCargoLock { @@ -40,7 +40,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices libiconv diff --git a/pkgs/development/python-modules/ruffus/default.nix b/pkgs/development/python-modules/ruffus/default.nix index 44a1b8939795..f7c96b10d3e1 100644 --- a/pkgs/development/python-modules/ruffus/default.nix +++ b/pkgs/development/python-modules/ruffus/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; # tests very flaky & hang often on darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # test files do indeed need to be executed separately checkPhase = '' pushd ruffus/test diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix index b0be3a51573c..d2ee15fa36b1 100644 --- a/pkgs/development/python-modules/rustworkx/default.nix +++ b/pkgs/development/python-modules/rustworkx/default.nix @@ -4,6 +4,7 @@ cargo, rustPlatform, rustc, + setuptools, setuptools-rust, numpy, fixtures, @@ -12,40 +13,50 @@ libiconv, stdenv, lib, + pytestCheckHook, }: buildPythonPackage rec { pname = "rustworkx"; - version = "0.14.2"; - format = "setuptools"; + version = "0.15.1"; + pyproject = true; src = fetchFromGitHub { owner = "Qiskit"; - repo = pname; + repo = "rustworkx"; rev = version; - hash = "sha256-gck5X6J4Yg5it/YCBsk/yZ5qXg/iwCEbyDIKfBTRxHM="; + hash = "sha256-0WYgShihTBM0e+MIhON0dnhZug6l280tZcVp3KF1Jq0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-FNCa5pshcnsYpjlz6yDITe2k0cHLTybj3rF34qrsRVU="; + hash = "sha256-AgHfCKLna30WERAFGEs8yRxxZHwvLzR+/S+ivwKHXXE="; }; nativeBuildInputs = [ - setuptools-rust rustPlatform.cargoSetupHook cargo rustc ]; - buildInputs = [ numpy ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + build-system = [ + setuptools + setuptools-rust + ]; - checkInputs = [ + buildInputs = [ numpy ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + + nativeCheckInputs = [ fixtures networkx + pytestCheckHook testtools ]; + preCheck = '' + rm -r rustworkx + ''; + pythonImportsCheck = [ "rustworkx" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/rzpipe/default.nix b/pkgs/development/python-modules/rzpipe/default.nix index 76a29b256f1c..3238a062980c 100644 --- a/pkgs/development/python-modules/rzpipe/default.nix +++ b/pkgs/development/python-modules/rzpipe/default.nix @@ -3,20 +3,23 @@ buildPythonPackage, fetchPypi, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "rzpipe"; version = "0.6.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; hash = "sha256-py4oiNp+WUcOGHn2AdHyIpgV8BsI8A1gtJi2joi1Wxc="; }; + build-system = [ setuptools ]; + # No native rz_core library doCheck = false; diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index bd53e3b3ef2b..7035c15615e7 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.1"; + version = "2024.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bCEG1sNPv7uI49IMbzVyiW1e49NRKJZpYwHCGjxUG+o="; + hash = "sha256-ZJNwWrtQN01reZT5YW0nrb3YohnIY1EAvcKGOC79kfU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index e138d2193a5c..3ac85beed894 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -38,11 +38,11 @@ buildPythonPackage rec { # There was a change in python 3.8 that defaults multiprocessing to spawn instead of fork on macOS # See https://bugs.python.org/issue33725 and https://github.com/python/cpython/pull/13603. # I suspect the underlying issue here is that upstream tests aren't compatible with spawn multiprocessing, and pass on linux where the default is still fork - lib.optionals stdenv.isDarwin [ "tests/unit/test_compat.py" ]; + lib.optionals stdenv.hostPlatform.isDarwin [ "tests/unit/test_compat.py" ]; pythonImportsCheck = [ "s3transfer" ]; - passthru.optional-dependencies = { + optional-dependencies = { crt = [ botocore.optional-dependencies.crt ]; }; diff --git a/pkgs/development/python-modules/safetensors/default.nix b/pkgs/development/python-modules/safetensors/default.nix index 7228a840d668..584cc1e7d6af 100644 --- a/pkgs/development/python-modules/safetensors/default.nix +++ b/pkgs/development/python-modules/safetensors/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { setuptools-rust ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeCheckInputs = [ h5py @@ -64,7 +64,7 @@ buildPythonPackage rec { "tests/test_paddle_comparison.py" "tests/test_tf_comparison.py" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # don't require mlx (not in Nixpkgs) to run tests "tests/test_mlx_comparison.py" ]; diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index 8bef717dabf5..911ddc0d8936 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "safety"; - version = "3.2.7"; + version = "3.2.9"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "pyupio"; repo = "safety"; rev = "refs/tags/${version}"; - hash = "sha256-JWbiw9qgfDo0UMAcqIhk1Y5tW0aSaZtbVdpdaY2z+3w="; + hash = "sha256-etA/S/i87w4ihsqQo5JJjt6hWC7Jt9/q8vhqyo+DTek="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix new file mode 100644 index 000000000000..262f1ff3673f --- /dev/null +++ b/pkgs/development/python-modules/sagemaker-core/default.nix @@ -0,0 +1,82 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + boto3, + importlib-metadata, + jsonschema, + mock, + platformdirs, + pydantic, + pyyaml, + rich, + + # optional-dependencies + black, + pandas, + pylint, + pytest, +}: + +buildPythonPackage rec { + pname = "sagemaker-core"; + version = "1.0.11"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aws"; + repo = "sagemaker-core"; + rev = "refs/tags/v${version}"; + hash = "sha256-6r8roHMJ4s/+mGiPeMVZ9wagdXNJQ3+tUFZ/7T+NQBc="; + }; + + build-system = [ + setuptools + ]; + + pythonRelaxDeps = [ + "importlib-metadata" + "mock" + ]; + + dependencies = [ + boto3 + importlib-metadata + jsonschema + mock + platformdirs + pydantic + pyyaml + rich + ]; + + optional-dependencies = { + codegen = [ + black + pandas + pylint + pytest + ]; + }; + + pythonImportsCheck = [ + "sagemaker_core" + ]; + + # Only a single test which fails with: + # ValueError: Must setup local AWS configuration with a region supported by SageMaker. + doCheck = false; + + meta = { + description = "Python SDK designed to provide an object-oriented interface for interacting with Amazon SageMaker resources"; + homepage = "https://github.com/aws/sagemaker-core"; + changelog = "https://github.com/aws/sagemaker-core/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/sagemaker-mlflow/default.nix b/pkgs/development/python-modules/sagemaker-mlflow/default.nix new file mode 100644 index 000000000000..152ef3b78eb3 --- /dev/null +++ b/pkgs/development/python-modules/sagemaker-mlflow/default.nix @@ -0,0 +1,74 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + boto3, + mlflow, + + # tests + pytestCheckHook, + scikit-learn, +}: + +buildPythonPackage rec { + pname = "sagemaker-mlflow"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aws"; + repo = "sagemaker-mlflow"; + rev = "refs/tags/v${version}"; + hash = "sha256-1bonIqZ+cFxCOxoFWn1MLBOIiB1wUX69/lUTPPupJaw="; + }; + + postPatch = '' + substituteInPlace VERSION \ + --replace-fail "${version}.dev0" "${version}" + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + boto3 + mlflow + ]; + + pythonImportsCheck = [ + "sagemaker_mlflow" + ]; + + nativeCheckInputs = [ + pytestCheckHook + scikit-learn + ]; + + disabledTests = [ + # AssertionError: assert 's3' in '/build/source/not implemented/0/d3c16d2bad4245bf9fc68f86d2e7599d/artifacts' + "test_log_metric" + + # AssertionError: assert 'not implemented' == 'mw' + "test_request_header" + + # Require internet access + "test_auth_provider_returns_correct_sigv4" + "test_log_artifact" + "test_presigned_url" + "test_presigned_url_with_fields" + ]; + + meta = { + description = "MLFlow plugin for SageMaker"; + homepage = "https://github.com/aws/sagemaker-mlflow"; + changelog = "https://github.com/aws/sagemaker-mlflow/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 23906dc2d9a3..6f437dd9f219 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -1,93 +1,89 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, - fetchpatch, - setuptools, + + # build-system + hatchling, + + # dependencies attrs, boto3, cloudpickle, + docker, google-pasta, - numpy, - protobuf, - smdebug-rulesconfig, importlib-metadata, + jsonschema, + numpy, packaging, pandas, pathos, - schema, - pyyaml, - jsonschema, platformdirs, - tblib, - urllib3, + protobuf, + psutil, + pyyaml, requests, - docker, + sagemaker-core, + sagemaker-mlflow, + schema, + smdebug-rulesconfig, + tblib, tqdm, - psutil, + urllib3, + + # optional-dependencies scipy, accelerate, }: buildPythonPackage rec { pname = "sagemaker"; - version = "2.224.1"; + version = "2.232.3"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "aws"; repo = "sagemaker-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-Kc66sygHGFqMvSY7rACb62wJEJesnN4KDmtYZLIOsqc="; + hash = "sha256-6kGxmgkR/1ih2V49C9aEUBBCJS6s1Jbev80FDnJtHFg="; }; - patches = [ - # Distutils removal, fix build with python 3.12 - # https://github.com/aws/sagemaker-python-sdk/pull/4544 - (fetchpatch { - url = "https://github.com/aws/sagemaker-python-sdk/commit/84447ba59e544c810aeb842fd058e20d89e3fc74.patch"; - hash = "sha256-B8Q18ViB7xYy1F5LoL1NvXj2lnFPgt+C9wssSODyAXM="; - }) - (fetchpatch { - url = "https://github.com/aws/sagemaker-python-sdk/commit/e9e08a30cb42d4b2d7299c1c4b42d680a8c78110.patch"; - hash = "sha256-uGPtXSXfeaIvt9kkZZKQDuiZfoRgw3teffuxai1kKlY="; - }) - ]; - build-system = [ - setuptools + hatchling ]; pythonRelaxDeps = [ + "attrs" + "boto3" "cloudpickle" "importlib-metadata" + "protobuf" ]; dependencies = [ attrs boto3 cloudpickle + docker google-pasta - numpy - protobuf - smdebug-rulesconfig importlib-metadata + jsonschema + numpy packaging pandas pathos - schema - pyyaml - jsonschema platformdirs - tblib - urllib3 + protobuf + psutil + pyyaml requests - docker + sagemaker-core + sagemaker-mlflow + schema + smdebug-rulesconfig + tblib tqdm - psutil + urllib3 ]; doCheck = false; # many test dependencies are not available in nixpkgs @@ -97,7 +93,7 @@ buildPythonPackage rec { "sagemaker.lineage.visualizer" ]; - passthru.optional-dependencies = { + optional-dependencies = { local = [ urllib3 docker @@ -108,11 +104,11 @@ buildPythonPackage rec { # feature-processor = [ pyspark sagemaker-feature-store-pyspark ]; # not available in nixpkgs }; - meta = with lib; { + meta = { description = "Library for training and deploying machine learning models on Amazon SageMaker"; homepage = "https://github.com/aws/sagemaker-python-sdk/"; changelog = "https://github.com/aws/sagemaker-python-sdk/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ nequissimus ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nequissimus ]; }; } diff --git a/pkgs/development/python-modules/salib/default.nix b/pkgs/development/python-modules/salib/default.nix new file mode 100644 index 000000000000..9b1f1ccd799b --- /dev/null +++ b/pkgs/development/python-modules/salib/default.nix @@ -0,0 +1,64 @@ +{ + lib, + fetchPypi, + buildPythonPackage, + hatchling, + hatch-vcs, + numpy, + scipy, + matplotlib, + pandas, + multiprocess, + pathos, +}: +let + finalAttrs = { + pname = "salib"; + version = "1.5.1"; + pyproject = true; + + src = fetchPypi { + inherit (finalAttrs) pname version; + hash = "sha256-5KnDGbjdAplajcmD9XxFLLflttvUPnt4VskMtqMyu18="; + }; + + build-system = [ + hatchling + hatch-vcs + ]; + + dependencies = [ + numpy + scipy + matplotlib + pandas + multiprocess + ]; + + optional-dependencies = { + distributed = [ pathos ]; + }; + + # There are no tests in the pypi package + doCheck = false; + + pythonImportsCheck = [ + "SALib" + "SALib.analyze" + "SALib.plotting" + "SALib.sample" + "SALib.test_functions" + "SALib.util" + ]; + + meta = { + changelog = "https://github.com/SALib/SALib/releases"; + description = "Python implementations of commonly used sensitivity analysis methods, useful in systems modeling to calculate the effects of model inputs or exogenous factors on outputs of interest"; + homepage = "https://github.com/SALib/SALib"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ theobori ]; + mainProgram = "salib"; + }; + }; +in +buildPythonPackage finalAttrs diff --git a/pkgs/development/python-modules/samarium/default.nix b/pkgs/development/python-modules/samarium/default.nix index 89d5a700a7bc..9e32e1c5b5df 100644 --- a/pkgs/development/python-modules/samarium/default.nix +++ b/pkgs/development/python-modules/samarium/default.nix @@ -5,7 +5,6 @@ poetry-core, crossandra, dahlia, - pythonRelaxDepsHook }: buildPythonPackage rec { @@ -20,11 +19,9 @@ buildPythonPackage rec { hash = "sha256-sOkJ67B8LaIA2cwCHaFnc16lMG8uaegBJCzF6Li77vk="; }; - build-system = [ poetry-core pythonRelaxDepsHook ]; + build-system = [ poetry-core ]; 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"; diff --git a/pkgs/development/python-modules/samsungctl/default.nix b/pkgs/development/python-modules/samsungctl/default.nix index c139a1d1a4c6..43ed26ace4e2 100644 --- a/pkgs/development/python-modules/samsungctl/default.nix +++ b/pkgs/development/python-modules/samsungctl/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0ipz3fd65rqkxlb02sql0awc3vnslrwb2pfrsnpfnf8bfgxpbh9g"; }; - passthru.optional-dependencies = { + optional-dependencies = { websocket = [ websocket-client ]; # interactive_ui requires curses package }; diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix index 7111961f9224..3a99d9c89165 100644 --- a/pkgs/development/python-modules/samsungtvws/default.nix +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { websocket-client ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiohttp websockets @@ -55,7 +55,7 @@ buildPythonPackage rec { aioresponses pytest-asyncio pytestCheckHook - ] ++ passthru.optional-dependencies.async ++ passthru.optional-dependencies.encrypted; + ] ++ optional-dependencies.async ++ optional-dependencies.encrypted; pythonImportsCheck = [ "samsungtvws" ]; diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 04f00668ed92..05cdff616166 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -5,7 +5,7 @@ aioquic, beautifulsoup4, buildPythonPackage, - doCheck ? !stdenv.isDarwin, # on Darwin, tests fail but pkg still works + doCheck ? !stdenv.hostPlatform.isDarwin, # on Darwin, tests fail but pkg still works fetchFromGitHub, gunicorn, html5tagger, @@ -55,7 +55,7 @@ buildPythonPackage rec { websockets ]; - passthru.optional-dependencies = { + optional-dependencies = { ext = [ # TODO: sanic-ext ]; @@ -69,7 +69,7 @@ buildPythonPackage rec { pytestCheckHook sanic-testing uvicorn - ] ++ passthru.optional-dependencies.http3; + ] ++ optional-dependencies.http3; inherit doCheck; @@ -82,7 +82,7 @@ buildPythonPackage rec { # needed for relative paths for some packages cd tests '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # OSError: [Errno 24] Too many open files ulimit -n 1024 ''; diff --git a/pkgs/development/python-modules/sarif-tools/default.nix b/pkgs/development/python-modules/sarif-tools/default.nix index c499d021447d..b75379c06af2 100644 --- a/pkgs/development/python-modules/sarif-tools/default.nix +++ b/pkgs/development/python-modules/sarif-tools/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, poetry-core, jsonpath-ng, + jsonschema, jinja2, python, python-docx, @@ -15,32 +16,33 @@ buildPythonPackage rec { pname = "sarif-tools"; - version = "3.0.0"; + version = "3.0.2"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "sarif-tools"; rev = "refs/tags/v${version}"; - hash = "sha256-MYwhewUTZ3Wl93p6bN3+bHqtXz+BAlAhte+JaetPQYU="; + hash = "sha256-VGdl4WBdIiCWPGfFxqcG4XlbLh0uiLQXdrhUa2OxaVY="; }; disabled = pythonOlder "3.8"; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - jsonpath-ng + dependencies = [ jinja2 + jsonpath-ng + matplotlib python python-docx - matplotlib pyyaml ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + jsonschema + pytestCheckHook + ]; pythonRelaxDeps = [ "python-docx" ]; diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix index 0f044c6e28b5..5443545d5af5 100644 --- a/pkgs/development/python-modules/sasmodels/default.nix +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -2,20 +2,23 @@ lib, fetchFromGitHub, buildPythonPackage, - pytest, + setuptools, + pytestCheckHook, numpy, scipy, - matplotlib, + bumps, docutils, - pyopencl, + matplotlib, opencl-headers, + pycuda, + pyopencl, pythonOlder, }: buildPythonPackage rec { pname = "sasmodels"; - version = "1.0.7"; - format = "setuptools"; + version = "1.0.8"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,25 +26,34 @@ buildPythonPackage rec { owner = "SasView"; repo = "sasmodels"; rev = "refs/tags/v${version}"; - hash = "sha256-GZQYVvQ4bEBizTmJ+o5fIfGr8gn2/4uD3PxIswEjzSE="; + hash = "sha256-fa6/13z11AuTRItZOEmTbjpU1aT6Ur7evi6UvVvXQck="; }; + build-system = [ setuptools ]; + buildInputs = [ opencl-headers ]; - propagatedBuildInputs = [ - docutils - matplotlib + dependencies = [ numpy scipy - pyopencl ]; - # Note: the 1.0.5 release should be compatible with pytest6, so this can - # be set back to 'pytest' at that point - nativeCheckInputs = [ pytest ]; + optional-dependencies = { + full = [ + docutils + bumps + matplotlib + # columnize + ]; + server = [ bumps ]; + opencl = [ pyopencl ]; + cuda = [ pycuda ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full; - checkPhase = '' - HOME=$(mktemp -d) py.test -c ./pytest.ini + preCheck = '' + export HOME=$TMPDIR ''; pythonImportsCheck = [ "sasmodels" ]; diff --git a/pkgs/development/python-modules/scalene/02-pyproject-unpin-setuptools.patch b/pkgs/development/python-modules/scalene/02-pyproject-unpin-setuptools.patch deleted file mode 100644 index 80ab0080e631..000000000000 --- a/pkgs/development/python-modules/scalene/02-pyproject-unpin-setuptools.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 777be9c46c4caed5f3fcde65b70ada4d773f4298 Mon Sep 17 00:00:00 2001 -From: Sarah Clark <seclark@nextquestion.net> -Date: Sat, 24 Aug 2024 11:26:30 -0700 -Subject: [PATCH] Unpin setuptools - ---- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index d17d12dc8..6bf1c7a38 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -54,7 +54,7 @@ scalene = "scalene.__main__:main" - [build-system] - build-backend = "setuptools.build_meta" - requires = [ -- "setuptools>=65.5.1,<71.0", # Pin to setuptools<71.0 to avoid this bug: https://github.com/pypa/setuptools/issues/4496 -+ "setuptools>=65.5.1", - "setuptools_scm>=8", - "wheel", - "cython", --- diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix index 820de7be473b..159a2dc7090a 100644 --- a/pkgs/development/python-modules/scalene/default.nix +++ b/pkgs/development/python-modules/scalene/default.nix @@ -10,6 +10,7 @@ numpy, nvidia-ml-py, psutil, + pydantic, pynvml, pytestCheckHook, pythonOlder, @@ -38,7 +39,7 @@ in buildPythonPackage rec { pname = "scalene"; - version = "1.5.44.1"; + version = "1.5.46"; pyproject = true; disabled = pythonOlder "3.9"; @@ -46,12 +47,11 @@ buildPythonPackage rec { owner = "plasma-umass"; repo = "scalene"; rev = "v${version}"; - hash = "sha256-XMz+gwiNaKiKplD4kOE1yhcg+dkzjEdDYjW0JsDEMQE="; + hash = "sha256-G+fX0D70aGOmXr/SqaBKkOz3CEHpGqClFFdTeOzRpaw="; }; patches = [ ./01-manifest-no-git.patch - ./02-pyproject-unpin-setuptools.patch ]; prePatch = '' @@ -74,6 +74,7 @@ buildPythonPackage rec { jinja2 numpy psutil + pydantic pynvml rich ] ++ lib.optionals stdenv.hostPlatform.isLinux [ nvidia-ml-py ]; diff --git a/pkgs/development/python-modules/scales/default.nix b/pkgs/development/python-modules/scales/default.nix index ff9ab853e5c9..e258bdf045f2 100644 --- a/pkgs/development/python-modules/scales/default.nix +++ b/pkgs/development/python-modules/scales/default.nix @@ -2,29 +2,48 @@ lib, buildPythonPackage, fetchPypi, - nose, + pytestCheckHook, + fetchpatch2, six, + setuptools, }: buildPythonPackage rec { pname = "scales"; version = "1.0.9"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "8b6930f7d4bf115192290b44c757af5e254e3fcfcb75ff9a51f5c96a404e2753"; + hash = "sha256-i2kw99S/EVGSKQtEx1evXiVOP8/Ldf+aUfXJakBOJ1M="; }; - nativeCheckInputs = [ nose ]; - propagatedBuildInputs = [ six ]; + patches = [ + # Use html module in Python 3 and cgi module in Python 2 + # https://github.com/Cue/scales/pull/47 + (fetchpatch2 { + url = "https://github.com/Cue/scales/commit/ee69d45f1a7f928f7b241702e9be06007444115e.patch?full_index=1"; + hash = "sha256-xBlgkh1mf+3J7GtNI0zGb7Sum8UYbTpUmM12sxK/fSU="; + }) + ]; - # No tests included - doCheck = false; + postPatch = '' + for file in scales_test formats_test aggregation_test; do + substituteInPlace src/greplin/scales/$file.py \ + --replace-fail "assertEquals" "assertEqual" + done; + ''; - meta = with lib; { + build-system = [ setuptools ]; + + dependencies = [ six ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { description = "Stats for Python processes"; homepage = "https://www.github.com/Cue/scales"; - license = licenses.asl20; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pyrox0 ]; }; } diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 6e1ab5aad6e3..77eb9ea5195a 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "scapy"; - version = "2.5.0"; + version = "2.6.0"; format = "setuptools"; disabled = isPyPy; @@ -40,8 +40,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "secdev"; repo = "scapy"; - rev = "v${version}"; - hash = "sha256-xJlovcxUQOQHfOU0Jgin/ayd2T5fOyeN4Jg0DbLHoeU="; + rev = "refs/tags/v${version}"; + hash = "sha256-k/wfY5nq/txdiqj5gyHT9FSjnFzazDBawE3+aNe9zrQ="; }; patches = [ ./find-library.patch ]; diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index 6e3b6e3d5ed6..ff6e5c978465 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -22,21 +22,21 @@ buildPythonPackage rec { pname = "schema-salad"; - version = "8.5.20240503091721"; + version = "8.7.20241021092521"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "common-workflow-language"; repo = "schema_salad"; rev = "refs/tags/${version}"; - hash = "sha256-VbEIkWzg6kPnJWqbvlfsD83oS0VQasGQo+pUIPiGjhU="; + hash = "sha256-1V73y+sp94QwoCz8T2LCMnf5iq8MtL9cvrhF949R+08="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "black>=19.10b0,<23.12" "black>=19.10b0" + --replace-fail "mypy[mypyc]==1.12.1" "mypy" ''; build-system = [ setuptools-scm ]; @@ -57,12 +57,7 @@ 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; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.pycodegen; preCheck = '' rm tox.ini @@ -80,7 +75,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "schema_salad" ]; - passthru.optional-dependencies = { + optional-dependencies = { pycodegen = [ black ]; }; diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix index 793627bb3c61..34ff86457720 100644 --- a/pkgs/development/python-modules/schwifty/default.nix +++ b/pkgs/development/python-modules/schwifty/default.nix @@ -18,20 +18,20 @@ # tests pytestCheckHook, - pytest-cov, + pytest-cov-stub, pythonOlder, }: buildPythonPackage rec { pname = "schwifty"; - version = "2024.8.1"; + version = "2024.9.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-XWdB0yGYKxz2PJVNbXpNnsG/SaF3ysZn8JjrDn/rZ7w="; + hash = "sha256-rO6fUCFYfCVPxfd+vvzWL+sMDDqA/qRSPUUTB90E8zA="; }; build-system = [ @@ -50,7 +50,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - pytest-cov + pytest-cov-stub pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); diff --git a/pkgs/development/python-modules/scienceplots/default.nix b/pkgs/development/python-modules/scienceplots/default.nix new file mode 100644 index 000000000000..b6421ce40a87 --- /dev/null +++ b/pkgs/development/python-modules/scienceplots/default.nix @@ -0,0 +1,33 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + matplotlib, +}: + +buildPythonPackage rec { + pname = "SciencePlots"; + version = "2.1.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-2NGX40EPh+va0LnCZeqrWWCU+wgtlxI+g19rwygAq1Q="; + }; + + build-system = [ setuptools ]; + + dependencies = [ matplotlib ]; + + pythonImportsCheck = [ "scienceplots" ]; + + doCheck = false; # no tests + + meta = with lib; { + description = "Matplotlib styles for scientific plotting"; + homepage = "https://github.com/garrettj403/SciencePlots"; + license = licenses.mit; + maintainers = with maintainers; [ kilimnik ]; + }; +} diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index 7068063a8cb5..afba3e93ddbd 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -2,9 +2,11 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, cython, oldest-supported-numpy, + requests, decorator, natsort, @@ -12,22 +14,24 @@ pandas, scipy, h5py, - hdmedians, biom-format, + statsmodels, + patsy, + python, pytestCheckHook, }: buildPythonPackage rec { pname = "scikit-bio"; - version = "0.6.0"; + version = "0.6.2"; pyproject = true; src = fetchFromGitHub { owner = "scikit-bio"; repo = "scikit-bio"; rev = "refs/tags/${version}"; - hash = "sha256-v8/r52pJpMi34SekPQBf7CqRbs+ZEyPR3WO5RBB7uKg="; + hash = "sha256-1L3AemXVqfgBDlRZorG7+8qt3f1Bm8L+Se+OwqEWwI4="; }; build-system = [ @@ -44,8 +48,9 @@ buildPythonPackage rec { pandas scipy h5py - hdmedians biom-format + statsmodels + patsy ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -53,6 +58,11 @@ buildPythonPackage rec { # only the $out dir contains the built cython extensions, so we run the tests inside there pytestFlagsArray = [ "${placeholder "out"}/${python.sitePackages}/skbio" ]; + disabledTestPaths = [ + # don't know why, but this segfaults + "${placeholder "out"}/${python.sitePackages}/skbio/metadata/tests/test_intersection.py" + ]; + pythonImportsCheck = [ "skbio" ]; meta = { diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix index 3dafa8134d0f..782fb9a21d94 100644 --- a/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/pkgs/development/python-modules/scikit-build-core/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "scikit-build-core"; - version = "0.10.5"; + version = "0.10.7"; pyproject = true; src = fetchFromGitHub { owner = "scikit-build"; repo = "scikit-build-core"; rev = "refs/tags/v${version}"; - hash = "sha256-hpwXEWPofgMT4ua2tZI1mtGbaBkT2XPBd6QL8xTi1A0="; + hash = "sha256-R6/Y9brIYBA1P3YeG8zGaoPcxWFUDqZlqbZpWu3MIIw="; }; postPatch = lib.optionalString (pythonOlder "3.11") '' @@ -89,7 +89,7 @@ buildPythonPackage rec { meta = with lib; { description = "Next generation Python CMake adaptor and Python API for plugins"; homepage = "https://github.com/scikit-build/scikit-build-core"; - changelog = "https://github.com/scikit-build/scikit-build-core/releases/tag/v${version}"; + changelog = "https://github.com/scikit-build/scikit-build-core/blob/${src.rev}/docs/changelog.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index f5c54e856e24..9a3501a71957 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "scikit-build"; - version = "0.18.0"; + version = "0.18.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,14 +32,14 @@ buildPythonPackage rec { src = fetchPypi { pname = "scikit_build"; inherit version; - hash = "sha256-caE69GfRo4UQw0lHhuLttz6tU+qSK95uUZ3FNyqmUJY="; + hash = "sha256-pBUqxaCE1JnCineXvgYo2DZsM24vsOGgY+sy5V78uOc="; }; patches = [ (fetchpatch2 { - name = "setuptools-70.2.0-compat.patch"; - url = "https://github.com/scikit-build/scikit-build/commit/7005897053bc5c71d823c36bbd89bd43121670f1.patch"; - hash = "sha256-YGNCS1AXnqHQMd40CDePVNAzLe5gQ/nJxASAZafsxK8="; + name = "setuptools-75.0-compat.patch"; + url = "https://github.com/scikit-build/scikit-build/commit/3992485c67331097553ec8f54233c4c295943f70.patch"; + hash = "sha256-U34UY+m6RE3c3UN/jGHuR+sRUqTGmG7dT52NWCY7nIE="; }) ]; diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix index 57cc5902ed73..f7fac9f6394f 100644 --- a/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/pkgs/development/python-modules/scikit-fmm/default.nix @@ -9,27 +9,27 @@ buildPythonPackage rec { pname = "scikit-fmm"; - version = "2024.5.29"; + version = "2024.9.16"; pyproject = true; src = fetchPypi { pname = "scikit_fmm"; inherit version; - hash = "sha256-sy7J5UKXhuL5K8zr3lBulUMekwNlBFfC8C2VzguVTUE="; + hash = "sha256-q6hqteXv600iH7xpCKHgRLkJYSpy9hIf/QnlsYI+jh4="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "oldest-supported-numpy" "numpy" - ''; - build-system = [ meson-python ]; dependencies = [ numpy ]; checkPhase = '' + runHook preCheck + # "Do not run the tests from the source directory" mkdir testdir; cd testdir - ${python.interpreter} -c "import skfmm, sys; sys.exit(skfmm.test())" + (set -x + ${python.interpreter} -c "import skfmm, sys; sys.exit(skfmm.test())" + ) + runHook postCheck ''; meta = with lib; { diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 369f1bf78e5c..b04e02faa6e3 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -35,7 +35,7 @@ let installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}"; self = buildPythonPackage rec { pname = "scikit-image"; - version = "0.22.0"; + version = "0.24.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -44,14 +44,14 @@ let owner = "scikit-image"; repo = "scikit-image"; rev = "refs/tags/v${version}"; - hash = "sha256-M18y5JBPf3DR7SlJcCf82nG2MzwILg2w1AhJMzZXslg="; + hash = "sha256-zhW7P2ss7n9LXRXiBMsifxCGGKXgZFbGLl3K4u4xzfE="; }; postPatch = '' patchShebangs skimage/_build_utils/{version,cythoner}.py substituteInPlace pyproject.toml \ - --replace "numpy==" "numpy>=" + --replace "numpy>=2.0.0rc1" "numpy" ''; nativeBuildInputs = [ @@ -77,7 +77,7 @@ let tifffile ]; - passthru.optional-dependencies = { + optional-dependencies = { data = [ pooch ]; optional = [ astropy @@ -125,7 +125,7 @@ let "skimage/io/tests/test_io.py::test_imread_http_url" "skimage/restoration/tests/test_rolling_ball.py::test_ndim" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Matplotlib tests are broken inside darwin sandbox "skimage/feature/tests/test_util.py::test_plot_matches" "skimage/filters/tests/test_thresholding.py::TestSimpleImage::test_try_all_threshold" @@ -133,7 +133,7 @@ let # See https://github.com/scikit-image/scikit-image/issues/7061 and https://github.com/scikit-image/scikit-image/issues/7104 "skimage/measure/tests/test_fit.py" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # https://github.com/scikit-image/scikit-image/issues/7104 "skimage/measure/tests/test_moments.py" ] diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index 7e975cb15949..6766ceca847e 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "1.5.0"; + version = "1.5.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,12 +32,12 @@ buildPythonPackage rec { src = fetchPypi { pname = "scikit_learn"; inherit version; - hash = "sha256-eJ49sBx1DtbUlvott9UGN4V7RR5XvK6GO/9wfBJHvvc="; + hash = "sha256-tCN+17P90KSIJ5LmjvJUXVuqUKyju0WqffRoE4rY+U0="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "numpy>=2.0.0rc2" "numpy" + --replace-fail "numpy>=2" "numpy" substituteInPlace meson.build --replace-fail \ "run_command('sklearn/_build_utils/version.py', check: true).stdout().strip()," \ @@ -80,12 +80,12 @@ buildPythonPackage rec { ''; # PermissionError: [Errno 1] Operation not permitted: '/nix/nix-installer' - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTests = [ # Skip test_feature_importance_regression - does web fetch "test_feature_importance_regression" - ] ++ lib.optionals stdenv.isAarch64 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # doesn't seem to produce correct results? # possibly relevant: https://github.com/scikit-learn/scikit-learn/issues/25838#issuecomment-2308650816 "test_sparse_input" diff --git a/pkgs/development/python-modules/scikit-misc/default.nix b/pkgs/development/python-modules/scikit-misc/default.nix index 5b6e9f347b3c..cf6ff0ad5474 100644 --- a/pkgs/development/python-modules/scikit-misc/default.nix +++ b/pkgs/development/python-modules/scikit-misc/default.nix @@ -7,24 +7,21 @@ git, meson-python, pkg-config, - blas, - lapack, numpy, setuptools, - wheel, pytestCheckHook, }: buildPythonPackage rec { pname = "scikit-misc"; - version = "0.3.1"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "has2k1"; repo = "scikit-misc"; rev = "refs/tags/v${version}"; - hash = "sha256-2L30hvKbFqIGlSEbzc1HvHybBqDGldJfZoUpqJJOv2Q="; + hash = "sha256-w6RHmVxJjLx9ov2LxXvicxmY8jixfkIRfbfVnV2yhOU="; }; postPatch = '' @@ -32,8 +29,8 @@ buildPythonPackage rec { # unbound numpy and disable coverage testing in pytest substituteInPlace pyproject.toml \ - --replace 'numpy==' 'numpy>=' \ - --replace 'addopts = "' '#addopts = "' + --replace-fail 'numpy>=2.0' 'numpy' \ + --replace-fail 'addopts = "' '#addopts = "' # provide a version to use when git fails to get the tag [[ -f skmisc/_version.py ]] || \ @@ -41,27 +38,19 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - cython gfortran git - meson-python - numpy pkg-config - setuptools - wheel ]; - propagatedBuildInputs = [ numpy ]; - - buildInputs = [ - blas - lapack + build-system = [ + cython + meson-python + numpy + setuptools ]; - mesonFlags = [ - "-Dblas=${blas.pname}" - "-Dlapack=${lapack.pname}" - ]; + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/scikit-optimize/default.nix b/pkgs/development/python-modules/scikit-optimize/default.nix deleted file mode 100644 index bc5beda2b27c..000000000000 --- a/pkgs/development/python-modules/scikit-optimize/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - isPy27, - buildPythonPackage, - fetchFromGitHub, - matplotlib, - numpy, - scipy, - scikit-learn, - pyaml, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "scikit-optimize"; - version = "0.9.0"; - format = "setuptools"; - disabled = isPy27; - - src = fetchFromGitHub { - owner = "scikit-optimize"; - repo = "scikit-optimize"; - rev = "v${version}"; - sha256 = "0hsq6pmryimxc275yrcy4bv217bx7ma6rz0q6m4138bv4zgq18d1"; - }; - - propagatedBuildInputs = [ - matplotlib - numpy - scipy - scikit-learn - pyaml - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - meta = with lib; { - description = "Sequential model-based optimization toolbox"; - homepage = "https://scikit-optimize.github.io/"; - license = licenses.bsd3; - maintainers = [ ]; - broken = true; # It will fix by https://github.com/scikit-optimize/scikit-optimize/pull/1123 - }; -} diff --git a/pkgs/development/python-modules/scikit-posthocs/default.nix b/pkgs/development/python-modules/scikit-posthocs/default.nix index 7072fb03234a..2a25488c1557 100644 --- a/pkgs/development/python-modules/scikit-posthocs/default.nix +++ b/pkgs/development/python-modules/scikit-posthocs/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "scikit-posthocs"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; src = fetchFromGitHub { owner = "maximtrp"; repo = "scikit-posthocs"; rev = "refs/tags/v${version}"; - hash = "sha256-sRop5DKakrZEBswzTvumn68wKqU15zM5aCLfZ/PdsFg="; + hash = "sha256-ssaTd+A7lzd4tlKHGkgKixi3XjZLQBcPs6UOEzX/hrk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/scikit-rf/default.nix b/pkgs/development/python-modules/scikit-rf/default.nix index e4d56716ee2e..98e27b4b5223 100644 --- a/pkgs/development/python-modules/scikit-rf/default.nix +++ b/pkgs/development/python-modules/scikit-rf/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "scikit-rf"; - version = "1.3.0"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "scikit-rf"; repo = "scikit-rf"; rev = "refs/tags/v${version}"; - hash = "sha256-cYQDoEX33fjxekTA2COHMvcLxCFCD7g9bp3y9sE4uUU="; + hash = "sha256-tUMOTRazs531OKGUZbh+Ee1omkFY3CAUAMmpKcNCdZU="; }; postPatch = '' @@ -65,14 +65,14 @@ buildPythonPackage rec { sphinx nbsphinx openpyxl + nbval ]; }; - env = lib.optionalAttrs stdenv.isDarwin { MPLBACKEND = "Agg"; }; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { MPLBACKEND = "Agg"; }; nativeCheckInputs = [ pytest-mock - nbval matplotlib pyvisa openpyxl @@ -83,7 +83,7 @@ buildPythonPackage rec { # test_calibration.py generates a divide by zero error on darwin # https://github.com/scikit-rf/scikit-rf/issues/972 disabledTestPaths = lib.optional ( - stdenv.isAarch64 && stdenv.isDarwin + stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin ) "skrf/calibration/tests/test_calibration.py"; pythonImportsCheck = [ "skrf" ]; diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix index e2d4ebff287b..85539eabeff6 100644 --- a/pkgs/development/python-modules/scikit-survival/default.nix +++ b/pkgs/development/python-modules/scikit-survival/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "scikit-survival"; - version = "0.22.2"; + version = "0.23.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-DpyGdQwN4VgGYmdREJlPB6NWiVWu8Ur4ExbysxADMr8="; + hash = "sha256-JFI3SDOK74vQdoUOStYlc4e0VHps97KjV3a1NQSN6E0="; }; nativeBuildInputs = [ @@ -71,7 +71,7 @@ buildPythonPackage rec { "test_survival_svm" "test_tree" ] - ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) # floating point mismatch on aarch64 # 27079905.88052468 to far from 27079905.880496684 "test_coxnet"; diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix index f5ddb753ffaf..f9695701602c 100644 --- a/pkgs/development/python-modules/scikits-odes/default.nix +++ b/pkgs/development/python-modules/scikits-odes/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { scipy ] ++ lib.optionals (!isPy3k) [ enum34 ]; - doCheck = true; nativeCheckInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/scim2-filter-parser/default.nix b/pkgs/development/python-modules/scim2-filter-parser/default.nix index 4ea0d1a6c7d5..2ddf98697185 100644 --- a/pkgs/development/python-modules/scim2-filter-parser/default.nix +++ b/pkgs/development/python-modules/scim2-filter-parser/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sly ]; - passthru.optional-dependencies = { + optional-dependencies = { django-query = [ django ]; }; @@ -49,7 +49,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.django-query; + ] ++ optional-dependencies.django-query; meta = with lib; { description = "Customizable parser/transpiler for SCIM2.0 filters"; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index e9b5a8a7ff5d..e5b2db20a1c0 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -48,8 +48,8 @@ let # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy # # The update script uses sed regexes to replace them with the updated hashes. - version = "1.14.0"; - srcHash = "sha256-rNplvbDExmMfcPuvhs+y9j5/9G6QR1GdMgQLty6oi2c="; + version = "1.14.1"; + srcHash = "sha256-eYuUHr9wZMXvEsIhssGR35JnRBNGaOL/j1LNM5sHuYY="; datasetsHashes = { ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; @@ -112,7 +112,7 @@ buildPythonPackage { pkg-config setuptools ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Minimal version required according to: # https://github.com/scipy/scipy/blob/v1.14.0/scipy/meson.build#L185-L188 (xcbuild.override { @@ -141,7 +141,7 @@ buildPythonPackage { # The following tests are broken on aarch64-darwin with newer compilers and library versions. # See https://github.com/scipy/scipy/issues/18308 - disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "test_a_b_neg_int_after_euler_hypergeometric_transformation" "test_dst4_definition_ortho" "test_load_mat4_le" @@ -150,7 +150,7 @@ buildPythonPackage { "test_uint64_max" ]; - doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); + doCheck = !(stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin); preConfigure = '' @@ -187,7 +187,9 @@ buildPythonPackage { # # ldr x0, [x0, ___stack_chk_guard];momd # - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + hardeningDisable = lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ + "stackprotector" + ]; # remove references to dev dependencies postInstall = '' diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 6c39cc2af8b6..6d38658041b5 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.7"; + version = "3.3.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "scmrepo"; rev = "refs/tags/${version}"; - hash = "sha256-Z9HUeZPsskEPTwRRwK4z4p2Lv7Ukg7du6OAxvDwEcPc="; + hash = "sha256-8fx4yZcdOb32x5eo04ixpMe3Mh21LwqzNKVRVEnjfQo="; }; build-system = [ diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index f291798d0500..010481da31e8 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -117,7 +117,7 @@ buildPythonPackage rec { # Test fails on Hydra "test_start_requests_laziness" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_xmliter_encoding" "test_download" "test_reactor_default_twisted_reactor_select" diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix index dc32cbb1dd6b..9f1a6c3a6e24 100644 --- a/pkgs/development/python-modules/screeninfo/default.nix +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "screeninfo" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Fetch location and size of physical screens"; homepage = "https://github.com/rr-/screeninfo"; license = licenses.mit; diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix index 8736930939e3..e311b2f2f25f 100644 --- a/pkgs/development/python-modules/scs/default.nix +++ b/pkgs/development/python-modules/scs/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { ]; buildInputs = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then [ Accelerate ] else [ diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 16e9d1b98078..74987d59dcc4 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pandas ]; - passthru.optional-dependencies = { + optional-dependencies = { stats = [ scipy statsmodels diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index 7bb81e8006eb..8ea5a67932fe 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { libusb-compat-0_1 ]; - passthru.optional-dependencies = { + optional-dependencies = { pyseabreeze = [ pyusb ]; }; @@ -77,7 +77,7 @@ buildPythonPackage rec { pytestCheckHook mock zipp - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ "TestHardware" ]; diff --git a/pkgs/development/python-modules/seasonal/default.nix b/pkgs/development/python-modules/seasonal/default.nix index f6aa8d2e3646..cef289ff5c8e 100644 --- a/pkgs/development/python-modules/seasonal/default.nix +++ b/pkgs/development/python-modules/seasonal/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { scipy ]; - passthru.optional-dependencies = { + optional-dependencies = { csv = [ pandas ]; plot = [ matplotlib ]; }; @@ -51,7 +51,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = with lib; { description = "Robustly estimate trend and periodicity in a timeseries"; diff --git a/pkgs/development/python-modules/securesystemslib/default.nix b/pkgs/development/python-modules/securesystemslib/default.nix index 21cff0dc498e..62fb78f35653 100644 --- a/pkgs/development/python-modules/securesystemslib/default.nix +++ b/pkgs/development/python-modules/securesystemslib/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling ]; - passthru.optional-dependencies = { + optional-dependencies = { PySPX = [ pyspx ]; awskms = [ boto3 @@ -70,7 +70,7 @@ buildPythonPackage rec { nativeCheckInputs = [ ed25519 pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "securesystemslib" ]; diff --git a/pkgs/development/python-modules/securityreporter/default.nix b/pkgs/development/python-modules/securityreporter/default.nix index 3826f8397f5d..087d0f719032 100644 --- a/pkgs/development/python-modules/securityreporter/default.nix +++ b/pkgs/development/python-modules/securityreporter/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "securityreporter"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "dongit-org"; repo = "python-reporter"; rev = "refs/tags/v${version}"; - hash = "sha256-Ddq1qjaQemawK+u3ArlsChrkzRbcuaj5LrswyTGwTrg="; + hash = "sha256-fpsvjbPE6iaOmLxykGSkCjkhFTmb8xhXa8pDrWN66KM="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/segyio/default.nix b/pkgs/development/python-modules/segyio/default.nix index 9e221db8cfe7..574354ea44a0 100644 --- a/pkgs/development/python-modules/segyio/default.nix +++ b/pkgs/development/python-modules/segyio/default.nix @@ -42,7 +42,6 @@ buildPythonPackage rec { scikit-build ]; - doCheck = true; # I'm not modifying the checkPhase nor adding a pytestCheckHook because the pytest is called # within the cmake test phase nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 9009d6bf3c4f..05e32bef804b 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "selenium"; - version = "4.22.0"; + version = "4.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,9 +29,11 @@ buildPythonPackage rec { repo = "selenium"; # check if there is a newer tag with or without -python suffix rev = "refs/tags/selenium-${version}"; - hash = "sha256-qBuZgI5SSBwxbSBrAT0W/HzzV2JmPL00hPJ6s57QTeg="; + hash = "sha256-ykZdL2Rn+bU8do3e9zf9pJtInBNRGLcXi5pD1vm7OJY="; }; + patches = [ ./dont-build-the-selenium-manager.patch ]; + preConfigure = '' cd py ''; @@ -47,11 +49,11 @@ buildPythonPackage rec { cp ../javascript/cdp-support/mutation-listener.js $DST_REMOTE cp ../third_party/js/selenium/webdriver.json $DST_FF/webdriver_prefs.json '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $DST_PREFIX/common/macos ln -s ${lib.getExe selenium-manager} $DST_PREFIX/common/macos/ '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $DST_PREFIX/common/linux/ ln -s ${lib.getExe selenium-manager} $DST_PREFIX/common/linux/ ''; diff --git a/pkgs/development/python-modules/selenium/dont-build-the-selenium-manager.patch b/pkgs/development/python-modules/selenium/dont-build-the-selenium-manager.patch new file mode 100644 index 000000000000..51db7aaf0e19 --- /dev/null +++ b/pkgs/development/python-modules/selenium/dont-build-the-selenium-manager.patch @@ -0,0 +1,37 @@ +From e52d75248a5d18bcf965591eb240a11a23147634 Mon Sep 17 00:00:00 2001 +From: Pavel Sobolev <contact@paveloom.dev> +Date: Sat, 3 Aug 2024 22:38:49 +0300 +Subject: [PATCH] Don't build the Selenium Manager. + +--- + py/setup.py | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/py/setup.py b/py/setup.py +index a71007f..fdda74e 100755 +--- a/py/setup.py ++++ b/py/setup.py +@@ -19,7 +19,6 @@ from distutils.command.install import INSTALL_SCHEMES + from os.path import dirname, join, abspath + from setuptools import setup + from setuptools.command.install import install +-from setuptools_rust import Binding, RustExtension + + + for scheme in INSTALL_SCHEMES.values(): +@@ -84,12 +83,6 @@ setup_args = { + "typing_extensions~=4.9", + "websocket-client~=1.8", + ], +- 'rust_extensions': [ +- RustExtension( +- {"selenium-manager": "selenium.webdriver.common.selenium-manager"}, +- binding=Binding.Exec +- ) +- ], + 'zip_safe': False + } + +-- +2.45.2 + diff --git a/pkgs/development/python-modules/semgrep/common.nix b/pkgs/development/python-modules/semgrep/common.nix new file mode 100644 index 000000000000..d51853953bf4 --- /dev/null +++ b/pkgs/development/python-modules/semgrep/common.nix @@ -0,0 +1,59 @@ +{ lib }: + +rec { + version = "1.74.0"; + + srcHash = "sha256-PH0fTT6n6o3Jtuq+cyyRb048Tuv3VGNduCZCEKTXMrE="; + + # submodule dependencies + # these are fetched so we: + # 1. don't fetch the many submodules we don't need + # 2. avoid fetchSubmodules since it's prone to impurities + submodules = { + "cli/src/semgrep/semgrep_interfaces" = { + owner = "semgrep"; + repo = "semgrep-interfaces"; + rev = "9f38254957c50c68ea402eebae0f7aa40dd01cbf"; + hash = "sha256-/P8b7nSwNZSrm7dUFkehDaGz+r+bofrlFfuIo4U7tJM="; + }; + }; + + # fetch pre-built semgrep-core since the ocaml build is complex and relies on + # the opam package manager at some point + # pulling it out of the python wheel as r2c no longer release a built binary + # on github releases + core = { + x86_64-linux = { + platform = "any"; + hash = "sha256-ZA5KlbSLkC0IJGqyK0XhuDKRx53987vf53vSM0zwD9k="; + }; + aarch64-linux = { + platform = "musllinux_1_0_aarch64.manylinux2014_aarch64"; + hash = "sha256-aHq87uzk9TtnlMDfAS6492ocXRJSHdBinng0hu2xLas="; + }; + x86_64-darwin = { + platform = "macosx_10_14_x86_64"; + hash = "sha256-OorDXQ0oYHV8aPu9o1dQAd22u78/EjpUWA2yPYG0S9E="; + }; + aarch64-darwin = { + platform = "macosx_11_0_arm64"; + hash = "sha256-g8sFLh2V9NDIvAZOaDhMpFxKqbS/S1eKep4v1vlOOo8="; + }; + }; + + meta = with lib; { + homepage = "https://semgrep.dev/"; + downloadPage = "https://github.com/semgrep/semgrep/"; + changelog = "https://github.com/semgrep/semgrep/blob/v${version}/CHANGELOG.md"; + description = "Lightweight static analysis for many languages"; + longDescription = '' + Semgrep is a fast, open-source, static analysis tool for finding bugs and + enforcing code standards at editor, commit, and CI time. Semgrep analyzes + code locally on your computer or in your build environment: code is never + uploaded. Its rules look like the code you already write; no abstract + syntax trees, regex wrestling, or painful DSLs. + ''; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ jk ambroisie ]; + }; +} diff --git a/pkgs/development/python-modules/semgrep/default.nix b/pkgs/development/python-modules/semgrep/default.nix new file mode 100644 index 000000000000..939454a71975 --- /dev/null +++ b/pkgs/development/python-modules/semgrep/default.nix @@ -0,0 +1,143 @@ +{ lib +, callPackage +, fetchFromGitHub +, semgrep-core +, buildPythonPackage +, pythonPackages + +, pytestCheckHook +, git +}: + +# testing locally post build: +# ./result/bin/semgrep scan --metrics=off --config 'r/generic.unicode.security.bidi.contains-bidirectional-characters' + +let + common = import ./common.nix { inherit lib; }; + semgrepBinPath = lib.makeBinPath [ semgrep-core ]; +in +buildPythonPackage rec { + pname = "semgrep"; + inherit (common) version; + src = fetchFromGitHub { + owner = "semgrep"; + repo = "semgrep"; + rev = "v${version}"; + hash = common.srcHash; + }; + + # prepare a subset of the submodules as we only need a handful + # and there are many many submodules total + postPatch = (lib.concatStringsSep "\n" (lib.mapAttrsToList + ( + path: submodule: '' + # substitute ${path} + # remove git submodule placeholder + rm -r ${path} + # link submodule + ln -s ${submodule}/ ${path} + '' + ) + passthru.submodulesSubset)) + '' + cd cli + ''; + + # tell cli/setup.py to not copy semgrep-core into the result + # this means we can share a copy of semgrep-core and avoid an issue where it + # copies the binary but doesn't retain the executable bit + SEMGREP_SKIP_BIN = true; + + pythonRelaxDeps = [ + "boltons" + "glom" + ]; + + propagatedBuildInputs = with pythonPackages; [ + attrs + boltons + colorama + click + click-option-group + glom + requests + rich + ruamel-yaml + tqdm + packaging + jsonschema + wcmatch + peewee + defusedxml + urllib3 + typing-extensions + python-lsp-jsonrpc + tomli + ]; + + doCheck = true; + + nativeCheckInputs = [ git pytestCheckHook ] ++ (with pythonPackages; [ + flaky + pytest-snapshot + pytest-mock + pytest-freezegun + types-freezegun + ]); + + disabledTestPaths = [ + "tests/default/e2e" + "tests/default/e2e-pro" + "tests/default/e2e-pysemgrep" + ]; + + disabledTests = [ + # requires networking + "test_send" + # requires networking + "test_parse_exclude_rules_auto" + # many child tests require networking to download files + "TestConfigLoaderForProducts" + # doesn't start flaky plugin correctly + "test_debug_performance" + ]; + + preCheck = '' + # tests need a home directory + export HOME="$(mktemp -d)" + + # tests need access to `semgrep-core` + export OLD_PATH="$PATH" + export PATH="$PATH:${semgrepBinPath}" + + # we're in cli + # replace old semgrep with wrapped one + rm ./bin/semgrep + ln -s $out/bin/semgrep ./bin/semgrep + ''; + + postCheck = '' + export PATH="$OLD_PATH" + unset OLD_PATH + ''; + + # since we stop cli/setup.py from finding semgrep-core and copying it into + # the result we need to provide it on the PATH + preFixup = '' + makeWrapperArgs+=(--prefix PATH : ${semgrepBinPath}) + ''; + + postInstall = '' + chmod +x $out/bin/{,py}semgrep + ''; + + passthru = { + inherit common semgrep-core; + submodulesSubset = lib.mapAttrs (k: args: fetchFromGitHub args) common.submodules; + updateScript = ./update.sh; + }; + + meta = common.meta // { + description = common.meta.description + " - cli"; + inherit (semgrep-core.meta) platforms; + }; +} diff --git a/pkgs/development/python-modules/semgrep/semgrep-core.nix b/pkgs/development/python-modules/semgrep/semgrep-core.nix new file mode 100644 index 000000000000..8986cba7d880 --- /dev/null +++ b/pkgs/development/python-modules/semgrep/semgrep-core.nix @@ -0,0 +1,53 @@ +{ lib, stdenvNoCC, fetchPypi, unzip }: + +let + common = import ./common.nix { inherit lib; }; +in +stdenvNoCC.mkDerivation rec { + pname = "semgrep-core"; + inherit (common) version; + # fetch pre-built semgrep-core since the ocaml build is complex and relies on + # the opam package manager at some point + # pulling it out of the python wheel as r2c no longer release a built binary + # on github releases + src = + let + inherit (stdenvNoCC.hostPlatform) system; + data = common.core.${system} or (throw "Unsupported system: ${system}"); + in + fetchPypi rec { + pname = "semgrep"; + inherit version; + format = "wheel"; + dist = python; + python = "cp38.cp39.cp310.cp311.py37.py38.py39.py310.py311"; + inherit (data) platform hash; + }; + + nativeBuildInputs = [ unzip ]; + + # _tryUnzip from unzip's setup-hook doesn't recognise .whl + # "do not know how to unpack source archive" + # perform unpack by hand + unpackPhase = '' + runHook preUnpack + LANG=en_US.UTF-8 unzip -qq "$src" + runHook postUnpack + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -Dm 755 -t $out/bin semgrep-${version}.data/purelib/semgrep/bin/semgrep-core + runHook postInstall + ''; + + meta = common.meta // { + description = common.meta.description + " - core binary"; + mainProgram = "semgrep-core"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = lib.attrNames common.core; + }; +} diff --git a/pkgs/development/python-modules/semgrep/update.sh b/pkgs/development/python-modules/semgrep/update.sh new file mode 100755 index 000000000000..914de6c9331f --- /dev/null +++ b/pkgs/development/python-modules/semgrep/update.sh @@ -0,0 +1,147 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused jq nix-prefetch + +set -euxo pipefail + +# provide a github token so you don't get rate limited +# if you use gh cli you can use: +# `export GITHUB_TOKEN="$(cat ~/.config/gh/config.yml | yq '.hosts."github.com".oauth_token' -r)"` +# or just set your token by hand: +# `read -s -p "Enter your token: " GITHUB_TOKEN; export GITHUB_TOKEN` +# (we use read so it doesn't show in our shell history and in secret mode so the token you paste isn't visible) +if [ -z "${GITHUB_TOKEN:-}" ]; then + echo "no GITHUB_TOKEN provided - you could meet API request limiting" >&2 +fi + +ROOT="$(dirname "$(readlink -f "$0")")" +NIXPKGS_ROOT="$ROOT/../../../.." + +COMMON_FILE="$ROOT/common.nix" + +instantiateClean() { + nix-instantiate -A "$1" --eval --strict | cut -d\" -f2 +} + +# get latest version +NEW_VERSION=$( + curl -s -L -H \ + "Accept: application/vnd.github.v3+json" \ + ${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \ + https://api.github.com/repos/semgrep/semgrep/releases/latest \ + | jq -r '.tag_name' +) +# trim v prefix +NEW_VERSION="${NEW_VERSION:1}" +OLD_VERSION="$(instantiateClean semgrep.passthru.common.version)" + +if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then + echo "Already up to date" + exit +fi + +replace() { + sed -i "s@$1@$2@g" "$3" +} + +fetchgithub() { + set +eo pipefail + nix-build -A "$1" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g' + set -eo pipefail +} + +fetch_arch() { + VERSION=$1 + PLATFORM=$2 + nix-prefetch "{ fetchPypi }: +fetchPypi rec { + pname = \"semgrep\"; + version = \"$VERSION\"; + format = \"wheel\"; + dist = python; + python = \"cp38.cp39.cp310.cp311.py37.py38.py39.py310.py311\"; + platform = \"$PLATFORM\"; +} +" +} + +replace "$OLD_VERSION" "$NEW_VERSION" "$COMMON_FILE" + +echo "Updating src" + +OLD_HASH="$(instantiateClean semgrep.passthru.common.srcHash)" +echo "Old hash $OLD_HASH" +TMP_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" +replace "$OLD_HASH" "$TMP_HASH" "$COMMON_FILE" +NEW_HASH="$(fetchgithub semgrep.src)" +echo "New hash $NEW_HASH" +replace "$TMP_HASH" "$NEW_HASH" "$COMMON_FILE" + +echo "Updated src" + + +update_core_platform() { + SYSTEM=$1 + echo "Updating core src $SYSTEM" + + PLATFORM="$(instantiateClean "semgrep.passthru.common.core.$SYSTEM.platform")" + + OLD_HASH="$(instantiateClean "semgrep.passthru.common.core.$SYSTEM.hash")" + echo "Old core hash $OLD_HASH" + NEW_HASH="$(fetch_arch "$NEW_VERSION" "$PLATFORM")" + echo "New core hash $NEW_HASH" + replace "$OLD_HASH" "$NEW_HASH" "$COMMON_FILE" + + echo "Updated core src $SYSTEM" +} + +update_core_platform "x86_64-linux" +update_core_platform "aarch64-linux" +update_core_platform "x86_64-darwin" +update_core_platform "aarch64-darwin" + +OLD_PWD=$PWD +TMPDIR="$(mktemp -d)" +# shallow clone to check submodule commits, don't actually need the submodules +git clone https://github.com/semgrep/semgrep "$TMPDIR/semgrep" --depth 1 --branch "v$NEW_VERSION" + +get_submodule_commit() { + OLD_PWD=$PWD + ( + cd "$TMPDIR/semgrep" + git ls-tree --object-only HEAD "$1" + cd "$OLD_PWD" + ) +} + +# loop through submodules +nix-instantiate -E "with import $NIXPKGS_ROOT {}; builtins.attrNames semgrep.passthru.common.submodules" --eval --strict --json \ +| jq '.[]' -r \ +| while read -r SUBMODULE; do + echo "Updating $SUBMODULE" + OLD_REV=$(instantiateClean semgrep.passthru.common.submodules."$SUBMODULE".rev) + echo "Old commit $OLD_REV" + OLD_HASH=$(instantiateClean semgrep.passthru.common.submodules."$SUBMODULE".hash) + echo "Old hash $OLD_HASH" + + NEW_REV=$(get_submodule_commit "$SUBMODULE") + echo "New commit $NEW_REV" + + if [[ "$OLD_REV" == "$NEW_REV" ]]; then + echo "$SUBMODULE already up to date" + continue + fi + + TMP_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" + replace "$OLD_REV" "$NEW_REV" "$COMMON_FILE" + replace "$OLD_HASH" "$TMP_HASH" "$COMMON_FILE" + NEW_HASH="$(fetchgithub semgrep.passthru.submodulesSubset."$SUBMODULE")" + echo "New hash $NEW_HASH" + replace "$TMP_HASH" "$NEW_HASH" "$COMMON_FILE" + + echo "Updated $SUBMODULE" +done + +rm -rf "$TMPDIR" + +echo "Finished" + diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix index 06beaabdbcd5..fe777922e226 100644 --- a/pkgs/development/python-modules/send2trash/default.nix +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -9,19 +9,19 @@ buildPythonPackage rec { pname = "send2trash"; - version = "1.8.2"; + version = "1.8.3"; format = "pyproject"; src = fetchFromGitHub { owner = "hsoft"; repo = "send2trash"; rev = "refs/tags/${version}"; - hash = "sha256-p0Pd9g+nLoT+oruthwjBn2E9rznvcx35VmzOAce2iTY="; + hash = "sha256-3RbKfluKOvl+sGJldtAt2bVfcasVKjCqVxmF6hVwh+Y="; }; nativeBuildInputs = [ setuptools ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index b3f99bf3ee38..11991b9ef17d 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.12.4"; + version = "0.13.3"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "scottbonline"; repo = "sense"; rev = "refs/tags/${version}"; - hash = "sha256-jHYXqlRV1JR95GtO9E6oYj69Jj8TsvLANcI1kl7/Gl4="; + hash = "sha256-k1W84c0odpYv0vI2u2zqfWGJXSpYJRSwfFyXACMto7s="; }; postPatch = '' @@ -33,9 +33,9 @@ buildPythonPackage rec { --replace-fail "{{VERSION_PLACEHOLDER}}" "${version}" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout kasa-crypt diff --git a/pkgs/development/python-modules/sensorpush-ble/default.nix b/pkgs/development/python-modules/sensorpush-ble/default.nix index fb458d9d0626..2281fdcd60fd 100644 --- a/pkgs/development/python-modules/sensorpush-ble/default.nix +++ b/pkgs/development/python-modules/sensorpush-ble/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, home-assistant-bluetooth, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, sensor-state-data, @@ -13,33 +14,31 @@ buildPythonPackage rec { pname = "sensorpush-ble"; - version = "1.6.2"; + version = "1.7.1"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "sensorpush-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-IZ2QSAHRdpDKFQYfqkcUm1o+7GaI8e50gEFRK3BV3s8="; + hash = "sha256-T2sjzQoWWRGAKiMDN29jZ7jZ5/i75qpNCiuVB7VEhJw="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=sensorpush_ble --cov-report=term-missing:skip-covered" "" - ''; + build-system = [ poetry-core ]; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ + dependencies = [ bluetooth-data-tools bluetooth-sensor-state-data home-assistant-bluetooth sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "sensorpush_ble" ]; diff --git a/pkgs/development/python-modules/sensoterra/default.nix b/pkgs/development/python-modules/sensoterra/default.nix new file mode 100644 index 000000000000..a592bd652fc3 --- /dev/null +++ b/pkgs/development/python-modules/sensoterra/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + requests, + setuptools, +}: + +buildPythonPackage rec { + pname = "sensoterra"; + version = "2.0.1"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-WfjTOns5OPU8+ufDeFdDGjURhBWUFfw/qRSHQazBL04="; + }; + + build-system = [ setuptools ]; + + dependencies = [ requests ]; + + # Test require network access + doCheck = false; + + pythonImportsCheck = [ "sensoterra" ]; + + meta = { + description = "Query Sensoterra probes using the Customer API"; + homepage = "https://gitlab.com/sensoterra/public/python"; + changelog = "https://gitlab.com/sensoterra/public/python/-/blob/main/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix index b9cf305a8d65..453105e4b765 100644 --- a/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/pkgs/development/python-modules/sentence-transformers/default.nix @@ -23,19 +23,19 @@ accelerate, datasets, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { pname = "sentence-transformers"; - version = "3.1.1"; + version = "3.2.1"; pyproject = true; src = fetchFromGitHub { owner = "UKPLab"; repo = "sentence-transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-YtAgv0vH2aL7UX3ETVfwDEQYEWYo5Pj/R45CeH7T3BU="; + hash = "sha256-5N5yObR3+3eV65ojFJFhzDbqtjNi/U2IhHlAaKttcVI="; }; build-system = [ setuptools ]; @@ -57,7 +57,7 @@ buildPythonPackage rec { accelerate datasets pytestCheckHook - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "sentence_transformers" ]; @@ -65,11 +65,16 @@ buildPythonPackage rec { disabledTests = [ # Tests require network access "test_cmnrl_same_grad" + "test_forward" + "test_initialization_with_embedding_dim" + "test_initialization_with_embedding_weights" "test_LabelAccuracyEvaluator" "test_model_card_reuse" "test_paraphrase_mining" "test_ParaphraseMiningEvaluator" + "test_save_and_load" "test_simple_encode" + "test_tokenize" "test_trainer" "test_trainer_invalid_column_names" "test_trainer_multi_dataset_errors" diff --git a/pkgs/development/python-modules/sentry-sdk/1.nix b/pkgs/development/python-modules/sentry-sdk/1.nix index 3f57549a1e39..c09abf95944c 100644 --- a/pkgs/development/python-modules/sentry-sdk/1.nix +++ b/pkgs/development/python-modules/sentry-sdk/1.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; beam = [ apache-beam ]; bottle = [ bottle ]; @@ -102,7 +102,7 @@ buildPythonPackage rec { pytestCheckHook ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; disabledTests = [ # Issue with the asseration diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 14c1db340348..e3d542906a71 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.14.0"; + version = "2.15.0"; pyproject = true; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-VrrzM81O3tG2GveP8Eq9kxVPSok7JIj3XjGOauGIlxY="; + hash = "sha256-jrApaDZ+R/bMOqOuQZguP9ySt6nKJeJYNpJTNTxq3no="; }; postPatch = '' diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix index f6ddf5540703..9a1708593f32 100644 --- a/pkgs/development/python-modules/serpent/default.nix +++ b/pkgs/development/python-modules/serpent/default.nix @@ -1,25 +1,27 @@ { lib, + attrs, buildPythonPackage, fetchPypi, - isPy27, - enum34, - attrs, - pytz, pytestCheckHook, + pythonOlder, + pytz, + setuptools, }: buildPythonPackage rec { pname = "serpent"; version = "1.41"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; hash = "sha256-BAcDX+PGZEOH1Iz/FGfVqp/v+BTQc3K3hnftDuPtcJU="; }; - propagatedBuildInputs = lib.optionals isPy27 [ enum34 ]; + build-system = [ setuptools ]; nativeCheckInputs = [ attrs @@ -27,9 +29,12 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ "serpent" ]; + meta = with lib; { description = "Simple serialization library based on ast.literal_eval"; homepage = "https://github.com/irmen/Serpent"; + changelog = "https://github.com/irmen/Serpent/releases/tag/serpent-${version}"; license = licenses.mit; maintainers = with maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/setuptools-dso/default.nix b/pkgs/development/python-modules/setuptools-dso/default.nix index 707a404a9025..094c66d1c4a0 100644 --- a/pkgs/development/python-modules/setuptools-dso/default.nix +++ b/pkgs/development/python-modules/setuptools-dso/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "setuptools-dso"; - version = "2.10"; + version = "2.11"; pyproject = true; src = fetchPypi { pname = "setuptools_dso"; inherit version; - hash = "sha256-sjAZ9enOw3vF3zqXNbhu45SM5/sv2kIwfKC6SWJdG0Q="; + hash = "sha256-lT5mp0TiHbvkrXPiK5/uLke65znya8Y6s3RzpFuXVFY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index 89ece83ec054..e9152ab0c561 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -17,26 +17,26 @@ buildPythonPackage rec { pname = "setuptools-rust"; - version = "1.9.0"; + version = "1.10.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - hash = "sha256-cE3wlI8uTMYMJZatboQOpnn09D5Y7UrQwYV4ByQOq5Y="; + pname = "setuptools_rust"; + inherit version; + hash = "sha256-15A1/FTN+TQunt9LAJSR7KsGw6ZSs3w8E3x7qFVH0+Y="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ semantic-version setuptools - typing-extensions - ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; pythonImportsCheck = [ "setuptools_rust" ]; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 7882a9363860..8b53de0a4890 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -10,19 +10,18 @@ buildPythonPackage rec { pname = "setuptools"; - version = "72.1.0"; + version = "75.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "setuptools"; rev = "refs/tags/v${version}"; - hash = "sha256-3Hm9HxJdSmyhHtDZeMF76HaR17vZwZWYYhS6Z0nA8rU="; + hash = "sha256-ZvhXfusayUHHFXl7ZBksFhxTi1p+Va6qAwq7Fo7Tg/s="; }; patches = [ ./tag-date.patch - ./setuptools-distutils-C++.patch ]; nativeBuildInputs = [ wheel ]; diff --git a/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch b/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch deleted file mode 100644 index 10eae862de8a..000000000000 --- a/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff --git a/setuptools/_distutils/cygwinccompiler.py b/setuptools/_distutils/cygwinccompiler.py -index 7b812fd05..c122a4318 100644 ---- a/setuptools/_distutils/cygwinccompiler.py -+++ b/setuptools/_distutils/cygwinccompiler.py -@@ -99,14 +99,18 @@ class CygwinCCompiler(UnixCCompiler): - self.cxx = os.environ.get('CXX', 'g++') - - self.linker_dll = self.cc -+ self.linker_dll_cxx = self.cxx - shared_option = "-shared" - - self.set_executables( - compiler=f'{self.cc} -mcygwin -O -Wall', - compiler_so=f'{self.cc} -mcygwin -mdll -O -Wall', -+ compiler_so_cxx=f'{self.cxx} -mcygwin -mdll -O -Wall', - compiler_cxx=f'{self.cxx} -mcygwin -O -Wall', - linker_exe=f'{self.cc} -mcygwin', - linker_so=(f'{self.linker_dll} -mcygwin {shared_option}'), -+ linker_exe_cxx=f'{self.cxx} -mcygwin', -+ linker_so_cxx=(f'{self.cxx} -mcygwin {shared_option}'), - ) - - # Include the appropriate MSVC runtime library if Python was built -@@ -138,9 +142,12 @@ class CygwinCCompiler(UnixCCompiler): - raise CompileError(msg) - else: # for other files use the C-compiler - try: -- self.spawn( -- self.compiler_so + cc_args + [src, '-o', obj] + extra_postargs -- ) -+ if self.detect_language(src) == 'c++': -+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn( -+ self.compiler_so + cc_args + [src, '-o', obj] + extra_postargs) - except DistutilsExecError as msg: - raise CompileError(msg) - -@@ -276,9 +283,12 @@ class Mingw32CCompiler(CygwinCCompiler): - self.set_executables( - compiler=f'{self.cc} -O -Wall', - compiler_so=f'{self.cc} -shared -O -Wall', -+ compiler_so_cxx=f'{self.cxx} -mdll -O -Wall', - compiler_cxx=f'{self.cxx} -O -Wall', - linker_exe=f'{self.cc}', - linker_so=f'{self.linker_dll} {shared_option}', -+ linker_exe_cxx=f'{self.cxx}', -+ linker_so_cxx=f'{self.linker_dll_cxx} {shared_option}', - ) - - def runtime_library_dir_option(self, dir): -diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py -index 7ebe67687..a995edf80 100644 ---- a/setuptools/_distutils/sysconfig.py -+++ b/setuptools/_distutils/sysconfig.py -@@ -304,6 +304,7 @@ def customize_compiler(compiler): # noqa: C901 - cflags, - ccshared, - ldshared, -+ ldcxxshared, - shlib_suffix, - ar, - ar_flags, -@@ -313,11 +314,14 @@ def customize_compiler(compiler): # noqa: C901 - 'CFLAGS', - 'CCSHARED', - 'LDSHARED', -+ 'LDCXXSHARED', - 'SHLIB_SUFFIX', - 'AR', - 'ARFLAGS', - ) - -+ cxxflags = cflags -+ - if 'CC' in os.environ: - newcc = os.environ['CC'] - if 'LDSHARED' not in os.environ and ldshared.startswith(cc): -@@ -329,19 +333,27 @@ def customize_compiler(compiler): # noqa: C901 - cxx = os.environ['CXX'] - if 'LDSHARED' in os.environ: - ldshared = os.environ['LDSHARED'] -+ if 'LDCXXSHARED' in os.environ: -+ ldcxxshared = os.environ['LDCXXSHARED'] - if 'CPP' in os.environ: - cpp = os.environ['CPP'] - else: - cpp = cc + " -E" # not always - if 'LDFLAGS' in os.environ: - ldshared = ldshared + ' ' + os.environ['LDFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] - if 'CFLAGS' in os.environ: -- cflags = cflags + ' ' + os.environ['CFLAGS'] -+ cflags = os.environ['CFLAGS'] - ldshared = ldshared + ' ' + os.environ['CFLAGS'] -+ if 'CXXFLAGS' in os.environ: -+ cxxflags = os.environ['CXXFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] - if 'CPPFLAGS' in os.environ: - cpp = cpp + ' ' + os.environ['CPPFLAGS'] - cflags = cflags + ' ' + os.environ['CPPFLAGS'] -+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] - ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] - if 'AR' in os.environ: - ar = os.environ['AR'] - if 'ARFLAGS' in os.environ: -@@ -350,13 +362,17 @@ def customize_compiler(compiler): # noqa: C901 - archiver = ar + ' ' + ar_flags - - cc_cmd = cc + ' ' + cflags -+ cxx_cmd = cxx + ' ' + cxxflags - compiler.set_executables( - preprocessor=cpp, - compiler=cc_cmd, - compiler_so=cc_cmd + ' ' + ccshared, -- compiler_cxx=cxx, -+ compiler_cxx=cxx_cmd, -+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, - linker_so=ldshared, -+ linker_so_cxx=ldcxxshared, - linker_exe=cc, -+ linker_exe_cxx=cxx, - archiver=archiver, - ) - -diff --git a/setuptools/_distutils/unixccompiler.py b/setuptools/_distutils/unixccompiler.py -index 7e68596b2..7214dbd20 100644 ---- a/setuptools/_distutils/unixccompiler.py -+++ b/setuptools/_distutils/unixccompiler.py -@@ -118,9 +118,12 @@ class UnixCCompiler(CCompiler): - 'preprocessor': None, - 'compiler': ["cc"], - 'compiler_so': ["cc"], -- 'compiler_cxx': ["cc"], -+ 'compiler_cxx': ["c++"], -+ 'compiler_so_cxx': ["c++"], - 'linker_so': ["cc", "-shared"], -+ 'linker_so_cxx': ["c++", "-shared"], - 'linker_exe': ["cc"], -+ 'linker_exe_cxx': ["c++", "-shared"], - 'archiver': ["ar", "-cr"], - 'ranlib': None, - } -@@ -187,8 +190,13 @@ class UnixCCompiler(CCompiler): - - def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): - compiler_so = compiler_fixup(self.compiler_so, cc_args + extra_postargs) -+ compiler_so_cxx = compiler_fixup(self.compiler_so_cxx, cc_args + extra_postargs) - try: -- self.spawn(compiler_so + cc_args + [src, '-o', obj] + extra_postargs) -+ if self.detect_language(src) == 'c++': -+ self.spawn(compiler_so_cxx + cc_args + [ src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn(compiler_so + cc_args + [src, '-o', obj] + extra_postargs) - except DistutilsExecError as msg: - raise CompileError(msg) - -@@ -256,7 +264,8 @@ class UnixCCompiler(CCompiler): - # building an executable or linker_so (with shared options) - # when building a shared library. - building_exe = target_desc == CCompiler.EXECUTABLE -- linker = (self.linker_exe if building_exe else self.linker_so)[:] -+ linker = (self.linker_exe if building_exe else (self.linker_so_cxx if -+ target_lang == "c++" else self.linker_so))[:] - - if target_lang == "c++" and self.compiler_cxx: - env, linker_ne = _split_env(linker) diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix index 4764b5ff573f..d68d4485a095 100644 --- a/pkgs/development/python-modules/sfrbox-api/default.nix +++ b/pkgs/development/python-modules/sfrbox-api/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { httpx ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click ]; }; @@ -47,7 +47,7 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook respx - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "sfrbox_api" ]; diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix index 51a4a9d842f6..06ae4cd49b4d 100644 --- a/pkgs/development/python-modules/sh/default.nix +++ b/pkgs/development/python-modules/sh/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "sh"; - version = "2.0.6"; + version = "2.0.7"; format = "pyproject"; src = fetchFromGitHub { owner = "amoffat"; repo = "sh"; rev = "refs/tags/${version}"; - hash = "sha256-c4Ms4ydcW7LgmAI1WuYD74nzILuY/Xg+JePJe0q5AQQ="; + hash = "sha256-O0jS/hO31ou9h0xsMSKAy76vEELjryaHKbvdfzYevJc="; }; nativeBuildInputs = [ poetry-core ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { # https://github.com/amoffat/sh/issues/684 "test_general_signal" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Disable tests that fail on Darwin sandbox "test_background_exception" "test_cwd" diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index 25246028a514..14d7ca023884 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -13,7 +13,6 @@ matplotlib, numba, numpy, - oldest-supported-numpy, opencv4, pandas, pyspark, @@ -31,7 +30,7 @@ buildPythonPackage rec { pname = "shap"; - version = "0.45.1"; + version = "0.46.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,16 +39,21 @@ buildPythonPackage rec { owner = "slundberg"; repo = "shap"; rev = "refs/tags/v${version}"; - hash = "sha256-REMAubT9WRe0exfhO4UCLt3FFQHq4HApHnI6i2F/V1o="; + hash = "sha256-qW36/Xw5oaYKmaMfE5euzkED9CKkjl2O55aO0OpCkfI="; }; - nativeBuildInputs = [ - oldest-supported-numpy + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "numpy>=2.0" "numpy" + ''; + + build-system = [ + numpy setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ cloudpickle numba numpy @@ -60,7 +64,7 @@ buildPythonPackage rec { tqdm ]; - passthru.optional-dependencies = { + optional-dependencies = { plots = [ matplotlib ipython diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index db6e185cb9b2..0959a8e3e0c9 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { cd $out ''; - disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # FIXME(lf-): these logging tests are broken, which is definitely our # fault. I've tried figuring out the cause and failed. # diff --git a/pkgs/development/python-modules/shaperglot/default.nix b/pkgs/development/python-modules/shaperglot/default.nix index 20c898c07698..9a5d761acf71 100644 --- a/pkgs/development/python-modules/shaperglot/default.nix +++ b/pkgs/development/python-modules/shaperglot/default.nix @@ -6,9 +6,10 @@ num2words, protobuf, pytestCheckHook, + pythonOlder, pyyaml, - setuptools, setuptools-scm, + setuptools, strictyaml, termcolor, ufo2ft, @@ -18,17 +19,29 @@ buildPythonPackage rec { pname = "shaperglot"; - version = "0.5.0"; + version = "0.6.4"; + pyproject = true; + + disabled = pythonOlder "3.7"; - # PyPI source tarballs omit tests, fetch from Github instead src = fetchFromGitHub { owner = "googlefonts"; repo = "shaperglot"; rev = "refs/tags/v${version}"; - hash = "sha256-jmYB1tsMMpFs0X/FW3z9el2nFr8De2jR1dO658w7U4Q="; + hash = "sha256-O6z7TJpC54QkqX5/G1HKSvaDYty7B9BnCQ4FpsLsEMs="; }; - pyproject = true; + env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools>=75.0.0" "setuptools" + ''; + + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ gflanguages @@ -41,19 +54,17 @@ buildPythonPackage rec { vharfbuzz youseedee ]; - build-system = [ - setuptools - setuptools-scm - ]; - doCheck = true; nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "shaperglot" ]; + meta = with lib; { description = "Tool to test OpenType fonts for language support"; - mainProgram = "shaperglot"; homepage = "https://github.com/googlefonts/shaperglot"; + changelog = "https://github.com/googlefonts/shaperglot/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ danc86 ]; + mainProgram = "shaperglot"; }; } diff --git a/pkgs/development/python-modules/shazamio/default.nix b/pkgs/development/python-modules/shazamio/default.nix index 06f058b03275..a23ddc53b33e 100644 --- a/pkgs/development/python-modules/shazamio/default.nix +++ b/pkgs/development/python-modules/shazamio/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "shazamio"; - version = "0.5.1"; + version = "0.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "dotX12"; repo = "ShazamIO"; rev = "refs/tags/${version}"; - hash = "sha256-nzKvEoh1DrZegoRNqOCh9Qm+7B7uQ9dEH75mVueGxZI="; + hash = "sha256-PYA7HUm++4r4kwezyPi3mWRRGF47qHjz2nHUZmVYk/I="; }; patches = [ diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index e35ca8ff6f02..88f59fc86ebb 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -1,6 +1,5 @@ { python, - pythonAtLeast, lib, stdenv, pyside2, @@ -15,35 +14,20 @@ stdenv.mkDerivation { inherit (pyside2) version src patches; - 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 - ''; + postPatch = '' + cd sources/shiboken2 + ''; CLANG_INSTALL_DIR = llvmPackages_15.libclang.out; nativeBuildInputs = [ cmake - (python.withPackages (ps: with ps; [ setuptools ])) + (python.withPackages ( + ps: with ps; [ + distutils + setuptools + ] + )) ]; buildInputs = diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix index e3d5490a6c36..e5889977ed13 100644 --- a/pkgs/development/python-modules/shiboken6/default.nix +++ b/pkgs/development/python-modules/shiboken6/default.nix @@ -13,27 +13,29 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "shiboken6"; - version = "6.7.2"; + version = "6.8.0.2"; src = fetchurl { # https://download.qt.io/official_releases/QtForPython/shiboken6/ - url = "mirror://qt/official_releases/QtForPython/shiboken6/PySide6-${finalAttrs.version}-src/pyside-setup-everywhere-src-${finalAttrs.version}.tar.xz"; - hash = "sha256-OisNDW54yapd3H8GyktvEaP+FFYLrrFI7qU7XZjjaMc="; + # FIXME: inconsistent version numbers in directory name and tarball? + url = "mirror://qt/official_releases/QtForPython/shiboken6/PySide6-6.8.0.2-src/pyside-setup-everywhere-src-6.8.0.tar.xz"; + hash = "sha256-Ghohmo8yfjQNJYJ1+tOp8mG48EvFcEF0fnPdatJStOE="; }; - sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/shiboken6"; + sourceRoot = "pyside-setup-everywhere-src-6.8.0/sources/shiboken6"; patches = [ ./fix-include-qt-headers.patch ]; nativeBuildInputs = [ cmake (python.pythonOnBuildForHost.withPackages (ps: [ ps.setuptools ])) - ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ llvmPackages.llvm llvmPackages.libclang python.pkgs.qt6.qtbase + python.pkgs.qt6.darwinVersionInputs python.pkgs.ninja python.pkgs.packaging python.pkgs.setuptools diff --git a/pkgs/development/python-modules/shimmy/default.nix b/pkgs/development/python-modules/shimmy/default.nix index b50135e517bf..eb19b4e16398 100644 --- a/pkgs/development/python-modules/shimmy/default.nix +++ b/pkgs/development/python-modules/shimmy/default.nix @@ -1,12 +1,17 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, + fetchpatch, + + # build-system setuptools, - wheel, + + # dependencies gymnasium, numpy, + + # tests ale-py, bsuite, dm-control, @@ -18,21 +23,32 @@ buildPythonPackage rec { pname = "shimmy"; - version = "1.3.0"; + version = "2.0.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "Farama-Foundation"; repo = "Shimmy"; rev = "refs/tags/v${version}"; - hash = "sha256-rYBbGyMSFF/iIGruKn2JXKAVIZIfJDEHUEZUESiUg/k="; + hash = "sha256-/wIXjOGb3UeMQdeifYagd7OcxbBcdGPS09mjvkFsWmk="; }; + patches = [ + # Shimmy tries to register some environments from `dm-control` that require unpackaged `labmaze`. + # This prevents from importing `shimmy` itself by crashing with a `ModuleNotFoundError`. + # This patch imports those environments lazily. + # + # TODO: get rid of this patch at the next release as the issue has been fixed upstream: + # https://github.com/Farama-Foundation/Shimmy/pull/125 + (fetchpatch { + name = "prevent-labmaze-import-crash"; + url = "https://github.com/Farama-Foundation/Shimmy/commit/095d576f6aae15a09a1e426138629ce9f43a3c04.patch"; + hash = "sha256-rr9l3tHunYFk0j7hfo9IaSRlogAtwXoXcQ0zuU/TL8c="; + }) + ]; + build-system = [ setuptools - wheel ]; dependencies = [ @@ -58,10 +74,6 @@ buildPythonPackage rec { # Requires unpackaged pyspiel "tests/test_openspiel.py" - - # Broken since ale-py v0.9.0 due to API change - # https://github.com/Farama-Foundation/Shimmy/issues/120 - "tests/test_atari.py" ]; preCheck = '' diff --git a/pkgs/development/python-modules/shippinglabel/default.nix b/pkgs/development/python-modules/shippinglabel/default.nix index 5cb75872f870..c0ae4fa635e9 100644 --- a/pkgs/development/python-modules/shippinglabel/default.nix +++ b/pkgs/development/python-modules/shippinglabel/default.nix @@ -11,12 +11,12 @@ }: buildPythonPackage rec { pname = "shippinglabel"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-hZYsK+IX/a4bZMtD+hMEYDnwgqhdkkEHkG0MPkAgy20="; + hash = "sha256-XwE/b7TQ7i+2hMSdZJhyVjl2lieweZLbA6PXcSJTnFE="; }; build-system = [ setuptools ]; @@ -29,8 +29,6 @@ buildPythonPackage rec { typing-extensions ]; - nativeCheckInputs = [ ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' diff --git a/pkgs/development/python-modules/shiv/default.nix b/pkgs/development/python-modules/shiv/default.nix index 804c33c3e744..346874edfa0c 100644 --- a/pkgs/development/python-modules/shiv/default.nix +++ b/pkgs/development/python-modules/shiv/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "shiv"; - version = "1.0.6"; + version = "1.0.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-4iJ2gTWXe+vftcDRp9/qKVV8VmtY0wDVuMJTXvIj13Y="; + hash = "sha256-lHdX/iY4OuntoMV288uiRN+jcV7S9Jk1RLdYJF9xqxU="; }; propagatedBuildInputs = [ 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 a43b08ee1c9e..a08a874d690c 100644 --- a/pkgs/development/python-modules/show-in-file-manager/default.nix +++ b/pkgs/development/python-modules/show-in-file-manager/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools ]; - propagatedBuildInputs = [ packaging ] ++ lib.optional (stdenv.isLinux) pyxdg; + propagatedBuildInputs = [ packaging ] ++ lib.optional (stdenv.hostPlatform.isLinux) pyxdg; meta = with lib; { homepage = "https://github.com/damonlynch/showinfilemanager"; diff --git a/pkgs/development/python-modules/signxml/default.nix b/pkgs/development/python-modules/signxml/default.nix index cf5b9504012e..433858761261 100644 --- a/pkgs/development/python-modules/signxml/default.nix +++ b/pkgs/development/python-modules/signxml/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "signxml"; - version = "3.2.2"; + version = "4.0.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,12 +22,12 @@ buildPythonPackage rec { owner = "XML-Security"; repo = "signxml"; rev = "refs/tags/v${version}"; - hash = "sha256-TlOIHYvx1o46nr/3qq45pgeOqmuyWaaTGvOS0Jwz1zs="; + hash = "sha256-ZpboU0N8dD03yHSboMpC+TJvp16StM45Qhn0Hv9+6fg="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ certifi cryptography lxml diff --git a/pkgs/development/python-modules/sigstore-rekor-types/default.nix b/pkgs/development/python-modules/sigstore-rekor-types/default.nix index 7498a29ee104..9aafd726976e 100644 --- a/pkgs/development/python-modules/sigstore-rekor-types/default.nix +++ b/pkgs/development/python-modules/sigstore-rekor-types/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "sigstore-rekor-types"; - version = "0.0.11"; + version = "0.0.13"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "trailofbits"; repo = "sigstore-rekor-types"; rev = "refs/tags/v${version}"; - hash = "sha256-oOFdRiDp9USc3A+aaPExprEO2i/RERNahiyi2kVpkns="; + hash = "sha256-vZNzNu0Ks0Xp/v406jVqPV9FuHgXORMa7NzmXeWoa+Q="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/simpful/default.nix b/pkgs/development/python-modules/simpful/default.nix index 74c88e6a5644..731d9299fc2c 100644 --- a/pkgs/development/python-modules/simpful/default.nix +++ b/pkgs/development/python-modules/simpful/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { plotting = [ matplotlib seaborn @@ -44,7 +44,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "simpful" ]; @@ -54,6 +54,6 @@ buildPythonPackage rec { changelog = "https://github.com/aresio/simpful/releases/tag/${version}"; license = with licenses; [ lgpl3Only ]; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix index 21cd49585fe7..df1765637a5e 100644 --- a/pkgs/development/python-modules/simpleeval/default.nix +++ b/pkgs/development/python-modules/simpleeval/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "simpleeval"; - version = "0.9.13"; + version = "1.0.0"; format = "pyproject"; src = fetchFromGitHub { owner = "danthedeckie"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-I1GILYPE6OyotgRe0Ek/iHHv6q9/b/MlcTxMAtfZD80="; + hash = "sha256-Ryi3ZzIPQ0x/rCQFfoXDOjLuE110n/vUbpvt2IX4GyA="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index bbebbfd35867..644ae86eb5d8 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.19.2"; + version = "3.19.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,12 +18,12 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+HHtU6sxxwISciLxiwa5m1zj7h/SLDmRxOZNqW5FQSY="; + hash = "sha256-M6ohYhw7xvZiNVm9uhotvPHeVsBOwYjDpj2sfXAzf0U="; }; nativeCheckInputs = [ pytestCheckHook ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "simplejson" ]; diff --git a/pkgs/development/python-modules/simplemma/default.nix b/pkgs/development/python-modules/simplemma/default.nix index 3cd1ddface07..191fbb5df796 100644 --- a/pkgs/development/python-modules/simplemma/default.nix +++ b/pkgs/development/python-modules/simplemma/default.nix @@ -1,34 +1,49 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, - + setuptools, + marisa-trie, + platformdirs, + pytest, + pytest-cov-stub, pytestCheckHook, }: buildPythonPackage rec { pname = "simplemma"; - version = "1.0.0"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + version = "1.1.1"; + pyproject = true; src = fetchFromGitHub { owner = "adbar"; repo = "simplemma"; rev = "refs/tags/v${version}"; - hash = "sha256-lhk6QrBg0m8orYHphnP+YiCnJFE44buyp3NQbz0U550="; + hash = "sha256-X0mqFPdCo0/sTexv4bi4bND7LFHOJvlOPH6tB39ybZY="; + }; + + build-system = [ + setuptools + ]; + + optional-dependencies = { + marisa-trie = [ + marisa-trie + platformdirs + ]; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "simplemma" ]; - meta = with lib; { + meta = { description = "Simple multilingual lemmatizer for Python, especially useful for speed and efficiency"; homepage = "https://github.com/adbar/simplemma"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/simplesat/default.nix b/pkgs/development/python-modules/simplesat/default.nix index 3f81b311c811..35359c29396d 100644 --- a/pkgs/development/python-modules/simplesat/default.nix +++ b/pkgs/development/python-modules/simplesat/default.nix @@ -1,42 +1,34 @@ { - buildPythonPackage, - fetchFromGitHub, - writeText, lib, attrs, + buildPythonPackage, + fetchFromGitHub, mock, okonomiyaki, pytestCheckHook, + pythonOlder, pyyaml, setuptools, six, }: -let - version = "0.9.0"; - versionFile = writeText "simplesat_ver" '' - version = '${version}' - full_version = '${version}' - git_revision = '0000000000000000000000000000000000000000' - is_released = True - msi_version = '${version}.000' - version_info = (${lib.versions.major version}, ${lib.versions.minor version}, ${lib.versions.patch version}, 'final', 0) - ''; -in buildPythonPackage rec { pname = "simplesat"; - inherit version; + version = "0.9.1"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchFromGitHub { owner = "enthought"; repo = "sat-solver"; rev = "refs/tags/v${version}"; - hash = "sha256-8sUOV42MLM3otG3EKvVzKKGAUpSlaTj850QZxZa62bE="; + hash = "sha256-/fBnpf1DtaF+wQYZztcB8Y20/ZMYxrF3fH5qRsMucL0="; }; - preConfigure = '' - cp ${versionFile} simplesat/_version.py + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "version = file: VERSION" "version = ${version}" ''; build-system = [ setuptools ]; @@ -47,20 +39,26 @@ buildPythonPackage rec { six ]; - pythonImportsCheck = [ "simplesat" ]; - nativeCheckInputs = [ mock pytestCheckHook pyyaml ]; + pythonImportsCheck = [ "simplesat" ]; + + preCheck = '' + substituteInPlace simplesat/tests/test_pool.py \ + --replace-fail "assertRaisesRegexp" "assertRaisesRegex" + ''; + pytestFlagsArray = [ "simplesat/tests" ]; meta = with lib; { - homepage = "https://github.com/enthought/sat-solver"; description = "Prototype for SAT-based dependency handling"; - maintainers = with maintainers; [ genericnerdyusername ]; + homepage = "https://github.com/enthought/sat-solver"; + changelog = "https://github.com/enthought/sat-solver/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; + maintainers = with maintainers; [ genericnerdyusername ]; }; } diff --git a/pkgs/development/python-modules/sip/4.x.nix b/pkgs/development/python-modules/sip/4.x.nix index e9305188ca6b..8dc26ddfdc0d 100644 --- a/pkgs/development/python-modules/sip/4.x.nix +++ b/pkgs/development/python-modules/sip/4.x.nix @@ -57,8 +57,6 @@ buildPythonPackage rec { "sipconfig" ]; - doCheck = true; - meta = with lib; { description = "Creates C++ bindings for Python modules"; mainProgram = "sip"; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 8a398654b08c..8fd6240e4a51 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -4,6 +4,7 @@ fetchPypi, pythonOlder, setuptools, + setuptools-scm, packaging, tomli, @@ -15,17 +16,20 @@ buildPythonPackage rec { pname = "sip"; - version = "6.8.3"; + version = "6.8.6"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-iIVHsBi7JMNq3tUZ6T0+UT1MaqC6VbfMGv+9Rc8Qdiw="; + hash = "sha256-f8lZ5I5uxdWvi9Am9p9eJNCLPLirs0IXb1q4AwzAfXo="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ packaging setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; diff --git a/pkgs/development/python-modules/siphashc/default.nix b/pkgs/development/python-modules/siphashc/default.nix index 639f06ead5f1..5b8b11142d33 100644 --- a/pkgs/development/python-modules/siphashc/default.nix +++ b/pkgs/development/python-modules/siphashc/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "siphashc"; - version = "2.4.1"; + version = "2.5"; pyproject = true; build-system = [ setuptools ]; src = fetchPypi { inherit pname version; - sha256 = "sha256-ptNpy7VkUXHbjvdir6v+eYOmtQ/j8XPXq4lj7ceS/5s="; + sha256 = "sha256-o7zGnOM96+C0I98iSYzua2MB8TP1okdw/m9O9I2DK00="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sipyco/default.nix b/pkgs/development/python-modules/sipyco/default.nix index 438072e9b072..277aa4961f3d 100644 --- a/pkgs/development/python-modules/sipyco/default.nix +++ b/pkgs/development/python-modules/sipyco/default.nix @@ -2,31 +2,33 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, + setuptools, pytestCheckHook, numpy, }: buildPythonPackage rec { pname = "sipyco"; - version = "1.4"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "1.8"; + pyproject = true; src = fetchFromGitHub { owner = "m-labs"; repo = "sipyco"; rev = "refs/tags/v${version}"; - hash = "sha256-sEYWtp11piUIa8YyuTOdFIIJ2GfcrUb+HEzPVKr4hW8="; + hash = "sha256-PPnAyDedUQ7Og/Cby9x5OT9wMkNGTP8GS53V6N/dk4w="; }; - propagatedBuildInputs = [ numpy ]; + build-system = [ setuptools ]; + + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "sipyco" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Simple Python Communications - used by the ARTIQ experimental control package"; mainProgram = "sipyco_rpctool"; diff --git a/pkgs/development/python-modules/sismic/default.nix b/pkgs/development/python-modules/sismic/default.nix index 8128e5490d29..0a6cd34b3856 100644 --- a/pkgs/development/python-modules/sismic/default.nix +++ b/pkgs/development/python-modules/sismic/default.nix @@ -11,7 +11,7 @@ }: let - version = "1.6.6"; + version = "1.6.7"; in buildPythonPackage { pname = "sismic"; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "AlexandreDecan"; repo = "sismic"; rev = "refs/tags/${version}"; - hash = "sha256-MvJyyERH0l5547cVmpxnHXRf9q1ylK9/ZfyLYBQfsbY="; + hash = "sha256-EP78Wc2f6AKqbGBW8wVP0wogEbTo0ndjlRRd+fsUvCo="; }; pythonRelaxDeps = [ "behave" ]; diff --git a/pkgs/development/python-modules/skia-pathops/default.nix b/pkgs/development/python-modules/skia-pathops/default.nix index 15806e8b1bce..308ecd70de06 100644 --- a/pkgs/development/python-modules/skia-pathops/default.nix +++ b/pkgs/development/python-modules/skia-pathops/default.nix @@ -10,6 +10,7 @@ fetchPypi, gn, pytestCheckHook, + cctools, xcodebuild, ApplicationServices, OpenGL, @@ -33,7 +34,7 @@ buildPythonPackage rec { --replace "build_cmd = [sys.executable, build_skia_py, build_dir]" \ 'build_cmd = [sys.executable, build_skia_py, "--no-fetch-gn", "--no-virtualenv", "--gn-path", "${gn}/bin/gn", build_dir]' '' - + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' substituteInPlace src/cpp/skia-builder/skia/gn/skia/BUILD.gn \ --replace "-march=armv7-a" "-march=armv8-a" \ --replace "-mfpu=neon" "" \ @@ -42,7 +43,7 @@ buildPythonPackage rec { --replace "defined(SK_CPU_ARM64)" "0" '' + - lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) # old compiler? + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) # old compiler? '' patch -p1 <<EOF --- a/src/cpp/skia-builder/skia/include/private/base/SkTArray.h @@ -53,13 +54,18 @@ buildPythonPackage rec { EOF ''; - nativeBuildInputs = [ - cython - ninja - setuptools-scm - ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ]; + nativeBuildInputs = + [ + cython + ninja + setuptools-scm + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools.libtool + xcodebuild + ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices OpenGL ]; diff --git a/pkgs/development/python-modules/skops/default.nix b/pkgs/development/python-modules/skops/default.nix index f0d33093d5ef..70df89009fd3 100644 --- a/pkgs/development/python-modules/skops/default.nix +++ b/pkgs/development/python-modules/skops/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { # minor output formatting issue "skops/card/_model_card.py" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Segfaults on darwin "skops/io/tests/test_persist.py" ]; diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index 28a8f1771f4e..3e139d4714a8 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { # failing tests "test_pickle_load" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # there is a problem with the compiler selection "test_fit_and_predict_with_compile" ] diff --git a/pkgs/development/python-modules/skrl/default.nix b/pkgs/development/python-modules/skrl/default.nix index eb99c9240a56..921cbf4b2089 100644 --- a/pkgs/development/python-modules/skrl/default.nix +++ b/pkgs/development/python-modules/skrl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "skrl"; - version = "1.1.0"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Toni-SM"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-JsE8QQNOqvFQylrPuHEjejOTeQL652rM0EteAfLyeVI="; + hash = "sha256-kKkAdQymmgJ9V+73nYi4MhOSJvrO2jwJ2BUYhUGPHe0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/skyfield/default.nix b/pkgs/development/python-modules/skyfield/default.nix index d4d6fa3f1b96..b917cf214890 100644 --- a/pkgs/development/python-modules/skyfield/default.nix +++ b/pkgs/development/python-modules/skyfield/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "skyfield"; - version = "1.45"; + version = "1.49"; pyproject = true; src = fetchFromGitHub { owner = "skyfielders"; repo = "python-skyfield"; rev = version; - hash = "sha256-kZrXNVE+JGPGiVsd6CTwOqfciYLsD2A4pTS3FpqO+Dk="; + hash = "sha256-PZ63sohdfpop3nYQr2RIMjPbrL9jdfincEhw5D8NZ+Y="; }; # Fix broken tests on "exotic" platforms. @@ -49,10 +49,6 @@ buildPythonPackage rec { assay ]; - # assay is broken on Python >= 3.11 - # https://github.com/brandon-rhodes/assay/issues/15 - doCheck = pythonOlder "3.11"; - checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index 8d1087f4ab83..5baa8bb7405f 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -3,7 +3,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, appdirs, dungeon-eos, explorerscript, @@ -29,7 +28,7 @@ buildPythonPackage rec { pname = "skytemple-files"; - version = "1.7.0"; + version = "1.8.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -38,19 +37,11 @@ buildPythonPackage rec { owner = "SkyTemple"; repo = "skytemple-files"; rev = version; - hash = "sha256-G2AAQ+eRnsMTWrAF0SNmxUmOoHTSMCuSy1kUZbFy8y0="; + hash = "sha256-4ENuYq074j/VdzLyrGVCGaZhoStwlgJWTqGbrt20A3Q="; # 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-fail "exec_name = os.getenv(\"SKYTEMPLE_ARMIPS_EXEC\", f\"{prefix}armips\")" "exec_name = \"${armips}/bin/armips\"" @@ -72,7 +63,7 @@ buildPythonPackage rec { range-typed-integers ]; - passthru.optional-dependencies = { + optional-dependencies = { spritecollab = [ aiohttp gql @@ -85,11 +76,14 @@ buildPythonPackage rec { pytestCheckHook parameterized xmldiff - ] ++ passthru.optional-dependencies.spritecollab; - pytestFlagsArray = [ "test/" ]; + ] ++ optional-dependencies.spritecollab; + + preCheck = "pushd test"; + postCheck = "popd"; + disabledTestPaths = [ - "test/skytemple_files_test/common/spritecollab/sc_online_test.py" - "test/skytemple_files_test/compression_container/atupx/atupx_test.py" # Particularly long test + "skytemple_files_test/common/spritecollab/sc_online_test.py" + "skytemple_files_test/compression_container/atupx/atupx_test.py" # Particularly long test ]; pythonImportsCheck = [ "skytemple_files" ]; @@ -100,6 +94,6 @@ buildPythonPackage rec { mainProgram = "skytemple_export_maps"; license = licenses.gpl3Plus; maintainers = with maintainers; [ marius851000 ]; - broken = stdenv.isDarwin; # pyobjc is missing + broken = stdenv.hostPlatform.isDarwin; # pyobjc is missing }; } diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix index ed60b724f840..8b29df693088 100644 --- a/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -3,7 +3,7 @@ stdenv, buildPythonPackage, cargo, - fetchPypi, + fetchFromGitHub, libiconv, Foundation, rustPlatform, @@ -14,21 +14,23 @@ buildPythonPackage rec { pname = "skytemple-rust"; - version = "1.6.5"; + version = "1.8.2"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-bf+umrb5EIoCD2kheVpf9IwsW4Sf2hR7XOEzscYtLA8="; + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = "skytemple-rust"; + rev = version; + hash = "sha256-0hIwFJn/cwtKHKoD+upeorC52YnDlej3TrWf3PmAQAQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-0a57RmZPztcIeRs7GNYe18JO+LlWoeNWG3nD9cG0XIU="; + hash = "sha256-Gdypi9DJAXQgNaRCLEt4LTqUhBJC8plH0YhgNOIOGvA="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Foundation ]; diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix index e50bc2ae59aa..64bd47671d03 100644 --- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "skytemple-ssb-debugger"; - version = "1.7.0"; + version = "1.8.2"; pyproject = true; src = fetchFromGitHub { owner = "SkyTemple"; repo = "skytemple-ssb-debugger"; rev = version; - hash = "sha256-S38Nw7FntacEdwdGu2d/zUKOsGostVy9+U2KPxlvI5Q="; + hash = "sha256-HmJOjHX2/P284DSIdKuSz3++Qr1fKVGRQmA/+cMrcYw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/skytemple-ssb-emulator/Cargo.lock b/pkgs/development/python-modules/skytemple-ssb-emulator/Cargo.lock index 2960a441457b..f1e46028962e 100644 --- a/pkgs/development/python-modules/skytemple-ssb-emulator/Cargo.lock +++ b/pkgs/development/python-modules/skytemple-ssb-emulator/Cargo.lock @@ -4,36 +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 = "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 = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitvec" @@ -61,15 +55,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" [[package]] name = "cc" -version = "1.0.90" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" [[package]] name = "cfg-if" @@ -79,18 +73,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[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", ] [[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 = "desmume-rs" @@ -116,9 +110,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding" @@ -186,9 +180,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[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", @@ -196,9 +190,9 @@ 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 = "funty" @@ -234,48 +228,48 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[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" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[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", ] [[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 = "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 = "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 = "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 = "locale_config" @@ -291,20 +285,10 @@ dependencies = [ ] [[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[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 = "malloc_buf" @@ -317,15 +301,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", ] @@ -338,14 +322,14 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.71", ] [[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", ] @@ -408,33 +392,10 @@ dependencies = [ ] [[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.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 = "pkg-config" @@ -444,30 +405,30 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[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.78" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[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", @@ -477,9 +438,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", @@ -487,9 +448,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", @@ -497,9 +458,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", @@ -508,34 +469,34 @@ 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", "quote", - "syn 2.0.52", + "syn 2.0.71", ] [[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", "pyo3-build-config", "quote", - "syn 2.0.52", + "syn 2.0.71", ] [[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", ] @@ -547,19 +508,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[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 = "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", @@ -569,9 +521,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", @@ -580,17 +532,17 @@ 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 = "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.4.2", + "bitflags", "errno", "libc", "linux-raw-sys", @@ -599,41 +551,35 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "scopeguard" -version = "1.2.0" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.71", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -642,8 +588,8 @@ dependencies = [ [[package]] name = "skytemple_rust" -version = "1.6.4" -source = "git+https://github.com/SkyTemple/skytemple-rust.git?tag=1.6.4#6b16478906fb35595fa4307c0ac77dea37e12983" +version = "1.8.1" +source = "git+https://github.com/SkyTemple/skytemple-rust.git?tag=1.8.1#889e3e9e4f9fe82b350c0e36368a28d82727fbe9" dependencies = [ "bytes", "encoding", @@ -654,24 +600,16 @@ dependencies = [ "num-traits", "packed_struct", "paste", + "pyo3", + "pyo3-log", "skytemple_rust_macros", - "skytemple_rust_macros_no_py", "thiserror", ] [[package]] name = "skytemple_rust_macros" version = "1.4.0" -source = "git+https://github.com/SkyTemple/skytemple-rust.git?tag=1.6.4#6b16478906fb35595fa4307c0ac77dea37e12983" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "skytemple_rust_macros_no_py" -version = "1.4.0" -source = "git+https://github.com/SkyTemple/skytemple-rust.git?tag=1.6.4#6b16478906fb35595fa4307c0ac77dea37e12983" +source = "git+https://github.com/SkyTemple/skytemple-rust.git?tag=1.8.1#889e3e9e4f9fe82b350c0e36368a28d82727fbe9" dependencies = [ "quote", "syn 1.0.109", @@ -679,7 +617,7 @@ dependencies = [ [[package]] name = "skytemple_ssb_emulator" -version = "1.6.4" +version = "1.8.0" dependencies = [ "byteorder", "crossbeam-channel", @@ -694,16 +632,10 @@ dependencies = [ ] [[package]] -name = "smallvec" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - -[[package]] name = "sprintf" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2819cb5194dfe9e6d102f4519a9fb9dc7106d2879b71b4fd4d4677f1175bd39" +checksum = "39b60413e681681e22dfe3966674082c075c5f6ed73c3900b95dd19eb9e0181d" dependencies = [ "thiserror", ] @@ -721,9 +653,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" dependencies = [ "proc-macro2", "quote", @@ -738,15 +670,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[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 = "temp-dir" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" @@ -762,22 +694,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.71", ] [[package]] @@ -820,122 +752,72 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", -] - -[[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", + "windows-targets", ] [[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", + "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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" - -[[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 = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[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_msvc" -version = "0.48.5" +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" - -[[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 = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" - -[[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 = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" - -[[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 = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[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" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "wyz" diff --git a/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix b/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix index ad3fdd758bac..8b5f71030667 100644 --- a/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix @@ -2,7 +2,7 @@ alsa-lib, buildPythonPackage, cargo, - fetchPypi, + fetchFromGitHub, glib, lib, libpcap, @@ -21,18 +21,20 @@ }: buildPythonPackage rec { pname = "skytemple-ssb-emulator"; - version = "1.6.4"; + version = "1.8.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-qGRfX7Bwr19KJnIdhwuSVBZzXxMJyEgyBuy91aLhEj4="; + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + hash = "sha256-9xD9Q/oYsi9tuxTOJ6ItLbWkqAjG78uzXYZXOiITDEA="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "skytemple_rust-1.6.4" = "sha256-t7P3F1zes7bgDu2JGqb5DgxlDCiztWtmViy4QY9CzT0="; + "skytemple_rust-1.8.1" = "sha256-KtMqgUOlyF02msQRouE4NpvCHqahY+aRiRV9P32ASqg="; }; }; diff --git a/pkgs/development/python-modules/slack-bolt/default.nix b/pkgs/development/python-modules/slack-bolt/default.nix index 7eeb546c5d5d..9b533254b46f 100644 --- a/pkgs/development/python-modules/slack-bolt/default.nix +++ b/pkgs/development/python-modules/slack-bolt/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "slack-bolt"; - version = "1.18.1"; + version = "1.20.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "bolt-python"; rev = "refs/tags/v${version}"; - hash = "sha256-UwVStemFVA4hgqnSpCKpQGwLYG+p5z7MwFXXnIhrvNk="; + hash = "sha256-wDiRQ44ei59I8/2JXv2j9VQFthdyS7sSEZLS7trhdp0="; }; postPatch = '' @@ -63,7 +63,7 @@ buildPythonPackage rec { dependencies = [ slack-sdk ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiohttp websockets @@ -94,7 +94,7 @@ buildPythonPackage rec { docker pytest-asyncio pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export HOME="$(mktemp -d)" diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 2f4c2d0f0081..9a6bafea9c9d 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -4,7 +4,6 @@ aiohttp, boto3, buildPythonPackage, - codecov, fetchFromGitHub, flake8, flask-sockets, @@ -21,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.33.1"; + version = "3.33.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -30,7 +29,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-OcGzpYwa8Ouf1ojQS9KnqlL37EYCZo5yjNeXXrkd0B4="; + hash = "sha256-6Uvp7hVFgHVavJO6Un5L793pOOOBtaT4+eywS3rRWUU="; }; postPatch = '' @@ -50,7 +49,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - codecov flake8 flask-sockets moto diff --git a/pkgs/development/python-modules/sleekxmpp/default.nix b/pkgs/development/python-modules/sleekxmpp/default.nix index dea81113d390..9c8031a6b878 100644 --- a/pkgs/development/python-modules/sleekxmpp/default.nix +++ b/pkgs/development/python-modules/sleekxmpp/default.nix @@ -28,7 +28,8 @@ buildPythonPackage rec { }; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "XMPP library for Python"; license = licenses.mit; homepage = "http://sleekxmpp.com/"; diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index aa98f44b02ff..4e8412d2cb90 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -12,6 +12,7 @@ requests, moto, paramiko, + pynacl, pytestCheckHook, responses, setuptools, @@ -67,6 +68,7 @@ buildPythonPackage rec { moto pytestCheckHook responses + pynacl ] ++ lib.flatten (builtins.attrValues optional-dependencies); pytestFlagsArray = [ "smart_open" ]; diff --git a/pkgs/development/python-modules/smarthab/default.nix b/pkgs/development/python-modules/smarthab/default.nix index 4060a3a92a91..44bde1243e8c 100644 --- a/pkgs/development/python-modules/smarthab/default.nix +++ b/pkgs/development/python-modules/smarthab/default.nix @@ -3,20 +3,23 @@ buildPythonPackage, fetchPypi, aiohttp, + setuptools, }: buildPythonPackage rec { pname = "smarthab"; version = "0.21"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "SmartHab"; inherit version; - sha256 = "bf929455a2f7cc1e275b331de73d983587138a8d9179574988ba05fa152d3ccf"; + hash = "sha256-v5KUVaL3zB4nWzMd5z2YNYcTio2ReVdJiLoF+hUtPM8="; }; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; # no tests on PyPI, no tags on GitLab doCheck = false; diff --git a/pkgs/development/python-modules/smartypants/default.nix b/pkgs/development/python-modules/smartypants/default.nix index e51744b9f507..fb0ec8e4da24 100644 --- a/pkgs/development/python-modules/smartypants/default.nix +++ b/pkgs/development/python-modules/smartypants/default.nix @@ -11,8 +11,8 @@ }: buildPythonPackage rec { - version = "2.0.1"; pname = "smartypants"; + version = "2.0.1"; pyproject = true; disabled = isPyPy; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "leohemsted"; repo = "smartypants.py"; - rev = "v${version}"; - sha256 = "00p1gnb9pzb3svdq3c5b9b332gsp50wrqqa39gj00m133zadanjp"; + rev = "refs/tags/v${version}"; + hash = "sha256-V1rV1B8jVADkS0NhnDkoVz8xxkqrsIHb1mP9m5Z94QI="; }; patches = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ docutils @@ -47,9 +47,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python with the SmartyPants"; - mainProgram = "smartypants"; homepage = "https://github.com/leohemsted/smartypants.py"; + changelog = "https://github.com/leohemsted/smartypants.py/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; maintainers = with maintainers; [ dotlambda ]; + mainProgram = "smartypants"; }; } diff --git a/pkgs/development/python-modules/smbprotocol/default.nix b/pkgs/development/python-modules/smbprotocol/default.nix index e531acb40b99..f33a64fcaa8d 100644 --- a/pkgs/development/python-modules/smbprotocol/default.nix +++ b/pkgs/development/python-modules/smbprotocol/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "smbprotocol"; - version = "1.12.0"; + version = "1.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jborean93"; repo = "smbprotocol"; rev = "refs/tags/v${version}"; - hash = "sha256-1huM+/WDrVJsB4ARh6fB6rLFOe9IqSQWr/A78FAk/Ag="; + hash = "sha256-9J6p3rJeD6ZTOiumUQ7XX7nHI4mC3Sf+Gc+Fw2vwVk4="; }; propagatedBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/jborean93/smbprotocol/issues/119 "test_copymode_local_to_local_symlink_dont_follow" "test_copystat_local_to_local_symlink_dont_follow_fail" diff --git a/pkgs/development/python-modules/smbus2/default.nix b/pkgs/development/python-modules/smbus2/default.nix index f88d43362d58..e1a87118ab81 100644 --- a/pkgs/development/python-modules/smbus2/default.nix +++ b/pkgs/development/python-modules/smbus2/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "smbus2"; - version = "0.4.3"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kplindegaard"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-tjJurJzDn0ATiYY3Xo66lwUs98/7ZLG3d4+h1prVHAI="; + hash = "sha256-3ZAjviVLO/c27NzrPcWf6RlZYclYkmUmOskTP9TVbNM="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/smhi-pkg/default.nix b/pkgs/development/python-modules/smhi-pkg/default.nix index a31cb56a3a36..da71e6b5b7b7 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.17"; + version = "1.0.18"; format = "setuptools"; src = fetchFromGitHub { owner = "joysoftware"; repo = "pypi_smhi"; rev = "refs/tags/${version}"; - hash = "sha256-dJh44JGWy3VafTnwwxWcr5cXClmzY1YuySy1RJzOak8="; + hash = "sha256-ygjlUEQpyHjIO1QLB+MrijWQr84v3v+RdlcRwi9H/cs="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/smoke-zephyr/default.nix b/pkgs/development/python-modules/smoke-zephyr/default.nix new file mode 100644 index 000000000000..0f85fae942de --- /dev/null +++ b/pkgs/development/python-modules/smoke-zephyr/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pythonOlder, + unittestCheckHook, +}: + +buildPythonPackage rec { + pname = "smoke-zephyr"; + version = "2.0.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "zeroSteiner"; + repo = "smoke-zephyr"; + rev = "refs/tags/v${version}"; + hash = "sha256-XZj8sxEWYv5z1x7LKb0T3L7MWSZbWr7lAIyjWekN+WY="; + }; + + postPatch = '' + substituteInPlace tests/utilities.py \ + --replace-fail "assertEquals" "assertEqual" + ''; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ unittestCheckHook ]; + + pythonImportsCheck = [ "smoke_zephyr" ]; + + meta = { + description = "Python utility collection"; + homepage = "https://github.com/zeroSteiner/smoke-zephyr"; + changelog = "https://github.com/zeroSteiner/smoke-zephyr/releases/tag/v${version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/snakemake-interface-common/default.nix b/pkgs/development/python-modules/snakemake-interface-common/default.nix index d9d3d09a4552..e2df0cedfc65 100644 --- a/pkgs/development/python-modules/snakemake-interface-common/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-common/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "snakemake-interface-common"; - version = "1.17.3"; + version = "1.17.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "snakemake"; repo = "snakemake-interface-common"; rev = "refs/tags/v${version}"; - hash = "sha256-91Sh6JNpCEWPRkrEwoJeycZS1D4lXWA4IJLVcxBYLnI="; + hash = "sha256-PMEs7yeVfSnZKbabLrbXfIKCIPteNV1wzbt9RIDG3qU="; }; build-system = [ poetry-core ]; 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 19365d837ff2..e6411e3abdf2 100644 --- a/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix @@ -10,19 +10,19 @@ buildPythonPackage rec { pname = "snakemake-interface-executor-plugins"; - version = "9.2.0"; - format = "pyproject"; + version = "9.3.2"; + pyproject = true; src = fetchFromGitHub { owner = "snakemake"; - repo = pname; + repo = "snakemake-interface-executor-plugins"; rev = "refs/tags/v${version}"; - hash = "sha256-WMbJP17YnDzFVcr6YepT5Ltw+Jo6PPn7ayIrjx2k+go="; + hash = "sha256-3XdsEnL+kuYhNOeAxkAsjTJ2R6NOtq97zPhQg9kdFkI="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ argparse-dataclass throttler snakemake-interface-common @@ -30,10 +30,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "snakemake_interface_executor_plugins" ]; - meta = with lib; { + meta = { description = "This package provides a stable interface for interactions between Snakemake and its executor plugins"; homepage = "https://github.com/snakemake/snakemake-interface-executor-plugins"; - license = licenses.mit; - maintainers = with maintainers; [ veprbl ]; + changelog = "https://github.com/snakemake/snakemake-interface-executor-plugins/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix index c20a0ad12246..5d5518de96db 100644 --- a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "snakemake-interface-report-plugins"; - version = "1.0.0"; + version = "1.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-30x4avA3FrqZ4GoTl6Js5h3VG5LW7BNHOcNWxznXoT0="; + hash = "sha256-yk2fYlueaobXJgF7ob6jTccEz8r0geq1HFVsa+ZO30Q="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix index 99a540790bca..405020619195 100644 --- a/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix +++ b/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "snakemake-storage-plugin-xrootd"; - version = "0.1.3"; + version = "0.1.4"; pyproject = true; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Wo6eF8XlHh9OiD2rTMCchyq1sQ8gjkKnoD4JsKDmJ2A="; + hash = "sha256-1plBss9jRzIIGQE7rXDEnAomFxNzSUKsw0VyhYA2mIc="; }; # xrootd<6.0.0,>=5.6.4 not satisfied by version 5.7rc20240303 diff --git a/pkgs/development/python-modules/snapshottest/default.nix b/pkgs/development/python-modules/snapshottest/default.nix index 4c697fcdb923..244a1627f11c 100644 --- a/pkgs/development/python-modules/snapshottest/default.nix +++ b/pkgs/development/python-modules/snapshottest/default.nix @@ -6,7 +6,7 @@ six, termcolor, pytestCheckHook, - pytest-cov, + pytest-cov-stub, django, }: @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ django pytestCheckHook - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "snapshottest" ]; diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index a0192ee1188e..13a86fb63e9d 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { # AssertionError: Expected 'fileno' to not have been called. Called 1 times. "test_client_stop_no_wait" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61 # port binding conflicts "test_snitun_single_runner_timeout" diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 0dd9835e617b..f20779b9b6d4 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.12.2"; + version = "3.12.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "snowflakedb"; repo = "snowflake-connector-python"; rev = "refs/tags/v${version}"; - hash = "sha256-A6QnKCROd1vJpFCTrLEoHVo43xojdjpgYS3qQm64gcY="; + hash = "sha256-Rv4/zGoSBA3Pdu67d96sgZLgZae6yfpLsJzwsm2A690="; }; build-system = [ diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 26942b6d9118..3e94b4c31d3c 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.5.3"; + version = "1.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eRkew/6/syvP/s1m8qfdVhvVcTRepLzL9BzB+1wGgv8="; + hash = "sha256-eSzekowNHTBxS4iwQE3oHtKXp3RcvMJT3NqXP2V1k4I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/social-auth-core/default.nix b/pkgs/development/python-modules/social-auth-core/default.nix index 7f9091b46f43..b2641bed1e7f 100644 --- a/pkgs/development/python-modules/social-auth-core/default.nix +++ b/pkgs/development/python-modules/social-auth-core/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { requests-oauthlib ]; - passthru.optional-dependencies = { + optional-dependencies = { openidconnect = [ python-jose ]; saml = [ lxml @@ -56,7 +56,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook httpretty - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); # Disable checking the code coverage prePatch = '' diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 191f963c7594..66eadefb449a 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "soco"; - version = "0.30.4"; + version = "0.30.6"; pyproject = true; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "SoCo"; repo = "SoCo"; rev = "refs/tags/v${version}"; - hash = "sha256-t5Cxlm5HhN6WY6ty4i2MAtqjbC7DwZqSp1g5nybFAH4="; + hash = "sha256-3/BDqCYNgICb8NGYR1VJM9MsMRmdvJVruqFXuyG6tIY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/solarlog-cli/default.nix b/pkgs/development/python-modules/solarlog-cli/default.nix index a2b039d217a8..b82b69d8c2f0 100644 --- a/pkgs/development/python-modules/solarlog-cli/default.nix +++ b/pkgs/development/python-modules/solarlog-cli/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "solarlog-cli"; - version = "0.3.0"; + version = "0.3.2"; pyproject = true; disabled = pythonOlder "3.12"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "dontinelli"; repo = "solarlog_cli"; rev = "refs/tags/v${version}"; - hash = "sha256-jNvwSh89Ncl/rR/cUNVbJfJThJTa9JlANjvH/vRruAU="; + hash = "sha256-Oa2o4fuchW3ROtQFVhiWL6rhdUbzSFDegCkm8W7bCpE="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index 5d4e946c8518..bcf489a45330 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { dependencies = [ regex ]; # loops forever - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "somajo" ]; diff --git a/pkgs/development/python-modules/sorl-thumbnail/default.nix b/pkgs/development/python-modules/sorl-thumbnail/default.nix index de3fd466ec6e..161c8119cb93 100644 --- a/pkgs/development/python-modules/sorl-thumbnail/default.nix +++ b/pkgs/development/python-modules/sorl-thumbnail/default.nix @@ -10,17 +10,18 @@ buildPythonPackage rec { pname = "sorl-thumbnail"; - version = "12.10.0"; + version = "12.11.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-3pWkkhf9/s7SIvo86qAdMS7i+KrVa6NNbHDy3umoSTg="; + pname = "sorl_thumbnail"; + inherit version; + hash = "sha256-GRuJwn7LQLXCo1VJ1VfRfEhBxq/0ObLhe5OLke6kY7M="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/sortedcollections/default.nix b/pkgs/development/python-modules/sortedcollections/default.nix index 3ee4eff75023..a525167635b6 100644 --- a/pkgs/development/python-modules/sortedcollections/default.nix +++ b/pkgs/development/python-modules/sortedcollections/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - pytest-cov, + pytest-cov-stub, pytestCheckHook, sortedcontainers, }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sortedcontainers ]; nativeCheckInputs = [ - pytest-cov + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sotabenchapi/default.nix b/pkgs/development/python-modules/sotabenchapi/default.nix new file mode 100644 index 000000000000..b8a1b0b918da --- /dev/null +++ b/pkgs/development/python-modules/sotabenchapi/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + click, + requests, + tabulate, +}: + +let + version = "0.0.16"; + pname = "sotabenchapi"; +in +buildPythonPackage { + inherit pname version; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-thbVH4aLmEgi8K17PkmbUg4nHqGj+dEiXPDILjvQMzk="; + }; + + # requirements.txt is missing in the Pypi archive and this makes the setup.py script fails + postPatch = '' + touch requirements.txt + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + click + requests + tabulate + ]; + + pythonImportsCheck = [ + "sotabenchapi" + ]; + + # No tests + doCheck = false; + + meta = { + description = "Easily benchmark Machine Learning models on selected tasks and datasets"; + homepage = "https://pypi.org/project/sotabenchapi/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/soundcloud-v2/default.nix b/pkgs/development/python-modules/soundcloud-v2/default.nix index fa777afe1f41..6fd5c0b67494 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.5.4"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cnM70Yz9xw3TPqGk8VYAag6u1nLjQS2kS7xRBJtFodU="; + hash = "sha256-RiUTFGwP/J7HKcHGFvT3Kw3NM/gUeMZCB/Jl8HLngkM="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index a4140a8a7f8a..f90e2f7a3064 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchPypi, isPy27, + setuptools, cffi, numpy, portaudio, @@ -12,21 +13,25 @@ buildPythonPackage rec { pname = "sounddevice"; - version = "0.4.7"; - format = "setuptools"; + version = "0.5.1"; + pyproject = true; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-abOGgY1QotUYYH1LlzRC6NUkdgx81si4vgPYyY/EvOc="; + hash = "sha256-CcqZHa7ajOS+mskeFamoHI+B76a2laNIyRceoMFssEE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cffi numpy portaudio ]; + nativeBuildInputs = [ cffi ]; + # No tests included nor upstream available. doCheck = false; diff --git a/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch b/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch index a5761764fdbb..6ec399e25d5f 100644 --- a/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch +++ b/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch @@ -1,11 +1,11 @@ -diff --git i/sounddevice.py w/sounddevice.py -index c7c1d62..aabcb12 100644 ---- i/sounddevice.py -+++ w/sounddevice.py -@@ -58,29 +58,7 @@ from ctypes.util import find_library as _find_library +diff --git a/sounddevice.py b/sounddevice.py +index 0974289..2d56c28 100644 +--- a/sounddevice.py ++++ b/sounddevice.py +@@ -58,32 +58,7 @@ from ctypes.util import find_library as _find_library from _sounddevice import ffi as _ffi - - + + -try: - for _libname in ( - 'portaudio', # Default name on POSIX systems @@ -22,7 +22,10 @@ index c7c1d62..aabcb12 100644 - if _platform.system() == 'Darwin': - _libname = 'libportaudio.dylib' - elif _platform.system() == 'Windows': -- _libname = 'libportaudio' + _platform.architecture()[0] + '.dll' +- if 'SD_ENABLE_ASIO' in _os.environ: +- _libname = 'libportaudio' + _platform.architecture()[0] + '-asio.dll' +- else: +- _libname = 'libportaudio' + _platform.architecture()[0] + '.dll' - else: - raise - import _sounddevice_data @@ -30,6 +33,6 @@ index c7c1d62..aabcb12 100644 - next(iter(_sounddevice_data.__path__)), 'portaudio-binaries', _libname) - _lib = _ffi.dlopen(_libname) +_lib = _ffi.dlopen('@portaudio@') - + _sampleformats = { 'float32': _lib.paFloat32, diff --git a/pkgs/development/python-modules/soundfile/default.nix b/pkgs/development/python-modules/soundfile/default.nix index 819975014f14..3e421ab2ac86 100644 --- a/pkgs/development/python-modules/soundfile/default.nix +++ b/pkgs/development/python-modules/soundfile/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { version = "0.12.1"; format = "setuptools"; # https://github.com/bastibe/python-soundfile/issues/157 - disabled = isPyPy || stdenv.isi686; + disabled = isPyPy || stdenv.hostPlatform.isi686; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix index b5583765da31..ae4e101f5f64 100644 --- a/pkgs/development/python-modules/soupsieve/default.nix +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "soupsieve"; - version = "2.5"; + version = "2.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-VmPVp7O/ru4LxDcuf8SPnP9JQLPuxUpkUcxSmfEJdpA="; + hash = "sha256-4uaEF3d681nsZdqsEFdASjyKVFW7irw28amGarGlGrs="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/sourmash/default.nix b/pkgs/development/python-modules/sourmash/default.nix index aefb730b229d..8e29c2845d12 100644 --- a/pkgs/development/python-modules/sourmash/default.nix +++ b/pkgs/development/python-modules/sourmash/default.nix @@ -21,7 +21,8 @@ pytestCheckHook, }: let - stdenv' = if stdenv.isDarwin then overrideSDK stdenv { darwinMinVersion = "10.14"; } else stdenv; + stdenv' = + if stdenv.hostPlatform.isDarwin then overrideSDK stdenv { darwinMinVersion = "10.14"; } else stdenv; in buildPythonPackage rec { pname = "sourmash"; diff --git a/pkgs/development/python-modules/soxr/cmake-nanobind.patch b/pkgs/development/python-modules/soxr/cmake-nanobind.patch new file mode 100644 index 000000000000..2f527e7a1692 --- /dev/null +++ b/pkgs/development/python-modules/soxr/cmake-nanobind.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eb701aa..6cb4b02 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,6 +32,11 @@ find_package(Python 3.9 + REQUIRED COMPONENTS Interpreter Development.Module + OPTIONAL_COMPONENTS Development.SABIModule) + ++execute_process( ++ COMMAND "${Python_EXECUTABLE}" -m nanobind --cmake_dir ++ OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE NB_DIR) ++list(APPEND CMAKE_PREFIX_PATH "${NB_DIR}") ++ + find_package(nanobind CONFIG REQUIRED) + + if (USE_SYSTEM_LIBSOXR) diff --git a/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix index 841ba83259f7..9095dcb7ae7f 100644 --- a/pkgs/development/python-modules/soxr/default.nix +++ b/pkgs/development/python-modules/soxr/default.nix @@ -2,51 +2,68 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonOlder, # build-system - cython, - numpy, - oldest-supported-numpy, + cmake, + nanobind, + ninja, + scikit-build-core, setuptools, setuptools-scm, - gnutar, + typing-extensions, - # native + # native dependencies libsoxr, + # dependencies + numpy, + # tests pytestCheckHook, }: buildPythonPackage rec { pname = "soxr"; - version = "0.3.7"; - format = "pyproject"; + version = "0.5.0.post1"; + pyproject = true; src = fetchFromGitHub { owner = "dofuuz"; repo = "python-soxr"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-HGtoMfMQ5/2iEIFtik7mCrSxFnLXkSSx2W8wBul0+jk="; + hash = "sha256-Fpayc+MOpDUCdpoyJaIqSbMzuO0jYb6UN5ARFaxxOHk="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "SYS_LIBSOXR = False" "SYS_LIBSOXR = True" - ''; + patches = [ ./cmake-nanobind.patch ]; nativeBuildInputs = [ - cython - gnutar - numpy - oldest-supported-numpy - setuptools - setuptools-scm + cmake + ninja + ]; + + dontUseCmakeConfigure = true; + + pypaBuildFlags = [ + "--config=cmake.define.USE_SYSTEM_LIBSOXR=ON" ]; + build-system = + [ + scikit-build-core + nanobind + setuptools + setuptools-scm + ] + ++ lib.optionals (pythonOlder "3.11") [ + typing-extensions + ]; + buildInputs = [ libsoxr ]; + dependencies = [ numpy ]; + pythonImportsCheck = [ "soxr" ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/spacy-alignments/default.nix b/pkgs/development/python-modules/spacy-alignments/default.nix index 66b1c2065512..9315953b5a25 100644 --- a/pkgs/development/python-modules/spacy-alignments/default.nix +++ b/pkgs/development/python-modules/spacy-alignments/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # Fails because spacy_alignments module cannot be loaded correctly. doCheck = false; diff --git a/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix b/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix index d6d1094447d2..3205238b742b 100644 --- a/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation { dontConfigure = true; dontBuild = true; - doCheck = true; nativeCheckInputs = [ pytest diff --git a/pkgs/development/python-modules/spacy/annotation-test/annotate.py b/pkgs/development/python-modules/spacy/annotation-test/annotate.py index 5acc3ddc60fd..db5fac2f7f6c 100644 --- a/pkgs/development/python-modules/spacy/annotation-test/annotate.py +++ b/pkgs/development/python-modules/spacy/annotation-test/annotate.py @@ -29,7 +29,7 @@ def test_entities(doc_en_core_web_sm): ('Google', 'ORG'), ('2007', 'DATE'), ('American', 'NORP'), - ('Thrun', 'PERSON'), + ('Thrun', 'GPE'), ('Recode', 'ORG'), ('earlier this week', 'DATE'), ] diff --git a/pkgs/development/python-modules/spacy/annotation-test/default.nix b/pkgs/development/python-modules/spacy/annotation-test/default.nix index cb8a97aa568f..5f5f8f3ca0a7 100644 --- a/pkgs/development/python-modules/spacy/annotation-test/default.nix +++ b/pkgs/development/python-modules/spacy/annotation-test/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation { dontConfigure = true; dontBuild = true; - doCheck = true; nativeCheckInputs = [ pytest diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 03fffb27b8a4..df9004d483ff 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -36,21 +36,20 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.7.6"; + version = "3.8.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9AZcCqxcSLv7L/4ZHVXMszv7AFN2r71MzW1ek0FRTjQ="; + hash = "sha256-Szfr0lraQFmw3J4Ik+cN3l34NIUymgaO8EWA5wiSpl0="; }; postPatch = '' - # thinc version 8.3.0 had no functional changes - # also see https://github.com/explosion/spaCy/issues/13607 + # spaCy is compatible with NumPy v1 and v2 substituteInPlace pyproject.toml setup.cfg \ - --replace-fail "thinc>=8.2.2,<8.3.0" "thinc>=8.2.2,<8.4.0" + --replace-fail "numpy>=2.0.0,<2.1.0" numpy ''; build-system = [ @@ -61,6 +60,10 @@ buildPythonPackage rec { thinc ]; + pythonRelaxDeps = [ + "thinc" + ]; + dependencies = [ catalogue cymem diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index 7f25c4281c37..f5049b13c3ac 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -1,506 +1,506 @@ [ { "pname": "ca_core_news_lg", - "version": "3.7.0", - "sha256": "1hlrbrgiahj6jkap3hrhki6zk10wg7dpajxcp540darprl7w60vy", + "version": "3.8.0", + "sha256": "0xb707rrd8z080rzh85hivl771s10d38l3bnwpa6and5qxz96nf2", "license": "gpl3" }, { "pname": "ca_core_news_md", - "version": "3.7.0", - "sha256": "0ygygvw8bs510dyz4k9sfmxxlqssmv566aac9k3xiip3k5lfgysi", + "version": "3.8.0", + "sha256": "0aav6dmilwjz343hw5741n2hriw1mcgmjbw1ncjrbwzp63034qff", "license": "gpl3" }, { "pname": "ca_core_news_sm", - "version": "3.7.0", - "sha256": "1cj53w9vzdb2xqjpprkhgrglm70g0vaw0308jxnd7nvgn6vfx09s", + "version": "3.8.0", + "sha256": "0yv9f7bj14g5kqgxdwr6fa2w4h7kwapwxgaxv493q0ha5fxva3ij", "license": "gpl3" }, { "pname": "ca_core_news_trf", - "version": "3.7.0", - "sha256": "1il0ak0wh4dlxxdddwz8a2vr6817cn5fwrflxwgcd25njx7w886g", + "version": "3.8.0", + "sha256": "0j04hf59a2hndwqifk2rm2risbnj7mcafjl9bfzci8n019x0aisz", "license": "gpl3" }, { "pname": "da_core_news_lg", - "version": "3.7.0", - "sha256": "04bm53v7dpdlnlk39wppfir792jp2qq9kkw0zs9i0ki68sxh8giz", + "version": "3.8.0", + "sha256": "1gn2cmfc9vpd5bs7n7aprsvqxfds210lfcn7r7nhspa1d5377ss5", "license": "cc-by-sa-40" }, { "pname": "da_core_news_md", - "version": "3.7.0", - "sha256": "1c35avbhkx16icnqsp571nvilcra143kqjvnszd7j0xnnzn5iqyx", + "version": "3.8.0", + "sha256": "0hgjj1k5cclr1ljvr4q2v3zkwl5z8jrqfc2pzz8xszgpyzgjpr00", "license": "cc-by-sa-40" }, { "pname": "da_core_news_sm", - "version": "3.7.0", - "sha256": "1hlx9zgixv91x4xa489gnwm3qdghffk4fimg7mjncyjw1g9xskif", + "version": "3.8.0", + "sha256": "1xnziq02y7pjib98bh7rbv4fp37kbl88qxm06mwj9hwm8cfzd3wh", "license": "cc-by-sa-40" }, { "pname": "da_core_news_trf", - "version": "3.7.0", - "sha256": "02hbg58ql1dcd7zdlgb959106inaqnvxphc2dmxf7myjr4si3w37", + "version": "3.8.0", + "sha256": "03ikrbpwp6cpgcn17kz791mjjdzr561mabbbjwasnvds9mkmmg8k", "license": "cc-by-sa-40" }, { "pname": "de_core_news_lg", - "version": "3.7.0", - "sha256": "1aag695nygpbxrvvknlcic79hyfzdwcc2d9vjgzq2bc43zdf05a0", + "version": "3.8.0", + "sha256": "1b4nfpxmfh4hqkvn95rqr65zppsd1i1arllj8cigv2f47jh4jdz4", "license": "mit" }, { "pname": "de_core_news_md", - "version": "3.7.0", - "sha256": "1qnq7yy38nw1pg8ysxjqyxd82yc3ncl148p90hil2njxg771g1hk", + "version": "3.8.0", + "sha256": "1kbh4g29rqr3wg0rgvvf58bvlijzxpqm7yylwfsla95ixj9r685j", "license": "mit" }, { "pname": "de_core_news_sm", - "version": "3.7.0", - "sha256": "0r0wgf044r0nl267m5dc3zp4cq5ml4b9i6gpkas1hhn708d5sjb1", + "version": "3.8.0", + "sha256": "0ib0sqx6aj03ydc3g5gml1pf9628rny2ijdi9zwr2qilsm9015h6", "license": "mit" }, { "pname": "de_dep_news_trf", - "version": "3.7.0", - "sha256": "05xca8gjpmn7dlj8jb93rv7r0s4wa3nq5h7rkmq6d7h7gy6zpz8f", + "version": "3.8.0", + "sha256": "0qdahnb74zlg4yabzfc57mi3m4cykm2j0spyv9fzy64gibv5r1dz", "license": "mit" }, { "pname": "el_core_news_lg", - "version": "3.7.0", - "sha256": "0n7xk8kbqqis1fivsgvyfmhd6qj853wylrwjl9q352cvbv8zg6dk", + "version": "3.8.0", + "sha256": "0nrd83jx57agpxirjckiiyfjvpdp9wxjx4wn0g4620hac19kidsq", "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_md", - "version": "3.7.0", - "sha256": "042vmymi40zgwxg87sfsvq7b9crigh6g9ai7cyz49spcqmvq2qd3", + "version": "3.8.0", + "sha256": "14jlcf7xljz6381ap29ngibpwpgdsicgip6fg7zzhy56kklqvh3h", "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_sm", - "version": "3.7.0", - "sha256": "0apky61l3gh2dvfpqaj6vqql5g6sh4bp9i91y7zfgacqvf7jp67g", + "version": "3.8.0", + "sha256": "0chbzki6ldqac89sh3y2nxm7xs31ffhi930k2nbqzzpfkx5583pl", "license": "cc-by-nc-sa-30" }, { "pname": "en_core_web_lg", - "version": "3.7.0", - "sha256": "192mhp5niixq0crqwwmp70g63wbahgr41dpmmjsdqf9189s7qswr", + "version": "3.8.0", + "sha256": "0qpd70cvs8wbwbp4imb7qkgf5gdvfx114prc20500l1r4krqjg3s", "license": "mit" }, { "pname": "en_core_web_md", - "version": "3.7.0", - "sha256": "1wy2kpsninpxwjbqavh963i12041a0av4wmrn8plvb73czp995dg", + "version": "3.8.0", + "sha256": "0lam8a1614j2ab2gkwsd74ky2ap9h2z5yf0yy55ldafw2l3yfksh", "license": "mit" }, { "pname": "en_core_web_sm", - "version": "3.7.0", - "sha256": "01hps9i3v73prqfjrch0da0s38vhbvx0d73g3x1bkrmavan26bj7", + "version": "3.8.0", + "sha256": "0m8g5h6byqms3imxsbj4793zvggs92cqrshrk00qgbvnqhdz78hl", "license": "mit" }, { "pname": "en_core_web_trf", - "version": "3.7.0", - "sha256": "1pnm63bk5k6g6kc5s8v5pwdahqgbh3rlm5mxq3gxk8my3cfkklpc", + "version": "3.8.0", + "sha256": "07v2jk9js1404162ddl7myd0s0ci41f57lh50qdssvxxgjkiivga", "license": "mit" }, { "pname": "es_core_news_lg", - "version": "3.7.0", - "sha256": "1qfadw61yjz1hkp5wldg5ncj50db0b3wvpcfklybij56r4ibz6f2", + "version": "3.8.0", + "sha256": "08g2yydfbrz6i886rw52q1bmb6f785arx2zqk5510b3bp6089cra", "license": "gpl3" }, { "pname": "es_core_news_md", - "version": "3.7.0", - "sha256": "1z9m6f2c3cbjrljdlywdd4c4qj4lky1rb3n20yav5zb9k7jbj3s4", + "version": "3.8.0", + "sha256": "0mgfrd1i9rci0i9f01d9lza4p0yaww6j5l8zpwlygb75vbgwmf3r", "license": "gpl3" }, { "pname": "es_core_news_sm", - "version": "3.7.0", - "sha256": "07fm2bmiwkkia4v491dzkgb3dbp1qfh4j7iba2h4wv8yci6la3n4", + "version": "3.8.0", + "sha256": "1nbbajq0nrbvv6a9hzi3i5axhszmddrg6di8rqj20zwkavp96g7i", "license": "gpl3" }, { "pname": "es_dep_news_trf", - "version": "3.7.0", - "sha256": "1n5sk5jlj6gx4w2ka1ia93bmi4nm2cyfg7fbca2kvmsg6zw8hq27", + "version": "3.8.0", + "sha256": "0xfbibm431jrxwmwk4nvrkwly63w6vwfpd901jp7wjza9p3d0i73", "license": "gpl3" }, { "pname": "fi_core_news_lg", - "version": "3.7.0", - "sha256": "08lk2dgwm99nj2a355s682ar4xwg1av4z3r6qpwq72rkm2h8jkmm", + "version": "3.8.0", + "sha256": "06q1lah7afpgak0l3r6fxjfiizmpld6fn0sbiycrsn2bsqk5nby3", "license": "cc-by-sa-40" }, { "pname": "fi_core_news_md", - "version": "3.7.0", - "sha256": "07hqjw6w8332zf3ki5pbrv7m1kc4y6j3f0czharvv0grr2sfvh84", + "version": "3.8.0", + "sha256": "06g4mkrrmnksf1fxkcwid3dvzs9ri2z4l4dgcvripm6yymchfyjy", "license": "cc-by-sa-40" }, { "pname": "fi_core_news_sm", - "version": "3.7.0", - "sha256": "03bhh3z3r70km19p3x202g66hikfyh309hgb96sycb8lhfr737lk", + "version": "3.8.0", + "sha256": "1r962x11lha38hmmv47hc7hk2whsy3qvnbf3hsqjc4nbagzia4bh", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_lg", - "version": "3.7.0", - "sha256": "02dv00w67alc1avwq93hara49va7mnsmmm2kww961p5a3k3ldz20", + "version": "3.8.0", + "sha256": "11x2cydzc8x5bv5d1bkyqnfawzj1kb5lslndqq226jvb6yc7kkcp", "license": "lgpllr" }, { "pname": "fr_core_news_md", - "version": "3.7.0", - "sha256": "184gxwgf980x3vsn45zycd3cr1mkl3r1vbf3hb5hrhs8xk3y1v34", + "version": "3.8.0", + "sha256": "1afnibp9r84xxv5dvds7jvz953khamcklj8vmjrgh3ix9bicylq3", "license": "lgpllr" }, { "pname": "fr_core_news_sm", - "version": "3.7.0", - "sha256": "1ifbazd9hs1fhy22hjqhwkq0bnnsr3km3ff60v8arkyq5vlprhdb", + "version": "3.8.0", + "sha256": "1377rja1x0v0fwnvqyqgiqdgnba6fsj83d3gpc2l88qqrplhaxai", "license": "lgpllr" }, { "pname": "fr_dep_news_trf", - "version": "3.7.0", - "sha256": "0shhlmyyd79bbvxf6dfr5r99lfhjcywvvrji67k2hxz4604q8bxv", + "version": "3.8.0", + "sha256": "1g7d3ifagifp0mwqn7d5zafac2cywvykd8fcngr5zzhffgk6x0bk", "license": "lgpllr" }, { "pname": "hr_core_news_lg", - "version": "3.7.0", - "sha256": "1r8cdyawf6fdvx1xn1l470mx31lbx5cjpivlx1pvv9ckp71zp28z", + "version": "3.8.0", + "sha256": "1rpk4ppdpzv20sak198rvdp2v53rh3k0qfbnayjmhq76pv43g972", "license": "cc-by-sa-40" }, { "pname": "hr_core_news_md", - "version": "3.7.0", - "sha256": "1dzi6dxwjpbddc0rjqajj4k1c61sacyycwnjvy03h3aclxacqn53", + "version": "3.8.0", + "sha256": "1rv4q1kz5mjsisi3v3kh836jb8i7gh01qhylni5pxbgp1ysrhrmv", "license": "cc-by-sa-40" }, { "pname": "hr_core_news_sm", - "version": "3.7.0", - "sha256": "0dmhv1fa46hi78jgv562v4x3mfl7svchs6kiz35s63ph9ik5r6f2", + "version": "3.8.0", + "sha256": "12hncjs9ihy5807a73c6dx8sk409ps9jzh5m33298nx0vx6jaaq9", "license": "cc-by-sa-40" }, { + "pname": "it_core_news_lg", + "version": "3.8.0", + "sha256": "1qnz7r8pax2pim9a3ywawpmz40hwawsfkv4wziqglm1wwp92jbf4", + "license": "cc-by-nc-sa-30" + }, + { + "pname": "it_core_news_md", + "version": "3.8.0", + "sha256": "0kfbb8n8jczdqr5g653nbgpgs8cg637dhby37s0dss7nkfwci5dm", + "license": "cc-by-nc-sa-30" + }, + { + "pname": "it_core_news_sm", + "version": "3.8.0", + "sha256": "0jzrj6rh7cq09dpgab2ji88d3d4py28ai4s3pafxpq5cz19wdd19", + "license": "cc-by-nc-sa-30" + }, + { "pname": "ja_core_news_lg", - "version": "3.7.0", - "sha256": "1nb77kivzy0wixsw8ijmw78fffkpqa63kykqph04jzmh75ra4wvg", + "version": "3.8.0", + "sha256": "0bg247vg6al2mr5rpwhpzc14g4i9lgq7n5559jv655s58pipknn3", "license": "cc-by-sa-40" }, { "pname": "ja_core_news_md", - "version": "3.7.0", - "sha256": "0p22bwc24q76cl7ndszvhqgllvq3ws3i3vbjsp5xvhxxls6p49x9", + "version": "3.8.0", + "sha256": "1xiyl8w0x0s6v3532xjyh73hrbv6plcrx4ifpv7j76856kjqk459", "license": "cc-by-sa-40" }, { "pname": "ja_core_news_sm", - "version": "3.7.0", - "sha256": "0bfvkds4dqynjshk2lxfya9yfcnbvwjfhc6n7yh0852ms1ycicaw", + "version": "3.8.0", + "sha256": "0553lk1vzld383cqw7hjmrwm0cad48xhvc92c9i528axv8ahwvw5", "license": "cc-by-sa-40" }, { "pname": "ja_core_news_trf", - "version": "3.7.0", - "sha256": "0n2lqql4flnilgf671n5mcdp8vi5pdjfz3vymxsapc1gyp29jykk", + "version": "3.8.0", + "sha256": "1zlih4fjl1122m8zl9ai80pabisb4hqy8h90l63k2syv6778i88k", "license": "cc-by-sa-30" }, { - "pname": "it_core_news_lg", - "version": "3.7.0", - "sha256": "0gwn6pf0rzbplahs2wnzp6379mmj066dqhijhq4ln4552fz4d1yx", - "license": "cc-by-nc-sa-30" - }, - { - "pname": "it_core_news_md", - "version": "3.7.0", - "sha256": "003w99glj5jgb6gfqygb4c5jljhc85ck6yqn49h9m8fa9vmaylhx", - "license": "cc-by-nc-sa-30" - }, - { - "pname": "it_core_news_sm", - "version": "3.7.0", - "sha256": "0kng2w5xj1irz6c5d6vl4px9my1z41h8zfvf9b01rh9yvjmhfyzc", - "license": "cc-by-nc-sa-30" - }, - { "pname": "ko_core_news_lg", - "version": "3.7.0", - "sha256": "0hxwkb1w58vb4g1162ry12a63hnj20q20n66xnlvc0r96ibj4fia", + "version": "3.8.0", + "sha256": "17s9r82zwdkymvk1h1bwzxxkzy77bsyh29g8aansdhzrvdr4xvc4", "license": "cc-by-sa-40" }, { "pname": "ko_core_news_md", - "version": "3.7.0", - "sha256": "1ai7cyk58c7rj0dy82l01w5r4fkp2cpnhcsarzas1ml0icnk1srm", + "version": "3.8.0", + "sha256": "0bmb04b6xl5a70hsy33lwhyipwrnsih9vmd5kg8ilpj3728916px", "license": "cc-by-sa-40" }, { "pname": "ko_core_news_sm", - "version": "3.7.0", - "sha256": "16m1lsikf8ghsazpdprd9fc4n3m8an9qzjbyjwyvwkr0f2p0nmph", + "version": "3.8.0", + "sha256": "0r6n4vazi5fqn88sfnd9yxzr341j211ndinncl0m7z995db92vcd", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_lg", - "version": "3.7.0", - "sha256": "174p8i2lnwq324qcs85s3c0j7iyav12yk0i896l23khg9gyzkmlg", + "version": "3.8.0", + "sha256": "1gl8iqb10ah29i1hlrqbych9xzlwliszb97j4adjk1ahq1bdir84", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_md", - "version": "3.7.0", - "sha256": "1117sij5w4s297q5j6h210hafh2amm6pd9m9m7m3608rfwsvm9g8", + "version": "3.8.0", + "sha256": "1z8zxralxaymj22p67wdi0r9z8rz7y7adjg8xdarcg6gz3znvssh", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_sm", - "version": "3.7.0", - "sha256": "1j04apdc63c2b2namic4blhm9mk8inmr8ynid09mncljwskg0fjb", + "version": "3.8.0", + "sha256": "1alg1sspi044pwkq5kascdhx0x7038n8jgln4l7k8wwjpm8b9ri7", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_lg", - "version": "3.7.0", - "sha256": "0fshypj08hvcbbqjfxkzyfs72p5rm5fw1pfclgln2y0whfap0lqx", + "version": "3.8.0", + "sha256": "0miw79yr5rl3sbgjc614lrnywqhjkk7x2hiksh45b889pzff3kn8", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_md", - "version": "3.7.0", - "sha256": "1il8pzfk2nd09hd8kmk5znf66ir4bsrp1ax7jaxghi76ggrbpzyx", + "version": "3.8.0", + "sha256": "1qr7418j5gv05aix449x4mnqqgw6fdaz6bmgbd685x2dzk8avnv8", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_sm", - "version": "3.7.0", - "sha256": "1805hkkm3hjbzw8pg6q08p61bpjk5h13ldzpik0gb9wqw9f69dbp", + "version": "3.8.0", + "sha256": "1nhwgqyqaw7zmb42l20bxql9dib8qnzhxh41194glg9lplifgdx3", "license": "cc-by-sa-40" }, { "pname": "nb_core_news_lg", - "version": "3.7.0", - "sha256": "1zqwp8a8d26mi94dkib5ahhkr9hawxx4vag4fhibfa6m0prpzh9h", + "version": "3.8.0", + "sha256": "1pmcbgyswk7q163nwqisc5qqp8vbc4vhyc1qza84axprwxpj7yy5", "license": "mit" }, { "pname": "nb_core_news_md", - "version": "3.7.0", - "sha256": "1ilxscc6hnmiby7ip7kgx3aih9msqmg21iqakkwny3z1lnnly466", + "version": "3.8.0", + "sha256": "1ch77iqiij62w9xy3ylh7f9rzm987dxm9yp03136j0niqm11cxkl", "license": "mit" }, { "pname": "nb_core_news_sm", - "version": "3.7.0", - "sha256": "1wrchw1rhlzrji5j46lpwzydiaxcywaglz0nvm4vk1np45r7l3dm", + "version": "3.8.0", + "sha256": "0s4fjfxiycn8fgm0j581l2ax23f3r5zvkfvc5rsylapmvsnf6xkh", "license": "mit" }, { "pname": "nl_core_news_lg", - "version": "3.7.0", - "sha256": "1777sdmjcc7lnj0j26zf00ab7pr09v1220k47fq724cw9l0knin1", + "version": "3.8.0", + "sha256": "1d096m2q9g1xh985fibvmdid406c3h9h5qhy727mf6p00ys04www", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_md", - "version": "3.7.0", - "sha256": "19g6hzljz0zi1fppl7c3w8gdak42af3f7z45cg12qyw7vnjl9988", + "version": "3.8.0", + "sha256": "1wy5nvcn8v2rnqyxb397ylf89m1w9sfpm9cvjhn6w2x0kw1xqi37", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_sm", - "version": "3.7.0", - "sha256": "0gcbb0vs5snif4j5a7z9ha2sj9jby0hnxbp0w5h73yxyg37fk8d4", + "version": "3.8.0", + "sha256": "0zpwkfw620nj2p2ij5xzzjf2iskd782lbxgi6va18z4ipva9j7yk", "license": "cc-by-sa-40" }, { "pname": "pl_core_news_lg", - "version": "3.7.0", - "sha256": "0glpd8lv7gwq3bryx32q84ny6pdvwrjm7lhxg9h2cdjrair8vx94", + "version": "3.8.0", + "sha256": "17alf74nf9zbchmz1c7146111nyynnx8m21dwd8my66pyy3wg227", "license": "gpl3" }, { "pname": "pl_core_news_md", - "version": "3.7.0", - "sha256": "04qwfh3dam7advyysdcdak7vna5gvirns001zq09kxhj766bc2k9", + "version": "3.8.0", + "sha256": "060qk4k3frjyzx45d8blxm7z58hz58f3m2nnf1npkw0rqyxysqzg", "license": "gpl3" }, { "pname": "pl_core_news_sm", - "version": "3.7.0", - "sha256": "00wygnwjpvfgiccb643720691pxhcb4pnk3zjj35hv9gbbx6qb8c", + "version": "3.8.0", + "sha256": "1w7z1jbhl3j2985ap7nkv41pscvsd94f9kz1qy8d5j3vrpmbcpxc", "license": "gpl3" }, { "pname": "pt_core_news_lg", - "version": "3.7.0", - "sha256": "1im0hgr6wd4sfsfb0ddnl2ad9pi1vs0vvr7rq3g14vda3x2f1rxy", + "version": "3.8.0", + "sha256": "114nxw6zjb8r2jl9s7056gs2vdr4vk1myk9mxbj5phs3w1lhmc7d", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_md", - "version": "3.7.0", - "sha256": "0zpgxg3ass084qv4bvk9wz15ya92w6a7d2p9p24g49a530b8gd7y", + "version": "3.8.0", + "sha256": "1kvvj62f1msbb3qbn7vlh43aihxyzz4jz3955kr63sj61ygnfrmq", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_sm", - "version": "3.7.0", - "sha256": "0z64w8599xwjvxdmrdlr08yyk4a5174m4a39m3zivgib0b5jyvdq", + "version": "3.8.0", + "sha256": "0da37fd4ly5czimly84lz9dpa4hjshrbha059fwaly1cmdlcr40m", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_lg", - "version": "3.7.0", - "sha256": "1y45xhdjlhf8026vlsdrxvmiwj8p9hzlpdg628kdcdzmcrr23l5j", + "version": "3.8.0", + "sha256": "1yddlyd8p5jsbvadli2n4yl5sxq2c3r13fsl2izpkzh7j1fgilrr", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_md", - "version": "3.7.0", - "sha256": "0jw71lav2fim48ff34mf137dsnn3arac555b9rf4flamiy8xg7y6", + "version": "3.8.0", + "sha256": "1hb6n1jbc1xr543x879vhcphi1f8ndn7gzm9ixa99dgsmka6jkrd", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_sm", - "version": "3.7.0", - "sha256": "0r35hxm6dgk2fnwl79ss25g6lfkgrd1h24zf96ys2p3cppp2i167", + "version": "3.8.0", + "sha256": "0ilvp6lpvwn4v969zi2jydjf05qi75x8cdw6ih96hwscz8nijwcr", "license": "cc-by-sa-40" }, { "pname": "ru_core_news_lg", - "version": "3.7.0", - "sha256": "02qnl0cfvx0m0icdbpn9zfsv39sp9k6sfdarzazhz7xnxzxib93q", + "version": "3.8.0", + "sha256": "1ica150slrxj1wysjnf114khqbbg4rdjvr1qf4md731iwg3iyi4w", "license": "mit" }, { "pname": "ru_core_news_md", - "version": "3.7.0", - "sha256": "187lkkm04x1ylg3jzyhf9avzpj2jkb48n86i36hqi6iqdv6yhfd5", + "version": "3.8.0", + "sha256": "023fpckxrar2d10y1pm2nlrha3xp49wmci7jyc64w5scssm1fj89", "license": "mit" }, { "pname": "ru_core_news_sm", - "version": "3.7.0", - "sha256": "11mh1rd0q024xfagdqkly1n4nndksrlq650n51jl1x1pmzlsdgzl", + "version": "3.8.0", + "sha256": "040k26qch2c847al1w1k451v5zjfplwan3mn2fvsjcrzjnwa4k56", "license": "mit" }, { "pname": "sl_core_news_lg", - "version": "3.7.0", - "sha256": "128ayhp21szc31ckiq3i8vib42i9xnz4lpi1709gjdc38cpmpnlp", + "version": "3.8.0", + "sha256": "01hcvzb0n1yxhgflrpchc9r1ja9wfksi16jahf0z57n4hj5a0d34", "license": "cc-by-sa-40" }, { "pname": "sl_core_news_md", - "version": "3.7.0", - "sha256": "07gx174gw5q1zgyyg1xhfplihhnr311f9562ri5pdd2hgjyz58yb", + "version": "3.8.0", + "sha256": "1msfdbpxhcxfg6ngv329vsbj418lj7kqspld38m2zfyxkyd71azx", "license": "cc-by-sa-40" }, { "pname": "sl_core_news_sm", - "version": "3.7.0", - "sha256": "005xwsnh5y3pf8y64lhvrzcbh8y34yr3in204as6hv7krsfg8bxa", + "version": "3.8.0", + "sha256": "07kz0rhka4s7vq5c9vrvlhrm83kr2k4wvhkq0bfcr49km2sxy5xw", "license": "cc-by-sa-40" }, { "pname": "sl_core_news_trf", - "version": "3.7.0", - "sha256": "0x97lwm1i2dq4kdg6rvarh9mnlcx45cnwq80qpjwv3b7zmviyq8c", + "version": "3.8.0", + "sha256": "1idihnpsxaxazkzqgmxigcd488627cr2i1xz7gdbvybqxzkn0qpm", "license": "cc-by-sa-40" }, { "pname": "sv_core_news_lg", - "version": "3.7.0", - "sha256": "05qaff8r3vs30zaxja1lgpibd12njp9ciq49zs26i6d4dqa18hdp", + "version": "3.8.0", + "sha256": "1277yk9vn5f45js32kgqm825b8q0wpbafdlmamf9sgv4dvcv7942", "license": "cc-by-sa-40" }, { "pname": "sv_core_news_md", - "version": "3.7.0", - "sha256": "0c64lqm10zmy863gs5h3ghx7662c8g7iyapn2rjhmz6909d82yyl", + "version": "3.8.0", + "sha256": "1k9hkjzhm5vfh83zrdgbfw5m2vlwyqlafpg9ba01iz8v60n0pqjp", "license": "cc-by-sa-40" }, { "pname": "sv_core_news_sm", - "version": "3.7.0", - "sha256": "1ik8b2nvxdalglwqg0zl4wbqnd2dyhdcy5hvxh40gi77rg2qd6kb", + "version": "3.8.0", + "sha256": "1v1x66gn7qsfn01a3gijzn8n167s4b665i4023szdm139dcjyz02", "license": "cc-by-sa-40" }, { "pname": "uk_core_news_lg", - "version": "3.7.0", - "sha256": "1qbw16y3ha690fqq71w7r46n8mz7d8za2iw1lljpqpf49my408q1", + "version": "3.8.0", + "sha256": "0953hh9axsdp7jcm4i75m92wj2zpb185mbmm128p0qj2h38506s9", "license": "mit" }, { "pname": "uk_core_news_md", - "version": "3.7.0", - "sha256": "0znfyl8cdvxbxfhypwkjv84hcs6n457wh4j2cl1sfp9pgsd7bmzb", + "version": "3.8.0", + "sha256": "0mvlkpnz0waxmm7fl366s22jw59whc4mav65wxghkjc42sk00yvh", "license": "mit" }, { "pname": "uk_core_news_sm", - "version": "3.7.0", - "sha256": "08scx97j87rrhyrg5smj9ydwmdhl81859qaqj2klgqqpykg0xwlc", + "version": "3.8.0", + "sha256": "094nnpr61h5rr074rpq2bwlk9yg5qaf76bwf4zpncvia936xnzvp", "license": "mit" }, { "pname": "uk_core_news_trf", - "version": "3.7.0", - "sha256": "14s4xwr0qs8x3d2fca2m1nj6ksl82gggj2by7c817gii1bdvn47p", + "version": "3.8.0", + "sha256": "0450y8pla94qj04ijf95qahnj9wvzmavqfy3mnliczkz04z3hgmw", "license": "mit" }, { "pname": "xx_ent_wiki_sm", - "version": "3.7.0", - "sha256": "1k06aa8xsx2qcmd4lz02sfxmgif5nngni8dc4y0w0d4x88icdscn", + "version": "3.8.0", + "sha256": "0sxyys9by4hfksgizwm87crrhrijb9yiywcxpw5315madyzg3w50", "license": "mit" }, { "pname": "xx_sent_ud_sm", - "version": "3.7.0", - "sha256": "13fc4dmmmkanxaxabyx0sa2sh53p92jp3mj263pf31yh98kryxpw", + "version": "3.8.0", + "sha256": "1pwyl23nvmmkpvq5wgafdqq0mlnq14l2svh9m6gi6w0skv7dd5fq", "license": "cc-by-sa-30" }, { "pname": "zh_core_web_lg", - "version": "3.7.0", - "sha256": "1kqdczq5id0sqnyg3sq5g8n7fcknz53srvd72qmz4wrymy5h81qa", + "version": "3.8.0", + "sha256": "0d0c71w18vm4ld9njx4bk8p26d5vyyx6n6j60d2qa1ss9w87bfpm", "license": "mit" }, { "pname": "zh_core_web_md", - "version": "3.7.0", - "sha256": "03m5gnx47mcyx7sh1g3dgqnarvprdkvkyxibsli6yrnvx3vz434j", + "version": "3.8.0", + "sha256": "1y3k6lczs42vhza46v2jaraf8gd2i5f6dfdmmbvdvjq6ykh09ka2", "license": "mit" }, { "pname": "zh_core_web_sm", - "version": "3.7.0", - "sha256": "1x9y4z2883m21rsvv6sw71l1nva3j8an8csdsabs4y84kb5y2by2", + "version": "3.8.0", + "sha256": "1sil5iwm5b1grbsnyi11rkbw6hxj62mc95gjzwgmj3lc7wd896dh", "license": "mit" }, { "pname": "zh_core_web_trf", - "version": "3.7.0", - "sha256": "1y4c9z4vjywmpg61yxsyp80cmz5s3aa95car01wq3i42qj09bvm6", + "version": "3.8.0", + "sha256": "18gmv0s4pz7f2q7m0kjvpj8w7dnabyya6fbd8d9nlkx2924qn03q", "license": "mit" } ] diff --git a/pkgs/development/python-modules/spake2/default.nix b/pkgs/development/python-modules/spake2/default.nix index 956c15ab0b0e..98602e7d521b 100644 --- a/pkgs/development/python-modules/spake2/default.nix +++ b/pkgs/development/python-modules/spake2/default.nix @@ -1,35 +1,28 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, fetchpatch2, setuptools, - hkdf, + cryptography, pytestCheckHook, }: buildPythonPackage rec { pname = "spake2"; - version = "0.8"; + version = "0.9"; pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "c17a614b29ee4126206e22181f70a406c618d3c6c62ca6d6779bce95e9c926f4"; + src = fetchFromGitHub { + owner = "warner"; + repo = "python-spake2"; + rev = "refs/tags/v${version}"; + hash = "sha256-WPMGH1OzG+5O+2lNl2sv06/dNardY+BHYDS290Z36vQ="; }; - patches = [ - # https://github.com/warner/python-spake2/pull/16 - (fetchpatch2 { - name = "python312-compat.patch"; - url = "https://github.com/warner/python-spake2/commit/1b04d33106b105207c97c64b2589c45790720b0b.patch"; - hash = "sha256-OoBz0lN17VyVGg6UfT+Zj9M1faFTNpPIhxrwCgUwMc8="; - }) - ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ hkdf ]; + dependencies = [ cryptography ]; pythonImportsCheck = [ "spake2" ]; diff --git a/pkgs/development/python-modules/spark-parser/default.nix b/pkgs/development/python-modules/spark-parser/default.nix index f82b7df76342..46eea5136304 100644 --- a/pkgs/development/python-modules/spark-parser/default.nix +++ b/pkgs/development/python-modules/spark-parser/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "spark-parser"; - version = "1.8.9"; + version = "1.9.0"; format = "setuptools"; src = fetchPypi { pname = "spark_parser"; inherit version; - sha256 = "0np2y4jcir4a4j18wws7yzkz2zj6nqhdhn41rpq8pyskg6wrgfx7"; + sha256 = "sha256-3GbUjEJlxBM9tBqcX+nBxQKzsgFn3xWKDyNM0xcSz2Q="; }; propagatedBuildInputs = [ click ]; diff --git a/pkgs/development/python-modules/spatialmath-python/default.nix b/pkgs/development/python-modules/spatialmath-python/default.nix index 3613763f3105..48314a348209 100644 --- a/pkgs/development/python-modules/spatialmath-python/default.nix +++ b/pkgs/development/python-modules/spatialmath-python/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchPypi, pythonOlder, @@ -10,19 +11,12 @@ numpy, scipy, typing-extensions, - coverage, - flake8, - pytest, - pytest-timeout, - pytest-xvfb, - sympy, pytestCheckHook, - pythonRelaxDepsHook, }: buildPythonPackage rec { pname = "spatialmath-python"; - version = "1.1.10"; + version = "1.1.13"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,18 +24,19 @@ buildPythonPackage rec { src = fetchPypi { pname = "spatialmath_python"; inherit version; - hash = "sha256-7h29RHCrxdexpabtxMQx/7RahQmCDGHhdJ1WETvtfYg="; + hash = "sha256-BhIB4VapnARkzyhps8xRWnQTAlRB8aVPDpNuN/FNezo="; }; - nativeBuildInputs = [ + build-system = [ oldest-supported-numpy setuptools - pythonRelaxDepsHook ]; pythonRemoveDeps = [ "pre-commit" ]; - propagatedBuildInputs = [ + pythonRelaxDeps = [ "matplotlib" ]; + + dependencies = [ ansitable matplotlib numpy @@ -49,21 +44,17 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { - dev = [ - coverage - flake8 - pytest - pytest-timeout - pytest-xvfb - sympy - ]; - }; - pythonImportsCheck = [ "spatialmath" ]; nativeCheckInputs = [ pytestCheckHook ]; + disabledTestPaths = [ + # tests hang + "tests/test_spline.py" + ]; + + env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "Agg"; + meta = with lib; { description = "Provides spatial maths capability for Python"; homepage = "https://pypi.org/project/spatialmath-python/"; diff --git a/pkgs/development/python-modules/spdx-tools/default.nix b/pkgs/development/python-modules/spdx-tools/default.nix index 336d8cb5549c..c50145cac6b2 100644 --- a/pkgs/development/python-modules/spdx-tools/default.nix +++ b/pkgs/development/python-modules/spdx-tools/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "spdx-tools"; - version = "0.8.2"; + version = "0.8.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "spdx"; repo = "tools-python"; rev = "refs/tags/v${version}"; - hash = "sha256-KB+tfuz0ZnoQcMX3H+IZXjcmPZ4x2ecl8ofz1/3r0/8="; + hash = "sha256-r7+RYGoq3LJYN1jYfwzb1r3fc/kL+CPd4pmGATFq8Pw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 444761c46159..d9c3e6466143 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -60,7 +60,9 @@ buildPythonPackage rec { # On x86_darwin, this test fails with "Fatal Python error: Aborted" # when sandbox = true. - disabledTestPaths = lib.optionals stdenv.isDarwin [ "spectral_cube/tests/test_visualization.py" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + "spectral_cube/tests/test_visualization.py" + ]; pythonImportsCheck = [ "spectral_cube" ]; diff --git a/pkgs/development/python-modules/speechbrain/default.nix b/pkgs/development/python-modules/speechbrain/default.nix index 0d31dd6d23f6..309d7a6af048 100644 --- a/pkgs/development/python-modules/speechbrain/default.nix +++ b/pkgs/development/python-modules/speechbrain/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "speechbrain"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "speechbrain"; repo = "speechbrain"; rev = "refs/tags/v${version}"; - hash = "sha256-JoVu53HuTPkUIyJGqLE80yu7jzPje8/r5Hk6lJsz2XA="; + hash = "sha256-Un7RPxMq1sD7uD3jcw3Bjp+Oo8ld+XC5g2I89gF6jxs="; }; dependencies = [ diff --git a/pkgs/development/python-modules/speechrecognition/default.nix b/pkgs/development/python-modules/speechrecognition/default.nix index 8629af8a075f..d53493b0a992 100644 --- a/pkgs/development/python-modules/speechrecognition/default.nix +++ b/pkgs/development/python-modules/speechrecognition/default.nix @@ -2,10 +2,13 @@ lib, buildPythonPackage, fetchFromGitHub, - numpy, + flac, + openai, + openai-whisper, + pocketsphinx, + pyaudio, pytestCheckHook, pythonOlder, - torch, requests, setuptools, soundfile, @@ -14,41 +17,54 @@ buildPythonPackage rec { pname = "speechrecognition"; - version = "3.10.4"; + version = "3.11.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Uberi"; repo = "speech_recognition"; rev = "refs/tags/${version}"; - hash = "sha256-icXZUg2lVLo8Z5t9ptDj67BjQLnEgrG8geYZ/lZeJt4="; + hash = "sha256-5DZ5QhaYpVtd+AX5OSYD3cM+37Ez0+EL5a+zJ+X/uNg="; }; + postPatch = '' + # Remove Bundled binaries + rm speech_recognition/flac-* + rm -r third-party + + substituteInPlace speech_recognition/audio.py \ + --replace-fail 'shutil_which("flac")' '"${lib.getExe flac}"' + ''; + build-system = [ setuptools ]; dependencies = [ + pyaudio requests typing-extensions ]; + optional-dependencies = { + audio = [ pyaudio ]; + whisper-api = [ openai ]; + whisper-local = [ + openai-whisper + soundfile + ]; + }; + nativeCheckInputs = [ - numpy pytestCheckHook - torch - soundfile - ]; + pocketsphinx + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "speech_recognition" ]; disabledTests = [ - # Test files are missing in source - "test_flac" - # Attribute error - "test_whisper" - # PocketSphinx is not available in Nixpkgs - "test_sphinx" + # Parsed string does not match expected + "test_sphinx_keywords" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/sphinx-argparse/default.nix b/pkgs/development/python-modules/sphinx-argparse/default.nix index 8a88c346dbac..5bc24ba7ec93 100644 --- a/pkgs/development/python-modules/sphinx-argparse/default.nix +++ b/pkgs/development/python-modules/sphinx-argparse/default.nix @@ -2,32 +2,31 @@ lib, buildPythonPackage, fetchPypi, - pytestCheckHook, + flit-core, sphinx, + pytestCheckHook, + lxml, }: buildPythonPackage rec { pname = "sphinx-argparse"; - version = "0.4.0"; - format = "setuptools"; + version = "0.5.2"; + pyproject = true; src = fetchPypi { pname = "sphinx_argparse"; inherit version; - hash = "sha256-4PNBhOtW8S+s53T7yHuICr25AXoJmNHsVZsmfpaX5Ek="; + hash = "sha256-5TUvj6iUtvtv2gSYuiip+NQ1lx70u8GmycZBTnZE8DI="; }; - postPatch = '' - # Fix tests for python-3.10 and add 3.10 to CI matrix - # Should be fixed in versions > 0.3.1 - # https://github.com/ashb/sphinx-argparse/pull/3 - substituteInPlace sphinxarg/parser.py \ - --replace "if action_group.title == 'optional arguments':" "if action_group.title == 'optional arguments' or action_group.title == 'options':" - ''; + build-system = [ flit-core ]; - propagatedBuildInputs = [ sphinx ]; + dependencies = [ sphinx ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + lxml + pytestCheckHook + ]; pythonImportsCheck = [ "sphinxarg" ]; diff --git a/pkgs/development/python-modules/sphinx-autoapi/default.nix b/pkgs/development/python-modules/sphinx-autoapi/default.nix index 54bd85583803..1da00715ba97 100644 --- a/pkgs/development/python-modules/sphinx-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinx-autoapi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "3.3.1"; + version = "3.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinx_autoapi"; inherit version; - hash = "sha256-5EoiWCfQ73F4dIIlpm8wyVRU39AO48Iq+9+4BW99/7U="; + hash = "sha256-6/i0Sy66tcKPAmPsbC+KzdFW6bLVOaWOyjnS82hEUXM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sphinx-autobuild/default.nix b/pkgs/development/python-modules/sphinx-autobuild/default.nix index b802384ae133..33314d868f6d 100644 --- a/pkgs/development/python-modules/sphinx-autobuild/default.nix +++ b/pkgs/development/python-modules/sphinx-autobuild/default.nix @@ -8,6 +8,7 @@ # dependencies colorama, + httpx, sphinx, starlette, uvicorn, @@ -20,20 +21,21 @@ buildPythonPackage rec { pname = "sphinx-autobuild"; - version = "2024.04.16"; + version = "2024.09.19"; pyproject = true; src = fetchFromGitHub { owner = "sphinx-doc"; repo = "sphinx-autobuild"; rev = "refs/tags/${version}"; - hash = "sha256-5HgRqt2ZTGcQ6X2sZN0gRfahmwlqpDbae5gOnGa02L0="; + hash = "sha256-azSQ524iXWeW7D1NgpWErFL4K0TBZ8ib6lRr1J246h4="; }; build-system = [ flit-core ]; dependencies = [ colorama + httpx sphinx starlette uvicorn diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index 7d3030c7226a..a5bd5406b0cc 100644 --- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -11,27 +11,29 @@ let pname = "sphinx-autodoc-typehints"; - version = "2.1.1"; + version = "2.4.4"; in buildPythonPackage { inherit pname version; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-AHK2X1qygYwinW1sLMmTdwr1XTa7e/sWAB4vzk0UiAw="; + hash = "sha256-50NRLaWLZ6BleaFGJ5imkHZkq3dGB1ikMjSt6sNQr78="; }; - nativeBuildInputs = [ + pythonRelaxDeps = [ "sphinx" ]; + + build-system = [ hatch-vcs hatchling ]; - propagatedBuildInputs = [ sphinx ]; + dependencies = [ sphinx ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sphinx-autodoc2/default.nix b/pkgs/development/python-modules/sphinx-autodoc2/default.nix new file mode 100644 index 000000000000..9442a660bc38 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-autodoc2/default.nix @@ -0,0 +1,72 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + + flit-core, + + astroid, + typing-extensions, + typer, + + pytestCheckHook, + pytest-regressions, + sphinx, + defusedxml, +}: + +buildPythonPackage rec { + pname = "sphinx-autodoc2"; + version = "0.5.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "sphinx-extensions2"; + repo = "sphinx-autodoc2"; + rev = "refs/tags/v${version}"; + hash = "sha256-Wu079THK1mHVilD2Fx9dIzuIOOYOXpo/EMxVczNutCI="; + }; + + build-system = [ flit-core ]; + + dependencies = [ + astroid + typing-extensions + + # cli deps + typer + ] ++ typer.optional-dependencies.standard; + + preCheck = '' + # make sphinx_path an alias of pathlib.Path, since sphinx_path was removed in Sphinx v7.2.0 + substituteInPlace tests/test_render.py --replace-fail \ + 'from sphinx.testing.util import path as sphinx_path' \ + 'sphinx_path = Path' + ''; + + nativeCheckInputs = [ + pytestCheckHook + pytest-regressions + sphinx + defusedxml + ]; + + disabledTests = [ + # some generated files differ in newer versions of Sphinx + "test_sphinx_build_directives" + ]; + + pythonImportsCheck = [ "autodoc2" ]; + + meta = { + changelog = "https://github.com/sphinx-extensions2/sphinx-autodoc2/releases/tag/v${version}"; + homepage = "https://github.com/sphinx-extensions2/sphinx-autodoc2"; + description = "Sphinx extension that automatically generates API documentation for your Python packages"; + license = lib.licenses.mit; + mainProgram = "autodoc2"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/pkgs/development/python-modules/sphinx-automodapi/default.nix b/pkgs/development/python-modules/sphinx-automodapi/default.nix index 371be354dc70..2c3b0820b552 100644 --- a/pkgs/development/python-modules/sphinx-automodapi/default.nix +++ b/pkgs/development/python-modules/sphinx-automodapi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "sphinx-automodapi"; - version = "0.17.0"; + version = "0.18.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "astropy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Suu81pWUIwIgp/iTaYambuYRTkC7njP6n5RWZscugnk="; + hash = "sha256-YTaoGBYQvuUbMYe4FKmtgxcAxeesU/ruVXPOjZXGLGU="; leaveDotGit = true; }; diff --git a/pkgs/development/python-modules/sphinx-hoverxref/default.nix b/pkgs/development/python-modules/sphinx-hoverxref/default.nix index 643e3111311d..903005d0df9a 100644 --- a/pkgs/development/python-modules/sphinx-hoverxref/default.nix +++ b/pkgs/development/python-modules/sphinx-hoverxref/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, flit-core, - pythonImportsCheckHook, # documentation build dependencies sphinxHook, sphinx-notfound-page, @@ -37,7 +36,6 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core - pythonImportsCheckHook sphinxHook sphinx-notfound-page diff --git a/pkgs/development/python-modules/sphinx-lv2-theme/default.nix b/pkgs/development/python-modules/sphinx-lv2-theme/default.nix new file mode 100644 index 000000000000..47689da31158 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-lv2-theme/default.nix @@ -0,0 +1,33 @@ +{ + buildPythonPackage, + lib, + fetchFromGitLab, + setuptools, + sphinx, +}: + +buildPythonPackage rec { + pname = "sphinx-lv2-theme"; + version = "1.4.2"; + pyproject = true; + + src = fetchFromGitLab { + owner = "LV2"; + repo = "sphinx_lv2_theme"; + rev = "v${version}"; + hash = "sha256-x3h2hOQIyzOmnh58WMHjuOARdML1sDiVAf7m0YghhJ4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ sphinx ]; + + pythonImportsCheck = [ "sphinx_lv2_theme" ]; + + meta = { + description = "Sphinx theme in the style of the LV2 plugin"; + homepage = "https://gitlab.com/lv2/sphinx_lv2_theme"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ samueltardieu ]; + }; +} diff --git a/pkgs/development/python-modules/sphinx-mdinclude/default.nix b/pkgs/development/python-modules/sphinx-mdinclude/default.nix index f938f267eb65..85c30a91a48c 100644 --- a/pkgs/development/python-modules/sphinx-mdinclude/default.nix +++ b/pkgs/development/python-modules/sphinx-mdinclude/default.nix @@ -10,6 +10,7 @@ docutils, mistune, pygments, + sphinx, # tests pytestCheckHook, @@ -17,13 +18,13 @@ buildPythonPackage rec { pname = "sphinx-mdinclude"; - version = "0.6.1"; + version = "0.6.2"; format = "pyproject"; src = fetchPypi { pname = "sphinx_mdinclude"; inherit version; - hash = "sha256-7OPYEuLVWbTn5H9ntqh7Dipom2svURR5XI7Uf/s5wWk="; + hash = "sha256-RHRi6Cy4vmFASiIEIn+SB2nrkj0vV2COMyXzu4goa0w="; }; nativeBuildInputs = [ flit-core ]; @@ -32,12 +33,12 @@ buildPythonPackage rec { docutils mistune pygments + sphinx ]; nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { - broken = true; # https://github.com/omnilib/sphinx-mdinclude/issues/22 homepage = "https://github.com/omnilib/sphinx-mdinclude"; changelog = "https://github.com/omnilib/sphinx-mdinclude/blob/v${version}/CHANGELOG.md"; description = "Sphinx extension for including or writing pages in Markdown format"; @@ -50,6 +51,9 @@ buildPythonPackage rec { sphinx-mdinclude is a fork of m2r and m2r2, focused only on providing a Sphinx extension. ''; license = licenses.mit; - maintainers = with maintainers; [ flokli ]; + maintainers = with maintainers; [ + flokli + JulianFP + ]; }; } diff --git a/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/pkgs/development/python-modules/sphinx-notfound-page/default.nix index 58c81240c42a..93e7662214ef 100644 --- a/pkgs/development/python-modules/sphinx-notfound-page/default.nix +++ b/pkgs/development/python-modules/sphinx-notfound-page/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, flit-core, - pythonImportsCheckHook, pythonOlder, # documentation build dependencies sphinxHook, @@ -38,7 +37,6 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core - pythonImportsCheckHook sphinxHook sphinx-prompt sphinx-rtd-theme diff --git a/pkgs/development/python-modules/sphinx-sitemap/default.nix b/pkgs/development/python-modules/sphinx-sitemap/default.nix index 918282c97679..f2ad32e67a43 100644 --- a/pkgs/development/python-modules/sphinx-sitemap/default.nix +++ b/pkgs/development/python-modules/sphinx-sitemap/default.nix @@ -5,11 +5,12 @@ setuptools, sphinx, sphinx-pytest, + defusedxml, pytestCheckHook, }: let pname = "sphinx-sitemap"; - version = "2.5.1"; + version = "2.6.0"; in buildPythonPackage { inherit pname version; @@ -19,7 +20,7 @@ buildPythonPackage { owner = "jdillard"; repo = "sphinx-sitemap"; rev = "refs/tags/v${version}"; - hash = "sha256-R8nAaEPd2vQs9Z0Fa5yvTP0KP3O+DnIJLPeISZ10Xtk="; + hash = "sha256-RERa+/MVug2OQ/FAXS4LOQHB4eEuIW2rwcdZUOrr6g8="; }; nativeBuildInputs = [ setuptools ]; @@ -29,6 +30,7 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook sphinx-pytest + defusedxml ]; meta = with lib; { diff --git a/pkgs/development/python-modules/sphinx-tabs/default.nix b/pkgs/development/python-modules/sphinx-tabs/default.nix index 9b8538408a7d..8d30e14bfc36 100644 --- a/pkgs/development/python-modules/sphinx-tabs/default.nix +++ b/pkgs/development/python-modules/sphinx-tabs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "sphinx-tabs"; - version = "3.4.5"; + version = "3.4.7"; format = "pyproject"; outputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = "sphinx-tabs"; rev = "refs/tags/v${version}"; - hash = "sha256-uFSnIhvnmg3ZURJGbSOUpLVx0EDUs/9SewspM7gtNRk="; + hash = "sha256-bJXm3qMT1y7NqUA0iiEUA+USTWHxdV8tbEEiDrQKk1U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-version-warning/default.nix b/pkgs/development/python-modules/sphinx-version-warning/default.nix index 6856bcd4fee7..771b674c18de 100644 --- a/pkgs/development/python-modules/sphinx-version-warning/default.nix +++ b/pkgs/development/python-modules/sphinx-version-warning/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, - pythonImportsCheckHook, pythonOlder, setuptools, sphinx, @@ -47,7 +46,6 @@ buildPythonPackage { ]; nativeBuildInputs = [ - pythonImportsCheckHook sphinx-autoapi sphinx-prompt sphinx-rtd-theme diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 16e2a81e5043..f39899a2c5b6 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -4,7 +4,6 @@ pythonAtLeast, pythonOlder, fetchFromGitHub, - fetchpatch2, isPyPy, # build-system @@ -29,6 +28,7 @@ sphinxcontrib-serializinghtml, sphinxcontrib-websupport, tomli, + typing-extensions, # check phase defusedxml, @@ -40,8 +40,9 @@ buildPythonPackage rec { pname = "sphinx"; - version = "7.3.7"; - format = "pyproject"; + version = "7.4.7"; + pyproject = true; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { @@ -55,17 +56,9 @@ buildPythonPackage rec { mv tests/roots/test-images/{testimäge,testimæge}.png sed -i 's/testimäge/testimæge/g' tests/{test_build*.py,roots/test-images/index.rst} ''; - hash = "sha256-XGGRWEvd1SbQsK8W5yxDzBd5hlvXcDzr8t5Qa6skH/M="; + hash = "sha256-/5zH9IdLmTGnn5MY4FFSuZOIeF/x1L9Ga/wp57XrAQo="; }; - patches = [ - (fetchpatch2 { - name = "python-3.13-compat.patch"; - url = "https://github.com/sphinx-doc/sphinx/commit/3496de62b743942115acb486cf35dfcc102586c3.patch"; - hash = "sha256-5VBPOQeGyj3a8VBq4hc9S/eKaeVZeGCTNislwgsauZo="; - }) - ]; - build-system = [ flit-core ]; dependencies = @@ -99,6 +92,7 @@ buildPythonPackage rec { html5lib pytestCheckHook pytest-xdist + typing-extensions ]; preCheck = '' @@ -121,6 +115,11 @@ buildPythonPackage rec { "test_class_alias_having_doccomment" "test_class_alias_for_imported_object_having_doccomment" "test_decorators" + # racy with too many threads + # https://github.com/NixOS/nixpkgs/issues/353176 + "test_document_toc_only" + # Assertion error + "test_gettext_literalblock_additional" # requires cython_0, but fails miserably on 3.11 "test_cython" # Could not fetch remote image: http://localhost:7777/sphinx.png diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index dbd91f0e5da6..6e88e523b901 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -1,35 +1,52 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, + setuptools, + docutils, + importlib-metadata, oset, pybtex, pybtex-docutils, sphinx, + sphinx-autoapi, + pytestCheckHook, }: buildPythonPackage rec { pname = "sphinxcontrib-bibtex"; - version = "2.6.2"; - format = "setuptools"; + version = "2.6.3"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-9IevaUM28ov7fWoXBwlTp9JkvsQwAKI3lyQnT1+NcK4="; + src = fetchFromGitHub { + owner = "mcmtroffaes"; + repo = "sphinxcontrib-bibtex"; + rev = "refs/tags/${version}"; + hash = "sha256-cqz5Jamtlflo5rFhWPCPlYoymApUtXPG4oTRjfDI+WY="; }; - propagatedBuildInputs = [ - oset - pybtex - pybtex-docutils - sphinx + build-system = [ setuptools ]; + + dependencies = + [ + docutils + oset + pybtex + pybtex-docutils + sphinx + ] + ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata + ]; + + nativeCheckInputs = [ + pytestCheckHook + sphinx-autoapi ]; - doCheck = false; - pythonImportsCheck = [ "sphinxcontrib.bibtex" ]; pythonNamespaces = [ "sphinxcontrib" ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 69b237b0452b..3279faae0128 100644 --- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-htmlhelp"; - version = "2.0.5"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinxcontrib_htmlhelp"; inherit version; - hash = "sha256-Dch2N9XeU91e7DpqAXU7HM+ZSUvXVqr+zXS0+p5ykBU="; + hash = "sha256-yeKRas6KrWTME6DSM+4iMX8rkCW5zzKVJJ+phcxwguk="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix b/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix index 66047794ecea..afc005af66ef 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix @@ -39,10 +39,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "sphinxcontrib.jquery" ]; + dependencies = [ + sphinx + ]; + nativeCheckInputs = [ defusedxml pytestCheckHook - sphinx ]; pythonNamespaces = [ "sphinxcontrib" ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index 402432dd1e49..755deb678526 100644 --- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-qthelp"; - version = "1.0.7"; + version = "1.0.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinxcontrib_qthelp"; inherit version; - hash = "sha256-BT3tw4gjqApyCagIYLFrci6eAgnjL+qYyQ5OZiRYjtY="; + hash = "sha256-2z+PoQeJx6jnbRc8IzZL3w682USZaanmo90xuLdGnwM="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 2740b83afbb4..7cfc6b174a3a 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { social_cards_generation = [ matplotlib ]; }; @@ -35,7 +35,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook beautifulsoup4 - ] ++ passthru.optional-dependencies.social_cards_generation; + ] ++ optional-dependencies.social_cards_generation; pythonImportsCheck = [ "sphinxext.opengraph" ]; diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index c85096167742..c8ce42bc7351 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { "zope.testbrowser" = [ zope-testbrowser lxml @@ -54,7 +54,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ # driver is present and fails with a different error during loading diff --git a/pkgs/development/python-modules/spotifyaio/default.nix b/pkgs/development/python-modules/spotifyaio/default.nix new file mode 100644 index 000000000000..54308db1a8b0 --- /dev/null +++ b/pkgs/development/python-modules/spotifyaio/default.nix @@ -0,0 +1,61 @@ +{ + lib, + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + mashumaro, + orjson, + poetry-core, + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, + pythonOlder, + syrupy, + yarl, +}: + +buildPythonPackage rec { + pname = "spotifyaio"; + version = "0.8.7"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "joostlek"; + repo = "python-spotify"; + rev = "refs/tags/v${version}"; + hash = "sha256-8CvXh3lU6CWOIFyfKQv4TX4R9O9BzwEu/Cua0MRdma4="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + mashumaro + orjson + yarl + ]; + + # With 0.6.0 the tests are properly mocked + doCheck = false; + + nativeCheckInputs = [ + aioresponses + syrupy + pytest-asyncio + pytest-cov-stub + pytestCheckHook + ]; + + pythonImportsCheck = [ "spotifyaio" ]; + + meta = { + description = "Module for interacting with for Spotify"; + homepage = "https://github.com/joostlek/python-spotify/"; + changelog = "https://github.com/joostlek/python-spotify/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 46bf6bb70bb2..c0511c2fc6a7 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "3.0.0"; + version = "3.0.1"; pyproject = true; src = fetchFromGitHub { owner = "spyder-ide"; repo = "spyder-kernels"; rev = "refs/tags/v${version}"; - hash = "sha256-oyPgujvaj2tqouZKuMVDq3gxm0GNrKmeUWqUFUkEMB4="; + hash = "sha256-OWdm4ytF9evqMEOOASssMag6QuJq2MwqmIZ+4et5IoI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index febf8c66dd3f..dfd9a79aeb38 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -2,7 +2,11 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, + + # nativeBuildInputs + + # build-system + setuptools, # dependencies aiohttp, @@ -41,7 +45,6 @@ rope, rtree, scipy, - setuptools, spyder-kernels, superqt, textdistance, @@ -52,18 +55,21 @@ buildPythonPackage rec { pname = "spyder"; - version = "6.0.0"; + version = "6.0.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-/UUtSpSkt1hJeIZfBLe8owP82jRx02kUF6TdfCsq6CY="; + hash = "sha256-mPUrAYFn3k5NQrsk7B2aPFnkAxKSKC4I97DnFPK1pvM="; }; patches = [ ./dont-clear-pythonpath.patch ]; - build-system = [ + nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook + ]; + + build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sqlalchemy-file/default.nix b/pkgs/development/python-modules/sqlalchemy-file/default.nix index 3fad04838acd..0cd6d46988ae 100644 --- a/pkgs/development/python-modules/sqlalchemy-file/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-file/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { export LOCAL_PATH="$PWD/.storage" ''; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # very flaky, sandbox issues? # libcloud.storage.types.ContainerDoesNotExistError # sqlite3.OperationalError: attempt to write a readonly database diff --git a/pkgs/development/python-modules/sqlalchemy-mixins/default.nix b/pkgs/development/python-modules/sqlalchemy-mixins/default.nix index 1adb1c21d046..66a1e659b5a1 100644 --- a/pkgs/development/python-modules/sqlalchemy-mixins/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-mixins/default.nix @@ -1,5 +1,6 @@ { lib, + aiosqlite, buildPythonPackage, fetchFromGitHub, setuptools, @@ -11,16 +12,16 @@ buildPythonPackage rec { pname = "sqlalchemy-mixins"; - version = "2.0.5"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "absent1706"; - repo = pname; + repo = "sqlalchemy-mixins"; rev = "refs/tags/v${version}"; - hash = "sha256-iJrRlV/M0Z1IOdrwWSblefm6wjvdk4/v0am+It8VeWI="; + hash = "sha256-0uB3x7RQSNEq3DyTSiOIGajwPQQEBjXK8HOyuXCNa/E="; }; build-system = [ setuptools ]; @@ -30,7 +31,10 @@ buildPythonPackage rec { sqlalchemy ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + aiosqlite + pytestCheckHook + ]; pythonImportsCheck = [ "sqlalchemy_mixins" ]; diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index e4865cd091af..ec8f69958be3 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -1,57 +1,54 @@ { lib, buildPythonPackage, - fetchPypi, - pythonOlder, - - # runtime - importlib-metadata, - sqlalchemy, - - # optionals - babel, arrow, - pendulum, - #, intervals - phonenumbers, - passlib, + babel, colour, - python-dateutil, - furl, cryptography, - - # tests - pytestCheckHook, - pygments, - jinja2, docutils, + fetchFromGitHub, flexmock, + furl, + # intervals, + jinja2, + passlib, + pendulum, + pg8000, + phonenumbers, psycopg2, psycopg2cffi, - pg8000, - pytz, - backports-zoneinfo, + pygments, pymysql, pyodbc, - + pytestCheckHook, + python-dateutil, + pythonOlder, + pytz, + setuptools, + sqlalchemy, }: buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.41.2"; - format = "setuptools"; + version = "0.42.2"; + pyproject = true; - src = fetchPypi { - inherit version; - pname = "SQLAlchemy-Utils"; - hash = "sha256-vFmcjDszGeU85sXDxHESC9Ml0AcftvOKEOkk49B7mZA="; + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "kvesteri"; + repo = "sqlalchemy-utils"; + rev = "refs/tags/${version}"; + hash = "sha256-jC8onlCiuzpMlJ3EzpzCnQ128xpkLzrZEuGWQv7pvVE="; }; patches = [ ./skip-database-tests.patch ]; - propagatedBuildInputs = [ sqlalchemy ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + build-system = [ setuptools ]; + + propagatedBuildInputs = [ sqlalchemy ]; - passthru.optional-dependencies = { + optional-dependencies = { babel = [ babel ]; arrow = [ arrow ]; pendulum = [ pendulum ]; @@ -78,24 +75,28 @@ buildPythonPackage rec { pymysql pyodbc ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies) + ++ lib.flatten (builtins.attrValues optional-dependencies) ++ lib.optionals (pythonOlder "3.12") [ # requires distutils, which were removed in 3.12 psycopg2cffi - ] - ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; + ]; + + disabledTests = [ + "test_create_database_twice" + "test_create_and_drop" + ]; pytestFlagsArray = [ - "--deselect tests/functions/test_database.py::TestDatabasePostgresCreateDatabaseCloseConnection::test_create_database_twice" - "--deselect tests/functions/test_database.py::TestDatabasePostgresPg8000::test_create_and_drop" - "--deselect tests/functions/test_database.py::TestDatabasePostgresPsycoPG2CFFI::test_create_and_drop" - "--deselect tests/functions/test_database.py::TestDatabasePostgresPsycoPG3::test_create_and_drop" + "-W" + "ignore::DeprecationWarning" ]; + pythonImportsCheck = [ "sqlalchemy_utils" ]; + meta = with lib; { - changelog = "https://github.com/kvesteri/sqlalchemy-utils/releases/tag/${version}"; - homepage = "https://github.com/kvesteri/sqlalchemy-utils"; description = "Various utility functions and datatypes for SQLAlchemy"; + homepage = "https://github.com/kvesteri/sqlalchemy-utils"; + changelog = "https://github.com/kvesteri/sqlalchemy-utils/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ eadwu ]; }; diff --git a/pkgs/development/python-modules/sqlalchemy/1_4.nix b/pkgs/development/python-modules/sqlalchemy/1_4.nix index b741a7710c56..2384a4f0c056 100644 --- a/pkgs/development/python-modules/sqlalchemy/1_4.nix +++ b/pkgs/development/python-modules/sqlalchemy/1_4.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ greenlet ]; - passthru.optional-dependencies = lib.fix (self: { + optional-dependencies = lib.fix (self: { asyncio = [ greenlet ]; mypy = [ mypy ]; mssql = [ pyodbc ]; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 426be56eea9d..06ce40e7e336 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "2.0.32"; + version = "2.0.34"; pyproject = true; disabled = pythonOlder "3.7"; @@ -50,14 +50,11 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-B0T4GsTIis2ZZykRnNOFfhyfW4qU/waXeP0BS5+G1IM="; + hash = "sha256-5nnMh8pEG6rXiy0nk9SKjIOY+htXNx9eHTEtNOkLrd8="; }; postPatch = '' sed -i '/tag_build = dev/d' setup.cfg - - substituteInPlace pyproject.toml \ - --replace-fail "setuptools>=61.0,<69.3" "setuptools" ''; nativeBuildInputs = [ setuptools ] ++ lib.optionals (!isPyPy) [ cython ]; @@ -67,7 +64,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = lib.fix (self: { + optional-dependencies = lib.fix (self: { asyncio = [ greenlet ]; mypy = [ mypy ]; mssql = [ pyodbc ]; diff --git a/pkgs/development/python-modules/sqlfmt/default.nix b/pkgs/development/python-modules/sqlfmt/default.nix new file mode 100644 index 000000000000..37f23ca89ee7 --- /dev/null +++ b/pkgs/development/python-modules/sqlfmt/default.nix @@ -0,0 +1,66 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + fetchFromGitHub, + importlib-metadata, + black, + poetry-core, + click, + jinja2, + platformdirs, + tomli, + tqdm, + gitpython, +}: + +buildPythonPackage rec { + pname = "sqlfmt"; + version = "0.23.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tconbeer"; + repo = "sqlfmt"; + rev = "refs/tags/v${version}"; + hash = "sha256-g2ycfpsBFMh16pYVzCmde0mhQhhvAhH25i3LJTcG7Ac="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + click + importlib-metadata + jinja2 + platformdirs + tomli + tqdm + ]; + + optional-dependencies = { + jinjafmt = [ + black + ]; + sqlfmt_primer = [ + gitpython + ]; + }; + + pythonRelaxDeps = [ + "platformdirs" + ]; + + pythonImportsCheck = [ + "sqlfmt" + ]; + + meta = { + description = "Sqlfmt formats your dbt SQL files so you don't have to"; + homepage = "https://github.com/tconbeer/sqlfmt"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pcboy ]; + mainProgram = "sqlfmt"; + }; +} diff --git a/pkgs/development/python-modules/sqlglot/default.nix b/pkgs/development/python-modules/sqlglot/default.nix index f146f9d8a7f5..d03bccf6b66d 100644 --- a/pkgs/development/python-modules/sqlglot/default.nix +++ b/pkgs/development/python-modules/sqlglot/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sqlglot"; - version = "23.12.1"; + version = "25.20.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { repo = "sqlglot"; owner = "tobymao"; rev = "refs/tags/v${version}"; - hash = "sha256-VUG/l1iZ/8vAJwhktN/tx8U8KVLgaghUPArtxEyIA54="; + hash = "sha256-RE9Hbb3g6j4j5X2ksjcBZ610RcV7Zd3YaKaBIUyD2vU="; }; nativeBuildInputs = [ @@ -39,11 +39,6 @@ buildPythonPackage rec { duckdb ]; - disabledTestPaths = [ - # These integration tests assume a running Spark instance - "tests/dataframe/integration" - ]; - pythonImportsCheck = [ "sqlglot" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix index 69c91cf65c0c..18b2a0c43983 100644 --- a/pkgs/development/python-modules/sqlparse/default.nix +++ b/pkgs/development/python-modules/sqlparse/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "sqlparse"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-cU0KSTLAWdFhifWO9UEewih6Q2DxfN0O3S0J1MUIfJM="; + hash = "sha256-u2tN9GVlXvMyVI4k8I4gWvyBuauGyxxFZXp/8XOjoA4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/sre-yield/default.nix b/pkgs/development/python-modules/sre-yield/default.nix index 04cc12184090..fdd8cc8b4b05 100644 --- a/pkgs/development/python-modules/sre-yield/default.nix +++ b/pkgs/development/python-modules/sre-yield/default.nix @@ -19,7 +19,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - doCheck = true; nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/srp/default.nix b/pkgs/development/python-modules/srp/default.nix index 6ac658f7ef79..e3c9c04fe6d3 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.21"; + version = "1.0.22"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hmgTvPUhGJoVY+bKMRK29U/fclpBCi2+u28NhLgqHx0="; + hash = "sha256-8zDQ7HOH4qyFd0h7FkljFV1KAxvKbiAk8bCTDrkrql0="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix index 6eaae84d6f77..6bd8a7a91666 100644 --- a/pkgs/development/python-modules/sshfs/default.nix +++ b/pkgs/development/python-modules/sshfs/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "sshfs"; - version = "2024.6.0"; + version = "2024.9.0"; pyproject = true; src = fetchFromGitHub { owner = "fsspec"; repo = "sshfs"; rev = "refs/tags/${version}"; - hash = "sha256-8Vut/JDLmWrTys8aaIBRbaWlvGCg6edaXmMCFxjGhag="; + hash = "sha256-rRcXimthyFLBqt0nMEv7bisL+JNLLZuRH7BopSLM7QQ="; }; build-system = [ @@ -41,8 +41,8 @@ buildPythonPackage rec { fido2 = [ asyncssh ] ++ asyncssh.optional-dependencies.fido2; gssapi = [ asyncssh ] ++ asyncssh.optional-dependencies.gssapi; libnacl = [ asyncssh ] ++ asyncssh.optional-dependencies.libnacl; - pkcs11 = [ asyncssh ] ++ asyncssh.optional-dependencies.python-pkcs11; - pyopenssl = [ asyncssh ] ++ asyncssh.optional-dependencies.pyopenssl; + pkcs11 = [ asyncssh ] ++ asyncssh.optional-dependencies.pkcs11; + pyopenssl = [ asyncssh ] ++ asyncssh.optional-dependencies.pyOpenSSL; }; __darwinAllowLocalNetworking = true; @@ -59,7 +59,7 @@ buildPythonPackage rec { # Test requires network access "test_config_expansions" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Test fails with sandbox enabled "test_checksum" ]; diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix index 1422b50c320d..ecb8e24d01a4 100644 --- a/pkgs/development/python-modules/sshtunnel/default.nix +++ b/pkgs/development/python-modules/sshtunnel/default.nix @@ -5,19 +5,22 @@ paramiko, pytestCheckHook, mock, + setuptools, }: buildPythonPackage rec { - version = "0.4.0"; - format = "setuptools"; pname = "sshtunnel"; + version = "0.4.0"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-58sOp3Tbgb+RhE2yLecqQKro97D5u5ug9mbUdO9r+fw="; }; - propagatedBuildInputs = [ paramiko ]; + build-system = [ setuptools ]; + + dependencies = [ paramiko ] ++ paramiko.optional-dependencies.ed25519; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/ssort/default.nix b/pkgs/development/python-modules/ssort/default.nix index 71a950b98bd7..6a60f6ab1e53 100644 --- a/pkgs/development/python-modules/ssort/default.nix +++ b/pkgs/development/python-modules/ssort/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "ssort"; - version = "0.13.0"; + version = "0.14.0"; pyproject = true; src = fetchFromGitHub { owner = "bwhmather"; repo = "ssort"; rev = "refs/tags/${version}"; - hash = "sha256-P/FUayCC7KfXjtzclTPLhLw5o0bV4L98tes69w+038o="; + hash = "sha256-TINktjuTdyRYkqIs3Jyv6vobSBqV1iPoHrG36sBHah8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/starlette-admin/default.nix b/pkgs/development/python-modules/starlette-admin/default.nix index 41f3a1001345..a60768ef4220 100644 --- a/pkgs/development/python-modules/starlette-admin/default.nix +++ b/pkgs/development/python-modules/starlette-admin/default.nix @@ -85,7 +85,7 @@ buildPythonPackage rec { export LOCAL_PATH="$PWD/.storage" ''; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # flaky, depends on test order "test_ensuring_pk" # flaky, of-by-one @@ -99,7 +99,7 @@ buildPythonPackage rec { # needs mongodb running on port 27017 "tests/mongoengine" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # very flaky, sandbox issues? # libcloud.storage.types.ContainerDoesNotExistError # sqlite3.OperationalError: attempt to write a readonly database diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 21551a5786da..c1b0fa8be4bd 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.37.2"; + version = "0.40.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "encode"; repo = "starlette"; rev = "refs/tags/${version}"; - hash = "sha256-GiCN1sfhLu9i19d2OcLZrlY8E64DFrFh+ITRSvLaxdE="; + hash = "sha256-CBkDDsIw9LAIeAzN5E9gdEvznFugoa/RilPmnwcJBy4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/static3/default.nix b/pkgs/development/python-modules/static3/default.nix index 050fb2119dae..13a41618feb3 100644 --- a/pkgs/development/python-modules/static3/default.nix +++ b/pkgs/development/python-modules/static3/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { --replace ", 'pytest-cov'" "" ''; - passthru.optional-dependencies = { + optional-dependencies = { KidMagic = [ # TODO: kid ]; @@ -40,7 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook webtest - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = with lib; { changelog = "https://github.com/rmohr/static3/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index d917d3ebf735..f08c9613fc34 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -16,19 +16,19 @@ buildPythonPackage rec { pname = "statsmodels"; - version = "0.14.2"; + version = "0.14.3"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-iQVQFHrTqBzaJPC6GlxAIa3BYBCAvQDhka581v7s1q0="; + hash = "sha256-7PNQJkP6k6q+XwvfI477WWCVF8TWCoEWMtMfzc6GwtI="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "numpy>=2.0.0rc1,<3" "numpy" + --replace-fail "numpy>=2.0.0,<3" "numpy" ''; build-system = [ diff --git a/pkgs/development/python-modules/stdlib-list/default.nix b/pkgs/development/python-modules/stdlib-list/default.nix index 6109e6ce2fc7..e4c3fbfa2296 100644 --- a/pkgs/development/python-modules/stdlib-list/default.nix +++ b/pkgs/development/python-modules/stdlib-list/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "stdlib-list"; - version = "0.10.0"; + version = "0.11.0"; format = "pyproject"; src = fetchPypi { pname = "stdlib_list"; inherit version; - hash = "sha256-ZRnFDWRVE+0odle/6FbVJ/J3MxVAaR3er3eyVFmWShQ="; + hash = "sha256-t0p7ZDp3oSY36Qfz9i8KufZzALzkAU9rLTyLTI/WPGY="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/stim/default.nix b/pkgs/development/python-modules/stim/default.nix index 9d1cda9a761f..1b5ca74cc77b 100644 --- a/pkgs/development/python-modules/stim/default.nix +++ b/pkgs/development/python-modules/stim/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "stim"; - version = "1.13.0"; + version = "1.14.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "quantumlib"; repo = "Stim"; rev = "refs/tags/v${version}"; - hash = "sha256-anJvDHLZ470iNw0U7hq9xGBacDgqYO9ZcmmdCt9pefg="; + hash = "sha256-Tx+4FfkMShzTP1QEQVwHEz3FZ5pz3uXK2mlJFLNlTas="; }; postPatch = '' diff --git a/pkgs/development/python-modules/stix2-patterns/default.nix b/pkgs/development/python-modules/stix2-patterns/default.nix index 4ca5ee040a75..16898cb624d4 100644 --- a/pkgs/development/python-modules/stix2-patterns/default.nix +++ b/pkgs/development/python-modules/stix2-patterns/default.nix @@ -1,5 +1,6 @@ { lib, + antlr4_9, antlr4-python3-runtime, buildPythonPackage, fetchFromGitHub, @@ -23,15 +24,10 @@ buildPythonPackage rec { hash = "sha256-lFgnvI5a7U7/Qj4Pqjr3mx4TNDnC2/Ru7tVG7VggR7Y="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "antlr4-python3-runtime~=" "antlr4-python3-runtime>=" - ''; - build-system = [ setuptools ]; dependencies = [ - antlr4-python3-runtime + (antlr4-python3-runtime.override { antlr4 = antlr4_9; }) six ]; @@ -39,14 +35,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "stix2patterns" ]; - disabledTestPaths = [ - # Exception: Could not deserialize ATN with version (expected 4) - "stix2patterns/test/v20/test_inspector.py" - "stix2patterns/test/v21/test_inspector.py" - "stix2patterns/test/v20/test_validator.py" - "stix2patterns/test/v21/test_validator.py" - ]; - meta = with lib; { description = "Validate patterns used to express cyber observable content in STIX Indicators"; mainProgram = "validate-patterns"; diff --git a/pkgs/development/python-modules/stix2/default.nix b/pkgs/development/python-modules/stix2/default.nix new file mode 100644 index 000000000000..26622eea45b5 --- /dev/null +++ b/pkgs/development/python-modules/stix2/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + haversine, + medallion, + pytz, + rapidfuzz, + requests, + simplejson, + stix2-patterns, + taxii2-client, +}: + +buildPythonPackage rec { + pname = "stix2"; + version = "3.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "oasis-open"; + repo = "cti-python-stix2"; + rev = "refs/tags/v${version}"; + hash = "sha256-1bILZUZgPOWmFWRu4p/fmgi4QPEE1lFQH9mxoWd/saI="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pytz + requests + simplejson + stix2-patterns + ]; + + nativeCheckInputs = [ + pytestCheckHook + haversine + medallion + rapidfuzz + taxii2-client + ]; + + disabledTests = [ + # flaky tests + "test_graph_equivalence_with_filesystem_source" + "test_graph_similarity_with_filesystem_source" + "test_object_similarity_prop_scores" + ]; + + pythonImportsCheck = [ "stix2" ]; + + meta = with lib; { + description = "Produce and consume STIX 2 JSON content"; + homepage = "https://stix2.readthedocs.io/en/latest/"; + changelog = "https://github.com/oasis-open/cti-python-stix2/blob/v${version}/CHANGELOG"; + license = licenses.bsd3; + maintainers = with maintainers; [ PapayaJackal ]; + }; +} diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix index 4fab0c1b3077..b27d221d75f4 100644 --- a/pkgs/development/python-modules/stm32loader/default.nix +++ b/pkgs/development/python-modules/stm32loader/default.nix @@ -44,13 +44,13 @@ buildPythonPackage rec { pyserial ]; - passthru.optional-dependencies = { + optional-dependencies = { hex = [ intelhex ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ "tests/unit" ]; diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix index d7698c977d0a..fea218cbc29d 100644 --- a/pkgs/development/python-modules/stone/default.nix +++ b/pkgs/development/python-modules/stone/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, fetchFromGitHub, - fetchpatch, lib, mock, packaging, @@ -14,32 +13,16 @@ buildPythonPackage rec { pname = "stone"; - version = "3.3.6"; + version = "3.3.8"; pyproject = true; disabled = pythonOlder "3.7"; - patches = [ - # fix distutils issue - # fix versions in tests to conform pep 440 - # See https://github.com/dropbox/stone/pull/334 - (fetchpatch { - name = "no-distutils.patch"; - url = "https://github.com/dropbox/stone/commit/f772d8d3b7e2ce62b14b4fb208a478bc8e54c7f2.patch"; - hash = "sha256-SH4gG5S13n/pXppm62LvH9poGfeQGGonW7bkzdYh73Q="; - }) - (fetchpatch { - name = "fix-test-pep-440.patch"; - url = "https://github.com/dropbox/stone/commit/f36de56b1f87eae61829258b2f16aa8319bbcc5c.patch"; - hash = "sha256-sBJukNk02RmQQza1qhLAkyx1OJRck0/zQOeRaXD9tkY="; - }) - ]; - src = fetchFromGitHub { owner = "dropbox"; repo = "stone"; rev = "refs/tags/v${version}"; - hash = "sha256-Og0hUUCCd9wRdHUhZBl62rDAunP2Bph5COsCw/T1kUA="; + hash = "sha256-W+wRVWPaAzhdHMVE54GEJC/YJqYZVJhwFDWWSMKUPdw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/stookwijzer/default.nix b/pkgs/development/python-modules/stookwijzer/default.nix index e7ca1728ee10..9da9317464f8 100644 --- a/pkgs/development/python-modules/stookwijzer/default.nix +++ b/pkgs/development/python-modules/stookwijzer/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "stookwijzer"; - version = "1.4.9"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "fwestenberg"; repo = "stookwijzer"; rev = "refs/tags/v${version}"; - hash = "sha256-QXCusmbt40Tg73ozl9nIDgMtQJ152uNhOuFyHn+OEA8="; + hash = "sha256-QZyuzOAz/VAThgZdhOGeOLvC+2wtp1mgCXzIekBm/Xs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index f35593ecd95b..bcf10fe99a2a 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "stravalib"; - version = "2.0"; + version = "2.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "stravalib"; repo = "stravalib"; rev = "refs/tags/v${version}"; - hash = "sha256-uF29fK+ZSSO688zKYYiSEygBUJZ6NBcvdgGgz3I1I6Q="; + hash = "sha256-VEVy9BAAoLsBCwMNFpsCjhacFbsgNswYoJ5tTcOQccw="; }; build-system = [ diff --git a/pkgs/development/python-modules/stravaweblib/default.nix b/pkgs/development/python-modules/stravaweblib/default.nix new file mode 100644 index 000000000000..210b62755add --- /dev/null +++ b/pkgs/development/python-modules/stravaweblib/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # setuptools + setuptools, + setuptools-scm, + + # dependencies + stravalib, + beautifulsoup4, +}: + +buildPythonPackage rec { + pname = "stravaweblib"; + version = "0.0.8"; + + src = fetchFromGitHub { + owner = "pR0Ps"; + repo = "stravaweblib"; + rev = "refs/tags/v${version}"; + hash = "sha256-v54UeRjhoH0GN2AVFKRjqKJ6BYUXVATe2qoDk9P48oU="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + stravalib + beautifulsoup4 + ]; + + pythonImportsCheck = [ "stravaweblib" ]; + + meta = { + description = "Python library for extending the Strava v3 API using web scraping"; + homepage = "https://github.com/pR0Ps/stravaweblib"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ stv0g ]; + }; +} diff --git a/pkgs/development/python-modules/strawberry-django/default.nix b/pkgs/development/python-modules/strawberry-django/default.nix new file mode 100644 index 000000000000..ea6326714e57 --- /dev/null +++ b/pkgs/development/python-modules/strawberry-django/default.nix @@ -0,0 +1,79 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + setuptools, + asgiref, + django, + strawberry-graphql, + django-debug-toolbar, + django-choices-field, + + # check inputs + pytestCheckHook, + django-guardian, + django-mptt, + django-polymorphic, + factory-boy, + pillow, + psycopg2, + pytest-cov-stub, + pytest-django, + pytest-mock, + pytest-snapshot, +}: + +buildPythonPackage rec { + pname = "strawberry-django"; + version = "0.47.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "strawberry-graphql"; + repo = "strawberry-django"; + rev = "v${version}"; + hash = "sha256-N7/EJ1AQ2xUJCEX6/xtyH1o/CuDzlvrUtpoDLq+H1WU="; + }; + + build-system = [ + poetry-core + setuptools + ]; + + dependencies = [ + asgiref + django + strawberry-graphql + ]; + + nativeCheckInputs = [ + pytestCheckHook + + django-guardian + django-mptt + django-polymorphic + factory-boy + pillow + psycopg2 + pytest-cov-stub + pytest-django + pytest-mock + pytest-snapshot + ] ++ optional-dependencies.debug-toolbar ++ optional-dependencies.enum; + + pythonImportsCheck = [ "strawberry_django" ]; + + optional-dependencies = { + debug-toolbar = [ django-debug-toolbar ]; + enum = [ django-choices-field ]; + }; + + meta = { + description = "Strawberry GraphQL Django extension"; + homepage = "https://github.com/strawberry-graphql/strawberry-django"; + changelog = "https://github.com/strawberry-graphql/strawberry-django/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ minijackson ]; + }; +} diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 1e3a816d6572..b17589b562ab 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -5,13 +5,11 @@ buildPythonPackage, chalice, channels, - click, daphne, django, email-validator, fastapi, fetchFromGitHub, - fetchpatch, flask, freezegun, graphql-core, @@ -40,11 +38,13 @@ starlette, typing-extensions, uvicorn, + typer, + graphlib-backport, }: buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.237.3"; + version = "0.243.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -53,18 +53,9 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-w9ADHKpYijUtN/tB9ANN2ebTMNw8wvqMuYP9fNkisQw="; + hash = "sha256-m+KaUd0rl0RRZzVPI+ldwW77YGLq45egkV5vYYz4dW8="; }; - patches = [ - (fetchpatch { - # https://github.com/strawberry-graphql/strawberry/pull/2199 - name = "switch-to-poetry-core.patch"; - url = "https://github.com/strawberry-graphql/strawberry/commit/710bb96f47c244e78fc54c921802bcdb48f5f421.patch"; - hash = "sha256-ekUZ2hDPCqwXp9n0YjBikwSkhCmVKUzQk7LrPECcD7Y="; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "--emoji" "" \ @@ -78,7 +69,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp pytest-aiohttp @@ -92,7 +83,7 @@ buildPythonPackage rec { libcst ]; debug-server = [ - click + typer libcst pygments python-multipart @@ -125,10 +116,11 @@ buildPythonPackage rec { ]; chalice = [ chalice ]; cli = [ - click pygments rich libcst + typer + graphlib-backport ]; # starlite = [ starlite ]; # litestar = [ litestar ]; @@ -146,7 +138,7 @@ buildPythonPackage rec { pytest-snapshot pytestCheckHook sanic-testing - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "strawberry" ]; @@ -159,7 +151,6 @@ buildPythonPackage rec { "tests/schema/extensions/" "tests/schema/test_dataloaders.py" "tests/schema/test_lazy/" - "tests/starlite/" "tests/test_dataloaders.py" "tests/utils/test_pretty_print.py" "tests/websockets/test_graphql_transport_ws.py" diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index 1ef214dd0a21..d3862776309a 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.38.0"; + version = "1.39.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-xL82s++HFJntRZRXSDRYMRP5Pwd90wNdUW0pV4byrWM="; + hash = "sha256-/vneeYPE7mXAjoVgfX/8y1awBIKxBB+mL5DkgV053zo="; }; build-system = [ @@ -76,7 +76,7 @@ buildPythonPackage rec { typing-extensions tzlocal validators - ] ++ lib.optionals (!stdenv.isDarwin) [ watchdog ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ watchdog ]; # pypi package does not include the tests, but cannot be built with fetchFromGitHub doCheck = false; diff --git a/pkgs/development/python-modules/stringbrewer/default.nix b/pkgs/development/python-modules/stringbrewer/default.nix index 8b79efd7be55..9b5fe137e087 100644 --- a/pkgs/development/python-modules/stringbrewer/default.nix +++ b/pkgs/development/python-modules/stringbrewer/default.nix @@ -4,7 +4,6 @@ fetchPypi, rstr, sre-yield, - pythonImportsCheckHook, }: buildPythonPackage rec { @@ -21,7 +20,6 @@ buildPythonPackage rec { rstr sre-yield ]; - nativeBuildInputs = [ pythonImportsCheckHook ]; # Package has no tests doCheck = false; diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix new file mode 100644 index 000000000000..e806a6cc5895 --- /dev/null +++ b/pkgs/development/python-modules/stringzilla/default.nix @@ -0,0 +1,59 @@ +{ + buildPythonPackage, + cargo, + fetchFromGitHub, + lib, + numpy, + pytest-repeat, + pytestCheckHook, + rustPlatform, + rustc, + setuptools, +}: + +buildPythonPackage rec { + pname = "stringzilla"; + version = "3.10.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ashvardanian"; + repo = "stringzilla"; + rev = "refs/tags/v${version}"; + hash = "sha256-36W7/PL8nRty8cHuMoTr73tQ4uvtjkwP9lyzNLCuhv0="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-qa03Jd0MMtDwkp2E81MacRMbzD/O7E29BT0tc2OjLiY="; + }; + + build-system = [ + setuptools + ]; + + nativeBuildInputs = [ + cargo + rustPlatform.cargoSetupHook + rustc + ]; + + pythonImportsCheck = [ "stringzilla" ]; + + nativeCheckInputs = [ + numpy + pytest-repeat + pytestCheckHook + ]; + + pytestFlagsArray = [ "scripts/test.py" ]; + + meta = { + changelog = "https://github.com/ashvardanian/StringZilla/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; + description = "SIMD-accelerated string search, sort, hashes, fingerprints, & edit distances"; + homepage = "https://github.com/ashvardanian/stringzilla"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 3d3bd39ca13a..038794ea14e4 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 = "10.12.0"; + version = "11.2.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Wr7ERUjTgUvB4HCqGFK8s/xcwCnpR8D3MxVusfjIcDA="; + hash = "sha256-TFPWHXtZYHAyS/pdchWEMUX+VGbkiXPYKKq0GtIJtc4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index f8d9015b2840..03d5e87e8e4c 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, + setuptools-scm, numpy, scipy, numba, @@ -14,8 +16,8 @@ buildPythonPackage rec { pname = "stumpy"; - version = "1.12.0"; - format = "setuptools"; + version = "1.13.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,10 +25,15 @@ buildPythonPackage rec { owner = "TDAmeritrade"; repo = "stumpy"; rev = "refs/tags/v${version}"; - hash = "sha256-rVl3tIx8iWx2mnaix3V5YnfWWdPBTP8+K2JJKTfctDA="; + hash = "sha256-S+Rb6pHphXfbqz4VMnN1p7ZrlWB/g7XCdy/T5/Q8VD8="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ numpy scipy numba @@ -47,10 +54,11 @@ buildPythonPackage rec { "tests/test_core.py" ]; - meta = with lib; { + meta = { description = "Library that can be used for a variety of time series data mining tasks"; + changelog = "https://github.com/TDAmeritrade/stumpy/blob/${src.rev}/CHANGELOG.md"; homepage = "https://github.com/TDAmeritrade/stumpy"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/stups-fullstop/default.nix b/pkgs/development/python-modules/stups-fullstop/default.nix index 494c8ecf1e9e..a2662d754c55 100644 --- a/pkgs/development/python-modules/stups-fullstop/default.nix +++ b/pkgs/development/python-modules/stups-fullstop/default.nix @@ -7,7 +7,7 @@ stups-cli-support, stups-zign, pytest, - pytest-cov, + pytest-cov-stub, isPy3k, }: @@ -36,7 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest - pytest-cov + pytest-cov-stub ]; meta = with lib; { diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index 23347af0ff45..bf06b126c668 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -21,7 +21,7 @@ tomli, pytestCheckHook, - pytest-cov, + pytest-cov-stub, pytest-xdist, mypy, sympy, @@ -62,7 +62,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub pytest-xdist mypy sympy @@ -84,10 +84,5 @@ buildPythonPackage rec { changelog = "https://github.com/Diaoul/subliminal/blob/${version}/HISTORY.rst"; 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 - # executable apparently isn't able to download subtitles at all. - broken = true; }; } diff --git a/pkgs/development/python-modules/submitit/default.nix b/pkgs/development/python-modules/submitit/default.nix new file mode 100644 index 000000000000..eb39da57d935 --- /dev/null +++ b/pkgs/development/python-modules/submitit/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + cloudpickle, + flit-core, + typing-extensions, + pytestCheckHook, + pytest-asyncio, +}: + +buildPythonPackage rec { + pname = "submitit"; + version = "1.5.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "facebookincubator"; + repo = "submitit"; + rev = "refs/tags/${version}"; + hash = "sha256-PDQLzqQjoBAZM9FKsoRby26Pbh4nik3SltIHUw/xWcY="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + cloudpickle + flit-core + typing-extensions + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "submitit" + ]; + + disabledTests = [ + # These tests are broken + "test_snapshot" + "test_snapshot_excludes" + "test_job_use_snapshot_cwd" + "test_job_use_snapshot_modules" + "test_nested_pickling" + "test_setup" + "test_requeuing" + ]; + + meta = { + changelog = "https://github.com/facebookincubator/submitit/releases/tag/${version}"; + description = "Python 3.8+ toolbox for submitting jobs to Slurm"; + homepage = "https://github.com/facebookincubator/submitit"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/succulent/default.nix b/pkgs/development/python-modules/succulent/default.nix index d756f3c7ac7e..87d63c8c1b68 100644 --- a/pkgs/development/python-modules/succulent/default.nix +++ b/pkgs/development/python-modules/succulent/default.nix @@ -4,17 +4,17 @@ fetchFromGitHub, flask, lxml, + numpy, pandas, pyyaml, poetry-core, pytestCheckHook, pythonOlder, - xmltodict, }: buildPythonPackage rec { pname = "succulent"; - version = "0.3.4"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,10 +23,13 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "succulent"; rev = "refs/tags/${version}"; - hash = "sha256-lU4M/ObX2mhHgYsc72zLp87g1lJ6ikfTeEojEdJwjGs="; + hash = "sha256-rD0qKYmWTu0LMRdWgul8OGp1FcczSY2/OxT8+oXO78E="; }; - pythonRelaxDeps = [ "flask" ]; + pythonRelaxDeps = [ + "flask" + "numpy" + ]; nativeBuildInputs = [ poetry-core @@ -35,9 +38,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask lxml + numpy pandas pyyaml - xmltodict ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sudachidict/default.nix b/pkgs/development/python-modules/sudachidict/default.nix index 1035f42bff84..1677ab112926 100644 --- a/pkgs/development/python-modules/sudachidict/default.nix +++ b/pkgs/development/python-modules/sudachidict/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "WorksApplications"; repo = "SudachiDict"; rev = "refs/tags/v${version}"; - hash = "sha256-xJ/iPywOZA2kzHaVU43Bc8TUboj3OpDg1kLFMIc/T90="; + hash = "sha256-axa7eQ0jTo8GXJA5lwcvMyZLw9T573yeSo9xuvIm/gY="; }; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/sudachipy/default.nix b/pkgs/development/python-modules/sudachipy/default.nix index d722b368756e..20233c1f7d9a 100644 --- a/pkgs/development/python-modules/sudachipy/default.nix +++ b/pkgs/development/python-modules/sudachipy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { setuptools-rust ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; preBuild = '' cd python diff --git a/pkgs/development/python-modules/summarytools/default.nix b/pkgs/development/python-modules/summarytools/default.nix index 58457768fe0e..40b5359cb35e 100644 --- a/pkgs/development/python-modules/summarytools/default.nix +++ b/pkgs/development/python-modules/summarytools/default.nix @@ -8,7 +8,6 @@ matplotlib, numpy, pandas, - pytestCheckHook, }: buildPythonPackage rec { @@ -32,8 +31,6 @@ buildPythonPackage rec { pandas ]; - nativeCheckImports = [ pytestCheckHook ]; - pythonImportsCheck = [ "summarytools" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index e1bfc94ceab4..cc7c01702c3d 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "5.1.4"; + version = "5.1.5"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-y+tw1I+C6wDFlJvObWrOhisrryQCeXulkwFyRCuAgTA="; + hash = "sha256-V8w+ErYVKoAPv6X3eh4rUZ5TKti9Z46A1JAdIjabs8k="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { parfive ]; - passthru.optional-dependencies = { + optional-dependencies = { asdf = [ asdf # asdf-astropy @@ -91,11 +91,11 @@ buildPythonPackage rec { pytest-mock pytestCheckHook ] - ++ passthru.optional-dependencies.asdf - ++ passthru.optional-dependencies.database - ++ passthru.optional-dependencies.image - ++ passthru.optional-dependencies.net - ++ passthru.optional-dependencies.timeseries; + ++ optional-dependencies.asdf + ++ optional-dependencies.database + ++ optional-dependencies.image + ++ optional-dependencies.net + ++ optional-dependencies.timeseries; postPatch = '' substituteInPlace setup.cfg \ @@ -103,7 +103,7 @@ buildPythonPackage rec { ''; # darwin has write permission issues - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/sunweg/default.nix b/pkgs/development/python-modules/sunweg/default.nix index 535b6d253727..0880a5b11d75 100644 --- a/pkgs/development/python-modules/sunweg/default.nix +++ b/pkgs/development/python-modules/sunweg/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sunweg"; - version = "3.0.2"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "rokam"; repo = "sunweg"; rev = "refs/tags/${version}"; - hash = "sha256-/pniECgavRiQdKzNtPINNhOijUW/uhPEOQJtjfr46ps="; + hash = "sha256-T67eH5WjS7J2pcNjq9psNmD4MwMfH+HRvk9llqI3FoQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index c2fbba840684..713f688a4c17 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { quantity = [ pint ]; pyside2 = [ pyside2 ]; pyside6 = [ pyside6 ]; diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index e75998606b63..8a6bb95f3c3c 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { # wants to write to /tmp/foo which is likely already owned by another # nixbld user on hydra - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ mock diff --git a/pkgs/development/python-modules/survey/default.nix b/pkgs/development/python-modules/survey/default.nix index f0ff72b8b785..2e264d7756f0 100644 --- a/pkgs/development/python-modules/survey/default.nix +++ b/pkgs/development/python-modules/survey/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "survey"; - version = "5.4.0"; + version = "5.4.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JT0tcNBReNdfbZrwSgv0OFcBz9Hp1N5JF4nP9oXfTJs="; + hash = "sha256-4vnjtSbw2y/o+fSWDl/CqTEZkl0jULGOLURdZ0BpKvY="; }; build-system = [ diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix index 9f9cca8b929d..093970206927 100644 --- a/pkgs/development/python-modules/svg-path/default.nix +++ b/pkgs/development/python-modules/svg-path/default.nix @@ -1,7 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, pillow, pytestCheckHook, pythonOlder, @@ -9,16 +10,20 @@ buildPythonPackage rec { pname = "svg.path"; - version = "6.2"; - format = "setuptools"; + version = "6.3"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-GiFZ+duJjfk8RjfP08yvfaH9Bz9Z+ppZUMc+RtSqGso="; + src = fetchFromGitHub { + owner = "regebro"; + repo = "svg.path"; + rev = "refs/tags/${version}"; + hash = "sha256-qes6cKw/Ok0WgcPO/NPuREVNUbnlhm82jF90dK7Ay8U="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pillow pytestCheckHook @@ -34,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "SVG path objects and parser"; homepage = "https://github.com/regebro/svg.path"; + changelog = "https://github.com/regebro/svg.path/blob/${version}/CHANGES.txt"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/swisshydrodata/default.nix b/pkgs/development/python-modules/swisshydrodata/default.nix index 24048a199746..c1c9bb698d47 100644 --- a/pkgs/development/python-modules/swisshydrodata/default.nix +++ b/pkgs/development/python-modules/swisshydrodata/default.nix @@ -3,23 +3,29 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - requests, + pythonOlder, requests-mock, + requests, + setuptools, }: buildPythonPackage rec { pname = "swisshydrodata"; - version = "0.1.0"; - format = "setuptools"; + version = "0.2.1"; + pyproject = true; + + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "Bouni"; - repo = pname; - rev = version; - sha256 = "1rdgfc6zg5j3fvrpbqs9vc3n5m66r5yljawyl7nmrqd5lwq1lqak"; + repo = "swisshydrodata"; + rev = "refs/tags/${version}"; + hash = "sha256-RcVwo61HZ02JEOHsSY/W8j2OTBN25oR2JunLZ5i6yVI="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook @@ -31,7 +37,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python client to get data from the Swiss federal Office for Environment FEON"; homepage = "https://github.com/bouni/swisshydrodata"; - license = with licenses; [ mit ]; + changelog = "https://github.com/Bouni/swisshydrodata/releases/tag/${version}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix index d59abb27c8d6..abea3479d15b 100644 --- a/pkgs/development/python-modules/symengine/default.nix +++ b/pkgs/development/python-modules/symengine/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, cython, cmake, symengine, @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "symengine"; - version = "0.11.0"; + version = "0.13.0"; build-system = [ setuptools ]; pyproject = true; @@ -23,32 +22,22 @@ buildPythonPackage rec { owner = "symengine"; repo = "symengine.py"; rev = "refs/tags/v${version}"; - hash = "sha256-uUMcNnynE2itIwc7IGFwxveqLRL8f4dAAcaD6FUWJaY="; + hash = "sha256-PJUzA86SGCnDpqU9j/dr3PlM9inyi8SQX0HGqPQ9wQw="; }; env = { SymEngine_DIR = "${symengine}"; }; - patches = [ - # Distutils has been removed in python 3.12 - # See https://github.com/symengine/symengine.py/pull/478 - (fetchpatch { - name = "no-distutils.patch"; - url = "https://github.com/symengine/symengine.py/pull/478/commits/e72006d5f7425cd50c54b22766e0ed4bcd2dca85.patch"; - hash = "sha256-kGJRGkBgxOfI1wf88JwnSztkOYd1wvg62H7wA6CcYEQ="; - }) - ]; - postPatch = '' substituteInPlace setup.py \ - --replace-fail "\"cmake\"" "\"${lib.getExe' cmake "cmake"}\"" \ --replace-fail "'cython>=0.29.24'" "'cython'" export PATH=${cython}/bin:$PATH ''; - nativeBuildUnputs = [ cmake ]; + dontUseCmakeConfigure = true; + nativeBuildInputs = [ cmake ]; buildInputs = [ cython ]; @@ -58,8 +47,10 @@ buildPythonPackage rec { ]; checkPhase = '' + runHook preCheck mkdir empty && cd empty ${python.interpreter} ../bin/test_python.py + runHook postCheck ''; meta = with lib; { diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index c9978724763b..a05d13f466ee 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.12.1"; + version = "1.13.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-KHewP5mM2MCPB80N5bdnEZzT70DQn0HDDXIvZoaw+4g="; + hash = "sha256-sn/SxlMOCrOeJ1/JtoOJU2flHV2pG6qNPWTbJWX+xNk="; }; nativeCheckInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/symspellpy/default.nix b/pkgs/development/python-modules/symspellpy/default.nix index ea823e6f204b..e52fd3cc24fc 100644 --- a/pkgs/development/python-modules/symspellpy/default.nix +++ b/pkgs/development/python-modules/symspellpy/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "symspellpy"; - version = "6.7.7"; + version = "6.7.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "mammothb"; repo = "symspellpy"; rev = "refs/tags/v${version}"; - hash = "sha256-D8xdMCy4fSff3nuS2sD2QHWk0869AlFDE+lFRvayYDQ="; + hash = "sha256-ZnkZE7v4o0o6iPdkjCycDgVdLhsE3Vn1uuGT7o0F86I="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix index 60cf1380d560..edc31d3fada2 100644 --- a/pkgs/development/python-modules/syrupy/default.nix +++ b/pkgs/development/python-modules/syrupy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "syrupy"; - version = "4.7.1"; + version = "4.7.2"; pyproject = true; disabled = lib.versionOlder python.version "3.8.1"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "syrupy-project"; repo = "syrupy"; rev = "refs/tags/v${version}"; - hash = "sha256-dTUugNqzaMuKV6ZwxRSf9df7tsnmZUBhgqwgGxBhirw="; + hash = "sha256-akYUsstepkDrRXqp1DY6wEeXMMlLNcCqitnWpjcAurg="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/tableauserverclient/default.nix b/pkgs/development/python-modules/tableauserverclient/default.nix index 032b4e189b70..f4c0658260f8 100644 --- a/pkgs/development/python-modules/tableauserverclient/default.nix +++ b/pkgs/development/python-modules/tableauserverclient/default.nix @@ -9,19 +9,20 @@ requests, requests-mock, setuptools, + typing-extensions, versioneer, }: buildPythonPackage rec { pname = "tableauserverclient"; - version = "0.31"; + version = "0.34"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-e00/+yVKg7dGGq3Os+oWu/F93j5e9dnwWZxKwm+soqM="; + hash = "sha256-0I0HLPCrA5LoGOnspIDeAp5x7jzR4S9dWitpGw0AzbA="; }; postPatch = '' @@ -29,17 +30,21 @@ buildPythonPackage rec { rm versioneer.py ''; - pythonRelaxDeps = [ "urllib3" ]; + pythonRelaxDeps = [ + "defusedxml" + "urllib3" + ]; - nativeBuildInputs = [ + build-system = [ setuptools versioneer ]; - propagatedBuildInputs = [ + dependencies = [ defusedxml requests packaging + typing-extensions ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index e7f22b68f39f..7dc18cefc481 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -14,6 +14,7 @@ packaging, setuptools, sphinx, + typing-extensions, # Test inputs python, pytest, @@ -22,17 +23,17 @@ buildPythonPackage rec { pname = "tables"; - version = "3.9.2"; + version = "3.10.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-1HAmPC5QxLfIY1oNmawf8vnnBMJNceX6M8RSnn0K2cM="; + hash = "sha256-SqB6xzS5wDe66vRK7GTskCrSR/V4EbWfMMTjHTHxJs8="; }; - nativeBuildInputs = [ + build-system = [ blosc2 cython setuptools @@ -47,12 +48,13 @@ buildPythonPackage rec { lzo ]; - propagatedBuildInputs = [ + dependencies = [ blosc2 py-cpuinfo numpy numexpr packaging # uses packaging.version at runtime + typing-extensions ]; # When doing `make distclean`, ignore docs @@ -83,6 +85,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest ]; preCheck = '' + export HOME=$(mktemp -d) cd .. ''; diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index 443b83ce7810..bd1ed07849ed 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ markuppy odfpy diff --git a/pkgs/development/python-modules/tabula-py/default.nix b/pkgs/development/python-modules/tabula-py/default.nix index 0299d511c25a..f923942c99be 100644 --- a/pkgs/development/python-modules/tabula-py/default.nix +++ b/pkgs/development/python-modules/tabula-py/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "tabula-py"; - version = "2.9.3"; + version = "2.10.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "chezou"; repo = "tabula-py"; rev = "refs/tags/v${version}"; - hash = "sha256-dEcVIlK3M7zqRMN7W7mnnMPWhM2A4/qvf0aY61ko4yE="; + hash = "sha256-PQbwm9ho3XtpmZ7N7ASkrV8gk9Jom+yQKlt2fUa948s="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index c781a453397a..d0c635cc919c 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -26,13 +26,13 @@ buildPythonPackage rec { setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { widechars = [ wcwidth ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = { description = "Pretty-print tabular data"; diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index 9e4ad7c8bbcc..8e3e33cac1ed 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -2,13 +2,13 @@ lib, buildPythonPackage, fetchPypi, - pythonAtLeast, # build-system setuptools, # native dependencies taskwarrior2, + distutils, # dependencies kitchen, @@ -24,9 +24,6 @@ buildPythonPackage rec { version = "2.0.0"; pyproject = true; - # ModuleNotFoundError: No module named 'distutils' - disabled = pythonAtLeast "3.12"; - src = fetchPypi { inherit pname version; hash = "sha256-EQm9+b3nqbMqUAejAsh4MD/2UYi2QiWsdKMomkxUi90="; @@ -44,7 +41,10 @@ buildPythonPackage rec { build-system = [ setuptools ]; - buildInputs = [ taskwarrior2 ]; + buildInputs = [ + taskwarrior2 + distutils + ]; dependencies = [ kitchen diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index 5e601845b4cc..40de44127087 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "tatsu"; - version = "5.12.1"; + version = "5.12.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "neogeny"; repo = "TatSu"; rev = "refs/tags/v${version}"; - hash = "sha256-dY+hvNwYrkKko9A5yRT0EWYlvVu3OrhJMzk/8cjzuUo="; + hash = "sha256-FRNQz3JtsFw1nch+ffGMzZF1+gq7XifPok9qsUiRPs8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/taxi/default.nix b/pkgs/development/python-modules/taxi/default.nix index 92a389512cad..6fd45eef85eb 100644 --- a/pkgs/development/python-modules/taxi/default.nix +++ b/pkgs/development/python-modules/taxi/default.nix @@ -3,30 +3,29 @@ buildPythonPackage, fetchFromGitHub, appdirs, - requests, click, - setuptools, + flit-core, pytestCheckHook, freezegun, }: buildPythonPackage rec { pname = "taxi"; - version = "6.2.0"; - format = "setuptools"; + version = "6.3.1"; + pyproject = true; src = fetchFromGitHub { owner = "sephii"; repo = "taxi"; rev = version; - hash = "sha256-wtLlO/W+39kTPjb2U6c54bxWxAQB7CxGxBh8gur+RCQ="; + hash = "sha256-QB88RpgzrQy7DGeRdMHC2SV5Esp/r5LZtlaY5C8vJxw="; }; - propagatedBuildInputs = [ + build-system = [ flit-core ]; + + dependencies = [ appdirs - requests click - setuptools ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/pkgs/development/python-modules/tbm-utils/default.nix index d9a0c20070de..9daa9648fe1e 100644 --- a/pkgs/development/python-modules/tbm-utils/default.nix +++ b/pkgs/development/python-modules/tbm-utils/default.nix @@ -61,14 +61,14 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Skip on macOS because /etc/localtime is accessed through the pendulum # library, which is not allowed in a sandboxed build. "test_create_parser_filter_dates" "test_parse_args" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # Skip on macOS because /etc/localtime is accessed through the pendulum # library, which is not allowed in a sandboxed build. "tests/test_datetime.py" diff --git a/pkgs/development/python-modules/telegram/default.nix b/pkgs/development/python-modules/telegram/default.nix deleted file mode 100644 index c706a7b7dad7..000000000000 --- a/pkgs/development/python-modules/telegram/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, -}: - -buildPythonPackage rec { - pname = "telegram"; - version = "0.0.1"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "1495l2ml8mg120wfvqhikqkfczhwwaby40vdmsz8v2l69jps01fl"; - }; - - meta = with lib; { - homepage = "https://github.com/liluo/telegram"; - description = "Telegram APIs"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/telegraph/default.nix b/pkgs/development/python-modules/telegraph/default.nix index 387c7034bb82..3dd1ce594efb 100644 --- a/pkgs/development/python-modules/telegraph/default.nix +++ b/pkgs/development/python-modules/telegraph/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - passthru.optional-dependencies = { + optional-dependencies = { aio = [ httpx ]; }; @@ -34,8 +34,6 @@ buildPythonPackage rec { disabledTests = [ "test_get_page" ]; - doCheck = true; - pythonImportsCheck = [ "telegraph" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index b349c470f8fe..ab0a973a86e1 100644 --- a/pkgs/development/python-modules/telethon/default.nix +++ b/pkgs/development/python-modules/telethon/default.nix @@ -5,6 +5,7 @@ openssl, rsa, pyaes, + cryptg, pythonOlder, setuptools, pytest-asyncio, @@ -13,40 +14,51 @@ buildPythonPackage rec { pname = "telethon"; - version = "1.26.1"; - format = "pyproject"; + version = "1.37.0"; + pyproject = true; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "LonamiWebs"; repo = "Telethon"; rev = "refs/tags/v${version}"; - hash = "sha256-RxnC+PVSnLeCZ1xap6n6CjpeA8Ig6oLGiB0LDxqUmsA="; + hash = "sha256-P7FP+Wqi3dqbBCFpI9aCDvK4k3mWv8076RO6MXg+jFQ="; }; patchPhase = '' - substituteInPlace telethon/crypto/libssl.py --replace \ + substituteInPlace telethon/crypto/libssl.py --replace-fail \ "ctypes.util.find_library('ssl')" "'${lib.getLib openssl}/lib/libssl.so'" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + ]; - propagatedBuildInputs = [ - rsa + dependencies = [ pyaes + rsa ]; + optional-dependencies = { + cryptg = [ cryptg ]; + }; + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; - pytestFlagsArray = [ "tests/telethon" ]; + disabledTests = [ + # https://github.com/LonamiWebs/Telethon/issues/4254 + "test_all_methods_present" + "test_private_get_extension" + ]; - meta = with lib; { + meta = { homepage = "https://github.com/LonamiWebs/Telethon"; description = "Full-featured Telegram client library for Python 3"; - license = licenses.mit; - maintainers = with maintainers; [ nyanloutre ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nyanloutre ]; }; } diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index fcae826816fb..976b9e0a2035 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -19,6 +19,7 @@ paramiko, pbr, prettytable, + pynacl, python, pythonOlder, pyyaml, @@ -33,14 +34,14 @@ buildPythonPackage rec { pname = "tempest"; - version = "40.0.0"; + version = "41.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-s2EvD1TDoRoKrvpRc6h3P7xRyT941nW1hveucXDLB4w="; + hash = "sha256-e0cxWm0ZNQl2bJnVzcMiiN+Wadd65nJZoLJnBRr2Qqw="; }; pythonRelaxDeps = [ "defusedxml" ]; @@ -74,6 +75,7 @@ buildPythonPackage rec { nativeCheckInputs = [ hacking oslotest + pynacl stestr ]; diff --git a/pkgs/development/python-modules/templateflow/default.nix b/pkgs/development/python-modules/templateflow/default.nix index 83d9ccfb885c..f00ce991ea3e 100644 --- a/pkgs/development/python-modules/templateflow/default.nix +++ b/pkgs/development/python-modules/templateflow/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "templateflow"; - version = "24.1.0"; + version = "24.2.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "templateflow"; repo = "python-client"; rev = "refs/tags/${version}"; - hash = "sha256-UxYJnKOqIIf10UW5xJ7MrFHtZY5WNVi5oZgdozj65Z8="; + hash = "sha256-COS767n2aC65m6AJihZb4NhJ4ZK9YkTAZR7Hcnc/LMs="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index 5ac8b3e2c963..0def5a032243 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pbr, pytest-asyncio, pytestCheckHook, pythonOlder, @@ -13,20 +12,17 @@ buildPythonPackage rec { pname = "tenacity"; - version = "8.4.1"; - format = "pyproject"; + version = "9.0.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-VLFBK4eN334fFXfNSVJ7rYze8yQhvVmb6sDGw/EFgv0="; + hash = "sha256-gH83ypfWKqNhJk1Jew4x6SuAJwRJQr+nVhYNkIMg1zs="; }; - nativeBuildInputs = [ - pbr - setuptools-scm - ]; + build-system = [ setuptools-scm ]; nativeCheckInputs = [ pytest-asyncio @@ -39,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/jd/tenacity"; + changelog = "https://github.com/jd/tenacity/releases/tag/${version}"; description = "Retrying library for Python"; license = licenses.asl20; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/tenant-schemas-celery/default.nix b/pkgs/development/python-modules/tenant-schemas-celery/default.nix new file mode 100644 index 000000000000..3f85d86e7f7e --- /dev/null +++ b/pkgs/development/python-modules/tenant-schemas-celery/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + celery, +}: + +buildPythonPackage rec { + pname = "tenant-schemas-celery"; + version = "3.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "maciej-gol"; + repo = "tenant-schemas-celery"; + rev = "refs/tags/${version}"; + hash = "sha256-3ZUXSAOBMtj72sk/VwPV24ysQK+E4l1HdwKa78xrDtg="; + }; + + build-system = [ setuptools ]; + + dependencies = [ celery ]; + + pythonImportsCheck = [ "tenant_schemas_celery" ]; + + meta = { + description = "Celery application implementation that allows celery tasks to cooperate with multi-tenancy provided by django-tenant-schemas and django-tenants packages"; + homepage = "https://github.com/maciej-gol/tenant-schemas-celery"; + changelog = "https://github.com/maciej-gol/tenant-schemas-celery/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 94d272b429d7..f048b525f679 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.1237"; + version = "3.0.1263"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-5pzdj+Es0JunISOCID5KJ+cR42EjD+c0Pt/B9dVJw2k="; + hash = "sha256-B61d8zyrOixqAy9sk4yiipB0xO3eHP5Pi8HfUVs/LeI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index 2c09edbf60a4..918df0bb1c91 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "tensorboard"; - version = "2.17.0"; + version = "2.18.0"; format = "wheel"; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-hZpJmpsftooFiFiWRIZicQC3H8shZGhhxh0xhGpkePs="; + hash = "sha256-EHykghdF9z4q76AsUP9wqbaU8595CxHm9oL30yZ0Xqs="; }; diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index e0c4231be405..aab6bc7e9df6 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { # Requires network access (FileNotFoundError: [Errno 2] No such file or directory: 'wget') "test_onnx_graph" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Fails with a mysterious error in pytorch: # RuntimeError: required keyword attribute 'name' has the wrong type "test_pytorch_graph" diff --git a/pkgs/development/python-modules/tensordict/default.nix b/pkgs/development/python-modules/tensordict/default.nix index fff726f5beeb..1ad591e13be6 100644 --- a/pkgs/development/python-modules/tensordict/default.nix +++ b/pkgs/development/python-modules/tensordict/default.nix @@ -73,6 +73,7 @@ buildPythonPackage rec { # torch._dynamo.exc.BackendCompilerFailed # Requires a more recent version of triton # Re-enable when https://github.com/NixOS/nixpkgs/pull/328247 is merged + "test_functional" "test_linear" "test_seq" "test_seq_lmbda" @@ -90,7 +91,7 @@ buildPythonPackage rec { "test_map_iter_interrupt_early" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised: # OpenMP support not found. "test/test_compile.py" diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index 15a8115c2036..fb0f9d589b39 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -49,14 +49,14 @@ buildPythonPackage rec { pname = "tensorflow-datasets"; - version = "4.9.4"; + version = "4.9.6"; format = "setuptools"; src = fetchFromGitHub { owner = "tensorflow"; repo = "datasets"; rev = "refs/tags/v${version}"; - hash = "sha256-HY/atBEWeEJgBNxEapq9jPFoZbFof2AHEDAiJa/lYAE="; + hash = "sha256-2zR1b/Zkj3hcwiVK7wdxix3taNgFFOxqy7fSge6dAIk="; }; patches = [ diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix index 14a1d00dc450..88f1bbe52a89 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "tensorflow-metadata"; - version = "1.14.0"; + version = "1.15.0"; format = "setuptools"; src = fetchFromGitHub { owner = "tensorflow"; repo = "metadata"; rev = "refs/tags/v${version}"; - hash = "sha256-ZfX25CaV+tZVdas+n7O6Gqv1GxOP1iwippIXxfhcOfg="; + hash = "sha256-f3bkDTy45uwqVJaXFb0Dmaj9U1lJTP5R5Ej1yzobEV4="; }; patches = [ ./build.patch ]; diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index dd80ee581ee6..862520463b30 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -39,7 +39,7 @@ }: let - version = "0.24.0"; + version = "0.25.0"; pname = "tensorflow-probability"; # first build all binaries and generate setup.py using bazel @@ -49,7 +49,7 @@ let owner = "tensorflow"; repo = "probability"; rev = "refs/tags/v${version}"; - hash = "sha256-V6aw4NtGOHlvcbgLWMH29x81eck1PyzV93ANelvpL4c="; + hash = "sha256-LXQfGFgnM7WYUQjJ2Y3jskdeJ/dEKz+Afg+UOQjv5kc="; }; nativeBuildInputs = [ absl-py @@ -63,7 +63,7 @@ let bazel = bazel_6; bazelTargets = [ ":pip_pkg" ]; - LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool"; + LIBTOOL = lib.optionalString stdenv.hostPlatform.isDarwin "${cctools}/bin/libtool"; fetchAttrs = { sha256 = "sha256-TbWcWYidyXuAMgBnO2/k0NKCzc4wThf2uUeC3QxdBJY="; diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index b0371e7a20f2..7a5127582a64 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -45,7 +45,7 @@ # - the source build doesn't work on NVIDIA Jetson platforms # unsupported combination -assert !(stdenv.isDarwin && cudaSupport); +assert !(stdenv.hostPlatform.isDarwin && cudaSupport); let packages = import ./binary-hashes.nix; @@ -154,13 +154,13 @@ buildPythonPackage { ]; libpaths = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) zlib ]; rpath = lib.makeLibraryPath (libpaths ++ cudapaths); in - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' # This is an array containing all the directories in the tensorflow2 # package that contain .so files. # diff --git a/pkgs/development/python-modules/tensorflow/binary-hashes.nix b/pkgs/development/python-modules/tensorflow/binary-hashes.nix index 2a6a31b540b2..d3813066c879 100644 --- a/pkgs/development/python-modules/tensorflow/binary-hashes.nix +++ b/pkgs/development/python-modules/tensorflow/binary-hashes.nix @@ -1,72 +1,72 @@ { - version = "2.17.0"; - version_jetson = "2.16.1+nv24.07"; + version = "2.18.0"; + version_jetson = "2.16.1+nv24.08"; x86_64-linux_39 = { - 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"; + url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow_cpu-2.18.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1b60b3lx7kf5jbh6md3hx9fx99jzcjvghsvnas6lypr1wcmi7p62"; }; x86_64-linux_310 = { - 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"; + url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow_cpu-2.18.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1whqqmf405q8mlg6plvh5sbvpwd4m2lv228knwwpsc2avrpld64z"; }; x86_64-linux_311 = { - 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"; + url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow_cpu-2.18.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "0zkgjdm075xzbng7lcry64vqb75rnf21yh2kr8fmisk0d5s737h8"; }; x86_64-linux_312 = { - 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"; + url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow_cpu-2.18.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "14dqf075nqw7zci4a9grqsskyn4b2l7anh9ddqyidr15s4d45g9r"; }; x86_64-linux_39_gpu = { - 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"; + url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "157bv97pqrp7fpf75p5qji609r17g6vw2y3kxr44gcvm1hlzg8dd"; }; x86_64-linux_310_gpu = { - 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"; + url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "029ppxdm7m43hq17p1bxrj4dcz6929skrcni4qkl96fna2p7zdqy"; }; x86_64-linux_311_gpu = { - 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"; + url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "0xirxjhwg7zyr0dzglk3r3bzkq84p3mrwlmbcv7by01nz9qdvf3h"; }; x86_64-linux_312_gpu = { - 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"; + url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "11k2gj0ibz9m35l673r12zk7w991ssfm53fp7ll68h06gvm6bpdz"; }; aarch64-linux_39 = { - 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"; + url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "0khcq43fy799x69ii8nkhyvq8m71vafdiknhn8ambyg89l9k5zdw"; }; aarch64-linux_310 = { - 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"; + url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "0lv3knwpvs47q36lz4vx55z6fmvpm56dlipry2d2xaywkgxl54sq"; }; aarch64-linux_311 = { - 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"; + url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "0j0bs0yqfgw5cnvgajs0sn6lbq6i7h4qcbmm2yqjklznk8vfgwc5"; }; aarch64-linux_312 = { - 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"; + url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "1xd1yh7sxivv597scb54xhn3bhfgj7qzxr8gbz1akn2r6m5r08j8"; }; aarch64-linux_310_jetson = { - url = "https://developer.download.nvidia.com/compute/redist/jp/v60/tensorflow/tensorflow-2.16.1+nv24.07-cp310-cp310-linux_aarch64.whl"; - sha256 = "1ymdknl5v41z6z0wg068diici30am8vysg6b6sqxr8w6yk4aib42"; + url = "https://developer.download.nvidia.com/compute/redist/jp/v61/tensorflow/tensorflow-2.16.1+nv24.08-cp310-cp310-linux_aarch64.whl"; + sha256 = "0z18zdcjc2dingl94kivhd5cpzbvkjp9j12q57acjppp4hyd6g7f"; }; aarch64-darwin_39 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp39-cp39-macosx_12_0_arm64.whl"; - sha256 = "01a3hjnrgjp2i0ciwyy0gki41cy32prvjhr20zhlcjwbssarxy4p"; + url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp39-cp39-macosx_12_0_arm64.whl"; + sha256 = "0xjpi60qliql9z7wk959ag8p6l0n86jzd4k2xq7w4af1g3isqv1k"; }; aarch64-darwin_310 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp310-cp310-macosx_12_0_arm64.whl"; - sha256 = "10ypfpmgppvvf3h7hl0m9i8ndjpk2n2v04jlaw907icviapfapsi"; + url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp310-cp310-macosx_12_0_arm64.whl"; + sha256 = "1vj04f4gzvw07mwgjrvk7sxzzyhhb0mhsn96sq0dvxm1i29hmacd"; }; aarch64-darwin_311 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp311-cp311-macosx_12_0_arm64.whl"; - sha256 = "0kd62x53fzv6zcxh4bggakiczxd8ghjrjr9hn6fi7yyc4in6vlp8"; + url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp311-cp311-macosx_12_0_arm64.whl"; + sha256 = "1rsiz0k4caygl266az7if4vd6s8mrz5whdpv2rix4bx0703bcg25"; }; aarch64-darwin_312 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp312-cp312-macosx_12_0_arm64.whl"; - sha256 = "0482xdh9mj65iz4651llfznbc268yqm0j9dvx9rfii97svyb867f"; + url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp312-cp312-macosx_12_0_arm64.whl"; + sha256 = "1l3i9zz37riyhwjak7sdhz3znflxawafkjz757li94y52ni36hgc"; }; } diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 31639d48f934..69df6b23d50a 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -107,7 +107,7 @@ let stdenv = if cudaSupport then cudaPackages.backendStdenv - else if originalStdenv.isDarwin then + else if originalStdenv.hostPlatform.isDarwin then llvmPackages.stdenv else originalStdenv; @@ -274,7 +274,7 @@ let ''; }; bazel-build = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then _bazel-build.overrideAttrs (prev: { bazelFlags = prev.bazelFlags ++ [ "--override_repository=rules_cc=${rules_cc_darwin_patched}" @@ -341,16 +341,16 @@ let cudnnMerged ] ++ lib.optionals mklSupport [ mkl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation Security ] - ++ lib.optionals (!stdenv.isDarwin) [ nsync ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ nsync ]; # arbitrarily set to the current latest bazel version, overly careful TF_IGNORE_MAX_BAZEL_VERSION = true; - LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool"; + LIBTOOL = lib.optionalString stdenv.hostPlatform.isDarwin "${cctools}/bin/libtool"; # Take as many libraries from the system as possible. Keep in sync with # list of valid syslibs in @@ -395,7 +395,7 @@ let "wrapt" "zlib" ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "nsync" # fails to build on darwin ] ); @@ -598,12 +598,12 @@ let maintainers = with lib.maintainers; [ abbradar ]; platforms = with lib.platforms; linux ++ darwin; broken = - stdenv.isDarwin + stdenv.hostPlatform.isDarwin || !(xlaSupport -> cudaSupport) || !(cudaSupport -> builtins.hasAttr cudnnAttribute cudaPackages) || !(cudaSupport -> cudaPackages ? cudatoolkit); } - // lib.optionalAttrs stdenv.isDarwin { + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { timeout = 86400; # 24 hours maxSilent = 14400; # 4h, double the default of 7200s }; diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh index 912977ecc42a..594e4d82ec50 100755 --- a/pkgs/development/python-modules/tensorflow/prefetcher.sh +++ b/pkgs/development/python-modules/tensorflow/prefetcher.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash -version="2.17.0" -version_jetson="2.16.1+nv24.07" +version="2.18.0" +version_jetson="2.16.1+nv24.08" bucket="https://storage.googleapis.com/tensorflow/versions/${version}" -bucket_jetson="https://developer.download.nvidia.com/compute/redist/jp/v60/tensorflow" +bucket_jetson="https://developer.download.nvidia.com/compute/redist/jp/v61/tensorflow" # List of binary wheels for Tensorflow. The most recent versions can be found # on the following page: diff --git a/pkgs/development/python-modules/tensorstore/default.nix b/pkgs/development/python-modules/tensorstore/default.nix index 90a550f42ab3..42693111f402 100644 --- a/pkgs/development/python-modules/tensorstore/default.nix +++ b/pkgs/development/python-modules/tensorstore/default.nix @@ -12,6 +12,7 @@ let pythonVersionNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; systemToPlatform = { + "aarch64-linux" = "manylinux_2_17_aarch64.manylinux2014_aarch64"; "x86_64-linux" = "manylinux_2_17_x86_64.manylinux2014_x86_64"; "aarch64-darwin" = "macosx_11_0_arm64"; }; @@ -19,6 +20,9 @@ let "310-x86_64-linux" = "sha256-oB68FjYzmRARWpbajQuLpAzWwg9CCji4tLZRFCsztjk="; "311-x86_64-linux" = "sha256-kGEecBu7b3TFGUIRirI9q2W3nipiQwsh/1OB92RqDB4="; "312-x86_64-linux" = "sha256-Vw8sT5kahSN20BQs3MOYesSUZqk4CuvfZR1z5nAO7g8="; + "310-aarch64-linux" = "sha256-Ocfg3VArM/14a06cpMuJDYP/MIo9rCvtFO4Cd3AahA4="; + "311-aarch64-linux" = "sha256-hegFeV3m0jpjTXNU6ue/3kGe1Cy+Pfeh4GDe96dvL7o="; + "312-aarch64-linux" = "sha256-O0VVtSqSEd4dqjmaXMTRvf/Bcc9YR7zzbz9N/8GVcXk="; "310-aarch64-darwin" = "sha256-2vuVxmJMx/GeaHgzUS6rRdysQFHreVzZ5IT5YSDUJro="; "311-aarch64-darwin" = "sha256-0xRVDSDE9upz2yU7mzpa3Y6l6M5FWOMAPKWBC8eY3Eo="; "312-aarch64-darwin" = "sha256-i2TmLOl2aHD5iyzF6YpjbHKFmBGPx5ixPYyNKKQfRNM="; @@ -42,7 +46,7 @@ buildPythonPackage rec { or (throw "unsupported system/python version combination"); }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; dependencies = [ ml-dtypes diff --git a/pkgs/development/python-modules/term-image/default.nix b/pkgs/development/python-modules/term-image/default.nix new file mode 100644 index 000000000000..a0a194b47a3c --- /dev/null +++ b/pkgs/development/python-modules/term-image/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, + pillow, + requests, + urwid, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "term-image"; + version = "0.7.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "AnonymouX47"; + repo = "term-image"; + rev = "refs/tags/v${version}"; + hash = "sha256-uA04KHKLXW0lx1y5brpCDARLac4/C8VmVinVMkEtTdM="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + requests + pillow + ]; + + optional-dependencies = { + urwid = [ urwid ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ optional-dependencies.urwid; + + disabledTestPaths = [ + # test_url needs online access + "tests/test_image/test_url.py" + ]; + + pythonImportsCheck = [ "term_image" ]; + + meta = { + description = "Display images in the terminal with python"; + homepage = "https://github.com/AnonymouX47/term-image"; + changelog = "https://github.com/AnonymouX47/term-image/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ liff ]; + }; +} diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index 9e854fc168d6..4d5d49d7b007 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -1,16 +1,19 @@ { lib, + aiofiles, aiohttp, aiolimiter, buildPythonPackage, + cryptography, fetchFromGitHub, + protobuf, pythonOlder, setuptools, }: buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.7.8"; + version = "0.8.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,14 +22,17 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; rev = "refs/tags/v${version}"; - hash = "sha256-jExS2bnxz35mqzN2f6qrqInpoNWGUYLzueKeXp//9/8="; + hash = "sha256-tPMX8zmiwNF/j4FdOU/cWROrBCensfLKfl1A8ouF+0Y="; }; build-system = [ setuptools ]; dependencies = [ + aiofiles aiohttp aiolimiter + cryptography + protobuf ]; # Module has no tests diff --git a/pkgs/development/python-modules/tesla-powerwall/default.nix b/pkgs/development/python-modules/tesla-powerwall/default.nix index 8677ae389af6..b5ce22702ae0 100644 --- a/pkgs/development/python-modules/tesla-powerwall/default.nix +++ b/pkgs/development/python-modules/tesla-powerwall/default.nix @@ -38,6 +38,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # yarl compat issue https://github.com/jrester/tesla_powerwall/issues/68 + "test_parse_endpoint" + ]; + pytestFlagsArray = [ "tests/unit" ]; pythonImportsCheck = [ "tesla_powerwall" ]; diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index a6d0ea2e8ee6..870e88e426fd 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.12.0"; + version = "3.12.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = "teslajsonpy"; rev = "refs/tags/v${version}"; - hash = "sha256-oIuIE5N/cHCEP3azMrwNiknP4q3rDxg4BiFQiJqcFkc="; + hash = "sha256-chUW7aa99KzYyn8qVDX4GK8eI8MoP8+TKRx9PI+0ZKE="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/teslemetry-stream/default.nix b/pkgs/development/python-modules/teslemetry-stream/default.nix new file mode 100644 index 000000000000..1154f0380442 --- /dev/null +++ b/pkgs/development/python-modules/teslemetry-stream/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + aiohttp, +}: + +buildPythonPackage rec { + pname = "teslemetry-stream"; + version = "0.4.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Teslemetry"; + repo = "python-teslemetry-stream"; + rev = "v${version}"; + hash = "sha256-Ny68yiM0LS2U7zy6K2R35ZLm+Jo4s+HIFJjuqgL49E0="; + }; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ "teslemetry_stream" ]; + + meta = { + changelog = "https://github.com/Teslemetry/python-teslemetry-stream/releases/tag/v${version}"; + description = "Python library for the Teslemetry Streaming API"; + homepage = "https://github.com/Teslemetry/python-teslemetry-stream"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index e1ef6e67796a..73cd3f3dcbfc 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "testcontainers"; - version = "4.8.1"; + version = "4.8.2"; pyproject = true; src = fetchFromGitHub { owner = "testcontainers"; repo = "testcontainers-python"; rev = "refs/tags/testcontainers-v${version}"; - hash = "sha256-UCT0AmpDWMiAeRuW4BadZl4cJFCQPDogHOSkTYi/tqM="; + hash = "sha256-cfvhTNUadx7zRmDPAv9Djsx+jWgBIAf9dMmwop/8oa0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix index 7403d9c2af24..913226ddc78b 100644 --- a/pkgs/development/python-modules/testpath/default.nix +++ b/pkgs/development/python-modules/testpath/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { rm testpath/cli-32.exe testpath/cli-64.exe ''; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # Work around https://github.com/jupyter/testpath/issues/24 export TMPDIR="/tmp" ''; diff --git a/pkgs/development/python-modules/textile/default.nix b/pkgs/development/python-modules/textile/default.nix index 725e6adae549..09e83fa1caeb 100644 --- a/pkgs/development/python-modules/textile/default.nix +++ b/pkgs/development/python-modules/textile/default.nix @@ -2,45 +2,57 @@ lib, buildPythonPackage, fetchFromGitHub, - html5lib, + nh3, + pillow, + pytest-cov-stub, pytestCheckHook, pythonOlder, regex, + setuptools-scm, + setuptools, }: buildPythonPackage rec { pname = "textile"; - version = "4.0.2"; - format = "setuptools"; + version = "4.0.3"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = pname; + owner = "textile"; repo = "python-textile"; - rev = version; - hash = "sha256-WwX7h07Bq8sNsViHwmfhrrqleXacmrIY4ZBBaP2kKnI="; + rev = "refs/tags/${version}"; + hash = "sha256-KVDppsvX48loV9OJ70yqmQ5ZSypzcxrjH1j31DcyfM8="; }; - propagatedBuildInputs = [ - html5lib + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + nh3 regex ]; - nativeCheckInputs = [ pytestCheckHook ]; + optional-dependencies = { + imagesize = [ pillow ]; + }; - postPatch = '' - substituteInPlace pytest.ini \ - --replace " --cov=textile --cov-report=html --cov-append --cov-report=term-missing" "" - ''; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "textile" ]; meta = with lib; { description = "MOdule for generating web text"; - mainProgram = "pytextile"; homepage = "https://github.com/textile/python-textile"; + changelog = "https://github.com/textile/python-textile/blob/${version}/CHANGELOG.textile"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; + mainProgram = "pytextile"; }; } diff --git a/pkgs/development/python-modules/textstat/default.nix b/pkgs/development/python-modules/textstat/default.nix new file mode 100644 index 000000000000..127c6f453a92 --- /dev/null +++ b/pkgs/development/python-modules/textstat/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pyphen, + pytestCheckHook, + pytest, +}: +buildPythonPackage rec { + version = "0.7.4"; + pname = "textstat"; + pyproject = true; + + src = fetchFromGitHub { + owner = "textstat"; + repo = "textstat"; + rev = version; + hash = "sha256-UOCWsIdoVGxmkro4kNBYNMYhA3kktngRDxKjo6o+GXY="; + }; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest + ]; + + dependencies = [ + setuptools + pyphen + ]; + + pythonImportsCheck = [ + "textstat" + ]; + + pytestFlagsArray = [ + "test.py" + ]; + + meta = { + description = "Python package to calculate readability statistics of a text object"; + homepage = "https://textstat.org"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aleksana ]; + }; +} diff --git a/pkgs/development/python-modules/textual-fastdatatable/default.nix b/pkgs/development/python-modules/textual-fastdatatable/default.nix new file mode 100644 index 000000000000..16d5418a2736 --- /dev/null +++ b/pkgs/development/python-modules/textual-fastdatatable/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + pyarrow, + pytz, + textual, + tzdata, + polars, +}: + +buildPythonPackage rec { + pname = "textual-fastdatatable"; + version = "0.9.0"; + pyproject = true; + + src = fetchPypi { + pname = "textual_fastdatatable"; + inherit version; + hash = "sha256-AS3SiwetCHkCMu8H81xbp5QvN/2GCvMlWgU4qZKvBRU="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + pyarrow + pytz + textual + tzdata + ]; + + optional-dependencies = { + polars = [ + polars + ]; + }; + + pythonImportsCheck = [ + "textual_fastdatatable" + ]; + + meta = { + description = "A performance-focused reimplementation of Textual's DataTable widget, with a pluggable data storage backend"; + homepage = "https://pypi.org/project/textual-fastdatatable/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pcboy ]; + }; +} diff --git a/pkgs/development/python-modules/textual-slider/default.nix b/pkgs/development/python-modules/textual-slider/default.nix new file mode 100644 index 000000000000..1a6734a31462 --- /dev/null +++ b/pkgs/development/python-modules/textual-slider/default.nix @@ -0,0 +1,32 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + textual, +}: + +buildPythonPackage rec { + pname = "textual-slider"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "TomJGooding"; + repo = "textual-slider"; + rev = "91e64bafe3aa72f8d875e76b437d6af9320e039e"; + hash = "sha256-lwN7igiEB8uC9e7qBSVLuKCpF41+Ni7ZJ3cVK19cEY8="; + }; + + pyproject = true; + + build-system = [ setuptools ]; + + dependencies = [ textual ]; + + meta = with lib; { + description = "Textual widget for a simple slider"; + homepage = "https://github.com/TomJGooding/textual-slider"; + license = licenses.gpl3Only; + maintainers = [ maintainers.lukegb ]; + }; +} diff --git a/pkgs/development/python-modules/textual-textarea/default.nix b/pkgs/development/python-modules/textual-textarea/default.nix new file mode 100644 index 000000000000..74293ee3c2e4 --- /dev/null +++ b/pkgs/development/python-modules/textual-textarea/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + pyperclip, + textual, +}: + +buildPythonPackage rec { + pname = "textual-textarea"; + version = "0.14.2"; + pyproject = true; + + src = fetchPypi { + pname = "textual_textarea"; + inherit version; + hash = "sha256-AJU7BBoev6pBrLhvbfF4I7l+E8YnO5jCD5OIsNf6NW0="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + pyperclip + textual + ]; + + pythonImportsCheck = [ + "textual_textarea" + ]; + + meta = { + description = "A text area (multi-line input) with syntax highlighting for Textual"; + homepage = "https://pypi.org/project/textual-textarea/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pcboy ]; + }; +} diff --git a/pkgs/development/python-modules/textual-universal-directorytree/default.nix b/pkgs/development/python-modules/textual-universal-directorytree/default.nix index 20429de6f810..9da4e1e82ee7 100644 --- a/pkgs/development/python-modules/textual-universal-directorytree/default.nix +++ b/pkgs/development/python-modules/textual-universal-directorytree/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { universal-pathlib ]; - passthru.optional-dependencies = { + optional-dependencies = { remote = [ adlfs aiohttp diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index f018431f4842..f04ba71578a9 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "textual"; - version = "0.79.0"; + version = "0.82.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = "textual"; rev = "refs/tags/v${version}"; - hash = "sha256-QD9iRgl6hwlFL5DLYyXL5aA/Xsvpe5/KXdEdMS+3L/8="; + hash = "sha256-belpoXQ+CkTchK+FjI/Ur8v4cNgzX39xLdNfPCwaU6E="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/tf2onnx/default.nix b/pkgs/development/python-modules/tf2onnx/default.nix index 54a837089bc8..5049d5043775 100644 --- a/pkgs/development/python-modules/tf2onnx/default.nix +++ b/pkgs/development/python-modules/tf2onnx/default.nix @@ -14,7 +14,7 @@ pytestCheckHook, graphviz, parameterized, - pytest-cov, + pytest-cov-stub, pyyaml, timeout-decorator, onnxruntime, @@ -57,7 +57,7 @@ buildPythonPackage rec { pytestCheckHook graphviz parameterized - pytest-cov + pytest-cov-stub pyyaml timeout-decorator keras diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index d4c35796a270..99126084f28a 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { setuptools ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreFoundation CoreGraphics diff --git a/pkgs/development/python-modules/thinqconnect/default.nix b/pkgs/development/python-modules/thinqconnect/default.nix index 0b269d0ff3d7..657eac221a47 100644 --- a/pkgs/development/python-modules/thinqconnect/default.nix +++ b/pkgs/development/python-modules/thinqconnect/default.nix @@ -10,8 +10,8 @@ }: buildPythonPackage rec { - pname = "pythinqconnect"; - version = "0.9.7-unstable-2024-09-09"; + pname = "thinqconnect"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,9 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thinq-connect"; repo = "pythinqconnect"; - # https://github.com/thinq-connect/pythinqconnect/issues/1 - rev = "39d535a2a5d1067a110eea37ae92002d0793b7e9"; - hash = "sha256-+nQAUqg5rB2eJgPBJJR8NsQ1O2Wb4UsbBQVPir1jyAU="; + rev = "refs/tags/${version}"; + hash = "sha256-8TDpoV2FNWzcHwXaEDyt5mRCbmFdtfuIYJK7OqXAgvg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix index 14ae9cca78ce..ae97c9a34732 100644 --- a/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/pkgs/development/python-modules/threadpoolctl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "threadpoolctl"; - version = "3.4.0"; + version = "3.5.0"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "joblib"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-nWaBhiFw76azx6dV4I18XodiUnHiLb0gNNhXks6iHIg="; + hash = "sha256-XFgiCfcHwzjsjPDKask1X4JHTx1xeHfIFeSJWtbgJmU="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/thrift/default.nix b/pkgs/development/python-modules/thrift/default.nix index 4052080fc351..e3301d3ab4cc 100644 --- a/pkgs/development/python-modules/thrift/default.nix +++ b/pkgs/development/python-modules/thrift/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "thrift"; - version = "0.20.0"; + version = "0.21.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TdZi6t9riuvopBcpUnvWmt9s6qKoaBy+9k0Sc7Po/ro="; + hash = "sha256-Xm98UPk26/oj6SQimvyV6yGfjI5agyAt1KORJEgD5AI="; }; build-system = [ diff --git a/pkgs/development/python-modules/throttler/default.nix b/pkgs/development/python-modules/throttler/default.nix index 4dc15bffedae..629ec3784559 100644 --- a/pkgs/development/python-modules/throttler/default.nix +++ b/pkgs/development/python-modules/throttler/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, pytestCheckHook, aiohttp, - codecov, flake8, pytest, pytest-asyncio, @@ -25,7 +24,6 @@ buildPythonPackage rec { checkInputs = [ aiohttp - codecov flake8 pytest pytest-asyncio diff --git a/pkgs/development/python-modules/tika-client/default.nix b/pkgs/development/python-modules/tika-client/default.nix index f2e74ad90c93..7b1614e9c256 100644 --- a/pkgs/development/python-modules/tika-client/default.nix +++ b/pkgs/development/python-modules/tika-client/default.nix @@ -6,10 +6,11 @@ hatchling, httpx, }: + buildPythonPackage rec { pname = "tika-client"; - version = "0.6.0"; - format = "pyproject"; + version = "0.7.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -17,14 +18,15 @@ buildPythonPackage rec { owner = "stumpylog"; repo = "tika-client"; rev = "refs/tags/${version}"; - hash = "sha256-1Gc/WF8eEGT17z2CiuSLUIngDZVoHdBhfsUddNUBwWo="; + hash = "sha256-0cv2HaquIUQOb5CPkCxSYvXDzu3OV7WKIT80jI+pjpY="; }; - propagatedBuildInputs = [ - hatchling - httpx - ]; + build-system = [ hatchling ]; + + dependencies = [ httpx ]; + pythonImportsCheck = [ "tika_client" ]; + # Almost all of the tests (all except one in 0.1.0) fail since there # is no tika http API endpoint reachable. Since tika is not yet # packaged for nixpkgs, it seems like an unreasonable amount of effort diff --git a/pkgs/development/python-modules/tiktoken/default.nix b/pkgs/development/python-modules/tiktoken/default.nix index ffcead40165d..9ce945ebf7c3 100644 --- a/pkgs/development/python-modules/tiktoken/default.nix +++ b/pkgs/development/python-modules/tiktoken/default.nix @@ -54,7 +54,7 @@ buildPythonPackage { rustc ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; dependencies = [ requests diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index a9cfbc082c90..e76ff173317c 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "tiledb"; - version = "0.26.2"; + version = "0.32.2"; format = "setuptools"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB-Py"; rev = "refs/tags/${version}"; - hash = "sha256-8c1l4zoD44SjaOUXlFUSho/y7oMNOEVM9ZlnRs1irV8="; + hash = "sha256-9UgT09KnCqQ7ip7sSp64Yy8Pstf1GCOVYOG0WM2P840="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix index 17d3827f4853..c519c457df47 100644 --- a/pkgs/development/python-modules/time-machine/default.nix +++ b/pkgs/development/python-modules/time-machine/default.nix @@ -5,30 +5,29 @@ pythonAtLeast, pythonOlder, setuptools, - backports-zoneinfo, python-dateutil, pytestCheckHook, }: buildPythonPackage rec { pname = "time-machine"; - version = "2.14.2"; + version = "2.15.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "adamchainz"; - repo = pname; - rev = version; - hash = "sha256-u5RxNv+hsL+0yxtiWeYHtmMQY7bvb8WY7ipouj+IZJ8="; + repo = "time-machine"; + rev = "refs/tags/${version}"; + hash = "sha256-0WYmkrMMeCkBYxy2qGovdxftzrYW9x/3tdeBcYC47Z0="; }; build-system = [ setuptools ]; dependencies = [ python-dateutil - ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; + ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -45,9 +44,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "time_machine" ]; meta = with lib; { - changelog = "https://github.com/adamchainz/time-machine/blob/${src.rev}/CHANGELOG.rst"; description = "Travel through time in your tests"; homepage = "https://github.com/adamchainz/time-machine"; + changelog = "https://github.com/adamchainz/time-machine/blob/${src.rev}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix index afee885b5446..a85434931992 100644 --- a/pkgs/development/python-modules/timm/default.nix +++ b/pkgs/development/python-modules/timm/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -22,16 +21,14 @@ buildPythonPackage rec { pname = "timm"; - version = "1.0.9"; + version = "1.0.11"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "huggingface"; repo = "pytorch-image-models"; rev = "refs/tags/v${version}"; - hash = "sha256-iWZXile3hCUMx2q3VHJasX7rlJmT0OKBm9rkCXuWISw="; + hash = "sha256-+e4+k1Oyxf94rLsOTWfMl5YWTteXgSoecvbyxL348kg="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/tinygrad/default.nix b/pkgs/development/python-modules/tinygrad/default.nix index 387ee633264e..ae55395b2ca2 100644 --- a/pkgs/development/python-modules/tinygrad/default.nix +++ b/pkgs/development/python-modules/tinygrad/default.nix @@ -9,14 +9,17 @@ rocmSupport ? config.rocmSupport, cudaPackages, ocl-icd, - stdenv, rocmPackages, + stdenv, # build-system setuptools, # dependencies + llvmlite, numpy, + triton, + unicorn, # tests blobfile, @@ -25,9 +28,9 @@ hexdump, hypothesis, librosa, + networkx, onnx, pillow, - pydot, pytest-xdist, pytestCheckHook, safetensors, @@ -36,6 +39,8 @@ torch, tqdm, transformers, + + tinygrad, }: buildPythonPackage rec { @@ -67,6 +72,18 @@ buildPythonPackage rec { substituteInPlace tinygrad/runtime/autogen/opencl.py \ --replace-fail "ctypes.util.find_library('OpenCL')" "'${ocl-icd}/lib/libOpenCL.so'" '' + # Patch `clang` directly in the source file + + '' + substituteInPlace tinygrad/runtime/ops_clang.py \ + --replace-fail "'clang'" "'${lib.getExe clang}'" + '' + # `cuda_fp16.h` and co. are needed at runtime to compile kernels + + lib.optionalString cudaSupport '' + substituteInPlace tinygrad/runtime/support/compiler_cuda.py \ + --replace-fail \ + ', "-I/usr/local/cuda/include", "-I/usr/include", "-I/opt/cuda/include/"' \ + ', "-I${lib.getDev cudaPackages.cuda_cudart}/include/"' + '' + lib.optionalString rocmSupport '' substituteInPlace tinygrad/runtime/autogen/hip.py \ --replace-fail "/opt/rocm/lib/libamdhip64.so" "${rocmPackages.clr}/lib/libamdhip64.so" \ @@ -82,12 +99,24 @@ buildPythonPackage rec { [ numpy ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # pyobjc-framework-libdispatch # pyobjc-framework-metal ]; - pythonImportsCheck = [ "tinygrad" ]; + optional-dependencies = { + llvm = [ llvmlite ]; + arm = [ unicorn ]; + triton = [ triton ]; + }; + + pythonImportsCheck = + [ + "tinygrad" + ] + ++ lib.optionals cudaSupport [ + "tinygrad.runtime.ops_nv" + ]; nativeCheckInputs = [ blobfile @@ -96,9 +125,9 @@ buildPythonPackage rec { hexdump hypothesis librosa + networkx onnx pillow - pydot pytest-xdist pytestCheckHook safetensors @@ -107,7 +136,7 @@ buildPythonPackage rec { torch tqdm transformers - ]; + ] ++ networkx.optional-dependencies.extra; preCheck = '' export HOME=$(mktemp -d) @@ -170,6 +199,10 @@ buildPythonPackage rec { "extra/" ]; + passthru.tests = { + withCuda = tinygrad.override { cudaSupport = true; }; + }; + meta = { description = "Simple and powerful neural network framework"; homepage = "https://github.com/tinygrad/tinygrad"; @@ -177,6 +210,6 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; # Requires unpackaged pyobjc-framework-libdispatch and pyobjc-framework-metal - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/tinygrad/fix-dlopen-cuda.patch b/pkgs/development/python-modules/tinygrad/fix-dlopen-cuda.patch index db74eab45bc0..285ca6111569 100644 --- a/pkgs/development/python-modules/tinygrad/fix-dlopen-cuda.patch +++ b/pkgs/development/python-modules/tinygrad/fix-dlopen-cuda.patch @@ -43,7 +43,7 @@ index 6af74187..c5a6c6c4 100644 + pass +if libnvrtc is None: + raise RuntimeError(f"`libnvrtc.so` not found") -+_libraries['libnvrtc.so'] = ctypes.CDLL(libnvrtc) ++_libraries['libnvrtc.so'] = libnvrtc def string_cast(char_pointer, encoding='utf-8', errors='strict'): value = ctypes.cast(char_pointer, ctypes.c_char_p).value if value is not None and encoding is not None: diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix index beba9834e703..e051bbf86d98 100644 --- a/pkgs/development/python-modules/tkinter/default.nix +++ b/pkgs/development/python-modules/tkinter/default.nix @@ -21,7 +21,7 @@ buildPythonPackage { mkdir -p $out/${py.sitePackages} mv lib/${py.libPrefix}/lib-dynload/_tkinter* $out/${py.sitePackages}/ '' - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # Update the rpath to point to python without x11Support old_rpath=$(patchelf --print-rpath $out/${py.sitePackages}/_tkinter*) new_rpath=$(sed "s#${py}#${python}#g" <<< "$old_rpath" ) diff --git a/pkgs/development/python-modules/tlds/default.nix b/pkgs/development/python-modules/tlds/default.nix index e161c5495f59..3d58e0c755b3 100644 --- a/pkgs/development/python-modules/tlds/default.nix +++ b/pkgs/development/python-modules/tlds/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "tlds"; - version = "2024071000"; + version = "2024092600"; pyproject = true; src = fetchFromGitHub { owner = "kichik"; repo = "tlds"; rev = "refs/tags/${version}"; - hash = "sha256-xt2IdF7V8NUW9nUg8x7XbMHLWir6CHAQcRIiH6ejV5M="; + hash = "sha256-ybqC0FUrTyTO2UfS/bCAUdzKtcK06wTeLv1Mv/R8RS0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix index 8bc321100aeb..ceaea06ebd74 100644 --- a/pkgs/development/python-modules/tlsh/default.nix +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -3,22 +3,25 @@ buildPythonPackage, fetchFromGitHub, cmake, + setuptools, }: buildPythonPackage rec { pname = "tlsh"; - version = "4.10.0"; - format = "setuptools"; + version = "4.12.0"; + pyproject = true; src = fetchFromGitHub { owner = "trendmicro"; repo = "tlsh"; - rev = version; - hash = "sha256-9Vkj7a5xU/coFyM/8i8JB0DdnbgDAEMOjmmMF8ckKuE="; + rev = "refs/tags/${version}"; + hash = "sha256-Ht4LkcNmxPEvzFHXeS/XhPt/xo+0sE4RBcLCn9N/zwE="; }; nativeBuildInputs = [ cmake ]; + build-system = [ setuptools ]; + # no test data doCheck = false; @@ -26,10 +29,12 @@ buildPythonPackage rec { cd ../py_ext ''; + pythonImportsCheck = [ "tlsh" ]; + meta = with lib; { description = "Trend Micro Locality Sensitive Hash"; homepage = "https://tlsh.org/"; + changelog = "https://github.com/trendmicro/tlsh/releases/tag/${version}"; license = licenses.asl20; - platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/token-bucket/default.nix b/pkgs/development/python-modules/token-bucket/default.nix index a2a9b7a04e7c..1af40f588f57 100644 --- a/pkgs/development/python-modules/token-bucket/default.nix +++ b/pkgs/development/python-modules/token-bucket/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Token Bucket Implementation for Python Web Apps"; diff --git a/pkgs/development/python-modules/tokenizers/Cargo.lock b/pkgs/development/python-modules/tokenizers/Cargo.lock deleted file mode 100644 index a0324bff8aba..000000000000 --- a/pkgs/development/python-modules/tokenizers/Cargo.lock +++ /dev/null @@ -1,1151 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "anstream" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys", -] - -[[package]] -name = "autocfg" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" - -[[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 = "bitflags" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" - -[[package]] -name = "cc" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[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", -] - -[[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-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "darling" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" -dependencies = [ - "darling_core", - "quote", - "syn", -] - -[[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", -] - -[[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", -] - -[[package]] -name = "either" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "env_filter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "humantime", - "log", -] - -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "esaxx-rs" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" -dependencies = [ - "cc", -] - -[[package]] -name = "fastrand" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "getrandom" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[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.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[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 = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[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.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[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 = "matrixmultiply" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" -dependencies = [ - "autocfg", - "rawpointer", -] - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "monostate" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20fffcd8ca4c69d31e036a71abc400147b41f90895df4edcb36497a1f8af8bf" -dependencies = [ - "monostate-impl", - "serde", -] - -[[package]] -name = "monostate-impl" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf307cbbbd777a9c10cec88ddafee572b3484caad5cce0c9236523c3803105a6" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "ndarray" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" -dependencies = [ - "matrixmultiply", - "num-complex", - "num-integer", - "num-traits", - "rawpointer", -] - -[[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 = "num-complex" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" -dependencies = [ - "num-traits", -] - -[[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-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "numpy" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec170733ca37175f5d75a5bea5911d6ff45d2cd52849ce98b685394e4f2f37f4" -dependencies = [ - "libc", - "ndarray", - "num-complex", - "num-integer", - "num-traits", - "pyo3", - "rustc-hash", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[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 = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "portable-atomic" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" -dependencies = [ - "unicode-ident", -] - -[[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", - "pyo3-ffi", - "pyo3-macros", - "unindent", -] - -[[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", -] - -[[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", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" -dependencies = [ - "heck", - "proc-macro2", - "pyo3-build-config", - "quote", - "syn", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[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 = "rawpointer" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" - -[[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 = "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 = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustix" -version = "0.38.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" -dependencies = [ - "bitflags 2.5.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[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.198" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.198" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.116" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "spm_precompiled" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" -dependencies = [ - "base64", - "nom", - "serde", - "unicode-segmentation", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "2.0.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "target-lexicon" -version = "0.12.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand", - "rustix", - "windows-sys", -] - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokenizers" -version = "0.19.1-rc0" -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 = "tokenizers-python" -version = "0.19.1-rc0" -dependencies = [ - "env_logger", - "itertools 0.12.1", - "libc", - "ndarray", - "numpy", - "onig", - "pyo3", - "rayon", - "serde", - "serde_json", - "tempfile", - "tokenizers", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[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-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" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[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 = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[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" -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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" -dependencies = [ - "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]] -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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" - -[[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.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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index aca17db0e74e..0a357801915c 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -2,24 +2,32 @@ lib, stdenv, linkFarm, + fetchurl, buildPythonPackage, - cargo, - datasets, - huggingface-hub, fetchFromGitHub, - fetchurl, - libiconv, - numpy, - openssl, - pkg-config, - pytestCheckHook, python, - pythonOlder, - requests, + + # nativeBuildInputs + pkg-config, + setuptools-rust, rustPlatform, + cargo, rustc, + + # buildInputs + openssl, + libiconv, Security, - setuptools-rust, + + # dependencies + huggingface-hub, + numpy, + + # tests + datasets, + pytestCheckHook, + requests, + tiktoken, }: let @@ -28,23 +36,23 @@ let test-data = linkFarm "tokenizers-test-data" { "roberta-base-vocab.json" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/roberta-base-vocab.json"; - sha256 = "0m86wpkfb2gdh9x9i9ng2fvwk1rva4p0s98xw996nrjxs7166zwy"; + hash = "sha256-nn9jwtFdZmtS4h0lDS5RO4fJtxPPpph6gu2J5eblBlU="; }; "roberta-base-merges.txt" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/roberta-base-merges.txt"; - sha256 = "1idd4rvkpqqbks51i2vjbd928inw7slij9l4r063w3y5fd3ndq8w"; + hash = "sha256-HOFmR3PFDz4MyIQmGak+3EYkUltyixiKngvjO3cmrcU="; }; "albert-base-v1-tokenizer.json" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/albert-base-v1-tokenizer.json"; - sha256 = "1hra9pn8rczx7378z88zjclw2qsdrdwq20m56sy42s2crbas6akf"; + hash = "sha256-biqj1cpMaEG8NqUCgXnLTWPBKZMfoY/OOP2zjOxNKsM="; }; "bert-base-uncased-vocab.txt" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/bert-base-uncased-vocab.txt"; - sha256 = "18rq42cmqa8zanydsbzrb34xwy4l6cz1y900r4kls57cbhvyvv07"; + hash = "sha256-B+ztN1zsFE0nyQAkHz4zlHjeyVj5L928VR8pXJkgOKM="; }; "big.txt" = fetchurl { url = "https://norvig.com/big.txt"; - sha256 = "0yz80icdly7na03cfpl0nfk5h3j3cam55rj486n03wph81ynq1ps"; + hash = "sha256-+gZsfUDw8gGsQUTmUqpiQw5YprOAXscGUPZ42lgE6Hs="; }; "bert-wiki.json" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/anthony/doc-pipeline/tokenizer.json"; @@ -56,29 +64,35 @@ let }; "openai-gpt-vocab.json" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-vocab.json"; - sha256 = "0y40gc9bixj5rxv674br1rxmxkd3ly29p80x1596h8yywwcrpx7x"; + hash = "sha256-/fSbGefeI2hSCR2gm4Sno81eew55kWN2z0X2uBJ7gHg="; }; "openai-gpt-merges.txt" = fetchurl { url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-merges.txt"; - sha256 = "09a754pm4djjglv3x5pkgwd6f79i2rq8ydg0f7c3q1wmwqdbba8f"; + hash = "sha256-Dqm1GuaVBzzYceA1j3AWMR1nGn/zlj42fVI2Ui8pRyU="; }; }; in buildPythonPackage rec { pname = "tokenizers"; - version = "0.19.1"; + version = "0.20.3"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "huggingface"; repo = "tokenizers"; rev = "refs/tags/v${version}"; - hash = "sha256-sKEAt46cdme821tzz9WSKnQb3hPmFJ4zvHgBNRxjEuk="; + hash = "sha256-NPH++kPPaSPR3jm6mfh+4aep6stj0I4bA24kFtaJSKU="; }; - cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit + pname + version + src + sourceRoot + ; + hash = "sha256-S2AfsKBtitEfprp9vjTyCl772IBe/wqwqYVnnAEK3LE="; + }; sourceRoot = "${src.name}/bindings/python"; maturinBuildFlags = [ "--interpreter ${python.executable}" ]; @@ -94,20 +108,21 @@ buildPythonPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; dependencies = [ - numpy huggingface-hub + numpy ]; nativeCheckInputs = [ datasets pytestCheckHook requests + tiktoken ]; postUnpack = '' @@ -127,17 +142,24 @@ buildPythonPackage rec { "test_encode_special_tokens" "test_splitting" "TestTrainFromIterators" + # Those tests require more data "test_from_pretrained" "test_from_pretrained_revision" "test_continuing_prefix_trainer_mistmatch" ]; - meta = with lib; { + disabledTestPaths = [ + # fixture 'model' not found + "benches/test_tiktoken.py" + ]; + + meta = { description = "Fast State-of-the-Art Tokenizers optimized for Research and Production"; homepage = "https://github.com/huggingface/tokenizers"; - license = licenses.asl20; - maintainers = [ ]; - platforms = platforms.unix; + changelog = "https://github.com/huggingface/tokenizers/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/tololib/default.nix b/pkgs/development/python-modules/tololib/default.nix index 03bb2f2ea81e..9548f2d77657 100644 --- a/pkgs/development/python-modules/tololib/default.nix +++ b/pkgs/development/python-modules/tololib/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "tololib" ]; # Network discovery doesn't work in the sandbox for darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Python Library for Controlling TOLO Sauna/Steam Bath Devices"; diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index 85f9ed273b7d..8c47693a5829 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -13,15 +13,15 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.12.5"; - format = "pyproject"; + version = "0.13.2"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-7vNPujmDTU1rc8m6fz5NHEF6Tlb4mn6W4JDdDSS4+zw="; + hash = "sha256-//X+WahylbJ4q9Mb7JLBXZvEoGiFqxK86lLHERk5Lnk="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ pyyaml diff --git a/pkgs/development/python-modules/toptica-lasersdk/default.nix b/pkgs/development/python-modules/toptica-lasersdk/default.nix new file mode 100644 index 000000000000..6c7ccb9c252e --- /dev/null +++ b/pkgs/development/python-modules/toptica-lasersdk/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + # build-system + setuptools, + + # dependencies + ifaddr, + pyserial, +}: + +buildPythonPackage rec { + pname = "toptica-lasersdk"; + version = "3.2.0"; + pyproject = true; + + src = fetchPypi { + pname = "toptica_lasersdk"; + inherit version; + hash = "sha256-UNazng4Za3CZeG7eDq0b+l7gmESEXIU8WMLWGGysmBg="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + ifaddr + pyserial + ]; + + pythonImportsCheck = [ + "toptica.lasersdk.dlcpro.v2_2_0" + ]; + + meta = { + description = "TOPTICA Python Laser SDK"; + homepage = "https://toptica.github.io/python-lasersdk/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/torch-geometric/default.nix b/pkgs/development/python-modules/torch-geometric/default.nix new file mode 100644 index 000000000000..d1342510d7af --- /dev/null +++ b/pkgs/development/python-modules/torch-geometric/default.nix @@ -0,0 +1,186 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + + # build-system + flit-core, + + # dependencies + aiohttp, + fsspec, + jinja2, + numpy, + psutil, + pyparsing, + requests, + torch, + tqdm, + + # optional-dependencies + matplotlib, + networkx, + pandas, + protobuf, + wandb, + ipython, + matplotlib-inline, + pre-commit, + torch-geometric, + ase, + # captum, + graphviz, + h5py, + numba, + opt-einsum, + pgmpy, + pynndescent, + # pytorch-memlab, + rdflib, + rdkit, + scikit-image, + scikit-learn, + scipy, + statsmodels, + sympy, + tabulate, + torchmetrics, + trimesh, + pytorch-lightning, + yacs, + huggingface-hub, + onnx, + onnxruntime, + pytest, + pytest-cov-stub, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "torch-geometric"; + version = "2.6.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pyg-team"; + repo = "pytorch_geometric"; + rev = "refs/tags/${version}"; + hash = "sha256-Zw9YqPQw2N0ZKn5i5Kl4Cjk9JDTmvZmyO/VvIVr6fTU="; + }; + + build-system = [ + flit-core + ]; + + dependencies = [ + aiohttp + fsspec + jinja2 + numpy + psutil + pyparsing + requests + torch + tqdm + ]; + + optional-dependencies = { + benchmark = [ + matplotlib + networkx + pandas + protobuf + wandb + ]; + dev = [ + ipython + matplotlib-inline + pre-commit + torch-geometric + ]; + full = [ + ase + # captum + graphviz + h5py + matplotlib + networkx + numba + opt-einsum + pandas + pgmpy + pynndescent + # pytorch-memlab + rdflib + rdkit + scikit-image + scikit-learn + scipy + statsmodels + sympy + tabulate + torch-geometric + torchmetrics + trimesh + ]; + graphgym = [ + protobuf + pytorch-lightning + yacs + ]; + modelhub = [ + huggingface-hub + ]; + test = [ + onnx + onnxruntime + pytest + pytest-cov-stub + ]; + }; + + pythonImportsCheck = [ + "torch_geometric" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTests = + [ + # TODO: try to re-enable when triton will have been updated to 3.0 + # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised: + # LoweringException: ImportError: cannot import name 'triton_key' from 'triton.compiler.compiler' + "test_compile_hetero_conv_graph_breaks" + "test_compile_multi_aggr_sage_conv" + + # RuntimeError: addmm: computation on CPU is not implemented for SparseCsr + SparseCsr @ SparseCsr without MKL. + # PyTorch built with MKL has better support for addmm with sparse CPU tensors. + "test_asap" + "test_graph_unet" + + # AttributeError: type object 'Any' has no attribute '_name' + "test_type_repr" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # This test uses `torch.jit` which might not be working on darwin: + # RuntimeError: required keyword attribute 'value' has the wrong type + "test_traceable_my_conv_with_self_loops" + ]; + + meta = { + description = "Graph Neural Network Library for PyTorch"; + homepage = "https://github.com/pyg-team/pytorch_geometric"; + changelog = "https://github.com/pyg-team/pytorch_geometric/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/torch-pitch-shift/default.nix b/pkgs/development/python-modules/torch-pitch-shift/default.nix index 910b65c6363a..754cd282a015 100644 --- a/pkgs/development/python-modules/torch-pitch-shift/default.nix +++ b/pkgs/development/python-modules/torch-pitch-shift/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "torch-pitch-shift"; - version = "1.2.4"; + version = "1.2.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "KentoNishi"; repo = "torch-pitch-shift"; rev = "refs/tags/v${version}"; - hash = "sha256-s3z+6jOGC7RfF9TzVZ9HFbIFz2BsBm6Yhx7lgaEKv6o="; + hash = "sha256-QuDz9IpmBdzfMjwAuG2Ln0x2OL/w3RVd/EfO4Ws78dw="; }; pythonRelaxDeps = [ "torchaudio" ]; diff --git a/pkgs/development/python-modules/torch-tb-profiler/default.nix b/pkgs/development/python-modules/torch-tb-profiler/default.nix index 005c9f375455..766baff5d3cc 100644 --- a/pkgs/development/python-modules/torch-tb-profiler/default.nix +++ b/pkgs/development/python-modules/torch-tb-profiler/default.nix @@ -1,32 +1,34 @@ { + lib, buildPythonPackage, fetchFromGitHub, - lib, pandas, pytestCheckHook, - torch, + setuptools, tensorboard, + torch, torchvision, }: - let - version = "0.3.1"; + version = "0.4.0"; repo = fetchFromGitHub { owner = "pytorch"; repo = "kineto"; - rev = "v${version}"; - hash = "sha256-Yg001XzOPDmz9wEP2b7Ggz/uU6x5PFzaaBeUBwWKFS0="; + rev = "refs/tags/v${version}"; + hash = "sha256-nAtqGCv8q3Tati3NOGWWLb+gXdvO3qmECeC1WG2Mt3M="; }; in -buildPythonPackage rec { +buildPythonPackage { pname = "torch_tb_profiler"; inherit version; - format = "setuptools"; + pyproject = true; # See https://discourse.nixos.org/t/extracting-sub-directory-from-fetchgit-or-fetchurl-or-any-derivation/8830. src = "${repo}/tb_plugin"; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pandas tensorboard ]; @@ -43,14 +45,18 @@ buildPythonPackage rec { "test_tensorboard_end2end" "test_tensorboard_with_path_prefix" "test_tensorboard_with_symlinks" + "test_autograd_api" + "test_profiler_api_with_record_shapes_memory_stack" + "test_profiler_api_without_record_shapes_memory_stack" + "test_profiler_api_without_step" ]; pythonImportsCheck = [ "torch_tb_profiler" ]; - meta = with lib; { + meta = { description = "PyTorch Profiler TensorBoard Plugin"; homepage = "https://github.com/pytorch/kineto"; - license = licenses.bsd3; - maintainers = with maintainers; [ samuela ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ samuela ]; }; } diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index 4ecaac16be18..15daafba6f71 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -1,34 +1,41 @@ { lib, stdenv, - buildPythonPackage, - autoAddDriverRunpath, - fetchurl, python, - pythonAtLeast, + buildPythonPackage, pythonOlder, + pythonAtLeast, + fetchurl, + + # nativeBuildInputs addDriverRunpath, - callPackage, + autoAddDriverRunpath, + autoPatchelfHook, + + # buildInputs cudaPackages, + + # dependencies + filelock, future, + jinja2, + networkx, numpy, - autoPatchelfHook, pyyaml, requests, setuptools, - typing-extensions, sympy, - jinja2, - networkx, - filelock, + typing-extensions, triton, + + callPackage, }: let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "2.4.0"; + version = "2.5.1"; in buildPythonPackage { inherit version; @@ -38,17 +45,17 @@ buildPythonPackage { format = "wheel"; - disabled = (pythonOlder "3.8") || (pythonAtLeast "3.13"); + disabled = (pythonOlder "3.9") || (pythonAtLeast "3.13"); src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ addDriverRunpath - autoPatchelfHook autoAddDriverRunpath + autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.isLinux ( + buildInputs = lib.optionals stdenv.hostPlatform.isLinux ( with cudaPackages; [ # $out/${sitePackages}/nvfuser/_C*.so wants libnvToolsExt.so.1 but torch/lib only ships @@ -68,7 +75,7 @@ buildPythonPackage { ] ); - autoPatchelfIgnoreMissingDeps = lib.optionals stdenv.isLinux [ + autoPatchelfIgnoreMissingDeps = lib.optionals stdenv.hostPlatform.isLinux [ # This is the hardware-dependent userspace driver that comes from # nvidia_x11 package. It must be deployed at runtime in # /run/opengl-driver/lib or pointed at by LD_LIBRARY_PATH variable, rather @@ -77,24 +84,24 @@ buildPythonPackage { ]; dependencies = [ + filelock future + jinja2 + networkx numpy pyyaml requests setuptools - typing-extensions sympy - jinja2 - networkx - filelock - ] ++ lib.optionals (stdenv.isLinux && stdenv.isx86_64) [ triton ]; + typing-extensions + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [ triton ]; postInstall = '' # ONNX conversion rm -rf $out/bin ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' addAutoPatchelfSearchPath "$out/${python.sitePackages}/torch/lib" ''; @@ -105,7 +112,7 @@ buildPythonPackage { extraRunpaths = lib.optionals stdenv.hostPlatform.isLinux [ "${lib.getLib cudaPackages.cuda_nvrtc}/lib" ]; - postPhases = lib.optionals stdenv.isLinux [ "postPatchelfPhase" ]; + postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "postPatchelfPhase" ]; postPatchelfPhase = '' while IFS= read -r -d $'\0' elf ; do for extra in $extraRunpaths ; do diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/binary-hashes.nix index 8a2cbc2ffa9c..cd936d54ad72 100644 --- a/pkgs/development/python-modules/torch/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/binary-hashes.nix @@ -7,81 +7,66 @@ version: builtins.getAttr version { - "2.4.0" = { - x86_64-linux-38 = { - name = "torch-2.4.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-ikebcXQK+SpOG5kEW+qDHz2nMYfIw+PSErHm/jkxWyE="; - }; + "2.5.1" = { x86_64-linux-39 = { - name = "torch-2.4.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-iIObriuWfdOFeaqwu6lRDpKxHau8Th3V5jDF/WVfXac="; + name = "torch-2.5.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torch-2.5.1%2Bcu124-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-1oG4vj/cLNQREjENs8OQT3xqCaeuKNBCrgrzrwHI/No="; }; x86_64-linux-310 = { - name = "torch-2.4.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-KL+6CE3KUqBsRl160PPMNyw1/FA/PquIHMF6X9gpFOc="; + name = "torch-2.5.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torch-2.5.1%2Bcu124-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-nd4w85nKIhN0Vcyk1HFA37f0F24tFqlyn8BE7r+tsTo="; }; x86_64-linux-311 = { - name = "torch-2.4.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-qf/zLTZeDHS2kJSAVIsuKRMUogStsptrtvLG0z+L4mw="; + name = "torch-2.5.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torch-2.5.1%2Bcu124-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-aylm7emv/i/WngdlaRynI+yHDgw0x3YfTVuOMYOD/a8="; }; x86_64-linux-312 = { - name = "torch-2.4.0-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.4.0%2Bcu121-cp312-cp312-linux_x86_64.whl"; - hash = "sha256-SaxVpkl93W0M3VG16ifY6+IMknMHeFXpyW6w3CifB8M="; - }; - aarch64-darwin-38 = { - name = "torch-2.4.0-cp38-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp38-none-macosx_11_0_arm64.whl"; - hash = "sha256-OvTeKmGPsGXnhATEuieoGKe3lX6u/yjGxmzn+1BLaLg="; + name = "torch-2.5.1-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torch-2.5.1%2Bcu124-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-v2SEv+W8T5KkoaG/VTBBUF4ZqRH3FwZTMOsGGv4OFNc="; }; aarch64-darwin-39 = { - name = "torch-2.4.0-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-iUD8i5ekxh/bXUajaPIfSjpWKheHnpMutRpexiMQyzE="; + name = "torch-2.5.1-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-gEZ2i39tNbhdEBtLOMuoqi881RlSvEwGpJWA8s5oIpE="; }; aarch64-darwin-310 = { - name = "torch-2.4.0-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-aFQYq5NzDvvucVKIIf9UAFWWlw3Ul78DyJIE+34/cd4="; + name = "torch-2.5.1-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-I9Biv3B3aj0E2+dNuVDbKlJF4bpPJyCKh/DXQ7DQboY="; }; aarch64-darwin-311 = { - name = "torch-2.4.0-cp311-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp311-none-macosx_11_0_arm64.whl"; - hash = "sha256-8Wm06m3JOzozMZYR/MR9wUBuTdU5hE3L0t7EwbluFm0="; + name = "torch-2.5.1-cp311-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp311-none-macosx_11_0_arm64.whl"; + hash = "sha256-MfjDlmCWL5rk7uyZXjBJtUkutzYN1PBzd2WO9Nco+kw="; }; aarch64-darwin-312 = { - name = "torch-2.4.0-cp312-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp312-none-macosx_11_0_arm64.whl"; - hash = "sha256-karwC/4f+kTcW1KAnZqVEp/KECEuyjrCZCDrEXJ8Yog="; - }; - aarch64-linux-38 = { - name = "torch-2.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-nrqD+Kj5hUL5F+OQAMkD8VRlWs9jdcBzz81DBqFU64A="; + name = "torch-2.5.1-cp312-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp312-none-macosx_11_0_arm64.whl"; + hash = "sha256-jHEt9hEBlk6xGRCoRlFAEfC29ZIMVdv1Z7/4o0Fj1bE="; }; aarch64-linux-39 = { - name = "torch-2.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-J4akfI2N7BdvxnnSqrmm9UnCVFJRC0llCrE0E1JmujM="; + name = "torch-2.5.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-x09z2hefp+qiFnqwtJPyZ65IGmwAckniZ0y9C69KXME="; }; aarch64-linux-310 = { - name = "torch-2.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-fBWeidTs8IQD+dE3PVVEIiQLmxFGoKGRKQadw1enKys="; + name = "torch-2.5.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-JpsQw0Qwqo6WQ9vgNdxSXEqbHWcc09vI7Lyu0oCuMi0="; }; aarch64-linux-311 = { - name = "torch-2.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-OBacsPHmcnw9rI2si5pI0HKkn2Q7kIqZFV7x2Bthves="; + name = "torch-2.5.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-1bMgPxkbxAeDyZSI0ud23Pk6xDGllJHWJ6HKWzriCyI="; }; aarch64-linux-312 = { - name = "torch-2.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-7IY1E1C716vqNDb6b0Iws7C793oibkS6RhhA4gT8zXE="; + name = "torch-2.5.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.5.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-NtG+mSgbb2Atljm9CvPuAAbnqrFvZxjYb3CdOVtvJiw="; }; }; } diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index bd6b1b262837..578976fbb189 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -35,12 +35,10 @@ removeReferencesTo, # Build inputs + apple-sdk_13, numactl, - Accelerate, - CoreServices, - libobjc, - # Propagated build inputs + # dependencies astunparse, fsspec, filelock, @@ -53,16 +51,27 @@ click, typing-extensions, # ROCm build and `torch.compile` requires `triton` - tritonSupport ? (!stdenv.isDarwin), + tritonSupport ? (!stdenv.hostPlatform.isDarwin), triton, + # TODO: 1. callPackage needs to learn to distinguish between the task + # of "asking for an attribute from the parent scope" and + # the task of "exposing a formal parameter in .override". + # TODO: 2. We should probably abandon attributes such as `torchWithCuda` (etc.) + # as they routinely end up consuming the wrong arguments\ + # (dependencies without cuda support). + # Instead we should rely on overlays and nixpkgsFun. + # (@SomeoneSerge) + _tritonEffective ? if cudaSupport then triton-cuda else triton, + triton-cuda, + # Unit tests hypothesis, psutil, # Disable MKLDNN on aarch64-darwin, it negatively impacts performance, # this is also what official pytorch build does - mklDnnSupport ? !(stdenv.isDarwin && stdenv.isAarch64), + mklDnnSupport ? !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64), # virtual pkg that consistently instantiates blas across nixpkgs # See https://github.com/NixOS/nixpkgs/pull/83888 @@ -78,8 +87,6 @@ tensorboard, protobuf, - pythonOlder, - # ROCm dependencies rocmSupport ? config.rocmSupport, rocmPackages_5, @@ -95,6 +102,8 @@ let ; inherit (cudaPackages) cudaFlags cudnn nccl; + triton = throw "python3Packages.torch: use _tritonEffective instead of triton to avoid divergence"; + rocmPackages = rocmPackages_5; setBool = v: if v then "1" else "0"; @@ -193,7 +202,7 @@ let brokenConditions = attrsets.filterAttrs (_: cond: cond) { "CUDA and ROCm are mutually exclusive" = cudaSupport && rocmSupport; - "CUDA is not targeting Linux" = cudaSupport && !stdenv.isLinux; + "CUDA is not targeting Linux" = cudaSupport && !stdenv.hostPlatform.isLinux; "Unsupported CUDA version" = cudaSupport && !(builtins.elem cudaPackages.cudaMajorVersion [ @@ -214,11 +223,9 @@ in buildPythonPackage rec { pname = "torch"; # Don't forget to update torch-bin to the same version. - version = "2.4.0"; + version = "2.5.1"; pyproject = true; - disabled = pythonOlder "3.8.0"; - outputs = [ "out" # output standard python package "dev" # output libtorch headers @@ -232,17 +239,12 @@ buildPythonPackage rec { repo = "pytorch"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-s49rtarGNNFpnNG+kfJtZLE8ND53Ma201I0cOjeFSts="; + hash = "sha256-17lgAcqJN+vir+Zvffy5cXRmNjd5Y80ev8b8pOj9F+g="; }; patches = - [ - # Allow setting PYTHON_LIB_REL_PATH with an environment variable. - # https://github.com/pytorch/pytorch/pull/128419 - ./passthrough-python-lib-rel-path.patch - ] - ++ lib.optionals cudaSupport [ ./fix-cmake-cuda-toolkit.patch ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + lib.optionals cudaSupport [ ./fix-cmake-cuda-toolkit.patch ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # pthreadpool added support for Grand Central Dispatch in April # 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO) # that is available starting with macOS 10.13. However, our current @@ -250,14 +252,25 @@ buildPythonPackage rec { # pthread support. ./pthreadpool-disable-gcd.diff ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ # Propagate CUPTI to Kineto by overriding the search path with environment variables. # https://github.com/pytorch/pytorch/pull/108847 ./pytorch-pr-108847.patch ]; postPatch = - lib.optionalString rocmSupport '' + '' + substituteInPlace cmake/public/cuda.cmake \ + --replace-fail \ + 'message(FATAL_ERROR "Found two conflicting CUDA' \ + 'message(WARNING "Found two conflicting CUDA' \ + --replace-warn \ + "set(CUDAToolkit_ROOT" \ + "# Upstream: set(CUDAToolkit_ROOT" + substituteInPlace third_party/gloo/cmake/Cuda.cmake \ + --replace-warn "find_package(CUDAToolkit 7.0" "find_package(CUDAToolkit" + '' + + lib.optionalString rocmSupport '' # https://github.com/facebookincubator/gloo/pull/297 substituteInPlace third_party/gloo/cmake/Hipify.cmake \ --replace "\''${HIPIFY_COMMAND}" "python \''${HIPIFY_COMMAND}" @@ -296,7 +309,8 @@ buildPythonPackage rec { # error: no member named 'aligned_alloc' in the global namespace; did you mean simply 'aligned_alloc' # This lib overrided aligned_alloc hence the error message. Tltr: his function is linkable but not in header. + - lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") + lib.optionalString + (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") '' substituteInPlace third_party/pocketfft/pocketfft_hdronly.h --replace-fail '#if (__cplusplus >= 201703L) && (!defined(__MINGW32__)) && (!defined(_MSC_VER)) inline void *aligned_alloc(size_t align, size_t size)' '#if 0 @@ -350,6 +364,20 @@ buildPythonPackage rec { # NB technical debt: building without NNPACK as workaround for missing `six` USE_NNPACK = 0; + # Explicitly enable MPS for Darwin + USE_MPS = setBool stdenv.hostPlatform.isDarwin; + + cmakeFlags = + [ + # (lib.cmakeBool "CMAKE_FIND_DEBUG_MODE" true) + (lib.cmakeFeature "CUDAToolkit_VERSION" cudaPackages.cudaVersion) + ] + ++ lib.optionals cudaSupport [ + # Unbreaks version discovery in enable_language(CUDA) when wrapping nvcc with ccache + # Cf. https://gitlab.kitware.com/cmake/cmake/-/issues/26363 + (lib.cmakeFeature "CMAKE_CUDA_COMPILER_TOOLKIT_VERSION" cudaPackages.cudaVersion) + ]; + preBuild = '' export MAX_JOBS=$NIX_BUILD_CORES ${python.pythonOnBuildForHost.interpreter} setup.py build --cmake-only @@ -468,7 +496,7 @@ buildPythonPackage rec { cuda_cccl # <thrust/*> cuda_cudart # cuda_runtime.h and libraries cuda_cupti # For kineto - cuda_nvcc # crt/host_config.h; even though we include this in nativeBuildinputs, it's needed here too + cuda_nvcc # crt/host_config.h; even though we include this in nativeBuildInputs, it's needed here too cuda_nvml_dev # <nvml.h> cuda_nvrtc cuda_nvtx # -llibNVToolsExt @@ -492,16 +520,17 @@ buildPythonPackage rec { ) ++ lib.optionals rocmSupport [ rocmPackages.llvm.openmp ] ++ lib.optionals (cudaSupport || rocmSupport) [ effectiveMagma ] - ++ lib.optionals stdenv.isLinux [ numactl ] - ++ lib.optionals stdenv.isDarwin [ - Accelerate - CoreServices - libobjc + ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_13 ] - ++ lib.optionals tritonSupport [ triton ] + ++ lib.optionals tritonSupport [ _tritonEffective ] ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; + pythonRelaxDeps = [ + "sympy" + ]; dependencies = [ astunparse cffi @@ -526,7 +555,7 @@ buildPythonPackage rec { # torch/csrc requires `pybind11` at runtime pybind11 - ] ++ lib.optionals tritonSupport [ triton ]; + ] ++ lib.optionals tritonSupport [ _tritonEffective ]; propagatedCxxBuildInputs = [ ] ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; @@ -600,7 +629,7 @@ buildPythonPackage rec { mkdir -p "$cxxdev/nix-support" printWords "''${propagatedCxxBuildInputs[@]}" >> "$cxxdev/nix-support/propagated-build-inputs" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' for f in $(ls $lib/lib/*.dylib); do install_name_tool -id $lib/lib/$(basename $f) $f || true done @@ -620,7 +649,7 @@ buildPythonPackage rec { # This is a quick hack to add `libnvrtc` to the runpath so that torch can find # it when it is needed at runtime. extraRunpaths = lib.optionals cudaSupport [ "${lib.getLib cudaPackages.cuda_nvrtc}/lib" ]; - postPhases = lib.optionals stdenv.isLinux [ "postPatchelfPhase" ]; + postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "postPatchelfPhase" ]; postPatchelfPhase = '' while IFS= read -r -d $'\0' elf ; do for extra in $extraRunpaths ; do @@ -661,7 +690,9 @@ buildPythonPackage rec { thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds - platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport && !rocmSupport) darwin; + platforms = + lib.platforms.linux + ++ lib.optionals (!cudaSupport && !rocmSupport) lib.platforms.darwin; broken = builtins.any trivial.id (builtins.attrValues brokenConditions); }; } diff --git a/pkgs/development/python-modules/torch/passthrough-python-lib-rel-path.patch b/pkgs/development/python-modules/torch/passthrough-python-lib-rel-path.patch deleted file mode 100644 index 629a0495c00e..000000000000 --- a/pkgs/development/python-modules/torch/passthrough-python-lib-rel-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py -index 5481ce46031c..d50d9d547399 100644 ---- a/tools/setup_helpers/cmake.py -+++ b/tools/setup_helpers/cmake.py -@@ -231,6 +231,7 @@ def generate( - "SELECTED_OP_LIST", - "TORCH_CUDA_ARCH_LIST", - "TRACING_BASED", -+ "PYTHON_LIB_REL_PATH", - ) - } - ) diff --git a/pkgs/development/python-modules/torch/prefetch.sh b/pkgs/development/python-modules/torch/prefetch.sh index 88cbfa2c346e..712edbddb52e 100755 --- a/pkgs/development/python-modules/torch/prefetch.sh +++ b/pkgs/development/python-modules/torch/prefetch.sh @@ -5,23 +5,20 @@ set -eou pipefail version=$1 -linux_cuda_version="cu121" +linux_cuda_version="cu124" linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" linux_cpu_bucket="https://download.pytorch.org/whl/cpu" darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-38 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl" "x86_64-linux-39 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" "x86_64-linux-310 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-linux-311 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torch-${version}-cp311-cp311-linux_x86_64.whl" "x86_64-linux-312 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp312-cp312-linux_x86_64.whl torch-${version}-cp312-cp312-linux_x86_64.whl" - "aarch64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_11_0_arm64.whl torch-${version}-cp38-none-macosx_11_0_arm64.whl" "aarch64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_11_0_arm64.whl torch-${version}-cp39-none-macosx_11_0_arm64.whl" "aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl" "aarch64-darwin-311 $darwin_bucket/torch-${version}-cp311-none-macosx_11_0_arm64.whl torch-${version}-cp311-none-macosx_11_0_arm64.whl" "aarch64-darwin-312 $darwin_bucket/torch-${version}-cp312-none-macosx_11_0_arm64.whl torch-${version}-cp312-none-macosx_11_0_arm64.whl" - "aarch64-linux-38 $linux_cpu_bucket/torch-${version}-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux-39 $linux_cpu_bucket/torch-${version}-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux-310 $linux_cpu_bucket/torch-${version}-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux-311 $linux_cpu_bucket/torch-${version}-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" @@ -37,7 +34,7 @@ for url_and_key in "${url_and_key_list[@]}"; do name=$(echo "$url_and_key" | cut -d' ' -f3) echo "prefetching ${url}..." - hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`) + hash=$(nix hash convert --hash-algo sha256 `nix-prefetch-url "$url" --name "$name"`) echo " $key = {" >> $hashfile echo " name = \"$name\";" >> $hashfile diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index 31b119a26406..297be21cf59d 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -1,22 +1,28 @@ { lib, stdenv, - addDriverRunpath, - autoPatchelfHook, buildPythonPackage, - cudaPackages, + python, fetchurl, + pythonOlder, + pythonAtLeast, + + # buildInputs + cudaPackages, ffmpeg_6, sox, - pythonAtLeast, - pythonOlder, - python, + + # nativeBuildInputs + addDriverRunpath, + autoPatchelfHook, + + # dependencies torch-bin, }: buildPythonPackage rec { pname = "torchaudio"; - version = "2.4.0"; + version = "2.5.1"; format = "wheel"; src = @@ -27,7 +33,7 @@ buildPythonPackage rec { in fetchurl srcs; - disabled = (pythonOlder "3.8") || (pythonAtLeast "3.13"); + disabled = (pythonOlder "3.9") || (pythonAtLeast "3.13"); buildInputs = [ @@ -35,7 +41,7 @@ buildPythonPackage rec { ffmpeg_6.dev sox ] - ++ lib.optionals stdenv.isLinux ( + ++ lib.optionals stdenv.hostPlatform.isLinux ( with cudaPackages; [ # $out/${sitePackages}/torchaudio/lib/libtorchaudio*.so wants libcudart.so.11.0 but torch/lib only ships @@ -48,14 +54,14 @@ buildPythonPackage rec { ] ); - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook addDriverRunpath ]; dependencies = [ torch-bin ]; - preInstall = lib.optionals stdenv.isLinux '' + preInstall = lib.optionals stdenv.hostPlatform.isLinux '' addAutoPatchelfSearchPath "${torch-bin}/${python.sitePackages}/torch" ''; diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index 53004bc2c0b9..7ae70136b171 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -7,81 +7,66 @@ version: builtins.getAttr version { - "2.4.0" = { - x86_64-linux-38 = { - name = "torchaudio-2.4.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-HbbFZ4nETaygQRxSMYg6d3Omqxbx6uSrXrUzRt71RTw="; - }; + "2.5.1" = { x86_64-linux-39 = { - name = "torchaudio-2.4.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-5wG1xXOR9ApLTdWQtt8eGt+83GwT6zfEW+Kay4pz5vQ="; + name = "torchaudio-2.5.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.1%2Bcu124-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-rHPCnEhWhGO+vGC0srILAdLt3bH1E15mFT8a+F458/0="; }; x86_64-linux-310 = { - name = "torchaudio-2.4.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-R+F2Pr3UEID6Otlv9OTyKHgxz6jd51IzrRMpxhOr2lA="; + name = "torchaudio-2.5.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.1%2Bcu124-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-CXWT7fMvCoRQq6eCK4CX0vJHb+lsCrmTMdEsNHADGAs="; }; x86_64-linux-311 = { - name = "torchaudio-2.4.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-KcjEOkm0MDZnvyDNhcP26borSg+0tqrsLgKzstbMbOo="; + name = "torchaudio-2.5.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.1%2Bcu124-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-6Yk43MROuquL2DeVRXhM/d/COuF3hziUSLf/mRjcPfk="; }; x86_64-linux-312 = { - name = "torchaudio-2.4.0-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.0%2Bcu121-cp312-cp312-linux_x86_64.whl"; - hash = "sha256-gTwbojelvYBZo0BOav9xtc09SXmtCV3PreFZJoCFUDE="; - }; - aarch64-darwin-38 = { - name = "torchaudio-2.4.0-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-/D+OzW8Lv8ZU07xSdWp8o1nx2ItPoCkOHNt2OjExt7k="; + name = "torchaudio-2.5.1-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchaudio-2.5.1%2Bcu124-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-mQJZjgMwrurQvBVFg3gE6yaFSbm0zkGuPKUbI4SQTok="; }; aarch64-darwin-39 = { - name = "torchaudio-2.4.0-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-H9ZwyAjjIsEBlXoHZR4pk1+G7DiSQ8DEOiTt16GFSEE="; + name = "torchaudio-2.5.1-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-pAoOSyOFZKGb8TjGTVk8e1LZfIc3hD2F1soJIWJBrmY="; }; aarch64-darwin-310 = { - name = "torchaudio-2.4.0-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-cz6dhZuI2r7+rwCOOrK4x4hbKUZgaLS3mkJ2a+RhnkY="; + name = "torchaudio-2.5.1-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-kBKR13Cu6x9Rkgu1qnP/gum38mNUo8e5DYD/C06aUEQ="; }; aarch64-darwin-311 = { - name = "torchaudio-2.4.0-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-rLz5Ep/8/OgIJU4sv/EDNjxQXOBu1MQjGz9DahBnnU0="; + name = "torchaudio-2.5.1-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-cAU1Sqfdqe+QjhPCVm7h/gvW1/W64Fg7XlMBbNIp/DQ="; }; aarch64-darwin-312 = { - name = "torchaudio-2.4.0-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-rhOpXvb6vK2w7/NthfUEjXBHSi6XBPqchumQPLzsDUo="; - }; - aarch64-linux-38 = { - name = "torchaudio-2.4.0-cp38-cp38-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp38-cp38-linux_aarch64.whl"; - hash = "sha256-1/6efy/oJQ/eB7IDVsRNdw1fqjyid6vc2jr31IQEj7o="; + name = "torchaudio-2.5.1-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-8cv9/Ru9++conUenTzb/bF2HwyBWBiAv71p/tpP2HPA="; }; aarch64-linux-39 = { - name = "torchaudio-2.4.0-cp39-cp39-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp39-cp39-linux_aarch64.whl"; - hash = "sha256-yECJTeEqbdPqV8uw0AhhI6qkgAG6Otme9xT+AJ6ujrk="; + name = "torchaudio-2.5.1-cp39-cp39-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp39-cp39-linux_aarch64.whl"; + hash = "sha256-0pNJlElV6wYed0/k2e6kaBxbyf9C6jmod/jxTeHk7QA="; }; aarch64-linux-310 = { - name = "torchaudio-2.4.0-cp310-cp310-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp310-cp310-linux_aarch64.whl"; - hash = "sha256-F8tz1DNncdRVzY3ai0iRMHpTRriQpOax1Lc9VlJY/uE="; + name = "torchaudio-2.5.1-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp310-cp310-linux_aarch64.whl"; + hash = "sha256-mzhyxd1QgL5jIpCNYjZVgaHdklDj3W1HurP1sIVKXR8="; }; aarch64-linux-311 = { - name = "torchaudio-2.4.0-cp311-cp311-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp311-cp311-linux_aarch64.whl"; - hash = "sha256-vpacCUZts14Nebiwnf9myu27lWm0LJA6LV4Nsq92Djw="; + name = "torchaudio-2.5.1-cp311-cp311-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp311-cp311-linux_aarch64.whl"; + hash = "sha256-S6JHaacr1oaQP+rxBAyJXXEK8v+80l7nqXlO4oVWGyY="; }; aarch64-linux-312 = { - name = "torchaudio-2.4.0-cp312-cp312-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp312-cp312-linux_aarch64.whl"; - hash = "sha256-U00ZB7slLs0rqeHWHP9yIP1mCQ5j33s8EJzqd6GdTLg="; + name = "torchaudio-2.5.1-cp312-cp312-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.5.1-cp312-cp312-linux_aarch64.whl"; + hash = "sha256-a7ZUFkBfQOALIHASV8FudJO/3XGI4C6HzFs4nDHBDCw="; }; }; } diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix index f736036b1350..ea07d68df4b7 100644 --- a/pkgs/development/python-modules/torchaudio/default.nix +++ b/pkgs/development/python-modules/torchaudio/default.nix @@ -1,12 +1,16 @@ { lib, + symlinkJoin, buildPythonPackage, fetchFromGitHub, + + # nativeBuildInputs cmake, - symlinkJoin, - ffmpeg-full, pkg-config, ninja, + + # buildInputs + ffmpeg_6-full, pybind11, sox, torch, @@ -72,14 +76,14 @@ let in buildPythonPackage rec { pname = "torchaudio"; - version = "2.4.0"; + version = "2.5.1"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "audio"; rev = "refs/tags/v${version}"; - hash = "sha256-ltBPoFDA7GS9XRHyWeTRn1YTVqdaE/38KnkG4fp7Th8="; + hash = "sha256-BRn4EZ7bIujGA6b/tdMu9yDqJNEaf/f1Kj45aLHC/JI="; }; patches = [ ./0001-setup.py-propagate-cmakeFlags.patch ]; @@ -104,9 +108,9 @@ buildPythonPackage rec { FFMPEG_ROOT = symlinkJoin { name = "ffmpeg"; paths = [ - ffmpeg-full.bin - ffmpeg-full.dev - ffmpeg-full.lib + ffmpeg_6-full.bin + ffmpeg_6-full.dev + ffmpeg_6-full.lib ]; }; @@ -127,7 +131,7 @@ buildPythonPackage rec { ); buildInputs = [ - ffmpeg-full + ffmpeg_6-full pybind11 sox torch.cxxdev diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh index e4a9b9c90f6c..64b5011773b1 100755 --- a/pkgs/development/python-modules/torchaudio/prefetch.sh +++ b/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -5,23 +5,20 @@ set -eou pipefail version=$1 -linux_cuda_version="cu121" +linux_cuda_version="cu124" linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" linux_cpu_bucket="https://download.pytorch.org/whl/cpu" darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-38 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" "x86_64-linux-39 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" "x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-linux-311 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchaudio-${version}-cp311-cp311-linux_x86_64.whl" "x86_64-linux-312 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp312-cp312-linux_x86_64.whl torchaudio-${version}-cp312-cp312-linux_x86_64.whl" - "aarch64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl" "aarch64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl" "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl" "aarch64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl" "aarch64-darwin-312 $darwin_bucket/torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl" - "aarch64-linux-38 $linux_cpu_bucket/torchaudio-${version}-cp38-cp38-linux_aarch64.whl torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl" "aarch64-linux-39 $linux_cpu_bucket/torchaudio-${version}-cp39-cp39-linux_aarch64.whl torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl" "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-linux_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl" "aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-linux_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl" @@ -37,7 +34,7 @@ for url_and_key in "${url_and_key_list[@]}"; do name=$(echo "$url_and_key" | cut -d' ' -f3) echo "prefetching ${url}..." - hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url "$url" --name "$name")) + hash=$(nix hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) echo " $key = {" >>$hashfile echo " name = \"$name\";" >>$hashfile diff --git a/pkgs/development/python-modules/torchbench/default.nix b/pkgs/development/python-modules/torchbench/default.nix new file mode 100644 index 000000000000..3593ae792130 --- /dev/null +++ b/pkgs/development/python-modules/torchbench/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + numpy, + opencv4, + sotabenchapi, + torch, + torchvision, + tqdm, +}: + +let + version = "0.0.31"; + pname = "torchbench"; +in +buildPythonPackage { + inherit pname version; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-EBZzcnRT50KREIOPrr/OZTJ4639ZUEejcelh3QSBcZ8="; + }; + + # requirements.txt is missing in the Pypi archive and this makes the setup.py script fails + postPatch = '' + touch requirements.txt + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + numpy + opencv4 + sotabenchapi + torch + torchvision + tqdm + ]; + + pythonImportsCheck = [ + "torchbench" + ]; + + # No tests + doCheck = false; + + meta = { + description = "Easily benchmark machine learning models in PyTorch"; + homepage = "https://github.com/paperswithcode/torchbench"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix index c0aae74f178f..3fbfe404febc 100644 --- a/pkgs/development/python-modules/torchio/default.nix +++ b/pkgs/development/python-modules/torchio/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { # tries to download models: "test_load_all" ] - ++ lib.optionals stdenv.isAarch64 [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly "test_queue_multiprocessing" ]; diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index cf08a09e552a..52f905878ae0 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -12,7 +12,7 @@ # buildInputs torch, - # checks + # tests cloudpickle, psutil, pytestCheckHook, @@ -28,7 +28,7 @@ let pname = "torchmetrics"; - version = "1.4.2"; + version = "1.4.3"; in buildPythonPackage { inherit pname version; @@ -38,7 +38,7 @@ buildPythonPackage { owner = "Lightning-AI"; repo = "torchmetrics"; rev = "refs/tags/v${version}"; - hash = "sha256-YieIz99QFnuW3hTtNFgxhkNnSXGsTG2qqYhRCyvZo7Q="; + hash = "sha256-527cHPFdFw/JajHe7Kkz7+zl4EfePaLx77I2OTjjxaA="; }; dependencies = [ diff --git a/pkgs/development/python-modules/torchprofile/default.nix b/pkgs/development/python-modules/torchprofile/default.nix new file mode 100644 index 000000000000..a040283e9b14 --- /dev/null +++ b/pkgs/development/python-modules/torchprofile/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + numpy, + torch, + torchvision, +}: + +buildPythonPackage rec { + pname = "torchprofile"; + version = "0.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "zhijian-liu"; + repo = "torchprofile"; + rev = "refs/tags/v${version}"; + hash = "sha256-6vxZHQwBjKpy288wcANdJ9gmvIOZloLv+iN76TtqYAI="; + }; + + build-system = [ + setuptools + ]; + + pythonRelaxDeps = [ + "torchvision" + ]; + + dependencies = [ + numpy + torch + torchvision + ]; + + pythonImportsCheck = [ + "torchprofile" + ]; + + meta = { + changelog = "https://github.com/zhijian-liu/torchprofile/releases/tag/v${version}"; + description = "General and accurate MACs / FLOPs profiler for PyTorch models"; + homepage = "https://github.com/zhijian-liu/torchprofile"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix index 3023380920c7..990e4df76be4 100644 --- a/pkgs/development/python-modules/torchrl/default.nix +++ b/pkgs/development/python-modules/torchrl/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -44,8 +43,6 @@ pytestCheckHook, pyyaml, scipy, - - stdenv, }: buildPythonPackage rec { @@ -53,8 +50,6 @@ buildPythonPackage rec { version = "0.5.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "pytorch"; repo = "rl"; @@ -138,6 +133,11 @@ buildPythonPackage rec { ++ optional-dependencies.rendering; disabledTests = [ + # torchrl is incompatible with gymnasium>=1.0 + # https://github.com/pytorch/rl/discussions/2483 + "test_resetting_strategies" + "test_torchrl_to_gym" + # mujoco.FatalError: an OpenGL platform library has not been loaded into this process, this most likely means that a valid OpenGL context has not been created before mjr_makeContext was called "test_vecenvs_env" @@ -175,6 +175,5 @@ buildPythonPackage rec { changelog = "https://github.com/pytorch/rl/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; - # ~3k tests fail with: RuntimeError: internal error }; } diff --git a/pkgs/development/python-modules/torchsnapshot/default.nix b/pkgs/development/python-modules/torchsnapshot/default.nix index dc1e66156a7e..c28ce3f55e71 100644 --- a/pkgs/development/python-modules/torchsnapshot/default.nix +++ b/pkgs/development/python-modules/torchsnapshot/default.nix @@ -66,6 +66,6 @@ buildPythonPackage rec { # https://github.com/pytorch/torchsnapshot/issues/175 pythonAtLeast "3.12" # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package - || stdenv.isDarwin; + || stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index 27dd914d7700..68b48711de37 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -1,15 +1,21 @@ { lib, stdenv, - addDriverRunpath, - autoPatchelfHook, + python, buildPythonPackage, - cudaPackages, fetchurl, - pythonAtLeast, pythonOlder, + pythonAtLeast, + + # buildInputs + cudaPackages, + + # nativeBuildInputs + addDriverRunpath, + autoPatchelfHook, + + # dependencies pillow, - python, torch-bin, }: @@ -17,7 +23,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.19.0"; + version = "0.20.1"; in buildPythonPackage { inherit version; @@ -28,20 +34,20 @@ buildPythonPackage { src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; - disabled = (pythonOlder "3.8") || (pythonAtLeast "3.13"); + disabled = (pythonOlder "3.9") || (pythonAtLeast "3.13"); # Note that we don't rely on config.cudaSupport here, because the Linux wheels all come built with CUDA support. buildInputs = with cudaPackages; - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ # $out/${sitePackages}/torchvision/_C.so wants libcudart.so.11.0 but torchvision.libs only ships # libcudart.$hash.so.11.0 cuda_cudart ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ - autoPatchelfHook + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ addDriverRunpath + autoPatchelfHook ]; dependencies = [ @@ -54,7 +60,7 @@ buildPythonPackage { pythonImportsCheck = [ "torchvision" ]; - preInstall = lib.optionalString stdenv.isLinux '' + preInstall = lib.optionalString stdenv.hostPlatform.isLinux '' addAutoPatchelfSearchPath "${torch-bin}/${python.sitePackages}/torch" ''; diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index 177a3ae30a99..ae7b3b798517 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -7,81 +7,66 @@ version: builtins.getAttr version { - "0.19.0" = { - x86_64-linux-38 = { - name = "torchvision-0.19.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-5GynSUL5Of12jXr29wqhfAciLKj6abBXtAi05u29bys="; - }; + "0.20.1" = { x86_64-linux-39 = { - name = "torchvision-0.19.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-R2KGR72zWQyauWXvtwhTMA1eHGh1lRHumUpvH5fywSM="; + name = "torchvision-0.20.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.1%2Bcu124-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-C/Tizgi8dJVzTcVAlTxlmQ5C67fJ7Sfi/3lRVLrvXMA="; }; x86_64-linux-310 = { - name = "torchvision-0.19.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-XuEDx+tH+LCIN+DkixePfsyR12nSthJAuQy1qi0Gznc="; + name = "torchvision-0.20.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.1%2Bcu124-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-OgVeTpBAsSmHjVfDnbVfEX+XWJn/MN1wyPJiHZEXDb4="; }; x86_64-linux-311 = { - name = "torchvision-0.19.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-NpTVJ7SPribGrEpDWWC4tXk9YcXxQgtr77lLM8mm/Ng="; + name = "torchvision-0.20.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.1%2Bcu124-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-pffrXvIvNKfRj8vCe2wB993lzVMN8xHNvdMRafkcvZg="; }; x86_64-linux-312 = { - name = "torchvision-0.19.0-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.0%2Bcu121-cp312-cp312-linux_x86_64.whl"; - hash = "sha256-9M7FuSc1N6VG5V6eCI++01kM+2kn+IFX1K/s7iPBJek="; - }; - aarch64-darwin-38 = { - name = "torchvision-0.19.0-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-hU6WehapQJ6UG1u+WqNXsj9xWLzLneNa4g/UlF8F7NE="; + name = "torchvision-0.20.1-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu124/torchvision-0.20.1%2Bcu124-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-0QU+xQVFSefawmE7FRv/4yPzySSTnSlt9NfTSSWq860="; }; aarch64-darwin-39 = { - name = "torchvision-0.19.0-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-3RJ5Vx1LaNWlPZt6Na7fkcTLHgsICZ9qHv+nsluMlec="; + name = "torchvision-0.20.1-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-LNWEBpeLgTGIz06RNbIYd1tX4LuG1KiPAzmHS4oiSBk="; }; aarch64-darwin-310 = { - name = "torchvision-0.19.0-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-7IdO+F3LJMaeYA9uJ2r4ksgM3j/9rrcnXv2kYyQrwqg="; + name = "torchvision-0.20.1-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-SHj++5bvKT0GwnIQkYrcg8OZ2fqvNM2lpj4Sn3cjKPE="; }; aarch64-darwin-311 = { - name = "torchvision-0.19.0-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-2/OqcaOJkkT8iEMD7TxGBKFggk/vrHfoIxelRj78HZs="; + name = "torchvision-0.20.1-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-NEsznhXmu7We4HAHcmFtCv79IJkgx2KxYENo2MNFgyI="; }; aarch64-darwin-312 = { - name = "torchvision-0.19.0-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-wJ747RhPqHf2JRtiAibnT2grjx1rNBRWQo1JVbjZxnA="; - }; - aarch64-linux-38 = { - name = "torchvision-0.19.0-cp38-cp38-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp38-cp38-linux_aarch64.whl"; - hash = "sha256-B5ppbgsstS5L4wr6jps9fSgPAqK1/+3X6CH6Hv0aWo0="; + name = "torchvision-0.20.1-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-GjElb/lF1k8Aa7MGgTp8laUx/ha/slNcg33UwQRTPXo="; }; aarch64-linux-39 = { - name = "torchvision-0.19.0-cp39-cp39-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp39-cp39-linux_aarch64.whl"; - hash = "sha256-X5pZjc+CvfyORDbOdHY7OHfavsOzP5RhO5Tt4T4+Te4="; + name = "torchvision-0.20.1-cp39-cp39-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp39-cp39-linux_aarch64.whl"; + hash = "sha256-q8uABd6Nw5Pb0TEOy2adxoq2ZLkQevbWmKY0HR0/LDw="; }; aarch64-linux-310 = { - name = "torchvision-0.19.0-cp310-cp310-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp310-cp310-linux_aarch64.whl"; - hash = "sha256-1GfUNABf0Foieiunr0xZG7Z+bUqXu9Bu2o2oP0Pp/Qc="; + name = "torchvision-0.20.1-cp310-cp310-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp310-cp310-linux_aarch64.whl"; + hash = "sha256-dfik1RpZPEurbJv311vdiGkbAKU7B2VmeLxVo6dT3XM="; }; aarch64-linux-311 = { - name = "torchvision-0.19.0-cp311-cp311-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp311-cp311-linux_aarch64.whl"; - hash = "sha256-Tmqk+j8Lw1mfoHHBSeZRo+a91nyRYXlEePn5FHHEBqI="; + name = "torchvision-0.20.1-cp311-cp311-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp311-cp311-linux_aarch64.whl"; + hash = "sha256-pA12Y0WSdjnaMixpOTTl+RsboiGIRscQS4aN6iMUzo4="; }; aarch64-linux-312 = { - name = "torchvision-0.19.0-cp312-cp312-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp312-cp312-linux_aarch64.whl"; - hash = "sha256-vg8noouOnyrpijGvNKS90qW/FU2SvXOleXyNIVb7OrY="; + name = "torchvision-0.20.1-cp312-cp312-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.20.1-cp312-cp312-linux_aarch64.whl"; + hash = "sha256-n4U7pEl6xGkYFa1BtSPuI89bpPh7HOhp1wQFLiM8qLc="; }; }; } diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index b25fdc2c4281..7ec3e7858b56 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -1,16 +1,24 @@ { + lib, + torch, buildPythonPackage, fetchFromGitHub, - lib, - libjpeg_turbo, + + # nativeBuildInputs libpng, ninja, + which, + + # buildInputs + libjpeg_turbo, + + # dependencies numpy, pillow, - pytest, scipy, - torch, - which, + + # tests + pytest, }: let @@ -18,7 +26,7 @@ let inherit (cudaPackages) backendStdenv; pname = "torchvision"; - version = "0.19.0"; + version = "0.20.1"; in buildPythonPackage { inherit pname version; @@ -27,7 +35,7 @@ buildPythonPackage { owner = "pytorch"; repo = "vision"; rev = "refs/tags/v${version}"; - hash = "sha256-OVwdEqKEoZR1jtcg4ODyvIZvP9UQPodPv8qnTqbA/pc="; + hash = "sha256-BXvi4LoO2LZtNSE8lvFzcN4H2nN2fRg5/s7KRci7rMM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh index 47ccbd935c8a..4e5acf3a7a67 100755 --- a/pkgs/development/python-modules/torchvision/prefetch.sh +++ b/pkgs/development/python-modules/torchvision/prefetch.sh @@ -5,22 +5,19 @@ set -eou pipefail version=$1 -linux_cuda_version="cu121" +linux_cuda_version="cu124" linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-38 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl" "x86_64-linux-39 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl" "x86_64-linux-310 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchvision-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-linux-311 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchvision-${version}-cp311-cp311-linux_x86_64.whl" "x86_64-linux-312 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp312-cp312-linux_x86_64.whl torchvision-${version}-cp312-cp312-linux_x86_64.whl" - "aarch64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl" "aarch64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl" "aarch64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl" "aarch64-darwin-311 $darwin_bucket/torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl" "aarch64-darwin-312 $darwin_bucket/torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl" - "aarch64-linux-38 $darwin_bucket/torchvision-${version}-cp38-cp38-linux_aarch64.whl torchvision-${version}-cp38-cp38-linux_aarch64.whl" "aarch64-linux-39 $darwin_bucket/torchvision-${version}-cp39-cp39-linux_aarch64.whl torchvision-${version}-cp39-cp39-linux_aarch64.whl" "aarch64-linux-310 $darwin_bucket/torchvision-${version}-cp310-cp310-linux_aarch64.whl torchvision-${version}-cp310-cp310-linux_aarch64.whl" "aarch64-linux-311 $darwin_bucket/torchvision-${version}-cp311-cp311-linux_aarch64.whl torchvision-${version}-cp311-cp311-linux_aarch64.whl" @@ -36,7 +33,7 @@ for url_and_key in "${url_and_key_list[@]}"; do name=$(echo "$url_and_key" | cut -d' ' -f3) echo "prefetching ${url}..." - hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`) + hash=$(nix hash convert --hash-algo sha256 `nix-prefetch-url "$url" --name "$name"`) echo " $key = {" >> $hashfile echo " name = \"$name\";" >> $hashfile diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 4c358cce9012..0d9997af8b3b 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "tox"; - version = "4.15.1"; + version = "4.18.1"; format = "pyproject"; src = fetchFromGitHub { owner = "tox-dev"; repo = "tox"; rev = "refs/tags/${version}"; - hash = "sha256-BLOxyvcC3ngQDVSMaw/NfLVbFkIHbTmhUOOVBqlcK/Q="; + hash = "sha256-p3pghGQwCBIvkFI6pYuzoGSwAwfaz4vKpteh8nhXOhE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index 60cf57c14f29..7edc33b88e5b 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-Dt1F7mCuRrzEk3NDVfxScSLrK0omHQFMWhYrrwc+Pq0="; + hash = "sha256-REzjeZs2Ddhw2TLD4Vp75XT2iLaxxzDK/F3UmrC1deo="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index 44e1b68a257c..fe5a361f9d8b 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -23,23 +23,20 @@ let in buildPythonPackage rec { pname = "tpm2-pytss"; - version = "2.2.1"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uPFUc0IvN39ZxyF9zRR5FlzOYt+jOTTsl2oni68unv4="; + hash = "sha256-IAcRKTeWVvXzw7wW02RhJnKxR9gRkftOufn/n77khBA="; }; patches = [ # Fix hardcoded `fapi-config.json` configuration path ./fapi-config.patch - # Backport for https://github.com/tpm2-software/tpm2-pytss/pull/576 - # This is likely to be dropped with the next major release (>= 2.3) - ./pr576-backport.patch ] ++ lib.optionals isCross [ # pytss will regenerate files from headers of tpm2-tss. @@ -81,8 +78,6 @@ buildPythonPackage rec { pyyaml ]; - doCheck = true; - nativeCheckInputs = [ pytestCheckHook tpm2-tools diff --git a/pkgs/development/python-modules/tpm2-pytss/pr576-backport.patch b/pkgs/development/python-modules/tpm2-pytss/pr576-backport.patch deleted file mode 100644 index ee04701f3931..000000000000 --- a/pkgs/development/python-modules/tpm2-pytss/pr576-backport.patch +++ /dev/null @@ -1,117 +0,0 @@ -Backport for https://github.com/tpm2-software/tpm2-pytss/pull/576 on 2.2.1 - -diff --git a/scripts/prepare_headers.py b/scripts/prepare_headers.py -index 6ca9b64..a7529b3 100644 ---- a/scripts/prepare_headers.py -+++ b/scripts/prepare_headers.py -@@ -32,6 +32,7 @@ def remove_common_guards(s): - - # Restructure #defines with ... - s = re.sub("(#define [A-Za-z0-9_]+) +\(\(.*?\) \(.*?\)\)", "\g<1>...", s) -+ s = re.sub("(#define [A-Za-z0-9_]+) +\(\(\(.*?\) .*\)", "\g<1>...", s) - s = re.sub("(#define [A-Za-z0-9_]+) +\(\(.*?\).*?\) ", "\g<1>...", s) - s = re.sub( - "(#define [A-Za-z0-9_]+) .*\n.*?.*\)\)", "\g<1>...", s, flags=re.MULTILINE -diff --git a/src/tpm2_pytss/internal/crypto.py b/src/tpm2_pytss/internal/crypto.py -index 42030c5..f9d8c34 100644 ---- a/src/tpm2_pytss/internal/crypto.py -+++ b/src/tpm2_pytss/internal/crypto.py -@@ -25,6 +25,7 @@ from cryptography.hazmat.backends import default_backend - from cryptography.exceptions import UnsupportedAlgorithm, InvalidSignature - from typing import Tuple, Type, Any - import secrets -+import inspect - import sys - - _curvetable = ( -diff --git a/test/test_encoding.py b/test/test_encoding.py -index 1f58562..8cf4b51 100644 ---- a/test/test_encoding.py -+++ b/test/test_encoding.py -@@ -1406,7 +1406,7 @@ class ToolsTest(TSS2_BaseTest): - def test_tools_decode_tpm2b_name(self): - if not self.has_tools: - self.skipTest("tools not in path") -- key = ec.generate_private_key(ec.SECP256R1).public_key() -+ key = ec.generate_private_key(ec.SECP256R1()).public_key() - kb = key.public_bytes( - serialization.Encoding.PEM, serialization.PublicFormat.SubjectPublicKeyInfo - ) -diff --git a/test/test_fapi.py b/test/test_fapi.py -index f702fc9..6b77c66 100644 ---- a/test/test_fapi.py -+++ b/test/test_fapi.py -@@ -13,7 +13,7 @@ from cryptography.hazmat.primitives.asymmetric.padding import PSS - - from tpm2_pytss import * - --from tpm2_pytss.internal.utils import is_bug_fixed, _lib_version_atleast -+from tpm2_pytss.internal.utils import is_bug_fixed - - from .TSS2_BaseTest import TpmSimulator - from tpm2_pytss.TSS2_Exception import TSS2_Exception -@@ -614,8 +614,7 @@ class Common: - self.fapi.sign(key_path, b"\x22" * 32) - - @pytest.mark.skipif( -- _lib_version_atleast("tss2-fapi", "4.0.1-170") -- or not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]), -+ not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]), - reason="tpm2-tss bug, see #2084", - ) - def test_write_authorize_nv(self, esys): -@@ -662,8 +661,7 @@ class Common: - self.fapi.quote(path=key_path, pcrs=[7, 9]) - - @pytest.mark.skipif( -- _lib_version_atleast("tss2-fapi", "4.0.1-170") -- or not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]), -+ not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]), - reason="tpm2-tss bug, see #2084", - ) - def test_authorize_policy(self, sign_key): -@@ -728,9 +726,7 @@ class Common: - self.fapi.quote(path=key_path, pcrs=[7, 9]) - - @pytest.mark.skipif( -- _lib_version_atleast("tss2-fapi", "4.0.1-170") -- or not is_bug_fixed(fixed_in="3.2"), -- reason="tpm2-tss bug, see #2080", -+ not is_bug_fixed(fixed_in="3.2"), reason="tpm2-tss bug, see #2080" - ) - def test_policy_signed(self, cryptography_key): - # create external signing key used by the signing authority external to the TPM -@@ -792,10 +788,6 @@ class Common: - with pytest.raises(TSS2_Exception): - self.fapi.sign(path=key_path, digest=b"\x11" * 32) - -- @pytest.mark.skipif( -- _lib_version_atleast("tss2-fapi", "4.0.1-170"), -- reason="issue on master branch.", -- ) - def test_policy_branched(self): - pcr_index = 15 - pcr_data = b"ABCDEF" -@@ -913,8 +905,7 @@ class Common: - self.fapi.delete(path=nv_path) - - @pytest.mark.skipif( -- _lib_version_atleast("tss2-fapi", "4.0.1-170") -- or not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]), -+ not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]), - reason="tpm2-tss bug, see #2089", - ) - def test_policy_action(self): -diff --git a/test/test_policy.py b/test/test_policy.py -index f18aa8a..5f56e21 100644 ---- a/test/test_policy.py -+++ b/test/test_policy.py -@@ -47,7 +47,7 @@ class TestPolicy(TSS2_EsapiTest): - super().setUp() - self._has_secp192r1 = True - try: -- ec.generate_private_key(ec.SECP192R1) -+ ec.generate_private_key(ec.SECP192R1()) - except Exception: - self._has_secp192r1 = False - diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 4c3e8230fba7..7da990f0b8de 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.66.4"; + version = "4.66.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-5Nk2yd6HJ5KPO+YHlZDpfZq/6NOaWQvmeOtZGf/Bhrs="; + hash = "sha256-4QIK7y5QlnAtigJax9FrFXcnnJ1j+DdbYwg+ml8Py60="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix index a12ffea156bd..91945de8dc89 100644 --- a/pkgs/development/python-modules/trackpy/default.nix +++ b/pkgs/development/python-modules/trackpy/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # specifically needed for darwin export HOME=$(mktemp -d) mkdir -p $HOME/.matplotlib @@ -55,6 +55,6 @@ buildPythonPackage rec { changelog = "https://github.com/soft-matter/trackpy/releases/tag/v${version}"; license = licenses.bsd3; maintainers = [ ]; - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/pkgs/development/python-modules/trafilatura/default.nix b/pkgs/development/python-modules/trafilatura/default.nix index 06d380df90fd..7617a5f87dab 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.12.1"; + version = "1.12.2"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-iYkdtkbdhNmPs0ovrte6hMIuVJAAe1h9BZkDbTUWR2A="; + hash = "sha256-TJyxQ09+E+8LFstE7h1E6EUj7HJolAuVWcN05+/8mpY="; }; # Patch out gui cli because it is not supported in this packaging and diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 066732b8b920..746b27514632 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -58,14 +58,14 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.44.2"; + version = "4.46.2"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-2nMt1orhQCTkHG0HKwqVyB7mQeJh7O6I3Eftv2bnnIc="; + hash = "sha256-5bYjgrW2ITJ/bc8BP/tWjzwLrLQHgvKSVyUCNsRniFM="; }; build-system = [ setuptools ]; @@ -173,7 +173,6 @@ buildPythonPackage rec { # natten = [ natten ]; # codecarbon = [ codecarbon ]; video = [ - # decord av ]; sentencepiece = [ diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index 74ce55dd4b13..545e5667da8c 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { "test_diagram" "test_ordered_with_graph" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Upstream issue https://github.com/pygraphviz/pygraphviz/issues/441 "test_binary_stream" ]; diff --git a/pkgs/development/python-modules/translate-toolkit/default.nix b/pkgs/development/python-modules/translate-toolkit/default.nix index 89bc4a2fde54..b309c81130c1 100644 --- a/pkgs/development/python-modules/translate-toolkit/default.nix +++ b/pkgs/development/python-modules/translate-toolkit/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "translate-toolkit"; - version = "3.13.2"; + version = "3.14.1"; pyproject = true; build-system = [ setuptools-scm ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "translate_toolkit"; inherit version; - hash = "sha256-95zIAelFSNK5+f1GY8DUgHPDQBS5K+9ULjXaSaa0wWM="; + hash = "sha256-IUjEN8Up1Or4nFo71WkDduq+6Xw8ObfUgkABp88zPoY="; }; dependencies = [ diff --git a/pkgs/development/python-modules/transmission-rpc/default.nix b/pkgs/development/python-modules/transmission-rpc/default.nix index 71a4b2778ba7..cc2db015a14b 100644 --- a/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/pkgs/development/python-modules/transmission-rpc/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - poetry-core, + setuptools, pytestCheckHook, pythonOlder, python-dotenv, @@ -14,8 +14,8 @@ buildPythonPackage rec { pname = "transmission-rpc"; - version = "7.0.3"; - format = "pyproject"; + version = "7.0.11"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -23,12 +23,12 @@ buildPythonPackage rec { owner = "Trim21"; repo = "transmission-rpc"; rev = "refs/tags/v${version}"; - hash = "sha256-HthWeFInolNEs7RNA773DJjhGvl1rfDhvhO8WwRwuuY="; + hash = "sha256-t07TuLLHfbxvWh+7854OMigfGC8jHzvpd4QO3v0M15I="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ requests typing-extensions ]; @@ -44,6 +44,7 @@ buildPythonPackage rec { disabledTests = [ # Tests require a running Transmission instance + "test_groups" "test_real" ]; diff --git a/pkgs/development/python-modules/transmissionrpc/default.nix b/pkgs/development/python-modules/transmissionrpc/default.nix deleted file mode 100644 index 0b6875390be0..000000000000 --- a/pkgs/development/python-modules/transmissionrpc/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - six, -}: - -buildPythonPackage rec { - pname = "transmissionrpc"; - version = "0.11"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "ec43b460f9fde2faedbfa6d663ef495b3fd69df855a135eebe8f8a741c0dde60"; - }; - - propagatedBuildInputs = [ six ]; - - # no tests - doCheck = false; - pythonImportsCheck = [ "transmissionrpc" ]; - - meta = with lib; { - description = "Python implementation of the Transmission bittorent client RPC protocol"; - homepage = "https://pypi.python.org/pypi/transmissionrpc/"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/tree-sitter-html/default.nix b/pkgs/development/python-modules/tree-sitter-html/default.nix index 361f53b29bb6..4c5060294231 100644 --- a/pkgs/development/python-modules/tree-sitter-html/default.nix +++ b/pkgs/development/python-modules/tree-sitter-html/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { core = [ tree-sitter ]; diff --git a/pkgs/development/python-modules/tree-sitter-javascript/default.nix b/pkgs/development/python-modules/tree-sitter-javascript/default.nix index f6a8782f1406..39766ce588f7 100644 --- a/pkgs/development/python-modules/tree-sitter-javascript/default.nix +++ b/pkgs/development/python-modules/tree-sitter-javascript/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { core = [ tree-sitter ]; diff --git a/pkgs/development/python-modules/tree-sitter-json/default.nix b/pkgs/development/python-modules/tree-sitter-json/default.nix index 45557bd5e2ea..0e6cd37f8b87 100644 --- a/pkgs/development/python-modules/tree-sitter-json/default.nix +++ b/pkgs/development/python-modules/tree-sitter-json/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { core = [ tree-sitter ]; diff --git a/pkgs/development/python-modules/tree-sitter-python/default.nix b/pkgs/development/python-modules/tree-sitter-python/default.nix index 399fcb0afc18..ece3a6900804 100644 --- a/pkgs/development/python-modules/tree-sitter-python/default.nix +++ b/pkgs/development/python-modules/tree-sitter-python/default.nix @@ -7,21 +7,21 @@ buildPythonPackage rec { pname = "tree-sitter-python"; - version = "0.21.0"; + version = "0.23.2"; pyproject = true; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; rev = "v${version}"; - hash = "sha256-ZQ949GbgzZ/W667J+ekvQbs4bGnbDO+IWejivhxPZXM="; + hash = "sha256-cOBG2xfFJ0PpR1RIKW1GeeNeOBA9DAP/N4RXRGYp3yw="; }; build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { core = [ tree-sitter ]; diff --git a/pkgs/development/python-modules/tree-sitter-rust/default.nix b/pkgs/development/python-modules/tree-sitter-rust/default.nix index c532127dcd14..526d1907a0a6 100644 --- a/pkgs/development/python-modules/tree-sitter-rust/default.nix +++ b/pkgs/development/python-modules/tree-sitter-rust/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { core = [ tree-sitter ]; diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix index fdaa03554433..92a9c1f00a71 100644 --- a/pkgs/development/python-modules/tree-sitter/default.nix +++ b/pkgs/development/python-modules/tree-sitter/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "tree-sitter"; - version = "0.22.3"; + version = "0.23.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tree-sitter"; repo = "py-tree-sitter"; rev = "refs/tags/v${version}"; - hash = "sha256-4lxE8oDFE0X7YAnB72PKIaHIqovWSM5QnFo0grPAtKU="; + hash = "sha256-OMCiHX1ZK9MknUcscEMg1Oie0qFpPQ9lMn8m/D0QF7g="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 1d2a9b15374c..aa313179af97 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "treq"; - version = "23.11.0"; + version = "24.9.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-CRT/kp/RYyzhZ5cjUmD4vBnSD/fEWcHeq9ZbjGjL6sU="; + hash = "sha256-Fdp/xATz5O1Z0Kvl+O70lm+rvmGAOaKiO8fBUwXO/qg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 302c5d975676..62c94ce4bd7c 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { mnemonic requests typing-extensions - ] ++ lib.optionals stdenv.isLinux [ trezor-udev-rules ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ trezor-udev-rules ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 272a5d535a31..96bf8cbcf491 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.4.9"; + version = "4.5.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-6fVMtO9w+dtJRGytOEW3qAQ/x9YtkZKyQXQfP7DYE6w="; + hash = "sha256-FlsS8omMPo3smaLtBexcg+r6L8gVC6jDD4s6YvaTQz8="; }; build-system = [ setuptools ]; @@ -41,9 +41,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for loading and using triangular meshes"; - homepage = "https://trimsh.org/"; + homepage = "https://trimesh.org/"; changelog = "https://github.com/mikedh/trimesh/releases/tag/${version}"; license = licenses.mit; + mainProgram = "trimesh"; maintainers = with maintainers; [ gebner pbsds diff --git a/pkgs/development/python-modules/trino-python-client/default.nix b/pkgs/development/python-modules/trino-python-client/default.nix index a75171f6957f..b76dba2b7692 100644 --- a/pkgs/development/python-modules/trino-python-client/default.nix +++ b/pkgs/development/python-modules/trino-python-client/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { tzlocal ]; - passthru.optional-dependencies = lib.fix (self: { + optional-dependencies = lib.fix (self: { kerberos = [ requests-kerberos ]; sqlalchemy = [ sqlalchemy ]; external-authentication-token-cache = [ keyring ]; @@ -47,7 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ httpretty pytestCheckHook - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; pythonImportsCheck = [ "trino" ]; diff --git a/pkgs/development/python-modules/trio-asyncio/default.nix b/pkgs/development/python-modules/trio-asyncio/default.nix index 7c8f0cbaa28b..821cd770caaf 100644 --- a/pkgs/development/python-modules/trio-asyncio/default.nix +++ b/pkgs/development/python-modules/trio-asyncio/default.nix @@ -45,6 +45,8 @@ buildPythonPackage rec { # RuntimeWarning: Can't run the Python asyncio tests because they're not installed "-W" "ignore::RuntimeWarning" + "-W" + "ignore::DeprecationWarning" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/trio-websocket/default.nix b/pkgs/development/python-modules/trio-websocket/default.nix index 39a9ee4baa4f..2804bcaa76e5 100644 --- a/pkgs/development/python-modules/trio-websocket/default.nix +++ b/pkgs/development/python-modules/trio-websocket/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { "test_client_connect_networking_error" "test_finalization_dropped_exception" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Failed: DID NOT RAISE <class 'ValueError'> "test_finalization_dropped_exception" # Timing related diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index b4e37ee448f6..a29bcd842401 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -36,7 +36,7 @@ let in buildPythonPackage rec { pname = "trio"; - version = "0.25.0"; + version = "0.26.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "python-trio"; repo = "trio"; rev = "refs/tags/v${version}"; - hash = "sha256-JQ493U4WINOG6ob4IzfNQt5Lgs3DmEM2BDwbae7Bvsw="; + hash = "sha256-Vlm6lEMKKfwmhbeefPjxm3vz1zFRUEGOCHXLcZKQcIo="; }; build-system = [ setuptools ]; @@ -59,7 +59,7 @@ buildPythonPackage rec { ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; # tests are failing on Darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ astor diff --git a/pkgs/development/python-modules/triton/0000-dont-download-ptxas.patch b/pkgs/development/python-modules/triton/0000-dont-download-ptxas.patch deleted file mode 100644 index d31a4798af05..000000000000 --- a/pkgs/development/python-modules/triton/0000-dont-download-ptxas.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/python/setup.py b/python/setup.py -index 18764ec13..b3bb5b60a 100644 ---- a/python/setup.py -+++ b/python/setup.py -@@ -269,10 +269,6 @@ class CMakeBuild(build_ext): - subprocess.check_call(["cmake", self.base_dir] + cmake_args, cwd=cmake_dir, env=env) - subprocess.check_call(["cmake", "--build", "."] + build_args, cwd=cmake_dir) - -- --download_and_copy_ptxas() -- -- - setup( - name="triton", - version="2.1.0", diff --git a/pkgs/development/python-modules/triton/0001-_build-allow-extra-cc-flags.patch b/pkgs/development/python-modules/triton/0001-_build-allow-extra-cc-flags.patch new file mode 100644 index 000000000000..1e473dc59f46 --- /dev/null +++ b/pkgs/development/python-modules/triton/0001-_build-allow-extra-cc-flags.patch @@ -0,0 +1,35 @@ +From 2751c5de5c61c90b56e3e392a41847f4c47258fd Mon Sep 17 00:00:00 2001 +From: SomeoneSerge <else+aalto@someonex.net> +Date: Sun, 13 Oct 2024 14:16:48 +0000 +Subject: [PATCH 1/3] _build: allow extra cc flags + +--- + python/triton/runtime/build.py | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/python/triton/runtime/build.py b/python/triton/runtime/build.py +index d7baeb286..d334dce77 100644 +--- a/python/triton/runtime/build.py ++++ b/python/triton/runtime/build.py +@@ -42,9 +42,17 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries): + py_include_dir = sysconfig.get_paths(scheme=scheme)["include"] + include_dirs = include_dirs + [srcdir, py_include_dir] + cc_cmd = [cc, src, "-O3", "-shared", "-fPIC", "-o", so] ++ ++ # Nixpkgs support branch ++ # Allows passing e.g. extra -Wl,-rpath ++ cc_cmd_extra_flags = "@ccCmdExtraFlags@" ++ if cc_cmd_extra_flags != ("@" + "ccCmdExtraFlags@"): # substituteAll hack ++ import shlex ++ cc_cmd.extend(shlex.split(cc_cmd_extra_flags)) ++ + cc_cmd += [f'-l{lib}' for lib in libraries] + cc_cmd += [f"-L{dir}" for dir in library_dirs] +- cc_cmd += [f"-I{dir}" for dir in include_dirs] ++ cc_cmd += [f"-I{dir}" for dir in include_dirs if dir is not None] + ret = subprocess.check_call(cc_cmd) + if ret == 0: + return so +-- +2.46.0 + diff --git a/pkgs/development/python-modules/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 deleted file mode 100644 index 3941d54b8b37..000000000000 --- a/pkgs/development/python-modules/triton/0001-ptxas-disable-version-key-for-non-cuda-targets.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 10f3d49aa6084d1b9b9624017cce7df106b9fb7e Mon Sep 17 00:00:00 2001 -From: Yaroslav Bolyukin <iam@lach.pw> -Date: Tue, 6 Feb 2024 13:51:28 +0100 -Subject: [PATCH] ptxas: disable version key for non-cuda targets - ---- - python/triton/runtime/jit.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/python/triton/runtime/jit.py b/python/triton/runtime/jit.py -index d55972b4b..bd875a701 100644 ---- a/python/triton/runtime/jit.py -+++ b/python/triton/runtime/jit.py -@@ -117,8 +117,8 @@ def version_key(): - with open(lib.module_finder.find_spec(lib.name).origin, "rb") as f: - contents += [hashlib.md5(f.read()).hexdigest()] - # ptxas version -- ptxas = path_to_ptxas()[0] -- ptxas_version = hashlib.md5(subprocess.check_output([ptxas, "--version"])).hexdigest() -+ # ptxas = path_to_ptxas()[0] -+ ptxas_version = "noptxas" - return '-'.join(TRITON_VERSION) + '-' + ptxas_version + '-' + '-'.join(contents) - - --- -2.43.0 - diff --git a/pkgs/development/python-modules/triton/0001-setup.py-introduce-TRITON_OFFLINE_BUILD.patch b/pkgs/development/python-modules/triton/0001-setup.py-introduce-TRITON_OFFLINE_BUILD.patch new file mode 100644 index 000000000000..5b195fd7f882 --- /dev/null +++ b/pkgs/development/python-modules/triton/0001-setup.py-introduce-TRITON_OFFLINE_BUILD.patch @@ -0,0 +1,64 @@ +From 587d1f3428eca63544238802f19e0be670d03244 Mon Sep 17 00:00:00 2001 +From: SomeoneSerge <else@someonex.net> +Date: Mon, 29 Jul 2024 14:31:11 +0000 +Subject: [PATCH] setup.py: introduce TRITON_OFFLINE_BUILD + +To prevent any vendoring whatsoever +--- + python/setup.py | 26 ++++++++++++++++++++++++-- + 1 file changed, 24 insertions(+), 2 deletions(-) + +diff --git a/python/setup.py b/python/setup.py +index 73800ec40..4e5b04de4 100644 +--- a/python/setup.py ++++ b/python/setup.py +@@ -112,6 +112,20 @@ def get_env_with_keys(key: list): + return os.environ[k] + return "" + ++def is_offline_build() -> bool: ++ """ ++ Downstream projects and distributions which bootstrap their own dependencies from scratch ++ and run builds in offline sandboxes ++ may set `TRITON_OFFLINE_BUILD` in the build environment to prevent any attempts at downloading ++ pinned dependencies from the internet or at using dependencies vendored in-tree. ++ ++ Dependencies must be defined using respective search paths (cf. `syspath_var_name` in `Package`). ++ Missing dependencies lead to an early abortion. ++ Dependencies' compatibility is not verified. ++ ++ Note that this flag isn't tested by the CI and does not provide any guarantees. ++ """ ++ return os.environ.get("TRITON_OFFLINE_BUILD", "") != "" + + # --- third party packages ----- + +@@ -220,8 +234,14 @@ def get_thirdparty_packages(packages: list): + if os.environ.get(p.syspath_var_name): + package_dir = os.environ[p.syspath_var_name] + version_file_path = os.path.join(package_dir, "version.txt") +- if p.syspath_var_name not in os.environ and\ +- (not os.path.exists(version_file_path) or Path(version_file_path).read_text() != p.url): ++ ++ input_defined = p.syspath_var_name not in os.environ ++ input_exists = input_defined and os.path.exists(version_file_path) ++ input_compatible = input_exists and Path(version_file_path).read_text() == p.url ++ ++ if is_offline_build() and not input_defined: ++ raise RuntimeError(f"Requested an offline build but {p.syspath_var_name} is not set") ++ if not is_offline_build() and not input_compatible: + with contextlib.suppress(Exception): + shutil.rmtree(package_root_dir) + os.makedirs(package_root_dir, exist_ok=True) +@@ -245,6 +265,8 @@ def get_thirdparty_packages(packages: list): + + + def download_and_copy(name, src_path, variable, version, url_func): ++ if is_offline_build(): ++ return + triton_cache_path = get_triton_cache_path() + if variable in os.environ: + return +-- +2.45.1 + diff --git a/pkgs/development/python-modules/triton/0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch b/pkgs/development/python-modules/triton/0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch new file mode 100644 index 000000000000..aa65cad58ed8 --- /dev/null +++ b/pkgs/development/python-modules/triton/0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch @@ -0,0 +1,70 @@ +From 7407cb03eec82768e333909d87b7668b633bfe86 Mon Sep 17 00:00:00 2001 +From: SomeoneSerge <else+aalto@someonex.net> +Date: Sun, 13 Oct 2024 14:28:48 +0000 +Subject: [PATCH 2/3] {nvidia,amd}/driver: short-circuit before ldconfig + +--- + python/triton/runtime/build.py | 6 +++--- + third_party/amd/backend/driver.py | 7 +++++++ + third_party/nvidia/backend/driver.py | 3 +++ + 3 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/python/triton/runtime/build.py b/python/triton/runtime/build.py +index d334dce77..a64e98da0 100644 +--- a/python/triton/runtime/build.py ++++ b/python/triton/runtime/build.py +@@ -42,6 +42,9 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries): + py_include_dir = sysconfig.get_paths(scheme=scheme)["include"] + include_dirs = include_dirs + [srcdir, py_include_dir] + cc_cmd = [cc, src, "-O3", "-shared", "-fPIC", "-o", so] ++ cc_cmd += [f'-l{lib}' for lib in libraries] ++ cc_cmd += [f"-L{dir}" for dir in library_dirs] ++ cc_cmd += [f"-I{dir}" for dir in include_dirs if dir is not None] + + # Nixpkgs support branch + # Allows passing e.g. extra -Wl,-rpath +@@ -50,9 +53,6 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries): + import shlex + cc_cmd.extend(shlex.split(cc_cmd_extra_flags)) + +- cc_cmd += [f'-l{lib}' for lib in libraries] +- cc_cmd += [f"-L{dir}" for dir in library_dirs] +- cc_cmd += [f"-I{dir}" for dir in include_dirs if dir is not None] + ret = subprocess.check_call(cc_cmd) + if ret == 0: + return so +diff --git a/third_party/amd/backend/driver.py b/third_party/amd/backend/driver.py +index 0a8cd7bed..aab8805f6 100644 +--- a/third_party/amd/backend/driver.py ++++ b/third_party/amd/backend/driver.py +@@ -24,6 +24,13 @@ def _get_path_to_hip_runtime_dylib(): + return env_libhip_path + raise RuntimeError(f"TRITON_LIBHIP_PATH '{env_libhip_path}' does not point to a valid {lib_name}") + ++ # ...on release/3.1.x: ++ # return mmapped_path ++ # raise RuntimeError(f"memory mapped '{mmapped_path}' in process does not point to a valid {lib_name}") ++ ++ if os.path.isdir("@libhipDir@"): ++ return ["@libhipDir@"] ++ + paths = [] + + import site +diff --git a/third_party/nvidia/backend/driver.py b/third_party/nvidia/backend/driver.py +index 90f71138b..30fbadb2a 100644 +--- a/third_party/nvidia/backend/driver.py ++++ b/third_party/nvidia/backend/driver.py +@@ -21,6 +21,9 @@ def libcuda_dirs(): + if env_libcuda_path: + return [env_libcuda_path] + ++ if os.path.exists("@libcudaStubsDir@"): ++ return ["@libcudaStubsDir@"] ++ + libs = subprocess.check_output(["/sbin/ldconfig", "-p"]).decode() + # each line looks like the following: + # libcuda.so.1 (libc6,x86-64) => /lib/x86_64-linux-gnu/libcuda.so.1 +-- +2.46.0 + diff --git a/pkgs/development/python-modules/triton/0003-nvidia-cudart-a-systempath.patch b/pkgs/development/python-modules/triton/0003-nvidia-cudart-a-systempath.patch new file mode 100644 index 000000000000..144d84e151fe --- /dev/null +++ b/pkgs/development/python-modules/triton/0003-nvidia-cudart-a-systempath.patch @@ -0,0 +1,46 @@ +From 6f92d54e5a544bc34bb07f2808d554a71cc0e4c3 Mon Sep 17 00:00:00 2001 +From: SomeoneSerge <else+aalto@someonex.net> +Date: Sun, 13 Oct 2024 14:30:19 +0000 +Subject: [PATCH 3/3] nvidia: cudart a systempath + +--- + third_party/nvidia/backend/driver.c | 2 +- + third_party/nvidia/backend/driver.py | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/third_party/nvidia/backend/driver.c b/third_party/nvidia/backend/driver.c +index 44524da27..fbdf0d156 100644 +--- a/third_party/nvidia/backend/driver.c ++++ b/third_party/nvidia/backend/driver.c +@@ -1,4 +1,4 @@ +-#include "cuda.h" ++#include <cuda.h> + #include <dlfcn.h> + #include <stdbool.h> + #define PY_SSIZE_T_CLEAN +diff --git a/third_party/nvidia/backend/driver.py b/third_party/nvidia/backend/driver.py +index 30fbadb2a..65c0562ed 100644 +--- a/third_party/nvidia/backend/driver.py ++++ b/third_party/nvidia/backend/driver.py +@@ -10,7 +10,8 @@ from triton.backends.compiler import GPUTarget + from triton.backends.driver import GPUDriver + + dirname = os.path.dirname(os.path.realpath(__file__)) +-include_dir = [os.path.join(dirname, "include")] ++import shlex ++include_dir = [*shlex.split("@cudaToolkitIncludeDirs@"), os.path.join(dirname, "include")] + libdevice_dir = os.path.join(dirname, "lib") + libraries = ['cuda'] + +@@ -149,7 +150,7 @@ def make_launcher(constants, signature, ids): + # generate glue code + params = [i for i in signature.keys() if i not in constants] + src = f""" +-#include \"cuda.h\" ++#include <cuda.h> + #include <stdbool.h> + #include <Python.h> + #include <dlfcn.h> +-- +2.46.0 + diff --git a/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch b/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch new file mode 100644 index 000000000000..eea1834d1750 --- /dev/null +++ b/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch @@ -0,0 +1,26 @@ +From e503e572b6d444cd27f1cdf124aaf553aa3a8665 Mon Sep 17 00:00:00 2001 +From: SomeoneSerge <else+aalto@someonex.net> +Date: Mon, 14 Oct 2024 00:12:05 +0000 +Subject: [PATCH 4/4] nvidia: allow static ptxas path + +--- + third_party/nvidia/backend/compiler.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/third_party/nvidia/backend/compiler.py b/third_party/nvidia/backend/compiler.py +index 6d7994923..6720e8f97 100644 +--- a/third_party/nvidia/backend/compiler.py ++++ b/third_party/nvidia/backend/compiler.py +@@ -20,6 +20,9 @@ def _path_to_binary(binary: str): + os.path.join(os.path.dirname(__file__), "bin", binary), + ] + ++ import shlex ++ paths.extend(shlex.split("@nixpkgsExtraBinaryPaths@")) ++ + for bin in paths: + if os.path.exists(bin) and os.path.isfile(bin): + result = subprocess.check_output([bin, "--version"], stderr=subprocess.STDOUT) +-- +2.46.0 + diff --git a/pkgs/development/python-modules/triton/bin.nix b/pkgs/development/python-modules/triton/bin.nix index 0189278bc0e9..98c8da68a4d1 100644 --- a/pkgs/development/python-modules/triton/bin.nix +++ b/pkgs/development/python-modules/triton/bin.nix @@ -5,11 +5,8 @@ cudaPackages, buildPythonPackage, fetchurl, - isPy38, - isPy39, - isPy310, - isPy311, python, + pythonOlder, autoPatchelfHook, filelock, lit, @@ -18,7 +15,7 @@ buildPythonPackage rec { pname = "triton"; - version = "2.1.0"; + version = "3.1.0"; format = "wheel"; src = @@ -29,7 +26,7 @@ buildPythonPackage rec { in fetchurl srcs; - disabled = !(isPy38 || isPy39 || isPy310 || isPy311); + disabled = pythonOlder "3.8"; pythonRemoveDeps = [ "cmake" diff --git a/pkgs/development/python-modules/triton/binary-hashes.nix b/pkgs/development/python-modules/triton/binary-hashes.nix index 5c542ac187ee..0ce7ee85b1ca 100644 --- a/pkgs/development/python-modules/triton/binary-hashes.nix +++ b/pkgs/development/python-modules/triton/binary-hashes.nix @@ -7,26 +7,31 @@ version: builtins.getAttr version { - "2.1.0" = { + "3.1.0" = { x86_64-linux-38 = { - name = "triton-2.1.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-2.1.0-0-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; - hash = "sha256-Ofb7a9zLPpjzFS4/vqck8a6ufXSUErux+pxEHUdOuiY="; + name = "triton-3.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-3.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + hash = "sha256-ba2sp/wk3jThgCcbXPhkwWdVcC6fY6FvYt9xSoCZEmo="; }; x86_64-linux-39 = { - name = "triton-2.1.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-2.1.0-0-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; - hash = "sha256-IVROUiwCAFpibIrWPTm9/y8x1BBpWSkZ7ygelk7SZEY="; + name = "triton-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl "; + url = "https://download.pytorch.org/whl/triton-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + hash = "sha256-qvqaIM0Nn+5SPNRQSqcTGAeoZM133Pbv5+mB8YuMbBE="; }; x86_64-linux-310 = { - name = "triton-2.1.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-2.1.0-0-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; - hash = "sha256-ZkOZI6MNXUg5mwip6uEDcPbCYaXshkpkmDuuYxUtOdc="; + name = "triton-3.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl "; + url = "https://download.pytorch.org/whl/triton-3.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + hash = "sha256-aw3RCpJSY6u+n6N9zeZ6Xpsjg/wmn99Z9WV8rDjF0dg="; }; x86_64-linux-311 = { - name = "triton-2.1.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-2.1.0-0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; - hash = "sha256-kZsGRT8AM+pSwT6veDPeDlfbMXjSPU4E+fxxxPLDK/g="; + name = "triton-3.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-3.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + hash = "sha256-DzT254hdG/Dqr3uodaXwzm88E7qY+VA2UcHm3GdX7Vw="; + }; + x86_64-linux-312 = { + name = "triton-3.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-3.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + hash = "sha256-yBgvQv2AgKfTnWZoFPo2xeMMwA6n7usaKYPbtMmaD9w="; }; }; } diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix index 98585b850e91..214bc9de1e6a 100644 --- a/pkgs/development/python-modules/triton/default.nix +++ b/pkgs/development/python-modules/triton/default.nix @@ -1,111 +1,92 @@ { lib, - config, addDriverRunpath, buildPythonPackage, - fetchFromGitHub, - fetchpatch, - setuptools, cmake, - ninja, - pybind11, + config, + cudaPackages, + fetchFromGitHub, + filelock, gtest, - zlib, - ncurses, libxml2, lit, llvm, - filelock, - torchWithRocm, + ncurses, + ninja, + pybind11, python, - - runCommand, - - cudaPackages, + pytestCheckHook, + stdenv, + substituteAll, + setuptools, + torchWithRocm, + zlib, cudaSupport ? config.cudaSupport, + rocmSupport ? config.rocmSupport, + rocmPackages, + triton, }: -let - ptxas = lib.getExe' cudaPackages.cuda_nvcc "ptxas"; # Make sure cudaPackages is the right version each update (See python/setup.py) -in -buildPythonPackage rec { +buildPythonPackage { pname = "triton"; - version = "2.1.0"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { - owner = "openai"; - repo = pname; - rev = "v${version}"; - hash = "sha256-8UTUwLH+SriiJnpejdrzz9qIquP2zBp1/uwLdHmv0XQ="; + owner = "triton-lang"; + repo = "triton"; + # latest branch commit from https://github.com/triton-lang/triton/commits/release/3.1.x/ + rev = "cf34004b8a67d290a962da166f5aa2fc66751326"; + hash = "sha256-233fpuR7XXOaSKN+slhJbE/CMFzAqCRCE4V4rIoJZrk="; }; patches = [ - # fix overflow error - (fetchpatch { - url = "https://github.com/openai/triton/commit/52c146f66b79b6079bcd28c55312fc6ea1852519.patch"; - hash = "sha256-098/TCQrzvrBAbQiaVGCMaF3o5Yc3yWDxzwSkzIuAtY="; + ./0001-setup.py-introduce-TRITON_OFFLINE_BUILD.patch + (substituteAll { + src = ./0001-_build-allow-extra-cc-flags.patch; + ccCmdExtraFlags = "-Wl,-rpath,${addDriverRunpath.driverLink}/lib"; }) - - # 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 + (substituteAll ( + { + src = ./0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch; + } + // lib.optionalAttrs rocmSupport { libhipDir = "${lib.getLib rocmPackages.clr}/lib"; } + // lib.optionalAttrs cudaSupport { + libcudaStubsDir = "${lib.getLib cudaPackages.cuda_cudart}/lib/stubs"; + ccCmdExtraFlags = "-Wl,-rpath,${addDriverRunpath.driverLink}/lib"; + } + )) ] - ++ lib.optionals (!cudaSupport) [ - # 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 + ++ lib.optionals cudaSupport [ + (substituteAll { + src = ./0003-nvidia-cudart-a-systempath.patch; + cudaToolkitIncludeDirs = "${lib.getInclude cudaPackages.cuda_cudart}/include"; + }) + (substituteAll { + src = ./0004-nvidia-allow-static-ptxas-path.patch; + nixpkgsExtraBinaryPaths = lib.escapeShellArgs [ (lib.getExe' cudaPackages.cuda_nvcc "ptxas") ]; + }) ]; - postPatch = - let - quote = x: ''"${x}"''; - subs.ldFlags = - let - # Bash was getting weird without linting, - # but basically upstream contains [cc, ..., "-lcuda", ...] - # and we replace it with [..., "-lcuda", "-L/run/opengl-driver/lib", "-L$stubs", ...] - old = [ "-lcuda" ]; - new = [ - "-lcuda" - "-L${addDriverRunpath.driverLink}" - "-L${cudaPackages.cuda_cudart}/lib/stubs/" - ]; - in - { - oldStr = lib.concatMapStringsSep ", " quote old; - newStr = lib.concatMapStringsSep ", " quote new; - }; - in - '' - # Use our `cmakeFlags` instead and avoid downloading dependencies - substituteInPlace python/setup.py \ - --replace "= get_thirdparty_packages(triton_cache_path)" "= os.environ[\"cmakeFlags\"].split()" - - # Already defined in llvm, when built with -DLLVM_INSTALL_UTILS - substituteInPlace bin/CMakeLists.txt \ - --replace "add_subdirectory(FileCheck)" "" - - # Don't fetch googletest - substituteInPlace unittest/CMakeLists.txt \ - --replace "include (\''${CMAKE_CURRENT_SOURCE_DIR}/googletest.cmake)" ""\ - --replace "include(GoogleTest)" "find_package(GTest REQUIRED)" - - cat << \EOF >> python/triton/common/build.py - def libcuda_dirs(): - return [ "${addDriverRunpath.driverLink}/lib" ] - EOF - '' - + lib.optionalString cudaSupport '' - # Use our linker flags - substituteInPlace python/triton/common/build.py \ - --replace '${subs.ldFlags.oldStr}' '${subs.ldFlags.newStr}' - ''; + postPatch = '' + # Use our `cmakeFlags` instead and avoid downloading dependencies + # remove any downloads + substituteInPlace python/setup.py \ + --replace-fail "get_json_package_info(), get_pybind11_package_info()" ""\ + --replace-fail "get_pybind11_package_info(), get_llvm_package_info()" ""\ + --replace-fail 'packages += ["triton/profiler"]' ""\ + --replace-fail "curr_version != version" "False" + + # Don't fetch googletest + substituteInPlace unittest/CMakeLists.txt \ + --replace-fail "include (\''${CMAKE_CURRENT_SOURCE_DIR}/googletest.cmake)" ""\ + --replace-fail "include(GoogleTest)" "find_package(GTest REQUIRED)" + ''; + + build-system = [ setuptools ]; nativeBuildInputs = [ - setuptools - # pytestCheckHook # Requires torch (circular dependency) and probably needs GPUs: cmake ninja @@ -125,7 +106,7 @@ buildPythonPackage rec { zlib ]; - propagatedBuildInputs = [ + dependencies = [ filelock # triton uses setuptools at runtime: # https://github.com/NixOS/nixpkgs/pull/286763/#discussion_r1480392652 @@ -139,91 +120,160 @@ buildPythonPackage rec { ]; # Avoid GLIBCXX mismatch with other cuda-enabled python packages - preConfigure = - '' - # Ensure that the build process uses the requested number of cores - export MAX_JOBS="$NIX_BUILD_CORES" - - # Upstream's setup.py tries to write cache somewhere in ~/ - export HOME=$(mktemp -d) - - # Upstream's github actions patch setup.cfg to write base-dir. May be redundant - echo " - [build_ext] - base-dir=$PWD" >> python/setup.cfg - - # The rest (including buildPhase) is relative to ./python/ - cd python - '' - + lib.optionalString cudaSupport '' - export CC=${cudaPackages.backendStdenv.cc}/bin/cc; - export CXX=${cudaPackages.backendStdenv.cc}/bin/c++; - - # Work around download_and_copy_ptxas() - mkdir -p $PWD/triton/third_party/cuda/bin - ln -s ${ptxas} $PWD/triton/third_party/cuda/bin - ''; + preConfigure = '' + # Ensure that the build process uses the requested number of cores + export MAX_JOBS="$NIX_BUILD_CORES" - # CMake is run by setup.py instead - dontUseCmakeConfigure = true; + # Upstream's setup.py tries to write cache somewhere in ~/ + export HOME=$(mktemp -d) + + # Upstream's github actions patch setup.cfg to write base-dir. May be redundant + echo " + [build_ext] + base-dir=$PWD" >> python/setup.cfg - # Setuptools (?) strips runpath and +x flags. Let's just restore the symlink - postFixup = lib.optionalString cudaSupport '' - rm -f $out/${python.sitePackages}/triton/third_party/cuda/bin/ptxas - ln -s ${ptxas} $out/${python.sitePackages}/triton/third_party/cuda/bin/ptxas + # The rest (including buildPhase) is relative to ./python/ + cd python ''; - checkInputs = [ cmake ]; # ctest - dontUseSetuptoolsCheck = true; + env = + { + TRITON_BUILD_PROTON = "OFF"; + TRITON_OFFLINE_BUILD = true; + } + // lib.optionalAttrs cudaSupport { + CC = lib.getExe' cudaPackages.backendStdenv.cc "cc"; + CXX = lib.getExe' cudaPackages.backendStdenv.cc "c++"; + + # TODO: Unused because of how TRITON_OFFLINE_BUILD currently works (subject to change) + TRITON_PTXAS_PATH = lib.getExe' cudaPackages.cuda_nvcc "ptxas"; # Make sure cudaPackages is the right version each update (See python/setup.py) + TRITON_CUOBJDUMP_PATH = lib.getExe' cudaPackages.cuda_cuobjdump "cuobjdump"; + TRITON_NVDISASM_PATH = lib.getExe' cudaPackages.cuda_nvdisasm "nvdisasm"; + TRITON_CUDACRT_PATH = lib.getInclude cudaPackages.cuda_nvcc; + TRITON_CUDART_PATH = lib.getInclude cudaPackages.cuda_cudart; + TRITON_CUPTI_PATH = cudaPackages.cuda_cupti; + }; + + pythonRemoveDeps = [ + # Circular dependency, cf. https://github.com/triton-lang/triton/issues/1374 + "torch" + + # CLI tools without dist-info + "cmake" + "lit" + ]; + + # CMake is run by setup.py instead + dontUseCmakeConfigure = true; + nativeCheckInputs = [ cmake ]; preCheck = '' # build/temp* refers to build_ext.build_temp (looked up in the build logs) (cd ./build/temp* ; ctest) - - # For pytestCheckHook - cd test/unit ''; - # Circular dependency on torch - # pythonImportsCheck = [ - # "triton" - # "triton.language" - # ]; + pythonImportsCheck = [ + "triton" + "triton.language" + ]; + + passthru.gpuCheck = stdenv.mkDerivation { + pname = "triton-pytest"; + inherit (triton) version src; + + requiredSystemFeatures = [ "cuda" ]; + + nativeBuildInputs = [ + (python.withPackages (ps: [ + ps.scipy + ps.torchWithCuda + ps.triton-cuda + ])) + ]; + + dontBuild = true; + nativeCheckInputs = [ pytestCheckHook ]; + + doCheck = true; + + preCheck = '' + cd python/test/unit + export HOME=$TMPDIR + ''; + checkPhase = "pytestCheckPhase"; + + installPhase = "touch $out"; + }; - # Ultimately, torch is our test suite: passthru.tests = { + # Ultimately, torch is our test suite: inherit torchWithRocm; - # Implemented as alternative to pythonImportsCheck, in case if circular dependency on torch occurs again, - # and pythonImportsCheck is commented back. - import-triton = - runCommand "import-triton" - { nativeBuildInputs = [ (python.withPackages (ps: [ ps.triton ])) ]; } + + # Test as `nix run -f "<nixpkgs>" python3Packages.triton.tests.axpy-cuda` + # or, using `programs.nix-required-mounts`, as `nix build -f "<nixpkgs>" python3Packages.triton.tests.axpy-cuda.gpuCheck` + axpy-cuda = + cudaPackages.writeGpuTestPython + { + libraries = ps: [ + ps.triton + ps.torch-no-triton + ]; + } '' - python << \EOF + # Adopted from Philippe Tillet https://triton-lang.org/main/getting-started/tutorials/01-vector-add.html + import triton - import triton.language - EOF - touch "$out" - ''; - }; + import triton.language as tl + import torch + import os - pythonRemoveDeps = [ - # Circular dependency, cf. https://github.com/openai/triton/issues/1374 - "torch" + @triton.jit + def axpy_kernel(n, a: tl.constexpr, x_ptr, y_ptr, out, BLOCK_SIZE: tl.constexpr): + pid = tl.program_id(axis=0) + block_start = pid * BLOCK_SIZE + offsets = block_start + tl.arange(0, BLOCK_SIZE) + mask = offsets < n + x = tl.load(x_ptr + offsets, mask=mask) + y = tl.load(y_ptr + offsets, mask=mask) + output = a * x + y + tl.store(out + offsets, output, mask=mask) - # CLI tools without dist-info - "cmake" - "lit" - ]; + def axpy(a, x, y): + output = torch.empty_like(x) + assert x.is_cuda and y.is_cuda and output.is_cuda + n_elements = output.numel() + + def grid(meta): + return (triton.cdiv(n_elements, meta['BLOCK_SIZE']), ) + + axpy_kernel[grid](n_elements, a, x, y, output, BLOCK_SIZE=1024) + return output + + if __name__ == "__main__": + if os.environ.get("HOME", None) == "/homeless-shelter": + os.environ["HOME"] = os.environ.get("TMPDIR", "/tmp") + if "CC" not in os.environ: + os.environ["CC"] = "${lib.getExe' cudaPackages.backendStdenv.cc "cc"}" + torch.manual_seed(0) + size = 12345 + x = torch.rand(size, device='cuda') + y = torch.rand(size, device='cuda') + output_torch = 3.14 * x + y + output_triton = axpy(3.14, x, y) + assert output_torch.sub(output_triton).abs().max().item() < 1e-6 + print("Triton axpy: OK") + ''; + }; - meta = with lib; { + meta = { description = "Language and compiler for writing highly efficient custom Deep-Learning primitives"; - homepage = "https://github.com/openai/triton"; - platforms = platforms.linux; - license = licenses.mit; - maintainers = with maintainers; [ + homepage = "https://github.com/triton-lang/triton"; + platforms = lib.platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ SomeoneSerge Madouura + derdennisop ]; }; } diff --git a/pkgs/development/python-modules/triton/prefetch.sh b/pkgs/development/python-modules/triton/prefetch.sh deleted file mode 100755 index f218718a5cf3..000000000000 --- a/pkgs/development/python-modules/triton/prefetch.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-prefetch-scripts - -set -eou pipefail - -version=$1 - -linux_bucket="https://download.pytorch.org/whl" - -url_and_key_list=( - "x86_64-linux-38 $linux_bucket/triton-${version}-0-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp38-cp38-linux_x86_64.whl" - "x86_64-linux-39 $linux_bucket/triton-${version}-0-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp39-cp39-linux_x86_64.whl" - "x86_64-linux-310 $linux_bucket/triton-${version}-0-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp310-cp310-linux_x86_64.whl" - "x86_64-linux-311 $linux_bucket/triton-${version}-0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp311-cp311-linux_x86_64.whl" -) - -hashfile=binary-hashes-"$version".nix -echo " \"$version\" = {" >> $hashfile - -for url_and_key in "${url_and_key_list[@]}"; do - key=$(echo "$url_and_key" | cut -d' ' -f1) - url=$(echo "$url_and_key" | cut -d' ' -f2) - name=$(echo "$url_and_key" | cut -d' ' -f3) - - echo "prefetching ${url}..." - hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`) - - cat << EOF >> $hashfile - $key = { - name = "$name"; - url = "$url"; - hash = "$hash"; - }; -EOF - - echo -done - -echo " };" >> $hashfile -echo "done." diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix index 7cfac7521cf9..fee2015a8ab0 100644 --- a/pkgs/development/python-modules/troposphere/default.nix +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "troposphere"; - version = "4.8.1"; + version = "4.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cloudtools"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qwU0SsS9qxKtUsZcsMZQ9NqB+Ye8lhDO8tR+ThmoxY8="; + hash = "sha256-Mz6n7QjNvK2HEQeWCySdxioA1dD5CLUh7jCQb1Q6mdc="; }; propagatedBuildInputs = [ cfn-flip ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { unittestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { policy = [ awacs ]; }; diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index a62a953eda7a..56520cb07b4e 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.7.2"; + version = "2024.9.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,14 +19,9 @@ let src = fetchPypi { pname = "trove_classifiers"; inherit version; - hash = "sha256-gyjyrCzj/Xc8uzfHZaDteoP4ncVkx9RS8Dm2kknQrDU="; + hash = "sha256-S0az4TSk0BmZrFvG5SivzBDMSPD3JPGF8mfidgBXaPQ="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace '"calver"' "" - ''; - build-system = [ calver setuptools diff --git a/pkgs/development/python-modules/truststore/default.nix b/pkgs/development/python-modules/truststore/default.nix index 820d823f8146..a4a6830d83d0 100644 --- a/pkgs/development/python-modules/truststore/default.nix +++ b/pkgs/development/python-modules/truststore/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "truststore"; - version = "0.9.1"; + version = "0.9.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = "truststore"; rev = "refs/tags/v${version}"; - hash = "sha256-BP88oQ363XFuRMKZqW8wSm1wl5upU+yEgmwktv65JOU="; + hash = "sha256-BSJneLxwgnD8IJ8IJM43WhmlII5N3qic96SBquMdMnc="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/trx-python/default.nix b/pkgs/development/python-modules/trx-python/default.nix new file mode 100644 index 000000000000..556cf6118ec9 --- /dev/null +++ b/pkgs/development/python-modules/trx-python/default.nix @@ -0,0 +1,65 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + cython, + setuptools, + setuptools-scm, + deepdiff, + nibabel, + numpy, + pytestCheckHook, + psutil, +}: + +buildPythonPackage rec { + pname = "trx-python"; + version = "0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tee-ar-ex"; + repo = "trx-python"; + rev = "refs/tags/${version}"; + hash = "sha256-gKPgP3GJ7QY0Piylk5L0HxnscRCREP1Hm5HZufL2h5g="; + }; + + build-system = [ + cython + setuptools + setuptools-scm + ]; + + dependencies = [ + deepdiff + nibabel + numpy + ]; + + pythonImportsCheck = [ "trx" ]; + + nativeCheckInputs = [ + pytestCheckHook + psutil + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + pytestFlagsArray = [ "trx/tests" ]; + + disabledTestPaths = [ + # access to network + "trx/tests/test_memmap.py" + "trx/tests/test_io.py" + ]; + + meta = { + description = "Python implementation of the TRX file format"; + homepage = "https://github.com/tee-ar-ex/trx-python"; + changelog = "https://github.com/tee-ar-ex/trx-python/releases/tag/${version}"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 8a2bdcfd5d8a..c51766df6c90 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "7.2.6"; + version = "7.2.9"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Vz1bYIwhvH8SHZnmv9ZuaoOnNe378gtIWK2UQDBQxas="; + hash = "sha256-Bzt9m7oqjJXlGdaHaMfIEi1fkwRjkT9sT4+U1FCwaAE="; }; build-system = [ setuptools ]; @@ -90,7 +90,7 @@ buildPythonPackage rec { homepage = "http://www.tryton.org/"; changelog = "https://foss.heptapod.net/tryton/tryton/-/blob/trytond-${version}/trytond/CHANGELOG?ref_type=tags"; license = licenses.gpl3Plus; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ udono johbo diff --git a/pkgs/development/python-modules/tsfresh/default.nix b/pkgs/development/python-modules/tsfresh/default.nix index 045385e9fa1b..3b8b7d75c447 100644 --- a/pkgs/development/python-modules/tsfresh/default.nix +++ b/pkgs/development/python-modules/tsfresh/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + stdenv, pythonOlder, requests, numpy, @@ -27,7 +28,7 @@ buildPythonPackage rec { pname = "tsfresh"; - version = "0.20.2"; + version = "0.20.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -36,7 +37,7 @@ buildPythonPackage rec { owner = "blue-yonder"; repo = "tsfresh"; rev = "refs/tags/v${version}"; - hash = "sha256-UTra+RAQnrv61NQ86xGYrUVYiycUAWhN/45F6/0ZvPI="; + hash = "sha256-Lw70PDiRVPiTzpnbfKSo7jjfBitCePSy15QL0z7+bMg="; }; patches = [ @@ -45,7 +46,7 @@ buildPythonPackage rec { ./remove-pytest-coverage-flags.patch ]; - propagatedBuildInputs = [ + dependencies = [ requests numpy pandas @@ -71,25 +72,34 @@ buildPythonPackage rec { pandas-datareader ]; - disabledTests = [ - # touches network - "test_relevant_extraction" - "test_characteristics_downloaded_robot_execution_failures" - "test_index" - "test_binary_target_is_default" - "test_characteristics_downloaded_robot_execution_failures" - "test_extraction_runs_through" - "test_multilabel_target_on_request" - ]; + disabledTests = + [ + # touches network + "test_relevant_extraction" + "test_characteristics_downloaded_robot_execution_failures" + "test_index" + "test_binary_target_is_default" + "test_characteristics_downloaded_robot_execution_failures" + "test_extraction_runs_through" + "test_multilabel_target_on_request" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # RuntimeError: Cluster failed to start: [Errno 1] Operation not permitted + # may require extra privileges on darwin + "test_local_dask_cluster_extraction_one_worker" + "test_local_dask_cluster_extraction_two_worker" + "test_dask_cluster_extraction_one_worker" + "test_dask_cluster_extraction_two_workers" + ]; pythonImportsCheck = [ "tsfresh" ]; - meta = with lib; { + meta = { description = "Automatic extraction of relevant features from time series"; mainProgram = "run_tsfresh"; homepage = "https://github.com/blue-yonder/tsfresh"; changelog = "https://github.com/blue-yonder/tsfresh/blob/${src.rev}/CHANGES.rst"; - license = licenses.mit; - maintainers = with maintainers; [ mbalatsko ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mbalatsko ]; }; } diff --git a/pkgs/development/python-modules/tskit/default.nix b/pkgs/development/python-modules/tskit/default.nix index 0299fea08e5a..e91fba90dc77 100644 --- a/pkgs/development/python-modules/tskit/default.nix +++ b/pkgs/development/python-modules/tskit/default.nix @@ -11,16 +11,22 @@ buildPythonPackage rec { pname = "tskit"; - version = "0.5.7"; + version = "0.5.8"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yD+2W1tzzi+5wFoZrqNe+jJLpWyx6ZILBgKivDE+wiM="; + hash = "sha256-Wq7ar96w5hdAyKMMvK4zjYln74RmX1l/VhvS++CN+Xk="; }; + postPatch = '' + # build-time constriant, used to ensure forward and backward compat + substituteInPlace pyproject.toml \ + --replace-fail "numpy>=2.0" "numpy" + ''; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/ttls/default.nix b/pkgs/development/python-modules/ttls/default.nix index bf1379dd2bcc..53a0566eaaf2 100644 --- a/pkgs/development/python-modules/ttls/default.nix +++ b/pkgs/development/python-modules/ttls/default.nix @@ -2,33 +2,29 @@ lib, aiohttp, buildPythonPackage, - colour, fetchFromGitHub, poetry-core, pythonOlder, - setuptools, }: buildPythonPackage rec { pname = "ttls"; - version = "1.8.3"; - format = "pyproject"; + version = "1.9.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jschlyter"; - repo = pname; + repo = "ttls"; rev = "refs/tags/v${version}"; - hash = "sha256-1RctamOSnpZ+bcfwnCsj4OAR7KYzf0XQtSe7MTFMGy4="; + hash = "sha256-itGXZbQZ+HYpiwySLeGN3mPy3fgsxx0A9byOxIVpRBc="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp - colour - setuptools ]; # Module has no tests diff --git a/pkgs/development/python-modules/ttp-templates/default.nix b/pkgs/development/python-modules/ttp-templates/default.nix index e22190ff82d9..b4297f30fb97 100644 --- a/pkgs/development/python-modules/ttp-templates/default.nix +++ b/pkgs/development/python-modules/ttp-templates/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ttp-templates"; - version = "0.3.6"; + version = "0.3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix index 700f97a68b5f..653ba4ad7171 100644 --- a/pkgs/development/python-modules/ttp/default.nix +++ b/pkgs/development/python-modules/ttp/default.nix @@ -64,6 +64,9 @@ buildPythonPackage rec { disabledTests = [ # data structure mismatches + "test_global_output_deepdiff_with_var_before" + "test_group_specific_output_deepdiff_with_var_before" + "test_group_specific_output_deepdiff_with_var_before_with_add_field" "test_yangson_validate" "test_yangson_validate_yang_lib_in_output_tag_data" "test_yangson_validate_multiple_inputs_mode_per_input_with_yang_lib_in_file" diff --git a/pkgs/development/python-modules/turnt/default.nix b/pkgs/development/python-modules/turnt/default.nix index abed46cc766e..8d9af7740283 100644 --- a/pkgs/development/python-modules/turnt/default.nix +++ b/pkgs/development/python-modules/turnt/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { tomli ]; - doCheck = true; - checkPhase = '' runHook preCheck $out/bin/turnt test/*/*.t 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 c831f7a0108c..d24bc3fecede 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.1.9"; + version = "0.2.1"; in buildPythonPackage { inherit pname version; src = fetchPypi { inherit pname version; - hash = "sha256-mBKR+ttBo0VF33pEmYdjbyM4bGgyDiYexIIsf8mXZW4="; + hash = "sha256-cuLJfCIQmnySCN1yezxyqtFmnTUdhD9tY9sBYNh9iUI="; }; # workaround needed, upstream issue: https://github.com/tuya/tuya-device-sharing-sdk/issues/10 diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 826888a528ae..7faf26909ea9 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.3.1"; + version = "9.3.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-yQrWMRLH8GZYmpmhjW2Lomk6qyKydWsteCvFR0uDPRQ="; + hash = "sha256-H/MBRiGU2EnrhspX2ilVvnxdr7A50q+snCM2inobrcs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 2002f84439d4..0542cd1c9fd5 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + fetchpatch2, fetchPypi, pythonOlder, importlib-metadata, @@ -13,21 +14,42 @@ rfc3986, setuptools-scm, urllib3, + build, + pretend, + pytest-socket, + pytestCheckHook, }: buildPythonPackage rec { pname = "twine"; - version = "5.1.0"; + version = "5.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TXR3DIjE/K+BNNKmqdhj5A8IJV/32OKss8u9V9Jfbp0="; + hash = "sha256-mqCCUTnAKzQ02RNUXHuEeiHINeEVl/UlWELUV9ojIts="; }; + patches = [ + # pkginfo>=1.11 compatibility patches + # https://github.com/pypa/twine/pull/1123 + (fetchpatch2 { + name = "pkginfo-1_11-compatibility-test.patch"; + url = "https://github.com/pypa/twine/commit/a3206073b87a8e939cf699777882ebfaced689a0.patch"; + hash = "sha256-gLN7gJsVng/LFfsrAHjJlqFZTu0wSdeBfnUN+UnLSFk="; + }) + (fetchpatch2 { + name = "pkginfo-1_11-compatibility-source.patch"; + url = "https://github.com/pypa/twine/commit/03e3795659b44f263f527b0467680b238c8fbacc.patch"; + hash = "sha256-Ne9+G8hMVbklKtcZLiBw29Skz5VO5x2F7yu/KozKgN8="; + }) + ]; + nativeBuildInputs = [ setuptools-scm ]; + pythonRelaxDeps = [ "pkginfo" ]; + propagatedBuildInputs = [ importlib-metadata keyring @@ -40,8 +62,12 @@ buildPythonPackage rec { urllib3 ]; - # Requires network - doCheck = false; + nativeCheckInputs = [ + build + pretend + pytest-socket + pytestCheckHook + ]; pythonImportsCheck = [ "twine" ]; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index ffeee44aa8c7..6a6b752ab8a2 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -73,6 +73,13 @@ buildPythonPackage rec { url = "https://github.com/mweinelt/twisted/commit/e69e652de671aac0abf5c7e6c662fc5172758c5a.patch"; hash = "sha256-LmvKUTViZoY/TPBmSlx4S9FbJNZfB5cxzn/YcciDmoI="; }) + + (fetchpatch { + name = "python-3.12.6.patch"; + url = "https://github.com/twisted/twisted/commit/3422f7988e3d42e6e5184acd65f103fd28750648.patch"; + excludes = [ ".github/workflows/test.yaml" ]; + hash = "sha256-/UmrHdWaApytkEDZiISjPGzpWv/Yxe/xjvr9GOjMPmQ="; + }) ]; __darwinAllowLocalNetworking = true; @@ -138,7 +145,7 @@ buildPythonPackage rec { substituteInPlace src/twisted/test/test_failure.py \ --replace "from cython_test_exception_raiser import raiser # type: ignore[import]" "raiser = None" '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' echo 'PTYProcessTestsBuilder_EPollReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py echo 'PTYProcessTestsBuilder_PollReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py echo 'UNIXTestsBuilder_EPollReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py @@ -149,7 +156,7 @@ buildPythonPackage rec { substituteInPlace src/twisted/python/_inotify.py --replace \ "ctypes.util.find_library(\"c\")" "'${stdenv.cc.libc}/lib/libc.so.6'" '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' echo 'ProcessTestsBuilder_AsyncioSelectorReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py echo 'ProcessTestsBuilder_SelectReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py echo 'ProcessTestsBuilder_AsyncioSelectorReactorTests.test_processEnded.skip = "exit code 120"' >> src/twisted/internet/test/test_process.py @@ -171,11 +178,13 @@ buildPythonPackage rec { hypothesis pyhamcrest ] - ++ passthru.optional-dependencies.conch - ++ passthru.optional-dependencies.http2 - ++ passthru.optional-dependencies.serial + ++ optional-dependencies.conch + ++ optional-dependencies.http2 + ++ optional-dependencies.serial # not supported on aarch64-darwin: https://github.com/pyca/pyopenssl/issues/873 - ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) passthru.optional-dependencies.tls; + ++ lib.optionals ( + !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) + ) optional-dependencies.tls; checkPhase = '' export SOURCE_DATE_EPOCH=315532800 @@ -184,26 +193,26 @@ buildPythonPackage rec { ${python.interpreter} -m twisted.trial -j1 twisted ''; - passthru = { - optional-dependencies = { - conch = [ - appdirs - bcrypt - cryptography - pyasn1 - ]; - http2 = [ - h2 - priority - ]; - serial = [ pyserial ]; - tls = [ - idna - pyopenssl - service-identity - ]; - }; + optional-dependencies = { + conch = [ + appdirs + bcrypt + cryptography + pyasn1 + ]; + http2 = [ + h2 + priority + ]; + serial = [ pyserial ]; + tls = [ + idna + pyopenssl + service-identity + ]; + }; + passthru = { tests = { inherit cassandra-driver diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix index 28bb7ba4adb3..7fa9b9d0f22c 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.1"; + version = "4.3.1"; disabled = pythonOlder "3.7"; @@ -21,12 +21,20 @@ buildPythonPackage rec { owner = "Teekeks"; repo = "pyTwitchAPI"; rev = "refs/tags/v${version}"; - hash = "sha256-DT8Q8x+OvrxnoLWwdS/Gv8x5cepJPIF1ZPyOumnwq2E="; + hash = "sha256-pXbrI4WbId6nYbDSpF9cYnQBOkbNGvzW6/opCztZ1ck="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = '' + sed -i "/document_enum/d" twitchAPI/type.py + ''; - propagatedBuildInputs = [ + pythonRemoveDeps = [ + "enum-tools" + ]; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp python-dateutil typing-extensions diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix index c9be16e2eba4..75b50c223a19 100644 --- a/pkgs/development/python-modules/txtai/default.nix +++ b/pkgs/development/python-modules/txtai/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + setuptools, # propagated build input faiss, torch, @@ -47,18 +48,32 @@ openpyxl, requests, xmltodict, + pgvector, + sqlite-vec, + python-multipart, # native check inputs - unittestCheckHook, - - pythonAtLeast, + pytestCheckHook, + # check inputs + httpx, + msgpack, + sqlalchemy, }: let - version = "7.3.0"; + version = "7.4.0"; api = [ aiohttp fastapi + pillow + python-multipart uvicorn ]; + ann = [ + annoy + hnswlib + pgvector + sqlalchemy + sqlite-vec + ]; # cloud = [ apache-libcloud ]; console = [ rich ]; @@ -124,10 +139,11 @@ let requests xmltodict ]; - all = api ++ console ++ database ++ graph ++ model ++ pipeline ++ similarity ++ workflow; + all = api ++ ann ++ console ++ database ++ graph ++ model ++ pipeline ++ similarity ++ workflow; optional-dependencies = { inherit + ann api console database @@ -147,7 +163,8 @@ in buildPythonPackage { pname = "txtai"; inherit version; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.8"; @@ -155,16 +172,17 @@ buildPythonPackage { owner = "neuml"; repo = "txtai"; rev = "refs/tags/v${version}"; - hash = "sha256-tnM6ye0Sxh8P2bm3awE72GvXEY0gXX1Sv+wPr77wRGU="; + hash = "sha256-DQB12mFUMsKJ8cACowI1Vc7k2n1npdTOQknRmHd5EIM="; }; + buildTools = [ setuptools ]; pythonRemoveDeps = [ # We call it faiss, not faiss-cpu. "faiss-cpu" ]; - propagatedBuildInputs = [ + dependencies = [ faiss torch transformers @@ -174,25 +192,54 @@ buildPythonPackage { regex ]; - passthru.optional-dependencies = optional-dependencies; - - pythonImportsCheck = [ "txtai" ]; - - # some tests hang forever - doCheck = false; + optional-dependencies = optional-dependencies; - preCheck = '' - export TRANSFORMERS_CACHE=$(mktemp -d) + # The Python imports check runs huggingface-hub which needs a writable directory. + # `pythonImportsCheck` runs in the installPhase (before checkPhase). + preInstall = '' + export HF_HOME=$(mktemp -d) ''; + pythonImportsCheck = [ "txtai" ]; + nativeCheckInputs = [ - unittestCheckHook - ] ++ optional-dependencies.api ++ optional-dependencies.similarity; + pytestCheckHook + ] ++ optional-dependencies.ann ++ optional-dependencies.api ++ optional-dependencies.similarity; + + checkInputs = [ + httpx + msgpack + python-multipart + sqlalchemy + ]; + + # The deselected paths depend on the huggingface hub and should be run as a passthru test + # disabledTestPaths won't work as the problem is with the classes containing the tests + # (in other words, it fails on __init__) + pytestFlagsArray = [ + "test/python/test*.py" + "--deselect=test/python/testcloud.py" + "--deselect=test/python/testconsole.py" + "--deselect=test/python/testembeddings.py" + "--deselect=test/python/testgraph.py" + "--deselect=test/python/testapi/testembeddings.py" + "--deselect=test/python/testapi/testpipelines.py" + "--deselect=test/python/testapi/testworkflow.py" + "--deselect=test/python/testdatabase/testclient.py" + "--deselect=test/python/testdatabase/testduckdb.py" + "--deselect=test/python/testdatabase/testencoder.py" + "--deselect=test/python/testworkflow.py" + ]; - unittestFlagsArray = [ - "-s" - "test/python" - "-v" + disabledTests = [ + # Hardcoded paths + "testInvalidTar" + "testInvalidZip" + # Downloads from Huggingface + "testPipeline" + # Not finding sqlite-vec despite being supplied + "testSQLite" + "testSQLiteCustom" ]; meta = { @@ -201,7 +248,5 @@ buildPythonPackage { homepage = "https://github.com/neuml/txtai"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ happysalada ]; - # This should be addressed in a newer version, but we first need to wait for python311Packages.faiss to be updated - broken = pythonAtLeast "3.12"; }; } diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 6c6f7c86b3a0..66329d3b0985 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -4,42 +4,33 @@ automat, buildPythonPackage, cryptography, - fetchpatch2, fetchPypi, geoip, - incremental, lsof, mock, pytestCheckHook, pythonOlder, + setuptools, twisted, zope-interface, }: buildPythonPackage rec { pname = "txtorcon"; - version = "23.11.0"; - format = "setuptools"; + version = "24.8.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cfha6T121yZRAFnJ7XTmCLxaXJ99EDhTtJ5BQoBAai8="; + hash = "sha256-vv4ZE42cjFMHtu5tT+RG0MIB/9HMQErrJl7ZAwmXitA="; }; - patches = [ - # https://github.com/meejah/txtorcon/pull/400 - (fetchpatch2 { - name = "twisted-24.7.0-fixes.patch"; - url = "https://github.com/meejah/txtorcon/commit/88b5dc2971514babd36d837c93550715dea44b09.patch"; - hash = "sha256-O7kFZw+y1PHJRcMdxCczy8UZd3ruLhjLMxh2tcawWI4="; - }) - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cryptography - incremental twisted automat zope-interface @@ -52,7 +43,9 @@ buildPythonPackage rec { geoip ]; - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); + + pythonImportsCheck = [ "txtorcon" ]; meta = with lib; { description = "Twisted-based Tor controller client, with state-tracking and configuration abstractions"; diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index a39f18bad504..7ea26fb78da1 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -6,6 +6,7 @@ click, click-option-group, fetchPypi, + hatch-vcs, hatchling, hypothesis, jinja2, @@ -15,10 +16,9 @@ tomli, typing-extensions, }: - buildPythonPackage rec { pname = "typed-settings"; - version = "24.3.0"; + version = "24.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,14 +26,14 @@ buildPythonPackage rec { src = fetchPypi { pname = "typed_settings"; inherit version; - hash = "sha256-x1ojSSZNrKkBHKE9dWw7NzX/G6ggRYRIQ5MMahwL1Ps="; + hash = "sha256-HCVwXiKrvAvPQXU5rD5wxflPBBcB+oqcWriJizdOMS8="; }; build-system = [ hatchling ]; dependencies = lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ attrs cattrs @@ -53,11 +53,13 @@ buildPythonPackage rec { pydantic = [ pydantic ]; }; + nativeBuildInputs = [ hatch-vcs ]; + nativeCheckInputs = [ hypothesis pytestCheckHook typing-extensions - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pytestFlagsArray = [ "tests" ]; diff --git a/pkgs/development/python-modules/typepy/default.nix b/pkgs/development/python-modules/typepy/default.nix index 91e01efa2019..0de0eea1ca8e 100644 --- a/pkgs/development/python-modules/typepy/default.nix +++ b/pkgs/development/python-modules/typepy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ mbstrdecoder ]; - passthru.optional-dependencies = { + optional-dependencies = { datetime = [ python-dateutil pytz @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook tcolorpy - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "typepy" ]; diff --git a/pkgs/development/python-modules/typer-shell/default.nix b/pkgs/development/python-modules/typer-shell/default.nix index bed80e598648..eed96f61780a 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.11"; + version = "0.1.12"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "FergusFettes"; repo = "typer-shell"; rev = "refs/tags/v${version}"; - hash = "sha256-pxi4FGxDRMcW4q6h4lQzqGPLhdcfElMaR6aZV85h2Os="; + hash = "sha256-fnqI+nKMaQocBWd9i/lqq8OzKwFdxJ8+7aYG5sNQ55E="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 9839f6d6c55d..3c92fb408ecf 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -6,6 +6,7 @@ coverage, fetchPypi, pdm-backend, + procps, pytest-sugar, pytest-xdist, pytestCheckHook, @@ -17,14 +18,14 @@ buildPythonPackage rec { pname = "typer"; - version = "0.12.3"; + version = "0.12.5"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-SecxMUgdgEKI72JZjZehzu8wWJBapTahE0+QiRujVII="; + hash = "sha256-9ZLwib7cyOwbl0El1khRApw7GvFF8ErKZNaUEPDJtyI="; }; nativeBuildInputs = [ pdm-backend ]; @@ -48,6 +49,8 @@ buildPythonPackage rec { pytest-sugar pytest-xdist pytestCheckHook + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + procps ]; preCheck = '' @@ -60,7 +63,7 @@ buildPythonPackage rec { # fails also on Linux "test_show_completion" "test_install_completion" - ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ "test_install_completion" ]; + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ "test_install_completion" ]; pythonImportsCheck = [ "typer" ]; diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix index c9c354d5dd84..e7272708faea 100644 --- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix @@ -60,1414 +60,1414 @@ let in rec { types-aiobotocore-accessanalyzer = - buildTypesAiobotocorePackage "accessanalyzer" "2.15.0" - "sha256-aXiUguHjVb9uw4bM1jpJLEFDSJGPEwPVBXUOSylrJUU="; + buildTypesAiobotocorePackage "accessanalyzer" "2.15.2" + "sha256-phl4/2H/Eca6fAEMRwF243B2tuzXYOofiWCFBmX8zAk="; types-aiobotocore-account = - buildTypesAiobotocorePackage "account" "2.15.0" - "sha256-frvRCAYh+zn8k1AXzGQuH84QnhXyIiUR7BZBZfH5Vao="; + buildTypesAiobotocorePackage "account" "2.15.2" + "sha256-k66NAKboMyLeFnpnsDTY6i2BP7GRRWgALmva/JRtOzo="; types-aiobotocore-acm = - buildTypesAiobotocorePackage "acm" "2.15.0" - "sha256-au29Nkw94QcHk1c+CCsaNBM+6bkOPPr17yj5naKlFJI="; + buildTypesAiobotocorePackage "acm" "2.15.2" + "sha256-eLo4G5qHs9BxcuYxJUszMHxSFegzAiMmsFZO1DdVnQk="; types-aiobotocore-acm-pca = - buildTypesAiobotocorePackage "acm-pca" "2.15.0" - "sha256-xLhR9zReaQ4O2ka8SJh6KOEvcoWm/fs+gC7PtRNQtTw="; + buildTypesAiobotocorePackage "acm-pca" "2.15.2" + "sha256-Q2LW9rHXP78eKyfNN9b7c7YDeM/f/GnzbeGZJ4TDWGA="; types-aiobotocore-alexaforbusiness = buildTypesAiobotocorePackage "alexaforbusiness" "2.13.0" "sha256-+w/InoQR2aZ5prieGhgEEp7auBiSSghG5zIIHY5Kyao="; types-aiobotocore-amp = - buildTypesAiobotocorePackage "amp" "2.15.0" - "sha256-nMLt8ZITr0zwrnG6v12XgpKtuvggXbhCaozMzF6Ng9c="; + buildTypesAiobotocorePackage "amp" "2.15.2" + "sha256-Qit4RmUHdSIcbOEQOsSZW6ARdx/S/b9qpfJxgMCP6uM="; types-aiobotocore-amplify = - buildTypesAiobotocorePackage "amplify" "2.15.0" - "sha256-L4P4YRaKsIJkhDT1aOjEs5NxnnXyZoRSPZbIVI0iCfE="; + buildTypesAiobotocorePackage "amplify" "2.15.2" + "sha256-Omrz8qlW74Yv69ElHjCpab0X4PAQ9vWc/L9JIyM6uwk="; types-aiobotocore-amplifybackend = - buildTypesAiobotocorePackage "amplifybackend" "2.15.0" - "sha256-bgOAbDajiuw3GQ15XRK6QJoSc+RwjQY1sZt+lLhGONA="; + buildTypesAiobotocorePackage "amplifybackend" "2.15.2" + "sha256-amNBmVDOA6sIEWU0K/wpQWh9q1QzNLpuqf7vEzRvouE="; types-aiobotocore-amplifyuibuilder = - buildTypesAiobotocorePackage "amplifyuibuilder" "2.15.0" - "sha256-N4OTBb2LW3JFJLzE6OeDPAzpjUcSlwPEVezaVelE++o="; + buildTypesAiobotocorePackage "amplifyuibuilder" "2.15.2" + "sha256-uCh6W8IWBmDIYCxqdbt5PBmd/iId5u5GGUG9tjL7W2w="; types-aiobotocore-apigateway = - buildTypesAiobotocorePackage "apigateway" "2.15.0" - "sha256-B+QNyR9jyv1+SKTj0fq6qlq1vwQ5yxhf9yvkIjc+AWA="; + buildTypesAiobotocorePackage "apigateway" "2.15.2" + "sha256-+8fuio9+dP2IqQJn+t2dshAdNyayQypdQNjefhDhRjo="; types-aiobotocore-apigatewaymanagementapi = - buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.15.0" - "sha256-cNIPbJvmZltZ089CfkfxenyTtJUC/+ETCyEDDlzwLOg="; + buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.15.2" + "sha256-Z/ib8krZwZ03DoQS/zyB6jKet0+gmTBkOHUew/i0A+4="; types-aiobotocore-apigatewayv2 = - buildTypesAiobotocorePackage "apigatewayv2" "2.15.0" - "sha256-PfwYm2wklpMZdH/DXKOMlOmozwl8PWY/dnGKZ+vDHVM="; + buildTypesAiobotocorePackage "apigatewayv2" "2.15.2" + "sha256-6Y8A/y30axUzYREdgLWH92gIG4pWvNkWKOxoTfYRQVw="; types-aiobotocore-appconfig = - buildTypesAiobotocorePackage "appconfig" "2.15.0" - "sha256-jhXyfuEWN+hc9R3K2zU5DeiIPuz7Gl9GxQBs1VecCZo="; + buildTypesAiobotocorePackage "appconfig" "2.15.2" + "sha256-I8fTll4jIngD0UHqRx4WhM+WPXuvepHvXByYlgHSrDE="; types-aiobotocore-appconfigdata = - buildTypesAiobotocorePackage "appconfigdata" "2.15.0" - "sha256-rLhZ4JpFtHlBfWgaRl1Y1BkGdy3L0pIK52zni/Jd1UU="; + buildTypesAiobotocorePackage "appconfigdata" "2.15.2" + "sha256-KfmKk/d1ZXcGeYvzqlJh43uHiQvsXzbyytybvEUcVbI="; types-aiobotocore-appfabric = - buildTypesAiobotocorePackage "appfabric" "2.15.0" - "sha256-PtAaUmLoCVRs2UFarVzJSdMjftYrRz4pjb7nraMIAys="; + buildTypesAiobotocorePackage "appfabric" "2.15.2" + "sha256-+BNkaM4f+DRqiSmY0uHksGTTbU7pBuJt+y8S2GRUkdg="; types-aiobotocore-appflow = - buildTypesAiobotocorePackage "appflow" "2.15.0" - "sha256-Yz7cnhD8peXaYwC4sLbAcjsQFDWWnq4VZKTAOJ3M5YA="; + buildTypesAiobotocorePackage "appflow" "2.15.2" + "sha256-aVprs4EiYNo4+VdzQAPE8/UYMebQDYDcTjEBGAN+PdQ="; types-aiobotocore-appintegrations = - buildTypesAiobotocorePackage "appintegrations" "2.15.0" - "sha256-azLPzqojFnj11d8Hw45c+VuZgG/J3KGUhOYD+R7ZwK8="; + buildTypesAiobotocorePackage "appintegrations" "2.15.2" + "sha256-BbhuY9g4oUnBBhoo75bVpNZRWeGDYCl5kwKlW7X3Ek0="; types-aiobotocore-application-autoscaling = - buildTypesAiobotocorePackage "application-autoscaling" "2.15.0" - "sha256-NvY9zOt9xDFh0XgUSyAQ1obzttIj8BXOa8qBWjJ/VLs="; + buildTypesAiobotocorePackage "application-autoscaling" "2.15.2" + "sha256-ggg7zdytM3/Gz5mTQCFCHG8NVfj+q79Wt0B/LEgSfvA="; types-aiobotocore-application-insights = - buildTypesAiobotocorePackage "application-insights" "2.15.0" - "sha256-g4NHKgSExk9Xb6xmNm8kTdrWP473KN+AHs1vw9l6yL0="; + buildTypesAiobotocorePackage "application-insights" "2.15.2" + "sha256-uGVDVNNBV7vzhsBStrEGq4EKvhp/pbcS00becWLM35E="; types-aiobotocore-applicationcostprofiler = - buildTypesAiobotocorePackage "applicationcostprofiler" "2.15.0" - "sha256-AZG2e70N6u+tYQF9rsxG/kCO/fCJiBtvmdaSQvEwLLo="; + buildTypesAiobotocorePackage "applicationcostprofiler" "2.15.2" + "sha256-FvfKD+vSV4jYk62NFDqHwXNaScqQL7uxv9QhnJ5zNEI="; types-aiobotocore-appmesh = - buildTypesAiobotocorePackage "appmesh" "2.15.0" - "sha256-Qn/Nw8OnHixSWzjJPxN2T7B8mzscpDdBNgjNrefOgmM="; + buildTypesAiobotocorePackage "appmesh" "2.15.2" + "sha256-t96fm5t8s6XeeyUcAF93aVdU+Zu9flGKTQBtR0wsQ1Y="; types-aiobotocore-apprunner = - buildTypesAiobotocorePackage "apprunner" "2.15.0" - "sha256-rjBxiphEQxs5/OZVEPDM45YIivDCrjVkkK4bLbUgvDM="; + buildTypesAiobotocorePackage "apprunner" "2.15.2" + "sha256-irCvrU+nnmWTvP+r4kVnSTz8QEFJvPCJ9MKXECikMgs="; types-aiobotocore-appstream = - buildTypesAiobotocorePackage "appstream" "2.15.0" - "sha256-tlmIQ+6d7lNhZiDtSiF6SodUtwLTJJkJSofMb5YUW1Q="; + buildTypesAiobotocorePackage "appstream" "2.15.2" + "sha256-iGmu1EKY9YXFIzLqoya+oTc0CjGw4zoKdnmZG5OTYX0="; types-aiobotocore-appsync = - buildTypesAiobotocorePackage "appsync" "2.15.0" - "sha256-kR3BQccO7l3TixcVmDOVu41t5gJPBpFedgk5uPLuDxU="; + buildTypesAiobotocorePackage "appsync" "2.15.2" + "sha256-82XUaNGcXO6P9w1ai0yg788yn3eTZ5G5+U1CiIEMvhQ="; types-aiobotocore-arc-zonal-shift = - buildTypesAiobotocorePackage "arc-zonal-shift" "2.15.0" - "sha256-o9pDedTVsRr98GZwtFbfFwKZwOA0e4zseGSFtlBEsLQ="; + buildTypesAiobotocorePackage "arc-zonal-shift" "2.15.2" + "sha256-h96kwgdTwldKgyBxy/K2nO0eRp+dsx/Zms9ZJm2jgoA="; types-aiobotocore-athena = - buildTypesAiobotocorePackage "athena" "2.15.0" - "sha256-AgWHakNCla5JY6zz0rWLwkorVESJCvQG6jhT1OFRNUY="; + buildTypesAiobotocorePackage "athena" "2.15.2" + "sha256-L6dfltBPK+6TBs5bfrQtYoaXEzTp4h7Z1YGpThrU2mU="; types-aiobotocore-auditmanager = - buildTypesAiobotocorePackage "auditmanager" "2.15.0" - "sha256-U5ir/tSKwIAIF2TVJ66L1utVyh9cscc7z2VyrcsrGoI="; + buildTypesAiobotocorePackage "auditmanager" "2.15.2" + "sha256-zaO6TuUySzlKPc5SizuSFtK25LjCQCyDF/oUcfYSb9Q="; types-aiobotocore-autoscaling = - buildTypesAiobotocorePackage "autoscaling" "2.15.0" - "sha256-7ZKRN/IlUrNvFgeuGbo242Di4eyIDr9/5tJsHrgcspg="; + buildTypesAiobotocorePackage "autoscaling" "2.15.2" + "sha256-L/EIaJrRPfNzwOEeJaR+E4c1niLpjBcnFYsWxcyfnkM="; types-aiobotocore-autoscaling-plans = - buildTypesAiobotocorePackage "autoscaling-plans" "2.15.0" - "sha256-Va74FcUxerO1nEtm6AiWbaw8zVHDkrdsfq3fBlznM7k="; + buildTypesAiobotocorePackage "autoscaling-plans" "2.15.2" + "sha256-X5Qi6TWVeKi5URcHkEyi1AzyFuZADgNxUFJmtbeRqrQ="; types-aiobotocore-backup = - buildTypesAiobotocorePackage "backup" "2.15.0" - "sha256-9k/3D58OtYwyGl/B9wepaNbj6vgxzqc9E96Tp5+qSVU="; + buildTypesAiobotocorePackage "backup" "2.15.2" + "sha256-56zIY48+BtCInvbY9qtOVgIijam4suphFS8EHQak+iE="; types-aiobotocore-backup-gateway = - buildTypesAiobotocorePackage "backup-gateway" "2.15.0" - "sha256-pp75wX3UeV4U7UChs3EyanPom1UD6RCYdYfVmN21MjM="; + buildTypesAiobotocorePackage "backup-gateway" "2.15.2" + "sha256-1UIYMYwvmTlGqRoKSoLb7A3W4Ll/WfL7wm3G+kI1GJs="; types-aiobotocore-backupstorage = buildTypesAiobotocorePackage "backupstorage" "2.13.0" "sha256-YUKtBdBrdwL2yqDqOovvzDPbcv/sD8JLRnKz3Oh7iSU="; types-aiobotocore-batch = - buildTypesAiobotocorePackage "batch" "2.15.0" - "sha256-vbZk1mR45gdhLVtdZTi0ZG6I72ttUwHqFAuXc4TW8o8="; + buildTypesAiobotocorePackage "batch" "2.15.2" + "sha256-iu0r4+edD0r5ZJEngGp9W+DiFYiyBXiPdQJk8bRzpU8="; types-aiobotocore-billingconductor = - buildTypesAiobotocorePackage "billingconductor" "2.15.0" - "sha256-mtbJipKOB82AHWrRAfNFUgHTwNtqiU/NSn9F6eLcqok="; + buildTypesAiobotocorePackage "billingconductor" "2.15.2" + "sha256-KGnqy6p/63nN613xm8gBGtFHrGEo21kmD1q/GngIStM="; types-aiobotocore-braket = - buildTypesAiobotocorePackage "braket" "2.15.0" - "sha256-Hu8DNQCusy3HR5NNptB4Rwuhu3m9lcqTgR7HnZMjtwA="; + buildTypesAiobotocorePackage "braket" "2.15.2" + "sha256-NAcGzPa4k+aAuSReMXK33wKMyaiPP4OCdyCfKmG//Ao="; types-aiobotocore-budgets = - buildTypesAiobotocorePackage "budgets" "2.15.0" - "sha256-E8f8+ONZep2G/BoOSinere9SIMetZHNK+FpmfJZtXxY="; + buildTypesAiobotocorePackage "budgets" "2.15.2" + "sha256-NA0KUMPOrSgXU3ZQ7BcM+gYzfCPbYZecEmckOaWNJKQ="; types-aiobotocore-ce = - buildTypesAiobotocorePackage "ce" "2.15.0" - "sha256-8FK+wf201DspWWW338aad19mh84tEqI84GqKE9zclyA="; + buildTypesAiobotocorePackage "ce" "2.15.2" + "sha256-F8Ve+ImFP00125yzh/wQJGFlXMi7ruP+SLg8dgwFleg="; types-aiobotocore-chime = - buildTypesAiobotocorePackage "chime" "2.15.0" - "sha256-mAgx2hqP0zIvMIdAlyqD6A9HVZ0l/CKDj1lAvsDP/60="; + buildTypesAiobotocorePackage "chime" "2.15.2" + "sha256-dtMLfqQNQNJibTPaZI/quovDdWtAKdB3SS2e7PIs7Gk="; types-aiobotocore-chime-sdk-identity = - buildTypesAiobotocorePackage "chime-sdk-identity" "2.15.0" - "sha256-aY7LS0tEdBVxPwUIrR10ukCybglu1iQIyohNkMHrD4I="; + buildTypesAiobotocorePackage "chime-sdk-identity" "2.15.2" + "sha256-5UFetlbvMPN1VN862HV5sFvOVcrY2z71ZS31OEXb5uY="; types-aiobotocore-chime-sdk-media-pipelines = - buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.15.0" - "sha256-34bU9wxdytAbTYBGM4/sfAn1tYtYLEc2dpUN+t4RtP4="; + buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.15.2" + "sha256-KMmwUEJfNZ0iNMPPm2+s0aKDB5EmWxT9urrLDiyZEhM="; types-aiobotocore-chime-sdk-meetings = - buildTypesAiobotocorePackage "chime-sdk-meetings" "2.15.0" - "sha256-X6YpdEVXPHsvDjptcowPEs71b6iVHO5s80VmO8yEG0o="; + buildTypesAiobotocorePackage "chime-sdk-meetings" "2.15.2" + "sha256-7jXpLCcTd5qG6UI8zyZN5ml9D3DsSHWc0KqXhhsyZNI="; types-aiobotocore-chime-sdk-messaging = - buildTypesAiobotocorePackage "chime-sdk-messaging" "2.15.0" - "sha256-6CI5unJa7Ba1agD41zvcg7hi76D5j34NF5WlPAzkZiY="; + buildTypesAiobotocorePackage "chime-sdk-messaging" "2.15.2" + "sha256-vkA6I/++bwJ77FBGMrrAuvAp6AEMs/t3nJBVr2/pzD8="; types-aiobotocore-chime-sdk-voice = - buildTypesAiobotocorePackage "chime-sdk-voice" "2.15.0" - "sha256-Qz3MHsRX3k9pxSZAltP3CrwFB3jcdNQkVok3jAUbXa8="; + buildTypesAiobotocorePackage "chime-sdk-voice" "2.15.2" + "sha256-fxjfPjiKcmvFJ15ukaP0HNU/PUM6mZROighcq6nuTO4="; types-aiobotocore-cleanrooms = - buildTypesAiobotocorePackage "cleanrooms" "2.15.0" - "sha256-d+cISH+Wz1tnTh3hl1V0VLmHAirfi5puzLE1llIb6SY="; + buildTypesAiobotocorePackage "cleanrooms" "2.15.2" + "sha256-/TD2BimSLmEFw4LfZL6Tve1pBjX4uWlcl/la1S3Gg+c="; types-aiobotocore-cloud9 = - buildTypesAiobotocorePackage "cloud9" "2.15.0" - "sha256-4+/5CcjgXH4O2LXpOUbDNXC2xMnVzU9e4eY0n6tA39I="; + buildTypesAiobotocorePackage "cloud9" "2.15.2" + "sha256-2ClX7W0zE2+UHZiqjaYdfixO0DxXZ9SuzSwkauvgV7A="; types-aiobotocore-cloudcontrol = - buildTypesAiobotocorePackage "cloudcontrol" "2.15.0" - "sha256-5yjSbImILBpPJrwJUabP/z37yocdAtASsS0sSfJq69Q="; + buildTypesAiobotocorePackage "cloudcontrol" "2.15.2" + "sha256-jPndHm2SNwvMB1qkSk5sjdqjbnHZK4zE8XMOEJoMjcw="; types-aiobotocore-clouddirectory = - buildTypesAiobotocorePackage "clouddirectory" "2.15.0" - "sha256-0+bbLpb+IIfgPFd2mltYjgDhV94hmD9nBHu+kOFPRbs="; + buildTypesAiobotocorePackage "clouddirectory" "2.15.2" + "sha256-qq1iH1BAG4P/4hVyniMOiUdq1JUzYS1n/Oo/fmbiGXg="; types-aiobotocore-cloudformation = - buildTypesAiobotocorePackage "cloudformation" "2.15.0" - "sha256-KV6YLm057AqItUSfZmlMro41bvzyWitf64KXh/S78BM="; + buildTypesAiobotocorePackage "cloudformation" "2.15.2" + "sha256-nGq1j9tMJw881JOtWtuDSJk36Nl3gkJD0Zi3Pouo0Bc="; types-aiobotocore-cloudfront = - buildTypesAiobotocorePackage "cloudfront" "2.15.0" - "sha256-G1vjQh+/51KC5GLbqu8id0vIMcllM6e249ibRWIc+50="; + buildTypesAiobotocorePackage "cloudfront" "2.15.2" + "sha256-gM3Q02aUPpwbNJbm17BayCPeSA7W1LRqNRyU1T7JYRo="; types-aiobotocore-cloudhsm = - buildTypesAiobotocorePackage "cloudhsm" "2.15.0" - "sha256-zFlLFb3Kg+n4aK0laLFxbyqBh5ljI9q38Hh+tK/9o3Q="; + buildTypesAiobotocorePackage "cloudhsm" "2.15.2" + "sha256-MPSf4e7fvmV7HF0FUNOfaaun7EVKfR/WSz3tu0bdREI="; types-aiobotocore-cloudhsmv2 = - buildTypesAiobotocorePackage "cloudhsmv2" "2.15.0" - "sha256-VkQmIJDWE+9VksOnEyLtktWOfNgRRw76zqr8xM7TM40="; + buildTypesAiobotocorePackage "cloudhsmv2" "2.15.2" + "sha256-fM4YaHOSjPBL6b6mtulrmliAfi6RaWX4RT01NbE82bY="; types-aiobotocore-cloudsearch = - buildTypesAiobotocorePackage "cloudsearch" "2.15.0" - "sha256-56M9O04QpzTvwBM6kTBlq/xlKulSye55n2yTqjibAhM="; + buildTypesAiobotocorePackage "cloudsearch" "2.15.2" + "sha256-UnjA0HGzLRSag2BK5g3a2f3Ocv5D5qQaSF/BWVv6t5U="; types-aiobotocore-cloudsearchdomain = - buildTypesAiobotocorePackage "cloudsearchdomain" "2.15.0" - "sha256-c2MkpaPyF+fpbQMMC2UvP8HvWOxXz1zoKlmy8mWihKg="; + buildTypesAiobotocorePackage "cloudsearchdomain" "2.15.2" + "sha256-Kzj6sgsKpqCbuR/Bqvlbj+2k3PSHYPNVs5Ijywir+B8="; types-aiobotocore-cloudtrail = - buildTypesAiobotocorePackage "cloudtrail" "2.15.0" - "sha256-3oPEyW12otLcBEs3PM4ySpx8REN1XbOveu/H3/tMlyk="; + buildTypesAiobotocorePackage "cloudtrail" "2.15.2" + "sha256-D3pSFLhphO5LJuAMpR+YMc9LEr6PreuF0jiCblgx+eg="; types-aiobotocore-cloudtrail-data = - buildTypesAiobotocorePackage "cloudtrail-data" "2.15.0" - "sha256-jwYk+AdycgvN5G26/e4E6xTvXqhSau5uXHOdn8QOz4A="; + buildTypesAiobotocorePackage "cloudtrail-data" "2.15.2" + "sha256-Ysfo0oRA28j4vYL2p/XSSlPDka1hWOwIFWaozAxjs4Q="; types-aiobotocore-cloudwatch = - buildTypesAiobotocorePackage "cloudwatch" "2.15.0" - "sha256-tSEIoJJZ3Qkta6R7urcY6o0Zmh/inayk9TFmWDtBxrI="; + buildTypesAiobotocorePackage "cloudwatch" "2.15.2" + "sha256-OyeSm/UKHTET9Lcp6pgIDknKJqmDkVwqyC3x2yO1d+E="; types-aiobotocore-codeartifact = - buildTypesAiobotocorePackage "codeartifact" "2.15.0" - "sha256-Uh628mId25sRK5C1RiFFUhnm3gwoAOn1qBiYFEZawiQ="; + buildTypesAiobotocorePackage "codeartifact" "2.15.2" + "sha256-PAQ5Vck8tG2x7BK1HBSCwchxubdoTJXduXb4fqSKewQ="; types-aiobotocore-codebuild = - buildTypesAiobotocorePackage "codebuild" "2.15.0" - "sha256-Vpmwx9NLkvW8//lwYbuNn4oCuTGlOzW6ALQvkNw3zjk="; + buildTypesAiobotocorePackage "codebuild" "2.15.2" + "sha256-gi8JQlea6kD/k7C+Vd0KwNU9bfiHFfCdkc/VMqdLsNI="; types-aiobotocore-codecatalyst = - buildTypesAiobotocorePackage "codecatalyst" "2.15.0" - "sha256-hLZYCwF1SvMp2Pmhg14E/I0QmkFHdBivYL4zwbeozAc="; + buildTypesAiobotocorePackage "codecatalyst" "2.15.2" + "sha256-A4tsBdng6gf4MdZcB86nOeW7jyBgee7L81Pz4m/rp9s="; types-aiobotocore-codecommit = - buildTypesAiobotocorePackage "codecommit" "2.15.0" - "sha256-ChHQF79gsoOzTA8Gzg3e7U4DRW24PsP2joi7haolI5U="; + buildTypesAiobotocorePackage "codecommit" "2.15.2" + "sha256-Nmr4IFs+HgkkSHct2m//k/6QPX+uMrBZxpGCQu/ktms="; types-aiobotocore-codedeploy = - buildTypesAiobotocorePackage "codedeploy" "2.15.0" - "sha256-CldfAcuTTh8Xf1alyNDfEaJb+7wOLhQKg+S4GrnhPT4="; + buildTypesAiobotocorePackage "codedeploy" "2.15.2" + "sha256-Oo0U/ymzZx4pm47GnlRsMwXO5WQSKPHKCVLVZ73o+FM="; types-aiobotocore-codeguru-reviewer = - buildTypesAiobotocorePackage "codeguru-reviewer" "2.15.0" - "sha256-I2WeTiUX7skEx1Ow8VQjsyBFk0ibYVqjM0SQwd+Djok="; + buildTypesAiobotocorePackage "codeguru-reviewer" "2.15.2" + "sha256-I8W1gWK+HCR1cX+4jRN0bk8IpgACUByK9UCfqKf2H0I="; types-aiobotocore-codeguru-security = - buildTypesAiobotocorePackage "codeguru-security" "2.15.0" - "sha256-yF6I+I+KPEVXogQ4kON3OUq+G+DmxaIwykJm521Lw1I="; + buildTypesAiobotocorePackage "codeguru-security" "2.15.2" + "sha256-RZkI3thRIWLZgcaupwlyzF1zd0LuLvNv/yDZphoTHT0="; types-aiobotocore-codeguruprofiler = - buildTypesAiobotocorePackage "codeguruprofiler" "2.15.0" - "sha256-/eRwr2fqu4i17bt9mG7Ffwh/QKBt8cx4T1IehPZNbc4="; + buildTypesAiobotocorePackage "codeguruprofiler" "2.15.2" + "sha256-6cB4PY0c8fB2IbLIa3pw5/0gKs9uc+TvqR20i3eiEbw="; types-aiobotocore-codepipeline = - buildTypesAiobotocorePackage "codepipeline" "2.15.0" - "sha256-i1HlE4mnLkBcbH9BlEUiMswVoDvdFqkA2db/ONYTs9o="; + buildTypesAiobotocorePackage "codepipeline" "2.15.2" + "sha256-NhB4WUrYN7noWIVGiZX5NVQ7jmr/KbZ/gaIGMwQyCtc="; types-aiobotocore-codestar = buildTypesAiobotocorePackage "codestar" "2.13.3" "sha256-Z1ewx2RjmxbOQZ7wXaN54PVOuRs6LP3rMpsrVTacwjo="; types-aiobotocore-codestar-connections = - buildTypesAiobotocorePackage "codestar-connections" "2.15.0" - "sha256-ksiIt34O0vVOmlaSZjfPugnYUQDzUj9go5hIOknyvHM="; + buildTypesAiobotocorePackage "codestar-connections" "2.15.2" + "sha256-6bP69xyRpdGzVeyH1tn7u1hLlTNNhBrNtEEXD28bXzU="; types-aiobotocore-codestar-notifications = - buildTypesAiobotocorePackage "codestar-notifications" "2.15.0" - "sha256-vbNr4u4HAHEUaXyUruJtNRk1urlJ6W7yUJrS6ULE+2s="; + buildTypesAiobotocorePackage "codestar-notifications" "2.15.2" + "sha256-4q4DTYuoKawQXcPfzupceFTaJfYs7eQZR4T2UBIZTJo="; types-aiobotocore-cognito-identity = - buildTypesAiobotocorePackage "cognito-identity" "2.15.0" - "sha256-uFRD5fzIN11WLtR6KQ10IKxWpzf/Lr2q5VHHdC++h5U="; + buildTypesAiobotocorePackage "cognito-identity" "2.15.2" + "sha256-7HHA+d6rI6phyN9vj8v8ySfUwRdFtHey3ORUtREDegc="; types-aiobotocore-cognito-idp = - buildTypesAiobotocorePackage "cognito-idp" "2.15.0" - "sha256-Yz1fDkWhQCsDN0I/KE8mkmKsVG+pzRMbyOighcdE+68="; + buildTypesAiobotocorePackage "cognito-idp" "2.15.2" + "sha256-rm/slcrINl8WpprLdkZq3TP7LVHqXLFOwa6hHoZqIuQ="; types-aiobotocore-cognito-sync = - buildTypesAiobotocorePackage "cognito-sync" "2.15.0" - "sha256-IAbAdXXV/qBLu4g4sxbk8PAlJ61fL1788sKrOCAPoyA="; + buildTypesAiobotocorePackage "cognito-sync" "2.15.2" + "sha256-hwUY83vHarKtrDhBWUQjvEWkjzT98QgIsoWzmSCOZVw="; types-aiobotocore-comprehend = - buildTypesAiobotocorePackage "comprehend" "2.15.0" - "sha256-o78Qq1eZTT/+3oSdpDMFGT3VcRr3BUgTHIEv9U6zsaw="; + buildTypesAiobotocorePackage "comprehend" "2.15.2" + "sha256-MplEELAL+rKGyMxJKEPTFEESi4EP1M48pSAXjFP50rA="; types-aiobotocore-comprehendmedical = - buildTypesAiobotocorePackage "comprehendmedical" "2.15.0" - "sha256-cdmbnC12r0nzgqHt9MZsB8z34Gh1wLr7pressaGNdok="; + buildTypesAiobotocorePackage "comprehendmedical" "2.15.2" + "sha256-B+vdbBPeANdozCD3G4l2qyQi/IiGePBtV1uC/L8YDL8="; types-aiobotocore-compute-optimizer = - buildTypesAiobotocorePackage "compute-optimizer" "2.15.0" - "sha256-OiZkYLcHvGfgrAAG/g2DI7OfTXuowz9U9vgYnUnQ5LY="; + buildTypesAiobotocorePackage "compute-optimizer" "2.15.2" + "sha256-l3wWbiLHsIg4sg8Ktv4P6uOk1qy9v/uI8iC+jyEv0GY="; types-aiobotocore-config = - buildTypesAiobotocorePackage "config" "2.15.0" - "sha256-t4TXmT50janvS0/t4x7a1Kugx+spLVtdhYXk0tbW7IA="; + buildTypesAiobotocorePackage "config" "2.15.2" + "sha256-GjC2wY6iIVssYrZi4Ql03bOgI4azJ8toRMhVmqdaF6g="; types-aiobotocore-connect = - buildTypesAiobotocorePackage "connect" "2.15.0" - "sha256-sqLlspZPLtilYBBOQtHV5YT3IZ2BJCenD2r8D8JUva0="; + buildTypesAiobotocorePackage "connect" "2.15.2" + "sha256-18PRUxRrcwq/Nz9eWfrWO1uv7RqfgWrdrzTGpf+Y5KA="; types-aiobotocore-connect-contact-lens = - buildTypesAiobotocorePackage "connect-contact-lens" "2.15.0" - "sha256-B2MqOOHJs3cHIuPKPJPdGsw/htwbTdqhF3vX2ErhSUs="; + buildTypesAiobotocorePackage "connect-contact-lens" "2.15.2" + "sha256-FK3HnkkWA8B0PlY/DZUGXPVxpxD25JB3ZNDWMuMJvSA="; types-aiobotocore-connectcampaigns = - buildTypesAiobotocorePackage "connectcampaigns" "2.15.0" - "sha256-ILLDJbAD7jQdyUop5NzZA5YOzCvDLS5DwjRaPqiHFZc="; + buildTypesAiobotocorePackage "connectcampaigns" "2.15.2" + "sha256-gumozHCg1SpV7NUYJ+SJhsSVlSvb0VQsPSCYLxhV8pA="; types-aiobotocore-connectcases = - buildTypesAiobotocorePackage "connectcases" "2.15.0" - "sha256-XM58yx4FP5mfVcdXpGOCXk3HrYbhiPbKhFLYMjKJfjE="; + buildTypesAiobotocorePackage "connectcases" "2.15.2" + "sha256-EIcgQ/i9U0nXJY3S0Cw+T3NdELyy3B1mZ640jn10BCw="; types-aiobotocore-connectparticipant = - buildTypesAiobotocorePackage "connectparticipant" "2.15.0" - "sha256-nEouxJuZHsnNuIXSFpW1r5eWp7wiM525jaqkrHKy27o="; + buildTypesAiobotocorePackage "connectparticipant" "2.15.2" + "sha256-6ieIdjDnzr3CZqYeXhvoEXN5giZBUfab/xLjQYxMESw="; types-aiobotocore-controltower = - buildTypesAiobotocorePackage "controltower" "2.15.0" - "sha256-pI3tNm75uKX9qYGq0wdINP/ikm1Q11Y2Y+buuSUhMqU="; + buildTypesAiobotocorePackage "controltower" "2.15.2" + "sha256-les6NCF44cG768lwj7h3GVYGPW3pF7EozUP04DXB3vI="; types-aiobotocore-cur = - buildTypesAiobotocorePackage "cur" "2.15.0" - "sha256-YE6vdELZULQU8zYRFd97IEWw+guKLJM24VhxRjbCHNk="; + buildTypesAiobotocorePackage "cur" "2.15.2" + "sha256-9tc5TZx6t46Ppd8gljnFAMu1/mt0asdpMEvHUReTgJ8="; types-aiobotocore-customer-profiles = - buildTypesAiobotocorePackage "customer-profiles" "2.15.0" - "sha256-Gq+W7nn4AaMd51nYd0uzDfDNWqMsqwYTBR8JA63NCtI="; + buildTypesAiobotocorePackage "customer-profiles" "2.15.2" + "sha256-5FL2ySDWbh3lUspkWDjk3NNJsknW8iweQub3P/i/vik="; types-aiobotocore-databrew = - buildTypesAiobotocorePackage "databrew" "2.15.0" - "sha256-cKk8cRR2XcMCIbBeg9g2Zgwun5/RRNQaiAKoIv8WvEk="; + buildTypesAiobotocorePackage "databrew" "2.15.2" + "sha256-2hfisDJAqw4fwtrmzil0sr77khsbFUxxCDMg+fr5Y2k="; types-aiobotocore-dataexchange = - buildTypesAiobotocorePackage "dataexchange" "2.15.0" - "sha256-0ZZcNnUh2X/K7t65yy0CJS7JDNqn//a/CEn/ujyBpjU="; + buildTypesAiobotocorePackage "dataexchange" "2.15.2" + "sha256-SfQXMRIr07Ig/W9PZxvsYdwyuL7BPCTSLrgcR7KYosI="; types-aiobotocore-datapipeline = - buildTypesAiobotocorePackage "datapipeline" "2.15.0" - "sha256-DeudpMd35JzfAn2Oi9J8IQdLzoL82YqUAP1sfJV2Mes="; + buildTypesAiobotocorePackage "datapipeline" "2.15.2" + "sha256-9jC8u1JuVEOXzS4glOhSUHkkHDMUT/IpvOCOlgXORXc="; types-aiobotocore-datasync = - buildTypesAiobotocorePackage "datasync" "2.15.0" - "sha256-E3SzICSZSRfKzcyUs1pXzg+jrAC6YX6S4FVUp6bqjqI="; + buildTypesAiobotocorePackage "datasync" "2.15.2" + "sha256-GpFc9Jp8lpBnVv7KiP+m4opXlbT2GZD/E+FuJIIuM2Q="; types-aiobotocore-dax = - buildTypesAiobotocorePackage "dax" "2.15.0" - "sha256-CShLLvZXv9Wl2ipx7Yo/9EZgFd8xC51rTn+3s5IQtJs="; + buildTypesAiobotocorePackage "dax" "2.15.2" + "sha256-8+YMDXMzMA5cdOKtLROJMFr9f/GNoVZcq8DPmQGaGyw="; types-aiobotocore-detective = - buildTypesAiobotocorePackage "detective" "2.15.0" - "sha256-1JpQFNtq/ER6zmTYo1glMgxKVz4ctYwQa3cm69otc14="; + buildTypesAiobotocorePackage "detective" "2.15.2" + "sha256-mhrEwfwNVvz1s//HXYy/afTHgJaM4jKdK2Juo5SDrlU="; types-aiobotocore-devicefarm = - buildTypesAiobotocorePackage "devicefarm" "2.15.0" - "sha256-tRLyH18/lVx4skaoAk73cd2lE6sBJ+d8DMUaHxXIVkg="; + buildTypesAiobotocorePackage "devicefarm" "2.15.2" + "sha256-o1MUk2hR7gwZS700rIJcjjUYoBHkO1S1Q2jeXlfT01I="; types-aiobotocore-devops-guru = - buildTypesAiobotocorePackage "devops-guru" "2.15.0" - "sha256-2Bv8N9q/i0WFB+F8Xu8BQZ7ws+7yJa7qgjaE7X1dQB0="; + buildTypesAiobotocorePackage "devops-guru" "2.15.2" + "sha256-FMt/z56MiTwVuqgC1mfUeGiiv060jAwJ9zRHX3S1Pls="; types-aiobotocore-directconnect = - buildTypesAiobotocorePackage "directconnect" "2.15.0" - "sha256-hY2hLmFtlsggdE6gyQ9lwjTjfkgfaGvWudSPcTy18NU="; + buildTypesAiobotocorePackage "directconnect" "2.15.2" + "sha256-tMYlYP5grEjERDEIgJf5uW2tOvKQuIZ9i82/27W/1bI="; types-aiobotocore-discovery = - buildTypesAiobotocorePackage "discovery" "2.15.0" - "sha256-RnQoddR4qXiAItydDAFBTOkEsBg+DHolqqdHyfCTqXM="; + buildTypesAiobotocorePackage "discovery" "2.15.2" + "sha256-HecRhn7WhVtnhyf2p3/DfR8GZFe7E+FXOB6Tfo4FhQ0="; types-aiobotocore-dlm = - buildTypesAiobotocorePackage "dlm" "2.15.0" - "sha256-/lzVDT2qoK+6PrUozdrSyN7QTcygA7IyUGl7E1K0t4Y="; + buildTypesAiobotocorePackage "dlm" "2.15.2" + "sha256-GPDMhuEywSHsZEb5c75luMAaJ7ezveedU9lNQkLGOzc="; types-aiobotocore-dms = - buildTypesAiobotocorePackage "dms" "2.15.0" - "sha256-9JKz+NHAudWbLGVL5L8fZwoTcom3o7JNFioRNYoVQ0Q="; + buildTypesAiobotocorePackage "dms" "2.15.2" + "sha256-ENyOPp9mO5gnHt/93OFdxAZ0j3qnTdrKHhB0wMLTb6I="; types-aiobotocore-docdb = - buildTypesAiobotocorePackage "docdb" "2.15.0" - "sha256-ZEdJM8Z7ngpa7LIMyL9+jRi0EL2IRcoG12O+cr2roYU="; + buildTypesAiobotocorePackage "docdb" "2.15.2" + "sha256-eR5tTx2QfrujGb2f4m29Ip31DWNqgalboYDVrGFNLmA="; types-aiobotocore-docdb-elastic = - buildTypesAiobotocorePackage "docdb-elastic" "2.15.0" - "sha256-kKf2pjIGoGuO/V/LjIDBPF+Kv0rhEO0kSCLsJe1npc8="; + buildTypesAiobotocorePackage "docdb-elastic" "2.15.2" + "sha256-q+jMIMYoxDEC+WDY2pqFpyJE8tnc1imKBU0fin17NAg="; types-aiobotocore-drs = - buildTypesAiobotocorePackage "drs" "2.15.0" - "sha256-HxY54FJDM6VQuSAB7Qy1PNT9EhPF5z8NXn+m1ICe+aI="; + buildTypesAiobotocorePackage "drs" "2.15.2" + "sha256-kKoZ3i8/bXkoJ5pbj0HVBsYSVwB4eAccmCaPyIPjpp4="; types-aiobotocore-ds = - buildTypesAiobotocorePackage "ds" "2.15.0" - "sha256-iAq4ovzPUAjfH6DE94F5IJoOXMtLr3MF6b+ITByTE2c="; + buildTypesAiobotocorePackage "ds" "2.15.2" + "sha256-tVONjcSBiwyW8Rok6pm+uzU1chwhrlCSVMsIw0Weh1Q="; types-aiobotocore-dynamodb = - buildTypesAiobotocorePackage "dynamodb" "2.15.0" - "sha256-TBiXxLLpyYHslMBCGjPVEOke+7/kj2YcBSMMNpe/d3s="; + buildTypesAiobotocorePackage "dynamodb" "2.15.2" + "sha256-0VYAb1ZzBc23YJ1oKwlWRE0Wb8SBltWBNODxckUEtRU="; types-aiobotocore-dynamodbstreams = - buildTypesAiobotocorePackage "dynamodbstreams" "2.15.0" - "sha256-RRg/aabmM+Vl4b3HwafJVrIc/khRLhgVN9uflG8IGi4="; + buildTypesAiobotocorePackage "dynamodbstreams" "2.15.2" + "sha256-egDbhJ2SAaw6EQQXGI75x98CBLc+bUyfl8a82RMEmzY="; types-aiobotocore-ebs = - buildTypesAiobotocorePackage "ebs" "2.15.0" - "sha256-FGLzilsbA3iCnJLkdeBSYNUPsyzz4N6aNX26MUwGKLE="; + buildTypesAiobotocorePackage "ebs" "2.15.2" + "sha256-GTCz/fv3NWAD57dhqeGJYYLqQlTYx9eHGCwhKF3xKTQ="; types-aiobotocore-ec2 = - buildTypesAiobotocorePackage "ec2" "2.15.0" - "sha256-FnDRizmCPp39EhGU+c9UKJIFz2ZAMlTOaebcLhLBmlY="; + buildTypesAiobotocorePackage "ec2" "2.15.2" + "sha256-13MWHHnHn17FW8NLfIxyCRwjk09xBG4rKhOn27IFB4M="; types-aiobotocore-ec2-instance-connect = - buildTypesAiobotocorePackage "ec2-instance-connect" "2.15.0" - "sha256-3KxMgKPAqCHVxv6a/70ykkJPAc/wFUIe+MxlOURCaHY="; + buildTypesAiobotocorePackage "ec2-instance-connect" "2.15.2" + "sha256-k+nxNJHuQouSxGSG/nigyvlx7qz0KvWnApGSvLPgOjQ="; types-aiobotocore-ecr = - buildTypesAiobotocorePackage "ecr" "2.15.0" - "sha256-+bAe56VT/aSJERPDE7/PuBelT5vJubs2j7mJB0pb5rA="; + buildTypesAiobotocorePackage "ecr" "2.15.2" + "sha256-MSh/z9Wzj6VUFz40U3QHe7ABj8d0HZqEidkG/lIDb6U="; types-aiobotocore-ecr-public = - buildTypesAiobotocorePackage "ecr-public" "2.15.0" - "sha256-5WJz1uIp+dbP3qqTCieXJBM9TCOWHPOfVQck1G8BkpY="; + buildTypesAiobotocorePackage "ecr-public" "2.15.2" + "sha256-9jRWoSdETNAU8a4kTGj+4Gj+8CU3Y2m3RJSQ2Tlw4fg="; types-aiobotocore-ecs = - buildTypesAiobotocorePackage "ecs" "2.15.0" - "sha256-KEE+rLoBBqNtP6AtFT33Xx4TzQydrvyUxKpamHe50jE="; + buildTypesAiobotocorePackage "ecs" "2.15.2" + "sha256-ZO4pKMnUf7g4DdKGvEuEzDM3hBEDe5yOSPPXhWDSLiU="; types-aiobotocore-efs = - buildTypesAiobotocorePackage "efs" "2.15.0" - "sha256-3DZJT/rjzuxNi1oAc51AJguCXN9zI57cYp7Y3wTvtZs="; + buildTypesAiobotocorePackage "efs" "2.15.2" + "sha256-BdXAO/Q7ymBnDbFccevpxTsNs5zcY5VZQtODBmbGEcI="; types-aiobotocore-eks = - buildTypesAiobotocorePackage "eks" "2.15.0" - "sha256-KEl1qvE3QAnhScIbH9/WkwRDyIHDGNsCnNBom1nkdRg="; + buildTypesAiobotocorePackage "eks" "2.15.2" + "sha256-qKOpyzUhdoKIB253zg/iLeByAYJVsKMZ0hytwY0kU8o="; types-aiobotocore-elastic-inference = - buildTypesAiobotocorePackage "elastic-inference" "2.15.0" - "sha256-65/pni/wL4lR1hzu0C7xfVeiT4kzl980hGr/pWJAwvU="; + buildTypesAiobotocorePackage "elastic-inference" "2.15.2" + "sha256-gnZqnLwqGbup02Gaqo/JbAtSMlEl6Rlcm7+3MNQ7MTs="; types-aiobotocore-elasticache = - buildTypesAiobotocorePackage "elasticache" "2.15.0" - "sha256-GlAHYrfqx+VSBuXdwiRY4lUDqcfsmaxVXLwph6d6HCc="; + buildTypesAiobotocorePackage "elasticache" "2.15.2" + "sha256-DpTquyKW0+uGZZLDnG6+N3k/aEBWaBCd6gx2RiQZ3fk="; types-aiobotocore-elasticbeanstalk = - buildTypesAiobotocorePackage "elasticbeanstalk" "2.15.0" - "sha256-Cd16ST0rbvq+NOYAOQgwU2UZWDiKfUTQ4vdxQlP3+Bs="; + buildTypesAiobotocorePackage "elasticbeanstalk" "2.15.2" + "sha256-DV7tOZxA63kA04q+0vUpoTP7QVJ9C3D3NodvcTJJfLg="; types-aiobotocore-elastictranscoder = - buildTypesAiobotocorePackage "elastictranscoder" "2.15.0" - "sha256-3dGv1gPdU/0o0LBYMjzH+uoSMVzhd2dHwZNxt4jdE6U="; + buildTypesAiobotocorePackage "elastictranscoder" "2.15.2" + "sha256-eFBKfNePfk9+765pfX7HVfusysU6shBHA+RFrAXKI4Y="; types-aiobotocore-elb = - buildTypesAiobotocorePackage "elb" "2.15.0" - "sha256-Y6J2/ChKP8JnrZEW8StlYONrAfRecKWJbf07I7zxIGI="; + buildTypesAiobotocorePackage "elb" "2.15.2" + "sha256-yzE/hHLfuEO/XJF7PfRxdnxYORfFiJjWeO0RKYXKH1o="; types-aiobotocore-elbv2 = - buildTypesAiobotocorePackage "elbv2" "2.15.0" - "sha256-7m97yZfyrNFCI3zQYdHJ4SJ5oTACcJ+cfzMzX0MSdN8="; + buildTypesAiobotocorePackage "elbv2" "2.15.2" + "sha256-sG42uIpI2QoHgo+Uuik2cQnKoINQmFXyaSZ1bVilZtA="; types-aiobotocore-emr = - buildTypesAiobotocorePackage "emr" "2.15.0" - "sha256-4GNDh92LYUWxXjvgiYrOsY2joFbHalolgAWtnd79AJQ="; + buildTypesAiobotocorePackage "emr" "2.15.2" + "sha256-0dBL/3beR2OKwCpxBjS5SnFx93QnHAc6c2LsvTQXI7Y="; types-aiobotocore-emr-containers = - buildTypesAiobotocorePackage "emr-containers" "2.15.0" - "sha256-TnEfypfapADarPuVOfl0SzNnJSFJUQmxmeoDZ869fIk="; + buildTypesAiobotocorePackage "emr-containers" "2.15.2" + "sha256-xNAW2n4skTQgHzrSgyfhYdPRFjvB/yYyo78rTKqoc6c="; types-aiobotocore-emr-serverless = - buildTypesAiobotocorePackage "emr-serverless" "2.15.0" - "sha256-bjW88670lzwRWbIp5dHEJIf4EfJSOkQl7CIG2G/wpsQ="; + buildTypesAiobotocorePackage "emr-serverless" "2.15.2" + "sha256-rlomQa/70HGPRCG4uf4UCAv5V/TbQ22yUNh9FsFrHGA="; types-aiobotocore-entityresolution = - buildTypesAiobotocorePackage "entityresolution" "2.15.0" - "sha256-9x6SSolu1CVMjQitu4/8QBxxhdk6G65onKE0EW4oGi0="; + buildTypesAiobotocorePackage "entityresolution" "2.15.2" + "sha256-NYKSykt5nfe5ML1b3vOBOUaHdFoEJVt+g29BRJbELhs="; types-aiobotocore-es = - buildTypesAiobotocorePackage "es" "2.15.0" - "sha256-s8lgcAKVZH3rxzogSj74xJ98thChBIvePIvJmHKrApc="; + buildTypesAiobotocorePackage "es" "2.15.2" + "sha256-ACWSJlnd6IjQez53QIKmrV1dtqI13yuohsMw6LC+vzI="; types-aiobotocore-events = - buildTypesAiobotocorePackage "events" "2.15.0" - "sha256-bgdyFuggcdUfDxEtDjgbmCIc88z4wGbdKQrYmIiZKjs="; + buildTypesAiobotocorePackage "events" "2.15.2" + "sha256-70GCA4DvVUz2e1oXNKrd+sDUO4FYRI2fA1Q9zg6Yw4Y="; types-aiobotocore-evidently = - buildTypesAiobotocorePackage "evidently" "2.15.0" - "sha256-ZNKyeP1THt85PeKqrof84e3glJ4x1TwT0ziqaCXKedk="; + buildTypesAiobotocorePackage "evidently" "2.15.2" + "sha256-5/+S+GXnUQOyu4u5NsirkbakGcq8mRzl8ss578BbMfs="; types-aiobotocore-finspace = - buildTypesAiobotocorePackage "finspace" "2.15.0" - "sha256-gvwDgITwyGZFVndTMKIkD0svxPF3Ur09De7rtP1N57A="; + buildTypesAiobotocorePackage "finspace" "2.15.2" + "sha256-TygJjwA7xBxxEFZ0vcqn3+XsOBMJLpyGnWELj0V7Ifk="; types-aiobotocore-finspace-data = - buildTypesAiobotocorePackage "finspace-data" "2.15.0" - "sha256-+NpGar24GvTd3+3umx0axL2vNJQ0RtDKZzuKvNJu2RY="; + buildTypesAiobotocorePackage "finspace-data" "2.15.2" + "sha256-rVleSTHqz08/5zBhzZQio733uy0rXRtFneqtjzQjHGs="; types-aiobotocore-firehose = - buildTypesAiobotocorePackage "firehose" "2.15.0" - "sha256-BD2gBxbEGlAolHT7xHBj58i4zVHXy3o0xGpIprcCA1I="; + buildTypesAiobotocorePackage "firehose" "2.15.2" + "sha256-+2rDM4qMi1AE4FZQ77Gir1VhONaq/H2NRfiwqhr4s38="; types-aiobotocore-fis = - buildTypesAiobotocorePackage "fis" "2.15.0" - "sha256-qRkkIDm1n3z41pVntjSLypDnM3UVQlXuh5A+sWipFGY="; + buildTypesAiobotocorePackage "fis" "2.15.2" + "sha256-C805H2eghE45jQFdabaYl9JGTjGzKdbpJOvPUT+9etE="; types-aiobotocore-fms = - buildTypesAiobotocorePackage "fms" "2.15.0" - "sha256-i2wfly+9R4KyK1rsRIwKbK3P6OnXpfCxWC8ZV1Fx1M4="; + buildTypesAiobotocorePackage "fms" "2.15.2" + "sha256-njmD/gMffz9BMGHaFtiLkBfQJs2qMk9fuibvbjEXdpQ="; types-aiobotocore-forecast = - buildTypesAiobotocorePackage "forecast" "2.15.0" - "sha256-SC0rCCOVa47auM4pasWds3nOzO19anbT5jL1UVIUKXo="; + buildTypesAiobotocorePackage "forecast" "2.15.2" + "sha256-CzK4VMvhuGfSygAKpJOL4zBZuKSiFoHzFmu7DDXwWhs="; types-aiobotocore-forecastquery = - buildTypesAiobotocorePackage "forecastquery" "2.15.0" - "sha256-3+z4Ef85r9aOPdkLXV8L/+9MBvQpLNkFIElRBlQLsRo="; + buildTypesAiobotocorePackage "forecastquery" "2.15.2" + "sha256-wW/e5dWz9NaWGQUcx5E51lsxMp8frgFO0d1dFpr69PA="; types-aiobotocore-frauddetector = - buildTypesAiobotocorePackage "frauddetector" "2.15.0" - "sha256-UroaCR4B1cgLe4l2+RKdUa9/Q6LLpglmohhYDROSdnU="; + buildTypesAiobotocorePackage "frauddetector" "2.15.2" + "sha256-TL/Dvkfj1i+cvBuOiyGUwFLZp4AG1VpSfEPzBAkkS24="; types-aiobotocore-fsx = - buildTypesAiobotocorePackage "fsx" "2.15.0" - "sha256-9iYbsEG4J4HeXBuCiQQtzOLVBzlkkcg404TbQGg+E7E="; + buildTypesAiobotocorePackage "fsx" "2.15.2" + "sha256-smCufroBQ6UNbfOTfnr8sJbwRMLcr1d5XO3Fmsr8oF4="; types-aiobotocore-gamelift = - buildTypesAiobotocorePackage "gamelift" "2.15.0" - "sha256-x9KREjqQw/DMOD3cbdw19mH4zOxvqKcMIRe/doGGn0s="; + buildTypesAiobotocorePackage "gamelift" "2.15.2" + "sha256-yu7KH5q1KWa0XZpX4jwtWdYItOjyK2NU824c8RawGC0="; types-aiobotocore-gamesparks = buildTypesAiobotocorePackage "gamesparks" "2.7.0" "sha256-oVbKtuLMPpCQcZYx/cH1Dqjv/t6/uXsveflfFVqfN+8="; types-aiobotocore-glacier = - buildTypesAiobotocorePackage "glacier" "2.15.0" - "sha256-k/oPZr4TznL4ygQND0EuXCsSZNgVouBTm8Pih3m3j6k="; + buildTypesAiobotocorePackage "glacier" "2.15.2" + "sha256-uvVtYnhswWmCCngRxzSucyWMD8IiUMv51TYH+KvePOo="; types-aiobotocore-globalaccelerator = - buildTypesAiobotocorePackage "globalaccelerator" "2.15.0" - "sha256-e6bP28zUjuyGn9Y+IWJyYkcRNTQ8odpK6vlZUuxSIHg="; + buildTypesAiobotocorePackage "globalaccelerator" "2.15.2" + "sha256-EG+Mub4z9+e1FSOYM9TymEBLkptdBCORAzq5f+FgDb8="; types-aiobotocore-glue = - buildTypesAiobotocorePackage "glue" "2.15.0" - "sha256-iEi6pPUnJ1VRFXpdFhNVDf8fQ94kByVZEUzLC4SPYIQ="; + buildTypesAiobotocorePackage "glue" "2.15.2" + "sha256-Yt9Bdj97pjBNjzAs4yfhPVXumdZBMR8K6fh9RMVE44U="; types-aiobotocore-grafana = - buildTypesAiobotocorePackage "grafana" "2.15.0" - "sha256-vQJJB10LNbGNvQTj+xHVneRChhxaFZkHXel5DRg7RSs="; + buildTypesAiobotocorePackage "grafana" "2.15.2" + "sha256-9SxJCAQTFvkyLLMUjZa8Sw8gmvA7CEmq8plCL2Im2vI="; types-aiobotocore-greengrass = - buildTypesAiobotocorePackage "greengrass" "2.15.0" - "sha256-RDhbq/ucOitxsOeElmNV5kXGlVTHv/g2d5sxAaBzLlI="; + buildTypesAiobotocorePackage "greengrass" "2.15.2" + "sha256-o2zx53sUfII3M2riAnSof/W0zjP1aDUMnRmZmFPuQZg="; types-aiobotocore-greengrassv2 = - buildTypesAiobotocorePackage "greengrassv2" "2.15.0" - "sha256-47eFTzMPom+q4Ha6HRjPOQCMbn9X5OtEbpScbH+JrpA="; + buildTypesAiobotocorePackage "greengrassv2" "2.15.2" + "sha256-gFUVkGUva3v9BgvOiSZTJlLEmR8xJPdbtraUXc3uDvE="; types-aiobotocore-groundstation = - buildTypesAiobotocorePackage "groundstation" "2.15.0" - "sha256-6+KjFU7B46BL2wsXpMawQT/3DTjdVfcir/XVq1mYS0c="; + buildTypesAiobotocorePackage "groundstation" "2.15.2" + "sha256-j8tHv3buQXMUNcu13zEqYEgh9y32qvZtGf7RwL/Ded0="; types-aiobotocore-guardduty = - buildTypesAiobotocorePackage "guardduty" "2.15.0" - "sha256-IBiDqyfJYhKyqt3v3hd8y72UXawwUed3BILsswrWkmg="; + buildTypesAiobotocorePackage "guardduty" "2.15.2" + "sha256-mvlSXeVh+aqX5nCBiDmLfVY3YzT8S3JGHqTmBECxijQ="; types-aiobotocore-health = - buildTypesAiobotocorePackage "health" "2.15.0" - "sha256-WMgJb50/QiojGKgh6s81aKjFrewlh3bx6YWroTIZabA="; + buildTypesAiobotocorePackage "health" "2.15.2" + "sha256-5aQSWo0L9uonXTWh5tZzukj5Jka2iJQF7Pn55tOR4to="; types-aiobotocore-healthlake = - buildTypesAiobotocorePackage "healthlake" "2.15.0" - "sha256-qy++uEn9Ph2Ek6Rzpth6j3x1NMK1AqoF50HFcVZBbIU="; + buildTypesAiobotocorePackage "healthlake" "2.15.2" + "sha256-MbPcf35D3xDJsReScEoRsMEbNcxCNqP6awnZ3wzEnK4="; types-aiobotocore-honeycode = buildTypesAiobotocorePackage "honeycode" "2.13.0" "sha256-DeeheoQeFEcDH21DSNs2kSR1rjnPLtTgz0yNCFnE+Io="; types-aiobotocore-iam = - buildTypesAiobotocorePackage "iam" "2.15.0" - "sha256-HcCuedSOhN7B4xwCH2zQz7RxrVdz6y+L7ZfNoCWG8RE="; + buildTypesAiobotocorePackage "iam" "2.15.2" + "sha256-gj0mnoKF4hCs6oWAil9XS6V/8YnmGVEu6dvh4l3Gl9o="; types-aiobotocore-identitystore = - buildTypesAiobotocorePackage "identitystore" "2.15.0" - "sha256-etmeEUkNyB/I760pSt3VEqbzqKnk44Evi1zqUc1SxFI="; + buildTypesAiobotocorePackage "identitystore" "2.15.2" + "sha256-OFIHUrjhNBztSEhictiFeLCcIITmihIIs337DT2z6IM="; types-aiobotocore-imagebuilder = - buildTypesAiobotocorePackage "imagebuilder" "2.15.0" - "sha256-0jIUpv7Njy5h6vzRxnKqr0kIIiHBUkOZh+NEW1s6tLw="; + buildTypesAiobotocorePackage "imagebuilder" "2.15.2" + "sha256-iVa8PY/Ymt8C8x0uWlLAvKcMWhxm/i0Fjy8+wq+vBAs="; types-aiobotocore-importexport = - buildTypesAiobotocorePackage "importexport" "2.15.0" - "sha256-v0gErsdr3Ljiyil8Ct7iNGqf61VenoExZOUhH760SPA="; + buildTypesAiobotocorePackage "importexport" "2.15.2" + "sha256-XODBb05MkRhTPkK44G1dF5PCObngkR0JIenShPg/SEM="; types-aiobotocore-inspector = - buildTypesAiobotocorePackage "inspector" "2.15.0" - "sha256-HInhkpxGJ886jRhspnQDWJkRF3jmo5J1PetVNrzuS7Q="; + buildTypesAiobotocorePackage "inspector" "2.15.2" + "sha256-W6cJuqZoOgrSHKWvYnLmNpyfswjJbB/pYfSyUYcN5Qg="; types-aiobotocore-inspector2 = - buildTypesAiobotocorePackage "inspector2" "2.15.0" - "sha256-hvFzgJO69n+Jr5trZLv85PuActzWRXrLfRW0Iqdn9jk="; + buildTypesAiobotocorePackage "inspector2" "2.15.2" + "sha256-toUQmdF8Tdakr6cIfAty6mIyHQ7lHyYheEbkrVDsD3g="; types-aiobotocore-internetmonitor = - buildTypesAiobotocorePackage "internetmonitor" "2.15.0" - "sha256-qgg/j2d763Q4e4axjkhXC3I+BnlJ24j4sZ4hxbvpgYA="; + buildTypesAiobotocorePackage "internetmonitor" "2.15.2" + "sha256-w8XaOTpY69HY4Y9HXHRzs/UNYVLEJ+OY4vL7K9CYZlU="; types-aiobotocore-iot = - buildTypesAiobotocorePackage "iot" "2.15.0" - "sha256-/KgXN3dWVw/ITZ51SOtJRvlUqc1kPxalRa7l7Rb6gSk="; + buildTypesAiobotocorePackage "iot" "2.15.2" + "sha256-KV3EkKI3KoPCwK0lGDyCRF3QzKgdt3VP0mzm0S1Urko="; types-aiobotocore-iot-data = - buildTypesAiobotocorePackage "iot-data" "2.15.0" - "sha256-7q+IBCltYgU5i8QuLlHm0ZFdZcDVDPLmw+tkrBSHeQQ="; + buildTypesAiobotocorePackage "iot-data" "2.15.2" + "sha256-j7Kffix+aoo6N0IKNtKuD1cmIxk/yeNXgQUvTwAOFNI="; types-aiobotocore-iot-jobs-data = - buildTypesAiobotocorePackage "iot-jobs-data" "2.15.0" - "sha256-aKQepzdWJBZQ+f633DVLErPldqrjyrkkAYMZt4Bi3gY="; + buildTypesAiobotocorePackage "iot-jobs-data" "2.15.2" + "sha256-rbNjx7Moa6xY8aQRNF54hurpbr/jLhDfR0IXZNKaZXg="; types-aiobotocore-iot-roborunner = buildTypesAiobotocorePackage "iot-roborunner" "2.12.2" "sha256-O/nGvYfUibI4EvHgONtkYHFv/dZSpHCehXjietPiMJo="; types-aiobotocore-iot1click-devices = - buildTypesAiobotocorePackage "iot1click-devices" "2.15.0" - "sha256-c81lJVCAx4haFwRtRfzab8A6YKVspaUSwI9i/nd7jw8="; + buildTypesAiobotocorePackage "iot1click-devices" "2.15.2" + "sha256-OK7Yw0t1rSXQz2BJrP0zYorMjGGdac2SS9IpKNrF6y4="; types-aiobotocore-iot1click-projects = - buildTypesAiobotocorePackage "iot1click-projects" "2.15.0" - "sha256-Bb9ze8VK6lRT0Ts1PhQ6jrOrjcMzYYrThqVCN4COdRw="; + buildTypesAiobotocorePackage "iot1click-projects" "2.15.2" + "sha256-kNEVudATczB+qs0XyihgJbmH/02Ds8tGuzKWQ5IDj4M="; types-aiobotocore-iotanalytics = - buildTypesAiobotocorePackage "iotanalytics" "2.15.0" - "sha256-eOuQ4Bead3AQ4zD7Ibc/J7BO1bT3FxY0hlUB8qLz390="; + buildTypesAiobotocorePackage "iotanalytics" "2.15.2" + "sha256-scMpD4ZGJyTA97b70t80fE/mQkS5LwumJCWD2v7ul9w="; types-aiobotocore-iotdeviceadvisor = - buildTypesAiobotocorePackage "iotdeviceadvisor" "2.15.0" - "sha256-vrCjbqXz1DGStxCJXwQgrQHzI7BIxGee5zolY/pU6JI="; + buildTypesAiobotocorePackage "iotdeviceadvisor" "2.15.2" + "sha256-XLS46QND2ZNbm0pB73gGrkJVS8ulEoBPAf2EucNQqNA="; types-aiobotocore-iotevents = - buildTypesAiobotocorePackage "iotevents" "2.15.0" - "sha256-3YScaOGMmSYRY+ObPUMWMsCJuUy6dhOYP9LNzluZnhk="; + buildTypesAiobotocorePackage "iotevents" "2.15.2" + "sha256-b21od8f3xlkyMebl6QFNKqhGCO4FcioMWX8odrKolnk="; types-aiobotocore-iotevents-data = - buildTypesAiobotocorePackage "iotevents-data" "2.15.0" - "sha256-Q/i0S+Y/tbnM5buFT838rLwBKJenYcPmfwBq7pJ6pyQ="; + buildTypesAiobotocorePackage "iotevents-data" "2.15.2" + "sha256-laNqog/9QdCDOtNhmBwki2hfJur9M+M6rqdVVZZKRyk="; types-aiobotocore-iotfleethub = - buildTypesAiobotocorePackage "iotfleethub" "2.15.0" - "sha256-EvUSF8PXk7Vb3+ic6ZtSdHJ63w2SmS0pp7QytP/tQss="; + buildTypesAiobotocorePackage "iotfleethub" "2.15.2" + "sha256-cXdG48rRVvZtvg0nnPcl6lDmyukhQpGH2tHyMhp6KpA="; types-aiobotocore-iotfleetwise = - buildTypesAiobotocorePackage "iotfleetwise" "2.15.0" - "sha256-ZEWme0qNdJpQqTKit2wqMbsCa+1E+8+TaqVz/NwolSQ="; + buildTypesAiobotocorePackage "iotfleetwise" "2.15.2" + "sha256-Qokco8UgSqsRZ03NawYHvyCx9qc+/q2mYPUEp+OhqOA="; types-aiobotocore-iotsecuretunneling = - buildTypesAiobotocorePackage "iotsecuretunneling" "2.15.0" - "sha256-O48C/03s2bPB8DhN00BuwoW4gIqUnQG6Dm2I+Vs3waU="; + buildTypesAiobotocorePackage "iotsecuretunneling" "2.15.2" + "sha256-Iq6WU6a7bfb8+ob0feMoVbJr0J3tQI7L0nsV7X7E3rM="; types-aiobotocore-iotsitewise = - buildTypesAiobotocorePackage "iotsitewise" "2.15.0" - "sha256-smId9Cxm0QJ7YiORYp3FdzRNt96kFIlpnWBMbSldtYE="; + buildTypesAiobotocorePackage "iotsitewise" "2.15.2" + "sha256-9XjABgFHnbEIztv7CiS2QX/dUgawqic3XEJ5CSt0oEk="; types-aiobotocore-iotthingsgraph = - buildTypesAiobotocorePackage "iotthingsgraph" "2.15.0" - "sha256-cyjMATxGhhu4oYoa3l076VdgKJ2HHcrqrkGOYvAYMnE="; + buildTypesAiobotocorePackage "iotthingsgraph" "2.15.2" + "sha256-pbVgFQOcfnEjPRYsXz+XHEh9Xa0aAZvTD7coaYt2uR0="; types-aiobotocore-iottwinmaker = - buildTypesAiobotocorePackage "iottwinmaker" "2.15.0" - "sha256-xOmpDzfMY28x5eebi6P9pzPeM0bOdaj5yYeIaMnaI9E="; + buildTypesAiobotocorePackage "iottwinmaker" "2.15.2" + "sha256-hyyW7WVaxyvus78zPDvy9g8J1/ZY3r0RbjhcgApVx0E="; types-aiobotocore-iotwireless = - buildTypesAiobotocorePackage "iotwireless" "2.15.0" - "sha256-d4Vxj2CQVXYTIPkPMF7hAi6TK3RTebuelZ+LfVCyIb8="; + buildTypesAiobotocorePackage "iotwireless" "2.15.2" + "sha256-+vc1U5s8yLnpBsrB1rzuwZj1z/ECe4NTUfIcuO5FRdk="; types-aiobotocore-ivs = - buildTypesAiobotocorePackage "ivs" "2.15.0" - "sha256-EefoDS/gNX1VkN5/5lRf4lOTHTmU0h1uZWFPiQERzvE="; + buildTypesAiobotocorePackage "ivs" "2.15.2" + "sha256-lkDOjzhDWTFECa+hxb8EIVpxd+j9FSHGb9L9fRePNRo="; types-aiobotocore-ivs-realtime = - buildTypesAiobotocorePackage "ivs-realtime" "2.15.0" - "sha256-GBan8Ln1n/ESWDNfbRlapLI5hgyamHTKQZdroasPpxo="; + buildTypesAiobotocorePackage "ivs-realtime" "2.15.2" + "sha256-hFFPTJHySEHbcNwgg6YnU8GJBDA8y2F1pyAY2jpw8CE="; types-aiobotocore-ivschat = - buildTypesAiobotocorePackage "ivschat" "2.15.0" - "sha256-SE0wPCcmri42ZHBqw1zA07JHA29Zq40QAfeuGKb5cis="; + buildTypesAiobotocorePackage "ivschat" "2.15.2" + "sha256-/nKK+JmeOr6zG8OEeNvBT1cWUTD55gK/LCFze3/P4p8="; types-aiobotocore-kafka = - buildTypesAiobotocorePackage "kafka" "2.15.0" - "sha256-eCQIXF+idvdZZa29cdQQbNWqDCl7YRBiL6oYooS82Xw="; + buildTypesAiobotocorePackage "kafka" "2.15.2" + "sha256-H+1xCc+/5RZ684yMxhzqUTysj9QvUMMVMcd+kI9PGZQ="; types-aiobotocore-kafkaconnect = - buildTypesAiobotocorePackage "kafkaconnect" "2.15.0" - "sha256-a9/2yUk/rq0npsCyrgK/2dNWVE5qP8tqF7qpSsyT40I="; + buildTypesAiobotocorePackage "kafkaconnect" "2.15.2" + "sha256-JH+0rJQmzsJ/LBWMSp/UsjtFpD6FmMtkfr0+9tJKKoY="; types-aiobotocore-kendra = - buildTypesAiobotocorePackage "kendra" "2.15.0" - "sha256-4xHwrD35jq9gbPR7X0TJx60GxystcHdMCuTxSZKckhw="; + buildTypesAiobotocorePackage "kendra" "2.15.2" + "sha256-+gQGQmC8lgxAF0Pyo7mloBLN/iSfqvM67KyntXFU4wg="; types-aiobotocore-kendra-ranking = - buildTypesAiobotocorePackage "kendra-ranking" "2.15.0" - "sha256-6MoK7C3eEhaty4jn6/Jc4o/WsZRTxDQ0FATrpSodTME="; + buildTypesAiobotocorePackage "kendra-ranking" "2.15.2" + "sha256-Qg/EN+M3YqqnYkYBFm34YoDnxfEFbmA7YUId/+YmEME="; types-aiobotocore-keyspaces = - buildTypesAiobotocorePackage "keyspaces" "2.15.0" - "sha256-aIjdGRxpS6bbiarTM425jE8B2xbVYKaTaiJhVSQ/4JM="; + buildTypesAiobotocorePackage "keyspaces" "2.15.2" + "sha256-QjwiOj8YhfmCjmM+7C4WP5kPtQcpLb7TbXam/+XMH0U="; types-aiobotocore-kinesis = - buildTypesAiobotocorePackage "kinesis" "2.15.0" - "sha256-hzKV9+gFBwkIbNhlUdDrRyVFU3/VasZfyTjaZNGA0MI="; + buildTypesAiobotocorePackage "kinesis" "2.15.2" + "sha256-1kwvF+RK4CjpEyv/BAi7u6R4kdL2y6PiWrp4pWt38yw="; types-aiobotocore-kinesis-video-archived-media = - buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.15.0" - "sha256-w2b8fP8AEH3bh3iWPym7zAmX0eyXy4hobqYXwAOs3zg="; + buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.15.2" + "sha256-vudWpiyA9u3f5v191Ajh/K5EvZJLeaKxqjo5oPjRbuk="; types-aiobotocore-kinesis-video-media = - buildTypesAiobotocorePackage "kinesis-video-media" "2.15.0" - "sha256-OkF8NwJTK9doelF0LCoKivpX8IQL0gJT+WgDEi1ZhkY="; + buildTypesAiobotocorePackage "kinesis-video-media" "2.15.2" + "sha256-t2FvtZiKBLfD/RADQ3+6ZzfUXUnq/PYMAMHj1YQmobU="; types-aiobotocore-kinesis-video-signaling = - buildTypesAiobotocorePackage "kinesis-video-signaling" "2.15.0" - "sha256-/1eZFJLoCnBbvQlSSBgwbEZRCfFdZIUbNIimTVfnxAE="; + buildTypesAiobotocorePackage "kinesis-video-signaling" "2.15.2" + "sha256-ImrtDqLs6k8nQBtXa0gEH34kFlBorZSrX1hCRqV130o="; types-aiobotocore-kinesis-video-webrtc-storage = - buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.15.0" - "sha256-++LfFLQ6NkCs6NwMkJzZYUFvEw1iJA24NV0nq+9eMnY="; + buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.15.2" + "sha256-Jb1oWeQgXmLP7fFSWG5ZgNLzUaZRITNGhVWWMlfQLQc="; types-aiobotocore-kinesisanalytics = - buildTypesAiobotocorePackage "kinesisanalytics" "2.15.0" - "sha256-QaWFDq5DZiaqHZDOt9uat0d+YFsJymd+J+dJ8FBnsJ0="; + buildTypesAiobotocorePackage "kinesisanalytics" "2.15.2" + "sha256-LXVmEz3iHWl3Svg5F3X06CJvStcQdwOlSS8m+uQj+Hk="; types-aiobotocore-kinesisanalyticsv2 = - buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.15.0" - "sha256-qoGXnmE2xrttERNdlD0vcgGvusymNo43Qmke53Cu9O0="; + buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.15.2" + "sha256-RCz0ySwc+gWzyVDKTFT2pXkqy9PEmg6uF8BOoLHzvmA="; types-aiobotocore-kinesisvideo = - buildTypesAiobotocorePackage "kinesisvideo" "2.15.0" - "sha256-i5itjd7OC0MIzdV4cXYk/jKnL/fi7PqfcjBqEBxOGpU="; + buildTypesAiobotocorePackage "kinesisvideo" "2.15.2" + "sha256-m1movOOFQVLCzKSCWSoYv03Ig9D0qJ17O73tk4XaTX0="; types-aiobotocore-kms = - buildTypesAiobotocorePackage "kms" "2.15.0" - "sha256-tNrJ8m8e1yvBxcnAFbwDPr6mLQSEYCuip/6cnIfnkYw="; + buildTypesAiobotocorePackage "kms" "2.15.2" + "sha256-9EXCtfSVjSuyszl3H8Llk5j/KYmU9HSUFP/k1Btrlv4="; types-aiobotocore-lakeformation = - buildTypesAiobotocorePackage "lakeformation" "2.15.0" - "sha256-db+t78Wdjp9Q0Yelq00j4uGO3COAq9wAQMiS04OHCDM="; + buildTypesAiobotocorePackage "lakeformation" "2.15.2" + "sha256-zYavyl1U94TCsmjyVhedtexjl0B+2FN3jo6Dg2adePo="; types-aiobotocore-lambda = - buildTypesAiobotocorePackage "lambda" "2.15.0" - "sha256-+zVb3jcfhxcwdZInmNgI5XD8kYg+cOztM5+vKw0NQig="; + buildTypesAiobotocorePackage "lambda" "2.15.2" + "sha256-vRsrDk4dzT7wsCeaNE2dnf8blwM/Unb3lAN8Dc0x7SA="; types-aiobotocore-lex-models = - buildTypesAiobotocorePackage "lex-models" "2.15.0" - "sha256-CTBYSHSjk140r5/ntNrbhCW9qHyJkHKnuzDGy/VnvkA="; + buildTypesAiobotocorePackage "lex-models" "2.15.2" + "sha256-jSO3wtWRgXuPCHFfFgBDw0lMsOYb1IjqzCmo1WX6Gr4="; types-aiobotocore-lex-runtime = - buildTypesAiobotocorePackage "lex-runtime" "2.15.0" - "sha256-HTMVi8/mDsMfLYxbOa1JoOqfFGyG87k5PDy6QBCWmFo="; + buildTypesAiobotocorePackage "lex-runtime" "2.15.2" + "sha256-BdaqbSjKpsFeDTh7ttj1j48YDSMP651UpgmqmM82KpI="; types-aiobotocore-lexv2-models = - buildTypesAiobotocorePackage "lexv2-models" "2.15.0" - "sha256-n+YKYwgx6LK4biiy7R0jroAniQH5eyJAZNCwt3bmd5U="; + buildTypesAiobotocorePackage "lexv2-models" "2.15.2" + "sha256-sJZcOkCK9x7RsFo6mVR7FGmictWprwVUlPpzuMbQEn4="; types-aiobotocore-lexv2-runtime = - buildTypesAiobotocorePackage "lexv2-runtime" "2.15.0" - "sha256-dsNybSvDpCf8WcCyLmsoNmvGyAYjOPMpaZEuT1Uon6w="; + buildTypesAiobotocorePackage "lexv2-runtime" "2.15.2" + "sha256-dmn/Q2ljn4+AIryiIcytMGxAS92Q0vZdv2yuuA3/0vo="; types-aiobotocore-license-manager = - buildTypesAiobotocorePackage "license-manager" "2.15.0" - "sha256-A/uBBx6+WR/QfyVSRoQ5QvxgJBoKYKomaV4Fy9bpdXs="; + buildTypesAiobotocorePackage "license-manager" "2.15.2" + "sha256-HfsmPqnNEoBM/Q6d5GbhV1qykXlO2KE9DURQi7cEnBo="; types-aiobotocore-license-manager-linux-subscriptions = - buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.15.0" - "sha256-Fsr3RTvMDVSagXHnZj2NMoqLjcVIYBGWKT5WsnIWebg="; + buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.15.2" + "sha256-u4pZBE0deFVSfZ4B5LXXXOBDb/SkpnCTi1pHQ7ZVyb0="; types-aiobotocore-license-manager-user-subscriptions = - buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.15.0" - "sha256-UDxwOQm+n6wABPchWLmTFE0K1CjPiQwISmLl+7Za9w4="; + buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.15.2" + "sha256-Ldd8K7DIjE0cNqvdWWVno2ehVzmtdt9IyLdUKuM1k5k="; types-aiobotocore-lightsail = - buildTypesAiobotocorePackage "lightsail" "2.15.0" - "sha256-iIDdWLBhFNNxtMSardWyzHL8JcvgHJIaudJ+05PXL7Q="; + buildTypesAiobotocorePackage "lightsail" "2.15.2" + "sha256-Odx5WGYh8Xlv6ahMuNjj3XzXftrKQdILAoGMoDz9aBQ="; types-aiobotocore-location = - buildTypesAiobotocorePackage "location" "2.15.0" - "sha256-fodpQvoIPV1oTNgnSfW+3zM4AMLwe3pHVtYwZYB2kaA="; + buildTypesAiobotocorePackage "location" "2.15.2" + "sha256-KjQ02j1x55qp+6RA1pWe4z53rUgd0Z59dp4vjHVSwlY="; types-aiobotocore-logs = - buildTypesAiobotocorePackage "logs" "2.15.0" - "sha256-ZhbzssEml+X1laF9Cs2MegVLZ4EJCV3E4ZxLW12vEKU="; + buildTypesAiobotocorePackage "logs" "2.15.2" + "sha256-4cxlv7ZSVy92Ewm5jgjqAXRKjFOczaYhl74zR+wGltU="; types-aiobotocore-lookoutequipment = - buildTypesAiobotocorePackage "lookoutequipment" "2.15.0" - "sha256-H2iedaGVN7uM7BLlzcnhdSbDQI96paStbohcijsRBUk="; + buildTypesAiobotocorePackage "lookoutequipment" "2.15.2" + "sha256-gEmhfU9rLE2hFRumda25SSBqhgOgZFza0lPiN+z6sGs="; types-aiobotocore-lookoutmetrics = - buildTypesAiobotocorePackage "lookoutmetrics" "2.15.0" - "sha256-VqVU6ziEvRtSQ60jPw2/XZo7dZTyAaLNUZ+6W9V8x+g="; + buildTypesAiobotocorePackage "lookoutmetrics" "2.15.2" + "sha256-VN3E+UkX8wvQqY3J5SSIfCcpDM/wfuqMvX6KbMUfFkU="; types-aiobotocore-lookoutvision = - buildTypesAiobotocorePackage "lookoutvision" "2.15.0" - "sha256-7NoKEpbYPGMaaE2l8fzvE7wymcHOGy7La7sPzTWZzn8="; + buildTypesAiobotocorePackage "lookoutvision" "2.15.2" + "sha256-6Tpk8lEKtYjIiXNI1VgH65RkCc6/Cp9qhB/5NHtl0ok="; types-aiobotocore-m2 = - buildTypesAiobotocorePackage "m2" "2.15.0" - "sha256-oR4biBouqRzHpLi8t62eicIBAC6uDxKhHCFJXcw98VA="; + buildTypesAiobotocorePackage "m2" "2.15.2" + "sha256-ZK+mMbIaY2BmeZU0P4GTMcbTcUOJ1k0ErkRTDu/LdeQ="; types-aiobotocore-machinelearning = - buildTypesAiobotocorePackage "machinelearning" "2.15.0" - "sha256-/7OUplbaSrqFCX6FM5It2M0einbHeKdPuhlPuW1oAf0="; + buildTypesAiobotocorePackage "machinelearning" "2.15.2" + "sha256-CkcJc43D+K24tN+MO48iIpkWINQ5v39Us6XiAerY5ug="; types-aiobotocore-macie = buildTypesAiobotocorePackage "macie" "2.7.0" "sha256-hJJtGsK2b56nKX1ZhiarC+ffyjHYWRiC8II4oyDZWWw="; types-aiobotocore-macie2 = - buildTypesAiobotocorePackage "macie2" "2.15.0" - "sha256-sZbckbmw1LfBLDiRjtfk2ogZe45H35vViBvr/z/syY8="; + buildTypesAiobotocorePackage "macie2" "2.15.2" + "sha256-XVUlAYWbCKlIHDD0KnAf1x5aIzPQOwDF/MUf2Cn0w2E="; types-aiobotocore-managedblockchain = - buildTypesAiobotocorePackage "managedblockchain" "2.15.0" - "sha256-rCmVEy/oDykR2eiEZ8K1rP+M9hvie8Fr/aVXGX/mnng="; + buildTypesAiobotocorePackage "managedblockchain" "2.15.2" + "sha256-bS54O33UB62+P6Lz+u4zzBDMP/dGG0EQYzJwabrLEzE="; types-aiobotocore-managedblockchain-query = - buildTypesAiobotocorePackage "managedblockchain-query" "2.15.0" - "sha256-234BPfns0M64IQL6zLw2YXrEm6Gv9dr8jFZ6W9kiIFc="; + buildTypesAiobotocorePackage "managedblockchain-query" "2.15.2" + "sha256-tI0WjxdRupLqL437/Q9W7Yd6PEzU2GBsfAGU/3UssG8="; types-aiobotocore-marketplace-catalog = - buildTypesAiobotocorePackage "marketplace-catalog" "2.15.0" - "sha256-xt9u8d4mUUzkieGKwsh/682O1EFplNOCvf/5RuEL9iA="; + buildTypesAiobotocorePackage "marketplace-catalog" "2.15.2" + "sha256-L23ZQ4bGhQtHat3xWT/IIbrTr4UnZ1wY2Cco9Z4ae4s="; types-aiobotocore-marketplace-entitlement = - buildTypesAiobotocorePackage "marketplace-entitlement" "2.15.0" - "sha256-ZQOMPaczJfEeHHPv4GWKKrQUOBDZLBIqol4fhriAhzA="; + buildTypesAiobotocorePackage "marketplace-entitlement" "2.15.2" + "sha256-7SXKNz2Lz2aewLAcKVvuIZShdGCRHZbwyKy2araKo3A="; types-aiobotocore-marketplacecommerceanalytics = - buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.15.0" - "sha256-ykZADFdCQ78IlBanzIQuWiHV5p7DuI4QPYwle1H63Bw="; + buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.15.2" + "sha256-qbAaQevFItdsIk7Je5ng9EMrTgVRfMmSmCeYSH7BXMY="; types-aiobotocore-mediaconnect = - buildTypesAiobotocorePackage "mediaconnect" "2.15.0" - "sha256-Glz572WmmAhDL7s2sBNACPwSZhB3c0JzvycEZGLIMoc="; + buildTypesAiobotocorePackage "mediaconnect" "2.15.2" + "sha256-DwyW/Lz2TcJUpS21SZAJCZR9nySSFN7/k4Hwea51QDo="; types-aiobotocore-mediaconvert = - buildTypesAiobotocorePackage "mediaconvert" "2.15.0" - "sha256-T2S8GaUePcH/bnCOFbt1Tu9Fudhv+xoBEhJX6giF2a0="; + buildTypesAiobotocorePackage "mediaconvert" "2.15.2" + "sha256-xEi7pQSuq7vkcGrZx7/LSHDiGc0yRy5yDLB+R1Sw9i4="; types-aiobotocore-medialive = - buildTypesAiobotocorePackage "medialive" "2.15.0" - "sha256-1pBMtaFdCzCWv2OXdP36NaeoLInFqlLTG46cSbWHihg="; + buildTypesAiobotocorePackage "medialive" "2.15.2" + "sha256-XejVpsX2j0u2TTB7y/ZkwCeBhKLQOpCuJm0BL88ocAg="; types-aiobotocore-mediapackage = - buildTypesAiobotocorePackage "mediapackage" "2.15.0" - "sha256-3AQtWf67flmSz6pJ4HMzClD4qyuQUFafpGB74D8KJTA="; + buildTypesAiobotocorePackage "mediapackage" "2.15.2" + "sha256-SxNd+WdyHA0ijqV3urXldQXeMew19EUydNArzMdHSZk="; types-aiobotocore-mediapackage-vod = - buildTypesAiobotocorePackage "mediapackage-vod" "2.15.0" - "sha256-BPQwsGw/xXEP5SeDhIQRu376UQ9AiP7M7hy+B5j56tw="; + buildTypesAiobotocorePackage "mediapackage-vod" "2.15.2" + "sha256-OaJv/gY2yhR6rMstJx88NQY/IBO9NxqleUY4gfq5dd0="; types-aiobotocore-mediapackagev2 = - buildTypesAiobotocorePackage "mediapackagev2" "2.15.0" - "sha256-Yjr+/QxMF6E7c5jsYzjptKMzMSezcSE/u5rVqBu2nGw="; + buildTypesAiobotocorePackage "mediapackagev2" "2.15.2" + "sha256-8mQbc9Wp8PvcyHocdcR9VS1jyJYGnwCuB4qk1iGq4DA="; types-aiobotocore-mediastore = - buildTypesAiobotocorePackage "mediastore" "2.15.0" - "sha256-YsgTZ0j3i3nlEERkF4fLqVn5M9pkzguFqthx5XSVn1E="; + buildTypesAiobotocorePackage "mediastore" "2.15.2" + "sha256-HvMe5b/WoUL6osOakD4z3fGfC5dPWphZFXijpqVL4tk="; types-aiobotocore-mediastore-data = - buildTypesAiobotocorePackage "mediastore-data" "2.15.0" - "sha256-ZnYZPMBhRC7e8kot/7RXCbXYGS5cU0NRfXiAdWgXVAA="; + buildTypesAiobotocorePackage "mediastore-data" "2.15.2" + "sha256-FqbPAwpzikmawdrNa1/R0SGj0G4WqGRxBT6xceJHX1A="; types-aiobotocore-mediatailor = - buildTypesAiobotocorePackage "mediatailor" "2.15.0" - "sha256-FjHfv8tfQVFk0iBD8np1KCQFX+BuprkIiEAUJCEDPn0="; + buildTypesAiobotocorePackage "mediatailor" "2.15.2" + "sha256-iHjBmnvn2Rzo62Ep1bjJoZKNVGArtwxdOZoT1+SneqE="; types-aiobotocore-medical-imaging = - buildTypesAiobotocorePackage "medical-imaging" "2.15.0" - "sha256-sxbmmX7Y7NoyZzOPq3+vQFU57JrBStsWHMZig3E2ZUc="; + buildTypesAiobotocorePackage "medical-imaging" "2.15.2" + "sha256-UXzTpoFnuJQRwJfahcWSfYO9lWuEP9W+CZWiGdiupPQ="; types-aiobotocore-memorydb = - buildTypesAiobotocorePackage "memorydb" "2.15.0" - "sha256-C6dAMsCasQw2+bPFnBJVUZHdKUodT1zLKYVGizI0UiA="; + buildTypesAiobotocorePackage "memorydb" "2.15.2" + "sha256-lFetqAmP6lwKTmJEhS1wcydBgePh4/hhkq/ngHAqxHw="; types-aiobotocore-meteringmarketplace = - buildTypesAiobotocorePackage "meteringmarketplace" "2.15.0" - "sha256-UG5Wy/1Fb3JwSL9cbzegHIj/UmVDyBIW0PhovEMMtZs="; + buildTypesAiobotocorePackage "meteringmarketplace" "2.15.2" + "sha256-wT3cz2FprMmyhag/0ZODuHFiB+qKD6LKvehs8PWP8m4="; types-aiobotocore-mgh = - buildTypesAiobotocorePackage "mgh" "2.15.0" - "sha256-YGh12HkugOCGThtFOM/YGTGSsAqhkdyLXwe/DUo06JE="; + buildTypesAiobotocorePackage "mgh" "2.15.2" + "sha256-uxukwGScWYD2oCXu8vPu6o2BJiLtnMuIXIgqXFF5VGA="; types-aiobotocore-mgn = - buildTypesAiobotocorePackage "mgn" "2.15.0" - "sha256-pt+o3fHfEZ+i0nTtA3aL9N5835Z2fJPDTI27ct1Q6ts="; + buildTypesAiobotocorePackage "mgn" "2.15.2" + "sha256-lXlNAFEQbteRMGiOfSpBF1AF12UYjc64sXaOVN6KZRg="; types-aiobotocore-migration-hub-refactor-spaces = - buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.15.0" - "sha256-UVbGGevpTSsk/5u4ZM4ssbupT4NNJOXRS1j6Ar6NTvg="; + buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.15.2" + "sha256-Ndj1DdPIam1NG5zAzKJkilE0TDHGykywc2hpxvWNyPY="; types-aiobotocore-migrationhub-config = - buildTypesAiobotocorePackage "migrationhub-config" "2.15.0" - "sha256-isZ/J3BH52c3kADs3QV6NCaN4U1W0SLH+2vx5FBUfYM="; + buildTypesAiobotocorePackage "migrationhub-config" "2.15.2" + "sha256-LXu7VQkVpgqIMD7ucMV4Kj/Zv6FoFDvLX8rYjtO2ijg="; types-aiobotocore-migrationhuborchestrator = - buildTypesAiobotocorePackage "migrationhuborchestrator" "2.15.0" - "sha256-21q8uRwtbfsX03ayhHNFecq8ZC/VTYZENmpWauk1oL0="; + buildTypesAiobotocorePackage "migrationhuborchestrator" "2.15.2" + "sha256-Te1jZDw3UjMBM6DlCj38Nn42xRt86WzHGaJnjbobDMs="; types-aiobotocore-migrationhubstrategy = - buildTypesAiobotocorePackage "migrationhubstrategy" "2.15.0" - "sha256-xXmi5qhzx4ZNTwXxAwOkPHHuMVevdjgm6ER0V/zaDf4="; + buildTypesAiobotocorePackage "migrationhubstrategy" "2.15.2" + "sha256-IkE/I9X6FXqNBsMUM2/lQ2SVIIaY8PtAyx0d4XA94BE="; types-aiobotocore-mobile = buildTypesAiobotocorePackage "mobile" "2.13.2" "sha256-OxB91BCAmYnY72JBWZaBlEkpAxN2Q5aY4i1Pt3eD9hc="; types-aiobotocore-mq = - buildTypesAiobotocorePackage "mq" "2.15.0" - "sha256-c/m/RAQabQHFWArEYuvEWjekBSyh+gPTHYlwNnpQ7r0="; + buildTypesAiobotocorePackage "mq" "2.15.2" + "sha256-VY6tLjwGYbJte8xoit/gIVuMSGkygYhpGrCVwmkcD+c="; types-aiobotocore-mturk = - buildTypesAiobotocorePackage "mturk" "2.15.0" - "sha256-vtZK0eYARSRbn9RpRK4yrKz0erx75YoFCPjuGBV2ztM="; + buildTypesAiobotocorePackage "mturk" "2.15.2" + "sha256-wmnepAFZGXOk6+/G0XToAQBxPyrtmyGIl9DYcaQIwrI="; types-aiobotocore-mwaa = - buildTypesAiobotocorePackage "mwaa" "2.15.0" - "sha256-uI+uv/D25J/bkTAS3koq7rOgGimhDhHTW2ChCk9mTP0="; + buildTypesAiobotocorePackage "mwaa" "2.15.2" + "sha256-sjXYuZf6yffeiu4A/FYXebGTFr408e7QKNmML2y2yTA="; types-aiobotocore-neptune = - buildTypesAiobotocorePackage "neptune" "2.15.0" - "sha256-MiH4jhgesSLxaeFzzEJfuorkAC60ncXGRfg1EFvT/Qg="; + buildTypesAiobotocorePackage "neptune" "2.15.2" + "sha256-hpnEfol8cLYk8AuIaBRitNIJoEMv1jvWzNED1b4xqfA="; types-aiobotocore-network-firewall = - buildTypesAiobotocorePackage "network-firewall" "2.15.0" - "sha256-NLBghjcr8XbHnSaZVGxUj3jCinFZkmxagLlDMjQFCbM="; + buildTypesAiobotocorePackage "network-firewall" "2.15.2" + "sha256-rMaMUBlbxJKeRIX/eEKtYrO0mXiDdWyZ0x4GfoDw2iY="; types-aiobotocore-networkmanager = - buildTypesAiobotocorePackage "networkmanager" "2.15.0" - "sha256-fA1CFdV5G+3BeJFqGb/61Mh4fDgUCIHZEHb3+Po1d70="; + buildTypesAiobotocorePackage "networkmanager" "2.15.2" + "sha256-JbN4suHNPpgGnkz4HnEmZXF4HMVnzMDd9DO6/xnzOgo="; types-aiobotocore-nimble = - buildTypesAiobotocorePackage "nimble" "2.15.0" - "sha256-0Fp0TZK21QeaKPUQ9prOE7IaDirSGBVEgH8yv8KKy20="; + buildTypesAiobotocorePackage "nimble" "2.15.2" + "sha256-PChX5Jbgr0d1YaTZU9AbX3cM7NrhkyunK6/X3l+I8Q0="; types-aiobotocore-oam = - buildTypesAiobotocorePackage "oam" "2.15.0" - "sha256-1EU1ZCtMoCQaCWnSXlrayKKaC9l82y4Edc2kc2Rm/EQ="; + buildTypesAiobotocorePackage "oam" "2.15.2" + "sha256-VYimOD1qzkRxpieACK1D5Flm1jTMLEkbiRhOczOPiCw="; types-aiobotocore-omics = - buildTypesAiobotocorePackage "omics" "2.15.0" - "sha256-cHrKEgGV79ea9FBdDV4fltKzEDPRsiavuSszM1z7Utw="; + buildTypesAiobotocorePackage "omics" "2.15.2" + "sha256-NjwwQvLdS4yaH+0lWiO3WdCbYkEm7Xy+WDZ0fZv0iO4="; types-aiobotocore-opensearch = - buildTypesAiobotocorePackage "opensearch" "2.15.0" - "sha256-6S42q0i4SULwjyUEx1YCg5i1kgwz0oXC4tTFdMiG+Po="; + buildTypesAiobotocorePackage "opensearch" "2.15.2" + "sha256-P/5KsryA4IRZ2B8Jvyb4UyhBwIrxAdR1Z1C0KfPgurQ="; types-aiobotocore-opensearchserverless = - buildTypesAiobotocorePackage "opensearchserverless" "2.15.0" - "sha256-o6QHCkyNfjil/O28CCYgflU6E3pUkLZ/flGYcRoIWWE="; + buildTypesAiobotocorePackage "opensearchserverless" "2.15.2" + "sha256-kshUKyoAIgVyIMntWuCrAD+WZ9usxXH1k78y/DqTWvc="; types-aiobotocore-opsworks = - buildTypesAiobotocorePackage "opsworks" "2.15.0" - "sha256-Jg9u7P2vapI3Pwx4DFeWMTy7HriNlro0UctPhSt9TgA="; + buildTypesAiobotocorePackage "opsworks" "2.15.2" + "sha256-KJfyFi4FHoqicPmLnsknrR0Bs2rXiM5fNneR2i9SG6E="; types-aiobotocore-opsworkscm = - buildTypesAiobotocorePackage "opsworkscm" "2.15.0" - "sha256-34frDYBm3pH4/YYpKey/uG0Rv6DbNCXytSV3PnR3QHw="; + buildTypesAiobotocorePackage "opsworkscm" "2.15.2" + "sha256-T+JObJ+jB48uaS39I68YyDxggoWiMj/8Di1PzDCQChU="; types-aiobotocore-organizations = - buildTypesAiobotocorePackage "organizations" "2.15.0" - "sha256-ZnjLqwh2+1N9Zb4nIkcysr+TGnUHBNxqy0vJABIQjuA="; + buildTypesAiobotocorePackage "organizations" "2.15.2" + "sha256-6TYjbdnUOCc29kWZ3RsdscEK40uS0q5fcwhVAZ46yKQ="; types-aiobotocore-osis = - buildTypesAiobotocorePackage "osis" "2.15.0" - "sha256-HH7HaxV6bMywkwTsMXP3QZWc+lyWDzxtHmrZMIY/JOk="; + buildTypesAiobotocorePackage "osis" "2.15.2" + "sha256-zRFrveWqmZ67/Cb8vnmgUCwVgt9oUn9qS8YegKqKwCw="; types-aiobotocore-outposts = - buildTypesAiobotocorePackage "outposts" "2.15.0" - "sha256-kGs9VO15CkvHdSZNA0d7OGUx5Mb/nzJK0kCna9qtRIA="; + buildTypesAiobotocorePackage "outposts" "2.15.2" + "sha256-+Pa7Gy+7aend87amJsaob24WXQWdrpA+Tj17dnrEFaQ="; types-aiobotocore-panorama = - buildTypesAiobotocorePackage "panorama" "2.15.0" - "sha256-JtO0nR0IhaCN8HNFt7YObk0ytdeirfGyXG6EFDguOxk="; + buildTypesAiobotocorePackage "panorama" "2.15.2" + "sha256-7BW09/NkN4AFwR8qhvTs8nYSflG9cozyPFIpS8/Y6FQ="; types-aiobotocore-payment-cryptography = - buildTypesAiobotocorePackage "payment-cryptography" "2.15.0" - "sha256-bqRMxwiGGbMqRFZqkQnsmNq4JWuXZOvLbX51IGeUz/Q="; + buildTypesAiobotocorePackage "payment-cryptography" "2.15.2" + "sha256-4tNGI26K1ejnLwfsCOU0Iy8JiQyjMmDsn6JP9RMG5MI="; types-aiobotocore-payment-cryptography-data = - buildTypesAiobotocorePackage "payment-cryptography-data" "2.15.0" - "sha256-+o4Q5VmzkR9+eGUow5dlS+IyD0ukR//EQ+pbEL1v5QQ="; + buildTypesAiobotocorePackage "payment-cryptography-data" "2.15.2" + "sha256-ZXVhYvin2ZjjusSXkg3byqW5QHtFEyd1uufi9nWvutM="; types-aiobotocore-personalize = - buildTypesAiobotocorePackage "personalize" "2.15.0" - "sha256-jH5M7kLBNUQAsct741zqKB5OsZyIOMLbzKi96Wem4OY="; + buildTypesAiobotocorePackage "personalize" "2.15.2" + "sha256-3CPcx8rP6N59eoooZej/qcySZYIiRl7j8B96KB9CD7s="; types-aiobotocore-personalize-events = - buildTypesAiobotocorePackage "personalize-events" "2.15.0" - "sha256-KBsvNpf8J53cucgF/auehCMsMCnVxixaGMIiW9YeSvM="; + buildTypesAiobotocorePackage "personalize-events" "2.15.2" + "sha256-jW4ZIOw2dPuebRyaQzl/aV5X5g3d+HyR96nK15KabKA="; types-aiobotocore-personalize-runtime = - buildTypesAiobotocorePackage "personalize-runtime" "2.15.0" - "sha256-Yf6yWHC2UqVHsxXc8ei6o6GPx8aAuhfMCkf7H/MoHzI="; + buildTypesAiobotocorePackage "personalize-runtime" "2.15.2" + "sha256-hQiddMrXRgWmQjIiytIIk3S3hYAyiSyM5wfGQ/PQtuo="; types-aiobotocore-pi = - buildTypesAiobotocorePackage "pi" "2.15.0" - "sha256-Bc0f8YGFQmCybeec+SnhpWYTbGQFyt7P4WtUMc4hIuY="; + buildTypesAiobotocorePackage "pi" "2.15.2" + "sha256-S+Zf7VW+F1x4gnWVYJyTyvA/31mfBlHvVtDiSokuCEo="; types-aiobotocore-pinpoint = - buildTypesAiobotocorePackage "pinpoint" "2.15.0" - "sha256-dHJY2ErvI8iJOdoGV+7f8hlHFtcr756fNiX8MTsXhUE="; + buildTypesAiobotocorePackage "pinpoint" "2.15.2" + "sha256-ajqWceNuGO3+ABzNi5rFook4tdWo7diCkfYIaNnCnqI="; types-aiobotocore-pinpoint-email = - buildTypesAiobotocorePackage "pinpoint-email" "2.15.0" - "sha256-Dpdpfga05sbxoEiwmMwa9bYaclrrOK4HpOmqERoAYJw="; + buildTypesAiobotocorePackage "pinpoint-email" "2.15.2" + "sha256-pMgodwm9Ihz99d/C+hP5Z5ZxSA9WQ5sOJu407j6w+9s="; types-aiobotocore-pinpoint-sms-voice = - buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.15.0" - "sha256-HAZyyUB+jpMcTwlUEJwmOxv6pTiyhWYdpbWnShVux2k="; + buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.15.2" + "sha256-8E6frTBvs14nYtfhaWi+/5HTDhNGWcHMAktQ+DhARdY="; types-aiobotocore-pinpoint-sms-voice-v2 = - buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.15.0" - "sha256-pI+ICkq+DyuutwMHngQYxprvQqdExaL0Fx8pDHDQ4MU="; + buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.15.2" + "sha256-WWwFEhAEls6dVX9WNZrWywV4egtd1bt5n3pOCEb1p00="; types-aiobotocore-pipes = - buildTypesAiobotocorePackage "pipes" "2.15.0" - "sha256-MIBeZQBCCfmi6iehHD29uWX2ArGlyWA3wlTgVhBie2s="; + buildTypesAiobotocorePackage "pipes" "2.15.2" + "sha256-5QD0FgHLNbU9BnppJtB7RKMg9cdOz0ILkF/gkR7igs4="; types-aiobotocore-polly = - buildTypesAiobotocorePackage "polly" "2.15.0" - "sha256-g/MJiOG6PulfS5KpWxZqRS7eGNr83O6Q1wyoZvidXrA="; + buildTypesAiobotocorePackage "polly" "2.15.2" + "sha256-r6onIkXMgieQ9xtjuaGsQqq52OOq6k/DUz3jO5uYi6U="; types-aiobotocore-pricing = - buildTypesAiobotocorePackage "pricing" "2.15.0" - "sha256-egYnlcrzy8pZcIALNJSsW5AFfQ5O/2vQYTupGDBvNKE="; + buildTypesAiobotocorePackage "pricing" "2.15.2" + "sha256-5IvT+CsBX3WBfz0f2CVGAtal+SprCAqO7CGKOwSLpLQ="; types-aiobotocore-privatenetworks = - buildTypesAiobotocorePackage "privatenetworks" "2.15.0" - "sha256-fPrRL1QyMOvF2sg5axx6Czoa1Ad5kNs/j8MLqEh6dDE="; + buildTypesAiobotocorePackage "privatenetworks" "2.15.2" + "sha256-gfnx+RgpiZCtLmIPWuc3Lz5JM+IgxMsAKvOqxiwJmew="; types-aiobotocore-proton = - buildTypesAiobotocorePackage "proton" "2.15.0" - "sha256-iJTcz8fTcBy3aw97Rn7J4m7Ha5kURK1EZvgiipqz64M="; + buildTypesAiobotocorePackage "proton" "2.15.2" + "sha256-MGL3z4ULEon/EjSCLuN2sB6tAepic+ZG+vVAani6qpQ="; types-aiobotocore-qldb = - buildTypesAiobotocorePackage "qldb" "2.15.0" - "sha256-TZkL/IKBAUWR0meMUTkXqCa49ea8N32Ml67y4xjUA94="; + buildTypesAiobotocorePackage "qldb" "2.15.2" + "sha256-dX2wLRIg977khlZoVYd9y1UzRMLDorIBHvOhXX2r+KI="; types-aiobotocore-qldb-session = - buildTypesAiobotocorePackage "qldb-session" "2.15.0" - "sha256-uLNMZgaWk9tUwYkG3vZogqyPiTbDmLcJm8GQqT3vqI4="; + buildTypesAiobotocorePackage "qldb-session" "2.15.2" + "sha256-omOG7aWjTBdIHElYE14X7DyQKBNGY5yfOg4IeiL0ooo="; types-aiobotocore-quicksight = - buildTypesAiobotocorePackage "quicksight" "2.15.0" - "sha256-QWXeYC6ZVd6tBDfOWtA1zUU7z2L0GOTeSuJiOvF2nZw="; + buildTypesAiobotocorePackage "quicksight" "2.15.2" + "sha256-U+151xlZAGz+JgIJD/mU9C1z85UCimqOubaX3x/0nhg="; types-aiobotocore-ram = - buildTypesAiobotocorePackage "ram" "2.15.0" - "sha256-BwuU/43NqfuZt99u0BtLjOye61pyLyFm55SbGR+mcEM="; + buildTypesAiobotocorePackage "ram" "2.15.2" + "sha256-lp2oA2JBXSgniu5MJR6F+HeSczlc+w4wj7zyPggA6dY="; types-aiobotocore-rbin = - buildTypesAiobotocorePackage "rbin" "2.15.0" - "sha256-0TrXf6db1xP42f9eJTBnzWr7w2su8Y0ExFTWmqV73fw="; + buildTypesAiobotocorePackage "rbin" "2.15.2" + "sha256-sFrrTWJkFCMkF4gxH3nQvctzMag234P3gN0tKyvvZrE="; types-aiobotocore-rds = - buildTypesAiobotocorePackage "rds" "2.15.0" - "sha256-X2fN3CYSDbqk6ImaaE4oVxOZbpN/UQzp1wMAFuOq7uY="; + buildTypesAiobotocorePackage "rds" "2.15.2" + "sha256-lz03bzDbmAvjc0s5hKeuOohycOcj1wAZsePeWYGp5ts="; types-aiobotocore-rds-data = - buildTypesAiobotocorePackage "rds-data" "2.15.0" - "sha256-vyi+0YaxujcmWQfm/vQaWY/iozoFTNHRkJsCqBDSby4="; + buildTypesAiobotocorePackage "rds-data" "2.15.2" + "sha256-WTb2V9H5MmEtDsboJmQPoRLRNWCL1Ot+myoRRBpDphw="; types-aiobotocore-redshift = - buildTypesAiobotocorePackage "redshift" "2.15.0" - "sha256-wavvzMsczE/TJJEqcCLVm7t2QHscZuv8TS6Qsuuu990="; + buildTypesAiobotocorePackage "redshift" "2.15.2" + "sha256-ErKPn+GGiujvvRps8FIY+QRo0ycQQ4t8tYE64iwqrw8="; types-aiobotocore-redshift-data = - buildTypesAiobotocorePackage "redshift-data" "2.15.0" - "sha256-JK3ZCluyF9pReeLHZy4AjgRIJTzmabb4vYakuHIracs="; + buildTypesAiobotocorePackage "redshift-data" "2.15.2" + "sha256-bxQv1ESSEBG3elReQbKurlEv3jMrfdztBbn7kIwrlJk="; types-aiobotocore-redshift-serverless = - buildTypesAiobotocorePackage "redshift-serverless" "2.15.0" - "sha256-aw/ubbtRU1rGRnYr1j2a/WQTohYjJhBmNJ8nP9Kxk4Y="; + buildTypesAiobotocorePackage "redshift-serverless" "2.15.2" + "sha256-EyciPvrLkG0maSoyVFRkV1gA30vPF+MybM0j4gtwjwA="; types-aiobotocore-rekognition = - buildTypesAiobotocorePackage "rekognition" "2.15.0" - "sha256-Ptv7sgRHVfbtRIEQM/M0Di0UPIVZC79Td15H2SHyTsE="; + buildTypesAiobotocorePackage "rekognition" "2.15.2" + "sha256-dqoAVV2zwCwgfIBb72gLSXminPq4FgPYYzZlzxumkrY="; types-aiobotocore-resiliencehub = - buildTypesAiobotocorePackage "resiliencehub" "2.15.0" - "sha256-/tJDFZQCnSvww/Mp8xL0AGhJxTmCCeI68fkvC4TSbjU="; + buildTypesAiobotocorePackage "resiliencehub" "2.15.2" + "sha256-o8TBetwKqzHJj7ISkhgX9iPpt8CvZ5M3LFYmfEqmCDI="; types-aiobotocore-resource-explorer-2 = - buildTypesAiobotocorePackage "resource-explorer-2" "2.15.0" - "sha256-yF8QaebGjKkuqZKU0kkgSjXBmVpVnGdhuGG8jYi8UP0="; + buildTypesAiobotocorePackage "resource-explorer-2" "2.15.2" + "sha256-hQ+Jc8m4q7Q7zHSJyCL62ugAMNeFLbEA8LJ6VQ9LVHo="; types-aiobotocore-resource-groups = - buildTypesAiobotocorePackage "resource-groups" "2.15.0" - "sha256-mxFaUb2cLNLaq9+pdUbfumO096kr2Ic2qGdKirR41LE="; + buildTypesAiobotocorePackage "resource-groups" "2.15.2" + "sha256-T1gIcrRPXWbfzYReB/MBLcYUjUhiDqbcah/kGKx6g9s="; types-aiobotocore-resourcegroupstaggingapi = - buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.15.0" - "sha256-4ISZza2xs+0qJ61oLDRI+a8PIS2Dw5ybWjmWpMzW4UQ="; + buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.15.2" + "sha256-fa/EoxdXi5Vd0R2eHexVx9PSiesVyw/0okGpHIGd7I8="; types-aiobotocore-robomaker = - buildTypesAiobotocorePackage "robomaker" "2.15.0" - "sha256-8R7Sy54+dC+PlgBmZ60vI0ZC31IqPbqv6x0kM4oomlE="; + buildTypesAiobotocorePackage "robomaker" "2.15.2" + "sha256-ShnMPJzy/isQNqwYiBBb3B7tEr/ydi6weW/J+Bu6XoU="; types-aiobotocore-rolesanywhere = - buildTypesAiobotocorePackage "rolesanywhere" "2.15.0" - "sha256-8iyTLdJAWs9ptCUoeh9BkPQ50uCMRoT/NnKrQ8OajDc="; + buildTypesAiobotocorePackage "rolesanywhere" "2.15.2" + "sha256-Td97qtNPStvbV/1vILYZ/TTtpngndk/7s1wAORakKeQ="; types-aiobotocore-route53 = - buildTypesAiobotocorePackage "route53" "2.15.0" - "sha256-UgH+fKQ+qsstCcPyvFUsG3ToMtJJCY4qlCkhMsfQfIM="; + buildTypesAiobotocorePackage "route53" "2.15.2" + "sha256-olwrQiY0EOvIJMFX/wQKT1dKzIGDlOEMrqvx2cVxOCA="; types-aiobotocore-route53-recovery-cluster = - buildTypesAiobotocorePackage "route53-recovery-cluster" "2.15.0" - "sha256-4Zt9w4r3OxoXOQH0o8nmamEWWwA36yBaAFNeX0trDk0="; + buildTypesAiobotocorePackage "route53-recovery-cluster" "2.15.2" + "sha256-T1kYpmeMmvQOZkxqeCDbab2HNFBcX7I7wc28gB66UHU="; types-aiobotocore-route53-recovery-control-config = - buildTypesAiobotocorePackage "route53-recovery-control-config" "2.15.0" - "sha256-z5WITGBPD7P+k33UL9rD5VLavtyXV3LAZcv0FpgC6/w="; + buildTypesAiobotocorePackage "route53-recovery-control-config" "2.15.2" + "sha256-/yWRQIwfwZjkDooNl3GmbGrlxD1vSTk/2NrrQpG3IJc="; types-aiobotocore-route53-recovery-readiness = - buildTypesAiobotocorePackage "route53-recovery-readiness" "2.15.0" - "sha256-Wc1AnMZa92WjRuc+rVePRadTSdcZfEAYOnmOyEpMaHs="; + buildTypesAiobotocorePackage "route53-recovery-readiness" "2.15.2" + "sha256-1+TJUQ5LPWnHDcR41at5C5lKf92euYVer6BXLfs8r3A="; types-aiobotocore-route53domains = - buildTypesAiobotocorePackage "route53domains" "2.15.0" - "sha256-jUSEzlaMkj8Wj7VGXpIRwYHFl6n9Ei8dSgMIROtXsPo="; + buildTypesAiobotocorePackage "route53domains" "2.15.2" + "sha256-xsAKhJBxAWzhCP2lUwcQ9jp4M/Av0nOae+ToMG4p1hQ="; types-aiobotocore-route53resolver = - buildTypesAiobotocorePackage "route53resolver" "2.15.0" - "sha256-CUJK2fsYrzHtm/XOXIFY2XYflI7XS7V9p2LyLxb6Cus="; + buildTypesAiobotocorePackage "route53resolver" "2.15.2" + "sha256-JNzO/R8OfmPhpPBCt2YIS420mXAuKadpB+/h8r1VccY="; types-aiobotocore-rum = - buildTypesAiobotocorePackage "rum" "2.15.0" - "sha256-qke+xaXPd7UjBq0C1eEjw8zwjd2hpuQ/XP3FJNULKgY="; + buildTypesAiobotocorePackage "rum" "2.15.2" + "sha256-KEjeiHaU2MjBHxDJzFgIZtsfnj/7vEzlixeAu8+KRm4="; types-aiobotocore-s3 = - buildTypesAiobotocorePackage "s3" "2.15.0" - "sha256-S3ZBfYlpZqBkUNgWNirNYkwlshwEDdEJVlJ+61Gdz/c="; + buildTypesAiobotocorePackage "s3" "2.15.2" + "sha256-Hr7IrJ3+a7+7OT6zTSkEdnBfq3aNKVjG0h2dv7dScs4="; types-aiobotocore-s3control = - buildTypesAiobotocorePackage "s3control" "2.15.0" - "sha256-L9YP3AIR4wn4m+eG8mHrK8M+IzrVlSC1j/NMeWTLXDU="; + buildTypesAiobotocorePackage "s3control" "2.15.2" + "sha256-4kWotne4SnLV1rEvWJLw/jP+ZiL1BmHQ4uxj/QW2Hb4="; types-aiobotocore-s3outposts = - buildTypesAiobotocorePackage "s3outposts" "2.15.0" - "sha256-CFXrxd2HOtz0Z8sz9aIXLRKRYd9louiLBfixa68l5AU="; + buildTypesAiobotocorePackage "s3outposts" "2.15.2" + "sha256-Dfp04DBqhQBWEokBwtw/ALimFq6ZgzrrV5bZfgG9aQw="; types-aiobotocore-sagemaker = - buildTypesAiobotocorePackage "sagemaker" "2.15.0" - "sha256-hVy9kRYhnec8Q1wJDqZiSek5Ww5QmahwJRJX0V+PjmU="; + buildTypesAiobotocorePackage "sagemaker" "2.15.2" + "sha256-jEAVncpRneLhQ7MN5sdwvRexiTXHBRLD1gfRng2LtXk="; types-aiobotocore-sagemaker-a2i-runtime = - buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.15.0" - "sha256-3jd5E8DSxushqXkIfkS9zm2s2p+iLlJfFBqCJz9STz0="; + buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.15.2" + "sha256-4pAalrOg0umvRj/3xRDsziWl/wHPf+37NhOurtvLJd8="; types-aiobotocore-sagemaker-edge = - buildTypesAiobotocorePackage "sagemaker-edge" "2.15.0" - "sha256-uydOAL5VEfRTL0QLl0aKIdCEjw2RYRp/RRSVMOKKsHs="; + buildTypesAiobotocorePackage "sagemaker-edge" "2.15.2" + "sha256-rCEEed2WVtd506aeYG+KX+ADuqwc3TuYIBO9aGzBjGM="; types-aiobotocore-sagemaker-featurestore-runtime = - buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.15.0" - "sha256-QiOGTUpL0R68Ns+Y3losMUVskv5YHf8/MnrmqeJqgmo="; + buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.15.2" + "sha256-y/5KuNWy3832PAvvPxcTFYrGeTS0SOA3cFM6oaQFGD8="; types-aiobotocore-sagemaker-geospatial = - buildTypesAiobotocorePackage "sagemaker-geospatial" "2.15.0" - "sha256-oQRTnA2lbRkd1Tv7g44GdKuVuq9BZ2PXLTNWUyABKfg="; + buildTypesAiobotocorePackage "sagemaker-geospatial" "2.15.2" + "sha256-joXbxcuxaBX4Nl18oFhhSz5AXme0zVcpmw/vWoziNu4="; types-aiobotocore-sagemaker-metrics = - buildTypesAiobotocorePackage "sagemaker-metrics" "2.15.0" - "sha256-jzwn2HDRNL9QmSEy6V2tNTL6gcHyBXPEQnuBVISy8xY="; + buildTypesAiobotocorePackage "sagemaker-metrics" "2.15.2" + "sha256-LgQn2sOOv7dV2XP87XcD5dz8ZulGK5Ny3wl/YLAAguU="; types-aiobotocore-sagemaker-runtime = - buildTypesAiobotocorePackage "sagemaker-runtime" "2.15.0" - "sha256-RtVl6fH1znkuNWPZ4Ndhb+qplLfDq1n1YzQ9p9Wk6G0="; + buildTypesAiobotocorePackage "sagemaker-runtime" "2.15.2" + "sha256-YMgZ7YH3iTjE26HrcOCLLqs3FF+0f8Dil8t5bTA+gRo="; types-aiobotocore-savingsplans = - buildTypesAiobotocorePackage "savingsplans" "2.15.0" - "sha256-uLmimcAk1vZO+2QlWlpV5LxTSxooYdQNsYET8CJ+tg0="; + buildTypesAiobotocorePackage "savingsplans" "2.15.2" + "sha256-FQaInT6mcJ+f0YooDo4vVJA7ZKrJv2w3Jg29L1GUe7U="; types-aiobotocore-scheduler = - buildTypesAiobotocorePackage "scheduler" "2.15.0" - "sha256-0/WvqWSd8VGISlqrTx8ef6B839PkYzDte2JYRTXwUeM="; + buildTypesAiobotocorePackage "scheduler" "2.15.2" + "sha256-9HbcEJfpfXXSQvTtYXCN5cQSwisIk57OsF+MYecLFh0="; types-aiobotocore-schemas = - buildTypesAiobotocorePackage "schemas" "2.15.0" - "sha256-+RA7DzmObfY/lbo1CCQUDMFacw/mwQGzXG8L44/y5z8="; + buildTypesAiobotocorePackage "schemas" "2.15.2" + "sha256-SvenxkkMais2m/zfzdAehy6Dl5uOZpuBEWq8SWg1z6Q="; types-aiobotocore-sdb = - buildTypesAiobotocorePackage "sdb" "2.15.0" - "sha256-ImfIS00D5p0FYZW43C6ZMz8dvSowWDavlauuTYRIBZg="; + buildTypesAiobotocorePackage "sdb" "2.15.2" + "sha256-/RPhNimi1jEbPiHvJmtkvL/t1dlnYguQsQ2C3uvM9pA="; types-aiobotocore-secretsmanager = - buildTypesAiobotocorePackage "secretsmanager" "2.15.0" - "sha256-w/ngCgJP9V1i11LDIVB1mqaDc3mKhALCpHHpMjoWnL4="; + buildTypesAiobotocorePackage "secretsmanager" "2.15.2" + "sha256-js9F7mkNtanyv2AVZPFGs88b21Ng99yQ7Yrc/UP4LKA="; types-aiobotocore-securityhub = - buildTypesAiobotocorePackage "securityhub" "2.15.0" - "sha256-EM+0L25N202Y3jLmcDz9EzfCr913N+ttbO36s0B2Cjg="; + buildTypesAiobotocorePackage "securityhub" "2.15.2" + "sha256-yrI7hTvxsInp64WWMfMvqBx0qkpoYF8fryV2WC7HrCU="; types-aiobotocore-securitylake = - buildTypesAiobotocorePackage "securitylake" "2.15.0" - "sha256-grQYAC3rSiuW8JoqJr9ESuRx0OrwukhAHZuLBdTYMoc="; + buildTypesAiobotocorePackage "securitylake" "2.15.2" + "sha256-DwJsoRR3NZEVQ3uvploTO3eRqGvMpET96CJm5Gx2kDc="; types-aiobotocore-serverlessrepo = - buildTypesAiobotocorePackage "serverlessrepo" "2.15.0" - "sha256-Vvt7f6trMwQWDIC8jOs0HrkG5UB7OyDZB8QKztYPusM="; + buildTypesAiobotocorePackage "serverlessrepo" "2.15.2" + "sha256-X0o4l4pcJmVnLkA1huf520RqMEFbkMqqs09ZqlFvl8w="; types-aiobotocore-service-quotas = - buildTypesAiobotocorePackage "service-quotas" "2.15.0" - "sha256-NVUuGzwoRUyJu5rZVkJod0BIzIt6flp7egiuM9SzXIo="; + buildTypesAiobotocorePackage "service-quotas" "2.15.2" + "sha256-Pbj9G+3rPMNyJ5Z3wQT4Zvqeb7N2H3ui+9CxcpU1oHU="; types-aiobotocore-servicecatalog = - buildTypesAiobotocorePackage "servicecatalog" "2.15.0" - "sha256-pEUUNvG0GF73VL5o3djXl6bz5UsdUV6Jlz7itavgdqc="; + buildTypesAiobotocorePackage "servicecatalog" "2.15.2" + "sha256-uSkuoDBkYXzGDBLtIX/4tmfFhRFfiWJGHmz5OpJhLek="; types-aiobotocore-servicecatalog-appregistry = - buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.15.0" - "sha256-/8dE7iiNcJ5ExvzorCG1rpbvOp6HNhw3hibymr+Y+z0="; + buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.15.2" + "sha256-qxjPzRVuya2L2yedaMejt8S0iNQkec0mRteahClNFDQ="; types-aiobotocore-servicediscovery = - buildTypesAiobotocorePackage "servicediscovery" "2.15.0" - "sha256-0GNZgK445MrP84a8ZlOyfhbx24EOVWcwJMlK8G0Rjqo="; + buildTypesAiobotocorePackage "servicediscovery" "2.15.2" + "sha256-CHvjmH7uPYJ1o97k+/u2GRK7/R0BaDfA6nhyJl3I0+U="; types-aiobotocore-ses = - buildTypesAiobotocorePackage "ses" "2.15.0" - "sha256-df/+KPwhP26hZIHj+kB8TT0SEmzvA1sSXEAyXOOu/oQ="; + buildTypesAiobotocorePackage "ses" "2.15.2" + "sha256-3jDEReH8mLWDRDaEBGhXnESbvw5l8OANgl6VnYcbN6I="; types-aiobotocore-sesv2 = - buildTypesAiobotocorePackage "sesv2" "2.15.0" - "sha256-17EmuWlNJZA+zIZChhHFkPRC+doE/n+ebPqVk73VtNs="; + buildTypesAiobotocorePackage "sesv2" "2.15.2" + "sha256-6NbQYkz04lWokHuhFpq3yY60HkXKKQkdXztNjW3XGcc="; types-aiobotocore-shield = - buildTypesAiobotocorePackage "shield" "2.15.0" - "sha256-LVdaqwMmqHeBlU++Npje5zo/y9lHkyeNFNNGaETypNk="; + buildTypesAiobotocorePackage "shield" "2.15.2" + "sha256-lxGndPfh8XDcj8e8oKydEPcFfzNiSVXHAgv3rxSg11U="; types-aiobotocore-signer = - buildTypesAiobotocorePackage "signer" "2.15.0" - "sha256-K0R9aAS2jacez/U5l9QIiPsBUwMDlW/bb8blBVkoolY="; + buildTypesAiobotocorePackage "signer" "2.15.2" + "sha256-vVkz6+GhJf8J2d/ZTfbTxIVdnWXA/ye/eq4nCtd/Krw="; types-aiobotocore-simspaceweaver = - buildTypesAiobotocorePackage "simspaceweaver" "2.15.0" - "sha256-Ilus9YxPmEpqLwuwh1GPZeDl/C7wVOUAaVi9xXRLT9E="; + buildTypesAiobotocorePackage "simspaceweaver" "2.15.2" + "sha256-JesS1NX79j37T3K2lAaSAoQ3M0SYHgHWW6w5EGkwgoU="; types-aiobotocore-sms = - buildTypesAiobotocorePackage "sms" "2.15.0" - "sha256-BniFLeuZataAM/NYyOK6iB4b2a/sWtgNRpVfgHsqYiY="; + buildTypesAiobotocorePackage "sms" "2.15.2" + "sha256-BD4R+N71BtyFQDzCR7e84vovWKkNRagloe5Se/oZJPU="; types-aiobotocore-sms-voice = - buildTypesAiobotocorePackage "sms-voice" "2.15.0" - "sha256-9MCKNyOtMOcEl/JpDNd4d9UmdJQFuxOSYVQFoRg3CL4="; + buildTypesAiobotocorePackage "sms-voice" "2.15.2" + "sha256-6UwSaemdRzaFk7fI+W1K7HUQTo93CTuoiQfOtvlroog="; types-aiobotocore-snow-device-management = - buildTypesAiobotocorePackage "snow-device-management" "2.15.0" - "sha256-ZEz4+4y7ebhBOyeYxGUrwSDeqiU2/JDMJM/3i1jqJYU="; + buildTypesAiobotocorePackage "snow-device-management" "2.15.2" + "sha256-8Qt9oOvwGYiDnCNNRzXKGpSF+cxKbQFErROsWS5NQ6o="; types-aiobotocore-snowball = - buildTypesAiobotocorePackage "snowball" "2.15.0" - "sha256-WL3OEnSX9SnfAZeNzknAwCiFTxnS49M8vg4Do+qa7Es="; + buildTypesAiobotocorePackage "snowball" "2.15.2" + "sha256-/NDdsd9AcLcpXAs0tqZ+nHHNJudfxVuYatqJHr9a8oo="; types-aiobotocore-sns = - buildTypesAiobotocorePackage "sns" "2.15.0" - "sha256-zoLt5UlcGqxQZY3LYzL3urQeryT/KQqmlMlMOx5UD9k="; + buildTypesAiobotocorePackage "sns" "2.15.2" + "sha256-7YRa4LucT1Jl8oujdVYsMw/wnRYSSMaZXMaY9qz4mRQ="; types-aiobotocore-sqs = - buildTypesAiobotocorePackage "sqs" "2.15.0" - "sha256-pYlp0b+AowToQQsrIcOS/dA/1a49WwNbojMsWXXroxs="; + buildTypesAiobotocorePackage "sqs" "2.15.2" + "sha256-6R+AHdVU27iziZvPWMzB3iPNaFYvdQkzfHQAOK+PMtI="; types-aiobotocore-ssm = - buildTypesAiobotocorePackage "ssm" "2.15.0" - "sha256-LGuL7mGhe7XVBetPFKrwqswpyMwLO3aXuWRwuWV1n4g="; + buildTypesAiobotocorePackage "ssm" "2.15.2" + "sha256-6b8jBjW+dhoaoM/xx08mZAh4EndISChOQL+mZZp14Q4="; types-aiobotocore-ssm-contacts = - buildTypesAiobotocorePackage "ssm-contacts" "2.15.0" - "sha256-lycHVp5nrD6z0dXwqN5KTs7OGQwAZaAZCM5Gezqj+rQ="; + buildTypesAiobotocorePackage "ssm-contacts" "2.15.2" + "sha256-JsJoes3hiMJsOK9fMaO/xSSgyNR8W0KqxsW49sQ/qFo="; types-aiobotocore-ssm-incidents = - buildTypesAiobotocorePackage "ssm-incidents" "2.15.0" - "sha256-CeSG0L3z5T+tlgrAa/dKU6knE6qKsA6B6+nJXDcgXqg="; + buildTypesAiobotocorePackage "ssm-incidents" "2.15.2" + "sha256-TZ2mFVwjA3UGCnyVIOFNG6GSF1tWD+SP03g8CZZdr6c="; types-aiobotocore-ssm-sap = - buildTypesAiobotocorePackage "ssm-sap" "2.15.0" - "sha256-0Dmwb0nOp3g3HY4gjxXKVRDFl/tjC1ppyzzrftgBkZU="; + buildTypesAiobotocorePackage "ssm-sap" "2.15.2" + "sha256-nJHnIk+XzFLKeNJ3UdM9NslUeJdFhru6cmvvoZUJmTU="; types-aiobotocore-sso = - buildTypesAiobotocorePackage "sso" "2.15.0" - "sha256-a9sxXz66olmSe2+PP27DFTcE9FK+ZFi7mNl3pdcOh8Q="; + buildTypesAiobotocorePackage "sso" "2.15.2" + "sha256-PhoZgQqeNQc3B75O1jIWVNU7lR9uBrJG9GpTfHB1pnI="; types-aiobotocore-sso-admin = - buildTypesAiobotocorePackage "sso-admin" "2.15.0" - "sha256-v+Co+P2VVLLF4HPES1x4gXFfq+m3EnreuD4iequsGis="; + buildTypesAiobotocorePackage "sso-admin" "2.15.2" + "sha256-+Ofbw3lAiX3RtygG9zfxX3i87NVdYmIHKKxq+7NTHHE="; types-aiobotocore-sso-oidc = - buildTypesAiobotocorePackage "sso-oidc" "2.15.0" - "sha256-qZ0w9T/NYTvLfOQ4CwZUoNtwVFmrAH6Ow6r5Lru1Vsk="; + buildTypesAiobotocorePackage "sso-oidc" "2.15.2" + "sha256-ZhEJ9TSH5zbH0a1ukgxX/XwIKrwxFvh/CF9SOAmAd4o="; types-aiobotocore-stepfunctions = - buildTypesAiobotocorePackage "stepfunctions" "2.15.0" - "sha256-bZPSrZ+hzxPrBYeE7PT8OGaM3V8T6950gxacsifLr0Y="; + buildTypesAiobotocorePackage "stepfunctions" "2.15.2" + "sha256-DN3vboRwssrSolCuKts/35RiQR6jV61+QN7Z8cp2f4Y="; types-aiobotocore-storagegateway = - buildTypesAiobotocorePackage "storagegateway" "2.15.0" - "sha256-THc96oaV0Bh7x9H+xSsV7LD1QwJKMT8t3z2H0Qzq3lw="; + buildTypesAiobotocorePackage "storagegateway" "2.15.2" + "sha256-6ahEEQrrvRI90jGON71iTLRatrEoF7ZyG7qJmG3oCsU="; types-aiobotocore-sts = - buildTypesAiobotocorePackage "sts" "2.15.0" - "sha256-ElXjKUWdOuR3xOBF59/FjWol+4v16Z5KzaGsuNL//Ng="; + buildTypesAiobotocorePackage "sts" "2.15.2" + "sha256-5Ua7GxbzeeX0/8vTxsYgB8jruGv5u16FQ8plGKLMBVw="; types-aiobotocore-support = - buildTypesAiobotocorePackage "support" "2.15.0" - "sha256-263KZcvknzGUEJYl1FX2iwqz/3OWDnE3twBwZepzFaY="; + buildTypesAiobotocorePackage "support" "2.15.2" + "sha256-nM+vzI5wv8VRyRUok6GaI77VEBcaxeGikldAAvAIAXw="; types-aiobotocore-support-app = - buildTypesAiobotocorePackage "support-app" "2.15.0" - "sha256-5YPHOgKZJADFOcefgIBg5NwolDQxDqruE3rtv3SaqJo="; + buildTypesAiobotocorePackage "support-app" "2.15.2" + "sha256-EhVR5a5O7/XwiRDcIsUS6aZqILArMyxd85XmiNN+M+Y="; types-aiobotocore-swf = - buildTypesAiobotocorePackage "swf" "2.15.0" - "sha256-7HH2Pe87MmL1huAN2G9zNf7LfdWMWMgX6zIBAxap7NU="; + buildTypesAiobotocorePackage "swf" "2.15.2" + "sha256-/dz5ZVqz6ovntu/O5ON7Gf1o78Nn1FxJOUzcHvwuOwg="; types-aiobotocore-synthetics = - buildTypesAiobotocorePackage "synthetics" "2.15.0" - "sha256-98S15J1C+jOv6eTO/EPEYN4qj8eWKLotMMjgpPUA5k0="; + buildTypesAiobotocorePackage "synthetics" "2.15.2" + "sha256-akHP8h2XxNvHVku5uCTQ3K8HgwWRg9QL1BAQRzQ3eEc="; types-aiobotocore-textract = - buildTypesAiobotocorePackage "textract" "2.15.0" - "sha256-YwmAG8BMUrluE1oLDRVQ5CwfThaDnQahl2ENauOlhxw="; + buildTypesAiobotocorePackage "textract" "2.15.2" + "sha256-Wt8E53/j9mi0yJWp/+omVnIBoI5sVMJPgR4BofB+6nM="; types-aiobotocore-timestream-query = - buildTypesAiobotocorePackage "timestream-query" "2.15.0" - "sha256-1RG3Y9yOkZh6/rySlvRzH32F5jDsw+o4UrCyiaRJZt0="; + buildTypesAiobotocorePackage "timestream-query" "2.15.2" + "sha256-7oi/qslTdLXQGVzsucF09PT+A1gyncYXdNoY0aZZwnA="; types-aiobotocore-timestream-write = - buildTypesAiobotocorePackage "timestream-write" "2.15.0" - "sha256-94yxaeKblMoFpN9UgZqR3+x65my8UHg8002tVNnWB18="; + buildTypesAiobotocorePackage "timestream-write" "2.15.2" + "sha256-oOPC3wV2Wutveglu9vd6bNl9MGWxsJhyxn1h3R5h3DU="; types-aiobotocore-tnb = - buildTypesAiobotocorePackage "tnb" "2.15.0" - "sha256-+5m/DzJB5y1eucLfqj3j7FyVRW4vgGxIJOfqLCs24qM="; + buildTypesAiobotocorePackage "tnb" "2.15.2" + "sha256-rxiCacHIc1+JX5Ba+Ft3kaZfxPOuQzDbsK/wxPJi4VA="; types-aiobotocore-transcribe = - buildTypesAiobotocorePackage "transcribe" "2.15.0" - "sha256-HIFmwpEuWcvQVKHvQ9pbqrLk76J7IpH7Hd8qbm/Aopc="; + buildTypesAiobotocorePackage "transcribe" "2.15.2" + "sha256-IMJBlNAWIlk0FWLQQ/2Gcyk6ePqicSqOkDvIxuc+yjg="; types-aiobotocore-transfer = - buildTypesAiobotocorePackage "transfer" "2.15.0" - "sha256-7Hz2zgr87h5xVhkf1+UzJN+O13rPqohVN4qZ2/E8ir4="; + buildTypesAiobotocorePackage "transfer" "2.15.2" + "sha256-M0bTj75PMhNE4Z1Cw8Mb5qlqN3NFkqyWPMi2T5IHnH0="; types-aiobotocore-translate = - buildTypesAiobotocorePackage "translate" "2.15.0" - "sha256-eauTD0hzFk83sn41EnlJxrz3V1teKYQsD7ci9AhiFYc="; + buildTypesAiobotocorePackage "translate" "2.15.2" + "sha256-OJYflZHEP6xshavrMsdALZ1W7OFGlXTcZ2y7lSZFiiM="; types-aiobotocore-verifiedpermissions = - buildTypesAiobotocorePackage "verifiedpermissions" "2.15.0" - "sha256-0MmY0RefjXcu/2cZjhR+DoLSBETiqTHO4p+O7/CsQSY="; + buildTypesAiobotocorePackage "verifiedpermissions" "2.15.2" + "sha256-jzG0vdPOF7gtAVdT4zUbQ9on9hGZ0r7Ip3BPJYVFk6I="; types-aiobotocore-voice-id = - buildTypesAiobotocorePackage "voice-id" "2.15.0" - "sha256-5tsvPjGjtoXQZdYQ+NjoXcCU2F8IY/EQgEOUow+EIME="; + buildTypesAiobotocorePackage "voice-id" "2.15.2" + "sha256-AG6/UuYdeYOjECyemoqB7BrjIDg6OuIbIfdCaSsgc7Y="; types-aiobotocore-vpc-lattice = - buildTypesAiobotocorePackage "vpc-lattice" "2.15.0" - "sha256-Lw4kqT/JIrzK4cVsm6c1hUTTE1t6etVHfuzskO6kMyY="; + buildTypesAiobotocorePackage "vpc-lattice" "2.15.2" + "sha256-pSrj/6I5X4EAiBGtP/usG8AnDFrExtV7wpCMIYjdmLI="; types-aiobotocore-waf = - buildTypesAiobotocorePackage "waf" "2.15.0" - "sha256-syx0otSKJ896wcitfxqsJafFxf/4nokZ7pUQGiEEYTg="; + buildTypesAiobotocorePackage "waf" "2.15.2" + "sha256-rdMMNnCkv1+sCL+4lB5ubSWAyPvBrNDuLZcqFAky6kI="; types-aiobotocore-waf-regional = - buildTypesAiobotocorePackage "waf-regional" "2.15.0" - "sha256-9qIuIhKCDE6W09Ue2RFTrmKzFjK+73l6MA5X2zhoo3U="; + buildTypesAiobotocorePackage "waf-regional" "2.15.2" + "sha256-FqUfQlM41v6q5SdlSgzBt/MnK3SiDYdGKpqNnlcKMXQ="; types-aiobotocore-wafv2 = - buildTypesAiobotocorePackage "wafv2" "2.15.0" - "sha256-yeQPntqK7MRxLVqW54sihvcQ4t1MU3+sEz76N+wE0DI="; + buildTypesAiobotocorePackage "wafv2" "2.15.2" + "sha256-wOVJrIL5F7qapff49bWw2NfX3p+fr2KiLyDU0UIKMDg="; types-aiobotocore-wellarchitected = - buildTypesAiobotocorePackage "wellarchitected" "2.15.0" - "sha256-ac5AzHfMlUq9x511Dfv4abQAjMc9LFvnmfSN7neAgdM="; + buildTypesAiobotocorePackage "wellarchitected" "2.15.2" + "sha256-srXL51+IeqOadPa8TFSA3BZEPQbw51zgsuRTbDJlACw="; types-aiobotocore-wisdom = - buildTypesAiobotocorePackage "wisdom" "2.15.0" - "sha256-HYeQ/YnZYWyIs12disXzm9LM2ZA8K1KSCGyI2oPwfjA="; + buildTypesAiobotocorePackage "wisdom" "2.15.2" + "sha256-p0KPHHmqy9Jd4tWypg+5AcnEHb0dESwNVC6bPr1VDBc="; types-aiobotocore-workdocs = - buildTypesAiobotocorePackage "workdocs" "2.15.0" - "sha256-hue/UsRvpngLHlgFFmTIPbCXzbtFB1vCkhEkiB7TNrA="; + buildTypesAiobotocorePackage "workdocs" "2.15.2" + "sha256-csR9+vedxQbUu16e3fCwSTW4opv2FW7VnNXsfawJGSk="; types-aiobotocore-worklink = - buildTypesAiobotocorePackage "worklink" "2.15.0" - "sha256-m4lbQZhG7UjtgSnsPyH37K51YxohcdfRwe0jPZGqQUs="; + buildTypesAiobotocorePackage "worklink" "2.15.1" + "sha256-VvuxiybvGaehPqyVUYGO1bbVSQ0OYgk6LbzgoKLHF2c="; types-aiobotocore-workmail = - buildTypesAiobotocorePackage "workmail" "2.15.0" - "sha256-vQRAXpFV6RG4HWKRHLgLOQHr++Mqly20MsTlIn2M/yA="; + buildTypesAiobotocorePackage "workmail" "2.15.1" + "sha256-o2n4u7wgJPSS02LLZe+PLsxdwm5r+0j3VzDFVnR7bGc="; types-aiobotocore-workmailmessageflow = - buildTypesAiobotocorePackage "workmailmessageflow" "2.15.0" - "sha256-7iMPW/8tdqfAmcCNCcTppvzaa4zo/8NCQMIuByJVB44="; + buildTypesAiobotocorePackage "workmailmessageflow" "2.15.2" + "sha256-2Rb15SCI1o6OfMuJzWcosZqWZQOs0ZrPGLDy7bdZPPk="; types-aiobotocore-workspaces = - buildTypesAiobotocorePackage "workspaces" "2.15.0" - "sha256-wN9Jx2vAtKsDJ9YJBJOVguEJY0OLu8OUxY/K9bRqymM="; + buildTypesAiobotocorePackage "workspaces" "2.15.2" + "sha256-wQSb23Y6nySclLl9c2MCfiZ81N+GKbYhHcro6zBVtNo="; types-aiobotocore-workspaces-web = - buildTypesAiobotocorePackage "workspaces-web" "2.15.0" - "sha256-ikKQGGpRu04WF1cix4RysjNSSl0sbA6QdPP2b2amz0E="; + buildTypesAiobotocorePackage "workspaces-web" "2.15.2" + "sha256-oFljA4OPlPF4q9xMMxhtv2/t5FQcwUeGdBC3ueGCnKA="; types-aiobotocore-xray = - buildTypesAiobotocorePackage "xray" "2.15.0" - "sha256-6axavJjQY10qnYlFnxXQvj44Dg9hmqYbpAHmTeOHoUU="; + buildTypesAiobotocorePackage "xray" "2.15.2" + "sha256-coVjEy0/Kt0gkLS/MI/r1WpXvbJJeCMfGUfCYH7SNPY="; } diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index 17f41b1164cd..75215f8a8ee3 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -364,13 +364,13 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.15.0"; + version = "2.15.2"; pyproject = true; src = fetchPypi { pname = "types_aiobotocore"; inherit version; - hash = "sha256-65wheAyrOIe6rwrjygLF/gq3uYj0qaXEPnr/L4lNfKc="; + hash = "sha256-Y+akVszDPiyjUKrliM/bu5S97PNTPmqFePc2xbK4Vgc="; }; build-system = [ setuptools ]; @@ -380,7 +380,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { accessanalyzer = [ types-aiobotocore-accessanalyzer ]; account = [ types-aiobotocore-account ]; acm = [ types-aiobotocore-acm ]; diff --git a/pkgs/development/python-modules/types-aiobotocore/update.sh b/pkgs/development/python-modules/types-aiobotocore/update.sh index f98f653a7278..a3449d2b4347 100755 --- a/pkgs/development/python-modules/types-aiobotocore/update.sh +++ b/pkgs/development/python-modules/types-aiobotocore/update.sh @@ -5,14 +5,14 @@ set -eu -o pipefail source_file=pkgs/development/python-modules/types-aiobotocore-packages/default.nix -#nix-update python312Packages.types-aiobotocore --commit --build +nix-update python312Packages.types-aiobotocore --commit --build packages=( types-aiobotocore-accessanalyzer types-aiobotocore-account types-aiobotocore-acm types-aiobotocore-acm-pca - types-aiobotocore-alexaforbusiness + # types-aiobotocore-alexaforbusiness Obsolete, will be removed soon types-aiobotocore-amp types-aiobotocore-amplify types-aiobotocore-amplifybackend @@ -39,7 +39,7 @@ packages=( types-aiobotocore-autoscaling-plans types-aiobotocore-backup types-aiobotocore-backup-gateway - types-aiobotocore-backupstorage + # types-aiobotocore-backupstorage Obsolete, will be removed soon types-aiobotocore-batch types-aiobotocore-billingconductor types-aiobotocore-braket @@ -73,7 +73,7 @@ packages=( types-aiobotocore-codeguru-security types-aiobotocore-codeguruprofiler types-aiobotocore-codepipeline - types-aiobotocore-codestar + # types-aiobotocore-codestar Obsolete, will be removed soon types-aiobotocore-codestar-connections types-aiobotocore-codestar-notifications types-aiobotocore-cognito-identity @@ -151,7 +151,7 @@ packages=( types-aiobotocore-guardduty types-aiobotocore-health types-aiobotocore-healthlake - types-aiobotocore-honeycode + # types-aiobotocore-honeycode Obsolete, will be removed soon types-aiobotocore-iam types-aiobotocore-identitystore types-aiobotocore-imagebuilder @@ -235,7 +235,7 @@ packages=( types-aiobotocore-migrationhub-config types-aiobotocore-migrationhuborchestrator types-aiobotocore-migrationhubstrategy - types-aiobotocore-mobile + # types-aiobotocore-mobile Obsolete, will be removed soon types-aiobotocore-mq types-aiobotocore-mturk types-aiobotocore-mwaa @@ -371,7 +371,7 @@ for package in "${packages[@]}"; do url="https://pypi.io/packages/source/t/${package}/${package//-/_}-${version}.tar.gz" hash=$(nix-prefetch-url --type sha256 $url) - sri_hash="$(nix hash to-sri --type sha256 $hash)" + sri_hash="$(nix hash convert --hash-algo sha256 --to sri $hash)" package_short="${package#types-aiobotocore-}" awk -i inplace -v pkg="$package" -v pkg_short="$package_short" -v ver="$version" -v hash="$sri_hash" ' diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index bbf905dcb82c..a783600fc5de 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.21.5"; + version = "0.23.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-n39H3mh5nLK8ueSG9I13ufWJYrkvukPLiGDacLPFfRs="; + hash = "sha256-P9Ht6skj0ZVsDpB8lz+4O9pGW+rn8FRxazcbKT+bX9w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-beautifulsoup4/default.nix b/pkgs/development/python-modules/types-beautifulsoup4/default.nix index 6bdcf999bed7..17cc87e26b01 100644 --- a/pkgs/development/python-modules/types-beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/types-beautifulsoup4/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "types-beautifulsoup4"; - version = "4.12.0.20240907"; + version = "4.12.0.20241020"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-jQI7hlMJIgcEF6HUxNkWeKsP8kObOyss/6O2KLSeurE="; + hash = "sha256-FYNw0I0M1Ei9EbEypQ/1J5I3pdS1g3vroHTeFSpRMFk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-dateutil/default.nix b/pkgs/development/python-modules/types-dateutil/default.nix index 46f98100ac75..a4027dc808f7 100644 --- a/pkgs/development/python-modules/types-dateutil/default.nix +++ b/pkgs/development/python-modules/types-dateutil/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-dateutil"; - version = "2.9.0.20240316"; + version = "2.9.0.20240906"; pyproject = true; src = fetchPypi { pname = "types-python-dateutil"; inherit version; - hash = "sha256-XS8uJAuGkF5AlE3Xh9ttqSY/Deq+8Qdt2u15c1HsAgI="; + hash = "sha256-lwbDtoKEwlrf/Ecxnsx5R+W7hrN3P4Q8c5Bv1Zi8F24="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix index fd1d57700de5..62e73587ae75 100644 --- a/pkgs/development/python-modules/types-docutils/default.nix +++ b/pkgs/development/python-modules/types-docutils/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.21.0.20240423"; + version = "0.21.0.20240907"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-dxbsbGi1F5t7oXOMrOLxMm5k359Et6sI2ZBNMsI/wV8="; + hash = "sha256-XdKqXi4G/PoJACC8QRVHm03SjaMymrcIVj7imJS9PA0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-html5lib/default.nix b/pkgs/development/python-modules/types-html5lib/default.nix index 2bd3c889d8f7..e7916e63218c 100644 --- a/pkgs/development/python-modules/types-html5lib/default.nix +++ b/pkgs/development/python-modules/types-html5lib/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-html5lib"; - version = "1.1.11.20240806"; + version = "1.1.11.20241018"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-gGDcmLr2PWeWp2W7vICf/596OD9uOprdUm+BTAhlRe8="; + hash = "sha256-mAQlVf942eOlHHfJGLEEGsu362xAVAjYqeFQ/1vsyvo="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-pillow/default.nix b/pkgs/development/python-modules/types-pillow/default.nix index c47eaf243b4b..fadbfb610b19 100644 --- a/pkgs/development/python-modules/types-pillow/default.nix +++ b/pkgs/development/python-modules/types-pillow/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-pillow"; - version = "10.2.0.20240520"; + version = "10.2.0.20240822"; format = "setuptools"; src = fetchPypi { inherit version; pname = "types-Pillow"; - hash = "sha256-EwuXkZVGX6HhZ22OgcnHwwMZ6OlbEvrpRejw1SUhMQc="; + hash = "sha256-VZ+1Ki75kcMm5KDSCsyzu2Onuo1A60k+DssDELpS8NM="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index 74629872dce7..885cfe353e24 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.27.0.20240626"; + version = "5.28.0.20240924"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-aDuhQEO63meF4/k3p0mPJDs3iBqRrI2BuSAuz4sZHpw="; + hash = "sha256-0YGviiVuWpHOjVrbU0luiA79kUTH1USD42UzMrYClvA="; }; propagatedBuildInputs = [ types-futures ]; diff --git a/pkgs/development/python-modules/types-psycopg2/default.nix b/pkgs/development/python-modules/types-psycopg2/default.nix index 2ba7ec577d6d..09eebdcab054 100644 --- a/pkgs/development/python-modules/types-psycopg2/default.nix +++ b/pkgs/development/python-modules/types-psycopg2/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-psycopg2"; - version = "2.9.21.20240417"; + version = "2.9.21.20240819"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Bdslb0pFn7IaQmuOf8oGVsNTkQX/Agjq9r2vQGo4cIc="; + hash = "sha256-Tta0dGTWN0+mTl47I0zqD3EOchI6RZbWerULdBWoRmY="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-pyopenssl/default.nix b/pkgs/development/python-modules/types-pyopenssl/default.nix index 60457be769c0..1df09d2fb578 100644 --- a/pkgs/development/python-modules/types-pyopenssl/default.nix +++ b/pkgs/development/python-modules/types-pyopenssl/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-pyopenssl"; - version = "24.1.0.20240425"; + version = "24.1.0.20240722"; format = "setuptools"; src = fetchPypi { pname = "types-pyOpenSSL"; inherit version; - hash = "sha256-Cn6CYmwZg9yNxZKSvyBlSlHDw4gby7mzN8HabjLwIE4="; + hash = "sha256-R5E7RnigHYefUDoSBERoIh7YV2JjwVQNywSEyiGwjDk="; }; propagatedBuildInputs = [ cryptography ]; diff --git a/pkgs/development/python-modules/types-python-dateutil/default.nix b/pkgs/development/python-modules/types-python-dateutil/default.nix index a84b7e22b810..43dda7067fe7 100644 --- a/pkgs/development/python-modules/types-python-dateutil/default.nix +++ b/pkgs/development/python-modules/types-python-dateutil/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.9.0.20240316"; + version = "2.9.0.20240906"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-XS8uJAuGkF5AlE3Xh9ttqSY/Deq+8Qdt2u15c1HsAgI="; + hash = "sha256-lwbDtoKEwlrf/Ecxnsx5R+W7hrN3P4Q8c5Bv1Zi8F24="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 7e6986f2a95a..44e9fcaabd3c 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2024.2.0.20240913"; + version = "2024.2.0.20241003"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-RDO130pvxYe77UFxbYalul2DK0N45Qb0DTS8nIHfLCQ="; + hash = "sha256-V13DjzhakiohK6wAp9bS4W4UETKjyVUHj0pP0T7Wy0Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-pyyaml/default.nix b/pkgs/development/python-modules/types-pyyaml/default.nix index 99006754e304..31fe7ac1de19 100644 --- a/pkgs/development/python-modules/types-pyyaml/default.nix +++ b/pkgs/development/python-modules/types-pyyaml/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-pyyaml"; - version = "6.0.12.20240311"; + version = "6.0.12.20240917"; format = "setuptools"; src = fetchPypi { pname = "types-PyYAML"; inherit version; - hash = "sha256-qeDw+I3INXObDBylHukNBMoqiXpxr3nemuxfOMsKU0I="; + hash = "sha256-0UBahvlXZoIjTvg7y05v/3yTBcix+61eC81Pfb3JxYc="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index 79728a451fe6..5878c4bd88a6 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.6.0.20240425"; + version = "4.6.0.20240903"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-lAKhDukx0kH9/MBFkuv3pmHXu5Ko3qYxJ58NisvPOiI="; + hash = "sha256-S6saN42/I8LJXDcN/biajwM5V8T9GlP+5xtSnBgv4Ag="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index ed5295ea0d97..124bcfe8874f 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.20240914"; + version = "2.32.0.20241016"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KFDheNs5Gdm/gJ5DTu9luknQ5+M6yS1Yj0peKV//1AU="; + hash = "sha256-DZytLydRXQ4+PacTShtvKPuXEp2GuGfyTZxyZFJjTZU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-s3transfer/default.nix b/pkgs/development/python-modules/types-s3transfer/default.nix index 1db9bc7323bd..bb2211a43dfb 100644 --- a/pkgs/development/python-modules/types-s3transfer/default.nix +++ b/pkgs/development/python-modules/types-s3transfer/default.nix @@ -2,21 +2,24 @@ lib, buildPythonPackage, fetchPypi, - poetry-core, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "types-s3transfer"; - version = "0.10.1"; + version = "0.10.2"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchPypi { pname = "types_s3transfer"; inherit version; - hash = "sha256-AhVMzkZSgoetdq0aAVOEDgSSI5oIh+iDNGbsz4S5jaA="; + hash = "sha256-YBZ6O/tcU27GzbWBj3+aKO3KncPgtf+FrjdFJvxeV24="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ setuptools ]; # Module has no tests doCheck = false; diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 0c5bcbbb5c48..d5b91eb17203 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "70.0.0.20240524"; + version = "75.1.0.20240917"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-4x/ue50V71OYBSZXmsYImzrlGgBaKBrPlxeOkKxxr/Y="; + hash = "sha256-EvEqFl5+04PzHe9wXlwPocJiFd1GawrzS9BC99UzH1U="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/typical/default.nix b/pkgs/development/python-modules/typical/default.nix index 357bb8d1094a..d222c05650dd 100644 --- a/pkgs/development/python-modules/typical/default.nix +++ b/pkgs/development/python-modules/typical/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "typical"; - version = "2.8.1"; + version = "2.9.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "seandstewart"; repo = "typical"; rev = "refs/tags/v${version}"; - hash = "sha256-2t9Jhdy9NmYBNzdtjjgUnoK2RDEUsAvDkYMcBRzEcmI="; + hash = "sha256-RS4hJ7NufClroRPRO3EyHwDaMgg0s0F7D/mqcBr8O18="; }; pythonRelaxDeps = [ "pendulum" ]; diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix index 198df9570b68..7ef57e00a0e8 100644 --- a/pkgs/development/python-modules/tzdata/default.nix +++ b/pkgs/development/python-modules/tzdata/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "tzdata"; - version = "2024.1"; + version = "2024.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-JnQSD42JGQl1HDirzf04asCloRJ5VPvDMq9rXOrgfv0="; + hash = "sha256-fYXMQW6TguaQlbe99K/Z44gEGKJBP+7HBp1TPWtOMcw="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 81f1ed1d2b80..a4e6ba12061c 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { "test_conflicting" "test_noconflict" "test_symlink_localtime" - ] ++ lib.optional stdenv.isDarwin "test_assert_tz_offset"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "test_assert_tz_offset"; pythonImportsCheck = [ "tzlocal" ]; diff --git a/pkgs/development/python-modules/uamqp/clang-fix-incompatible-function-pointer-conversion.patch b/pkgs/development/python-modules/uamqp/clang-fix-incompatible-function-pointer-conversion.patch deleted file mode 100644 index ed177797da0c..000000000000 --- a/pkgs/development/python-modules/uamqp/clang-fix-incompatible-function-pointer-conversion.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/message_receiver.pyx b/src/message_receiver.pyx -index b99647c..479cc9c 100644 ---- a/src/message_receiver.pyx -+++ b/src/message_receiver.pyx -@@ -120,7 +120,7 @@ cdef class cMessageReceiver(StructBase): - - #### Callbacks (context is a MessageReceiver instance) - --cdef void on_message_receiver_state_changed(void* context, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG new_state, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG previous_state): -+cdef void on_message_receiver_state_changed(const void* context, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG new_state, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG previous_state): - if context != NULL: - context_pyobj = <PyObject*>context - if context_pyobj.ob_refcnt == 0: # context is being garbage collected, skip the callback diff --git a/pkgs/development/python-modules/uamqp/darwin-azure-c-shared-utility-corefoundation.patch b/pkgs/development/python-modules/uamqp/darwin-azure-c-shared-utility-corefoundation.patch deleted file mode 100644 index ad2186543f3c..000000000000 --- a/pkgs/development/python-modules/uamqp/darwin-azure-c-shared-utility-corefoundation.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 52ab2095649b5951e6af77f68954209473296983 Mon Sep 17 00:00:00 2001 -From: Sandro <sandro.jaeckel@gmail.com> -Date: Sat, 16 Jan 2021 15:54:05 +0100 -Subject: [PATCH] Fix finding apple libraries - ---- - CMakeLists.txt | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - - -(rejected by upstream in https://github.com/Azure/azure-c-shared-utility/pull/499, -seems problem it's solving is nixpkgs-specific) - -diff --git a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt -index 7bbfa6f3f..3567b18bc 100644 ---- a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt -+++ b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt -@@ -120,8 +120,9 @@ endif() - - if(${use_applessl}) - # MACOSX only has native tls and open ssl, so use the native apple tls -- find_library(cf_foundation Foundation) -+ find_library(cf_foundation CoreFoundation) - find_library(cf_network CFNetwork) -+ find_library(cf_security Security) - endif() - - if(${no_logging}) -@@ -581,7 +582,7 @@ endif() - - - if(${use_applessl}) -- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${cf_foundation} ${cf_network}) -+ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${cf_foundation} ${cf_network} ${cf_security}) - endif() - - if(WIN32) diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 0bde984b93e5..122ecccb046b 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -3,8 +3,9 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, - cython_0, + fetchpatch2, + setuptools, + cython, certifi, CFNetwork, cmake, @@ -17,43 +18,25 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.6.8"; - format = "setuptools"; + version = "1.6.11"; + pyproject = true; src = fetchFromGitHub { owner = "Azure"; repo = "azure-uamqp-python"; rev = "refs/tags/v${version}"; - hash = "sha256-L4E7nnsVZ/VrOM0t4KtztU9ALmtGfi1vDzUi0ogtZOc="; + hash = "sha256-HTIOHheCrvyI7DwA/UcUXk/fbesd29lvUvJ9TAeG3CE="; }; - patches = - lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - ./darwin-azure-c-shared-utility-corefoundation.patch - ] - ++ [ - (fetchpatch { - name = "CVE-2024-25110.patch"; - url = "https://github.com/Azure/azure-uamqp-c/commit/30865c9ccedaa32ddb036e87a8ebb52c3f18f695.patch"; - stripLen = 1; - extraPrefix = "src/vendor/azure-uamqp-c/"; - hash = "sha256-igzZqTLUUyuNcpCUbYHI4RXmWxg+7EC/yyD4DBurR2M="; - }) - (fetchpatch { - name = "CVE-2024-27099.patch"; - url = "https://github.com/Azure/azure-uamqp-c/commit/2ca42b6e4e098af2d17e487814a91d05f6ae4987.patch"; - stripLen = 1; - extraPrefix = "src/vendor/azure-uamqp-c/"; - # other files are just tests which aren't run from the python - # builder anyway - includes = [ "src/vendor/azure-uamqp-c/src/link.c" ]; - hash = "sha256-EqDfG1xAz5CG8MssSSrz8Yrje5qwF8ri1Kdw+UUu5ms="; - }) - # Fix incompatible function pointer conversion error with clang 16. - ./clang-fix-incompatible-function-pointer-conversion.patch - ]; + patches = [ + (fetchpatch2 { + name = "fix-clang16-compatibility.patch"; + url = "https://github.com/Azure/azure-uamqp-python/commit/bd6d9ef5a8bca3873e1e66218fd09ca787b8064e.patch"; + hash = "sha256-xtnIVjB71EPJp/QjLQWctcSDds5s6n4ut+gnvp3VMlM="; + }) + ]; - postPatch = lib.optionalString (stdenv.isDarwin && !stdenv.isx86_64) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isx86_64) '' # force darwin aarch64 to use openssl instead of applessl, removing # some quirks upstream thinks they need to use openssl on macos sed -i \ @@ -69,20 +52,24 @@ buildPythonPackage rec { src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt ''; + build-system = [ + cython + setuptools + ]; + nativeBuildInputs = [ cmake - cython_0 ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation CFNetwork Security ]; - propagatedBuildInputs = [ certifi ]; + dependencies = [ certifi ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index 731da3b75fbe..ef7284f3196f 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -9,19 +9,19 @@ astunparse, typing-extensions, pytest7CheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { pname = "uarray"; - version = "0.8.8"; + version = "0.9.0"; pyproject = true; src = fetchFromGitHub { owner = "Quansight-Labs"; repo = pname; - rev = version; - hash = "sha256-wTKqOw64b+/kdZpSYLwCJATOuo807BWCtVHB4pH58fY="; + rev = "refs/tags/${version}"; + hash = "sha256-q9lMU/xA+G2x38yZy3DxCpXTEmg1lZhZ8GFIHDIKE24="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest7CheckHook - pytest-cov + pytest-cov-stub ]; # Tests must be run from outside the source directory diff --git a/pkgs/development/python-modules/ubelt/default.nix b/pkgs/development/python-modules/ubelt/default.nix index 85764d05986c..11491426bd09 100644 --- a/pkgs/development/python-modules/ubelt/default.nix +++ b/pkgs/development/python-modules/ubelt/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { wheel ]; - passthru.optional-dependencies = { + optional-dependencies = { optional = [ numpy python-dateutil @@ -51,7 +51,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # fail due to sandbox environment "CacheStamp.expired" "userhome" diff --git a/pkgs/development/python-modules/ucsmsdk/default.nix b/pkgs/development/python-modules/ucsmsdk/default.nix index a510f0f468aa..1c506a92b6da 100644 --- a/pkgs/development/python-modules/ucsmsdk/default.nix +++ b/pkgs/development/python-modules/ucsmsdk/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "ucsmsdk"; - version = "0.9.20"; + version = "0.9.21"; format = "setuptools"; src = fetchFromGitHub { owner = "CiscoUcs"; repo = "ucsmsdk"; rev = "refs/tags/v${version}"; - hash = "sha256-X8lGpfVjIZIpNneOM/mE+9RvglW9FlYoGz7pFs7ellk="; + hash = "sha256-iqwU42Im4/YyxefkJZ8Zn5CddjUzuZk/7zjLD/0pHm4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ufmt/default.nix b/pkgs/development/python-modules/ufmt/default.nix index d8e349261418..e18b8062f1ff 100644 --- a/pkgs/development/python-modules/ufmt/default.nix +++ b/pkgs/development/python-modules/ufmt/default.nix @@ -44,14 +44,14 @@ buildPythonPackage rec { usort ]; - passthru.optional-dependencies = { + optional-dependencies = { lsp = [ pygls ]; ruff = [ ruff-api ]; }; nativeCheckInputs = [ unittestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "ufmt" ]; diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index cd438f890d50..22ea350cf303 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -7,34 +7,44 @@ cu2qu, defcon, fetchPypi, + fetchpatch2, fontmath, fonttools, pytestCheckHook, pythonOlder, setuptools-scm, skia-pathops, + syrupy, ufolib2, }: buildPythonPackage rec { pname = "ufo2ft"; - version = "3.2.8"; + version = "3.3.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-HSD66FbCxZyACRq7b8p2uizoO4ZqPAn1O8BFoi1/Mkc="; + hash = "sha256-lw5mLcVw1NFT1c/AOcMyo2a8aGOyxFG+ZAU6Ggnssko="; }; - nativeBuildInputs = [ + patches = [ + (fetchpatch2 { + # update syrupy snapshots + url = "https://github.com/googlefonts/ufo2ft/commit/7a3edb2e4202cf388e3ffe31b5b3783dbb392db2.patch"; + hash = "sha256-YEgUgrtgH3PBZlt+xoJme+oPRuDMwq7M/4cJ3JbeuyU="; + }) + ]; + + build-system = [ setuptools-scm ]; pythonRelaxDeps = [ "cffsubr" ]; - propagatedBuildInputs = [ + dependencies = [ cu2qu fontmath fonttools @@ -46,7 +56,10 @@ buildPythonPackage rec { skia-pathops ] ++ fonttools.optional-dependencies.lxml ++ fonttools.optional-dependencies.ufo; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + syrupy + ]; disabledTests = [ # Do not depend on skia. diff --git a/pkgs/development/python-modules/ufolib2/default.nix b/pkgs/development/python-modules/ufolib2/default.nix index 6eaac11f17f0..201413ed9b9d 100644 --- a/pkgs/development/python-modules/ufolib2/default.nix +++ b/pkgs/development/python-modules/ufolib2/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { fonttools ] ++ fonttools.optional-dependencies.ufo; - passthru.optional-dependencies = { + optional-dependencies = { lxml = [ lxml ]; converters = [ cattrs ]; json = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "ufoLib2" ]; diff --git a/pkgs/development/python-modules/ufolint/default.nix b/pkgs/development/python-modules/ufolint/default.nix index 95db33a7bfc1..714a5cac45f3 100644 --- a/pkgs/development/python-modules/ufolint/default.nix +++ b/pkgs/development/python-modules/ufolint/default.nix @@ -27,7 +27,6 @@ buildPythonPackage rec { fonttools ]; - doCheck = true; nativeBuildInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ufomerge/default.nix b/pkgs/development/python-modules/ufomerge/default.nix index 79b3436a28bb..99e7666584e1 100644 --- a/pkgs/development/python-modules/ufomerge/default.nix +++ b/pkgs/development/python-modules/ufomerge/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "ufomerge"; - version = "1.8.1"; + version = "1.8.2"; pyproject = true; src = fetchFromGitHub { owner = "googlefonts"; repo = "ufomerge"; rev = "refs/tags/v${version}"; - hash = "sha256-Bo/KJhJTIAGNDT2QoXRKGMYLQuqjfCe5yaCsFcQ4A64="; + hash = "sha256-D+BhKCKWgprQn+eXFgwnSN/06+JF5CiUS0VAS1Kvedw="; }; nativeBuildInputs = [ pythonRelaxDepsHook ]; diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix index 0dc8fea9bc8a..b4d7fa157605 100644 --- a/pkgs/development/python-modules/uharfbuzz/default.nix +++ b/pkgs/development/python-modules/uharfbuzz/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, pythonOlder, cython, + pkgconfig, setuptools, setuptools-scm, pytestCheckHook, @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "uharfbuzz"; - version = "0.39.0"; + version = "0.41.0"; pyproject = true; disabled = pythonOlder "3.5"; @@ -23,16 +24,22 @@ buildPythonPackage rec { repo = "uharfbuzz"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-I4fCaomq26FdkpiJdj+zyrbdqdynnD2hIutYTuTFvQs="; + hash = "sha256-N/Vprr1lJmDLUzf+aX374YbJhDuHOpPzNeYXpLOANeI="; }; - nativeBuildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools >= 36.4, < 72.2" setuptools + ''; + + build-system = [ cython + pkgconfig setuptools setuptools-scm ]; - buildInputs = lib.optionals stdenv.isDarwin [ ApplicationServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index bee77028970e..9278ad563162 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -18,6 +18,7 @@ packaging, pillow, platformdirs, + propcache, pydantic, pyjwt, rich, @@ -38,7 +39,7 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "6.0.2"; + version = "6.4.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -47,7 +48,7 @@ buildPythonPackage rec { owner = "uilibs"; repo = "uiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-3Dmim+wSAhco3KvtbAT/f/feNriaI22m0ml4L9SJFPs="; + hash = "sha256-+BHxcwQhx4lOqS0ATk1PjLbyTu7xQakM3HMrydXeGUc="; }; build-system = [ poetry-core ]; @@ -68,6 +69,7 @@ buildPythonPackage rec { packaging pillow platformdirs + propcache pydantic pyjwt rich @@ -89,6 +91,12 @@ buildPythonPackage rec { pytestFlagsArray = [ "--benchmark-disable" ]; + disabledTests = [ + # https://127.0.0.1 vs https://127.0.0.1:0 + "test_base_url" + "test_bootstrap" + ]; + pythonImportsCheck = [ "uiprotect" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index 8a6f51bded2a..9d91c6d94ffa 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -5,6 +5,7 @@ colorcet, datashader, fetchFromGitHub, + setuptools, holoviews, matplotlib, numba, @@ -12,7 +13,6 @@ pandas, pynndescent, pytestCheckHook, - pythonOlder, scikit-image, scikit-learn, scipy, @@ -24,19 +24,19 @@ buildPythonPackage rec { pname = "umap-learn"; - version = "0.5.6"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + version = "0.5.7"; + pyproject = true; src = fetchFromGitHub { owner = "lmcinnes"; repo = "umap"; rev = "refs/tags/release-${version}"; - hash = "sha256-fqYl8T53BgCqsquY6RJHqpDFsdZA0Ihja69E/kG3YGU="; + hash = "sha256-hPYmRDSeDa4JWGekUVq3CWf5NthHTpMpyuUQ1yIkVAE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numba numpy pynndescent @@ -45,7 +45,7 @@ buildPythonPackage rec { tqdm ]; - passthru.optional-dependencies = rec { + optional-dependencies = rec { plot = [ bokeh colorcet @@ -91,6 +91,7 @@ buildPythonPackage rec { meta = with lib; { description = "Uniform Manifold Approximation and Projection"; homepage = "https://github.com/lmcinnes/umap"; + changelog = "https://github.com/lmcinnes/umap/releases/tag/release-${version}"; license = licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index abf225feb5ee..e5d9b4bef619 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -2,51 +2,47 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, + setuptools, spark-parser, xdis, - nose, - pytest, + pytestCheckHook, hypothesis, six, }: buildPythonPackage rec { pname = "uncompyle6"; - version = "3.9.1"; - format = "setuptools"; + version = "3.9.2"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-xFHDjrPFzINOuLip5uCwzzIm5NlNCP0nbdA/6RWO2yc="; + hash = "sha256-b3CYD/4IpksRS2hxgy/QLYbJkDX4l2qPH4Eh2tb8pCU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ spark-parser xdis ]; + pythonRelaxDeps = [ "spark-parser" ]; + nativeCheckInputs = [ - nose - pytest + pytestCheckHook hypothesis six ]; - # Tests attempt to decompile bytecode of the python version - # that is running the tests - this does not work for versions - # above 3.8, but they decompile older bytecode fine - doCheck = pythonOlder "3.9"; - # six import errors (yet it is supplied...) - checkPhase = '' - runHook preCheck - pytest ./pytest --ignore=pytest/test_function_call.py - runHook postCheck - ''; - - meta = with lib; { - description = "Python cross-version byte-code deparser"; - homepage = "https://github.com/rocky/python-uncompyle6/"; - license = licenses.gpl3; + # No tests are provided for versions past 3.8, + # as the project only targets bytecode of versions <= 3.8 + doCheck = false; + + meta = { + description = "A bytecode decompiler for Python versions 3.8 and below"; + homepage = "https://github.com/rocky/python-uncompyle6"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ melvyn2 ]; }; } diff --git a/pkgs/development/python-modules/unicode-rbnf/default.nix b/pkgs/development/python-modules/unicode-rbnf/default.nix index a672feebf5ee..7bc806314a72 100644 --- a/pkgs/development/python-modules/unicode-rbnf/default.nix +++ b/pkgs/development/python-modules/unicode-rbnf/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "unicode-rbnf"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "unicode-rbnf"; - rev = "v${version}"; - hash = "sha256-PquPoiaO1rEDMz7jaN9MUB0UQGH07M0O9mlrUCsfhm4="; + rev = "refs/tags/v${version}"; + hash = "sha256-dAoDO707qmdDzCbi7EWNaM9txdBV46NlLkOs7xyycz0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/unicorn/avoid-distutils-python312.patch b/pkgs/development/python-modules/unicorn/avoid-distutils-python312.patch deleted file mode 100644 index 904538880a22..000000000000 --- a/pkgs/development/python-modules/unicorn/avoid-distutils-python312.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 de3a0f6a3040..6ce310bfb5d1 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -9,35 +9,30 @@ buildPythonPackage rec { pname = "unicorn"; version = lib.getVersion unicorn-emu; - format = "setuptools"; + pyproject = true; src = unicorn-emu.src; 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/ ''; - # needed on non-x86 linux + # Needed on non-x86 linux setupPyBuildFlags = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ "--plat-name" "linux" ] # aarch64 only available from MacOS SDK 11 onwards, so fix the version tag. # otherwise, bdist_wheel may detect "macosx_10_6_arm64" which doesn't make sense. - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "--plat-name" "macosx_11_0" ]; - propagatedBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/unidata-blocks/default.nix b/pkgs/development/python-modules/unidata-blocks/default.nix index d7e9f274d3d5..793cbc7428a0 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.13"; + version = "0.0.15"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "unidata_blocks"; inherit version; - hash = "sha256-JQwKMEhDdvvsnXI6QsV2TcuB3mw5NcALbi5kM5xl/Pw="; + hash = "sha256-dPVJjA+udN6hD8v+pp59/SsHHCwmJLVRYuCDBQIGJQk="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index b09942f1beec..025eec125099 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -14,6 +14,7 @@ coloredlogs, crc, libgpiod, + pyserial-asyncio-fast, typing-extensions, zigpy, @@ -26,14 +27,14 @@ buildPythonPackage rec { pname = "universal-silabs-flasher"; - version = "0.0.22"; + version = "0.0.25"; pyproject = true; src = fetchFromGitHub { owner = "NabuCasa"; repo = "universal-silabs-flasher"; rev = "refs/tags/v${version}"; - hash = "sha256-fAz5dhHO5A0pSH6IYcVwNWPxqsNn3urXqnp8GudOrBA="; + hash = "sha256-fmm5QrRpZIYmPO4GK/JrP7w0Utlw52pfh524pgESliM="; }; postPatch = '' @@ -56,6 +57,7 @@ buildPythonPackage rec { click coloredlogs crc + pyserial-asyncio-fast typing-extensions zigpy ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libgpiod ]; diff --git a/pkgs/development/python-modules/unrardll/default.nix b/pkgs/development/python-modules/unrardll/default.nix index 14a32c0ba862..b539d805f66e 100644 --- a/pkgs/development/python-modules/unrardll/default.nix +++ b/pkgs/development/python-modules/unrardll/default.nix @@ -18,9 +18,9 @@ buildPythonPackage rec { buildInputs = [ unrar ]; - NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin "-headerpad_max_install_names"; + NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change libunrar.so ${unrar}/lib/libunrar.so $out/lib/python*/site-packages/unrardll/unrar.*-darwin.so install_name_tool -change libunrar.so ${unrar}/lib/libunrar.so build/lib.*/unrardll/unrar.*-darwin.so ''; diff --git a/pkgs/development/python-modules/unrpa/default.nix b/pkgs/development/python-modules/unrpa/default.nix index c64443ff6661..b806af03a2c1 100644 --- a/pkgs/development/python-modules/unrpa/default.nix +++ b/pkgs/development/python-modules/unrpa/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0yl4qdwp3in170ks98qnldqz3r2iyzil5g1775ccg98qkh95s724"; }; - passthru.optional-dependencies = { + optional-dependencies = { ZiX = [ uncompyle6 ]; }; diff --git a/pkgs/development/python-modules/unstructured-api-tools/default.nix b/pkgs/development/python-modules/unstructured-api-tools/default.nix index 0eae368c30c3..656fa897e8d2 100644 --- a/pkgs/development/python-modules/unstructured-api-tools/default.nix +++ b/pkgs/development/python-modules/unstructured-api-tools/default.nix @@ -22,7 +22,7 @@ flake8, httpx, ipython, - pytest-cov, + pytest-cov-stub, requests, requests-toolbelt, nbdev, @@ -77,7 +77,7 @@ buildPythonPackage { flake8 httpx ipython - pytest-cov + pytest-cov-stub requests requests-toolbelt nbdev diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix index b619b5b70e45..cf51d6bdf973 100644 --- a/pkgs/development/python-modules/unstructured-inference/default.nix +++ b/pkgs/development/python-modules/unstructured-inference/default.nix @@ -6,7 +6,7 @@ layoutparser, python-multipart, huggingface-hub, - opencv, + opencv-python, onnxruntime, transformers, detectron2, @@ -17,33 +17,28 @@ click, httpx, mypy, - pytest-cov, + pytest-cov-stub, pdf2image, }: buildPythonPackage rec { pname = "unstructured-inference"; - version = "0.7.24"; + version = "0.7.37"; format = "setuptools"; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-inference"; rev = "refs/tags/${version}"; - hash = "sha256-AxQHTUgE4CyiinT7HEh6fvbw+uVi7lKUgfOc1KZOezU="; + hash = "sha256-2k7gFlBUevVnz2A5pvUE4eIGmXwEr5s4F8BbX6j5lzc="; }; - postPatch = '' - substituteInPlace requirements/base.in \ - --replace "opencv-python" "opencv" - ''; - propagatedBuildInputs = [ layoutparser python-multipart huggingface-hub - opencv + opencv-python onnxruntime transformers detectron2 @@ -58,7 +53,7 @@ buildPythonPackage rec { click httpx mypy - pytest-cov + pytest-cov-stub pdf2image huggingface-hub ]; diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index afa02b447739..74667094daa2 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -51,13 +51,13 @@ freezegun, # , label-studio-sdk mypy, - pytest-cov, + pytest-cov-stub, pytest-mock, vcrpy, grpcio, }: let - version = "0.15.13"; + version = "0.15.14"; optional-dependencies = { huggingflace = [ langdetect @@ -100,7 +100,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-DbOuNh+p+4vsEO6AQUeMq25RTLm5Zn9FyzcTKJedbTM="; + hash = "sha256-cIMKaSKG4T832rpiJeiwftqVrcMezD9ICfislGPV/TQ="; }; propagatedBuildInputs = [ @@ -137,13 +137,13 @@ buildPythonPackage { click freezegun mypy - pytest-cov + pytest-cov-stub pytest-mock vcrpy grpcio ]; - passthru.optional-dependencies = optional-dependencies; + optional-dependencies = optional-dependencies; meta = with lib; { description = "Open source libraries and APIs to build custom preprocessing pipelines for labeling, training, or production machine learning pipelines"; diff --git a/pkgs/development/python-modules/upass/default.nix b/pkgs/development/python-modules/upass/default.nix index 7e82256d3917..616afc78bcd4 100644 --- a/pkgs/development/python-modules/upass/default.nix +++ b/pkgs/development/python-modules/upass/default.nix @@ -4,21 +4,24 @@ fetchFromGitHub, pyperclip, urwid, + setuptools, }: buildPythonPackage rec { pname = "upass"; - version = "0.2.1"; - format = "setuptools"; + version = "0.3.0"; + pyproject = true; src = fetchFromGitHub { owner = "Kwpolska"; repo = "upass"; rev = "v${version}"; - sha256 = "0bgplq07dmlld3lp6jag1w055glqislfgwwq2k7cb2bzjgvysdnj"; + hash = "sha256-IlNqPmDaRZ3yRV8O6YKjQkZ3fKNcFgzJHtIX0ADrOyU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pyperclip urwid ]; diff --git a/pkgs/development/python-modules/uplc/default.nix b/pkgs/development/python-modules/uplc/default.nix index 0de44fb056ca..6d7affece0c6 100644 --- a/pkgs/development/python-modules/uplc/default.nix +++ b/pkgs/development/python-modules/uplc/default.nix @@ -15,15 +15,15 @@ buildPythonPackage rec { pname = "uplc"; - version = "1.0.6"; + version = "1.0.7"; format = "pyproject"; src = fetchFromGitHub { owner = "OpShin"; repo = "uplc"; - rev = version; - hash = "sha256-FQH2GE6ihLcHtEavAYFPr8xsRqnUROtZ8yyIfRbY9CQ="; + rev = "refs/tags/${version}"; + hash = "sha256-xK2k0XLybWqyP5Qa2Oby8YBgiiswR++yVK7NPgpdSa0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index e0e666d7ffa7..4242814caafe 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -26,16 +25,14 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.4.0"; + version = "5.4.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-iCyGG4y7cnJqHEaqpzFc/LjWiLZw3HArU5hDtEyLgFo="; + hash = "sha256-MWqkEbw6hdNaXrRLWoxUcppT+X9a+DmEhho9GpG29XM="; }; build-system = [ diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 1bffd501e763..943bed05fb02 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -6,6 +6,7 @@ # build-system hatchling, + hatch-vcs, # optional-dependencies brotli, @@ -24,17 +25,20 @@ let self = buildPythonPackage rec { pname = "urllib3"; - version = "2.2.2"; + version = "2.2.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-3VBUhVSaelUoM9peYGNjnQ0XfATyO8OGTkHl3F9hIWg="; + hash = "sha256-59gUqB2tgebK8uyf3tsoTsyccwdrYmVFR8xkzNyuJuk="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ + hatchling + hatch-vcs + ]; - passthru.optional-dependencies = { + optional-dependencies = { brotli = if isPyPy then [ brotlicffi ] else [ brotli ]; socks = [ pysocks ]; }; @@ -47,7 +51,7 @@ let trustme ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (builtins.attrValues optional-dependencies); # Tests in urllib3 are mostly timeout-based instead of event-based and # are therefore inherently flaky. On your own machine, the tests will diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 7c2024af44d8..0094bb972a91 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.15"; + version = "2.6.16"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "urwid"; repo = "urwid"; rev = "refs/tags/${version}"; - hash = "sha256-bBgzhNNYxNZKaSo43I3fMoR+j6XDV6UBNrZfQyZ/f7c="; + hash = "sha256-D5NHtU7XQRh8OqkwrN5r8U/VGF87LGwdnaqGhdjN8AE="; }; postPatch = '' @@ -46,7 +46,7 @@ buildPythonPackage rec { wcwidth ]; - passthru.optional-dependencies = { + optional-dependencies = { glib = [ pygobject3 ]; tornado = [ tornado ]; trio = [ @@ -62,12 +62,17 @@ buildPythonPackage rec { nativeCheckInputs = [ glibcLocales pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); env.LC_ALL = "en_US.UTF8"; pytestFlagsArray = [ "tests" ]; + disabledTests = [ + # Flaky tests + "TwistedEventLoopTest" + ]; + disabledTestPaths = [ # expect call hangs "tests/test_vterm.py" diff --git a/pkgs/development/python-modules/us/default.nix b/pkgs/development/python-modules/us/default.nix index b42c5c8f6aa1..aca1f00c6898 100644 --- a/pkgs/development/python-modules/us/default.nix +++ b/pkgs/development/python-modules/us/default.nix @@ -6,27 +6,26 @@ pytestCheckHook, pythonOlder, pytz, + setuptools, }: buildPythonPackage rec { pname = "us"; - version = "3.1.1"; - format = "setuptools"; + version = "3.2.0"; + pyproject = true; + + build-system = [ setuptools ]; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-40eWPo0kocp0N69EP6aFkXdoR7UMhlDY7w61NILnBcI="; + hash = "sha256-yyI+hTk9zFFx6tDdISutxH+WZ7I3AP6j5+pfMQ1UUzg="; }; - postPatch = '' - # Upstream spins jellyfish - substituteInPlace setup.py \ - --replace "jellyfish==" "jellyfish>=" - ''; - - propagatedBuildInputs = [ jellyfish ]; + propagatedBuildInputs = [ + jellyfish + ]; nativeCheckInputs = [ pytestCheckHook @@ -35,7 +34,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "us" ]; - meta = with lib; { + meta = { description = "Package for easily working with US and state metadata"; mainProgram = "states"; longDescription = '' @@ -45,7 +44,7 @@ buildPythonPackage rec { census, congressional districts, counties, and census tracts. ''; homepage = "https://github.com/unitedstates/python-us/"; - license = licenses.bsd3; - maintainers = [ ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; }; } diff --git a/pkgs/development/python-modules/ush/default.nix b/pkgs/development/python-modules/ush/default.nix index 3b4cd7a0bd23..714bb5a630b0 100644 --- a/pkgs/development/python-modules/ush/default.nix +++ b/pkgs/development/python-modules/ush/default.nix @@ -4,20 +4,25 @@ fetchFromGitHub, pytestCheckHook, six, + setuptools, }: buildPythonPackage rec { pname = "ush"; - version = "3.1.0"; - format = "setuptools"; + version = "4.1.0"; + pyproject = true; src = fetchFromGitHub { owner = "tarruda"; repo = "python-ush"; rev = version; - hash = "sha256-eL3vG3yS02enbLYorKvvYKbju9HInffUhrZgkodwhvo="; + hash = "sha256-a6ICbd8647DRtuHl2vs64bsChUjlpuWHV1ipBdFA600="; }; + build-system = [ setuptools ]; + + pythonImportsCheck = [ "ush" ]; + nativeCheckInputs = [ pytestCheckHook six diff --git a/pkgs/development/python-modules/uuid6/default.nix b/pkgs/development/python-modules/uuid6/default.nix new file mode 100644 index 000000000000..709f7156e645 --- /dev/null +++ b/pkgs/development/python-modules/uuid6/default.nix @@ -0,0 +1,47 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + pytestCheckHook, +}: +buildPythonPackage rec { + pname = "uuid6"; + version = "2024.7.10"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LSnX9j9ZPKruoODQ3QrYEpycZjsp4ZvfiC6GS+3xj7A="; + }; + + # https://github.com/oittaa/uuid6-python/blob/e647035428d984452b9906b75bb007198533dfb1/setup.py#L12-L19 + env.GITHUB_REF = "refs/tags/${version}"; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "test/" + ]; + + disabledTestPaths = [ + "test/test_uuid6.py" + ]; + + pythonImportsCheck = [ + "uuid6" + ]; + + meta = { + description = "New time-based UUID formats which are suited for use as a database key"; + homepage = "https://github.com/oittaa/uuid6-python"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aleksana ]; + }; +} diff --git a/pkgs/development/python-modules/uvcclient/default.nix b/pkgs/development/python-modules/uvcclient/default.nix index 707a464d7e4f..4f37152ef71f 100644 --- a/pkgs/development/python-modules/uvcclient/default.nix +++ b/pkgs/development/python-modules/uvcclient/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "uvcclient"; - version = "0.12.1"; + version = "0.12.2"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ilZTRoSuoJMWlyRfvY/PpTBbr+d6wx+T3cVyW3ZkXlY="; + hash = "sha256-V7xIvZ9vIXHPpkEeJZ6QedWk+4ZVNwCzj5ffLyixFz4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 48bd9e9ef85e..ab72df02971f 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.29.0"; + version = "0.32.0"; disabled = pythonOlder "3.8"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "encode"; repo = "uvicorn"; rev = "refs/tags/${version}"; - hash = "sha256-D0FdZxaDB+9N/7p73GF8qw0UwbXTQrKc1WOgy9UltxA="; + hash = "sha256-LTioJNDq1zsy/FO6lBgRW8Ow5qyxUD8NjNCj4nIrVDM="; }; outputs = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { h11 ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; - passthru.optional-dependencies.standard = [ + optional-dependencies.standard = [ httptools python-dotenv pyyaml diff --git a/pkgs/development/python-modules/uvicorn/tests.nix b/pkgs/development/python-modules/uvicorn/tests.nix index 24dd8d2b848c..b5d7cee2f7c5 100644 --- a/pkgs/development/python-modules/uvicorn/tests.nix +++ b/pkgs/development/python-modules/uvicorn/tests.nix @@ -34,7 +34,7 @@ buildPythonPackage { wsproto ] ++ uvicorn.optional-dependencies.standard; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 06447432f218..8ef7730047d5 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -6,7 +6,7 @@ fetchPypi, # build-system - cython_0, + cython, setuptools, # native dependencies @@ -22,18 +22,18 @@ buildPythonPackage rec { pname = "uvloop"; - version = "0.20.0"; + version = "0.21.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-RgPKcUp1T8jZsZfjJdslsuoEU4Xoo60F00Y95yX99Gk="; + hash = "sha256-O/ErD9poRHgGp62Ee/pZFhMXcnXTW2ckse5XP6o3BOM="; }; build-system = [ - cython_0 + cython setuptools ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { buildInputs = [ libuv ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ApplicationServices ]; @@ -61,7 +61,10 @@ buildPythonPackage rec { "--deselect=tests/test_process.py::Test_UV_Process::test_process_streams_redirect" "--deselect=tests/test_process.py::Test_AIO_Process::test_process_streams_redirect" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (pythonOlder "3.11") [ + "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_create_connection_ssl_failed_certificat" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # Segmentation fault "--deselect=tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename" # Broken: https://github.com/NixOS/nixpkgs/issues/160904 @@ -78,7 +81,7 @@ buildPythonPackage rec { # force using installed/compiled uvloop rm -rf uvloop '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # Work around "OSError: AF_UNIX path too long" # https://github.com/MagicStack/uvloop/issues/463 export TMPDIR="/tmp" diff --git a/pkgs/development/python-modules/uxsim/default.nix b/pkgs/development/python-modules/uxsim/default.nix index 15d10eb5fe62..56800a5199b7 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.6.0"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "toruseo"; repo = "UXsim"; rev = "refs/tags/v${version}"; - hash = "sha256-+nJsP/XAp6F7LZQI559rI3OCFnMTXJ4eFKEEJyEDHDg="; + hash = "sha256-FZ8eGA3sSKaUqAd+jTlIIZDeEoXeqdpsSgJ+ZHuWyJM="; }; 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 fbec2841fcdb..341739ff6e5a 100644 --- a/pkgs/development/python-modules/validator-collection/default.nix +++ b/pkgs/development/python-modules/validator-collection/default.nix @@ -9,7 +9,6 @@ certifi, cffi, chardet, - codecov, colorama, coverage, docutils, @@ -35,7 +34,7 @@ pyparsing, pytest, pytest-benchmark, - pytest-cov, + pytest-cov-stub, pytz, readme-renderer, requests, @@ -82,7 +81,6 @@ buildPythonPackage rec { certifi cffi chardet - codecov colorama coverage docutils @@ -108,7 +106,7 @@ buildPythonPackage rec { pyparsing pytest pytest-benchmark - pytest-cov + pytest-cov-stub pytz readme-renderer requests diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix index 1664916710d5..180296b11374 100644 --- a/pkgs/development/python-modules/validators/default.nix +++ b/pkgs/development/python-modules/validators/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "validators"; - version = "0.33.0"; + version = "0.34.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "python-validators"; repo = "validators"; rev = "refs/tags/${version}"; - hash = "sha256-eLujcm2MD1mPjROrBTg9TfU9wts16Jgb+ouNXFHsFZ0="; + hash = "sha256-1QKo6nidaHeKCbti/xALbgylHYbtBUJlWrjhNtdx8kU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/vdf/default.nix b/pkgs/development/python-modules/vdf/default.nix index e74f735538e5..28f08948fce1 100644 --- a/pkgs/development/python-modules/vdf/default.nix +++ b/pkgs/development/python-modules/vdf/default.nix @@ -2,8 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, mock, pytestCheckHook, + nix-update-script, }: buildPythonPackage rec { @@ -13,17 +15,30 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ValvePython"; - repo = pname; - rev = "v${version}"; + repo = "vdf"; + rev = "refs/tags/v${version}"; hash = "sha256-6ozglzZZNKDtADkHwxX2Zsnkh6BE8WbcRcC9HkTTgPU="; }; + patches = [ + # Support appinfo.vdf v29 (required by protontricks 1.12.0) + (fetchpatch2 { + url = "https://github.com/Matoking/vdf/commit/981cad270c2558aeb8eccaf42cfcf9fabbbed199.patch"; + hash = "sha256-kLAbbB0WHjxq4rokLoGTPx43BU44EshteR59Ey9JnXo="; + }) + ]; + nativeCheckInputs = [ mock pytestCheckHook ]; + pythonImportsCheck = [ "vdf" ]; + # Use nix-update-script instead of the default python updater + # The python updater requires GitHub releases, but vdf only uses tags + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Library for working with Valve's VDF text format"; homepage = "https://github.com/ValvePython/vdf"; diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 7851df4a2971..e0a4e1353a57 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "vdirsyncer"; - version = "0.19.2"; + version = "0.19.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/QWM7quCk0WaBGbNmw5Ks7OUYsbgiaDwrDfDB0INgro="; + hash = "sha256-5DeFH+uYXew1RGVPj5z23RCbCwP34ZlWCGYDCS/+so8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix index ae7782699ef9..df2cffc98b4a 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -1,7 +1,7 @@ { lib, + stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -12,7 +12,7 @@ numpy, packaging, - # checks + # tests awkward, dask-awkward, notebook, @@ -20,22 +20,18 @@ papermill, pytestCheckHook, sympy, - - stdenv, }: buildPythonPackage rec { pname = "vector"; - version = "1.5.1"; + version = "1.5.2"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "scikit-hep"; repo = "vector"; rev = "refs/tags/v${version}"; - hash = "sha256-bTCcuJosoR0/n6QiJuCIeE9oPab9RKAbUXXA+sAkX48="; + hash = "sha256-lj6ZloBGZqHW0g7lCD7m9zvszJceB9TQ3r6B3Xuj5KE="; }; build-system = [ @@ -68,7 +64,7 @@ buildPythonPackage rec { "test_rhophi_eta_tau" "test_xy_eta_tau" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # AssertionError: assert 2.1073424255447017e-08 == 0.0 "test_issue_463" ]; diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index d7fbe2cabaa2..0645e6d7e8b8 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchpatch, fetchPypi, pythonOlder, altair, @@ -17,25 +16,16 @@ buildPythonPackage rec { pname = "vega"; - version = "4.0.0"; + version = "4.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-v1/8taHdN1n9+gy7L+g/wAJ2x9FwYCaxZiEdFqLct1Y="; + hash = "sha256-8lrmhCvwczqBpiQRCkPjmiYsJPHEFnZab/Azkh+i7ls="; }; - patches = [ - # https://github.com/vega/ipyvega/pull/507 - (fetchpatch { - name = "replace-poetry-with-poetry-core.patch"; - url = "https://github.com/vega/ipyvega/commit/1a5028ee5d54e24b9650b66685f54c42b72c7899.patch"; - hash = "sha256-W8UmMit7DJGKCM9+/OSRLTuRvC0ZR42AP/b/frVEvsk="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; @@ -49,7 +39,7 @@ buildPythonPackage rec { pandas ]; - passthru.optional-dependencies = { + optional-dependencies = { widget = [ ipywidgets ]; jupyterlab = [ jupyterlab ]; }; diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index 2536e44bd960..72803dfd6074 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.6"; + version = "2024.10.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "velbus-aio"; rev = "refs/tags/${version}"; - hash = "sha256-+mdIJNWnrw8DHVEes+/X04eTILBt7zgTgNLG80XJlnI="; + hash = "sha256-4hMUh/0/srYIPed647Sh7H7DIp2oV7LN9srzLr0Qxps="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 7dd1e7a818f9..2794a7a1699b 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -4,7 +4,7 @@ fetchPypi, isPy27, pytestCheckHook, - pytest-cov, + pytest-cov-stub, setuptools, }: @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; checkPhase = '' diff --git a/pkgs/development/python-modules/verilogae/Cargo.lock b/pkgs/development/python-modules/verilogae/Cargo.lock new file mode 100644 index 000000000000..9f8d248604fd --- /dev/null +++ b/pkgs/development/python-modules/verilogae/Cargo.lock @@ -0,0 +1,1769 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +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.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "anyhow" +version = "1.0.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + +[[package]] +name = "arena" +version = "0.0.0" +dependencies = [ + "typed-index-collections", +] + +[[package]] +name = "arrayvec" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "backtrace-ext" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50" +dependencies = [ + "backtrace", +] + +[[package]] +name = "base_n" +version = "1.0.0" + +[[package]] +name = "basedb" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "arena", + "codespan-reporting", + "expect-test", + "indexmap", + "mini_harness", + "parking_lot", + "salsa", + "stdx", + "syntax", + "text-size", + "typed-index-collections", + "vfs", +] + +[[package]] +name = "bforest" +version = "0.0.0" +dependencies = [ + "stdx", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24a6904aef64d73cf10ab17ebace7befb918b82164785cb89907993be7f83813" + +[[package]] +name = "bitset" +version = "0.0.0" +dependencies = [ + "arrayvec", + "stdx", +] + +[[package]] +name = "camino" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" + +[[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 = "chardetng" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14b8f0b65b7b08ae3c8187e8d77174de20cb6777864c6b832d8ad365999cf1ea" +dependencies = [ + "cfg-if", + "encoding_rs", + "memchr", +] + +[[package]] +name = "clap" +version = "4.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" +dependencies = [ + "anstream", + "anstyle", + "bitflags 1.3.2", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_lex" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" + +[[package]] +name = "cli-table" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adfbb116d9e2c4be7011360d0c0bee565712c11e969c9609b25b619366dc379d" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "countme" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "dashmap" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +dependencies = [ + "cfg-if", + "num_cpus", +] + +[[package]] +name = "directories-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dissimilar" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "210ec60ae7d710bed8683e333e9d2855a8a56a3e9892b38bad3bb0d4d29b0d5e" + +[[package]] +name = "dot" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a74b6c4d4a1cff5f454164363c16b72fa12463ca6b31f4b5f2035a65fa3d5906" + +[[package]] +name = "drop_bomb" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" + +[[package]] +name = "encoding_rs" +version = "0.8.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[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 = "expect-test" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3" +dependencies = [ + "dissimilar", + "once_cell", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "getrandom" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" + +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +dependencies = [ + "ahash 0.7.6", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.3", +] + +[[package]] +name = "hashlink" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" +dependencies = [ + "hashbrown 0.11.2", +] + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[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 = "hir_def" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "arena", + "basedb", + "expect-test", + "indexmap", + "mini_harness", + "once_cell", + "parking_lot", + "salsa", + "stdx", + "syntax", + "typed-index-collections", +] + +[[package]] +name = "hir_lower" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "basedb", + "bitset", + "expect-test", + "hir_def", + "hir_ty", + "indexmap", + "lasso", + "mini_harness", + "mir", + "mir_build", + "parking_lot", + "salsa", + "stdx", + "syntax", + "typed-index-collections", + "typed_indexmap", +] + +[[package]] +name = "hir_ty" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "arena", + "basedb", + "expect-test", + "hir_def", + "mini_harness", + "parking_lot", + "salsa", + "smol_str", + "stdx", + "syntax", + "typed-index-collections", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[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 = "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 = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "klu-rs" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0326c3bebaae9e354d82d0425b8abeebe41e9df313063ac3845ae93aa43181" +dependencies = [ + "klu_sys", + "num-complex", +] + +[[package]] +name = "klu_sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc7f729c295c52f9ad3058f5e61db78bde2b8c6f1e30abf4ccf09d2df4f3a689" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "lasso" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badc7a606a3096e40b886fb2f63803cacf11cd79796ae04e3f4b7e35a38cfc2" +dependencies = [ + "ahash 0.8.3", + "hashbrown 0.13.2", +] + +[[package]] +name = "lexer" +version = "0.0.0" +dependencies = [ + "expect-test", + "text-size", + "tokens", +] + +[[package]] +name = "libc" +version = "0.2.144" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" + +[[package]] +name = "libloading" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "libmimalloc-sys" +version = "0.1.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "linker" +version = "0.0.0" +dependencies = [ + "anyhow", + "camino", + "cc", + "target", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" + +[[package]] +name = "list_pool" +version = "0.0.0" +dependencies = [ + "stdx", +] + +[[package]] +name = "llvm" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "cc", + "libc", +] + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "md5" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" + +[[package]] +name = "melange-core" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "anyhow", + "bitflags 2.2.1", + "camino", + "cli-table", + "directories-next", + "indexmap", + "klu-rs", + "lasso", + "libc", + "libloading", + "log", + "num-complex", + "openvaf", + "pretty_dtoa", + "stdx", + "typed-index-collections", + "typed_indexmap", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mimalloc" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" +dependencies = [ + "libmimalloc-sys", +] + +[[package]] +name = "mini_harness" +version = "0.0.1" +dependencies = [ + "xflags", +] + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + +[[package]] +name = "mir" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "bforest", + "bitset", + "dot", + "expect-test", + "lasso", + "list_pool", + "stdx", + "typed-index-collections", + "typed_indexmap", +] + +[[package]] +name = "mir_autodiff" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "arena", + "bitset", + "expect-test", + "float-cmp", + "indexmap", + "mir", + "mir_interpret", + "mir_reader", + "stdx", + "typed-index-collections", + "typed_indexmap", + "workqueue", +] + +[[package]] +name = "mir_build" +version = "0.0.0" +dependencies = [ + "bforest", + "bitset", + "expect-test", + "lasso", + "mir", + "mir_reader", + "smallvec", + "stdx", + "typed-index-collections", +] + +[[package]] +name = "mir_interpret" +version = "0.0.0" +dependencies = [ + "lasso", + "mir", + "typed-index-collections", +] + +[[package]] +name = "mir_llvm" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "arrayvec", + "base_n", + "lasso", + "libc", + "llvm", + "log", + "mir", + "target", + "typed-index-collections", +] + +[[package]] +name = "mir_opt" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "bitset", + "expect-test", + "hashbrown 0.13.2", + "indexmap", + "mir", + "mir_reader", + "stdx", + "typed-index-collections", + "workqueue", +] + +[[package]] +name = "mir_reader" +version = "0.0.0" +dependencies = [ + "bforest", + "expect-test", + "lasso", + "mir", +] + +[[package]] +name = "num-complex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +dependencies = [ + "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 = "object" +version = "0.30.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "openvaf" +version = "0.1.2" +dependencies = [ + "anyhow", + "base_n", + "basedb", + "camino", + "linker", + "llvm", + "md5", + "mir_llvm", + "osdi", + "paths", + "sim_back", + "target", + "termcolor", +] + +[[package]] +name = "openvaf-driver" +version = "23.5.0" +dependencies = [ + "anyhow", + "backtrace", + "backtrace-ext", + "camino", + "clap", + "directories-next", + "env_logger", + "log", + "mimalloc", + "openvaf", + "path-absolutize", + "termcolor", +] + +[[package]] +name = "osdi" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "base_n", + "camino", + "expect-test", + "float-cmp", + "hir_def", + "hir_lower", + "hir_ty", + "indexmap", + "lasso", + "llvm", + "log", + "mini_harness", + "mir", + "mir_interpret", + "mir_llvm", + "paths", + "rayon-core", + "salsa", + "sim_back", + "smol_str", + "stdx", + "target", + "typed-index-collections", + "typed_indexmap", + "xshell", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys 0.45.0", +] + +[[package]] +name = "parser" +version = "0.0.0" +dependencies = [ + "drop_bomb", + "stdx", + "tokens", +] + +[[package]] +name = "path-absolutize" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43eb3595c63a214e1b37b44f44b0a84900ef7ae0b4c5efce59e123d246d7a0de" +dependencies = [ + "path-dedot", +] + +[[package]] +name = "path-dedot" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d55e486337acb9973cdea3ec5638c1b3bcb22e573b2b7b41969e0c744d5a15e" +dependencies = [ + "once_cell", +] + +[[package]] +name = "paths" +version = "0.0.0" + +[[package]] +name = "preprocessor" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "expect-test", + "lexer", + "stdx", + "text-size", + "tokens", + "typed-index-collections", + "vfs", +] + +[[package]] +name = "pretty_dtoa" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a239bcdfda2c685fda1add3b4695c06225f50075e3cfb5b954e91545587edff2" +dependencies = [ + "ryu_floating_decimal", +] + +[[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 = "pyo3-build-config" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cb946f5ac61bb61a5014924910d936ebd2b23b705f7a4a3c40b05c720b079a3" +dependencies = [ + "once_cell", + "python3-dll-a", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd4d7c5337821916ea2a1d21d1092e8443cf34879e53a0ac653fbb98f44ff65c" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "python3-dll-a" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a915bd72824962bf190bbd3e8a044cccb695d1409f73ff5493712eda5136c7a8" +dependencies = [ + "cc", +] + +[[package]] +name = "quote" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall", + "thiserror", +] + +[[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 = "rowan" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64449cfef9483a475ed56ae30e2da5ee96448789fb2aa240a04beb6a055078bf" +dependencies = [ + "countme", + "hashbrown 0.12.3", + "memoffset", + "rustc-hash", + "text-size", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.37.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "ryu_floating_decimal" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "700de91d5fd6091442d00fdd9ee790af6d4f0f480562b0f5a1e8f59e90aafe73" + +[[package]] +name = "salsa" +version = "0.17.0-pre.2" +source = "git+https://github.com/DSPOM2/salsa#73532d7d4d8b5b27f2c9f189a76e012d1fc4de09" +dependencies = [ + "arc-swap", + "crossbeam-utils", + "dashmap", + "hashlink", + "indexmap", + "lock_api", + "log", + "oorandom", + "parking_lot", + "rustc-hash", + "salsa-macros", + "smallvec", +] + +[[package]] +name = "salsa-macros" +version = "0.17.0-pre.2" +source = "git+https://github.com/DSPOM2/salsa#73532d7d4d8b5b27f2c9f189a76e012d1fc4de09" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "sim_back" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "anyhow", + "basedb", + "bitset", + "expect-test", + "float-cmp", + "hir_def", + "hir_lower", + "hir_ty", + "indexmap", + "lasso", + "mir", + "mir_autodiff", + "mir_interpret", + "mir_opt", + "parking_lot", + "paths", + "salsa", + "smol_str", + "stdx", + "syntax", + "typed-index-collections", + "typed_indexmap", + "workqueue", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "smol_str" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" + +[[package]] +name = "sourcegen" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "indexmap", + "proc-macro2", + "quote", + "stdx", + "target", + "ungrammar", + "xshell", +] + +[[package]] +name = "stdx" +version = "0.0.0" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[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 = "syntax" +version = "0.0.0" +dependencies = [ + "parser", + "preprocessor", + "rowan", + "smol_str", + "stdx", + "text-size", + "tokens", + "vfs", +] + +[[package]] +name = "target" +version = "0.0.0" +dependencies = [ + "stdx", + "xshell", +] + +[[package]] +name = "target-lexicon" +version = "0.12.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "text-size" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "288cb548dbe72b652243ea797201f3d481a0609a967980fcc5b2315ea811560a" + +[[package]] +name = "thiserror" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + +[[package]] +name = "tokens" +version = "0.0.0" +dependencies = [ + "text-size", +] + +[[package]] +name = "typed-index-collections" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "183496e014253d15abbe6235677b1392dba2d40524c88938991226baa38ac7c4" + +[[package]] +name = "typed_indexmap" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "indexmap", +] + +[[package]] +name = "ungrammar" +version = "1.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e5df347f0bf3ec1d670aad6ca5c6a1859cd9ea61d2113125794654ccced68f" + +[[package]] +name = "unicode-ident" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "verilogae" +version = "1.0.0" +dependencies = [ + "ahash 0.8.3", + "anyhow", + "base_n", + "basedb", + "bitset", + "camino", + "directories-next", + "hir_def", + "hir_lower", + "hir_ty", + "indexmap", + "lasso", + "libloading", + "linker", + "llvm", + "md5", + "mir", + "mir_autodiff", + "mir_llvm", + "mir_opt", + "parking_lot", + "paths", + "rayon-core", + "salsa", + "smol_str", + "stdx", + "syntax", + "target", + "termcolor", + "typed-index-collections", + "typed_indexmap", +] + +[[package]] +name = "verilogae_ffi" +version = "1.0.0" +dependencies = [ + "verilogae", +] + +[[package]] +name = "verilogae_py" +version = "1.0.0" +dependencies = [ + "libc", + "pyo3-build-config", + "pyo3-ffi", + "verilogae_ffi", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vfs" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "chardetng", + "encoding_rs", + "indexmap", + "paths", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[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-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 = "workqueue" +version = "0.0.0" +dependencies = [ + "bitset", +] + +[[package]] +name = "xflags" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4554b580522d0ca238369c16b8f6ce34524d61dafe7244993754bbd05f2c2ea" +dependencies = [ + "xflags-macros", +] + +[[package]] +name = "xflags-macros" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f58e7b3ca8977093aae6b87b6a7730216fc4c53a6530bab5c43a783cd810c1a8" + +[[package]] +name = "xshell" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "962c039b3a7b16cf4e9a4248397c6585c07547412e7d6a6e035389a802dcfe90" +dependencies = [ + "xshell-macros", +] + +[[package]] +name = "xshell-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dbabb1cbd15a1d6d12d9ed6b35cc6777d4af87ab3ba155ea37215f20beab80c" + +[[package]] +name = "xtask" +version = "0.1.0" +dependencies = [ + "anyhow", + "base_n", + "md5", + "xflags", + "xshell", +] diff --git a/pkgs/development/python-modules/verilogae/default.nix b/pkgs/development/python-modules/verilogae/default.nix new file mode 100644 index 000000000000..ab6bd93632c0 --- /dev/null +++ b/pkgs/development/python-modules/verilogae/default.nix @@ -0,0 +1,79 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools-rust, + rustPlatform, + cargo, + rustc, + autoPatchelfHook, + pkg-config, + llvmPackages_15, + libxml2, + ncurses, + zlib, +}: + +buildPythonPackage rec { + pname = "verilogae"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pascalkuthe"; + repo = "OpenVAF"; + rev = "VerilogAE-v${version}"; + hash = "sha256-TILKKmgSyhyxp88sdflDXAoH++iP6CMpdoXN1/1fsjU="; + }; + + postPatch = '' + substituteInPlace openvaf/llvm/src/initialization.rs \ + --replace-fail "i8" "libc::c_char" + substituteInPlace openvaf/osdi/build.rs \ + --replace-fail "-fPIC" "" + ''; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "salsa-0.17.0-pre.2" = "sha256-6GssvV76lFr5OzAUekz2h6f82Tn7usz5E8MSZ5DmgJw="; + }; + }; + + nativeBuildInputs = [ + setuptools-rust + rustPlatform.cargoSetupHook + rustPlatform.bindgenHook + cargo + rustc + autoPatchelfHook + pkg-config + llvmPackages_15.clang + llvmPackages_15.llvm + ]; + + buildInputs = [ + libxml2.dev + llvmPackages_15.libclang + ncurses + zlib + ]; + + cargoBuildType = "release"; + + pythonImportsCheck = [ "verilogae" ]; + + hardeningDisable = [ "pic" ]; + + meta = { + description = "Verilog-A tool useful for compact model parameter extraction"; + homepage = "https://man.sr.ht/~dspom/openvaf_doc/verilogae/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + jasonodoom + jleightcap + ]; + platforms = lib.platforms.linux; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + }; +} diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index d98aa5ab71d1..613859ff61e0 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { toml = lib.optionals (pythonOlder "3.11") [ tomli ]; }; diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix index 9abbf8bba33b..05dc14a79557 100644 --- a/pkgs/development/python-modules/versioningit/default.nix +++ b/pkgs/development/python-modules/versioningit/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "versioningit"; version = "3.1.2"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -29,13 +29,16 @@ buildPythonPackage rec { hash = "sha256-Tbg+2Z9WsH2DlAvuNEXKRsoSDRO2swTNtftE5apO3sA="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = + dependencies = [ packaging ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + # AttributeError: type object 'CaseDetails' has no attribute 'model_validate_json' + doCheck = lib.versionAtLeast pydantic.version "2"; + nativeCheckInputs = [ pytestCheckHook build diff --git a/pkgs/development/python-modules/vharfbuzz/default.nix b/pkgs/development/python-modules/vharfbuzz/default.nix index 5d41a3a2e57b..7b06fe7a8252 100644 --- a/pkgs/development/python-modules/vharfbuzz/default.nix +++ b/pkgs/development/python-modules/vharfbuzz/default.nix @@ -2,29 +2,35 @@ lib, buildPythonPackage, fetchPypi, + setuptools, + setuptools-scm, fonttools, - pythonImportsCheckHook, uharfbuzz, }: buildPythonPackage rec { pname = "vharfbuzz"; - version = "0.3.0"; - format = "setuptools"; + version = "0.3.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-bBKmVvLuc/CtQF+TSri8ngglnj4QCh77FV+JHPzsFAI="; + hash = "sha256-zFVw8Nxh7cRJNk/S7D3uiIGShBMiZ/JeuSdX4hN94kc="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ fonttools uharfbuzz ]; - nativeBuildInputs = [ pythonImportsCheckHook ]; # Package has no tests. doCheck = false; + pythonImportsCheck = [ "vharfbuzz" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/videocr/default.nix b/pkgs/development/python-modules/videocr/default.nix index 262c109325d9..ed37faf4bb1f 100644 --- a/pkgs/development/python-modules/videocr/default.nix +++ b/pkgs/development/python-modules/videocr/default.nix @@ -5,7 +5,7 @@ setuptools, levenshtein, pytesseract, - opencv4, + opencv-python, fuzzywuzzy, }: @@ -24,14 +24,13 @@ buildPythonPackage rec { dependencies = [ levenshtein pytesseract - opencv4 + opencv-python fuzzywuzzy ]; postPatch = '' substituteInPlace setup.py \ - --replace-fail "python-Levenshtein" "Levenshtein" \ - --replace-fail "opencv-python" "opencv" + --replace-fail "python-Levenshtein" "Levenshtein" substituteInPlace videocr/constants.py \ --replace-fail "master" "main" substituteInPlace videocr/video.py \ diff --git a/pkgs/development/python-modules/viewstate/default.nix b/pkgs/development/python-modules/viewstate/default.nix index 27cb972bb780..d3824b2c36a3 100644 --- a/pkgs/development/python-modules/viewstate/default.nix +++ b/pkgs/development/python-modules/viewstate/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "viewstate"; - version = "0.4.3"; + version = "0.6.0"; format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { owner = "yuvadm"; repo = pname; - rev = "v${version}"; - sha256 = "15s0n1lhkz0zwi33waqkkjipal3f7s45rxsj1bw89xpr4dj87qx5"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-cXT5niE3rNdqmNqnITWy9c9/MF0gZ6LU2i1uzfOzkUI="; }; nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/virt-firmware/default.nix b/pkgs/development/python-modules/virt-firmware/default.nix index 19c6244f2626..3e327a51474e 100644 --- a/pkgs/development/python-modules/virt-firmware/default.nix +++ b/pkgs/development/python-modules/virt-firmware/default.nix @@ -3,7 +3,7 @@ pkgs, stdenv, buildPythonPackage, - fetchPypi, + fetchFromGitLab, setuptools, cryptography, pytestCheckHook, @@ -12,12 +12,14 @@ buildPythonPackage rec { pname = "virt-firmware"; - version = "24.4"; + version = "24.7"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-rqhaKDOQEOj6bcRz3qZJ+a4yG1qTC9SUjuxMhZlnmwU="; + src = fetchFromGitLab { + owner = "kraxel"; + repo = "virt-firmware"; + rev = "refs/tags/v${version}"; + hash = "sha256-uVLq4vbnvK1RCA3tpLgwKb/qzysLsOo3p/6gQ2Prmu0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/virtkey/default.nix b/pkgs/development/python-modules/virtkey/default.nix index 4815ce63413f..553721e83eea 100644 --- a/pkgs/development/python-modules/virtkey/default.nix +++ b/pkgs/development/python-modules/virtkey/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Extension to emulate keypresses and to get the layout information from the X server"; homepage = "https://launchpad.net/virtkey"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 6e7904dbe3cd..660859b95769 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.26.2"; + version = "20.26.6"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gr8PTuu7eNNt2u4Cg9Q/5XNrU4gLiozc03OQoHrDdBw="; + hash = "sha256-KArt4JoqXDF+QJoAEC5wd8ZDLFo48O+TjmQ4BaetLEg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/visions/default.nix b/pkgs/development/python-modules/visions/default.nix index 6d3da09118f9..f79a34ce58c9 100644 --- a/pkgs/development/python-modules/visions/default.nix +++ b/pkgs/development/python-modules/visions/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pandas ]; - passthru.optional-dependencies = { + optional-dependencies = { type-geometry = [ shapely ]; type-image-path = [ imagehash pillow ]; plotting = [ matplotlib pydot pygraphviz ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ # requires running Apache Spark: diff --git a/pkgs/development/python-modules/viv-utils/default.nix b/pkgs/development/python-modules/viv-utils/default.nix index 59119f85cd2b..7bb87b98bc56 100644 --- a/pkgs/development/python-modules/viv-utils/default.nix +++ b/pkgs/development/python-modules/viv-utils/default.nix @@ -5,30 +5,32 @@ funcy, intervaltree, pefile, - typing-extensions, - vivisect, pytest-sugar, pytestCheckHook, python-flirt, + pythonOlder, + setuptools-scm, + typing-extensions, + vivisect, }: + buildPythonPackage rec { pname = "viv-utils"; - version = "0.7.10"; - format = "setuptools"; + version = "0.7.11"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "williballenthin"; repo = "viv-utils"; rev = "refs/tags/v${version}"; - hash = "sha256-pQAe4QuOcx5MG+slJkf4UU38TGt4pU0uVZr+vtwsWgM="; + hash = "sha256-zYamhG5oeoYYVLEvv1EdZ1buFDByZatuCxbl0uRhk6Y="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "==" ">=" - ''; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ funcy intervaltree pefile @@ -47,6 +49,8 @@ buildPythonPackage rec { }; }; + pythonImportsCheck = [ "viv_utils" ]; + meta = with lib; { description = "Utilities for working with vivisect"; homepage = "https://github.com/williballenthin/viv-utils"; diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix index ef939cbdca6e..06b15686ec24 100644 --- a/pkgs/development/python-modules/vivisect/default.nix +++ b/pkgs/development/python-modules/vivisect/default.nix @@ -12,39 +12,43 @@ pythonOlder, withGui ? false, wrapQtAppsHook, + setuptools, }: buildPythonPackage rec { pname = "vivisect"; - version = "1.1.1"; - format = "setuptools"; + version = "1.2.1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-URRBEZelw4s43zqtb/GrLxIksvrqHbqQWntT9jVonhU="; + hash = "sha256-zBWrVBub48rYBg7k9CDmgCWPpPz3R38/mtUCM1P3Mpk="; }; pythonRelaxDeps = [ "cxxfilt" + "msgpack" "pyasn1" "pyasn1-modules" ]; + build-system = [ setuptools ]; + nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = [ + dependencies = [ pyasn1 pyasn1-modules cxxfilt msgpack pycparser - ] ++ lib.optionals (withGui) passthru.optional-dependencies.gui; + ] ++ lib.optionals (withGui) optional-dependencies.gui; - passthru.optional-dependencies.gui = [ + optional-dependencies.gui = [ pyqt5 pyqtwebengine ]; @@ -53,7 +57,7 @@ buildPythonPackage rec { wrapQtApp $out/bin/vivbin ''; - # requires another repo for test files + # Tests requires another repo for test files doCheck = false; pythonImportsCheck = [ "vivisect" ]; diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 3b9e6ee43487..0d554e5a5491 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -58,7 +58,7 @@ in buildPythonPackage rec { pname = "vllm"; - version = "0.5.3.post1"; + version = "0.6.2"; pyproject = true; stdenv = if cudaSupport then cudaPackages.backendStdenv else args.stdenv; @@ -67,7 +67,7 @@ buildPythonPackage rec { owner = "vllm-project"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-++DK2Y2zz+1KrEcdQc5XFrSjc7fCwMD2DQ/RqY7PoFU="; + hash = "sha256-zUkqAPPhDRdN9rDQ2biCl1B+trV0xIHXub++v9zsQGo="; }; patches = [ @@ -176,6 +176,8 @@ buildPythonPackage rec { happysalada lach ]; - broken = !cudaSupport && !rocmSupport; + # RuntimeError: Unknown runtime environment + broken = true; + # broken = !cudaSupport && !rocmSupport; }; } diff --git a/pkgs/development/python-modules/voip-utils/default.nix b/pkgs/development/python-modules/voip-utils/default.nix index 1799598a2a6b..04e0eb2ede82 100644 --- a/pkgs/development/python-modules/voip-utils/default.nix +++ b/pkgs/development/python-modules/voip-utils/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "voip-utils"; - version = "0.1.0"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "voip-utils"; - rev = "refs/tags/v${version}"; - hash = "sha256-PG4L6KphH9JIZO76cCN8eClFE2CneEIExlXS+x79k3U="; + rev = "refs/tags/${version}"; + hash = "sha256-/DBBTL+t0VQJL43HgXGdhMHMKr8uBEkJ7Mf7Xp1mwhU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index 23677ab4ec4f..c61971b587f4 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp ]; - passthru.optional-dependencies = { + optional-dependencies = { console = [ certifi docopt @@ -55,7 +55,7 @@ buildPythonPackage rec { mock pytest-asyncio pytestCheckHook - ] ++ passthru.optional-dependencies.mqtt; + ] ++ optional-dependencies.mqtt; pythonImportsCheck = [ "volvooncall" ]; diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 7f4feb2ba9ad..5dbf58739c75 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "9.9.0"; + version = "9.10.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-YCg2EI4rhEMwcVEzx9ES8Z3CoCddeUFVk4lZ0nuQJUc="; + hash = "sha256-Yyqm3MlW6UL+bCufFfzWg9mBBQNhLxR+g++ZrQ6qM/E="; }; nativeBuildInputs = [ cmake ]; @@ -55,7 +55,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; # Python ctypes.find_library uses DYLD_LIBRARY_PATH. - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH="${python.pkgs.boost}/lib" ''; @@ -71,6 +71,6 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ teh ]; # Test again when new version is released - broken = stdenv.isLinux; + broken = stdenv.hostPlatform.isLinux; }; } diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix index 837a13f38b44..77ce5707c5d1 100644 --- a/pkgs/development/python-modules/vsure/default.nix +++ b/pkgs/development/python-modules/vsure/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "vsure"; - version = "2.6.7"; + version = "2.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/eVFa1BTFbvFTAt48Bv+bjsV7f2eVSuKARJQVxDqU9s="; + hash = "sha256-dz7Ud8sOIz/w9IiRgDZWDln65efgf6skNmECwg+MRw0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vulcan-api/default.nix b/pkgs/development/python-modules/vulcan-api/default.nix index 37baf7f80f34..1cde8424418c 100644 --- a/pkgs/development/python-modules/vulcan-api/default.nix +++ b/pkgs/development/python-modules/vulcan-api/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "vulcan-api"; - version = "2.3.2"; + version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "kapi2289"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ebWKcRxAAkHVqV2RaftIHBRJe/TYSUxS+5Utxb0yhtw="; + hash = "sha256-RtB67Pme/qtKG0T3rzm0OeewNZPg2e3aebL5YnSWWFQ="; }; pythonRemoveDeps = [ "faust-cchardet" ]; diff --git a/pkgs/development/python-modules/vulture/default.nix b/pkgs/development/python-modules/vulture/default.nix index 9a08899a4b2b..1ad75b5cc3e9 100644 --- a/pkgs/development/python-modules/vulture/default.nix +++ b/pkgs/development/python-modules/vulture/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, pint, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -12,27 +13,23 @@ buildPythonPackage rec { pname = "vulture"; - version = "2.11"; + version = "2.13"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-8Pu2C85lEarYfuBzbFAkVnN0kKgtkZpE5tkiYss18cI="; + hash = "sha256-eCSL9Y9er/zCreMGFB6tc/Q3M5lQ+ABF3Of4sHjloao="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace " --cov vulture --cov-report=html --cov-report=term --cov-report=xml --cov-append" "" - ''; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ tomli ]; + dependencies = lib.optionals (pythonOlder "3.11") [ tomli ]; nativeCheckInputs = [ pint + pytest-cov-stub pytestCheckHook toml ]; @@ -41,10 +38,10 @@ buildPythonPackage rec { meta = with lib; { description = "Finds unused code in Python programs"; - mainProgram = "vulture"; homepage = "https://github.com/jendrikseipp/vulture"; changelog = "https://github.com/jendrikseipp/vulture/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ mcwitt ]; + mainProgram = "vulture"; }; } diff --git a/pkgs/development/python-modules/w1thermsensor/default.nix b/pkgs/development/python-modules/w1thermsensor/default.nix index eca3bdd9302e..af8854ce96ec 100644 --- a/pkgs/development/python-modules/w1thermsensor/default.nix +++ b/pkgs/development/python-modules/w1thermsensor/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiofiles ]; }; @@ -46,7 +46,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ tomli ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "w1thermsensor" ]; diff --git a/pkgs/development/python-modules/wadllib/default.nix b/pkgs/development/python-modules/wadllib/default.nix index 78d8db46b6d0..f5bbaddb6c34 100644 --- a/pkgs/development/python-modules/wadllib/default.nix +++ b/pkgs/development/python-modules/wadllib/default.nix @@ -2,32 +2,35 @@ lib, buildPythonPackage, fetchPypi, - isPy3k, setuptools, lazr-uri, }: buildPythonPackage rec { pname = "wadllib"; - version = "1.3.6"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "acd9ad6a2c1007d34ca208e1da6341bbca1804c0e6850f954db04bdd7666c5fc"; + hash = "sha256-HtuvI+T6NP6nDJs4C6oqE5sQhq5InrzMxLO2X8lzdCc="; }; - propagatedBuildInputs = [ - setuptools + build-system = [ setuptools ]; + + dependencies = [ lazr-uri ]; - doCheck = isPy3k; + pythonImportsCheck = [ "wadllib" ]; + + # pypi tarball has no tests + doCheck = false; meta = with lib; { description = "Navigate HTTP resources using WADL files as guides"; homepage = "https://launchpad.net/wadllib"; - license = licenses.lgpl3; + license = licenses.lgpl3Only; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/wagtail-localize/default.nix b/pkgs/development/python-modules/wagtail-localize/default.nix index 5312633cd803..43aa722abdaa 100644 --- a/pkgs/development/python-modules/wagtail-localize/default.nix +++ b/pkgs/development/python-modules/wagtail-localize/default.nix @@ -18,21 +18,21 @@ buildPythonPackage rec { pname = "wagtail-localize"; - version = "1.9"; + version = "1.10"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { repo = "wagtail-localize"; owner = "wagtail"; rev = "refs/tags/v${version}"; - hash = "sha256-ENdUXfvQOfd9cgHr6fd5Hf+8AJXFix3YbsYJQfpu4ZE="; + hash = "sha256-khGzJj7LBxz5WPU8l20CmQjC9p5umk6spSyMMHBBguc="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ django wagtail polib @@ -47,7 +47,7 @@ buildPythonPackage rec { google-cloud-translate ]; - passthru.optional-dependencies = { + optional-dependencies = { google = [ google-cloud-translate ]; }; diff --git a/pkgs/development/python-modules/wagtail-modeladmin/default.nix b/pkgs/development/python-modules/wagtail-modeladmin/default.nix index 6b4664398505..2f3988e0af41 100644 --- a/pkgs/development/python-modules/wagtail-modeladmin/default.nix +++ b/pkgs/development/python-modules/wagtail-modeladmin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "wagtail-modeladmin"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { repo = pname; owner = "wagtail-nest"; rev = "refs/tags/v${version}"; - hash = "sha256-J6ViGf7lqUvl5EV4/LbADVDp15foY9bUZygs1dSDlKw="; + hash = "sha256-IG7e7YomMM7K2IlJ1Dr1zo+blDPHnu/JeS5csos8ncc="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index ae55189f99c6..6c4fed94b591 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.2"; + version = "6.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-WQhujKGBsQ8nSxE5JFAFBN7W/BaCTBl283w8vd0QDSQ="; + hash = "sha256-UGrCtZ2uhQaa51S0W8E7kcvYbpLU9dZjZYdzsO16Frk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/walrus/default.nix b/pkgs/development/python-modules/walrus/default.nix index 976037f92889..e5513ff4ac9a 100644 --- a/pkgs/development/python-modules/walrus/default.nix +++ b/pkgs/development/python-modules/walrus/default.nix @@ -1,18 +1,18 @@ { lib, - pkgs, buildPythonPackage, fetchFromGitHub, + pkgs, pythonOlder, redis, + setuptools, unittestCheckHook, - fetchpatch, }: buildPythonPackage rec { pname = "walrus"; - version = "0.9.3"; - format = "setuptools"; + version = "0.9.4"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,20 +20,12 @@ buildPythonPackage rec { owner = "coleifer"; repo = "walrus"; rev = "refs/tags/${version}"; - hash = "sha256-jinYMGSBAY8HTg92qU/iU5vGIrrDr5SeQG0XjsBVfcc="; + hash = "sha256-cvoRiaGGTpZWfSE6DDT6GwDmc/TC/Z/E76Qy9Zzkpsw="; }; - patches = [ - # distutils has been deprecated, this wraps its import inside a try-catch - # and fallsback to a fallback import. - # Should not be necessary in future versions. - (fetchpatch { - url = "https://github.com/coleifer/walrus/commit/79e20c89aa4015017ef8a3e0b5c27ca2731dc9b2.patch"; - hash = "sha256-hCpvki6SV3KYhicjjUMP4VrKMEerMjq2n1BgozXKDO8="; - }) - ]; - - propagatedBuildInputs = [ redis ]; + build-system = [ setuptools ]; + + dependencies = [ redis ]; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index fbd5d9baabf5..6967bfca9bc8 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -1,324 +1,324 @@ { lib, stdenv, - appdirs, - azure-containerregistry, + fetchFromGitHub, + + ## wandb-core + buildGoModule, + git, + versionCheckHook, + + ## gpu-stats + rustPlatform, + darwin, + + ## wandb + buildPythonPackage, + substituteAll, + + # build-system + hatchling, + + # dependencies + click, + docker-pycreds, + gitpython, + platformdirs, + protobuf, + psutil, + pyyaml, + requests, + sentry-sdk_2, + setproctitle, + setuptools, + pythonOlder, + typing-extensions, + + # tests + pytestCheckHook, azure-core, + azure-containerregistry, azure-identity, azure-storage-blob, bokeh, boto3, - buildPythonPackage, - click, - docker-pycreds, - fetchFromGitHub, + coverage, flask, - git, - gitpython, google-cloud-artifact-registry, google-cloud-compute, google-cloud-storage, hypothesis, - imageio, - jsonref, jsonschema, - keras, kubernetes, + kubernetes-asyncio, matplotlib, - mlflow, moviepy, - nbclient, - nbformat, pandas, parameterized, - pathtools, - protobuf, - psutil, + pillow, + plotly, pydantic, pyfakefs, + pyte, + pytest-asyncio, + pytest-cov-stub, pytest-mock, + pytest-timeout, pytest-xdist, - pytestCheckHook, - pythonOlder, - pyyaml, - requests, + rdkit, responses, scikit-learn, - sentry-sdk, - setproctitle, - setuptools, soundfile, - substituteAll, + tenacity, torch, tqdm, }: -buildPythonPackage rec { - pname = "wandb"; - version = "0.16.0"; - format = "pyproject"; - - disabled = pythonOlder "3.6"; - +let + version = "0.18.5"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "wandb"; + repo = "wandb"; rev = "refs/tags/v${version}"; - hash = "sha256-XXs9KjiAPzZ932r4UJ87RpM+qhg/bNDWEYsq2Ua6SRw="; + hash = "sha256-nx50baneYSSIWPAIOkUk4cGCNpWAhv7IwFDQJ4vUMiw="; + }; + + gpu-stats = rustPlatform.buildRustPackage rec { + pname = "gpu-stats"; + version = "0.2.0"; + inherit src; + + sourceRoot = "${src.name}/gpu_stats"; + + cargoHash = "sha256-4udGG4I2Hr8r84c4WX6QGG/+bcHK4csXqwddvIiKmkw="; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.IOKit + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/gpu_stats"; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + meta = { + mainProgram = "gpu_stats"; + # ld: library not found for -lIOReport + # TODO: succeeds on https://github.com/NixOS/nixpkgs/pull/348827, so try again once it lands on master + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; + }; + }; + + wandb-core = buildGoModule rec { + pname = "wandb-core"; + inherit src version; + + sourceRoot = "${src.name}/core"; + + # hardcode the `gpu_stats` binary path. + postPatch = '' + substituteInPlace pkg/monitor/gpu.go \ + --replace-fail \ + 'cmdPath, err := getGPUStatsCmdPath()' \ + 'cmdPath, err := "${lib.getExe gpu-stats}", error(nil)' + ''; + + vendorHash = null; + + nativeBuildInputs = [ + git + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + __darwinAllowLocalNetworking = true; + + meta.mainProgram = "wandb-core"; }; +in + +buildPythonPackage rec { + pname = "wandb"; + pyproject = true; + + inherit src version; patches = [ # Replace git paths (substituteAll { src = ./hardcode-git-path.patch; - git = "${lib.getBin git}/bin/git"; + git = lib.getExe git; }) ]; - nativeBuildInputs = [ - setuptools - ]; + # Hard-code the path to the `wandb-core` binary in the code. + postPatch = '' + substituteInPlace wandb/util.py \ + --replace-fail \ + 'bin_path = pathlib.Path(__file__).parent / "bin" / "wandb-core"' \ + 'bin_path = pathlib.Path("${lib.getExe wandb-core}")' + ''; - # setuptools is necessary since pkg_resources is required at runtime. - propagatedBuildInputs = [ - appdirs - click - docker-pycreds - gitpython - pathtools - protobuf - psutil - pyyaml - requests - sentry-sdk - setproctitle - setuptools + env = { + # Prevent the install script to try building and embedding the `gpu_stats` and `wandb-core` + # binaries in the wheel. + # Their path have been patched accordingly in the `wandb-core` and `wanbd` source codes. + # https://github.com/wandb/wandb/blob/v0.18.5/hatch_build.py#L37-L47 + WANDB_BUILD_SKIP_GPU_STATS = true; + WANDB_BUILD_UNIVERSAL = true; + }; + + build-system = [ + hatchling ]; + dependencies = + [ + click + docker-pycreds + gitpython + platformdirs + protobuf + psutil + pyyaml + requests + sentry-sdk_2 + setproctitle + # setuptools is necessary since pkg_resources is required at runtime. + setuptools + ] + ++ lib.optionals (pythonOlder "3.12") [ + typing-extensions + ]; + __darwinAllowLocalNetworking = true; nativeCheckInputs = [ - azure-containerregistry + pytestCheckHook azure-core + azure-containerregistry azure-identity azure-storage-blob - bokeh boto3 + bokeh + coverage flask google-cloud-artifact-registry google-cloud-compute google-cloud-storage hypothesis - imageio - jsonref jsonschema - keras kubernetes + kubernetes-asyncio matplotlib - mlflow moviepy - nbclient - nbformat pandas parameterized + pillow + plotly pydantic pyfakefs + pyte + pytest-asyncio + pytest-cov-stub pytest-mock + pytest-timeout pytest-xdist - pytestCheckHook + rdkit responses scikit-learn soundfile + tenacity torch tqdm ]; - # Set BOKEH_CDN_VERSION to stop bokeh throwing an exception in tests preCheck = '' export HOME=$(mktemp -d) - export BOKEH_CDN_VERSION=${bokeh.version} ''; - pythonRelaxDeps = [ "protobuf" ]; - - pytestFlagsArray = [ - # We want to run only unit tests - "tests/pytest_tests" + disabledTestPaths = [ + # Require docker access + "tests/release_tests/test_launch" + "tests/system_tests" ]; - disabledTestPaths = - [ - # Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment. - "tests/pytest_tests/system_tests/test_notebooks/test_notebooks.py" - "tests/pytest_tests/unit_tests_old/test_cli.py" - "tests/pytest_tests/unit_tests_old/test_data_types.py" - "tests/pytest_tests/unit_tests_old/test_file_stream.py" - "tests/pytest_tests/unit_tests_old/test_file_upload.py" - "tests/pytest_tests/unit_tests_old/test_footer.py" - "tests/pytest_tests/unit_tests_old/test_internal_api.py" - "tests/pytest_tests/unit_tests_old/test_metric_internal.py" - "tests/pytest_tests/unit_tests_old/test_public_api.py" - "tests/pytest_tests/unit_tests_old/test_runtime.py" - "tests/pytest_tests/unit_tests_old/test_sender.py" - "tests/pytest_tests/unit_tests_old/test_summary.py" - "tests/pytest_tests/unit_tests_old/test_tb_watcher.py" - "tests/pytest_tests/unit_tests_old/test_time_resolution.py" - "tests/pytest_tests/unit_tests_old/test_wandb_agent.py" - "tests/pytest_tests/unit_tests_old/test_wandb_integration.py" - "tests/pytest_tests/unit_tests_old/test_wandb_run.py" - "tests/pytest_tests/unit_tests_old/test_wandb.py" - "tests/pytest_tests/unit_tests_old/tests_launch/test_launch_aws.py" - "tests/pytest_tests/unit_tests_old/tests_launch/test_launch_cli.py" - "tests/pytest_tests/unit_tests_old/tests_launch/test_launch_docker.py" - "tests/pytest_tests/unit_tests_old/tests_launch/test_launch.py" - "tests/pytest_tests/unit_tests/test_cli.py" - "tests/pytest_tests/unit_tests/test_data_types.py" - "tests/pytest_tests/unit_tests/test_internal_api.py" - "tests/pytest_tests/unit_tests/test_mode_disabled.py" - "tests/pytest_tests/unit_tests/test_model_workflows.py" - "tests/pytest_tests/unit_tests/test_plots.py" - "tests/pytest_tests/unit_tests/test_public_api.py" - "tests/pytest_tests/unit_tests/test_sender.py" - "tests/pytest_tests/unit_tests/test_util.py" - "tests/pytest_tests/unit_tests/test_wandb_verify.py" - - # Requires docker access - "tests/pytest_tests/system_tests/test_artifacts/test_artifact_saver.py" - "tests/pytest_tests/system_tests/test_artifacts/test_misc.py" - "tests/pytest_tests/system_tests/test_artifacts/test_misc2.py" - "tests/pytest_tests/system_tests/test_artifacts/test_object_references.py" - "tests/pytest_tests/system_tests/test_artifacts/test_wandb_artifacts_full.py" - "tests/pytest_tests/system_tests/test_artifacts/test_wandb_artifacts.py" - "tests/pytest_tests/system_tests/test_core/test_cli_full.py" - "tests/pytest_tests/system_tests/test_core/test_data_types_full.py" - "tests/pytest_tests/system_tests/test_core/test_file_stream_internal.py" - "tests/pytest_tests/system_tests/test_core/test_file_upload.py" - "tests/pytest_tests/system_tests/test_core/test_footer.py" - "tests/pytest_tests/system_tests/test_core/test_keras_full.py" - "tests/pytest_tests/system_tests/test_core/test_label_full.py" - "tests/pytest_tests/system_tests/test_core/test_metric_full.py" - "tests/pytest_tests/system_tests/test_core/test_metric_internal.py" - "tests/pytest_tests/system_tests/test_core/test_mode_disabled_full.py" - "tests/pytest_tests/system_tests/test_core/test_model_workflow.py" - "tests/pytest_tests/system_tests/test_core/test_mp_full.py" - "tests/pytest_tests/system_tests/test_core/test_public_api.py" - "tests/pytest_tests/system_tests/test_core/test_redir_full.py" - "tests/pytest_tests/system_tests/test_core/test_report_api.py" - "tests/pytest_tests/system_tests/test_core/test_save_policies.py" - "tests/pytest_tests/system_tests/test_core/test_sender.py" - "tests/pytest_tests/system_tests/test_core/test_start_method.py" - "tests/pytest_tests/system_tests/test_core/test_system_info.py" - "tests/pytest_tests/system_tests/test_core/test_tb_watcher.py" - "tests/pytest_tests/system_tests/test_core/test_telemetry_full.py" - "tests/pytest_tests/system_tests/test_core/test_time_resolution.py" - "tests/pytest_tests/system_tests/test_core/test_torch_full.py" - "tests/pytest_tests/system_tests/test_core/test_validation_data_logger.py" - "tests/pytest_tests/system_tests/test_core/test_wandb_init.py" - "tests/pytest_tests/system_tests/test_core/test_wandb_integration.py" - "tests/pytest_tests/system_tests/test_core/test_wandb_run.py" - "tests/pytest_tests/system_tests/test_core/test_wandb_settings.py" - "tests/pytest_tests/system_tests/test_core/test_wandb_tensorflow.py" - "tests/pytest_tests/system_tests/test_core/test_wandb_verify.py" - "tests/pytest_tests/system_tests/test_core/test_wandb.py" - "tests/pytest_tests/system_tests/test_importers/test_import_mlflow.py" - "tests/pytest_tests/system_tests/test_launch/test_github_reference.py" - "tests/pytest_tests/system_tests/test_launch/test_job_status_tracker.py" - "tests/pytest_tests/system_tests/test_launch/test_job.py" - "tests/pytest_tests/system_tests/test_launch/test_launch_add.py" - "tests/pytest_tests/system_tests/test_launch/test_launch_cli.py" - "tests/pytest_tests/system_tests/test_launch/test_launch_kubernetes.py" - "tests/pytest_tests/system_tests/test_launch/test_launch_local_container.py" - "tests/pytest_tests/system_tests/test_launch/test_launch_run.py" - "tests/pytest_tests/system_tests/test_launch/test_launch_sagemaker.py" - "tests/pytest_tests/system_tests/test_launch/test_launch_sweep_cli.py" - "tests/pytest_tests/system_tests/test_launch/test_launch_sweep.py" - "tests/pytest_tests/system_tests/test_launch/test_launch_vertex.py" - "tests/pytest_tests/system_tests/test_launch/test_launch.py" - "tests/pytest_tests/system_tests/test_launch/test_wandb_reference.py" - "tests/pytest_tests/system_tests/test_nexus/test_nexus.py" - "tests/pytest_tests/system_tests/test_sweep/test_public_api.py" - "tests/pytest_tests/system_tests/test_sweep/test_sweep_scheduler.py" - "tests/pytest_tests/system_tests/test_sweep/test_sweep_utils.py" - "tests/pytest_tests/system_tests/test_sweep/test_wandb_agent_full.py" - "tests/pytest_tests/system_tests/test_sweep/test_wandb_agent.py" - "tests/pytest_tests/system_tests/test_sweep/test_wandb_sweep.py" - "tests/pytest_tests/system_tests/test_system_metrics/test_open_metrics.py" - "tests/pytest_tests/system_tests/test_system_metrics/test_system_monitor.py" - - # Tries to access /homeless-shelter - "tests/pytest_tests/unit_tests/test_tables.py" - - # E AssertionError: assert 'Cannot use both --async and --queue with wandb launch' in 'wandb: ERROR Find detailed error logs at: /build/source/wandb/debug-cli.nixbld.log\nError: The wandb service process exited with 1. Ensure that `sys.executable` is a valid python interpreter. You can override it with the `_executable` setting or with the `WANDB__EXECUTABLE` environment variable.\n' - # E + where 'wandb: ERROR Find detailed error logs at: /build/source/wandb/debug-cli.nixbld.log\nError: The wandb service process exited with 1. Ensure that `sys.executable` is a valid python interpreter. You can override it with the `_executable` setting or with the `WANDB__EXECUTABLE` environment variable.\n' = <Result SystemExit(1)>.output - "tests/pytest_tests/unit_tests_old/tests_launch/test_launch_jobs.py" - - # Requires google-cloud-aiplatform which is not packaged as of 2023-04-25. - "tests/pytest_tests/unit_tests/test_launch/test_runner/test_vertex.py" - - # Requires google-cloud-artifact-registry which is not packaged as of 2023-04-25. - "tests/pytest_tests/unit_tests/test_launch/test_registry/test_gcp_artifact_registry.py" - - # Requires kfp which is not packaged as of 2023-04-25. - "tests/pytest_tests/system_tests/test_core/test_kfp.py" - - # Requires kubernetes_asyncio which is not packaged as of 2024-01-14. - "tests/pytest_tests/unit_tests/test_launch/test_builder/test_kaniko.py" - "tests/pytest_tests/unit_tests/test_launch/test_runner/test_kubernetes.py" - "tests/pytest_tests/unit_tests/test_launch/test_runner/test_safe_watch.py" - - # Requires metaflow which is not packaged as of 2023-04-25. - "tests/pytest_tests/unit_tests/test_metaflow.py" - - # Requires tensorflow which is broken as of 2023-09-03 - "tests/pytest_tests/unit_tests/test_keras.py" - - # Try to get hardware information, not possible in the nix build environment - "tests/pytest_tests/unit_tests/test_system_metrics/test_disk.py" - - # See https://github.com/wandb/wandb/issues/5423 - "tests/pytest_tests/unit_tests/test_docker.py" - "tests/pytest_tests/unit_tests/test_library_public.py" - - # See https://github.com/wandb/wandb/issues/6836 - "tests/pytest_tests/unit_tests_old/test_logging.py" - ] - ++ lib.optionals stdenv.isLinux [ - # Same as above - "tests/pytest_tests/unit_tests/test_artifacts/test_storage.py" - ] - ++ lib.optionals stdenv.isDarwin [ - # Same as above - "tests/pytest_tests/unit_tests/test_lib/test_filesystem.py" - ]; - disabledTests = [ - # Timing sensitive - "test_login_timeout" - - # Tensorflow 2.13 is too old for the current version of keras - # ModuleNotFoundError: No module named 'keras.api._v2' - "test_saved_model_keras" - "test_sklearn_saved_model" - "test_pytorch_saved_model" - "test_tensorflow_keras_saved_model" + # Probably failing because of lack of internet access + # AttributeError: module 'wandb.sdk.launch.registry' has no attribute 'azure_container_registry'. Did you mean: 'elastic_container_registry'? + "test_registry_from_uri" + + # Require docker + "test_get_requirements_section_pyproject" + "test_local_custom_env" + "test_local_custom_port" + "test_local_default" + + # Expects python binary to be named `python3` but nix provides `python3.12` + # AssertionError: assert ['python3.12', 'main.py'] == ['python3', 'main.py'] + "test_get_entrypoint" + + # Require internet access + "test_audio_refs" + "test_bind_image" + "test_check_cors_configuration" + "test_check_wandb_version" + "test_from_path_project_type" + "test_image_accepts_bounding_boxes" + "test_image_accepts_bounding_boxes_optional_args" + "test_image_accepts_masks" + "test_image_accepts_masks_without_class_labels" + "test_image_seq_to_json" + "test_max_images" + "test_media_keys_escaped_as_glob_for_publish" + "test_parse_path" + "test_parse_project_path" + "test_translates_azure_err_to_normal_err" + + # Tries to access a storage disk but there are none in the sandbox + # psutil.test_disk_out() returns None + "test_disk_in" + "test_disk_out" + + # AssertionError: assert is_available('http://localhost:9400/metrics') + "test_dcgm" + + # Error in the moviepy package: + # TypeError: must be real number, not NoneType + "test_video_numpy_mp4" ] - ++ lib.optionals stdenv.isDarwin [ - # Disable test that fails on darwin due to issue with python3Packages.psutil: - # https://github.com/giampaolo/psutil/issues/1219 - "test_tpu_system_stats" + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # AssertionError: assert not copy2_mock.called + "test_copy_or_overwrite_changed_no_copy" + + # Fatal Python error: Aborted + "test_convert_plots" + "test_gpu_apple" + "test_image_from_matplotlib_with_image" + "test_make_plot_media_from_matplotlib_with_image" + "test_make_plot_media_from_matplotlib_without_image" + "test_matplotlib_contains_images" + "test_matplotlib_image" + "test_matplotlib_plotly_with_multiple_axes" + "test_matplotlib_to_plotly" + "test_plotly_from_matplotlib_with_image" ]; pythonImportsCheck = [ "wandb" ]; - # unmaintainable list of disabled tests - passthru.skipBulkUpdate = true; - - meta = with lib; { + meta = { description = "CLI and library for interacting with the Weights and Biases API"; homepage = "https://github.com/wandb/wandb"; changelog = "https://github.com/wandb/wandb/raw/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ samuela ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ samuela ]; + broken = gpu-stats.meta.broken || wandb-core.meta.broken; }; } diff --git a/pkgs/development/python-modules/wandb/hardcode-git-path.patch b/pkgs/development/python-modules/wandb/hardcode-git-path.patch index a0f45c04b2c3..bb9a5fb6cafc 100644 --- a/pkgs/development/python-modules/wandb/hardcode-git-path.patch +++ b/pkgs/development/python-modules/wandb/hardcode-git-path.patch @@ -1,7 +1,7 @@ -diff --git a/tests/functional_tests/t0_main/kfp/wandb_probe.py b/tests/functional_tests/t0_main/kfp/wandb_probe.py -index 82fadfe1..25c1454c 100644 ---- a/tests/functional_tests/t0_main/kfp/wandb_probe.py -+++ b/tests/functional_tests/t0_main/kfp/wandb_probe.py +diff --git a/landfill/functional_tests/kfp/wandb_probe.py b/landfill/functional_tests/kfp/wandb_probe.py +index 86b18a438..23e237e3b 100644 +--- a/landfill/functional_tests/kfp/wandb_probe.py ++++ b/landfill/functional_tests/kfp/wandb_probe.py @@ -5,7 +5,7 @@ import subprocess def wandb_probe_package(): if not os.environ.get("WB_PROBE_PACKAGE"): @@ -12,20 +12,20 @@ index 82fadfe1..25c1454c 100644 return wandb_local = f"git+https://github.com/wandb/wandb.git@{o}#egg=wandb" diff --git a/wandb/cli/cli.py b/wandb/cli/cli.py -index 5767e61c..56009fec 100644 +index 1453100cc..9dc468201 100644 --- a/wandb/cli/cli.py +++ b/wandb/cli/cli.py -@@ -1919,7 +1919,7 @@ def restore(ctx, run, no_git, branch, project, entity): +@@ -2531,7 +2531,7 @@ def restore(ctx, run, no_git, branch, project, entity): commit, json_config, patch_content, metadata = api.run_config( project, run=run, entity=entity ) - repo = metadata.get("git", {}).get("repo") + repo = metadata.get("@git@", {}).get("repo") image = metadata.get("docker") - restore_message = ( - """`wandb restore` needs to be run from the same git repository as the original run. -@@ -1938,7 +1938,7 @@ Run `git clone %s` and restore from there or pass the --no-git flag.""" - + restore_message = """`wandb restore` needs to be run from the same git repository as the original run. + Run `git clone {}` and restore from there or pass the --no-git flag.""".format(repo) +@@ -2547,7 +2547,7 @@ Run `git clone {}` and restore from there or pass the --no-git flag.""".format(r + if commit and api.git.enabled: wandb.termlog(f"Fetching origin and finding commit: {commit}") - subprocess.check_call(["git", "fetch", "--all"]) @@ -33,7 +33,7 @@ index 5767e61c..56009fec 100644 try: api.git.repo.commit(commit) except ValueError: -@@ -1992,7 +1992,7 @@ Run `git clone %s` and restore from there or pass the --no-git flag.""" +@@ -2604,7 +2604,7 @@ Run `git clone {}` and restore from there or pass the --no-git flag.""".format(r # --reject is necessary or else this fails any time a binary file # occurs in the diff exit_code = subprocess.call( @@ -42,16 +42,16 @@ index 5767e61c..56009fec 100644 ) if exit_code == 0: wandb.termlog("Applied patch") -diff --git a/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py b/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py -index 614df9f5..38db460b 100644 ---- a/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py -+++ b/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py -@@ -67,7 +67,7 @@ def get_git_changeset(): +diff --git a/wandb/vendor/promise-2.3.0/wandb_promise/pyutils/version.py b/wandb/vendor/promise-2.3.0/wandb_promise/pyutils/version.py +index 47d439145..16118feb0 100644 +--- a/wandb/vendor/promise-2.3.0/wandb_promise/pyutils/version.py ++++ b/wandb/vendor/promise-2.3.0/wandb_promise/pyutils/version.py +@@ -69,7 +69,7 @@ def get_git_changeset(): repo_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) try: git_log = subprocess.Popen( -- 'git log --pretty=format:%ct --quiet -1 HEAD', -+ '@git@ log --pretty=format:%ct --quiet -1 HEAD', - stdout=subprocess.PIPE, stderr=subprocess.PIPE, - shell=True, cwd=repo_dir, universal_newlines=True, - ) +- "git log --pretty=format:%ct --quiet -1 HEAD", ++ "@git@ log --pretty=format:%ct --quiet -1 HEAD", + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + shell=True, diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index 8408780ef637..c903ede48d27 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -56,7 +56,7 @@ let --replace "package.metadata.maturin" "broken" ''; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ] ++ extraBuildInputs; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ extraBuildInputs; inherit buildAndTestSubdir; diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 4e83fb026425..f9c205f3c725 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -2,42 +2,40 @@ lib, stdenv, buildPythonPackage, - CoreServices, eventlet, fetchPypi, flaky, + pytest-cov-stub, pytest-timeout, pytestCheckHook, pythonOlder, pyyaml, + apple-sdk_11, }: buildPythonPackage rec { pname = "watchdog"; - version = "4.0.1"; + version = "4.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7rqs9nT6JVEeiGcCjSgeYC7mUABFtX9DsId4CC9/i0Q="; + hash = "sha256-tN+7bEkiG+RTViPqRHSk1u4KnO9KgLIMKNtNhYtk4nA="; }; - # force kqueue on x86_64-darwin, because our api version does - # not support fsevents - patches = lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [ ./force-kqueue.patch ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; - - passthru.optional-dependencies.watchmedo = [ pyyaml ]; + optional-dependencies.watchmedo = [ pyyaml ]; nativeCheckInputs = [ eventlet flaky + pytest-cov-stub pytest-timeout pytestCheckHook - ] ++ passthru.optional-dependencies.watchmedo; + ] ++ optional-dependencies.watchmedo; postPatch = '' substituteInPlace setup.cfg \ @@ -50,13 +48,13 @@ buildPythonPackage rec { "--deselect=tests/test_emitter.py::test_create_wrong_encoding" "--deselect=tests/test_emitter.py::test_close" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # fails to stop process in teardown "--deselect=tests/test_0_watchmedo.py::test_auto_restart_subprocess_termination" # assert cap.out.splitlines(keepends=False).count('+++++ 0') == 2 != 3 "--deselect=tests/test_0_watchmedo.py::test_auto_restart_on_file_change_debounce" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # FileCreationEvent != FileDeletionEvent "--deselect=tests/test_emitter.py::test_separate_consecutive_moves" "--deselect=tests/test_observers_polling.py::test___init__" @@ -66,7 +64,7 @@ buildPythonPackage rec { # AttributeError: '_thread.RLock' object has no attribute 'key'" "--deselect=tests/test_skip_repeats_queue.py::test_eventlet_monkey_patching" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # segfaults "--deselect=tests/test_delayed_queue.py::test_delayed_get" "--deselect=tests/test_0_watchmedo.py::test_tricks_from_file" @@ -89,7 +87,7 @@ buildPythonPackage rec { # tests timeout easily "tests/test_inotify_buffer.py" ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # segfaults the testsuite "tests/test_emitter.py" # unsupported on x86_64-darwin diff --git a/pkgs/development/python-modules/watchdog/force-kqueue.patch b/pkgs/development/python-modules/watchdog/force-kqueue.patch deleted file mode 100644 index d4a0f4e6a00e..000000000000 --- a/pkgs/development/python-modules/watchdog/force-kqueue.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/setup.py b/setup.py -index 337e4be..55ef9a6 100644 ---- a/setup.py -+++ b/setup.py -@@ -38,7 +38,7 @@ _apple_devices = ("appletv", "iphone", "ipod", "ipad", "watch") - is_macos = sys.platform == "darwin" and not machine().lower().startswith(_apple_devices) - - ext_modules = [] --if is_macos or os.getenv("FORCE_MACOS_MACHINE", "0") == "1": -+if False: - ext_modules = [ - Extension( - name="_watchdog_fsevents", -diff --git a/tests/utils.py b/tests/utils.py -index 00dcf40..9fbc42a 100644 ---- a/tests/utils.py -+++ b/tests/utils.py -@@ -15,8 +15,6 @@ Emitter: Type[EventEmitter] - if sys.platform.startswith("linux"): - from watchdog.observers.inotify import InotifyEmitter as Emitter - from watchdog.observers.inotify import InotifyFullEmitter --elif sys.platform.startswith("darwin"): -- from watchdog.observers.fsevents import FSEventsEmitter as Emitter - elif sys.platform.startswith("win"): - from watchdog.observers.read_directory_changes import WindowsApiEmitter as Emitter - elif sys.platform.startswith(("dragonfly", "freebsd", "netbsd", "openbsd", "bsd")): diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix index 22cd171afae5..3b09081249b0 100644 --- a/pkgs/development/python-modules/watchfiles/default.nix +++ b/pkgs/development/python-modules/watchfiles/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { hash = "sha256-n9yN/VRNQWCxh+BoliIMkKqJC51inpB9DQ9WtqR4oA0="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices libiconv ]; diff --git a/pkgs/development/python-modules/watermark/default.nix b/pkgs/development/python-modules/watermark/default.nix index b6f9eeeb90a8..5eefa67895c5 100644 --- a/pkgs/development/python-modules/watermark/default.nix +++ b/pkgs/development/python-modules/watermark/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "watermark"; - version = "2.4.0"; + version = "2.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "rasbt"; repo = "watermark"; rev = "refs/tags/v${version}"; - hash = "sha256-4/1Y7cdh1tF33jgPrqdxCGPcRnnxx+Wf8lyztF54Ck0="; + hash = "sha256-UR4kV6UoZ/JLO19on+qEH+M05QIsT0SXvXJtTMCKuZM="; }; nativeBuildInputs = [ setuptools ]; @@ -31,13 +31,13 @@ buildPythonPackage rec { importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { gpu = [ py3nvml ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "watermark" ]; diff --git a/pkgs/development/python-modules/wcmatch/default.nix b/pkgs/development/python-modules/wcmatch/default.nix index 6be8a9fd7f17..4faf5b1805ce 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 = "9.0"; + version = "10.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Vn1msRrXQ4SVTIr4b2B4V8O9+TaCNJrTIGYjGr1VbJI="; + hash = "sha256-5y8N4Ju6agTg3nCTewzwblXzbzez3rQi36+FS4Z7hAo="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/weasel/default.nix b/pkgs/development/python-modules/weasel/default.nix index bf01bbf033d2..16987cee2cd1 100644 --- a/pkgs/development/python-modules/weasel/default.nix +++ b/pkgs/development/python-modules/weasel/default.nix @@ -1,33 +1,36 @@ { lib, buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies cloudpathlib, confection, - fetchFromGitHub, packaging, pydantic, - pytestCheckHook, - pythonOlder, requests, - setuptools, smart-open, srsly, typer, wasabi, + + # tests + pytestCheckHook, }: buildPythonPackage rec { pname = "weasel"; - version = "0.3.4"; + version = "0.4.1"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "explosion"; repo = "weasel"; rev = "refs/tags/v${version}"; - hash = "sha256-6Ck8R10/YW2Nc6acNk2bzgyqSg+OPqwyJjhUgXP/umw="; + hash = "sha256-gXPHEoEY0qKcpAtqHlUw5c43/6hKseCx+vBNzEXFF2A="; }; pythonRelaxDeps = [ @@ -36,11 +39,9 @@ buildPythonPackage rec { "typer" ]; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cloudpathlib confection packaging @@ -54,19 +55,23 @@ buildPythonPackage rec { pythonImportsCheck = [ "weasel" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; disabledTests = [ # This test requires internet access "test_project_assets" + "test_project_git_dir_asset" + "test_project_git_file_asset" ]; - meta = with lib; { + meta = { description = "Small and easy workflow system"; - mainProgram = "weasel"; homepage = "https://github.com/explosion/weasel/"; changelog = "https://github.com/explosion/weasel/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "weasel"; }; } diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 2652a524678c..bc6c57e94083 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "62.2"; + version = "62.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "weasyprint"; - hash = "sha256-oIrEAOEZGdmW12vsqjMWDXwaxVuhYGKMQs51hldMGlE="; + hash = "sha256-jYaA1zL3+g/LxYdpKlpcsJXDUlYnBmkY1uIDy/Qrf80="; }; patches = [ diff --git a/pkgs/development/python-modules/weatherflow4py/default.nix b/pkgs/development/python-modules/weatherflow4py/default.nix index 5ffcffcbcff9..d4417374d491 100644 --- a/pkgs/development/python-modules/weatherflow4py/default.nix +++ b/pkgs/development/python-modules/weatherflow4py/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "weatherflow4py"; - version = "1.0.6"; + version = "1.2.0"; pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "jeeftor"; repo = "weatherflow4py"; rev = "refs/tags/v${version}"; - hash = "sha256-NazRT/gSaxat90eA66ajjVPvN9UFNEX4y1hfOtu9UoE="; + hash = "sha256-NOruMysLm0Pu2fsaA/qCNdeCTacomvJ51oqI8V2WFWI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 506aa956bda6..e059e5bcabb7 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.8.0"; + version = "4.8.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-JVn9Xhq7MJD+o6DA/EaW1NNnvsjjqyW+pmFctuQStgo="; + hash = "sha256-HSLU9OQMEOCwgxtLj20yJ0Xo9c6SVfMhfVT/F5du17A="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix index 49415d090f5c..08fc850f9e50 100644 --- a/pkgs/development/python-modules/web3/default.nix +++ b/pkgs/development/python-modules/web3/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { }; # Note: to reflect the extra_requires in main/setup.py. - passthru.optional-dependencies = { + optional-dependencies = { ipfs = [ ipfshttpclient ]; }; diff --git a/pkgs/development/python-modules/webargs/default.nix b/pkgs/development/python-modules/webargs/default.nix index 21c7af1cfdbc..6f8287733b58 100644 --- a/pkgs/development/python-modules/webargs/default.nix +++ b/pkgs/development/python-modules/webargs/default.nix @@ -2,7 +2,8 @@ buildPythonPackage, fetchPypi, lib, - isPy27, + pythonAtLeast, + flit-core, marshmallow, pytestCheckHook, pytest-aiohttp, @@ -19,18 +20,17 @@ buildPythonPackage rec { pname = "webargs"; - version = "8.4.0"; - format = "setuptools"; - disabled = isPy27; + version = "8.6.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-6pk2ghSkzmE5JL6Z1x21jCaWMele/0+gm3NU5S3ABqU="; + hash = "sha256-uNCYq5K9dMZZ7KcFr6MdaBR18hjLFcHlcnH6IQPAVHo="; }; - pythonImportsCheck = [ "webargs" ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ marshmallow ]; + dependencies = [ marshmallow ]; nativeCheckInputs = [ pytestCheckHook @@ -46,6 +46,8 @@ buildPythonPackage rec { aiohttp ]; + pythonImportsCheck = [ "webargs" ]; + meta = with lib; { description = "Declarative parsing and validation of HTTP request objects, with built-in support for popular web frameworks"; homepage = "https://github.com/marshmallow-code/webargs"; diff --git a/pkgs/development/python-modules/webassets/default.nix b/pkgs/development/python-modules/webassets/default.nix index 64b45c17154c..d64ca27ece01 100644 --- a/pkgs/development/python-modules/webassets/default.nix +++ b/pkgs/development/python-modules/webassets/default.nix @@ -2,40 +2,72 @@ lib, buildPythonPackage, fetchPypi, + setuptools, pyyaml, - nose, jinja2, mock, - pytest, + fetchpatch2, + pytestCheckHook, + distutils, }: buildPythonPackage rec { pname = "webassets"; version = "2.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "1kc1042jydgk54xpgcp0r1ib4gys91nhy285jzfcxj3pfqrk4w8n"; + hash = "sha256-FnEyM3Z3yM7clwUJD21I2j+yYsjgsnc7KfM1LwUBgc0="; }; - propagatedBuildInputs = [ pyyaml ]; + patches = [ + # remove nose and extra mock + (fetchpatch2 { + name = "remove-nose-and-mock.patch"; + url = "https://github.com/miracle2k/webassets/commit/26e203929eebbb4cdbb9967cf47fefa95df8f24d.patch?full_index=1"; + hash = "sha256-+jrMT6Sl/MOLkleUEDZkzRd5tzBTXZYNoCXRrTFVtq4="; + excludes = [ + "requirements-dev.pip" + "tox.ini" + ]; + }) + (fetchpatch2 { + name = "fix-missing-zope-skip.patch"; + url = "https://github.com/miracle2k/webassets/commit/3bfb5ea8223c46c60b922fdbbda36d9b8c5e9c9c.patch?full_index=1"; + hash = "sha256-dV8bp6vYr56mZpzw5C7ac4rXri04o4MrAhwfWUXLe4s="; + }) + ./migrate_test_setup_to_pytest.patch + ]; + + build-system = [ setuptools ]; + + dependencies = [ pyyaml ]; + nativeCheckInputs = [ - nose jinja2 mock - pytest + pytestCheckHook + distutils ]; - # Needs Babel CLI tool - doCheck = false; - checkPhase = "py.test"; + postPatch = '' + # Fix thread attribute "isAlive" + substituteInPlace tests/test_script.py \ + --replace-fail "isAlive" "is_alive" + ''; + + disabledTests = [ + "TestFilterBaseClass" + "TestAutoprefixer6Filter" + "TestBabel" + ]; - meta = with lib; { + meta = { description = "Media asset management for Python, with glue code for various web frameworks"; mainProgram = "webassets"; homepage = "https://github.com/miracle2k/webassets/"; - license = licenses.bsd2; - maintainers = with maintainers; [ abbradar ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/python-modules/webassets/migrate_test_setup_to_pytest.patch b/pkgs/development/python-modules/webassets/migrate_test_setup_to_pytest.patch new file mode 100644 index 000000000000..134ba1df203b --- /dev/null +++ b/pkgs/development/python-modules/webassets/migrate_test_setup_to_pytest.patch @@ -0,0 +1,591 @@ +diff --git a/src/webassets/test.py b/src/webassets/test.py +index 232806c..a362120 100644 +--- a/src/webassets/test.py ++++ b/src/webassets/test.py +@@ -27,7 +27,7 @@ class TempDirHelper(object): + + default_files = {} + +- def setup(self): ++ def setup_method(self): + self._tempdir_created = tempfile.mkdtemp() + self.create_files(self.default_files) + +@@ -35,7 +35,7 @@ class TempDirHelper(object): + shutil.rmtree(self._tempdir_created) + + def __enter__(self): +- self.setup() ++ self.setup_method() + return self + + def __exit__(self, type, value, traceback): +@@ -136,8 +136,8 @@ class TempEnvironmentHelper(TempDirHelper): + + default_files = {'in1': 'A', 'in2': 'B', 'in3': 'C', 'in4': 'D'} + +- def setup(self): +- TempDirHelper.setup(self) ++ def setup_method(self): ++ TempDirHelper.setup_method(self) + + self.env = self._create_environment() + # Unless we explicitly test it, we don't want to use the cache +diff --git a/tests/__init__.py b/tests/__init__.py +index 7d859d3..363b641 100644 +--- a/tests/__init__.py ++++ b/tests/__init__.py +@@ -1,4 +1,4 @@ +-def setup(): ++def setup_method(): + # For some strange reason (using Python 2.6.6), if a warning has + # already been raised somewhere else before a test attempts to + # capture and verify it using warnings.catch_warnings(), the warning +diff --git a/tests/test_bundle_build.py b/tests/test_bundle_build.py +index 9325bb9..86f69b9 100644 +--- a/tests/test_bundle_build.py ++++ b/tests/test_bundle_build.py +@@ -473,8 +473,8 @@ class TestAutoBuild(TempEnvironmentHelper): + generally everything involving the updater (as used by the build() method). + """ + +- def setup(self): +- TempEnvironmentHelper.setup(self) ++ def setup_method(self): ++ TempEnvironmentHelper.setup_method(self) + + class CustomUpdater(BaseUpdater): + allow = True +diff --git a/tests/test_bundle_urls.py b/tests/test_bundle_urls.py +index 317889e..9bd8753 100644 +--- a/tests/test_bundle_urls.py ++++ b/tests/test_bundle_urls.py +@@ -29,8 +29,8 @@ class BaseUrlsTester(TempEnvironmentHelper): + + default_files = {'a': '', 'b': '', 'c': '', '1': '', '2': ''} + +- def setup(self): +- TempEnvironmentHelper.setup(self) ++ def setup_method(self): ++ TempEnvironmentHelper.setup_method(self) + + self.env.url_expire = False + +@@ -282,8 +282,8 @@ class TestUrlsWithDebugTrue(BaseUrlsTester): + """Test url generation in debug mode. + """ + +- def setup(self): +- BaseUrlsTester.setup(self) ++ def setup_method(self): ++ BaseUrlsTester.setup_method(self) + self.env.debug = True + + def test_simple_bundle(self): +@@ -427,8 +427,8 @@ class TestUrlsWithDebugTrue(BaseUrlsTester): + + class TestUrlsWithDebugMerge(BaseUrlsTester): + +- def setup(self): +- BaseUrlsTester.setup(self) ++ def setup_method(self): ++ BaseUrlsTester.setup_method(self) + self.env.debug = 'merge' + + def test_simple_bundle(self): +diff --git a/tests/test_bundle_various.py b/tests/test_bundle_various.py +index b24a903..6d92eb3 100644 +--- a/tests/test_bundle_various.py ++++ b/tests/test_bundle_various.py +@@ -177,8 +177,8 @@ class TestVersionFeatures(TempEnvironmentHelper): + + default_files = {'in': 'foo'} + +- def setup(self): +- super(TestVersionFeatures, self).setup() ++ def setup_method(self): ++ super(TestVersionFeatures, self).setup_method() + self.env.manifest = DummyManifest() + self.env.versions = DummyVersion() + +@@ -371,8 +371,8 @@ class TestLoadPath(TempEnvironmentHelper): + an optional feature. + """ + +- def setup(self): +- TempEnvironmentHelper.setup(self) ++ def setup_method(self): ++ TempEnvironmentHelper.setup_method(self) + self.env.updater = False + self.env.directory = self.path('dir') + self.env.debug = True +@@ -603,8 +603,8 @@ class TestUrlContents(TempEnvironmentHelper): + """Test bundles containing a URL. + """ + +- def setup(self): +- TempEnvironmentHelper.setup(self) ++ def setup_method(self): ++ TempEnvironmentHelper.setup_method(self) + mock_opener = build_opener(MockHTTPHandler({ + 'http://foo': u'function() {}'})) + install_opener(mock_opener) +diff --git a/tests/test_cache.py b/tests/test_cache.py +index 9afbe3d..f8afb61 100644 +--- a/tests/test_cache.py ++++ b/tests/test_cache.py +@@ -89,8 +89,8 @@ class TestCacheIsUsed(TempEnvironmentHelper): + """Ensure the cache is used during the build process. + """ + +- def setup(self): +- TempEnvironmentHelper.setup(self) ++ def setup_method(self): ++ TempEnvironmentHelper.setup_method(self) + + class MyCache(BaseCache): + def __init__(self): +diff --git a/tests/test_environment.py b/tests/test_environment.py +index bd89ef6..ff36289 100644 +--- a/tests/test_environment.py ++++ b/tests/test_environment.py +@@ -13,7 +13,7 @@ from webassets import Bundle + class TestEnvApi(object): + """General Environment functionality.""" + +- def setup(self): ++ def setup_method(self): + self.m = Environment(None, None) + + def test_register_single_bundle(self): +@@ -186,7 +186,7 @@ class TestEnvConfig(object): + """Custom config values through get_config/set_config. + """ + +- def setup(self): ++ def setup_method(self): + self.m = Environment(None, None) + + def test_initial_values_override_defaults(self): +@@ -216,7 +216,7 @@ class TestSpecialProperties(object): + as a string, and would receive object instances when accessing the property. + """ + +- def setup(self): ++ def setup_method(self): + self.m = Environment('.', None) # we won't create any files + + def test_versioner(self): +diff --git a/tests/test_ext/test_jinja2.py b/tests/test_ext/test_jinja2.py +index 37139bb..155ad40 100644 +--- a/tests/test_ext/test_jinja2.py ++++ b/tests/test_ext/test_jinja2.py +@@ -12,7 +12,7 @@ from webassets.ext.jinja2 import AssetsExtension, Jinja2Loader + + class TestTemplateTag(object): + +- def setup(self): ++ def setup_method(self): + # Setup the assets environment. + assets_env = AssetsEnvironment('', '') + self.foo_bundle = Bundle() +@@ -123,8 +123,8 @@ class TestLoader(TempEnvironmentHelper): + """ + } + +- def setup(self): +- TempEnvironmentHelper.setup(self) ++ def setup_method(self): ++ TempEnvironmentHelper.setup_method(self) + self.jinja_env = JinjaEnvironment() + self.jinja_env.add_extension(AssetsExtension) + self.jinja_env.assets_environment = self.env +diff --git a/tests/test_filters.py b/tests/test_filters.py +index 9976f4e..deec66d 100644 +--- a/tests/test_filters.py ++++ b/tests/test_filters.py +@@ -79,7 +79,7 @@ class TestFilterBaseClass(object): + env = Environment(None, None) + env.config['attr1'] = 'bar' + env.config['attr4'] = 'bar' +- f = TestFilter(); f.ctx = ContextWrapper(env); f.setup() ++ f = TestFilter(); f.ctx = ContextWrapper(env); f.setup_method() + assert f.attr1 == 'bar' + assert f.attr4 is None # Was configured to not support env + +@@ -177,7 +177,7 @@ class TestExternalToolClass(object): + self.__class__.result = \ + argv, data.getvalue() if data is not None else data + +- def setup(self): ++ def setup_method(self): + if not hasattr(str, 'format'): + # A large part of this functionality is not available on Python 2.5 + pytest.skip() +@@ -630,12 +630,12 @@ class TestBuiltinFilters(TempEnvironmentHelper): + + class TestCSSPrefixer(TempEnvironmentHelper): + +- def setup(self): ++ def setup_method(self): + try: + import cssprefixer + except ImportError: + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test(self): + self.create_files({'in': """a { border-radius: 1em; }"""}) +@@ -650,10 +650,10 @@ class TestCSSPrefixer(TempEnvironmentHelper): + + class TestCoffeeScript(TempEnvironmentHelper): + +- def setup(self): ++ def setup_method(self): + if not find_executable('coffee'): + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test_default_options(self): + self.create_files({'in': "alert \"I knew it!\" if elvis?"}) +@@ -674,12 +674,12 @@ class TestCoffeeScript(TempEnvironmentHelper): + + class TestJinja2(TempEnvironmentHelper): + +- def setup(self): ++ def setup_method(self): + try: + import jinja2 + except ImportError: + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test_default_options(self): + self.create_files({'in': """Hi there, {{ name }}!"""}) +@@ -705,13 +705,13 @@ class TestClosure(TempEnvironmentHelper): + """ + } + +- def setup(self): ++ def setup_method(self): + try: + import closure + except ImportError: + pytest.skip() + +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test_closure(self): + self.mkbundle('foo.js', filters='closure_js', output='out.js').build() +@@ -832,10 +832,10 @@ class TestLess(TempEnvironmentHelper): + 'foo.less': "h1 { color: #FFFFFF; }", + } + +- def setup(self): ++ def setup_method(self): + if not find_executable('lessc'): + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test(self): + self.mkbundle('foo.less', filters='less', output='out.css').build() +@@ -928,14 +928,14 @@ class TestRubySass(TempEnvironmentHelper): + """, + } + +- def setup(self): ++ def setup_method(self): + if not find_executable('sass'): + pytest.skip() + + if "Ruby" not in check_output(["sass", "--version"]).decode('utf-8'): + pytest.skip() + +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test_sass(self): + sass = get_filter('sass_ruby', debug_info=False) +@@ -1038,10 +1038,10 @@ class TestSass(TempEnvironmentHelper): + """, + } + +- def setup(self): ++ def setup_method(self): + if not find_executable('sass'): + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test_sass(self): + sass = get_filter('sass') +@@ -1099,13 +1099,13 @@ class TestPyScss(TempEnvironmentHelper): + 'bar.scss': 'h1{color:red}' + } + +- def setup(self): ++ def setup_method(self): + try: + import scss + self.scss = scss + except ImportError: + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test(self): + self.mkbundle('foo.scss', filters='pyscss', output='out.css').build() +@@ -1136,13 +1136,13 @@ class TestLibSass(TempEnvironmentHelper): + 'b.scss': '$foo: foo !default; .test {background-color: $foo;}' + } + +- def setup(self): ++ def setup_method(self): + try: + import sass + self.sass = sass + except ImportError: + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test(self): + self.mkbundle('foo.scss', filters='libsass', output='out.css').build() +@@ -1198,10 +1198,10 @@ class TestCompass(TempEnvironmentHelper): + """ + } + +- def setup(self): ++ def setup_method(self): + if not find_executable('compass'): + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test_compass(self): + self.mkbundle('foo.sass', filters='compass', output='out.css').build() +@@ -1262,7 +1262,7 @@ class TestCompassConfig(object): + } + } + +- def setup(self): ++ def setup_method(self): + self.compass_config = CompassConfig(self.config).to_string() + + def test_compass_config_is_unicode(self): +@@ -1294,8 +1294,8 @@ class TestJST(TempEnvironmentHelper): + 'templates/bar.html': "<div>Im an html jst template. Go syntax highlighting!</div>" + } + +- def setup(self): +- TempEnvironmentHelper.setup(self) ++ def setup_method(self): ++ TempEnvironmentHelper.setup_method(self) + + def test_jst(self): + self.mkbundle('templates/*', filters='jst', output='out.js').build() +@@ -1424,10 +1424,10 @@ class TestHandlebars(TempEnvironmentHelper): + """ + } + +- def setup(self): ++ def setup_method(self): + if not find_executable('handlebars'): + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test_basic(self): + self.mkbundle('foo.html', 'dir/bar.html', +@@ -1461,12 +1461,12 @@ class TestJinja2JS(TempEnvironmentHelper): + ) + } + +- def setup(self): ++ def setup_method(self): + try: + import closure_soy + except: + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test(self): + self.mkbundle('foo.soy', filters='closure_tmpl', output='out.js').build() +@@ -1490,10 +1490,10 @@ class TestTypeScript(TempEnvironmentHelper): + 'foo.ts': """class X { z: number; }""" + } + +- def setup(self): ++ def setup_method(self): + if not find_executable('tsc'): + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test(self): + self.mkbundle('foo.ts', filters='typescript', output='out.js').build() +@@ -1521,10 +1521,10 @@ define("script/utils",[],function(){return{debug:console.log}}),\ + define("script/app",["./utils"],function(e){e.debug("APP")});\ + ''' + +- def setup(self): ++ def setup_method(self): + if not find_executable('r.js'): + pytest.skip('"r.js" executable not found') +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + self.env.config['requirejs_config'] = self.path('requirejs.json') + self.env.config['requirejs_baseUrl'] = self.path('') + +@@ -1573,10 +1573,10 @@ class TestClosureStylesheets(TempEnvironmentHelper): + """ + } + +- def setup(self): ++ def setup_method(self): + if not 'CLOSURE_STYLESHEETS_PATH' in os.environ: + pytest.skip() +- TempEnvironmentHelper.setup(self) ++ TempEnvironmentHelper.setup_method(self) + + def test_compiler(self): + self.mkbundle('test.css', filters = 'closure_stylesheets_compiler', output = 'output.css').build() +diff --git a/tests/test_loaders.py b/tests/test_loaders.py +index f910ecb..5c183a5 100644 +--- a/tests/test_loaders.py ++++ b/tests/test_loaders.py +@@ -14,7 +14,7 @@ from webassets.exceptions import EnvironmentError + + class TestYAML(object): + +- def setup(self): ++ def setup_method(self): + yaml = pytest.importorskip("yaml") + + def loader(self, text, filename=None): +@@ -189,8 +189,8 @@ class TestPython(object): + + class TestYAMLCustomFilters(TestYAML): + +- def setup(self): +- super(TestYAMLCustomFilters, self).setup() ++ def setup_method(self): ++ super(TestYAMLCustomFilters, self).setup_method() + + # If zope.dottedname is not installed, that's OK + pytest.importorskip("zope.dottedname.resolve") +diff --git a/tests/test_script.py b/tests/test_script.py +index 84b9940..479c64b 100644 +--- a/tests/test_script.py ++++ b/tests/test_script.py +@@ -38,8 +38,8 @@ class MockBundle(Bundle): + + class TestCLI(TempEnvironmentHelper): + +- def setup(self): +- super(TestCLI, self).setup() ++ def setup_method(self): ++ super(TestCLI, self).setup_method() + self.assets_env = self.env + self.cmd_env = CommandLineEnvironment(self.assets_env, logging) + +@@ -210,8 +210,8 @@ class TestWatchCommand(TestWatchMixin, TestCLI): + + default_files = {'in': 'foo', 'out': 'bar'} + +- def setup(self): +- super(TestWatchCommand, self).setup() ++ def setup_method(self): ++ super(TestWatchCommand, self).setup_method() + + # Pay particular attention that the watch command works with auto_build + # disabled (since normally this implies no use of the updater, but +diff --git a/tests/test_updaters.py b/tests/test_updaters.py +index aaa5b72..8c5f48a 100644 +--- a/tests/test_updaters.py ++++ b/tests/test_updaters.py +@@ -15,7 +15,7 @@ class TestBundleDefBaseUpdater(object): + changes. + """ + +- def setup(self): ++ def setup_method(self): + self.env = Environment(None, None) # we won't create files + self.env.cache = MemoryCache(capacity=100) + self.bundle = Bundle(output="target") +@@ -65,8 +65,8 @@ class TestTimestampUpdater(TempEnvironmentHelper): + + default_files = {'in': '', 'out': ''} + +- def setup(self): +- TempEnvironmentHelper.setup(self) ++ def setup_method(self): ++ TempEnvironmentHelper.setup_method(self) + + # Test the timestamp updater with cache disabled, so that the + # BundleDefUpdater() base class won't interfere. +diff --git a/tests/test_version.py b/tests/test_version.py +index d83297d..3aab5eb 100644 +--- a/tests/test_version.py ++++ b/tests/test_version.py +@@ -32,8 +32,8 @@ def test_builtin_manifest_accessors(): + + class TestTimestampVersion(TempEnvironmentHelper): + +- def setup(self): +- super(TestTimestampVersion, self).setup() ++ def setup_method(self): ++ super(TestTimestampVersion, self).setup_method() + self.v = TimestampVersion() + + # Create a bunch of files with known mtimes +@@ -95,8 +95,8 @@ class TestTimestampVersion(TempEnvironmentHelper): + + class TestHashVersion(TempEnvironmentHelper): + +- def setup(self): +- super(TestHashVersion, self).setup() ++ def setup_method(self): ++ super(TestHashVersion, self).setup_method() + self.v = HashVersion() + + # Create a bunch of files with known content +@@ -140,8 +140,8 @@ class TestHashVersion(TempEnvironmentHelper): + + class TestFileManifest(TempEnvironmentHelper): + +- def setup(self): +- super(TestFileManifest, self).setup() ++ def setup_method(self): ++ super(TestFileManifest, self).setup_method() + self.bundle = self.mkbundle(output='foo') + + def test_repl(self): +@@ -177,8 +177,8 @@ class TestFileManifest(TempEnvironmentHelper): + + class TestJsonManifest(TempEnvironmentHelper): + +- def setup(self): +- super(TestJsonManifest, self).setup() ++ def setup_method(self): ++ super(TestJsonManifest, self).setup_method() + self.bundle = self.mkbundle(output='foo') + + def test_repl(self): +@@ -200,8 +200,8 @@ class TestJsonManifest(TempEnvironmentHelper): + + class TestCacheManifest(TempEnvironmentHelper): + +- def setup(self): +- super(TestCacheManifest, self).setup() ++ def setup_method(self): ++ super(TestCacheManifest, self).setup_method() + self.bundle = self.mkbundle(output='foo') + + def test_repl(self): diff --git a/pkgs/development/python-modules/webcolors/default.nix b/pkgs/development/python-modules/webcolors/default.nix index 93f2030755c0..4d24df46c213 100644 --- a/pkgs/development/python-modules/webcolors/default.nix +++ b/pkgs/development/python-modules/webcolors/default.nix @@ -9,17 +9,17 @@ buildPythonPackage rec { pname = "webcolors"; - version = "1.13"; - format = "pyproject"; + version = "24.8.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-wiW2dMg/qSO+k9I1MwzgMANz0CiFzvIyOIE7DVZoMEo="; + hash = "sha256-CLB68oagG80w1YOnrK32KVg9H3m/7yfdLCxcJjgXJ30="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/webdataset/default.nix b/pkgs/development/python-modules/webdataset/default.nix index 3c5b74eed4ae..07c43828b2ab 100644 --- a/pkgs/development/python-modules/webdataset/default.nix +++ b/pkgs/development/python-modules/webdataset/default.nix @@ -2,34 +2,38 @@ lib, stdenv, buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies braceexpand, + numpy, + pyyaml, + + # tests imageio, lmdb, msgpack, - numpy, pytestCheckHook, - pyyaml, - setuptools, torch, torchvision, - wheel, - fetchFromGitHub, }: buildPythonPackage rec { pname = "webdataset"; - version = "0.2.100"; + version = "0.2.107"; pyproject = true; src = fetchFromGitHub { owner = "webdataset"; repo = "webdataset"; - rev = "refs/tags/${version}"; - hash = "sha256-+Rvb4VY4qBcVKM1CUkLZTQdlZklpHcuiMO8r6VNInLc="; + rev = "refs/tags/v${version}"; + hash = "sha256-L9RUQItmW/7O/eTst2Sl/415EP4Jo662bKWbYA6p5bk="; }; build-system = [ setuptools - wheel ]; dependencies = [ @@ -39,12 +43,12 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook imageio + lmdb + msgpack + pytestCheckHook torch torchvision - msgpack - lmdb ]; pythonImportsCheck = [ "webdataset" ]; @@ -67,16 +71,16 @@ buildPythonPackage rec { "test_unbatched" "test_yaml3" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # pickling error "test_background_download" ] - ++ lib.optionals (stdenv.isx86_64 && stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin) [ "test_concurrent_access" # fails to patch 'init_process_group' from torch.distributed "TestDistributedChunkedSampler" ] - ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ # segfaults on aarch64-linux "test_webloader" "test_webloader2" @@ -84,12 +88,12 @@ buildPythonPackage rec { "test_webloader_unbatched" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # AttributeError: <module 'torch.distributed' from /nix/store/... - "tests/test_wids.py" + "tests/wids/test_wids.py" # Issue with creating a temp file in the sandbox - "tests/test_wids_mmtar.py" + "tests/wids/test_wids_mmtar.py" ]; meta = { diff --git a/pkgs/development/python-modules/webdav4/default.nix b/pkgs/development/python-modules/webdav4/default.nix index 9a6459fa375e..ce0d6d58b61f 100644 --- a/pkgs/development/python-modules/webdav4/default.nix +++ b/pkgs/development/python-modules/webdav4/default.nix @@ -47,9 +47,9 @@ buildPythonPackage rec { pytestCheckHook pytest-cov-stub wsgidav - ] ++ passthru.optional-dependencies.fsspec; + ] ++ optional-dependencies.fsspec; - passthru.optional-dependencies = { + optional-dependencies = { fsspec = [ fsspec ]; http2 = [ httpx.optional-dependencies.http2 ]; all = [ diff --git a/pkgs/development/python-modules/webexpythonsdk/default.nix b/pkgs/development/python-modules/webexpythonsdk/default.nix new file mode 100644 index 000000000000..fb14d7ab164c --- /dev/null +++ b/pkgs/development/python-modules/webexpythonsdk/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pyjwt, + pythonOlder, + requests, + requests-toolbelt, + poetry-core, + poetry-dynamic-versioning, +}: + +buildPythonPackage rec { + pname = "webexpythonsdk"; + version = "2.0.1"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "CiscoDevNet"; + repo = "WebexPythonSDK"; + rev = "refs/tags/v${version}"; + hash = "sha256-ENAUUicVO/Br7k+RFHCGzQ7BIG0CP7jTYM3tzs5EAZQ="; + }; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = [ + pyjwt + requests + requests-toolbelt + ]; + + # Tests require a Webex Teams test domain + doCheck = false; + + pythonImportsCheck = [ "webexpythonsdk" ]; + + meta = with lib; { + description = "Python module for Webex Teams APIs"; + homepage = "https://github.com/WebexCommunity/WebexPythonSDK"; + changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix index 373f06b6d046..30eeb64d83a1 100644 --- a/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/pkgs/development/python-modules/webexteamssdk/default.nix @@ -2,34 +2,41 @@ lib, buildPythonPackage, fetchFromGitHub, + future, pyjwt, pythonOlder, requests, requests-toolbelt, - poetry-core, - poetry-dynamic-versioning, + setuptools, + versioneer, }: buildPythonPackage rec { pname = "webexteamssdk"; - version = "2.0.1"; + version = "1.6.1"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CiscoDevNet"; repo = "webexteamssdk"; rev = "refs/tags/v${version}"; - hash = "sha256-ENAUUicVO/Br7k+RFHCGzQ7BIG0CP7jTYM3tzs5EAZQ="; + hash = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo="; }; + postPatch = '' + # Remove vendorized versioneer + rm versioneer.py + ''; + build-system = [ - poetry-core - poetry-dynamic-versioning + setuptools + versioneer ]; dependencies = [ + future pyjwt requests requests-toolbelt @@ -38,13 +45,13 @@ buildPythonPackage rec { # Tests require a Webex Teams test domain doCheck = false; - pythonImportsCheck = [ "webexpythonsdk" ]; + pythonImportsCheck = [ "webexteamssdk" ]; meta = with lib; { description = "Python module for Webex Teams APIs"; homepage = "https://github.com/CiscoDevNet/webexteamssdk"; changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}"; - license = licenses.mit; + license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/weblate-language-data/default.nix b/pkgs/development/python-modules/weblate-language-data/default.nix index 98740f668d17..a8f24fa0a1fe 100644 --- a/pkgs/development/python-modules/weblate-language-data/default.nix +++ b/pkgs/development/python-modules/weblate-language-data/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "weblate-language-data"; - version = "2024.6"; + version = "2024.13"; pyproject = true; src = fetchPypi { pname = "weblate_language_data"; inherit version; - hash = "sha256-FGLrjptIqMeKAV/O2H6ZcP+uGcr1ghqIxAHsYnOpVxg="; + hash = "sha256-fAT3dI3Tbu329BWaal/n4ka0JSVDzPrJLnzL7/LRjhs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix index e574d78da108..1f1ca8587380 100644 --- a/pkgs/development/python-modules/webob/default.nix +++ b/pkgs/development/python-modules/webob/default.nix @@ -1,25 +1,31 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, legacy-cgi, pytestCheckHook, pythonAtLeast, pythonOlder, + + # for passthru.tests + pyramid, + routes, + tokenlib, }: buildPythonPackage rec { pname = "webob"; - version = "1.8.7"; + version = "1.8.8"; pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "WebOb"; - inherit version; - hash = "sha256-tk71FBvlWc+t5EjwRPpFwiYDUe3Lao72t+AMfc7wwyM="; + src = fetchFromGitHub { + owner = "Pylons"; + repo = "webob"; + rev = "refs/tags/${version}"; + hash = "sha256-QN0UMLzO0g8Oalnn5GlOulXUxtXOx89jeeEvJV53rVs="; }; build-system = [ setuptools ]; @@ -37,6 +43,10 @@ buildPythonPackage rec { "tests/test_client_functional.py" ]; + passthru.tests = { + inherit pyramid routes tokenlib; + }; + meta = with lib; { description = "WSGI request and response object"; homepage = "https://webob.org/"; diff --git a/pkgs/development/python-modules/webrtc-models/default.nix b/pkgs/development/python-modules/webrtc-models/default.nix new file mode 100644 index 000000000000..5b2524dc0bc5 --- /dev/null +++ b/pkgs/development/python-modules/webrtc-models/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + mashumaro, + orjson, + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, + pythonOlder, + syrupy, +}: + +buildPythonPackage rec { + pname = "webrtc-models"; + version = "0.2.0"; + pyproject = true; + + disabled = pythonOlder "3.12"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "python-webrtc-models"; + rev = "refs/tags/${version}"; + hash = "sha256-6fVcp9kWr5nV4wOKov3ObqyPJo+u3jN443qv++sJ0TQ="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.0.0"' 'version = "${version}"' + ''; + + pythonRelaxDeps = [ "orjson" ]; + + build-system = [ hatchling ]; + + dependencies = [ + mashumaro + orjson + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-cov-stub + pytestCheckHook + syrupy + ]; + + pythonImportsCheck = [ "webrtc_models" ]; + + meta = { + description = "WebRTC models as Python dataclasses with mashumaro"; + homepage = "https://github.com/home-assistant-libs/python-webrtc-models"; + changelog = "https://github.com/home-assistant-libs/python-webrtc-models/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/webrtc-noise-gain/default.nix b/pkgs/development/python-modules/webrtc-noise-gain/default.nix index 68cc5938bc88..45f2d805aa40 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.4"; + version = "1.2.5"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "webrtc-noise-gain"; - rev = "v${version}"; - hash = "sha256-ALRdj9zBcx05DcSKjAI0oEPruTD/p+pQ0kcqqyHl37A="; + rev = "refs/tags/v${version}"; + hash = "sha256-GbdG2XM11zgPk2VZ0mu7qMv256jaMyJDHdBCBUnynMY="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { buildInputs = [ abseil-cpp - ] ++ lib.optionals (stdenv.isDarwin) [ darwin.apple_sdk.frameworks.CoreServices ]; + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.CoreServices ]; pythonImportsCheck = [ "webrtc_noise_gain" ]; diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix index b69dfcb58509..dbaae49890b5 100644 --- a/pkgs/development/python-modules/websocket-client/default.nix +++ b/pkgs/development/python-modules/websocket-client/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "1.8.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "websocket_client"; @@ -21,9 +21,14 @@ buildPythonPackage rec { hash = "sha256-Mjnfn0TaYy+WASRygF1AojKBqZECfOEdL0Wm8krEw9o="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ python-socks ]; + optional-dependencies = { + optional = [ + python-socks + # wsaccel is not available at the moment + ]; + }; nativeCheckInputs = [ pytestCheckHook ]; @@ -31,10 +36,10 @@ buildPythonPackage rec { meta = with lib; { description = "Websocket client for Python"; - mainProgram = "wsdump"; homepage = "https://github.com/websocket-client/websocket-client"; changelog = "https://github.com/websocket-client/websocket-client/blob/v${version}/ChangeLog"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ fab ]; + mainProgram = "wsdump"; }; } diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index f2c7ce30d799..658d69ea942d 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -10,45 +10,55 @@ buildPythonPackage rec { pname = "websockets"; - version = "12.0"; + version = "13.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "aaugustin"; - repo = pname; + repo = "websockets"; rev = "refs/tags/${version}"; - hash = "sha256-sOL3VI9Ib/PncZs5KN4dAIHOrBc7LfXqT15LO4M6qKg="; + hash = "sha256-Y0HDZw+H7l8+ywLLzFk66GNDCI0uWOZYypG86ozLo7c="; }; - nativeBuildInputs = [ setuptools ]; - - patchPhase = '' - # Disable all tests that need to terminate within a predetermined amount of - # time. This is nondeterministic. - sed -i 's/with self.assertCompletesWithin.*:/if True:/' \ - tests/legacy/test_protocol.py - - # Disables tests relying on tight timeouts to avoid failures like: - # File "/build/source/tests/legacy/test_protocol.py", line 1270, in test_keepalive_ping_with_no_ping_timeout - # ping_1_again, ping_2 = tuple(self.protocol.pings) - # ValueError: too many values to unpack (expected 2) - for t in \ - test_keepalive_ping_stops_when_connection_closing \ - test_keepalive_ping_does_not_crash_when_connection_lost \ - test_keepalive_ping \ - test_keepalive_ping_not_acknowledged_closes_connection \ - test_keepalive_ping_with_no_ping_timeout \ - ; do - sed -i "s/def $t(/def skip_$t(/" tests/legacy/test_protocol.py - done - ''; + build-system = [ setuptools ]; + + patchPhase = + '' + # Disable all tests that need to terminate within a predetermined amount of + # time. This is nondeterministic. + sed -i 's/with self.assertCompletesWithin.*:/if True:/' \ + tests/legacy/test_protocol.py + + # Disables tests relying on tight timeouts to avoid failures like: + # File "/build/source/tests/legacy/test_protocol.py", line 1270, in test_keepalive_ping_with_no_ping_timeout + # ping_1_again, ping_2 = tuple(self.protocol.pings) + # ValueError: too many values to unpack (expected 2) + for t in \ + test_keepalive_ping_stops_when_connection_closing \ + test_keepalive_ping_does_not_crash_when_connection_lost \ + test_keepalive_ping \ + test_keepalive_ping_not_acknowledged_closes_connection \ + test_keepalive_ping_with_no_ping_timeout \ + ; do + sed -i "s/def $t(/def skip_$t(/" tests/legacy/test_protocol.py + done + '' + + lib.optionalString (pythonOlder "3.11") '' + # Our Python 3.10 and older raise SSLError instead of SSLCertVerificationError + sed -i "s/def test_reject_invalid_server_certificate(/def skip_test_reject_invalid_server_certificate(/" tests/sync/test_client.py + ''; nativeCheckInputs = [ unittestCheckHook ]; + preCheck = '' + # https://github.com/python-websockets/websockets/issues/1509 + export WEBSOCKETS_TESTS_TIMEOUT_FACTOR=100 + ''; + # Tests fail on Darwin with `OSError: AF_UNIX path too long` - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; pythonImportsCheck = [ "websockets" ]; diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index 2dee5231dc72..2aaa1078200b 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # this test failed on macos # https://github.com/novnc/websockify/issues/552 "test_socket_set_keepalive_options" diff --git a/pkgs/development/python-modules/webssh/default.nix b/pkgs/development/python-modules/webssh/default.nix index b18dcd38c2a7..f7166b86e459 100644 --- a/pkgs/development/python-modules/webssh/default.nix +++ b/pkgs/development/python-modules/webssh/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { changelog = "https://github.com/huashengdun/webssh/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ davidtwco ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index 15a36b3dc8f1..da51af3e701b 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -3,7 +3,7 @@ beautifulsoup4, buildPythonPackage, fetchPypi, - fetchpatch, + setuptools, pastedeploy, pyquery, pytestCheckHook, @@ -16,27 +16,19 @@ buildPythonPackage rec { pname = "webtest"; - version = "3.0.0"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { - pname = "WebTest"; - inherit version; - hash = "sha256-VL2WlyWDjZhhqfon+Nlx950nXZSuJV9cUB9Tu22ZKes="; + inherit pname version; + hash = "sha256-STtcgC+JSKZbXjoa1bJSTuXhq2DNcT2aPaO42ggsBv4="; }; - patches = [ - (fetchpatch { - # Replace deprecated unittest aliases for Python 3.12 - name = "webtest-python312-compat.patch"; - url = "https://github.com/Pylons/webtest/commit/d82ec5bd2cf3c7109a1d49ad9fa802ae1eae1763.patch"; - hash = "sha256-hSwxAxAI3Eo28I8S+r2k/hFG8TlzrVYup3MuTsE+xXk="; - }) - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 six waitress diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index bdbd57513c56..a3380e20b553 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.48.4"; + version = "0.49.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-Yv6CAGTDi4P9pImLxVk2QkZ014iqQ8UMBUeiyZWnYiQ="; + hash = "sha256-jTScDPTj7aIQcGuL2g8MvuYln6iaj6abEyCfd8vvT2I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 171622cf10b2..109457308110 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { Images = [ ascii-magic pillow diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 43758f06157b..feafb29bcbd3 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -29,22 +29,22 @@ buildPythonPackage rec { pname = "werkzeug"; - version = "3.0.3"; - format = "pyproject"; + version = "3.0.6"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-CX5b/anwq6jaa4VFFG3vSB0Gqn0yZudEjizM9n3YvRg="; + hash = "sha256-qN1Z1N4oynBHGjTLp5vtX37y4Danazqwg1R0JG60H40="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ markupsafe ]; + dependencies = [ markupsafe ]; - passthru.optional-dependencies = { - watchdog = lib.optionals (!stdenv.isDarwin) [ + optional-dependencies = { + watchdog = lib.optionals (!stdenv.hostPlatform.isDarwin) [ # watchdog requires macos-sdk 10.13 watchdog ]; @@ -59,11 +59,11 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ greenlet ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "werkzeug" ]; - disabledTests = lib.optionals stdenv.isDarwin [ "test_get_machine_id" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_get_machine_id" ]; disabledTestPaths = [ # ConnectionRefusedError: [Errno 111] Connection refused diff --git a/pkgs/development/python-modules/west/default.nix b/pkgs/development/python-modules/west/default.nix index e644d156edb0..d8823b927bb0 100644 --- a/pkgs/development/python-modules/west/default.nix +++ b/pkgs/development/python-modules/west/default.nix @@ -1,8 +1,8 @@ { lib, buildPythonPackage, + setuptools, colorama, - configobj, fetchPypi, packaging, pykwalify, @@ -12,19 +12,20 @@ buildPythonPackage rec { pname = "west"; - version = "1.2.0"; - format = "setuptools"; + version = "1.3.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-tB5RrJA5OUT5wB974nAA1LMpYVt+0HT7DvaTtGRoEpc="; + hash = "sha256-iTIANL6HCZ0W519HYKwNHtZ+iXiSjkaKuZPj+6DP6S8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ colorama - configobj packaging pyyaml pykwalify diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index 754223e49adf..4c7a5b3dc288 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "wheel"; - version = "0.43.0"; + version = "0.44.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; - repo = pname; + repo = "wheel"; rev = "refs/tags/${version}"; - hash = "sha256-cATYN7GtS1l3GxcqBl95RsBTuszWoFB9CtuRgUSL0/A="; + hash = "sha256-IFJ411H5nItR8gA5R0AYXFs3n6e1SLo2VoMOqgvDnnk="; postFetch = '' cd $out mv tests/testdata/unicode.dist/unicodedist/åäö_日本語.py \ diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix index cdb547e65dac..8fe5daca8738 100644 --- a/pkgs/development/python-modules/whenever/default.nix +++ b/pkgs/development/python-modules/whenever/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "whenever"; - version = "0.6.9"; + version = "0.6.12"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,12 +29,12 @@ buildPythonPackage rec { owner = "ariebovenberg"; repo = "whenever"; rev = "refs/tags/${version}"; - hash = "sha256-Y2+ZQhQpUf747OlzhQRdT1B3jZgCr0BViJ6ujPJWo3w="; + hash = "sha256-fvLqdjbTuQ732qeVUu1f3dXXlFOuP9FGexEt4gZe0aI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-B1weEmW+Q7VxwnLxv9QH75I6IgEICTd70ci/I14ehLY="; + hash = "sha256-KWB0PRYKiGNBUKYZn8bCHUjh+oFe818PgKtPdNy1CZA="; }; build-system = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; diff --git a/pkgs/development/python-modules/whey-pth/default.nix b/pkgs/development/python-modules/whey-pth/default.nix index 44c490f28014..c40292ede641 100644 --- a/pkgs/development/python-modules/whey-pth/default.nix +++ b/pkgs/development/python-modules/whey-pth/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { whey ]; - nativeCheckInputs = [ ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' diff --git a/pkgs/development/python-modules/whey/default.nix b/pkgs/development/python-modules/whey/default.nix index 9c7cad7a1039..7c1aaec13e6c 100644 --- a/pkgs/development/python-modules/whey/default.nix +++ b/pkgs/development/python-modules/whey/default.nix @@ -41,8 +41,6 @@ buildPythonPackage rec { shippinglabel ]; - nativeCheckInputs = [ ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' diff --git a/pkgs/development/python-modules/whispers/default.nix b/pkgs/development/python-modules/whispers/default.nix index 346083ef81a1..ad550eafe520 100644 --- a/pkgs/development/python-modules/whispers/default.nix +++ b/pkgs/development/python-modules/whispers/default.nix @@ -13,12 +13,14 @@ pytestCheckHook, pythonOlder, pyyaml, + wrapt, + semgrep, setuptools, }: buildPythonPackage rec { pname = "whispers"; - version = "2.2.1"; + version = "2.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +29,7 @@ buildPythonPackage rec { owner = "adeptex"; repo = "whispers"; rev = "refs/tags/${version}"; - hash = "sha256-YPfTe2txQY/sVEIGSMTA1b3Ye3j8qT+YdWp3AVqpdLI="; + hash = "sha256-tjDog8+oWTNuK1eK5qUEFspiilB0riUSTX5ugTIiP3M="; }; postPatch = '' @@ -35,6 +37,12 @@ buildPythonPackage rec { --replace-fail '"pytest-runner"' "" ''; + pythonRelaxDeps = [ + "lxml" + "pyyaml" + "semgrep" + ]; + build-system = [ setuptools ]; dependencies = [ @@ -46,6 +54,8 @@ buildPythonPackage rec { luhn lxml pyyaml + wrapt + semgrep ]; nativeCheckInputs = [ @@ -53,7 +63,16 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # pinning tests highly sensitive to semgrep version + "tests/unit/plugins/test_semgrep.py" + ]; + preCheck = '' + # pinning test highly sensitive to semgrep version + substituteInPlace tests/unit/test_main.py \ + --replace-fail '("--ast", 421),' "" + # Some tests need the binary available in PATH export PATH=$out/bin:$PATH ''; diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index f2ab1675d043..367a615f9c27 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -1,48 +1,43 @@ { lib, buildPythonPackage, + defusedxml, fetchFromGitHub, - - # build-system - flit-core, - - # dependencies filetype, - defusedxml, - - # optional-dependencies - pillow-heif, - - # tests + flit-core, numpy, opencv4, + pillow-heif, pillow, pytestCheckHook, + pythonOlder, wand, }: buildPythonPackage rec { pname = "willow"; - version = "1.8.0"; - format = "pyproject"; + version = "1.9.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "wagtail"; repo = "Willow"; rev = "refs/tags/v${version}"; - hash = "sha256-g9/v56mdo0sJe5Pl/to/R/kXayaKK3qaYbnnPXpFjXE="; + hash = "sha256-H/UXE6gA6x849aqBcUgl3JYZ87OMNpuFyWGSsgqW1Rk="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; pythonRelaxDeps = [ "defusedxml" ]; - propagatedBuildInputs = [ + dependencies = [ filetype defusedxml ]; - passthru.optional-dependencies = { + optional-dependencies = { heif = [ pillow-heif ]; }; @@ -52,11 +47,12 @@ buildPythonPackage rec { pytestCheckHook pillow wand - ] ++ passthru.optional-dependencies.heif; + ] ++ optional-dependencies.heif; meta = with lib; { description = "Python image library that sits on top of Pillow, Wand and OpenCV"; homepage = "https://github.com/torchbox/Willow/"; + changelog = "https://github.com/wagtail/Willow/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ desiderius ]; }; diff --git a/pkgs/development/python-modules/wktutils/default.nix b/pkgs/development/python-modules/wktutils/default.nix index 23529f04a356..de011db9a56d 100644 --- a/pkgs/development/python-modules/wktutils/default.nix +++ b/pkgs/development/python-modules/wktutils/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { shapely ]; - passthru.optional-dependencies = { + optional-dependencies = { extras = [ requests scikit-learn diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 00e3c9e24412..196397ab7f1d 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { yarl ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ typer zeroconf diff --git a/pkgs/development/python-modules/wordcloud/default.nix b/pkgs/development/python-modules/wordcloud/default.nix index 4146522d0137..4f80b2938578 100644 --- a/pkgs/development/python-modules/wordcloud/default.nix +++ b/pkgs/development/python-modules/wordcloud/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "wordcloud"; - version = "1.9.3"; + version = "1.9.4"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-qapzjWPtZ0pA8Mwxrbg/TKX8GV8Dpq/24BDR9YB9HFg="; + hash = "sha256-snPYpd7ZfT6tkEBGtJRk3LcRGe5534dQcqTBBcrdNHo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/world-bank-data/default.nix b/pkgs/development/python-modules/world-bank-data/default.nix new file mode 100644 index 000000000000..b5d02b034b27 --- /dev/null +++ b/pkgs/development/python-modules/world-bank-data/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + cachetools, + pandas, + requests, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "world-bank-data"; + version = "0.1.4"; + pyproject = true; + + src = fetchPypi { + pname = "world_bank_data"; + inherit version; + hash = "sha256-UidtJovurzrZKWeI7n1bV0vluc5pSg92zKFELvZE9fw="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + cachetools + pandas + requests + ]; + + # Tests require a HTTP connection + doCheck = false; + + pythonImportsCheck = [ + "world_bank_data" + ]; + + meta = { + description = "World Bank Data API in Python"; + homepage = "https://github.com/mwouts/world_bank_data"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ itepastra ]; + }; +} diff --git a/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix b/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix new file mode 100644 index 000000000000..4d48ed10846f --- /dev/null +++ b/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + sqlalchemy, + wtforms, +}: + +buildPythonPackage rec { + pname = "wtforms-sqlalchemy"; + version = "0.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "wtforms"; + repo = "wtforms-sqlalchemy"; + rev = version; + hash = "sha256-uR09LYfcyre+AC2TTEIhpjSI7y4Yo0GJ20smkzo5PRY="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + sqlalchemy + wtforms + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "wtforms_sqlalchemy" ]; + + meta = { + description = "WTForms integration for SQLAlchemy"; + homepage = "https://github.com/wtforms/wtforms-sqlalchemy"; + changelog = "https://github.com/wtforms/wtforms-sqlalchemy/blob/${version}/CHANGES.rst"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index 4712aefbed07..fc509b20132b 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "wtforms"; - version = "3.1.2"; + version = "3.2.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "wtforms"; repo = "wtforms"; rev = "refs/tags/${version}"; - hash = "sha256-L6DmB7iVpJR775oRxuEkCKWlUJnmw8VPZTr2dZbqeEc="; + hash = "sha256-jwjP/wkk8MdNJbPE8MlkrH4DyR304Ju41nN4lMo3jFs="; }; nativeBuildInputs = [ @@ -41,13 +41,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ markupsafe ]; - passthru.optional-dependencies = { + optional-dependencies = { email = [ email-validator ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "wtforms" ]; diff --git a/pkgs/development/python-modules/wxpython/0001-add-missing-bool-c.patch b/pkgs/development/python-modules/wxpython/0001-add-missing-bool-c.patch new file mode 100644 index 000000000000..3a12611b5be1 --- /dev/null +++ b/pkgs/development/python-modules/wxpython/0001-add-missing-bool-c.patch @@ -0,0 +1,41 @@ +From f16912c7932ecc1cceb2fd9565fcae37bfd0447b Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Tue, 22 Oct 2024 11:07:58 +0800 +Subject: [PATCH] tt + +--- + sip/siplib/bool.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + create mode 100644 sip/siplib/bool.c + +diff --git a/sip/siplib/bool.c b/sip/siplib/bool.c +new file mode 100644 +index 0000000..781babb +--- /dev/null ++++ b/sip/siplib/bool.c +@@ -0,0 +1,22 @@ ++// This contains all the C++ code that is needed by the sip module. ++// ++// Copyright (c) 2015 Riverbank Computing Limited <info@riverbankcomputing.com> ++// ++// This file is part of SIP. ++// ++// This copy of SIP is licensed for use under the terms of the SIP License ++// Agreement. See the file LICENSE for more details. ++// ++// This copy of SIP may also used under the terms of the GNU General Public ++// License v2 or v3 as published by the Free Software Foundation which can be ++// found in the files LICENSE-GPL2 and LICENSE-GPL3 included in this package. ++// ++// SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of ++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++ ++ ++// Set a C++ bool for the main C implementation of the module. ++extern "C" void sipSetBool(void *ptr, int val) ++{ ++ *reinterpret_cast<bool *>(ptr) = !!val; ++} +-- +2.46.1 + diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix index 8ad524a17c9b..09cf9684c4d5 100644 --- a/pkgs/development/python-modules/wxpython/4.2.nix +++ b/pkgs/development/python-modules/wxpython/4.2.nix @@ -30,7 +30,7 @@ mesa, pango, SDL, - webkitgtk, + webkitgtk_4_0, wxGTK, xorgproto, @@ -42,13 +42,13 @@ buildPythonPackage rec { pname = "wxpython"; - version = "4.2.1"; + version = "4.2.2"; format = "other"; src = fetchPypi { pname = "wxPython"; inherit version; - hash = "sha256-5I3iEaZga/By7D+neHcda3RsALf0uXDrWHKN31bRPVw="; + hash = "sha256-XbywZQ9n/cLFlleVolX/qj17CfsUmqjaLQ2apE444ro="; }; patches = [ @@ -58,6 +58,7 @@ buildPythonPackage rec { libpangocairo = "${pango}/lib/libpangocairo-1.0.so"; libcairo = "${cairo}/lib/libcairo.so"; }) + ./0001-add-missing-bool-c.patch # Add missing bool.c from old source ]; # https://github.com/wxWidgets/Phoenix/issues/2575 @@ -75,14 +76,14 @@ buildPythonPackage rec { sip which wxGTK - ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ wxGTK SDL ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ gst_all_1.gst-plugins-base gst_all_1.gstreamer libGL @@ -93,7 +94,7 @@ buildPythonPackage rec { libXxf86vm libglvnd mesa - webkitgtk + webkitgtk_4_0 xorgproto ]; diff --git a/pkgs/development/python-modules/wyoming/default.nix b/pkgs/development/python-modules/wyoming/default.nix index bc1eb85ab3ba..3c63c6a73916 100644 --- a/pkgs/development/python-modules/wyoming/default.nix +++ b/pkgs/development/python-modules/wyoming/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { zeroconf = [ zeroconf ]; }; diff --git a/pkgs/development/python-modules/x-wr-timezone/default.nix b/pkgs/development/python-modules/x-wr-timezone/default.nix index 4d873e9590f5..507180439589 100644 --- a/pkgs/development/python-modules/x-wr-timezone/default.nix +++ b/pkgs/development/python-modules/x-wr-timezone/default.nix @@ -4,46 +4,43 @@ fetchFromGitHub, setuptools, icalendar, - pytz, + tzdata, pytestCheckHook, restructuredtext-lint, pygments, + pytz, }: buildPythonPackage rec { pname = "x-wr-timezone"; - version = "0.0.7"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "niccokunzmann"; repo = "x-wr-timezone"; rev = "v${version}"; - hash = "sha256-itqsVYYUcpbKTh0BM6IHk6F9xhB+pAQnnJsnZAVpNL4="; + hash = "sha256-MDFniFhgRuNtYITH/IUUP/HHC79coqxgXrlErj+Yrcs="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ icalendar - pytz + tzdata ]; nativeCheckInputs = [ pytestCheckHook restructuredtext-lint pygments + pytz ]; preCheck = '' export PATH=$out/bin:$PATH ''; - disabledTests = [ - "test_input_to_output" - "test_output_stays_the_same" - ]; - pythonImportsCheck = [ "x_wr_timezone" ]; meta = { diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix index 382b67293272..fea907243d70 100644 --- a/pkgs/development/python-modules/xapian/default.nix +++ b/pkgs/development/python-modules/xapian/default.nix @@ -34,8 +34,6 @@ buildPythonPackage rec { xapian ]; - doCheck = true; - checkPhase = '' ${python.interpreter} python${pythonSuffix}/pythontest.py ''; diff --git a/pkgs/development/python-modules/xarray-datatree/default.nix b/pkgs/development/python-modules/xarray-datatree/default.nix deleted file mode 100644 index 1d99f300cb7b..000000000000 --- a/pkgs/development/python-modules/xarray-datatree/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - 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 b82a8a8cd79f..db1b1c5504b1 100644 --- a/pkgs/development/python-modules/xarray-einstats/default.nix +++ b/pkgs/development/python-modules/xarray-einstats/default.nix @@ -14,34 +14,40 @@ buildPythonPackage rec { pname = "xarray-einstats"; - version = "0.7.0"; - format = "pyproject"; + version = "0.8.0"; + pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "arviz-devs"; - repo = pname; + repo = "xarray-einstats"; rev = "refs/tags/v${version}"; - hash = "sha256-aljjwgBJp341aQN3g1PoZPj+46x21Eu+svG1yzURhJE="; + hash = "sha256-XvxsyH8cwsA9B36uhM1Pr5XaNd0d0/nEamA4axdJe24="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ numpy scipy xarray ]; - nativeCheckInputs = [ - einops - numba - pytestCheckHook - ]; + optional-dependencies = { + einops = [ einops ]; + numba = [ numba ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "xarray_einstats" ]; + disabledTests = [ + # TypeError + "test_pinv" + ]; + meta = with lib; { description = "Stats, linear algebra and einops for xarray"; homepage = "https://github.com/arviz-devs/xarray-einstats"; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index a0abc6074a35..96540a3484b6 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "xarray"; - version = "2024.07.0"; + version = "2024.10.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pydata"; repo = "xarray"; rev = "refs/tags/v${version}"; - hash = "sha256-pt0qnkgf3E/QQHQAaZLommakhqEJ4NuTyjx5tdk2N1U="; + hash = "sha256-s5MvHp2OkomD3xNYzj9oKlVLMgHZDQRBJM6vgOAv1jQ="; }; build-system = [ @@ -42,10 +42,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "xarray" ]; - meta = with lib; { + meta = { changelog = "https://github.com/pydata/xarray/blob/${src.rev}/doc/whats-new.rst"; description = "N-D labeled arrays and datasets in Python"; homepage = "https://github.com/pydata/xarray"; - license = licenses.asl20; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + doronbehar + ]; }; } diff --git a/pkgs/development/python-modules/xboxapi/default.nix b/pkgs/development/python-modules/xboxapi/default.nix index b100259cea6b..3441760693ab 100644 --- a/pkgs/development/python-modules/xboxapi/default.nix +++ b/pkgs/development/python-modules/xboxapi/default.nix @@ -2,23 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, - requests, pytestCheckHook, + requests, + setuptools, }: buildPythonPackage rec { pname = "xboxapi"; version = "2.0.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mKeRix"; repo = "xboxapi-python"; - rev = version; - sha256 = "10mhvallkwf5lw91hj5rv16sziqhhjq7sgcgr28sqqnlgjnyazdd"; + rev = "refs/tags/${version}"; + hash = "sha256-rX3lrXzUYqyRyI89fbCEEMevTdi5SBgSp8XxSanasII="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -27,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python XBOX One API wrapper"; homepage = "https://github.com/mKeRix/xboxapi-python"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/xdg-base-dirs/default.nix b/pkgs/development/python-modules/xdg-base-dirs/default.nix index e65785377a57..5c376c3db440 100644 --- a/pkgs/development/python-modules/xdg-base-dirs/default.nix +++ b/pkgs/development/python-modules/xdg-base-dirs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "xdg-base-dirs"; - version = "6.0.1"; + version = "6.0.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "srstevenson"; repo = "xdg-base-dirs"; - rev = version; - hash = "sha256-nbdF1tjVqlxwiGW0pySS6HyJbmNuQ7mVdQYfhofO4Dk="; + rev = "refs/tags/${version}"; + hash = "sha256-iXK9WURTfmpl5vd7RsT0ptwfrb5UQQFqMMCu3+vL+EY="; }; nativeBuildInputs = [ poetry-core ]; @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of the XDG Base Directory Specification in Python"; homepage = "https://github.com/srstevenson/xdg-base-dirs"; - changelog = "https://github.com/srstevenson/xdg-base-dirs/releases/tag/${src.rev}"; + changelog = "https://github.com/srstevenson/xdg-base-dirs/releases/tag/${version}"; license = licenses.isc; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index ebbad75f8408..ce66720f17d0 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -3,15 +3,17 @@ buildPythonPackage, click, fetchFromGitHub, + fetchpatch, pytestCheckHook, pythonOlder, + setuptools, six, }: buildPythonPackage rec { pname = "xdis"; - version = "6.1.0"; - format = "setuptools"; + version = "6.1.1"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -19,10 +21,38 @@ buildPythonPackage rec { owner = "rocky"; repo = "python-xdis"; rev = "refs/tags/${version}"; - hash = "sha256-KgKTO99T2/be1sBs5rY3Oy7/Yl9WGgdG3hqqkZ7D7ZY="; + hash = "sha256-Fn1cyUPMrn1SEXl4sdQwJiNHaY+BbxBDz3nKZY965/0="; }; - propagatedBuildInputs = [ + # Backport magics for newer newer python versions + patches = [ + (fetchpatch { + url = "https://github.com/rocky/python-xdis/commit/fcba74a7f64c5e2879ca0779ff10f38f9229e7da.patch"; + hash = "sha256-D7eJ97g4G6pmYL/guq0Ndf8yKTVBD2gAuUCAKwvlYbE="; + }) + (fetchpatch { + url = "https://github.com/rocky/python-xdis/commit/b66976ff53a2c6e17a73fb7652ddd6c8054df8db.patch"; + hash = "sha256-KO1y0nDTPmEZ+0/3Pjh+CvTdpr/p4AYZ8XdH5J+XzXo="; + }) + (fetchpatch { + url = "https://github.com/rocky/python-xdis/commit/a9f50c0ba77cdbf4693388404c13a02796a4221a.patch"; + hash = "sha256-gwMagKBY7d/+ohESTSl6M2IEjzABxfrddpdr58VJAk8="; + }) + (fetchpatch { + url = "https://github.com/rocky/python-xdis/commit/d9e15acae76a413667912a10fbf8259711ed9c65.patch"; + hash = "sha256-hpmKg+K1RiLSnmUIS8KtZRVBfvTO9bWbpsNhBFUM38o="; + }) + (fetchpatch { + url = "https://github.com/rocky/python-xdis/commit/b412c878d0bc1b516bd01612d46d8830c36a14ad.patch"; + hash = "sha256-W1JuIXYLO6iyjWiSnzCoXzFsedZjesq31gEPgrtjxas="; + }) + ]; + + build-system = [ + setuptools + ]; + + dependencies = [ click six ]; @@ -41,6 +71,9 @@ buildPythonPackage rec { # Doesn't run on non-2.7 but has global-level mis-import "test_unit/test_dis27.py" + + # Has Python 2 style prints + "test/decompyle/test_nested_scopes.py" ]; disabledTests = [ @@ -50,11 +83,14 @@ buildPythonPackage rec { "test_basic" ]; - meta = with lib; { + meta = { description = "Python cross-version byte-code disassembler and marshal routines"; homepage = "https://github.com/rocky/python-xdis"; changelog = "https://github.com/rocky/python-xdis/releases/tag/${version}"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ onny ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + onny + melvyn2 + ]; }; } diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index 8cd817ea1c90..944b9f4619e9 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -60,8 +60,6 @@ buildPythonPackage rec { runHook postCheck ''; - doCheck = true; - meta = with lib; { description = "Interactive viewer for graphs written in Graphviz's dot"; mainProgram = "xdot"; diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix index 69c7583c9eac..8790b380b769 100644 --- a/pkgs/development/python-modules/xformers/default.nix +++ b/pkgs/development/python-modules/xformers/default.nix @@ -5,12 +5,13 @@ pythonOlder, fetchFromGitHub, which, + setuptools, # runtime dependencies numpy, torch, # check dependencies pytestCheckHook, - pytest-cov, + pytest-cov-stub, # , pytest-mpi pytest-timeout, # , pytorch-image-models @@ -29,25 +30,27 @@ }: let inherit (torch) cudaCapabilities cudaPackages cudaSupport; - version = "0.0.23.post1"; + version = "0.0.28.post3"; in buildPythonPackage { pname = "xformers"; inherit version; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "facebookresearch"; repo = "xformers"; rev = "refs/tags/v${version}"; - hash = "sha256-AJXow8MmX4GxtEE2jJJ/ZIBr+3i+uS4cA6vofb390rY="; + hash = "sha256-23tnhCHK+Z0No8fqZxkgDFp2VIgXZR4jpM+pkb/vvmw="; fetchSubmodules = true; }; patches = [ ./0001-fix-allow-building-without-git.patch ]; + build-system = [ setuptools ]; + preBuild = '' cat << EOF > ./xformers/version.py # noqa: C801 @@ -81,7 +84,7 @@ buildPythonPackage { which ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_nvcc ]); - propagatedBuildInputs = [ + dependencies = [ numpy torch ]; @@ -99,7 +102,7 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub pytest-timeout hydra-core fairscale @@ -115,7 +118,7 @@ buildPythonPackage { ]; meta = with lib; { - description = "XFormers: A collection of composable Transformer building blocks"; + description = "Collection of composable Transformer building blocks"; homepage = "https://github.com/facebookresearch/xformers"; changelog = "https://github.com/facebookresearch/xformers/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index eeb1b6ce3373..76db9d97263a 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -3,7 +3,6 @@ arabic-reshaper, buildPythonPackage, fetchFromGitHub, - fetchpatch2, html5lib, pillow, pyhanko, @@ -19,7 +18,7 @@ buildPythonPackage rec { pname = "xhtml2pdf"; - version = "0.2.15"; + version = "0.2.16"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,25 +27,14 @@ buildPythonPackage rec { owner = "xhtml2pdf"; repo = "xhtml2pdf"; rev = "refs/tags/v${version}"; - hash = "sha256-JXxh/n1kUsy3O4P/6WTfa5p+mYy/t4ZBUhlHp+ypoQc="; + hash = "sha256-sva1Oqz4FsLz/www8IPVxol3D0hx5F5hQ0I/rSRP9sE="; }; - patches = [ - # https://github.com/xhtml2pdf/xhtml2pdf/pull/754 - (fetchpatch2 { - name = "reportlab-compat.patch"; - url = "https://github.com/xhtml2pdf/xhtml2pdf/commit/1252510bd23b833b45b4d252aeac62c1eb51eeef.patch"; - hash = "sha256-9Fkn086uh2biabmiChbBna8Q4lJV/604yX1ng9j5TGs="; - }) - ]; - - nativeBuildInputs = [ + build-system = [ setuptools ]; - pythonRelaxDeps = [ "reportlab" ]; - - propagatedBuildInputs = [ + dependencies = [ arabic-reshaper html5lib pillow @@ -71,12 +59,12 @@ buildPythonPackage rec { "xhtml2pdf.pisa" ]; - meta = with lib; { + meta = { + changelog = "https://github.com/xhtml2pdf/xhtml2pdf/releases/tag/v${version}"; description = "PDF generator using HTML and CSS"; homepage = "https://github.com/xhtml2pdf/xhtml2pdf"; - changelog = "https://github.com/xhtml2pdf/xhtml2pdf/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = [ ]; + license = lib.licenses.asl20; mainProgram = "xhtml2pdf"; + maintainers = with lib.maintainers; [ drupol ]; }; } diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index a053c5313997..1be46ecf5656 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -1,13 +1,14 @@ { lib, - bleak, bleak-retry-connector, + bleak, bluetooth-data-tools, bluetooth-sensor-state-data, buildPythonPackage, cryptography, fetchFromGitHub, home-assistant-bluetooth, + orjson, poetry-core, pycryptodomex, pytestCheckHook, @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.32.0"; + version = "0.33.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "xiaomi-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-dZJsB40BMPo0tOFq0vLILrwfezf5dnspFK/aZWOV4uc="; + hash = "sha256-7/4Ea8IiRPxhgMiazSylYZAmznqIula2yCEUAyIHBBg="; }; postPatch = '' @@ -46,6 +47,7 @@ buildPythonPackage rec { bluetooth-sensor-state-data cryptography home-assistant-bluetooth + orjson pycryptodomex sensor-state-data ]; diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index cc04d6611f99..eb3472bce0f9 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "xknx"; - version = "3.1.1"; + version = "3.3.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "XKNX"; repo = "xknx"; rev = "refs/tags/${version}"; - hash = "sha256-mlY9jPB3Sme9iajh5kWGf+8MHI0vMUilHe8W7AwmuCo="; + hash = "sha256-FLGOY7IUdLvRbwSWUYbJl0VzOCJVwiG+2C+CjFAqI6g="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/xknxproject/default.nix b/pkgs/development/python-modules/xknxproject/default.nix index bd7e126de6a1..3244c7d0c622 100644 --- a/pkgs/development/python-modules/xknxproject/default.nix +++ b/pkgs/development/python-modules/xknxproject/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - cryptography, fetchFromGitHub, pytestCheckHook, pythonOlder, @@ -12,7 +11,7 @@ buildPythonPackage rec { pname = "xknxproject"; - version = "3.7.1"; + version = "3.8.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,13 +20,12 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknxproject"; rev = "refs/tags/${version}"; - hash = "sha256-/Zg4MYOvbsbJ0zyKuq+gX0PNbm8TyyBMziIaGCq6Lt8="; + hash = "sha256-iuW83gKDJTgFkfSW32OPOuwyGLyFoZGKQGUDJkVUGAM="; }; build-system = [ setuptools ]; dependencies = [ - cryptography pyzipper striprtf ]; diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index a24b9fe21a6a..fb5685de6adf 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index db7c59df4c1c..1119a300b541 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -1,34 +1,31 @@ { lib, - appdirs, buildPythonPackage, configargparse, decorator, dict2xml, fetchFromGitHub, google-i18n-address, - html5lib, intervaltree, jinja2, lxml, - markupsafe, platformdirs, pycairo, pycountry, - pyflakes, - pypdf2, + pypdf, pytestCheckHook, python-fontconfig, pythonOlder, pyyaml, requests, + setuptools, wcwidth, }: buildPythonPackage rec { pname = "xml2rfc"; - version = "3.23.1"; - format = "setuptools"; + version = "3.24.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -36,7 +33,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - hash = "sha256-8AtQxLOOgEKhkbza9YwXrZVh/++UeJq8n8a7VwIzHSc="; + hash = "sha256-cymClLsXPeuWsRMbFJHO55ASzEbau++XvYoBsquDv+Y="; }; postPatch = '' @@ -45,20 +42,20 @@ buildPythonPackage rec { --replace-fail "test flaketest" "test" ''; - propagatedBuildInputs = [ - appdirs + build-system = [ setuptools ]; + + pythonRelaxDeps = [ "lxml" ]; + + dependencies = [ configargparse dict2xml google-i18n-address - html5lib intervaltree jinja2 lxml - markupsafe platformdirs pycountry - pyflakes - pypdf2 + pypdf pyyaml requests wcwidth diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 660f520c246b..6f10a4962c31 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.4.2"; + version = "3.4.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-0x8nk8F+kg5SSDQI4dOnv67ilyN4z2MZ5phPC3PW4WQ="; + hash = "sha256-7RA9lQwuty8aZghwTKNbU+oL+BATH2FVIRQBe9fIpHI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/xnd/default.nix b/pkgs/development/python-modules/xnd/default.nix index dcf396c079e5..8317f30e462b 100644 --- a/pkgs/development/python-modules/xnd/default.nix +++ b/pkgs/development/python-modules/xnd/default.nix @@ -34,7 +34,7 @@ buildPythonPackage { mkdir $out/include cp python/xnd/*.h $out/include '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath ${libxnd}/lib $out/${python.sitePackages}/xnd/_xnd.*.so ''; diff --git a/pkgs/development/python-modules/xrootd/default.nix b/pkgs/development/python-modules/xrootd/default.nix index 33b42f9f0f35..65d874d73c2d 100644 --- a/pkgs/development/python-modules/xrootd/default.nix +++ b/pkgs/development/python-modules/xrootd/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, cmake, setuptools, - wheel, xrootd, }: @@ -15,10 +14,9 @@ buildPythonPackage rec { sourceRoot = "${src.name}/bindings/python"; - nativeBuildInputs = [ + build-system = [ cmake setuptools - wheel ]; buildInputs = [ xrootd ]; @@ -30,11 +28,11 @@ buildPythonPackage rec { # Tests are only compatible with Python 2 doCheck = false; - meta = with lib; { + meta = { description = "XRootD central repository"; homepage = "https://github.com/xrootd/xrootd"; changelog = "https://github.com/xrootd/xrootd/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index 387eefcd14bf..e83779c85a80 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -19,16 +19,16 @@ buildPythonPackage rec { pname = "xsdata"; - version = "24.9"; + version = "24.11"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "tefra"; repo = "xsdata"; rev = "refs/tags/v${version}"; - hash = "sha256-wQSrdAS4E6AmpP+pKviFomLrcSHLROhTWHg/hYGTaeQ="; + hash = "sha256-hyNC9VcWkGnOYm6BpXgH3RzmHTqBVmQoADvcEvgF6yg="; }; patches = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { dependencies = [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click click-default-group @@ -59,11 +59,9 @@ buildPythonPackage rec { soap = [ requests ]; }; - nativeCheckInputs = - [ pytestCheckHook ] - ++ passthru.optional-dependencies.cli - ++ passthru.optional-dependencies.lxml - ++ passthru.optional-dependencies.soap; + nativeCheckInputs = [ + pytestCheckHook + ] ++ optional-dependencies.cli ++ optional-dependencies.lxml ++ optional-dependencies.soap; disabledTestPaths = [ "tests/integration/benchmarks" ]; diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index 3108d6f4ef5f..66a162f4f266 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "xxhash"; - version = "3.4.1"; + version = "3.5.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-A3nWzx/5h81CFgmiZM4CXnTzRuPhRd0QbAzC4+w/mak="; + hash = "sha256-hPLK3flRycv43C4iqJ1Mz12GORrGQY/oHjxn0M9gtF8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/y-py/default.nix b/pkgs/development/python-modules/y-py/default.nix index 7284ceca55a4..b01d8f5dcca3 100644 --- a/pkgs/development/python-modules/y-py/default.nix +++ b/pkgs/development/python-modules/y-py/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { rustc ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; pythonImportsCheck = [ "y_py" ]; diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index a38ecebdffdc..8caefef8b59f 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.4.3"; + version = "2.5.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-e+XTozOStGiYa4VBM/mQfcpYTapKe92OeZPuD5SwSIQ="; + hash = "sha256-I8LasRfV0a13E3ewkIwWEj8Af9BFBs/Xi4O2z8WuyKI="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 953f818e8337..f55c4b98416b 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -9,6 +9,7 @@ fetchFromGitHub, freenub, poetry-core, + propcache, pyjwt, pytest-asyncio, pytest-cov-stub, @@ -24,7 +25,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "8.6.4"; + version = "8.10.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -33,7 +34,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "yalexs"; rev = "refs/tags/v${version}"; - hash = "sha256-KUm+e/ZrfkrS4MA0Wb3VAo9URYmC0ucKw3L+yMMoMtU="; + hash = "sha256-0fC12QsCOgFc6GJk5T7kCjVHe9W4Fhwmtv3dwJVh9mM="; }; build-system = [ poetry-core ]; @@ -45,6 +46,7 @@ buildPythonPackage rec { aiohttp ciso8601 freenub + propcache pyjwt python-dateutil python-socketio diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index ff7560587aa4..b645cd8b56e6 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { # test failure reported upstream: https://github.com/adrienverge/yamllint/issues/373 "test_find_files_recursively" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # locale tests are broken on BSDs; see https://github.com/adrienverge/yamllint/issues/307 "test_locale_accents" "test_locale_case" diff --git a/pkgs/development/python-modules/yappi/default.nix b/pkgs/development/python-modules/yappi/default.nix index 634914a18c30..2120be04acc9 100644 --- a/pkgs/development/python-modules/yappi/default.nix +++ b/pkgs/development/python-modules/yappi/default.nix @@ -5,28 +5,33 @@ gevent, python, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "yappi"; - version = "1.6.0"; - format = "setuptools"; + version = "1.6.4"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sumerc"; - repo = pname; + repo = "yappi"; rev = "refs/tags/${version}"; - hash = "sha256-zA4apOGyrbjBOxUKBARiKmmM9rSVFVGWsDpOaItOoLU="; + hash = "sha256-3lGbFDu7sk83KrSHo6qZxHT2dxPWtT8yfXXQO1GbteU="; }; patches = [ ./tests.patch ]; + build-system = [ setuptools ]; + nativeCheckInputs = [ gevent ]; checkPhase = '' + runHook preCheck ${python.interpreter} run_tests.py + runHook postCheck ''; pythonImportsCheck = [ "yappi" ]; diff --git a/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix index 78589108f7e0..87cd9ffcee7f 100644 --- a/pkgs/development/python-modules/yaramod/default.nix +++ b/pkgs/development/python-modules/yaramod/default.nix @@ -5,10 +5,10 @@ fetchFromGitHub, pytestCheckHook, libxcrypt, - pythonOlder, gtest, pybind11, nlohmann_json, + setuptools, }: let @@ -21,16 +21,14 @@ let in buildPythonPackage rec { pname = "yaramod"; - version = "3.23.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "4.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "avast"; - repo = pname; + repo = "yaramod"; rev = "refs/tags/v${version}"; - hash = "sha256-TB0dnWA+5beyHAoYUjqocmw5uGFgo/h9eKDbuKbmfsw="; + hash = "sha256-EkGG3J84mTFnor1YX9B1TyjvW6mCCF/AH904DaVX+VU="; }; postPatch = '' @@ -48,12 +46,16 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake pog - gtest ]; - setupPyBuildFlags = [ "--with-unit-tests" ]; + build-system = [ setuptools ]; + + env.ENV_YARAMOD_BUILD_WITH_UNIT_TESTS = true; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + gtest + pytestCheckHook + ]; pytestFlagsArray = [ "tests/" ]; diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 0fd0f0ae6898..356e3f792639 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -1,45 +1,43 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, cython, expandvars, setuptools, idna, multidict, - typing-extensions, + pytest-cov-stub, pytest-xdist, pytestCheckHook, }: buildPythonPackage rec { pname = "yarl"; - version = "1.9.4"; + version = "1.13.1"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-Vm24ZxfPgIC5m1iwg7dzqQiuQPBmgeh+WJqXb6+CRr8="; + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "yarl"; + rev = "refs/tags/v${version}"; + hash = "sha256-I6/c5Q6/SRw8PIW4rPLKhVRVPRIC+n+Cz+UrKn5Pv/0="; }; - postPatch = '' - sed -i '/cov/d' pytest.ini - ''; - - nativeBuildInputs = [ + build-system = [ cython expandvars setuptools ]; - propagatedBuildInputs = [ + dependencies = [ idna multidict - ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; preCheck = '' # don't import yarl from ./ so the C extension is available @@ -47,6 +45,7 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ + pytest-cov-stub pytest-xdist pytestCheckHook ]; diff --git a/pkgs/development/python-modules/yaspin/default.nix b/pkgs/development/python-modules/yaspin/default.nix index e66d8fc3cd45..40ad8de8ef30 100644 --- a/pkgs/development/python-modules/yaspin/default.nix +++ b/pkgs/development/python-modules/yaspin/default.nix @@ -11,21 +11,25 @@ buildPythonPackage rec { pname = "yaspin"; - version = "3.0.1"; - format = "pyproject"; + version = "3.1.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pavdmyt"; - repo = pname; + repo = "yaspin"; rev = "refs/tags/v${version}"; - hash = "sha256-cYTCJyHZ9yNg6BfpZ+g3P0yMWFhYUxgYtlbANNgfohQ="; + hash = "sha256-4IWaAPqzGri7V8X2gL607F5GlWfIFDlBBpDwSe4sz9I="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ termcolor ]; + dependencies = [ termcolor ]; + + pythonRelaxDeps = [ + "termcolor" + ]; nativeCheckInputs = [ pytest-xdist diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index bbf2a0605cc2..5fcd36765519 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "yattag"; - version = "1.15.2"; + version = "1.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qtn1QL0i3FA+W1UGzEeFb6zwgapx/TX3JzcbY+HkAr8="; + hash = "sha256-CXgke5dU2fRONwPGQ3Srn6hy0Y3pWsV3L9/dPD8NBwY="; }; pythonImportsCheck = [ "yattag" ]; diff --git a/pkgs/development/python-modules/ydata-profiling/default.nix b/pkgs/development/python-modules/ydata-profiling/default.nix index d9e88875777e..334261463c62 100644 --- a/pkgs/development/python-modules/ydata-profiling/default.nix +++ b/pkgs/development/python-modules/ydata-profiling/default.nix @@ -1,54 +1,59 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, pytestCheckHook -, dacite -, htmlmin -, imagehash -, jinja2 -, matplotlib -, multimethod -, numba -, numpy -, pandas -, phik -, pyarrow -, pydantic -, pyyaml -, requests -, scipy -, seaborn -, statsmodels -, tqdm -, typeguard -, visions -, wordcloud +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + pytestCheckHook, + dacite, + htmlmin, + imagehash, + jinja2, + matplotlib, + multimethod, + numba, + numpy, + pandas, + phik, + pyarrow, + pydantic, + pyyaml, + requests, + scipy, + setuptools, + seaborn, + statsmodels, + tqdm, + typeguard, + visions, + wordcloud, }: buildPythonPackage rec { pname = "ydata-profiling"; - version = "4.10.0"; + version = "4.12.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ydataai"; - repo = pname; + repo = "ydata-profiling"; rev = "refs/tags/v${version}"; - hash = "sha256-uB8E7qp1xohAdcIIt1T2DxwSu93XhJoI8/qn54fSvGY="; + hash = "sha256-G1qW6HcJi176nfxOBGBK2tLyY/Nnz9STYpZWluWvhP0="; }; preBuild = '' echo ${version} > VERSION ''; + build-system = [ setuptools ]; + pythonRelaxDeps = [ + "imagehash" "scipy" ]; - propagatedBuildInputs = [ + dependencies = [ dacite htmlmin imagehash @@ -72,9 +77,10 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook pyarrow + pytestCheckHook ]; + disabledTestPaths = [ # needs Spark: "tests/backends/spark_backend" @@ -84,6 +90,7 @@ buildPythonPackage rec { "tests/unit/test_dataset_schema.py" "tests/unit/test_modular.py" ]; + disabledTests = [ # try to download data: "test_decorator" @@ -92,9 +99,7 @@ buildPythonPackage rec { "test_urls" ]; - pythonImportsCheck = [ - "ydata_profiling" - ]; + pythonImportsCheck = [ "ydata_profiling" ]; meta = with lib; { description = "Create HTML profiling reports from Pandas DataFrames"; diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index d9c3041c038c..36a381551864 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.43"; + version = "0.2.48"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = "yfinance"; rev = "refs/tags/${version}"; - hash = "sha256-pHjOXxnANnqypcycqdIV8/6u/qVVNnRFAeL4xsHjk3w="; + hash = "sha256-7m5N2l80Cg6+NDiW0x49WtHkc6fu07s0BqKlHFCc1v0="; }; build-system = [ setuptools ]; @@ -52,7 +52,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { nospam = [ requests-cache requests-ratelimiter diff --git a/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch b/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch index 73aadac9a3de..a1bc6fd92cc6 100644 --- a/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch +++ b/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch @@ -1,16 +1,33 @@ diff --git a/lib/youseedee/__init__.py b/lib/youseedee/__init__.py -index d2aeab3..c706277 100644 +index 8db9c5f..9ad6618 100644 --- a/lib/youseedee/__init__.py +++ b/lib/youseedee/__init__.py -@@ -29,10 +29,7 @@ UCD_URL = "https://unicode.org/Public/UCD/latest/ucd/UCD.zip" - +@@ -38,12 +38,7 @@ UCD_URL = "https://unicode.org/Public/UCD/latest/ucd/UCD.zip" def ucd_dir(): -- ucddir = os.path.expanduser("~/.youseedee") -- if not os.path.isdir(ucddir): + """Return the directory where Unicode data is stored""" +- ucddir = expanduser("~/.youseedee") +- try: - os.mkdir(ucddir) +- except FileExistsError: +- pass - return ucddir + return "@ucd_dir@" + def up_to_date(): +@@ -65,14 +60,6 @@ def up_to_date(): + def ensure_files(): + """Ensure the Unicode data files are downloaded and up to date, and download them if not""" +- if not os.path.isfile(os.path.join(ucd_dir(), "UnicodeData.txt")): +- download_files() +- if not up_to_date(): +- # Remove the zip if it exists +- zip_path = os.path.join(ucd_dir(), "UCD.zip") +- if os.path.isfile(zip_path): +- os.unlink(zip_path) +- download_files() + return + + diff --git a/pkgs/development/python-modules/youseedee/default.nix b/pkgs/development/python-modules/youseedee/default.nix index a5f45c10cbb5..e35be6b56568 100644 --- a/pkgs/development/python-modules/youseedee/default.nix +++ b/pkgs/development/python-modules/youseedee/default.nix @@ -3,6 +3,8 @@ buildPythonPackage, fetchPypi, substituteAll, + setuptools, + setuptools-scm, filelock, requests, unicode-character-database, @@ -10,12 +12,12 @@ buildPythonPackage rec { pname = "youseedee"; - version = "0.5.3"; - format = "setuptools"; + version = "0.6.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-hQkI8kdropLiO86LXDy6eQma3FEg48gLldU7bFg9dzI="; + hash = "sha256-9w6yr28zq0LgOvMp5fCFaHGOwK4wbbDo/g1jH4Uky0E="; }; patches = [ @@ -27,16 +29,20 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ filelock requests ]; - doCheck = true; # Package has no unit tests, but we can check an example as per README.rst: checkPhase = '' runHook preCheck - python -m youseedee 0x078A | grep -q "'Block': 'Thaana'" + python -m youseedee 0x078A | grep -qE "Block\s+Thaana" runHook postCheck ''; diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix index 06612b963230..75b05e352d0e 100644 --- a/pkgs/development/python-modules/yowsup/default.nix +++ b/pkgs/development/python-modules/yowsup/default.nix @@ -26,13 +26,19 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tgalal"; repo = "yowsup"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "1pz0r1gif15lhzdsam8gg3jm6zsskiv2yiwlhaif5rl7lv3p0v7q"; }; pythonRelaxDeps = true; pythonRemoveDeps = [ "argparse" ]; + env = { + # make protobuf compatible with old versions + # https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates + PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + }; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -45,11 +51,11 @@ buildPythonPackage rec { six ] ++ lib.optionals (!pythonOlder "3.12") [ pyasyncore ]; - meta = with lib; { + meta = { homepage = "https://github.com/tgalal/yowsup"; description = "Python WhatsApp library"; mainProgram = "yowsup-cli"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index da34c7442a28..78218a379fef 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.8.1"; + version = "1.8.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sigma67"; repo = "ytmusicapi"; rev = "refs/tags/${version}"; - hash = "sha256-zjJ/Kkym4zHYYIlITgTas+q41vv9ow/f6AqfTd64iB8="; + hash = "sha256-SZ5YsQNrE91ycSXy/NjtjXp0E6msVKlV0f+Td0AwYpQ="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 131aef003b2d..cc38c78b3c48 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -1,47 +1,56 @@ { lib, - asciitree, buildPythonPackage, - fasteners, fetchPypi, - numcodecs, - msgpack, - numpy, - pytestCheckHook, pythonOlder, + + # build-system setuptools-scm, + + # dependencies + asciitree, + numpy, + fasteners, + numcodecs, + + # tests + pytestCheckHook, }: buildPythonPackage rec { pname = "zarr"; - version = "2.18.2"; + version = "2.18.3"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-m7OTuKCjj7Eh27kTsEfXXbKN6YkPbWRKIXpzz0rnT0c="; + hash = "sha256-JYDYy23YRiF3GhDTHE13fcqKJ3BqGomyn0LS034t9c4="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ asciitree numpy fasteners numcodecs ] ++ numcodecs.optional-dependencies.msgpack; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "zarr" ]; - meta = with lib; { + meta = { description = "Implementation of chunked, compressed, N-dimensional arrays for Python"; homepage = "https://github.com/zarr-developers/zarr"; changelog = "https://github.com/zarr-developers/zarr-python/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/development/python-modules/zcbor/default.nix b/pkgs/development/python-modules/zcbor/default.nix index 7ff878f490d8..cec36ddc61fa 100644 --- a/pkgs/development/python-modules/zcbor/default.nix +++ b/pkgs/development/python-modules/zcbor/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "zcbor"; - version = "0.8.1"; + version = "0.9.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-U3Y/r3tBhzK6bGnMxdqKzS7bLHyAzgpGZ5PVK9pw7Pk="; + hash = "sha256-dm/gPFQaeQOrz5tcqqgCt4d4dh188QVjL4r8isXgiWY="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index d5965d455f6e..139d4ba8ea54 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -22,13 +22,14 @@ requests-toolbelt, requests-file, requests-mock, + setuptools, xmlsec, }: buildPythonPackage rec { pname = "zeep"; - version = "4.2.1"; - format = "setuptools"; + version = "4.3.1"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -36,10 +37,12 @@ buildPythonPackage rec { owner = "mvantellingen"; repo = "python-zeep"; rev = "refs/tags/${version}"; - hash = "sha256-8f6kS231gbaZ8qyE8BKMcbnZsm8o2+iBoTlQrs5X+jY="; + hash = "sha256-Bt0QqzJMKPXV91hZYETy9DKoQAELUWlYIh8w/IFTE8E="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ attrs defusedxml isodate @@ -51,7 +54,7 @@ buildPythonPackage rec { requests-toolbelt ]; - passthru.optional-dependencies = { + optional-dependencies = { async_require = [ httpx ]; xmlsec_require = [ xmlsec ]; }; @@ -68,7 +71,7 @@ buildPythonPackage rec { pytest-httpx pytestCheckHook requests-mock - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ # Failed: External connections not allowed during tests. diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index 8a61451a6221..7d6cc236f8f4 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "Ice" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://zeroc.com/"; license = licenses.gpl2; description = "Comprehensive RPC framework with support for Python, C++, .NET, Java, JavaScript and more"; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index c23d94c7af64..e9910213140e 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.133.0"; + version = "0.136.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-nS3zr+56K819GujzA4uLqcZJb4OxbAOV3FfxssDEEQA="; + hash = "sha256-q1Dk2lUiChjDFJeRCUqkPAIO1I+PsnvuLSx6UgXHPU4="; }; build-system = [ diff --git a/pkgs/development/python-modules/zeversolar/default.nix b/pkgs/development/python-modules/zeversolar/default.nix new file mode 100644 index 000000000000..5a28927a3ec3 --- /dev/null +++ b/pkgs/development/python-modules/zeversolar/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pytest-mock, + pytestCheckHook, + pythonOlder, + requests, + retry2, +}: + +buildPythonPackage rec { + pname = "zeversolar"; + version = "0.3.2"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "kvanzuijlen"; + repo = "zeversolar"; + rev = "refs/tags/${version}"; + hash = "sha256-HnF21B7k2MmugMjGIF2EKwwXJWD/WdDvPdz1oaPSS5Y="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + requests + retry2 + ]; + + nativeCheckInputs = [ + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "zeversolar" ]; + + meta = { + description = "Module to interact with the local CGI provided by ZeverSolar"; + homepage = "https://github.com/kvanzuijlen/zeversolar"; + changelog = "https://github.com/kvanzuijlen/zeversolar/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 7e9720163c8c..8946613f81b9 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.121"; + version = "0.0.124"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-+HDW07fFh47gW7xNaymylSt8TT2Vzz+6IWSPLtkk/Nw="; + hash = "sha256-dRO5fbvFMy3g/3wxGvVHJ5lPwyWOpnZ/0Qz5wM6Rii8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index f8c83870f9f1..2da990de3650 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.33"; + version = "0.0.37"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; rev = "refs/tags/${version}"; - hash = "sha256-qcXKHIiEm1wqcQKRH+TqgQMPZbLqNnBiR6dbmLwxW1Y="; + hash = "sha256-PY4TJIG5NtJdQuQYmoZG3NgcH3WfCkpkcoJTbJ5jdr0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index 04b8efb6f27f..edbba6c73050 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, pyserial, pyserial-asyncio, pytest-asyncio, @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.23.3"; + version = "0.24.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,20 +22,13 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-z/QulOkvkV/1Z+M7EfzdfGvrrtkapYcvfz+3AijR46k="; + hash = "sha256-CSXJcERqrPnCdlwyNSqSkxoiVhjNuL2GL4J6h2DMZY4="; }; - patches = [ - (fetchpatch2 { - url = "https://github.com/zigpy/zigpy-deconz/commit/86fdcd6be824f12ce3bf88b40217a6224cbf5a89.patch"; - hash = "sha256-iqpTSJPBMSBZXg5EVXXupxIFRsGCNuxU/oNHZ2VT0Jc="; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ - --replace ', "setuptools-git-versioning<2"' "" \ - --replace 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail ', "setuptools-git-versioning<2"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix index 0a3c11635f48..449632991f89 100644 --- a/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "zigpy-xbee"; - version = "0.20.2"; + version = "0.21.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-xbee"; rev = "refs/tags/${version}"; - hash = "sha256-d5TOX2sKA2E6b6KHvAdhxEknD6fOF4qRjCMpBKEsicA="; + hash = "sha256-Ep7pP2vcH9YpSrGPVDi3nc+WkQgBVS+NLmoQU0o0aQQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix index fc7d291bd2a9..a48feefb0730 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.13.1"; + version = "0.13.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-zigate"; rev = "refs/tags/${version}"; - hash = "sha256-Mwccb0OQgSknH8prbFejkGRVI7ii/r9D87aRyQrGgWs="; + hash = "sha256-MlAX7dcRZziMYCpG64OemZ8czwvDXpdoRaDVo1sUCno="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 98a7661f0483..628a688f0875 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.4"; + version = "0.13.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5DuqM7MgntV/3WquR+0Cr/vIwYL35ZVpGlNZPj92jJ4="; + hash = "sha256-6ApwGB6VvG+XiE8U85gg/EWnYniMb+1fqmNwtHGcf/I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index ed182e36c461..f20c1a004406 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.66.0"; + version = "0.71.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-Rv45WP6KxsFY/eGgNja5JSgmVKQWrRbP6K4tz6CFpMs="; + hash = "sha256-ctlbCtUiwLFlxja9F6Fz7m9FP/lJLS+7/+gWlMTo+1s="; }; postPatch = '' @@ -72,10 +72,14 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # assert quirked.quirk_metadata.quirk_location.endswith("zigpy/tests/test_quirks_v2.py]-line:104") is False - "test_quirks_v2" - ] ++ lib.optionals (stdenv.isLinux && stdenv.isx86_64) [ "test_periodic_scan_priority" ]; + disabledTests = + [ + # assert quirked.quirk_metadata.quirk_location.endswith("zigpy/tests/test_quirks_v2.py]-line:104") is False + "test_quirks_v2" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [ + "test_periodic_scan_priority" + ]; disabledTestPaths = [ # Tests require network access diff --git a/pkgs/development/python-modules/zipfile2/default.nix b/pkgs/development/python-modules/zipfile2/default.nix index 2d611e912c04..68b1af2e79bd 100644 --- a/pkgs/development/python-modules/zipfile2/default.nix +++ b/pkgs/development/python-modules/zipfile2/default.nix @@ -1,31 +1,43 @@ { + lib, buildPythonPackage, fetchFromGitHub, - lib, - pythonAtLeast, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "zipfile2"; - version = "0.0.12"; - format = "setuptools"; + version = "0.0.12-unstable-2024-09-28"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "cournape"; - repo = pname; - rev = "v${version}"; - hash = "sha256-BwcEgW4XrQqz0Jmtbyxf8q0mWTJXv2dL3Tk7N/IYuMI="; + repo = "zipfile2"; + #rev = "refs/tags/v${version}"; + rev = "8823f7253772e5c5811343306a591c00c764c6d0"; + hash = "sha256-jDOyIj0sQS1dIsar4nyk5V2mme3Zc6VTms49/4n93ho="; }; - patches = [ ./no-setuid.patch ]; + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "zipfile2" ]; + disabledTests = [ + # PermissionError: [Errno 1] Operation not ... + "test_extract" + ]; + meta = with lib; { - homepage = "https://github.com/cournape/zipfile2"; description = "Backwards-compatible improved zipfile class"; - maintainers = with maintainers; [ genericnerdyusername ]; + homepage = "https://github.com/cournape/zipfile2"; + changelog = "https://github.com/itziakos/zipfile2/releases/tag/v${version}"; license = licenses.psfl; - broken = pythonAtLeast "3.12"; # tests are failing because the signature of ZipInfo._decodeExtra changed + maintainers = with maintainers; [ genericnerdyusername ]; }; } diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index 07185aa568f4..273606c8f3a6 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -11,14 +11,14 @@ let zipp = buildPythonPackage rec { pname = "zipp"; - version = "3.19.2"; + version = "3.20.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vx3PZFD4c6E+lSopUEiHyJ5t51BiCeWxvMNGATXU3hk="; + hash = "sha256-vJ6yb0UG/aAbgbzeDKeBA7bmL5kbOB/sglQ1yDbtvCk="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/zipstream-ng/default.nix b/pkgs/development/python-modules/zipstream-ng/default.nix index b8f054c27840..fbc7038a49de 100644 --- a/pkgs/development/python-modules/zipstream-ng/default.nix +++ b/pkgs/development/python-modules/zipstream-ng/default.nix @@ -4,12 +4,13 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "zipstream-ng"; - version = "1.7.1"; - format = "setuptools"; + version = "1.8.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,9 +18,11 @@ buildPythonPackage rec { owner = "pR0Ps"; repo = "zipstream-ng"; rev = "refs/tags/v${version}"; - hash = "sha256-BYQse+DlyLUH9CofRfGrPUZjP7E8AP/wpirvJmSRfow="; + hash = "sha256-mmPxzml+gaVg2IQ/Gql+3ru0hHosbyX4WjLCMxD/MJw="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "zipstream" ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/zlib-ng/default.nix b/pkgs/development/python-modules/zlib-ng/default.nix index 697a8405ecbd..77b3743c0137 100644 --- a/pkgs/development/python-modules/zlib-ng/default.nix +++ b/pkgs/development/python-modules/zlib-ng/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "zlib-ng"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "pycompression"; repo = "python-zlib-ng"; rev = "v${version}"; - hash = "sha256-H8Niz6BbmNCccNKHBfRma4SUt0RY846fCiHidEvcd5E="; + hash = "sha256-UsdZgpRI7h6GemT1+1g/cP/8uhLykZ//saH4JMwwlY4="; }; patches = [ diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index e9d90b93e4b9..6b0b0a97b584 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -3,25 +3,41 @@ buildPythonPackage, pythonOlder, fetchPypi, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { pname = "zodbpickle"; - version = "4.0"; - format = "setuptools"; + version = "4.1.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-6FutlWDWCSpjW+vueKQ7DxySamaRK+OQ6IyrZvTewYA="; + hash = "sha256-38DJFe8Umd0GA5cPXBECxr1+t7asRkNLKabYQL8Cckg="; }; - # fails.. - doCheck = false; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "setuptools<74" "setuptools" + ''; + + build-system = [ setuptools ]; pythonImportsCheck = [ "zodbpickle" ]; + nativeCheckInputs = [ pytestCheckHook ]; + + # fails.. + disabledTests = [ + "test_dump" + "test_dumps" + "test_load" + "test_loads" + ]; + meta = with lib; { description = "Fork of Python's pickle module to work with ZODB"; homepage = "https://github.com/zopefoundation/zodbpickle"; diff --git a/pkgs/development/python-modules/zope-proxy/default.nix b/pkgs/development/python-modules/zope-proxy/default.nix index 958470fde845..cb204cc57753 100644 --- a/pkgs/development/python-modules/zope-proxy/default.nix +++ b/pkgs/development/python-modules/zope-proxy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zope-proxy"; - version = "5.2"; + version = "5.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "zope.proxy"; inherit version; - hash = "sha256-93fVbCqy/PQNAmraHmfx45z2MY497rmhzVCH/MsfKG4="; + hash = "sha256-rSTSjrxq3p++vgzEvcTsUNHe5BpFPjMa/SoSYL6Wdgg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/zpp/default.nix b/pkgs/development/python-modules/zpp/default.nix new file mode 100644 index 000000000000..c30a60fa6466 --- /dev/null +++ b/pkgs/development/python-modules/zpp/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + testers, + zpp, +}: +buildPythonPackage rec { + pname = "zpp"; + version = "1.1.0"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "jbigot"; + repo = "zpp"; + rev = "refs/tags/${version}"; + hash = "sha256-Jvh80TfOonZ57lb+4PulVOUKi9Y74nplIcrPzlUPw3M="; + }; + + build-system = [ setuptools ]; + + passthru = { + tests.version = testers.testVersion { package = zpp; }; + }; + + meta = { + description = "The 'Z' pre-processor, the last preprocessor you'll ever need"; + homepage = "https://github.com/jbigot/zpp"; + license = lib.licenses.mit; + mainProgram = "zpp"; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix index e76b19f95c41..e902ea024198 100644 --- a/pkgs/development/python-modules/zstandard/default.nix +++ b/pkgs/development/python-modules/zstandard/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "zstandard"; - version = "0.22.0"; + version = "0.23.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-giajPFQry1TNa9CjZgZ7YQtBcTtkyavsG8RTPWn1HnA="; + hash = "sha256-stjGLQjnJV9o96dAuuhbPJuOVGa6qcv39X8c3grGvAk="; }; propagatedNativeBuildInputs = [ cffi ]; diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index bb374e1ec42b..d2caa2c2f383 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.57.0"; + version = "0.58.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "zwave-js-server-python"; rev = "refs/tags/${version}"; - hash = "sha256-5Kvk73tRnHFi5YDzMmRj1r7gKuAPkecPF9q9L2qhAUI="; + hash = "sha256-hszt14ymZQsUg0zfJ7+cY08DlXNaWzxKwV/i4i29DtI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python2-modules/README.md b/pkgs/development/python2-modules/README.md new file mode 100644 index 000000000000..2d3a7cbb2b8e --- /dev/null +++ b/pkgs/development/python2-modules/README.md @@ -0,0 +1,7 @@ +# Python 2 is Not Supported + +Packages, applications, and services based on Python 2 are no longer supported and are being removed. If you require a Python 2 based package, you can include that package in your own local repository. + +Some packages may continue to be maintained for internal use by nixpkgs, but they should not be used by new public packages. + +For more details, see [Issue #201859](https://github.com/NixOS/nixpkgs/pull/201859). diff --git a/pkgs/development/python2-modules/cffi/default.nix b/pkgs/development/python2-modules/cffi/default.nix index adeda6e90d22..aa6f49f95e3c 100644 --- a/pkgs/development/python2-modules/cffi/default.nix +++ b/pkgs/development/python2-modules/cffi/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, cffi }: if cffi == null then null else cffi.overridePythonAttrs { - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # cannot load library 'c' "test_FILE" "test_FILE_object" diff --git a/pkgs/development/python2-modules/configparser/default.nix b/pkgs/development/python2-modules/configparser/default.nix index 5cb0e9cf8961..956c12f44c5d 100644 --- a/pkgs/development/python2-modules/configparser/default.nix +++ b/pkgs/development/python2-modules/configparser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; preConfigure = '' - export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 + export LC_ALL=${if stdenv.hostPlatform.isDarwin then "en_US" else "C"}.UTF-8 ''; meta = with lib; { diff --git a/pkgs/development/python2-modules/futures/default.nix b/pkgs/development/python2-modules/futures/default.nix index d1cdb679d0d1..5cad6c13029d 100644 --- a/pkgs/development/python2-modules/futures/default.nix +++ b/pkgs/development/python2-modules/futures/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { ${python.interpreter} test_futures.py ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Backport of the concurrent.futures package from Python 3.2"; diff --git a/pkgs/development/python2-modules/jinja2/default.nix b/pkgs/development/python2-modules/jinja2/default.nix index 3b593338763f..1b6948a66aad 100644 --- a/pkgs/development/python2-modules/jinja2/default.nix +++ b/pkgs/development/python2-modules/jinja2/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { # Multiple tests run out of stack space on 32bit systems with python2. # See https://github.com/pallets/jinja/issues/1158 # warnings are no longer being filtered correctly for python2 - doCheck = !stdenv.is32bit && isPy3k; + doCheck = !stdenv.hostPlatform.is32bit && isPy3k; checkPhase = '' pytest -v tests -W ignore::DeprecationWarning diff --git a/pkgs/development/python2-modules/more-itertools/default.nix b/pkgs/development/python2-modules/more-itertools/default.nix index 615b1d00d204..7a09dda8e9cd 100644 --- a/pkgs/development/python2-modules/more-itertools/default.nix +++ b/pkgs/development/python2-modules/more-itertools/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, nose +, unittestCheckHook , six , stdenv }: @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4"; }; - nativeCheckInputs = [ nose ]; + nativeCheckInputs = [ unittestCheckHook ]; propagatedBuildInputs = [ six ]; # iterable = range(10 ** 10) # Is efficiently reversible diff --git a/pkgs/development/python2-modules/pygobject/default.nix b/pkgs/development/python2-modules/pygobject/default.nix index 00c98fba39af..3202c6e6af76 100644 --- a/pkgs/development/python2-modules/pygobject/default.nix +++ b/pkgs/development/python2-modules/pygobject/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { outputs = [ "out" "devdoc" ]; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./pygobject-2.0-fix-darwin.patch (fetchpatch { url = "https://github.com/macports/macports-ports/raw/f2975d5bbbc2459c661905c5a850cc661fa32f55/python/py-gobject/files/py-gobject-dynamic_lookup-11.patch"; diff --git a/pkgs/development/python2-modules/pygtk/default.nix b/pkgs/development/python2-modules/pygtk/default.nix index 003474ee8582..68a7dba4c8e3 100644 --- a/pkgs/development/python2-modules/pygtk/default.nix +++ b/pkgs/development/python2-modules/pygtk/default.nix @@ -37,8 +37,8 @@ buildPythonPackage rec { buildPhase = "buildPhase"; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-ObjC" - + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) " -lpython2.7"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-ObjC" + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) " -lpython2.7"; installPhase = "installPhase"; diff --git a/pkgs/development/python2-modules/pytest/default.nix b/pkgs/development/python2-modules/pytest/default.nix index 0edfd3039112..fa086eb46c7c 100644 --- a/pkgs/development/python2-modules/pytest/default.nix +++ b/pkgs/development/python2-modules/pytest/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { find $out -name .pytest_cache -type d -exec rm -rf {} + } - preDistPhases+=" pytestcachePhase" + appendToVar preDistPhases pytestcachePhase # pytest generates it's own bytecode files to improve assertion messages. # These files similar to cpython's bytecode files but are never laoded @@ -55,7 +55,7 @@ buildPythonPackage rec { # https://github.com/pytest-dev/pytest/blob/4.6.11/src/_pytest/assertion/rewrite.py#L32-L47 find $out -name "*-PYTEST.py[co]" -delete } - preDistPhases+=" pytestRemoveBytecodePhase" + appendToVar preDistPhases pytestRemoveBytecodePhase ''; meta = with lib; { diff --git a/pkgs/development/r-modules/cran-packages.json b/pkgs/development/r-modules/cran-packages.json index 5026cbfc196a..5ab76e95d392 100644 --- a/pkgs/development/r-modules/cran-packages.json +++ b/pkgs/development/r-modules/cran-packages.json @@ -100653,8 +100653,8 @@ }, "ragg": { "name": "ragg", - "version": "1.3.2", - "sha256": "0cb9dcp47pl0nizwy0a2ml8hm11bhf7ay20j237hmmgx159a8dw0", + "version": "1.3.3", + "sha256": "sha256-QtuEX/GNZ8rm0pGDPHahNsHvArWyRtTZDB8a6Mwbsq8=", "depends": ["systemfonts", "textshaping"] }, "rags2ridges": { diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 43aacdddb6e6..37930d4c67b0 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -339,7 +339,8 @@ let adimpro = [ pkgs.imagemagick ]; animation = [ pkgs.which ]; Apollonius = with pkgs; [ pkg-config gmp.dev mpfr.dev ]; - arrow = with pkgs; [ pkg-config cmake ] ++ lib.optionals stdenv.isDarwin [ intltool ]; + arrow = with pkgs; [ pkg-config cmake ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ intltool ]; + alcyon = with pkgs; [ cmake which ]; audio = [ pkgs.portaudio ]; BayesSAE = [ pkgs.gsl ]; BayesVarSel = [ pkgs.gsl ]; @@ -363,7 +364,7 @@ let clarabel = [ pkgs.cargo ]; curl = [ pkgs.curl.dev ]; CytoML = [ pkgs.libxml2.dev ]; - data_table = with pkgs; [ pkg-config zlib.dev ] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; + data_table = with pkgs; [ pkg-config zlib.dev ] ++ lib.optional stdenv.hostPlatform.isDarwin pkgs.llvmPackages.openmp; devEMF = with pkgs; [ xorg.libXft.dev ]; diversitree = with pkgs; [ gsl fftw ]; exactextractr = [ pkgs.geos ]; @@ -423,8 +424,9 @@ let rvg = [ pkgs.libpng.dev ]; MAGEE = [ pkgs.zlib.dev pkgs.bzip2.dev ]; magick = [ pkgs.imagemagick.dev ]; - ModelMetrics = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; + ModelMetrics = lib.optional stdenv.hostPlatform.isDarwin pkgs.llvmPackages.openmp; mvabund = [ pkgs.gsl ]; + mcrPioda = [ pkgs.gsl ]; mwaved = [ pkgs.fftw.dev ]; mzR = with pkgs; [ zlib netcdf ]; nanonext = with pkgs; [ mbedtls nng ]; @@ -438,7 +440,7 @@ let pander = with pkgs; [ pandoc which ]; pbdMPI = [ pkgs.mpi ]; pbdPROF = [ pkgs.mpi ]; - pbdZMQ = [ pkgs.pkg-config ] ++ lib.optionals stdenv.isDarwin [ pkgs.which ]; + pbdZMQ = [ pkgs.pkg-config ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.which ]; pcaL1 = [ pkgs.pkg-config pkgs.clp ]; pdftools = [ pkgs.poppler.dev ]; PEPBVS = [ pkgs.gsl ]; @@ -455,6 +457,7 @@ let RcppGSL = [ pkgs.gsl ]; RcppZiggurat = [ pkgs.gsl ]; reprex = [ pkgs.which ]; + resultant = with pkgs; [ gmp.dev mpfr.dev pkg-config ]; rgdal = with pkgs; [ proj.dev gdal ]; Rhisat2 = [ pkgs.which pkgs.hostname ]; gdalcubes = [ pkgs.pkg-config ]; @@ -474,7 +477,7 @@ let RMySQL = with pkgs; [ zlib libmysqlclient openssl.dev ]; RNetCDF = with pkgs; [ netcdf udunits ]; RODBC = [ pkgs.libiodbc ]; - rpanel = [ pkgs.bwidget ]; + rpanel = [ pkgs.tclPackages.bwidget ]; Rpoppler = [ pkgs.poppler ]; RPostgres = with pkgs; [ postgresql ]; RPostgreSQL = with pkgs; [ postgresql postgresql ]; @@ -533,7 +536,7 @@ let V8 = [ pkgs.nodejs.libv8 ]; XBRL = with pkgs; [ zlib libxml2.dev ]; XLConnect = [ pkgs.jdk ]; - xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ]; + xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.perl ]; XML = with pkgs; [ libtool libxml2.dev xmlsec libxslt ]; affyPLM = [ pkgs.zlib.dev ]; BitSeq = [ pkgs.zlib.dev ]; @@ -579,6 +582,7 @@ let RcppCWB = [ pkgs.pkg-config pkgs.pcre2 ]; redux = [ pkgs.pkg-config ]; rswipl = with pkgs; [ cmake pkg-config ]; + scorematchingad = [ pkgs.cmake ]; rrd = [ pkgs.pkg-config ]; surveyvoi = [ pkgs.pkg-config ]; Rbwa = [ pkgs.zlib.dev ]; @@ -607,8 +611,8 @@ let unrtf = with pkgs; [ xz.dev bzip2.dev zlib.dev icu.dev libdeflate ]; nat = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ]; - pbdZMQ = [ pkgs.zeromq ] ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ]; - bigmemory = lib.optionals stdenv.isLinux [ pkgs.libuuid.dev ]; + pbdZMQ = [ pkgs.zeromq ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.darwin.binutils ]; + bigmemory = lib.optionals stdenv.hostPlatform.isLinux [ pkgs.libuuid.dev ]; bayesWatch = [ pkgs.boost.dev ]; clustermq = [ pkgs.pkg-config ]; coga = [ pkgs.gsl.dev ]; @@ -643,9 +647,10 @@ let gdalcubes = with pkgs; [ proj.dev gdal sqlite.dev netcdf ]; rsbml = [ pkgs.libsbml ]; SuperGauss = [ pkgs.pkg-config pkgs.fftw.dev]; + ravetools = with pkgs; [ pkg-config fftw.dev]; specklestar = [ pkgs.fftw.dev ]; cartogramR = [ pkgs.fftw.dev ]; - jqr = [ pkgs.jq.lib ]; + jqr = [ pkgs.jq.out ]; kza = [ pkgs.pkg-config ]; igraph = with pkgs; [ gmp libxml2.dev glpk ]; interpolation = [ pkgs.gmp ]; @@ -670,6 +675,7 @@ let Cairo = [ pkgs.pkg-config ]; CLVTools = [ pkgs.gsl ]; excursions = [ pkgs.gsl ]; + OpenCL = with pkgs; [ opencl-clhpp ocl-icd ]; gpuMagic = [ pkgs.ocl-icd ]; JMcmprsk = [ pkgs.gsl ]; KSgeneral = [ pkgs.fftw.dev ]; @@ -792,7 +798,7 @@ let DropletUtils = [ pkgs.zlib.dev ]; RMariaDB = [ pkgs.libmysqlclient.dev ]; ijtiff = [ pkgs.libtiff ]; - ragg = with pkgs; [ freetype.dev libpng.dev libtiff.dev zlib.dev libjpeg.dev bzip2.dev ] ++ lib.optional stdenv.isDarwin lerc.dev; + ragg = with pkgs; [ freetype.dev libpng.dev libtiff.dev zlib.dev libjpeg.dev bzip2.dev ] ++ lib.optional stdenv.hostPlatform.isDarwin lerc.dev; qqconf = [ pkgs.fftw.dev ]; spFW = [ pkgs.fftw.dev ]; qspray = with pkgs; [ gmp.dev mpfr.dev ]; @@ -801,7 +807,7 @@ let sphereTessellation = with pkgs; [ gmp.dev mpfr.dev ]; vapour = with pkgs; [ proj.dev gdal ]; MedianaDesigner = [ pkgs.zlib.dev ]; - ChemmineOB = [ pkgs.eigen ]; + ChemmineOB = with pkgs; [ eigen openbabel ]; DGP4LCF = [ pkgs.lapack pkgs.blas ]; }; @@ -1049,10 +1055,11 @@ let }); timeless = old.timeless.overrideAttrs (attrs: { + preConfigure = "patchShebangs configure"; cargoDeps = pkgs.rustPlatform.fetchCargoTarball { src = attrs.src; sourceRoot = "timeless/src/rust"; - hash = "sha256-n0/52CV3NzWe7T3N6VoaURMxWrnqeYaUMPKkUy+LRQs="; + hash = "sha256-AccuRY3lfTXzaMnaYieKCEJErKo5132oSXgILbFhePI="; }; cargoRoot = "src/rust"; @@ -1084,6 +1091,36 @@ let ''; }); + alcyon = old.alcyon.overrideAttrs (attrs: { + configureFlags = [ + "--enable-force-openmp" + ]; + }); + + lwgeom = old.lwgeom.overrideAttrs (attrs: { + configureFlags = [ + "--with-proj-lib=${pkgs.lib.getLib pkgs.proj}/lib" + ]; + }); + + sf = old.sf.overrideAttrs (attrs: { + configureFlags = [ + "--with-proj-lib=${pkgs.lib.getLib pkgs.proj}/lib" + ]; + }); + + terra = old.terra.overrideAttrs (attrs: { + configureFlags = [ + "--with-proj-lib=${pkgs.lib.getLib pkgs.proj}/lib" + ]; + }); + + vapour = old.vapour.overrideAttrs (attrs: { + configureFlags = [ + "--with-proj-lib=${pkgs.lib.getLib pkgs.proj}/lib" + ]; + }); + rzmq = old.rzmq.overrideAttrs (attrs: { preConfigure = "patchShebangs configure"; }); @@ -1220,7 +1257,7 @@ let ModelMetrics = old.ModelMetrics.overrideAttrs (attrs: { env = (attrs.env or { }) // { - NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + lib.optionalString stdenv.isDarwin " -fopenmp"; + NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + lib.optionalString stdenv.hostPlatform.isDarwin " -fopenmp"; }; }); @@ -1275,7 +1312,7 @@ let }); pbdZMQ = old.pbdZMQ.overrideAttrs (attrs: { - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' for file in R/*.{r,r.in}; do sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.cctools}/bin/\1"#g' $file done @@ -1442,9 +1479,9 @@ let rpanel = old.rpanel.overrideAttrs (attrs: { preConfigure = '' - export TCLLIBPATH="${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}" + export TCLLIBPATH="${pkgs.tclPackages.bwidget}/lib/bwidget${pkgs.tclPackages.bwidget.version}" ''; - TCLLIBPATH = "${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}"; + TCLLIBPATH = "${pkgs.tclPackages.bwidget}/lib/bwidget${pkgs.tclPackages.bwidget.version}"; }); networkscaleup = old.networkscaleup.overrideAttrs (attrs: { @@ -1564,29 +1601,26 @@ let PKGCONFIG_LIBS = "-Wl,-rpath,${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.openssl}/lib -L${pkgs.cyrus_sasl.out}/lib -L${pkgs.zlib.out}/lib -lssl -lcrypto -lsasl2 -lz"; }); - ChemmineOB = let - # R package doesn't compile with the latest (unstable) version. - # Override from nixpkgs-23.11 - openbabel3 = pkgs.openbabel.overrideAttrs (attrs: { - version = "3.1.1"; - src = pkgs.fetchFromGitHub { - owner = "openbabel"; - repo = "openbabel"; - rev = "openbabel-${lib.replaceStrings ["."] ["-"] attrs.version}"; - sha256 = "sha256-wQpgdfCyBAoh4pmj9j7wPTlMtraJ62w/EShxi/olVMY="; - }; - }); - in - old.ChemmineOB.overrideAttrs (attrs: { + ChemmineOB = old.ChemmineOB.overrideAttrs (attrs: { # pkg-config knows openbabel-3 without the .0 # Eigen3 is also looked for in the wrong location + # pointer was changed in newer version of openbabel: + # https://github.com/openbabel/openbabel/commit/305a6fd3183540e4a8ae1d79d10bf1860e6aa373 postPatch = '' substituteInPlace configure \ --replace-fail openbabel-3.0 openbabel-3 substituteInPlace src/Makevars.in \ --replace-fail "-I/usr/include/eigen3" "-I${pkgs.eigen}/include/eigen3" + substituteInPlace src/ChemmineOB.cpp \ + --replace-fail "obsharedptr<" "std::shared_ptr<" ''; - buildInputs = attrs.buildInputs ++ [openbabel3]; + + # copied from fastnlo-toolkit: + # None of our currently packaged versions of swig are C++17-friendly + # Use a workaround from https://github.com/swig/swig/issues/1538 + env = (attrs.env or { }) // { + NIX_CFLAGS_COMPILE = (attrs.env.NIX_CFLAGS_COMPILE or "") + lib.optionalString stdenv.hostPlatform.isDarwin " -D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES"; + }; }); ps = old.ps.overrideAttrs (attrs: { diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index ecbd78c4057d..6e3f93f52321 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation ({ buildInputs = buildInputs ++ [R gettext] ++ lib.optionals requireX [util-linux xvfb-run] ++ - lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran libiconv]; + lib.optionals stdenv.hostPlatform.isDarwin [Cocoa Foundation gfortran libiconv]; env.NIX_CFLAGS_COMPILE = - lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; enableParallelBuilding = true; diff --git a/pkgs/development/rocm-modules/5/llvm/base.nix b/pkgs/development/rocm-modules/5/llvm/base.nix index 914b7d827547..a8147d862e32 100644 --- a/pkgs/development/rocm-modules/5/llvm/base.nix +++ b/pkgs/development/rocm-modules/5/llvm/base.nix @@ -54,8 +54,8 @@ in let llvmNativeTarget = - if stdenv.isx86_64 then "X86" - else if stdenv.isAarch64 then "AArch64" + if stdenv.hostPlatform.isx86_64 then "X86" + else if stdenv.hostPlatform.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; inferNativeTarget = t: if t == "NATIVE" then llvmNativeTarget else t; llvmTargetsToBuild' = [ "AMDGPU" ] ++ builtins.map inferNativeTarget llvmTargetsToBuild; diff --git a/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix b/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix index f601e96f0a35..ad4981aa435b 100644 --- a/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix +++ b/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix @@ -6,5 +6,5 @@ callPackage ../base.nix { inherit stdenv rocmUpdateScript; requiredSystemFeatures = [ "big-parallel" ]; - isBroken = stdenv.isAarch64; # https://github.com/ROCm/ROCm/issues/1831#issuecomment-1278205344 + isBroken = stdenv.hostPlatform.isAarch64; # https://github.com/ROCm/ROCm/issues/1831#issuecomment-1278205344 } diff --git a/pkgs/development/rocm-modules/5/rocm-comgr/default.nix b/pkgs/development/rocm-modules/5/rocm-comgr/default.nix index 1ef226b338c4..ab43edf8a4b9 100644 --- a/pkgs/development/rocm-modules/5/rocm-comgr/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-comgr/default.nix @@ -10,8 +10,8 @@ let llvmNativeTarget = - if stdenv.isx86_64 then "X86" - else if stdenv.isAarch64 then "AArch64" + if stdenv.hostPlatform.isx86_64 then "X86" + else if stdenv.hostPlatform.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-comgr"; diff --git a/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix b/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix index 28af3e960266..3e769421548b 100644 --- a/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix @@ -9,8 +9,8 @@ let llvmNativeTarget = - if stdenv.isx86_64 then "X86" - else if stdenv.isAarch64 then "AArch64" + if stdenv.hostPlatform.isx86_64 then "X86" + else if stdenv.hostPlatform.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-device-libs"; diff --git a/pkgs/development/rocm-modules/5/rocminfo/default.nix b/pkgs/development/rocm-modules/5/rocminfo/default.nix index addbad038b94..fbeb2f7d7f2c 100644 --- a/pkgs/development/rocm-modules/5/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/5/rocminfo/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.ncsa; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = stdenv.isAarch64 || versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; + broken = stdenv.hostPlatform.isAarch64 || versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocmlir/default.nix b/pkgs/development/rocm-modules/5/rocmlir/default.nix index 73dbbf8f95f8..33d0ddb55604 100644 --- a/pkgs/development/rocm-modules/5/rocmlir/default.nix +++ b/pkgs/development/rocm-modules/5/rocmlir/default.nix @@ -27,8 +27,8 @@ let else ""; llvmNativeTarget = - if stdenv.isx86_64 then "X86" - else if stdenv.isAarch64 then "AArch64" + if stdenv.hostPlatform.isx86_64 then "X86" + else if stdenv.hostPlatform.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocmlir${suffix}"; diff --git a/pkgs/development/rocm-modules/6/llvm/base.nix b/pkgs/development/rocm-modules/6/llvm/base.nix index 1bbf16447549..b7a919c792ba 100644 --- a/pkgs/development/rocm-modules/6/llvm/base.nix +++ b/pkgs/development/rocm-modules/6/llvm/base.nix @@ -54,8 +54,8 @@ in let llvmNativeTarget = - if stdenv.isx86_64 then "X86" - else if stdenv.isAarch64 then "AArch64" + if stdenv.hostPlatform.isx86_64 then "X86" + else if stdenv.hostPlatform.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; inferNativeTarget = t: if t == "NATIVE" then llvmNativeTarget else t; llvmTargetsToBuild' = [ "AMDGPU" ] ++ builtins.map inferNativeTarget llvmTargetsToBuild; diff --git a/pkgs/development/rocm-modules/6/llvm/stage-1/llvm.nix b/pkgs/development/rocm-modules/6/llvm/stage-1/llvm.nix index f601e96f0a35..ad4981aa435b 100644 --- a/pkgs/development/rocm-modules/6/llvm/stage-1/llvm.nix +++ b/pkgs/development/rocm-modules/6/llvm/stage-1/llvm.nix @@ -6,5 +6,5 @@ callPackage ../base.nix { inherit stdenv rocmUpdateScript; requiredSystemFeatures = [ "big-parallel" ]; - isBroken = stdenv.isAarch64; # https://github.com/ROCm/ROCm/issues/1831#issuecomment-1278205344 + isBroken = stdenv.hostPlatform.isAarch64; # https://github.com/ROCm/ROCm/issues/1831#issuecomment-1278205344 } diff --git a/pkgs/development/rocm-modules/6/rocm-comgr/default.nix b/pkgs/development/rocm-modules/6/rocm-comgr/default.nix index c610b63abf68..033de08af11b 100644 --- a/pkgs/development/rocm-modules/6/rocm-comgr/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-comgr/default.nix @@ -10,8 +10,8 @@ let llvmNativeTarget = - if stdenv.isx86_64 then "X86" - else if stdenv.isAarch64 then "AArch64" + if stdenv.hostPlatform.isx86_64 then "X86" + else if stdenv.hostPlatform.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-comgr"; diff --git a/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix b/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix index defcf2e60ecb..c55ba960fc61 100644 --- a/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix @@ -9,8 +9,8 @@ let llvmNativeTarget = - if stdenv.isx86_64 then "X86" - else if stdenv.isAarch64 then "AArch64" + if stdenv.hostPlatform.isx86_64 then "X86" + else if stdenv.hostPlatform.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-device-libs"; diff --git a/pkgs/development/rocm-modules/6/rocminfo/default.nix b/pkgs/development/rocm-modules/6/rocminfo/default.nix index cb1df3f1fd43..f53dcf19b96b 100644 --- a/pkgs/development/rocm-modules/6/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/6/rocminfo/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.ncsa; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = stdenv.isAarch64 || versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "7.0.0"; + broken = stdenv.hostPlatform.isAarch64 || versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "7.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/6/rocmlir/default.nix b/pkgs/development/rocm-modules/6/rocmlir/default.nix index d8747009a10e..efc33fd8468a 100644 --- a/pkgs/development/rocm-modules/6/rocmlir/default.nix +++ b/pkgs/development/rocm-modules/6/rocmlir/default.nix @@ -28,8 +28,8 @@ let else ""; llvmNativeTarget = - if stdenv.isx86_64 then "X86" - else if stdenv.isAarch64 then "AArch64" + if stdenv.hostPlatform.isx86_64 then "X86" + else if stdenv.hostPlatform.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocmlir${suffix}"; diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix deleted file mode 100644 index c144149da290..000000000000 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, buildRubyGem, ruby, writeScript, testers, bundler }: - -buildRubyGem rec { - inherit ruby; - name = "${gemName}-${version}"; - gemName = "bundler"; - version = "2.5.16"; - source.sha256 = "sha256-h7oDOPQNWSinmxqwZ4Z6Ns3lgTXQi2MmfvY5eVuVmDo="; - dontPatchShebangs = true; - - postFixup = '' - sed -i -e "s/activate_bin_path/bin_path/g" $out/bin/bundle - ''; - - passthru = { - updateScript = writeScript "gem-update-script" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl common-updater-scripts jq - - set -eu -o pipefail - - latest_version=$(curl -s https://rubygems.org/api/v1/gems/${gemName}.json | jq --raw-output .version) - update-source-version ${gemName} "$latest_version" - ''; - tests.version = testers.testVersion { - package = bundler; - command = "bundler -v"; - version = version; - }; - }; - - meta = with lib; { - description = "Manage your Ruby application's gem dependencies"; - homepage = "https://bundler.io"; - changelog = "https://github.com/rubygems/rubygems/blob/bundler-v${version}/bundler/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ anthonyroussel ]; - mainProgram = "bundler"; - }; -} diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index eb55255191cf..f358d47e2193 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -20,14 +20,14 @@ { 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, lerc, buildRubyGem +, cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre2, gecode_3, curl +, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, 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 , bundler, libsass, dart-sass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie , CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libepoxy, libxkbcommon, libmaxminddb, libyaml -, cargo, rustc, rustPlatform +, cargo, rustc, rustPlatform, libsysprof-capture , autoSignDarwinBinariesHook }@args: @@ -49,7 +49,7 @@ in atk = attrs: { dependencies = attrs.dependencies ++ [ "gobject-introspection" ]; nativeBuildInputs = [ rake bundler pkg-config ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 atk ]; }; @@ -70,14 +70,14 @@ in cairo = attrs: { nativeBuildInputs = [ pkg-config ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ gtk2 pcre2 xorg.libpthreadstubs xorg.libXdmcp]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; + buildInputs = [ cairo expat glib libsysprof-capture pcre2 xorg.libpthreadstubs xorg.libXdmcp ]; }; cairo-gobject = attrs: { nativeBuildInputs = [ pkg-config ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ cairo expat pcre2 xorg.libpthreadstubs xorg.libXdmcp ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; + buildInputs = [ cairo expat libsysprof-capture pcre2 xorg.libpthreadstubs xorg.libXdmcp ]; }; charlock_holmes = attrs: { @@ -238,13 +238,13 @@ in gdk_pixbuf2 = attrs: { nativeBuildInputs = [ pkg-config bundler rake ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 gdk-pixbuf ]; }; gdk3 = attrs: { nativeBuildInputs = [ pkg-config bundler rake ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 gdk-pixbuf cairo ]; }; @@ -256,8 +256,8 @@ in gio2 = attrs: { nativeBuildInputs = [ pkg-config gobject-introspection ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ gtk2 pcre pcre2 ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; + buildInputs = [ glib libsysprof-capture pcre2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux libselinux libsepol ]; }; gitlab-markup = attrs: { meta.priority = 1; }; @@ -335,7 +335,7 @@ in rustc.unwrapped ]; preBuild = '' - cat ../.cargo/config > ext/fast_mmaped_file_rs/.cargo/config.toml + cat ../.cargo/config.toml > ext/fast_mmaped_file_rs/.cargo/config.toml sed -i "s|cargo-vendor-dir|$PWD/../cargo-vendor-dir|" ext/fast_mmaped_file_rs/.cargo/config.toml ''; postInstall = '' @@ -345,41 +345,19 @@ in glib2 = attrs: { nativeBuildInputs = [ pkg-config ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ gtk2 pcre2 ]; - }; - - gtk2 = attrs: { - nativeBuildInputs = [ - binutils pkg-config - ] ++ lib.optionals stdenv.isLinux [ - util-linux libselinux libsepol - ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - propagatedBuildInputs = [ - atk - gdk-pixbuf - fribidi - gobject-introspection - gtk2 - harfbuzz - libdatrie - libthai - pcre pcre2 - xorg.libpthreadstubs - xorg.libXdmcp - ]; - dontStrip = stdenv.isDarwin; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; + buildInputs = [ glib libsysprof-capture pcre2 ]; }; gtk3 = attrs: { nativeBuildInputs = [ binutils pkg-config - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux libselinux libsepol - ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; propagatedBuildInputs = [ atk gdk-pixbuf @@ -390,8 +368,8 @@ in harfbuzz lerc libdatrie + libsysprof-capture libthai - pcre pcre2 xorg.libpthreadstubs xorg.libXdmcp @@ -399,13 +377,13 @@ in libxkbcommon libepoxy ]; - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; }; gobject-introspection = attrs: { - nativeBuildInputs = [ pkg-config pcre2 ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 glib ]; + nativeBuildInputs = [ pkg-config ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; + propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 glib pcre2 libsysprof-capture ]; }; gollum = attrs: { @@ -425,8 +403,8 @@ in grpc = attrs: { nativeBuildInputs = [ pkg-config ] - ++ lib.optional stdenv.isDarwin cctools - ++ lib.optional (lib.versionAtLeast attrs.version "1.53.0" && stdenv.isDarwin && stdenv.isAarch64) autoSignDarwinBinariesHook; + ++ lib.optional stdenv.hostPlatform.isDarwin cctools + ++ lib.optional (lib.versionAtLeast attrs.version "1.53.0" && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) autoSignDarwinBinariesHook; buildInputs = [ openssl ]; hardeningDisable = [ "format" ]; env.NIX_CFLAGS_COMPILE = toString [ @@ -443,7 +421,7 @@ in postPatch = '' substituteInPlace Makefile \ --replace '-Wno-invalid-source-encoding' "" - '' + lib.optionalString (lib.versionOlder attrs.version "1.53.0" && stdenv.isDarwin) '' + '' + lib.optionalString (lib.versionOlder attrs.version "1.53.0" && stdenv.hostPlatform.isDarwin) '' # For < v1.48.0 substituteInPlace src/ruby/ext/grpc/extconf.rb \ --replace "ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/" "" @@ -454,7 +432,7 @@ in }; hitimes = attrs: { - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; }; hpricot = attrs: { @@ -467,7 +445,7 @@ in iconv = attrs: { dontBuild = false; - buildFlags = lib.optionals stdenv.isDarwin [ + buildFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--with-iconv-dir=${lib.getLib libiconv}" "--with-iconv-include=${lib.getDev libiconv}/include" ]; @@ -524,7 +502,7 @@ in buildFlags = [ "--with-xml2-lib=${libxml2.out}/lib" "--with-xml2-include=${libxml2.dev}/include/libxml2" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-iconv-dir=${lib.getLib libiconv}" "--with-opt-include=${lib.getDev libiconv}/include" ]; @@ -565,7 +543,7 @@ in # For some reason 'mathematical.so' is missing cairo, glib, and # lasem in its RPATH, add them explicitly here - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' soPath="$out/${ruby.gemPath}/gems/mathematical-${attrs.version}/lib/mathematical/mathematical.so" rpath="$(patchelf --print-rpath "$soPath")" patchelf --set-rpath "${lib.makeLibraryPath [ lasem glib cairo ]}:$rpath" "$soPath" @@ -618,12 +596,17 @@ in "--with-xslt-include=${libxslt.dev}/include" "--with-exslt-lib=${libxslt.out}/lib" "--with-exslt-include=${libxslt.dev}/include" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-iconv-dir=${libiconv}" "--with-opt-include=${libiconv}/include" ]; - } // lib.optionalAttrs stdenv.isDarwin { + } // lib.optionalAttrs stdenv.hostPlatform.isDarwin { buildInputs = [ libxml2 ]; + + # libxml 2.12 upgrade requires these fixes + # https://github.com/sparklemotion/nokogiri/pull/3032 + # which don't trivially apply to older versions + meta.broken = (lib.versionOlder attrs.version "1.16.0") && (lib.versionAtLeast libxml2.version "2.12"); }); openssl = attrs: { @@ -648,15 +631,10 @@ in pango = attrs: { nativeBuildInputs = [ pkg-config - fribidi - harfbuzz - pcre pcre2 - xorg.libpthreadstubs - xorg.libXdmcp - ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ libdatrie libthai ] - ++ lib.optionals stdenv.isLinux [ libselinux libsepol util-linux ]; - propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 gtk2 ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; + buildInputs = [ libdatrie libthai fribidi harfbuzz libsysprof-capture pcre2 xorg.libpthreadstubs xorg.libXdmcp ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libselinux libsepol util-linux ]; + propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 ]; }; patron = attrs: { @@ -791,7 +769,7 @@ in }; rugged = attrs: { - nativeBuildInputs = [ cmake pkg-config which ] ++ lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = [ cmake pkg-config which ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; buildInputs = [ openssl libssh2 zlib ]; dontUseCmakeConfigure = true; }; @@ -816,7 +794,7 @@ in ''; }; - scrypt = attrs: lib.optionalAttrs stdenv.isDarwin { + scrypt = attrs: lib.optionalAttrs stdenv.hostPlatform.isDarwin { dontBuild = false; postPatch = '' sed -i -e "s/-arch i386//" Rakefile ext/scrypt/Rakefile @@ -919,6 +897,6 @@ in }; zookeeper = attrs: { - buildInputs = lib.optionals stdenv.isDarwin [ cctools ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; }; } diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index b2bb43736657..5ed890f8ec48 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { buildInputs = [ ruby - ] ++ lib.optionals stdenv.isDarwin [ libobjc ] + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc ] ++ buildInputs; #name = builtins.trace (attrs.name or "no attr.name" ) "${namePrefix}${gemName}-${version}"; diff --git a/pkgs/development/ruby-modules/rbenv/default.nix b/pkgs/development/ruby-modules/rbenv/default.nix deleted file mode 100644 index 6c080f4f2181..000000000000 --- a/pkgs/development/ruby-modules/rbenv/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles }: - -stdenv.mkDerivation rec { - pname = "rbenv"; - version = "1.2.0"; - - nativeBuildInputs = [ installShellFiles ]; - - src = fetchFromGitHub { - owner = "rbenv"; - repo = "rbenv"; - rev = "v${version}"; - sha256 = "sha256-m/Yy5EK8pLTBFcsgKCrNvQrPFFIlYklXXZbjN4Nmm9c="; - }; - - postPatch = '' - patchShebangs src/configure - pushd src - ''; - - installPhase = '' - popd - mkdir -p $out/bin - mv libexec $out - ln -s $out/libexec/rbenv $out/bin/rbenv - - installShellCompletion completions/rbenv.{bash,zsh} - ''; - - meta = with lib; { - description = "Groom your app’s Ruby environment"; - mainProgram = "rbenv"; - longDescription = '' - Use rbenv to pick a Ruby version for your application and guarantee that your development environment matches production. - Put rbenv to work with Bundler for painless Ruby upgrades and bulletproof deployments. - ''; - homepage = "https://github.com/rbenv/rbenv"; - license = licenses.mit; - maintainers = with maintainers; [ fzakaria ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix deleted file mode 100644 index b0ad8d4ec1b0..000000000000 --- a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, guile -, autoreconfHook -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "scheme-bytestructures"; - version = "2.0.2"; - - src = fetchFromGitHub { - owner = "TaylanUB"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-7FK1dXD1Qz6fFYjNUtHMaDGaezHLVaDvdgOboNNw0Lc="; - }; - - strictDeps = true; - nativeBuildInputs = [ - autoreconfHook guile pkg-config - ]; - buildInputs = [ - guile - ]; - - doCheck = true; - makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; - - # In procedure bytevector-u8-ref: Argument 2 out of range - dontStrip = stdenv.isDarwin; - - meta = with lib; { - description = "Structured access to bytevector contents"; - homepage = "https://github.com/TaylanUB/scheme-bytestructures"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ethancedwards8 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/skaware-packages/build-skaware-package.nix b/pkgs/development/skaware-packages/build-skaware-package.nix index 4e912e3af2e8..abad54414566 100644 --- a/pkgs/development/skaware-packages/build-skaware-package.nix +++ b/pkgs/development/skaware-packages/build-skaware-package.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation { # We assume every nix-based cross target has urandom. # This might not hold for e.g. BSD. "--with-sysdep-devurandom=yes" - (if stdenv.isDarwin + (if stdenv.hostPlatform.isDarwin then "--disable-shared" else "--enable-shared") ] @@ -93,7 +93,7 @@ stdenv.mkDerivation { # Explicitly setting target ensures code can be compiled against a skalibs # binary built on a different version of darwin. # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph - ++ (lib.optional stdenv.isDarwin + ++ (lib.optional stdenv.hostPlatform.isDarwin "--build=${stdenv.hostPlatform.system}"); inherit postConfigure; diff --git a/pkgs/development/skaware-packages/execline/default.nix b/pkgs/development/skaware-packages/execline/default.nix index 1b995df6d485..eb552cd23957 100644 --- a/pkgs/development/skaware-packages/execline/default.nix +++ b/pkgs/development/skaware-packages/execline/default.nix @@ -1,14 +1,14 @@ { lib, skawarePackages, skalibs }: let - version = "2.9.6.0"; + version = "2.9.6.1"; in skawarePackages.buildPackage { inherit version; pname = "execline"; # ATTN: also check whether there is a new manpages version - sha256 = "uion6Xxetr18pqCYeokl5ERlpb6ZbaoNGPj+yjfXVxo="; + sha256 = "sha256-dpGdYvLeTbGsSzpZ7rPg4JtivN2a3ROuPy2tJvjw5co="; # Maintainer of manpages uses following versioning scheme: for every # upstream $version he tags manpages release as ${version}.1, and, @@ -16,8 +16,8 @@ in skawarePackages.buildPackage { # ${version}.3 and so on are created. manpages = skawarePackages.buildManPages { pname = "execline-man-pages"; - version = "2.9.6.0.1"; - sha256 = "0lyX3rIUZ2JqWioRSm22uDS+q9ONkwIZxfR5E2pSDC4="; + version = "2.9.6.1.1"; + sha256 = "sha256-bj+74zTkGKLdLEb1k4iHfNI1lAuxLBASc5++m17Y0O8="; description = "Port of the documentation for the execline suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; }; diff --git a/pkgs/development/skaware-packages/skalibs/default.nix b/pkgs/development/skaware-packages/skalibs/default.nix index 8af02e348312..f473135c70c5 100644 --- a/pkgs/development/skaware-packages/skalibs/default.nix +++ b/pkgs/development/skaware-packages/skalibs/default.nix @@ -6,8 +6,8 @@ skawarePackages.buildPackage { pname = "skalibs"; - version = "2.14.2.0"; - sha256 = "sha256-3f7Fcw5bLxnQOB7Pf3lrOabkcyNr2grY03dqP+ewfkM="; + version = "2.14.3.0"; + sha256 = "sha256-oUqlWMmwmwYvoWrOxiOyyPk9afXLpNB/bQxYkTBmxCc="; description = "Set of general-purpose C programming libraries"; diff --git a/pkgs/development/skaware-packages/tipidee/default.nix b/pkgs/development/skaware-packages/tipidee/default.nix index 4df0a2e2a3bb..de3557d58f76 100644 --- a/pkgs/development/skaware-packages/tipidee/default.nix +++ b/pkgs/development/skaware-packages/tipidee/default.nix @@ -35,5 +35,5 @@ skawarePackages.buildPackage { mv examples $doc/share/doc/tipidee/examples ''; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; } diff --git a/pkgs/development/tcl-modules/by-name/README.md b/pkgs/development/tcl-modules/by-name/README.md new file mode 100644 index 000000000000..c65310524c1c --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/README.md @@ -0,0 +1,17 @@ +# Name-based Tcl package directories + +The structure of this directory is identical to the one described in +[/pkgs/by-name/README.md](../../../by-name/README.md). +The only difference is the scope: + +```nix +{ lib +# You can get tclPackages attributes directly +, mkTclDerivation +, tcllib +}: + +mkTclDerivation { + # ... +} +``` diff --git a/pkgs/development/tcl-modules/by-name/bw/bwidget/package.nix b/pkgs/development/tcl-modules/by-name/bw/bwidget/package.nix new file mode 100644 index 000000000000..161324f9e6e0 --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/bw/bwidget/package.nix @@ -0,0 +1,27 @@ +{ lib, fetchurl, mkTclDerivation, tk }: + +mkTclDerivation rec { + pname = "bwidget"; + version = "1.10.0"; + + src = fetchurl { + url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; + sha256 = "sha256-61sCvsua+Iv3SldHhd4eMpzzCjZ5EVMJOnkRT6xRw60="; + }; + + dontBuild = true; + propagatedBuildInputs = [ tk ]; + + installPhase = '' + mkdir -p "$out/lib/bwidget${version}" + cp -R *.tcl lang images "$out/lib/bwidget${version}" + ''; + + meta = { + homepage = "https://sourceforge.net/projects/tcllib"; + description = "High-level widget set for Tcl/Tk"; + maintainers = with lib.maintainers; [ agbrooks ]; + license = lib.licenses.tcltk; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/tcl-modules/by-name/ex/expect/0004-enable-cross-compilation.patch b/pkgs/development/tcl-modules/by-name/ex/expect/0004-enable-cross-compilation.patch new file mode 100644 index 000000000000..c09623d292b2 --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/ex/expect/0004-enable-cross-compilation.patch @@ -0,0 +1,295 @@ +From: Andrew Ruder <andrew.ruder@elecsyscorp.com> +Subject: [PATCH] enable cross compilation for expect + +This patch was created by running ./configure on a modern Linux machine +and inserting the results into the cross compilation section of +each AC_MSG_CHECKING that bombed out with an error. + +Signed-off-by: Andrew Ruder <andrew.ruder@elecsyscorp.com> + +-- + +The original patch, and description above, is originally from +https://github.com/buildroot/buildroot/blob/master/package/expect/0001-enable-cross-compilation.patch + +This patch has been further modified to not hard-code Linux assumptions. + +--- + +Index: expect-5.45/configure.in +=================================================================== +--- expect-5.45.orig/configure.in 2013-11-14 07:59:58.732100595 -0600 ++++ expect-5.45/configure.in 2013-11-14 07:59:58.732100595 -0600 +@@ -6,10 +6,12 @@ + AC_INIT([expect],[5.45.4]) + + TEA_INIT([3.9]) + + AC_CONFIG_AUX_DIR(tclconfig) ++ ++AC_LANG([C]) + + #-------------------------------------------------------------------- + # Configure script for package 'Expect'. + # TEA compliant. + #-------------------------------------------------------------------- +@@ -465,26 +467,20 @@ + # Some systems only define WNOHANG if _POSIX_SOURCE is defined + # The following merely tests that sys/wait.h can be included + # and if so that WNOHANG is not defined. The only place I've + # seen this is ISC. + AC_MSG_CHECKING([if WNOHANG requires _POSIX_SOURCE]) +-AC_TRY_RUN([ ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include <sys/wait.h> +-int +-main() { + #ifndef WNOHANG +- return 0; +-#else +- return 1; ++# error "WNOHANG requires _POSIX_SOURCE to be defined" + #endif +-}], ++]])], + AC_MSG_RESULT(yes) + AC_DEFINE(WNOHANG_REQUIRES_POSIX_SOURCE) + , + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + AC_MSG_CHECKING([if any value exists for WNOHANG]) + rm -rf wnohang + AC_TRY_RUN([ +@@ -504,11 +501,12 @@ + rm -f wnohang + , + AC_MSG_RESULT(no) + AC_DEFINE(WNOHANG_BACKUP_VALUE, 1) + , +- AC_MSG_ERROR([Expect can't be cross compiled]) ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(WNOHANG_BACKUP_VALUE, 1) + ) + + # + # check how signals work + # +@@ -572,11 +570,11 @@ + }], + AC_MSG_RESULT(yes) + AC_DEFINE(REARM_SIG) + , + AC_MSG_RESULT(no) +-, AC_MSG_WARN([Expect can't be cross compiled]) ++, AC_MSG_RESULT(no) + ) + + # HPUX7 has trouble with the big cat so split it + # Owen Rees <rtor@ansa.co.uk> 29Mar93 + SEDDEFS="${SEDDEFS}CONFEOF +@@ -710,25 +708,19 @@ + AC_DEFINE(POSIX) + fi + + # first check for the pure bsd + AC_MSG_CHECKING([for struct sgttyb]) +-AC_TRY_RUN([ ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include <sgtty.h> +-int +-main() +-{ +- struct sgttyb tmp; +- return 0; +-}], ++static struct sgttyb tmp; ++]])], + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SGTTYB) + PTY_TYPE=sgttyb + , + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + # mach systems have include files for unimplemented features + # so avoid doing following test on those systems + if test $mach -eq 0 ; then +@@ -735,116 +728,88 @@ + # next check for the older style ttys + # note that if we detect termio.h (only), we still set PTY_TYPE=termios + # since that just controls which of pty_XXXX.c file is use and + # pty_termios.c is set up to handle pty_termio. + AC_MSG_CHECKING([for struct termio]) +- AC_TRY_RUN([#include <termio.h> +- int +- main() +- { +- struct termio tmp; +- return 0; +- }], ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ++#include <termio.h> ++static struct termio tmp; ++]])], + AC_DEFINE(HAVE_TERMIO) + PTY_TYPE=termios + AC_MSG_RESULT(yes) + , + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + # now check for the new style ttys (not yet posix) + AC_MSG_CHECKING([for struct termios]) +- AC_TRY_RUN([ +- /* including termios.h on Solaris 5.6 fails unless inttypes.h included */ +-# ifdef HAVE_INTTYPES_H ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ++/* including termios.h on Solaris 5.6 fails unless inttypes.h included */ ++#ifdef HAVE_INTTYPES_H + # include <inttypes.h> +-# endif +-# include <termios.h> +- int +- main() +- { +- struct termios tmp; +- return 0; +- }], ++#endif ++#include <termios.h> ++static struct termios tmp; ++]])], + AC_DEFINE(HAVE_TERMIOS) + PTY_TYPE=termios + AC_MSG_RESULT(yes) + , + AC_MSG_RESULT(no) +- , +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + fi + + AC_MSG_CHECKING([if TCGETS or TCGETA in termios.h]) +-AC_TRY_RUN([ ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + /* including termios.h on Solaris 5.6 fails unless inttypes.h included */ + #ifdef HAVE_INTTYPES_H +-#include <inttypes.h> ++# include <inttypes.h> + #endif + #include <termios.h> +-int +-main() { +-#if defined(TCGETS) || defined(TCGETA) +- return 0; +-#else +- return 1; ++# ++#if !(defined(TCGETS) || defined(TCGETA)) ++# error "missing both of TCGETS and TCGETA" + #endif +-}], ++]])], + AC_DEFINE(HAVE_TCGETS_OR_TCGETA_IN_TERMIOS_H) + AC_MSG_RESULT(yes) + , + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + AC_MSG_CHECKING([if TIOCGWINSZ in termios.h]) +-AC_TRY_RUN([ ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + /* including termios.h on Solaris 5.6 fails unless inttypes.h included */ + #ifdef HAVE_INTTYPES_H +-#include <inttypes.h> ++# include <inttypes.h> + #endif + #include <termios.h> +-int +-main() { +-#ifdef TIOCGWINSZ +- return 0; +-#else +- return 1; ++ ++#ifndef TIOCGWINSZ ++# error "missing TIOCGWINSZ" + #endif +-}], ++]])], + AC_DEFINE(HAVE_TIOCGWINSZ_IN_TERMIOS_H) + AC_MSG_RESULT(yes) + , + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + # finally check for Cray style ttys + AC_MSG_CHECKING([for Cray-style ptys]) + SETUID=":" +-AC_TRY_RUN([ +-int +-main(){ +-#ifdef CRAY +- return 0; +-#else +- return 1; ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ++#ifndef CRAY ++# error "CRAY is not defined" + #endif +-} +-], ++]])], + PTY_TYPE=unicos + SETUID="chmod u+s" + AC_MSG_RESULT(yes) + , + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + # + # Check for select and/or poll. If both exist, we prefer select. + # if neither exists, define SIMPLE_EVENT. +@@ -873,26 +842,24 @@ + + # + # check for timezones + # + AC_MSG_CHECKING([for SV-style timezone]) +-AC_TRY_RUN([ ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + extern char *tzname[2]; + extern int daylight; + int + main() + { + int *x = &daylight; + char **y = tzname; + + return 0; +-}], ++}]])], + AC_DEFINE(HAVE_SV_TIMEZONE) + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + + # Following comment stolen from Tcl's configure.in: + # Note: in the following variable, it's important to use the absolute + diff --git a/pkgs/development/tcl-modules/by-name/ex/expect/fix-build-time-run-tcl.patch b/pkgs/development/tcl-modules/by-name/ex/expect/fix-build-time-run-tcl.patch new file mode 100644 index 000000000000..8edc4bea39d6 --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/ex/expect/fix-build-time-run-tcl.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in 2022-09-07 21:46:37.090519258 +0200 ++++ b/Makefile.in 2022-09-07 21:46:21.462592279 +0200 +@@ -380,7 +380,7 @@ + cp $(DIST_ROOT)/$(PKG_DIR).tar.gz $(top_builddir) + + $(SCRIPTS): +- $(TCLSH) $(srcdir)/fixline1 $(SHORT_BINDIR) < $(srcdir)/example/$@ > $@ ++ @tcl@ $(srcdir)/fixline1 $(SHORT_BINDIR) < $(srcdir)/example/$@ > $@ + + ## We cannot use TCL_LIBS below (after TCL_LIB_SPEC) because its + ## expansion references the contents of LIBS, which contains linker diff --git a/pkgs/development/tcl-modules/by-name/ex/expect/fix-darwin-bsd-clang16.patch b/pkgs/development/tcl-modules/by-name/ex/expect/fix-darwin-bsd-clang16.patch new file mode 100644 index 000000000000..a0e11a5f9d6b --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/ex/expect/fix-darwin-bsd-clang16.patch @@ -0,0 +1,36 @@ +diff -ur a/exp_win.c b/exp_win.c +--- a/exp_win.c 2018-02-02 14:15:52.000000000 -0500 ++++ b/exp_win.c 2023-10-10 07:47:33.082690432 -0400 +@@ -39,7 +39,8 @@ + /* Sigh. On AIX 2.3, termios.h exists but does not define TIOCGWINSZ */ + /* Instead, it has to come from ioctl.h. However, As I said above, this */ + /* can't be cavalierly included on all machines, even when it exists. */ +-#if defined(HAVE_TERMIOS) && !defined(HAVE_TIOCGWINSZ_IN_TERMIOS_H) ++/* Darwin also has termios.h, but it requires ioctl.h for `ioctl`. */ ++#if defined(HAVE_TERMIOS) && (defined(__APPLE__) || !defined(HAVE_TIOCGWINSZ_IN_TERMIOS_H)) + # include <sys/ioctl.h> + #endif + +diff -ur d/pty_termios.c c/pty_termios.c +--- d/pty_termios.c 2023-10-10 07:59:23.244452442 -0400 ++++ c/pty_termios.c 2023-10-10 08:00:35.303231582 -0400 +@@ -7,7 +7,18 @@ + + */ + +-#include <pty.h> /* openpty */ ++/* openpty */ ++#if defined(__APPLE__) ++# include <util.h> ++#elif defined(__FreeBSD__) ++# include <sys/types.h> ++# include <sys/ioctl.h> ++# include <termios.h> ++# include <libutil.h> ++#else /* pty.h is Linux-specific */ ++# include <pty.h> ++#endif ++ + #include <stdio.h> + #include <signal.h> + diff --git a/pkgs/development/tcl-modules/by-name/ex/expect/freebsd-unversioned.patch b/pkgs/development/tcl-modules/by-name/ex/expect/freebsd-unversioned.patch new file mode 100644 index 000000000000..345fa4f6277f --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/ex/expect/freebsd-unversioned.patch @@ -0,0 +1,14 @@ +--- expect5.45.4/tclconfig/tcl.m4.orig 2024-05-29 11:24:56.150656190 -0700 ++++ expect5.45.4/tclconfig/tcl.m4 2024-05-29 11:25:22.850790934 -0700 +@@ -1643,11 +1643,6 @@ + LIBS=`echo $LIBS | sed s/-pthread//` + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + LDFLAGS="$LDFLAGS $PTHREAD_LIBS"]) +- # Version numbers are dot-stripped by system policy. +- TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` +- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' +- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' +- TCL_LIB_VERSIONS_OK=nodots + ;; + Darwin-*) + CFLAGS_OPTIMIZE="-Os" diff --git a/pkgs/development/tcl-modules/by-name/ex/expect/package.nix b/pkgs/development/tcl-modules/by-name/ex/expect/package.nix new file mode 100644 index 000000000000..e1ddab04bfbe --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/ex/expect/package.nix @@ -0,0 +1,63 @@ +{ lib, stdenv, buildPackages, fetchurl, tcl, makeWrapper, autoreconfHook, fetchpatch, substituteAll }: + +tcl.mkTclDerivation rec { + pname = "expect"; + version = "5.45.4"; + + src = fetchurl { + url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz"; + hash = "sha256-Safag7C92fRtBKBN7sGcd2e7mjI+QMR4H4nK92C5LDQ="; + }; + + patches = [ + (substituteAll { + src = ./fix-build-time-run-tcl.patch; + tcl = "${buildPackages.tcl}/bin/tclsh"; + }) + # The following patches fix compilation with clang 15+ + (fetchpatch { + url = "https://sourceforge.net/p/expect/patches/24/attachment/0001-Add-prototype-to-function-definitions.patch"; + hash = "sha256-X2Vv6VVM3KjmBHo2ukVWe5YTVXRmqe//Kw2kr73OpZs="; + }) + (fetchpatch { + url = "https://sourceforge.net/p/expect/patches/_discuss/thread/b813ca9895/6759/attachment/expect-configure-c99.patch"; + hash = "sha256-PxQQ9roWgVXUoCMxkXEgu+it26ES/JuzHF6oML/nk54="; + }) + ./0004-enable-cross-compilation.patch + # Include `sys/ioctl.h` and `util.h` on Darwin, which are required for `ioctl` and `openpty`. + # Include `termios.h` on FreeBSD for `openpty` + ./fix-darwin-bsd-clang16.patch + # Remove some code which causes it to link against a file that does not exist at build time on native FreeBSD + ./freebsd-unversioned.patch + ]; + + postPatch = '' + sed -i "s,/bin/stty,$(type -p stty),g" configure.in + ''; + + nativeBuildInputs = [ autoreconfHook makeWrapper ]; + + strictDeps = true; + + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + + hardeningDisable = [ "format" ]; + + postInstall = '' + tclWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ tcl ]}) + ${lib.optionalString stdenv.hostPlatform.isDarwin "tclWrapperArgs+=(--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version})"} + ''; + + outputs = [ "out" "dev" ]; + + meta = with lib; { + description = "Tool for automating interactive applications"; + homepage = "https://expect.sourceforge.net/"; + license = licenses.publicDomain; + platforms = platforms.unix; + mainProgram = "expect"; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/tcl-modules/by-name/in/incrtcl/package.nix b/pkgs/development/tcl-modules/by-name/in/incrtcl/package.nix new file mode 100644 index 000000000000..7b1397ac1bb8 --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/in/incrtcl/package.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, mkTclDerivation, fetchurl, writeText, tcl }: + +mkTclDerivation rec { + pname = "incrtcl"; + version = "4.2.3"; + + src = fetchurl { + url = "mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl${version}.tar.gz"; + sha256 = "sha256-idOs2GXP3ZY7ECtF+K9hg5REyK6sQ0qk+666gUQPjCY="; + }; + + enableParallelBuilding = true; + + patchPhase = '' + substituteInPlace configure --replace "\''${TCL_SRC_DIR}/generic" "${tcl}/include" + ''; + + postInstall = '' + rmdir $out/bin + mv $out/lib/itcl${version}/* $out/lib + ln -s libitcl${version}${stdenv.hostPlatform.extensions.sharedLibrary} \ + $out/lib/libitcl${lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary} + rmdir $out/lib/itcl${version} + ''; + + setupHook = writeText "setup-hook.sh" '' + export ITCL_LIBRARY=@out@/lib + ''; + + outputs = [ "out" "dev" "man" ]; + + meta = with lib; { + homepage = "https://incrtcl.sourceforge.net/"; + description = "Object Oriented Enhancements for Tcl/Tk"; + license = licenses.tcltk; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/development/tcl-modules/by-name/it/itktcl/package.nix b/pkgs/development/tcl-modules/by-name/it/itktcl/package.nix new file mode 100644 index 000000000000..aefefa8c3ceb --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/it/itktcl/package.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchurl, mkTclDerivation, tk, incrtcl }: + +mkTclDerivation rec { + pname = "itk-tcl"; + version = "4.1.0"; + + src = fetchurl { + url = "mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itk${version}.tar.gz"; + sha256 = "1iy964jfgsfnc1agk1w6bbm44x18ily8d4wmr7cc9z9f4acn2r6s"; + }; + + buildInputs = [ tk incrtcl ]; + enableParallelBuilding = true; + + configureFlags = [ + "--with-tk=${tk}/lib" + "--with-itcl=${incrtcl}/lib" + "--with-tkinclude=${tk.dev}/include" + ]; + + postInstall = '' + rmdir $out/bin + mv $out/lib/itk${version}/* $out/lib + ln -s libitk${version}${stdenv.hostPlatform.extensions.sharedLibrary} \ + $out/lib/libitk${lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary} + rmdir $out/lib/itk${version} + ''; + + outputs = [ "out" "dev" "man" ]; + + meta = with lib; { + homepage = "https://incrtcl.sourceforge.net/"; + description = "Mega-widget toolkit for incr Tk"; + license = licenses.tcltk; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/development/tcl-modules/by-name/mu/mustache-tcl/package.nix b/pkgs/development/tcl-modules/by-name/mu/mustache-tcl/package.nix new file mode 100644 index 000000000000..5281f40a78e8 --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/mu/mustache-tcl/package.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, mkTclDerivation, tcllib }: + +mkTclDerivation rec { + pname = "mustache-tcl"; + version = "1.1.3.4"; + + src = fetchFromGitHub { + owner = "ianka"; + repo = "mustache.tcl"; + rev = "v${version}"; + sha256 = "sha256-apM57LEZ0Y9hXcEPWrKYOoTVtP5QSqiaQrjTHQc3pc4="; + }; + + buildInputs = [ + tcllib + ]; + + unpackPhase = '' + mkdir -p $out/lib/mustache-tcl + cp $src/mustache.tcl $out/lib/mustache-tcl/mustache.tcl + cp $src/pkgIndex.tcl $out/lib/mustache-tcl/pkgIndex.tcl + ''; + + meta = with lib; { + homepage = "https://github.com/ianka/mustache.tcl"; + description = "Tcl implementation of the mustache templating language"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ nat-418 ]; + }; +} + diff --git a/pkgs/development/tcl-modules/by-name/pd/pdf4tcl/package.nix b/pkgs/development/tcl-modules/by-name/pd/pdf4tcl/package.nix new file mode 100644 index 000000000000..07d059c042d3 --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/pd/pdf4tcl/package.nix @@ -0,0 +1,29 @@ +{ + lib, + mkTclDerivation, + fetchzip, +}: + +mkTclDerivation rec { + pname = "pdf4tcl"; + version = "0.9.4"; + + src = fetchzip { + url = "mirror://sourceforge/pdf4tcl/pdf4tcl${lib.replaceStrings [ "." ] [ "" ] version}.tar.gz"; + hash = "sha256-lmSt0UQDfUef8S7zevAvvbeWB/vd6jLbKz7Y5A7xJm4="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib/pdf4tcl + cp -r * $out/lib/pdf4tcl/ + runHook postInstall + ''; + + meta = { + description = "Tcl package for generating PDF files"; + homepage = "https://pdf4tcl.sourceforge.net/"; + license = lib.licenses.tcltk; + maintainers = with lib.maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix b/pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix new file mode 100644 index 000000000000..49d23ddd9a72 --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, mkTclDerivation, tclx }: + +mkTclDerivation rec { + pname = "tcl-fcgi"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "mpcjanssen"; + repo = "tcl-fcgi"; + rev = "62452dbf3177ba9458fbb42457834ca77bdf5a82"; + sha256 = "sha256-RLuV4ARmGWCJTmhs7DbMWENQGj3d5ZXWb821WrgG0qA="; + }; + + buildInputs = [ + tclx + ]; + + unpackPhase = '' + mkdir -p $out/lib/tcl-fcgi + cp -r $src/tcl-src/* $out/lib/tcl-fcgi/ + ''; + + meta = with lib; { + homepage = "https://github.com/mpcjanssen/tcl-fcgi"; + description = "Tcl interface for the FastCGI protocol"; + license = licenses.bsd2; + platforms = tclx.meta.platforms; + maintainers = with maintainers; [ nat-418 ]; + }; +} + diff --git a/pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix b/pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix new file mode 100644 index 000000000000..9e967de825bc --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix @@ -0,0 +1,33 @@ +{ + lib, + mkTclDerivation, + fetchFromGitHub, + curl, +}: + +mkTclDerivation rec { + pname = "tclcurl"; + version = "7.22.1"; + + src = fetchFromGitHub { + owner = "flightaware"; + repo = "tclcurl-fa"; + rev = "refs/tags/v${version}"; + hash = "sha256-XQuP+SiqvGX3ckBShUxsGBADjV3QdvYpU4hW6LMbMMQ="; + }; + + buildInputs = [ curl ]; + + # Uses curl-config + strictDeps = false; + + makeFlags = [ "LDFLAGS=-lcurl" ]; + + meta = { + description = "Curl support in Tcl"; + homepage = "https://github.com/flightaware/tclcurl-fa"; + changelog = "https://github.com/flightaware/tclcurl-fa/blob/master/ChangeLog.txt"; + license = lib.licenses.tcltk; + maintainers = with lib.maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/development/tcl-modules/by-name/tc/tcllib/package.nix b/pkgs/development/tcl-modules/by-name/tc/tcllib/package.nix new file mode 100644 index 000000000000..8ec83df8b6ed --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/tc/tcllib/package.nix @@ -0,0 +1,28 @@ +{ lib +, fetchzip +, mkTclDerivation +, critcl +, withCritcl ? true +}: + +mkTclDerivation rec { + pname = "tcllib"; + version = "1.21"; + + src = fetchzip { + url = "mirror://sourceforge/tcllib/tcllib-${version}.tar.gz"; + hash = "sha256-p8thpRpC+9k/LvbBFaSOIpDXuhMlEWhs0qbrjtKcTzQ="; + }; + + nativeBuildInputs = lib.optional withCritcl critcl; + + buildFlags = [ "all" ] ++ lib.optional withCritcl "critcl"; + + meta = { + homepage = "https://core.tcl-lang.org/tcllib/"; + description = "Tcl-only library of standard routines for Tcl"; + license = lib.licenses.tcltk; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/development/tcl-modules/by-name/tc/tclmagick/package.nix b/pkgs/development/tcl-modules/by-name/tc/tclmagick/package.nix new file mode 100644 index 000000000000..ad688ec56de4 --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/tc/tclmagick/package.nix @@ -0,0 +1,38 @@ +{ + lib, + mkTclDerivation, + fetchzip, + graphicsmagick, + tk, +}: + +mkTclDerivation rec { + pname = "tclmagick"; + version = "1.3.43"; + + src = fetchzip { + url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; + hash = "sha256-CpZztiBF0HqH4XWIAyE9IbZVpBcgrDzyASv47wTneQ0="; + }; + + sourceRoot = src.name + "/TclMagick"; + + buildInputs = [ + graphicsmagick + tk + ]; + + configureFlags = [ + "--with-tk=${lib.getLib tk}/lib" + "--with-tkinclude=${lib.getDev tk}/include" + ]; + + doInstallCheck = true; + + meta = { + description = "Tcl and Tk Interfaces to GraphicsMagick and ImageMagick"; + homepage = "http://www.graphicsmagick.org/TclMagick/doc/"; + license = lib.licenses.tcltk; + maintainers = with lib.maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix b/pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix new file mode 100644 index 000000000000..62880ee5323a --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix @@ -0,0 +1,66 @@ +{ lib, stdenv +, fetchFromGitHub +, automake +, autoconf +, libtool +, readline +, mkTclDerivation +, tk +}: + +mkTclDerivation rec { + pname = "tclreadline"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "flightaware"; + repo = "tclreadline"; + rev = "v${version}"; + sha256 = "sha256-rB2bR0yu/ZFf/WOgo1LeLmciaQA42/LulnqSczmzea8="; + }; + + nativeBuildInputs = [ + automake + autoconf + libtool + ]; + buildInputs = [ + readline + tk + ]; + + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; + + configureFlags = [ + "--enable-tclshrl" + "--enable-wishrl" + "--with-tk=${tk}/lib" + "--with-readline-includes=${readline.dev}/include/readline" + "--with-libtool=${libtool}" + ]; + + # The provided makefile leaves a wrong reference to /build/ in RPATH, + # so we fix it after checking that everything is also present in $out + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + needed_libraries=$(ls .libs | grep '\.\(so\|la\)$') + for lib in $needed_libraries; do + if ! ls $out/lib | grep "$lib"; then + echo "$lib was not installed correctly" + exit 1 + fi + done + for executable in $out/bin/{wishrl,tclshrl}; do + patchelf --set-rpath \ + "$(patchelf --print-rpath "$executable" | sed "s@$builddir/.libs@$out/lib@")" \ + "$executable" + done + ''; + + meta = with lib; { + description = "GNU readline for interactive tcl shells"; + homepage = "https://github.com/flightaware/tclreadline"; + license = licenses.bsd3; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tcl-modules/by-name/tc/tcltls/package.nix b/pkgs/development/tcl-modules/by-name/tc/tcltls/package.nix new file mode 100644 index 000000000000..cb32bf4a7ba8 --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/tc/tcltls/package.nix @@ -0,0 +1,25 @@ +{ lib, fetchurl, mkTclDerivation, openssl }: + +mkTclDerivation rec { + pname = "tcltls"; + version = "1.7.22"; + + src = fetchurl { + url = "https://core.tcl-lang.org/tcltls/uv/tcltls-${version}.tar.gz"; + sha256 = "sha256-6E4reideyCxKqp0bH5eG2+Q1jIFekXU5/+f2Z/9Lw7Q="; + }; + + buildInputs = [ openssl ]; + + configureFlags = [ + "--with-ssl-dir=${openssl.dev}" + ]; + + meta = { + homepage = "https://core.tcl-lang.org/tcltls/index"; + description = "OpenSSL / RSA-bsafe Tcl extension"; + maintainers = [ lib.maintainers.agbrooks ]; + license = lib.licenses.tcltk; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/tcl-modules/by-name/tc/tcludp/package.nix b/pkgs/development/tcl-modules/by-name/tc/tcludp/package.nix new file mode 100644 index 000000000000..073a93432fda --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/tc/tcludp/package.nix @@ -0,0 +1,39 @@ +{ + lib, + mkTclDerivation, + fetchfossil, +}: + +mkTclDerivation rec { + pname = "tcludp"; + version = "1.0.11"; + + src = fetchfossil { + url = "https://core.tcl-lang.org/tcludp"; + rev = "ver_" + lib.replaceStrings [ "." ] [ "_" ] version; + hash = "sha256-PckGwUqL2r5KJEet8sS4U504G63flX84EkQEkQdMifY="; + }; + + # Add missing pkgIndex.tcl.in + postPatch = '' + test ! -e pkgIndex.tcl.in + cat > pkgIndex.tcl.in <<EOF + package ifneeded @PACKAGE_NAME@ @PACKAGE_VERSION@ \ + [list load [file join $dir @PKG_LIB_FILE@] @PACKAGE_NAME@] + EOF + ''; + + # Some tests fail because of the sandbox. + # However, tcltest always returns exit code 0, so this always succeeds. + # https://wuhrr.wordpress.com/2013/09/13/tcltest-part-9-provides-exit-code/ + doInstallCheck = true; + + installCheckTarget = "test"; + + meta = { + description = "UDP socket support for Tcl"; + homepage = "https://core.tcl-lang.org/tcludp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/development/tcl-modules/by-name/tc/tclvfs/package.nix b/pkgs/development/tcl-modules/by-name/tc/tclvfs/package.nix new file mode 100644 index 000000000000..0fde102cc2a7 --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/tc/tclvfs/package.nix @@ -0,0 +1,28 @@ +{ + lib, + mkTclDerivation, + fetchzip, +}: + +mkTclDerivation { + pname = "tclvfs"; + version = "1.4-unstable-2023-11-23"; + + src = fetchzip { + url = "https://core.tcl-lang.org/tclvfs/tarball/8cdab08997fe82d8/tclvfs-8cdab08997fe82d8.tar.gz"; + hash = "sha256-DzZ4Puwscbr0KarMyEKeah7jDJy7cfKNBbBSh0boaUw="; + }; + + meta = { + description = "Tcl extension that exposes Tcl's Virtual File System (VFS) subsystem to the script level"; + homepage = "https://core.tcl.tk/tclvfs"; + license = lib.licenses.tcltk; + longDescription = '' + The TclVfs project aims to provide an extension to the Tcl language which + allows Virtual Filesystems to be built using Tcl scripts only. It is also + a repository of such Tcl-implemented filesystems (metakit, zip, ftp, tar, + http, webdav, namespace, url) + ''; + maintainers = with lib.maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/development/tcl-modules/by-name/tc/tclx/package.nix b/pkgs/development/tcl-modules/by-name/tc/tclx/package.nix new file mode 100644 index 000000000000..8ed3bb6f5931 --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/tc/tclx/package.nix @@ -0,0 +1,30 @@ +{ lib +, fetchFromGitHub +, mkTclDerivation +}: + +mkTclDerivation rec { + pname = "tclx"; + version = "8.6.3"; + + src = fetchFromGitHub { + owner = "flightaware"; + repo = "tclx"; + rev = "v${version}"; + hash = "sha256-bzLF6qOF9o24joWnGR7B4S+Doj7zv9iTh/mo50iFbUs="; + }; + + # required in order for tclx to properly detect tclx.tcl at runtime + postInstall = let + majorMinorVersion = lib.versions.majorMinor version; + in '' + ln -s $prefix/lib/tclx${majorMinorVersion} $prefix/lib/tclx${majorMinorVersion}/tclx${majorMinorVersion} + ''; + + meta = { + homepage = "https://github.com/flightaware/tclx"; + description = "Tcl extensions"; + license = lib.licenses.tcltk; + maintainers = with lib.maintainers; [ kovirobi fgaz ]; + }; +} diff --git a/pkgs/development/tcl-modules/by-name/td/tdom/package.nix b/pkgs/development/tcl-modules/by-name/td/tdom/package.nix new file mode 100644 index 000000000000..38ac7acfbcf0 --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/td/tdom/package.nix @@ -0,0 +1,40 @@ +{ + lib, + mkTclDerivation, + fetchzip, + expat, + gumbo, + pkg-config, +}: + +mkTclDerivation rec { + pname = "tdom"; + version = "0.9.5"; + + src = fetchzip { + url = "http://tdom.org/downloads/tdom-${version}-src.tgz"; + hash = "sha256-WjXIVnz+1Z59fQHMHXzQaIRRwfiBHMTBq/p2alGF+Po="; + }; + + buildInputs = [ + expat + gumbo + ]; + + nativeBuildInputs = [ pkg-config ]; + + configureFlags = [ + "--enable-html5" + "--with-expat=${lib.getDev expat}" + ]; + + doInstallCheck = true; + installCheckTarget = "test"; + + meta = { + description = "XML / DOM / XPath / XSLT / HTML / JSON implementation for Tcl"; + homepage = "http://www.tdom.org"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/development/libraries/tix/duplicated-xlowerwindow.patch b/pkgs/development/tcl-modules/by-name/ti/tix/duplicated-xlowerwindow.patch index 0ea888749a2f..0ea888749a2f 100644 --- a/pkgs/development/libraries/tix/duplicated-xlowerwindow.patch +++ b/pkgs/development/tcl-modules/by-name/ti/tix/duplicated-xlowerwindow.patch diff --git a/pkgs/development/libraries/tix/fix-clang16.patch b/pkgs/development/tcl-modules/by-name/ti/tix/fix-clang16.patch index f5d8a5337de0..f5d8a5337de0 100644 --- a/pkgs/development/libraries/tix/fix-clang16.patch +++ b/pkgs/development/tcl-modules/by-name/ti/tix/fix-clang16.patch diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/tcl-modules/by-name/ti/tix/package.nix index 67cee0140de0..67cee0140de0 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/tcl-modules/by-name/ti/tix/package.nix diff --git a/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix b/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix new file mode 100644 index 000000000000..f058585d3ad9 --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchsvn, tcl, tcllib, tk, xorg, darwin }: + +tcl.mkTclDerivation rec { + pname = "tkimg"; + version = "623"; + + src = fetchsvn { + url = "svn://svn.code.sf.net/p/tkimg/code/trunk"; + rev = version; + sha256 = "sha256-6GlkqYxXmMGjiJTZS2fQNVSimcKc1BZ/lvzvtkhty+o="; + }; + + configureFlags = [ + "--with-tcl=${tcl}/lib" + "--with-tk=${tk}/lib" + "--with-tkinclude=${tk.dev}/include" + ]; + + buildInputs = [ xorg.libX11 tcllib ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + Cocoa + ]); + + meta = { + homepage = "https://sourceforge.net/projects/tkimg/"; + description = "Img package adds several image formats to Tcl/Tk"; + maintainers = with lib.maintainers; [ matthewcroughan ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/tcl-modules/by-name/wa/wapp/package.nix b/pkgs/development/tcl-modules/by-name/wa/wapp/package.nix new file mode 100644 index 000000000000..fc7e14205f9f --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/wa/wapp/package.nix @@ -0,0 +1,32 @@ +{ lib, fetchurl, mkTclDerivation }: + +mkTclDerivation { + pname = "wapp"; + version = "0-unstable-2024-05-23"; + + src = fetchurl { + url = "https://wapp.tcl-lang.org/home/raw/98f23b2160bafc41f34be8e5d8ec414c53d33412eb2f724a07f2476eaf04ac6f?at=wapp.tcl"; + hash = "sha256-A+Ml5h5C+OMoDQtAoB9lHgYEK1A7qHExT3p46PHRTYg="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/wapp + cp $src $out/lib/wapp/wapp.tcl + cat <<EOF > $out/lib/wapp/pkgIndex.tcl + package ifneeded wapp 1.0 [list source [file join \$dir wapp.tcl]] + EOF + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://wapp.tcl-lang.org/home/doc/trunk/README.md"; + description = "Framework for writing web applications in Tcl"; + license = licenses.bsd2; + maintainers = with maintainers; [ nat-418 ]; + }; +} diff --git a/pkgs/development/tcl-modules/critcl/default.nix b/pkgs/development/tcl-modules/critcl/default.nix new file mode 100644 index 000000000000..4dda4292eb64 --- /dev/null +++ b/pkgs/development/tcl-modules/critcl/default.nix @@ -0,0 +1,47 @@ +{ lib +, fetchFromGitHub +, mkTclDerivation +, tcl +, tcllib +}: + +mkTclDerivation rec { + pname = "critcl"; + version = "3.2"; + + src = fetchFromGitHub { + owner = "andreas-kupries"; + repo = "critcl"; + rev = version; + hash = "sha256-IxScn9ZTlqD9mG9VJLG+TtplLFhhahOiFhQCjxp22Uk="; + }; + + buildInputs = [ + tcl + tcllib + ]; + + dontBuild = true; + doCheck = true; + + checkPhase = '' + runHook preInstall + HOME="$(mktemp -d)" tclsh ./build.tcl test + runHook postInstall + ''; + + installPhase = '' + runHook preInstall + tclsh ./build.tcl install --prefix $out + runHook postInstall + ''; + + meta = with lib; { + description = "Easily embed C code in Tcl"; + homepage = "https://andreas-kupries.github.io/critcl/"; + license = licenses.tcltk; + mainProgram = "critcl"; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/aapt/default.nix b/pkgs/development/tools/aapt/default.nix deleted file mode 100644 index 4af284948f0b..000000000000 --- a/pkgs/development/tools/aapt/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenvNoCC -, fetchzip -, autoPatchelfHook -, libcxx -}: - -stdenvNoCC.mkDerivation rec { - pname = "aapt"; - version = "8.4.1-11315950"; - - src = - let - urlAndHash = - if stdenvNoCC.isLinux then { - url = "https://dl.google.com/android/maven2/com/android/tools/build/aapt2/${version}/aapt2-${version}-linux.jar"; - hash = "sha256-eSQaZrRtb5aCG320hrXAL256fxa/oMhBC4hcTA1KRxs="; - } else if stdenvNoCC.isDarwin then { - url = "https://dl.google.com/android/maven2/com/android/tools/build/aapt2/${version}/aapt2-${version}-osx.jar"; - hash = "sha256-LUihNjase79JbUkHDb10A5d6pJ+VXDVfv7m09hkL8kY="; - } else throw "Unsupport platform: ${stdenvNoCC.system}"; - in - fetchzip (urlAndHash // { - extension = "zip"; - stripRoot = false; - }); - - nativeBuildInputs = lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenvNoCC.isLinux [ libcxx ]; - - installPhase = '' - runHook preInstall - - install -D aapt2 $out/bin/aapt2 - - runHook postInstall - ''; - - meta = { - description = "Build tool that compiles and packages Android app's resources"; - mainProgram = "aapt2"; - homepage = "https://developer.android.com/tools/aapt2"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ linsui ]; - platforms = lib.platforms.unix; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; -} - diff --git a/pkgs/development/tools/abuild/default.nix b/pkgs/development/tools/abuild/default.nix deleted file mode 100644 index 4cabeaa7d020..000000000000 --- a/pkgs/development/tools/abuild/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, gitUpdater -, makeWrapper -, pkg-config -, file -, scdoc -, openssl -, zlib -, busybox -, apk-tools -, perl -, findutils -}: - -stdenv.mkDerivation rec { - pname = "abuild"; - version = "3.13.0"; - - src = fetchFromGitLab { - domain = "gitlab.alpinelinux.org"; - owner = "alpine"; - repo = pname; - rev = version; - sha256 = "sha256-xVxgcBchGfeVo1cgP9iVsWjZ6SHVN6R8zWaE1k3DcXQ="; - }; - - buildInputs = [ - openssl - zlib - busybox - # for $out/bin/apkbuild-cpan and $out/bin/apkbuild-pypi - (perl.withPackages (ps: with ps; [ - LWP - JSON - ModuleBuildTiny - LWPProtocolHttps - IPCSystemSimple - ])) - ]; - - nativeBuildInputs = [ - pkg-config - scdoc - makeWrapper - file - findutils - ]; - - patchPhase = '' - substituteInPlace ./Makefile \ - --replace 'chmod 4555' '#chmod 4555' - ''; - - makeFlags = [ - "prefix=${placeholder "out"}" - "CFLAGS=-Wno-error" - ]; - - installFlags = [ - "sysconfdir=${placeholder "out"}/etc" - ]; - - postInstall = '' - # this script requires unpackaged 'augeas' rubygem, no reason - # to ship it if we can't provide the dependencies for it - rm -f ${placeholder "out"}/bin/apkbuild-gem-resolver - - # Find all executables that are not compiled binaries and wrap - # them, make `apk-tools` available in their PATH and also the - # $out directory since many of the binaries provided call into - # other binaries - for prog in \ - $(find ${placeholder "out"}/bin -type f -exec ${file}/bin/file -i '{}' + \ - | grep -v x-executable | cut -d : -f1); do - wrapProgram $prog \ - --prefix PATH : "${lib.makeBinPath [ apk-tools ]}" \ - --prefix PATH : "${placeholder "out"}/bin" - done - ''; - - passthru.updateScript = gitUpdater { }; - - meta = with lib; { - description = "Alpine Linux build tools"; - homepage = "https://gitlab.alpinelinux.org/alpine/abuild"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ onny ]; - platforms = platforms.unix; - }; - -} diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix deleted file mode 100644 index f50100bf6c81..000000000000 --- a/pkgs/development/tools/air/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule rec { - pname = "air"; - version = "1.52.3"; - - src = fetchFromGitHub { - owner = "air-verse"; - repo = "air"; - rev = "v${version}"; - hash = "sha256-TLTg9fYkIlTFDwkjRIQ7mAmKd+jA5Q9EPQ62fJ6zS9o="; - }; - - vendorHash = "sha256-dSu00NAq6hEOdJxXp+12UaUq32z53Wzla3/u+2nxqPw="; - - ldflags = [ - "-s" - "-w" - "-X=main.airVersion=${version}" - ]; - - subPackages = [ "." ]; - - meta = with lib; { - description = "Live reload for Go apps"; - mainProgram = "air"; - homepage = "https://github.com/air-verse/air"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ Gonzih ]; - }; -} diff --git a/pkgs/development/tools/allure/default.nix b/pkgs/development/tools/allure/default.nix deleted file mode 100644 index 2db5d880138f..000000000000 --- a/pkgs/development/tools/allure/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, stdenv -, makeWrapper -, fetchurl -, jre -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "allure"; - version = "2.30.0"; - - src = fetchurl { - url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz"; - hash = "sha256-jYdinK7it2MDwrWZmxPHR5YqZhhVIo2vMZDCX38+igU="; - }; - - dontConfigure = true; - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,share} - cd "$out/share" - tar xvzf $src - makeWrapper $out/share/${finalAttrs.meta.mainProgram}-${finalAttrs.version}/bin/allure $out/bin/${finalAttrs.meta.mainProgram} \ - --prefix PATH : "${jre}/bin" - - runHook postInstall - ''; - - meta = { - homepage = "https://docs.qameta.io/allure/"; - description = "Allure Report is a flexible, lightweight multi-language test reporting tool"; - longDescription = '' - Allure Report is a flexible, lightweight multi-language test reporting - tool providing clear graphical reports and allowing everyone involved - in the development process to extract the maximum of information from - the everyday testing process. - ''; - license = lib.licenses.asl20; - mainProgram = "allure"; - maintainers = with lib.maintainers; [ happysalada ]; - }; -}) diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix deleted file mode 100644 index 60fde1605700..000000000000 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, appimageTools, makeWrapper, fetchurl }: - -let - pname = "altair"; - version = "7.3.6"; - - src = fetchurl { - url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-jXFEpcmv8bkm7Yyo2GUwoakMlAwArCoZ1jIDeyF87Ms="; - }; - - appimageContents = appimageTools.extract { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit src pname version; - - extraInstallCommands = '' - source "${makeWrapper}/nix-support/setup-hook" - wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share - ''; - - meta = with lib; { - description = "Feature-rich GraphQL Client IDE"; - mainProgram = "altair"; - homepage = "https://github.com/imolorhe/altair"; - license = licenses.mit; - maintainers = with maintainers; [ evalexpr ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/tools/amazon-qldb-shell/default.nix b/pkgs/development/tools/amazon-qldb-shell/default.nix index 2aa7ba99479d..308552b99e2b 100644 --- a/pkgs/development/tools/amazon-qldb-shell/default.nix +++ b/pkgs/development/tools/amazon-qldb-shell/default.nix @@ -21,7 +21,7 @@ let }; nativeBuildInputs = [ cmake rustPlatform.bindgenHook ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix deleted file mode 100644 index 6f15544953b8..000000000000 --- a/pkgs/development/tools/ameba/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, fetchFromGitHub, crystal }: - -crystal.buildCrystalPackage rec { - pname = "ameba"; - version = "1.6.1"; - - src = fetchFromGitHub { - owner = "crystal-ameba"; - repo = "ameba"; - rev = "refs/tags/v${version}"; - hash = "sha256-NwmsNz9YfHDk0hVwVb5zczuzvErrwPhd3rs75t/Fj+I="; - }; - - format = "make"; - - meta = with lib; { - description = "Static code analysis tool for Crystal"; - mainProgram = "ameba"; - homepage = "https://crystal-ameba.github.io"; - changelog = "https://github.com/crystal-ameba/ameba/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ kimburgess ]; - }; -} diff --git a/pkgs/development/tools/amqpcat/default.nix b/pkgs/development/tools/amqpcat/default.nix deleted file mode 100644 index 38c0b5302ff1..000000000000 --- a/pkgs/development/tools/amqpcat/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, fetchFromGitHub, crystal, openssl, testers, amqpcat }: - -crystal.buildCrystalPackage rec { - pname = "amqpcat"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "cloudamqp"; - repo = "amqpcat"; - rev = "v${version}"; - hash = "sha256-QLVFAcymj7dERbUiRcseiDuuKgrQ8n4LbkdhUyXPcWw="; - }; - - format = "shards"; - shardsFile = ./shards.nix; - - buildInputs = [ openssl ]; - - # Tests require network access - doCheck = false; - - passthru.tests.version = testers.testVersion { - package = amqpcat; - }; - - meta = with lib; { - description = "CLI tool for publishing to and consuming from AMQP servers"; - mainProgram = "amqpcat"; - homepage = "https://github.com/cloudamqp/amqpcat"; - license = licenses.mit; - maintainers = with maintainers; [ aaronjheng ]; - }; -} diff --git a/pkgs/development/tools/amqpcat/shards.nix b/pkgs/development/tools/amqpcat/shards.nix deleted file mode 100644 index 077c49286971..000000000000 --- a/pkgs/development/tools/amqpcat/shards.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - amq-protocol = { - url = "https://github.com/cloudamqp/amq-protocol.cr.git"; - rev = "v1.1.14"; - sha256 = "1pr5h3lxfhjmarfqpvfldn8d6425g3i56k4p4szk2jkffa0z38nz"; - }; - amqp-client = { - url = "https://github.com/cloudamqp/amqp-client.cr.git"; - rev = "v1.2.3"; - sha256 = "1pbiq5srni87hd8q2x3vs4s2hpajlzzlwgalgnmb35dcyih1ff9k"; - }; -} diff --git a/pkgs/development/tools/analysis/banana-vera/default.nix b/pkgs/development/tools/analysis/banana-vera/default.nix deleted file mode 100644 index 704b822fa45e..000000000000 --- a/pkgs/development/tools/analysis/banana-vera/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, python310 -, tcl -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "banana-vera"; - version = "1.3.0-ubuntu"; - - src = fetchFromGitHub { - owner = "Epitech"; - repo = "banana-vera"; - rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "sha256-sSN3trSySJe3KVyrb/hc5HUGRS4M3c4UX9SLlzBM43c="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - python310 - python310.pkgs.boost - tcl - ]; - - cmakeFlags = [ - "-DVERA_LUA=OFF" - "-DVERA_USE_SYSTEM_BOOST=ON" - "-DPANDOC=OFF" - ]; - - meta = { - mainProgram = "vera++"; - description = "Fork of vera using python3.10"; - homepage = "https://github.com/Epitech/banana-vera"; - license = lib.licenses.boost; - maintainers = with lib.maintainers; [ sigmanificient ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - }; -}) diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix deleted file mode 100644 index 6a5e2041e57d..000000000000 --- a/pkgs/development/tools/analysis/bingrep/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "bingrep"; - version = "0.11.0"; - - src = fetchFromGitHub { - owner = "m4b"; - repo = pname; - rev = "v${version}"; - hash = "sha256-bHu3/f25U1QtRZv1z5OQSDMayOpLU6tbNaV00K55ZY8="; - }; - - cargoHash = "sha256-n49VmAJcD98LdkrUCW6ouihSXmSCsdBDvCe9l96G0ec="; - - meta = with lib; { - description = "Greps through binaries from various OSs and architectures, and colors them"; - mainProgram = "bingrep"; - homepage = "https://github.com/m4b/bingrep"; - license = licenses.mit; - maintainers = with maintainers; [ minijackson ]; - }; -} diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 03f2e36eea9d..f426f0f35dcd 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ curl Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl Security ]; doCheck = false; diff --git a/pkgs/development/tools/analysis/cccc/cccc.patch b/pkgs/development/tools/analysis/cccc/cccc.patch deleted file mode 100644 index 9454e3b18ad1..000000000000 --- a/pkgs/development/tools/analysis/cccc/cccc.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/cccc/cccc_tbl.cc b/cccc/cccc_tbl.cc -index df98e2b..59f2572 100644 ---- a/cccc/cccc_tbl.cc -+++ b/cccc/cccc_tbl.cc -@@ -96,7 +96,7 @@ bool CCCC_Table<T>::remove(T* old_item_ptr) - typename map_t::iterator value_iterator=map_t::find(old_item_ptr->key()); - if(value_iterator!=map_t::end()) - { -- erase(value_iterator); -+ map_t::erase(value_iterator); - retval=true; - } - return retval; -diff --git a/makefile b/makefile -index 23ad004..2cca469 100644 ---- a/makefile -+++ b/makefile -@@ -20,5 +20,5 @@ test : - cd test ; make -f posix.mak - - install : -- cd install ; su root -c "make -f install.mak" -+ cd install ; make -f install.mak - diff --git a/pkgs/development/tools/analysis/cccc/default.nix b/pkgs/development/tools/analysis/cccc/default.nix deleted file mode 100644 index b0fd8769bdbe..000000000000 --- a/pkgs/development/tools/analysis/cccc/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "cccc"; - version = "3.1.4"; - - src = fetchurl { - url = "mirror://sourceforge/cccc/${version}/cccc-${version}.tar.gz"; - sha256 = "1gsdzzisrk95kajs3gfxks3bjvfd9g680fin6a9pjrism2lyrcr7"; - }; - - hardeningDisable = [ "format" ]; - - patches = [ ./cccc.patch ]; - - preConfigure = '' - substituteInPlace install/install.mak --replace /usr/local/bin $out/bin - substituteInPlace install/install.mak --replace MKDIR=mkdir "MKDIR=mkdir -p" - ''; - buildFlags = [ "CCC=c++" "LD=c++" ]; - - meta = { - description = "C and C++ Code Counter"; - mainProgram = "cccc"; - longDescription = '' - CCCC is a tool which analyzes C++ and Java files and generates a report - on various metrics of the code. Metrics supported include lines of code, McCabe's - complexity and metrics proposed by Chidamber&Kemerer and Henry&Kafura. - ''; - homepage = "https://cccc.sourceforge.net/"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.linquize ]; - }; -} diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index deae8bcea043..a865f6fdbca2 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.254"; + version = "3.2.283"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-+3hx6MEJWDbTby0bvUSe/AGoneqJ/ojzkkpb8oF4ZIo="; + hash = "sha256-9izC3O5e6GY/4OLkFLnUOoiFSnxdaS22qPSD3uYXSOE="; }; patches = [ ./flake8-compat-5.x.patch ]; @@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec { "cyclonedx-python-lib" "dpath" "igraph" + "importlib-metadata" "license-expression" "networkx" "openai" @@ -44,9 +45,7 @@ python3.pkgs.buildPythonApplication rec { "pycep-parser" ]; - build-system = with python3.pkgs; [ - setuptools-scm - ]; + build-system = with python3.pkgs; [ setuptools-scm ]; dependencies = with python3.pkgs; [ aiodns diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix deleted file mode 100644 index 482348b63c66..000000000000 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }: - -stdenvNoCC.mkDerivation rec { - version = "10.18.1"; - pname = "checkstyle"; - - src = fetchurl { - url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-2nOh+jvi6CksU69cidNTVjOOIZTRQttpCOuf+KrILoM="; - }; - - nativeBuildInputs = [ makeBinaryWrapper ]; - buildInputs = [ jre ]; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - install -D $src $out/checkstyle/checkstyle-all.jar - makeWrapper ${jre}/bin/java $out/bin/checkstyle \ - --add-flags "-jar $out/checkstyle/checkstyle-all.jar" - runHook postInstall - ''; - - meta = with lib; { - description = "Checks Java source against a coding standard"; - mainProgram = "checkstyle"; - longDescription = '' - checkstyle is a development tool to help programmers write Java code that - adheres to a coding standard. By default it supports the Sun Code - Conventions, but is highly configurable. - ''; - homepage = "https://checkstyle.org/"; - changelog = "https://checkstyle.org/releasenotes.html#Release_${version}"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.lgpl21; - maintainers = with maintainers; [ pSub ]; - platforms = jre.meta.platforms; - }; -} diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix deleted file mode 100644 index 94c45614ed84..000000000000 --- a/pkgs/development/tools/analysis/coan/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, perl }: - -stdenv.mkDerivation rec { - version = "6.0.1"; - pname = "coan"; - - src = fetchurl { - url = "mirror://sourceforge/project/coan2/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1d041j0nd1hc0562lbj269dydjm4rbzagdgzdnmwdxr98544yw44"; - }; - - patches = [ - # fix compile error in configure.ac - ./fix-big-endian-config-check.diff - ]; - - nativeBuildInputs = [ autoreconfHook perl ]; - - configureFlags = [ "CXXFLAGS=-std=c++11" ]; - - enableParallelBuilding = true; - - postInstall = '' - mv -v $out/share/man/man1/coan.1.{1,gz} - ''; - - meta = with lib; { - description = "C preprocessor chainsaw"; - mainProgram = "coan"; - longDescription = '' - A software engineering tool for analysing preprocessor-based - configurations of C or C++ source code. Its principal use is to simplify - a body of source code by eliminating any parts that are redundant with - respect to a specified configuration. Dead code removal is an - application of this sort. - ''; - homepage = "https://coan2.sourceforge.net/"; - license = licenses.bsd3; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/analysis/coan/fix-big-endian-config-check.diff b/pkgs/development/tools/analysis/coan/fix-big-endian-config-check.diff deleted file mode 100644 index 7a2965361da0..000000000000 --- a/pkgs/development/tools/analysis/coan/fix-big-endian-config-check.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 23ba6f0..13e6647 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4,7 +4,7 @@ AC_PREREQ(2.59) - AM_INIT_AUTOMAKE(1.13 no-define) - AC_CHECK_HEADERS(strings.h) - AC_MSG_CHECKING(for big-endian host) --AC_TRY_RUN([main () { -+AC_TRY_RUN([int main () { - /* Are we little or big endian? From Harbison&Steele. */ - union - { -@@ -12,7 +12,7 @@ AC_TRY_RUN([main () { - char c[sizeof (long)]; - } u; - u.l = 1; -- exit (u.c[sizeof (long) - 1] == 1); -+ return u.c[sizeof (long) - 1] == 1; - }], BIG_ENDIAN=no, BIG_ENDIAN=yes) - AC_MSG_RESULT([$BIG_ENDIAN]) - AM_CONDITIONAL([IS_BIG_ENDIAN],[test "$BIG_ENDIAN" = "yes"]) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix deleted file mode 100644 index 7ead573d36df..000000000000 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchzip, zlib, xorg, freetype, jdk17, curl }: - -stdenv.mkDerivation rec { - pname = "codeql"; - version = "2.18.4"; - - dontConfigure = true; - dontBuild = true; - dontStrip = true; - - src = fetchzip { - url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-nVeIdwTg1BdRrnvwVlmo0bZh1OopMn3WCBaHxpoJas8="; - }; - - nativeBuildInputs = [ - zlib - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXtst - xorg.libXrender - freetype - jdk17 - stdenv.cc.cc.lib - curl - ]; - - installPhase = '' - # codeql directory should not be top-level, otherwise, - # it'll include /nix/store to resolve extractors. - mkdir -p $out/{codeql,bin} - cp -R * $out/codeql/ - - ln -sf $out/codeql/tools/linux64/lib64trace.so $out/codeql/tools/linux64/libtrace.so - - # many of the codeql extractors use CODEQL_DIST + CODEQL_PLATFORM to - # resolve java home, so to be able to create databases, we want to make - # sure that they point somewhere sane/usable since we can not autopatch - # the codeql packaged java dist, but we DO want to patch the extractors - # as well as the builders which are ELF binaries for the most part - rm -rf $out/codeql/tools/linux64/java - ln -s ${jdk17} $out/codeql/tools/linux64/java - - ln -s $out/codeql/codeql $out/bin/ - ''; - - meta = with lib; { - description = "Semantic code analysis engine"; - homepage = "https://codeql.github.com"; - maintainers = [ maintainers.dump_stack ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - license = licenses.unfree; - }; -} diff --git a/pkgs/development/tools/analysis/cov-build/default.nix b/pkgs/development/tools/analysis/cov-build/default.nix deleted file mode 100644 index 61c8dda2e6da..000000000000 --- a/pkgs/development/tools/analysis/cov-build/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, stdenv -, fetchurl - -, autoPatchelfHook - -, alsa-lib -, libxcrypt-legacy -, lttng-ust_2_12 -, xorg -, zlib -}: - -stdenv.mkDerivation rec { - pname = "cov-build"; - version = "2022.12.2"; - - src = - if stdenv.hostPlatform.system == "i686-linux" - then fetchurl { - url = "https://archive.org/download/cov-analysis-linux-${version}.tar/cov-analysis-linux-${version}.tar.gz"; - hash = "sha256-Jr9bMUo9GRp+dgoAPqKxaTqWYWh4djGArdG9ukUK+ZY="; - } - else if stdenv.hostPlatform.system == "x86_64-linux" - then fetchurl { - url = "https://archive.org/download/cov-analysis-linux64-${version}.tar/cov-analysis-linux64-${version}.tar.gz"; - hash = "sha256-CyNKILJXlDMOCXbZZF4r/knz0orRx32oSj+Kpq/nxXQ="; - } - else throw "Unsupported platform '${stdenv.hostPlatform.system}'"; - - nativeBuildInputs = [ autoPatchelfHook ]; - - buildInputs = [ - alsa-lib - libxcrypt-legacy - lttng-ust_2_12 - xorg.libXext - xorg.libXrender - xorg.libXtst - zlib - ]; - - dontConfigure = true; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/bin $out/libexec - mv * $out/libexec - for x in cov-build cov-capture cov-configure cov-emit cov-emit-java \ - cov-export-cva cov-extract-scm cov-help cov-import-scm cov-link \ - cov-internal-clang cov-internal-emit-clang cov-internal-nm \ - cov-internal-emit-java-bytecode cov-internal-reduce cov-translate \ - cov-preprocess cov-internal-pid-to-db cov-manage-emit \ - cov-manage-history; do - ln -s $out/libexec/bin/$x $out/bin/$x; - done - ''; - - dontStrip = true; - - meta = { - description = "Coverity Scan build tools"; - homepage = "https://scan.coverity.com"; - license = lib.licenses.unfreeRedistributable; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.thoughtpolice ]; - }; -} diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix deleted file mode 100644 index b32e1cf4e678..000000000000 --- a/pkgs/development/tools/analysis/cpplint/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, fetchpatch, python3Packages, fetchFromGitHub }: - -python3Packages.buildPythonApplication rec { - pname = "cpplint"; - version = "1.7.0"; - pyproject = true; - - # Fetch from github instead of pypi, since the test cases are not in the pypi archive - src = fetchFromGitHub { - owner = "cpplint"; - repo = "cpplint"; - # Commit where version was bumped to 1.7.0, no tag available - rev = "8f62396aff6dc850415cbe5ed7edf9dc95f4a731"; - hash = "sha256-EKD7vkxJjoKWfPrXEQRA0X3PyAoYXi9wGgUFT1zC4WM="; - }; - - patches = [ - # Whitespace fixes that make the tests pass - (fetchpatch { - url = "https://github.com/cpplint/cpplint/commit/fd257bd78db02888cf6b5985ab8f53d6b765704f.patch"; - hash = "sha256-BNyW8QEY9fUe2zMG4RZzBHASaIsu4d2FJt5rX3VgkrQ="; - }) - ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace-fail '"pytest-runner==5.2"' "" - - patchShebangs cpplint_unittest.py - ''; - - build-system = with python3Packages; [ - setuptools - ]; - - nativeCheckInputs = with python3Packages; [ - pytest - ]; - - checkPhase = '' - ./cpplint_unittest.py - ''; - - meta = { - homepage = "https://github.com/cpplint/cpplint"; - description = "Static code checker for C++"; - mainProgram = "cpplint"; - maintainers = [ lib.maintainers.bhipple ]; - license = [ lib.licenses.bsd3 ]; - }; -} diff --git a/pkgs/development/tools/analysis/cvehound/default.nix b/pkgs/development/tools/analysis/cvehound/default.nix deleted file mode 100644 index 9eedade72dd9..000000000000 --- a/pkgs/development/tools/analysis/cvehound/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, fetchFromGitHub -, coccinelle -, gnugrep -, python3 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "cvehound"; - version = "1.2.1"; - - src = fetchFromGitHub { - owner = "evdenis"; - repo = "cvehound"; - rev = "refs/tags/${version}"; - hash = "sha256-UvjmlAm/8B4KfE9grvvgn37Rui+ZRfs2oTLqYYgqcUQ="; - }; - - makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ coccinelle gnugrep ]}" - ]; - - propagatedBuildInputs = with python3.pkgs; [ - lxml - setuptools - sympy - ]; - - nativeCheckInputs = with python3.pkgs; [ - gitpython - psutil - pytestCheckHook - ]; - - # Tries to clone the kernel sources - doCheck = false; - - meta = with lib; { - description = "Tool to check linux kernel source dump for known CVEs"; - homepage = "https://github.com/evdenis/cvehound"; - changelog = "https://github.com/evdenis/cvehound/blob/${src.rev}/ChangeLog"; - # See https://github.com/evdenis/cvehound/issues/22 - license = with licenses; [ gpl2Only gpl3Plus ]; - maintainers = with maintainers; [ ambroisie ]; - }; -} diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix index 603cc1d1ccbb..c61f862f5178 100644 --- a/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-4r4NTq2rLnpmm/nwxJ9RoN2+JrUI6XKGfYFI78NY710="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Lightning-fast linter for .env files. Written in Rust"; diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix deleted file mode 100644 index 5c9b4ef0453d..000000000000 --- a/pkgs/development/tools/analysis/egypt/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, fetchurl, perlPackages }: - -perlPackages.buildPerlPackage rec { - pname = "egypt"; - version = "1.10"; - - src = fetchurl { - sha256 = "0r0wj6v8z9fzlh9pb5617kyjdf92ppmlbzajaarrq729bbb6ln5m"; - url = "https://www.gson.org/egypt/download/${pname}-${version}.tar.gz"; - }; - - outputs = [ "out" ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = with lib; { - description = "Tool for making call graphs of C programmes"; - mainProgram = "egypt"; - longDescription = '' - Egypt is a simple tool for creating call graphs of C programs. It neither - analyzes source code nor lays out graphs. Instead, it leaves the source - code analysis to GCC and the graph layout to Graphviz, both of which are - better at their respective jobs than egypt itself could ever hope to be. - Egypt is simply a very small Perl script that glues these existing tools - together. - ''; - homepage = "http://www.gson.org/egypt/"; - license = with licenses; [ artistic1 gpl1Plus ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix deleted file mode 100644 index 4a284ac0d603..000000000000 --- a/pkgs/development/tools/analysis/emma/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{lib, stdenv, fetchurl, unzip}: - -stdenv.mkDerivation rec { - pname = "emma"; - version = "2.0.5312"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.zip"; - sha256 = "0xxy39s2lvgs56vicjzpcz936l1vjaplliwa0dm7v3iyvw6jn7vj"; - }; - - nativeBuildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/lib/jars - cp lib/*.jar $out/lib/jars/ - ''; - - meta = { - homepage = "https://emma.sourceforge.net/"; - description = "Code coverage tool for Java"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - platforms = lib.platforms.unix; - license = lib.licenses.cpl10; - }; -} diff --git a/pkgs/development/tools/analysis/eresi/default.nix b/pkgs/development/tools/analysis/eresi/default.nix deleted file mode 100644 index 1b3cf0936502..000000000000 --- a/pkgs/development/tools/analysis/eresi/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, which, openssl, readline, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "eresi"; - version = "0.83-a3-phoenix"; - - src = fetchFromGitHub { - owner = "thorkill"; - repo = "eresi"; - rev = version; - sha256 = "0a5a7mh2zw9lcdrl8n1mqccrc0xcgj7743l7l4kslkh722fxv625"; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/thorkill/eresi/commit/a79406344cc21d594d27fa5ec5922abe9f7475e7.patch"; - sha256 = "1mjjc6hj7r06iarvai7prcdvjk9g0k5vwrmkwcm7b8ivd5xzxp2z"; - }) - - # Pull patch pending upstream inclusion for -fno-common toolchains: - # https://github.com/thorkill/eresi/pull/166 - (fetchpatch { - url = "https://github.com/thorkill/eresi/commit/bc5b9a75c326f277e5f89e01a3b8f7f0519a99f6.patch"; - sha256 = "0lqwrnkkhhd3vi1r8ngvziyqkk09h98h93rrs3ndqi048a898ys1"; - }) - ]; - - postPatch = '' - # Two occurences of fprintf() with only two arguments, which should really - # be fputs(). - # - # Upstream pull request: https://github.com/thorkill/eresi/pull/162 - # - sed -i -e 's/fprintf(\(stderr\), *\([a-z0-9]\+\))/fputs(\2, \1)/g' \ - libe2dbg/common/common.c libe2dbg/user/threads.c - - # We need to patch out a few ifs here, because it tries to create a series - # of configuration files in ~/.something. However, our builds are sandboxed - # and also don't contain a valid home, so let's NOP it out :-) - # - # The second fix we need to make is that we need to pretend being Gentoo - # because otherwise the build process tries to link against libtermcap, - # which I think is solely for historic reasons (nowadays Terminfo should - # have largely superseded it). - sed -i -e '/^if \[ ! -e/c if false; then' \ - -e 's/^GENTOO=.*/GENTOO=1/' configure - ''; - - configureFlags = [ - (if stdenv.is64bit then "--enable-32-64" else "--enable-32") - "--enable-readline" - ]; - - # The configure script is not generated by autoconf but is hand-rolled, so it - # has --enable-static but no --disabled-static and also doesn't support the - # equals sign in --prefix. - prefixKey = "--prefix "; - dontDisableStatic = true; - - nativeBuildInputs = [ which ]; - buildInputs = [ openssl readline ]; - enableParallelBuilding = true; - # ln: failed to create symbolic link '...-eresi-0.83-a3-phoenix//bin/elfsh': No such file or directory - # make: *** [Makefile:108: install64] Error 1 - enableParallelInstalling = false; - - installTargets = lib.singleton "install" - ++ lib.optional stdenv.is64bit "install64"; - - meta = { - description = "ERESI Reverse Engineering Software Interface"; - license = lib.licenses.gpl2Only; - homepage = "https://github.com/thorkill/eresi"; # Formerly http://www.eresi-project.org/ - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix deleted file mode 100644 index ade3f53ddef2..000000000000 --- a/pkgs/development/tools/analysis/evmdis/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule { - pname = "evmdis"; - version = "unstable-2022-05-09"; - - src = fetchFromGitHub { - owner = "Arachnid"; - repo = "evmdis"; - rev = "7fad4fbee443262839ce9f88111b417801163086"; - hash = "sha256-jfbjXoGT8RtwLlqX13kcKdiFlhrVwA7Ems6abGJVRbA="; - }; - - vendorHash = null; - - preBuild = '' - go mod init github.com/Arachnid/evmdis - ''; - - ldflags = [ "-s" ]; - - meta = with lib; { - homepage = "https://github.com/Arachnid/evmdis"; - description = "Ethereum EVM disassembler"; - mainProgram = "evmdis"; - license = [ licenses.asl20 ]; - maintainers = with maintainers; [ asymmetric ]; - }; -} diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix deleted file mode 100644 index a3f52f8da092..000000000000 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "findbugs"; - version = "3.0.1"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "06b46fz4nid7qvm36r66zw01fr87y4jyz21ixw27b8hkqah0s3p8"; - }; - - buildPhase = '' - substituteInPlace bin/findbugs --replace /bin/pwd pwd - ''; - - installPhase = '' - d=$out/libexec/findbugs - mkdir -p $d $out/bin $out/nix-support - - cp -prd bin lib plugin doc $d/ - rm $d/bin/*.bat - for i in $d/bin/*; do - if [ -f $i ]; then ln -s $i $out/bin/; fi - done - - # Get rid of unnecessary JARs. - rm $d/lib/ant.jar - - # Make some JARs findable. - mkdir -p $out/share/java - ln -s $d/lib/{findbugs.jar,findbugs-ant.jar} $out/share/java/ - - cat <<EOF > $out/nix-support/setup-hook - export FINDBUGS_HOME=$d - EOF - ''; - - meta = with lib; { - description = "Static analysis tool to find bugs in Java programs automatically"; - homepage = "https://findbugs.sourceforge.net/"; - maintainers = with maintainers; [ pSub ]; - platforms = with platforms; unix; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.lgpl3; - }; -} diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 956e460deca3..2bb80f22ecc4 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = with ocamlPackages; [ ocaml dune_3 findlib ocamlbuild ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ] - ++ (with ocamlPackages; [ core_kernel dtoa fileutils lwt_log lwt_ppx ocaml_lwt ppx_deriving ppx_gen_rec ppx_let sedlex visitors wtf8 ] ++ lib.optionals stdenv.isLinux [ inotify ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ] + ++ (with ocamlPackages; [ core_kernel dtoa fileutils lwt_log lwt_ppx ocaml_lwt ppx_deriving ppx_gen_rec ppx_let sedlex visitors wtf8 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify ]); meta = with lib; { description = "Static type checker for JavaScript"; diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix deleted file mode 100644 index f682196a458f..000000000000 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ lib, stdenv, fetchurl, writeText -, graphviz, doxygen -, ocamlPackages, ltl2ba, coq, why3 -, gdk-pixbuf, wrapGAppsHook3 -}: - -let - mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib"; - runtimeDeps = with ocamlPackages; [ - apron.dev - bigarray-compat - biniou - camlzip - easy-format - menhirLib - mlgmpidl - num - ocamlgraph - ppx_deriving - ppx_deriving_yojson - ppx_import - stdlib-shims - why3.dev - re - result - seq - sexplib - sexplib0 - parsexp - base - unionFind - yojson - zarith - ]; - ocamlpath = lib.concatMapStringsSep ":" mkocamlpath runtimeDeps; -in - -stdenv.mkDerivation rec { - pname = "frama-c"; - version = "29.0"; - slang = "Copper"; - - src = fetchurl { - url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - hash = "sha256-0vuzuND/g5RYcunm+iWOk0pwY2DmmNrjtNX5ca3fdJM="; - }; - - preConfigure = '' - substituteInPlace src/dune --replace " bytes " " " - ''; - - postConfigure = "patchShebangs src/plugins/eva/gen-api.sh"; - - strictDeps = true; - - nativeBuildInputs = [ wrapGAppsHook3 ] ++ (with ocamlPackages; [ ocaml findlib dune_3 menhir ]); - - buildInputs = with ocamlPackages; [ - dune-site dune-configurator - ltl2ba ocamlgraph yojson menhirLib camlzip - lablgtk3 lablgtk3-sourceview3 coq graphviz zarith apron why3 mlgmpidl doxygen - ppx_deriving ppx_import ppx_deriving_yaml ppx_deriving_yojson - gdk-pixbuf - unionFind - ]; - - buildPhase = '' - runHook preBuild - dune build -j$NIX_BUILD_CORES --release @install - runHook postBuild - ''; - - installFlags = [ "PREFIX=$(out)" ]; - - preFixup = '' - gappsWrapperArgs+=(--prefix OCAMLPATH ':' ${ocamlpath}:$out/lib/) - ''; - - # Allow loading of external Frama-C plugins - setupHook = writeText "setupHook.sh" '' - addFramaCPath () { - if test -d "''$1/lib/frama-c/plugins"; then - export FRAMAC_PLUGIN="''${FRAMAC_PLUGIN-}''${FRAMAC_PLUGIN:+:}''$1/lib/frama-c/plugins" - export OCAMLPATH="''${OCAMLPATH-}''${OCAMLPATH:+:}''$1/lib/frama-c/plugins" - fi - - if test -d "''$1/lib/frama-c"; then - export OCAMLPATH="''${OCAMLPATH-}''${OCAMLPATH:+:}''$1/lib/frama-c" - fi - - if test -d "''$1/share/frama-c/"; then - export FRAMAC_EXTRA_SHARE="''${FRAMAC_EXTRA_SHARE-}''${FRAMAC_EXTRA_SHARE:+:}''$1/share/frama-c" - fi - - } - - addEnvHooks "$targetOffset" addFramaCPath - ''; - - - meta = { - description = "Extensible and collaborative platform dedicated to source-code analysis of C software"; - homepage = "http://frama-c.com/"; - license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ thoughtpolice amiddelk ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix deleted file mode 100644 index 4623c42e8191..000000000000 --- a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - - pname = "tracefilegen"; - version = "unstable-2017-05-13"; - - src = fetchFromGitHub { - owner = "GarCoSim"; - repo = "TraceFileGen"; - rev = "0ebfd1fdb54079d4bdeaa81fc9267ecb9f016d60"; - sha256 = "1gsx18ksgz5gwl3v62vgrmhxc0wc99i74qwhpn0h57zllk41drjc"; - }; - - nativeBuildInputs = [ cmake ]; - - patches = [ ./gcc7.patch ]; - - installPhase = '' - install -Dm755 TraceFileGen $out/bin/TraceFileGen - mkdir -p $out/share/doc/${pname}-${version}/ - cp -ar $src/Documentation/html $out/share/doc/${pname}-${version}/. - ''; - - meta = with lib; { - description = "Automatically generate all types of basic memory management operations and write into trace files"; - mainProgram = "TraceFileGen"; - homepage = "https://github.com/GarCoSim"; - maintainers = [ maintainers.cmcdragonkai ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch b/pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch deleted file mode 100644 index 48301bbf61ad..000000000000 --- a/pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Utils/Logger.cpp b/Utils/Logger.cpp -index 747cd63..e3efdf1 100644 ---- a/Utils/Logger.cpp -+++ b/Utils/Logger.cpp -@@ -29,7 +29,7 @@ Logger::Logger(char* tracepath) { - trace = fopen(tracepath, "w"); - - // dot file is not used, set null as default value -- dot = '\0'; -+ dot = nullptr; - //dot = fopen("gcKons.dot", "w"); - //fprintf(dot,"digraph G {\n"); - } diff --git a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix deleted file mode 100644 index cd1682a1f5e7..000000000000 --- a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation { - - pname = "tracefilesim"; - version = "unstable-2015-11-07"; - - src = fetchFromGitHub { - owner = "GarCoSim"; - repo = "TraceFileSim"; - rev = "368aa6b1d6560e7ecbd16fca47000c8f528f3da2"; - sha256 = "156m92k38ap4bzidbr8dzl065rni8lrib71ih88myk9z5y1x5nxm"; - }; - - hardeningDisable = [ "fortify" ]; - - installPhase = '' - mkdir --parents "$out/bin" - cp ./traceFileSim "$out/bin" - ''; - - meta = with lib; { - description = "Ease the analysis of existing memory management techniques, as well as the prototyping of new memory management techniques"; - mainProgram = "traceFileSim"; - homepage = "https://github.com/GarCoSim"; - maintainers = [ maintainers.cmcdragonkai ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix index f769ac1b28c6..7aa3f922e291 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -7,7 +7,6 @@ , wrapQtAppsHook , elfutils , fetchFromGitHub -, fetchpatch , kconfigwidgets , kddockwidgets , ki18n @@ -28,25 +27,16 @@ stdenv.mkDerivation rec { pname = "hotspot"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "KDAB"; repo = "hotspot"; rev = "refs/tags/v${version}"; - hash = "sha256-FJkDPWqNwoWg/15tvMnwke7PVtWVuqT0gtJBFQE0qZ4="; + hash = "sha256-O2wp19scyHIwIY2AzKmPmorGXDH249/OhSg+KtzOYhI="; fetchSubmodules = true; }; - patches = [ - # Backport stuck UI bug fix - # FIXME: remove in next update - (fetchpatch { - url = "https://github.com/KDAB/hotspot/commit/7639dee8617dba9b88182c7ff4887e8d3714ac98.patch"; - hash = "sha256-aAo9uEy+MBztMhnC5jB08moZBeRCENU22R39pqSBXOY="; - }) - ]; - nativeBuildInputs = [ cmake extra-cmake-modules diff --git a/pkgs/development/tools/analysis/ikos/default.nix b/pkgs/development/tools/analysis/ikos/default.nix index e135b4f79a26..f7fb222b4b84 100644 --- a/pkgs/development/tools/analysis/ikos/default.nix +++ b/pkgs/development/tools/analysis/ikos/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "ikos"; - version = "3.3"; + version = "3.4"; src = fetchFromGitHub { owner = "NASA-SW-VnV"; repo = "ikos"; rev = "v${version}"; - hash = "sha256-4/M0fyqvzdr0aBPCUuLiBgqMOrHEmikkIjQMB9KSrdo="; + hash = "sha256-xJuSpQHShggDqLVQaj0a0fEPOWUFIrbGmxazu4FKISs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/jacoco/default.nix b/pkgs/development/tools/analysis/jacoco/default.nix deleted file mode 100644 index 4794e8474d6a..000000000000 --- a/pkgs/development/tools/analysis/jacoco/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchzip -, makeWrapper -, jre -}: - -stdenv.mkDerivation rec { - pname = "jacoco"; - version = "0.8.12"; - - src = fetchzip { - url = "https://search.maven.org/remotecontent?filepath=org/jacoco/jacoco/${version}/jacoco-${version}.zip"; - stripRoot = false; - sha256 = "sha256-7bN68fcUycehJDJeBAyCloz8rb3SXgjwmC9zpob8YdI="; - }; - - outputs = [ "out" "doc" ]; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p $doc/share/doc $out/bin - - cp -r doc $doc/share/doc/jacoco - install -Dm444 lib/* -t $out/share/java - - makeWrapper ${jre}/bin/java $out/bin/jacoco \ - --add-flags "-jar $out/share/java/jacococli.jar" - - runHook postInstall - ''; - - meta = with lib; { - description = "Free code coverage library for Java"; - mainProgram = "jacoco"; - homepage = "https://www.jacoco.org/jacoco"; - changelog = "https://www.jacoco.org/jacoco/trunk/doc/changes.html"; - license = licenses.epl20; - platforms = platforms.all; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix deleted file mode 100644 index efb0bba4a1b2..000000000000 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, zlib -, curl -, elfutils -, python3 -, libiberty -, libopcodes -, runCommandCC -, rustc -}: - -let - self = - stdenv.mkDerivation rec { - pname = "kcov"; - version = "43"; - - src = fetchFromGitHub { - owner = "SimonKagstrom"; - repo = "kcov"; - rev = "v${version}"; - sha256 = "sha256-hRJYuHNSXyRoUDBF/yIPXPcBBxZoTO5cgoB2tBhKPwY="; - }; - - preConfigure = "patchShebangs src/bin-to-c-source.py"; - nativeBuildInputs = [ cmake pkg-config python3 ]; - - buildInputs = [ curl zlib elfutils libiberty libopcodes ]; - - strictDeps = true; - - passthru.tests = { - works-on-c = runCommandCC "works-on-c" { } '' - set -ex - cat - > a.c <<EOF - int main() {} - EOF - $CC a.c -o a.out - ${self}/bin/kcov /tmp/kcov ./a.out - test -e /tmp/kcov/index.html - touch $out - set +x - ''; - - works-on-rust = runCommandCC "works-on-rust" { nativeBuildInputs = [ rustc ]; } '' - set -ex - cat - > a.rs <<EOF - fn main() {} - EOF - # Put gcc in the path so that `cc` is found - rustc a.rs -o a.out - ${self}/bin/kcov /tmp/kcov ./a.out - test -e /tmp/kcov/index.html - touch $out - set +x - ''; - }; - - meta = with lib; { - description = "Code coverage tester for compiled programs, Python scripts and shell scripts"; - - longDescription = '' - Kcov is a code coverage tester for compiled programs, Python - scripts and shell scripts. It allows collecting code coverage - information from executables without special command-line - arguments, and continuosly produces output from long-running - applications. - ''; - - homepage = "http://simonkagstrom.github.io/kcov/index.html"; - license = licenses.gpl2; - changelog = "https://github.com/SimonKagstrom/kcov/blob/master/ChangeLog"; - - maintainers = with maintainers; [ gal_bolle ekleog ]; - platforms = platforms.linux; - }; - }; -in -self diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix deleted file mode 100644 index 0ed0ef816f09..000000000000 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - perl, - python3, - perlPackages, - makeWrapper, -}: - -let - perlDeps = [ - perlPackages.CaptureTiny - perlPackages.DateTime - perlPackages.DateTimeFormatW3CDTF - perlPackages.DevelCover - perlPackages.GD - perlPackages.JSONXS - perlPackages.PathTools - ] ++ lib.optionals (!stdenv.isDarwin) [ perlPackages.MemoryProcess ]; -in -stdenv.mkDerivation rec { - pname = "lcov"; - version = "2.1"; - - src = fetchFromGitHub { - owner = "linux-test-project"; - repo = "lcov"; - rev = "v${version}"; - hash = "sha256-QfA+mzLfpi2fuhcPvCKO7YnPef1GMhCbgBWdXFTXPzE="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ - perl - python3 - ]; - - preBuild = '' - patchShebangs bin/ - makeFlagsArray=(PREFIX=$out LCOV_PERL_PATH=$(command -v perl)) - ''; - - postInstall = '' - for f in "$out"/bin/{gen*,lcov,perl2lcov}; do - wrapProgram "$f" --set PERL5LIB ${perlPackages.makeFullPerlPath perlDeps} - done - ''; - - meta = { - description = "Code coverage tool that enhances GNU gcov"; - - longDescription = '' - LCOV is an extension of GCOV, a GNU tool which provides information - about what parts of a program are actually executed (i.e., - "covered") while running a particular test case. The extension - consists of a set of PERL scripts which build on the textual GCOV - output to implement the following enhanced functionality such as - HTML output. - ''; - - homepage = "https://github.com/linux-test-project/lcov"; - license = lib.licenses.gpl2Plus; - - maintainers = with lib.maintainers; [ dezgeg ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/analysis/makefile2graph/default.nix b/pkgs/development/tools/analysis/makefile2graph/default.nix deleted file mode 100644 index dea310ede42e..000000000000 --- a/pkgs/development/tools/analysis/makefile2graph/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, bash, gnumake }: - -stdenv.mkDerivation rec { - pname = "makefile2graph"; - version = "2021.11.06"; - - src = fetchFromGitHub { - owner = "lindenb"; - repo = "makefile2graph"; - rev = "refs/tags/${version}"; - hash = "sha256-4jyftC0eCJ13X/L4uEWhT5FA5/UXUmSHSoba89GSySQ="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - makeFlags = [ "prefix=$(out)" ]; - - fixupPhase = '' - substituteInPlace $out/bin/makefile2graph \ - --replace '/bin/sh' ${bash}/bin/bash \ - --replace 'make2graph' "$out/bin/make2graph" - wrapProgram $out/bin/makefile2graph \ - --set PATH ${lib.makeBinPath [ gnumake ]} - ''; - - meta = with lib; { - homepage = "https://github.com/lindenb/makefile2graph"; - description = "Creates a graph of dependencies from GNU-Make; Output is a graphiz-dot file or a Gexf-XML file"; - maintainers = with maintainers; [ cmcdragonkai ]; - license = licenses.mit; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/analysis/oclgrind/default.nix b/pkgs/development/tools/analysis/oclgrind/default.nix deleted file mode 100644 index a95c227fae76..000000000000 --- a/pkgs/development/tools/analysis/oclgrind/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages_12, readline, python3 }: - -stdenv.mkDerivation rec { - pname = "oclgrind"; - version = "21.10"; - - src = fetchFromGitHub { - owner = "jrprice"; - repo = "oclgrind"; - rev = "v${version}"; - sha256 = "sha256-DGCF7X2rPV1w9guxg2bMylRirXQgez24sG7Unlct3ow="; - }; - - nativeBuildInputs = [ cmake ]; - nativeCheckInputs = [ python3 ]; - buildInputs = [ llvmPackages_12.llvm llvmPackages_12.clang-unwrapped readline ]; - - cmakeFlags = [ - "-DCLANG_ROOT=${llvmPackages_12.clang-unwrapped}" - ]; - - meta = with lib; { - description = "OpenCL device simulator and debugger"; - homepage = "https://github.com/jrprice/oclgrind"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ athas ]; - }; -} diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix deleted file mode 100644 index 01ba9da439a4..000000000000 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform, qt5, git, cmake -, pkg-config, makeWrapper }: - -rustPlatform.buildRustPackage rec { - pname = "panopticon"; - version = "unstable-20171202"; - - src = fetchFromGitHub { - owner = "das-labor"; - repo = pname; - rev = "33ffec0d6d379d51b38d6ea00d040f54b1356ae4"; - sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa"; - }; - - nativeBuildInputs = [ cmake pkg-config makeWrapper ]; - propagatedBuildInputs = with qt5; [ - qt5.qtbase - qtdeclarative - qtsvg - qtquickcontrols2 - qtgraphicaleffects - git - ]; - - dontWrapQtApps = true; - - cargoHash = "sha256-VQG7WTubznDi7trrnZIPB5SLfvYUzWxHh+z9wOdYDG4="; - doCheck = false; - - postInstall = '' - mkdir -p $out/share/${pname} $out/bin - cp -R qml $out/share/${pname} - mv $out/bin/${pname} $out/share/${pname} - chmod +x $out/share/${pname} - makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} - ''; - - meta = with lib; { - description = "Libre cross-platform disassembler"; - longDescription = '' - Panopticon is a cross platform disassembler for reverse - engineering written in Rust. It can disassemble AMD64, - x86, AVR and MOS 6502 instruction sets and open ELF files. - Panopticon comes with Qt GUI for browsing and annotating - control flow graphs. - ''; - license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ leenaars ]; - broken = true; # Added 2024-03-16 - }; -} diff --git a/pkgs/development/tools/analysis/pev/default.nix b/pkgs/development/tools/analysis/pev/default.nix deleted file mode 100644 index 56b72c24c421..000000000000 --- a/pkgs/development/tools/analysis/pev/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, openssl, fetchFromGitHub }: - -stdenv.mkDerivation { - pname = "pev"; - version = "unstable-2020-05-23"; - - src = fetchFromGitHub { - owner = "merces"; - repo = "pev"; - rev = "beec2b4f09585fea919ed41ce466dee06be0b6bf"; - hash = "sha256-HrMbk9YbuqkoBBM7+rfXpqVEnd1rDl2rMePdcfU1WDg="; - fetchSubmodules = true; - }; - - buildInputs = [ openssl ]; - - enableParallelBuilding = true; - - makeFlags = [ "prefix=$(out)" ]; - - installFlags = [ "prefix=$(out)" ]; - - meta = with lib; { - description = "Full-featured, open source, multiplatform command line toolkit to work with PE (Portable Executables) binaries"; - homepage = "https://pev.sourceforge.net/"; - license = licenses.gpl2; - maintainers = with maintainers; [ jeschli ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 2d7e18d53e4c..9c0be92e2618 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { cp -p converters/op2calltree $out/bin/op2calltree cp -p converters/pprof2calltree $out/bin/pprof2calltree chmod -R +x $out/bin/ - '' + (if stdenv.isDarwin then '' + '' + (if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications cp cgview/cgview.app/Contents/MacOS/cgview $out/bin cp -a qcachegrind/qcachegrind.app $out/Applications @@ -35,7 +35,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Qt GUI to visualize profiling data"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 8d75f994aee6..6bf80144a839 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -46,13 +46,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "radare2"; - version = "5.9.2"; + version = "5.9.6"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-smsjGfTvSTVwd7nhWhptYpkus2fEQ2EVdT5bDt/rHZE="; + hash = "sha256-t/BMsYqNLMAlBBYm6JCDkFYL5YwJBwmEaaIY4KFYxY4="; }; preBuild = '' @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { popd ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath $out/lib $out/lib/libr_io.${finalAttrs.version}.dylib ''; diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix deleted file mode 100644 index 552f5fef7cae..000000000000 --- a/pkgs/development/tools/analysis/randoop/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - version = "4.3.3"; - pname = "randoop"; - - src = fetchurl { - url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "sha256-x9kAoVa4wvUp3gpg9GCodvjwql3CBtn5EqJIZYSSqVI="; - }; - - nativeBuildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/lib $out/doc - - cp -R *.jar $out/lib - cp README.txt $out/doc - ''; - - meta = with lib; { - description = "Automatic test generation for Java"; - homepage = "https://randoop.github.io/randoop/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.mit; - maintainers = with maintainers; [ pSub ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix deleted file mode 100644 index c562479eb052..000000000000 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ /dev/null @@ -1,236 +0,0 @@ -{ stdenv -, fetchFromGitHub -, fetchpatch -, fetchzip -, writeText -, lib -, openssl -, cmake -, autoconf -, automake -, libtool -, pkg-config -, bison -, flex -, groff -, perl -, python3 -, ncurses -, time -, upx -, gtest -, libffi -, libxml2 -, zlib -, enableTests ? true -, buildDevTools ? true -, compileYaraPatterns ? true -}: - -let - # all dependencies that are normally fetched during build time (the subdirectories of `deps`) - # all of these need to be fetched through nix and applied via their <NAME>_URL cmake variable - capstone = fetchFromGitHub { - owner = "capstone-engine"; - repo = "capstone"; - rev = "5.0-rc2"; - sha256 = "sha256-nB7FcgisBa8rRDS3k31BbkYB+tdqA6Qyj9hqCnFW+ME="; - }; - llvm = fetchFromGitHub { - owner = "avast-tl"; - repo = "llvm"; - rev = "2a1f3d8a97241c6e91710be8f84cf3cf80c03390"; - sha256 = "sha256-+v1T0VI9R92ed9ViqsfYZMJtPCjPHCr4FenoYdLuFOU="; - }; - yaracpp = fetchFromGitHub { - owner = "VirusTotal"; - repo = "yara"; - rev = "v4.2.0-rc1"; - sha256 = "sha256-WcN6ClYO2d+/MdG06RHx3kN0o0WVAY876dJiG7CwJ8w="; - }; - yaramod = fetchFromGitHub { - owner = "avast"; - repo = "yaramod"; - rev = "aa06dd408c492a8f4488774caf2ee105ccc23ab5"; - sha256 = "sha256-NVDRf2U5H92EN/Ks//uxNEaeKU+sT4VL4QyyYMO+zKk="; - }; - keystone = fetchFromGitHub { - # only for tests - owner = "keystone-engine"; - repo = "keystone"; - rev = "d7ba8e378e5284e6384fc9ecd660ed5f6532e922"; - sha256 = "1yzw3v8xvxh1rysh97y0i8y9svzbglx2zbsqjhrfx18vngh0x58f"; - }; - - retdec-support-version = "2019-03-08"; - retdec-support = - { rev = retdec-support-version; } // # for checking the version against the expected version - fetchzip { - url = "https://github.com/avast-tl/retdec-support/releases/download/${retdec-support-version}/retdec-support_${retdec-support-version}.tar.xz"; - hash = "sha256-t1tx4MfLW/lwtbO5JQ1nrFBIOeMclq+0dENuXW+ahIM="; - stripRoot = false; - }; - - check-dep = name: dep: - '' - context="$(grep ${name}_URL --after-context 1 cmake/deps.cmake)" - expected="$(echo "$context" | grep --only-matching '".*"')" - have="${dep.rev}" - - echo "checking ${name} dependency matches deps.cmake..."; - if ! echo "$expected" | grep -q "$have"; then - printf '%s\n' "${name} version does not match!" " nix: $have, expected: $expected" - false - fi - ''; - - deps = { - CAPSTONE = capstone; - LLVM = llvm; - YARA = yaracpp; - YARAMOD = yaramod; - SUPPORT_PKG = retdec-support; - } // lib.optionalAttrs enableTests { - KEYSTONE = keystone; - # nixpkgs googletest is used - # GOOGLETEST = googletest; - }; - - # overwrite install-share.py to copy instead of download. - # we use this so the copy happens at the right time in the build, - # otherwise, the build process cleans the directory. - install-share = - writeText - "install-share.py" - '' - import os, sys, shutil, subprocess - - install_path, arch_url, sha256hash_ref, version = sys.argv[1:] - support_dir = os.path.join(install_path, 'share', 'retdec', 'support') - - assert os.path.isdir(arch_url), "nix install-share.py expects a path for support url" - - os.makedirs(support_dir, exist_ok=True) - shutil.copytree(arch_url, support_dir, dirs_exist_ok=True) - subprocess.check_call(['chmod', '-R', 'u+w', support_dir]) - ''; -in -stdenv.mkDerivation (self: { - pname = "retdec"; - - # If you update this you will also need to adjust the versions of the updated dependencies. - # I've notified upstream about this problem here: - # https://github.com/avast-tl/retdec/issues/412 - # - # The dependencies and their sources are listed in this file: - # https://github.com/avast/retdec/blob/master/cmake/deps.cmake - version = "5.0"; - - src = fetchFromGitHub { - owner = "avast"; - repo = "retdec"; - rev = "refs/tags/v${self.version}"; - sha256 = "sha256-H4e+aSgdBBbG6X6DzHGiDEIASPwBVNVsfHyeBTQLAKI="; - }; - - patches = [ - # gcc 13 compatibility: https://github.com/avast/retdec/pull/1153 - (fetchpatch { - url = "https://github.com/avast/retdec/commit/dbaab2c3d17b1eae22c581e8ab6bfefadf4ef6ae.patch"; - hash = "sha256-YqHYPGAGWT4x6C+CpsOSsOIZ+NPM2FBQtGQFs74OUIQ="; - }) - ]; - - nativeBuildInputs = [ - cmake - autoconf - automake - libtool - pkg-config - bison - flex - groff - perl - python3 - ]; - - buildInputs = [ - openssl - ncurses - libffi - libxml2 - zlib - ] ++ lib.optional self.doInstallCheck gtest; - - cmakeFlags = [ - (lib.cmakeBool "RETDEC_TESTS" self.doInstallCheck) # build tests - (lib.cmakeBool "RETDEC_DEV_TOOLS" buildDevTools) # build tools e.g. capstone2llvmir, retdectool - (lib.cmakeBool "RETDEC_COMPILE_YARA" compileYaraPatterns) # build and install compiled patterns - ] ++ lib.mapAttrsToList (k: v: lib.cmakeFeature "${k}_URL" "${v}") deps; - - preConfigure = - lib.concatStringsSep "\n" (lib.mapAttrsToList check-dep deps) - + - '' - cp -v ${install-share} ./support/install-share.py - - # the CMakeLists assume CMAKE_INSTALL_BINDIR, etc are path components but in Nix, they are absolute. - # therefore, we need to remove the unnecessary CMAKE_INSTALL_PREFIX prepend. - substituteInPlace ./CMakeLists.txt \ - --replace-warn "''$"{CMAKE_INSTALL_PREFIX}/"''$"{RETDEC_INSTALL_BIN_DIR} "''$"{CMAKE_INSTALL_FULL_BINDIR} \ - --replace-warn "''$"{CMAKE_INSTALL_PREFIX}/"''$"{RETDEC_INSTALL_LIB_DIR} "''$"{CMAKE_INSTALL_FULL_LIBDIR} \ - - # --replace "''$"{CMAKE_INSTALL_PREFIX}/"''$"{RETDEC_INSTALL_SUPPORT_DIR} "''$"{RETDEC_INSTALL_SUPPORT_DIR} - # note! Nix does not set CMAKE_INSTALL_DATADIR to an absolute path, so this replacement would be incorrect - - # similarly for yaramod. here, we fix the LIBDIR to lib64. for whatever reason, only "lib64" works. - substituteInPlace deps/yaramod/CMakeLists.txt \ - --replace-fail "''$"{YARAMOD_INSTALL_DIR}/"''$"{CMAKE_INSTALL_LIBDIR} "''$"{YARAMOD_INSTALL_DIR}/lib64 \ - --replace-fail CMAKE_ARGS 'CMAKE_ARGS -DCMAKE_INSTALL_LIBDIR=lib64' - - # yara needs write permissions in the generated source directory. - echo ${lib.escapeShellArg '' - ExternalProject_Add_Step( - yara chmod WORKING_DIRECTORY ''${YARA_DIR} - DEPENDEES download COMMAND chmod -R u+w . - ) - ''} >> deps/yara/CMakeLists.txt - - # patch gtest to use the system package - gtest=deps/googletest/CMakeLists.txt - old="$(cat $gtest)" - (echo 'find_package(GTest REQUIRED)'; echo "$old") > $gtest - sed -i 's/ExternalProject_[^(]\+[(]/ set(IGNORED /g' $gtest - - substituteInPlace $gtest \ - --replace-fail '$'{GTEST_LIB} "GTest::gtest"\ - --replace-fail '$'{GMOCK_LIB} "GTest::gmock"\ - --replace-fail '$'{GTEST_MAIN_LIB} "GTest::gtest_main"\ - --replace-fail '$'{GMOCK_MAIN_LIB} "GTest::gmock_main" - - # without git history, there is no chance these tests will pass. - substituteInPlace tests/utils/version_tests.cpp \ - --replace-quiet VersionTests DISABLED_VersionTests - - substituteInPlace scripts/retdec-utils.py \ - --replace-warn /usr/bin/time ${time} \ - --replace-warn /usr/local/bin/gtime ${time} - substituteInPlace scripts/retdec-unpacker.py \ - --replace-warn "'upx'" "'${upx}'" - ''; - - doInstallCheck = enableTests; - installCheckPhase = '' - ${python3.interpreter} "$out/bin/retdec-tests-runner.py" - - rm -rf $out/bin/__pycache__ - ''; - - meta = with lib; { - description = "Retargetable machine-code decompiler based on LLVM"; - homepage = "https://retdec.com"; - license = licenses.mit; - maintainers = with maintainers; [ katrinafyi ]; - platforms = [ "x86_64-linux" ]; - }; -}) diff --git a/pkgs/development/tools/analysis/rizin/0002-disable-pcre2-jit.patch b/pkgs/development/tools/analysis/rizin/0002-disable-pcre2-jit.patch new file mode 100644 index 000000000000..4a10f44612c1 --- /dev/null +++ b/pkgs/development/tools/analysis/rizin/0002-disable-pcre2-jit.patch @@ -0,0 +1,36 @@ +diff --git a/meson.build b/meson.build +index a8153a2ee5..787cbfae06 100644 +--- a/meson.build ++++ b/meson.build +@@ -197,7 +197,7 @@ endif + + # Handle PCRE2 + cpu_jit_supported = [ 'aarch64', 'arm', 'mips', 'mips64', 'ppc', 'ppc64', 'riscv32', 'riscv64', 's390x', 'x86', 'x86_64' ] +-pcre2_jit_supported = target_machine.cpu_family() in cpu_jit_supported and cc.get_id() != 'tcc' and target_machine.system() != 'darwin' ++pcre2_jit_supported = false + if pcre2_jit_supported + add_project_arguments(['-DSUPPORTS_PCRE2_JIT'], language: 'c') + endif +diff --git a/subprojects/packagefiles/pcre2/meson.build b/subprojects/packagefiles/pcre2/meson.build +index b40ea85740..f3ee7a02ed 100644 +--- a/subprojects/packagefiles/pcre2/meson.build ++++ b/subprojects/packagefiles/pcre2/meson.build +@@ -60,18 +60,6 @@ cpu_jit_supported = [ 'aarch64', 'arm', 'mips', 'mips64', 'ppc', 'ppc64', 'riscv + # tcc doesn't support the MSVC asm syntax PCRE2 uses (`__asm { ... }`). + # Darwin kernel not as well, because of forbidden wx memory. + # It is used in the JIT compiler code. +-if cc.get_id() != 'tcc' and target_machine.cpu_family() in cpu_jit_supported and target_machine.system() != 'darwin' +- libpcre2_c_args += ['-DSUPPORT_JIT'] +- pcre2_files += ['src/pcre2_jit_compile.c'] +-endif +- +-if target_machine.system() == 'openbsd' +- # jit compilation fails with "no more memory" if wx allocations are allowed. +- libpcre2_c_args += ['-DSLJIT_WX_EXECUTABLE_ALLOCATOR'] +-elif target_machine.system() == 'netbsd' +- # jit compilation fails with "no more memory" if wx allocations are allowed. +- libpcre2_c_args += ['-DSLJIT_PROT_EXECUTABLE_ALLOCATOR'] +-endif + + pcre2_includes = [ + include_directories('.'), diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix index 44954c62a3c2..123b58e8a21d 100644 --- a/pkgs/development/tools/analysis/rizin/cutter.nix +++ b/pkgs/development/tools/analysis/rizin/cutter.nix @@ -52,7 +52,7 @@ let cutter = stdenv.mkDerivation rec { qttools qtwebengine rizin - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix index f83c3dcdcfac..893242aa4f5a 100644 --- a/pkgs/development/tools/analysis/rizin/default.nix +++ b/pkgs/development/tools/analysis/rizin/default.nix @@ -60,6 +60,8 @@ let rizin = stdenv.mkDerivation rec { ./librz-wrapper-support.patch ./0001-fix-compilation-with-clang.patch + # Can be dropped when upstream fixes this: https://github.com/NixOS/nixpkgs/issues/300056 + ./0002-disable-pcre2-jit.patch ]; @@ -83,7 +85,7 @@ let rizin = stdenv.mkDerivation rec { fi done export LIBRARY_PATH - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace binrz/rizin/macos_sign.sh \ --replace 'codesign' '# codesign' ''; diff --git a/pkgs/development/tools/analysis/rizin/rz-ghidra.nix b/pkgs/development/tools/analysis/rizin/rz-ghidra.nix index fcc014f9944d..d9ef68b8620e 100644 --- a/pkgs/development/tools/analysis/rizin/rz-ghidra.nix +++ b/pkgs/development/tools/analysis/rizin/rz-ghidra.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { # errors out with undefined symbols from Cutter - broken = enableCutterPlugin && stdenv.isDarwin; + broken = enableCutterPlugin && stdenv.hostPlatform.isDarwin; description = "Deep ghidra decompiler and sleigh disassembler integration for rizin"; homepage = finalAttrs.src.meta.homepage; changelog = "${finalAttrs.src.meta.homepage}/releases/tag/${finalAttrs.src.rev}"; diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix deleted file mode 100644 index 6c0f359fff5d..000000000000 --- a/pkgs/development/tools/analysis/spin/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, bison, gcc, tk, swarm, graphviz }: - -let - binPath = lib.makeBinPath [ gcc graphviz tk swarm ]; -in - -stdenv.mkDerivation rec { - pname = "spin"; - version = "6.5.2"; - - src = fetchFromGitHub { - owner = "nimble-code"; - repo = "Spin"; - rev = "version-${version}"; - sha256 = "sha256-drvQXfDZCZRycBZt/VNngy8zs4XVJg+d1b4dQXVcyFU="; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ bison ]; - - sourceRoot = "${src.name}/Src"; - - preBuild = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man1 - ''; - - enableParallelBuilding = true; - makeFlags = [ "DESTDIR=$(out)" ]; - - postInstall = '' - wrapProgram $out/bin/spin --prefix PATH : ${binPath} - - mkdir -p $out/share/spin - cp $src/optional_gui/ispin.tcl $out/share/spin - makeWrapper $out/share/spin/ispin.tcl $out/bin/ispin \ - --prefix PATH : $out/bin:${binPath} - ''; - - meta = with lib; { - description = "Formal verification tool for distributed software systems"; - homepage = "https://spinroot.com/"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ pSub siraben ]; - }; -} diff --git a/pkgs/development/tools/analysis/splint/default.nix b/pkgs/development/tools/analysis/splint/default.nix index e22a8b380926..7bff76d87dbd 100644 --- a/pkgs/development/tools/analysis/splint/default.nix +++ b/pkgs/development/tools/analysis/splint/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "02pv8kscsrkrzip9r08pfs9xs98q74c52mlxzbii6cv6vx1vd3f7"; }; - patches = [ ./tmpdir.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch; + patches = [ ./tmpdir.patch ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; buildInputs = [ flex ]; diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix deleted file mode 100644 index b4fb2512596a..000000000000 --- a/pkgs/development/tools/analysis/svlint/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -}: - -rustPlatform.buildRustPackage rec { - pname = "svlint"; - version = "0.9.3"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-u61gmkO7eij7r1A1RPk0ro+pml7ZmMsg0ukJLCFNaD0="; - }; - - cargoHash = "sha256-HBfCTOETQ1hHzLFDw12W58omRmliiWDFGSrmr3PELD8="; - - cargoBuildFlags = [ "--bin" "svlint" ]; - - meta = with lib; { - description = "SystemVerilog linter"; - mainProgram = "svlint"; - homepage = "https://github.com/dalance/svlint"; - changelog = "https://github.com/dalance/svlint/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ trepetti ]; - }; -} diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix deleted file mode 100644 index 18ecc912915f..000000000000 --- a/pkgs/development/tools/analysis/swarm/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "swarm"; - version = "unstable-2019-03-11"; - - src = fetchFromGitHub { - owner = "nimble-code"; - repo = "swarm"; - rev = "4b36ed83c8fbb074f2dc5777fe1c0ab4d73cc7d9"; - sha256 = "18zwlwsiiksivjpg6agmbmg0zsw2fl9475ss66b6pgcsya2q4afs"; - }; - - installPhase = '' - install -Dm755 Src/swarm $out/bin/swarm - install -Dm644 Doc/swarm.1 $out/share/man/man1/swarm.1 - ''; - - meta = with lib; { - description = "Verification script generator for Spin"; - mainProgram = "swarm"; - homepage = "http://spinroot.com/"; - license = licenses.free; - platforms = platforms.unix; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix index d9a851d09824..f29d54a9eefe 100644 --- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix +++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tflint-ruleset-aws"; - version = "0.32.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-sgAr4kUBjKIH+DgI5XqH/Zs3uL0yiYwlBa6vO0m++xM="; + hash = "sha256-osQhLnOuJQqyKm24mgaEuYKy69cPvnR3XHU0JgVKA84="; }; - vendorHash = "sha256-B2QFjJKwfQYZP8ypiv7bNkFNr3ejP42WA/bmv4Jz46c="; + vendorHash = "sha256-mhc8HJG+sI8pZG/D+91+pyi0RGK0WfZV6ZNuH1bUfhk="; # 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 deleted file mode 100644 index c3a7b65b051d..000000000000 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, runCommand -, makeWrapper -, tflint -, tflint-plugins -, symlinkJoin -}: - -buildGoModule rec { - pname = "tflint"; - version = "0.52.0"; - - src = fetchFromGitHub { - owner = "terraform-linters"; - repo = pname; - rev = "v${version}"; - hash = "sha256-H27krznCX00F0EZ4ahdsMVh+wcAAUC/ErQac9Y4QaJs="; - }; - - vendorHash = "sha256-jTwzheC/BtcuLGwtLanOccbidOPCHmqxJ4Mwhsid6jY="; - - doCheck = false; - - subPackages = [ "." ]; - - ldflags = [ "-s" "-w" ]; - - passthru.withPlugins = plugins: - let - actualPlugins = plugins tflint-plugins; - pluginDir = symlinkJoin { - name = "tflint-plugin-dir"; - paths = [ actualPlugins ]; - }; - in - runCommand "tflint-with-plugins" - { - nativeBuildInputs = [ makeWrapper ]; - } '' - makeWrapper ${tflint}/bin/tflint $out/bin/tflint \ - --set TFLINT_PLUGIN_DIR "${pluginDir}" - ''; - - meta = with lib; { - description = "Terraform linter focused on possible errors, best practices, and so on"; - mainProgram = "tflint"; - homepage = "https://github.com/terraform-linters/tflint"; - changelog = "https://github.com/terraform-linters/tflint/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix deleted file mode 100644 index 0865a3b7ae79..000000000000 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule rec { - pname = "tfsec"; - version = "1.28.10"; - - src = fetchFromGitHub { - owner = "aquasecurity"; - repo = "tfsec"; - rev = "refs/tags/v${version}"; - hash = "sha256-Dulbo5ZTw4+1XxjpnZ1aIsVPLVEqwQKdNMv+L9/j1wc="; - }; - - ldflags = [ - "-s" - "-w" - "-X=github.com/aquasecurity/tfsec/version.Version=v${version}" - ## not sure if this is needed (https://github.com/aquasecurity/tfsec/blob/master/.goreleaser.yml#L6) - # "-extldflags '-fno-PIC -static'" - ]; - - vendorHash = "sha256-Hu530cBJWGtvMmQ6gbROXf5JBfkOfc4nwznsKBTegUk="; - - subPackages = [ - "cmd/tfsec" - "cmd/tfsec-docs" - "cmd/tfsec-checkgen" - ]; - - meta = with lib; { - description = "Static analysis powered security scanner for terraform code"; - homepage = "https://github.com/aquasecurity/tfsec"; - changelog = "https://github.com/aquasecurity/tfsec/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ - fab - peterromfeldhk - ]; - }; -} diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index c54fb7bfeeab..fe44e8b1922f 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -49,18 +49,18 @@ stdenv.mkDerivation rec { # GDB is needed to provide a sane default for `--db-command'. # Perl is needed for `callgrind_{annotate,control}'. - buildInputs = [ gdb perl ] ++ lib.optionals (stdenv.isDarwin) [ bootstrap_cmds xnu ]; + buildInputs = [ gdb perl ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ bootstrap_cmds xnu ]; # Perl is also a native build input. nativeBuildInputs = [ autoreconfHook perl ]; enableParallelBuilding = true; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.hostPlatform.isLinux; - preConfigure = lib.optionalString stdenv.isFreeBSD '' + preConfigure = lib.optionalString stdenv.hostPlatform.isFreeBSD '' substituteInPlace configure --replace '`uname -r`' \ ${toString stdenv.hostPlatform.parsed.kernel.version}.0- - '' + lib.optionalString stdenv.isDarwin ( + '' + lib.optionalString stdenv.hostPlatform.isDarwin ( let OSRELEASE = '' $(awk -F '"' '/#define OSRELEASE/{ print $2 }' \ <${xnu}/Library/Frameworks/Kernel.framework/Headers/libkern/version.h)''; @@ -133,6 +133,6 @@ stdenv.mkDerivation rec { (x86 ++ power ++ s390x ++ armv7 ++ aarch64 ++ mips) (darwin ++ freebsd ++ illumos ++ linux); badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; - broken = stdenv.isDarwin; # https://hydra.nixos.org/build/128521440/nixlog/2 + broken = stdenv.hostPlatform.isDarwin; # https://hydra.nixos.org/build/128521440/nixlog/2 }; } diff --git a/pkgs/development/tools/analysis/yallback/default.nix b/pkgs/development/tools/analysis/yallback/default.nix deleted file mode 100644 index 19ad53d038df..000000000000 --- a/pkgs/development/tools/analysis/yallback/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, makeWrapper -, coreutils -, bashInteractive -}: - -stdenv.mkDerivation rec { - version = "0.2.0"; - pname = "yallback"; - src = fetchFromGitHub { - owner = "abathur"; - repo = "yallback"; - rev = "v${version}"; - hash = "sha256-t+fdnDJMFiFqN23dSY3TnsZsIDcravtwdNKJ5MiZosE="; - }; - - buildInputs = [ coreutils bashInteractive ]; - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - install -Dv yallback $out/bin/yallback - wrapProgram $out/bin/yallback --prefix PATH : ${lib.makeBinPath [ coreutils ]} - ''; - - meta = with lib; { - description = "Callbacks for YARA rule matches"; - mainProgram = "yallback"; - homepage = "https://github.com/abathur/yallback"; - license = licenses.mit; - maintainers = with maintainers; [ abathur ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/ansi/default.nix b/pkgs/development/tools/ansi/default.nix deleted file mode 100644 index 77ddf81a269a..000000000000 --- a/pkgs/development/tools/ansi/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ fetchCrate, lib, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "ansi-escape-sequences-cli"; - version = "0.1.4"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-KGPlNXkF16VdoOb3tg3nsQRdtgU83z7ibPy965bvvDk="; - }; - - cargoHash = "sha256-Q46VKBrOsjqUeSruuK/Bur2L69JAGr3c+ianfPlfzi0="; - - meta = { - description = "Quickly get ANSI escape sequences"; - longDescription = '' - CLI utility called "ansi" to quickly get ANSI escape sequences. Supports - the colors and styles, such as bold or italic. - ''; - homepage = "https://github.com/phip1611/ansi-escape-sequences-cli"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ phip1611 ]; - mainProgram = "ansi"; - }; -} diff --git a/pkgs/development/tools/apkid/default.nix b/pkgs/development/tools/apkid/default.nix deleted file mode 100644 index d54a6564908a..000000000000 --- a/pkgs/development/tools/apkid/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, fetchFromGitHub -, python3 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "apkid"; - version = "2.1.5"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "rednaga"; - repo = "APKiD"; - rev = "refs/tags/v${version}"; - hash = "sha256-yO3k2kT043/KkiCjDnNUlqxX86kQqMZ+CghD+yon3r4="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - yara-python - ]; - - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; - - preBuild = '' - # Prepare the YARA rules - ${python3.interpreter} prep-release.py - ''; - - postPatch = '' - # We have dex support enabled in yara-python - substituteInPlace setup.py \ - --replace "yara-python-dex>=1.0.1" "yara-python" - ''; - - pythonImportsCheck = [ - "apkid" - ]; - - meta = with lib; { - description = "Android Application Identifier"; - mainProgram = "apkid"; - homepage = "https://github.com/rednaga/APKiD"; - license = with licenses; [ gpl3Only ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix index 879d88cf0a92..cb8d4f2eafac 100644 --- a/pkgs/development/tools/apko/default.nix +++ b/pkgs/development/tools/apko/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "apko"; - version = "0.14.1"; + version = "0.19.6"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-O1lU3b3dNmFcV0Dfkpw63Eu6AgLSLBi7MbF47OsjgL4="; + hash = "sha256-zcAV+6GdytdUsVxJCNIhfeVGjWFZ2/mgmwpIXTFLEhk="; # 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; @@ -24,7 +24,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-shnVJ6TcqWxUu1Ib2ewaz2VK4mi1Rt3R0Cmof9ilDJ4="; + vendorHash = "sha256-vQjsKQ49ksea5GZXEd7XjGkN0IoW2HQekyQL5fmwCTc="; nativeBuildInputs = [ installShellFiles ]; @@ -41,9 +41,19 @@ buildGoModule rec { ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)" ''; + preCheck = '' + # some tests require a writable HOME + export HOME=$(mktemp -d) + + # some test data include SOURCE_DATE_EPOCH (which is different from our default) + # and the default version info which we get by unsetting our ldflags + export SOURCE_DATE_EPOCH=0 + ldflags= + ''; + checkFlags = [ - # fails to run on read-only filesystem - "-skip=(TestPublish|TestBuild|TestTarFS)" + # requires networking (apk.chainreg.biz) + "-skip=TestInitDB_ChainguardDiscovery" ]; postInstall = '' @@ -69,6 +79,6 @@ buildGoModule rec { description = "Build OCI images using APK directly without Dockerfile"; mainProgram = "apko"; license = licenses.asl20; - maintainers = with maintainers; [ jk developer-guy ]; + maintainers = with maintainers; [ jk developer-guy emilylange ]; }; } diff --git a/pkgs/development/tools/apksigcopier/default.nix b/pkgs/development/tools/apksigcopier/default.nix deleted file mode 100644 index 1262c9eaaa75..000000000000 --- a/pkgs/development/tools/apksigcopier/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, apksigner -, bash -, fetchFromGitHub -, installShellFiles -, pandoc -, python3 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "apksigcopier"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "obfusk"; - repo = "apksigcopier"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-VuwSaoTv5qq1jKwgBTKd1y9RKUzz89n86Z4UBv7Q51o="; - }; - - nativeBuildInputs = [ - installShellFiles - pandoc - ]; - - propagatedBuildInputs = with python3.pkgs; [ - click - ]; - - makeWrapperArgs = [ - "--prefix" - "PATH" - ":" - "${lib.makeBinPath [ apksigner ]}" - ]; - - postPatch = '' - substituteInPlace Makefile \ - --replace /bin/bash ${bash}/bin/bash - ''; - - postBuild = '' - make ${pname}.1 - ''; - - postInstall = '' - installManPage ${pname}.1 - ''; - - doInstallCheck = true; - - installCheckPhase = '' - runHook preInstallCheck - $out/bin/apksigcopier --version | grep "${version}" - runHook postInstallCheck - ''; - - meta = with lib; { - description = "Copy/extract/patch android apk signatures & compare APKs"; - mainProgram = "apksigcopier"; - longDescription = '' - apksigcopier is a tool for copying android APK signatures from a signed - APK to an unsigned one (in order to verify reproducible builds). - It can also be used to compare two APKs with different signatures. - Its command-line tool offers four operations: - - * copy signatures directly from a signed to an unsigned APK - * extract signatures from a signed APK to a directory - * patch previously extracted signatures onto an unsigned APK - * compare two APKs with different signatures (requires apksigner) - ''; - homepage = "https://github.com/obfusk/apksigcopier"; - license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ obfusk ]; - }; -} diff --git a/pkgs/development/tools/apksigner/default.nix b/pkgs/development/tools/apksigner/default.nix deleted file mode 100644 index 0a918df061a7..000000000000 --- a/pkgs/development/tools/apksigner/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, stdenv -, fetchgit -, jdk_headless -, gradle -, makeWrapper -}: - -stdenv.mkDerivation rec { - pname = "apksigner"; - version = "34.0.5-unstable-2024-03-06"; - - src = fetchgit { - # use pname here because the final jar uses this as the filename - name = pname; - url = "https://android.googlesource.com/platform/tools/apksig"; - rev = "ac5cbb07d87cc342fcf07715857a812305d69888"; - hash = "sha256-sLAs7XEkhNkQjB/nhBODxI3QzxFvLWM1SBKDuXp6gvw="; - }; - - postPatch = '' - cat >> build.gradle <<EOF - - apply plugin: 'application' - mainClassName = "com.android.apksigner.ApkSignerTool" - sourceSets.main.java.srcDirs = [ 'src/apksigner/java', 'src/main/java' ] - jar { - manifest { attributes "Main-Class": "com.android.apksigner.ApkSignerTool" } - from { (configurations.runtimeClasspath).collect { it.isDirectory() ? it : zipTree(it) } } { - exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/native/*.dll' - } - from('src/apksigner/java') { - include 'com/android/apksigner/*.txt' - } - } - tasks.named("processTestResources") { dependsOn("extractTestProto") } - EOF - sed -i -e '/conscrypt/s/testImplementation/implementation/' build.gradle - ''; - - mitmCache = gradle.fetchDeps { - inherit pname; - data = ./deps.json; - }; - - __darwinAllowLocalNetworking = true; - - doCheck = true; - - nativeBuildInputs = [ gradle makeWrapper ]; - - installPhase = '' - install -Dm444 build/libs/apksigner.jar -t $out/lib - makeWrapper "${jdk_headless}/bin/java" "$out/bin/apksigner" \ - --add-flags "-jar $out/lib/apksigner.jar" - ''; - - meta = with lib; { - description = "Command line tool to sign and verify Android APKs"; - mainProgram = "apksigner"; - homepage = "https://developer.android.com/studio/command-line/apksigner"; - license = licenses.asl20; - maintainers = with maintainers; [ linsui ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/apksigner/deps.json b/pkgs/development/tools/apksigner/deps.json deleted file mode 100644 index a0f5ccb9c489..000000000000 --- a/pkgs/development/tools/apksigner/deps.json +++ /dev/null @@ -1,119 +0,0 @@ -{ - "!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/apktool/default.nix b/pkgs/development/tools/apktool/default.nix deleted file mode 100644 index 5b2585f6bce7..000000000000 --- a/pkgs/development/tools/apktool/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, fetchurl -, makeWrapper -, jdk_headless -, aapt -}: - -stdenv.mkDerivation rec { - pname = "apktool"; - version = "2.10.0"; - - src = fetchurl { - urls = [ - "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" - "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" - ]; - hash = "sha256-wDUKu6tTFCSN/i7gyQfe9O3RT2+u8fXTctPUq9KPBDE="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - - sourceRoot = "."; - - installPhase = - '' - install -D ${src} "$out/libexec/apktool/apktool.jar" - mkdir -p "$out/bin" - makeWrapper "${jdk_headless}/bin/java" "$out/bin/apktool" \ - --add-flags "-jar $out/libexec/apktool/apktool.jar" \ - --prefix PATH : ${lib.getBin aapt} - ''; - - meta = with lib; { - description = "Tool for reverse engineering Android apk files"; - mainProgram = "apktool"; - homepage = "https://ibotpeaches.github.io/Apktool/"; - changelog = "https://github.com/iBotPeaches/Apktool/releases/tag/v${version}"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.asl20; - maintainers = with maintainers; [ offline ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/development/tools/ashpd-demo/default.nix deleted file mode 100644 index 8c9127296b17..000000000000 --- a/pkgs/development/tools/ashpd-demo/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cargo -, meson -, ninja -, rustPlatform -, rustc -, pkg-config -, glib -, libshumate -, gst_all_1 -, gtk4 -, libadwaita -, pipewire -, wayland -, wrapGAppsHook4 -, desktop-file-utils -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "ashpd-demo"; - version = "0.4.1"; - - src = fetchFromGitHub { - owner = "bilelmoussaoui"; - repo = "ashpd"; - rev = "${finalAttrs.version}-demo"; - hash = "sha256-fIyJEUcyTcjTbBycjuJb99wALQelMT7Zq6PHKcL2F80="; - }; - - cargoDeps = rustPlatform.fetchCargoTarball { - src = "${finalAttrs.src}/ashpd-demo"; - hash = "sha256-ldflCBErM9w3eO2DwWfYTrdO7lowZtqfj7Fft6Crl1w="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - cargo - rustPlatform.cargoSetupHook - rustc - wrapGAppsHook4 - rustPlatform.bindgenHook - desktop-file-utils - glib # for glib-compile-schemas - ]; - - buildInputs = [ - glib - gtk4 - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - libadwaita - pipewire - wayland - libshumate - ]; - - postPatch = '' - cd ashpd-demo - ''; - - meta = with lib; { - description = "Tool for playing with XDG desktop portals"; - mainProgram = "ashpd-demo"; - homepage = "https://github.com/bilelmoussaoui/ashpd/tree/master/ashpd-demo"; - license = licenses.mit; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix deleted file mode 100644 index 1c22f3ea1781..000000000000 --- a/pkgs/development/tools/asmfmt/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ buildGoModule -, lib -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "asmfmt"; - version = "1.3.2"; - - src = fetchFromGitHub { - owner = "klauspost"; - repo = "asmfmt"; - rev = "v${version}"; - sha256 = "sha256-YxIVqPGsqxvOY0Qz4Jw5FuO9IbplCICjChosnHrSCgc="; - }; - - vendorHash = null; - - # This package comes with its own version of goimports, gofmt and goreturns - # but these binaries are outdated and are offered by other packages. - subPackages = [ "cmd/asmfmt" ]; - - ldflags = [ "-s" "-w" ]; - - # There are no tests. - doCheck = false; - - meta = with lib; { - description = "Go assembler formatter"; - mainProgram = "asmfmt"; - longDescription = '' - This will format your assembler code in a similar way that gofmt formats - your Go code. - ''; - homepage = "https://github.com/klauspost/asmfmt"; - changelog = "https://github.com/klauspost/asmfmt/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; - }; -} diff --git a/pkgs/development/tools/async/default.nix b/pkgs/development/tools/async/default.nix deleted file mode 100644 index dd2ea5205335..000000000000 --- a/pkgs/development/tools/async/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "async"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "ctbur"; - repo = pname; - rev = "v${version}"; - sha256 = "19ypflbayi5l0mb8yw7w0a4bq9a3w8nl9jsxapp9m3xggzmsvrxx"; - }; - - cargoHash = "sha256-jIL7ZFzRMQuGLmMatGegkYRYctlsl3RRUfChgaIhWHg="; - - meta = with lib; { - description = "Tool to parallelize shell commands"; - mainProgram = "async"; - longDescription = '' - `async` is a tool to run shell commands in parallel and is designed to be - able to quickly parallelize shell scripts with minimal changes. It was - inspired by GNU Parallel, with the main difference being that async - retains state between commands by running a server in the background. - ''; - homepage = "https://github.com/ctbur/async"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ minijackson ]; - }; -} diff --git a/pkgs/development/tools/ats-acc/default.nix b/pkgs/development/tools/ats-acc/default.nix deleted file mode 100644 index b8eef344f20d..000000000000 --- a/pkgs/development/tools/ats-acc/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, ats2 }: - -stdenv.mkDerivation rec { - pname = "ats-acc"; - version = "unstable-2018-10-21"; - - src = fetchFromGitHub { - owner = "sparverius"; - repo = pname; - rev = "2d49f4e76d0fe1f857ceb70deba4aed13c306dcb"; - sha256 = "sha256-Wp39488YNL40GKp4KaJwhi75PsYP+gMtrZqAvs4Q/sw="; - }; - - postPatch = '' - substituteInPlace Makefile \ - --replace "mv acc \''$(PATSHOME)/bin/" "install -Dm755 acc ${placeholder "out"}/bin/" - ''; - - nativeBuildInputs = [ ats2 ]; - - meta = with lib; { - description = "Pretty-print error messages of the ATS Compiler"; - homepage = "https://github.com/sparverius/ats-acc"; - maintainers = with maintainers; [ moni ]; - license = licenses.unfree; # Upstream has no license - }; -} diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix deleted file mode 100644 index 9615d4574cdb..000000000000 --- a/pkgs/development/tools/avro-tools/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, jre, lib }: - -stdenv.mkDerivation rec { - pname = "avro-tools"; - version = "1.11.3"; - - src = fetchurl { - url = - "mirror://maven/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar"; - sha256 = "sha256-dPaV1rZxxE+G/gB7hEDyiMI7ZbzkTpNEtexp/Y6hrPI="; - }; - - dontUnpack = true; - - buildInputs = [ jre ]; - nativeBuildInputs = [ makeWrapper ]; - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/libexec/avro-tools - cp $src $out/libexec/avro-tools/${pname}.jar - - makeWrapper ${jre}/bin/java $out/bin/avro-tools \ - --add-flags "-jar $out/libexec/avro-tools/${pname}.jar" - ''; - - meta = with lib; { - homepage = "https://avro.apache.org/"; - description = "Avro command-line tools and utilities"; - mainProgram = "avro-tools"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = lib.licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix deleted file mode 100644 index bc28ff15db2e..000000000000 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ /dev/null @@ -1,165 +0,0 @@ -{ - lib, - python3, - fetchFromGitHub, - git, - testers, - aws-sam-cli, - nix-update-script, - enableTelemetry ? false, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "aws-sam-cli"; - version = "1.120.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "aws"; - repo = "aws-sam-cli"; - rev = "refs/tags/v${version}"; - hash = "sha256-XFVh7e9ooIBhWRkVovPdrSuyosBMQ84PDRjV2o0x9ns="; - }; - - build-system = with python3.pkgs; [ setuptools ]; - - pythonRelaxDeps = [ - "aws-lambda-builders" - "aws-sam-translator" - "boto3-stubs" - "cfn-lint" - "cookiecutter" - "docker" - "jsonschema" - "pyopenssl" - "requests" - "rich" - "ruamel-yaml" - "tomlkit" - "tzlocal" - "watchdog" - ]; - - dependencies = - with python3.pkgs; - [ - aws-lambda-builders - aws-sam-translator - boto3 - boto3-stubs - cfn-lint - chevron - click - cookiecutter - dateparser - docker - flask - jsonschema - pyopenssl - pyyaml - requests - rich - ruamel-yaml - tomlkit - typing-extensions - tzlocal - watchdog - ] - ++ (with python3.pkgs.boto3-stubs.optional-dependencies; [ - apigateway - cloudformation - ecr - iam - kinesis - lambda - s3 - schemas - secretsmanager - signer - sqs - stepfunctions - sts - xray - ]); - - postFixup = '' - # Disable telemetry: https://github.com/aws/aws-sam-cli/issues/1272 - wrapProgram $out/bin/sam \ - --set SAM_CLI_TELEMETRY ${if enableTelemetry then "1" else "0"} \ - --prefix PATH : $out/bin:${lib.makeBinPath [ git ]} - ''; - - nativeCheckInputs = with python3.pkgs; [ - filelock - flaky - jaraco-text - parameterized - psutil - pytest-timeout - pytest-xdist - pytestCheckHook - ]; - - preCheck = '' - export HOME=$(mktemp -d) - export PATH="$PATH:$out/bin:${lib.makeBinPath [ git ]}" - ''; - - pytestFlagsArray = [ - "tests" - # Disable warnings - "-W" - "ignore::DeprecationWarning" - ]; - - disabledTestPaths = [ - # Disable tests that requires networking or complex setup - "tests/end_to_end" - "tests/integration" - "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" - ]; - - disabledTests = [ - # Disable flaky tests - "test_update_stage" - "test_delete_deployment" - "test_request_with_no_data" - "test_import_should_succeed_for_a_defined_hidden_package_540_pkg_resources_py2_warn" - ]; - - pythonImportsCheck = [ "samcli" ]; - - passthru = { - tests.version = testers.testVersion { - package = aws-sam-cli; - command = "sam --version"; - }; - updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "^v([0-9.]+)$" - ]; - }; - }; - - __darwinAllowLocalNetworking = true; - - meta = with lib; { - description = "CLI tool for local development and testing of Serverless applications"; - homepage = "https://github.com/aws/aws-sam-cli"; - changelog = "https://github.com/aws/aws-sam-cli/releases/tag/v${version}"; - license = licenses.asl20; - mainProgram = "sam"; - maintainers = with maintainers; [ - lo1tuma - anthonyroussel - ]; - }; -} diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix deleted file mode 100644 index 1ca6c587c974..000000000000 --- a/pkgs/development/tools/azcopy/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, fetchFromGitHub -, buildGoModule -}: - -buildGoModule rec { - pname = "azure-storage-azcopy"; - version = "10.26.0"; - - src = fetchFromGitHub { - owner = "Azure"; - repo = "azure-storage-azcopy"; - rev = "refs/tags/v${version}"; - hash = "sha256-u6ngYEHqNVjz0YYkWhFnoQGCBRMHLdOzFTee8plwoDo="; - }; - - subPackages = [ "." ]; - - vendorHash = "sha256-C8UopiCSp6qFeaDNE+w2QUKbSHALSSeV5WVo4lkLDrs="; - - doCheck = false; - - postInstall = '' - ln -rs "$out/bin/azure-storage-azcopy" "$out/bin/azcopy" - ''; - - meta = with lib; { - description = "New Azure Storage data transfer utility - AzCopy v10"; - homepage = "https://github.com/Azure/azure-storage-azcopy"; - changelog = "https://github.com/Azure/azure-storage-azcopy/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ colemickens kashw2 ]; - }; -} diff --git a/pkgs/development/tools/azure-functions-core-tools/default.nix b/pkgs/development/tools/azure-functions-core-tools/default.nix deleted file mode 100644 index 17c3a181ec9a..000000000000 --- a/pkgs/development/tools/azure-functions-core-tools/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, - stdenv, - fetchFromGitHub, - buildDotnetModule, - buildGoModule, - dotnetCorePackages, -}: -let - version = "4.0.5455"; - src = fetchFromGitHub { - owner = "Azure"; - repo = "azure-functions-core-tools"; - rev = version; - sha256 = "sha256-Ip1m0/l0YWFosYfp8UeREg9DP5pnvRnXyAaAuch7Op4="; - }; - gozip = buildGoModule { - pname = "gozip"; - inherit version; - src = src + "/tools/go/gozip"; - vendorHash = null; - }; -in -buildDotnetModule rec { - pname = "azure-functions-core-tools"; - inherit src version; - - dotnet-runtime = dotnetCorePackages.sdk_6_0; - nugetDeps = ./deps.nix; - useDotnetFromEnv = true; - executables = [ "func" ]; - - postPatch = '' - substituteInPlace src/Azure.Functions.Cli/Common/CommandChecker.cs \ - --replace "CheckExitCode(\"/bin/bash" "CheckExitCode(\"${stdenv.shell}" - ''; - - postInstall = '' - mkdir -p $out/bin - ln -s ${gozip}/bin/gozip $out/bin/gozip - ''; - - meta = with lib; { - homepage = "https://github.com/Azure/azure-functions-core-tools"; - description = "Command line tools for Azure Functions"; - license = licenses.mit; - maintainers = with maintainers; [ mdarocha detegr ]; - platforms = ["x86_64-linux" "aarch64-darwin" "x86_64-darwin"]; - }; -} diff --git a/pkgs/development/tools/azure-functions-core-tools/deps.nix b/pkgs/development/tools/azure-functions-core-tools/deps.nix deleted file mode 100644 index e9e53a5716bf..000000000000 --- a/pkgs/development/tools/azure-functions-core-tools/deps.nix +++ /dev/null @@ -1,673 +0,0 @@ -# This file was automatically generated by passthru.fetch-deps. -# Please dont edit it manually, your changes might get overwritten! - -{ fetchNuGet }: [ - (fetchNuGet { pname = "AccentedCommandLineParser"; version = "2.0.0"; sha256 = "0s215i49ffbs2jdrfrs045yffp0kcx5cm16nf67xiqp4rs1n51jv"; }) - (fetchNuGet { pname = "Autofac"; version = "4.6.2"; sha256 = "00046qyg8qljhk6krcifyqj6n9xfgpxnwv3rcni5iahbj5xz4kvq"; }) - (fetchNuGet { pname = "Azure.Core"; version = "1.15.0"; sha256 = "0hf7z1nqsw62pxp8iy4nnfz4q9askymj9669iqac8szpzlvwn71l"; }) - (fetchNuGet { pname = "Azure.Core"; version = "1.19.0"; sha256 = "08l7d6cq1gl1g2qvlrc80z754f9amwnmgf33vnr7dywsbrx6qic5"; }) - (fetchNuGet { pname = "Azure.Core"; version = "1.34.0"; sha256 = "1rvzg508kkadkpamkjry4xzid9d7hi8af5ydsc0vnidksm1ppv6x"; }) - (fetchNuGet { pname = "Azure.Identity"; version = "1.10.0"; sha256 = "0lrw7l88y1vqc23y0j2dsn2qbn9h50212c04jn74g4xkq7g2siac"; }) - (fetchNuGet { pname = "Azure.Security.KeyVault.Secrets"; version = "4.2.0"; sha256 = "1l9jjlymccglbngkl9kd18zx70sz5n4d11zbmx6pwadh5nihcmnc"; }) - (fetchNuGet { pname = "Azure.Storage.Blobs"; version = "12.13.0"; sha256 = "0cpzvn0j8nwndh580rpakp29835mm0fx3yli8wb23wvkaq8y4glh"; }) - (fetchNuGet { pname = "Azure.Storage.Blobs"; version = "12.9.0"; sha256 = "15f4wwg3dvhpkx323rg3nfyjn7xn01p2aqs0isrgkgyq0hggal9i"; }) - (fetchNuGet { pname = "Azure.Storage.Common"; version = "12.12.0"; sha256 = "1n29vfldnali71jawb2bwwkv3dvflw6zhkgpq96zk9ic6s23zm44"; }) - (fetchNuGet { pname = "Azure.Storage.Common"; version = "12.8.0"; sha256 = "0a1k8xrsqr22fihqqzv289g8rycj6v8kha3ry06b2lvl4pr4vd9l"; }) - (fetchNuGet { pname = "Castle.Core"; version = "4.2.0"; sha256 = "098vn490ivggchn13w23s8bfp9w2f0gp9pc4xjp0p16lxqp44vh7"; }) - (fetchNuGet { pname = "Castle.Core"; version = "4.2.1"; sha256 = "18qbjsaah23jg9r24wjcy4jlggbz1dq6sw621d8314jhyhjxvw0l"; }) - (fetchNuGet { pname = "Colors.Net"; version = "1.1.0"; sha256 = "1jw7iijz9djih518fiiagdnqjppzgivgv4g49pq61v3sh2l0zl87"; }) - (fetchNuGet { pname = "DotNetZip"; version = "1.13.3"; sha256 = "1a62pyalgzvvy5xrqbvif1ia2v3swj1z2m2pijxm6yn3h8dhnlg6"; }) - (fetchNuGet { pname = "Dynamitey"; version = "2.0.9.136"; sha256 = "1wzd4g58bgvlxj2wkx71jgv6yxaikgm2q9b8cvicr2hndr6wl6y1"; }) - (fetchNuGet { pname = "FluentAssertions"; version = "5.2.0"; sha256 = "14bjayrmh5zsipg9m0v8vjvi8ma945nhw7ysfc96d501f5kkcnab"; }) - (fetchNuGet { pname = "FSharp.Core"; version = "3.1.2.5"; sha256 = "0pfvjimrgrffb5rj612gsid044lfpk8g2cxyh9792dc1n8ck5hih"; }) - (fetchNuGet { pname = "Google.Protobuf"; version = "3.23.1"; sha256 = "0kma0srl4qwmlrkkfi2viqf7a7vr70ifx1b8asvhx22j3vf42r8w"; }) - (fetchNuGet { pname = "Grpc.AspNetCore"; version = "2.55.0"; sha256 = "12nrpwf364nvlnkz9f9mjq0j3w3an2ijbfzd4v5bd335c2x1mv99"; }) - (fetchNuGet { pname = "Grpc.AspNetCore.Server"; version = "2.55.0"; sha256 = "1y4xgszrw885nm8xmq6i2i61liihp96a3x4n14306iwki8rd3r3i"; }) - (fetchNuGet { pname = "Grpc.AspNetCore.Server.ClientFactory"; version = "2.55.0"; sha256 = "0ns4f7k5jq0lcgfn3h9g5bxv5cyqjvfb438m5dihmdgqm7lmh4qz"; }) - (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.55.0"; sha256 = "03k2z8s0l39fq7rs7fg6ldn4mnna11hfkb1iswdrcir4ia2djlbi"; }) - (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.55.0"; sha256 = "1q1fhaff80zfchk5f4sflhpgi3sklh81nzdzcdg0r48kiygxsky4"; }) - (fetchNuGet { pname = "Grpc.Net.ClientFactory"; version = "2.55.0"; sha256 = "0bpqs9c144v47l7xp9207mpfs9fga7mw95yig16h393qrm7af0y7"; }) - (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.55.0"; sha256 = "1xc6pf55dnfjaqlx5iz4df2dbpkdlsz478wmnzrvrjblvy3ycisi"; }) - (fetchNuGet { pname = "Grpc.Tools"; version = "2.55.1"; sha256 = "11vx30w0hkkwzd7fd8spyb1iairv5nbicvzpbqpvyg0a2hm2lgfa"; }) - (fetchNuGet { pname = "ImpromptuInterface"; version = "7.0.1"; sha256 = "1kyjp5skhsajvmabz438abcvddaz1w8s3d3csybw3znngpj9hlpb"; }) - (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.21.0"; sha256 = "1q034jbqkxb8lddkd0ijp0wp0ymnnf3bg2mjpay027zv7jswnc4x"; }) - (fetchNuGet { pname = "Microsoft.ApplicationInsights.AspNetCore"; version = "2.21.0"; sha256 = "0dpcik1jlzdp6prwknb3brx4inb8z2qrdvbxvp5am9s799p25611"; }) - (fetchNuGet { pname = "Microsoft.ApplicationInsights.DependencyCollector"; version = "2.21.0"; sha256 = "1dacz9g5w1f5wx6wdylv1k9h2y3pqqiq75i03jdb4n8df3h02g66"; }) - (fetchNuGet { pname = "Microsoft.ApplicationInsights.EventCounterCollector"; version = "2.21.0"; sha256 = "0y42jhyh8jzqkdqdkb8a22ca4ay6323f6d71ychybb785d94p8sg"; }) - (fetchNuGet { pname = "Microsoft.ApplicationInsights.PerfCounterCollector"; version = "2.21.0"; sha256 = "03v8zib3ank49qcxkd31kvi788sh180mplg6q9i2nwsr3yskpic5"; }) - (fetchNuGet { pname = "Microsoft.ApplicationInsights.SnapshotCollector"; version = "1.4.3"; sha256 = "1mpyjni63i7d22j4qr77nb8kxa2rbjkn0k1hfcz35lr23qgjki2k"; }) - (fetchNuGet { pname = "Microsoft.ApplicationInsights.WindowsServer"; version = "2.21.0"; sha256 = "0093dpkcijc6j95lcha4d0yyh2zb1ajq4jvs6pdsx1319nvcjqwc"; }) - (fetchNuGet { pname = "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel"; version = "2.21.0"; sha256 = "15zw2lajm8lx6zz7zi3kd1rjdfjcs6a7xgvsx41s5i7v2ly4ilcr"; }) - (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.8"; sha256 = "1dbwdbxr6npyc82zwl0g9bhifkpcqfzyhx1ihd8rzcmzprw70yfj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Antiforgery"; version = "2.1.0"; sha256 = "00fayhhlrh382a618yb25camxp0k13s7w2gh7bxcq4rjcgs981j6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.Abstractions"; version = "2.1.0"; sha256 = "09f99hficsvg15j4xpd1mjvrx5l3j4pc2vikkmsn26h8lk1v716p"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.Abstractions"; version = "2.2.0"; sha256 = "0vj7fhpk0d95nkkxz4q0rma6pb4ym96mx6nms4603y0l19h0k5yh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.Core"; version = "2.1.0"; sha256 = "146q9zf8xmapxjpa3a84dy8r6b0k3vhm3bl13phnv6snww9hrff5"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.Core"; version = "2.2.0"; sha256 = "1wgn45fmdi7dk9cl4cdhzgqc9mdxhfw7zg8zwns3j7qgrhlv6k8h"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.JwtBearer"; version = "6.0.0"; sha256 = "14hrgi8mmxgxlggmx52gjvfw0ml2danspv6zbjazrjx1g9wyxx8v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; version = "2.1.0"; sha256 = "0jw5g3c7q8jffnalvmknwrx1h0d68hx359qk8rfcfdzwag8q1p2f"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; version = "2.2.0"; sha256 = "1mpq8pmxlxfa625k2ghv6xcyy2wdpwv56xzya9mvmlnh50h1i8rx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization.Policy"; version = "2.1.0"; sha256 = "1inz9b8y4hn9gsfdp1zmqln4ms5zap44mwb6difvr2skwa78z59v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization.Policy"; version = "2.2.0"; sha256 = "1d1zh65kfjf81j21ssmhr465vx08bra8424vgnrb22gdx03mhwd2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Cors"; version = "2.1.0"; sha256 = "1kfdf4rhrnsclpyk7n87mvl5xszb9i2bixns4v7qmvy41pa74sbc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "2.2.0"; sha256 = "01lg2fx85b47ldgdrhs6clsivj35x54xwc9r5xk3f1v8rr3gycsv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.DataProtection"; version = "2.2.0"; sha256 = "09lzbp084xxy1xxfbxpqdff8phv2pzd1n5v30xfm03hhl7a038gx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.DataProtection.Abstractions"; version = "2.2.0"; sha256 = "1gi4hpssmrrdf5lm6idkhvqbfy12bx14976y4gbhmx9z8lxaqcfz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Diagnostics.Abstractions"; version = "2.1.0"; sha256 = "18k6a6ppsbsljrsnwhmyvmzzby6pp9cgbzqcr2c9kmv3z09pc745"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting"; version = "2.1.1"; sha256 = "1prlc9qgwqvs0w3sjrbk9q8fhaq0l0pnvwyxa6gqcb0x82vmlhsl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Abstractions"; version = "2.1.0"; sha256 = "0sdzvjf6bz0krr2bm77zdyxpjcddadq2fqd3b4yybd6my3b5f7j2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Abstractions"; version = "2.1.1"; sha256 = "1wnlcnaqfv3xpmhi5rpkn1r6bfrpv3pb8rvfz9dk5l87mllpi5mm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Abstractions"; version = "2.2.0"; sha256 = "043k651vbfshh3s997x42ymj8nb32419m7q3sjw5q2c27anrhfhv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; version = "2.1.0"; sha256 = "1xm8913slkx0cvk7gcbk1sf9518xmrajjjp3z8qhr5xdhdx1b879"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; version = "2.1.1"; sha256 = "0zldzvhh7xraps3gg47anva3dm3gssynw3k3gazjvqwb4gblsw6p"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; version = "2.2.0"; sha256 = "0nz73bwrvhc1n7gd7xxm3p5ww2wx9qr9m9i43y20gh0c54adkygh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Html.Abstractions"; version = "2.1.0"; sha256 = "03pf5k7dm1js14jjn17bddiicjl75bb4jynimy5n5cpx7j56dpsp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http"; version = "2.1.0"; sha256 = "1nrhbsr58fh6hpzxq75qvrimh0lk6pdwghs3cbv0f1zk90rar1cq"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http"; version = "2.1.22"; sha256 = "09hn5j38n9w0b9qz4ka10mkbzrcbkpqc3mcwf7793lh579vw3axg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http"; version = "2.2.0"; sha256 = "1fcrafpa57sab3as18idqknzlxkx49n4sxzlzik3sj6pcji5j17q"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http"; version = "2.2.2"; sha256 = "09mgjvpqdyylz9dbngql9arx46lfkiczjdf7aqr9asd5vjqlv2c8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Abstractions"; version = "2.1.0"; sha256 = "0jz5w1y661cxbh1sakyjh0813sqrc456mj53w3482ilb5xh5zhbf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Abstractions"; version = "2.1.1"; sha256 = "02jsghkbfjz0rvrnfz5pakv8dpyfcc3wjxmj4rpp0fc2mmpibkys"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Abstractions"; version = "2.2.0"; sha256 = "13s8cm6jdpydxmr0rgmzrmnp1v2r7i3rs7v9fhabk5spixdgfy6b"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Extensions"; version = "2.1.0"; sha256 = "14f1sg4p7zg1p4qj1xs0sjs5xwqidin843xdj9wlzy76sxy3066r"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Extensions"; version = "2.1.1"; sha256 = "01nbz8gl12bjcrw52z5w61khlzn02wngdkc68fsy7pl74vrzj69v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Extensions"; version = "2.2.0"; sha256 = "118gp1mfb8ymcvw87fzgjqwlc1d1b0l0sbfki291ydg414cz3dfn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Features"; version = "2.1.0"; sha256 = "1mwpvbq0z982f9r5ik6k15h18qviy735i55hld9vfk8694k9zwcj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Features"; version = "2.1.1"; sha256 = "0vifha5wfynpgg4kvdmbqcgn6ngkxkkdmx1qnvlphmjx0iw7sw3d"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Features"; version = "2.2.0"; sha256 = "0xrlq8i61vzhzzy25n80m7wh2kn593rfaii3aqnxdsxsg6sfgnx1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "2.1.0"; sha256 = "0jcvihh5nbpkg51bj7rb4svgxcdsn4nzklscqm0qcyvxnk3xy0pf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "2.2.0"; sha256 = "07cihb5sqkavg42nvircdwjp0b67mhrla97jgx285zdjphplg4h2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0"; sha256 = "1hczz9kq3wwhpa8xi1xcalqjf03lhhnlvir2cmhxa51h2f1afx89"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Localization"; version = "2.1.0"; sha256 = "1xwdm6z2fnrbca4r76mj6g8ggrjy5n9frhn2159mhracl0gd1d66"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc"; version = "2.1.0"; sha256 = "0yp24572mnvdq1814wrl29rb9zl2903igdch8sm4y6c6sw3bf4n9"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Abstractions"; version = "2.1.0"; sha256 = "0p50d8bly48pv8kwsraw9aklppl9cav0lp1d6xjfpddr7jy2w2w8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Abstractions"; version = "2.2.0"; sha256 = "09p447ipd19517vy8xx9ykvspn6b4fgbm2rskpmzyw41x9wz4k0b"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.ApiExplorer"; version = "2.1.0"; sha256 = "0rvvaa5gsw4q67phayw0k16lhildi8g8qld09rwkyg8521hv6arc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Core"; version = "2.1.0"; sha256 = "1gfaxk6d1k0cqaymv5vx26ifvcrxsizxzl8s1rzw16v47vvyqyxp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Core"; version = "2.2.0"; sha256 = "1k6lkgk9zak5sczvyjbwgqnfcwcg9ks74wznqfzck8c6hns1by0m"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Cors"; version = "2.1.0"; sha256 = "0z8z11wppy1bwfz0wkigsp80gbq2n38yzg9p5p1mbrkf2dapaaz7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.DataAnnotations"; version = "2.1.0"; sha256 = "0gpwyg1ap5pm5yji3wyga1h1kcya6jd0k533jkyl8yx1ijm7l6hg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Formatters.Json"; version = "2.1.0"; sha256 = "0jrfwmw4rqg2m4dqrlpf4j9lc48qw6ymxwcw78bx5lam2qibky58"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Formatters.Json"; version = "2.2.0"; sha256 = "0421fcf2z8a6z81ql123ili32wbr3x25zpq17xjf4s9fmsr0069a"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Localization"; version = "2.1.0"; sha256 = "1z6511nj5r0gpx2y4d61bcp98y5c833zb2kmvhzpv39cd1axmggk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0"; sha256 = "1zxzy4xb0jnnx7pri8pxkc1kwgpz58daxqy9ypyhf3wx1jdqy3w3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor"; version = "2.1.0"; sha256 = "0mvizjv8qvdkb4ycvcvccal1j3yfkhqaxi71hw6j73ylba8va8f2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; version = "2.1.0"; sha256 = "18dr08g27hgmijzp277avzq42004gipnp3h7pacpnyanh2psgp43"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.RazorPages"; version = "2.1.0"; sha256 = "0if759kacp95bmhskmsjq4vb74d9638f4b212ziqnq0fyl67bv8w"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.TagHelpers"; version = "2.1.0"; sha256 = "0vj8yqf29jfpb8kj8djxcfmxfn21ixk1987rjgzcwi1zal1wln1q"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.ViewFeatures"; version = "2.1.0"; sha256 = "0zynjyakzgdmyrcmgk2ahs91nhqavc7kvc804xcbkfl5ai2ypmwp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.WebApiCompatShim"; version = "2.2.0"; sha256 = "1mdj7k58sb9b9gx010dhpavnsfymwxk7izvyqc4vnclqznakfxw8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Razor"; version = "2.1.0"; sha256 = "1yxq7vipswqa01xpw9jl22ngpifqm8ywzqg843mxwwf15kmf27bi"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.Design"; version = "2.1.0"; sha256 = "06is3ch4g0bdr1pnlil5fq2wpwva2yxbf3iyl7xcd99rw1wfpiga"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.Language"; version = "2.1.0"; sha256 = "12b3jp0crshvcwckvk8gd4w72ngd7125qz8zlpgczjv6vyb28wqs"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.Runtime"; version = "2.1.0"; sha256 = "0mf19civk8s85yhb3hnpr0gfa4nkxypylwcq2sj15zwx4qpsm8l7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.ResponseCaching.Abstractions"; version = "2.1.0"; sha256 = "097mxkx8sdj35yndwi8q4r4q5g8ds6hwrx7if1694zn9fmzqd424"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.ResponseCaching.Abstractions"; version = "2.2.0"; sha256 = "01sp2i2bgcn6blw1mcvg5nrlc97c9czyawwvgfi6ydzdvs6ang37"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Routing"; version = "2.1.0"; sha256 = "0xs89qbw2whzl46r7b549ys5bs6vrp2qf248cphfhwvjw1lv4bhs"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Routing"; version = "2.2.0"; sha256 = "12kv602j2rxp43l1v3618yz3pdd7hqc3r98ya0bqz6y2ppvhbyws"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Routing"; version = "2.2.2"; sha256 = "1s225v52i2l3496i97jc7jjlrmb4m3vz9q696g88yq5xhcy4d37x"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Routing.Abstractions"; version = "2.1.0"; sha256 = "1f8xixbg749nhv10vaf3jmdv9zjdw822hw7ikwa97h70767d8xz5"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Routing.Abstractions"; version = "2.2.0"; sha256 = "0d9wwz1rsh1fslbv1y72jpkvqv2v9n28rl3vslcg0x74lp2678ly"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.WebUtilities"; version = "2.1.0"; sha256 = "148snpiq4rhm44gzx8wn9ljfb286h7vd1axc9by4r4fxp0gix0kf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.WebUtilities"; version = "2.1.1"; sha256 = "1744g3c04bz27lafx0q90cg0i17rahymgckbhggn1147pxs3lgpv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.WebUtilities"; version = "2.2.0"; sha256 = "0cs1g4ing4alfbwyngxzgvkrv7z964isv1j9dzflafda4p0wxmsi"; }) - (fetchNuGet { pname = "Microsoft.Azure.AppService.Middleware"; version = "1.5.4"; sha256 = "08bannmsijcz9zbcvykq6gc116q11mgilyg7zcnxi62jh21ip235"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/21e57804-e42a-44f4-a801-493faaf56251/nuget/v3/flat2/microsoft.azure.appservice.middleware/1.5.4/microsoft.azure.appservice.middleware.1.5.4.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.AppService.Middleware.Functions"; version = "1.5.4"; sha256 = "1765lv13nd1wp7ycli1wfx5glp0qryc432awfrv5s1x1wxgl0dc7"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/21e57804-e42a-44f4-a801-493faaf56251/nuget/v3/flat2/microsoft.azure.appservice.middleware.functions/1.5.4/microsoft.azure.appservice.middleware.functions.1.5.4.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.AppService.Middleware.Modules"; version = "1.5.4"; sha256 = "17idpdivdr03j8dqfqim0d2948xm87x6nk1wnzpraj22pa964j3f"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/21e57804-e42a-44f4-a801-493faaf56251/nuget/v3/flat2/microsoft.azure.appservice.middleware.modules/1.5.4/microsoft.azure.appservice.middleware.modules.1.5.4.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.AppService.Middleware.NetCore"; version = "1.5.4"; sha256 = "0k5pn7qi874bhlhcmm813k15kmsd7zc45mgk0ym8qzvvk1s8j7cv"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/21e57804-e42a-44f4-a801-493faaf56251/nuget/v3/flat2/microsoft.azure.appservice.middleware.netcore/1.5.4/microsoft.azure.appservice.middleware.netcore.1.5.4.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.AppService.Proxy.Client"; version = "2.2.20220831.41"; sha256 = "0qqghqfm8v6zdgkgzr76lwfi88nn5zpbrza318mc2h3xnz3fvf3s"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.appservice.proxy.client/2.2.20220831.41/microsoft.azure.appservice.proxy.client.2.2.20220831.41.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.AppService.Proxy.Common"; version = "2.2.20220831.41"; sha256 = "1rns26wapv8h5sfwbv09cbz1ixzzgqsa95y4q7ikb77arwqcgha3"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.appservice.proxy.common/2.2.20220831.41/microsoft.azure.appservice.proxy.common.2.2.20220831.41.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.AppService.Proxy.Runtime"; version = "2.2.20220831.41"; sha256 = "157ijskdxdc7fmja8rlsizd85bf4znm0yarfjs5wfkyg5227lgm4"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.appservice.proxy.runtime/2.2.20220831.41/microsoft.azure.appservice.proxy.runtime.2.2.20220831.41.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.Cosmos.Table"; version = "1.0.8"; sha256 = "1x590xzsi4dqr210b2cj30c7adxmlzv2fanmqzwghffk29r4paz9"; }) - (fetchNuGet { pname = "Microsoft.Azure.DocumentDB.Core"; version = "2.11.2"; sha256 = "0gwksfc5g2vxkxw662lzg7azmsflpahn677944z7vjrhnlnyizg9"; }) - (fetchNuGet { pname = "Microsoft.Azure.DurableTask.AzureStorage.Internal"; version = "1.4.0"; sha256 = "0pqy7k1lslz0n74qbgp1b5la45qhd68bk02wgsxlabqdhrmbvvvc"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.durabletask.azurestorage.internal/1.4.0/microsoft.azure.durabletask.azurestorage.internal.1.4.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.DurableTask.Core.Internal"; version = "2.0.11"; sha256 = "1f6alhfp8pq0m8n0rxzzwx933iw672k0rw38r91kdddg8m28ly37"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.durabletask.core.internal/2.0.11/microsoft.azure.durabletask.core.internal.2.0.11.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.Functions.DotNetIsolatedNativeHost"; version = "1.0.2"; sha256 = "0r4cjbrdfb1fy5gz42gpvcsxxc8l4xxd550426z2i2k7s4vm94i0"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.functions.dotnetisolatednativehost/1.0.2/microsoft.azure.functions.dotnetisolatednativehost.1.0.2.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.Functions.JavaWorker"; version = "2.13.0"; sha256 = "08lm6m86fm2ymd67i55rmllxjvi9biz5gdrnlzf6bzvcls6gv66z"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.functions.javaworker/2.13.0/microsoft.azure.functions.javaworker.2.13.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.Functions.NodeJsWorker"; version = "3.8.1"; sha256 = "0kc1dxi774jlmfvy0a8valhin4yvar4ib7ppa8iliq1lzynr3pqn"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/f37f760c-aebd-443e-9714-ce725cd427df/nuget/v3/flat2/microsoft.azure.functions.nodejsworker/3.8.1/microsoft.azure.functions.nodejsworker.3.8.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.Functions.PowerShellWorker.PS7.0"; version = "4.0.2973"; sha256 = "16is04gbrjsayjiv2vnqnw9j3cdn03xi2zsp2406wz4knbi2w2g8"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/c0493cce-bc63-4e11-9fc9-e7c45291f151/nuget/v3/flat2/microsoft.azure.functions.powershellworker.ps7.0/4.0.2973/microsoft.azure.functions.powershellworker.ps7.0.4.0.2973.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.Functions.PowerShellWorker.PS7.2"; version = "4.0.2974"; sha256 = "0ahqvx31ll2y86c6a2dsh6i1y4jlgsivn71zxq7vs8kkb28ab7xx"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/c0493cce-bc63-4e11-9fc9-e7c45291f151/nuget/v3/flat2/microsoft.azure.functions.powershellworker.ps7.2/4.0.2974/microsoft.azure.functions.powershellworker.ps7.2.4.0.2974.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.Functions.PowerShellWorker.PS7.4"; version = "4.0.2975"; sha256 = "1ga4ma5mja1iz1szcsry9m40mms1yfjz81z8s8czs6mngq2f7gj2"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/c0493cce-bc63-4e11-9fc9-e7c45291f151/nuget/v3/flat2/microsoft.azure.functions.powershellworker.ps7.4/4.0.2975/microsoft.azure.functions.powershellworker.ps7.4.4.0.2975.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.Functions.PythonWorker"; version = "4.20.0"; sha256 = "055n0004g6s995ymlb2bhj6i6zl24j5lfpndjfxg61cfb7g4kzyz"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.functions.pythonworker/4.20.0/microsoft.azure.functions.pythonworker.4.20.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.KeyVault.Core"; version = "2.0.4"; sha256 = "0rv7z989zxk5myqd4n2a9ccxx9jr4jb3fslc6b4w3p0570af60hn"; }) - (fetchNuGet { pname = "Microsoft.Azure.Storage.Common"; version = "11.1.7"; sha256 = "0pi31nqz858fir9bw1yv41wc7m2icwvx4pll6wq5r66i1hndw98s"; }) - (fetchNuGet { pname = "Microsoft.Azure.Storage.File"; version = "11.1.7"; sha256 = "11lnxiv2vbfczffa8czr6gaw648mamgsgdh5dikbydlc8m8nhbx4"; }) - (fetchNuGet { pname = "Microsoft.Azure.WebJobs"; version = "3.0.39"; sha256 = "1yyn3ipls8vvhhy06h9kd1sr2ay93vy1f3byn03m413qa7rsdp1m"; }) - (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Core"; version = "3.0.39"; sha256 = "08ngapfblvgfj8b5x4wi0ghvwnq6yg2d3190ghnygrlli4f8bia7"; }) - (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Extensions"; version = "5.0.0-beta.2-10879"; sha256 = "09zawvx47x5pv3w81wsl6izf90xkk0hswf318xngnd2bskli4wi1"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.webjobs.extensions/5.0.0-beta.2-10879/microsoft.azure.webjobs.extensions.5.0.0-beta.2-10879.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Extensions.Http"; version = "3.2.0"; sha256 = "0w2006vrvb7b97q3dg8rgldvmpxcnjz939hqhv7vy73xy3dbdp60"; }) - (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Extensions.Timers.Storage"; version = "1.0.0-beta.1"; sha256 = "03yv9k6ii6chwqhibazqxv1g4y6cjpzi3qz1c0c6z0f4lgmb6qzp"; }) - (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Host.Storage"; version = "5.0.0-beta.2-11957"; sha256 = "0i0q40v62rlxq58jh0icdwnxiymgmvs6rk9smizml3s7lnsg0dks"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.webjobs.host.storage/5.0.0-beta.2-11957/microsoft.azure.webjobs.host.storage.5.0.0-beta.2-11957.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Logging.ApplicationInsights"; version = "3.0.37"; sha256 = "0mlqz64krpy5w9wilc8nd8qigwhikhm9im8xb9jdzm725naghbhz"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/21e57804-e42a-44f4-a801-493faaf56251/nuget/v3/flat2/microsoft.azure.webjobs.logging.applicationinsights/3.0.37/microsoft.azure.webjobs.logging.applicationinsights.3.0.37.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Rpc.Core"; version = "3.0.37"; sha256 = "1idsghkya7rghlri3pf8y9drh4qq414gvwx2v0ssisqganc3wy31"; }) - (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Script"; version = "4.27.5"; sha256 = "08mhii9h4z1a6hf556bkxyhll28j8wyd7h058974j4fq17kl5bdj"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script/4.27.5/microsoft.azure.webjobs.script.4.27.5.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Script.Abstractions"; version = "1.0.4-preview"; sha256 = "16k6h7xrg1y272s4rb7mhx16y7aq0s4isvilvgaq8vj3dsiv8blg"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/f37f760c-aebd-443e-9714-ce725cd427df/nuget/v3/flat2/microsoft.azure.webjobs.script.abstractions/1.0.4-preview/microsoft.azure.webjobs.script.abstractions.1.0.4-preview.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Script.Grpc"; version = "4.27.5"; sha256 = "0z9b6g20szfxvpkxh8gfhyb5ngx0zdbzwgizyjbqfwkkha6wd12d"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script.grpc/4.27.5/microsoft.azure.webjobs.script.grpc.4.27.5.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Script.WebHost"; version = "4.27.5"; sha256 = "0a7z1i0ydaq8z78ym8whgjcw55ijdw4kab4pwckqb104amh750fh"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script.webhost/4.27.5/microsoft.azure.webjobs.script.webhost.4.27.5.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Azure.WebSites.DataProtection"; version = "2.1.91-alpha"; sha256 = "0x7dabqqwajkrpbjb2psxv7rsk2rnd9w1bln2jadb89jg0qld7y3"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.websites.dataprotection/2.1.91-alpha/microsoft.azure.websites.dataprotection.2.1.91-alpha.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.0.0"; sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) - (fetchNuGet { pname = "Microsoft.Build"; version = "17.0.0"; sha256 = "166brl88y8xn9llc0hmn911k6y74gapmk1mrnfxbv73qj77jxsn1"; }) - (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.0.0"; sha256 = "08c257dmfa6n41lq4fxb34khi8jbwlqfy1168x7h7zsbh3wss7yq"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "1.1.0"; sha256 = "08r667hj2259wbim1p3al5qxkshydykmb7nd9ygbjlg4mmydkapc"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.4"; sha256 = "1h3n680d3a2m6dcqvzwwipx6gjjcnzxk05dv1jxvxfn62bckq7mv"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "2.8.0"; sha256 = "0g4h41fs0r8lqh9pk9s4mc1090kdpa6sbxq4rc866s8hnq9s1h4j"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.3.1"; sha256 = "1badvp024rwwipy99csx56k8ah192wngq4gb690pz8j0qfvsg9mr"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "2.8.0"; sha256 = "0p1xvw1h2fmnxywv1j4x6p3rgarpc8mfwfgn0vflk5xfnc961f6w"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.3.1"; sha256 = "05fgbs0fny6n338zihzlvvldm2jzc8sril0ndj1iqvgzdc75wplk"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.3.1"; sha256 = "1xkrfg5lplpi9q183f7hc3s7lscali07sz2p8y57pj1md251r6if"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Razor"; version = "2.1.0"; sha256 = "1d5nk0x2bnb0zzdi1ixs2fd53ih4bm91av0g4xvjj3ca17baz65m"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.3.1"; sha256 = "0l047bcdzfpggr329i2ky2iy1zbrb5jw4w95fzj2lbz9wfaxf0xf"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "1.0.3"; sha256 = "0jgxcnaaabmvgdjwxb4ldfm90xbj1mcsjww5ngp8fdchzlk07vdw"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.1"; sha256 = "0z6d1i6xcf0c00z6rs75rgw4ncs9q2m8amasf6mmbf40fm02ry7g"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "1.0.3"; sha256 = "1nayc88w80jrmnf3mkq0fk2bjhpgnk59m9yl40d9qfj06bzvckxl"; }) - (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.1.0"; sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Azure"; version = "1.1.1"; sha256 = "0g3nixm0j1clyfij3s3c22k3b6xv8am1cgzz590r2xmsqrvd9kqm"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Azure"; version = "1.7.0"; sha256 = "09ibdbxsvym182aglhiz5vqc6h0zhw3717dyg7rwf0wi5zsc27f8"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "1.0.0"; sha256 = "0j2wjgmcpjilvccjq4481x7g8zd2sga29wx902sqfi0ymqacj9jd"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "2.1.0"; sha256 = "009vnlnrvkjki2s45pq3gwp25grkyr9dwsyi87mn4iimfii5c6ck"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "5.0.0"; sha256 = "0j83zapqhgqb4v5f6kn891km095pfhvsqha357a86ccclmv2czvb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "1.0.0"; sha256 = "0y69cxadbhpv2xabds9ri06hic85ri1mq0qrdmih9inbgx2cwar3"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "2.1.0"; sha256 = "020xm0vhhg9wr133pacjff5qy6dql4dwvj3r4rzyqck2kkdr7xzx"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "5.0.0"; sha256 = "0l8spndl3kvccjlay202msm31iy5iig0i9ddbsdy92wbcjr97lca"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.1.0"; sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.1.1"; sha256 = "0244czr3jflvzcj6axq61j10dkl0f16ad34rw81ryg57v4cvlwx6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.0.3"; sha256 = "0fiwv35628rzkpixpbqcj8ln4c0hnwhr3is8ha38a9pdzlrs6zx8"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.0"; sha256 = "1rszgz0rd5kvib5fscz6ss3pkxyjwqy0xpd4f2ypgzf5z5g5d398"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "5.0.0"; sha256 = "01m9vzlq0vg0lhckj2dimwq42niwny8g3lm13c9a401hlyg90z1p"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.1.0"; sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.1.1"; sha256 = "0b4bn0cf39c6jlc8xnpi1d8f3pz0qhf8ng440yb95y5jv5q4fdyw"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.2.0"; sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.0.3"; sha256 = "18l6ys6z7j07vf5pa3g0d018dfgk5vb9hf3393cmmh448rpjq41m"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.0"; sha256 = "1f7h52kamljglx5k08ccryilvk6d6cvr9c26lcb6b2c091znzk0q"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.1.0"; sha256 = "0x1888w5ypavvszfmpja9krgc64527prs75vm8xbf9fv3rgsplql"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.1.1"; sha256 = "0n91s6cjfv8plf5swhr307s849jmq2pa3i1rbpb0cb0grxml0mqm"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.0.3"; sha256 = "0zy90kvlvxinwqz38cwj1jmp06a8gar1crdbycjk5wy8d6w5m0br"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; sha256 = "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "2.1.0"; sha256 = "0xx3idb1l5y1da5zynlys5gyarijmw5pc9hgci8xdxbrcv6rzbjb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "2.1.1"; sha256 = "0b7f3fjdnfdm7qzqnbym344rbv8fh9qmngqnz5q1c2rapm9s6si8"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "2.1.0"; sha256 = "1lz2xwm63clbh9dfhmygbqvcp4dsrwh5jihv82dmqd5h7lqngl40"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "2.1.1"; sha256 = "0nfydlxvgs7bxqamj0jww1wwxbipzm30ygxabk29zx9q1r0qbnx5"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "3.1.0"; sha256 = "1bg73szp1kyinvfq9ws40w1dsyci66y16av16fr22cpf8113064n"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "2.1.0"; sha256 = "1hpb6c3hqkb9xx1c0psknja4g0zj9290q3rwmsm5qk7iv525zqk4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "3.1.0"; sha256 = "0pg4q2wbhiwd3nan419xwmzgzx9n29bblyxdf6s7rjjx5g9q19pj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.0.0"; sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.1.0"; sha256 = "1h30yw0fbjkb42jb5n291f3jns1f5g1asjaf9mjlgpy3k6x96gln"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.1.1"; sha256 = "1ll7kmp8csngy27azxh0vcli2w4sgvamqh11c9z5d4spjh6jzxcp"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.0.3"; sha256 = "0nd36n0zfqv5l4w4jlbs2smaw0x7lw49aw1wgk3wsyv69s74p3gj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "1.0.0"; sha256 = "0c4zjjpzvngd06kpy5dmws5ljzwf23g3bklrfxaxbkkvy027svqi"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.1.0"; sha256 = "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.1.1"; sha256 = "0rn0925aqm1fsbaf0n8jy6ng2fm1cy97lp7yikvx31m6178k9i84"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.0.3"; sha256 = "1hyilp5gr19xz7zcyar6h8jpfksqbn5s9kz0qrfqwvqhq2p7sm5g"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "1.0.3"; sha256 = "1vclzbn8aq3wnvib34kr8g86gi37r6hn1ax9nc1sllid3h026irl"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.1.0"; sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.1.0"; sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.1.1"; sha256 = "1shldpcczkc7rkxq0xd4zxm1r047bswy8nj1vx27aisni6nyqxys"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.2.0"; sha256 = "1f83ffb4xjwljg8dgzdsa3pa0582q6b4zm0si467fgkybqzk3c54"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "3.1.0"; sha256 = "16bpzq9mcy4p80yzp2kd9ijrvhmxbrm5x7aljk46n7fpg666g59b"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Composite"; version = "2.1.0"; sha256 = "1yyiqjiz5gb13gr1wfmdg2xvd301zmzf6pj5bg8y9ns0m4pfwixj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "2.1.0"; sha256 = "1firpsl5bk219i9gdfgiqw1zm68146h1dzx9hvawfpw9slfaa56w"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "2.1.1"; sha256 = "13rharvsycfk0056fbcx55npp9py7ng3hgcsasz1inva3q9lcngj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "3.1.0"; sha256 = "0msas2gvpyz43d76pbdlzm40nw2n15xzixjyhapbv08hvb3l4nds"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "2.1.0"; sha256 = "1d2622qp22x1cnlwycnzjbc3sgi9jria26fk78zwzsa08npa3avv"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "2.1.1"; sha256 = "039w2gfvapdy5a1gl1bkajr6glngp29j895cgysy8132vg80jgwb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "3.1.0"; sha256 = "1qvifck5rr6xqnjzqh2gm9vzprsmwp068gkmk44ib65236p1pg6x"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting"; version = "2.1.0"; sha256 = "17dvhs4fbmp3ch6i9ph4yg0b4rq69ax1g4rv946wvwy91wqy7x7k"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.1.0"; sha256 = "04vm9mdjjzg3lpp2rzpgkpn8h5bzdl3bwcr22lshd3kp602ws4k9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.1.1"; sha256 = "1vgiby2slglmwg4kjxyn6cmb3xksps6i6c9z11za6s8d2czjl90l"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.2.0"; sha256 = "1xc7xr1nq7akfahyl5in9iyxrygap2xi9nxh39rfm37sf8lk55v1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "6.0.0"; sha256 = "1mwjx6li4a82nb589763whpnhf5hfy1bpv1dzqqvczb1lhxhzhlj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "3.0.3"; sha256 = "0glfid82amr4mxjqpq2ar6vhq6wv88sp463yvhg4pravkcrd0611"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Localization"; version = "2.1.0"; sha256 = "1xffy6cfl1apf2fhwzbaf770fiqpnpimv9l8cwg01r6wv6rg4sj2"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Localization.Abstractions"; version = "2.1.0"; sha256 = "077yw87idwrvm80ycyx118w1nby9agvb6pws5spq7gpky54s1zpb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.1.1"; sha256 = "12pag6rf01xfa8x1h30mf4czfhlhg2kgi5q712jicy3h12c02w8y"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "3.0.3"; sha256 = "0kyh6bk9iywbdvn29zm1770fwmag58y7c8rfpx886anxs6p9rh61"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.0"; sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.1"; sha256 = "1sgpwj0sa0ac7m5fnkb482mnch8fsv8hfbvk53c6lyh47s1xhdjg"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.2.0"; sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.0.3"; sha256 = "1wj871vl1azasbn2lrzzycvzkk72rvaxywnj193xwv11420b0mjh"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.ApplicationInsights"; version = "2.21.0"; sha256 = "0f8kz1sc66dmh443zcxkjvf0p5c9w755h0i13m9mvvwz56k6j8d6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "2.1.0"; sha256 = "1ia9nw7p5kx81n1x4l2n3jhwl55c1i12zm8245191d5g3b19f405"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "6.0.0"; sha256 = "0plx785hk61arjxf0m3ywy9hl5nii25raj4523n3ql7mmv6hxqr1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "2.0.0"; sha256 = "0kdl5vh0fpizh48plj7zhmqv15wh74ij4rgi8hpzfk4y5b8nhgh1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "6.0.0"; sha256 = "1383b0r33dzz0hrch9cqzzxr9vxr21qq0a5vnrpkfq71m2fky31d"; }) - (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "2.1.0"; sha256 = "0i0vmfc3ch7xa3awmbw3byylprfl2d6dp7lgm8k8f215kxzl1wdn"; }) - (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "2.1.1"; sha256 = "1rc1f9pqjljgqp670i3a4v8y4bsydcbm6mpmhw2dq753cg90gx4a"; }) - (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "2.2.0"; sha256 = "0n1q9lvc24ii1shzy575xldgmz7imnk4dswwwcgmzz93klri9r1z"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "1.0.0"; sha256 = "0gi3rj7hdkk5cq63biil8245mpcjf31l0d8cbl2gv7813h16ckmx"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.1.0"; sha256 = "0w9644sryd1c6r3n4lq2cgd5pn6jl3k5m38a05m7vjffa4m2spd2"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.1.1"; sha256 = "0wgpsi874gzzjj099xbdmmsifslkbdjkxd5xrzpc5xdglpkw08vl"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.2.0"; sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "3.0.3"; sha256 = "0lq433x3z3dhf4w10vrxnqami6xsr6mwasla3qhmfx7yfybgz7y0"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "2.1.0"; sha256 = "19zvypljvd74q50xl75xy1n869kha98slff4q012q7jpl9lfyf57"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "1.0.0"; sha256 = "0gmcvilj80xf5j06icjsg75qn65bdg9qca5a86sg8cs2licbxss1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.1.0"; sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.1.1"; sha256 = "033rkqdffybq5prhc7nn6v68zij393n00s5a82yf2n86whwvdfwx"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.0.3"; sha256 = "08zlr6kl92znj9v2cs1wsjw6s98nxbkwnxk8pccbv0b4c7xhb3pf"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.1.0"; sha256 = "1w1y22njywwysi8qjnj4m83qhbq0jr4mmjib0hfawz6cwamh7xrb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.Extensions.WebEncoders"; version = "2.1.0"; sha256 = "04dby8szfzmrry3b7vfysbis3yg8q1fbqk82ck8z6zdxga1nv2dj"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.54.1"; sha256 = "1g7bgklz71vwamr4w2rw3k07h6vzwkl0jqlz0cxnp98pfi8k9c17"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "2.31.0"; sha256 = "1x9xbcm1dq7y1mmldqd1ga7ayczz7ydjj1bfbmx65bi46z63am5r"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.22.0"; sha256 = "06495i2i9cabys4s0dkaz0rby8k47gy627v9ivp7aa3k6xmypviz"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.32.0"; sha256 = "01b6kyhk8kv1ys9ynkmlaaif4q4i0hpgrjqfmqg04lbh5g0rl6f4"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.32.0"; sha256 = "1q4qfr4i9jbdsbrbjhxpgj0ikf6xcn5msvq0ms1vxv01ah83r522"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.32.0"; sha256 = "1wn6rylcagvz4sjr8mi707r6c91f931cqyy5ghgn1l6da2hi1d5n"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "6.32.0"; sha256 = "0bziphc91qdqnv4wkzdz9mr9m4sc02qqsjj1m6ak25pg4kp563pm"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "6.32.0"; sha256 = "1c35a1y9lzvygb0v1z73cngw5gr0qshbn2jvrnnx3961g52c17lb"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.32.0"; sha256 = "125c8drkknrbbmy40r5a7n1mnx6chrjlw6m0d2n0gks9qyr30prr"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Validators"; version = "6.32.0"; sha256 = "1h6rpn8pxlbzdwj7sfmgjq0sbz255dg1is62gyg2y8mp9pizwm1n"; }) - (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.1.0"; sha256 = "1a02bll0flsin9grd3jxbi76ycl42qamynalbp7qbqcsprabw3ai"; }) - (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.1.1"; sha256 = "06q4xmxj25ry7gkl51zi7vh2957k9s49vdrlgfy03w9rqk81vnld"; }) - (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.2.0"; sha256 = "0w6lrk9z67bcirq2cj2ldfhnizc6id77ba6i30hjzgqjlyhh1gx5"; }) - (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "1.0.0"; sha256 = "06yakiyzgss399giivfx6xdrnfxqfsvy5fzm90scjanvandv0sdj"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "15.6.2"; sha256 = "10ii20xm855kj4klvx9rf6q566ay473ip7a8y0cp68z3idq72n32"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) - (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.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.0"; sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.9"; sha256 = "1h5cvi2f8p3khgsidrrlgqyc52vjfrxivakfnpr89b838x2hrii2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) - (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.OData.Core"; version = "7.6.4"; sha256 = "1m85s9zxr84slwxs1xw22ys6yvhrd4qmn31z23q94dhvrqlxdvqa"; }) - (fetchNuGet { pname = "Microsoft.OData.Edm"; version = "7.6.4"; sha256 = "1i7cxijnkpyj612fy58mzk18sxjd81my49hwrhnp2j218lj2303h"; }) - (fetchNuGet { pname = "Microsoft.Security.Utilities"; version = "1.3.0"; sha256 = "188l55zrdcgpc1n46mkiclkg8wi4sf3ksj9i1d514fipmvnl0wpn"; }) - (fetchNuGet { pname = "Microsoft.Spatial"; version = "7.6.4"; sha256 = "1qi03p8ws48hi4lf9vvvxsjisxc3p7i8289jf2q4i611ap3gkczd"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "15.6.2"; sha256 = "1ym6rrnah0mia5v04k1dbhg12sd63vrfn7c1sk243dag213lk09v"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "15.6.2"; sha256 = "1q7snd0smkn1ck1zhczmmly3mg0pdndxq6qv8bmg4qimril2wfv9"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.0.0"; sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.7.0"; sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.7.0"; sha256 = "0pjll2a62hc576hd4wgyasva0lp733yllmk54n37svz5ac7nfz0q"; }) - (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) - (fetchNuGet { pname = "Moq"; version = "4.8.2"; sha256 = "081qp2rk8qgvpvybspjqlgvs933hmlry7bhql076d7iqx5x4klbq"; }) - (fetchNuGet { pname = "NCrontab.Signed"; version = "3.3.2"; sha256 = "1rjlrcbgpbvsiaxavpykxjsmfhazr5338pfawzq5c9f7i3hydl2a"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.0"; sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.1"; sha256 = "0d44wjxphs1ck838v7dapm0ag0b91zpiy33cr5vflsrwrqgj51dk"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) - (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) - (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) - (fetchNuGet { pname = "NSubstitute"; version = "3.1.0"; sha256 = "12cqhkxizsx00hdpagyg9aha9sp3f56447kbb7gf8z7s3armvvk8"; }) - (fetchNuGet { pname = "NuGet.Common"; version = "5.11.5"; sha256 = "0rrkxq114q6gl5biacq15xd7w4cczsry5da2q449i8ahbxw1q6cb"; }) - (fetchNuGet { pname = "NuGet.Configuration"; version = "5.11.5"; sha256 = "02zffklhk4dzib2wphkpcikh6j758v167759d3pl2b49kivhasib"; }) - (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "5.11.5"; sha256 = "09206r7j2i17mik4vwx3wmpd1mcl769f83brzjl2kk347yd2f6lp"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.5"; sha256 = "1bzgwanmw8gkd9n9v6fnr4k88fg7rl3qjy832ip69qxf921anla5"; }) - (fetchNuGet { pname = "NuGet.LibraryModel"; version = "5.11.5"; sha256 = "127jds09jvn9q1nhbidxas3fzqsr3cxjh4qb2x3yn4z204q07ack"; }) - (fetchNuGet { pname = "NuGet.Packaging"; version = "5.11.5"; sha256 = "0w53zl8km3slxp2r44brbrs1nzsgpvqyzjwl1k8bq643ppgs0g6w"; }) - (fetchNuGet { pname = "NuGet.ProjectModel"; version = "5.11.5"; sha256 = "16r6n6pjya6bx6kdskz3gdn57xb69nb5xsg60rzpj9ff41scsi5i"; }) - (fetchNuGet { pname = "NuGet.Protocol"; version = "5.11.5"; sha256 = "1s0xfnq23lhr9h71naqkmiqxik9w1bwgiwjvdc7pgsqyn38s0rii"; }) - (fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.5"; sha256 = "17lc6rv9gmmrsnalq4wr71alj5zdvfzfy0kdd0gpckkb6gxfh8al"; }) - (fetchNuGet { pname = "Octokit"; version = "0.29.0"; sha256 = "1q62w95cj95kff0il9lcjaidgpj3xvh9a6mjy4prrb4j4gm694jb"; }) - (fetchNuGet { pname = "protobuf-net"; version = "2.3.3"; sha256 = "0h0fl5wrsjr0i5bpz6cq3fcpzfb8g4a239m69pk8l8hn2cnbksi5"; }) - (fetchNuGet { pname = "RichardSzalay.MockHttp"; version = "5.0.0"; sha256 = "13gvp56xl8vv2wxm0ygld9n2m255la3szgympfh2yx27xx0m80cg"; }) - (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.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.1.0"; sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.0.1"; sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Security"; version = "4.3.0"; sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) - (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 = "Suave"; version = "1.1.3"; sha256 = "1a46gknr70p86rcnmm5z9x1gv3wkb67pf926yskp4i76f1mz9gfg"; }) - (fetchNuGet { pname = "SuaveServerWrapper"; version = "0.0.3"; sha256 = "0vpp919irg3vs69jymwrh8y8x0dn3s00mcf4a1dqk8ajnnbndsfz"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.0"; sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; }) - (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.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.2.0"; sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.3.0"; sha256 = "1fym59ia85x3bjyv59vvjpnd8579alsf790k3i8lfsn0703ny1pq"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.3.1"; sha256 = "17615br2x5riyx8ivf1dcqwj6q3ipq1bi5hqhw54yfyxmx38ddva"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) - (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.0.1"; sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; }) - (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) - (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.0.1"; sha256 = "1wbv7y686p5x169rnaim7sln67ivmv6r57falrnx8aap9y33mam9"; }) - (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) - (fetchNuGet { pname = "System.ComponentModel"; version = "4.0.1"; sha256 = "0v4qpmqlzyfad2kswxxj2frnaqqhz9201c3yn8fmmarx5vlzg52z"; }) - (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.4.0"; sha256 = "1c91pgj8vwjf4v0ss90bq63vmw2yr64qinria7blif3ml5c368lf"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) - (fetchNuGet { pname = "System.ComponentModel.EventBasedAsync"; version = "4.0.11"; sha256 = "07r5i7xwban347nsfw28hhjwpr78ywksjyhywvhj1yr0s7sr00wh"; }) - (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.1.0"; sha256 = "0wb5mnaag0w4fnyc40x19j8v2vshxp266razw64bcqfyj1whb1q0"; }) - (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) - (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.1.0"; sha256 = "178cva9p1cs043h5n2fry5xkzr3wc9n0hwbxa8m3ymld9m6wcv0y"; }) - (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.4.0"; sha256 = "1hjgmz47v5229cbzd2pwz2h0dkq78lb2wp9grx8qr72pb5i0dk7v"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.5.0"; sha256 = "1frpy24mn6q7hgwayj98kkx89z861f5dmia4j6zc0a2ydgx8x02c"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.7.0"; sha256 = "0pav0n21ghf2ax6fiwjbng29f27wkb4a2ddma0cqx04s97yyk25d"; }) - (fetchNuGet { pname = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Contracts"; version = "4.0.1"; sha256 = "0y6dkd9n5k98vzhc3w14r2pbhf10qjn2axpghpmfr6rlxx9qrb9j"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.0.0"; sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.5.0"; sha256 = "1y8m0p3127nak5yspapfnz25qc9x53gqpvwr3hdpsvrcd2r1pgyj"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.6.0"; sha256 = "07pff0y96hj0k0izgmqlxydnx8cpsvfymicwi4m3dix979sdly09"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "5.0.0"; sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; sha256 = "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy"; }) - (fetchNuGet { pname = "System.Diagnostics.FileVersionInfo"; version = "4.3.0"; sha256 = "094hx249lb3vb336q7dg3v257hbxvz2jnalj695l7cg5kxzqwai7"; }) - (fetchNuGet { pname = "System.Diagnostics.PerformanceCounter"; version = "4.5.0"; sha256 = "17gh1ijbjvbq4qk4g3k7izwn0h3xsdbbvgih01id68jxach9f7nb"; }) - (fetchNuGet { pname = "System.Diagnostics.PerformanceCounter"; version = "4.7.0"; sha256 = "1m00cf40rmfphd5l19wis571yygwbwgyxnhp4ya4bv1130lagil1"; }) - (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.1.0"; sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; }) - (fetchNuGet { pname = "System.Diagnostics.StackTrace"; version = "4.3.0"; sha256 = "0ash4h9k0m7xsm0yl79r0ixrdz369h7y922wipp5gladmlbvpyjd"; }) - (fetchNuGet { pname = "System.Diagnostics.TextWriterTraceListener"; version = "4.0.0"; sha256 = "1xigiwkwyxak0dhm0p8i2zb7a9syly9cdb5s9zkr9rbad4f2fqhs"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.0.0"; sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; }) - (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "4.7.0"; sha256 = "0yfw7cpl54mgfcylvlpvrl0c8r1b0zca6p7r3rcwkvqy23xqcyhg"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "4.7.3"; sha256 = "1dcqbm35yx52c7x7sgnnfl6f5nfrj484sgaapnr8dw9x160w64qp"; }) - (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.Formats.Asn1"; version = "5.0.0"; sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.32.0"; sha256 = "1xv95ipxp9n3j3bdky9pw7pgkb20zzxbjdnldzxd4x4nsqfsnw1c"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Abstractions"; version = "2.1.0.227"; sha256 = "1dhdv07a06s7b34lpzx3c0n50zzqkhiia9rgi09cbibsbwzpm6b3"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.0.1"; sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) - (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.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "4.5.0"; sha256 = "1gq4s8w7ds1sp8f9wqzf8nrzal40q5cd2w4pkf4fscrl2ih3hkkj"; }) - (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "4.7.0"; sha256 = "0k0lyhk5dmnpljgw9jr3lgbq4q0h5wmzybllglldbaz7jmm7jazi"; }) - (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "5.0.0"; sha256 = "0ixl68plva0fsj3byv76bai7vkin86s6wyzr8vcav3szl862blvk"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) - (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.IO.Hashing"; version = "7.0.0"; sha256 = "0vilmb817wnw8w13kkps831p05zzc41dldigpbr3wqi0hsrf8ad9"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) - (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.Linq.Queryable"; version = "4.0.1"; sha256 = "11jn9k34g245yyf260gr3ldzvaqa9477w2c5nhb1p8vjx4xm3qaw"; }) - (fetchNuGet { pname = "System.Linq.Queryable"; version = "4.3.0"; sha256 = "0vidv9cjwy8scabxd33mm4zl5vql695rz56ydc42m9b731xi2ahj"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Memory.Data"; version = "1.0.2"; sha256 = "1p8qdg0gzxhjvabryc3xws2629pj8w5zz2iqh86kw8sh0rann9ay"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; }) - (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.NetworkInformation"; version = "4.1.0"; sha256 = "17ia8gyr0aq76z9cv37yjmpna7nx30xfppw0lifvi9s2q3yjspd2"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Requests"; version = "4.0.11"; sha256 = "13mka55sa6dg6nw4zdrih44gnp8hnj5azynz47ljsh2791lz3d9h"; }) - (fetchNuGet { pname = "System.Net.Security"; version = "4.3.2"; sha256 = "1aw1ca1vssqrillrh4qkarx0lxwc8wcaqdkfdima8376wb98j2q8"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0"; sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.Net.WebHeaderCollection"; version = "4.0.1"; sha256 = "10bxpxj80c4z00z3ksrfswspq9qqsw8jwxcbzvymzycb97m9b55q"; }) - (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.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.DataContractSerialization"; version = "4.1.1"; sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.2"; sha256 = "019s7jz73d236p23mnpfaxxwib019i0v1fbwbkys0hskgddvw7cc"; }) - (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) - (fetchNuGet { pname = "System.Reactive.Core"; version = "3.1.1"; sha256 = "15nlyzsccfah5ihrhklr1fjl2mphv4rqbmbvlfbgvijava0czkn9"; }) - (fetchNuGet { pname = "System.Reactive.Core"; version = "5.0.0"; sha256 = "1dx853anp24awwgpw9j91qkgm2ww3n76jxnmg6qkn79vnfnjg0g7"; }) - (fetchNuGet { pname = "System.Reactive.Interfaces"; version = "3.1.1"; sha256 = "1i4zq94cwnk3d5bvkds3garm0gg348yxlpvcybq0jpj4m46nd4ak"; }) - (fetchNuGet { pname = "System.Reactive.Linq"; version = "3.1.1"; sha256 = "1l4844pqbpg2s6cddc5k8a0ff9pc5l7qz9q7zlnk5h0gpjy00wvi"; }) - (fetchNuGet { pname = "System.Reactive.Linq"; version = "5.0.0"; sha256 = "07p05v13yixbxhs84231k5l8jw3nji0j3zcqc6nsbcmh54jpjsrb"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) - (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.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.3.0"; sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.4.2"; sha256 = "08b7b43vczlliv8k7q43jinjfrxwpljsglw7sxmc6sd7d54pd1vi"; }) - (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.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) - (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.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.1"; sha256 = "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.1"; sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) - (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.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) - (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.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (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.Runtime.InteropServices.WindowsRuntime"; version = "4.0.1"; sha256 = "0r43c2jggyd0bvaal64gfv6iw49xj0378r1zb3ycwb53ff4rdn26"; }) - (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.0.0"; sha256 = "0lpfi3psqcp6zxsjk2qyahal7zaawviimc8lhrlswhip2mx7ykl0"; }) - (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; sha256 = "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Json"; version = "4.0.2"; sha256 = "08ypbzs0sb302ga04ds5b2wxa2gg0q50zpa0nvc87ipjhs0v66dn"; }) - (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.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.7.0"; sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) - (fetchNuGet { pname = "System.Security.Claims"; version = "4.0.1"; sha256 = "03dw0ls49bvsrffgwycyifjgz0qzr9r85skqhdyhfd51fqf398n6"; }) - (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.2.0"; sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.5.0"; sha256 = "1pm4ykbcz48f1hdmwpia432ha6qbb9kbrxrrp7cg3m8q8xn52ngn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.7.0"; sha256 = "00797sqbba8lys486ifxblz9j52m29kidclvmqpk531820k55x9j"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.0.0"; sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.0.0"; sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.0.0"; sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "4.5.0"; sha256 = "16dhiz2qypk289dxiqa9rb7jmslnami6bykalv5dvbd8j91zikpy"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "4.7.0"; sha256 = "1mwvzl5ask8kk0vdgchhqr90nl61kagg47warb7dxrb03cxjd4wm"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "5.0.0"; sha256 = "0hb2mndac3xrw3786bsjxjfh19bwnr991qib54k6wsqjhjyyvbwj"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.0.0"; sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; }) - (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.ProtectedData"; version = "4.5.0"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.7.0"; sha256 = "1s1sh8k10s0apa09c5m2lkavi3ys90y657whg2smb3y8mpkfr5vm"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.1.0"; sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.1"; sha256 = "06fp9a8zh0qk4g80q1g9m2q90q287nwywxlgfa4wi0v3lybnr9hp"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "4.5.0"; sha256 = "1rk40x0msf9k7sxnjyizagjns1z25dh3cf22bx6hsx6vhf0sk08l"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "4.7.1"; sha256 = "0smi8lv8q59ciba63bf6snxcs0i09awwasbnf5hc26ih7snqvd03"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "4.5.0"; sha256 = "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "4.7.0"; sha256 = "13f366sj36jwbvld957gk2q64k2xbj48r8b0k9avrri2nlq1fs04"; }) - (fetchNuGet { pname = "System.Security.Principal"; version = "4.0.1"; sha256 = "1nbzdfqvzzbgsfdd5qsh94d7dbg2v4sw0yx6himyn52zf8z6007p"; }) - (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.0.0"; sha256 = "1d3vc8i0zss9z8p4qprls4gbh7q4218l9845kclx7wvw41809k6z"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Security.SecureString"; version = "4.0.0"; sha256 = "026q5f46585hgisz4svhnjc7q0ljprz43v15rybqizlyli5585jz"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.0.1"; sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.3.0"; sha256 = "0lgxg1gn7pg7j0f942pfdc9q7wamzxsgq3ng248ikdasxz0iadkv"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.0"; sha256 = "19x38911pawq4mrxrm04l2bnxwxxlzq8v8rj4cbxnfjj8pnd3vj3"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.5.0"; sha256 = "0srd5bva52n92i90wd88pzrqjsxnfgka3ilybwh7s6sf469y5s53"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; sha256 = "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "4.6.0"; sha256 = "0ism236hwi0k6axssfq58s1d8lihplwiz058pdvl8al71hagri39"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "5.0.2"; sha256 = "0vd0wd29cdhgcjngl9sw391sn2s8xm974y15zvym0whsdgjwiqfx"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }) - (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.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; }) - (fetchNuGet { pname = "System.Threading.Overlapped"; version = "4.0.1"; sha256 = "0fi79az3vmqdp9mv3wh2phblfjls89zlj6p9nc3i9f6wmfarj188"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "4.8.0"; sha256 = "1hdd808x1fliv2j9jjk9hyjadlfl4sdc31vh1bafnz6y614r7m4r"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "4.9.0"; sha256 = "1g6s9pjg4z8iy98df60y9a01imdqy59zd767vz74rrng78jl2dk5"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.0"; sha256 = "05mpkdc7aigwadlcc9q3ash88hygkyz5pmkj360jj6c6ffhm91s8"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.1"; sha256 = "1ikrplvw4m6pzjbq3bfbpr572n4i9mni577zvmrkaygvx85q3myw"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.2"; sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Parallel"; version = "4.3.0"; sha256 = "1rr3qa4hxwyj531s4nb3bwrxnxxwz617i0n9gh6x7nr7dd3ayzgh"; }) - (fetchNuGet { pname = "System.Threading.Thread"; version = "4.0.0"; sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; }) - (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) - (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.0.10"; sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; }) - (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.3.0"; sha256 = "1227k7fxbxapq7dms4lvwwjdf3pr1jcsmhy2nzzhj6g6hs530hxn"; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.4.0"; sha256 = "1wydfgszs00yxga57sam66vzv9fshk2pw7gim57saplsnkfliaif"; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "4.7.0"; sha256 = "11dmyx3j0jafjx5r9mkj1v4w2a4rzrdn8fgwm2d1g7fs1ayqcvy9"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) - (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.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.0.1"; sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; }) - (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.0.11"; sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; }) - (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.3.0"; sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; }) - (fetchNuGet { pname = "System.Xml.XPath"; version = "4.0.1"; sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m"; }) - (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 = "System.Xml.XPath.XmlDocument"; version = "4.0.1"; sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc"; }) - (fetchNuGet { pname = "Validation"; version = "2.4.15"; sha256 = "1wy60zv97q7w5rnrs1c12q4gazjj3a86dn856c8qy3xj9rlgx52j"; }) - (fetchNuGet { pname = "WindowsAzure.Storage"; version = "9.3.1"; sha256 = "1zwkzh2pprqn46bc6rkl1chb2dbpyrnzk0jirsbw29fqafmwdmdl"; }) - (fetchNuGet { pname = "xunit"; version = "2.4.0"; sha256 = "1fqya6mr6864x4kc0bqxzz0i61bl1vz6b4c79ica5vmwxdz50765"; }) - (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.1"; sha256 = "0c7zkf3i8n1mhc457q859klk067bw1xbf31lyxlwc5hlx9aqz65z"; }) - (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.2"; sha256 = "1cfpdhzrmqywsg8w899w9x5bxbhszipsm4791il1gf7cdq4hz463"; }) - (fetchNuGet { pname = "xunit.analyzers"; version = "0.10.0"; sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; }) - (fetchNuGet { pname = "xunit.assert"; version = "2.4.0"; sha256 = "1p96zl0czhsh3im2c39nlc63869nwqia3kllfp5wn0jlaacpr82s"; }) - (fetchNuGet { pname = "xunit.core"; version = "2.4.0"; sha256 = "1lcy8k62pnmsf15pppr7y940289rygxc0ipif1dsk9k3h5m7vpkn"; }) - (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.2.0"; sha256 = "0l9fl09l709dq671r5yvmcrk9vhxgszmxf3ny1h9ja2sp9xx5pbs"; }) - (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.0"; sha256 = "0qd834mv1017j13bjz7g0byiiqzpflnnqhm15zvnk309q48rgfrd"; }) - (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.2.0"; sha256 = "14ia58y98qhswsx61fp046mpfx0kxcq5alhixf3k3vjar6p7naq4"; }) - (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.0"; sha256 = "0bpy9iw4dkx884ld10dlijlyfp13afxrb3akhprdvazhmh8lj53j"; }) - (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.0"; sha256 = "1qgj8rbwd51cparf5kkqvf0zp0w68giz3ryf7265lmv4n14nwd5a"; }) - (fetchNuGet { pname = "Xunit.SkippableFact"; version = "1.3.6"; sha256 = "1g4lwzdv594ldwp4bfj01q2n74wa483z70gms4742v9nsf8119qq"; }) - (fetchNuGet { pname = "YamlDotNet"; version = "6.0.0"; sha256 = "15p23jw0cw7y9lij8n6iiyh85rl2plr2z4clnxjgdh2iz7783v51"; }) - (fetchNuGet { pname = "Yarp.ReverseProxy"; version = "2.0.1"; sha256 = "1bgf4wxn4q64byxs0nwzafan8lj342ffma19gpsxj4yzarad5h8x"; }) -] diff --git a/pkgs/development/tools/azure-static-sites-client/default.nix b/pkgs/development/tools/azure-static-sites-client/default.nix index 126eaf1ec68e..18b80555833e 100644 --- a/pkgs/development/tools/azure-static-sites-client/default.nix +++ b/pkgs/development/tools/azure-static-sites-client/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { libkrb5 lttng-ust openssl - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) zlib ]; diff --git a/pkgs/development/tools/b4/default.nix b/pkgs/development/tools/b4/default.nix deleted file mode 100644 index c175badcc300..000000000000 --- a/pkgs/development/tools/b4/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, python3Packages, fetchPypi, patatt }: - -python3Packages.buildPythonApplication rec { - pname = "b4"; - version = "0.14.2"; - pyproject = true; - - src = fetchPypi { - inherit pname version; - hash = "sha256-T4NbblrjDv9gBLslwV/Y9Pbs0RBVluhtsYcf730YET0="; - }; - - # tests make dns requests and fails - doCheck = false; - - build-system = with python3Packages; [ - setuptools - ]; - - propagatedBuildInputs = with python3Packages; [ - requests - dnspython - dkimpy - patatt - git-filter-repo - ]; - - meta = with lib; { - homepage = "https://git.kernel.org/pub/scm/utils/b4/b4.git/about"; - license = licenses.gpl2Only; - description = "Helper utility to work with patches made available via a public-inbox archive"; - mainProgram = "b4"; - maintainers = with maintainers; [ jb55 qyliss mfrw ]; - }; -} diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix deleted file mode 100644 index b7e2265c4915..000000000000 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ lib -, python3Packages -, fetchFromGitHub -, installShellFiles -, testers -, backblaze-b2 -# executable is renamed to backblaze-b2 by default, to avoid collision with boost's 'b2' -, execName ? "backblaze-b2" -}: - -python3Packages.buildPythonApplication rec { - pname = "backblaze-b2"; - version = "4.0.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "Backblaze"; - repo = "B2_Command_Line_Tool"; - rev = "refs/tags/v${version}"; - hash = "sha256-rZUWPSI7CrKOdEKdsSpekwBerbIMf2iiVrWkV8WrqSc="; - }; - - nativeBuildInputs = with python3Packages; [ - installShellFiles - argcomplete - ]; - - build-system = with python3Packages; [ - pdm-backend - ]; - - dependencies = with python3Packages; [ - argcomplete - arrow - b2sdk - phx-class-registry - docutils - rst2ansi - tabulate - tqdm - platformdirs - packaging - setuptools - ]; - - nativeCheckInputs = with python3Packages; [ - backoff - more-itertools - pexpect - pytestCheckHook - pytest-xdist - ]; - - preCheck = '' - export HOME=$(mktemp -d) - ''; - - disabledTestPaths = [ - # Test requires network - "test/integration/test_b2_command_line.py" - "test/integration/test_tqdm_closer.py" - # it's hard to make it work on nix - "test/integration/test_autocomplete.py" - "test/unit/test_console_tool.py" - # this one causes successive tests to fail - "test/unit/_cli/test_autocomplete_cache.py" - ]; - - disabledTests = [ - # Autocomplete is not successful in a sandbox - "test_autocomplete_installer" - "test_help" - "test_install_autocomplete" - ]; - - postInstall = lib.optionalString (execName != "b2") '' - mv "$out/bin/b2" "$out/bin/${execName}" - '' - + '' - installShellCompletion --cmd ${execName} \ - --bash <(register-python-argcomplete ${execName}) \ - --zsh <(register-python-argcomplete ${execName}) - ''; - - passthru.tests.version = (testers.testVersion { - package = backblaze-b2; - command = "${execName} version --short"; - }).overrideAttrs (old: { - # workaround the error: Permission denied: '/homeless-shelter' - # backblaze-b2 fails to create a 'b2' directory under the XDG config path - preHook = '' - export HOME=$(mktemp -d) - ''; - }); - - meta = with lib; { - description = "Command-line tool for accessing the Backblaze B2 storage service"; - homepage = "https://github.com/Backblaze/B2_Command_Line_Tool"; - changelog = "https://github.com/Backblaze/B2_Command_Line_Tool/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ hrdinka tomhoule ]; - mainProgram = "backblaze-b2"; - }; -} diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix deleted file mode 100644 index afaa956bbcab..000000000000 --- a/pkgs/development/tools/bacon/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, CoreServices -}: - -rustPlatform.buildRustPackage rec { - pname = "bacon"; - version = "2.21.0"; - - src = fetchFromGitHub { - owner = "Canop"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-WIjTFP5koNQeHiTcVxQ18eZEdHzmpBFinvfNtirG+pg="; - }; - - cargoHash = "sha256-YaVnfwf0jyZTe6B35z9Zm9247kGU/G6nu23sHg9lnAk="; - - buildInputs = lib.optionals stdenv.isDarwin [ - CoreServices - ]; - - meta = with lib; { - description = "Background rust code checker"; - mainProgram = "bacon"; - homepage = "https://github.com/Canop/bacon"; - changelog = "https://github.com/Canop/bacon/blob/v${version}/CHANGELOG.md"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ FlorianFranzen ]; - }; -} diff --git a/pkgs/development/tools/bazel-gazelle/default.nix b/pkgs/development/tools/bazel-gazelle/default.nix deleted file mode 100644 index f521ccf4f220..000000000000 --- a/pkgs/development/tools/bazel-gazelle/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, lib -}: - -buildGoModule rec { - pname = "bazel-gazelle"; - version = "0.38.0"; - - src = fetchFromGitHub { - owner = "bazelbuild"; - repo = pname; - rev = "v${version}"; - hash = "sha256-0FOKLBu1eZMK1nXOmXN4achrZgNUqzzcuC6sH0RLtbc="; - }; - - vendorHash = null; - - doCheck = false; - - subPackages = [ "cmd/gazelle" ]; - - meta = with lib; { - homepage = "https://github.com/bazelbuild/bazel-gazelle"; - description = '' - Gazelle is a Bazel build file generator for Bazel projects. It natively - supports Go and protobuf, and it may be extended to support new languages - and custom rule sets. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ kalbasit ]; - mainProgram = "gazelle"; - }; -} diff --git a/pkgs/development/tools/bazel-kazel/default.nix b/pkgs/development/tools/bazel-kazel/default.nix deleted file mode 100644 index 8d7ceb04f0eb..000000000000 --- a/pkgs/development/tools/bazel-kazel/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib }: - -buildGoModule rec { - pname = "bazel-kazel"; - version = "0.2.5"; - - src = fetchFromGitHub { - owner = "kubernetes"; - repo = "repo-infra"; - rev = "v${version}"; - sha256 = "sha256-Y9VOlFrFmJQCQuwf3UztHGuJqmq/lSibTbI3oGjtNuE="; - }; - - vendorHash = "sha256-1+7Mx1Zh1WolqTpWNe560PRzRYaWVUVLvNvUOysaW5I="; - - doCheck = false; - - subPackages = [ "cmd/kazel" ]; - - meta = with lib; { - description = "kazel - a BUILD file generator for go and bazel"; - homepage = "https://github.com/kubernetes/repo-infra"; - license = licenses.asl20; - maintainers = with maintainers; [ kalbasit ]; - mainProgram = "kazel"; - }; -} diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix deleted file mode 100644 index ae152a3782ab..000000000000 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ buildBazelPackage -, bazel_5 -, fetchFromGitHub -, git -, go_1_21 -, python3 -, lib, stdenv -}: - -let - patches = [ - ./use-go-in-path.patch - ]; - - # Patch the protoc alias so that it always builds from source. - rulesProto = fetchFromGitHub { - owner = "bazelbuild"; - repo = "rules_proto"; - rev = "4.0.0"; - hash = "sha256-WVPZx14thneAC4PdiDhBibnPwlCKEF9c93CHR0t1Efo="; - postFetch = '' - sed -i 's|name = "protoc"|name = "_protoc_original"|' $out/proto/private/BUILD.release - cat <<EOF >>$out/proto/private/BUILD.release - alias(name = "protoc", actual = "@com_github_protocolbuffers_protobuf//:protoc", visibility = ["//visibility:public"]) - EOF - ''; - }; - -in -buildBazelPackage rec { - pname = "bazel-watcher"; - version = "0.25.2"; - - src = fetchFromGitHub { - owner = "bazelbuild"; - repo = "bazel-watcher"; - rev = "v${version}"; - hash = "sha256-lreGKA0DZiOd1bJq8NNQ+80cyDwiughoXCkKu1RaZmc="; - }; - - nativeBuildInputs = [ go_1_21 git python3 ]; - removeRulesCC = false; - - bazel = bazel_5; - bazelFlags = [ "--override_repository=rules_proto=${rulesProto}" ]; - bazelBuildFlags = lib.optionals stdenv.cc.isClang [ "--cxxopt=-x" "--cxxopt=c++" "--host_cxxopt=-x" "--host_cxxopt=c++" ]; - bazelTargets = [ "//cmd/ibazel" ]; - - fetchConfigured = false; # we want to fetch all dependencies, regardless of the current system - fetchAttrs = { - inherit patches; - - preBuild = '' - patchShebangs . - - echo ${bazel_5.version} > .bazelversion - ''; - - preInstall = '' - # Remove the go_sdk (it's just a copy of the go derivation) and all - # references to it from the marker files. Bazel does not need to download - # this sdk because we have patched the WORKSPACE file to point to the one - # currently present in PATH. Without removing the go_sdk from the marker - # file, the hash of it will change anytime the Go derivation changes and - # that would lead to impurities in the marker files which would result in - # a different hash for the fetch phase. - rm -rf $bazelOut/external/{go_sdk,\@go_sdk.marker} - sed -e '/^FILE:@go_sdk.*/d' -i $bazelOut/external/\@*.marker - - # Retains go build input markers - chmod -R 755 $bazelOut/external/{bazel_gazelle_go_repository_cache,@\bazel_gazelle_go_repository_cache.marker} - rm -rf $bazelOut/external/{bazel_gazelle_go_repository_cache,@\bazel_gazelle_go_repository_cache.marker} - - # Remove the gazelle tools, they contain go binaries that are built - # non-deterministically. As long as the gazelle version matches the tools - # should be equivalent. - rm -rf $bazelOut/external/{bazel_gazelle_go_repository_tools,\@bazel_gazelle_go_repository_tools.marker} - sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker - - # remove com_google_protobuf because it had files with different permissions on linux and darwin - rm -rf $bazelOut/external/com_google_protobuf - ''; - - sha256 = "sha256-B2KVD/FmkAa7MNhLaH286gF3uA20qjN3CoA83KRB9E8="; - }; - - buildAttrs = { - inherit patches; - - preBuild = '' - patchShebangs . - - substituteInPlace cmd/ibazel/BUILD.bazel --replace '{STABLE_GIT_VERSION}' ${version} - echo ${bazel_5.version} > .bazelversion - ''; - - installPhase = '' - install -Dm755 bazel-bin/cmd/ibazel/ibazel_/ibazel $out/bin/ibazel - ''; - }; - - meta = with lib; { - homepage = "https://github.com/bazelbuild/bazel-watcher"; - description = "Tools for building Bazel targets when source files change"; - license = licenses.asl20; - maintainers = with maintainers; [ kalbasit ]; - mainProgram = "ibazel"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/bazel-watcher/use-go-in-path.patch b/pkgs/development/tools/bazel-watcher/use-go-in-path.patch deleted file mode 100644 index 5ce4f81ff3ae..000000000000 --- a/pkgs/development/tools/bazel-watcher/use-go-in-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/WORKSPACE b/WORKSPACE -index 51273b6..fcf9ffb 100644 ---- a/WORKSPACE -+++ b/WORKSPACE -@@ -61,7 +61,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe - - go_rules_dependencies() - --go_register_toolchains(version = "1.19.4") -+go_register_toolchains(go_version = "host") - - load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") - diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix deleted file mode 100644 index e0faacc5e5d5..000000000000 --- a/pkgs/development/tools/bazelisk/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "bazelisk"; - version = "1.21.0"; - - src = fetchFromGitHub { - owner = "bazelbuild"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-p5K0VYPAjorlwJx7GB2r7M/KGUzD3jyOp4dLkw11/tc="; - }; - - vendorHash = "sha256-wMCJnbu9pKBujTvZ4rvxgJdB7l7Z6vB6eyem35Ghz0Q="; - - doCheck = false; - - ldflags = [ "-s" "-w" "-X main.BazeliskVersion=${version}" ]; - - meta = with lib; { - description = "User-friendly launcher for Bazel"; - mainProgram = "bazelisk"; - longDescription = '' - BEWARE: This package does not work on NixOS. - ''; - homepage = "https://github.com/bazelbuild/bazelisk"; - changelog = "https://github.com/bazelbuild/bazelisk/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ elasticdog ]; - }; -} diff --git a/pkgs/development/tools/bbin/default.nix b/pkgs/development/tools/bbin/default.nix deleted file mode 100644 index 42ef4285816c..000000000000 --- a/pkgs/development/tools/bbin/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, gitUpdater -, makeWrapper -, babashka-unwrapped -}: - -stdenvNoCC.mkDerivation rec { - pname = "bbin"; - version = "0.2.3"; - - src = fetchFromGitHub { - owner = "babashka"; - repo = "bbin"; - rev = "v${version}"; - sha256 = "sha256-tWk5HzDKff+wwqRjLYbjfio3aQC6Xz5vsMf/NLm+Scc="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - install -D bbin $out/bin/bbin - mkdir -p $out/share - cp -r docs $out/share/docs - wrapProgram $out/bin/bbin \ - --prefix PATH : "${lib.makeBinPath [ babashka-unwrapped babashka-unwrapped.graalvmDrv ]}" - - runHook postInstall - ''; - - passthru = { - updateScript = gitUpdater { rev-prefix = "v"; }; - }; - - meta = with lib; { - homepage = "https://github.com/babashka/bbin"; - description = "Install any Babashka script or project with one command"; - mainProgram = "bbin"; - license = licenses.mit; - inherit (babashka-unwrapped.meta) platforms; - maintainers = with maintainers; [ sohalt ]; - }; -} diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix deleted file mode 100644 index 583344aa640a..000000000000 --- a/pkgs/development/tools/bearer/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - testers, - bearer, -}: - -buildGoModule rec { - pname = "bearer"; - version = "1.46.1"; - - src = fetchFromGitHub { - owner = "bearer"; - repo = "bearer"; - rev = "refs/tags/v${version}"; - hash = "sha256-zMQvD6ats1zJ/hK/aZh0LKWdSRqcR0BrAVcD4KnRwMQ="; - }; - - vendorHash = "sha256-1wxy/NXZCntVf8Po3Rn+pueadcveE0v3Jc0d4eYkY6s="; - - subPackages = [ "cmd/bearer" ]; - - ldflags = [ - "-s" - "-w" - "-X=github.com/bearer/bearer/cmd/bearer/build.Version=${version}" - ]; - - passthru.tests = { - version = testers.testVersion { - package = bearer; - command = "bearer version"; - }; - }; - - meta = with lib; { - description = "Code security scanning tool (SAST) to discover, filter and prioritize security and privacy risks"; - homepage = "https://github.com/bearer/bearer"; - changelog = "https://github.com/Bearer/bearer/releases/tag/v${version}"; - license = with licenses; [ elastic20 ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/tools/benthos/default.nix b/pkgs/development/tools/benthos/default.nix deleted file mode 100644 index 26c03f7fa658..000000000000 --- a/pkgs/development/tools/benthos/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "benthos"; - version = "4.27.0"; - - src = fetchFromGitHub { - owner = "benthosdev"; - repo = "benthos"; - rev = "refs/tags/v${version}"; - hash = "sha256-Jswy4Ku/dxIEfC+jNjLXu/WW24enc4Qn0vrOHvNDVYQ="; - }; - - proxyVendor = true; - - vendorHash = "sha256-6CVDhy29bIn19EgKbKDNTBWdy+i18g0oz/NxABcQ6QE="; - - doCheck = false; - - subPackages = [ - "cmd/benthos" - ]; - - ldflags = [ - "-s" - "-w" - "-X github.com/benthosdev/benthos/v4/internal/cli.Version=${version}" - ]; - - meta = with lib; { - description = "Fancy stream processing made operationally mundane"; - mainProgram = "benthos"; - homepage = "https://www.benthos.dev"; - changelog = "https://github.com/benthosdev/benthos/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ sagikazarmark ]; - }; -} diff --git a/pkgs/development/tools/bin2c/default.nix b/pkgs/development/tools/bin2c/default.nix deleted file mode 100644 index 2528b1ea0961..000000000000 --- a/pkgs/development/tools/bin2c/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, util-linux -}: - -stdenv.mkDerivation { - pname = "bin2c"; - version = "unstable-2020-05-30"; - - src = fetchFromGitHub { - owner = "adobe"; - repo = "bin2c"; - rev = "4300880a350679a808dc05bdc2840368f5c24d9a"; - sha256 = "sha256-PLo5kkN2k3KutVGumoXEB2x9MdxDUtpwAQZLwm4dDvw="; - }; - - makeFlags = [ "prefix=$(out)" ]; - - doCheck = !stdenv.isDarwin; - checkTarget = "test"; - checkInputs = [ util-linux ]; # uuidgen - - meta = with lib; { - description = "Embed binary & text files inside C binaries"; - mainProgram = "bin2c"; - homepage = "https://github.com/adobe/bin2c"; - license = licenses.asl20; - maintainers = [ maintainers.shadowrz ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/bingo/default.nix b/pkgs/development/tools/bingo/default.nix deleted file mode 100644 index 9af3b77dfbff..000000000000 --- a/pkgs/development/tools/bingo/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "bingo"; - version = "0.9.0"; - - src = fetchFromGitHub { - owner = "bwplotka"; - repo = "bingo"; - rev = "v${version}"; - hash = "sha256-bzh6P+J8EoewjOofwWXMgtSXAhESetD3y9EiqLNOT54="; - }; - - vendorHash = "sha256-cDeeRkTwuwEKNTqK/6ZEKANrjTIUTeR3o5oClkJQ4AE="; - - postPatch = '' - rm get_e2e_test.go get_e2e_utils_test.go - ''; - - CGO_ENABLED = 0; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Like `go get` but for Go tools! CI Automating versioning of Go binaries in a nested, isolated Go modules"; - mainProgram = "bingo"; - homepage = "https://github.com/bwplotka/bingo"; - license = licenses.asl20; - maintainers = with maintainers; [ aaronjheng ]; - }; -} diff --git a/pkgs/development/tools/biodiff/default.nix b/pkgs/development/tools/biodiff/default.nix deleted file mode 100644 index adbb69f486e8..000000000000 --- a/pkgs/development/tools/biodiff/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform, wfa2-lib }: - -rustPlatform.buildRustPackage rec { - pname = "biodiff"; - version = "1.2.1"; - - src = fetchFromGitHub { - owner = "8051Enthusiast"; - repo = "biodiff"; - rev = "v${version}"; - hash = "sha256-ZLxjOV08sC5dKICvRUyL6FLMORkxwdLgNq7L45CDwa4="; - fetchSubmodules = true; - }; - - cargoHash = "sha256-LxkwhOxXkegdXLmtbNLIB6nOAeCbpvIwSXbTF6jBcHs="; - - buildInputs = [ wfa2-lib ]; - - # default statically links wfa2 - buildNoDefaultFeatures = true; - buildFeatures = [ "wfa2" ]; - - meta = with lib; { - description = "Hex diff viewer using alignment algorithms from biology"; - homepage = "https://github.com/8051Enthusiast/biodiff"; - changelog = "https://github.com/8051Enthusiast/biodiff/blob/v${version}/CHANGELOG"; - license = licenses.mit; - maintainers = with maintainers; [ newam ]; - }; -} diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix deleted file mode 100644 index 1393a7ca54e9..000000000000 --- a/pkgs/development/tools/bloaty/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib, stdenv, cmake, zlib, fetchFromGitHub, re2, abseil-cpp, protobuf, capstone, gtest, pkg-config, lit, llvmPackages_16 }: - -stdenv.mkDerivation rec { - pname = "bloaty"; - version = "1.1-unstable-2023-11-06"; - - src = fetchFromGitHub { - owner = "google"; - repo = "bloaty"; - rev = "16f9fe54d9cd0e9abe1d25fc1a9b44c214cfaa9f"; - hash = "sha256-mIVlNMKtJMfH2QdYZ6+oV7619oYzvKkq3fHY6uofqlM="; - }; - - # Old vendored package which has no other use than here, so not packaged in nixpkgs. - demumble = fetchFromGitHub { - owner = "nico"; - repo = "demumble"; - rev = "01098eab821b33bd31b9778aea38565cd796aa85"; - hash = "sha256-605SsXd7TSdm3BH854ChHIZbOXcHI/n8RN+pFMz4Ex4="; - }; - - cmakeFlags = [ - "-DLIT_EXECUTABLE=${lit}/bin/lit" - "-DFILECHECK_EXECUTABLE=${llvmPackages_16.libllvm}/bin/FileCheck" - "-DYAML2OBJ_EXECUTABLE=${llvmPackages_16.libllvm}/bin/yaml2obj" - ]; - - postPatch = '' - # Build system relies on some of those source files - rm -rf third_party/googletest third_party/abseil-cpp third_party/demumble - ln -s ${gtest.src} third_party/googletest - ln -s ${abseil-cpp.src} third_party/abseil-cpp - ln -s ${demumble} third_party/demumble - substituteInPlace CMakeLists.txt \ - --replace "find_package(Python COMPONENTS Interpreter)" "" \ - --replace "if(Python_FOUND AND LIT_EXECUTABLE" "if(LIT_EXECUTABLE" \ - --replace "COMMAND \''\${Python_EXECUTABLE} \''\${LIT_EXECUTABLE}" "COMMAND \''\${LIT_EXECUTABLE}" - # wasm test fail. Possibly due to LLVM version < 17. See https://github.com/google/bloaty/pull/354 - rm -rf tests/wasm - ''; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ zlib re2 abseil-cpp protobuf capstone gtest lit llvmPackages_16.libllvm ]; - - doCheck = true; - - postCheck = '' - # These lit tests need to be build seperatly. - # See https://github.com/google/bloaty/blob/main/tests/README.md - cmake --build . --target check-bloaty - ''; - installPhase = '' - install -Dm755 {.,$out/bin}/bloaty - ''; - - meta = with lib; { - description = "Size profiler for binaries"; - mainProgram = "bloaty"; - homepage = "https://github.com/google/bloaty"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/bloom/default.nix b/pkgs/development/tools/bloom/default.nix deleted file mode 100644 index e870371c0ebe..000000000000 --- a/pkgs/development/tools/bloom/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, yaml-cpp -, qtbase -, qtsvg -, wrapQtAppsHook -, qttools -, libusb1 -, php -, hidapi -, procps -}: - -stdenv.mkDerivation rec { - pname = "bloom"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "bloombloombloom"; - repo = "Bloom"; - rev = "v${version}"; - hash = "sha256-ZZfclZwxsCgApUII79bJVyT5V/dF9jm7l8ynRWCh0UU="; - }; - - nativeBuildInputs = [ - cmake - php - wrapQtAppsHook - ]; - - buildInputs = [ - hidapi - libusb1 - procps - qtbase - qtsvg - qttools - yaml-cpp - ]; - - postPatch = '' - sed -i 's|/usr|${placeholder "out"}|' cmake/Installing.cmake - ''; - - meta = { - description = "Debug interface for AVR-based embedded systems development on GNU/Linux"; - homepage = "https://bloom.oscillate.io/"; - license = lib.licenses.lgpl3Only; - maintainers = [ ]; - mainProgram = "bloom"; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/tools/bodyclose/default.nix b/pkgs/development/tools/bodyclose/default.nix deleted file mode 100644 index 9072fe4c1045..000000000000 --- a/pkgs/development/tools/bodyclose/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, unstableGitUpdater -}: - -buildGoModule { - pname = "bodyclose"; - version = "0-unstable-2024-01-26"; - - src = fetchFromGitHub { - owner = "timakin"; - repo = "bodyclose"; - rev = "f835fa56326ac81b2d54408f1a3a6c43bca4d5aa"; - hash = "sha256-yPvBDJx6ECrSLDazdNDRl79iogsZO2qNWHuUuwQoRHU="; - }; - - vendorHash = "sha256-8grdJuV8aSETsJr2VazC/3ctfnGh3UgjOWD4/xf3uC8="; - - ldflags = [ "-s" "-w" ]; - - passthru.updateScript = unstableGitUpdater {}; - - meta = with lib; { - description = "Golang linter to check whether HTTP response body is closed and a re-use of TCP connection is not blocked"; - mainProgram = "bodyclose"; - homepage = "https://github.com/timakin/bodyclose"; - license = licenses.mit; - maintainers = with maintainers; [ meain ]; - }; -} diff --git a/pkgs/development/tools/bomber-go/default.nix b/pkgs/development/tools/bomber-go/default.nix deleted file mode 100644 index 7857dff0302a..000000000000 --- a/pkgs/development/tools/bomber-go/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "bomber-go"; - version = "0.4.7"; - - src = fetchFromGitHub { - owner = "devops-kung-fu"; - repo = "bomber"; - rev = "refs/tags/v${version}"; - hash = "sha256-q3x3duXc2++BvVul2a5fBTcPHWrOHpPOGHBUXL08syg="; - }; - - vendorHash = "sha256-jVdrvc48/Vt240EYk5PtZCjNGipX7M1qF8OJdpu/qI4="; - - ldflags = [ - "-w" - "-s" - ]; - - checkFlags = [ - "-skip=TestEnrich" # Requires network access - ]; - - meta = with lib; { - description = "Tool to scans Software Bill of Materials (SBOMs) for vulnerabilities"; - homepage = "https://github.com/devops-kung-fu/bomber"; - changelog = "https://github.com/devops-kung-fu/bomber/releases/tag/v${version}"; - license = licenses.mpl20; - mainProgram = "bomber"; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix deleted file mode 100644 index fe8f1a4682fe..000000000000 --- a/pkgs/development/tools/boost-build/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, bison -# boost derivation to use for the src and version. -# This is used by the boost derivation to build -# a b2 matching their version (by overriding this -# argument). Infinite recursion is not an issue -# since we only look at src and version of boost. -, useBoost ? {} -}: - -let - defaultVersion = "4.4.1"; -in - -stdenv.mkDerivation { - pname = "boost-build"; - version = - if useBoost ? version - then "boost-${useBoost.version}" - else defaultVersion; - - src = useBoost.src or (fetchFromGitHub { - owner = "boostorg"; - repo = "build"; - rev = defaultVersion; - sha256 = "1r4rwlq87ydmsdqrik4ly5iai796qalvw7603mridg2nwcbbnf54"; - }); - - # b2 is in a subdirectory of boost source tarballs - postUnpack = lib.optionalString (useBoost ? src) '' - sourceRoot="$sourceRoot/tools/build" - ''; - - patches = useBoost.boostBuildPatches or [] - ++ lib.optional (useBoost ? version && lib.versionAtLeast useBoost.version "1.81") ./fix-clang-target.patch; - - # Upstream defaults to gcc on darwin, but we use clang. - postPatch = '' - substituteInPlace src/build-system.jam \ - --replace "default-toolset = darwin" "default-toolset = clang-darwin" - '' + lib.optionalString (useBoost ? version && lib.versionAtLeast useBoost.version "1.82") '' - patchShebangs --build src/engine/build.sh - ''; - - nativeBuildInputs = [ - bison - ]; - - buildPhase = '' - runHook preBuild - ./bootstrap.sh - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - ./b2 ${lib.optionalString (stdenv.cc.isClang) "toolset=clang "}install --prefix="$out" - - # older versions of b2 created this symlink, - # which we want to support building via useBoost. - test -e "$out/bin/bjam" || ln -s b2 "$out/bin/bjam" - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://www.boost.org/build/"; - license = lib.licenses.boost; - platforms = platforms.unix; - maintainers = with maintainers; [ ivan-tkatchev ]; - }; -} diff --git a/pkgs/development/tools/boost-build/fix-clang-target.patch b/pkgs/development/tools/boost-build/fix-clang-target.patch deleted file mode 100644 index 0e64e02e2743..000000000000 --- a/pkgs/development/tools/boost-build/fix-clang-target.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/tools/clang.jam 2024-07-25 10:38:16.278401900 -0700 -+++ b/src/tools/clang.jam 2024-07-25 10:38:52.659750666 -0700 -@@ -90,11 +90,6 @@ - case x86-64 : arch = x86_64 ; - case x86-32 : arch = i386 ; - } -- -- toolset.flags $(toolset) -- OPTIONS $(condition)/<target-os>$(target-os)/<architecture>$(_architecture_)/<address-model>$(_address-model_) -- : "--target=$(arch)-$(vendor-sys)" -- : unchecked ; - } - } - } diff --git a/pkgs/development/tools/bpf-linker/Cargo.lock b/pkgs/development/tools/bpf-linker/Cargo.lock deleted file mode 100644 index d1edbeb55dcb..000000000000 --- a/pkgs/development/tools/bpf-linker/Cargo.lock +++ /dev/null @@ -1,1253 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "anstream" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -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 = "ar" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d67af77d68a931ecd5cbd8a3b5987d63a1d1d1278f7f6a60ae33db485cdebb69" - -[[package]] -name = "aya-rustc-llvm-proxy" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c81d599ae18f5a5fdf5e3e13e376c142a6e2c3d4d5ee960e50e61b034ada46b" -dependencies = [ - "anyhow", - "cargo_metadata", - "libc", - "libloading", - "llvm-sys", - "once_cell", - "prettyplease", - "quote", - "rustversion", - "syn", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" - -[[package]] -name = "bpf-linker" -version = "0.9.13" -dependencies = [ - "anyhow", - "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 = "camino" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cc" -version = "1.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "4.5.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "compiletest_rs" -version = "0.10.2" -source = "git+https://github.com/Manishearth/compiletest-rs.git#072c4ce3d211932d6a8a9417adcfe1dfeeb621a7" -dependencies = [ - "diff", - "filetime", - "getopts", - "lazy_static", - "libc", - "log", - "miow", - "regex", - "rustfix", - "serde", - "serde_derive", - "serde_json", - "tester", - "winapi", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "either" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[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 = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "fallible-iterator" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[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", - "windows-sys 0.52.0", -] - -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "getrandom" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" -dependencies = [ - "fallible-iterator", - "indexmap", - "stable_deref_trait", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" - -[[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 = "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 = "indexmap" -version = "2.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[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.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libloading" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" -dependencies = [ - "cfg-if", - "windows-targets 0.52.4", -] - -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.5.0", - "libc", - "redox_syscall", -] - -[[package]] -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 = "191.0.0-rc1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc981f56df5430a462d0f7676913fe9e8e4c8cc4df02e3157a6e3d808f7ae443" -dependencies = [ - "anyhow", - "cc", - "lazy_static", - "libc", - "regex-lite", - "semver", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[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 = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "miow" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "nu-ansi-term" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2800e1520bdc966782168a627aa5d1ad92e33b984bf7c7615d31280c83ff14" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[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" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "prettyplease" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" -dependencies = [ - "proc-macro2", - "syn", -] - -[[package]] -name = "proc-macro2" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" -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 0.4.6", - "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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "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.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2471f8f296262437d7e848e527b4210b44a96e53a3b4435b890227ce3e6da106" -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.32" -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", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[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 = "semver" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.114" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "strsim" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" - -[[package]] -name = "syn" -version = "2.0.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi", -] - -[[package]] -name = "tester" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e8bf7e0eb2dd7b4228cc1b6821fc5114cd6841ae59f652a85488c016091e5f" -dependencies = [ - "cfg-if", - "getopts", - "libc", - "num_cpus", - "term", -] - -[[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", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[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 = "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-appender" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" -dependencies = [ - "crossbeam-channel", - "thiserror", - "time", - "tracing-subscriber", -] - -[[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" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "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 0.46.0", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "tracing-tree" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f459ca79f1b0d5f71c54ddfde6debfc59c8b6eeb46808ae492077f739dc7b49c" -dependencies = [ - "nu-ansi-term 0.50.0", - "tracing-core", - "tracing-log", - "tracing-subscriber", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[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 = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "which" -version = "6.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d9c5ed668ee1f17edb3b627225343d210006a90bb1e3745ce1f30b1fb115075" -dependencies = [ - "either", - "home", - "regex", - "rustix", - "winsafe", -] - -[[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.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" -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" -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.4", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -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", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" - -[[package]] -name = "winsafe" -version = "0.0.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" diff --git a/pkgs/development/tools/bpf-linker/default.nix b/pkgs/development/tools/bpf-linker/default.nix deleted file mode 100644 index 8c044c58622c..000000000000 --- a/pkgs/development/tools/bpf-linker/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, llvmPackages_19 -, zlib -, ncurses -, libxml2 -}: - -rustPlatform.buildRustPackage rec { - pname = "bpf-linker"; - version = "0.9.13"; - - src = fetchFromGitHub { - owner = "aya-rs"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-CRYp1ktmmY4OS23+LNKOBQJUMkd+GXptBp5LPfbyZAc="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "compiletest_rs-0.10.2" = "sha256-JTfVfMW0bCbFjQxeAFu3Aex9QmGnx0wp6weGrNlQieA="; - }; - }; - - buildNoDefaultFeatures = true; - - nativeBuildInputs = [ llvmPackages_19.llvm ]; - buildInputs = [ zlib ncurses libxml2 ]; - - # fails with: couldn't find crate `core` with expected target triple bpfel-unknown-none - # rust-src and `-Z build-std=core` are required to properly run the tests - doCheck = false; - - meta = with lib; { - description = "Simple BPF static linker"; - mainProgram = "bpf-linker"; - homepage = "https://github.com/aya-rs/bpf-linker"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ nickcao ]; - # llvm-sys crate locates llvm by calling llvm-config - # which is not available when cross compiling - broken = stdenv.buildPlatform != stdenv.hostPlatform; - }; -} diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix deleted file mode 100644 index 95fa7c96c2bf..000000000000 --- a/pkgs/development/tools/buf/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, protobuf_26 -, git -, testers -, buf -, installShellFiles -}: - -buildGoModule rec { - pname = "buf"; - version = "1.42.0"; - - src = fetchFromGitHub { - owner = "bufbuild"; - repo = "buf"; - rev = "v${version}"; - hash = "sha256-T4cEl2aT6F/IamCd1FxomYxqGpbcbXzPtEu0AJUyJJU="; - }; - - vendorHash = "sha256-apF3FpVlwonm76d0Ue7TMPDIRW0BNkZXWMLgh1+mmvo="; - - patches = [ - # Skip a test that requires networking to be available to work. - ./skip_broken_tests.patch - ]; - - nativeBuildInputs = [ installShellFiles ]; - - ldflags = [ "-s" "-w" ]; - - nativeCheckInputs = [ - git # Required for TestGitCloner - protobuf_26 # Required for buftesting.GetProtocFilePaths - ]; - - checkFlags = [ - "-skip=TestWorkspaceGit" - ]; - - preCheck = '' - # The tests need access to some of the built utilities - export PATH="$PATH:$GOPATH/bin" - ''; - - # Allow tests that bind or connect to localhost on macOS. - __darwinAllowLocalNetworking = true; - - installPhase = '' - runHook preInstall - - # Binaries - # Only install required binaries, don't install testing binaries - for FILE in buf protoc-gen-buf-breaking protoc-gen-buf-lint; do - install -D -m 555 -t $out/bin $GOPATH/bin/$FILE - done - - # Completions - installShellCompletion --cmd buf \ - --bash <($GOPATH/bin/buf completion bash) \ - --fish <($GOPATH/bin/buf completion fish) \ - --zsh <($GOPATH/bin/buf completion zsh) - - # Man Pages - mkdir man && $GOPATH/bin/buf manpages man - installManPage man/* - - runHook postInstall - ''; - - passthru.tests.version = testers.testVersion { package = buf; }; - - meta = with lib; { - homepage = "https://buf.build"; - changelog = "https://github.com/bufbuild/buf/releases/tag/v${version}"; - description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices"; - license = licenses.asl20; - maintainers = with maintainers; [ jk lrewega aaronjheng ]; - mainProgram = "buf"; - }; -} diff --git a/pkgs/development/tools/buf/skip_broken_tests.patch b/pkgs/development/tools/buf/skip_broken_tests.patch deleted file mode 100644 index 8bde6a9f70bf..000000000000 --- a/pkgs/development/tools/buf/skip_broken_tests.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/private/buf/buftesting/buftesting.go b/private/buf/buftesting/buftesting.go -index 1c650077..5422f703 100644 ---- a/private/buf/buftesting/buftesting.go -+++ b/private/buf/buftesting/buftesting.go -@@ -106,6 +106,10 @@ func RunActualProtoc( - - // GetGoogleapisDirPath gets the path to a clone of googleapis. - func GetGoogleapisDirPath(t *testing.T, buftestingDirPath string) string { -+ // Requires network access, which is not available during -+ // the nixpkgs sandboxed build -+ t.Skip() -+ - googleapisDirPath := filepath.Join(buftestingDirPath, testGoogleapisDirPath) - require.NoError( - t, diff --git a/pkgs/development/tools/build-managers/alire/default.nix b/pkgs/development/tools/build-managers/alire/default.nix deleted file mode 100644 index cfa6e58ff3a0..000000000000 --- a/pkgs/development/tools/build-managers/alire/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, gprbuild -, gnat -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "alire"; - version = "2.0.1"; - - src = fetchFromGitHub { - owner = "alire-project"; - repo = "alire"; - rev = "v${finalAttrs.version}"; - hash = "sha256-fJXt3mM/v87hWumML6L3MH1O/uKkzmpE58B9nDRohzM="; - - fetchSubmodules = true; - }; - - nativeBuildInputs = [ gprbuild gnat ]; - - postPatch = '' - patchShebangs ./dev/build.sh - ''; - - buildPhase = '' - runHook preBuild - - export ALIRE_BUILD_JOBS="$NIX_BUILD_CORES" - ./dev/build.sh - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -r ./bin $out - - runHook postInstall - ''; - - meta = { - description = "Source-based package manager for the Ada and SPARK programming languages"; - homepage = "https://alire.ada.dev"; - changelog = "https://github.com/alire-project/alire/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ atalii ]; - platforms = lib.platforms.unix; - mainProgram = "alr"; - }; -}) diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix deleted file mode 100644 index 5e00d302ac4c..000000000000 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ fetchurl, lib, stdenv, coreutils, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "ant"; - version = "1.10.11"; - - nativeBuildInputs = [ makeWrapper ]; - - src = fetchurl { - url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; - sha256 = "19m8xb7h6xm4jykzb79kakbx1pa4awaglw6z31pbfg8m5pmwkipz"; - }; - - contrib = fetchurl { - url = "mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2"; - sha256 = "1l8say86bz9gxp4yy777z7nm4j6m905pg342li1aphc14p5grvwn"; - }; - - installPhase = - '' - mkdir -p $out/bin $out/lib/ant - mv * $out/lib/ant/ - - # Get rid of the manual (35 MiB). Maybe we should put this in a - # separate output. Keep the antRun script since it's vanilla sh - # and needed for the <exec/> task (but since we set ANT_HOME to - # a weird value, we have to move antRun to a weird location). - # Get rid of the other Ant scripts since we provide our own. - mv $out/lib/ant/bin/antRun $out/bin/ - rm -rf $out/lib/ant/{manual,bin,WHATSNEW} - mkdir $out/lib/ant/bin - mv $out/bin/antRun $out/lib/ant/bin/ - - # Install ant-contrib. - unpackFile $contrib - cp -p ant-contrib/ant-contrib-*.jar $out/lib/ant/lib/ - - cat >> $out/bin/ant <<EOF - #! ${stdenv.shell} -e - - ANT_HOME=$out/lib/ant - - # Find the JDK by looking for javac. As a fall-back, find the - # JRE by looking for java. The latter allows just the JRE to be - # used with (say) ECJ as the compiler. Finally, allow the GNU - # JVM. - if [ -z "\''${JAVA_HOME-}" ]; then - for i in javac java gij; do - if p="\$(type -p \$i)"; then - export JAVA_HOME="\$(${coreutils}/bin/dirname \$(${coreutils}/bin/dirname \$(${coreutils}/bin/readlink -f \$p)))" - break - fi - done - if [ -z "\''${JAVA_HOME-}" ]; then - echo "\$0: cannot find the JDK or JRE" >&2 - exit 1 - fi - fi - - if [ -z \$NIX_JVM ]; then - if [ -e \$JAVA_HOME/bin/java ]; then - NIX_JVM=\$JAVA_HOME/bin/java - elif [ -e \$JAVA_HOME/bin/gij ]; then - NIX_JVM=\$JAVA_HOME/bin/gij - else - NIX_JVM=java - fi - fi - - LOCALCLASSPATH="\$ANT_HOME/lib/ant-launcher.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH" - - exec \$NIX_JVM \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" \ - -Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \ - org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \ - -cp "\$CLASSPATH" "\$@" - EOF - - chmod +x $out/bin/ant - ''; # */ - - meta = { - homepage = "https://ant.apache.org/"; - description = "Java-based build tool"; - mainProgram = "ant"; - - longDescription = '' - Apache Ant is a Java-based build tool. In theory, it is kind of like - Make, but without Make's wrinkles. - - Why another build tool when there is already make, gnumake, nmake, jam, - and others? Because all those tools have limitations that Ant's - original author couldn't live with when developing software across - multiple platforms. Make-like tools are inherently shell-based -- they - evaluate a set of dependencies, then execute commands not unlike what - you would issue in a shell. This means that you can easily extend - these tools by using or writing any program for the OS that you are - working on. However, this also means that you limit yourself to the - OS, or at least the OS type such as Unix, that you are working on. - - Ant is different. Instead of a model where it is extended with - shell-based commands, Ant is extended using Java classes. Instead of - writing shell commands, the configuration files are XML-based, calling - out a target tree where various tasks get executed. Each task is run - by an object that implements a particular Task interface. - ''; - - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.asl20; - maintainers = [ ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/build-managers/arpa2cm/default.nix b/pkgs/development/tools/build-managers/arpa2cm/default.nix deleted file mode 100644 index 7951c7013474..000000000000 --- a/pkgs/development/tools/build-managers/arpa2cm/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, cmake }: - -stdenv.mkDerivation rec { - pname = "arpa2cm"; - version = "1.0.4"; - - src = fetchFromGitLab { - owner = "arpa2"; - repo = pname; - rev = "v${version}"; - hash = "sha256-2vb/7UL+uWGrQNh8yOZ3gih5G1/eOp064hF78SDsPGk="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "CMake Module library for the ARPA2 project"; - longDescription = '' - The CMake module library for the ARPA2 project, including the LillyDAP, - TLSPool and IdentityHub software stacks. Like the KDE Extra CMake Modules (ECM) - which is a large-ish collection of curated CMake modules of particular - interest to Qt-based and KDE Frameworks-based applications, the ARPA2 - CMake Modules (ARPA2CM) is a collection of modules for the software - stack from the ARPA2 project. This is largely oriented towards - TLS, SSL, X509, DER and LDAP technologies. The ARPA2 CMake Modules - also include modules used for product release and deployment of - the ARPA2 software stack. - ''; - homepage = "https://gitlab.com/arpa2/arpa2cm"; - license = licenses.bsd2; - maintainers = with maintainers; [ leenaars fufexan ]; - }; -} diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix deleted file mode 100644 index c435e2fa16ec..000000000000 --- a/pkgs/development/tools/build-managers/bam/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, lua5_3, python3 }: - -stdenv.mkDerivation rec { - pname = "bam"; - version = "0.5.1"; - - src = fetchFromGitHub { - owner = "matricks"; - repo = "bam"; - rev = "v${version}"; - sha256 = "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6"; - }; - - nativeBuildInputs = [ lua5_3 python3 ]; - - buildPhase = "${stdenv.shell} make_unix.sh"; - - checkPhase = "${python3.interpreter} scripts/test.py"; - - strictDeps = true; - - installPhase = '' - mkdir -p "$out/share/bam" - cp -r docs examples tests "$out/share/bam" - mkdir -p "$out/bin" - cp bam "$out/bin" - ''; - - meta = with lib; { - description = "Yet another build manager"; - mainProgram = "bam"; - maintainers = with maintainers; - [ - raskin - ]; - platforms = platforms.linux; - license = licenses.zlib; - downloadPage = "http://matricks.github.com/bam/"; - }; -} diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix deleted file mode 100644 index 182b66c8db08..000000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, lib -}: - -buildGoModule rec { - pname = "bazel-remote"; - version = "2.4.4"; - - src = fetchFromGitHub { - owner = "buchgr"; - repo = pname; - rev = "v${version}"; - hash = "sha256-ncYE48DtH+mIM9ZR7IB38SzQFordhMGLp79poqDKWLE="; - }; - - vendorHash = "sha256-7rxrnxZwxqRRQf1sWk8ILi2IV/pYmxBuwHl9khfCrKE="; - - subPackages = [ "." ]; - - doCheck = false; - - ldflags = [ "-s" "-w" "-X main.gitCommit=${version}" ]; - - meta = with lib; { - homepage = "https://github.com/buchgr/bazel-remote"; - description = "Remote HTTP/1.1 cache for Bazel"; - mainProgram = "bazel-remote"; - changelog = "https://github.com/buchgr/bazel-remote/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = lib.teams.bazel.members; - platforms = platforms.darwin ++ platforms.linux; - }; -} 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 c2210358344c..da81c1fb4e9b 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -522,7 +522,7 @@ stdenv.mkDerivation rec { which zip python3.pkgs.absl-py # Needed to build fish completion - ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ]; + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ]; # Bazel makes extensive use of symlinks in the WORKSPACE. # This causes problems with infinite symlinks if the build output is in the same location as the @@ -650,7 +650,7 @@ stdenv.mkDerivation rec { # stored non-contiguously in the binary due to gcc optimisations, which leads # Nix to miss the hash when scanning for dependencies echo "${bazelRC}" >> $out/nix-support/depends - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' echo "${cctools}" >> $out/nix-support/depends ''; 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 a49530ecfc69..b1069673f14a 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -583,7 +583,7 @@ stdenv.mkDerivation rec { which zip python3.pkgs.absl-py # Needed to build fish completion - ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx sigtool CoreFoundation CoreServices Foundation ]; + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ cctools libcxx sigtool CoreFoundation CoreServices Foundation ]; # Bazel makes extensive use of symlinks in the WORKSPACE. # This causes problems with infinite symlinks if the build output is in the same location as the @@ -622,7 +622,7 @@ stdenv.mkDerivation rec { '' + # disable execlog parser on darwin, since it fails to build # see https://github.com/NixOS/nixpkgs/pull/273774#issuecomment-1865322055 - lib.optionalString (!stdenv.isDarwin) '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # need to change directory for bazel to find the workspace cd ./bazel_src # build execlog tooling @@ -649,7 +649,7 @@ stdenv.mkDerivation rec { '' + # disable execlog parser on darwin, since it fails to build # see https://github.com/NixOS/nixpkgs/pull/273774#issuecomment-1865322055 - (lib.optionalString (!stdenv.isDarwin) '' + (lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir $out/share cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar cat <<EOF > $out/bin/bazel-execlog @@ -730,7 +730,7 @@ stdenv.mkDerivation rec { # stored non-contiguously in the binary due to gcc optimisations, which leads # Nix to miss the hash when scanning for dependencies echo "${bazelRC}" >> $out/nix-support/depends - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' echo "${cctools}" >> $out/nix-support/depends ''; 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 5722d26ea1ed..7f98f512c519 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 @@ -56,7 +56,7 @@ let cp ${./cpp-test-MODULE.bazel.lock} $out/MODULE.bazel.lock echo > $out/WORSPACE '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); @@ -71,10 +71,10 @@ let --verbose_failures \ --repository_cache=${mergedDistDir} \ --curses=no \ - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' --cxxopt=-x --cxxopt=c++ \ --host_cxxopt=-x --host_cxxopt=c++ \ - '' + lib.optionalString (stdenv.isDarwin && Foundation != null) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && Foundation != null) '' --linkopt=-Wl,-F${Foundation}/Library/Frameworks \ --linkopt=-L${darwin.libobjc}/lib \ '' + '' diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index 1a31de96ca4f..661eb1a71aa9 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -419,7 +419,7 @@ stdenv.mkDerivation rec { which zip python3.pkgs.absl-py # Needed to build fish completion - ] ++ lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ cctools libcxx Foundation @@ -561,7 +561,7 @@ stdenv.mkDerivation rec { # stored non-contiguously in the binary due to gcc optimisations, which leads # Nix to miss the hash when scanning for dependencies echo "${bazelRC}" >> $out/nix-support/depends - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' echo "${cctools}" >> $out/nix-support/depends ''; 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 51fea3e32dc3..752ddc444855 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 @@ -55,7 +55,7 @@ let cp ${./cpp-test-MODULE.bazel} $out/MODULE.bazel cp ${./cpp-test-MODULE.bazel.lock} $out/MODULE.bazel.lock '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); 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 ebe4f13346bc..309bae9b2387 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 @@ -122,7 +122,7 @@ let cp ${personProto} $out/person/person.proto cp ${personBUILD} $out/person/BUILD.bazel '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' echo 'tools bazel created' mkdir $out/tools install ${toolsBazel} $out/tools/bazel @@ -155,7 +155,7 @@ let --host_javabase='@local_jdk//:jdk' \ --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \ --javabase='@local_jdk//:jdk' \ - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \ '' + '' diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix index 0976d1c2d5a6..768804ecd555 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix @@ -104,7 +104,7 @@ let } ${# Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609 # about why to create a subdir for the workspace. - '' cp -r ${workspaceDir} wd && chmod ug+rw -R wd && cd wd '' + ''cp -r ${workspaceDir} wd && chmod ug+rw -R wd && cd wd'' } ${# run the actual test snippet bazelScript diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix deleted file mode 100644 index f3cb1a9313e1..000000000000 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "bazel-buildtools"; - version = "7.3.1"; - - src = fetchFromGitHub { - owner = "bazelbuild"; - repo = "buildtools"; - rev = "v${version}"; - hash = "sha256-AdwJDRw+AY3F+ZDaKqn5YzAVyAzvrV+d1WTk8OJtUdk="; - }; - - vendorHash = "sha256-sYZ7ogQY0dWOwJMvLljOjaKeYGYdLrF5AnetregdlYY="; - - preBuild = '' - rm -r warn/docs - ''; - - proxyVendor = true; - - doCheck = false; - - excludedPackages = [ "generatetables" ]; - - ldflags = [ "-s" "-w" "-X main.buildVersion=${version}" "-X main.buildScmRevision=${src.rev}" ]; - - meta = with lib; { - description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps"; - homepage = "https://github.com/bazelbuild/buildtools"; - changelog = "https://github.com/bazelbuild/buildtools/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; - [ elasticdog uri-canva ] - ++ lib.teams.bazel.members; - }; -} diff --git a/pkgs/development/tools/build-managers/bazel/cpp-test.nix b/pkgs/development/tools/build-managers/bazel/cpp-test.nix index 6759bf14de10..cc3bc8d9a141 100644 --- a/pkgs/development/tools/build-managers/bazel/cpp-test.nix +++ b/pkgs/development/tools/build-managers/bazel/cpp-test.nix @@ -36,7 +36,7 @@ let cp -r ${bazel-examples}/cpp-tutorial/stage3 $out find $out -type d -exec chmod 755 {} \; '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); @@ -51,10 +51,10 @@ let --distdir=${distDir} \ --curses=no \ ${extraBazelArgs} \ - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \ --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \ - '' + lib.optionalString (stdenv.isDarwin && Foundation != null) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && Foundation != null) '' --linkopt=-Wl,-F${Foundation}/Library/Frameworks \ --linkopt=-L${darwin.libobjc}/lib \ ''; diff --git a/pkgs/development/tools/build-managers/bazel/java-test.nix b/pkgs/development/tools/build-managers/bazel/java-test.nix index 3890d45d2b94..afdacaf6a844 100644 --- a/pkgs/development/tools/build-managers/bazel/java-test.nix +++ b/pkgs/development/tools/build-managers/bazel/java-test.nix @@ -35,7 +35,7 @@ let cp -r ${bazel-examples}/java-tutorial $out find $out -type d -exec chmod 755 {} \; '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); diff --git a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix index 0466404ced96..5880c5dd95fe 100644 --- a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix +++ b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix @@ -154,7 +154,7 @@ let cp ${personProto} $out/person/person.proto cp ${personBUILD} $out/person/BUILD.bazel '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); @@ -178,7 +178,7 @@ let --host_javabase='@local_jdk//:jdk' \ --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \ --javabase='@local_jdk//:jdk' \ - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \ --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \ ''; 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 e0e59fb8891d..59f5d0c01fcc 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 @@ -65,7 +65,7 @@ let cp ${pythonBin} $out/python/bin.py cp ${pythonBUILD} $out/python/BUILD.bazel '' - + (lib.optionalString stdenv.isDarwin '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix deleted file mode 100644 index 13f16c9171b6..000000000000 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, ninja -, pkg-config -, grpc -, protobuf -, openssl -, nlohmann_json -, gtest -, spdlog -, c-ares -, zlib -, sqlite -, re2 -, lit -, python3 -, coreutils -}: - -stdenv.mkDerivation rec { - pname = "bear"; - version = "3.1.3"; - - src = fetchFromGitHub { - owner = "rizsotto"; - repo = pname; - rev = version; - hash = "sha256-1nZPzgLWcmaRkOUXdm16IW2Nw/p1w8GBGEfZX/v+En0="; - }; - - nativeBuildInputs = [ - cmake - ninja - pkg-config - - # Used for functional tests, which run during buildPhase. - lit - python3 - ]; - - buildInputs = [ - grpc - protobuf - openssl - nlohmann_json - gtest - spdlog - c-ares - zlib - sqlite - re2 - ]; - - cmakeFlags = [ - # Build system and generated files concatenate install prefix and - # CMAKE_INSTALL_{BIN,LIB}DIR, which breaks if these are absolute paths. - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - (lib.cmakeBool "ENABLE_UNIT_TESTS" false) - (lib.cmakeBool "ENABLE_FUNC_TESTS" false) - ]; - - patches = [ - # Fix toolchain environment variable handling and the Darwin SIP check. - ./fix-functional-tests.patch - ]; - - postPatch = '' - patchShebangs test/bin - - # /usr/bin/env is used in test commands and embedded scripts. - find test -name '*.sh' \ - -exec sed -ie 's|/usr/bin/env|${coreutils}/bin/env|g' {} + - ''; - - # Functional tests use loopback networking. - __darwinAllowLocalNetworking = true; - - meta = with lib; { - description = "Tool that generates a compilation database for clang tooling"; - mainProgram = "bear"; - longDescription = '' - Note: the bear command is very useful to generate compilation commands - e.g. for YouCompleteMe. You just enter your development nix-shell - and run `bear make`. It's not perfect, but it gets a long way. - ''; - homepage = "https://github.com/rizsotto/Bear"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ DieracDelta ]; - }; -} diff --git a/pkgs/development/tools/build-managers/bear/fix-functional-tests.patch b/pkgs/development/tools/build-managers/bear/fix-functional-tests.patch deleted file mode 100644 index 99d64f26d077..000000000000 --- a/pkgs/development/tools/build-managers/bear/fix-functional-tests.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/test/lit.cfg b/test/lit.cfg -index 118c979..b69fecc 100644 ---- a/test/lit.cfg -+++ b/test/lit.cfg -@@ -207,13 +207,8 @@ def is_preload_disabled(): - if is_windows: - return True - elif sys.platform == 'darwin': -- command = ['csrutil', 'status'] -- pattern = re.compile(r'System Integrity Protection status:\s+enabled') -- try: -- output = subprocess.check_output(command, stderr=subprocess.STDOUT) -- return any(pattern.match(line) for line in output.decode('utf-8').splitlines()) -- except (OSError, subprocess.CalledProcessError): -- return False -+ # csrutil(8) isn't available in the Nix build sandbox. -+ return True - else: - return False - -@@ -221,6 +216,11 @@ def is_preload_disabled(): - if not is_preload_disabled(): - config.available_features.add('preload') - -+# Preserve the variables required for the Nix toolchain wrappers. -+for var, value in os.environ.items(): -+ if var.startswith('NIX_'): -+ config.environment[var] = value -+ - print(config.substitutions) - print(config.environment) - print(config.available_features) diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix deleted file mode 100644 index 5a97ad797f91..000000000000 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv -, fetchurl -, autoPatchelfHook -, installShellFiles -, makeWrapper -, jre -, lib -, zlib -}: - -stdenv.mkDerivation rec { - pname = "bloop"; - version = "2.0.0"; - - platform = - if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux" - else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin" - else throw "unsupported platform"; - - bloop-bash = fetchurl { - url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bash-completions"; - sha256 = "sha256-2mt+zUEJvQ/5ixxFLZ3Z0m7uDSj/YE9sg/uNMjamvdE="; - }; - - bloop-fish = fetchurl { - url = "https://github.com/scalacenter/bloop/releases/download/v${version}/fish-completions"; - sha256 = "sha256-eFESR6iPHRDViGv+Fk3sCvPgVAhk2L1gCG4LnfXO/v4="; - }; - - bloop-zsh = fetchurl { - url = "https://github.com/scalacenter/bloop/releases/download/v${version}/zsh-completions"; - sha256 = "sha256-WNMsPwBfd5EjeRbRtc06lCEVI2FVoLfrqL82OR0G7/c="; - }; - - 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-SnDXAkNu//Dn24FaQcACEBEJODlrhvpQ8uNbge99nGA=" - else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-MfenrNbL1UBC4t/0w9MTDI+kz2HKv7xJcmA57qBbMFw=" - else throw "unsupported platform"; - }; - - dontUnpack = true; - nativeBuildInputs = [ installShellFiles makeWrapper ] - ++ lib.optional stdenv.isLinux autoPatchelfHook; - buildInputs = [ stdenv.cc.cc.lib zlib ]; - propagatedBuildInputs = [ jre ]; - - installPhase = '' - runHook preInstall - - install -D -m 0755 ${bloop-binary} $out/.bloop-wrapped - - makeWrapper $out/.bloop-wrapped $out/bin/bloop - - #Install completions - installShellCompletion --name bloop --bash ${bloop-bash} - installShellCompletion --name _bloop --zsh ${bloop-zsh} - installShellCompletion --name bloop.fish --fish ${bloop-fish} - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://scalacenter.github.io/bloop/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.asl20; - description = "Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way"; - mainProgram = "bloop"; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ kubukoz tomahna ]; - }; -} diff --git a/pkgs/development/tools/build-managers/bob/default.nix b/pkgs/development/tools/build-managers/bob/default.nix deleted file mode 100644 index ba93433b6862..000000000000 --- a/pkgs/development/tools/build-managers/bob/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub -, installShellFiles -, fetchpatch -}: - -buildGoModule rec { - pname = "bob"; - version = "0.8.2"; - - src = fetchFromGitHub { - owner = "benchkram"; - repo = pname; - rev = version; - hash = "sha256-zmWfOLBb+GWw9v6LdCC7/WaP1Wz7UipPwqkmI1+rG8Q="; - }; - - patches = [ - # Fix vulnerable dependencies - # Backport of https://github.com/benchkram/bob/pull/387 - (fetchpatch { - url = "https://github.com/benchkram/bob/commit/5020e6fafbfbcb1b3add5d936886423ce882793d.patch"; - hash = "sha256-if1ZErI0Un7d26eOkYSkEa87+VTRcEtF6JbsJYOHpHE="; - }) - ]; - - ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; - - vendorHash = "sha256-u0nFaTQWU9O7A/RAhGaLcBka+YNGjSlpycDF8TLQALw="; - - excludedPackages = [ "example/server-db" "test/e2e" "tui-example" ]; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd bob \ - --bash <($out/bin/bob completion) \ - --zsh <($out/bin/bob completion -z) - ''; - - # tests require network access - doCheck = false; - - meta = with lib; { - description = "Build system for microservices"; - mainProgram = "bob"; - homepage = "https://bob.build"; - license = licenses.asl20; - maintainers = with maintainers; [ zuzuleinen ]; - }; -} diff --git a/pkgs/development/tools/build-managers/boot/builder.sh b/pkgs/development/tools/build-managers/boot/builder.sh deleted file mode 100644 index 4506e3f0f861..000000000000 --- a/pkgs/development/tools/build-managers/boot/builder.sh +++ /dev/null @@ -1,14 +0,0 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - -boot_bin=$out/bin/boot - -mkdir -pv $(dirname $boot_bin) -cp -v $src $boot_bin -chmod -v 755 $boot_bin - -patchShebangs $boot_bin - -sed -i \ - -e "s;\${BOOT_JAVA_COMMAND:-java};\${BOOT_JAVA_COMMAND:-${jdk}/bin/java};g" \ - $boot_bin diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix deleted file mode 100644 index dd296aa83188..000000000000 --- a/pkgs/development/tools/build-managers/boot/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, jdk }: - -stdenv.mkDerivation rec { - version = "2.7.2"; - pname = "boot"; - - src = fetchurl { - url = "https://github.com/boot-clj/boot-bin/releases/download/${version}/boot.sh"; - sha256 = "1hqp3xxmsj5vkym0l3blhlaq9g3w0lhjgmp37g6y3rr741znkk8c"; - }; - - inherit jdk; - - builder = ./builder.sh; - - propagatedBuildInputs = [ jdk ]; - - meta = with lib; { - description = "Build tooling for Clojure"; - mainProgram = "boot"; - homepage = "https://boot-clj.github.io/"; - license = licenses.epl10; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ ragge ]; - }; -} diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index f494e4053525..06246f6b081a 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.all; # https://github.com/facebook/buck/issues/2666 - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/tools/build-managers/buck2/default.nix b/pkgs/development/tools/build-managers/buck2/default.nix index c1e504a2da5d..b40748d76278 100644 --- a/pkgs/development/tools/build-managers/buck2/default.nix +++ b/pkgs/development/tools/build-managers/buck2/default.nix @@ -1,5 +1,11 @@ -{ fetchurl, lib, stdenv, zstd -, testers, buck2 # for passthru.tests +{ + fetchurl, + lib, + stdenv, + zstd, + installShellFiles, + testers, + buck2, # for passthru.tests }: # NOTE (aseipp): buck2 uses a precompiled binary build for good reason — the @@ -38,7 +44,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # our version of buck2; this should be a git tag - version = "2024-05-15"; + version = "2024-10-15"; # the platform-specific, statically linked binary — which is also # zstd-compressed @@ -63,7 +69,7 @@ let # tooling prelude-src = let - prelude-hash = "4e9e6d50b8b461564a7e351ff60b87fe59d7e53b"; + prelude-hash = "615f852ad43a901d8a09b2cbbb3aefff61626c52"; name = "buck2-prelude-${version}.tar.gz"; hash = buildHashes."_prelude"; url = "https://github.com/facebook/buck2-prelude/archive/${prelude-hash}.tar.gz"; @@ -74,7 +80,10 @@ in stdenv.mkDerivation { version = "unstable-${version}"; # TODO (aseipp): kill 'unstable' once a non-prerelease is made inherit src; - nativeBuildInputs = [ zstd ]; + nativeBuildInputs = [ + installShellFiles + zstd + ]; doCheck = true; dontConfigure = true; @@ -87,6 +96,12 @@ in stdenv.mkDerivation { mkdir -p $out/bin install -D buck2 $out/bin/buck2 ''; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd buck2 \ + --bash <( $out/bin/buck2 completion bash ) \ + --fish <( $out/bin/buck2 completion fish ) \ + --zsh <( $out/bin/buck2 completion zsh ) + ''; passthru = { prelude = prelude-src; diff --git a/pkgs/development/tools/build-managers/buck2/hashes.json b/pkgs/development/tools/build-managers/buck2/hashes.json index 0aa1592ceb1f..a48ac27b94ee 100644 --- a/pkgs/development/tools/build-managers/buck2/hashes.json +++ b/pkgs/development/tools/build-managers/buck2/hashes.json @@ -1,7 +1,7 @@ { "_comment": "@generated by pkgs/development/tools/build-managers/buck2/update.sh" -, "_prelude": "sha256-r2opeCtXAFxF3PbqKDKK0+pcySe70hUEtMiX7QlWZCQ=" -, "x86_64-linux": "sha256-Ln2FkZDQRKlTLU+EvcEE0VNW0BdnaZRd9nNeY8YgGVA=" -, "x86_64-darwin": "sha256-qSO+eERWWBH7KKBft/cze3sV04QZl3itpFNud6AFrFM=" -, "aarch64-linux": "sha256-KNYsZv5io4NYa/45rxzx+5ta6L7LrxV/GnqNWT4Y5/k=" -, "aarch64-darwin": "sha256-YUMrU5WsRu9ZAMzUS3xS/FFuiXtfbByMtT49CRGQ8do=" +, "_prelude": "sha256-R2aC8tcg21UBEHdQzL4xOnOQc6p48ObvGswGqfmY2WM=" +, "x86_64-linux": "sha256-vyBsK0dj/SYsB36ks8v+ysLC7Pq+Bg1bY3V9Vk+onnE=" +, "x86_64-darwin": "sha256-7QKrAtAiCC8uimA7ttWlTK+JaaHt0p+lYfxGKahQ+Bs=" +, "aarch64-linux": "sha256-Jh+S0eeCZ8DKIZGQWVetQiMshyKgTMPZm9W7U2cpkMk=" +, "aarch64-darwin": "sha256-xEc0DUSjOOthSLCFTq2qZVt4TQL3EpMdl3iaPY6WFgU=" } diff --git a/pkgs/development/tools/build-managers/build2/bpkg.nix b/pkgs/development/tools/build-managers/build2/bpkg.nix index e4d212858690..bf9951e7ae17 100644 --- a/pkgs/development/tools/build-managers/build2/bpkg.nix +++ b/pkgs/development/tools/build-managers/build2/bpkg.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { openssl ]; - doCheck = !stdenv.isDarwin; # tests hang + doCheck = !stdenv.hostPlatform.isDarwin; # tests hang # Failing test postPatch = '' @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "config.bin.lib=${build2.configSharedStatic enableShared enableStatic}" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath '${lib.getLib build2}/lib' "''${!outputBin}/bin/bpkg" ''; diff --git a/pkgs/development/tools/build-managers/build2/default.nix b/pkgs/development/tools/build-managers/build2/default.nix index c420bd8c7320..c02334c98a51 100644 --- a/pkgs/development/tools/build-managers/build2/default.nix +++ b/pkgs/development/tools/build-managers/build2/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { "config.build2.libpkgconf=true" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath "''${!outputLib}/lib" "''${!outputBin}/bin/b" ''; diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix deleted file mode 100644 index 251268a449d4..000000000000 --- a/pkgs/development/tools/build-managers/colormake/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, perl }: - -stdenv.mkDerivation { - pname = "colormake"; - version = "2.1.0"; - - buildInputs = [ perl ]; - - src = fetchFromGitHub { - owner = "pagekite"; - repo = "Colormake"; - rev = "66544f40d"; - sha256 = "8e714c5540305d169989d9387dbac47b8b9fb2cfb424af7bcd412bfe684dc6d7"; - }; - - installPhase = '' - mkdir -p $out/bin - cp -fa colormake.pl colormake colormake-short clmake clmake-short $out/bin - ''; - - meta = with lib; { - description = "Simple wrapper around make to colorize the output"; - homepage = "https://bre.klaki.net/programs/colormake/"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ bhipple ]; - }; -} diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix deleted file mode 100644 index 5e7a0e866cff..000000000000 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ /dev/null @@ -1,120 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, git -, pkg-config -, xcbuild -, python3 -, zlib -}: - -python3.pkgs.buildPythonApplication rec { - pname = "conan"; - version = "2.5.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "conan-io"; - repo = "conan"; - rev = "refs/tags/${version}"; - hash = "sha256-4GCLmPEoCX1Cw+H6Bo1KA4+9GX35HgONAmMF/WNX6ag="; - }; - - nativeBuildInputs = with python3.pkgs; [ - ]; - - propagatedBuildInputs = with python3.pkgs; [ - bottle - colorama - python-dateutil - distro - fasteners - jinja2 - patch-ng - pluginbase - pygments - pyjwt - pylint # Not in `requirements.txt` but used in hooks, see https://github.com/conan-io/conan/pull/6152 - pyyaml - requests - tqdm - urllib3 - ] ++ lib.optionals stdenv.isDarwin [ - idna - cryptography - pyopenssl - ]; - - nativeCheckInputs = [ - git - pkg-config - zlib - ] ++ lib.optionals (stdenv.isDarwin) [ - xcbuild.xcrun - ] ++ (with python3.pkgs; [ - mock - parameterized - pytest-xdist - pytestCheckHook - webtest - ]); - - __darwinAllowLocalNetworking = true; - - pythonImportsCheck = [ - "conan" - ]; - - pytestFlagsArray = [ - "-n" - "$NIX_BUILD_CORES" - ]; - - disabledTests = [ - # Tests require network access - "TestFTP" - ] ++ lib.optionals stdenv.isDarwin [ - # Rejects paths containing nix - "test_conditional_os" - # Requires Apple Clang - "test_detect_default_compilers" - "test_detect_default_in_mac_os_using_gcc_as_default" - # Incompatible with darwin.xattr and xcbuild from nixpkgs - "test_dot_files" - "test_xcrun" - "test_xcrun_in_required_by_tool_requires" - "test_xcrun_in_tool_requires" - ]; - - disabledTestPaths = [ - # Requires cmake, meson, autotools, apt-get, etc. - "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; { - description = "Decentralized and portable C/C++ package manager"; - mainProgram = "conan"; - homepage = "https://conan.io"; - changelog = "https://github.com/conan-io/conan/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ HaoZeke ]; - }; -} diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/development/tools/build-managers/corrosion/default.nix deleted file mode 100644 index 6809ee7ffd7a..000000000000 --- a/pkgs/development/tools/build-managers/corrosion/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cargo -, cmake -, rustc -, libiconv -}: - -stdenv.mkDerivation rec { - pname = "corrosion"; - version = "0.5"; - - src = fetchFromGitHub { - owner = "corrosion-rs"; - repo = "corrosion"; - rev = "v${version}"; - hash = "sha256-vaNXXXaGqYNmhonU+ANN857LAUgwv+PMcON+nBuUoeo="; - }; - - buildInputs = lib.optional stdenv.isDarwin libiconv; - - nativeBuildInputs = [ - cmake - cargo - rustc - ]; - - doCheck = true; - - checkPhase = let - excludedTests = [ - "cbindgen_rust2cpp_build" - "cbindgen_rust2cpp_run_cpp-exe" - "hostbuild_build" - "hostbuild_run_rust-host-program" - "parse_target_triple_build" - "rustup_proxy_build" - ]; - excludedTestsRegex = lib.concatStringsSep "|" excludedTests; - in '' - runHook preCheck - - ctest -E "${excludedTestsRegex}" - - runHook postCheck - ''; - - meta = with lib; { - description = "Tool for integrating Rust into an existing CMake project"; - homepage = "https://github.com/corrosion-rs/corrosion"; - changelog = "https://github.com/corrosion-rs/corrosion/blob/${src.rev}/RELEASES.md"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/tools/build-managers/ekam/default.nix b/pkgs/development/tools/build-managers/ekam/default.nix deleted file mode 100644 index 09e43f7ef8a6..000000000000 --- a/pkgs/development/tools/build-managers/ekam/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, capnproto }: - -stdenv.mkDerivation { - pname = "ekam"; - version = "unstable-2021-09-18"; - - src = fetchFromGitHub { - owner = "capnproto"; - repo = "ekam"; - rev = "77c338f8bd8f4a2ce1e6199b2a52363f1fccf388"; - sha256 = "0q4bizlb1ykzdp4ca0kld6xm5ml9q866xrj3ijffcnyiyqr51qr8"; - }; - - # The capnproto *source* is required to build ekam. - # https://github.com/capnproto/ekam/issues/5 - # - # Specifically, the git version of the source is required, as - # capnproto release tarballs do not include ekam rule files. - postUnpack = '' - mkdir -p $sourceRoot/deps - cp -r ${capnproto.src} $sourceRoot/deps/capnproto - ''; - - postPatch = '' - # A single capnproto test file expects to be able to write to - # /var/tmp. We change it to use /tmp because /var is not available - # under nix-build. - substituteInPlace deps/capnproto/c++/src/kj/filesystem-disk-test.c++ \ - --replace "/var/tmp" "/tmp" - ''; - - # NIX_ENFORCE_PURITY prevents ld from linking against anything outside - # of the nix store -- but ekam builds capnp locally and links against it, - # so that causes the build to fail. So, we turn this off. - # - # See: https://wiki.nixos.org/wiki/Development_environment_with_nix-shell#Troubleshooting - preBuild = '' - unset NIX_ENFORCE_PURITY - ''; - - makeFlags = [ - "PARALLEL=$(NIX_BUILD_CORES)" - ]; - - installPhase = '' - mkdir $out - cp -r bin $out - - # Remove capnproto tools; there's a separate nix package for that. - rm $out/bin/capnp* - # Don't distribute ekam-bootstrap, which is not needed outside this build. - rm $out/bin/ekam-bootstrap - ''; - - meta = with lib; { - description = ''Build system ("make" in reverse)''; - longDescription = '' - Ekam ("make" spelled backwards) is a build system which automatically - figures out what to build and how to build it purely based on the - source code. No separate "makefile" is needed. - ''; - homepage = "https://github.com/capnproto/ekam"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = [ maintainers.garrison ]; - }; -} diff --git a/pkgs/development/tools/build-managers/fac/default.nix b/pkgs/development/tools/build-managers/fac/default.nix index b44cefe6a953..63d53e123aad 100644 --- a/pkgs/development/tools/build-managers/fac/default.nix +++ b/pkgs/development/tools/build-managers/fac/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { }; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; cargoHash = "sha256-XT4FQVE+buORuZAFZK5Qnf/Fl3QSvw4SHUuCzWhxUdk="; # fac includes a unit test called ls_files_works which assumes it's @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = '' A build system that uses ptrace to handle dependencies automatically ''; diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix deleted file mode 100644 index 508a821d7495..000000000000 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix args { - # Note: Please use the recommended version for Chromium, e.g.: - # https://git.archlinux.org/svntogit/packages.git/tree/trunk/chromium-gn-version.sh?h=packages/gn - rev = "fd3d768bcfd44a8d9639fe278581bd9851d0ce3a"; - revNum = "1718"; # git describe HEAD --match initial-commit | cut -d- -f3 - version = "2020-03-09"; - sha256 = "1asc14y8by7qcn10vbk467hvx93s30pif8r0brissl0sihsaqazr"; -} diff --git a/pkgs/development/tools/build-managers/gn/generic.nix b/pkgs/development/tools/build-managers/gn/generic.nix deleted file mode 100644 index fe74486ccfaa..000000000000 --- a/pkgs/development/tools/build-managers/gn/generic.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv, lib, fetchgit, cctools, darwin, writeText -, ninja, python3 -, ... -}: - -{ rev, revNum, version, sha256 }: - -let - revShort = builtins.substring 0 7 rev; - lastCommitPosition = writeText "last_commit_position.h" '' - #ifndef OUT_LAST_COMMIT_POSITION_H_ - #define OUT_LAST_COMMIT_POSITION_H_ - - #define LAST_COMMIT_POSITION_NUM ${revNum} - #define LAST_COMMIT_POSITION "${revNum} (${revShort})" - - #endif // OUT_LAST_COMMIT_POSITION_H_ - ''; - -in stdenv.mkDerivation { - pname = "gn-unstable"; - inherit version; - - src = fetchgit { - # Note: The TAR-Archives (+archive/${rev}.tar.gz) are not deterministic! - url = "https://gn.googlesource.com/gn"; - inherit rev sha256; - }; - - nativeBuildInputs = [ ninja python3 ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ - libobjc - cctools - - # frameworks - ApplicationServices - Foundation - AppKit - ]); - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - buildPhase = '' - python build/gen.py --no-last-commit-position - ln -s ${lastCommitPosition} out/last_commit_position.h - ninja -j $NIX_BUILD_CORES -C out gn - ''; - - installPhase = '' - install -vD out/gn "$out/bin/gn" - ''; - - setupHook = ./setup-hook.sh; - - meta = with lib; { - description = "Meta-build system that generates build files for Ninja"; - mainProgram = "gn"; - homepage = "https://gn.googlesource.com/gn"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ stesie matthewbauer primeos ]; - }; -} diff --git a/pkgs/development/tools/build-managers/gn/rev1924.nix b/pkgs/development/tools/build-managers/gn/rev1924.nix deleted file mode 100644 index 1b17328f2e09..000000000000 --- a/pkgs/development/tools/build-managers/gn/rev1924.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix args { - rev = "24e2f7df92641de0351a96096fb2c490b2436bb8"; - revNum = "1924"; # git describe HEAD --match initial-commit | cut -d- -f3 - version = "2021-08-08"; - sha256 = "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl"; -} diff --git a/pkgs/development/tools/build-managers/gn/setup-hook.sh b/pkgs/development/tools/build-managers/gn/setup-hook.sh deleted file mode 100644 index f459e979aa0f..000000000000 --- a/pkgs/development/tools/build-managers/gn/setup-hook.sh +++ /dev/null @@ -1,20 +0,0 @@ -# shellcheck shell=bash - -gnConfigurePhase() { - runHook preConfigure - - local flagsArray=() - concatTo flagsArray gnFlags gnFlagsArray - - echoCmd 'gn flags' "${flagsArray[@]}" - - gn gen out/Release --args="${flagsArray[*]}" - # shellcheck disable=SC2164 - cd out/Release/ - - runHook postConfigure -} - -if [ -z "${dontUseGnConfigure-}" ] && [ -z "${configurePhase-}" ]; then - configurePhase=gnConfigurePhase -fi diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix deleted file mode 100644 index ac22eee7e206..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }: - -assert guileSupport -> ( pkg-config != null && guile != null ); - -stdenv.mkDerivation rec { - pname = "gnumake"; - version = "4.2.1"; - - src = fetchurl { - url = "mirror://gnu/make/make-${version}.tar.bz2"; - sha256 = "12f5zzyq2w56g95nni65hc0g5p7154033y2f3qmjvd016szn5qnn"; - }; - - patchFlags = [ "-p0" ]; - patches = [ - # Purity: don't look for library dependencies (of the form `-lfoo') in /lib - # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for - # included Makefiles, don't look in /usr/include and friends. - ./impure-dirs.patch - ./pselect.patch - # Fix support for glibc 2.27's glob, inspired by http://www.linuxfromscratch.org/lfs/view/8.2/chapter05/make.html - ./glibc-2.27-glob.patch - ./glibc-2.33-glob.patch - ]; - - nativeBuildInputs = lib.optionals guileSupport [ pkg-config ]; - buildInputs = lib.optionals guileSupport [ guile ]; - - configureFlags = lib.optional guileSupport "--with-guile" - - # Make uses this test to decide whether it should keep track of - # subseconds. Apple made this possible with APFS and macOS 10.13. - # However, we still support macOS 10.11 and 10.12. Binaries built - # in Nixpkgs will be unable to use futimens to set mtime less than - # a second. So, tell Make to ignore nanoseconds in mtime here by - # overriding the autoconf test for the struct. - # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion. - ++ lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; - - outputs = [ "out" "man" "info" ]; - - meta = with lib; { - description = "Tool to control the generation of non-source files from sources"; - longDescription = '' - Make is a tool which controls the generation of executables and - other non-source files of a program from the program's source files. - - Make gets its knowledge of how to build your program from a file - called the makefile, which lists each of the non-source files and - how to compute it from other files. When you write a program, you - should write a makefile for it, so that it is possible to use Make - to build and install the program. - ''; - homepage = "https://www.gnu.org/software/make/"; - - license = licenses.gpl3Plus; - maintainers = [ ]; - mainProgram = "make"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch b/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch deleted file mode 100644 index 186212d0d298..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur glob/glob.c glob/glob.c ---- glob/glob.c 2013-10-20 13:14:38.000000000 -0400 -+++ glob/glob.c 2018-03-16 14:32:38.483496170 -0400 -@@ -208,28 +208,9 @@ - #endif /* __GNU_LIBRARY__ || __DJGPP__ */ - - --#if !defined __alloca && !defined __GNU_LIBRARY__ -- --# ifdef __GNUC__ --# undef alloca --# define alloca(n) __builtin_alloca (n) --# else /* Not GCC. */ --# ifdef HAVE_ALLOCA_H - # include <alloca.h> --# else /* Not HAVE_ALLOCA_H. */ --# ifndef _AIX --# ifdef WINDOWS32 --# include <malloc.h> --# else --extern char *alloca (); --# endif /* WINDOWS32 */ --# endif /* Not _AIX. */ --# endif /* sparc or HAVE_ALLOCA_H. */ --# endif /* GCC. */ -- - # define __alloca alloca - --#endif - - #ifndef __GNU_LIBRARY__ - # define __stat stat diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch b/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch deleted file mode 100644 index d3e424d1c499..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git glob/glob.c glob/glob.c -index 924f2b3..d4ef0c5 100644 ---- glob/glob.c -+++ glob/glob.c -@@ -212,8 +212,8 @@ my_realloc (p, n) - # define __alloca alloca - - --#ifndef __GNU_LIBRARY__ - # define __stat stat -+#ifndef __GNU_LIBRARY__ - # ifdef STAT_MACROS_BROKEN - # undef S_ISDIR - # endif --- -2.31.1 - diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch deleted file mode 100644 index f6646f1d0126..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -rc read.c read.c -*** read.c 2006-03-17 15:24:20.000000000 +0100 ---- read.c 2007-05-24 17:16:31.000000000 +0200 -*************** -*** 99,107 **** ---- 99,109 ---- - #endif - INCLUDEDIR, - #ifndef _AMIGA -+ #if 0 - "/usr/gnu/include", - "/usr/local/include", - "/usr/include", -+ #endif - #endif - 0 - }; -diff -rc reremake.c -*** remake.c 2006-03-20 03:36:37.000000000 +0100 ---- remake.c 2007-05-24 17:06:54.000000000 +0200 -*************** -*** 1452,1460 **** ---- 1452,1462 ---- - static char *dirs[] = - { - #ifndef _AMIGA -+ #if 0 - "/lib", - "/usr/lib", - #endif -+ #endif - #if defined(WINDOWS32) && !defined(LIBDIR) - /* - * This is completely up to the user at product install time. Just define diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch b/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch deleted file mode 100644 index 5a03acb2f7ca..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch +++ /dev/null @@ -1,170 +0,0 @@ -From b552b05251980f693c729e251f93f5225b400714 Mon Sep 17 00:00:00 2001 -From: Paul Smith <psmith@gnu.org> -Date: Sat, 3 Jun 2017 16:20:51 -0400 -Subject: [SV 51159] Use a non-blocking read with pselect to avoid hangs. - -* posixos.c (set_blocking): Set blocking on a file descriptor. -(jobserver_setup): Set non-blocking on the jobserver read side. -(jobserver_parse_auth): Ditto. -(jobserver_acquire_all): Set blocking to avoid a busy-wait loop. -(jobserver_acquire): If the non-blocking read() returns without -taking a token then try again. ---- - posixos.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++----------------- - 1 file changed, 71 insertions(+), 26 deletions(-) - -diff --git posixos.c posixos.c -index e642d7f..dbafa51 100644 ---- posixos.c -+++ posixos.c -@@ -62,6 +62,24 @@ make_job_rfd (void) - #endif - } - -+static void -+set_blocking (int fd, int blocking) -+{ -+ // If we're not using pselect() don't change the blocking -+#ifdef HAVE_PSELECT -+ int flags; -+ EINTRLOOP (flags, fcntl (fd, F_GETFL)); -+ if (flags >= 0) -+ { -+ int r; -+ flags = blocking ? (flags & ~O_NONBLOCK) : (flags | O_NONBLOCK); -+ EINTRLOOP (r, fcntl (fd, F_SETFL, flags)); -+ if (r < 0) -+ pfatal_with_name ("fcntl(O_NONBLOCK)"); -+ } -+#endif -+} -+ - unsigned int - jobserver_setup (int slots) - { -@@ -86,6 +104,9 @@ jobserver_setup (int slots) - pfatal_with_name (_("init jobserver pipe")); - } - -+ /* When using pselect() we want the read to be non-blocking. */ -+ set_blocking (job_fds[0], 0); -+ - return 1; - } - -@@ -121,6 +142,9 @@ jobserver_parse_auth (const char *auth) - return 0; - } - -+ /* When using pselect() we want the read to be non-blocking. */ -+ set_blocking (job_fds[0], 0); -+ - return 1; - } - -@@ -169,7 +193,10 @@ jobserver_acquire_all (void) - { - unsigned int tokens = 0; - -- /* Close the write side, so the read() won't hang. */ -+ /* Use blocking reads to wait for all outstanding jobs. */ -+ set_blocking (job_fds[0], 1); -+ -+ /* Close the write side, so the read() won't hang forever. */ - close (job_fds[1]); - job_fds[1] = -1; - -@@ -236,18 +263,12 @@ jobserver_pre_acquire (void) - unsigned int - jobserver_acquire (int timeout) - { -- sigset_t empty; -- fd_set readfds; - struct timespec spec; - struct timespec *specp = NULL; -- int r; -- char intake; -+ sigset_t empty; - - sigemptyset (&empty); - -- FD_ZERO (&readfds); -- FD_SET (job_fds[0], &readfds); -- - if (timeout) - { - /* Alarm after one second (is this too granular?) */ -@@ -256,28 +277,52 @@ jobserver_acquire (int timeout) - specp = &spec; - } - -- r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty); -- -- if (r == -1) -+ while (1) - { -- /* Better be SIGCHLD. */ -- if (errno != EINTR) -- pfatal_with_name (_("pselect jobs pipe")); -- return 0; -- } -+ fd_set readfds; -+ int r; -+ char intake; - -- if (r == 0) -- /* Timeout. */ -- return 0; -+ FD_ZERO (&readfds); -+ FD_SET (job_fds[0], &readfds); - -- /* The read FD is ready: read it! */ -- EINTRLOOP (r, read (job_fds[0], &intake, 1)); -- if (r < 0) -- pfatal_with_name (_("read jobs pipe")); -+ r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty); -+ if (r < 0) -+ switch (errno) -+ { -+ case EINTR: -+ /* SIGCHLD will show up as an EINTR. */ -+ return 0; -+ -+ case EBADF: -+ /* Someone closed the jobs pipe. -+ That shouldn't happen but if it does we're done. */ -+ O (fatal, NILF, _("job server shut down")); - -- /* What does it mean if read() returns 0? It shouldn't happen because only -- the master make can reap all the tokens and close the write side...?? */ -- return r > 0; -+ default: -+ pfatal_with_name (_("pselect jobs pipe")); -+ } -+ -+ if (r == 0) -+ /* Timeout. */ -+ return 0; -+ -+ /* The read FD is ready: read it! This is non-blocking. */ -+ EINTRLOOP (r, read (job_fds[0], &intake, 1)); -+ -+ if (r < 0) -+ { -+ /* Someone sniped our token! Try again. */ -+ if (errno == EAGAIN) -+ continue; -+ -+ pfatal_with_name (_("read jobs pipe")); -+ } -+ -+ /* read() should never return 0: only the master make can reap all the -+ tokens and close the write side...?? */ -+ return r > 0; -+ } - } - - #else --- -cgit v1.0-41-gc330 - diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index fcbb23a7119e..5f215be7386a 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # a second. So, tell Make to ignore nanoseconds in mtime here by # overriding the autoconf test for the struct. # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion. - ++ lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; + ++ lib.optional stdenv.hostPlatform.isDarwin "ac_cv_struct_st_mtim_nsec=no"; outputs = [ "out" "man" "info" ]; separateDebugInfo = true; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index a9827e7a0a7e..5f34894e8dc3 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -23,7 +23,11 @@ rec { "x86_64-darwin" "x86_64-linux" "x86_64-windows" - ] + ], + + # Extra attributes to be merged into the resulting derivation's + # meta attribute. + meta ? {} }: { lib @@ -61,7 +65,7 @@ rec { nativeBuildInputs = [ makeWrapper unzip - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; @@ -98,9 +102,9 @@ rec { --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain${toolchain.property}" ''; - dontFixup = !stdenv.isLinux; + dontFixup = !stdenv.hostPlatform.isLinux; - fixupPhase = let arch = if stdenv.is64bit then "amd64" else "i386"; + fixupPhase = let arch = if stdenv.hostPlatform.is64bit then "amd64" else "i386"; in '' . ${./patching.sh} @@ -108,7 +112,7 @@ rec { for variant in "" "-ncurses5" "-ncurses6"; do autoPatchelfInJar \ $out/lib/gradle/lib/native-platform-linux-${arch}$variant-''${nativeVersion}.jar \ - "${stdenv.cc.cc.lib}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ncurses6 ]}" + "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ncurses6 ]}" done # The file-events library _seems_ to follow the native-platform version, but @@ -116,7 +120,7 @@ rec { fileEventsVersion="$(extractVersion file-events $out/lib/gradle/lib/file-events-*.jar)" autoPatchelfInJar \ $out/lib/gradle/lib/file-events-linux-${arch}-''${fileEventsVersion}.jar \ - "${stdenv.cc.cc.lib}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}" + "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}" # The scanner doesn't pick up the runtime dependency in the jar. # Manually add a reference where it will be found. @@ -170,9 +174,9 @@ rec { binaryNativeCode ]; license = licenses.asl20; - maintainers = with maintainers; [ lorenzleutgeb liff ]; + maintainers = with maintainers; [ lorenzleutgeb liff ] ++ lib.teams.java.members; mainProgram = "gradle"; - }; + } // meta; }); # NOTE: Default JDKs that are hardcoded below must be LTS versions @@ -180,8 +184,8 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_8 = gen { - version = "8.10"; - hash = "sha256-W5xes/n8LJSrrqV9kL14dHyhF927+WyFnTdBGBoSvyo="; + version = "8.10.2"; + hash = "sha256-McVXE+QCM6gwOCfOtCykikcmegrUurkXcSMSHnFSTCY="; defaultJava = jdk21; }; @@ -191,16 +195,11 @@ rec { defaultJava = jdk17; }; - gradle_6 = gen { - version = "6.9.4"; - hash = "sha256-PiQCKFON6fGHcqV06ZoLqVnoPW7zUQFDgazZYxeBOJo="; - defaultJava = jdk11; - }; - wrapGradle = { - lib, callPackage, mitm-cache, substituteAll, symlinkJoin, concatTextFile, makeSetupHook + lib, callPackage, mitm-cache, substituteAll, symlinkJoin, concatTextFile, makeSetupHook, nix-update-script }: gradle-unwrapped: + updateAttrPath: lib.makeOverridable (args: let gradle = gradle-unwrapped.override args; @@ -226,8 +225,13 @@ rec { passthru = { fetchDeps = callPackage ./fetch-deps.nix { inherit mitm-cache; }; - inherit (gradle) jdk; + inherit (gradle) jdk tests; unwrapped = gradle; + } // lib.optionalAttrs (updateAttrPath != null) { + updateScript = nix-update-script { + attrPath = updateAttrPath; + extraArgs = [ "--url=https://github.com/gradle/gradle" ]; + }; }; meta = gradle.meta // { diff --git a/pkgs/development/tools/build-managers/gradle/fetch-deps.nix b/pkgs/development/tools/build-managers/gradle/fetch-deps.nix index 304898c0131c..a0d3b10ba863 100644 --- a/pkgs/development/tools/build-managers/gradle/fetch-deps.nix +++ b/pkgs/development/tools/build-managers/gradle/fetch-deps.nix @@ -22,7 +22,7 @@ in , data # redirect stdout to stderr to allow the update script to be used with update script combinators , silent ? true -, useBwrap ? stdenv.isLinux +, useBwrap ? stdenv.hostPlatform.isLinux } @ attrs: let diff --git a/pkgs/development/tools/build-managers/gradle/setup-hook.sh b/pkgs/development/tools/build-managers/gradle/setup-hook.sh index a16742414b12..6c9c927f0c45 100644 --- a/pkgs/development/tools/build-managers/gradle/setup-hook.sh +++ b/pkgs/development/tools/build-managers/gradle/setup-hook.sh @@ -29,7 +29,9 @@ gradleConfigureHook() { } gradle() { - command gradle $gradleFlags "${gradleFlagsArray[@]}" "$@" + local flagsArray=() + concatTo flagsArray gradleFlags gradleFlagsArray + command gradle "${flagsArray[@]}" "$@" } gradleBuildPhase() { diff --git a/pkgs/development/tools/build-managers/gradle/update-deps.nix b/pkgs/development/tools/build-managers/gradle/update-deps.nix index 96e46a0d98fd..51959fa69f38 100644 --- a/pkgs/development/tools/build-managers/gradle/update-deps.nix +++ b/pkgs/development/tools/build-managers/gradle/update-deps.nix @@ -1,6 +1,7 @@ { lib , runtimeShell , srcOnly +, stdenvNoCC , writeTextFile , writeShellScript , path @@ -38,6 +39,8 @@ let source = srcOnly (pkg.overrideAttrs (old: { mitmCache = ""; gradleInitScript = ./init-deps.gradle; + + stdenv = old.stdenv or stdenvNoCC; })); sourceDrvPath = builtins.unsafeDiscardOutputDependency source.drvPath; nixShellKeep = lib.concatMapStringsSep " " (x: "--keep ${x}") keep; diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix index 3576b67208c3..b500d7d9cc40 100644 --- a/pkgs/development/tools/build-managers/gup/default.nix +++ b/pkgs/development/tools/build-managers/gup/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, nix-update-source, lib, python3 , which, runtimeShell, pylint }: stdenv.mkDerivation rec { - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { + hash = "sha256-bV5HauM0xmRI/9Pxp1cYLPLA8PbFvPER2y4mAMmgchs="; owner = "timbertson"; repo = "gup"; rev = "version-${version}"; - sha256 = "1wfw46b647rkalwds6547ylzy353b3xlklhcl2xjgj2gihvi30mx"; }; pname = "gup"; nativeBuildInputs = [ python3 which pylint ]; @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { --set repo gup \ --set type fetchFromGitHub \ --set rev 'version-{version}' \ + --nix-literal rev 'version-''${version}'\ --modify-nix default.nix '' ]; diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix deleted file mode 100644 index 039d4ee6970c..000000000000 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, makeWrapper, gcc, ncurses }: - -stdenv.mkDerivation rec { - pname = "icmake"; - version = "9.03.01"; - - src = fetchFromGitLab { - sha256 = "05r0a69w0hv2qhjpb2bxd0lmp2vv5r2d4iggg6ly4miam0i318jy"; - rev = version; - repo = "icmake"; - owner = "fbb-git"; - }; - - - setSourceRoot = '' - sourceRoot=$(echo */icmake) - ''; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ gcc ]; - - preConfigure = '' - patchShebangs ./ - substituteInPlace INSTALL.im --replace "usr/" "" - ''; - - buildPhase = '' - ./icm_prepare $out - ./icm_bootstrap x - ''; - - installPhase = '' - ./icm_install all / - - wrapProgram $out/bin/icmbuild \ - --prefix PATH : ${ncurses}/bin - ''; - - meta = with lib; { - description = "Program maintenance (make) utility using a C-like grammar"; - homepage = "https://fbb-git.gitlab.io/icmake/"; - license = licenses.gpl3; - maintainers = with maintainers; [ pSub ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix deleted file mode 100644 index bf06954df4de..000000000000 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ lib, stdenv, fetchurl, bison, buildPackages, pkgsBuildTarget }: - -let - mkJam = { pname, version, src, meta ? { } }: stdenv.mkDerivation { - inherit pname version src; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ bison ]; - - # Jam uses c89 conventions - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-std=c89"; - - # Jambase expects ar to have flags. - preConfigure = '' - export AR="$AR rc" - ''; - - # When cross-compiling, we need to set the preprocessor macros - # OSMAJOR/OSMINOR/OSPLAT to the values from the target platform, not the - # host platform. This looks a little ridiculous because the vast majority of - # build tools don't embed target-specific information into their binary, but - # in this case we behave more like a compiler than a make(1)-alike. - postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) '' - cat >>jam.h <<EOF - #undef OSMAJOR - #undef OSMINOR - #undef OSPLAT - $( - ${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}cc -E -dM jam.h \ - | grep -E '^#define (OSMAJOR|OSMINOR|OSPLAT) ' - ) - EOF - ''; - - LOCATE_TARGET = "bin.unix"; - - buildPhase = '' - runHook preBuild - make $makeFlags jam0 - ./jam0 -j$NIX_BUILD_CORES -sCC=${buildPackages.stdenv.cc.targetPrefix}cc jambase.c - ./jam0 -j$NIX_BUILD_CORES - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin $out/doc/jam - cp bin.unix/jam $out/bin/jam - cp *.html $out/doc/jam - runHook postInstall - ''; - - enableParallelBuilding = true; - - meta = with lib; { - license = licenses.free; - mainProgram = "jam"; - platforms = platforms.unix; - } // meta; - }; -in -{ - jam = let - pname = "jam"; - version = "2.6.1"; - - base = mkJam { - inherit pname version; - - src = fetchurl { - url = "https://swarm.workshop.perforce.com/projects/perforce_software-jam/download/main/${pname}-${version}.tar"; - sha256 = "19xkvkpycxfsncxvin6yqrql3x3z9ypc1j8kzls5k659q4kv5rmc"; - }; - - meta = with lib; { - description = "Just Another Make"; - homepage = "https://www.perforce.com/resources/documentation/jam"; - maintainers = with maintainers; [ impl orivej ]; - }; - }; - in base.overrideAttrs (oldAttrs: { - makeFlags = (oldAttrs.makeFlags or []) ++ [ - "CC=${buildPackages.stdenv.cc.targetPrefix}cc" - ]; - }); - - ftjam = let - pname = "ftjam"; - version = "2.5.2"; - - base = mkJam { - inherit pname version; - - src = fetchurl { - url = "https://downloads.sourceforge.net/project/freetype/${pname}/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-6JdzUAqSkS3pGOn+v/q+S2vOedaa8ZRDX04DK4ptZqM="; - }; - - meta = with lib; { - description = "FreeType's enhanced, backwards-compatible Jam clone"; - homepage = "https://freetype.org/jam/"; - maintainers = with maintainers; [ AndersonTorres impl ]; - }; - }; - in base.overrideAttrs (oldAttrs: { - postPatch = (oldAttrs.postPatch or "") + '' - substituteInPlace Jamfile --replace strip ${stdenv.cc.targetPrefix}strip - ''; - - # Doesn't understand how to cross compile once bootstrapped, so we'll just - # use the Makefile for the bootstrapping portion. - configurePlatforms = [ "build" "target" ]; - configureFlags = (oldAttrs.configureFlags or []) ++ [ - "CC=${buildPackages.stdenv.cc.targetPrefix}cc" - "--host=${stdenv.buildPlatform.config}" - ]; - }); -} diff --git a/pkgs/development/tools/build-managers/kati/default.nix b/pkgs/development/tools/build-managers/kati/default.nix deleted file mode 100644 index 9ceeb2f8c490..000000000000 --- a/pkgs/development/tools/build-managers/kati/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation { - pname = "kati-unstable"; - version = "2019-09-23"; - - src = fetchFromGitHub { - owner = "google"; - repo = "kati"; - rev = "9da3296746a0cd55b38ebebf91e7f57105a4c36f"; - sha256 = "0s5dfhgpcbx12b1fqmm8p0jpvrhgrnl9qywv1ksbwhw3pfp7j866"; - }; - - patches = [ ./version.patch ]; - - installPhase = '' - install -D ckati $out/bin/ckati - ''; - - meta = with lib; { - description = "Experimental GNU make clone"; - mainProgram = "ckati"; - homepage = "https://github.com/google/kati"; - platforms = platforms.all; - license = licenses.asl20; - maintainers = with maintainers; [ danielfullmer ]; - }; -} diff --git a/pkgs/development/tools/build-managers/kati/version.patch b/pkgs/development/tools/build-managers/kati/version.patch deleted file mode 100644 index 1821ac6bbb73..000000000000 --- a/pkgs/development/tools/build-managers/kati/version.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/Makefile.ckati b/Makefile.ckati -index e4067bb..15518f3 100644 ---- a/Makefile.ckati -+++ b/Makefile.ckati -@@ -102,14 +102,8 @@ $(KATI_CXX_TEST_EXES): $(KATI_BIN_PATH)/%: $(KATI_INTERMEDIATES_PATH)/%.o - $(KATI_LD) $^ -o $@ $(KATI_LIBS) - - # Rule to generate version.cc --KATI_GIT_DIR := $(shell git -C $(KATI_SRC_PATH) rev-parse --show-toplevel) --ifneq ($(KATI_GIT_DIR),) --KATI_VERSION_DEPS := $(KATI_GIT_DIR)/.git/HEAD $(KATI_GIT_DIR)/.git/index --KATI_VERSION := $(shell git -C $(KATI_GIT_DIR) rev-parse HEAD) --else - KATI_VERSION_DEPS := - KATI_VERSION := unknown --endif - $(KATI_INTERMEDIATES_PATH)/version.cc: $(KATI_VERSION_DEPS) - @mkdir -p $(dir $@) - echo '// +build ignore' > $@ diff --git a/pkgs/development/tools/build-managers/knit/default.nix b/pkgs/development/tools/build-managers/knit/default.nix deleted file mode 100644 index 387985087a7e..000000000000 --- a/pkgs/development/tools/build-managers/knit/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "knit"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "zyedidia"; - repo = "knit"; - rev = "v${version}"; - hash = "sha256-zxwEJnQZpOEJhV7jx2ClS3XmMfGBiq8AHR26TOIBJVw="; - }; - - vendorHash = "sha256-+IZFydwchHIMIvYmIgZ0uJKjW4aVBFuj3SQk58I0z/g="; - - subPackages = [ - "cmd/knit" - ]; - - ldflags = [ - "-s" - "-w" - "-X github.com/zyedidia/knit/info.Version=${version}" - ]; - - meta = with lib; { - description = "Simple and flexible build tool using Lua, similar to make/mk"; - mainProgram = "knit"; - homepage = "https://github.com/zyedidia/knit"; - changelog = "https://github.com/zyedidia/knit/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ DrSensor ]; - }; -} diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix deleted file mode 100644 index efbce0bcd339..000000000000 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper -, coreutils, jdk, rlwrap, gnupg }: - -stdenv.mkDerivation rec { - pname = "leiningen"; - version = "2.11.2"; - - src = fetchurl { - url = "https://codeberg.org/leiningen/leiningen/raw/tag/${version}/bin/lein-pkg"; - hash = "sha256-KKGmJmjF9Ce0E6hnfjdq/6qZXwI7H80G4tTJisHfXz4="; - }; - - jarsrc = fetchurl { - url = "https://codeberg.org/leiningen/leiningen/releases/download/${version}/leiningen-${version}-standalone.jar"; - hash = "sha256-fTGuI652npJ0OLDNVdFak+faurCf1PwVh3l5Fh4Qh3Q="; - }; - - JARNAME = "${pname}-${version}-standalone.jar"; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ jdk ]; - - # the jar is not in share/java, because it's a standalone jar and should - # never be picked up by set-java-classpath.sh - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share - cp -v $src $out/bin/lein - cp -v $jarsrc $out/share/$JARNAME - - runHook postInstall - ''; - - fixupPhase = '' - runHook preFixup - - chmod +x $out/bin/lein - patchShebangs $out/bin/lein - substituteInPlace $out/bin/lein \ - --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/$JARNAME" - wrapProgram $out/bin/lein \ - --prefix PATH ":" "${lib.makeBinPath [ rlwrap coreutils ]}" \ - --set LEIN_GPG ${gnupg}/bin/gpg \ - --set JAVA_CMD ${jdk}/bin/java - - runHook postFixup - ''; - - meta = { - homepage = "https://leiningen.org/"; - description = "Project automation for Clojure"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.epl10; - platforms = jdk.meta.platforms; - maintainers = [ ]; - mainProgram = "lein"; - }; -} diff --git a/pkgs/development/tools/build-managers/mage/default.nix b/pkgs/development/tools/build-managers/mage/default.nix deleted file mode 100644 index 3ba789eacfe8..000000000000 --- a/pkgs/development/tools/build-managers/mage/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib }: - -buildGoModule rec { - pname = "mage"; - version = "1.15.0"; - - src = fetchFromGitHub { - owner = "magefile"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-aZPv3+F4VMiThjR0nFP+mKQLI9zKj2jaOawClROnT34="; - }; - - vendorHash = null; - - doCheck = false; - - ldflags = [ - "-X github.com/magefile/mage/mage.commitHash=v${version}" - "-X github.com/magefile/mage/mage.gitTag=v${version}" - "-X github.com/magefile/mage/mage.timestamp=1970-01-01T00:00:00Z" - ]; - - meta = with lib; { - description = "Make/Rake-like Build Tool Using Go"; - mainProgram = "mage"; - homepage = "https://magefile.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ swdunlop ]; - }; -} diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix deleted file mode 100644 index 4ca4dcd04fa3..000000000000 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper }: - -stdenv.mkDerivation (finalAttrs: { - pname = "mill"; - version = "0.11.12"; - - src = fetchurl { - url = "https://github.com/com-lihaoyi/mill/releases/download/${finalAttrs.version}/${finalAttrs.version}-assembly"; - hash = "sha256-k4/oMHvtq5YXY8hRlX4gWN16ClfjXEAn6mRIoEBHNJo="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - # this is mostly downloading a pre-built artifact - preferLocal = true; - - installPhase = '' - runHook preInstall - install -Dm555 "$src" "$out/bin/.mill-wrapped" - # can't use wrapProgram because it sets --argv0 - makeWrapper "$out/bin/.mill-wrapped" "$out/bin/mill" \ - --prefix PATH : "${jre}/bin" \ - --set JAVA_HOME "${jre}" - runHook postInstall - ''; - - doInstallCheck = true; - # The default release is a script which will do an impure download - # just ensure that the application can run without network - installCheckPhase = '' - $out/bin/mill --help > /dev/null - ''; - - meta = with lib; { - homepage = "https://com-lihaoyi.github.io/mill/"; - license = licenses.mit; - description = "Build tool for Scala, Java and more"; - mainProgram = "mill"; - longDescription = '' - Mill is a build tool borrowing ideas from modern tools like Bazel, to let you build - your projects in a way that's simple, fast, and predictable. Mill has built in - support for the Scala programming language, and can serve as a replacement for - SBT, but can also be extended to support any other language or platform via - modules (written in Java or Scala) or through an external subprocesses. - ''; - maintainers = with maintainers; [ scalavision zenithal ]; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index adb3c306a779..46275144ffa6 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.28.2"; + version = "1.29.0"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-T+fPQ9qQ3mdnf80E6L7VYtDQpiGNj209yH+IgmdAgug="; + hash = "sha256-s0JwqEso1Mum+fMTg2rn58oxoSqraQ0iEnsRpgMmtVU="; }; - cargoHash = "sha256-PgeVoq0jS7i6WD0cZRHu86zWgxK8fRpJhHujsaFqRy0="; + cargoHash = "sha256-5WFB2+dWm0q+Ui7rpVlvVrmCHoc4v5x5QNEbDpANkhA="; env = { RUSTFLAGS = "-C strip=symbols"; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { }; buildInputs = [ openssl ] ++ - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix deleted file mode 100644 index 94469669a59e..000000000000 --- a/pkgs/development/tools/build-managers/msbuild/default.nix +++ /dev/null @@ -1,152 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, glibcLocales, mono, unzip, dotnetCorePackages, roslyn }: - -let - - dotnet-sdk = dotnetCorePackages.sdk_6_0; - - xplat = fetchurl { - url = "https://github.com/mono/msbuild/releases/download/v16.9.0/mono_msbuild_6.12.0.137.zip"; - sha256 = "1wnzbdpk4s9bmawlh359ak2b8zi0sgx1qvcjnvfncr1wsck53v7q"; - }; - - inherit (stdenv.hostPlatform.extensions) sharedLibrary; - - mkPackage = attrs: stdenv.mkDerivation (finalAttrs: - dotnetCorePackages.addNuGetDeps - { - nugetDeps = ./deps.nix; - overrideFetchAttrs = a: { - dontBuild = false; - }; - } - attrs finalAttrs); - -in - -mkPackage rec { - pname = "msbuild"; - version = "16.10.1+xamarinxplat.2021.05.26.14.00"; - - src = fetchurl { - url = "https://download.mono-project.com/sources/msbuild/msbuild-${version}.tar.xz"; - sha256 = "05ghqqkdj4s3d0xkp7mkdzjig5zj3k6ajx71j0g2wv6rdbvg6899"; - }; - - nativeBuildInputs = [ - dotnet-sdk - mono - unzip - makeWrapper - ]; - - buildInputs = [ - glibcLocales - ]; - - # https://github.com/NixOS/nixpkgs/issues/38991 - # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) - LOCALE_ARCHIVE = lib.optionalString stdenv.isLinux - "${glibcLocales}/lib/locale/locale-archive"; - - postPatch = '' - # not patchShebangs, there is /bin/bash in the body of the script as well - substituteInPlace ./eng/cibuild_bootstrapped_msbuild.sh --replace /bin/bash ${stdenv.shell} - - patchShebangs eng/*.sh mono/build/*.sh - - sed -i -e "/<\/projectImportSearchPaths>/a <property name=\"MSBuildExtensionsPath\" value=\"$out/lib/mono/xbuild\"/>" \ - src/MSBuild/app.config - - # license check is case sensitive - mv LICENSE license.bak && mv license.bak license - ''; - - linkNugetPackages = true; - - buildPhase = '' - mkdir -p artifacts - unzip ${xplat} -d artifacts - mv artifacts/msbuild artifacts/mono-msbuild - chmod +x artifacts/mono-msbuild/MSBuild.dll - - # The provided libhostfxr.dylib is for x86_64-darwin, so we remove it - rm artifacts/mono-msbuild/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver/libhostfxr.dylib - - ln -s $(find ${dotnet-sdk} -name libhostfxr${sharedLibrary}) artifacts/mono-msbuild/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver/ - - # overwrite the file - echo "#!${stdenv.shell}" > eng/common/dotnet-install.sh - echo "#!${stdenv.shell}" > mono/build/get_sdk_files.sh - - # Prevent msbuild from downloading a new libhostfxr - echo "#!${stdenv.shell}" > mono/build/extract_and_copy_hostfxr.sh - - mkdir -p mono/dotnet-overlay/msbuild-bin - cp ${dotnet-sdk}/sdk/*/{Microsoft.NETCoreSdk.BundledVersions.props,RuntimeIdentifierGraph.json} mono/dotnet-overlay/msbuild-bin - - # DisableNerdbankVersioning https://gitter.im/Microsoft/msbuild/archives/2018/06/27?at=5b33dbc4ce3b0f268d489bfa - # TODO there are some (many?) failing tests - NuGetPackageRoot="$NUGET_PACKAGES" ./eng/cibuild_bootstrapped_msbuild.sh --host_type mono --configuration Release --skip_tests /p:DisableNerdbankVersioning=true - patchShebangs stage1/mono-msbuild/msbuild - ''; - - installPhase = '' - stage1/mono-msbuild/msbuild mono/build/install.proj /p:MonoInstallPrefix="$out" /p:Configuration=Release-MONO - - ln -s ${roslyn}/lib/dotnet/microsoft.net.compilers.toolset/*/tasks/net472 $out/lib/mono/msbuild/Current/bin/Roslyn - - makeWrapper ${mono}/bin/mono $out/bin/msbuild \ - --set-default MONO_GC_PARAMS "nursery-size=64m" \ - --add-flags "$out/lib/mono/msbuild/15.0/bin/MSBuild.dll" - - ln -s $(find ${dotnet-sdk} -name libhostfxr${sharedLibrary}) $out/lib/mono/msbuild/Current/bin/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver/ - ''; - - doInstallCheck = true; - - # https://docs.microsoft.com/cs-cz/visualstudio/msbuild/walkthrough-creating-an-msbuild-project-file-from-scratch?view=vs-2019 - installCheckPhase = '' - cat > Helloworld.cs <<EOF -using System; - -class HelloWorld -{ - static void Main() - { -#if DebugConfig - Console.WriteLine("WE ARE IN THE DEBUG CONFIGURATION"); -#endif - - Console.WriteLine("Hello, world!"); - } -} -EOF - - cat > Helloworld.csproj <<EOF -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Compile Include="Helloworld.cs" /> - </ItemGroup> - <Target Name="Build"> - <Csc Sources="@(Compile)"/> - </Target> -</Project> -EOF - - $out/bin/msbuild Helloworld.csproj -t:Build - ${mono}/bin/mono Helloworld.exe | grep "Hello, world!" - ''; - - meta = with lib; { - description = "Mono version of Microsoft Build Engine, the build platform for .NET, and Visual Studio"; - mainProgram = "msbuild"; - homepage = "https://github.com/mono/msbuild"; - sourceProvenance = with sourceTypes; [ - fromSource - binaryNativeCode # dependencies - ]; - license = licenses.mit; - maintainers = with maintainers; [ jdanek ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/build-managers/msbuild/deps.nix b/pkgs/development/tools/build-managers/msbuild/deps.nix deleted file mode 100644 index e7d1d362a1c5..000000000000 --- a/pkgs/development/tools/build-managers/msbuild/deps.nix +++ /dev/null @@ -1,235 +0,0 @@ -# This file was automatically generated by passthru.fetch-deps. -# Please dont edit it manually, your changes might get overwritten! - -{ fetchNuGet }: [ - (fetchNuGet { pname = "BenchmarkDotNet"; version = "0.12.1"; hash = "sha256-vISVlxTg4nhyRd1Jw+EwzGK7jabO+dQYnBScDVRAE3I="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/benchmarkdotnet/0.12.1/benchmarkdotnet.0.12.1.nupkg"; }) - (fetchNuGet { pname = "BenchmarkDotNet.Annotations"; version = "0.12.1"; hash = "sha256-g1M3JNIgAsL1g7oEISRf5mMsYkO2uJfWBkglc9tHOxg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/benchmarkdotnet.annotations/0.12.1/benchmarkdotnet.annotations.0.12.1.nupkg"; }) - (fetchNuGet { pname = "CommandLineParser"; version = "2.4.3"; hash = "sha256-pTyYP26uXXLe6ejCb/yVYpb23ad/Dkl2Ka8NWwQeiqk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/commandlineparser/2.4.3/commandlineparser.2.4.3.nupkg"; }) - (fetchNuGet { pname = "FSharp.NET.Sdk"; version = "1.0.4-bundled-0100"; hash = "sha256-6FC2zLqwF0bydu8d2uiH1McIy0af/NrZ//hf4xdvHho="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/fsharp.net.sdk/1.0.4-bundled-0100/fsharp.net.sdk.1.0.4-bundled-0100.nupkg"; }) - (fetchNuGet { pname = "Iced"; version = "1.4.0"; hash = "sha256-yQ7xTIeuZCo5WotGbkWuw7/hyAf/6sukdtuURRkQFNE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/iced/1.4.0/iced.1.4.0.nupkg"; }) - (fetchNuGet { pname = "ILLink.Tasks"; version = "0.1.6-prerelease.20175.2"; hash = "sha256-/yDCjUVz3RstltoUDOcYEwNyGeLWAviiG7YUURGZjmg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/7d9f5c21-0d79-403f-bfe3-9a4506529760/nuget/v3/flat2/illink.tasks/0.1.6-prerelease.20175.2/illink.tasks.0.1.6-prerelease.20175.2.nupkg"; }) - (fetchNuGet { pname = "jnm2.ReferenceAssemblies.net35"; version = "1.0.1"; hash = "sha256-7Kgh/lQW1wxa76vecVxmG/8JNBvMz766lxazyL+mt4E="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/jnm2.referenceassemblies.net35/1.0.1/jnm2.referenceassemblies.net35.1.0.1.nupkg"; }) - (fetchNuGet { pname = "LargeAddressAware"; version = "1.0.5"; hash = "sha256-IQnTkOHBsic3HDa7TwfQtwwbowHG/iWQd6tkPuqAUkM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/largeaddressaware/1.0.5/largeaddressaware.1.0.5.nupkg"; }) - (fetchNuGet { pname = "MicroBuild.Core"; version = "0.2.0"; hash = "sha256-JIVBO1hWtK955RmtghoXqn6S9rb2G69Id92vqWUhmmA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microbuild.core/0.2.0/microbuild.core.0.2.0.nupkg"; }) - (fetchNuGet { pname = "MicroBuild.Core.Sentinel"; version = "1.0.0"; hash = "sha256-Efk2JFokIgDHw8G3sSsBs2990adCCItAoPiq6UrHsww="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microbuild.core.sentinel/1.0.0/microbuild.core.sentinel.1.0.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.0"; hash = "sha256-QYVojfqSZKbF8P6D/aacfxfumMaRUD9SEEQbzw73Bbc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.asyncinterfaces/1.1.0/microsoft.bcl.asyncinterfaces.1.1.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Build"; version = "14.3.0"; hash = "sha256-P4NszYl1VU6+2hWB64Y7Jy1mw/HA0kul5iD2ju6wVf0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/14.3.0/microsoft.build.14.3.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Build.CentralPackageVersions"; version = "2.0.1"; hash = "sha256-sxSrG4+xzZVP2YtJYYCpHGa0pCAPmZCQRhilJaSKkp0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.centralpackageversions/2.0.1/microsoft.build.centralpackageversions.2.0.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "14.3.0"; hash = "sha256-zSmVu5u/oec5XVHsbwviR5joITIC5uZGWXfk1U4M/mQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/14.3.0/microsoft.build.framework.14.3.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "15.5.180"; hash = "sha256-XyTJ3tn+vOc5rH4Pux1MjswRia6ei5bqTX3GEI4anhg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/15.5.180/microsoft.build.framework.15.5.180.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Build.NuGetSdkResolver"; version = "5.9.1-rc.8"; hash = "sha256-DaH2rPBY32UWK1M2odPiRVF/NnmrrnvBtxTnI6ia/bU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.nugetsdkresolver/5.9.1-rc.8/microsoft.build.nugetsdkresolver.5.9.1-rc.8.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.1.0-beta-20206-02"; hash = "sha256-nbFnPIifuevbeOCkPuCirofjqDLi+CnxYUXvSfGGlL8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.build.tasks.git/1.1.0-beta-20206-02/microsoft.build.tasks.git.1.1.0-beta-20206-02.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "14.3.0"; hash = "sha256-awZNRydsILpI8xtA/zI8WbHTDuQcq220nt+K0K22oQw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/14.3.0/microsoft.build.utilities.core.14.3.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "15.5.180"; hash = "sha256-YJiW2bLfrkOFvQ8toWDGyPodrmjlIkshWyixhxWUizA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/15.5.180/microsoft.build.utilities.core.15.5.180.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.6.1"; hash = "sha256-1+FV3KvwerZsknecHZhdDACsPKaWrbQQeN27BAcZk94="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/2.6.1/microsoft.codeanalysis.analyzers.2.6.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Build.Tasks"; version = "3.9.0-5.21112.8"; hash = "sha256-h1UrpcVKxFQkmX4bHrsZGlJ2wB5X+dwREtiHu++sm6M="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.build.tasks/3.9.0-5.21112.8/microsoft.codeanalysis.build.tasks.3.9.0-5.21112.8.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "2.10.0"; hash = "sha256-UikMFW/dcSiKfsUqnn2hvguLJN7gw1e01WpWmHEHydA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/2.10.0/microsoft.codeanalysis.common.2.10.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "2.10.0"; hash = "sha256-szdSweIavn5BBPZgM8uE4j1WrvTfMqF/4yqzgLJeSmk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.csharp/2.10.0/microsoft.codeanalysis.csharp.2.10.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.6.1"; hash = "sha256-NI+9eizIs3mrCNAw058DZvRzxpCAdoL3SKth6iypzgU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codecoverage/16.6.1/microsoft.codecoverage.16.6.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.61701"; hash = "sha256-ITNO2LJYyWhYs3A/iqfoaW6ddvkuuBVXQ5YSKQ8wgcU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diagnostics.netcore.client/0.2.61701/microsoft.diagnostics.netcore.client.0.2.61701.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.Runtime"; version = "1.1.57604"; hash = "sha256-Ubu6a+qKwstY6v7Oywg1izAwgLZOnvv5ZjcmOJ5+qb4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diagnostics.runtime/1.1.57604/microsoft.diagnostics.runtime.1.1.57604.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; version = "2.0.49"; hash = "sha256-SUkXJTeA+Ctk+MlxY5QAThL6d+mBIz+gKJ0RlShKnCM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diagnostics.tracing.traceevent/2.0.49/microsoft.diagnostics.tracing.traceevent.2.0.49.nupkg"; }) - (fetchNuGet { pname = "Microsoft.DotNet.Arcade.Sdk"; version = "5.0.0-beta.21226.1"; hash = "sha256-g0R3wc9SZryUvgu5fB5WwyLEcQsPYbrqa4qylNpn97Q="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/5.0.0-beta.21226.1/microsoft.dotnet.arcade.sdk.5.0.0-beta.21226.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.DotNet.MSBuildSdkResolver"; version = "5.0.300-servicing.21267.11"; hash = "sha256-5S7nvtosI97MPWxHaxBManc70Dp1e9Ycbta9C6cS78k="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a8a526e9-91b3-4569-ba2d-ff08dbb7c110/nuget/v3/flat2/microsoft.dotnet.msbuildsdkresolver/5.0.300-servicing.21267.11/microsoft.dotnet.msbuildsdkresolver.5.0.300-servicing.21267.11.nupkg"; }) - (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.1.0"; hash = "sha256-vrZhYp94SjycUMGaVYCFWJ4p7KBKfqVyLWtIG73fzeM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.dotnet.platformabstractions/2.1.0/microsoft.dotnet.platformabstractions.2.1.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.DotNet.SignTool"; version = "5.0.0-beta.21226.1"; hash = "sha256-cr0QbHmpSj7zhg3y0bMudugkInppcdSlDTHFYRExo8k="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.signtool/5.0.0-beta.21226.1/microsoft.dotnet.signtool.5.0.0-beta.21226.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NET.Build.Extensions"; version = "3.1.400-preview.20365.20"; hash = "sha256-pUGvWPLzNQEIDhdCbkv+qnU1e9QS477moiFree6RrO4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d5f6139d-6136-4228-8b2d-9676e9e4eb3d/nuget/v3/flat2/microsoft.net.build.extensions/3.1.400-preview.20365.20/microsoft.net.build.extensions.3.1.400-preview.20365.20.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Net.Compilers.Toolset"; version = "3.9.0-5.21112.8"; hash = "sha256-MDxQi3QVFfvA5bcOblCm/ypHSe6WqpGb0ZD65NXrLLc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/3.9.0-5.21112.8/microsoft.net.compilers.toolset.3.9.0-5.21112.8.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NET.Sdk"; version = "3.1.400-preview.20365.20"; hash = "sha256-XiBnkAuLbDXE3qNKswDW5bJ+2/lOTM0Jotwwq7OxVgk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d5f6139d-6136-4228-8b2d-9676e9e4eb3d/nuget/v3/flat2/microsoft.net.sdk/3.1.400-preview.20365.20/microsoft.net.sdk.3.1.400-preview.20365.20.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NET.Sdk.Publish"; version = "3.1.300-servicing.20216.7"; hash = "sha256-gVym+TG4pekotsouOrEup8dkYYLPFeNIqzN/cWHEO/Y="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d5f6139d-6136-4228-8b2d-9676e9e4eb3d/nuget/v3/flat2/microsoft.net.sdk.publish/3.1.300-servicing.20216.7/microsoft.net.sdk.publish.3.1.300-servicing.20216.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NET.Sdk.Razor"; version = "3.1.6"; hash = "sha256-KqYNpuT8B01liMwZLBLZoLucTt3uVYR3zE4UTEH8gO8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.sdk.razor/3.1.6/microsoft.net.sdk.razor.3.1.6.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NET.Sdk.Web"; version = "3.1.300-servicing.20216.7"; hash = "sha256-oWSmOGSjhfiRXcJYRKQK0GuBfgkpxlZ6WRtwzqNoMgA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d5f6139d-6136-4228-8b2d-9676e9e4eb3d/nuget/v3/flat2/microsoft.net.sdk.web/3.1.300-servicing.20216.7/microsoft.net.sdk.web.3.1.300-servicing.20216.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NET.Sdk.Web.ProjectSystem"; version = "3.1.300-servicing.20216.7"; hash = "sha256-VE0CiduLOC3KT0D4pqaWGrSSzF6rvd6dQhAFanqsARg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d5f6139d-6136-4228-8b2d-9676e9e4eb3d/nuget/v3/flat2/microsoft.net.sdk.web.projectsystem/3.1.300-servicing.20216.7/microsoft.net.sdk.web.projectsystem.3.1.300-servicing.20216.7.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.6.1"; hash = "sha256-G9Z/50Ycr4GxkyxV+a04JzOaAuvDEXO+2NcwiQx5TUo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.test.sdk/16.6.1/microsoft.net.test.sdk.16.6.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.0"; hash = "sha256-6faPQ4jaFY3OGGVk3lZKW+DEZaIOBZ/wHqbiDTsRR1k="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies/1.0.0/microsoft.netframework.referenceassemblies.1.0.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net45"; version = "1.0.0"; hash = "sha256-m5521kl7/G0DKFKOtQ9fzIhqPrpPR82r099m+UF06sY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies.net45/1.0.0/microsoft.netframework.referenceassemblies.net45.1.0.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.0"; hash = "sha256-LI/XnqGb0Dzs5A7ZK3uv3gJPh8c6vOvj7/jabgW2Ea8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies.net472/1.0.0/microsoft.netframework.referenceassemblies.net472.1.0.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.AzureRepos.Git"; version = "1.1.0-beta-20206-02"; hash = "sha256-xbwMpGdH9cr6ssddH10lg64jCR465IdDubb80RCUDgI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.azurerepos.git/1.1.0-beta-20206-02/microsoft.sourcelink.azurerepos.git.1.1.0-beta-20206-02.nupkg"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.1.0-beta-20206-02"; hash = "sha256-KdM3dDkuDQNUQyaBVyEyCCwnp/pZxMnYDXLsfhWYYOM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.common/1.1.0-beta-20206-02/microsoft.sourcelink.common.1.1.0-beta-20206-02.nupkg"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.1.0-beta-20206-02"; hash = "sha256-akWBI51ohB5mUp8ADBgukUsgwfMR3yR2sX93PqV8NWA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.github/1.1.0-beta-20206-02/microsoft.sourcelink.github.1.1.0-beta-20206-02.nupkg"; }) - (fetchNuGet { pname = "Microsoft.SymbolUploader.Build.Task"; version = "1.1.145102"; hash = "sha256-ou58zD57BfjtpalXM8Pced3l2MF7/4VmsOLOIR8Drdo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.symboluploader.build.task/1.1.145102/microsoft.symboluploader.build.task.1.1.145102.nupkg"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.SDK.EmbedInteropTypes"; version = "15.0.15"; hash = "sha256-7VYeONedZMDjHQiO9gl09WPI4iNdx9Q841ax/6keGTI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.sdk.embedinteroptypes/15.0.15/microsoft.visualstudio.sdk.embedinteroptypes.15.0.15.nupkg"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "1.16.30"; hash = "sha256-5IGlN0Nmp6887dxLgV0O3eFbXtertrU2xaztAToVApA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/1.16.30/microsoft.visualstudio.setup.configuration.interop.1.16.30.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Web.Xdt"; version = "3.0.0"; hash = "sha256-FhFSzVbgttYCtrqUcIVFN2VKGEz1J5DI8IzRB4FzcaE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.web.xdt/3.0.0/microsoft.web.xdt.3.0.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; hash = "sha256-B4t5El/ViBdxALMcpZulewc4j/3SIXf71HhJWhm4Ctk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.0.1/microsoft.win32.primitives.4.0.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; hash = "sha256-WMBXsIb0DgPFPaFkNVxY9b9vcMxPqtgFgijKYMJfV/0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.registry/4.5.0/microsoft.win32.registry.4.5.0.nupkg"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/netstandard.library/1.6.1/netstandard.library.1.6.1.nupkg"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.1"; hash = "sha256-lbR7rpS/EXgJ8TqQspuIIqAsiorrZb1oOK4HFw+QyPw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/newtonsoft.json/11.0.1/newtonsoft.json.11.0.1.nupkg"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/newtonsoft.json/9.0.1/newtonsoft.json.9.0.1.nupkg"; }) - (fetchNuGet { pname = "NuGet.Build.Tasks"; version = "5.9.1-rc.8"; hash = "sha256-5awutMHe2p6BwEFHqzA4mwK6l0y2dgkOXb/iNwpsIBg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.build.tasks/5.9.1-rc.8/nuget.build.tasks.5.9.1-rc.8.nupkg"; }) - (fetchNuGet { pname = "NuGet.Build.Tasks.Pack"; version = "5.9.1-rc.8"; hash = "sha256-kgrhybexqM5jKBY9/kKZeGWl3gsmjBzRD+fvYsJuE4M="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.build.tasks.pack/5.9.1-rc.8/nuget.build.tasks.pack.5.9.1-rc.8.nupkg"; }) - (fetchNuGet { pname = "NuGet.CommandLine"; version = "4.1.0"; hash = "sha256-QZPkNpa3+jClzVUikLkuZH2PEn2sdJdU520f2lgGMw4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/nuget.commandline/4.1.0/nuget.commandline.4.1.0.nupkg"; }) - (fetchNuGet { pname = "NuGet.Commands"; version = "5.9.1-rc.8"; hash = "sha256-mXIMDyviqUklhu+Kn3YybAJDWBKcaCy5oRzn2T6Lv2U="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.commands/5.9.1-rc.8/nuget.commands.5.9.1-rc.8.nupkg"; }) - (fetchNuGet { pname = "NuGet.Common"; version = "5.9.1-rc.8"; hash = "sha256-jCjfnYCpwZOXI8EpUNiNiymiwf/YaMGw+GbG7QgMyxQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/5.9.1-rc.8/nuget.common.5.9.1-rc.8.nupkg"; }) - (fetchNuGet { pname = "NuGet.Configuration"; version = "5.9.1-rc.8"; hash = "sha256-c0/Bwx37fVCbVBWa0E0qkW2CJsmsoxSDm+Y6DdyLG3U="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/5.9.1-rc.8/nuget.configuration.5.9.1-rc.8.nupkg"; }) - (fetchNuGet { pname = "NuGet.Credentials"; version = "5.9.1-rc.8"; hash = "sha256-27DsdfUd3o0FqlzXkeLc1Ubj0Uls7aP9CTe7TP7TG4k="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.credentials/5.9.1-rc.8/nuget.credentials.5.9.1-rc.8.nupkg"; }) - (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "5.9.1-rc.8"; hash = "sha256-7I1/82CJt8n2ohyvfEtCo9BvMRVPCXTJckaNH/RJKuE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/5.9.1-rc.8/nuget.dependencyresolver.core.5.9.1-rc.8.nupkg"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.9.1-rc.8"; hash = "sha256-O8JyP+V5HnLPR5JiwPX7tSCyxlYCHvl4I9ino226ddg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/5.9.1-rc.8/nuget.frameworks.5.9.1-rc.8.nupkg"; }) - (fetchNuGet { pname = "NuGet.LibraryModel"; version = "5.9.1-rc.8"; hash = "sha256-m+yi3s1QU0K8qWlulQ7t8VYjMFeWFqQmeoyTxIQgyGs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/5.9.1-rc.8/nuget.librarymodel.5.9.1-rc.8.nupkg"; }) - (fetchNuGet { pname = "NuGet.PackageManagement"; version = "5.9.1-rc.8"; hash = "sha256-75IKTQQyaeBTW8wE8w2vOaPGRC+r3JuS9R06ODBunVU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packagemanagement/5.9.1-rc.8/nuget.packagemanagement.5.9.1-rc.8.nupkg"; }) - (fetchNuGet { pname = "NuGet.Packaging"; version = "5.9.1-rc.8"; hash = "sha256-G2aab7v/ko3hOFIrs+FWRXaiHELKtvi6qMbaQM4eLHU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/5.9.1-rc.8/nuget.packaging.5.9.1-rc.8.nupkg"; }) - (fetchNuGet { pname = "NuGet.ProjectModel"; version = "5.9.1-rc.8"; hash = "sha256-+444VKy9NvmzFCV8Y7RlIu5kOOVDutkOm/YYwnU8UPY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/5.9.1-rc.8/nuget.projectmodel.5.9.1-rc.8.nupkg"; }) - (fetchNuGet { pname = "NuGet.Protocol"; version = "5.9.1-rc.8"; hash = "sha256-+DeBsU6oiK84o3vWvYMJMNTs9oQN+EUafxDiyNTv2eY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/5.9.1-rc.8/nuget.protocol.5.9.1-rc.8.nupkg"; }) - (fetchNuGet { pname = "NuGet.Resolver"; version = "5.9.1-rc.8"; hash = "sha256-m5hBLEceBDELGo2Bur8iySpvKP/zV8ytPz650sDDzWA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.resolver/5.9.1-rc.8/nuget.resolver.5.9.1-rc.8.nupkg"; }) - (fetchNuGet { pname = "NuGet.Versioning"; version = "5.9.1-rc.8"; hash = "sha256-e5u1mlhopshnwPbVoDh6hSwXLxzSVLl1FlPTKET4Z+8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/5.9.1-rc.8/nuget.versioning.5.9.1-rc.8.nupkg"; }) - (fetchNuGet { pname = "Perfolizer"; version = "0.2.1"; hash = "sha256-nllshKuHU+1jSBfcTz8BTJTGr1TeCFvxjM4OPyLGSgQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/perfolizer/0.2.1/perfolizer.0.2.1.nupkg"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; hash = "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.0.0/runtime.native.system.4.0.0.nupkg"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.io.compression/4.3.0/runtime.native.system.io.compression.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "Shouldly"; version = "3.0.0"; hash = "sha256-g9MPlQooO7NsDy92Tjss25yVvliU6VN6JohOlBBH4sE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/shouldly/3.0.0/shouldly.3.0.0.nupkg"; }) - (fetchNuGet { pname = "sn"; version = "1.0.0"; hash = "sha256-GoeLcHlpQEKLuGdd1e7D1oprNBkEGrRLGQJvwxpzIoA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/sn/1.0.0/sn.1.0.0.nupkg"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; hash = "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.appcontext/4.1.0/system.appcontext.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.appcontext/4.3.0/system.appcontext.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.3.0/system.buffers.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; hash = "sha256-KTxAhYawFG2V5VX1jw3pzx3IrQXRgn1TsvgjPgxAbqA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.4.0/system.buffers.4.4.0.nupkg"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.0"; hash = "sha256-THw2znu+KibfJRfD7cE3nRYHsm7Fyn5pjOOZVonFjvs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.5.0/system.buffers.4.5.0.nupkg"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.5.1/system.buffers.4.5.1.nupkg"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.0.11/system.collections.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.3.0/system.collections.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; hash = "sha256-zIEM7AB4SyE9u6G8+o+gCLLwkgi6+3rHQVPdn/dEwB8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.concurrent/4.0.12/system.collections.concurrent.4.0.12.nupkg"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.concurrent/4.3.0/system.collections.concurrent.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.2.0"; hash = "sha256-FQ3l+ulbLSPhQ0JcQCC4D4SzjTnHsRqcOj56Ywy7pMo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/1.2.0/system.collections.immutable.1.2.0.nupkg"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; hash = "sha256-BliqYlL9ntbMXo5d7NUrKXwYN+PqdyqDIS5bp4qVr7Q="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/1.5.0/system.collections.immutable.1.5.0.nupkg"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.0.1"; hash = "sha256-jdCVXmGOsJ+2F0xAagCkiMZ91SGAm9iOhO2u4ksmKaU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.nongeneric/4.0.1/system.collections.nongeneric.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.7.0"; hash = "sha256-rYjp/UmagI4ZULU1ocia/AiXxLNL8uhMV8LBF4QFW10="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.configuration.configurationmanager/4.7.0/system.configuration.configurationmanager.4.7.0.nupkg"; }) - (fetchNuGet { pname = "System.Console"; version = "4.0.0"; hash = "sha256-jtZfT/TpJtLisV/y5Mk3IfCpE79zwhBYXtyGP9jC3Xo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.console/4.0.0/system.console.4.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.console/4.3.0/system.console.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.diagnosticsource/4.3.0/system.diagnostics.diagnosticsource.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.FileVersionInfo"; version = "4.3.0"; hash = "sha256-JyqOf5/lsUNLMpIqK8XffcFTxB6vHWzGWHssmojokCQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.fileversioninfo/4.3.0/system.diagnostics.fileversioninfo.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.1.0"; hash = "sha256-OgW6ogQ+oYADYS0PHmwXdhrOKQJpqXlwzSvmfjTLNBg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.process/4.1.0/system.diagnostics.process.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.StackTrace"; version = "4.3.0"; hash = "sha256-Tfq7F61N0VfujVyI5A9MZvyWewQ5HepB1f1UMBMkUCs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.stacktrace/4.3.0/system.diagnostics.stacktrace.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tools/4.3.0/system.diagnostics.tools.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.0.0"; hash = "sha256-cCjdPU7ow91HGf1hBIOLJMQGO6pNmF+N+5/Z38XJh9U="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracesource/4.0.0/system.diagnostics.tracesource.4.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; hash = "sha256-JA0jJcLbU3zh52ub3zweob2EVHvxOqiC6SCYHrY5WbQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.1.0/system.diagnostics.tracing.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.dynamic.runtime/4.3.0/system.dynamic.runtime.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.0.11/system.globalization.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.3.0/system.globalization.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization.calendars/4.3.0/system.globalization.calendars.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.1.0/system.io.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.3.0/system.io.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.compression/4.3.0/system.io.compression.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.compression.zipfile/4.3.0/system.io.compression.zipfile.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem/4.0.1/system.io.filesystem.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.primitives/4.0.1/system.io.filesystem.primitives.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.1.0/system.linq.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.3.0/system.linq.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq.expressions/4.3.0/system.linq.expressions.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Management"; version = "4.5.0"; hash = "sha256-mcsEl3a95O3oPO260hL3lpiaYaJhFPoWSbEHYYfo5ac="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.management/4.5.0/system.management.4.5.0.nupkg"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.5.3/system.memory.4.5.3.nupkg"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.5.4/system.memory.4.5.4.nupkg"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.http/4.3.0/system.net.http.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.sockets/4.3.0/system.net.sockets.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; hash = "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.objectmodel/4.0.12/system.objectmodel.4.0.12.nupkg"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.objectmodel/4.3.0/system.objectmodel.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Private.DataContractSerialization"; version = "4.1.1"; hash = "sha256-OaE+ZcEfkpIkbdMOMAMiJa9vgiVP25FGuFrf+N/mafY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.datacontractserialization/4.1.1/system.private.datacontractserialization.4.1.1.nupkg"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.1.0/system.reflection.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.3.0/system.reflection.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit/4.0.1/system.reflection.emit.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit/4.3.0/system.reflection.emit.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.ilgeneration/4.0.1/system.reflection.emit.ilgeneration.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.0.1/system.reflection.emit.lightweight.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.3.0/system.reflection.emit.lightweight.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.extensions/4.0.1/system.reflection.extensions.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.extensions/4.3.0/system.reflection.extensions.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/1.6.0/system.reflection.metadata.1.6.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/5.0.0/system.reflection.metadata.5.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Resources.Extensions"; version = "4.6.0"; hash = "sha256-ErAPQRTkjRsica+h1mAFxMZbE4RrR9nH0/VB9mSCzEY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.extensions/4.6.0/system.resources.extensions.4.6.0.nupkg"; }) - (fetchNuGet { pname = "System.Resources.Reader"; version = "4.0.0"; hash = "sha256-NOax26EYc/L4bfedL2a33fg4sFXVkBwzVTQ41saJTsk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.reader/4.0.0/system.resources.reader.4.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.1.0/system.runtime.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.3.0/system.runtime.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; hash = "sha256-neARSpLPUzPxEKhJRwoBzhPxK+cKIitLx7WBYncsYgo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/5.0.0/system.runtime.compilerservices.unsafe.5.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; hash = "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices.runtimeinformation/4.0.0/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices.runtimeinformation/4.3.0/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.numerics/4.3.0/system.runtime.numerics.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.serialization.primitives/4.1.1/system.runtime.serialization.primitives.4.1.1.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Xml"; version = "4.1.1"; hash = "sha256-Mx/8hiqvp1E4I6ysJC3U8D2B9qhRQcVvEOivV6w65IQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.serialization.xml/4.1.1/system.runtime.serialization.xml.4.1.1.nupkg"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; hash = "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/4.5.0/system.security.accesscontrol.4.5.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.7.0"; hash = "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/4.7.0/system.security.accesscontrol.4.7.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.algorithms/4.3.0/system.security.cryptography.algorithms.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.encoding/4.3.0/system.security.cryptography.encoding.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.primitives/4.3.0/system.security.cryptography.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.x509certificates/4.3.0/system.security.cryptography.x509certificates.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "4.7.0"; hash = "sha256-BGgXMLUi5rxVmmChjIhcXUxisJjvlNToXlyaIbUxw40="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/4.7.0/system.security.permissions.4.7.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; hash = "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/4.5.0/system.security.principal.windows.4.5.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; hash = "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/4.7.0/system.security.principal.windows.4.7.0.nupkg"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.0.1"; hash = "sha256-wxtwWQSTv5tuFP79KhUAhaL6bL4d8lSzSWkCn9aolwM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.3.0"; hash = "sha256-ezYVwe9atRkREc8O/HT/VfGDE2vuCpIckOfdY194/VE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.3.0/system.text.encoding.codepages.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.0.11/system.text.encoding.extensions.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.0"; hash = "sha256-w3KhanXU1v+0uWZuLECd1oChvYeUrGhN5blk5WBco2k="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encodings.web/4.7.0/system.text.encodings.web.4.7.0.nupkg"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "4.7.0"; hash = "sha256-ubmcBH9pNdILnROdpGfnfo90WijLE6bUbKUypn3u4zo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/4.7.0/system.text.json.4.7.0.nupkg"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.regularexpressions/4.1.0/system.text.regularexpressions.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.regularexpressions/4.3.0/system.text.regularexpressions.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.0.11/system.threading.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.3.0/system.threading.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "4.9.0"; hash = "sha256-ZTZBJTrP5kzO38ec9lPxuNUYgEoeGNdQ8hF98uRN2rw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.dataflow/4.9.0/system.threading.tasks.dataflow.4.9.0.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.0.0/system.threading.tasks.extensions.4.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.3.0/system.threading.tasks.extensions.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.2"; hash = "sha256-EqJF9TppMHTKvpR6emrdA61zalMW3HwrZ7j6Bn4bBuo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.5.2/system.threading.tasks.extensions.4.5.2.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Parallel"; version = "4.0.1"; hash = "sha256-5VyRZ97Fug4reK/cQ6wsCrJ5jH53aGu1a4ZkKMZrnIQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.parallel/4.0.1/system.threading.tasks.parallel.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Parallel"; version = "4.3.0"; hash = "sha256-8H2vRmsn29MNfMmCeIL5vHfbM19jWaLDKNLzDonCI+c="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.parallel/4.3.0/system.threading.tasks.parallel.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Thread"; version = "4.0.0"; hash = "sha256-7EtSJuKqcW107FYA5Ko9NFXEWUPIzNDtlfKaQV2pvb8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.thread/4.0.0/system.threading.thread.4.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; hash = "sha256-pMs6RNFC3nQOGz9EqIcyWmO8YLaqay+q/Qde5hqPXXg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.thread/4.3.0/system.threading.thread.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; hash = "sha256-5lU6zt1O9JDSPr2KAHw4BYgysHnt0yyZrMNa5IIjxZY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.timer/4.0.1/system.threading.timer.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.timer/4.3.0/system.threading.timer.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.readerwriter/4.0.11/system.xml.readerwriter.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.readerwriter/4.3.0/system.xml.readerwriter.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xdocument/4.3.0/system.xml.xdocument.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.0.1"; hash = "sha256-gdoFrPo54v1LjkBF79f8EvtltVVjHz9ZI9kc5ve0GkY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xmldocument/4.0.1/system.xml.xmldocument.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; hash = "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xmldocument/4.3.0/system.xml.xmldocument.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.0.11"; hash = "sha256-v6x4d6W18dijG5cDqQmVHdtWRf6Y4OkdBolT3d5g3wY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xmlserializer/4.0.11/system.xml.xmlserializer.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Xml.XPath"; version = "4.3.0"; hash = "sha256-kd1JMqj6obhxzEPRJeYvcUyJqkOs/9A0UOQccC6oYrM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xpath/4.3.0/system.xml.xpath.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Xml.XPath.XDocument"; version = "4.3.0"; hash = "sha256-dqk4CWuwocj5qsUAYlS+XAe6GGcY/N/HIPEGe5afrPM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xpath.xdocument/4.3.0/system.xml.xpath.xdocument.4.3.0.nupkg"; }) - (fetchNuGet { pname = "vswhere"; version = "2.6.7"; hash = "sha256-kzMH9TNexExGSutkXHIWpydXgjlbd+L+H8Oca1Isk0A="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/vswhere/2.6.7/vswhere.2.6.7.nupkg"; }) - (fetchNuGet { pname = "XliffTasks"; version = "1.0.0-beta.20502.2"; hash = "sha256-ICnkCRBS+hsuFtwNPS7ux2ZQAttaAgCX/HTBzp5qY54="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/xlifftasks/1.0.0-beta.20502.2/xlifftasks.1.0.0-beta.20502.2.nupkg"; }) - (fetchNuGet { pname = "xunit"; version = "2.4.1"; hash = "sha256-QGDuE0ZnsxyEJONP8GcJ80PmPeb+OawwdSW8y72aw3U="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit/2.4.1/xunit.2.4.1.nupkg"; }) - (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; hash = "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.abstractions/2.0.3/xunit.abstractions.2.0.3.nupkg"; }) - (fetchNuGet { pname = "xunit.analyzers"; version = "0.10.0"; hash = "sha256-8lRZhogXHYksa9ChnkFXpBnTMlLlYIvu3Av7qQYWwJY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.analyzers/0.10.0/xunit.analyzers.0.10.0.nupkg"; }) - (fetchNuGet { pname = "xunit.assert"; version = "2.4.1"; hash = "sha256-hl1cMSakAlwkpFEchxCNMdvQie6PMJ1uFrhzgOC3vsY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.assert/2.4.1/xunit.assert.2.4.1.nupkg"; }) - (fetchNuGet { pname = "xunit.core"; version = "2.4.1"; hash = "sha256-KgUgAIJIPHQ5VQ4FiB+i5u2JXSYxmvMCV8zXP4kcy9o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.core/2.4.1/xunit.core.2.4.1.nupkg"; }) - (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.1"; hash = "sha256-oACVOrvF4XmKFr+8ZqPVpjbopZgeRwaXveJGW2XUeIA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.extensibility.core/2.4.1/xunit.extensibility.core.2.4.1.nupkg"; }) - (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.1"; hash = "sha256-KmKEdgsUq4zuQJ2saJA0YT1CIZ2AuhZL5V7cF2Cncd0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.extensibility.execution/2.4.1/xunit.extensibility.execution.2.4.1.nupkg"; }) - (fetchNuGet { pname = "xunit.runner.console"; version = "2.4.1"; hash = "sha256-I/C0ntv+W+j4VU5/QxejkJSbuWvbL4MJ6+J8aFX6048="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.runner.console/2.4.1/xunit.runner.console.2.4.1.nupkg"; }) - (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.3"; hash = "sha256-42axn0yDDiJWKV8UEYzYWgiKbpc6mHh9M/eeylYGLUg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.runner.visualstudio/2.4.3/xunit.runner.visualstudio.2.4.3.nupkg"; }) -] diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 092f8efe785c..9c642123ee4d 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Tool that helps simplify the build process for developing projects across multiple platforms"; homepage = "https://wiki.qt.io/Qbs"; license = licenses.lgpl3; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix deleted file mode 100644 index 22841cb20d17..000000000000 --- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv, lib, python3, fetchFromGitHub, which, coreutils -, perl, installShellFiles, gnumake42 -, doCheck ? true -}: stdenv.mkDerivation rec { - - pname = "redo-apenwarr"; - version = "0.42d"; - - src = fetchFromGitHub rec { - owner = "apenwarr"; - repo = "redo"; - rev = "${repo}-${version}"; - sha256 = "/QIMXpVhVLAIJa3LiOlRKzbUztIWZygkWZUKN4Nrh+M="; - }; - - postPatch = '' - - patchShebangs minimal/do - - '' + lib.optionalString doCheck '' - unset CC CXX - - substituteInPlace minimal/do.test \ - --replace "/bin/pwd" "${coreutils}/bin/pwd" - - substituteInPlace t/105-sympath/all.do \ - --replace "/bin/pwd" "${coreutils}/bin/pwd" - - substituteInPlace t/all.do \ - --replace "/bin/ls" "ls" - - substituteInPlace t/110-compile/hello.o.do \ - --replace "/usr/include" "${lib.getDev stdenv.cc.libc}/include" - - substituteInPlace t/200-shell/nonshelltest.do \ - --replace "/usr/bin/env perl" "${perl}/bin/perl" - - ''; - - inherit doCheck; - - checkTarget = "test"; - - outputs = [ "out" "man" ]; - - installFlags = [ - "PREFIX=$(out)" - "DESTDIR=/" - ]; - - nativeBuildInputs = [ - python3 - (with python3.pkgs; [ beautifulsoup4 markdown ]) - which - installShellFiles - gnumake42 # fails with make 4.4 - ]; - - postInstall = '' - installShellCompletion --bash contrib/bash_completion.d/redo - ''; - - meta = with lib; { - description = "Smaller, easier, more powerful, and more reliable than make. An implementation of djb's redo"; - homepage = "https://github.com/apenwarr/redo"; - maintainers = with maintainers; [ - andrewchambers - ck3d - ]; - license = licenses.asl20; - platforms = python3.meta.platforms; - }; -} diff --git a/pkgs/development/tools/build-managers/redo-c/Makefile b/pkgs/development/tools/build-managers/redo-c/Makefile deleted file mode 100644 index 5a1dd74c5b84..000000000000 --- a/pkgs/development/tools/build-managers/redo-c/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -CFLAGS ?= -Os - -all: redo links - -links: - sh links.do - -install: - mkdir -p "$(out)/bin" - cp --no-dereference redo redo-* "$(out)/bin" diff --git a/pkgs/development/tools/build-managers/redo-c/default.nix b/pkgs/development/tools/build-managers/redo-c/default.nix deleted file mode 100644 index ffa93b0d7dcb..000000000000 --- a/pkgs/development/tools/build-managers/redo-c/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { - pname = "redo-c"; - version = "0.3"; - - src = fetchFromGitHub { - owner = "leahneukirchen"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-oZcaBgESIaD7/SUBE7luh7axucKTEzXPVkQAQs2NCXE="; - }; - - postPatch = '' - cp '${./Makefile}' Makefile - ''; - - meta = with lib; { - description = "Implementation of the redo build system in portable C with zero dependencies"; - homepage = "https://github.com/leahneukirchen/redo-c"; - license = licenses.cc0; - platforms = platforms.all; - maintainers = with maintainers; [ ck3d ]; - }; -} diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix deleted file mode 100644 index 67dd66d8eeee..000000000000 --- a/pkgs/development/tools/build-managers/redo-sh/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, coreutils }: - -stdenv.mkDerivation { - version = "4.0.4"; - pname = "redo-sh"; - - src = fetchurl { - url = "http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz"; - sha256 = "0d3hz3vy5qmjr9r4f8a5cx9hikpzs8h8f0fsl3dpbialf4wck24g"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - sourceRoot = "."; - installPhase = '' - mkdir -p "$out/share" - mv man "$out/share" - mv bin "$out" - for p in $out/bin/*; do - wrapProgram "$p" --prefix PATH : "$out/bin:${coreutils}/bin" - done - ''; - - meta = with lib; { - description = "Redo implementation in Bourne Shell"; - homepage = "http://news.dieweltistgarnichtso.net/bin/redo-sh.html"; - license = licenses.agpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ sternenseemann ]; - }; -} diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/pkgs/development/tools/build-managers/redo/default.nix deleted file mode 100644 index e6a68c4215c3..000000000000 --- a/pkgs/development/tools/build-managers/redo/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{lib, stdenv, fetchFromGitHub, perl }: - -stdenv.mkDerivation rec { - pname = "redo"; - version = "1.4"; - src = fetchFromGitHub { - owner = "jdebp"; - repo = "redo"; - rev = "91f5462339ef6373f9ac80902cfae2b614e2902b"; - hash = "sha256-cA8UN4aQnJ8VyMW3mDOIPna4Ucw1kp8CirZTDhSoCpU="; - }; - - nativeBuildInputs = [ perl /* for pod2man */ ]; - - buildPhase = '' - package/compile - ''; - installPhase = '' - package/export $out/ - ''; - - meta = { - homepage = "https://jdebp.eu./Softwares/redo/"; - description = "System for building target files from source files"; - license = lib.licenses.bsd2; - maintainers = [ ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix deleted file mode 100644 index 886034e4a270..000000000000 --- a/pkgs/development/tools/build-managers/remake/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, readline -, guileSupport ? false -, guile -}: - -stdenv.mkDerivation rec { - pname = "remake"; - remakeVersion = "4.3"; - dbgVersion = "1.6"; - version = "${remakeVersion}+dbg-${dbgVersion}"; - - src = fetchurl { - url = "mirror://sourceforge/project/bashdb/remake/${version}/remake-${remakeVersion}+dbg-${dbgVersion}.tar.gz"; - sha256 = "11vvch8bi0yhjfz7gn92b3xmmm0cgi3qfiyhbnnj89frkhbwd87n"; - }; - - patches = [ - ./glibc-2.27-glob.patch - ]; - - nativeBuildInputs = [ - pkg-config - ]; - buildInputs = [ readline ] - ++ lib.optionals guileSupport [ guile ]; - - # make check fails, see https://github.com/rocky/remake/issues/117 - - meta = { - homepage = "https://bashdb.sourceforge.net/remake/"; - license = lib.licenses.gpl3Plus; - description = "GNU Make with comprehensible tracing and a debugger"; - mainProgram = "remake"; - platforms = with lib.platforms; linux ++ darwin; - maintainers = with lib.maintainers; [ bjornfor shamilton ]; - }; -} diff --git a/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch b/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch deleted file mode 100644 index ef876e2fb237..000000000000 --- a/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/glob/glob.c b/glob/glob.c -index f3911bcd861..6cb76e8e162 100644 ---- a/glob/glob.c -+++ b/glob/glob.c -@@ -208,29 +208,8 @@ my_realloc (p, n) - #endif /* __GNU_LIBRARY__ || __DJGPP__ */ - - --#if !defined __alloca && !defined __GNU_LIBRARY__ -- --# ifdef __GNUC__ --# undef alloca --# define alloca(n) __builtin_alloca (n) --# else /* Not GCC. */ --# ifdef HAVE_ALLOCA_H --# include <alloca.h> --# else /* Not HAVE_ALLOCA_H. */ --# ifndef _AIX --# ifdef WINDOWS32 --# include <malloc.h> --# else --extern char *alloca (); --# endif /* WINDOWS32 */ --# endif /* Not _AIX. */ --# endif /* sparc or HAVE_ALLOCA_H. */ --# endif /* GCC. */ -- - # define __alloca alloca - --#endif -- - #ifndef __GNU_LIBRARY__ - # define __stat stat - # ifdef STAT_MACROS_BROKEN diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix deleted file mode 100644 index 7c44671a3b44..000000000000 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk, writeScript -, common-updater-scripts, cacert, git, nixfmt-classic, nix, jq, coreutils -, gnused }: - -stdenv.mkDerivation rec { - pname = "sbt-extras"; - rev = "ed4bce34420650fbc06cc161f1960b539f19289d"; - version = "2024-07-10"; - - src = fetchFromGitHub { - owner = "paulp"; - repo = "sbt-extras"; - inherit rev; - sha256 = "lsYFupTSZQe2id0wuy+E7lszG4IT3R6fuo+Yql91MkM="; - }; - - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - - substituteInPlace bin/sbt --replace 'declare java_cmd="java"' 'declare java_cmd="${jdk}/bin/java"' - - install bin/sbt $out/bin - - wrapProgram $out/bin/sbt --prefix PATH : ${lib.makeBinPath [ which curl ]} - - runHook postInstall - ''; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/sbt -h >/dev/null - ''; - - passthru.updateScript = writeScript "update.sh" '' - #!${stdenv.shell} - set -xo errexit - PATH=${ - lib.makeBinPath [ - common-updater-scripts - curl - cacert - git - nixfmt-classic - nix - jq - coreutils - gnused - ] - } - oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" - latestSha="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')" - if [ ! "null" = "$latestSha" ]; then - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix" - latestDate="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits/$latestSha | jq '.commit.committer.date' | sed 's|"\(.*\)T.*|\1|g')" - update-source-version ${pname} "$latestSha" --version-key=rev - update-source-version ${pname} "$latestDate" --ignore-same-hash - nixfmt "$default_nix" - else - echo "${pname} is already up-to-date" - fi - ''; - - meta = { - description = - "A more featureful runner for sbt, the simple/scala/standard build tool"; - homepage = "https://github.com/paulp/sbt-extras"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ nequissimus puffnfresh ]; - mainProgram = "sbt"; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 3977d5b18441..8b6f3335962e 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -9,20 +9,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "sbt"; - version = "1.10.1"; + version = "1.10.2"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz"; - hash = "sha256-R/6YzpSY7kbmnyJnLzwSI0y+fnGedkQQoT5YtyXWWfM="; + hash = "sha256-pxbdAYvWi8epWi3RAzdmOqdvRDrWyZ3qvl6t0a38djk="; }; postPatch = '' echo -java-home ${jre.home} >>conf/sbtopts ''; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc # libstdc++.so.6 zlib ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { cp -ra . $out/share/sbt ln -sT ../share/sbt/bin/sbt $out/bin/sbt ln -sT ../share/sbt/bin/sbtn-${ - if (stdenv.isDarwin) then "universal-apple-darwin" + if (stdenv.hostPlatform.isDarwin) then "universal-apple-darwin" else if (stdenv.hostPlatform.isAarch64) then "aarch64-pc-linux" else "x86_64-pc-linux" } $out/bin/sbtn diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix index 5e2058899393..3a0eb79b2430 100644 --- a/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { inherit pname version; nativeBuildInputs = [ installShellFiles makeWrapper ] - ++ lib.optional stdenv.isLinux autoPatchelfHook; + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; buildInputs = assert lib.assertMsg (lib.versionAtLeast jre.version "17.0.0") '' scala-cli requires Java 17 or newer, but ${jre.name} is ${jre.version} @@ -54,7 +54,7 @@ stdenv.mkDerivation { # We need to call autopatchelf before generating completions dontAutoPatchelf = true; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' autoPatchelf $out '' + '' # hack to ensure the completion function looks right diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index de1dd7c0f4d0..75e494e5cfd7 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.5.0", + "version": "1.5.1", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "1samfkiw4rgfw36sqd85nrn0v050jy9mca3qvn46wfxczrf3sjvj" + "sha256": "0cb7g5vzwbdcyndfg6i8aavmvxis444sz5kza228cyj9w4ydffv6" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "02zpqffprf1hf68jhr9h7panqr110ip0fyv42lgqpj6rbhlxi371" + "sha256": "0kmz4nxpcn7ms60d28xjx5h1af8ygibw89mip7mcbmrcapbm3kcv" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1lfrcz2khabyww52ji03p034k3h6zrmgzxgy1zw78r5z2s984w4f" + "sha256": "1v7sah8fs87vq5a10812l78prkn34bwbrywfjqsv5180hzlpck3w" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "15rlzgg2innaifixwqy4w2lxg2ab9pi11s2fx1c053ylhbbbz3v1" + "sha256": "0rj75q3nmh7wry7apii5yirxdsgrq1lhwmylakck1gn9wqnbc53s" } } } diff --git a/pkgs/development/tools/build-managers/turtle-build/default.nix b/pkgs/development/tools/build-managers/turtle-build/default.nix deleted file mode 100644 index e1fbd6bf1261..000000000000 --- a/pkgs/development/tools/build-managers/turtle-build/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "turtle-build"; - version = "0.4.8"; - - src = fetchFromGitHub { - owner = "raviqqe"; - repo = "turtle-build"; - rev = "v${version}"; - hash = "sha256-PDpiLPMyBZzj2nBy76cSC4ab/kyaoZC/Gd2HSaRVHUM="; - }; - - cargoHash = "sha256-Z9PCnFrUgvF9anfShfU9U7iYISDpzAuJudLq/wN4ONU="; - - meta = with lib; { - description = "Ninja-compatible build system for high-level programming languages written in Rust"; - homepage = "https://github.com/raviqqe/turtle-build"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "turtle"; - }; -} diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix index 184c038beae4..537509a83b31 100644 --- a/pkgs/development/tools/build-managers/xmake/default.nix +++ b/pkgs/development/tools/build-managers/xmake/default.nix @@ -1,48 +1,32 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, lua -, readline -, ncurses -, lz4 -, tbox -, xmake-core-sv +{ + lib, + stdenv, + fetchurl, + fetchpatch, + CoreServices, + nix-update-script, }: - stdenv.mkDerivation rec { pname = "xmake"; - version = "2.9.4"; - + version = "2.9.6"; src = fetchurl { url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; - hash = "sha256-deLd4r0qSKMymJuAGuZQd8RS1JH+xRep2yeoHIcTzcU="; + hash = "sha256-R/bvywD5DJigLDlflztNVb3TqP5FJnbc5XtVwFV1loY="; }; - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - lua - lua.pkgs.cjson - readline - ncurses - lz4 - tbox - xmake-core-sv - ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreServices; - strictDeps = true; - - configureFlags = [ "--external=y" ]; + passthru = { + updateScript = nix-update-script { }; + }; meta = with lib; { description = "Cross-platform build utility based on Lua"; homepage = "https://xmake.io"; license = licenses.asl20; - platforms = lua.meta.platforms; - maintainers = with maintainers; [ rewine ]; + maintainers = with maintainers; [ + rewine + rennsax + ]; }; } - diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index c242ab3b4ff3..c41de9d2b4b1 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.37.2"; + version = "1.37.3"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - hash = "sha256-ZZa/83Ut2+obDsh/t8/G6gUAfnBEohXeIQxC8yCQzHs="; + hash = "sha256-YYmgxlW80y6HOlRQbG3N+wTZM5pB58ZzZHEOa6vWbRw="; }; outputs = [ "out" "man" ]; @@ -36,7 +36,7 @@ buildGoModule rec { buildInputs = [ gpgme - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ btrfs-progs libapparmor libseccomp diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix index 60670791827d..1b27c4899715 100644 --- a/pkgs/development/tools/buildah/wrapper.nix +++ b/pkgs/development/tools/buildah/wrapper.nix @@ -19,7 +19,7 @@ let binPath = lib.makeBinPath ([ - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ runc crun conmon @@ -34,7 +34,7 @@ let # this only works for some binaries, others may need to be added to `binPath` or in the modules paths = [ - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ aardvark-dns netavark passt diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix deleted file mode 100644 index bddb8432109d..000000000000 --- a/pkgs/development/tools/buildkit/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "buildkit"; - version = "0.16.0"; - - src = fetchFromGitHub { - owner = "moby"; - repo = "buildkit"; - rev = "v${version}"; - hash = "sha256-rAl2lPcm4JSRO9xVrZctGpWoi/JNZ5uUHDIZKd70+M8="; - }; - - vendorHash = null; - - subPackages = [ "cmd/buildctl" ] ++ lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; - - ldflags = [ "-s" "-w" "-X github.com/moby/buildkit/version.Version=${version}" "-X github.com/moby/buildkit/version.Revision=${src.rev}" ]; - - doCheck = false; - - meta = { - description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit"; - homepage = "https://github.com/moby/buildkit"; - changelog = "https://github.com/moby/buildkit/releases/tag/v${version}"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ developer-guy vdemeester ]; - mainProgram = "buildctl"; - }; -} diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix deleted file mode 100644 index 31a4c70bd68f..000000000000 --- a/pkgs/development/tools/buildpack/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "pack"; - version = "0.35.1"; - - src = fetchFromGitHub { - owner = "buildpacks"; - repo = pname; - rev = "v${version}"; - hash = "sha256-iQkYtnobhAt73JMRrejk0DkOH1ZW2bqfZx05ZrDG5bA="; - }; - - vendorHash = "sha256-gp6Hd0MZxtUX0yYshFIGwrm6yY2pdSOtUs6xmzXBqc4="; - - nativeBuildInputs = [ installShellFiles ]; - - subPackages = [ "cmd/pack" ]; - - ldflags = [ "-s" "-w" "-X github.com/buildpacks/pack.Version=${version}" ]; - - postInstall = '' - installShellCompletion --cmd pack \ - --zsh $(PACK_HOME=$PWD $out/bin/pack completion --shell zsh) \ - --bash $(PACK_HOME=$PWD $out/bin/pack completion --shell bash) \ - --fish $(PACK_HOME=$PWD $out/bin/pack completion --shell fish) - ''; - - meta = with lib; { - homepage = "https://buildpacks.io/"; - changelog = "https://github.com/buildpacks/pack/releases/tag/v${version}"; - description = "CLI for building apps using Cloud Native Buildpacks"; - mainProgram = "pack"; - license = licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/development/tools/bundletool/default.nix deleted file mode 100644 index 0a7629958227..000000000000 --- a/pkgs/development/tools/bundletool/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre_headless }: - -stdenvNoCC.mkDerivation rec { - pname = "bundletool"; - version = "1.17.1"; - - src = fetchurl { - url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar"; - sha256 = "sha256-RYgerRM4iHLYLEJVsZVIi3/DPyysWpqXewr8XpI2dZI="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ makeBinaryWrapper ]; - - installPhase = '' - runHook preInstall - makeWrapper ${jre_headless}/bin/java $out/bin/bundletool --add-flags "-jar $src" - runHook postInstall - ''; - - meta = with lib; { - description = "Command-line tool to manipulate Android App Bundles"; - mainProgram = "bundletool"; - homepage = "https://developer.android.com/studio/command-line/bundletool"; - changelog = "https://github.com/google/bundletool/releases/tag/${version}"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - 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 deleted file mode 100644 index 35fc322b0567..000000000000 --- a/pkgs/development/tools/bunyan-rs/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ rustPlatform -, fetchFromGitHub -, lib -}: - -rustPlatform.buildRustPackage rec { - pname = "bunyan-rs"; - version = "0.1.9"; - - src = fetchFromGitHub { - owner = "LukeMathWalker"; - repo = "bunyan"; - rev = "v${version}"; - sha256 = "sha256-dqhZIwxWBMXS2RgE8YynYrESVyAOIJ9ujAKcp2tDhvA="; - }; - - cargoHash = "sha256-sQ6f8BHGsPFPchFDjNlZimnu9i99SGYf5bYfM1/2Gac="; - - meta = with lib; { - description = "CLI to pretty print logs in bunyan format (Rust port of the original JavaScript bunyan CLI)"; - homepage = "https://github.com/LukeMathWalker/bunyan"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ netcrns ]; - mainProgram = "bunyan"; - }; -} diff --git a/pkgs/development/tools/butane/default.nix b/pkgs/development/tools/butane/default.nix deleted file mode 100644 index 01ba6089364e..000000000000 --- a/pkgs/development/tools/butane/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: - -buildGoModule rec { - pname = "butane"; - version = "0.21.0"; - - src = fetchFromGitHub { - owner = "coreos"; - repo = "butane"; - rev = "v${version}"; - hash = "sha256-KsI+mt7nJHwrq0+GPNcI79jRy/4WEjHp2/egw0PcRLM="; - }; - - vendorHash = null; - - doCheck = false; - - subPackages = [ "internal" ]; - - ldflags = [ - "-X github.com/coreos/butane/internal/version.Raw=v${version}" - ]; - - postInstall = '' - mv $out/bin/{internal,butane} - ''; - - meta = with lib; { - description = "Translates human-readable Butane configs into machine-readable Ignition configs"; - mainProgram = "butane"; - license = licenses.asl20; - homepage = "https://github.com/coreos/butane"; - maintainers = with maintainers; [ elijahcaine ruuda ]; - }; -} diff --git a/pkgs/development/tools/cambalache/default.nix b/pkgs/development/tools/cambalache/default.nix deleted file mode 100644 index 6af8672e03e3..000000000000 --- a/pkgs/development/tools/cambalache/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ lib -, fetchFromGitLab -, python3 -, meson -, ninja -, pkg-config -, gobject-introspection -, desktop-file-utils -, shared-mime-info -, wrapGAppsHook4 -, glib -, gtk3 -, gtk4 -, gtksourceview5 -, libadwaita -, libhandy -, webkitgtk_4_1 -, webkitgtk_6_0 -, nix-update-script -}: - -python3.pkgs.buildPythonApplication rec { - pname = "cambalache"; - version = "0.90.4"; - - format = "other"; - - # Did not fetch submodule since it is only for tests we don't run. - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "jpu"; - repo = "cambalache"; - rev = version; - hash = "sha256-XS6JBJuifmN2ElCGk5hITbotZ+fqEdjopL6VqmMP2y4="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection # for setup hook - desktop-file-utils # for update-desktop-database - shared-mime-info # for update-mime-database - wrapGAppsHook4 - ]; - - pythonPath = with python3.pkgs; [ - pygobject3 - lxml - ]; - - buildInputs = [ - glib - gtk3 - gtk4 - gtksourceview5 - webkitgtk_4_1 - webkitgtk_6_0 - # For extra widgets support. - libadwaita - libhandy - ]; - - # Prevent double wrapping. - dontWrapGApps = true; - - postPatch = '' - patchShebangs postinstall.py - # those programs are used at runtime not build time - # https://gitlab.gnome.org/jpu/cambalache/-/blob/0.12.1/meson.build#L79-80 - substituteInPlace ./meson.build \ - --replace-fail "find_program('broadwayd', required: true)" "" \ - --replace-fail "find_program('gtk4-broadwayd', required: true)" "" - ''; - - preFixup = '' - # Let python wrapper use GNOME flags. - makeWrapperArgs+=( - # For broadway daemons - --prefix PATH : "${lib.makeBinPath [ gtk3 gtk4 ]}" - "''${gappsWrapperArgs[@]}" - ) - ''; - - postFixup = '' - # Wrap a helper script in an unusual location. - wrapPythonProgramsIn "$out/${python3.sitePackages}/cambalache/priv/merengue" "$out $pythonPath" - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/jpu/cambalache"; - description = "RAD tool for GTK 4 and 3 with data model first philosophy"; - mainProgram = "cambalache"; - maintainers = teams.gnome.members; - license = with licenses; [ - lgpl21Only # Cambalache - gpl2Only # tools - ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/capnproto-java/default.nix b/pkgs/development/tools/capnproto-java/default.nix deleted file mode 100644 index 73c068543fb3..000000000000 --- a/pkgs/development/tools/capnproto-java/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, capnproto, pkg-config }: - -stdenv.mkDerivation rec { - pname = "capnproto-java"; - version = "0.1.16"; - - src = fetchFromGitHub { - owner = "capnproto"; - repo = pname; - rev = "v${version}"; - hash = "sha256-7uYtRHKsJvbE1b0HbNXGbRXpkUHHLjMDIWLlOUcQWDk="; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ capnproto ]; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - meta = with lib; { - description = "Cap'n Proto codegen plugin for Java"; - mainProgram = "capnpc-java"; - longDescription = "Only includes compiler plugin, the Java runtime/library that the generated code will link to must be built separately with Maven."; - homepage = "https://dwrensha.github.io/capnproto-java/index.html"; - license = licenses.mit; - maintainers = with maintainers; [ bhipple solson ]; - }; -} diff --git a/pkgs/development/tools/capnproto-rust/default.nix b/pkgs/development/tools/capnproto-rust/default.nix deleted file mode 100644 index e63cca6a5e90..000000000000 --- a/pkgs/development/tools/capnproto-rust/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, fetchCrate -, rustPlatform -, capnproto -}: - -rustPlatform.buildRustPackage rec { - pname = "capnproto-rust"; - version = "0.17.2"; - - src = fetchCrate { - crateName = "capnpc"; - inherit version; - hash = "sha256-WVjXVLVoTCAtA8a6+zaX4itAaPCWb2c0trtSsxBopO4="; - }; - - cargoHash = "sha256-h9YArxHnY14T8eQCS4JVItjaCjv+2dorcOVBir7r6SY="; - - postInstall = '' - mkdir -p $out/include/capnp - cp rust.capnp $out/include/capnp - ''; - - nativeCheckInputs = [ - capnproto - ]; - - meta = with lib; { - description = "Cap'n Proto codegen plugin for Rust"; - homepage = "https://github.com/capnproto/capnproto-rust"; - license = licenses.mit; - maintainers = with maintainers; [ mikroskeem solson ]; - }; -} diff --git a/pkgs/development/tools/carto/default.nix b/pkgs/development/tools/carto/default.nix deleted file mode 100644 index f48244111a84..000000000000 --- a/pkgs/development/tools/carto/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "carto"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "mapbox"; - repo = "carto"; - rev = "v${version}"; - hash = "sha256-TylMgb2EI52uFmVeMJiQltgNCSh6MutFwUjsYC7gfEA="; - }; - - npmDepsHash = "sha256-8M9hze71bQWhyxcXeI/EOr0SQ+tx8Lb9LfvnGxYYo0A="; - - dontNpmBuild = true; - - meta = { - changelog = "https://github.com/mapbox/carto/blob/${src.rev}/CHANGELOG.md"; - description = "Mapnik stylesheet compiler"; - homepage = "https://github.com/mapbox/carto"; - license = lib.licenses.asl20; - mainProgram = "carto"; - maintainers = with lib.maintainers; [ Luflosi ]; - }; -} diff --git a/pkgs/development/tools/cbfmt/default.nix b/pkgs/development/tools/cbfmt/default.nix deleted file mode 100644 index 099a2a7f9f87..000000000000 --- a/pkgs/development/tools/cbfmt/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub, testers, cbfmt }: - -rustPlatform.buildRustPackage rec { - pname = "cbfmt"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "lukas-reineke"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-/ZvL1ZHXcmE1n+hHvJeSqmnI9nSHJ+zM9lLNx0VQfIE="; - }; - - cargoHash = "sha256-6oZCpjQ8t/QLFhEtF7td8KGI/kFE04pg7OELutsrJKo="; - - passthru.tests.version = testers.testVersion { - package = cbfmt; - }; - - meta = with lib; { - description = "Tool to format codeblocks inside markdown and org documents"; - mainProgram = "cbfmt"; - homepage = "https://github.com/lukas-reineke/cbfmt"; - license = licenses.mit; - maintainers = [ maintainers.stehessel ]; - }; -} diff --git a/pkgs/development/tools/cdecrypt/default.nix b/pkgs/development/tools/cdecrypt/default.nix deleted file mode 100644 index 4965eb31e98c..000000000000 --- a/pkgs/development/tools/cdecrypt/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "cdecrypt"; - version = "4.8"; - - src = fetchFromGitHub { - owner = "VitaSmith"; - repo = "cdecrypt"; - rev = "refs/tags/v${version}"; - hash = "sha256-PyT60RDyp1/Co/7WHC0+KrsnrDeTJ605x1pt4OmlGYg="; - }; - - installPhase = '' - install -Dm755 cdecrypt $out/bin/cdecrypt - ''; - - meta = with lib; { - description = "Utility that decrypts Wii U NUS content files"; - mainProgram = "cdecrypt"; - homepage = "https://github.com/VitaSmith/cdecrypt"; - changelog = "https://github.com/VitaSmith/cdecrypt/releases/tag/v${version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ hughobrien ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/tools/cfn-nag/Gemfile b/pkgs/development/tools/cfn-nag/Gemfile deleted file mode 100644 index 5ccc66872d41..000000000000 --- a/pkgs/development/tools/cfn-nag/Gemfile +++ /dev/null @@ -1,2 +0,0 @@ -source 'https://rubygems.org' -gem 'cfn-nag' diff --git a/pkgs/development/tools/cfn-nag/Gemfile.lock b/pkgs/development/tools/cfn-nag/Gemfile.lock deleted file mode 100644 index 86bfdad86108..000000000000 --- a/pkgs/development/tools/cfn-nag/Gemfile.lock +++ /dev/null @@ -1,51 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - aws-eventstream (1.2.0) - aws-partitions (1.568.0) - aws-sdk-core (3.130.0) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) - aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.55.0) - aws-sdk-core (~> 3, >= 3.127.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.113.0) - aws-sdk-core (~> 3, >= 3.127.0) - aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.4.0) - aws-eventstream (~> 1, >= 1.0.2) - cfn-model (0.6.6) - kwalify (= 0.7.2) - psych (~> 3) - cfn-nag (0.8.9) - aws-sdk-s3 (~> 1.76) - cfn-model (= 0.6.6) - lightly (~> 0.3.2) - logging (~> 2.2.2) - netaddr (~> 2.0.4) - optimist (~> 3.0.0) - rexml - jmespath (1.6.1) - kwalify (0.7.2) - lightly (0.3.3) - little-plugger (1.1.4) - logging (2.2.2) - little-plugger (~> 1.1) - multi_json (~> 1.10) - multi_json (1.15.0) - netaddr (2.0.5) - optimist (3.0.1) - psych (3.3.2) - rexml (3.2.5) - -PLATFORMS - ruby - -DEPENDENCIES - cfn-nag - -BUNDLED WITH - 2.2.28 diff --git a/pkgs/development/tools/cfn-nag/default.nix b/pkgs/development/tools/cfn-nag/default.nix deleted file mode 100644 index 8438607102c3..000000000000 --- a/pkgs/development/tools/cfn-nag/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, bundlerEnv, bundlerUpdateScript, ruby }: - -bundlerEnv { - pname = "cfn-nag"; - version = "0.8.9"; - - inherit ruby; - gemdir = ./.; - - passthru.updateScript = bundlerUpdateScript "cfn-nag"; - - meta = with lib; { - description = "Linting tool for CloudFormation templates"; - homepage = "https://github.com/stelligent/cfn_nag"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/cfn-nag/gemset.nix b/pkgs/development/tools/cfn-nag/gemset.nix deleted file mode 100644 index e2e39f7a8137..000000000000 --- a/pkgs/development/tools/cfn-nag/gemset.nix +++ /dev/null @@ -1,189 +0,0 @@ -{ - aws-eventstream = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-partitions = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ap27g6hxcczpb5dj7v0wzxrvywfa2kf3zx69xnjz1qvxf3plw54"; - type = "gem"; - }; - version = "1.568.0"; - }; - aws-sdk-core = { - dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "14ymvp06k46gvkpvz5zaqvbvr6wd8vdka5iq25q0wd0fzdx7aivm"; - type = "gem"; - }; - version = "3.130.0"; - }; - aws-sdk-kms = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fmpdll52ng1kfn4r5ndcyppn5553qvvxw87w58m9n70ga3avasi"; - type = "gem"; - }; - version = "1.55.0"; - }; - aws-sdk-s3 = { - dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0iafjly868kdzmpxkv1ndmqm524ik36ibs15mqh145vw32gz7bax"; - type = "gem"; - }; - version = "1.113.0"; - }; - aws-sigv4 = { - dependencies = ["aws-eventstream"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa"; - type = "gem"; - }; - version = "1.4.0"; - }; - cfn-model = { - dependencies = ["kwalify" "psych"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1b3ix36yfnfwyxb4w9ss8a7nc6w15m1wbj3q8rarsqjrs3xj6wjs"; - type = "gem"; - }; - version = "0.6.6"; - }; - cfn-nag = { - dependencies = ["aws-sdk-s3" "cfn-model" "lightly" "logging" "netaddr" "optimist" "rexml"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "14qlnflxx5chjvda9n2ka2axcfcjbmn9h00cija8k7kvpy1dgqga"; - type = "gem"; - }; - version = "0.8.9"; - }; - jmespath = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; - type = "gem"; - }; - version = "1.6.1"; - }; - kwalify = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ngxg3ysq5vip9dn3d32ajc7ly61kdin86hfycm1hkrcvkkn1vjf"; - type = "gem"; - }; - version = "0.7.2"; - }; - lightly = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sgj2r6j7qxb9vqzkx5isjbphi38rplk4h8838am0cjcpq5h3jb3"; - type = "gem"; - }; - version = "0.3.3"; - }; - little-plugger = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; - type = "gem"; - }; - version = "1.1.4"; - }; - logging = { - dependencies = ["little-plugger" "multi_json"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; - type = "gem"; - }; - version = "2.2.2"; - }; - multi_json = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; - type = "gem"; - }; - version = "1.15.0"; - }; - netaddr = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0r7nln9xvrralwwhd5s1q4sghp0k9y7g9z5pinzpqkx715xcpdxm"; - type = "gem"; - }; - version = "2.0.5"; - }; - optimist = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk"; - type = "gem"; - }; - version = "3.0.1"; - }; - psych = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10iawnkpa44hcfrapy7yw6zmjn4g1g0y09lw244qiv424f7jasn5"; - type = "gem"; - }; - version = "3.3.2"; - }; - rexml = { - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; - type = "gem"; - }; - version = "3.2.5"; - }; -} diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix deleted file mode 100644 index 5c32c6bcd078..000000000000 --- a/pkgs/development/tools/changie/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -}: - -buildGoModule rec { - pname = "changie"; - version = "1.19.1"; - - src = fetchFromGitHub { - owner = "miniscruff"; - repo = "changie"; - rev = "v${version}"; - hash = "sha256-FZR3KWBCulTbE1Rn6T1neJsjbps0HBPSzzZ57lngB/8="; - }; - - vendorHash = "sha256-2SkHId5BDAv525PISLjlrP862Z2fJDN4L839rz8rWaw="; - - nativeBuildInputs = [ - installShellFiles - ]; - - ldflags = [ "-s" "-w" "-X=main.version=${version}" ]; - - postInstall = '' - installShellCompletion --cmd changie \ - --bash <($out/bin/changie completion bash) \ - --fish <($out/bin/changie completion fish) \ - --zsh <($out/bin/changie completion zsh) - ''; - - meta = with lib; { - description = "Automated changelog tool for preparing releases with lots of customization options"; - mainProgram = "changie"; - homepage = "https://changie.dev"; - changelog = "https://github.com/miniscruff/changie/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/check-jsonschema/default.nix b/pkgs/development/tools/check-jsonschema/default.nix deleted file mode 100644 index 25125b41b6b5..000000000000 --- a/pkgs/development/tools/check-jsonschema/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, fetchFromGitHub, python3 }: - -with python3.pkgs; - -buildPythonApplication rec { - pname = "check-jsonschema"; - version = "0.29.2"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "python-jsonschema"; - repo = "check-jsonschema"; - rev = "refs/tags/${version}"; - hash = "sha256-Z/v/a0zENH8K1NHCZViLBbc8gma5rTMBm8hatHhu878="; - }; - - propagatedBuildInputs = [ - ruamel-yaml - jsonschema - requests - click - regress - ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-xdist - responses - ]; - - pythonImportsCheck = [ - "check_jsonschema" - "check_jsonschema.cli" - ]; - - disabledTests = [ - "test_schemaloader_yaml_data" - ]; - - meta = with lib; { - description = "Jsonschema CLI and pre-commit hook"; - mainProgram = "check-jsonschema"; - homepage = "https://github.com/python-jsonschema/check-jsonschema"; - changelog = "https://github.com/python-jsonschema/check-jsonschema/blob/${version}/CHANGELOG.rst"; - license = licenses.asl20; - maintainers = with maintainers; [ sudosubin ]; - }; -} diff --git a/pkgs/development/tools/check/default.nix b/pkgs/development/tools/check/default.nix deleted file mode 100644 index 1de7a49f3180..000000000000 --- a/pkgs/development/tools/check/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitLab -}: - -buildGoModule rec { - pname = "check"; - version = "unstable-2018-12-24"; - rev = "ccaba434e62accd51209476ad093810bd27ec150"; - - src = fetchFromGitLab { - owner = "opennota"; - repo = "check"; - inherit rev; - hash = "sha256-u8U/62LZEn1ffwdGsUCGam4HAk7b2LetomCLZzHuuas="; - }; - - vendorHash = "sha256-DyysiVYFpncmyCzlHIOEtWlCMpm90AC3gdItI9WinSo="; - - meta = with lib; { - description = "Set of utilities for checking Go sources"; - homepage = "https://gitlab.com/opennota/check"; - license = licenses.gpl3; - maintainers = with maintainers; [ kalbasit ]; - }; -} diff --git a/pkgs/development/tools/checkmake/default.nix b/pkgs/development/tools/checkmake/default.nix deleted file mode 100644 index 8e4d4c326141..000000000000 --- a/pkgs/development/tools/checkmake/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -, pandoc -, go -}: - -buildGoModule rec { - pname = "checkmake"; - version = "0.2.2"; - - src = fetchFromGitHub { - owner = "mrtazz"; - repo = pname; - rev = version; - hash = "sha256-Ql8XSQA/w7wT9GbmYOM2vG15GVqj9LxOGIu8Wqp9Wao="; - }; - - vendorHash = null; - - nativeBuildInputs = [ - installShellFiles - pandoc - ]; - - ldflags = [ - "-s" - "-w" - "-X=main.version=${version}" - "-X=main.buildTime=1970-01-01T00:00:00Z" - "-X=main.builder=nixpkgs" - "-X=main.goversion=go${go.version}" - ]; - - postPatch = '' - substituteInPlace man/man1/checkmake.1.md \ - --replace REPLACE_DATE 1970-01-01T00:00:00Z - ''; - - postBuild = '' - pandoc man/man1/checkmake.1.md -st man -o man/man1/checkmake.1 - ''; - - postInstall = '' - installManPage man/man1/checkmake.1 - ''; - - meta = with lib; { - description = "Experimental tool for linting and checking Makefiles"; - mainProgram = "checkmake"; - homepage = "https://github.com/mrtazz/checkmake"; - changelog = "https://github.com/mrtazz/checkmake/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ vidbina ]; - longDescription = '' - checkmake is an experimental tool for linting and checking - Makefiles. It may not do what you want it to. - ''; - }; -} diff --git a/pkgs/development/tools/checkmate/default.nix b/pkgs/development/tools/checkmate/default.nix deleted file mode 100644 index ca036f967661..000000000000 --- a/pkgs/development/tools/checkmate/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "checkmate"; - version = "0.9.3"; - - src = fetchFromGitHub { - owner = "adedayo"; - repo = pname; - rev = "v${version}"; - hash = "sha256-XzzN4oIG6E4NsMGl4HzFlgAGhkRieRn+jyA0bT8fcrg="; - }; - - vendorHash = "sha256-D87b/LhHnu8xE0wRdB/wLIuf5NlqrVnKt2WAF29bdZo="; - - subPackages = [ "." ]; - - meta = with lib; { - description = "Pluggable code security analysis tool"; - mainProgram = "checkmate"; - homepage = "https://github.com/adedayo/checkmate"; - changelog = "https://github.com/adedayo/checkmate/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/tools/chit/Cargo.lock b/pkgs/development/tools/chit/Cargo.lock deleted file mode 100644 index 1a2b7a766e20..000000000000 --- a/pkgs/development/tools/chit/Cargo.lock +++ /dev/null @@ -1,1872 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[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 = "atlatl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32bb156841d2e2a888185b5b4f7d93d30efd3a40d1671d9628ab39536adb7ea2" -dependencies = [ - "fnv", - "num-traits", - "serde", -] - -[[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 = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" -dependencies = [ - "autocfg 1.1.0", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide 0.6.2", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -dependencies = [ - "byteorder", -] - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder", - "either", - "iovec", -] - -[[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 = "chit" -version = "0.1.15" -dependencies = [ - "clap", - "colored", - "hyphenation", - "openssl", - "reqwest", - "serde", - "serde_derive", - "serde_json", - "textwrap", -] - -[[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 = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] - -[[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 = "cookie" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" -dependencies = [ - "time", - "url 1.7.2", -] - -[[package]] -name = "cookie_store" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c" -dependencies = [ - "cookie", - "failure", - "idna 0.1.5", - "log", - "publicsuffix", - "serde", - "serde_json", - "time", - "try_from", - "url 1.7.2", -] - -[[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 = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam-deque" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" -dependencies = [ - "autocfg 1.1.0", - "cfg-if 0.1.10", - "crossbeam-utils", - "lazy_static", - "maybe-uninit", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-utils", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg 1.1.0", - "cfg-if 0.1.10", - "lazy_static", -] - -[[package]] -name = "dtoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[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 = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "flate2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" -dependencies = [ - "crc32fast", - "miniz_oxide 0.7.1", -] - -[[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 2.2.0", -] - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[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" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" - -[[package]] -name = "futures-cpupool" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" -dependencies = [ - "futures", - "num_cpus", -] - -[[package]] -name = "gimli" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" - -[[package]] -name = "h2" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" -dependencies = [ - "byteorder", - "bytes", - "fnv", - "futures", - "http", - "indexmap", - "log", - "slab", - "string", - "tokio-io", -] - -[[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.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" -dependencies = [ - "bytes", - "fnv", - "itoa 0.4.8", -] - -[[package]] -name = "http-body" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" -dependencies = [ - "bytes", - "futures", - "http", - "tokio-buf", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "hyper" -version = "0.12.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c843caf6296fc1f93444735205af9ed4e109a539005abb2564ae1d6fad34c52" -dependencies = [ - "bytes", - "futures", - "futures-cpupool", - "h2", - "http", - "http-body", - "httparse", - "iovec", - "itoa 0.4.8", - "log", - "net2", - "rustc_version", - "time", - "tokio", - "tokio-buf", - "tokio-executor", - "tokio-io", - "tokio-reactor", - "tokio-tcp", - "tokio-threadpool", - "tokio-timer", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" -dependencies = [ - "bytes", - "futures", - "hyper", - "native-tls", - "tokio-io", -] - -[[package]] -name = "hyphenation" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0493c6fb308d367d0aed7acd341adbc1c2f216c135073e4b73b652c5d0d6b54c" -dependencies = [ - "atlatl", - "bincode", - "hyphenation_commons", - "pocket-resources", - "serde", -] - -[[package]] -name = "hyphenation_commons" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3461ab51107f7beb8e0c46606d6eb7dfa48880014a29c170afad3ce6b25add" -dependencies = [ - "atlatl", - "serde", -] - -[[package]] -name = "idna" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[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 1.1.0", - "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 = "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 = "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 = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard", -] - -[[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 = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" -dependencies = [ - "autocfg 1.1.0", -] - -[[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 = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[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 = "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-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg 1.1.0", -] - -[[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 = "object" -version = "0.30.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" -dependencies = [ - "memchr", -] - -[[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-src" -version = "111.25.3+1.1.1t" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "924757a6a226bf60da5f7dd0311a34d2b52283dd82ddeb103208ddc66362f80c" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "parking_lot" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" -dependencies = [ - "lock_api", - "parking_lot_core", - "rustc_version", -] - -[[package]] -name = "parking_lot_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66b810a62be75176a80873726630147a5ca780cd33921e0b5709033e66b0a" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.57", - "rustc_version", - "smallvec", - "winapi 0.3.9", -] - -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "pocket-resources" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c135f38778ad324d9e9ee68690bac2c1a51f340fdf96ca13e2ab3914eb2e51d8" - -[[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 2.3.1", -] - -[[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.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -dependencies = [ - "autocfg 0.1.8", - "libc", - "rand_chacha", - "rand_core 0.4.2", - "rand_hc", - "rand_isaac", - "rand_jitter", - "rand_os", - "rand_pcg", - "rand_xorshift", - "winapi 0.3.9", -] - -[[package]] -name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.3.1", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rand_hc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc", - "rand_core 0.4.2", - "winapi 0.3.9", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.4.2", - "rdrand", - "winapi 0.3.9", -] - -[[package]] -name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.4.2", -] - -[[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[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 = "reqwest" -version = "0.9.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab" -dependencies = [ - "base64", - "bytes", - "cookie", - "cookie_store", - "encoding_rs", - "flate2", - "futures", - "http", - "hyper", - "hyper-tls", - "log", - "mime", - "mime_guess", - "native-tls", - "serde", - "serde_json", - "serde_urlencoded", - "time", - "tokio", - "tokio-executor", - "tokio-io", - "tokio-threadpool", - "tokio-timer", - "url 1.7.2", - "uuid", - "winreg", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[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 = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "security-framework" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2855b3715770894e67cbfa3df957790aa0c9edc3bf06efa1a84d77fa0839d1" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" -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.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" -dependencies = [ - "dtoa", - "itoa 0.4.8", - "serde", - "url 1.7.2", -] - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg 1.1.0", -] - -[[package]] -name = "smallvec" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" -dependencies = [ - "maybe-uninit", -] - -[[package]] -name = "string" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" -dependencies = [ - "bytes", -] - -[[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 = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - -[[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 = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "hyphenation", - "unicode-width", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi", - "winapi 0.3.9", -] - -[[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.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" -dependencies = [ - "bytes", - "futures", - "mio", - "num_cpus", - "tokio-current-thread", - "tokio-executor", - "tokio-io", - "tokio-reactor", - "tokio-tcp", - "tokio-threadpool", - "tokio-timer", -] - -[[package]] -name = "tokio-buf" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" -dependencies = [ - "bytes", - "either", - "futures", -] - -[[package]] -name = "tokio-current-thread" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" -dependencies = [ - "futures", - "tokio-executor", -] - -[[package]] -name = "tokio-executor" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" -dependencies = [ - "crossbeam-utils", - "futures", -] - -[[package]] -name = "tokio-io" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" -dependencies = [ - "bytes", - "futures", - "log", -] - -[[package]] -name = "tokio-reactor" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" -dependencies = [ - "crossbeam-utils", - "futures", - "lazy_static", - "log", - "mio", - "num_cpus", - "parking_lot", - "slab", - "tokio-executor", - "tokio-io", - "tokio-sync", -] - -[[package]] -name = "tokio-sync" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" -dependencies = [ - "fnv", - "futures", -] - -[[package]] -name = "tokio-tcp" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" -dependencies = [ - "bytes", - "futures", - "iovec", - "mio", - "tokio-io", - "tokio-reactor", -] - -[[package]] -name = "tokio-threadpool" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" -dependencies = [ - "crossbeam-deque", - "crossbeam-queue", - "crossbeam-utils", - "futures", - "lazy_static", - "log", - "num_cpus", - "slab", - "tokio-executor", -] - -[[package]] -name = "tokio-timer" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" -dependencies = [ - "crossbeam-utils", - "futures", - "slab", - "tokio-executor", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "try_from" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" -dependencies = [ - "cfg-if 0.1.10", -] - -[[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 = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "url" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -dependencies = [ - "idna 0.1.5", - "matches", - "percent-encoding 1.0.1", -] - -[[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 2.2.0", -] - -[[package]] -name = "uuid" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" -dependencies = [ - "rand", -] - -[[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.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" -dependencies = [ - "futures", - "log", - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[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-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.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" -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/chit/default.nix b/pkgs/development/tools/chit/default.nix deleted file mode 100644 index 03c301f19362..000000000000 --- a/pkgs/development/tools/chit/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, stdenv -, openssl -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "chit"; - version = "0.1.15"; - - src = fetchFromGitHub { - owner = "peterheesterman"; - repo = pname; - rev = version; - sha256 = "0iixczy3cad44j2d7zzj8f3lnmp4jwnb0snmwfgiq3vj9wrn28pz"; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - }; - - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; - - buildInputs = lib.optionals stdenv.isLinux [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - # update Carg.lock to work with openssl 3 - postPatch = '' - ln -sf ${./Cargo.lock} Cargo.lock - ''; - - meta = with lib; { - description = "Crate help in terminal: A tool for looking up details about rust crates without going to crates.io"; - mainProgram = "chit"; - longDescription = '' - Chit helps answer these questions: - - * Who wrote this crate? What else did they write? - * What alternatives are there? - * How old is this crate? - * What versions are there? When did they come out? - * What are the downloads over time? - * Should i use this crate? - * How mature is it? - ''; - homepage = "https://github.com/peterheesterman/chit"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/circup/default.nix b/pkgs/development/tools/circup/default.nix deleted file mode 100644 index cbb952c1035b..000000000000 --- a/pkgs/development/tools/circup/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - fetchFromGitHub, - python3, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "circup"; - version = "2.0.4"; - pyproject = true; - - src = fetchFromGitHub { - owner = "adafruit"; - repo = "circup"; - rev = "refs/tags/${version}"; - hash = "sha256-Iid6IwPoj7F9X6Yb0ESsuvD9/tZdRQyCceGOVt2R1qw="; - }; - - pythonRelaxDeps = [ "semver" ]; - - build-system = with python3.pkgs; [ setuptools-scm ]; - - dependencies = with python3.pkgs; [ - appdirs - click - findimports - requests - semver - setuptools - toml - update-checker - ]; - - nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; - - postBuild = '' - export HOME=$(mktemp -d); - ''; - - pythonImportsCheck = [ "circup" ]; - - disabledTests = [ - # Test requires network access - "test_libraries_from_imports_bad" - ]; - - meta = with lib; { - description = "CircuitPython library updater"; - homepage = "https://github.com/adafruit/circup"; - changelog = "https://github.com/adafruit/circup/releases/tag/${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - mainProgram = "circup"; - }; -} diff --git a/pkgs/development/tools/clean-css-cli/default.nix b/pkgs/development/tools/clean-css-cli/default.nix deleted file mode 100644 index 62782c311d62..000000000000 --- a/pkgs/development/tools/clean-css-cli/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "clean-css-cli"; - version = "5.6.2"; - - src = fetchFromGitHub { - owner = "clean-css"; - repo = "clean-css-cli"; - rev = "v${version}"; - hash = "sha256-ONWJn6mehXeNwRVEEM+Ad/heXwNWC9E9yA5eUQsi98A="; - }; - - npmDepsHash = "sha256-eVd6YSTHhp6qzGYn5PlikUgjNS+GJoRwfm6KPrEJKGE="; - - dontNpmBuild = true; - - meta = { - changelog = "https://github.com/clean-css/clean-css-cli/blob/${src.rev}/History.md"; - description = "Command-line interface to the clean-css CSS optimization library"; - homepage = "https://github.com/clean-css/clean-css-cli"; - license = lib.licenses.mit; - mainProgram = "cleancss"; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix deleted file mode 100644 index b24d2b9fd255..000000000000 --- a/pkgs/development/tools/clj-kondo/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, buildGraalvmNativeImage, graalvmCEPackages, fetchurl -}: - -buildGraalvmNativeImage rec { - pname = "clj-kondo"; - version = "2024.08.29"; - - src = fetchurl { - url = - "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-0Mvj8FW6/Q9GudaD3lnRFvTjMkkAGwpAokdNJa/HfsI="; - }; - - graalvmDrv = graalvmCEPackages.graalvm-ce; - - extraNativeImageBuildArgs = - [ "-H:+ReportExceptionStackTraces" "--no-fallback" ]; - - meta = with lib; { - description = "Linter for Clojure code that sparks joy"; - homepage = "https://github.com/clj-kondo/clj-kondo"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.epl10; - changelog = - "https://github.com/clj-kondo/clj-kondo/blob/v${version}/CHANGELOG.md"; - maintainers = with maintainers; [ jlesquembre bandresen ]; - }; -} diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix deleted file mode 100644 index 6f4fa62cb533..000000000000 --- a/pkgs/development/tools/clog-cli/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ fetchFromGitHub, rustPlatform, lib }: - -rustPlatform.buildRustPackage rec { - pname = "clog-cli"; - version = "0.9.3"; - - src = fetchFromGitHub { - owner = "clog-tool"; - repo = "clog-cli"; - rev = "v${version}"; - sha256 = "1wxglc4n1dar5qphhj5pab7ps34cjr7jy611fwn72lz0f6c7jp3z"; - }; - - cargoHash = "sha256-yjBgccrkG2D8ZW3Uju4XUhz9Kar50jkJZ75MWhn9j3U="; - - meta = { - description = "Generate changelogs from local git metadata"; - homepage = "https://github.com/clog-tool/clog-cli"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - maintainers = [lib.maintainers.nthorne]; - mainProgram = "clog"; - # error: could not compile `rustc-serialize` - broken = true; # Added 2024-03-16 - }; -} diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix deleted file mode 100644 index f17bad02615b..000000000000 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, makeBinaryWrapper -}: - -buildGoModule rec { - pname = "cloud-nuke"; - version = "0.37.2"; - - src = fetchFromGitHub { - owner = "gruntwork-io"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-EAN2O4DisHEQ5ID96BtZXQHz0eQFDSu/0r0WO+Ihleo="; - }; - - vendorHash = "sha256-Rw3wSGDorCcAz/8BKmLsy0AVQ922W7FrvRYDgZj2blg="; - - nativeBuildInputs = [ - makeBinaryWrapper - ]; - - ldflags = [ - "-s" - "-w" - "-X=main.VERSION=${version}" - ]; - - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/cloud-nuke --set-default DISABLE_TELEMETRY true - ''; - - meta = with lib; { - homepage = "https://github.com/gruntwork-io/cloud-nuke"; - description = "Tool for cleaning up your cloud accounts by nuking (deleting) all resources within it"; - mainProgram = "cloud-nuke"; - changelog = "https://github.com/gruntwork-io/cloud-nuke/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/cloudsmith-cli/default.nix b/pkgs/development/tools/cloudsmith-cli/default.nix deleted file mode 100644 index ed4cde502a5c..000000000000 --- a/pkgs/development/tools/cloudsmith-cli/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -, fetchpatch -}: - -python3.pkgs.buildPythonApplication rec { - pname = "cloudsmith-cli"; - version = "1.2.5"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "cloudsmith-io"; - repo = "cloudsmith-cli"; - rev = "refs/tags/v${version}"; - hash = "sha256-UzyfOmjJzYEJYA6c4kn5XCvRVIMuiIpiq0kH9UhBwmo="; - }; - - patches = [ - # Fix compatibility with urllib3 2.0 - (fetchpatch { - url = "https://github.com/cloudsmith-io/cloudsmith-cli/commit/1a8d2d91c01320537b26778003735d6b694141c2.patch"; - revert = true; - includes = [ - "cloudsmith_cli/core/rest.py" - ]; - hash = "sha256-Rf3MMJuLr8fzkRqSftIJ1eUbgNdfrng2V609jYvpogc="; - }) - ]; - - nativeBuildInputs = with python3.pkgs; [ - pip - ]; - - propagatedBuildInputs = with python3.pkgs; [ - click - click-configfile - click-didyoumean - click-spinner - cloudsmith-api - colorama - future - requests - requests-toolbelt - semver - simplejson - six - setuptools # needs pkg_resources - ]; - - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - pytest-cov - ]; - - checkInputs = with python3.pkgs; [ - httpretty - ]; - - pythonImportsCheck = [ - "cloudsmith_cli" - ]; - - postPatch = '' - # Permit urllib3 2.0 - substituteInPlace setup.py \ - --replace-fail 'urllib3<2.0' 'urllib3' - ''; - - preCheck = '' - # E _pytest.pathlib.ImportPathMismatchError: ('cloudsmith_cli.cli.tests.conftest', '/build/source/build/lib/cloudsmith_cli/cli/tests/conftest.py', PosixPath('/build/source/cloudsmith_cli/cli/tests/conftest.py')) - # ___________ ERROR collecting cloudsmith_cli/core/tests/test_init.py ____________ - # import file mismatch: - # imported module 'cloudsmith_cli.core.tests.test_init' has this __file__ attribute: - # /build/source/build/lib/cloudsmith_cli/core/tests/test_init.py - # which is not the same as the test file we want to collect: - # /build/source/cloudsmith_cli/core/tests/test_init.py - # HINT: remove __pycache__ / .pyc files and/or use a unique basename for your test file modules - # https://github.com/NixOS/nixpkgs/issues/255262 - cd "$out" - ''; - - meta = with lib; { - homepage = "https://help.cloudsmith.io/docs/cli/"; - description = "Cloudsmith Command Line Interface"; - mainProgram = "cloudsmith"; - changelog = "https://github.com/cloudsmith-io/cloudsmith-cli/blob/v${version}/CHANGELOG.md"; - maintainers = [ ]; - license = licenses.asl20; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/tools/cobra-cli/default.nix b/pkgs/development/tools/cobra-cli/default.nix deleted file mode 100644 index d94ef657d741..000000000000 --- a/pkgs/development/tools/cobra-cli/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, go }: - -buildGoModule rec { - pname = "cobra-cli"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "spf13"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-E0I/Pxw4biOv7aGVzGlQOFXnxkc+zZaEoX1JmyMh6UE="; - }; - - vendorHash = "sha256-vrtGPQzY+NImOGaSxV+Dvch+GNPfL9XfY4lfCHTGXwY="; - - nativeBuildInputs = [ makeWrapper ]; - - allowGoReference = true; - - postPatch = '' - substituteInPlace "cmd/add_test.go" \ - --replace "TestGoldenAddCmd" "SkipGoldenAddCmd" - substituteInPlace "cmd/init_test.go" \ - --replace "TestGoldenInitCmd" "SkipGoldenInitCmd" - ''; - - postFixup = '' - wrapProgram "$out/bin/cobra-cli" \ - --prefix PATH : ${go}/bin - ''; - - meta = with lib; { - description = "Cobra CLI tool to generate applications and commands"; - mainProgram = "cobra-cli"; - homepage = "https://github.com/spf13/cobra-cli/"; - changelog = "https://github.com/spf13/cobra-cli/releases/tag/${version}"; - license = licenses.afl20; - maintainers = [ maintainers.ivankovnatsky ]; - }; -} diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index 6760b4754203..848b6fb2f10d 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ libgit2 ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ libgit2 ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd cog \ diff --git a/pkgs/development/tools/code-maat/default.nix b/pkgs/development/tools/code-maat/default.nix deleted file mode 100644 index 2046322390c1..000000000000 --- a/pkgs/development/tools/code-maat/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenvNoCC -, fetchurl -, makeBinaryWrapper -, jre -}: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "code-maat"; - version = "1.0.4"; - - src = fetchurl { - url = "https://github.com/adamtornhill/code-maat/releases/download/v${finalAttrs.version}/code-maat-${finalAttrs.version}-standalone.jar"; - hash = "sha256-QoeuIDSQGERFD3aVR7xEl6DaGm0cf6b63IWHBeZ0O18="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ - makeBinaryWrapper - ]; - - installPhase = - let - jar = "$out/libexec/code-maat/code-maat.jar"; - in - '' - runHook preInstall - - install -D ${finalAttrs.src} ${jar} - mkdir -p "$out/bin" - makeWrapper "${jre}/bin/java" "$out/bin/code-maat" \ - --add-flags "-jar ${jar}" - - runHook postInstall - ''; - - meta = with lib; { - description = "Command line tool to mine and analyze data from version-control systems"; - mainProgram = "code-maat"; - homepage = "https://github.com/adamtornhill/code-maat"; - platforms = platforms.unix; - license = licenses.gpl3; - maintainers = with maintainers; [ sir4ur0n ]; - }; -}) diff --git a/pkgs/development/tools/codeowners/default.nix b/pkgs/development/tools/codeowners/default.nix deleted file mode 100644 index 3c7bdb1ff222..000000000000 --- a/pkgs/development/tools/codeowners/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ buildGoModule, lib, fetchFromGitHub }: - -buildGoModule rec { - pname = "codeowners"; - version = "1.2.1"; - - src = fetchFromGitHub { - owner = "hmarr"; - repo = pname; - rev = "v${version}"; - hash = "sha256-PMT3ihxCD4TNgTZOD4KB9Od1djIhnlMa8zuD6t1OieU="; - }; - - vendorHash = "sha256-CpGlw4xe+gg2IRov9Atd8Z7XbXs1zkIYxvBVpsY/gxg="; - - meta = with lib; { - description = "CLI and Go library for Github's CODEOWNERS file"; - mainProgram = "codeowners"; - homepage = "https://github.com/hmarr/codeowners"; - license = licenses.mit; - maintainers = with maintainers; [ yorickvp ]; - }; -} diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix index c1c1f2fe30fe..904f39f89a08 100644 --- a/pkgs/development/tools/coder/default.nix +++ b/pkgs/development/tools/coder/default.nix @@ -14,21 +14,21 @@ let channels = { stable = { - version = "2.14.3"; + version = "2.15.1"; hash = { - x86_64-linux = "sha256-CDQmixywYDLj3ABqTEnaUftITSFGA/wGAfe0IFoU64g="; - x86_64-darwin = "sha256-TDpoby2lBw8W6zJrHgF/AQFQL+j9dv3d21VLsiSd1sk="; - aarch64-linux = "sha256-L+2YOMgH1cCl4o1VFZk1dC258/XStgiH9lr9PEQOPSo="; - aarch64-darwin = "sha256-hG3HsJ+DIjwB5ehT+Hd3EZduvjNXYTZLYbAYCRWWiQ8="; + x86_64-linux = "sha256-DB/3iUkgWzAI+3DEQB8heYkG6apUARDulQ4lKDAPN1I="; + x86_64-darwin = "sha256-62tjAC3WtWC8eIkh9dPi2Exksp2gDHyXEU2tCavKZ4Q="; + aarch64-linux = "sha256-957GdH5sDjbjxEt8LXKPBM7vht7T6JizVwYYhbitdpw="; + aarch64-darwin = "sha256-ckcd1u9dgg9LKhr47Yw8dJKkR7hawPie4QNyySH8vyM="; }; }; mainline = { - version = "2.15.0"; + version = "2.16.0"; hash = { - x86_64-linux = "sha256-zM5l3vkLKuDdZHTgVTYfvfYTGLCpDnA2GZDh5PLQ9rs="; - x86_64-darwin = "sha256-AbW92RMaPfusve5DxRaT3npeN2zVzrBOBL3XGN8235I="; - aarch64-linux = "sha256-13FZc1zMmaxfDp0bXBFzf2gcO6wkiA932C5m9oon2GQ="; - aarch64-darwin = "sha256-UP08DncRvM1NjtMOfanDnXGySK1RrCUta5lbIvJ7vto="; + x86_64-linux = "sha256-Uk9oGiLSHBCINAzQg88tlHyMw/OGfdmCw2/NXJs5wbQ="; + x86_64-darwin = "sha256-Bbayv00NDJGUA4M4KyG4XCXIiaQSf4JSgy5VvLSVmAM="; + aarch64-linux = "sha256-nV02uO+UkNNvQDIkh2G+9H8gvk9DOSYyIu4O3nwkYXk="; + aarch64-darwin = "sha256-C9Nm8dW3V25D7J/3ABO5oLGL4wcSCsAXtQNZABwVpWs="; }; }; }; diff --git a/pkgs/development/tools/codespell/default.nix b/pkgs/development/tools/codespell/default.nix deleted file mode 100644 index da39f0f75992..000000000000 --- a/pkgs/development/tools/codespell/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, fetchFromGitHub -, aspellDicts -, python3 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "codespell"; - version = "2.3.0"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "codespell-project"; - repo = "codespell"; - rev = "v${version}"; - sha256 = "sha256-X3Pueu0E7Q57sbKSXqCZki4/PUb1WyWk/Zmj+lhVTM8="; - }; - - nativeBuildInputs = with python3.pkgs; [ - setuptools-scm - ]; - - nativeCheckInputs = with python3.pkgs; [ - aspell-python - chardet - pytestCheckHook - pytest-cov-stub - pytest-dependency - ]; - - preCheck = '' - export ASPELL_CONF="dict-dir ${aspellDicts.en}/lib/aspell" - ''; - - disabledTests = [ - # tries to run not fully installed script - "test_basic" - ]; - - pythonImportsCheck = [ "codespell_lib" ]; - - meta = with lib; { - description = "Fix common misspellings in source code"; - mainProgram = "codespell"; - homepage = "https://github.com/codespell-project/codespell"; - license = with licenses; [ gpl2Only cc-by-sa-30 ]; - maintainers = with maintainers; [ johnazoidberg SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/tools/comby/default.nix b/pkgs/development/tools/comby/default.nix index ad7ab8559688..49532070b2b4 100644 --- a/pkgs/development/tools/comby/default.nix +++ b/pkgs/development/tools/comby/default.nix @@ -79,7 +79,6 @@ mkCombyPackage { ocamlPackages.patience_diff ocamlPackages.toml ocamlPackages.cohttp-lwt-unix - ocamlPackages.opium ocamlPackages.textutils ocamlPackages.jst-config ocamlPackages.parany @@ -92,7 +91,7 @@ mkCombyPackage { ocamlPackages.dune-configurator combyKernel combySemantic - ] ++ (if !stdenv.isAarch32 && !stdenv.isAarch64 then + ] ++ (if !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64 then [ ocamlPackages.hack_parallel ] else [ ]); diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix deleted file mode 100644 index 65ae92d90479..000000000000 --- a/pkgs/development/tools/compile-daemon/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: - -buildGoModule rec { - pname = "compile-daemon"; - version = "1.4.0"; - - src = fetchFromGitHub { - owner = "githubnemo"; - repo = "CompileDaemon"; - rev = "v${version}"; - sha256 = "sha256-gpyXy7FO7ZVXJrkzcKHFez4S/dGiijXfZ9eSJtNlm58="; - }; - - vendorHash = "sha256-UpktrXY6OntOA1sxKq3qI59zrOwwCuM+gfGGxPmUJRo="; - - patches = [ - (fetchpatch { - url = "https://github.com/githubnemo/CompileDaemon/commit/39bc1352dc62fea06dff40c5eaef81ab1bdb1f14.patch"; - hash = "sha256-Zftbw2nu8zzaoj0uwEwdq7xlyycdC0xxBu/qE9VHASI="; - }) - ]; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Very simple compile daemon for Go"; - homepage = "https://github.com/githubnemo/CompileDaemon"; - license = licenses.bsd2; - maintainers = [ ]; - mainProgram = "CompileDaemon"; - }; -} diff --git a/pkgs/development/tools/confluent-cli/default.nix b/pkgs/development/tools/confluent-cli/default.nix deleted file mode 100644 index e614fe7d947d..000000000000 --- a/pkgs/development/tools/confluent-cli/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, autoPatchelfHook, fetchurl, lib }: - -stdenv.mkDerivation rec { - pname = "confluent-cli"; - version = "3.60.0"; - - # To get the latest version: - # curl -L https://cnfl.io/cli | sh -s -- -l | grep -v latest | sort -V | tail -n1 - src = { - x86_64-linux = fetchurl { - url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_${version}_linux_amd64.tar.gz"; - hash = "sha256-GYA7T2yRcSNStvd9ZqI2iTJC3d6ymH9Dg5FVkIsM1f0="; - }; - aarch64-linux = fetchurl { - url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_${version}_linux_arm64.tar.gz"; - hash = "sha256-BJJaZtRInKT6S0W22f96RCM8H18dIpOTP5lu357zh18="; - }; - x86_64-darwin = fetchurl { - url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_${version}_darwin_amd64.tar.gz"; - hash = "sha256-94ur/FXxQWL4EOkEI1FSoWduRaMaY7DCNMiucpNC0B0="; - }; - aarch64-darwin = fetchurl { - url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_${version}_darwin_arm64.tar.gz"; - hash = "sha256-aEIKSrO0/6dJCAyzwBH2ZDAmwvURugx6jTzaepbRvH8="; - }; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - - dontStrip = stdenv.isDarwin; - - installPhase = '' - mkdir -p $out/{bin,share/doc/confluent-cli} - cp confluent $out/bin/ - cp LICENSE $out/share/doc/confluent-cli/ - cp -r legal $out/share/doc/confluent-cli/ - ''; - - meta = with lib; { - description = "Confluent CLI"; - homepage = "https://docs.confluent.io/confluent-cli/current/overview.html"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ rguevara84 autophagy ]; - - # TODO: There's support for i686 systems but I do not have any such system - # to build it locally on, it's also unfree so I cannot rely on ofborg to - # build it. Get the list of supported system by looking at the list of - # files in the S3 bucket: - # - # https://s3-us-west-2.amazonaws.com/confluent.cloud?prefix=confluent-cli/archives/1.25.0/&delimiter=/%27 - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix deleted file mode 100644 index 98051df100a7..000000000000 --- a/pkgs/development/tools/conftest/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -}: - -buildGoModule rec { - pname = "conftest"; - version = "0.55.0"; - - src = fetchFromGitHub { - owner = "open-policy-agent"; - repo = "conftest"; - rev = "refs/tags/v${version}"; - hash = "sha256-cJY3NmZa+IBmadTAusvzHKXeGsnsKpRqvJwYPVnU68A="; - }; - vendorHash = "sha256-iPTyDqaodTFhnGRLEbEFpQjfz9r4DsFdue7fQNwq/pU="; - - ldflags = [ - "-s" - "-w" - "-X github.com/open-policy-agent/conftest/internal/commands.version=${version}" - ]; - - nativeBuildInputs = [ - installShellFiles - ]; - - preCheck = '' - export HOME="$(mktemp -d)" - ''; - - postInstall = '' - installShellCompletion --cmd conftest \ - --bash <($out/bin/conftest completion bash) \ - --fish <($out/bin/conftest completion fish) \ - --zsh <($out/bin/conftest completion zsh) - ''; - - doInstallCheck = true; - installCheckPhase = '' - export HOME="$(mktemp -d)" - $out/bin/conftest --version | grep ${version} > /dev/null - ''; - - meta = with lib; { - description = "Write tests against structured configuration data"; - mainProgram = "conftest"; - downloadPage = "https://github.com/open-policy-agent/conftest"; - homepage = "https://www.conftest.dev"; - changelog = "https://github.com/open-policy-agent/conftest/releases/tag/v${version}"; - license = licenses.asl20; - longDescription = '' - Conftest helps you write tests against structured configuration data. - Using Conftest you can write tests for your Kubernetes configuration, - Tekton pipeline definitions, Terraform code, Serverless configs or any - other config files. - - Conftest uses the Rego language from Open Policy Agent for writing the - assertions. You can read more about Rego in 'How do I write policies' in - the Open Policy Agent documentation. - ''; - maintainers = with maintainers; [ jk yurrriq ]; - }; -} diff --git a/pkgs/development/tools/container2wasm/default.nix b/pkgs/development/tools/container2wasm/default.nix deleted file mode 100644 index 0245cb57ebfb..000000000000 --- a/pkgs/development/tools/container2wasm/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "container2wasm"; - version = "0.6.5"; - - src = fetchFromGitHub { - owner = "ktock"; - repo = "container2wasm"; - rev = "refs/tags/v${version}"; - hash = "sha256-PFgaqzl6uc6vHzcZ9+FpugAOFSBKhxAsoSvmYHxUmLs="; - }; - - vendorHash = "sha256-j6oqYpFcfZy4Lz4C9wbJGI2RdJsAxQxBqcLNWgKk/UU="; - - ldflags = [ - "-s" - "-w" - "-X=github.com/ktock/container2wasm/version.Version=${version}" - ]; - - subPackages = [ - "cmd/c2w" - ]; - - meta = with lib; { - description = "Container to WASM converter"; - homepage = "https://github.com/ktock/container2wasm"; - changelog = "https://github.com/ktock/container2wasm/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ dit7ya ]; - mainProgram = "c2w"; - }; -} diff --git a/pkgs/development/tools/continuous-integration/agola/default.nix b/pkgs/development/tools/continuous-integration/agola/default.nix deleted file mode 100644 index e5f59a784910..000000000000 --- a/pkgs/development/tools/continuous-integration/agola/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -let - version = "0.9.2"; -in - -buildGoModule { - pname = "agola"; - inherit version; - - src = fetchFromGitHub { - owner = "agola-io"; - repo = "agola"; - rev = "v${version}"; - hash = "sha256-ggi0Eb4vO5zBoIrIIa3MFwOIW0IBS8yGF6eveBb+lgY="; - }; - - vendorHash = "sha256-Igtccundx/2PHFp8+L44CvOLG+/Ndinhonh/EDcQeoY="; - - ldflags = [ - "-s" - "-w" - "-X agola.io/agola/cmd.Version=${version}" - ]; - - tags = [ - "sqlite_unlock_notify" - ]; - - # somehow the tests get stuck - doCheck = false; - - meta = with lib; { - 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 daffa9165162..07b18f692313 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/default.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/default.nix @@ -5,16 +5,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: { - # a lot of tests -> very slow, we already build them when building python packages - doCheck = false; - }); - }; - }; + python = python3; buildbot-pkg = self.callPackage ./pkg.nix { }; diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index d0a2efb32b57..965bb2e936f2 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -26,6 +26,8 @@ , moto , markdown , lz4 +, brotli +, zstandard , setuptools-trial , buildbot-worker , buildbot-plugins @@ -71,7 +73,7 @@ let in buildPythonApplication rec { pname = "buildbot"; - version = "4.0.2"; + version = "4.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -80,7 +82,7 @@ buildPythonApplication rec { owner = "buildbot"; repo = "buildbot"; rev = "v${version}"; - hash = "sha256-0ctOInVRJqjmcqy67PTriRmqo3fz1qMEVV+K5lXvZ6k="; + hash = "sha256-RPg4eXqpm/F1SSoB4MVo61DgZv/iE2R4VtCkUU69iA8="; }; build-system = [ @@ -108,6 +110,9 @@ buildPythonApplication rec { importlib-resources packaging unidiff + treq + brotli + zstandard ] # tls ++ twisted.optional-dependencies.tls; @@ -137,32 +142,23 @@ buildPythonApplication rec { ]; postPatch = '' - substituteInPlace master/buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" - ''; - preBuild = '' cd master + touch buildbot/py.typed + substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" ''; - # Silence the depreciation warning from SqlAlchemy - SQLALCHEMY_SILENCE_UBER_WARNING = 1; - # TimeoutErrors on slow machines -> aarch64 - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; preCheck = '' export LC_ALL="en_US.UTF-8" export PATH="$out/bin:$PATH" - - # remove testfile which is missing configuration file from sdist - rm buildbot/test/integration/test_graphql.py - # tests in this file are flaky, see https://github.com/buildbot/buildbot/issues/6776 - rm buildbot/test/integration/test_try_client.py ''; passthru = { - inherit withPlugins; + inherit withPlugins python; updateScript = ./update.sh; - } // lib.optionalAttrs stdenv.isLinux { + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { tests = { inherit (nixosTests) buildbot; }; @@ -174,6 +170,6 @@ buildPythonApplication rec { changelog = "https://github.com/buildbot/buildbot/releases/tag/v${version}"; maintainers = teams.buildbot.members; license = licenses.gpl2Only; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index 530b46d26337..7da50409cbd7 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-TU5/0KQQbNDpxuntIwQvxGp/7PvBb+iMiAOJA3EAAAA="; + hash = "sha256-+ZiOkTZLdwqsZfApW6aQxoNkbcFCaB4BHEjMTZIl+Rg="; }; # Remove unnecessary circular dependency on buildbot @@ -29,40 +29,13 @@ }; }; - www-react = buildPythonPackage rec { - pname = "buildbot_www_react"; - inherit (buildbot-pkg) version; - - src = fetchurl { - url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-EtG4vlsoyIDcfKWvkL7ei/BGVItF5wkWPhq4aHfmJ24="; - }; - - # Remove unnecessary circular dependency on buildbot - postPatch = '' - sed -i "s/'buildbot'//" setup.py - ''; - - buildInputs = [ buildbot-pkg ]; - - # No tests - doCheck = false; - - meta = with lib; { - homepage = "https://buildbot.net/"; - description = "Buildbot UI (React)"; - maintainers = teams.buildbot.members; - license = licenses.gpl2Only; - }; - }; - console-view = buildPythonPackage rec { pname = "buildbot_console_view"; inherit (buildbot-pkg) version; src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-gNei1LZXV7G+8u0AtNDSsj98LprsbyIFR94N4+AXO54="; + hash = "sha256-IgG/afjU//zrcHuTXMBLlz1gCmB31fWaECIm+UqaMgA="; }; buildInputs = [ buildbot-pkg ]; @@ -78,35 +51,13 @@ }; }; - react-console-view = buildPythonPackage rec { - pname = "buildbot_react_console_view"; - inherit (buildbot-pkg) version; - - src = fetchurl { - url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-CJ14Se4Wlpb7jt5u1VVmd0MnUdO2l7KfQyVQbO7hMhA="; - }; - - buildInputs = [ buildbot-pkg ]; - - # tests fail - doCheck = false; - - meta = with lib; { - homepage = "https://buildbot.net/"; - description = "Buildbot Console View Plugin (React)"; - maintainers = teams.buildbot.members; - license = licenses.gpl2; - }; - }; - waterfall-view = buildPythonPackage rec { pname = "buildbot_waterfall_view"; inherit (buildbot-pkg) version; src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-lY8ljjGaZ0i7aY1rR//7M7H83ZTSQj9CnTafWXner94="; + hash = "sha256-E0yFY3PtTZ8XtJGDMh0aRljhTNsWHqHQzcBORTgrCIA="; }; buildInputs = [ buildbot-pkg ]; @@ -122,35 +73,13 @@ }; }; - react-waterfall-view = buildPythonPackage rec { - pname = "buildbot_react_waterfall_view"; - inherit (buildbot-pkg) version; - - src = fetchurl { - url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-XZAInGgM/hm4Rxk0usH0NRiCuq19XJeYuwJNF2gtn3M="; - }; - - buildInputs = [ buildbot-pkg ]; - - # tests fail - doCheck = false; - - meta = with lib; { - homepage = "https://buildbot.net/"; - description = "Buildbot Waterfall View Plugin (React)"; - maintainers = teams.buildbot.members; - license = licenses.gpl2; - }; - }; - grid-view = buildPythonPackage rec { pname = "buildbot_grid_view"; inherit (buildbot-pkg) version; src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-RRdHvlm+98Cu+qiIhDMx6W65bQ30ULTKZrz05Xm32gg="; + hash = "sha256-KR4M7RSULCM1aS7vYjWuMXIHGpO+xFjfhC8+YncAmlE="; }; buildInputs = [ buildbot-pkg ]; @@ -166,35 +95,13 @@ }; }; - react-grid-view = buildPythonPackage rec { - pname = "buildbot_react_grid_view"; - inherit (buildbot-pkg) version; - - src = fetchurl { - url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-sg/40zP3YMF8e3GsL+A9gtCUlhoqKqHNeFUycQrQNJc="; - }; - - buildInputs = [ buildbot-pkg ]; - - # tests fail - doCheck = false; - - meta = with lib; { - homepage = "https://buildbot.net/"; - description = "Buildbot Grid View Plugin (React)"; - maintainers = teams.buildbot.members; - license = licenses.gpl2; - }; - }; - wsgi-dashboards = buildPythonPackage rec { pname = "buildbot_wsgi_dashboards"; inherit (buildbot-pkg) version; src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-pE6wDMLYGtDgaRjqv/SS9bm6F58molO9oQI3XklcWfg="; + hash = "sha256-L7DayDddqrwOyBwgy4w1waCL+49GMtdrCdZNpcLrFXk="; }; buildInputs = [ buildbot-pkg ]; @@ -210,35 +117,13 @@ }; }; - react-wsgi-dashboards = buildPythonPackage rec { - pname = "buildbot_react_wsgi_dashboards"; - inherit (buildbot-pkg) version; - - src = fetchurl { - url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-ZgnfiQtKCs1Ui9KiUMaSbtaMnCgSgH+IzJTXWYcG/fE="; - }; - - buildInputs = [ buildbot-pkg ]; - - # tests fail - doCheck = false; - - meta = with lib; { - homepage = "https://buildbot.net/"; - description = "Buildbot WSGI dashboards Plugin (React)"; - maintainers = teams.buildbot.members; - license = licenses.gpl2; - }; - }; - badges = buildPythonPackage rec { pname = "buildbot_badges"; inherit (buildbot-pkg) version; src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-yxbLY3LiT0qmRiz7+/F/TuODiSnteq0891fxAGSU7yY="; + hash = "sha256-CnRTSnwhSj6cjrATUuVerGrqt7XxJZYgC5XjUC4+Xrs="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/tools/continuous-integration/buildbot/update.sh b/pkgs/development/tools/continuous-integration/buildbot/update.sh index b1e407ef165b..c5ea61e3828f 100755 --- a/pkgs/development/tools/continuous-integration/buildbot/update.sh +++ b/pkgs/development/tools/continuous-integration/buildbot/update.sh @@ -4,13 +4,8 @@ set -eu -o pipefail nix-update buildbot nix-update --version=skip buildbot-plugins.www -nix-update --version=skip buildbot-plugins.www-react nix-update --version=skip buildbot-plugins.console-view -nix-update --version=skip buildbot-plugins.react-console-view nix-update --version=skip buildbot-plugins.waterfall-view -nix-update --version=skip buildbot-plugins.react-waterfall-view nix-update --version=skip buildbot-plugins.grid-view -nix-update --version=skip buildbot-plugins.react-grid-view nix-update --version=skip buildbot-plugins.wsgi-dashboards -nix-update --version=skip buildbot-plugins.react-wsgi-dashboards nix-update --version=skip buildbot-plugins.badges diff --git a/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/pkgs/development/tools/continuous-integration/buildbot/worker.nix index aacdf92e30a5..8bbe3a241b0e 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -8,7 +8,6 @@ # propagates , autobahn -, future , msgpack , twisted @@ -27,6 +26,7 @@ buildPythonPackage ({ postPatch = '' cd worker + touch buildbot_worker/py.typed substituteInPlace buildbot_worker/scripts/logwatcher.py \ --replace /usr/bin/tail "${coreutils}/bin/tail" ''; @@ -37,7 +37,6 @@ buildPythonPackage ({ propagatedBuildInputs = [ autobahn - future msgpack twisted ]; @@ -56,6 +55,6 @@ buildPythonPackage ({ description = "Buildbot Worker Daemon"; maintainers = teams.buildbot.members; license = licenses.gpl2; - broken = stdenv.isDarwin; # https://hydra.nixos.org/build/243534318/nixlog/6 + broken = stdenv.hostPlatform.isDarwin; # https://hydra.nixos.org/build/243534318/nixlog/6 }; }) diff --git a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix deleted file mode 100644 index dd81126d68fd..000000000000 --- a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "buildkite-cli"; - version = "2.0.0"; - - src = fetchFromGitHub { - owner = "buildkite"; - repo = "cli"; - rev = "v${version}"; - sha256 = "sha256-4MUgyUKyycsreAMVtyKJFpQOHvI6JJSn7TUZtbQANyc="; - }; - - vendorHash = "sha256-3x7yJenJ2BHdqVPaBaqfFVeOSJZ/VRNF/TTfSsw+2os="; - - doCheck = false; - - postPatch = '' - patchShebangs .buildkite/steps/{lint,run-local}.sh - ''; - - subPackages = [ "cmd/bk" ]; - - ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; - - meta = with lib; { - description = "Command line interface for Buildkite"; - homepage = "https://github.com/buildkite/cli"; - license = licenses.mit; - maintainers = with maintainers; [ groodt ]; - mainProgram = "bk"; - }; -} 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 28630e43b766..84c62e556858 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 @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-PF2TFfzWmHXLgTopzJ04dfnzd3Sc/A6Hduffz2guxmU="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix b/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix deleted file mode 100644 index db7463c9e15d..000000000000 --- a/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, fetchFromGitea, buildGoModule, nix-update-script }: - -buildGoModule rec { - pname = "codeberg-pages"; - version = "5.1"; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "Codeberg"; - repo = "pages-server"; - rev = "v${version}"; - hash = "sha256-txWRYQnJCGVZ0/6pZdKkRFsdUe2B+A0Fy0/WJCiBVa0="; - }; - - vendorHash = "sha256-0JPnBf4NA4t+63cNMZYnB56y93nOc8Wn7TstRiHgvhk="; - - postPatch = '' - # disable httptest - rm server/handler/handler_test.go - ''; - - ldflags = [ "-s" "-w" ]; - - tags = [ "sqlite" "sqlite_unlock_notify" "netgo" ]; - - passthru.updateScript = nix-update-script {}; - - meta = with lib; { - 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-cli/0001-use-builtin-go-syscerts.patch b/pkgs/development/tools/continuous-integration/drone-cli/0001-use-builtin-go-syscerts.patch deleted file mode 100644 index 6dfb50271a49..000000000000 --- a/pkgs/development/tools/continuous-integration/drone-cli/0001-use-builtin-go-syscerts.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 93f4f92b017935a35988e7210036db8020753f9e Mon Sep 17 00:00:00 2001 -From: Jake Hillion <jake@hillion.co.uk> -Date: Sun, 21 Feb 2021 21:26:39 +0000 -Subject: [PATCH] removed dependency for systemcertpool - ---- - drone/internal/util.go | 7 +++++-- - go.mod | 1 - - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/drone/internal/util.go b/drone/internal/util.go -index 46c8ec6f..25d4def7 100644 ---- a/drone/internal/util.go -+++ b/drone/internal/util.go -@@ -2,11 +2,11 @@ package internal - - import ( - "crypto/tls" -+ "crypto/x509" - "fmt" - "net/http" - "strings" - -- "github.com/jackspirou/syscerts" - "github.com/urfave/cli" - "golang.org/x/net/proxy" - "golang.org/x/oauth2" -@@ -35,7 +35,10 @@ func NewClient(c *cli.Context) (drone.Client, error) { - } - - // attempt to find system CA certs -- certs := syscerts.SystemRootsPool() -+ certs, err := x509.SystemCertPool() -+ if err != nil { -+ return nil, err -+ } - tlsConfig := &tls.Config{ - RootCAs: certs, - InsecureSkipVerify: skip, diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix deleted file mode 100644 index 84432b82d495..000000000000 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, fetchFromGitHub -, buildGoModule -}: - -buildGoModule rec { - version = "1.8.0"; - pname = "drone-cli"; - revision = "v${version}"; - - src = fetchFromGitHub { - owner = "harness"; - repo = "drone-cli"; - rev = revision; - hash = "sha256-moxsGlm7Q9E0q9SZ2gZotn3tRbnbtwhDc9UNCCSb3pY="; - }; - - vendorHash = "sha256-rKZq2vIXvw4bZ6FXPqOip9dLiV5rSb1fWDJe3oxOBjw="; - - # patch taken from https://patch-diff.githubusercontent.com/raw/harness/drone-cli/pull/179.patch - # but with go.mod changes removed due to conflict - patches = [ ./0001-use-builtin-go-syscerts.patch ]; - - ldflags = [ - "-X main.version=${version}" - ]; - - doCheck = false; - - meta = with lib; { - mainProgram = "drone"; - maintainers = with maintainers; [ techknowlogick ]; - license = licenses.asl20; - description = "Command line client for the Drone continuous integration server"; - }; -} diff --git a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix deleted file mode 100644 index 05347f153c7a..000000000000 --- a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: - -buildGoModule rec { - pname = "drone-runner-docker"; - version = "1.8.3"; - - src = fetchFromGitHub { - owner = "drone-runners"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-ZoQeCuT5FRhxp/ikB0gkp3QVOQ6OS7ukkz4QanWT9G0="; - }; - - vendorHash = "sha256-KcNp3VdJ201oxzF0bLXY4xWHqHNz54ZrVSI96cfhU+k="; - - meta = with lib; { - maintainers = [ ]; - license = licenses.unfreeRedistributable; - homepage = "https://github.com/drone-runners/drone-runner-docker"; - description = "Drone pipeline runner that executes builds inside Docker containers"; - mainProgram = "drone-runner-docker"; - }; -} diff --git a/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix deleted file mode 100644 index 1e9d1e96a9a9..000000000000 --- a/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "drone-runner-exec"; - version = "unstable-2020-04-19"; - - src = fetchFromGitHub { - owner = "drone-runners"; - repo = "drone-runner-exec"; - rev = "c0a612ef2bdfdc6d261dfbbbb005c887a0c3668d"; - sha256 = "sha256-0UIJwpC5Y2TQqyZf6C6neICYBZdLQBWAZ8/K1l6KVRs="; - }; - - vendorHash = "sha256-ypYuQKxRhRQGX1HtaWt6F6BD9vBpD8AJwx/4esLrJsw="; - - meta = with lib; { - description = "Drone pipeline runner that executes builds directly on the host machine"; - homepage = "https://github.com/drone-runners/drone-runner-exec"; - # https://polyformproject.org/licenses/small-business/1.0.0/ - license = licenses.unfree; - maintainers = with maintainers; [ mic92 ]; - mainProgram = "drone-runner-exec"; - }; -} diff --git a/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix deleted file mode 100644 index 92a015f8e95a..000000000000 --- a/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: - -buildGoModule rec { - pname = "drone-runner-ssh"; - version = "unstable-2022-12-22"; - - src = fetchFromGitHub { - owner = "drone-runners"; - repo = pname; - rev = "ee70745c60e070a7fac57d9cecc41252e7a3ff55"; - sha256 = "sha256-YUyhEA1kYIFLN+BI2A8PFeSgifoVNmNPKtdS58MwwVU="; - }; - - vendorHash = "sha256-Vj6ZmNwegKBVJPh6MsjtLMmX9WR76msuR2DPM8Qyhe0="; - - meta = with lib; { - description = "Experimental Drone runner that executes a pipeline on a remote machine"; - homepage = "https://github.com/drone-runners/drone-runner-ssh"; - license = licenses.unfreeRedistributable; - maintainers = teams.c3d2.members; - mainProgram = "drone-runner-ssh"; - }; -} diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix deleted file mode 100644 index 42aa1e5ab71d..000000000000 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ buildGoModule, fetchFromGitHub, stdenv, lib, installShellFiles }: - -buildGoModule rec { - pname = "fly"; - version = "7.11.2"; - - src = fetchFromGitHub { - owner = "concourse"; - repo = "concourse"; - rev = "v${version}"; - hash = "sha256-GopZTVdjnPQZ354UC6USHYew+bzuy2AxagsHeH7wseQ="; - }; - - vendorHash = "sha256-Tzp4pPaIJ08NkkBBKR4xkMEhQR7K+Egx8aHYeRog0Gk="; - - subPackages = [ "fly" ]; - - ldflags = [ - "-s" "-w" "-X github.com/concourse/concourse.Version=${version}" - ]; - - nativeBuildInputs = [ installShellFiles ]; - - doCheck = false; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd fly \ - --bash <($out/bin/fly completion --shell bash) \ - --fish <($out/bin/fly completion --shell fish) \ - --zsh <($out/bin/fly completion --shell zsh) - ''; - - meta = with lib; { - description = "Command line interface to Concourse CI"; - mainProgram = "fly"; - homepage = "https://concourse-ci.org"; - license = licenses.asl20; - maintainers = with maintainers; [ ivanbrennan SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix b/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix deleted file mode 100644 index 10e07234aafa..000000000000 --- a/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, fetchFromGitea -, buildGoModule -, testers -, gitea-actions-runner -}: - -buildGoModule rec { - pname = "gitea-actions-runner"; - version = "0.2.10"; - - src = fetchFromGitea { - domain = "gitea.com"; - owner = "gitea"; - repo = "act_runner"; - rev = "v${version}"; - hash = "sha256-YRWFBMHw9Fcmzkmglh2I1kXJkAAivqvCBcenLTjE/bI="; - }; - - vendorHash = "sha256-8sdSQhg9DnRLgghDZzWrUMM4vjinhCgu3dTKU7MBVQU="; - - ldflags = [ - "-s" - "-w" - "-X gitea.com/gitea/act_runner/internal/pkg/ver.version=v${version}" - ]; - - passthru.tests.version = testers.testVersion { - package = gitea-actions-runner; - version = "v${version}"; - }; - - meta = with lib; { - mainProgram = "act_runner"; - maintainers = with maintainers; [ techknowlogick ]; - license = licenses.mit; - changelog = "https://gitea.com/gitea/act_runner/releases/tag/v${version}"; - homepage = "https://gitea.com/gitea/act_runner"; - description = "Runner for Gitea based on act"; - }; -} diff --git a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix deleted file mode 100644 index adb2839de1d8..000000000000 --- a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, nixosTests }: - -stdenv.mkDerivation rec { - pname = "gocd-agent"; - version = "23.1.0"; - rev = "16079"; - - src = fetchurl { - url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-agent-${version}-${rev}.zip"; - sha256 = "sha256-L2MOkbVHoQu99lKrbnsNkhuU0SZ8VANSK72GZrGLbiQ="; - }; - - passthru.tests = { inherit (nixosTests) gocd-agent; }; - - meta = with lib; { - description = "Continuous delivery server specializing in advanced workflow modeling and visualization"; - homepage = "http://www.go.cd"; - license = licenses.asl20; - platforms = platforms.all; - sourceProvenance = with sourceTypes; [ - binaryBytecode - binaryNativeCode - ]; - maintainers = with maintainers; [ grahamc swarren83 ]; - }; - - nativeBuildInputs = [ unzip ]; - - buildCommand = " - unzip $src -d $out - mv $out/go-agent-${version} $out/go-agent - "; -} diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/development/tools/continuous-integration/gocd-server/default.nix deleted file mode 100644 index ce01ff95cc5a..000000000000 --- a/pkgs/development/tools/continuous-integration/gocd-server/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchurl -, unzip -, nixosTests -}: - -stdenv.mkDerivation rec { - pname = "gocd-server"; - version = "23.1.0"; - rev = "16079"; - - src = fetchurl { - url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-server-${version}-${rev}.zip"; - sha256 = "sha256-//d6izGm1odE25H/PI5pn51FfUL4/6GbLwKUKAqZ3Kw="; - }; - - meta = with lib; { - description = "Continuous delivery server specializing in advanced workflow modeling and visualization"; - homepage = "http://www.go.cd"; - license = licenses.asl20; - platforms = platforms.all; - sourceProvenance = with sourceTypes; [ - binaryBytecode - binaryNativeCode - ]; - maintainers = with maintainers; [ grahamc swarren83 ]; - }; - - nativeBuildInputs = [ unzip ]; - - passthru.tests = { - inherit (nixosTests) gocd-server; - }; - - buildCommand = " - unzip $src -d $out - mv $out/go-server-${version} $out/go-server - mkdir -p $out/go-server/conf - "; -} diff --git a/pkgs/development/tools/continuous-integration/hci/default.nix b/pkgs/development/tools/continuous-integration/hci/default.nix index 4f04e0494f0f..6da44a4786cd 100644 --- a/pkgs/development/tools/continuous-integration/hci/default.nix +++ b/pkgs/development/tools/continuous-integration/hci/default.nix @@ -2,7 +2,7 @@ let inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables appendConfigureFlags; inherit (lib) makeBinPath; - bundledBins = lib.optional stdenv.isLinux crun; + bundledBins = lib.optional stdenv.hostPlatform.isLinux crun; overrides = old: { hercules-ci-agent = diff --git a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix index 0da85bae969a..a01febb9113d 100644 --- a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix @@ -15,7 +15,7 @@ let inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables; inherit (lib) makeBinPath; - bundledBins = [ gnutar gzip git openssh ] ++ lib.optional stdenv.isLinux crun; + bundledBins = [ gnutar gzip git openssh ] ++ lib.optional stdenv.hostPlatform.isLinux crun; pkg = # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 @@ -43,7 +43,7 @@ in pkg.overrideAttrs (finalAttrs: o: { package = finalAttrs.finalPackage; command = "hercules-ci-agent --help"; }; - } // lib.optionalAttrs (stdenv.isLinux) { + } // lib.optionalAttrs (stdenv.hostPlatform.isLinux) { # Does not test the package, but evaluation of the related NixOS module. nixos-simple-config = (nixos { boot.loader.grub.enable = false; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix deleted file mode 100644 index cd11eb515e19..000000000000 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused -, makeWrapper, nix, nixfmt-classic, openjdk, writeScript, nixosTests, jq, cacert -, curl }: - -stdenv.mkDerivation rec { - pname = "jenkins"; - version = "2.462.2"; - - src = fetchurl { - url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-DkyU06S9QFdtZ5HBJkzaZuRGjjeSnnxcs+Vs+lCANHQ="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - mkdir -p "$out/bin" "$out/share" "$out/webapps" - - cp "$src" "$out/webapps/jenkins.war" - - # Create the `jenkins-cli` command. - ${openjdk}/bin/jar -xf "$src" WEB-INF/lib/cli-${version}.jar \ - && mv WEB-INF/lib/cli-${version}.jar "$out/share/jenkins-cli.jar" - - makeWrapper "${openjdk}/bin/java" "$out/bin/jenkins-cli" \ - --add-flags "-jar $out/share/jenkins-cli.jar" - ''; - - passthru = { - tests = { inherit (nixosTests) jenkins jenkins-cli; }; - - updateScript = writeScript "update.sh" '' - #!${stdenv.shell} - set -o errexit - PATH=${ - lib.makeBinPath [ - cacert - common-updater-scripts - coreutils - curl - git - gnused - jq - nix - nixfmt-classic - ] - } - - core_json="$(curl -s --fail --location https://updates.jenkins.io/stable/update-center.actual.json | jq .core)" - oldVersion=$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion jenkins" | tr -d '"') - - version="$(jq -r .version <<<$core_json)" - sha256="$(jq -r .sha256 <<<$core_json)" - hash="$(nix hash to-sri --type sha256 "$sha256")" - - if [ ! "$oldVersion" = "$version" ]; then - update-source-version jenkins "$version" "$hash" - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix" - nixfmt "$default_nix" - else - echo "jenkins is already up-to-date" - fi - ''; - }; - - meta = with lib; { - description = "Extendable open source continuous integration server"; - homepage = "https://jenkins.io/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.mit; - maintainers = with maintainers; - [ coconnor earldouglas nequissimus ] ++ teams.helsinki-systems.members; - changelog = "https://www.jenkins.io/changelog-stable/#v${version}"; - mainProgram = "jenkins-cli"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/continuous-integration/laminar/default.nix b/pkgs/development/tools/continuous-integration/laminar/default.nix deleted file mode 100644 index e32d3e4a9701..000000000000 --- a/pkgs/development/tools/continuous-integration/laminar/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchFromGitHub -, cmake -, capnproto -, sqlite -, boost -, zlib -, rapidjson -, pandoc -}: -let - js.vue = fetchurl { - url = "https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.12/vue.min.js"; - sha256 = "1hm5kci2g6n5ikrvp1kpkkdzimjgylv1xicg2vnkbvd9rb56qa99"; - }; - js.ansi_up = fetchurl { - url = "https://raw.githubusercontent.com/drudru/ansi_up/v4.0.4/ansi_up.js"; - sha256 = "1dx8wn38ds8d01kkih26fx1yrisg3kpz61qynjr4zil03ap0hrlr"; - }; - js.Chart = fetchurl { - url = "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/3.9.1/chart.min.js"; - hash = "sha256-+8RZJua0aEWg+QVVKg4LEzEEm/8RFez5Tb4JBNiV5xA="; - }; -in stdenv.mkDerivation rec { - pname = "laminar"; - version = "1.3"; - outputs = [ "out" "doc" ]; - src = fetchFromGitHub { - owner = "ohwgiles"; - repo = "laminar"; - rev = version; - hash = "sha256-eo5WzvmjBEe0LAfZdQ/U0XepEE2kdWKKiyE4HOi3RXk="; - }; - patches = [ ./patches/no-network.patch ]; - - # We need both binary from "capnproto" and library files. - nativeBuildInputs = [ cmake pandoc capnproto ]; - buildInputs = [ capnproto sqlite boost zlib rapidjson ]; - cmakeFlags = [ "-DLAMINAR_VERSION=${version}" ]; - - preBuild = '' - mkdir -p js css - cp ${js.vue} js/vue.min.js - cp ${js.ansi_up} js/ansi_up.js - cp ${js.Chart} js/Chart.min.js - ''; - - postInstall = '' - mv $out/usr/share/* $out/share/ - rmdir $out/usr/share $out/usr - - mkdir -p $out/share/doc/laminar - pandoc -s ../UserManual.md -o $out/share/doc/laminar/UserManual.html - rm -rf $out/lib # remove upstream systemd units - rm -rf $out/etc # remove upstream config file - ''; - - meta = with lib; { - description = "Lightweight and modular continuous integration service"; - homepage = "https://laminar.ohwg.net"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ kaction maralorn ]; - }; -} diff --git a/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch b/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch deleted file mode 100644 index 7b4d3134d69f..000000000000 --- a/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch +++ /dev/null @@ -1,39 +0,0 @@ -Build system that downloads stuff from network is bad. Build system that -does so unconditionally is twice as bad. - -Required files are downloaded as separate fixed-output derivations and -put into correct location before build phase starts. - ---- laminar-1.3/CMakeLists.txt -+++ laminar-1.3-new/CMakeLists.txt -@@ -82,13 +82,6 @@ - COMMAND sh -c '( echo -n "\\#define INDEX_HTML_UNCOMPRESSED_SIZE " && wc -c < "${CMAKE_SOURCE_DIR}/src/resources/index.html" ) > index_html_size.h' - DEPENDS src/resources/index.html) - --# Download 3rd-party frontend JS libs... --file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.12/vue.min.js -- js/vue.min.js EXPECTED_MD5 fb192338844efe86ec759a40152fcb8e) --file(DOWNLOAD https://raw.githubusercontent.com/drudru/ansi_up/v4.0.4/ansi_up.js -- js/ansi_up.js EXPECTED_MD5 b31968e1a8fed0fa82305e978161f7f5) --file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/Chart.js/3.9.1/chart.min.js -- js/Chart.min.js EXPECTED_MD5 7dd5ea7d2cf22a1c42b43c40093d2669) - # ...and compile them - generate_compressed_bins(${CMAKE_BINARY_DIR} js/vue.min.js - js/ansi_up.js js/Chart.min.js) -@@ -139,12 +132,12 @@ - target_link_libraries(laminar-tests ${GTEST_LIBRARIES} capnp-rpc capnp kj-http kj-async kj pthread sqlite3 z) - endif() - --set(SYSTEMD_UNITDIR /lib/systemd/system CACHE PATH "Path to systemd unit files") --set(BASH_COMPLETIONS_DIR /usr/share/bash-completion/completions CACHE PATH "Path to bash completions directory") --set(ZSH_COMPLETIONS_DIR /usr/share/zsh/site-functions CACHE PATH "Path to zsh completions directory") -+set(SYSTEMD_UNITDIR lib/systemd/system CACHE PATH "Path to systemd unit files") -+set(BASH_COMPLETIONS_DIR usr/share/bash-completion/completions CACHE PATH "Path to bash completions directory") -+set(ZSH_COMPLETIONS_DIR usr/share/zsh/site-functions CACHE PATH "Path to zsh completions directory") - install(TARGETS laminard RUNTIME DESTINATION sbin) - install(TARGETS laminarc RUNTIME DESTINATION bin) --install(FILES etc/laminar.conf DESTINATION /etc) -+install(FILES etc/laminar.conf DESTINATION etc) - install(FILES etc/laminarc-completion.bash DESTINATION ${BASH_COMPLETIONS_DIR} RENAME laminarc) - install(FILES etc/laminarc-completion.zsh DESTINATION ${ZSH_COMPLETIONS_DIR} RENAME _laminarc) - diff --git a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix b/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix deleted file mode 100644 index c8d28fa69dd2..000000000000 --- a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, testers -, woodpecker-plugin-git -}: - -buildGoModule rec { - pname = "woodpecker-plugin-git"; - version = "2.6.0"; - - src = fetchFromGitHub { - owner = "woodpecker-ci"; - repo = "plugin-git"; - rev = "refs/tags/${version}"; - hash = "sha256-ffP4CmvoxmXdwrWWOG2HIoz1pgmxTUdG5rPsgJ1+3do="; - }; - - vendorHash = "sha256-wB1Uv7ZSIEHzR8z96hwXScoGA31uhoql/wwAH3Olj2E="; - - CGO_ENABLED = "0"; - - ldflags = [ - "-s" - "-w" - "-X main.version=${version}" - ]; - - # Checks fail because they require network access. - doCheck = false; - - passthru.tests.version = testers.testVersion { package = woodpecker-plugin-git; }; - - meta = with lib; { - description = "Woodpecker plugin for cloning Git repositories"; - homepage = "https://woodpecker-ci.org/"; - changelog = "https://github.com/woodpecker-ci/plugin-git/releases/tag/${version}"; - license = licenses.asl20; - mainProgram = "plugin-git"; - maintainers = with maintainers; [ ambroisie ]; - }; -} diff --git a/pkgs/development/tools/cotton/default.nix b/pkgs/development/tools/cotton/default.nix index ec39c399bdd5..bc54f3154949 100644 --- a/pkgs/development/tools/cotton/default.nix +++ b/pkgs/development/tools/cotton/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; meta = with lib; { description = "Package manager for JavaScript projects"; diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix deleted file mode 100644 index 8da4eb40b8d6..000000000000 --- a/pkgs/development/tools/coursier/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts -, coreutils, git, gnused, nix, zlib }: - -let - libPath = lib.makeLibraryPath [ - zlib # libz.so.1 - ]; -in -stdenv.mkDerivation rec { - pname = "coursier"; - version = "2.1.11"; - - src = fetchurl { - url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - hash = "sha256-Gd5RM7QdFUmafr6ceQEvFjbQsWooHCiMDslG1MYFcrI="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - install -Dm555 $src $out/bin/cs - patchShebangs $out/bin/cs - wrapProgram $out/bin/cs \ - --prefix PATH ":" ${lib.makeBinPath [ jre ]} \ - --prefix LD_LIBRARY_PATH ":" ${libPath} - - runHook postInstall - ''; - - passthru.updateScript = writeScript "update.sh" '' - #!${stdenv.shell} - set -o errexit - PATH=${lib.makeBinPath [ common-updater-scripts coreutils git gnused nix ]} - oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" - latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags https://github.com/coursier/coursier.git 'v*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" - if [ "$oldVersion" != "$latestTag" ]; then - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/development/tools/coursier/default.nix" - update-source-version ${pname} "$latestTag" --version-key=version --print-changes - else - echo "${pname} is already up-to-date" - fi - ''; - - meta = with lib; { - homepage = "https://get-coursier.io/"; - description = "Scala library to fetch dependencies from Maven / Ivy repositories"; - mainProgram = "cs"; - license = licenses.asl20; - maintainers = with maintainers; [ adelbertc nequissimus ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/cpm-cmake/default.nix b/pkgs/development/tools/cpm-cmake/default.nix deleted file mode 100644 index 83d2019493c0..000000000000 --- a/pkgs/development/tools/cpm-cmake/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -}: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "cpm-cmake"; - version = "0.40.2"; - - src = fetchFromGitHub { - owner = "cpm-cmake"; - repo = "cpm.cmake"; - rev = "v${finalAttrs.version}"; - hash = "sha256-KIRVztkE72juIgXquZlC6AYo78QKHBD7iCvCa+ri66k="; - }; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/{,doc/}cpm - install -Dm644 cmake/CPM.cmake $out/share/cpm/CPM.cmake - install -Dm644 README.md CONTRIBUTING.md $out/share/doc/cpm/ - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/cpm-cmake/CPM.cmake"; - description = "CMake's missing package manager"; - longDescription = '' - CPM.cmake is a cross-platform CMake script that adds dependency - management capabilities to CMake. It's built as a thin wrapper around - CMake's FetchContent module that adds version control, caching, a - simple API and more. - ''; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/tools/cppclean/default.nix b/pkgs/development/tools/cppclean/default.nix deleted file mode 100644 index d48e21fffb5d..000000000000 --- a/pkgs/development/tools/cppclean/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, fetchFromGitHub, python3Packages }: - -with python3Packages; - -buildPythonApplication rec { - pname = "cppclean"; - version = "0.13"; - - src = fetchFromGitHub { - owner = "myint"; - repo = "cppclean"; - rev = "v${version}"; - sha256 = "081bw7kkl7mh3vwyrmdfrk3fgq8k5laacx7hz8fjpchrvdrkqph0"; - }; - - postUnpack = '' - patchShebangs . - ''; - - checkPhase = '' - ./test.bash - ''; - - meta = with lib; { - description = "Finds problems in C++ source that slow development of large code bases"; - mainProgram = "cppclean"; - homepage = "https://github.com/myint/cppclean"; - license = licenses.asl20; - maintainers = with maintainers; [ nthorne ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/crd2pulumi/default.nix b/pkgs/development/tools/crd2pulumi/default.nix deleted file mode 100644 index 7f49978543c2..000000000000 --- a/pkgs/development/tools/crd2pulumi/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "crd2pulumi"; - version = "1.5.0"; - - src = fetchFromGitHub { - owner = "pulumi"; - repo = "crd2pulumi"; - rev = "v${version}"; - sha256 = "sha256-DuTGsa8udtnYuWCqGZTXyELZsAse8EF2xiVcXl/SE3M="; - }; - - vendorHash = "sha256-pdrFG0vArpbPlXtgGulTLBvWttVps6vVZFn67tay2Gg="; - - ldflags = [ "-s" "-w" "-X github.com/pulumi/crd2pulumi/gen.Version=${src.rev}" ]; - - subPackages = [ "." ]; - - meta = with lib; { - description = "Generate typed CustomResources from a Kubernetes CustomResourceDefinition"; - mainProgram = "crd2pulumi"; - homepage = "https://github.com/pulumi/crd2pulumi"; - license = licenses.asl20; - maintainers = with maintainers; [ flokli ]; - }; -} diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix deleted file mode 100644 index ccd57d05895c..000000000000 --- a/pkgs/development/tools/ctlptl/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "ctlptl"; - version = "0.8.34"; - - src = fetchFromGitHub { - owner = "tilt-dev"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Fmv6hq7t0ZrlWIbK8ahCXzgNI8Mg94nTmb9rgd5KEEY="; - }; - - vendorHash = "sha256-d9TijRzBpMvRrOMexGtewtAA9XpLwDTjPnPzt7G67Cs="; - - nativeBuildInputs = [ installShellFiles ]; - - subPackages = [ "cmd/ctlptl" ]; - - ldflags = [ - "-s" - "-w" - "-X main.version=${version}" - ]; - - postInstall = '' - installShellCompletion --cmd ctlptl \ - --bash <($out/bin/ctlptl completion bash) \ - --fish <($out/bin/ctlptl completion fish) \ - --zsh <($out/bin/ctlptl completion zsh) - ''; - - meta = with lib; { - description = "CLI for declaratively setting up local Kubernetes clusters"; - homepage = "https://github.com/tilt-dev/ctlptl"; - license = licenses.asl20; - maintainers = with maintainers; [ svrana ]; - }; -} diff --git a/pkgs/development/tools/cuelsp/default.nix b/pkgs/development/tools/cuelsp/default.nix deleted file mode 100644 index b7a269843b35..000000000000 --- a/pkgs/development/tools/cuelsp/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "cuelsp"; - version = "0.3.4"; - - src = fetchFromGitHub { - owner = "dagger"; - repo = "cuelsp"; - rev = "v${version}"; - sha256 = "sha256-+E49TR2D26HSTwgwO1XFkIwXr5lmvv9l3KtR8dVT/cQ="; - }; - - vendorHash = "sha256-zg4aXPY2InY5VEX1GLJkGhMlfa5EezObAjIuX/bGvlc="; - - doCheck = false; - - subPackages = [ - "cmd/cuelsp" - ]; - - meta = with lib; { - description = "Language Server implementation for CUE, with built-in support for Dagger"; - mainProgram = "cuelsp"; - homepage = "https://github.com/dagger/cuelsp"; - license = licenses.asl20; - maintainers = with maintainers; [ sagikazarmark ]; - }; -} diff --git a/pkgs/development/tools/dapper/default.nix b/pkgs/development/tools/dapper/default.nix deleted file mode 100644 index 5e141bfee852..000000000000 --- a/pkgs/development/tools/dapper/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "dapper"; - version = "0.6.0"; - - src = fetchFromGitHub { - owner = "rancher"; - repo = "dapper"; - rev = "v${version}"; - sha256 = "sha256-V+lHnOmIWjI1qmoJ7+pp+cGmJAtSeY+r2I9zykswQzM="; - }; - vendorHash = null; - - patchPhase = '' - substituteInPlace main.go --replace 0.0.0 ${version} - ''; - - meta = with lib; { - description = "Docker build wrapper"; - mainProgram = "dapper"; - homepage = "https://github.com/rancher/dapper"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ kuznero ]; - }; -} diff --git a/pkgs/development/tools/database/apgdiff/default.nix b/pkgs/development/tools/database/apgdiff/default.nix deleted file mode 100644 index 8ce720efd681..000000000000 --- a/pkgs/development/tools/database/apgdiff/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, maven -, fetchFromGitHub -, jre -, makeWrapper -}: -maven.buildMavenPackage rec { - pname = "apgdiff"; - version = "2.7.0"; - - src = fetchFromGitHub { - sparseCheckout = [ "src" ]; - owner = "fordfrog"; - repo = "apgdiff"; - rev = "refs/tags/release_${version}"; - hash = "sha256-2m+9QNwQV2tJwOabTXE2xjRB5gDrSwyL6zL2op+wmkM="; - }; - - # Fix wrong version string in --help - postPatch = '' - sed -i 's/VersionNumber=.*/VersionNumber=${version}/' \ - src/main/resources/cz/startnet/utils/pgdiff/Resources.properties - ''; - - mvnHash = "sha256-zJQirS8sVqHKZsBukEOf7ox5IeiAVOP6wEHWb4CAyxc="; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - install -Dm644 target/apgdiff-${version}.jar $out/lib/apgdiff.jar - - mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/apgdiff \ - --argv0 apgdiff \ - --add-flags "-jar $out/lib/apgdiff.jar" - ''; - - meta = with lib; { - description = "Another PostgreSQL diff tool"; - mainProgram = "apgdiff"; - homepage = "https://apgdiff.com"; - license = licenses.mit; - inherit (jre.meta) platforms; - maintainers = [ maintainers.misterio77 ]; - }; -} diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix deleted file mode 100644 index 4eadbc101dd8..000000000000 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ buildGoModule -, clickhouse-backup -, fetchFromGitHub -, lib -, testers -}: - -buildGoModule rec { - pname = "clickhouse-backup"; - version = "2.6.1"; - - src = fetchFromGitHub { - owner = "Altinity"; - repo = "clickhouse-backup"; - rev = "v${version}"; - hash = "sha256-IaRM0wxG/8O12SuCls9MAtiobPHhuDFoFDaT3ZOn2Hk="; - }; - - vendorHash = "sha256-n3rlijycZ5qZtR/e+Z/UPCcr47p4wN3kFgfWr+73WAQ="; - - ldflags = [ - "-X main.version=${version}" - ]; - - postConfigure = '' - export CGO_ENABLED=0 - ''; - - passthru.tests.version = testers.testVersion { - package = clickhouse-backup; - }; - - meta = with lib; { - description = "Tool for easy ClickHouse backup and restore using object storage for backup files"; - mainProgram = "clickhouse-backup"; - homepage = "https://github.com/Altinity/clickhouse-backup"; - license = licenses.mit; - maintainers = with maintainers; [ devusb ]; - }; -} diff --git a/pkgs/development/tools/database/dblab/default.nix b/pkgs/development/tools/database/dblab/default.nix deleted file mode 100644 index 8cc1f8c5566a..000000000000 --- a/pkgs/development/tools/database/dblab/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "dblab"; - version = "0.26.0"; - - src = fetchFromGitHub { - owner = "danvergara"; - repo = "dblab"; - rev = "v${version}"; - hash = "sha256-3v9L1mV+DZ6FlrBoGSg8tewKJVyeqqacVj3yGVtYVHc="; - }; - - vendorHash = "sha256-3vtk4pJE/zRLCbIN+UFvxF/KdH4J5IiCsQ0Wu585wnM="; - - ldflags = [ "-s -w -X main.version=${version}" ]; - - # some tests require network access - doCheck = false; - - meta = with lib; { - description = "Database client every command line junkie deserves"; - homepage = "https://github.com/danvergara/dblab"; - license = licenses.mit; - maintainers = with maintainers; [ dit7ya ]; - }; -} diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix deleted file mode 100644 index 2241f25578ff..000000000000 --- a/pkgs/development/tools/database/dbmate/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "dbmate"; - version = "2.20.0"; - - src = fetchFromGitHub { - owner = "amacneil"; - repo = "dbmate"; - rev = "refs/tags/v${version}"; - hash = "sha256-5lsScWX7oaYU3IzqBYK41g96bLn2Er0XRq3nUgXI+Vk="; - }; - - vendorHash = "sha256-BtMvaMb36F9c1CJb7qAhkMW8jxuPJqlKRSlMzkEOMAY="; - - doCheck = false; - - meta = with lib; { - description = "Database migration tool"; - mainProgram = "dbmate"; - homepage = "https://github.com/amacneil/dbmate"; - changelog = "https://github.com/amacneil/dbmate/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ manveru ]; - }; -} diff --git a/pkgs/development/tools/database/dynein/default.nix b/pkgs/development/tools/database/dynein/default.nix index 618ca16417db..167374348459 100644 --- a/pkgs/development/tools/database/dynein/default.nix +++ b/pkgs/development/tools/database/dynein/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; preBuild = '' export OPENSSL_DIR=${lib.getDev openssl} diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/development/tools/database/ephemeralpg/default.nix deleted file mode 100644 index b50d22d76e78..000000000000 --- a/pkgs/development/tools/database/ephemeralpg/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, postgresql, getopt, makeWrapper }: -stdenv.mkDerivation rec { - pname = "ephemeralpg"; - version = "3.3"; - src = fetchurl { - url = "https://eradman.com/ephemeralpg/code/${pname}-${version}.tar.gz"; - hash = "sha256-pVQrfSpwJnxCRXAUpZQZsb0Z/wlLbjdaYmhVevgHrgo="; - }; - nativeBuildInputs = [ makeWrapper ]; - installPhase = '' - mkdir -p $out - PREFIX=$out make install - wrapProgram $out/bin/pg_tmp --prefix PATH : ${lib.makeBinPath [ postgresql getopt ]} - ''; - meta = with lib; { - description = "Run tests on an isolated, temporary PostgreSQL database"; - license = licenses.isc; - homepage = "https://eradman.com/ephemeralpg/"; - platforms = platforms.all; - maintainers = with maintainers; [ hrdinka medv ]; - }; -} diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix deleted file mode 100644 index 41861eb4e5e1..000000000000 --- a/pkgs/development/tools/database/liquibase/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ lib -, stdenv -, fetchurl -, gitUpdater -, jre -, makeWrapper -, mysqlSupport ? true -, mysql_jdbc -, postgresqlSupport ? true -, postgresql_jdbc -, redshiftSupport ? true -, redshift_jdbc -, liquibase_redshift_extension -}: - -let - extraJars = - lib.optional mysqlSupport mysql_jdbc - ++ lib.optional postgresqlSupport postgresql_jdbc - ++ lib.optionals redshiftSupport [ - redshift_jdbc - liquibase_redshift_extension - ]; -in - -stdenv.mkDerivation rec { - pname = "liquibase"; - version = "4.29.2"; - - src = fetchurl { - url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-HQF6IGqVqzB2pS9mBnnC2AufIXSULLBxXjXVOTHiDuk="; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre ]; - - unpackPhase = '' - tar xfz ${src} - ''; - - installPhase = - let addJars = dir: '' - for jar in ${dir}/*.jar; do - CP="\$CP":"\$jar" - done - ''; - in - '' - mkdir -p $out - mv ./{lib,licenses} $out/ - - mkdir -p $out/internal/lib - mv ./internal/lib/*.jar $out/internal/lib/ - - mkdir -p $out/share/doc/${pname}-${version} - mv LICENSE.txt \ - README.txt \ - ABOUT.txt \ - changelog.txt \ - $out/share/doc/${pname}-${version} - - mkdir -p $out/bin - # there’s a lot of escaping, but I’m not sure how to improve that - cat > $out/bin/liquibase <<EOF - #!/usr/bin/env bash - # taken from the executable script in the source - CP="" - ${addJars "$out/internal/lib"} - ${addJars "$out/lib"} - ${addJars "$out"} - ${lib.concatStringsSep "\n" (map (p: addJars "${p}/share/java") extraJars)} - ${lib.getBin jre}/bin/java -cp "\$CP" \$JAVA_OPTS \ - liquibase.integration.commandline.LiquibaseCommandLine \''${1+"\$@"} - EOF - chmod +x $out/bin/liquibase - ''; - - passthru.updateScript = gitUpdater { - url = "https://github.com/liquibase/liquibase"; - rev-prefix = "v"; - # The latest versions are in the 4.xx series. I am not sure where - # 10.10.10 and 5.0.0 came from, though it appears like they are - # for the commercial product. - ignoredVersions = "10.10.10|5.0.0|.*-beta.*"; - }; - - meta = with lib; { - description = "Version Control for your database"; - mainProgram = "liquibase"; - homepage = "https://www.liquibase.org/"; - changelog = "https://raw.githubusercontent.com/liquibase/liquibase/v${version}/changelog.txt"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.asl20; - maintainers = with maintainers; [ jsoo1 ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix deleted file mode 100644 index 9a20f12c0f60..000000000000 --- a/pkgs/development/tools/database/litecli/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, python3Packages -, fetchPypi -}: - -python3Packages.buildPythonApplication rec { - pname = "litecli"; - version = "1.11.0"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-YW3mjYfSuxi/XmaetrWmjVuTfqgaitQ5wfUaJdHIH1Y="; - }; - - propagatedBuildInputs = with python3Packages; [ - cli-helpers - click - configobj - prompt-toolkit - pygments - sqlparse - ]; - - nativeCheckInputs = with python3Packages; [ - pytestCheckHook - mock - ]; - - pythonImportsCheck = [ "litecli" ]; - - disabledTests = [ - "test_auto_escaped_col_names" - ]; - - meta = with lib; { - description = "Command-line interface for SQLite"; - mainProgram = "litecli"; - longDescription = '' - A command-line client for SQLite databases that has auto-completion and syntax highlighting. - ''; - homepage = "https://litecli.com"; - changelog = "https://github.com/dbcli/litecli/blob/v${version}/CHANGELOG.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ Scriptkiddi ]; - }; -} diff --git a/pkgs/development/tools/database/litefs/default.nix b/pkgs/development/tools/database/litefs/default.nix deleted file mode 100644 index e3dbdd780cd8..000000000000 --- a/pkgs/development/tools/database/litefs/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "litefs"; - version = "0.5.11"; - - src = fetchFromGitHub { - owner = "superfly"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-I12bKImZkvAMyfwb6r/NxE+BcUk+SalN+cIDXP0q4xA="; - }; - - vendorHash = "sha256-FcYPe4arb+jbxj4Tl6bRRAnkEvw0rkECIo8/zC79lOA="; - - subPackages = [ "cmd/litefs" ]; - - # following https://github.com/superfly/litefs/blob/main/Dockerfile - ldflags = [ - "-s" - "-w" - "-X main.Version=${version}" - "-extldflags=-static" - ]; - - tags = [ - "osusergo" - "netgo" - "sqlite_omit_load_extension" - ]; - - doCheck = false; # fails - - meta = with lib; { - description = "FUSE-based file system for replicating SQLite databases across a cluster of machines"; - homepage = "https://github.com/superfly/litefs"; - license = licenses.asl20; - maintainers = with maintainers; [ dit7ya ]; - mainProgram = "litefs"; - }; -} diff --git a/pkgs/development/tools/database/litestream/default.nix b/pkgs/development/tools/database/litestream/default.nix deleted file mode 100644 index b09b0168b0aa..000000000000 --- a/pkgs/development/tools/database/litestream/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, lib -, nixosTests -}: -buildGoModule rec { - pname = "litestream"; - version = "0.3.13"; - - src = fetchFromGitHub { - owner = "benbjohnson"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-p858gK+ICKDQ+/LUiBaxF/kfrZzQAXnYMZDFU8kNCJ4="; - }; - - ldflags = [ - "-s" - "-w" - "-X main.Version=${version}" - ]; - - vendorHash = "sha256-sYIY3Z3VrCqbjEbQtEY7q6Jljg8jMoa2qWEB/IkDjzM="; - - passthru.tests = { inherit (nixosTests) litestream; }; - - meta = with lib; { - description = "Streaming replication for SQLite"; - mainProgram = "litestream"; - license = licenses.asl20; - homepage = "https://litestream.io/"; - maintainers = with maintainers; [ fbrs ]; - knownVulnerabilities = [ "CVE-2024-41254" ]; - }; -} diff --git a/pkgs/development/tools/database/mermerd/default.nix b/pkgs/development/tools/database/mermerd/default.nix deleted file mode 100644 index f73cca5d01ec..000000000000 --- a/pkgs/development/tools/database/mermerd/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, testers -, mermerd -}: - -buildGoModule rec { - pname = "mermerd"; - version = "0.11.0"; - - src = fetchFromGitHub { - owner = "KarnerTh"; - repo = "mermerd"; - rev = "refs/tags/v${version}"; - hash = "sha256-7oBN9EeF3JBrOFuIM3lkNR2WMZA8PNDaKqdsVPawHBE="; - }; - - vendorHash = "sha256-bd/1LT0Pw25NhbnwQH3nmuCm3m8jBKPOYGRIRpcOGQI="; - - ldflags = [ - "-s" - "-w" - "-X=main.version=${version}" - "-X=main.commit=${src.rev}" - ]; - - # the tests expect a database to be running - doCheck = false; - - passthru.tests = { - version = testers.testVersion { - package = mermerd; - command = "mermerd version"; - }; - }; - - meta = with lib; { - description = "Create Mermaid-Js ERD diagrams from existing tables"; - mainProgram = "mermerd"; - homepage = "https://github.com/KarnerTh/mermerd"; - changelog = "https://github.com/KarnerTh/mermerd/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ austin-artificial ]; - }; -} diff --git a/pkgs/development/tools/database/movine/default.nix b/pkgs/development/tools/database/movine/default.nix deleted file mode 100644 index 51a4d8f2943b..000000000000 --- a/pkgs/development/tools/database/movine/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, pkg-config -, openssl -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "movine"; - version = "0.11.4"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-wa2GfV2Y8oX8G+1LbWnb2KH/+QbUYL9GXgOOVHpzbN8="; - }; - - cargoHash = "sha256-brM6QObhl9W5SZ+79Kv9oNxnglO24BUgjPSQy9jV1/Q="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - meta = with lib; { - description = "Migration manager written in Rust, that attempts to be smart yet minimal"; - mainProgram = "movine"; - homepage = "https://github.com/byronwasti/movine"; - license = licenses.mit; - longDescription = '' - Movine is a simple database migration manager that aims to be compatible - with real-world migration work. Many migration managers get confused - with complicated development strategies for migrations. Oftentimes - migration managers do not warn you if the SQL saved in git differs from - what was actually run on the database. Movine solves this issue by - keeping track of the unique hashes for the <literal>up.sql</literal> and - <literal>down.sql</literal> for each migration, and provides tools for - fixing issues. This allows users to easily keep track of whether their - local migration history matches the one on the database. - - This project is currently in early stages. - - Movine does not aim to be an ORM. - Consider <link xling:href="https://diesel.rs/">diesel</link> instead if - you want an ORM. - ''; - maintainers = with maintainers; [ netcrns ]; - }; -} diff --git a/pkgs/development/tools/database/pg_activity/default.nix b/pkgs/development/tools/database/pg_activity/default.nix deleted file mode 100644 index ccb4444c01c9..000000000000 --- a/pkgs/development/tools/database/pg_activity/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ python3Packages, fetchFromGitHub, lib }: - -python3Packages.buildPythonApplication rec { - pname = "pg_activity"; - version = "3.5.1"; - disabled = python3Packages.pythonOlder "3.8"; - - src = fetchFromGitHub { - owner = "dalibo"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-fqRECReeXjdoCieCYIsIumIjcMGN7UUbWHxxAfzm9co="; - }; - - propagatedBuildInputs = with python3Packages; [ - attrs - blessed - humanize - psutil - psycopg2 - ]; - - pythonImportsCheck = [ "pgactivity" ]; - - meta = with lib; { - description = "Top like application for PostgreSQL server activity monitoring"; - mainProgram = "pg_activity"; - homepage = "https://github.com/dalibo/pg_activity"; - license = licenses.postgresql; - maintainers = with maintainers; [ mausch ]; - }; -} diff --git a/pkgs/development/tools/database/pg_checksums/default.nix b/pkgs/development/tools/database/pg_checksums/default.nix deleted file mode 100644 index 0aac2409c07b..000000000000 --- a/pkgs/development/tools/database/pg_checksums/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libxslt, docbook_xsl, postgresql }: - -stdenv.mkDerivation rec { - pname = "pg_checksums"; - version = "1.1"; - - src = fetchFromGitHub { - owner = "credativ"; - repo = pname; - rev = version; - sha256 = "sha256-Ij+4ceQauX3tC97ftk/JS3/WlocPBf7A7PJrylpTLzw="; - }; - - nativeBuildInputs = [ libxslt.bin ]; - - buildInputs = [ postgresql ]; - - buildFlags = [ "all" "man" ]; - - preConfigure = '' - substituteInPlace doc/stylesheet-man.xsl \ - --replace "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" "${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" - ''; - - installPhase = '' - install -Dm755 -t $out/bin pg_checksums_ext - install -Dm644 -t $out/share/man/man1 doc/man1/pg_checksums_ext.1 - ''; - - meta = with lib; { - description = "Activate/deactivate/verify checksums in offline PostgreSQL clusters"; - homepage = "https://github.com/credativ/pg_checksums"; - maintainers = [ ]; - mainProgram = "pg_checksums_ext"; - platforms = postgresql.meta.platforms; - license = licenses.postgresql; - }; -} diff --git a/pkgs/development/tools/database/pgweb/default.nix b/pkgs/development/tools/database/pgweb/default.nix deleted file mode 100644 index b7ae5487d215..000000000000 --- a/pkgs/development/tools/database/pgweb/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, testers -, pgweb -}: - -buildGoModule rec { - pname = "pgweb"; - version = "0.16.1"; - - src = fetchFromGitHub { - owner = "sosedoff"; - repo = pname; - rev = "v${version}"; - hash = "sha256-lQc1ELeH2i9tate47rdHxFnvjQQUdg1B0CXcr5YGC+g="; - }; - - postPatch = '' - # Disable tests require network access. - rm -f pkg/client/{client,dump}_test.go - ''; - - vendorHash = "sha256-Jpvf6cST3kBvYzCQLoJ1fijUC/hP1ouptd2bQZ1J/Lo="; - - ldflags = [ "-s" "-w" ]; - - checkFlags = - let - skippedTests = [ - # There is a `/tmp/foo` file on the test machine causing the test case to fail on macOS - "TestParseOptions" - ]; - in - [ "-skip" "${builtins.concatStringsSep "|" skippedTests}" ]; - - passthru.tests.version = testers.testVersion { - version = "v${version}"; - package = pgweb; - command = "pgweb --version"; - }; - - meta = with lib; { - changelog = "https://github.com/sosedoff/pgweb/releases/tag/v${version}"; - description = "Web-based database browser for PostgreSQL"; - longDescription = '' - A simple postgres browser that runs as a web server. You can view data, - run queries and examine tables and indexes. - ''; - homepage = "https://sosedoff.github.io/pgweb/"; - license = licenses.mit; - mainProgram = "pgweb"; - maintainers = with maintainers; [ zupo luisnquin ]; - }; -} diff --git a/pkgs/development/tools/database/prisma-engines/Cargo.lock b/pkgs/development/tools/database/prisma-engines/Cargo.lock index 10e0ec53630e..bb37bb4c275a 100644 --- a/pkgs/development/tools/database/prisma-engines/Cargo.lock +++ b/pkgs/development/tools/database/prisma-engines/Cargo.lock @@ -30,9 +30,9 @@ dependencies = [ [[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", "getrandom 0.2.11", @@ -43,15 +43,6 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c" @@ -150,7 +141,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -161,7 +152,35 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", +] + +[[package]] +name = "async-tungstenite" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e661b6cb0a6eb34d02c520b052daa3aa9ac0cc02495c9d066bbce13ead132b" +dependencies = [ + "futures-io", + "futures-util", + "log", + "native-tls", + "pin-project-lite", + "tokio", + "tokio-native-tls", + "tungstenite", +] + +[[package]] +name = "async_io_stream" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" +dependencies = [ + "futures", + "pharos", + "rustc_version", + "tokio", ] [[package]] @@ -178,12 +197,12 @@ dependencies = [ ] [[package]] -name = "atomic-shim" -version = "0.2.0" +name = "atoi" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cd4b51d303cf3501c301e8125df442128d3c6d7c69f71b27833d253de47e77" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" dependencies = [ - "crossbeam-utils", + "num-traits", ] [[package]] @@ -258,6 +277,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] name = "bigdecimal" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -325,7 +350,7 @@ dependencies = [ "enumflags2", "indoc 2.0.3", "insta", - "query-engine-metrics", + "prisma-metrics", "query-engine-tests", "query-tests-setup", "regex", @@ -400,16 +425,16 @@ dependencies = [ [[package]] name = "bson" -version = "2.8.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88c18b51216e1f74b9d769cead6ace2f82b965b807e3d73330aabe9faec31c84" +checksum = "d8a88e82b9106923b5c4d6edfca9e7db958d4e98a478ec115022e81b9b38e2c8" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.11", "base64 0.13.1", "bitvec", "chrono", "hex", - "indexmap 1.9.3", + "indexmap 2.2.2", "js-sys", "once_cell", "rand 0.8.5", @@ -430,6 +455,10 @@ dependencies = [ ] [[package]] +name = "build-utils" +version = "0.1.0" + +[[package]] name = "bumpalo" version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -465,9 +494,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "cast" @@ -496,11 +525,11 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" dependencies = [ - "libc", + "shlex", ] [[package]] @@ -677,7 +706,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.58", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", ] [[package]] @@ -867,9 +905,12 @@ dependencies = [ name = "crosstarget-utils" version = "0.1.0" dependencies = [ + "derive_more", + "enumflags2", "futures", "js-sys", "pin-project", + "regex", "tokio", "wasm-bindgen", "wasm-bindgen-futures", @@ -892,7 +933,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f34ba9a9bcb8645379e9de8cb3ecfcf4d1c85ba66d90deb3259206fa5aa193b" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -948,6 +989,16 @@ dependencies = [ ] [[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]] name = "darling_core" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -976,6 +1027,20 @@ 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.58", +] + +[[package]] name = "darling_macro" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -998,16 +1063,27 @@ dependencies = [ ] [[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.58", +] + +[[package]] name = "dashmap" version = "5.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" dependencies = [ "cfg-if", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.8", + "parking_lot_core", ] [[package]] @@ -1036,6 +1112,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", + "serde", ] [[package]] @@ -1058,7 +1135,7 @@ dependencies = [ "convert_case 0.4.0", "proc-macro2", "quote", - "rustc_version 0.4.0", + "rustc_version", "syn 1.0.109", ] @@ -1131,11 +1208,11 @@ dependencies = [ "expect-test", "futures", "js-sys", - "metrics 0.18.1", "napi", "napi-derive", "once_cell", "pin-project", + "prisma-metrics", "quaint", "serde", "serde-wasm-bindgen", @@ -1244,14 +1321,14 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" [[package]] name = "enum-as-inner" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.58", ] [[package]] @@ -1272,7 +1349,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1292,6 +1369,17 @@ 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 = "expect-test" version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1330,6 +1418,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + +[[package]] name = "fallible-streaming-iterator" version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1365,6 +1459,17 @@ dependencies = [ ] [[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "spin 0.9.8", +] + +[[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1419,7 +1524,7 @@ checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1431,7 +1536,7 @@ dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1443,7 +1548,7 @@ dependencies = [ "frunk_core", "frunk_proc_macro_helpers", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1501,6 +1606,17 @@ dependencies = [ ] [[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + +[[package]] name = "futures-io" version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1514,7 +1630,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1633,7 +1749,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.9", "indexmap 2.2.2", "slab", "tokio", @@ -1649,15 +1765,6 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash 0.7.8", -] - -[[package]] -name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" @@ -1667,21 +1774,21 @@ dependencies = [ [[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" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.11", "allocator-api2", ] [[package]] name = "hashlink" -version = "0.8.3" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -1721,6 +1828,51 @@ 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 0.8.5", + "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 0.8.5", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", +] + +[[package]] name = "hmac" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1761,13 +1913,24 @@ 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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.9", "pin-project-lite", ] @@ -1794,7 +1957,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.9", "http-body", "httparse", "httpdate", @@ -1863,11 +2026,10 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.2.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] @@ -1890,6 +2052,7 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", + "serde", ] [[package]] @@ -1899,7 +2062,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] @@ -1949,21 +2112,12 @@ dependencies = [ ] [[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] name = "ipconfig" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.3", + "socket2 0.5.7", "widestring", "windows-sys 0.48.0", "winreg 0.50.0", @@ -2166,9 +2320,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" dependencies = [ "cc", "pkg-config", @@ -2255,15 +2409,6 @@ dependencies = [ ] [[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - -[[package]] name = "match_cfg" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2279,12 +2424,6 @@ dependencies = [ ] [[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] name = "md-5" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2316,92 +2455,48 @@ dependencies = [ [[package]] name = "metrics" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e52eb6380b6d2a10eb3434aec0885374490f5b82c8aaf5cd487a183c98be834" -dependencies = [ - "ahash 0.7.8", - "metrics-macros", -] - -[[package]] -name = "metrics" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142c53885123b68d94108295a09d4afe1a1388ed95b54d5dacd9a454753030f2" +checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261" dependencies = [ - "ahash 0.7.8", - "metrics-macros", + "ahash 0.8.11", + "portable-atomic", ] [[package]] name = "metrics-exporter-prometheus" -version = "0.10.0" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953cbbb6f9ba4b9304f4df79b98cdc9d14071ed93065a9fca11c00c5d9181b66" +checksum = "b4f0c8427b39666bf970460908b213ec09b3b350f20c0c2eabcbba51704a08e6" dependencies = [ - "hyper", - "indexmap 1.9.3", - "ipnet", - "metrics 0.19.0", - "metrics-util 0.13.0", - "parking_lot 0.11.2", + "base64 0.22.1", + "indexmap 2.2.2", + "metrics", + "metrics-util", "quanta", "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "metrics-macros" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49e30813093f757be5cf21e50389a24dc7dbb22c49f23b7e8f51d69b508a5ffa" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", ] [[package]] name = "metrics-util" -version = "0.12.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65a9e83b833e1d2e07010a386b197c13aa199bbd0fca5cf69bfa147972db890a" +checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828" dependencies = [ - "aho-corasick 0.7.20", - "atomic-shim", + "aho-corasick", "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.11.2", - "indexmap 1.9.3", - "metrics 0.18.1", + "hashbrown 0.14.5", + "indexmap 2.2.2", + "metrics", "num_cpus", "ordered-float", - "parking_lot 0.11.2", "quanta", "radix_trie", "sketches-ddsketch", ] [[package]] -name = "metrics-util" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1f4b69bef1e2b392b2d4a12902f2af90bb438ba4a66aa222d1023fa6561b50" -dependencies = [ - "atomic-shim", - "crossbeam-epoch", - "crossbeam-utils", - "hashbrown 0.11.2", - "metrics 0.19.0", - "num_cpus", - "parking_lot 0.11.2", - "quanta", - "sketches-ddsketch", -] - -[[package]] name = "mime" version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2436,9 +2531,9 @@ dependencies = [ [[package]] name = "mobc" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90eb49dc5d193287ff80e72a86f34cfb27aae562299d22fea215e06ea1059dd3" +checksum = "316a7d198b51958a0ab57248bf5f42d8409551203cb3c821d5925819a8d5415f" dependencies = [ "async-trait", "futures-channel", @@ -2446,7 +2541,7 @@ dependencies = [ "futures-timer", "futures-util", "log", - "metrics 0.18.1", + "metrics", "thiserror", "tokio", "tracing", @@ -2455,9 +2550,8 @@ dependencies = [ [[package]] name = "mongodb" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c30763a5c6c52079602be44fa360ca3bfacee55fca73f4734aecd23706a7f2" +version = "3.0.0" +source = "git+https://github.com/prisma/mongo-rust-driver.git?branch=RUST-1994/happy-eyeballs#31e0356391a7871bec000ae35fe0edc35582449e" dependencies = [ "async-trait", "base64 0.13.1", @@ -2471,9 +2565,12 @@ dependencies = [ "futures-io", "futures-util", "hex", + "hickory-proto", + "hickory-resolver", "hmac", - "lazy_static", "md-5", + "mongodb-internal-macros", + "once_cell", "pbkdf2", "percent-encoding", "rand 0.8.5", @@ -2485,16 +2582,14 @@ dependencies = [ "serde_with", "sha-1", "sha2 0.10.7", - "socket2 0.4.9", + "socket2 0.5.7", "stringprep", - "strsim 0.10.0", + "strsim 0.11.1", "take_mut", "thiserror", "tokio", "tokio-rustls 0.24.1", "tokio-util 0.7.8", - "trust-dns-proto", - "trust-dns-resolver", "typed-builder", "uuid", "webpki-roots", @@ -2511,6 +2606,16 @@ dependencies = [ ] [[package]] +name = "mongodb-internal-macros" +version = "3.0.0" +source = "git+https://github.com/prisma/mongo-rust-driver.git?branch=RUST-1994/happy-eyeballs#31e0356391a7871bec000ae35fe0edc35582449e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] name = "mongodb-query-connector" version = "0.1.0" dependencies = [ @@ -2527,15 +2632,16 @@ dependencies = [ "mongodb", "mongodb-client", "pretty_assertions", + "prisma-metrics", "prisma-value", "psl", "query-connector", - "query-engine-metrics", "query-structure", "rand 0.8.5", "regex", "serde", "serde_json", + "telemetry", "thiserror", "tokio", "tracing", @@ -2548,6 +2654,7 @@ dependencies = [ name = "mongodb-schema-connector" version = "0.1.0" dependencies = [ + "bson", "convert_case 0.6.0", "datamodel-renderer", "dissimilar", @@ -2576,6 +2683,7 @@ dependencies = [ name = "mongodb-schema-describer" version = "0.1.0" dependencies = [ + "bson", "futures", "mongodb", "serde", @@ -2687,9 +2795,9 @@ dependencies = [ [[package]] name = "napi" -version = "2.15.1" +version = "2.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43792514b0c95c5beec42996da0c1b39265b02b75c97baa82d163d3ef55cbfa7" +checksum = "214f07a80874bb96a8433b3cdfc84980d56c7b02e1a0d7ba4ba0db5cef785e2b" dependencies = [ "bitflags 2.4.0", "ctor", @@ -2709,38 +2817,38 @@ checksum = "ebd4419172727423cf30351406c54f6cc1b354a2cfb4f1dba3e6cd07f6d5522b" [[package]] name = "napi-derive" -version = "2.15.0" +version = "2.16.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7622f0dbe0968af2dacdd64870eee6dee94f93c989c841f1ad8f300cf1abd514" +checksum = "17435f7a00bfdab20b0c27d9c56f58f6499e418252253081bfff448099da31d1" dependencies = [ "cfg-if", "convert_case 0.6.0", "napi-derive-backend", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] name = "napi-derive-backend" -version = "1.0.59" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ec514d65fce18a959be55e7f683ac89c6cb850fb59b09e25ab777fd5a4a8d9e" +checksum = "967c485e00f0bf3b1bdbe510a38a4606919cf1d34d9a37ad41f25a81aa077abe" dependencies = [ "convert_case 0.6.0", "once_cell", "proc-macro2", "quote", "regex", - "semver 1.0.18", - "syn 2.0.48", + "semver", + "syn 2.0.58", ] [[package]] name = "napi-sys" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2503fa6af34dc83fb74888df8b22afe933b58d37daf7d80424b1c60c68196b8b" +checksum = "427802e8ec3a734331fec1035594a210ce1ff4dc5bc1950530920ab717964ea3" dependencies = [ "libloading 0.8.1", ] @@ -2934,7 +3042,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -2996,7 +3104,7 @@ dependencies = [ "async-trait", "futures", "futures-util", - "http", + "http 0.2.9", "opentelemetry", "prost", "thiserror", @@ -3021,9 +3129,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "2.10.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +checksum = "44d501f1a72f71d3c063a6bbc8f7271fa73aa09fe5d6283b6571e2ed176a2537" dependencies = [ "num-traits", ] @@ -3047,15 +3155,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] -name = "parking_lot" -version = "0.11.2" +name = "parking" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -3064,21 +3167,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -3185,7 +3274,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -3220,6 +3309,16 @@ dependencies = [ ] [[package]] +name = "pharos" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" +dependencies = [ + "futures", + "rustc_version", +] + +[[package]] name = "phf" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3254,7 +3353,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -3304,9 +3403,15 @@ dependencies = [ ] [[package]] +name = "portable-atomic" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" + +[[package]] name = "postgres-native-tls" version = "0.5.0" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#c62b9928d402685e152161907e8480603c29ef65" dependencies = [ "native-tls", "tokio", @@ -3316,13 +3421,13 @@ dependencies = [ [[package]] name = "postgres-protocol" -version = "0.6.4" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98" +version = "0.6.7" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#c62b9928d402685e152161907e8480603c29ef65" dependencies = [ - "base64 0.13.1", + "base64 0.22.1", "byteorder", "bytes", - "fallible-iterator", + "fallible-iterator 0.2.0", "hmac", "md-5", "memchr", @@ -3333,13 +3438,13 @@ dependencies = [ [[package]] name = "postgres-types" -version = "0.2.4" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98" +version = "0.2.8" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#c62b9928d402685e152161907e8480603c29ef65" dependencies = [ "bit-vec", "bytes", "chrono", - "fallible-iterator", + "fallible-iterator 0.2.0", "postgres-protocol", "serde", "serde_json", @@ -3388,6 +3493,7 @@ dependencies = [ name = "prisma-fmt" version = "0.1.0" dependencies = [ + "build-utils", "colored", "dissimilar", "dmmf", @@ -3404,6 +3510,27 @@ dependencies = [ ] [[package]] +name = "prisma-metrics" +version = "0.1.0" +dependencies = [ + "derive_more", + "expect-test", + "futures", + "metrics", + "metrics-exporter-prometheus", + "metrics-util", + "once_cell", + "parking_lot", + "pin-project", + "serde", + "serde_json", + "tokio", + "tracing", + "tracing-futures", + "tracing-subscriber", +] + +[[package]] name = "prisma-schema-build" version = "0.1.0" dependencies = [ @@ -3609,6 +3736,7 @@ name = "quaint" version = "0.2.0-alpha.13" dependencies = [ "async-trait", + "async-tungstenite", "base64 0.12.3", "bigdecimal", "bit-vec", @@ -3620,6 +3748,7 @@ dependencies = [ "connection-string", "crosstarget-utils", "either", + "enumflags2", "expect-test", "futures", "getrandom 0.2.11", @@ -3627,7 +3756,6 @@ dependencies = [ "indoc 0.3.6", "itertools 0.12.0", "lru-cache", - "metrics 0.18.1", "mobc", "mysql_async", "names 0.11.0", @@ -3638,8 +3766,10 @@ dependencies = [ "percent-encoding", "postgres-native-tls", "postgres-types", + "prisma-metrics", "quaint-test-macros", "quaint-test-setup", + "regex", "rusqlite", "serde", "serde_json", @@ -3648,11 +3778,12 @@ dependencies = [ "tiberius", "tokio", "tokio-postgres", - "tokio-util 0.6.10", + "tokio-util 0.7.8", "tracing", - "tracing-core", + "tracing-futures", "url", "uuid", + "ws_stream_tungstenite", ] [[package]] @@ -3681,16 +3812,15 @@ dependencies = [ [[package]] name = "quanta" -version = "0.9.3" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20afe714292d5e879d8b12740aa223c6a88f118af41870e8b6196e39a02238a8" +checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" dependencies = [ "crossbeam-utils", "libc", - "mach", "once_cell", "raw-cpuid", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi 0.11.0+wasi-snapshot-preview1", "web-sys", "winapi", ] @@ -3709,6 +3839,7 @@ dependencies = [ "query-structure", "serde", "serde_json", + "telemetry", "thiserror", "user-facing-errors", "uuid", @@ -3725,6 +3856,7 @@ dependencies = [ "crossbeam-channel", "crosstarget-utils", "cuid", + "derive_more", "enumflags2", "futures", "indexmap 2.2.2", @@ -3733,13 +3865,14 @@ dependencies = [ "once_cell", "opentelemetry", "petgraph 0.4.13", + "prisma-metrics", "psl", "query-connector", - "query-engine-metrics", "query-structure", "schema", "serde", "serde_json", + "telemetry", "thiserror", "tokio", "tracing", @@ -3757,6 +3890,7 @@ dependencies = [ "anyhow", "async-trait", "base64 0.13.1", + "build-utils", "connection-string", "enumflags2", "graphql-parser", @@ -3765,17 +3899,18 @@ dependencies = [ "mongodb-query-connector", "opentelemetry", "opentelemetry-otlp", + "prisma-metrics", "psl", "quaint", "query-connector", "query-core", - "query-engine-metrics", "request-handlers", "serde", "serde_json", "serial_test", "sql-query-connector", "structopt", + "telemetry", "thiserror", "tokio", "tracing", @@ -3791,6 +3926,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", + "build-utils", "cbindgen", "chrono", "connection-string", @@ -3809,6 +3945,7 @@ dependencies = [ "serde", "serde_json", "sql-query-connector", + "telemetry", "thiserror", "tokio", "tracing", @@ -3828,12 +3965,13 @@ dependencies = [ "connection-string", "napi", "opentelemetry", + "prisma-metrics", "psl", "query-connector", "query-core", - "query-engine-metrics", "serde", "serde_json", + "telemetry", "thiserror", "tracing", "tracing-futures", @@ -3846,29 +3984,12 @@ dependencies = [ ] [[package]] -name = "query-engine-metrics" -version = "0.1.0" -dependencies = [ - "expect-test", - "metrics 0.18.1", - "metrics-exporter-prometheus", - "metrics-util 0.12.1", - "once_cell", - "parking_lot 0.12.1", - "serde", - "serde_json", - "tokio", - "tracing", - "tracing-futures", - "tracing-subscriber", -] - -[[package]] name = "query-engine-node-api" version = "0.1.0" dependencies = [ "anyhow", "async-trait", + "build-utils", "connection-string", "driver-adapters", "futures", @@ -3876,17 +3997,18 @@ dependencies = [ "napi-build", "napi-derive", "opentelemetry", + "prisma-metrics", "psl", "quaint", "query-connector", "query-core", "query-engine-common", - "query-engine-metrics", "query-structure", "request-handlers", "serde", "serde_json", "sql-query-connector", + "telemetry", "thiserror", "tokio", "tracing", @@ -3912,9 +4034,9 @@ dependencies = [ "itertools 0.12.0", "once_cell", "paste", + "prisma-metrics", "prisma-value", "psl", - "query-engine-metrics", "query-test-macros", "query-tests-setup", "serde_json", @@ -3931,6 +4053,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", + "build-utils", "connection-string", "driver-adapters", "futures", @@ -3947,6 +4070,7 @@ dependencies = [ "serde-wasm-bindgen", "serde_json", "sql-query-connector", + "telemetry", "thiserror", "tokio", "tracing", @@ -4003,12 +4127,12 @@ dependencies = [ "nom", "once_cell", "parse-hyperlinks", + "prisma-metrics", "psl", "qe-setup", "quaint", "query-core", "query-engine", - "query-engine-metrics", "query-structure", "regex", "request-handlers", @@ -4016,6 +4140,7 @@ dependencies = [ "serde_json", "sql-query-connector", "strip-ansi-escapes", + "telemetry", "thiserror", "tokio", "tracing", @@ -4167,11 +4292,11 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "10.7.0" +version = "11.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", ] [[package]] @@ -4207,29 +4332,29 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", ] [[package]] name = "regex" -version = "1.10.3" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ - "aho-corasick 1.0.3", + "aho-corasick", "memchr", "regex-automata 0.4.5", "regex-syntax 0.8.2", @@ -4250,7 +4375,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ - "aho-corasick 1.0.3", + "aho-corasick", "memchr", "regex-syntax 0.8.2", ] @@ -4300,6 +4425,7 @@ dependencies = [ "serde", "serde_json", "sql-query-connector", + "telemetry", "thiserror", "tracing", "url", @@ -4318,7 +4444,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.9", "http-body", "hyper", "hyper-tls", @@ -4412,13 +4538,13 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" +checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" dependencies = [ "bitflags 2.4.0", "chrono", - "fallible-iterator", + "fallible-iterator 0.3.0", "fallible-streaming-iterator", "hashlink", "libsqlite3-sys", @@ -4456,30 +4582,21 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - -[[package]] -name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.18", + "semver", ] [[package]] name = "rustc_version_runtime" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d31b7153270ebf48bf91c65ae5b0c00e749c4cfad505f66530ac74950249582f" +checksum = "2dd18cd2bae1820af0b6ad5e54f4a51d0f3fcc53b05f845675074efcc7af071d" dependencies = [ - "rustc_version 0.2.3", - "semver 0.9.0", + "rustc_version", + "semver", ] [[package]] @@ -4648,6 +4765,7 @@ version = "0.1.0" dependencies = [ "backtrace", "base64 0.13.1", + "build-utils", "connection-string", "expect-test", "indoc 2.0.3", @@ -4726,30 +4844,15 @@ dependencies = [ [[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.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[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.209" +version = "1.0.206" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "5b3e4cd94123dd520a128bcd11e34d9e9e423e7e3e50425cb1b4b1e3549d0284" dependencies = [ "serde_derive", ] @@ -4776,13 +4879,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.206" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "fabfb6138d2383ea8208cf98ccf69cdfb1aff4088460681d84189aa259762f97" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -4793,7 +4896,7 @@ checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -4816,7 +4919,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -4833,24 +4936,32 @@ dependencies = [ [[package]] name = "serde_with" -version = "1.14.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.2.2", "serde", + "serde_derive", + "serde_json", "serde_with_macros", + "time", ] [[package]] name = "serde_with_macros" -version = "1.5.2" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" dependencies = [ - "darling 0.13.4", + "darling 0.20.10", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.58", ] [[package]] @@ -4863,7 +4974,7 @@ dependencies = [ "futures", "lazy_static", "log", - "parking_lot 0.12.1", + "parking_lot", "serial_test_derive", ] @@ -4875,7 +4986,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -4981,9 +5092,9 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "sketches-ddsketch" -version = "0.1.3" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04d2ecae5fcf33b122e2e6bd520a57ccf152d2dde3b38c71039df1a6867264ee" +checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" [[package]] name = "slab" @@ -4996,9 +5107,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -5012,12 +5123,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5031,6 +5142,9 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] [[package]] name = "sql-ddl" @@ -5077,6 +5191,7 @@ dependencies = [ "indoc 2.0.3", "jsonrpc-core", "once_cell", + "paste", "pretty_assertions", "prisma-value", "psl", @@ -5118,6 +5233,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", + "telemetry", "thiserror", "tokio", "tracing", @@ -5136,6 +5252,7 @@ dependencies = [ "datamodel-renderer", "either", "enumflags2", + "expect-test", "indexmap 2.2.2", "indoc 2.0.3", "once_cell", @@ -5150,6 +5267,8 @@ dependencies = [ "sql-schema-describer", "sqlformat", "sqlparser", + "sqlx-core", + "sqlx-sqlite", "tokio", "tracing", "tracing-futures", @@ -5206,6 +5325,61 @@ dependencies = [ ] [[package]] +name = "sqlx-core" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a999083c1af5b5d6c071d34a708a19ba3e02106ad82ef7bbd69f5e48266b613b" +dependencies = [ + "atoi", + "byteorder", + "bytes", + "crossbeam-queue", + "either", + "event-listener", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashbrown 0.14.5", + "hashlink", + "hex", + "indexmap 2.2.2", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "smallvec", + "sqlformat", + "thiserror", + "tracing", + "url", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2cdd83c008a622d94499c0006d8ee5f821f36c89b7d625c900e5dc30b5c5ee" +dependencies = [ + "atoi", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde_urlencoded", + "sqlx-core", + "tracing", + "url", +] + +[[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5249,6 +5423,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 = "structopt" version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5301,9 +5481,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -5335,6 +5515,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] +name = "telemetry" +version = "0.1.0" +dependencies = [ + "async-trait", + "crossbeam-channel", + "crosstarget-utils", + "cuid", + "derive_more", + "enumflags2", + "futures", + "indexmap 2.2.2", + "itertools 0.12.0", + "lru 0.7.8", + "once_cell", + "opentelemetry", + "prisma-metrics", + "psl", + "rand 0.8.5", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", + "tracing-futures", + "tracing-opentelemetry", + "tracing-subscriber", + "uuid", +] + +[[package]] name = "tempfile" version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5362,6 +5572,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", + "build-utils", "colored", "dmmf", "enumflags2", @@ -5433,7 +5644,7 @@ checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -5536,19 +5747,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.30.0" +version = "1.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd" +checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" dependencies = [ "backtrace", "bytes", "libc", "mio", "num_cpus", - "parking_lot 0.12.1", + "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] @@ -5565,13 +5776,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -5586,25 +5797,27 @@ dependencies = [ [[package]] name = "tokio-postgres" -version = "0.7.7" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98" +version = "0.7.12" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#c62b9928d402685e152161907e8480603c29ef65" dependencies = [ "async-trait", "byteorder", "bytes", - "fallible-iterator", + "fallible-iterator 0.2.0", "futures-channel", "futures-util", "log", - "parking_lot 0.12.1", + "parking_lot", "percent-encoding", "phf", "pin-project-lite", "postgres-protocol", "postgres-types", - "socket2 0.5.3", + "rand 0.8.5", + "socket2 0.5.7", "tokio", "tokio-util 0.7.8", + "whoami", ] [[package]] @@ -5647,7 +5860,6 @@ checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" dependencies = [ "bytes", "futures-core", - "futures-io", "futures-sink", "log", "pin-project-lite", @@ -5691,7 +5903,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.9", "http-body", "hyper", "hyper-timeout", @@ -5776,7 +5988,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -5867,51 +6079,6 @@ dependencies = [ ] [[package]] -name = "trust-dns-proto" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.2.3", - "ipnet", - "lazy_static", - "log", - "rand 0.8.5", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "url", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" -dependencies = [ - "cfg-if", - "futures-util", - "ipconfig", - "lazy_static", - "log", - "lru-cache", - "parking_lot 0.12.1", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "trust-dns-proto", -] - -[[package]] name = "try-lock" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5939,7 +6106,26 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.48", + "syn 2.0.58", +] + +[[package]] +name = "tungstenite" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "native-tls", + "rand 0.8.5", + "sha1", + "thiserror", + "utf-8", ] [[package]] @@ -5949,7 +6135,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "rand 0.8.5", + "rand 0.3.23", "static_assertions", ] @@ -6084,6 +6270,12 @@ dependencies = [ ] [[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] name = "utf8-width" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6194,38 +6386,39 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +name = "wasite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", "wasm-bindgen-shared", ] @@ -6243,9 +6436,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6253,22 +6446,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-logger" @@ -6328,6 +6521,17 @@ dependencies = [ ] [[package]] +name = "whoami" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" +dependencies = [ + "redox_syscall 0.5.7", + "wasite", + "web-sys", +] + +[[package]] name = "widestring" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6604,6 +6808,26 @@ dependencies = [ ] [[package]] +name = "ws_stream_tungstenite" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed39ff9f8b2eda91bf6390f9f49eee93d655489e15708e3bb638c1c4f07cecb4" +dependencies = [ + "async-tungstenite", + "async_io_stream", + "bitflags 2.4.0", + "futures-core", + "futures-io", + "futures-sink", + "futures-util", + "pharos", + "rustc_version", + "tokio", + "tracing", + "tungstenite", +] + +[[package]] name = "wyz" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6644,5 +6868,5 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 295c791d4f5e..7208dfb869ae 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -2,7 +2,6 @@ , lib , Security , openssl -, git , pkg-config , protobuf , rustPlatform @@ -14,13 +13,13 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "5.18.0"; + version = "5.22.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - hash = "sha256-ucAOz00dBgX2Bb63ueaBbyu1XtVQD+96EncUyo7STwA="; + hash = "sha256-aCzm7pEsgbZ4ZNir3DLNnUlmiydOpLNcW2FpIQ44B6E="; }; # Use system openssl. @@ -33,22 +32,17 @@ rustPlatform.buildRustPackage rec { "cuid-1.3.2" = "sha256-qBu1k/dJiA6rWBwk4nOOqouIneD9h2TTBT8tvs0TDfA="; "graphql-parser-0.3.0" = "sha256-0ZAsj2mW6fCLhwTETucjbu4rPNzfbNiHu2wVTBlTNe4="; "mysql_async-0.31.3" = "sha256-2wOupQ/LFV9pUifqBLwTvA0tySv+XWbxHiqs7iTzvvg="; - "postgres-native-tls-0.5.0" = "sha256-UYPsxhCkXXWk8yPbqjNS0illwjS5mVm3Z/jFwpVwqfw="; + "postgres-native-tls-0.5.0" = "sha256-pzMPNZzlvMaQqBu/V3ExPYVnoIaALeUaYJ4oo/hY9lA="; + "mongodb-3.0.0" = "sha256-1WQgY0zSZhFjt1nrLYTUBrpqBxpCCgKRSeGJLtkE6pw="; }; }; - nativeBuildInputs = [ pkg-config git ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl protobuf - ] ++ lib.optionals stdenv.isDarwin [ Security ]; - - # FIXME: Workaround Rust 1.80 support by updating time to 0.3.36 - # https://github.com/prisma/prisma-engines/issues/4989 - postPatch = '' - ln -sfn ${./Cargo.lock} Cargo.lock - ''; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; preBuild = '' export OPENSSL_DIR=${lib.getDev openssl} @@ -59,6 +53,8 @@ rustPlatform.buildRustPackage rec { export SQLITE_MAX_VARIABLE_NUMBER=250000 export SQLITE_MAX_EXPR_DEPTH=10000 + + export GIT_HASH=0000000000000000000000000000000000000000 ''; cargoBuildFlags = [ diff --git a/pkgs/development/tools/database/prqlc/default.nix b/pkgs/development/tools/database/prqlc/default.nix deleted file mode 100644 index 2eac6f4a2073..000000000000 --- a/pkgs/development/tools/database/prqlc/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, openssl -, sqlite -, zlib -, stdenv -, darwin -, python3 -}: - -rustPlatform.buildRustPackage rec { - pname = "prqlc"; - version = "0.13.0"; - - src = fetchFromGitHub { - owner = "prql"; - repo = "prql"; - rev = version; - hash = "sha256-XW0LnBt4gSuLQ8AjNTh6Rsd11x/dh45CQe818EZKRRs="; - }; - - cargoHash = "sha256-BecxuAOW+znKNe0s+UDPiqJ84BZU1P+f16Q53I4eXkI="; - - nativeBuildInputs = [ - pkg-config - rustPlatform.bindgenHook - ]; - - buildInputs = - [ - openssl - sqlite - zlib - ] - ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - ]; - - env = { - PYO3_PYTHON = "${python3}/bin/python3"; - }; - - # we are only interested in the prqlc binary - postInstall = '' - rm -r $out/bin/compile-files $out/bin/mdbook-prql $out/lib - ''; - - meta = with lib; { - description = "CLI for the PRQL compiler - a simple, powerful, pipelined SQL replacement"; - homepage = "https://github.com/prql/prql"; - changelog = "https://github.com/prql/prql/blob/${src.rev}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ dit7ya ]; - }; -} diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix deleted file mode 100644 index 03b0a5cecbbb..000000000000 --- a/pkgs/development/tools/database/pyrseas/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, python3Packages, fetchFromGitHub }: - -let - pgdbconn = python3Packages.buildPythonPackage rec { - pname = "pgdbconn"; - version = "0.8.0"; - - src = fetchFromGitHub { - owner = "perseas"; - repo = "pgdbconn"; - rev = "v${version}"; - sha256 = "09r4idk5kmqi3yig7ip61r6js8blnmac5n4q32cdcbp1rcwzdn6z"; - }; - - # The tests are impure (they try to access a PostgreSQL server) - doCheck = false; - - propagatedBuildInputs = with python3Packages; [ psycopg2 pytest ]; - }; -in - -python3Packages.buildPythonApplication rec { - pname = "pyrseas"; - version = "0.9.1"; - - src = fetchFromGitHub { - owner = "perseas"; - repo = "Pyrseas"; - rev = version; - sha256 = "sha256-+MxnxvbLMxK1Ak+qKpKe3GHbzzC+XHO0eR7rl4ON9H4="; - }; - - propagatedBuildInputs = with python3Packages; [ - psycopg2 - pytest - pyyaml - pgdbconn - ]; - - # The tests are impure (they try to access a PostgreSQL server) - doCheck = false; - - meta = { - description = "Declarative language to describe PostgreSQL databases"; - homepage = "https://perseas.github.io/"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ pmeunier ]; - }; -} diff --git a/pkgs/development/tools/database/replibyte/default.nix b/pkgs/development/tools/database/replibyte/default.nix index 4437e4738e16..f04a00e881ca 100644 --- a/pkgs/development/tools/database/replibyte/default.nix +++ b/pkgs/development/tools/database/replibyte/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; cargoBuildFlags = [ "--all-features" ]; diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix deleted file mode 100644 index 797ee27eeeb2..000000000000 --- a/pkgs/development/tools/database/shmig/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchFromGitHub -, withMySQL ? true, withPSQL ? false, withSQLite ? false -, mariadb, postgresql, sqlite, gawk, gnugrep, findutils, gnused -, lib -}: - -stdenv.mkDerivation rec { - pname = "shmig"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "mbucc"; - repo = "shmig"; - rev = "v${version}"; - sha256 = "15ry1d51d6dlzzzhck2x57wrq48vs4n9pp20bv2sz6nk92fva5l5"; - }; - - makeFlags = [ "PREFIX=$(out)" ]; - - postPatch = '' - patchShebangs . - - substituteInPlace shmig \ - --replace "\`which mysql\`" "${lib.optionalString withMySQL "${mariadb.client}/bin/mysql"}" \ - --replace "\`which psql\`" "${lib.optionalString withPSQL "${postgresql}/bin/psql"}" \ - --replace "\`which sqlite3\`" "${lib.optionalString withSQLite "${sqlite}/bin/sqlite3"}" \ - --replace "awk" "${gawk}/bin/awk" \ - --replace "grep" "${gnugrep}/bin/grep" \ - --replace "find" "${findutils}/bin/find" \ - --replace "sed" "${gnused}/bin/sed" - ''; - - preBuild = '' - mkdir -p $out/bin - ''; - - meta = with lib; { - description = "Minimalistic database migration tool with MySQL, PostgreSQL and SQLite support"; - mainProgram = "shmig"; - homepage = "https://github.com/mbucc/shmig"; - license = licenses.bsd3; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/database/sleek/Cargo.lock b/pkgs/development/tools/database/sleek/Cargo.lock deleted file mode 100644 index b7f385d76c7c..000000000000 --- a/pkgs/development/tools/database/sleek/Cargo.lock +++ /dev/null @@ -1,470 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "anstream" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is-terminal", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" - -[[package]] -name = "anstyle-parse" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "anstyle-wincon" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd" -dependencies = [ - "anstyle", - "windows-sys 0.48.0", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "clap" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" -dependencies = [ - "clap_builder", - "clap_derive", - "once_cell", -] - -[[package]] -name = "clap_builder" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" -dependencies = [ - "anstream", - "anstyle", - "bitflags", - "clap_lex", - "once_cell", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "errno" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.45.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 = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "io-lifetimes" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "is-terminal" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" -dependencies = [ - "hermit-abi", - "io-lifetimes", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "libc" -version = "0.2.141" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" - -[[package]] -name = "linux-raw-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[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 = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[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 = "quote" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rustix" -version = "0.37.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aef160324be24d31a62147fae491c14d2204a3865c7ca8c3b0d7f7bcb3ea635" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "sleek" -version = "0.3.0" -dependencies = [ - "clap", - "glob", - "sqlformat", - "thiserror", -] - -[[package]] -name = "sqlformat" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" -dependencies = [ - "itertools", - "nom", - "unicode_categories", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[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" diff --git a/pkgs/development/tools/database/sleek/default.nix b/pkgs/development/tools/database/sleek/default.nix deleted file mode 100644 index 0218917a2caa..000000000000 --- a/pkgs/development/tools/database/sleek/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "sleek"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "nrempel"; - repo = "sleek"; - rev = "v${version}"; - hash = "sha256-VQ0LmKhFsC12qoXCFHxtV5E+J7eRvZMVH0j+5r8pDk8="; - }; - - # 0.3.0 has been tagged before the actual Cargo.lock bump, resulting in an inconsitent lock file. - # To work around this, the Cargo.lock below is from the commit right after the tag: - # https://github.com/nrempel/sleek/commit/18c5457a813a16e3eebfc1c6f512131e6e8daa02 - postPatch = '' - ln -s --force ${./Cargo.lock} Cargo.lock - ''; - - cargoLock.lockFile = ./Cargo.lock; - - meta = with lib; { - description = "CLI tool for formatting SQL"; - homepage = "https://github.com/nrempel/sleek"; - license = licenses.mit; - maintainers = with maintainers; [ xrelkd ]; - mainProgram = "sleek"; - }; -} diff --git a/pkgs/development/tools/database/sqlboiler-crdb/default.nix b/pkgs/development/tools/database/sqlboiler-crdb/default.nix deleted file mode 100644 index df439bce808e..000000000000 --- a/pkgs/development/tools/database/sqlboiler-crdb/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib }: - -buildGoModule rec { - pname = "sqlboiler-crbd"; - version = "unstable-2022-06-12"; - - src = fetchFromGitHub { - owner = "glerchundi"; - repo = "sqlboiler-crdb"; - rev = "7b35c4d19c05fdc53d1efdcc074f20ee6b56f340"; - hash = "sha256-RlppCRYP7TlM1z1PiXtEVifNVxQHwLuoBXxgYIpUirE="; - }; - - vendorHash = "sha256-N16GH8ZDyeWWBsaaG4RkJwzAbuQ7E8YjZAgVsfeECo4"; - - doCheck = false; # requires a running testdb - - meta = with lib; { - description = "CockroachDB generator for usage with SQLBoiler"; - mainProgram = "sqlboiler-crdb"; - homepage = "https://github.com/glerchundi/sqlboiler-crdb/"; - maintainers = with maintainers; [ dgollings ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/development/tools/database/sqlc/default.nix deleted file mode 100644 index 9340132b63d9..000000000000 --- a/pkgs/development/tools/database/sqlc/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -let - version = "1.27.0"; -in -buildGoModule { - pname = "sqlc"; - inherit version; - - src = fetchFromGitHub { - owner = "sqlc-dev"; - repo = "sqlc"; - rev = "v${version}"; - hash = "sha256-wxQ+YPsDX0Z6B8whlQ/IaT2dRqapPL8kOuFEc6As1rU="; - }; - - proxyVendor = true; - vendorHash = "sha256-ndOw3uShF5TngpxYNumoK3H3R9v4crfi5V3ZCoSqW90="; - - subPackages = [ "cmd/sqlc" ]; - - meta = { - description = "Generate type-safe code from SQL"; - mainProgram = "sqlc"; - homepage = "https://sqlc.dev/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.adisbladis ]; - }; -} diff --git a/pkgs/development/tools/database/sqlcheck/default.nix b/pkgs/development/tools/database/sqlcheck/default.nix deleted file mode 100644 index 0673061c486d..000000000000 --- a/pkgs/development/tools/database/sqlcheck/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: - -stdenv.mkDerivation rec { - pname = "sqlcheck"; - version = "1.3"; - - src = fetchFromGitHub { - owner = "jarulraj"; - repo = "sqlcheck"; - rev = "v${version}"; - hash = "sha256-rGqCtEO2K+OT44nYU93mF1bJ07id+ixPkRSC8DcO6rY="; - fetchSubmodules = true; - }; - - patches = [ - # Fix gcc-13 build failure: - # https://github.com/jarulraj/sqlcheck/pull/62 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/jarulraj/sqlcheck/commit/ca131db13b860cf1d9194a1c7f7112f28f49acca.patch"; - hash = "sha256-uoF7rYvjdIUu82JCLXq/UGswgwM6JCpmABP4ItWjDe4="; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - doCheck = true; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Automatically identify anti-patterns in SQL queries"; - mainProgram = "sqlcheck"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/database/sqlcl/default.nix b/pkgs/development/tools/database/sqlcl/default.nix deleted file mode 100644 index 9bd1cca620e9..000000000000 --- a/pkgs/development/tools/database/sqlcl/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, makeWrapper, fetchurl, unzip, jdk }: - -stdenv.mkDerivation (finalAttrs: { - pname = "sqlcl"; - version = "24.2.0.180.1721"; - - src = fetchurl { - url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip"; - hash = "sha256-22cLWfeEqJm48KeUDDIMOnPu/R8oEAtBNBn3slfMGAE="; - }; - - nativeBuildInputs = [ makeWrapper unzip ]; - - unpackCmd = "unzip $curSrc"; - - installPhase = '' - mkdir -p $out/libexec - mv * $out/libexec/ - - makeWrapper $out/libexec/bin/sql $out/bin/sqlcl \ - --set JAVA_HOME ${jdk.home} \ - --chdir "$out/libexec/bin" - ''; - - meta = with lib; { - description = "Oracle's Oracle DB CLI client"; - longDescription = '' - Oracle SQL Developer Command Line (SQLcl) is a free command line - interface for Oracle Database. It allows you to interactively or batch - execute SQL and PL/SQL. SQLcl provides in-line editing, statement - completion, and command recall for a feature-rich experience, all while - also supporting your previously written SQL*Plus scripts. - ''; - homepage = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/"; - license = licenses.unfreeRedistributable; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ misterio77 ]; - }; -}) diff --git a/pkgs/development/tools/database/sqlcmd/default.nix b/pkgs/development/tools/database/sqlcmd/default.nix deleted file mode 100644 index 15c0542de096..000000000000 --- a/pkgs/development/tools/database/sqlcmd/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, installShellFiles -, lib -, sqlcmd -, testers -}: - -buildGoModule rec { - pname = "sqlcmd"; - version = "1.8.0"; - - src = fetchFromGitHub { - repo = "go-sqlcmd"; - owner = "microsoft"; - rev = "v${version}"; - sha256 = "sha256-QW8cDGXaj/10Y9UsU3WLalnFkf1+2ZBrFpf0Y5eTPUQ="; - }; - - vendorHash = "sha256-DgIn01nUIX1+JigC1Jr5ZqG3tAYiOPUm6md/TdcD2U4="; - proxyVendor = true; - - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; - - subPackages = [ "cmd/modern" ]; - - nativeBuildInputs = [ installShellFiles ]; - - preCheck = '' - export HOME=$(mktemp -d) - ''; - - postInstall = '' - mv $out/bin/modern $out/bin/sqlcmd - - installShellCompletion --cmd sqlcmd \ - --bash <($out/bin/sqlcmd completion bash) \ - --fish <($out/bin/sqlcmd completion fish) \ - --zsh <($out/bin/sqlcmd completion zsh) - ''; - - passthru.tests.version = testers.testVersion { - package = sqlcmd; - command = "sqlcmd --version"; - inherit version; - }; - - meta = { - description = "Command line tool for working with Microsoft SQL Server, Azure SQL Database, and Azure Synapse"; - mainProgram = "sqlcmd"; - homepage = "https://github.com/microsoft/go-sqlcmd"; - changelog = "https://github.com/microsoft/go-sqlcmd/releases/tag/v${version}"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.ratsclub ]; - }; -} diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix deleted file mode 100644 index 655156c176c6..000000000000 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib, stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }: - -let - version = "20.4.0.379.2205"; - - desktopItem = makeDesktopItem { - name = "sqldeveloper"; - exec = "sqldeveloper"; - icon = "sqldeveloper"; - desktopName = "Oracle SQL Developer"; - genericName = "Oracle SQL Developer"; - comment = "Oracle's Oracle DB GUI client"; - categories = [ "Development" ]; - }; -in - stdenv.mkDerivation { - - inherit version; - pname = "sqldeveloper"; - - src = requireFile rec { - name = "sqldeveloper-${version}-no-jre.zip"; - url = "https://www.oracle.com/tools/downloads/sqldev-downloads.html"; - message = '' - This Nix expression requires that ${name} already be part of the store. To - obtain it you need to - - - navigate to ${url} - - make sure that it says "Version ${version}" above the list of downloads - - if it does not, click on the "Previous Version" link below the downloads - and repeat until the version is correct. This is necessarry because as the - time of this writing there exists no permanent link for the current version - yet. - Also consider updating this package yourself (you probably just need to - change the `version` variable and update the sha256 to the one of the - new file) or opening an issue at the nixpkgs repo. - - accept the license agreement - - download the file listed under "Other Platforms" - - sign in or create an oracle account if neccessary - - and then add the file to the Nix store using either: - - nix-store --add-fixed sha256 ${name} - - or - - nix-prefetch-url --type sha256 file:///path/to/${name} - ''; - sha256 = "1h53gl41ydr7kim6q9ckg3xyhb0rhmwj7jnis0xz6vms52b3h59k"; - }; - - nativeBuildInputs = [ makeWrapper unzip ]; - - unpackCmd = "unzip $curSrc"; - - installPhase = '' - mkdir -p $out/libexec $out/share/{applications,pixmaps} - mv * $out/libexec/ - - mv $out/libexec/icon.png $out/share/pixmaps/sqldeveloper.png - cp ${desktopItem}/share/applications/* $out/share/applications - - makeWrapper $out/libexec/sqldeveloper/bin/sqldeveloper $out/bin/sqldeveloper \ - --set JAVA_HOME ${jdk.home} \ - --chdir "$out/libexec/sqldeveloper/bin" - ''; - - meta = with lib; { - description = "Oracle's Oracle DB GUI client"; - longDescription = '' - Oracle SQL Developer is a free integrated development environment that - simplifies the development and management of Oracle Database in both - traditional and Cloud deployments. SQL Developer offers complete - end-to-end development of your PL/SQL applications, a worksheet for - running queries and scripts, a DBA console for managing the database, - a reports interface, a complete data modeling solution, and a migration - platform for moving your 3rd party databases to Oracle. - ''; - homepage = "http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/"; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ardumont ]; - }; -} diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix deleted file mode 100644 index 16ae0bbad20d..000000000000 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - lib, - fetchFromGitHub, - python3, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "sqlfluff"; - version = "3.2.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "sqlfluff"; - repo = "sqlfluff"; - rev = "refs/tags/${version}"; - hash = "sha256-7bCfIWJV7gB+WbvMxmhJW1RM1pd3gA/bCuH+o4FGg/A="; - }; - - build-system = with python3.pkgs; [ setuptools ]; - - dependencies = - with python3.pkgs; - [ - appdirs - cached-property - chardet - click - colorama - configparser - diff-cover - jinja2 - oyaml - pathspec - pytest - regex - tblib - toml - tqdm - typing-extensions - ] - ++ lib.optionals (pythonOlder "3.8") [ - backports.cached-property - importlib_metadata - ]; - - nativeCheckInputs = with python3.pkgs; [ - hypothesis - pytestCheckHook - ]; - - disabledTestPaths = [ - # Don't run the plugin related tests - "plugins/sqlfluff-plugin-example/test/rules/rule_test_cases_test.py" - "plugins/sqlfluff-templater-dbt" - "test/core/plugin_test.py" - "test/diff_quality_plugin_test.py" - ]; - - disabledTests = [ - # dbt is not available yet - "test__linter__skip_dbt_model_disabled" - "test_rules__test_helper_has_variable_introspection" - "test__rules__std_file_dbt" - ]; - - pythonImportsCheck = [ "sqlfluff" ]; - - meta = with lib; { - description = "SQL linter and auto-formatter"; - homepage = "https://www.sqlfluff.com/"; - changelog = "https://github.com/sqlfluff/sqlfluff/blob/${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - mainProgram = "sqlfluff"; - }; -} diff --git a/pkgs/development/tools/database/sqlite-web/default.nix b/pkgs/development/tools/database/sqlite-web/default.nix deleted file mode 100644 index 610e872da187..000000000000 --- a/pkgs/development/tools/database/sqlite-web/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, python3Packages -, fetchPypi -}: - -python3Packages.buildPythonApplication rec { - pname = "sqlite-web"; - version = "0.6.4"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-5Bdd1C9M3HjvfDKdVvGSQ+/I0Iimvf1MZwPonRiqwqU="; - }; - - propagatedBuildInputs = with python3Packages; [ flask peewee pygments ]; - - # no tests in repository - doCheck = false; - - meta = with lib; { - description = "Web-based SQLite database browser"; - mainProgram = "sqlite_web"; - homepage = "https://github.com/coleifer/sqlite-web"; - license = licenses.mit; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 6b97b1c373d5..ec73d534007a 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -4,22 +4,22 @@ stdenv.mkDerivation (finalAttrs: { pname = "sqlitebrowser"; - version = "3.13.0"; + version = "3.13.1"; src = fetchFromGitHub { owner = "sqlitebrowser"; repo = "sqlitebrowser"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-2U0jnL2hmrxynMxEiObl10bKFAFlCrY2hulZ/Ggqimw="; + sha256 = "sha256-bpZnO8i8MDgOm0f93pBmpy1sZLJQ9R4o4ZLnGfT0JRg="; }; - patches = lib.optional stdenv.isDarwin ./macos.patch; + patches = lib.optional stdenv.hostPlatform.isDarwin ./macos.patch; # We should be using qscintilla from nixpkgs instead of the vendored version, # but qscintilla is currently in a bit of a mess as some consumers expect a # -qt4 or -qt5 prefix while others do not. # We *really* should get that cleaned up. - buildInputs = [ qtbase sqlcipher ] ++ lib.optional stdenv.isDarwin qtmacextras; + buildInputs = [ qtbase sqlcipher ] ++ lib.optional stdenv.hostPlatform.isDarwin qtmacextras; nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index bd23f523276a..31d538597e51 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { pname = "squirrel-sql"; - version = "4.7.1"; + version = "4.8.0"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "sha256-Y7eG2otbLjtXvs3mRXWL8jJywuhBQ9i/MfWJXvkxnuU="; + sha256 = "sha256-uQuzh9CyGNJsbYvQiQAYmIyBgpIzXALg8dTFB1USkr0="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix index a8243353adea..e47174c93450 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/default.nix +++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix @@ -10,7 +10,7 @@ let pname = "surrealdb-migrations"; - version = "2.0.0-preview.3"; + version = "2.0.0"; in rustPlatform.buildRustPackage rec { inherit pname version; @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec { owner = "Odonno"; repo = pname; rev = "v${version}"; - hash = "sha256-BSLUhXxZyffH6HX3RR6PqXts76ERa0bpct/qs0Sf0NE="; + hash = "sha256-MrIawJr8EydfYFVzxODUZ7jDj0B0M1FAuX4Arktbf4Y="; }; - cargoHash = "sha256-jj1ytX44XoNKR+TCn/MpWk8CFM/DvHSwyfjVe3ca+AA="; + cargoHash = "sha256-ELYBEQrh80LdNYNZwcGVh9GE+dSfjF+RuO8fd0PabIw="; buildInputs = [ ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; # Error: No such file or directory (os error 2) # failures: diff --git a/pkgs/development/tools/database/termdbms/default.nix b/pkgs/development/tools/database/termdbms/default.nix deleted file mode 100644 index 06521cde30a9..000000000000 --- a/pkgs/development/tools/database/termdbms/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: - -buildGoModule rec { - pname = "termdbms"; - version = "unstable-2021-09-04"; - - src = fetchFromGitHub { - owner = "mathaou"; - repo = "termdbms"; - rev = "d46e72c796e8aee0def71b8e3499b0ebe5ca3385"; - hash = "sha256-+4y9JmLnu0xCJs1p1GNwqCx2xP6YvbIPb4zuClt8fbA="; - }; - - vendorHash = "sha256-RtgHus8k+6lvecG7+zABTo0go3kgoQj0S+3HaJHhKkE="; - - patches = [ ./viewer.patch ]; - - ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; - - meta = with lib; { - homepage = "https://github.com/mathaou/termdbms/"; - description = "TUI for viewing and editing database files"; - license = licenses.mit; - maintainers = with maintainers; [ izorkin ]; - mainProgram = "sqlite3-viewer"; - }; -} diff --git a/pkgs/development/tools/database/termdbms/viewer.patch b/pkgs/development/tools/database/termdbms/viewer.patch deleted file mode 100644 index 1b95c71de46b..000000000000 --- a/pkgs/development/tools/database/termdbms/viewer.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/viewer/viewer.go b/viewer/viewer.go -index fcf850e..b0a0f8d 100644 ---- a/viewer/viewer.go -+++ b/viewer/viewer.go -@@ -5,7 +5,6 @@ import ( - "github.com/charmbracelet/bubbles/viewport" - tea "github.com/charmbracelet/bubbletea" - "github.com/charmbracelet/lipgloss" -- "github.com/mattn/go-runewidth" - "math" - "runtime" - "strings" diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix deleted file mode 100644 index 37bad3e03d63..000000000000 --- a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "timescaledb-parallel-copy"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "timescale"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-HxaGKJnLZjPPJXoccAx0XUsCrZiG09c40zeSbHYXm04="; - }; - - vendorHash = "sha256-muxtr80EjnRoHG/TCEQwrBwlnARsfqWoYlR0HavMe6U="; - - meta = with lib; { - description = "Bulk, parallel insert of CSV records into PostgreSQL"; - mainProgram = "timescaledb-parallel-copy"; - homepage = "https://github.com/timescale/timescaledb-parallel-copy"; - license = licenses.asl20; - maintainers = with maintainers; [ thoughtpolice ]; - }; -} diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix deleted file mode 100644 index 71e1073f327d..000000000000 --- a/pkgs/development/tools/database/timescaledb-tune/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "timescaledb-tune"; - version = "0.17.0"; - - src = fetchFromGitHub { - owner = "timescale"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-HCl0v9hS9/UgzLniFQ7QFb5pdOAnnoomT3Zv3BLf/Ac="; - }; - - vendorHash = "sha256-7u3eceVDnzjhGguijJXbm40qyCPO/Q101Zr5vEcGEqs="; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Tool for tuning your TimescaleDB for better performance"; - mainProgram = "timescaledb-tune"; - homepage = "https://github.com/timescale/timescaledb-tune"; - license = licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/database/trino-cli/default.nix b/pkgs/development/tools/database/trino-cli/default.nix deleted file mode 100644 index e52881c6f5f5..000000000000 --- a/pkgs/development/tools/database/trino-cli/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, jre_headless, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "trino-cli"; - version = "439"; - - jarfilename = "${pname}-${version}-executable.jar"; - - nativeBuildInputs = [ makeWrapper ]; - - src = fetchurl { - url = "mirror://maven/io/trino/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-ANrv3+hpRn00zFAu6FHltk6seQ4lP2esDIhsJrctfY0="; - }; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - - install -D "$src" "$out/share/java/${jarfilename}" - - makeWrapper ${jre_headless}/bin/java $out/bin/trino \ - --add-flags "-jar $out/share/java/${jarfilename}" - - runHook postInstall - ''; - - meta = with lib; { - description = "Trino CLI provides a terminal-based, interactive shell for running queries"; - mainProgram = "trino"; - homepage = "https://github.com/trinodb/trino"; - license = licenses.asl20; - maintainers = with maintainers; [ regadas cpcloud ]; - }; -} diff --git a/pkgs/development/tools/database/vitess/default.nix b/pkgs/development/tools/database/vitess/default.nix deleted file mode 100644 index 1363cf66b304..000000000000 --- a/pkgs/development/tools/database/vitess/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, sqlite }: - -buildGoModule rec { - pname = "vitess"; - version = "20.0.2"; - - src = fetchFromGitHub { - owner = "vitessio"; - repo = pname; - rev = "v${version}"; - hash = "sha256-I+pz8bz/H1mg7cQnPiJZxYr1gyzajMLVqg8yHbBXYLc="; - }; - - vendorHash = "sha256-ZDPDL7vJoPv5pIS5xhHAgLiZsiF2B85KNnqGQJPk1SQ="; - - buildInputs = [ sqlite ]; - - subPackages = [ "go/cmd/..." ]; - - # integration tests require access to syslog and root - doCheck = false; - - meta = with lib; { - homepage = "https://vitess.io/"; - changelog = "https://github.com/vitessio/vitess/releases/tag/v${version}"; - description = "Database clustering system for horizontal scaling of MySQL"; - license = licenses.asl20; - maintainers = with maintainers; [ urandom ]; - }; -} diff --git a/pkgs/development/tools/database/webdis/default.nix b/pkgs/development/tools/database/webdis/default.nix deleted file mode 100644 index 02cab4c36570..000000000000 --- a/pkgs/development/tools/database/webdis/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, hiredis -, http-parser -, jansson -, libevent -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "webdis"; - version = "0.1.22"; - - src = fetchFromGitHub { - owner = "nicolasff"; - repo = "webdis"; - rev = finalAttrs.version; - hash = "sha256-83nZMqRK1uEWR1xn9lzbTyM0kuAkhmvm999cGu6Yu3k="; - }; - - buildInputs = [ hiredis http-parser jansson libevent ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - "CONFDIR=${placeholder "out"}/share/webdis" - ]; - - meta = { - description = "Redis HTTP interface with JSON output"; - mainProgram = "webdis"; - homepage = "https://webd.is/"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ wucke13 ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix deleted file mode 100644 index 79e352deb532..000000000000 --- a/pkgs/development/tools/datree/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -, testers -, datree -}: - -buildGoModule rec { - pname = "datree"; - version = "1.9.19"; - - src = fetchFromGitHub { - owner = "datreeio"; - repo = "datree"; - rev = "refs/tags/${version}"; - hash = "sha256-W1eX7eUMdPGbHA/f08xkG2EUeZmaunEAQn7/LRBe2nk="; - }; - - vendorHash = "sha256-+PQhuIO4KjXtW/ZcS0OamuOHzK7ZL+nwOBxeCRoXuKE="; - - nativeBuildInputs = [ installShellFiles ]; - - ldflags = [ - "-s" - "-w" - "-X github.com/datreeio/datree/cmd.CliVersion=${version}" - ]; - - tags = [ "main" ]; - - postInstall = '' - installShellCompletion \ - --cmd datree \ - --bash <($out/bin/datree completion bash) \ - --fish <($out/bin/datree completion fish) \ - --zsh <($out/bin/datree completion zsh) - ''; - - passthru.tests.version = testers.testVersion { - package = datree; - command = "datree version"; - }; - - meta = with lib; { - description = "CLI tool to ensure K8s manifests and Helm charts follow best practices"; - mainProgram = "datree"; - longDescription = '' - Datree provides an E2E policy enforcement solution to run automatic checks - for rule violations. Datree can be used on the command line, admission - webhook, or even as a kubectl plugin to run policies against Kubernetes - objects. - ''; - homepage = "https://datree.io/"; - changelog = "https://github.com/datreeio/datree/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ azahi jceb ]; - }; -} diff --git a/pkgs/development/tools/dbus-test-runner/default.nix b/pkgs/development/tools/dbus-test-runner/default.nix deleted file mode 100644 index 93b186095923..000000000000 --- a/pkgs/development/tools/dbus-test-runner/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ stdenv -, lib -, fetchbzr -, testers -, autoreconfHook -, bash -, dbus -, dbus-glib -, glib -, intltool -, pkg-config -, python3 -, xvfb-run -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dbus-test-runner"; - version = "unstable-2019-10-02"; - - src = fetchbzr { - url = "lp:dbus-test-runner"; - rev = "109"; - sha256 = "sha256-4yH19X98SVqpviCBIWzIX6FYHWxCbREpuKCNjQuTFDk="; - }; - - postPatch = '' - patchShebangs tests/test-wait-outputer - - # Tests `cat` together build shell scripts - # true is a PATHable call, bash a shebang - substituteInPlace tests/Makefile.am \ - --replace '/bin/true' 'true' \ - --replace '/bin/bash' '${lib.getExe bash}' - ''; - - strictDeps = true; - - nativeBuildInputs = [ - autoreconfHook - glib # for autoconf macro, gtester, gdbus - intltool - pkg-config - ]; - - buildInputs = [ - dbus-glib - glib - ]; - - nativeCheckInputs = [ - bash - dbus - (python3.withPackages (ps: with ps; [ - python-dbusmock - ])) - xvfb-run - ]; - - enableParallelBuilding = true; - - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - - checkFlags = [ - "XVFB_RUN=${lib.getExe xvfb-run}" - ]; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = with lib; { - description = "Small little utility to run a couple of executables under a new DBus session for testing"; - mainProgram = "dbus-test-runner"; - homepage = "https://launchpad.net/dbus-test-runner"; - license = licenses.gpl3Only; - platforms = platforms.unix; - maintainers = teams.lomiri.members; - pkgConfigModules = [ - "dbustest-1" - ]; - }; -}) diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/development/tools/dcadec/default.nix deleted file mode 100644 index bf531476566e..000000000000 --- a/pkgs/development/tools/dcadec/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "dcadec"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "foo86"; - repo = pname; - rev = "v" + version; - sha256 = "07nd0ajizrp1w02bsyfcv18431r8m8rq8gjfmz9wmckpg7cxj2hs"; - }; - - installPhase = "make PREFIX=/ DESTDIR=$out install"; - - doCheck = false; # fails with "ERROR: Run 'git submodule update --init test/samples' first." - - meta = with lib; { - description = "DTS Coherent Acoustics decoder with support for HD extensions"; - mainProgram = "dcadec"; - maintainers = with maintainers; [ edwtjo ]; - homepage = "https://github.com/foo86/dcadec"; - license = licenses.lgpl21; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix deleted file mode 100644 index 0f47035721e6..000000000000 --- a/pkgs/development/tools/ddosify/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "ddosify"; - version = "1.0.6"; - - src = fetchFromGitHub { - owner = "ddosify"; - repo = "ddosify"; - rev = "refs/tags/v${version}"; - hash = "sha256-5K/qXtdlDC09dEjRwYvoh9SapGLNmvywDMiNdwZDDTQ="; - }; - - vendorHash = "sha256-Wg4JzA2aEwNBsDrkauFUb9AS38ITLBGex9QHzDcdpoM="; - - ldflags = [ - "-s" - "-w" - "-X=main.GitVersion=${version}" - "-X=main.GitCommit=unknown" - "-X=main.BuildDate=unknown" - ]; - - # TestCreateHammerMultipartPayload error occurred - Get "https://upload.wikimedia.org/wikipedia/commons/b/bd/Test.svg" - doCheck = false; - - doInstallCheck = true; - - installCheckPhase = '' - $out/bin/ddosify -version | grep ${version} > /dev/null - ''; - - meta = with lib; { - description = "High-performance load testing tool, written in Golang"; - mainProgram = "ddosify"; - homepage = "https://ddosify.com/"; - changelog = "https://github.com/ddosify/ddosify/releases/tag/v${version}"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ bryanasdev000 ]; - }; -} diff --git a/pkgs/development/tools/deadnix/default.nix b/pkgs/development/tools/deadnix/default.nix deleted file mode 100644 index daea07c9ba3e..000000000000 --- a/pkgs/development/tools/deadnix/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, fetchFromGitHub -, rustPlatform -}: - -rustPlatform.buildRustPackage rec { - pname = "deadnix"; - version = "1.2.1"; - - src = fetchFromGitHub { - owner = "astro"; - repo = "deadnix"; - rev = "v${version}"; - hash = "sha256-xaaXGzTd+t1GjD2KpiS/c8acv6bXufv/lTN+ACRGVJw="; - }; - - cargoHash = "sha256-14onbdsactPJ27GTzG+culsdnwHvGdDXwBD9ZMq192Q="; - - meta = with lib; { - description = "Find and remove unused code in .nix source files"; - homepage = "https://github.com/astro/deadnix"; - license = licenses.gpl3Only; - mainProgram = "deadnix"; - maintainers = with maintainers; [ astro ]; - }; -} diff --git a/pkgs/development/tools/dec-decode/default.nix b/pkgs/development/tools/dec-decode/default.nix deleted file mode 100644 index 621e119dc090..000000000000 --- a/pkgs/development/tools/dec-decode/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "dec-decode"; - version = "unstable-2022-12-24"; - - src = fetchFromGitHub { - owner = "sammiq"; - repo = pname; - rev = "6ee103c"; - hash = "sha256-vOYKVl00oaXwp77pRLqUPnXQT5QuJfqnGGkQVBMq5W0="; - }; - - vendorHash = "sha256-zGWRzw1KUmifIsTudlgoKCR3+K0FLehHRSB3lNX+OWY="; - - meta = with lib; { - description = "Nintendo Wii iso.dec decoder"; - mainProgram = "dec-decode"; - homepage = "https://github.com/sammiq/dec-decode"; - license = licenses.unlicense; - maintainers = with maintainers; [ hughobrien ]; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix deleted file mode 100644 index 4552539bb76e..000000000000 --- a/pkgs/development/tools/delve/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, stdenv }: - -buildGoModule rec { - pname = "delve"; - version = "1.23.0"; - - src = fetchFromGitHub { - owner = "go-delve"; - repo = "delve"; - rev = "v${version}"; - hash = "sha256-LtrPcYyuobHq6O3/vBKLTOMZfpYL7P3mtGfVqCMV9iM="; - }; - - vendorHash = null; - - subPackages = [ "cmd/dlv" ]; - - nativeBuildInputs = [ makeWrapper ]; - - hardeningDisable = [ "fortify" ]; - - preCheck = '' - XDG_CONFIG_HOME=$(mktemp -d) - ''; - - # Disable tests on Darwin as they require various workarounds. - # - # - Tests requiring local networking fail with or without sandbox, - # even with __darwinAllowLocalNetworking allowed. - # - CGO_FLAGS warnings break tests' expected stdout/stderr outputs. - # - DAP test binaries exit prematurely. - doCheck = !stdenv.isDarwin; - - postInstall = '' - # fortify source breaks build since delve compiles with -O0 - wrapProgram $out/bin/dlv \ - --prefix disableHardening " " fortify - - # add symlink for vscode golang extension - # https://github.com/golang/vscode-go/blob/master/docs/debugging.md#manually-installing-dlv-dap - ln $out/bin/dlv $out/bin/dlv-dap - ''; - - meta = with lib; { - description = "debugger for the Go programming language"; - homepage = "https://github.com/go-delve/delve"; - maintainers = with maintainers; [ vdemeester ]; - license = licenses.mit; - mainProgram = "dlv"; - }; -} diff --git a/pkgs/development/tools/detekt/default.nix b/pkgs/development/tools/detekt/default.nix deleted file mode 100644 index 75ac8e45e4ae..000000000000 --- a/pkgs/development/tools/detekt/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ detekt, lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }: -stdenv.mkDerivation rec { - pname = "detekt"; - version = "1.23.7"; - - jarfilename = "${pname}-${version}-executable.jar"; - - src = fetchurl { - url = "https://github.com/detekt/detekt/releases/download/v${version}/detekt-cli-${version}-all.jar"; - sha256 = "sha256-hL7e0oMBLLKzi8rvSZZFL81gadLpynS1Dqp54K0hiX4="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - install -D "$src" "$out/share/java/${jarfilename}" - - makeWrapper ${jre_headless}/bin/java $out/bin/detekt \ - --add-flags "-jar $out/share/java/${jarfilename}" - - runHook postInstall - ''; - - passthru.tests.version = testers.testVersion { package = detekt; }; - - meta = with lib; { - description = "Static code analysis for Kotlin"; - mainProgram = "detekt"; - homepage = "https://detekt.dev/"; - license = licenses.asl20; - platforms = jre_headless.meta.platforms; - maintainers = with maintainers; [ mdr ]; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - }; -} diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index 59200d18b259..5df6117abedf 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -2,16 +2,17 @@ , fetchFromGitHub , installShellFiles , lib +, stdenv }: buildGoModule rec { pname = "devbox"; - version = "0.12.0"; + version = "0.13.4"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-+bnFaopmK8Yz2XSkN3wPiipoO5TsRD0IuAKUlx1KvKM="; + hash = "sha256-+3AKBhxf1m6cBNtEx8xmUmJ2PUk0LNPaS+cZhsXJoTs="; }; ldflags = [ @@ -20,14 +21,16 @@ buildGoModule rec { "-X go.jetpack.io/devbox/internal/build.Version=${version}" ]; + subPackages = [ "cmd/devbox" ]; + # integration tests want file system access doCheck = false; - vendorHash = "sha256-fuLKo6m/n06W4jyCc4Ki0GLlSIYZNdGFOhpasTd95x0="; + vendorHash = "sha256-rwmNzYzmZqNcNVV4GgqCVLT6ofIkblVCMJHLGwlhcGw="; nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd devbox \ --bash <($out/bin/devbox completion bash) \ --fish <($out/bin/devbox completion fish) \ diff --git a/pkgs/development/tools/devd/default.nix b/pkgs/development/tools/devd/default.nix deleted file mode 100644 index 271f9048db1d..000000000000 --- a/pkgs/development/tools/devd/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ buildGoModule, fetchFromGitHub, fetchpatch, lib }: - -buildGoModule rec { - pname = "devd"; - version = "unstable-2020-04-27"; - - src = fetchFromGitHub { - owner = "cortesi"; - repo = "devd"; - rev = "c1a3bfba27d8e028de90fb24452374412a4cffb3"; - hash = "sha256-k0zj7fiYbaHnNUUI7ruD0vXiT4c1bxPuR4I0dRouCbU="; - }; - - vendorHash = "sha256-o7MbN/6n7fkp/yqYyQbfWBUqI09/JYh5jtV31gjNf6w="; - - patches = [ - # Update x/sys to support go 1.17. - (fetchpatch { - url = "https://github.com/cortesi/devd/commit/5f4720bf41399736b4e7e1a493da6c87a583d0b2.patch"; - hash = "sha256-WDN08XNsDPuZwBCE8iDXgGAWFwx2UTwqRkhzKMtPKR8="; - }) - ]; - - subPackages = [ "cmd/devd" ]; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Local webserver for developers"; - mainProgram = "devd"; - homepage = "https://github.com/cortesi/devd"; - license = licenses.mit; - maintainers = with maintainers; [ brianhicks ]; - }; -} diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index ea60c216a8f5..ef2584ab99e9 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -5,17 +5,18 @@ glibcLocales, python3, fetchPypi, + nix-update-script, }: python3.pkgs.buildPythonApplication rec { pname = "devpi-client"; - version = "7.0.3"; + version = "7.2.0"; pyproject = true; src = fetchPypi { - pname = "devpi_client"; + pname = "devpi-client"; inherit version; - hash = "sha256-5aF6EIFnhfywDeAfWSN+eZUpaO6diPCP5QHT11Y/IQI="; + hash = "sha256-wUM2hFjDh4unvuah2bQY4uZZVxo4VmFPWNdriigmnXs="; }; build-system = with python3.pkgs; [ @@ -66,6 +67,8 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "devpi" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Client for devpi, a pypi index server and packaging meta tool"; homepage = "http://doc.devpi.net"; diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index c1dfc4841931..e32f0702e2aa 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -1,4 +1,5 @@ { lib, fetchFromGitHub, buildPythonApplication +, gitUpdater , pythonOlder , aiohttp , appdirs @@ -29,7 +30,7 @@ buildPythonApplication rec { pname = "devpi-server"; - version = "6.10.0"; + version = "6.14.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -38,7 +39,7 @@ buildPythonApplication rec { owner = "devpi"; repo = "devpi"; rev = "server-${version}"; - hash = "sha256-JqYWWItdAgtUtiYSqxUd40tT7ON4oHiDA4/3Uhb01b8="; + hash = "sha256-j8iILbptUw8DUE9lFpjDp/VYzdJzmOYqM/RCnkpWdcA="; }; sourceRoot = "${src.name}/server"; @@ -116,6 +117,11 @@ buildPythonApplication rec { }; }; + # devpi uses a monorepo for server,common,client and web + passthru.updateScript = gitUpdater { + rev-prefix = "server-"; + }; + meta = with lib;{ homepage = "http://doc.devpi.net"; description = "Github-style pypi index server and packaging meta tool"; diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix index 75c1e27c41f3..2236d27be2b3 100644 --- a/pkgs/development/tools/devpod/default.nix +++ b/pkgs/development/tools/devpod/default.nix @@ -18,7 +18,7 @@ , rustPlatform , stdenv , testers -, webkitgtk +, webkitgtk_4_0 }: let @@ -122,7 +122,7 @@ rec { cp -r ${frontend-build} frontend-build substituteInPlace tauri.conf.json --replace '"distDir": "../dist",' '"distDir": "frontend-build",' - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" @@ -134,20 +134,20 @@ rec { nativeBuildInputs = [ copyDesktopItems pkg-config - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ jq - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ libsoup openssl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 libayatana-appindicator - webkitgtk - ] ++ lib.optionals stdenv.isDarwin [ + webkitgtk_4_0 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.WebKit diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/development/tools/devtodo/default.nix deleted file mode 100644 index 1cc83d7fd979..000000000000 --- a/pkgs/development/tools/devtodo/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, readline, ncurses }: - -stdenv.mkDerivation rec { - pname = "devtodo"; - version = "0.1.20"; - - src = fetchurl { - url = "https://swapoff.org/files/devtodo/${pname}-${version}.tar.gz"; - sha256 = "029y173njydzlznxmdizrrz4wcky47vqhl87fsb7xjcz9726m71p"; - }; - - buildInputs = [ readline ncurses ]; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://swapoff.org/devtodo1.html"; - description = "Hierarchical command-line task manager"; - license = licenses.gpl2; - maintainers = [ maintainers.woffs ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/distgen/default.nix b/pkgs/development/tools/distgen/default.nix deleted file mode 100644 index 7450e7c10d29..000000000000 --- a/pkgs/development/tools/distgen/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, python3, fetchPypi }: - -python3.pkgs.buildPythonApplication rec { - pname = "distgen"; - version = "1.18"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-lS6OeEaPiK8Pskuoww9KwyNhKnGQ+dHhdPmZn1Igj0Q="; - }; - - nativeCheckInputs = with python3.pkgs; [ - pytest - mock - ]; - - propagatedBuildInputs = with python3.pkgs; [ - distro - jinja2 - six - pyyaml - ]; - - checkPhase = "make test-unit PYTHON=${python3.executable}"; - - meta = with lib; { - description = "Templating system/generator for distributions"; - mainProgram = "dg"; - license = licenses.gpl2Plus; - homepage = "https://distgen.readthedocs.io/"; - maintainers = with maintainers; [ bachp ]; - }; -} diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix deleted file mode 100644 index a29e3a23a26b..000000000000 --- a/pkgs/development/tools/dive/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub -, fetchpatch -, pkg-config -, btrfs-progs -, gpgme -, lvm2 -}: - -buildGoModule rec { - pname = "dive"; - version = "0.12.0"; - - src = fetchFromGitHub { - owner = "wagoodman"; - repo = "dive"; - rev = "v${version}"; - hash = "sha256-CuVRFybsn7PVPgz3fz5ghpjOEOsTYTv6uUAgRgFewFw="; - }; - - vendorHash = "sha256-uzzawa/Doo6j/Fh9dJMzGKbpp24UTLAo9VGmuQ80IZE="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]; - - patches = [ - # fix scrolling - # See https://github.com/wagoodman/dive/pull/447 - (fetchpatch { - name = "fix-scrolling.patch"; - url = "https://github.com/wagoodman/dive/pull/473/commits/a885fa6e68b3763d52de20603ee1b9cd8949276f.patch"; - hash = "sha256-6gTWfyvK19xDqc7Ah33ewgz/WQRcQHLYwerrwUtRpJc="; - }) - (fetchpatch { - name = "add-scrolling-layers.patch"; - url = "https://github.com/wagoodman/dive/pull/473/commits/840653158e235bdd59b4c4621cf282ce6499c714.patch"; - hash = "sha256-dYqg5JpWKOzy3hVjIVCHA2vmKCtCgc8W+oHEzuGpyxc="; - }) - (fetchpatch { - name = "fix-render-update.patch"; - url = "https://github.com/wagoodman/dive/pull/473/commits/36177a9154eebe9e3ae9461a9e6f6b368f7974e1.patch"; - hash = "sha256-rSeEYxUaYlEZGv+NWYK+nATBYS4P2swqjC3HimHyqNI="; - }) - ]; - - - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; - - meta = with lib; { - description = "Tool for exploring each layer in a docker image"; - mainProgram = "dive"; - homepage = "https://github.com/wagoodman/dive"; - changelog = "https://github.com/wagoodman/dive/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/tools/djhtml/default.nix b/pkgs/development/tools/djhtml/default.nix index 0d30fc4f3800..1859249eb0f3 100644 --- a/pkgs/development/tools/djhtml/default.nix +++ b/pkgs/development/tools/djhtml/default.nix @@ -1,28 +1,30 @@ { lib , buildPythonApplication , fetchFromGitHub -, pythonOlder +, setuptools }: buildPythonApplication rec { pname = "djhtml"; - version = "3.0.6"; - - format = "setuptools"; - disabled = pythonOlder "3.7"; + version = "3.0.7"; + pyproject = true; src = fetchFromGitHub { owner = "rtts"; - repo = pname; + repo = "djhtml"; rev = "refs/tags/${version}"; - hash = "sha256-3bviLyTLpHcAUWAaAmNZukWBDwFs8yFOAxl2bSk9GNY="; + hash = "sha256-W93J3UFUrCqT718zoGcu96ORYFt0NLyYP7iVWbr8FYo="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "djhtml" ]; meta = with lib; { homepage = "https://github.com/rtts/djhtml"; description = "Django/Jinja template indenter"; + changelog = "https://github.com/rtts/djhtml/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = [ ]; + mainProgram = "djhtml"; }; } diff --git a/pkgs/development/tools/djlint/default.nix b/pkgs/development/tools/djlint/default.nix deleted file mode 100644 index 84cfb65522ec..000000000000 --- a/pkgs/development/tools/djlint/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -}: - -python3.pkgs.buildPythonApplication rec { - pname = "djlint"; - version = "1.35.2"; - pyproject = true; - - src = fetchFromGitHub { - owner = "Riverside-Healthcare"; - repo = "djlint"; - rev = "refs/tags/v${version}"; - hash = "sha256-KdIK6SgOQiNc13Nzg6MI38BdkBdEClnMn1RcWvngP+A="; - }; - - build-system = with python3.pkgs; [ - poetry-core - ]; - - pythonRelaxDeps = [ - "pathspec" - "regex" - ]; - - dependencies = with python3.pkgs; [ - click - colorama - cssbeautifier - html-tag-names - html-void-elements - jsbeautifier - json5 - pathspec - pyyaml - regex - tomli - tqdm - ]; - - pythonImportsCheck = [ "djlint" ]; - - meta = { - description = "HTML Template Linter and Formatter. Django - Jinja - Nunjucks - Handlebars - GoLang"; - mainProgram = "djlint"; - homepage = "https://github.com/Riverside-Healthcare/djlint"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ traxys ]; - }; -} diff --git a/pkgs/development/tools/doc2go/default.nix b/pkgs/development/tools/doc2go/default.nix deleted file mode 100644 index 68b0f7f5e1e8..000000000000 --- a/pkgs/development/tools/doc2go/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "doc2go"; - version = "0.8.1"; - - src = fetchFromGitHub { - owner = "abhinav"; - repo = "doc2go"; - rev = "v${version}"; - hash = "sha256-b4L20/9jm+bFGdNsHmcwSnzcmr3Il9XoV20284Ba8PU="; - }; - vendorHash = "sha256-d5ZRMFi7GIfDHsYRNvMnDdfnGhTM1sA0WDYD2aDoEd0="; - - ldflags = [ "-s" "-w" "-X main._version=${version}" ]; - - subPackages = [ "." ]; - # integration is it's own module - excludedPackages = [ "integration" ]; - - checkFlags = [ - # needs to fetch additional go modules - "-skip=TestFinder_ImportedPackage/Modules" - ]; - - preCheck = '' - # run all tests - unset subPackages - ''; - - meta = with lib; { - homepage = "https://github.com/abhinav/doc2go"; - changelog = "https://github.com/abhinav/doc2go/blob/${src.rev}/CHANGELOG.md"; - description = "Your Go project's documentation, to-go"; - mainProgram = "doc2go"; - longDescription = '' - doc2go is a command line tool that generates static HTML documentation - from your Go code. It is a self-hosted static alternative to - https://pkg.go.dev/ and https://godocs.io/. - ''; - license = with licenses; [ - # general project license - asl20 - # internal/godoc/synopsis*.go adapted from golang source - bsd3 - ]; - maintainers = with maintainers; [ jk ]; - }; -} diff --git a/pkgs/development/tools/dockfmt/default.nix b/pkgs/development/tools/dockfmt/default.nix deleted file mode 100644 index 3ca4fc9a1624..000000000000 --- a/pkgs/development/tools/dockfmt/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "dockfmt"; - version = "unstable-2020-09-18"; - - # The latest released version doesn't support reading from stdin. - src = fetchFromGitHub { - owner = "jessfraz"; - repo = "dockfmt"; - rev = "1455059b8bb53ab4723ef41946c43160583a8333"; - hash = "sha256-wEC9kENcE3u+Mb7uLbx/VBUup6PBnCY5cxTYvkJcavg="; - }; - - vendorHash = null; - - ldflags = [ - "-w" - "-s" - "-X github.com/jessfraz/dockfmt/version.VERSION=${version}" - ]; - - meta = with lib; { - description = "Dockerfile format"; - mainProgram = "dockfmt"; - homepage = "https://github.com/jessfraz/dockfmt"; - license = licenses.mit; - maintainers = with maintainers; [ cpcloud ]; - }; -} diff --git a/pkgs/development/tools/dockle/default.nix b/pkgs/development/tools/dockle/default.nix deleted file mode 100644 index 6dc04fef038b..000000000000 --- a/pkgs/development/tools/dockle/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, lvm2 }: - -buildGoModule rec { - pname = "dockle"; - version = "0.4.14"; - - src = fetchFromGitHub { - owner = "goodwithtech"; - repo = pname; - rev = "v${version}"; - hash = "sha256-ZAk51juPFSaDQYfzsf7HXigL4aIk8V+tGA9lZqHBOsY="; - }; - - vendorHash = "sha256-+AtvnplvPWkUwmxfB7rjYcLTQibQsObFT1QRR0FXAe0="; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ btrfs-progs lvm2 ]; - - ldflags = [ - "-s" - "-w" - "-X github.com/goodwithtech/dockle/pkg.version=${version}" - ]; - - preCheck = '' - # Remove tests that use networking - rm pkg/scanner/scan_test.go - ''; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/dockle --help - $out/bin/dockle --version | grep "dockle version ${version}" - runHook postInstallCheck - ''; - - meta = with lib; { - homepage = "https://containers.goodwith.tech"; - changelog = "https://github.com/goodwithtech/dockle/releases/tag/v${version}"; - description = "Container Image Linter for Security"; - mainProgram = "dockle"; - longDescription = '' - Container Image Linter for Security. - Helping build the Best-Practice Docker Image. - Easy to start. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ jk ]; - }; -} diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix deleted file mode 100644 index bfc3b39c158c..000000000000 --- a/pkgs/development/tools/doctl/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, buildPackages }: - -buildGoModule rec { - pname = "doctl"; - version = "1.114.0"; - - vendorHash = null; - - doCheck = false; - - subPackages = [ "cmd/doctl" ]; - - ldflags = let t = "github.com/digitalocean/doctl"; in [ - "-X ${t}.Major=${lib.versions.major version}" - "-X ${t}.Minor=${lib.versions.minor version}" - "-X ${t}.Patch=${lib.versions.patch version}" - "-X ${t}.Label=release" - ]; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - export HOME=$(mktemp -d) # attempts to write to /homeless-shelter - for shell in bash fish zsh; do - ${stdenv.hostPlatform.emulator buildPackages} $out/bin/doctl completion $shell > doctl.$shell - installShellCompletion doctl.$shell - done - ''; - - src = fetchFromGitHub { - owner = "digitalocean"; - repo = "doctl"; - rev = "v${version}"; - sha256 = "sha256-E+/rfOpUDBvHaVVN7xhhcFd1W1X6cSEWpxjqoKoQR80="; - }; - - meta = with lib; { - description = "Command line tool for DigitalOcean services"; - mainProgram = "doctl"; - homepage = "https://github.com/digitalocean/doctl"; - license = licenses.asl20; - maintainers = [ maintainers.siddharthist ]; - }; -} diff --git a/pkgs/development/tools/documentation/antora/default.nix b/pkgs/development/tools/documentation/antora/default.nix deleted file mode 100644 index afd694d4d7de..000000000000 --- a/pkgs/development/tools/documentation/antora/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, buildNpmPackage, fetchFromGitLab }: - -buildNpmPackage rec { - pname = "antora"; - version = "3.1.9"; - - src = fetchFromGitLab { - owner = pname; - repo = pname; - rev = "v${version}"; - hash = "sha256-hkavYC2LO8NRIRwHNWIJLRDkVnhAB4Di3IqL8uGt+U8="; - }; - - npmDepsHash = "sha256-ngreuitwUcIDVF6vW7fZA1OaVxr9fv7s0IjCErXlcxg="; - - # This is to stop tests from being ran, as some of them fail due to trying to query remote repositories - postPatch = '' - substituteInPlace package.json --replace \ - '"_mocha"' '""' - ''; - - postInstall = '' - mkdir -p $out/bin - ln -s $out/lib/node_modules/antora-build/packages/cli/bin/antora $out/bin/antora - ''; - - meta = with lib; { - description = "Modular documentation site generator. Designed for users of Asciidoctor"; - mainProgram = "antora"; - homepage = "https://antora.org"; - license = licenses.mpl20; - maintainers = [ maintainers.ehllie ]; - }; -} diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 35fcdc709521..455f18ba0a3d 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv spdlog sqlite ] ++ lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ]) - ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; cmakeFlags = [ "-DICONV_INCLUDE_DIR=${libiconv}/include" @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (qt5 != null) "-Dbuild_wizard=YES"; env.NIX_CFLAGS_COMPILE = - lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; + lib.optionalString stdenv.hostPlatform.isDarwin "-mmacosx-version-min=10.9"; # put examples in an output so people/tools can test against them outputs = [ "out" "examples" ]; diff --git a/pkgs/development/tools/documentation/gi-docgen/default.nix b/pkgs/development/tools/documentation/gi-docgen/default.nix deleted file mode 100644 index 9d5da739745f..000000000000 --- a/pkgs/development/tools/documentation/gi-docgen/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, fetchurl -, meson -, ninja -, python3 -, gnome -}: - -python3.pkgs.buildPythonApplication rec { - pname = "gi-docgen"; - version = "2024.1"; - - format = "other"; - - src = fetchurl { - url = "mirror://gnome/sources/gi-docgen/${lib.versions.major version}/gi-docgen-${version}.tar.xz"; - hash = "sha256-hwx3+WIEYszknjVUKkLcFhL8hYcz6D274kjFNUWK7B4="; - }; - - depsBuildBuild = [ - python3 - ]; - - nativeBuildInputs = [ - meson - ninja - ]; - - pythonPath = with python3.pkgs; [ - jinja2 - markdown - markupsafe - packaging - pygments - toml # remove once python311 is the default - typogrify - ]; - - doCheck = false; # no tests - - postFixup = '' - # Do not propagate Python - substituteInPlace $out/nix-support/propagated-build-inputs \ - --replace "${python3}" "" - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = "gi-docgen"; - }; - }; - - meta = with lib; { - description = "Documentation generator for GObject-based libraries"; - mainProgram = "gi-docgen"; - homepage = "https://gitlab.gnome.org/GNOME/gi-docgen"; - license = licenses.asl20; # OR GPL-3.0-or-later - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix deleted file mode 100644 index 5586ed5c2301..000000000000 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, fetchurl, pkg-config, libxml2, libxslt, intltool, gnome -, python3Packages, fetchpatch, bash }: - -python3Packages.buildPythonApplication rec { - pname = "gnome-doc-utils"; - version = "0.20.10"; - - format = "other"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb"; - }; - - patches = [ - # https://bugzilla.redhat.com/show_bug.cgi?id=438638 - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/gnome-doc-utils/raw/6b8908abe5af61a952db7174c5d1843708d61f1b/f/gnome-doc-utils-0.14.0-package.patch"; - sha256 = "sha256-V2L2/30NoHY/wj3+dsombxveWRSUJb2YByOKtEgVx/0="; - }) - # python3 support - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/gnome-doc-utils/raw/6b8908abe5af61a952db7174c5d1843708d61f1b/f/gnome-doc-utils-0.20.10-python3.patch"; - sha256 = "sha256-niH/Yx5H44rsRgkCZS8LWLFB9ZvuInt75zugzoVUhH0="; - }) - ]; - - nativeBuildInputs = [ intltool pkg-config libxslt.dev ]; - buildInputs = [ libxml2 libxslt bash ]; - propagatedBuildInputs = [ python3Packages.libxml2 ]; - - configureFlags = [ "--disable-scrollkeeper" ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - }; - }; - - meta = with lib; { - description = "Collection of documentation utilities for the GNOME project"; - homepage = "https://gitlab.gnome.org/GNOME/gnome-doc-utils"; - license = with licenses; [ gpl2Plus lgpl2Plus ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix deleted file mode 100644 index b21bdfc500da..000000000000 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ lib -, fetchFromGitLab -, meson -, ninja -, pkg-config -, python3 -, docbook_xml_dtd_43 -, docbook-xsl-nons -, libxslt -, gettext -, gnome -, withDblatex ? false, dblatex -}: - -python3.pkgs.buildPythonApplication rec { - pname = "gtk-doc"; - version = "1.34.0"; - - outputDevdoc = "out"; - - format = "other"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = pname; - rev = version; - hash = "sha256-Jt6d5wbhAoSQ2sWyYWW68Y81duc3+QOJK/5JR/lCmnQ="; - }; - - patches = [ - passthru.respect_xml_catalog_files_var_patch - ]; - - postPatch = '' - substituteInPlace meson.build \ - --replace "pkg-config" "$PKG_CONFIG" - ''; - - strictDeps = true; - - depsBuildBuild = [ - python3 - pkg-config - ]; - - nativeBuildInputs = [ - pkg-config - gettext - meson - ninja - libxslt # for xsltproc - ]; - - buildInputs = [ - docbook_xml_dtd_43 - docbook-xsl-nons - libxslt - ] ++ lib.optionals withDblatex [ - dblatex - ]; - - pythonPath = with python3.pkgs; [ - pygments # Needed for https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/meson.build#L42 - lxml - ]; - - mesonFlags = [ - "-Dtests=false" - "-Dyelp_manual=false" - ]; - - doCheck = false; # requires a lot of stuff - doInstallCheck = false; # fails - - postFixup = '' - # Do not propagate Python - substituteInPlace $out/nix-support/propagated-build-inputs \ - --replace "${python3}" "" - ''; - - passthru = { - # Consumers are expected to copy the m4 files to their source tree, let them reuse the patch - respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch; - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - description = "Tools to extract documentation embedded in GTK and GNOME source code"; - homepage = "https://gitlab.gnome.org/GNOME/gtk-doc"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members ++ (with maintainers; [ pSub ]); - }; -} diff --git a/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch b/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch deleted file mode 100644 index 95f6879a0069..000000000000 --- a/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/m4/gtkdoc_jh_check_xml_catalog.m4 -+++ b/m4/gtkdoc_jh_check_xml_catalog.m4 -@@ -5,8 +5,8 @@ - [ - AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl - AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) -- if $jh_found_xmlcatalog && \ -- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then -+ # empty argument forces libxml to use XML_CATALOG_FILES variable -+ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then - AC_MSG_RESULT([found]) - ifelse([$3],,,[$3]) - else diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index fbd8ea370866..d6b1266ab393 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-86ecnwDDVvgXgBBodP2rSZOn+R52Jap8RCKILttGOn8="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; # Tests fail because they expect a test WASM plugin. Tests already run for # every commit upstream on GitHub Actions diff --git a/pkgs/development/tools/drip/default.nix b/pkgs/development/tools/drip/default.nix deleted file mode 100644 index 30684d20252f..000000000000 --- a/pkgs/development/tools/drip/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, jdk8, which, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "drip"; - version = "0.2.4"; - - src = fetchFromGitHub { - repo = pname; - owner = "ninjudd"; - rev = version; - sha256 = "1zl62wdwfak6z725asq5lcqb506la1aavj7ag78lvp155wyh8aq1"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ jdk8 ]; - - postPatch = '' - patchShebangs . - ''; - - installPhase = '' - runHook preInstall - mkdir $out - cp ./* $out -r - wrapProgram $out/bin/drip \ - --prefix PATH : "${which}/bin" - $out/bin/drip version - runHook postInstall - ''; - - meta = with lib; { - description = "Launcher for the Java Virtual Machine intended to be a drop-in replacement for the java command, only faster"; - license = licenses.epl10; - homepage = "https://github.com/ninjudd/drip"; - platforms = platforms.linux; - maintainers = [ maintainers.rybern ]; - }; -} diff --git a/pkgs/development/tools/drm_info/default.nix b/pkgs/development/tools/drm_info/default.nix deleted file mode 100644 index e14437b08b24..000000000000 --- a/pkgs/development/tools/drm_info/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, libdrm, json_c, pciutils -, meson, ninja, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "drm_info"; - version = "2.3.0"; - - src = fetchFromGitHub { - owner = "ascent12"; - repo = "drm_info"; - rev = "v${version}"; - sha256 = "sha256-UTDYLe3QezPCyG9CIp+O+KX716JDTL9mn+OEjjyTwlg="; - }; - - nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ libdrm json_c pciutils ]; - - meta = with lib; { - description = "Small utility to dump info about DRM devices"; - mainProgram = "drm_info"; - homepage = "https://github.com/ascent12/drm_info"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/dstp/default.nix b/pkgs/development/tools/dstp/default.nix deleted file mode 100644 index bbfac9b19941..000000000000 --- a/pkgs/development/tools/dstp/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "dstp"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "ycd"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-YvuUgHHa8Egk+bbSI0SH0i3YrKWRbzjAckNG32RBRXw="; - }; - - vendorHash = "sha256-qNH71MPKOC0ld7xxppjZrHSTJ6t8E0LljM1OzT7pM9g="; - - # Tests require network connection, but is not allowed by nix - doCheck = false; - - meta = with lib; { - description = "Run common networking tests against your site"; - mainProgram = "dstp"; - homepage = "https://github.com/ycd/dstp"; - license = licenses.mit; - maintainers = with maintainers; [ jlesquembre ]; - }; -} diff --git a/pkgs/development/tools/dt-schema/default.nix b/pkgs/development/tools/dt-schema/default.nix deleted file mode 100644 index c1a16d729bb6..000000000000 --- a/pkgs/development/tools/dt-schema/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, python3 -}: - -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 { - version = "4.17.3"; - disabled = self.pythonOlder "3.7"; - - src = old.src.override { - inherit version; - hash = "sha256-D4ZEN6uLYHa6ZwdFPvj5imoNUSqA6T+KvbZ29zfstg0="; - }; - - propagatedBuildInputs = with self; ([ - attrs - pyrsistent - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - typing-extensions - ] ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources - pkgutil-resolve-name - ]); - }); - }; -}; in python.pkgs.toPythonApplication python.pkgs.dtschema diff --git a/pkgs/development/tools/dum/default.nix b/pkgs/development/tools/dum/default.nix deleted file mode 100644 index 201c81f3fd6c..000000000000 --- a/pkgs/development/tools/dum/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "dum"; - version = "0.1.19"; - - src = fetchFromGitHub { - owner = "egoist"; - repo = pname; - rev = "v${version}"; - sha256 = "0rnm59zhpaa8nbbh6rh53svnlb484q1k6s4wc4w9516b18xhmkca"; - }; - - cargoHash = "sha256-aMx4xfWYiiz5TY/CVCogZ3WNR6md77jb8RKhhVwqeto="; - - meta = with lib; { - description = "Npm scripts runner written in Rust"; - mainProgram = "dum"; - homepage = "https://github.com/egoist/dum"; - changelog = "https://github.com/egoist/dum/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/dump_syms/default.nix b/pkgs/development/tools/dump_syms/default.nix index 61d323d83274..7f723096a8a7 100644 --- a/pkgs/development/tools/dump_syms/default.nix +++ b/pkgs/development/tools/dump_syms/default.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - ] ++ lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ Security SystemConfiguration ]; diff --git a/pkgs/development/tools/dyff/default.nix b/pkgs/development/tools/dyff/default.nix deleted file mode 100644 index 8ee17a2e382d..000000000000 --- a/pkgs/development/tools/dyff/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "dyff"; - version = "1.9.0"; - - src = fetchFromGitHub { - owner = "homeport"; - repo = "dyff"; - rev = "v${version}"; - sha256 = "sha256-y5gep3v+totupFbsAuGhySUbcESmQeGHWteQFFXj2Kw="; - }; - - vendorHash = "sha256-cRPAjFVvjCgT+m8ceAQJt5ZE8ax7jefzdVWPGM45LpY="; - - subPackages = [ - "cmd/dyff" - "pkg/dyff" - "internal/cmd" - ]; - - nativeBuildInputs = [ installShellFiles ]; - - # test fails with the injected version - postPatch = '' - substituteInPlace internal/cmd/cmds_test.go \ - --replace "version (development)" ${version} - ''; - - ldflags = [ - "-s" - "-w" - "-X=github.com/homeport/dyff/internal/cmd.version=${version}" - ]; - - postInstall = '' - installShellCompletion --cmd dyff \ - --bash <($out/bin/dyff completion bash) \ - --fish <($out/bin/dyff completion fish) \ - --zsh <($out/bin/dyff completion zsh) - ''; - - meta = with lib; { - description = "Diff tool for YAML files, and sometimes JSON"; - mainProgram = "dyff"; - longDescription = '' - dyff is inspired by the way the old BOSH v1 deployment output reported - changes from one version to another by only showing the parts of a YAML - file that change. - - Each difference is referenced by its location in the YAML document by - using either the Spruce or go-patch path syntax. - ''; - homepage = "https://github.com/homeport/dyff"; - license = licenses.mit; - maintainers = with maintainers; [ edlimerkaj jceb ]; - }; -} diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix deleted file mode 100644 index 576c3edd405c..000000000000 --- a/pkgs/development/tools/earthly/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, stdenv, testers, earthly }: - -buildGoModule rec { - pname = "earthly"; - version = "0.8.15"; - - src = fetchFromGitHub { - owner = "earthly"; - repo = "earthly"; - rev = "v${version}"; - hash = "sha256-7yw2SmwWsPBCH0LOaZSruYeZ5qL+njGuExy8+11Ni78="; - }; - - vendorHash = "sha256-bwNuQPGjAQ9Afa2GuPWrW8ytfIvhsOYFKPt0zyfdZhU="; - subPackages = [ "cmd/earthly" "cmd/debugger" ]; - - CGO_ENABLED = 0; - - ldflags = [ - "-s" - "-w" - "-X main.Version=v${version}" - "-X main.DefaultBuildkitdImage=docker.io/earthly/buildkitd:v${version}" - "-X main.GitSha=v${version}" - "-X main.DefaultInstallationName=earthly" - ] ++ lib.optionals stdenv.isLinux [ - "-extldflags '-static'" - ]; - - tags = [ - "dfrunmount" - "dfrunnetwork" - "dfrunsecurity" - "dfsecrets" - "dfssh" - ]; - - postInstall = '' - mv $out/bin/debugger $out/bin/earthly-debugger - ''; - - passthru = { - tests.version = testers.testVersion { - package = earthly; - version = "v${version}"; - }; - }; - - meta = with lib; { - description = "Build automation for the container era"; - homepage = "https://earthly.dev/"; - changelog = "https://github.com/earthly/earthly/releases/tag/v${version}"; - license = licenses.mpl20; - maintainers = with maintainers; [ zoedsoupe konradmalik ]; - }; -} diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix deleted file mode 100644 index 6b97424e0e46..000000000000 --- a/pkgs/development/tools/easyjson/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "easyjson"; - version = "0.7.7"; - - src = fetchFromGitHub { - owner = "mailru"; - repo = "easyjson"; - rev = "v${version}"; - sha256 = "0clifkvvy8f45rv3cdyv58dglzagyvfcqb63wl6rij30c5j2pzc1"; - }; - vendorHash = "sha256-L8u7QQPE2SnskcRrSIwQ4KhsX9xncqDWXJ75ytjxLJ4="; - - subPackages = [ "easyjson" ]; - - meta = with lib; { - homepage = "https://github.com/mailru/easyjson"; - description = "Fast JSON serializer for Go"; - mainProgram = "easyjson"; - license = licenses.mit; - maintainers = with maintainers; [ Madouura ]; - }; -} diff --git a/pkgs/development/tools/ec2-metadata-mock/default.nix b/pkgs/development/tools/ec2-metadata-mock/default.nix deleted file mode 100644 index 5663782852c1..000000000000 --- a/pkgs/development/tools/ec2-metadata-mock/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "ec2-metadata-mock"; - version = "1.12.0"; - - src = fetchFromGitHub { - owner = "aws"; - repo = "amazon-ec2-metadata-mock"; - rev = "v${version}"; - sha256 = "sha256-8X6LBGo496fG0Chhvg3jAaUF6mp8psCzHd+Es75z27Y="; - }; - - vendorHash = "sha256-jRJX4hvfRuhR5TlZe7LsXaOlUCwmQGem2QKlX3vuk8c="; - - postInstall = '' - mv $out/bin/{cmd,ec2-metadata-mock} - ''; - - meta = with lib; { - description = "Amazon EC2 Metadata Mock"; - mainProgram = "ec2-metadata-mock"; - homepage = "https://github.com/aws/amazon-ec2-metadata-mock"; - license = licenses.asl20; - maintainers = with maintainers; [ ymatsiuk ]; - }; -} diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix deleted file mode 100644 index 5aea91699a22..000000000000 --- a/pkgs/development/tools/eclipse-mat/default.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ fetchurl -, fontconfig -, freetype -, glib -, gsettings-desktop-schemas -, gtk3 -, jdk17 -, lib -, libX11 -, libXrender -, libXtst -, makeDesktopItem -, makeWrapper -, shared-mime-info -, stdenv -, unzip -, webkitgtk -, zlib -}: - -let - pVersion = "1.15.0.20231206"; - pVersionTriple = lib.splitVersion pVersion; - majorVersion = lib.elemAt pVersionTriple 0; - minorVersion = lib.elemAt pVersionTriple 1; - patchVersion = lib.elemAt pVersionTriple 2; - baseVersion = "${majorVersion}.${minorVersion}.${patchVersion}"; - jdk = jdk17; -in -stdenv.mkDerivation rec { - pname = "eclipse-mat"; - version = pVersion; - - src = fetchurl { - url = "http://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip"; - sha256 = "sha256-icmo5zdK0XaH32kXwZUVaQ0VPSGEgvlLr7v7PtdbmCg="; - }; - - desktopItem = makeDesktopItem { - name = "eclipse-mat"; - exec = "eclipse-mat"; - icon = "eclipse"; - comment = "Eclipse Memory Analyzer"; - desktopName = "Eclipse MAT"; - genericName = "Java Memory Analyzer"; - categories = [ "Development" ]; - }; - - unpackPhase = '' - unzip $src - ''; - - buildCommand = '' - mkdir -p $out - unzip $src - mv mat $out - - # Patch binaries. - interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2) - libCairo=$out/eclipse/libcairo-swt.so - patchelf --set-interpreter $interpreter $out/mat/MemoryAnalyzer - [ -f $libCairo ] && patchelf --set-rpath ${ - lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ] - } $libCairo - - # Create wrapper script. Pass -configuration to store settings in ~/.eclipse-mat/<version> - makeWrapper $out/mat/MemoryAnalyzer $out/bin/eclipse-mat \ - --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk ])} \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --add-flags "-configuration \$HOME/.eclipse-mat/''${version}/configuration" - - # Create desktop item. - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications - mkdir -p $out/share/pixmaps - find $out/mat/plugins -name 'eclipse*.png' -type f -exec cp {} $out/share/pixmaps \; - mv $out/share/pixmaps/eclipse64.png $out/share/pixmaps/eclipse.png - ''; - - nativeBuildInputs = [ unzip makeWrapper ]; - buildInputs = [ - fontconfig - freetype - glib - gsettings-desktop-schemas - gtk3 - jdk - libX11 - libXrender - libXtst - zlib - shared-mime-info - webkitgtk - ]; - - dontBuild = true; - dontConfigure = true; - - meta = with lib; { - description = "Fast and feature-rich Java heap analyzer"; - mainProgram = "eclipse-mat"; - longDescription = '' - The Eclipse Memory Analyzer is a tool that helps you find memory - leaks and reduce memory consumption. Use the Memory Analyzer to - analyze productive heap dumps with hundreds of millions of - objects, quickly calculate the retained sizes of objects, see - who is preventing the Garbage Collector from collecting objects, - run a report to automatically extract leak suspects. - ''; - homepage = "https://www.eclipse.org/mat"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.epl20; - maintainers = [ maintainers.ktor ]; - platforms = [ "x86_64-linux" ]; - }; - -} diff --git a/pkgs/development/tools/efm-langserver/default.nix b/pkgs/development/tools/efm-langserver/default.nix deleted file mode 100644 index 3bf9d0a1eb62..000000000000 --- a/pkgs/development/tools/efm-langserver/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "efm-langserver"; - version = "0.0.53"; - - src = fetchFromGitHub { - owner = "mattn"; - repo = "efm-langserver"; - rev = "v${version}"; - sha256 = "sha256-Csm+2C9hP+dTXliADUquAb1nC+8f5j1rJ+66cqWDrCk="; - }; - - vendorHash = "sha256-0YkUak6+dpxvXn6nVVn33xrTEthWqnC9MhMLm/yjFMA="; - subPackages = [ "." ]; - - meta = with lib; { - description = "General purpose Language Server"; - mainProgram = "efm-langserver"; - maintainers = with maintainers; [ Philipp-M ]; - homepage = "https://github.com/mattn/efm-langserver"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/tools/ejs/default.nix b/pkgs/development/tools/ejs/default.nix deleted file mode 100644 index b9242836b62b..000000000000 --- a/pkgs/development/tools/ejs/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "ejs"; - version = "3.1.9"; - - src = fetchFromGitHub { - owner = "mde"; - repo = "ejs"; - rev = "v${version}"; - hash = "sha256-bOZclhsnV3onxc32ZGfLpuGS5Jz6S12/BmkmwL4M6Dg="; - }; - - npmDepsHash = "sha256-829eWfJiMw9KRlhdmzD0ha//bgUQ5nPEzO+ayUPLxXY="; - - buildPhase = '' - runHook preBuild - - ./node_modules/.bin/jake build - - runHook postBuild - ''; - - meta = { - description = "Embedded JavaScript templates"; - homepage = "http://ejs.co"; - license = lib.licenses.asl20; - mainProgram = "ejs"; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/ejson/Gemfile b/pkgs/development/tools/ejson/Gemfile deleted file mode 100644 index f860fe5075d4..000000000000 --- a/pkgs/development/tools/ejson/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source 'https://rubygems.org' - -gem 'fpm' -gem 'ronn' diff --git a/pkgs/development/tools/ejson/Gemfile.lock b/pkgs/development/tools/ejson/Gemfile.lock deleted file mode 100644 index d0a51c0a0623..000000000000 --- a/pkgs/development/tools/ejson/Gemfile.lock +++ /dev/null @@ -1,54 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - arr-pm (0.0.10) - cabin (> 0) - backports (3.14.0) - cabin (0.9.0) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) - clamp (1.0.1) - dotenv (2.7.2) - ffi (1.10.0) - fpm (1.11.0) - arr-pm (~> 0.0.10) - backports (>= 2.6.2) - cabin (>= 0.6.0) - childprocess (= 0.9.0) - clamp (~> 1.0.0) - ffi - json (>= 1.7.7, < 2.0) - pleaserun (~> 0.0.29) - ruby-xz (~> 0.2.3) - stud - hpricot (0.8.6) - insist (1.0.0) - io-like (0.3.0) - json (1.8.6) - mustache (0.99.8) - pleaserun (0.0.30) - cabin (> 0) - clamp - dotenv - insist - mustache (= 0.99.8) - stud - rdiscount (2.2.0.1) - ronn (0.7.3) - hpricot (>= 0.8.2) - mustache (>= 0.7.0) - rdiscount (>= 1.5.8) - ruby-xz (0.2.3) - ffi (~> 1.9) - io-like (~> 0.3) - stud (0.0.23) - -PLATFORMS - ruby - -DEPENDENCIES - fpm - ronn - -BUNDLED WITH - 2.1.4 diff --git a/pkgs/development/tools/ejson/default.nix b/pkgs/development/tools/ejson/default.nix deleted file mode 100644 index 42e5e6cb33a5..000000000000 --- a/pkgs/development/tools/ejson/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, bundlerEnv, ruby, buildGoModule, fetchFromGitHub }: -let - # needed for manpage generation - gems = bundlerEnv { - name = "ejson-gems"; - gemdir = ./.; - inherit ruby; - }; -in -buildGoModule rec { - pname = "ejson"; - version = "1.3.3"; - - src = fetchFromGitHub { - owner = "Shopify"; - repo = "ejson"; - rev = "v${version}"; - sha256 = "sha256-M2Gk+/l1tNlIAe1/fR1WLEOey+tjCUmMAujc76gmeZA="; - }; - - vendorHash = "sha256-9+x7HrbXRoS/7ZADWwhsbynQLr3SyCbcsp9QnSubov0="; - - nativeBuildInputs = [ gems ]; - - ldflags = [ "-s" "-w" ]; - - # set HOME, otherwise bundler will insert stuff in the manpages - postBuild = '' - HOME=$PWD make man SHELL=$SHELL - ''; - - postInstall = '' - mkdir -p $out/share - cp -r build/man $out/share - ''; - - meta = with lib; { - description = "Small library to manage encrypted secrets using asymmetric encryption"; - mainProgram = "ejson"; - license = licenses.mit; - homepage = "https://github.com/Shopify/ejson"; - maintainers = [ maintainers.manveru ]; - }; -} diff --git a/pkgs/development/tools/ejson/gemset.nix b/pkgs/development/tools/ejson/gemset.nix deleted file mode 100644 index 93fa1131f2a7..000000000000 --- a/pkgs/development/tools/ejson/gemset.nix +++ /dev/null @@ -1,188 +0,0 @@ -{ - arr-pm = { - dependencies = ["cabin"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "07yx1g1nh4zdy38i2id1xyp42fvj4vl6i196jn7szvjfm0jx98hg"; - type = "gem"; - }; - version = "0.0.10"; - }; - backports = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17j5pf0b69bkn043wi4xd530ky53jbbnljr4bsjzlm4k8bzlknfn"; - type = "gem"; - }; - version = "3.14.0"; - }; - cabin = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0b3b8j3iqnagjfn1261b9ncaac9g44zrx1kcg81yg4z9i513kici"; - type = "gem"; - }; - version = "0.9.0"; - }; - childprocess = { - dependencies = ["ffi"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p"; - type = "gem"; - }; - version = "0.9.0"; - }; - clamp = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jb6l4scp69xifhicb5sffdixqkw8wgkk9k2q57kh2y36x1px9az"; - type = "gem"; - }; - version = "1.0.1"; - }; - dotenv = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13cis6bf06hmz744xrsl163p6gb78xcm8g8q4pcabsy5ywyv6kag"; - type = "gem"; - }; - version = "2.7.2"; - }; - ffi = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; - type = "gem"; - }; - version = "1.10.0"; - }; - fpm = { - dependencies = ["arr-pm" "backports" "cabin" "childprocess" "clamp" "ffi" "json" "pleaserun" "ruby-xz" "stud"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0khzsiqzswxpql6w2ws9dawb27zgv4nmgrjszydmm0xpv6h21jrm"; - type = "gem"; - }; - version = "1.11.0"; - }; - hpricot = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jn8x9ch79gqmnzgyz78kppavjh5lqx0y0r6frykga2b86rz9s6z"; - type = "gem"; - }; - version = "0.8.6"; - }; - insist = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bw3bdwns14mapbgb8cbjmr0amvwz8y72gyclq04xp43wpp5jrvg"; - type = "gem"; - }; - version = "1.0.0"; - }; - io-like = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04nn0s2wmgxij3k760h3r8m1dgih5dmd9h4v1nn085yi824i5z6k"; - type = "gem"; - }; - version = "0.3.0"; - }; - json = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; - type = "gem"; - }; - version = "1.8.6"; - }; - mustache = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; - type = "gem"; - }; - version = "0.99.8"; - }; - pleaserun = { - dependencies = ["cabin" "clamp" "dotenv" "insist" "mustache" "stud"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hgnrl67zkqaxmfkwbyscawj4wqjm7h8khpbj58s6iw54wp3408p"; - type = "gem"; - }; - version = "0.0.30"; - }; - rdiscount = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1arvk3k06prxasq1djbj065ixar4zl171340g7wr1ww4gj9makx3"; - type = "gem"; - }; - version = "2.2.0.1"; - }; - ronn = { - dependencies = ["hpricot" "mustache" "rdiscount"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "07plsxxfx5bxdk72ii9za6km0ziqlq8jh3bicr4774dalga6zpw2"; - type = "gem"; - }; - version = "0.7.3"; - }; - ruby-xz = { - dependencies = ["ffi" "io-like"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11bgpvvk0098ghvlxr4i713jmi2izychalgikwvdwmpb452r3ndw"; - type = "gem"; - }; - version = "0.2.3"; - }; - stud = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qpb57cbpm9rwgsygqxifca0zma87drnlacv49cqs2n5iyi6z8kb"; - type = "gem"; - }; - version = "0.0.23"; - }; -} diff --git a/pkgs/development/tools/electron-fiddle/default.nix b/pkgs/development/tools/electron-fiddle/default.nix deleted file mode 100644 index cde2dcae311c..000000000000 --- a/pkgs/development/tools/electron-fiddle/default.nix +++ /dev/null @@ -1,176 +0,0 @@ -{ buildFHSEnv -, electron_24 -, fetchFromGitHub -, fetchYarnDeps -, fetchurl -, fixup-yarn-lock -, git -, lib -, makeDesktopItem -, nodejs_18 -, stdenvNoCC -, util-linux -, yarn -, zip -}: - -let - pname = "electron-fiddle"; - version = "0.32.6"; - electron = electron_24; - nodejs = nodejs_18; - - src = fetchFromGitHub { - owner = "electron"; - repo = "fiddle"; - rev = "v${version}"; - hash = "sha256-Iuss2xwts1aWy2rKYG7J2EvFdH8Bbedn/uZG2bi9UHw="; - }; - - # As of https://github.com/electron/fiddle/pull/1316 this is fetched - # from the network and has no stable hash. Grab an old version from - # the repository. - releasesJson = fetchurl { - url = "https://raw.githubusercontent.com/electron/fiddle/v0.32.4~18/static/releases.json"; - hash = "sha256-1sxd3eJ6/WjXS6XQbrgKUTNUmrhuc1dAvy+VAivGErg="; - }; - - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; - hash = "sha256-dwhwUWwv6RYKEMdhRBvKVXvM8n1r+Qo0D3/uFsWIOpw="; - }; - - electronDummyMirror = "https://electron.invalid/"; - electronDummyDir = "nix"; - electronDummyFilename = - builtins.baseNameOf (builtins.head (electron.src.urls)); - electronDummyHash = - builtins.hashString "sha256" "${electronDummyMirror}${electronDummyDir}"; - - unwrapped = stdenvNoCC.mkDerivation { - pname = "${pname}-unwrapped"; - inherit version src; - - nativeBuildInputs = [ fixup-yarn-lock git nodejs util-linux yarn zip ]; - - configurePhase = '' - export HOME=$TMPDIR - fixup-yarn-lock yarn.lock - yarn config --offline set yarn-offline-mirror ${offlineCache} - yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules - - mkdir -p ~/.cache/electron/${electronDummyHash} - cp -ra '${electron.dist}' "$TMPDIR/electron" - chmod -R u+w "$TMPDIR/electron" - (cd "$TMPDIR/electron" && zip -0Xr ~/.cache/electron/${electronDummyHash}/${electronDummyFilename} .) - - ln -s ${releasesJson} static/releases.json - ''; - - buildPhase = '' - ELECTRON_CUSTOM_VERSION='${electron.version}' \ - ELECTRON_MIRROR='${electronDummyMirror}' \ - ELECTRON_CUSTOM_DIR='${electronDummyDir}' \ - ELECTRON_CUSTOM_FILENAME='${electronDummyFilename}' \ - yarn --offline run package - ''; - - installPhase = '' - mkdir -p "$out/lib/electron-fiddle/resources" - cp "out/Electron Fiddle-"*/resources/app.asar "$out/lib/electron-fiddle/resources/" - mkdir -p "$out/share/icons/hicolor/scalable/apps" - cp assets/icons/fiddle.svg "$out/share/icons/hicolor/scalable/apps/electron-fiddle.svg" - ''; - }; - - desktopItem = makeDesktopItem { - name = "electron-fiddle"; - desktopName = "Electron Fiddle"; - comment = "The easiest way to get started with Electron"; - genericName = "Electron Fiddle"; - exec = "electron-fiddle %U"; - icon = "electron-fiddle"; - startupNotify = true; - categories = [ "GNOME" "GTK" "Utility" ]; - mimeTypes = [ "x-scheme-handler/electron-fiddle" ]; - }; - -in -buildFHSEnv { - name = "electron-fiddle"; - runScript = "${electron}/bin/electron ${unwrapped}/lib/electron-fiddle/resources/app.asar"; - - extraInstallCommands = '' - mkdir -p "$out/share/icons/hicolor/scalable/apps" - ln -s "${unwrapped}/share/icons/hicolor/scalable/apps/electron-fiddle.svg" "$out/share/icons/hicolor/scalable/apps/" - mkdir -p "$out/share/applications" - cp "${desktopItem}/share/applications"/*.desktop "$out/share/applications/" - ''; - - targetPkgs = pkgs: - with pkgs; - map lib.getLib [ - # for electron-fiddle itself - udev - - # for running Electron 22.0.0 inside - alsa-lib - atk - cairo - cups - dbus - expat - glib - gtk3 - libdrm - libnotify - libxkbcommon - mesa - nspr - nss - pango - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxcb - - # for running Electron before 18.3.5/19.0.5/20.0.0 inside - gdk-pixbuf - - # for running Electron before 16.0.0 inside - xorg.libxshmfence - - # for running Electron before 11.0.0 inside - xorg.libXcursor - xorg.libXi - xorg.libXrender - xorg.libXtst - - # for running Electron before 10.0.0 inside - xorg.libXScrnSaver - - # for running Electron before 8.0.0 inside - libuuid - - # for running Electron before 4.0.0 inside - fontconfig - - # for running Electron before 3.0.0 inside - gnome2.GConf - - # Electron 2.0.8 is the earliest working version, due to - # https://github.com/electron/electron/issues/13972 - ]; - - meta = with lib; { - description = "Easiest way to get started with Electron"; - homepage = "https://www.electronjs.org/fiddle"; - license = licenses.mit; - maintainers = with maintainers; [ andersk ]; - platforms = electron.meta.platforms; - }; -} diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 60255d21bcb1..6835c8a6263e 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -43,7 +43,7 @@ let ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; # https://www.electronjs.org/docs/latest/tutorial/electron-timelines - knownVulnerabilities = optional (versionOlder version "30.0.0") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "31.0.0") "Electron version ${version} is EOL"; }; fetcher = vers: tag: hash: fetchurl { @@ -97,7 +97,7 @@ let xorg.libxkbfile pango pciutils - stdenv.cc.cc.lib + stdenv.cc.cc systemd ] ++ lib.optionals (lib.versionAtLeast version "9.0.0") [ libdrm mesa ] @@ -166,5 +166,5 @@ in stdenv.mkDerivation (finalAttrs: lib.recursiveUpdate (common stdenv.hostPlatform) - ((if stdenv.isDarwin then darwin else linux) finalAttrs) + ((if stdenv.hostPlatform.isDarwin then darwin else linux) finalAttrs) ) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 8aa43f8213e5..e6f6c9f38f11 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -45,35 +45,46 @@ }, "30": { "hashes": { - "aarch64-darwin": "2238c45a85b2c78aed00aeaf15bbfa2f64b4d13e48cc6b9bc330f24c4d214595", - "aarch64-linux": "aa422122373b84f4eb8ce937937b1b6fe8fb3975c3edafb9df85f7fba449afd4", - "armv7l-linux": "3643857e1eec3037ad6f07e755bffc64f033a7196307ff0386bf67c9cc3ec31e", - "headers": "1zpl51g8d0j6xw4h2pw1wy6qlwgxj37x4lsj377kg27y809rf5ah", - "x86_64-darwin": "6e633bf87be9f8bf46dff9733cfd0d611e018ae5df75f30735747721f91fcf43", - "x86_64-linux": "b365aac23c61dc0b18002c60937c4842e814cbe6d8e6a34e4dc211774ebaec01" + "aarch64-darwin": "d312544ea29844cf328b44b9dbde12f4fdced90cb442dfca6df36c098dbb6e7a", + "aarch64-linux": "eb31470c0d7cd6e23e7ce0d89cc93a2356c9dac8bcc997e335353b8aa995afa0", + "armv7l-linux": "224bd46983e503101c756c72d10b195f14712a7a56438718acb126017dd04edf", + "headers": "0db38ndw9rrd8ixa14761cbff6ns31b6302bzx5q4in8i4dkrrs3", + "x86_64-darwin": "faf9dcc20d525607ea205f2f6a1dfe3270f6268aa439bb0ba5646c7e4fbbd842", + "x86_64-linux": "ec4707783d39e86005f42899e30ae59e50dd5d9c7f28531ed494eb43f2361403" }, - "version": "30.4.0" + "version": "30.5.1" }, "31": { "hashes": { - "aarch64-darwin": "4cd04f75e97f6cdfee1d166c7756b9a3c7341e51a7b12255c37bd46fa5a45da5", - "aarch64-linux": "37fbede76b30bad461cbfa3efec8aef07a34f6991c71c50a69ac489623413098", - "armv7l-linux": "7a6cba2d78ef3ff776d9482121f9b2400370da23b3065bfdafc4cd83c8bbe423", - "headers": "0iclnzcihiw7bnf7nn0p56m8zz8cwn951ccf6g52d7pfr791gbnv", - "x86_64-darwin": "e177e9846bfe63eefea3ecd6a889e9865e1fba21b93179a0cde08bd7c94796ee", - "x86_64-linux": "9b95e66cb4d55bb632e37bcb6083992a5d665f0b378466a771a2948c1aab57b7" + "aarch64-darwin": "d275eebc7cdaa1374e18ca97fe864767642203d89a0c66a49ed2e37acd11ff1c", + "aarch64-linux": "b67eb45065b3045041ccca358a9b608ff2fce9eb08ab45085b43c69790476e21", + "armv7l-linux": "58a257d20535933982ed27b5b58a79222e7b95b8fd24e057c06140755a03be10", + "headers": "1kqw3z7nwqrldbhc6ai8x903hwrl2grpq5ald0j0lgg8j1b0kjbj", + "x86_64-darwin": "1d64ae2924c92ee56bbd195076e125c80cc9cb47ebd88700600a504f212c3057", + "x86_64-linux": "bab1b66aa54d3d32e98c1b298a8c5ef38a2adb6205b697e34ea5fa1aec7727aa" }, - "version": "31.4.0" + "version": "31.7.2" }, "32": { "hashes": { - "aarch64-darwin": "b0e04b765702c35341e587e41b01eb9bcb1233953ab243a0c82e9555c04b269b", - "aarch64-linux": "1bf3b53cba77e070fb0da4b32540fedc29586b2111700b897fd62e3577708d53", - "armv7l-linux": "6e52f9fd163e54cb482354645dc32d42b24c6624bbb8927d194dbbb9eaf92959", - "headers": "0gw7yvj9i3kwmxbjj6w4l442saac3pcn3g7m42kvbpbwbfds1h4d", - "x86_64-darwin": "e3bb68b37e723af4aab8d9694661e5e9ecbe7b1fbc253fe263940dafffd66864", - "x86_64-linux": "5a9980bc3c80d1d2af0965eba2bc3c0f532b4ccc29194a595cefdd4dbe98e7dc" + "aarch64-darwin": "c3fd68b5bdf0346c99b7c6bf41804dcaa74701847f5bbc58d25c261d33056967", + "aarch64-linux": "5587eeed9c507fc0f62006cb5206b37cd335d34ad0ae692d1c44b8009e2c0ab7", + "armv7l-linux": "cd44653e3602136a9dabef1db9305df8b1a24e77ace24f0cccbeed1fc041ce2c", + "headers": "1gh4cgpfxi9mv0l17wki21hd0rhrrvk68a7f2wksmhmsnj4yqyxi", + "x86_64-darwin": "4ee209cdf27df4af79fad026a24b3df120ff9c89c2bdbc68ab5478fa7f32f5d7", + "x86_64-linux": "0b515f5ba76e919540af17251a4ce4bc355fdb497fcd7bd47d689872a1aae82c" }, - "version": "32.1.1" + "version": "32.2.2" + }, + "33": { + "hashes": { + "aarch64-darwin": "2d31f140b1a6cfa6efb509e644dee5830601e4d73d47539a8af20d57e8ae7b12", + "aarch64-linux": "43157d520ff6094ef7c390e49d1eec1ba58a488e150114c08e7157fb321fca7b", + "armv7l-linux": "1cb4a8422addfbb109a26f3cb4f406d793e5f04617bdc34b825dd17d84045906", + "headers": "1fiwmpfvjlyiixngb4rl6yrbm0sf0xrj13mprfg78a5kan9mwi7c", + "x86_64-darwin": "4bf99f30f124b447ef3b178e5ba0cdfe1faefa6a725bcde76a35eb26a50d4333", + "x86_64-linux": "933dc1eae3f2db67912b3ab056fd15a7ca3e1328fe8dd6a1f5266c5a063b1121" + }, + "version": "33.0.2" } } diff --git a/pkgs/development/tools/electron/chromedriver/generic.nix b/pkgs/development/tools/electron/chromedriver/generic.nix index edd648713e27..6ee587b26ef9 100644 --- a/pkgs/development/tools/electron/chromedriver/generic.nix +++ b/pkgs/development/tools/electron/chromedriver/generic.nix @@ -51,7 +51,7 @@ let src = fetcher version (get tags platform) (get hashes platform); buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) glib xorg.libxcb nspr @@ -92,5 +92,5 @@ let in stdenv.mkDerivation ( (common stdenv.hostPlatform) // - (if stdenv.isDarwin then darwin else linux) + (if stdenv.hostPlatform.isDarwin then darwin else linux) ) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index f80b67c66eaf..2ff177f3567a 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -23,24 +23,35 @@ }, "31": { "hashes": { - "aarch64-darwin": "904d665b4df7377ccdae58c35328456bf2a05a8d3e878954e48175ee60103b3f", - "aarch64-linux": "d66e80621dc8c667ca634c30c4be8486b56ebce17ba6debab5eb70dd40ed9ab9", - "armv7l-linux": "ae76cf56a793f7c98411f997db610d4729b6992e7ccbb7651a960947e87c5bb2", - "headers": "1vm3r688cjl5014x4lmmwh9927wbx26nd38lijmim434n32aby88", - "x86_64-darwin": "3ee05c812e0ce5cb0ee7a36fb1c3a52447d8bfef80a57ca82667b501a354778a", - "x86_64-linux": "65b04f0d8980c17d205644903718a4b41ba6c1fab9d25a58dadf00b6db24a402" + "aarch64-darwin": "e49778b48b971b06e965aa2a3cd07194a4c4c1f66e3a3565e97f21a94865fea8", + "aarch64-linux": "9a28b5402e88b74657e2e89eeafbeedc9fed3ec1f36f408ddeef12871042278d", + "armv7l-linux": "465f71ab1385c3538f10d1d463fc482be04ab3e53b0a31291e124f1b88d175ca", + "headers": "1kqw3z7nwqrldbhc6ai8x903hwrl2grpq5ald0j0lgg8j1b0kjbj", + "x86_64-darwin": "8ede4560f070f8d7e08e1c71f4135c10b164a077befe255110b957d32b865db5", + "x86_64-linux": "b3d19e86d5fc4d49c7e340282e421590ee1a81d6a75fdf4aea85b36e2c39d8a9" }, - "version": "31.6.0" + "version": "31.7.2" }, "32": { "hashes": { - "aarch64-darwin": "3fff987133294dcc18420500292bdfc32b452cfcf72f2e89af96404aa566aa27", - "aarch64-linux": "cfd75fdd5ec2bc86483b0779f241f98f775b74e4b75407a08b3755103304421a", - "armv7l-linux": "469d23434bca0f8bd4def7d3d9d3e9ff30dfa29e65450bac88cbbc0ae1ffc09c", - "headers": "0gw7yvj9i3kwmxbjj6w4l442saac3pcn3g7m42kvbpbwbfds1h4d", - "x86_64-darwin": "2b0e23c214580716dbeedd7b6bccc2b8994cbaa7827fa34208ed22ccb4ccdf77", - "x86_64-linux": "5d824770f97216138a209f268fbcab3de64bc967046ed9ad92ec0059abef184f" + "aarch64-darwin": "0ed199847a33fafa4482e1a49e5e8394f09a433eb5f2e638e25faac80ce2d435", + "aarch64-linux": "fb6f143eaff79c7096a8c2164d8b30dcd564056e1b9ec7e30b1290d8c5ec2b10", + "armv7l-linux": "15350e535ed59660f3d2082d13231a56f847f3e3deaeb05c3fd714629322492c", + "headers": "1gh4cgpfxi9mv0l17wki21hd0rhrrvk68a7f2wksmhmsnj4yqyxi", + "x86_64-darwin": "af52397c32446f114619d5cd2ec6d83748095a0cd6a5c0c95479397e4ed30be5", + "x86_64-linux": "05a35b7b2d77012bef8c9920cec87f4356aff191aa7009ffaa2e8e3cfac888e4" }, - "version": "32.1.1" + "version": "32.2.2" + }, + "33": { + "hashes": { + "aarch64-darwin": "31b21d4f0798b0a91e7b41fd354c8d6b64345668db2948a8b0ebe9dc33992102", + "aarch64-linux": "d79008c5024612d94bb03c20c753fc93e66cbc49fa4d56438e249b1e3bfb4d68", + "armv7l-linux": "b2afa0b00e88dd5bb5bffafa8ffbb0501fbcc0bb7d67eacda46026bf92d92590", + "headers": "1fiwmpfvjlyiixngb4rl6yrbm0sf0xrj13mprfg78a5kan9mwi7c", + "x86_64-darwin": "aeeca15c1925c57fa91f71b56781270549eb4cd7a82ed423335cb5a2e92fa0b0", + "x86_64-linux": "ace2073bfe2e9c340255b6a33ad2df61070e002bea645ce522b63a466428bd5e" + }, + "version": "33.0.2" } } diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index e98e93a0a17d..bd4843edbcca 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -49,14 +49,7 @@ in ((chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { src = null; - patches = base.patches ++ lib.optional (lib.versionOlder info.version "30") - (substituteAll { - # disable a component that requires CIPD blobs - name = "disable-screen-ai.patch"; - src = ./disable-screen-ai.patch; - inherit (info) version; - }) - ; + patches = base.patches; unpackPhase = '' runHook preUnpack @@ -174,12 +167,11 @@ in ((chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { dawn_use_built_dxc = false; v8_enable_private_mapping_fork_optimization = true; v8_expose_public_symbols = true; - } // lib.optionalAttrs (lib.versionOlder info.version "31") { - use_perfetto_client_library = false; - } // lib.optionalAttrs (lib.versionAtLeast info.version "31") { enable_dangling_raw_ptr_feature_flag = false; clang_unsafe_buffers_paths = ""; enterprise_cloud_content_analysis = false; + } // lib.optionalAttrs (lib.versionAtLeast info.version "33") { + content_enable_legacy_ipc = true; } // { # other @@ -201,7 +193,7 @@ in ((chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { libPath = lib.makeLibraryPath [ libnotify pipewire - stdenv.cc.cc.lib + stdenv.cc.cc libsecret libpulseaudio speechd-minimal diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index d7af407e417b..e08754d49d4f 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -1,24 +1,24 @@ { - "30": { - "chrome": "124.0.6367.243", + "31": { + "chrome": "126.0.6478.234", "chromium": { "deps": { "gn": { - "hash": "sha256-aEL1kIhgPAFqdb174dG093HoLhCJ07O1Kpqfu7r14wQ=", - "rev": "22581fb46c0c0c9530caa67149ee4dd8811063cf", + "hash": "sha256-mNoQeHSSM+rhR0UHrpbyzLJC9vFqfxK1SD0X8GiRsqw=", + "rev": "df98b86690c83b81aedc909ded18857296406159", "url": "https://gn.googlesource.com/gn", - "version": "2024-03-14" + "version": "2024-05-13" } }, - "version": "124.0.6367.243" + "version": "126.0.6478.234" }, "chromium_npm_hash": "sha256-oILlQlzTcc0YqAvK5htRvG/YXWJTDtJ60Z1EcBEj9dw=", "deps": { "src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-YrAJnuNig6v87+eNnZ2W+PCzxjGe5CuymF6ul/v9SCk=", + "hash": "sha256-lepGVhzXrBAY5YWwobe18FroRiOD/Q9f8QqazHDmvTY=", "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "rev": "124.0.6367.243", + "rev": "126.0.6478.234", "url": "https://chromium.googlesource.com/chromium/src.git" }, "src/chrome/test/data/perf/canvas_bench": { @@ -41,16 +41,16 @@ }, "src/docs/website": { "fetcher": "fetchFromGitiles", - "hash": "sha256-2WyiSqza9Mp2G8KHUnrzfikC7hGcUTLu4/W9AD6Zdi4=", - "rev": "02057aa20e0dd4598967e3daf2f25c815962ef1c", + "hash": "sha256-OSt8vyB1nPLMJaL47ouvS/R+VRxMixEL74TwrdDpJro=", + "rev": "b623150ede7e61bf949bd203b400f28012298274", "url": "https://chromium.googlesource.com/website.git" }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-SUwtnpYQbPRCIzTQcJnoW9sI597LP1BvqNrhcb2NNfk=", + "hash": "sha256-OlnSVTCfhl8Gl6DHG6JBi/x0G9cXar1KC3mfxcZ3y1Y=", "owner": "electron", "repo": "electron", - "rev": "v30.4.0" + "rev": "v31.7.2" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -60,10 +60,16 @@ }, "src/net/third_party/quiche/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-BJ3CCKFHOcIgIqnYxfjfOqbRhnt9ycrZfAFRZOLPYZQ=", - "rev": "9f8738892edd83219d2f83fdd73c7c14d5dbb80d", + "hash": "sha256-viNzIM0zITYLVIdxjqqOhZcJZQiNLeZbPXBt12fGxAw=", + "rev": "ee237e96f18ef123af9992f74645a8a0ce9ef6ef", "url": "https://quiche.googlesource.com/quiche.git" }, + "src/testing/libfuzzer/fuzzers/wasm_corpus": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qWsGQNUptbz0jYvUuxP7woNf5QQrfn9k3uvr82Yk0QM=", + "rev": "f650ff816f2ef227f61ea2e9f222aa69708ab367", + "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git" + }, "src/third_party/accessibility_test_framework/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=", @@ -72,14 +78,14 @@ }, "src/third_party/angle": { "fetcher": "fetchFromGitiles", - "hash": "sha256-MFXZ7gEO8vHFHtjzzLSgGlB9AKx+hndPfmwsE5XHGXo=", - "rev": "bda89e1f7c7195a9d03d037039c2dd5057563a59", + "hash": "sha256-npgkeMJGP/VBgU13RBVihRziyD3GHXPR5kIgarIE7Yw=", + "rev": "efca5c3874f331bb1a82ed913f5691af7ff99d82", "url": "https://chromium.googlesource.com/angle/angle.git" }, "src/third_party/angle/third_party/VK-GL-CTS/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-eQvZmm6aAsI+z++SMM9i/SsREjikIjMLpedzw57eKyA=", - "rev": "ec9827528085fcffca353c8d941ec20e3de7aaea", + "hash": "sha256-jpcUpskkhZ1uj+mKI+nNrrBg2Yk9SxWwLiTqDDqdzxM=", + "rev": "9d7b4c3d553331e316321942e2eb8413e4081c79", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" }, "src/third_party/angle/third_party/glmark2/src": { @@ -96,8 +102,8 @@ }, "src/third_party/anonymous_tokens/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-ZKvfil6V4PexxVl/UCW/mUINlCHBTrZnhTB0UhTW0PQ=", - "rev": "321a40ba18a083feccb8ae2f99a8676bb1702676", + "hash": "sha256-o/9lOnPR6vT0pkqWgenfyh9nI5Qoxyd030MNTfcoRSc=", + "rev": "76bfcccb6418239183df55111f2f24782d9f3680", "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" }, "src/third_party/beto-core/src": { @@ -108,8 +114,8 @@ }, "src/third_party/boringssl/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-RiDdH26xzoAD2NdTNKDraco9p2jKHXJxbRWI3pUhI78=", - "rev": "4fa4804c8ab4521079af62dba5260a99c34b8a29", + "hash": "sha256-+G7BcdtU8AeNMY4NLQgKpgF28/CS9FIjf+vaOd+Wf6o=", + "rev": "2db0eb3f96a5756298dcd7f9319e56a98585bd10", "url": "https://boringssl.googlesource.com/boringssl.git" }, "src/third_party/breakpad/breakpad": { @@ -126,8 +132,8 @@ }, "src/third_party/catapult": { "fetcher": "fetchFromGitiles", - "hash": "sha256-HhpP5OeGF9in2XEoZMfMCIAFHAqlDvJpfSWa8JfGWzM=", - "rev": "9128ec6d34905512199f953bc60ff75ca29d0cf2", + "hash": "sha256-A/mJDWPo2SijDiar3hleWOx0mZg7HxtdN9sjgsmiO60=", + "rev": "923a565b97768d3a51047c3f384f6a0d17990192", "url": "https://chromium.googlesource.com/catapult.git" }, "src/third_party/ced/src": { @@ -138,14 +144,14 @@ }, "src/third_party/chromium-variations": { "fetcher": "fetchFromGitiles", - "hash": "sha256-YwnqJynhunMvIduUcJ1/nBLabe/WS4RDox+XLMYMA2c=", - "rev": "e78e275e34f94fdf333245137878f0f6482db67d", + "hash": "sha256-5XL7nKQPfzRNdtaQTtEG/syvQBdoVZhrNcyKAHu72Sg=", + "rev": "1545704ff52cfb5119f3693c9a9e971594e9cb43", "url": "https://chromium.googlesource.com/chromium-variations.git" }, "src/third_party/clang-format/script": { "fetcher": "fetchFromGitiles", - "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=", - "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9", + "hash": "sha256-whD8isX2ZhLrFzdxHhFP1S/sZDRgyrzLFaVd7OEFqYo=", + "rev": "3c0acd2d4e73dd911309d9e970ba09d58bf23a62", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" }, "src/third_party/cld_3/src": { @@ -174,10 +180,16 @@ }, "src/third_party/cpuinfo/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-9QRj4OA1qWlZujVJ6Z9x3190taVjTCZocM/272eepIs=", - "rev": "aa4b2163b99ac9534194520f70b93eeefb0b3b4e", + "hash": "sha256-eshoHmGiu5k0XE/A1SWf7OvBj7/YD9JNSZgoyGzGcLA=", + "rev": "3c8b1533ac03dd6531ab6e7b9245d488f13a82a5", "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" }, + "src/third_party/crabbyavif/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-MNHqTBfQAV0WsoZzjHVa8F7o1OUuc8O3OOln+UKT58c=", + "rev": "ef17807890f60bee1398a752d53204c369076aca", + "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git" + }, "src/third_party/crc32c/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", @@ -186,14 +198,14 @@ }, "src/third_party/cros-components/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-w2VosAdg+GtalFaGxDB8FB2w7498PMudsXxX4SpJqYE=", - "rev": "a254b37189cf97cfc76634644e58be511aefb69a", + "hash": "sha256-ht/hkX4Nr0VfHq/dovI/CHgPRPpGflUz9KiZywh0MXg=", + "rev": "1985ff9dfd894b5cd958163bf9f4fde8716acbb4", "url": "https://chromium.googlesource.com/external/google3/cros_components.git" }, "src/third_party/cros_system_api": { "fetcher": "fetchFromGitiles", - "hash": "sha256-dFp4Hy7fldUjXxUTtcyRXdt7zpIP2lchzDKkk0b+iko=", - "rev": "9a51dc89c4f21362e858b20a6a7cc8adfd7c7238", + "hash": "sha256-p/eew0EIxSQOWuvEmzrk9BnDIps5y6R/cBR54sHhfcc=", + "rev": "8d58ca6b357e6827660dc26ca777c798f4426c2e", "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" }, "src/third_party/crossbench": { @@ -210,14 +222,14 @@ }, "src/third_party/dawn": { "fetcher": "fetchFromGitiles", - "hash": "sha256-W0E0fhjAc5gdTgIsy+iOAFA7GPEFeMPPJEU5nnRUtbM=", - "rev": "e04b03f714994b7a747b5472da4ffae9e6e38938", + "hash": "sha256-7pYn8KbOAxAG5+OPNXNiW8aCUNxE55BgR67fNO6MaSI=", + "rev": "c9815acd5a88ae4853cd25f7cb8f2face7cace28", "url": "https://dawn.googlesource.com/dawn.git" }, "src/third_party/dawn/third_party/dxc": { "fetcher": "fetchFromGitiles", - "hash": "sha256-bqzkbBbf1btIz84odYfC3c69m6kgssHy2+a9aR+EUaQ=", - "rev": "511cfef8e0509d172fbfa156be8a97ed2b42590b", + "hash": "sha256-mwAZuGP2dIW1pup11wokABoE5xcicSNhFbz/TXfYGII=", + "rev": "9463ce9cd8d9b02b98edb746431c0bbcf9654ae4", "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" }, "src/third_party/dawn/third_party/dxheaders": { @@ -246,20 +258,26 @@ }, "src/third_party/dawn/third_party/webgpu-cts": { "fetcher": "fetchFromGitiles", - "hash": "sha256-VTYTdvBNxqRzYjEx5ml4LnkDEUGpyvssSzDOndHyYgU=", - "rev": "3e45aee0b16dc724a79a0feb0490e2ddb06c9f0d", + "hash": "sha256-oc7Dt++zGJzpyueP3qMzI9YVA50MjFy6uIqO4eklYb4=", + "rev": "4629efe685b7b8db08e1c7aa2cafd1e9e5769ac2", "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" }, + "src/third_party/dawn/third_party/webgpu-headers": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xQ+yqHyyxqCvZsX0nl8Thyc3MKRS3SRRhTaLLErcgfM=", + "rev": "aef5e428a1fdab2ea770581ae7c95d8779984e0a", + "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers" + }, "src/third_party/depot_tools": { "fetcher": "fetchFromGitiles", - "hash": "sha256-YmjhwOjqCRxDhC7P+aRoNN+Vokl7hB4s6hDNFS5gLYo=", - "rev": "9c43bc14f1a7404fd4b6f744050d553acca557bf", + "hash": "sha256-JNF2y81hdi0Q6BY+w00uf1iPbP/cq/N+uuOC+a2nPbg=", + "rev": "28ece72a5d752a5e36e62124979b18530e610f6b", "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" }, "src/third_party/devtools-frontend/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-FVYUoK3KWlIjQTWlNkjmnzJDfpRkEZ9sFWTr4GdOUJw=", - "rev": "694ad4ed3c55195acd701950d2b2528880e9201e", + "hash": "sha256-IWKu2u06tUcLKZlvleCiZ63e6hYtsrnMNVNj9N07aLI=", + "rev": "c963f0c7472f41d9d4c3335fffdab4f9b8da25bb", "url": "https://chromium.googlesource.com/devtools/devtools-frontend" }, "src/third_party/dom_distiller_js/dist": { @@ -270,16 +288,16 @@ }, "src/third_party/eigen3/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-tx/XR7xJ7IMh5RMvL8wRo/g+dfD3xcjZkLPSY4D9HaY=", - "rev": "2a9055b50ed22101da7d77e999b90ed50956fe0b", + "hash": "sha256-Q/5UIBdgoS0cIWPnlg41+8Wy4Z6B2cBqSqGfj5rNdII=", + "rev": "e16d70bd4e9cdebd2fbdae63b1a4d86493fbbde6", "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" }, "src/third_party/electron_node": { "fetcher": "fetchFromGitHub", - "hash": "sha256-FJVFKLhVCoOdM6dbuu/DQxw0hXjg+C8a2WfF0u3Qndw=", + "hash": "sha256-gm0mJNq6RVWfSsy7vxz44zz0OKjoH50APKOkOnI+Is8=", "owner": "nodejs", "repo": "node", - "rev": "v20.15.1" + "rev": "v20.18.0" }, "src/third_party/emoji-segmenter/src": { "fetcher": "fetchFromGitiles", @@ -296,8 +314,8 @@ }, "src/third_party/expat/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", - "rev": "441f98d02deafd9b090aea568282b28f66a50e36", + "hash": "sha256-fr18LL/xX23t9TIn3q8jWdV9Y6coepbGsO3vJVdDW6k=", + "rev": "a59c3edffa54a77b8d7b268ef527da541076ca6a", "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" }, "src/third_party/farmhash/src": { @@ -308,8 +326,8 @@ }, "src/third_party/ffmpeg": { "fetcher": "fetchFromGitiles", - "hash": "sha256-5ynDd2wQ3QtS6SM2X+j3hTKB9aVhGrjoIlGSzy43K8Q=", - "rev": "52d8ef3799b2f16b66351dd0972bb0bcee1648ac", + "hash": "sha256-hFmeeCoUrsMsq3ARBKQCgITuotRCD0ro/feJpF/85Rk=", + "rev": "092f84b6141055bfab609b6b2666b724eee2e130", "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" }, "src/third_party/flac": { @@ -320,8 +338,8 @@ }, "src/third_party/flatbuffers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-LecJwLDG6szZZ/UOCFD+MDqH3NKawn0sdEwgnMt8wMM=", - "rev": "bcb9ef187628fe07514e57756d05e6a6296f7dc5", + "hash": "sha256-XT1DKfSFKK5Rp1fttm/aHOVBmUWD+wvcOfD+OYgEJpI=", + "rev": "c696275eaffec33796b5ca8755614fd9fec0a6a7", "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" }, "src/third_party/fontconfig/src": { @@ -344,14 +362,14 @@ }, "src/third_party/freetype/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-FtFRJaxyp7vo4EPBiqx05OsKo1UA1g/h+9BjuoijLFA=", - "rev": "f42ce25563b73fed0123d18a2556b9ba01d2c76b", + "hash": "sha256-ZFWYp9nD4kp/dYQm3SQXjej2do8QgWZMiV9Y4nTDcEY=", + "rev": "a46424228f0998a72c715f32e18dca8a7a764c1f", "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" }, "src/third_party/fuzztest/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-utl9uwFqMqDW9ll9/3lh3rfjmPHlv5sx/enQuPffQZ8=", - "rev": "bddcd9f77ba0a81a99ce50bcadf5149efe545df0", + "hash": "sha256-xMUZYJ0cTCvc9q4q0ZhfFOf2Yb1tHOQfPLrDMEf/YvA=", + "rev": "34584108adea9bb274f71cee34fc091f89d7b2d5", "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" }, "src/third_party/fxdiv/src": { @@ -374,8 +392,8 @@ }, "src/third_party/googletest/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-mNYS3k2fAc7Q6GlpnO7pkXSkGHfUH1MXuZXkCmwG4q4=", - "rev": "c231e6f5b152029dbd5fa4a9e0c04095035aec3f", + "hash": "sha256-OCJ62/IGZI9QCJu/eiytdNE/5keiaf2hbLEM3vmUbNI=", + "rev": "33af80a883ddc33d9c0fac0a5b4578301efb18de", "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" }, "src/third_party/grpc/src": { @@ -404,10 +422,16 @@ }, "src/third_party/icu": { "fetcher": "fetchFromGitiles", - "hash": "sha256-YYoslfgGfmDpSTxtCOmGGfwQg6mVU1IggzAtWRwwcMc=", - "rev": "bad7ddbf921358177e56fd723c2f59f8041a370f", + "hash": "sha256-XQDU7A+43ywikpEt/fLNFnZ/wbU/vUEbm/K55qg180I=", + "rev": "98f2494518c2dbb9c488e83e507b070ea5910e95", "url": "https://chromium.googlesource.com/chromium/deps/icu.git" }, + "src/third_party/instrumented_libs": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-SGEB74fK9e0WWT77ZNISE9fVlXGGPvZMBUsQ3XD+DsA=", + "rev": "0172d67d98df2d30bd2241959d0e9569ada25abe", + "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git" + }, "src/third_party/jsoncpp/source": { "fetcher": "fetchFromGitiles", "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", @@ -434,14 +458,14 @@ }, "src/third_party/libaom/source/libaom": { "fetcher": "fetchFromGitiles", - "hash": "sha256-zgtNjrQE+fzr8Aye0rAkQR5enzfacCAsRbC3crUrMQ4=", - "rev": "158761dfb40e77f3a54c3b14a596112837baa24b", + "hash": "sha256-zlzMsP86/BvcvfoZxdajZUZCvW/8nUvIkRuTdYXnUf8=", + "rev": "77665fee933b409dd94e35b0c216645f845b9fd9", "url": "https://aomedia.googlesource.com/aom.git" }, "src/third_party/libavif/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-moVf7i0gZ/KW53ACcVIWKWNL0oAimOSU1m5IdQHz6z8=", - "rev": "43ec9ace31c6ca11efddddb61b94b744450d46e2", + "hash": "sha256-2vUxV4C9MrXVPgdSZjkEJ3YO9kkdwR0G5pgGZ+E+/60=", + "rev": "5d97130f0820dbc97738f5480e2dd00865a35744", "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git" }, "src/third_party/libavifinfo/src": { @@ -452,14 +476,14 @@ }, "src/third_party/libc++/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-k2bSS8OhVyd0/metFpwFvRCWYOaLEU0Md4AW50GpGTM=", - "rev": "80307e66e74bae927fb8709a549859e777e3bf0b", + "hash": "sha256-ocJqlENHw19VpkFxKwHneGw3aNh56nt+/JeopxLj2M8=", + "rev": "e3b94d0e5b86883fd77696bf10dc33ba250ba99b", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" }, "src/third_party/libc++abi/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-AdyX58sg//O2e76HAcRC5DcuiTsd68QS4mNVkPv0Vck=", - "rev": "ec88f0ab262c5f2426dbf138b92ee9ae5961e431", + "hash": "sha256-71aEsBTsJl7XkH5y1s99eH3WpjVk+O1mHLtZE6dSIjQ=", + "rev": "a37a3aa431f132b02a58656f13984d51098330a2", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" }, "src/third_party/libdrm/src": { @@ -470,8 +494,8 @@ }, "src/third_party/libgav1/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-tB9Wzjs4Sct7QendDMKkaEE4ddD6ptnNCmj1yYKcQSc=", - "rev": "f9a93151adf7203c6ab90f3c94bbd5972b7967b8", + "hash": "sha256-+ss9S5t+yoHzqbtX68+5OyyUbJVecYLwp+C3EXfAziE=", + "rev": "a2f139e9123bdb5edf7707ac6f1b73b3aa5038dd", "url": "https://chromium.googlesource.com/codecs/libgav1.git" }, "src/third_party/libipp/libipp": { @@ -506,8 +530,8 @@ }, "src/third_party/libsrtp": { "fetcher": "fetchFromGitiles", - "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=", - "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a", + "hash": "sha256-XOPiDAOHpWyCiXI+fi1CAie0Zaj4v14m9Kc8+jbzpUY=", + "rev": "7a7e64c8b5a632f55929cb3bb7d3e6fb48c3205a", "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" }, "src/third_party/libsync/src": { @@ -524,8 +548,8 @@ }, "src/third_party/libvpx/source/libvpx": { "fetcher": "fetchFromGitiles", - "hash": "sha256-5IsUUvhcKKiWJFetS29+S7Wiz5JwqRZGK2t2ehld/M4=", - "rev": "19832b1702d5b0adf616a0e080abd5207c8445b5", + "hash": "sha256-R7AMqzNV92dnNsPV1mECVsi1dKh+0W8mo24NcPyMn0c=", + "rev": "108f5128e2969451f77b1523ce30bebe545cdd58", "url": "https://chromium.googlesource.com/webm/libvpx.git" }, "src/third_party/libwebm/source": { @@ -536,8 +560,8 @@ }, "src/third_party/libwebp/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Wa33opOFgcmYtycezDUt2f6PqZBse6xYB5kLuSaw95o=", - "rev": "ca332209cb5567c9b249c86788cb2dbf8847e760", + "hash": "sha256-xuRpEwOnaLGZmrPvfUn3DSoJANd94CG+JXcN7Mdmk5I=", + "rev": "845d5476a866141ba35ac133f856fa62f0b7445f", "url": "https://chromium.googlesource.com/webm/libwebp.git" }, "src/third_party/libyuv": { @@ -579,8 +603,8 @@ }, "src/third_party/nearby/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-YotKuKutnjuphwiElfQO6qpoNLhZGP6bqWZnW3Zv6QI=", - "rev": "33e682f24427a0eb634bd3186fe3c6fd96bd6768", + "hash": "sha256-oz+yloV78xpY71JzWKLEcJNmYT4QYh0IzNXdJwKc8mU=", + "rev": "f26d25ed0106bd8946f8bb380bb67fb552e7390d", "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" }, "src/third_party/neon_2_sse/src": { @@ -597,14 +621,14 @@ }, "src/third_party/openscreen/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-4Qd5nHJxIOY7ifPy6Xf0TgZK0TkZY48scOkJ25kMCjk=", - "rev": "90e48ecc4ed9feeba36f49065c738d620d6f0780", + "hash": "sha256-FOawpIr8sXw3VNgYXCw5+NxFexE+lNVni7flp+BMJXA=", + "rev": "97d0a7fd9e51669930f8376e069599acc1c2de2e", "url": "https://chromium.googlesource.com/openscreen" }, "src/third_party/openscreen/src/buildtools": { "fetcher": "fetchFromGitiles", - "hash": "sha256-SBorO59kMSnskcp3oP5lrGQg+9cr/Ymey2aZGlRTgu0=", - "rev": "0ac67b7cef80e421283f633ee9c2ce652f6e42cc", + "hash": "sha256-suuxUL//BfAMmG8os8ChI7ic9EjGTi7y5kjxiAyrEQc=", + "rev": "4e0e9c73a0f26735f034f09a9cab2a5c0178536b", "url": "https://chromium.googlesource.com/chromium/src/buildtools" }, "src/third_party/openscreen/src/third_party/tinycbor/src": { @@ -621,14 +645,14 @@ }, "src/third_party/pdfium": { "fetcher": "fetchFromGitiles", - "hash": "sha256-/gSW4sd2AN4m3aIs9AojqsfrXeCNNrl7wFM54KeQVxw=", - "rev": "dcdd830ae4e1b14f85383d1baf84efee6bc853cc", + "hash": "sha256-jhDbR0COFpErzHiWD66rcQRWqmf3IgqBU4/aklUEDG4=", + "rev": "ecbab85b3c5285b971b9801c7e197284dca5d144", "url": "https://pdfium.googlesource.com/pdfium.git" }, "src/third_party/perfetto": { "fetcher": "fetchFromGitiles", - "hash": "sha256-FeI+nAa5N8mQoA8gDSmWn6nw6TSPhDGwJI8/7r/5z1c=", - "rev": "a66020f87046d8934c22e20acb2bb8a91901ce8e", + "hash": "sha256-kqpwwf/havZpzxBjJFWNcPnGqvu7KSC6DE3xBbdiK9Q=", + "rev": "6aaa8a1fb15659d1b68179e20993e969d9f500f8", "url": "https://android.googlesource.com/platform/external/perfetto.git" }, "src/third_party/protobuf-javascript/src": { @@ -663,14 +687,14 @@ }, "src/third_party/re2/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-gB6vW6UJ60LrrGeNP6NKAcirIK6jgZjHRc6TA+pNXAQ=", - "rev": "6598a8ecd57724c8c7d43b2fca8eb9f9969ce57c", + "hash": "sha256-+xqIFlDDx0FjHt82Gj/7UVKz8KCaTvhTg4Pg/MKwu8w=", + "rev": "f31c2c6f380331ddc862e37c7dea0bcf440b29dc", "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" }, "src/third_party/ruy/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-cwmKQJpR+7lp+dq8fGu6U8A+qmkXz6SlWvAdhBkKZOw=", - "rev": "587c2cf8b11d3c32fa26887063eda3171a3d353e", + "hash": "sha256-4NVvqUZn2BdwTxJINTHwPeRqbGXZrWdcd7jv1Y+eoKY=", + "rev": "c08ec529fc91722bde519628d9449258082eb847", "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" }, "src/third_party/securemessage/src": { @@ -681,8 +705,8 @@ }, "src/third_party/skia": { "fetcher": "fetchFromGitiles", - "hash": "sha256-zHfv4OZK/nVJc2rl+dBSCc4f6qndpAKcFZtThw06+LY=", - "rev": "a747f7ea37db6ea3871816dbaf2eb41b5776c826", + "hash": "sha256-MmguxmkiZkICHvx76J2bHM6BaXQh9vzWNRQExa5PScg=", + "rev": "be621ea04206d8fae23952783d1d588d6ce0d9b3", "url": "https://skia.googlesource.com/skia.git" }, "src/third_party/smhasher/src": { @@ -705,8 +729,8 @@ }, "src/third_party/sqlite/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-TsrSvL76H7SFhJWgHqyl8Y/BhAcnI9oaT2tUT6Ktan4=", - "rev": "f51e3fa404f5853650525549c78d7489a7f457b3", + "hash": "sha256-NyYVUWJTfZ069Po70vgOssJEGXdoFgdrxg1IhYNtXPA=", + "rev": "1ee793e63351333e2089d4b272e15574502ff0c2", "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" }, "src/third_party/squirrel.mac": { @@ -732,8 +756,8 @@ }, "src/third_party/swiftshader": { "fetcher": "fetchFromGitiles", - "hash": "sha256-tU0maePvL35JIVKFm+9hmPYDM81szLNYqUJyTKMHT0k=", - "rev": "bbe6452b420c5ddc4b0fd421b0a3ce271262f4ca", + "hash": "sha256-z4bu4cohPSBV8qluLBQau/C65GC+OGWq6bBeMR/TCFA=", + "rev": "da334852e70510d259bfa8cbaa7c5412966b2f41", "url": "https://swiftshader.googlesource.com/SwiftShader.git" }, "src/third_party/text-fragments-polyfill/src": { @@ -744,8 +768,8 @@ }, "src/third_party/tflite/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Iqun3uMTCjGzHxUDeTCrvZufNtobnbqYVPDt7ZJ06wM=", - "rev": "55bc062601e4ee5a4efa834a84ae5c5ec6b28306", + "hash": "sha256-k846rWmLlNmnQxZHPzaFHDv5xu3AQt+9ynQIor4fFfw=", + "rev": "1187fe26a8a52029b23e0832356989ab44a540c3", "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" }, "src/third_party/ukey2/src": { @@ -756,14 +780,14 @@ }, "src/third_party/vulkan-deps": { "fetcher": "fetchFromGitiles", - "hash": "sha256-MokWdjOP8Mc5hmoRrSXHXkobMPWbbmMzAMBOOoKG3gk=", - "rev": "3cebaae6743688201c8aa9b3694bba6948f0fa68", + "hash": "sha256-EU8/UkMiD8TAlXjzg0bqn7DRijSm+y0W+7fpaP/gDkI=", + "rev": "f1dcf238ad742f936794809f28b0ad0511b6585b", "url": "https://chromium.googlesource.com/vulkan-deps" }, "src/third_party/vulkan-deps/glslang/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-lP+N1d6jE+Cj5ofomgMEhbA6VbH5eKw83mY6zNIOfNk=", - "rev": "9f37ad360ea1c32162f0cc1799b1b292594fc771", + "hash": "sha256-/2t8GbVf+GnOK8p+KFKXyWc26SEAD+UxPCGuhqZsRpg=", + "rev": "b3e9bdbe1656b37611585e0a1523678f089bc31e", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" }, "src/third_party/vulkan-deps/spirv-cross/src": { @@ -774,44 +798,44 @@ }, "src/third_party/vulkan-deps/spirv-headers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-kyOAwe4R0FmeA9IIJF2eoZR+7g9LiGKaZ7FuIfkrXJ4=", - "rev": "8b246ff75c6615ba4532fe4fde20f1be090c3764", + "hash": "sha256-+svEwPqaUxZeg/JF9DYfwx0N1g9eTzHkIEyW5rZ1DaA=", + "rev": "49a1fceb9b1d087f3c25ad5ec077bb0e46231297", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" }, "src/third_party/vulkan-deps/spirv-tools/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-/Cldtx75V+z3FuColEqwweyZHEqR2NaIj1Ha/vPoCsc=", - "rev": "c6615779ef8a1eb5ef48fef77bf3eb2cf4f5438d", + "hash": "sha256-+HKyvortwE3LT1T+vwfhLWOjBu4QUIj0mSuRK/WhFqI=", + "rev": "199038f10cbe56bf7cbfeb5472eb0a25af2f09f5", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" }, "src/third_party/vulkan-deps/vulkan-headers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-EnKiCtH6rh3ACQgokSSfp4FPFluMZW0dheP8IEzZtY4=", - "rev": "577baa05033cf1d9236b3d078ca4b3269ed87a2b", + "hash": "sha256-bbILp733ddwEStJB0nr+cyAV8Px0kie7rLQ4eS7kUoI=", + "rev": "5677bafb820e476441e9e1f745371b72133407d3", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" }, "src/third_party/vulkan-deps/vulkan-loader/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-zkJSPshRaZRDiBvLJbJo8l1MX10KXYZniqtNTNnokT4=", - "rev": "61a9c50248e09f3a0e0be7ce6f8bb1663855f979", + "hash": "sha256-8N0xdcT2BtjECOMytAkkydbYCIYsJZ9JnQMt1fq1Iso=", + "rev": "eb8c7b071a449be3d1331e0961c8fdd0a78efca9", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" }, "src/third_party/vulkan-deps/vulkan-tools/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-9qs0oS6W7x/1Z+wlFt91bqF09oxoloNPtjjH9mECJFk=", - "rev": "733fd2b522918f81f9c4669350dafd066f99c5d5", + "hash": "sha256-6Pu0oSqrCIUCQUlYEqaNsQt583fipG+3SYXtM4oa9RE=", + "rev": "df8e710224f563a04b7db2680f72d31619c4b259", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" }, "src/third_party/vulkan-deps/vulkan-utility-libraries/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-mCD9/bpWUXRVJ+OyOqG0tXTgFuptIlcG6UR/RiNV1Z0=", - "rev": "a4140c5fd47dcf3a030726a60b293db61cfb54a3", + "hash": "sha256-QAYYpIH82F1OaUsTFCgBDHMWAdWpaTBMLvNgK+QRMBQ=", + "rev": "358a107a6ff284906dcccbabe5b0183c03fd85b6", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" }, "src/third_party/vulkan-deps/vulkan-validation-layers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Bcm5yMo7JL/E6YZetlabkA0mkEFxbWriYNd8tRtgx5k=", - "rev": "5b8af92af052c83444ac560ff1e28c1c322424ef", + "hash": "sha256-ysOCZ3XKVt0bhtF0J20cbumFTXzk3qqgfZFjA9qU/9s=", + "rev": "944660e342cfafb6c318d11731751d9a291434d4", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" }, "src/third_party/vulkan_memory_allocator": { @@ -834,14 +858,14 @@ }, "src/third_party/wayland-protocols/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-ljMcY59iOdGYeToadCuQ3t0lrBnsBdot+NiT6e+JJ04=", - "rev": "681c33c8547d6aefe24455ba2bffe1c5ae11fee5", + "hash": "sha256-5gWBte8oiuXM01StvyXFAsxFwuQZHjZT/LZ6l0mvrwI=", + "rev": "c7e9c4f5d396cda4051e49b15d7d0e4f91e4efac", "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" }, "src/third_party/wayland/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-YSo1DznmcaYSUcJl/3voVSfZfuLokAFQt6F3M1Iat28=", - "rev": "c35d1a3d1c0a1735afe5eb227cb826faa878ec19", + "hash": "sha256-Cxu9+Kzw2t1BDfuGzNobaraT4eJcSPO7jvnHpuUANoo=", + "rev": "31577177454b89db37ceabd94e1640d398adbc87", "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" }, "src/third_party/webdriver/pylib": { @@ -852,20 +876,20 @@ }, "src/third_party/webgl/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-dubsIPZKBGOzANGvMtQxFKFIHr0laDUGpzgRyEOjHMU=", - "rev": "f4bf599a8b575df685c31d9c4729a70a04e377ed", + "hash": "sha256-Yn0e1bpvtD4mGdZaRiBytc+upLulYVyHJqXJiTWEfmA=", + "rev": "1b6371436a0a60e6b9a4ae2a40a8eba198e3af02", "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" }, "src/third_party/webgpu-cts/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-/duXwmqanyI2KEnV5izvr0kE8tJNI1F1jMMIY0ylLH8=", - "rev": "addbf812fd750dc8cebbd63732e7ce54a763fbee", + "hash": "sha256-POFEg+sjEvogLgu0tGpMHFiMy244QBJInr+Ix2MgtYs=", + "rev": "762a3dfb42095c6084da99b630eea6bef9dc1db8", "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" }, "src/third_party/webrtc": { "fetcher": "fetchFromGitiles", - "hash": "sha256-USSfh+vUFrWnXYvZIORRb4AEGNSCPub2cNqEdZD9mKM=", - "rev": "a55ff9e83e4592010969d428bee656bace8cbc3b", + "hash": "sha256-zSB7M1YbAdQaBJzJVJKkE+ZPdqiJRPPBCOoZk+IH3Yo=", + "rev": "a18e38fed2307edd6382760213fa3ddf199fa181", "url": "https://webrtc.googlesource.com/src.git" }, "src/third_party/weston/src": { @@ -888,14 +912,14 @@ }, "src/third_party/xnnpack/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Cmw+rj805YTnnCwy2Zwzi2ZW4sdX5JWjTnBaUB6+YyU=", - "rev": "7e696d941310a528dd2d6fbee3d499d19b24746d", + "hash": "sha256-DFASq5yiHHrda3iAIJ6spcw12HQfwsVJs37XsxIcers=", + "rev": "e73fb4a03f658fd48cc10c8a7cf48fe7eeab9114", "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" }, "src/third_party/zstd/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-hWfYKiTzkmeiUTgNrSYXOFauusSVceVhD04Hgk69CK4=", - "rev": "621a263fb2e6c2175fbd489e5d77ee8038baa2b2", + "hash": "sha256-B/zsEY8mUV86xzf6fOclTdjBFBD+ErkjYAmTNn2r+18=", + "rev": "ff7a151f2e6c009b657d9f798c2d9962b0e3feb5", "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" }, "src/tools/page_cycler/acid3": { @@ -906,36 +930,36 @@ }, "src/v8": { "fetcher": "fetchFromGitiles", - "hash": "sha256-ME/O8CJASZ8Ql931EaTRM3+6lLzGx1us/cK9Dv7Bd+s=", - "rev": "cc9dc1eb196bc3cbeca92eeec62949b4ac7cd757", + "hash": "sha256-WitoqX3tFf3ty0pXaoGAtKV7Jr0cAZ/m+MxET4kpMzQ=", + "rev": "65b1674f955694c83b9a3e579c23ae0ea35258db", "url": "https://chromium.googlesource.com/v8/v8.git" } }, - "electron_yarn_hash": "0vq12z09hcm6xdrd34b01vx1c47r4zdaqrkw9db6r612xrp2xi0c", - "modules": "123", - "node": "20.15.1", - "version": "30.4.0" + "electron_yarn_hash": "0mkq703idswn1qdmrm21ra58pa69hz79hyhaqnigyc854qf4k6w2", + "modules": "125", + "node": "20.18.0", + "version": "31.7.2" }, - "31": { - "chrome": "126.0.6478.234", + "32": { + "chrome": "128.0.6613.186", "chromium": { "deps": { "gn": { - "hash": "sha256-mNoQeHSSM+rhR0UHrpbyzLJC9vFqfxK1SD0X8GiRsqw=", - "rev": "df98b86690c83b81aedc909ded18857296406159", + "hash": "sha256-BiMGbML5aNUt4JzzVqSszBj+8BMlEc92csNugo5qjUk=", + "rev": "b2afae122eeb6ce09c52d63f67dc53fc517dbdc8", "url": "https://gn.googlesource.com/gn", - "version": "2024-05-13" + "version": "2024-06-11" } }, - "version": "126.0.6478.234" + "version": "128.0.6613.186" }, - "chromium_npm_hash": "sha256-oILlQlzTcc0YqAvK5htRvG/YXWJTDtJ60Z1EcBEj9dw=", + "chromium_npm_hash": "sha256-OBUYgjfoEZly8JLTtprfU+hlKNFSnHLheaVWhrirGJk=", "deps": { "src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-lepGVhzXrBAY5YWwobe18FroRiOD/Q9f8QqazHDmvTY=", + "hash": "sha256-6Rtd3eu9z7yvzmMaSGjvTCXt29f9cAXFc1IVT0otQ2I=", "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "rev": "126.0.6478.234", + "rev": "128.0.6613.186", "url": "https://chromium.googlesource.com/chromium/src.git" }, "src/chrome/test/data/perf/canvas_bench": { @@ -958,16 +982,16 @@ }, "src/docs/website": { "fetcher": "fetchFromGitiles", - "hash": "sha256-OSt8vyB1nPLMJaL47ouvS/R+VRxMixEL74TwrdDpJro=", - "rev": "b623150ede7e61bf949bd203b400f28012298274", + "hash": "sha256-6pM0P5zXJQXNSQ7MaXSKEHfb7KmtztfhlNlS+i8ugD4=", + "rev": "82c1d3e5b812b35df1cb6a031f59616dc594d4f7", "url": "https://chromium.googlesource.com/website.git" }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-pio5G9ATJHsM4ygKkDhmAbpZecS8p1AQUJ7LHavMq6I=", + "hash": "sha256-RrQMeFf3notm96BJJgctXU/0azABY4axQ8VIEQsG4Gk=", "owner": "electron", "repo": "electron", - "rev": "v31.4.0" + "rev": "v32.2.2" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -977,8 +1001,8 @@ }, "src/net/third_party/quiche/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-viNzIM0zITYLVIdxjqqOhZcJZQiNLeZbPXBt12fGxAw=", - "rev": "ee237e96f18ef123af9992f74645a8a0ce9ef6ef", + "hash": "sha256-bFe79wg+PHRphP6I5q2wRheGTUARKx0zjyn3LxCie0s=", + "rev": "aecfea159d58ef53bd690688e4aca512fc4a3d35", "url": "https://quiche.googlesource.com/quiche.git" }, "src/testing/libfuzzer/fuzzers/wasm_corpus": { @@ -995,14 +1019,14 @@ }, "src/third_party/angle": { "fetcher": "fetchFromGitiles", - "hash": "sha256-npgkeMJGP/VBgU13RBVihRziyD3GHXPR5kIgarIE7Yw=", - "rev": "efca5c3874f331bb1a82ed913f5691af7ff99d82", + "hash": "sha256-YV7RIbGq3zcnl4ZXJndjqbaPPDxCOzPJ87aH672mNq0=", + "rev": "713102774487cf1a8b3f433529eb8181cbcec31a", "url": "https://chromium.googlesource.com/angle/angle.git" }, "src/third_party/angle/third_party/VK-GL-CTS/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-jpcUpskkhZ1uj+mKI+nNrrBg2Yk9SxWwLiTqDDqdzxM=", - "rev": "9d7b4c3d553331e316321942e2eb8413e4081c79", + "hash": "sha256-haO6KT+VbG/d2FljtsoJT7xghPTeEY5GPJdh2s9faVs=", + "rev": "5b2dfe7c775aa7b7909432944ba3535abcd25fc9", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" }, "src/third_party/angle/third_party/glmark2/src": { @@ -1025,20 +1049,20 @@ }, "src/third_party/beto-core/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-7GkqH4hgTVmISjUy/Km/X28tBSsiMs3JRnDmol1zaag=", - "rev": "8bd72cfb219344308ee857bcbe65a27fe91acfe8", + "hash": "sha256-E2oaN2nbqG21qFhUtatsbXwC8KhoQadvU6BmYxF2lgs=", + "rev": "08537fdd2b0990270ea0214a61dfd318f293bc15", "url": "https://beto-core.googlesource.com/beto-core.git" }, "src/third_party/boringssl/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-+G7BcdtU8AeNMY4NLQgKpgF28/CS9FIjf+vaOd+Wf6o=", - "rev": "2db0eb3f96a5756298dcd7f9319e56a98585bd10", + "hash": "sha256-jZ9T5/6t1ImeCDBAMzW0aSmT/NcLxbESYv/F+cBjIFY=", + "rev": "f01108e4761e1d4189cb134322c3cb01dc71ef87", "url": "https://boringssl.googlesource.com/boringssl.git" }, "src/third_party/breakpad/breakpad": { "fetcher": "fetchFromGitiles", - "hash": "sha256-qAIXZ1jZous0Un0jVkOQ66nA2525NziV3Lbso2/+Z1Y=", - "rev": "76788faa4ef163081f82273bfca7fae8a734b971", + "hash": "sha256-QuMzYywRDzbwZHJrz/Gm/W6kclvBImRZCnGq8AbTxUY=", + "rev": "81819541a78c49e9109d2267462775e801f89ce6", "url": "https://chromium.googlesource.com/breakpad/breakpad.git" }, "src/third_party/cast_core/public/src": { @@ -1049,8 +1073,8 @@ }, "src/third_party/catapult": { "fetcher": "fetchFromGitiles", - "hash": "sha256-A/mJDWPo2SijDiar3hleWOx0mZg7HxtdN9sjgsmiO60=", - "rev": "923a565b97768d3a51047c3f384f6a0d17990192", + "hash": "sha256-LIPOcMBxugyuYJ7IE1VszqLAWBBR58Ozy9VCRqVL208=", + "rev": "523ebded2f72a446544e2d9271ef39857f4e6ae7", "url": "https://chromium.googlesource.com/catapult.git" }, "src/third_party/ced/src": { @@ -1061,8 +1085,8 @@ }, "src/third_party/chromium-variations": { "fetcher": "fetchFromGitiles", - "hash": "sha256-5XL7nKQPfzRNdtaQTtEG/syvQBdoVZhrNcyKAHu72Sg=", - "rev": "1545704ff52cfb5119f3693c9a9e971594e9cb43", + "hash": "sha256-E6deeWYQt2BxT+9Zb2VSXvZWCQI64Kf1dzUYAZJVA2s=", + "rev": "c134de595151ae72a112767e22da4448eb50e57f", "url": "https://chromium.googlesource.com/chromium-variations.git" }, "src/third_party/clang-format/script": { @@ -1097,14 +1121,14 @@ }, "src/third_party/cpuinfo/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-eshoHmGiu5k0XE/A1SWf7OvBj7/YD9JNSZgoyGzGcLA=", - "rev": "3c8b1533ac03dd6531ab6e7b9245d488f13a82a5", + "hash": "sha256-UKy9TIiO/UJ5w+qLRlMd085CX2qtdVH2W3rtxB5r6MY=", + "rev": "ca678952a9a8eaa6de112d154e8e104b22f9ab3f", "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" }, "src/third_party/crabbyavif/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-MNHqTBfQAV0WsoZzjHVa8F7o1OUuc8O3OOln+UKT58c=", - "rev": "ef17807890f60bee1398a752d53204c369076aca", + "hash": "sha256-vnFxeAu6NMY6TOb2+LvGbCyOLbVD9R+utl/nnnCWVks=", + "rev": "716408df5cb6d43ebe31cb24194979b81a83b03c", "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git" }, "src/third_party/crc32c/src": { @@ -1115,38 +1139,38 @@ }, "src/third_party/cros-components/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-ht/hkX4Nr0VfHq/dovI/CHgPRPpGflUz9KiZywh0MXg=", - "rev": "1985ff9dfd894b5cd958163bf9f4fde8716acbb4", + "hash": "sha256-6XVrzfpQ8Rh99bCGbUkGd/zmFNgt4ZyRsyNvUkIfEyE=", + "rev": "39e57dd0d30ed019d6fb07c24b350f5fe78a1625", "url": "https://chromium.googlesource.com/external/google3/cros_components.git" }, "src/third_party/cros_system_api": { "fetcher": "fetchFromGitiles", - "hash": "sha256-p/eew0EIxSQOWuvEmzrk9BnDIps5y6R/cBR54sHhfcc=", - "rev": "8d58ca6b357e6827660dc26ca777c798f4426c2e", + "hash": "sha256-Wq6XYQYAWzy3AurVkLGofFF4avntKIPmx6L7vPW2c2Q=", + "rev": "86bdf11581c80f776bfdf54db7f39f930fd6abaf", "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" }, "src/third_party/crossbench": { "fetcher": "fetchFromGitiles", - "hash": "sha256-4gQn5y/Z6ccYA/0VjIQfMpFMkEuPA78jyCgZ+FpmsFs=", - "rev": "acbea986f40578f43c88239c78c797f61842e642", + "hash": "sha256-ICE5UkP91LHBT0vCpwKmdR+3ePnYcwnFroPUpJMKDvU=", + "rev": "b03a515f9e56280ecabfb254b188349d1a049827", "url": "https://chromium.googlesource.com/crossbench.git" }, "src/third_party/dav1d/libdav1d": { "fetcher": "fetchFromGitiles", - "hash": "sha256-AA2bcrsW1xFspyl5TqYUJeAwKM06rWTNtXr/uMVIJmw=", - "rev": "006ca01d387ac6652825d6cce1a57b2de67dbf8d", + "hash": "sha256-SlHTLgqaVST4pRstuzSBZmMx87I9TJ1c0qhClvU2sjI=", + "rev": "2355eeb8f254a1c34dbb0241be5c70cdf6ed46d1", "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" }, "src/third_party/dawn": { "fetcher": "fetchFromGitiles", - "hash": "sha256-7pYn8KbOAxAG5+OPNXNiW8aCUNxE55BgR67fNO6MaSI=", - "rev": "c9815acd5a88ae4853cd25f7cb8f2face7cace28", + "hash": "sha256-UTtU0GIlkOtXA3vJy0MA99wLARHl7WMM7IBNmXxE6d4=", + "rev": "a79093138c06b0ca942f99ddc39b225dafa4776d", "url": "https://dawn.googlesource.com/dawn.git" }, "src/third_party/dawn/third_party/dxc": { "fetcher": "fetchFromGitiles", - "hash": "sha256-mwAZuGP2dIW1pup11wokABoE5xcicSNhFbz/TXfYGII=", - "rev": "9463ce9cd8d9b02b98edb746431c0bbcf9654ae4", + "hash": "sha256-p4DZNVQ8C4YB52BfBKEFXCqenQk0ONkzkctM9vyz4aw=", + "rev": "ee5422d3f33c0bfd8643ce7782eb3a216cf15dea", "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" }, "src/third_party/dawn/third_party/dxheaders": { @@ -1157,8 +1181,8 @@ }, "src/third_party/dawn/third_party/glfw": { "fetcher": "fetchFromGitiles", - "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", - "rev": "62e175ef9fae75335575964c845a302447c012c7", + "hash": "sha256-E1zXIDiw87badrLOZTvV+Wh9NZHu51nb70ZK9vlAlqE=", + "rev": "b35641f4a3c62aa86a0b3c983d163bc0fe36026d", "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw" }, "src/third_party/dawn/third_party/khronos/EGL-Registry": { @@ -1175,26 +1199,26 @@ }, "src/third_party/dawn/third_party/webgpu-cts": { "fetcher": "fetchFromGitiles", - "hash": "sha256-oc7Dt++zGJzpyueP3qMzI9YVA50MjFy6uIqO4eklYb4=", - "rev": "4629efe685b7b8db08e1c7aa2cafd1e9e5769ac2", + "hash": "sha256-jDjxhMN+cXrf2+sCdp5GqhXuoO2EkoEijSx3PcYahpg=", + "rev": "5167b71635dfbfa5d4558de0da01923d446a5cd4", "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" }, "src/third_party/dawn/third_party/webgpu-headers": { "fetcher": "fetchFromGitiles", - "hash": "sha256-xQ+yqHyyxqCvZsX0nl8Thyc3MKRS3SRRhTaLLErcgfM=", - "rev": "aef5e428a1fdab2ea770581ae7c95d8779984e0a", + "hash": "sha256-J3PcwYoO79HqrACFgk77BZLTCi7oi5k2J6v3wlcFVD4=", + "rev": "8049c324dc7b3c09dc96ea04cb02860f272c8686", "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers" }, "src/third_party/depot_tools": { "fetcher": "fetchFromGitiles", - "hash": "sha256-JNF2y81hdi0Q6BY+w00uf1iPbP/cq/N+uuOC+a2nPbg=", - "rev": "28ece72a5d752a5e36e62124979b18530e610f6b", + "hash": "sha256-Tc3x10zkgOvOqMap0xwsFd7W2l8ZyA923C0RRgw+jp0=", + "rev": "31e21628c3a558d4f2189712e25849d608b3ff8c", "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" }, "src/third_party/devtools-frontend/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-IWKu2u06tUcLKZlvleCiZ63e6hYtsrnMNVNj9N07aLI=", - "rev": "c963f0c7472f41d9d4c3335fffdab4f9b8da25bb", + "hash": "sha256-agqi21oQNixRF+foVECaf4MiDVQdA308sLIgLGKiwYI=", + "rev": "47f04a536265028feb1254a3663853e0ce526455", "url": "https://chromium.googlesource.com/devtools/devtools-frontend" }, "src/third_party/dom_distiller_js/dist": { @@ -1205,16 +1229,16 @@ }, "src/third_party/eigen3/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Q/5UIBdgoS0cIWPnlg41+8Wy4Z6B2cBqSqGfj5rNdII=", - "rev": "e16d70bd4e9cdebd2fbdae63b1a4d86493fbbde6", + "hash": "sha256-qmFsmFEQCDH+TRFc8+5BsYAG1ybL08fWhn8NpM6H6xY=", + "rev": "33d0937c6bdf5ec999939fb17f2a553183d14a74", "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" }, "src/third_party/electron_node": { "fetcher": "fetchFromGitHub", - "hash": "sha256-3pcWLDR1Y6oJUuwtequ5pK7nGwPeOqzALVNGJYskuc0=", + "hash": "sha256-gm0mJNq6RVWfSsy7vxz44zz0OKjoH50APKOkOnI+Is8=", "owner": "nodejs", "repo": "node", - "rev": "v20.16.0" + "rev": "v20.18.0" }, "src/third_party/emoji-segmenter/src": { "fetcher": "fetchFromGitiles", @@ -1243,8 +1267,8 @@ }, "src/third_party/ffmpeg": { "fetcher": "fetchFromGitiles", - "hash": "sha256-hFmeeCoUrsMsq3ARBKQCgITuotRCD0ro/feJpF/85Rk=", - "rev": "092f84b6141055bfab609b6b2666b724eee2e130", + "hash": "sha256-HVsENaBsYThsScvLwwuBT9dhjq5Acf3eskMIH+09mu0=", + "rev": "d941d9677bb4802f01750fd908ec284fb72c84df", "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" }, "src/third_party/flac": { @@ -1255,8 +1279,8 @@ }, "src/third_party/flatbuffers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-XT1DKfSFKK5Rp1fttm/aHOVBmUWD+wvcOfD+OYgEJpI=", - "rev": "c696275eaffec33796b5ca8755614fd9fec0a6a7", + "hash": "sha256-sdcZAL3ZHIHO9c1ko0xCfyii4jibwA+25RQkDa9XqTo=", + "rev": "fb9afbafc7dfe226b9db54d4923bfb8839635274", "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" }, "src/third_party/fontconfig/src": { @@ -1279,14 +1303,14 @@ }, "src/third_party/freetype/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-ZFWYp9nD4kp/dYQm3SQXjej2do8QgWZMiV9Y4nTDcEY=", - "rev": "a46424228f0998a72c715f32e18dca8a7a764c1f", + "hash": "sha256-4WPGveEx3PoBpMlh1PyCJ3w5hdpXztzrXcTZfQ+7DtA=", + "rev": "37cefe33b284d0bad4ec52bcccc1a8c2d8704340", "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" }, "src/third_party/fuzztest/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-xMUZYJ0cTCvc9q4q0ZhfFOf2Yb1tHOQfPLrDMEf/YvA=", - "rev": "34584108adea9bb274f71cee34fc091f89d7b2d5", + "hash": "sha256-Go2Mrehkvk5fz2SlFrChMBnZJ3H8luhJU+M1TtqG7vg=", + "rev": "32eb84a95951fa3a0148fb3e6a1a02f830ded136", "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" }, "src/third_party/fxdiv/src": { @@ -1301,6 +1325,12 @@ "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" }, + "src/third_party/glslang/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FhuQ4i8Xhy8FsEdAqJntffpo1vJRPsYdR5GFWXDtQD0=", + "rev": "dc9f6f61adaec755a09e1943cf7014c688443bcb", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" + }, "src/third_party/google_benchmark/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=", @@ -1309,8 +1339,8 @@ }, "src/third_party/googletest/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-OCJ62/IGZI9QCJu/eiytdNE/5keiaf2hbLEM3vmUbNI=", - "rev": "33af80a883ddc33d9c0fac0a5b4578301efb18de", + "hash": "sha256-iBR2otKeTc864DvCw0n7hpcn/4fHP+CIu2kLmBWym9M=", + "rev": "cee1ba1f24fb12b9ae8f31e70dca3f73dbb12cc2", "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" }, "src/third_party/grpc/src": { @@ -1321,14 +1351,14 @@ }, "src/third_party/harfbuzz-ng/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-VAan6P8PHSq8RsGE4YbI/wCfFAhzl3nJMt0cQBYi5Ls=", - "rev": "155015f4bec434ecc2f94621665844218f05ce51", + "hash": "sha256-iR49rfGDKxPObCff1/30hYHpP5FpZ28ROgMZhNk9eFY=", + "rev": "1da053e87f0487382404656edca98b85fe51f2fd", "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" }, "src/third_party/highway/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", - "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a", + "hash": "sha256-PXsXIqWB4NNiFhanRjMIFSWYuW/IRuQo8mMPUBEentY=", + "rev": "8295336dd70f1201d42c22ab5b0861de38cf8fbf", "url": "https://chromium.googlesource.com/external/github.com/google/highway.git" }, "src/third_party/hunspell_dictionaries": { @@ -1339,14 +1369,14 @@ }, "src/third_party/icu": { "fetcher": "fetchFromGitiles", - "hash": "sha256-XQDU7A+43ywikpEt/fLNFnZ/wbU/vUEbm/K55qg180I=", - "rev": "98f2494518c2dbb9c488e83e507b070ea5910e95", + "hash": "sha256-YlX+PaPhvYh9JzHT9WtS1beUK+cQrHGVUl+IBbv7GeQ=", + "rev": "9408c6fd4a39e6fef0e1c4077602e1c83b15f3fb", "url": "https://chromium.googlesource.com/chromium/deps/icu.git" }, "src/third_party/instrumented_libs": { "fetcher": "fetchFromGitiles", - "hash": "sha256-SGEB74fK9e0WWT77ZNISE9fVlXGGPvZMBUsQ3XD+DsA=", - "rev": "0172d67d98df2d30bd2241959d0e9569ada25abe", + "hash": "sha256-kHKGADAgzlaeckXFbpU1GhJK+zkiRd9XvdtPF6qrQFY=", + "rev": "bb6dbcf2df7a9beb34c3773ef4df161800e3aed9", "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git" }, "src/third_party/jsoncpp/source": { @@ -1375,32 +1405,32 @@ }, "src/third_party/libaom/source/libaom": { "fetcher": "fetchFromGitiles", - "hash": "sha256-zlzMsP86/BvcvfoZxdajZUZCvW/8nUvIkRuTdYXnUf8=", - "rev": "77665fee933b409dd94e35b0c216645f845b9fd9", + "hash": "sha256-igHNDa/Jch0hiwDczrDOdrnGL4nMZMRevwX3AsYiUQ0=", + "rev": "93b8eee4f428675195c5c76e8da719ff50c2a01c", "url": "https://aomedia.googlesource.com/aom.git" }, "src/third_party/libavif/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-2vUxV4C9MrXVPgdSZjkEJ3YO9kkdwR0G5pgGZ+E+/60=", - "rev": "5d97130f0820dbc97738f5480e2dd00865a35744", + "hash": "sha256-aol16YtRFF1xQYXNRIZf4QMf5+ba09aDMEBx4lcAbWI=", + "rev": "03acd65314fe29e6627cf4eab752819f6ee15d74", "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git" }, "src/third_party/libavifinfo/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-UAc4iYWrKWteH98hD3QLkD3JWmV/rsvWhFIVJN7tc+Q=", - "rev": "b496868f7c3fd17dfeeecc0364fe37e19edd548a", + "hash": "sha256-61OPjdMCIbHvWncmBzNw6sqlHcuc1kyqm9k1j4UTcZ0=", + "rev": "8d8b58a3f517ef8d1794baa28ca6ae7d19f65514", "url": "https://aomedia.googlesource.com/libavifinfo.git" }, "src/third_party/libc++/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-ocJqlENHw19VpkFxKwHneGw3aNh56nt+/JeopxLj2M8=", - "rev": "e3b94d0e5b86883fd77696bf10dc33ba250ba99b", + "hash": "sha256-vRRQW+ekjNpstfUI+OOA6rxwJp/OjRhfStmGEb/fOFg=", + "rev": "6bb75caa139ee1e686d2205910454cf6ea212e58", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" }, "src/third_party/libc++abi/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-71aEsBTsJl7XkH5y1s99eH3WpjVk+O1mHLtZE6dSIjQ=", - "rev": "a37a3aa431f132b02a58656f13984d51098330a2", + "hash": "sha256-tSIbtraD/pbqq4lCzgOakepXrSimCyry0WgcGAnkbwM=", + "rev": "a3c7d3e2f3e1e724b4651891b1a71257cbd88acc", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" }, "src/third_party/libdrm/src": { @@ -1423,8 +1453,8 @@ }, "src/third_party/libjpeg_turbo": { "fetcher": "fetchFromGitiles", - "hash": "sha256-+t75ZAdOXc7Nd1/8zEQLX+enZb8upqIQuR6qzb9z7Cg=", - "rev": "9b894306ec3b28cea46e84c32b56773a98c483da", + "hash": "sha256-UhDKDfAgcCS92R2EvxKpoiJMvakUDQgyHu2k/xeE7do=", + "rev": "ccfbe1c82a3b6dbe8647ceb36a3f9ee711fba3cf", "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" }, "src/third_party/liblouis/src": { @@ -1459,14 +1489,14 @@ }, "src/third_party/libunwind/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-/4/Trextb4F9UMDVrg4uG9QZl6S0H9FiwnL+2S5+ZpE=", - "rev": "419b03c0b8f20d6da9ddcb0d661a94a97cdd7dad", + "hash": "sha256-uUiAqW0OoB+ZWnTFpk2PJqI7kO9WgYLHiHkz8jikSKA=", + "rev": "d09db732ff68f40fd3581306c650b17ea1955b4e", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" }, "src/third_party/libvpx/source/libvpx": { "fetcher": "fetchFromGitiles", - "hash": "sha256-R7AMqzNV92dnNsPV1mECVsi1dKh+0W8mo24NcPyMn0c=", - "rev": "108f5128e2969451f77b1523ce30bebe545cdd58", + "hash": "sha256-uG9dnz4l28RB8R1AZBR97Fz7RN/ZYknP0/RffR1FJ1g=", + "rev": "057e53d759ac05417bbc7880b1d2e2ac7f08fc67", "url": "https://chromium.googlesource.com/webm/libvpx.git" }, "src/third_party/libwebm/source": { @@ -1520,8 +1550,8 @@ }, "src/third_party/nearby/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-oz+yloV78xpY71JzWKLEcJNmYT4QYh0IzNXdJwKc8mU=", - "rev": "f26d25ed0106bd8946f8bb380bb67fb552e7390d", + "hash": "sha256-1cj+yG9B9hEvPiGW0jGJhiFG882l56PvgEUXyCBFsSk=", + "rev": "76651429b8f96fc6c80949ba8f4e18c4b738e216", "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" }, "src/third_party/neon_2_sse/src": { @@ -1538,8 +1568,8 @@ }, "src/third_party/openscreen/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-FOawpIr8sXw3VNgYXCw5+NxFexE+lNVni7flp+BMJXA=", - "rev": "97d0a7fd9e51669930f8376e069599acc1c2de2e", + "hash": "sha256-x/SiWPBPeU2Rg7WqrwZcFvDk2J8ILTXyMEGix8r+7Js=", + "rev": "4f7c05781bc43e93706b0330eb830e2bc33fcb6c", "url": "https://chromium.googlesource.com/openscreen" }, "src/third_party/openscreen/src/buildtools": { @@ -1562,14 +1592,14 @@ }, "src/third_party/pdfium": { "fetcher": "fetchFromGitiles", - "hash": "sha256-jhDbR0COFpErzHiWD66rcQRWqmf3IgqBU4/aklUEDG4=", - "rev": "ecbab85b3c5285b971b9801c7e197284dca5d144", + "hash": "sha256-GRihOFfswz+cNDxU/6LHZLp6rVSuHhz+5apRXQapOnQ=", + "rev": "66c80ddf43e3c3181d404607dcdc0cf37fdf7675", "url": "https://pdfium.googlesource.com/pdfium.git" }, "src/third_party/perfetto": { "fetcher": "fetchFromGitiles", - "hash": "sha256-kqpwwf/havZpzxBjJFWNcPnGqvu7KSC6DE3xBbdiK9Q=", - "rev": "6aaa8a1fb15659d1b68179e20993e969d9f500f8", + "hash": "sha256-zs3PFwBmIxSfAk4HZpKsezkyE9kqaFNTbFQ7MSCl20Y=", + "rev": "077d742d9f9738a0453e408560a283a7514c9e8e", "url": "https://android.googlesource.com/platform/external/perfetto.git" }, "src/third_party/protobuf-javascript/src": { @@ -1604,8 +1634,8 @@ }, "src/third_party/re2/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-+xqIFlDDx0FjHt82Gj/7UVKz8KCaTvhTg4Pg/MKwu8w=", - "rev": "f31c2c6f380331ddc862e37c7dea0bcf440b29dc", + "hash": "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=", + "rev": "6dcd83d60f7944926bfd308cc13979fc53dd69ca", "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" }, "src/third_party/ruy/src": { @@ -1622,8 +1652,8 @@ }, "src/third_party/skia": { "fetcher": "fetchFromGitiles", - "hash": "sha256-MmguxmkiZkICHvx76J2bHM6BaXQh9vzWNRQExa5PScg=", - "rev": "be621ea04206d8fae23952783d1d588d6ce0d9b3", + "hash": "sha256-vclLETDkiiBinfvse++0CF9/1+qZeG5vcukTTmqPYiU=", + "rev": "cd98397d0c2c3eb1d5a8d76aade3c87c2e0d28ac", "url": "https://skia.googlesource.com/skia.git" }, "src/third_party/smhasher/src": { @@ -1644,10 +1674,28 @@ "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d", "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" }, + "src/third_party/spirv-cross/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=", + "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" + }, + "src/third_party/spirv-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5lRPxsfXGWimJ7jNtM6kJembcAz357ER8PwFXnh6o4E=", + "rev": "db5a00f8cebe81146cafabf89019674a3c4bf03d", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" + }, + "src/third_party/spirv-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Uld5cLV+oD0wm8TxK0V15yiwrdiUbWGqPQEbtMW9Apg=", + "rev": "a0817526b8e391732632e6a887134be256a20a18", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" + }, "src/third_party/sqlite/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-NyYVUWJTfZ069Po70vgOssJEGXdoFgdrxg1IhYNtXPA=", - "rev": "1ee793e63351333e2089d4b272e15574502ff0c2", + "hash": "sha256-ZDByCZjc0coy19a0/BkVAU8y/Fkt7FKgWtCwI5K0Tdo=", + "rev": "9e45bccab2b8de8140c1732b0ec490db0362f730", "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" }, "src/third_party/squirrel.mac": { @@ -1673,8 +1721,8 @@ }, "src/third_party/swiftshader": { "fetcher": "fetchFromGitiles", - "hash": "sha256-z4bu4cohPSBV8qluLBQau/C65GC+OGWq6bBeMR/TCFA=", - "rev": "da334852e70510d259bfa8cbaa7c5412966b2f41", + "hash": "sha256-YGVv/wDle+VyO/Ue7wR004dl8nvO5GjmDeWsoC30+kc=", + "rev": "c4dfa69de7deecf52c6b53badbc8bb7be1a05e8c", "url": "https://swiftshader.googlesource.com/SwiftShader.git" }, "src/third_party/text-fragments-polyfill/src": { @@ -1685,8 +1733,8 @@ }, "src/third_party/tflite/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-k846rWmLlNmnQxZHPzaFHDv5xu3AQt+9ynQIor4fFfw=", - "rev": "1187fe26a8a52029b23e0832356989ab44a540c3", + "hash": "sha256-2iYz04vqZI1nbvtnMjjy6aE9PMzvpLhttNbTrEvhC4M=", + "rev": "f9122e774969459927e9d956674c0aac06eb3b68", "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" }, "src/third_party/ukey2/src": { @@ -1697,62 +1745,38 @@ }, "src/third_party/vulkan-deps": { "fetcher": "fetchFromGitiles", - "hash": "sha256-EU8/UkMiD8TAlXjzg0bqn7DRijSm+y0W+7fpaP/gDkI=", - "rev": "f1dcf238ad742f936794809f28b0ad0511b6585b", + "hash": "sha256-88nATFDj0QqE57ZH7effuNXByjYwGI58SYiAdvyjrt8=", + "rev": "d8095b45a0b2dcc2a85327ff4cc306c618dfa39a", "url": "https://chromium.googlesource.com/vulkan-deps" }, - "src/third_party/vulkan-deps/glslang/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-/2t8GbVf+GnOK8p+KFKXyWc26SEAD+UxPCGuhqZsRpg=", - "rev": "b3e9bdbe1656b37611585e0a1523678f089bc31e", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" - }, - "src/third_party/vulkan-deps/spirv-cross/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=", - "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" - }, - "src/third_party/vulkan-deps/spirv-headers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+svEwPqaUxZeg/JF9DYfwx0N1g9eTzHkIEyW5rZ1DaA=", - "rev": "49a1fceb9b1d087f3c25ad5ec077bb0e46231297", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" - }, - "src/third_party/vulkan-deps/spirv-tools/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+HKyvortwE3LT1T+vwfhLWOjBu4QUIj0mSuRK/WhFqI=", - "rev": "199038f10cbe56bf7cbfeb5472eb0a25af2f09f5", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" - }, - "src/third_party/vulkan-deps/vulkan-headers/src": { + "src/third_party/vulkan-headers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-bbILp733ddwEStJB0nr+cyAV8Px0kie7rLQ4eS7kUoI=", - "rev": "5677bafb820e476441e9e1f745371b72133407d3", + "hash": "sha256-5gslQRGEeHu7lshmlM6SON+P6cKTGOYrmwkBRmu9NIw=", + "rev": "fabe9e2672334fdb9a622d42a2e8f94578952082", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" }, - "src/third_party/vulkan-deps/vulkan-loader/src": { + "src/third_party/vulkan-loader/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-8N0xdcT2BtjECOMytAkkydbYCIYsJZ9JnQMt1fq1Iso=", - "rev": "eb8c7b071a449be3d1331e0961c8fdd0a78efca9", + "hash": "sha256-CwBKsSCvrhp8gw9zm5lw+aJ/lzYksXd5zGZw0abw2JY=", + "rev": "5892ebe2d7505c2238a643288d9a5b2e68784a36", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" }, - "src/third_party/vulkan-deps/vulkan-tools/src": { + "src/third_party/vulkan-tools/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-6Pu0oSqrCIUCQUlYEqaNsQt583fipG+3SYXtM4oa9RE=", - "rev": "df8e710224f563a04b7db2680f72d31619c4b259", + "hash": "sha256-BraOoeYPOaLw7LfqnG+bZHQiJtWByYjnUU8Gw5ee29k=", + "rev": "2cee0d5b1d8c34e26fd6d9992d3d428ac4c5139d", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" }, - "src/third_party/vulkan-deps/vulkan-utility-libraries/src": { + "src/third_party/vulkan-utility-libraries/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-QAYYpIH82F1OaUsTFCgBDHMWAdWpaTBMLvNgK+QRMBQ=", - "rev": "358a107a6ff284906dcccbabe5b0183c03fd85b6", + "hash": "sha256-0p4CEh0BzMXRDxOh72QIPUjhYFB+9cna2bRtJXEGE/M=", + "rev": "67522b34edde86dbb97e164280291f387ade55fc", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" }, - "src/third_party/vulkan-deps/vulkan-validation-layers/src": { + "src/third_party/vulkan-validation-layers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-ysOCZ3XKVt0bhtF0J20cbumFTXzk3qqgfZFjA9qU/9s=", - "rev": "944660e342cfafb6c318d11731751d9a291434d4", + "hash": "sha256-ompMbxRxa0acD/+a830N0VL88s1GepOO0e8Rkg5Nmjk=", + "rev": "919599474e6e6639527e7c3775ed1064665412d3", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" }, "src/third_party/vulkan_memory_allocator": { @@ -1799,14 +1823,14 @@ }, "src/third_party/webgpu-cts/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-POFEg+sjEvogLgu0tGpMHFiMy244QBJInr+Ix2MgtYs=", - "rev": "762a3dfb42095c6084da99b630eea6bef9dc1db8", + "hash": "sha256-4ZDhNhd4kh2lT47PV9zBISNmZDqxZO8WY+pTtxajEfw=", + "rev": "198d1770062c1a8aba86e7d6e001bb47bea028ee", "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" }, "src/third_party/webrtc": { "fetcher": "fetchFromGitiles", - "hash": "sha256-zSB7M1YbAdQaBJzJVJKkE+ZPdqiJRPPBCOoZk+IH3Yo=", - "rev": "a18e38fed2307edd6382760213fa3ddf199fa181", + "hash": "sha256-ZHkIEiazTp9MBDUufupLGeV97UEfjTwXxG87OUeHcog=", + "rev": "f237dc146debcfde3d70038c2b66f71bfea8d24b", "url": "https://webrtc.googlesource.com/src.git" }, "src/third_party/weston/src": { @@ -1829,14 +1853,14 @@ }, "src/third_party/xnnpack/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-DFASq5yiHHrda3iAIJ6spcw12HQfwsVJs37XsxIcers=", - "rev": "e73fb4a03f658fd48cc10c8a7cf48fe7eeab9114", + "hash": "sha256-JO49N/vJz2nske13dcNFxC9hO7oO/1X6AsNnRCW/RqI=", + "rev": "8df2e765487685757ab5dabd12516cd0a24e3e25", "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" }, "src/third_party/zstd/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-B/zsEY8mUV86xzf6fOclTdjBFBD+ErkjYAmTNn2r+18=", - "rev": "ff7a151f2e6c009b657d9f798c2d9962b0e3feb5", + "hash": "sha256-sy6cs+c3t/XlwwJOMKCuBmoyrOiYHYeqsr/uOMVOdlI=", + "rev": "0ff651dd876823b99fa5c5f53292be28381aee9b", "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" }, "src/tools/page_cycler/acid3": { @@ -1847,36 +1871,36 @@ }, "src/v8": { "fetcher": "fetchFromGitiles", - "hash": "sha256-WitoqX3tFf3ty0pXaoGAtKV7Jr0cAZ/m+MxET4kpMzQ=", - "rev": "65b1674f955694c83b9a3e579c23ae0ea35258db", + "hash": "sha256-VwRVnondH9YM8pYRQo0l0jM0Zb531kpQTo6ngvEPOBg=", + "rev": "d213b3bbc0ecf17ccd2849fdef3bccb1946b01b3", "url": "https://chromium.googlesource.com/v8/v8.git" } }, - "electron_yarn_hash": "12pcq3zzx6627igdfd5bgyismz9n21093smpd43c4aall2mn6194", - "modules": "125", - "node": "20.16.0", - "version": "31.4.0" + "electron_yarn_hash": "19iw16qs4h6b1bcmkkqxhhcgxnl2r6qf57w7dr76vbl0zhmhlyf9", + "modules": "128", + "node": "20.18.0", + "version": "32.2.2" }, - "32": { - "chrome": "128.0.6613.137", + "33": { + "chrome": "130.0.6723.59", "chromium": { "deps": { "gn": { - "hash": "sha256-BiMGbML5aNUt4JzzVqSszBj+8BMlEc92csNugo5qjUk=", - "rev": "b2afae122eeb6ce09c52d63f67dc53fc517dbdc8", + "hash": "sha256-iNXRq3Mr8+wmY1SR4sV7yd2fDiIZ94eReelwFI0UhGU=", + "rev": "20806f79c6b4ba295274e3a589d85db41a02fdaa", "url": "https://gn.googlesource.com/gn", - "version": "2024-06-11" + "version": "2024-09-09" } }, - "version": "128.0.6613.137" + "version": "130.0.6723.59" }, - "chromium_npm_hash": "sha256-OBUYgjfoEZly8JLTtprfU+hlKNFSnHLheaVWhrirGJk=", + "chromium_npm_hash": "sha256-4w5m/bTMygidlb4TZHMx1Obp784DLxMwrfe1Uvyyfp8=", "deps": { "src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-H+C79mGXUaDYcDoJz25iobN3xWUJz6OplleJlTX3ilg=", - "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "rev": "128.0.6613.137", + "hash": "sha256-8AsyUWYjYNczlybVCsvR5YEaL+Ak4Sth7ZA5n6gUjss=", + "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", + "rev": "130.0.6723.59", "url": "https://chromium.googlesource.com/chromium/src.git" }, "src/chrome/test/data/perf/canvas_bench": { @@ -1899,27 +1923,27 @@ }, "src/docs/website": { "fetcher": "fetchFromGitiles", - "hash": "sha256-6pM0P5zXJQXNSQ7MaXSKEHfb7KmtztfhlNlS+i8ugD4=", - "rev": "82c1d3e5b812b35df1cb6a031f59616dc594d4f7", + "hash": "sha256-XK22S9WwNN4zQZ5teiQ1sZA5m/8rArwq3jCgM6H9KQY=", + "rev": "052e29447b43b18da32fff653b9d58ef79fbc836", "url": "https://chromium.googlesource.com/website.git" }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-OErkW4OrDU9WJd8iqWAUZZ5qR4vuX+laLzwTt5OMrOc=", + "hash": "sha256-0Ftjs2hvO7ySECm9U3JFOBtb/VgEHchTfnAoo45sOj8=", "owner": "electron", "repo": "electron", - "rev": "v32.1.1" + "rev": "v33.0.2" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", - "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28", + "rev": "eb21edc44e8e5a82095037be80c8b15c51624293", "url": "https://chromium.googlesource.com/chromium/cdm.git" }, "src/net/third_party/quiche/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-bFe79wg+PHRphP6I5q2wRheGTUARKx0zjyn3LxCie0s=", - "rev": "aecfea159d58ef53bd690688e4aca512fc4a3d35", + "hash": "sha256-NJKJ5cc+wEcmCIFYXWQX4x9BZblbS+wqj+25CcUiPZM=", + "rev": "9808dac40e034f09d7af53d3d79589a02e39c211", "url": "https://quiche.googlesource.com/quiche.git" }, "src/testing/libfuzzer/fuzzers/wasm_corpus": { @@ -1936,14 +1960,14 @@ }, "src/third_party/angle": { "fetcher": "fetchFromGitiles", - "hash": "sha256-YV7RIbGq3zcnl4ZXJndjqbaPPDxCOzPJ87aH672mNq0=", - "rev": "713102774487cf1a8b3f433529eb8181cbcec31a", + "hash": "sha256-k9moMf40yao+FxWT6c/JBu0z/oI+U26LnqUwoweA0SU=", + "rev": "21e4b689c009a93f66d61989a713d52bceaf2979", "url": "https://chromium.googlesource.com/angle/angle.git" }, "src/third_party/angle/third_party/VK-GL-CTS/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-haO6KT+VbG/d2FljtsoJT7xghPTeEY5GPJdh2s9faVs=", - "rev": "5b2dfe7c775aa7b7909432944ba3535abcd25fc9", + "hash": "sha256-yPQG/Ddat9H4XZq6Zu5S3VzcZeMhLBcM//KI/3Kxaxg=", + "rev": "1df39e522f4aa358012180fd4cf876af68aff78d", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" }, "src/third_party/angle/third_party/glmark2/src": { @@ -1960,26 +1984,26 @@ }, "src/third_party/anonymous_tokens/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-o/9lOnPR6vT0pkqWgenfyh9nI5Qoxyd030MNTfcoRSc=", - "rev": "76bfcccb6418239183df55111f2f24782d9f3680", + "hash": "sha256-PMB49+zW9ewlS9ym+xi0xYQYLN0j5Urx6yBXWd8FjjI=", + "rev": "6ea6ec78f9e4998d0a7a5677b2aec08f0ac858f8", "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" }, "src/third_party/beto-core/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-E2oaN2nbqG21qFhUtatsbXwC8KhoQadvU6BmYxF2lgs=", - "rev": "08537fdd2b0990270ea0214a61dfd318f293bc15", + "hash": "sha256-QPFGjtu/I0r4+dTQ2eSlWIEYwJ43B3yW0q4QtVFTVGY=", + "rev": "89563fec14c756482afa08b016eeba9087c8d1e3", "url": "https://beto-core.googlesource.com/beto-core.git" }, "src/third_party/boringssl/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-jZ9T5/6t1ImeCDBAMzW0aSmT/NcLxbESYv/F+cBjIFY=", - "rev": "f01108e4761e1d4189cb134322c3cb01dc71ef87", + "hash": "sha256-on+VonYXZ710oqgaK/OKa9Huq2mSXp8SJcj9CciHsf8=", + "rev": "58f3bc83230d2958bb9710bc910972c4f5d382dc", "url": "https://boringssl.googlesource.com/boringssl.git" }, "src/third_party/breakpad/breakpad": { "fetcher": "fetchFromGitiles", - "hash": "sha256-QuMzYywRDzbwZHJrz/Gm/W6kclvBImRZCnGq8AbTxUY=", - "rev": "81819541a78c49e9109d2267462775e801f89ce6", + "hash": "sha256-kTkwRfaqw5ZCHEvu2YPZ+1vCfekHkY5pY3m9snDN64g=", + "rev": "6b0c5b7ee1988a14a4af94564e8ae8bba8a94374", "url": "https://chromium.googlesource.com/breakpad/breakpad.git" }, "src/third_party/cast_core/public/src": { @@ -1990,8 +2014,8 @@ }, "src/third_party/catapult": { "fetcher": "fetchFromGitiles", - "hash": "sha256-LIPOcMBxugyuYJ7IE1VszqLAWBBR58Ozy9VCRqVL208=", - "rev": "523ebded2f72a446544e2d9271ef39857f4e6ae7", + "hash": "sha256-IHubCuEBE9W0wRudOmjUoaOvT66JuVTzEBUOTvdnXqQ=", + "rev": "296226a4a0067c8cffeb8831fb87526a8035f3cc", "url": "https://chromium.googlesource.com/catapult.git" }, "src/third_party/ced/src": { @@ -2002,8 +2026,8 @@ }, "src/third_party/chromium-variations": { "fetcher": "fetchFromGitiles", - "hash": "sha256-E6deeWYQt2BxT+9Zb2VSXvZWCQI64Kf1dzUYAZJVA2s=", - "rev": "c134de595151ae72a112767e22da4448eb50e57f", + "hash": "sha256-DR5rJdnDKunS/PHtVK1n4zk0MmK54LhlawZW74711LY=", + "rev": "6aa57f2c6b49402b55ec607c17bd7ee8946970b0", "url": "https://chromium.googlesource.com/chromium-variations.git" }, "src/third_party/clang-format/script": { @@ -2044,50 +2068,50 @@ }, "src/third_party/crabbyavif/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-vnFxeAu6NMY6TOb2+LvGbCyOLbVD9R+utl/nnnCWVks=", - "rev": "716408df5cb6d43ebe31cb24194979b81a83b03c", + "hash": "sha256-9ooMkYOHRYbV2kdxu8VWUNgBeBsrN4kWUb8cZJwZfiU=", + "rev": "adfb834d76c6a064f28bb3a694689fc14a42425e", "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git" }, "src/third_party/crc32c/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", - "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6", + "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=", + "rev": "d3d60ac6e0f16780bcfcc825385e1d338801a558", "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" }, "src/third_party/cros-components/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-6XVrzfpQ8Rh99bCGbUkGd/zmFNgt4ZyRsyNvUkIfEyE=", - "rev": "39e57dd0d30ed019d6fb07c24b350f5fe78a1625", + "hash": "sha256-gEhAwW6u8VgBRFmAddRBlosbf/a9lhRLgs70Dvh1zos=", + "rev": "08a6ca6559c8d07c79fb5576a44e016e3126c221", "url": "https://chromium.googlesource.com/external/google3/cros_components.git" }, "src/third_party/cros_system_api": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Wq6XYQYAWzy3AurVkLGofFF4avntKIPmx6L7vPW2c2Q=", - "rev": "86bdf11581c80f776bfdf54db7f39f930fd6abaf", + "hash": "sha256-9rM9m6VRX7B+h9JiICN5O9rBYdQEHNlCUnQMuaTy/1s=", + "rev": "2f88f9c4581a9c854604fa23516de8c9c13b227b", "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" }, "src/third_party/crossbench": { "fetcher": "fetchFromGitiles", - "hash": "sha256-ICE5UkP91LHBT0vCpwKmdR+3ePnYcwnFroPUpJMKDvU=", - "rev": "b03a515f9e56280ecabfb254b188349d1a049827", + "hash": "sha256-7IuhXuxXD3xBkgazg3B9GZknlNv8Xi0eTHkeQv63ayk=", + "rev": "2b812597dd143dbdc560ff2f28d5f8d3adc700d4", "url": "https://chromium.googlesource.com/crossbench.git" }, "src/third_party/dav1d/libdav1d": { "fetcher": "fetchFromGitiles", - "hash": "sha256-SlHTLgqaVST4pRstuzSBZmMx87I9TJ1c0qhClvU2sjI=", - "rev": "2355eeb8f254a1c34dbb0241be5c70cdf6ed46d1", + "hash": "sha256-qJSUt8gMFB+IhOnEAw3t6nj1y7XUY91pLQBF8CeYtas=", + "rev": "6b3c489a2ee2c030f351f21987c27611b4cbe725", "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" }, "src/third_party/dawn": { "fetcher": "fetchFromGitiles", - "hash": "sha256-6ljZh99QPH8/9JAV1tVm6BVAYsJWqkJjzlM2AG2m01g=", - "rev": "5f86f5a316f4e082b2419d8b954ebb79c2be590d", + "hash": "sha256-jc08+1u7+znDkzlQ7vDh85J+iAaEL3Av42SeOtKw0hU=", + "rev": "b1d26bc8d238d4759b5e62aaaa1f62048f92e254", "url": "https://dawn.googlesource.com/dawn.git" }, "src/third_party/dawn/third_party/dxc": { "fetcher": "fetchFromGitiles", - "hash": "sha256-oIByfTUMy1EY3J0/m0iOqJbHd+DzpVAmZbaIdllcF04=", - "rev": "3ea0e7f6b5f464814d6b896eaf69cbd5ebe7fac4", + "hash": "sha256-CrR08tw9e+4U+fa6E9xoP/4puPNHEjLrxtSju8psLlk=", + "rev": "05334a70d3e5355fc86c94bb4e3cfe1c31a65999", "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" }, "src/third_party/dawn/third_party/dxheaders": { @@ -2116,8 +2140,8 @@ }, "src/third_party/dawn/third_party/webgpu-cts": { "fetcher": "fetchFromGitiles", - "hash": "sha256-jDjxhMN+cXrf2+sCdp5GqhXuoO2EkoEijSx3PcYahpg=", - "rev": "5167b71635dfbfa5d4558de0da01923d446a5cd4", + "hash": "sha256-heIL8hhaVr0uRi2lD+7RFltggVFW48ZY9Tdl0yVRdac=", + "rev": "a5065e398d2430c83e17ef9cbad6eae31d1efa8f", "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" }, "src/third_party/dawn/third_party/webgpu-headers": { @@ -2128,14 +2152,14 @@ }, "src/third_party/depot_tools": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Tc3x10zkgOvOqMap0xwsFd7W2l8ZyA923C0RRgw+jp0=", - "rev": "31e21628c3a558d4f2189712e25849d608b3ff8c", + "hash": "sha256-C8U5BFLBCorwHvfKvh1xmAzOaDcBAbe3GhwJebENZD4=", + "rev": "22df6f8e622dc3e8df8dc8b5d3e3503b169af78e", "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" }, "src/third_party/devtools-frontend/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-agqi21oQNixRF+foVECaf4MiDVQdA308sLIgLGKiwYI=", - "rev": "47f04a536265028feb1254a3663853e0ce526455", + "hash": "sha256-brsMWPV8xleRMMUnrONL23kJyy3C98p59nPkGCMUTM0=", + "rev": "b99303161bf24247ed677a5be454dab24ebdced5", "url": "https://chromium.googlesource.com/devtools/devtools-frontend" }, "src/third_party/dom_distiller_js/dist": { @@ -2144,23 +2168,29 @@ "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git" }, + "src/third_party/domato/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fYxoA0fxKe9U23j+Jp0MWj4m7RfsRpM0XjF6/yOhX1I=", + "rev": "053714bccbda79cf76dac3fee48ab2b27f21925e", + "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git" + }, "src/third_party/eigen3/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-qmFsmFEQCDH+TRFc8+5BsYAG1ybL08fWhn8NpM6H6xY=", - "rev": "33d0937c6bdf5ec999939fb17f2a553183d14a74", + "hash": "sha256-U4SMReXTFZg7YGyefI6MXIB66nt5OiANMH0HUyr/xIc=", + "rev": "134b526d6110061469168e7e0511822a8e30bcaf", "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" }, "src/third_party/electron_node": { "fetcher": "fetchFromGitHub", - "hash": "sha256-fYx771gbZTsgEmHQf4mj3qSqmFHs8YVg4sVyUnfsmqI=", + "hash": "sha256-gm0mJNq6RVWfSsy7vxz44zz0OKjoH50APKOkOnI+Is8=", "owner": "nodejs", "repo": "node", - "rev": "v20.17.0" + "rev": "v20.18.0" }, "src/third_party/emoji-segmenter/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", - "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e", + "hash": "sha256-sI6UgXTWxXJajB2h2LH3caf7cqRbBshD5GoLocrUivk=", + "rev": "6b8f235b72deba7d6ef113631129b274c14941ef", "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git" }, "src/third_party/engflow-reclient-configs": { @@ -2172,8 +2202,8 @@ }, "src/third_party/expat/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-fr18LL/xX23t9TIn3q8jWdV9Y6coepbGsO3vJVdDW6k=", - "rev": "a59c3edffa54a77b8d7b268ef527da541076ca6a", + "hash": "sha256-Iwu9+i/0vsPyu6pOWFxjNNblVxMl6bTPW5eWyaju4Mg=", + "rev": "624da0f593bb8d7e146b9f42b06d8e6c80d032a3", "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" }, "src/third_party/farmhash/src": { @@ -2182,10 +2212,16 @@ "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" }, + "src/third_party/fast_float/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0eVovauN7SnO3nSIWBRWAJ4dR7q5beZrIGUZ18M2pao=", + "rev": "3e57d8dcfb0a04b5a8a26b486b54490a2e9b310f", + "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git" + }, "src/third_party/ffmpeg": { "fetcher": "fetchFromGitiles", - "hash": "sha256-HVsENaBsYThsScvLwwuBT9dhjq5Acf3eskMIH+09mu0=", - "rev": "d941d9677bb4802f01750fd908ec284fb72c84df", + "hash": "sha256-HnpWlSfXxa951UkFgL/2zKoaBeveuVkTZz/iqYXjkH8=", + "rev": "91903c28af60a732a051c343b496e1188eec9b05", "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" }, "src/third_party/flac": { @@ -2196,8 +2232,8 @@ }, "src/third_party/flatbuffers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-sdcZAL3ZHIHO9c1ko0xCfyii4jibwA+25RQkDa9XqTo=", - "rev": "fb9afbafc7dfe226b9db54d4923bfb8839635274", + "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM=", + "rev": "8db59321d9f02cdffa30126654059c7d02f70c32", "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" }, "src/third_party/fontconfig/src": { @@ -2220,14 +2256,14 @@ }, "src/third_party/freetype/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-4WPGveEx3PoBpMlh1PyCJ3w5hdpXztzrXcTZfQ+7DtA=", - "rev": "37cefe33b284d0bad4ec52bcccc1a8c2d8704340", + "hash": "sha256-w5Zd4yvGoMQ0BmDGa2b9gK/+7f+UaZDRYqEdMGH/zKg=", + "rev": "83af801b552111e37d9466a887e1783a0fb5f196", "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" }, "src/third_party/fuzztest/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Go2Mrehkvk5fz2SlFrChMBnZJ3H8luhJU+M1TtqG7vg=", - "rev": "32eb84a95951fa3a0148fb3e6a1a02f830ded136", + "hash": "sha256-g+iJrywURQfdYpco26VN+OlhZkVcFzmAK18C7W7/WLU=", + "rev": "a29e31cb00ec9b123dec5a0c6b8d4bc12c2480c8", "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" }, "src/third_party/fxdiv/src": { @@ -2244,8 +2280,8 @@ }, "src/third_party/glslang/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-FhuQ4i8Xhy8FsEdAqJntffpo1vJRPsYdR5GFWXDtQD0=", - "rev": "dc9f6f61adaec755a09e1943cf7014c688443bcb", + "hash": "sha256-6lVjQb8FOyGmRGEcNDzL55s/9bcDY3jIz4Xm3BK3GoI=", + "rev": "dc1012140e015d43711514d1294ac6f626890a40", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" }, "src/third_party/google_benchmark/src": { @@ -2256,8 +2292,8 @@ }, "src/third_party/googletest/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-iBR2otKeTc864DvCw0n7hpcn/4fHP+CIu2kLmBWym9M=", - "rev": "cee1ba1f24fb12b9ae8f31e70dca3f73dbb12cc2", + "hash": "sha256-jccFUondvjWgCBC3oCLUXqtLV07pkEq8IEZ+FLu1MrE=", + "rev": "0953a17a4281fc26831da647ad3fcd5e21e6473b", "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" }, "src/third_party/grpc/src": { @@ -2304,14 +2340,14 @@ }, "src/third_party/leveldatabase/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", - "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea", + "hash": "sha256-y3awFXL8ih2UhEqWj8JRgkhzSxfQciLztb020JHJ350=", + "rev": "23e35d792b9154f922b8b575b12596a4d8664c65", "url": "https://chromium.googlesource.com/external/leveldb.git" }, "src/third_party/libFuzzer/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E=", - "rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303", + "hash": "sha256-xQXfRIcQmAVP0k2mT7Blv1wBxL6wDaWTbIPGcTiMZRo=", + "rev": "487e79376394754705984c5de7c4ce7f82f2bd7c", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" }, "src/third_party/libaddressinput/src": { @@ -2322,14 +2358,14 @@ }, "src/third_party/libaom/source/libaom": { "fetcher": "fetchFromGitiles", - "hash": "sha256-igHNDa/Jch0hiwDczrDOdrnGL4nMZMRevwX3AsYiUQ0=", - "rev": "93b8eee4f428675195c5c76e8da719ff50c2a01c", + "hash": "sha256-uFUIodoC9qpLycwtWRgc0iqaqcUsvVmwAAQGHKolWto=", + "rev": "d5265b173616ce62de231cd1b1eae853ad03641e", "url": "https://aomedia.googlesource.com/aom.git" }, "src/third_party/libavif/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-aol16YtRFF1xQYXNRIZf4QMf5+ba09aDMEBx4lcAbWI=", - "rev": "03acd65314fe29e6627cf4eab752819f6ee15d74", + "hash": "sha256-2GKqPgWs1TD0nPW7VoSo8dz3ugPsZhcy2K1V35XflSk=", + "rev": "c2177c3316a49505dcd592ba21073f7abc25cd37", "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git" }, "src/third_party/libavifinfo/src": { @@ -2340,20 +2376,20 @@ }, "src/third_party/libc++/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-vRRQW+ekjNpstfUI+OOA6rxwJp/OjRhfStmGEb/fOFg=", - "rev": "6bb75caa139ee1e686d2205910454cf6ea212e58", + "hash": "sha256-hKlmY2Bn1f6w0Gmx/Le/LwWk/Gf6hzXqR5C+/w+0CNA=", + "rev": "50ab693ecb611942ce4440d8c9ed707ee65ed5e8", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" }, "src/third_party/libc++abi/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-tSIbtraD/pbqq4lCzgOakepXrSimCyry0WgcGAnkbwM=", - "rev": "a3c7d3e2f3e1e724b4651891b1a71257cbd88acc", + "hash": "sha256-GtK8z2jn4es3uuxpAgm5AoQvUjvhAunAyUwm3HEqLVA=", + "rev": "29b2e9a0f48688da116692cb04758393053d269c", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" }, "src/third_party/libdrm/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", - "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1", + "hash": "sha256-woSYEDUfcEBpYOYnli13wLMt754A7KnUbmTEcFQdFGw=", + "rev": "ad78bb591d02162d3b90890aa4d0a238b2a37cde", "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" }, "src/third_party/libgav1/src": { @@ -2370,8 +2406,8 @@ }, "src/third_party/libjpeg_turbo": { "fetcher": "fetchFromGitiles", - "hash": "sha256-UhDKDfAgcCS92R2EvxKpoiJMvakUDQgyHu2k/xeE7do=", - "rev": "ccfbe1c82a3b6dbe8647ceb36a3f9ee711fba3cf", + "hash": "sha256-qgHXAjCDFxQ+QqJ8pSmI1NUvHvKKTi4MkIe1I/+hUAI=", + "rev": "927aabfcd26897abb9776ecf2a6c38ea5bb52ab6", "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" }, "src/third_party/liblouis/src": { @@ -2394,8 +2430,8 @@ }, "src/third_party/libsrtp": { "fetcher": "fetchFromGitiles", - "hash": "sha256-XOPiDAOHpWyCiXI+fi1CAie0Zaj4v14m9Kc8+jbzpUY=", - "rev": "7a7e64c8b5a632f55929cb3bb7d3e6fb48c3205a", + "hash": "sha256-4qEZ9MD97MoqCUlZtbEhIKy+fDO1iIWqyrBsKwkjXTg=", + "rev": "000edd791434c8738455f10e0dd6b268a4852c0b", "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" }, "src/third_party/libsync/src": { @@ -2406,20 +2442,20 @@ }, "src/third_party/libunwind/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-uUiAqW0OoB+ZWnTFpk2PJqI7kO9WgYLHiHkz8jikSKA=", - "rev": "d09db732ff68f40fd3581306c650b17ea1955b4e", + "hash": "sha256-5xsrVVSu9b+78GEKeLGNpo7ySxrJ2SeuuKghN6NHlSU=", + "rev": "dc70138c3e68e2f946585f134e20815851e26263", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" }, "src/third_party/libvpx/source/libvpx": { "fetcher": "fetchFromGitiles", - "hash": "sha256-uG9dnz4l28RB8R1AZBR97Fz7RN/ZYknP0/RffR1FJ1g=", - "rev": "057e53d759ac05417bbc7880b1d2e2ac7f08fc67", + "hash": "sha256-fXEPPgUdTsvzbLc8mp7v0MWw/9FfOooIIKjRshvYi2o=", + "rev": "fbf63dff1f528d44f24bd662abb89fd01a4a1c25", "url": "https://chromium.googlesource.com/webm/libvpx.git" }, "src/third_party/libwebm/source": { "fetcher": "fetchFromGitiles", - "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", - "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da", + "hash": "sha256-Mn3snC2g4BDKBJsS6cxT3BZL7LZknOWg77+60Nr4Hy0=", + "rev": "26d9f667170dc75e8d759a997bb61c64dec42dda", "url": "https://chromium.googlesource.com/webm/libwebm.git" }, "src/third_party/libwebp/src": { @@ -2430,8 +2466,8 @@ }, "src/third_party/libyuv": { "fetcher": "fetchFromGitiles", - "hash": "sha256-hD5B9fPNwf8M98iS/PYeUJgJxtBvvf2BrrlnBNYXSg0=", - "rev": "a6a2ec654b1be1166b376476a7555c89eca0c275", + "hash": "sha256-tQ7eCY1udoGHRoFr83obQ994IMfxqaH68StvXJ6obZ8=", + "rev": "4620f1705822fd6ab99939f43ce63099bd3d9ae0", "url": "https://chromium.googlesource.com/libyuv/libyuv.git" }, "src/third_party/lss": { @@ -2467,8 +2503,8 @@ }, "src/third_party/nearby/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-1cj+yG9B9hEvPiGW0jGJhiFG882l56PvgEUXyCBFsSk=", - "rev": "76651429b8f96fc6c80949ba8f4e18c4b738e216", + "hash": "sha256-RZsdeT1gkbrOuHvngs+Iavl9YE27jLx4AXXYOvSXZoI=", + "rev": "3c8737f92d765407e4ff6c87b8758ba99ede40ed", "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" }, "src/third_party/neon_2_sse/src": { @@ -2479,14 +2515,14 @@ }, "src/third_party/openh264/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", - "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7", + "hash": "sha256-S7dS2IZwt4p4ZrF6K7E5HnwKuI3owU2I7vwtu95uTkE=", + "rev": "478e5ab3eca30e600006d5a0a08b176fd34d3bd1", "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" }, "src/third_party/openscreen/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-x/SiWPBPeU2Rg7WqrwZcFvDk2J8ILTXyMEGix8r+7Js=", - "rev": "4f7c05781bc43e93706b0330eb830e2bc33fcb6c", + "hash": "sha256-y2XOZ3CmGdI0S/DLnOwAhm0kGTf/ayJ6OwPVlQCQqBw=", + "rev": "b720e33d337c68353e5d80a72491fb438f27d93a", "url": "https://chromium.googlesource.com/openscreen" }, "src/third_party/openscreen/src/buildtools": { @@ -2509,14 +2545,14 @@ }, "src/third_party/pdfium": { "fetcher": "fetchFromGitiles", - "hash": "sha256-GRihOFfswz+cNDxU/6LHZLp6rVSuHhz+5apRXQapOnQ=", - "rev": "66c80ddf43e3c3181d404607dcdc0cf37fdf7675", + "hash": "sha256-znfeKj2ttFWalFPeP9o8NPYLHD+pWAKuWVudX59MhLw=", + "rev": "2b675cf15ab4b68bf1ed4e0511ba2479e11f1605", "url": "https://pdfium.googlesource.com/pdfium.git" }, "src/third_party/perfetto": { "fetcher": "fetchFromGitiles", - "hash": "sha256-zs3PFwBmIxSfAk4HZpKsezkyE9kqaFNTbFQ7MSCl20Y=", - "rev": "077d742d9f9738a0453e408560a283a7514c9e8e", + "hash": "sha256-ej8yXGOlmqwnWBbKR99qtIn3MvImaqV5ResVp95zdcM=", + "rev": "9170899ab284db894f14439e561f02f83a04d88e", "url": "https://android.googlesource.com/platform/external/perfetto.git" }, "src/third_party/protobuf-javascript/src": { @@ -2527,8 +2563,8 @@ }, "src/third_party/pthreadpool/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=", - "rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8", + "hash": "sha256-rGg6lgLkmbYo+a9CdaXz9ZUyrqJ1rxLcjLJeBEOPAlE=", + "rev": "560c60d342a76076f0557a3946924c6478470044", "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git" }, "src/third_party/pyelftools": { @@ -2569,8 +2605,8 @@ }, "src/third_party/skia": { "fetcher": "fetchFromGitiles", - "hash": "sha256-B5zb35NkwR3yT58344iAOM1Kywn8Yr/TuNBSJcrxwh4=", - "rev": "938144dd79c6e3664a3c0bbd019daedddf655ffa", + "hash": "sha256-u/K96HEBcx1sge4wSf3m4xDkZEoFaxekHafgmC4rjVQ=", + "rev": "3c64459d5df2fa9794b277f0959ed8a92552bf4c", "url": "https://skia.googlesource.com/skia.git" }, "src/third_party/smhasher/src": { @@ -2599,20 +2635,20 @@ }, "src/third_party/spirv-headers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-5lRPxsfXGWimJ7jNtM6kJembcAz357ER8PwFXnh6o4E=", - "rev": "db5a00f8cebe81146cafabf89019674a3c4bf03d", + "hash": "sha256-o1yRTvP7a+XVwendTKBJKNnelVGWLD0gH258GGeUDhQ=", + "rev": "2a9b6f951c7d6b04b6c21fe1bf3f475b68b84801", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" }, "src/third_party/spirv-tools/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Uld5cLV+oD0wm8TxK0V15yiwrdiUbWGqPQEbtMW9Apg=", - "rev": "a0817526b8e391732632e6a887134be256a20a18", + "hash": "sha256-13y7Z6wMeAmV2dgMepgQPB+c+Pjc2O3C2G0kdlBVsNE=", + "rev": "37d2fcb485bf3fcadb18ef90aab6f283dcc4be72", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" }, "src/third_party/sqlite/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-ZDByCZjc0coy19a0/BkVAU8y/Fkt7FKgWtCwI5K0Tdo=", - "rev": "9e45bccab2b8de8140c1732b0ec490db0362f730", + "hash": "sha256-ltl3OTk/wZPSj3yYthNlKd3mBxef6l5uW6UYTwebNek=", + "rev": "567495a62a62dc013888500526e82837d727fe01", "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" }, "src/third_party/squirrel.mac": { @@ -2638,8 +2674,8 @@ }, "src/third_party/swiftshader": { "fetcher": "fetchFromGitiles", - "hash": "sha256-YGVv/wDle+VyO/Ue7wR004dl8nvO5GjmDeWsoC30+kc=", - "rev": "c4dfa69de7deecf52c6b53badbc8bb7be1a05e8c", + "hash": "sha256-U29q1G3gnJdoucdLGZEbwpkGpDE4C2lv2b5WqpUf2Ho=", + "rev": "2afc8c97882a5c66abf5f26670ae420d2e30adc3", "url": "https://swiftshader.googlesource.com/SwiftShader.git" }, "src/third_party/text-fragments-polyfill/src": { @@ -2650,8 +2686,8 @@ }, "src/third_party/tflite/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-2iYz04vqZI1nbvtnMjjy6aE9PMzvpLhttNbTrEvhC4M=", - "rev": "f9122e774969459927e9d956674c0aac06eb3b68", + "hash": "sha256-HtvrZur/vifocB/TKLDkzTLjFbGee4xGUhRLShozo9M=", + "rev": "d29299c16ec49623af1294900dba53fc8864f0bb", "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" }, "src/third_party/ukey2/src": { @@ -2662,38 +2698,38 @@ }, "src/third_party/vulkan-deps": { "fetcher": "fetchFromGitiles", - "hash": "sha256-88nATFDj0QqE57ZH7effuNXByjYwGI58SYiAdvyjrt8=", - "rev": "d8095b45a0b2dcc2a85327ff4cc306c618dfa39a", + "hash": "sha256-U8iB5HlLHzpeBJjd9XODWONDy7GTfNbM2kjGBIAhabU=", + "rev": "c045c2192ab45a144b419033dffe6190be5d8c93", "url": "https://chromium.googlesource.com/vulkan-deps" }, "src/third_party/vulkan-headers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-5gslQRGEeHu7lshmlM6SON+P6cKTGOYrmwkBRmu9NIw=", - "rev": "fabe9e2672334fdb9a622d42a2e8f94578952082", + "hash": "sha256-8q6uu3v7j7poTMkn0oxj+RewIqhjCOuBz/QG/oFnWBI=", + "rev": "c6391a7b8cd57e79ce6b6c832c8e3043c4d9967b", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" }, "src/third_party/vulkan-loader/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-CwBKsSCvrhp8gw9zm5lw+aJ/lzYksXd5zGZw0abw2JY=", - "rev": "5892ebe2d7505c2238a643288d9a5b2e68784a36", + "hash": "sha256-dA9yc8nv8HDF8WA7bSReqI2JtUU41/Xl4J/CQlq0nuU=", + "rev": "1108bba6c97174d172d45470a7470a3d6a564647", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" }, "src/third_party/vulkan-tools/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-BraOoeYPOaLw7LfqnG+bZHQiJtWByYjnUU8Gw5ee29k=", - "rev": "2cee0d5b1d8c34e26fd6d9992d3d428ac4c5139d", + "hash": "sha256-eEJ9S1/fF5WMT+fRq+ZTzRfb+gxDA8drK8uwPVrFoNc=", + "rev": "4c63e845962ff3b197855f3ae4907a47d0863f5a", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" }, "src/third_party/vulkan-utility-libraries/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-0p4CEh0BzMXRDxOh72QIPUjhYFB+9cna2bRtJXEGE/M=", - "rev": "67522b34edde86dbb97e164280291f387ade55fc", + "hash": "sha256-4jK6OQT5Za46HixUe1kOay2NlTYtf9OHkbZrZ0y6pdI=", + "rev": "ea5774a13e3017b6d5d79af6fba9f0d72ca5c61a", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" }, "src/third_party/vulkan-validation-layers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-ompMbxRxa0acD/+a830N0VL88s1GepOO0e8Rkg5Nmjk=", - "rev": "919599474e6e6639527e7c3775ed1064665412d3", + "hash": "sha256-vwd7n30odVW/Q39lIiVuhyWhnm20giEHlzP14ONXyuw=", + "rev": "ef846ac0883cde5e69ced0e7d7af59fe92f34e25", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" }, "src/third_party/vulkan_memory_allocator": { @@ -2716,14 +2752,14 @@ }, "src/third_party/wayland-protocols/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-5gWBte8oiuXM01StvyXFAsxFwuQZHjZT/LZ6l0mvrwI=", - "rev": "c7e9c4f5d396cda4051e49b15d7d0e4f91e4efac", + "hash": "sha256-o/adWEXYSqWib6KoK7XMCWbojapcS4O/CEPxv7iFCw8=", + "rev": "7d5a3a8b494ae44cd9651f9505e88a250082765e", "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" }, "src/third_party/wayland/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Cxu9+Kzw2t1BDfuGzNobaraT4eJcSPO7jvnHpuUANoo=", - "rev": "31577177454b89db37ceabd94e1640d398adbc87", + "hash": "sha256-oK0Z8xO2ILuySGZS0m37ZF0MOyle2l8AXb0/6wai0/w=", + "rev": "a156431ea66fe67d69c9fbba8a8ad34dabbab81c", "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" }, "src/third_party/webdriver/pylib": { @@ -2740,14 +2776,14 @@ }, "src/third_party/webgpu-cts/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-4ZDhNhd4kh2lT47PV9zBISNmZDqxZO8WY+pTtxajEfw=", - "rev": "198d1770062c1a8aba86e7d6e001bb47bea028ee", + "hash": "sha256-3ruYKYHOkqlJcrjl4xvQV+OtULbgNUvXGBfrd5WTGyY=", + "rev": "2f55512456a725e77f3baac3d951de5c6c5e28a3", "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" }, "src/third_party/webrtc": { "fetcher": "fetchFromGitiles", - "hash": "sha256-ZHkIEiazTp9MBDUufupLGeV97UEfjTwXxG87OUeHcog=", - "rev": "f237dc146debcfde3d70038c2b66f71bfea8d24b", + "hash": "sha256-4URlxWupNm67GeUGLJe3Dz1IONIq1mCjG5Lf4csKFKo=", + "rev": "28b793b4dd275bf2b901b87e01c0ee8d4f5732fc", "url": "https://webrtc.googlesource.com/src.git" }, "src/third_party/weston/src": { @@ -2770,14 +2806,14 @@ }, "src/third_party/xnnpack/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-JO49N/vJz2nske13dcNFxC9hO7oO/1X6AsNnRCW/RqI=", - "rev": "8df2e765487685757ab5dabd12516cd0a24e3e25", + "hash": "sha256-VBrBNjoF3hsRXpBfXP2g9xOujVsmm7AkV6wE4ZwW2ts=", + "rev": "c4a28daf28c98300da9d9b5213c53f762908825e", "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" }, "src/third_party/zstd/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-sy6cs+c3t/XlwwJOMKCuBmoyrOiYHYeqsr/uOMVOdlI=", - "rev": "0ff651dd876823b99fa5c5f53292be28381aee9b", + "hash": "sha256-/IUfh0De9m7ACrisqKlpxZsb+asoAWGXCaK6L+s24Q8=", + "rev": "20707e3718ee14250fb8a44b3bf023ea36bd88df", "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" }, "src/tools/page_cycler/acid3": { @@ -2788,14 +2824,14 @@ }, "src/v8": { "fetcher": "fetchFromGitiles", - "hash": "sha256-bhGdJhSfvBFUh0PY9xssNinO1CKb36lxKuU3b35aV0M=", - "rev": "6f774f929205be0a49cf861b8d73a92655e1dd36", + "hash": "sha256-D2txyy9f/dNIL0b2qL0YM9/DMUfO9jkWiWZZFNyP2ys=", + "rev": "4c685866b13f6ec453f327f0499379672e5b1751", "url": "https://chromium.googlesource.com/v8/v8.git" } }, - "electron_yarn_hash": "0jb1rs1in1bp71syim7a7p0n669kbc6as90y3zi6nd0q340cwgqa", - "modules": "128", - "node": "20.17.0", - "version": "32.1.1" + "electron_yarn_hash": "0x3hk02diq4ss2405m44r4nb144h213vqr5hr4gmy04p6drk76qv", + "modules": "130", + "node": "20.18.0", + "version": "33.0.2" } } diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py index 022306a2bacf..81e00691ae12 100755 --- a/pkgs/development/tools/electron/update.py +++ b/pkgs/development/tools/electron/update.py @@ -182,18 +182,16 @@ class GitilesRepo(Repo): def __init__(self, url: str, rev: str) -> None: super().__init__() self.fetcher = "fetchFromGitiles" - # self.fetcher = 'fetchgit' self.args = { "url": url, "rev": rev, - # "fetchSubmodules": "false", } if url == "https://chromium.googlesource.com/chromium/src.git": self.args["postFetch"] = "rm -r $out/third_party/blink/web_tests; " self.args["postFetch"] += "rm -r $out/third_party/hunspell/tests; " self.args["postFetch"] += "rm -r $out/content/test/data; " - self.args["postFetch"] += "rm -r $out/courgette/testdata; " + self.args["postFetch"] += "rm -rf $out/courgette/testdata; " self.args["postFetch"] += "rm -r $out/extensions/test/data; " self.args["postFetch"] += "rm -r $out/media/test/data; " @@ -321,7 +319,6 @@ class ElectronChromedriverRepo(ElectronBinRepo): # and it is rather pointless trying to update those. # # https://endoflife.date/electron -@memory.cache def supported_version_range() -> range: """Returns a range of electron releases that have not reached end-of-life yet""" releases_json = json.loads( diff --git a/pkgs/development/tools/eliot-tree/default.nix b/pkgs/development/tools/eliot-tree/default.nix deleted file mode 100644 index 3a8c809f933c..000000000000 --- a/pkgs/development/tools/eliot-tree/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - python3Packages, - fetchPypi, -}: - -python3Packages.buildPythonApplication rec { - pname = "eliot-tree"; - version = "21.0.0"; - pyproject = true; - - src = fetchPypi { - inherit pname version; - hash = "sha256-hTl+r+QJPPQ7ss73lty3Wm7DLy2SKGmmgIuJx38ilO8="; - }; - - # Patch Python 3.12 incompatibilities in versioneer.py. - postPatch = '' - substituteInPlace versioneer.py \ - --replace-fail SafeConfigParser ConfigParser \ - --replace-fail readfp read_file - ''; - - build-system = with python3Packages; [ setuptools ]; - - dependencies = with python3Packages; [ - colored - eliot - iso8601 - jmespath - toolz - ]; - - nativeCheckInputs = with python3Packages; [ - pytestCheckHook - testtools - ]; - - # Tests run eliot-tree in out/bin. - preCheck = '' - export PATH=$out/bin:$PATH - ''; - - 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 = lib.licenses.mit; - maintainers = [ lib.maintainers.dpausp ]; - }; -} diff --git a/pkgs/development/tools/elkhound/default.nix b/pkgs/development/tools/elkhound/default.nix deleted file mode 100644 index 562c11a5278a..000000000000 --- a/pkgs/development/tools/elkhound/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, bison -, cmake -, flex -, perl -}: - -stdenv.mkDerivation rec { - pname = "elkhound"; - version = "unstable-2020-04-13"; - - src = fetchFromGitHub { - owner = "WeiDUorg"; - repo = pname; - rev = "a7eb4bb2151c00cc080613a770d37560f62a285c"; - sha256 = "sha256-Y96OFpBNrD3vrKoEZ4KdJuI1Q4RmYANsu7H3ZzfaA6g="; - }; - - postPatch = '' - patchShebangs scripts - ''; - - sourceRoot = "${src.name}/src"; - - nativeBuildInputs = [ bison cmake flex perl ]; - - installPhase = '' - runHook preInstall - - install -Dm555 -t $out/bin ast/astgen elkhound/elkhound - for d in ast elkhound smbase; do - install -Dm444 -t $out/lib $d/*.a - install -Dm444 -t $out/include/$d $src/src/$d/*.h - done - install -Dm444 -t $out/share/doc/${pname} $src/src/elkhound/*.txt - - runHook postInstall - ''; - - meta = with lib; { - description = "Parser generator which emits GLR parsers, either in OCaml or C++"; - homepage = "https://scottmcpeak.com/elkhound/"; - license = licenses.bsd3; - maintainers = with maintainers; [ peterhoeg ]; - # possibly works on Darwin - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/eltclsh/default.nix b/pkgs/development/tools/eltclsh/default.nix deleted file mode 100644 index ec54952406cf..000000000000 --- a/pkgs/development/tools/eltclsh/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, fetchgit -, automake -, autoconf -, libtool -, libedit -, tcl -, tk -}: - -tcl.mkTclDerivation rec { - pname = "eltclsh"; - version = "1.19"; - - src = fetchgit { - url = "https://git.openrobots.org/robots/eltclsh.git"; - rev = "eltclsh-${version}"; - hash = "sha256-YcJRaNct/cLNsjWk+NLzGiDYOG0jNgKudBczKckQU14="; - }; - - nativeBuildInputs = [ - automake - autoconf - libtool - ]; - buildInputs = [ - libedit - tk - ]; - - preConfigure = "NOCONFIGURE=1 ./autogen.sh"; - - configureFlags = [ - "--enable-tclshrl" - "--enable-wishrl" - "--with-tk=${tk}/lib" - "--with-includes=${libedit.dev}/include/readline" - "--with-libtool=${libtool}" - ]; - - meta = with lib; { - description = "Interactive shell for the TCL programming language based on editline"; - homepage = "https://homepages.laas.fr/mallet/soft/shell/eltclsh"; - license = licenses.bsd3; - maintainers = with maintainers; [ iwanb ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/ent/default.nix b/pkgs/development/tools/ent/default.nix deleted file mode 100644 index acb35c912eab..000000000000 --- a/pkgs/development/tools/ent/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "ent-go"; - version = "0.14.0"; - - src = fetchFromGitHub { - owner = "ent"; - repo = "ent"; - rev = "v${version}"; - sha256 = "sha256-Jq5txpjv2JxypOXYA8JKT0CNMIaJksMUIdnbwflVMZA="; - }; - - vendorHash = "sha256-9KdSGIyi95EVQq9jGoVqK8aq3JXlQXB+Qwlh/Kfz4Oc="; - - subPackages = [ "cmd/ent" ]; - - ldflags = [ - "-s" - "-w" - ]; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - installShellCompletion --cmd ent \ - --bash <($out/bin/ent completion bash) \ - --fish <($out/bin/ent completion fish) \ - --zsh <($out/bin/ent completion zsh) - ''; - - meta = { - description = "Entity framework for Go"; - homepage = "https://entgo.io/"; - changelog = "https://github.com/ent/ent/releases/tag/v${version}"; - downloadPage = "https://github.com/ent/ent"; - license = lib.licenses.asl20; - maintainers = [ ]; - mainProgram = "ent"; - }; -} diff --git a/pkgs/development/tools/errcheck/default.nix b/pkgs/development/tools/errcheck/default.nix deleted file mode 100644 index be79ea2f574d..000000000000 --- a/pkgs/development/tools/errcheck/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: - -buildGoModule rec { - pname = "errcheck"; - version = "1.7.0"; - - src = fetchFromGitHub { - owner = "kisielk"; - repo = "errcheck"; - rev = "v${version}"; - hash = "sha256-hl1EbAO4okfTahl+1WDsFuVgm6Ba98Ji0hxqVe7jGbk="; - }; - - vendorHash = "sha256-rO2FoFksN3OdKXwlJBuISs6FmCtepc4FDLdOa5AHvC4="; - - subPackages = [ "." ]; - - meta = with lib; { - description = "Checks for unchecked errors in go programs"; - mainProgram = "errcheck"; - homepage = "https://github.com/kisielk/errcheck"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; - }; -} diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 98f3a4f221e6..a7720470f489 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.23.1"; + version = "0.24.0"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-2E5FkUnU/8tf+eDd+KIEcc0HlnpYYn5QMPq/w2sa914="; + hash = "sha256-czQJqLz6rRgyh9usuhDTmgwMC6oL5UzpwNFQ3PKpKck="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/eslint_d/default.nix b/pkgs/development/tools/eslint_d/default.nix deleted file mode 100644 index 6cd40d882f3b..000000000000 --- a/pkgs/development/tools/eslint_d/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildNpmPackage, fetchFromGitHub }: - -buildNpmPackage rec { - pname = "eslint_d"; - version = "14.0.3"; - - src = fetchFromGitHub { - owner = "mantoni"; - repo = "eslint_d.js"; - rev = "v${version}"; - hash = "sha256-r0pb9qbWfyVUHuHrNhiYm+0zlF5WId3dH7QCubzZDts="; - }; - - npmDepsHash = "sha256-0Db18y7MUnnnr8v+bBOUhGBCsZcZ9OGtGqSVH7/wYQc="; - - dontNpmBuild = true; - - meta = with lib; { - description = "Makes eslint the fastest linter on the planet"; - homepage = "https://github.com/mantoni/eslint_d.js"; - license = licenses.mit; - maintainers = [ maintainers.ehllie ]; - mainProgram = "eslint_d"; - }; -} diff --git a/pkgs/development/tools/espup/default.nix b/pkgs/development/tools/espup/default.nix deleted file mode 100644 index ca650be0e386..000000000000 --- a/pkgs/development/tools/espup/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, installShellFiles -, bzip2 -, openssl -, xz -, zstd -, stdenv -, darwin -, testers -, espup -}: - -rustPlatform.buildRustPackage rec { - pname = "espup"; - version = "0.12.2"; - - src = fetchFromGitHub { - owner = "esp-rs"; - repo = "espup"; - rev = "v${version}"; - hash = "sha256-7rxT3Stbfec7oxZOBN87lICmq+V8OZMCXb5F6Ca6jS4="; - }; - - cargoHash = "sha256-GfoM2ngwnovQdbiEUQrkrrMpq4fo37VVOmnkK/5l+C8="; - - nativeBuildInputs = [ - pkg-config - installShellFiles - ]; - - buildInputs = [ - bzip2 - openssl - xz - zstd - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - env = { - OPENSSL_NO_VENDOR = true; - ZSTD_SYS_USE_PKG_CONFIG = true; - }; - - preCheck = '' - export HOME=$(mktemp -d) - ''; - - checkFlags = [ - # makes network calls - "--skip=toolchain::rust::tests::test_xtensa_rust_parse_version" - ]; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd espup \ - --bash <($out/bin/espup completions bash) \ - --fish <($out/bin/espup completions fish) \ - --zsh <($out/bin/espup completions zsh) - ''; - - passthru.tests.version = testers.testVersion { - package = espup; - }; - - meta = with lib; { - description = "Tool for installing and maintaining Espressif Rust ecosystem"; - homepage = "https://github.com/esp-rs/espup/"; - license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ knightpp beeb ]; - mainProgram = "espup"; - }; -} diff --git a/pkgs/development/tools/evans/default.nix b/pkgs/development/tools/evans/default.nix deleted file mode 100644 index 89ed0fbfb173..000000000000 --- a/pkgs/development/tools/evans/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "evans"; - version = "0.10.11"; - - src = fetchFromGitHub { - owner = "ktr0731"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-V5M7vXlBSQFX2YZ+Vjt63hLziWy0yuAbCMmSZFEO0OA="; - }; - - subPackages = [ "." ]; - - vendorHash = "sha256-oyFPycyQoYnN261kmGhkN9NMPMA6XChf4jXlYezKiCo="; - - meta = with lib; { - description = "More expressive universal gRPC client"; - mainProgram = "evans"; - homepage = "https://evans.syfm.me/"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ diogox ]; - }; -} diff --git a/pkgs/development/tools/exhaustive/default.nix b/pkgs/development/tools/exhaustive/default.nix deleted file mode 100644 index 078d886b0973..000000000000 --- a/pkgs/development/tools/exhaustive/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "exhaustive"; - version = "0.10.0"; - - src = fetchFromGitHub { - owner = "nishanths"; - repo = "exhaustive"; - rev = "v${version}"; - hash = "sha256-vMoFIyZcAdObeQD5bGcQHlGpJv/a8yl/2HUVc8aDiIA="; - }; - - vendorHash = "sha256-i3Cgefe4krvH99N233IeEWkVt9AhdzROkJ5JBeTIaAs="; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Check exhaustiveness of switch statements of enum-like constants in Go code"; - mainProgram = "exhaustive"; - homepage = "https://github.com/nishanths/exhaustive"; - license = licenses.bsd2; - maintainers = with maintainers; [ meain ]; - }; -} diff --git a/pkgs/development/tools/explain/default.nix b/pkgs/development/tools/explain/default.nix deleted file mode 100644 index 66334b12d996..000000000000 --- a/pkgs/development/tools/explain/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch -, libtool, bison, groff, ghostscript, gettext -, acl, libcap, lsof }: -stdenv.mkDerivation rec { - pname = "explain"; - version = "1.4"; - - src = fetchurl { - url = "mirror://sourceforge/libexplain/libexplain-${version}.tar.gz"; - hash = "sha256-KIY7ZezMdJNOI3ysQTZMs8GALDbJ4jGO0EF0YP7oP4A="; - }; - - patches = let - debian-src = "https://sources.debian.org/data/main"; - debian-ver = "${version}.D001-12"; - debian-patch = fname: hash: fetchpatch { - name = fname; - url = "${debian-src}/libe/libexplain/${debian-ver}/debian/patches/${fname}"; - hash = hash; - }; - in [ - (debian-patch "sanitize-bison.patch" - "sha256-gU6JG32j2yIOwehZTUSvIr4TSDdlg+p1U3bhfZHMEDY=") - (debian-patch "03_fsflags-4.5.patch" - "sha256-ML7Qvf85vEBp+iwm6PSosMAn/frYdEOSHRToEggmR8M=") - (debian-patch "linux5.11.patch" - "sha256-N7WwnTfwOxBfIiKntcFOqHTH9r2gd7NMEzic7szzR+Y=") - (debian-patch "termiox-no-more-exists-since-kernel-5.12.patch" - "sha256-cocgEYKoDMDnGk9VNQDtgoVxMGnnNpdae0hzgUlacOw=") - (debian-patch "gcc-10.patch" - "sha256-YNcYGyOOqPUuwpUpXGcR7zsWbepVg8SAqcVKlxENSQk=") - ]; - - nativeBuildInputs = [ libtool bison groff ghostscript gettext ]; - buildInputs = [ acl libcap lsof ]; - - outputs = [ "bin" "dev" "out" "man" "doc" ]; - - meta = with lib; { - description = "Library and utility to explain system call errors"; - mainProgram = "explain"; - homepage = "https://libexplain.sourceforge.net"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ McSinyx ]; - platforms = platforms.unix; - # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; - }; -} diff --git a/pkgs/development/tools/extism-cli/default.nix b/pkgs/development/tools/extism-cli/default.nix deleted file mode 100644 index ac577f16a970..000000000000 --- a/pkgs/development/tools/extism-cli/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -}: - -buildGoModule rec { - pname = "extism-cli"; - version = "1.5.2"; - - src = fetchFromGitHub { - owner = "extism"; - repo = "cli"; - rev = "refs/tags/v${version}"; - hash = "sha256-kAdvQtc3FWXQffL1KRg4peeAJ+0439n609jTV9u11aA="; - }; - - vendorHash = "sha256-yQ6LGWNVWxrUqFskt22+G9OfbcKfHXh1bf4uNoATsxg="; - - nativeBuildInputs = [ installShellFiles ]; - - subPackages = [ "./extism" ]; - - doCheck = false; # Tests require network access - - postInstall = '' - local INSTALL="$out/bin/extism" - installShellCompletion --cmd extism \ - --bash <($out/bin/extism completion bash) \ - --fish <($out/bin/extism completion fish) \ - --zsh <($out/bin/extism completion zsh) - ''; - - meta = with lib; { - description = "Extism CLI is used to manage Extism installations"; - homepage = "https://github.com/extism/cli"; - license = licenses.bsd3; - maintainers = with maintainers; [ zshipko ]; - mainProgram = "extism"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/f2c/default.nix b/pkgs/development/tools/f2c/default.nix deleted file mode 100644 index 4b263a907b05..000000000000 --- a/pkgs/development/tools/f2c/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation { - pname = "f2c"; - version = "20240312"; - - src = fetchurl { - url = "https://www.netlib.org/f2c/src.tgz"; - sha256 = "sha256-TTPve2fe31/Ad+xFAWy6NUIes2QyUi6NjFucN0pdb5k="; - }; - - makeFlags = [ "-f" "makefile.u" ]; - - # Ensure xsum binary is built from scratch - preBuild = "rm xsum"; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/man/man1 - install -m755 f2c $out/bin - install -m755 xsum $out/bin - install f2c.1t $out/share/man/man1 - - runHook postInstall - ''; - - meta = with lib; { - description = "Convert Fortran 77 source code to C"; - homepage = "https://www.netlib.org/f2c/"; - license = licenses.mit; - maintainers = [ maintainers.markuskowa ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix deleted file mode 100644 index cf5d42b65a97..000000000000 --- a/pkgs/development/tools/faas-cli/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub -, makeWrapper -, git -, installShellFiles -, testers -, faas-cli -}: -let - faasPlatform = platform: - let cpuName = platform.parsed.cpu.name; in { - "aarch64" = "arm64"; - "armv7l" = "armhf"; - "armv6l" = "armhf"; - }.${cpuName} or cpuName; -in -buildGoModule rec { - pname = "faas-cli"; - version = "0.16.34"; - - src = fetchFromGitHub { - owner = "openfaas"; - repo = "faas-cli"; - rev = version; - sha256 = "sha256-vz/RMwmZYCG76lZyloRz1CyLJuj+fK8oAaK1GqW6bvE="; - }; - - vendorHash = null; - - CGO_ENABLED = 0; - - subPackages = [ "." ]; - - ldflags = [ - "-s" "-w" - "-X github.com/openfaas/faas-cli/version.GitCommit=ref/tags/${version}" - "-X github.com/openfaas/faas-cli/version.Version=${version}" - "-X github.com/openfaas/faas-cli/commands.Platform=${faasPlatform stdenv.hostPlatform}" - ]; - - nativeBuildInputs = [ makeWrapper installShellFiles ]; - - postInstall = '' - wrapProgram "$out/bin/faas-cli" \ - --prefix PATH : ${lib.makeBinPath [ git ]} - - installShellCompletion --cmd metal \ - --bash <($out/bin/faas-cli completion --shell bash) \ - --zsh <($out/bin/faas-cli completion --shell zsh) - ''; - - passthru.tests.version = testers.testVersion { - command = "${faas-cli}/bin/faas-cli version --short-version --warn-update=false"; - package = faas-cli; - }; - - meta = with lib; { - description = "Official CLI for OpenFaaS"; - mainProgram = "faas-cli"; - homepage = "https://github.com/openfaas/faas-cli"; - license = licenses.mit; - maintainers = with maintainers; [ welteki techknowlogick ]; - }; -} diff --git a/pkgs/development/tools/faq/default.nix b/pkgs/development/tools/faq/default.nix deleted file mode 100644 index c955174a4aff..000000000000 --- a/pkgs/development/tools/faq/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, jq -, oniguruma -}: - -buildGoModule rec { - pname = "faq"; - # Latest git release (0.0.7) presents vendor issues - using latest commit instead. - version = "unstable-2022-01-09"; - - src = fetchFromGitHub { - owner = "jzelinskie"; - repo = "faq"; - rev = "594bb8e15dc4070300f39c168354784988646231"; - sha256 = "1lqrchj4sj16n6y5ljsp8v4xmm57gzkavbddq23dhlgkg2lfyn91"; - }; - vendorHash = "sha256-731eINkboZiuPXX/HQ4r/8ogLedKBWx1IV7BZRKwU3A"; - - buildInputs = [ - jq - oniguruma - ]; - - ldflags = [ - "-s" - "-w" - "-X github.com/jzelinskie/faq/internal/version.Version=${version}" - ]; - - tags = [ - "netgo" - ]; - - subPackages = [ - "cmd/faq" - ]; - - doCheck = true; - - meta = with lib; { - description = "faq is a tool intended to be a more flexible jq, supporting additional formats"; - mainProgram = "faq"; - homepage = "https://github.com/jzelinskie/faq"; - license = licenses.asl20; - maintainers = with maintainers; [ quentin-m ]; - }; -} diff --git a/pkgs/development/tools/fastddsgen/default.nix b/pkgs/development/tools/fastddsgen/default.nix deleted file mode 100644 index 3a04f6c2fd3d..000000000000 --- a/pkgs/development/tools/fastddsgen/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib -, stdenv -, makeWrapper -, fetchFromGitHub -, gradle_7 -, openjdk17 -}: - -let - pname = "fastddsgen"; - version = "4.0.1"; - - gradle = gradle_7; - -in -stdenv.mkDerivation { - inherit pname version; - - src = fetchFromGitHub { - owner = "eProsima"; - repo = "Fast-DDS-Gen"; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-6kZndC5v/75FKY78jwmMuFXWpWzxZkCesYK4GLYxUY8="; - }; - - nativeBuildInputs = [ - gradle - openjdk17 - makeWrapper - ]; - - mitmCache = gradle.fetchDeps { - inherit pname; - data = ./deps.json; - }; - - __darwinAllowLocalNetworking = true; - - gradleFlags = [ "-x" "submodulesUpdate" ]; - - installPhase = '' - runHook preInstall - - gradle install --install_path=$out - - # Override the default start script to use absolute java path. - # Make the unwrapped "cpp" available in the path, since the wrapped "cpp" - # passes additional flags and produces output incompatible with fastddsgen. - makeWrapper ${openjdk17}/bin/java $out/bin/fastddsgen \ - --add-flags "-jar $out/share/fastddsgen/java/fastddsgen.jar" \ - --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc ]} - - 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"; - homepage = "https://github.com/eProsima/Fast-DDS-Gen"; - license = licenses.asl20; - longDescription = '' - eProsima Fast DDS-Gen is a Java application that generates - eProsima Fast DDS C++ or Python source code using the data types - defined in an IDL (Interface Definition Language) file. This - generated source code can be used in any Fast DDS application in - order to define the data type of a topic, which will later be - used to publish or subscribe. - ''; - maintainers = with maintainers; [ wentasah ]; - platforms = openjdk17.meta.platforms; - }; -} diff --git a/pkgs/development/tools/fastddsgen/deps.json b/pkgs/development/tools/fastddsgen/deps.json deleted file mode 100644 index c749fd049ad9..000000000000 --- a/pkgs/development/tools/fastddsgen/deps.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "!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/fastgron/default.nix b/pkgs/development/tools/fastgron/default.nix deleted file mode 100644 index 5b5796cc7014..000000000000 --- a/pkgs/development/tools/fastgron/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl, testers }: - -stdenv.mkDerivation (finalAttrs: { - pname = "fastgron"; - version = "0.7.7"; - - src = fetchFromGitHub { - owner = "adamritter"; - repo = "fastgron"; - rev = "v${finalAttrs.version}"; - hash = "sha256-dAfFSQ/UbAovQQr5AnCsyQtq1JkdQjvlG/SbuFnTx0E="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ curl ]; - - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - }; - - meta = with lib; { - changelog = "https://github.com/adamritter/fastgron/releases/tag/${finalAttrs.src.rev}"; - description = "High-performance JSON to GRON (greppable, flattened JSON) converter"; - mainProgram = "fastgron"; - homepage = "https://github.com/adamritter/fastgron"; - license = licenses.mit; - maintainers = with maintainers; [ zowoq ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/tools/fatcat/default.nix b/pkgs/development/tools/fatcat/default.nix deleted file mode 100644 index fe333dc9e10d..000000000000 --- a/pkgs/development/tools/fatcat/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gitUpdater -}: - -stdenv.mkDerivation rec { - pname = "fatcat"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "Gregwar"; - repo = "fatcat"; - rev = "v${version}"; - hash = "sha256-/iGNVP7Bz/UZAR+dFxAKMKM9jm07h0x0F3VGpdxlHdk="; - }; - - nativeBuildInputs = [ - cmake - ]; - - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; - - meta = with lib; { - description = "FAT filesystems explore, extract, repair, and forensic tool"; - mainProgram = "fatcat"; - homepage = "https://github.com/Gregwar/fatcat"; - license = licenses.mit; - maintainers = with maintainers; [ cynerd ]; - }; -} diff --git a/pkgs/development/tools/fblog/default.nix b/pkgs/development/tools/fblog/default.nix deleted file mode 100644 index 8720d5a7f625..000000000000 --- a/pkgs/development/tools/fblog/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "fblog"; - version = "4.10.0"; - - src = fetchFromGitHub { - owner = "brocode"; - repo = pname; - rev = "v${version}"; - hash = "sha256-4Yg7gWVBG9GI1ailEbbcslM+XR8L7yjjjvf4dQq/87I="; - }; - - cargoHash = "sha256-8rnQllCne1q1uDpeJkqAdzNKSkEgVp+v9drXL8TaQmM="; - - meta = with lib; { - description = "Small command-line JSON log viewer"; - mainProgram = "fblog"; - homepage = "https://github.com/brocode/fblog"; - license = licenses.wtfpl; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/fermyon-spin/default.nix b/pkgs/development/tools/fermyon-spin/default.nix deleted file mode 100644 index 17c525d801a5..000000000000 --- a/pkgs/development/tools/fermyon-spin/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib -, stdenv -, fetchurl -, autoPatchelfHook -, gcc-unwrapped -, zlib -}: - -let - system = stdenv.hostPlatform.system; - - platform = { - x86_64-linux = "linux-amd64"; - aarch64-linux = "linux-aarch64"; - x86_64-darwin = "macos-amd64"; - aarch64-darwin = "macos-aarch64"; - }.${system} or (throw "Unsupported system: ${system}"); - - # TODO: It'd be nice to write an update script that would update all of these - # hashes together. - packageHash = { - x86_64-linux = "sha256-gYHIfvgofT9tKYCchZoRYvioLCtp2wfaOtuVWxTyujM="; - aarch64-linux = "sha256-zW+aeUc67pa6mQQkfazShHKAvGeucswLK1eRCxzXOJM="; - x86_64-darwin = "sha256-ph+SrrxOIyG9rRS098duhvDFiNGuh0o2uemm++J+zKw="; - aarch64-darwin = "sha256-eOpRaivRhk841/TCxC4ygw27UrPkqQCMH2mme2qo8V8="; - }.${system} or (throw "Unsupported system: ${system}"); - -in stdenv.mkDerivation rec { - pname = "fermyon-spin"; - version = "2.5.1"; - - # Use fetchurl rather than fetchzip as these tarballs are built by the project - # and not by GitHub (and thus are stable) - this simplifies the update script - # by allowing it to use the output of `nix store prefetch-file`. - src = fetchurl { - url = "https://github.com/fermyon/spin/releases/download/v${version}/spin-v${version}-${platform}.tar.gz"; - hash = packageHash; - }; - - sourceRoot = "."; - - nativeBuildInputs = lib.optionals stdenv.isLinux [ - autoPatchelfHook - ]; - - buildInputs = [ - gcc-unwrapped.lib - zlib - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp ./spin $out/bin - - runHook postInstall - ''; - - meta = with lib; { - description = "Framework for building, deploying, and running fast, secure, and composable cloud microservices with WebAssembly"; - homepage = "https://github.com/fermyon/spin"; - license = with licenses; [ asl20 ]; - mainProgram = "spin"; - maintainers = with maintainers; [ mglolenstine ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/tools/fermyon-spin/update.sh b/pkgs/development/tools/fermyon-spin/update.sh deleted file mode 100755 index 9d00621f1c37..000000000000 --- a/pkgs/development/tools/fermyon-spin/update.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p jq -#shellcheck shell=bash - -CURRENT_HASH="" - -print_hash() { - OS="$1" - ARCH="$2" - VERSION="$3" - - URL="https://github.com/fermyon/spin/releases/download/v${VERSION}/spin-v${VERSION}-${OS}-${ARCH}.tar.gz" - echo - CURRENT_HASH=$(nix store prefetch-file "$URL" --json | jq -r '.hash') - - echo "${ARCH}-${OS}: $CURRENT_HASH" -} - -if [[ -z "$VER" && -n "$1" ]]; then - VER="$1" -fi - -if [[ -z "$VER" ]]; then - echo "No 'VER' environment variable provided, skipping" -else - print_hash "linux" "amd64" "$VER" - print_hash "linux" "aarch64" "$VER" - print_hash "macos" "amd64" "$VER" - print_hash "macos" "aarch64" "$VER" -fi - diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/development/tools/firebase-tools/default.nix deleted file mode 100644 index 8222c1df9ea4..000000000000 --- a/pkgs/development/tools/firebase-tools/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, buildNpmPackage -, fetchFromGitHub -, python3 -, xcbuild -}: - -buildNpmPackage rec { - pname = "firebase-tools"; - version = "13.17.0"; - - src = fetchFromGitHub { - owner = "firebase"; - repo = "firebase-tools"; - rev = "v${version}"; - hash = "sha256-Tf01j8t4zCrUDWB8+5DkJ+74OBJLD23FlI+4QlWCjLw="; - }; - - npmDepsHash = "sha256-Ghi4H7BPTQhpnI0UZWBVC9OX4F6NFlbXrtSxA5U4omg="; - - postPatch = '' - ln -s npm-shrinkwrap.json package-lock.json - ''; - - nativeBuildInputs = [ - python3 - ] ++ lib.optionals stdenv.isDarwin [ - xcbuild - ]; - - env = { - PUPPETEER_SKIP_DOWNLOAD = true; - }; - - meta = { - changelog = "https://github.com/firebase/firebase-tools/blob/${src.rev}/CHANGELOG.md"; - description = "Manage, and deploy your Firebase project from the command line"; - homepage = "https://github.com/firebase/firebase-tools"; - license = lib.licenses.mit; - mainProgram = "firebase"; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/fission/default.nix b/pkgs/development/tools/fission/default.nix deleted file mode 100644 index 29712678b9e9..000000000000 --- a/pkgs/development/tools/fission/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: - -buildGoModule rec { - pname = "fission"; - version = "1.20.4"; - - src = fetchFromGitHub { - owner = "fission"; - repo = "fission"; - rev = "v${version}"; - hash = "sha256-zI8OBjmV7pnFe18sChRNdC2RQGfCif/5IG9sn/yHE94="; - }; - - vendorHash = "sha256-W5fPa02rpWhGwYJzRkn8umqdMHG72Ym8+S0f+Id/mcM="; - - ldflags = [ "-s" "-w" "-X info.Version=${version}" ]; - - subPackages = [ "cmd/fission-cli" ]; - - postInstall = '' - ln -s $out/bin/fission-cli $out/bin/fission - ''; - - meta = with lib; { - description = "Cli used by end user to interact Fission"; - homepage = "https://fission.io"; - license = licenses.asl20; - maintainers = with maintainers; [ neverbehave ]; - }; -} diff --git a/pkgs/development/tools/flamegraph/default.nix b/pkgs/development/tools/flamegraph/default.nix deleted file mode 100644 index d80354b68c7a..000000000000 --- a/pkgs/development/tools/flamegraph/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, perl }: - -stdenv.mkDerivation rec { - pname = "FlameGraph"; - version = "2023-11-06"; - - src = fetchFromGitHub { - owner = "brendangregg"; - repo = pname; - rev = "a96184c6939f8c6281fcd7285b54fba80555ac74"; - sha256 = "sha256-hvp1HxmgNbe85kxe0NyolFUd+kPPBDYAt+g2K8pE1Ak="; - }; - - buildInputs = [ perl ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - for x in $src/*.pl $src/*.awk $src/dev/*.pl $src/dev/*.d; do - cp $x $out/bin - done - - runHook postInstall - ''; - - doCheck = true; - - checkPhase = '' - patchShebangs ./test.sh - ./test.sh - ''; - - meta = with lib; { - license = with licenses; [ asl20 cddl gpl2Plus ]; - homepage = "http://www.brendangregg.com/flamegraphs.html"; - description = "Visualization for profiled code"; - mainProgram = "flamegraph.pl"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/flawfinder/default.nix b/pkgs/development/tools/flawfinder/default.nix deleted file mode 100644 index 09560acc1d21..000000000000 --- a/pkgs/development/tools/flawfinder/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, fetchurl -, python3 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "flawfinder"; - version = "2.0.19"; - - src = fetchurl { - url = "https://dwheeler.com/flawfinder/flawfinder-${version}.tar.gz"; - sha256 = "sha256-/lUJgdNwq/oKKWcTRswLA4Ipqb2QsjnqsPAfEiEt9hg="; - }; - - # Project is using a combination of bash/Python for the tests - doCheck = false; - - pythonImportsCheck = [ "flawfinder" ]; - - meta = with lib; { - description = "Tool to examines C/C++ source code for security flaws"; - mainProgram = "flawfinder"; - homepage = "https://dwheeler.com/flawfinder/"; - license = with licenses; [ gpl2Only ]; - maintainers = with maintainers; [ fab ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/flock/default.nix b/pkgs/development/tools/flock/default.nix deleted file mode 100644 index b427a179dc80..000000000000 --- a/pkgs/development/tools/flock/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, ronn }: - -stdenv.mkDerivation rec { - pname = "flock"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "discoteq"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-cCpckORtogs6Nt7c5q2+z0acXAnALdLV6uzxa5ng3s4="; - }; - - nativeBuildInputs = [ autoreconfHook ronn ]; - - patches = [ - (fetchpatch { - name = "fix-format-specifier.patch"; - url = "https://github.com/discoteq/flock/commit/408bad42eb8d76cdd0c504c2f97f21c0b424c3b1.patch"; - sha256 = "sha256-YuFKXWTBu9A2kBNqkg1Oek6vDbVo/y8dB1k9Fuh3QmA"; - }) - ]; - - meta = with lib; { - description = "Cross-platform version of flock(1)"; - maintainers = with maintainers; [ matthewbauer ]; - mainProgram = "flock"; - platforms = platforms.all; - license = licenses.isc; - }; -} diff --git a/pkgs/development/tools/flootty/default.nix b/pkgs/development/tools/flootty/default.nix deleted file mode 100644 index 2c090556b760..000000000000 --- a/pkgs/development/tools/flootty/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, python3Packages, fetchPypi }: - -python3Packages.buildPythonApplication rec { - pname = "Flootty"; - version = "3.2.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "0gfl143ly81pmmrcml91yr0ypvwrs5q4s1sfdc0l2qkqpy233ih7"; - }; - - meta = with lib; { - description = "Collaborative terminal. In practice, it's similar to a shared screen or tmux session"; - mainProgram = "flootty"; - homepage = "https://floobits.com/help/flootty"; - license = licenses.asl20; - maintainers = with maintainers; [ sellout ]; - }; -} diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix deleted file mode 100644 index cd42388f0f82..000000000000 --- a/pkgs/development/tools/flyway/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchurl, jre_headless, makeWrapper, testers }: - -stdenv.mkDerivation (finalAttrs: { - pname = "flyway"; - version = "9.22.3"; - src = fetchurl { - url = "mirror://maven/org/flywaydb/flyway-commandline/${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-utAJpbU5NkKyJyyWB0yfwHZJxQAVJgiKm12wmGK1ojQ="; - }; - nativeBuildInputs = [ makeWrapper ]; - dontBuild = true; - dontStrip = true; - installPhase = '' - mkdir -p $out/bin $out/share/flyway - cp -r sql jars drivers conf $out/share/flyway - install -Dt $out/share/flyway/lib lib/community/*.jar lib/*.jar lib/aad/*.jar lib/oracle_wallet/*.jar - makeWrapper "${jre_headless}/bin/java" $out/bin/flyway \ - --add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \ - --add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/drivers/*'" \ - --add-flags "org.flywaydb.commandline.Main" \ - --add-flags "-jarDirs='$out/share/flyway/jars'" - ''; - passthru.tests = { - version = testers.testVersion { package = finalAttrs.finalPackage; }; - }; - meta = with lib; { - description = "Evolve your Database Schema easily and reliably across all your instances"; - longDescription = '' - The Flyway command-line tool is a standalone Flyway distribution. - It is primarily meant for users who wish to migrate their database from the command-line - without having to integrate Flyway into their applications nor having to install a build tool. - - This package is only the Community Edition of the Flyway command-line tool. - ''; - mainProgram = "flyway"; - downloadPage = "https://github.com/flyway/flyway"; - homepage = "https://flywaydb.org/"; - changelog = "https://documentation.red-gate.com/fd/release-notes-for-flyway-engine-179732572.html"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [ maintainers.cmcdragonkai ]; - }; -}) diff --git a/pkgs/development/tools/fnlfmt/default.nix b/pkgs/development/tools/fnlfmt/default.nix deleted file mode 100644 index 14c783ce845b..000000000000 --- a/pkgs/development/tools/fnlfmt/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchFromSourcehut, luaPackages, lua }: - -stdenv.mkDerivation rec { - pname = "fnlfmt"; - version = "0.3.1"; - - src = fetchFromSourcehut { - owner = "~technomancy"; - repo = pname; - rev = version; - sha256 = "sha256-rhbYG0TpqAZnbLaZOG739/pDA61Dwb4Y1HhBxWLtOus="; - }; - - nativeBuildInputs = [ luaPackages.fennel ]; - - buildInputs = [ lua ]; - - buildPhase = '' - runHook preBuild - - echo "#!${lua}/bin/lua" > fnlfmt - ${luaPackages.fennel}/bin/fennel --require-as-include --compile cli.fnl >> fnlfmt - chmod +x fnlfmt - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -D ./fnlfmt $out/bin/fnlfmt - runHook postInstall - ''; - - meta = with lib; { - description = "Formatter for Fennel"; - homepage = "https://git.sr.ht/~technomancy/fnlfmt"; - license = licenses.lgpl3Plus; - platforms = lua.meta.platforms; - maintainers = with maintainers; [ chiroptical ]; - mainProgram = "fnlfmt"; - }; -} diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix index 9aafdb4e02c1..fe17fdfeff72 100644 --- a/pkgs/development/tools/fnm/default.nix +++ b/pkgs/development/tools/fnm/default.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "fnm"; - version = "1.37.1"; + version = "1.37.2"; src = fetchFromGitHub { owner = "Schniz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x6w2g7U/FbJBycMAF4PUyaoIazp/w6imIpy+N7Cf0qk="; + sha256 = "sha256-RU9GJIn5yTZU6GsIZVQVMtIXnD9ZjmkLWk/V8ZnSXNY="; }; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ DiskArbitration Foundation Security ]; - cargoHash = "sha256-b15m5DjTDNWJBHOaKSEMwkO/o+0mV+JMBDBurml7xOs="; + cargoHash = "sha256-2opSyfEuFTS3QZbrk0SOMeiRc+rQTWvm2vqSHyGeFns="; doCheck = false; diff --git a/pkgs/development/tools/fprettify/default.nix b/pkgs/development/tools/fprettify/default.nix deleted file mode 100644 index 1a424c5f57c1..000000000000 --- a/pkgs/development/tools/fprettify/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, python3Packages, fetchFromGitHub }: - -python3Packages.buildPythonApplication rec { - pname = "fprettify"; - version = "0.3.7"; - - src = fetchFromGitHub { - owner = "pseewald"; - repo = pname; - rev = "v${version}"; - sha256 = "17v52rylmsy3m3j5fcb972flazykz2rvczqfh8mxvikvd6454zyj"; - }; - - preConfigure = '' - patchShebangs fprettify.py - ''; - - propagatedBuildInputs = with python3Packages; [ - configargparse - ]; - - meta = with lib; { - description = "Auto-formatter for modern Fortran code that imposes strict whitespace formatting, written in Python"; - mainProgram = "fprettify"; - homepage = "https://pypi.org/project/fprettify/"; - license = with licenses; [ gpl3Only ]; - maintainers = with maintainers; [ fabiangd ]; - }; -} diff --git a/pkgs/development/tools/fq/default.nix b/pkgs/development/tools/fq/default.nix deleted file mode 100644 index 4b9560f72e5c..000000000000 --- a/pkgs/development/tools/fq/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, fq -, testers -}: - -buildGoModule rec { - pname = "fq"; - version = "0.13.0"; - - src = fetchFromGitHub { - owner = "wader"; - repo = "fq"; - rev = "v${version}"; - hash = "sha256-bHyLEJiSM42arZiM1VVKga6wp3Q3EAMgUrFnh3hbk9M="; - }; - - vendorHash = "sha256-in+c8Wl7ffXAqMvs+3K6dzAd5ePqBpRaxU2iM81moQM="; - - ldflags = [ - "-s" - "-w" - "-X main.version=${version}" - ]; - - subPackages = [ "." ]; - - passthru.tests = testers.testVersion { package = fq; }; - - meta = with lib; { - description = "jq for binary formats"; - mainProgram = "fq"; - homepage = "https://github.com/wader/fq"; - license = licenses.mit; - maintainers = with maintainers; [ siraben ]; - }; -} diff --git a/pkgs/development/tools/frece/default.nix b/pkgs/development/tools/frece/default.nix deleted file mode 100644 index c8bc63e3dcb7..000000000000 --- a/pkgs/development/tools/frece/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "frece"; - version = "1.0.6"; - - src = fetchFromGitHub { - owner = "YodaEmbedding"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-CAiIqT5KuzrqbV9FVK3nZUe8MDs2KDdsKplJMI7rN9w="; - }; - - cargoHash = "sha256-eLN917L6l0vUWlAn3ROKrRdtyqaaMKjBQD2tEGWECUU="; - - meta = with lib; { - description = "Maintain a database sorted by frecency (frequency + recency)"; - mainProgram = "frece"; - homepage = "https://github.com/YodaEmbedding/frece"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/frink/default.nix b/pkgs/development/tools/frink/default.nix deleted file mode 100644 index 818a70bfe2a0..000000000000 --- a/pkgs/development/tools/frink/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - fetchurl, - frink, - jdk, - lib, - rlwrap, - stdenv, - testers, -}: -stdenv.mkDerivation rec { - pname = "frink"; - version = "2024-05-09"; - - src = fetchurl { - # Upstream does not provide versioned download links - url = "https://web.archive.org/web/20240605193919/https://frinklang.org/frinkjar/frink-tng.jar"; - sha256 = "sha256-ceV1p9wsXprcNLhol79evswVZ1SpH5IzfSbl8st4cmU="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ jdk ]; - - buildInputs = [ - jdk - rlwrap - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/lib - - cp ${src} $out/lib/frink-tng.jar - - # Generate rlwrap helper files. - # See https://frinklang.org/fsp/colorize.fsp?f=listUnits.frink - # and https://frinklang.org/fsp/colorize.fsp?f=listFunctions.frink - java -classpath "$out/lib/frink-tng.jar" frink.gui.FrinkStarter -e 'joinln[lexicalSort[units[]]]' > $out/lib/unitnames.txt - java -classpath "$out/lib/frink-tng.jar" frink.gui.FrinkStarter -e 'joinln[map[{|f| - f =~ %s/\s+//g - return "$f$" - }, lexicalSort[functions[]]]]' > $out/lib/functionnames.txt - - cat > "$out/bin/frink" << EOF - #!${stdenv.shell} - exec ${rlwrap}/bin/rlwrap -f $out/lib/unitnames.txt -b '$' -f $out/lib/functionnames.txt ${jdk}/bin/java -classpath "$out/lib/frink-tng.jar" frink.gui.FrinkStarter "\$@" - EOF - - chmod a+x "$out/bin/frink" - - runHook postInstall - ''; - - meta = with lib; { - description = "Practical calculating tool and programming language"; - homepage = "https://frinklang.org/"; - license = licenses.unfree; - sourceProvenance = [ sourceTypes.binaryBytecode ]; - maintainers = [ maintainers.stefanfehrenbach ]; - }; - - passthru.tests = { - callFrinkVersion = testers.testVersion { - package = frink; - command = "frink -e 'FrinkVersion[]'"; - }; - }; -} diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix deleted file mode 100644 index bf83ec753d50..000000000000 --- a/pkgs/development/tools/frugal/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "frugal"; - version = "3.17.13"; - - src = fetchFromGitHub { - owner = "Workiva"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-giPlv3pf0hz2zlQ/9o12SGfwFLCtpN96tfQwP9AaPNo="; - }; - - subPackages = [ "." ]; - - vendorHash = "sha256-DCSS2kH2yco8cfbQBw3IZHcEE4BP5ir7ikxsIsFDqg0="; - - meta = with lib; { - description = "Thrift improved"; - mainProgram = "frugal"; - homepage = "https://github.com/Workiva/frugal"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ diogox ]; - }; -} diff --git a/pkgs/development/tools/fsautocomplete/default.nix b/pkgs/development/tools/fsautocomplete/default.nix deleted file mode 100644 index 3ff029699e5f..000000000000 --- a/pkgs/development/tools/fsautocomplete/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, buildDotnetModule, fetchFromGitHub, fetchpatch, dotnetCorePackages }: - -buildDotnetModule rec { - pname = "fsautocomplete"; - version = "0.73.2"; - - src = fetchFromGitHub { - owner = "fsharp"; - repo = "FsAutoComplete"; - rev = "v${version}"; - 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 = '' - rm global.json - - substituteInPlace src/FsAutoComplete/FsAutoComplete.fsproj \ - --replace TargetFrameworks TargetFramework \ - ''; - - 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" ]; - - useDotnetFromEnv = true; - - meta = with lib; { - description = "FsAutoComplete project (FSAC) provides a backend service for rich editing or intellisense features for editors"; - mainProgram = "fsautocomplete"; - homepage = "https://github.com/fsharp/FsAutoComplete"; - changelog = "https://github.com/fsharp/FsAutoComplete/releases/tag/v${version}"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ gbtb mdarocha ]; - }; -} diff --git a/pkgs/development/tools/fsautocomplete/deps.nix b/pkgs/development/tools/fsautocomplete/deps.nix deleted file mode 100644 index 82fbac560308..000000000000 --- a/pkgs/development/tools/fsautocomplete/deps.nix +++ /dev/null @@ -1,214 +0,0 @@ -# This file was automatically generated by passthru.fetch-deps. -# Please dont edit it manually, your changes might get overwritten! - -{ fetchNuGet }: [ - (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/functiontrace-server/default.nix b/pkgs/development/tools/functiontrace-server/default.nix deleted file mode 100644 index abacb1d9f9d4..000000000000 --- a/pkgs/development/tools/functiontrace-server/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, rustPlatform, fetchCrate, stdenv, darwin }: - -rustPlatform.buildRustPackage rec { - pname = "functiontrace-server"; - version = "0.5.2"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-p6ypMfg99ohQCyPB2O0wXbGmPvD2K9V3EnFDd5dC6js="; - }; - - cargoHash = "sha256-3tLjW7yiS1dNsV81KUZbfN2pvYT9kqiC62nWFid2NH8="; - - buildInputs = lib.optionals stdenv.isDarwin - [ darwin.apple_sdk.frameworks.CoreFoundation ]; - - meta = with lib; { - description = "Server for FunctionTrace, a graphical Python profiler"; - homepage = "https://functiontrace.com"; - license = with licenses; [ prosperity30 ]; - maintainers = with maintainers; [ tehmatt ]; - }; -} diff --git a/pkgs/development/tools/fundoc/default.nix b/pkgs/development/tools/fundoc/default.nix deleted file mode 100644 index 72c572e3e4f1..000000000000 --- a/pkgs/development/tools/fundoc/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: - -rustPlatform.buildRustPackage rec { - pname = "fundoc"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "daynin"; - repo = pname; - rev = "v${version}"; - hash = "sha256-8WWaYgfqGWrTV2EEeSPz1BN2ur7gsxFiHeDNMJdVDcw="; - }; - - cargoPatches = [ - # updates outdated lock file and fixes a test - (fetchpatch { - name = "fix-tests.patch"; - url = "https://github.com/daynin/fundoc/commit/7dd3cf53a1d1ed72b00bf38ea3a45ba4590da7ef.patch"; - hash = "sha256-9Xsw2P4t9gzwc/qDU6U5+HZevPiQOOQo88gybC8QpyM="; - }) - ]; - - cargoHash = "sha256-yapFUkG2JfGb3N3iVEDpQunOyRnbNTs+q3zQ23B23/s="; - - meta = with lib; { - description = "Language agnostic documentation generator"; - mainProgram = "fundoc"; - homepage = "https://github.com/daynin/fundoc"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/development/tools/fusee-launcher/default.nix deleted file mode 100644 index 776f5c064aef..000000000000 --- a/pkgs/development/tools/fusee-launcher/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv -, python3Packages -, python3 -, fetchFromGitHub -, pkgsCross -, makeWrapper -} : - -let - arm-embedded-cc = pkgsCross.arm-embedded.buildPackages.gcc; -in - -stdenv.mkDerivation { - pname = "fusee-launcher"; - version = "unstable-2018-07-14"; - - src = fetchFromGitHub { - owner = "Cease-and-DeSwitch"; - repo = "fusee-launcher"; - rev = "265e8f3e1987751ec41db6f1946d132b296aba43"; - sha256 = "1pqkgw5bk0xcz9x7pc1f0r0b9nsc8jnnvcs1315d8ml8mx23fshm"; - }; - - makeFlags = [ - "CROSS_COMPILE=${arm-embedded-cc.targetPrefix}" - ]; - - installPhase = '' - mkdir -p $out/bin $out/share - cp fusee-launcher.py $out/bin/fusee-launcher - cp intermezzo.bin $out/share/intermezzo.bin - - # Wrap with path to intermezzo.bin relocator binary in /share - wrapProgram $out/bin/fusee-launcher \ - --add-flags "--relocator $out/share/intermezzo.bin" \ - --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" - ''; - - nativeBuildInputs = [ arm-embedded-cc makeWrapper python3Packages.wrapPython ]; - buildInputs = [ python3 python3Packages.pyusb ]; - pythonPath = with python3Packages; [ pyusb ]; - - meta = with lib; { - homepage = "https://github.com/Cease-and-DeSwitch/fusee-launcher"; - description = "Work-in-progress launcher for one of the Tegra X1 bootROM exploits"; - mainProgram = "fusee-launcher"; - license = licenses.gpl2; - maintainers = with maintainers; [ pneumaticat ]; - }; - -} diff --git a/pkgs/development/tools/fusee-nano/default.nix b/pkgs/development/tools/fusee-nano/default.nix deleted file mode 100644 index fc0623277074..000000000000 --- a/pkgs/development/tools/fusee-nano/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, unixtools }: - -stdenv.mkDerivation { - pname = "fusee-nano"; - version = "unstable-2023-05-17"; - - src = fetchFromGitHub { - owner = "DavidBuchanan314"; - repo = "fusee-nano"; - rev = "2979d34f470d02f34594d8d59be1f5c7bf4bf73f"; - hash = "sha256-RUG10wvhB0qEuiLwn8wk6Uxok+gv4bFLD6tbx0P0yDc="; - }; - - nativeBuildInputs = [ unixtools.xxd ]; - - makeFlags = [ "PREFIX=$(out)/bin" ]; - - meta = { - description = "Minimalist re-implementation of the Fusée Gelée exploit"; - mainProgram = "fusee-nano"; - homepage = "https://github.com/DavidBuchanan314/fusee-nano"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.leo60228 ]; - }; -} diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix deleted file mode 100644 index 581a6f99374e..000000000000 --- a/pkgs/development/tools/galen/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, jre8, unzip }: - -stdenv.mkDerivation rec { - pname = "galen"; - version = "2.4.4"; - - inherit jre8; - - src = fetchurl { - url = "https://github.com/galenframework/galen/releases/download/galen-${version}/galen-bin-${version}.zip"; - sha256 = "13dq8cf0yy24vym6z7p8hb0mybgpcl4j5crsaq8a6pjfxz6d17mq"; - }; - - nativeBuildInputs = [ unzip ]; - - buildPhase = '' - mkdir -p $out/bin - ''; - - installPhase = '' - cat galen | sed -e "s,java,$jre8/bin/java," > $out/bin/galen - chmod +x $out/bin/galen - cp galen.jar $out/bin - ''; - - meta = with lib; { - homepage = "http://galenframework.com"; - description = "Automated layout testing for websites"; - mainProgram = "galen"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.asl20; - maintainers = [ ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/tools/gamecube-tools/default.nix b/pkgs/development/tools/gamecube-tools/default.nix deleted file mode 100644 index 9b854d3671e5..000000000000 --- a/pkgs/development/tools/gamecube-tools/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook -, freeimage, libGL }: - -stdenv.mkDerivation rec { - version = "1.0.6"; - pname = "gamecube-tools"; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ freeimage libGL ]; - - src = fetchFromGitHub { - owner = "devkitPro"; - repo = "gamecube-tools"; - rev = "v${version}"; - sha256 = "sha256-GsTmwyxBc36Qg+UGy+cRAjGW1eh1XxV0s94B14ZJAjU="; - }; - - meta = with lib; { - description = "Tools for gamecube/wii projects"; - homepage = "https://github.com/devkitPro/gamecube-tools/"; - license = licenses.gpl2; - maintainers = with maintainers; [ tomsmeets ]; - }; -} diff --git a/pkgs/development/tools/garble/default.nix b/pkgs/development/tools/garble/default.nix deleted file mode 100644 index 438d83405988..000000000000 --- a/pkgs/development/tools/garble/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv -, buildGoModule -, fetchFromGitHub -, lib -, git -}: -buildGoModule rec { - pname = "garble"; - version = "0.8.0"; - - src = fetchFromGitHub { - owner = "burrowers"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-f7coWG1CS4UL8GGqwADx5CvIk2sPONPlWW+JgRhFsb8="; - }; - - vendorHash = "sha256-SOdIlu0QrQokl9j9Ff594+1K6twU1mCuECFQaVKaPV4="; - - # Used for some of the tests. - nativeCheckInputs = [git]; - - preBuild = lib.optionalString (!stdenv.isx86_64) '' - # The test assumex amd64 assembly - rm testdata/script/asm.txtar - ''; - - meta = { - description = "Obfuscate Go code by wrapping the Go toolchain"; - homepage = "https://github.com/burrowers/garble/"; - maintainers = with lib.maintainers; [ davhau ]; - license = lib.licenses.bsd3; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/garble.x86_64-darwin - }; -} diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index 7a46966e90e7..88b740fb6cd4 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gauge"; - version = "1.6.8"; + version = "1.6.9"; patches = [ # adds a check which adds an error message when trying to @@ -14,10 +14,10 @@ buildGoModule rec { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - hash = "sha256-ifE+6lwBYVZl0eAOCUTrqqTwVnKvCB44AHXTyLhsMX8="; + hash = "sha256-YjLBfQ6L3UwcgQ9LgUfnNSegNhQI8/Gb5Hdpe0/uzOc="; }; - vendorHash = "sha256-yh7hAKmt2qn2jmPKGF+ATvZd4miNHuHsKlFNaWibTJQ="; + vendorHash = "sha256-Uir/umJNnTHWEKPbVch0Pq7B3hVim8BMtGc/M9esADw="; excludedPackages = [ "build" "man" ]; diff --git a/pkgs/development/tools/gauge/plugins/dotnet/data.json b/pkgs/development/tools/gauge/plugins/dotnet/data.json index 396b444a5cb3..3e3aac11ed19 100644 --- a/pkgs/development/tools/gauge/plugins/dotnet/data.json +++ b/pkgs/development/tools/gauge/plugins/dotnet/data.json @@ -1,5 +1,5 @@ { - "version": "0.6.0", - "url": "https://github.com/getgauge/gauge-dotnet/releases/download/v0.6.0/gauge-dotnet-0.6.0.zip", - "hash": "sha256-xivSxTRs6yWfAR/ac/jLok3gcTobNu2a/vPGLwxt1Kk=" + "version": "0.7.2", + "url": "https://github.com/getgauge/gauge-dotnet/releases/download/v0.7.2/gauge-dotnet-0.7.2.zip", + "hash": "sha256-ac2pf0st1p/DPAXgQC689nbD+DO7DYkxFqrVItq+UWw=" } diff --git a/pkgs/development/tools/gauge/plugins/dotnet/default.nix b/pkgs/development/tools/gauge/plugins/dotnet/default.nix index 2b79004073ec..dbac34acdac7 100644 --- a/pkgs/development/tools/gauge/plugins/dotnet/default.nix +++ b/pkgs/development/tools/gauge/plugins/dotnet/default.nix @@ -12,7 +12,7 @@ makeGaugePlugin { releasePrefix = "gauge-dotnet-"; isCrossArch = true; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; meta = { description = "Gauge plugin that lets you write tests in C#"; diff --git a/pkgs/development/tools/gauge/plugins/java/data.json b/pkgs/development/tools/gauge/plugins/java/data.json index f5a9e09edfdc..764a22697bb4 100644 --- a/pkgs/development/tools/gauge/plugins/java/data.json +++ b/pkgs/development/tools/gauge/plugins/java/data.json @@ -1,19 +1,19 @@ { - "version": "0.11.0", + "version": "0.11.1", "aarch64-darwin": { - "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.0/gauge-java-0.11.0-darwin.arm64.zip", - "hash": "sha256-o7viYih6oghPipGmpsdGZXxtML4++Ux7Qul8pRzkdUc=" + "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.1/gauge-java-0.11.1-darwin.arm64.zip", + "hash": "sha256-KoUVku5DRi6sUYCMJ5/DBEYv4NlNEcHdOlYGsfYR0Yw=" }, "x86_64-darwin": { - "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.0/gauge-java-0.11.0-darwin.x86_64.zip", - "hash": "sha256-wTXVuyXU9mfVxAc/l0mgvKt3c/jinffILBUhe/tikgs=" + "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.1/gauge-java-0.11.1-darwin.x86_64.zip", + "hash": "sha256-ea2s3b38MG8r7i6IqlOjQ2Wc7b237Eu1VL7euwNW43M=" }, "aarch64-linux": { - "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.0/gauge-java-0.11.0-linux.arm64.zip", - "hash": "sha256-CsEzoNseWllbNtN5mOYVCPvTPlm60fd7eSXuTpxbRx8=" + "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.1/gauge-java-0.11.1-linux.arm64.zip", + "hash": "sha256-QbQWDYkk+XnJReqx+Kj3hvGSDM7ACjDEWVFKd34hZkw=" }, "x86_64-linux": { - "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.0/gauge-java-0.11.0-linux.x86_64.zip", - "hash": "sha256-zig+Wq6uyBl8fKfjcpKCRFtHBZ/xFeDaUrUqvx1ails=" + "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.1/gauge-java-0.11.1-linux.x86_64.zip", + "hash": "sha256-Ikt8rE8tehLXtWa4CjU6tWiBvOVoDpds8Jgy8QwW6lY=" } } diff --git a/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix b/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix index acf902e1b79d..71f88a2c40ae 100644 --- a/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix +++ b/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix @@ -17,7 +17,7 @@ let otherArgs = lib.attrsets.removeAttrs args [ "pname" "data" "repo" "releasePrefix" "isMultiArch" ]; inherit (stdenvNoCC.hostPlatform) system; - inherit (if isCrossArch then data else data.${system}) url hash; + inherit (if isCrossArch then data else data.${system} or (throw "gaugePlugins.${pname}: No source for system: ${system}")) url hash; # Upstream uses a different naming scheme for platforms systemMap = { "x86_64-darwin" = "darwin.x86_64"; diff --git a/pkgs/development/tools/gci/default.nix b/pkgs/development/tools/gci/default.nix deleted file mode 100644 index fcf1abe23fc2..000000000000 --- a/pkgs/development/tools/gci/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: -buildGoModule rec { - pname = "gci"; - version = "0.13.5"; - - src = fetchFromGitHub { - owner = "daixiang0"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-jtDqaUko0So/VwY3NF5NyPFu1jxt4nIbUkJxILc+iTs="; - }; - - vendorHash = "sha256-/8fggERlHySyimrGOHkDERbCPZJWqojycaifNPF6MjE="; - - meta = with lib; { - description = "Controls golang package import order and makes it always deterministic"; - homepage = "https://github.com/daixiang0/gci"; - license = licenses.bsd3; - maintainers = with maintainers; [krostar]; - }; -} diff --git a/pkgs/development/tools/gcov2lcov/default.nix b/pkgs/development/tools/gcov2lcov/default.nix deleted file mode 100644 index 0ac499923f2a..000000000000 --- a/pkgs/development/tools/gcov2lcov/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "gcov2lcov"; - version = "1.0.6"; - - src = fetchFromGitHub { - owner = "jandelgado"; - repo = "gcov2lcov"; - rev = "v${version}"; - hash = "sha256-S5fAhd0bh1XEeQwaya8LvnKQ/iz4PjAbpjK4uFI6H1g="; - }; - - vendorHash = "sha256-r95PFkTywGiDIEnDfLpzt97SkuDeXo4xg2N7ikG0hs0="; - - ldflags = [ "-s" "-w" ]; - - # Some checks depend on looking up vcs root - checkPhase = false; - - meta = with lib; { - description = "Convert go coverage files to lcov format"; - mainProgram = "gcov2lcov"; - homepage = "https://github.com/jandelgado/gcov2lcov"; - changelog = "https://github.com/jandelgado/gcov2lcov/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ meain ]; - }; -} diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix index f62ab97c1bee..7af8747ef8c4 100644 --- a/pkgs/development/tools/geckodriver/default.nix +++ b/pkgs/development/tools/geckodriver/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-gopI5iOCSzD23mvOues76WIiBtpNf9A6X9NoOULm6Qo="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; meta = with lib; { description = "Proxy for using W3C WebDriver-compatible clients to interact with Gecko-based browsers"; diff --git a/pkgs/development/tools/gemstash/Gemfile.lock b/pkgs/development/tools/gemstash/Gemfile.lock index eed8dffc6225..e091a27c0f86 100644 --- a/pkgs/development/tools/gemstash/Gemfile.lock +++ b/pkgs/development/tools/gemstash/Gemfile.lock @@ -1,24 +1,24 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.2) + activesupport (7.2.1.2) base64 bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) base64 (0.2.0) - bigdecimal (3.1.4) - concurrent-ruby (1.2.2) + bigdecimal (3.1.8) + concurrent-ruby (1.3.4) connection_pool (2.4.1) - dalli (3.2.6) - drb (2.2.0) - ruby2_keywords - faraday (1.10.3) + dalli (3.2.8) + drb (2.2.1) + faraday (1.10.4) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -36,12 +36,12 @@ GEM faraday-httpclient (1.0.1) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (1.0.1) + faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - faraday_middleware (1.2.0) + faraday_middleware (1.2.1) faraday (~> 1.0) gemstash (2.7.1) activesupport (>= 4.2, < 8) @@ -57,50 +57,60 @@ GEM sqlite3 (~> 1.3) terminal-table (~> 3.0) thor (~> 1.0) - i18n (1.14.1) + i18n (1.14.6) concurrent-ruby (~> 1.0) + logger (1.6.1) lru_redux (1.1.0) - mini_portile2 (2.8.5) - minitest (5.20.0) - multipart-post (2.3.0) - mustermann (3.0.0) + minitest (5.25.1) + multipart-post (2.4.1) + mustermann (3.0.3) ruby2_keywords (~> 0.0.1) - mutex_m (0.2.0) - nio4r (2.6.1) - psych (5.1.1.1) + nio4r (2.7.3) + psych (5.1.2) stringio - puma (6.4.0) + puma (6.4.3) nio4r (~> 2.0) - rack (2.2.8) - rack-protection (3.1.0) + rack (2.2.10) + rack-protection (3.2.0) + base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) ruby2_keywords (0.0.5) - sequel (5.74.0) + securerandom (0.3.1) + sequel (5.85.0) bigdecimal server_health_check (1.0.2) server_health_check-rack (0.1.0) server_health_check (~> 1.0, >= 1.0.1) - sinatra (3.1.0) + sinatra (3.2.0) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) + rack-protection (= 3.2.0) tilt (~> 2.0) - sqlite3 (1.6.9) - mini_portile2 (~> 2.8.0) - stringio (3.1.0) + sqlite3 (1.7.3-aarch64-linux) + sqlite3 (1.7.3-arm-linux) + sqlite3 (1.7.3-arm64-darwin) + sqlite3 (1.7.3-x86-linux) + sqlite3 (1.7.3-x86_64-darwin) + sqlite3 (1.7.3-x86_64-linux) + stringio (3.1.1) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.3.0) - tilt (2.3.0) + thor (1.3.2) + tilt (2.4.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) PLATFORMS - ruby + aarch64-linux + arm-linux + arm64-darwin + x86-linux + x86_64-darwin + x86_64-linux DEPENDENCIES gemstash BUNDLED WITH - 2.4.22 + 2.5.17 diff --git a/pkgs/development/tools/gemstash/gemset.nix b/pkgs/development/tools/gemstash/gemset.nix index ba5b0b9178e1..8d626cd10367 100644 --- a/pkgs/development/tools/gemstash/gemset.nix +++ b/pkgs/development/tools/gemstash/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l6hmf99zgckpn812qfxfz60rbh0zixv1hxnxhjlg8942pvixn2v"; + sha256 = "1cacrvmn1561fb88fn99ig52wdz1k67s7vbssqwwwljf1kanlgvc"; type = "gem"; }; - version = "7.1.2"; + version = "7.2.1.2"; }; base64 = { groups = ["default"]; @@ -25,20 +25,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07y615s8yldk3k13lmkhpk1k190lcqvmxmnjwgh4bzjan9xrc36y"; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; type = "gem"; }; - version = "3.1.4"; + version = "3.1.8"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.2.2"; + version = "1.3.4"; }; connection_pool = { groups = ["default"]; @@ -55,21 +55,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "137xw0nl7ixxqyam6fjgmzl24i3rdml37whgnks8y35w92i95447"; + sha256 = "19daxf5n5gr3pr57k4wqg701c3zwsk2h4jjialkaw7yrhi85jqrf"; type = "gem"; }; - version = "3.2.6"; + version = "3.2.8"; }; drb = { - dependencies = ["ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79"; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.1"; }; faraday = { dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; @@ -77,10 +76,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90"; + sha256 = "069gmdh5j90v06rbwlqvlhzhq45lxhx74mahz25xd276rm0wb153"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; faraday-em_http = { groups = ["default"]; @@ -138,10 +137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + sha256 = "10n6wikd442mfm15hd6gzm0qb527161w1wwch4h5m4iclkz2x6b3"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; faraday-net_http_persistent = { groups = ["default"]; @@ -189,10 +188,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy"; + sha256 = "1s990pnapb3vci9c00bklqc7jjix4i2zhxn2zf1lfk46xv47hnyl"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.1"; }; gemstash = { dependencies = ["activesupport" "dalli" "faraday" "faraday_middleware" "lru_redux" "psych" "puma" "sequel" "server_health_check-rack" "sinatra" "sqlite3" "terminal-table" "thor"]; @@ -211,52 +210,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; + sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.6"; }; - lru_redux = { - gem_platform = "ruby"; + logger = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yxghzg7476sivz8yyr9nkak2dlbls0b89vc2kg52k0nmg6d0wgf"; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; type = "gem"; }; - target_platform = "ruby"; - version = "1.1.0"; + version = "1.6.1"; }; - mini_portile2 = { + lru_redux = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; + sha256 = "1yxghzg7476sivz8yyr9nkak2dlbls0b89vc2kg52k0nmg6d0wgf"; type = "gem"; }; - version = "2.8.5"; + version = "1.1.0"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; + sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; type = "gem"; }; - version = "5.20.0"; + version = "5.25.1"; }; multipart-post = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lgyysrpl50wgcb9ahg29i4p01z0irb3p9lirygma0kkfr5dgk9x"; + sha256 = "1a5lrlvmg2kb2dhw3lxcsv6x276bwgsxpnka1752082miqxd0wlq"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.1"; }; mustermann = { dependencies = ["ruby2_keywords"]; @@ -264,30 +261,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rwbq20s2gdh8dljjsgj5s6wqqfmnbclhvv2c2608brv7jm6jdbd"; - type = "gem"; - }; - version = "3.0.0"; - }; - mutex_m = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; + sha256 = "123ycmq6pkivv29bqbv79jv2cs04xakzd0fz1lalgvfs5nxfky6i"; type = "gem"; }; - version = "0.2.0"; + version = "3.0.3"; }; nio4r = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y99dfzlb3kgzh7pfk8km0p5zjiblxyh5rm8yal9h523vi5awji8"; + sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal"; type = "gem"; }; - version = "2.6.1"; + version = "2.7.3"; }; psych = { dependencies = ["stringio"]; @@ -295,10 +282,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wjzrkssjfjpynij5dpycyflhqbjvi1gc2j73xgq3b196s1d3c24"; + sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk"; type = "gem"; }; - version = "5.1.1.1"; + version = "5.1.2"; }; puma = { dependencies = ["nio4r"]; @@ -306,34 +293,33 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y8jcw80zcxvdq0id329lzmp5pzx7hpac227d7sgjkblc89s3pfm"; + sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914"; type = "gem"; }; - version = "6.4.0"; + version = "6.4.3"; }; rack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; + sha256 = "0ax778fsfvlhj7c11n0d1wdcb8bxvkb190a9lha5d91biwzyx9g4"; type = "gem"; }; - version = "2.2.8"; + version = "2.2.10"; }; rack-protection = { - dependencies = ["rack"]; + dependencies = ["base64" "rack"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xsz78hccgza144n37bfisdkzpr2c8m0xl6rnlzgxdbsm1zrkg7r"; + sha256 = "1zzvivmdb4dkscc58i3gmcyrnypynsjwp6xgc4ylarlhqmzvlx1w"; type = "gem"; }; - version = "3.1.0"; + version = "3.2.0"; }; ruby2_keywords = { - gem_platform = "ruby"; groups = ["default"]; platforms = []; source = { @@ -341,22 +327,30 @@ sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; type = "gem"; }; - target_platform = "ruby"; version = "0.0.5"; }; + securerandom = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q"; + type = "gem"; + }; + version = "0.3.1"; + }; sequel = { dependencies = ["bigdecimal"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zj66n0m1la1anxjjdb8a35frzabym112rf9ssyxq42mq05ln4m2"; + sha256 = "04jjv63wvvi9qfkpfsrv6w74liiqk4cd1qnlk7ja7i2waci9hlzx"; type = "gem"; }; - version = "5.74.0"; + version = "5.85.0"; }; server_health_check = { - gem_platform = "ruby"; groups = ["default"]; platforms = []; source = { @@ -364,12 +358,10 @@ sha256 = "06chz92parchhj1457lf5lbj3hrmvqpq6mfskxcnj5f4qa14n5wd"; type = "gem"; }; - target_platform = "ruby"; version = "1.0.2"; }; server_health_check-rack = { dependencies = ["server_health_check"]; - gem_platform = "ruby"; groups = ["default"]; platforms = []; source = { @@ -377,7 +369,6 @@ sha256 = "0cgqr94x18f60n27sk9lgg471c6vk6qy132z7i1ppp32kvmjfphs"; type = "gem"; }; - target_platform = "ruby"; version = "0.1.0"; }; sinatra = { @@ -386,31 +377,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00541cnypsh1mnilfxxqlz6va9afrixf9m1asn4wzjp5m59777p8"; + sha256 = "01wq20aqk5kfggq3wagx5xr1cz0x08lg6dxbk9yhd1sf0d6pywkf"; type = "gem"; }; - version = "3.1.0"; + version = "3.2.0"; }; sqlite3 = { - dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08irz5llz31im8pmkk5k0kw433jyyji1qa98xkdmpphncdjr38am"; + sha256 = "sha256-+nf2PHCVSPRtTptrtFzaUqo4gaoSzIWZETJ1jolocBw="; type = "gem"; }; - version = "1.6.9"; + version = "1.7.3"; }; stringio = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "063psvsn1aq6digpznxfranhcpmi0sdv2jhra5g0459sw0x2dxn1"; + sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak"; type = "gem"; }; - version = "3.1.0"; + version = "3.1.1"; }; terminal-table = { dependencies = ["unicode-display_width"]; @@ -428,20 +418,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; + sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.2"; }; tilt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p3l7v619hwfi781l3r7ypyv1l8hivp09r18kmkn6g11c4yr1pc2"; + sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -459,9 +449,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; + sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; } diff --git a/pkgs/development/tools/gendef/default.nix b/pkgs/development/tools/gendef/default.nix deleted file mode 100644 index 6f637b01144d..000000000000 --- a/pkgs/development/tools/gendef/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ fetchgit, lib, stdenv }: - -stdenv.mkDerivation (finalAttrs: { - pname = "gendef"; - version = "11.0.1"; - - src = fetchgit { - url = "https://git.code.sf.net/p/mingw-w64/mingw-w64.git"; - rev = "v${finalAttrs.version}"; - hash = "sha256-0vbAHSN+uwxoXXZtbuycP67PxjcB8Ftxd/Oij1gqE3Y="; - }; - - sourceRoot = "${finalAttrs.src.name}/mingw-w64-tools/gendef"; - - meta = { - description = "Tool which generate def files from DLLs"; - mainProgram = "gendef"; - homepage = "https://sourceforge.net/p/mingw-w64/wiki2/gendef/"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ hughobrien ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/development/tools/gi-crystal/default.nix b/pkgs/development/tools/gi-crystal/default.nix deleted file mode 100644 index d5c19a21662a..000000000000 --- a/pkgs/development/tools/gi-crystal/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, fetchFromGitHub -, crystal -, gobject-introspection -, gitUpdater -}: -crystal.buildCrystalPackage rec { - pname = "gi-crystal"; - version = "0.22.2"; - - src = fetchFromGitHub { - owner = "hugopl"; - repo = "gi-crystal"; - rev = "v${version}"; - hash = "sha256-JfBbKqobikpTGMryeO86zZ46EbOHybem+Cc5FZEL6i4="; - }; - - # Make sure gi-crystal picks up the name of the so or dylib and not the leading nix store path - # when the package name happens to start with “lib”. - patches = [ ./src.patch ./store-friendly-library-name.patch ]; - - nativeBuildInputs = [ gobject-introspection ]; - buildTargets = [ "generator" ]; - - doCheck = false; - doInstallCheck = false; - - installPhase = '' - runHook preInstall - - mkdir $out - cp -r * $out - - runHook postInstall - ''; - - passthru = { - updateScript = gitUpdater { rev-prefix = "v"; }; - }; - - - meta = with lib; { - description = "GI Crystal is a binding generator used to generate Crystal bindings for GObject based libraries using GObject Introspection"; - homepage = "https://github.com/hugopl/gi-crystal"; - mainProgram = "gi-crystal"; - maintainers = with maintainers; [ sund3RRR ]; - }; -} diff --git a/pkgs/development/tools/gi-crystal/src.patch b/pkgs/development/tools/gi-crystal/src.patch deleted file mode 100644 index eb18035f9941..000000000000 --- a/pkgs/development/tools/gi-crystal/src.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/src/generator/main.cr 2023-07-14 18:30:47.687581729 +0300 -+++ b/src/generator/main.cr 2023-07-17 07:55:24.177630085 +0300 -@@ -1,6 +1,8 @@ - require "colorize" - require "log" - require "option_parser" -+require "file" -+require "file_utils" - - require "./binding_config" - require "./error" -@@ -43,7 +45,7 @@ - end - end - -- output_dir = Path.new(project_dir, "lib/gi-crystal/src/auto").normalize if output_dir.nil? -+ output_dir = Path.new(Dir.current, "lib/gi-crystal/src/auto").normalize if output_dir.nil? - extra_bindings = argv.map { |path| Path.new(path).expand.to_s } - - {output_dir: output_dir, -@@ -74,11 +76,23 @@ - end - end - --private def find_bindings : Array(String) -- find_pattern = Path.new(project_dir, "**/binding.yml").normalize -+private def find_bindings_yml(path) : Array(String) -+ find_pattern = File.join(path, "**/binding.yml") - Dir[find_pattern] - end - -+private def find_bindings : Array(String) -+ current_directory = Dir.current -+ -+ bindings = find_bindings_yml(current_directory) -+ Dir.glob(File.join(current_directory, "**/*")).each do |path| -+ if File.symlink?(path) -+ bindings += find_bindings_yml(path) -+ end -+ end -+ bindings -+end -+ - private def format_files(dir) - # We need to chdir into output dir since the formatter ignores everything under `lib` dir. - Dir.cd(dir) { `crystal tool format` } -@@ -102,7 +116,9 @@ - Log.info { "Generating bindings at #{options[:output_dir]}" } - - Generator::DocRepo.disable! unless options[:doc_gen] -- -+ -+ FileUtils.cp_r(project_dir, File.join(Dir.current, "lib/gi-crystal")) -+ - binding_yamls = find_bindings.concat(options[:extra_bindings]) - binding_yamls.each do |file| - Log.info { "Using binding config at #{file}" } diff --git a/pkgs/development/tools/gi-crystal/store-friendly-library-name.patch b/pkgs/development/tools/gi-crystal/store-friendly-library-name.patch deleted file mode 100644 index c6fd4e18c8db..000000000000 --- a/pkgs/development/tools/gi-crystal/store-friendly-library-name.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/generator/lib_gen.cr 1969-12-31 17:00:01.000000000 -0700 -+++ b/src/generator/lib_gen.cr 2023-07-14 11:48:41.509397114 -0600 -@@ -10,7 +10,7 @@ - - private def libraries : Array(String) - namespace.shared_libraries.map do |library| -- library[/lib([^\/]+)\.(?:so|.+?\.dylib).*/, 1] -+ library[/(?:\/[^\/]*)+\/lib([^\/]+)\.(?:so|.+?\.dylib).*/, 1] - end - end \ No newline at end of file diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix deleted file mode 100644 index 4584650436c2..000000000000 --- a/pkgs/development/tools/ginkgo/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, ginkgo }: - -buildGoModule rec { - pname = "ginkgo"; - version = "2.20.2"; - - src = fetchFromGitHub { - owner = "onsi"; - repo = "ginkgo"; - rev = "v${version}"; - sha256 = "sha256-/emP4U2s7/hYJZCJ+TdE5sM45q0C8OrrIFreSupq3ig="; - }; - vendorHash = "sha256-6HlCj2Wq+lH6OQxG18fCMj1eC2Xy++IQx35nCAtHQ/U="; - - # integration tests expect more file changes - # types tests are missing CodeLocation - excludedPackages = [ "integration" "types" ]; - - __darwinAllowLocalNetworking = true; - - passthru.tests.version = testers.testVersion { - package = ginkgo; - command = "ginkgo version"; - }; - - meta = with lib; { - homepage = "https://onsi.github.io/ginkgo/"; - changelog = "https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md"; - description = "Modern Testing Framework for Go"; - mainProgram = "ginkgo"; - longDescription = '' - Ginkgo is a testing framework for Go designed to help you write expressive - tests. It is best paired with the Gomega matcher library. When combined, - Ginkgo and Gomega provide a rich and expressive DSL - (Domain-specific Language) for writing tests. - - Ginkgo is sometimes described as a "Behavior Driven Development" (BDD) - framework. In reality, Ginkgo is a general purpose testing framework in - active use across a wide variety of testing contexts: unit tests, - integration tests, acceptance test, performance tests, etc. - ''; - license = licenses.mit; - maintainers = with maintainers; [ saschagrunert jk ]; - }; -} diff --git a/pkgs/development/tools/gir/Cargo.lock b/pkgs/development/tools/gir/Cargo.lock deleted file mode 100644 index 4a605d9ae634..000000000000 --- a/pkgs/development/tools/gir/Cargo.lock +++ /dev/null @@ -1,278 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clock_ticks" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c49a90f58e73ac5f41ed0ac249861ceb5f0976db35fabc2b9c2c856916042d63" - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "log 0.4.17", -] - -[[package]] -name = "fix-getters-rules" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6af7c515020a47f109ddbb4ae0ea662e202c361e5d8570caaca2f1d9037d1bc" -dependencies = [ - "once_cell", -] - -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "gir" -version = "0.0.1" -dependencies = [ - "bitflags", - "env_logger", - "fix-getters-rules", - "getopts", - "hprof", - "log 0.4.17", - "once_cell", - "regex", - "rustdoc-stripper", - "toml", - "xml-rs", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hprof" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b42e67c01ef27237e424783538a0bc45721ecd53438fab5c3f8bbf5dfd8516" -dependencies = [ - "clock_ticks", - "log 0.3.9", -] - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "log" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -dependencies = [ - "log 0.4.17", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "nom8" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" - -[[package]] -name = "proc-macro2" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "regex" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "rustdoc-stripper" -version = "0.1.18" -source = "git+https://github.com/GuillaumeGomez/rustdoc-stripper#08114e390ea162c7ed35dc20cbf1d38bd8bfc130" - -[[package]] -name = "serde" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_spanned" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c68e921cef53841b8925c2abadd27c9b891d9613bdc43d6b823062866df38e8" -dependencies = [ - "serde", -] - -[[package]] -name = "syn" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "toml" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729bfd096e40da9c001f778f5cdecbd2957929a24e10e5883d9392220a751581" -dependencies = [ - "indexmap", - "nom8", - "serde", - "serde_spanned", - "toml_datetime", -] - -[[package]] -name = "unicode-ident" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "xml-rs" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/development/tools/gir/default.nix deleted file mode 100644 index afdfbda2c54e..000000000000 --- a/pkgs/development/tools/gir/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -let - version = "0.17.1"; -in -rustPlatform.buildRustPackage { - pname = "gir"; - inherit version; - - src = fetchFromGitHub { - owner = "gtk-rs"; - repo = "gir"; - rev = version; - sha256 = "sha256-WpTyT62bykq/uwzBFQXeJ1HxR1a2vKmtid8YAzk7J+Q="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "rustdoc-stripper-0.1.18" = "sha256-b+RRXJDGULEvkIZDBzU/ZchVF63pX0S9hBupeP12CkU="; - }; - }; - - postPatch = '' - rm build.rs - sed -i '/build = "build\.rs"/d' Cargo.toml - echo "pub const VERSION: &str = \"$version\";" > src/gir_version.rs - ''; - - meta = with lib; { - description = "Tool to generate rust bindings and user API for glib-based libraries"; - homepage = "https://github.com/gtk-rs/gir/"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ ekleog ]; - mainProgram = "gir"; - }; -} diff --git a/pkgs/development/tools/git-ps-rs/default.nix b/pkgs/development/tools/git-ps-rs/default.nix index 667cafdf67a5..089c03268931 100644 --- a/pkgs/development/tools/git-ps-rs/default.nix +++ b/pkgs/development/tools/git-ps-rs/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Tool for working with a stack of patches"; diff --git a/pkgs/development/tools/github-commenter/default.nix b/pkgs/development/tools/github-commenter/default.nix deleted file mode 100644 index 50a12e0eb0a8..000000000000 --- a/pkgs/development/tools/github-commenter/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: - -buildGoModule rec { - pname = "github-commenter"; - version = "0.28.0"; - - src = fetchFromGitHub { - owner = "cloudposse"; - repo = pname; - rev = version; - hash = "sha256-x3/ae22ub9Us3mvSmvq9ohlkujvZCUfSrmZeQNvIWzE="; - }; - - vendorHash = "sha256-DS2cTYQasIKmyqHS3kTpNMA4fuLxSv4n7ZQjeRWE0gI="; - - meta = with lib; { - description = "Command line utility for creating GitHub comments on Commits, Pull Request Reviews or Issues"; - mainProgram = "github-commenter"; - license = licenses.asl20; - homepage = "https://github.com/cloudposse/github-commenter"; - maintainers = [ maintainers.mmahut ]; - }; -} diff --git a/pkgs/development/tools/github-copilot-intellij-agent/default.nix b/pkgs/development/tools/github-copilot-intellij-agent/default.nix deleted file mode 100644 index c919e2de6281..000000000000 --- a/pkgs/development/tools/github-copilot-intellij-agent/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ stdenv, lib, fetchurl, unzip }: - -stdenv.mkDerivation rec { - pname = "github-copilot-intellij-agent"; - version = "1.4.5.4049"; - - src = fetchurl { - name = "${pname}-${version}-plugin.zip"; - url = "https://plugins.jetbrains.com/plugin/download?updateId=454005"; - hash = "sha256-ibu3OcmtyLHuumhJQ6QipsNEIdEhvLUS7sb3xmnaR0U="; - }; - - nativeBuildInputs = [ unzip ]; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - unzip -p $src github-copilot-intellij/copilot-agent/bin/copilot-agent-${ - if stdenv.isDarwin then (if stdenv.isAarch64 then "macos-arm64" else "macos") else "linux" - } | install -m755 /dev/stdin $out/bin/copilot-agent - - runHook postInstall - ''; - - # https://discourse.nixos.org/t/unrelatable-error-when-working-with-patchelf/12043 - # https://github.com/NixOS/nixpkgs/blob/db0d8e10fc1dec84f1ccb111851a82645aa6a7d3/pkgs/development/web/now-cli/default.nix - preFixup = let - binaryLocation = "$out/bin/copilot-agent"; - libPath = lib.makeLibraryPath [ stdenv.cc.cc ]; - in '' - orig_size=$(stat --printf=%s ${binaryLocation}) - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ${binaryLocation} - patchelf --set-rpath ${libPath} ${binaryLocation} - chmod +x ${binaryLocation} - - new_size=$(stat --printf=%s ${binaryLocation}) - - var_skip=20 - var_select=22 - shift_by=$(expr $new_size - $orig_size) - - function fix_offset { - location=$(grep -obUam1 "$1" ${binaryLocation} | cut -d: -f1) - location=$(expr $location + $var_skip) - value=$(dd if=${binaryLocation} iflag=count_bytes,skip_bytes skip=$location \ - bs=1 count=$var_select status=none) - value=$(expr $shift_by + $value) - echo -n $value | dd of=${binaryLocation} bs=1 seek=$location conv=notrunc - } - - fix_offset PAYLOAD_POSITION - fix_offset PRELUDE_POSITION - ''; - - dontStrip = true; - - meta = rec { - description = "GitHub copilot IntelliJ plugin's native component"; - longDescription = '' - The GitHub copilot IntelliJ plugin's native component. - bin/copilot-agent must be symlinked into the plugin directory, replacing the existing binary. - - For example: - - ```shell - ln -fs /run/current-system/sw/bin/copilot-agent ~/.local/share/JetBrains/IntelliJIdea2022.2/github-copilot-intellij/copilot-agent/bin/copilot-agent-linux - ``` - ''; - homepage = "https://plugins.jetbrains.com/plugin/17718-github-copilot"; - downloadPage = homepage; - changelog = homepage; - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ hacker1024 ]; - mainProgram = "copilot-agent"; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; - sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; - }; -} diff --git a/pkgs/development/tools/github/bump/default.nix b/pkgs/development/tools/github/bump/default.nix deleted file mode 100644 index 52c3117b1ef9..000000000000 --- a/pkgs/development/tools/github/bump/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib }: - -buildGoModule rec { - pname = "bump"; - version = "0.2.4"; - - src = fetchFromGitHub { - owner = "mroth"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-DFgNx0H9/hZ+wUdPkEybRCIjnLsmuoYWruYgbDuFRhU="; - }; - - vendorHash = "sha256-AiXbCS3RXd6KZwIo7qzz3yM28cJloLRR+gdWqEpyims="; - - doCheck = false; - - ldflags = [ - "-X main.buildVersion=${version}" "-X main.buildCommit=${version}" "-X main.buildDate=1970-01-01" - ]; - - meta = with lib; { - license = licenses.mit; - homepage = "https://github.com/mroth/bump"; - description = "CLI tool to draft a GitHub Release for the next semantic version"; - mainProgram = "bump"; - maintainers = with maintainers; [ doronbehar ]; - }; -} diff --git a/pkgs/development/tools/github/github-release/default.nix b/pkgs/development/tools/github/github-release/default.nix deleted file mode 100644 index e2480451e98d..000000000000 --- a/pkgs/development/tools/github/github-release/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib, testers, github-release }: - -buildGoModule rec { - pname = "github-release"; - version = "0.10.1-unstable-2024-06-25"; - - src = fetchFromGitHub { - owner = "github-release"; - repo = "github-release"; - rev = "d250e89a7bf00d54e823b169c3a4722a55ac67b0"; - hash = "sha256-QDImy9VNJ3hfGVCpMoJ72Za3CiM3SVNH1D9RFHVM+4I="; - }; - - vendorHash = null; - - ldflags = [ "-s" ]; - - passthru.tests.version = testers.testVersion { - package = github-release; - version = "v${version}"; - }; - - meta = with lib; { - description = "Commandline app to create and edit releases on Github (and upload artifacts)"; - mainProgram = "github-release"; - longDescription = '' - A small commandline app written in Go that allows you to easily create and - delete releases of your projects on Github. - In addition it allows you to attach files to those releases. - ''; - - license = licenses.mit; - homepage = "https://github.com/github-release/github-release"; - maintainers = with maintainers; [ ardumont j03 ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix deleted file mode 100644 index da706dcdb30a..000000000000 --- a/pkgs/development/tools/glade/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv -, lib -, gettext -, fetchurl -, python3 -, meson -, ninja -, pkg-config -, gtk3 -, glib -, gjs -, enableWebkit2gtk ? stdenv.isLinux -, webkitgtk_4_1 -, gobject-introspection -, wrapGAppsHook3 -, itstool -, libxml2 -, docbook-xsl-nons -, docbook_xml_dtd_42 -, gnome -, adwaita-icon-theme -, gdk-pixbuf -, libxslt -, gsettings-desktop-schemas -}: - -stdenv.mkDerivation rec { - pname = "glade"; - version = "3.40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/glade/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "McmtrqhJlyq5UXtWThmsGZd8qXdYsQntwxZwCPU+PZw="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - itstool - wrapGAppsHook3 - docbook-xsl-nons - docbook_xml_dtd_42 - libxslt - libxml2 - gobject-introspection - ]; - - buildInputs = [ - gtk3 - glib - gjs - libxml2 - python3 - python3.pkgs.pygobject3 - gsettings-desktop-schemas - gdk-pixbuf - adwaita-icon-theme - ] ++ lib.optionals enableWebkit2gtk [ - webkitgtk_4_1 - ]; - - mesonFlags = [ - (lib.mesonEnable "webkit2gtk" enableWebkit2gtk) - ]; - - postPatch = '' - substituteInPlace meson.build \ - --replace 'webkit2gtk-4.0' 'webkit2gtk-4.1' - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/glade"; - description = "User interface designer for GTK applications"; - maintainers = teams.gnome.members; - license = licenses.lgpl2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/glamoroustoolkit/GlamorousToolkit-GetImage b/pkgs/development/tools/glamoroustoolkit/GlamorousToolkit-GetImage deleted file mode 100755 index 20c2c315a350..000000000000 --- a/pkgs/development/tools/glamoroustoolkit/GlamorousToolkit-GetImage +++ /dev/null @@ -1,25 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash --packages curl -# -# Download the latest GlamorousToolkit image to the current directory, which must be empty -# -set -e - -if [ ! -z "$(ls)" ] -then - echo "Warning: the directory is not empty, continuing may overwrite some files" - read -p "Continue? (Y/N): " confirm && [[ $confirm == [yY] || $confirm == [yY][eE][sS] ]] || exit 1 -fi - -GTVERSION=$(curl -s https://api.github.com/repos/feenkcom/gtoolkit/releases/latest 2>/dev/null | grep tag_name | cut -d '"' -f 4) -if [ -z "$GTVERSION" ] -then - echo "Failed to get Gt Version string, exiting..." - exit 1 -fi - -curl -L \ - -o gt-image.zip \ - https://github.com/feenkcom/gtoolkit/releases/download/${GTVERSION}/GlamorousToolkit-Linux-x86_64-${GTVERSION}.zip -unzip gt-image.zip -rm -rf bin lib diff --git a/pkgs/development/tools/glamoroustoolkit/default.nix b/pkgs/development/tools/glamoroustoolkit/default.nix deleted file mode 100644 index e2f5ed297fc2..000000000000 --- a/pkgs/development/tools/glamoroustoolkit/default.nix +++ /dev/null @@ -1,133 +0,0 @@ -{ lib -, stdenv -, fetchzip -, fetchurl -, patchelf -, wrapGAppsHook3 -, cairo -, dbus -, fontconfig -, freetype -, glib -, gtk3 -, libX11 -, libXcursor -, libXext -, libXi -, libXrandr -, libXrender -, libgit2 -, libglvnd -, libuuid -, libxcb -, harfbuzz -, libsoup_3 -, webkitgtk_4_1 -, zenity -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "glamoroustoolkit"; - version = "1.1.0"; - - src = fetchzip { - url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; - stripRoot = false; - hash = "sha256-863xmWC9AuNFTmmBTZVDSchgbqXuk14t1r6B6MeLU74="; - }; - - nativeBuildInputs = [ - wrapGAppsHook3 - (patchelf.overrideAttrs (old: { - version = "0.11"; - src = fetchurl { - url = "https://nixos.org/releases/patchelf/patchelf-0.11/patchelf-0.11.tar.bz2"; - sha256 = "16ms3ijcihb88j3x6cl8cbvhia72afmfcphczb9cfwr0gbc22chx"; - }; - })) - ]; - - sourceRoot = "."; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - runHook preInstall - - install -d $out/bin $out/lib - cp -r $src/bin $src/lib $out/ - cp ${./GlamorousToolkit-GetImage} $out/bin/GlamorousToolkit-GetImage - - runHook postInstall - ''; - - preFixup = let - libPath = lib.makeLibraryPath [ - cairo - dbus - fontconfig - freetype - glib - gtk3 - libX11 - libXcursor - libXext - libXi - libXrandr - libXrender - libglvnd - libuuid - libxcb - harfbuzz # libWebView.so - libsoup_3 # libWebView.so - webkitgtk_4_1 # libWebView.so - stdenv.cc.cc.lib - ]; - binPath = lib.makeBinPath [ - zenity # File selection dialog - ]; - in '' - chmod +x $out/lib/*.so - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}:$out/lib" \ - $out/bin/GlamorousToolkit $out/bin/GlamorousToolkit-cli - patchelf --shrink-rpath \ - $out/bin/GlamorousToolkit $out/bin/GlamorousToolkit-cli - patchelf \ - --set-rpath "${libPath}:$out/lib" \ - $out/lib/*.so - patchelf --shrink-rpath $out/lib/*.so - # - # shrink-rpath gets it wrong for the following libraries, - # restore the full rpath. - # - patchelf \ - --set-rpath "${libPath}:$out/lib" \ - $out/lib/libPharoVMCore.so \ - $out/lib/libWinit.so \ - $out/lib/libPixels.so - patchelf --set-rpath $out/lib $out/lib/libssl.so - - ln -s $out/lib/libcrypto.so $out/lib/libcrypto.so.1.1 - ln -s $out/lib/libcairo.so $out/lib/libcairo.so.2 - rm $out/lib/libgit2.so - ln -s "${libgit2}/lib/libgit2.so" $out/lib/libgit2.so.1.1 - - gappsWrapperArgs+=( - --prefix PATH : ${binPath} - ) - ''; - - meta = { - homepage = "https://gtoolkit.com"; - description = "GlamorousToolkit Development Environment"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.akgrant43 ]; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; -}) diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix deleted file mode 100644 index b1350fba7c4e..000000000000 --- a/pkgs/development/tools/gllvm/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, llvmPackages, getconf }: - -buildGoModule { - pname = "gllvm"; - version = "1.3.1-unstable-2024-04-28"; - - src = fetchFromGitHub { - owner = "SRI-CSL"; - repo = "gllvm"; - rev = "154531bdd9c05cd9d01742bc1b35bdf200a487d3"; - sha256 = "sha256-dxrtJFqEEDKx33+sOm+R7huBwbovlKzL4qFXoco8A4s="; - }; - - vendorHash = null; - - nativeCheckInputs = with llvmPackages; [ - clang - llvm - ] ++ lib.optionals stdenv.isDarwin [ getconf ]; - - meta = with lib; { - homepage = "https://github.com/SRI-CSL/gllvm"; - description = "Whole Program LLVM: wllvm ported to go"; - license = licenses.bsd3; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix deleted file mode 100644 index b35cc4998f67..000000000000 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite, proot, zlib }: - -let - defineMvnWrapper = '' - mvn() - { - # One of the deps that are downloaded and run needs zlib. - export LD_LIBRARY_PATH="${lib.makeLibraryPath [zlib]}" - # Give access to ELF interpreter under FHS path, to be able to run - # prebuilt binaries. - "${lib.getExe proot}" -b "${stdenv.cc.libc}/lib:/lib64" mvn "$@" - } - ''; -in -maven.buildMavenPackage rec { - pname = "global-platform-pro"; - version = "20.01.23"; - GPPRO_VERSION = "v20.01.23-0-g5ad373b"; # git describe --tags --always --long --dirty - - src = fetchFromGitHub { - owner = "martinpaljak"; - repo = "GlobalPlatformPro"; - rev = "v${version}"; - sha256 = "sha256-z38I61JR4oiAkImkbwcvXoK5QsdoR986dDrOzhHsCeY="; - }; - - mvnJdk = jdk8; - mvnHash = "sha256-es8M7gV2z1V9VpWOxanJwQyiemabiUw3n4heJB8Q75A="; - - nativeBuildInputs = [ jdk8 makeWrapper ]; - - # Fix build error due to missing .git directory: - # Failed to execute goal pl.project13.maven:git-commit-id-plugin:4.0.0:revision (retrieve-git-info) on project gppro: .git directory is not found! Please specify a valid [dotGitDirectory] in your pom.xml -> [Help 1] - mvnParameters = "-Dmaven.gitcommitid.skip=true"; - - mvnFetchExtraArgs = { - preConfigure = defineMvnWrapper; - }; - - preConfigure = defineMvnWrapper; - - installPhase = '' - mkdir -p "$out/lib/java" "$out/share/java" - cp tool/target/gp.jar "$out/share/java" - makeWrapper "${jre8_headless}/bin/java" "$out/bin/gp" \ - --add-flags "-jar '$out/share/java/gp.jar'" \ - --prefix LD_LIBRARY_PATH : "${lib.getLib pcsclite}/lib" - ''; - - meta = with lib; { - description = "Command-line utility for managing applets and keys on Java Cards"; - longDescription = '' - This command-line utility can be used to manage applets and keys - on Java Cards. It is made available as the `gp` executable. - - The executable requires the PC/SC daemon running for correct execution. - If you run NixOS, it can be enabled with `services.pcscd.enable = true;`. - ''; - homepage = "https://github.com/martinpaljak/GlobalPlatformPro"; - sourceProvenance = with sourceTypes; [ - fromSource - binaryBytecode # deps - ]; - license = with licenses; [ lgpl3 ]; - maintainers = with maintainers; [ ekleog ]; - mainProgram = "gp"; - }; -} diff --git a/pkgs/development/tools/glpaper/default.nix b/pkgs/development/tools/glpaper/default.nix deleted file mode 100644 index f6f285d45a0b..000000000000 --- a/pkgs/development/tools/glpaper/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromSourcehut, meson, ninja, pkg-config, wayland -, libX11, libGL }: - -stdenv.mkDerivation rec { - pname = "glpaper"; - version = "unstable-2022-05-15"; - - src = fetchFromSourcehut { - owner = "~scoopta"; - repo = pname; - vc = "hg"; - rev = "f89e60b7941fb60f1069ed51af9c5bb4917aab35"; - sha256 = "sha256-E7FKjt3NL0aAEibfaq+YS2IVvpjNjInA+Rs8SU63/3M="; - }; - - nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ - wayland - libX11 # required by libglvnd - libGL - ]; - - meta = with lib; { - description = - "Wallpaper program for wlroots based Wayland compositors such as sway that allows you to render glsl shaders as your wallpaper"; - mainProgram = "glpaper"; - homepage = "https://hg.sr.ht/~scoopta/glpaper"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ ccellado ]; - }; -} diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index 809a674a36a9..0d950d24bf60 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ncurses ffmpeg ] - ++ lib.optional stdenv.isDarwin Cocoa; + ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; meta = with lib; { description = "Live GLSL coding renderer"; @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; mainProgram = "glslViewer"; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix deleted file mode 100644 index 1ff42a6f6241..000000000000 --- a/pkgs/development/tools/gnome-desktop-testing/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv -, lib -, glib -, autoreconfHook -, pkg-config -, systemd -, fetchFromGitLab -, nix-update-script -}: - -stdenv.mkDerivation rec { - pname = "gnome-desktop-testing"; - version = "2021.1"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "gnome-desktop-testing"; - rev = "v${version}"; - sha256 = "sha256-PWn4eEZskY0YgMpf6O2dgXNSu8b8T311vFHREv2HE/Q="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ - glib - systemd - ]; - - enableParallelBuilding = true; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "GNOME test runner for installed tests"; - homepage = "https://gitlab.gnome.org/GNOME/gnome-desktop-testing"; - license = licenses.lgpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.jtojnar ]; - }; -} diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix deleted file mode 100644 index 1a5f173317d1..000000000000 --- a/pkgs/development/tools/gnulib/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchFromSavannah, python3, perl }: - -stdenv.mkDerivation rec { - pname = "gnulib"; - version = "20231109"; - - src = fetchFromSavannah { - repo = "gnulib"; - rev = "2dd1a7984c6b3e6056cef7e3f9933e0039c21634"; - hash = "sha256-QtWf3mljEnr0TTogkoKN63Y5HTm14A2e/sIXX3xe2SE="; - }; - - 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 ]; - - installPhase = '' - mkdir -p $out/bin - cp -r * $out/ - ln -s $out/lib $out/include - ln -s $out/gnulib-tool $out/bin/ - ''; - - # do not change headers to not update all vendored build files - dontFixup = true; - - passthru = { - # This patch is used by multiple other packages (currently: - # gnused, gettext) which contain vendored copies of gnulib. - # Without it, compilation will fail with error messages about - # "__LDBL_REDIR1_DECL" or similar on platforms with longdouble - # redirects (currently powerpc64). Once all of those other - # packages make a release with a newer gnulib we can drop this - # patch. - longdouble-redirect-patch = ./gnulib-longdouble-redirect.patch; - }; - - meta = with lib; { - description = "Central location for code to be shared among GNU packages"; - homepage = "https://www.gnu.org/software/gnulib/"; - changelog = "https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=ChangeLog"; - license = licenses.gpl3Plus; - mainProgram = "gnulib-tool"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/gnulib/gnulib-longdouble-redirect.patch b/pkgs/development/tools/gnulib/gnulib-longdouble-redirect.patch deleted file mode 100644 index f684292dc8bd..000000000000 --- a/pkgs/development/tools/gnulib/gnulib-longdouble-redirect.patch +++ /dev/null @@ -1,72 +0,0 @@ - -Below is the subset of gnulib commit -776af40e09b476a41073131a90022572f448c189 which deals with long double -redirects. The rest of that commit has been removed. - -diff --git a/lib/cdefs.h b/lib/cdefs.h -index fd72b7b..4383e70 100644 ---- a/lib/cdefs.h -+++ b/lib/cdefs.h -@@ -483,7 +493,37 @@ - # include <bits/long-double.h> - #endif - --#if defined __LONG_DOUBLE_MATH_OPTIONAL && defined __NO_LONG_DOUBLE_MATH -+#if __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1 -+# ifdef __REDIRECT -+ -+/* Alias name defined automatically. */ -+# define __LDBL_REDIR(name, proto) ... unused__ldbl_redir -+# define __LDBL_REDIR_DECL(name) \ -+ extern __typeof (name) name __asm (__ASMNAME ("__" #name "ieee128")); -+ -+/* Alias name defined automatically, with leading underscores. */ -+# define __LDBL_REDIR2_DECL(name) \ -+ extern __typeof (__##name) __##name \ -+ __asm (__ASMNAME ("__" #name "ieee128")); -+ -+/* Alias name defined manually. */ -+# define __LDBL_REDIR1(name, proto, alias) ... unused__ldbl_redir1 -+# define __LDBL_REDIR1_DECL(name, alias) \ -+ extern __typeof (name) name __asm (__ASMNAME (#alias)); -+ -+# define __LDBL_REDIR1_NTH(name, proto, alias) \ -+ __REDIRECT_NTH (name, proto, alias) -+# define __REDIRECT_NTH_LDBL(name, proto, alias) \ -+ __LDBL_REDIR1_NTH (name, proto, __##alias##ieee128) -+ -+/* Unused. */ -+# define __REDIRECT_LDBL(name, proto, alias) ... unused__redirect_ldbl -+# define __LDBL_REDIR_NTH(name, proto) ... unused__ldbl_redir_nth -+ -+# else -+_Static_assert (0, "IEEE 128-bits long double requires redirection on this platform"); -+# endif -+#elif defined __LONG_DOUBLE_MATH_OPTIONAL && defined __NO_LONG_DOUBLE_MATH - # define __LDBL_COMPAT 1 - # ifdef __REDIRECT - # define __LDBL_REDIR1(name, proto, alias) __REDIRECT (name, proto, alias) -@@ -492,6 +532,8 @@ - # define __LDBL_REDIR1_NTH(name, proto, alias) __REDIRECT_NTH (name, proto, alias) - # define __LDBL_REDIR_NTH(name, proto) \ - __LDBL_REDIR1_NTH (name, proto, __nldbl_##name) -+# define __LDBL_REDIR2_DECL(name) \ -+ extern __typeof (__##name) __##name __asm (__ASMNAME ("__nldbl___" #name)); - # define __LDBL_REDIR1_DECL(name, alias) \ - extern __typeof (name) name __asm (__ASMNAME (#alias)); - # define __LDBL_REDIR_DECL(name) \ -@@ -502,11 +544,13 @@ - __LDBL_REDIR1_NTH (name, proto, __nldbl_##alias) - # endif - #endif --#if !defined __LDBL_COMPAT || !defined __REDIRECT -+#if (!defined __LDBL_COMPAT && __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 0) \ -+ || !defined __REDIRECT - # define __LDBL_REDIR1(name, proto, alias) name proto - # define __LDBL_REDIR(name, proto) name proto - # define __LDBL_REDIR1_NTH(name, proto, alias) name proto __THROW - # define __LDBL_REDIR_NTH(name, proto) name proto __THROW -+# define __LDBL_REDIR2_DECL(name) - # define __LDBL_REDIR_DECL(name) - # ifdef __REDIRECT - # define __REDIRECT_LDBL(name, proto, alias) __REDIRECT (name, proto, alias) diff --git a/pkgs/development/tools/go-bindata-assetfs/default.nix b/pkgs/development/tools/go-bindata-assetfs/default.nix deleted file mode 100644 index 021887077602..000000000000 --- a/pkgs/development/tools/go-bindata-assetfs/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "go-bindata-assetfs"; - version = "unstable-2022-04-12"; - - src = fetchFromGitHub { - owner = "elazarl"; - repo = "go-bindata-assetfs"; - rev = "de3be3ce9537d87338bf26ac211d02d4fa568bb8"; - hash = "sha256-yQgIaTl06nmIu8BfmQzrvEnlPQ2GQ/2nnvTmYXCL1oI="; - }; - - vendorHash = null; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Serve embedded files from jteeuwen/go-bindata"; - mainProgram = "go-bindata-assetfs"; - license = licenses.bsd2; - maintainers = with maintainers; [ avnik ]; - }; -} diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix deleted file mode 100644 index 7877313b9d50..000000000000 --- a/pkgs/development/tools/go-bindata/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "go-bindata"; - version = "4.0.2"; - - src = fetchFromGitHub { - owner = "kevinburke"; - repo = pname; - rev = "v${version}"; - hash = "sha256-3/1RqJrv1fsPKsZpurp2dHsMg8FJBcFlI/pwwCf5H6E="; - }; - - vendorHash = null; - - subPackages = [ "go-bindata" ]; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - homepage = "https://github.com/kevinburke/go-bindata"; - 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 = [ ]; - license = licenses.cc0; - }; -} diff --git a/pkgs/development/tools/go-callvis/default.nix b/pkgs/development/tools/go-callvis/default.nix deleted file mode 100644 index a954781fb28f..000000000000 --- a/pkgs/development/tools/go-callvis/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "go-callvis"; - version = "0.7.0"; - - src = fetchFromGitHub { - owner = "ofabry"; - repo = "go-callvis"; - rev = "v${version}"; - hash = "sha256-PIzmnqlK+uFtzZW4H0xpP5c+X30hFvOjQydvreJn4xM="; - }; - - vendorHash = "sha256-AfbUxA5C5dH70+vqC+1RGaTt7S0FL9CBcxel0ifmHKs="; - - ldflags = [ "-s" "-w" ]; - - # Build errors in github.com/goccy/go-graphviz/internal/ccall when format hardening is enabled: - # cc1: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security] - hardeningDisable = [ "format" ]; - - meta = with lib; { - description = "Visualize call graph of a Go program using Graphviz"; - mainProgram = "go-callvis"; - homepage = "https://github.com/ofabry/go-callvis"; - license = licenses.mit; - maintainers = with maintainers; [ meain ]; - }; -} diff --git a/pkgs/development/tools/go-containerregistry/default.nix b/pkgs/development/tools/go-containerregistry/default.nix deleted file mode 100644 index 6e3a68bf2323..000000000000 --- a/pkgs/development/tools/go-containerregistry/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - -let bins = [ "crane" "gcrane" ]; in - -buildGoModule rec { - pname = "go-containerregistry"; - version = "0.20.2"; - - src = fetchFromGitHub { - owner = "google"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-5f5zheFPSKmpUaVmcAfeZgFSDu3rvdtQh8mau9jdqz4="; - }; - vendorHash = null; - - nativeBuildInputs = [ installShellFiles ]; - - subPackages = [ "cmd/crane" "cmd/gcrane" ]; - - outputs = [ "out" ] ++ bins; - - ldflags = - let t = "github.com/google/go-containerregistry"; in - [ "-s" "-w" "-X ${t}/cmd/crane/cmd.Version=v${version}" "-X ${t}/pkg/v1/remote/transport.Version=${version}" ]; - - postInstall = - lib.concatStringsSep "\n" ( - map (bin: '' - mkdir -p ''$${bin}/bin && - mv $out/bin/${bin} ''$${bin}/bin/ && - ln -s ''$${bin}/bin/${bin} $out/bin/ - '') bins - ) + '' - for cmd in crane gcrane; do - installShellCompletion --cmd "$cmd" \ - --bash <($GOPATH/bin/$cmd completion bash) \ - --fish <($GOPATH/bin/$cmd completion fish) \ - --zsh <($GOPATH/bin/$cmd completion zsh) - done - ''; - - # NOTE: no tests - doCheck = false; - - meta = with lib; { - description = "Tools for interacting with remote images and registries including crane and gcrane"; - homepage = "https://github.com/google/go-containerregistry"; - license = licenses.asl20; - maintainers = with maintainers; [ yurrriq ]; - }; -} diff --git a/pkgs/development/tools/go-jet/default.nix b/pkgs/development/tools/go-jet/default.nix deleted file mode 100644 index 34b8c5ef1d3c..000000000000 --- a/pkgs/development/tools/go-jet/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "go-jet"; - version = "2.11.1"; - - src = fetchFromGitHub { - owner = pname; - repo = "jet"; - rev = "v${version}"; - sha256 = "sha256-1ntvvbSIqeANZhz/FKXP9cD8UVs9luMHa8pgvc6RsqE="; - }; - - vendorHash = "sha256-7jcUSzz/EI30PUK41u4FUUAzzl/PUKvE46A/nYwx134="; - - subPackages = [ "cmd/jet" ]; - - tags = [ - "mysql" - "golang" - "postgres" - "sql" - "database" - "code-generator" - "sqlite" - "postgresql" - "mariadb" - "sql-query" - "codegenerator" - "typesafe" - "sql-builder" - "datamapper" - "code-completion" - "sql-queries" - "cockroachdb" - "sql-query-builder" - "sqlbuilder" - "typesafety" - ]; - - postPatch = '' - # removing the tests which depend on external data - rm -rf tests/{sqlite,postgres,mysql} - ''; - - meta = with lib; { - homepage = "https://github.com/go-jet/jet"; - description = "Type safe SQL builder with code generation and automatic query result data mapping"; - maintainers = with maintainers; [ mrityunjaygr8 ]; - license = licenses.asl20; - mainProgram = "jet"; - }; -} diff --git a/pkgs/development/tools/go-junit-report/default.nix b/pkgs/development/tools/go-junit-report/default.nix deleted file mode 100644 index c8a7322b42c5..000000000000 --- a/pkgs/development/tools/go-junit-report/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "go-junit-report"; - version = "2.1.0"; - - src = fetchFromGitHub { - owner = "jstemmer"; - repo = "go-junit-report"; - rev = "v${version}"; - sha256 = "sha256-s4XVjACmpd10C5k+P3vtcS/aWxI6UkSUPyxzLhD2vRI="; - }; - - vendorHash = "sha256-+KmC7m6xdkWTT/8MkGaW9gqkzeZ6LWL0DXbt+12iTHY="; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Convert go test output to junit xml"; - mainProgram = "go-junit-report"; - homepage = "https://github.com/jstemmer/go-junit-report"; - license = licenses.mit; - maintainers = with maintainers; [ cryptix ]; - }; -} diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/development/tools/go-migrate/default.nix deleted file mode 100644 index 35c8c320cf21..000000000000 --- a/pkgs/development/tools/go-migrate/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "go-migrate"; - version = "4.18.1"; - - src = fetchFromGitHub { - owner = "golang-migrate"; - repo = "migrate"; - rev = "v${version}"; - sha256 = "sha256-ZZeurnoFcObrK75zkIZvz9ycdDP9AM3uX6h/4bMWpGc="; - }; - - proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-Zaq88oF5rSCSv736afyKDvTNCSIyrIGTN0kuJWqS7tg="; - - subPackages = [ "cmd/migrate" ]; - - tags = [ "cassandra" "clickhouse" "cockroachdb" "crate" "firebird" "mongodb" "multistmt" "mysql" "neo4j" "pgx" "pgx5" "postgres" "ql" "redshift" "rqlite" "shell" "snowflake" "spanner" "sqlite3" "sqlserver" "stub" "testing" "yugabytedb" ]; - - meta = with lib; { - homepage = "https://github.com/golang-migrate/migrate"; - description = "Database migrations. CLI and Golang library"; - maintainers = with maintainers; [ offline ]; - license = licenses.mit; - mainProgram = "migrate"; - }; -} diff --git a/pkgs/development/tools/go-minimock/default.nix b/pkgs/development/tools/go-minimock/default.nix deleted file mode 100644 index 55601dd5704f..000000000000 --- a/pkgs/development/tools/go-minimock/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "go-minimock"; - version = "3.4.0"; - - src = fetchFromGitHub { - owner = "gojuno"; - repo = "minimock"; - rev = "v${version}"; - hash = "sha256-IfowEauUoMybElxThsAZxtdZu3LCqwgpJM5wLQI/yAc="; - }; - - ldflags = [ - "-s" "-w" "-X main.version=${version}" - ]; - - vendorHash = "sha256-ObyIiHidGioSelX2qplFMkC0KX44h0rT6ePa3QKpNfU="; - - doCheck = true; - - subPackages = [ "cmd/minimock" "." ]; - - meta = with lib; { - homepage = "https://github.com/gojuno/minimock"; - description = "Golang mock generator from interfaces"; - license = licenses.mit; - maintainers = with maintainers; [ svrana ]; - mainProgram = "minimock"; - }; -} diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix deleted file mode 100644 index 61cc59d4a811..000000000000 --- a/pkgs/development/tools/go-mockery/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, go-mockery, runCommand, go }: - -buildGoModule rec { - pname = "go-mockery"; - version = "2.46.0"; - - src = fetchFromGitHub { - owner = "vektra"; - repo = "mockery"; - rev = "v${version}"; - sha256 = "sha256-qPE4hzdu5soGVfw6mLJLWvjiXxdkUAT+kpOCWMO1sL8="; - }; - - preCheck = '' - substituteInPlace ./pkg/generator_test.go --replace-fail 0.0.0-dev ${version} - substituteInPlace ./pkg/logging/logging_test.go --replace-fail v0.0 v${lib.versions.majorMinor version} - ''; - - ldflags = [ - "-s" "-w" - "-X" "github.com/vektra/mockery/v2/pkg/logging.SemVer=v${version}" - ]; - - CGO_ENABLED = false; - - proxyVendor = true; - vendorHash = "sha256-1SzdVM1Ncpym6bPg1aSyfoAM1YiUGal3Glw0paz+buk="; - - subPackages = [ "." ]; - - passthru.tests = { - generateMock = runCommand "${pname}-test" { - nativeBuildInputs = [ go-mockery ]; - buildInputs = [ go ]; - } '' - if [[ $(mockery --version) != *"${version}"* ]]; then - echo "Error: program version does not match package version" - exit 1 - fi - - export HOME=$TMPDIR - - cat <<EOF > foo.go - package main - - type Foo interface { - Bark() string - } - EOF - - mockery --name Foo --dir . - - if [[ ! -f "mocks/Foo.go" ]]; then - echo "Error: mocks/Foo.go was not generated by ${pname}" - exit 1 - fi - - touch $out - ''; - }; - - meta = with lib; { - homepage = "https://github.com/vektra/mockery"; - description = "Mock code autogenerator for Golang"; - maintainers = with maintainers; [ fbrs ]; - mainProgram = "mockery"; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/tools/go-mod-graph-chart/default.nix b/pkgs/development/tools/go-mod-graph-chart/default.nix deleted file mode 100644 index 8540e0148394..000000000000 --- a/pkgs/development/tools/go-mod-graph-chart/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "go-mod-graph-chart"; - version = "0.5.3"; - - src = fetchFromGitHub { - owner = "PaulXu-cn"; - repo = pname; - rev = "v${version}"; - hash = "sha256-vitUZXQyAj72ed9Gukr/sAT/iWWMhwsxjZhf2a9CM7I="; - }; - - vendorHash = null; - - # check requires opening webpage - doCheck = false; - - meta = with lib; { - description = "Tool build chart by go mod graph output with zero dependencies"; - homepage = "https://github.com/PaulXu-cn/go-mod-graph-chart"; - mainProgram = "gmchart"; - license = licenses.mit; - maintainers = with maintainers; [ aleksana ]; - }; -} diff --git a/pkgs/development/tools/go-motion/default.nix b/pkgs/development/tools/go-motion/default.nix deleted file mode 100644 index 3db974affe13..000000000000 --- a/pkgs/development/tools/go-motion/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "motion"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "fatih"; - repo = "motion"; - rev = "v${version}"; - sha256 = "sha256-7vkMhjO4JUAf0sUcKiMjqJ5GzLb//QoHd7Cagerx4/s="; - }; - - vendorHash = null; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Navigation and insight in Go"; - mainProgram = "motion"; - longDescription = '' - Motion is a tool that was designed to work with editors. It is providing - contextual information for a given offset(option) from a file or - directory of files. Editors can use these informations to implement - navigation, text editing, etc... that are specific to a Go source code. - - It's optimized and created to work with vim-go, but it's designed to work - with any editor. It's currently work in progress and open to change. - ''; - homepage = "https://github.com/fatih/motion"; - license = licenses.bsd3; - maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix deleted file mode 100644 index c8f7f4efa502..000000000000 --- a/pkgs/development/tools/go-outline/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "go-outline"; - version = "unstable-2021-06-08"; - - src = fetchFromGitHub { - owner = "ramya-rao-a"; - repo = "go-outline"; - rev = "9736a4bde949f321d201e5eaa5ae2bcde011bf00"; - sha256 = "sha256-5ns6n1UO9kRSw8iio4dmJDncsyvFeN01bjxHxQ9Fae4="; - }; - - vendorHash = "sha256-jYYtSXdJd2eUc80UfwRRMPcX6tFiXE3LbxV3NAdKVKE="; - - meta = with lib; { - description = "Utility to extract JSON representation of declarations from a Go source file"; - mainProgram = "go-outline"; - homepage = "https://github.com/ramya-rao-a/go-outline"; - maintainers = with maintainers; [ vdemeester ]; - license = licenses.mit; - }; -} diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix deleted file mode 100644 index aa8c8df12e86..000000000000 --- a/pkgs/development/tools/go-protobuf/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "go-protobuf"; - version = "1.5.4"; - - src = fetchFromGitHub { - owner = "golang"; - repo = "protobuf"; - rev = "v${version}"; - sha256 = "sha256-AfyZ6xlqmrsVqtoKV1XMEo/Vba9Kpu1EgwfF6pPSZ64="; - }; - - vendorHash = "sha256-jGAWUgW0DA7EwmlzVxnBmtbf2dp+P4Qwcb8mTAEhUi4="; - - meta = with lib; { - homepage = "https://github.com/golang/protobuf"; - description = " Go bindings for protocol buffer"; - maintainers = with maintainers; [ lewo ]; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/development/tools/go-swag/default.nix deleted file mode 100644 index 25ceb20089e0..000000000000 --- a/pkgs/development/tools/go-swag/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib }: - -buildGoModule rec { - pname = "go-swag"; - version = "1.16.3"; - - src = fetchFromGitHub { - owner = "swaggo"; - repo = "swag"; - rev = "v${version}"; - sha256 = "sha256-wS5m3dBiILxmVb6P559fGcONdCWc/5hhLAVMC+G1QZs="; - }; - - vendorHash = "sha256-BxWmEcx5IIT/yI46CJGE0vE1BRm5zwngc0x1dVy/04s="; - - subPackages = [ "cmd/swag" ]; - - meta = with lib; { - description = "Automatically generate RESTful API documentation with Swagger 2.0 for Go"; - homepage = "https://github.com/swaggo/swag"; - license = licenses.mit; - maintainers = with maintainers; [ stephenwithph ]; - mainProgram = "swag"; - }; -} diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/development/tools/go-swagger/default.nix deleted file mode 100644 index 9319bd499758..000000000000 --- a/pkgs/development/tools/go-swagger/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "go-swagger"; - version = "0.31.0"; - - src = fetchFromGitHub { - owner = "go-swagger"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-PeH9bkRObsw4+ttuWhaPfPQQTOAw8pwlgTEtPoUBiIQ="; - }; - - vendorHash = "sha256-PBzJMXPZ2gVdrW3ZeerhR1BeT9vWIIS1vCTjz3UFHes="; - - doCheck = false; - - subPackages = [ "cmd/swagger" ]; - - ldflags = [ - "-s" - "-w" - "-X github.com/go-swagger/go-swagger/cmd/swagger/commands.Version=${version}" - "-X github.com/go-swagger/go-swagger/cmd/swagger/commands.Commit=${src.rev}" - ]; - - meta = with lib; { - description = "Golang implementation of Swagger 2.0, representation of your RESTful API"; - homepage = "https://github.com/go-swagger/go-swagger"; - changelog = "https://github.com/go-swagger/go-swagger/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ kalbasit ]; - mainProgram = "swagger"; - }; -} diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix deleted file mode 100644 index 8c456874899b..000000000000 --- a/pkgs/development/tools/go-task/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, fetchpatch -, installShellFiles -, testers -, go-task -}: - -buildGoModule rec { - pname = "go-task"; - version = "3.38.0"; - - src = fetchFromGitHub { - owner = pname; - repo = "task"; - rev = "refs/tags/v${version}"; - hash = "sha256-mz/07DONaO3kCxOXEnvWglY0b9JXxCXjTrVIEbsbl98="; - }; - - 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; - - nativeBuildInputs = [ installShellFiles ]; - - subPackages = [ "cmd/task" ]; - - ldflags = [ - "-s" - "-w" - "-X=github.com/go-task/task/v3/internal/version.version=${version}" - ]; - - postInstall = '' - ln -s $out/bin/task $out/bin/go-task - - installShellCompletion completion/{bash,fish,zsh}/* - - substituteInPlace $out/share/bash-completion/completions/task.bash \ - --replace-fail 'complete -F _task task' 'complete -F _task task go-task' - substituteInPlace $out/share/fish/vendor_completions.d/task.fish \ - --replace-fail 'complete -c $GO_TASK_PROGNAME' 'complete -c $GO_TASK_PROGNAME -c go-task' - substituteInPlace $out/share/zsh/site-functions/_task \ - --replace-fail '#compdef task' '#compdef task go-task' - ''; - - passthru.tests = { - version = testers.testVersion { - package = go-task; - }; - }; - - meta = with lib; { - homepage = "https://taskfile.dev/"; - description = "Task runner / simpler Make alternative written in Go"; - changelog = "https://github.com/go-task/task/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ parasrah ]; - }; -} diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix deleted file mode 100644 index d22898102778..000000000000 --- a/pkgs/development/tools/go-toml/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: -let - version = "2.2.3"; -in -buildGoModule { - pname = "go-toml"; - inherit version; - - src = fetchFromGitHub { - owner = "pelletier"; - repo = "go-toml"; - rev = "v${version}"; - sha256 = "sha256-+l89SvJ/4SxVItys1ROLOv2hZ5euU1MF21Yn0siQHUM="; - }; - - vendorHash = "sha256-YkOcpzn5AKFMDWUYbKY8DzGMiIMSyaDfexFmXv5HNQI="; - - excludedPackages = [ - "cmd/gotoml-test-decoder" - "cmd/gotoml-test-encoder" - "cmd/tomltestgen" - ]; - - # allowGoReference adds the flag `-trimpath` which is also denoted by, go-toml's goreleaser config - # <https://github.com/pelletier/go-toml/blob/a3d5a0bb530b5206c728eed9cb57323061922bcb/.goreleaser.yaml#L13> - allowGoReference = true; - - ldflags = [ - "-s" - "-w" - "-X main.version=${version}" - ]; - - meta = { - description = "Go library for the TOML language"; - homepage = "https://github.com/pelletier/go-toml"; - changelog = "https://github.com/pelletier/go-toml/releases/tag/v${version}"; - maintainers = [ lib.maintainers.isabelroses ]; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix deleted file mode 100644 index dd4f60f16b74..000000000000 --- a/pkgs/development/tools/go-tools/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ buildGoModule -, lib -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "go-tools"; - version = "2024.1.1"; - - src = fetchFromGitHub { - owner = "dominikh"; - repo = "go-tools"; - rev = version; - sha256 = "sha256-VD6WB0Rcwo41MqZUNVlLGl2yRGZKRGGLGBPvS+ISF4c="; - }; - - vendorHash = "sha256-OZ67BWsIUaU24BPQ1VjbGE4GkDZUKgbBG3ynUVXvyaU="; - - excludedPackages = [ "website" ]; - - doCheck = false; - - meta = with lib; { - description = "Collection of tools and libraries for working with Go code, including linters and static analysis"; - homepage = "https://staticcheck.io"; - license = licenses.mit; - maintainers = with maintainers; [ rvolosatovs kalbasit smasher164 ]; - }; -} diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix deleted file mode 100644 index 4f294564772f..000000000000 --- a/pkgs/development/tools/goa/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "goa"; - version = "3.18.2"; - - src = fetchFromGitHub { - owner = "goadesign"; - repo = "goa"; - rev = "v${version}"; - hash = "sha256-TBGCykHW++o2t4NFbWS3IK+UpXbyGgaJZ/6aoCrqi2Q="; - }; - vendorHash = "sha256-AwpPuj/nX8MD//JL/oF+RGGQi1fdUo28KII2+y5Ptso="; - - subPackages = [ "cmd/goa" ]; - - meta = with lib; { - description = "Design-based APIs and microservices in Go"; - mainProgram = "goa"; - homepage = "https://goa.design"; - license = licenses.mit; - maintainers = with maintainers; [ rushmorem ]; - }; -} diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix deleted file mode 100644 index 6d1ef96f77a8..000000000000 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "gocode-gomod"; - version = "1.0.0"; - - # we must allow references to the original `go` package, - # because `gocode` needs to dig into $GOROOT to provide completions for the - # standard packages. - allowGoReference = true; - - src = fetchFromGitHub { - owner = "stamblerre"; - repo = "gocode"; - rev = "v${version}"; - sha256 = "YAOYrPPKgnjCErq8+iW0Le51clGBv0MJy2Nnn7UVo/s="; - }; - - vendorHash = null; - - postInstall = '' - mv $out/bin/gocode $out/bin/gocode-gomod - ''; - - doCheck = false; # fails on go 1.17 - - meta = with lib; { - description = "Autocompletion daemon for the Go programming language"; - mainProgram = "gocode-gomod"; - longDescription = '' - Gocode is a helper tool which is intended to be integrated with your - source code editor, like vim, neovim and emacs. It provides several - advanced capabilities, which currently includes: - - - Context-sensitive autocompletion - - It is called daemon, because it uses client/server architecture for - caching purposes. In particular, it makes autocompletions very fast. - Typical autocompletion time with warm cache is 30ms, which is barely - noticeable. - ''; - homepage = "https://github.com/stamblerre/gocode"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit rvolosatovs ]; - }; -} diff --git a/pkgs/development/tools/goconst/default.nix b/pkgs/development/tools/goconst/default.nix deleted file mode 100644 index d080a4fe3754..000000000000 --- a/pkgs/development/tools/goconst/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "goconst"; - version = "1.7.1"; - - excludedPackages = [ "tests" ]; - - src = fetchFromGitHub { - owner = "jgautheron"; - repo = "goconst"; - rev = "v${version}"; - sha256 = "sha256-GpOZJ5/5aNw1o8fk2RSAx200v6AZ+pbNu/25i8OSS1Y="; - }; - - vendorHash = null; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Find in Go repeated strings that could be replaced by a constant"; - mainProgram = "goconst"; - homepage = "https://github.com/jgautheron/goconst"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix deleted file mode 100644 index 6717ff777be6..000000000000 --- a/pkgs/development/tools/goconvey/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "goconvey"; - version = "1.8.1-unstable-2024-03-06"; - - excludedPackages = "web/server/watch/integration_testing"; - - src = fetchFromGitHub { - owner = "smartystreets"; - repo = "goconvey"; - rev = "a50310f1e3e53e63e2d23eb904f853aa388a5988"; - hash = "sha256-w5eX/n6Wu2gYgCIhgtjqH3lNckWIDaN4r80cJW3JqFo="; - }; - - vendorHash = "sha256-P4J/CZY95ks08DC+gSqG+eanL3zoiaoz1d9/ZvBoc9Q="; - - ldflags = [ "-s" "-w" ]; - - checkFlags = [ - "-short" - ]; - - meta = { - description = "Go testing in the browser. Integrates with `go test`. Write behavioral tests in Go"; - mainProgram = "goconvey"; - homepage = "https://github.com/smartystreets/goconvey"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ vdemeester ]; - }; -} diff --git a/pkgs/development/tools/gocover-cobertura/default.nix b/pkgs/development/tools/gocover-cobertura/default.nix deleted file mode 100644 index bc8b4e9f0f2b..000000000000 --- a/pkgs/development/tools/gocover-cobertura/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "gocover-cobertura"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "boumenot"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-nbwqfObU1tod5gWa9UbhmS6CpLLilvFyvNJ6XjeR8Qc="; - }; - - vendorHash = null; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - homepage = "https://github.com/boumenot/gocover-cobertura"; - description = "This is a simple helper tool for generating XML output in Cobertura format for CIs like Jenkins and others from go tool cover output"; - mainProgram = "gocover-cobertura"; - license = licenses.mit; - maintainers = with maintainers; [ hmajid2301 ]; - }; -} diff --git a/pkgs/development/tools/gocyclo/default.nix b/pkgs/development/tools/gocyclo/default.nix deleted file mode 100644 index 49aa20f2be70..000000000000 --- a/pkgs/development/tools/gocyclo/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ buildGoModule -, lib -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "gocyclo"; - version = "0.6.0"; - - src = fetchFromGitHub { - owner = "fzipp"; - repo = "gocyclo"; - rev = "v${version}"; - sha256 = "sha256-1IwtGUqshpLDyxH5NNkGUads1TKLs48eslNnFylGUPA="; - }; - - vendorHash = null; - - meta = with lib; { - description = "Calculate cyclomatic complexities of functions in Go source code"; - mainProgram = "gocyclo"; - homepage = "https://github.com/fzipp/gocyclo"; - license = licenses.bsd3; - maintainers = with maintainers; [ kalbasit ]; - }; -} diff --git a/pkgs/development/tools/goda/default.nix b/pkgs/development/tools/goda/default.nix deleted file mode 100644 index ff8b0cecbc90..000000000000 --- a/pkgs/development/tools/goda/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, nix-update-script, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "goda"; - version = "0.5.9"; - - src = fetchFromGitHub { - owner = "loov"; - repo = "goda"; - rev = "v${version}"; - hash = "sha256-tkGIo4FWIFFMtp4rP0GJaF7B6lrmtjaAVx45G4wAPQg="; - }; - - vendorHash = "sha256-FYjlOYB0L4l6gF8hYtJroV1qMQD0ZmKWXBarjyConRs="; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - homepage = "https://github.com/loov/goda"; - description = "Go Dependency Analysis toolkit"; - maintainers = with maintainers; [ michaeladler ]; - license = licenses.mit; - mainProgram = "goda"; - }; -} diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix deleted file mode 100644 index d79406a2ac43..000000000000 --- a/pkgs/development/tools/godef/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "godef"; - version = "1.1.2"; - rev = "v${version}"; - - subPackages = [ "." ]; - - vendorHash = null; - - doCheck = false; - - src = fetchFromGitHub { - inherit rev; - owner = "rogpeppe"; - repo = "godef"; - sha256 = "0rhhg73kzai6qzhw31yxw3nhpsijn849qai2v9am955svmnckvf4"; - }; - - meta = { - description = "Print where symbols are defined in Go source code"; - mainProgram = "godef"; - homepage = "https://github.com/rogpeppe/godef/"; - maintainers = with lib.maintainers; [ vdemeester rvolosatovs ]; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/development/tools/gogetdoc/default.nix b/pkgs/development/tools/gogetdoc/default.nix deleted file mode 100644 index ed6f586a01ba..000000000000 --- a/pkgs/development/tools/gogetdoc/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ buildGoModule -, lib -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "gogetdoc-unstable"; - version = "2019-02-28"; - rev = "b37376c5da6aeb900611837098f40f81972e63e4"; - - vendorHash = null; - - doCheck = false; - - src = fetchFromGitHub { - inherit rev; - - owner = "zmb3"; - repo = "gogetdoc"; - sha256 = "1v74zd0x2xh10603p8raazssacv3y0x0lr9apkpsdk0bfp5jj0lr"; - }; - - meta = with lib; { - description = "Gets documentation for items in Go source code"; - mainProgram = "gogetdoc"; - homepage = "https://github.com/zmb3/gogetdoc"; - license = licenses.bsd3; - maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/tools/goimports-reviser/default.nix b/pkgs/development/tools/goimports-reviser/default.nix deleted file mode 100644 index b7bdf8632164..000000000000 --- a/pkgs/development/tools/goimports-reviser/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "goimports-reviser"; - version = "3.6.5"; - - src = fetchFromGitHub { - owner = "incu6us"; - repo = "goimports-reviser"; - rev = "v${version}"; - hash = "sha256-46s6A1sGqoJR3XihaCkVCxTpManl330mMcJ8hv66zDc="; - }; - vendorHash = "sha256-z+FeAXPXKi653im2X2WOP1R9gRl/x7UBnndoEXoxdwA="; - - CGO_ENABLED = 0; - - subPackages = [ "." ]; - - ldflags = [ - "-s" - "-w" - "-X=main.Tag=${src.rev}" - ]; - - checkFlags = [ - "-skip=TestSourceFile_Fix_WithAliasForVersionSuffix/success_with_set_alias" - ]; - - preCheck = '' - # unset to run all tests - unset subPackages - # unset as some tests require cgo - unset CGO_ENABLED - ''; - - meta = with lib; { - description = "Right imports sorting & code formatting tool (goimports alternative)"; - mainProgram = "goimports-reviser"; - homepage = "https://github.com/incu6us/goimports-reviser"; - license = licenses.mit; - maintainers = with maintainers; [ jk ]; - }; -} diff --git a/pkgs/development/tools/gojq/default.nix b/pkgs/development/tools/gojq/default.nix deleted file mode 100644 index 8a573665b4b8..000000000000 --- a/pkgs/development/tools/gojq/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, gojq }: - -buildGoModule rec { - pname = "gojq"; - version = "0.12.16"; - - src = fetchFromGitHub { - owner = "itchyny"; - repo = pname; - rev = "v${version}"; - hash = "sha256-lCNh0J0vVvSJaNE9fu3X83YRZlWHOI4rQwmrGJDQWzk="; - }; - - vendorHash = "sha256-ZC0byawZLBwId5GcAgHXRdEOMUSAv4wDNHFHLrbhB+I="; - - ldflags = [ "-s" "-w" ]; - - passthru.tests.version = testers.testVersion { - package = gojq; - }; - - meta = with lib; { - description = "Pure Go implementation of jq"; - homepage = "https://github.com/itchyny/gojq"; - changelog = "https://github.com/itchyny/gojq/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ aaronjheng ]; - mainProgram = "gojq"; - }; -} diff --git a/pkgs/development/tools/gojsontoyaml/default.nix b/pkgs/development/tools/gojsontoyaml/default.nix deleted file mode 100644 index f05d0405aebf..000000000000 --- a/pkgs/development/tools/gojsontoyaml/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "gojsontoyaml"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "brancz"; - repo = "gojsontoyaml"; - rev = "v${version}"; - sha256 = "sha256-ebxz2uTH7XwD3j6JnsfET6aCGYjvsCjow/sU9pagg50="; - }; - - vendorHash = null; - - meta = with lib; { - description = "Simply tool to convert json to yaml written in Go"; - mainProgram = "gojsontoyaml"; - homepage = "https://github.com/brancz/gojsontoyaml"; - license = licenses.mit; - maintainers = [ maintainers.bryanasdev000 ]; - }; -} diff --git a/pkgs/development/tools/gokart/default.nix b/pkgs/development/tools/gokart/default.nix deleted file mode 100644 index 11e68b9bede1..000000000000 --- a/pkgs/development/tools/gokart/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "gokart"; - version = "0.5.1"; - - src = fetchFromGitHub { - owner = "praetorian-inc"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-G1IjlJ/rmviFWy6RFfLtP+bhfYcDuB97leimU39YCoQ="; - }; - - vendorHash = "sha256-lgKYVgJlmUJ/msdIqG7EKAZuISie1lG7+VeCF/rcSlE="; - - # Would need files to scan which are not shipped by the project - doCheck = false; - - meta = with lib; { - description = "Static analysis tool for securing Go code"; - mainProgram = "gokart"; - homepage = "https://github.com/praetorian-inc/gokart"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/tools/golangci-lint-langserver/default.nix b/pkgs/development/tools/golangci-lint-langserver/default.nix deleted file mode 100644 index ce43f3ed50b8..000000000000 --- a/pkgs/development/tools/golangci-lint-langserver/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "golangci-lint-langserver"; - version = "0.0.9"; - - src = fetchFromGitHub { - owner = "nametake"; - repo = "golangci-lint-langserver"; - rev = "v${version}"; - sha256 = "sha256-jNRDqg2a5dXo7QI4CBRw0MLwhfpdGuhygpMoSKNcgC0="; - }; - - vendorHash = "sha256-tAcl6P+cgqFX1eMYdS8vnfdNyb+1QNWwWdJsQU6Fpgg="; - - subPackages = [ "." ]; - - meta = with lib; { - description = "Language server for golangci-lint"; - homepage = "https://github.com/nametake/golangci-lint-langserver"; - license = licenses.mit; - maintainers = with maintainers; [ kirillrdy ]; - mainProgram = "golangci-lint-langserver"; - }; -} diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix deleted file mode 100644 index 620dc94a8b03..000000000000 --- a/pkgs/development/tools/golangci-lint/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ buildGo123Module, fetchFromGitHub, lib, installShellFiles }: - -buildGo123Module rec { - pname = "golangci-lint"; - version = "1.61.0"; - - src = fetchFromGitHub { - owner = "golangci"; - repo = "golangci-lint"; - rev = "v${version}"; - hash = "sha256-2YzVNOdasal27R92l6eVdeS81mAp0ZU6kYsC/Jfvkcg="; - }; - - vendorHash = "sha256-mFDCRxbLq08yRd0ko3CCPJD2BZiCB0Gwd1g+/1oR6w8="; - - subPackages = [ "cmd/golangci-lint" ]; - - nativeBuildInputs = [ installShellFiles ]; - - ldflags = [ - "-s" - "-w" - "-X main.version=${version}" - "-X main.commit=v${version}" - "-X main.date=19700101-00:00:00" - ]; - - postInstall = '' - for shell in bash zsh fish; do - HOME=$TMPDIR $out/bin/golangci-lint completion $shell > golangci-lint.$shell - installShellCompletion golangci-lint.$shell - done - ''; - - meta = with lib; { - description = "Fast linters Runner for Go"; - homepage = "https://golangci-lint.run/"; - changelog = "https://github.com/golangci/golangci-lint/blob/v${version}/CHANGELOG.md"; - mainProgram = "golangci-lint"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ SuperSandro2000 mic92 ]; - }; -} diff --git a/pkgs/development/tools/golines/default.nix b/pkgs/development/tools/golines/default.nix deleted file mode 100644 index da6c887d43bb..000000000000 --- a/pkgs/development/tools/golines/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "golines"; - version = "0.12.2"; - - src = fetchFromGitHub { - owner = "segmentio"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-D0gI9BA0vgM1DBqwolNTfPsTCWuOGrcu5gAVFEdyVGg="; - }; - - vendorHash = "sha256-jI3/m1UdZMKrS3H9jPhcVAUCjc1G/ejzHi9SCTy24ak="; - - meta = with lib; { - description = "Golang formatter that fixes long lines"; - homepage = "https://github.com/segmentio/golines"; - license = licenses.mit; - maintainers = with maintainers; [ meain ]; - }; -} diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix deleted file mode 100644 index 47e1ee0a5455..000000000000 --- a/pkgs/development/tools/golint/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, buildGoModule, fetchgit }: - -buildGoModule rec { - pname = "golint"; - version = "unstable-2020-12-08"; - - # we must allow references to the original `go` package, as golint uses - # compiler go/build package to load the packages it's linting. - allowGoReference = true; - - src = fetchgit { - url = "https://go.googlesource.com/lint"; - rev = "83fdc39ff7b56453e3793356bcff3070b9b96445"; - sha256 = "sha256-g4Z9PREOxGoN7n/XhutawsITBznJlbz6StXeDYvOQ1c="; - }; - - vendorHash = "sha256-dPadFoymYu2Uw2AXZfbaBfxsN8IWMuK1TrcknHco3Bo="; - - # tests no longer work: - # found packages pkg (4.go) and foo (blank-import-lib.go) in /build/lint-6edffad/testdata - # testdata/errorf-custom.go:9:2: cannot find package "." in: - # /build/lint-6edffad/vendor/github.com/pkg/errors - doCheck = false; - - meta = with lib; { - homepage = "https://golang.org"; - description = "Linter for Go source code"; - mainProgram = "golint"; - license = licenses.bsd3; - maintainers = with maintainers; [ jhillyerd tomberek ]; - }; -} diff --git a/pkgs/development/tools/gomacro/default.nix b/pkgs/development/tools/gomacro/default.nix deleted file mode 100644 index 1b2a45da7a42..000000000000 --- a/pkgs/development/tools/gomacro/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "gomacro"; - version = "2.7-unstable-2024-01-07"; - - src = fetchFromGitHub { - owner = "cosmos72"; - repo = "gomacro"; - rev = "bf232d031933810d4a5382e17ce6c4b042a24304"; - hash = "sha256-16u3eByFmnY12M2CEhSJKLIT0KP9nbvTv+BnqWwNTcg="; - }; - - vendorHash = "sha256-ok71QlBHGasGVt+CGwGqhgmx5JLkQcdlU/KX+W1A5Ws="; - - subPackages = [ "." ]; - - meta = with lib; { - description = "Interactive Go interpreter and debugger with generics and macros"; - mainProgram = "gomacro"; - homepage = "https://github.com/cosmos72/gomacro"; - license = licenses.mpl20; - maintainers = with maintainers; [ shofius ]; - }; -} diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix deleted file mode 100644 index c66137a82899..000000000000 --- a/pkgs/development/tools/gomodifytags/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "gomodifytags"; - version = "1.17.0"; - - src = fetchFromGitHub { - owner = "fatih"; - repo = "gomodifytags"; - rev = "v${version}"; - sha256 = "sha256-XVjSRW7FzXbGmGT+xH4tNg9PVXvgmhQXTIrYYZ346/M="; - }; - - vendorHash = "sha256-0eWrkOcaow+W2Daaw2rzugfS+jqhN6RE2iCdpui9aQg="; - - meta = { - description = "Go tool to modify struct field tags"; - mainProgram = "gomodifytags"; - homepage = "https://github.com/fatih/gomodifytags"; - maintainers = with lib.maintainers; [ vdemeester ]; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix deleted file mode 100644 index 40532ac9dd0a..000000000000 --- a/pkgs/development/tools/gomplate/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "gomplate"; - version = "4.1.0"; - - src = fetchFromGitHub { - owner = "hairyhenderson"; - repo = "gomplate"; - rev = "refs/tags/v${version}"; - hash = "sha256-shbG0q86wlSjoCK2K7hNdUCwNPiQp94GWQJ1e71A1T0="; - }; - - vendorHash = "sha256-UKqSKypAm6gt2JUCZh/DyfWo8uJeMp0M+4FiqwzzHIA="; - - ldflags = [ - "-s" - "-X github.com/${src.owner}/${pname}/v4/version.Version=${version}" - ]; - - preCheck = '' - # some tests require network access - rm net/net_test.go \ - internal/tests/integration/datasources_blob_test.go \ - internal/tests/integration/datasources_git_test.go \ - render_test.go - # some tests rely on external tools we'd rather not depend on - rm internal/tests/integration/datasources_consul_test.go \ - internal/tests/integration/datasources_vault*_test.go - ''; - - postInstall = '' - rm $out/bin/gen - ''; - - meta = with lib; { - description = "Flexible commandline tool for template rendering"; - mainProgram = "gomplate"; - homepage = "https://gomplate.ca/"; - changelog = "https://github.com/hairyhenderson/gomplate/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ ris jlesquembre ]; - }; -} diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix deleted file mode 100644 index 1230ac606ecf..000000000000 --- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchzip, python3Packages, makeWrapper }: - -with python3Packages; - -stdenv.mkDerivation rec { - pname = "google-app-engine-go-sdk"; - version = "1.9.61"; - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchzip { - url = "https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_linux_amd64-${version}.zip"; - sha256 = "1i2j9ympl1218akwsmm7yb31v0gibgpzlb657bcravi1irfv1hhs"; - } - else - fetchzip { - url = "https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_darwin_amd64-${version}.zip"; - sha256 = "0s8sqyc72lnc7dxd4cl559gyfx83x71jjpsld3i3nbp3mwwamczp"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ python ]; - - installPhase = '' - mkdir -p $out/bin $out/share/ - cp -r "$src" "$out/share/go_appengine" - - # create wrappers with correct env - for i in goapp go-app-stager *.py; do - makeWrapper "$out/share/go_appengine/$i" "$out/bin/$i" \ - --prefix PATH : "${python}/bin" \ - --prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl})" - done - ''; - - meta = with lib; { - description = "Google App Engine SDK for Go"; - version = version; - homepage = "https://cloud.google.com/appengine/docs/go/"; - sourceProvenance = with sourceTypes; [ - fromSource - binaryNativeCode # includes golang toolchain binaries - ]; - license = licenses.asl20; - platforms = ["x86_64-linux" "x86_64-darwin"]; - maintainers = with maintainers; [ lufia ]; - }; -} diff --git a/pkgs/development/tools/google-clasp/default.nix b/pkgs/development/tools/google-clasp/default.nix deleted file mode 100644 index 2b2d6758410b..000000000000 --- a/pkgs/development/tools/google-clasp/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "clasp"; - version = "2.4.2"; - - src = fetchFromGitHub { - owner = "google"; - repo = "clasp"; - rev = "refs/tags/v${version}"; - hash = "sha256-Cnnqbxjfx7hlRYIDtbjSbDO0QBHqLsleIGrAUQDLaCw="; - }; - - npmDepsHash = "sha256-4oYpGBpk4WBVnE1HNYmRRGHZgcPgta2YQB00YyWvbiI="; - - # `npm run build` tries installing clasp globally - npmBuildScript = [ "compile" ]; - - meta = with lib; { - description = "Develop Apps Script Projects locally"; - mainProgram = "clasp"; - homepage = "https://github.com/google/clasp#readme"; - changelog = "https://github.com/google/clasp/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ natsukium ]; - }; -} diff --git a/pkgs/development/tools/google-java-format/default.nix b/pkgs/development/tools/google-java-format/default.nix deleted file mode 100644 index cbecd3d59816..000000000000 --- a/pkgs/development/tools/google-java-format/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "google-java-format"; - 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-fGN1rCS0glvmu+YZAOi1ixo+iUShNnqDYyEPntLQhXA="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,share/${pname}} - install -D ${src} $out/share/${pname}/google-java-format-${version}-all-deps.jar - - makeWrapper ${jre}/bin/java $out/bin/${pname} \ - --argv0 ${pname} \ - --add-flags "--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" \ - --add-flags "--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED" \ - --add-flags "--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED" \ - --add-flags "--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED" \ - --add-flags "--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED" \ - --add-flags "-jar $out/share/${pname}/google-java-format-${version}-all-deps.jar" - - runHook postInstall - ''; - - meta = with lib; { - description = "Java source formatter by Google"; - longDescription = '' - A program that reformats Java source code to comply with Google Java Style. - ''; - homepage = "https://github.com/google/google-java-format"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.asl20; - maintainers = [ maintainers.emptyflask ]; - platforms = platforms.all; - mainProgram = "google-java-format"; - }; -} diff --git a/pkgs/development/tools/goperf/default.nix b/pkgs/development/tools/goperf/default.nix deleted file mode 100644 index dc5ee3052a01..000000000000 --- a/pkgs/development/tools/goperf/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, buildGoModule -, fetchgit -, writeShellScript -, unstableGitUpdater -, sd -}: - -buildGoModule rec { - pname = "goperf"; - version = "0-unstable-2024-09-05"; - - src = fetchgit { - url = "https://go.googlesource.com/perf"; - rev = "ce4811554b022ac27d024d355ad160e95079bec1"; - hash = "sha256-kJJod7Qma3++lrctezYltB9hV8/gH/CycHrk+GpOasE="; - }; - - vendorHash = "sha256-VWywJ1LalYcfOQjrC0sLBfbQyIg8fYv4paMlIfa3RxI="; - - passthru.updateScript = writeShellScript "update-goperf" '' - export UPDATE_NIX_ATTR_PATH=goperf - ${lib.escapeShellArgs (unstableGitUpdater { inherit (src) url; })} - set -x - oldhash="$(nix-instantiate . --eval --strict -A "goperf.goModules.drvAttrs.outputHash" | cut -d'"' -f2)" - newhash="$(nix-build -A goperf.goModules --no-out-link 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" - fname="$(nix-instantiate --eval -E 'with import ./. {}; (builtins.unsafeGetAttrPos "version" goperf).file' | cut -d'"' -f2)" - ${lib.getExe sd} --string-mode "$oldhash" "$newhash" "$fname" - ''; - - meta = with lib; { - description = "Tools and packages for analyzing Go benchmark results"; - homepage = "https://cs.opensource.google/go/x/perf"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ pbsds ]; - }; -} diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix deleted file mode 100644 index ba7d9ffccde3..000000000000 --- a/pkgs/development/tools/gopkgs/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "gopkgs"; - version = "2.1.2"; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "uudashr"; - repo = "gopkgs"; - hash = "sha256-ll5fhwzzCNL0UtMLNSGOY6Yyy0EqI8OZ1iqWad4KU8k="; - }; - - vendorHash = "sha256-WVikDxf79nEahKRn4Gw7Pv8AULQXW+RXGoA3ihBhmt8="; - - subPackages = [ "cmd/gopkgs" ]; - - doCheck = false; - - meta = { - description = "Tool to get list available Go packages"; - mainProgram = "gopkgs"; - homepage = "https://github.com/uudashr/gopkgs"; - maintainers = with lib.maintainers; [ vdemeester ]; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/tools/gops/default.nix b/pkgs/development/tools/gops/default.nix deleted file mode 100644 index 3c1f5e2ac5cc..000000000000 --- a/pkgs/development/tools/gops/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "gops"; - version = "0.3.28"; - - src = fetchFromGitHub { - owner = "google"; - repo = "gops"; - rev = "v${version}"; - sha256 = "sha256-HNM487WSfNWNF31ccDIdotsEG8Mj2C7V85UI47a9drU="; - }; - - vendorHash = "sha256-ptC2G7cXcAjthJcAXvuBqI2ZpPuSMBqzO+gJiyaAUP0="; - - preCheck = "export HOME=$(mktemp -d)"; - - meta = with lib; { - description = "Tool to list and diagnose Go processes currently running on your system"; - mainProgram = "gops"; - homepage = "https://github.com/google/gops"; - license = licenses.bsd3; - maintainers = with maintainers; [ pborzenkov ]; - }; -} diff --git a/pkgs/development/tools/gore/default.nix b/pkgs/development/tools/gore/default.nix deleted file mode 100644 index af9b48e85a38..000000000000 --- a/pkgs/development/tools/gore/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "gore"; - version = "0.5.7"; - - src = fetchFromGitHub { - owner = "motemen"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-J6rXz62y/qj4GFXnUwpfx9UEUQaUVQjf7KQCSzmNsws="; - }; - - vendorHash = "sha256-MpmDQ++32Rop1yYcibEr7hQJ7YAU1QvITzTSstL5V9w="; - - doCheck = false; - - meta = with lib; { - description = "Yet another Go REPL that works nicely"; - mainProgram = "gore"; - homepage = "https://github.com/motemen/gore"; - license = licenses.mit; - maintainers = with maintainers; [ offline ]; - }; -} diff --git a/pkgs/development/tools/goresym/default.nix b/pkgs/development/tools/goresym/default.nix deleted file mode 100644 index d20a9a6c809a..000000000000 --- a/pkgs/development/tools/goresym/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, fetchFromGitHub -, buildGoModule -, unzip -}: - -buildGoModule rec { - pname = "goresym"; - version = "2.7.4"; - - src = fetchFromGitHub { - owner = "mandiant"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-qFDacInIiV1thuYMjyzTG7ru5bkd2Af1iao7Oes1mRg="; - }; - - subPackages = [ "." ]; - - vendorHash = "sha256-pjkBrHhIqLmSzwi1dKS5+aJrrAAIzNATOt3LgLsMtx0="; - - nativeCheckInputs = [ unzip ]; - - preCheck = '' - cd test - unzip weirdbins.zip - cd .. - ''; - - doCheck = true; - - meta = with lib; { - description = "Go symbol recovery tool"; - mainProgram = "GoReSym"; - homepage = "https://github.com/mandiant/GoReSym"; - changelog = "https://github.com/mandiant/GoReSym/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ pyrox0 ]; - }; -} diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix deleted file mode 100644 index a2c6cd85e5ed..000000000000 --- a/pkgs/development/tools/gosec/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "gosec"; - version = "2.21.2"; - - src = fetchFromGitHub { - owner = "securego"; - repo = pname; - rev = "v${version}"; - hash = "sha256-1lVyIytIorxxipDZAf2AYqtO1Slz9aUw6MpC40ji89w="; - }; - - vendorHash = "sha256-jxbGAEvkjvuK878nkl8TGbZmBzS7n9nG4hH9BL3UGwE="; - - subPackages = [ - "cmd/gosec" - ]; - - ldflags = [ - "-s" - "-w" - "-X main.Version=${version}" - "-X main.GitTag=${src.rev}" - "-X main.BuildDate=unknown" - ]; - - meta = with lib; { - homepage = "https://github.com/securego/gosec"; - description = "Golang security checker"; - mainProgram = "gosec"; - license = licenses.asl20; - maintainers = with maintainers; [ kalbasit nilp0inter ]; - }; -} diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix deleted file mode 100644 index f73bfa69693d..000000000000 --- a/pkgs/development/tools/gotags/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: - -buildGoModule rec { - pname = "gotags"; - version = "1.4.1"; - - src = fetchFromGitHub { - owner = "jstemmer"; - repo = pname; - rev = "4c0c4330071a994fbdfdff68f412d768fbcca313"; - hash = "sha256-cHTgt+zW6S6NDWBE6NxSXNPdn84CLD8WmqBe+uXN8sA="; - }; - - vendorHash = null; - - patches = [ - # Add Go Modules support - (fetchpatch { - url = "https://github.com/jstemmer/gotags/commit/9146999bce9a88e15b5f123d1aa1613926dd9a9c.patch"; - hash = "sha256-6v/Ws15y50S6iCI1c0kEw5WHSg+1WqVT4mwdQKoi5G8="; - }) - ]; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "ctags-compatible tag generator for Go"; - mainProgram = "gotags"; - homepage = "https://github.com/jstemmer/gotags"; - license = licenses.mit; - maintainers = with maintainers; [ urandom ]; - }; -} diff --git a/pkgs/development/tools/gotemplate/default.nix b/pkgs/development/tools/gotemplate/default.nix deleted file mode 100644 index 57dbba5db01e..000000000000 --- a/pkgs/development/tools/gotemplate/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "gotemplate"; - version = "3.7.5"; - - src = fetchFromGitHub { - owner = "coveooss"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-BMZyq7fa57WaE0cSkGjHWxtEnbC7vEy+kLaHDoI/KZU="; - }; - - vendorHash = "sha256-uRB3atrJ+A1/xXvgmkyM/AKN+9VKSIDvsnPIdtsc3vc="; - - meta = with lib; { - description = "CLI for go text/template"; - mainProgram = "gotemplate"; - changelog = "https://github.com/coveooss/gotemplate/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ giorgiga ]; - }; -} diff --git a/pkgs/development/tools/gotest/default.nix b/pkgs/development/tools/gotest/default.nix deleted file mode 100644 index 2f54241d651d..000000000000 --- a/pkgs/development/tools/gotest/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "gotest"; - version = "0.0.6"; - - src = fetchFromGitHub { - owner = "rakyll"; - repo = pname; - rev = "v${version}"; - sha256 = "1v11ccrjghq7nsz0f91r17di14yixsw28vs0m3dwzwqkh1a20img"; - }; - - vendorHash = "sha256-pVq6H1HoKqCMRfJg7FftRf3vh+BWZQe6cQAX+TBzKqw="; - - subPackages = [ "." ]; - - meta = with lib; { - description = "go test with colors"; - mainProgram = "gotest"; - homepage = "https://github.com/rakyll/gotest"; - license = licenses.bsd3; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/gotestfmt/default.nix b/pkgs/development/tools/gotestfmt/default.nix deleted file mode 100644 index 0bd71fd5ea58..000000000000 --- a/pkgs/development/tools/gotestfmt/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib }: - -buildGoModule rec { - pname = "gotestfmt"; - version = "2.5.0"; - - src = fetchFromGitHub { - owner = "gotesttools"; - repo = pname; - rev = "v${version}"; - hash = "sha256-7mLn2axlHoXau9JtLhk1zwzhxkFGHgYPo7igI+IAsP4="; - }; - - vendorHash = null; - - meta = with lib; { - description = "Go test output for humans"; - homepage = "https://github.com/gotesttools/gotestfmt"; - changelog = "https://github.com/GoTestTools/gotestfmt/releases/tag/v${version}"; - license = licenses.unlicense; - maintainers = with maintainers; [ urandom ]; - }; -} diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix deleted file mode 100644 index 2086df1051ba..000000000000 --- a/pkgs/development/tools/gotests/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "gotests"; - version = "1.6.0"; - - src = fetchFromGitHub { - owner = "cweill"; - repo = "gotests"; - rev = "v${version}"; - sha256 = "sha256-6IzUpAsFUgF2FwiC17OfDn1M+8WYFQPpRyXbkpHIztw="; - }; - - vendorHash = "sha256-WMeHZN3s+8pIYEVaSLjI3Bz+rPTWHr1AkZ8lydjBwCw="; - - # tests are broken in nix environment - doCheck = false; - - meta = with lib; { - description = "Generate Go tests from your source code"; - mainProgram = "gotests"; - homepage = "https://github.com/cweill/gotests"; - maintainers = with maintainers; [ vdemeester ]; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix deleted file mode 100644 index 5bb515592e57..000000000000 --- a/pkgs/development/tools/gotestsum/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildGoModule, -}: -let - version = "1.11.0"; -in -buildGoModule { - pname = "gotestsum"; - inherit version; - - src = fetchFromGitHub { - owner = "gotestyourself"; - repo = "gotestsum"; - rev = "v${version}"; - hash = "sha256-Sq0ejnX7AJoPf3deBge8PMOq1NlMbw+Ljn145C5MQ+s="; - }; - - vendorHash = "sha256-zUqa6xlDV12ZV4N6+EZ7fLPsL8U+GB7boQ0qG9egvm0="; - - doCheck = false; - - ldflags = [ - "-s" - "-w" - "-X gotest.tools/gotestsum/cmd.version=${version}" - ]; - - subPackages = [ "." ]; - - meta = { - homepage = "https://github.com/gotestyourself/gotestsum"; - changelog = "https://github.com/gotestyourself/gotestsum/releases/tag/v${version}"; - description = "Human friendly `go test` runner"; - mainProgram = "gotestsum"; - platforms = with lib.platforms; linux ++ darwin; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ isabelroses ]; - }; -} diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix deleted file mode 100644 index ef4a608fcbc4..000000000000 --- a/pkgs/development/tools/gotools/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "gotools"; - version = "0.22.0"; - - # using GitHub instead of https://go.googlesource.com/tools because Gitiles UI is to basic to browse - src = fetchFromGitHub { - owner = "golang"; - repo = "tools"; - rev = "v${version}"; - hash = "sha256-qqzvbHFbm6RlqztBnuj7HvMa9Wff1+YUA0fxiM0cx8o="; - }; - - postPatch = '' - # The gopls folder contains a Go submodule which causes a build failure - # and lives in its own package named gopls. - rm -r gopls - ''; - - vendorHash = "sha256-eQ/T/Zxmzn6KF0ewjvt9TDd48RSsSbQ3LgVcKgdeVbU="; - - doCheck = false; - - # Set GOTOOLDIR for derivations adding this to buildInputs - postInstall = '' - mkdir -p $out/nix-support - substitute ${./setup-hook.sh} $out/nix-support/setup-hook \ - --subst-var-by bin $out - ''; - - meta = with lib; { - description = "Additional tools for Go development"; - longDescription = '' - This package contains tools like: godoc, goimports, callgraph, digraph, stringer or toolstash. - ''; - homepage = "https://go.googlesource.com/tools"; - license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/tools/gotools/setup-hook.sh b/pkgs/development/tools/gotools/setup-hook.sh deleted file mode 100644 index e354e50c35aa..000000000000 --- a/pkgs/development/tools/gotools/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -export GOTOOLDIR=@bin@/bin diff --git a/pkgs/development/tools/gotraceui/default.nix b/pkgs/development/tools/gotraceui/default.nix deleted file mode 100644 index 3f162f246288..000000000000 --- a/pkgs/development/tools/gotraceui/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, fetchFromGitHub, pkg-config, buildGoModule, - libGL, libX11, libXcursor, libXfixes, libxkbcommon, vulkan-headers, wayland, -}: - -buildGoModule rec { - pname = "gotraceui"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "dominikh"; - repo = "gotraceui"; - rev = "v${version}"; - sha256 = "sha256-Rforuh9YlTv/mTpQm0+BaY+Ssc4DAiDCzVkIerP5Uz0="; - }; - - vendorHash = "sha256-dNV5u6BG+2Nzci6dX/4/4WAeM/zXE5+Ix0HqIsNnm0E="; - subPackages = ["cmd/gotraceui"]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - vulkan-headers - libxkbcommon - wayland - libX11 - libXcursor - libXfixes - libGL - ]; - - ldflags = ["-X gioui.org/app.ID=co.honnef.Gotraceui"]; - - postInstall = '' - cp -r share $out/ - ''; - - meta = with lib; { - description = "Efficient frontend for Go execution traces"; - mainProgram = "gotraceui"; - homepage = "https://github.com/dominikh/gotraceui"; - platforms = platforms.linux; - license = licenses.mit; - maintainers = with maintainers; [ dominikh ]; - }; -} diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix deleted file mode 100644 index e1ba5d9bb743..000000000000 --- a/pkgs/development/tools/gox/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, makeWrapper -, go -}: - -buildGoModule rec { - pname = "gox"; - version = "1.0.1"; - - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "gox"; - rev = "v${version}"; - sha256 = "0mkh81hd7kn45dz7b6yhzqsg2mvg1g6pwx89jjigxrnqhyg9vrl7"; - }; - - vendorHash = null; - - # This is required for wrapProgram. - allowGoReference = true; - - nativeBuildInputs = [ makeWrapper ]; - - postFixup = '' - wrapProgram $out/bin/gox --prefix PATH : ${lib.makeBinPath [ go ]} - ''; - - meta = with lib; { - homepage = "https://github.com/mitchellh/gox"; - description = "Dead simple, no frills Go cross compile tool"; - mainProgram = "gox"; - license = licenses.mpl20; - maintainers = with maintainers; [ azahi ]; - }; -} diff --git a/pkgs/development/tools/gpp/default.nix b/pkgs/development/tools/gpp/default.nix deleted file mode 100644 index 902c0bbf02b5..000000000000 --- a/pkgs/development/tools/gpp/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: - -stdenv.mkDerivation { - pname = "gpp"; - version = "2.25"; - - src = fetchFromGitHub { - owner = "logological"; - repo = "gpp"; - rev = "96c5dd8905384ea188f380f51d24cbd7fd58f642"; - sha256 = "0bvhnx3yfhbfiqqhhz6k2a596ls5rval7ykbp3jl5b6062xj861b"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - installCheckPhase = "$out/bin/gpp --help"; - doInstallCheck = true; - - meta = with lib; { - description = "General-purpose preprocessor with customizable syntax"; - mainProgram = "gpp"; - homepage = "https://logological.org/gpp"; - license = licenses.lgpl3; - maintainers = with maintainers; [ nmattia ]; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/pkgs/development/tools/gptcommit/default.nix b/pkgs/development/tools/gptcommit/default.nix index f1bd3376e160..1a4036d77189 100644 --- a/pkgs/development/tools/gptcommit/default.nix +++ b/pkgs/development/tools/gptcommit/default.nix @@ -11,7 +11,7 @@ let pname = "gptcommit"; - version = "0.5.16"; + version = "0.5.17"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,18 +20,18 @@ rustPlatform.buildRustPackage { owner = "zurawiki"; repo = pname; rev = "v${version}"; - hash = "sha256-JhMkK2zw3VL9o7j8DJmjY/im+GyCjfV2TJI3GDo8T8c="; + hash = "sha256-MB78QsJA90Au0bCUXfkcjnvfPagTPZwFhFVqxix+Clw="; }; - cargoHash = "sha256-ye9MAfG3m24ofV95Kr+KTP4FEqfrsm3aTQ464hG9q08="; + cargoHash = "sha256-F4nabUeQZMnmSNC8KlHjx3IcyR2Xn36kovabmJ6g1zo="; nativeBuildInputs = [ pkg-config ]; # 0.5.6 release has failing tests doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ] - ++ lib.optionals stdenv.isLinux [ openssl ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/development/tools/gqlgenc/default.nix b/pkgs/development/tools/gqlgenc/default.nix deleted file mode 100644 index 3b08fda8ad9d..000000000000 --- a/pkgs/development/tools/gqlgenc/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib }: - -buildGoModule rec { - pname = "gqlgenc"; - version = "0.25.1"; - - src = fetchFromGitHub { - owner = "yamashou"; - repo = "gqlgenc"; - rev = "v${version}"; - sha256 = "sha256-i2+J8hWbADeOmua4I3/NX8MC6FKP+5I9BqwCDkLOnvw="; - }; - - excludedPackages = [ "example" ]; - - vendorHash = "sha256-/lrOc2suNyNRlpi22QUr6MZCIrdWaWiZUv6pe/mYnB8="; - - meta = with lib; { - description = "Go tool for building GraphQL client with gqlgen"; - mainProgram = "gqlgenc"; - homepage = "https://github.com/Yamashou/gqlgenc"; - license = licenses.mit; - maintainers = with maintainers; [ milran ]; - }; -} diff --git a/pkgs/development/tools/gqlint/default.nix b/pkgs/development/tools/gqlint/default.nix deleted file mode 100644 index 18fc0cc624b7..000000000000 --- a/pkgs/development/tools/gqlint/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "gqlint"; - version = "1.8.0"; - - src = fetchFromGitHub { - owner = "happylinks"; - repo = "gqlint"; - rev = "v${version}"; - hash = "sha256-m/Y7i3+93UdPnKQlZUHgtRbfSmJ1xYjao+bU+zxMgHw="; - }; - - npmDepsHash = "sha256-Fc5RbBqrJB7KSqLgTmIsPf3MK2n7vef/UVeFqH0o7mE="; - - dontNpmBuild = true; - - meta = { - description = "GraphQL linter"; - homepage = "https://github.com/happylinks/gqlint"; - license = lib.licenses.mit; - mainProgram = "gqlint"; - maintainers = with lib.maintainers; [ hardselius ]; - }; -} diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix deleted file mode 100644 index e26dcf63f77b..000000000000 --- a/pkgs/development/tools/grabserial/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, fetchFromGitHub, python3Packages }: - -python3Packages.buildPythonApplication rec { - pname = "grabserial"; - version = "2.0.2"; - - src = fetchFromGitHub { - owner = "tbird20d"; - repo = "grabserial"; - rev = "v${version}"; - sha256 = "0ryk4w8q6zfmia71nwnk5b7xaxw0sf45dw9q50xp7k76i3k5f9f3"; - }; - - propagatedBuildInputs = [ python3Packages.pyserial ]; - - # no usable tests - doCheck = false; - - meta = with lib; { - description = "Python based serial dump and timing program"; - mainProgram = "grabserial"; - homepage = "https://github.com/tbird20d/grabserial"; - license = licenses.gpl2; - maintainers = with maintainers; [ vmandela ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/graphql-client/default.nix b/pkgs/development/tools/graphql-client/default.nix index 241e1ef95faa..8fe6ff5bcf08 100644 --- a/pkgs/development/tools/graphql-client/default.nix +++ b/pkgs/development/tools/graphql-client/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "GraphQL tool for Rust projects"; diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix deleted file mode 100644 index 4ef6216c370b..000000000000 --- a/pkgs/development/tools/gron/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "gron"; - version = "0.7.1"; - - src = fetchFromGitHub { - owner = "tomnomnom"; - repo = "gron"; - rev = "v${version}"; - sha256 = "sha256-ZkAfAQsaFX7npyDcBDFS4Xa8kOMVH6yGfxGD7c0iQ+o="; - }; - - vendorHash = "sha256-K/QAG9mCIHe7PQhex3TntlGYAK9l0bESWk616N97dBs="; - - ldflags = [ "-s" "-w" "-X main.gronVersion=${version}" ]; - - meta = with lib; { - description = "Make JSON greppable!"; - mainProgram = "gron"; - longDescription = '' - gron transforms JSON into discrete assignments to make it easier to grep - for what you want and see the absolute 'path' to it. It eases the - exploration of APIs that return large blobs of JSON but have terrible - documentation. - ''; - homepage = "https://github.com/tomnomnom/gron"; - license = licenses.mit; - maintainers = with maintainers; [ fgaz SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/tools/grpc-gateway/default.nix b/pkgs/development/tools/grpc-gateway/default.nix deleted file mode 100644 index b2c7effd8007..000000000000 --- a/pkgs/development/tools/grpc-gateway/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib, testers, grpc-gateway }: - -buildGoModule rec { - pname = "grpc-gateway"; - version = "2.22.0"; - - src = fetchFromGitHub { - owner = "grpc-ecosystem"; - repo = "grpc-gateway"; - rev = "v${version}"; - sha256 = "sha256-I1w3gfV06J8xG1xJ+XuMIGkV2/Ofszo7SCC+z4Xb6l4="; - }; - - vendorHash = "sha256-S4hcD5/BSGxM2qdJHMxOkxsJ5+Ks6m4lKHSS9+yZ17c="; - - ldflags = [ - "-X=main.version=${version}" - "-X=main.date=1970-01-01T00:00:00Z" - "-X=main.commit=unknown" - ]; - - passthru.tests = { - version = testers.testVersion { - package = grpc-gateway; - command = "protoc-gen-grpc-gateway --version"; - version = "Version ${version}, commit unknown, built at 1970-01-01T00:00:00Z"; - }; - openapiv2Version = testers.testVersion { - package = grpc-gateway; - command = "protoc-gen-openapiv2 --version"; - version = "Version ${version}, commit unknown, built at 1970-01-01T00:00:00Z"; - }; - }; - - meta = with lib; { - description = - "A gRPC to JSON proxy generator plugin for Google Protocol Buffers"; - longDescription = '' - This is a plugin for the Google Protocol Buffers compiler (protoc). It reads - protobuf service definitions and generates a reverse-proxy server which - translates a RESTful HTTP API into gRPC. This server is generated according to - the google.api.http annotations in the protobuf service definitions. - ''; - homepage = "https://github.com/grpc-ecosystem/grpc-gateway"; - license = licenses.bsd3; - maintainers = with maintainers; [ happyalu ]; - }; -} diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/pkgs/development/tools/gtk-mac-bundler/default.nix deleted file mode 100644 index a94534a9cb32..000000000000 --- a/pkgs/development/tools/gtk-mac-bundler/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, lib, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "gtk-mac-bundler"; - version = "0.7.4"; - - src = fetchFromGitHub { - owner = "GNOME"; - repo = "gtk-mac-bundler"; - rev = "bundler-${version}"; - sha256 = "1kyyq2hc217i5vhbfff0ldgv0r3aziwryd1xlck5cw3s6hgskbza"; - }; - - installPhase = '' - mkdir -p $out/bin - substitute gtk-mac-bundler.in $out/bin/gtk-mac-bundler \ - --subst-var-by PATH $out/share - chmod a+x $out/bin/gtk-mac-bundler - - mkdir -p $out/share - cp -r bundler $out/share - ''; - - meta = with lib; { - description = "Helper script that creates application bundles form GTK executables for macOS"; - maintainers = [ maintainers.matthewbauer ]; - platforms = platforms.darwin; - homepage = "https://gitlab.gnome.org/GNOME/gtk-mac-bundler"; - license = licenses.gpl2; - }; -} diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix deleted file mode 100644 index 83028d8fb2e2..000000000000 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ fetchurl, lib, stdenv, guile, guile-lib, libffi, pkg-config, glib }: - -stdenv.mkDerivation rec { - pname = "g-wrap"; - version = "1.9.15"; - - src = fetchurl { - url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg"; - }; - - nativeBuildInputs = [ pkg-config ]; - - # Note: Glib support is optional, but it's quite useful (e.g., it's used by - # Guile-GNOME). - buildInputs = [ guile glib guile-lib ]; - - propagatedBuildInputs = [ libffi ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - - doCheck = true; - - meta = with lib; { - description = "Wrapper generator for Guile"; - mainProgram = "g-wrap-config"; - longDescription = '' - G-Wrap is a tool (and Guile library) for generating function wrappers for - inter-language calls. It currently only supports generating Guile - wrappers for C functions. - ''; - homepage = "https://www.nongnu.org/g-wrap/"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ vyp ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/guile/guile-hall/default.nix b/pkgs/development/tools/guile/guile-hall/default.nix deleted file mode 100644 index 3c57fb4da8ce..000000000000 --- a/pkgs/development/tools/guile/guile-hall/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config -, texinfo, makeWrapper, guile, guile-config }: - -stdenv.mkDerivation rec { - pname = "guile-hall"; - version = "0.4.1"; - - src = fetchFromGitLab { - owner = "a-sassmannshausen"; - repo = "guile-hall"; - rev = version; - hash = "sha256-TUCN8kW44X6iGbSJURurcz/Tc2eCH1xgmXH1sMOMOXs="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config texinfo makeWrapper ]; - - buildInputs = [ guile guile-config ]; - - enableParallelBuilding = true; - - doCheck = true; - - postInstall = '' - wrapProgram $out/bin/hall \ - --prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \ - --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH" - ''; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - export HOME=$TMPDIR - $out/bin/hall --version | grep ${version} > /dev/null - runHook postInstallCheck - ''; - - meta = with lib; { - description = "Project manager and build tool for GNU guile"; - mainProgram = "hall"; - homepage = "https://gitlab.com/a-sassmannshausen/guile-hall"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ sikmir ]; - platforms = guile.meta.platforms; - }; -} diff --git a/pkgs/development/tools/halfempty/default.nix b/pkgs/development/tools/halfempty/default.nix deleted file mode 100644 index 62b0d161b412..000000000000 --- a/pkgs/development/tools/halfempty/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, glib, hexdump, scowl }: - -stdenv.mkDerivation rec { - pname = "halfempty"; - version = "0.40"; - - src = fetchFromGitHub { - owner = "googleprojectzero"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-YGq6fneAMo2jCpLPrjzRJ0eeOsStKaK5L+lwQfqcfpY="; - }; - - nativeBuildInputs = [ pkg-config hexdump ]; - buildInputs = [ glib ]; - - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - - enableParallelBuilding = true; - - patches = [ - (fetchpatch { - name = "fix-bash-specific-syntax.patch"; - url = "https://github.com/googleprojectzero/halfempty/commit/ad15964d0fcaba12e5aca65c8935ebe3f37d7ea3.patch"; - sha256 = "sha256:0hgdci0wwi5wyw8i57w0545cxjmsmswm1y6g4vhykap0y40zizav"; - }) - ]; - - postPatch = '' - substituteInPlace test/Makefile \ - --replace '/usr/share/dict/words' '${scowl}/share/dict/words.txt' - ''; - - installPhase = '' - install -vDt $out/bin halfempty - ''; - - doCheck = true; - checkTarget = "test"; - - meta = { - description = "Fast, parallel test case minimization tool"; - mainProgram = "halfempty"; - homepage = "https://github.com/googleprojectzero/halfempty/"; - maintainers = with lib.maintainers; [ fpletz ]; - license = with lib.licenses; [ asl20 ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/tools/haskell/ghc-settings-edit/default.nix b/pkgs/development/tools/haskell/ghc-settings-edit/default.nix index fa5146a128bb..4cd19aebcdd7 100644 --- a/pkgs/development/tools/haskell/ghc-settings-edit/default.nix +++ b/pkgs/development/tools/haskell/ghc-settings-edit/default.nix @@ -8,13 +8,10 @@ mkDerivation { pname = "ghc-settings-edit"; version = "0.1.0"; - src = lib.fileset.toSource { - root = ./.; - fileset = lib.fileset.unions [ - ./Setup.hs - ./ghc-settings-edit.lhs - ./ghc-settings-edit.cabal - ]; + src = builtins.path { + path = ./.; + name = "source"; + filter = path: _: (builtins.baseNameOf path) != "default.nix"; }; isLibrary = false; isExecutable = true; diff --git a/pkgs/development/tools/haskell/hadrian/disable-hyperlinked-source-extra-args.patch b/pkgs/development/tools/haskell/hadrian/disable-hyperlinked-source-extra-args.patch new file mode 100644 index 000000000000..dbbf126a4425 --- /dev/null +++ b/pkgs/development/tools/haskell/hadrian/disable-hyperlinked-source-extra-args.patch @@ -0,0 +1,13 @@ +diff --git a/hadrian/src/Settings/Default.hs b/hadrian/src/Settings/Default.hs +index 0b743788ec..a7ff841609 100644 +--- a/hadrian/src/Settings/Default.hs ++++ b/hadrian/src/Settings/Default.hs +@@ -249,7 +249,7 @@ defaultExtraArgs = + + defaultHaddockExtraArgs :: Args + defaultHaddockExtraArgs = builder (Haddock BuildPackage) ? +- mconcat [ arg "--hyperlinked-source", arg "--hoogle", arg "--quickjump" ] ++ mconcat [ arg "--hoogle", arg "--quickjump" ] + + + -- | Default source arguments, e.g. optimisation settings. diff --git a/pkgs/development/tools/haskell/hadrian/disable-hyperlinked-source.patch b/pkgs/development/tools/haskell/hadrian/disable-hyperlinked-source-pre-9.8.patch index 103871bb65e1..103871bb65e1 100644 --- a/pkgs/development/tools/haskell/hadrian/disable-hyperlinked-source.patch +++ b/pkgs/development/tools/haskell/hadrian/disable-hyperlinked-source-pre-9.8.patch diff --git a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix index fb9ee89f7cdb..8db821a9794d 100644 --- a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix +++ b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix @@ -52,4 +52,7 @@ callPackage' ./hadrian.nix ({ # to build hadrian. (Hackage-released conditional dependencies are handled # in ./hadrian.nix without requiring intervention here.) inherit ghc-platform ghc-toolchain; +} // lib.optionalAttrs (lib.versionAtLeast ghcVersion "9.11") { + # See https://gitlab.haskell.org/ghc/ghc/-/commit/145a6477854d4003a07573d5e7ffa0c9a64ae29c + Cabal = bootPkgs.Cabal_3_14_0_0; }) diff --git a/pkgs/development/tools/haskell/mueval/default.nix b/pkgs/development/tools/haskell/mueval/default.nix deleted file mode 100644 index f763c69c3737..000000000000 --- a/pkgs/development/tools/haskell/mueval/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, makeWrapper, haskellPackages, packages ? (pkgs: []) -}: - -let defaultPkgs = pkgs: [ pkgs.show - pkgs.simple-reflect - pkgs.QuickCheck - pkgs.mtl - ]; - env = haskellPackages.ghcWithPackages - (pkgs: defaultPkgs pkgs ++ packages pkgs); - -in stdenv.mkDerivation { - name = "mueval-env"; - - inherit (haskellPackages) mueval; - - nativeBuildInputs = [ makeWrapper ]; - - dontUnpack = true; - - buildPhase = '' - runHook preBuild - - mkdir -p $out/bin - - makeWrapper $mueval/bin/mueval $out/bin/mueval \ - --set "NIX_GHC_LIBDIR" "$(${lib.getExe' env "ghc"} --print-libdir)" - - runHook postBuild - ''; - - passthru = { inherit defaultPkgs; }; - meta.mainProgram = "mueval"; -} diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix deleted file mode 100644 index d2d74ab52edf..000000000000 --- a/pkgs/development/tools/hcloud/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -}: - -buildGoModule rec { - pname = "hcloud"; - version = "1.47.0"; - - src = fetchFromGitHub { - owner = "hetznercloud"; - repo = "cli"; - rev = "refs/tags/v${version}"; - hash = "sha256-bIrkX/udxkHA+DWQ1t7QkHOmEhqacdtVR9wBWaS820M="; - }; - - vendorHash = "sha256-fNcyIP6q54A+TlsN0xliQGONx7H20KNY+d0NxOUSxQc="; - - ldflags = [ - "-s" - "-w" - "-X=github.com/hetznercloud/cli/internal/version.Version=${version}" - ]; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - for shell in bash fish zsh; do - $out/bin/hcloud completion $shell > hcloud.$shell - installShellCompletion hcloud.$shell - done - ''; - - meta = with lib; { - changelog = "https://github.com/hetznercloud/cli/releases/tag/v${version}"; - description = "Command-line interface for Hetzner Cloud, a provider for cloud virtual private servers"; - mainProgram = "hcloud"; - homepage = "https://github.com/hetznercloud/cli"; - license = licenses.mit; - maintainers = with maintainers; [ zauberpony techknowlogick ]; - }; -} diff --git a/pkgs/development/tools/headache/default.nix b/pkgs/development/tools/headache/default.nix deleted file mode 100644 index b5f5e55f3f79..000000000000 --- a/pkgs/development/tools/headache/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, fetchFromGitHub, nix-update-script, ocamlPackages }: - -let - inherit (ocamlPackages) buildDunePackage camomile; -in - -buildDunePackage rec { - pname = "headache"; - version = "1.08"; - - src = fetchFromGitHub { - owner = "frama-c"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-UXQIIsCyJZN4qos7Si7LLm9vQueOduUmLeYHuyT2GZo="; - }; - - propagatedBuildInputs = [ - camomile - ]; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - homepage = "https://github.com/frama-c/${pname}"; - description = "Lightweight tool for managing headers in source code files"; - mainProgram = "headache"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ niols ]; - }; -} diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix deleted file mode 100644 index 638d046aa675..000000000000 --- a/pkgs/development/tools/heroku/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, lib, fetchzip, makeWrapper, nodejs, writeScript }: - -stdenv.mkDerivation { - pname = "heroku"; - version = "9.2.1"; - - src = fetchzip { - url = "https://cli-assets.heroku.com/versions/9.2.1/6e4f307/heroku-v9.2.1-6e4f307-linux-x64.tar.xz"; - hash = "sha256-9MeZx4LmKyh3DSIz+ZZVY/qpFDqk5oE4P/MIUQPmRb8="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/share/heroku $out/bin - cp -pr * $out/share/heroku - substituteInPlace $out/share/heroku/bin/run \ - --replace "/usr/bin/env node" "${nodejs}/bin/node" - makeWrapper $out/share/heroku/bin/run $out/bin/heroku \ - --set HEROKU_DISABLE_AUTOUPDATE 1 - ''; - - passthru.updateScript = writeScript "update-heroku" '' - #!/usr/bin/env nix-shell - #!nix-shell -I nixpkgs=./. -i bash -p nix-prefetch curl jq common-updater-scripts - resp="$( - curl -L "https://cli-assets.heroku.com/versions/heroku-linux-x64-tar-xz.json" \ - | jq '[to_entries[] | { version: .key, url: .value } | select(.version|contains("-")|not)] | sort_by(.version|split(".")|map(tonumber)) | .[-1]' - )" - url="$(jq <<<"$resp" .url --raw-output)" - version="$(jq <<<"$resp" .version --raw-output)" - hash="$(nix-prefetch fetchzip --url "$(jq <<<"$resp" .url --raw-output)")" - update-source-version heroku "$version" "$hash" "$url" - ''; - - meta = { - homepage = "https://devcenter.heroku.com/articles/heroku-cli"; - description = "Everything you need to get started using Heroku"; - mainProgram = "heroku"; - maintainers = with lib.maintainers; [ aflatter mirdhyn ]; - license = lib.licenses.mit; - platforms = with lib.platforms; unix; - }; -} diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix deleted file mode 100644 index 0b4e474515ab..000000000000 --- a/pkgs/development/tools/hexio/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pcsclite, pth, python2 }: - -stdenv.mkDerivation rec { - pname = "hexio"; - version = "1.0-RC1"; - - src = fetchFromGitHub { - sha256 = "08jxkdi0gjsi8s793f9kdlad0a58a0xpsaayrsnpn9bpmm5cgihq"; - rev = "version-${version}"; - owner = "vanrein"; - repo = "hexio"; - }; - - strictDeps = true; - - buildInputs = [ pcsclite pth python2 ]; - - patchPhase = '' - substituteInPlace Makefile \ - --replace '-I/usr/local/include/PCSC/' '-I${lib.getDev pcsclite}/include/PCSC/' \ - --replace '-L/usr/local/lib/pth' '-I${pth}/lib/' - ''; - - installPhase = '' - mkdir -p $out/bin $out/lib $out/sbin $out/man - make DESTDIR=$out PREFIX=/ all - make DESTDIR=$out PREFIX=/ install - ''; - - meta = with lib; { - description = "Low-level I/O helpers for hexadecimal, tty/serial devices and so on"; - homepage = "https://github.com/vanrein/hexio"; - license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ leenaars ]; - }; -} diff --git a/pkgs/development/tools/hexo-cli/default.nix b/pkgs/development/tools/hexo-cli/default.nix deleted file mode 100644 index be5764c9f0c3..000000000000 --- a/pkgs/development/tools/hexo-cli/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "hexo-cli"; - version = "4.3.1"; - - src = fetchFromGitHub { - owner = "hexojs"; - repo = "hexo-cli"; - rev = "v${version}"; - hash = "sha256-mtbg9Fa9LBqG/aNfm4yEo4ymuaxuqhymkO1q6mYA2Fs="; - }; - - npmDepsHash = "sha256-VCHG1YMPRwEBbwgscSv6V+fTNVRpsCxWeyO8co4Zy6k="; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -r bin/ dist/ node_modules/ package.json $out/ - - runHook postInstall - ''; - - meta = { - description = "Command line interface for Hexo"; - mainProgram = "hexo"; - homepage = "https://hexo.io/"; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/tools/hobbes/default.nix b/pkgs/development/tools/hobbes/default.nix deleted file mode 100644 index d4a76bf29183..000000000000 --- a/pkgs/development/tools/hobbes/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib -, stdenv -, llvmPackages -, fetchFromGitHub -, fetchpatch -, cmake -, llvm_12 -, ncurses -, readline -, zlib -, libxml2 -, python3 -}: -llvmPackages.stdenv.mkDerivation { - pname = "hobbes"; - version = "0-unstable-2023-06-03"; - - src = fetchFromGitHub { - owner = "morganstanley"; - repo = "hobbes"; - rev = "88a712b85bc896a4c87e60c12321445f1cdcfd00"; - hash = "sha256-2v0yk35/cLKTjX0Qbc8cjc7Y6bamRSa9GpPvGoxL2Cw="; - }; - - patches = [ - # fix build for LLVM-12+ - # https://github.com/morganstanley/hobbes/pull/452 - (fetchpatch { - name = "include-cstdint.patch"; - url = "https://github.com/morganstanley/hobbes/commit/924b71fca06c61e606792cc8db8521fb499d4237.patch"; - hash = "sha256-/VsWtTYc3LBOnm4Obgx/MOqaaWZhUc8yzmkygtNz+mY="; - }) - ]; - - # only one warning generated. try to remove on next update - env.CXXFLAGS = "-Wno-error=deprecated-copy"; - - # TODO: re-enable Python tests once they work on Python 3 - # currently failing with "I don't know how to decode the primitive type: b'bool'" - postPatch = '' - rm test/Python.C - ''; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - llvm_12 - ncurses - readline - zlib - libxml2 - python3 - ]; - - doCheck = true; - checkTarget = "test"; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "Language and an embedded JIT compiler"; - longDescription = '' - Hobbes is a a language, embedded compiler, and runtime for efficient - dynamic expression evaluation, data storage and analysis. - ''; - homepage = "https://github.com/morganstanley/hobbes"; - license = licenses.asl20; - maintainers = with maintainers; [ kthielen thmzlt ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - }; -} diff --git a/pkgs/development/tools/hors/default.nix b/pkgs/development/tools/hors/default.nix index 4ecea68c18ec..03f53f1eabaf 100644 --- a/pkgs/development/tools/hors/default.nix +++ b/pkgs/development/tools/hors/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-1PB/JvgfC6qABI+cIePqtsSlZXPqMGQIay9SCXJkV9o="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # requires network access doCheck = false; diff --git a/pkgs/development/tools/hostess/default.nix b/pkgs/development/tools/hostess/default.nix deleted file mode 100644 index efc849f0651d..000000000000 --- a/pkgs/development/tools/hostess/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "hostess"; - version = "0.5.2"; - - src = fetchFromGitHub { - owner = "cbednarski"; - repo = pname; - rev = "v${version}"; - sha256 = "1izszf60nsa6pyxx3kd8qdrz3h47ylm17r9hzh9wk37f61pmm42j"; - }; - - subPackages = [ "." ]; - - vendorHash = null; - - meta = with lib; { - description = "Idempotent command-line utility for managing your /etc/hosts* file"; - mainProgram = "hostess"; - license = licenses.mit; - maintainers = with maintainers; [ edlimerkaj ]; - }; -} diff --git a/pkgs/development/tools/hotdoc/default.nix b/pkgs/development/tools/hotdoc/default.nix index 11d9cf11b152..9a1bfe9ded9e 100644 --- a/pkgs/development/tools/hotdoc/default.nix +++ b/pkgs/development/tools/hotdoc/default.nix @@ -91,7 +91,7 @@ buildPythonApplication rec { disabledTests = [ # Test does not correctly handle path normalization for test comparison "test_cli_overrides" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Test does not correctly handle absolute /home paths on Darwin (even fake ones) "test_index" ]; @@ -101,8 +101,8 @@ buildPythonApplication rec { substituteInPlace hotdoc/extensions/c/c_extension.py \ --replace "shutil.which('llvm-config')" 'True' \ --replace "subprocess.check_output(['llvm-config', '--version']).strip().decode()" '"${lib.versions.major llvmPackages.libclang.version}"' \ - --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${llvmPackages.libclang.lib}"' \ - --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${llvmPackages.libclang.lib}/lib"' + --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${lib.getLib llvmPackages.libclang}"' \ + --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${lib.getLib llvmPackages.libclang}/lib"' ''; # Make pytest run from a temp dir to have it pick up installed package for cmark diff --git a/pkgs/development/tools/hover/default.nix b/pkgs/development/tools/hover/default.nix deleted file mode 100644 index b661adaac136..000000000000 --- a/pkgs/development/tools/hover/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ lib -, buildGoModule -, buildFHSEnv -, binutils -, dejavu_fonts -, pkg-config -, fetchFromGitHub -, roboto -, xorg -, libglvnd -, addDriverRunpath -, makeWrapper -, gcc -, go -, flutter -}: - -let - pname = "hover"; - version = "0.47.0"; - - libs = with xorg; [ - libX11.dev - libXcursor.dev - libXext.dev - libXi.dev - libXinerama.dev - libXrandr.dev - libXrender.dev - libXfixes.dev - libXxf86vm - libglvnd.dev - xorgproto - ]; - hover = buildGoModule rec { - inherit pname version; - - meta = with lib; { - description = "Build tool to run Flutter applications on desktop"; - homepage = "https://github.com/go-flutter-desktop/hover"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ ericdallo ]; - }; - - subPackages = [ "." ]; - - vendorHash = "sha256-GDoX5d2aDfaAx9JsKuS4r8137t3swT6rgcCghmaThSM="; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "go-flutter-desktop"; - repo = pname; - sha256 = "sha256-ch59Wx4g72u7x99807ppURI4I+5aJ/W8Zr35q8X68v4="; - }; - - nativeBuildInputs = [ addDriverRunpath makeWrapper ]; - - buildInputs = libs; - - checkRun = false; - - patches = [ - ./fix-assets-path.patch - ]; - - postPatch = '' - sed -i 's|@assetsFolder@|'"''${out}/share/assets"'|g' internal/fileutils/assets.go - ''; - - postInstall = '' - mkdir -p $out/share - cp -r assets $out/share/assets - chmod -R a+rx $out/share/assets - - wrapProgram "$out/bin/hover" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath libs} - ''; - - postFixup = '' - addDriverRunpath $out/bin/hover - ''; - }; - -in -buildFHSEnv rec { - inherit pname version; - targetPkgs = pkgs: [ - binutils - dejavu_fonts - flutter - gcc - go - hover - pkg-config - roboto - ] ++ libs; - - runScript = "hover"; -} diff --git a/pkgs/development/tools/hover/fix-assets-path.patch b/pkgs/development/tools/hover/fix-assets-path.patch deleted file mode 100644 index 00b1900bf776..000000000000 --- a/pkgs/development/tools/hover/fix-assets-path.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/internal/fileutils/assets.go b/internal/fileutils/assets.go -index 83eacd9..0b80e51 100644 ---- a/internal/fileutils/assets.go -+++ b/internal/fileutils/assets.go -@@ -1,28 +1,7 @@ - //go:generate rice embed - package fileutils - --import ( -- "os" -- "sync" -- -- rice "github.com/GeertJohan/go.rice" -- "github.com/go-flutter-desktop/hover/internal/log" --) -- --var ( -- assetsBox *rice.Box -- assetsBoxOnce sync.Once --) -- - // AssetsBox hover's assets box --func AssetsBox() *rice.Box { -- assetsBoxOnce.Do(func() { -- var err error -- assetsBox, err = rice.FindBox("../../assets") -- if err != nil { -- log.Errorf("Failed to find hover assets: %v", err) -- os.Exit(1) -- } -- }) -- return assetsBox -+func AssetsBox() string { -+ return "@assetsFolder@" - } -diff --git a/internal/fileutils/file.go b/internal/fileutils/file.go -index cb75563..3822e80 100644 ---- a/internal/fileutils/file.go -+++ b/internal/fileutils/file.go -@@ -11,8 +11,6 @@ import ( - "strings" - "text/template" - -- rice "github.com/GeertJohan/go.rice" -- - "github.com/go-flutter-desktop/hover/internal/log" - ) - -@@ -215,24 +213,24 @@ func ExecuteTemplateFromFile(boxed, to string, templateData interface{}) { - } - - // ExecuteTemplateFromAssetsBox create file from a template asset --func ExecuteTemplateFromAssetsBox(boxed, to string, assetsBox *rice.Box, templateData interface{}) { -- templateString, err := assetsBox.String(boxed) -+func ExecuteTemplateFromAssetsBox(boxed, to string, assetsBox string, templateData interface{}) { -+ templateString, err := ioutil.ReadFile(assetsBox + "/" + boxed) - if err != nil { - log.Errorf("Failed to find template file: %v\n", err) - os.Exit(1) - } -- executeTemplateFromString(templateString, to, templateData) -+ executeTemplateFromString(string(templateString), to, templateData) - } - - // CopyAsset copies a file from asset --func CopyAsset(boxed, to string, assetsBox *rice.Box) { -+func CopyAsset(boxed string, to string, assetsBox string) { - file, err := os.Create(to) - if err != nil { - log.Errorf("Failed to create %s: %v", to, err) - os.Exit(1) - } - defer file.Close() -- boxedFile, err := assetsBox.Open(boxed) -+ boxedFile, err := os.OpenFile(assetsBox + "/" + boxed, os.O_RDONLY, 0666) - if err != nil { - log.Errorf("Failed to find boxed file %s: %v", boxed, err) - os.Exit(1) diff --git a/pkgs/development/tools/hred/default.nix b/pkgs/development/tools/hred/default.nix deleted file mode 100644 index 8de5ec2a5f63..000000000000 --- a/pkgs/development/tools/hred/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, buildNpmPackage, fetchFromGitHub, runCommand, hred, jq }: - -buildNpmPackage rec { - pname = "hred"; - version = "1.5.0"; - - src = fetchFromGitHub { - owner = "danburzo"; - repo = "hred"; - rev = "v${version}"; - hash = "sha256-rnobJG9Z1lXEeFm+c0f9OsbiTzxeP3+zut5LYpGzWfc="; - }; - - npmDepsHash = "sha256-POxlGWK0TJMwNWDpiK5+OXLGtAx4lFJO3imoe/h+7Sc="; - - dontNpmBuild = true; - - passthru.tests = { - simple = runCommand "${pname}-test" {} '' - set -e -o pipefail - echo '<i id="foo">bar</i>' | ${hred}/bin/hred 'i#foo { @id => id, @.textContent => text }' -c | ${jq}/bin/jq -c > $out - [ "$(cat $out)" = '{"id":"foo","text":"bar"}' ] - ''; - }; - - meta = { - description = "Command-line tool to extract data from HTML"; - mainProgram = "hred"; - license = lib.licenses.mit; - homepage = "https://github.com/danburzo/hred"; - maintainers = with lib.maintainers; [ tejing ]; - }; -} diff --git a/pkgs/development/tools/html-minifier/default.nix b/pkgs/development/tools/html-minifier/default.nix deleted file mode 100644 index 6fd239fa816c..000000000000 --- a/pkgs/development/tools/html-minifier/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "html-minifier"; - version = "4.0.0"; - - src = fetchFromGitHub { - owner = "kangax"; - repo = "html-minifier"; - rev = "v${version}"; - hash = "sha256-OAykAqBxgr7tbeXXfSH23DALf7Eoh3VjDKNKWGAL3+A="; - }; - - npmDepsHash = "sha256-VWXc/nBXgvSE/DoLHR4XTFQ5kuwWC1m0/cj1CndfPH8="; - - npmFlags = [ "--ignore-scripts" ]; - - dontNpmBuild = true; - - meta = { - description = "Highly configurable, well-tested, JavaScript-based HTML minifier"; - homepage = "https://github.com/kangax/html-minifier"; - license = lib.licenses.mit; - mainProgram = "html-minifier"; - maintainers = with lib.maintainers; [ chris-martin ]; - }; -} diff --git a/pkgs/development/tools/htmlhint/default.nix b/pkgs/development/tools/htmlhint/default.nix deleted file mode 100644 index 6d70819515d1..000000000000 --- a/pkgs/development/tools/htmlhint/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "htmlhint"; - version = "1.1.4"; - - src = fetchFromGitHub { - owner = "htmlhint"; - repo = "HTMLHint"; - rev = "v${version}"; - hash = "sha256-6R+/uwqWpuTjUnFeUFMzZBzhlFBxYceYZfLLuaYhc6k="; - }; - - npmDepsHash = "sha256-m5hHxA2YTk7qNpc1Z6TXxNTfIMY5LCM9Il9JHJxQJlI="; - - meta = { - changelog = "https://github.com/htmlhint/HTMLHint/blob/${src.rev}/CHANGELOG.md"; - description = "Static code analysis tool for HTML"; - homepage = "https://github.com/htmlhint/HTMLHint"; - license = lib.licenses.mit; - mainProgram = "htmlhint"; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/htmlq/default.nix b/pkgs/development/tools/htmlq/default.nix index 7e55740d03ba..e9767ca60029 100644 --- a/pkgs/development/tools/htmlq/default.nix +++ b/pkgs/development/tools/htmlq/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-r9EnQQPGpPIcNYb1eqGrMnRdh0snIa5iVsTYTI+YErY="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; doCheck = false; diff --git a/pkgs/development/tools/htmltest/default.nix b/pkgs/development/tools/htmltest/default.nix deleted file mode 100644 index cbb82695a46e..000000000000 --- a/pkgs/development/tools/htmltest/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, lib -}: - -buildGoModule rec { - pname = "htmltest"; - version = "0.17.0"; - - src = fetchFromGitHub { - owner = "wjdp"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-8tkk476kGEfHo3XGu3/0r6fhX1c4vkYiUACpw0uEu2g="; - }; - - vendorHash = "sha256-dTn5aYb5IHFbksmhkXSTJtI0Gnn8Uz0PMZPFzFKMo38="; - - ldflags = [ - "-w" - "-s" - "-X main.version=${version}" - ]; - - # tests require network access - doCheck = false; - - meta = with lib; { - description = "Tool to test generated HTML output"; - mainProgram = "htmltest"; - longDescription = '' - htmltest runs your HTML output through a series of checks to ensure all your - links, images, scripts references work, your alt tags are filled in, etc. - ''; - homepage = "https://github.com/wjdp/htmltest"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix index 584b8856e89f..e368d608d593 100644 --- a/pkgs/development/tools/iaca/2.1.nix +++ b/pkgs/development/tools/iaca/2.1.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp bin/iaca $out/bin/ cp lib/* $out/lib ''; - preFixup = let libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib gcc ]; in '' + preFixup = let libPath = lib.makeLibraryPath [ stdenv.cc.cc gcc ]; in '' patchelf \ --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \ --set-rpath $out/lib:"${libPath}" \ diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix deleted file mode 100644 index 21c1b5324459..000000000000 --- a/pkgs/development/tools/icr/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, fetchFromGitHub -, crystal -, shards -, makeWrapper -, pkg-config -, which -, openssl -, readline -, libyaml -, zlib -}: - -crystal.buildCrystalPackage rec { - pname = "icr"; - version = "0.9.0"; - - src = fetchFromGitHub { - owner = "crystal-community"; - repo = "icr"; - rev = "v${version}"; - hash = "sha256-29B/i8oEjwNOYjnc78QcYTl6fC/M9VfAVCCBjLBKp0Q="; - }; - - shardsFile = ./shards.nix; - - buildInputs = [ libyaml openssl readline zlib ]; - - nativeBuildInputs = [ makeWrapper pkg-config which ]; - - # tests are failing due to our sandbox - doCheck = false; - - postFixup = '' - wrapProgram $out/bin/icr \ - --prefix PATH : ${lib.makeBinPath [ crystal shards which ]} - ''; - - meta = with lib; { - description = "Interactive console for the Crystal programming language"; - mainProgram = "icr"; - homepage = "https://github.com/crystal-community/icr"; - license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/development/tools/icr/shards.nix b/pkgs/development/tools/icr/shards.nix deleted file mode 100644 index 8f880fa9a6f0..000000000000 --- a/pkgs/development/tools/icr/shards.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - readline = { - url = "https://github.com/crystal-lang/crystal-readline.git"; - rev = "0fb7d186da8e1b157998d98d1c96e99699b791eb"; - sha256 = "1rk27vw3ssldgnfgprwvz2gag02v4g6d6yg56b3sk9w3fn8jyyi8"; - }; -} diff --git a/pkgs/development/tools/iferr/default.nix b/pkgs/development/tools/iferr/default.nix deleted file mode 100644 index bf970ce1e9de..000000000000 --- a/pkgs/development/tools/iferr/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ buildGoModule -, lib -, fetchFromGitHub -}: - -buildGoModule { - pname = "iferr"; - version = "0-unstable-2024-01-22"; - - src = fetchFromGitHub { - owner = "koron"; - repo = "iferr"; - rev = "9c3e2fbe4bd19a7f0338e42bb483562ed4cf4d50"; - hash = "sha256-qGuSsdQorb407rDl2o7w7kPCLng3W7YQsqo5JpoZFW8="; - }; - - vendorHash = null; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = ''Generate "if err != nil {" block''; - homepage = "https://github.com/koron/iferr"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; - mainProgram = "iferr"; - }; -} diff --git a/pkgs/development/tools/img/default.nix b/pkgs/development/tools/img/default.nix deleted file mode 100644 index f7c751cf0ea3..000000000000 --- a/pkgs/development/tools/img/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, lib -, makeWrapper -, runc -, wrapperDir ? "/run/wrappers/bin" # Default for NixOS, other systems might need customization. -}: - -buildGoModule rec { - pname = "img"; - version = "0.5.11"; - - src = fetchFromGitHub { - owner = "genuinetools"; - repo = "img"; - rev = "v${version}"; - sha256 = "0r5hihzp2679ki9hr3p0f085rafy2hc8kpkdhnd4m5k4iibqib08"; - }; - - vendorHash = null; - - postPatch = '' - V={newgidmap,newgidmap} \ - substituteInPlace ./internal/unshare/unshare.c \ - --replace "/usr/bin/$V" "${wrapperDir}/$V" - ''; - - nativeBuildInputs = [ - makeWrapper - ]; - - tags = [ - "seccomp" - "noembed" # disables embedded `runc` - ]; - - ldflags = [ - "-X github.com/genuinetools/img/version.VERSION=v${version}" - "-s -w" - ]; - - postInstall = '' - wrapProgram "$out/bin/img" --prefix PATH : ${lib.makeBinPath [ runc ]} - ''; - - # Tests fail as: internal/binutils/install.go:57:15: undefined: Asset - doCheck = false; - - meta = with lib; { - description = "Standalone, daemon-less, unprivileged Dockerfile and OCI compatible container image builder."; - mainProgram = "img"; - license = licenses.mit; - homepage = "https://github.com/genuinetools/img"; - maintainers = with maintainers; [ bryanasdev000 ]; - }; -} diff --git a/pkgs/development/tools/impl/default.nix b/pkgs/development/tools/impl/default.nix deleted file mode 100644 index c33389af05e5..000000000000 --- a/pkgs/development/tools/impl/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ buildGoModule, lib, fetchFromGitHub }: - -buildGoModule rec { - pname = "impl"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "josharian"; - repo = "impl"; - rev = "v${version}"; - hash = "sha256-a9jAoZp/wVnTyaE4l2yWSf5aSxXEtqN6SoxU68XhRhk="; - }; - - vendorHash = "sha256-vTqDoM/LK5SHkayLKYig+tCrXLelOoILmQGCxlTWHog="; - - meta = with lib; { - description = "Generate method stubs for implementing an interface"; - mainProgram = "impl"; - homepage = "https://github.com/josharian/impl"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; - }; -} diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix deleted file mode 100644 index 0febc4db51e7..000000000000 --- a/pkgs/development/tools/ineffassign/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, go -}: - -buildGoModule rec { - pname = "ineffassign"; - version = "unstable-2021-09-04"; - rev = "4cc7213b9bc8b868b2990c372f6fa057fa88b91c"; - - src = fetchFromGitHub { - owner = "gordonklaus"; - repo = "ineffassign"; - inherit rev; - sha256 = "sha256-XLXANN9TOmrNOixWtlqnIC27u+0TW2P3s9MyeyVUcAQ="; - }; - - vendorHash = "sha256-QTgWicN2m2ughtLsEBMaQWfpDbmbL0nS5qaIKF3mTJM="; - - allowGoReference = true; - - nativeCheckInputs = [ go ]; - - meta = with lib; { - description = "Detect ineffectual assignments in Go code"; - mainProgram = "ineffassign"; - homepage = "https://github.com/gordonklaus/ineffassign"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; - }; -} diff --git a/pkgs/development/tools/inferno/default.nix b/pkgs/development/tools/inferno/default.nix deleted file mode 100644 index 9657129fd0cb..000000000000 --- a/pkgs/development/tools/inferno/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "inferno"; - version = "0.11.20"; - - src = fetchFromGitHub { - owner = "jonhoo"; - repo = pname; - rev = "v${version}"; - hash = "sha256-+A27B50hRAQvk0QrcCP0QQe6zJkVUIX7qggL8kjJmQY="; - fetchSubmodules = true; - }; - - cargoHash = "sha256-XmxB18IQh2Bvbez6BowoV+P0qghmOcHpC0ZH4PgsIZo="; - - # skip flaky tests - checkFlags = [ - "--skip=collapse::dtrace::tests::test_collapse_multi_dtrace" - "--skip=collapse::dtrace::tests::test_collapse_multi_dtrace_simple" - "--skip=collapse::perf::tests::test_collapse_multi_perf" - "--skip=collapse::perf::tests::test_collapse_multi_perf_simple" - "--skip=flamegraph_base_symbol" - "--skip=flamegraph_multiple_base_symbol" - ]; - - meta = with lib; { - description = "Port of parts of the flamegraph toolkit to Rust"; - homepage = "https://github.com/jonhoo/inferno"; - changelog = "https://github.com/jonhoo/inferno/blob/v${version}/CHANGELOG.md"; - license = licenses.cddl; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix index 665dda06b2fc..b7e7c349f045 100644 --- a/pkgs/development/tools/infisical/default.nix +++ b/pkgs/development/tools/infisical/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, testers, infisical, installShellFiles }: +{ stdenv, lib, fetchurl, testers, installShellFiles }: # this expression is mostly automated, and you are STRONGLY # RECOMMENDED to use to nix-update for updating this expression when new @@ -15,7 +15,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # the version of infisical - version = "0.30.0"; + version = "0.31.2"; # the platform-specific, statically linked binary src = @@ -36,7 +36,7 @@ let fetchurl { inherit name url hash; }; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "infisical"; version = version; inherit src; @@ -63,7 +63,7 @@ stdenv.mkDerivation { passthru = { updateScript = ./update.sh; - tests.version = testers.testVersion { package = infisical; }; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; }; meta = with lib; { @@ -84,4 +84,4 @@ stdenv.mkDerivation { "x86_64-darwin" ]; }; -} +}) diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json index 9d9f1ecee3b2..7346d8e18b64 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-ZOwPZTTM/UoezgBojXaR4/35JIw6DCplY09brTCgHP4=" -, "x86_64-darwin": "sha256-b4Xxbu+bYZSlRlKv7kE7jNrruRiOy16oidQEke6HGzE=" -, "aarch64-linux": "sha256-OMdHZKwpTWHbfG9jyWs3bZP6pUqIv5ErZonvzwPkfvM=" -, "aarch64-darwin": "sha256-hG1rDxcXn70j1AVpp07se5jPIQE+de2PoMlnhZYeIzk=" +, "x86_64-linux": "sha256-vNA6bhbgfzWRSlIitA9VJVOxe+LF3ra6q6lJY1NW13w=" +, "x86_64-darwin": "sha256-p+iis192d77vRWbPtWiFWZSgzdNY3K7VeDmmc7AbBtg=" +, "aarch64-linux": "sha256-IeCyJT8KF3Kh4XXfKmsKAewZWW3C9Gz3GQseMd0WMUw=" +, "aarch64-darwin": "sha256-vXS8YbLb2tCqaGEJSmS147b0m1OMZTFZ5Ou2vtegFWo=" } diff --git a/pkgs/development/tools/initool/default.nix b/pkgs/development/tools/initool/default.nix deleted file mode 100644 index 1b3c3f05eac9..000000000000 --- a/pkgs/development/tools/initool/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv -, mlton -, lib -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "initool"; - version = "0.18.0"; - - src = fetchFromGitHub { - owner = "dbohdan"; - repo = pname; - rev = "v${version}"; - hash = "sha256-f426yzSYcrhd0MOZc5vDg4T4m/RdWzTz/KPzb65h03U="; - }; - - nativeBuildInputs = [ mlton ]; - - doCheck = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp initool $out/bin/ - - runHook postInstall - ''; - - meta = with lib; { - inherit (mlton.meta) platforms; - - description = "Manipulate INI files from the command line"; - mainProgram = "initool"; - homepage = "https://github.com/dbohdan/initool"; - license = licenses.mit; - maintainers = with maintainers; [ e1mo ]; - changelog = "https://github.com/dbohdan/initool/releases/tag/v${version}"; - }; -} - diff --git a/pkgs/development/tools/jake/default.nix b/pkgs/development/tools/jake/default.nix deleted file mode 100644 index b91a779cb53c..000000000000 --- a/pkgs/development/tools/jake/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "jake"; - version = "10.8.7"; - - src = fetchFromGitHub { - owner = "jakejs"; - repo = "jake"; - rev = "v${version}"; - hash = "sha256-Qado9huQx9MVTFp8t7szB+IUVNWQqT/ni62JnURQqeM="; - }; - - npmDepsHash = "sha256-3pOFrH/em/HMTswrZLAeqPAb9U0/odcZPt4AkQkMhZM="; - - dontNpmBuild = true; - - meta = { - description = "JavaScript build tool, similar to Make or Rake"; - homepage = "https://github.com/jakejs/jake"; - license = lib.licenses.asl20; - mainProgram = "jake"; - maintainers = with lib.maintainers; [ jasoncarr ]; - }; -} diff --git a/pkgs/development/tools/jaq/default.nix b/pkgs/development/tools/jaq/default.nix deleted file mode 100644 index 8304303d301f..000000000000 --- a/pkgs/development/tools/jaq/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "jaq"; - version = "1.6.0"; - - src = fetchFromGitHub { - owner = "01mf02"; - repo = "jaq"; - rev = "v${version}"; - hash = "sha256-VD10BO7bxTmD1A1AZsiEiYBsVhAKlXxdHNMmXqpvpKM="; - }; - - cargoHash = "sha256-7MK0iLBpjvWE7UH5Tb3qIm2XnEVsAvBy34Ed4wHagZQ="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - meta = with lib; { - description = "Jq clone focused on correctness, speed and simplicity"; - homepage = "https://github.com/01mf02/jaq"; - changelog = "https://github.com/01mf02/jaq/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda siraben ]; - mainProgram = "jaq"; - }; -} diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix deleted file mode 100644 index 9604b8df2ff1..000000000000 --- a/pkgs/development/tools/java/cfr/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, makeWrapper, fetchurl, jre }: - -stdenv.mkDerivation rec { - pname = "cfr"; - version = "0.152"; - - src = fetchurl { - url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "sha256-9obo897Td9e8h9IWqQ6elRLfQVbnWwbGVaFmSK6HZbI="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - jar=$out/share/java/cfr_${version}.jar - install -Dm444 $src $jar - makeWrapper ${jre}/bin/java $out/bin/cfr --add-flags "-jar $jar" - ''; - - meta = with lib; { - description = "Another java decompiler"; - mainProgram = "cfr"; - longDescription = '' - CFR will decompile modern Java features - Java 8 lambdas (pre and post - Java beta 103 changes), Java 7 String switches etc, but is written - entirely in Java 6. - ''; - homepage = "http://www.benf.org/other/cfr/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.mit; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/java/dex2jar/default.nix b/pkgs/development/tools/java/dex2jar/default.nix deleted file mode 100644 index e0ce19dc8d2f..000000000000 --- a/pkgs/development/tools/java/dex2jar/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenvNoCC -, fetchurl -, jre -, makeWrapper -, unzip -}: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "dex2jar"; - version = "2.4"; - - src = fetchurl { - url = "https://github.com/pxb1988/dex2jar/releases/download/v${finalAttrs.version}/dex-tools-v${finalAttrs.version}.zip"; - hash = "sha256-7nxF6zwdJHSmFF2NRH5lGnNqItlmS209O+WlqBfdojo="; - }; - - nativeBuildInputs = [ makeWrapper unzip ]; - - postPatch = '' - rm *.bat - chmod +x *.sh - ''; - - installPhase = '' - f=$out/share/dex2jar/ - - mkdir -p $f $out/bin - - mv * $f - for i in $f/*.sh; do - n=$(basename ''${i%.sh}) - makeWrapper $i $out/bin/$n --prefix PATH : ${lib.makeBinPath [ jre ] } - done - ''; - - meta = with lib; { - homepage = "https://github.com/pxb1988/dex2jar"; - description = "Tools to work with android .dex and java .class files"; - maintainers = with maintainers; [ makefu ]; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.asl20; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/tools/java/java-language-server/default.nix b/pkgs/development/tools/java/java-language-server/default.nix deleted file mode 100644 index 723937f8f535..000000000000 --- a/pkgs/development/tools/java/java-language-server/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, jdk_headless, maven -, makeWrapper -}: - -let - platform = - if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "mac" - else if stdenv.isWindows then "windows" - else throw "unsupported platform"; -in -maven.buildMavenPackage rec { - pname = "java-language-server"; - version = "0.2.46"; - - src = fetchFromGitHub { - owner = "georgewfraser"; - repo = pname; - # commit hash is used as owner sometimes forgets to set tags. See https://github.com/georgewfraser/java-language-server/issues/104 - rev = "d7f4303cd233cdad84daffbb871dd4512a2c8da2"; - sha256 = "sha256-BIcfwz+pLQarnK8XBPwDN2nrdvK8xqUo0XFXk8ZV/h0="; - }; - - mvnFetchExtraArgs.dontConfigure = true; - mvnJdk = jdk_headless; - mvnHash = "sha256-2uthmSjFQ43N5lgV11DsxuGce+ZptZsmRLTgjDo0M2w="; - - nativeBuildInputs = [ jdk_headless makeWrapper ]; - - dontConfigure = true; - preBuild = '' - jlink \ - ${lib.optionalString (!stdenv.isDarwin) "--module-path './jdks/${platform}/jdk-13/jmods'"} \ - --add-modules java.base,java.compiler,java.logging,java.sql,java.xml,jdk.compiler,jdk.jdi,jdk.unsupported,jdk.zipfs \ - --output dist/${platform} \ - --no-header-files \ - --no-man-pages \ - --compress 2 - ''; - - doCheck = false; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/java/java-language-server - cp -r dist/classpath dist/*${platform}* $out/share/java/java-language-server - - # a link is not used as lang_server_${platform}.sh makes use of "dirname $0" to access other files - makeWrapper $out/share/java/java-language-server/lang_server_${platform}.sh $out/bin/java-language-server - - runHook postInstall - ''; - - meta = with lib; { - description = "Java language server based on v3.0 of the protocol and implemented using the Java compiler API"; - mainProgram = "java-language-server"; - homepage = "https://github.com/georgewfraser/java-language-server"; - license = licenses.mit; - maintainers = with maintainers; [ hqurve ]; - }; -} diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/development/tools/java/jhiccup/default.nix deleted file mode 100644 index 453455dcd118..000000000000 --- a/pkgs/development/tools/java/jhiccup/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchzip }: - -stdenv.mkDerivation rec { - pname = "jhiccup"; - version = "2.0.10"; - - src = fetchzip { - url = "https://www.azul.com/files/jHiccup-${version}-dist.zip"; - sha256 = "1hsvi8wjh615fnjf75h7b5afp04chqcgvini30vfcn3m9a5icbgy"; - }; - - dontConfigure = true; - buildPhase = ":"; - installPhase = '' - mkdir -p $out/bin $out/share/java - cp *.jar $out/share/java - - # Fix version number (out of date at time of import), and path to - # jHiccup.jar - for x in ./jHiccup ./jHiccupLogProcessor; do - substituteInPlace $x \ - --replace 'JHICCUP_Version=2.0.5' 'JHICCUP_Version=${version}' \ - --replace '$INSTALLED_PATH' $out/share/java - done - - mv jHiccup jHiccupLogProcessor $out/bin/ - ''; - - meta = { - description = "Measure JVM application stalls and GC pauses"; - homepage = "https://www.azul.com/jhiccup/"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.cc0; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ thoughtpolice ]; - }; -} diff --git a/pkgs/development/tools/java/jprofiler/default.nix b/pkgs/development/tools/java/jprofiler/default.nix index 7f74d8665a80..3e86ea7b702a 100644 --- a/pkgs/development/tools/java/jprofiler/default.nix +++ b/pkgs/development/tools/java/jprofiler/default.nix @@ -26,7 +26,7 @@ let maintainers = with maintainers; [ catap ]; }; - src = if stdenv.isLinux then fetchurl { + src = if stdenv.hostPlatform.isLinux then fetchurl { url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_linux_${lib.replaceStrings ["."] ["_"] version}.tar.gz"; hash = "sha256-orjBSaC7NvKcak+RSEa9V05oL3EZIBnp7TyaX/8XFyg="; } else fetchurl { @@ -39,15 +39,17 @@ let hash = "sha256-4T0j2ctHmgWOSCmFG2PZCLJS57nIa5MxmJBpMYzy9FI="; }; - desktopItems = makeDesktopItem { - name = pname; - exec = pname; - icon = pname; - comment = meta.description; - desktopName = nameApp; - genericName = "Java Profiler Tool"; - categories = [ "Development" ]; - }; + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + comment = meta.description; + desktopName = nameApp; + genericName = "Java Profiler Tool"; + categories = [ "Development" ]; + }) + ]; linux = stdenv.mkDerivation { inherit pname version src desktopItems; @@ -99,4 +101,4 @@ let meta = meta // { platforms = lib.platforms.darwin; }; }; in -if stdenv.isDarwin then darwin else linux +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/development/tools/java/sawjap/default.nix b/pkgs/development/tools/java/sawjap/default.nix deleted file mode 100644 index bc48b0342ab2..000000000000 --- a/pkgs/development/tools/java/sawjap/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, ocamlPackages }: - -let inherit (ocamlPackages) ocaml findlib sawja; in - -stdenv.mkDerivation { - - pname = "sawjap"; - - inherit (sawja) src version; - - prePatch = "cd test"; - - strictDeps = true; - - nativeBuildInputs = [ ocaml findlib ]; - buildInputs = [ sawja ]; - - buildPhase = '' - runHook preBuild - mkdir -p $out/bin - ocamlfind opt -o $out/bin/sawjap -package sawja -linkpkg sawjap.ml - runHook postBuild - ''; - - dontInstall = true; - - meta = sawja.meta // { - description = "Pretty-print .class files"; - mainProgram = "sawjap"; - }; - -} diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix deleted file mode 100644 index 5ec81ec7040d..000000000000 --- a/pkgs/development/tools/java/visualvm/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk }: - -stdenv.mkDerivation rec { - version = "2.1.9"; - pname = "visualvm"; - - src = fetchzip { - url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "sha256-q1oIxdeCQq7JdVskjvF2KAFzFGrowRHjkvst3ukXSyY="; - }; - - desktopItem = makeDesktopItem { - name = "visualvm"; - exec = "visualvm"; - comment = "Java Troubleshooting Tool"; - desktopName = "VisualVM"; - genericName = "Java Troubleshooting Tool"; - categories = [ "Development" ]; - }; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - find . -type f -name "*.dll" -o -name "*.exe" -delete; - - substituteInPlace etc/visualvm.conf \ - --replace "#visualvm_jdkhome=" "visualvm_jdkhome=" \ - --replace "/path/to/jdk" "${jdk.home}" \ - - cp -r . $out - ''; - - meta = with lib; { - description = "Visual interface for viewing information about Java applications"; - mainProgram = "visualvm"; - longDescription = '' - VisualVM is a visual tool integrating several commandline JDK - tools and lightweight profiling capabilities. Designed for both - production and development time use, it further enhances the - capability of monitoring and performance analysis for the Java - SE platform. - ''; - homepage = "https://visualvm.github.io"; - license = licenses.gpl2ClasspathPlus; - platforms = platforms.all; - maintainers = with maintainers; [ michalrus moaxcp ]; - }; -} diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix deleted file mode 100644 index 48737ed668f7..000000000000 --- a/pkgs/development/tools/jbake/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchzip, makeWrapper, jre }: - -stdenv.mkDerivation rec { - version = "2.6.7"; - pname = "jbake"; - - src = fetchzip { - url = "https://github.com/jbake-org/jbake/releases/download/v${version}/jbake-${version}-bin.zip"; - sha256 = "sha256-kikGnFsParq8g0dzzYtMr2vIJD2ie8PeF6TG2G5K7KE="; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre ]; - - postPatch = "patchShebangs ."; - - installPhase = '' - mkdir -p $out - cp -vr * $out - wrapProgram $out/bin/jbake --set JAVA_HOME "${jre}" - ''; - - checkPhase = '' - export JAVA_HOME=${jre} - bin/jbake | grep -q "${version}" || (echo "jbake did not return correct version"; exit 1) - ''; - doCheck = true; - - meta = with lib; { - description = "Java based, open source, static site/blog generator for developers & designers"; - homepage = "https://jbake.org/"; - license = licenses.mit; - maintainers = with maintainers; [ moaxcp ]; - }; -} diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix deleted file mode 100644 index a344e31c320b..000000000000 --- a/pkgs/development/tools/jbang/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: - -stdenv.mkDerivation rec { - version = "0.117.1"; - pname = "jbang"; - - src = fetchzip { - url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-LQ9xXTutKhAnAt51mglP/zc7k1v2X/QLwEY31M8SmzM="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - rm bin/jbang.{cmd,ps1} - cp -r . $out - wrapProgram $out/bin/jbang \ - --set JAVA_HOME ${jdk} \ - --set PATH ${lib.makeBinPath [ (placeholder "out") coreutils jdk curl ]} - runHook postInstall - ''; - - installCheckPhase = '' - $out/bin/jbang --version 2>&1 | grep -q "${version}" - ''; - - meta = with lib; { - description = "Run java as scripts anywhere"; - mainProgram = "jbang"; - longDescription = '' - jbang uses the java language to build scripts similar to groovy scripts. Dependencies are automatically - downloaded and the java code runs. - ''; - homepage = "https://www.jbang.dev"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ moaxcp ]; - }; -} diff --git a/pkgs/development/tools/jd-diff-patch/default.nix b/pkgs/development/tools/jd-diff-patch/default.nix deleted file mode 100644 index 6f50f7d1c3ae..000000000000 --- a/pkgs/development/tools/jd-diff-patch/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "jd-diff-patch"; - version = "1.9.1"; - - src = fetchFromGitHub { - owner = "josephburnett"; - repo = "jd"; - rev = "v${version}"; - sha256 = "sha256-qq/Y2/NGK3xsgljT0D9+dD1D1UfjB9Niay81nQJ4gX0="; - }; - - # not including web ui - excludedPackages = [ "gae" "pack" ]; - - vendorHash = null; - - meta = with lib; { - description = "Commandline utility and Go library for diffing and patching JSON values"; - homepage = "https://github.com/josephburnett/jd"; - license = licenses.mit; - maintainers = with maintainers; [ bryanasdev000 blaggacao ]; - mainProgram = "jd"; - }; -} diff --git a/pkgs/development/tools/jet/default.nix b/pkgs/development/tools/jet/default.nix deleted file mode 100644 index b71b7caee2e9..000000000000 --- a/pkgs/development/tools/jet/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildGraalvmNativeImage -, fetchurl -, testers -, jet -}: - -buildGraalvmNativeImage rec { - pname = "jet"; - version = "0.7.27"; - - src = fetchurl { - url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-250/1DBNCXlU1b4jjLUUOXI+uSbOyPXtBN1JJRpdmFc="; - }; - - extraNativeImageBuildArgs = [ - "-H:+ReportExceptionStackTraces" - "-H:Log=registerResource:" - "--no-fallback" - "--no-server" - ]; - - passthru.tests.version = testers.testVersion { - inherit version; - package = jet; - command = "jet --version"; - }; - - meta = with lib; { - description = "CLI to transform between JSON, EDN, YAML and Transit, powered with a minimal query language"; - homepage = "https://github.com/borkdude/jet"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.epl10; - maintainers = with maintainers; [ ericdallo ]; - }; -} diff --git a/pkgs/development/tools/jf/default.nix b/pkgs/development/tools/jf/default.nix deleted file mode 100644 index 8184883218f2..000000000000 --- a/pkgs/development/tools/jf/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: - -rustPlatform.buildRustPackage rec { - pname = "jf"; - version = "0.6.2"; - - src = fetchFromGitHub { - owner = "sayanarijit"; - repo = "jf"; - rev = "v${version}"; - hash = "sha256-A29OvGdG6PyeKMf5RarEOrfnNSmXhXri0AlECHWep6M="; - }; - - cargoHash = "sha256-jZmFUvg6R15oL13OYKkirsepoJwOKCeXdKMcqhPEhNU="; - - nativeBuildInputs = [ installShellFiles ]; - - # skip auto manpage update - buildNoDefaultFeatures = true; - - postInstall = '' - installManPage assets/jf.1 - ''; - - meta = with lib; { - description = "Small utility to safely format and print JSON objects in the commandline"; - mainProgram = "jf"; - homepage = "https://github.com/sayanarijit/jf"; - license = licenses.mit; - maintainers = [ maintainers.sayanarijit ]; - }; -} diff --git a/pkgs/development/tools/jfmt/default.nix b/pkgs/development/tools/jfmt/default.nix deleted file mode 100644 index 98fe184e0329..000000000000 --- a/pkgs/development/tools/jfmt/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "jfmt"; - version = "1.2.1"; - - src = fetchFromGitHub { - owner = "scruffystuffs"; - repo = "${pname}.rs"; - rev = "v${version}"; - hash = "sha256-X3wk669G07BTPAT5xGbAfIu2Qk90aaJIi1CLmOnSG80="; - }; - - cargoHash = "sha256-u/v3P7iPdBJU/0wlSNBq/cjnM3XOnoVfUjrrmo4sTAA="; - - meta = with lib; { - description = "CLI utility to format json files"; - mainProgram = "jfmt"; - homepage = "https://github.com/scruffystuffs/jfmt.rs"; - changelog = "https://github.com/scruffystuffs/jfmt.rs/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = [ maintainers.psibi ]; - }; -} diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix deleted file mode 100644 index 036224f86dd0..000000000000 --- a/pkgs/development/tools/jid/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, jid }: - -buildGoModule rec { - pname = "jid"; - version = "0.7.6"; - - src = fetchFromGitHub { - owner = "simeji"; - repo = "jid"; - rev = "v${version}"; - hash = "sha256-fZzEbVNGsDNQ/FhII+meQvKeyrgxn3wtFW8VfNmJz5U="; - }; - - vendorHash = "sha256-Lq8ouTjPsGhqDwrCMpqkSU7FEGszYwAkwl92vAEZ68w="; - - patches = [ - # Run go mod tidy - ./go-mod.patch - ]; - - ldflags = [ "-s" "-w" ]; - - passthru.tests.version = testers.testVersion { - package = jid; - version = "v${version}"; - }; - - meta = { - description = "Command-line tool to incrementally drill down JSON"; - mainProgram = "jid"; - homepage = "https://github.com/simeji/jid"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ stesie ]; - }; -} diff --git a/pkgs/development/tools/jid/go-mod.patch b/pkgs/development/tools/jid/go-mod.patch deleted file mode 100644 index beca79fff86a..000000000000 --- a/pkgs/development/tools/jid/go-mod.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/go.mod b/go.mod -index d26c293..3276f36 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,12 +1,24 @@ - module github.com/simeji/jid - -+go 1.19 -+ - require ( - github.com/bitly/go-simplejson v0.5.0 -- github.com/fatih/color v1.7.0 // indirect -- github.com/mattn/go-colorable v0.0.9 // indirect -- github.com/mattn/go-isatty v0.0.4 // indirect - github.com/mattn/go-runewidth v0.0.4 - github.com/nsf/termbox-go v0.0.0-20181027232701-60ab7e3d12ed - github.com/nwidger/jsoncolor v0.0.0-20170215171346-75a6de4340e5 - github.com/pkg/errors v0.8.0 -+ github.com/stretchr/testify v1.8.2 -+) -+ -+require ( -+ github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect -+ github.com/davecgh/go-spew v1.1.1 // indirect -+ github.com/fatih/color v1.7.0 // indirect -+ github.com/kr/pretty v0.3.1 // indirect -+ github.com/mattn/go-colorable v0.0.9 // indirect -+ github.com/mattn/go-isatty v0.0.4 // indirect -+ github.com/pmezard/go-difflib v1.0.0 // indirect -+ golang.org/x/sys v0.5.0 // indirect -+ gopkg.in/yaml.v3 v3.0.1 // indirect - ) -diff --git a/go.sum b/go.sum -index 2fb379f..07d786d 100644 ---- a/go.sum -+++ b/go.sum -@@ -1,7 +1,17 @@ - github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y= - github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= -+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= -+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= -+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= - github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= - github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= - github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= - github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= - github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs= -@@ -12,5 +22,24 @@ github.com/nsf/termbox-go v0.0.0-20181027232701-60ab7e3d12ed h1:bAVGG6B+R5qpSylr - github.com/nsf/termbox-go v0.0.0-20181027232701-60ab7e3d12ed/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ= - github.com/nwidger/jsoncolor v0.0.0-20170215171346-75a6de4340e5 h1:d+C3xJdxZT7wNlxqEwbXn3R355CwAhYBL9raVNfSnK0= - github.com/nwidger/jsoncolor v0.0.0-20170215171346-75a6de4340e5/go.mod h1:GYFm0zZgTNeoK1QxuIofRDasy2ibmaJZhZLzwsMXUF4= -+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= - github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= - github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/pkgs/development/tools/jless/default.nix b/pkgs/development/tools/jless/default.nix index e704ec994eed..0aba5e3f23f1 100644 --- a/pkgs/development/tools/jless/default.nix +++ b/pkgs/development/tools/jless/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-sas94liAOSIirIJGdexdApXic2gWIBDT4uJFRM3qMw0="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ python3 ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ python3 ]; buildInputs = [ ] - ++ lib.optionals stdenv.isDarwin [ AppKit ] - ++ lib.optionals stdenv.isLinux [ libxcb ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]; meta = with lib; { description = "Command-line pager for JSON data"; diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix deleted file mode 100644 index 26f90e8602a5..000000000000 --- a/pkgs/development/tools/jmespath/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "jmespath"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "jmespath"; - repo = "go-jmespath"; - rev = "v${version}"; - sha256 = "sha256-djA/7TCmAqCsht28b1itoiWd8Mtdsn/5uLxyT23K/qM="; - }; - - vendorHash = "sha256-Q12muprcKB7fCxemESb4sGPyYIdmgOt3YXVUln7oabw="; - - excludedPackages = [ - "./internal/testify" - ]; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "JMESPath implementation in Go"; - homepage = "https://github.com/jmespath/go-jmespath"; - license = licenses.asl20; - maintainers = with maintainers; [ cransom ]; - mainProgram = "jpgo"; - }; -} diff --git a/pkgs/development/tools/jo/default.nix b/pkgs/development/tools/jo/default.nix deleted file mode 100644 index 500bab51baad..000000000000 --- a/pkgs/development/tools/jo/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{lib, stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkg-config}: - -stdenv.mkDerivation rec { - pname = "jo"; - version = "1.9"; - - src = fetchFromGitHub { - owner = "jpmens"; - repo = "jo"; - rev = version; - sha256 ="sha256-1q4/RpxfoAdtY3m8bBuj7bhD17V+4dYo3Vb8zMbI1YU="; - }; - - enableParallelBuilding = true; - - nativeBuildInputs = [ autoreconfHook pandoc pkg-config ]; - - meta = with lib; { - description = "Small utility to create JSON objects"; - homepage = "https://github.com/jpmens/jo"; - mainProgram = "jo"; - license = licenses.gpl2Plus; - maintainers = [maintainers.markus1189]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix deleted file mode 100644 index 8a44f0acade1..000000000000 --- a/pkgs/development/tools/jp/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "jp"; - version = "0.2.1"; - - src = fetchFromGitHub { - rev = version; - owner = "jmespath"; - repo = "jp"; - hash = "sha256-a3WvLAdUZk+Y+L+opPDMBvdN5x5B6nAi/lL8JHJG/gY="; - }; - - vendorHash = "sha256-K6ZNtART7tcVBH5myV6vKrKWfnwK8yTa6/KK4QLyr00="; - - meta = with lib; { - description = "Command line interface to the JMESPath expression language for JSON"; - mainProgram = "jp"; - homepage = "https://github.com/jmespath/jp"; - maintainers = with maintainers; [ cransom ]; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/tools/jpexs/default.nix b/pkgs/development/tools/jpexs/default.nix deleted file mode 100644 index f5c3bf79842c..000000000000 --- a/pkgs/development/tools/jpexs/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv, fetchzip, makeWrapper, makeDesktopItem, jdk8 }: - -stdenv.mkDerivation rec { - pname = "jpexs"; - version = "20.1.0"; - - src = fetchzip { - url = "https://github.com/jindrapetrik/jpexs-decompiler/releases/download/version${version}/ffdec_${version}.zip"; - hash = "sha256-ytGtylhyNSdKfuPclZRJasOb/cskW65hMd4NM/q+/Ko="; - stripRoot = false; - }; - - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - mkdir -p $out/share/{ffdec,icons/hicolor/512x512/apps} - - cp ffdec.jar $out/share/ffdec - cp -r lib $out/share/ffdec - cp icon.png $out/share/icons/hicolor/512x512/apps/ffdec.png - cp -r ${desktopItem}/share/applications $out/share - - makeWrapper ${jdk8}/bin/java $out/bin/ffdec \ - --add-flags "-jar $out/share/ffdec/ffdec.jar" - ''; - - desktopItem = makeDesktopItem rec { - name = "ffdec"; - exec = name; - icon = name; - desktopName = "JPEXS Free Flash Decompiler"; - genericName = "Flash Decompiler"; - comment = meta.description; - categories = [ "Development" "Java" ]; - startupWMClass = "com-jpexs-decompiler-flash-gui-Main"; - }; - - meta = with lib; { - description = "Flash SWF decompiler and editor"; - mainProgram = "ffdec"; - longDescription = '' - Open-source Flash SWF decompiler and editor. Extract resources, - convert SWF to FLA, edit ActionScript, replace images, sounds, - texts or fonts. - ''; - homepage = "https://github.com/jindrapetrik/jpexs-decompiler"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.gpl3; - platforms = jdk8.meta.platforms; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix deleted file mode 100644 index 8d4ec0d1c5a6..000000000000 --- a/pkgs/development/tools/jq/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ lib -, stdenv -, fetchurl -, removeReferencesTo -, autoreconfHook -, bison -, onigurumaSupport ? true -, oniguruma -}: - -stdenv.mkDerivation rec { - pname = "jq"; - version = "1.7.1"; - - # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages - src = fetchurl { - url = "https://github.com/jqlang/jq/releases/download/jq-${version}/jq-${version}.tar.gz"; - hash = "sha256-R4ycoSn9LjRD/icxS0VeIR4NjGC8j/ffcDhz3u7lgMI="; - }; - - outputs = [ "bin" "doc" "man" "dev" "lib" "out" ]; - - # https://github.com/jqlang/jq/issues/2871 - postPatch = lib.optionalString stdenv.isFreeBSD '' - substituteInPlace Makefile.am --replace-fail "tests/mantest" "" --replace-fail "tests/optionaltest" "" - ''; - - # Upstream script that writes the version that's eventually compiled - # and printed in `jq --help` relies on a .git directory which our src - # doesn't keep. - preConfigure = '' - echo "#!/bin/sh" > scripts/version - echo "echo ${version}" >> scripts/version - patchShebangs scripts/version - ''; - - # paranoid mode: make sure we never use vendored version of oniguruma - # Note: it must be run after automake, or automake will complain - preBuild = '' - rm -r ./modules/oniguruma - ''; - - buildInputs = lib.optionals onigurumaSupport [ oniguruma ]; - nativeBuildInputs = [ removeReferencesTo autoreconfHook bison ]; - - # Darwin requires _REENTRANT be defined to use functions like `lgamma_r`. - # Otherwise, configure will detect that they’re in libm, but the build will fail - # with clang 16+ due to calls to undeclared functions. - # This is fixed upstream and can be removed once jq is updated (to 1.7 or an unstable release). - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ - "-D_REENTRANT=1" - "-D_DARWIN_C_SOURCE=1" - ]); - - configureFlags = [ - "--bindir=\${bin}/bin" - "--sbindir=\${bin}/bin" - "--datadir=\${doc}/share" - "--mandir=\${man}/share/man" - ] ++ lib.optional (!onigurumaSupport) "--with-oniguruma=no" - # jq is linked to libjq: - ++ lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; - - # Break the dependency cycle: $dev refers to $bin via propagated-build-outputs, and - # $bin refers to $dev because of https://github.com/jqlang/jq/commit/583e4a27188a2db097dd043dd203b9c106bba100 - postFixup = '' - remove-references-to -t "$dev" "$bin/bin/jq" - ''; - - doInstallCheck = true; - installCheckTarget = "check"; - - postInstallCheck = '' - $bin/bin/jq --help >/dev/null - $bin/bin/jq -r '.values[1]' <<< '{"values":["hello","world"]}' | grep '^world$' > /dev/null - ''; - - passthru = { inherit onigurumaSupport; }; - - meta = with lib; { - description = "Lightweight and flexible command-line JSON processor"; - homepage = "https://jqlang.github.io/jq/"; - license = licenses.mit; - maintainers = with maintainers; [ raskin artturin ncfavier ]; - platforms = platforms.unix; - downloadPage = "https://jqlang.github.io/jq/download/"; - mainProgram = "jq"; - }; -} diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix deleted file mode 100644 index b9add5050a74..000000000000 --- a/pkgs/development/tools/jql/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, fetchFromGitHub -, rustPlatform -}: - -rustPlatform.buildRustPackage rec { - pname = "jql"; - version = "7.2.0"; - - src = fetchFromGitHub { - owner = "yamafaktory"; - repo = pname; - rev = "jql-v${version}"; - hash = "sha256-UyZ7unIbKRn/5WsoYxkHWQ5k0Tb5NcC+UGpiyvpShBo="; - }; - - cargoHash = "sha256-gJQsap31twigZT5n5w7oHATdNf0DfqoNfdS7cMU/hiA="; - - meta = with lib; { - description = "JSON Query Language CLI tool built with Rust"; - homepage = "https://github.com/yamafaktory/jql"; - changelog = "https://github.com/yamafaktory/jql/releases/tag/${src.rev}"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ akshgpt7 figsoda ]; - mainProgram = "jql"; - }; -} diff --git a/pkgs/development/tools/jqp/default.nix b/pkgs/development/tools/jqp/default.nix deleted file mode 100644 index 22fee1b4ee98..000000000000 --- a/pkgs/development/tools/jqp/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "jqp"; - version = "0.7.0"; - - src = fetchFromGitHub { - owner = "noahgorstein"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-i22qALVa8EUaTwgN6DocGJArNyOvkQbFuH++EQKBuIc="; - }; - - vendorHash = "sha256-GbY0x4BgV0+QdVMkITLF/W//oO72FbjV6lNJRm6ecys="; - - subPackages = [ "." ]; - - meta = with lib; { - description = "TUI playground to experiment with jq"; - mainProgram = "jqp"; - homepage = "https://github.com/noahgorstein/jqp"; - license = licenses.mit; - maintainers = with maintainers; [ dit7ya ]; - }; -} diff --git a/pkgs/development/tools/jsduck/Gemfile b/pkgs/development/tools/jsduck/Gemfile deleted file mode 100644 index 483fc40ff799..000000000000 --- a/pkgs/development/tools/jsduck/Gemfile +++ /dev/null @@ -1,3 +0,0 @@ -source "https://rubygems.org" - -gem "jsduck" diff --git a/pkgs/development/tools/jsduck/Gemfile.lock b/pkgs/development/tools/jsduck/Gemfile.lock deleted file mode 100644 index d8331181652b..000000000000 --- a/pkgs/development/tools/jsduck/Gemfile.lock +++ /dev/null @@ -1,23 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - dimensions (1.2.0) - jsduck (5.3.4) - dimensions (~> 1.2.0) - json (~> 1.8.0) - parallel (~> 0.7.1) - rdiscount (~> 2.1.6) - rkelly-remix (~> 0.0.4) - json (1.8.6) - parallel (0.7.1) - rdiscount (2.1.8) - rkelly-remix (0.0.7) - -PLATFORMS - ruby - -DEPENDENCIES - jsduck - -BUNDLED WITH - 2.1.4 diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/development/tools/jsduck/default.nix deleted file mode 100644 index debd33c80745..000000000000 --- a/pkgs/development/tools/jsduck/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, lib, bundlerEnv, makeWrapper, bundlerUpdateScript }: - -stdenv.mkDerivation rec { - pname = "jsduck"; - version = (import ./gemset.nix).jsduck.version; - - env = bundlerEnv { - name = pname; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; - }; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ env ]; - - installPhase = '' - mkdir -p $out/bin - makeWrapper ${env}/bin/jsduck $out/bin/jsduck - ''; - - passthru.updateScript = bundlerUpdateScript "jsduck"; - - meta = with lib; { - description = "Simple JavaScript Duckumentation generator"; - mainProgram = "jsduck"; - homepage = "https://github.com/senchalabs/jsduck"; - license = with licenses; gpl3; - maintainers = with maintainers; [ periklis nicknovitski ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/jsduck/gemset.nix b/pkgs/development/tools/jsduck/gemset.nix deleted file mode 100644 index 493cc42f4f4e..000000000000 --- a/pkgs/development/tools/jsduck/gemset.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - dimensions = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pqb7yzjcpbgbyi196ifqbd1wy570cn12bkzcvpcha4xilhajja0"; - type = "gem"; - }; - version = "1.2.0"; - }; - jsduck = { - dependencies = ["dimensions" "json" "parallel" "rdiscount" "rkelly-remix"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hac7g9g6gg10bigbm8dskwwbv1dfch8ca353gh2bkwf244qq2xr"; - type = "gem"; - }; - version = "5.3.4"; - }; - json = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; - type = "gem"; - }; - version = "1.8.6"; - }; - parallel = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kzz6ydg7r23ks2b7zbpx4vz3h186n19vhgnjcwi7xwd6h2f1fsq"; - type = "gem"; - }; - version = "0.7.1"; - }; - rdiscount = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vcyy90r6wfg0b0y5wqp3d25bdyqjbwjhkm1xy9jkz9a7j72n70v"; - type = "gem"; - }; - version = "2.1.8"; - }; - rkelly-remix = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1g7hjl9nx7f953y7lncmfgp0xgxfxvgfm367q6da9niik6rp1y3j"; - type = "gem"; - }; - version = "0.0.7"; - }; -} diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/development/tools/json2hcl/default.nix deleted file mode 100644 index 7255736cd500..000000000000 --- a/pkgs/development/tools/json2hcl/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "json2hcl"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "kvz"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-h7DudYVWvDRCbjoIgOoCIudf7ZfUfWXp5OJ4ni0nm6c="; - }; - - vendorHash = "sha256-GxYuFak+5CJyHgC1/RsS0ub84bgmgL+bI4YKFTb+vIY="; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Convert JSON to HCL, and vice versa"; - mainProgram = "json2hcl"; - homepage = "https://github.com/kvz/json2hcl"; - license = licenses.mit; - maintainers = with maintainers; [ matthewbauer ]; - }; -} diff --git a/pkgs/development/tools/jsonnet-bundler/default.nix b/pkgs/development/tools/jsonnet-bundler/default.nix deleted file mode 100644 index 3dedb2a41ac3..000000000000 --- a/pkgs/development/tools/jsonnet-bundler/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib }: - -buildGoModule rec { - pname = "jsonnet-bundler"; - version = "0.6.0"; - - src = fetchFromGitHub { - owner = "jsonnet-bundler"; - repo = "jsonnet-bundler"; - rev = "v${version}"; - hash = "sha256-VaYfjDSDst1joN2MnDVdz9SGGMamhYxfNM/a2mJf8Lo="; - }; - - vendorHash = null; - - ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; - - meta = with lib; { - description = "Jsonnet package manager"; - homepage = "https://github.com/jsonnet-bundler/jsonnet-bundler"; - license = licenses.asl20; - maintainers = with maintainers; [ preisschild ]; - mainProgram = "jb"; - }; -} diff --git a/pkgs/development/tools/jtc/default.nix b/pkgs/development/tools/jtc/default.nix deleted file mode 100644 index f368a460463d..000000000000 --- a/pkgs/development/tools/jtc/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "jtc"; - version = "1.76"; - - src = fetchFromGitHub { - owner = "ldn-softdev"; - repo = pname; - rev = version; - sha256 = "sha256-VATRlOOV4wBInLOm9J0Dp2vhtL5mb0Yxdl/ya0JiqEU="; - }; - - patches = [ - # Fix building with Clang. Removing with next release. - (fetchpatch { - url = "https://github.com/ldn-softdev/jtc/commit/92a5116e5524c0b6d2f539db7b5cc9fdd7c5b8ab.patch"; - sha256 = "sha256-AAvDH0XsT8/CAguG611/odg0m1HR+veC0jbAw6KLHLM="; - }) - ]; - - buildPhase = '' - runHook preBuild - - $CXX -o jtc -Wall -std=gnu++14 -Ofast -pthread -lpthread jtc.cpp - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -Dm755 -t $out/bin jtc - - runHook postInstall - ''; - - meta = with lib; { - description = "JSON manipulation and transformation tool"; - mainProgram = "jtc"; - homepage = "https://github.com/ldn-softdev/jtc"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix deleted file mode 100644 index e34e31b1a561..000000000000 --- a/pkgs/development/tools/k6/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "k6"; - version = "0.53.0"; - - src = fetchFromGitHub { - owner = "grafana"; - repo = pname; - rev = "v${version}"; - hash = "sha256-mh7Y7AGNvXRD2MJN8UOCSDNWJZlnu9hBdeDePfce9g8="; - }; - - subPackages = [ "./" ]; - - vendorHash = null; - - nativeBuildInputs = [ installShellFiles ]; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/k6 version | grep ${version} > /dev/null - ''; - - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' - installShellCompletion --cmd k6 \ - --bash <($out/bin/k6 completion bash) \ - --fish <($out/bin/k6 completion fish) \ - --zsh <($out/bin/k6 completion zsh) - ''; - - meta = with lib; { - description = "Modern load testing tool, using Go and JavaScript"; - mainProgram = "k6"; - homepage = "https://k6.io/"; - changelog = "https://github.com/grafana/k6/releases/tag/v${version}"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ offline bryanasdev000 kashw2 ]; - }; -} diff --git a/pkgs/development/tools/kaf/default.nix b/pkgs/development/tools/kaf/default.nix deleted file mode 100644 index eb098c272873..000000000000 --- a/pkgs/development/tools/kaf/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "kaf"; - version = "0.2.8"; - - src = fetchFromGitHub { - owner = "birdayz"; - repo = "kaf"; - rev = "v${version}"; - hash = "sha256-12xPBBLV0jtQQI/inNlWTFBZtYBF0GF1GoD1kv1/thQ="; - }; - - vendorHash = "sha256-otKz8ECSb2N3vwU5c1+u7zGvXU4iRvQWWggw9WwG78c="; - - # Many tests require a running Kafka instance - doCheck = false; - - meta = with lib; { - description = "Modern CLI for Apache Kafka, written in Go"; - mainProgram = "kaf"; - homepage = "https://github.com/birdayz/kaf"; - license = licenses.asl20; - maintainers = with maintainers; [ zarelit ]; - }; -} diff --git a/pkgs/development/tools/kafka-delta-ingest/Cargo.lock b/pkgs/development/tools/kafka-delta-ingest/Cargo.lock deleted file mode 100644 index 53bbe80ada05..000000000000 --- a/pkgs/development/tools/kafka-delta-ingest/Cargo.lock +++ /dev/null @@ -1,2898 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -dependencies = [ - "memchr", -] - -[[package]] -name = "alloc-no-stdlib" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697ed7edc0f1711de49ce108c541623a0af97c6c60b2f6e2b65229847ac843c2" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi", -] - -[[package]] -name = "anyhow" -version = "1.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf" - -[[package]] -name = "arrow" -version = "6.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46cb449d481a6b13ea4e82e9fc662ea3e29cb5dc0a310fc42e27592cef3cb611" -dependencies = [ - "bitflags", - "chrono", - "csv", - "flatbuffers", - "hex", - "indexmap", - "lazy_static", - "lexical-core", - "multiversion", - "num 0.4.0", - "rand", - "regex", - "serde", - "serde_derive", - "serde_json", -] - -[[package]] -name = "async-trait" -version = "0.1.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "atomic_refcell" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681b971236e0f76b20fcafca0236b8718c9186ee778d67cd78bd5f28fd85427f" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "backtrace" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base-x" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" - -[[package]] -name = "base64" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] -name = "brotli" -version = "3.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71cb90ade945043d3d53597b2fc359bb063db8ade2bcffe7997351d0756e9d50" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bstr" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" - -[[package]] -name = "cc" -version = "1.0.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0" -dependencies = [ - "jobserver", -] - -[[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.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" -dependencies = [ - "libc", - "num-integer", - "num-traits", - "serde", - "time 0.1.43", - "winapi", -] - -[[package]] -name = "clap" -version = "2.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width", - "vec_map", -] - -[[package]] -name = "clap" -version = "3.0.0-beta.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcd70aa5597dbc42f7217a543f9ef2768b2ef823ba29036072d30e1d88e98406" -dependencies = [ - "atty", - "bitflags", - "clap_derive", - "indexmap", - "lazy_static", - "os_str_bytes", - "strsim 0.10.0", - "termcolor", - "textwrap 0.14.2", - "vec_map", -] - -[[package]] -name = "clap_derive" -version = "3.0.0-beta.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5bb0d655624a0b8770d1c178fb8ffcb1f91cc722cb08f451e3dc72465421ac" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] - -[[package]] -name = "const_fn" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" - -[[package]] -name = "core-foundation" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" - -[[package]] -name = "cpufeatures" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", -] - -[[package]] -name = "crypto-mac" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "csv" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" -dependencies = [ - "bstr", - "csv-core", - "itoa", - "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 = "debugid" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91cf5a8c2f2097e2a32627123508635d47ce10563d999ec1a95addf08b502ba" -dependencies = [ - "serde", - "uuid", -] - -[[package]] -name = "deltalake" -version = "0.4.1" -source = "git+https://github.com/delta-io/delta-rs.git?rev=cba4e3d316c56c65dc1cb660dc7e6d380ddd3a6b#cba4e3d316c56c65dc1cb660dc7e6d380ddd3a6b" -dependencies = [ - "anyhow", - "arrow", - "async-trait", - "bytes", - "cfg-if 1.0.0", - "chrono", - "clap 3.0.0-beta.4", - "env_logger", - "errno", - "futures", - "glibc_version", - "lazy_static", - "libc", - "log", - "maplit", - "parquet", - "parquet-format", - "percent-encoding", - "regex", - "rusoto_core", - "rusoto_credential", - "rusoto_dynamodb", - "rusoto_s3", - "rusoto_sts", - "serde", - "serde_json", - "thiserror", - "tokio", - "tokio-stream", - "uuid", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "deunicode" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "850878694b7933ca4c9569d30a34b55031b9b139ee1fc7b94a527c4ef960d690" - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "dipstick" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "596c026d3f177d5ef10f5ac01f9a9a2db64aa5c79730267d5a727b6d22db0566" -dependencies = [ - "atomic_refcell", - "crossbeam-channel", - "lazy_static", - "log", - "minreq", - "num 0.2.1", - "parking_lot 0.10.2", - "time 0.1.43", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if 1.0.0", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[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 = "encoding_rs" -version = "0.8.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "env_logger" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "errno" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa68f2fb9cae9d37c9b2b3584aba698a2e97f72d7aef7b9f7aa71d8b54ce46fe" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067" -dependencies = [ - "gcc", - "libc", -] - -[[package]] -name = "flatbuffers" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4c5738bcd7fad10315029c50026f83c9da5e4a21f8ed66826f43e0e2bde5f6" -dependencies = [ - "bitflags", - "smallvec", - "thiserror", -] - -[[package]] -name = "flate2" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80edafed416a46fb378521624fab1cfa2eb514784fd8921adbe8a8d8321da811" -dependencies = [ - "cfg-if 1.0.0", - "crc32fast", - "libc", - "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 = "form_urlencoded" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -dependencies = [ - "matches", - "percent-encoding", -] - -[[package]] -name = "futures" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" - -[[package]] -name = "futures-executor" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" - -[[package]] -name = "futures-macro" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" -dependencies = [ - "autocfg", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" - -[[package]] -name = "futures-task" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" - -[[package]] -name = "futures-util" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" -dependencies = [ - "autocfg", - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "proc-macro-hack", - "proc-macro-nested", - "slab", -] - -[[package]] -name = "gcc" -version = "0.3.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" - -[[package]] -name = "generic-array" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" - -[[package]] -name = "glibc_version" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "803ff7635f1ab4e2c064b68a0c60da917d3d18dc8d086130f689d62ce4f1c33e" -dependencies = [ - "regex", -] - -[[package]] -name = "h2" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c06815895acec637cd6ed6e9662c935b866d20a106f8361892893a7d9234964" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hmac" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" -dependencies = [ - "crypto-mac", - "digest", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" - -[[package]] -name = "httpdate" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" - -[[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.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13f67199e765030fa08fe0bd581af683f0d5bc04ea09c2b1102012c5fb90e7fd" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[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 = "indexmap" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "instant" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "integer-encoding" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dc51180a9b377fd75814d0cc02199c20f8e99433d6762f650d39cdbbd3b56f" - -[[package]] -name = "ipnet" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" - -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "jmespatch" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acf91a732ade34d8eda2dee9500a051833f14f0d3d10d77c149845d6ac6a5f0" -dependencies = [ - "lazy_static", - "serde", - "serde_json", - "slug", -] - -[[package]] -name = "jobserver" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kafka-delta-ingest" -version = "0.1.0" -dependencies = [ - "anyhow", - "arrow", - "async-trait", - "base64", - "chrono", - "clap 3.0.0-beta.4", - "deltalake", - "dipstick", - "env_logger", - "futures", - "jmespatch", - "lazy_static", - "log", - "maplit", - "parquet", - "parquet-format", - "rdkafka", - "rusoto_core", - "rusoto_credential", - "rusoto_s3", - "sentry", - "serde", - "serde_json", - "serial_test", - "strum", - "strum_macros", - "tempfile", - "thiserror", - "tokio", - "tokio-stream", - "tokio-util", - "utime", - "uuid", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lexical-core" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32c80337884d5044fe54e9c1b8d64b92de67e10d9312e472a8ff6d6ea849daf" -dependencies = [ - "lexical-parse-float", - "lexical-parse-integer", - "lexical-util", - "lexical-write-float", - "lexical-write-integer", -] - -[[package]] -name = "lexical-parse-float" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673a01c82cb851a33bb46cacc44c3ad5e7b39ea3b8d22ade21646221df58e45f" -dependencies = [ - "lexical-parse-integer", - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-parse-integer" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2c92badda8cc0fc4f3d3cc1c30aaefafb830510c8781ce4e8669881f3ed53ac" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-util" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff669ccaae16ee33af90dc51125755efed17f1309626ba5c12052512b11e291" -dependencies = [ - "static_assertions", -] - -[[package]] -name = "lexical-write-float" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93601479eae2b41ad465e1f813ea98780069ef1d69063145e76c1bd108ab769" -dependencies = [ - "lexical-util", - "lexical-write-integer", - "static_assertions", -] - -[[package]] -name = "lexical-write-integer" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece956492e0e40fd95ef8658a34d53a3b8c2015762fdcaaff2167b28de1f56ef" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "libc" -version = "0.2.101" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21" - -[[package]] -name = "libz-sys" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard", -] - -[[package]] -name = "lock_api" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" -dependencies = [ - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "lz4" -version = "1.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac20ed6991e01bf6a2e68cc73df2b389707403662a8ba89f68511fb340f724c" -dependencies = [ - "libc", - "lz4-sys", -] - -[[package]] -name = "lz4-sys" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca79aa95d8b3226213ad454d328369853be3a1382d89532a854f4d69640acae" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - -[[package]] -name = "memchr" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" - -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - -[[package]] -name = "minreq" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f7db7a675c4b46b8842105b9371d6151e95fbbecd9b0e54dc2ea814397d2cc" -dependencies = [ - "log", -] - -[[package]] -name = "mio" -version = "0.7.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] - -[[package]] -name = "multiversion" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025c962a3dd3cc5e0e520aa9c612201d127dcdf28616974961a649dca64f5373" -dependencies = [ - "multiversion-macros", -] - -[[package]] -name = "multiversion-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a3e2bde382ebf960c1f3e79689fa5941625fe9bf694a1cb64af3e85faff3af" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "native-tls" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "ntapi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -dependencies = [ - "winapi", -] - -[[package]] -name = "num" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36" -dependencies = [ - "num-complex 0.2.4", - "num-integer", - "num-iter", - "num-rational 0.2.4", - "num-traits", -] - -[[package]] -name = "num" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" -dependencies = [ - "num-bigint", - "num-complex 0.4.0", - "num-integer", - "num-iter", - "num-rational 0.4.0", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74e768dff5fb39a41b3bcd30bb25cf989706c90d028d1ad71971987aa309d535" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" -dependencies = [ - "autocfg", - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9bd055fb730c4f8f4f57d45d35cd6b3f0980535b056dc7ff119cee6a66ed6f" -dependencies = [ - "derivative", - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486ea01961c4a818096de679a8b740b26d9033146ac5291b1c98557658f8cdd9" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "object" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f37e50073ccad23b6d09bcb5b263f4e76d3bb6038e4a3c08e52162ffa8abc2" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "openssl" -version = "0.10.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-sys", -] - -[[package]] -name = "openssl-probe" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" - -[[package]] -name = "openssl-src" -version = "111.16.0+1.1.1l" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab2173f69416cf3ec12debb5823d244127d23a9b127d5a5189aa97c5fa2859f" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1996d2d305e561b70d1ee0c53f1542833f4e1ac6ce9a6708b6ff2738ca67dc82" -dependencies = [ - "autocfg", - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "ordered-float" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7" -dependencies = [ - "num-traits", -] - -[[package]] -name = "os_str_bytes" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6acbef58a60fe69ab50510a55bc8cdd4d6cf2283d27ad338f54cb52747a9cf2d" - -[[package]] -name = "parking_lot" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" -dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.7.2", -] - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api 0.4.5", - "parking_lot_core 0.8.5", -] - -[[package]] -name = "parking_lot_core" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.57", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall 0.2.10", - "smallvec", - "winapi", -] - -[[package]] -name = "parquet" -version = "6.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479de475fbb7abf51e39cde69da3cc902d13a6fcb9259993f98688325e6a1ee7" -dependencies = [ - "arrow", - "base64", - "brotli", - "byteorder", - "chrono", - "clap 2.33.3", - "flate2", - "lz4", - "num-bigint", - "parquet-format", - "rand", - "serde_json", - "snap", - "thrift", - "zstd", -] - -[[package]] -name = "parquet-format" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5bc6b23543b5dedc8f6cce50758a35e5582e148e0cfa26bd0cacd569cda5b71" -dependencies = [ - "thrift", -] - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "pin-project-lite" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" - -[[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.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" - -[[package]] -name = "ppv-lite86" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" - -[[package]] -name = "proc-macro-crate" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" -dependencies = [ - "thiserror", - "toml", -] - -[[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", - "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.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro-nested" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" - -[[package]] -name = "proc-macro2" -version = "1.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quote" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core", -] - -[[package]] -name = "rdkafka" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af78bc431a82ef178c4ad6db537eb9cc25715a8591d27acc30455ee7227a76f4" -dependencies = [ - "futures", - "libc", - "log", - "rdkafka-sys", - "serde", - "serde_derive", - "serde_json", - "slab", - "tokio", -] - -[[package]] -name = "rdkafka-sys" -version = "4.0.0+1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54f24572851adfeb525fdc4a1d51185898e54fed4e8d8dba4fadb90c6b4f0422" -dependencies = [ - "libc", - "libz-sys", - "num_enum", - "openssl-sys", - "pkg-config", -] - -[[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.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" -dependencies = [ - "getrandom", - "redox_syscall 0.2.10", -] - -[[package]] -name = "regex" -version = "1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - -[[package]] -name = "regex-syntax" -version = "0.6.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "reqwest" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51c732d463dd300362ffb44b7b125f299c23d2990411a4253824630ebc7467fb" -dependencies = [ - "base64", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "lazy_static", - "log", - "mime", - "native-tls", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded 0.7.0", - "tokio", - "tokio-native-tls", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[package]] -name = "rusoto_core" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02aff20978970d47630f08de5f0d04799497818d16cafee5aec90c4b4d0806cf" -dependencies = [ - "async-trait", - "base64", - "bytes", - "crc32fast", - "futures", - "http", - "hyper", - "hyper-tls", - "lazy_static", - "log", - "rusoto_credential", - "rusoto_signature", - "rustc_version 0.2.3", - "serde", - "serde_json", - "tokio", - "xml-rs", -] - -[[package]] -name = "rusoto_credential" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e91e4c25ea8bfa6247684ff635299015845113baaa93ba8169b9e565701b58e" -dependencies = [ - "async-trait", - "chrono", - "dirs-next", - "futures", - "hyper", - "serde", - "serde_json", - "shlex", - "tokio", - "zeroize", -] - -[[package]] -name = "rusoto_dynamodb" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f26af40f36409cb8fae3069690f78f638f747b55c7b90f338d5ed36016b0cda" -dependencies = [ - "async-trait", - "bytes", - "futures", - "rusoto_core", - "serde", - "serde_json", -] - -[[package]] -name = "rusoto_s3" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abc3f56f14ccf91f880b9a9c2d0556d8523e8c155041c54db155b384a1dd1119" -dependencies = [ - "async-trait", - "bytes", - "futures", - "rusoto_core", - "xml-rs", -] - -[[package]] -name = "rusoto_signature" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486e6b1673ab3e0ba1ded284fb444845fe1b7f41d13989a54dd60f62a7b2baa" -dependencies = [ - "base64", - "bytes", - "futures", - "hex", - "hmac", - "http", - "hyper", - "log", - "md5", - "percent-encoding", - "pin-project-lite", - "rusoto_credential", - "rustc_version 0.2.3", - "serde", - "sha2", - "time 0.2.27", - "tokio", -] - -[[package]] -name = "rusoto_sts" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f93005e0c3b9e40a424b50ca71886d2445cc19bb6cdac3ac84c2daff482eb59" -dependencies = [ - "async-trait", - "bytes", - "chrono", - "futures", - "rusoto_core", - "serde_urlencoded 0.6.1", - "xml-rs", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.4", -] - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "schannel" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -dependencies = [ - "lazy_static", - "winapi", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "security-framework" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" -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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "sentry" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "546b9b6f76c26c60ffbcf0b7136e15169fe13d43949b4aadb7c1edc1c3f3a26f" -dependencies = [ - "httpdate", - "reqwest", - "sentry-backtrace", - "sentry-contexts", - "sentry-core", - "sentry-panic", - "tokio", -] - -[[package]] -name = "sentry-backtrace" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd0cba2aff36ac98708f7a6e7abbdde82dbaf180d5870c41084dc1b473648b9" -dependencies = [ - "backtrace", - "lazy_static", - "regex", - "sentry-core", -] - -[[package]] -name = "sentry-contexts" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bacf1c62427c6c97b896640d0c4dd204bbd3b79dd192d7cb40891aa5ee11d58" -dependencies = [ - "hostname", - "lazy_static", - "libc", - "regex", - "rustc_version 0.4.0", - "sentry-core", - "uname", -] - -[[package]] -name = "sentry-core" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a957270c9a430218f8031c866493061a27e35a70250e9527f093563a33ce6b" -dependencies = [ - "chrono", - "lazy_static", - "rand", - "sentry-types", - "serde", - "serde_json", -] - -[[package]] -name = "sentry-panic" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692bf989f0c99f025e33d7f58e62822c3771f56d189698c66dcc863122255d95" -dependencies = [ - "sentry-backtrace", - "sentry-core", -] - -[[package]] -name = "sentry-types" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4dd2266fee014a86e250e98e389191ecd23be546b5c42b6a2fb9af2972fadac" -dependencies = [ - "chrono", - "debugid", - "serde", - "serde_json", - "thiserror", - "url", - "uuid", -] - -[[package]] -name = "serde" -version = "1.0.130" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.130" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f9e390c27c3c0ce8bc5d725f6e4d30a29d26659494aa4b17535f7522c5c950" -dependencies = [ - "indexmap", - "itoa", - "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", - "serde", - "url", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serial_test" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0bccbcf40c8938196944a3da0e133e031a33f4d6b72db3bda3cc556e361905d" -dependencies = [ - "lazy_static", - "parking_lot 0.11.2", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2acd6defeddb41eb60bb468f8825d0cfd0c2a76bc03bfd235b6a1dc4f6a1ad5" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "sha1" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" - -[[package]] -name = "sha2" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9204c41a1597a8c5af23c82d1c921cb01ec0a4c59e07a9c7306062829a3903f3" -dependencies = [ - "block-buffer", - "cfg-if 1.0.0", - "cpufeatures", - "digest", - "opaque-debug", -] - -[[package]] -name = "shlex" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" - -[[package]] -name = "signal-hook-registry" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" -dependencies = [ - "libc", -] - -[[package]] -name = "slab" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" - -[[package]] -name = "slug" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373" -dependencies = [ - "deunicode", -] - -[[package]] -name = "smallvec" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" - -[[package]] -name = "snap" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451" - -[[package]] -name = "socket2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version 0.2.3", - "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", -] - -[[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", -] - -[[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 = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c" - -[[package]] -name = "strum_macros" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "syn" -version = "1.0.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "tempfile" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "rand", - "redox_syscall 0.2.10", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "textwrap" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "thrift" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6d965454947cc7266d22716ebfd07b18d84ebaf35eec558586bbb2a8cb6b5b" -dependencies = [ - "byteorder", - "integer-encoding", - "log", - "ordered-float", - "threadpool", -] - -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi", -] - -[[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", -] - -[[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", -] - -[[package]] -name = "tinyvec" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "tokio" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce" -dependencies = [ - "autocfg", - "bytes", - "libc", - "memchr", - "mio", - "num_cpus", - "once_cell", - "parking_lot 0.11.2", - "pin-project-lite", - "signal-hook-registry", - "tokio-macros", - "winapi", -] - -[[package]] -name = "tokio-macros" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d3725d3efa29485e87311c5b699de63cde14b00ed4d256b8318aa30ca452cd" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "log", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" -dependencies = [ - "serde", -] - -[[package]] -name = "tower-service" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" - -[[package]] -name = "tracing" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" -dependencies = [ - "cfg-if 1.0.0", - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "try-lock" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - -[[package]] -name = "typenum" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" - -[[package]] -name = "uname" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" -dependencies = [ - "libc", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085" - -[[package]] -name = "unicode-normalization" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "url" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" -dependencies = [ - "form_urlencoded", - "idna", - "matches", - "percent-encoding", - "serde", -] - -[[package]] -name = "utime" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91baa0c65eabd12fcbdac8cc35ff16159cab95cae96d0222d6d0271db6193cef" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom", - "serde", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" - -[[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.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - -[[package]] -name = "wasm-bindgen" -version = "0.2.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" -dependencies = [ - "bumpalo", - "lazy_static", - "log", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" - -[[package]] -name = "web-sys" -version = "0.3.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[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 = "winreg" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" -dependencies = [ - "winapi", -] - -[[package]] -name = "xml-rs" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" - -[[package]] -name = "zeroize" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "377db0846015f7ae377174787dd452e1c5f5a9050bc6f954911d01f116daa0cd" - -[[package]] -name = "zstd" -version = "0.9.0+zstd.1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07749a5dc2cb6b36661290245e350f15ec3bbb304e493db54a1d354480522ccd" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "4.1.1+zstd.1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c91c90f2c593b003603e5e0493c837088df4469da25aafff8bce42ba48caf079" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "1.6.1+zstd.1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615120c7a2431d16cf1cf979e7fc31ba7a5b5e5707b29c8a99e5dbf8a8392a33" -dependencies = [ - "cc", - "libc", -] diff --git a/pkgs/development/tools/kafka-delta-ingest/default.nix b/pkgs/development/tools/kafka-delta-ingest/default.nix deleted file mode 100644 index 8dd3cf1299cb..000000000000 --- a/pkgs/development/tools/kafka-delta-ingest/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, pkg-config -, openssl -, perl -, rdkafka -}: - -rustPlatform.buildRustPackage rec { - pname = "kafka-delta-ingest"; - version = "unstable-2021-12-08"; - - src = fetchFromGitHub { - owner = "delta-io"; - repo = pname; - rev = "c48c854145b5aab1b8f36cc04978880794a2273c"; - sha256 = "sha256-q0jOVZlxMHIhnc8y2N8o7Sl5Eg7DfJ96kXrPIV8RD1Y="; - }; - - nativeBuildInputs = [ - pkg-config - perl - ]; - - buildFeatures = [ "dynamic-linking" ]; - - buildInputs = [ - openssl - rdkafka - ]; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "deltalake-0.4.1" = "sha256-0v3n+qMbBhw53qPuZdhGSO+aqc6j8T577fnyEIQmPDU="; - }; - }; - - # many tests seem to require a running kafka instance - doCheck = false; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "Highly efficient daemon for streaming data from Kafka into Delta Lake"; - mainProgram = "kafka-delta-ingest"; - homepage = "https://github.com/delta-io/kafka-delta-ingest"; - license = licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/kafkactl/default.nix b/pkgs/development/tools/kafkactl/default.nix deleted file mode 100644 index 8e9b7c5ab800..000000000000 --- a/pkgs/development/tools/kafkactl/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "kafkactl"; - version = "5.3.0"; - - src = fetchFromGitHub { - owner = "deviceinsight"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-OPXSajfR/eHSL0nHOIYPYvML2PsxtflBt7aTLPT1i0M="; - }; - - vendorHash = "sha256-VY1pm1RSfNGswuVoD73Mrpq+yMtenbjfpV7q72x/z7o="; - - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/deviceinsight/kafkactl"; - changelog = "https://github.com/deviceinsight/kafkactl/blob/v${version}/CHANGELOG.md"; - description = "Command Line Tool for managing Apache Kafka"; - mainProgram = "kafkactl"; - longDescription = '' - A command-line interface for interaction with Apache Kafka. - Features: - - command auto-completion for bash, zsh, fish shell including dynamic completion for e.g. topics or consumer groups - - support for avro schemas - - Configuration of different contexts - - directly access kafka clusters inside your kubernetes cluster - ''; - license = licenses.asl20; - maintainers = with maintainers; [ grburst ]; - }; -} diff --git a/pkgs/development/tools/karate/default.nix b/pkgs/development/tools/karate/default.nix deleted file mode 100644 index bc3076931d69..000000000000 --- a/pkgs/development/tools/karate/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenvNoCC, fetchurl, jre, makeWrapper }: - -stdenvNoCC.mkDerivation rec { - pname = "karate"; - version = "1.5.0"; - - src = fetchurl { - url = "https://github.com/karatelabs/karate/releases/download/v${version}/karate-${version}.jar"; - sha256 = "sha256-3uz51dQvyvK7gcmRoUjfszghBaPfVc/SJaKSEWkfgr8="; - }; - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - makeWrapper ${jre}/bin/java $out/bin/karate --add-flags "-jar $src" - runHook postInstall - ''; - - meta = with lib; { - description = "API Test Automation Made Simple"; - mainProgram = "karate"; - longDescription = '' - Karate is the only open-source tool to combine API - test-automation, mocks, performance-testing and even UI - automation into a single, unified framework. The BDD syntax - popularized by Cucumber is language-neutral, and easy for even - non-programmers. Assertions and HTML reports are built-in, and - you can run tests in parallel for speed. - ''; - homepage = "https://github.com/karatelabs/karate"; - changelog = "https://github.com/karatelabs/karate/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ maintainers.kephasp ]; - platforms = jre.meta.platforms; - }; -} diff --git a/pkgs/development/tools/karma-runner/default.nix b/pkgs/development/tools/karma-runner/default.nix deleted file mode 100644 index 514d789ac678..000000000000 --- a/pkgs/development/tools/karma-runner/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "karma"; - version = "6.4.2"; - - src = fetchFromGitHub { - owner = "karma-runner"; - repo = "karma"; - rev = "v${version}"; - hash = "sha256-v6IiLz65NS8GwM/FPqRxR5qcFDDu7EqloR0SIensdDI="; - }; - - patches = [ - ./fix-package-lock.patch - ]; - - npmDepsHash = "sha256-nX4/96WdPEDZ6DASp+AOBbBbHyq+p2zIh2dZUbtmIPI="; - - env.PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = true; - - meta = { - description = "Spectacular Test Runner for JavaScript"; - homepage = "http://karma-runner.github.io/"; - license = lib.licenses.mit; - mainProgram = "karma"; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/karma-runner/fix-package-lock.patch b/pkgs/development/tools/karma-runner/fix-package-lock.patch deleted file mode 100644 index c1a835382513..000000000000 --- a/pkgs/development/tools/karma-runner/fix-package-lock.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/package-lock.json b/package-lock.json -index 413cf4d1..1d03d9f5 100644 ---- a/package-lock.json -+++ b/package-lock.json -@@ -5226,36 +5226,6 @@ - "integrity": "sha512-ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA==", - "dev": true - }, -- "karma": { -- "version": "file:", -- "dev": true, -- "requires": { -- "@colors/colors": "1.5.0", -- "body-parser": "^1.19.0", -- "braces": "^3.0.2", -- "chokidar": "^3.5.1", -- "connect": "^3.7.0", -- "di": "^0.0.1", -- "dom-serialize": "^2.2.1", -- "glob": "^7.1.7", -- "graceful-fs": "^4.2.6", -- "http-proxy": "^1.18.1", -- "isbinaryfile": "^4.0.8", -- "lodash": "^4.17.21", -- "log4js": "^6.4.1", -- "mime": "^2.5.2", -- "minimatch": "^3.0.4", -- "mkdirp": "^0.5.5", -- "qjobs": "^1.2.0", -- "range-parser": "^1.2.1", -- "rimraf": "^3.0.2", -- "socket.io": "^4.4.1", -- "source-map": "^0.6.1", -- "tmp": "^0.2.1", -- "ua-parser-js": "^0.7.30", -- "yargs": "^16.1.1" -- } -- }, - "karma-browserify": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/karma-browserify/-/karma-browserify-7.0.0.tgz", -diff --git a/package.json b/package.json -index 347d9e95..90f6d036 100644 ---- a/package.json -+++ b/package.json -@@ -471,7 +471,6 @@ - "eslint-plugin-standard": "^4.0.1", - "http2": "^3.3.6", - "jasmine-core": "^3.6.0", -- "karma": ".", - "karma-browserify": "^7.0.0", - "karma-browserstack-launcher": "^1.6.0", - "karma-chai": "^0.1.0", diff --git a/pkgs/development/tools/kcat/default.nix b/pkgs/development/tools/kcat/default.nix deleted file mode 100644 index f3bd6a8555b6..000000000000 --- a/pkgs/development/tools/kcat/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl, avro-c, libserdes, which }: - -stdenv.mkDerivation rec { - pname = "kcat"; - - version = "1.7.1"; - - src = fetchFromGitHub { - owner = "edenhill"; - repo = "kcat"; - rev = version; - sha256 = "sha256-pCIYNx0GYPGDYzTLq9h/LbOrJjhKWLAV4gq07Ikl5O4="; - }; - - nativeBuildInputs = [ pkg-config which ]; - - buildInputs = [ zlib rdkafka yajl avro-c libserdes ]; - - meta = with lib; { - description = "Generic non-JVM producer and consumer for Apache Kafka"; - mainProgram = "kcat"; - homepage = "https://github.com/edenhill/kcat"; - license = licenses.bsd2; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ nyarly ]; - }; -} diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix deleted file mode 100644 index 4047b3c296dd..000000000000 --- a/pkgs/development/tools/kcli/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "kcli"; - version = "1.8.3"; - - src = fetchFromGitHub { - owner = "cswank"; - repo = "kcli"; - rev = version; - sha256 = "0whijr2r2j5bvfy8jgmpxsa0zvwk5kfjlpnkw4za5k35q7bjffls"; - }; - - vendorHash = null; - - subPackages = [ "." ]; - - meta = with lib; { - description = "Kafka command line browser"; - homepage = "https://github.com/cswank/kcli"; - license = licenses.mit; - maintainers = with maintainers; [ cswank ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check - }; -} diff --git a/pkgs/development/tools/kdash/default.nix b/pkgs/development/tools/kdash/default.nix index 13edb7bd1fed..aceddd467b02 100644 --- a/pkgs/development/tools/kdash/default.nix +++ b/pkgs/development/tools/kdash/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ perl python3 pkg-config ]; buildInputs = [ openssl xorg.xcbutil ] - ++ lib.optional stdenv.isDarwin AppKit; + ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; cargoHash = "sha256-jm0UCKDy6TrogMPavB86lvk8yKZXubTGGbApk+oP2RQ="; diff --git a/pkgs/development/tools/kdoctor/default.nix b/pkgs/development/tools/kdoctor/default.nix deleted file mode 100644 index 7054be1b08c9..000000000000 --- a/pkgs/development/tools/kdoctor/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, fetchurl -, unzip -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "kdoctor"; - version = "1.1.0"; - - src = fetchurl { - url = "https://github.com/Kotlin/kdoctor/releases/download/v${finalAttrs.version}/kdoctor_${finalAttrs.version}+97.zip"; - hash = "sha256-H4lpdMf1AIU8BC+6DlvcwM1wLuEl+Hd9xBli/TGFMV4="; - }; - - nativeBuildInputs = [ unzip ]; - - unpackPhase = '' - runHook preUnpack - unzip $src -x META-INF/* - runHook postUnpack - ''; - - installPhase = '' - runHook preInstall - install -Dm755 kdoctor -t $out/bin/ - runHook postInstall - ''; - - meta = with lib; { - description = "Environment analysis tool for Kotlin Multiplatform Mobile"; - longDescription = '' - KDoctor is a command-line tool that helps to set up the environment for - Kotlin Multiplatform Mobile app development. - ''; - homepage = "https://github.com/Kotlin/kdoctor"; - license = licenses.asl20; - mainProgram = "kdoctor"; - maintainers = with maintainers; [ sironheart ]; - platforms = platforms.darwin; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -}) diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix deleted file mode 100644 index 239ecdcf1d6b..000000000000 --- a/pkgs/development/tools/kind/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "kind"; - version = "0.24.0"; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "kubernetes-sigs"; - repo = "kind"; - hash = "sha256-vndN3ssiaaJdpPZQ0vBdqr4xPuY2bAHAd+SJamNrX6Q="; - }; - - patches = [ - # fix kernel module path used by kind - ./kernel-module-path.patch - ]; - - vendorHash = "sha256-VfqNM48M39R2LaUHirKmSXCdvBXUHu09oMzDPmAQC4o="; - - nativeBuildInputs = [ installShellFiles ]; - - subPackages = [ "." ]; - - CGO_ENABLED = 0; - - ldflags = [ "-s" "-w" ]; - - doCheck = false; - - postInstall = '' - installShellCompletion --cmd kind \ - --bash <($out/bin/kind completion bash) \ - --fish <($out/bin/kind completion fish) \ - --zsh <($out/bin/kind completion zsh) - ''; - - meta = with lib; { - description = "Kubernetes IN Docker - local clusters for testing Kubernetes"; - homepage = "https://github.com/kubernetes-sigs/kind"; - maintainers = with maintainers; [ offline rawkode ]; - license = licenses.asl20; - mainProgram = "kind"; - }; -} diff --git a/pkgs/development/tools/kind/kernel-module-path.patch b/pkgs/development/tools/kind/kernel-module-path.patch deleted file mode 100644 index dd04c9ec3050..000000000000 --- a/pkgs/development/tools/kind/kernel-module-path.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/pkg/cluster/internal/providers/common/getmodules.go b/pkg/cluster/internal/providers/common/getmodules.go -new file mode 100644 -index 00000000..1cce5675 ---- /dev/null -+++ b/pkg/cluster/internal/providers/common/getmodules.go -@@ -0,0 +1,15 @@ -+package common -+ -+import "os" -+ -+const ( -+ fhsKernelModulePath = "/lib/modules" -+ nixKernelModulePath = "/run/booted-system/kernel-modules/lib/modules" -+) -+ -+func GetKernelModulePath() string { -+ if _, err := os.Stat(nixKernelModulePath); !os.IsNotExist(err) { -+ return nixKernelModulePath -+ } -+ return fhsKernelModulePath -+} -diff --git a/pkg/cluster/internal/providers/docker/provision.go b/pkg/cluster/internal/providers/docker/provision.go -index 97b05594..3aaa9830 100644 ---- a/pkg/cluster/internal/providers/docker/provision.go -+++ b/pkg/cluster/internal/providers/docker/provision.go -@@ -230,7 +230,7 @@ func runArgsForNode(node *config.Node, clusterIPFamily config.ClusterIPFamily, n - // (please don't depend on doing this though!) - "--volume", "/var", - // some k8s things want to read /lib/modules -- "--volume", "/lib/modules:/lib/modules:ro", -+ "--volume", fmt.Sprintf("%s:/lib/modules:ro", common.GetKernelModulePath()), - // propagate KIND_EXPERIMENTAL_CONTAINERD_SNAPSHOTTER to the entrypoint script - "-e", "KIND_EXPERIMENTAL_CONTAINERD_SNAPSHOTTER", - }, -diff --git a/pkg/cluster/internal/providers/podman/provision.go b/pkg/cluster/internal/providers/podman/provision.go -index 50aa7018..7e25a4de 100644 ---- a/pkg/cluster/internal/providers/podman/provision.go -+++ b/pkg/cluster/internal/providers/podman/provision.go -@@ -203,7 +203,7 @@ func runArgsForNode(node *config.Node, clusterIPFamily config.ClusterIPFamily, n - // dev: devices on the volume will be able to be used by processes within the container - "--volume", fmt.Sprintf("%s:/var:suid,exec,dev", varVolume), - // some k8s things want to read /lib/modules -- "--volume", "/lib/modules:/lib/modules:ro", -+ "--volume", fmt.Sprintf("%s:/lib/modules:ro", common.GetKernelModulePath()), - // propagate KIND_EXPERIMENTAL_CONTAINERD_SNAPSHOTTER to the entrypoint script - "-e", "KIND_EXPERIMENTAL_CONTAINERD_SNAPSHOTTER", - }, diff --git a/pkgs/development/tools/knightos/genkfs/default.nix b/pkgs/development/tools/knightos/genkfs/default.nix deleted file mode 100644 index c3bf1a1e7a75..000000000000 --- a/pkgs/development/tools/knightos/genkfs/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, asciidoc, cmake, libxslt }: - -stdenv.mkDerivation rec { - pname = "genkfs"; - version = "1.3.2"; - - src = fetchFromGitHub { - owner = "KnightOS"; - repo = "genkfs"; - rev = version; - sha256 = "0f50idd2bb73b05qjmwlirjnhr1bp43zhrgy6z949ab9a7hgaydp"; - }; - - strictDeps = true; - - nativeBuildInputs = [ asciidoc libxslt.bin cmake ]; - - hardeningDisable = [ "format" ]; - - meta = with lib; { - homepage = "https://knightos.org/"; - description = "Utility to write a KFS filesystem into a ROM file"; - mainProgram = "genkfs"; - license = licenses.mit; - maintainers = with maintainers; [ siraben ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/knightos/kcc/default.nix b/pkgs/development/tools/knightos/kcc/default.nix deleted file mode 100644 index 3de660ce065c..000000000000 --- a/pkgs/development/tools/knightos/kcc/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, bison, flex, boost }: - -stdenv.mkDerivation rec { - pname = "kcc"; - - version = "4.0.4"; - - src = fetchFromGitHub { - owner = "KnightOS"; - repo = "kcc"; - rev = version; - sha256 = "13sbpv8ynq8sjackv93jqxymk0bsy76c5fc0v29wz97v53q3izjp"; - }; - - strictDeps = true; - - nativeBuildInputs = [ bison cmake flex ]; - - buildInputs = [ boost ]; - - meta = with lib; { - homepage = "https://knightos.org/"; - description = "KnightOS C compiler"; - mainProgram = "kcc"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ siraben ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/knightos/kimg/default.nix b/pkgs/development/tools/knightos/kimg/default.nix deleted file mode 100644 index b987d11ce4bd..000000000000 --- a/pkgs/development/tools/knightos/kimg/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libxslt, asciidoc }: - -stdenv.mkDerivation rec { - pname = "kimg"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "KnightOS"; - repo = "kimg"; - rev = version; - sha256 = "040782k3rh2a5mhbfgr9gnbfis0wgxvi27vhfn7l35vrr12sw1l3"; - }; - - strictDeps = true; - - nativeBuildInputs = [ asciidoc cmake libxslt.bin ]; - - hardeningDisable = [ "format" ]; - - meta = with lib; { - homepage = "https://knightos.org/"; - description = "Converts image formats supported by stb_image to the KnightOS image format"; - mainProgram = "kimg"; - license = licenses.mit; - maintainers = with maintainers; [ siraben ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/knightos/kpack/default.nix b/pkgs/development/tools/knightos/kpack/default.nix deleted file mode 100644 index ee0ac1568614..000000000000 --- a/pkgs/development/tools/knightos/kpack/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt }: - -stdenv.mkDerivation rec { - pname = "kpack"; - - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "KnightOS"; - repo = "kpack"; - rev = version; - sha256 = "1l6bm2j45946i80qgwhrixg9sckazwb5x4051s76d3mapq9bara8"; - }; - - strictDeps = true; - - nativeBuildInputs = [ asciidoc cmake libxslt.bin ]; - - hardeningDisable = [ "fortify" ]; - - meta = with lib; { - homepage = "https://knightos.org/"; - description = "Tool to create or extract KnightOS packages"; - mainProgram = "kpack"; - license = licenses.lgpl2Only; - maintainers = with maintainers; [ siraben ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/knightos/mkrom/default.nix b/pkgs/development/tools/knightos/mkrom/default.nix deleted file mode 100644 index a95f9530992a..000000000000 --- a/pkgs/development/tools/knightos/mkrom/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libxslt, asciidoc }: - -stdenv.mkDerivation rec { - pname = "mkrom"; - version = "1.0.4"; - - src = fetchFromGitHub { - owner = "KnightOS"; - repo = "mkrom"; - rev = version; - sha256 = "sha256-YFrh0tOGiM90uvU9ZWopW1+9buHDQtetuOtPDSYYaXw="; - }; - - strictDeps = true; - nativeBuildInputs = [ asciidoc libxslt.bin ]; - - installFlags = [ "DESTDIR=$(out)" ]; - installTargets = [ "install" "install_man" ]; - - meta = with lib; { - homepage = "https://knightos.org/"; - description = "Packages KnightOS distribution files into a ROM"; - mainProgram = "mkrom"; - license = licenses.mit; - maintainers = with maintainers; [ siraben ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/knightos/mktiupgrade/default.nix b/pkgs/development/tools/knightos/mktiupgrade/default.nix deleted file mode 100644 index 0cd855345866..000000000000 --- a/pkgs/development/tools/knightos/mktiupgrade/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libxslt, asciidoc }: - -stdenv.mkDerivation rec { - pname = "mktiupgrade"; - version = "1.1.6"; - - src = fetchFromGitHub { - owner = "KnightOS"; - repo = "mktiupgrade"; - rev = version; - sha256 = "15y3rxvv7ipgc80wrvrpksxzdyqr21ywysc9hg6s7d3w8lqdq8dm"; - }; - - strictDeps = true; - - nativeBuildInputs = [ asciidoc cmake libxslt.bin ]; - - hardeningDisable = [ "format" ]; - - meta = with lib; { - homepage = "https://knightos.org/"; - description = "Makes TI calculator upgrade files from ROM dumps"; - mainProgram = "mktiupgrade"; - license = licenses.mit; - maintainers = with maintainers; [ siraben ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/knightos/patchrom/default.nix b/pkgs/development/tools/knightos/patchrom/default.nix deleted file mode 100644 index 6eb4e2b308b4..000000000000 --- a/pkgs/development/tools/knightos/patchrom/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt }: - - -stdenv.mkDerivation rec { - pname = "patchrom"; - - version = "1.1.3"; - - src = fetchFromGitHub { - owner = "KnightOS"; - repo = "patchrom"; - rev = version; - sha256 = "0yc4q7n3k7k6rx3cxq5ddd5r0la8gw1287a74kql6gwkxjq0jmcv"; - }; - - strictDeps = true; - - nativeBuildInputs = [ asciidoc cmake libxslt.bin ]; - - hardeningDisable = [ "format" ]; - - meta = with lib; { - homepage = "https://knightos.org/"; - description = "Patches jumptables into TI calculator ROM files and generates an include file"; - mainProgram = "patchrom"; - license = licenses.mit; - maintainers = with maintainers; [ siraben ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/knightos/regenkfs/default.nix b/pkgs/development/tools/knightos/regenkfs/default.nix deleted file mode 100644 index b8d4ed3b1554..000000000000 --- a/pkgs/development/tools/knightos/regenkfs/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage { - pname = "regenkfs"; - version = "unstable-2020-10-17"; - - src = fetchFromGitHub { - owner = "siraben"; - repo = "regenkfs"; - rev = "652155445fc39bbe6628f6b9415b5cd6863f592f"; - sha256 = "sha256-zkwOpMNPGstn/y1l1s8blUKpBebY4Ta9hiPYxVLvG6Y="; - }; - - cargoHash = "sha256-05VmQdop4vdzw2XEvVdp9+RNmyZvay1Q7gKN2n8rDEQ="; - - buildFeatures = [ "c-undef" ]; - - meta = with lib; { - description = "Reimplementation of genkfs in Rust"; - homepage = "https://github.com/siraben/regenkfs"; - license = licenses.mit; - maintainers = with maintainers; [ siraben ]; - mainProgram = "regenkfs"; - }; -} diff --git a/pkgs/development/tools/knightos/remkrom/default.nix b/pkgs/development/tools/knightos/remkrom/default.nix deleted file mode 100644 index c7a8fb21241e..000000000000 --- a/pkgs/development/tools/knightos/remkrom/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage { - pname = "remkrom"; - version = "unstable-2020-10-17"; - - src = fetchFromGitHub { - owner = "siraben"; - repo = "remkrom"; - rev = "86a0b19c1d382a029ecaa96eeca7e9f76c8561d6"; - sha256 = "sha256-DhfNfV9bd0p5dLXKgrVLyugQHK+RHsepeg0tGq5J6cI="; - }; - - cargoHash = "sha256-JUyIbg1SxQ7pdqypGv7Kz2MM0ZwL3M9YJekO9oSftLM="; - - meta = with lib; { - description = "Reimplementation of mkrom in Rust"; - homepage = "https://github.com/siraben/remkrom"; - license = licenses.mit; - maintainers = with maintainers; [ siraben ]; - mainProgram = "remkrom"; - }; -} diff --git a/pkgs/development/tools/knightos/scas/default.nix b/pkgs/development/tools/knightos/scas/default.nix deleted file mode 100644 index e05953e87ec7..000000000000 --- a/pkgs/development/tools/knightos/scas/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ fetchFromGitHub, lib, stdenv, cmake, buildPackages, asciidoc, libxslt }: - -let - isCrossCompiling = stdenv.hostPlatform != stdenv.buildPlatform; -in - -stdenv.mkDerivation rec { - pname = "scas"; - version = "0.5.5"; - - src = fetchFromGitHub { - owner = "KnightOS"; - repo = "scas"; - rev = version; - sha256 = "sha256-JGQE+orVDKKJsTt8sIjPX+3yhpZkujISroQ6g19+MzU="; - }; - - cmakeFlags = [ "-DSCAS_LIBRARY=1" ]; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "TARGETS scas scdump scwrap" "TARGETS scas scdump scwrap generate_tables" - ''; - strictDeps = true; - - depsBuildBuild = lib.optionals isCrossCompiling [ buildPackages.knightos-scas ]; - nativeBuildInputs = [ asciidoc libxslt.bin cmake ]; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ - "-Wno-error=implicit-function-declaration" - ]); - - postInstall = '' - cd .. - make DESTDIR=$out install_man - ''; - - meta = with lib; { - homepage = "https://knightos.org/"; - description = "Assembler and linker for the Z80"; - license = licenses.mit; - maintainers = with maintainers; [ siraben ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/knightos/z80e/default.nix b/pkgs/development/tools/knightos/z80e/default.nix deleted file mode 100644 index 41c5e5ca9be8..000000000000 --- a/pkgs/development/tools/knightos/z80e/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, knightos-scas, readline, SDL2 }: - -stdenv.mkDerivation rec { - pname = "z80e"; - version = "0.5.3"; - - src = fetchFromGitHub { - owner = "KnightOS"; - repo = "z80e"; - rev = version; - sha256 = "sha256-FQMYHxKxHEP+x98JbGyjaM0OL8QK/p3epsAWvQkv6bc="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ readline SDL2 knightos-scas ]; - - cmakeFlags = [ "-Denable-sdl=YES" ]; - - meta = with lib; { - homepage = "https://knightos.org/"; - description = "Z80 calculator emulator and debugger"; - license = licenses.mit; - maintainers = with maintainers; [ siraben ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix deleted file mode 100644 index 01dec8c3bf1b..000000000000 --- a/pkgs/development/tools/ko/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, git -, installShellFiles -}: - -buildGoModule rec { - pname = "ko"; - version = "0.15.4"; - - src = fetchFromGitHub { - owner = "ko-build"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-MeFoy2WoPsJIgUhpzt/4sEP6J9lM4nsSAK2VZiTS7jo="; - }; - - vendorHash = "sha256-n/NbbitSyjl05gESPVG3Uv2ek1U0Cd2fQqcxBhDKULU="; - - nativeBuildInputs = [ installShellFiles ]; - - # Pin so that we don't build the several other development tools - subPackages = "."; - - ldflags = [ "-s" "-w" "-X github.com/google/ko/pkg/commands.Version=${version}" ]; - - checkFlags = [ - # requires docker daemon - "-skip=TestNewPublisherCanPublish" - ]; - - nativeCheckInputs = [ git ]; - preCheck = '' - # Feed in all the tests for testing - # This is because subPackages above limits what is built to just what we - # want but also limits the tests - getGoDirs() { - go list ./... - } - - # resolves some complaints from ko - export GOROOT="$(go env GOROOT)" - git init - - # ko tests will fail if any of those env are set, as ko tries - # to make sure it can build and target multiple GOOS/GOARCH - unset GOOS GOARCH GOARM - ''; - - postInstall = '' - installShellCompletion --cmd ko \ - --bash <($out/bin/ko completion bash) \ - --fish <($out/bin/ko completion fish) \ - --zsh <($out/bin/ko completion zsh) - ''; - - meta = with lib; { - homepage = "https://github.com/ko-build/ko"; - changelog = "https://github.com/ko-build/ko/releases/tag/v${version}"; - description = "Build and deploy Go applications on Kubernetes"; - mainProgram = "ko"; - longDescription = '' - ko is a simple, fast container image builder for Go applications. - It's ideal for use cases where your image contains a single Go application without any/many dependencies on the OS base image (e.g. no cgo, no OS package dependencies). - ko builds images by effectively executing go build on your local machine, and as such doesn't require docker to be installed. This can make it a good fit for lightweight CI/CD use cases. - ko also includes support for simple YAML templating which makes it a powerful tool for Kubernetes applications. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ nickcao jk vdemeester developer-guy ]; - }; -} diff --git a/pkgs/development/tools/konstraint/default.nix b/pkgs/development/tools/konstraint/default.nix deleted file mode 100644 index 5ef27e097976..000000000000 --- a/pkgs/development/tools/konstraint/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "konstraint"; - version = "0.38.0"; - - src = fetchFromGitHub { - owner = "plexsystems"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-02vmIsYGX6HB7k1HArMpNY+UxVX24IyraNPu13ht2qQ="; - }; - vendorHash = "sha256-eD0K2te9+9x0fUYMVZ6SreV2AhkYwBzQHUTyeNwuEHc="; - - # Exclude go within .github folder - excludedPackages = ".github"; - - nativeBuildInputs = [ installShellFiles ]; - - ldflags = [ "-s" "-w" "-X github.com/plexsystems/konstraint/internal/commands.version=${version}" ]; - - postInstall = '' - installShellCompletion --cmd konstraint \ - --bash <($out/bin/konstraint completion bash) \ - --fish <($out/bin/konstraint completion fish) \ - --zsh <($out/bin/konstraint completion zsh) - ''; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/konstraint --help - $out/bin/konstraint --version | grep "${version}" - runHook postInstallCheck - ''; - - meta = with lib; { - homepage = "https://github.com/plexsystems/konstraint"; - changelog = "https://github.com/plexsystems/konstraint/releases/tag/v${version}"; - description = "Policy management tool for interacting with Gatekeeper"; - mainProgram = "konstraint"; - longDescription = '' - konstraint is a CLI tool to assist with the creation and management of templates and constraints when using - Gatekeeper. Automatically copy Rego to the ConstraintTemplate. Automatically update all ConstraintTemplates with - library changes. Enable writing the same policies for Conftest and Gatekeeper. - ''; - license = licenses.mit; - maintainers = with maintainers; [ jk ]; - }; -} diff --git a/pkgs/development/tools/krankerl/default.nix b/pkgs/development/tools/krankerl/default.nix deleted file mode 100644 index 51d0e5e634b9..000000000000 --- a/pkgs/development/tools/krankerl/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, pkg-config -, openssl -, dbus -, sqlite -, file -, makeWrapper -}: - -rustPlatform.buildRustPackage rec { - pname = "krankerl"; - version = "0.14.0"; - - src = fetchFromGitHub { - owner = "ChristophWurst"; - repo = "krankerl"; - rev = "v${version}"; - sha256 = "sha256-fFtjQFkNB5vn9nlFJI6nRdqxB9PmOGl3ySZ5LG2tgPg="; - }; - - cargoHash = "sha256-0V2ftZmuKXRhOFWCroYOxQqW3NFh9Uuwcg0CM1sFlcQ="; - - nativeBuildInputs = [ - pkg-config - makeWrapper - ]; - - buildInputs = [ - openssl - dbus - sqlite - ]; - - nativeCheckInputs = [ - file - ]; - - meta = with lib; { - description = "CLI helper to manage, package and publish Nextcloud apps"; - mainProgram = "krankerl"; - homepage = "https://github.com/ChristophWurst/krankerl"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ onny ]; - }; -} diff --git a/pkgs/development/tools/krew/default.nix b/pkgs/development/tools/krew/default.nix deleted file mode 100644 index 490fc4b94a76..000000000000 --- a/pkgs/development/tools/krew/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, gitMinimal }: - -buildGoModule rec { - pname = "krew"; - version = "0.4.4"; - - src = fetchFromGitHub { - owner = "kubernetes-sigs"; - repo = "krew"; - rev = "v${version}"; - sha256 = "sha256-SN6F7EmkgjtU4UHYPXWBiuXSSagjQYD6SBYBXRrSVGA="; - }; - - vendorHash = "sha256-3tEesDezIyB6005PZmOcrnEeAIvc5za3FxTmBBbKf7s="; - - subPackages = [ "cmd/krew" ]; - - nativeBuildInputs = [ makeWrapper ]; - - postFixup = '' - wrapProgram $out/bin/krew \ - --prefix PATH : ${lib.makeBinPath [ gitMinimal ]} - ''; - - meta = with lib; { - description = "Package manager for kubectl plugins"; - mainProgram = "krew"; - homepage = "https://github.com/kubernetes-sigs/krew"; - maintainers = with maintainers; [ vdemeester ]; - license = lib.licenses.asl20; - }; -} diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix deleted file mode 100644 index 1dc7b205e0d9..000000000000 --- a/pkgs/development/tools/ktlint/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre_headless, gnused }: - -stdenv.mkDerivation rec { - pname = "ktlint"; - version = "1.3.1"; - - src = fetchurl { - url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "sha256-qfkjvlj70yZwoX8Lcpsd+ASviC+ldAIWV0HLJuVEDKE="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - dontUnpack = true; - - installPhase = '' - install -Dm755 $src $out/bin/ktlint - ''; - - postFixup = '' - wrapProgram $out/bin/ktlint --prefix PATH : "${lib.makeBinPath [ jre_headless gnused ]}" - ''; - - meta = with lib; { - description = "Anti-bikeshedding Kotlin linter with built-in formatter"; - homepage = "https://ktlint.github.io/"; - license = licenses.mit; - platforms = jre_headless.meta.platforms; - changelog = "https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md"; - maintainers = with maintainers; [ tadfisher SubhrajyotiSen ]; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - mainProgram = "ktlint"; - }; -} diff --git a/pkgs/development/tools/kube-linter/default.nix b/pkgs/development/tools/kube-linter/default.nix deleted file mode 100644 index df0abaac6fa1..000000000000 --- a/pkgs/development/tools/kube-linter/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kube-linter }: - -buildGoModule rec { - pname = "kube-linter"; - version = "0.6.8"; - - src = fetchFromGitHub { - owner = "stackrox"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-abfNzf+84BWHpvLQZKyzl7WBt7UHj2zqzKq3VCqAwwY="; - }; - - vendorHash = "sha256-FUkGiJ/6G9vSYtAj0v9GT4OINbO3d/OKlJ0YwhONftY="; - - ldflags = [ - "-s" "-w" "-X golang.stackrox.io/kube-linter/internal/version.version=${version}" - ]; - - nativeBuildInputs = [ installShellFiles ]; - - checkFlags = [ "-skip=TestCreateContextsWithIgnorePaths" ]; - - postInstall = '' - installShellCompletion --cmd kube-linter \ - --bash <($out/bin/kube-linter completion bash) \ - --fish <($out/bin/kube-linter completion fish) \ - --zsh <($out/bin/kube-linter completion zsh) - ''; - - passthru.tests.version = testers.testVersion { - package = kube-linter; - command = "kube-linter version"; - }; - - meta = with lib; { - description = "Static analysis tool that checks Kubernetes YAML files and Helm charts"; - homepage = "https://kubelinter.io"; - changelog = "https://github.com/stackrox/kube-linter/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ mtesseract stehessel Intuinewin ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/kube-prompt/default.nix b/pkgs/development/tools/kube-prompt/default.nix deleted file mode 100644 index b9abf26206ef..000000000000 --- a/pkgs/development/tools/kube-prompt/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "kube-prompt"; - version = "1.0.11"; - - src = fetchFromGitHub { - owner = "c-bata"; - repo = "kube-prompt"; - rev = "v${version}"; - sha256 = "sha256-9OWsITbC7YO51QzsRwDWvojU54DiuGJhkSGwmesEj9w="; - }; - - vendorHash = "sha256-wou5inOX8vadEBCIBccwSRjtzf0GH1abwNdUu4JBvyM="; - - meta = with lib; { - description = "Interactive kubernetes client featuring auto-complete"; - mainProgram = "kube-prompt"; - license = licenses.mit; - homepage = "https://github.com/c-bata/kube-prompt"; - maintainers = with maintainers; [ vdemeester ]; - }; -} diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix deleted file mode 100644 index 839525c30eba..000000000000 --- a/pkgs/development/tools/kubectx/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "kubectx"; - version = "0.9.5"; - - src = fetchFromGitHub { - owner = "ahmetb"; - repo = pname; - rev = "v${version}"; - hash = "sha256-HVmtUhdMjbkyMpTgbsr5Mm286F9Q7zbc5rOxi7OBZEg="; - }; - - vendorHash = "sha256-3xetjviMuH+Nev12DB2WN2Wnmw1biIDAckUSGVRHQwM="; - - nativeBuildInputs = [ installShellFiles ]; - - ldflags = [ - "-s" - "-w" - "-X main.version=${version}" - ]; - - postInstall = '' - installShellCompletion completion/* - ''; - - meta = with lib; { - description = "Fast way to switch between clusters and namespaces in kubectl!"; - license = licenses.asl20; - homepage = "https://github.com/ahmetb/kubectx"; - maintainers = with maintainers; [ jlesquembre ]; - }; -} diff --git a/pkgs/development/tools/kubedock/default.nix b/pkgs/development/tools/kubedock/default.nix deleted file mode 100644 index b7103c18a223..000000000000 --- a/pkgs/development/tools/kubedock/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "kubedock"; - version = "0.17.0"; - - src = fetchFromGitHub { - owner = "joyrex2001"; - repo = "kubedock"; - rev = version; - hash = "sha256-UfOFehpN9Qj4LKH61akSidikPytZS4QSFOUzDDw3OCI="; - }; - - vendorHash = "sha256-qPBqKDn6NFa35+f+s2iCeHKdLI7ihK1DUMlq2mldNEI="; - - # config.Build not defined as it would break r-ryantm - ldflags = [ - "-s" - "-w" - "-X github.com/joyrex2001/kubedock/internal/config.Version=${version}" - ]; - - CGO_ENABLED = 0; - - meta = with lib; { - description = "Minimal implementation of the Docker API that will orchestrate containers on a Kubernetes cluster"; - homepage = "https://github.com/joyrex2001/kubedock"; - license = licenses.mit; - maintainers = with maintainers; [ mausch ]; - mainProgram = "kubedock"; - }; -} diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/development/tools/kubeprompt/default.nix deleted file mode 100644 index b1122ac69cb4..000000000000 --- a/pkgs/development/tools/kubeprompt/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "kubeprompt"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "jlesquembre"; - repo = pname; - rev = version; - hash = "sha256-is6Rz0tw/g4HyGJMTHj+r390HZAytVhfGVRzZ5wKZkU="; - }; - - vendorHash = "sha256-UUMulGnqfIshN2WIejZgwrWWlywj5TpnAQ4A5/d0NCE="; - - ldflags = [ - "-w" - "-s" - "-X github.com/jlesquembre/kubeprompt/pkg/version.Version=${version}" - ]; - - doCheck = false; - - meta = with lib; { - description = "Kubernetes prompt"; - mainProgram = "kubeprompt"; - homepage = "https://github.com/jlesquembre/kubeprompt"; - license = licenses.epl20; - maintainers = with maintainers; [ jlesquembre ]; - }; -} diff --git a/pkgs/development/tools/kubepug/default.nix b/pkgs/development/tools/kubepug/default.nix deleted file mode 100644 index fc6f9c30daa0..000000000000 --- a/pkgs/development/tools/kubepug/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "kubepug"; - version = "1.7.1"; - - src = fetchFromGitHub { - owner = "kubepug"; - repo = "kubepug"; - rev = "v${version}"; - hash = "sha256-VNxaYQy81U0JWd6KS0jCvMexpyWL4v1cKpjxLRkxBLE="; - }; - - vendorHash = "sha256-HVsaQBd7fSZp2fOpOOmlDhYrHcHqWKiYWPFLQX0azEw="; - - ldflags = [ - "-s" - "-w" - "-X sigs.k8s.io/release-utils/version.gitVersion=${version}" - ]; - - meta = with lib; { - description = "Checks a Kubernetes cluster for objects using deprecated API versions"; - homepage = "https://github.com/kubepug/kubepug"; - license = licenses.asl20; - maintainers = with maintainers; [ mausch ]; - }; -} diff --git a/pkgs/development/tools/kubernetes-code-generator/default.nix b/pkgs/development/tools/kubernetes-code-generator/default.nix deleted file mode 100644 index 69ffeaf8db31..000000000000 --- a/pkgs/development/tools/kubernetes-code-generator/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "code-generator"; - version = "0.25.4"; - - src = fetchFromGitHub { - owner = "kubernetes"; - repo = pname; - rev = "v${version}"; - hash = "sha256-GKF6DXvyZujInOZbV0ePUu71BEl1s/chNTN1PucdIYw="; - }; - - vendorHash = "sha256-zjgTtGen6a8TPi/DrwheTS1VQ+hd+KI7UHoyMZ4W4+k="; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - homepage = "https://github.com/kubernetes/code-generator"; - changelog = "https://github.com/kubernetes/code-generator/releases/tag/v${version}"; - description = "Kubernetes code generation"; - license = licenses.asl20; - maintainers = with maintainers; [ urandom ]; - }; -} diff --git a/pkgs/development/tools/kubernetes-controller-tools/default.nix b/pkgs/development/tools/kubernetes-controller-tools/default.nix deleted file mode 100644 index 520b0101bc54..000000000000 --- a/pkgs/development/tools/kubernetes-controller-tools/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ buildGoModule, lib, fetchFromGitHub }: - -buildGoModule rec { - pname = "controller-tools"; - version = "0.16.3"; - - src = fetchFromGitHub { - owner = "kubernetes-sigs"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Txvzp8OcRTDCAB8nFrqj93X+Kk/sNPSSLOI07J3DwcM="; - }; - - vendorHash = "sha256-nwzXlsSG7JF145bf/AJZB1GbGJRHJC7Q73Jty6mHc/w="; - - ldflags = [ - "-s" - "-w" - "-X sigs.k8s.io/controller-tools/pkg/version.version=v${version}" - ]; - - doCheck = false; - - subPackages = [ - "cmd/controller-gen" - "cmd/type-scaffold" - "cmd/helpgen" - ]; - - meta = with lib; { - description = "Tools to use with the Kubernetes controller-runtime libraries"; - homepage = "https://github.com/kubernetes-sigs/controller-tools"; - changelog = "https://github.com/kubernetes-sigs/controller-tools/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ michojel ]; - }; -} diff --git a/pkgs/development/tools/kubeswitch/default.nix b/pkgs/development/tools/kubeswitch/default.nix deleted file mode 100644 index 9212f2a1da3f..000000000000 --- a/pkgs/development/tools/kubeswitch/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - testers, - kubeswitch, - installShellFiles, -}: - -buildGoModule rec { - pname = "kubeswitch"; - version = "0.9.1"; - - src = fetchFromGitHub { - owner = "danielfoehrKn"; - repo = "kubeswitch"; - rev = version; - hash = "sha256-cvMTuiXSpx+ZicN1P3JjGExzW7d51nN1YIpsGArXHzw="; - }; - - vendorHash = null; - - subPackages = [ "cmd/main.go" ]; - - ldflags = [ - "-s" - "-w" - "-X github.com/danielfoehrkn/kubeswitch/cmd/switcher.version=${version}" - "-X github.com/danielfoehrkn/kubeswitch/cmd/switcher.buildDate=1970-01-01" - ]; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - mv $out/bin/main $out/bin/switcher - for shell in bash zsh fish; do - $out/bin/switcher --cmd switcher completion $shell > switcher.$shell - installShellCompletion --$shell switcher.$shell - done - ''; - - passthru.tests.version = testers.testVersion { package = kubeswitch; }; - - meta = { - changelog = "https://github.com/danielfoehrKn/kubeswitch/releases/tag/${version}"; - description = "Kubectx for operators, a drop-in replacement for kubectx"; - license = lib.licenses.asl20; - homepage = "https://github.com/danielfoehrKn/kubeswitch"; - maintainers = with lib.maintainers; [ bryanasdev000 ]; - mainProgram = "switcher"; - }; -} diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index 42f19d97e4ff..18b429e2d434 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' installShellCompletion completion/kubie.bash diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index e7e9a8d0b013..e7955979a7ae 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.3"; + version = "5.5.0"; 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-DrdExiGDWBrlbNIY6R9SXD4cuVyLBOE3ePw1J3hymHA="; + hash = "sha256-7mtnSrQQPQnG0COqnzrT5DXFEbTeoc3+GZ2fFhB/lW8="; }; # avoid finding test and development commands modRoot = "kustomize"; proxyVendor = true; - vendorHash = "sha256-cyTZCa1kmNhomkNNnt2Waww4czOZ5YzDBUDx5gqLHtQ="; + vendorHash = "sha256-ddARfbjuSIn2aNFILL4LA28swGBvH6kOqlg4qkw+NGw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/kythe/default.nix b/pkgs/development/tools/kythe/default.nix deleted file mode 100644 index 4129e220ac02..000000000000 --- a/pkgs/development/tools/kythe/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, binutils , fetchurl, ncurses5 }: - -stdenv.mkDerivation rec { - version = "0.0.30"; - pname = "kythe"; - - src = fetchurl { - url = "https://github.com/kythe/kythe/releases/download/v${version}/${pname}-v${version}.tar.gz"; - sha256 = "12bwhqkxfbkh3mm4wfvqflwhmbzpmlhlfykdpy6h7p9ih9ky8w6r"; - }; - - buildInputs = - [ binutils ]; - - doCheck = false; - - dontBuild = true; - - installPhase = '' - cd tools - for exe in http_server \ - kythe read_entries triples verifier \ - write_entries write_tables entrystream; do - echo "Patching:" $exe - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $exe - patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ]}" $exe - done - cd ../ - cp -R ./ $out - ln -s $out/tools $out/bin - ''; - - meta = with lib; { - description = "Pluggable, (mostly) language-agnostic ecosystem for building tools that work with code"; - longDescription = '' - The Kythe project was founded to provide and support tools and standards - that encourage interoperability among programs that manipulate source - code. At a high level, the main goal of Kythe is to provide a standard, - language-agnostic interchange mechanism, allowing tools that operate on - source code — including build systems, compilers, interpreters, static - analyses, editors, code-review applications, and more — to share - information with each other smoothly. ''; - homepage = "https://kythe.io/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = [ maintainers.mpickering ]; - }; -} diff --git a/pkgs/development/tools/lalrpop/default.nix b/pkgs/development/tools/lalrpop/default.nix deleted file mode 100644 index cc52d2622f55..000000000000 --- a/pkgs/development/tools/lalrpop/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, substituteAll -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "lalrpop"; - version = "0.20.2"; - - src = fetchFromGitHub { - owner = "lalrpop"; - repo = "lalrpop"; - rev = version; - hash = "sha256-cFwBck+bdOjhF6rQQj03MOO+XCsrII5c4Xvhsw12ETA="; - }; - - cargoHash = "sha256-zkPLas+fQQzm7LlWNpTooUR/e30KMS9OET6PMwQ2yAA="; - - patches = [ - (substituteAll { - src = ./use-correct-binary-path-in-tests.patch; - target_triple = stdenv.hostPlatform.rust.rustcTarget; - }) - ]; - - buildAndTestSubdir = "lalrpop"; - - # there are some tests in lalrpop-test and some in lalrpop - checkPhase = '' - buildAndTestSubdir=lalrpop-test cargoCheckHook - cargoCheckHook - ''; - - meta = with lib; { - description = "LR(1) parser generator for Rust"; - homepage = "https://github.com/lalrpop/lalrpop"; - changelog = "https://github.com/lalrpop/lalrpop/blob/${src.rev}/RELEASES.md"; - license = with licenses; [ asl20 /* or */ mit ]; - mainProgram = "lalrpop"; - maintainers = with maintainers; [ chayleaf ]; - }; -} diff --git a/pkgs/development/tools/lalrpop/use-correct-binary-path-in-tests.patch b/pkgs/development/tools/lalrpop/use-correct-binary-path-in-tests.patch deleted file mode 100644 index c7e691b864e8..000000000000 --- a/pkgs/development/tools/lalrpop/use-correct-binary-path-in-tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lalrpop-test/src/lib.rs b/lalrpop-test/src/lib.rs -index cb4f2b0..725b0d4 100644 ---- a/lalrpop-test/src/lib.rs -+++ b/lalrpop-test/src/lib.rs -@@ -1089,7 +1089,7 @@ fn verify_lalrpop_generates_itself() { - // Don't remove the .rs file that already exist - fs::copy(&grammar_file, &copied_grammar_file).expect("no grammar file found"); - -- assert!(Command::new("../target/debug/lalrpop") -+ assert!(Command::new("../target/@target_triple@/release/lalrpop") - .args([ - "--force", - "--no-whitespace", diff --git a/pkgs/development/tools/language-servers/ansible-language-server/default.nix b/pkgs/development/tools/language-servers/ansible-language-server/default.nix deleted file mode 100644 index a6287cc52c0d..000000000000 --- a/pkgs/development/tools/language-servers/ansible-language-server/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -, nix-update-script -}: - -buildNpmPackage rec { - pname = "ansible-language-server"; - version = "1.2.1"; - - src = fetchFromGitHub { - owner = "ansible"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-e6cOWoryOxWnl8q62rlGmSgwLVnoxLMwNFoGlUZw2bQ="; - }; - - npmDepsHash = "sha256-Lzwj0/2fxa44DJBsgDPa43AbRxggqh881X/DFnlNLig="; - npmBuildScript = "compile"; - - # We remove/ignore the prepare and prepack scripts because they run the - # build script, and therefore are redundant. - # - # Additionally, the prepack script runs npm ci in addition to the - # build script. Directly before npm pack is run, we make npm unaware - # of the dependency cache, causing the npm ci invocation to fail, - # wiping out node_modules, which causes a mysterious error stating that tsc isn't installed. - postPatch = '' - sed -i '/"prepare"/d' package.json - sed -i '/"prepack"/d' package.json - ''; - - npmPackFlags = [ "--ignore-scripts" ]; - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - changelog = "https://github.com/ansible/ansible-language-server/releases/tag/v${version}"; - description = "Ansible Language Server"; - mainProgram = "ansible-language-server"; - homepage = "https://github.com/ansible/ansible-language-server"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; - }; -} diff --git a/pkgs/development/tools/language-servers/beancount-language-server/default.nix b/pkgs/development/tools/language-servers/beancount-language-server/default.nix deleted file mode 100644 index d01732da1212..000000000000 --- a/pkgs/development/tools/language-servers/beancount-language-server/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, fetchFromGitHub -, rustPlatform -}: - -rustPlatform.buildRustPackage rec { - pname = "beancount-language-server"; - version = "1.3.5"; - - src = fetchFromGitHub { - owner = "polarmutex"; - repo = "beancount-language-server"; - rev = "v${version}"; - hash = "sha256-Z8Gc3QbnFGzF1mNjlbazz7OiDpQxY3HcaBKd32XjQCY="; - }; - - cargoHash = "sha256-WMrh4toFqd+G30ZZxC+kT/Q07gn+3p80oKECASD48wc="; - - doInstallCheck = true; - postInstallCheck = '' - $out/bin/beancount-language-server --help > /dev/null - ''; - - meta = with lib; { - description = "Language Server Protocol (LSP) for beancount files"; - mainProgram = "beancount-language-server"; - homepage = "https://github.com/polarmutex/beancount-language-server"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ polarmutex ]; - }; -} diff --git a/pkgs/development/tools/language-servers/buf-language-server/default.nix b/pkgs/development/tools/language-servers/buf-language-server/default.nix deleted file mode 100644 index 012041064f21..000000000000 --- a/pkgs/development/tools/language-servers/buf-language-server/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "buf-language-server"; - version = "unstable-2022-08-19"; - - src = fetchFromGitHub { - owner = "bufbuild"; - repo = pname; - rev = "6f08a7eed22c5a178cb55613f454319e09be112c"; - sha256 = "sha256-UHsWrWDOC/f3YS2g533CgUkuUmz4MUQRunClQiY/YPQ="; - }; - - vendorHash = "sha256-ORzCOmBx6k1GZj6pYLhqPsdneCc7Tt1yHpI5mw5ruFU="; - - ldflags = [ - "-s" - "-w" - ]; - - meta = with lib; { - description = "Language server for protocol buffers"; - mainProgram = "bufls"; - homepage = "https://github.com/bufbuild/buf-language-server"; - license = licenses.asl20; - maintainers = with maintainers; [ svrana ]; - }; -} diff --git a/pkgs/development/tools/language-servers/ccls/default.nix b/pkgs/development/tools/language-servers/ccls/default.nix index 175d2800e4c7..0cb1e7884097 100644 --- a/pkgs/development/tools/language-servers/ccls/default.nix +++ b/pkgs/development/tools/language-servers/ccls/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ccls"; - version = "0.20240202"; + version = "0.20241108"; src = fetchFromGitHub { owner = "MaskRay"; repo = "ccls"; rev = version; - sha256 = "sha256-xVx3+cnmIdoA7R1S31EaiPj+DOTqkINoQeMgauW61Ys="; + sha256 = "sha256-0hZ4VnscnKYBrXy58IjeoeDxja1oNq0mNaQGPmej5BA="; }; nativeBuildInputs = [ cmake llvmPackages.llvm.dev ]; diff --git a/pkgs/development/tools/language-servers/crystalline/default.nix b/pkgs/development/tools/language-servers/crystalline/default.nix index 3687d1fc57a9..3f59e57bdb01 100644 --- a/pkgs/development/tools/language-servers/crystalline/default.nix +++ b/pkgs/development/tools/language-servers/crystalline/default.nix @@ -7,7 +7,7 @@ }: let - version = "0.13.1"; + version = "0.15.0"; in crystal.buildCrystalPackage { pname = "crystalline"; @@ -17,7 +17,7 @@ crystal.buildCrystalPackage { owner = "elbywan"; repo = "crystalline"; rev = "v${version}"; - hash = "sha256-Exv83jmSyhJv90Oo4oApZwNgNjy7tOKxLNh7yJIbfws="; + hash = "sha256-6ZAogEuOJH1QQ6NSJ+8KZUSFSgQAcvd4U9vWNAGix/M="; }; format = "crystal"; diff --git a/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix b/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix deleted file mode 100644 index e699d8a26dff..000000000000 --- a/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "docker-compose-language-service"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "microsoft"; - repo = "compose-language-service"; - rev = "v${version}"; - hash = "sha256-UBnABi7DMKrAFkRA8H6us/Oq4yM0mJ+kwOm0Rt8XnGw="; - }; - - npmDepsHash = "sha256-G1X9WrnwN6wM9S76PsGrPTmmiMBUKu4T2Al3HH3Wo+w="; - - meta = with lib; { - description = "Language service for Docker Compose documents"; - homepage = "https://github.com/microsoft/compose-language-service"; - changelog = "https://github.com/microsoft/compose-language-service/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ natsukium ]; - mainProgram = "docker-compose-langserver"; - }; -} diff --git a/pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix b/pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix deleted file mode 100644 index 8c96dd227d7c..000000000000 --- a/pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "dockerfile-language-server-nodejs"; - version = "0.11.0"; - - src = fetchFromGitHub { - owner = "rcjsuen"; - repo = "dockerfile-language-server-nodejs"; - rev = "v${version}"; - hash = "sha256-xhb540hXATfSo+O+BAYt4VWOa6QHLzKHoi0qKrdBVjw="; - }; - - preBuild = '' - npm run prepublishOnly - ''; - - npmDepsHash = "sha256-+u4AM6wzVMhfQisw/kcwg4u0rzrbbQeIIk6qBXUM+5I="; - - meta = { - changelog = "https://github.com/rcjsuen/dockerfile-language-server-nodejs/blob/${src.rev}/CHANGELOG.md"; - description = "Language server for Dockerfiles powered by Node.js, TypeScript, and VSCode technologies"; - homepage = "https://github.com/rcjsuen/dockerfile-language-server-nodejs"; - license = lib.licenses.mit; - mainProgram = "docker-langserver"; - maintainers = with lib.maintainers; [ rvolosatovs net-mist ]; - }; -} diff --git a/pkgs/development/tools/language-servers/dot-language-server/default.nix b/pkgs/development/tools/language-servers/dot-language-server/default.nix deleted file mode 100644 index 98d76d8d1aaa..000000000000 --- a/pkgs/development/tools/language-servers/dot-language-server/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildNpmPackage, fetchFromGitHub }: - -buildNpmPackage rec { - pname = "dot-language-server"; - version = "1.2.1"; - - src = fetchFromGitHub { - owner = "nikeee"; - repo = "dot-language-server"; - rev = "v${version}"; - hash = "sha256-NGkobMZrvWlW/jteFowZgGUVQiNm3bS5gv5tN2485VA="; - }; - - npmDepsHash = "sha256-spskj0vqfR9GoQeKyfLsQgRp6JasZeVLCVBt6wZiSP8="; - - npmBuildScript = "compile"; - - meta = with lib; { - description = "Language server for the DOT language"; - mainProgram = "dot-language-server"; - homepage = "https://github.com/nikeee/dot-language-server"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/language-servers/emmet-language-server/default.nix b/pkgs/development/tools/language-servers/emmet-language-server/default.nix deleted file mode 100644 index b6f32643376d..000000000000 --- a/pkgs/development/tools/language-servers/emmet-language-server/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "emmet-language-server"; - version = "2.2.0"; - - src = fetchFromGitHub { - owner = "olrtg"; - repo = "emmet-language-server"; - rev = "v${version}"; - hash = "sha256-53FbZ0hC2s9o6yXPYAy0vqe4tLcYMHLqeBMNuNI8Nd0="; - }; - - npmDepsHash = "sha256-luE8iYfTsSrBVcv0sE1yYnAksE2+icx9K4yNzjUV7U4="; - - # Upstream doesn't have a lockfile - postPatch = '' - cp ${./package-lock.json} ./package-lock.json - ''; - - meta = with lib; { - description = "Language server for emmet.io"; - homepage = "https://github.com/olrtg/emmet-language-server"; - changelog = "https://github.com/olrtg/emmet-language-server/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ stnley ]; - mainProgram = "emmet-language-server"; - }; -} diff --git a/pkgs/development/tools/language-servers/emmet-language-server/package-lock.json b/pkgs/development/tools/language-servers/emmet-language-server/package-lock.json deleted file mode 100644 index c82924552b67..000000000000 --- a/pkgs/development/tools/language-servers/emmet-language-server/package-lock.json +++ /dev/null @@ -1,896 +0,0 @@ -{ - "name": "@olrtg/emmet-language-server", - "version": "2.2.0", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "@olrtg/emmet-language-server", - "version": "2.2.0", - "license": "MIT", - "dependencies": { - "@vscode/emmet-helper": "^2.9.2", - "bumpp": "^9.1.1", - "vscode-languageserver": "^8.1.0", - "vscode-languageserver-textdocument": "^1.0.8" - }, - "bin": { - "emmet-language-server": "dist/index.js" - }, - "devDependencies": { - "@tsconfig/recommended": "^1.0.2", - "typescript": "^5.1.6" - } - }, - "node_modules/@emmetio/abbreviation": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.3.3.tgz", - "integrity": "sha512-mgv58UrU3rh4YgbE/TzgLQwJ3pFsHHhCLqY20aJq+9comytTXUDNGG/SMtSeMJdkpxgXSXunBGLD8Boka3JyVA==", - "dependencies": { - "@emmetio/scanner": "^1.0.4" - } - }, - "node_modules/@emmetio/css-abbreviation": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.8.tgz", - "integrity": "sha512-s9yjhJ6saOO/uk1V74eifykk2CBYi01STTK3WlXWGOepyKa23ymJ053+DNQjpFcy1ingpaO7AxCcwLvHFY9tuw==", - "dependencies": { - "@emmetio/scanner": "^1.0.4" - } - }, - "node_modules/@emmetio/scanner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@emmetio/scanner/-/scanner-1.0.4.tgz", - "integrity": "sha512-IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA==" - }, - "node_modules/@jsdevtools/ez-spawn": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@jsdevtools/ez-spawn/-/ez-spawn-3.0.4.tgz", - "integrity": "sha512-f5DRIOZf7wxogefH03RjMPMdBF7ADTWUMoOs9kaJo06EfwF+aFhMZMDZxHg/Xe12hptN9xoZjGso2fdjapBRIA==", - "dependencies": { - "call-me-maybe": "^1.0.1", - "cross-spawn": "^7.0.3", - "string-argv": "^0.3.1", - "type-detect": "^4.0.8" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@tsconfig/recommended": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@tsconfig/recommended/-/recommended-1.0.3.tgz", - "integrity": "sha512-+jby/Guq9H8O7NWgCv6X8VAiQE8Dr/nccsCtL74xyHKhu2Knu5EAKmOZj3nLCnLm1KooUzKY+5DsnGVqhM8/wQ==", - "dev": true - }, - "node_modules/@vscode/emmet-helper": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.9.2.tgz", - "integrity": "sha512-MaGuyW+fa13q3aYsluKqclmh62Hgp0BpKIqS66fCxfOaBcVQ1OnMQxRRgQUYnCkxFISAQlkJ0qWWPyXjro1Qrg==", - "dependencies": { - "emmet": "^2.4.3", - "jsonc-parser": "^2.3.0", - "vscode-languageserver-textdocument": "^1.0.1", - "vscode-languageserver-types": "^3.15.1", - "vscode-uri": "^2.1.2" - } - }, - "node_modules/acorn": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", - "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", - "engines": { - "node": ">=8" - } - }, - "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dependencies": { - "fill-range": "^7.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/bumpp": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/bumpp/-/bumpp-9.2.0.tgz", - "integrity": "sha512-pgp7y3jp33QTaXFVDrE0IKuZF5Y8EsIz+ywZXFALW2nD+ZD+4crxJe/GypBQBoJuZrr5dc6TGrR3wl7fk3+C6w==", - "dependencies": { - "@jsdevtools/ez-spawn": "^3.0.4", - "c12": "^1.4.2", - "cac": "^6.7.14", - "fast-glob": "^3.3.1", - "prompts": "^2.4.2", - "semver": "^7.5.4" - }, - "bin": { - "bumpp": "bin/bumpp.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/c12": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/c12/-/c12-1.4.2.tgz", - "integrity": "sha512-3IP/MuamSVRVw8W8+CHWAz9gKN4gd+voF2zm/Ln6D25C2RhytEZ1ABbC8MjKr4BR9rhoV1JQ7jJA158LDiTkLg==", - "dependencies": { - "chokidar": "^3.5.3", - "defu": "^6.1.2", - "dotenv": "^16.3.1", - "giget": "^1.1.2", - "jiti": "^1.18.2", - "mlly": "^1.4.0", - "ohash": "^1.1.2", - "pathe": "^1.1.1", - "perfect-debounce": "^1.0.0", - "pkg-types": "^1.0.3", - "rc9": "^2.1.1" - } - }, - "node_modules/cac": { - "version": "6.7.14", - "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz", - "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/call-me-maybe": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz", - "integrity": "sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==" - }, - "node_modules/chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], - "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "engines": { - "node": ">=10" - } - }, - "node_modules/colorette": { - "version": "2.0.20", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", - "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==" - }, - "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/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/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/defu": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.2.tgz", - "integrity": "sha512-+uO4+qr7msjNNWKYPHqN/3+Dx3NFkmIzayk2L1MyZQlvgZb/J1A0fo410dpKrN2SnqFjt8n4JL8fDJE0wIgjFQ==" - }, - "node_modules/destr": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/destr/-/destr-2.0.1.tgz", - "integrity": "sha512-M1Ob1zPSIvlARiJUkKqvAZ3VAqQY6Jcuth/pBKQ2b1dX/Qx0OnJ8Vux6J2H5PTMQeRzWrrbTu70VxBfv/OPDJA==" - }, - "node_modules/dotenv": { - "version": "16.3.1", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz", - "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/motdotla/dotenv?sponsor=1" - } - }, - "node_modules/emmet": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/emmet/-/emmet-2.4.6.tgz", - "integrity": "sha512-dJfbdY/hfeTyf/Ef7Y7ubLYzkBvPQ912wPaeVYpAxvFxkEBf/+hJu4H6vhAvFN6HlxqedlfVn2x1S44FfQ97pg==", - "dependencies": { - "@emmetio/abbreviation": "^2.3.3", - "@emmetio/css-abbreviation": "^2.1.8" - } - }, - "node_modules/fast-glob": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", - "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/fastq": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", - "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", - "dependencies": { - "reusify": "^1.0.4" - } - }, - "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/flat": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", - "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", - "bin": { - "flat": "cli.js" - } - }, - "node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/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.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/giget": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/giget/-/giget-1.1.2.tgz", - "integrity": "sha512-HsLoS07HiQ5oqvObOI+Qb2tyZH4Gj5nYGfF9qQcZNrPw+uEFhdXtgJr01aO2pWadGHucajYDLxxbtQkm97ON2A==", - "dependencies": { - "colorette": "^2.0.19", - "defu": "^6.1.2", - "https-proxy-agent": "^5.0.1", - "mri": "^1.2.0", - "node-fetch-native": "^1.0.2", - "pathe": "^1.1.0", - "tar": "^6.1.13" - }, - "bin": { - "giget": "dist/cli.mjs" - } - }, - "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" - }, - "node_modules/jiti": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.20.0.tgz", - "integrity": "sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA==", - "bin": { - "jiti": "bin/jiti.js" - } - }, - "node_modules/jsonc-parser": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz", - "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==" - }, - "node_modules/kleur": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", - "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", - "engines": { - "node": ">=6" - } - }, - "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dependencies": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/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.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/mlly": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.2.tgz", - "integrity": "sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==", - "dependencies": { - "acorn": "^8.10.0", - "pathe": "^1.1.1", - "pkg-types": "^1.0.3", - "ufo": "^1.3.0" - } - }, - "node_modules/mri": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", - "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==", - "engines": { - "node": ">=4" - } - }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "node_modules/node-fetch-native": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.4.0.tgz", - "integrity": "sha512-F5kfEj95kX8tkDhUCYdV8dg3/8Olx/94zB8+ZNthFs6Bz31UpUi8Xh40TN3thLwXgrwXry1pEg9lJ++tLWTcqA==" - }, - "node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ohash": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/ohash/-/ohash-1.1.3.tgz", - "integrity": "sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw==" - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "engines": { - "node": ">=8" - } - }, - "node_modules/pathe": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz", - "integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==" - }, - "node_modules/perfect-debounce": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz", - "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==" - }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/pkg-types": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz", - "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==", - "dependencies": { - "jsonc-parser": "^3.2.0", - "mlly": "^1.2.0", - "pathe": "^1.1.0" - } - }, - "node_modules/pkg-types/node_modules/jsonc-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==" - }, - "node_modules/prompts": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", - "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", - "dependencies": { - "kleur": "^3.0.3", - "sisteransi": "^1.0.5" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "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/rc9": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/rc9/-/rc9-2.1.1.tgz", - "integrity": "sha512-lNeOl38Ws0eNxpO3+wD1I9rkHGQyj1NU1jlzv4go2CtEnEQEUfqnIvZG7W+bC/aXdJ27n5x/yUjb6RoT9tko+Q==", - "dependencies": { - "defu": "^6.1.2", - "destr": "^2.0.0", - "flat": "^5.0.2" - } - }, - "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "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": { - "queue-microtask": "^1.2.2" - } - }, - "node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/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.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "engines": { - "node": ">=8" - } - }, - "node_modules/sisteransi": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==" - }, - "node_modules/string-argv": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz", - "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==", - "engines": { - "node": ">=0.6.19" - } - }, - "node_modules/tar": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz", - "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==", - "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/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "engines": { - "node": ">=4" - } - }, - "node_modules/typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, - "node_modules/ufo": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.0.tgz", - "integrity": "sha512-bRn3CsoojyNStCZe0BG0Mt4Nr/4KF+rhFlnNXybgqt5pXHNFRlqinSoQaTrGyzE4X8aHplSb+TorH+COin9Yxw==" - }, - "node_modules/vscode-jsonrpc": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz", - "integrity": "sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw==", - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/vscode-languageserver": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.1.0.tgz", - "integrity": "sha512-eUt8f1z2N2IEUDBsKaNapkz7jl5QpskN2Y0G01T/ItMxBxw1fJwvtySGB9QMecatne8jFIWJGWI61dWjyTLQsw==", - "dependencies": { - "vscode-languageserver-protocol": "3.17.3" - }, - "bin": { - "installServerIntoExtension": "bin/installServerIntoExtension" - } - }, - "node_modules/vscode-languageserver-protocol": { - "version": "3.17.3", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz", - "integrity": "sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA==", - "dependencies": { - "vscode-jsonrpc": "8.1.0", - "vscode-languageserver-types": "3.17.3" - } - }, - "node_modules/vscode-languageserver-textdocument": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz", - "integrity": "sha512-1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q==" - }, - "node_modules/vscode-languageserver-types": { - "version": "3.17.3", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz", - "integrity": "sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==" - }, - "node_modules/vscode-uri": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz", - "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==" - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/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/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - } - } -} diff --git a/pkgs/development/tools/language-servers/emmet-ls/default.nix b/pkgs/development/tools/language-servers/emmet-ls/default.nix deleted file mode 100644 index 5950dc543855..000000000000 --- a/pkgs/development/tools/language-servers/emmet-ls/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -, fetchpatch -}: - -buildNpmPackage rec { - pname = "emmet-ls"; - version = "0.4.1"; - - src = fetchFromGitHub { - owner = "aca"; - repo = "emmet-ls"; - rev = version; - hash = "sha256-TmsJpVLF9FZf/6uOM9LZBKC6S3bMPjA3QMiRMPaY9Dg="; - }; - - npmDepsHash = "sha256-Boaxkad7S6H+eTW5AHwBa/zj/f1oAGGSsmW1QrzuFWc="; - - patches = [ - # update package-lock.json as it is outdated - (fetchpatch { - name = "fix-lock-file-to-match-package-json.patch"; - url = "https://github.com/aca/emmet-ls/commit/111111a2c2113f751fa12a716ccfbeae61c32079.patch"; - hash = "sha256-/3ZbOBxScnfhL1F66cnIoD2flVeYTJ2sLxNHQ9Yrgjw="; - }) - ]; - - meta = with lib; { - description = "Emmet support based on LSP"; - homepage = "https://github.com/aca/emmet-ls"; - changelog = "https://github.com/aca/emmet-ls/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "emmet-ls"; - }; -} diff --git a/pkgs/development/tools/language-servers/glslls/default.nix b/pkgs/development/tools/language-servers/glslls/default.nix deleted file mode 100644 index 0e78dd8502f7..000000000000 --- a/pkgs/development/tools/language-servers/glslls/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, ninja -, python3 -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "glslls"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "svenstaro"; - repo = "glsl-language-server"; - rev = finalAttrs.version; - fetchSubmodules = true; - hash = "sha256-wi1QiqaWRh1DmIhwmu94lL/4uuMv6DnB+whM61Jg1Zs="; - }; - - nativeBuildInputs = [ - python3 - cmake - ninja - ]; - - meta = { - description = "Language server implementation for GLSL"; - mainProgram = "glslls"; - homepage = "https://github.com/svenstaro/glsl-language-server"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ declan ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/development/tools/language-servers/helm-ls/default.nix b/pkgs/development/tools/language-servers/helm-ls/default.nix deleted file mode 100644 index df72b7dfb615..000000000000 --- a/pkgs/development/tools/language-servers/helm-ls/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -, testers -, helm-ls -}: - -buildGoModule rec { - pname = "helm-ls"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "mrjosh"; - repo = "helm-ls"; - rev = "v${version}"; - hash = "sha256-EuZbbeRssacrctIbxBbd2GOh8zgFi2OBRregfC88se0="; - }; - - vendorHash = "sha256-AWKCE2BZGVYcr6Pe8URQo11Xnr3sfgWWkm9v7vvILOo="; - - nativeBuildInputs = [ installShellFiles ]; - - ldflags = [ - "-s" - "-w" - "-X main.Version=${version}" - ]; - - postInstall = '' - mv $out/bin/helm-ls $out/bin/helm_ls - installShellCompletion --cmd helm_ls \ - --bash <($out/bin/helm_ls completion bash) \ - --fish <($out/bin/helm_ls completion fish) \ - --zsh <($out/bin/helm_ls completion zsh) - ''; - - passthru.tests.version = testers.testVersion { - package = helm-ls; - command = "helm_ls version"; - }; - - meta = with lib; { - description = "Language server for Helm"; - changelog = "https://github.com/mrjosh/helm-ls/releases/tag/v${version}"; - homepage = "https://github.com/mrjosh/helm-ls"; - license = licenses.mit; - maintainers = with maintainers; [ stehessel ]; - mainProgram = "helm_ls"; - }; -} diff --git a/pkgs/development/tools/language-servers/javascript-typescript-langserver/default.nix b/pkgs/development/tools/language-servers/javascript-typescript-langserver/default.nix deleted file mode 100644 index bdfc1d8f40c8..000000000000 --- a/pkgs/development/tools/language-servers/javascript-typescript-langserver/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "javascript-typescript-langserver"; - version = "2.11.3"; - - src = fetchFromGitHub { - owner = "sourcegraph"; - repo = "javascript-typescript-langserver"; - rev = "v${version}"; - hash = "sha256-vd7Hj0jPFgK0u3CBlMfOFERmW+w9CnKIY9nvs48KqsI="; - }; - - npmDepsHash = "sha256-nHGTi1aH9YY01dzBeNyUEUEswrdjZPWaoycDVZZmIAA="; - - meta = { - description = "JavaScript and TypeScript code intelligence through the Language Server Protocol"; - homepage = "https://github.com/sourcegraph/javascript-typescript-langserver"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dywedir ]; - }; -} diff --git a/pkgs/development/tools/language-servers/jq-lsp/default.nix b/pkgs/development/tools/language-servers/jq-lsp/default.nix deleted file mode 100644 index ad43af981e39..000000000000 --- a/pkgs/development/tools/language-servers/jq-lsp/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "jq-lsp"; - version = "0.1.3"; - - src = fetchFromGitHub { - owner = "wader"; - repo = "jq-lsp"; - rev = "refs/tags/v${version}"; - hash = "sha256-c7uK8WPM/h2PLVLFGeN66SztvzjBCgJje7L14+oErVU="; - }; - - vendorHash = "sha256-8sZGnoP7l09ZzLJqq8TUCquTOPF0qiwZcFhojUnnEIY="; - - # based on https://github.com/wader/jq-lsp/blob/master/.goreleaser.yml - CGO_ENABLED = 0; - - ldflags = [ - "-s" - "-w" - "-X main.version=${version}" - "-X main.commit=${src.rev}" - "-X main.builtBy=Nix" - ]; - - meta = with lib; { - description = "jq language server"; - homepage = "https://github.com/wader/jq-lsp"; - license = licenses.mit; - maintainers = with maintainers; [ sysedwinistrator ]; - mainProgram = "jq-lsp"; - }; -} diff --git a/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix b/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix deleted file mode 100644 index 3e348c342ae4..000000000000 --- a/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "jsonnet-language-server"; - version = "0.14.1"; - - src = fetchFromGitHub { - owner = "grafana"; - repo = "jsonnet-language-server"; - rev = "refs/tags/v${version}"; - hash = "sha256-GR5EjVd1Tje9FLyP0pfNT6hMUGYkfPnsT8M72H713D4="; - }; - - vendorHash = "sha256-rh+b089fr+z0YzgvzivzELnSbNDiNczGCRwFrIYR250="; - - ldflags = [ - "-s" - "-w" - "-X 'main.version=${version}'" - ]; - - meta = with lib; { - description = "Language Server Protocol server for Jsonnet"; - mainProgram = "jsonnet-language-server"; - homepage = "https://github.com/grafana/jsonnet-language-server"; - changelog = "https://github.com/grafana/jsonnet-language-server/releases/tag/v${version}"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ hardselius ]; - }; -} diff --git a/pkgs/development/tools/language-servers/kotlin-language-server/default.nix b/pkgs/development/tools/language-servers/kotlin-language-server/default.nix deleted file mode 100644 index 19ff79c332ab..000000000000 --- a/pkgs/development/tools/language-servers/kotlin-language-server/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchzip, openjdk, gradle, makeWrapper, maven }: - -stdenv.mkDerivation rec { - pname = "kotlin-language-server"; - version = "1.3.12"; - src = fetchzip { - url = "https://github.com/fwcd/kotlin-language-server/releases/download/${version}/server.zip"; - hash = "sha256-poWaU0vZS1cpMbbvN7/s1RRUKhekdfTi08fF/IZsVGs="; - }; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/lib - mkdir -p $out/bin - cp -r lib/* $out/lib - cp -r bin/* $out/bin - ''; - - nativeBuildInputs = [ gradle makeWrapper ]; - buildInputs = [ openjdk gradle ]; - - postFixup = '' - wrapProgram "$out/bin/kotlin-language-server" --set JAVA_HOME ${openjdk} --prefix PATH : ${lib.strings.makeBinPath [ openjdk maven ] } - ''; - - meta = { - description = "kotlin language server"; - longDescription = '' - About Kotlin code completion, linting and more for any editor/IDE - using the Language Server Protocol Topics''; - maintainers = with lib.maintainers; [ vtuan10 ]; - homepage = "https://github.com/fwcd/kotlin-language-server"; - changelog = "https://github.com/fwcd/kotlin-language-server/blob/${version}/CHANGELOG.md"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; - }; -} diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix deleted file mode 100644 index 0bbab7942e8a..000000000000 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - ninja, - makeWrapper, - CoreFoundation, - Foundation, - ditto, - nix-update-script, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "lua-language-server"; - version = "3.10.6"; - - src = fetchFromGitHub { - owner = "luals"; - repo = "lua-language-server"; - rev = finalAttrs.version; - hash = "sha256-K5+xGRGmd6X3eYF1BzhqFbbfVJXSduo/9930HxLGQCo="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - ninja - makeWrapper - ]; - - buildInputs = lib.optionals stdenv.isDarwin [ - CoreFoundation - Foundation - ditto - ]; - - postPatch = - '' - # filewatch tests are failing on darwin - # this feature is not used in lua-language-server - sed -i /filewatch/d 3rd/bee.lua/test/test.lua - - pushd 3rd/luamake - '' - + lib.optionalString stdenv.isDarwin '' - # This package uses the program clang for C and C++ files. The language - # is selected via the command line argument -std, but this do not work - # in combination with the nixpkgs clang wrapper. Therefor we have to - # find all c++ compiler statements and replace $cc (which expands to - # clang) with clang++. - sed -i compile/ninja/macos.ninja \ - -e '/c++/s,$cc,clang++,' \ - -e '/test.lua/s,= .*,= true,' \ - -e '/ldl/s,$cc,clang++,' - sed -i scripts/compiler/gcc.lua \ - -e '/cxx_/s,$cc,clang++,' - ''; - - ninjaFlags = [ "-fcompile/ninja/${if stdenv.isDarwin then "macos" else "linux"}.ninja" ]; - - postBuild = '' - popd - ./3rd/luamake/luamake rebuild - ''; - - installPhase = '' - runHook preInstall - - install -Dt "$out"/share/lua-language-server/bin bin/lua-language-server - install -m644 -t "$out"/share/lua-language-server/bin bin/*.* - install -m644 -t "$out"/share/lua-language-server {debugger,main}.lua - cp -r locale meta script "$out"/share/lua-language-server - - # necessary for --version to work: - install -m644 -t "$out"/share/lua-language-server changelog.md - - makeWrapper "$out"/share/lua-language-server/bin/lua-language-server \ - $out/bin/lua-language-server \ - --add-flags "-E $out/share/lua-language-server/main.lua \ - --logpath=\''${XDG_CACHE_HOME:-\$HOME/.cache}/lua-language-server/log \ - --metapath=\''${XDG_CACHE_HOME:-\$HOME/.cache}/lua-language-server/meta" - - runHook postInstall - ''; - - # some tests require local networking - __darwinAllowLocalNetworking = true; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Language server that offers Lua language support"; - homepage = "https://github.com/luals/lua-language-server"; - changelog = "https://github.com/LuaLS/lua-language-server/blob/${finalAttrs.version}/changelog.md"; - license = licenses.mit; - maintainers = with maintainers; [ - figsoda - gepbird - sei40kr - ]; - mainProgram = "lua-language-server"; - platforms = platforms.linux ++ platforms.darwin; - }; -}) diff --git a/pkgs/development/tools/language-servers/metals/default.nix b/pkgs/development/tools/language-servers/metals/default.nix deleted file mode 100644 index 708d62d2ec7b..000000000000 --- a/pkgs/development/tools/language-servers/metals/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, lib, coursier, jre, makeWrapper, setJavaClassPath }: - -stdenv.mkDerivation rec { - pname = "metals"; - version = "1.3.5"; - - deps = stdenv.mkDerivation { - name = "${pname}-deps-${version}"; - buildCommand = '' - export COURSIER_CACHE=$(pwd) - ${coursier}/bin/cs fetch org.scalameta:metals_2.13:${version} \ - -r bintray:scalacenter/releases \ - -r sonatype:snapshots > deps - mkdir -p $out/share/java - cp $(< deps) $out/share/java/ - ''; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = "sha256-86/zeoOO5kSAwh7uQTV7nGUGQoIux1rlH5eUgvn3kvY="; - }; - - nativeBuildInputs = [ makeWrapper setJavaClassPath ]; - buildInputs = [ deps ]; - - dontUnpack = true; - - extraJavaOpts = "-XX:+UseG1GC -XX:+UseStringDeduplication -Xss4m -Xms100m"; - - installPhase = '' - mkdir -p $out/bin - - makeWrapper ${jre}/bin/java $out/bin/metals \ - --add-flags "${extraJavaOpts} -cp $CLASSPATH scala.meta.metals.Main" - ''; - - meta = with lib; { - homepage = "https://scalameta.org/metals/"; - license = licenses.asl20; - description = "Language server for Scala"; - mainProgram = "metals"; - maintainers = with maintainers; [ fabianhjr jpaju tomahna ]; - }; -} diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock deleted file mode 100644 index d6620fa370d1..000000000000 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ /dev/null @@ -1,1512 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "analysis" -version = "0.14.3" -dependencies = [ - "config", - "diagnostic", - "elapsed", - "fast-hash", - "fmt-util", - "input", - "mlb-statics", - "paths", - "sml-file-syntax", - "sml-fixity", - "sml-hir", - "sml-naive-fmt", - "sml-namespace", - "sml-statics", - "sml-statics-types", - "sml-symbol-kind", - "sml-syntax", - "str-util", - "text-pos", - "text-size-util", -] - -[[package]] -name = "anyhow" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "better-panic" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa9e1d11a268684cbd90ed36370d7577afb6c62d912ddff5c15fc34343e5036" -dependencies = [ - "backtrace", - "console", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" - -[[package]] -name = "cc" -version = "1.0.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b918671670962b48bc23753aef0c51d072dca6f52f01f800854ada6ddb7f7d3" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chain-map" -version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" -dependencies = [ - "fast-hash", - "str-util", -] - -[[package]] -name = "char-name" -version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" - -[[package]] -name = "cm-syntax" -version = "0.14.3" -dependencies = [ - "lex-util", - "paths", - "slash-var-path", - "sml-file", - "str-util", - "text-size-util", -] - -[[package]] -name = "code-h2-md-map" -version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" -dependencies = [ - "fast-hash", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "config" -version = "0.14.3" -dependencies = [ - "fast-hash", - "serde", - "sml-path", - "str-util", -] - -[[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", - "windows-sys", -] - -[[package]] -name = "countme" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" - -[[package]] -name = "cov-mark" -version = "0.14.3" -dependencies = [ - "fast-hash", - "once_cell", -] - -[[package]] -name = "crc32fast" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "diagnostic" -version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "drop_bomb" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" - -[[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - -[[package]] -name = "elapsed" -version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" -dependencies = [ - "log", -] - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[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" -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 = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "event-parse" -version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" -dependencies = [ - "drop_bomb", - "rowan", - "token", -] - -[[package]] -name = "fast-hash" -version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" -dependencies = [ - "rustc-hash", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fmt-util" -version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" - -[[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 = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" - -[[package]] -name = "hermit-abi" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "identifier-case" -version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" - -[[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 = "idx" -version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" -dependencies = [ - "nohash-hasher", -] - -[[package]] -name = "indexmap" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "input" -version = "0.14.3" -dependencies = [ - "cm-syntax", - "config", - "cov-mark", - "diagnostic", - "fast-hash", - "mlb-hir", - "mlb-syntax", - "paths", - "slash-var-path", - "sml-file", - "sml-file-syntax", - "sml-fixity", - "sml-namespace", - "sml-path", - "sml-syntax", - "str-util", - "text-pos", - "text-size-util", - "toml", - "topo-sort", -] - -[[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", -] - -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "la-arena" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" - -[[package]] -name = "lang-srv" -version = "0.14.3" -dependencies = [ - "analysis", - "anyhow", - "config", - "crossbeam-channel", - "diagnostic", - "elapsed", - "fast-hash", - "input", - "log", - "lsp-server", - "lsp-types", - "paths", - "serde", - "serde_json", - "sml-namespace", - "text-pos", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lex-util" -version = "0.14.3" - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "line-index" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67d61795376ae2683928c218fda7d7d7db136fd38c06b7552904667f0d55580a" -dependencies = [ - "nohash-hasher", - "text-size", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "lsp-server" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248f65b78f6db5d8e1b1604b4098a28b43d21a8eb1deeca22b1c421b276c7095" -dependencies = [ - "crossbeam-channel", - "log", - "serde", - "serde_json", -] - -[[package]] -name = "lsp-types" -version = "0.95.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "158c1911354ef73e8fe42da6b10c0484cb65c7f1007f28022e847706c1ab6984" -dependencies = [ - "bitflags 1.3.2", - "serde", - "serde_json", - "serde_repr", - "url", -] - -[[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "millet-cli" -version = "0.14.3" -dependencies = [ - "analysis", - "codespan-reporting", - "config", - "diagnostic", - "env_logger", - "input", - "panic-hook", - "paths", - "pico-args", - "sml-naive-fmt", - "text-pos", - "text-size-util", -] - -[[package]] -name = "millet-ls" -version = "0.14.3" -dependencies = [ - "anyhow", - "env_logger", - "lang-srv", - "log", - "panic-hook", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", -] - -[[package]] -name = "mlb-hir" -version = "0.14.3" -dependencies = [ - "fast-hash", - "paths", - "sml-file", - "sml-namespace", - "str-util", - "text-size-util", -] - -[[package]] -name = "mlb-statics" -version = "0.14.3" -dependencies = [ - "config", - "diagnostic", - "fast-hash", - "mlb-hir", - "paths", - "sml-comment", - "sml-file", - "sml-file-syntax", - "sml-fixity", - "sml-hir", - "sml-hir-lower", - "sml-libs", - "sml-namespace", - "sml-statics", - "sml-statics-types", - "sml-syntax", - "str-util", - "text-pos", - "text-size-util", -] - -[[package]] -name = "mlb-syntax" -version = "0.14.3" -dependencies = [ - "lex-util", - "paths", - "slash-var-path", - "sml-file", - "sml-namespace", - "str-util", - "text-size-util", -] - -[[package]] -name = "nohash-hasher" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" - -[[package]] -name = "num-bigint" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[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-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "panic-hook" -version = "0.14.3" -dependencies = [ - "better-panic", -] - -[[package]] -name = "paths" -version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" -dependencies = [ - "dunce", - "fast-hash", - "glob", - "idx", - "nohash-hasher", - "str-util", -] - -[[package]] -name = "pattern-match" -version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" -dependencies = [ - "fast-hash", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - -[[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -dependencies = [ - "diff", - "yansi", -] - -[[package]] -name = "prettyplease" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" -dependencies = [ - "proc-macro2", - "syn", -] - -[[package]] -name = "proc-macro2" -version = "1.0.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "pulldown-cmark" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" -dependencies = [ - "bitflags 2.4.2", - "getopts", - "memchr", - "unicase", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "regex" -version = "1.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "rowan" -version = "0.15.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49" -dependencies = [ - "countme", - "hashbrown", - "memoffset", - "rustc-hash", - "text-size", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustix" -version = "0.38.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" -dependencies = [ - "bitflags 2.4.2", - "errno", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "ryu" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - -[[package]] -name = "serde" -version = "1.0.196" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.196" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.113" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -dependencies = [ - "serde", -] - -[[package]] -name = "slash-var-path" -version = "0.14.3" -dependencies = [ - "fast-hash", - "str-util", -] - -[[package]] -name = "sml-comment" -version = "0.14.3" -dependencies = [ - "sml-syntax", -] - -[[package]] -name = "sml-dynamics" -version = "0.14.3" -dependencies = [ - "fast-hash", - "fmt-util", - "sml-hir", - "sml-statics-types", - "str-util", -] - -[[package]] -name = "sml-dynamics-tests" -version = "0.14.3" -dependencies = [ - "config", - "pretty_assertions", - "sml-dynamics", - "sml-file", - "sml-file-syntax", - "sml-fixity", - "sml-hir", - "sml-path", - "sml-statics", - "sml-statics-types", - "str-util", -] - -[[package]] -name = "sml-file" -version = "0.14.3" - -[[package]] -name = "sml-file-syntax" -version = "0.14.3" -dependencies = [ - "config", - "elapsed", - "sml-file", - "sml-fixity", - "sml-hir-lower", - "sml-lex", - "sml-parse", - "sml-ty-var-scope", - "text-pos", -] - -[[package]] -name = "sml-fixity" -version = "0.14.3" -dependencies = [ - "fast-hash", - "once_cell", - "str-util", -] - -[[package]] -name = "sml-hir" -version = "0.14.3" -dependencies = [ - "la-arena", - "sml-lab", - "sml-path", - "sml-scon", - "str-util", -] - -[[package]] -name = "sml-hir-lower" -version = "0.14.3" -dependencies = [ - "config", - "cov-mark", - "diagnostic", - "fast-hash", - "lex-util", - "sml-file", - "sml-hir", - "sml-path", - "sml-syntax", - "str-util", - "text-size-util", -] - -[[package]] -name = "sml-lab" -version = "0.14.3" -dependencies = [ - "str-util", -] - -[[package]] -name = "sml-lex" -version = "0.14.3" -dependencies = [ - "cov-mark", - "diagnostic", - "lex-util", - "sml-syntax", - "text-size-util", - "token", -] - -[[package]] -name = "sml-libs" -version = "0.1.0" -source = "git+https://github.com/azdavis/sml-libs.git#0d94e3ce13f2a489dff86151f74b26074affec2a" - -[[package]] -name = "sml-naive-fmt" -version = "0.14.3" -dependencies = [ - "fast-hash", - "sml-comment", - "sml-syntax", - "text-size-util", -] - -[[package]] -name = "sml-namespace" -version = "0.14.3" - -[[package]] -name = "sml-parse" -version = "0.14.3" -dependencies = [ - "diagnostic", - "event-parse", - "fast-hash", - "sml-fixity", - "sml-syntax", - "str-util", - "text-size-util", - "token", -] - -[[package]] -name = "sml-path" -version = "0.14.3" -dependencies = [ - "str-util", -] - -[[package]] -name = "sml-scon" -version = "0.14.3" -dependencies = [ - "num-bigint", - "num-traits", - "str-util", -] - -[[package]] -name = "sml-statics" -version = "0.14.3" -dependencies = [ - "chain-map", - "config", - "cov-mark", - "diagnostic", - "elapsed", - "fast-hash", - "fmt-util", - "log", - "paths", - "pattern-match", - "sml-hir", - "sml-namespace", - "sml-path", - "sml-statics-types", - "sml-symbol-kind", - "str-util", - "uniq", -] - -[[package]] -name = "sml-statics-types" -version = "0.14.3" -dependencies = [ - "chain-map", - "code-h2-md-map", - "config", - "cov-mark", - "drop_bomb", - "fast-hash", - "fmt-util", - "idx", - "once_cell", - "paths", - "sml-hir", - "sml-path", - "str-util", -] - -[[package]] -name = "sml-symbol-kind" -version = "0.14.3" -dependencies = [ - "sml-namespace", - "sml-statics-types", -] - -[[package]] -name = "sml-syntax" -version = "0.14.3" -dependencies = [ - "code-h2-md-map", - "fast-hash", - "rowan", - "syntax-gen", - "token", -] - -[[package]] -name = "sml-ty-var-scope" -version = "0.14.3" -dependencies = [ - "fast-hash", - "sml-hir", -] - -[[package]] -name = "smol_str" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" -dependencies = [ - "serde", -] - -[[package]] -name = "str-util" -version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" -dependencies = [ - "smol_str", -] - -[[package]] -name = "syn" -version = "2.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syntax-gen" -version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" -dependencies = [ - "char-name", - "fast-hash", - "identifier-case", - "proc-macro2", - "quote", - "ungrammar", - "write-rs-tokens", -] - -[[package]] -name = "tempfile" -version = "3.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" -dependencies = [ - "cfg-if", - "fastrand", - "rustix", - "windows-sys", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "tests" -version = "0.14.3" -dependencies = [ - "analysis", - "cm-syntax", - "config", - "cov-mark", - "diagnostic", - "env_logger", - "fast-hash", - "input", - "log", - "mlb-syntax", - "once_cell", - "paths", - "pretty_assertions", - "proc-macro2", - "pulldown-cmark", - "quote", - "serde_json", - "slash-var-path", - "sml-file", - "sml-syntax", - "str-util", - "text-pos", - "write-rs-tokens", -] - -[[package]] -name = "text-pos" -version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" -dependencies = [ - "line-index", - "text-size-util", -] - -[[package]] -name = "text-size" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" - -[[package]] -name = "text-size-util" -version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" -dependencies = [ - "text-size", -] - -[[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 = "token" -version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" - -[[package]] -name = "toml" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "topo-sort" -version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" - -[[package]] -name = "ungrammar" -version = "1.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e5df347f0bf3ec1d670aad6ca5c6a1859cd9ea61d2113125794654ccced68f" - -[[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.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "uniq" -version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[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.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" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[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" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[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" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "write-rs-tokens" -version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" -dependencies = [ - "prettyplease", - "proc-macro2", - "syn", -] - -[[package]] -name = "xtask" -version = "0.14.3" -dependencies = [ - "anyhow", - "flate2", - "pico-args", - "tempfile", -] - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix deleted file mode 100644 index 36e78863deb6..000000000000 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "millet"; - version = "0.14.3"; - - src = fetchFromGitHub { - owner = "azdavis"; - repo = pname; - rev = "v${version}"; - hash = "sha256-V1FToLhBzeZd3ve+eKAHniHN6oveEg0FBHnkSZPxBqo="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "chain-map-0.1.0" = "sha256-nds+lPGCbxw3GqrgfmTbKnPkiV3F6f5A2xr82qV33iI="; - "sml-libs-0.1.0" = "sha256-zQrhH24XlA9SeQ+sVzaVwJwrm80TRIjFq99Vay7QEN8="; - }; - }; - - postPatch = '' - rm .cargo/config.toml - ''; - - cargoBuildFlags = [ "--package" "millet-ls" ]; - - cargoTestFlags = [ "--package" "millet-ls" ]; - - meta = with lib; { - description = "Language server for Standard ML"; - 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 = [ ]; - mainProgram = "millet-ls"; - }; -} diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/development/tools/language-servers/neocmakelsp/default.nix deleted file mode 100644 index dc841414cf4d..000000000000 --- a/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "neocmakelsp"; - version = "0.8.4"; - - src = fetchFromGitHub { - owner = "Decodetalkers"; - repo = "neocmakelsp"; - rev = "v${version}"; - hash = "sha256-DPKCAWIDw3ykYp2Cuwt9CcWHgdL7aoW5z2CjVFxizhg="; - }; - - cargoHash = "sha256-wYh5JNT7HJnY6PLFCPm21LNFHsffFq53FTCRkUuHxWY="; - - meta = with lib; { - description = "CMake lsp based on tower-lsp and treesitter"; - homepage = "https://github.com/Decodetalkers/neocmakelsp"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ rewine multivac61 ]; - mainProgram = "neocmakelsp"; - }; -} diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index b4736c0b6173..ffa06bb33933 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -21,13 +21,13 @@ let common = rec { - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixd"; rev = version; - hash = "sha256-ffHLKHpqgVlYLGQ/Dc/6hW/inA98QdMJiv/fT2IrH7c="; + hash = "sha256-8F97zAu+icDC9ZYS7m+Y58oZQ7R3gVuXMvzAfgkVmJo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/language-servers/openscad-lsp/default.nix b/pkgs/development/tools/language-servers/openscad-lsp/default.nix deleted file mode 100644 index 9991f9571d35..000000000000 --- a/pkgs/development/tools/language-servers/openscad-lsp/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "openscad-lsp"; - version = "1.2.5"; - - src = fetchFromGitHub { - owner = "Leathong"; - repo = "openscad-LSP"; - rev = "dc1283df080b981f8da620744b0fb53b22f2eb84"; - hash = "sha256-IPTBWX0kKmusijg4xAvS1Ysi9WydFaUWx/BkZbMvgJk="; - }; - - cargoHash = "sha256-AQpjamyHienqB501lruxk56N6r8joocWrJ5srsm5baY="; - - # no tests exist - doCheck = false; - - meta = with lib; { - description = "LSP (Language Server Protocol) server for OpenSCAD"; - mainProgram = "openscad-lsp"; - homepage = "https://github.com/Leathong/openscad-LSP"; - license = licenses.asl20; - maintainers = with maintainers; [ c-h-johnson ]; - }; -} diff --git a/pkgs/development/tools/language-servers/perlnavigator/default.nix b/pkgs/development/tools/language-servers/perlnavigator/default.nix deleted file mode 100644 index a7d243888587..000000000000 --- a/pkgs/development/tools/language-servers/perlnavigator/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -let - version = "0.6.3"; - src = fetchFromGitHub { - owner = "bscan"; - repo = "PerlNavigator"; - rev = "v${version}"; - hash = "sha256-CNsgFf+W7YQwAR++GwfTka4Cy8woRu02BQIJRmRAxK4="; - }; - browser-ext = buildNpmPackage { - pname = "perlnavigator-web-server"; - inherit version src; - sourceRoot = "${src.name}/browser-ext"; - npmDepsHash = "sha256-PJKW+ni2wKw1ivkgQsL6g0jaxoYboa3XpVEEwgT4jWo="; - dontNpmBuild = true; - installPhase = '' - cp -r . "$out" - ''; - }; - client = buildNpmPackage { - pname = "perlnavigator-client"; - inherit version src; - sourceRoot = "${src.name}/client"; - npmDepsHash = "sha256-CM0l+D1VNkXBrZQHQGDiB/vAxMvpbHYoYlIugoLxSfA="; - dontNpmBuild = true; - installPhase = '' - cp -r . "$out" - ''; - }; - server = buildNpmPackage { - pname = "perlnavigator-server"; - inherit version src; - sourceRoot = "${src.name}/server"; - npmDepsHash = "sha256-TxK3ba9T97p8TBlULHUov6YX7WRl2QMq6TiNHxBoQeY="; - dontNpmBuild = true; - installPhase = '' - cp -r . "$out" - ''; - }; -in buildNpmPackage rec { - pname = "perlnavigator"; - inherit version src; - - npmDepsHash = "sha256-nEinmgrbbFC+nkfTwu9djiUS+tj0VM4WKl2oqKpcGtM="; - - postPatch = '' - sed -i /postinstall/d package.json - - rm -r browser-ext client server - cp -r ${browser-ext} browser-ext - cp -r ${client} client - cp -r ${server} server - chmod +w browser-ext client server - ''; - - env = { - PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = 1; - }; - - npmBuildScript = "compile"; - - postInstall = '' - cp -r ${browser-ext}/node_modules "$out/lib/node_modules/perlnavigator/browser-ext" - cp -r ${client}/node_modules "$out/lib/node_modules/perlnavigator/client" - cp -r ${server}/node_modules "$out/lib/node_modules/perlnavigator/server" - ''; - - meta = { - changelog = "https://github.com/bscan/PerlNavigator/blob/${src.rev}/CHANGELOG.md"; - description = "Perl Language Server that includes syntax checking, perl critic, and code navigation"; - homepage = "https://github.com/bscan/PerlNavigator/tree/main/server"; - license = lib.licenses.mit; - mainProgram = "perlnavigator"; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/language-servers/postgres-lsp/default.nix b/pkgs/development/tools/language-servers/postgres-lsp/default.nix deleted file mode 100644 index b267442cae83..000000000000 --- a/pkgs/development/tools/language-servers/postgres-lsp/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, protobuf -}: - -rustPlatform.buildRustPackage rec { - pname = "postgres-lsp"; - version = "0-unstable-2024-03-24"; - - src = fetchFromGitHub { - owner = "supabase"; - repo = "postgres_lsp"; - rev = "43ca9b675cb152ca7f38cfa6aff6dd2131dfa9a2"; - hash = "sha256-n7Qbt9fGzC0CcleAtTWDInPz4oaPjI+pvIPrR5EYJ9U="; - fetchSubmodules = true; - }; - - cargoHash = "sha256-UEcHlkbYMA6xETMryWXsDHyAZYtLncRJn2jA6tvw7gQ="; - - nativeBuildInputs = [ - protobuf - rustPlatform.bindgenHook - ]; - - cargoBuildFlags = [ "-p=postgres_lsp" ]; - cargoTestFlags = cargoBuildFlags; - - RUSTC_BOOTSTRAP = 1; # We need rust unstable features - - meta = with lib; { - description = "Language Server for Postgres"; - homepage = "https://github.com/supabase/postgres_lsp"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "postgres_lsp"; - }; -} diff --git a/pkgs/development/tools/language-servers/rune-languageserver/default.nix b/pkgs/development/tools/language-servers/rune-languageserver/default.nix deleted file mode 100644 index df2d91fa7e84..000000000000 --- a/pkgs/development/tools/language-servers/rune-languageserver/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "rune-languageserver"; - version = "0.13.4"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-Kw6Qh/9eQPMj4V689+7AxuJB+aCciK3FZTfcdhyZXGY="; - }; - - cargoHash = "sha256-GlzT7lN9iCNiPFIjhL/UfqohgtOwDaIeTVEWOyaeicM="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - env = { - RUNE_VERSION = version; - }; - - meta = with lib; { - description = "Language server for the Rune Language, an embeddable dynamic programming language for Rust"; - homepage = "https://crates.io/crates/rune-languageserver"; - changelog = "https://github.com/rune-rs/rune/releases/tag/${version}"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "rune-languageserver"; - }; -} diff --git a/pkgs/development/tools/language-servers/svls/default.nix b/pkgs/development/tools/language-servers/svls/default.nix deleted file mode 100644 index 6faefffee2f5..000000000000 --- a/pkgs/development/tools/language-servers/svls/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "svls"; - version = "0.2.12"; - - src = fetchFromGitHub { - owner = "dalance"; - repo = "svls"; - rev = "v${version}"; - sha256 = "sha256-DuwH0qie8SctvOGntljOdTRMGKrNFPycdaFG3QZxihA="; - }; - - cargoHash = "sha256-vDpuIWB5pbhYrFgQ1ogALMJpZvy8ETZtneX1fjpjl+0="; - - meta = with lib; { - description = "SystemVerilog language server"; - mainProgram = "svls"; - homepage = "https://github.com/dalance/svls"; - license = licenses.mit; - maintainers = with maintainers; [ trepetti ]; - }; -} diff --git a/pkgs/development/tools/language-servers/vala-language-server/default.nix b/pkgs/development/tools/language-servers/vala-language-server/default.nix deleted file mode 100644 index 0a8b3ef124a5..000000000000 --- a/pkgs/development/tools/language-servers/vala-language-server/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, nix-update-script -, meson -, ninja -, pkg-config -, scdoc -, gnome-builder -, glib -, libgee -, json-glib -, jsonrpc-glib -, vala -}: - -stdenv.mkDerivation rec { - pname = "vala-language-server"; - version = "0.48.7"; - - src = fetchFromGitHub { - owner = "vala-lang"; - repo = pname; - rev = version; - sha256 = "sha256-Vl5DjKBdpk03aPD+0xGoTwD9Slg1rREorqZGX5o10cY="; - }; - - passthru = { - updateScript = nix-update-script { }; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - scdoc - ] ++ lib.optionals stdenv.isLinux [ - # GNOME Builder Plugin - gnome-builder - ]; - - buildInputs = [ - glib - libgee - json-glib - jsonrpc-glib - vala - ]; - - meta = with lib; { - description = "Code Intelligence for Vala & Genie"; - mainProgram = "vala-language-server"; - homepage = "https://github.com/vala-lang/vala-language-server"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ andreasfelix ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/language-servers/vhdl-ls/default.nix b/pkgs/development/tools/language-servers/vhdl-ls/default.nix deleted file mode 100644 index 34ba70c683d9..000000000000 --- a/pkgs/development/tools/language-servers/vhdl-ls/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "vhdl-ls"; - version = "0.83.0"; - - src = fetchFromGitHub { - owner = "VHDL-LS"; - repo = "rust_hdl"; - rev = "v${version}"; - hash = "sha256-WLk8EHzpqUPhrmnRK6mP/4MDfSinytgVDZWi1/OfkyU="; - }; - - cargoHash = "sha256-QkD1dEEphYP0eL4qPe+TAv1ATyVcw5rSPiiIkk21Dms="; - - postPatch = '' - substituteInPlace vhdl_lang/src/config.rs \ - --replace /usr/lib $out/lib - ''; - - postInstall = '' - mkdir -p $out/lib/rust_hdl - cp -r vhdl_libraries $out/lib/rust_hdl - ''; - - meta = { - description = "Fast VHDL language server"; - homepage = "https://github.com/VHDL-LS/rust_hdl"; - license = lib.licenses.mpl20; - mainProgram = "vhdl_ls"; - maintainers = with lib.maintainers; [ doronbehar ]; - }; -} diff --git a/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix b/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix deleted file mode 100644 index 4b7f571ead57..000000000000 --- a/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, buildNpmPackage, fetchFromGitHub, unzip, vscodium, vscode-extensions }: - -buildNpmPackage rec { - pname = "vscode-langservers-extracted"; - version = "4.10.0"; - - 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.app/Contents/Resources/app/extensions" - else "../resources/app/extensions"; - in - '' - npx babel ${extensions}/css-language-features/server/dist/node \ - --out-dir lib/css-language-server/node/ - npx babel ${extensions}/html-language-features/server/dist/node \ - --out-dir lib/html-language-server/node/ - npx babel ${extensions}/json-language-features/server/dist/node \ - --out-dir lib/json-language-server/node/ - cp -r ${vscode-extensions.dbaeumer.vscode-eslint}/share/vscode/extensions/dbaeumer.vscode-eslint/server/out \ - lib/eslint-language-server - ''; - - meta = with lib; { - description = "HTML/CSS/JSON/ESLint language servers extracted from vscode"; - homepage = "https://github.com/hrsh7th/vscode-langservers-extracted"; - license = licenses.mit; - maintainers = with maintainers; [ lord-valen ]; - }; -} diff --git a/pkgs/development/tools/language-servers/yaml-language-server/default.nix b/pkgs/development/tools/language-servers/yaml-language-server/default.nix deleted file mode 100644 index 585ea255ef7d..000000000000 --- a/pkgs/development/tools/language-servers/yaml-language-server/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ lib -, fetchFromGitHub -, fetchYarnDeps -, fixup-yarn-lock -, makeWrapper -, nodejs -, stdenv -, yarn -}: - -stdenv.mkDerivation rec { - pname = "yaml-language-server"; - version = "1.15.0"; - - src = fetchFromGitHub { - owner = "redhat-developer"; - repo = "yaml-language-server"; - rev = version; - hash = "sha256-Y3Q/y9UIiy7US8Jl4vxT0Pfw8h3hiXK+Cu9TEQHyAaA="; - }; - - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; - hash = "sha256-zHcxZ4VU6CGux72Nsy0foU4gFshK1wO/LTfnwOoirmg="; - }; - - nativeBuildInputs = [ - makeWrapper - fixup-yarn-lock - yarn - ]; - - buildInputs = [ - nodejs - ]; - - configurePhase = '' - runHook preConfigure - - export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror "$offlineCache" - fixup-yarn-lock yarn.lock - yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install - patchShebangs node_modules - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - yarn --offline compile - yarn --offline build:libs - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - yarn --offline --production install - - mkdir -p $out/bin $out/lib/node_modules/yaml-language-server - cp -r . $out/lib/node_modules/yaml-language-server - ln -s $out/lib/node_modules/yaml-language-server/bin/yaml-language-server $out/bin/ - - runHook postInstall - ''; - - meta = { - changelog = "https://github.com/redhat-developer/yaml-language-server/blob/${src.rev}/CHANGELOG.md"; - description = "Language Server for YAML Files"; - homepage = "https://github.com/redhat-developer/yaml-language-server"; - license = lib.licenses.mit; - mainProgram = "yaml-language-server"; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/language-servers/yaml-language-server/package.json b/pkgs/development/tools/language-servers/yaml-language-server/package.json deleted file mode 100644 index 62be0e23edba..000000000000 --- a/pkgs/development/tools/language-servers/yaml-language-server/package.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "name": "yaml-language-server", - "description": "YAML language server", - "version": "1.15.0", - "author": "Gorkem Ercan (Red Hat)", - "license": "MIT", - "contributors": [ - { - "name": "Joshua Pinkney", - "email": "joshpinkney@gmail.com" - }, - { - "name": "Yevhen Vydolob", - "email": "yvydolob@redhat.com" - }, - { - "name": "Google LLC" - } - ], - "bin": { - "yaml-language-server": "./bin/yaml-language-server" - }, - "main": "./out/server/src/index.js", - "keywords": [ - "yaml", - "LSP" - ], - "repository": { - "type": "git", - "url": "https://github.com/redhat-developer/yaml-language-server.git" - }, - "optionalDependencies": { - "prettier": "2.8.7" - }, - "dependencies": { - "ajv": "^8.11.0", - "lodash": "4.17.21", - "request-light": "^0.5.7", - "vscode-json-languageservice": "4.1.8", - "vscode-languageserver": "^7.0.0", - "vscode-languageserver-textdocument": "^1.0.1", - "vscode-languageserver-types": "^3.16.0", - "vscode-nls": "^5.0.0", - "vscode-uri": "^3.0.2", - "yaml": "2.2.2" - }, - "devDependencies": { - "@microsoft/eslint-formatter-sarif": "3.0.0", - "@types/chai": "^4.2.12", - "@types/mocha": "8.2.2", - "@types/node": "16.x", - "@types/prettier": "2.7.2", - "@types/sinon": "^9.0.5", - "@types/sinon-chai": "^3.2.5", - "@typescript-eslint/eslint-plugin": "^5.38.0", - "@typescript-eslint/parser": "^5.38.0", - "chai": "^4.2.0", - "coveralls": "3.1.1", - "eslint": "^8.24.0", - "eslint-config-prettier": "^8.5.0", - "eslint-plugin-import": "^2.26.0", - "eslint-plugin-prettier": "^4.2.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "mocha": "9.2.2", - "mocha-lcov-reporter": "^1.3.0", - "nyc": "^15.1.0", - "rimraf": "^3.0.2", - "sinon": "^9.0.3", - "sinon-chai": "^3.5.0", - "source-map-support": "^0.5.19", - "ts-node": "^10.0.0", - "typescript": "^4.8.3" - }, - "scripts": { - "clean": "rimraf out/server && rimraf lib", - "compile": "tsc -p .", - "watch": "tsc --watch -p .", - "test": "mocha --require ts-node/register --timeout 5000 --ui bdd ./test/*.test.ts", - "coverage": "nyc mocha --require ts-node/register --timeout 5000 --require source-map-support/register --recursive --ui bdd ./test/*.test.ts", - "coveralls": "nyc --reporter=lcov --reporter=text mocha --timeout 5000 --require ts-node/register --require source-map-support/register --recursive --ui bdd ./test/*.test.ts", - "lint": "eslint --max-warnings 0 -c .eslintrc.js --ext .ts src test", - "lint-ci": "eslint --max-warnings 0 -c .eslintrc.js -f @microsoft/eslint-formatter-sarif -o eslint-result.sarif --ext .ts src test", - "prettier-fix": "yarn prettier --write .", - "build": "yarn clean && yarn lint && yarn compile && yarn build:libs", - "build:libs": "yarn compile:umd && yarn compile:esm", - "compile:umd": "tsc -p ./tsconfig.umd.json", - "compile:esm": "tsc -p ./tsconfig.esm.json", - "check-dependencies": "node ./scripts/check-dependencies.js", - "pull-remote": "git pull https://github.com/redhat-developer/yaml-language-server.git main" - }, - "nyc": { - "extension": [ - ".ts", - ".tsx" - ], - "exclude": [ - "**/*.d.ts", - "test/", - "out", - "lib", - "coverage/", - ".eslintrc.js", - "scripts" - ], - "all": true - } -} diff --git a/pkgs/development/tools/language-servers/zls/default.nix b/pkgs/development/tools/language-servers/zls/default.nix deleted file mode 100644 index 408bb69f64b6..000000000000 --- a/pkgs/development/tools/language-servers/zls/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, zig_0_13 -, callPackage -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "zls"; - version = "0.13.0"; - - src = fetchFromGitHub { - owner = "zigtools"; - repo = "zls"; - rev = finalAttrs.version; - fetchSubmodules = true; - hash = "sha256-vkFGoKCYUk6B40XW2T/pdhir2wzN1kpFmlLcoLwJx1U="; - }; - - zigBuildFlags = [ - "-Dversion_data_path=${zig_0_13.src}/doc/langref.html.in" - ]; - - nativeBuildInputs = [ - zig_0_13.hook - ]; - - postPatch = '' - ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p - ''; - - meta = { - description = "Zig LSP implementation + Zig Language Server"; - mainProgram = "zls"; - 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 _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 deleted file mode 100644 index 1c6b2cd25f8c..000000000000 --- a/pkgs/development/tools/language-servers/zls/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -# generated by zon2nix (https://github.com/figsoda/zon2nix) - -{ linkFarm, fetchzip }: - -linkFarm "zig-packages" [ - { - name = "12209cde192558f8b3dc098ac2330fc2a14fdd211c5433afd33085af75caa9183147"; - path = fetchzip { - url = "https://github.com/ziglibs/known-folders/archive/0ad514dcfb7525e32ae349b9acc0a53976f3a9fa.tar.gz"; - hash = "sha256-X+XkFj56MkYxxN9LUisjnkfCxUfnbkzBWHy9pwg5M+g="; - }; - } - { - name = "1220102cb2c669d82184fb1dc5380193d37d68b54e8d75b76b2d155b9af7d7e2e76d"; - path = fetchzip { - url = "https://github.com/ziglibs/diffz/archive/ef45c00d655e5e40faf35afbbde81a1fa5ed7ffb.tar.gz"; - hash = "sha256-5/3W0Xt9RjsvCb8Q4cdaM8dkJP7CdFro14JJLCuqASo="; - }; - } -] diff --git a/pkgs/development/tools/lc3tools/0001-mangle-configure.patch b/pkgs/development/tools/lc3tools/0001-mangle-configure.patch deleted file mode 100644 index 80b5c7d21174..000000000000 --- a/pkgs/development/tools/lc3tools/0001-mangle-configure.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/configure b/configure -index 46f9af4..dfc1b3e 100755 ---- a/configure -+++ b/configure -@@ -17,10 +17,11 @@ esac - - # Some binaries that we'll need, and the places that we might find them. - --binlist="uname flex gcc wish rm cp mkdir chmod sed" --pathlist="/bin /usr/bin /usr/local/bin /sw/bin /usr/x116/bin /usr/X11R6/bin" --libpathlist="/lib /usr/lib /usr/local/lib" --incpathlist="/include /usr/include /usr/local/include" -+IFS=: -+binlist="uname:flex:gcc:wish:rm:cp:mkdir:chmod:sed" -+pathlist=$PATH -+libpathlist=$LIBS -+incpathlist=$INCLUDES - - - # Find the binaries (or die trying). -@@ -55,7 +56,7 @@ case `$uname -s` in - echo "Configuring for Cygwin..." - ;; - Linux*) echo "Configuring for Linux..." -- OS_SIM_LIBS="-lcurses" -+ # OS_SIM_LIBS="-lcurses" - ;; - SunOS*) echo "Configuring for Solaris..." - OS_SIM_LIBS="-lcurses -lsocket -lnsl" diff --git a/pkgs/development/tools/lc3tools/0002-lc3os-path.patch b/pkgs/development/tools/lc3tools/0002-lc3os-path.patch deleted file mode 100644 index 413c95e12f64..000000000000 --- a/pkgs/development/tools/lc3tools/0002-lc3os-path.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/lc3sim.c b/lc3sim.c -index dac7f7a..736fd7c 100644 ---- a/lc3sim.c -+++ b/lc3sim.c -@@ -665,14 +665,14 @@ init_machine () - bzero (lc3_sym_hash, sizeof (lc3_sym_hash)); - clear_all_breakpoints (); - -- if (read_obj_file (INSTALL_DIR "/lc3os.obj", &os_start, &os_end) == -1) { -+ if (read_obj_file (INSTALL_DIR "/share/lc3tools/lc3os.obj", &os_start, &os_end) == -1) { - if (gui_mode) - puts ("ERR {Failed to read LC-3 OS code.}"); - else - puts ("Failed to read LC-3 OS code."); - show_state_if_stop_visible (); - } else { -- if (read_sym_file (INSTALL_DIR "/lc3os.sym") == -1) { -+ if (read_sym_file (INSTALL_DIR "/share/lc3tools/lc3os.sym") == -1) { - if (gui_mode) - puts ("ERR {Failed to read LC-3 OS symbols.}"); - else diff --git a/pkgs/development/tools/lc3tools/0003-lc3sim-tk-path.patch b/pkgs/development/tools/lc3tools/0003-lc3sim-tk-path.patch deleted file mode 100644 index 38bc9daaf59c..000000000000 --- a/pkgs/development/tools/lc3tools/0003-lc3sim-tk-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile.def b/Makefile.def -index 34f7df3..05dc86c 100644 ---- a/Makefile.def -+++ b/Makefile.def -@@ -155,7 +155,7 @@ dist_lc3sim-tk: lc3sim-tk - - lc3sim-tk: lc3sim-tk.def - ${SED} -e 's @@WISH@@ ${WISH} g' \ -- -e 's*@@LC3_SIM@@*"${INSTALL_DIR}/lc3sim"*g' \ -+ -e 's*@@LC3_SIM@@*"${INSTALL_DIR}/bin/lc3sim"*g' \ - -e 's!@@CODE_FONT@@!${CODE_FONT}!g' \ - -e 's!@@BUTTON_FONT@@!${BUTTON_FONT}!g' \ - -e 's!@@CONSOLE_FONT@@!${CONSOLE_FONT}!g' \ diff --git a/pkgs/development/tools/lc3tools/0004-configure-use-cc.patch b/pkgs/development/tools/lc3tools/0004-configure-use-cc.patch deleted file mode 100644 index caaec2200008..000000000000 --- a/pkgs/development/tools/lc3tools/0004-configure-use-cc.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/configure b/configure -index dfc1b3e..55577af 100755 ---- a/configure -+++ b/configure -@@ -18,7 +18,7 @@ esac - # Some binaries that we'll need, and the places that we might find them. - - IFS=: --binlist="uname:flex:gcc:wish:rm:cp:mkdir:chmod:sed" -+binlist="uname:flex:cc:wish:rm:cp:mkdir:chmod:sed" - pathlist=$PATH - libpathlist=$LIBS - incpathlist=$INCLUDES -@@ -109,7 +109,7 @@ fi - # Splice it all in to Makefile.def to create the Makefile. - - rm -f Makefile --sed -e "s __GCC__ $gcc g" -e "s __FLEX__ $flex g" -e "s __EXE__ $EXE g" \ -+sed -e "s __GCC__ $cc g" -e "s __FLEX__ $flex g" -e "s __EXE__ $EXE g" \ - -e "s*__OS_SIM_LIBS__*$OS_SIM_LIBS*g" -e "s __RM__ $rm g" \ - -e "s __CP__ $cp g" -e "s __MKDIR__ $mkdir g" -e "s __CHMOD__ $chmod g" \ - -e "s __USE_READLINE__ $USE_READLINE g" -e "s*__RLLPATH__*$RLLPATH*g" \ diff --git a/pkgs/development/tools/lc3tools/default.nix b/pkgs/development/tools/lc3tools/default.nix deleted file mode 100644 index c6120a227a99..000000000000 --- a/pkgs/development/tools/lc3tools/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, flex, tk, ncurses, readline }: - -stdenv.mkDerivation { - pname = "lc3tools"; - version = "0.12"; - - src = fetchurl { - url = "https://highered.mheducation.com/sites/dl/free/0072467509/104652/lc3tools_v12.zip"; - hash = "sha256-PTM0ole8pHiJmUaahjPwcBQY8/hVVgQhADZ4bSABt3I="; - }; - - patches = [ - # the original configure looks for things in the FHS path - # I have modified it to take environment vars - ./0001-mangle-configure.patch - - # lc3sim looks for the LC3 OS in $out/share/lc3tools instead of $out - ./0002-lc3os-path.patch - - # lc3sim-tk looks for lc3sim in $out/bin instead of $out - ./0003-lc3sim-tk-path.patch - - # use `cc` instead of `gcc`; on macOS the latter is not present - ./0004-configure-use-cc.patch - ]; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ flex tk ncurses readline ]; - - # lumetta published this a while ago but handrolled his configure - # jank in the original packaging makes this necessary: - LIBS = "${flex}/lib:${ncurses}/lib:${readline}/lib"; - INCLUDES = "${flex}/include:${ncurses}/include:${readline}/include"; - - # it doesn't take `--prefix` - prefixKey = "--installdir "; - - postInstall = '' - mkdir -p $out/{bin,share/lc3tools} - - mv -t $out/share/lc3tools $out/{COPYING,NO_WARRANTY,README} $out/lc3os* - mv -t $out/bin $out/lc3* - ''; - - meta = with lib; { - longDescription = '' - The LC-3 tools package contains the lc3as assembler, the lc3sim simulator, - and lc3sim-tk, a Tcl/Tk-based GUI frontend to the simulator. - ''; - description = "Toolchain and emulator for the LC-3 architecture"; - homepage = "https://highered.mheducation.com/sites/0072467509/student_view0/lc-3_simulator.html"; - license = licenses.gpl2; - maintainers = with maintainers; [ anna328p ]; - mainProgram = "lc3sim-tk"; - platforms = with lib.platforms; unix ++ windows; - }; -} diff --git a/pkgs/development/tools/ldid/default.nix b/pkgs/development/tools/ldid/default.nix index 38b252781c7e..c3a988885cec 100644 --- a/pkgs/development/tools/ldid/default.nix +++ b/pkgs/development/tools/ldid/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libplist libxml2 openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "-lcrypto" "-lplist-2.0" "-lxml2" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-framework CoreFoundation" "-framework Security" ]; diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix deleted file mode 100644 index c9eac1db13a8..000000000000 --- a/pkgs/development/tools/leaps/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, leaps, nixosTests }: - -buildGoModule rec { - pname = "leaps"; - version = "0.9.1"; - - src = fetchFromGitHub { - owner = "Jeffail"; - repo = "leaps"; - rev = "v${version}"; - sha256 = "sha256-9AYE8+K6B6/odwNR+UhTTqmJ1RD6HhKvtC3WibWUZic="; - }; - - proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-0dwUOoV2bxPB+B6CKxJPImPIDlBMPcm0AwEMrVUkALc="; - - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; - - passthru.tests = { - version = testers.testVersion { package = leaps; }; - inherit (nixosTests) leaps; - }; - - meta = with lib; { - description = "Pair programming tool and library written in Golang"; - mainProgram = "leaps"; - homepage = "https://github.com/jeffail/leaps/"; - license = licenses.mit; - maintainers = with lib.maintainers; [ qknight ]; - }; -} diff --git a/pkgs/development/tools/legitify/default.nix b/pkgs/development/tools/legitify/default.nix deleted file mode 100644 index 4759f9f19967..000000000000 --- a/pkgs/development/tools/legitify/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "legitify"; - version = "1.0.11"; - - src = fetchFromGitHub { - owner = "Legit-Labs"; - repo = "legitify"; - rev = "refs/tags/v${version}"; - hash = "sha256-ijW0vvamuqcN6coV5pAtmjAUjzNXxiqr2S9EwrNlrJc="; - }; - - vendorHash = "sha256-QwSh7+LuwdbBtrIGk3ZK6cMW9h7wzNArPT/lVZgUGBU="; - - ldflags = [ - "-w" - "-s" - "-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"; - 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/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index ca9aee9c4592..c93c27722ec2 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook doxygen pkg-config python ]; buildInputs = [ libzip glib libusb1 libftdi1 check libserialport glibmm hidapi - ] ++ lib.optionals stdenv.isLinux [ libieee1284 bluez ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libieee1284 bluez ]; strictDeps = true; diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix deleted file mode 100644 index 972c413ccddd..000000000000 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchgit, pkg-config, autoreconfHook, glib, python3, check, libxcrypt }: - -stdenv.mkDerivation rec { - pname = "libsigrokdecode"; - version = "0.5.3-unstable-2023-10-23"; - - src = fetchgit { - url = "git://sigrok.org/libsigrokdecode"; - rev = "0c35c5c5845d05e5f624c99d58af992d2f004446"; - hash = "sha256-1kQB7uk2c+6Uriw+1o6brThDcBLoCdPV0MVWAha7ohk="; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ glib python3 libxcrypt ]; - nativeCheckInputs = [ check ]; - doCheck = true; - - meta = with lib; { - description = "Protocol decoding library for the sigrok signal analysis software suite"; - homepage = "https://sigrok.org/"; - license = licenses.gpl3Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ bjornfor vifino ]; - }; -} diff --git a/pkgs/development/tools/license-scanner/default.nix b/pkgs/development/tools/license-scanner/default.nix deleted file mode 100644 index 6fcb17e4f4b2..000000000000 --- a/pkgs/development/tools/license-scanner/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "license-scanner"; - version = "0.11.0"; - - src = fetchFromGitHub { - owner = "CycloneDX"; - repo = "license-scanner"; - rev = "refs/tags/v${version}"; - hash = "sha256-2KUaVDAZxMwZ3AAMEUmRiuvenPSFliUp6rZCZrVTDps="; - }; - - vendorHash = "sha256-7xa2tdCDCXkOZCLL8YPtO7i1VqD61Mow7un0690I8mM="; - - meta = with lib; { - description = "Utility that provides an API and CLI to identify licenses and legal terms"; - mainProgram = "license-scanner"; - homepage = "https://github.com/CycloneDX/license-scanner"; - changelog = "https://github.com/CycloneDX/license-scanner/blob/${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix deleted file mode 100644 index d0657e935697..000000000000 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, nawk, groff, icon-lang, useIcon ? true }: - -stdenv.mkDerivation (finalAttrs: { - pname = "noweb"; - version = "2.13"; - - src = fetchFromGitHub { - owner = "nrnrnr"; - repo = "noweb"; - rev = "v${builtins.replaceStrings ["."] ["_"] finalAttrs.version}"; - sha256 = "sha256-COcWyrYkheRaSr2gqreRRsz9SYRTX2PSl7km+g98ljs="; - }; - - sourceRoot = "${finalAttrs.src.name}/src"; - - patches = [ - # Remove FAQ - ./no-FAQ.patch - ]; - - postPatch = '' - substituteInPlace Makefile --replace 'strip' '${stdenv.cc.targetPrefix}strip' - substituteInPlace Makefile --replace '`./gitversion`' '${finalAttrs.src.rev}' - ''; - - nativeBuildInputs = [ groff ] ++ lib.optionals useIcon [ icon-lang ]; - buildInputs = [ nawk ]; - - preBuild = '' - mkdir -p "$out/lib/noweb" - ''; - - makeFlags = lib.optionals useIcon [ - "LIBSRC=icon" - "ICONC=icont" - ] ++ [ "CC=${stdenv.cc.targetPrefix}cc" ]; - - preInstall = '' - mkdir -p "$tex/tex/latex/noweb" - installFlagsArray+=( \ - "BIN=${placeholder "out"}/bin" \ - "ELISP=${placeholder "out"}/share/emacs/site-lisp" \ - "LIB=${placeholder "out"}/lib/noweb" \ - "MAN=${placeholder "out"}/share/man" \ - "TEXINPUTS=${placeholder "tex"}/tex/latex/noweb" \ - ) - ''; - - installTargets = [ "install-code" "install-tex" "install-elisp" ]; - - postInstall = '' - substituteInPlace "$out/bin/cpif" --replace "PATH=/bin:/usr/bin" "" - - for f in $out/bin/no{index,roff,roots,untangle,web} \ - $out/lib/noweb/to{ascii,html,roff,tex} \ - $out/lib/noweb/{bt,empty}defn \ - $out/lib/noweb/{noidx,pipedocs,unmarkup}; do - # NOTE: substituteInPlace breaks Icon binaries, so make sure the script - # uses (n)awk before calling. - if grep -q nawk "$f"; then - substituteInPlace "$f" --replace "nawk" "${nawk}/bin/nawk" - fi - done - - # HACK: This is ugly, but functional. - PATH=$out/bin:$PATH make -BC xdoc - make "''${installFlagsArray[@]}" install-man - - ln -s "$tex" "$out/share/texmf" - ''; - - outputs = [ "out" "tex" ]; - - passthru = { - tlType = "run"; - pkgs = [ finalAttrs.finalPackage.tex ]; - }; - - meta = with lib; { - description = "Simple, extensible literate-programming tool"; - homepage = "https://www.cs.tufts.edu/~nr/noweb"; - license = licenses.bsd2; - maintainers = with maintainers; [ yurrriq ]; - platforms = with platforms; linux ++ darwin; - }; -}) diff --git a/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch b/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch deleted file mode 100644 index 7fa5c475c400..000000000000 --- a/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index 1897c09..770e108 100644 ---- a/Makefile -+++ b/Makefile -@@ -195,7 +195,7 @@ install-elisp: - - uninstall-elisp: - rm -f $(ELISP)/noweb-mode.el --source: FAQ -+source: - for i in c shell lib xdoc icon awk tex; do (cd $$i && $(MAKE) CPIF=">" $@); done - sleep 1 - for i in c shell lib xdoc icon awk tex; do (cd $$i && $(MAKE) touch); done diff --git a/pkgs/development/tools/ls-lint/default.nix b/pkgs/development/tools/ls-lint/default.nix deleted file mode 100644 index b130e9d27dcc..000000000000 --- a/pkgs/development/tools/ls-lint/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "ls-lint"; - version = "2.2.3"; - - src = fetchFromGitHub { - owner = "loeffel-io"; - repo = "ls-lint"; - rev = "v${version}"; - sha256 = "sha256-blhb7+SmB3p6udGcbA8eCpSaqlTCca8J0Y/8riNRjW0="; - }; - - vendorHash = "sha256-qXx83jtkVzN+ydXjW4Nkz49rhSLbAS2597iuYUDsEo4="; - - meta = with lib; { - description = "Extremely fast file and directory name linter"; - mainProgram = "ls_lint"; - homepage = "https://ls-lint.org/"; - license = licenses.mit; - maintainers = with maintainers; [ flokli ]; - }; -} diff --git a/pkgs/development/tools/luaformatter/default.nix b/pkgs/development/tools/luaformatter/default.nix deleted file mode 100644 index eb8b5a799ce1..000000000000 --- a/pkgs/development/tools/luaformatter/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4_9, libargs, catch2, cmake, yaml-cpp }: - -let - antlr4 = antlr4_9; -in - -stdenv.mkDerivation rec { - pname = "luaformatter"; - version = "1.3.6"; - - src = fetchFromGitHub { - owner = "Koihik"; - repo = "LuaFormatter"; - rev = version; - sha256 = "14l1f9hrp6m7z3cm5yl0njba6gfixzdirxjl8nihp9val0685vm0"; - }; - - patches = [ - (substituteAll { - src = ./fix-lib-paths.patch; - antlr4RuntimeCpp = antlr4.runtime.cpp.dev; - inherit libargs catch2 yaml-cpp; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ antlr4.runtime.cpp yaml-cpp ]; - - meta = with lib; { - description = "Code formatter for Lua"; - homepage = "https://github.com/Koihik/LuaFormatter"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "lua-format"; - }; -} diff --git a/pkgs/development/tools/luaformatter/fix-lib-paths.patch b/pkgs/development/tools/luaformatter/fix-lib-paths.patch deleted file mode 100644 index 610a313ca27c..000000000000 --- a/pkgs/development/tools/luaformatter/fix-lib-paths.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4a21b94..0ac7911 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -67,10 +67,10 @@ endif() - - include_directories( - ${PROJECT_SOURCE_DIR}/generated/ -- ${PROJECT_SOURCE_DIR}/third_party/ -- ${PROJECT_SOURCE_DIR}/third_party/Catch2/single_include -- ${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/include -- ${PROJECT_SOURCE_DIR}/third_party/antlr4/runtime/Cpp/runtime/src -+ @libargs@/include -+ @catch2@/include -+ @yaml-cpp@/include -+ @antlr4RuntimeCpp@/include/antlr4-runtime - ${PROJECT_SOURCE_DIR}/src/ - ) - -@@ -92,9 +92,6 @@ file(GLOB_RECURSE yaml-cpp-src - ${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/src/*.cpp - ) - --add_library (antlr4-cpp-runtime ${antlr4-cpp-src}) --add_library (yaml-cpp ${yaml-cpp-src}) -- - add_executable(lua-format ${src_dir} src/main.cpp) - - if(WIN32) -@@ -104,7 +101,7 @@ endif() - - set_target_properties(lua-format PROPERTIES LINKER_LANGUAGE CXX) - --target_link_libraries(lua-format yaml-cpp antlr4-cpp-runtime ${extra-libs}) -+target_link_libraries(lua-format yaml-cpp antlr4-runtime ${extra-libs}) - - install(TARGETS lua-format - RUNTIME DESTINATION bin -@@ -135,7 +132,7 @@ if(BUILD_TESTS) - endif() - - target_compile_definitions(lua-format-test PUBLIC PROJECT_PATH="${PROJECT_SOURCE_DIR}") -- target_link_libraries(lua-format-test yaml-cpp antlr4-cpp-runtime ${extra-libs}) -+ target_link_libraries(lua-format-test yaml-cpp antlr4-runtime ${extra-libs}) - - add_test(NAME args COMMAND lua-format-test [args]) - add_test(NAME config COMMAND lua-format-test [config]) -diff --git a/src/main.cpp b/src/main.cpp -index 38962a2..332aad6 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -1,4 +1,4 @@ --#include <args/args.hxx> -+#include <args.hxx> - #include <cstdlib> - #include <fstream> - #include <iostream> -diff --git a/test/test_args.cpp b/test/test_args.cpp -index 69a5746..b988d00 100644 ---- a/test/test_args.cpp -+++ b/test/test_args.cpp -@@ -1,4 +1,4 @@ --#include <args/args.hxx> -+#include <args.hxx> - #include <catch2/catch.hpp> - #include <iostream> - #include <tuple> diff --git a/pkgs/development/tools/lurk/default.nix b/pkgs/development/tools/lurk/default.nix deleted file mode 100644 index b9c8dcb36abc..000000000000 --- a/pkgs/development/tools/lurk/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, -}: - -rustPlatform.buildRustPackage rec { - pname = "lurk"; - version = "0.3.7"; - - src = fetchFromGitHub { - owner = "jakwai01"; - repo = pname; - rev = "v${version}"; - hash = "sha256-99WdRyE2avoH5Ea277Dx/HNcOdWxOamR41W7dQQadpo="; - }; - - cargoHash = "sha256-BUIMtJCzK//bZuvn9iptBd7lVMGyWFNJ/0oTfwPu0DE="; - - postPatch = '' - substituteInPlace src/lib.rs \ - --replace-fail '/usr/bin/ls' 'ls' - ''; - - meta = with lib; { - description = "Simple and pretty alternative to strace"; - mainProgram = "lurk"; - homepage = "https://github.com/jakwai01/lurk"; - changelog = "https://github.com/jakwai01/lurk/releases/tag/${src.rev}"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ figsoda ]; - platforms = [ - "i686-linux" - "x86_64-linux" - ]; - }; -} diff --git a/pkgs/development/tools/maizzle/default.nix b/pkgs/development/tools/maizzle/default.nix deleted file mode 100644 index a33a845e7cd3..000000000000 --- a/pkgs/development/tools/maizzle/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "maizzle"; - version = "1.5.9"; - - src = fetchFromGitHub { - owner = "maizzle"; - repo = "cli"; - rev = "v${version}"; - hash = "sha256-r3HWqfm/BdOfENi5cGdau7ockvNLxnWufWcQepI/RFM="; - }; - - npmDepsHash = "sha256-WlqWOGwmSab+cJWPUFIBWuFwMK4lFQm80PoUfEIIIH8="; - - dontNpmBuild = true; - - meta = { - description = "CLI tool for the Maizzle Email Framework"; - homepage = "https://github.com/maizzle/cli"; - license = lib.licenses.mit; - mainProgram = "maizzle"; - maintainers = with lib.maintainers; [ happysalada ]; - }; -} diff --git a/pkgs/development/tools/makerpm/default.nix b/pkgs/development/tools/makerpm/default.nix deleted file mode 100644 index a00d4a4d6663..000000000000 --- a/pkgs/development/tools/makerpm/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, zlib, libarchive, openssl }: - -stdenv.mkDerivation rec { - version = "1.0"; - pname = "makerpm"; - - installPhase = '' - mkdir -p $out/bin - cp makerpm $out/bin - ''; - - buildInputs = [ zlib libarchive openssl ]; - - src = fetchFromGitHub { - owner = "ivan-tkatchev"; - repo = "makerpm"; - rev = version; - sha256 = "089dkbh5705ppyi920rd0ksjc0143xmvnhm8qrx93rsgwc1ggi1y"; - }; - - meta = with lib; { - homepage = "https://github.com/ivan-tkatchev/makerpm/"; - description = "Clean, simple RPM packager reimplemented completely from scratch"; - mainProgram = "makerpm"; - license = licenses.free; - platforms = platforms.all; - maintainers = [ maintainers.ivan-tkatchev ]; - }; -} diff --git a/pkgs/development/tools/mani/default.nix b/pkgs/development/tools/mani/default.nix deleted file mode 100644 index add490154d66..000000000000 --- a/pkgs/development/tools/mani/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib, installShellFiles, git, makeWrapper}: - -buildGoModule rec { - pname = "mani"; - version = "0.25.0"; - - src = fetchFromGitHub { - owner = "alajmo"; - repo = "mani"; - rev = "v${version}"; - sha256 = "sha256-TqxoU2g4ZegJGHrnNO+ivPu209NDFcLnxpHGj8pOA4E="; - }; - - vendorHash = "sha256-mFan09oJ+BPVJHAxoROj282WJ+4e7TD0ZqeQH1kDabQ="; - - nativeBuildInputs = [ installShellFiles makeWrapper ]; - - ldflags = [ "-s" "-w" "-X github.com/alajmo/mani/cmd.version=${version}" ]; - - postInstall = '' - installShellCompletion --cmd mani \ - --bash <($out/bin/mani completion bash) \ - --fish <($out/bin/mani completion fish) \ - --zsh <($out/bin/mani completion zsh) - - wrapProgram $out/bin/mani \ - --prefix PATH : ${lib.makeBinPath [ git ]} - ''; - - # Skip tests - # The repo's test folder has a README.md with detailed information. I don't - # know how to wrap the dependencies for these integration tests so skip for now. - doCheck = false; - - meta = with lib; { - description = "CLI tool to help you manage multiple repositories"; - mainProgram = "mani"; - longDescription = '' - mani is a CLI tool that helps you manage multiple repositories. It's useful - when you are working with microservices, multi-project systems, many - libraries or just a bunch of repositories and want a central place for - pulling all repositories and running commands over them. - ''; - homepage = "https://manicli.com/"; - changelog = "https://github.com/alajmo/mani/releases/tag/v${version}"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/tools/manifest-tool/default.nix b/pkgs/development/tools/manifest-tool/default.nix deleted file mode 100644 index fe85fb0c451c..000000000000 --- a/pkgs/development/tools/manifest-tool/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, git -, stdenv -, testers -, manifest-tool -}: - -buildGoModule rec { - pname = "manifest-tool"; - version = "2.1.7"; - modRoot = "v2"; - - src = fetchFromGitHub { - owner = "estesp"; - repo = "manifest-tool"; - rev = "v${version}"; - hash = "sha256-f3rl4ktqvZlqIBmk9WeZ0IUil2bEAdusdCIvtqm9Gwk="; - leaveDotGit = true; - postFetch = '' - git -C $out rev-parse HEAD > $out/.git-revision - rm -rf $out/.git - ''; - }; - - vendorHash = null; - - nativeBuildInputs = [ git ]; - - ldflags = [ - "-s" - "-w" - "-X main.version=${version}" - ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - "-linkmode=external" - "-extldflags" - "-static" - ]; - - preConfigure = '' - export ldflags+=" -X main.gitCommit=$(cat .git-revision)" - ''; - - tags = lib.optionals stdenv.hostPlatform.isStatic [ - "cgo" - "netgo" - "osusergo" - "static_build" - ]; - - passthru.tests.version = testers.testVersion { - package = manifest-tool; - }; - - meta = with lib; { - description = "Command line tool to create and query container image manifest list/indexes"; - mainProgram = "manifest-tool"; - homepage = "https://github.com/estesp/manifest-tool"; - license = licenses.asl20; - maintainers = with maintainers; [ tricktron ]; - }; -} diff --git a/pkgs/development/tools/marksman/default.nix b/pkgs/development/tools/marksman/default.nix index 4a0f4ca10a7a..663ccf3c646e 100644 --- a/pkgs/development/tools/marksman/default.nix +++ b/pkgs/development/tools/marksman/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "marksman"; - version = "2023-12-09"; + version = "2024-10-07"; src = fetchFromGitHub { owner = "artempyanykh"; repo = "marksman"; rev = version; - sha256 = "sha256-g+Y4BZh5r4FQJe1q79hxj7WZe7z9346+5cB7tgJ5+Wo="; + sha256 = "sha256-BU9ttJsAQ8du9NUs69c7/FxZodUS/BhzKm+P1RocCms="; }; projectFile = "Marksman/Marksman.fsproj"; diff --git a/pkgs/development/tools/marksman/deps.nix b/pkgs/development/tools/marksman/deps.nix index 1e8a43139e91..56e23e7b3ef1 100644 --- a/pkgs/development/tools/marksman/deps.nix +++ b/pkgs/development/tools/marksman/deps.nix @@ -2,194 +2,193 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "coverlet.collector"; version = "6.0.0"; sha256 = "12j34vrkmph8lspbafnqmfnj2qvysz1jcrks2khw798s6dwv0j90"; }) - (fetchNuGet { pname = "dotnet-fsharplint"; version = "0.21.6"; sha256 = "0ka6im90i8wyqwqjwx7gfx60py05711ccvgn5x83l3mf0l07h0l8"; }) - (fetchNuGet { pname = "fantomas"; version = "6.2.3"; sha256 = "1x91w4sk402b6ah1y0r0c9rxwbbnjp4x4mr7x4n5zvjhiv97b282"; }) - (fetchNuGet { pname = "FSharp.Core"; version = "8.0.100"; sha256 = "06z3vg8yj7i83x6gmnzl2lka1bp4hzc07h6mrydpilxswnmy2a0l"; }) - (fetchNuGet { pname = "FSharp.SystemCommandLine"; version = "0.13.0-beta4"; sha256 = "10h58gqfdg2hdy9laf6ry8djfysrdmwlj9n0d7ydwyszb6zgnd20"; }) - (fetchNuGet { pname = "FSharpPlus"; version = "1.5.0"; sha256 = "18xvz9a7bhmmr14911ykpg6sbgyq61s4w7g0hdlpr2vcg0bja1cd"; }) - (fetchNuGet { pname = "Glob"; version = "1.1.9"; sha256 = "1q72haq20bf414xwdabsx30lp5c55fjh7hav6r9sp2cqhmva0y53"; }) - (fetchNuGet { pname = "Markdig"; version = "0.33.0"; sha256 = "1dj06wgdqmjji4nfr1dysz7hwp5bjgsrk9qjkdq82d7gk6nmhs9r"; }) - (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.CodeCoverage"; version = "17.8.0"; sha256 = "173wjadp3gan4x2jfjchngnc4ca4mb95h1sbb28jydfkfw0z1zvj"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) - (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; sha256 = "1smx30nq22plrn2mw4wb5vfgxk6hyx12b60c4wabmpnr81lq3nzv"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; sha256 = "1syvl3g0hbrcgfi9rq6pld8s8hqqww4dflf1lxn59ccddyyx0gmv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) - (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.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.8.0"; sha256 = "0f5jah93kjkvxwmhwb78lw11m9pkkq9fvf135hpymmmpxqbdh97q"; }) - (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.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.66"; sha256 = "04p4vd2v3mj1g315jj0fcb9ajwdr6clnbnl80mn6nyj3wmjb56nz"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) - (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.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.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (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.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 = "Serilog"; version = "2.11.0"; sha256 = "1nvd3hm615xlcdmw1i7llkd3xvwvpv66c4y4s28npv47v3yci3lh"; }) - (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.0.1"; sha256 = "080vh9kcyn9lx4j7p34146kp9byvhqlaz5jn9wzx70ql9cwd0hlz"; }) - (fetchNuGet { pname = "Snapper"; version = "2.4.0"; sha256 = "1g31hzw13ijvwn5knbzkcgsk4jgm6ppsfmha0halmnsbch0vn608"; }) - (fetchNuGet { pname = "StreamJsonRpc"; version = "2.16.36"; sha256 = "1bwbbzd8rg1mjsig046ihs53gn8ywf5j9mjfy32axfziisqr1c2w"; }) - (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.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) - (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.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.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.2"; sha256 = "1h97ikph775gya93qsjjaka87qcygbyh1064rh1hnfcnp5xv0ipi"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) - (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.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) - (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.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) - (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.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.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) - (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.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) - (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"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) - (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.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) - (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.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.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) - (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.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (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.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) - (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.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (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.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) - (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.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.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 = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (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.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) - (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.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (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.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) - (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.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "Tomlyn"; version = "0.17.0"; sha256 = "0xndl4hz701jk49hd5jgz6l7isg5wsndx208vxv1a9hi1zpwb4d4"; }) - (fetchNuGet { pname = "xunit"; version = "2.6.2"; sha256 = "0g5j0xwrv9cwrx91cjb9gas3wnkcwwk8krhdzsv50vlyp71pqqgz"; }) - (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) - (fetchNuGet { pname = "xunit.analyzers"; version = "1.6.0"; sha256 = "1nwrz0mxk2hk2rwwabgr0a4wa3j22qwm94xvrzci39l58hmzxpbi"; }) - (fetchNuGet { pname = "xunit.assert"; version = "2.6.2"; sha256 = "1nxg9m8qhh05i9linap7a8bdhxnr7x2pg7piw8hh76cshx0402ql"; }) - (fetchNuGet { pname = "xunit.core"; version = "2.6.2"; sha256 = "0q0kzjdb0hxq4bajl11pvnwl1dp47b2adqx47j30bi2llj21ihj6"; }) - (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.6.2"; sha256 = "1a27ng02piwjr3ggff4mg0r92b6rabd1339clnxzqxwcyf620q2c"; }) - (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.6.2"; sha256 = "1lhhlrq6lzd4w61x78dhxjz1453lnipjgph8sc52izgwq9d5xp1n"; }) - (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.5.4"; sha256 = "0mp3z8m5l4q09lr17142hff6p05zl189cwz3iavfqk8dpspyjgvd"; }) + (fetchNuGet { pname = "coverlet.collector"; version = "6.0.0"; hash = "sha256-IEmweTMapcPhFHpmJsPXfmMhravYOrWupgjeOvMmQ4o="; }) + (fetchNuGet { pname = "dotnet-fsharplint"; version = "0.21.6"; hash = "sha256-iAJ4AAWuDjpQL/ZtxkI4BfgLTHfvdC4xx56jCFKNRk0="; }) + (fetchNuGet { pname = "fantomas"; version = "6.2.3"; hash = "sha256-Aol10o5Q7l8s6SdX0smVdi3ec2IgAx+gMksAMjXhIfU="; }) + (fetchNuGet { pname = "FSharp.SystemCommandLine"; version = "0.13.0-beta4"; hash = "sha256-QDT7vllfe978acAmSXltWXsnG/LZOEWTb1C85vBDBYI="; }) + (fetchNuGet { pname = "FSharpPlus"; version = "1.5.0"; hash = "sha256-jQUlF3hsi3xpg+AdTnQw2L+lzbvTh5BIyLXCdVT6u6M="; }) + (fetchNuGet { pname = "Glob"; version = "1.1.9"; hash = "sha256-o3igdoWYiatTNlvBA6UrhZVLweh6qcY7CcQtILCC4uA="; }) + (fetchNuGet { pname = "Markdig"; version = "0.37.0"; hash = "sha256-nPox06LraU0xZPGj+rQaBAxpiiLnhM1NduUEidVpgzU="; }) + (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.CodeCoverage"; version = "17.8.0"; hash = "sha256-cv/wAXfTNS+RWEsHWNKqRDHC7LOQSSdFJ1a9cZuSfJw="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; }) + (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; hash = "sha256-+9uBaUDZ3roUJwyYJUL30Mz+3C6LE16FzfQKgS0Yveo="; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; hash = "sha256-uz7QvW+NsVRsp8FR1wjnGEOkUaPX4JyieywvCN6g2+s="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; }) + (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.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; hash = "sha256-9TwGrjVvbtyetw67Udp3EMK5MX8j0RFRjduxPCs9ESw="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.8.0"; hash = "sha256-+CTYFu631uovLCO47RKe86YaAqfoLA4r73vKORJUsjg="; }) + (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.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.66"; hash = "sha256-35qyZOVDemtsBYjaZSkzuXGp0mIOSFnCeEHWsUXb5BI="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; hash = "sha256-ElqfN4CcKxT3hP2qvxxObb4mnBlYG89IMxO0Sm5oZ2g="; }) + (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.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.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; }) + (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.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 = "Serilog"; version = "2.11.0"; hash = "sha256-kI7I/NiH7GuR0MQTZsy+m+8+2qT0xMBrY7SXYCocbds="; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.0.1"; hash = "sha256-n0LQOEsUg9M/T1aWryiG2690pyGBjHsk6TRZz2aCGyA="; }) + (fetchNuGet { pname = "Snapper"; version = "2.4.0"; hash = "sha256-CBi7AWRL20oVBApWp+819Uky9WPzLzuL5VvGEfiHYbw="; }) + (fetchNuGet { pname = "StreamJsonRpc"; version = "2.16.36"; hash = "sha256-XLCQsY7xu67E8E7WJIvjHtk3iobREPCiljW8jNpfi68="; }) + (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.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; }) + (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.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.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.2"; hash = "sha256-8Uawe7mWOQsDzMSAAP16nuGD1FRSajyS8q+cA++MJ8E="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; }) + (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.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; }) + (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.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) + (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.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.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; }) + (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.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; }) + (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"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; }) + (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.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; }) + (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.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.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; }) + (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.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (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.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.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.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; }) + (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.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; }) + (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.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.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 = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) + (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.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; }) + (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.0.0"; hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; }) + (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.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; }) + (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.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) + (fetchNuGet { pname = "Tomlyn"; version = "0.17.0"; hash = "sha256-pJHF7w8RJhV23wiI3qzm5el4qPlPlgYTmTKA8yGhzXY="; }) + (fetchNuGet { pname = "xunit"; version = "2.6.2"; hash = "sha256-/2F8w7meblC2/g3miSbnbFo+tHppSRZSz5ylnXkHsjw="; }) + (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; hash = "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "1.6.0"; hash = "sha256-cd3+K0SFphHZz7uTVDkWQg7FiQL5LcV5FhOK2Sv4mds="; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.6.2"; hash = "sha256-FAtAQIeamQMh4vGed0U/2XbYFlLnKhtpigVAiFFNr9s="; }) + (fetchNuGet { pname = "xunit.core"; version = "2.6.2"; hash = "sha256-RsIYhKRUxAWGPKTjpsQ65LZAud03BCrVIrhDsJr8E2A="; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.6.2"; hash = "sha256-TGAgjPOMd/y7pSyNEdpS2SyRMniVOPfeyJLHK8CzR6g="; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.6.2"; hash = "sha256-NtxeWsL8/SgK0wjeJ2+0dBQSvuywodOD4aR9anCmENI="; }) + (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.5.4"; hash = "sha256-bT/pr74NTey2iuNzllCgv4BrnIOChBMyTQATWir641Y="; }) ] diff --git a/pkgs/development/tools/mars-mips/default.nix b/pkgs/development/tools/mars-mips/default.nix deleted file mode 100644 index 66b9684175c3..000000000000 --- a/pkgs/development/tools/mars-mips/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib -, stdenv -, fetchurl -, makeBinaryWrapper -, copyDesktopItems -, makeDesktopItem -, desktopToDarwinBundle -, unzip -, imagemagick -, jre -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "mars-mips"; - version = "4.5"; - - src = fetchurl { - url = "https://courses.missouristate.edu/KenVollmar/MARS/MARS_${lib.replaceStrings ["."] ["_"] finalAttrs.version}_Aug2014/Mars${lib.replaceStrings ["."] ["_"] finalAttrs.version}.jar"; - hash = "sha256-rDQLZ2uitiJGud935i+BrURHvP0ymrU5cWvNCZULcJY="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ - makeBinaryWrapper - copyDesktopItems - unzip - imagemagick - ] ++ lib.optionals stdenv.isDarwin [ - desktopToDarwinBundle - ]; - - desktopItems = [ - (makeDesktopItem { - name = "mars"; - desktopName = "MARS"; - exec = "Mars"; - icon = "mars"; - comment = finalAttrs.meta.description; - categories = [ "Development" "IDE" ]; - }) - ]; - - installPhase = '' - runHook preInstall - - export JAR=$out/share/java/mars/Mars.jar - install -Dm444 $src $JAR - makeWrapper ${jre}/bin/java $out/bin/Mars \ - --add-flags "-jar $JAR" - - unzip $src images/MarsThumbnail.gif - for size in 16 24 32 48 64 128 256 512 - do - mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - convert -resize "$size"x"$size" images/MarsThumbnail.gif $out/share/icons/hicolor/"$size"x"$size"/apps/mars.png - done - - runHook postInstall - ''; - - meta = { - description = "An IDE for programming in MIPS assembly language intended for educational-level use"; - mainProgram = "Mars"; - homepage = "https://courses.missouristate.edu/KenVollmar/MARS/"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ emilytrau ]; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/development/tools/mask/default.nix b/pkgs/development/tools/mask/default.nix deleted file mode 100644 index aecc3fb96521..000000000000 --- a/pkgs/development/tools/mask/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "mask"; - version = "0.11.4"; - - src = fetchFromGitHub { - owner = "jacobdeichert"; - repo = pname; - rev = "mask/${version}"; - hash = "sha256-pi8dD4Fko39yn1maXNOqm+aDWYJhxE/b4kH7H18InbY="; - }; - - cargoHash = "sha256-zbvYSTR0m7S4m0WFQrCqCrMXqMcDW2oIMznD5PDdeHE="; - - # tests require mask to be installed - doCheck = false; - - meta = with lib; { - description = "CLI task runner defined by a simple markdown file"; - mainProgram = "mask"; - homepage = "https://github.com/jacobdeichert/mask"; - changelog = "https://github.com/jacobdeichert/mask/blob/mask/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/mbed-cli/default.nix b/pkgs/development/tools/mbed-cli/default.nix deleted file mode 100644 index 3434e4771b3a..000000000000 --- a/pkgs/development/tools/mbed-cli/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, python3Packages, fetchPypi, git, mercurial }: - -with python3Packages; - -buildPythonApplication rec { - pname = "mbed-cli"; - version = "1.10.5"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-X+hNVM8fsy0VFTqFr1pPKWRimacBenTcY4y+PBJpvlI="; - }; - - nativeCheckInputs = [ - git - mercurial - pytest - ]; - - checkPhase = '' - export GIT_COMMITTER_NAME=nixbld - export EMAIL=nixbld@localhost - export GIT_COMMITTER_DATE=$SOURCE_DATE_EPOCH - pytest test - ''; - - meta = with lib; { - homepage = "https://github.com/ARMmbed/mbed-cli"; - description = "Arm Mbed Command Line Interface"; - license = licenses.asl20; - maintainers = [ ]; - }; -} - diff --git a/pkgs/development/tools/mblock-mlink/default.nix b/pkgs/development/tools/mblock-mlink/default.nix deleted file mode 100644 index 0b6ec3252ef5..000000000000 --- a/pkgs/development/tools/mblock-mlink/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook }: - -stdenv.mkDerivation rec { - pname = "mblock-mlink"; - version = "1.2.0"; - - src = fetchurl { - url = "https://dl.makeblock.com/mblock5/linux/mLink-${version}-amd64.deb"; - sha256 = "sha256-KLxj81ZjbEvhhaz0seNB4WXX5ybeZ7/WcT1dGfdWle0="; - }; - - unpackPhase = '' - ${dpkg}/bin/dpkg -x $src $out - ''; - - buildInputs = [ - stdenv.cc.cc.lib - ]; - - nativeBuildInputs = [ - autoPatchelfHook - ]; - - installPhase = '' - mv $out/usr/local/makeblock $out/usr/makeblock - rmdir $out/usr/local - mkdir -p $out/bin - echo $out/usr/makeblock/mLink/mnode $out/usr/makeblock/mLink/app.js > $out/bin/mlink - chmod +x $out/bin/mlink - ''; - - meta = with lib; { - description = "Driver for mBlock web version"; - homepage = "https://mblock.makeblock.com/en-us/download/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.mausch ]; - }; -} diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix deleted file mode 100644 index 7345540b51b2..000000000000 --- a/pkgs/development/tools/mdk/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, intltool, pkg-config, glib }: - -stdenv.mkDerivation rec { - pname = "gnu-mdk"; - version = "1.3.0"; - src = fetchurl { - url = "mirror://gnu/mdk/v${version}/mdk-${version}.tar.gz"; - sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb"; - }; - nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ glib ]; - postInstall = '' - mkdir -p $out/share/emacs/site-lisp/ - cp -v ./misc/*.el $out/share/emacs/site-lisp - ''; - - meta = { - description = "GNU MIX Development Kit (MDK)"; - homepage = "https://www.gnu.org/software/mdk/"; - license = lib.licenses.gpl3; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/melange/default.nix b/pkgs/development/tools/melange/default.nix deleted file mode 100644 index 318f1a7ff1e1..000000000000 --- a/pkgs/development/tools/melange/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -}: - -buildGoModule rec { - pname = "melange"; - version = "0.11.3"; - - src = fetchFromGitHub { - owner = "chainguard-dev"; - repo = pname; - rev = "v${version}"; - hash = "sha256-+G6lSG3iaKWC1SU0cyeU1sU8r9VBUwwtU7D/yjZmu04="; - # 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; - postFetch = '' - cd "$out" - git rev-parse HEAD > $out/COMMIT - # in format of 0000-00-00T00:00:00Z - date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH - find "$out" -name .git -print0 | xargs -0 rm -rf - ''; - }; - - vendorHash = "sha256-GNY1ez7qC2aaEm8WAQqGy4vWZEZFQhze15r3QQZBNzA="; - - subPackages = [ "." ]; - - nativeBuildInputs = [ installShellFiles ]; - - ldflags = [ - "-s" - "-w" - "-X sigs.k8s.io/release-utils/version.gitVersion=v${version}" - "-X sigs.k8s.io/release-utils/version.gitTreeState=clean" - ]; - - # ldflags based on metadata from git and source - preBuild = '' - ldflags+=" -X sigs.k8s.io/release-utils/version.gitCommit=$(cat COMMIT)" - ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)" - ''; - - postInstall = '' - installShellCompletion --cmd melange \ - --bash <($out/bin/melange completion bash) \ - --fish <($out/bin/melange completion fish) \ - --zsh <($out/bin/melange completion zsh) - ''; - - doInstallCheck = true; - - installCheckPhase = '' - runHook preInstallCheck - - $out/bin/melange --help - $out/bin/melange version 2>&1 | grep "v${version}" - - runHook postInstallCheck - ''; - - meta = with lib; { - homepage = "https://github.com/chainguard-dev/melange"; - changelog = "https://github.com/chainguard-dev/melange/blob/${src.rev}/NEWS.md"; - description = "Build APKs from source code"; - mainProgram = "melange"; - license = licenses.asl20; - maintainers = with maintainers; [ developer-guy ]; - }; -} diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix deleted file mode 100644 index cfe12b41d3aa..000000000000 --- a/pkgs/development/tools/memray/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ - lib, - elfutils, - fetchFromGitHub, - libunwind, - lz4, - pkg-config, - python3Packages, -}: - -python3Packages.buildPythonApplication rec { - pname = "memray"; - version = "1.14.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "bloomberg"; - repo = "memray"; - rev = "refs/tags/v${version}"; - hash = "sha256-U9JR60rSxPYXbZaKR7vVNhGT78AXnqcoqvVC6/1OW/E="; - }; - - build-system = with python3Packages; [ - distutils - setuptools - ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - libunwind - lz4 - elfutils # for `-ldebuginfod` - ] ++ (with python3Packages; [ cython ]); - - dependencies = with python3Packages; [ - pkgconfig - textual - jinja2 - rich - ]; - - nativeCheckInputs = - with python3Packages; - [ - ipython - pytest-cov # fix Unknown pytest.mark.no_cover - pytest-textual-snapshot - pytestCheckHook - ] - ++ lib.optionals (pythonOlder "3.12") [ greenlet ]; - - pythonImportsCheck = [ "memray" ]; - - 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 = [ - # Very time-consuming and some tests fails (performance-related?) - "tests/integration/test_main.py" - ]; - - meta = with lib; { - description = "Memory profiler for Python"; - homepage = "https://bloomberg.github.io/memray/"; - changelog = "https://github.com/bloomberg/memray/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix deleted file mode 100644 index 62b69b6318ff..000000000000 --- a/pkgs/development/tools/metal-cli/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -}: - -buildGoModule rec { - pname = "metal-cli"; - version = "0.25.0"; - - src = fetchFromGitHub { - owner = "equinix"; - repo = pname; - rev = "v${version}"; - hash = "sha256-+hpsGFZHuVhh+fKVcap0vhoUmRs3xPgUwW8SD56m6uI="; - }; - - vendorHash = "sha256-X+GfM73LAWk2pT4ZOPT2pg8YaKyT+SNjQ14LgB+C7Wo="; - - ldflags = [ - "-s" - "-w" - "-X github.com/equinix/metal-cli/cmd.Version=${version}" - ]; - - nativeBuildInputs = [ - installShellFiles - ]; - - postInstall = '' - installShellCompletion --cmd metal \ - --bash <($out/bin/metal completion bash) \ - --fish <($out/bin/metal completion fish) \ - --zsh <($out/bin/metal completion zsh) - ''; - - doCheck = false; - - doInstallCheck = true; - - installCheckPhase = '' - $out/bin/metal --version | grep ${version} - ''; - - meta = with lib; { - description = "Official Equinix Metal CLI"; - homepage = "https://github.com/equinix/metal-cli/"; - changelog = "https://github.com/equinix/metal-cli/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne nshalman teutat3s ]; - mainProgram = "metal"; - }; -} diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix deleted file mode 100644 index 2ef6fed04189..000000000000 --- a/pkgs/development/tools/micronaut/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchzip, jdk, makeWrapper, installShellFiles }: - -stdenv.mkDerivation rec { - pname = "micronaut"; - version = "4.6.2"; - - src = fetchzip { - url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-y+/qdZ9Kl6rVoziss+UipkU4/QSqZuD7J3efWdWNfl8="; - }; - - nativeBuildInputs = [ makeWrapper installShellFiles ]; - - installPhase = '' - runHook preInstall - rm bin/mn.bat - cp -r . $out - wrapProgram $out/bin/mn \ - --prefix JAVA_HOME : ${jdk} - installShellCompletion --bash --name mn.bash bin/mn_completion - runHook postInstall - ''; - - meta = with lib; { - description = "Modern, JVM-based, full-stack framework for building microservice applications"; - longDescription = '' - Micronaut is a modern, JVM-based, full stack microservices framework - designed for building modular, easily testable microservice applications. - Reflection-based IoC frameworks load and cache reflection data for - every single field, method, and constructor in your code, whereas with - Micronaut, your application startup time and memory consumption are - not bound to the size of your codebase. - ''; - homepage = "https://micronaut.io/"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ moaxcp ]; - mainProgram = "mn"; - }; -} diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 0a054fe43a1c..183481d872dd 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizinc"; - version = "2.8.5"; + version = "2.8.7"; src = fetchFromGitHub { owner = "MiniZinc"; repo = "libminizinc"; rev = finalAttrs.version; - sha256 = "sha256-AD5hbHnu5/gmhvk4Hzeqzvq3E/7w54ijxl9US5eATRY="; + sha256 = "sha256-2JCTOgnzGeh106YBkLPM46MgnB4XHZmdMXNn1P0OBqA="; }; nativeBuildInputs = [ bison cmake flex jq ]; diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index 45fd8da44b5e..f6535569abf7 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -1,22 +1,22 @@ { lib, stdenv, fetchFromGitHub, qtbase, qmake, qtwebsockets, minizinc, makeWrapper, Cocoa }: let - executableLoc = if stdenv.isDarwin then "$out/Applications/MiniZincIDE.app/Contents/MacOS/MiniZincIDE" else "$out/bin/MiniZincIDE"; + executableLoc = if stdenv.hostPlatform.isDarwin then "$out/Applications/MiniZincIDE.app/Contents/MacOS/MiniZincIDE" else "$out/bin/MiniZincIDE"; in stdenv.mkDerivation rec { pname = "minizinc-ide"; - version = "2.8.5"; + version = "2.8.7"; src = fetchFromGitHub { owner = "MiniZinc"; repo = "MiniZincIDE"; rev = version; - hash = "sha256-rE3Mq2lEcO5s4S8RMW7mQyp04gYwKW+e8cWnWqfVq9E="; + hash = "sha256-mlLW7RHwO+VHWJdKhDjIWYoRpdTrt7QpPKp0EiHGkEs="; fetchSubmodules = true; }; nativeBuildInputs = [ qmake makeWrapper ]; - buildInputs = [ qtbase qtwebsockets ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ qtbase qtwebsockets ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; sourceRoot = "${src.name}/MiniZincIDE"; diff --git a/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/pkgs/development/tools/misc/abi-compliance-checker/default.nix deleted file mode 100644 index b5ccb40d5dc4..000000000000 --- a/pkgs/development/tools/misc/abi-compliance-checker/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, ctags, perl, binutils, abi-dumper }: - -stdenv.mkDerivation rec { - pname = "abi-compliance-checker"; - version = "2.3"; - - src = fetchFromGitHub { - owner = "lvc"; - repo = "abi-compliance-checker"; - rev = version; - sha256 = "1f1f9j2nf9j83sfl2ljadch99v6ha8rq8xm7ax5akc05hjpyckij"; - }; - - buildInputs = [ binutils ctags perl ]; - propagatedBuildInputs = [ abi-dumper ]; - - makeFlags = [ "prefix=$(out)" ]; - - meta = with lib; { - homepage = "https://lvc.github.io/abi-compliance-checker"; - description = "Tool for checking backward API/ABI compatibility of a C/C++ library"; - mainProgram = "abi-compliance-checker"; - license = licenses.lgpl21; - maintainers = [ maintainers.bhipple ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/abi-dumper/default.nix b/pkgs/development/tools/misc/abi-dumper/default.nix deleted file mode 100644 index 09b30b6c6231..000000000000 --- a/pkgs/development/tools/misc/abi-dumper/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, ctags, perl, elfutils, vtable-dumper }: - -stdenv.mkDerivation rec { - pname = "abi-dumper"; - version = "1.2"; - - src = fetchFromGitHub { - owner = "lvc"; - repo = "abi-dumper"; - rev = version; - sha256 = "1i00rfnddrrb9lb1l6ib19g3a76pyasl9lb7rqz2p998gav1gjp2"; - }; - - patchPhase = '' - substituteInPlace abi-dumper.pl \ - --replace eu-readelf ${elfutils}/bin/eu-readelf \ - --replace vtable-dumper ${vtable-dumper}/bin/vtable-dumper \ - --replace '"ctags"' '"${ctags}/bin/ctags"' - ''; - - buildInputs = [ elfutils ctags perl vtable-dumper ]; - - preBuild = "mkdir -p $out"; - makeFlags = [ "prefix=$(out)" ]; - - meta = with lib; { - homepage = "https://github.com/lvc/abi-dumper"; - description = "Dump ABI of an ELF object containing DWARF debug info"; - mainProgram = "abi-dumper"; - license = licenses.lgpl21; - maintainers = [ maintainers.bhipple ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix deleted file mode 100644 index 613209b3a988..000000000000 --- a/pkgs/development/tools/misc/astyle/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, lib, fetchurl, cmake, asLibrary ? false }: - -stdenv.mkDerivation rec { - pname = "astyle"; - version = "3.5.2"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-2wwKctQOZAwgHjnmRni2/jFvN+fvBfZ84rItVVwKbRI="; - }; - - nativeBuildInputs = [ cmake ]; - - # upstream repo includes a build/ directory - cmakeBuildDir = "_build"; - - cmakeFlags = lib.optional asLibrary [ - "-DBUILD_SHARED_LIBS=ON" - ]; - - postInstall = lib.optionalString asLibrary '' - install -Dm444 ../src/astyle.h $out/include/astyle.h - ''; - - meta = with lib; { - description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java"; - mainProgram = "astyle"; - homepage = "https://astyle.sourceforge.net/"; - license = licenses.lgpl3; - maintainers = with maintainers; [ carlossless ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix deleted file mode 100644 index b6970beb8734..000000000000 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchurl, lib, stdenv, makeWrapper, perl, openssh, rsync }: - -stdenv.mkDerivation rec { - pname = "autobuild"; - version = "5.3"; - - src = fetchurl { - url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0gv7g61ja9q9zg1m30k4snqwwy1kq7b4df6sb7d2qra7kbdq8af1"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perl openssh rsync ]; - - doCheck = true; - - meta = { - description = "Continuous integration tool"; - - longDescription = '' - Autobuild is a package that process output from building - software, primarily focused on packages using Autoconf and - Automake, and then generate a HTML summary file, containing - links to each build log. - - Autobuild can also help you automate building your project on - many systems concurrently. Users with accounts on the - SourceForge compile farms will be able to invoke a parallel - build of their Autoconf/Automake based software, and produce a - summary of the build status, after reading the manual. - ''; - - homepage = "https://josefsson.org/autobuild/"; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix deleted file mode 100644 index 3fbfabcee265..000000000000 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, xz }: - -stdenv.mkDerivation rec { - pname = "autoconf-archive"; - version = "2023.02.20"; - - src = fetchurl { - url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; - hash = "sha256-cdQEhHmuKPH1eUYZw9ct+cAd9JscYo74X943WW3DGjM="; - }; - - strictDeps = true; - enableParallelBuilding = true; - - buildInputs = [ xz ]; - - meta = with lib; { - description = "Archive of autoconf m4 macros"; - homepage = "https://www.gnu.org/software/autoconf-archive/"; - license = licenses.gpl3; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/autoconf/2.64.nix b/pkgs/development/tools/misc/autoconf/2.64.nix index daf026dc3a5b..c505cc694805 100644 --- a/pkgs/development/tools/misc/autoconf/2.64.nix +++ b/pkgs/development/tools/misc/autoconf/2.64.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # details. # There are many test failures on `i386-pc-solaris2.11'. - #doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); + #doCheck = ((!stdenv.hostPlatform.isCygwin) && (!stdenv.hostPlatform.isSunOS)); doCheck = false; # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the diff --git a/pkgs/development/tools/misc/autoconf/2.69.nix b/pkgs/development/tools/misc/autoconf/2.69.nix index 870b0ae1d34a..bdd534055a5a 100644 --- a/pkgs/development/tools/misc/autoconf/2.69.nix +++ b/pkgs/development/tools/misc/autoconf/2.69.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # details. # There are many test failures on `i386-pc-solaris2.11'. - #doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); + #doCheck = ((!stdenv.hostPlatform.isCygwin) && (!stdenv.hostPlatform.isSunOS)); doCheck = false; # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the diff --git a/pkgs/development/tools/misc/autoconf/2.71.nix b/pkgs/development/tools/misc/autoconf/2.71.nix index 1fcb819bd4b7..bfc24892ecd9 100644 --- a/pkgs/development/tools/misc/autoconf/2.71.nix +++ b/pkgs/development/tools/misc/autoconf/2.71.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # details. # There are many test failures on `i386-pc-solaris2.11'. - doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); + doCheck = ((!stdenv.hostPlatform.isCygwin) && (!stdenv.hostPlatform.isSunOS)); # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the # "fixed" path in generated files! diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 8039e36a4f20..9f4ee80d1a76 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # details. # There are many test failures on `i386-pc-solaris2.11'. - doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); + doCheck = ((!stdenv.hostPlatform.isCygwin) && (!stdenv.hostPlatform.isSunOS)); # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the # "fixed" path in generated files! diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix deleted file mode 100644 index 3cb6760842f5..000000000000 --- a/pkgs/development/tools/misc/autogen/default.nix +++ /dev/null @@ -1,124 +0,0 @@ -{ lib, stdenv, buildPackages, fetchurl, fetchpatch, autoreconfHook, which, pkg-config, perl, guile_2_2, libxml2 }: - -stdenv.mkDerivation rec { - pname = "autogen"; - version = "5.18.16"; - - src = fetchurl { - url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.xz"; - sha256 = "16mlbdys8q4ckxlvxyhwkdnh1ay9f6g0cyp1kylkpalgnik398gq"; - }; - - patches = let - dp = { ver ? "1%255.18.16-5", name, sha256 }: fetchurl { - url = "https://salsa.debian.org/debian/autogen/-/raw/debian/${ver}" - + "/debian/patches/${name}?inline=false"; - inherit name sha256; - }; - in [ - (dp { - name = "20_no_Werror.diff"; - sha256 = "08z4s2ifiqyaacjpd9pzr59w8m4j3548kkaq1bwvp2gjn29m680x"; - }) - (dp { - name = "30_ag_macros.m4_syntax_error.diff"; - sha256 = "1z8vmbwbkz3505wd33i2xx91mlf8rwsa7klndq37nw821skxwyh3"; - }) - (dp { - name = "31_allow_overriding_AGexe_for_crossbuild.diff"; - sha256 = "0h9wkc9bqb509knh8mymi43hg6n6sxg2lixvjlchcx7z0j7p8xkf"; - }) - (dp { - name = "40_suse_01-autogen-catch-race-error.patch"; - sha256 = "1cfkym2zds1f85md1m74snxzqmzlj7wd5jivgmyl342856848xav"; - }) - (dp { - name = "40_suse_03-gcc9-fix-wrestrict.patch"; - sha256 = "1ifdwi6gf96jc78jw7q4bfi5fgdldlf2nl55y20h6xb78kv0pznd"; - }) - (dp { - name = "40_suse_05-sprintf-overflow.patch"; - sha256 = "136m62k68w1h5k7iapynvbyipidw35js6pq21lsc6rpxvgp0n469"; - }) - (dp { - name = "40_suse_06-autogen-avoid-GCC-code-analysis-bug.patch"; - sha256 = "1d65zygzw2rpa00s0jy2y1bg29vkbhnjwlb5pv22rfv87zbk6z9q"; - }) - # Next upstream release will contain guile-3 support. We apply non-invasive - # patch meanwhile. - (fetchpatch { - name = "guile-3.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-devel/autogen/files/autogen-5.18.16-guile-3.patch?id=43bcc61c56a5a7de0eaf806efec7d8c0e4c01ae7"; - sha256 = "18d7y1f6164dm1wlh7rzbacfygiwrmbc35a7qqsbdawpkhydm5lr"; - }) - (fetchpatch { - name = "lfs64.patch"; - url = "https://cygwin.com/cgit/cygwin-packages/autogen/plain/5.16.2-cygwin17.patch?id=6f39882873b3d1290ba3739e0557a84bfe05ba60"; - stripLen = 1; - hash = "sha256-6dk2imqForUHKhI82CTronWaS3KUWW/EKfA/JZZcRe0="; - }) - ]; - - outputs = [ "bin" "dev" "lib" "out" "man" "info" ]; - - nativeBuildInputs = [ - which pkg-config perl autoreconfHook/*patches applied*/ - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # autogen needs a build autogen when cross-compiling - buildPackages.buildPackages.autogen buildPackages.texinfo - ]; - buildInputs = [ - guile_2_2 libxml2 - ]; - - preConfigure = '' - export MAN_PAGE_DATE=$(date '+%Y-%m-%d' -d "@$SOURCE_DATE_EPOCH") - ''; - - configureFlags = [ - "--with-libxml2=${libxml2.dev}" - "--with-libxml2-cflags=-I${libxml2.dev}/include/libxml2" - # Make sure to use a static value for the timeout. If we do not set a value - # here autogen will select one based on the execution time of the configure - # phase which is not really reproducible. - # - # If you are curious about the number 78, it has been cargo-culted from - # Debian: https://salsa.debian.org/debian/autogen/-/blob/master/debian/rules#L21 - "--enable-timeout=78" - "CFLAGS=-D_FILE_OFFSET_BITS=64" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # the configure check for regcomp wants to run a host program - "libopts_cv_with_libregex=yes" - #"MAKEINFO=${buildPackages.texinfo}/bin/makeinfo" - ] - # See: https://sourceforge.net/p/autogen/bugs/187/ - ++ lib.optionals stdenv.isDarwin [ "ac_cv_func_utimensat=no" ]; - - #doCheck = true; # not reliable - - postInstall = '' - mkdir -p $dev/bin - mv $bin/bin/autoopts-config $dev/bin - - for f in $lib/lib/autogen/tpl-config.tlib $out/share/autogen/tpl-config.tlib; do - sed -e "s|$dev/include|/no-such-autogen-include-path|" -i $f - sed -e "s|$bin/bin|/no-such-autogen-bin-path|" -i $f - sed -e "s|$lib/lib|/no-such-autogen-lib-path|" -i $f - done - - '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - # remove build directory (/build/**, or /tmp/nix-build-**) from RPATHs - for f in "$bin"/bin/*; do - local nrp="$(patchelf --print-rpath "$f" | sed -E 's@(:|^)'$NIX_BUILD_TOP'[^:]*:@\1@g')" - patchelf --set-rpath "$nrp" "$f" - done - ''; - - meta = with lib; { - description = "Automated text and program generation tool"; - license = with licenses; [ gpl3Plus lgpl3Plus ]; - homepage = "https://www.gnu.org/software/autogen/"; - platforms = platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/misc/automaticcomponenttoolkit/default.nix b/pkgs/development/tools/misc/automaticcomponenttoolkit/default.nix deleted file mode 100644 index 59a9914891d7..000000000000 --- a/pkgs/development/tools/misc/automaticcomponenttoolkit/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, go }: - -stdenv.mkDerivation rec { - pname = "AutomaticComponentToolkit"; - version = "1.6.0"; - - src = fetchFromGitHub { - owner = "Autodesk"; - repo = pname; - rev = "v${version}"; - sha256 = "1r0sbw82cf9dbcj3vgnbd4sc1lklzvijic2z5wgkvs21azcm0yzh"; - }; - - nativeBuildInputs = [ go ]; - - buildPhase = '' - cd Source - export HOME=/tmp - go build -o act *.go - ''; - - installPhase = '' - install -Dm0755 act $out/bin/act - ''; - - meta = with lib; { - description = "Toolkit to automatically generate software components: abstract API, implementation stubs and language bindings"; - mainProgram = "act"; - homepage = "https://github.com/Autodesk/AutomaticComponentToolkit"; - license = licenses.bsd2; - maintainers = with maintainers; [ gebner ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/aviator/bump-golang-x-sys.patch b/pkgs/development/tools/misc/aviator/bump-golang-x-sys.patch deleted file mode 100644 index cb9b076d3eaf..000000000000 --- a/pkgs/development/tools/misc/aviator/bump-golang-x-sys.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/go.mod b/go.mod -index 9bc55db..4bddb07 100644 ---- a/go.mod -+++ b/go.mod -@@ -19,5 +19,6 @@ require ( - github.com/smallfish/simpleyaml v0.0.0-20170527020626-116d8e577389 // indirect - github.com/starkandwayne/goutils v0.0.0-20190115202530-896b8a6904be - github.com/urfave/cli v1.19.1 -+ golang.org/x/sys v0.0.0-20220731174439-a90be440212d // indirect - gopkg.in/yaml.v2 v2.3.0 - ) -diff --git a/go.sum b/go.sum -index 7641199..d983a95 100644 ---- a/go.sum -+++ b/go.sum -@@ -138,6 +138,8 @@ golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7w - golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20200523222454-059865788121 h1:rITEj+UZHYC927n8GT97eC3zrpzXdb/voyeOuVKS46o= - golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80= -+golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= - golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= - golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= diff --git a/pkgs/development/tools/misc/aviator/default.nix b/pkgs/development/tools/misc/aviator/default.nix deleted file mode 100644 index 69b076834f7e..000000000000 --- a/pkgs/development/tools/misc/aviator/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "aviator"; - version = "1.8.1"; - - src = fetchFromGitHub { - owner = "herrjulz"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Oa4z8n+q7LKWMnwk+xj9UunzOa3ChaPBCTo828yYJGQ="; - }; - - patches = [ - ./bump-golang-x-sys.patch - ]; - - deleteVendor = true; - vendorHash = "sha256-AJyxCE4DdAXRS+2sY4Zzu8NTEFKJoV1bopfOqOFKZfI="; - - meta = with lib; { - description = "Merge YAML/JSON files in a in a convenient fashion"; - mainProgram = "aviator"; - homepage = "https://github.com/herrjulz/aviator"; - license = licenses.mit; - maintainers = with maintainers; [ risson ]; - }; -} diff --git a/pkgs/development/tools/misc/awf/default.nix b/pkgs/development/tools/misc/awf/default.nix deleted file mode 100644 index d72b5dc51ed3..000000000000 --- a/pkgs/development/tools/misc/awf/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkg-config -, wrapGAppsHook3 }: - -stdenv.mkDerivation rec { - pname = "awf"; - version = "1.4.0"; - - src = fetchFromGitHub { - owner = "valr"; - repo = "awf"; - rev = "v${version}"; - sha256 = "0jl2kxwpvf2n8974zzyp69mqhsbjnjcqm39y0jvijvjb1iy8iman"; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 ]; - - buildInputs = [ gtk2 gtk3 ]; - - autoreconfPhase = '' - patchShebangs ./autogen.sh - ./autogen.sh - ''; - - meta = with lib; { - description = "Widget Factory"; - longDescription = '' - A widget factory is a theme preview application for gtk2 and - gtk3. It displays the various widget types provided by gtk2/gtk3 - in a single window allowing to see the visual effect of the - applied theme. - ''; - homepage = "https://github.com/valr/awf"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ michalrus ]; - }; -} diff --git a/pkgs/development/tools/misc/bashdb/default.nix b/pkgs/development/tools/misc/bashdb/default.nix deleted file mode 100644 index 52119250f69c..000000000000 --- a/pkgs/development/tools/misc/bashdb/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, makeWrapper -, python3Packages -}: - -stdenv.mkDerivation rec { - pname = "bashdb"; - version = "5.0-1.1.2"; - - src = fetchurl { - url = "mirror://sourceforge/bashdb/${pname}-${version}.tar.bz2"; - sha256 = "sha256-MBdtKtKMWwCy4tIcXqGu+PuvQKj52fcjxnxgUx87czA="; - }; - - patches = [ - # Enable building with bash 5.1/5.2 - # Remove with any upstream 5.1-x.y.z release - (fetchpatch { - url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/569fbb806d9ee813afa8b27d2098a44f93433922/devel/bashdb/files/patch-configure"; - sha256 = "19zfzcnxavndyn6kfxp775kjcd0gigsm4y3bnh6fz5ilhnnbbbgr"; - }) - ]; - patchFlags = [ "-p0" ]; - - nativeBuildInputs = [ - makeWrapper - ]; - - postInstall = '' - wrapProgram $out/bin/bashdb --prefix PYTHONPATH ":" "$(toPythonPath ${python3Packages.pygments})" - ''; - - meta = { - description = "Bash script debugger"; - mainProgram = "bashdb"; - homepage = "https://bashdb.sourceforge.net/"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/tools/misc/binutils/2.38/libbfd.nix b/pkgs/development/tools/misc/binutils/2.38/libbfd.nix index 08cf35970a6c..313b610560da 100644 --- a/pkgs/development/tools/misc/binutils/2.38/libbfd.nix +++ b/pkgs/development/tools/misc/binutils/2.38/libbfd.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { strictDeps = true; nativeBuildInputs = [ autoreconfHook bison ]; - buildInputs = [ libiberty zlib ] ++ lib.optionals stdenv.isDarwin [ libintl ]; + buildInputs = [ libiberty zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl ]; configurePlatforms = [ "build" "host" ]; configureFlags = [ diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index cbc6351d5545..4d90fa66ea7d 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -3,13 +3,11 @@ let in { stdenv -, autoreconfHook , autoconf269, automake, libtool , bison , buildPackages , fetchFromGitHub , fetchurl -, flex , gettext , lib , noSysDirs @@ -33,20 +31,7 @@ assert enableGoldDefault -> enableGold; let inherit (stdenv) buildPlatform hostPlatform targetPlatform; - version = "2.42"; - - srcs = { - normal = fetchurl { - url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; - hash = "sha256-qlSFDr2lBkxyzU7C2bBWwpQlKZFIY1DZqXqypt/frxI="; - }; - vc4-none = fetchFromGitHub { - owner = "itszor"; - repo = "binutils-vc4"; - rev = "708acc851880dbeda1dd18aca4fd0a95b2573b36"; - sha256 = "1kdrz6fki55lm15rwwamn74fnqpy0zlafsida2zymk76n3656c63"; - }; - }; + version = "2.43.1"; #INFO: The targetPrefix prepended to binary names to allow multiple binuntils # on the PATH to both be usable. @@ -57,7 +42,10 @@ stdenv.mkDerivation (finalAttrs: { pname = targetPrefix + "binutils"; inherit version; - src = srcs.${targetPlatform.system} or srcs.normal; + src = fetchurl { + url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; + hash = "sha256-vsqsXSleA3WHtjpC+tV/49nXuD9HjrJLZ/nuxdDxhy8="; + }; # WARN: this package is used for bootstrapping fetchurl, and thus cannot use # fetchpatch! All mutable patches (generated by GitHub or cgit) that are @@ -84,19 +72,18 @@ stdenv.mkDerivation (finalAttrs: { # not need to know binutils' BINDIR at all. It's an absolute path # where libraries are stored. ./plugins-no-BINDIR.patch - ] ++ lib.optionals hostPlatform.isDarwin [ - # Note: Conditional to avoid Linux rebuilds on staging-next. Remove the conditional with the next update. + # ld64 needs `-undefined dynamic_lookup` to link `libctf-nobfd.dylib`, but the Darwin # version detection in `libtool.m4` fails to detect the Darwin version correctly. ./0001-libtool.m4-update-macos-version-detection-block.patch - ] - ++ lib.optional targetPlatform.isiOS ./support-ios.patch - # Adds AVR-specific options to "size" for compatibility with Atmel's downstream distribution - # Patch from arch-community - # https://github.com/archlinux/svntogit-community/blob/c8d53dd1734df7ab15931f7fad0c9acb8386904c/trunk/avr-size.patch - ++ lib.optional targetPlatform.isAvr ./avr-size.patch - ++ lib.optional stdenv.targetPlatform.isWindows ./windres-locate-gcc.patch - ; + + # Adds AVR-specific options to "size" for compatibility with Atmel's downstream distribution + # Patch from arch-community + # https://github.com/archlinux/svntogit-community/blob/c8d53dd1734df7ab15931f7fad0c9acb8386904c/trunk/avr-size.patch + ./avr-size.patch + + ./windres-locate-gcc.patch + ]; outputs = [ "out" "info" "man" "dev" ] # Ideally we would like to always install 'lib' into a separate @@ -117,9 +104,7 @@ stdenv.mkDerivation (finalAttrs: { bison perl ] - ++ lib.optionals targetPlatform.isiOS [ autoreconfHook ] ++ lib.optionals buildPlatform.isDarwin [ autoconf269 automake gettext libtool ] - ++ lib.optionals targetPlatform.isVc4 [ flex ] ; buildInputs = [ zlib gettext ] ++ lib.optionals hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/development/tools/misc/binutils/gold-powerpc-for-llvm.patch b/pkgs/development/tools/misc/binutils/gold-powerpc-for-llvm.patch deleted file mode 100644 index 29330131499b..000000000000 --- a/pkgs/development/tools/misc/binutils/gold-powerpc-for-llvm.patch +++ /dev/null @@ -1,107 +0,0 @@ -https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=d537f77ef3b18a5fbfd598643aaad957652e9608 - -Fix llvm testsuite failure on a single test: - FAIL: LLVM :: tools/gold/PowerPC/mtriple.ll (43659 of 49708) - ld.gold: internal error in add_output_section_to_load, at output.cc:4097 - -From: Alan Modra <amodra@gmail.com> -Date: Thu, 24 Aug 2023 23:42:18 +0000 (+0930) -Subject: PR30794, PowerPC gold: internal error in add_output_section_to_load -X-Git-Tag: gdb-14-branchpoint~482 -X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=d537f77ef3b18a5fbfd598643aaad957652e9608 - -PR30794, PowerPC gold: internal error in add_output_section_to_load - -Caused by commit 5a97377e5513, specifically this code added to -Target_powerpc::do_relax -+ if (parameters->options().output_is_position_independent()) -+ this->rela_dyn_size_ -+ = this->rela_dyn_section(layout)->current_data_size(); - -The problem here is that if .rela.dyn isn't already created then the -call to rela_dyn_section creates it, and as this comment in -Target_powerpc::do_finalize_sections says: - // Annoyingly, we need to make these sections now whether or - // not we need them. If we delay until do_relax then we - // need to mess with the relaxation machinery checkpointing. -We can't be creating sections in do_relax. - - PR 30794 - * powerpc.cc (Target_powerpc::do_relax): Only set rela_dyn_size_ - for size == 64, and assert that rela_dyn_ already exists. - Tidy code setting plt_thread_safe, which also only needs to be - set when size == 64 for ELFv1. ---- - -diff --git a/gold/powerpc.cc b/gold/powerpc.cc -index e66d9cbb900..a4fecaae55a 100644 ---- a/gold/powerpc.cc -+++ b/gold/powerpc.cc -@@ -3714,12 +3714,7 @@ Target_powerpc<size, big_endian>::do_relax(int pass, - unsigned int prev_brlt_size = 0; - if (pass == 1) - { -- bool thread_safe -- = this->abiversion() < 2 && parameters->options().plt_thread_safe(); -- if (size == 64 -- && this->abiversion() < 2 -- && !thread_safe -- && !parameters->options().user_set_plt_thread_safe()) -+ if (size == 64 && this->abiversion() < 2) - { - static const char* const thread_starter[] = - { -@@ -3747,29 +3742,37 @@ Target_powerpc<size, big_endian>::do_relax(int pass, - /* libgo */ - "__go_go", - }; -+ bool thread_safe = parameters->options().plt_thread_safe(); - -- if (parameters->options().shared()) -- thread_safe = true; -- else -+ if (!thread_safe -+ && !parameters->options().user_set_plt_thread_safe()) - { -- for (unsigned int i = 0; -- i < sizeof(thread_starter) / sizeof(thread_starter[0]); -- i++) -+ if (parameters->options().shared()) -+ thread_safe = true; -+ else - { -- Symbol* sym = symtab->lookup(thread_starter[i], NULL); -- thread_safe = (sym != NULL -- && sym->in_reg() -- && sym->in_real_elf()); -- if (thread_safe) -- break; -+ for (unsigned int i = 0; -+ i < sizeof(thread_starter) / sizeof(thread_starter[0]); -+ i++) -+ { -+ Symbol* sym = symtab->lookup(thread_starter[i], NULL); -+ thread_safe = (sym != NULL -+ && sym->in_reg() -+ && sym->in_real_elf()); -+ if (thread_safe) -+ break; -+ } - } - } -+ this->plt_thread_safe_ = thread_safe; - } -- this->plt_thread_safe_ = thread_safe; - -- if (parameters->options().output_is_position_independent()) -- this->rela_dyn_size_ -- = this->rela_dyn_section(layout)->current_data_size(); -+ if (size == 64 -+ && parameters->options().output_is_position_independent()) -+ { -+ gold_assert (this->rela_dyn_); -+ this->rela_dyn_size_ = this->rela_dyn_->current_data_size(); -+ } - - this->stub_group_size_ = parameters->options().stub_group_size(); - bool no_size_errors = true; diff --git a/pkgs/development/tools/misc/binutils/ppc-make-machine-less-strict.patch b/pkgs/development/tools/misc/binutils/ppc-make-machine-less-strict.patch deleted file mode 100644 index c2452414fc7d..000000000000 --- a/pkgs/development/tools/misc/binutils/ppc-make-machine-less-strict.patch +++ /dev/null @@ -1,51 +0,0 @@ -From cebc89b9328eab994f6b0314c263f94e7949a553 Mon Sep 17 00:00:00 2001 -From: Alan Modra <amodra@gmail.com> -Date: Mon, 21 Feb 2022 10:58:57 +1030 -Subject: [PATCH] binutils 2.38 vs. ppc32 linux kernel - -Commit b25f942e18d6 made .machine more strict. Weaken it again. - - * config/tc-ppc.c (ppc_machine): Treat an early .machine specially, - keeping sticky options to work around gcc bugs. ---- - gas/config/tc-ppc.c | 25 ++++++++++++++++++++++++- - 1 file changed, 24 insertions(+), 1 deletion(-) - -diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c -index 054f9c72161..89bc7d3f9b9 100644 ---- a/gas/config/tc-ppc.c -+++ b/gas/config/tc-ppc.c -@@ -5965,7 +5965,30 @@ ppc_machine (int ignore ATTRIBUTE_UNUSED) - options do not count as a new machine, instead they add - to currently selected opcodes. */ - ppc_cpu_t machine_sticky = 0; -- new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string); -+ /* Unfortunately, some versions of gcc emit a .machine -+ directive very near the start of the compiler's assembly -+ output file. This is bad because it overrides user -Wa -+ cpu selection. Worse, there are versions of gcc that -+ emit the *wrong* cpu, not even respecting the -mcpu given -+ to gcc. See gcc pr101393. And to compound the problem, -+ as of 20220222 gcc doesn't pass the correct cpu option to -+ gas on the command line. See gcc pr59828. Hack around -+ this by keeping sticky options for an early .machine. */ -+ asection *sec; -+ for (sec = stdoutput->sections; sec != NULL; sec = sec->next) -+ { -+ segment_info_type *info = seg_info (sec); -+ /* Are the frags for this section perturbed from their -+ initial state? Even .align will count here. */ -+ if (info != NULL -+ && (info->frchainP->frch_root != info->frchainP->frch_last -+ || info->frchainP->frch_root->fr_type != rs_fill -+ || info->frchainP->frch_root->fr_fix != 0)) -+ break; -+ } -+ new_cpu = ppc_parse_cpu (ppc_cpu, -+ sec == NULL ? &sticky : &machine_sticky, -+ cpu_string); - if (new_cpu != 0) - ppc_cpu = new_cpu; - else --- -2.31.1 diff --git a/pkgs/development/tools/misc/binutils/support-ios.patch b/pkgs/development/tools/misc/binutils/support-ios.patch deleted file mode 100644 index 74e56d130ed5..000000000000 --- a/pkgs/development/tools/misc/binutils/support-ios.patch +++ /dev/null @@ -1,168 +0,0 @@ -diff --git a/bfd/config.bfd b/bfd/config.bfd -index f04a993f06..1e24a9d030 100644 ---- a/bfd/config.bfd -+++ b/bfd/config.bfd -@@ -238,7 +238,7 @@ case "${targ}" in - - # START OF targmatch.h - #ifdef BFD64 -- aarch64-*-darwin*) -+ aarch64-*-darwin* | aarch64-*-ios*) - targ_defvec=aarch64_mach_o_vec - targ_selvecs="arm_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec" - targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch" -@@ -358,7 +358,7 @@ case "${targ}" in - targ_selvecs=arc_elf32_be_vec - ;; - -- arm-*-darwin*) -+ arm-*-darwin* | arm-*-ios*) - targ_defvec=arm_mach_o_vec - targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec" - targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch" -@@ -678,7 +678,7 @@ case "${targ}" in - i[3-7]86-*-aix*) - targ_defvec=i386_coff_vec - ;; -- i[3-7]86-*-darwin* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*) -+ i[3-7]86-*-darwin* | i[3-7]86-*-ios* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*) - targ_defvec=i386_mach_o_vec - targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec" - targ64_selvecs=x86_64_mach_o_vec -@@ -762,7 +762,7 @@ case "${targ}" in - targ_defvec=x86_64_elf64_cloudabi_vec - want64=true - ;; -- x86_64-*-darwin*) -+ x86_64-*-darwin* | x86_64-*-ios*) - targ_defvec=x86_64_mach_o_vec - targ_selvecs="i386_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec" - targ_archs="$targ_archs bfd_powerpc_arch bfd_rs6000_arch" -@@ -1402,7 +1402,7 @@ case "${targ}" in - targ_selvecs="powerpc_elf32_le_vec powerpc_boot_vec" - targ64_selvecs="powerpc_elf64_vec powerpc_elf64_le_vec" - ;; -- powerpc-*-darwin* | powerpc-*-macos10* | powerpc-*-rhapsody*) -+ powerpc-*-darwin* | powerpc-*-ios* | powerpc-*-macos10* | powerpc-*-rhapsody*) - targ_defvec=mach_o_be_vec - targ_selvecs="mach_o_be_vec mach_o_le_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec" - targ_archs="$targ_archs bfd_i386_arch" -diff --git a/configure.ac b/configure.ac -index aae94501e4..2cceb4dad4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -510,7 +510,7 @@ if test x$enable_libgomp = x ; then - ;; - *-*-solaris2* | *-*-hpux11*) - ;; -- *-*-darwin* | *-*-aix*) -+ *-*-darwin* | *-*-ios* | *-*-aix*) - ;; - nvptx*-*-*) - ;; -@@ -700,13 +700,13 @@ esac - - # Disable libffi for some systems. - case "${target}" in -- powerpc-*-darwin*) -+ powerpc-*-darwin* | powerpc-*-ios*) - ;; -- i[[3456789]]86-*-darwin*) -+ i[[3456789]]86-*-darwin* | i[[3456789]]86-*-ios*) - ;; -- x86_64-*-darwin[[912]]*) -+ x86_64-*-darwin[[912]]* | x86_64-*-ios[[912]]*) - ;; -- *-*-darwin*) -+ *-*-darwin* | *-*-ios*) - noconfigdirs="$noconfigdirs target-libffi" - ;; - *-*-netware*) -@@ -788,7 +788,7 @@ esac - # Disable the go frontend on systems where it is known to not work. Please keep - # this in sync with contrib/config-list.mk. - case "${target}" in --*-*-darwin* | *-*-cygwin* | *-*-mingw*) -+*-*-darwin* | *-*-ios* | *-*-cygwin* | *-*-mingw*) - unsupported_languages="$unsupported_languages go" - ;; - esac -@@ -797,7 +797,7 @@ esac - # For testing, you can easily override this with --enable-libgo. - if test x$enable_libgo = x; then - case "${target}" in -- *-*-darwin*) -+ *-*-darwin* | *-*-ios*) - # PR 46986 - noconfigdirs="$noconfigdirs target-libgo" - ;; -@@ -916,27 +916,27 @@ esac - case "${target}" in - *-*-chorusos) - ;; -- aarch64-*-darwin*) -+ aarch64-*-darwin* | aarch64-*-ios*) - noconfigdirs="$noconfigdirs ld gas gdb gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -- arm-*-darwin*) -+ arm-*-darwin* | arm-*-ios*) - noconfigdirs="$noconfigdirs ld gas gdb gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -- powerpc-*-darwin*) -+ powerpc-*-darwin* | powerpc-*-ios*) - noconfigdirs="$noconfigdirs ld gas gdb gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -- i[[3456789]]86-*-darwin*) -+ i[[3456789]]86-*-darwin* | i[[3456789]]86-*-ios*) - noconfigdirs="$noconfigdirs ld gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -- x86_64-*-darwin[[912]]*) -+ x86_64-*-darwin[[912]]* | x86_64-*-ios[[912]]*) - noconfigdirs="$noconfigdirs ld gas gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -- *-*-darwin*) -+ *-*-darwin* | *-*-ios*) - noconfigdirs="$noconfigdirs ld gas gdb gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -@@ -1226,7 +1226,7 @@ case "${host}" in - hppa*-*) - host_makefile_frag="config/mh-pa" - ;; -- *-*-darwin*) -+ *-*-darwin* | *-*-ios*) - host_makefile_frag="config/mh-darwin" - ;; - powerpc-*-aix*) -@@ -1697,7 +1697,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always. - build_lto_plugin=yes - ],[if test x"$default_enable_lto" = x"yes" ; then - case $target in -- *-apple-darwin[[912]]* | *-cygwin* | *-mingw* | *djgpp*) ;; -+ *-apple-darwin[[912]]* | *-apple-ios[[912]]* | *-cygwin* | *-mingw* | *djgpp*) ;; - # On other non-ELF platforms, LTO has yet to be validated. - *) enable_lto=no ;; - esac -@@ -1708,7 +1708,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always. - # warn during gcc/ subconfigure; unless you're bootstrapping with - # -flto it won't be needed until after installation anyway. - case $target in -- *-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;; -+ *-cygwin* | *-mingw* | *-apple-darwin* | *-apple-ios* | *djgpp*) ;; - *) if test x"$enable_lto" = x"yes"; then - AC_MSG_ERROR([LTO support is not enabled for this target.]) - fi -@@ -2590,7 +2590,7 @@ rm -f conftest* - # Decide which environment variable is used to find dynamic libraries. - case "${host}" in - *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; -- *-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; -+ *-*-darwin* | *-*-ios* ) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; - *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;; - *) RPATH_ENVVAR=LD_LIBRARY_PATH ;; - esac diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index 2640c67a53f4..af4f83d54bae 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.28.12"; + version = "2.28.13"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ dpkg ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - if ${ lib.boolToString stdenv.isLinux } + if ${ lib.boolToString stdenv.hostPlatform.isLinux } then dpkg-deb -x $src $out mv $out/usr/* $out @@ -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 = "Z8E8Nn+q9Onku6K7OM3qh2Co0QYnxn9s+g2/xgntFCw="; + sha256 = "cNzmvdsFkDj2W4KG8ZxVY2mfRHTAgq+XOTQtnl3UwvU="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "RbT65OuvjUD73h5qp9n5EIXTPR94T7z6/4EcsE/XMsM="; + sha256 = "ZJ2fNJ2W66u0E48wgUO/XlsHSfifhcikb0LG2JncWJ0="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "d1VadZt5yZg7AF0UITh3XcEGxBLR6uONgkaLt5vXTE0="; + sha256 = "PculxxgMBMpUCsKB2YCQKZ7s8SrT2rIY7La1s8mCQ4g="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "h8IAxVUj85mh8Lz/zpxAHv0r4ozodiFWw+we0b4ZhJo="; + sha256 = "FVQrzZr0LBSLmcK8k3QIWQiCk9WMVXOJY2MNW+w/1g8="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "wp5I8urCtH1zr5Pg10yBN5RqVMPmWS/KNd6zSvIslKo="; + sha256 = "/MCihH97/W8iMsW10EMdSaj+ZWBigaWDF3GR2WYnh+A="; }; }; diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index 4a292f6079bc..fe07298b47f3 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -15,47 +15,47 @@ let phpMajor = lib.versions.majorMinor php.version; inherit (stdenv.hostPlatform) system; - version = "1.92.22"; + version = "1.92.25"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-MWAKoshKC+hW8ldRLfYQIcMwpSHvW+hV9dRMvZ4rqcU="; - "8.2" = "sha256-xAdECbxuaV5PxG+X7+o2p5pOEG9lgRLuOTp46k5I4RM="; - "8.3" = "sha256-4vCLpSy4kJ4qwOSonSFvlevCfNMxjIU6AUswm0uG59o="; + "8.1" = "sha256-owV7Eo/2Qszm5alNppm6DHS7YLZyFDHnQ//jRfM+m1s="; + "8.2" = "sha256-1eECdIo+eET5tZz9neuC8WRtuJpNbJz+A2i0J9lqnms="; + "8.3" = "sha256-rfY849xL5AjWNtzzLIud+8+JWuOpmhNM7pdpR1tnNmo="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-fvXv3Yn3FXBO4EIgb/5LI3jJxV5HA2Q2JCNy14bA8eU="; - "8.2" = "sha256-0m2ze1e09IUGjTpxbyTOchQBBMa86cpiMrAImiXrAZ0="; - "8.3" = "sha256-nhVP4/Ls71MxPN6Ko1bDG8PSHkHQt+vC08EbP0WAL8g="; + "8.1" = "sha256-b3Dy18FawjtuiASwYCdS1Q5gOv1WSx6f3ESwow8wj4E="; + "8.2" = "sha256-vFNT/KR1RkxsYwjxLZewSYv2MbG1P7qdcxwzGZho7as="; + "8.3" = "sha256-TtsWgvrw4orrOFTuWPaPlS3LT9d101HiCGIrBKz4MaI="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-pvzKVvtpBh+nwppqSqxSsR989mWzwyAHtwIdDjWx08o="; - "8.2" = "sha256-O6RhO/PY2C4GubYl/jcTzpWeiUKSGy8Np4/KrlMsE1Y="; - "8.3" = "sha256-3sfjwXq980oRV8u+IAamyYKDp2UMREFaynigz/dpyXE="; + "8.1" = "sha256-bCS3gfUDr68KKmWy73G9ripYlCTAZuMssThyEDCGDgM="; + "8.2" = "sha256-FQlfdsVeClSLLCJqQPp0fo1CqpshkTo1iUw/9QI9JBc="; + "8.3" = "sha256-cThRmDf1HTaCT/KuvT3TMcmsCMky407p9u3hwtGtWDQ="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-peZmwxzQ2NCKkq5qSraIb4pnnJDwcRkCyGW8qeBSGRk="; - "8.2" = "sha256-MvF7S+VITEnsJSLz3xEy927zIR6TN+p3nRGQFjKqtu8="; - "8.3" = "sha256-sUlD8cPk7emJPtz4en6AcFxs/7NUjxUMkqf/Qs3INIA="; + "8.1" = "sha256-ZbUUtljjvQ0dcly/eTovTECTZn9OOcx3VDe1gKEICyA="; + "8.2" = "sha256-8xjs5IrsdbcjmTfni/hbtN+qFmnUgFK3KG8ntbNgBeI="; + "8.3" = "sha256-kDf+5rATt6/DMH5zZoom2Y5j/6CFFj8claJHlMq285o="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-kMftb/fC9uyMZyjP4jmtYLM+xEhFqP7umQ5FLvR9vAo="; - "8.2" = "sha256-W8LXYz8KzWlzdpyqmo7XQmkzuyfXO0BZSkiBIlfi18g="; - "8.3" = "sha256-a/Q7avEJr/we5GF2NxTZywpsal5AkAGxEABMPCgy2LM="; + "8.1" = "sha256-i1QxRGump5G3eMKjXFokqRr9FD6wsdPoUbjE7w3/a0A="; + "8.2" = "sha256-O7L4LgAbLRsz/F+esGwwnxAdD1gT30QEy3FEOQxTNu0="; + "8.3" = "sha256-a5oCtzCb8T/bA5GOOfyN7dMzeK29ZUBZceEnlqme41I="; }; }; }; @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { inherit system phpMajor; }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; diff --git a/pkgs/development/tools/misc/bonnmotion/default.nix b/pkgs/development/tools/misc/bonnmotion/default.nix deleted file mode 100644 index dc77da6d7e18..000000000000 --- a/pkgs/development/tools/misc/bonnmotion/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, lib, fetchzip, substituteAll, bash, jre }: - -stdenv.mkDerivation rec { - pname = "bonnmotion"; - version = "3.0.1"; - - src = fetchzip { - url = "https://sys.cs.uos.de/bonnmotion/src/bonnmotion-${version}.zip"; - sha256 = "16bjgr0hy6an892m5r3x9yq6rqrl11n91f9rambq5ik1cxjqarxw"; - }; - - patches = [ - # The software has a non-standard install bash script which kind of works. - # However, to make it fully functional, the automatically detection of the - # program paths must be substituted with full paths. - (substituteAll { - src = ./install.patch; - inherit bash jre; - }) - ]; - - installPhase = '' - runHook preInstall - - ./install - - mkdir -p $out/bin $out/share/bonnmotion - cp -r ./classes ./lib $out/share/bonnmotion/ - cp ./bin/bm $out/bin/ - - substituteInPlace $out/bin/bm \ - --replace-fail "$PWD" $out/share/bonnmotion - - runHook postInstall - ''; - - meta = with lib; { - description = "Mobility scenario generation and analysis tool"; - mainProgram = "bm"; - longDescription = '' - BonnMotion is a Java software which creates and analyzes mobility - scenarios and is most commonly used as a tool for the investigation of - mobile ad hoc network characteristics. The scenarios can also be exported - for several network simulators, such as ns-2, ns-3, GloMoSim/QualNet, - COOJA, MiXiM, and ONE. - ''; - homepage = "https://sys.cs.uos.de/bonnmotion/"; - sourceProvenance = with sourceTypes; [ - fromSource - binaryBytecode # source bundles dependency jars - ]; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ oxzi ]; - }; -} diff --git a/pkgs/development/tools/misc/bonnmotion/install.patch b/pkgs/development/tools/misc/bonnmotion/install.patch deleted file mode 100644 index 86be99b3dd5e..000000000000 --- a/pkgs/development/tools/misc/bonnmotion/install.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/install b/install -index 95afa2c..70c5fca 100755 ---- a/install -+++ b/install -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!@bash@/bin/bash - - echo "BonnMotion - a mobility scenario generation and analysis tool" - echo "Copyright (C) 2002-2012 University of Bonn" -@@ -19,28 +19,11 @@ echo "along with this program; if not, write to the Free Software" - echo "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA" - echo - --OS=`uname -s | tr A-Z a-z | sed -e s/_.\*//` -- - PACKAGE=edu.bonn.cs.iv.bonnmotion --JAVAPATH=`which java 2> /dev/null` --if [ ! "$JAVAPATH" = "" ] --then -- JAVAPATH=`dirname ${JAVAPATH}` --fi --echo -n Please enter your Java binary path \[$JAVAPATH\]:\ --read KBDENTRY --if [ ! "$KBDENTRY" = "" ] --then -- JAVAPATH=$KBDENTRY --fi -+JAVAPATH="@jre@/bin" - if [ -x "${JAVAPATH}/java" ] - then -- cd `dirname $0` -- BONNMOTION=`pwd` -- -- cd "${JAVAPATH}" -- JAVAPATH=`pwd` -- cd "${BONNMOTION}" -+ BONNMOTION="$(realpath .)" - - CLASSPATH="${BONNMOTION}/classes" - DOCPATH="${BONNMOTION}/javadoc" -@@ -52,14 +35,7 @@ then - then - mkdir "${DOCPATH}" - fi -- if [ $OS = "cygwin" ] -- then -- cd "${CLASSPATH}" -- CLASSPATH=`cmd.exe /c cd` -- cd "${DOCPATH}" -- DOCPATH=`cmd.exe /c cd` -- fi -- -+ - for l in $BONNMOTION/lib/*.jar - do - LIBRARYPATH=$LIBRARYPATH:$l -@@ -69,7 +45,7 @@ then - APPS=`ls` - cd "${BONNMOTION}/bin" - -- echo \#\!/bin/bash > .head -+ echo \#\!@bash@/bin/bash > .head - echo >> .head - echo BONNMOTION=\"$BONNMOTION\" >> .head - echo PACKAGE=\"$PACKAGE\" >> .head -@@ -103,8 +79,6 @@ then - fi - echo "done." - echo -- echo "$ ./bin/bm -h" -- ./bm - else - echo No executable \"$JAVAPATH/java\", aborting. - fi diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix deleted file mode 100644 index e7b16547d383..000000000000 --- a/pkgs/development/tools/misc/bsdbuild/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib, stdenv, fetchurl, perl, libtool, pkg-config, gettext, mandoc, ed }: - -stdenv.mkDerivation rec { - pname = "bsdbuild"; - version = "3.1"; - - src = fetchurl { - url = "http://stable.hypertriton.com/bsdbuild/${pname}-${version}.tar.gz"; - sha256 = "1zrdjh7a6z4khhfw9zrp490afq306cpl5v8wqz2z55ys7k1n5ifl"; - }; - - buildInputs = [ perl mandoc ed ]; - nativeBuildInputs = [ pkg-config libtool gettext ]; - - prePatch = '' - #ignore unfamiliar flags - substituteInPlace configure \ - --replace '--sbindir=*' '--sbindir=* | --includedir=* | --oldincludedir=*' - #same for packages using bsdbuild - substituteInPlace mkconfigure.pl \ - --replace '--sbindir=*' '--sbindir=* | --includedir=* | --oldincludedir=*' - #insert header for missing NULL macro - for f in db4.pm sdl_ttf.pm mysql.pm uim.pm strlcpy.pm getpwuid.pm \ - getaddrinfo.pm strtoll.pm free_null.pm getpwnam_r.pm \ - gettimeofday.pm gethostbyname.pm xinerama.pm strsep.pm \ - fontconfig.pm gettext.pm pthreads.pm strlcat.pm kqueue.pm wgl.pm \ - alsa.pm crypt.pm cracklib.pm freesg-rg.pm edacious.pm mmap.pm \ - agar.pm x11.pm x11.pm execvp.pm agar-core.pm dyld.pm getopt.pm \ - strtold.pm sdl_image.pm shl_load.pm glx.pm percgi.pm timerfd.pm \ - glob.pm dlopen.pm freesg.pm csidl.pm perl.pm select.pm \ - portaudio.pm etubestore.pm; - do -ed -s -v BSDBuild/$f << EOF -/#include -i -#include <stddef.h> -. -w -EOF - done - ''; - - configureFlags = [ - "--with-libtool=${libtool}/bin/libtool" - "--enable-nls=yes" - "--with-gettext=${gettext}" - "--with-manpages=yes" - ]; - - meta = { - homepage = "http://bsdbuild.hypertriton.com"; - description = "Cross-platform build system"; - - longDescription = '' - BSDBuild is a cross-platform build system. Derived from the - traditional 4.4BSD make libraries, BSDBuild allows BSD-style - Makefiles (without BSD make extensions), and works natively - under most operating systems and make flavors. Since BSDBuild - is implemented as a library (as opposed to a macro package), - Makefiles are edited directly, as opposed to being compiled - (however, if the build directory is separate from the source - directory, BSDBuild will produce the required Makefiles in place). - ''; - - license = lib.licenses.bsd3; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/tools/misc/c2ffi/default.nix b/pkgs/development/tools/misc/c2ffi/default.nix deleted file mode 100644 index d83381080a5f..000000000000 --- a/pkgs/development/tools/misc/c2ffi/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, fetchFromGitHub -, cmake -, llvmPackages_16 -, unstableGitUpdater -}: - -let - c2ffiBranch = "llvm-16.0.0"; - llvmPackages = llvmPackages_16; -in - -llvmPackages.stdenv.mkDerivation { - pname = "c2ffi-${c2ffiBranch}"; - version = "0-unstable-2023-11-18"; - - src = fetchFromGitHub { - owner = "rpav"; - repo = "c2ffi"; - rev = "097cbe61ca02dc79ea60859aa056975131a9d985"; - hash = "sha256-pflolW5OoEkVDozy4cjCdUIVxgE/SfVKIhQyNBDhENc="; - }; - - passthru.updateScript = unstableGitUpdater { - url = "https://github.com/rpav/c2ffi.git"; - branch = c2ffiBranch; - # Tags only exist for older LLVM versions, so they would result in nonsense names - # like: c2ffi-llvm-16.0.0-11.0.0.0-unstable-YYYY-MM-DD - hardcodeZeroVersion = true; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - llvmPackages.llvm - llvmPackages.clang - llvmPackages.libclang - ]; - - # This isn't much, but... - doInstallCheck = true; - installCheckPhase = '' - $out/bin/c2ffi --help 2>&1 >/dev/null - ''; - - # LLVM may be compiled with -fno-rtti, so let's just turn it off. - # A mismatch between lib{clang,LLVM}* and us can lead to the link time error: - # undefined reference to `typeinfo for clang::ASTConsumer' - env.CXXFLAGS="-fno-rtti"; - - meta = with lib; { - homepage = "https://github.com/rpav/c2ffi"; - 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 = [ ]; - }; -} diff --git a/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff b/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff deleted file mode 100644 index cc42f0745da5..000000000000 --- a/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff +++ /dev/null @@ -1,49 +0,0 @@ -Based on this: -http://sourceforge.net/tracker/?func=detail&aid=1493886&group_id=5152&atid=305152 -fix the infinite loops in quote highlight - ID: 1493886 - ---- cbrowser-0.8-2/ftcllib.tcl 2000-07-04 01:17:43.000000000 +0200 -+++ cbrowser-0.8/ftcllib.tcl 2006-05-24 00:39:18.833762522 +0200 -@@ -1290,13 +1290,39 @@ - foreach {start end} [concat 1.0 [$widget tag ranges comment] end] { - - while {[set temp [$widget search -regexp -- $pattern $start $end]] != ""} { -+ set startquote [$widget index "$temp + 1chars"] - -- set endquote [$widget search -regexp -- {[^\\]\"} "$temp + 1chars" $end] -+ set temp [$widget index "$startquote + 1chars"] -+ while {1==1} { -+ set endquote [$widget search -regexp -- {\"} $temp $end] -+ -+ # The program will not break if a /*C comment*/ is between C quotes. -+ if { $endquote == "" } { -+ set endquote $startquote -+ break -+ } -+ -+ # look for double backslashes -+ if {[set temp2 [$widget search -regexp -- {\\\\} $temp $endquote]] != ""} { -+ set temp "$temp2 + 2chars" -+ continue -+ } -+ -+ # look for \" -+ if {[set temp2 [$widget search -regexp -- {\\\"} $temp $endquote]] != ""} { -+ set temp "$temp2 + 2chars" -+ continue -+ } -+ -+ break -+ } - - if {[strlen $endquote] > 0} { -- set start [$widget index "$endquote + 2chars"] -+ set start [$widget index "$endquote + 1chars"] - -- $widget tag add quote "$temp + 1chars" $start -+ $widget tag add quote $startquote $start -+ } else { -+ set start [$widget index "$start + 1chars"] - } - } - } diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix deleted file mode 100644 index 72a177a17f93..000000000000 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ fetchurl, lib, stdenv, tk, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "cbrowser"; - version = "0.8"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1050mirjab23qsnq3lp3a9vwcbavmh9kznzjm7dr5vkx8b7ffcji"; - }; - - patches = [ ./backslashes-quotes.diff ]; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ tk ]; - - installPhase = '' - mkdir -p $out/bin $out/share/${pname}-${version} - cp -R * $out/share/${pname}-${version}/ - - makeWrapper $out/share/${pname}-${version}/cbrowser $out/bin/cbrowser \ - --prefix PATH : ${tk}/bin - ''; - - meta = { - description = "Tcl/Tk GUI front-end to cscope"; - mainProgram = "cbrowser"; - - license = lib.licenses.gpl2Plus; - - homepage = "https://sourceforge.net/projects/cbrowser/"; - - maintainers = [ ]; - - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix deleted file mode 100644 index a1a116b46d07..000000000000 --- a/pkgs/development/tools/misc/cflow/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, fetchurl, gettext, emacs }: - -stdenv.mkDerivation rec { - pname = "cflow"; - version = "1.7"; - - src = fetchurl { - url = "mirror://gnu/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-0BFGyvkAHiZhM0F8KoJYpktfwW/LCCoU9lKCBNDJcIY="; - }; - - patchPhase = '' - substituteInPlace "src/cflow.h" \ - --replace "/usr/bin/cpp" \ - "$(cat ${stdenv.cc}/nix-support/orig-cc)/bin/cpp" - ''; - - buildInputs = [ gettext ] ++ - # We don't have Emacs/GTK/etc. on {Dar,Cyg}win. - lib.optional - (! (lib.lists.any (x: stdenv.hostPlatform.system == x) - [ "i686-cygwin" ])) - emacs; - - doCheck = true; - - meta = with lib; { - description = "Tool to analyze the control flow of C programs"; - mainProgram = "cflow"; - - longDescription = '' - GNU cflow analyzes a collection of C source files and prints a - graph, charting control flow within the program. - - GNU cflow is able to produce both direct and inverted flowgraphs - for C sources. Optionally a cross-reference listing can be - generated. Two output formats are implemented: POSIX and GNU - (extended). - - The package also provides Emacs major mode for examining the - produced flowcharts in Emacs. - ''; - - license = licenses.gpl3Plus; - - homepage = "https://www.gnu.org/software/cflow/"; - - maintainers = [ ]; - - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix deleted file mode 100644 index bb5a792fa4dc..000000000000 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, ncurses, readline, flex, texinfo }: - -stdenv.mkDerivation rec { - pname = "cgdb"; - version = "0.8.0"; - - src = fetchurl { - url = "https://cgdb.me/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-DTi1JNN3JXsQa61thW2K4zBBQOHuJAhTQ+bd8bZYEfE="; - }; - - buildInputs = [ ncurses readline flex texinfo ]; - - meta = with lib; { - description = "Curses interface to gdb"; - mainProgram = "cgdb"; - - homepage = "https://cgdb.github.io/"; - - license = licenses.gpl2Plus; - - platforms = with platforms; linux ++ cygwin; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix deleted file mode 100644 index 1890b21d7cf1..000000000000 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - 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_${finalAttrs.version}.tar.xz"; - hash = "sha256-nOnlE1Ry2GR+L/tWZV4AOR6Omap6SormBc8OH/2fNgk="; - }; - - nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ perl ]; - - buildPhase = '' - runHook preBuild - - substituteInPlace ./scripts/checkbashisms.pl \ - --replace '###VERSION###' "$version" - - runHook postBuild - ''; - installPhase = '' - runHook preInstall - - installManPage scripts/$pname.1 - installShellCompletion --bash --name $pname scripts/$pname.bash_completion - install -D -m755 scripts/$pname.pl $out/bin/$pname - - 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/chrpath/default.nix b/pkgs/development/tools/misc/chrpath/default.nix deleted file mode 100644 index 32cb4864a357..000000000000 --- a/pkgs/development/tools/misc/chrpath/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "chrpath"; - version = "0.16"; - - src = fetchurl { - url = "https://alioth-archive.debian.org/releases/${pname}/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "0yvfq891mcdkf8g18gjjkn2m5rvs8z4z4cl1vwdhx6f2p9a4q3dv"; - }; - - meta = with lib; { - description = "Command line tool to adjust the RPATH or RUNPATH of ELF binaries"; - mainProgram = "chrpath"; - longDescription = '' - chrpath changes, lists or removes the rpath or runpath setting in a - binary. The rpath, or runpath if it is present, is where the runtime - linker should look for the libraries needed for a program. - ''; - homepage = "https://tracker.debian.org/pkg/chrpath"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/development/tools/misc/chruby-fish/default.nix b/pkgs/development/tools/misc/chruby-fish/default.nix deleted file mode 100644 index 6268c740e212..000000000000 --- a/pkgs/development/tools/misc/chruby-fish/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, chruby }: - -stdenv.mkDerivation rec { - pname = "chruby-fish"; - version = "0.8.2"; - - src = fetchFromGitHub { - owner = "JeanMertz"; - repo = "chruby-fish"; - rev = "v${version}"; - sha256 = "15q0ywsn9pcypbpvlq0wb41x4igxm9bsvhg9a05dqw1n437qjhyb"; - }; - - postInstall = '' - sed -i -e '1iset CHRUBY_ROOT ${chruby}' $out/share/chruby/auto.fish - sed -i -e '1iset CHRUBY_ROOT ${chruby}' $out/share/chruby/chruby.fish - ''; - - installFlags = [ "PREFIX=$(out)" ]; - - meta = { - description = "Thin wrapper around chruby to make it work with the Fish shell"; - homepage = "https://github.com/JeanMertz/chruby-fish"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.cohei ]; - }; -} diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix deleted file mode 100644 index 8f1f2ecc3767..000000000000 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: - -buildGoModule rec { - pname = "circleci-cli"; - version = "0.1.30995"; - - src = fetchFromGitHub { - owner = "CircleCI-Public"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-DSgpyQ9luC7RSFq/TbJplQzEKJEDdGIPHsFX3LuzqaQ="; - }; - - vendorHash = "sha256-60edYYhbSPiJWmuQXXEt+xCnSxsHf8Q38RgyWwdP6vQ="; - - nativeBuildInputs = [ installShellFiles ]; - - doCheck = false; - - ldflags = [ "-s" "-w" "-X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" "-X github.com/CircleCI-Public/circleci-cli/version.Commit=${src.rev}" "-X github.com/CircleCI-Public/circleci-cli/version.packageManager=nix" ]; - - postInstall = '' - mv $out/bin/circleci-cli $out/bin/circleci - - installShellCompletion --cmd circleci \ - --bash <(HOME=$TMPDIR $out/bin/circleci completion bash --skip-update-check) \ - --zsh <(HOME=$TMPDIR $out/bin/circleci completion zsh --skip-update-check) - ''; - - meta = with lib; { - # Box blurb edited from the AUR package circleci-cli - description = '' - Command to enable you to reproduce the CircleCI environment locally and - run jobs as if they were running on the hosted CirleCI application. - ''; - maintainers = with maintainers; [ synthetica ]; - mainProgram = "circleci"; - license = licenses.mit; - homepage = "https://circleci.com/"; - }; -} diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix deleted file mode 100644 index 35cfd01ff925..000000000000 --- a/pkgs/development/tools/misc/cl-launch/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl }: -stdenv.mkDerivation rec { - pname = "cl-launch"; - version = "4.1.4.1"; - - src = fetchurl { - url = "http://common-lisp.net/project/xcvb/cl-launch/cl-launch-${version}.tar.gz"; - sha256 = "sha256-v5aURs2Verhn2HmGiijvY9br20OTPFrOGBWsb6cHhSQ="; - }; - - preConfigure = '' - export makeFlags="$makeFlags PREFIX='$out'" - mkdir -p "$out/bin" - ''; - - preBuild = '' - sed -e 's/\t\t@/\t\t/g' -i Makefile - ''; - - meta = with lib; { - description = "Common Lisp launcher script"; - license = licenses.llgpl21; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix deleted file mode 100644 index 6e70fbcfcde5..000000000000 --- a/pkgs/development/tools/misc/complexity/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ fetchurl, lib, stdenv, autogen }: - -stdenv.mkDerivation rec { - pname = "complexity"; - version = "1.10"; - - src = fetchurl { - url = "mirror://gnu/complexity/${pname}-${version}.tar.gz"; - sha256 = "1vfns9xm7w0wrz12a3w15slrqnrfh6qxk15nv7qkj3irll3ff522"; - }; - - buildInputs = [ autogen ]; - - doCheck = true; - - meta = { - description = "C code complexity measurement tool"; - - longDescription = - '' GNU Complexity is a tool designed for analyzing the complexity of C - program functions. It is very similar to the McCabe scoring, but - addresses several issues not considered in that scoring scheme. - ''; - - license = lib.licenses.gpl3Plus; - - homepage = "https://www.gnu.org/software/complexity/"; - - platforms = lib.platforms.gnu ++ lib.platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/misc/complgen/default.nix b/pkgs/development/tools/misc/complgen/default.nix deleted file mode 100644 index 8a540e77cfe2..000000000000 --- a/pkgs/development/tools/misc/complgen/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "complgen"; - version = "0.1.8"; - - src = fetchFromGitHub { - owner = "adaszko"; - repo = "complgen"; - rev = "v${version}"; - hash = "sha256-pcMyI9jK5yyqZ7OlzDuG+9bK9QdZvXAxm4QS9awyqXk="; - }; - - cargoHash = "sha256-gZoK0EuULoZ5D6YPrjmn0Cv1Wu9t9xzJhP6/3OrBHeY="; - - meta = with lib; { - description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar"; - mainProgram = "complgen"; - homepage = "https://github.com/adaszko/complgen"; - changelog = "https://github.com/adaszko/complgen/blob/${src.rev}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix deleted file mode 100644 index 8aa0afd7011e..000000000000 --- a/pkgs/development/tools/misc/cppi/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ fetchurl, lib, stdenv }: - -stdenv.mkDerivation rec { - pname = "cppi"; - version = "1.18"; - - src = fetchurl { - url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1jk42cjaggk71rimjnx3qpmb6hivps0917vl3z7wbxk3i2whb98j"; - }; - - doCheck = true; - - meta = { - homepage = "https://savannah.gnu.org/projects/cppi/"; - - description = "C preprocessor directive indenter"; - mainProgram = "cppi"; - - longDescription = - '' GNU cppi indents C preprocessor directives to reflect their nesting - and ensure that there is exactly one space character between each #if, - #elif, #define directive and the following token. The number of - spaces between the `#' and the following directive must correspond - to the level of nesting of that directive. - ''; - - license = lib.licenses.gpl3Plus; - - maintainers = with lib.maintainers; [ sigmanificient ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/cproto/cproto.patch b/pkgs/development/tools/misc/cproto/cproto.patch deleted file mode 100644 index 3743fef977b0..000000000000 --- a/pkgs/development/tools/misc/cproto/cproto.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur cproto-4.6-old/cproto.h cproto-4.6/cproto.h ---- cproto-4.6-old/cproto.h 1998-01-18 19:49:16.000000000 -0500 -+++ cproto-4.6/cproto.h 2004-03-14 00:02:32.148070032 -0500 -@@ -117,6 +117,7 @@ - Declarator *declarator; - DeclaratorList decl_list; - } YYSTYPE; -+#define YYSTYPE_IS_DECLARED 1 - - /* Prototype styles */ - #if OPT_LINTLIBRARY diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix deleted file mode 100644 index faf0e8e5a4ee..000000000000 --- a/pkgs/development/tools/misc/cproto/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, flex, bison }: - -stdenv.mkDerivation rec { - pname = "cproto"; - version = "4.7w"; - - src = fetchurl { - urls = [ - "mirror://debian/pool/main/c/cproto/cproto_${version}.orig.tar.gz" - # No version listings and apparently no versioned tarball over http(s). - "ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz" - ]; - sha256 = "sha256-ix1GjM2aKFnzmcdf773KDf3KTcMYkf7bxArFwybSe20="; - }; - - # patch made by Joe Khoobyar copied from gentoo bugs - patches = [ ./cproto.patch ]; - - nativeBuildInputs = [ flex bison ]; - - doCheck = true; - - doInstallCheck = true; - installCheckPhase = '' - [ "$("$out/bin/cproto" -V 2>&1)" = '${version}' ] - ''; - - meta = with lib; { - description = "Tool to generate C function prototypes from C source code"; - mainProgram = "cproto"; - homepage = "https://invisible-island.net/cproto/"; - license = licenses.publicDomain; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index 7adc78013f47..a8b6acb1e3f9 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # On Linux, c-reduce's preferred way to reason about # the cpu architecture/topology is to use 'lscpu', # so let's make sure it knows where to find it: - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace creduce/creduce_utils.pm --replace \ lscpu ${util-linux}/bin/lscpu ''; diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix deleted file mode 100644 index f306478948bc..000000000000 --- a/pkgs/development/tools/misc/cscope/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ fetchurl, lib, stdenv, ncurses -, emacsSupport ? true, emacs -}: - -stdenv.mkDerivation rec { - pname = "cscope"; - version = "15.9"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0ngiv4aj3rr35k3q3wjx0y19gh7i1ydqa0cqip6sjwd8fph5ll65"; - }; - - configureFlags = [ "--with-ncurses=${ncurses.dev}" ]; - - buildInputs = [ ncurses ]; - nativeBuildInputs = lib.optional emacsSupport emacs; - - postInstall = lib.optionalString emacsSupport '' - cd "contrib/xcscope" - - sed -i "cscope-indexer" \ - -"es|^PATH=.*$|PATH=\"$out/bin:\$PATH\"|g" - sed -i "xcscope.el" \ - -"es|\"cscope-indexer\"|\"$out/libexec/cscope/cscope-indexer\"|g"; - - mkdir -p "$out/libexec/cscope" - cp "cscope-indexer" "$out/libexec/cscope" - - mkdir -p "$out/share/emacs/site-lisp" - emacs --batch --eval '(byte-compile-file "xcscope.el")' - cp xcscope.el{,c} "$out/share/emacs/site-lisp" - ''; - - meta = { - description = "Developer's tool for browsing source code"; - - longDescription = '' - Cscope is a developer's tool for browsing source code. It has - an impeccable Unix pedigree, having been originally developed at - Bell Labs back in the days of the PDP-11. Cscope was part of - the official AT&T Unix distribution for many years, and has been - used to manage projects involving 20 million lines of code! - ''; - - license = "BSD-style"; - - homepage = "https://cscope.sourceforge.net/"; - - maintainers = [ ]; - - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix deleted file mode 100644 index 52955577ee7f..000000000000 --- a/pkgs/development/tools/misc/csmith/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchurl, m4, makeWrapper, libbsd, perlPackages }: - -stdenv.mkDerivation rec { - pname = "csmith"; - version = "2.3.0"; - - src = fetchurl { - url = "https://embed.cs.utah.edu/csmith/${pname}-${version}.tar.gz"; - sha256 = "1mb5zgixsyf86slggs756k8a5ddmj980md3ic9sa1y75xl5cqizj"; - }; - - nativeBuildInputs = [ m4 makeWrapper ]; - buildInputs = [ libbsd ] ++ (with perlPackages; [ perl SysCPU ]); - - CXXFLAGS = "-std=c++98"; - - postInstall = '' - substituteInPlace $out/bin/compiler_test.pl \ - --replace '$CSMITH_HOME/runtime' $out/include/${pname}-${version} \ - --replace ' ''${CSMITH_HOME}/runtime' " $out/include/${pname}-${version}" \ - --replace '$CSMITH_HOME/src/csmith' $out/bin/csmith - - substituteInPlace $out/bin/launchn.pl \ - --replace '../compiler_test.pl' $out/bin/compiler_test.pl \ - --replace '../$CONFIG_FILE' '$CONFIG_FILE' - - wrapProgram $out/bin/launchn.pl \ - --prefix PERL5LIB : "$PERL5LIB" - - mkdir -p $out/share/csmith - mv $out/bin/compiler_test.in $out/share/csmith/ - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Random generator of C programs"; - homepage = "https://embed.cs.utah.edu/csmith"; - # Officially, the license is this: https://github.com/csmith-project/csmith/blob/master/COPYING - license = licenses.bsd2; - longDescription = '' - Csmith is a tool that can generate random C programs that statically and - dynamically conform to the C99 standard. It is useful for stress-testing - compilers, static analyzers, and other tools that process C code. - 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 = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix index d74dfaa7e760..26aacff8256d 100644 --- a/pkgs/development/tools/misc/cvise/default.nix +++ b/pkgs/development/tools/misc/cvise/default.nix @@ -16,14 +16,14 @@ buildPythonApplication rec { pname = "cvise"; - version = "2.10.0"; + version = "2.11.0"; format = "other"; src = fetchFromGitHub { owner = "marxin"; repo = "cvise"; rev = "refs/tags/v${version}"; - hash = "sha256-0gk4O1q90eH1FMhj4ncNVqX/MfVyaU0nckh1xny2wlM="; + hash = "sha256-xaX3QMnTKXTXPuLzui0e0WgaQNvbz8u1JNRBkfe4QWg="; }; patches = [ diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix deleted file mode 100644 index fc07a523ff0b..000000000000 --- a/pkgs/development/tools/misc/cwebbin/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, tie }: - -let - cweb = fetchurl { - url = "https://www.ctan.org/tex-archive/web/c_cpp/cweb/cweb-3.64ah.tgz"; - sha256 = "1hdzxfzaibnjxjzgp6d2zay8nsarnfy9hfq55hz1bxzzl23n35aj"; - }; -in -stdenv.mkDerivation rec { - pname = "cwebbin"; - version = "22p"; - - __structuredAttrs = true; - - src = fetchFromGitHub { - owner = "ascherer"; - repo = "cwebbin"; - rev = "2016-05-20-22p"; - sha256 = "0zf93016hm9i74i2v384rwzcw16y3hg5vc2mibzkx1rzvqa50yfr"; - }; - - prePatch = '' - tar xf ${cweb} - ''; - - # Remove references to __DATE__ and __TIME__ - postPatch = '' - substituteInPlace wmerg-patch.ch --replace ' ("__DATE__", "__TIME__")' "" - substituteInPlace ctang-patch.ch --replace ' ("__DATE__", "__TIME__")' "" - substituteInPlace ctangle.cxx --replace ' ("__DATE__", "__TIME__")' "" - substituteInPlace cweav-patch.ch --replace ' ("__DATE__", "__TIME__")' "" - ''; - - nativeBuildInputs = [ tie ]; - - makefile = "Makefile.unix"; - - makeFlags = [ - "MACROSDIR=$(out)/share/texmf/tex/generic/cweb" - "CWEBINPUTS=$(out)/lib/cweb" - "DESTDIR=$(out)/bin/" - "MANDIR=$(out)/share/man/man1" - "EMACSDIR=$(out)/share/emacs/site-lisp" - "CP=cp" - "RM=rm" - "PDFTEX=echo" - # requires __structuredAttrs = true - "CC=$(CXX) -std=c++14" - ]; - - buildFlags = [ - "boot" - "cautiously" - ]; - - preInstall = '' - mkdir -p $out/share/man/man1 $out/share/texmf/tex/generic $out/share/emacs $out/lib - ''; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Literate Programming in C/C++"; - platforms = with platforms; unix; - maintainers = [ ]; - license = licenses.abstyles; - }; -} diff --git a/pkgs/development/tools/misc/d-spy/default.nix b/pkgs/development/tools/misc/d-spy/default.nix deleted file mode 100644 index c2812c2e1209..000000000000 --- a/pkgs/development/tools/misc/d-spy/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenv -, lib -, desktop-file-utils -, fetchurl -, glib -, gettext -, gtk4 -, libadwaita -, meson -, ninja -, pkg-config -, wrapGAppsHook4 -, gnome -}: - -stdenv.mkDerivation rec { - pname = "d-spy"; - version = "1.10.0"; - - outputs = [ "out" "lib" "dev" ]; - - src = fetchurl { - url = "mirror://gnome/sources/d-spy/${lib.versions.majorMinor version}/d-spy-${version}.tar.xz"; - hash = "sha256-VVgSucZUBVHaWZ7oFHiArTkVuTyH4XV7bRz9kKDgXlM="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - desktop-file-utils - wrapGAppsHook4 - gettext - glib - ]; - - buildInputs = [ - glib - gtk4 - libadwaita - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = "d-spy"; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "D-Bus exploration tool"; - mainProgram = "d-spy"; - homepage = "https://gitlab.gnome.org/GNOME/d-spy"; - license = with licenses; [ - lgpl3Plus # library - gpl3Plus # app - ]; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix deleted file mode 100644 index 796536b9e2aa..000000000000 --- a/pkgs/development/tools/misc/dbench/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchgit, autoconf, popt, zlib, rpcsvc-proto, libtirpc }: - -stdenv.mkDerivation rec { - pname = "dbench"; - version = "2013-01-01"; - - src = fetchgit { - url = "git://git.samba.org/sahlberg/${pname}.git"; - rev = "65b19870ed8d25bff14cafa1c30beb33f1fb6597"; - sha256 = "16lcbwmmx8z5i73k3dnf54yffrpx7ql3y9k3cpkss9dcyxb1p83i"; - }; - - nativeBuildInputs = [ autoconf rpcsvc-proto ]; - buildInputs = [ popt zlib libtirpc ]; - env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; - NIX_LDFLAGS = [ "-ltirpc" ]; - - patches = [ - # patch has been also sent upstream and might be included in future versions - ./fix-missing-stdint.patch - ]; - - preConfigure = '' - ./autogen.sh - configureFlagsArray+=("--datadir=$out/share/dbench") - ''; - - postInstall = '' - cp -R loadfiles/* $out/share/dbench/doc/dbench/loadfiles - - # dbench looks here for the file - ln -s doc/dbench/loadfiles/client.txt $out/share/dbench/client.txt - - # backwards compatible to older nixpkgs packaging introduced by - # 3f27be8e5d5861cd4b9487d6c5212d88bf24316d - ln -s dbench/doc/dbench/loadfiles $out/share/loadfiles - ''; - - meta = with lib; { - description = "Filesystem benchmark tool based on load patterns"; - mainProgram = "dbench"; - homepage = "https://dbench.samba.org/"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/development/tools/misc/dbench/fix-missing-stdint.patch b/pkgs/development/tools/misc/dbench/fix-missing-stdint.patch deleted file mode 100644 index 96cb28e9e55a..000000000000 --- a/pkgs/development/tools/misc/dbench/fix-missing-stdint.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- dbench-65b1987.org/libnfs.c 2017-11-08 12:25:39.652147989 +0000 -+++ dbench-65b1987/libnfs.c 2017-11-08 12:26:20.269897054 +0000 -@@ -23,6 +23,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> -+#include <stdint.h> - - #define discard_const(ptr) ((void *)((intptr_t)(ptr))) - diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix deleted file mode 100644 index 0321b24de321..000000000000 --- a/pkgs/development/tools/misc/ddd/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - imagemagick, - desktopToDarwinBundle, - motif, - ncurses, - libX11, - libXt, - gdb, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "ddd"; - version = "3.4.0"; - - src = fetchurl { - url = "mirror://gnu/ddd/ddd-${finalAttrs.version}.tar.gz"; - hash = "sha256-XUy8iguwRYVDhm1nkwjFOj7wZuQC/loZGOGWmKPTWA8="; - }; - - postPatch = '' - substituteInPlace ddd/Ddd.in \ - --replace-fail 'debuggerCommand:' 'debuggerCommand: ${gdb}/bin/gdb' - ''; - - nativeBuildInputs = [ imagemagick ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; - - buildInputs = [ - motif - ncurses - libX11 - libXt - ]; - - # ioctl is not found without this flag. fixed in next release - # Upstream issue ref: https://savannah.gnu.org/bugs/index.php?64188 - env = lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_COMPILE = "-DHAVE_SYS_IOCTL_H"; }; - - configureFlags = [ - "--enable-builtin-manual" - "--enable-builtin-app-defaults" - ]; - - # From MacPorts: make will build the executable "ddd" and the X resource - # file "Ddd" in the same directory, as HFS+ is case-insensitive by default - # this will loosely FAIL - makeFlags = [ "EXEEXT=exe" ]; - enableParallelBuilding = true; - - postInstall = '' - mv $out/bin/dddexe $out/bin/ddd - convert icons/ddd.xbm ddd.png - install -D ddd.png $out/share/icons/hicolor/48x48/apps/ddd.png - ''; - - meta = { - changelog = "https://www.gnu.org/software/ddd/news.html"; - description = "Graphical front-end for command-line debuggers"; - homepage = "https://www.gnu.org/software/ddd"; - license = lib.licenses.gpl3Only; - mainProgram = "ddd"; - maintainers = with lib.maintainers; [ emilytrau ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/development/tools/misc/debugedit/default.nix b/pkgs/development/tools/misc/debugedit/default.nix deleted file mode 100644 index 8da0effe7be5..000000000000 --- a/pkgs/development/tools/misc/debugedit/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -#TODO@deliciouslytyped The tool seems to unnecessarily force mutable access for the debugedit `-l` feature -{fetchgit, lib, stdenv, autoreconfHook, pkg-config, elfutils, help2man, util-linux}: -stdenv.mkDerivation rec { - pname = "debugedit"; - version = "5.0"; - - nativeBuildInputs = [ autoreconfHook pkg-config help2man ]; - buildInputs = [ elfutils ]; - nativeCheckInputs = [ util-linux ]; # Tests use `rev` - - src = fetchgit { - url = "git://sourceware.org/git/debugedit.git"; - rev = "debugedit-${version}"; - sha256 = "VTZ7ybQT3DfKIfK0lH+JiehCJyJ+qpQ0bAn1/f+Pscs="; - }; - - preBuild = '' - patchShebangs scripts/find-debuginfo.in - ''; - - doCheck = true; - - meta = with lib; { - description = "Provides programs and scripts for creating debuginfo and source file distributions, collect build-ids and rewrite source paths in DWARF data for debugging, tracing and profiling"; - homepage = "https://sourceware.org/debugedit/"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ deliciouslytyped ]; - }; -} diff --git a/pkgs/development/tools/misc/deheader/default.nix b/pkgs/development/tools/misc/deheader/default.nix deleted file mode 100644 index d562ec98b6d1..000000000000 --- a/pkgs/development/tools/misc/deheader/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, stdenv -, python3 -, xmlto -, docbook-xsl-nons -, fetchFromGitLab -, installShellFiles -}: - -stdenv.mkDerivation rec { - pname = "deheader"; - version = "1.10"; - outputs = [ "out" "man" ]; - - src = fetchFromGitLab { - owner = "esr"; - repo = "deheader"; - rev = version; - hash = "sha256-dYTHvFWlt3aM/fdZFge7GBdd9bfCrEcp7ULJuBl71Xs="; - }; - - buildInputs = [ python3 ]; - - nativeBuildInputs = [ xmlto docbook-xsl-nons installShellFiles ]; - - # With upstream Makefile, xmlto is called without "--skip-validation". It - # makes it require a lot of dependencies, yet ultimately it fails - # nevertheless in attempt to fetch something from SourceForge. - # - # Need to set "foundMakefile" so "make check" tests are run. - buildPhase = '' - runHook preBuild - - xmlto man --skip-validation deheader.xml - patchShebangs ./deheader - foundMakefile=1 - - runHook postBuild - ''; - - doCheck = true; - - installPhase = '' - runHook preInstall - - install -Dm755 ./deheader -t $out/bin - installManPage ./deheader.1 - - runHook postInstall - ''; - - meta = with lib; { - description = "Tool to find and optionally remove unneeded includes in C or C++ source files"; - mainProgram = "deheader"; - longDescription = '' - This tool takes a list of C or C++ sourcefiles and generates a report - on which #includes can be omitted from them -- the test, for each foo.c - or foo.cc or foo.cpp, is simply whether 'rm foo.o; make foo.o' returns a - zero status. Optionally, with the -r option, the unneeded headers are removed. - The tool also reports on headers required for strict portability. - ''; - homepage = "http://catb.org/~esr/deheader"; - changelog = "https://gitlab.com/esr/deheader/-/blob/master/NEWS.adoc"; - license = licenses.bsd2; - maintainers = with maintainers; [ kaction ]; - - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix deleted file mode 100644 index 015e7ff991d1..000000000000 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ fetchurl, lib, stdenv, expect, makeWrapper, updateAutotoolsGnuConfigScriptsHook }: - -stdenv.mkDerivation rec { - pname = "dejagnu"; - version = "1.6.3"; - - src = fetchurl { - url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1qx2cv6qkxbiqg87jh217jb62hk3s7dmcs4cz1llm2wmsynfznl7"; - }; - - nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook makeWrapper ]; - buildInputs = [ expect ]; - - # dejagnu-1.6.3 can't successfully run tests in source tree: - # https://wiki.linuxfromscratch.org/lfs/ticket/4871 - preConfigure = '' - mkdir build - cd build - ''; - configureScript = "../configure"; - - doCheck = !(with stdenv; isDarwin && isAarch64); - - # Note: The test-suite *requires* /dev/pts among the `build-chroot-dirs' of - # the build daemon when building in a chroot. See - # <https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01056.html> for - # details. - - # The test-suite needs to have a non-empty stdin: - # https://lists.gnu.org/archive/html/bug-dejagnu/2003-06/msg00002.html - checkPhase = '' - # Provide `runtest' with a log name, otherwise it tries to run - # `whoami', which fails when in a chroot. - LOGNAME="nix-build-daemon" make check < /dev/zero - ''; - - postInstall = '' - # 'runtest' and 'dejagnu' look up 'expect' in their 'bin' path - # first. We avoid use of 'wrapProgram' here because wrapping - # of shell scripts does not preserve argv[0] for schell scripts: - # https://sourceware.org/PR30052#c5 - ln -s ${expect}/bin/expect $out/bin/expect - ''; - - meta = with lib; { - description = "Framework for testing other programs"; - - longDescription = '' - DejaGnu is a framework for testing other programs. Its purpose - is to provide a single front end for all tests. Think of it as a - custom library of Tcl procedures crafted to support writing a - test harness. A test harness is the testing infrastructure that - is created to support a specific program or tool. Each program - can have multiple testsuites, all supported by a single test - harness. DejaGnu is written in Expect, which in turn uses Tcl -- - Tool command language. - ''; - - homepage = "https://www.gnu.org/software/dejagnu/"; - license = licenses.gpl2Plus; - - platforms = platforms.unix; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/development/tools/misc/devspace/default.nix deleted file mode 100644 index a6bed0257440..000000000000 --- a/pkgs/development/tools/misc/devspace/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, testers -, devspace -}: - -buildGoModule rec { - pname = "devspace"; - version = "6.3.12"; - - src = fetchFromGitHub { - owner = "devspace-sh"; - repo = "devspace"; - rev = "v${version}"; - hash = "sha256-tnkMXB0BWavSZF3HEdvtCE42zgcHNRGI5CdK3RDvv9c="; - }; - - vendorHash = null; - - ldflags = [ - "-s" - "-w" - "-X main.version=${version}" - ]; - - # Check are disable since they requiered a working K8S cluster - # TODO: add a nixosTest to be able to perform the package check - doCheck = false; - - passthru.tests.version = testers.testVersion { - package = devspace; - }; - - meta = with lib; { - description = "Open-source developer tool for Kubernetes that lets you develop and deploy cloud-native software faster"; - homepage = "https://devspace.sh/"; - changelog = "https://github.com/devspace-sh/devspace/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ darkonion0 ]; - }; -} diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix deleted file mode 100644 index a4c091bfbe7e..000000000000 --- a/pkgs/development/tools/misc/dfu-programmer/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, libusb-compat-0_1 }: -stdenv.mkDerivation rec { - pname = "dfu-programmer"; - version = "0.7.2"; - - buildInputs = [ libusb-compat-0_1 ]; - - src = fetchurl { - url = "mirror://sourceforge/dfu-programmer/${pname}-${version}.tar.gz"; - sha256 = "15gr99y1z9vbvhrkd25zqhnzhg6zjmaam3vfjzf2mazd39mx7d0x"; - }; - - configureFlags = [ "--disable-libusb_1_0" ]; - - meta = with lib; { - license = licenses.gpl2; - description = "Device Firmware Update based USB programmer for Atmel chips with a USB bootloader"; - mainProgram = "dfu-programmer"; - homepage = "http://dfu-programmer.sourceforge.net/"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix deleted file mode 100644 index 26610c2c78d7..000000000000 --- a/pkgs/development/tools/misc/dfu-util/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libusb1 }: - -stdenv.mkDerivation rec { - pname = "dfu-util"; - version = "0.11"; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 ]; - - src = fetchurl { - url = "https://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-tLU7ohqC7349TEffKVKt9fpJT0mbawtXxYxdBK6P8Z4="; - }; - - meta = with lib; { - description = "Device firmware update (DFU) USB programmer"; - longDescription = '' - dfu-util is a program that implements the host (PC) side of the USB - DFU 1.0 and 1.1 (Universal Serial Bus Device Firmware Upgrade) protocol. - - DFU is intended to download and upload firmware to devices connected over - USB. It ranges from small devices like micro-controller boards up to mobile - phones. With dfu-util you are able to download firmware to your device or - upload firmware from it. - ''; - homepage = "https://dfu-util.sourceforge.net"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = [ maintainers.fpletz ]; - }; -} diff --git a/pkgs/development/tools/misc/direvent/default.nix b/pkgs/development/tools/misc/direvent/default.nix deleted file mode 100644 index 3e3de9f26676..000000000000 --- a/pkgs/development/tools/misc/direvent/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv -, fetchurl -}: - -stdenv.mkDerivation rec { - pname = "direvent"; - version = "5.4"; - - src = fetchurl { - url = "mirror://gnu/direvent/direvent-${version}.tar.gz"; - sha256 = "sha256-HbvGGSqrZ+NFclFIYD1XDGooKDgMlkIVdir5FSTXlbo="; - }; - - meta = with lib; { - description = "Directory event monitoring daemon"; - mainProgram = "direvent"; - homepage = "https://www.gnu.org.ua/software/direvent/"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ puffnfresh ]; - }; -} diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix deleted file mode 100644 index fb4dff6b5e10..000000000000 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - fetchurl, - lib, - libxml2, - makeWrapper, - python3, - stdenv, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "doclifter"; - version = "2.21"; - - src = fetchurl { - url = "http://www.catb.org/~esr/doclifter/doclifter-${finalAttrs.version}.tar.gz"; - hash = "sha256-3zb+H/rRmU87LWh0+kQtiRMZ4JwJ3tVrt8vQ/EeKx8Q="; - }; - - postPatch = '' - substituteInPlace manlifter \ - --replace-fail '/usr/bin/env python2' '/usr/bin/env python3' - 2to3 -w manlifter - ''; - - nativeBuildInputs = [ - python3 - makeWrapper - ]; - - buildInputs = [ python3 ]; - - strictDeps = true; - - makeFlags = [ "PREFIX=$(out)" ]; - - preInstall = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man1 - cp manlifter $out/bin - wrapProgram "$out/bin/manlifter" \ - --prefix PATH : "${lib.getBin libxml2}/bin:$out/bin" - gzip < manlifter.1 > $out/share/man/man1/manlifter.1.gz - ''; - - meta = { - changelog = "https://gitlab.com/esr/doclifter/-/blob/2.21/NEWS"; - description = "Lift documents in nroff markups to XML-DocBook"; - homepage = "http://www.catb.org/esr/doclifter"; - license = lib.licenses.bsd2; - mainProgram = "doclifter"; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/development/tools/misc/doq/default.nix b/pkgs/development/tools/misc/doq/default.nix deleted file mode 100644 index 786720465097..000000000000 --- a/pkgs/development/tools/misc/doq/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -}: - -python3.pkgs.buildPythonApplication rec { - pname = "doq"; - version = "0.10.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "heavenshell"; - repo = "py-doq"; - rev = "refs/tags/${version}"; - hash = "sha256-iVu+5o8pZ5OhIzNItWbzUzqC3VQ6HCD7nP5gW/PVAMM="; - }; - - nativeBuildInputs = with python3.pkgs; [ - setuptools - setuptools-generate - ]; - - propagatedBuildInputs = with python3.pkgs; [ - jinja2 - parso - toml - ]; - - nativeCheckInputs = with python3.pkgs; [ - parameterized - pytestCheckHook - ]; - - pythonImportsCheck = [ "doq" ]; - - meta = with lib; { - description = "Docstring generator for Python"; - homepage = "https://github.com/heavenshell/py-doq"; - changelog = "https://github.com/heavenshell/py-doq/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; - license = licenses.bsd3; - maintainers = with maintainers; [ natsukium ]; - mainProgram = "doq"; - }; -} diff --git a/pkgs/development/tools/misc/dura/default.nix b/pkgs/development/tools/misc/dura/default.nix index 34b5127e118e..34b966607a74 100644 --- a/pkgs/development/tools/misc/dura/default.nix +++ b/pkgs/development/tools/misc/dura/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/tools/misc/dwz/default.nix b/pkgs/development/tools/misc/dwz/default.nix deleted file mode 100644 index 852201cf7114..000000000000 --- a/pkgs/development/tools/misc/dwz/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl, elfutils }: - -stdenv.mkDerivation rec { - pname = "dwz"; - version = "0.14"; - - src = fetchurl { - url = "https://www.sourceware.org/ftp/${pname}/releases/${pname}-${version}.tar.gz"; - sha256 = "07qdvzfk4mvbqj5z3aff7vc195dxqn1mi27w2dzs1w2zhymnw01k"; - }; - - nativeBuildInputs = [ elfutils ]; - - makeFlags = [ "prefix=${placeholder "out"}" ]; - - meta = with lib; { - homepage = "https://sourceware.org/dwz/"; - description = "DWARF optimization and duplicate removal tool"; - mainProgram = "dwz"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ jbcrail ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix deleted file mode 100644 index ad61dcded73d..000000000000 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, editorconfig-checker }: - -buildGoModule rec { - pname = "editorconfig-checker"; - version = "3.0.3"; - - src = fetchFromGitHub { - owner = "editorconfig-checker"; - repo = "editorconfig-checker"; - rev = "v${version}"; - hash = "sha256-lU7YGn3W3KGrvOUH/v++jHii4q3hSo9X8BAjDNJ7y3A="; - }; - - vendorHash = "sha256-P5lOx9CH37Z7mkDshbwS+XJZQdQiqNKl71wR1iUvpm8="; - - doCheck = false; - - nativeBuildInputs = [ installShellFiles ]; - - ldflags = [ "-X main.version=${version}" ]; - - postInstall = '' - installManPage docs/editorconfig-checker.1 - ''; - - passthru.tests.version = testers.testVersion { - package = editorconfig-checker; - }; - - meta = with lib; { - changelog = "https://github.com/editorconfig-checker/editorconfig-checker/releases/tag/${src.rev}"; - description = "Tool to verify that your files are in harmony with your .editorconfig"; - mainProgram = "editorconfig-checker"; - homepage = "https://editorconfig-checker.github.io/"; - license = licenses.mit; - maintainers = with maintainers; [ uri-canva zowoq ]; - }; -} diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix deleted file mode 100644 index 7c3eb4e19423..000000000000 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pcre2 -, doxygen -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "editorconfig-core-c"; - version = "0.12.9"; - - outputs = [ "out" "dev" ]; - - src = fetchFromGitHub { - owner = "editorconfig"; - repo = "editorconfig-core-c"; - rev = "v${finalAttrs.version}"; - hash = "sha256-myJNJxKwgmgm+P2MqnYmW8OC0oYcInL+Suyf/xwX9xo="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - cmake - doxygen - ]; - - buildInputs = [ - pcre2 - ]; - - # Multiple doxygen can not generate man pages in the same base directory in - # parallel: https://github.com/doxygen/doxygen/issues/6293 - enableParallelBuilding = false; - - meta = with lib; { - homepage = "https://editorconfig.org/"; - description = "EditorConfig core library written in C"; - longDescription = '' - EditorConfig makes it easy to maintain the correct coding style when - switching between different text editors and between different - projects. The EditorConfig project maintains a file format and plugins - for various text editors which allow this file format to be read and used - by those editors. For information on the file format and supported text - editors, see the EditorConfig website. - ''; - downloadPage = "https://github.com/editorconfig/editorconfig-core-c"; - license = with licenses; [ bsd2 bsd3 ]; - maintainers = with maintainers; [ dochang ]; - platforms = platforms.unix; - mainProgram = "editorconfig"; - }; -}) diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix deleted file mode 100644 index c5ede8488511..000000000000 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, dbus, dbus-glib }: - -stdenv.mkDerivation rec { - pname = "eggdbus"; - version = "0.6"; - - src = fetchurl { - url = "https://hal.freedesktop.org/releases/${pname}-${version}.tar.gz"; - sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib dbus dbus-glib ]; - - meta = with lib; { - homepage = "https://hal.freedesktop.org/releases/"; - description = "D-Bus bindings for GObject"; - platforms = platforms.linux; - license = licenses.lgpl2; - }; -} diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix deleted file mode 100644 index 93636e1675d8..000000000000 --- a/pkgs/development/tools/misc/elfinfo/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "elfinfo"; - version = "1.2.2"; - - src = fetchFromGitHub { - owner = "xyproto"; - repo = "elfinfo"; - rev = version; - sha256 = "sha256-HnjHOjanStqmDXnc6Z9w0beCMJFf/ndWbYxoDEaOws4="; - }; - - vendorHash = null; - - meta = with lib; { - description = "Small utility for showing information about ELF files"; - mainProgram = "elfinfo"; - homepage = "https://elfinfo.roboticoverlords.org/"; - changelog = "https://github.com/xyproto/elfinfo/releases/tag/${version}"; - license = licenses.bsd3; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix deleted file mode 100644 index 9a612593d06f..000000000000 --- a/pkgs/development/tools/misc/elfkickers/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "elfkickers"; - version = "3.2"; - - src = fetchurl { - url = "https://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-${version}.tar.gz"; - sha256 = "sha256-m4HmxT4MlPwZjZiC63NxVvNtVlFS3DIRiJfHewaiaHw="; - }; - - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix:=${placeholder "out"}" ]; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://www.muppetlabs.com/~breadbox/software/elfkickers.html"; - description = "Collection of programs that access and manipulate ELF files"; - platforms = platforms.linux; - license = licenses.gpl2Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/misc/elfutils/cxx-header-collision.patch b/pkgs/development/tools/misc/elfutils/cxx-header-collision.patch deleted file mode 100644 index a3442c6aa276..000000000000 --- a/pkgs/development/tools/misc/elfutils/cxx-header-collision.patch +++ /dev/null @@ -1,331 +0,0 @@ -From: Tristan Ross <tristan.ross@midstall.com> -Date: Wed, 31 Jul 2024 04:03:03 +0000 (-0700) -Subject: Prevent binaries in src from colliding with libc++ headers -X-Git-Url: https://sourceware.org/git/?p=elfutils.git;a=commitdiff_plain;h=232b9ede92cbecabbd61291c2fc9aaf3fc61061f;hp=87a60d22299c4ba7b94cbce04a32c2abf015f98a - -Prevent binaries in src from colliding with libc++ headers - -Discovered with Nix and LLVM 17. Headers inside of libc++ can easily -collide with binaries being linked in src. This results in clang trying -to include a binary as a header. - -Fix this by removing '-I.' and '-I$(srcdir)' from AM_CPPFLAGS and -DEFAULT_INCLUDES in src/Makefile.am. - -To facilitate this config/eu.am has been refactored. New file -config/eu-common.am contains all of the old eu.am but with the -AM_CPPFLAGS definition removed. eu.am now includes eu-common.am and -contains the old AM_CPPFLAGS definition. - -eu.am functionality does not change, but src/Makefile.am can instead -include eu-common.am and define its own AM_CPPFLAGS without causing a -"multiply defined" warning during autoreconf. - -Signed-off-by: Tristan Ross <tristan.ross@midstall.com> ---- - -diff --git a/config/eu-common.am b/config/eu-common.am -new file mode 100644 -index 000000000..9cc7f6969 ---- /dev/null -+++ b/config/eu-common.am -@@ -0,0 +1,148 @@ -+## Common automake fragments for elfutils subdirectory makefiles. -+## -+## Copyright (C) 2010, 2014, 2016 Red Hat, Inc. -+## Copyright (C) 2023, Mark J. Wielaard <mark@klomp.org> -+## -+## This file is part of elfutils. -+## -+## This file is free software; you can redistribute it and/or modify -+## it under the terms of either -+## -+## * the GNU Lesser General Public License as published by the Free -+## Software Foundation; either version 3 of the License, or (at -+## your option) any later version -+## -+## or -+## -+## * the GNU General Public License as published by the Free -+## Software Foundation; either version 2 of the License, or (at -+## your option) any later version -+## -+## or both in parallel, as here. -+## -+## elfutils is distributed in the hope that it will be useful, but -+## WITHOUT ANY WARRANTY; without even the implied warranty of -+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+## General Public License for more details. -+## -+## You should have received copies of the GNU General Public License and -+## the GNU Lesser General Public License along with this program. If -+## not, see <http://www.gnu.org/licenses/>. -+## -+ -+DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"' -+ -+# Drop the 'u' flag that automake adds by default. It is incompatible -+# with deterministic archives. -+ARFLAGS = cr -+ -+# Warn about stack usage of more than 256K = 262144 bytes. -+if ADD_STACK_USAGE_WARNING -+STACK_USAGE_WARNING=-Wstack-usage=262144 -+STACK_USAGE_NO_ERROR=-Wno-error=stack-usage= -+else -+STACK_USAGE_WARNING= -+STACK_USAGE_NO_ERROR= -+endif -+ -+if SANE_LOGICAL_OP_WARNING -+LOGICAL_OP_WARNING=-Wlogical-op -+else -+LOGICAL_OP_WARNING= -+endif -+ -+if HAVE_DUPLICATED_COND_WARNING -+DUPLICATED_COND_WARNING=-Wduplicated-cond -+else -+DUPLICATED_COND_WARNING= -+endif -+ -+if HAVE_NULL_DEREFERENCE_WARNING -+NULL_DEREFERENCE_WARNING=-Wnull-dereference -+else -+NULL_DEREFERENCE_WARNING= -+endif -+ -+if HAVE_IMPLICIT_FALLTHROUGH_WARNING -+# Use strict fallthrough. Only __attribute__((fallthrough)) will prevent the -+# warning -+if HAVE_IMPLICIT_FALLTHROUGH_5_WARNING -+IMPLICIT_FALLTHROUGH_WARNING=-Wimplicit-fallthrough=5 -+else -+IMPLICIT_FALLTHROUGH_WARNING=-Wimplicit-fallthrough -+endif -+else -+IMPLICIT_FALLTHROUGH_WARNING= -+endif -+ -+if HAVE_TRAMPOLINES_WARNING -+TRAMPOLINES_WARNING=-Wtrampolines -+else -+TRAMPOLINES_WARNING= -+endif -+ -+if HAVE_NO_PACKED_NOT_ALIGNED_WARNING -+NO_PACKED_NOT_ALIGNED_WARNING=-Wno-packed-not-aligned -+else -+NO_PACKED_NOT_ALIGNED_WARNING= -+endif -+ -+if HAVE_USE_AFTER_FREE3_WARNING -+USE_AFTER_FREE3_WARNING=-Wuse-after-free=3 -+else -+USE_AFTER_FREE3_WARNING= -+endif -+ -+AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ -+ -Wold-style-definition -Wstrict-prototypes $(TRAMPOLINES_WARNING) \ -+ $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ -+ $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ -+ $(USE_AFTER_FREE3_WARNING) \ -+ $(if $($(*F)_no_Werror),,-Werror) \ -+ $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ -+ $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ -+ $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ -+ $($(*F)_CFLAGS) -+ -+AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \ -+ $(TRAMPOLINES_WARNING) \ -+ $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ -+ $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ -+ $(if $($(*F)_no_Werror),,-Werror) \ -+ $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ -+ $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ -+ $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ -+ $($(*F)_CXXFLAGS) -+ -+COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) -+ -+DEFS.os = -DPIC -DSHARED -+if SYMBOL_VERSIONING -+DEFS.os += -DSYMBOL_VERSIONING -+else -+endif -+ -+%.os: %.c %.o -+if AMDEP -+ $(AM_V_CC)if $(COMPILE.os) -c -o $@ $(fpic_CFLAGS) $(DEFS.os) -MT $@ -MD -MP \ -+ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ -+ then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ -+ rm -f "$(DEPDIR)/$*.Tpo"; \ -+ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+ fi -+else -+ $(AM_V_CC)$(COMPILE.os) -c -o $@ $(fpic_CFLAGS) $(DEFS.os) $< -+endif -+ -+CLEANFILES = *.gcno *.gcda -+ -+textrel_msg = echo "WARNING: TEXTREL found in '$@'" -+if FATAL_TEXTREL -+textrel_found = $(textrel_msg); exit 1 -+else -+textrel_found = $(textrel_msg) -+endif -+textrel_check = if $(READELF) -d $@ | grep -F -q TEXTREL; then $(textrel_found); fi -+ -+print-%: -+ @echo $*=$($*) -diff --git a/config/eu.am b/config/eu.am -index e6c241f9d..3aa6048aa 100644 ---- a/config/eu.am -+++ b/config/eu.am -@@ -1,4 +1,5 @@ --## Common automake fragments for elfutils subdirectory makefiles. -+## Common automake fragments for elfutils subdirectory makefiles -+## with AM_CPPFLAGS set. - ## - ## Copyright (C) 2010, 2014, 2016 Red Hat, Inc. - ## Copyright (C) 2023, Mark J. Wielaard <mark@klomp.org> -@@ -30,120 +31,5 @@ - ## not, see <http://www.gnu.org/licenses/>. - ## - --DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"' - AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. -- --# Drop the 'u' flag that automake adds by default. It is incompatible --# with deterministic archives. --ARFLAGS = cr -- --# Warn about stack usage of more than 256K = 262144 bytes. --if ADD_STACK_USAGE_WARNING --STACK_USAGE_WARNING=-Wstack-usage=262144 --STACK_USAGE_NO_ERROR=-Wno-error=stack-usage= --else --STACK_USAGE_WARNING= --STACK_USAGE_NO_ERROR= --endif -- --if SANE_LOGICAL_OP_WARNING --LOGICAL_OP_WARNING=-Wlogical-op --else --LOGICAL_OP_WARNING= --endif -- --if HAVE_DUPLICATED_COND_WARNING --DUPLICATED_COND_WARNING=-Wduplicated-cond --else --DUPLICATED_COND_WARNING= --endif -- --if HAVE_NULL_DEREFERENCE_WARNING --NULL_DEREFERENCE_WARNING=-Wnull-dereference --else --NULL_DEREFERENCE_WARNING= --endif -- --if HAVE_IMPLICIT_FALLTHROUGH_WARNING --# Use strict fallthrough. Only __attribute__((fallthrough)) will prevent the --# warning --if HAVE_IMPLICIT_FALLTHROUGH_5_WARNING --IMPLICIT_FALLTHROUGH_WARNING=-Wimplicit-fallthrough=5 --else --IMPLICIT_FALLTHROUGH_WARNING=-Wimplicit-fallthrough --endif --else --IMPLICIT_FALLTHROUGH_WARNING= --endif -- --if HAVE_TRAMPOLINES_WARNING --TRAMPOLINES_WARNING=-Wtrampolines --else --TRAMPOLINES_WARNING= --endif -- --if HAVE_NO_PACKED_NOT_ALIGNED_WARNING --NO_PACKED_NOT_ALIGNED_WARNING=-Wno-packed-not-aligned --else --NO_PACKED_NOT_ALIGNED_WARNING= --endif -- --if HAVE_USE_AFTER_FREE3_WARNING --USE_AFTER_FREE3_WARNING=-Wuse-after-free=3 --else --USE_AFTER_FREE3_WARNING= --endif -- --AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ -- -Wold-style-definition -Wstrict-prototypes $(TRAMPOLINES_WARNING) \ -- $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ -- $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ -- $(USE_AFTER_FREE3_WARNING) \ -- $(if $($(*F)_no_Werror),,-Werror) \ -- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ -- $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ -- $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ -- $($(*F)_CFLAGS) -- --AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \ -- $(TRAMPOLINES_WARNING) \ -- $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ -- $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ -- $(if $($(*F)_no_Werror),,-Werror) \ -- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ -- $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ -- $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ -- $($(*F)_CXXFLAGS) -- --COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) -- --DEFS.os = -DPIC -DSHARED --if SYMBOL_VERSIONING --DEFS.os += -DSYMBOL_VERSIONING --else --endif -- --%.os: %.c %.o --if AMDEP -- $(AM_V_CC)if $(COMPILE.os) -c -o $@ $(fpic_CFLAGS) $(DEFS.os) -MT $@ -MD -MP \ -- -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ -- then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ -- rm -f "$(DEPDIR)/$*.Tpo"; \ -- else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -- fi --else -- $(AM_V_CC)$(COMPILE.os) -c -o $@ $(fpic_CFLAGS) $(DEFS.os) $< --endif -- --CLEANFILES = *.gcno *.gcda -- --textrel_msg = echo "WARNING: TEXTREL found in '$@'" --if FATAL_TEXTREL --textrel_found = $(textrel_msg); exit 1 --else --textrel_found = $(textrel_msg) --endif --textrel_check = if $(READELF) -d $@ | grep -F -q TEXTREL; then $(textrel_found); fi -- --print-%: -- @echo $*=$($*) -+include $(top_srcdir)/config/eu-common.am -diff --git a/src/Makefile.am b/src/Makefile.am -index 1d592d4de..5fcebc21d 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -16,10 +16,12 @@ - ## You should have received a copy of the GNU General Public License - ## along with this program. If not, see <http://www.gnu.org/licenses/>. - ## --include $(top_srcdir)/config/eu.am -+include $(top_srcdir)/config/eu-common.am - DEFS += $(YYDEBUG) -DDEBUGPRED=@DEBUGPRED@ \ - -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\" --AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ -+DEFAULT_INCLUDES = -I$(top_builddir) -+AM_CPPFLAGS = -I$(top_srcdir)/lib -I.. \ -+ -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ - -I$(srcdir)/../libdw -I$(srcdir)/../libdwelf \ - -I$(srcdir)/../libdwfl -I$(srcdir)/../libasm -I../debuginfod diff --git a/pkgs/development/tools/misc/elfutils/debug-info-from-env.patch b/pkgs/development/tools/misc/elfutils/debug-info-from-env.patch deleted file mode 100644 index 409f1311c315..000000000000 --- a/pkgs/development/tools/misc/elfutils/debug-info-from-env.patch +++ /dev/null @@ -1,27 +0,0 @@ -Look up .build-id files relative to the directories in the -colon-separated environment variable NIX_DEBUG_INFO_DIRS, unless -overriden by --debuginfo-path. - -diff -ru elfutils-0.169-orig/libdwfl/argp-std.c elfutils-0.169/libdwfl/argp-std.c ---- elfutils-0.169-orig/libdwfl/argp-std.c 2017-05-02 23:05:52.000000000 +0200 -+++ elfutils-0.169/libdwfl/argp-std.c 2017-07-28 16:08:06.739558106 +0200 -@@ -376,5 +376,7 @@ - const struct argp * - dwfl_standard_argp (void) - { -+ debuginfo_path = getenv("NIX_DEBUG_INFO_DIRS"); -+ - return &libdwfl_argp; - } -diff -ru elfutils-0.169-orig/src/stack.c elfutils-0.169/src/stack.c ---- elfutils-0.169-orig/src/stack.c 2017-02-24 11:55:28.000000000 +0100 -+++ elfutils-0.169/src/stack.c 2017-07-28 15:50:06.743196696 +0200 -@@ -631,6 +631,8 @@ - /* Set locale. */ - (void) setlocale (LC_ALL, ""); - -+ debuginfo_path = getenv("NIX_DEBUG_INFO_DIRS"); -+ - const struct argp_option options[] = - { - { NULL, 0, NULL, 0, N_("Input selection options:"), 0 }, diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix deleted file mode 100644 index 260d385e350b..000000000000 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, musl-fts -, musl-obstack, m4, zlib, zstd, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs -, argp-standalone -, enableDebuginfod ? true, sqlite, curl, libmicrohttpd, libarchive -, gitUpdater, autoreconfHook -}: - -# TODO: Look at the hardcoded paths to kernel, modules etc. -stdenv.mkDerivation rec { - pname = "elfutils"; - version = "0.191"; - - src = fetchurl { - url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-33bbcTZtHXCDZfx6bGDKSDmPFDZ+sriVTvyIlxR62HE="; - }; - - patches = [ - ./debug-info-from-env.patch - (fetchpatch { - name = "fix-aarch64_fregs.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/elfutils/fix-aarch64_fregs.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; - sha256 = "zvncoRkQx3AwPx52ehjA2vcFroF+yDC2MQR5uS6DATs="; - }) - (fetchpatch { - name = "musl-asm-ptrace-h.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-asm-ptrace-h.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; - sha256 = "8D1wPcdgAkE/TNBOgsHaeTZYhd9l+9TrZg8d5C7kG6k="; - }) - (fetchpatch { - name = "musl-macros.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-macros.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; - sha256 = "tp6O1TRsTAMsFe8vw3LMENT/vAu6OmyA8+pzgThHeA8="; - }) - (fetchpatch { - name = "musl-strndupa.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; - sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0="; - }) - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ] - # Prevent headers and binaries from colliding which results in an error. - # https://sourceware.org/pipermail/elfutils-devel/2024q3/007281.html - ++ lib.optional (stdenv.targetPlatform.useLLVM or false) ./cxx-header-collision.patch; - - postPatch = '' - patchShebangs tests/*.sh - '' + lib.optionalString stdenv.hostPlatform.isRiscV '' - # disable failing test: - # - # > dwfl_thread_getframes: No DWARF information found - sed -i s/run-backtrace-dwarf.sh//g tests/Makefile.in - ''; - - outputs = [ "bin" "dev" "out" "man" ]; - - # We need bzip2 in NativeInputs because otherwise we can't unpack the src, - # as the host-bzip2 will be in the path. - nativeBuildInputs = [ m4 bison flex gettext bzip2 ] - ++ lib.optional enableDebuginfod pkg-config - ++ lib.optional (stdenv.targetPlatform.useLLVM or false) autoreconfHook; - buildInputs = [ zlib zstd bzip2 xz ] - ++ lib.optionals stdenv.hostPlatform.isMusl [ - argp-standalone - musl-fts - musl-obstack - ] ++ lib.optionals enableDebuginfod [ - sqlite - curl - libmicrohttpd - libarchive - ]; - - propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; - - configureFlags = [ - "--program-prefix=eu-" # prevent collisions with binutils - "--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; - - - doCheck = - # Backtrace unwinding tests rely on glibc-internal symbol names. - # Musl provides slightly different forms and fails. - # Let's disable tests there until musl support is fully upstreamed. - !stdenv.hostPlatform.isMusl - # Test suite tries using `uname` to determine whether certain tests - # can be executed, so we need to match build and host platform exactly. - && (stdenv.hostPlatform == stdenv.buildPlatform); - doInstallCheck = !stdenv.hostPlatform.isMusl - && (stdenv.hostPlatform == stdenv.buildPlatform); - - passthru.updateScript = gitUpdater { - url = "https://sourceware.org/git/elfutils.git"; - rev-prefix = "elfutils-"; - }; - - meta = with lib; { - homepage = "https://sourceware.org/elfutils/"; - description = "Set of utilities to handle ELF objects"; - platforms = platforms.linux; - # https://lists.fedorahosted.org/pipermail/elfutils-devel/2014-November/004223.html - badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; - # licenses are GPL2 or LGPL3+ for libraries, GPL3+ for bins, - # but since this package isn't split that way, all three are listed. - license = with licenses; [ gpl2Only lgpl3Plus gpl3Plus ]; - maintainers = with maintainers; [ r-burns ]; - }; -} diff --git a/pkgs/development/tools/misc/elfutils/musl-error_h.patch b/pkgs/development/tools/misc/elfutils/musl-error_h.patch deleted file mode 100644 index 711928078d35..000000000000 --- a/pkgs/development/tools/misc/elfutils/musl-error_h.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -crb --new-file a/lib/error.h b/lib/error.h -*** a/lib/error.h 1969-12-31 19:00:00.000000000 -0500 ---- b/lib/error.h 2021-01-21 04:38:25.000000000 -0500 -*************** -*** 0 **** ---- 1,27 ---- -+ #ifndef _ERROR_H_ -+ #define _ERROR_H_ -+ -+ #include <stdarg.h> -+ #include <stdio.h> -+ #include <stdlib.h> -+ #include <string.h> -+ #include <errno.h> -+ -+ static unsigned int error_message_count = 0; -+ -+ static inline void error(int status, int errnum, const char* format, ...) -+ { -+ va_list ap; -+ fprintf(stderr, "%s: ", program_invocation_name); -+ va_start(ap, format); -+ vfprintf(stderr, format, ap); -+ va_end(ap); -+ if (errnum) -+ fprintf(stderr, ": %s", strerror(errnum)); -+ fprintf(stderr, "\n"); -+ error_message_count++; -+ if (status) -+ exit(status); -+ } -+ -+ #endif /* _ERROR_H_ */ -diff -crb --new-file a/src/error.h b/src/error.h -*** a/src/error.h 1969-12-31 19:00:00.000000000 -0500 ---- b/src/error.h 2021-01-21 04:38:29.000000000 -0500 -*************** -*** 0 **** ---- 1,27 ---- -+ #ifndef _ERROR_H_ -+ #define _ERROR_H_ -+ -+ #include <stdarg.h> -+ #include <stdio.h> -+ #include <stdlib.h> -+ #include <string.h> -+ #include <errno.h> -+ -+ static unsigned int error_message_count = 0; -+ -+ static inline void error(int status, int errnum, const char* format, ...) -+ { -+ va_list ap; -+ fprintf(stderr, "%s: ", program_invocation_name); -+ va_start(ap, format); -+ vfprintf(stderr, format, ap); -+ va_end(ap); -+ if (errnum) -+ fprintf(stderr, ": %s", strerror(errnum)); -+ fprintf(stderr, "\n"); -+ error_message_count++; -+ if (status) -+ exit(status); -+ } -+ -+ #endif /* _ERROR_H_ */ diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix deleted file mode 100644 index 93a6a6d7343b..000000000000 --- a/pkgs/development/tools/misc/epm/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, rpm -}: - -stdenv.mkDerivation rec { - pname = "epm"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "jimjag"; - repo = pname; - rev = "v${version}"; - hash = "sha256-o4B5lWBeve+U70FDgF1DrtNrXxaEY4etkPpwbqF7fmc="; - }; - - patches = [ - # Makefile fix: INSTALL command - (fetchpatch { - url = "https://github.com/jimjag/epm/commit/dc5fcd6fa6e3a74baa28be060769a2b47f9368e7.patch"; - sha256 = "1gfyz493w0larin841xx3xalb7m3sp1r2vv1xki6rz35ybrnb96c"; - }) - # Makefile fix: man pages filenames and docdir target - (fetchpatch { - url = "https://github.com/jimjag/epm/commit/96bb48d4d7b463a09d5a25debfb51c88dcd7398c.patch"; - sha256 = "11aws0qac6vyy3w5z39vkjy4symmfzxfq9qgbgkk74fvx9vax42a"; - }) - ]; - - buildInputs = [ rpm ]; - - meta = with lib; { - description = "ESP Package Manager generates distribution archives for a variety of platforms"; - homepage = "https://jimjag.github.io/epm/"; - license = licenses.asl20; - maintainers = with maintainers; [ pSub ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/ezno/default.nix b/pkgs/development/tools/misc/ezno/default.nix deleted file mode 100644 index 559622bf7da2..000000000000 --- a/pkgs/development/tools/misc/ezno/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "ezno"; - version = "0.0.8"; - - src = fetchFromGitHub { - owner = "kaleidawave"; - repo = "ezno"; - rev = "release/ezno-${version}"; - hash = "sha256-0yLEpNkl7KjBEGxNONtfMjVlWMSKGZ6TbYJMsCeQ3ms="; - }; - - cargoHash = "sha256-noMfKx6BsmWhAVI4r8LlC961Uwogv1JGMYSrNGlLGPQ="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - - cargoBuildFlags = [ "--bin" "ezno" ]; - - meta = with lib; { - description = "JavaScript compiler and TypeScript checker with a focus on static analysis and runtime performance"; - mainProgram = "ezno"; - homepage = "https://github.com/kaleidawave/ezno"; - changelog = "https://github.com/kaleidawave/ezno/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/findnewest/default.nix b/pkgs/development/tools/misc/findnewest/default.nix deleted file mode 100644 index adf791cf6030..000000000000 --- a/pkgs/development/tools/misc/findnewest/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "findnewest"; - version = "0.3"; - - src = fetchFromGitHub { - owner = "0-wiz-0"; - repo = pname; - rev = "${pname}-${version}"; - sha256 = "1x1cbn2b27h5r0ah5xc06fkalfdci2ngrgd4wibxjw0h88h0nvgq"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - meta = with lib; { - homepage = "https://github.com/0-wiz-0/findnewest"; - description = "Recursively find newest file in a hierarchy and print its timestamp"; - mainProgram = "fn"; - license = licenses.bsd2; - maintainers = with maintainers; [ bhipple ]; - }; -} diff --git a/pkgs/development/tools/misc/fsatrace/default.nix b/pkgs/development/tools/misc/fsatrace/default.nix deleted file mode 100644 index d99374ac5373..000000000000 --- a/pkgs/development/tools/misc/fsatrace/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "fsatrace"; - version = "0.0.5"; - - src = fetchFromGitHub { - owner = "jacereda"; - repo = "fsatrace"; - rev = "5af79511828ca6cea4e5dd9f28e1676fb0b705e9"; - "hash" = "sha256-pn07qlrRaM153znEviziuKWrkX9cLsNFCujovmE4UUA="; - }; - - installDir = "libexec/${pname}-${version}"; - - makeFlags = [ "INSTALLDIR=$(out)/$(installDir)" ]; - - preInstall = '' - mkdir -p $out/$installDir - ''; - - postInstall = '' - mkdir -p $out/bin - ln -s $out/$installDir/fsatrace $out/bin/fsatrace - ''; - - meta = with lib; { - homepage = "https://github.com/jacereda/fsatrace"; - description = "filesystem access tracer"; - mainProgram = "fsatrace"; - license = licenses.isc; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index afeac90c58c0..05fbd759ffca 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-gVYDvda+6ZJkShJXUxUEVxq4enkRrhdvlTTxYWq4Aho="; }; - nativeBuildInputs = [ autoreconfHook makeWrapper ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + nativeBuildInputs = [ autoreconfHook makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; buildInputs = [ gettext libtool texinfo ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/misc/funzzy/default.nix b/pkgs/development/tools/misc/funzzy/default.nix deleted file mode 100644 index c05def18404b..000000000000 --- a/pkgs/development/tools/misc/funzzy/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "funzzy"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "cristianoliveira"; - repo = "funzzy"; - rev = "v${version}"; - hash = "sha256-YjA/XxVB8gGxyLovxTTatSC/ESBCkgz7Not0qfEPxtw="; - }; - - cargoHash = "sha256-eq5d6oHWKip9K+9yszLXW+JHtzYzrThXfqoZGMhnSHk="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - - meta = with lib; { - description = "Lightweight watcher"; - homepage = "https://github.com/cristianoliveira/funzzy"; - changelog = "https://github.com/cristianoliveira/funzzy/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 5cf686dcfb6b..19783b407567 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -15,7 +15,7 @@ # $debugdir:$datadir/auto-load are whitelisted by default by GDB "$debugdir" "$datadir/auto-load" # targetPackages so we get the right libc when cross-compiling and using buildPackages.gdb - targetPackages.stdenv.cc.cc.lib + (lib.getLib targetPackages.stdenv.cc.cc) ] , writeScript }: @@ -30,14 +30,14 @@ assert pythonSupport -> python3 != null; stdenv.mkDerivation rec { pname = targetPrefix + basename + lib.optionalString hostCpuOnly "-host-cpu-only"; - version = "15.1"; + version = "15.2"; src = fetchurl { url = "mirror://gnu/gdb/${basename}-${version}.tar.xz"; - hash = "sha256-OCVOrNRXITS8qcWlqk1MpWTLvTDDadiB9zP7a5AzVPI="; + hash = "sha256-gzUMzTW1taDLprM0xBKU6paBWMVzlAkE8AuS92NFMU0="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace gdb/darwin-nat.c \ --replace '#include "bfd/mach-o.h"' '#include "mach-o.h"' '' + lib.optionalString stdenv.hostPlatform.isMusl '' @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { patches = [ ./debug-info-from-env.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./darwin-target-match.patch ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ++ lib.optional pythonSupport python3 ++ lib.optional doCheck dejagnu ++ lib.optional enableDebuginfod (elfutils.override { enableDebuginfod = true; }) - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # darwin build fails with format hardening since v7.12 - hardeningDisable = lib.optionals stdenv.isDarwin [ "format" ]; + hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "format" ]; env.NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; @@ -117,10 +117,10 @@ stdenv.mkDerivation rec { ++ lib.optional enableDebuginfod "--with-debuginfod=yes" ++ lib.optional (!enableSim) "--disable-sim"; - postInstall = - '' # Remove Info files already provided by Binutils and other packages. - rm -v $out/share/info/bfd.info - ''; + postInstall = '' + # Remove Info files already provided by Binutils and other packages. + rm -v $out/share/info/bfd.info + ''; # TODO: Investigate & fix the test failures. doCheck = false; diff --git a/pkgs/development/tools/misc/gef/default.nix b/pkgs/development/tools/misc/gef/default.nix deleted file mode 100644 index fd3071a08175..000000000000 --- a/pkgs/development/tools/misc/gef/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, makeWrapper -, gdb -, python3 -, bintools-unwrapped -, file -, ps -, git -, coreutils -}: - -let - pythonPath = with python3.pkgs; makePythonPath [ - keystone-engine - unicorn - capstone - ropper - ]; - -in stdenv.mkDerivation rec { - pname = "gef"; - version = "2024.06"; - - src = fetchFromGitHub { - owner = "hugsy"; - repo = "gef"; - rev = version; - sha256 = "sha256-fo8hC2T2WDcG0MQffPm2QBPR89EPiqctkUJC40PeyWg="; - }; - - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/share/gef - cp gef.py $out/share/gef - makeWrapper ${gdb}/bin/gdb $out/bin/gef \ - --add-flags "-q -x $out/share/gef/gef.py" \ - --set NIX_PYTHONPATH ${pythonPath} \ - --prefix PATH : ${lib.makeBinPath [ - python3 - bintools-unwrapped # for readelf - file - ps - ]} - ''; - - nativeCheckInputs = [ - gdb - file - ps - git - python3 - python3.pkgs.pytest - python3.pkgs.pytest-xdist - python3.pkgs.keystone-engine - python3.pkgs.unicorn - python3.pkgs.capstone - python3.pkgs.ropper - ]; - checkPhase = '' - # Skip some tests that require network access. - sed -i '/def test_cmd_shellcode_get(self):/i \ \ \ \ @unittest.skip(reason="not available in sandbox")' tests/runtests.py - sed -i '/def test_cmd_shellcode_search(self):/i \ \ \ \ @unittest.skip(reason="not available in sandbox")' tests/runtests.py - - # Patch the path to /bin/ls. - sed -i 's+/bin/ls+${coreutils}/bin/ls+g' tests/runtests.py - - # Run the tests. - make test - ''; - - meta = with lib; { - description = "Modern experience for GDB with advanced debugging features for exploit developers & reverse engineers"; - mainProgram = "gef"; - homepage = "https://github.com/hugsy/gef"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ freax13 ]; - }; -} diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix deleted file mode 100644 index 9ef5ec24d545..000000000000 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ fetchurl, lib, stdenv, texinfo, help2man }: - -stdenv.mkDerivation rec { - pname = "gengetopt"; - version = "2.23"; - - src = fetchurl { - url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1b44fn0apsgawyqa4alx2qj5hls334mhbszxsy6rfr0q074swhdr"; - }; - - doCheck = true; - # attempts to open non-existent file - preCheck = '' - rm tests/test_conf_parser_save.sh - ''; - - # test suite is not thread safe - enableParallelBuilding = false; - - nativeBuildInputs = [ texinfo help2man ]; - - #Fix, see #28255 - postPatch = '' - substituteInPlace configure --replace \ - 'set -o posix' \ - 'set +o posix' - ''; - - env = lib.optionalAttrs stdenv.cc.isClang { - CXXFLAGS = "-std=c++14"; - }; - - meta = { - description = "Command-line option parser generator"; - mainProgram = "gengetopt"; - - longDescription = - '' GNU Gengetopt program generates a C function that uses getopt_long - function to parse the command line options, to validate them and - fills a struct - ''; - - homepage = "https://www.gnu.org/software/gengetopt/"; - - license = lib.licenses.gpl3Plus; - - maintainers = [ ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/gf/build-use-optional-freetype-with-pkg-config.patch b/pkgs/development/tools/misc/gf/build-use-optional-freetype-with-pkg-config.patch deleted file mode 100644 index 7e748dca244e..000000000000 --- a/pkgs/development/tools/misc/gf/build-use-optional-freetype-with-pkg-config.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build.sh b/build.sh -index e471563..32bdfab 100755 ---- a/build.sh -+++ b/build.sh -@@ -5,7 +5,7 @@ gdb --version > /dev/null 2>&1 || printf "\033[0;31mWarning\033[0m: GDB not dete - echo q | gdb | grep "(gdb)" > /dev/null 2>&1 || printf "\033[0;31mWarning\033[0m: Your copy of GDB appears to be non-standard or has been heavily reconfigured with .gdbinit.\nIf you are using GDB plugins like 'GDB Dashboard' you must remove them,\nas otherwise gf will be unable to communicate with GDB.\n" - - # Check if FreeType is available. --if [ -d /usr/include/freetype2 ]; then extra_flags="$extra_flags -lfreetype -D UI_FREETYPE -I /usr/include/freetype2"; -+if pkg-config --cflags freetype2 > /dev/null; then extra_flags="$extra_flags -D UI_FREETYPE $(pkg-config --cflags --libs freetype2)"; - else printf "\033[0;31mWarning\033[0m: FreeType could not be found. The fallback font will be used.\n"; fi - - # Check if SSE2 is available. diff --git a/pkgs/development/tools/misc/gf/default.nix b/pkgs/development/tools/misc/gf/default.nix deleted file mode 100644 index 4b7c40bf983d..000000000000 --- a/pkgs/development/tools/misc/gf/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, stdenv -, makeWrapper -, fetchFromGitHub -, libX11 -, pkg-config -, gdb -, freetype -, freetypeSupport ? true -, extensions ? [ ] -}: - -stdenv.mkDerivation { - pname = "gf"; - version = "unstable-2023-08-09"; - - src = fetchFromGitHub { - repo = "gf"; - owner = "nakst"; - rev = "4190211d63c1e5378a9e841d22fa2b96a1099e68"; - hash = "sha256-28Xgw/KxwZ94r/TXsdISeUtXHSips4irB0D+tEefMYE="; - }; - - nativeBuildInputs = [ makeWrapper pkg-config ]; - buildInputs = [ libX11 gdb ] - ++ lib.optional freetypeSupport freetype; - - patches = [ - ./build-use-optional-freetype-with-pkg-config.patch - ]; - - postPatch = lib.forEach extensions (ext: '' - cp ${ext} ./${ext.name or (builtins.baseNameOf ext)} - ''); - - preConfigure = '' - patchShebangs build.sh - ''; - - buildPhase = '' - runHook preBuild - extra_flags=-DUI_FREETYPE_SUBPIXEL ./build.sh - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p "$out/bin" - cp gf2 "$out/bin/" - runHook postInstall - ''; - - postFixup = '' - wrapProgram $out/bin/gf2 --prefix PATH : ${lib.makeBinPath[ gdb ]} - ''; - - meta = with lib; { - description = "GDB Frontend"; - homepage = "https://github.com/nakst/gf"; - license = licenses.mit; - platforms = platforms.linux; - mainProgram = "gf2"; - maintainers = with maintainers; [ _0xd61 ]; - }; -} diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix deleted file mode 100644 index 7f3d79f6a3d7..000000000000 --- a/pkgs/development/tools/misc/global/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ fetchurl, lib, stdenv, libtool, makeWrapper -, coreutils, ctags, ncurses, python3Packages, sqlite, universal-ctags -}: - -let - pygments = python3Packages.pygments; -in stdenv.mkDerivation rec { - pname = "global"; - version = "6.6.13"; - - src = fetchurl { - url = "mirror://gnu/global/${pname}-${version}.tar.gz"; - hash = "sha256-lF80lzDaAfd4VNmBHKj4AWaclGE5WimWbY2Iy2cDNHs="; - }; - - nativeBuildInputs = [ libtool makeWrapper ]; - - buildInputs = [ ncurses sqlite ]; - - propagatedBuildInputs = [ pygments ]; - - configureFlags = [ - "--with-ltdl-include=${libtool}/include" - "--with-ltdl-lib=${libtool.lib}/lib" - "--with-ncurses=${ncurses}" - "--with-sqlite3" - "--with-exuberant-ctags=${ctags}/bin/ctags" - "--with-universal-ctags=${universal-ctags}/bin/ctags" - "--with-posix-sort=${coreutils}/bin/sort" - ]; - - doCheck = true; - - postInstall = '' - mkdir -p "$out/share/emacs/site-lisp" - cp -v *.el "$out/share/emacs/site-lisp" - - wrapProgram $out/bin/gtags \ - --prefix PYTHONPATH : "$(toPythonPath ${pygments})" - wrapProgram $out/bin/global \ - --prefix PYTHONPATH : "$(toPythonPath ${pygments})" - ''; - - meta = with lib; { - description = "Source code tag system"; - longDescription = '' - GNU GLOBAL is a source code tagging system that works the same way - across diverse environments (Emacs, vi, less, Bash, web browser, etc). - You can locate specified objects in source files and move there easily. - It is useful for hacking a large project containing many - subdirectories, many #ifdef and many main() functions. It is similar - to ctags or etags but is different from them at the point of - independence of any editor. It runs on a UNIX (POSIX) compatible - operating system like GNU and BSD. - ''; - homepage = "https://www.gnu.org/software/global/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ pSub peterhoeg ]; - platforms = platforms.unix; - changelog = "https://cvs.savannah.gnu.org/viewvc/global/global/NEWS?view=markup&pathrev=VERSION-${lib.replaceStrings [ "." ] [ "_" ] version}"; - }; -} diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix deleted file mode 100644 index 5dea7f059557..000000000000 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchurl }: - -# 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 { - pname = "gnum4"; - version = "1.4.19"; - - src = fetchurl { - url = "mirror://gnu/m4/m4-${version}.tar.bz2"; - sha256 = "sha256-swapHA/ZO8QoDPwumMt6s5gf91oYe+oyk4EfRSyJqMg="; - }; - - # https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-devel/m4/m4-1.4.19-r1.ebuild - patches = lib.optional stdenv.hostPlatform.isLoongArch64 ./loong-fix-build.patch; - # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion - # necessary for FreeBSD code path in configure - postPatch = '' - substituteInPlace ./build-aux/config.guess --replace-fail /usr/bin/uname uname - '' + lib.optionalString stdenv.hostPlatform.isLoongArch64 '' - touch ./aclocal.m4 ./lib/config.hin ./configure ./doc/stamp-vti || die - find . -name Makefile.in -exec touch {} + || die - ''; - - strictDeps = true; - - enableParallelBuilding = true; - - doCheck = false; - - configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ] - ++ lib.optional stdenv.hostPlatform.isMinGW "CFLAGS=-fno-stack-protector"; - - meta = { - description = "GNU M4, a macro processor"; - longDescription = '' - GNU M4 is an implementation of the traditional Unix macro - processor. It is mostly SVR4 compatible although it has some - extensions (for example, handling more than 9 positional - parameters to macros). GNU M4 also has built-in functions for - including files, running shell commands, doing arithmetic, etc. - - GNU M4 is a macro processor in the sense that it copies its - input to the output expanding macros as it goes. Macros are - either builtin or user-defined and can take any number of - arguments. Besides just doing macro expansion, m4 has builtin - functions for including named files, running UNIX commands, - doing integer arithmetic, manipulating text in various ways, - recursion etc... m4 can be used either as a front-end to a - compiler or as a macro processor in its own right. - ''; - homepage = "https://www.gnu.org/software/m4/"; - - license = lib.licenses.gpl3Plus; - mainProgram = "m4"; - platforms = lib.platforms.unix ++ lib.platforms.windows; - }; - -} diff --git a/pkgs/development/tools/misc/gnum4/loong-fix-build.patch b/pkgs/development/tools/misc/gnum4/loong-fix-build.patch deleted file mode 100644 index d5243357928b..000000000000 --- a/pkgs/development/tools/misc/gnum4/loong-fix-build.patch +++ /dev/null @@ -1,30 +0,0 @@ -[xen0n: this is https://github.com/sunhaiyong1978/CLFS-for-LoongArch/blob/1.0/patches/stack-direction-add-loongarch.patch with line number tweak, and change to generated file added as well.] -From: Sun Haiyong <youbest@sina.com> -Date: Tue, 31 Aug 2021 11:11:52 +0800 -Subject: [PATCH] stack-direction: Add support for loongarch CPU - -* m4/stack-direction.m4 (SV_STACK_DIRECTION): When the CPU is loongarch, -set "sv_cv_stack_direction" to "-1" . ---- a/m4/stack-direction.m4 -+++ b/m4/stack-direction.m4 -@@ -31,6 +31,7 @@ AC_DEFUN([SV_STACK_DIRECTION], - i?86 | x86_64 | \ - i860 | \ - ia64 | \ -+ loongarch* | \ - m32r | \ - m68* | \ - m88k | \ ---- a/configure -+++ b/configure -@@ -46399,6 +46399,7 @@ else $as_nop - i?86 | x86_64 | \ - i860 | \ - ia64 | \ -+ loongarch* | \ - m32r | \ - m68* | \ - m88k | \ --- -2.17.2 - diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/development/tools/misc/go-license-detector/default.nix deleted file mode 100644 index a59b55be975d..000000000000 --- a/pkgs/development/tools/misc/go-license-detector/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, git }: - -buildGoModule rec { - pname = "go-license-detector"; - version = "4.3.1"; - - src = fetchFromGitHub { - owner = "go-enry"; - repo = pname; - rev = "v${version}"; - hash = "sha256-S9LKXjn5dL5FETOOAk+bs7bIVdu2x7MIhfjpZuXzuLo="; - }; - - vendorHash = "sha256-MtQsUsFd9zQGbP7NGZ4zcSoa6O2WSWvGig0GUwCc6uM="; - - nativeCheckInputs = [ git ]; - - meta = with lib; { - description = "Reliable project licenses detector"; - homepage = "https://github.com/go-enry/go-license-detector"; - license = licenses.asl20; - maintainers = [ ]; - mainProgram = "license-detector"; - }; -} diff --git a/pkgs/development/tools/misc/go-licenses/default.nix b/pkgs/development/tools/misc/go-licenses/default.nix deleted file mode 100644 index 6d1e6dce1609..000000000000 --- a/pkgs/development/tools/misc/go-licenses/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, go -, installShellFiles -, makeWrapper -}: - -buildGoModule rec { - pname = "go-licenses"; - version = "1.6.0"; - - src = fetchFromGitHub { - owner = "google"; - repo = "go-licenses"; - rev = "refs/tags/v${version}"; - hash = "sha256-GAlwTVoVA+n9+EfhybmpKm16FoY9kFzrxy1ZQxS6A8E="; - }; - - vendorHash = "sha256-ToRn2wj7Yi+UDJwvAhV0ACEhqlcQjt4bRpz7abNRt9A="; - - patches = [ - # Without this, we get error messages like: - # vendor/golang.org/x/sys/unix/syscall.go:83:16: unsafe.Slice requires go1.17 or later (-lang was set to go1.16; check go.mod) - # The patch was generated by changing "go 1.16" to "go 1.17" and executing `go mod tidy`. - ./fix-go-version-error.patch - ]; - - nativeBuildInputs = [ - installShellFiles - makeWrapper - ]; - - subPackages = [ "." ]; - - allowGoReference = true; - - postInstall = '' - installShellCompletion --cmd go-licenses \ - --bash <("$out/bin/go-licenses" completion bash) \ - --fish <("$out/bin/go-licenses" completion fish) \ - --zsh <("$out/bin/go-licenses" completion zsh) - - # workaround empty output when GOROOT differs from built environment - # see https://github.com/google/go-licenses/issues/149 - wrapProgram "$out/bin/go-licenses" \ - --set GOROOT '${go}/share/go' - ''; - - # Tests require internet connection - doCheck = false; - - meta = with lib; { - changelog = "https://github.com/google/go-licenses/releases/tag/v${version}"; - description = "Reports on the licenses used by a Go package and its dependencies"; - mainProgram = "go-licenses"; - homepage = "https://github.com/google/go-licenses"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ Luflosi ]; - }; -} diff --git a/pkgs/development/tools/misc/go-licenses/fix-go-version-error.patch b/pkgs/development/tools/misc/go-licenses/fix-go-version-error.patch deleted file mode 100644 index 1e102636dd45..000000000000 --- a/pkgs/development/tools/misc/go-licenses/fix-go-version-error.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/go.mod b/go.mod -index 7e3d596..d90b393 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,27 +1,50 @@ - module github.com/google/go-licenses - --go 1.16 -+go 1.17 - - require ( -- cloud.google.com/go/iam v0.4.0 // indirect -- github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/google/go-cmp v0.5.8 - github.com/google/go-replayers/httpreplay v1.1.1 - github.com/google/licenseclassifier v0.0.0-20210722185704-3043a050f148 -- github.com/kr/text v0.2.0 // indirect -- github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect - github.com/otiai10/copy v1.6.0 -- github.com/pkg/errors v0.9.1 // indirect -- github.com/sergi/go-diff v1.2.0 // indirect - github.com/spf13/cobra v1.6.0 -- github.com/stretchr/testify v1.8.0 // indirect - go.opencensus.io v0.23.0 -- golang.org/x/crypto v0.1.0 // indirect - golang.org/x/mod v0.7.0 - golang.org/x/net v0.5.0 - golang.org/x/text v0.6.0 - golang.org/x/tools v0.5.0 -- gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect - gopkg.in/src-d/go-git.v4 v4.13.1 - k8s.io/klog/v2 v2.80.1 - ) -+ -+require ( -+ cloud.google.com/go v0.102.1 // indirect -+ cloud.google.com/go/iam v0.4.0 // indirect -+ cloud.google.com/go/storage v1.22.1 // indirect -+ github.com/emirpasic/gods v1.12.0 // indirect -+ github.com/go-logr/logr v1.2.0 // indirect -+ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect -+ github.com/google/martian/v3 v3.3.2 // indirect -+ github.com/inconshreveable/mousetrap v1.0.1 // indirect -+ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect -+ github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect -+ github.com/kr/text v0.2.0 // indirect -+ github.com/mitchellh/go-homedir v1.1.0 // indirect -+ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect -+ github.com/pkg/errors v0.9.1 // indirect -+ github.com/sergi/go-diff v1.2.0 // indirect -+ github.com/spf13/pflag v1.0.5 // indirect -+ github.com/src-d/gcfg v1.4.0 // indirect -+ github.com/stretchr/testify v1.8.0 // indirect -+ github.com/xanzy/ssh-agent v0.2.1 // indirect -+ golang.org/x/crypto v0.1.0 // indirect -+ golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 // indirect -+ golang.org/x/sys v0.4.0 // indirect -+ google.golang.org/api v0.93.0 // indirect -+ google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959 // indirect -+ google.golang.org/grpc v1.48.0 // indirect -+ google.golang.org/protobuf v1.28.1 // indirect -+ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect -+ gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect -+ gopkg.in/warnings.v0 v0.1.2 // indirect -+) diff --git a/pkgs/development/tools/misc/go-md2man/default.nix b/pkgs/development/tools/misc/go-md2man/default.nix deleted file mode 100644 index ee8b8d38b565..000000000000 --- a/pkgs/development/tools/misc/go-md2man/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "go-md2man"; - version = "2.0.4"; - - vendorHash = "sha256-aMLL/tmRLyGze3RSB9dKnoTv5ZK1eRtgV8fkajWEbU0="; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "cpuguy83"; - repo = "go-md2man"; - sha256 = "sha256-pQ+H8Psh92KWTang8hK0cHFLomH+4X0rMMilIJUQ4Qc="; - }; - - meta = with lib; { - description = "Go tool to convert markdown to man pages"; - mainProgram = "go-md2man"; - license = licenses.mit; - homepage = "https://github.com/cpuguy83/go-md2man"; - maintainers = with maintainers; [offline]; - }; -} diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix deleted file mode 100644 index deef55569e90..000000000000 --- a/pkgs/development/tools/misc/gob2/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, bison, flex, gnome }: - -stdenv.mkDerivation rec { - pname = "gob2"; - version = "2.0.20"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "5fe5d7990fd65b0d4b617ba894408ebaa6df453f2781c15a1cfdf2956c0c5428"; - }; - - # configure script looks for d-bus but it is only needed for tests - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib bison flex ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; - }; - }; - - meta = { - description = "Preprocessor for making GObjects with inline C code"; - mainProgram = "gob2"; - homepage = "https://www.jirka.org/gob.html"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/gopatch/default.nix b/pkgs/development/tools/misc/gopatch/default.nix deleted file mode 100644 index 276176c2d65a..000000000000 --- a/pkgs/development/tools/misc/gopatch/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, testers -, gopatch -}: - -buildGoModule rec { - pname = "gopatch"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "uber-go"; - repo = "gopatch"; - rev = "v${version}"; - hash = "sha256-zP5zC71icrVvzKzBBlxfX9h5JlKd89cf32Q6eZatX44="; - }; - - vendorHash = "sha256-ZHXzaR8pd6kApY3PBl9GV1iRc2jdDHMfewDn1j9npjc="; - - subPackages = [ - "." - ]; - - ldflags = [ - "-s" - "-w" - "-X=main._version=${version}" - ]; - - passthru.tests = { - version = testers.testVersion { - package = gopatch; - }; - }; - - meta = with lib; { - description = "Refactoring and code transformation tool for Go"; - mainProgram = "gopatch"; - homepage = "https://github.com/uber-go/gopatch"; - changelog = "https://github.com/uber-go/gopatch/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/gpuvis/default.nix b/pkgs/development/tools/misc/gpuvis/default.nix deleted file mode 100644 index ad2d36e25021..000000000000 --- a/pkgs/development/tools/misc/gpuvis/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ fetchFromGitHub -, freetype -, gtk3 -, lib -, meson -, ninja -, pkg-config -, SDL2 -, stdenv -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "gpuvis"; - version = "0.1"; - - src = fetchFromGitHub { - owner = "mikesart"; - repo = pname; - rev = "v${version}"; - hash = "sha256-a9eAYDsiwyzZc4FAPo0wANysisIT4qCHLh2PrYswJtw="; - }; - - # patch dlopen path for gtk3 - postPatch = '' - substituteInPlace src/hook_gtk3.h \ - --replace "libgtk-3.so" "${lib.getLib gtk3}/lib/libgtk-3.so" - ''; - - nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook3 ]; - - buildInputs = [ SDL2 gtk3 freetype ]; - - CXXFLAGS = [ - # GCC 13: error: 'uint32_t' has not been declared - "-include cstdint" - ]; - - meta = with lib; { - description = "GPU Trace Visualizer"; - mainProgram = "gpuvis"; - homepage = "https://github.com/mikesart/gpuvis"; - license = licenses.mit; - maintainers = with maintainers; [ emantor ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/misc/grcov/default.nix b/pkgs/development/tools/misc/grcov/default.nix deleted file mode 100644 index d097f389deb9..000000000000 --- a/pkgs/development/tools/misc/grcov/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "grcov"; - version = "0.8.19"; - - src = fetchFromGitHub { - owner = "mozilla"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-1t+hzB9sSApLScCkjBnLk9i2dsoEwZmWCFukEOvHhZI="; - }; - - cargoHash = "sha256-4KzFbfUqnGmle2fwSaHMPIJHQFDq8H2Qzm4FdYdqpuM="; - - # tests do not find grcov path correctly - checkFlags = let - skipList = [ - "test_coveralls_service_job_id_is_not_sufficient" - "test_coveralls_service_name_is_not_sufficient" - "test_coveralls_works_with_just_service_name_and_job_id_args" - "test_coveralls_works_with_just_token_arg" - "test_integration" - "test_integration_guess_single_file" - "test_integration_zip_dir" - "test_integration_zip_zip" - ]; - skipFlag = test: "--skip " + test; - in builtins.concatStringsSep " " (builtins.map skipFlag skipList); - - meta = with lib; { - description = - "Rust tool to collect and aggregate code coverage data for multiple source files"; - mainProgram = "grcov"; - homepage = "https://github.com/mozilla/grcov"; - license = licenses.mpl20; - maintainers = with maintainers; [ DieracDelta ]; - }; -} diff --git a/pkgs/development/tools/misc/grpc-client-cli/default.nix b/pkgs/development/tools/misc/grpc-client-cli/default.nix deleted file mode 100644 index 19cc8803cee4..000000000000 --- a/pkgs/development/tools/misc/grpc-client-cli/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "grpc-client-cli"; - version = "1.20.3"; - - src = fetchFromGitHub { - owner = "vadimi"; - repo = "grpc-client-cli"; - rev = "v${version}"; - sha256 = "sha256-aPmHvi81jqRKO3aY6bZ9bMJmk/HZVl/8MAUZN3QJByQ="; - }; - - vendorHash = "sha256-ruC/JE4+ftkzmgDxg2bRxTszjBtDtKQQGvyFD9H0O3I="; - - meta = with lib; { - description = "generic gRPC command line client"; - mainProgram = "grpc-client-cli"; - maintainers = with maintainers; [ Philipp-M ]; - homepage = "https://github.com/vadimi/grpc-client-cli"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/tools/misc/grpc-tools/default.nix b/pkgs/development/tools/misc/grpc-tools/default.nix deleted file mode 100644 index 5c21f8a0f415..000000000000 --- a/pkgs/development/tools/misc/grpc-tools/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, cmake -, fetchFromGitHub -, gitUpdater -}: - -stdenv.mkDerivation rec { - pname = "grpc-tools"; - version = "1.12.4"; - - src = fetchFromGitHub { - owner = "grpc"; - repo = "grpc-node"; - rev = "grpc-tools@${version}"; - hash = "sha256-708lBIGW5+vvSTrZHl/kc+ck7JKNXElrghIGDrMSyx8="; - fetchSubmodules = true; - }; - - sourceRoot = "${src.name}/packages/grpc-tools"; - - nativeBuildInputs = [ cmake ]; - - installPhase = '' - install -Dm755 -t $out/bin grpc_node_plugin - install -Dm755 -t $out/bin deps/protobuf/protoc - ''; - - passthru.updateScript = gitUpdater { - url = "https://github.com/grpc/grpc-node.git"; - rev-prefix = "grpc-tools@"; - }; - - meta = with lib; { - description = "Distribution of protoc and the gRPC Node protoc plugin for ease of installation with npm"; - longDescription = '' - This package distributes the Protocol Buffers compiler protoc along with - the plugin for generating client and service objects for use with the Node - gRPC libraries. - ''; - homepage = "https://github.com/grpc/grpc-node/tree/master/packages/grpc-tools"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = [ maintainers.nzhang-zh ]; - }; -} diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix deleted file mode 100644 index 378cdb5705d2..000000000000 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{lib, stdenv, fetchurl, fetchpatch, gtk2, pkg-config }: - -stdenv.mkDerivation rec { - pname = "gtkdialog"; - version = "0.8.3"; - - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e"; - }; - patches = [ - # Pull Gentoo patch for -fno-common toolchain fix. - (fetchpatch { - name = "fno-common.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fno-common.patch?id=98692e4c4ad494b88c4902ca1ab3e6541190bbe8"; - sha256 = "1mh01krzpfy7lbbqx3xm71xsiqqgg67w4snv794wspfqkk2hicvz"; - }) - ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 ]; - - meta = { - homepage = "https://code.google.com/archive/p/gtkdialog/"; - # community links: http://murga-linux.com/puppy/viewtopic.php?t=111923 -> https://github.com/01micko/gtkdialog - description = "Small utility for fast and easy GUI building from many scripted and compiled languages"; - mainProgram = "gtkdialog"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch b/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch deleted file mode 100644 index 82f8cf1cb37b..000000000000 --- a/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch +++ /dev/null @@ -1,165 +0,0 @@ -LD_PRELOAD by itself only works with Cygwin builtin functions, but -textdomain() and friends come from libintl. In order to override -those functions, we have to "replace" cygintl-?.dll since functions are -bound to a DLL name at link time. Our replacement will be used since -it is loaded first by LD_PRELOAD. - -But as we are making this *the* libintl, we need to provide -pass-throughs for the other functions which we're not overriding, -otherwise Locale::gettext won't load (not to mention the program -that we're trying to help2man). - ---- help2man-1.46.5/Makefile.in 2014-10-09 13:03:01.000000000 +0200 -+++ help2man-1.46.5/Makefile.in 2015-05-12 14:46:52.995521900 +0200 -@@ -76,7 +76,8 @@ - fi - - install_preload: install_dirs preload -- $(INSTALL_PROGRAM) $(preload).so $(DESTDIR)$(pkglibdir) -+ $(INSTALL_PROGRAM) lib/cygintl-9.dll $(DESTDIR)$(pkglibdir) -+ ln -sf cygintl-9.dll $(DESTDIR)$(pkglibdir)/$(preload).so - - install_l10n: install_dirs msg_l10n man_l10n info_l10n - set -e; \ -@@ -144,7 +146,9 @@ - - preload: $(preload).so - $(preload).so: $(srcdir)/$(preload).c -- $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -fPIC -shared $? $(LIBS) -+ mkdir -p lib -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o lib/cygintl-9.dll -shared $? $(LIBS) -+ ln -sf lib/cygintl-9.dll $@ - - man: $(target).1 - $(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m.PL ---- help2man-1.46.5/bindtextdomain.c 2009-11-13 00:01:34.000000000 -0600 -+++ help2man-1.46.5/bindtextdomain.c 2011-12-29 00:24:33.608078600 -0600 -@@ -27,12 +27,34 @@ static char *(*r_textdomain)(char const - static char *(*r_bindtextdomain)(char const *, char const *) = 0; - static char *(*r_bind_textdomain_codeset)(char const *, char const *) = 0; - -+#ifdef __CYGWIN__ -+static void *RTLD_NEXT = 0; -+static char *(*r_gettext)(const char *) = 0; -+static char *(*r_dgettext)(const char *, const char *) = 0; -+static char *(*r_dcgettext)(const char *, const char *, int) = 0; -+static char *(*r_ngettext)(const char *, const char *, unsigned long int) = 0; -+static char *(*r_dngettext)(const char *, const char *, const char *, -+ unsigned long int) = 0; -+static char *(*r_dcngettext)(const char *, const char *, const char *, -+ unsigned long int, int) = 0; -+static char *(*r_setlocale)(int, const char *) = 0; -+ -+#define SYM(sym) libintl_ ## sym -+#else -+#define SYM(sym) sym -+#endif -+ - void setup() - { - static int done = 0; - if (done++) - return; - -+#ifdef __CYGWIN__ -+ if (!(RTLD_NEXT = dlopen("/usr/bin/cygintl-9.dll", RTLD_LAZY))) -+ die("libintl8 not found"); -+#endif -+ - if (!(e_textdomain = getenv("TEXTDOMAIN"))) - die("TEXTDOMAIN not set"); - -@@ -48,9 +70,19 @@ void setup() - if (!(r_bind_textdomain_codeset = dlsym(RTLD_NEXT, - "bind_textdomain_codeset"))) - die("can't find symbol \"bind_textdomain_codeset\""); -+ -+#ifdef __CYGWIN__ -+ r_gettext = dlsym(RTLD_NEXT, "libintl_gettext"); -+ r_dgettext = dlsym(RTLD_NEXT, "libintl_dgettext"); -+ r_dcgettext = dlsym(RTLD_NEXT, "libintl_dcgettext"); -+ r_ngettext = dlsym(RTLD_NEXT, "libintl_ngettext"); -+ r_dngettext = dlsym(RTLD_NEXT, "libintl_dngettext"); -+ r_dcngettext = dlsym(RTLD_NEXT, "libintl_dcngettext"); -+ r_setlocale = dlsym(RTLD_NEXT, "libintl_setlocale"); -+#endif - } - --char *textdomain(char const *domainname) -+char *SYM(textdomain)(char const *domainname) - { - char *r; - setup(); -@@ -61,7 +93,7 @@ char *textdomain(char const *domainname) - return r; - } - --char *bindtextdomain(char const *domainname, char const *dirname) -+char *SYM(bindtextdomain)(char const *domainname, char const *dirname) - { - char const *dir = dirname; - setup(); -@@ -71,7 +103,7 @@ char *bindtextdomain(char const *domainn - return r_bindtextdomain(domainname, dir); - } - --char *bind_textdomain_codeset(char const *domainname, char const *codeset) -+char *SYM(bind_textdomain_codeset)(char const *domainname, char const *codeset) - { - char *r; - setup(); -@@ -81,3 +113,54 @@ char *bind_textdomain_codeset(char const - - return r; - } -+ -+#ifdef __CYGWIN__ -+ -+char *libintl_gettext(const char *msgid) -+{ -+ setup(); -+ return r_gettext(msgid); -+} -+ -+char *libintl_dgettext (const char *domainname, const char *msgid) -+{ -+ setup(); -+ return r_dgettext(domainname, msgid); -+} -+ -+char *libintl_dcgettext (const char *domainname, const char *msgid, -+ int category) -+{ -+ setup(); -+ return r_dcgettext (domainname, msgid, category); -+} -+ -+char *libintl_ngettext (const char *msgid1, const char *msgid2, -+ unsigned long int n) -+{ -+ setup(); -+ return r_ngettext (msgid1, msgid2, n); -+} -+ -+char *libintl_dngettext (const char *domainname, const char *msgid1, -+ const char *msgid2, unsigned long int n) -+{ -+ setup(); -+ return r_dngettext (domainname, msgid1, msgid2, n); -+} -+ -+char *libintl_dcngettext (const char *domainname, -+ const char *msgid1, const char *msgid2, -+ unsigned long int n, int category) -+{ -+ setup(); -+ return r_dcngettext (domainname, msgid1, msgid2, n, category); -+} -+ -+char *libintl_setlocale (int i, const char *s) -+{ -+ setup(); -+ return r_setlocale (i, s); -+} -+ -+#endif diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix deleted file mode 100644 index 9fd35a094db8..000000000000 --- a/pkgs/development/tools/misc/help2man/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv, fetchurl, perlPackages, gettext, libintl }: - -# 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 { - pname = "help2man"; - version = "1.49.3"; - - src = fetchurl { - url = "mirror://gnu/help2man/help2man-${version}.tar.xz"; - sha256 = "sha256-TX5P3vLspq/geiaCFRzqeHgeCk6PliIULZ9wwIOi/U8="; - }; - - strictDeps = true; - - enableParallelBuilding = true; - - nativeBuildInputs = [ gettext perlPackages.perl perlPackages.LocaleGettext ]; - buildInputs = [ perlPackages.LocaleGettext libintl ]; - - configureFlags = [ - "--enable-nls" - ]; - - doCheck = false; # target `check' is missing - - patches = lib.optional stdenv.hostPlatform.isCygwin ./1.40.4-cygwin-nls.patch; - - # We don't use makeWrapper here because it uses substitutions our - # bootstrap shell can't handle. - postInstall = '' - mv $out/bin/help2man $out/bin/.help2man-wrapped - cat > $out/bin/help2man <<EOF - #! $SHELL -e - export PERL5LIB=\''${PERL5LIB:+:}${perlPackages.LocaleGettext}/${perlPackages.perl.libPrefix} - ${lib.optionalString stdenv.hostPlatform.isCygwin ''export PATH=\''${PATH:+:}${gettext}/bin''} - exec -a \$0 $out/bin/.help2man-wrapped "\$@" - EOF - chmod +x $out/bin/help2man - ''; - - meta = with lib; { - description = "Generate man pages from `--help' output"; - mainProgram = "help2man"; - longDescription = '' - help2man produces simple manual pages from the ‘--help’ and ‘--version’ output of other commands. - ''; - homepage = "https://www.gnu.org/software/help2man/"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ pSub ]; - }; -} diff --git a/pkgs/development/tools/misc/highlight-assertions/default.nix b/pkgs/development/tools/misc/highlight-assertions/default.nix deleted file mode 100644 index b2f595cb01ba..000000000000 --- a/pkgs/development/tools/misc/highlight-assertions/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "highlight-assertions"; - version = "0.1.7"; - - src = fetchFromGitHub { - owner = "thehamsta"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-7r8tBJ6JFGUGUsTivzlO23hHiXISajjn2WF12mmbmMg="; - }; - - cargoHash = "sha256-E2TNwCry7JOWy50+iLM9d+Tx4lIO6hkBtaHVLV8bDuo="; - - # requires nightly features - RUSTC_BOOTSTRAP = 1; - - meta = with lib; { - description = "Tool for unit testing tree sitter highlights for nvim-treesitter"; - mainProgram = "highlight-assertions"; - homepage = "https://github.com/thehamsta/highlight-assertions"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix deleted file mode 100644 index 6e3124556f54..000000000000 --- a/pkgs/development/tools/misc/hound/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, makeWrapper -, mercurial -, git -, openssh -, nixosTests -, fetchpatch -}: - -buildGoModule rec { - pname = "hound"; - version = "0.7.1"; - - src = fetchFromGitHub { - owner = "hound-search"; - repo = "hound"; - rev = "v${version}"; - sha256 = "sha256-Qdk57zLjTXLdDEmB6K+sZAym5s0BekJJa/CpYeOBOcY="; - }; - - patches = [ - # add check config flag - # https://github.com/hound-search/hound/pull/485/files - (fetchpatch { - url = "https://github.com/MarcelCoding/hound/commit/b2f1cef335eff235394de336593687236a3b88bb.patch"; - hash = "sha256-3+EBvnA8JIx2P6YM+8LpojDIX7hNXJ0vwVN4oSAouZ4="; - }) - (fetchpatch { - url = "https://github.com/MarcelCoding/hound/commit/f917a457570ad8659d02fca4311cc91cadcadc00.patch"; - hash = "sha256-CGvcIoSbgiayli5B8JRjvGfLuH2fscNpNTEm7xwkfpo="; - }) - ]; - - vendorHash = "sha256-0psvz4bnhGuwwSAXvQp0ju0GebxoUyY2Rjp/D43KF78="; - - nativeBuildInputs = [ makeWrapper ]; - - # requires network access - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/houndd --prefix PATH : ${lib.makeBinPath [ mercurial git openssh ]} - ''; - - passthru.tests = { inherit (nixosTests) hound; }; - - meta = with lib; { - description = "Lightning fast code searching made easy"; - homepage = "https://github.com/hound-search/hound"; - license = licenses.mit; - maintainers = with maintainers; [ grahamc SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/tools/misc/httpref/default.nix b/pkgs/development/tools/misc/httpref/default.nix deleted file mode 100644 index f2c0f58a3094..000000000000 --- a/pkgs/development/tools/misc/httpref/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "httpref"; - version = "1.6.1"; - - src = fetchFromGitHub { - owner = "dnnrly"; - repo = "httpref"; - rev = "v${version}"; - hash = "sha256-T5fR9cyqsM6Kw6kFqZedoSxyvFkkxNpuErscwiUTMa0="; - }; - - vendorHash = "sha256-9Ei4Lfll79f/+iuO5KesUMaTgkS9nq+1tma/dhOZ7Qw="; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Command line, offline, access to HTTP status code, common header, and port references"; - mainProgram = "httpref"; - homepage = "https://github.com/dnnrly/httpref"; - changelog = "https://github.com/dnnrly/httpref/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/husky/default.nix b/pkgs/development/tools/misc/husky/default.nix deleted file mode 100644 index cd613b925b2d..000000000000 --- a/pkgs/development/tools/misc/husky/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildNpmPackage, fetchFromGitHub }: - -buildNpmPackage rec { - pname = "husky"; - version = "8.0.3"; - - src = fetchFromGitHub { - owner = "typicode"; - repo = "husky"; - rev = "v${version}"; - hash = "sha256-KoF2+vikgFyCGjfKeaqkC720UVMuvCIn9ApDPKbudsA="; - }; - - npmDepsHash = "sha256-u1dndTKvInobva+71yI2vPiwrW9vqzAJ2sDAqT9YJsg="; - - meta = with lib; { - description = "Git hooks made easy 🐶 woof!"; - mainProgram = "husky"; - homepage = "https://github.com/typicode/husky"; - changelog = "https://github.com/typicode/husky/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ dit7ya ]; - }; -} diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix deleted file mode 100644 index 527362114851..000000000000 --- a/pkgs/development/tools/misc/hydra-cli/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - pkg-config, - openssl, - stdenv, - darwin, - testers, - hydra-cli, -}: - -rustPlatform.buildRustPackage rec { - pname = "hydra-cli"; - version = "0.3.0-unstable-2023-12-20"; - - src = fetchFromGitHub { - owner = "nlewo"; - repo = "hydra-cli"; - rev = "dbb6eaa45c362969382bae7142085be769fa14e6"; - hash = "sha256-6L+5rkXzjXH9JtLsrJkuV8ZMsm64Q+kcb+2pr1coBK4="; - }; - - sourceRoot = "${src.name}/hydra-cli"; - - cargoHash = "sha256-WokdTMNA7MrbFcKNeFIRU2Tw6LyM80plDoZPX1v/hrc="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - - __darwinAllowLocalNetworking = true; - - 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 lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ - lewo - aleksana - ]; - }; -} diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/pkgs/development/tools/misc/icon-naming-utils/default.nix deleted file mode 100644 index 930327a880db..000000000000 --- a/pkgs/development/tools/misc/icon-naming-utils/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{lib, stdenv, fetchurl, perl, librsvg}: - -stdenv.mkDerivation rec { - pname = "icon-naming-utils"; - version = "0.8.90"; - - src = fetchurl { - url = "http://tango.freedesktop.org/releases/${pname}-${version}.tar.gz"; - sha256 = "071fj2jm5kydlz02ic5sylhmw6h2p3cgrm3gwdfabinqkqcv4jh4"; - }; - - buildInputs = [ librsvg (perl.withPackages (p: [ p.XMLSimple ])) ]; - - meta = with lib; { - homepage = "http://tango.freedesktop.org/Standard_Icon_Naming_Specification"; - platforms = with platforms; linux ++ darwin; - license = licenses.gpl2; - }; -} diff --git a/pkgs/development/tools/misc/igprof/default.nix b/pkgs/development/tools/misc/igprof/default.nix deleted file mode 100644 index fc2036ec9bbd..000000000000 --- a/pkgs/development/tools/misc/igprof/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{lib, stdenv, fetchFromGitHub, libunwind, cmake, pcre, gdb}: - -stdenv.mkDerivation rec { - version = "5.9.18"; - pname = "igprof"; - - src = fetchFromGitHub { - owner = "igprof"; - repo = "igprof"; - rev = "v${version}"; - sha256 = "sha256-UTrAaH8C79km78Z/7NxvQ6dnl4u4Ki80nORf4bsoSNw="; - }; - - postPatch = '' - substituteInPlace src/igprof --replace libigprof.so $out/lib/libigprof.so - ''; - - buildInputs = [libunwind gdb pcre]; - nativeBuildInputs = [cmake]; - CXXFLAGS = ["-fPIC" "-O2" "-w" "-fpermissive"]; - - meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); - description = "Ignominous Profiler"; - - longDescription = '' - IgProf is a fast and light weight profiler. It correctly handles - dynamically loaded shared libraries, threads and sub-processes started by - the application. We have used it routinely with large C++ applications - consisting of many hundreds of shared libraries and thousands of symbols - from millions of source lines of code. It requires no special privileges - to run. The performance reports provide full navigable call stacks and - can be customised by applying filters. Results from any number of - profiling runs can be included. This means you can both dig into the - details and see the big picture from combined workloads. - ''; - - license = lib.licenses.gpl2; - - homepage = "https://igprof.org/"; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ktf ]; - }; -} diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix deleted file mode 100644 index 8a371a56a3ff..000000000000 --- a/pkgs/development/tools/misc/indent/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, libintl -, texinfo -, buildPackages -, pkgsStatic -}: - -stdenv.mkDerivation rec { - pname = "indent"; - version = "2.2.13"; - - src = fetchurl { - url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-nmRjT8TOZ5eyBLy4iXzhT90KtIyldpb3h2fFnK5XgJU="; - }; - - patches = [ - (fetchpatch { - name = "CVE-2023-40305.part-1.patch"; - url = "https://git.savannah.gnu.org/cgit/indent.git/patch/?id=df4ab2d19e247d059e0025789ba513418073ab6f"; - hash = "sha256-OLXBlYTdEuFK8SIsyC5Xr/hHWlvXiRqY2h79w+H5pGk="; - }) - (fetchpatch { - name = "CVE-2023-40305.part-2.patch"; - url = "https://git.savannah.gnu.org/cgit/indent.git/patch/?id=2685cc0bef0200733b634932ea7399b6cf91b6d7"; - hash = "sha256-t+QF7N1aqQ28J2O8esZ2bc5K042cUuZR4MeMeuWIgPw="; - }) - ]; - - # avoid https://savannah.gnu.org/bugs/?64751 - postPatch = '' - sed -E -i '/output\/else-comment-2-br(-ce)?.c/d' regression/TEST - sed -E -i 's/else-comment-2-br(-ce)?.c//g' regression/TEST - ''; - - makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" ]; - - strictDeps = true; - nativeBuildInputs = [ texinfo ]; - buildInputs = [ libintl ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed when cross-compiling - - env.NIX_CFLAGS_COMPILE = toString ( - lib.optional stdenv.cc.isClang "-Wno-implicit-function-declaration" - ++ lib.optional (stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc) "13") "-Wno-unused-but-set-variable" - ); - - hardeningDisable = [ "format" ]; - - doCheck = true; - - passthru.tests.static = pkgsStatic.indent; - meta = { - homepage = "https://www.gnu.org/software/indent/"; - description = "Source code reformatter"; - mainProgram = "indent"; - license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.mmahut ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix deleted file mode 100644 index e8536ea784f3..000000000000 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, autoreconfHook, fetchFromGitHub, nix-update-script, fanotifySupport ? true }: - -stdenv.mkDerivation (finalAttrs: { - pname = "inotify-tools"; - version = "4.23.9.0"; - - src = fetchFromGitHub { - repo = "inotify-tools"; - owner = "inotify-tools"; - rev = finalAttrs.version; - hash = "sha256-6kM2JzxRcwUjUmbUWGnQ+gAvZcn7C32/enRwiYiuQGU="; - }; - - configureFlags = [ - (lib.enableFeature fanotifySupport "fanotify") - ]; - - nativeBuildInputs = [ autoreconfHook ]; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - homepage = "https://github.com/inotify-tools/inotify-tools/wiki"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ marcweber pSub shamilton ]; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix deleted file mode 100644 index 7c26da46b203..000000000000 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ /dev/null @@ -1,117 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, fetchpatch - -# build time -, bison -, docbook_xsl -, docutils -, flex -, gtk-doc -, meson -, ninja -, pkg-config -, utilmacros - -# runtime -, alsa-lib -, cairo -, curl -, elfutils -, glib -, gsl -, json_c -, kmod -, libdrm -, liboping -, libpciaccess -, libunwind -, libX11 -, libXext -, libXrandr -, libXv -, openssl -, peg -, procps -, python3 -, udev -, valgrind -, xmlrpc_c -, xorgproto -}: - -stdenv.mkDerivation rec { - pname = "intel-gpu-tools"; - version = "1.29"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "drm"; - repo = "igt-gpu-tools"; - rev = "refs/tags/v${version}"; - hash = "sha256-t6DeFmIgTomMNwE53n5JicnvuCd/QfpNYWCdwPwc30E="; - }; - - patches = [ - (fetchpatch { - name = "basename.patch"; - url = "https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/604dec781ef283885f65968358bd9ae88c5193c3.patch"; - hash = "sha256-zU6U9uuTDvuADVYmT9sMYA85Xgtvqgy378LvWFDVEJw="; - }) - ]; - - nativeBuildInputs = [ - bison - docbook_xsl - docutils - flex - gtk-doc - meson - ninja - pkg-config - utilmacros - ]; - - buildInputs = [ - alsa-lib - cairo - curl - elfutils - glib - gsl - json_c - kmod - libdrm - liboping - libpciaccess - libunwind - libX11 - libXext - libXrandr - libXv - openssl - peg - procps - python3 - udev - valgrind - xmlrpc_c - xorgproto - ]; - - preConfigure = '' - patchShebangs lib man scripts tests - ''; - - hardeningDisable = [ "bindnow" ]; - - meta = with lib; { - changelog = "https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/blob/v${version}/NEWS"; - homepage = "https://drm.pages.freedesktop.org/igt-gpu-tools/"; - description = "Tools for development and testing of the Intel DRM driver"; - license = licenses.mit; - platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ pSub ]; - }; -} diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix deleted file mode 100644 index 967fc442a73d..000000000000 --- a/pkgs/development/tools/misc/intltool/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, gettext, perlPackages, buildPackages }: - -stdenv.mkDerivation rec { - pname = "intltool"; - version = "0.51.0"; - - src = fetchurl { - url = "https://launchpad.net/intltool/trunk/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7"; - }; - - # fix "unescaped left brace" errors when using intltool in some cases - patches = [(fetchpatch { - name = "perl5.26-regex-fixes.patch"; - urls = [ - "https://sources.debian.org/data/main/i/intltool/0.51.0-5/debian/patches/perl5.26-regex-fixes.patch" - "https://src.fedoraproject.org/rpms/intltool/raw/d8d2ef29fb122a42a6b6678eb1ec97ae56902af2/f/intltool-perl5.26-regex-fixes.patch" - ]; - sha256 = "12q2140867r5d0dysly72khi7b0mm2gd7nlm1k81iyg7fxgnyz45"; - })]; - - nativeBuildInputs = with perlPackages; [ perl XMLParser ]; - propagatedBuildInputs = [ gettext ] ++ (with perlPackages; [ perl XMLParser ]); - - postInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - for f in $out/bin/*; do - substituteInPlace $f --replace "${buildPackages.perl}" "${perlPackages.perl}" - done - ''; - meta = with lib; { - description = "Translation helper tool"; - homepage = "https://launchpad.net/intltool/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/iozone/default.nix b/pkgs/development/tools/misc/iozone/default.nix deleted file mode 100644 index a724d67a1a04..000000000000 --- a/pkgs/development/tools/misc/iozone/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ stdenv, lib, fetchurl, gnuplot }: - -let - target = if stdenv.hostPlatform.system == "i686-linux" then - "linux" - else if stdenv.hostPlatform.system == "x86_64-linux" then - "linux-AMD64" - else if stdenv.hostPlatform.system == "x86_64-darwin" then - "macosx" - else if stdenv.hostPlatform.system == "aarch64-linux" then - "linux-arm" - else throw "Platform ${stdenv.hostPlatform.system} not yet supported."; -in - -stdenv.mkDerivation rec { - pname = "iozone"; - version = "3.506"; - - src = fetchurl { - url = "http://www.iozone.org/src/current/iozone${lib.replaceStrings ["."] ["_"] version}.tar"; - hash = "sha256-EUzlwHGHO5ose6bnPQXV735mVkOSrL/NwLMmHbEPy+c="; - }; - - license = fetchurl { - url = "http://www.iozone.org/docs/Iozone_License.txt"; - hash = "sha256-O/8yztxKBI/UKs6vwv9mq16Rn3cf/UHpSxdVnAPVCYw="; - }; - - preBuild = "pushd src/current"; - postBuild = "popd"; - - buildFlags = target; - - enableParallelBuilding = true; - - installPhase = '' - mkdir -p $out/{bin,share/doc,libexec,share/man/man1} - install docs/iozone.1 $out/share/man/man1/ - install docs/Iozone_ps.gz $out/share/doc/ - install -s src/current/{iozone,fileop,pit_server} $out/bin/ - install src/current/{gnu3d.dem,Generate_Graphs,gengnuplot.sh} $out/libexec/ - ln -s $out/libexec/Generate_Graphs $out/bin/iozone_generate_graphs - # License copy is mandated by the license, but it's not in the tarball. - install ${license} $out/share/doc/Iozone_License.txt - ''; - - preFixup = '' - sed -i "1i#! $shell" $out/libexec/Generate_Graphs - substituteInPlace $out/libexec/Generate_Graphs \ - --replace ./gengnuplot.sh $out/libexec/gengnuplot.sh \ - --replace 'gnuplot ' "${gnuplot}/bin/gnuplot " \ - --replace gnu3d.dem $out/libexec/gnu3d.dem - ''; - - meta = { - description = "IOzone Filesystem Benchmark"; - homepage = "http://www.iozone.org/"; - license = lib.licenses.unfreeRedistributable; - platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; - maintainers = with lib.maintainers; [ Baughn makefu ]; - }; -} diff --git a/pkgs/development/tools/misc/itm-tools/Cargo.lock b/pkgs/development/tools/misc/itm-tools/Cargo.lock deleted file mode 100644 index d9d39e519d22..000000000000 --- a/pkgs/development/tools/misc/itm-tools/Cargo.lock +++ /dev/null @@ -1,315 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "addr2line" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602d785912f476e480434627e8732e6766b760c045bbf897d9dfaa9f4fbd399c" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler32" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" - -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "backtrace" -version = "0.3.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05100821de9e028f12ae3d189176b41ee198341eb8f369956407fea2f5cc666c" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "byteorder" -version = "1.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "clap" -version = "2.33.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "either" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" - -[[package]] -name = "exitfailure" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ff5bd832af37f366c6c194d813a11cd90ac484f124f079294f28e357ae40515" -dependencies = [ - "failure", -] - -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "gimli" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c" - -[[package]] -name = "hermit-abi" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" -dependencies = [ - "libc", -] - -[[package]] -name = "itm" -version = "0.4.0" -source = "git+https://github.com/rust-embedded/itm#5dd476d03de0738062a876fd3845900ab04833a4" -dependencies = [ - "byteorder", - "either", - "thiserror", -] - -[[package]] -name = "itm-tools" -version = "0.1.0" -dependencies = [ - "clap", - "exitfailure", - "failure", - "itm", - "rustc-demangle", - "xmas-elf", -] - -[[package]] -name = "libc" -version = "0.2.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" - -[[package]] -name = "miniz_oxide" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -dependencies = [ - "adler32", -] - -[[package]] -name = "object" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" - -[[package]] -name = "proc-macro2" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quote" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" - -[[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.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "synstructure" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "unicode-xid", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unicode-xid" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[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 = "xmas-elf" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22678df5df766e8d1e5d609da69f0c3132d794edf6ab5e75e7abcd2270d4cf58" -dependencies = [ - "zero", -] - -[[package]] -name = "zero" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f1bc8a6b2005884962297587045002d8cfb8dcec9db332f4ca216ddc5de82c5" diff --git a/pkgs/development/tools/misc/itm-tools/default.nix b/pkgs/development/tools/misc/itm-tools/default.nix deleted file mode 100644 index 7f027a217327..000000000000 --- a/pkgs/development/tools/misc/itm-tools/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform, pkg-config }: - -rustPlatform.buildRustPackage rec { - pname = "itm-tools"; - version = "unstable-2019-11-15"; - - src = fetchFromGitHub { - owner = "japaric"; - repo = pname; - rev = "e94155e44019d893ac8e6dab51cc282d344ab700"; - sha256 = "19xkjym0i7y52cfhvis49c59nzvgw4906cd8bkz8ka38mbgfqgiy"; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "itm-0.4.0" = "sha256-T61f1WvxEMhI5bzp8FuMYWiG1YOPJvWuBJfK/gjuNKI="; - }; - }; - - nativeBuildInputs = [ pkg-config ]; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - - doCheck = false; - - meta = with lib; { - description = "Tools for analyzing ITM traces"; - homepage = "https://github.com/japaric/itm-tools"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ hh sb0 ]; - }; -} diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix deleted file mode 100644 index c8889d33401b..000000000000 --- a/pkgs/development/tools/misc/itstool/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv -, lib -, fetchurl -, python3 -}: - -stdenv.mkDerivation rec { - pname = "itstool"; - version = "2.0.7"; - - src = fetchurl { - url = "http://files.itstool.org/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-a5p80poSu5VZj1dQ6HY87niDahogf4W3TYsydbJ+h8o="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - python3 - python3.pkgs.wrapPython - ]; - - buildInputs = [ - python3 - python3.pkgs.libxml2 - ]; - - pythonPath = [ - python3.pkgs.libxml2 - ]; - - postFixup = '' - wrapPythonPrograms - ''; - - meta = { - homepage = "https://itstool.org/"; - description = "XML to PO and back again"; - mainProgram = "itstool"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/misc/jiq/default.nix b/pkgs/development/tools/misc/jiq/default.nix deleted file mode 100644 index ed07a8d3c344..000000000000 --- a/pkgs/development/tools/misc/jiq/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, jq, makeWrapper }: - -buildGoModule rec { - pname = "jiq"; - version = "0.7.2"; - - src = fetchFromGitHub { - owner = "fiatjaf"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-txhttYngN+dofA3Yp3gZUZPRRZWGug9ysXq1Q0RP7ig="; - }; - - vendorHash = "sha256-ZUmOhPGy+24AuxdeRVF0Vnu8zDGFrHoUlYiDdfIV5lc="; - - nativeBuildInputs = [ makeWrapper ]; - - nativeCheckInputs = [ jq ]; - - postInstall = '' - wrapProgram $out/bin/jiq \ - --prefix PATH : ${lib.makeBinPath [ jq ]} - ''; - - meta = with lib; { - homepage = "https://github.com/fiatjaf/jiq"; - license = licenses.mit; - description = "jid on jq - interactive JSON query tool using jq expressions"; - mainProgram = "jiq"; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix deleted file mode 100644 index a082614aece3..000000000000 --- a/pkgs/development/tools/misc/jscoverage/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ fetchurl, perl, python3, lib, stdenv, zip }: - -stdenv.mkDerivation rec { - pname = "jscoverage"; - version = "0.5.1"; - - src = fetchurl { - url = "https://siliconforks.com/${pname}/download/${pname}-${version}.tar.bz2"; - sha256 = "c45f051cec18c10352f15f9844f47e37e8d121d5fd16680e2dd0f3b4420eb7f4"; - }; - - patches = [ - ./jsfalse_to_null.patch - ]; - - nativeBuildInputs = [ perl python3 zip ]; - - strictDeps = true; - - # It works without MOZ_FIX_LINK_PATHS, circumventing an impurity - # issue. Maybe we could kick js/ (spidermonkey) completely and - # instead use our spidermonkey via nix. - preConfigure = '' - sed -i 's/^MOZ_FIX_LINK_PATHS=.*$/MOZ_FIX_LINK_PATHS=""/' ./js/configure - ''; - - meta = { - description = "Code coverage for JavaScript"; - - longDescription = '' - JSCoverage is a tool that measures code coverage for JavaScript - programs. - - Code coverage statistics show which lines of a program have been - executed (and which have been missed). This information is useful - for constructing comprehensive test suites (hence, it is often - called test coverage). - - JSCoverage works by instrumenting the JavaScript code used in web - pages. Code coverage statistics are collected while the - instrumented JavaScript code is executed in a web browser. - - JSCoverage supports the complete language syntax described in the - ECMAScript Language Specification (ECMA-262, 3rd - edition). JSCoverage works with any modern standards-compliant web - browser - including Internet Explorer (IE 6, 7, and 8), Firefox, - Opera, Safari, and Google Chrome - on Microsoft Windows and - GNU/Linux. - ''; - - homepage = "http://siliconforks.com/jscoverage/"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/tools/misc/jscoverage/jsfalse_to_null.patch b/pkgs/development/tools/misc/jscoverage/jsfalse_to_null.patch deleted file mode 100644 index b49594964e1f..000000000000 --- a/pkgs/development/tools/misc/jscoverage/jsfalse_to_null.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git i/js/jsstr.cpp w/js/jsstr.cpp -index e662bf1..b18597e 100644 ---- i/js/jsstr.cpp -+++ w/js/jsstr.cpp -@@ -3040,7 +3040,7 @@ js_InitStringClass(JSContext *cx, JSObject *obj) - JSVAL_VOID, NULL, NULL, - JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0, - NULL)) { -- return JS_FALSE; -+ return NULL; - } - - return proto; -diff --git i/js/jsxml.cpp w/js/jsxml.cpp -index 5621ede..e00c97d 100644 ---- i/js/jsxml.cpp -+++ w/js/jsxml.cpp -@@ -303,7 +303,7 @@ NewXMLNamespace(JSContext *cx, JSString *prefix, JSString *uri, JSBool declared) - - obj = js_NewObject(cx, &js_NamespaceClass.base, NULL, NULL); - if (!obj) -- return JS_FALSE; -+ return NULL; - JS_ASSERT(JSVAL_IS_VOID(obj->fslots[JSSLOT_PREFIX])); - JS_ASSERT(JSVAL_IS_VOID(obj->fslots[JSSLOT_URI])); - JS_ASSERT(JSVAL_IS_VOID(obj->fslots[JSSLOT_DECLARED])); diff --git a/pkgs/development/tools/misc/jsonfmt/default.nix b/pkgs/development/tools/misc/jsonfmt/default.nix deleted file mode 100644 index e098c8feea8f..000000000000 --- a/pkgs/development/tools/misc/jsonfmt/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, testers -, jsonfmt -}: - -buildGoModule rec { - pname = "jsonfmt"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "caarlos0"; - repo = "jsonfmt"; - rev = "v${version}"; - hash = "sha256-rVv7Dv4vQmss4eiiy+KaO9tZ5U58WlRlsOz4QO0gdfM="; - }; - - vendorHash = "sha256-xtwN+TemiiyXOxZ2DNys4G6w4KA3BjLSWAmzox+boMY="; - - ldflags = [ - "-s" - "-w" - "-X=main.version=${version}" - ]; - - passthru.tests = { - version = testers.testVersion { - package = jsonfmt; - }; - }; - - meta = with lib; { - description = "Formatter for JSON files"; - homepage = "https://github.com/caarlos0/jsonfmt"; - changelog = "https://github.com/caarlos0/jsonfmt/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "jsonfmt"; - }; -} diff --git a/pkgs/development/tools/misc/k2tf/default.nix b/pkgs/development/tools/misc/k2tf/default.nix deleted file mode 100644 index 0da0d51f3bc4..000000000000 --- a/pkgs/development/tools/misc/k2tf/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: - -buildGoModule rec { - pname = "k2tf"; - version = "0.7.0"; - - src = fetchFromGitHub { - owner = "sl1pm4t"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-zkkRzCTZCvbwBj4oIhTo5d3PvqLMJPzT3zV9jU3PEJs="; - }; - - patches = [ - # update dependencies - # https://github.com/sl1pm4t/k2tf/pull/111 - (fetchpatch { - url = "https://github.com/sl1pm4t/k2tf/commit/7e7b778eeb80400cb0dadb1cdea4e617b5738147.patch"; - hash = "sha256-ZGQUuH7u3aNLml6rvOzOxVwSTlbhZLknXbHKeY4lp00="; - }) - ]; - - vendorHash = "sha256-yGuoE1bgwVHk3ym382OC93me9HPlVoNgGo/3JROVC2E="; - - ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ]; - - meta = with lib; { - description = "Kubernetes YAML to Terraform HCL converter"; - mainProgram = "k2tf"; - homepage = "https://github.com/sl1pm4t/k2tf"; - license = licenses.mpl20; - maintainers = [ maintainers.flokli ]; - }; -} diff --git a/pkgs/development/tools/misc/kool/default.nix b/pkgs/development/tools/misc/kool/default.nix deleted file mode 100644 index 7c96ee3ee242..000000000000 --- a/pkgs/development/tools/misc/kool/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, testers -, kool -}: - -buildGoModule rec { - pname = "kool"; - version = "3.3.0"; - - src = fetchFromGitHub { - owner = "kool-dev"; - repo = "kool"; - rev = version; - hash = "sha256-AbE0MT55LQgDY/WZRs+kCfreLYtSyzmXkYIQmJC4Hbo="; - }; - - vendorHash = "sha256-wzTsd2ITwnPFc85bXoZLLb9wKvHYOgnb1FGiFXLkkiE="; - - ldflags = [ - "-s" - "-w" - "-X=kool-dev/kool/commands.version=${version}" - ]; - - passthru.tests = { - version = testers.testVersion { - package = kool; - }; - }; - - meta = with lib; { - description = "From local development to the cloud: development workflow made easy"; - mainProgram = "kool"; - homepage = "https://kool.dev"; - changelog = "https://github.com/kool-dev/kool/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/libtree/default.nix b/pkgs/development/tools/misc/libtree/default.nix deleted file mode 100644 index 621ab218669e..000000000000 --- a/pkgs/development/tools/misc/libtree/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, testers -, libtree -, runCommand -, coreutils -, dieHook -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libtree"; - version = "3.1.1"; - - src = fetchFromGitHub { - owner = "haampie"; - repo = "libtree"; - rev = "v${finalAttrs.version}"; - hash = "sha256-q3JtQ9AxoP0ma9K96cC3gf6QmQ1FbS7T7I59qhkwbMk="; - }; - - makeFlags = [ "PREFIX=$(out)" ]; - - # Fails at https://github.com/haampie/libtree/blob/v3.1.1/tests/07_origin_is_relative_to_symlink_location_not_realpath/Makefile#L28 - doCheck = false; - - passthru.tests = { - version = testers.testVersion { - package = libtree; - command = "libtree --version"; - version = finalAttrs.version; - }; - checkCoreUtils = runCommand "${finalAttrs.pname}-ls-test" { - nativeBuildInputs = [ finalAttrs.finalPackage dieHook ]; - } '' - libtree ${coreutils}/bin/ls > $out || die "libtree failed to show dependencies." - [ -s $out ] - ''; - }; - - meta = with lib; { - description = "Tree ldd with an option to bundle dependencies into a single folder"; - mainProgram = "libtree"; - homepage = "https://github.com/haampie/libtree"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ prusnak rardiol ]; - }; -}) diff --git a/pkgs/development/tools/misc/libwhich/default.nix b/pkgs/development/tools/misc/libwhich/default.nix deleted file mode 100644 index e8d919cfabe0..000000000000 --- a/pkgs/development/tools/misc/libwhich/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "libwhich"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "vtjnash"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-JNIWdI12sL3TZqVA3GeH0KbgqFDbMsEdecea3392Goc="; - }; - - installPhase = '' - install -Dm755 -t $out/bin libwhich - ''; - - meta = with lib; { - description = "Like `which`, for dynamic libraries"; - mainProgram = "libwhich"; - homepage = "https://github.com/vtjnash/libwhich"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/misc/licenseclassifier/default.nix b/pkgs/development/tools/misc/licenseclassifier/default.nix deleted file mode 100644 index 369adafa10b4..000000000000 --- a/pkgs/development/tools/misc/licenseclassifier/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "licenseclassifier"; - version = "2.0.0"; - - src = fetchFromGitHub { - owner = "google"; - repo = "licenseclassifier"; - rev = "v${version}"; - hash = "sha256-j+8hX8W0VD0h09Qmu7POnHT8f8+SeG5Si1fI0CDIwuo="; - }; - - # The new and improved "License Classifier v2" is hidden in a subdirectory. - sourceRoot = "${src.name}/v2"; - - vendorHash = "sha256-u0VR8DCmbZS0MF26Y4HfqtLaGyX2n2INdAidVNbnXPE="; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "License Classifier"; - mainProgram = "identify_license"; - longDescription = '' - The license classifier can analyze text to determine what type of license - it contains. It searches for license texts in a file and compares them to - an archive of known licenses. These files could be, e.g., LICENSE files - with a single or multiple licenses in it, or source code files with the - license text in a comment. - ''; - homepage = "https://github.com/google/licenseclassifier"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ tnias ]; - }; -} diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index eacb70a5ea8f..ec721340b34c 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.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "linuxkit"; repo = "linuxkit"; rev = "v${version}"; - sha256 = "sha256-Od6ij4RUWWNN3pm6Yt8W7LkeHnrusikJi2pXw6axbhU="; + sha256 = "sha256-M/M4m/vsvvtSDnNNy8p6x+xpv1QmVzyfPRf/BNBX7zA="; }; vendorHash = null; @@ -24,8 +24,8 @@ buildGoModule rec { # able to use the Virtualization framework at runtime. # - sigtool is allows us to validly sign such executables with a dummy # authority. - nativeBuildInputs = lib.optionals stdenv.isDarwin [ sigtool ]; - buildInputs = lib.optionals stdenv.isDarwin [ Cocoa Virtualization ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa Virtualization ]; ldflags = [ "-s" @@ -43,7 +43,7 @@ buildGoModule rec { # - Finally, at the start of the fixup phase, the working directory is # $sourceRoot/src/cmd/linuxkit, so it's simpler to use the sign target from # the Makefile in that directory rather than $sourceRoot/Makefile. - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' make sign LOCAL_TARGET=$out/bin/linuxkit ''; passthru.tests.version = testers.testVersion { diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix deleted file mode 100644 index fa128cf3cb5c..000000000000 --- a/pkgs/development/tools/misc/loccount/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, buildGoModule, fetchFromGitLab, python3 }: -buildGoModule rec { - pname = "loccount"; - version = "2.15"; - - src = fetchFromGitLab { - owner = "esr"; - repo = "loccount"; - rev = version; - hash = "sha256-IRDwxz/InF4okyfAzbK0PzZz+HMUwv5LgRthUUy3rus="; - }; - - vendorHash = null; - - excludedPackages = "tests"; - - nativeBuildInputs = [ python3 ]; - - ldflags = [ "-s" "-w" ]; - - preBuild = '' - patchShebangs --build tablegen.py - - go generate - ''; - - meta = with lib; { - description = "Re-implementation of sloccount in Go"; - mainProgram = "loccount"; - longDescription = '' - loccount is a re-implementation of David A. Wheeler's sloccount tool - in Go. It is faster and handles more different languages. Because - it's one source file in Go, it is easier to maintain and extend than the - multi-file, multi-language implementation of the original. - - The algorithms are largely unchanged and can be expected to produce - identical numbers for languages supported by both tools. Python is - an exception; loccount corrects buggy counting of single-quote multiline - literals in sloccount 2.26. - ''; - homepage = "https://gitlab.com/esr/loccount"; - downloadPage = "https://gitlab.com/esr/loccount/tree/master"; - license = licenses.bsd2; - maintainers = with maintainers; [ calvertvl ]; - }; -} diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix deleted file mode 100644 index de1decee524f..000000000000 --- a/pkgs/development/tools/misc/lsof/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, buildPackages, perl, which, ncurses, nukeReferences }: - -let - dialect = lib.last (lib.splitString "-" stdenv.hostPlatform.system); -in - -stdenv.mkDerivation rec { - pname = "lsof"; - version = "4.99.3"; - - src = fetchFromGitHub { - owner = "lsof-org"; - repo = "lsof"; - rev = version; - hash = "sha256-XW3l+E9D8hgI9jGJGKkIAKa8O9m0JHgZhEASqg4gYuw="; - }; - - postPatch = '' - patchShebangs --build lib/dialects/*/Mksrc - # Do not re-build version.h in every 'make' to allow nuke-refs below. - # We remove phony 'FRC' target that forces rebuilds: - # 'version.h: FRC ...' is translated to 'version.h: ...'. - sed -i lib/dialects/*/Makefile -e 's/version.h:\s*FRC/version.h:/' - '' + lib.optionalString stdenv.isDarwin '' - sed -i 's|lcurses|lncurses|g' Configure - ''; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ nukeReferences perl which ]; - buildInputs = [ ncurses ]; - - # Stop build scripts from searching global include paths - LSOF_INCLUDE = "${lib.getDev stdenv.cc.libc}/include"; - configurePhase = "LINUX_CONF_CC=$CC_FOR_BUILD LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB ./Configure -n ${dialect}"; - - preBuild = '' - for filepath in $(find dialects/${dialect} -type f); do - sed -i "s,/usr/include,$LSOF_INCLUDE,g" $filepath - done - - # Wipe out development-only flags from CFLAGS embedding - make version.h - nuke-refs version.h - ''; - - installPhase = '' - # Fix references from man page https://github.com/lsof-org/lsof/issues/66 - substituteInPlace Lsof.8 \ - --replace ".so ./00DIALECTS" "" \ - --replace ".so ./version" ".ds VN ${version}" - mkdir -p $out/bin $out/man/man8 - cp Lsof.8 $out/man/man8/lsof.8 - cp lsof $out/bin - ''; - - meta = { - homepage = "https://github.com/lsof-org/lsof"; - description = "Tool to list open files"; - mainProgram = "lsof"; - longDescription = '' - List open files. Can show what process has opened some file, - socket (IPv6/IPv4/UNIX local), or partition (by opening a file - from it). - ''; - license = lib.licenses.purdueBsd; - maintainers = with lib.maintainers; [ dezgeg ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix deleted file mode 100644 index 594828e25954..000000000000 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv, fetchurl, fetchgit, autoreconfHook, dejagnu, elfutils }: - -stdenv.mkDerivation rec { - pname = "ltrace"; - version = "0.7.91"; - - src = fetchurl { - url = "https://src.fedoraproject.org/repo/pkgs/ltrace/ltrace-0.7.91.tar.bz2/9db3bdee7cf3e11c87d8cc7673d4d25b/ltrace-0.7.91.tar.bz2"; - sha256 = "sha256-HqellbKh2ZDHxslXl7SSIXtpjV1sodtgVwh8hgTC3Dc="; - }; - - nativeBuildInputs = [ autoreconfHook ]; # Some patches impact ./configure. - buildInputs = [ elfutils ]; - nativeCheckInputs = [ dejagnu ]; - - # Import Fedora's (very) large patch series: bug fixes, architecture support, - # etc. RH/Fedora are currently working with upstream to merge all these - # patches for the next major branch. - prePatch = let - fedora = fetchgit { - url = "https://src.fedoraproject.org/rpms/ltrace.git"; - rev = "00f430ccbebdbd13bdd4d7ee6303b091cf005542"; - sha256 = "sha256-FBGEgmaslu7xrJtZ2WsYwu9Cw1ZQrWRV1+Eu9qLXO4s="; - }; - in '' - # Order matters, read the patch list from the RPM spec. Our own patches - # are applied on top of the Fedora baseline. - fedorapatches="" - for p in $(grep '^Patch[0-9]\+:' ${fedora}/ltrace.spec | awk '{ print $2 }'); do - fedorapatches="$fedorapatches ${fedora}/$p" - done - patches="$fedorapatches $patches" - ''; - - # Cherry-pick extra patches for recent glibc support in the test suite. - patches = [ - # https://gitlab.com/cespedes/ltrace/-/merge_requests/14 - ./testsuite-newfstatat.patch - # https://gitlab.com/cespedes/ltrace/-/merge_requests/15 - ./sysdeps-x86.patch - ]; - - doCheck = true; - checkPhase = '' - # Hardening options interfere with some of the low-level expectations in - # the test suite (e.g. printf ends up redirected to __printf_chk). - NIX_HARDENING_ENABLE="" \ - # Disable test that requires ptrace-ing a non-child process, this might be - # forbidden by YAMA ptrace policy on the build host. - RUNTESTFLAGS="--host=${stdenv.hostPlatform.config} \ - --target=${stdenv.targetPlatform.config} \ - --ignore attach-process.exp" \ - make check - ''; - - meta = with lib; { - description = "Library call tracer"; - mainProgram = "ltrace"; - homepage = "https://www.ltrace.org/"; - platforms = platforms.linux; - license = licenses.gpl2Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/misc/ltrace/sysdeps-x86.patch b/pkgs/development/tools/misc/ltrace/sysdeps-x86.patch deleted file mode 100644 index 63ae8ad94813..000000000000 --- a/pkgs/development/tools/misc/ltrace/sysdeps-x86.patch +++ /dev/null @@ -1,328 +0,0 @@ -diff --git a/sysdeps/linux-gnu/x86/syscallent.h b/sysdeps/linux-gnu/x86/syscallent.h -index 345fe20..66ac522 100644 ---- a/sysdeps/linux-gnu/x86/syscallent.h -+++ b/sysdeps/linux-gnu/x86/syscallent.h -@@ -238,7 +238,7 @@ - "setfsgid32", /* 216 */ - "pivot_root", /* 217 */ - "mincore", /* 218 */ -- "madvise1", /* 219 */ -+ "madvise", /* 219 */ - "getdents64", /* 220 */ - "fcntl64", /* 221 */ - "222", /* 222 */ -@@ -279,14 +279,14 @@ - "remap_file_pages", /* 257 */ - "set_tid_address", /* 258 */ - "timer_create", /* 259 */ -- "260", /* 260 */ -- "261", /* 261 */ -- "262", /* 262 */ -- "263", /* 263 */ -- "264", /* 264 */ -- "265", /* 265 */ -- "266", /* 266 */ -- "267", /* 267 */ -+ "timer_settime", /* 260 */ -+ "timer_gettime", /* 261 */ -+ "timer_getoverrun", /* 262 */ -+ "timer_delete", /* 263 */ -+ "clock_settime", /* 264 */ -+ "clock_gettime", /* 265 */ -+ "clock_getres", /* 266 */ -+ "clock_nanosleep", /* 267 */ - "statfs64", /* 268 */ - "fstatfs64", /* 269 */ - "tgkill", /* 270 */ -@@ -297,11 +297,11 @@ - "get_mempolicy", /* 275 */ - "set_mempolicy", /* 276 */ - "mq_open", /* 277 */ -- "278", /* 278 */ -- "279", /* 279 */ -- "280", /* 280 */ -- "281", /* 281 */ -- "282", /* 282 */ -+ "mq_unlink", /* 278 */ -+ "mq_timedsend", /* 279 */ -+ "mq_timedreceive", /* 280 */ -+ "mq_notify", /* 281 */ -+ "mq_getsetattr", /* 282 */ - "kexec_load", /* 283 */ - "waitid", /* 284 */ - "285", /* 285 */ -@@ -368,3 +368,105 @@ - "setns", /* 346 */ - "process_vm_readv", /* 347 */ - "process_vm_writev", /* 348 */ -+ "kcmp", /* 349 */ -+ "finit_module", /* 350 */ -+ "sched_setattr", /* 351 */ -+ "sched_getattr", /* 352 */ -+ "renameat2", /* 353 */ -+ "seccomp", /* 354 */ -+ "getrandom", /* 355 */ -+ "memfd_create", /* 356 */ -+ "bpf", /* 357 */ -+ "execveat", /* 358 */ -+ "socket", /* 359 */ -+ "socketpair", /* 360 */ -+ "bind", /* 361 */ -+ "connect", /* 362 */ -+ "listen", /* 363 */ -+ "accept4", /* 364 */ -+ "getsockopt", /* 365 */ -+ "setsockopt", /* 366 */ -+ "getsockname", /* 367 */ -+ "getpeername", /* 368 */ -+ "sendto", /* 369 */ -+ "sendmsg", /* 370 */ -+ "recvfrom", /* 371 */ -+ "recvmsg", /* 372 */ -+ "shutdown", /* 373 */ -+ "userfaultfd", /* 374 */ -+ "membarrier", /* 375 */ -+ "mlock2", /* 376 */ -+ "copy_file_range", /* 377 */ -+ "preadv2", /* 378 */ -+ "pwritev2", /* 379 */ -+ "pkey_mprotect", /* 380 */ -+ "pkey_alloc", /* 381 */ -+ "pkey_free", /* 382 */ -+ "statx", /* 383 */ -+ "arch_prctl", /* 384 */ -+ "io_pgetevents", /* 385 */ -+ "rseq", /* 386 */ -+ "387", /* 387 */ -+ "388", /* 388 */ -+ "389", /* 389 */ -+ "390", /* 390 */ -+ "391", /* 391 */ -+ "392", /* 392 */ -+ "semget", /* 393 */ -+ "semctl", /* 394 */ -+ "shmget", /* 395 */ -+ "shmctl", /* 396 */ -+ "shmat", /* 397 */ -+ "shmdt", /* 398 */ -+ "msgget", /* 399 */ -+ "msgsnd", /* 400 */ -+ "msgrcv", /* 401 */ -+ "msgctl", /* 402 */ -+ "clock_gettime64", /* 403 */ -+ "clock_settime64", /* 404 */ -+ "clock_adjtime64", /* 405 */ -+ "clock_getres_time64", /* 406 */ -+ "clock_nanosleep_time64", /* 407 */ -+ "timer_gettime64", /* 408 */ -+ "timer_settime64", /* 409 */ -+ "timerfd_gettime64", /* 410 */ -+ "timerfd_settime64", /* 411 */ -+ "utimensat_time64", /* 412 */ -+ "pselect6_time64", /* 413 */ -+ "ppoll_time64", /* 414 */ -+ "415", /* 415 */ -+ "io_pgetevents_time64", /* 416 */ -+ "recvmmsg_time64", /* 417 */ -+ "mq_timedsend_time64", /* 418 */ -+ "mq_timedreceive_time64", /* 419 */ -+ "semtimedop_time64", /* 420 */ -+ "rt_sigtimedwait_time64", /* 421 */ -+ "futex_time64", /* 422 */ -+ "sched_rr_get_interval_time64", /* 423 */ -+ "pidfd_send_signal", /* 424 */ -+ "io_uring_setup", /* 425 */ -+ "io_uring_enter", /* 426 */ -+ "io_uring_register", /* 427 */ -+ "open_tree", /* 428 */ -+ "move_mount", /* 429 */ -+ "fsopen", /* 430 */ -+ "fsconfig", /* 431 */ -+ "fsmount", /* 432 */ -+ "fspick", /* 433 */ -+ "pidfd_open", /* 434 */ -+ "clone3", /* 435 */ -+ "close_range", /* 436 */ -+ "openat2", /* 437 */ -+ "pidfd_getfd", /* 438 */ -+ "faccessat2", /* 439 */ -+ "process_madvise", /* 440 */ -+ "epoll_pwait2", /* 441 */ -+ "mount_setattr", /* 442 */ -+ "quotactl_fd", /* 443 */ -+ "landlock_create_ruleset", /* 444 */ -+ "landlock_add_rule", /* 445 */ -+ "landlock_restrict_self", /* 446 */ -+ "memfd_secret", /* 447 */ -+ "process_mrelease", /* 448 */ -+ "futex_waitv", /* 449 */ -+ "set_mempolicy_home_node", /* 450 */ -diff --git a/sysdeps/linux-gnu/x86/syscallent1.h b/sysdeps/linux-gnu/x86/syscallent1.h -index 91ae8d6..f8b15f7 100644 ---- a/sysdeps/linux-gnu/x86/syscallent1.h -+++ b/sysdeps/linux-gnu/x86/syscallent1.h -@@ -36,8 +36,8 @@ - "rt_sigprocmask", /* 14 */ - "rt_sigreturn", /* 15 */ - "ioctl", /* 16 */ -- "pread", /* 17 */ -- "pwrite", /* 18 */ -+ "pread64", /* 17 */ -+ "pwrite64", /* 18 */ - "readv", /* 19 */ - "writev", /* 20 */ - "access", /* 21 */ -@@ -233,8 +233,8 @@ - "get_thread_area", /* 211 */ - "lookup_dcookie", /* 212 */ - "epoll_create", /* 213 */ -- "epoll_ctl", /* 214 */ -- "epoll_wait", /* 215 */ -+ "epoll_ctl_old", /* 214 */ -+ "epoll_wait_old", /* 215 */ - "remap_file_pages", /* 216 */ - "getdents64", /* 217 */ - "set_tid_address", /* 218 */ -@@ -331,3 +331,142 @@ - "getcpu", /* 309 */ - "process_vm_readv", /* 310 */ - "process_vm_writev", /* 311 */ -+ "kcmp", /* 312 */ -+ "finit_module", /* 313 */ -+ "sched_setattr", /* 314 */ -+ "sched_getattr", /* 315 */ -+ "renameat2", /* 316 */ -+ "seccomp", /* 317 */ -+ "getrandom", /* 318 */ -+ "memfd_create", /* 319 */ -+ "kexec_file_load", /* 320 */ -+ "bpf", /* 321 */ -+ "execveat", /* 322 */ -+ "userfaultfd", /* 323 */ -+ "membarrier", /* 324 */ -+ "mlock2", /* 325 */ -+ "copy_file_range", /* 326 */ -+ "preadv2", /* 327 */ -+ "pwritev2", /* 328 */ -+ "pkey_mprotect", /* 329 */ -+ "pkey_alloc", /* 330 */ -+ "pkey_free", /* 331 */ -+ "statx", /* 332 */ -+ "io_pgetevents", /* 333 */ -+ "rseq", /* 334 */ -+ "335", /* 335 */ -+ "336", /* 336 */ -+ "337", /* 337 */ -+ "338", /* 338 */ -+ "339", /* 339 */ -+ "340", /* 340 */ -+ "341", /* 341 */ -+ "342", /* 342 */ -+ "343", /* 343 */ -+ "344", /* 344 */ -+ "345", /* 345 */ -+ "346", /* 346 */ -+ "347", /* 347 */ -+ "348", /* 348 */ -+ "349", /* 349 */ -+ "350", /* 350 */ -+ "351", /* 351 */ -+ "352", /* 352 */ -+ "353", /* 353 */ -+ "354", /* 354 */ -+ "355", /* 355 */ -+ "356", /* 356 */ -+ "357", /* 357 */ -+ "358", /* 358 */ -+ "359", /* 359 */ -+ "360", /* 360 */ -+ "361", /* 361 */ -+ "362", /* 362 */ -+ "363", /* 363 */ -+ "364", /* 364 */ -+ "365", /* 365 */ -+ "366", /* 366 */ -+ "367", /* 367 */ -+ "368", /* 368 */ -+ "369", /* 369 */ -+ "370", /* 370 */ -+ "371", /* 371 */ -+ "372", /* 372 */ -+ "373", /* 373 */ -+ "374", /* 374 */ -+ "375", /* 375 */ -+ "376", /* 376 */ -+ "377", /* 377 */ -+ "378", /* 378 */ -+ "379", /* 379 */ -+ "380", /* 380 */ -+ "381", /* 381 */ -+ "382", /* 382 */ -+ "383", /* 383 */ -+ "384", /* 384 */ -+ "385", /* 385 */ -+ "386", /* 386 */ -+ "387", /* 387 */ -+ "388", /* 388 */ -+ "389", /* 389 */ -+ "390", /* 390 */ -+ "391", /* 391 */ -+ "392", /* 392 */ -+ "393", /* 393 */ -+ "394", /* 394 */ -+ "395", /* 395 */ -+ "396", /* 396 */ -+ "397", /* 397 */ -+ "398", /* 398 */ -+ "399", /* 399 */ -+ "400", /* 400 */ -+ "401", /* 401 */ -+ "402", /* 402 */ -+ "403", /* 403 */ -+ "404", /* 404 */ -+ "405", /* 405 */ -+ "406", /* 406 */ -+ "407", /* 407 */ -+ "408", /* 408 */ -+ "409", /* 409 */ -+ "410", /* 410 */ -+ "411", /* 411 */ -+ "412", /* 412 */ -+ "413", /* 413 */ -+ "414", /* 414 */ -+ "415", /* 415 */ -+ "416", /* 416 */ -+ "417", /* 417 */ -+ "418", /* 418 */ -+ "419", /* 419 */ -+ "420", /* 420 */ -+ "421", /* 421 */ -+ "422", /* 422 */ -+ "423", /* 423 */ -+ "pidfd_send_signal", /* 424 */ -+ "io_uring_setup", /* 425 */ -+ "io_uring_enter", /* 426 */ -+ "io_uring_register", /* 427 */ -+ "open_tree", /* 428 */ -+ "move_mount", /* 429 */ -+ "fsopen", /* 430 */ -+ "fsconfig", /* 431 */ -+ "fsmount", /* 432 */ -+ "fspick", /* 433 */ -+ "pidfd_open", /* 434 */ -+ "clone3", /* 435 */ -+ "close_range", /* 436 */ -+ "openat2", /* 437 */ -+ "pidfd_getfd", /* 438 */ -+ "faccessat2", /* 439 */ -+ "process_madvise", /* 440 */ -+ "epoll_pwait2", /* 441 */ -+ "mount_setattr", /* 442 */ -+ "quotactl_fd", /* 443 */ -+ "landlock_create_ruleset", /* 444 */ -+ "landlock_add_rule", /* 445 */ -+ "landlock_restrict_self", /* 446 */ -+ "memfd_secret", /* 447 */ -+ "process_mrelease", /* 448 */ -+ "futex_waitv", /* 449 */ -+ "set_mempolicy_home_node", /* 450 */ diff --git a/pkgs/development/tools/misc/ltrace/testsuite-newfstatat.patch b/pkgs/development/tools/misc/ltrace/testsuite-newfstatat.patch deleted file mode 100644 index 17165be495bf..000000000000 --- a/pkgs/development/tools/misc/ltrace/testsuite-newfstatat.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/testsuite/ltrace.main/system_calls.exp b/testsuite/ltrace.main/system_calls.exp -index 1b64cb0..af19916 100644 ---- a/testsuite/ltrace.main/system_calls.exp -+++ b/testsuite/ltrace.main/system_calls.exp -@@ -133,7 +133,7 @@ Match [Diff [Calls [ltraceRun -L -S -- $bin]] \ - { {^write$} == 1 } - { {^unlink(at)?$} >= 2 } - { {^open(at)?$} == 1 } -- { {^(new|f)?stat(64)?$} >= 1 } -+ { {^(new)?f?statx?(at)?(64)?$} >= 1 } - { {^close$} == 1 } - { {^getcwd$} == 1 } - { {^chdir$} == 1 } diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix deleted file mode 100644 index b9ea42664110..000000000000 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }: - -stdenv.mkDerivation rec { - pname = "lttng-tools"; - version = "2.13.13"; - - src = fetchurl { - url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-/19PALCB2sZgkq/o5yt8eQZwkxzxwe4N6qf4D7xTiD4="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ popt libuuid liburcu lttng-ust libxml2 kmod ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Tracing tools (kernel + user space) for Linux"; - mainProgram = "lttng"; - homepage = "https://lttng.org/"; - license = with licenses; [ lgpl21Only gpl2Only ]; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; - -} diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix deleted file mode 100644 index 1e89be8a0c22..000000000000 --- a/pkgs/development/tools/misc/lttv/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, popt, babeltrace }: - -stdenv.mkDerivation rec { - pname = "lttv"; - version = "1.5"; - - src = fetchurl { - url = "https://lttng.org/files/packages/${pname}-${version}.tar.bz2"; - sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib gtk2 popt babeltrace ]; - - meta = with lib; { - description = "Graphical trace viewer for LTTng trace files"; - homepage = "https://lttng.org/"; - # liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1. - # The rest of the LTTV package is distributed under the GNU GPL v2. - license = with licenses; [ gpl2 lgpl21 ]; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; - -} diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix deleted file mode 100644 index 504b79c50048..000000000000 --- a/pkgs/development/tools/misc/macdylibbundler/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, makeWrapper, fetchFromGitHub, cctools }: - -stdenv.mkDerivation rec { - pname = "macdylibbundler"; - version = "1.0.4"; - - src = fetchFromGitHub { - owner = "auriamg"; - repo = "macdylibbundler"; - rev = version; - sha256 = "0j4ij48jf5izgymzxxaakf6vc50w9q0761yir6nfj1n6qlnrlidf"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - makeFlags = [ "PREFIX=$(out)" ]; - - postInstall = '' - wrapProgram $out/bin/dylibbundler \ - --prefix PATH ":" "${cctools}/bin" - ''; - - meta = with lib; { - description = "Utility to ease bundling libraries into executables for OSX"; - longDescription = '' - dylibbundler is a small command-line programs that aims to make bundling - .dylibs as easy as possible. It automatically determines which dylibs are - needed by your program, copies these libraries inside the app bundle, and - fixes both them and the executable to be ready for distribution... all - this with a single command on the teminal! It will also work if your - program uses plug-ins that have dependencies too. - ''; - homepage = "https://github.com/auriamg/macdylibbundler"; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ maintainers.nomeata ]; - - }; -} diff --git a/pkgs/development/tools/misc/mdctags/default.nix b/pkgs/development/tools/misc/mdctags/default.nix deleted file mode 100644 index 2307cc54facb..000000000000 --- a/pkgs/development/tools/misc/mdctags/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage { - pname = "mdctags"; - version = "unstable-2020-06-11"; # v0.1.0 does not build with our rust version - - src = fetchFromGitHub { - owner = "wsdjeg"; - repo = "mdctags.rs"; - rev = "0ed9736ea0c77e6ff5b560dda46f5ed0a983ed82"; - sha256 = "14gryhgh9czlkfk75ml0620c6v8r74i6h3ykkkmc7gx2z8h1jxrb"; - }; - - cargoHash = "sha256-L0x8VKBqTOB6hUWumz91Q5Krofx7DLxLDQnHvi/Lq80="; - - meta = { - description = "tags for markdown file"; - homepage = "https://github.com/wsdjeg/mdctags.rs"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ pacien ]; - mainProgram = "mdctags"; - }; -} diff --git a/pkgs/development/tools/misc/micronucleus/default.nix b/pkgs/development/tools/misc/micronucleus/default.nix deleted file mode 100644 index d7141324dc97..000000000000 --- a/pkgs/development/tools/misc/micronucleus/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv -, libusb-compat-0_1 -, fetchFromGitHub -, lib -}: -stdenv.mkDerivation rec { - pname = "micronucleus"; - version = "2.04"; - - sourceRoot = "${src.name}/commandline"; - - src = fetchFromGitHub { - owner = "micronucleus"; - repo = "micronucleus"; - rev = version; - sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in"; - }; - - buildInputs = [ libusb-compat-0_1 ]; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/lib/udev - cp micronucleus $out/bin - cp 49-micronucleus.rules $out/lib/udev - ''; - - meta = with lib; { - description = "Upload tool for micronucleus"; - mainProgram = "micronucleus"; - homepage = "https://github.com/micronucleus/micronucleus"; - license = licenses.gpl3; - maintainers = [ maintainers.cab404 ]; - }; -} diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix deleted file mode 100644 index 1b3355b7cc45..000000000000 --- a/pkgs/development/tools/misc/mkcert/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "mkcert"; - version = "1.4.4"; - - src = fetchFromGitHub { - owner = "FiloSottile"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-FMAXjRL+kJ/hwGmaWBy8ecON+JCMgRytfpryeLWsSVc="; - }; - - vendorHash = "sha256-DdA7s+N5S1ivwUgZ+M2W/HCp/7neeoqRQL0umn3m6Do="; - - doCheck = false; - - ldflags = [ - "-s" "-w" "-X main.Version=v${version}" - ]; - - meta = with lib; { - homepage = "https://github.com/FiloSottile/mkcert"; - description = "Simple tool for making locally-trusted development certificates"; - mainProgram = "mkcert"; - license = licenses.bsd3; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix deleted file mode 100644 index 0d4d5c2c4331..000000000000 --- a/pkgs/development/tools/misc/msitools/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, vala -, gobject-introspection -, perl -, bison -, gettext -, glib -, pkg-config -, libgsf -, gcab -, bzip2 -, gnome -}: - -stdenv.mkDerivation rec { - pname = "msitools"; - version = "0.103"; - - src = fetchurl { - url = "mirror://gnome/sources/msitools/${lib.versions.majorMinor version}/msitools-${version}.tar.xz"; - hash = "sha256-0XYi7rvzf6TAm1m+C8jbCLJr4wCmcxx02h684mK86Dk="; - }; - - nativeBuildInputs = [ - meson - ninja - vala - gobject-introspection - perl - bison - gettext - pkg-config - ]; - - buildInputs = [ - glib - libgsf - gcab - bzip2 - ]; - - # WiX tests fail on darwin - doCheck = !stdenv.isDarwin; - - postPatch = '' - patchShebangs subprojects/bats-core/{bin,libexec} - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - description = "Set of programs to inspect and build Windows Installer (.MSI) files"; - homepage = "https://gitlab.gnome.org/GNOME/msitools"; - license = with licenses; [ - # Library - lgpl21Plus - # Tools - gpl2Plus - ]; - maintainers = with maintainers; [ PlushBeaver ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/n98-magerun/default.nix b/pkgs/development/tools/misc/n98-magerun/default.nix deleted file mode 100644 index c52fd68473b1..000000000000 --- a/pkgs/development/tools/misc/n98-magerun/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, fetchFromGitHub -, php81 -}: - -php81.buildComposerProject (finalAttrs: { - pname = "n98-magerun"; - version = "2.3.0"; - - src = fetchFromGitHub { - owner = "netz98"; - repo = "n98-magerun"; - rev = finalAttrs.version; - hash = "sha256-/RffdYgl2cs8mlq4vHtzUZ6j0viV8Ot/cB/cB1dstFM="; - }; - - vendorHash = "sha256-n608AY6AQdVuN3hfVQk02vJQ6hl/0+4LVBOsBL5o3+8="; - - meta = { - changelog = "https://magerun.net/category/magerun/"; - description = "Swiss army knife for Magento1/OpenMage developers"; - homepage = "https://magerun.net/"; - license = lib.licenses.mit; - mainProgram = "n98-magerun"; - maintainers = lib.teams.php.members; - }; -}) diff --git a/pkgs/development/tools/misc/namaka/default.nix b/pkgs/development/tools/misc/namaka/default.nix deleted file mode 100644 index 50259d691cbc..000000000000 --- a/pkgs/development/tools/misc/namaka/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, installShellFiles -, pkg-config -, oniguruma -}: - -rustPlatform.buildRustPackage rec { - pname = "namaka"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "nix-community"; - repo = "namaka"; - rev = "v${version}"; - hash = "sha256-CLGEW11Fo1v4vj0XSqiyW1EbhRZFO7dkgM43eKwItrk="; - }; - - cargoHash = "sha256-exftXTO/NbTfd7gNPpZ886jXH1XveqX+Cl/gXpZlS4c="; - - nativeBuildInputs = [ - installShellFiles - pkg-config - ]; - - buildInputs = [ - oniguruma - ]; - - env = { - GEN_ARTIFACTS = "artifacts"; - RUSTONIG_SYSTEM_LIBONIG = true; - }; - - postInstall = '' - installManPage artifacts/*.1 - installShellCompletion artifacts/namaka.{bash,fish} --zsh artifacts/_namaka - ''; - - meta = with lib; { - description = "Snapshot testing tool for Nix based on haumea"; - mainProgram = "namaka"; - homepage = "https://github.com/nix-community/namaka"; - changelog = "https://github.com/nix-community/namaka/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/netcoredbg/default.nix b/pkgs/development/tools/misc/netcoredbg/default.nix deleted file mode 100644 index d3c08025108e..000000000000 --- a/pkgs/development/tools/misc/netcoredbg/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib, clangStdenv, stdenv, cmake, autoPatchelfHook, fetchFromGitHub, dotnetCorePackages, buildDotnetModule, netcoredbg, testers }: -let - pname = "netcoredbg"; - build = "1031"; - release = "3.1.0"; - version = "${release}-${build}"; - hash = "sha256-/ScV6NPGOun47D88e7BLisSOipeQWdUbYaEryrlPbHg="; - - coreclr-version = "v8.0.7"; - coreclr-src = fetchFromGitHub { - owner = "dotnet"; - repo = "runtime"; - rev = coreclr-version; - hash = "sha256-vxyhZ1Z5TB/2jpF4qiXTpUj1hKeqV7xPgG1BJYOLIko="; - }; - - dotnet-sdk = dotnetCorePackages.sdk_8_0; - - src = fetchFromGitHub { - owner = "Samsung"; - repo = pname; - rev = version; - inherit hash; - }; - - unmanaged = clangStdenv.mkDerivation { - inherit src pname version; - - nativeBuildInputs = [ cmake dotnet-sdk ]; - - hardeningDisable = [ "strictoverflow" ]; - - preConfigure = '' - export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 - ''; - - cmakeFlags = [ - "-DCORECLR_DIR=${coreclr-src}/src/coreclr" - "-DDOTNET_DIR=${dotnet-sdk}" - "-DBUILD_MANAGED=0" - ]; - }; - - managed = buildDotnetModule { - inherit pname version src dotnet-sdk; - - projectFile = "src/managed/ManagedPart.csproj"; - nugetDeps = ./deps.nix; - - # include platform-specific dbgshim binary in nugetDeps - dotnetFlags = [ "-p:UseDbgShimDependency=true" ]; - executables = [ ]; - - # this passes RID down to dotnet build command - # and forces dotnet to include binary dependencies in the output (libdbgshim) - selfContainedBuild = true; - }; -in -stdenv.mkDerivation { - inherit pname version; - # managed brings external binaries (libdbgshim.*) - # include source here so that autoPatchelfHook can do it's job - src = managed; - - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib ]; - installPhase = '' - mkdir -p $out/share/netcoredbg $out/bin - cp ${unmanaged}/* $out/share/netcoredbg - cp ./lib/netcoredbg/* $out/share/netcoredbg - # darwin won't work unless we link all files - ln -s $out/share/netcoredbg/* "$out/bin/" - ''; - - passthru = { - inherit (managed) fetch-deps; - tests.version = testers.testVersion { - package = netcoredbg; - command = "netcoredbg --version"; - version = "NET Core debugger ${release}"; - }; - }; - - meta = with lib; { - description = "Managed code debugger with MI interface for CoreCLR"; - homepage = "https://github.com/Samsung/netcoredbg"; - license = licenses.mit; - platforms = platforms.unix; - mainProgram = "netcoredbg"; - maintainers = with maintainers; [ leo60228 konradmalik ]; - }; -} diff --git a/pkgs/development/tools/misc/netcoredbg/deps.nix b/pkgs/development/tools/misc/netcoredbg/deps.nix deleted file mode 100644 index 12e4c86a157f..000000000000 --- a/pkgs/development/tools/misc/netcoredbg/deps.nix +++ /dev/null @@ -1,122 +0,0 @@ -# This file was automatically generated by passthru.fetch-deps. -# Please dont edit it manually, your changes might get overwritten! - -{ fetchNuGet }: [ - (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 deleted file mode 100644 index 76729d71e401..000000000000 --- a/pkgs/development/tools/misc/ninka/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, fetchFromGitHub, perl, perlPackages }: - -perlPackages.buildPerlPackage { - pname = "ninka"; - version = "2.0-pre"; - - src = fetchFromGitHub { - owner = "dmgerman"; - repo = "ninka"; - rev = "b89b59ecd057dfc939d0c75acaddebb58fcd8cba"; - sha256 = "1grlis1kycbcjvjgqvn7aw81q1qx49ahvxg2k7cgyr79mvgpgi9m"; - }; - - buildInputs = with perlPackages; [ perl TestOutput DBDSQLite DBI TestPod TestPodCoverage SpreadsheetParseExcel ]; - - doCheck = false; # hangs - - preConfigure = '' - sed -i.bak -e 's;#!/usr/bin/perl;#!${perl}/bin/perl;g' \ - ./bin/ninka-excel ./bin/ninka ./bin/ninka-sqlite \ - ./scripts/unify.pl ./scripts/parseLicense.pl \ - ./scripts/license_matcher_modified.pl \ - ./scripts/sort_package_license_list.pl - perl Makefile.PL - ''; - - meta = with lib; { - description = "Sentence based license detector"; - mainProgram = "ninka"; - homepage = "http://ninka.turingmachine.org/"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/nix-bisect/default.nix b/pkgs/development/tools/misc/nix-bisect/default.nix deleted file mode 100644 index 9927be16d36a..000000000000 --- a/pkgs/development/tools/misc/nix-bisect/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, fetchFromGitHub -, python3 -}: - -let - pname = "nix-bisect"; - version = "0.4.1-unstable-2024-04-19"; -in -python3.pkgs.buildPythonApplication { - inherit pname version; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "timokau"; - repo = pname; - rev = "4f26082fec0817acbfa8cc6ca4c25caaf77ddcd2"; - hash = "sha256-zyeE1jYo/9NEG8fB4gQBAR01siP4tyLvjjHN1yUS4Ug="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - appdirs - numpy - pexpect - ]; - - doCheck = false; - - meta = with lib; { - description = "Bisect nix builds"; - homepage = "https://github.com/timokau/nix-bisect"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; - }; -} diff --git a/pkgs/development/tools/misc/nix-build-uncached/default.nix b/pkgs/development/tools/misc/nix-build-uncached/default.nix deleted file mode 100644 index 0aa894b3effe..000000000000 --- a/pkgs/development/tools/misc/nix-build-uncached/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: - -buildGoModule rec { - pname = "nix-build-uncached"; - version = "1.1.2"; - - src = fetchFromGitHub { - owner = "Mic92"; - repo = "nix-build-uncached"; - rev = "v${version}"; - sha256 = "sha256-n9Koi01Te77bpYbRX46UThyD2FhCu9OGHd/6xDQLqjQ="; - }; - - vendorHash = null; - - doCheck = false; - - nativeBuildInputs = [ makeWrapper ]; - - meta = with lib; { - description = "CI friendly wrapper around nix-build"; - mainProgram = "nix-build-uncached"; - license = licenses.mit; - homepage = "https://github.com/Mic92/nix-build-uncached"; - maintainers = [ maintainers.mic92 ]; - }; -} diff --git a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix deleted file mode 100644 index 78a04adde797..000000000000 --- a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, bzip2 -, installShellFiles -, libusb1 -, libzip -, openssl -, zstd -}: - -stdenv.mkDerivation rec { - pname = "nxpmicro-mfgtools"; - version = "1.5.139"; - - src = fetchFromGitHub { - owner = "nxp-imx"; - repo = "mfgtools"; - rev = "uuu_${version}"; - sha256 = "sha256-t5usUGbcdLQlqPpZkNDeGncka9VfkpO7U933Kw/Sm7U="; - }; - - nativeBuildInputs = [ cmake pkg-config installShellFiles ]; - - buildInputs = [ bzip2 libusb1 libzip openssl zstd ]; - - preConfigure = "echo ${version} > .tarball-version"; - - postInstall = '' - # rules printed by the following invocation are static, - # they come from hardcoded configs in libuuu/config.cpp:48 - $out/bin/uuu -udev > udev-rules 2>stderr.txt - rules_file="$(cat stderr.txt|grep '1: put above udev run into'|sed 's|^.*/||')" - install -D udev-rules "$out/lib/udev/rules.d/$rules_file" - installShellCompletion --cmd uuu \ - --bash ../snap/local/bash-completion/universal-update-utility - ''; - - meta = with lib; { - description = "Freescale/NXP I.MX chip image deploy tools"; - longDescription = '' - UUU (Universal Update Utility) is a command line tool, evolved out of - MFGTools (aka MFGTools v3). - - One of the main purposes is to upload images to I.MX SoC's using at least - their boot ROM. - - With time, the need for an update utility portable to Linux and Windows - increased. UUU has the same usage on both Windows and Linux. It means the same - script works on both OS. - ''; - homepage = "https://github.com/NXPmicro/mfgtools"; - license = licenses.bsd3; - maintainers = with maintainers; [ bmilanov jraygauthier ]; - mainProgram = "uuu"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix deleted file mode 100644 index c811925fbe63..000000000000 --- a/pkgs/development/tools/misc/objconv/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - pname = "objconv"; - version = "2.54"; - - src = fetchurl { - # Versioned archive of objconv sources maintained by orivej. - url = "https://archive.org/download/objconv/${pname}-${version}.zip"; - sha256 = "sha256-SDwnpPHc2NyctxKROrhjCDXs36WGj8js5blaQkUibWE="; - }; - - nativeBuildInputs = [ unzip ]; - - outputs = [ "out" "doc" ]; - - unpackPhase = '' - mkdir -p "$name" - cd "$name" - unpackFile "$src" - unpackFile source.zip - ''; - - buildPhase = "c++ -o objconv -O2 *.cpp"; - - installPhase = '' - mkdir -p $out/bin $out/doc/objconv - mv objconv $out/bin - mv objconv-instructions.pdf $out/doc/objconv - ''; - - meta = with lib; { - description = "Object and executable file converter, modifier and disassembler"; - mainProgram = "objconv"; - homepage = "https://www.agner.org/optimize/"; - license = licenses.gpl2; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/om4/default.nix b/pkgs/development/tools/misc/om4/default.nix deleted file mode 100644 index 4425ae52fb5f..000000000000 --- a/pkgs/development/tools/misc/om4/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchFromGitHub, bison, flex, lib }: - -stdenv.mkDerivation rec { - pname = "om4"; - version = "6.7"; - - src = fetchFromGitHub { - owner = "ibara"; - repo = "m4"; - rev = "${pname}-${version}"; - sha256 = "04h76hxwb5rs3ylkw1dv8k0kmkzl84ccqlwdwxb6i0x57rrqbgzx"; - }; - - strictDeps = true; - nativeBuildInputs = [ bison flex ]; - - configureFlags = [ "--enable-m4" ]; - - meta = with lib; { - description = "Portable OpenBSD m4 macro processor"; - homepage = "https://github.com/ibara/m4"; - license = with licenses; [ bsd2 bsd3 isc publicDomain ]; - mainProgram = "m4"; - platforms = platforms.unix; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix deleted file mode 100644 index 3390127d678a..000000000000 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "opengrok"; - version = "1.13.21"; - - # binary distribution - src = fetchurl { - url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-xzg2KTZpa8DkxifQH7Q6pvyNEZj/mnXkBktNThMbI5k="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -a * $out/ - makeWrapper ${jre}/bin/java $out/bin/opengrok \ - --add-flags "-jar $out/lib/opengrok.jar" - - runHook postInstall - ''; - - meta = with lib; { - description = "Source code search and cross reference engine"; - mainProgram = "opengrok"; - homepage = "https://opengrok.github.io/OpenGrok/"; - changelog = "https://github.com/oracle/opengrok/releases/tag/${version}"; - license = licenses.cddl; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/orogene/default.nix b/pkgs/development/tools/misc/orogene/default.nix deleted file mode 100644 index 218fdf706885..000000000000 --- a/pkgs/development/tools/misc/orogene/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, openssl -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "orogene"; - version = "0.3.34"; - - src = fetchFromGitHub { - owner = "orogene"; - repo = "orogene"; - rev = "v${version}"; - hash = "sha256-GMWrlvZZ2xlcvcRG3u8jS8KiewHpyX0brNe4pmCpHbM="; - fetchSubmodules = true; - }; - - cargoHash = "sha256-I9uh8jV1hH5R/UHM3mz2/ZA7QY4O9gW5qXlVSfao0ZM="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - preCheck = '' - export CI=true - export HOME=$(mktemp -d) - ''; - - meta = with lib; { - description = "Package manager for tools that use node_modules"; - homepage = "https://github.com/orogene/orogene"; - changelog = "https://github.com/orogene/orogene/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ asl20 isc ]; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "oro"; - }; -} diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 951493b84395..646fbb1aff14 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; passthru = { updateScript = unstableGitUpdater { diff --git a/pkgs/development/tools/misc/patsh/default.nix b/pkgs/development/tools/misc/patsh/default.nix deleted file mode 100644 index 476fe420a678..000000000000 --- a/pkgs/development/tools/misc/patsh/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, runCommand -, rustPlatform -, fetchFromGitHub -, stdenv -, coreutils -}: - -let - # copied from flake.nix - # tests require extra setup with nix - custom = runCommand "custom" { } '' - mkdir -p $out/bin - touch $out/bin/{'foo$','foo"`'} - chmod +x $out/bin/{'foo$','foo"`'} - ''; -in - -rustPlatform.buildRustPackage rec { - pname = "patsh"; - version = "0.2.1"; - - src = fetchFromGitHub { - owner = "nix-community"; - repo = "patsh"; - rev = "v${version}"; - sha256 = "sha256-d2Br4RAlKO7Bpse8sFbIDCIYd2fYvby0ar9oIbQS2jc="; - }; - - cargoHash = "sha256-hAWMm3YjwTB8ajn3QeXEOJYmPzbbitdwyO4k/IyhlOI="; - - nativeCheckInputs = [ custom ]; - - # see comment on `custom` - postPatch = '' - for file in tests/fixtures/*-expected.sh; do - substituteInPlace $file \ - --subst-var-by cc ${stdenv.cc} \ - --subst-var-by coreutils ${coreutils} \ - --subst-var-by custom ${custom} - done - ''; - - meta = with lib; { - description = "Command-line tool for patching shell scripts inspired by resholve"; - mainProgram = "patsh"; - homepage = "https://github.com/nix-community/patsh"; - changelog = "https://github.com/nix-community/patsh/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/perfect-hash/default.nix b/pkgs/development/tools/misc/perfect-hash/default.nix deleted file mode 100644 index 124758e571e9..000000000000 --- a/pkgs/development/tools/misc/perfect-hash/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, python3, fetchFromGitHub }: -python3.pkgs.buildPythonApplication rec { - pname = "perfect-hash"; - version = "0.4.1"; - - # Archive on pypi does not contain examples, which are very helpful to - # understand how to use this program, so we use git source. - src = fetchFromGitHub { - owner = "ilanschnell"; - repo = "perfect-hash"; - rev = version; - sha256 = "0gkc3n613hl0q4jknrh2nm1n96j97p36q9jjgarb9d8yii9q7792"; - }; - - postInstall = '' - mkdir -p $out/share/doc/perfect-hash - cp README.md $out/share/doc/perfect-hash - cp -r examples $out/share/doc/perfect-hash - ''; - - meta = with lib; { - description = "Minimal perfect hash function generator"; - mainProgram = "perfect-hash"; - longDescription = '' - Generate a minimal perfect hash function for a given set of keys. - A given code template is filled with parameters, such that the - output is code which implements the hash function. Templates can - easily be constructed for any programming language. - ''; - license = licenses.bsd3; - maintainers = [ maintainers.kaction ]; - - homepage = "https://github.com/ilanschnell/perfect-hash"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/pest-ide-tools/default.nix b/pkgs/development/tools/misc/pest-ide-tools/default.nix deleted file mode 100644 index a962444a6fa5..000000000000 --- a/pkgs/development/tools/misc/pest-ide-tools/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, nix-update-script -, pkg-config -, openssl -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "pest-ide-tools"; - version = "0.3.11"; - cargoHash = "sha256-ZD8UQbkk5JhkanBkzo+c86DZE4aD44ma5cN97aKx97U="; - - src = fetchFromGitHub { - owner = "pest-parser"; - repo = "pest-ide-tools"; - rev = "v${version}"; - sha256 = "sha256-12/FndzUbUlgcYcwMT1OfamSKgy2q+CvtGyx5YY4IFQ="; - }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "IDE support for Pest, via the LSP"; - homepage = "https://pest.rs"; - license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ nickhu ]; - mainProgram = "pest-language-server"; - }; -} diff --git a/pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch b/pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch deleted file mode 100644 index c1dd808e6008..000000000000 --- a/pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch +++ /dev/null @@ -1,324 +0,0 @@ ---- a/glib/configure.ac 2013-08-04 20:21:20.808722600 -0500 -+++ b/glib/configure.ac 2013-08-04 18:30:21.852852200 -0500 -@@ -1880,7 +1880,7 @@ dnl ************************************ - - AC_MSG_CHECKING(for platform-dependent source) - case "$host" in -- *-*-cygwin*|*-*-mingw*) -+ *-*-mingw*) - PLATFORMDEP=gwin32.lo - ;; - *) -@@ -2594,9 +2594,6 @@ dnl *** Win32 API libs *** - dnl ********************** - - case $host in -- *-*-cygwin*) -- G_LIBS_EXTRA="-luser32 -lkernel32" -- ;; - *-*-mingw*) - G_LIBS_EXTRA="-lws2_32 -lole32 -lwinmm -lshlwapi" - ;; ---- a/glib/glib/gatomic.c 2013-08-04 20:21:20.907728300 -0500 -+++ b/glib/glib/gatomic.c 2013-08-04 18:11:14.000000000 -0500 -@@ -464,7 +464,7 @@ gsize - return g_atomic_pointer_xor ((volatile gpointer *) atomic, val); - } - --#elif defined (G_PLATFORM_WIN32) -+#elif defined (G_OS_WIN32) - - #include <windows.h> - #if !defined(_M_AMD64) && !defined (_M_IA64) && !defined(_M_X64) && !(defined _MSC_VER && _MSC_VER <= 1200) ---- a/glib/glib/gcharset.c 2013-08-04 20:21:20.925729300 -0500 -+++ b/glib/glib/gcharset.c 2013-08-04 18:11:14.000000000 -0500 -@@ -496,7 +496,7 @@ guess_category_value (const gchar *categ - if ((retval != NULL) && (retval[0] != '\0')) - return retval; - --#ifdef G_PLATFORM_WIN32 -+#ifdef G_OS_WIN32 - /* g_win32_getlocale() first checks for LC_ALL, LC_MESSAGES and - * LANG, which we already did above. Oh well. The main point of - * calling g_win32_getlocale() is to get the thread's locale as used ---- a/glib/glib/gconvert.c 2013-08-04 20:21:20.933729800 -0500 -+++ b/glib/glib/gconvert.c 2013-08-04 18:11:14.000000000 -0500 -@@ -33,9 +33,6 @@ - - #ifdef G_OS_WIN32 - #include "win_iconv.c" --#endif -- --#ifdef G_PLATFORM_WIN32 - #define STRICT - #include <windows.h> - #undef STRICT -@@ -1258,7 +1255,7 @@ g_locale_from_utf8 (const gchar *utf8str - charset, "UTF-8", bytes_read, bytes_written, error); - } - --#ifndef G_PLATFORM_WIN32 -+#ifndef G_OS_WIN32 - - typedef struct _GFilenameCharsetCache GFilenameCharsetCache; - -@@ -1374,7 +1371,7 @@ g_get_filename_charsets (const gchar *** - return cache->is_utf8; - } - --#else /* G_PLATFORM_WIN32 */ -+#else /* G_OS_WIN32 */ - - gboolean - g_get_filename_charsets (const gchar ***filename_charsets) -@@ -1403,7 +1400,7 @@ g_get_filename_charsets (const gchar *** - #endif - } - --#endif /* G_PLATFORM_WIN32 */ -+#endif /* G_OS_WIN32 */ - - static gboolean - get_filename_charset (const gchar **filename_charset) ---- a/glib/glib/gfileutils.c 2013-08-04 20:21:20.942730300 -0500 -+++ b/glib/glib/gfileutils.c 2013-08-04 18:11:14.000000000 -0500 -@@ -2153,7 +2153,7 @@ g_path_skip_root (const gchar *file_name - { - g_return_val_if_fail (file_name != NULL, NULL); - --#ifdef G_PLATFORM_WIN32 -+#ifdef G_OS_WIN32 - /* Skip \\server\share or //server/share */ - if (G_IS_DIR_SEPARATOR (file_name[0]) && - G_IS_DIR_SEPARATOR (file_name[1]) && -@@ -2163,7 +2163,6 @@ g_path_skip_root (const gchar *file_name - gchar *p; - p = strchr (file_name + 2, G_DIR_SEPARATOR); - --#ifdef G_OS_WIN32 - { - gchar *q; - -@@ -2171,7 +2170,6 @@ g_path_skip_root (const gchar *file_name - if (p == NULL || (q != NULL && q < p)) - p = q; - } --#endif - - if (p && p > file_name + 2 && p[1]) - { ---- a/glib/glib/glib.h 2013-08-04 20:21:20.949730700 -0500 -+++ b/glib/glib/glib.h 2013-08-04 18:11:14.000000000 -0500 -@@ -96,7 +96,7 @@ - #include <glib/gvariant.h> - #include <glib/gversion.h> - #include <glib/gversionmacros.h> --#ifdef G_PLATFORM_WIN32 -+#ifdef G_OS_WIN32 - #include <glib/gwin32.h> - #endif - ---- a/glib/glib/gutf8.c 2013-08-04 20:21:20.984732700 -0500 -+++ b/glib/glib/gutf8.c 2013-08-04 18:11:14.000000000 -0500 -@@ -27,7 +27,7 @@ - #endif - #include <string.h> - --#ifdef G_PLATFORM_WIN32 -+#ifdef G_OS_WIN32 - #include <stdio.h> - #define STRICT - #include <windows.h> ---- a/glib/glib/gutils.c 2013-08-04 20:21:21.015734500 -0500 -+++ b/glib/glib/gutils.c 2013-08-04 18:11:14.000000000 -0500 -@@ -72,7 +72,7 @@ - #include "garray.h" - #include "glibintl.h" - --#ifdef G_PLATFORM_WIN32 -+#ifdef G_OS_WIN32 - #include "gconvert.h" - #include "gwin32.h" - #endif -@@ -86,16 +86,13 @@ - * These are portable utility functions. - */ - --#ifdef G_PLATFORM_WIN32 -+#ifdef G_OS_WIN32 - # include <windows.h> - # ifndef GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS - # define GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT 2 - # define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS 4 - # endif - # include <lmcons.h> /* For UNLEN */ --#endif /* G_PLATFORM_WIN32 */ -- --#ifdef G_OS_WIN32 - # include <direct.h> - # include <shlobj.h> - /* older SDK (e.g. msvc 5.0) does not have these*/ -@@ -131,7 +128,7 @@ - #include <langinfo.h> - #endif - --#ifdef G_PLATFORM_WIN32 -+#ifdef G_OS_WIN32 - - gchar * - _glib_get_dll_directory (void) ---- a/glib/glib/gutils.h 2013-08-04 20:21:21.067737500 -0500 -+++ b/glib/glib/gutils.h 2013-08-04 18:11:14.000000000 -0500 -@@ -350,7 +350,7 @@ g_bit_storage (gulong number) - * On non-Windows platforms, expands to nothing. - */ - --#ifndef G_PLATFORM_WIN32 -+#ifndef G_OS_WIN32 - # define G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name) - #else - # define G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name) \ -@@ -378,7 +378,7 @@ DllMain (HINSTANCE hinstDLL, \ - - #endif /* !G_DISABLE_DEPRECATED */ - --#endif /* G_PLATFORM_WIN32 */ -+#endif /* G_OS_WIN32 */ - - G_END_DECLS - ---- a/glib/glib/gwin32.h 2013-08-04 20:21:21.081738300 -0500 -+++ b/glib/glib/gwin32.h 2013-08-04 18:11:14.000000000 -0500 -@@ -33,7 +33,7 @@ - - #include <glib/gtypes.h> - --#ifdef G_PLATFORM_WIN32 -+#ifdef G_OS_WIN32 - - G_BEGIN_DECLS - -@@ -41,8 +41,6 @@ G_BEGIN_DECLS - #define MAXPATHLEN 1024 - #endif - --#ifdef G_OS_WIN32 -- - /* - * To get prototypes for the following POSIXish functions, you have to - * include the indicated non-POSIX headers. The functions are defined -@@ -68,7 +66,6 @@ G_BEGIN_DECLS - GLIB_AVAILABLE_IN_ALL - gint g_win32_ftruncate (gint f, - guint size); --#endif /* G_OS_WIN32 */ - - /* The MS setlocale uses locale names of the form "English_United - * States.1252" etc. We want the Unixish standard form "en", "zh_TW" -@@ -112,7 +109,7 @@ gchar* g_win32_locale_filename_ - - G_END_DECLS - --#endif /* G_PLATFORM_WIN32 */ -+#endif /* G_OS_WIN32 */ - - #ifdef G_OS_WIN32 - #ifdef _WIN64 ---- a/glib/glib/libcharset/localcharset.c 2013-08-04 20:21:21.095739100 -0500 -+++ b/glib/glib/libcharset/localcharset.c 2013-08-04 18:11:14.000000000 -0500 -@@ -46,10 +46,6 @@ - # include <locale.h> - # endif - # endif --# ifdef __CYGWIN__ --# define WIN32_LEAN_AND_MEAN --# include <windows.h> --# endif - #elif defined WIN32_NATIVE - # define WIN32_LEAN_AND_MEAN - # include <windows.h> -@@ -111,7 +107,7 @@ _g_locale_get_charset_aliases (void) - cp = charset_aliases; - if (cp == NULL) - { --#if !(defined VMS || defined WIN32_NATIVE || defined __CYGWIN__) -+#if !(defined VMS || defined WIN32_NATIVE) - FILE *fp; - const char *dir; - const char *base = "charset.alias"; -@@ -237,7 +233,7 @@ _g_locale_get_charset_aliases (void) - "DECKOREAN" "\0" "EUC-KR" "\0"; - # endif - --# if defined WIN32_NATIVE || defined __CYGWIN__ -+# if defined WIN32_NATIVE - /* To avoid the troubles of installing a separate file in the same - directory as the DLL and of retrieving the DLL's directory at - runtime, simply inline the aliases here. */ -@@ -292,53 +288,6 @@ _g_locale_charset_raw (void) - /* Most systems support nl_langinfo (CODESET) nowadays. */ - codeset = nl_langinfo (CODESET); - --# ifdef __CYGWIN__ -- /* Cygwin 2006 does not have locales. nl_langinfo (CODESET) always -- returns "US-ASCII". As long as this is not fixed, return the suffix -- of the locale name from the environment variables (if present) or -- the codepage as a number. */ -- if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0) -- { -- const char *locale; -- static char buf[2 + 10 + 1]; -- -- locale = getenv ("LC_ALL"); -- if (locale == NULL || locale[0] == '\0') -- { -- locale = getenv ("LC_CTYPE"); -- if (locale == NULL || locale[0] == '\0') -- locale = getenv ("LANG"); -- } -- if (locale != NULL && locale[0] != '\0') -- { -- /* If the locale name contains an encoding after the dot, return -- it. */ -- const char *dot = strchr (locale, '.'); -- -- if (dot != NULL) -- { -- const char *modifier; -- -- dot++; -- /* Look for the possible @... trailer and remove it, if any. */ -- modifier = strchr (dot, '@'); -- if (modifier == NULL) -- return dot; -- if (modifier - dot < sizeof (buf)) -- { -- memcpy (buf, dot, modifier - dot); -- buf [modifier - dot] = '\0'; -- return buf; -- } -- } -- } -- -- /* Woe32 has a function returning the locale's codepage as a number. */ -- sprintf (buf, "CP%u", GetACP ()); -- codeset = buf; -- } --# endif -- - # else - - /* On old systems which lack it, use setlocale or getenv. */ -diff --git a/glib/gtypes.h b/glib/gtypes.h -index c18e0bf..816685a 100644 ---- a/glib/glib/gtypes.h -+++ b/glib/glib/gtypes.h -@@ -462,7 +462,7 @@ G_END_DECLS - * properly get exported in Windows DLLs. - */ - #ifndef GLIB_VAR --# ifdef G_PLATFORM_WIN32 -+# ifdef G_OS_WIN32 - # ifdef GLIB_STATIC_COMPILATION - # define GLIB_VAR extern - # else /* !GLIB_STATIC_COMPILATION */ diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix deleted file mode 100644 index ae567bb01b73..000000000000 --- a/pkgs/development/tools/misc/pkg-config/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchurl, libiconv, vanilla ? false }: - -stdenv.mkDerivation rec { - pname = "pkg-config"; - version = "0.29.2"; - - src = fetchurl { - url = "https://pkg-config.freedesktop.org/releases/${pname}-${version}.tar.gz"; - sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg"; - }; - - outputs = [ "out" "man" "doc" ]; - strictDeps = true; - - # Process Requires.private properly, see - # http://bugs.freedesktop.org/show_bug.cgi?id=4738, migrated to - # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/28 - patches = lib.optional (!vanilla) ./requires-private.patch - ++ lib.optional stdenv.isCygwin ./2.36.3-not-win32.patch; - - # These three tests fail due to a (desired) behavior change from our ./requires-private.patch - postPatch = - # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion - # necessary for FreeBSD code path in configure - '' - substituteInPlace ./config.guess ./glib/config.guess --replace-fail /usr/bin/uname uname - '' + lib.optionalString (!vanilla) '' - rm -f check/check-requires-private check/check-gtk check/missing - ''; - - buildInputs = [ libiconv ]; - - configureFlags = [ "--with-internal-glib" ] - ++ lib.optionals (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ] - # Can't run these tests while cross-compiling - ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) - [ "glib_cv_stack_grows=no" - "glib_cv_uscore=no" - "ac_cv_func_posix_getpwuid_r=yes" - "ac_cv_func_posix_getgrgid_r=yes" - ]; - - env.NIX_CFLAGS_COMPILE = toString ( - # Silence "incompatible integer to pointer conversion passing 'gsize'" when building with Clang. - lib.optionals stdenv.cc.isClang ["-Wno-int-conversion"] - # Silence fprintf format errors when building for Windows. - ++ lib.optionals stdenv.hostPlatform.isWindows ["-Wno-error=format"] - ); - - enableParallelBuilding = true; - doCheck = true; - - postInstall = ''rm -f "$out"/bin/*-pkg-config''; # clean the duplicate file - - meta = with lib; { - description = "Tool that allows packages to find out information about other packages"; - homepage = "http://pkg-config.freedesktop.org/wiki/"; - platforms = platforms.all; - license = licenses.gpl2Plus; - mainProgram = "pkg-config"; - }; -} diff --git a/pkgs/development/tools/misc/pkg-config/requires-private.patch b/pkgs/development/tools/misc/pkg-config/requires-private.patch deleted file mode 100644 index d40aa9801379..000000000000 --- a/pkgs/development/tools/misc/pkg-config/requires-private.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/main.c b/main.c -index b61ca34..5a420c2 100644 ---- a/main.c -+++ b/main.c -@@ -602,10 +602,10 @@ main (int argc, char **argv) - else - disable_private_libs(); - -- /* honor Requires.private if any Cflags are requested or any static -+ /* honor Requires.private if any any static - * libs are requested */ - -- if (pkg_flags & CFLAGS_ANY || want_requires_private || want_exists || -+ if (want_requires_private || - (want_static_lib_list && (pkg_flags & LIBS_ANY))) - enable_requires_private(); - diff --git a/pkgs/development/tools/misc/planus/default.nix b/pkgs/development/tools/misc/planus/default.nix deleted file mode 100644 index 22cc165a93a5..000000000000 --- a/pkgs/development/tools/misc/planus/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, installShellFiles -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "planus"; - version = "0.4.0"; - - src = fetchCrate { - pname = "planus-cli"; - inherit version; - hash = "sha256-KpX4KSA2MjfRS8M0WVYpY4hoSvOOB7MUz7YKZwEGqj8="; - }; - - cargoHash = "sha256-yT/ZK5GG0rXpiaCQlQclK2iY8BXhhmiW/UDX9aL8wBQ="; - - nativeBuildInputs = [ - installShellFiles - ]; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd planus \ - --bash <($out/bin/planus generate-completions bash) \ - --fish <($out/bin/planus generate-completions fish) \ - --zsh <($out/bin/planus generate-completions zsh) - ''; - - meta = with lib; { - description = "Alternative compiler for flatbuffers"; - mainProgram = "planus"; - homepage = "https://github.com/planus-org/planus"; - changelog = "https://github.com/planus-org/planus/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/development/tools/misc/pmccabe/default.nix deleted file mode 100644 index 1fd58fd14a2f..000000000000 --- a/pkgs/development/tools/misc/pmccabe/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "pmccabe"; - version = "2.6"; - - src = fetchurl { - url = "http://http.debian.net/debian/pool/main/p/pmccabe/pmccabe_${version}.tar.gz"; - sha256 = "0a3h1b9fb87c82d5fbql5lc4gp338pa5s9i66dhw7zk8jdygx474"; - }; - - patches = [ - ./getopt_on_darwin.patch - ]; - - configurePhase = '' - sed -i -r Makefile \ - -e 's,/usr/,/,g' \ - -e "s,^DESTDIR =.*$,DESTDIR = $out," \ - -e "s,^INSTALL = install.*$,INSTALL = install," \ - -e "s,^all:.*$,all: \$(PROGS)," - ''; - - checkPhase = "make test"; - - doCheck = true; - - meta = with lib; { - description = "McCabe-style function complexity and line counting for C and C++"; - homepage = "https://people.debian.org/~bame/pmccabe/"; - license = licenses.gpl2Plus; - - longDescription = '' - pmccabe calculates McCabe-style cyclomatic complexity for C and - C++ source code. Per-function complexity may be used for - spotting likely trouble spots and for estimating testing - effort. - - pmccabe also includes a non-commented line counter, decomment which - only removes comments from source code; codechanges, a program to - calculate the amount of change which has occurred between two source - trees or files; and vifn, to invoke vi given a function name rather - than a file name. - ''; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch b/pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch deleted file mode 100644 index 534d6c1d6ef7..000000000000 --- a/pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/decomment.c b/decomment.c -index 400707a..aea29fd 100644 ---- a/decomment.c -+++ b/decomment.c -@@ -11,6 +11,10 @@ - #include "getopt.h" - #endif - -+#ifdef __APPLE__ -+#include "getopt.h" -+#endif -+ - #ifdef NEED_OPTIND - extern int optind; - #endif diff --git a/pkgs/development/tools/misc/polylith/default.nix b/pkgs/development/tools/misc/polylith/default.nix deleted file mode 100644 index 54c1954380f2..000000000000 --- a/pkgs/development/tools/misc/polylith/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchurl, jdk, runtimeShell }: - -stdenv.mkDerivation rec { - pname = "polylith"; - version = "0.2.21"; - - src = fetchurl { - url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar"; - sha256 = "sha256-w1STu6+OzEhZ3MnfXer6QRQauEfW15iMIiiMN+nxAe0="; - }; - - dontUnpack = true; - - passAsFile = [ "polyWrapper" ]; - polyWrapper = '' - #!${runtimeShell} - ARGS="" - while [ "$1" != "" ] ; do - ARGS="$ARGS $1" - shift - done - exec "${jdk}/bin/java" "-jar" "${src}" $ARGS - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp "$polyWrapperPath" $out/bin/poly - chmod a+x $out/bin/poly - - runHook postInstall - ''; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - - $out/bin/poly help | fgrep -q '${version}' - - runHook postInstallCheck - ''; - - meta = with lib; { - description = "Tool used to develop Polylith based architectures in Clojure"; - mainProgram = "poly"; - homepage = "https://github.com/polyfy/polylith"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.epl10; - maintainers = with maintainers; [ ericdallo jlesquembre ]; - platforms = jdk.meta.platforms; - }; -} diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix deleted file mode 100644 index d5c742841190..000000000000 --- a/pkgs/development/tools/misc/prelink/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv -, lib -, fetchgit -, autoreconfHook -, libelf -, libiberty -}: - -stdenv.mkDerivation rec { - pname = "prelink"; - version = "unstable-2019-06-24"; - - src = fetchgit { - url = "https://git.yoctoproject.org/git/prelink-cross"; - branchName = "cross_prelink"; - rev = "f9975537dbfd9ade0fc813bd5cf5fcbe41753a37"; - sha256 = "sha256-O9/oZooLRyUBBZX3SFcB6LFMmi2vQqkUlqtZnrq5oZc="; - }; - - strictDeps = true; - - configurePlatforms = [ "build" "host" ]; - - nativeBuildInputs = [ - autoreconfHook - ]; - - buildInputs = [ - stdenv.cc.libc - libelf - libiberty - ]; - - # most tests fail - doCheck = false; - - enableParallelBuilding = true; - - meta = with lib;{ - description = "ELF prelinking utility to speed up dynamic linking"; - homepage = "https://wiki.yoctoproject.org/wiki/Cross-Prelink"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ artturin ]; - }; -} diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix index 64ee0c37317d..e84d2a57c943 100644 --- a/pkgs/development/tools/misc/premake/5.nix +++ b/pkgs/development/tools/misc/premake/5.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-2R5gq4jaQsp8Ny1oGuIYkef0kn2UG9jMf20vq0714oY="; }; - buildInputs = [ libuuid ] ++ lib.optionals stdenv.isDarwin [ Foundation readline ]; + buildInputs = [ libuuid ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation readline ]; patches = [ ./no-curl-ca.patch ]; postPatch = '' substituteInPlace contrib/curl/premake5.lua \ --replace "ca = nil" "ca = '${cacert}/etc/ssl/certs/ca-bundle.crt'" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace premake5.lua \ --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5 \ --replace-fail '"-arch arm64"' '""' \ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; buildPhase = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' make -f Bootstrap.mak osx '' else '' make -f Bootstrap.mak linux diff --git a/pkgs/development/tools/misc/protox/default.nix b/pkgs/development/tools/misc/protox/default.nix deleted file mode 100644 index d8375a878676..000000000000 --- a/pkgs/development/tools/misc/protox/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -}: - -rustPlatform.buildRustPackage rec { - pname = "protox"; - version = "0.5.0"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-U9+7k7dQ6YFfsKMfFMg34g42qLvn+mcSRlAAys3eXNo="; - }; - - cargoHash = "sha256-sNOw19gxj+cEctxhXNWI8u15VJYlN8nSNl6Ha9sB/eE="; - - buildFeatures = [ "bin" ]; - - # tests are not included in the crate source - doCheck = false; - - meta = with lib; { - description = "Rust implementation of the protobuf compiler"; - mainProgram = "protox"; - homepage = "https://github.com/andrewhickman/protox"; - changelog = "https://github.com/andrewhickman/protox/blob/${version}/CHANGELOG.md"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/ptags/default.nix b/pkgs/development/tools/misc/ptags/default.nix deleted file mode 100644 index b855a648a537..000000000000 --- a/pkgs/development/tools/misc/ptags/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ fetchFromGitHub -, ctags -, lib -, makeWrapper -, rustPlatform -}: - -rustPlatform.buildRustPackage rec { - pname = "ptags"; - version = "0.3.5"; - - src = fetchFromGitHub { - owner = "dalance"; - repo = "ptags"; - rev = "v${version}"; - sha256 = "sha256-bxp38zWufqS6PZqhw8X5HR5zMRcwH58MuZaJmDRuiys="; - }; - - cargoHash = "sha256-Se4q4G3hzXIHHSY2YxeRHxU6+wnqR9bfrIQSOagFYZE="; - - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - # `ctags` must be accessible in `PATH` for `ptags` to work. - wrapProgram "$out/bin/ptags" \ - --prefix PATH : "${lib.makeBinPath [ ctags ]}" - ''; - - # Sanity check. - checkPhase = '' - $releaseDir/ptags --help > /dev/null - ''; - - meta = with lib; { - description = "Parallel universal-ctags wrapper for git repository"; - mainProgram = "ptags"; - homepage = "https://github.com/dalance/ptags"; - maintainers = with maintainers; [ pamplemousse ]; - license = licenses.mit; - }; -} diff --git a/pkgs/development/tools/misc/pwninit/default.nix b/pkgs/development/tools/misc/pwninit/default.nix index 341532d00422..d67c7e640611 100644 --- a/pkgs/development/tools/misc/pwninit/default.nix +++ b/pkgs/development/tools/misc/pwninit/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-tbZS7PdRFvO2ifoHA/w3cSPfqqHrLeLHAg6V8oG9gVE="; }; - buildInputs = [ openssl xz ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl xz ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config makeBinaryWrapper ]; postInstall = '' wrapProgram $out/bin/pwninit \ diff --git a/pkgs/development/tools/misc/python-launcher/default.nix b/pkgs/development/tools/misc/python-launcher/default.nix deleted file mode 100644 index 854f1e39e1a2..000000000000 --- a/pkgs/development/tools/misc/python-launcher/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub, python3 }: - -rustPlatform.buildRustPackage rec { - pname = "python-launcher"; - version = "1.0.1"; - - src = fetchFromGitHub { - owner = "brettcannon"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-wRKTBvLLo0Vvvh1GtF9hOnUHNpOeX950y1U+8JYBGoE="; - }; - - cargoHash = "sha256-+FtfL5jAGJrpnZaJDnDMvWC0D3Af0L466v9nqJkb+uA="; - - nativeCheckInputs = [ python3 ]; - - useNextest = true; - - meta = with lib; { - description = "Implementation of the `py` command for Unix-based platforms"; - homepage = "https://github.com/brettcannon/python-launcher"; - changelog = "https://github.com/brettcannon/python-launcher/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "py"; - }; -} diff --git a/pkgs/development/tools/misc/regex-cli/default.nix b/pkgs/development/tools/misc/regex-cli/default.nix deleted file mode 100644 index 0f197e66181d..000000000000 --- a/pkgs/development/tools/misc/regex-cli/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -}: - -rustPlatform.buildRustPackage rec { - pname = "regex-cli"; - version = "0.2.1"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-lHjChrjjqO7pApj7OA8BM2XvmU3iS+kEMPYSfb/C61U="; - }; - - cargoHash = "sha256-5uxy2iAIUh60QjEPtkOP7A86ha4CY5+1QgzdIsEKPIs="; - - meta = with lib; { - description = "Command line tool for debugging, ad hoc benchmarking and generating regular expressions"; - mainProgram = "regex-cli"; - homepage = "https://github.com/rust-lang/regex/tree/master/regex-cli"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix b/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix deleted file mode 100644 index 1ff4e5c62459..000000000000 --- a/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, libarchive, python3, file, which }: - -stdenv.mkDerivation rec { - pname = "remarkable-toolchain"; - version = "3.1.2"; - - src = fetchurl { - url = "https://storage.googleapis.com/remarkable-codex-toolchain/codex-x86_64-cortexa9hf-neon-rm10x-toolchain-${version}.sh"; - sha256 = "sha256-ocODUUx2pgmqxMk8J+D+OvqlSHBSay6YzcqnxC9n59w="; - executable = true; - }; - - nativeBuildInputs = [ - libarchive - python3 - file - which - ]; - - dontUnpack = true; - dontBuild = true; - - installPhase = '' - mkdir -p $out - ENVCLEANED=1 $src -y -d $out - ''; - - meta = with lib; { - description = "Toolchain for cross-compiling to reMarkable tablets"; - homepage = "https://remarkable.engineering/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ nickhu siraben ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix b/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix deleted file mode 100644 index 6e6b79e8f2e9..000000000000 --- a/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, libarchive, python3, file, which }: - -stdenv.mkDerivation rec { - pname = "remarkable2-toolchain"; - version = "3.1.2"; - - src = fetchurl { - url = "https://storage.googleapis.com/remarkable-codex-toolchain/codex-x86_64-cortexa7hf-neon-rm11x-toolchain-${version}.sh"; - sha256 = "sha256-JKMDRbkvoxwHiTm/o4JdLn3Mm2Ld1LyxTnCCwvnxk4c="; - executable = true; - }; - - nativeBuildInputs = [ - libarchive - python3 - file - which - ]; - - dontUnpack = true; - dontBuild = true; - - installPhase = '' - mkdir -p $out - ENVCLEANED=1 $src -y -d $out - ''; - - meta = with lib; { - description = "Toolchain for cross-compiling to reMarkable 2 tablets"; - homepage = "https://remarkable.engineering/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ tadfisher ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/tools/misc/replacement/default.nix b/pkgs/development/tools/misc/replacement/default.nix deleted file mode 100644 index fd0533852aef..000000000000 --- a/pkgs/development/tools/misc/replacement/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, fetchFromGitHub -, python3Packages -}: - -python3Packages.buildPythonApplication rec { - pname = "replacement"; - version = "0.4.4"; - - disabled = python3Packages.isPy27; - - src = fetchFromGitHub { - owner = "siriobalmelli"; - repo = "replacement"; - rev = "v${version}"; - sha256 = "0j4lvn3rx1kqvxcsd8nhc2lgk48jyyl7qffhlkvakhy60f9lymj3"; - }; - - propagatedBuildInputs = with python3Packages; [ - ruamel-yaml - ]; - - nativeCheckInputs = with python3Packages; [ - pytestCheckHook - sh - ]; - - meta = with lib; { - homepage = "https://github.com/siriobalmelli/replacement"; - description = "Tool to execute yaml templates and output text"; - mainProgram = "replacement"; - longDescription = '' - Replacement is a python utility - that parses a yaml template and outputs text. - - A 'template' is a YAML file containing a 'replacement' object. - - A 'replacement' object contains a list of blocks, - each of which is executed in sequence. - - This tool is useful in generating configuration files, - static websites and the like. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ siriobalmelli ]; - }; -} diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix deleted file mode 100644 index ec81d929a351..000000000000 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "reviewdog"; - version = "0.20.2"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - hash = "sha256-UB2cylJn90TE3ng9JaPwmpbkhuPOmRnlS/eCZSjfqwQ="; - }; - - vendorHash = "sha256-hFmUhA35J1c2Mp7SeaJF4+Jid8GfdsEiF7lEdPoYbS4="; - - doCheck = false; - - subPackages = [ "cmd/reviewdog" ]; - - ldflags = [ "-s" "-w" "-X github.com/reviewdog/reviewdog/commands.Version=${version}" ]; - - meta = with lib; { - description = "Automated code review tool integrated with any code analysis tools regardless of programming language"; - mainProgram = "reviewdog"; - homepage = "https://github.com/reviewdog/reviewdog"; - changelog = "https://github.com/reviewdog/reviewdog/blob/v${version}/CHANGELOG.md"; - maintainers = [ ]; - license = licenses.mit; - }; -} diff --git a/pkgs/development/tools/misc/rhai-doc/default.nix b/pkgs/development/tools/misc/rhai-doc/default.nix deleted file mode 100644 index dd07b8df9926..000000000000 --- a/pkgs/development/tools/misc/rhai-doc/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "rhai-doc"; - version = "0.2.3"; - - src = fetchFromGitHub { - owner = "rhaiscript"; - repo = "rhai-doc"; - rev = "v${version}"; - hash = "sha256-GZq5C8Q95OHKftEkps4Y6X6sAc4pzSfSq3ELUW/kPWI="; - }; - - cargoHash = "sha256-dJMqaDQVSrvZPwjPFixgqRRzxPJW/f1nO+81kHwGmYU="; - - meta = with lib; { - description = "Tool to auto-generate documentation for Rhai source code"; - homepage = "https://github.com/rhaiscript/rhai-doc"; - changelog = "https://github.com/rhaiscript/rhai-doc/releases/tag/${src.rev}"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "rhai-doc"; - }; -} diff --git a/pkgs/development/tools/misc/riff/default.nix b/pkgs/development/tools/misc/riff/default.nix deleted file mode 100644 index d6c7ee8164b9..000000000000 --- a/pkgs/development/tools/misc/riff/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, makeWrapper -, pkg-config -, openssl -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "riff"; - version = "1.0.3"; - - src = fetchFromGitHub { - owner = "DeterminateSystems"; - repo = pname; - rev = "v${version}"; - hash = "sha256-ThHkEvu+lWojHmEgcrwdZDPROfxznB7vv78msyZf90A="; - }; - - cargoHash = "sha256-knA08KqjtI2FZUbllfVETxDqi/r4Gf3VuLE17JujTzc="; - - nativeBuildInputs = [ - makeWrapper - pkg-config - ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - postInstall = '' - wrapProgram $out/bin/riff --set-default RIFF_DISABLE_TELEMETRY true - ''; - - meta = with lib; { - description = "Tool that automatically provides external dependencies for software projects"; - mainProgram = "riff"; - homepage = "https://riff.sh"; - changelog = "https://github.com/DeterminateSystems/riff/releases/tag/v${version}"; - license = licenses.mpl20; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/rman/default.nix b/pkgs/development/tools/misc/rman/default.nix deleted file mode 100644 index c3c044fef000..000000000000 --- a/pkgs/development/tools/misc/rman/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "rman"; - version = "3.2"; - - src = fetchurl { - url = "mirror://sourceforge/polyglotman/${version}/${pname}-${version}.tar.gz"; - sha256 = "0prdld6nbkdlkcgc2r1zp13h2fh8r0mlwxx423dnc695ddlk18b8"; - }; - - postPatch = '' - substituteInPlace Makefile \ - --replace ginstall install \ - --replace gcc '${stdenv.cc.targetPrefix}cc' - ''; - - makeFlags = [ "BINDIR=$(out)/bin" "MANDIR=$(out)/share/man" ]; - - preInstall = '' - mkdir -p $out/bin - mkdir -p $out/share/man - ''; - - hardeningDisable = [ "format" ]; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; - - doCheck = false; # "check" target is probably meant to do "installcheck" or something - - meta = { - description = "Parse formatted man pages and man page source from most flavors of UNIX and converts them to HTML, ASCII, TkMan, DocBook, and other formats"; - license = "artistic"; - platforms = lib.platforms.all; - mainProgram = "rman"; - }; -} diff --git a/pkgs/development/tools/misc/rolespec/default.nix b/pkgs/development/tools/misc/rolespec/default.nix deleted file mode 100644 index e5870d582e98..000000000000 --- a/pkgs/development/tools/misc/rolespec/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "rolespec"; - version = "20161104"; - - src = fetchFromGitHub { - owner = "nickjj"; - repo = "rolespec"; - rev = "d9ee530cd709168882059776c482fc37f46cb743"; - sha256 = "1jkidw6aqr0zfqwmcvlpi9qa140z2pxcfsd43xm5ikx6jcwjdrzl"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - # The default build phase (`make`) runs the test code. It's difficult to do - # the test in the build environment because it depends on the system package - # managers (apt/yum/pacman). We simply skip this phase since RoleSpec is - # shell based. - dontBuild = true; - - # Wrap the program because `ROLESPEC_LIB` defaults to - # `/usr/local/lib/rolespec`. - installPhase = '' - make install PREFIX=$out - wrapProgram $out/bin/rolespec --set ROLESPEC_LIB $out/lib/rolespec - ''; - - # Since RoleSpec installs the shell script files in `lib` directory, the - # fixup phase shows some warnings. Disable these actions. - dontPatchELF = true; - dontStrip = true; - - meta = with lib; { - homepage = "https://github.com/nickjj/rolespec"; - description = "Test library for testing Ansible roles"; - mainProgram = "rolespec"; - longDescription = '' - A shell based test library for Ansible that works both locally and over - Travis-CI. - ''; - downloadPage = "https://github.com/nickjj/rolespec"; - license = licenses.gpl3; - maintainers = [ maintainers.dochang ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/rsass/default.nix b/pkgs/development/tools/misc/rsass/default.nix deleted file mode 100644 index b71dca0b3953..000000000000 --- a/pkgs/development/tools/misc/rsass/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, rustPlatform, fetchCrate }: - -rustPlatform.buildRustPackage rec { - pname = "rsass"; - version = "0.28.10"; - - src = fetchCrate { - pname = "rsass-cli"; - inherit version; - hash = "sha256-/2U1+kCRpM36r2fHB6Hditnm2dSVHh08M0RIi3AIe44="; - }; - - cargoHash = "sha256-pCQOFBs+lNdjcyOqZ/GjJyOthepnaWAM1feEpegdrDo="; - - meta = with lib; { - description = "Sass reimplemented in rust with nom"; - mainProgram = "rsass"; - homepage = "https://github.com/kaj/rsass"; - changelog = "https://github.com/kaj/rsass/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/rsonpath/default.nix b/pkgs/development/tools/misc/rsonpath/default.nix deleted file mode 100644 index 02a867788a4b..000000000000 --- a/pkgs/development/tools/misc/rsonpath/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "rsonpath"; - version = "0.9.1"; - - src = fetchFromGitHub { - owner = "v0ldek"; - repo = "rsonpath"; - rev = "v${version}"; - hash = "sha256-3q0q9Bj/DPuDmHu2G9jrABFXU8xgbUUS7iTBguVWR5s="; - }; - - cargoHash = "sha256-bh72u1AvM6bGNQCjyu6GdAiK0jw5lE0SIdYzaZEjYg8="; - - cargoBuildFlags = [ "-p=rsonpath" ]; - cargoTestFlags = cargoBuildFlags; - - meta = with lib; { - description = "Experimental JSONPath engine for querying massive streamed datasets"; - homepage = "https://github.com/v0ldek/rsonpath"; - changelog = "https://github.com/v0ldek/rsonpath/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "rq"; - }; -} diff --git a/pkgs/development/tools/misc/rtss/default.nix b/pkgs/development/tools/misc/rtss/default.nix deleted file mode 100644 index 5545d90281cd..000000000000 --- a/pkgs/development/tools/misc/rtss/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "rtss"; - version = "0.6.2"; - - src = fetchFromGitHub { - owner = "Freaky"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-WeeZsB42/4SlIaWwKvOqWiPNV5p0QOToynI8ozVVxJM="; - }; - - cargoHash = "sha256-aHK9KBzRbU2IYr7vOdlz0Aw4iYGjD6VedbWPE/V7AVc="; - - meta = with lib; { - description = "Annotate output with relative durations between lines"; - mainProgram = "rtss"; - homepage = "https://github.com/Freaky/rtss"; - license = licenses.mit; - maintainers = with maintainers; [ djanatyn ]; - }; -} diff --git a/pkgs/development/tools/misc/runme/default.nix b/pkgs/development/tools/misc/runme/default.nix deleted file mode 100644 index 8299ceba5395..000000000000 --- a/pkgs/development/tools/misc/runme/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -, nodejs -, python3 -, runtimeShell -, stdenv -, testers -, runme -}: - -buildGoModule rec { - pname = "runme"; - version = "3.0.2"; - - src = fetchFromGitHub { - owner = "stateful"; - repo = "runme"; - rev = "v${version}"; - hash = "sha256-a+7Gff3Z1V17uaywoUE+nLVeVprB50Gslarcle/NPB8="; - }; - - vendorHash = "sha256-QoZzEq1aC7cjY/RVp5Z5HhSuTFf2BSYQnfg0jSaeTJU="; - - nativeBuildInputs = [ - installShellFiles - ]; - - nativeCheckInputs = [ - nodejs - python3 - ]; - - subPackages = [ - "." - ]; - - ldflags = [ - "-s" - "-w" - "-X=github.com/stateful/runme/internal/version.BuildDate=1970-01-01T00:00:00Z" - "-X=github.com/stateful/runme/internal/version.BuildVersion=${version}" - "-X=github.com/stateful/runme/internal/version.Commit=${src.rev}" - ]; - - # tests fail to access /etc/bashrc on darwin - doCheck = !stdenv.isDarwin; - - postPatch = '' - substituteInPlace testdata/{categories/basic,runall/basic,script/basic}.txtar \ - --replace /bin/bash "${runtimeShell}" - ''; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd runme \ - --bash <($out/bin/runme completion bash) \ - --fish <($out/bin/runme completion fish) \ - --zsh <($out/bin/runme completion zsh) - ''; - - passthru.tests = { - version = testers.testVersion { - package = runme; - }; - }; - - meta = with lib; { - description = "Execute commands inside your runbooks, docs, and READMEs"; - mainProgram = "runme"; - homepage = "https://runme.dev"; - changelog = "https://github.com/stateful/runme/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/rustywind/default.nix b/pkgs/development/tools/misc/rustywind/default.nix deleted file mode 100644 index 6ffcd67a5557..000000000000 --- a/pkgs/development/tools/misc/rustywind/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "rustywind"; - version = "0.22.0"; - - src = fetchFromGitHub { - owner = "avencera"; - repo = "rustywind"; - rev = "v${version}"; - hash = "sha256-dK8tO7rIsu1zVmA2reduBe8vM6L6oesig1tE+ajGSXM="; - }; - - cargoHash = "sha256-yZQSY2zqVpmhMd6+Avg2vBh0WQB2FJ2fiMuy5x9Zl9U="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - meta = with lib; { - description = "CLI for organizing Tailwind CSS classes"; - mainProgram = "rustywind"; - homepage = "https://github.com/avencera/rustywind"; - changelog = "https://github.com/avencera/rustywind/blob/${src.rev}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix deleted file mode 100644 index ce77855b419e..000000000000 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib, fetchurl, makeDesktopItem, appimageTools }: -let - name = "saleae-logic-2"; - version = "2.4.13"; - src = fetchurl { - url = "https://downloads.saleae.com/logic2/Logic-${version}-linux-x64.AppImage"; - hash = "sha256-0GIZQKQDY3arDUlxjQKWOHDB3j76xVwkx5H+8q+d0Rc="; - }; - desktopItem = makeDesktopItem { - inherit name; - exec = name; - icon = "Logic"; - comment = "Software for Saleae logic analyzers"; - desktopName = "Saleae Logic"; - genericName = "Logic analyzer"; - categories = [ "Development" ]; - }; -in -appimageTools.wrapType2 { - inherit name src; - - extraInstallCommands = - let - appimageContents = appimageTools.extractType2 { inherit name src; }; - in - '' - mkdir -p $out/etc/udev/rules.d - cp ${appimageContents}/resources/linux-x64/99-SaleaeLogic.rules $out/etc/udev/rules.d/ - mkdir -p $out/share/pixmaps - ln -s ${desktopItem}/share/applications $out/share/ - cp ${appimageContents}/usr/share/icons/hicolor/256x256/apps/Logic.png $out/share/pixmaps/Logic.png - ''; - - extraPkgs = pkgs: with pkgs; [ - wget - unzip - glib - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrender - xorg.libXtst - nss - nspr - dbus - gdk-pixbuf - gtk3 - pango - atk - cairo - expat - xorg.libXrandr - xorg.libXScrnSaver - alsa-lib - at-spi2-core - cups - libxcrypt-legacy - ]; - - meta = with lib; { - homepage = "https://www.saleae.com/"; - description = "Software for Saleae logic analyzers"; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ j-hui newam ]; - }; -} diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix deleted file mode 100644 index d4f17fb595d0..000000000000 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -# Saleae logic analyzer software -# -# Suggested udev rules to be able to access the Logic device without being root: -# SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="0925", ATTR{idProduct}=="3881", MODE="0666" -# SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="21a9", ATTR{idProduct}=="1001", MODE="0666" -# -# In NixOS, simply add this package to services.udev.packages. - -{ lib, stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft -, fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor -, freetype, libXinerama, libxcb, zlib, pciutils -, makeDesktopItem, xkeyboardconfig, dbus, runtimeShell, libGL -}: - -let - - libPath = lib.makeLibraryPath [ - glib libSM libICE gtk2 libXext libXft fontconfig libXrender libXfixes libX11 - libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc.lib - dbus libGL - ]; - -in - -assert stdenv.hostPlatform.system == "x86_64-linux"; - -stdenv.mkDerivation rec { - pname = "saleae-logic"; - version = "1.2.18"; - - src = fetchurl { - name = "saleae-logic-${version}-64bit.zip"; - url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip"; - sha256 = "0lhair2vsg8sjvzicvfcjfmvy30q7i01xj4z02iqh7pgzpb025h8"; - }; - - desktopItem = makeDesktopItem { - name = "saleae-logic"; - exec = "saleae-logic"; - icon = ""; # the package contains no icon - comment = "Software for Saleae logic analyzers"; - desktopName = "Saleae Logic"; - genericName = "Logic analyzer"; - categories = [ "Development" ]; - }; - - nativeBuildInputs = [ unzip ]; - - installPhase = '' - # Copy prebuilt app to $out - mkdir "$out" - cp -r * "$out" - - # Patch it - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/Logic" - for bin in "$out/Logic" \ - "$out/libQt5Widgets.so.5" \ - "$out/libQt5Gui.so.5" \ - "$out/libQt5Core.so.5" \ - "$out/libQt5Network.so.5" ; do - patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$bin" - done - - patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/../" "$out/platforms/libqxcb.so" - - # Build the LD_PRELOAD library that makes Logic work from a read-only directory - mkdir -p "$out/lib" - gcc -shared -fPIC -DOUT=\"$out\" "${./preload.c}" -o "$out/lib/preload.so" -ldl - - # Make wrapper script that uses the LD_PRELOAD library - mkdir -p "$out/bin" - cat > "$out/bin/saleae-logic" << EOF - #!${runtimeShell} - export LD_PRELOAD="$out/lib/preload.so" - export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb" - export PATH="${pciutils}/bin:\$PATH" - exec "$out/Logic" "\$@" - EOF - chmod a+x "$out"/bin/saleae-logic - - # Copy the generated .desktop file - mkdir -p "$out/share/applications" - cp "$desktopItem"/share/applications/* "$out/share/applications/" - - # Install provided udev rules - mkdir -p "$out/etc/udev/rules.d" - cp Drivers/99-SaleaeLogic.rules "$out/etc/udev/rules.d/" - ''; - - meta = with lib; { - description = "Software for Saleae logic analyzers"; - homepage = "https://www.saleae.com/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/development/tools/misc/saleae-logic/preload.c b/pkgs/development/tools/misc/saleae-logic/preload.c deleted file mode 100644 index b4451e4d99f7..000000000000 --- a/pkgs/development/tools/misc/saleae-logic/preload.c +++ /dev/null @@ -1,341 +0,0 @@ -/* - * LD_PRELOAD trick to make Saleae Logic work from a read-only installation - * directory. - * - * Saleae Logic tries to write to a few directories inside its installation - * directory. Because the Nix store is read-only, we have to redirect access to - * this file somewhere else. Here's the map: - * - * $out/Settings/ => $HOME/.saleae-logic/Settings/ - * $out/Databases/ => $HOME/.saleae-logic/Databases/ - * $out/Errors/ => $HOME/.saleae-logic/Errors/ - * $out/Calibration/ => $HOME/.saleae-logic/Calibration/ - * - * This also makes the software multi-user aware :-) - * - * NOTE: AFAIK (Bjørn Forsman), Logic version 1.2+ was supposed to have a - * command line parameter for redirecting these write operations, but - * apparently that feature got postponed. - * - * Usage: - * gcc -shared -fPIC -DOUT="$out" preload.c -o preload.so -ldl - * LD_PRELOAD=$PWD/preload.so ./result/Logic - * - * To see the paths that are modified at runtime, set the environment variable - * PRELOAD_DEBUG to 1 (or anything really; debugging is on as long as the - * variable exists). - */ - -#define _GNU_SOURCE -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <fcntl.h> -#include <dlfcn.h> -#include <limits.h> -#include <sys/stat.h> -#include <sys/types.h> -#include <errno.h> - -#ifndef OUT -#error Missing OUT define - path to the installation directory. -#endif - -/* - * TODO: How to properly wrap "open", which is declared as a variadic function - * in glibc? The man page lists these signatures: - * - * int open(const char *pathname, int flags); - * int open(const char *pathname, int flags, mode_t mode); - * - * But using either signature in this code cause a compile error, because - * glibc has declared the function as "int open(const char *, int, ...)". - * Same thing with "openat". - * - * For now we discard the variadic args. It seems to work. - * - * Relevant: - * http://stackoverflow.com/questions/28462523/how-to-wrap-ioctlint-d-unsigned-long-request-using-ld-preload - */ -typedef FILE *(*fopen_func_t)(const char *path, const char *mode); -typedef FILE *(*fopen64_func_t)(const char *path, const char *mode); -typedef int (*open_func_t)(const char *pathname, int flags, ...); -typedef int (*open64_func_t)(const char *pathname, int flags, ...); -typedef int (*openat_func_t)(int dirfd, const char *pathname, int flags, ...); -typedef int (*openat64_func_t)(int dirfd, const char *pathname, int flags, ...); -typedef int (*xstat_func_t)(int vers, const char *pathname, struct stat *buf); -typedef int (*xstat64_func_t)(int vers, const char *pathname, struct stat64 *buf); -typedef int (*access_func_t)(const char *pathname, int mode); -typedef int (*faccessat_func_t)(int dirfd, const char *pathname, int mode, int flags); -typedef int (*unlink_func_t)(const char *pathname); - -/* - * Redirect $out/{Settings,Databases,Errors,Calibration}/ => $HOME/.saleae-logic/. - * Path is truncated if bigger than PATH_MAX. - * - * @param pathname Original file path. - * @param buffer Pointer to a buffer of size PATH_MAX bytes that this function - * will write the new redirected path to (if needed). - * - * @return Pointer to the resulting path. It will either be equal to the - * pathname (no redirect) or buffer argument (was redirected). - */ -static const char *redirect(const char *pathname, char *buffer) -{ - const char *homepath; - const char *new_path; - static char have_warned; - const char *remainder; - static char have_initialized; - static size_t out_strlen; - static size_t settings_strlen; - static size_t databases_strlen; - static size_t errors_strlen; - static size_t calibration_strlen; - int ret; - int i; - - homepath = getenv("HOME"); - if (!homepath) { - homepath = "/"; - if (!have_warned && getenv("PRELOAD_DEBUG")) { - fprintf(stderr, "preload_debug: WARNING: HOME is unset, using \"/\" (root) instead.\n"); - have_warned = 1; - } - } - - if (!have_initialized) { - /* - * The directories that Saleae Logic expects to find. - * The first element is intentionally empty (create base dir). - */ - char *dirs[] = {"", "/Settings", "/Databases", "/Errors", "/Calibration"}; - char old_settings_path[PATH_MAX]; - access_func_t orig_access; - - out_strlen = strlen(OUT); - settings_strlen = out_strlen + strlen("/Settings"); - databases_strlen = out_strlen + strlen("/Databases"); - errors_strlen = out_strlen + strlen("/Errors"); - calibration_strlen = out_strlen + strlen("/Calibration"); - for (i = 0; i < sizeof dirs / sizeof dirs[0]; i++) { - snprintf(buffer, PATH_MAX, "%s/.saleae-logic%s", homepath, dirs[i]); - buffer[PATH_MAX-1] = '\0'; - ret = mkdir(buffer, 0755); - if (0 != ret && errno != EEXIST) { - fprintf(stderr, "ERROR: Failed to create directory \"%s\": %s\n", - buffer, strerror(errno)); - return NULL; - } - } - - /* - * Automatic migration of the settings file: - * ~/.saleae-logic-settings.xml => ~/.saleae-logic/Settings/settings.xml - */ - snprintf(old_settings_path, PATH_MAX, "%s/.saleae-logic-settings.xml", homepath); - old_settings_path[PATH_MAX-1] = '\0'; - orig_access = (access_func_t)dlsym(RTLD_NEXT, "access"); - if (orig_access(old_settings_path, F_OK) == 0) { - snprintf(buffer, PATH_MAX, "%s/.saleae-logic/Settings/settings.xml", homepath); - buffer[PATH_MAX-1] = '\0'; - ret = rename(old_settings_path, buffer); - if (ret != 0) { - fprintf(stderr, "WARN: Failed to move %s to %s", - old_settings_path, buffer); - } - } - - have_initialized = 1; - } - - new_path = pathname; - remainder = pathname + out_strlen; - - if ((strncmp(OUT "/Settings", pathname, settings_strlen) == 0) || - (strncmp(OUT "/Databases", pathname, databases_strlen) == 0) || - (strncmp(OUT "/Errors", pathname, errors_strlen) == 0) || - (strncmp(OUT "/Calibration", pathname, calibration_strlen) == 0)) { - snprintf(buffer, PATH_MAX, "%s/.saleae-logic%s", homepath, remainder); - buffer[PATH_MAX-1] = '\0'; - new_path = buffer; - } - - return new_path; -} - -FILE *fopen(const char *pathname, const char *mode) -{ - const char *path; - char buffer[PATH_MAX]; - fopen_func_t orig_fopen; - - orig_fopen = (fopen_func_t)dlsym(RTLD_NEXT, "fopen"); - path = redirect(pathname, buffer); - if (path != pathname && getenv("PRELOAD_DEBUG")) { - fprintf(stderr, "preload_debug: fopen(\"%s\", \"%s\") => \"%s\"\n", pathname, mode, path); - } - - return orig_fopen(path, mode); -} - -FILE *fopen64(const char *pathname, const char *mode) -{ - const char *path; - char buffer[PATH_MAX]; - fopen64_func_t orig_fopen64; - - orig_fopen64 = (fopen64_func_t)dlsym(RTLD_NEXT, "fopen64"); - path = redirect(pathname, buffer); - if (path != pathname && getenv("PRELOAD_DEBUG")) { - fprintf(stderr, "preload_debug: fopen64(\"%s\", \"%s\") => \"%s\"\n", pathname, mode, path); - } - - return orig_fopen64(path, mode); -} - -int open(const char *pathname, int flags, ...) -{ - const char *path; - char buffer[PATH_MAX]; - open_func_t orig_open; - - orig_open = (open_func_t)dlsym(RTLD_NEXT, "open"); - path = redirect(pathname, buffer); - if (path != pathname && getenv("PRELOAD_DEBUG")) { - fprintf(stderr, "preload_debug: open(\"%s\", ...) => \"%s\"\n", pathname, path); - } - - return orig_open(path, flags); -} - -int open64(const char *pathname, int flags, ...) -{ - const char *path; - char buffer[PATH_MAX]; - open64_func_t orig_open64; - - orig_open64 = (open64_func_t)dlsym(RTLD_NEXT, "open64"); - path = redirect(pathname, buffer); - if (path != pathname && getenv("PRELOAD_DEBUG")) { - fprintf(stderr, "preload_debug: open64(\"%s\", ...) => \"%s\"\n", pathname, path); - } - - return orig_open64(path, flags); -} - -int openat(int dirfd, const char *pathname, int flags, ...) -{ - const char *path; - char buffer[PATH_MAX]; - openat_func_t orig_openat; - - orig_openat = (openat_func_t)dlsym(RTLD_NEXT, "openat"); - path = redirect(pathname, buffer); - if (path != pathname && getenv("PRELOAD_DEBUG")) { - fprintf(stderr, "preload_debug: openat(%d, \"%s\", %#x) => \"%s\"\n", dirfd, pathname, flags, path); - } - - return orig_openat(dirfd, path, flags); -} - -int openat64(int dirfd, const char *pathname, int flags, ...) -{ - const char *path; - char buffer[PATH_MAX]; - openat64_func_t orig_openat64; - - orig_openat64 = (openat64_func_t)dlsym(RTLD_NEXT, "openat64"); - path = redirect(pathname, buffer); - if (path != pathname && getenv("PRELOAD_DEBUG")) { - fprintf(stderr, "preload_debug: openat64(%d, \"%s\", %#x) => \"%s\"\n", dirfd, pathname, flags, path); - } - - return orig_openat64(dirfd, path, flags); -} - -/* - * Notes about "stat". - * - * The stat function is special, at least in glibc, in that it cannot be - * directly overridden by LD_PRELOAD, due to it being inline wrapper around - * __xstat. The __xstat functions take one extra parameter, a version number, - * to indicate what "struct stat" should look like. This trick allows changing - * the contents of mode_t without changing the shared library major number. See - * sys/stat.h header for more info. - */ -int __xstat(int vers, const char *pathname, struct stat *buf) -{ - const char *path; - char buffer[PATH_MAX]; - xstat_func_t orig_xstat; - - orig_xstat = (xstat_func_t)dlsym(RTLD_NEXT, "__xstat"); - path = redirect(pathname, buffer); - if (path != pathname && getenv("PRELOAD_DEBUG")) { - fprintf(stderr, "preload_debug: (__x)stat(\"%s\", ...) => \"%s\"\n", pathname, path); - } - - return orig_xstat(vers, path, buf); -} - -int __xstat64(int vers, const char *pathname, struct stat64 *buf) -{ - const char *path; - char buffer[PATH_MAX]; - xstat64_func_t orig_xstat64; - - orig_xstat64 = (xstat64_func_t)dlsym(RTLD_NEXT, "__xstat64"); - path = redirect(pathname, buffer); - if (path != pathname && getenv("PRELOAD_DEBUG")) { - fprintf(stderr, "preload_debug: (__x)stat64(\"%s\", ...) => \"%s\"\n", pathname, path); - } - - return orig_xstat64(vers, path, buf); -} - -int access(const char *pathname, int mode) -{ - const char *path; - char buffer[PATH_MAX]; - access_func_t orig_access; - - orig_access = (access_func_t)dlsym(RTLD_NEXT, "access"); - path = redirect(pathname, buffer); - if (path != pathname && getenv("PRELOAD_DEBUG")) { - fprintf(stderr, "preload_debug: access(\"%s\", ...) => \"%s\"\n", pathname, path); - } - - return orig_access(path, mode); -} - -int faccessat(int dirfd, const char *pathname, int mode, int flags) -{ - const char *path; - char buffer[PATH_MAX]; - faccessat_func_t orig_faccessat; - - orig_faccessat = (faccessat_func_t)dlsym(RTLD_NEXT, "faccessat"); - path = redirect(pathname, buffer); - if (path != pathname && getenv("PRELOAD_DEBUG")) { - fprintf(stderr, "preload_debug: faccessat(\"%s\", ...) => \"%s\"\n", pathname, path); - } - - return orig_faccessat(dirfd, path, mode, flags); -} - -int unlink(const char *pathname) -{ - const char *path; - char buffer[PATH_MAX]; - unlink_func_t orig_unlink; - - orig_unlink = (unlink_func_t)dlsym(RTLD_NEXT, "unlink"); - path = redirect(pathname, buffer); - if (path != pathname && getenv("PRELOAD_DEBUG")) { - fprintf(stderr, "preload_debug: unlink(\"%s\") => \"%s\"\n", pathname, path); - } - - return orig_unlink(path); -} diff --git a/pkgs/development/tools/misc/samply/default.nix b/pkgs/development/tools/misc/samply/default.nix deleted file mode 100644 index a929d90652a9..000000000000 --- a/pkgs/development/tools/misc/samply/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, jq -, moreutils -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "samply"; - version = "0.12.0"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-7bf1lDIZGhRpvnn8rHNwzH2GBY8CwtYCjuRAUTQgbsA="; - }; - - cargoHash = "sha256-QGvtKx+l6+UxdlziHnF63geAvW55RRlatK2/J8LR0Ck="; - - # the dependencies linux-perf-data and linux-perf-event-reader contains both README.md and Readme.md, - # which causes a hash mismatch on systems with a case-insensitive filesystem - # this removes the readme files and updates cargo's checksum file accordingly - depsExtraArgs = { - nativeBuildInputs = [ - jq - moreutils - ]; - - postBuild = '' - for crate in linux-perf-data linux-perf-event-reader; do - pushd $name/$crate - - rm -f README.md Readme.md - jq 'del(.files."README.md") | del(.files."Readme.md")' \ - .cargo-checksum.json -c \ - | sponge .cargo-checksum.json - - popd - done - ''; - }; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - - meta = with lib; { - description = "Command line profiler for macOS and Linux"; - mainProgram = "samply"; - homepage = "https://github.com/mstange/samply"; - changelog = "https://github.com/mstange/samply/releases/tag/samply-v${version}"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix deleted file mode 100644 index a268e1749f0d..000000000000 --- a/pkgs/development/tools/misc/sccache/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, pkg-config -, openssl -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - version = "0.8.1"; - pname = "sccache"; - - src = fetchFromGitHub { - owner = "mozilla"; - repo = "sccache"; - rev = "v${version}"; - sha256 = "sha256-sP6KTR50Ns4Yf/DGeSK7kB0dF0lraWbx948EOmsy+8c="; - }; - - cargoHash = "sha256-6tiTgyhkPeH/oWcce1U2UsVngEfc4LKbB1zMt7meshA="; - - nativeBuildInputs = [ - pkg-config - ]; - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - # Tests fail because of client server setup which is not possible inside the - # pure environment, see https://github.com/mozilla/sccache/issues/460 - doCheck = false; - - meta = with lib; { - description = "Ccache with Cloud Storage"; - mainProgram = "sccache"; - homepage = "https://github.com/mozilla/sccache"; - changelog = "https://github.com/mozilla/sccache/releases/tag/v${version}"; - maintainers = with maintainers; [ doronbehar figsoda ]; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/tools/misc/scip/default.nix b/pkgs/development/tools/misc/scip/default.nix deleted file mode 100644 index f31673a12f73..000000000000 --- a/pkgs/development/tools/misc/scip/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, testers -, scip -}: - -buildGoModule rec { - pname = "scip"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "sourcegraph"; - repo = "scip"; - rev = "v${version}"; - hash = "sha256-o7DWSFd3rPSAOmhTvtI9X0tySNhDL7Jh7iDW8eIYn3w="; - }; - - vendorHash = "sha256-iFlbZvbj30UpgxJdndpLYcUZSTLQAO2MqJGb/6hO8Uc="; - - ldflags = [ - "-s" - "-w" - "-X=main.Reproducible=true" - ]; - - # update documentation to fix broken test - postPatch = '' - substituteInPlace docs/CLI.md \ - --replace 0.3.0 0.3.1 - ''; - - passthru.tests = { - version = testers.testVersion { - package = scip; - version = "v${version}"; - }; - }; - - meta = with lib; { - description = "SCIP Code Intelligence Protocol CLI"; - mainProgram = "scip"; - homepage = "https://github.com/sourcegraph/scip"; - changelog = "https://github.com/sourcegraph/scip/blob/${src.rev}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/scriptisto/default.nix b/pkgs/development/tools/misc/scriptisto/default.nix deleted file mode 100644 index 5efcd30c9018..000000000000 --- a/pkgs/development/tools/misc/scriptisto/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, installShellFiles -}: - -rustPlatform.buildRustPackage rec { - pname = "scriptisto"; - version = "2.2.0"; - - src = fetchFromGitHub { - owner = "igor-petruk"; - repo = "scriptisto"; - rev = "v${version}"; - hash = "sha256-iaDdOFmi4kfcJSjXOcGAFG9i1SdB+K5Qz4+NDaVQALY="; - }; - - cargoHash = "sha256-LIOsl9qPKJr/ykbXeaHP6lNHGUMcw3omniSWx2FkF28="; - - nativeBuildInputs = [ - installShellFiles - ]; - - postInstall = '' - installManPage man/* - ''; - - meta = with lib; { - description = "Language-agnostic \"shebang interpreter\" that enables you to write scripts in compiled languages"; - mainProgram = "scriptisto"; - homepage = "https://github.com/igor-petruk/scriptisto"; - changelog = "https://github.com/igor-petruk/scriptisto/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/segger-ozone/default.nix b/pkgs/development/tools/misc/segger-ozone/default.nix deleted file mode 100644 index 8109c1e42a36..000000000000 --- a/pkgs/development/tools/misc/segger-ozone/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ lib -, stdenv -, fetchurl -, autoPatchelfHook -, fontconfig -, freetype -, libICE -, libSM -, libX11 -, libXcursor -, libXfixes -, libXrandr -, libXrender -}: - -stdenv.mkDerivation rec { - pname = "segger-ozone"; - version = "3.30b"; - - src = { - x86_64-linux = fetchurl { - url = "https://www.segger.com/downloads/jlink/Ozone_Linux_V${builtins.replaceStrings ["."] [""] version}_x86_64.tgz"; - hash = "sha256-W8Fo0q58pAn1aB92CjYARcN3vMLEguvsyozsS7VRArQ="; - }; - i686-linux = fetchurl { - url = "https://www.segger.com/downloads/jlink/Ozone_Linux_V${builtins.replaceStrings ["."] [""] version}_i386.tgz"; - hash = "sha256-Xq/69lwF2Ll5VdkYMDNRtc0YUUvWc+XR0FHJXxOLNQ4="; - }; - }.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); - - nativeBuildInputs = [ - autoPatchelfHook - ]; - - buildInputs = [ - fontconfig - freetype - libICE - libSM - libX11 - libXcursor - libXfixes - libXrandr - libXrender - stdenv.cc.cc.lib - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - mv Lib lib - mv * $out - ln -s $out/Ozone $out/bin - - runHook postInstall - ''; - - meta = with lib; { - description = "J-Link Debugger and Performance Analyzer"; - longDescription = '' - Ozone is a cross-platform debugger and performance analyzer for J-Link - and J-Trace. - - - Stand-alone graphical debugger - - Debug output of any tool chain and IDE 1 - - C/C++ source level debugging and assembly instruction debugging - - Debug information windows for any purpose: disassembly, memory, - globals and locals, (live) watches, CPU and peripheral registers - - Source editor to fix bugs immediately - - High-speed programming of the application into the target - - Direct use of J-Link built-in features (Unlimited Flash - Breakpoints, Flash Download, Real Time Terminal, Instruction Trace) - - Scriptable project files to set up everything automatically - - New project wizard to ease the basic configuration of new projects - - 1 Ozone has been tested with the output of the following compilers: - GCC, Clang, ARM, IAR. Output of other compilers may be supported but is - not guaranteed to be. - ''; - homepage = "https://www.segger.com/products/development-tools/ozone-j-link-debugger"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = [ maintainers.bmilanov ]; - platforms = [ "x86_64-linux" "i686-linux" ]; - }; -} diff --git a/pkgs/development/tools/misc/semver-tool/default.nix b/pkgs/development/tools/misc/semver-tool/default.nix deleted file mode 100644 index a26c99171662..000000000000 --- a/pkgs/development/tools/misc/semver-tool/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, lib, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "semver-tool"; - version = "3.4.0"; - - src = fetchFromGitHub { - owner = "fsaintjacques"; - repo = pname; - rev = version; - sha256 = "sha256-BnHuiCxE0VjzMWFTEMunQ9mkebQKIKbbMxZVfBUO57Y="; - }; - - dontBuild = true; # otherwise we try to 'make' which fails. - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - install src/semver $out/bin - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/fsaintjacques/semver-tool"; - description = "semver bash implementation"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [ maintainers.qyliss ]; - mainProgram = "semver"; - }; -} diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix deleted file mode 100644 index 414be9560b9a..000000000000 --- a/pkgs/development/tools/misc/sipp/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, ncurses, libpcap, cmake, openssl, git, lksctp-tools }: - -stdenv.mkDerivation rec { - version = "3.6.1"; - pname = "sipp"; - - src = fetchurl { - url = "https://github.com/SIPp/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-alYOg6/5gvMx3byt+zvVMMWJbNW3V91utoITPMhg7LE="; - }; - - postPatch = '' - cp version.h src/version.h - ''; - - cmakeFlags = [ - "-DUSE_GSL=1" - "-DUSE_PCAP=1" - "-DUSE_SSL=1" - "-DUSE_SCTP=${if stdenv.isLinux then "1" else "0"}" - - # file RPATH_CHANGE could not write new RPATH - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ]; - enableParallelBuilding = true; - - nativeBuildInputs = [ cmake git ]; - buildInputs = [ ncurses libpcap openssl ] - ++ lib.optional (stdenv.isLinux) lksctp-tools; - - meta = with lib; { - homepage = "http://sipp.sf.net"; - description = "SIPp testing tool"; - mainProgram = "sipp"; - license = licenses.gpl3; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/slint-lsp/default.nix b/pkgs/development/tools/misc/slint-lsp/default.nix deleted file mode 100644 index 9fee7cca7f7e..000000000000 --- a/pkgs/development/tools/misc/slint-lsp/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchCrate -, pkg-config -, cmake -, fontconfig -, libGL -, xorg -, libxkbcommon -, wayland - # Darwin Frameworks -, AppKit -, CoreGraphics -, CoreServices -, CoreText -, Foundation -, libiconv -, OpenGL -}: - -let - rpathLibs = [ fontconfig libGL xorg.libxcb xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi ] - ++ lib.optionals stdenv.isLinux [ libxkbcommon wayland ]; -in -rustPlatform.buildRustPackage rec { - pname = "slint-lsp"; - version = "1.5.1"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-wqAcHBHWtYavAakHLhHHCI+Yercgdtzo1EAOilsZOK0="; - }; - - cargoHash = "sha256-XjVXhXoGEhxWc+LZa0EsPiw3Gq2pg03YjKONTptSQvA="; - - nativeBuildInputs = [ cmake pkg-config fontconfig ]; - buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] - ++ lib.optionals stdenv.isDarwin [ - AppKit - CoreGraphics - CoreServices - CoreText - Foundation - libiconv - OpenGL - ]; - - postInstall = lib.optionalString stdenv.isLinux '' - patchelf --set-rpath ${lib.makeLibraryPath rpathLibs} $out/bin/slint-lsp - ''; - - dontPatchELF = true; - - meta = with lib; { - description = "Language Server Protocol (LSP) for Slint UI language"; - mainProgram = "slint-lsp"; - homepage = "https://slint-ui.com/"; - changelog = "https://github.com/slint-ui/slint/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ xgroleau ]; - }; -} diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix deleted file mode 100644 index fc619612a48b..000000000000 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ fetchurl, lib, stdenv, perl, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "sloccount"; - version = "2.26"; - - src = fetchurl { - url = "https://www.dwheeler.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0ayiwfjdh1946asah861ah9269s5xkc8p5fv1wnxs9znyaxs4zzs"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perl ]; - - # Make sure the Flex-generated files are newer than the `.l' files, so that - # Flex isn't needed to recompile them. - patchPhase = '' - for file in * - do - if grep -q /usr/bin/perl "$file" - then - echo "patching \`$file'..." - substituteInPlace "$file" --replace \ - "/usr/bin/perl" "${perl}/bin/perl" - fi - done - - for file in *.l - do - touch "$(echo $file | sed -es'/\.l$/.c/g')" - done - ''; - - makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; - - doCheck = true; - checkPhase = ''HOME="$TMPDIR" PATH="$PWD:$PATH" make test''; - - preInstall = '' - mkdir -p "$out/bin" - mkdir -p "$out/share/man/man1" - mkdir -p "$out/share/doc" - ''; - - postInstall = '' - for w in "$out/bin"/*; do - isScript "$w" || continue - wrapProgram "$w" --prefix PATH : "$out/bin" - done - ''; - - meta = { - description = "Set of tools for counting physical Source Lines of Code (SLOC)"; - - longDescription = '' - This is the home page of "SLOCCount", a set of tools for - counting physical Source Lines of Code (SLOC) in a large number - of languages of a potentially large set of programs. This suite - of tools was used in my papers More than a Gigabuck: Estimating - GNU/Linux's Size and Estimating Linux's Size to measure the SLOC - of entire GNU/Linux distributions, and my essay Linux Kernel - 2.6: It's Worth More! Others have measured Debian GNU/Linux and - the Perl CPAN library using this tool suite. - ''; - - license = lib.licenses.gpl2Plus; - - homepage = "https://www.dwheeler.com/sloccount/"; - - maintainers = [ ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/spruce/default.nix b/pkgs/development/tools/misc/spruce/default.nix deleted file mode 100644 index 6127973e7953..000000000000 --- a/pkgs/development/tools/misc/spruce/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "spruce"; - version = "1.31.1"; - - src = fetchFromGitHub { - owner = "geofffranks"; - repo = pname; - rev = "v${version}"; - hash = "sha256-wLxPHaCU0fciSIdK26dV4XOnJsp5EKKEXzgspWC1GvA="; - }; - - vendorHash = null; - - meta = with lib; { - description = "BOSH template merge tool"; - mainProgram = "spruce"; - homepage = "https://github.com/geofffranks/spruce"; - license = licenses.mit; - maintainers = with maintainers; [ risson ]; - }; -} diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index 612ef223e67b..458e3b51d309 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { pname = "sqitch"; version = sqitch.version; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; src = sqitch; dontBuild = true; @@ -34,7 +34,7 @@ stdenv.mkDerivation { ln -s ${sqitch}/$d $out/$d fi done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/sqitch ''; dontStrip = true; diff --git a/pkgs/development/tools/misc/src-cli/default.nix b/pkgs/development/tools/misc/src-cli/default.nix deleted file mode 100644 index 44b8cc62145d..000000000000 --- a/pkgs/development/tools/misc/src-cli/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, stdenv -, xorg -, darwin -, testers -, src-cli -}: - -buildGoModule rec { - pname = "src-cli"; - version = "5.5.0"; - - src = fetchFromGitHub { - owner = "sourcegraph"; - repo = "src-cli"; - rev = version; - hash = "sha256-3hj/nY66z3AjdvmdvkKTAXD8E6A4qPtLOuY7U6sKw9U="; - }; - - vendorHash = "sha256-F6TEw9hk8Fu7uY8/KW4etyZMqOb/GL/g4NV87JjfAsY="; - - subPackages = [ - "cmd/src" - ]; - - buildInputs = lib.optionals stdenv.isLinux [ - xorg.libX11 - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ]; - - ldflags = [ - "-s" - "-w" - "-X=github.com/sourcegraph/src-cli/internal/version.BuildTag=${version}" - ]; - - __darwinAllowLocalNetworking = true; - - passthru.tests = { - version = testers.testVersion { - package = src-cli; - command = "src version || true"; - }; - }; - - meta = with lib; { - description = "Sourcegraph CLI"; - homepage = "https://github.com/sourcegraph/src-cli"; - changelog = "https://github.com/sourcegraph/src-cli/blob/${src.rev}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "src"; - }; -} diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix deleted file mode 100644 index 1d542383bfb0..000000000000 --- a/pkgs/development/tools/misc/srecord/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, boost, libtool, groff, ghostscript, libgcrypt ? null }: - -stdenv.mkDerivation rec { - pname = "srecord"; - version = "1.64"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1qk75q0k5vzmm3932q9hqz2gp8n9rrdfjacsswxc02656f3l3929"; - }; - - buildInputs = [ boost libtool groff ghostscript libgcrypt ]; - - configureFlags = lib.optional (libgcrypt == null) "--without-gcrypt"; - - meta = with lib; { - description = "Collection of powerful tools for manipulating EPROM load files"; - homepage = "https://srecord.sourceforge.net/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.bjornfor ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index 16785e4d4b89..c5c54351ac64 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -11,7 +11,7 @@ let # The Darwin build of stlink explicitly refers to static libusb. - libusb1' = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1; + libusb1' = if stdenv.hostPlatform.isDarwin then libusb1.override { withStatic = true; } else libusb1; # IMPORTANT: You need permissions to access the stlink usb devices. # Add services.udev.packages = [ pkgs.stlink ] to your configuration.nix diff --git a/pkgs/development/tools/misc/strace-analyzer/default.nix b/pkgs/development/tools/misc/strace-analyzer/default.nix deleted file mode 100644 index 625683196923..000000000000 --- a/pkgs/development/tools/misc/strace-analyzer/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, strace -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "strace-analyzer"; - version = "0.5.4"; - - src = fetchFromGitHub { - owner = "wookietreiber"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-KbdQeZoWFz4D5txu/411J0HNnIAs3t5IvO30/34vBek="; - }; - - cargoHash = "sha256-t1BFc5cNOQJIbufFH2hHI4f7SMrZ5mwVODXukdbHf3M="; - - nativeCheckInputs = [ strace ]; - - checkFlags = lib.optionals stdenv.isAarch64 [ - # thread 'analysis::tests::analyze_dd' panicked at 'assertion failed: ...' - "--skip=analysis::tests::analyze_dd" - ]; - - meta = with lib; { - description = "Analyzes strace output"; - mainProgram = "strace-analyzer"; - homepage = "https://github.com/wookietreiber/strace-analyzer"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix deleted file mode 100644 index 167768a27e36..000000000000 --- a/pkgs/development/tools/misc/strace/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, perl, libunwind, buildPackages, gitUpdater, elfutils }: - -stdenv.mkDerivation rec { - pname = "strace"; - version = "6.11"; - - src = fetchurl { - url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-gyYlg6NSnwLDUBqouKx3K0y8A9yTTpi6tuSINibig6U="; - }; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl ]; - - # libunwind for -k. - # On RISC-V platforms, LLVM's libunwind implementation is unsupported by strace. - # The build will silently fall back and -k will not work on RISC-V. - buildInputs = [ libunwind ] - # -kk - ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform elfutils) elfutils; - - configureFlags = [ "--enable-mpers=check" ] - ++ lib.optional stdenv.cc.isClang "CFLAGS=-Wno-unused-function"; - - passthru.updateScript = gitUpdater { - # No nicer place to find latest release. - url = "https://github.com/strace/strace.git"; - rev-prefix = "v"; - }; - - meta = with lib; { - homepage = "https://strace.io/"; - description = "System call tracer for Linux"; - license = with licenses; [ lgpl21Plus gpl2Plus ]; # gpl2Plus is for the test suite - platforms = platforms.linux; - maintainers = with maintainers; [ globin ma27 qyliss ]; - mainProgram = "strace"; - }; -} diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix deleted file mode 100644 index fa39c310a269..000000000000 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config -, libmysqlclient -, libaio -, luajit -# For testing: -, testers -, sysbench -}: - -stdenv.mkDerivation rec { - pname = "sysbench"; - version = "1.0.20"; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libmysqlclient luajit ] ++ lib.optionals stdenv.isLinux [ libaio ]; - depsBuildBuild = [ pkg-config ]; - - src = fetchFromGitHub { - owner = "akopytov"; - repo = pname; - rev = version; - sha256 = "1sanvl2a52ff4shj62nw395zzgdgywplqvwip74ky8q7s6qjf5qy"; - }; - - enableParallelBuilding = true; - - configureFlags = [ - # The bundled version does not build on aarch64-darwin: - # https://github.com/akopytov/sysbench/issues/416 - "--with-system-luajit" - "--with-mysql-includes=${lib.getDev libmysqlclient}/include/mysql" - "--with-mysql-libs=${libmysqlclient}/lib/mysql" - ]; - - # We cannot use the regular nixpkgs ck here, since it has very - # different performance characteristics than the vendored one. - # On the downside the vendored libck version require more fixes for cross-compilation. - # Sysbench related on statically linked vendored libck. - postPatch = '' - substituteInPlace \ - third_party/concurrency_kit/ck/configure \ - --replace-fail \ - 'COMPILER=`./.1 2> /dev/null`' \ - "COMPILER=${if stdenv.cc.isGNU then "gcc" else if stdenv.cc.isClang then "clang" else throw "Unsupported compiler"}" \ - --replace-fail \ - 'PLATFORM=`uname -m 2> /dev/null`' \ - "PLATFORM=${stdenv.hostPlatform.parsed.cpu.name}" - substituteInPlace \ - third_party/concurrency_kit/ck/src/Makefile.in \ - --replace-fail \ - "ar rcs" \ - "${stdenv.cc.targetPrefix}ar rcs" - ''; - - passthru.tests = { - versionTest = testers.testVersion { - package = sysbench; - }; - }; - - meta = { - description = "Modular, cross-platform and multi-threaded benchmark tool"; - mainProgram = "sysbench"; - longDescription = '' - sysbench is a scriptable multi-threaded benchmark tool based on LuaJIT. - It is most frequently used for database benchmarks, but can also be used - to create arbitrarily complex workloads that do not involve a database - server. - ''; - homepage = "https://github.com/akopytov/sysbench"; - downloadPage = "https://github.com/akopytov/sysbench/releases/tag/${version}"; - changelog = "https://github.com/akopytov/sysbench/blob/${version}/ChangeLog"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix deleted file mode 100644 index e638718474e5..000000000000 --- a/pkgs/development/tools/misc/tcptrack/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libpcap }: - -stdenv.mkDerivation rec { - pname = "tcptrack"; - version = "unstable-2017-04-29"; - - src = fetchFromGitHub { - owner = "bchretien"; - repo = "tcptrack"; - rev = "2b096ac103af2884bbd7648cff8adcbadbda9394"; - sha256 = "0084g9s0ynv1az67j08q9nz4p07bqqz9k6w5lprzj3ljlh0x10gj"; - }; - - patches = [ - # Fix pending upstream inclusion for ncurses-6.3 support: - # https://github.com/bchretien/tcptrack/pull/10 - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/bchretien/tcptrack/commit/409007afbce8ec5a81312a2a4123dd83b62b4494.patch"; - sha256 = "00641jyr52ksww5bbzvxlprmbb36jnvzg2w1aj1jgnm75jiajcfc"; - }) - ]; - - buildInputs = [ ncurses libpcap ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; - - meta = with lib; { - inherit (src.meta) homepage; - description = "libpcap based program for live TCP connection monitoring"; - mainProgram = "tcptrack"; - license = licenses.lgpl21; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix deleted file mode 100644 index 1084fd9b06b0..000000000000 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "terracognita"; - version = "0.8.4"; - - src = fetchFromGitHub { - owner = "cycloidio"; - repo = pname; - rev = "v${version}"; - hash = "sha256-pPY8y+pQdk9/F7dnUBz/y4lvcR1k/EClywcZATArZVA="; - }; - - vendorHash = "sha256-ApnJH0uIClXbfXK+k4t9Tcayc2mfndoG9iMqZY3iWys="; - - doCheck = false; - - subPackages = [ "." ]; - - ldflags = [ "-s" "-w" "-X github.com/cycloidio/terracognita/cmd.Version=${version}" ]; - - meta = with lib; { - description = "Reads from existing Cloud Providers (reverse Terraform) and generates your infrastructure as code on Terraform configuration"; - mainProgram = "terracognita"; - homepage = "https://github.com/cycloidio/terracognita"; - changelog = "https://github.com/cycloidio/terracognita/raw/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix deleted file mode 100644 index f72e1e000ac4..000000000000 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "terraform-ls"; - version = "0.34.3"; - - src = fetchFromGitHub { - owner = "hashicorp"; - repo = pname; - rev = "v${version}"; - hash = "sha256-fN/C7H0s7ZhXSg8pLn9iex6WglMKsx6hA8OK/HYqbRU="; - }; - - vendorHash = "sha256-NL5pqcQTjauxLschhj3kCiZLBLagABSCU/zHLcG2anM="; - - ldflags = [ "-s" "-w" ]; - - # There's a mixture of tests that use networking and several that fail on aarch64 - doCheck = false; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/terraform-ls --help - $out/bin/terraform-ls --version | grep "${version}" - runHook postInstallCheck - ''; - - meta = with lib; { - description = "Terraform Language Server (official)"; - mainProgram = "terraform-ls"; - homepage = "https://github.com/hashicorp/terraform-ls"; - changelog = "https://github.com/hashicorp/terraform-ls/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ mbaillie jk ]; - }; -} diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/pkgs/development/tools/misc/terraform-lsp/default.nix deleted file mode 100644 index 35a503d8b0aa..000000000000 --- a/pkgs/development/tools/misc/terraform-lsp/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "terraform-lsp"; - version = "0.0.12"; - - src = fetchFromGitHub { - owner = "juliosueiras"; - repo = pname; - rev = "v${version}"; - sha256 = "111350jbq0dp0qhk48j12hrlisd1fwzqpcv357igrbqf6ki7r78q"; - }; - - vendorHash = null; - - ldflags = [ "-s" "-w" "-X main.Version=${version}" "-X main.GitCommit=${src.rev}" ]; - - meta = with lib; { - description = "Language Server Protocol for Terraform"; - mainProgram = "terraform-lsp"; - homepage = "https://github.com/juliosueiras/terraform-lsp"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/misc/terraformer/default.nix b/pkgs/development/tools/misc/terraformer/default.nix deleted file mode 100644 index e38d753b4688..000000000000 --- a/pkgs/development/tools/misc/terraformer/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "terraformer"; - version = "0.8.24"; - - src = fetchFromGitHub { - owner = "GoogleCloudPlatform"; - repo = pname; - rev = version; - sha256 = "sha256-paBj2vaBicXHMEei2HPW+d4fXWf8VnVhvcanXmo/5KI="; - }; - - vendorHash = "sha256-Rh2ZGSfa95Yw8GGjsZjwmj0o4qKpygbPsLCbzUTOBxQ="; - - subPackages = [ "." ]; - - meta = with lib; { - description = "CLI tool to generate terraform files from existing infrastructure (reverse Terraform). Infrastructure to Code"; - mainProgram = "terraformer"; - homepage = "https://github.com/GoogleCloudPlatform/terraformer"; - license = licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/misc/terramate/default.nix b/pkgs/development/tools/misc/terramate/default.nix deleted file mode 100644 index c1c44f4971e4..000000000000 --- a/pkgs/development/tools/misc/terramate/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, git -}: - -buildGoModule rec { - pname = "terramate"; - version = "0.10.2"; - - src = fetchFromGitHub { - owner = "terramate-io"; - repo = "terramate"; - rev = "v${version}"; - hash = "sha256-z7G0oj6aJRUXVitj9f2hGTLOFPo0LcQyADKvMFsk9t0="; - }; - - vendorHash = "sha256-TOntPPtynr333rX0wlb2pIeEwcNzyWP3wFqPoMz6LK0="; - - # required for version info - nativeBuildInputs = [ git ]; - - ldflags = [ "-extldflags" "-static" ]; - - # Disable failing E2E tests preventing the package from building - excludedPackages = [ "./e2etests/cloud" "./e2etests/core" ]; - - meta = with lib; { - description = "Adds code generation, stacks, orchestration, change detection, data sharing and more to Terraform"; - homepage = "https://github.com/terramate-io/terramate"; - license = licenses.mpl20; - maintainers = with maintainers; [ dit7ya ]; - }; -} diff --git a/pkgs/development/tools/misc/terser/default.nix b/pkgs/development/tools/misc/terser/default.nix deleted file mode 100644 index a0f6527d05e9..000000000000 --- a/pkgs/development/tools/misc/terser/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ buildNpmPackage, fetchFromGitHub, lib }: - -buildNpmPackage rec { - pname = "terser"; - version = "5.31.3"; - - src = fetchFromGitHub { - owner = "terser"; - repo = "terser"; - rev = "v${version}"; - hash = "sha256-7B6dRulnSPD5s2w4nTXBPxJUCRvKD9++/Y1BMNm2ZwM="; - }; - - npmDepsHash = "sha256-FMd2bbMHzo38/zJuOlpzGtRPwuoxmZJF/XF2KgTP2ak="; - - meta = with lib; { - description = "JavaScript parser, mangler and compressor toolkit for ES6+"; - mainProgram = "terser"; - homepage = "https://terser.org"; - license = licenses.bsd2; - maintainers = with maintainers; [ talyz ]; - }; -} diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix deleted file mode 100644 index a3f5942a6bfd..000000000000 --- a/pkgs/development/tools/misc/tet/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ fetchurl, lib, stdenv }: - -stdenv.mkDerivation ({ - version = "3.8"; - pname = "tet"; - - src = fetchurl { - url = "http://tetworks.opengroup.org/downloads/38/software/Sources/3.8/tet3.8-src.tar.gz"; - sha256 = "1j57hv56df38w249l595b8rsgmsyvjkbysai03a9724gax5jl9av" ; - }; - - buildInputs = [ ]; - - patchPhase = "chmod +x configure"; - - configurePhase = "./configure -t lite"; - - buildPhase = "cd src; make; cd -"; - - installPhase = "cd src; make install; cd -; cp -vr $PWD $out"; - - meta = { - description = "Test Environment Toolkit is used in test applications like The Open Group's UNIX Certification program and the Free Standards Group's LSB Certification program"; - homepage = "http://tetworks.opengroup.org/Products/tet.htm"; - license = lib.licenses.artistic1; - platforms = lib.platforms.unix; - maintainers = [ ]; - }; -}) diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix deleted file mode 100644 index 66609d8d17e1..000000000000 --- a/pkgs/development/tools/misc/texi2html/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, perl, gettext, buildPackages }: - -stdenv.mkDerivation rec { - pname = "texi2html"; - version = "5.0"; - - src = fetchurl { - url = "mirror://savannah/texi2html/${pname}-${version}.tar.bz2"; - sha256 = "1yprv64vrlcbksqv25asplnjg07mbq38lfclp1m5lj8cw878pag8"; - }; - - strictDeps = true; - - nativeBuildInputs = [ gettext perl ]; - buildInputs = [ perl ]; - - postPatch = '' - patchShebangs separated_to_hash.pl - ''; - - postInstall = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - for f in $out/bin/*; do - substituteInPlace $f --replace "${buildPackages.perl}" "${perl}" - done - ''; - - meta = with lib; { - description = "Perl script which converts Texinfo source files to HTML output"; - mainProgram = "texi2html"; - homepage = "https://www.nongnu.org/texi2html/"; - license = licenses.gpl2; - maintainers = [ maintainers.marcweber ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index a43eab5f00e5..da9b2c9cbcb0 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { postPatch = '' - patchShebangs tp/maintain + patchShebangs tp/maintain/regenerate_commands_perl_info.pl '' # This patch is needed for IEEE-standard long doubles on # powerpc64; it does not apply cleanly to texinfo 5.x or @@ -86,7 +86,7 @@ stdenv.mkDerivation { bash libintl ] - ++ optionals stdenv.isSunOS [ + ++ optionals stdenv.hostPlatform.isSunOS [ libiconv gawk ] @@ -104,7 +104,7 @@ stdenv.mkDerivation { ++ optionals (crossBuildTools && lib.versionAtLeast version "7.1") [ "texinfo_cv_sys_iconv_converts_euc_cn=yes" ] - ++ optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; + ++ optional stdenv.hostPlatform.isSunOS "AWK=${gawk}/bin/awk"; installFlags = [ "TEXMF=$(out)/texmf-dist" ]; installTargets = [ @@ -114,7 +114,7 @@ stdenv.mkDerivation { nativeCheckInputs = [ procps ] ++ optionals stdenv.buildPlatform.isFreeBSD [ freebsd.locale ]; - doCheck = interactive && !stdenv.isDarwin && !stdenv.isSunOS; # flaky + doCheck = interactive && !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isSunOS; # flaky checkFlags = optionals (!stdenv.hostPlatform.isMusl && versionOlder version "7") [ # Test is known to fail on various locales on texinfo-6.8: @@ -125,7 +125,7 @@ stdenv.mkDerivation { postFixup = optionalString crossBuildTools '' for f in "$out"/bin/{pod2texi,texi2any}; do substituteInPlace "$f" \ - --replace ${buildPackages.perl}/bin/perl ${perl}/bin/perl + --replace-fail ${buildPackages.perl}/bin/perl ${perl}/bin/perl done ''; diff --git a/pkgs/development/tools/misc/texinfo/packages.nix b/pkgs/development/tools/misc/texinfo/packages.nix index ae1046318cd5..1c215819a9a2 100644 --- a/pkgs/development/tools/misc/texinfo/packages.nix +++ b/pkgs/development/tools/misc/texinfo/packages.nix @@ -102,7 +102,7 @@ in patches = [ ./fix-glibc-2.34.patch ]; }; texinfo7 = buildTexinfo { - version = "7.1"; - hash = "sha256-3u7J8Z8VngRv34rSIjGYGAbawzLMNy8cdjUErYKzCVM="; + version = "7.1.1"; + hash = "sha256-Ma435GKDUpQythvuHOAe0AkNWZ5gb8aincofd8dqbII="; }; } diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index d691b94c38a3..051bc6d8529a 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -15,23 +15,23 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.19.0"; + version = "5.21.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-iH7KqZddP4uKwTBxLLMURUtWBsuEtLHGQppVgGFaWZQ="; + hash = "sha256-Lx7vENYuBXaMvGDOZxAPqivGZVaCXYrihaTnBn9eTm4="; }; - cargoHash = "sha256-QW+q869bVAMYv4SCj/2eKrADoDonrvQuaHuanZHIjMo="; + cargoHash = "sha256-6JDG9Ac43AW6HV2baZH08uxdb84hjrGXgdzZiFr2Ybk="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!isCross) help2man; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security CoreServices @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { # generate the man page postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v5.16.1/.github/workflows/publish.yml#L117-L121 + # https://github.com/latex-lsp/texlab/blob/v5.21.0/.github/workflows/publish.yml#L110-L114 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; diff --git a/pkgs/development/tools/misc/tie/default.nix b/pkgs/development/tools/misc/tie/default.nix deleted file mode 100644 index 5a50600d47c8..000000000000 --- a/pkgs/development/tools/misc/tie/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "tie"; - version = "2.4"; - - src = fetchurl { - url = "http://mirrors.ctan.org/web/tie/${pname}-${version}.tar.gz"; - sha256 = "1m5952kdfffiz33p1jw0wv7dh272mmw28mpxw9v7lkb352zv4xsj"; - }; - - buildPhase = '' - ${stdenv.cc.targetPrefix}cc -std=c89 tie.c -o tie - ''; - - installPhase = '' - mkdir -p $out/bin - cp tie $out/bin - ''; - - meta = with lib; { - homepage = "https://www.ctan.org/tex-archive/web/tie"; - description = "Allow multiple web change files"; - mainProgram = "tie"; - platforms = platforms.all; - maintainers = [ ]; - license = licenses.abstyles; - }; -} diff --git a/pkgs/development/tools/misc/tockloader/default.nix b/pkgs/development/tools/misc/tockloader/default.nix deleted file mode 100644 index 90cf25e54772..000000000000 --- a/pkgs/development/tools/misc/tockloader/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, python3 -, fetchPypi -}: - -python3.pkgs.buildPythonApplication rec { - pname = "tockloader"; - version = "1.9.0"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-7W55jugVtamFUL8N3dD1LFLJP2UDQb74V6o96rd/tEg="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - argcomplete - colorama - crcmod - pycryptodome - pyserial - questionary - toml - tqdm - ]; - - # Project has no test suite - checkPhase = '' - runHook preCheck - $out/bin/tockloader --version | grep -q ${version} - runHook postCheck - ''; - - meta = with lib; { - description = "Tool for programming Tock onto hardware boards"; - mainProgram = "tockloader"; - homepage = "https://github.com/tock/tockloader"; - changelog = "https://github.com/tock/tockloader/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ ]; - }; -} - diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index ff3ceafc7f5c..6c6b232e9354 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-U7Bode8qwDsNf4FVppfEHA9uiOFz74CtKgXG6xyYlT8="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; - checkInputs = lib.optionals stdenv.isDarwin [ zlib ]; + checkInputs = lib.optionals stdenv.hostPlatform.isDarwin [ zlib ]; # enable all output formats buildFeatures = [ "all" ]; diff --git a/pkgs/development/tools/misc/topiary/Cargo.lock b/pkgs/development/tools/misc/topiary/Cargo.lock deleted file mode 100644 index 0b0af1fcb05d..000000000000 --- a/pkgs/development/tools/misc/topiary/Cargo.lock +++ /dev/null @@ -1,1741 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" -dependencies = [ - "memchr", -] - -[[package]] -name = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "anstream" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is-terminal", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" - -[[package]] -name = "anstyle-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" -dependencies = [ - "anstyle", - "windows-sys", -] - -[[package]] -name = "assert_cmd" -version = "2.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" -dependencies = [ - "anstyle", - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "async-scoped" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7a6a57c8aeb40da1ec037f5d455836852f7a57e69e1b1ad3d8f38ac1d6cadf" -dependencies = [ - "futures", - "pin-project", - "slab", - "tokio", -] - -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.26", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" - -[[package]] -name = "bstr" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" -dependencies = [ - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "ciborium" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" - -[[package]] -name = "ciborium-ll" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" -dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "clap" -version = "4.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" -dependencies = [ - "clap_builder", - "clap_derive", - "once_cell", -] - -[[package]] -name = "clap_builder" -version = "4.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", - "terminal_size", -] - -[[package]] -name = "clap_complete" -version = "4.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4110a1e6af615a9e6d0a36f805d5c99099f8bab9b8042f5bc1fa220a4a89e36f" -dependencies = [ - "clap", -] - -[[package]] -name = "clap_derive" -version = "4.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.26", -] - -[[package]] -name = "clap_lex" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "criterion" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" -dependencies = [ - "anes", - "cast", - "ciborium", - "clap", - "criterion-plot", - "futures", - "is-terminal", - "itertools 0.10.5", - "num-traits", - "once_cell", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools 0.10.5", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "directories" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" -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", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", -] - -[[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 = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.26", -] - -[[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-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" - -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "indexmap" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "indoc" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" - -[[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", - "libc", - "windows-sys", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix 0.38.4", - "windows-sys", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "js-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "libc" -version = "0.2.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" - -[[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 = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[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.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "object" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "pad" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ad9b889f1b12e0b9ee24db044b5129150d5eada288edc800f789928dc8c0e3" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.26", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "plotters" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" - -[[package]] -name = "plotters-svg" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "predicates" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" -dependencies = [ - "anstyle", - "difflib", - "float-cmp", - "itertools 0.10.5", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -dependencies = [ - "diff", - "yansi", -] - -[[package]] -name = "prettydiff" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff1fec61082821f8236cf6c0c14e8172b62ce8a72a0eedc30d3b247bb68dc11" -dependencies = [ - "ansi_term", - "pad", -] - -[[package]] -name = "proc-macro2" -version = "1.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall 0.2.16", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys", -] - -[[package]] -name = "rustix" -version = "0.38.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" -dependencies = [ - "bitflags 2.3.3", - "errno", - "libc", - "linux-raw-sys 0.4.3", - "windows-sys", -] - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[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 = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "serde" -version = "1.0.171" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-toml-merge" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78072b550e5c20bc4a9d1384be28809cbdb7b25b2b4707ddc6d908b7e6de3bf" -dependencies = [ - "toml", -] - -[[package]] -name = "serde_derive" -version = "1.0.171" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.26", -] - -[[package]] -name = "serde_json" -version = "1.0.103" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" -dependencies = [ - "serde", -] - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[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.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" -dependencies = [ - "autocfg", - "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix 0.37.23", - "windows-sys", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" -dependencies = [ - "rustix 0.37.23", - "windows-sys", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "test-log" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9601d162c1d77e62c1ea0bc8116cd1caf143ce3af947536c3c9052a1677fe0c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "thiserror" -version = "1.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.26", -] - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "tokio" -version = "1.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" -dependencies = [ - "backtrace", - "num_cpus", - "pin-project-lite", - "tokio-macros", -] - -[[package]] -name = "tokio-macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.26", -] - -[[package]] -name = "tokio-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-test" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3" -dependencies = [ - "async-stream", - "bytes", - "futures-core", - "tokio", - "tokio-stream", -] - -[[package]] -name = "toml" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "topiary" -version = "0.3.0" -dependencies = [ - "clap", - "criterion", - "env_logger", - "futures", - "itertools 0.11.0", - "log", - "pretty_assertions", - "prettydiff", - "regex", - "serde", - "serde_json", - "test-log", - "tokio", - "tokio-test", - "toml", - "tree-sitter-bash", - "tree-sitter-facade", - "tree-sitter-json", - "tree-sitter-nickel", - "tree-sitter-ocaml", - "tree-sitter-ocamllex", - "tree-sitter-query", - "tree-sitter-rust", - "tree-sitter-toml", - "unescape", - "web-tree-sitter-sys", -] - -[[package]] -name = "topiary-cli" -version = "0.3.0" -dependencies = [ - "assert_cmd", - "async-scoped", - "clap", - "clap_complete", - "directories", - "env_logger", - "futures", - "indoc", - "itertools 0.11.0", - "log", - "predicates", - "serde-toml-merge", - "tempfile", - "tokio", - "toml", - "topiary", - "topiary-queries", - "tree-sitter-bash", - "tree-sitter-facade", - "tree-sitter-json", - "tree-sitter-nickel", - "tree-sitter-ocaml", - "tree-sitter-ocamllex", - "tree-sitter-query", - "tree-sitter-rust", - "tree-sitter-toml", -] - -[[package]] -name = "topiary-playground" -version = "0.3.0" -dependencies = [ - "cfg-if", - "itertools 0.11.0", - "topiary", - "tree-sitter-facade", - "wasm-bindgen", - "wasm-bindgen-futures", -] - -[[package]] -name = "topiary-queries" -version = "0.3.0" - -[[package]] -name = "tree-sitter" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "tree-sitter-bash" -version = "0.19.0" -source = "git+https://github.com/tree-sitter/tree-sitter-bash#1b0321ee85701d5036c334a6f04761cdc672e64c" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-facade" -version = "0.9.3" -source = "git+https://github.com/tweag/tree-sitter-facade#1b290e795e700a57d8bd303f98a9715ab1c4f598" -dependencies = [ - "js-sys", - "tree-sitter", - "wasm-bindgen", - "web-sys", - "web-tree-sitter-sys", -] - -[[package]] -name = "tree-sitter-json" -version = "0.20.0" -source = "git+https://github.com/tree-sitter/tree-sitter-json.git#ca3f8919800e3c1ad4508de3bfd7b0b860ce434f" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-nickel" -version = "0.0.1" -source = "git+https://github.com/nickel-lang/tree-sitter-nickel?rev=b1a4718601ebd29a62bf3a7fd1069a99ccf48093#b1a4718601ebd29a62bf3a7fd1069a99ccf48093" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-ocaml" -version = "0.20.4" -source = "git+https://github.com/tree-sitter/tree-sitter-ocaml.git#694c57718fd85d514f8b81176038e7a4cfabcaaf" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-ocamllex" -version = "0.20.2" -source = "git+https://github.com/314eter/tree-sitter-ocamllex.git#4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-query" -version = "0.1.0" -source = "git+https://github.com/nvim-treesitter/tree-sitter-query#3a9808b22742d5bd906ef5d1a562f2f1ae57406d" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-rust" -version = "0.20.4" -source = "git+https://github.com/tree-sitter/tree-sitter-rust.git#17a6b15562b09db1f27b8f5f26f17edbb2aac097" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-toml" -version = "0.5.1" -source = "git+https://github.com/tree-sitter/tree-sitter-toml.git#342d9be207c2dba869b9967124c679b5e6fd0ebe" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "unescape" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e" - -[[package]] -name = "unicode-ident" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "walkdir" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -dependencies = [ - "same-file", - "winapi-util", -] - -[[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.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] -name = "web-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-tree-sitter-sys" -version = "1.3.0" -source = "git+https://github.com/tweag/web-tree-sitter-sys#9e9755b9ab59055092de4717ba0bafe6483f4e5c" -dependencies = [ - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[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-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[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.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[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.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[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.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "winnow" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" -dependencies = [ - "memchr", -] - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/pkgs/development/tools/misc/topiary/default.nix b/pkgs/development/tools/misc/topiary/default.nix deleted file mode 100644 index 6be5eedcca5f..000000000000 --- a/pkgs/development/tools/misc/topiary/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, nix-update-script -}: - -rustPlatform.buildRustPackage rec { - pname = "topiary"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "tweag"; - repo = pname; - rev = "v${version}"; - hash = "sha256-zt4uXkO6Y0Yc1Wt8l5O79oKbgNLrgip40ftD7UfUPwo="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "tree-sitter-bash-0.19.0" = "sha256-a0/KyHV2jUpytsZSHI7tVw8GfYnuqVjfs5KScLZkB0I="; - "tree-sitter-facade-0.9.3" = "sha256-M/npshnHJkU70pP3I4WMXp3onlCSWM5mMIqXP45zcUs="; - "tree-sitter-json-0.20.0" = "sha256-cyrea0Y13OVGkXbYE0Cwc7nUsDGEZyoQmPAS9wVuHw0="; - "tree-sitter-nickel-0.0.1" = "sha256-aYsEx1Y5oDEqSPCUbf1G3J5Y45ULT9OkD+fn6stzrOU="; - "tree-sitter-ocaml-0.20.4" = "sha256-j3Hv2qOMxeBNOW+WIgIYzG3zMIFWPQpoHe94b2rT+A8="; - "tree-sitter-ocamllex-0.20.2" = "sha256-YhmEE7I7UF83qMuldHqc/fD/no/7YuZd6CaAIaZ1now="; - "tree-sitter-query-0.1.0" = "sha256-5N7FT0HTK3xzzhAlk3wBOB9xlEpKSNIfakgFnsxEi18="; - "tree-sitter-rust-0.20.4" = "sha256-seWoMuA87ZWCq3mUXopVeDCcTxX/Bh+B4PFLVa0CBQA="; - "tree-sitter-toml-0.5.1" = "sha256-5nLNBxFeOGE+gzbwpcrTVnuL1jLUA0ZLBVw2QrOLsDQ="; - "web-tree-sitter-sys-1.3.0" = "sha256-9rKB0rt0y9TD/HLRoB9LjEP9nO4kSWR9ylbbOXo2+2M="; - }; - }; - - cargoBuildFlags = [ "-p" "topiary-cli" ]; - cargoTestFlags = cargoBuildFlags; - - env.TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/queries"; - - postInstall = '' - install -Dm444 queries/* -t $out/share/queries - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Uniform formatter for simple languages, as part of the Tree-sitter ecosystem"; - mainProgram = "topiary"; - homepage = "https://github.com/tweag/topiary"; - changelog = "https://github.com/tweag/topiary/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/ttags/default.nix b/pkgs/development/tools/misc/ttags/default.nix deleted file mode 100644 index b95bc53e2bea..000000000000 --- a/pkgs/development/tools/misc/ttags/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform, testers, ttags }: -let version = "0.4.1"; -in rustPlatform.buildRustPackage { - pname = "ttags"; - inherit version; - - src = fetchFromGitHub { - owner = "npezza93"; - repo = "ttags"; - rev = "${version}"; - hash = "sha256-yKg0KUA/Wa7B/sU1uxgGQR0Wat/bFv3ascqnUCdWKw0="; - }; - - cargoHash = "sha256-MZ9QRF5yNw+YtSEu+Qc/J3Ap7+nRDZT7aitunk+x38Y="; - - passthru.tests.version = testers.testVersion { - package = ttags; - command = "ttags --version"; - version = version; - }; - - meta = with lib; { - description = "Generate tags using tree-sitter"; - mainProgram = "ttags"; - longDescription = '' - ttags generates tags (similar to ctags) for various - languages, using tree-sitter. - - Can be run as a language server that updates the tags - for a file when it is saved. - - Supported languages: - - Haskell - - JavaScript - - Nix - - Ruby - - Rust - - Swift - ''; - homepage = "https://github.com/npezza93/ttags"; - license = licenses.mit; - maintainers = with maintainers; [ mrcjkb ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/typical/default.nix b/pkgs/development/tools/misc/typical/default.nix deleted file mode 100644 index 9eb303065ab8..000000000000 --- a/pkgs/development/tools/misc/typical/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, installShellFiles -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "typical"; - version = "0.12.1"; - - src = fetchFromGitHub { - owner = "stepchowfun"; - repo = "typical"; - rev = "v${version}"; - hash = "sha256-y7PWTzD9+rkC4wZYhecmDTa3AoWl4Tgh7QXbSK4Qq5Q="; - }; - - cargoHash = "sha256-U6dRk8fqhxxMbu283jvkjGMjbIOYqy9jN64M2VmdZ/g="; - - nativeBuildInputs = [ - installShellFiles - ]; - - preCheck = '' - export NO_COLOR=true - ''; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd typical \ - --bash <($out/bin/typical shell-completion bash) \ - --fish <($out/bin/typical shell-completion fish) \ - --zsh <($out/bin/typical shell-completion zsh) - ''; - - meta = with lib; { - description = "Data interchange with algebraic data types"; - mainProgram = "typical"; - homepage = "https://github.com/stepchowfun/typical"; - changelog = "https://github.com/stepchowfun/typical/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/tyson/default.nix b/pkgs/development/tools/misc/tyson/default.nix deleted file mode 100644 index 2809c881c945..000000000000 --- a/pkgs/development/tools/misc/tyson/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -}: - -buildGoModule rec { - pname = "tyson"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "jetpack-io"; - repo = "tyson"; - rev = "v${version}"; - hash = "sha256-c4ROLn+BSX7v/4C9/IeU6HiE2YvnqDuXXGp2iZhAVk4="; - }; - - vendorHash = "sha256-NhDv7oH8LK/vebwjs55tsCCWVhbZZd15z5ewOF5z9+Y="; - - nativeBuildInputs = [ - installShellFiles - ]; - - ldflags = [ "-s" "-w" ]; - - postInstall = '' - installShellCompletion --cmd tyson \ - --bash <($out/bin/tyson completion bash) \ - --fish <($out/bin/tyson completion fish) \ - --zsh <($out/bin/tyson completion zsh) - ''; - - meta = with lib; { - description = "TypeScript as a configuration language"; - mainProgram = "tyson"; - homepage = "https://github.com/jetpack-io/tyson"; - changelog = "https://github.com/jetpack-io/tyson/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix deleted file mode 100644 index 519580507a6b..000000000000 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3 }: - -stdenv.mkDerivation rec { - pname = "uncrustify"; - version = "0.79.0"; - - src = fetchFromGitHub { - owner = "uncrustify"; - repo = "uncrustify"; - rev = "uncrustify-${version}"; - sha256 = "sha256-M9LfLWpkMoCNrvnmMhFhfJhyOwbnitjpm7LKay1M0dI="; - }; - - nativeBuildInputs = [ cmake python3 ]; - - meta = with lib; { - description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; - mainProgram = "uncrustify"; - homepage = "https://uncrustify.sourceforge.net/"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/development/tools/misc/unifdef/default.nix deleted file mode 100644 index 76c3b7346011..000000000000 --- a/pkgs/development/tools/misc/unifdef/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "unifdef"; - version = "2.12"; - - src = fetchurl { - url = "https://dotat.at/prog/unifdef/unifdef-${version}.tar.xz"; - sha256 = "00647bp3m9n01ck6ilw6r24fk4mivmimamvm4hxp5p6wxh10zkj3"; - }; - - makeFlags = [ - "prefix=$(out)" - "DESTDIR=" - ]; - - meta = with lib; { - homepage = "https://dotat.at/prog/unifdef/"; - description = "Selectively remove C preprocessor conditionals"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = with maintainers; [ orivej ]; - }; -} diff --git a/pkgs/development/tools/misc/unixbench/common.patch b/pkgs/development/tools/misc/unixbench/common.patch deleted file mode 100644 index 68961cbe2edd..000000000000 --- a/pkgs/development/tools/misc/unixbench/common.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff --git a/UnixBench/Run b/UnixBench/Run -index 34d2c72..130b56e 100755 ---- a/UnixBench/Run -+++ b/UnixBench/Run -@@ -81,23 +81,23 @@ my $longIterCount = 10; - my $shortIterCount = 3; - - # C compiler to use in compilation tests. --my $cCompiler = 'gcc'; -+my $cCompiler = 'cc -w'; - - # Establish full paths to directories. These need to be full pathnames - # (or do they, any more?). They can be set in env. - # variable names are the first parameter to getDir() below. - - # Directory where the test programs live. --my $BINDIR = getDir('UB_BINDIR', $FindBin::Bin . "/pgms"); -+my $BINDIR = getDir('UB_BINDIR', '@out@/libexec/pgms'); - - # Temp directory, for temp files. --my $TMPDIR = getDir('UB_TMPDIR', $FindBin::Bin . "/tmp"); -+my $TMPDIR = getDir('UB_TMPDIR', "$ENV{'PWD'}/unixbench/temp"); - - # Directory to put results in. --my $RESULTDIR = getDir('UB_RESULTDIR', $FindBin::Bin . "/results"); -+my $RESULTDIR = getDir('UB_RESULTDIR', "$ENV{'PWD'}/unixbench/results"); - - # Directory where the tests are executed. --my $TESTDIR = getDir('UB_TESTDIR', $FindBin::Bin . "/testdir"); -+my $TESTDIR = getDir('UB_TESTDIR', '@out@/share/testdir'); - - - ############################################################################ -@@ -330,19 +330,19 @@ my $testParams = { - "logmsg" => "Shell Scripts (1 concurrent)", - "cat" => 'system', - "prog" => "${BINDIR}/looper", -- "options" => "60 \"${BINDIR}/multi.sh\" 1", -+ "options" => "60 \"${BINDIR}/multi.sh\" 1 ${TMPDIR} ${TESTDIR}", - }, - "shell8" => { - "logmsg" => "Shell Scripts (8 concurrent)", - "cat" => 'system', - "prog" => "${BINDIR}/looper", -- "options" => "60 \"${BINDIR}/multi.sh\" 8", -+ "options" => "60 \"${BINDIR}/multi.sh\" 8 ${TMPDIR} ${TESTDIR}", - }, - "shell16" => { - "logmsg" => "Shell Scripts (16 concurrent)", - "cat" => 'system', - "prog" => "${BINDIR}/looper", -- "options" => "60 \"${BINDIR}/multi.sh\" 16", -+ "options" => "60 \"${BINDIR}/multi.sh\" 16 ${TMPDIR} ${TESTDIR}", - }, - - ########################## -@@ -434,7 +434,7 @@ my $testParams = { - "logmsg" => "C Compiler Throughput ($cCompiler)", - "cat" => 'misc', - "prog" => "${BINDIR}/looper", -- "options" => "60 $cCompiler cctest.c", -+ "options" => "60 $cCompiler $TESTDIR/cctest.c -o $TMPDIR/cctest", - }, - "arithoh" => { - "logmsg" => "Arithoh", -@@ -873,16 +873,6 @@ sub preChecks { - # Set the language. - $ENV{'LANG'} = $language; - -- # Check that the required files are in the proper places. -- my $make = $ENV{MAKE} || "make"; -- system("$make check"); -- if ($? != 0) { -- system("$make all"); -- if ($? != 0) { -- abortRun("\"$make all\" failed"); -- } -- } -- - # Create a script to kill this run. - system("echo \"kill -9 $$\" > \"${TMPDIR}/kill_run\""); - chmod(0755, $TMPDIR . "/kill_run"); -@@ -923,7 +913,10 @@ sub parseArgs { - $params->{'copies'} = [ ]; - } - push(@{$params->{'copies'}}, shift(@words)); -- } else { -+ } elsif ($word eq "--help" || $word eq "-h") { -+ print "Run: please see ubench(1) for available options\n"; -+ exit 0; -+ }else { - die("Run: unknown option $word\n"); - } - } -diff --git a/UnixBench/pgms/multi.sh b/UnixBench/pgms/multi.sh -index 72e8716..d2f5f48 100755 ---- a/UnixBench/pgms/multi.sh -+++ b/UnixBench/pgms/multi.sh -@@ -15,7 +15,8 @@ - ############################################################################### - ID="@(#)multi.sh:3.4 -- 5/15/91 19:30:24"; - instance=1 --sort_src=sort.src -+sort_src=$3/sort.src -+cd $2 - work_factor=${MULTI_SH_WORK_FACTOR:-1} - if [ $work_factor -gt 1 ]; then - inputs= diff --git a/pkgs/development/tools/misc/unixbench/default.nix b/pkgs/development/tools/misc/unixbench/default.nix deleted file mode 100644 index d5f060af82cf..000000000000 --- a/pkgs/development/tools/misc/unixbench/default.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, makeWrapper -, pandoc -, installShellFiles -, perl -, xorg -, libGLX -, coreutils -, unixtools -, targetPackages -, gnugrep -, gawk -, withGL? true -, withX11perf? true -}: - -stdenv.mkDerivation rec { - pname = "unixbench"; - version = "unstable-2023-02-27"; - - src = fetchFromGitHub { - owner = "kdlucas"; - repo = "byte-unixbench"; - rev = "a07fcc03264915c624f0e4818993c5b4df3fa703"; - hash = "sha256-gmRWAqE9/HBb0S9rK0DXoaCoiGbtat0gmdeozhbv0NI="; - }; - - patches = [ - ./common.patch - ]; - - patchFlags = [ "-p2" ]; - - sourceRoot = "${src.name}/UnixBench"; - - postPatch = '' - substituteInPlace Makefile \ - --replace "-Wa,-q" "" - ''; - - nativeBuildInputs = [ - makeWrapper - pandoc - installShellFiles - ]; - - buildInputs = [ perl ] ++ lib.optionals withGL [ - xorg.libX11 - xorg.libXext - libGLX - ]; - - runtimeDependencies = [ - coreutils - unixtools.nettools - unixtools.locale - targetPackages.stdenv.cc - gnugrep - gawk - ] ++ lib.optionals withX11perf [ - xorg.x11perf - ]; - - makeFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - ] ++ lib.optionals withGL [ - "GRAPHIC_TESTS=defined" - ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/{bin,libexec,share} - install -D Run $out/bin/ubench - cp -r pgms $out/libexec/ - cp -r testdir $out/share/ - runHook postInstall - ''; - - postInstall = '' - substituteInPlace USAGE \ - --replace 'Run"' 'ubench"' \ - --replace './Run' 'ubench' \ - --replace 'Run ' 'ubench ' - pandoc -f rst -t man USAGE -o ubench.1 - installManPage ubench.1 - ''; - - preFixup = '' - substituteInPlace $out/libexec/pgms/multi.sh \ - --replace '/bin/sh "$' '${targetPackages.runtimeShell} "$' - - substituteInPlace $out/bin/ubench \ - --subst-var out - - wrapProgram $out/bin/ubench \ - --prefix PATH : ${lib.makeBinPath runtimeDependencies} - ''; - - meta = with lib; { - description = "Basic indicator of the performance of a Unix-like system"; - homepage = "https://github.com/kdlucas/byte-unixbench"; - license = licenses.gpl2Plus; - mainProgram = "ubench"; - maintainers = with maintainers; [ aleksana ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/unused/default.nix b/pkgs/development/tools/misc/unused/default.nix deleted file mode 100644 index 9c7875146690..000000000000 --- a/pkgs/development/tools/misc/unused/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform, cmake }: -rustPlatform.buildRustPackage rec { - pname = "unused"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "unused-code"; - repo = pname; - rev = version; - sha256 = "sha256-+1M8dUfjjrT4llS0C6WYDyNxJ9QZ5s9v+W185TbgwMw="; - }; - - nativeBuildInputs = [ cmake ]; - - cargoHash = "sha256-hCtkR20+xs1UHZP7oJVpJACVGcMQLQmSS1QE2tmIVhs="; - - meta = with lib; { - description = "Tool to identify potentially unused code"; - homepage = "https://unused.codes"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index 0befa7aac9d6..474de7100486 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ marcweber peterhoeg ]; platforms = platforms.linux; + mainProgram = "usb_modeswitch"; }; } diff --git a/pkgs/development/tools/misc/usbsdmux/default.nix b/pkgs/development/tools/misc/usbsdmux/default.nix deleted file mode 100644 index 7794cf06d77d..000000000000 --- a/pkgs/development/tools/misc/usbsdmux/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, python3Packages, fetchPypi }: - -python3Packages.buildPythonApplication rec { - pname = "usbsdmux"; - version = "24.1.1"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-OtGgToDGUr6pBu9+LS/DxaYw/9+Pd6jPhxVDAM22HB4="; - }; - - # Remove the wrong GROUP=plugdev. - # The udev rule already has TAG+="uaccess", which is sufficient. - postPatch = '' - substituteInPlace contrib/udev/99-usbsdmux.rules \ - --replace-fail 'TAG+="uaccess", GROUP="plugdev"' 'TAG+="uaccess"' - ''; - - # usbsdmux is not meant to be used as an importable module and has no tests - doCheck = false; - - postInstall = '' - install -Dm0444 -t $out/lib/udev/rules.d/ contrib/udev/99-usbsdmux.rules - ''; - - meta = with lib; { - description = "Control software for the LXA USB-SD-Mux"; - homepage = "https://github.com/linux-automation/usbsdmux"; - license = licenses.lgpl21; - maintainers = with maintainers; [ emantor ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/development/tools/misc/vtable-dumper/default.nix b/pkgs/development/tools/misc/vtable-dumper/default.nix deleted file mode 100644 index 1bb01240a2a8..000000000000 --- a/pkgs/development/tools/misc/vtable-dumper/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libelf }: - -stdenv.mkDerivation rec { - pname = "vtable-dumper"; - version = "1.2"; - - src = fetchFromGitHub { - owner = "lvc"; - repo = "vtable-dumper"; - rev = version; - sha256 = "0sl7lnjr2l4c2f7qaazvpwpzsp4gckkvccfam88wcq9f7j9xxbyp"; - }; - - buildInputs = [ libelf ]; - makeFlags = [ "prefix=$(out)" ]; - - meta = with lib; { - homepage = "https://github.com/lvc/vtable-dumper"; - description = "Tool to list content of virtual tables in a C++ shared library"; - mainProgram = "vtable-dumper"; - license = licenses.lgpl21; - maintainers = [ maintainers.bhipple ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/wasmer-pack/default.nix b/pkgs/development/tools/misc/wasmer-pack/default.nix deleted file mode 100644 index 7c1d84de885d..000000000000 --- a/pkgs/development/tools/misc/wasmer-pack/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "wasmer-pack"; - version = "0.7.1"; - - src = fetchFromGitHub { - owner = "wasmerio"; - repo = "wasmer-pack"; - rev = "v${version}"; - hash = "sha256-+wqgYkdkuhPFkJBdQLnUKAGmUfGBU9mBfMRNBFmiT4E="; - }; - - cargoHash = "sha256-nyhjwEZyT8IEb0pTbou/EtN47gehge3fUCQVPs2TkIY="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - cargoBuildFlags = [ "-p=wasmer-pack-cli" ]; - - # requires internet access - doCheck = false; - - meta = with lib; { - description = "Import your WebAssembly code just like any other dependency"; - mainProgram = "wasmer-pack"; - homepage = "https://github.com/wasmerio/wasmer-pack"; - changelog = "https://github.com/wasmerio/wasmer-pack/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/wishbone-tool/default.nix b/pkgs/development/tools/misc/wishbone-tool/default.nix deleted file mode 100644 index 7cda9afee898..000000000000 --- a/pkgs/development/tools/misc/wishbone-tool/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform, libusb-compat-0_1 }: - -let - version = "0.7.9"; - src = fetchFromGitHub { - owner = "litex-hub"; - repo = "wishbone-utils"; - rev = "v${version}"; - hash = "sha256-Gl0bxHJ8Y0ytYJxToYAR2tVkD4YNMihk+zRpieSvMGE="; - }; -in -rustPlatform.buildRustPackage { - pname = "wishbone-tool"; - inherit version; - - inherit src; - - sourceRoot = "${src.name}/wishbone-tool"; - - cargoHash = "sha256-wOw3v47AekJUW+8dpHVysheA+42HwEahn/hriYF7CfA="; - - buildInputs = [ libusb-compat-0_1 ]; - - meta = with lib; { - description = "Manipulate a Wishbone device over some sort of bridge"; - mainProgram = "wishbone-tool"; - homepage = "https://github.com/litex-hub/wishbone-utils"; - license = licenses.asl20; - maintainers = with maintainers; [ edef ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/misc/xorg-autoconf/default.nix b/pkgs/development/tools/misc/xorg-autoconf/default.nix deleted file mode 100644 index 34aa363550ae..000000000000 --- a/pkgs/development/tools/misc/xorg-autoconf/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, stdenv -, autoreconfHook -, fetchFromGitLab -}: - -stdenv.mkDerivation rec { - pname = "xorg-autoconf"; - version = "1.19.3"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - group = "xorg"; - owner = "util"; - repo = "macros"; - rev = "util-macros-${version}"; - sha256 = "sha256-+yEMCjLztdY5LKTNjfhudDS0fdaOj4LKZ3YL5witFR4="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - meta = with lib; { - description = "GNU autoconf macros shared across X.Org projects"; - homepage = "https://gitlab.freedesktop.org/xorg/util/macros"; - maintainers = with maintainers; [ raboof ]; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/misc/xspim/default.nix b/pkgs/development/tools/misc/xspim/default.nix deleted file mode 100644 index 4a040e41ab66..000000000000 --- a/pkgs/development/tools/misc/xspim/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib, stdenv, fetchsvn, imake, bison, flex, xorg }: - -stdenv.mkDerivation rec { - pname = "xspim"; - version = "9.1.22"; - - src = fetchsvn { - url = "https://svn.code.sf.net/p/spimsimulator/code/"; - rev = "r739"; - sha256 = "1kazfgrbmi4xq7nrkmnqw1280rhdyc1hmr82flrsa3g1b1rlmj1s"; - }; - - nativeBuildInputs = [ imake bison flex ]; - buildInputs = [ - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXaw - xorg.libXext - xorg.libXmu - xorg.libXpm - xorg.libXt - ]; - - preConfigure = '' - cd xspim - xmkmf - ''; - - makeFlags = [ - "BIN_DIR=${placeholder "out"}/bin" - "EXCEPTION_DIR=${placeholder "out"}/share/spim" - "MAN_DIR=${placeholder "out"}/share/man/man1" - ]; - - doCheck = true; - preCheck = '' - pushd ../spim - ''; - postCheck = '' - popd - ''; - - preInstall = '' - mkdir -p $out/share/spim - install -D ../spim/spim $out/bin/spim - install -D ../Documentation/spim.man $out/share/man/man1/spim.1 - install -D ../Documentation/xspim.man $out/share/man/man1/xspim.1 - ''; - - meta = with lib; { - description = "MIPS32 simulator"; - homepage = "https://spimsimulator.sourceforge.net/"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ emilytrau ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/misc/xxgdb/default.nix b/pkgs/development/tools/misc/xxgdb/default.nix deleted file mode 100644 index 1c6eca4729a0..000000000000 --- a/pkgs/development/tools/misc/xxgdb/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchurl -, imake -, gccmakedep -, libX11 -, libXaw -, libXext -, libXmu -, libXt -}: - -stdenv.mkDerivation rec { - pname = "xxgdb"; - version = "1.12"; - - src = fetchurl { - url = "http://deb.debian.org/debian/pool/main/x/xxgdb/xxgdb_${version}.orig.tar.gz"; - sha256 = "0jwazg99wk2l7r390ggw0yr8xipl07bp0qynni141xss530i6d1a"; - }; - - patches = [ - # http://zhu-qy.blogspot.com.es/2012/11/slackware-14-i-still-got-xxgdb-all-ptys.html - ./xxgdb-pty.patch - ]; - - nativeBuildInputs = [ imake gccmakedep ]; - buildInputs = [ libX11 libXaw libXext libXmu libXt ]; - - preConfigure = '' - mkdir build - xmkmf - ''; - - makeFlags = [ - "DESTDIR=build" - ]; - - postInstall = '' - # Fix up install paths - shopt -s globstar - mv build/**/bin $out/bin - - install -D xxgdb.1 $out/share/man/man1/xxgdb.1 - ''; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "Simple but powerful graphical interface to gdb"; - mainProgram = "xxgdb"; - license = licenses.mit; - maintainers = with maintainers; [ emilytrau ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/xxgdb/xxgdb-pty.patch b/pkgs/development/tools/misc/xxgdb/xxgdb-pty.patch deleted file mode 100644 index 735bb1b0b5fc..000000000000 --- a/pkgs/development/tools/misc/xxgdb/xxgdb-pty.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- xxgdb-1.12-org/calldbx.c 2012-10-26 17:17:49.810750909 -0700 -+++ xxgdb-1.12/calldbx.c 2012-10-26 17:53:59.209918816 -0700 -@@ -69,6 +69,12 @@ - * create_io_window(): create an io window for gdb to use - */ - -+#ifdef linux -+#ifndef _GNU_SOURCE -+#define _GNU_SOURCE -+#endif -+#endif -+ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -@@ -126,6 +132,13 @@ - { - int master; - -+#ifdef _POSIX_SOURCE -+ if ((master = posix_openpt (O_RDWR|O_NOCTTY)) < 0) { -+ perror("posix_openpt failed:"); -+ } else { -+ return master; -+ } -+#else - #ifdef SVR4 /* (MJH) Use STREAMS */ - - if((master = open(MASTER_CLONE, O_RDWR)) < 0) -@@ -152,6 +165,7 @@ - } - #endif - #endif /* SVR4 */ -+#endif /* _POSIX_SOURCE */ - - #ifdef GDB - fprintf(stderr, "xxgdb: all ptys in use\n"); -@@ -167,7 +181,28 @@ - { - int slave; - --#ifdef SVR4 /* (MJH) */ -+#ifdef _POSIX_SOURCE -+ char *slave_name = ptsname (master); -+ if (slave_name == NULL) { -+ perror ("Pseudo-tty slave"); -+ exit (2); -+ } // end if -+ if (grantpt (master) < 0) { -+ perror ("grantpt error"); -+ exit (3); -+ } -+ if (unlockpt (master) < 0) { -+ perror ("unlockpt error"); -+ exit (4); -+ } -+ if ((slave = open (slave_name, O_RDWR)) < 0) { -+ perror (slave_name); -+ exit (5); -+ } // end if -+ return slave; -+#else -+#ifdef SVR4 -+ /* (MJH) */ - char *slave_name = "unknown"; - extern char *ptsname(int master); - void (*handler)(); -@@ -194,6 +229,7 @@ - } - return slave; - #endif /* SVR4 */ -+#endif /* _POSIX_SOURCE */ - } - - #ifdef CREATE_IO_WINDOW -@@ -230,7 +266,7 @@ - { - /* child */ - /* printf("xterm xterm -l -e xxgdbiowin\n");*/ -- if (execlp("xterm", "xterm", "-e", "xxgdbiowin", 0)) -+ if (execlp("xterm", "xterm", "-e", "xxgdbiowin", NULL)) - { - printf("exec of 'xterm -e xxgdbiowin' fails\n"); - unlink("/tmp/iowindowtty"); diff --git a/pkgs/development/tools/misc/yakut/default.nix b/pkgs/development/tools/misc/yakut/default.nix index c4589eefb4de..c4f5d4e051c6 100644 --- a/pkgs/development/tools/misc/yakut/default.nix +++ b/pkgs/development/tools/misc/yakut/default.nix @@ -24,7 +24,7 @@ buildPythonApplication rec { }; buildInputs = [ - stdenv.cc.cc.lib + (lib.getLib stdenv.cc.cc) click coloredlogs psutil diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix deleted file mode 100644 index d8e5bd26b39d..000000000000 --- a/pkgs/development/tools/misc/yodl/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, perl, icmake, util-linux }: - -stdenv.mkDerivation rec { - pname = "yodl"; - version = "4.03.03"; - - nativeBuildInputs = [ icmake ]; - - buildInputs = [ perl ]; - - src = fetchFromGitLab { - hash = "sha256-MeD/jjhwoiWTb/G8pHrnEEX22h+entPr9MhJ6WHO3DM="; - rev = version; - repo = "yodl"; - owner = "fbb-git"; - }; - - setSourceRoot = '' - sourceRoot=$(echo */yodl) - ''; - - preConfigure = '' - patchShebangs ./build - patchShebangs scripts/ - substituteInPlace INSTALL.im --replace /usr $out - substituteInPlace macros/rawmacros/startdoc.pl --replace /usr/bin/perl ${perl}/bin/perl - substituteInPlace scripts/yodl2whatever.in --replace getopt ${util-linux}/bin/getopt - ''; - - # Set TERM because icmbuild calls tput. - TERM = "xterm"; - - buildPhase = '' - ./build programs - ./build macros - ./build man - ''; - - installPhase = '' - ./build install programs - ./build install macros - ./build install man - ''; - - meta = with lib; { - description = "Package that implements a pre-document language and tools to process it"; - homepage = "https://fbb-git.gitlab.io/yodl/"; - license = licenses.gpl3; - maintainers = with maintainers; [ pSub ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/misc/ztags/default.nix b/pkgs/development/tools/misc/ztags/default.nix deleted file mode 100644 index 25010cc0cc67..000000000000 --- a/pkgs/development/tools/misc/ztags/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, scdoc -, zig_0_11 -}: - -stdenv.mkDerivation { - pname = "ztags"; - version = "unstable-2023-09-07"; - - src = fetchFromGitHub { - owner = "gpanders"; - repo = "ztags"; - rev = "6cdbd6dcdeda0d1ab9ad30261000e3d21b2407e6"; - hash = "sha256-lff5L7MG8RJdJM/YebJKDkKfkG4oumC0HytiCUOUG5Q="; - }; - - nativeBuildInputs = [ - scdoc - zig_0_11.hook - ]; - - postInstall = '' - zig build docs --prefix $out - ''; - - meta = with lib; { - description = "Generate tags files for Zig projects"; - homepage = "https://github.com/gpanders/ztags"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "ztags"; - inherit (zig_0_11.meta) platforms; - }; -} diff --git a/pkgs/development/tools/mix2nix/default.nix b/pkgs/development/tools/mix2nix/default.nix deleted file mode 100644 index a2420980d181..000000000000 --- a/pkgs/development/tools/mix2nix/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, elixir, erlang }: - -stdenv.mkDerivation rec { - pname = "mix2nix"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "ydlr"; - repo = "mix2nix"; - rev = version; - hash = "sha256-hD4lpP8GPkNXuMMDOOTEmy+rOwOSCxQwR0Mjq8i4oDM="; - }; - - nativeBuildInputs = [ elixir ]; - buildInputs = [ erlang ]; - - buildPhase = "mix escript.build"; - installPhase = "install -Dt $out/bin mix2nix"; - - meta = with lib; { - description = "Generate nix expressions from mix.lock file"; - mainProgram = "mix2nix"; - license = licenses.mit; - maintainers = with maintainers; [ ydlr ] ++ teams.beam.members; - }; -} diff --git a/pkgs/development/tools/mmixware/default.nix b/pkgs/development/tools/mmixware/default.nix deleted file mode 100644 index 024028fd5b69..000000000000 --- a/pkgs/development/tools/mmixware/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, tetex }: - -stdenv.mkDerivation { - pname = "mmixware"; - version = "unstable-2021-06-18"; - - src = fetchFromGitLab { - domain = "gitlab.lrz.de"; - owner = "mmix"; - repo = "mmixware"; - rev = "7c790176d50d13ae2422fa7457ccc4c2d29eba9b"; - sha256 = "sha256-eSwHiJ5SP/Nennalv4QFTgVnM6oan/DWDZRqtk0o6Z0="; - }; - - hardeningDisable = [ "format" ]; - - postPatch = '' - substituteInPlace Makefile --replace 'rm abstime.h' "" - ''; - - # Workaround build failure on -fno-common toolchains: - # ld: mmix-config.o:(.bss+0x600): multiple definition of `buffer'; /build/ccDuGrwH.o:(.bss+0x20): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - nativeBuildInputs = [ tetex ]; - enableParallelBuilding = true; - - makeFlags = [ "all" "doc" "CFLAGS=-O2" ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/doc - cp *.ps $out/share/doc - install -Dm755 mmixal -t $out/bin - install -Dm755 mmix -t $out/bin - install -Dm755 mmotype -t $out/bin - install -Dm755 mmmix -t $out/bin - runHook postInstall - ''; - - meta = with lib; { - description = "MMIX simulator and assembler"; - homepage = "https://www-cs-faculty.stanford.edu/~knuth/mmix-news.html"; - maintainers = with maintainers; [ siraben ]; - platforms = platforms.unix; - license = licenses.publicDomain; - }; -} diff --git a/pkgs/development/tools/mockgen/default.nix b/pkgs/development/tools/mockgen/default.nix deleted file mode 100644 index ed2aa4e50d93..000000000000 --- a/pkgs/development/tools/mockgen/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, lib -, testers -, mockgen -}: - -buildGoModule rec { - pname = "mockgen"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "uber-go"; - repo = "mock"; - rev = "v${version}"; - sha256 = "sha256-3nt70xrZisK5vgQa+STZPiY4F9ITKw8PbBWcKoBn4Vc="; - }; - - vendorHash = "sha256-mcNVud2jzvlPPQEaar/eYZkP71V2Civz+R5v10+tewA="; - - CGO_ENABLED = 0; - - subPackages = [ "mockgen" ]; - - ldflags = [ - "-X=main.version=${version}" - "-X=main.date=1970-01-01T00:00:00Z" - "-X=main.commit=unknown" - ]; - - passthru.tests.version = testers.testVersion { - package = mockgen; - command = "mockgen -version"; - version = '' - v${version} - Commit: unknown - Date: 1970-01-01T00:00:00Z - ''; - }; - - meta = with lib; { - description = "GoMock is a mocking framework for the Go programming language"; - homepage = "https://github.com/uber-go/mock"; - changelog = "https://github.com/uber-go/mock/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ bouk ]; - mainProgram = "mockgen"; - }; -} diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix deleted file mode 100644 index 8e71eb969b6b..000000000000 --- a/pkgs/development/tools/mod/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib }: - -buildGoModule rec { - pname = "mod"; - version = "0.7.1"; - - src = fetchFromGitHub { - owner = "marwan-at-work"; - repo = "mod"; - rev = "v${version}"; - sha256 = "sha256-QkLARUN/NiN0D6VEhosdFJSce6DP+sWRWFwAEocZaOQ="; - }; - - vendorHash = "sha256-5A4W99wcuXMWH0s+uykBWuKCxo8wr3GbTpUKj+Ql0os="; - - doCheck = false; - - subPackages = [ "cmd/mod" ]; - - meta = with lib; { - description = "Automated Semantic Import Versioning Upgrades for Go"; - mainProgram = "mod"; - longDescription = '' - Command line tool to upgrade/downgrade Semantic Import Versioning in Go - Modules. - ''; - homepage = "https://github.com/marwan-at-work/mod"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/tools/modd/default.nix b/pkgs/development/tools/modd/default.nix deleted file mode 100644 index 23116255c0de..000000000000 --- a/pkgs/development/tools/modd/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "modd"; - version = "unstable-2021-12-15"; - - src = fetchFromGitHub { - owner = "cortesi"; - repo = "modd"; - rev = "6083f9d1c171bd3292945672dab654a70d205945"; - sha256 = "sha256-KDZyOnytDLyybHTgU1v/NpiomeHXMIUHiQ+Xpmwyo0w="; - }; - - vendorHash = "sha256-O+hJRMSwV/9NHxbaLjloCWnfPugfRYaXNve098wjbqQ="; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Flexible developer tool that runs processes and responds to filesystem changes"; - mainProgram = "modd"; - homepage = "https://github.com/cortesi/modd"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/tools/moq/default.nix b/pkgs/development/tools/moq/default.nix deleted file mode 100644 index e3ba759beb16..000000000000 --- a/pkgs/development/tools/moq/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib }: - -buildGoModule rec { - pname = "moq"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "matryer"; - repo = "moq"; - rev = "v${version}"; - sha256 = "sha256-7egB+0JLHUbPc21XBC18M4m4fPqy1Qon3N9Fwkcmico="; - }; - - vendorHash = "sha256-Kp0mRLmOlV3UpYSQJoc54tYU78sg+RZ5qy/1ime7j7w="; - - subPackages = [ "." ]; - - ldflags = [ - "-s" - "-w" - "-X main.Version=${version}" - ]; - - meta = with lib; { - homepage = "https://github.com/matryer/moq"; - description = "Interface mocking tool for go generate"; - mainProgram = "moq"; - longDescription = '' - Moq is a tool that generates a struct from any interface. The struct can - be used in test code as a mock of the interface. - ''; - license = licenses.mit; - maintainers = with maintainers; [ anpryl ]; - }; -} diff --git a/pkgs/development/tools/mpfshell/default.nix b/pkgs/development/tools/mpfshell/default.nix deleted file mode 100644 index 63223a54eb8e..000000000000 --- a/pkgs/development/tools/mpfshell/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, python3Packages, fetchFromGitHub }: - -python3Packages.buildPythonPackage rec { - pname = "mpfshell-unstable"; - version = "2020-04-11"; - - src = fetchFromGitHub { - owner = "wendlers"; - repo = "mpfshell"; - rev = "429469fcccbda770fddf7a4277f5db92b1217664"; - sha256 = "0md6ih9vp65dacqy8gki3b2p4v76xb9ijqmxymk4b4f9z684x2m7"; - }; - - propagatedBuildInputs = with python3Packages; [ - pyserial colorama websocket-client - ]; - - doCheck = false; - pythonImportsCheck = [ "mp.mpfshell" ]; - - meta = with lib; { - homepage = "https://github.com/wendlers/mpfshell"; - description = "Simple shell based file explorer for ESP8266 Micropython based devices"; - mainProgram = "mpfshell"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/development/tools/msgpack-tools/default.nix deleted file mode 100644 index 5b3bc7b1472c..000000000000 --- a/pkgs/development/tools/msgpack-tools/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "msgpack-tools"; - version = "0.6"; - - src = fetchFromGitHub { - owner = "ludocode"; - repo = "msgpack-tools"; - rev = "v${version}"; - sha256 = "1ygjk25zlpqjckxgqmahnz999704zy2bd9id6hp5jych1szkjgs5"; - }; - - libb64 = fetchurl { - url = "mirror://sourceforge/libb64/libb64-1.2.1.zip"; - sha256 = "1chlcc8qggzxnbpy5wrda533xyz38dk20w9wl4srrzawm45ny410"; - }; - - rapidjson = fetchurl { - url = "https://github.com/miloyip/rapidjson/archive/99ba17bd66a85ec64a2f322b68c2b9c3b77a4391.tar.gz"; - sha256 = "0jxgyy5n0lf9w36dycwwgz2wici4z9dnxlsn0z6m23zaa47g3wyw"; - }; - - mpack = fetchurl { - url = "https://github.com/ludocode/mpack/archive/df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz"; - sha256 = "1br8g3rf86h8z8wbqkd50aq40953862lgn0xk7cy68m07fhqc3pg"; - }; - - postUnpack = '' - mkdir $sourceRoot/contrib - cp ${rapidjson} $sourceRoot/contrib/rapidjson-99ba17bd66a85ec64a2f322b68c2b9c3b77a4391.tar.gz - cp ${libb64} $sourceRoot/contrib/libb64-1.2.1.zip - cp ${mpack} $sourceRoot/contrib/mpack-df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz - ''; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Command-line tools for converting between MessagePack and JSON"; - homepage = "https://github.com/ludocode/msgpack-tools"; - license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ alibabzo ]; - }; -} diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix deleted file mode 100644 index 6c93c272164b..000000000000 --- a/pkgs/development/tools/mustache-go/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "mustache-go"; - version = "1.4.0"; - - src = fetchFromGitHub { - owner = "cbroglie"; - repo = "mustache"; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-A7LIkidhpFmhIjiDu9KdmSIdqFNsV3N8J2QEo7yT+DE="; - }; - - vendorHash = "sha256-FYdsLcW6FYxSgixZ5US9cBPABOAVwidC3ejUNbs1lbA="; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - homepage = "https://github.com/cbroglie/mustache"; - description = "Mustache template language in Go"; - license = [ licenses.mit ]; - maintainers = with maintainers; [ Zimmi48 ]; - mainProgram = "mustache"; - }; -} diff --git a/pkgs/development/tools/mutmut/default.nix b/pkgs/development/tools/mutmut/default.nix deleted file mode 100644 index 3d9c8078060c..000000000000 --- a/pkgs/development/tools/mutmut/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, fetchFromGitHub -, python3 -, testers -}: - -let self = with python3.pkgs; buildPythonApplication rec { - pname = "mutmut"; - version = "2.2.0"; - - src = fetchFromGitHub { - repo = pname; - owner = "boxed"; - rev = version; - hash = "sha256-G+OL/9km2iUeZ1QCpU73CIWVWMexcs3r9RdCnAsESnY="; - }; - - postPatch = '' - substituteInPlace requirements.txt --replace 'junit-xml==1.8' 'junit-xml==1.9' - ''; - - disabled = pythonOlder "3.7"; - - doCheck = false; - - propagatedBuildInputs = [ click glob2 parso pony junit-xml ]; - - passthru.tests.version = testers.testVersion { package = self; }; - - meta = with lib; { - description = "mutation testing system for Python, with a strong focus on ease of use"; - mainProgram = "mutmut"; - homepage = "https://github.com/boxed/mutmut"; - changelog = "https://github.com/boxed/mutmut/blob/${version}/HISTORY.rst"; - license = licenses.bsd3; - maintainers = with maintainers; [ synthetica ]; - }; -}; -in self diff --git a/pkgs/development/tools/mysql-shell/8.nix b/pkgs/development/tools/mysql-shell/8.nix index 2f8983572f29..79f8f638c08c 100644 --- a/pkgs/development/tools/mysql-shell/8.nix +++ b/pkgs/development/tools/mysql-shell/8.nix @@ -5,9 +5,8 @@ , fetchurl , git , cctools -, DarwinTools +, darwin , makeWrapper -, CoreServices , bison , openssl , protobuf @@ -34,8 +33,8 @@ let pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ]; - mysqlShellVersion = "8.4.1"; - mysqlServerVersion = "8.4.1"; + mysqlShellVersion = "8.4.3"; + mysqlServerVersion = "8.4.3"; in stdenv.mkDerivation (finalAttrs: { pname = "mysql-shell"; @@ -44,11 +43,11 @@ stdenv.mkDerivation (finalAttrs: { srcs = [ (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz"; - hash = "sha256-20Hxl9cXDFTX7cDQyaJzDCJfSvBeztD2S+z5u2wRAT4="; + hash = "sha256-eslWTEeAIvcwBf+Ju7QPZ7OB/AbVUYQWvf/sdeYluBg="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-wTwoaoaCrTQqaqgE35Sg8zn8HqjsjQowbtgMZTpkYQU="; + hash = "sha256-rO+cAfQzUobMrTLGHRbaXsG+vMcjVTtDoZwmyok+dS4="; }) ]; @@ -72,8 +71,8 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] - ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ] - ++ lib.optionals stdenv.isDarwin [ cctools DarwinTools ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.DarwinTools ]; buildInputs = [ curl @@ -95,8 +94,8 @@ stdenv.mkDerivation (finalAttrs: { python3 antlr.runtime.cpp ] ++ pythonDeps - ++ lib.optionals stdenv.isLinux [ libtirpc ] - ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ]; preConfigure = '' # Build MySQL diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix index 32fd0746360f..573245955006 100644 --- a/pkgs/development/tools/mysql-shell/innovation.nix +++ b/pkgs/development/tools/mysql-shell/innovation.nix @@ -5,9 +5,8 @@ , fetchurl , git , cctools -, DarwinTools +, darwin , makeWrapper -, CoreServices , bison , openssl , protobuf @@ -34,8 +33,8 @@ let pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ]; - mysqlShellVersion = "9.0.1"; - mysqlServerVersion = "9.0.1"; + mysqlShellVersion = "9.1.0"; + mysqlServerVersion = "9.1.0"; in stdenv.mkDerivation (finalAttrs: { pname = "mysql-shell-innovation"; @@ -44,11 +43,11 @@ stdenv.mkDerivation (finalAttrs: { srcs = [ (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz"; - hash = "sha256-GPpl8epq6nHkGP4FSFUtmijeaOK4vDupU2WZ60WaZgY="; + hash = "sha256-UsNnUjm/2dPIMiT/IAKqbihvq5e/WytcoahcnDR3Zvw="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-F77W+cY1X29p4DIA1JOxJ6jAKT+8Qz4LkHh91MASlE0="; + hash = "sha256-YHlM/heqV8vQnIGxwEESXx+wRVr++TFjSb00tPwBb2s="; }) ]; @@ -72,8 +71,8 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] - ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ] - ++ lib.optionals stdenv.isDarwin [ cctools DarwinTools ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.DarwinTools ]; buildInputs = [ curl @@ -95,8 +94,8 @@ stdenv.mkDerivation (finalAttrs: { python3 antlr.runtime.cpp ] ++ pythonDeps - ++ lib.optionals stdenv.isLinux [ libtirpc ] - ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ]; preConfigure = '' # Build MySQL diff --git a/pkgs/development/tools/nagelfar/default.nix b/pkgs/development/tools/nagelfar/default.nix deleted file mode 100644 index a40861e0988d..000000000000 --- a/pkgs/development/tools/nagelfar/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, fetchzip, tcl, tcllib, tk, }: - -tcl.mkTclDerivation { - pname = "nagelfar"; - version = "1.3.3"; - - src = fetchzip { - url = "https://sourceforge.net/projects/nagelfar/files/Rel_133/nagelfar133.tar.gz"; - sha256 = "sha256-bdH53LSOKMwq53obVQitl7bpaSpwvMce8oJgg/GKrg0="; - }; - - buildInputs = [ - tcl - tcllib - tk - ]; - - installPhase = '' - install -Dm 755 $src/nagelfar.tcl $out/bin/nagelfar - ''; - - meta = with lib; { - homepage = "https://nagelfar.sourceforge.net/"; - description = "Static syntax checker (linter) for Tcl"; - longDescription = '' - Provides static syntax checking, code coverage instrumentation, - and is very extendable through its syntax database and plugins. - ''; - mainProgram = "nagelfar"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = [ maintainers.nat-418 ]; - }; -} diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix deleted file mode 100644 index 6f4e5505299e..000000000000 --- a/pkgs/development/tools/nailgun/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib, stdenv, stdenvNoCC, fetchMavenArtifact, fetchFromGitHub, jre, makeWrapper, symlinkJoin }: - -let - version = "1.0.0"; - nailgun-server = fetchMavenArtifact { - groupId = "com.facebook"; - artifactId = "nailgun-server"; - inherit version; - sha256 = "1mk8pv0g2xg9m0gsb96plbh6mc24xrlyrmnqac5mlbl4637l4q95"; - }; - - commonMeta = { - license = lib.licenses.asl20; - homepage = "https://www.martiansoftware.com/nailgun/"; - platforms = lib.platforms.linux; - maintainers = [ ]; - }; - - server = stdenvNoCC.mkDerivation { - pname = "nailgun-server"; - inherit version; - - nativeBuildInputs = [ makeWrapper ]; - - dontUnpack = true; - installPhase = '' - runHook preInstall - - makeWrapper ${jre}/bin/java $out/bin/ng-server \ - --add-flags '-classpath ${nailgun-server.jar}:$CLASSPATH com.facebook.nailgun.NGServer' - - runHook postInstall - ''; - - meta = commonMeta // { - description = "Server for running Java programs from the command line without incurring the JVM startup overhead"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - }; - }; - - client = stdenv.mkDerivation { - pname = "nailgun-client"; - inherit version; - - src = fetchFromGitHub { - owner = "facebook"; - repo = "nailgun"; - rev = "nailgun-all-v${version}"; - sha256 = "1syyk4ss5vq1zf0ma00svn56lal53ffpikgqgzngzbwyksnfdlh6"; - }; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = commonMeta // { - description = "Client for running Java programs from the command line without incurring the JVM startup overhead"; - }; - }; -in -symlinkJoin rec { - pname = "nailgun"; - inherit client server version; - - name = "${pname}-${version}"; - paths = [ client server ]; - - meta = commonMeta // { - description = "Client, protocol, and server for running Java programs from the command line without incurring the JVM startup overhead"; - }; -} diff --git a/pkgs/development/tools/nap/default.nix b/pkgs/development/tools/nap/default.nix deleted file mode 100644 index 784877af792f..000000000000 --- a/pkgs/development/tools/nap/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "nap"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "maaslalani"; - repo = pname; - rev = "v${version}"; - sha256 = "0b3sz8zp1nwcjl02b3lli5yjc7vfay1ig6fs8bgxwz22imfx076p"; - }; - - vendorHash = "sha256-puCqql77kvdWTcwp8z6LExBt/HbNRNe0f+wtM0kLoWM="; - - excludedPackages = ".nap"; - - meta = { - description = "Code snippets in your terminal 🛌"; - mainProgram = "nap"; - homepage = "https://github.com/maaslalani/nap"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ phdcybersec maaslalani ]; - }; -} diff --git a/pkgs/development/tools/napi-rs-cli/default.nix b/pkgs/development/tools/napi-rs-cli/default.nix deleted file mode 100644 index 86b714dbb0c4..000000000000 --- a/pkgs/development/tools/napi-rs-cli/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, nodejs }: - -stdenv.mkDerivation rec { - pname = "napi-rs-cli"; - version = "2.17.0"; - - src = fetchurl { - url = "https://registry.npmjs.org/@napi-rs/cli/-/cli-${version}.tgz"; - hash = "sha256-DeqH3pEtGZoKEBz5G0RfDO9LWHGMKL2OiWS1uWk4v44="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/bin" "$out/lib/napi-rs-cli" - - cp scripts/index.js "$out/lib/napi-rs-cli" - - makeWrapper ${nodejs}/bin/node "$out/bin/napi" --add-flags "$out/lib/napi-rs-cli/index.js" - - runHook postInstall - ''; - - meta = with lib; { - description = "CLI tools for napi-rs"; - mainProgram = "napi"; - homepage = "https://napi.rs"; - license = licenses.mit; - maintainers = with maintainers; [ winter ]; - inherit (nodejs.meta) platforms; - }; -} diff --git a/pkgs/development/tools/nasmfmt/default.nix b/pkgs/development/tools/nasmfmt/default.nix deleted file mode 100644 index 850f0303e825..000000000000 --- a/pkgs/development/tools/nasmfmt/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule { - pname = "nasmfmt"; - version = "unstable-2022-09-15"; - - src = fetchFromGitHub { - owner = "yamnikov-oleg"; - repo = "nasmfmt"; - rev = "127dbe8e72376c67d7dff89010ccfb49fc7b533e"; - hash = "sha256-1c7ZOdoM0/Us7cnTT3sds2P5pcCedrCfl0GqQBnf9Rk="; - }; - - vendorHash = null; - - preBuild = '' - go mod init github.com/yamnikov-oleg/nasmfmt - ''; - - ldflags = [ "-s" ]; - - meta = with lib; { - description = "Formatter for NASM source files"; - mainProgram = "nasmfmt"; - homepage = "https://github.com/yamnikov-oleg/nasmfmt"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/neil/default.nix b/pkgs/development/tools/neil/default.nix deleted file mode 100644 index 6249685b503b..000000000000 --- a/pkgs/development/tools/neil/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, makeWrapper -, babashka -}: - -stdenv.mkDerivation rec { - pname = "neil"; - version = "0.3.66"; - - src = fetchFromGitHub { - owner = "babashka"; - repo = "neil"; - rev = "v${version}"; - sha256 = "sha256-Gh4bhJh5ZB2ZEp3cx1D/r1qyc5SLdQ7RGGR12UaFW/k="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - dontBuild = true; - - installPhase = '' - install -D neil $out/bin/neil - wrapProgram $out/bin/neil \ - --prefix PATH : "${lib.makeBinPath [ babashka ]}" - ''; - - meta = with lib; { - homepage = "https://github.com/babashka/neil"; - description = "CLI to add common aliases and features to deps.edn-based projects"; - mainProgram = "neil"; - license = licenses.mit; - platforms = babashka.meta.platforms; - maintainers = with maintainers; [ jlesquembre ]; - }; -} diff --git a/pkgs/development/tools/nemiver/default.nix b/pkgs/development/tools/nemiver/default.nix deleted file mode 100644 index c63761f23a0b..000000000000 --- a/pkgs/development/tools/nemiver/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ lib, stdenv -, fetchurl -, fetchpatch -, pkg-config -, gnome -, gtk3 -, libxml2 -, intltool -, itstool -, gdb -, boost -, sqlite -, libgtop -, glibmm -, gtkmm3 -, vte -, gtksourceview -, gsettings-desktop-schemas -, gtksourceviewmm -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "nemiver"; - version = "0.9.6"; - - src = fetchurl { - url = "mirror://gnome/sources/nemiver/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2"; - }; - - nativeBuildInputs = [ - libxml2 - intltool - itstool - pkg-config - wrapGAppsHook3 - ]; - - buildInputs = [ - gtk3 - gdb - boost - sqlite - libgtop - glibmm - gtkmm3 - vte - gtksourceview - gtksourceviewmm - gsettings-desktop-schemas - ]; - - patches = [ - # build fixes - (fetchpatch { - url = "https://gitlab.gnome.org/Archive/nemiver/-/commit/e0e42221ceb77d88be64fac1c09792dc5c9e2f43.patch"; - sha256 = "1g0ixll6yqfj6ysf50p0c7nmh3lgmb6ds15703q7ibnw7dyidvj8"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/Archive/nemiver/-/commit/7005393a8c4d914eac9705e7f47818d0f4de3578.patch"; - sha256 = "1mxb1sdqdj7dm204gja8cdygx8579bjriqqbb7cna9rj0m9c8pjg"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/Archive/nemiver/-/commit/262cf9657f9c2727a816972b348692adcc666008.patch"; - sha256 = "03jv6z54b8nzvplplapk4aj206zl1gvnv6iz0mad19g6yvfbw7a7"; - }) - ]; - - configureFlags = [ - "--enable-gsettings" - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = "nemiver"; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/Archive/nemiver"; - description = "Easy to use standalone C/C++ debugger"; - mainProgram = "nemiver"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.juliendehos ]; - }; -} diff --git a/pkgs/development/tools/nest-cli/default.nix b/pkgs/development/tools/nest-cli/default.nix deleted file mode 100644 index 9c5f8a12df5b..000000000000 --- a/pkgs/development/tools/nest-cli/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ buildNpmPackage -, darwin -, fetchFromGitHub -, lib -, python3 -, stdenv -}: - -buildNpmPackage rec { - pname = "nest-cli"; - version = "10.4.5"; - - src = fetchFromGitHub { - owner = "nestjs"; - repo = pname; - rev = version; - hash = "sha256-F/Oi7ra+UE4YKXHZalH5qFk4coaGfHRpWaxamYunRuw="; - }; - - npmDepsHash = "sha256-6yh8TKfq3fuq4QcnA4uM49/G0Kp1sccRyTcV5s9dVck="; - - env = { - npm_config_build_from_source = true; - }; - - nativeBuildInputs = [ - python3 - ]; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - - meta = with lib; { - description = "CLI tool for Nest applications"; - homepage = "https://nestjs.com"; - license = licenses.mit; - mainProgram = "nest"; - maintainers = [ maintainers.ehllie ]; - }; -} diff --git a/pkgs/development/tools/nodehun/default.nix b/pkgs/development/tools/nodehun/default.nix deleted file mode 100644 index 83ba3fe2e494..000000000000 --- a/pkgs/development/tools/nodehun/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ buildNpmPackage -, cctools -, darwin -, fetchFromGitHub -, lib -, node-gyp -, nodejs -, python3 -, stdenv -}: - -buildNpmPackage { - pname = "nodehun"; - version = "3.0.2"; - - src = fetchFromGitHub { - owner = "Wulf"; - repo = "nodehun"; - rev = "03c9dcf1fcd965031a68553ccaf6487d1fe87f79"; - hash = "sha256-MoY95lSIQK1K4aIlMdPm93YxJuez9HYx2zlUhHvDao0="; - }; - - patches = [ - # fsevents is needed on Darwin, but its dependency "nan" in the upstream package-lock.json - # is too old for the Node 18.x in Nixpkgs. - # This patch is generated by checking out the upstream source and running - # npm update nan --lockfile-version 1 - ./update-nan.patch - ]; - - npmDepsHash = "sha256-mV6rWNf2p2w4H0ESUT0/Ybtx9YEdvO5l2gCvlWFXK+U="; - - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; - nativeBuildInputs = [ node-gyp python3 ] - ++ lib.optionals stdenv.isDarwin [ cctools ]; - - postInstall = '' - # Only keep the necessary parts of build/Release to reduce closure size - cd $out/lib/node_modules/nodehun - mv build build_old - mkdir build - cp -r build_old/Release build/ - rm -rf build_old - rm -rf build/Release/.deps - # Remove a development script to eliminate runtime dependency on node - rm node_modules/node-addon-api/tools/conversion.js - ''; - - doInstallCheck = true; - nativeCheckInputs = [ nodejs ]; - postInstallCheck = '' - # Smoke check: require() works - export NODE_PATH=$out/lib/node_modules - echo 'require("nodehun")' | node - - ''; - - disallowedReferences = [ nodejs ]; - - meta = with lib; { - description = "Hunspell binding for NodeJS that exposes as much of Hunspell as possible and also adds new features"; - homepage = "https://github.com/Wulf/nodehun"; - license = licenses.mit; - maintainers = [ maintainers.thomasjm ]; - }; -} diff --git a/pkgs/development/tools/nodehun/update-nan.patch b/pkgs/development/tools/nodehun/update-nan.patch deleted file mode 100644 index e01f1e15c0e6..000000000000 --- a/pkgs/development/tools/nodehun/update-nan.patch +++ /dev/null @@ -1,150 +0,0 @@ -diff --git a/package-lock.json b/package-lock.json -index 3c577dd..64be338 100644 ---- a/package-lock.json -+++ b/package-lock.json -@@ -932,10 +932,6 @@ - "concat-map": "0.0.1" - } - }, -- "chownr": { -- "version": "1.1.1", -- "bundled": true -- }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, -@@ -987,13 +983,6 @@ - "dev": true, - "optional": true - }, -- "fs-minipass": { -- "version": "1.2.5", -- "bundled": true, -- "requires": { -- "minipass": "^2.2.1" -- } -- }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, -@@ -1100,22 +1089,6 @@ - "dev": true, - "optional": true - }, -- "minipass": { -- "version": "2.3.5", -- "bundled": true, -- "optional": true, -- "requires": { -- "safe-buffer": "^5.1.2", -- "yallist": "^3.0.0" -- } -- }, -- "minizlib": { -- "version": "1.2.1", -- "bundled": true, -- "requires": { -- "minipass": "^2.2.1" -- } -- }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, -@@ -1300,6 +1273,7 @@ - "safe-buffer": { - "version": "5.1.2", - "bundled": true, -+ "dev": true, - "optional": true - }, - "safer-buffer": { -@@ -1332,24 +1306,24 @@ - "dev": true, - "optional": true - }, -- "string-width": { -- "version": "1.0.2", -+ "string_decoder": { -+ "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { -- "code-point-at": "^1.0.0", -- "is-fullwidth-code-point": "^1.0.0", -- "strip-ansi": "^3.0.0" -+ "safe-buffer": "~5.1.0" - } - }, -- "string_decoder": { -- "version": "1.1.1", -+ "string-width": { -+ "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { -- "safe-buffer": "~5.1.0" -+ "code-point-at": "^1.0.0", -+ "is-fullwidth-code-point": "^1.0.0", -+ "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { -@@ -1387,11 +1361,6 @@ - "bundled": true, - "dev": true, - "optional": true -- }, -- "yallist": { -- "version": "3.0.3", -- "bundled": true, -- "optional": true - } - } - }, -@@ -2096,9 +2065,9 @@ - "dev": true - }, - "nan": { -- "version": "2.14.0", -- "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", -- "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", -+ "version": "2.17.0", -+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", -+ "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", - "dev": true, - "optional": true - }, -@@ -2768,6 +2737,15 @@ - } - } - }, -+ "string_decoder": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", -+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", -+ "dev": true, -+ "requires": { -+ "safe-buffer": "~5.1.0" -+ } -+ }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", -@@ -2798,15 +2776,6 @@ - "function-bind": "^1.1.1" - } - }, -- "string_decoder": { -- "version": "1.1.1", -- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", -- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", -- "dev": true, -- "requires": { -- "safe-buffer": "~5.1.0" -- } -- }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", diff --git a/pkgs/development/tools/nodenv/default.nix b/pkgs/development/tools/nodenv/default.nix deleted file mode 100644 index 3eb045c5e9a9..000000000000 --- a/pkgs/development/tools/nodenv/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "nodenv"; - version = "1.5.0"; - - src = fetchFromGitHub { - owner = "nodenv"; - repo = "nodenv"; - rev = "v${version}"; - sha256 = "sha256-PGeZKL7qsffMAZIsCLB244Fuu48GyWw5Rh67ePu6h38="; - }; - - buildPhase = '' - runHook preBuild - - bash src/configure - make -C src - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -r libexec $out/ - cp -r bin $out/ - - runHook postInstall - ''; - - meta = with lib; { - description = "Manage multiple NodeJS versions"; - mainProgram = "nodenv"; - homepage = "https://github.com/nodenv/nodenv/"; - changelog = "https://github.com/nodenv/nodenv/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ alexnortung ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/norminette/default.nix b/pkgs/development/tools/norminette/default.nix deleted file mode 100644 index 90a978e09948..000000000000 --- a/pkgs/development/tools/norminette/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, python3Packages -, fetchFromGitHub -}: - -python3Packages.buildPythonApplication rec { - pname = "norminette"; - version = "3.3.55"; - - src = fetchFromGitHub { - owner = "42School"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-SaXOUpYEbc2QhZ8aKS+JeJ22MSXZ8HZuRmVQ9fWk7tM="; - }; - - nativeCheckInputs = with python3Packages; [ - pytestCheckHook - ]; - - preCheck = '' - export PYTHONPATH=norminette:$PYTHONPATH - ''; - - meta = with lib; { - description = "Open source norminette to apply 42's norme to C files"; - mainProgram = "norminette"; - homepage = "https://github.com/42School/norminette"; - license = licenses.mit; - maintainers = with maintainers; [ wegank ]; - }; -} diff --git a/pkgs/development/tools/npm-check/default.nix b/pkgs/development/tools/npm-check/default.nix deleted file mode 100644 index 131048f10cbe..000000000000 --- a/pkgs/development/tools/npm-check/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ buildNpmPackage -, fetchFromGitHub -, lib -}: - -buildNpmPackage rec { - pname = "npm-check"; - version = "6.0.1"; - - src = fetchFromGitHub { - owner = "dylang"; - repo = "npm-check"; - rev = "v${version}"; - hash = "sha256-F7bMvGqOxJzoaw25VR6D90UNwT8HxZ4PZhhQEvQFDn4="; - }; - - npmDepsHash = "sha256-KRLgLWikcCWMF8/cOxThom6DHE9ar6WO/9HtosJQnLE="; - - npmFlags = [ "--legacy-peer-deps" ]; - - dontNpmBuild = true; - - meta = with lib; { - description = "Check for outdated, incorrect, and unused dependencies"; - mainProgram = "npm-check"; - homepage = "https://github.com/dylang/npm-check"; - changelog = "https://github.com/dylang/npm-check/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ maintainers.thomasjm ]; - }; -} diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix deleted file mode 100644 index 32e69dcf7042..000000000000 --- a/pkgs/development/tools/nsis/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, stdenv -, symlinkJoin -, fetchurl -, fetchzip -, scons -, zlib -, libiconv -}: - -stdenv.mkDerivation rec { - pname = "nsis"; - version = "3.06.1"; - - src = - fetchurl { - url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}-src.tar.bz2"; - sha256 = "1w1z2m982l6j8lw8hy91c3979wbnqglcf4148f9v79vl32znhpcv"; - }; - srcWinDistributable = - fetchzip { - url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}.zip"; - sha256 = "04qm9jqbcybpwcrjlksggffdyafzwxxcaz9xhjw8w5rb95x7lw5q"; - }; - - postUnpack = '' - mkdir -p $out/share/nsis - cp -avr ${srcWinDistributable}/{Contrib,Include,Plugins,Stubs} \ - $out/share/nsis - chmod -R u+w $out/share/nsis - ''; - - nativeBuildInputs = [ scons ]; - buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - - CPPPATH = symlinkJoin { - name = "nsis-includes"; - paths = [ zlib.dev ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - }; - - LIBPATH = symlinkJoin { - name = "nsis-libs"; - paths = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - }; - - sconsFlags = [ - "SKIPSTUBS=all" - "SKIPPLUGINS=all" - "SKIPUTILS=all" - "SKIPMISC=all" - "NSIS_CONFIG_CONST_DATA=no" - ] ++ lib.optional stdenv.isDarwin "APPEND_LINKFLAGS=-liconv"; - - preBuild = '' - sconsFlagsArray+=( - "PATH=$PATH" - "CC=$CC" - "CXX=$CXX" - "APPEND_CPPPATH=$CPPPATH/include" - "APPEND_LIBPATH=$LIBPATH/lib" - ) - ''; - - prefixKey = "PREFIX="; - installTargets = [ "install-compiler" ]; - - meta = with lib; { - description = "Free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge"; - homepage = "https://nsis.sourceforge.io/"; - license = licenses.zlib; - platforms = platforms.unix; - maintainers = with maintainers; [ pombeirp ]; - mainProgram = "makensis"; - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/development/tools/nufmt/default.nix b/pkgs/development/tools/nufmt/default.nix deleted file mode 100644 index 4c9e6ff4af6a..000000000000 --- a/pkgs/development/tools/nufmt/default.nix +++ /dev/null @@ -1,33 +0,0 @@ - -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - darwin, - ... -}: -rustPlatform.buildRustPackage rec { - pname = "nufmt"; - version = "unstable-2023-09-25"; - - src = fetchFromGitHub { - owner = "nushell"; - repo = "nufmt"; - rev = "796ee834c1e31ead4c5479bf2827a4339c5d61d1"; - hash = "sha256-BwKLl8eMCrqVt9PA5SHAXxu3ypP2ePcSuljKL+wSkvw="; - }; - - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - IOKit - ]); - - cargoHash = "sha256-16Z20opeZpoa7h258um+grL3ktPmY4P0M/tqMTr5hYc="; - - meta = with lib; { - description = "Nushell formatter"; - homepage = "https://github.com/nushell/nufmt"; - license = licenses.mit; - maintainers = with maintainers; [iogamaster]; - }; -} diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index ff1fae302d16..408584de712e 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -3,6 +3,7 @@ , atk , autoPatchelfHook , buildEnv +, buildPackages , cairo , cups , dbus @@ -32,7 +33,6 @@ , stdenv , systemd , udev -, wrapGAppsHook3 , xorg }: @@ -107,7 +107,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook - (wrapGAppsHook3.override { inherit makeWrapper; }) + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; buildInputs = [ nwEnv ]; diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index f2c00e16c9e7..1aa192f1daab 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ocaml findlib ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff deleted file mode 100644 index e6fc96038ff8..000000000000 --- a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- old/Makefile.conf 2014-05-19 16:53:09.263564921 +0200 -+++ new/Makefile.conf 2014-05-19 16:53:42.213152994 +0200 -@@ -1,6 +1,6 @@ - - # Where binaries are installed: --BINDIR := `dirname \`which ocamlc\`` -+BINDIR := $(out)/bin - - #### - diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index f4c97b9642ec..b15668269494 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -1,7 +1,6 @@ { lib , substituteAll , fetchurl -, fetchpatch , ocaml , dune_3 , buildDunePackage @@ -13,23 +12,23 @@ , menhir , menhirLib , menhirSdk -}: - -let # Each releases of Merlin support a limited range of versions of OCaml. - merlinVersions = { +, version ? { "4.12.0" = "4.7-412"; "4.12.1" = "4.7-412"; "4.13.0" = "4.7-413"; "4.13.1" = "4.7-413"; - "4.14.0" = "4.16-414"; - "4.14.1" = "4.16-414"; - "4.14.2" = "4.16-414"; + "4.14.0" = "4.17.1-414"; + "4.14.1" = "4.17.1-414"; + "4.14.2" = "4.17.1-414"; "5.0.0" = "4.14-500"; - "5.1.0" = "4.16-501"; - "5.1.1" = "4.16-501"; - "5.2.0" = "5.1-502"; - }; + "5.1.0" = "4.17.1-501"; + "5.1.1" = "4.17.1-501"; + "5.2.0" = "5.2.1-502"; + }."${ocaml.version}" +}: + +let hashes = { "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y="; @@ -37,17 +36,13 @@ let "4.14-500" = "sha256-7CPzJPh1UgzYiX8wPMbU5ZXz1wAJFNQQcp8WuGrR1w4="; "4.16-414" = "sha256-xekZdfPfVoSeGzBvNWwxcJorE519V2NLjSHkcyZvzy0="; "4.16-501" = "sha256-2lvzCbBAZFwpKuRXLMagpwDb0rz8mWrBPI5cODbCHiY="; - "5.1-502" = "sha256-T9gIvCaSnP/MqOoGNEeQFZwQ4+r5yRTPRu956Rf8rhU="; + "4.17.1-414" = "sha256-vz+AbvSGMgU4YdVLc73vlTm6QhivAh2LCsrY435kX8Y="; + "4.17.1-501" = "sha256-N2cHqocfCeljlFbT++S4miHJrXXHdOlMu75n+EKwpQA="; + "5.2.1-502" = "sha256-XALccbLTG2GYUcFKlluRxlCk281Jv1YATu5h4MWNWEw="; }; - version = lib.getAttr ocaml.version merlinVersions; - in -if !lib.hasAttr ocaml.version merlinVersions -then builtins.throw "merlin is not available for OCaml ${ocaml.version}" -else - buildDunePackage { pname = "merlin"; inherit version; @@ -58,23 +53,14 @@ buildDunePackage { }; patches = let - branch = lib.head (lib.tail (lib.splitString "-" version)); - needsVimPatch = lib.versionOlder version "4.17" || - branch == "502" && lib.versionOlder version "5.2"; + old-patch = lib.versionOlder version "4.17"; in [ (substituteAll { - src = ./fix-paths.patch; + src = if old-patch then ./fix-paths.patch else ./fix-paths2.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/fix-paths2.patch b/pkgs/development/tools/ocaml/merlin/fix-paths2.patch new file mode 100644 index 000000000000..5bef154a1702 --- /dev/null +++ b/pkgs/development/tools/ocaml/merlin/fix-paths2.patch @@ -0,0 +1,17 @@ +diff --git a/src/kernel/mconfig_dot.ml b/src/kernel/mconfig_dot.ml +index 0a42a1d3..91997190 100644 +--- a/src/kernel/mconfig_dot.ml ++++ b/src/kernel/mconfig_dot.ml +@@ -146,10 +146,10 @@ end = struct + let prog, args = + match cfg with + | Dot_merlin -> +- let prog = "dot-merlin-reader" in ++ let prog = "@dot-merlin-reader@" in + (prog, [| prog |]) + | Dune -> +- let prog = "dune" in ++ let prog = "@dune@" in + (prog, [| prog; "ocaml-merlin"; "--no-print-directory" |]) + in + let cwd = Sys.getcwd () in diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix deleted file mode 100644 index 4575226afdec..000000000000 --- a/pkgs/development/tools/ocaml/obuild/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, ocamlPackages }: - -stdenv.mkDerivation rec { - pname = "obuild"; - version = "0.1.11"; - - src = fetchFromGitHub { - owner = "ocaml-obuild"; - repo = "obuild"; - rev = "obuild-v${version}"; - hash = "sha256-me9/FVD7S0uPIpFZzcxDfYKVWn9ifq6JryBAGCo681I="; - }; - - strictDeps = true; - - nativeBuildInputs = with ocamlPackages; [ ocaml findlib ]; - - buildPhase = '' - patchShebangs ./bootstrap - ./bootstrap - ''; - - installPhase = '' - mkdir -p $out/bin - cp dist/build/obuild/obuild dist/build/obuild-from-oasis/obuild-from-oasis dist/build/obuild-simple/obuild-simple $out/bin/ - ''; - - meta = { - homepage = "https://github.com/ocaml-obuild/obuild"; - inherit (ocamlPackages.ocaml.meta) platforms; - description = "Simple package build system for OCaml"; - license = lib.licenses.lgpl21; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix deleted file mode 100644 index 538731a15dc8..000000000000 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, fetchFromGitHub, ocamlPackages }: - -let - inherit (ocamlPackages) buildDunePackage lablgtk3-sourceview3 ocp-index; -in - -buildDunePackage rec { - pname = "ocaml-top"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "OCamlPro"; - repo = "ocaml-top"; - rev = version; - hash = "sha256-xmPGGB/zUpfeAxUIhR1PhfoESAJq7sTpqHuf++EH3Lw="; - }; - - buildInputs = [ lablgtk3-sourceview3 ocp-index ]; - - meta = { - homepage = "https://www.typerex.org/ocaml-top.html"; - license = lib.licenses.gpl3; - description = "Simple cross-platform OCaml code editor built for top-level evaluation"; - mainProgram = "ocaml-top"; - maintainers = with lib.maintainers; [ vbgl ]; - }; -} diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix deleted file mode 100644 index bad8dc09a1c1..000000000000 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchFromGitHub, ocamlPackages }: - -ocamlPackages.buildDunePackage rec { - pname = "ocsigen-i18n"; - version = "4.0.0"; - - buildInputs = with ocamlPackages; [ ppxlib ]; - - src = fetchFromGitHub { - owner = "besport"; - repo = "ocsigen-i18n"; - rev = version; - hash = "sha256-NIl1YUTws8Ff4nrqdhU7oS/TN0lxVQgrtyEZtpS1ojM="; - }; - - meta = { - homepage = "https://github.com/besport/ocsigen-i18n"; - description = "I18n made easy for web sites written with eliom"; - license = lib.licenses.lgpl21; - maintainers = [ lib.maintainers.gal_bolle ]; - }; - -} diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix deleted file mode 100644 index 956a4d4a5d01..000000000000 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, ocaml }: - -stdenv.mkDerivation rec { - - pname = "omake"; - version = "0.10.6"; - - src = fetchurl { - url = "http://download.camlcity.org/download/${pname}-${version}.tar.gz"; - hash = "sha256-AuSZEnybyk8HaDZ7mbwDqjFXMXVQ7TDRuRU/aRY8/yE="; - }; - - strictDeps = true; - - nativeBuildInputs = [ ocaml ]; - - meta = { - description = "Build system designed for scalability and portability"; - homepage = "http://projects.camlcity.org/projects/omake.html"; - license = with lib.licenses; [ - mit /* scripts */ - gpl2 /* program */ - ]; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/tools/ocaml/opaline/default.nix b/pkgs/development/tools/ocaml/opaline/default.nix deleted file mode 100644 index e8fbae0f241b..000000000000 --- a/pkgs/development/tools/ocaml/opaline/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, ocamlPackages }: - -stdenv.mkDerivation rec { - version = "0.3.3"; - pname = "opaline"; - - src = fetchFromGitHub { - owner = "jaapb"; - repo = "opaline"; - rev = "v${version}"; - sha256 = "sha256-6htaiFIcRMUYWn0U7zTNfCyDaTgDEvPch2q57qzvND4="; - }; - - nativeBuildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild ]; - buildInputs = with ocamlPackages; [ opam-file-format ]; - - preInstall = "mkdir -p $out/bin"; - - installFlags = [ "PREFIX=$(out)" ]; - - meta = { - description = "OPAm Light INstaller Engine"; - mainProgram = "opaline"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - inherit (ocamlPackages.ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/tools/ocaml/opam-publish/default.nix b/pkgs/development/tools/ocaml/opam-publish/default.nix deleted file mode 100644 index 41a7528e52d4..000000000000 --- a/pkgs/development/tools/ocaml/opam-publish/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, fetchFromGitHub, ocamlPackages }: - -let - inherit (ocamlPackages) - buildDunePackage - cmdliner - github - github-unix - lwt_ssl - opam-core - opam-format - opam-state - ; -in - -buildDunePackage rec { - pname = "opam-publish"; - version = "2.4.0"; - - src = fetchFromGitHub { - owner = "ocaml-opam"; - repo = pname; - rev = version; - hash = "sha256-7TIBLHpLVzI8Ex01wiQqVPllMZuiiUQsbuGtsNmrW3Q="; - }; - - buildInputs = [ - cmdliner - lwt_ssl - opam-core - opam-format - opam-state - github - github-unix - ]; - - meta = with lib; { - homepage = "https://github.com/ocaml-opam/${pname}"; - description = "Tool to ease contributions to opam repositories"; - mainProgram = "opam-publish"; - license = with licenses; [ lgpl21Only ocamlLgplLinkingException ]; - maintainers = with maintainers; [ niols ]; - }; -} diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index ec34ba2f17fc..4e7d0af89ab0 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper unzip ocaml curl ]; buildInputs = [ ncurses getconf ] - ++ lib.optionals stdenv.isLinux [ bubblewrap ] - ++ lib.optionals stdenv.isDarwin [ Foundation ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ bubblewrap ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; patches = [ ./opam-shebangs.patch ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation { 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 \ + --suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.hostPlatform.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 ''; diff --git a/pkgs/development/tools/ocaml/opam2json/default.nix b/pkgs/development/tools/ocaml/opam2json/default.nix deleted file mode 100644 index 844e6f816134..000000000000 --- a/pkgs/development/tools/ocaml/opam2json/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, opam-installer, ocamlPackages }: -stdenv.mkDerivation rec { - pname = "opam2json"; - version = "0.4"; - - src = fetchFromGitHub { - owner = "tweag"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-5pXfbUfpVABtKbii6aaI2EdAZTjHJ2QntEf0QD2O5AM="; - }; - - buildInputs = with ocamlPackages; [ yojson opam-file-format cmdliner ]; - nativeBuildInputs = with ocamlPackages; [ ocaml findlib opam-installer ]; - - preInstall = ''export PREFIX="$out"''; - - meta = with lib; { - platforms = platforms.all; - description = "convert opam file syntax to JSON"; - mainProgram = "opam2json"; - maintainers = [ maintainers.balsoft ]; - license = licenses.gpl3; - homepage = "https://github.com/tweag/opam2json"; - }; -} diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix deleted file mode 100644 index bbe663911ff4..000000000000 --- a/pkgs/development/tools/omniorb/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, python3 -}: - -stdenv.mkDerivation rec { - - pname = "omniorb"; - version = "4.3.2"; - - src = fetchurl { - url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; - hash = "sha256-HHRTMNAZBK/Xoe0KWJa5puU6waS4ZKSFA7k8fuy/H6g="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ python3 ]; - - enableParallelBuilding = true; - hardeningDisable = [ "format" ]; - - # Transform omniidl_be into a PEP420 namespace to allow other projects to define - # their omniidl backends. Especially useful for omniorbpy, the python backend. - postInstall = '' - rm $out/${python3.sitePackages}/omniidl_be/__init__.py - rm $out/${python3.sitePackages}/omniidl_be/__pycache__/__init__.*.pyc - ''; - - # Ensure postInstall didn't break cxx backend - # Same as 'pythonImportsCheck = ["omniidl_be.cxx"];', but outside buildPythonPackage - doInstallCheck = true; - postInstallCheck = '' - export PYTHONPATH=$out/${python3.sitePackages}:$PYTHONPATH - ${lib.getExe python3} -c "import omniidl_be.cxx" - ''; - - meta = with lib; { - description = "Robust high performance CORBA ORB for C++ and Python"; - longDescription = '' - omniORB is a robust high performance CORBA ORB for C++ and Python. - It is freely available under the terms of the GNU Lesser General Public License - (for the libraries),and GNU General Public License (for the tools). - omniORB is largely CORBA 2.6 compliant. - ''; - homepage = "http://omniorb.sourceforge.net/"; - license = with licenses; [ gpl2Plus lgpl21Plus ]; - maintainers = with maintainers; [ smironov ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix deleted file mode 100644 index bd5102e038a2..000000000000 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ buildDotnetModule -, dotnetCorePackages -, fetchFromGitHub -, lib -, stdenv -, runCommand -, expect -}: -let - inherit (dotnetCorePackages) sdk_8_0 runtime_6_0; -in -let finalPackage = buildDotnetModule rec { - pname = "omnisharp-roslyn"; - version = "1.39.12"; - - src = fetchFromGitHub { - owner = "OmniSharp"; - repo = "omnisharp-roslyn"; - rev = "refs/tags/v${version}"; - hash = "sha256-WQIBNqUqvVA0UhSoPdf179X+GYKp4LhPvYeEAet6TnY="; - }; - - projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj"; - nugetDeps = ./deps.nix; - - dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_8_0 ]; - dotnet-runtime = sdk_8_0; - - dotnetInstallFlags = [ "--framework net6.0" ]; - dotnetBuildFlags = [ "--framework net6.0" "--no-self-contained" ]; - dotnetFlags = [ - # These flags are set by the cake build. - "-property:PackageVersion=${version}" - "-property:AssemblyVersion=${version}.0" - "-property:FileVersion=${version}.0" - "-property:InformationalVersion=${version}" - "-property:RuntimeFrameworkVersion=${runtime_6_0.version}" - "-property:RollForward=LatestMajor" - ]; - - postPatch = '' - # Relax the version requirement - rm global.json - - # Patch the project files so we can compile them properly - for project in src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj src/OmniSharp.LanguageServerProtocol/OmniSharp.LanguageServerProtocol.csproj src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj; do - substituteInPlace $project \ - --replace '<RuntimeIdentifiers>win7-x64;win7-x86;win10-arm64</RuntimeIdentifiers>' '<RuntimeIdentifiers>linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>' - done - ''; - - useDotnetFromEnv = true; - executables = [ "OmniSharp" ]; - - passthru.tests = let - with-sdk = sdk: runCommand "with-${if sdk ? version then sdk.version else "no"}-sdk" - { nativeBuildInputs = [ finalPackage sdk expect ]; meta.timeout = 60; } '' - HOME=$TMPDIR - expect <<"EOF" - spawn OmniSharp - expect_before timeout { - send_error "timeout!\n" - exit 1 - } - expect ".NET Core SDK ${if sdk ? version then sdk.version else sdk_8_0.version}" - expect "{\"Event\":\"started\"," - send \x03 - expect eof - catch wait result - exit [lindex $result 3] - EOF - touch $out - ''; - in { - # Make sure we can run OmniSharp with any supported SDK version, as well as without - with-net6-sdk = with-sdk dotnetCorePackages.sdk_6_0; - with-net7-sdk = with-sdk dotnetCorePackages.sdk_7_0; - with-net8-sdk = with-sdk dotnetCorePackages.sdk_8_0; - no-sdk = with-sdk null; - }; - - meta = { - description = "OmniSharp based on roslyn workspaces"; - homepage = "https://github.com/OmniSharp/omnisharp-roslyn"; - sourceProvenance = with lib.sourceTypes; [ - fromSource - binaryNativeCode # dependencies - ]; - 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 deleted file mode 100644 index 65912a50593b..000000000000 --- a/pkgs/development/tools/omnisharp-roslyn/deps.nix +++ /dev/null @@ -1,145 +0,0 @@ -# This file was automatically generated by passthru.fetch-deps. -# Please dont edit it manually, your changes might get overwritten! - -{ fetchNuGet }: [ - (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/omnisharp-roslyn/updater.sh b/pkgs/development/tools/omnisharp-roslyn/updater.sh deleted file mode 100755 index 10868fbd0992..000000000000 --- a/pkgs/development/tools/omnisharp-roslyn/updater.sh +++ /dev/null @@ -1,20 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts -# shellcheck shell=bash - -set -euo pipefail - -cd "$(dirname "${BASH_SOURCE[0]}")" - -new_version="$(curl -s "https://api.github.com/repos/OmniSharp/omnisharp-roslyn/releases?per_page=1" | jq -r '.[0].name')" -old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" - -if [[ "$new_version" == "$old_version" ]]; then - echo "Already up to date!" - exit 0 -fi - -cd ../../../.. -update-source-version omnisharp-roslyn "${new_version//v}" - -$(nix-build -A omnisharp-roslyn.fetch-deps --no-out-link) diff --git a/pkgs/development/tools/opcr-policy/default.nix b/pkgs/development/tools/opcr-policy/default.nix deleted file mode 100644 index 4c947f3e1aab..000000000000 --- a/pkgs/development/tools/opcr-policy/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "opcr-policy"; - version = "0.2.18"; - - src = fetchFromGitHub { - owner = "opcr-io"; - repo = "policy"; - rev = "v${version}"; - sha256 = "sha256-Q/2r8mqz820mEQD7o9qzC1TPMrRH0f6nr1jgRQAEj/Y="; - }; - vendorHash = "sha256-C6Y+R2q1ZRbeFN1qY109fikkzvcUsBfDn4CYCrKrLKI="; - - ldflags = [ "-s" "-w" "-X github.com/opcr-io/policy/pkg/version.ver=${version}" ]; - - subPackages = [ "cmd/policy" ]; - # disable go workspaces - env.GOWORK = "off"; - - doCheck = false; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - - $out/bin/policy --help - $out/bin/policy version | grep "version: ${version}" - - runHook postInstallCheck - ''; - - meta = with lib; { - mainProgram = "policy"; - homepage = "https://www.openpolicyregistry.io/"; - changelog = "https://github.com/opcr-io/policy/releases/tag/v${version}"; - description = "CLI for managing authorization policies"; - longDescription = '' - The policy CLI is a tool for building, versioning and publishing your authorization policies. - It uses OCI standards to manage artifacts, and the Open Policy Agent (OPA) to compile and run. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ naphta jk ]; - }; -} diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix deleted file mode 100644 index 891733635cce..000000000000 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub -, fetchpatch -, installShellFiles - -, enableWasmEval ? false -}: - -assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm on darwin is failing in nixpkgs"; - -buildGoModule rec { - pname = "open-policy-agent"; - version = "0.66.0"; - - src = fetchFromGitHub { - owner = "open-policy-agent"; - repo = "opa"; - rev = "v${version}"; - 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 ]; - - subPackages = [ "." ]; - - ldflags = [ "-s" "-w" "-X github.com/open-policy-agent/opa/version.Version=${version}" ]; - - tags = lib.optional enableWasmEval ( - builtins.trace - ("Warning: enableWasmEval breaks reproducability, " - + "ensure you need wasm evaluation. " - + "`opa build` does not need this feature.") - "opa_wasm"); - - checkFlags = lib.optionals (!enableWasmEval) [ - "-skip=TestRegoTargetWasmAndTargetPluginDisablesIndexingTopdownStages" - ]; - - preCheck = '' - # Feed in all but the e2e tests for testing - # This is because subPackages above limits what is built to just what we - # want but also limits the tests - # Also avoid wasm tests on darwin due to wasmtime-go build issues - getGoDirs() { - go list ./... | grep -v -e e2e ${lib.optionalString stdenv.isDarwin "-e wasm"} - } - '' + lib.optionalString stdenv.isDarwin '' - # remove tests that have "too many open files"/"no space left on device" issues on darwin in hydra - rm server/server_test.go - ''; - - postInstall = '' - installShellCompletion --cmd opa \ - --bash <($out/bin/opa completion bash) \ - --fish <($out/bin/opa completion fish) \ - --zsh <($out/bin/opa completion zsh) - ''; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - - $out/bin/opa --help - $out/bin/opa version | grep "Version: ${version}" - - ${lib.optionalString enableWasmEval '' - # If wasm is enabled verify it works - $out/bin/opa eval -t wasm 'trace("hello from wasm")' - ''} - - runHook postInstallCheck - ''; - - meta = with lib; { - mainProgram = "opa"; - homepage = "https://www.openpolicyagent.org"; - changelog = "https://github.com/open-policy-agent/opa/blob/v${version}/CHANGELOG.md"; - description = "General-purpose policy engine"; - longDescription = '' - The Open Policy Agent (OPA, pronounced "oh-pa") is an open source, general-purpose policy engine that unifies - policy enforcement across the stack. OPA provides a high-level declarative language that let’s you specify policy - as code and simple APIs to offload policy decision-making from your software. You can use OPA to enforce policies - in microservices, Kubernetes, CI/CD pipelines, API gateways, and more. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ lewo jk ]; - }; -} diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix deleted file mode 100644 index 9f21ff46889a..000000000000 --- a/pkgs/development/tools/operator-sdk/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, buildGoModule -, go -, fetchFromGitHub -, makeWrapper -}: - -buildGoModule rec { - pname = "operator-sdk"; - version = "1.37.0"; - - src = fetchFromGitHub { - owner = "operator-framework"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-ANG9KpyEO+fpjelYU+HNTkbg2S0vFNyPzPRFjcLoLOI="; - }; - - vendorHash = "sha256-pr3WTUZetps/Gof8lttN2beomiobVPCgX0j9V77g5sI="; - - nativeBuildInputs = [ - makeWrapper - ]; - - buildInputs = [ - go - ]; - - doCheck = false; - - subPackages = [ - "cmd/helm-operator" - "cmd/operator-sdk" - ]; - - # operator-sdk uses the go compiler at runtime - allowGoReference = true; - - postFixup = '' - wrapProgram $out/bin/operator-sdk --prefix PATH : ${lib.makeBinPath [ go ]} - ''; - - meta = with lib; { - description = "SDK for building Kubernetes applications. Provides high level APIs, useful abstractions, and project scaffolding"; - homepage = "https://github.com/operator-framework/operator-sdk"; - changelog = "https://github.com/operator-framework/operator-sdk/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ arnarg ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/tools/oq/default.nix b/pkgs/development/tools/oq/default.nix deleted file mode 100644 index 0be19c71ffb4..000000000000 --- a/pkgs/development/tools/oq/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, fetchFromGitHub -, fetchpatch -, crystal -, jq -, libxml2 -, makeWrapper -}: - -crystal.buildCrystalPackage rec { - pname = "oq"; - version = "1.3.4"; - - src = fetchFromGitHub { - owner = "Blacksmoke16"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-W0iGE1yVOphooiab689AFT3rhGGdXqEFyYIhrx11RTE="; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/Blacksmoke16/oq/commit/4f9ef2a73770465bfe2348795461fc8a90a7b9b0.diff"; - hash = "sha256-Ljvf2+1vsGv6wJHl27T7DufI9rTUCY/YQZziOWpW8Do="; - }) - ]; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ libxml2 ]; - nativeCheckInputs = [ jq ]; - - format = "shards"; - - postInstall = '' - wrapProgram "$out/bin/oq" \ - --prefix PATH : "${lib.makeBinPath [ jq ]}" - ''; - - meta = with lib; { - description = "Performant, and portable jq wrapper"; - mainProgram = "oq"; - homepage = "https://blacksmoke16.github.io/oq/"; - license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/oras/default.nix b/pkgs/development/tools/oras/default.nix deleted file mode 100644 index add83c4480a1..000000000000 --- a/pkgs/development/tools/oras/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, oras }: - -buildGoModule rec { - pname = "oras"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "oras-project"; - repo = "oras"; - rev = "v${version}"; - hash = "sha256-uqbHyp7eB7uttBlWpWxkCDGHtLkViYPEsIXuMGZ6LuM="; - }; - - vendorHash = "sha256-QGh3utM+9yPRGN/6IrPbXzyXA6yUNKQuOdVWglFeySw="; - - nativeBuildInputs = [ installShellFiles ]; - - excludedPackages = [ "./test/e2e" ]; - - ldflags = [ - "-s" - "-w" - "-X oras.land/oras/internal/version.Version=${version}" - "-X oras.land/oras/internal/version.BuildMetadata=" - "-X oras.land/oras/internal/version.GitTreeState=clean" - ]; - - postInstall = '' - installShellCompletion --cmd oras \ - --bash <($out/bin/oras completion bash) \ - --fish <($out/bin/oras completion fish) \ - --zsh <($out/bin/oras completion zsh) - ''; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - - $out/bin/oras --help - $out/bin/oras version | grep "${version}" - - runHook postInstallCheck - ''; - - passthru.tests.version = testers.testVersion { - package = oras; - command = "oras version"; - }; - - meta = with lib; { - homepage = "https://oras.land/"; - changelog = "https://github.com/oras-project/oras/releases/tag/v${version}"; - description = "ORAS project provides a way to push and pull OCI Artifacts to and from OCI Registries"; - mainProgram = "oras"; - license = licenses.asl20; - maintainers = with maintainers; [ jk developer-guy ]; - }; -} diff --git a/pkgs/development/tools/oshka/default.nix b/pkgs/development/tools/oshka/default.nix deleted file mode 100644 index 0161382491cf..000000000000 --- a/pkgs/development/tools/oshka/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "oshka"; - version = "0.4.1"; - - src = fetchFromGitHub { - owner = "k1LoW"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-fpWhqFK5h/U7DCC/SyhAlMyCMhjZHRLMlwakvlhOd3w="; - }; - - vendorHash = "sha256-ZBI3WDXfJKBEF2rmUN3LvOOPT1185dHmj88qJKsdUiE="; - - ldflags = [ - "-w" - "-s" - "-X github.com/k1LoW/oshka/version.Version=${version}" - ]; - - # Tests requires a running Docker instance - doCheck = false; - - meta = with lib; { - description = "Tool for extracting nested CI/CD supply chains and executing commands"; - mainProgram = "oshka"; - homepage = "https://github.com/k1LoW/oshka"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/development/tools/osslsigncode/default.nix deleted file mode 100644 index 2fe91c46bcd3..000000000000 --- a/pkgs/development/tools/osslsigncode/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, python3 -, curl -, openssl -}: - -stdenv.mkDerivation rec { - pname = "osslsigncode"; - version = "2.9"; - - src = fetchFromGitHub { - owner = "mtrojnar"; - repo = pname; - rev = version; - sha256 = "sha256-ENMFhIVQhPL4FDW9Ne2YGR3sXjvW55NN1bErfr/kDZg="; - }; - - nativeBuildInputs = [ cmake pkg-config python3 ]; - - buildInputs = [ curl openssl ]; - - meta = with lib; { - homepage = "https://github.com/mtrojnar/osslsigncode"; - description = "OpenSSL based Authenticode signing for PE/MSI/Java CAB files"; - mainProgram = "osslsigncode"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ mmahut prusnak ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix deleted file mode 100644 index 2d6fb694318f..000000000000 --- a/pkgs/development/tools/out-of-tree/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildGoModule, fetchgit, qemu, podman, makeWrapper }: - -buildGoModule rec { - pname = "out-of-tree"; - version = "2.1.1"; - - nativeBuildInputs = [ makeWrapper ]; - - src = fetchgit { - rev = "refs/tags/v${version}"; - url = "https://code.dumpstack.io/tools/${pname}.git"; - hash = "sha256-XzO8NU7A5m631PjAm0F/K7qLrD+ZDSdHXaNowGaZAPo="; - }; - - vendorHash = "sha256-p1dqzng3ak9lrnzrEABhE1TP1lM2Ikc8bmvp5L3nUp0="; - - doCheck = false; - - postFixup = '' - wrapProgram $out/bin/out-of-tree \ - --prefix PATH : "${lib.makeBinPath [ qemu podman ]}" - ''; - - meta = with lib; { - description = "kernel {module, exploit} development tool"; - mainProgram = "out-of-tree"; - homepage = "https://out-of-tree.io"; - maintainers = [ maintainers.dump_stack ]; - license = licenses.agpl3Plus; - }; -} diff --git a/pkgs/development/tools/overcommit/Gemfile b/pkgs/development/tools/overcommit/Gemfile deleted file mode 100644 index 39325c7561b3..000000000000 --- a/pkgs/development/tools/overcommit/Gemfile +++ /dev/null @@ -1,2 +0,0 @@ -source 'https://rubygems.org' -gem 'overcommit' diff --git a/pkgs/development/tools/overcommit/Gemfile.lock b/pkgs/development/tools/overcommit/Gemfile.lock deleted file mode 100644 index 1c75368b7d81..000000000000 --- a/pkgs/development/tools/overcommit/Gemfile.lock +++ /dev/null @@ -1,19 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - childprocess (4.1.0) - iniparse (1.5.0) - overcommit (0.60.0) - childprocess (>= 0.6.3, < 5) - iniparse (~> 1.4) - rexml (~> 3.2) - rexml (3.2.6) - -PLATFORMS - ruby - -DEPENDENCIES - overcommit - -BUNDLED WITH - 2.4.17 diff --git a/pkgs/development/tools/overcommit/default.nix b/pkgs/development/tools/overcommit/default.nix deleted file mode 100644 index 663a13af370d..000000000000 --- a/pkgs/development/tools/overcommit/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, bundlerApp, bundlerUpdateScript }: - -bundlerApp { - pname = "overcommit"; - gemdir = ./.; - exes = [ "overcommit" ]; - - passthru = { - updateScript = bundlerUpdateScript "overcommit"; - }; - - meta = with lib; { - description = "Tool to manage and configure Git hooks"; - homepage = "https://github.com/sds/overcommit"; - license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne anthonyroussel ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/overcommit/gemset.nix b/pkgs/development/tools/overcommit/gemset.nix deleted file mode 100644 index 96e84f288e4f..000000000000 --- a/pkgs/development/tools/overcommit/gemset.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - childprocess = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lvcp8bsd35g57f7wz4jigcw2sryzzwrpcgjwwf3chmjrjcww5in"; - type = "gem"; - }; - version = "4.1.0"; - }; - iniparse = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1wb1qy4i2xrrd92dc34pi7q7ibrjpapzk9y465v0n9caiplnb89n"; - type = "gem"; - }; - version = "1.5.0"; - }; - overcommit = { - dependencies = ["childprocess" "iniparse" "rexml"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0slqmsycbqx746liwq0qw0c81xrp4051iff8s574a4fmj941gkia"; - type = "gem"; - }; - version = "0.60.0"; - }; - rexml = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; - type = "gem"; - }; - version = "3.2.6"; - }; -} diff --git a/pkgs/development/tools/oxlint/default.nix b/pkgs/development/tools/oxlint/default.nix deleted file mode 100644 index 4625b97eb000..000000000000 --- a/pkgs/development/tools/oxlint/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, rust-jemalloc-sys -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "oxlint"; - version = "0.5.2"; - - src = fetchFromGitHub { - owner = "web-infra-dev"; - repo = "oxc"; - rev = "oxlint_v${version}"; - hash = "sha256-rjp1k3cnDSr/hKXNru7XQ6n5Wz97j2EULnHwg3HAm3g="; - }; - - cargoHash = "sha256-3IebdIKw3lV+Qy6F7ZgWMchPLzrluGSeWTV9l5to8iM="; - - buildInputs = [ - rust-jemalloc-sys - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - cargoBuildFlags = [ "--bin=oxlint" ]; - cargoTestFlags = cargoBuildFlags; - - meta = with lib; { - description = "Suite of high-performance tools for JavaScript and TypeScript written in Rust"; - homepage = "https://github.com/web-infra-dev/oxc"; - changelog = "https://github.com/web-infra-dev/oxc/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "oxlint"; - }; -} diff --git a/pkgs/development/tools/package-project-cmake/default.nix b/pkgs/development/tools/package-project-cmake/default.nix deleted file mode 100644 index 083bf37f8ad9..000000000000 --- a/pkgs/development/tools/package-project-cmake/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -}: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "package-project-cmake"; - version = "1.12.0"; - - src = fetchFromGitHub { - owner = "TheLartians"; - repo = "PackageProject.cmake"; - rev = "v${finalAttrs.version}"; - hash = "sha256-TMf9nA0V1qTXpzEJ0A6b3mIVN0MIogn5WlZeVY+Q2bg="; - }; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/{,doc/}package-project-cmake - install -Dm644 CMakeLists.txt $out/share/package-project-cmake/ - install -Dm644 README.md $out/share/doc/package-project-cmake/ - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/TheLartians/PackageProject.cmake"; - description = "CMake script for packaging C/C++ projects"; - longDescription = '' - Help other developers use your project. A CMake script for packaging - C/C++ projects for simple project installation while employing - best-practices for maximum compatibility. Creating installable - CMake scripts always requires a large amount of boilerplate code - to get things working. This small script should simplify the CMake - packaging process into a single, easy-to-use command. - ''; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/tools/packcc/default.nix b/pkgs/development/tools/packcc/default.nix deleted file mode 100644 index 0f756388be3b..000000000000 --- a/pkgs/development/tools/packcc/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ - bats, - fetchFromGitHub, - lib, - packcc, - python3, - stdenv, - testers, - uncrustify, -}: - -stdenv.mkDerivation rec { - pname = "packcc"; - version = "2.0.2"; - - src = fetchFromGitHub { - owner = "arithy"; - repo = "packcc"; - rev = "v${version}"; - 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" - } - ''; - - doCheck = true; - - nativeCheckInputs = [ - bats - uncrustify - python3 - ]; - - 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; }; - - meta = with lib; { - description = "Parser generator for C"; - 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, - - Gives your parser great efficiency by packrat parsing, - - Supports direct and indirect left-recursive grammar rules. - ''; - homepage = "https://github.com/arithy/packcc"; - changelog = "https://github.com/arithy/packcc/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ azahi ]; - platforms = platforms.unix; - mainProgram = "packcc"; - }; -} diff --git a/pkgs/development/tools/packet-sd/default.nix b/pkgs/development/tools/packet-sd/default.nix deleted file mode 100644 index 5fcd486119fe..000000000000 --- a/pkgs/development/tools/packet-sd/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, fetchpatch2 -, lib -}: - -buildGoModule rec { - pname = "prometheus-packet-sd"; - version = "0.0.3"; - - src = fetchFromGitHub { - owner = "packethost"; - repo = "prometheus-packet-sd"; - rev = "v${version}"; - hash = "sha256-2k8AsmyhQNNZCzpVt6JdgvI8IFb5pRi4ic6Yn2NqHMM="; - }; - - patches = [ - (fetchpatch2 { - # fix racy permissions on outfile - # https://github.com/packethost/prometheus-packet-sd/issues/15 - url = "https://github.com/packethost/prometheus-packet-sd/commit/bf0ed3a1da4d0f797bd29e4a1857ac65a1d04750.patch"; - hash = "sha256-ZLV9lyqZxpIQ1Cmzy/nY/85b4QWF5Ou0XcdrZXxck2E="; - }) - (fetchpatch2 { - # restrict outfile to not be world/group writable - url = "https://github.com/packethost/prometheus-packet-sd/commit/a0afc2a4c3f49dc234d0d2c4901df25b4110b3ec.patch"; - hash = "sha256-M5133+r77z21/Ulnbz+9sGbbuY5UpU1+22iY464UVAU="; - }) - (fetchpatch2 { - # apply chmod to tmpfile, not the outfile, that does not exist at that point - url = "https://github.com/packethost/prometheus-packet-sd/commit/41977f11b449677497a93456c499916c68e56334.patch"; - hash = "sha256-ffXxbwatKBw7G1fdmsZaT7WX4OmYFMJnueL/kEKc1VE="; - }) - ]; - - vendorHash = null; - - subPackages = [ "." ]; - - meta = with lib; { - description = "Prometheus service discovery for Equinix Metal"; - homepage = "https://github.com/packethost/prometheus-packet-sd"; - license = licenses.asl20; - maintainers = [ ]; - mainProgram = "prometheus-packet-sd"; - }; -} diff --git a/pkgs/development/tools/pactorio/default.nix b/pkgs/development/tools/pactorio/default.nix index e6254bdbbb6f..06b55790ddf6 100644 --- a/pkgs/development/tools/pactorio/default.nix +++ b/pkgs/development/tools/pactorio/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = [ bzip2 ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ bzip2 ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; postInstall = '' installManPage artifacts/pactorio.1 diff --git a/pkgs/development/tools/paging-calculator/default.nix b/pkgs/development/tools/paging-calculator/default.nix deleted file mode 100644 index 43ec8ccd7447..000000000000 --- a/pkgs/development/tools/paging-calculator/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ fetchCrate -, lib -, rustPlatform -}: - -rustPlatform.buildRustPackage rec { - pname = "paging-calculator"; - version = "0.4.0"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-mTHBARrcq8cJxzh80v/fGr5vACAMyy/DhN8zpQTV0jM="; - }; - - cargoHash = "sha256-oQQA+AGsuMKaFhoZRuv3BASCLJwfgbrdK+2noxBLm7k="; - - meta = { - description = "CLI utility that helps calculating page table indices from a virtual address"; - mainProgram = "paging-calculator"; - longDescription = '' - paging-calculator is a CLI utility written in Rust that helps you finding the indices that a - virtual address will have into the page tables on different architectures. - - It takes a (virtual) address in hexadecimal format and shows you which index is used for - which level of the page table. - ''; - homepage = "https://github.com/phip1611/paging-calculator"; - changelog = "https://github.com/phip1611/paging-calculator/blob/v${version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ phip1611 ]; - }; -} diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/development/tools/pandoc/default.nix deleted file mode 100644 index 9d0c511f6479..000000000000 --- a/pkgs/development/tools/pandoc/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, lib, haskellPackages, haskell, removeReferencesTo, installShellFiles }: - -let - # Since pandoc 3.0 the pandoc binary resides in the pandoc-cli package. - static = haskell.lib.compose.justStaticExecutables haskellPackages.pandoc-cli; - -in - (haskell.lib.compose.overrideCabal (drv: { - configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; - buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; - buildTools = (drv.buildTools or []) ++ [ - removeReferencesTo - installShellFiles - ]; - - # Normally, the static linked executable shouldn't refer to any library or the compiler. - # This is not always the case when the dependency has Paths_* module generated by Cabal, - # where bindir, datadir, and libdir contain the path to the library, and thus make the - # executable indirectly refer to GHC. However, most Haskell programs only use Paths_*.version for - # getting the version at runtime, so it's safe to remove the references to them. - # This is true so far for pandoc-types and warp. - # For details see: https://github.com/NixOS/nixpkgs/issues/34376 - postInstall = drv.postInstall or "" + '' - remove-references-to \ - -t ${haskellPackages.pandoc-types} \ - $out/bin/pandoc - remove-references-to \ - -t ${haskellPackages.warp} \ - $out/bin/pandoc - remove-references-to \ - -t ${haskellPackages.pandoc} \ - $out/bin/pandoc - '' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' - mkdir -p $out/share/bash-completion/completions - $out/bin/pandoc --bash-completion > $out/share/bash-completion/completions/pandoc - '' + '' - installManPage man/* - ''; - }) static).overrideAttrs (drv: { - # These libraries are still referenced, because they generate - # a `Paths_*` module for figuring out their version. - # The `Paths_*` module is generated by Cabal, and contains the - # version, but also paths to e.g. the data directories, which - # lead to a transitive runtime dependency on the whole GHC distribution. - # This should ideally be fixed in haskellPackages (or even Cabal), - # but a minimal pandoc is important enough to patch it manually. - disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp haskellPackages.pandoc ]; - }) diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix deleted file mode 100644 index cc434f14dd6d..000000000000 --- a/pkgs/development/tools/parinfer-rust/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub, llvmPackages }: - -rustPlatform.buildRustPackage rec { - pname = "parinfer-rust"; - version = "0.4.3"; - - src = fetchFromGitHub { - owner = "eraserhd"; - repo = "parinfer-rust"; - rev = "v${version}"; - sha256 = "0hj5in5h7pj72m4ag80ing513fh65q8xlsf341qzm3vmxm3y3jgd"; - }; - - cargoHash = "sha256-PW9LIQamQfusaijyJ2R9xe29LhM0GNf9BdxI9vkjVdE="; - - nativeBuildInputs = [ llvmPackages.clang rustPlatform.bindgenHook ]; - - postInstall = '' - mkdir -p $out/share/kak/autoload/plugins - cp rc/parinfer.kak $out/share/kak/autoload/plugins/ - - rtpPath=$out/plugin - mkdir -p $rtpPath - sed "s,let s:libdir = .*,let s:libdir = '${placeholder "out"}/lib'," \ - plugin/parinfer.vim > $rtpPath/parinfer.vim - ''; - - meta = with lib; { - description = "Infer parentheses for Clojure, Lisp, and Scheme"; - mainProgram = "parinfer-rust"; - homepage = "https://github.com/eraserhd/parinfer-rust"; - license = licenses.isc; - maintainers = with maintainers; [ eraserhd ]; - }; -} diff --git a/pkgs/development/tools/parse-cli-bin/default.nix b/pkgs/development/tools/parse-cli-bin/default.nix deleted file mode 100644 index 0ece2bb4afb0..000000000000 --- a/pkgs/development/tools/parse-cli-bin/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "parse-cli-bin"; - version = "3.0.5"; - - src = fetchurl { - url = "https://github.com/ParsePlatform/parse-cli/releases/download/release_${version}/parse_linux"; - sha256 = "1iyfizbbxmr87wjgqiwqds51irgw6l3vm9wn89pc3zpj2zkyvf5h"; - }; - - meta = with lib; { - description = "Parse Command Line Interface"; - mainProgram = "parse"; - homepage = "https://parse.com"; - platforms = platforms.linux; - license = licenses.bsd3; - }; - - dontUnpack = true; - - installPhase = '' - mkdir -p "$out/bin" - cp "$src" "$out/bin/parse" - chmod +x "$out/bin/parse" - ''; -} diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index a47918f4354b..991925cb4e76 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./2.7.7-fixes.patch ]; buildInputs = [ jdk ]; - CXXFLAGS = lib.optionalString stdenv.isDarwin "-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION"; + CXXFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION"; meta = with lib; { description = "Powerful parser generator"; diff --git a/pkgs/development/tools/parsing/antlr/4.nix b/pkgs/development/tools/parsing/antlr/4.nix index 79db5301add9..f575110b87fd 100644 --- a/pkgs/development/tools/parsing/antlr/4.nix +++ b/pkgs/development/tools/parsing/antlr/4.nix @@ -89,7 +89,7 @@ let nativeBuildInputs = [ cmake ninja pkg-config ]; buildInputs = - lib.optional stdenv.isDarwin CoreFoundation ++ + lib.optional stdenv.hostPlatform.isDarwin CoreFoundation ++ extraCppBuildInputs; cmakeDir = "../runtime/Cpp"; @@ -153,7 +153,7 @@ in { version = "4.10.1"; sourceSha256 = "sha256-Z1P81L0aPbimitzrHH/9rxsMCA6Qn3i42jFbUmVqu1E="; jarSha256 = "sha256-QZSdQfINMdW4J3GHc13XVRCN9Ss422yGUQjTOCBA+Rg="; - extraCppBuildInputs = lib.optional stdenv.isLinux libuuid; + extraCppBuildInputs = lib.optional stdenv.hostPlatform.isLinux libuuid; extraCppCmakeFlags = [ "-DANTLR4_INSTALL=ON" "-DANTLR_BUILD_CPP_TESTS=OFF" @@ -165,7 +165,7 @@ in { sourceSha256 = "1af3cfqwk7lq1b5qsh1am0922fyhy7wmlpnrqdnvch3zzza9n1qm"; jarSha256 = "0dnz2x54kigc58bxnynjhmr5iq49f938vj6p50gdir1xdna41kdg"; extraCppBuildInputs = [ utf8cpp ] - ++ lib.optional stdenv.isLinux libuuid; + ++ lib.optional stdenv.hostPlatform.isLinux libuuid; extraCppCmakeFlags = [ "-DCMAKE_CXX_FLAGS='-I${lib.getDev utf8cpp}/include/utf8cpp'" ]; @@ -178,7 +178,7 @@ in { version = "4.8"; sourceSha256 = "1qal3add26qxskm85nk7r758arladn5rcyjinmhlhznmpbbv9j8m"; jarSha256 = "0nms976cnqyr1ndng3haxkmknpdq6xli4cpf4x4al0yr21l9v93k"; - extraCppBuildInputs = lib.optional stdenv.isLinux libuuid; + extraCppBuildInputs = lib.optional stdenv.hostPlatform.isLinux libuuid; extraCppCmakeFlags = [ "-DANTLR4_INSTALL=ON" ]; }).antlr; } diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix deleted file mode 100644 index 43ef3ffa3e19..000000000000 --- a/pkgs/development/tools/parsing/bison/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib, stdenv, fetchurl, m4, perl, help2man }: - -# 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 { - pname = "bison"; - version = "3.8.2"; - - src = fetchurl { - url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-BsnhO99+sk1M62tZIFpPZ8LH5yExGWREMP6C+9FKCrs="; - }; - - # gnulib relies on --host= to detect iconv() features on musl(). - # Otherwise tests fail due to incorrect unicode symbol oconversion. - configurePlatforms = [ "build" "host" ]; - - # there's a /bin/sh shebang in bin/yacc which when no strictDeps is patched with the build stdenv shell - # however when cross-compiling it would still be patched with the build stdenv shell which would be wrong - # cannot add bash to buildInputs due to infinite recursion - strictDeps = stdenv.hostPlatform != stdenv.buildPlatform; - - nativeBuildInputs = [ m4 perl ] ++ lib.optional stdenv.isSunOS help2man; - propagatedBuildInputs = [ m4 ]; - - enableParallelBuilding = true; - - # Normal check and install check largely execute the same test suite - doCheck = false; - doInstallCheck = true; - - meta = { - homepage = "https://www.gnu.org/software/bison/"; - description = "Yacc-compatible parser generator"; - license = lib.licenses.gpl3Plus; - - longDescription = '' - Bison is a general-purpose parser generator that converts an - annotated context-free grammar into an LALR(1) or GLR parser for - that grammar. Once you are proficient with Bison, you can use - it to develop a wide range of language parsers, from those used - in simple desk calculators to complex programming languages. - - Bison is upward compatible with Yacc: all properly-written Yacc - grammars ought to work with Bison with no change. Anyone - familiar with Yacc should be able to use Bison with little - trouble. You need to be fluent in C or C++ programming in order - to use Bison. - ''; - - platforms = lib.platforms.unix; - }; - - passthru = { glrSupport = true; }; -} diff --git a/pkgs/development/tools/parsing/bisonc++/default.nix b/pkgs/development/tools/parsing/bisonc++/default.nix deleted file mode 100644 index 16d8e13cdfda..000000000000 --- a/pkgs/development/tools/parsing/bisonc++/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{lib, stdenv, fetchurl, fetchFromGitLab -, yodl, icmake, flexcpp, bobcat -}: -stdenv.mkDerivation rec { - pname = "bisonc++"; - version = "6.04.00"; - - src = fetchFromGitLab { - domain = "gitlab.com"; - owner = "fbb-git"; - repo = "bisoncpp"; - rev = "6.04.00"; - hash = "sha256:0aa9bij4g08ilsk6cgrbgi03vyhqr9fn6j2164sjin93m63212wl"; - }; - - buildInputs = [ bobcat ]; - - nativeBuildInputs = [ yodl icmake flexcpp ]; - - setSourceRoot = '' - sourceRoot="$(echo */bisonc++)" - ''; - - gpl = fetchurl { - url = "https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt"; - sha256 = "sha256:0hq6i0dm4420825fdm0lnnppbil6z67ls67n5kgjcd912dszjxw1"; - }; - - postPatch = '' - substituteInPlace INSTALL.im --replace /usr $out - patchShebangs . - for file in $(find documentation -type f); do - substituteInPlace "$file" --replace /usr/share/common-licenses/GPL ${gpl} - substituteInPlace "$file" --replace /usr $out - done - ''; - - buildPhase = '' - ./build program - ./build man - ./build manual - ''; - - installPhase = '' - ./build install x - ''; - - meta = with lib; { - description = "Parser generator like bison, but it generates C++ code"; - mainProgram = "bisonc++"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; - homepage = "https://fbb-git.gitlab.io/bisoncpp/"; - }; -} diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index bd62241ec98c..84cb5f35d3c6 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { export ac_cv_func_realloc_0_nonnull=yes ''; - postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' + postConfigure = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' ''; diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix deleted file mode 100644 index 1a56818b4d65..000000000000 --- a/pkgs/development/tools/parsing/flexc++/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, bobcat, icmake, yodl }: - -stdenv.mkDerivation rec { - pname = "flexc++"; - version = "2.05.00"; - - src = fetchFromGitHub { - sha256 = "0s25d9jsfsqvm34rwf48cxwz23aq1zja3cqlzfz3z33p29wwazwz"; - rev = version; - repo = "flexcpp"; - owner = "fbb-git"; - }; - - setSourceRoot = '' - sourceRoot=$(echo */flexc++) - ''; - - buildInputs = [ bobcat ]; - nativeBuildInputs = [ icmake yodl ]; - - postPatch = '' - substituteInPlace INSTALL.im --replace /usr $out - patchShebangs . - ''; - - buildPhase = '' - ./build man - ./build manual - ./build program - ''; - - installPhase = '' - ./build install x - ''; - - meta = with lib; { - description = "C++ tool for generating lexical scanners"; - mainProgram = "flexc++"; - longDescription = '' - Flexc++ was designed after `flex'. Flexc++ offers a cleaner class design - and requires simpler specification files than offered by flex's C++ - option. - ''; - homepage = "https://fbb-git.github.io/flexcpp/"; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix deleted file mode 100644 index d47c62cf9d85..000000000000 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ fetchFromGitLab -, glib -, lib -, pkg-config -, scons -, stdenv -}: - -stdenv.mkDerivation rec { - pname = "hammer"; - version = "nightly_20220416"; - - src = fetchFromGitLab { - domain = "gitlab.special-circumstanc.es"; - owner = "hammer"; - repo = "hammer"; - rev = version; - sha256 = "sha256-xMZhUnycGeHkNZfHQ2d9mETti8HwGHZNskFqh9f0810="; - }; - - nativeBuildInputs = [ pkg-config scons ]; - buildInputs = [ glib ]; - - meta = with lib; { - description = "Bit-oriented parser combinator library"; - longDescription = '' - Hammer is a parsing library. Like many modern parsing libraries, it - provides a parser combinator interface for writing grammars as inline - domain-specific languages, but Hammer also provides a variety of parsing - backends. It's also bit-oriented rather than character-oriented, making it - ideal for parsing binary data such as images, network packets, audio, and - executables. - ''; - homepage = "https://gitlab.special-circumstanc.es/hammer/hammer"; - license = licenses.gpl2; - maintainers = with maintainers; [ azahi ]; - }; -} diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/pkgs/development/tools/parsing/jikespg/default.nix deleted file mode 100644 index 03814d3cfbe7..000000000000 --- a/pkgs/development/tools/parsing/jikespg/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "jikespg"; - version = "1.3"; - - src = fetchurl { - url = "mirror://sourceforge/jikes/${pname}-${version}.tar.gz"; - sha256 = "083ibfxaiw1abxmv1crccx1g6sixkbyhxn2hsrlf6fwii08s6rgw"; - }; - - postPatch = '' - substituteInPlace Makefile --replace-fail "gcc" "${stdenv.cc.targetPrefix}cc ${lib.optionalString stdenv.isDarwin "-std=c89"}" - ''; - - sourceRoot = "jikespg/src"; - - installPhase = '' - install -Dm755 -t $out/bin jikespg - ''; - - meta = with lib; { - homepage = "https://jikes.sourceforge.net/"; - description = "Jikes Parser Generator"; - mainProgram = "jikespg"; - platforms = platforms.all; - license = licenses.ipl10; - maintainers = with maintainers; [ pSub ]; - }; -} diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/development/tools/parsing/jshon/default.nix deleted file mode 100644 index 7e167aa729d2..000000000000 --- a/pkgs/development/tools/parsing/jshon/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, jansson }: - -stdenv.mkDerivation rec { - pname = "jshon"; - version = "20170302"; - - src = fetchFromGitHub { - owner = "keenerd"; - repo = "jshon"; - rev = "d919aeaece37962251dbe6c1ee50f0028a5c90e4"; - sha256 = "1x4zfmsjq0l2y994bxkhx3mn5vzjxxr39iib213zjchi9h6yxvnc"; - }; - - buildInputs = [ jansson ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error=strict-prototypes"; - - patches = [ - (fetchpatch { - # https://github.com/keenerd/jshon/pull/62 - url = "https://github.com/keenerd/jshon/commit/96b4e9dbf578be7b31f29740b608aa7b34df3318.patch"; - sha256 = "0kwbn3xb37iqb5y1n8vhzjiwlbg5jmki3f38pzakc24kzc5ksmaa"; - }) - ]; - - postPatch = - '' - substituteInPlace Makefile --replace "/usr/" "/" - ''; - - preInstall = - '' - export DESTDIR=$out - ''; - - meta = with lib; { - homepage = "http://kmkeen.com/jshon"; - description = "JSON parser designed for maximum convenience within the shell"; - mainProgram = "jshon"; - license = licenses.free; - platforms = platforms.all; - maintainers = with maintainers; [ rushmorem ]; - }; -} diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/development/tools/parsing/lemon/default.nix deleted file mode 100644 index 512d3bccc973..000000000000 --- a/pkgs/development/tools/parsing/lemon/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchurl }: - -let - - srcs = { - lemon = fetchurl { - sha256 = "1c5pk2hz7j9hix5mpc38rwnm8dnlr2jqswf4lan6v78ccbyqzkjx"; - url = "http://www.sqlite.org/src/raw/tool/lemon.c?name=680980c7935bfa1edec20c804c9e5ba4b1dd96f5"; - name = "lemon.c"; - }; - lempar = fetchurl { - sha256 = "1ba13a6yh9j2cs1aw2fh4dxqvgf399gxq1gpp4sh8q0f2w6qiw3i"; - url = "http://www.sqlite.org/src/raw/tool/lempar.c?name=01ca97f87610d1dac6d8cd96ab109ab1130e76dc"; - name = "lempar.c"; - }; - }; - -in stdenv.mkDerivation { - pname = "lemon"; - version = "1.69"; - - dontUnpack = true; - - buildPhase = '' - sh -xc "$CC ${srcs.lemon} -o lemon" - ''; - - installPhase = '' - install -Dvm755 lemon $out/bin/lemon - install -Dvm644 ${srcs.lempar} $out/bin/lempar.c - ''; - - meta = with lib; { - description = "LALR(1) parser generator"; - mainProgram = "lemon"; - longDescription = '' - The Lemon program is an LALR(1) parser generator that takes a - context-free grammar and converts it into a subroutine that will parse a - file using that grammar. Lemon is similar to the much more famous - programs "yacc" and "bison", but is not compatible with either. - ''; - homepage = "http://www.hwaci.com/sw/lemon/"; - license = licenses.publicDomain; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/parsing/nex/default.nix b/pkgs/development/tools/parsing/nex/default.nix deleted file mode 100644 index 6a3415660878..000000000000 --- a/pkgs/development/tools/parsing/nex/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, lib -}: -# upstream is pretty stale, but it still works, so until they merge module -# support we have to use gopath: see blynn/nex#57 -buildGoModule rec { - pname = "nex"; - version = "0-unstable-2021-03-30"; - - src = fetchFromGitHub { - owner = "blynn"; - repo = pname; - rev = "1a3320dab988372f8910ccc838a6a7a45c8980ff"; - hash = "sha256-DtJkV380T2B5j0+u7lYZfbC0ej0udF4GW2lbRmmbjAM="; - }; - - vendorHash = null; - - postPatch = '' - go mod init github.com/blynn/nex - ''; - - subPackages = [ "." ]; - - # Fails with 'nex_test.go:23: got: 7a3661f13445ca7b51de2987bea127d9 wanted: 13f760d2f0dc1743dd7165781f2a318d' - # Checks failed on master before, but buildGoPackage had checks disabled. - doCheck = false; - - meta = with lib; { - description = "Lexer for Go"; - mainProgram = "nex"; - homepage = "https://github.com/blynn/nex"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ urandom ]; - }; -} diff --git a/pkgs/development/tools/parsing/peg/default.nix b/pkgs/development/tools/parsing/peg/default.nix deleted file mode 100644 index 988c3d461f85..000000000000 --- a/pkgs/development/tools/parsing/peg/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "peg"; - version = "0.1.20"; - - src = fetchurl { - url = "${meta.homepage}/${pname}-${version}.tar.gz"; - sha256 = "sha256-uLcXvJOll2ijXWUlZ5pODOlOa/ZvkrrPKXnGR0VytFo="; - }; - - postPatch = '' - substituteInPlace Makefile \ - --replace-fail "strip" '$(STRIP)' - ''; - - preBuild="makeFlagsArray+=( PREFIX=$out )"; - - meta = with lib; { - homepage = "http://piumarta.com/software/peg/"; - description = "Tools for generating recursive-descent parsers: programs that perform pattern matching on text"; - platforms = platforms.all; - license = licenses.mit; - }; -} diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 72e77a55a152..a6090f104fa2 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -50,6 +50,6 @@ in version = "7.0.0.12"; sha256 = "0x3si355lv6q051lgpg8bpclpiq5brpri5lv3p8kk2qhzfbyz69r"; license = lib.licenses.mit; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/tools/parsing/re-flex/default.nix b/pkgs/development/tools/parsing/re-flex/default.nix deleted file mode 100644 index 60bdaa4de103..000000000000 --- a/pkgs/development/tools/parsing/re-flex/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "re-flex"; - version = "4.5.0"; - - src = fetchFromGitHub { - owner = "Genivia"; - repo = "RE-flex"; - rev = "v${version}"; - hash = "sha256-Dc/nnzJtkLgfmYnilA9FtOPtlOwTqgXtNVWhypFu5hs="; - }; - - outputs = [ "out" "bin" "dev" ]; - - nativeBuildInputs = [ - cmake - ]; - - meta = with lib; { - homepage = "https://www.genivia.com/doc/reflex/html"; - description = "Regex-centric, fast lexical analyzer generator for C++ with full Unicode support"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with lib.maintainers; [ prrlvr ]; - mainProgram = "reflex"; - }; -} diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix deleted file mode 100644 index f06a2b5424ef..000000000000 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, nix-update-script -, python3 - -# for passthru.tests -, ninja -, php -, spamassassin -}: - -stdenv.mkDerivation rec { - pname = "re2c"; - version = "3.1"; - - src = fetchFromGitHub { - owner = "skvadrik"; - repo = "re2c"; - rev = version; - sha256 = "sha256-7zZdLby7HdNoURgdkg+xnlp6VDCACcyGCTtjM43OLd4="; - }; - - nativeBuildInputs = [ - autoreconfHook - python3 - ]; - - doCheck = true; - enableParallelBuilding = true; - - preCheck = '' - patchShebangs run_tests.py - ''; - - passthru = { - updateScript = nix-update-script { - # Skip non-release tags like `python-experimental`. - extraArgs = [ "--version-regex" "([0-9.]+)" ]; - }; - tests = { - inherit ninja php spamassassin; - }; - }; - - meta = with lib; { - description = "Tool for writing very fast and very flexible scanners"; - homepage = "https://re2c.org"; - license = licenses.publicDomain; - platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice ]; - }; -} diff --git a/pkgs/development/tools/parsing/spicy/default.nix b/pkgs/development/tools/parsing/spicy/default.nix deleted file mode 100644 index 43b531d09837..000000000000 --- a/pkgs/development/tools/parsing/spicy/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, makeWrapper -, python3 -, bison -, flex -, zlib -}: - -stdenv.mkDerivation rec { - pname = "spicy"; - version = "1.11.1"; - - strictDeps = true; - - src = fetchFromGitHub { - owner = "zeek"; - repo = "spicy"; - rev = "v${version}"; - hash = "sha256-gSfj5d8g2eQGhaT4dGyNPqWy+9GkDxMkMuZ7vKnhFVQ="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - bison - cmake - flex - makeWrapper - python3 - ]; - - buildInputs = [ - flex - zlib - ]; - - postPatch = '' - patchShebangs scripts tests/scripts - ''; - - cmakeFlags = [ - "-DHILTI_DEV_PRECOMPILE_HEADERS=OFF" - ]; - - preFixup = '' - for b in $out/bin/* - do wrapProgram "$b" --prefix PATH : "${lib.makeBinPath [ bison flex ]}" - done - ''; - - meta = with lib; { - homepage = "https://github.com/zeek/spicy"; - description = "C++ parser generator for dissecting protocols & files"; - longDescription = '' - Spicy is a parser generator that makes it easy to create robust C++ - parsers for network protocols, file formats, and more. Spicy is a bit - like a "yacc for protocols", but it's much more than that: It's an - all-in-one system enabling developers to write attributed grammars that - describe both syntax and semantics of an input format using a single, - unified language. Think of Spicy as a domain-specific scripting language - for all your parsing needs. - ''; - license = licenses.bsd3; - maintainers = with maintainers; [ tobim ]; - }; -} diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index ea3386e15d51..87915de31ec4 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -27,13 +27,13 @@ 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.6"; - hash = "sha256-jBCKgDlvXwA7Z4GDBJ+aZc52zC+om30DtsZJuHado1s="; + version = "0.24.3"; + hash = "sha256-2Pg4D1Pf1Ex6ykXouAJvD1NVfg5CH4rCQcSTAJmYwd4="; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; inherit hash; fetchSubmodules = true; }; @@ -111,10 +111,10 @@ rustPlatform.buildRustPackage { pname = "tree-sitter"; inherit src version; - cargoHash = "sha256-44FIO0kPso6NxjLwmggsheILba3r9GEhDld2ddt601g="; + cargoHash = "sha256-0ZoXf0eV3kmHaRoHcWrVEgoWnYNBsY9GiFfy84H+0mc="; buildInputs = - lib.optionals stdenv.isDarwin [ Security CoreServices ]; + lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreServices ]; nativeBuildInputs = [ which ] ++ lib.optionals webUISupport [ emscripten ]; @@ -133,6 +133,8 @@ rustPlatform.buildRustPackage { sed -e 's/playground,//' \ -e 's/playground::serve(&grammar_path.*$/println!("ERROR: web-ui is not available in this nixpkgs build; enable the webUISupport"); std::process::exit(1);/' \ -i cli/src/main.rs + sed -e 's/playground::serve(.*$/println!("ERROR: web-ui is not available in this nixpkgs build; enable the webUISupport"); std::process::exit(1);/' \ + -i cli/src/main.rs ''; # Compile web assembly with emscripten. The --debug flag prevents us from @@ -169,7 +171,7 @@ rustPlatform.buildRustPackage { }; }; - meta = with lib; { + meta = { homepage = "https://github.com/tree-sitter/tree-sitter"; description = "Parser generator tool and an incremental parsing library"; mainProgram = "tree-sitter"; @@ -185,7 +187,7 @@ rustPlatform.buildRustPackage { * Robust enough to provide useful results even in the presence of syntax errors * Dependency-free so that the runtime library (which is written in pure C) can be embedded in any application ''; - license = licenses.mit; - maintainers = with maintainers; [ Profpatsch ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Profpatsch ]; }; } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index c9faf8a788f8..d4a5de263d2a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -82,6 +82,7 @@ tree-sitter-r = lib.importJSON ./tree-sitter-r.json; tree-sitter-regex = lib.importJSON ./tree-sitter-regex.json; tree-sitter-rego = lib.importJSON ./tree-sitter-rego.json; + tree-sitter-river = lib.importJSON ./tree-sitter-river.json; tree-sitter-rst = lib.importJSON ./tree-sitter-rst.json; tree-sitter-ruby = lib.importJSON ./tree-sitter-ruby.json; tree-sitter-rust = lib.importJSON ./tree-sitter-rust.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json index 86ac2bc43009..73451c3654d4 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json @@ -1,10 +1,10 @@ { "url": "https://github.com/polarmutex/tree-sitter-beancount", - "rev": "6c665e7cf15d76a1687959643868a78fb381458d", - "date": "2024-03-09T18:30:23-05:00", - "path": "/nix/store/al4c5f670bl596mlp3vk1njz7w8bhq98-tree-sitter-beancount", - "sha256": "0cwiw69br9y8w5iysdh31i4vlvfgj79zvpkz93y1spyxx6vlylc5", - "hash": "sha256-hVFPt+ndXx38SH/e/dORz226SQwDNu1j4cinvJLhkTM=", + "rev": "321b12d0b02923c36e8cd9768afe6db5ced98e33", + "date": "2024-07-19T21:09:17-04:00", + "path": "/nix/store/v8yv84fm0n134mr5vmwbpr4cpyl71vxz-tree-sitter-beancount", + "sha256": "1milrdb8ka5vkypl0b44xgfdn0haydg2fz7489djcwpjkx7gfrsg", + "hash": "sha256-T2f3Tp/yciZbQuR8J17zCgLb3OuELECvn7uoiVbLNNY=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": 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 e79396e609fb..34f5a128ce56 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": "3a1ace906c151dd631cf6f149b5083f2b60e6a9e", - "date": "2024-05-15T19:51:17+09:00", - "path": "/nix/store/naaja1ijjxpsln6fr62sd4m3sgygb309-tree-sitter-clojure", - "sha256": "1j41ba48sid6blnfzn6s9vsl829qxd86lr6yyrnl95m42x8q5cx4", - "hash": "sha256-pLOCUReklkRt9t5kalDrOAlE9U7a2O8sXaZFjYhagcg=", + "rev": "f4236d4da8aa92bc105d9c118746474c608e6af7", + "date": "2024-05-22T23:05:15+09:00", + "path": "/nix/store/vl1d7aql1bcvn65khrgs13rfk90q08ik-tree-sitter-clojure", + "sha256": "16hnb5d8shz216sv9hj5hxpg63ri86w5pf9bzi5z3f37zh7vlljj", + "hash": "sha256-UlK6D/xnuPFL/Cu5W7hBMQ/zbodFwrS1CeJDjVpZFpo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json index 89afd7990d8b..e3a6f4b9e12a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json @@ -1,10 +1,10 @@ { "url": "https://github.com/uyha/tree-sitter-cmake", - "rev": "20ffd6d3b4da1acdbf2d08204b2130a5b2f7c4b3", - "date": "2024-03-19T09:50:27+02:00", - "path": "/nix/store/2fcf8g6rryigpy6grr284qzgmqw1gkd5-tree-sitter-cmake", - "sha256": "16klinbjr9k5piwqvfvl48wmprk9wlypqnmihryy2wj2m2xzlyqa", - "hash": "sha256-Cnv6u6hCcuF9hrFafD3laeZbOSJ0u415vGWmLJeNdJo=", + "rev": "f2569dd1fce0f252097a25bcbcb9ed8898840310", + "date": "2024-10-07T08:54:29Z", + "path": "/nix/store/8wbih7ylzajm44r4wxpr376r8r1jhbpy-tree-sitter-cmake", + "sha256": "1vy9qrvnmbyah8zb2lg2vwmwilh8byzlyxkwdd2ww5yg651izs1d", + "hash": "sha256-LegfQzHPF85Fa3x2T79fCNLIK9/iUbE+gsqvanfGye8=", "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 c5a2a628c4db..ff2f413a9953 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": "2369fa991eba294e9238e28280ffcd58132f94bc", - "date": "2024-04-30T23:37:25-04:00", - "path": "/nix/store/6zvwyr1034vawcvw8yra4rcjb6m7shlj-tree-sitter-cpp", - "sha256": "1dbb8w4dyzgp7czqnrdfyjbm6zyyxbxqmfzmrj6kd37vcxldxq5d", - "hash": "sha256-reDeaGf7jDaNzPW7ivvq3n9Tl/SuZYs/O/d93whHa7U=", + "rev": "30d2fa385735378388a55917e2910965fce19748", + "date": "2024-09-22T21:23:40-04:00", + "path": "/nix/store/4lkh62dqx3mgs2k7hncp8892y00xakih-tree-sitter-cpp", + "sha256": "0sm8wbnc6allavcc1jrsdd6q59vp53j76kccrv9j4c74dfc1bc9v", + "hash": "sha256-O7EVmGvkMCLTzoxNc+Qod6eCTWs6y8DYVpQqw+ziqGo=", "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 47cf0bc2a32b..a7c098c78b98 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": "f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af", - "date": "2024-05-05T18:14:34-04:00", - "path": "/nix/store/iw66hs4n4wmf9mjaj4zb78diwfkb8y4d-tree-sitter-css", - "sha256": "1mq5yzcj16bv9jphgj0v16fsa9bzf7y204c78mf79ls2rqsanljp", - "hash": "sha256-V1KrNM5C03RcRYcRIPxxfyWlnQkbyAevTHuZINn3Bdc=", + "rev": "a68fcd1e6b03118d1e92ffa45e7ab7a39d52d3f7", + "date": "2024-09-02T04:29:00-04:00", + "path": "/nix/store/46v1b4mfmsgd7sk48n6l613vjcxpl3gg-tree-sitter-css", + "sha256": "1apypprrqn23ghay11w35vz31crpjdby6imjhnxq9cqj9rvhxgx3", + "hash": "sha256-o78Od04Ss4S7hbJG41eTN7Mw/i6Dh+AVfENYnPO9/qo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json index 54bbe3214f4b..4b64224bcb86 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json @@ -1,10 +1,10 @@ { "url": "https://github.com/thehamsta/tree-sitter-cuda", - "rev": "4ec5afdf98041d137c25b555958a1f825c7c1272", - "date": "2024-04-02T22:40:43+02:00", - "path": "/nix/store/2n6dkgdvhfd34qa48b5824qbw1pc7899-tree-sitter-cuda", - "sha256": "1n840xzsx56w3hys263f216ih901jh456yxdmm0i274ijwngn38h", - "hash": "sha256-EA37LJeRHBFBra17UwiUASQYTRBuGKE9HNyUrn8HBNk=", + "rev": "cbce8aedc6fa35313a4cecd206196011a08a85c4", + "date": "2024-08-22T22:57:54+02:00", + "path": "/nix/store/4ygv7b9ap52kb03cv7mihsq86g6vgfpc-tree-sitter-cuda", + "sha256": "12q2zpfll8n72yccxkqjh36cmmpj2fyivkq6fghzbs9kf4mvwy12", + "hash": "sha256-Ini+K3Ez6fXhcwbPHb0T8tbKzIASz86YF8ciSt39Aos=", "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 40f4c4bab4cf..57b620e57e05 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": "ac0bb849ccd1a923963af47573b5e396736ff582", - "date": "2024-04-28T11:52:00-06:00", - "path": "/nix/store/7sfa8zsg3p14rm0dbgv030s86lk8fv3w-tree-sitter-dart", - "sha256": "0vm0yd2km73cyl2dph5qwb1fbgjjambn9mi4k7jxh495wrmk8hn8", - "hash": "sha256-yEI0a+YlEdjlmSTWZFdVUr7lwuK4wNsE9WycOkXzoG4=", + "rev": "9ac03bb2154316624fb4c41fe0f372a5f1597b43", + "date": "2024-09-01T14:20:26-06:00", + "path": "/nix/store/g3q5dd40gjm0iwf19afz3vz5amvr7dsg-tree-sitter-dart", + "sha256": "0nn7in0qr23vjkyk7ynyaw3rlbisx8vsvwf2yqclshdm72qabd7i", + "hash": "sha256-8bSlsDi1QU0Z9sLxrTfqOi6aB1fe+jP9lHuIjIGNx1o=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json index aeb72e594ba2..60fcf5a46ec4 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json @@ -1,10 +1,10 @@ { "url": "https://github.com/joelspadin/tree-sitter-devicetree", - "rev": "05f12c50cdaafcd8969c9c712245f51a0611df23", - "date": "2024-03-15T23:40:59-05:00", - "path": "/nix/store/rlbnn034jn2vb5bg06ynrsc6xyxs9sa0-tree-sitter-devicetree", - "sha256": "1iw1az1xm3nlq61365lrj8prhx8417ha4f82a90hwfpb58dnf30m", - "hash": "sha256-FQxnGyrrOg5BUgI5ouAJBHWYL5KZFjOCwdSO2sNXgcc=", + "rev": "07a647c8fb70e6b06379a60526721e3141aa2fd2", + "date": "2024-09-26T18:03:23-05:00", + "path": "/nix/store/xcv8715lvqg6ncs5z4idzzx4klprl0ca-tree-sitter-devicetree", + "sha256": "13rm15p9mrdklys0d720xy386pnvirxxjswg0wi1m87hs8i49qns", + "hash": "sha256-2uJEItLwoBoiB49r2XuO216Dhu9AnAa0p7Plmm4JNY8=", "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 0241aff6a8e0..2a025287f953 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": "450546b6db9a37a178fd87aeda93a287301e9570", - "date": "2024-05-16T21:54:01+02:00", - "path": "/nix/store/9fsxiz65a2n0kyy7a10q9lqzhhdz1p6x-tree-sitter-earthfile", - "sha256": "0vhj9x7zr102f363l9kpgb58py3n4c3q3fl1c3b2dh5dadks0r6h", - "hash": "sha256-0GSgZ1OtwCbWYIG6gQcjdviLynp3JjrMcAKE/E9PEm4=", + "rev": "1d637f2002bb8b22d4c08d26ad2bfbc22916f3ce", + "date": "2024-09-07T22:41:52+02:00", + "path": "/nix/store/y2sjzjb5naajjzpshv4y1g38cala5sfw-tree-sitter-earthfile", + "sha256": "1kzl8639pm3pxvkh2flmy5azzi7r48a1mirh2iqkvjc55fv30frb", + "hash": "sha256-KzswtiuFyT1xFDDHGhQi+cT/VfGVOgHn7nfUm4ZB9M8=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json index 405fd174824e..9d04a9f924d9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json @@ -1,10 +1,10 @@ { "url": "https://github.com/elixir-lang/tree-sitter-elixir", - "rev": "de690fa8a028f122af46d9d2685679fe5f2d7d60", - "date": "2024-04-08T19:02:42+02:00", - "path": "/nix/store/q46fy2kd4gvab4bpfv3zacg4qgkfc6dz-tree-sitter-elixir", - "sha256": "03fg2qj0i3n1dx8abkngg4nxqwpz86m5nr7q70hp5jw5bxccxxkf", - "hash": "sha256-bvbOWF+Fy3IhOPhkW6pB/3LcLXnPzqVQb8GOCCQWzw0=", + "rev": "ef124b83a3f3572b0af23db4efae3f8de06a15e1", + "date": "2024-09-28T16:06:03+07:00", + "path": "/nix/store/ra2sdascd7h53icvbyh8wv0y2l9pr6pb-tree-sitter-elixir", + "sha256": "08nqlhw5c43b92agh7y2mlw27bjsz6qc3dgqa8vxr5gysgqlmxp5", + "hash": "sha256-5fZK8dP+ldw3Uvi1wbD5Wq4jOK3CH/iUSGsQVjik2CI=", "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 e8722c898174..dcfb7983536d 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": "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=", + "rev": "62b0a6e45900a7dff7c37da95fec20a09968ba52", + "date": "2024-09-02T02:11:42-04:00", + "path": "/nix/store/skq9pzdng2gblx99v9mxw3y90qxzs3q6-tree-sitter-embedded-template", + "sha256": "0sn821pbg3gay9v51i6r3xdwi985chzgn6php2svydy82ab2hiqp", + "hash": "sha256-F0colhLIN7+1uPAa+z5kBaXIWx/ZxFB28uqNt24QyGo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json index d6cc94339f43..6b62fc988b0f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json @@ -1,10 +1,10 @@ { "url": "https://github.com/stadelmanma/tree-sitter-fortran", - "rev": "f73d473e3530862dee7cbb38520f28824e7804f6", - "date": "2023-08-30T10:25:35+01:00", - "path": "/nix/store/mkvh0z39lc89c3bgd91asxjwwiwskyp8-tree-sitter-fortran", - "sha256": "1nvxdrzkzs1hz0fki5g7a2h7did66jghaknfakqn92fa20pagl1b", - "hash": "sha256-K9CnLhDKiWTxVM5OBZ80psV2oFDnlTgd+DDoP39ufds=", + "rev": "4a593dda9cbc050a6686187249f8350ceea292ce", + "date": "2024-09-26T12:07:02-04:00", + "path": "/nix/store/yvw262lh24nbz37mvwlxmxgqij0y74yp-tree-sitter-fortran", + "sha256": "1ss12vmg9ibwgz7wk2fmmghy1xw3rv29bn8fd7lr361j6p587h8y", + "hash": "sha256-HsGDyjUymJHpaQ7ZlcTOg/fg4avVicnPf3zF9OoWQes=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json index 44c6d89e2914..0d0dbc08924e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json @@ -1,10 +1,10 @@ { "url": "https://github.com/gleam-lang/tree-sitter-gleam", - "rev": "2012f294baacf30e7a62414754021284377366c6", - "date": "2024-03-04T16:19:15-05:00", - "path": "/nix/store/2ms5f9sylr9v23pgw428dr8gqap4859m-tree-sitter-gleam", - "sha256": "06xlh4al14h81qr88n60ndy54sfnj0wh20cm3x5pha6llg3dzqsv", - "hash": "sha256-W+PfxqPUKHhLH5UBATmQ1mlSfLPAWIQyDgiSQBWBtBs=", + "rev": "57c9951b290c8084d7c60b0aee7a2b30986ea031", + "date": "2024-09-26T08:29:11-05:00", + "path": "/nix/store/zgyi05wljzz1c264mx4lf62629lfkq4z-tree-sitter-gleam", + "sha256": "1jcamn09jgna2jyhfali3x74dp9bsp8h4ylkq24hhlyfkfsszqw9", + "hash": "sha256-ieOvtZvOUwiJwJN6AtHVK91GTh+RKge9FMo+mYCtisk=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json index e221099a39b8..87da016a651e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json @@ -1,10 +1,10 @@ { "url": "https://github.com/alexlafroscia/tree-sitter-glimmer", - "rev": "3e66b67efeba1a2001859f6e02d16e0bbdbf4a9b", - "date": "2023-10-05T16:33:40-04:00", - "path": "/nix/store/sizww81ylny2pnafn3d901qv15k3rlp2-tree-sitter-glimmer", - "sha256": "0ggxs83jq59z6vk4bvr7scfscmak41lgz038pcwczpm3hwfhasjq", - "hash": "sha256-WGoFHYej3s84u2iA/2ggU1WmHdMn70XmNj8VLAfS/T0=", + "rev": "51970d4bb249d918dbd26289cc4208bee4068004", + "date": "2024-08-20T13:58:19-04:00", + "path": "/nix/store/ff20fkmpcslz5b9883gk7q6nlri8x6qd-tree-sitter-glimmer", + "sha256": "135pf610rb5nppn5k5699z5azxa7zqvx17x6v5nrp7fdwsy0whg2", + "hash": "sha256-4kEOvObNnZtt2aaf0Df+R/Wvyk/JlFnsvbasDIJxt4w=", "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 7faba26b25a2..0d6d9a127406 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": "8c9fb41836dc202bbbcf0e2369f256055786dedb", - "date": "2024-05-11T23:58:08+02:00", - "path": "/nix/store/knbraa6ipp3gm9b2ja01zlk1i27pswp0-tree-sitter-glsl", - "sha256": "1vpdfpznkh7p47wqya3bqqih2wn1nmyqx4jmyv05v88x5f138hv9", - "hash": "sha256-aUM0gisdoV3A9lWSjn21wXIBI8ZrKI/5IffAaf917e4=", + "rev": "66aec57f7119c7e8e40665b723cd7af5594f15ee", + "date": "2024-09-12T12:52:04+02:00", + "path": "/nix/store/xzxngsr3nhs1586c47iwdx9k20yaansc-tree-sitter-glsl", + "sha256": "0gp3bn31xz5rq52amx059r9sllk3749f1ajmbs1fkjb833f2kvqh", + "hash": "sha256-EO8p3BhoyemCXlWq4BI5Y1KqU04F9KpEwbn8HoZd4z4=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json index 075059a0599d..4be7f396a7c8 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json @@ -1,10 +1,10 @@ { "url": "https://github.com/camdencheek/tree-sitter-go-mod", - "rev": "bbe2fe3be4b87e06a613e685250f473d2267f430", - "date": "2024-01-16T04:55:23-07:00", - "path": "/nix/store/xi1fr4l79pnqaa7md7gk4nqvg4ccgyzy-tree-sitter-go-mod", - "sha256": "1clw1wyjxiicdjav5g2b9m9q7vlg5k1iy1fqwmf2yc4fxrfnmyrq", - "hash": "sha256-OPtqXe6OMC9c5dgFH8Msj+6DU01LvLKVbCzGLj0PnLI=", + "rev": "3b01edce2b9ea6766ca19328d1850e456fde3103", + "date": "2024-09-11T15:20:34-06:00", + "path": "/nix/store/waxmvqpiild2qbkqx7kmkc60g08822b3-tree-sitter-go-mod", + "sha256": "1vbg4fn54a7lbwcrvjdx3nrwgw5y925chbbb7sd6kwms1434yyhb", + "hash": "sha256-C3pPBgm68mmaPmstyIpIvvDHsx29yZ0ZX/QoUqwjb+0=", "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 ed82da289c31..597e6e0c027d 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": "a50070d5bb5bd5c1281740a6102ecf1f4b0c4f19", - "date": "2024-05-05T18:23:47+02:00", - "path": "/nix/store/knnf5zfxjwnml5cdbp3x6kjkw7q4nhsd-tree-sitter-haskell", - "sha256": "0hi72f7d4y89i6zkzg9r2j16ykxcb4vh4gwaxg9hcqa95wpv9qw6", - "hash": "sha256-huO0Ly9JYQbT64o/AjdZrE9vghQ5vT+/iQl50o4TJ0I=", + "rev": "558b997049fddcb07fc513528189c57d6129a260", + "date": "2024-09-02T05:58:07-04:00", + "path": "/nix/store/gqvq3azd0g60ghzhbqj5ghqb8q8gsvai-tree-sitter-haskell", + "sha256": "1jjknp2l8afggzxrp032998hw66r831069q4vy3i1hn9s4fw5y86", + "hash": "sha256-BvnCHdHJwhCH3wQnA8JA2RgOUUpigJv7f88pRMW1U8o=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json index 132aca585b14..4d6137d9284d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json @@ -1,10 +1,10 @@ { "url": "https://github.com/ntbbloodbath/tree-sitter-http", - "rev": "b639716df0698940b53de81e6fcefa2b6cd30724", - "date": "2024-03-16T17:35:45-04:00", - "path": "/nix/store/ynn327dwmxxakcbfrpq94b7m6sl5301h-tree-sitter-http", - "sha256": "0l2yzq0j3w20m9vy9z627jgnfylk1d8crldz3n8xmhisaxwl47ia", - "hash": "sha256-Kh5CeVc6wtqRHb/RzFALk3pnnzzC/OR3qkDwIQH+XlA=", + "rev": "b88cd0c7dba0128b8f28fcb25cca13eea0d193b3", + "date": "2024-08-21T01:10:49+09:00", + "path": "/nix/store/l6knlfkxvh3dnmc2asism5qr0xdsfna4-tree-sitter-http", + "sha256": "0k6rkpjjzs3jxgwljya3rjnzz0cpi68bm1xfpar2kf71fydd03m6", + "hash": "sha256-pg7QmnfhuCmyuq6HupCJl4H/rcxDeUn563LoL+Wd2Uw=", "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 a68ad7d89d75..7673c1c21f81 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": "25d0687433ed0ed8e320861c2c625711ce1716f9", - "date": "2024-05-17T12:45:28+09:00", - "path": "/nix/store/ffqfh3ggcszd5lnx4gx5d2wpilsv6qz5-tree-sitter-janet-simple", - "sha256": "0xzqllz8gi2lb44y4hiqxk25p96yl7ysy8r6k1c11sv9gjf65ja4", - "hash": "sha256-RMlinHxp6xBYmCYjr/2h3qRbxOw4QuIJWVTEhz6l+Hc=", + "rev": "12bfab7db8a5f5b1d774ef84b5831acd34936071", + "date": "2024-08-27T15:31:21+09:00", + "path": "/nix/store/v5rcba220xk49qj3ghh9ggdpfqc91snv-tree-sitter-janet-simple", + "sha256": "05df573vih9p8nlqahlijgg66xr6rvzjd0g7n0qhdlzkcwd63p4x", + "hash": "sha256-ndxhGmfz0wYxsOeBJv/OJndj3pORQoWpRTfBuMcprhU=", "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 4e5bb91173ff..7c9b7ffbb69a 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": "e88537c2703546f3f0887dd3f16898e1749cdba5", - "date": "2024-05-10T14:09:58-04:00", - "path": "/nix/store/s29hw61sfkgxs4pixpnsjbfqi1w73f06-tree-sitter-javascript", - "sha256": "0ly10ib6f7lj6l4za7pz8xz7pn4cjp7d5c56bf4n538zlgv136py", - "hash": "sha256-/poR9qMfjWKJW6aw0s6VjNh7fkf/HvUJNZIeZ1YEwVM=", + "rev": "b6f0624c1447bc209830b195999b78a56b10a579", + "date": "2024-09-02T05:16:11-04:00", + "path": "/nix/store/q6l4f361yzqcnsl29qhm1dcir75fk0hq-tree-sitter-javascript", + "sha256": "03lyqswy7h9iw2mhjlsa7an3g76hqi074c06pvdjb57h637zisf5", + "hash": "sha256-xen4zzDwlCXbvgYwckDE0Jw3rDpKUwmr4DHB47nGng4=", "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 d2dce87abbc4..d886cfd7e92c 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": "49fde205b59a1d9792efc21ee0b6d50bbd35ff14", - "date": "2024-05-05T20:47:41-04:00", - "path": "/nix/store/7i5mj175rsgz6gsxji0hbchxw6mvvsjp-tree-sitter-jsdoc", - "sha256": "030r6ksv6v0wnlb8yi22n0blls21cipzvgi4flnjllpm9vrsxxii", - "hash": "sha256-Mfau8071UiotdSS+/W9kQWhKF7BCRI8WtRxss/U0GQw=", + "rev": "bc09606fc786ead131a301e4b7524888f2d5c517", + "date": "2024-09-02T04:15:15-04:00", + "path": "/nix/store/l1jmw9y271rl00y9lhjwscdmidl3mn31-tree-sitter-jsdoc", + "sha256": "080dzr7547vsapxdd7vs4id3m9mfnzqfzjzkssgyb1vpcdmrhl5m", + "hash": "sha256-tVCYa2N3h+Wf1vPL7/C3rqY6WiR6n9b6VXofUk7+DSA=", "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 785c855a2323..9ace481a7922 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": "94f5c527b2965465956c2000ed6134dd24daf2a7", - "date": "2024-05-06T15:10:02-04:00", - "path": "/nix/store/nl87jvkhqfwshind35dvh204bmjkdv1h-tree-sitter-json", - "sha256": "14za39wy4cw0r6r2m5a1i1za9m2wcyrlmh6yi2zl15b86i3dkbyp", - "hash": "sha256-16/ZRjRolUC/iN7ASrNnXNSkfohBlSqyyYAz4nka6pM=", + "rev": "8bfdb43f47ad805bb1ce093203cfcbaa8ed2c571", + "date": "2024-09-02T05:26:12-04:00", + "path": "/nix/store/qcm8dvbv4d4i989b7c8rc11fnbfh9nr6-tree-sitter-json", + "sha256": "0z9nq267cx0c6dpkq3hm24jcxv37l3lhpwabxpmmpmx2f758yjyc", + "hash": "sha256-zEuPynGi11vr7UvxC+mgZ+zOJBEVDjxvMwx0dozANn0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json index 6a6114aeacb2..518f0c115f18 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json @@ -1,10 +1,10 @@ { "url": "https://github.com/sourcegraph/tree-sitter-jsonnet", - "rev": "d34615fa12cc1d1cfc1f1f1a80acc9db80ee4596", - "date": "2023-08-15T11:57:41-04:00", - "path": "/nix/store/4hf1f6klnr5wd4p1va1x5v8ndmcc7z7b-tree-sitter-jsonnet", - "sha256": "0vw4k1hxq6dhy3ahh40h06k67h073ryxl7513cn81lb6sfgf6c4f", - "hash": "sha256-jjDjntNm0YAsG6Ec2n0eB8BjpgEQEAjV8LAZ3GGYhG8=", + "rev": "ddd075f1939aed8147b7aa67f042eda3fce22790", + "date": "2024-08-15T10:26:01+02:00", + "path": "/nix/store/l4ypaa5lbid6qk21kb4b4x6vh6ki97rq-tree-sitter-jsonnet", + "sha256": "1bfdjxp0h95d124bzlhlvc9b5q19cdj716aym41nyl6z5a992c9q", + "hash": "sha256-ODGRkirfUG8DqV6ZcGRjKeCyEtsU0r+ICK0kCG6Xza0=", "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 aa993c30c3a5..0c49037052cb 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": "acd5ca12cc278df7960629c2429a096c7ac4bbea", - "date": "2024-04-17T13:39:34-05:00", - "path": "/nix/store/3cjbxyngm4mbki1mydjv5q34w16kfhgp-tree-sitter-julia", - "sha256": "12dwy7ljhddg804jwkkzh6mn0mbjazihhsbcwn3gd5175qqr9lym", - "hash": "sha256-1dOUMS4nlPaG5WxpCONXclVgq4F/Ti4JQK81KOnxvIk=", + "rev": "3520b57e418f734f582215181ecd926a6178c90f", + "date": "2024-09-05T13:11:36-05:00", + "path": "/nix/store/4zljgvbaih9ds4kcb52qk5r1si4dpy8m-tree-sitter-julia", + "sha256": "0lp3js2dmmfv9bsgsjrxj4j1yaj47hmzrkhv07s9yc8cwq749yr0", + "hash": "sha256-IPtEDuYMMZ/0ARvO/Cs8RCofJJE9S/30StvV2oSW41I=", "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 2d3d16425630..86172703b343 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": "fd814fc6c579f68c2a642f5e0268cf69daae92d7", - "date": "2024-05-02T02:56:00-04:00", - "path": "/nix/store/4q0rpglj1sa6lay5i1fdnws2pyl8hh71-tree-sitter-just", - "sha256": "09faimq5mhldc91r89707fsmdfjqg6dicc2ccr6q9qn5sy0drr6a", - "hash": "sha256-yuTcgNfF4oRNZkwwFpt5WLpWtTvgJJRDYo3CWnCNyiU=", + "rev": "390cec48bf04b5bb4e87e8ebc35a06ca3f7051cf", + "date": "2024-10-12T11:54:49-05:00", + "path": "/nix/store/wbplh7k0xa63pzld09nk6vdljlpc96fg-tree-sitter-just", + "sha256": "0r5xjx0v0fsghmin689ib39y682kk87374n2r8vq5xqdkv7m8gix", + "hash": "sha256-PT5Uz54N94I3ysKSMw6aUyDj01gxIWNjhU87sEGXvWQ=", "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 7cf5bab4e707..44b506fed455 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": "d5dc99a9bdc3fe895e6bcd39caddcfa4820f4c03", - "date": "2024-05-08T00:38:43+02:00", - "path": "/nix/store/gj5w748yk7iyx9s7bzyqj6m9i9sx6rrv-tree-sitter-kotlin", - "sha256": "0lqwjg778xy561hhf90c9m8zdjmv58z5kxgy0cjgys4xqsfbfri6", - "hash": "sha256-Jma3nMadaP8kA/71WT4qu8r2UU0MJAdhMMV3dM6THFM=", + "rev": "e1a2d5ad1f61f5740677183cd4125bb071cd2f30", + "date": "2024-08-03T01:29:18+02:00", + "path": "/nix/store/jppx5kglmzyh10qmy13d5948hl68lxvc-tree-sitter-kotlin", + "sha256": "0bv21rcypi9dx87kgfr89mg8qfc7ik1g1fcb8am7ss17by8badwk", + "hash": "sha256-kze1kF8naH2qQou58MKMhzmMXk0ouzcP6i3F61kOYi8=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json index 4fbad29a92d4..e63f2032140e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json @@ -1,10 +1,10 @@ { "url": "https://github.com/benwilliamgraham/tree-sitter-llvm", - "rev": "1b96e58faf558ce057d4dc664b904528aee743cb", - "date": "2023-09-08T15:05:51-04:00", - "path": "/nix/store/hifa2i7b634kl47ldahvryj4n5fm3gwk-tree-sitter-llvm", - "sha256": "1sl3i37vzwbyn5ac12lrccmny0dg814my848cb25xdp8n47s5q7l", - "hash": "sha256-9OCiD7Hotl7EYoggX0lArwFvK2OZisBUsX7xv8+Ig+o=", + "rev": "c14cb839003348692158b845db9edda201374548", + "date": "2024-10-07T15:28:34-07:00", + "path": "/nix/store/aravnn08ip3zggkbww6ap73xb5zvrf6g-tree-sitter-llvm", + "sha256": "1fh5nq7war87zrphlv5v2g55gmsbhyv3385va7k1y8gh3czg0x9g", + "hash": "sha256-L3XwPhvwIR/mUbugMbaHS9dXyhO7bApv/gdlxQ+2Bbo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json index d0bbf38f3b88..b01889fcedbb 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json @@ -1,10 +1,10 @@ { "url": "https://github.com/MunifTanjim/tree-sitter-lua", - "rev": "a24dab177e58c9c6832f96b9a73102a0cfbced4a", - "date": "2024-03-11T11:40:44+02:00", - "path": "/nix/store/dia2ry7m40yxfn4l4191c0by58vb2yn8-tree-sitter-lua", - "sha256": "1184dazb4agqf3v55sz8i7xmynsn4rkddhbph3mgmh5qsnk88mmq", - "hash": "sha256-uFaEptW4wPrqgHfB1mYmVltf+4no61L2cPgpsr5qBIU=", + "rev": "99fc677e6971c425e8d407f59c77ab897e585c92", + "date": "2024-09-09T11:10:03-04:00", + "path": "/nix/store/iiih0sfdls1h8q7ca12y0rhc7g5jl76w-tree-sitter-lua", + "sha256": "0wrbxmb6j8xyckf5jw14jf97cb9fn7yhalap6xxgsag84ypfsqj3", + "hash": "sha256-Q2LtrifoKf16N1dRBf2xLi12kpMkcFncZL4jaVbtK3M=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json index 04d1eeeb505e..8d116744dffa 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json @@ -1,7 +1,7 @@ { "url": "https://github.com/alemuller/tree-sitter-make", "rev": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd", - "date": "2021-12-16T17:14:17+00:00", + "date": "2021-12-16T17:14:17Z", "path": "/nix/store/v01s3lfi1w3bm433gf6zi0wb0r603906-tree-sitter-make", "sha256": "07gz4x12xhigar2plr3jgazb2z4f9xp68nscmvy9a7wafak9l2m9", "hash": "sha256-qQqapnKKH5X8rkxbZG5PjnyxvnpyZHpFVi/CLkIn/x0=", diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json index 6f9a1b44406d..250b848c1bdf 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json @@ -1,10 +1,10 @@ { "url": "https://github.com/MDeiml/tree-sitter-markdown", - "rev": "62516e8c78380e3b51d5b55727995d2c511436d8", - "date": "2024-03-22T11:52:05+02:00", - "path": "/nix/store/4hi3bz1ny9dz3yq7mr6d74gsfmcnh9rw-tree-sitter-markdown", - "sha256": "08wl8y8xgrr10m1p6xpmv0jbmnif30wgd2q5m28ghh1v37q2ixfp", - "hash": "sha256-1/Uo8Bk7QPiQqAWL9jgYLtq6JNj1dnNDBSHn15FHlCM=", + "rev": "1c8dea73bc0c996d92dd9ebc30dd388716b1c5db", + "date": "2024-09-11T16:28:36+03:00", + "path": "/nix/store/g4696miy9vzcw0qwd00rar36qn08jn2l-tree-sitter-markdown", + "sha256": "13xfyclim1yql6swbk4y12sxgvn799ldbzjl35n5rrkz7wgnwm9s", + "hash": "sha256-OlVuHz9/5lxsGVT+1WhKx+7XtQiezMW1odiHGinzro8=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json index 90dff573ed1e..614ac8c59836 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json @@ -1,10 +1,10 @@ { "url": "https://github.com/nickel-lang/tree-sitter-nickel", - "rev": "58baf89db8fdae54a84bcf22c80ff10ee3f929ed", - "date": "2024-03-07T15:18:26+00:00", - "path": "/nix/store/z386k8b1asbadh303dpzkhydv8r4f6fz-tree-sitter-nickel", - "sha256": "1a62cngravp7pq3gs582larbd0my7k323s48rgidhpd7b5gkmrjs", - "hash": "sha256-WuY6X1mnXdjiy4joIcY8voK2sqICFf0GvudulZ9lwqg=", + "rev": "ddaa2bc22355effd97c0d6b09ff5962705c6368d", + "date": "2024-10-01T17:50:53+02:00", + "path": "/nix/store/gwlzg1pxrb75s7bqza2g94d9ad30j20f-tree-sitter-nickel", + "sha256": "1dzjrn4lrdr0ncx9s5lkzb066dhpscs3jn63jabmgyv3wbh3kgcc", + "hash": "sha256-jL054OJj+1eXksNYOTTTFzZjwPqTFp06syC3TInN8rc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json index 91c713dae026..df4b224a6314 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json @@ -1,10 +1,10 @@ { "url": "https://github.com/cstrahan/tree-sitter-nix", - "rev": "b3cda619248e7dd0f216088bd152f59ce0bbe488", - "date": "2024-04-03T09:38:13+02:00", - "path": "/nix/store/5rz41r1yycp0w3s947cjs3m9d9v1082r-tree-sitter-nix", - "sha256": "1xh75z11d1b514qm997br8vmxalir2ah1pk7v3k1ppm28043ggr1", - "hash": "sha256-Ib83CECi3hvm2GfeAJXIkapeN8rrpFQxCWWFFsIvB/Y=", + "rev": "456b14a2fa6315abc7e02fcffaf4a1f35d4955d3", + "date": "2024-10-12T02:22:35Z", + "path": "/nix/store/as4bh1khg5ymrdvzb9sb3d3d3nh4z2v7-tree-sitter-nix", + "sha256": "05jq1ssazilajk5s0i3zfy1jhx0qvpwjwf7cjp8z87n5qpirx3vr", + "hash": "sha256-eY+e48XFHvTRlew4LvndGHQog3d/RKDLlIrGr7QOWBY=", "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 5253f32efcb1..74af23993264 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": "aa1a1a7ded81a094cc3d5cb14bea6f34b86d8688", - "date": "2024-04-19T19:37:12+02:00", - "path": "/nix/store/pas31z7l3x16113qa7k7ywb6hbarnwvs-tree-sitter-norg", - "sha256": "08bsk3v61r0xhracanjv25jccqv80ahipx0mv5a1slzhcyymv8kd", - "hash": "sha256-baJdvWfwUx1U2RX0G6ECaGPGZBFbWsVUhh3kYPaYeiE=", + "rev": "d89d95af13d409f30a6c7676387bde311ec4a2c8", + "date": "2024-09-04T16:57:27+02:00", + "path": "/nix/store/5kp8p7s80rvimcqs3i8syjwsc4459nmf-tree-sitter-norg", + "sha256": "077rds0rq10wjywpj4hmmq9dd6qp6sfwbdjyh587laldrfl7jy6g", + "hash": "sha256-z3h5qMuNKnpQgV62xZ02F5vWEq4VEnm5lxwEnIFu+Rw=", "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 5f43ea1f7ab9..5b4701aa3986 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": "a58513279e98dc3ff9ed149e3b4310cbb7e11068", - "date": "2024-04-20T10:10:30-04:00", - "path": "/nix/store/h4jw0skhik308krrqi7rmhw7ls4vp1rs-tree-sitter-nu", - "sha256": "00vpw8aai4k7bw57pyjwn6b09lb9rr1n88qc4r4nma86rl63y9ic", - "hash": "sha256-LCY/DM0GqWpJJgwjZEPOadEElrFc+nsKX2eSqBTidwM=", + "rev": "e3b4c967937cad628dca09bd098cd780d8288750", + "date": "2024-09-26T09:06:33-05:00", + "path": "/nix/store/b0dxxkkj4zqclhm2l6s8n8sqndzzsw49-tree-sitter-nu", + "sha256": "1652pyb888lbi4g7g6jh9bkqasm2zjch8d4ir2m90f6pl12c2nqf", + "hash": "sha256-DlvBRKDXOJCqyJE0BJn8omqF50pQmnceiYsihJa/opg=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json index d769f351e21d..c983defb998c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ocaml", - "rev": "f7e63111ed1bc1908eacafe6af1ee8d01bfcf7ae", - "date": "2024-03-23T14:49:30+01:00", - "path": "/nix/store/p4awlsbz7b3xlbr9l785l7vi1rnxgxlr-tree-sitter-ocaml", - "sha256": "04vscg6lkhdnzs15r1yqwwmc2lj73x4h3nf4mfpkwq6g870i04wj", - "hash": "sha256-khMQwUHPYD6vq8TZAUkfR1LBKufYh1yC/rbBSc1jehM=", + "rev": "5f7a97e9757d8afe6c0b0b5dd8734cf59f35456e", + "date": "2024-09-27T01:35:53+02:00", + "path": "/nix/store/aaq21ki5ds4l85ymww8yb04g6jwrmclm-tree-sitter-ocaml", + "sha256": "144b8wdlxyzwmbi7x8flxvs8v8b2p92xy70fvrsp417dj8k8s5cc", + "hash": "sha256-jBWNJpLtBHJ13g4c30W6YqGN9O7UoX7iqvz7ThtHi5A=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json index 385e00ceb552..14f22e9e243d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json @@ -1,10 +1,10 @@ { "url": "https://github.com/ganezdragon/tree-sitter-perl", - "rev": "93bd92a6af01113140f1a0b4c1845d22adae7ab6", - "date": "2024-03-29T09:45:26+05:30", - "path": "/nix/store/v4fhidwmxfihmkkq32a2xj75zs9fs9cd-tree-sitter-perl", - "sha256": "1ldbqjiyc4apls5gfc96lw6l4y53k5adk8knf1pp3ar2x2dl8v6y", - "hash": "sha256-3mxEm+giq3FvcHai2VSZo3hCDacmMfeKplcR5qPEq9E=", + "rev": "8b554de277956a96f3e618b727d0ed4d4e564676", + "date": "2024-05-26T14:22:34Z", + "path": "/nix/store/fr9iacwd8dx2pb138d1q17wk9s64xvw3-tree-sitter-perl", + "sha256": "1ib0vx5dqp54ycisqg2gw72dj2ygin0z4846m2jnckavs7awn6fm", + "hash": "sha256-1RnL1dFbTWalqIYg8oGNzwvZxOFPPKwj86Rc3ErfYMU=", "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 433932e93683..a63896e4c319 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": "c5b2f2346e4148702b1343ec9bcc42b4a9aa88dc", - "date": "2024-04-27T16:35:50-04:00", - "path": "/nix/store/klrbfqwbmrwpgrghr2jijy0yy4yra3c3-tree-sitter-pgn", - "sha256": "1p6vn84f06c38kanv6j7w5pdwxny0gc7vk357s8ykiz0wv6r8ay9", - "hash": "sha256-ySuUzebgx+mRPmXMfdgD3nbebuFHmm3VRIMZ4Aiy29w=", + "rev": "f86a119d21d01f6bf0dcd3247a366554e98dbbe5", + "date": "2024-09-14T21:47:45Z", + "path": "/nix/store/09rxvhnmdq63n4ghk00ngbdgnmqqs1k4-tree-sitter-pgn", + "sha256": "1ahl979ika0pyq4glz6am71hq6y360hcmwhxikn2l2gl8415701k", + "hash": "sha256-M4BTAkH0CSrsjB3yyiAwwxsMw6nKfPoI9heoGdNJFKo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index 2d45886a8df4..149336a19090 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "78a78df5e06b4c13173af2a1f607c9a853d0f240", - "date": "2024-02-25T14:41:06-06:00", - "path": "/nix/store/h63hh37wn6khk4gj4v1yv37w7kxgr595-tree-sitter-php", - "sha256": "07022kisc2r5pfcbv0smh5gnn9v0i7jazfbvckczz15d0wwrpfip", - "hash": "sha256-N7qbOQethP/ZZHu5r+SJYCdrX4FVg72YuyULpuMUAhw=", + "rev": "a342f7c0ad1db48afc6d2420cdd87b55b51a0644", + "date": "2024-10-01T08:28:55-05:00", + "path": "/nix/store/nhhbb50wrzyqmqar66gynmc44qgrk2ws-tree-sitter-php", + "sha256": "0gblhb2cvl740pjccjqxkvdd9shq7f1grzz7qqv7knjvmzhdw858", + "hash": "sha256-qCDe4K9b2nk2xuf//II7GOrU2p4dS8bkBeTQzcSCdD0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json index 52fedbf7a4cc..a53b5c2e17c2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json @@ -1,10 +1,10 @@ { "url": "https://github.com/leo60228/tree-sitter-pioasm", - "rev": "924aadaf5dea2a6074d72027b064f939acf32e20", - "date": "2021-08-27T17:22:56-04:00", - "path": "/nix/store/nhxzw33vljxh5i90d0fb5nzdfjp5h9bl-tree-sitter-pioasm", - "sha256": "1lxvgc0zkd2sv8dxp2fy6b1k3gqrbkxgqy25lw9sbd4kij7463m2", - "hash": "sha256-og5DjoyTtKUTp0V4/PpcGb8xwzLeidsb2lq0+QF7u9M=", + "rev": "afece58efdb30440bddd151ef1347fa8d6f744a9", + "date": "2024-10-11T21:14:24-04:00", + "path": "/nix/store/zhxnnjc6a8bc7dwvb7i20dxbjrv9fnj3-tree-sitter-pioasm", + "sha256": "0gz5632nlhi085sn5yh968qpyk17shifkhz9mai92g73byaahjxd", + "hash": "sha256-rUuolF/jPJGiqunD6SLUJ0x/MTIJ+mJ1QSBCasUw5T8=", "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 688de10aa445..299aa72dadf5 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": "71778c2a472ed00a64abf4219544edbf8e4b86d7", - "date": "2024-04-30T21:50:21-04:00", - "path": "/nix/store/xqc20db4g26sqsj0jflj4z2jm8hfmd97-tree-sitter-python", - "sha256": "1dmg11dbrddf55xhly813cb6ykxmyam2kjs7lyfi8k8xms03jx44", - "hash": "sha256-hHQ5gK4dTRSdp0fLKarytU9vFhsBeQp7Ka61vFoIr7Y=", + "rev": "8c65e256f971812276ff2a69a2f515c218ed7f82", + "date": "2024-09-02T20:40:41-04:00", + "path": "/nix/store/8mw7g7r8j8n8d8wssjz43nsmkhnlqd0b-tree-sitter-python", + "sha256": "0d51zk7znaxvwcacp5gzm2rwprk8m10wnxhk5g4q7sygbcvl2rzj", + "hash": "sha256-8mdBN1vP64PJKxN2y0GoaObLs6j/lcsU47sr+8/8oTQ=", "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 c213aaa449b5..81b8070b53d0 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": "afd8764736bb7ae52b6628618e8b3e7e28224ab7", - "date": "2024-05-07T13:58:04+02:00", - "path": "/nix/store/696rbv0z6i563jjqbwgdavy6kvpkja94-tree-sitter-ql-dbscheme", - "sha256": "1mb87h2gzv3cwswklnnk2s8xmj060j4aj3ccgic7va23n1mm6rbs", - "hash": "sha256-emVTa7BDqH1YfIwNqYgEBsjakRbTWjq55mzs/wQ8aNU=", + "rev": "1980b4b6998a1138d326f863e6168f0f2c0c544d", + "date": "2024-09-02T15:26:46-04:00", + "path": "/nix/store/s3klligl52ag14ai8n1fcwhn7k4m1wdk-tree-sitter-ql-dbscheme", + "sha256": "1k3qz85507xysx2msr1ns44ya3x3xxb9kxfzvpp088w6nrc6cipm", + "hash": "sha256-9UZmWLaGIwTu3d/1mVbvow/lCdE2ZF1F174fUAr6eMw=", "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 6cf9f8045e67..901d037b9feb 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": "42becd6f8f7bae82c818fa3abb1b6ff34b552310", - "date": "2024-05-07T14:00:59+02:00", - "path": "/nix/store/dknbdl1hrgp0kicx2wx1wjnhb7bay643-tree-sitter-ql", - "sha256": "1gcgs87cas4qd5ppvzjfgzj2ayjnjfxbyg3gl204w8mrvciq2niq", - "hash": "sha256-OFqBI9u5Ik6AoG88v7qTVnol5H9O/n1vaZhoxQ7Sj70=", + "rev": "c73c31c89cb0019ef56fe8bc1723e7c36e0be607", + "date": "2024-09-02T14:59:29-04:00", + "path": "/nix/store/diaw28vzzry46dc5b0fra2xw263lmbhs-tree-sitter-ql", + "sha256": "1lnasix7vb9q7lixy5qayslzw9yk53gll8130d03h0a9vl44dw8b", + "hash": "sha256-C/FGCN1JAThAAyMgSt8o0yf+qfYKF98jPTitfXrUytI=", "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 09390cce1ead..c2ab4fb278de 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": "d25e8d183f319497b8b22a2a1585975b020da722", - "date": "2024-05-06T23:21:15+02:00", - "path": "/nix/store/bj3dsdmf608vwagc1nwwhs5z90p6swzc-tree-sitter-query", - "sha256": "191h311g14aah7wpibpyhpz925506c3l6qyrfra1kd8pjn1nv2vk", - "hash": "sha256-c4ttg5UXtRlUdtljQwczoBSR/oX+rnj5gUqR8EIYMKQ=", + "rev": "f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0", + "date": "2024-05-26T11:54:30+02:00", + "path": "/nix/store/rr9wn6900c73csv01czjnq609nwzyhqk-tree-sitter-query", + "sha256": "0wi01kmvb5axavfm6jp3rd6dd9pnq551w9lgwcgs02amxp6z8ymj", + "hash": "sha256-snr0ze1VCaAf448mHkrB9qbWTMvjSlPdVl2VtesMIHI=", "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 c74499796fbc..4754dba33b8d 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": "391400572538ff9854341a175ed8ab4b1e45f44b", - "date": "2024-05-03T14:16:03-04:00", - "path": "/nix/store/dkmd92q56snynssaridhzkd7rv8zckq7-tree-sitter-r", - "sha256": "05s0n6qvb3jsx7sv4vzsc794vdxinxf7f8d2sbf9qz3vwwm39kr8", - "hash": "sha256-KM80Kud7fJzc0qIhd1y3sbdN0mH6b7L16VqOtbGxQBc=", + "rev": "ac939363ced63a5fd39a8bd5e7891bbe06b5738d", + "date": "2024-09-06T16:53:09-04:00", + "path": "/nix/store/qj9nyda5grkjqkh23m9a3q3sgkmkgcdh-tree-sitter-r", + "sha256": "1jf14nvrfcznsnmxmlkbnn59bdykpsawxm5grph65p8vghi4fik7", + "hash": "sha256-Z0ZHInwb3WLgza/UzpW+07eVirVr0tqr1fYzl7clwck=", "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 fee52809beb5..db619e455693 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": "47007f195752d8e57bda80b0b6cdb2d173a9f7d7", - "date": "2024-05-05T20:53:57-04:00", - "path": "/nix/store/4vlp0kgq09yp9bnjkrsc82mh0c0mb4qa-tree-sitter-regex", - "sha256": "0j9shwv7j8jnkms1f8h9ddg80cj85vp1pivkdcspdifbi69q8l2z", - "hash": "sha256-X1CEk4nLxXY1a3PHG+4uSDKAXmsJIhd0nVYieTaHOkk=", + "rev": "f70251e1f1d72bd6dc1f897f956f9112f8668441", + "date": "2024-09-02T03:31:05-04:00", + "path": "/nix/store/9shrpsgb7rnk24nwc3xr1xv33wxi0ydk-tree-sitter-regex", + "sha256": "08i97gwvf6777h6dkvsd08s2n4pmpz2xghxpn1npn16jcpaknhhv", + "hash": "sha256-G0I71WXSBHttsLfD18W/9RIrNAJN79kMPOcYt/k7KSI=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json index 0cf6618b45b7..1df81f913967 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json @@ -1,10 +1,10 @@ { "url": "https://github.com/FallenAngel97/tree-sitter-rego", - "rev": "9ac75e71b2d791e0aadeef68098319d86a2a14cf", - "date": "2023-11-03T09:13:53+02:00", - "path": "/nix/store/7v3znqfnq89ik6svp70fzsin8j4ydl4s-tree-sitter-rego", - "sha256": "12napwjsv4hx2k4ad0p2v3mv4lhxgp894riglyqmidxxkikzma9g", - "hash": "sha256-L6n6Z5y9t1ixpy9mktB9HVKy69jigqbIFB2SrSW/yoo=", + "rev": "20b5a5958c837bc9f74b231022a68a594a313f6d", + "date": "2024-06-12T18:01:13+03:00", + "path": "/nix/store/dhpxdwhiwc6dl3gys99g3ax5jmg6s7fw-tree-sitter-rego", + "sha256": "0cmja3gd5nbmi251qc14hh1cbfd7i0mydx74qxs30qvix6q5a2az", + "hash": "sha256-XwlVsOlxYzB0x+T05iuIp7nFAoQkMByKiHXZ0t5QsjI=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json new file mode 100644 index 000000000000..9b98afddeef0 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json @@ -0,0 +1,12 @@ +{ + "url": "https://github.com/grafana/tree-sitter-river", + "rev": "eafcdc5147f985fea120feb670f1df7babb2f79e", + "date": "2023-11-22T14:48:13+01:00", + "path": "/nix/store/6wwv45dv3lgyzng2hryadamp061yzx4i-tree-sitter-river", + "sha256": "0acgxdgdffya5jc8d9ck2xrac0gi41w1a85cm91vwbm1xwxqh6vy", + "hash": "sha256-fhuIO++hLr5DqqwgFXgg8QGmcheTpYaYLMo7117rjyk=", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": 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 12519a98bf82..a682053ee93e 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": "9c84af007b0f144954adb26b3f336495cbb320a7", - "date": "2024-05-05T19:28:38-04:00", - "path": "/nix/store/5mmx41c8spdf25jci02lw3vmq117dksv-tree-sitter-rust", - "sha256": "0wjw8wz34c3h624xi0n133pv4ld1gmx4zn60xfkqgv7cmn9f42cv", - "hash": "sha256-mwnikq3s7Ien68DYT3p9oVGy7xjBgtiJMHAwMj5HXHI=", + "rev": "6b7d1fc73ded57f73b1619bcf4371618212208b1", + "date": "2024-09-02T05:17:41-04:00", + "path": "/nix/store/7qazknjwzfdl0jyc7jyqskjagw00i5wy-tree-sitter-rust", + "sha256": "08m0i6ar5gkz1pvz8lh2dfwjff4szzl0q0lzbqp0p5il0arxvbbh", + "hash": "sha256-cK3dswI0lgsuXp8CDOj/mjgnuWsCUvT3DX++kpWJoCI=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json index 719d4ce9e2d1..c72db6775674 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-scala", - "rev": "b3ac6a5d959d3137e7f3146d4d9f7899872177de", - "date": "2024-03-12T14:34:11-04:00", - "path": "/nix/store/zi4bjbmxlhp003lk37pcyf5kg9m2wcf6-tree-sitter-scala", - "sha256": "1j2ivdm21c5db54rcff00n7bqcfrfjc91jwlfl4a2cm363hbrym2", - "hash": "sha256-ovq84DCjMqEIdZTLkJh02TG8jgXAOZZJWa2wIGrbUcg=", + "rev": "62e7506f5ec87e2daf218e3bbd317401768d9963", + "date": "2024-09-12T09:36:24-04:00", + "path": "/nix/store/kcrap980k751mp2mk59z19jcc196pk08-tree-sitter-scala", + "sha256": "0ybj359b21cqy1nqr1psjy244y7d672iik9a3pqxrg67cppwwn26", + "hash": "sha256-RljO72XHvNzxHSrNGMUx7XhChJf6hoxt8JgFsVIZcnk=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json index 7e08f324213e..ef5caa8e43ec 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json @@ -1,10 +1,10 @@ { "url": "https://github.com/6cdh/tree-sitter-scheme", - "rev": "8f9dff3d038f09934db5ea113cebc59c74447743", - "date": "2024-04-12T09:33:55+08:00", - "path": "/nix/store/myg0q8bjsdzgq712skhxk1vf2gqqr7b0-tree-sitter-scheme", - "sha256": "1n9f9zala2mv7bllwjb2nsh2xsr56zjh7j09vxzd77jnb10rjh20", - "hash": "sha256-QECZQVhWntN+3wnIA+U3JesuoLZiSU7pOrsKRdVPLtk=", + "rev": "63e25a4a84142ae7ee0ee01fe3a32c985ca16745", + "date": "2024-09-08T01:23:30+08:00", + "path": "/nix/store/1wk7w5vkxcwqx24qlm203z1z5rw95vn8-tree-sitter-scheme", + "sha256": "12p8g2mnd73lanibk16llhbx7xarlcl2ihngcibhpa4bzppcbb8l", + "hash": "sha256-FK3F7v2LqAtXZM/CKCijWfXTF6TUhLmiVXScZqt46Io=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json index 0c3c6df0b6b2..6212e7a66822 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json @@ -1,7 +1,7 @@ { "url": "https://github.com/serenadeai/tree-sitter-scss", "rev": "c478c6868648eff49eb04a4df90d703dc45b312a", - "date": "2022-02-03T21:48:21+00:00", + "date": "2022-02-03T21:48:21Z", "path": "/nix/store/s49l3jbhjni3l1d0m3xrpzml39aq9yr3-tree-sitter-scss", "sha256": "15r3jiv36hzx2pmjmp63am3pbc01s52z36xfraa1aw4wlx7lqnq4", "hash": "sha256-BFtMT6eccBWUyq6b8UXRAbB1R1XD3CrrFf1DM3aUI5c=", diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json index 609520882b07..c95def892a1a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json @@ -1,7 +1,7 @@ { "url": "https://github.com/indoorvivants/tree-sitter-smithy", "rev": "cf8c7eb9faf7c7049839585eac19c94af231e6a0", - "date": "2023-01-31T21:16:56+00:00", + "date": "2023-01-31T21:16:56Z", "path": "/nix/store/y5j99bx1b6h25k1lnzs6s4gkg0mhll06-tree-sitter-smithy", "sha256": "0k7gfpa3pcj1ji34k0kwk1xbadkgjadfg36xfwns1fmlwzmr7jnx", "hash": "sha256-3cqT6+e0uqAtd92M55qSbza1eph8gklGlEGyO9R170w=", diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json index 42199274dd42..3108dc0d129e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json @@ -1,10 +1,10 @@ { "url": "https://github.com/bonabeavis/tree-sitter-sparql", - "rev": "05f949d3c1c15e3261473a244d3ce87777374dec", - "date": "2021-08-16T15:50:03+02:00", - "path": "/nix/store/vvgvb1jcv0qrn3xj0jbf83qwi1lh2m68-tree-sitter-sparql", - "sha256": "012c1pi4vc6hkvllymvl2yah3ix8k4pi7997iydy949fc33aa5i8", - "hash": "sha256-KBalxmAukeSbjyelEy+ZqMcBlRd0V0/pntCwTeINTAQ=", + "rev": "d853661ca680d8ff7f8d800182d5782b61d0dd58", + "date": "2024-06-26T16:15:19+02:00", + "path": "/nix/store/cz22k5dh2fqyfmamdx1mrlwv28shnk1x-tree-sitter-sparql", + "sha256": "1xd0hp2m62ggka46cv2px0507yyl9d9cdqhlpglq6y1jqb5p85fh", + "hash": "sha256-0BV0y8IyeIPpuxTixlJL1PsDCuhXbGaImu8JU8WFoPU=", "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 210646ac4c5e..ad70caa2684c 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": "7d591a1a14ce4d5caf81ae64284c2dc185544cb2", - "date": "2024-04-20T18:48:13+02:00", - "path": "/nix/store/r6sz2sa4az2p2idl3vjv90nr4zghxmxr-tree-sitter-sql", - "sha256": "1x4kw4fflizwb472n8sfpigqyc8y57m28mawsf999011flzg2dmp", - "hash": "sha256-tzbxPnUhgJSS01xVJOopHjGPX7xOIysOWfxH6hzhk/Q=", + "rev": "53623157a27f787cab12b2545f43ddd34f3fb5f7", + "date": "2024-08-09T22:12:06+02:00", + "path": "/nix/store/vlm9y5gcjih5scd3iyaxynr79gbfqha8-tree-sitter-sql", + "sha256": "1hjb75rsqnrs0ca1zq17bv4r7skmvra7jw69lk94ncjk8sbhh30w", + "hash": "sha256-HAwIl0ZTMkvSpMlweVTedeqTyV4n4B8UAzpbrHM5S8I=", "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 a83d9b23b034..ebf0c40e5579 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": "affa4389186b6939d89673e1e9d2b28364f5ca6f", - "date": "2024-04-30T09:37:18+02:00", - "path": "/nix/store/jhngv28bin50xqq7b898mq55s8mzmvr9-tree-sitter-supercollider", - "sha256": "02jbkx3679b5z78fdn62yr1ax7lr4mlcrdq0fs378alx8hm9704g", - "hash": "sha256-j4CTKkSdKnSGdgC3zGglmZ6uQvbC2ObQ+WWlY0afSwo=", + "rev": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7", + "date": "2024-09-21T12:39:28+02:00", + "path": "/nix/store/c94cwr855ai3b48ajw7nkxgrk6bs2n88-tree-sitter-supercollider", + "sha256": "051m7anq0w14qaj271x5ic4ilamrijx5f8np2g8kpgbkxmjc0v8v", + "hash": "sha256-G23AZO1zvTvRE9ciV7qMuSoaCYulhyOkwiRwgK06NRQ=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json index baa13c0a37dc..827afca5f9b1 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json @@ -1,10 +1,10 @@ { "url": "https://github.com/wenkokke/tree-sitter-talon", - "rev": "dafc9fabf7acc1a46d51cce379cec00c07661aa7", - "date": "2023-11-05T13:07:41+00:00", - "path": "/nix/store/df67djinw8sjwf6lbfv6gdckxckv0y65-tree-sitter-talon", - "sha256": "1clmmb3pgvc54fsp83f2jmz6n21pmmjkb15yk9bfqlkzdm12sirw", - "hash": "sha256-PEctQm1/UuxWmr6ENWWtNwhrfpXCDXS1I4Xtd8eqlbI=", + "rev": "53fd1d6102f692ab3040f90a1fe5023b7342ff23", + "date": "2024-06-18T14:14:45+01:00", + "path": "/nix/store/bva5mf6j33icgd2rr4067i50gjjzbd10-tree-sitter-talon", + "sha256": "1kw7axcqpmjbcsl6h8lsvraqv58k0w76rhxcvqqx7kly4jgz1wrm", + "hash": "sha256-NfPwnySeztMx3qzDbA4HE5WNVd6aImioZkvWi1lXh88=", "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 6dbe64089625..32997568a47c 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": "d631f60287c0904770bc41aa865e249594b52422", - "date": "2024-05-09T13:42:17+02:00", - "path": "/nix/store/5h839wwxwjmg799bp79kkcav2ld8k0jy-tree-sitter-templ", - "sha256": "16di98f9xnqdpzb69p8hrgisfhsz0r9p4pv342z0cvkjv5n4s0xc", - "hash": "sha256-rANNbNlybga+IGNfclMGX0On48sQ3WTWvw3bnhxKsZk=", + "rev": "4519e3ec9ca92754ca25659bb1fd410d5e0f8d88", + "date": "2024-10-13T13:44:06+02:00", + "path": "/nix/store/2qw76ygi99kpygl7v49syy6v7n81fii2-tree-sitter-templ", + "sha256": "10zgbql8z1rnn7wm5gm8z9mfpp0rzm0pnidjj8d8crn4l2b55kl9", + "hash": "sha256-ic5SlqDEZoYakrJFe0H9GdzravqovlL5sTaHjyhe74M=", "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 f50a35e3f2cb..444e95e3bdab 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": "ef18145e7f985f592ad41b04004b24a590f58b71", - "date": "2024-05-15T18:54:24-04:00", - "path": "/nix/store/saczmakjnrwrvn0dad37bfva1m3mvzc5-tree-sitter-tlaplus", - "sha256": "0hnylz5mxsvk1q8bbv7ak4r49l2knx75ln58i4isqs7qr0a2vw6b", - "hash": "sha256-y/AtFMj4aKwjiahYWk63U9BEMpnq7LUQDnPrXsun3kI=", + "rev": "b9e3978f363b3f8884c886a01d15e41bd14d30bd", + "date": "2024-09-28T09:39:52-04:00", + "path": "/nix/store/cl7xp08fmz23bzn67lzj9ygwzp5fwgz6-tree-sitter-tlaplus", + "sha256": "02igqk23gfh5ffdbcdngri769dcr1yd5pcla8vvgwlrgnh1j4bf4", + "hash": "sha256-xC0iA7QvU/72RoqyW5oPmbVkTszPNraacwW6N8TELwo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json index 6797d3fc6362..8523faec3758 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json @@ -1,10 +1,10 @@ { "url": "https://github.com/bonabeavis/tree-sitter-turtle", - "rev": "085437f5cb117703b7f520dd92161140a684f092", - "date": "2021-08-16T15:17:50+02:00", - "path": "/nix/store/c90hph3wfyhjmri3qbfb5lpy1bl855zv-tree-sitter-turtle", - "sha256": "1l5djvz90sq9w14kfcrffdigqs61r1p8v17xpj92sxz8z3ngpgmr", - "hash": "sha256-ub777Pjody2SvP2EjW7IwWj8YnMuMzdJ4AlrkP6WrdA=", + "rev": "7f789ea7ef765080f71a298fc96b7c957fa24422", + "date": "2024-07-02T13:41:07+02:00", + "path": "/nix/store/1rscya6w8m579211nsmhhicc3rgk204h-tree-sitter-turtle", + "sha256": "0c3diz97lrnxqkq410s9rlmxddjqgnswyc4spdfny045xgfzp9yg", + "hash": "sha256-z6f73euFAG9du5owz7V9WLbWK81Jg0DwxN1metKPbTA=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json index 874cb0a1368a..daede42ece96 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json @@ -1,10 +1,10 @@ { "url": "https://github.com/maxxnino/tree-sitter-zig", - "rev": "0d08703e4c3f426ec61695d7617415fff97029bd", - "date": "2023-04-25T05:51:06-03:00", - "path": "/nix/store/fzz8x1pa11zksamgk199fw0j7dkbsz0s-tree-sitter-zig", - "sha256": "0whj44fl6hmcyap5bjqhy90rd6xnnxgsy3vn1z3mvq8d2mwbnxbb", - "hash": "sha256-a3W7eBUN4V3HD3YPr1+3tpuWQfIQy1Wu8qxCQx0hEnI=", + "rev": "a80a6e9be81b33b182ce6305ae4ea28e29211bd5", + "date": "2024-10-13T11:52:27+07:00", + "path": "/nix/store/7vjvw01f5f8w2czz7n25pxl85zn3b6ys-tree-sitter-zig", + "sha256": "0fdf0hcvss7b2rl6wl2rbh6mm43ghfswygz4qv52fb94dxnl0x53", + "hash": "sha256-o3RAbW8kLSfKxuQ/z7WDb5BaDVxZUG5oFutovRkErjk=", "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 6d5db177b8a5..3c45e4b74089 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -61,6 +61,12 @@ let "py-tree-sitter" # afl fuzzing for tree sitter "afl-tree-sitter" + # this is the kotlin language bindings, tree-sitter-kotlin is the grammar + "kotlin-tree-sitter" + # this is the go language bindings, tree-sitter-go is the grammar + "go-tree-sitter" + # this is the java language bindings, tree-sitter-java is the grammar + "java-tree-sitter" # archived "highlight-schema" # website @@ -77,6 +83,12 @@ let "tree-sitter-fluent" # to unblock my update "csharp-tree-sitter" + # (experimental) java bindings to the Tree-sitter parsing library + "java-tree-sitter" + # go bindings to the Tree-sitter parsing library + "go-tree-sitter" + # kotlin bindings to the Tree-sitter parsing library + "kotlin-tree-sitter" # Non-grammar repositories ".github" @@ -439,6 +451,10 @@ let orga = "glehmann"; repo = "tree-sitter-earthfile"; }; + "tree-sitter-river" = { + orga = "grafana"; + repo = "tree-sitter-river"; + }; }; allGrammars = diff --git a/pkgs/development/tools/patatt/default.nix b/pkgs/development/tools/patatt/default.nix deleted file mode 100644 index 49477035a110..000000000000 --- a/pkgs/development/tools/patatt/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, python3Packages, fetchPypi }: - -python3Packages.buildPythonApplication rec { - pname = "patatt"; - version = "0.6.3"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-mAgm9lKdJXbCZ8ofVk1b7wRstH5UIVu1mO1sS5stCig="; - }; - - propagatedBuildInputs = with python3Packages; [ - pynacl - ]; - - meta = with lib; { - homepage = "https://git.kernel.org/pub/scm/utils/patatt/patatt.git/about/"; - license = licenses.mit0; - description = "Add cryptographic attestation to patches sent via email"; - mainProgram = "patatt"; - longDescription = '' - This utility allows an easy way to add end-to-end cryptographic - attestation to patches sent via mail. It does so by adapting the - DKIM email signature standard to include cryptographic - signatures via the X-Developer-Signature email header. - ''; - maintainers = with maintainers; [ qyliss yoctocell ]; - }; -} diff --git a/pkgs/development/tools/patcher9x/default.nix b/pkgs/development/tools/patcher9x/default.nix deleted file mode 100644 index fdf116a40c86..000000000000 --- a/pkgs/development/tools/patcher9x/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ fasm, lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation (finalAttr: { - pname = "patcher9x"; - version = "0.8.50"; - - srcs = [ - (fetchFromGitHub { - owner = "JHRobotics"; - repo = "patcher9x"; - rev = "v${finalAttr.version}"; - hash = "sha256-TZw2+R7Dzojzxzal1Wp8jhe5gwU4CfZDROITi5Z+auo="; - name = "src"; - }) - - (fetchFromGitHub { - owner = "JHRobotics"; - repo = "nocrt"; - rev = "f65cc7ef2a3cccd6264b2eb265d7fffbecb06ba4"; - hash = "sha256-oeHcK9zYMDWk5sWfzYqLtC3MAJVtcaDJy4PvUGrxiPE="; - name = "nocrt"; - }) - ]; - - buildInputs = [ fasm ]; - sourceRoot = "src"; - hardeningDisable = [ "fortify" ]; - - preBuild = '' - rmdir nocrt - ln -s ../nocrt . - ''; - - installPhase = '' - runHook preInstall - install -D patcher9x $out/bin/patcher9x - runHook postInstall - ''; - - meta = with lib; { - description = "Patch for Windows 95/98/98 SE/Me to fix CPU issues"; - mainProgram = "patcher9x"; - homepage = "https://github.com/JHRobotics/patcher9x"; - license = licenses.mit; - maintainers = with maintainers; [ hughobrien ]; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix deleted file mode 100644 index 6152e0c8dc38..000000000000 --- a/pkgs/development/tools/pax-rs/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, fetchFromGitHub, fetchurl, rustPlatform, runCommand } : - -rustPlatform.buildRustPackage rec { - pname = "pax-rs"; - version = "0.4.0"; - - meta = with lib; { - description = "Fastest JavaScript bundler in the galaxy"; - longDescription = '' - The fastest JavaScript bundler in the galaxy. Fully supports ECMAScript module syntax (import/export) in addition to CommonJS require(<string>). - ''; - homepage = "https://github.com/nathan/pax"; - license = licenses.mit; - maintainers = [ maintainers.klntsky ]; - platforms = platforms.linux; - mainProgram = "px"; - }; - - src = - let - source = fetchFromGitHub { - owner = "nathan"; - repo = "pax"; - rev = "pax-v${version}"; - sha256 = "1l2xpgsms0bfc0i3l0hyw4dbp6d4qdxa9vxyp704p27vvn4ndhv2"; - }; - - cargo-lock = fetchurl { - url = "https://gist.github.com/klntsky/c7863424d7df0c379782015f6bb3b399/raw/1cf7481e33984fd1510dc77ed677606d08fa8eb6/Cargo.lock"; - sha256 = "0ff1b64b99cbca1cc2ceabcd2e4f7bc3411e3a2a9fbb9db2204d9240fe38ddeb"; - }; - in - runCommand "pax-rs-src" {} '' - cp -R ${source} $out - chmod +w $out - cp ${cargo-lock} $out/Cargo.lock - ''; - - cargoHash = "sha256-2gXd1rwj82Ywin4QW3g9cB9R0PkXhE73F9xSJ6EozzQ="; -} diff --git a/pkgs/development/tools/perseus-cli/default.nix b/pkgs/development/tools/perseus-cli/default.nix index cffa0299beab..ba795a6ef870 100644 --- a/pkgs/development/tools/perseus-cli/default.nix +++ b/pkgs/development/tools/perseus-cli/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-i7MPmO9MoANZLzmR5gsD+v0gyDtFbzhsmE9xOsb88L0="; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; postInstall = '' wrapProgram $out/bin/perseus \ diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix deleted file mode 100644 index 6446c475f355..000000000000 --- a/pkgs/development/tools/pet/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ buildGoModule, fetchFromGitHub, installShellFiles, lib }: - -buildGoModule rec { - pname = "pet"; - version = "0.9.0"; - - src = fetchFromGitHub { - owner = "knqyf263"; - repo = "pet"; - rev = "v${version}"; - sha256 = "sha256-h6e7X93uU/rdTrCz5xJcNtpDbzcF/2Z186b4dHkp9jM="; - }; - - vendorHash = "sha256-hf2I5xHloqcXDlC8frxtCiQx2PlTmKmyd1mrzF2UdDo="; - - ldflags = [ - "-s" "-w" "-X=github.com/knqyf263/pet/cmd.version=${version}" - ]; - - doCheck = false; - - subPackages = [ "." ]; - - nativeBuildInputs = [ - installShellFiles - ]; - - postInstall = '' - installShellCompletion --cmd pet \ - --zsh ./misc/completions/zsh/_pet - ''; - - meta = with lib; { - description = "Simple command-line snippet manager, written in Go"; - mainProgram = "pet"; - homepage = "https://github.com/knqyf263/pet"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix deleted file mode 100644 index adcfc0efd4c7..000000000000 --- a/pkgs/development/tools/pew/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, python3, fetchPypi }: - -with python3.pkgs; - -buildPythonApplication rec { - pname = "pew"; - version = "1.2.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "04anak82p4v9w0lgfs55s7diywxil6amq8c8bhli143ca8l2fcdq"; - }; - - propagatedBuildInputs = [ virtualenv virtualenv-clone setuptools ]; - - # no tests are packaged - checkPhase = '' - $out/bin/pew > /dev/null - ''; - - pythonImportsCheck = [ "pew" ]; - - meta = with lib; { - homepage = "https://github.com/berdario/pew"; - description = "Tools to manage multiple virtualenvs written in pure python"; - mainProgram = "pew"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ berdario ]; - }; -} diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix deleted file mode 100644 index d4407fa5ec24..000000000000 --- a/pkgs/development/tools/pgformatter/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, perlPackages, fetchFromGitHub, fetchpatch, shortenPerlShebang }: - -perlPackages.buildPerlPackage rec { - pname = "pgformatter"; - version = "5.5"; - - src = fetchFromGitHub { - owner = "darold"; - repo = "pgFormatter"; - rev = "v${version}"; - hash = "sha256-4KtrsckO9Q9H0yIM0877YvWaDW02CQVAQiOKD919e9w="; - }; - - outputs = [ "out" ]; - - makeMakerFlags = [ "INSTALLDIRS=vendor" ]; - - # Avoid creating perllocal.pod, which contains a timestamp - installTargets = [ "pure_install" ]; - - patches = [ - # Fix an uninitialized variable error. Remove with the next release. - (fetchpatch { - url = "https://github.com/darold/pgFormatter/commit/c2622c47d48cee47effecbf58a588c3cd3a7bf1a.patch"; - sha256 = "sha256-WnQIOvfuzL2HrwtL0HaaYObrBxhXDu82jxGcqggQVhc="; - }) - ]; - - # Makefile.PL only accepts DESTDIR and INSTALLDIRS, but we need to set more to make this work for NixOS. - patchPhase = '' - substituteInPlace pg_format \ - --replace "#!/usr/bin/env perl" "#!/usr/bin/perl" - substituteInPlace Makefile.PL \ - --replace "'DESTDIR' => \$DESTDIR," "'DESTDIR' => '$out/'," \ - --replace "'INSTALLDIRS' => \$INSTALLDIRS," "'INSTALLDIRS' => \$INSTALLDIRS, 'INSTALLVENDORLIB' => 'bin/lib', 'INSTALLVENDORBIN' => 'bin', 'INSTALLVENDORSCRIPT' => 'bin', 'INSTALLVENDORMAN1DIR' => 'share/man/man1', 'INSTALLVENDORMAN3DIR' => 'share/man/man3'," - ''; - - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' - shortenPerlShebang $out/bin/pg_format - ''; - - doCheck = false; - - meta = with lib; { - description = "PostgreSQL SQL syntax beautifier that can work as a console program or as a CGI"; - homepage = "https://github.com/darold/pgFormatter"; - changelog = "https://github.com/darold/pgFormatter/releases/tag/v${version}"; - maintainers = [ ]; - license = [ licenses.postgresql licenses.artistic2 ]; - mainProgram = "pg_format"; - }; -} diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix deleted file mode 100644 index 59f3eeeaeaa9..000000000000 --- a/pkgs/development/tools/pgloader/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, sbcl, sqlite, freetds, libzip, curl, git, cacert, openssl }: -stdenv.mkDerivation rec { - pname = "pgloader"; - version = "3.6.9"; - - src = fetchurl { - url = "https://github.com/dimitri/pgloader/releases/download/v3.6.9/pgloader-bundle-3.6.9.tgz"; - sha256 = "sha256-pdCcRmoJnrfVnkhbT0WqLrRbCtOEmRgGRsXK+3uByeA="; - }; - - nativeBuildInputs = [ git makeWrapper ]; - buildInputs = [ sbcl cacert sqlite freetds libzip curl openssl ]; - - LD_LIBRARY_PATH = lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ]; - - buildPhase = '' - export PATH=$PATH:$out/bin - export HOME=$TMPDIR - - make pgloader - ''; - - dontStrip = true; - enableParallelBuilding = false; - - installPhase = '' - install -Dm755 bin/pgloader "$out/bin/pgloader" - wrapProgram $out/bin/pgloader --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}" - ''; - - meta = with lib; { - homepage = "https://pgloader.io/"; - description = "Loads data into PostgreSQL and allows you to implement Continuous Migration from your current database to PostgreSQL"; - mainProgram = "pgloader"; - maintainers = with maintainers; [ mguentner ]; - license = licenses.postgresql; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/pgtop/default.nix b/pkgs/development/tools/pgtop/default.nix deleted file mode 100644 index 5798b7da517a..000000000000 --- a/pkgs/development/tools/pgtop/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, perlPackages, fetchFromGitHub, shortenPerlShebang }: - -perlPackages.buildPerlPackage rec { - pname = "pgtop"; - version = "0.11"; - - src = fetchFromGitHub { - owner = "cosimo"; - repo = "pgtop"; - rev = "v${version}"; - sha256 = "1awyl6ddfihm7dfr5y2z15r1si5cyipnlyyj3m1l19pk98s4x66l"; - }; - - outputs = [ "out" ]; - - buildInputs = with perlPackages; [ DBI DBDPg TermReadKey JSON LWP ]; - - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' - shortenPerlShebang $out/bin/pgtop - ''; - - meta = with lib; { - description = "PostgreSQL clone of `mytop', which in turn is a `top' clone for MySQL"; - mainProgram = "pgtop"; - homepage = "https://github.com/cosimo/pgtop"; - changelog = "https://github.com/cosimo/pgtop/releases/tag/v${version}"; - maintainers = [ maintainers.hagl ]; - license = [ licenses.gpl2Only ]; - }; -} diff --git a/pkgs/development/tools/picotool/default.nix b/pkgs/development/tools/picotool/default.nix deleted file mode 100644 index a31f46808353..000000000000 --- a/pkgs/development/tools/picotool/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libusb1, pico-sdk }: - -stdenv.mkDerivation rec { - pname = "picotool"; - version = "1.1.2"; - - src = fetchFromGitHub { - owner = "raspberrypi"; - repo = pname; - rev = version; - sha256 = "sha256-OcQJeiva6X2rUyh1rJ+w4O2dWxaR7MwMfbHlnWuBVb8="; - }; - - buildInputs = [ libusb1 pico-sdk ]; - nativeBuildInputs = [ cmake pkg-config ]; - cmakeFlags = [ "-DPICO_SDK_PATH=${pico-sdk}/lib/pico-sdk" ]; - - postInstall = '' - install -Dm444 ../udev/99-picotool.rules -t $out/etc/udev/rules.d - ''; - - meta = with lib; { - homepage = "https://github.com/raspberrypi/picotool"; - description = "Tool for interacting with a RP2040 device in BOOTSEL mode, or with a RP2040 binary"; - mainProgram = "picotool"; - license = licenses.bsd3; - maintainers = with maintainers; [ muscaln ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/pifpaf/default.nix b/pkgs/development/tools/pifpaf/default.nix deleted file mode 100644 index 3979f9fc53e5..000000000000 --- a/pkgs/development/tools/pifpaf/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, python3 -, fetchPypi -}: - -python3.pkgs.buildPythonApplication rec { - pname = "pifpaf"; - version = "3.2.1"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-8SSSdXBj9Yd351Iv7TdASLCfYPnkG7h6X8rBLrArgFI="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - click - daiquiri - fixtures - jinja2 - pbr - psutil - xattr - ]; - - preCheck = '' - export PATH=$out/bin:$PATH - ''; - - nativeCheckInputs = with python3.pkgs; [ - requests - testtools - ]; - - pythonImportsCheck = [ "pifpaf" ]; - - meta = with lib; { - description = "Suite of tools and fixtures to manage daemons for testing"; - mainProgram = "pifpaf"; - homepage = "https://github.com/jd/pifpaf"; - license = licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix deleted file mode 100644 index 9deb33c757f4..000000000000 --- a/pkgs/development/tools/pip-audit/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - lib, - fetchFromGitHub, - python3, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "pip-audit"; - version = "2.7.3"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "trailofbits"; - repo = "pip-audit"; - rev = "refs/tags/v${version}"; - hash = "sha256-MRFfF5OygUCIdUnPvxhYk4IcLSWGgmlw2qgzPoZDniw="; - }; - - build-system = with python3.pkgs; [ flit-core ]; - - dependencies = - with python3.pkgs; - [ - cachecontrol - cyclonedx-python-lib - html5lib - packaging - pip-api - pip-requirements-parser - rich - toml - ] - ++ cachecontrol.optional-dependencies.filecache; - - nativeCheckInputs = with python3.pkgs; [ - pretend - pytestCheckHook - ]; - - pythonImportsCheck = [ "pip_audit" ]; - - preCheck = '' - export HOME=$(mktemp -d); - ''; - - disabledTestPaths = [ - # Tests require network access - "test/dependency_source/test_requirement.py" - "test/service/test_pypi.py" - "test/service/test_osv.py" - ]; - - disabledTests = [ - # Tests requrire network access - "test_get_pip_cache" - "test_virtual_env" - "test_pyproject_source" - "test_pyproject_source_duplicate_deps" - ]; - - meta = with lib; { - description = "Tool for scanning Python environments for known vulnerabilities"; - homepage = "https://github.com/trailofbits/pip-audit"; - changelog = "https://github.com/pypa/pip-audit/releases/tag/v${version}"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; - mainProgram = "pip-audit"; - }; -} diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix deleted file mode 100644 index dd65dbe34221..000000000000 --- a/pkgs/development/tools/pipenv/default.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ lib -, stdenv -, python3 -, fetchFromGitHub -, installShellFiles -, pipenv -, runCommand -}: - -with python3.pkgs; - -let - - runtimeDeps = ps: with ps; [ - certifi - setuptools - pip - virtualenv - virtualenv-clone - ] - ++ lib.optionals stdenv.hostPlatform.isAndroid [ - pyjnius - ]; - - pythonEnv = python3.withPackages runtimeDeps; - -in buildPythonApplication rec { - pname = "pipenv"; - version = "2024.0.1"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "pypa"; - repo = "pipenv"; - rev = "refs/tags/v${version}"; - hash = "sha256-IyjJrIEcKHm7TpZk26MYI///ZIB/7ploTBzvms1gDmI="; - }; - - env.LC_ALL = "en_US.UTF-8"; - - nativeBuildInputs = [ - installShellFiles - setuptools - wheel - ]; - - postPatch = '' - # pipenv invokes python in a subprocess to create a virtualenv - # and to call setup.py. - # It would use sys.executable, which in our case points to a python that - # does not have the required dependencies. - substituteInPlace pipenv/utils/virtualenv.py \ - --replace "sys.executable" "'${pythonEnv.interpreter}'" - ''; - - propagatedBuildInputs = runtimeDeps python3.pkgs; - - preCheck = '' - export HOME="$TMPDIR" - ''; - - nativeCheckInputs = [ - mock - pytestCheckHook - pytest-xdist - pytz - requests - ]; - - disabledTests = [ - # 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) \ - --zsh <(_PIPENV_COMPLETE=zsh_source $out/bin/pipenv) \ - --fish <(_PIPENV_COMPLETE=fish_source $out/bin/pipenv) - ''; - - meta = with lib; { - description = "Python Development Workflow for Humans"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ berdario ]; - }; -} diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 89419379239f..596c4c73d991 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -1,4 +1,8 @@ -{ lib, callPackage }: +{ + lib, + callPackage, +}: + let inherit (lib) mapAttrs' nameValuePair; @@ -8,12 +12,12 @@ let hash = "sha256-2qJ6C1QbxjUyP/lsLe2ZVGf/n+bWn/ZwIVWKqa2dzDY="; }; "9" = { - version = "9.10.0"; - hash = "sha256-NVqKuNu2rUG+++85vE/Wtd+F4Sdh0nJL0B8T6HjeSxM"; + version = "9.12.3"; + hash = "sha256-JCNXcsxKyCpiYnzUf4NMcmZ6LOh3mahG7E6OVV4tS4s="; }; }; - callPnpm = variant: callPackage ./generic.nix {inherit (variant) version hash;}; + callPnpm = variant: callPackage ./generic.nix { inherit (variant) version hash; }; mkPnpm = versionSuffix: variant: nameValuePair "pnpm_${versionSuffix}" (callPnpm variant); in diff --git a/pkgs/development/tools/pnpm/fetch-deps/default.nix b/pkgs/development/tools/pnpm/fetch-deps/default.nix index 4ef68fdd50c8..971f1656ba92 100644 --- a/pkgs/development/tools/pnpm/fetch-deps/default.nix +++ b/pkgs/development/tools/pnpm/fetch-deps/default.nix @@ -9,13 +9,15 @@ pnpm, yq, }: + { fetchDeps = { hash ? "", pname, - pnpmWorkspace ? "", + pnpmWorkspaces ? [ ], prePnpmInstall ? "", + pnpmInstallFlags ? [ ], ... }@args: let @@ -31,76 +33,87 @@ outputHash = ""; outputHashAlgo = "sha256"; }; - installFlags = lib.optionalString (pnpmWorkspace != "") "--filter=${pnpmWorkspace}"; + + filterFlags = lib.map (package: "--filter=${package}") pnpmWorkspaces; in - stdenvNoCC.mkDerivation (finalAttrs: ( - args' - // { - name = "${pname}-pnpm-deps"; + # pnpmWorkspace was deprecated, so throw if it's used. + assert (lib.throwIf (args ? pnpmWorkspace) + "pnpm.fetchDeps: `pnpmWorkspace` is no longer supported, please migrate to `pnpmWorkspaces`." + ) true; + + stdenvNoCC.mkDerivation ( + finalAttrs: + ( + args' + // { + name = "${pname}-pnpm-deps"; - nativeBuildInputs = [ - cacert - jq - moreutils - pnpm - yq - ]; + nativeBuildInputs = [ + cacert + jq + moreutils + pnpm + yq + ]; - impureEnvVars = lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "NIX_NPM_REGISTRY" ]; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - lockfileVersion="$(yq -r .lockfileVersion pnpm-lock.yaml)" - if [[ ''${lockfileVersion:0:1} -gt ${lib.versions.major pnpm.version} ]]; then - echo "ERROR: lockfileVersion $lockfileVersion in pnpm-lock.yaml is too new for the provided pnpm version ${lib.versions.major pnpm.version}!" - exit 1 - fi + lockfileVersion="$(yq -r .lockfileVersion pnpm-lock.yaml)" + if [[ ''${lockfileVersion:0:1} -gt ${lib.versions.major pnpm.version} ]]; then + echo "ERROR: lockfileVersion $lockfileVersion in pnpm-lock.yaml is too new for the provided pnpm version ${lib.versions.major pnpm.version}!" + exit 1 + fi - export HOME=$(mktemp -d) - pnpm config set store-dir $out - # Some packages produce platform dependent outputs. We do not want to cache those in the global store - 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 \ - --force \ - --ignore-scripts \ - ${installFlags} \ - --frozen-lockfile + export HOME=$(mktemp -d) + pnpm config set store-dir $out + # Some packages produce platform dependent outputs. We do not want to cache those in the global store + 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 \ + --force \ + --ignore-scripts \ + ${lib.escapeShellArgs filterFlags} \ + ${lib.escapeShellArgs pnpmInstallFlags} \ + --registry="$NIX_NPM_REGISTRY" \ + --frozen-lockfile - runHook postInstall - ''; + runHook postInstall + ''; - fixupPhase = '' - runHook preFixup + fixupPhase = '' + runHook preFixup - # Remove timestamp and sort the json files - rm -rf $out/v3/tmp - for f in $(find $out -name "*.json"); do - jq --sort-keys "del(.. | .checkedAt?)" $f | sponge $f - done + # Remove timestamp and sort the json files + rm -rf $out/v3/tmp + for f in $(find $out -name "*.json"); do + jq --sort-keys "del(.. | .checkedAt?)" $f | sponge $f + done - runHook postFixup - ''; + runHook postFixup + ''; - passthru = { - serve = callPackage ./serve.nix { - inherit pnpm; - pnpmDeps = finalAttrs.finalPackage; + passthru = { + serve = callPackage ./serve.nix { + inherit pnpm; + pnpmDeps = finalAttrs.finalPackage; + }; }; - }; - dontConfigure = true; - dontBuild = true; - outputHashMode = "recursive"; - } - // hash' - )); + dontConfigure = true; + dontBuild = true; + outputHashMode = "recursive"; + } + // hash' + ) + ); configHook = makeSetupHook { name = "pnpm-config-hook"; 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 e82a62f9101c..a47e3184e9cb 100644 --- a/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh +++ b/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh @@ -22,11 +22,19 @@ pnpmConfigHook() { pnpm config set store-dir "$STORE_PATH" - echo "Installing dependencies" - if [[ -n "$pnpmWorkspace" ]]; then - pnpmInstallFlags+=("--filter=$pnpmWorkspace") + echo "'pnpmWorkspace' is deprecated, please migrate to 'pnpmWorkspaces'." + exit 2 + fi + + echo "Installing dependencies" + if [[ -n "$pnpmWorkspaces" ]]; then + local IFS=" " + for ws in $pnpmWorkspaces; do + pnpmInstallFlags+=("--filter=$ws") + done fi + runHook prePnpmInstall pnpm install \ diff --git a/pkgs/development/tools/pnpm/fetch-deps/serve.nix b/pkgs/development/tools/pnpm/fetch-deps/serve.nix index a44022d841dc..a60aaa3b928f 100644 --- a/pkgs/development/tools/pnpm/fetch-deps/serve.nix +++ b/pkgs/development/tools/pnpm/fetch-deps/serve.nix @@ -1,4 +1,9 @@ -{ writeShellApplication, pnpm, pnpmDeps }: +{ + writeShellApplication, + pnpm, + pnpmDeps, +}: + writeShellApplication { name = "serve-pnpm-store"; diff --git a/pkgs/development/tools/pnpm/generic.nix b/pkgs/development/tools/pnpm/generic.nix index 7050df448970..0eb8467a4274 100644 --- a/pkgs/development/tools/pnpm/generic.nix +++ b/pkgs/development/tools/pnpm/generic.nix @@ -7,10 +7,11 @@ nodejs, testers, withNode ? true, - version, hash, -}: stdenvNoCC.mkDerivation (finalAttrs: { +}: + +stdenvNoCC.mkDerivation (finalAttrs: { pname = "pnpm"; inherit version; @@ -26,7 +27,10 @@ buildInputs = lib.optionals withNode [ nodejs ]; - nativeBuildInputs = [ installShellFiles nodejs ]; + nativeBuildInputs = [ + installShellFiles + nodejs + ]; installPhase = '' runHook preInstall @@ -40,41 +44,49 @@ ''; postInstall = - if lib.toInt (lib.versions.major version) < 9 then '' - export HOME="$PWD" - node $out/bin/pnpm install-completion bash - node $out/bin/pnpm install-completion fish - node $out/bin/pnpm install-completion zsh - sed -i '1 i#compdef pnpm' .config/tabtab/zsh/pnpm.zsh - installShellCompletion \ - .config/tabtab/bash/pnpm.bash \ - .config/tabtab/fish/pnpm.fish \ - .config/tabtab/zsh/pnpm.zsh - '' else '' - node $out/bin/pnpm completion bash >pnpm.bash - node $out/bin/pnpm completion fish >pnpm.fish - node $out/bin/pnpm completion zsh >pnpm.zsh - sed -i '1 i#compdef pnpm' pnpm.zsh - installShellCompletion pnpm.{bash,fish,zsh} - ''; + if lib.toInt (lib.versions.major version) < 9 then + '' + export HOME="$PWD" + node $out/bin/pnpm install-completion bash + node $out/bin/pnpm install-completion fish + node $out/bin/pnpm install-completion zsh + sed -i '1 i#compdef pnpm' .config/tabtab/zsh/pnpm.zsh + installShellCompletion \ + .config/tabtab/bash/pnpm.bash \ + .config/tabtab/fish/pnpm.fish \ + .config/tabtab/zsh/pnpm.zsh + '' + else + '' + node $out/bin/pnpm completion bash >pnpm.bash + node $out/bin/pnpm completion fish >pnpm.fish + node $out/bin/pnpm completion zsh >pnpm.zsh + sed -i '1 i#compdef pnpm' pnpm.zsh + installShellCompletion pnpm.{bash,fish,zsh} + ''; - passthru = let - fetchDepsAttrs = callPackages ./fetch-deps { pnpm = finalAttrs.finalPackage; }; - in { - inherit (fetchDepsAttrs) fetchDeps configHook; + passthru = + let + fetchDepsAttrs = callPackages ./fetch-deps { pnpm = finalAttrs.finalPackage; }; + in + { + inherit (fetchDepsAttrs) fetchDeps configHook; - tests.version = lib.optionalAttrs withNode ( - testers.testVersion { package = finalAttrs.finalPackage; } - ); - }; + tests.version = lib.optionalAttrs withNode ( + testers.testVersion { package = finalAttrs.finalPackage; } + ); + }; - meta = with lib; { + meta = { description = "Fast, disk space efficient package manager for JavaScript"; homepage = "https://pnpm.io/"; changelog = "https://github.com/pnpm/pnpm/releases/tag/v${finalAttrs.version}"; - license = licenses.mit; - maintainers = with maintainers; [ Scrumplex ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + Scrumplex + gepbird + ]; + platforms = lib.platforms.all; mainProgram = "pnpm"; }; }) diff --git a/pkgs/development/tools/poac/default.nix b/pkgs/development/tools/poac/default.nix index 95a028c6f809..d6a1ad39bdaf 100644 --- a/pkgs/development/tools/poac/default.nix +++ b/pkgs/development/tools/poac/default.nix @@ -71,8 +71,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake git cacert ]; buildInputs = [ (boost179.override { - enableShared = stdenv.isDarwin; - enableStatic = !stdenv.isDarwin; + enableShared = stdenv.hostPlatform.isDarwin; + enableStatic = !stdenv.hostPlatform.isDarwin; }) git2-cpp glob diff --git a/pkgs/development/tools/postiats-utilities/default.nix b/pkgs/development/tools/postiats-utilities/default.nix deleted file mode 100644 index 6ac021e1ba09..000000000000 --- a/pkgs/development/tools/postiats-utilities/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python3, python3Packages }: - -stdenv.mkDerivation rec { - pname = "postiats-utilities"; - version = "2.1.1"; - src = fetchFromGitHub { - owner = "Hibou57"; - repo = "PostiATS-Utilities"; - rev = "v${version}"; - sha256 = "sha256-QeBbv5lwqL2ARjB+RGyBHeuibaxugffBLhC9lYs+5tE="; - }; - - meta = with lib; { - homepage = "https://github.com/Hibou57/PostiATS-Utilities"; - license = licenses.bsd2; - platforms = platforms.linux; - maintainers = [ maintainers.ttuegel ]; - }; - - buildInputs = [ python3 python3Packages.wrapPython ]; - - postPatch = '' - for f in pats-* postiats/*.py; do - sed -i "$f" -e "1 s,python3,python," - done - ''; - - installPhase = '' - libdir="$out/${python3.sitePackages}" - mkdir -p "$libdir" - cp -r postiats "$libdir" - - mkdir -p "$out/bin" - install pats-* "$out/bin" - - wrapPythonPrograms - ''; -} diff --git a/pkgs/development/tools/pqrs/default.nix b/pkgs/development/tools/pqrs/default.nix deleted file mode 100644 index 1d406394ac12..000000000000 --- a/pkgs/development/tools/pqrs/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "pqrs"; - version = "0.3.2"; - - src = fetchFromGitHub { - owner = "manojkarthick"; - repo = "pqrs"; - rev = "v${version}"; - sha256 = "sha256-0oSSoGZga0OGAKUNsLmKkUl8N1l0pVi4KIqrKJbeVVU="; - }; - - cargoHash = "sha256-w0WD+EtVGFMGpS4a2DJrLdbunwF2yiONKQwdcQG2EB0="; - - meta = with lib; { - description = "CLI tool to inspect Parquet files"; - mainProgram = "pqrs"; - homepage = "https://github.com/manojkarthick/pqrs"; - license = with licenses; [ mit /* or */ asl20 ]; - maintainers = [ maintainers.manojkarthick ]; - }; -} diff --git a/pkgs/development/tools/pretty-simple/default.nix b/pkgs/development/tools/pretty-simple/default.nix deleted file mode 100644 index 0a33b6e6b2ea..000000000000 --- a/pkgs/development/tools/pretty-simple/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ haskell, haskellPackages, lib }: - -haskell.lib.compose.justStaticExecutables (haskell.lib.compose.overrideCabal (oldAttrs: { - maintainers = (oldAttrs.maintainers or []) ++ [ - lib.maintainers.cdepillabout - ]; - - configureFlags = (oldAttrs.configureFlags or []) ++ ["-fbuildexe"]; - - buildDepends = (oldAttrs.buildDepends or []) ++ [haskellPackages.optparse-applicative]; -}) haskellPackages.pretty-simple) - diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix deleted file mode 100644 index fdd665bbae22..000000000000 --- a/pkgs/development/tools/profiling/EZTrace/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, - stdenv, - fetchFromGitLab, - gfortran, - libelf, - libiberty, - zlib, - # Once https://gitlab.com/eztrace/eztrace/-/issues/41 - # is released we can switch to latest binutils. - libbfd_2_38, - libopcodes_2_38, - autoreconfHook -}: - -stdenv.mkDerivation rec { - pname = "EZTrace"; - version = "1.1-11"; - - src = fetchFromGitLab { - owner = "eztrace"; - repo = "eztrace"; - rev = "eztrace-${version}"; - hash = "sha256-A6HMr4ib5Ka1lTbbTQOdq3kIdCoN/CwAKRdXdv9wpfU="; - }; - - nativeBuildInputs = [ gfortran autoreconfHook ]; - buildInputs = [ libelf libiberty zlib libbfd_2_38 libopcodes_2_38 ]; - - meta = with lib; { - description = "Tool that aims at generating automatically execution trace from HPC programs"; - license = licenses.cecill-b; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/profiling/malt/default.nix b/pkgs/development/tools/profiling/malt/default.nix deleted file mode 100644 index 82b041cc86a0..000000000000 --- a/pkgs/development/tools/profiling/malt/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, lib -, fetchFromGitHub -, cmake, nodejs, libelf, libunwind -}: - -stdenv.mkDerivation rec { - pname = "malt"; - version = "1.2.2"; - - src = fetchFromGitHub { - owner = "memtt"; - repo = "malt"; - rev = "v${version}"; - sha256 = "sha256-6GGIdBaw/JSc2Qexy+P1NON27EBBRltthyQpMPZwi+8="; - }; - - postPatch = '' - sed -i s,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@,@CMAKE_INSTALL_LIBDIR@, \ - src/integration/malt.sh.in - sed -i -e 's,^NODE=""$,NODE=${nodejs}/bin/node,' -e s,^detectNodeJS$,, \ - src/integration/malt-{webview,passwd}.sh.in - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libelf libunwind ]; - - meta = with lib; { - description = "Memory tool to find where you allocate your memory"; - homepage = "https://github.com/memtt/malt"; - license = licenses.cecill-c; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/development/tools/profiling/pprof/default.nix deleted file mode 100644 index 24851fc6763b..000000000000 --- a/pkgs/development/tools/profiling/pprof/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "pprof"; - version = "0-unstable-2024-07-10"; - - src = fetchFromGitHub { - owner = "google"; - repo = "pprof"; - rev = "f6c9dda6c6da638264f96f1097bce50fd82b4927"; - hash = "sha256-jxPl3e9aYRWyR7vkz+15aZiG331WnrNkMW8vwbcldfY="; - }; - - 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"; - homepage = "https://github.com/google/pprof"; - license = licenses.asl20; - longDescription = '' - pprof reads a collection of profiling samples in profile.proto format and - generates reports to visualize and help analyze the data. It can generate - both text and graphical reports (through the use of the dot visualization - package). - - profile.proto is a protocol buffer that describes a set of callstacks and - symbolization information. A common usage is to represent a set of sampled - callstacks from statistical profiling. The format is described on the - proto/profile.proto file. For details on protocol buffers, see - https://developers.google.com/protocol-buffers - - Profiles can be read from a local file, or over http. Multiple profiles of - the same type can be aggregated or compared. - - If the profile samples contain machine addresses, pprof can symbolize them - through the use of the native binutils tools (addr2line and nm). - - This is not an official Google product. - ''; - mainProgram = "pprof"; - maintainers = with maintainers; [ hzeller ]; - }; -} diff --git a/pkgs/development/tools/profiling/sysprof/capture.nix b/pkgs/development/tools/profiling/sysprof/capture.nix index 1739897096d7..ad04b7314820 100644 --- a/pkgs/development/tools/profiling/sysprof/capture.nix +++ b/pkgs/development/tools/profiling/sysprof/capture.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { "-Dtools=false" "-Dtests=false" "-Dexamples=false" + "-Dpolkit-agent=disabled" # only useful for sysprof-cli ]; meta = sysprof.meta // { diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 7359fbb136fb..b13883474363 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "sysprof"; - version = "46.0"; + version = "47.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-c6p+deurPk4JRqBacj335u5CSeO56ITbo1UAq6Kh0XY="; + hash = "sha256-dCTGKUNGYGVCiMBCSJmMNX0c6H7hVZ/UTfGYCZLvXfU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index a2895a095422..c6595db224ef 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -1,6 +1,7 @@ { lib, fetchgit, pkg-config, gettext, runCommand, makeWrapper , cpio, elfutils, kernel, gnumake, python3 , nixosTests +, withStap ? true # avoid cyclic dependency with glib }: let @@ -33,7 +34,7 @@ let pypkgs = with python3.pkgs; makePythonPath [ pyparsing ]; -in runCommand "systemtap-${kernel.version}-${version}" { +in runCommand "systemtap-${version}" { inherit stapBuild; nativeBuildInputs = [ makeWrapper ]; passthru.tests = { inherit (nixosTests.systemtap) linux_default linux_latest; }; @@ -43,15 +44,16 @@ in runCommand "systemtap-${kernel.version}-${version}" { license = lib.licenses.gpl2; platforms = lib.systems.inspect.patterns.isGnu; }; -} '' +} ('' mkdir -p $out/bin for bin in $stapBuild/bin/*; do ln -s $bin $out/bin done rm $out/bin/stap $out/bin/dtrace + makeWrapper $stapBuild/bin/dtrace $out/bin/dtrace \ + --prefix PYTHONPATH : ${pypkgs} +'' + lib.optionalString withStap '' makeWrapper $stapBuild/bin/stap $out/bin/stap \ --add-flags "--sysroot ${sysroot}" \ --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc stdenv.cc.bintools elfutils gnumake ]} - makeWrapper $stapBuild/bin/dtrace $out/bin/dtrace \ - --prefix PYTHONPATH : ${pypkgs} -'' +'') diff --git a/pkgs/development/tools/proto-contrib/default.nix b/pkgs/development/tools/proto-contrib/default.nix deleted file mode 100644 index 5437fd11345a..000000000000 --- a/pkgs/development/tools/proto-contrib/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib }: - -buildGoModule rec { - pname = "proto-contrib"; - version = "0.9.0"; - - src = fetchFromGitHub { - owner = "emicklei"; - repo = pname; - rev = "v${version}"; - sha256 = "0ksxic7cypv9gg8q5lkl5bla1n9i65z7b03cx9lwq6252glmf2jk"; - }; - - vendorHash = "sha256-XAFB+DDWN7CLfNxIBqYJy88gUNrUJYExzy2/BFnBe8c="; - - doCheck = false; - - meta = with lib; { - description = "Contributed tools and other packages on top of the Go proto package"; - homepage = "https://github.com/emicklei/proto-contrib"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; - }; -} diff --git a/pkgs/development/tools/protoc-gen-connect-go/default.nix b/pkgs/development/tools/protoc-gen-connect-go/default.nix deleted file mode 100644 index 36a5bb15e35c..000000000000 --- a/pkgs/development/tools/protoc-gen-connect-go/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "protoc-gen-connect-go"; - version = "1.17.0"; - - src = fetchFromGitHub { - owner = "connectrpc"; - repo = "connect-go"; - rev = "refs/tags/v${version}"; - hash = "sha256-GF7J21Y27LmKuDjuk2omQo2xV5pDo2GQXyu9SLwG0fs="; - }; - - vendorHash = "sha256-j5T1Ho3K0kPZOo5LA6Md06W/gF6DmEElGt9BvceBtTo="; - - subPackages = [ - "cmd/protoc-gen-connect-go" - ]; - - preCheck = '' - # test all paths - unset subPackages - ''; - - meta = with lib; { - description = "Simple, reliable, interoperable, better gRPC"; - mainProgram = "protoc-gen-connect-go"; - homepage = "https://github.com/connectrpc/connect-go"; - changelog = "https://github.com/connectrpc/connect-go/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ kilimnik jk ]; - }; -} diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/development/tools/protoc-gen-doc/default.nix deleted file mode 100644 index 09eb0a057aee..000000000000 --- a/pkgs/development/tools/protoc-gen-doc/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib }: - -buildGoModule rec { - pname = "protoc-gen-doc"; - version = "1.5.1"; - - src = fetchFromGitHub { - owner = "pseudomuto"; - repo = "protoc-gen-doc"; - rev = "v${version}"; - sha256 = "sha256-19CN62AwqQGq5Gb5kQqVYhs+LKsJ9K2L0VAakwzPD5Y="; - }; - - vendorHash = "sha256-K0rZBERSKob5ubZW28QpbcPhgFKOOASkd9UyC9f8gyQ="; - - meta = with lib; { - description = "Documentation generator plugin for Google Protocol Buffers"; - mainProgram = "protoc-gen-doc"; - longDescription = '' - This is a documentation generator plugin for the Google Protocol Buffers - compiler (protoc). The plugin can generate HTML, JSON, DocBook and - Markdown documentation from comments in your .proto files. - - It supports proto2 and proto3, and can handle having both in the same - context. - ''; - homepage = "https://github.com/pseudomuto/protoc-gen-doc"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; - }; -} diff --git a/pkgs/development/tools/protoc-gen-entgrpc/default.nix b/pkgs/development/tools/protoc-gen-entgrpc/default.nix deleted file mode 100644 index b4751caa883a..000000000000 --- a/pkgs/development/tools/protoc-gen-entgrpc/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "protoc-gen-entgrpc"; - version = "0.6.0"; - - src = fetchFromGitHub { - owner = "ent"; - repo = "contrib"; - rev = "v${version}"; - sha256 = "sha256-8BQXjoVTasCReAc3XWBgeoYmL9zLj+uvf9TRKBYaAr4="; - }; - - vendorHash = "sha256-jdjcnDfEAP33oQSn5nqgFqE+uwKBXp3gJWTNiiH/6iw="; - - subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ]; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Generator of an implementation of the service interface for ent protobuff"; - mainProgram = "protoc-gen-entgrpc"; - downloadPage = "https://github.com/ent/contrib/"; - license = licenses.asl20; - homepage = "https://entgo.io/"; - maintainers = [ ]; - }; -} - diff --git a/pkgs/development/tools/protoc-gen-go-grpc/default.nix b/pkgs/development/tools/protoc-gen-go-grpc/default.nix deleted file mode 100644 index 34d5f22d821f..000000000000 --- a/pkgs/development/tools/protoc-gen-go-grpc/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, lib -}: - -buildGoModule rec { - pname = "protoc-gen-go-grpc"; - version = "1.3.0"; - modRoot = "cmd/protoc-gen-go-grpc"; - - src = fetchFromGitHub { - owner = "grpc"; - repo = "grpc-go"; - rev = "cmd/protoc-gen-go-grpc/v${version}"; - sha256 = "sha256-Zy0k5X/KFzCao9xAGt5DNb0MMGEyqmEsDj+uvXI4xH4="; - }; - - vendorHash = "sha256-y+/hjYUTFZuq55YAZ5M4T1cwIR+XFQBmWVE+Cg1Y7PI="; - - meta = with lib; { - description = "Go language implementation of gRPC. HTTP/2 based RPC"; - mainProgram = "protoc-gen-go-grpc"; - license = licenses.asl20; - maintainers = [ maintainers.raboof ]; - }; -} diff --git a/pkgs/development/tools/protoc-gen-go-vtproto/default.nix b/pkgs/development/tools/protoc-gen-go-vtproto/default.nix deleted file mode 100644 index 11764e7e8e3c..000000000000 --- a/pkgs/development/tools/protoc-gen-go-vtproto/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, lib -}: -buildGoModule rec { - pname = "protoc-gen-go-vtproto"; - version = "0.6.0"; - - src = fetchFromGitHub { - owner = "planetscale"; - repo = "vtprotobuf"; - rev = "v${version}"; - sha256 = "sha256-ji6elc0hN49A4Ov/ckd8chPR4/8ZX11THzVz9HJGui4="; - }; - - vendorHash = "sha256-UMOEePOtOtmm9ShQy5LXcEUTv8/SIG9dU7/9vLhrBxQ="; - - excludedPackages = [ "conformance" ]; - - meta = with lib; { - description = "Protocol Buffers compiler that generates optimized marshaling & unmarshaling Go code for ProtoBuf APIv2"; - mainProgram = "protoc-gen-go-vtproto"; - homepage = "https://github.com/planetscale/vtprotobuf"; - license = licenses.bsd3; - maintainers = [ maintainers.zane ]; - }; -} diff --git a/pkgs/development/tools/protoc-gen-go/default.nix b/pkgs/development/tools/protoc-gen-go/default.nix deleted file mode 100644 index 52a54fbeeaa1..000000000000 --- a/pkgs/development/tools/protoc-gen-go/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "protoc-gen-go"; - version = "1.34.2"; - - src = fetchFromGitHub { - owner = "protocolbuffers"; - repo = "protobuf-go"; - rev = "v${version}"; - hash = "sha256-467+AhA3tADBg6+qbTd1SvLW+INL/1QVR8PzfAMYKFA="; - }; - - vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E="; - - subPackages = [ "cmd/protoc-gen-go" ]; - - meta = with lib; { - description = "Go support for Google's protocol buffers"; - mainProgram = "protoc-gen-go"; - homepage = "https://google.golang.org/protobuf"; - license = licenses.bsd3; - maintainers = with maintainers; [ jojosch ]; - }; -} diff --git a/pkgs/development/tools/protoc-gen-twirp/default.nix b/pkgs/development/tools/protoc-gen-twirp/default.nix deleted file mode 100644 index 4f59af22d6e9..000000000000 --- a/pkgs/development/tools/protoc-gen-twirp/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "protoc-gen-twirp"; - version = "8.1.3"; - - src = fetchFromGitHub { - owner = "twitchtv"; - repo = "twirp"; - rev = "v${version}"; - sha256 = "sha256-p3gHVHGBHakOOQnJAuMK7vZumNXN15mOABuEHUG0wNs="; - }; - - postPatch = '' - go mod init github.com/twitchtv/twirp - ''; - - vendorHash = null; - - subPackages = [ - "protoc-gen-twirp" - ]; - - meta = with lib; { - description = "Simple RPC framework with protobuf service definitions"; - mainProgram = "protoc-gen-twirp"; - homepage = "https://github.com/twitchtv/twirp"; - license = licenses.asl20; - maintainers = with maintainers; [ jojosch ]; - }; -} diff --git a/pkgs/development/tools/protoc-gen-twirp_php/default.nix b/pkgs/development/tools/protoc-gen-twirp_php/default.nix deleted file mode 100644 index 5d12aa44beac..000000000000 --- a/pkgs/development/tools/protoc-gen-twirp_php/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildGoModule, fetchgit }: - -buildGoModule rec { - pname = "protoc-gen-twirp_php"; - version = "0.12.0"; - - # fetchFromGitHub currently not possible, because go.mod and go.sum are export-ignored - src = fetchgit { - url = "https://github.com/twirphp/twirp.git"; - rev = "v${version}"; - hash = "sha256-GDDycFWGrNXWdWNjGhb+W6kImF1nqVVH+dJ8VjYQ2MQ="; - }; - - vendorHash = "sha256-ErTXIbPKAFm8jBYRPuWSaCFbTS+5MPyto9edixbTR7E="; - - subPackages = [ "protoc-gen-twirp_php" ]; - - ldflags = [ - "-X main.version=${version}" - ]; - - meta = with lib; { - description = "PHP port of Twitch's Twirp RPC framework"; - mainProgram = "protoc-gen-twirp_php"; - homepage = "https://github.com/twirphp/twirp"; - license = licenses.mit; - maintainers = with maintainers; [ jojosch ]; - }; -} diff --git a/pkgs/development/tools/protoc-gen-twirp_swagger/default.nix b/pkgs/development/tools/protoc-gen-twirp_swagger/default.nix deleted file mode 100644 index 1445f60f676f..000000000000 --- a/pkgs/development/tools/protoc-gen-twirp_swagger/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule { - pname = "protoc-gen-twirp_swagger"; - version = "unstable-2021-03-29"; - - src = fetchFromGitHub { - owner = "elliots"; - repo = "protoc-gen-twirp_swagger"; - rev = "f21ef47d69e37c1602a7fb26146de05c092d30b6"; - sha256 = "sha256-uHU15NbHK7SYgNS3VK21H/OqDo/JyyTZdXw3i9lsgLY="; - }; - - vendorHash = "sha256-g0+9l83Fc0XPzsZAKjLBrjD+tv2+Fot57hcilqAhOZk="; - - subPackages = [ "." ]; - - meta = with lib; { - description = "Swagger generator for twirp"; - mainProgram = "protoc-gen-twirp_swagger"; - homepage = "https://github.com/elliots/protoc-gen-twirp_swagger"; - license = licenses.bsd3; - maintainers = with maintainers; [ jojosch ]; - }; -} diff --git a/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix b/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix deleted file mode 100644 index 340b21784712..000000000000 --- a/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule { - pname = "protoc-gen-twirp_typescript"; - version = "unstable-2022-08-14"; - - src = fetchFromGitHub { - owner = "larrymyers"; - repo = "protoc-gen-twirp_typescript"; - rev = "535986b31881a214db3c04f122bcc96a2823a155"; - sha256 = "sha256-LfF/n96LwRX8aoPHzCRI/QbDmZR9yMhE5yGhFAqa8nA="; - }; - - proxyVendor = true; - vendorHash = "sha256-UyxHa28SY60U8VeL7TbSTyscqN5T7tKGfuN2GIL6QIg"; - - subPackages = [ "." ]; - - meta = with lib; { - description = "Protobuf Plugin for Generating a Twirp Typescript Client"; - mainProgram = "protoc-gen-twirp_typescript"; - homepage = "https://github.com/larrymyers/protoc-gen-twirp_typescript"; - license = licenses.mit; - maintainers = with maintainers; [ jojosch dgollings ]; - }; -} diff --git a/pkgs/development/tools/protoc-gen-validate/default.nix b/pkgs/development/tools/protoc-gen-validate/default.nix deleted file mode 100644 index b8266c6f223b..000000000000 --- a/pkgs/development/tools/protoc-gen-validate/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "protoc-gen-validate"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "bufbuild"; - repo = "protoc-gen-validate"; - rev = "v${version}"; - sha256 = "sha256-QY7MqggMNYq6x1VkkWVGN07VZgkexe7mGj/+6QvJiHs="; - }; - - vendorHash = "sha256-DqM+Am7Pi0UTz7NxYOCMN9W3H6WipX4oRRa8ceMsYZ0="; - - excludedPackages = [ "tests" ]; - - meta = with lib; { - description = "Protobuf plugin for generating polyglot message validators"; - homepage = "https://github.com/envoyproxy/protoc-gen-validate"; - license = licenses.asl20; - maintainers = with maintainers; [ matthewpi ]; - }; -} diff --git a/pkgs/development/tools/protolint/default.nix b/pkgs/development/tools/protolint/default.nix deleted file mode 100644 index 7f58ceab0dba..000000000000 --- a/pkgs/development/tools/protolint/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: -buildGoModule rec { - pname = "protolint"; - version = "0.50.5"; - - src = fetchFromGitHub { - owner = "yoheimuta"; - repo = pname; - rev = "v${version}"; - hash = "sha256-dJurnM+AXdAd0/WBfnGT8KfpLmKHd5YAIZvMj5HHibI="; - }; - - vendorHash = "sha256-pjDVOD6McJdER+BbUckKt4WW/AXsCxdA2nNn8iWSlGE="; - - # Something about the way we run tests causes issues. It doesn't happen - # when using "go test" directly: - # === RUN TestEnumFieldNamesPrefixRule_Apply_fix/no_fix_for_a_correct_proto - # util_test.go:35: open : no such file or directory - # === RUN TestEnumFieldNamesPrefixRule_Apply_fix/fix_for_an_incorrect_proto - # util_test.go:35: open : no such file or directory - excludedPackages = [ "internal" ]; - - ldflags = let - rev = builtins.substring 0 7 src.rev; - in [ - "-X github.com/yoheimuta/protolint/internal/cmd.version=${version}" - "-X github.com/yoheimuta/protolint/internal/cmd.revision=${rev}" - "-X github.com/yoheimuta/protolint/internal/cmd/protocgenprotolint.version=${version}" - "-X github.com/yoheimuta/protolint/internal/cmd/protocgenprotolint.revision=${rev}" - ]; - - meta = with lib; { - description = "Pluggable linter and fixer to enforce Protocol Buffer style and conventions"; - homepage = "https://github.com/yoheimuta/protolint"; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ maintainers.zane ]; - mainProgram = "protolint"; - }; -} diff --git a/pkgs/development/tools/protoscope/default.nix b/pkgs/development/tools/protoscope/default.nix deleted file mode 100644 index 98ebbc995617..000000000000 --- a/pkgs/development/tools/protoscope/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "protoscope"; - version = "unstable-2022-11-09"; - - src = fetchFromGitHub { - owner = "protocolbuffers"; - repo = "protoscope"; - rev = "8e7a6aafa2c9958527b1e0747e66e1bfff045819"; - hash = "sha256-+VIy+CD6bKJzwtpHXRr9MqmsPE2MJ1dRdtvSMUkCh5I="; - }; - - vendorHash = "sha256-mK8eGo6oembs4nofvROn4g0+oO5E5/zQrmPKMe3xXik="; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Simple, human-editable language for representing and emitting the Protobuf wire format"; - mainProgram = "protoscope"; - homepage = "https://github.com/protocolbuffers/protoscope"; - license = licenses.asl20; - maintainers = with maintainers; [ aaronjheng ]; - }; -} diff --git a/pkgs/development/tools/prototool/default.nix b/pkgs/development/tools/prototool/default.nix deleted file mode 100644 index c65dad2bb717..000000000000 --- a/pkgs/development/tools/prototool/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, protobuf }: - -buildGoModule rec { - pname = "prototool"; - version = "1.10.0"; - - src = fetchFromGitHub { - owner = "uber"; - repo = pname; - rev = "v${version}"; - hash = "sha256-T6SjjyHC4j5du2P4Emcfq/ZFbuCpMPPJFJTHb/FNMAo="; - }; - - vendorHash = "sha256-W924cy6bd3V/ep3JmzUCV7iuYNukEetr90SKmLMH0j8="; - - nativeBuildInputs = [ makeWrapper ]; - - doCheck = false; - - postInstall = '' - wrapProgram "$out/bin/prototool" \ - --prefix PROTOTOOL_PROTOC_BIN_PATH : "${protobuf}/bin/protoc" \ - --prefix PROTOTOOL_PROTOC_WKT_PATH : "${protobuf}/include" - ''; - - subPackages = [ "cmd/prototool" ]; - - meta = with lib; { - homepage = "https://github.com/uber/prototool"; - description = "Your Swiss Army Knife for Protocol Buffers"; - mainProgram = "prototool"; - maintainers = [ ]; - license = licenses.mit; - }; -} diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix deleted file mode 100644 index bf055522254a..000000000000 --- a/pkgs/development/tools/pscale/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, installShellFiles -, lib -, pscale -, testers -}: - -buildGoModule rec { - pname = "pscale"; - version = "0.209.0"; - - src = fetchFromGitHub { - owner = "planetscale"; - repo = "cli"; - rev = "v${version}"; - sha256 = "sha256-XbGxFpkAVPhOShZWE6W/Z26NSOumB+1oh/o0zVVswL8="; - }; - - vendorHash = "sha256-5Uul5c8Lwu6SJ7DlLU8+k2Pxa3V/DhqdvK5xY2g6S40="; - - ldflags = [ - "-s" "-w" - "-X main.version=v${version}" - "-X main.commit=v${version}" - "-X main.date=unknown" - ]; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - installShellCompletion --cmd pscale \ - --bash <($out/bin/pscale completion bash) \ - --fish <($out/bin/pscale completion fish) \ - --zsh <($out/bin/pscale completion zsh) - ''; - - __darwinAllowLocalNetworking = true; - - passthru.tests.version = testers.testVersion { - package = pscale; - }; - - meta = with lib; { - description = "CLI for PlanetScale Database"; - mainProgram = "pscale"; - changelog = "https://github.com/planetscale/cli/releases/tag/v${version}"; - homepage = "https://www.planetscale.com/"; - license = licenses.asl20; - maintainers = with maintainers; [ pimeys kashw2 ]; - }; -} diff --git a/pkgs/development/tools/pulumictl/default.nix b/pkgs/development/tools/pulumictl/default.nix deleted file mode 100644 index b96c87bdf32c..000000000000 --- a/pkgs/development/tools/pulumictl/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "pulumictl"; - version = "0.0.46"; - - src = fetchFromGitHub { - owner = "pulumi"; - repo = "pulumictl"; - rev = "v${version}"; - sha256 = "sha256-7A6dx/5091FIQ2AB6C+Z2CjhTBx2e6iB21Du2u9EiHY="; - }; - - vendorHash = "sha256-Wktr3TXSIIzbkiT3Gk5i4K58gahnxySi6ht30li+Z0o="; - - ldflags = [ - "-s" "-w" "-X=github.com/pulumi/pulumictl/pkg/version.Version=${src.rev}" - ]; - - subPackages = [ "cmd/pulumictl" ]; - - meta = with lib; { - description = "Swiss Army Knife for Pulumi Development"; - mainProgram = "pulumictl"; - homepage = "https://github.com/pulumi/pulumictl"; - license = licenses.asl20; - maintainers = with maintainers; [ vincentbernat ]; - }; -} diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix deleted file mode 100644 index 3df3ef3bc42b..000000000000 --- a/pkgs/development/tools/pup/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "pup"; - version = "unstable-2022-03-06"; - - src = fetchFromGitHub { - owner = "ericchiang"; - repo = "pup"; - rev = "5a57cf111366c7c08999a34b2afd7ba36d58a96d"; - hash = "sha256-Ledg3xPbu71L5qUY033bru/lw03jws3s4YlAarIuqaA="; - }; - - vendorHash = "sha256-/MDSWIuSYNxKbTslqIooI2qKA8Pye0yJF2dY8g8qbWI="; - - meta = with lib; { - description = "Parsing HTML at the command line"; - mainProgram = "pup"; - homepage = "https://github.com/ericchiang/pup"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/pur/default.nix b/pkgs/development/tools/pur/default.nix deleted file mode 100644 index 3b79fbc2ce16..000000000000 --- a/pkgs/development/tools/pur/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -}: - -python3.pkgs.buildPythonApplication rec { - pname = "pur"; - version = "7.3.2"; - pyproject = true; - - src = fetchFromGitHub { - owner = "alanhamlett"; - repo = "pip-update-requirements"; - rev = "refs/tags/${version}"; - hash = "sha256-XLI9U9ej3+tS0zzmCDGwZ0pAb3mKnrqBtm90f5N6rMw="; - }; - - build-system = with python3.pkgs; [ - setuptools - ]; - - dependencies = with python3.pkgs; [ - click - ]; - - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; - - pythonImportsCheck = [ - "pur" - ]; - - meta = with lib; { - description = "Python library for update and track the requirements"; - homepage = "https://github.com/alanhamlett/pip-update-requirements"; - changelog = "https://github.com/alanhamlett/pip-update-requirements/blob/${version}/HISTORY.rst"; - license = licenses.bsd2; - maintainers = with maintainers; [ fab ]; - mainProgram = "pur"; - }; -} diff --git a/pkgs/development/tools/pxview/default.nix b/pkgs/development/tools/pxview/default.nix deleted file mode 100644 index 53698261560e..000000000000 --- a/pkgs/development/tools/pxview/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, perl, perlPackages, pxlib }: - -stdenv.mkDerivation rec { - pname = "pxview"; - version = "0.2.5"; - src = fetchurl { - url = "mirror://sourceforge/pxlib/${pname}_${version}.orig.tar.gz"; - sha256 = "1kpdqs6lvnyj02v9fbz1s427yqhgrxp7zw63rzfgiwd4iqp75139"; - }; - - buildInputs = [ pxlib perl ] ++ (with perlPackages; [ libxml_perl ]); - nativeBuildInputs = [ pkg-config ]; - - configureFlags = [ "--with-pxlib=${pxlib.out}" ]; - - # https://sourceforge.net/p/pxlib/bugs/12/ - LDFLAGS = "-lm"; - hardeningDisable = [ "format" ]; - - meta = with lib; { - description = "Program to convert Paradox databases"; - mainProgram = "pxview"; - homepage = "https://pxlib.sourceforge.net/pxview/"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.winpat ]; - }; -} diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix index 8522333ef9db..01d847649bbf 100644 --- a/pkgs/development/tools/py-spy/default.nix +++ b/pkgs/development/tools/py-spy/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { python3 ]; - buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # Pull a header that contains a definition of proc_pid_rusage(). darwin.apple_sdk_11_0.Libsystem ]; diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/development/tools/pyenv/default.nix deleted file mode 100644 index db91e04d6318..000000000000 --- a/pkgs/development/tools/pyenv/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, installShellFiles -}: - -stdenv.mkDerivation rec { - pname = "pyenv"; - version = "2.4.12"; - - src = fetchFromGitHub { - owner = "pyenv"; - repo = "pyenv"; - rev = "refs/tags/v${version}"; - hash = "sha256-ZvXtDD9HKwOJiUpR8ThqyCHWyMFs46dIrOgPMNpuHrY="; - }; - - nativeBuildInputs = [ - installShellFiles - ]; - - configureScript = "src/configure"; - - makeFlags = ["-C" "src"]; - - installPhase = '' - runHook preInstall - - mkdir -p "$out" - cp -R bin "$out/bin" - cp -R libexec "$out/libexec" - cp -R plugins "$out/plugins" - - runHook postInstall - ''; - - postInstall = '' - installManPage man/man1/pyenv.1 - installShellCompletion completions/pyenv.{bash,fish,zsh} - ''; - - meta = with lib; { - description = "Simple Python version management"; - homepage = "https://github.com/pyenv/pyenv"; - changelog = "https://github.com/pyenv/pyenv/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ tjni ]; - platforms = platforms.all; - mainProgram = "pyenv"; - }; -} diff --git a/pkgs/development/tools/pylint-exit/default.nix b/pkgs/development/tools/pylint-exit/default.nix deleted file mode 100644 index 6bd5591b57e9..000000000000 --- a/pkgs/development/tools/pylint-exit/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, fetchFromGitHub, python3Packages }: - -with python3Packages; buildPythonApplication rec { - pname = "pylint-exit"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "jongracecox"; - repo = pname; - rev = "v${version}"; - sha256 = "0hwfny48g394visa3xd15425fsw596r3lhkfhswpjrdk2mnk3cny"; - }; - - # Converting the shebang manually as it is not picked up by patchShebangs - postPatch = '' - substituteInPlace pylint_exit.py \ - --replace "#!/usr/local/bin/python" "#!${python.interpreter}" - ''; - - # See https://github.com/jongracecox/pylint-exit/pull/7 - buildInputs = [ m2r ]; - - # setup.py reads its version from the TRAVIS_TAG environment variable - TRAVIS_TAG = version; - - checkPhase = '' - ${python.interpreter} -m doctest pylint_exit.py - ''; - - meta = with lib; { - description = "Utility to handle pylint exit codes in an OS-friendly way"; - license = licenses.mit; - homepage = "https://github.com/jongracecox/pylint-exit"; - maintainers = [ maintainers.fabiangd ]; - }; -} diff --git a/pkgs/development/tools/pypi-mirror/default.nix b/pkgs/development/tools/pypi-mirror/default.nix deleted file mode 100644 index 9ed9a85ad54e..000000000000 --- a/pkgs/development/tools/pypi-mirror/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ fetchFromGitHub -, lib -, python3 -}: -python3.pkgs.buildPythonApplication rec { - pname = "pypi-mirror"; - version = "5.2.0"; - - src = fetchFromGitHub { - owner = "montag451"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-bvnOieNs8pCDKuCSJx88vRxFPcOGWUj/i3mNS6E/nok="; - }; - - pythonImportsCheck = [ "pypi_mirror" ]; - - meta = with lib; { - description = "Script to create a partial PyPI mirror"; - mainProgram = "pypi-mirror"; - homepage = "https://github.com/montag451/pypi-mirror"; - license = licenses.mit; - maintainers = with maintainers; [ kamadorueda ]; - }; -} diff --git a/pkgs/development/tools/qc/default.nix b/pkgs/development/tools/qc/default.nix deleted file mode 100644 index e02df42fa1cc..000000000000 --- a/pkgs/development/tools/qc/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "qc"; - version = "0.5.1"; - - src = fetchFromGitHub { - owner = "qownnotes"; - repo = "qc"; - rev = "v${version}"; - hash = "sha256-SrvcRF2yRGGPTk835ykG+NH9WPoc/bXO5tSj43Q7T3g="; - }; - - vendorHash = "sha256-7t5rQliLm6pMUHhtev/kNrQ7AOvmA/rR93SwNQhov6o="; - - ldflags = [ - "-s" "-w" "-X=github.com/qownnotes/qc/cmd.version=${version}" - ]; - - # There are no automated tests - doCheck = false; - - subPackages = [ "." ]; - - nativeBuildInputs = [ - installShellFiles - ]; - - postInstall = '' - export HOME=$(mktemp -d) - installShellCompletion --cmd qc \ - --bash <($out/bin/qc completion bash) \ - --fish <($out/bin/qc completion fish) \ - --zsh <($out/bin/qc completion zsh) - ''; - - meta = with lib; { - description = "QOwnNotes command-line snippet manager"; - mainProgram = "qc"; - homepage = "https://github.com/qownnotes/qc"; - license = licenses.mit; - maintainers = with maintainers; [ pbek totoroot ]; - }; -} diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 2f29a32e87ef..54831c7028f3 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 = "14.0.1"; + version = "14.0.2"; src = fetchurl { - url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - hash = "sha256-lZXS5sZbuRjng3YxQ0HcK+9JHDIApcbVzm8wVQmwsos="; + url = "mirror://qt/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; + hash = "sha256-stL4eLtpKKjm4w2HYAvdk89ATCYZoVHGS9zcjNB4OJI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/quick-lint-js/default.nix b/pkgs/development/tools/quick-lint-js/default.nix deleted file mode 100644 index 86b76bf99c07..000000000000 --- a/pkgs/development/tools/quick-lint-js/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ buildPackages, cmake, fetchFromGitHub, lib, ninja, stdenv, testers, quick-lint-js }: - -let - version = "3.2.0"; - - src = fetchFromGitHub { - owner = "quick-lint"; - repo = "quick-lint-js"; - rev = version; - hash = "sha256-L2LCRm1Fsg+xRdPc8YmgxDnuXJo92nxs862ewzObZ3I="; - }; - - quick-lint-js-build-tools = buildPackages.stdenv.mkDerivation { - pname = "quick-lint-js-build-tools"; - inherit version src; - - nativeBuildInputs = [ cmake ninja ]; - doCheck = false; - - cmakeFlags = [ - "-DQUICK_LINT_JS_ENABLE_BUILD_TOOLS=ON" - # Temporary workaround for https://github.com/NixOS/nixpkgs/pull/108496#issuecomment-1192083379 - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ]; - ninjaFlags = "quick-lint-js-build-tools"; - - installPhase = '' - runHook preInstall - cmake --install . --component build-tools - runHook postInstall - ''; - }; -in -stdenv.mkDerivation rec { - pname = "quick-lint-js"; - inherit version src; - - nativeBuildInputs = [ cmake ninja ]; - doCheck = true; - - cmakeFlags = [ - "-DQUICK_LINT_JS_USE_BUILD_TOOLS=${quick-lint-js-build-tools}/bin" - # Temporary workaround for https://github.com/NixOS/nixpkgs/pull/108496#issuecomment-1192083379 - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ]; - - passthru.tests = { - version = testers.testVersion { package = quick-lint-js; }; - }; - - meta = with lib; { - description = "Find bugs in Javascript programs"; - mainProgram = "quick-lint-js"; - homepage = "https://quick-lint-js.com"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ratsclub ]; - platforms = platforms.all; - }; - - # Expose quick-lint-js-build-tools to nix repl as quick-lint-js.build-tools. - passthru.build-tools = quick-lint-js-build-tools; -} diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix deleted file mode 100644 index a339c8e28961..000000000000 --- a/pkgs/development/tools/quicktemplate/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "quicktemplate"; - version = "1.7.0"; - - src = fetchFromGitHub { - owner = "valyala"; - repo = "quicktemplate"; - rev = "v${version}"; - sha256 = "0xzsvhpllmzmyfg8sj1dpp02826j1plmyrdvqbwryzhf2ci33nqr"; - }; - - vendorHash = null; - - meta = with lib; { - homepage = "https://github.com/valyala/quicktemplate"; - description = "Fast, powerful, yet easy to use template engine for Go"; - license = licenses.mit; - maintainers = with maintainers; [ Madouura ]; - mainProgram = "qtc"; - }; -} diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix deleted file mode 100644 index 4b7cfb59cf7d..000000000000 --- a/pkgs/development/tools/quilt/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, stdenv -, fetchurl -, makeWrapper -, bash -, coreutils -, diffstat -, diffutils -, findutils -, gawk -, gnugrep -, gnused -, patch -, perl -, unixtools -}: - -stdenv.mkDerivation rec { - - pname = "quilt"; - version = "0.68"; - - src = fetchurl { - url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-/owJ3gPBBuhbNzfI8DreFHyVa3ntevSFocijhY2zhCY="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ - bash - coreutils - diffstat - diffutils - findutils - gawk - gnugrep - gnused - patch - perl - unixtools.column - unixtools.getopt - ]; - - postInstall = '' - wrapProgram $out/bin/quilt --prefix PATH : ${lib.makeBinPath buildInputs} - ''; - - meta = with lib; { - homepage = "https://savannah.nongnu.org/projects/quilt"; - description = "Easily manage large numbers of patches"; - - longDescription = '' - Quilt allows you to easily manage large numbers of - patches by keeping track of the changes each patch - makes. Patches can be applied, un-applied, refreshed, - and more. - ''; - - license = licenses.gpl2Plus; - maintainers = with maintainers; [ smancill ]; - platforms = platforms.all; - }; - -} diff --git a/pkgs/development/tools/rain/default.nix b/pkgs/development/tools/rain/default.nix deleted file mode 100644 index 11e143dfda23..000000000000 --- a/pkgs/development/tools/rain/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, testers -, rain -}: - -buildGoModule rec { - pname = "rain"; - version = "1.15.0"; - - src = fetchFromGitHub { - owner = "aws-cloudformation"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-B+LSwZ1AugYhMlt1XcG8i8SIORO0vFMUxJrF6z3Crus="; - }; - - vendorHash = "sha256-JTKoEuO3D+/MO7FeSu1tiVqERkQiu2nG/KiEth1ylG0="; - - subPackages = [ "cmd/rain" ]; - - ldflags = [ "-s" "-w" ]; - - passthru.tests.version = testers.testVersion { - package = rain; - command = "rain --version"; - version = "v${version}"; - }; - - meta = with lib; { - description = "Development workflow tool for working with AWS CloudFormation"; - mainProgram = "rain"; - homepage = "https://github.com/aws-cloudformation/rain"; - license = licenses.asl20; - maintainers = with maintainers; [ jiegec ]; - }; -} diff --git a/pkgs/development/tools/rakkess/default.nix b/pkgs/development/tools/rakkess/default.nix deleted file mode 100644 index 6b101e0b890c..000000000000 --- a/pkgs/development/tools/rakkess/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "rakkess"; - version = "0.5.1"; - - src = fetchFromGitHub { - owner = "corneliusweig"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-igovWWk8GfNmOS/NbZWfv9kox6QLNIbM09jdvA/lL3A="; - }; - vendorHash = "sha256-lVxJ4wFBhHc8JVpkmqphLYPE9Z8Cr6o+aAHvC1naqyE="; - - ldflags = [ "-s" "-w" "-X github.com/corneliusweig/rakkess/internal/version.version=v${version}" ]; - - meta = with lib; { - homepage = "https://github.com/corneliusweig/rakkess"; - changelog = "https://github.com/corneliusweig/rakkess/releases/tag/v${version}"; - description = "Review Access - kubectl plugin to show an access matrix for k8s server resources"; - mainProgram = "rakkess"; - longDescription = '' - Have you ever wondered what access rights you have on a provided - kubernetes cluster? For single resources you can use - `kubectl auth can-i list deployments`, but maybe you are looking for a - complete overview? This is what rakkess is for. It lists access rights for - the current user and all server resources, similar to - `kubectl auth can-i --list`. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ jk ]; - }; -} diff --git a/pkgs/development/tools/rars/default.nix b/pkgs/development/tools/rars/default.nix deleted file mode 100644 index b1ce9eecde52..000000000000 --- a/pkgs/development/tools/rars/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, fetchurl, stdenvNoCC, makeWrapper, jre }: - -stdenvNoCC.mkDerivation rec { - pname = "rars"; - version = "1.6"; - - src = fetchurl { - url = "https://github.com/TheThirdOne/rars/releases/download/v${version}/rars1_6.jar"; - hash = "sha256-eA9zDrRXsbpgnpaKzMLIt32PksPZ2/MMx/2zz7FOjCQ="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - export JAR=$out/share/java/${pname}/${pname}.jar - install -D $src $JAR - makeWrapper ${jre}/bin/java $out/bin/${pname} \ - --add-flags "-jar $JAR" - runHook postInstall - ''; - - meta = with lib; { - description = "RISC-V Assembler and Runtime Simulator"; - mainProgram = "rars"; - homepage = "https://github.com/TheThirdOne/rars"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.mit; - maintainers = with maintainers; [ athas ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index a109b0ea579e..beae01a2c57e 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ ruby which - ] ++ lib.optional stdenv.isDarwin rustPlatform.bindgenHook; + ] ++ lib.optional stdenv.hostPlatform.isDarwin rustPlatform.bindgenHook; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/tools/rcodesign/default.nix b/pkgs/development/tools/rcodesign/default.nix deleted file mode 100644 index 72c261cfa0ed..000000000000 --- a/pkgs/development/tools/rcodesign/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "rcodesign"; - version = "0.22.0"; - - src = fetchFromGitHub { - owner = "indygreg"; - repo = "apple-platform-rs"; - rev = "apple-codesign/${version}"; - hash = "sha256-ndbDBGtTOfHHUquKrETe4a+hB5Za9samlnXwVGVvWy4="; - }; - - cargoHash = "sha256-cpQBdxTw/ge4VtzjdL2a2xgSeCT22fMIjuKu5UEedhI="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Security - ]; - - cargoBuildFlags = [ - # Only build the binary we want - "--bin" - "rcodesign" - ]; - - checkFlags = [ - # Does network IO - "--skip=ticket_lookup::test::lookup_ticket" - ]; - - meta = with lib; { - description = "Cross-platform CLI interface to interact with Apple code signing"; - mainProgram = "rcodesign"; - longDescription = '' - rcodesign provides various commands to interact with Apple signing, - including signing and notarizing binaries, generating signing - certificates, and verifying existing signed binaries. - - For more information, refer to the [documentation](https://gregoryszorc.com/docs/apple-codesign/stable/apple_codesign_rcodesign.html). - ''; - homepage = "https://github.com/indygreg/apple-platform-rs"; - license = licenses.mpl20; - maintainers = with maintainers; [ euank ]; - }; -} diff --git a/pkgs/development/tools/rdocker/default.nix b/pkgs/development/tools/rdocker/default.nix deleted file mode 100644 index fa823ec4d4c9..000000000000 --- a/pkgs/development/tools/rdocker/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, openssh }: - -stdenv.mkDerivation { - pname = "rdocker"; - version = "unstable-2018-07-17"; - - src = fetchFromGitHub { - owner = "dvddarias"; - repo = "rdocker"; - rev = "949377de0154ade2d28c6d4c4ec33b65ea813b5a"; - sha256 = "1mwg9zh144q4fqk9016v2d347vzch8sxlixaxrz0ci9dxvs6ibd4"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - install -Dm755 rdocker.sh $out/bin/rdocker - ''; - - postInstall = '' - wrapProgram $out/bin/rdocker \ - --prefix PATH : ${lib.makeBinPath [ openssh ]} - ''; - - meta = with lib; { - description = "Securely control a remote docker daemon CLI using ssh forwarding, no SSL setup needed"; - mainProgram = "rdocker"; - homepage = "https://github.com/dvddarias/rdocker"; - maintainers = [ lib.maintainers.pneumaticat ]; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix deleted file mode 100644 index 61d808e23c6d..000000000000 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ lib -, stdenv -, fetchurl -, unzip -, cairo -, xorg -, gdk-pixbuf -, fontconfig -, pango -, atk -, at-spi2-atk -, at-spi2-core -, gtk3 -, glib -, freetype -, dbus -, nss -, nspr -, alsa-lib -, cups -, expat -, udev -, makeDesktopItem -, libdrm -, libxkbcommon -, mesa -, makeWrapper -}: - -let - rpath = lib.makeLibraryPath [ - cairo - stdenv.cc.cc - gdk-pixbuf - fontconfig - pango - atk - gtk3 - glib - freetype - dbus - nss - nspr - alsa-lib - cups - expat - udev - at-spi2-atk - at-spi2-core - libdrm - libxkbcommon - mesa - - xorg.libX11 - xorg.libXcursor - xorg.libXtst - xorg.libxcb - xorg.libXext - xorg.libXi - xorg.libXdamage - xorg.libXrandr - xorg.libXcomposite - xorg.libXfixes - xorg.libXrender - xorg.libXScrnSaver - ]; -in -stdenv.mkDerivation rec { - pname = "react-native-debugger"; - version = "0.14.0"; - src = fetchurl { - url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip"; - sha256 = "sha256-RioBe0MAR47M84aavFaTJikGsJtcZDak8Tkg3WtX2l0="; - }; - - nativeBuildInputs = [ makeWrapper unzip ]; - buildCommand = '' - shopt -s extglob - mkdir -p $out - unzip $src -d $out - - mkdir $out/{lib,bin,share} - mv $out/{libEGL,libGLESv2,libvk_swiftshader,libffmpeg}.so $out/lib - mv $out/!(lib|share|bin) $out/share - - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath ${rpath}:$out/lib \ - $out/share/react-native-debugger - - wrapProgram $out/share/react-native-debugger \ - --add-flags --no-sandbox - - ln -s $out/share/react-native-debugger $out/bin/react-native-debugger - - install -Dm644 "${desktopItem}/share/applications/"* \ - -t $out/share/applications/ - ''; - - desktopItem = makeDesktopItem { - name = "rndebugger"; - exec = "react-native-debugger"; - desktopName = "React Native Debugger"; - genericName = "React Native Debugger"; - categories = [ "Development" "Debugger" ]; - }; - - meta = with lib; { - homepage = "https://github.com/jhen0409/react-native-debugger"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.mit; - description = "Standalone app based on official debugger of React Native, and includes React Inspector / Redux DevTools"; - mainProgram = "react-native-debugger"; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/react-static/default.nix b/pkgs/development/tools/react-static/default.nix deleted file mode 100644 index 5307f93a4b4c..000000000000 --- a/pkgs/development/tools/react-static/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, mkYarnPackage -, fetchFromGitHub -, fetchYarnDeps -}: - -mkYarnPackage rec { - pname = "react-static"; - version = "7.6.2"; - - src = fetchFromGitHub { - owner = "react-static"; - repo = "react-static"; - rev = "v${version}"; - hash = "sha256-dlYmD0vgEqWxYf7E0VYstZMAuNDGvQP7xDgHo/wmlUs="; - }; - - packageJSON = ./package.json; - - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; - hash = "sha256-SNnJPUzv+l2HXfA6NKYpJvn/DCX3a42JQ3N0+XYKbd8="; - }; - - buildPhase = '' - runHook preBuild - - yarn --cwd deps/react-static/packages/react-static --offline build - - runHook postBuild - ''; - - doDist = false; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/lib/node_modules" - mv deps/react-static/packages/react-static "$out/lib/node_modules" - mv node_modules "$out/lib/node_modules/react-static" - - ln -s "$out/lib/node_modules/react-static/bin" "$out" - - runHook postInstall - ''; - - meta = { - changelog = "https://github.com/react-static/react-static/blob/${src.rev}/CHANGELOG.md"; - description = "Progressive static site generator for React"; - homepage = "https://github.com/react-static/react-static"; - license = lib.licenses.mit; - mainProgram = "react-static"; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/react-static/package.json b/pkgs/development/tools/react-static/package.json deleted file mode 100644 index 70b873277fd2..000000000000 --- a/pkgs/development/tools/react-static/package.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "name": "react-static", - "description": "A progressive static site generator for React", - "version": "7.6.2", - "license": "MIT", - "repository": "https://github.com/react-static/react-static", - "main": "lib/index.js", - "types": "src/index.d.ts", - "engines": { - "node": ">=8.9.0" - }, - "bin": { - "react-static": "./bin/react-static" - }, - "scripts": { - "prebuild": "rimraf lib", - "build": "cross-env REACT_STATIC_INTERNAL=true babel src --out-dir lib --ignore \"**/__tests__/*\" --ignore \"**/__mocks__/*\" --source-maps inline", - "watch": "yarn build --watch", - "watch:link": "onchange './lib/**/*' -- yalc push --changed", - "start": "yarn watch", - "test": "yarn format && yarn lint && yarn unitTest", - "lint": "eslint src", - "format": "prettier README.md {src,templates/*/src}/**/*.js --write", - "unitTest": "cross-env NODE_ENV=test yarn jest ./src", - "unitTestWatch": "cross-env NODE_ENV=test yarn jest src --watch", - "preversion": "yarn build && yarn test", - "publishLink": "echo '{{event}} to {{changed}}' && yalc publish" - }, - "peerDependencies": { - "react": "^16.9.0", - "react-dom": "^16.9.0", - "react-hot-loader": "^4.12.11" - }, - "dependencies": { - "@babel/cli": "^7.5.5", - "@babel/core": "^7.5.5", - "@babel/plugin-proposal-class-properties": "^7.5.5", - "@babel/plugin-proposal-export-default-from": "^7.5.2", - "@babel/plugin-proposal-optional-chaining": "^7.2.0", - "@babel/plugin-syntax-dynamic-import": "^7.2.0", - "@babel/plugin-transform-destructuring": "^7.5.0", - "@babel/plugin-transform-modules-commonjs": "^7.5.0", - "@babel/plugin-transform-runtime": "^7.5.5", - "@babel/preset-env": "^7.5.5", - "@babel/preset-react": "^7.0.0", - "@babel/preset-stage-0": "^7.0.0", - "@babel/register": "^7.5.5", - "@babel/runtime": "^7.5.5", - "@reach/router": "^1.3.1", - "autoprefixer": "^9.7.4", - "axios": "^0.21.1", - "babel-core": "7.0.0-bridge.0", - "babel-loader": "^8.0.6", - "babel-plugin-macros": "^2.6.1", - "babel-plugin-transform-react-remove-prop-types": "^0.4.24", - "babel-plugin-universal-import": "^4.0.0", - "case-sensitive-paths-webpack-plugin": "^2.2.0", - "chalk": "^2.4.2", - "chokidar": "^3.0.2", - "circular-dependency-plugin": "^5.2.0", - "cors": "^2.8.5", - "css-loader": "^2.1.1", - "download-git-repo": "^2.0.0", - "extract-css-chunks-webpack-plugin": "^4.6.0", - "file-loader": "3.0.1", - "fs-extra": "^7.0.1", - "git-promise": "^1.0.0", - "glob": "^7.1.4", - "gunzip-maybe": "^1.4.1", - "html-webpack-plugin": "^3.2.0", - "inquirer": "^6.5.1", - "inquirer-autocomplete-prompt": "^1.0.1", - "intersection-observer": "^0.7.0", - "jsesc": "^2.5.2", - "match-sorter": "^3.1.1", - "minimist": "^1.2.0", - "mutation-observer": "^1.0.3", - "optimize-css-assets-webpack-plugin": "^5.0.3", - "portfinder": "^1.0.21", - "postcss-flexbugs-fixes": "^4.1.0", - "postcss-loader": "^3.0.0", - "pretty-error": "^2.1.1", - "progress": "^2.0.3", - "prop-types": "^15.7.2", - "raf": "^3.4.1", - "raw-loader": "^3.1.0", - "react-helmet": "^6.1.0", - "react-universal-component": "^4.0.0", - "resolve-from": "^5.0.0", - "serve": "^11.1.0", - "shorthash": "^0.0.2", - "slash": "^2.0.0", - "socket.io": "^2.2.0", - "socket.io-client": "^2.2.0", - "style-loader": "0.23.1", - "swimmer": "^1.4.0", - "tar-fs": "^2.0.0", - "terser-webpack-plugin": "^1.4.1", - "upath": "^1.1.2", - "url-loader": "^2.1.0", - "webpack": "^4.39.2", - "webpack-bundle-analyzer": "^3.4.1", - "webpack-dev-server": "^3.8.0", - "webpack-flush-chunks": "^2.0.3", - "webpack-node-externals": "^1.7.2" - }, - "devDependencies": { - "@types/react": "^16.9.1", - "@types/react-helmet": "^6.1.0", - "babel-jest": "^24.8.0", - "cors": "^2.8.5", - "cross-env": "^5.2.0", - "enzyme": "^3.10.0", - "enzyme-adapter-react-16": "^1.14.0", - "enzyme-to-json": "^3.4.0", - "eslint": "^6.1.0", - "eslint-config-prettier": "^6.0.0", - "eslint-config-react-tools": "^1.1.7", - "eslint-plugin-babel": "^5.3.0", - "eslint-plugin-import": "^2.18.2", - "eslint-plugin-jsx-a11y": "^6.2.3", - "eslint-plugin-react": "^7.14.3", - "express": "^4.17.1", - "husky": "^3.0.3", - "jest": "^24.8.0", - "lerna": "^3.16.4", - "onchange": "^6.0.0", - "prettier": "1.18.2", - "react": "^16.9.0", - "react-dev-utils": "^9.0.3", - "react-dom": "^16.9.0", - "react-hot-loader": "^4.12.11", - "rimraf": "^2.7.0", - "webpack-hot-middleware": "^2.25.0" - }, - "jest": { - "verbose": true, - "moduleDirectories": [ - "node_modules", - "src" - ], - "testRegex": "(/__tests__/.*\\.(test))\\.jsx?$", - "moduleNameMapper": { - "static.config.js$": "<rootDir>/src/static/__mocks__/static.config.js.mock.js" - }, - "setupFiles": [ - "<rootDir>/setupTests.js" - ], - "snapshotSerializers": [ - "enzyme-to-json/serializer" - ] - }, - "gitHead": "875004e6e75d36043382b8ec8bba27a766c1a83a" -} diff --git a/pkgs/development/tools/rebazel/default.nix b/pkgs/development/tools/rebazel/default.nix index d5979ac53dbd..4b9549b8a58a 100644 --- a/pkgs/development/tools/rebazel/default.nix +++ b/pkgs/development/tools/rebazel/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-cBAm8LyNKEVJkhZJ+QZU5XtQutb1oNvad8xH70Bi2LM="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; meta = with lib; { description = "tool for expediting bazel build workflows"; diff --git a/pkgs/development/tools/redisinsight/default.nix b/pkgs/development/tools/redisinsight/default.nix deleted file mode 100644 index 3889022daf97..000000000000 --- a/pkgs/development/tools/redisinsight/default.nix +++ /dev/null @@ -1,170 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - makeWrapper, - makeDesktopItem, - copyDesktopItems, - fixup-yarn-lock, - yarn, - nodejs_18, - python3, - fetchYarnDeps, - electron, - nest-cli, - libsass, - buildPackages, - pkg-config, - sqlite, - xdg-utils, -}: - -let - nodejs = nodejs_18; -in -stdenv.mkDerivation (finalAttrs: { - pname = "redisinsight"; - version = "2.48.0"; - - src = fetchFromGitHub { - owner = "RedisInsight"; - repo = "RedisInsight"; - rev = finalAttrs.version; - hash = "sha256-ek0Fp8v6j+mZPK2cEuFNrBgInXdYIKBBUg0UD1I51Sg="; - }; - - offlineCache = fetchYarnDeps { - yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-ohtU1h6wrg7asXDxTt1Jlzx9GaS3zDrGQD9P9tgzCOE="; - }; - - feOfflineCache = fetchYarnDeps { - yarnLock = finalAttrs.src + "/redisinsight/yarn.lock"; - hash = "sha256-9xbIdDeLUEk4eNeK7RTwidqDGinA8SPfcumqml66kTw="; - }; - - apiOfflineCache = fetchYarnDeps { - yarnLock = finalAttrs.src + "/redisinsight/api/yarn.lock"; - hash = "sha256-4zbffuneTceMEyKb8atTXTFhTv0DhrsRMdepZWgoxMQ="; - }; - - nativeBuildInputs = [ - yarn - fixup-yarn-lock - nodejs - makeWrapper - (python3.withPackages (ps: [ ps.setuptools ])) - nest-cli - libsass - pkg-config - copyDesktopItems - ]; - - buildInputs = [ - sqlite - xdg-utils - ]; - - configurePhase = '' - runHook preConfigure - - export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror ${finalAttrs.offlineCache} - fixup-yarn-lock yarn.lock - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - - yarn config --offline set yarn-offline-mirror ${finalAttrs.feOfflineCache} - fixup-yarn-lock redisinsight/yarn.lock - yarn --offline --cwd redisinsight/ --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - - yarn config --offline set yarn-offline-mirror ${finalAttrs.apiOfflineCache} - fixup-yarn-lock redisinsight/api/yarn.lock - yarn --offline --cwd redisinsight/api/ --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - - patchShebangs node_modules/ - patchShebangs redisinsight/node_modules/ - patchShebangs redisinsight/api/node_modules/ - - mkdir -p "$HOME/.node-gyp/${nodejs.version}" - echo 9 >"$HOME/.node-gyp/${nodejs.version}/installVersion" - ln -sfv "${nodejs}/include" "$HOME/.node-gyp/${nodejs.version}" - export npm_config_nodedir=${nodejs} - - # Build the sqlite3 package. - pushd redisinsight - npm_config_node_gyp="${buildPackages.nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" npm rebuild --verbose --sqlite=${sqlite.dev} sqlite3 - popd - - # Build node-sass - LIBSASS_EXT=auto npm rebuild --verbose node-sass - - substituteInPlace redisinsight/api/config/default.ts \ - --replace-fail "process['resourcesPath']" "\"$out/share/redisinsight\"" \ - - # has irrelevant files - rm -r resources/app - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - yarn config --offline set yarn-offline-mirror ${finalAttrs.offlineCache} - - yarn --offline build:prod - - yarn --offline electron-builder \ - --dir \ - -c.electronDist=${electron.dist} \ - -c.electronVersion=${electron.version} - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/share/redisinsight"/{app,defaults,static/plugins,static/resources/plugins} - - cp -r release/*-unpacked/{locales,resources{,.pak}} "$out/share/redisinsight/app" - mv "$out/share/redisinsight/app/resources/resources" "$out/share/redisinsight" - - # icons - for icon in "$out/share/redisinsight/resources/icons"/*.png; do - mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps" - ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/redisinsight.png" - done - - makeWrapper '${electron}/bin/electron' "$out/bin/redisinsight" \ - --add-flags "$out/share/redisinsight/app/resources/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ - --inherit-argv0 - - runHook postInstall - ''; - - desktopItems = [ - (makeDesktopItem { - name = "redisinsight"; - exec = "redisinsight %u"; - icon = "redisinsight"; - desktopName = "RedisInsight"; - genericName = "RedisInsight Redis Client"; - comment = finalAttrs.meta.description; - categories = [ "Development" ]; - startupWMClass = "redisinsight"; - }) - ]; - - meta = { - description = "RedisInsight Redis client powered by Electron"; - homepage = "https://github.com/RedisInsight/RedisInsight"; - license = lib.licenses.sspl; - maintainers = with lib.maintainers; [ - tomasajt - ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/development/tools/redoc-cli/default.nix b/pkgs/development/tools/redoc-cli/default.nix deleted file mode 100644 index de30e43d5eaf..000000000000 --- a/pkgs/development/tools/redoc-cli/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "redoc-cli"; - version = "0.13.21"; - - src = fetchFromGitHub { - owner = "Redocly"; - repo = "redoc"; - rev = "d3ac16f4774ae5b5f698b4e8f4c1d3f5a009d361"; - hash = "sha256-LmNb+m1Ng/53SPUqrr/AmxNMiWsrMGCKow0DW/9t3Do="; - }; - - sourceRoot = "${src.name}/cli"; - - npmDepsHash = "sha256-XL4D7+hb0zOxAr/aRo2UOg4UOip3oewbffsnkFddmWw="; - - postPatch = '' - ln -s npm-shrinkwrap.json package-lock.json - ''; - - dontNpmBuild = true; - - meta = { - description = "OpenAPI/Swagger-generated API Reference Documentation"; - homepage = "https://github.com/Redocly/redoc/tree/redoc-cli/cli"; - license = lib.licenses.mit; - mainProgram = "redoc-cli"; - maintainers = with lib.maintainers; [ veehaitch ]; - # https://github.com/NixOS/nixpkgs/issues/272217 - broken = true; - }; -} diff --git a/pkgs/development/tools/reflex/default.nix b/pkgs/development/tools/reflex/default.nix deleted file mode 100644 index 0c536d211421..000000000000 --- a/pkgs/development/tools/reflex/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: - -buildGoModule rec { - pname = "reflex"; - version = "0.3.1"; - - src = fetchFromGitHub { - owner = "cespare"; - repo = "reflex"; - rev = "v${version}"; - sha256 = "sha256-/2qVm2xpSFVspA16rkiIw/qckxzXQp/1EGOl0f9KljY="; - }; - - vendorHash = "sha256-JCtVYDHbhH2i7tGNK1jvgHCjU6gMMkNhQ2ZnlTeqtmA="; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Small tool to watch a directory and rerun a command when certain files change"; - mainProgram = "reflex"; - homepage = "https://github.com/cespare/reflex"; - license = licenses.mit; - maintainers = with maintainers; [ nicknovitski ]; - }; -} diff --git a/pkgs/development/tools/refmt/default.nix b/pkgs/development/tools/refmt/default.nix deleted file mode 100644 index 5946e75f3f20..000000000000 --- a/pkgs/development/tools/refmt/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: - -buildGoModule rec { - pname = "refmt"; - version = "1.6.1"; - - src = fetchFromGitHub { - owner = "rjeczalik"; - repo = "refmt"; - rev = "v${version}"; - sha256 = "sha256-HiAWSR2S+3OcIgwdQ0ltW37lcG+OHkDRDUF07rfNcJY="; - }; - - vendorHash = "sha256-MiYUDEF9W0VAiOX6uE8doXtGAekIrA1cfA8A2a7xd2I="; - - meta = with lib; { - description = "Reformat HCL <-> JSON <-> YAML"; - mainProgram = "refmt"; - homepage = "https://github.com/rjeczalik/refmt"; - license = licenses.agpl3Only; - maintainers = with lib.maintainers; [ deemp ]; - }; -} diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/development/tools/reftools/default.nix deleted file mode 100644 index 151f1accccf2..000000000000 --- a/pkgs/development/tools/reftools/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ buildGoModule -, lib -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "reftools"; - version = "unstable-2021-02-13"; - - src = fetchFromGitHub { - owner = "davidrjenni"; - repo = "reftools"; - rev = "40322ffdc2e46fd7920d1f8250051bbd2f3bd34d"; - sha256 = "sha256-fHWtUoVK3G0Kn69O6/D0blM6Q/u4LuLinT6sxF18nFo="; - }; - - vendorHash = null; - - doCheck = false; - - excludedPackages = "cmd/fillswitch/test-fixtures"; - - meta = with lib; { - description = "Refactoring tools for Go"; - homepage = "https://github.com/davidrjenni/reftools"; - license = licenses.bsd2; - maintainers = with maintainers; [ kalbasit ]; - }; -} diff --git a/pkgs/development/tools/refurb/default.nix b/pkgs/development/tools/refurb/default.nix deleted file mode 100644 index 83c0e04b1829..000000000000 --- a/pkgs/development/tools/refurb/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, fetchFromGitHub -, python3Packages -}: - -python3Packages.buildPythonApplication rec { - pname = "refurb"; - version = "2.0.0"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "dosisod"; - repo = "refurb"; - rev = "refs/tags/v${version}"; - hash = "sha256-6MchaqRKJPmvwiDyhCK4kFyIYl2B+2dGL8H8X2ES+VQ="; - }; - - nativeBuildInputs = with python3Packages; [ - poetry-core - ]; - - propagatedBuildInputs = with python3Packages; [ - mypy - mypy-extensions - tomli - typing-extensions - ]; - - nativeCheckInputs = with python3Packages; [ - attrs - click - colorama - iniconfig - mccabe - packaging - pathspec - platformdirs - pluggy - py - pyparsing - pytest-cov-stub - pytestCheckHook - ]; - - disabledTests = [ - "test_checks" # broken because new mypy release added new checks - ]; - - pythonImportsCheck = [ - "refurb" - ]; - - meta = with lib; { - description = "Tool for refurbishing and modernizing Python codebases"; - mainProgram = "refurb"; - homepage = "https://github.com/dosisod/refurb"; - license = with licenses; [ gpl3Only ]; - maintainers = with maintainers; [ knl ]; - }; -} diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/development/tools/regclient/default.nix deleted file mode 100644 index 3251014f5bfd..000000000000 --- a/pkgs/development/tools/regclient/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -, lndir -, testers -, regclient -}: - -let bins = [ "regbot" "regctl" "regsync" ]; in - -buildGoModule rec { - pname = "regclient"; - version = "0.7.1"; - tag = "v${version}"; - - src = fetchFromGitHub { - owner = "regclient"; - repo = "regclient"; - rev = tag; - sha256 = "sha256-QG0qwilYqsueyI3rzpNj9z8gYYRzIorlOID+baORgJU="; - }; - vendorHash = "sha256-gqnE3kfBLjV8CroYcJwa9QWCFOL/dBIblPQJZR2DW+4="; - - outputs = [ "out" ] ++ bins; - - ldflags = [ - "-s" - "-w" - "-X github.com/regclient/regclient/internal/version.vcsTag=${tag}" - ]; - - nativeBuildInputs = [ installShellFiles lndir ]; - - postInstall = lib.concatMapStringsSep "\n" - (bin: '' - export bin=''$${bin} - export outputBin=bin - - mkdir -p $bin/bin - mv $out/bin/${bin} $bin/bin - - installShellCompletion --cmd ${bin} \ - --bash <($bin/bin/${bin} completion bash) \ - --fish <($bin/bin/${bin} completion fish) \ - --zsh <($bin/bin/${bin} completion zsh) - - lndir -silent $bin $out - - unset bin outputBin - '') - bins; - - checkFlags = [ - # touches network - "-skip=^ExampleNew$" - ]; - - passthru.tests = lib.mergeAttrsList ( - map - (bin: { - "${bin}Version" = testers.testVersion { - package = regclient; - command = "${bin} version"; - version = tag; - }; - }) - bins - ); - - __darwinAllowLocalNetworking = true; - - meta = with lib; { - description = "Docker and OCI Registry Client in Go and tooling using those libraries"; - homepage = "https://github.com/regclient/regclient"; - license = licenses.asl20; - maintainers = with maintainers; [ maxbrunet ]; - }; -} diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix deleted file mode 100644 index f3d384c5bfa2..000000000000 --- a/pkgs/development/tools/reindeer/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, openssl -, stdenv -, libiconv -, darwin -, nix-update-script -}: - -rustPlatform.buildRustPackage rec { - pname = "reindeer"; - version = "2024.08.05.00"; - - src = fetchFromGitHub { - owner = "facebookincubator"; - repo = "reindeer"; - rev = "refs/tags/v${version}"; - hash = "sha256-888AFkVSQq8LvHi5x7N1BtiEe8s/V4FE/DJqiTf3NVQ="; - }; - - cargoHash = "sha256-bq+6lcetBUeVUxywsGLalfN48+alxAx3C1x/Gvtf7zM="; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] ++ lib.optionals stdenv.isDarwin [ - libiconv - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.CoreServices - ]; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Reindeer is a tool which takes Rust Cargo dependencies and generates Buck build rules"; - mainProgram = "reindeer"; - homepage = "https://github.com/facebookincubator/reindeer"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ nickgerace ]; - }; -} - diff --git a/pkgs/development/tools/relic/default.nix b/pkgs/development/tools/relic/default.nix deleted file mode 100644 index 3a66444f345c..000000000000 --- a/pkgs/development/tools/relic/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, testers -, relic -}: - -buildGoModule rec { - pname = "relic"; - version = "8.0.1"; - - src = fetchFromGitHub { - owner = "sassoftware"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-w7KU3XntkKep0mcuOUBSG4fJW14yCamioeRH5YrULSo="; - }; - - vendorHash = "sha256-/P4W+smY01feV1HP5Tsx0PsoOyp//ik7RVWuEaiSepY="; - - ldflags = [ - "-s" - "-w" - "-X=main.version=${version}" - "-X=main.commit=${src.rev}" - ]; - - passthru.tests = { - version = testers.testVersion { - package = relic; - }; - }; - - meta = with lib; { - homepage = "https://github.com/sassoftware/relic"; - description = "Service and a tool for adding digital signatures to operating system packages for Linux and Windows"; - mainProgram = "relic"; - license = licenses.asl20; - maintainers = with maintainers; [ strager ]; - }; -} diff --git a/pkgs/development/tools/remodel/default.nix b/pkgs/development/tools/remodel/default.nix index 2788f4fb11d8..83b32a7dd26f 100644 --- a/pkgs/development/tools/remodel/default.nix +++ b/pkgs/development/tools/remodel/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/tools/renderdoc/default.nix b/pkgs/development/tools/renderdoc/default.nix deleted file mode 100644 index beeeddeb70c5..000000000000 --- a/pkgs/development/tools/renderdoc/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ lib -, fetchFromGitHub -, nix-update-script -, cmake -, pkg-config -, mkDerivation -, qtbase -, qtx11extras -, qtsvg -, makeWrapper -, vulkan-loader -, libglvnd -, xorg -, python311 -, python311Packages -, bison -, pcre -, automake -, autoconf -, addDriverRunpath -, waylandSupport ? false -, wayland -}: -let - custom_swig = fetchFromGitHub { - owner = "baldurk"; - repo = "swig"; - rev = "renderdoc-modified-7"; - sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6"; - }; -in -mkDerivation rec { - pname = "renderdoc"; - version = "1.34"; - - src = fetchFromGitHub { - owner = "baldurk"; - repo = "renderdoc"; - rev = "v${version}"; - sha256 = "sha256-obRCILzMR7tCni0YoT3/oesTSADGI2sXqY3G6RS1h1o="; - }; - - buildInputs = [ - 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 addDriverRunpath ]; - - postUnpack = '' - cp -r ${custom_swig} swig - chmod -R +w swig - patchShebangs swig/autogen.sh - ''; - - cmakeFlags = [ - (lib.cmakeFeature "BUILD_VERSION_HASH" src.rev) - (lib.cmakeFeature "BUILD_VERSION_DIST_NAME" "NixOS") - (lib.cmakeFeature "BUILD_VERSION_DIST_VER" version) - (lib.cmakeFeature "BUILD_VERSION_DIST_CONTACT" "https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/graphics/renderdoc") - (lib.cmakeBool "BUILD_VERSION_STABLE" true) - (lib.cmakeBool "ENABLE_WAYLAND" waylandSupport) - ]; - - # TODO: define these in the above array via placeholders, once those are widely supported - preConfigure = '' - cmakeFlags+=" -DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/" - cmakeFlags+=" -DRENDERDOC_SWIG_PACKAGE=$PWD/../swig" - ''; - - dontWrapQtApps = true; - preFixup = '' - wrapQtApp $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib:${libglvnd}/lib" - wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib:${libglvnd}/lib" - ''; - - # The only documentation for this so far is in pkgs/build-support/add-opengl-runpath/setup-hook.sh - postFixup = '' - addDriverRunpath $out/lib/librenderdoc.so - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Single-frame graphics debugger"; - homepage = "https://renderdoc.org/"; - license = licenses.mit; - longDescription = '' - RenderDoc is a free MIT licensed stand-alone graphics debugger that - allows quick and easy single-frame capture and detailed introspection - of any application using Vulkan, D3D11, OpenGL or D3D12 across - Windows 7 - 10, Linux or Android. - ''; - maintainers = [ ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/development/tools/renderizer/default.nix deleted file mode 100644 index 18aea3041332..000000000000 --- a/pkgs/development/tools/renderizer/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "renderizer"; - version = "2.0.13"; - - src = fetchFromGitHub { - owner = "gomatic"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-jl98LuEsGN40L9IfybJhLnbzoYP/XpwFVQnjrlmDL9A="; - }; - - ldflags = [ - "-s" "-w" "-X main.version=${version}" "-X main.commitHash=${src.rev}" "-X main.date=19700101T000000" - ]; - - vendorHash = null; - - meta = with lib; { - description = "CLI to render Go template text files"; - mainProgram = "renderizer"; - inherit (src.meta) homepage; - license = licenses.gpl3; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/rep/default.nix b/pkgs/development/tools/rep/default.nix deleted file mode 100644 index 78b9c2612e42..000000000000 --- a/pkgs/development/tools/rep/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, asciidoc-full }: - -stdenv.mkDerivation rec { - pname = "rep"; - version = "0.2.2"; - - src = fetchFromGitHub { - owner = "eraserhd"; - repo = pname; - rev = "v${version}"; - sha256 = "pqmISVm3rYGxRuwKieVpRwXE8ufWnBHEA6h2hrob51s="; - }; - - nativeBuildInputs = [ - asciidoc-full - ]; - - postPatch = '' - substituteInPlace rc/rep.kak --replace '$(rep' '$('"$out/bin/rep" - ''; - makeFlags = [ "prefix=$(out)" ]; - - meta = with lib; { - description = "Single-shot nREPL client"; - mainProgram = "rep"; - homepage = "https://github.com/eraserhd/rep"; - license = licenses.epl10; - platforms = platforms.all; - maintainers = [ maintainers.eraserhd ]; - }; -} diff --git a/pkgs/development/tools/replay-io/default.nix b/pkgs/development/tools/replay-io/default.nix index 51daef23b527..4f65c853da4a 100644 --- a/pkgs/development/tools/replay-io/default.nix +++ b/pkgs/development/tools/replay-io/default.nix @@ -8,7 +8,7 @@ in rec { version = builtins.head (builtins.match ".*/linux-recordreplay-(.*).tgz" metadata.recordreplay.url); nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib openssl zlib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) openssl zlib ]; src = (fetchzip metadata.recordreplay); dontBuild = true; @@ -73,7 +73,7 @@ in rec { version = builtins.head (builtins.match ".*/linux-node-(.*)" metadata.replay-node.url); nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; src = (fetchurl metadata.replay-node); dontUnpack = true; @@ -114,7 +114,7 @@ in rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ stdenv.cc.cc.lib nodejs ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) nodejs ]; dontBuild = true; installPhase = '' runHook preInstall diff --git a/pkgs/development/tools/reshape/default.nix b/pkgs/development/tools/reshape/default.nix deleted file mode 100644 index 273b0577dc04..000000000000 --- a/pkgs/development/tools/reshape/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, darwin -, postgresqlTestHook -, postgresql -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "reshape"; - version = "0.7.0"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-wv2gKyXCEH+tnZkUUAisMbuseth3dsFiJujH8VO1ii4="; - }; - - cargoHash = "sha256-VTJ3FNhVLgxo/VVBhk1yF9UUktLXcbrEkYwoyoWFhXA="; - - buildInputs = - lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; - - nativeCheckInputs = [ - postgresqlTestHook - postgresql - ]; - - dontUseCargoParallelTests = true; - - postgresqlTestSetupPost = '' - export POSTGRES_CONNECTION_STRING="user=$PGUSER dbname=$PGDATABASE host=$PGHOST" - ''; - - postgresqlTestUserOptions = "LOGIN SUPERUSER"; - - meta = with lib; { - description = "Easy-to-use, zero-downtime schema migration tool for Postgres"; - mainProgram = "reshape"; - homepage = "https://github.com/fabianlindfors/reshape"; - changelog = "https://github.com/fabianlindfors/reshape/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ ilyakooo0 ]; - }; -} diff --git a/pkgs/development/tools/resolve-march-native/default.nix b/pkgs/development/tools/resolve-march-native/default.nix deleted file mode 100644 index a5db33e712ab..000000000000 --- a/pkgs/development/tools/resolve-march-native/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ python3Packages -, fetchFromGitHub -, gcc -, lib -}: - -python3Packages.buildPythonApplication rec { - pname = "resolve-march-native"; - version = "5.0.2"; - - src = fetchFromGitHub { - owner = "hartwork"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-fkiEWZvg/h8Gn0TL3Ov8aq2cAG5VncUTrVcUTRNOx+Y="; - }; - - # NB: The tool uses gcc at runtime to resolve the -march=native flags - propagatedBuildInputs = [ gcc ]; - - doCheck = true; - - meta = with lib; { - description = "Tool to determine what GCC flags -march=native would resolve into"; - mainProgram = "resolve-march-native"; - homepage = "https://github.com/hartwork/resolve-march-native"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovesegfault ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/revive/default.nix b/pkgs/development/tools/revive/default.nix deleted file mode 100644 index 927eb7b43c5f..000000000000 --- a/pkgs/development/tools/revive/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ buildGoModule, fetchFromGitHub, go, lib, makeWrapper }: - -buildGoModule rec { - pname = "revive"; - version = "1.4.0"; - - src = fetchFromGitHub { - owner = "mgechev"; - repo = pname; - rev = "v${version}"; - hash = "sha256-ViYNXZXvlOOpBjQuMAQXwcDtu1HoF+NstrOZzQcBOuQ="; - # 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; - postFetch = '' - date -u -d "@$(git -C $out log -1 --pretty=%ct)" "+%Y-%m-%d %H:%M UTC" > $out/DATE - git -C $out rev-parse HEAD > $out/COMMIT - rm -rf $out/.git - ''; - }; - vendorHash = "sha256-btuAXaJL8URkJvzPy+9tci5gOAqSkkNZn3mN2ox1Vfk="; - - ldflags = [ - "-s" - "-w" - "-X github.com/mgechev/revive/cli.version=${version}" - "-X github.com/mgechev/revive/cli.builtBy=nix" - ]; - - # ldflags based on metadata from git and source - preBuild = '' - ldflags+=" -X github.com/mgechev/revive/cli.commit=$(cat COMMIT)" - ldflags+=" -X 'github.com/mgechev/revive/cli.date=$(cat DATE)'" - ''; - - 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"; - mainProgram = "revive"; - homepage = "https://revive.run"; - license = licenses.mit; - maintainers = with maintainers; [ maaslalani ]; - }; -} diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix index 4e9f750520f9..85c04d53e801 100644 --- a/pkgs/development/tools/rgp/default.nix +++ b/pkgs/development/tools/rgp/default.nix @@ -23,15 +23,15 @@ }: let - buildNum = "2024-06-26-1341"; + buildNum = "2024-09-26-1411"; in stdenv.mkDerivation { pname = "rgp"; - version = "2.2"; + version = "2.3"; src = fetchurl { url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz"; - hash = "sha256-mpm4hxWyunq6Z6kdSuk4jqnYOTuLFVe+XzXZvHJPf/Q="; + hash = "sha256-mgIFDStgat4E+67TaSLrcwgWTu7zLf7Nkn6zBlgeVcQ="; }; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix deleted file mode 100644 index 3435572580ac..000000000000 --- a/pkgs/development/tools/richgo/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "richgo"; - version = "0.3.12"; - - src = fetchFromGitHub { - owner = "kyoh86"; - repo = "richgo"; - rev = "v${version}"; - sha256 = "sha256-pOB1exuwGwSxStodKhLLwh1xBvLjopUn0k+sEARdA9g="; - }; - - vendorHash = "sha256-jIzBN5T5+eTFCYOdS5hj3yTGOfU8NTrFmnIu+dDjVeU="; - - meta = with lib; { - description = "Enrich `go test` outputs with text decorations"; - mainProgram = "richgo"; - homepage = "https://github.com/kyoh86/richgo"; - license = licenses.mit; - maintainers = with maintainers; [ rvolosatovs ]; - }; -} diff --git a/pkgs/development/tools/riot-redis/default.nix b/pkgs/development/tools/riot-redis/default.nix deleted file mode 100644 index 755228361b1f..000000000000 --- a/pkgs/development/tools/riot-redis/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchzip -, jre_headless -, makeWrapper -}: - -stdenv.mkDerivation rec { - pname = "riot-redis"; - version = "2.19.0"; - - src = fetchzip { - url = "https://github.com/redis-developer/riot/releases/download/v${version}/riot-redis-${version}.zip"; - sha256 = "sha256-q2ZqFVdjg5HSH4kiwoC1W+a8VgHNxBgNeMaw5n97isc="; - }; - - buildInputs = [ jre_headless ]; - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp bin/riot-redis $out/bin - cp -R lib $out - chmod +x $out/bin/* - - wrapProgram $out/bin/riot-redis \ - --set JAVA_HOME "${jre_headless}" - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/redis-developer/riot"; - description = "Get data in and out of Redis"; - mainProgram = "riot-redis"; - license = licenses.asl20; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - maintainers = with maintainers; [ wesnel ]; - }; -} diff --git a/pkgs/development/tools/rojo/default.nix b/pkgs/development/tools/rojo/default.nix deleted file mode 100644 index 32ebfcf4189c..000000000000 --- a/pkgs/development/tools/rojo/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, pkg-config -, openssl -, darwin -}: - -let - inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; -in -rustPlatform.buildRustPackage rec { - pname = "rojo"; - version = "7.4.4"; - - src = fetchFromGitHub { - owner = "rojo-rbx"; - repo = "rojo"; - rev = "v${version}"; - hash = "sha256-5jiqR3gn3X+klcYr1zTEB9omxWwHKQNLKCVXhry1jjY="; - fetchSubmodules = true; - }; - - cargoHash = "sha256-J5297V6cHyWZYRyTTKM0V71QoHdHidtQCoAbQ2IoJrc="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - CoreServices - SystemConfiguration - ]; - - # reqwest's native-tls-vendored feature flag uses vendored openssl. this disables that - OPENSSL_NO_VENDOR = "1"; - - # tests flaky on darwin on hydra - doCheck = !stdenv.isDarwin; - - meta = with lib; { - description = "Project management tool for Roblox"; - mainProgram = "rojo"; - longDescription = '' - Rojo is a tool designed to enable Roblox developers to use professional-grade software engineering tools. - ''; - homepage = "https://rojo.space"; - downloadPage = "https://github.com/rojo-rbx/rojo/releases/tag/v${version}"; - changelog = "https://github.com/rojo-rbx/rojo/raw/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ wackbyte ]; - }; -} diff --git a/pkgs/development/tools/roswell/0001-get-image-from-environment.patch b/pkgs/development/tools/roswell/0001-get-image-from-environment.patch deleted file mode 100644 index 5eeaf514db95..000000000000 --- a/pkgs/development/tools/roswell/0001-get-image-from-environment.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 40c81f684ec2014ea63a712329f61c52aebe4dba Mon Sep 17 00:00:00 2001 -From: Valentin Boettcher <hiro@protagon.space> -Date: Wed, 4 Aug 2021 17:25:12 +0200 -Subject: [PATCH] get image from environment - ---- - src/cmd-run-sbcl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/cmd-run-sbcl.c b/src/cmd-run-sbcl.c -index a83b56c..dc472bb 100644 ---- a/src/cmd-run-sbcl.c -+++ b/src/cmd-run-sbcl.c -@@ -12,7 +12,7 @@ char** cmd_run_sbcl(int argc,char** argv,struct sub_command* cmd) { - char* impl_path=impldir(arch,os,impl,version); - char* help=get_opt("help",0); - char* script=get_opt("script",0); -- char* image=get_opt("image",0); -+ char* image=get_opt("image",1); - char* program=get_opt("program",0); - char* dynamic_space_size=get_opt("dynamic-space-size",1); - char* control_stack_size=get_opt("control-stack-size",1); --- -2.32.0 - diff --git a/pkgs/development/tools/roswell/default.nix b/pkgs/development/tools/roswell/default.nix deleted file mode 100644 index 0ec1dc8fe574..000000000000 --- a/pkgs/development/tools/roswell/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, curl -, autoconf -, automake -, makeWrapper -, sbcl -}: - -stdenv.mkDerivation rec { - pname = "roswell"; - version = "23.10.14.114"; - - src = fetchFromGitHub { - owner = "roswell"; - repo = pname; - rev = "v${version}"; - hash = "sha256-70BSwRKj1WPvWxQzWPrs8ECkcVosAUaX5cK7FaDUhRc="; - }; - - patches = [ - # Load the name of the image from the environment variable so that - # it can be consistently overwritten. Using the command line - # argument in the wrapper did not work. - ./0001-get-image-from-environment.patch - ]; - - preConfigure = '' - sh bootstrap - ''; - - configureFlags = [ "--prefix=${placeholder "out"}" ]; - - postInstall = '' - wrapProgram $out/bin/ros \ - --set image `basename $out` \ - --add-flags 'lisp=sbcl-bin/system sbcl-bin.version=system -L sbcl-bin' \ - --prefix PATH : ${lib.makeBinPath [ sbcl ]} --argv0 ros - ''; - - nativeBuildInputs = [ - autoconf - automake - makeWrapper - ]; - - buildInputs = [ - sbcl - curl - ]; - - meta = with lib; { - description = "Lisp implementation installer/manager and launcher"; - license = licenses.mit; - maintainers = with maintainers; [ hiro98 ]; - platforms = platforms.unix; - homepage = "https://github.com/roswell/roswell"; - changelog = "https://github.com/roswell/roswell/blob/v${version}/ChangeLog"; - mainProgram = "ros"; - }; -} diff --git a/pkgs/development/tools/rover/default.nix b/pkgs/development/tools/rover/default.nix index c70869299c9d..978935595fec 100644 --- a/pkgs/development/tools/rover/default.nix +++ b/pkgs/development/tools/rover/default.nix @@ -1,7 +1,8 @@ { lib , fetchFromGitHub -, perl +, pkg-config , rustPlatform +, openssl , darwin , stdenv }: @@ -19,16 +20,22 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Rf4kRXYW+WAF1rM7o8PmXBLgp/YyA8y/TqbZL22VOqI="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeBuildInputs = [ - perl + pkg-config ]; + env = { + OPENSSL_NO_VENDOR = true; + }; + # This test checks whether the plugins specified in the plugins json file are # valid by making a network call to the repo that houses their binaries; but, the # build env can't make network calls (impurity) diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix deleted file mode 100644 index b5624092c852..000000000000 --- a/pkgs/development/tools/rq/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "rq"; - version = "1.0.4"; - - src = fetchFromGitHub { - owner = "dflemstr"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-QyYTbMXikLSe3eYJRUALQJxUJjA6VlvaLMwGrxIKfZI="; - }; - - cargoHash = "sha256-WAgWc9rAQBjrsaHP6s3Djpg3iYmfRVC9J9yq0T/zMqA="; - - postPatch = '' - # Remove #[deny(warnings)] which is equivalent to -Werror in C. - # Prevents build failures when upgrading rustc, which may give more warnings. - substituteInPlace src/lib.rs \ - --replace "#![deny(warnings)]" "" - - # build script tries to get version information from git - # this fixes the --version output - rm build.rs - ''; - - VERGEN_SEMVER = version; - - meta = with lib; { - description = "Tool for doing record analysis and transformation"; - mainProgram = "rq"; - homepage = "https://github.com/dflemstr/rq"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ aristid Br1ght0ne figsoda ]; - }; -} diff --git a/pkgs/development/tools/rslint/default.nix b/pkgs/development/tools/rslint/default.nix deleted file mode 100644 index 28dfadd4cd75..000000000000 --- a/pkgs/development/tools/rslint/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "rslint"; - version = "0.3.2"; - - src = fetchFromGitHub { - owner = "rslint"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-3DEwi+bhqwP8aMpZYl07GZbe7IecraB3m54lZ5LViVc="; - }; - - cargoHash = "sha256-bqF5v52uxbvmVmphXAmcWlCI6nbQzZemCxlTcqhRDTY="; - - cargoBuildFlags = [ - "-p" "rslint_cli" - "-p" "rslint_lsp" - ]; - - meta = with lib; { - description = "Fast, customizable, and easy to use JavaScript and TypeScript linter"; - homepage = "https://rslint.org"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rstfmt/default.nix b/pkgs/development/tools/rstfmt/default.nix deleted file mode 100644 index f69c8c69bd5f..000000000000 --- a/pkgs/development/tools/rstfmt/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -}: - -python3.pkgs.buildPythonApplication rec { - pname = "rstfmt"; - version = "0.0.14"; - pyproject = true; - - src = fetchFromGitHub { - owner = "dzhu"; - repo = "rstfmt"; - rev = "refs/tags/v${version}"; - hash = "sha256-zvmKgNzfxyWYHoaD+q84I48r1Mpp4kU4oIGAwMSRRlA="; - }; - - build-system = with python3.pkgs; [ - setuptools - ]; - - dependencies = with python3.pkgs; [ - black - docutils - sphinx - ]; - - # Project has no unittest just sample files - doCheck = false; - - pythonImportsCheck = [ - "rstfmt" - ]; - - meta = with lib; { - description = "Formatter for reStructuredText"; - homepage = "https://github.com/dzhu/rstfmt"; - changelog = "https://github.com/dzhu/rstfmt/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 3710cb6122a8..b3f9e00a81a5 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config llvmPackages.llvm.dev ]; buildInputs = [ llvmPackages.llvm llvmPackages.libclang openssl emacs ] ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ] - ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; src = fetchFromGitHub { owner = "andersbakken"; diff --git a/pkgs/development/tools/rubyfmt/default.nix b/pkgs/development/tools/rubyfmt/default.nix index 287959dbf0b5..480826ab55d0 100644 --- a/pkgs/development/tools/rubyfmt/default.nix +++ b/pkgs/development/tools/rubyfmt/default.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { libxcrypt libyaml rust-jemalloc-sys-unprefixed - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ readline libiconv libobjc @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-QZ26GmsKyENkzdCGg2peie/aJhEt7KQAF/lwsibonDk="; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fdeclspec"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-fdeclspec"; preFixup = '' mv $out/bin/rubyfmt{-main,} @@ -78,7 +78,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/fables-tales/rubyfmt"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bobvanderlinden ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "rubyfmt"; }; } diff --git a/pkgs/development/tools/rucksack/default.nix b/pkgs/development/tools/rucksack/default.nix deleted file mode 100644 index 1aad7a5c8da1..000000000000 --- a/pkgs/development/tools/rucksack/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, liblaxjson, cmake, freeimage }: - -stdenv.mkDerivation rec { - version = "3.1.0"; - pname = "rucksack"; - - src = fetchFromGitHub { - owner = "andrewrk"; - repo = "rucksack"; - rev = version; - sha256 = "0bcm20hqxqnq1j0zghb9i7z9frri6bbf7rmrv5g8dd626sq07vyv"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ liblaxjson freeimage ]; - - meta = with lib; { - description = "Texture packer and resource bundler"; - platforms = [ "i686-linux" "x86_64-linux" ]; # fails on Darwin and AArch64 - homepage = "https://github.com/andrewrk/rucksack"; - license = licenses.mit; - maintainers = [ maintainers.andrewrk ]; - }; -} diff --git a/pkgs/development/tools/run/default.nix b/pkgs/development/tools/run/default.nix deleted file mode 100644 index 794fb32c5cfe..000000000000 --- a/pkgs/development/tools/run/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: -buildGoModule rec { - pname = "run"; - version = "0.11.2"; - - src = fetchFromGitHub { - owner = "TekWizely"; - repo = "run"; - rev = "v${version}"; - sha256 = "sha256-an5AuRJJEM18IssdLLZC/zzPpsVCCtawRQXK/AfzMN0="; - }; - - vendorHash = "sha256-BAyhuE9hGGDfDGmXQ7dseUvHlK5vC87uLT78lHSvLeg="; - - doCheck = false; - - meta = with lib; { - description = "Easily manage and invoke small scripts and wrappers"; - mainProgram = "run"; - homepage = "https://github.com/TekWizely/run"; - license = licenses.mit; - maintainers = with maintainers; [ rawkode Br1ght0ne ]; - }; -} diff --git a/pkgs/development/tools/rund/default.nix b/pkgs/development/tools/rund/default.nix deleted file mode 100644 index ef0701d9343e..000000000000 --- a/pkgs/development/tools/rund/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{stdenv, lib, fetchFromGitHub, ldc ? null, dcompiler ? ldc }: - -assert dcompiler != null; - -stdenv.mkDerivation rec { - pname = "rund"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "dragon-lang"; - repo = pname; - rev = "v${version}"; - sha256 = "10x6f1nn294r5qnpacrpcbp348dndz5fv4nz6ih55c61ckpkvgcf"; - }; - - buildInputs = [ dcompiler ]; - buildPhase = '' - for candidate in dmd ldmd2 gdmd; do - echo Checking for DCompiler $candidate ... - dc=$(type -P $candidate || echo "") - if [ ! "$dc" == "" ]; then - break - fi - done - if [ "$dc" == "" ]; then - exit "Error: could not find a D compiler" - fi - echo Using DCompiler $candidate - $dc -I=$src/src -i -run $src/make.d build --out $NIX_BUILD_TOP - ''; - - doCheck = true; - checkPhase = '' - $NIX_BUILD_TOP/rund make.d test - ''; - - installPhase = '' - mkdir -p $out/bin - mv $NIX_BUILD_TOP/rund $out/bin - ''; - - meta = with lib; { - description = "Compiler-wrapper that runs and caches D programs"; - mainProgram = "rund"; - homepage = "https://github.com/dragon-lang/rund"; - license = lib.licenses.boost; - maintainers = with maintainers; [ jonathanmarler ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/tools/rust-code-analysis/default.nix b/pkgs/development/tools/rust-code-analysis/default.nix deleted file mode 100644 index 7427a8bd76d6..000000000000 --- a/pkgs/development/tools/rust-code-analysis/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, rustPlatform, fetchCrate }: - -rustPlatform.buildRustPackage rec { - pname = "rust-code-analysis"; - version = "0.0.25"; - - src = fetchCrate { - pname = "rust-code-analysis-cli"; - inherit version; - hash = "sha256-/Irmtsy1PdRWQ7dTAHLZJ9M0J7oi2IiJyW6HeTIDOCs="; - }; - - cargoHash = "sha256-axrtFZQOm1/UUBq1CDFkaZCks1mWoLWmfajDfsqSBmY="; - - meta = with lib; { - description = "Analyze and collect metrics on source code"; - homepage = "https://github.com/mozilla/rust-code-analysis"; - license = with licenses; [ - mit # grammars - mpl20 # code - ]; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "rust-code-analysis-cli"; - }; -} diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 462eb6022c5a..1e2af744f9bc 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -1,4 +1,4 @@ -{ rust-bindgen-unwrapped, zlib, bash, runCommand, runCommandCC }: +{ lib, rust-bindgen-unwrapped, zlib, bash, runCommand, runCommandCC }: let clang = rust-bindgen-unwrapped.clang; self = runCommand "rust-bindgen-${rust-bindgen-unwrapped.version}" @@ -6,7 +6,7 @@ let #for substituteAll inherit bash; unwrapped = rust-bindgen-unwrapped; - libclang = clang.cc.lib; + libclang = (lib.getLib clang.cc); meta = rust-bindgen-unwrapped.meta // { longDescription = rust-bindgen-unwrapped.meta.longDescription + '' This version of bindgen is wrapped with the required compiler flags diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index a862878c9f7a..70e695cb1f05 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -5,20 +5,20 @@ let rustfmt-nightly = rustfmt.override { asNightly = true; }; in rustPlatform.buildRustPackage rec { pname = "rust-bindgen-unwrapped"; - version = "0.69.4"; + version = "0.70.1"; src = fetchCrate { pname = "bindgen-cli"; inherit version; - hash = "sha256-5fwJq1WsL3IEcVUjsyqKdQU8VufbbPk6TglwJg3C1Gw="; + hash = "sha256-6FRcW/VGqlmLjb64UYqk21HmQ8u0AdVD3S2F+9D/vQo="; }; - cargoHash = "sha256-UROy/MyPBKJe+EaiUIDbOYKVbge0C9LsmfnsvOLEONE="; + cargoHash = "sha256-oTeIh5278nckh5fFaEFjWht11ovGmN80MaLJl4k4NAs="; - buildInputs = [ clang.cc.lib ]; + buildInputs = [ (lib.getLib clang.cc) ]; preConfigure = '' - export LIBCLANG_PATH="${clang.cc.lib}/lib" + export LIBCLANG_PATH="${lib.getLib clang.cc}/lib" ''; doCheck = true; diff --git a/pkgs/development/tools/rust/bootimage/default.nix b/pkgs/development/tools/rust/bootimage/default.nix deleted file mode 100644 index 16dc55b64fbc..000000000000 --- a/pkgs/development/tools/rust/bootimage/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "bootimage"; - version = "0.10.3"; - - src = fetchFromGitHub { - owner = "rust-osdev"; - repo = pname; - rev = "v${version}"; - sha256 = "12p18mk3l473is3ydv3zmn6s7ck8wgjwavllimcpja3yjilxm3zg"; - }; - - cargoHash = "sha256-XXiZ0qfAS+SXOsiRAU/xBDShpPOr18JSGQfLh3mNXQ4="; - - meta = with lib; { - description = "Creates a bootable disk image from a Rust OS kernel"; - homepage = "https://github.com/rust-osdev/bootimage"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ dbeckwith ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-about/default.nix b/pkgs/development/tools/rust/cargo-about/default.nix deleted file mode 100644 index ee7da1db8890..000000000000 --- a/pkgs/development/tools/rust/cargo-about/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - pkg-config, - zstd, - stdenv, - darwin, -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-about"; - version = "0.6.4"; - - src = fetchFromGitHub { - owner = "EmbarkStudios"; - repo = "cargo-about"; - rev = version; - sha256 = "sha256-KFTG4FmmEji+0yNTwrunqOQuaU+qUcu1Vg7ZqoeUy4c="; - }; - - cargoHash = "sha256-bCw30ooQdSMRD3oM9BeUt9sJe5v+ketO73FjEypNy9s="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = - [ zstd ] - ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - env = { - ZSTD_SYS_USE_PKG_CONFIG = true; - }; - - meta = with lib; { - description = "Cargo plugin to generate list of all licenses for a crate"; - homepage = "https://github.com/EmbarkStudios/cargo-about"; - changelog = "https://github.com/EmbarkStudios/cargo-about/blob/${version}/CHANGELOG.md"; - license = with licenses; [ - mit # or - asl20 - ]; - maintainers = with maintainers; [ - evanjs - figsoda - matthiasbeyer - ]; - mainProgram = "cargo-about"; - }; -} diff --git a/pkgs/development/tools/rust/cargo-all-features/default.nix b/pkgs/development/tools/rust/cargo-all-features/default.nix deleted file mode 100644 index bb00a230a85e..000000000000 --- a/pkgs/development/tools/rust/cargo-all-features/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-all-features"; - version = "1.10.0"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-/w3Xd7PXUNtqzRYmUqJtth+GDuXSnsk1NiYCTYsHuAQ="; - }; - - cargoHash = "sha256-d69jj2FGptjndJG1tq3Fb/8F3kuFXN5otsYGhXYhhZg="; - - meta = with lib; { - description = "Cargo subcommand to build and test all feature flag combinations"; - homepage = "https://github.com/frewsxcv/cargo-all-features"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-apk/default.nix b/pkgs/development/tools/rust/cargo-apk/default.nix deleted file mode 100644 index c889f643b5cb..000000000000 --- a/pkgs/development/tools/rust/cargo-apk/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-apk"; - version = "0.9.6"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-1vCrM+0SNefd7FrRXnSjLhM3/MSVJfcL4k1qAstX+/A="; - }; - - cargoHash = "sha256-rGn3MKbqIRWayarsgedIOhuTTl8lyRsRxn7BN5Id97w="; - - meta = with lib; { - description = "Tool for creating Android packages"; - mainProgram = "cargo-apk"; - homepage = "https://github.com/rust-windowing/android-ndk-rs"; - license = with licenses;[ mit asl20 ]; - maintainers = with maintainers; [ nickcao ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix index 9c66f2cd9798..4e8cecb4a338 100644 --- a/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-asm/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-QsaOFman+VBSIAbCalW63I3QXY0uECZy9+ufOKhSQrA="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # Test checks against machine code output, which fails with some # LLVM/compiler versions. diff --git a/pkgs/development/tools/rust/cargo-audit/default.nix b/pkgs/development/tools/rust/cargo-audit/default.nix index 01f72f1bc421..9de3d6c9437c 100644 --- a/pkgs/development/tools/rust/cargo-audit/default.nix +++ b/pkgs/development/tools/rust/cargo-audit/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/cargo-bazel/default.nix b/pkgs/development/tools/rust/cargo-bazel/default.nix index 22567ad2d135..151f155f9ee1 100644 --- a/pkgs/development/tools/rust/cargo-bazel/default.nix +++ b/pkgs/development/tools/rust/cargo-bazel/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-+PVNB/apG5AR236Ikqt+JTz20zxc0HUi7z6BU6xq/Fw="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # `test_data` is explicitly excluded from the package published to crates.io, so tests cannot be run doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-benchcmp/default.nix b/pkgs/development/tools/rust/cargo-benchcmp/default.nix deleted file mode 100644 index 4ab9cb65d6f5..000000000000 --- a/pkgs/development/tools/rust/cargo-benchcmp/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, substituteAll -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-benchcmp"; - version = "0.4.4"; - - src = fetchFromGitHub { - owner = "BurntSushi"; - repo = "cargo-benchcmp"; - rev = version; - hash = "sha256-pg3/VUC1DQ7GbSQDfVZ0WNisXvzXy0O0pr2ik2ar2h0="; - }; - - cargoHash = "sha256-vxy9Ym3Twx034I1E5fWNnbP1ttfLolMbO1IgRiPfhRw="; - - patches = [ - # patch the binary path so tests can find the binary when `--target` is present - (substituteAll { - src = ./fix-test-binary-path.patch; - shortTarget = stdenv.hostPlatform.rust.rustcTarget; - }) - ]; - - checkFlags = [ - # thread 'different_input_colored' panicked at 'assertion failed: `(left == right)` - "--skip=different_input_colored" - ]; - - meta = with lib; { - description = "Small utility to compare Rust micro-benchmarks"; - mainProgram = "cargo-benchcmp"; - homepage = "https://github.com/BurntSushi/cargo-benchcmp"; - license = with licenses; [ mit unlicense ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-benchcmp/fix-test-binary-path.patch b/pkgs/development/tools/rust/cargo-benchcmp/fix-test-binary-path.patch deleted file mode 100644 index f4643e670ce6..000000000000 --- a/pkgs/development/tools/rust/cargo-benchcmp/fix-test-binary-path.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/tests/integration.rs -+++ b/tests/integration.rs -@@ -16,20 +16,13 @@ impl CommandUnderTest { - fn new() -> CommandUnderTest { - // To find the directory where the built binary is, we walk up the directory tree of the test binary until the - // parent is "target/". -- let mut binary_path = env::current_exe().expect("need current binary path to find binary to test"); -- loop { -- { -- let parent = binary_path.parent(); -- if parent.is_none() { -- panic!("Failed to locate binary path from original path: {:?}", env::current_exe()); -- } -- let parent = parent.unwrap(); -- if parent.is_dir() && parent.file_name().unwrap() == "target" { -- break; -- } -- } -- binary_path.pop(); -- } -+ let mut binary_path = PathBuf::from( -+ env::current_dir() -+ .unwrap() -+ .join("target") -+ .join("@shortTarget@") -+ .join(env!("cargoBuildType")), -+ ); - - binary_path.push( - if cfg!(target_os = "windows") { diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix deleted file mode 100644 index 205484f5fa70..000000000000 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, bzip2 -, xz -, zstd -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-binstall"; - version = "1.10.5"; - - src = fetchFromGitHub { - owner = "cargo-bins"; - repo = "cargo-binstall"; - rev = "v${version}"; - hash = "sha256-VhmyfGVO1rDcorOznovkUu0GHgUSwKHhk/3jqg1pDZk="; - }; - - cargoHash = "sha256-rgr++LD6YsTlrxKmNRtn2gdT5a1ul6A5UrXgKmpWC7w="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - bzip2 - xz - zstd - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - buildNoDefaultFeatures = true; - buildFeatures = [ - "fancy-no-backtrace" - "git" - "pkg-config" - "rustls" - "trust-dns" - "zstd-thin" - ]; - - cargoBuildFlags = [ "-p" "cargo-binstall" ]; - cargoTestFlags = [ "-p" "cargo-binstall" ]; - - checkFlags = [ - # requires internet access - "--skip=download::test::test_and_extract" - "--skip=gh_api_client::test::test_gh_api_client_cargo_binstall_no_such_release" - "--skip=gh_api_client::test::test_gh_api_client_cargo_binstall_v0_20_1" - ]; - - meta = with lib; { - description = "Tool for installing rust binaries as an alternative to building from source"; - mainProgram = "cargo-binstall"; - homepage = "https://github.com/cargo-bins/cargo-binstall"; - changelog = "https://github.com/cargo-bins/cargo-binstall/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-binutils/default.nix b/pkgs/development/tools/rust/cargo-binutils/default.nix deleted file mode 100644 index 0f7e53474f6f..000000000000 --- a/pkgs/development/tools/rust/cargo-binutils/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, rustPlatform, fetchCrate }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-binutils"; - version = "0.3.6"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-tRh3+X6QCdkkJE1O60ZRkDBRbznGZ1aB1AOmcz0EINI="; - }; - - cargoHash = "sha256-lZJcsCg7e5ZmClnzKFjm/roXBIyhkPTzS7R6BTmcNIk="; - - meta = with lib; { - description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain"; - longDescription = '' - In order for this to work, you either need to run `rustup component add llvm-tools-preview` or install the `llvm-tools-preview` component using your Nix library (e.g. fenix or rust-overlay) - ''; - homepage = "https://github.com/rust-embedded/cargo-binutils"; - changelog = "https://github.com/rust-embedded/cargo-binutils/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ stupremee matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch b/pkgs/development/tools/rust/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch deleted file mode 100644 index 3df226835ab9..000000000000 --- a/pkgs/development/tools/rust/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/src/toolchains.rs b/src/toolchains.rs -index 53a7ddb..795a711 100644 ---- a/src/toolchains.rs -+++ b/src/toolchains.rs -@@ -206,6 +206,8 @@ impl Toolchain { - })?; - } - -+ nix_patchelf(tmpdir.path().to_path_buf()) -+ .expect("failed to patch toolchain for NixOS"); - fs::rename(tmpdir.into_path(), dest).map_err(InstallError::Move) - } - -@@ -533,3 +535,42 @@ fn download_tarball( - res => res, - } - } -+ -+fn nix_patchelf(mut toolchain_path: PathBuf) -> io::Result<()> { -+ toolchain_path.push("bin"); -+ -+ for entry in toolchain_path.read_dir()? { -+ let entry = entry?; -+ if !entry.file_type()?.is_file() { -+ continue; -+ } -+ -+ eprintln!("info: you seem to be running NixOS. Attempting to patch {}", -+ entry.path().to_str().unwrap()); -+ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") -+ .arg("--set-interpreter") -+ .arg("@dynamicLinker@") -+ .arg(entry.path()) -+ .output(); -+ } -+ -+ toolchain_path.pop(); -+ toolchain_path.push("lib"); -+ -+ for entry in toolchain_path.read_dir()? { -+ let entry = entry?; -+ if !entry.file_type()?.is_file() { -+ continue; -+ } -+ -+ eprintln!("info: you seem to be running NixOS. Attempting to patch {}", -+ entry.path().to_str().unwrap()); -+ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") -+ .arg("--set-rpath") -+ .arg("@libPath@") -+ .arg(entry.path()) -+ .output(); -+ } -+ -+ Ok(()) -+} diff --git a/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix b/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix deleted file mode 100644 index 9babac9ebade..000000000000 --- a/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - darwin, - rustPlatform, - pkg-config, - openssl, - runCommand, - patchelf, - zlib, -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-bisect-rustc"; - version = "0.6.8"; - - src = fetchFromGitHub { - owner = "rust-lang"; - repo = pname; - rev = "v${version}"; - hash = "sha256-7HiM1oRuLSfRaum66duag/w8ncFdxRLF0yeSGlIey0Y="; - }; - - patches = - let - patchelfPatch = - runCommand "0001-dynamically-patchelf-binaries.patch" - { - CC = stdenv.cc; - patchelf = patchelf; - libPath = "$ORIGIN/../lib:${lib.makeLibraryPath [ zlib ]}"; - } - '' - export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) - substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ - --subst-var patchelf \ - --subst-var dynamicLinker \ - --subst-var libPath - ''; - in - lib.optionals stdenv.isLinux [ patchelfPatch ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - cargoHash = "sha256-CgEs0cejquFRY3VN6CgbE23Gipg+LEuWp/jSIkITrjw="; - - checkFlags = [ - "--skip test_github" # requires internet - ]; - - meta = with lib; { - description = "Bisects rustc, either nightlies or CI artifacts"; - mainProgram = "cargo-bisect-rustc"; - homepage = "https://github.com/rust-lang/cargo-bisect-rustc"; - license = with licenses; [ - asl20 - mit - ]; - maintainers = with maintainers; [ davidtwco ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-bitbake/default.nix b/pkgs/development/tools/rust/cargo-bitbake/default.nix deleted file mode 100644 index 91b491202220..000000000000 --- a/pkgs/development/tools/rust/cargo-bitbake/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, pkg-config, rustPlatform, fetchFromGitHub, openssl }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-bitbake"; - version = "0.3.16"; - - src = fetchFromGitHub { - owner = "meta-rust"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-+ovC4nZwHzf9hjfv2LcnTztM2m++tpC3mUSS/I0l6Ck="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; - - cargoHash = "sha256-LYdQ0FLfCopY8kPTCmiW0Qyx6sHA4nlb+hK9hXezGLg="; - - meta = with lib; { - description = "Cargo extension that can generate BitBake recipes utilizing the classes from meta-rust"; - mainProgram = "cargo-bitbake"; - homepage = "https://github.com/meta-rust/cargo-bitbake"; - license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ rvarago ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-bolero/default.nix b/pkgs/development/tools/rust/cargo-bolero/default.nix deleted file mode 100644 index cd082dca6c86..000000000000 --- a/pkgs/development/tools/rust/cargo-bolero/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, rustPlatform, fetchCrate, libbfd, libopcodes, libunwind, nix-update-script }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-bolero"; - version = "0.11.2"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-Xcu91CbIDBLSojWQJjvdFWJiqjMteAxF105lemCAipk="; - }; - - cargoHash = "sha256-QLtf42Il+XHWeaUdh8jNNWU1sXaVe82sYOKiHLoXw2M="; - - buildInputs = [ libbfd libopcodes libunwind ]; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "Fuzzing and property testing front-end framework for Rust"; - mainProgram = "cargo-bolero"; - homepage = "https://github.com/camshaft/bolero"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ ekleog ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix b/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix deleted file mode 100644 index 1a6cc5ca0746..000000000000 --- a/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-bundle-licenses"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "sstadick"; - repo = "cargo-bundle-licenses"; - rev = "v${version}"; - hash = "sha256-pWQU0IMahbFJR7oRUqnz73cB8yRbTpkh5NASmUKg0E0="; - }; - - cargoHash = "sha256-eUY3dyyWbqSqFqafdZ2AdI7vsH60vCRNk2cAGJw0ROk="; - - meta = with lib; { - description = "Generate a THIRDPARTY file with all licenses in a cargo project"; - mainProgram = "cargo-bundle-licenses"; - homepage = "https://github.com/sstadick/cargo-bundle-licenses"; - changelog = "https://github.com/sstadick/cargo-bundle-licenses/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-bundle/default.nix b/pkgs/development/tools/rust/cargo-bundle/default.nix deleted file mode 100644 index daf4bc230b8d..000000000000 --- a/pkgs/development/tools/rust/cargo-bundle/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, stdenv -, darwin -, libxkbcommon -, wayland -}: - -rustPlatform.buildRustPackage { - pname = "cargo-bundle"; - # the latest stable release fails to build on darwin - version = "unstable-2023-08-18"; - - src = fetchFromGitHub { - owner = "burtonageo"; - repo = "cargo-bundle"; - rev = "c9f7a182d233f0dc4ad84e10b1ffa0d44522ea43"; - hash = "sha256-n+c83pmCvFdNRAlcadmcZvYj+IRqUYeE8CJVWWYbWDQ="; - }; - - cargoHash = "sha256-Ea658jHomktmzXtU5wmd0bRX+i5n46hCvexYxYbjjUc="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ] ++ lib.optionals stdenv.isLinux [ - libxkbcommon - wayland - ]; - - meta = with lib; { - description = "Wrap rust executables in OS-specific app bundles"; - mainProgram = "cargo-bundle"; - homepage = "https://github.com/burtonageo/cargo-bundle"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index ca0f8a590ebd..3dd89aefe7ac 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-UfhIz87s0CLUDbIpWMPzGQ7qVmh14GuiFoquauSbTOw="; nativeBuildInputs = [ pkg-config (lib.getDev curl) ]; - buildInputs = [ openssl curl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl curl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation libiconv Security diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix index 1c19b61bf8b4..fc5da4b5b1cb 100644 --- a/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/pkgs/development/tools/rust/cargo-cache/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-275QREIcncgBk4ah/CivSz5N2m6s/XPCfp6JGChpr38="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; checkFlags = [ "offline_tests" ]; diff --git a/pkgs/development/tools/rust/cargo-careful/default.nix b/pkgs/development/tools/rust/cargo-careful/default.nix deleted file mode 100644 index 125a8a9b8056..000000000000 --- a/pkgs/development/tools/rust/cargo-careful/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-careful"; - version = "0.4.3"; - - src = fetchFromGitHub { - owner = "RalfJung"; - repo = "cargo-careful"; - rev = "v${version}"; - hash = "sha256-pYfyqsS+bGwSP6YZAtI+8iMXdID/hrCiX+cuYoYiZmc="; - }; - - cargoHash = "sha256-C+bnoYMO0Pjdgn4Q2Qb2COllMK0hnRNBwGd828o3AKE="; - - meta = with lib; { - description = "Tool to execute Rust code carefully, with extra checking along the way"; - mainProgram = "cargo-careful"; - homepage = "https://github.com/RalfJung/cargo-careful"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-chef/default.nix b/pkgs/development/tools/rust/cargo-chef/default.nix deleted file mode 100644 index b307704c76fb..000000000000 --- a/pkgs/development/tools/rust/cargo-chef/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, rustPlatform, fetchCrate }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-chef"; - version = "0.1.68"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-NTFrNSEIzHppwOOjI3VadjhdV6EgGUmJzyX5JmTsJoI="; - }; - - cargoHash = "sha256-DoIkK/tj3AYt0vm7u7f4SmgOKbdQZv3ZunMFT68+37E="; - - meta = with lib; { - description = "Cargo-subcommand to speed up Rust Docker builds using Docker layer caching"; - mainProgram = "cargo-chef"; - homepage = "https://github.com/LukeMathWalker/cargo-chef"; - license = licenses.mit; - maintainers = with maintainers; [ kkharji ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-clone/default.nix b/pkgs/development/tools/rust/cargo-clone/default.nix index c5e065eb2eaa..ee119146feaf 100644 --- a/pkgs/development/tools/rust/cargo-clone/default.nix +++ b/pkgs/development/tools/rust/cargo-clone/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration diff --git a/pkgs/development/tools/rust/cargo-codspeed/default.nix b/pkgs/development/tools/rust/cargo-codspeed/default.nix index 23880c2480fc..ce20d409df28 100644 --- a/pkgs/development/tools/rust/cargo-codspeed/default.nix +++ b/pkgs/development/tools/rust/cargo-codspeed/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/development/tools/rust/cargo-component/default.nix deleted file mode 100644 index fa8ba8accb04..000000000000 --- a/pkgs/development/tools/rust/cargo-component/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, openssl -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-component"; - version = "0.16.0"; - - src = fetchFromGitHub { - owner = "bytecodealliance"; - repo = "cargo-component"; - rev = "v${version}"; - hash = "sha256-MCsFcEdP8SaT6PiCidUD5DBjRdeS+YIrQHpKsAnL4gA="; - }; - - cargoHash = "sha256-Eif6e/6HHOLI4dvptQvk1LTIoaalCoVtXwM4CpEivcI="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - # requires the wasm32-wasi target - doCheck = false; - - meta = with lib; { - description = "Cargo subcommand for creating WebAssembly components based on the component model proposal"; - homepage = "https://github.com/bytecodealliance/cargo-component"; - changelog = "https://github.com/bytecodealliance/cargo-component/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "cargo-component"; - }; -} diff --git a/pkgs/development/tools/rust/cargo-cranky/default.nix b/pkgs/development/tools/rust/cargo-cranky/default.nix deleted file mode 100644 index cb83bf72b528..000000000000 --- a/pkgs/development/tools/rust/cargo-cranky/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-cranky"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "ericseppanen"; - repo = "cargo-cranky"; - rev = "v${version}"; - hash = "sha256-3ARl3z+2nz05UaKf8ChN6mvPY2qMjUNxGnGJ1P0xkas="; - }; - - cargoHash = "sha256-jmyrtaJTdZlffC7i5k7z9BEsHAs1rPTCs2/jgq1Jt6Y="; - - meta = with lib; { - description = "Easy to configure wrapper for Rust's clippy"; - mainProgram = "cargo-cranky"; - homepage = "https://github.com/ericseppanen/cargo-cranky"; - changelog = "https://github.com/ericseppanen/cargo-cranky/releases/tag/${src.rev}"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 0a2b797610d4..ab41565e01d9 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.25.9"; + version = "0.25.11"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "sha256-ZevtYJ1ibSs3an3m1KJNTTquz1w6UfTiFgd1mNHFHWE="; + sha256 = "sha256-suKnbCCJWKCDVGEmpddTphUfvuebBeiV+N/B6BIid88="; }; - cargoHash = "sha256-QHhfHm2fDFR5BpSnw1wzr3dfCWDTzWNDDdRtj2qOoKE="; + cargoHash = "sha256-U6pznzHE9yURptV+7rC63vIdD1HxRD+Vg9vemHk7G+Q="; preCheck = '' export HOME=$(mktemp -d) @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ perl pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration Security CoreFoundation libiconv curl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ SystemConfiguration Security CoreFoundation libiconv curl ]; nativeCheckInputs = [ git ]; diff --git a/pkgs/development/tools/rust/cargo-criterion/default.nix b/pkgs/development/tools/rust/cargo-criterion/default.nix deleted file mode 100644 index b139a4ce3a0c..000000000000 --- a/pkgs/development/tools/rust/cargo-criterion/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-criterion"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "bheisler"; - repo = pname; - rev = version; - sha256 = "sha256-RPix9DM6E32PhObvV3xPGrnXrrVHn3auxLUhysP8GM0="; - }; - - cargoHash = "sha256-L/ILHKWlcYTkbEi2qDu7tf/3NHfTl6GhW0s+fUlsW08="; - - meta = with lib; { - description = "Cargo extension for running Criterion.rs benchmarks"; - mainProgram = "cargo-criterion"; - homepage = "https://github.com/bheisler/cargo-criterion"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ humancalico matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-cross/default.nix b/pkgs/development/tools/rust/cargo-cross/default.nix deleted file mode 100644 index 772461683bf3..000000000000 --- a/pkgs/development/tools/rust/cargo-cross/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, nix-update-script -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-cross"; - version = "0.2.5"; - - src = fetchFromGitHub { - owner = "cross-rs"; - repo = "cross"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-TFPIQno30Vm5m2nZ2b3d0WPu/98UqANLhw3IZiE5a38="; - }; - - cargoHash = "sha256-x+DrKo79R8TAeLVuvIIguQs3gdAHiAQ9dUU2/eZRZ0c="; - - checkFlags = [ - "--skip=docker::shared::tests::directories::test_host" - ]; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "Zero setup cross compilation and cross testing"; - homepage = "https://github.com/cross-rs/cross"; - changelog = "https://github.com/cross-rs/cross/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ otavio ]; - mainProgram = "cross"; - }; -} diff --git a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix index 841a502a31f7..3fbb42c88aa1 100644 --- a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix +++ b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration CoreFoundation diff --git a/pkgs/development/tools/rust/cargo-deadlinks/default.nix b/pkgs/development/tools/rust/cargo-deadlinks/default.nix index d206e739bb83..b5e73fd9e0df 100644 --- a/pkgs/development/tools/rust/cargo-deadlinks/default.nix +++ b/pkgs/development/tools/rust/cargo-deadlinks/default.nix @@ -16,11 +16,14 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # uses internet "--skip non_existent_http_link --skip working_http_check" + # makes assumption about HTML paths that changed in rust 1.82.0 + "--skip simple_project::it_checks_okay_project_correctly" + "--skip cli_args::it_passes_arguments_through_to_cargo" ] ++ lib.optional (stdenv.hostPlatform.system != "x86_64-linux") # assumes the target is x86_64-unknown-linux-gnu "--skip simple_project::it_checks_okay_project_correctly"; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Cargo subcommand to check rust documentation for broken links"; diff --git a/pkgs/development/tools/rust/cargo-deb/default.nix b/pkgs/development/tools/rust/cargo-deb/default.nix deleted file mode 100644 index 56b46ff8bc9f..000000000000 --- a/pkgs/development/tools/rust/cargo-deb/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, makeWrapper -, dpkg -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-deb"; - version = "2.5.1"; - - src = fetchFromGitHub { - owner = "kornelski"; - repo = pname; - rev = "v${version}"; - hash = "sha256-COXYXx7C+IDJiw/y+GLY0oJYxtUjnGsikeWUk3z5B48="; - }; - - cargoHash = "sha256-5iU6jk8yZLVUjksB4g39zBtfm6LTeBgXOLsw/M5CZZc="; - - nativeBuildInputs = [ - makeWrapper - ]; - - # This is an FHS specific assert depending on glibc location - checkFlags = [ - "--skip=dependencies::resolve_test" - "--skip=run_cargo_deb_command_on_example_dir_with_separate_debug_symbols" - ]; - - postInstall = '' - wrapProgram $out/bin/cargo-deb \ - --prefix PATH : ${lib.makeBinPath [ dpkg ]} - ''; - - meta = with lib; { - description = "Cargo subcommand that generates Debian packages from information in Cargo.toml"; - mainProgram = "cargo-deb"; - homepage = "https://github.com/kornelski/cargo-deb"; - license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix deleted file mode 100644 index 573bdb96db02..000000000000 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, zstd -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-deny"; - version = "0.16.1"; - - src = fetchFromGitHub { - owner = "EmbarkStudios"; - repo = "cargo-deny"; - rev = version; - hash = "sha256-RfXKTACAVmQffOFHpQHDi/BgiMNRVuS8j4aLslMYL1Q="; - }; - - cargoHash = "sha256-ywDjdlPhqqs740zGcwA8Ee9/TQ/sEiulSgGSejY41oY="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - zstd - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - env = { - ZSTD_SYS_USE_PKG_CONFIG = true; - }; - - # tests require internet access - doCheck = false; - - meta = with lib; { - description = "Cargo plugin to generate list of all licenses for a crate"; - mainProgram = "cargo-deny"; - homepage = "https://github.com/EmbarkStudios/cargo-deny"; - changelog = "https://github.com/EmbarkStudios/cargo-deny/blob/${version}/CHANGELOG.md"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ figsoda matthiasbeyer jk ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-depgraph/default.nix b/pkgs/development/tools/rust/cargo-depgraph/default.nix deleted file mode 100644 index c4379974a6ab..000000000000 --- a/pkgs/development/tools/rust/cargo-depgraph/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, rustPlatform, fetchFromSourcehut }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-depgraph"; - version = "1.6.0"; - - src = fetchFromSourcehut { - owner = "~jplatte"; - repo = "cargo-depgraph"; - rev = "v${version}"; - hash = "sha256-yvcKRESX2W1oLmQvkl07iG8+I74qDKsaS3amM4pZU8s="; - }; - - cargoHash = "sha256-OJOw0V4u/bK4vw3bU2wKVeOqP205ehfZMKJ6qIpYDLU="; - - meta = with lib; { - description = "Create dependency graphs for cargo projects using `cargo metadata` and graphviz"; - mainProgram = "cargo-depgraph"; - homepage = "https://sr.ht/~jplatte/cargo-depgraph"; - changelog = "https://git.sr.ht/~jplatte/cargo-depgraph/tree/${src.rev}/item/CHANGELOG.md"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-dephell/Cargo.lock b/pkgs/development/tools/rust/cargo-dephell/Cargo.lock deleted file mode 100644 index 832a4a283791..000000000000 --- a/pkgs/development/tools/rust/cargo-dephell/Cargo.lock +++ /dev/null @@ -1,2548 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[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 = "anyhow" -version = "1.0.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "askama" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134" -dependencies = [ - "askama_derive", - "askama_escape", - "askama_shared", -] - -[[package]] -name = "askama_derive" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522" -dependencies = [ - "askama_shared", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "askama_escape" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" - -[[package]] -name = "askama_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d6083ccb191711e9c2b80b22ee24a8381a18524444914c746d4239e21d1afaf" -dependencies = [ - "askama_escape", - "humansize", - "nom", - "num-traits", - "percent-encoding", - "proc-macro2", - "quote", - "serde", - "syn 1.0.109", - "toml", -] - -[[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 = "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 = "bitmaps" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" -dependencies = [ - "typenum", -] - -[[package]] -name = "bitvec" -version = "0.19.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] -name = "bstr" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" - -[[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 = "bytesize" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38fcc2979eff34a4b84e1cf9a1e3da42a7d44b3b690a40cdcb23e3d556cfb2e5" - -[[package]] -name = "camino" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" - -[[package]] -name = "cargo" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d89cbdcbeada632f64aa9f692e265852b0eb6ccdf3b1814716cc62101eeb6" -dependencies = [ - "anyhow", - "atty", - "bytesize", - "cargo-platform", - "clap", - "core-foundation", - "crates-io", - "crossbeam-utils", - "crypto-hash", - "curl", - "curl-sys", - "env_logger", - "filetime", - "flate2", - "fwdansi", - "git2", - "git2-curl", - "glob", - "hex 0.4.3", - "home", - "humantime", - "ignore", - "im-rc", - "jobserver", - "lazy_static", - "lazycell", - "libc", - "libgit2-sys", - "log", - "memchr", - "miow 0.3.7", - "num_cpus", - "opener", - "percent-encoding", - "rustc-workspace-hack", - "rustfix", - "same-file", - "semver 0.10.0", - "serde", - "serde_ignored", - "serde_json", - "shell-escape", - "strip-ansi-escapes", - "tar", - "tempfile", - "termcolor", - "toml", - "unicode-width", - "unicode-xid", - "url", - "walkdir", - "winapi 0.3.9", -] - -[[package]] -name = "cargo-dephell" -version = "0.5.1" -dependencies = [ - "askama", - "base64", - "camino", - "cargo", - "cargo_metadata", - "chrono", - "clap", - "glob", - "guppy", - "ignore", - "loc", - "regex", - "reqwest", - "serde", - "serde_json", - "tempdir", -] - -[[package]] -name = "cargo-platform" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7714a157da7991e23d90686b9524b9e12e0407a108647f52e9328f4b3d51ac7f" -dependencies = [ - "cargo-platform", - "semver 0.11.0", - "semver-parser 0.10.2", - "serde", - "serde_json", -] - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" -dependencies = [ - "jobserver", -] - -[[package]] -name = "cfg-expr" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30aa9e2ffbb838c6b451db14f3cd8e63ed622bf859f9956bc93845a10fafc26a" -dependencies = [ - "smallvec 1.10.0", -] - -[[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", - "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 = "commoncrypto" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007" -dependencies = [ - "commoncrypto-sys", -] - -[[package]] -name = "commoncrypto-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2" -dependencies = [ - "libc", -] - -[[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 = "crates-io" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f977948a46e9edf93eb3dc2d7a8dd4ce3105d36de63300befed37cdf051d4a" -dependencies = [ - "anyhow", - "curl", - "percent-encoding", - "serde", - "serde_derive", - "serde_json", - "url", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[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 = "crypto-hash" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a77162240fd97248d19a564a565eb563a3f592b386e4136fb300909e67dddca" -dependencies = [ - "commoncrypto", - "hex 0.3.2", - "openssl", - "winapi 0.3.9", -] - -[[package]] -name = "curl" -version = "0.4.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2 0.4.9", - "winapi 0.3.9", -] - -[[package]] -name = "curl-sys" -version = "0.4.61+curl-8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d05c10f541ae6f3bc5b3d923c20001f47db7d5f0b2bc6ad16490133842db79" -dependencies = [ - "cc", - "libc", - "libnghttp2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "winapi 0.3.9", -] - -[[package]] -name = "deque" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a694dae478589798d752c7125542f8a5ae8b6e59476172baf2eed67357bdfa27" - -[[package]] -name = "edit-distance" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbbaaaf38131deb9ca518a274a45bfdb8771f139517b073b16c2d3d32ae5037b" - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[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 = "env_logger" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[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 = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "filetime" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.2.16", - "windows-sys 0.48.0", -] - -[[package]] -name = "fixedbitset" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" - -[[package]] -name = "flate2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" -dependencies = [ - "crc32fast", - "libz-sys", - "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 = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[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 = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - -[[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 = "fwdansi" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c1f5787fe85505d1f7777268db5103d80a7a374d2316a7ce262e57baf8f208" -dependencies = [ - "memchr", - "termcolor", -] - -[[package]] -name = "git2" -version = "0.13.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29229cc1b24c0e6062f6e742aa3e256492a5323365e5ed3413599f8a5eff7d6" -dependencies = [ - "bitflags", - "libc", - "libgit2-sys", - "log", - "openssl-probe", - "openssl-sys", - "url", -] - -[[package]] -name = "git2-curl" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "883539cb0ea94bab3f8371a98cd8e937bbe9ee7c044499184aa4c17deb643a50" -dependencies = [ - "curl", - "git2", - "log", - "url", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globset" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" -dependencies = [ - "aho-corasick 0.7.20", - "bstr", - "fnv", - "log", - "regex", -] - -[[package]] -name = "guppy" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec4cbddce827d660864974dc3dc62a1c810e813d17e518cc5830716b977cd110" -dependencies = [ - "camino", - "cargo_metadata", - "fixedbitset", - "indexmap", - "itertools", - "nested", - "once_cell", - "pathdiff", - "petgraph", - "semver 0.11.0", - "serde", - "serde_json", - "supercow", - "target-spec", -] - -[[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 = "hex" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "home" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" -dependencies = [ - "windows-sys 0.48.0", -] - -[[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 = "humansize" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[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 0.3.19", - "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.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" -dependencies = [ - "globset", - "lazy_static", - "log", - "memchr", - "regex", - "same-file", - "thread_local", - "walkdir", - "winapi-util", -] - -[[package]] -name = "im-rc" -version = "15.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1955a75fa080c677d3972822ec4bad316169ab1cfc6c257a942c2265dbe5fe" -dependencies = [ - "bitmaps", - "rand_core 0.6.4", - "rand_xoshiro", - "sized-chunks", - "typenum", - "version_check", -] - -[[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 = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[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 = "jobserver" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] - -[[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 = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "lexical-core" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" -dependencies = [ - "arrayvec", - "bitflags", - "cfg-if 1.0.0", - "ryu", - "static_assertions", -] - -[[package]] -name = "libc" -version = "0.2.144" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" - -[[package]] -name = "libgit2-sys" -version = "0.12.26+1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e1c899248e606fbfe68dcb31d8b0176ebab833b103824af31bddf4b7457494" -dependencies = [ - "cc", - "libc", - "libssh2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", -] - -[[package]] -name = "libnghttp2-sys" -version = "0.1.7+1.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "libssh2-sys" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" - -[[package]] -name = "loc" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19667875e98831e0135a1eb4e7ddc775b09dd317809e34e0d0fc8172443c85e3" -dependencies = [ - "clap", - "deque", - "edit-distance", - "ignore", - "memchr", - "num_cpus", - "regex", - "smallvec 0.6.14", -] - -[[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 = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[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 = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[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 0.2.2", - "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 = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi 0.3.9", -] - -[[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 = "nested" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b420f638f07fe83056b55ea190bb815f609ec5a35e7017884a10f78839c9e" - -[[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 = "nom" -version = "6.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" -dependencies = [ - "bitvec", - "funty", - "lexical-core", - "memchr", - "version_check", -] - -[[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 = "opener" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13117407ca9d0caf3a0e74f97b490a7e64c0ae3aa90a8b7085544d0c37b6f3ae" -dependencies = [ - "winapi 0.3.9", -] - -[[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 = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pest" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e68e84bfb01f0507134eac1e9b410a12ba379d064eab48c50ba4ce329a527b70" -dependencies = [ - "thiserror", - "ucd-trie", -] - -[[package]] -name = "petgraph" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[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 = "proc-macro2" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" - -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi 0.3.9", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" - -[[package]] -name = "rand_xoshiro" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" -dependencies = [ - "rand_core 0.6.4", -] - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" -dependencies = [ - "aho-corasick 1.0.1", - "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 = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi 0.3.9", -] - -[[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", - "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", - "tokio", - "tokio-tls", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[package]] -name = "rustc-workspace-hack" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc71d2faa173b74b232dedc235e3ee1696581bb132fc116fa3626d6151a1a8fb" - -[[package]] -name = "rustfix" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2c50b74badcddeb8f7652fa8323ce440b95286f8e4b64ebfd871c609672704e" -dependencies = [ - "anyhow", - "log", - "serde", - "serde_json", -] - -[[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 = "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.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.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190" -dependencies = [ - "semver-parser 0.7.0", - "serde", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser 0.10.2", - "serde", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - -[[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_ignored" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94eb4a4087ba8bdf14a9208ac44fddbf55c01a6195f7edfc511ddaff6cae45a6" -dependencies = [ - "serde", -] - -[[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.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 = "shell-escape" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" - -[[package]] -name = "sized-chunks" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" -dependencies = [ - "bitmaps", - "typenum", -] - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" -dependencies = [ - "maybe-uninit", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[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 = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strip-ansi-escapes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "011cbb39cf7c1f62871aea3cc46e5817b0937b49e9447370c93cacbe93a766d8" -dependencies = [ - "vte", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "supercow" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171758edb47aa306a78dfa4ab9aeb5167405bd4e3dc2b64e88f6a84bbe98bd63" - -[[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 = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "tar" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" -dependencies = [ - "filetime", - "libc", -] - -[[package]] -name = "target-spec" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac395241acf0f3d224dd2b07b334994adf6f37c904d1826867332ab8c6ddedbf" -dependencies = [ - "cfg-expr", -] - -[[package]] -name = "tempdir" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -dependencies = [ - "rand", - "remove_dir_all", -] - -[[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 = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if 1.0.0", - "once_cell", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi", - "winapi 0.3.9", -] - -[[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 = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[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 = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "ucd-trie" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" - -[[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 = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[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 = "vte" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983" -dependencies = [ - "arrayvec", - "utf8parse", - "vte_generate_state_changes", -] - -[[package]] -name = "vte_generate_state_changes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "walkdir" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -dependencies = [ - "same-file", - "winapi-util", -] - -[[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.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-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi 0.3.9", -] - -[[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", -] - -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" diff --git a/pkgs/development/tools/rust/cargo-dephell/default.nix b/pkgs/development/tools/rust/cargo-dephell/default.nix deleted file mode 100644 index 1302fd581bbe..000000000000 --- a/pkgs/development/tools/rust/cargo-dephell/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, stdenv -, curl -, openssl -, darwin -, libgit2 -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-dephell"; - version = "0.5.1"; - - src = fetchFromGitHub { - owner = "mimoo"; - repo = pname; - rev = "v${version}"; - hash = "sha256-NOjkKttA+mwPCpl4uiRIYD58DlMomVFpwnM9KGfWd+w="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - }; - - nativeBuildInputs = [ - pkg-config - ] ++ lib.optionals stdenv.isDarwin [ - curl - ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - curl - darwin.apple_sdk.frameworks.Security - libgit2 - ]; - - # update Cargo.lock to work with openssl 3 - postPatch = '' - ln -sf ${./Cargo.lock} Cargo.lock - ''; - - env = { - LIBGIT2_NO_VENDOR = 1; - }; - - meta = with lib; { - description = "Tool to analyze the third-party dependencies imported by a rust crate or rust workspace"; - mainProgram = "cargo-dephell"; - homepage = "https://github.com/mimoo/cargo-dephell"; - license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-diet/default.nix b/pkgs/development/tools/rust/cargo-diet/default.nix deleted file mode 100644 index b7b4e2d11d1b..000000000000 --- a/pkgs/development/tools/rust/cargo-diet/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-diet"; - version = "1.2.7"; - - src = fetchFromGitHub { - owner = "the-lean-crate"; - repo = "cargo-diet"; - rev = "v${version}"; - hash = "sha256-SuJ1H/2YfSVVigdgLUd9veMClI7ZT7xkkyQ4PfXoQdQ="; - }; - - cargoHash = "sha256-MASftcn3WmB3M6bvmtnK3nlroE8nq9zdkleSEgzA5lk="; - - meta = with lib; { - description = "Help computing optimal include directives for your Cargo.toml manifest"; - mainProgram = "cargo-diet"; - homepage = "https://github.com/the-lean-crate/cargo-diet"; - changelog = "https://github.com/the-lean-crate/cargo-diet/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix deleted file mode 100644 index e7f5003768a6..000000000000 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, nix-update-script -, pkg-config -, bzip2 -, xz -, zstd -, stdenv -, darwin -, git -, rustup -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-dist"; - version = "0.22.1"; - - src = fetchFromGitHub { - owner = "axodotdev"; - repo = "cargo-dist"; - rev = "v${version}"; - hash = "sha256-Pq7gVZWvtWhS7HJPwKPDq3TJqwurG6fXisM5FsSMZ9k="; - }; - - cargoHash = "sha256-0j3u4oQ8JxJP+lBufDiSMyvFrW70X1snpHstjaM9tDg="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - bzip2 - xz - zstd - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - nativeCheckInputs = [ - git - rustup - ]; - - env = { - ZSTD_SYS_USE_PKG_CONFIG = true; - }; - - # remove tests that require internet access - postPatch = '' - rm cargo-dist/tests/integration-tests.rs - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Tool for building final distributable artifacts and uploading them to an archive"; - mainProgram = "cargo-dist"; - homepage = "https://github.com/axodotdev/cargo-dist"; - changelog = "https://github.com/axodotdev/cargo-dist/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda matthiasbeyer mistydemeo ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-docset/default.nix b/pkgs/development/tools/rust/cargo-docset/default.nix deleted file mode 100644 index 54328186e8b7..000000000000 --- a/pkgs/development/tools/rust/cargo-docset/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, fetchFromGitHub -, gitUpdater -, rustPlatform -, sqlite -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-docset"; - version = "0.3.1"; - - src = fetchFromGitHub { - owner = "Robzz"; - repo = pname; - rev = "v${version}"; - hash = "sha256-o2CSQiU9fEoS3eRmwphtYGZTwn3mstRm2Tlvval83+U="; - }; - - cargoHash = "sha256-YHrSvfHfQ7kbVeCOgggYf3E7gHq+RhVKZrzP8LqX5I0="; - - buildInputs = [ sqlite ]; - - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; - - meta = with lib; { - description = "Cargo subcommand to generate a Dash/Zeal docset for your Rust packages"; - mainProgram = "cargo-docset"; - homepage = "https://github.com/Robzz/cargo-docset"; - changelog = "https://github.com/Robzz/cargo-docset/blob/${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ colinsane matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-duplicates/default.nix b/pkgs/development/tools/rust/cargo-duplicates/default.nix deleted file mode 100644 index f9417651cf6a..000000000000 --- a/pkgs/development/tools/rust/cargo-duplicates/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, curl -, pkg-config -, libgit2 -, openssl -, zlib -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-duplicates"; - version = "0.6.0"; - - src = fetchFromGitHub { - owner = "Keruspe"; - repo = "cargo-duplicates"; - rev = "v${version}"; - hash = "sha256-OwytBecRGizkDC2S92FKAy3/mc4Jg/NwaYIPahfiG6k="; - }; - - cargoHash = "sha256-LsdzHCQ4uG6+dwiUoC36VPuqUf8oPlcMHxNgdkvYzu8="; - - nativeBuildInputs = [ - curl - pkg-config - ]; - - buildInputs = [ - curl - libgit2 - openssl - zlib - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - meta = with lib; { - description = "Cargo subcommand for displaying when different versions of a same dependency are pulled in"; - mainProgram = "cargo-duplicates"; - homepage = "https://github.com/Keruspe/cargo-duplicates"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix index 7a72bc360253..f42607332d71 100644 --- a/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/pkgs/development/tools/rust/cargo-edit/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl zlib ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/tools/rust/cargo-espmonitor/default.nix b/pkgs/development/tools/rust/cargo-espmonitor/default.nix deleted file mode 100644 index 4c65c7bba3b2..000000000000 --- a/pkgs/development/tools/rust/cargo-espmonitor/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, -}: -rustPlatform.buildRustPackage rec { - pname = "espmonitor"; - version = "0.10.0"; - - src = fetchFromGitHub { - owner = "esp-rs"; - repo = pname; - rev = "v${version}"; - sha256 = "hWFdim84L2FfG6p9sEf+G5Uq4yhp5kv1ZMdk4sMHa+4="; - }; - - cargoHash = "sha256-d0tN6NZiAd+RkRy941fIaVEw/moz6tkpL0rN8TZew3g="; - - meta = with lib; { - description = "Cargo tool for monitoring ESP32/ESP8266 execution"; - homepage = "https://github.com/esp-rs/espmonitor"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ xanderio ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-feature/default.nix b/pkgs/development/tools/rust/cargo-feature/default.nix deleted file mode 100644 index 1e713076e1f3..000000000000 --- a/pkgs/development/tools/rust/cargo-feature/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, libiconv }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-feature"; - version = "0.7.0"; - - src = fetchFromGitHub { - owner = "Riey"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-UPpqkz/PwoMaJan9itfldjyTmZmiMb6PzCyu9Vtjj1s="; - }; - - cargoHash = "sha256-8qrpW/gU7BvxN3nSbFWhbgu5bwsdzYZTS3w3kcwsGbU="; - - buildInputs = lib.optional stdenv.isDarwin libiconv; - - meta = with lib; { - description = "Cargo plugin to manage dependency features"; - mainProgram = "cargo-feature"; - homepage = "https://github.com/Riey/cargo-feature"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ riey matthiasbeyer ]; - }; -} - diff --git a/pkgs/development/tools/rust/cargo-flamegraph/default.nix b/pkgs/development/tools/rust/cargo-flamegraph/default.nix index 4a6d9c3ff39d..aca8e713e6e3 100644 --- a/pkgs/development/tools/rust/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/rust/cargo-flamegraph/default.nix @@ -15,12 +15,12 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-KwpveTiViY+C4A+fE5yeGuT9PXbDyi+YsOc75mX2KdU="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/cargo-flamegraph \ --set-default PERF ${perf}/bin/perf wrapProgram $out/bin/flamegraph \ diff --git a/pkgs/development/tools/rust/cargo-fund/default.nix b/pkgs/development/tools/rust/cargo-fund/default.nix index 42f703aaa240..23d13a8841ae 100644 --- a/pkgs/development/tools/rust/cargo-fund/default.nix +++ b/pkgs/development/tools/rust/cargo-fund/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv curl ]; meta = with lib; { description = "Discover funding links for your project's dependencies"; diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix deleted file mode 100644 index fc60b761fe4e..000000000000 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform, stdenv, libiconv }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-fuzz"; - version = "0.12.0"; - - src = fetchFromGitHub { - owner = "rust-fuzz"; - repo = "cargo-fuzz"; - rev = version; - hash = "sha256-PC36O5+eB+yVLpz+EywBDGcMAtHl79FYwUo/l/JL8hM="; - }; - - cargoHash = "sha256-sfvepPpYtgA0TuUlu0CD50HX933AVQbUGzJBNAzFR94="; - - buildInputs = lib.optional stdenv.isDarwin libiconv; - - doCheck = false; - - meta = with lib; { - description = "Command line helpers for fuzzing"; - mainProgram = "cargo-fuzz"; - homepage = "https://github.com/rust-fuzz/cargo-fuzz"; - license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ ekleog matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix deleted file mode 100644 index f4c25a60dbc4..000000000000 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, libgit2 -, openssl -, stdenv -, darwin -, git -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-generate"; - version = "0.21.3"; - - src = fetchFromGitHub { - owner = "cargo-generate"; - repo = "cargo-generate"; - rev = "v${version}"; - sha256 = "sha256-1F/865UgdqwfpITFhXCuL7CmducL7w0lVDyfui9UzjU="; - }; - - cargoHash = "sha256-szPO1V09EThpo2N03Ll+ZJUpvjp2b+/C/sviOzFfG+k="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - nativeCheckInputs = [ git ]; - - # disable vendored libgit2 and openssl - buildNoDefaultFeatures = true; - - preCheck = '' - export HOME=$(mktemp -d) USER=nixbld - git config --global user.name Nixbld - git config --global user.email nixbld@localhost.localnet - ''; - - # Exclude some tests that don't work in sandbox: - # - favorites_default_to_git_if_not_defined: requires network access to github.com - # - should_canonicalize: the test assumes that it will be called from the /Users/<project_dir>/ folder on darwin variant. - checkFlags = [ - "--skip=favorites::favorites_default_to_git_if_not_defined" - ] ++ lib.optionals stdenv.isDarwin [ - "--skip=git::utils::should_canonicalize" - ]; - - env = { - LIBGIT2_NO_VENDOR = 1; - }; - - meta = with lib; { - description = "Tool to generate a new Rust project by leveraging a pre-existing git repository as a template"; - mainProgram = "cargo-generate"; - homepage = "https://github.com/cargo-generate/cargo-generate"; - changelog = "https://github.com/cargo-generate/cargo-generate/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ figsoda turbomack matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-guppy/default.nix b/pkgs/development/tools/rust/cargo-guppy/default.nix deleted file mode 100644 index 13bb3eaff1cf..000000000000 --- a/pkgs/development/tools/rust/cargo-guppy/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, openssl -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-guppy"; - version = "unstable-2023-10-04"; - - src = fetchFromGitHub { - owner = "guppy-rs"; - repo = "guppy"; - rev = "837d0ae762b9ae79cc8ca5d629842e5ca34293b4"; - sha256 = "sha256-LWU1yAD/f9w5m522vcKP9D2JusGkwzvfGSGstvFGUpk="; - }; - - cargoHash = "sha256-IyU5fJSFzef8P5v8ILufGcTP3+5Gm0PH4Cox2G5saHw="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - cargoBuildFlags = [ "-p" "cargo-guppy" ]; - cargoTestFlags = [ "-p" "cargo-guppy" ]; - - meta = with lib; { - description = "Command-line frontend for guppy"; - mainProgram = "cargo-guppy"; - homepage = "https://github.com/guppy-rs/guppy/tree/main/cargo-guppy"; - license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix deleted file mode 100644 index f85d1459c8ae..000000000000 --- a/pkgs/development/tools/rust/cargo-hack/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, rustPlatform, fetchCrate }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-hack"; - version = "0.6.31"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-PMqGDwiQYTtPna4buO6pxUjF+RXT9phjPUNcpQQSn6Q="; - }; - - cargoHash = "sha256-/bkGWQZAHkMtH6Y9ntFJEKV6gmUZEAbYf5A5xoUOMM8="; - - # some necessary files are absent in the crate version - doCheck = false; - - meta = with lib; { - description = "Cargo subcommand to provide various options useful for testing and continuous integration"; - mainProgram = "cargo-hack"; - homepage = "https://github.com/taiki-e/cargo-hack"; - changelog = "https://github.com/taiki-e/cargo-hack/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-hakari/default.nix b/pkgs/development/tools/rust/cargo-hakari/default.nix deleted file mode 100644 index c8429896be45..000000000000 --- a/pkgs/development/tools/rust/cargo-hakari/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-hakari"; - version = "0.9.30"; - - src = fetchFromGitHub { - owner = "guppy-rs"; - repo = "guppy"; - rev = "cargo-hakari-${version}"; - sha256 = "sha256-fwqMV8oTEYqS0Y/IXar1DSZ0Gns1qJ9oGhbdehScrgw="; - }; - - cargoHash = "sha256-DkPnQcoiytIYz780veSAhPnk70qkP3QvTJJ41csUThY="; - - cargoBuildFlags = [ - "-p" - "cargo-hakari" - ]; - cargoTestFlags = [ - "-p" - "cargo-hakari" - ]; - - meta = with lib; { - description = "Manage workspace-hack packages to speed up builds in large workspaces"; - mainProgram = "cargo-hakari"; - longDescription = '' - cargo hakari is a command-line application to manage workspace-hack crates. - Use it to speed up local cargo build and cargo check commands by 15-95%, - and cumulatively by 20-25% or more. - ''; - 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 - ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-hf2/default.nix b/pkgs/development/tools/rust/cargo-hf2/default.nix index ec689cb515d6..8859fa605a42 100644 --- a/pkgs/development/tools/rust/cargo-hf2/default.nix +++ b/pkgs/development/tools/rust/cargo-hf2/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = [ libusb1 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; meta = with lib; { description = "Cargo Subcommand for Microsoft HID Flashing Library for UF2 Bootloaders"; diff --git a/pkgs/development/tools/rust/cargo-info/default.nix b/pkgs/development/tools/rust/cargo-info/default.nix deleted file mode 100644 index 096ef8f764e9..000000000000 --- a/pkgs/development/tools/rust/cargo-info/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitLab -, pkg-config -, openssl -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-info"; - version = "0.7.6"; - - src = fetchFromGitLab { - owner = "imp"; - repo = "cargo-info"; - rev = version; - hash = "sha256-02Zkp7Vc1M5iZsG4iJL30S73T2HHg3lqrPJ9mW3FOuk="; - }; - - # upstream uses `#![deny(warnings)]` which breaks our build - RUSTFLAGS = "--cap-lints allow"; - - cargoHash = "sha256-zp7qklME28HNGomAcQgrEi7W6zQ1QCJc4FjxtnKySUE="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - meta = with lib; { - description = "Cargo subcommand to show crates info from crates.io"; - mainProgram = "cargo-info"; - homepage = "https://gitlab.com/imp/cargo-info"; - changelog = "https://gitlab.com/imp/cargo-info/-/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix index e8b1443dd009..b1126b42f248 100644 --- a/pkgs/development/tools/rust/cargo-inspect/default.nix +++ b/pkgs/development/tools/rust/cargo-inspect/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "026vc8d0jkc1d7dlp3ldmwks7svpvqzl0k5niri8a12cl5w5b9hj"; }; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cargoHash = "sha256-+cYbejdZOmvaX8jdf1llAvaTefPVtIOl1fqGm5tHMRk="; diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix deleted file mode 100644 index a70f6b4e4585..000000000000 --- a/pkgs/development/tools/rust/cargo-insta/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-insta"; - version = "1.40"; - - src = fetchFromGitHub { - owner = "mitsuhiko"; - repo = "insta"; - rev = "83f33653b687c84823fe6af00806107e1dd4f4b8"; - hash = "sha256-eau5h75oZpxufTrf0fLHfr+3TIOFXB/kSgHX+o2GtiE="; - }; - - cargoHash = "sha256-OqM8SERSWHtbvW6SZfM7lOrQZu66uzsv5wiD3Iqaf3s="; - - checkFlags = [ - # Depends on `rustfmt` and does not matter for packaging. - "--skip=utils::test_format_rust_expression" - # Requires networking - "--skip=test_force_update_snapshots" - ]; - - meta = with lib; { - description = "Cargo subcommand for snapshot testing"; - mainProgram = "cargo-insta"; - homepage = "https://github.com/mitsuhiko/insta"; - changelog = "https://github.com/mitsuhiko/insta/blob/${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda oxalica matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-kcov/default.nix b/pkgs/development/tools/rust/cargo-kcov/default.nix deleted file mode 100644 index 2517ac37c712..000000000000 --- a/pkgs/development/tools/rust/cargo-kcov/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, makeWrapper -, kcov -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-kcov"; - version = "0.5.2"; - - src = fetchFromGitHub { - owner = "kennytm"; - repo = pname; - rev = "v${version}"; - sha256 = "0hqplgj3i8js42v2kj44khk543a93sk3n6wlfpv3c84pdqlm29br"; - }; - - cargoHash = "sha256-cgnTf4KKthO1HvjFCjoZw7eCTqsbobHW5Kjx/6V3r1Q="; - doCheck = false; - - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram $out/bin/cargo-kcov \ - --prefix PATH : ${lib.makeBinPath [ kcov ]} - ''; - - meta = with lib; { - description = "Cargo subcommand to run kcov to get coverage report on Linux"; - mainProgram = "cargo-kcov"; - homepage = "https://github.com/kennytm/cargo-kcov"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ saschagrunert matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-lambda/default.nix b/pkgs/development/tools/rust/cargo-lambda/default.nix index 75127127eae2..b63c9e43b415 100644 --- a/pkgs/development/tools/rust/cargo-lambda/default.nix +++ b/pkgs/development/tools/rust/cargo-lambda/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl CoreServices Security diff --git a/pkgs/development/tools/rust/cargo-leptos/default.nix b/pkgs/development/tools/rust/cargo-leptos/default.nix deleted file mode 100644 index 2beed790ed69..000000000000 --- a/pkgs/development/tools/rust/cargo-leptos/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ darwin -, fetchFromGitHub -, lib -, rustPlatform -, stdenv -}: -let - inherit (darwin.apple_sdk.frameworks) - CoreServices - SystemConfiguration - Security; - inherit (lib) optionals; - inherit (stdenv) isDarwin; -in -rustPlatform.buildRustPackage rec { - pname = "cargo-leptos"; - version = "0.2.20"; - - src = fetchFromGitHub { - owner = "leptos-rs"; - repo = pname; - rev = "v${version}"; - hash = "sha256-45zus+mNOiWWbuF50XpMwc1B6Uoy5E1kUQmtdGVc46g="; - }; - - cargoHash = "sha256-54CRNSDWdqD582Vv6d8snYEJrpkQ2Cvp8sjgQ6BcvHY="; - - buildInputs = optionals isDarwin [ - SystemConfiguration - Security - CoreServices - ]; - - # https://github.com/leptos-rs/cargo-leptos#dependencies - buildFeatures = [ "no_downloads" ]; # cargo-leptos will try to install missing dependencies on its own otherwise - doCheck = false; # Check phase tries to query crates.io - - meta = with lib; { - description = "Build tool for the Leptos web framework"; - mainProgram = "cargo-leptos"; - homepage = "https://github.com/leptos-rs/cargo-leptos"; - changelog = "https://github.com/leptos-rs/cargo-leptos/releases/tag/v${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ benwis ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-license/default.nix b/pkgs/development/tools/rust/cargo-license/default.nix deleted file mode 100644 index 868ad03f5068..000000000000 --- a/pkgs/development/tools/rust/cargo-license/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, rustPlatform, fetchCrate }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-license"; - version = "0.6.1"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-qwyWj0vPWQOZYib2ZZutX25a4wwnG1kFAiRCWqGyVms="; - }; - - cargoHash = "sha256-ifw/n7eejUWUqhieDLojuO3xgosn28NnjAKkq/ZSLEI="; - - meta = with lib; { - description = "Cargo subcommand to see license of dependencies"; - mainProgram = "cargo-license"; - homepage = "https://github.com/onur/cargo-license"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ basvandijk figsoda matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-limit/default.nix b/pkgs/development/tools/rust/cargo-limit/default.nix deleted file mode 100644 index 958bfeb447c3..000000000000 --- a/pkgs/development/tools/rust/cargo-limit/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, nix-update-script -, stdenv -, libiconv -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-limit"; - version = "0.0.10"; - - src = fetchFromGitHub { - owner = "alopatindev"; - repo = "cargo-limit"; - rev = version; - sha256 = "sha256-joWDB9fhCsYVZFZdr+Gfm4JaRlm5kj+CHp34Sx5iQYk="; - }; - - cargoHash = "sha256-dwqbG0UFeUQHa0K98ebHfjbcQuQOhK2s6ZxAT6r0cik="; - - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "Cargo subcommand \"limit\": reduces the noise of compiler messages"; - homepage = "https://github.com/alopatindev/cargo-limit"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ otavio matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix deleted file mode 100644 index 387460a0dd16..000000000000 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -# If the tests are broken, it's probably for one of two reasons: -# -# 1. The version of llvm used doesn't match the expectations of rustc and/or -# cargo-llvm-cov. This is relatively unlikely because we pull llvm out of -# rustc's attrset, so it *should* be the right version as long as this is the -# case. -# 2. Nixpkgs has changed its rust infrastructure in a way that causes -# cargo-llvm-cov to misbehave under test. It's likely that even though the -# tests are failing, cargo-llvm-cov will still function properly in actual -# use. This has happened before, and is described [here][0] (along with a -# feature request that would fix this instance of the problem). -# -# For previous test-troubleshooting discussion, see [here][1]. -# -# [0]: https://github.com/taiki-e/cargo-llvm-cov/issues/242 -# [1]: https://github.com/NixOS/nixpkgs/pull/197478 - -{ stdenv -, lib -, fetchurl -, fetchFromGitHub -, rustPlatform -, rustc -, git -}: - -let - pname = "cargo-llvm-cov"; - version = "0.6.12"; - - owner = "taiki-e"; - homepage = "https://github.com/${owner}/${pname}"; - - llvm = rustc.llvmPackages.llvm; - - # Download `Cargo.lock` from crates.io so we don't clutter up Nixpkgs - cargoLock = fetchurl { - name = "Cargo.lock"; - url = "https://crates.io/api/v1/crates/${pname}/${version}/download"; - sha256 = "sha256-QMO5J5c8MQr84w6X74oQrHV99cjSUVfpC8Ub1csQ0gI="; - downloadToTemp = true; - postFetch = '' - tar xzf $downloadedFile ${pname}-${version}/Cargo.lock - mv ${pname}-${version}/Cargo.lock $out - ''; - }; -in - -rustPlatform.buildRustPackage { - inherit pname version; - - # Use `fetchFromGitHub` instead of `fetchCrate` because the latter does not - # pull in fixtures needed for the test suite - src = fetchFromGitHub { - inherit owner; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-BlXgbCWjGya/I94nqfjBqQPSWnVhyhNn0oSRL9xiS6k="; - }; - - # Upstream doesn't include the lockfile so we need to add it back - postUnpack = '' - cp ${cargoLock} source/Cargo.lock - ''; - - cargoHash = "sha256-nabO19JePQRuhxsbm5wVIU4+5si6p0VgqR2QLmLeivU="; - - # `cargo-llvm-cov` reads these environment variables to find these binaries, - # which are needed to run the tests - LLVM_COV = "${llvm}/bin/llvm-cov"; - LLVM_PROFDATA = "${llvm}/bin/llvm-profdata"; - - nativeCheckInputs = [ - git - ]; - - # `cargo-llvm-cov` tests rely on `git ls-files. - preCheck = '' - git init -b main - git add . - ''; - - meta = { - inherit homepage; - changelog = homepage + "/blob/v${version}/CHANGELOG.md"; - description = "Cargo subcommand to easily use LLVM source-based code coverage"; - mainProgram = "cargo-llvm-cov"; - longDescription = '' - In order for this to work, you either need to run `rustup component add llvm- - tools-preview` or install the `llvm-tools-preview` component using your Nix - library (e.g. fenix or rust-overlay) - ''; - license = with lib.licenses; [ asl20 /* or */ mit ]; - maintainers = with lib.maintainers; [ wucke13 matthiasbeyer CobaltCause ]; - - # The profiler runtime is (currently) disabled on non-Linux platforms - broken = !(stdenv.isLinux && !stdenv.targetPlatform.isRedox); - }; -} diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix deleted file mode 100644 index 3e567af66173..000000000000 --- a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-llvm-lines"; - version = "0.4.40"; - - src = fetchFromGitHub { - owner = "dtolnay"; - repo = pname; - rev = version; - hash = "sha256-FyPq2+Smx4ZbJG13TKUHlyAANU4JbpAAUxisH9c4Aq8="; - }; - - cargoHash = "sha256-AH27+WrWguFpZFIq3N8Wb1Nlwbof6tgX0W4AtwMtoVw="; - - meta = with lib; { - description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; - mainProgram = "cargo-llvm-lines"; - homepage = "https://github.com/dtolnay/cargo-llvm-lines"; - changelog = "https://github.com/dtolnay/cargo-llvm-lines/releases/tag/${src.rev}"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-local-registry/default.nix b/pkgs/development/tools/rust/cargo-local-registry/default.nix deleted file mode 100644 index 76f26decd868..000000000000 --- a/pkgs/development/tools/rust/cargo-local-registry/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, curl -, pkg-config -, libgit2 -, openssl -, zlib -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-local-registry"; - version = "0.2.7"; - - src = fetchFromGitHub { - owner = "dhovart"; - repo = "cargo-local-registry"; - rev = "v${version}"; - hash = "sha256-hG6OSi0I7Y6KZacGR9MCC+e7YcDcvaVfR3LSOjqz23A="; - }; - - cargoHash = "sha256-lTtxCRK4J3dQ6fwjOwYvKa0ykr28guAwVN/J8pfLn9s="; - - nativeBuildInputs = [ - curl - pkg-config - ]; - - buildInputs = [ - curl - libgit2 - openssl - zlib - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - darwin.apple_sdk.frameworks.CoreFoundation - ]; - - # tests require internet access - doCheck = false; - - meta = with lib; { - description = "Cargo subcommand to manage local registries"; - mainProgram = "cargo-local-registry"; - homepage = "https://github.com/dhovart/cargo-local-registry"; - changelog = "https://github.com/dhovart/cargo-local-registry/releases/tag/${src.rev}"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-lock/default.nix b/pkgs/development/tools/rust/cargo-lock/default.nix deleted file mode 100644 index 6c1f35b1244d..000000000000 --- a/pkgs/development/tools/rust/cargo-lock/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, rustPlatform, fetchCrate }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-lock"; - version = "9.0.0"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-SMxM66qo3Xmst+SVXu4LYZ0Zzn15wqVVNqqHzAkip/s="; - }; - - cargoHash = "sha256-wUp4zBY64MvD4anGlVsJrI3pyfwVSQGnn6YuweTeYNk="; - - buildFeatures = [ "cli" ]; - - meta = with lib; { - description = "Self-contained Cargo.lock parser with graph analysis"; - mainProgram = "cargo-lock"; - homepage = "https://github.com/rustsec/rustsec/tree/main/cargo-lock"; - changelog = "https://github.com/rustsec/rustsec/blob/cargo-lock/v${version}/cargo-lock/CHANGELOG.md"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-machete/default.nix b/pkgs/development/tools/rust/cargo-machete/default.nix deleted file mode 100644 index aadd97f30a95..000000000000 --- a/pkgs/development/tools/rust/cargo-machete/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-machete"; - version = "0.6.2"; - - src = fetchFromGitHub { - owner = "bnjbvr"; - repo = "cargo-machete"; - rev = "v${version}"; - hash = "sha256-8ktiBnlcnC4QD3rIox8rfxhF0ZWOlbok8rK7fnqeZOM="; - }; - - cargoHash = "sha256-emW/TDpeh/7hgqTgXAZeQwzkSIktDxk3Lp3JyhdTSRo="; - - # tests require internet access - doCheck = false; - - meta = with lib; { - description = "Cargo tool that detects unused dependencies in Rust projects"; - mainProgram = "cargo-machete"; - homepage = "https://github.com/bnjbvr/cargo-machete"; - changelog = "https://github.com/bnjbvr/cargo-machete/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-mobile2/default.nix b/pkgs/development/tools/rust/cargo-mobile2/default.nix deleted file mode 100644 index 28c94f9a0f02..000000000000 --- a/pkgs/development/tools/rust/cargo-mobile2/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, pkg-config -, openssl -, git -, darwin -, makeWrapper -}: - -let - inherit (darwin.apple_sdk.frameworks) CoreServices; - pname = "cargo-mobile2"; - version = "0.17.2"; -in -rustPlatform.buildRustPackage { - inherit pname version; - src = fetchFromGitHub { - owner = "tauri-apps"; - repo = pname; - rev = "cargo-mobile2-v${version}"; - hash = "sha256-No2xlLRSNvjgW5WtQ8u3Wev/+RyamsJ2f6p4ONKeRe0="; - }; - - # 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-oc3Hc0mWuL9bd1SgyJD9nK9kuPLZEaWFbydL/ti09HU="; - - preBuild = '' - mkdir -p $out/share/ - # during the install process tauri-mobile puts templates and commit information in CARGO_HOME - export CARGO_HOME=$out/share/ - ''; - - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; - nativeBuildInputs = [ pkg-config git makeWrapper ]; - - preFixup = '' - for bin in $out/bin/cargo-*; do - wrapProgram $bin \ - --set CARGO_HOME "$out/share" - done - ''; - - meta = with lib; { - 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 deleted file mode 100644 index 3787173f0fff..000000000000 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-modules"; - version = "0.16.8"; - - src = fetchFromGitHub { - owner = "regexident"; - repo = pname; - rev = "v${version}"; - hash = "sha256-F1hVKktU9zhdxXWhpLgymehJQlOX6WbXL2cqQGB+Y5k="; - }; - - cargoHash = "sha256-j3AYWKq7SrlNlsY7A80iwcWKW8wi6hx0U9UwDIQkXZs="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - - checkFlags = [ - "--skip=cfg_test::smoke" - "--skip=colors::ansi::smoke" - "--skip=colors::plain::smoke" - "--skip=colors::truecolor::smoke" - "--skip=focus_on::glob_path::smoke" - "--skip=focus_on::self_path::smoke" - "--skip=focus_on::simple_path::smoke" - "--skip=focus_on::use_tree::smoke" - "--skip=functions::function_body" - "--skip=functions::function_inputs" - "--skip=functions::function_outputs" - "--skip=max_depth::depth_2::smoke" - "--skip=selection::no_fns::smoke" - "--skip=selection::no_modules::smoke" - "--skip=selection::no_traits::smoke" - "--skip=selection::no_types::smoke" - "--skip=fields::enum_fields" - "--skip=fields::struct_fields" - "--skip=fields::tuple_fields" - "--skip=fields::union_fields" - ]; - - meta = with lib; { - description = "Cargo plugin for showing a tree-like overview of a crate's modules"; - mainProgram = "cargo-modules"; - homepage = "https://github.com/regexident/cargo-modules"; - changelog = "https://github.com/regexident/cargo-modules/blob/${version}/CHANGELOG.md"; - license = with licenses; [ mpl20 ]; - maintainers = with maintainers; [ figsoda rvarago matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-mommy/default.nix b/pkgs/development/tools/rust/cargo-mommy/default.nix deleted file mode 100644 index e62f87969d7c..000000000000 --- a/pkgs/development/tools/rust/cargo-mommy/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, rustPlatform, fetchCrate }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-mommy"; - version = "0.3.1"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-2WR6xUYL/bLgZlI4ADbPAtdLq0y4MoVP8Loxdu/58Wc="; - }; - - cargoHash = "sha256-iQt6eTCcpzhFnrDkUmT4x7JX+Z7fWdW5ovbB/9Ui7Sw="; - - meta = with lib; { - description = "Cargo wrapper that encourages you after running commands"; - mainProgram = "cargo-mommy"; - homepage = "https://github.com/Gankra/cargo-mommy"; - license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ GoldsteinE ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index e8b23c70bd11..ec0f9331df7b 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.15.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rmWPkxxrpVamYHII0xkZq62ubL3/jrcqXUvFH9VuNtg="; + sha256 = "sha256-pgSwyq5KK9PCsmMnquufaw2oW7VSm93xRmozi/uqzNc="; }; - cargoHash = "sha256-/Bspy94uIP/e4uJY8qo+UPK1tnPjglxiMWeYWx2qoHk="; + cargoHash = "sha256-4eGoNKv76+3QVRUbTPiqTiLbQoOX6mVouJ3puxN6pMY="; passthru = { updateScript = gitUpdater { @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { # Integration tests fail doCheck = false; - buildInputs = if stdenv.isDarwin + buildInputs = if stdenv.hostPlatform.isDarwin then [ libiconv Security ] else [ openssl ]; diff --git a/pkgs/development/tools/rust/cargo-mutants/default.nix b/pkgs/development/tools/rust/cargo-mutants/default.nix deleted file mode 100644 index 742000213879..000000000000 --- a/pkgs/development/tools/rust/cargo-mutants/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-mutants"; - version = "24.7.1"; - - src = fetchFromGitHub { - owner = "sourcefrog"; - repo = "cargo-mutants"; - rev = "v${version}"; - hash = "sha256-56IIMifv5epThXeWtQbNLwee1IQ52SPKik4hsHlnv6w="; - }; - - cargoHash = "sha256-VRkhDgKunSUOz2/U4oC2t0YrDh5l48z4luevMazfj6o="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - # too many tests require internet access - doCheck = false; - - meta = with lib; { - description = "Mutation testing tool for Rust"; - mainProgram = "cargo-mutants"; - homepage = "https://github.com/sourcefrog/cargo-mutants"; - changelog = "https://github.com/sourcefrog/cargo-mutants/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-ndk/default.nix b/pkgs/development/tools/rust/cargo-ndk/default.nix index b1068127483b..8e38d601c752 100644 --- a/pkgs/development/tools/rust/cargo-ndk/default.nix +++ b/pkgs/development/tools/rust/cargo-ndk/default.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage rec { pname = "cargo-ndk"; - version = "3.5.6"; + version = "3.5.7"; src = fetchFromGitHub { owner = "bbqsrc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-piNKtmDssDeB+DznLl0uufT5BFiVCMmYGuRmBUr5QWQ="; + sha256 = "sha256-tzjiq1jjluWqTl+8MhzFs47VRp3jIRJ7EOLhUP8ydbM="; }; - cargoHash = "sha256-sIKan8LnGv4sGVrGOUOKSD3R4fNRu5yBFATm5MWDTSU="; + cargoHash = "sha256-UthI01fLC35BPp550LaDLoo1kjisUmQZqSud8JM/kqM="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreGraphics Foundation ]; diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix deleted file mode 100644 index cb3465a592f9..000000000000 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub, nix-update-script }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-nextest"; - version = "0.9.78"; - - src = fetchFromGitHub { - owner = "nextest-rs"; - repo = "nextest"; - rev = "cargo-nextest-${version}"; - hash = "sha256-nQIq/WCbB3iWxDdD13tthvmndYhccttcOeXWJ7Dri+0="; - }; - - cargoHash = "sha256-XGDPxak2jVKkGyhPMpW4KxzyMd5aaIj1Hguw+XEM7w8="; - - cargoBuildFlags = [ "-p" "cargo-nextest" ]; - cargoTestFlags = [ "-p" "cargo-nextest" ]; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Next-generation test runner for Rust projects"; - mainProgram = "cargo-nextest"; - homepage = "https://github.com/nextest-rs/nextest"; - changelog = "https://nexte.st/CHANGELOG.html"; - license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ ekleog figsoda matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-outdated/default.nix b/pkgs/development/tools/rust/cargo-outdated/default.nix index 64b7c4a77656..0c575c604cf8 100644 --- a/pkgs/development/tools/rust/cargo-outdated/default.nix +++ b/pkgs/development/tools/rust/cargo-outdated/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl CoreFoundation CoreServices diff --git a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix index 3d41c35ffd36..89293ab62ef8 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix @@ -56,6 +56,7 @@ # dependency here. Set to false and provide rustfmt in nativeBuildInputs, if you need it, e.g. # if you include the generated code in the output via postInstall. , useFakeRustfmt ? true +, usePgTestCheckFeature ? true , ... } @ args: let @@ -96,12 +97,12 @@ let pg_ctl stop ''; - argsForBuildRustPackage = builtins.removeAttrs args [ "postgresql" "useFakeRustfmt" ]; + argsForBuildRustPackage = builtins.removeAttrs args [ "postgresql" "useFakeRustfmt" "usePgTestCheckFeature" ]; # so we don't accidentally `(rustPlatform.buildRustPackage argsForBuildRustPackage) // { ... }` because # we forgot parentheses finalArgs = argsForBuildRustPackage // { - buildInputs = (args.buildInputs or [ ]) ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = (args.buildInputs or [ ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cargo-pgrx @@ -118,7 +119,7 @@ let ${maybeEnterBuildAndTestSubdir} PGRX_BUILD_FLAGS="--frozen -j $NIX_BUILD_CORES ${builtins.concatStringsSep " " cargoBuildFlags}" \ - ${lib.optionalString stdenv.isDarwin ''RUSTFLAGS="''${RUSTFLAGS:+''${RUSTFLAGS} }-Clink-args=-Wl,-undefined,dynamic_lookup"''} \ + ${lib.optionalString stdenv.hostPlatform.isDarwin ''RUSTFLAGS="''${RUSTFLAGS:+''${RUSTFLAGS} }-Clink-args=-Wl,-undefined,dynamic_lookup"''} \ cargo pgrx package \ --pg-config ${lib.getDev postgresql}/bin/pg_config \ ${maybeDebugFlag} \ @@ -154,7 +155,7 @@ let RUST_BACKTRACE = "full"; checkNoDefaultFeatures = true; - checkFeatures = (args.checkFeatures or [ ]) ++ [ "pg_test pg${pgrxPostgresMajor}" ]; + checkFeatures = (args.checkFeatures or [ ]) ++ (lib.optionals usePgTestCheckFeature [ "pg_test" ]) ++ [ "pg${pgrxPostgresMajor}" ]; }; in rustPlatform.buildRustPackage finalArgs diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix index 3aa7003b7567..93010928ddc6 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -24,13 +24,13 @@ let inherit cargoHash; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -71,4 +71,10 @@ in hash = "sha256-UHIfwOdXoJvR4Svha6ud0FxahP1wPwUtviUwUnTmLXU="; cargoHash = "sha256-j4HnD8Zt9uhlV5N7ldIy9564o9qFEqs5KfXHmnQ1WEw="; }; + + cargo-pgrx_0_12_0_alpha_1 = generic { + version = "0.12.0-alpha.1"; + hash = "sha256-0m9oaqjU42RYyttkTihADDrRMjr2WoK/8sInZALeHws="; + cargoHash = "sha256-9XTIcpoCnROP63ZTDgMMMmj0kPggiTazKlKQfCgXKzk="; + }; } diff --git a/pkgs/development/tools/rust/cargo-play/default.nix b/pkgs/development/tools/rust/cargo-play/default.nix deleted file mode 100644 index a95f2c10c32e..000000000000 --- a/pkgs/development/tools/rust/cargo-play/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-play"; - version = "0.5.1"; - - src = fetchFromGitHub { - owner = "fanzeyi"; - repo = pname; - rev = version; - sha256 = "sha256-Z5zcLQYfQeGybsnt2U+4Z+peRHxNPbDriPMKWhJ+PeA="; - }; - - cargoHash = "sha256-I+keVi0fxUVttMHOGJQWVfIpHEQu/9aTbERa3qiHmnQ="; - - # these tests require internet access - checkFlags = [ - "--skip=dtoa_test" - "--skip=infer_override" - ]; - - meta = with lib; { - description = "Run your rust code without setting up cargo"; - mainProgram = "cargo-play"; - homepage = "https://github.com/fanzeyi/cargo-play"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix deleted file mode 100644 index d7abd37316c1..000000000000 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, pkg-config -, curl -, openssl -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-public-api"; - version = "0.38.0"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-NgaW/QsBaMMBbfUGyHwuu0fb3q3GmD8Qv5wG6qYPjvA="; - }; - - cargoHash = "sha256-KX3+tIdAyaWdaq2nabVTvoZRTXLSXEALFJYCa5nda4w="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ curl openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - - # Tests fail - doCheck = false; - - meta = with lib; { - description = "List and diff the public API of Rust library crates between releases and commits. Detect breaking API changes and semver violations"; - mainProgram = "cargo-public-api"; - homepage = "https://github.com/Enselic/cargo-public-api"; - changelog = "https://github.com/Enselic/cargo-public-api/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer ]; - }; -} - diff --git a/pkgs/development/tools/rust/cargo-readme/default.nix b/pkgs/development/tools/rust/cargo-readme/default.nix deleted file mode 100644 index 8924195b4e76..000000000000 --- a/pkgs/development/tools/rust/cargo-readme/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-readme"; - version = "3.3.1"; - - src = fetchFromGitHub { - owner = "webern"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-FFWHADATEfvZvxGwdkj+eTVoq7pnPuoUAhMGTokUkMs="; - }; - - cargoHash = "sha256-OEArMqOiT+PZ+zMRt9h0EzeP7ikFuOYR8mFGtm+xCkQ="; - - # disable doc tests - cargoTestFlags = [ - "--bins" "--lib" - ]; - - meta = with lib; { - description = "Generate README.md from docstrings"; - mainProgram = "cargo-readme"; - homepage = "https://github.com/livioribeiro/cargo-readme"; - license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ baloo matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-release/Cargo.lock b/pkgs/development/tools/rust/cargo-release/Cargo.lock deleted file mode 100644 index 25882759eb3d..000000000000 --- a/pkgs/development/tools/rust/cargo-release/Cargo.lock +++ /dev/null @@ -1,2898 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[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.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" - -[[package]] -name = "anstyle-parse" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" -dependencies = [ - "anstyle", - "windows-sys 0.48.0", -] - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "assert_fs" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd762e110c8ed629b11b6cde59458cc1c71de78ebbcc30099fc8e0403a2a2ec" -dependencies = [ - "anstyle", - "doc-comment", - "globwalk", - "predicates", - "predicates-core", - "predicates-tree", - "tempfile", -] - -[[package]] -name = "async-compression" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[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" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[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 = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - -[[package]] -name = "camino" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-release" -version = "0.25.10" -dependencies = [ - "anstream", - "anstyle", - "anyhow", - "assert_fs", - "bstr", - "cargo-test-macro", - "cargo-test-support", - "cargo_metadata", - "clap", - "clap-cargo", - "dirs-next", - "dunce", - "env_logger", - "git-conventional", - "git2", - "globset", - "ignore", - "indexmap", - "itertools 0.13.0", - "log", - "maplit", - "once_cell", - "predicates", - "quick-error", - "regex", - "semver", - "serde", - "similar", - "snapbox 0.4.17", - "tame-index", - "time", - "toml", - "toml_edit", - "trycmd", -] - -[[package]] -name = "cargo-test-macro" -version = "0.1.0" -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#5613aac68d821652adf378d74e7ef1411cc31161" -dependencies = [ - "anstream", - "anstyle", - "anyhow", - "cargo-test-macro", - "cargo-util", - "crates-io", - "filetime", - "flate2", - "git2", - "glob", - "itertools 0.11.0", - "pasetors", - "serde", - "serde_json", - "snapbox 0.4.17", - "tar", - "time", - "toml", - "url", - "windows-sys 0.48.0", -] - -[[package]] -name = "cargo-util" -version = "0.2.8" -source = "git+https://github.com/rust-lang/cargo#5613aac68d821652adf378d74e7ef1411cc31161" -dependencies = [ - "anyhow", - "core-foundation", - "filetime", - "hex", - "jobserver", - "libc", - "miow", - "same-file", - "sha2", - "shell-escape", - "tempfile", - "tracing", - "walkdir", - "windows-sys 0.48.0", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "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 = [ - "jobserver", - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap-cargo" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e2fd20c8f8c7cc395f69a86a61eb9d93e1de8fadc00338508cde2ffc656388" -dependencies = [ - "anstyle", - "cargo_metadata", - "clap", -] - -[[package]] -name = "clap_builder" -version = "4.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", - "terminal_size", -] - -[[package]] -name = "clap_derive" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "const-oid" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" - -[[package]] -name = "content_inspector" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38" -dependencies = [ - "memchr", -] - -[[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 = "cpufeatures" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" -dependencies = [ - "libc", -] - -[[package]] -name = "crates-io" -version = "0.39.1" -source = "git+https://github.com/rust-lang/cargo#5613aac68d821652adf378d74e7ef1411cc31161" -dependencies = [ - "curl", - "percent-encoding", - "serde", - "serde_json", - "thiserror", - "url", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crypto-bigint" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" -dependencies = [ - "generic-array", - "rand_core", - "subtle", - "zeroize", -] - -[[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 = "ct-codecs" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df" - -[[package]] -name = "curl" -version = "0.4.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2 0.4.9", - "winapi", -] - -[[package]] -name = "curl-sys" -version = "0.4.63+curl-8.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeb0fef7046022a1e2ad67a004978f0e3cacb9e3123dc62ce768f92197b771dc" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "winapi", -] - -[[package]] -name = "der" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56acb310e15652100da43d130af8d97b509e95af61aab1c5a7939ef24337ee17" -dependencies = [ - "const-oid", - "pem-rfc7468", - "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 = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "const-oid", - "crypto-common", - "subtle", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - -[[package]] -name = "ecdsa" -version = "0.16.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428" -dependencies = [ - "der", - "digest", - "elliptic-curve", - "rfc6979", - "signature", - "spki", -] - -[[package]] -name = "ed25519-compact" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3d382e8464107391c8706b4c14b087808ecb909f6c15c34114bc42e53a9e4c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "elliptic-curve" -version = "0.13.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9775b22bc152ad86a0cf23f0f348b884b26add12bf741e7ffc4d4ab2ab4d205" -dependencies = [ - "base16ct", - "crypto-bigint", - "digest", - "ff", - "generic-array", - "group", - "hkdf", - "pem-rfc7468", - "pkcs8", - "rand_core", - "sec1", - "subtle", - "zeroize", -] - -[[package]] -name = "env_filter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" -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.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 = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "ff" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" -dependencies = [ - "rand_core", - "subtle", -] - -[[package]] -name = "fiat-crypto" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" - -[[package]] -name = "filetime" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", -] - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "libz-sys", - "miniz_oxide", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futures-channel" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" - -[[package]] -name = "futures-io" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" - -[[package]] -name = "futures-sink" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" - -[[package]] -name = "futures-task" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" - -[[package]] -name = "futures-util" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" -dependencies = [ - "futures-core", - "futures-io", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", - "zeroize", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" - -[[package]] -name = "git-conventional" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8035f7561b84cc80e8ec1c2c18dd14113c8b6e07206db72212403e9a25d2e72d" -dependencies = [ - "doc-comment", - "unicase", - "winnow", -] - -[[package]] -name = "git2" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" -dependencies = [ - "bitflags 2.4.0", - "libc", - "libgit2-sys", - "log", - "openssl-probe", - "openssl-sys", - "url", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "globwalk" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" -dependencies = [ - "bitflags 2.4.0", - "ignore", - "walkdir", -] - -[[package]] -name = "group" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" -dependencies = [ - "ff", - "rand_core", - "subtle", -] - -[[package]] -name = "h2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" - -[[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.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hkdf" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" -dependencies = [ - "hmac", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" -dependencies = [ - "windows-sys 0.48.0", -] - -[[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 = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -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", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "humantime-serde" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c" -dependencies = [ - "humantime", - "serde", -] - -[[package]] -name = "hyper" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -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.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" -dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata", - "same-file", - "walkdir", - "winapi-util", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[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.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "jobserver" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libgit2-sys" -version = "0.16.2+1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" -dependencies = [ - "cc", - "libc", - "libssh2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", -] - -[[package]] -name = "libssh2-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[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.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "miow" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -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" -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", - "libc", -] - -[[package]] -name = "object" -version = "0.32.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-src" -version = "111.26.0+1.1.1u" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "orion" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbe74a766292f94f7e69db5a7bf010eadd944f24186c463fe578a7e637582066" -dependencies = [ - "fiat-crypto", - "subtle", - "zeroize", -] - -[[package]] -name = "os_pipe" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "p384" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] -name = "pasetors" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba765699a309908d55950919a3445e9491453e89b2587b1b2abe4143a48894c0" -dependencies = [ - "ct-codecs", - "ed25519-compact", - "getrandom", - "orion", - "p384", - "rand_core", - "regex", - "serde", - "serde_json", - "sha2", - "subtle", - "time", - "zeroize", -] - -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - -[[package]] -name = "percent-encoding" -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 = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[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.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - -[[package]] -name = "pkg-config" -version = "0.3.27" -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.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" -dependencies = [ - "anstyle", - "difflib", - "float-cmp", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "primeorder" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" -dependencies = [ - "elliptic-curve", -] - -[[package]] -name = "proc-macro2" -version = "1.0.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[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" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall 0.2.16", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "reqwest" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" -dependencies = [ - "async-compression", - "base64", - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls", - "rustls-native-certs", - "rustls-pemfile", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-rustls", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", - "winreg", -] - -[[package]] -name = "rfc6979" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" -dependencies = [ - "hmac", - "subtle", -] - -[[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 = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustix" -version = "0.38.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" -dependencies = [ - "log", - "ring", - "rustls-pki-types", - "rustls-webpki", - "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 = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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.102.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[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.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "sec1" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0aec48e813d6b90b15f0b8948af3c63483992dee44c03e9930b3eebdabe046e" -dependencies = [ - "base16ct", - "der", - "generic-array", - "pkcs8", - "subtle", - "zeroize", -] - -[[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.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.108" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" -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 = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "shell-escape" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signature" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" -dependencies = [ - "digest", - "rand_core", -] - -[[package]] -name = "similar" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" - -[[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 = "smol_str" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" -dependencies = [ - "serde", -] - -[[package]] -name = "snapbox" -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 = "94204b12a4d3550420babdb4148c6639692e4e3e61060866929c5107f208aeb6" -dependencies = [ - "anstream", - "anstyle", - "content_inspector", - "dunce", - "filetime", - "libc", - "normalize-line-endings", - "os_pipe", - "similar", - "snapbox-macros", - "tempfile", - "wait-timeout", - "walkdir", - "windows-sys 0.52.0", -] - -[[package]] -name = "snapbox-macros" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f4c14672714436c09254801c934b203196a51182a5107fb76591c7cc56424d" -dependencies = [ - "anstream", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" -dependencies = [ - "libc", - "windows-sys 0.48.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.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "syn" -version = "2.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "tame-index" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44a98d58caab3de29c6cb538054c7d994b3d7e6eec483a9dfca02f92027f7686" -dependencies = [ - "camino", - "crossbeam-channel", - "home", - "http", - "libc", - "memchr", - "rayon", - "reqwest", - "semver", - "serde", - "serde_json", - "smol_str", - "thiserror", - "tokio", - "toml-span", - "twox-hash", -] - -[[package]] -name = "tar" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" -dependencies = [ - "filetime", - "libc", -] - -[[package]] -name = "tempfile" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall 0.4.1", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "terminal_size" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" -dependencies = [ - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "thiserror" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[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 = "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 = "1.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "socket2 0.5.4", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-rustls" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -dependencies = [ - "rustls", - "rustls-pki-types", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.8.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml-span" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "369db38ce6d1fc320a54ea3f032d07c07a232ca19c40e287246aff06d57c2abe" -dependencies = [ - "smallvec", -] - -[[package]] -name = "toml_datetime" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.22.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "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", - "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" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -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" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "trycmd" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59709bd8eccada6a3fded26d22a7f2dcee406c18d3bd7ad2605ca3eeb8f6f6ec" -dependencies = [ - "automod", - "glob", - "humantime", - "humantime-serde", - "rayon", - "serde", - "shlex", - "snapbox 0.6.7", - "toml_edit", -] - -[[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.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[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 = "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.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" - -[[package]] -name = "web-sys" -version = "0.3.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" -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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[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-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" -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.0", -] - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -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", -] - -[[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.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 = "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.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 = "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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -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" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -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" -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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" - -[[package]] -name = "winnow" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" -dependencies = [ - "memchr", -] - -[[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 = "zeroize" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" diff --git a/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/development/tools/rust/cargo-release/default.nix deleted file mode 100644 index 8f9abcb28da2..000000000000 --- a/pkgs/development/tools/rust/cargo-release/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, libgit2 -, openssl -, stdenv -, curl -, darwin -, git -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-release"; - version = "0.25.10"; - - src = fetchFromGitHub { - owner = "crate-ci"; - repo = "cargo-release"; - rev = "refs/tags/v${version}"; - hash = "sha256-eMPwbcMIjYxM5gJm3HSdwzxN7WYOOtzj/Wf7rwuJfWs="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "cargo-test-macro-0.1.0" = "sha256-5EHfvuwbI14DBkbLWyXepmn9m4Qn2ah2+9J9FHrSOgU="; - }; - }; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - libgit2 - openssl - ] ++ lib.optionals stdenv.isDarwin [ - curl - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - nativeCheckInputs = [ - git - ]; - - # disable vendored-libgit2 and vendored-openssl - buildNoDefaultFeatures = true; - - meta = with lib; { - description = ''Cargo subcommand "release": everything about releasing a rust crate''; - mainProgram = "cargo-release"; - homepage = "https://github.com/crate-ci/cargo-release"; - changelog = "https://github.com/crate-ci/cargo-release/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ figsoda gerschtli ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-risczero/default.nix b/pkgs/development/tools/rust/cargo-risczero/default.nix deleted file mode 100644 index ead0103d3f65..000000000000 --- a/pkgs/development/tools/rust/cargo-risczero/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchCrate -, rustPlatform -, pkg-config -, openssl -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-risczero"; - version = "0.17.0"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-UXCZ4l45zcyn2AnfDW6dNdEnXCWL2waNwDTbermgS6M="; - }; - - cargoHash = "sha256-KkV+ZQAPegbeZKj3ixDSFQEyKwkKeMYceSc27xGtQms="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - # The tests require network access which is not available in sandboxed Nix builds. - doCheck = false; - - meta = with lib; { - description = "Cargo extension to help create, manage, and test RISC Zero projects"; - mainProgram = "cargo-risczero"; - homepage = "https://risczero.com"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ cameronfyfe ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-rr/default.nix b/pkgs/development/tools/rust/cargo-rr/default.nix deleted file mode 100644 index cccd1368a802..000000000000 --- a/pkgs/development/tools/rust/cargo-rr/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, nix-update-script -, makeWrapper -, rr -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-rr"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "danielzfranklin"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-t8pRqeOdaRVG0titQhxezT2aDjljSs//MnRTTsJ73Yo="; - }; - - cargoHash = "sha256-P4r4XRolORdSGAsNg5RutZ2VVRR8rAfiBZNm+vIH3aM="; - - passthru = { - updateScript = nix-update-script { }; - }; - - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram $out/bin/cargo-rr --prefix PATH : ${lib.makeBinPath [ rr ]} - ''; - - meta = with lib; { - description = "Cargo subcommand \"rr\": a light wrapper around rr, the time-travelling debugger"; - mainProgram = "cargo-rr"; - homepage = "https://github.com/danielzfranklin/cargo-rr"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ otavio matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-run-bin/default.nix b/pkgs/development/tools/rust/cargo-run-bin/default.nix deleted file mode 100644 index e72f5d074273..000000000000 --- a/pkgs/development/tools/rust/cargo-run-bin/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-run-bin"; - version = "1.7.3"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-VMlia5EEnNiNkOzwdTZwoaKtAxHz5xAxxnGlGoSbD80="; - }; - - cargoHash = "sha256-DFsDUoYq+TE8ifwQIl5YfoeUl8udIf1z35rFmLe/4To="; - - # multiple impurities in tests - doCheck = false; - - meta = with lib; { - description = "Build, cache, and run binaries scoped in Cargo.toml rather than installing globally. This acts similarly to npm run and gomodrun, and allows your teams to always be running the same tooling versions"; - mainProgram = "cargo-bin"; - homepage = "https://github.com/dustinblackman/cargo-run-bin"; - changelog = "https://github.com/dustinblackman/cargo-run-bin/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ mightyiam matthiasbeyer ]; - }; -} - diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix deleted file mode 100644 index a219cbd41d1d..000000000000 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, cmake -, zlib -, stdenv -, darwin -, git -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-semver-checks"; - version = "0.34.0"; - - src = fetchFromGitHub { - owner = "obi1kenobi"; - repo = pname; - rev = "v${version}"; - hash = "sha256-U7ykTLEuREe2GTVswcAw3R3h4zbkWxuI2dt/2689xSA="; - }; - - cargoHash = "sha256-NoxYHwY5XpRiqrOjQsaSWQCXFalNAS9SchaKwHbB2uU="; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - zlib - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - checkFlags = [ - # requires internet access - "--skip=detects_target_dependencies" - ]; - - preCheck = '' - patchShebangs scripts/regenerate_test_rustdocs.sh - substituteInPlace scripts/regenerate_test_rustdocs.sh \ - --replace-fail \ - 'TOPLEVEL="$(git rev-parse --show-toplevel)"' \ - "TOPLEVEL=$PWD" - scripts/regenerate_test_rustdocs.sh - ''; - - meta = with lib; { - description = "Tool to scan your Rust crate for semver violations"; - mainProgram = "cargo-semver-checks"; - homepage = "https://github.com/obi1kenobi/cargo-semver-checks"; - changelog = "https://github.com/obi1kenobi/cargo-semver-checks/releases/tag/v${version}"; - license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix deleted file mode 100644 index 80af89869c14..000000000000 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, installShellFiles -, stdenv -, nix-update-script -, callPackage -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-show-asm"; - version = "0.2.39"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-fGUx2SOgs5IF7KTr36fHktykrFkxqLWp4CWVGOZ+MeM="; - }; - - cargoHash = "sha256-iCHf4/bqICZ0bTeFFeVopU0Yl8VbxRd+Cr4WucuptVk="; - - nativeBuildInputs = [ - installShellFiles - ]; - - 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) \ - --zsh <($out/bin/cargo-asm --bpaf-complete-style-zsh) - ''; - - passthru = { - updateScript = nix-update-script { }; - tests = lib.optionalAttrs stdenv.hostPlatform.isx86_64 { - test-basic-x86_64 = callPackage ./test-basic-x86_64.nix { }; - }; - }; - - meta = with lib; { - description = "Cargo subcommand showing the assembly, LLVM-IR and MIR generated for Rust code"; - homepage = "https://github.com/pacak/cargo-show-asm"; - changelog = "https://github.com/pacak/cargo-show-asm/blob/${version}/Changelog.md"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda oxalica matthiasbeyer ]; - mainProgram = "cargo-asm"; - }; -} diff --git a/pkgs/development/tools/rust/cargo-show-asm/test-basic-x86_64.nix b/pkgs/development/tools/rust/cargo-show-asm/test-basic-x86_64.nix deleted file mode 100644 index ca1738f02185..000000000000 --- a/pkgs/development/tools/rust/cargo-show-asm/test-basic-x86_64.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ runCommand, cargo, rustc, cargo-show-asm }: -runCommand "test-basic" { - nativeBuildInputs = [ cargo rustc cargo-show-asm ]; -} '' - mkdir -p src - cat >Cargo.toml <<EOF -[package] -name = "add" -version = "0.0.0" -EOF - cat >src/lib.rs <<EOF -#[inline(never)] pub fn add(a: u32, b: u32) -> u32 { a + b } -EOF - - [[ "$(cargo asm add::add | tee /dev/stderr)" == *"lea eax, "* ]] - [[ "$(cargo asm --mir add | tee /dev/stderr)" == *"= Add("* ]] - touch $out -'' diff --git a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock b/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock deleted file mode 100644 index 830141edf1fe..000000000000 --- a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock +++ /dev/null @@ -1,7741 +0,0 @@ -# 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 = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "getrandom 0.2.15", - "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.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.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" - -[[package]] -name = "anstyle-parse" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" -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 = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "asn1-rs" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" -dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror", - "time", -] - -[[package]] -name = "asn1-rs-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", -] - -[[package]] -name = "asn1-rs-impl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "assert-json-diff" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "assert_cmd" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8" -dependencies = [ - "anstyle", - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-posthog" -version = "0.2.3" -source = "git+https://github.com/shuttle-hq/posthog-rs?branch=main#4a8299fde3080bff550620c0853be9b83fee8f44" -dependencies = [ - "posthog-core", - "reqwest 0.11.27", - "serde", - "serde_json", - "thiserror", - "tokio", -] - -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "async-stripe" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b39347f478f57a40cbaf82cbaebb4a350acc757cda30fc7ff88707a11d1d81" -dependencies = [ - "futures-util", - "http-types", - "hyper 0.14.30", - "hyper-rustls 0.24.2", - "serde", - "serde_json", - "serde_path_to_error", - "serde_qs 0.10.1", - "smart-default", - "smol_str", - "thiserror", - "tokio", -] - -[[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 = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", -] - -[[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 = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6b3804dca60326e07205179847f17a4fce45af3a1106939177ad41ac08a6de" -dependencies = [ - "aws-credential-types", - "aws-http", - "aws-sdk-sso", - "aws-sdk-sts", - "aws-smithy-async", - "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-http-tower", - "aws-smithy-json", - "aws-smithy-types", - "aws-types", - "bytes", - "fastrand 2.1.0", - "hex", - "http 0.2.12", - "hyper 0.14.30", - "ring 0.16.20", - "time", - "tokio", - "tower", - "tracing", - "zeroize", -] - -[[package]] -name = "aws-credential-types" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a66ac8ef5fa9cf01c2d999f39d16812e90ec1467bd382cbbb74ba23ea86201" -dependencies = [ - "aws-smithy-async", - "aws-smithy-types", - "fastrand 2.1.0", - "tokio", - "tracing", - "zeroize", -] - -[[package]] -name = "aws-http" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e626370f9ba806ae4c439e49675fd871f5767b093075cdf4fef16cac42ba900" -dependencies = [ - "aws-credential-types", - "aws-smithy-http", - "aws-smithy-types", - "aws-types", - "bytes", - "http 0.2.12", - "http-body 0.4.6", - "lazy_static", - "percent-encoding", - "pin-project-lite", - "tracing", -] - -[[package]] -name = "aws-runtime" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ac5cf0ff19c1bca0cea7932e11b239d1025a45696a4f44f72ea86e2b8bdd07" -dependencies = [ - "aws-credential-types", - "aws-http", - "aws-sigv4", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "fastrand 2.1.0", - "http 0.2.12", - "percent-encoding", - "tracing", - "uuid", -] - -[[package]] -name = "aws-sdk-rds" -version = "0.33.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45177b4af2c0a04d6b19891f70062609aed49389943882e1fa96f691c6370960" -dependencies = [ - "aws-credential-types", - "aws-http", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-client", - "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", - "regex", - "tokio-stream", - "tracing", -] - -[[package]] -name = "aws-sdk-sso" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "903f888ff190e64f6f5c83fb0f8d54f9c20481f1dc26359bb8896f5d99908949" -dependencies = [ - "aws-credential-types", - "aws-http", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "http 0.2.12", - "regex", - "tokio-stream", - "tracing", -] - -[[package]] -name = "aws-sdk-sts" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47ad6bf01afc00423d781d464220bf69fb6a674ad6629cbbcb06d88cdc2be82" -dependencies = [ - "aws-credential-types", - "aws-http", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-client", - "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", - "regex", - "tracing", -] - -[[package]] -name = "aws-sigv4" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b28f4910bb956b7ab320b62e98096402354eca976c587d1eeccd523d9bac03" -dependencies = [ - "aws-smithy-http", - "form_urlencoded", - "hex", - "hmac", - "http 0.2.12", - "once_cell", - "percent-encoding", - "regex", - "sha2", - "time", - "tracing", -] - -[[package]] -name = "aws-smithy-async" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cdb73f85528b9d19c23a496034ac53703955a59323d581c06aa27b4e4e247af" -dependencies = [ - "futures-util", - "pin-project-lite", - "tokio", - "tokio-stream", -] - -[[package]] -name = "aws-smithy-client" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c27b2756264c82f830a91cb4d2d485b2d19ad5bea476d9a966e03d27f27ba59a" -dependencies = [ - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-http-tower", - "aws-smithy-types", - "bytes", - "fastrand 2.1.0", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", - "hyper-rustls 0.24.2", - "lazy_static", - "pin-project-lite", - "rustls 0.21.12", - "tokio", - "tower", - "tracing", -] - -[[package]] -name = "aws-smithy-http" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54cdcf365d8eee60686885f750a34c190e513677db58bbc466c44c588abf4199" -dependencies = [ - "aws-smithy-types", - "bytes", - "bytes-utils", - "futures-core", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", - "once_cell", - "percent-encoding", - "pin-project-lite", - "pin-utils", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "aws-smithy-http-tower" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822de399d0ce62829a69dfa8c5cd08efdbe61a7426b953e2268f8b8b52a607bd" -dependencies = [ - "aws-smithy-http", - "aws-smithy-types", - "bytes", - "http 0.2.12", - "http-body 0.4.6", - "pin-project-lite", - "tower", - "tracing", -] - -[[package]] -name = "aws-smithy-json" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1e7ab8fa7ad10c193af7ae56d2420989e9f4758bf03601a342573333ea34f" -dependencies = [ - "aws-smithy-types", -] - -[[package]] -name = "aws-smithy-query" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28556a3902091c1f768a34f6c998028921bdab8d47d92586f363f14a4a32d047" -dependencies = [ - "aws-smithy-types", - "urlencoding", -] - -[[package]] -name = "aws-smithy-runtime" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745e096b3553e7e0f40622aa04971ce52765af82bebdeeac53aa6fc82fe801e6" -dependencies = [ - "aws-smithy-async", - "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-runtime-api", - "aws-smithy-types", - "bytes", - "fastrand 2.1.0", - "http 0.2.12", - "http-body 0.4.6", - "once_cell", - "pin-project-lite", - "pin-utils", - "tokio", - "tracing", -] - -[[package]] -name = "aws-smithy-runtime-api" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d0ae0c9cfd57944e9711ea610b48a963fb174a53aabacc08c5794a594b1d02" -dependencies = [ - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-types", - "bytes", - "http 0.2.12", - "tokio", - "tracing", -] - -[[package]] -name = "aws-smithy-types" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d90dbc8da2f6be461fa3c1906b20af8f79d14968fe47f2b7d29d086f62a51728" -dependencies = [ - "base64-simd", - "itoa", - "num-integer", - "ryu", - "serde", - "time", -] - -[[package]] -name = "aws-smithy-xml" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e01d2dedcdd8023043716cfeeb3c6c59f2d447fce365d8e194838891794b23b6" -dependencies = [ - "xmlparser", -] - -[[package]] -name = "aws-types" -version = "0.56.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85aa0451bf8af1bf22a4f028d5d28054507a14be43cb8ac0597a8471fba9edfe" -dependencies = [ - "aws-credential-types", - "aws-smithy-async", - "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-types", - "http 0.2.12", - "rustc_version 0.4.0", - "tracing", -] - -[[package]] -name = "axum" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" -dependencies = [ - "async-trait", - "axum-core", - "base64 0.21.7", - "bitflags 1.3.2", - "bytes", - "futures-util", - "headers", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sha1", - "sync_wrapper 0.1.2", - "tokio", - "tokio-tungstenite", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-extra" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a93e433be9382c737320af3924f7d5fc6f89c155cf2bf88949d8f5126fab283f" -dependencies = [ - "axum", - "axum-core", - "bytes", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "mime", - "pin-project-lite", - "serde", - "tokio", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-server" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447f28c85900215cc1bea282f32d4a2f22d55c5a300afdfbc661c8d6a632e063" -dependencies = [ - "arc-swap", - "bytes", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", - "pin-project-lite", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", - "tokio", - "tokio-rustls 0.24.1", - "tower-service", -] - -[[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 = "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" -dependencies = [ - "serde", -] - -[[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 = "bollard" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03db470b3c0213c47e978da93200259a1eb4dae2e5512cba9955e2b540a6fc6" -dependencies = [ - "base64 0.21.7", - "bollard-stubs", - "bytes", - "futures-core", - "futures-util", - "hex", - "http 0.2.12", - "hyper 0.14.30", - "hyperlocal", - "log", - "pin-project-lite", - "serde", - "serde_derive", - "serde_json", - "serde_repr", - "serde_urlencoded", - "thiserror", - "tokio", - "tokio-util", - "url", - "winapi", -] - -[[package]] -name = "bollard-stubs" -version = "1.43.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b58071e8fd9ec1e930efd28e3a90c1251015872a2ce49f81f36421b86466932e" -dependencies = [ - "serde", - "serde_repr", - "serde_with 3.9.0", -] - -[[package]] -name = "bson" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a88e82b9106923b5c4d6edfca9e7db958d4e98a478ec115022e81b9b38e2c8" -dependencies = [ - "ahash", - "base64 0.13.1", - "bitvec", - "hex", - "indexmap 2.2.6", - "js-sys", - "once_cell", - "rand 0.8.5", - "serde", - "serde_bytes", - "serde_json", - "time", - "uuid", -] - -[[package]] -name = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "regex-automata 0.4.7", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -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 = "bytes" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" - -[[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 = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "camino" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" -dependencies = [ - "serde", -] - -[[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-shuttle" -version = "0.47.0" -dependencies = [ - "anyhow", - "assert_cmd", - "async-trait", - "bollard", - "cargo_metadata", - "chrono", - "clap", - "clap_complete", - "clap_mangen", - "crossterm 0.27.0", - "dialoguer", - "dirs", - "dunce", - "flate2", - "futures", - "git2", - "gix", - "globset", - "headers", - "home", - "ignore", - "indicatif", - "indoc", - "portpicker", - "regex", - "reqwest 0.11.27", - "rexpect", - "rmp-serde", - "semver 1.0.23", - "serde", - "serde_json", - "shuttle-api-client", - "shuttle-common", - "shuttle-common-tests", - "shuttle-proto", - "shuttle-service", - "strum 0.26.3", - "tar", - "tempfile", - "tokio", - "tokio-tungstenite", - "toml", - "toml_edit 0.20.7", - "tonic 0.10.2", - "tracing", - "tracing-subscriber", - "url", - "uuid", - "walkdir", - "webbrowser", - "zip", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver 1.0.23", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cc" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" -dependencies = [ - "jobserver", - "libc", -] - -[[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.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.6", -] - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "clap" -version = "4.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim 0.11.1", -] - -[[package]] -name = "clap_complete" -version = "4.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b4be9c4c4b1f30b78d8a750e0822b6a6102d97e62061c583a6c1dea2dfb33ae" -dependencies = [ - "clap", -] - -[[package]] -name = "clap_derive" -version = "4.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "clap_lex" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" - -[[package]] -name = "clap_mangen" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50dde5bc0c853d6248de457e5eb6e5a674a54b93810a34ded88d882ca1fe2de" -dependencies = [ - "clap", - "roff", -] - -[[package]] -name = "clru" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbd0f76e066e64fdc5631e3bb46381254deab9ef1158292f27c8c57e3bf3fe59" - -[[package]] -name = "colorchoice" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" - -[[package]] -name = "colored" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" -dependencies = [ - "lazy_static", - "windows-sys 0.48.0", -] - -[[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 = "6.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba" -dependencies = [ - "crossterm 0.26.1", - "strum 0.24.1", - "strum_macros 0.24.3", - "unicode-width", -] - -[[package]] -name = "comma" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" - -[[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 = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[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 = "crc" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -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" -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.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" -dependencies = [ - "bitflags 1.3.2", - "crossterm_winapi", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[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", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "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 = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[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 = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core 0.13.4", - "darling_macro 0.13.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]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[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.72", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core 0.13.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.72", -] - -[[package]] -name = "data-encoding" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" - -[[package]] -name = "deadpool" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490" -dependencies = [ - "async-trait", - "deadpool-runtime", - "num_cpus", - "tokio", -] - -[[package]] -name = "deadpool-runtime" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" - -[[package]] -name = "der" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" -dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", -] - -[[package]] -name = "der-parser" -version = "8.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" -dependencies = [ - "asn1-rs", - "displaydoc", - "nom", - "num-bigint", - "num-traits", - "rusticata-macros", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_more" -version = "0.99.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version 0.4.0", - "syn 2.0.72", -] - -[[package]] -name = "dialoguer" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" -dependencies = [ - "console", - "shell-words", - "thiserror", - "zeroize", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "const-oid", - "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 = "dotenvy" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" - -[[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" -dependencies = [ - "serde", -] - -[[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.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[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 = "etcetera" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" -dependencies = [ - "cfg-if", - "home", - "windows-sys 0.48.0", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "faster-hex" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -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 = "finl_unicode" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" - -[[package]] -name = "flate2" -version = "1.0.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "spin 0.9.8", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[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 = "fqdn" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08b1eaa7dfddeab6036292995620bf0435712e619db6d7690605897e76975eb0" - -[[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-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -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-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-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 = "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.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[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 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - -[[package]] -name = "git2" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" -dependencies = [ - "bitflags 2.6.0", - "libc", - "libgit2-sys", - "log", - "url", -] - -[[package]] -name = "gix" -version = "0.63.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "984c5018adfa7a4536ade67990b3ebc6e11ab57b3d6cd9968de0947ca99b4b06" -dependencies = [ - "gix-actor", - "gix-attributes", - "gix-command", - "gix-commitgraph", - "gix-config", - "gix-credentials", - "gix-date", - "gix-diff", - "gix-discover", - "gix-features", - "gix-filter", - "gix-fs", - "gix-glob", - "gix-hash", - "gix-hashtable", - "gix-ignore", - "gix-index", - "gix-lock", - "gix-macros", - "gix-negotiate", - "gix-object", - "gix-odb", - "gix-pack", - "gix-path", - "gix-pathspec", - "gix-prompt", - "gix-protocol", - "gix-ref", - "gix-refspec", - "gix-revision", - "gix-revwalk", - "gix-sec", - "gix-submodule", - "gix-tempfile", - "gix-trace", - "gix-transport", - "gix-traverse", - "gix-url", - "gix-utils", - "gix-validate", - "gix-worktree", - "gix-worktree-state", - "once_cell", - "parking_lot", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-actor" -version = "0.31.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b8ee65074b2bbb91d9d97c15d172ea75043aefebf9869b5b329149dc76501c" -dependencies = [ - "bstr", - "gix-date", - "gix-utils", - "itoa", - "thiserror", - "winnow 0.6.14", -] - -[[package]] -name = "gix-attributes" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eefb48f42eac136a4a0023f49a54ec31be1c7a9589ed762c45dcb9b953f7ecc8" -dependencies = [ - "bstr", - "gix-glob", - "gix-path", - "gix-quote", - "gix-trace", - "kstring", - "smallvec", - "thiserror", - "unicode-bom", -] - -[[package]] -name = "gix-bitmap" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a371db66cbd4e13f0ed9dc4c0fea712d7276805fccc877f77e96374d317e87ae" -dependencies = [ - "thiserror", -] - -[[package]] -name = "gix-chunk" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c8751169961ba7640b513c3b24af61aa962c967aaf04116734975cd5af0c52" -dependencies = [ - "thiserror", -] - -[[package]] -name = "gix-command" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c22e086314095c43ffe5cdc5c0922d5439da4fd726f3b0438c56147c34dc225" -dependencies = [ - "bstr", - "gix-path", - "gix-trace", - "shell-words", -] - -[[package]] -name = "gix-commitgraph" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7b102311085da4af18823413b5176d7c500fb2272eaf391cfa8635d8bcb12c4" -dependencies = [ - "bstr", - "gix-chunk", - "gix-features", - "gix-hash", - "memmap2", - "thiserror", -] - -[[package]] -name = "gix-config" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fafe42957e11d98e354a66b6bd70aeea00faf2f62dd11164188224a507c840" -dependencies = [ - "bstr", - "gix-config-value", - "gix-features", - "gix-glob", - "gix-path", - "gix-ref", - "gix-sec", - "memchr", - "once_cell", - "smallvec", - "thiserror", - "unicode-bom", - "winnow 0.6.14", -] - -[[package]] -name = "gix-config-value" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbd06203b1a9b33a78c88252a625031b094d9e1b647260070c25b09910c0a804" -dependencies = [ - "bitflags 2.6.0", - "bstr", - "gix-path", - "libc", - "thiserror", -] - -[[package]] -name = "gix-credentials" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c70146183bd3c7119329a3c7392d1aa0e0adbe48d727f4df31828fe6d8fdaa1" -dependencies = [ - "bstr", - "gix-command", - "gix-config-value", - "gix-path", - "gix-prompt", - "gix-sec", - "gix-trace", - "gix-url", - "thiserror", -] - -[[package]] -name = "gix-date" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eed6931f21491ee0aeb922751bd7ec97b4b2fe8fbfedcb678e2a2dce5f3b8c0" -dependencies = [ - "bstr", - "itoa", - "thiserror", - "time", -] - -[[package]] -name = "gix-diff" -version = "0.44.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40b9bd8b2d07b6675a840b56a6c177d322d45fa082672b0dad8f063b25baf0a4" -dependencies = [ - "bstr", - "gix-hash", - "gix-object", - "thiserror", -] - -[[package]] -name = "gix-discover" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc27c699b63da66b50d50c00668bc0b7e90c3a382ef302865e891559935f3dbf" -dependencies = [ - "bstr", - "dunce", - "gix-fs", - "gix-hash", - "gix-path", - "gix-ref", - "gix-sec", - "thiserror", -] - -[[package]] -name = "gix-features" -version = "0.38.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac7045ac9fe5f9c727f38799d002a7ed3583cd777e3322a7c4b43e3cf437dc69" -dependencies = [ - "bytes", - "crc32fast", - "flate2", - "gix-hash", - "gix-trace", - "gix-utils", - "libc", - "once_cell", - "prodash", - "sha1_smol", - "thiserror", - "walkdir", -] - -[[package]] -name = "gix-filter" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00ce6ea5ac8fca7adbc63c48a1b9e0492c222c386aa15f513405f1003f2f4ab2" -dependencies = [ - "bstr", - "encoding_rs", - "gix-attributes", - "gix-command", - "gix-hash", - "gix-object", - "gix-packetline-blocking", - "gix-path", - "gix-quote", - "gix-trace", - "gix-utils", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-fs" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3338ff92a2164f5209f185ec0cd316f571a72676bb01d27e22f2867ba69f77a" -dependencies = [ - "fastrand 2.1.0", - "gix-features", - "gix-utils", -] - -[[package]] -name = "gix-glob" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2a29ad0990cf02c48a7aac76ed0dbddeb5a0d070034b83675cc3bbf937eace4" -dependencies = [ - "bitflags 2.6.0", - "bstr", - "gix-features", - "gix-path", -] - -[[package]] -name = "gix-hash" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93d7df7366121b5018f947a04d37f034717e113dcf9ccd85c34b58e57a74d5e" -dependencies = [ - "faster-hex", - "thiserror", -] - -[[package]] -name = "gix-hashtable" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ddf80e16f3c19ac06ce415a38b8591993d3f73aede049cb561becb5b3a8e242" -dependencies = [ - "gix-hash", - "hashbrown 0.14.5", - "parking_lot", -] - -[[package]] -name = "gix-ignore" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "640dbeb4f5829f9fc14d31f654a34a0350e43a24e32d551ad130d99bf01f63f1" -dependencies = [ - "bstr", - "gix-glob", - "gix-path", - "gix-trace", - "unicode-bom", -] - -[[package]] -name = "gix-index" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d8c5a5f1c58edcbc5692b174cda2703aba82ed17d7176ff4c1752eb48b1b167" -dependencies = [ - "bitflags 2.6.0", - "bstr", - "filetime", - "fnv", - "gix-bitmap", - "gix-features", - "gix-fs", - "gix-hash", - "gix-lock", - "gix-object", - "gix-traverse", - "gix-utils", - "gix-validate", - "hashbrown 0.14.5", - "itoa", - "libc", - "memmap2", - "rustix", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-lock" -version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bc7fe297f1f4614774989c00ec8b1add59571dc9b024b4c00acb7dedd4e19d" -dependencies = [ - "gix-tempfile", - "gix-utils", - "thiserror", -] - -[[package]] -name = "gix-macros" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "999ce923619f88194171a67fb3e6d613653b8d4d6078b529b15a765da0edcc17" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "gix-negotiate" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d57dec54544d155a495e01de947da024471e1825d7d3f2724301c07a310d6184" -dependencies = [ - "bitflags 2.6.0", - "gix-commitgraph", - "gix-date", - "gix-hash", - "gix-object", - "gix-revwalk", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-object" -version = "0.42.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25da2f46b4e7c2fa7b413ce4dffb87f69eaf89c2057e386491f4c55cadbfe386" -dependencies = [ - "bstr", - "gix-actor", - "gix-date", - "gix-features", - "gix-hash", - "gix-utils", - "gix-validate", - "itoa", - "smallvec", - "thiserror", - "winnow 0.6.14", -] - -[[package]] -name = "gix-odb" -version = "0.61.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e92b9790e2c919166865d0825b26cc440a387c175bed1b43a2fa99c0e9d45e98" -dependencies = [ - "arc-swap", - "gix-date", - "gix-features", - "gix-fs", - "gix-hash", - "gix-object", - "gix-pack", - "gix-path", - "gix-quote", - "parking_lot", - "tempfile", - "thiserror", -] - -[[package]] -name = "gix-pack" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8da51212dbff944713edb2141ed7e002eea326b8992070374ce13a6cb610b3" -dependencies = [ - "clru", - "gix-chunk", - "gix-features", - "gix-hash", - "gix-hashtable", - "gix-object", - "gix-path", - "gix-tempfile", - "memmap2", - "parking_lot", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-packetline" -version = "0.17.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b70486beda0903b6d5b65dfa6e40585098cdf4e6365ca2dff4f74c387354a515" -dependencies = [ - "bstr", - "faster-hex", - "gix-trace", - "thiserror", -] - -[[package]] -name = "gix-packetline-blocking" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31d42378a3d284732e4d589979930d0d253360eccf7ec7a80332e5ccb77e14a" -dependencies = [ - "bstr", - "faster-hex", - "gix-trace", - "thiserror", -] - -[[package]] -name = "gix-path" -version = "0.10.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d23d5bbda31344d8abc8de7c075b3cf26e5873feba7c4a15d916bce67382bd9" -dependencies = [ - "bstr", - "gix-trace", - "home", - "once_cell", - "thiserror", -] - -[[package]] -name = "gix-pathspec" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76cab098dc10ba2d89f634f66bf196dea4d7db4bf10b75c7a9c201c55a2ee19" -dependencies = [ - "bitflags 2.6.0", - "bstr", - "gix-attributes", - "gix-config-value", - "gix-glob", - "gix-path", - "thiserror", -] - -[[package]] -name = "gix-prompt" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fddabbc7c51c241600ab3c4623b19fa53bde7c1a2f637f61043ed5fcadf000cc" -dependencies = [ - "gix-command", - "gix-config-value", - "parking_lot", - "rustix", - "thiserror", -] - -[[package]] -name = "gix-protocol" -version = "0.45.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c140d4c6d209048826bad78f021a01b612830f89da356efeb31afe8957f8bee" -dependencies = [ - "bstr", - "gix-credentials", - "gix-date", - "gix-features", - "gix-hash", - "gix-transport", - "gix-utils", - "maybe-async", - "thiserror", - "winnow 0.6.14", -] - -[[package]] -name = "gix-quote" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbff4f9b9ea3fa7a25a70ee62f545143abef624ac6aa5884344e70c8b0a1d9ff" -dependencies = [ - "bstr", - "gix-utils", - "thiserror", -] - -[[package]] -name = "gix-ref" -version = "0.44.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3394a2997e5bc6b22ebc1e1a87b41eeefbcfcff3dbfa7c4bd73cb0ac8f1f3e2e" -dependencies = [ - "gix-actor", - "gix-date", - "gix-features", - "gix-fs", - "gix-hash", - "gix-lock", - "gix-object", - "gix-path", - "gix-tempfile", - "gix-utils", - "gix-validate", - "memmap2", - "thiserror", - "winnow 0.6.14", -] - -[[package]] -name = "gix-refspec" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde848865834a54fe4d9b4573f15d0e9a68eaf3d061b42d3ed52b4b8acf880b2" -dependencies = [ - "bstr", - "gix-hash", - "gix-revision", - "gix-validate", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-revision" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63e08f8107ed1f93a83bcfbb4c38084c7cb3f6cd849793f1d5eec235f9b13b2b" -dependencies = [ - "bstr", - "gix-date", - "gix-hash", - "gix-hashtable", - "gix-object", - "gix-revwalk", - "gix-trace", - "thiserror", -] - -[[package]] -name = "gix-revwalk" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4181db9cfcd6d1d0fd258e91569dbb61f94cb788b441b5294dd7f1167a3e788f" -dependencies = [ - "gix-commitgraph", - "gix-date", - "gix-hash", - "gix-hashtable", - "gix-object", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-sec" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fddc27984a643b20dd03e97790555804f98cf07404e0e552c0ad8133266a79a1" -dependencies = [ - "bitflags 2.6.0", - "gix-path", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "gix-submodule" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "921cd49924ac14b6611b22e5fb7bbba74d8780dc7ad26153304b64d1272460ac" -dependencies = [ - "bstr", - "gix-config", - "gix-path", - "gix-pathspec", - "gix-refspec", - "gix-url", - "thiserror", -] - -[[package]] -name = "gix-tempfile" -version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b0e276cd08eb2a22e9f286a4f13a222a01be2defafa8621367515375644b99" -dependencies = [ - "gix-fs", - "libc", - "once_cell", - "parking_lot", - "tempfile", -] - -[[package]] -name = "gix-trace" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f924267408915fddcd558e3f37295cc7d6a3e50f8bd8b606cee0808c3915157e" - -[[package]] -name = "gix-transport" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb0ffa5f869977f5b9566399154055902f05d7e85c787d5eacf551acdd0c4adf" -dependencies = [ - "base64 0.22.1", - "bstr", - "gix-command", - "gix-credentials", - "gix-features", - "gix-packetline", - "gix-quote", - "gix-sec", - "gix-url", - "reqwest 0.12.5", - "thiserror", -] - -[[package]] -name = "gix-traverse" -version = "0.39.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f20cb69b63eb3e4827939f42c05b7756e3488ef49c25c412a876691d568ee2a0" -dependencies = [ - "bitflags 2.6.0", - "gix-commitgraph", - "gix-date", - "gix-hash", - "gix-hashtable", - "gix-object", - "gix-revwalk", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-url" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db829ebdca6180fbe32be7aed393591df6db4a72dbbc0b8369162390954d1cf" -dependencies = [ - "bstr", - "gix-features", - "gix-path", - "home", - "thiserror", - "url", -] - -[[package]] -name = "gix-utils" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35192df7fd0fa112263bad8021e2df7167df4cc2a6e6d15892e1e55621d3d4dc" -dependencies = [ - "fastrand 2.1.0", - "unicode-normalization", -] - -[[package]] -name = "gix-validate" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c27dd34a49b1addf193c92070bcbf3beaf6e10f16a78544de6372e146a0acf" -dependencies = [ - "bstr", - "thiserror", -] - -[[package]] -name = "gix-worktree" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53f6b7de83839274022aff92157d7505f23debf739d257984a300a35972ca94e" -dependencies = [ - "bstr", - "gix-attributes", - "gix-features", - "gix-fs", - "gix-glob", - "gix-hash", - "gix-ignore", - "gix-index", - "gix-object", - "gix-path", - "gix-validate", -] - -[[package]] -name = "gix-worktree-state" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b2835892ce553b15aef7f6f7bb1e39e146fdf71eb99609b86710a7786cf34" -dependencies = [ - "bstr", - "gix-features", - "gix-filter", - "gix-fs", - "gix-glob", - "gix-hash", - "gix-index", - "gix-object", - "gix-path", - "gix-worktree", - "io-close", - "thiserror", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", -] - -[[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.2.6", - "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.6", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[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", -] - -[[package]] -name = "hashlink" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" -dependencies = [ - "hashbrown 0.14.5", -] - -[[package]] -name = "headers" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" -dependencies = [ - "base64 0.21.7", - "bytes", - "headers-core", - "http 0.2.12", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http 0.2.12", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] - -[[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 = "hkdf" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" -dependencies = [ - "hmac", -] - -[[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 = "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.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 = "http-range-header" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" - -[[package]] -name = "http-types" -version = "2.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" -dependencies = [ - "anyhow", - "async-channel", - "base64 0.13.1", - "futures-lite", - "http 0.2.12", - "infer", - "pin-project-lite", - "rand 0.7.3", - "serde", - "serde_json", - "serde_qs 0.8.5", - "serde_urlencoded", - "url", -] - -[[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 = "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 0.5.7", - "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", - "httpdate", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-reverse-proxy" -version = "0.5.2-dev" -source = "git+https://github.com/chesedo/hyper-reverse-proxy?branch=bug/host_header#5f82b7dffe940abf896fe47dadf6c8e87ddc670b" -dependencies = [ - "hyper 0.14.30", - "lazy_static", - "tokio", - "tracing", -] - -[[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", - "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.11", - "rustls-pki-types", - "tokio", - "tokio-rustls 0.26.0", - "tower-service", - "webpki-roots 0.26.3", -] - -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper 0.14.30", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - -[[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 = "hyperlocal" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c" -dependencies = [ - "futures-util", - "hex", - "hyper 0.14.30", - "pin-project", - "tokio", -] - -[[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.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.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" -dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata 0.4.7", - "same-file", - "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", - "serde", -] - -[[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 = "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 = "infer" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" - -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "instant-acme" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d50eb225913c1903c788287ddd0b16369771e5abc988756a5e5927390ba04f" -dependencies = [ - "base64 0.21.7", - "hyper 0.14.30", - "hyper-rustls 0.24.2", - "ring 0.16.20", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "io-close" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cadcf447f06744f8ce713d2d6239bb5bde2c357a452397a9ed90c625da390bc" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "ipconfig" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" -dependencies = [ - "socket2 0.5.7", - "widestring", - "windows-sys 0.48.0", - "winreg 0.50.0", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[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" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -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 = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[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.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" -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 = "jsonwebtoken" -version = "9.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" -dependencies = [ - "base64 0.21.7", - "js-sys", - "pem 3.0.4", - "ring 0.17.8", - "serde", - "serde_json", - "simple_asn1", -] - -[[package]] -name = "kstring" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747" -dependencies = [ - "static_assertions", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -dependencies = [ - "spin 0.9.8", -] - -[[package]] -name = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libgit2-sys" -version = "0.16.2+1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" -dependencies = [ - "cc", - "libc", - "libz-sys", - "pkg-config", -] - -[[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 = "libsqlite3-sys" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[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-cache" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[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" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "matchit" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - -[[package]] -name = "maybe-async" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[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 = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memmap2" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -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 = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - -[[package]] -name = "mongodb" -version = "2.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef206acb1b72389b49bc9985efe7eb1f8a9bb18e5680d262fac26c07f44025f1" -dependencies = [ - "async-trait", - "base64 0.13.1", - "bitflags 1.3.2", - "bson", - "chrono", - "derivative", - "derive_more", - "futures-core", - "futures-executor", - "futures-io", - "futures-util", - "hex", - "hmac", - "lazy_static", - "md-5", - "pbkdf2", - "percent-encoding", - "rand 0.8.5", - "rustc_version_runtime", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", - "serde", - "serde_bytes", - "serde_with 1.14.0", - "sha-1", - "sha2", - "socket2 0.4.10", - "stringprep", - "strsim 0.10.0", - "take_mut", - "thiserror", - "tokio", - "tokio-rustls 0.24.1", - "tokio-util", - "trust-dns-proto", - "trust-dns-resolver", - "typed-builder", - "uuid", - "webpki-roots 0.25.4", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "nix" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset", - "pin-utils", -] - -[[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 = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[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-bigint-dig" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand 0.8.5", - "smallvec", - "zeroize", -] - -[[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-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_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "libc", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[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.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" -dependencies = [ - "memchr", -] - -[[package]] -name = "oid-registry" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" -dependencies = [ - "asn1-rs", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "opentelemetry" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514d24875c140ed269eecc2d1b56d7b71b573716922a763c317fb1b1b4b58f15" -dependencies = [ - "async-trait", - "futures", - "js-sys", - "lazy_static", - "percent-encoding", - "pin-project", - "rand 0.8.5", - "thiserror", -] - -[[package]] -name = "opentelemetry" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" -dependencies = [ - "futures-core", - "futures-sink", - "indexmap 2.2.6", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", -] - -[[package]] -name = "opentelemetry-appender-tracing" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12c4bd073648dae8ac45cfc81588d74b3dc5f334119ac08567ddcbfe16f2d809" -dependencies = [ - "once_cell", - "opentelemetry 0.21.0", - "opentelemetry_sdk", - "tracing", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "opentelemetry-contrib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e448fc8ad3687b1dd9073087941834f54093624c015a7fbd1f1efc5a38a7737" -dependencies = [ - "async-trait", - "http 0.2.12", - "indexmap 1.9.3", - "lazy_static", - "opentelemetry 0.12.0", - "opentelemetry-http 0.1.0", - "rmp", - "thiserror", -] - -[[package]] -name = "opentelemetry-http" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69a853d37ac1c02889211517007a99b2a90d3d7e89526f9af037ada84f1326a1" -dependencies = [ - "async-trait", - "http 0.2.12", - "opentelemetry 0.12.0", - "thiserror", -] - -[[package]] -name = "opentelemetry-http" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f51189ce8be654f9b5f7e70e49967ed894e84a06fc35c6c042e64ac1fc5399e" -dependencies = [ - "async-trait", - "bytes", - "http 0.2.12", - "opentelemetry 0.21.0", - "reqwest 0.11.27", -] - -[[package]] -name = "opentelemetry-otlp" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930" -dependencies = [ - "async-trait", - "futures-core", - "http 0.2.12", - "opentelemetry 0.21.0", - "opentelemetry-http 0.10.0", - "opentelemetry-proto", - "opentelemetry-semantic-conventions", - "opentelemetry_sdk", - "prost 0.11.9", - "reqwest 0.11.27", - "thiserror", - "tokio", - "tonic 0.9.2", -] - -[[package]] -name = "opentelemetry-proto" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1" -dependencies = [ - "opentelemetry 0.21.0", - "opentelemetry_sdk", - "prost 0.11.9", - "tonic 0.9.2", -] - -[[package]] -name = "opentelemetry-semantic-conventions" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" -dependencies = [ - "opentelemetry 0.21.0", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f16aec8a98a457a52664d69e0091bac3a0abd18ead9b641cb00202ba4e0efe4" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "glob", - "once_cell", - "opentelemetry 0.21.0", - "ordered-float", - "percent-encoding", - "rand 0.8.5", - "serde_json", - "thiserror", - "tokio", - "tokio-stream", -] - -[[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 = "4.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be" -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 = "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 0.5.3", - "smallvec", - "windows-targets 0.52.6", -] - -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest", - "hmac", - "password-hash", - "sha2", -] - -[[package]] -name = "pem" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" -dependencies = [ - "base64 0.13.1", -] - -[[package]] -name = "pem" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" -dependencies = [ - "base64 0.21.7", - "serde", -] - -[[package]] -name = "pem" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" -dependencies = [ - "base64 0.22.1", - "serde", -] - -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "permit-client-rs" -version = "2.0.0" -source = "git+https://github.com/shuttle-hq/permit-client-rs?rev=19085ba#19085ba73bb87c879731590f4a3a988e92d076ac" -dependencies = [ - "reqwest 0.11.27", - "serde", - "serde_derive", - "serde_json", - "serde_with 2.3.3", - "url", - "uuid", -] - -[[package]] -name = "permit-pdp-client-rs" -version = "0.2.0" -source = "git+https://github.com/shuttle-hq/permit-pdp-client-rs?rev=37c7296#37c72968adf360aa4e2386c3f0c918b823fb919f" -dependencies = [ - "reqwest 0.11.27", - "serde", - "serde_derive", - "serde_json", - "serde_with 2.3.3", - "url", - "uuid", -] - -[[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 = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der", - "pkcs8", - "spki", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -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 = "portable-atomic" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" - -[[package]] -name = "portpicker" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9" -dependencies = [ - "rand 0.8.5", -] - -[[package]] -name = "posthog-core" -version = "0.1.0" -source = "git+https://github.com/shuttle-hq/posthog-rs?branch=main#4a8299fde3080bff550620c0853be9b83fee8f44" -dependencies = [ - "chrono", - "serde", - "serde_json", - "thiserror", -] - -[[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" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "predicates" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" -dependencies = [ - "anstyle", - "difflib", - "predicates-core", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -dependencies = [ - "diff", - "yansi", -] - -[[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-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "prodash" -version = "28.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79" - -[[package]] -name = "proptest" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" -dependencies = [ - "bit-set", - "bit-vec", - "bitflags 2.6.0", - "lazy_static", - "num-traits", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_xorshift", - "regex-syntax 0.8.4", - "rusty-fork", - "tempfile", - "unarray", -] - -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive 0.11.9", -] - -[[package]] -name = "prost" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" -dependencies = [ - "bytes", - "prost-derive 0.12.6", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[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 0.12.6", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[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.11", - "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 0.8.5", - "ring 0.17.8", - "rustc-hash", - "rustls 0.23.11", - "slab", - "thiserror", - "tinyvec", - "tracing", -] - -[[package]] -name = "quinn-udp" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a78e6f726d84fcf960409f509ae354a32648f090c8d32a2ea8b1a1bc3bab14" -dependencies = [ - "libc", - "once_cell", - "socket2 0.5.7", - "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.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[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 0.5.1", -] - -[[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 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.15", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_xorshift" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" -dependencies = [ - "rand_core 0.6.4", -] - -[[package]] -name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "rcgen" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c4f3084aa3bc7dfbba4eff4fab2a54db4324965d8872ab933565e6fbd83bc6" -dependencies = [ - "pem 3.0.4", - "ring 0.16.20", - "time", - "yasna", -] - -[[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_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 0.2.15", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", -] - -[[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.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.4", -] - -[[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.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 = [ - "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-rustls 0.24.2", - "ipnet", - "js-sys", - "log", - "mime", - "mime_guess", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.12", - "rustls-native-certs", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration", - "tokio", - "tokio-rustls 0.24.1", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots 0.25.4", - "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", - "encoding_rs", - "futures-channel", - "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", - "once_cell", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls 0.23.11", - "rustls-pemfile 2.1.2", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 1.0.1", - "system-configuration", - "tokio", - "tokio-rustls 0.26.0", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots 0.26.3", - "winreg 0.52.0", -] - -[[package]] -name = "reqwest-middleware" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a735987236a8e238bf0296c7e351b999c188ccc11477f311b82b55c93984216" -dependencies = [ - "anyhow", - "async-trait", - "http 0.2.12", - "reqwest 0.11.27", - "serde", - "task-local-extensions", - "thiserror", -] - -[[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 = "rexpect" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ff60778f96fb5a48adbe421d21bf6578ed58c0872d712e7e08593c195adff8" -dependencies = [ - "comma", - "nix", - "regex", - "tempfile", - "thiserror", -] - -[[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 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom 0.2.15", - "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.52.0", -] - -[[package]] -name = "rmp" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" -dependencies = [ - "byteorder", - "num-traits", - "paste", -] - -[[package]] -name = "rmp-serde" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - -[[package]] -name = "roff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" - -[[package]] -name = "rsa" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core 0.6.4", - "signature", - "spki", - "subtle", - "zeroize", -] - -[[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.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - -[[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 = "rustc_version_runtime" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d31b7153270ebf48bf91c65ae5b0c00e749c4cfad505f66530ac74950249582f" -dependencies = [ - "rustc_version 0.2.3", - "semver 0.9.0", -] - -[[package]] -name = "rusticata-macros" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" -dependencies = [ - "nom", -] - -[[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 0.17.8", - "rustls-webpki 0.101.7", - "sct", -] - -[[package]] -name = "rustls" -version = "0.23.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" -dependencies = [ - "once_cell", - "ring 0.17.8", - "rustls-pki-types", - "rustls-webpki 0.102.5", - "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-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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" -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 0.17.8", - "untrusted 0.9.0", -] - -[[package]] -name = "rustls-webpki" -version = "0.102.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" -dependencies = [ - "ring 0.17.8", - "rustls-pki-types", - "untrusted 0.9.0", -] - -[[package]] -name = "rustrict" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe3300a40b60e76a856237ad1fe2210da1f40686705a2211688bb5742109a63" -dependencies = [ - "arrayvec", - "bitflags 1.3.2", - "doc-comment", - "finl_unicode", - "itertools 0.10.5", - "lazy_static", - "rustc-hash", - "strsim 0.10.0", - "unicode-normalization", -] - -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "rusty-fork" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" -dependencies = [ - "fnv", - "quick-error", - "tempfile", - "wait-timeout", -] - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[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 = "scc" -version = "2.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4465c22496331e20eb047ff46e7366455bc01c0c02015c4a376de0b2cd3a1af" -dependencies = [ - "sdd", -] - -[[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 = "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 0.17.8", - "untrusted 0.9.0", -] - -[[package]] -name = "sdd" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85f05a494052771fc5bd0619742363b5e24e5ad72ab3111ec2e27925b8edc5f3" - -[[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 = "serde" -version = "1.0.204" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_bytes" -version = "0.11.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" -dependencies = [ - "serde", -] - -[[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.120" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" -dependencies = [ - "indexmap 2.2.6", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" -dependencies = [ - "itoa", - "serde", -] - -[[package]] -name = "serde_qs" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" -dependencies = [ - "percent-encoding", - "serde", - "thiserror", -] - -[[package]] -name = "serde_qs" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cac3f1e2ca2fe333923a1ae72caca910b98ed0630bb35ef6f8c8517d6e81afa" -dependencies = [ - "percent-encoding", - "serde", - "thiserror", -] - -[[package]] -name = "serde_repr" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "serde_spanned" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" -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 = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" -dependencies = [ - "serde", - "serde_with_macros 1.5.2", -] - -[[package]] -name = "serde_with" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" -dependencies = [ - "base64 0.13.1", - "chrono", - "hex", - "indexmap 1.9.3", - "serde", - "serde_json", - "serde_with_macros 2.3.3", - "time", -] - -[[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.6", - "serde", - "serde_derive", - "serde_json", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" -dependencies = [ - "darling 0.13.4", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "serde_with_macros" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" -dependencies = [ - "darling 0.20.10", - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "serial_test" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" -dependencies = [ - "futures", - "log", - "once_cell", - "parking_lot", - "scc", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "sha-1" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[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 = "sha1_smol" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" - -[[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 = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - -[[package]] -name = "shuttle-admin" -version = "0.47.0" -dependencies = [ - "anyhow", - "clap", - "dirs", - "serde_json", - "shuttle-api-client", - "shuttle-backends", - "shuttle-common", - "tokio", - "toml", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "shuttle-api-client" -version = "0.47.0" -dependencies = [ - "anyhow", - "async-trait", - "headers", - "percent-encoding", - "reqwest 0.11.27", - "reqwest-middleware", - "rmp-serde", - "serde", - "serde_json", - "shuttle-common", - "task-local-extensions", - "tokio", - "tokio-tungstenite", - "tracing", - "url", - "uuid", -] - -[[package]] -name = "shuttle-auth" -version = "0.47.0" -dependencies = [ - "anyhow", - "async-stripe", - "async-trait", - "axum", - "axum-extra", - "base64 0.21.7", - "chrono", - "clap", - "ctor", - "http 0.2.12", - "hyper 0.14.30", - "jsonwebtoken", - "once_cell", - "opentelemetry 0.21.0", - "pem 2.0.1", - "portpicker", - "pretty_assertions", - "ring 0.17.8", - "serde", - "serde_json", - "shuttle-backends", - "shuttle-common", - "shuttle-common-tests", - "sqlx", - "thiserror", - "tokio", - "tower", - "tracing", - "tracing-opentelemetry", - "tracing-subscriber", - "ulid", - "wiremock", -] - -[[package]] -name = "shuttle-backends" -version = "0.47.0" -dependencies = [ - "anyhow", - "async-trait", - "axum", - "base64 0.21.7", - "bytes", - "ctor", - "headers", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", - "jsonwebtoken", - "opentelemetry 0.21.0", - "opentelemetry-appender-tracing", - "opentelemetry-http 0.10.0", - "opentelemetry-otlp", - "opentelemetry_sdk", - "permit-client-rs", - "permit-pdp-client-rs", - "pin-project", - "portpicker", - "reqwest 0.11.27", - "ring 0.17.8", - "rustrict", - "serde", - "serde_json", - "serial_test", - "shuttle-common", - "shuttle-common-tests", - "shuttle-proto", - "sqlx", - "strum 0.26.3", - "test-context", - "thiserror", - "tokio", - "tonic 0.10.2", - "tower", - "tower-http", - "tracing", - "tracing-fluent-assertions", - "tracing-opentelemetry", - "tracing-subscriber", - "ttl_cache", - "uuid", - "wiremock", -] - -[[package]] -name = "shuttle-codegen" -version = "0.47.0" -dependencies = [ - "pretty_assertions", - "proc-macro-error", - "proc-macro2", - "quote", - "reqwest 0.11.27", - "serde", - "serde_json", - "shuttle-common-tests", - "syn 2.0.72", - "tokio", - "trybuild", -] - -[[package]] -name = "shuttle-common" -version = "0.47.0" -dependencies = [ - "anyhow", - "async-trait", - "axum", - "bytes", - "chrono", - "comfy-table", - "crossterm 0.27.0", - "headers", - "http 0.2.12", - "http-body 0.4.6", - "jsonwebtoken", - "opentelemetry 0.21.0", - "opentelemetry-http 0.10.0", - "pin-project", - "proptest", - "rand 0.8.5", - "reqwest 0.11.27", - "semver 1.0.23", - "serde", - "serde_json", - "sqlx", - "strum 0.26.3", - "thiserror", - "tonic 0.10.2", - "tower", - "tracing", - "tracing-opentelemetry", - "tracing-subscriber", - "url", - "uuid", - "wiremock", - "zeroize", -] - -[[package]] -name = "shuttle-common-tests" -version = "0.47.0" -dependencies = [ - "cargo-shuttle", - "hyper 0.14.30", - "portpicker", - "reqwest 0.11.27", - "serde", - "shuttle-common", - "shuttle-proto", - "tokio", - "tokio-stream", - "tonic 0.10.2", - "tower", - "uuid", -] - -[[package]] -name = "shuttle-deployer" -version = "0.47.0" -dependencies = [ - "anyhow", - "async-trait", - "axum", - "cargo_metadata", - "chrono", - "clap", - "ctor", - "flate2", - "hex", - "home", - "hyper 0.14.30", - "hyper-reverse-proxy", - "once_cell", - "opentelemetry 0.21.0", - "portpicker", - "prost-types", - "rand 0.8.5", - "rmp-serde", - "serde", - "serde_json", - "shuttle-backends", - "shuttle-common", - "shuttle-common-tests", - "shuttle-proto", - "shuttle-service", - "sqlx", - "strum 0.26.3", - "tar", - "tempfile", - "thiserror", - "tokio", - "tokio-stream", - "toml", - "tonic 0.10.2", - "tower", - "tracing", - "tracing-opentelemetry", - "tracing-subscriber", - "ulid", - "uuid", -] - -[[package]] -name = "shuttle-gateway" -version = "0.47.0" -dependencies = [ - "anyhow", - "async-posthog", - "async-trait", - "axum", - "axum-server", - "bollard", - "chrono", - "clap", - "colored", - "flate2", - "fqdn", - "futures", - "http 0.2.12", - "hyper 0.14.30", - "hyper-reverse-proxy", - "instant-acme", - "jsonwebtoken", - "lazy_static", - "num_cpus", - "once_cell", - "opentelemetry 0.21.0", - "opentelemetry-contrib", - "opentelemetry-http 0.10.0", - "pem 1.1.1", - "pin-project", - "portpicker", - "rand 0.8.5", - "rcgen", - "reqwest 0.11.27", - "ring 0.17.8", - "rmp-serde", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", - "semver 1.0.23", - "serde", - "serde_json", - "shuttle-backends", - "shuttle-common", - "shuttle-common-tests", - "shuttle-proto", - "snailquote", - "sqlx", - "strum 0.26.3", - "tar", - "tempfile", - "test-context", - "thiserror", - "tokio", - "tonic 0.10.2", - "tower", - "tower-http", - "tracing", - "tracing-opentelemetry", - "tracing-subscriber", - "ttl_cache", - "ulid", - "uuid", - "x509-parser", -] - -[[package]] -name = "shuttle-logger" -version = "0.47.0" -dependencies = [ - "async-trait", - "chrono", - "clap", - "ctor", - "once_cell", - "portpicker", - "pretty_assertions", - "prost-types", - "serde_json", - "shuttle-backends", - "shuttle-common", - "shuttle-common-tests", - "shuttle-proto", - "sqlx", - "thiserror", - "tokio", - "tokio-stream", - "tonic 0.10.2", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "shuttle-proto" -version = "0.47.0" -dependencies = [ - "anyhow", - "async-trait", - "chrono", - "futures-core", - "http 0.2.12", - "portpicker", - "prost 0.12.6", - "prost-types", - "serde_json", - "shuttle-common", - "tokio", - "tonic 0.10.2", - "tower", - "tracing", -] - -[[package]] -name = "shuttle-provisioner" -version = "0.47.0" -dependencies = [ - "aws-config", - "aws-sdk-rds", - "clap", - "ctor", - "fqdn", - "mongodb", - "once_cell", - "portpicker", - "prost 0.12.6", - "rand 0.8.5", - "serde_json", - "shuttle-backends", - "shuttle-common", - "shuttle-common-tests", - "shuttle-proto", - "sqlx", - "thiserror", - "tokio", - "tonic 0.10.2", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "shuttle-resource-recorder" -version = "0.47.0" -dependencies = [ - "async-trait", - "chrono", - "clap", - "portpicker", - "pretty_assertions", - "prost-types", - "serde_json", - "shuttle-backends", - "shuttle-common", - "shuttle-common-tests", - "shuttle-proto", - "sqlx", - "strum 0.26.3", - "thiserror", - "tokio", - "tonic 0.10.2", - "tracing", - "tracing-subscriber", - "ulid", -] - -[[package]] -name = "shuttle-runtime" -version = "0.47.0" -dependencies = [ - "anyhow", - "async-trait", - "colored", - "portpicker", - "serde", - "serde_json", - "shuttle-codegen", - "shuttle-common", - "shuttle-proto", - "shuttle-service", - "strfmt", - "tokio", - "tokio-stream", - "tokio-util", - "tonic 0.10.2", - "tracing-subscriber", - "uuid", -] - -[[package]] -name = "shuttle-service" -version = "0.47.0" -dependencies = [ - "anyhow", - "async-trait", - "cargo_metadata", - "dunce", - "serde", - "shuttle-common", - "shuttle-proto", - "strfmt", - "thiserror", - "tokio", - "toml", - "tracing", -] - -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - -[[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 = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core 0.6.4", -] - -[[package]] -name = "simple_asn1" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" -dependencies = [ - "num-bigint", - "num-traits", - "thiserror", - "time", -] - -[[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 = "smart-default" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "smol_str" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9" -dependencies = [ - "serde", -] - -[[package]] -name = "snailquote" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec62a949bda7f15800481a711909f946e1204f2460f89210eaf7f57730f88f86" -dependencies = [ - "thiserror", - "unicode_categories", -] - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[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.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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "sqlformat" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f" -dependencies = [ - "nom", - "unicode_categories", -] - -[[package]] -name = "sqlx" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" -dependencies = [ - "sqlx-core", - "sqlx-macros", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", -] - -[[package]] -name = "sqlx-core" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" -dependencies = [ - "ahash", - "atoi", - "byteorder", - "bytes", - "chrono", - "crc", - "crossbeam-queue", - "either", - "event-listener", - "futures-channel", - "futures-core", - "futures-intrusive", - "futures-io", - "futures-util", - "hashlink", - "hex", - "indexmap 2.2.6", - "log", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "sha2", - "smallvec", - "sqlformat", - "thiserror", - "tokio", - "tokio-stream", - "tracing", - "url", - "uuid", - "webpki-roots 0.25.4", -] - -[[package]] -name = "sqlx-macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" -dependencies = [ - "proc-macro2", - "quote", - "sqlx-core", - "sqlx-macros-core", - "syn 1.0.109", -] - -[[package]] -name = "sqlx-macros-core" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" -dependencies = [ - "dotenvy", - "either", - "heck 0.4.1", - "hex", - "once_cell", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2", - "sqlx-core", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", - "syn 1.0.109", - "tempfile", - "tokio", - "url", -] - -[[package]] -name = "sqlx-mysql" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" -dependencies = [ - "atoi", - "base64 0.21.7", - "bitflags 2.6.0", - "byteorder", - "bytes", - "chrono", - "crc", - "digest", - "dotenvy", - "either", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "generic-array", - "hex", - "hkdf", - "hmac", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "percent-encoding", - "rand 0.8.5", - "rsa", - "serde", - "sha1", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing", - "uuid", - "whoami", -] - -[[package]] -name = "sqlx-postgres" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" -dependencies = [ - "atoi", - "base64 0.21.7", - "bitflags 2.6.0", - "byteorder", - "chrono", - "crc", - "dotenvy", - "etcetera", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "hex", - "hkdf", - "hmac", - "home", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "rand 0.8.5", - "serde", - "serde_json", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing", - "uuid", - "whoami", -] - -[[package]] -name = "sqlx-sqlite" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" -dependencies = [ - "atoi", - "chrono", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "serde", - "sqlx-core", - "tracing", - "url", - "urlencoding", - "uuid", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strfmt" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8348af2d9fc3258c8733b8d9d8db2e56f54b2363a4b5b81585c7875ed65e65" - -[[package]] -name = "stringprep" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" -dependencies = [ - "unicode-bidi", - "unicode-normalization", - "unicode-properties", -] - -[[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.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" - -[[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.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - -[[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 = "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.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - -[[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 = "take_mut" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "tar" -version = "0.4.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "task-local-extensions" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8" -dependencies = [ - "pin-utils", -] - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand 2.1.0", - "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 = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "test-context" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6676ab8513edfd2601a108621103fdb45cac9098305ca25ec93f7023b06b05d9" -dependencies = [ - "futures", - "test-context-macros", -] - -[[package]] -name = "test-context-macros" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ea17a2dc368aeca6f554343ced1b1e31f76d63683fa8016e5844bd7a5144a1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[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 = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "libc", - "num-conv", - "num_threads", - "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 = "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 = "tokio" -version = "1.38.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.7", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-macros" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[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.11", - "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-tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" -dependencies = [ - "futures-util", - "log", - "rustls 0.21.12", - "tokio", - "tokio-rustls 0.24.1", - "tungstenite", - "webpki-roots 0.25.4", -] - -[[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-io", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.16", -] - -[[package]] -name = "toml_datetime" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" -dependencies = [ - "indexmap 2.2.6", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.14", -] - -[[package]] -name = "tonic" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" -dependencies = [ - "async-trait", - "axum", - "base64 0.21.7", - "bytes", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost 0.11.9", - "tokio", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tonic" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.21.7", - "bytes", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost 0.12.6", - "tokio", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "indexmap 1.9.3", - "pin-project", - "pin-project-lite", - "rand 0.8.5", - "slab", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" -dependencies = [ - "bitflags 2.6.0", - "bytes", - "futures-core", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "http-range-header", - "pin-project-lite", - "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" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -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 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", - "valuable", -] - -[[package]] -name = "tracing-fluent-assertions" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de1a8c6bcfee614305e836308b596bbac831137a04c61f7e5b0b0bf2cfeaf6" -dependencies = [ - "tracing", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-opentelemetry" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" -dependencies = [ - "js-sys", - "once_cell", - "opentelemetry 0.21.0", - "opentelemetry_sdk", - "smallvec", - "tracing", - "tracing-core", - "tracing-log", - "tracing-subscriber", - "web-time 0.2.4", -] - -[[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", - "tracing-serde", -] - -[[package]] -name = "trust-dns-proto" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.2.3", - "ipnet", - "lazy_static", - "log", - "rand 0.8.5", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "url", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" -dependencies = [ - "cfg-if", - "futures-util", - "ipconfig", - "lazy_static", - "log", - "lru-cache", - "parking_lot", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "trust-dns-proto", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "trybuild" -version = "1.0.97" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b1e5645f2ee8025c2f1d75e1138f2dd034d74e6ba54620f3c569ba2a2a1ea06" -dependencies = [ - "glob", - "serde", - "serde_derive", - "serde_json", - "termcolor", - "toml", -] - -[[package]] -name = "ttl_cache" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4189890526f0168710b6ee65ceaedf1460c48a14318ceec933cb26baa492096a" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 0.2.12", - "httparse", - "log", - "rand 0.8.5", - "rustls 0.21.12", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "typed-builder" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "ulid" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f903f293d11f31c0c29e4148f6dc0d033a7f80cebc0282bea147611667d289" -dependencies = [ - "getrandom 0.2.15", - "rand 0.8.5", - "serde", - "web-time 1.1.0", -] - -[[package]] -name = "unarray" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" - -[[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-bom" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217" - -[[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-properties" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" - -[[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-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "untrusted" -version = "0.9.0" -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", - "serde", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -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.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 0.2.15", - "serde", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "vsimd" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "waker-fn" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" - -[[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.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" - -[[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 = "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 = "web-time" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[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 = "webbrowser" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b" -dependencies = [ - "core-foundation", - "home", - "jni", - "log", - "ndk-context", - "objc", - "raw-window-handle", - "url", - "web-sys", -] - -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - -[[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 = "whoami" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" -dependencies = [ - "redox_syscall 0.4.1", - "wasite", -] - -[[package]] -name = "widestring" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" - -[[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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" -dependencies = [ - "windows-sys 0.52.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-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-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 = "winnow" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374ec40a2d767a3c1b4972d9475ecd557356637be906f2cb3f7fe17a6eb5e22f" -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 = "wiremock" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a59f8ae78a4737fb724f20106fb35ccb7cfe61ff335665d3042b3aa98e34717" -dependencies = [ - "assert-json-diff", - "async-trait", - "base64 0.21.7", - "deadpool", - "futures", - "http 1.1.0", - "http-body-util", - "hyper 1.4.1", - "hyper-util", - "log", - "once_cell", - "regex", - "serde", - "serde_json", - "tokio", - "url", -] - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "x509-parser" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" -dependencies = [ - "asn1-rs", - "data-encoding", - "der-parser", - "lazy_static", - "nom", - "oid-registry", - "rusticata-macros", - "thiserror", - "time", -] - -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys", - "rustix", -] - -[[package]] -name = "xmlparser" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - -[[package]] -name = "yasna" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" -dependencies = [ - "time", -] - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "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 = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" - -[[package]] -name = "zip" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" -dependencies = [ - "aes", - "byteorder", - "bzip2", - "constant_time_eq", - "crc32fast", - "crossbeam-utils", - "flate2", - "hmac", - "pbkdf2", - "sha1", - "time", - "zstd", -] - -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "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 = "0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/pkgs/development/tools/rust/cargo-shuttle/default.nix b/pkgs/development/tools/rust/cargo-shuttle/default.nix deleted file mode 100644 index 61a0bf1c6c06..000000000000 --- a/pkgs/development/tools/rust/cargo-shuttle/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - pkg-config, - openssl, - zlib, - stdenv, - darwin, -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-shuttle"; - version = "0.47.0"; - - src = fetchFromGitHub { - owner = "shuttle-hq"; - repo = "shuttle"; - rev = "v${version}"; - hash = "sha256-AJ+7IUxi5SRRWw0EHh9JmQHkdQU3Mhd1Nmo1peEG2zg="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "async-posthog-0.2.3" = "sha256-V0f9+UKZkqh80p7UjINEbAW9y8cKBmJTRjAJZV3no1M="; - "hyper-reverse-proxy-0.5.2-dev" = "sha256-R1ZXGgWvwHWRHmKX823QLqM6ZJW+tzWUXigKkAyI5OE="; - "permit-client-rs-2.0.0" = "sha256-MxsgqPbvWDYDOb3oGuD1I6d3cdcGAhfoWsI7cwfhrb4="; - "permit-pdp-client-rs-0.2.0" = "sha256-F9wSvo3WzoRXjZb+We0Bvcwx3rRSG1QxXPsvrmtIN38="; - }; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = - [ - openssl - zlib - ] - ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - cargoBuildFlags = [ - "-p" - "cargo-shuttle" - ]; - - cargoTestFlags = cargoBuildFlags ++ [ - # other tests are failing for different reasons - "init::shuttle_init_tests::" - ]; - - meta = with lib; { - description = "Cargo command for the shuttle platform"; - mainProgram = "cargo-shuttle"; - homepage = "https://shuttle.rs"; - changelog = "https://github.com/shuttle-hq/shuttle/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-sort/default.nix b/pkgs/development/tools/rust/cargo-sort/default.nix deleted file mode 100644 index 53f941e788d0..000000000000 --- a/pkgs/development/tools/rust/cargo-sort/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ fetchFromGitHub, lib, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-sort"; - version = "1.0.9"; - - src = fetchFromGitHub { - owner = "devinr528"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-fqmyL4ZSz+nKfUIrcrfLRT9paEas5d00Y/kvEqyz2vw="; - }; - - cargoHash = "sha256-JON6cE1ZHeI+0vU9AJp0e1TIbiH3AWjHyn0jd9PNqQU="; - - meta = with lib; { - description = "Tool to check that your Cargo.toml dependencies are sorted alphabetically"; - mainProgram = "cargo-sort"; - homepage = "https://github.com/devinr528/cargo-sort"; - changelog = "https://github.com/devinr528/cargo-sort/blob/v${version}/changelog.md"; - license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/development/tools/rust/cargo-spellcheck/default.nix index aae0be337614..6d6bfa5ae258 100644 --- a/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; preCheck = "HOME=$(mktemp -d)"; diff --git a/pkgs/development/tools/rust/cargo-supply-chain/default.nix b/pkgs/development/tools/rust/cargo-supply-chain/default.nix deleted file mode 100644 index 395a48498237..000000000000 --- a/pkgs/development/tools/rust/cargo-supply-chain/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-supply-chain"; - version = "0.3.3"; - - src = fetchFromGitHub { - owner = "rust-secure-code"; - repo = "cargo-supply-chain"; - rev = "v${version}"; - hash = "sha256-KjeYB9TFbuJ2KPaObeM0ADs5F8uJJ6/czMPQjBUgIk8="; - }; - - cargoHash = "sha256-Fx1C4X0dQqePqLa+X+4ZDrIMFKBQ6J50nBApYXcGbFM="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - meta = with lib; { - description = "Gather author, contributor and publisher data on crates in your dependency graph"; - mainProgram = "cargo-supply-chain"; - homepage = "https://github.com/rust-secure-code/cargo-supply-chain"; - changelog = "https://github.com/rust-secure-code/cargo-supply-chain/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ asl20 mit zlib ]; # any of three - maintainers = with maintainers; [ figsoda matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix deleted file mode 100644 index 8e04ed2bc9f8..000000000000 --- a/pkgs/development/tools/rust/cargo-sweep/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-sweep"; - version = "0.7.0"; - - src = fetchFromGitHub { - owner = "holmgr"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-L9tWTgW8PIjxeby+wa71NPp3kWMYH5D7PNtpk8Bmeyc="; - }; - - cargoHash = "sha256-aalB7gHLc3YIgSOg68wc2fyzXFGfHO5x5YdzhuRmyro="; - - checkFlags = [ - # Requires a rustup toolchain to be installed. - "--skip check_toolchain_listing_on_multiple_projects" - ]; - - meta = with lib; { - description = "Cargo subcommand for cleaning up unused build files generated by Cargo"; - mainProgram = "cargo-sweep"; - homepage = "https://github.com/holmgr/cargo-sweep"; - license = licenses.mit; - maintainers = with maintainers; [ xrelkd matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/pkgs/development/tools/rust/cargo-sync-readme/default.nix deleted file mode 100644 index 953553cb948c..000000000000 --- a/pkgs/development/tools/rust/cargo-sync-readme/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-sync-readme"; - version = "1.1"; - - src = fetchFromGitHub { - owner = "phaazon"; - repo = pname; - rev = version; - sha256 = "sha256-n9oIWblTTuXFFQFN6mpQiCH5N7yg5fAp8v9vpB5/DAo="; - }; - - 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"; - mainProgram = "cargo-sync-readme"; - homepage = "https://github.com/phaazon/cargo-sync-readme"; - changelog = "https://github.com/phaazon/cargo-sync-readme/blob/${version}/CHANGELOG.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ b4dm4n matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix deleted file mode 100644 index 828f50e467c3..000000000000 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, rustPlatform, fetchCrate, stdenv, darwin }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-tally"; - version = "1.0.48"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-BrWJKM7Vkvjlkn3PCBe45epQc2SkjKVlttQF0/AHSls="; - }; - - cargoHash = "sha256-Dkz3QJchUAn4/kQsmQcSfxVrRdiCA2qJSOTszfvE4No="; - - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ - DiskArbitration - Foundation - IOKit - ]); - - meta = with lib; { - description = "Graph the number of crates that depend on your crate over time"; - mainProgram = "cargo-tally"; - homepage = "https://github.com/dtolnay/cargo-tally"; - changelog = "https://github.com/dtolnay/cargo-tally/releases/tag/${version}"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix deleted file mode 100644 index 1dcc79fb4b75..000000000000 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - lib, - stdenv, - rustPlatform, - fetchFromGitHub, - openssl, - pkg-config, - glibc, - libsoup, - cairo, - gtk3, - webkitgtk, - darwin, -}: - -let - inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; -in -rustPlatform.buildRustPackage rec { - pname = "tauri"; - version = "1.7.1-unstable-2024-08-16"; - - src = fetchFromGitHub { - owner = "tauri-apps"; - repo = "tauri"; - rev = "2b61447dfc167ec11724f99671bf9e2de0bf6768"; - hash = "sha256-gKG7olZuTCkW+SKI3FVZqgS6Pp5hFemRJshdma8rpyg="; - }; - - # 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-VXg/dAhwPTSrLwJm8HNzAi/sVF9RqgpHIF3PZe1LjSA="; - - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.isLinux [ - glibc - libsoup - cairo - gtk3 - webkitgtk - ] - ++ lib.optionals stdenv.isDarwin [ - CoreServices - Security - SystemConfiguration - ]; - nativeBuildInputs = [ pkg-config ]; - - meta = { - description = "Build smaller, faster, and more secure desktop applications with a web frontend"; - mainProgram = "cargo-tauri"; - homepage = "https://tauri.app/"; - license = with lib.licenses; [ - asl20 # or - mit - ]; - maintainers = with lib.maintainers; [ - dit7ya - happysalada - ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-temp/default.nix b/pkgs/development/tools/rust/cargo-temp/default.nix deleted file mode 100644 index 8f1e96c5562d..000000000000 --- a/pkgs/development/tools/rust/cargo-temp/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-temp"; - version = "0.2.22"; - - src = fetchFromGitHub { - owner = "yozhgoor"; - repo = "cargo-temp"; - rev = "v${version}"; - hash = "sha256-gsrmHCj9DC6OkGS0CD/NE2UMc/9TdjA2In6f3iKXMOg="; - }; - - cargoHash = "sha256-ryvv4SuhxIXPJKa3WLdjNQZAP+JLAjWtrCfWXUm+WVg="; - - meta = with lib; { - description = "CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies"; - mainProgram = "cargo-temp"; - homepage = "https://github.com/yozhgoor/cargo-temp"; - changelog = "https://github.com/yozhgoor/cargo-temp/releases/tag/${src.rev}"; - license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-toml-lint/default.nix b/pkgs/development/tools/rust/cargo-toml-lint/default.nix deleted file mode 100644 index a32f6e4bc695..000000000000 --- a/pkgs/development/tools/rust/cargo-toml-lint/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-toml-lint"; - version = "0.1.1"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-U3y9gnFvkqJmyFqRAUQorJQY0iRzAE9UUXzFmgZIyaM="; - }; - - cargoHash = "sha256-ujdekIucqes2Wya4jwTMLstb8JMptbAlqYhgMxfp2gg="; - - meta = with lib; { - description = "Simple linter for Cargo.toml manifests"; - mainProgram = "cargo-toml-lint"; - homepage = "https://github.com/fuellabs/cargo-toml-lint"; - changelog = "https://github.com/fuellabs/cargo-toml-lint/releases/tag/v${version}"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ mitchmindtree matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index bc72b8a6a757..16ef0f6ea57b 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,22 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.50"; + version = "0.1.52"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SU9SX+Z03CnJAuR1RCdSuU5Q+lxqAbqJY4SA83Ezj8M="; + sha256 = "sha256-ArFQaQQU6lOT5wS9vxC+hCYpDWaq7D1DbQhjGzPQEjo="; }; - cargoHash = "sha256-HWJt9WaSKVJDcUEOgi0Zai3k44KyQqs+ckTAZfZyibA="; + cargoHash = "sha256-fRTOhZVehGBwQcJQM/GWmLgfaDK7aJFYz772MPYhkn4="; nativeBuildInputs = [ pkg-config ]; # TODO figure out how to use provided curl instead of compiling curl from curl-sys buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security libiconv SystemConfiguration ]; # Requires network access doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-ui/default.nix b/pkgs/development/tools/rust/cargo-ui/default.nix deleted file mode 100644 index 01578e497deb..000000000000 --- a/pkgs/development/tools/rust/cargo-ui/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, pkg-config -, libgit2 -, openssl -, stdenv -, expat -, fontconfig -, libGL -, xorg -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-ui"; - version = "0.3.3"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-M/ljgtTHMSc7rY/a8CpKGNuOSdVDwRt6+tzPPHdpKOw="; - }; - - cargoHash = "sha256-u3YqXQZCfveSBjxdWb+GC0IA9bpruAYQdxX1zanT3fw="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - libgit2 - openssl - ] ++ lib.optionals stdenv.isLinux [ - expat - fontconfig - libGL - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr - xorg.libxcb - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; - - postFixup = lib.optionalString stdenv.isLinux '' - patchelf $out/bin/cargo-ui \ - --add-rpath ${lib.makeLibraryPath [ fontconfig libGL ]} - ''; - - env = { - LIBGIT2_NO_VENDOR = 1; - }; - - meta = with lib; { - description = "GUI for Cargo"; - mainProgram = "cargo-ui"; - homepage = "https://github.com/slint-ui/cargo-ui"; - changelog = "https://github.com/slint-ui/cargo-ui/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit asl20 gpl3Only ]; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-unused-features/default.nix b/pkgs/development/tools/rust/cargo-unused-features/default.nix deleted file mode 100644 index 32fae29d903a..000000000000 --- a/pkgs/development/tools/rust/cargo-unused-features/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, curl -, pkg-config -, libgit2 -, openssl -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-unused-features"; - version = "0.2.0"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-gdwIbbQDw/DgBV9zY2Rk/oWjPv1SS/+oFnocsMo2Axo="; - }; - - cargoHash = "sha256-K9I7Eg43BS2SKq5zZ3eZrMkmuHAx09OX240sH0eGs+k="; - - nativeBuildInputs = [ - curl.dev - pkg-config - ]; - - buildInputs = [ - curl - libgit2 - openssl - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - ]; - - env = { - LIBGIT2_NO_VENDOR = 1; - }; - - meta = with lib; { - description = "Tool to find potential unused enabled feature flags and prune them"; - homepage = "https://github.com/timonpost/cargo-unused-features"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; - mainProgram = "unused-features"; - }; -} diff --git a/pkgs/development/tools/rust/cargo-update/default.nix b/pkgs/development/tools/rust/cargo-update/default.nix deleted file mode 100644 index f2aa80920811..000000000000 --- a/pkgs/development/tools/rust/cargo-update/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, cmake -, installShellFiles -, pkg-config -, ronn -, stdenv -, curl -, libgit2 -, libssh2 -, openssl -, zlib -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-update"; - version = "14.1.1"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-2UV+BetL6MBHAyPcMTbssLNgJQKoJOo2iG3uGPWSrUs="; - }; - - cargoHash = "sha256-Qn2DquO3HmhZvCk6FaowodgURvtA5gXrztN+wp60bSA="; - - nativeBuildInputs = [ - cmake - installShellFiles - pkg-config - ronn - ] ++ lib.optionals stdenv.isDarwin [ - curl - ]; - - buildInputs = [ - libgit2 - libssh2 - openssl - zlib - ] ++ lib.optionals stdenv.isDarwin [ - curl - darwin.apple_sdk.frameworks.Security - ]; - - postBuild = '' - # Man pages contain non-ASCII, so explicitly set encoding to UTF-8. - HOME=$TMPDIR \ - RUBYOPT="-E utf-8:utf-8" \ - ronn -r --organization="cargo-update developers" man/*.md - ''; - - postInstall = '' - installManPage man/*.1 - ''; - - env = { - LIBGIT2_NO_VENDOR = 1; - }; - - meta = with lib; { - description = "Cargo subcommand for checking and applying updates to installed executables"; - homepage = "https://github.com/nabijaczleweli/cargo-update"; - changelog = "https://github.com/nabijaczleweli/cargo-update/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ gerschtli Br1ght0ne johntitor matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-valgrind/default.nix b/pkgs/development/tools/rust/cargo-valgrind/default.nix deleted file mode 100644 index 1020caad551b..000000000000 --- a/pkgs/development/tools/rust/cargo-valgrind/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, nix-update-script -, makeWrapper -, valgrind -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-valgrind"; - version = "2.1.1"; - - src = fetchFromGitHub { - owner = "jfrimmel"; - repo = "cargo-valgrind"; - rev = "v${version}"; - sha256 = "sha256-l/1paghG/ARD0JfzNh0xj2UD5kW6FddM8Xrd/FCygYc="; - }; - - cargoHash = "sha256-9/kIIZDIsOhUvRT3TyXN5PGFUB+a8m2yXmzBbsPUK28="; - - passthru = { - updateScript = nix-update-script { }; - }; - - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram $out/bin/cargo-valgrind --prefix PATH : ${lib.makeBinPath [ valgrind ]} - ''; - - checkFlags = [ - "--skip examples_are_runnable" - "--skip tests_are_runnable" - ]; - - meta = with lib; { - description = ''Cargo subcommand "valgrind": runs valgrind and collects its output in a helpful manner''; - mainProgram = "cargo-valgrind"; - homepage = "https://github.com/jfrimmel/cargo-valgrind"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ otavio matthiasbeyer ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-vet/default.nix b/pkgs/development/tools/rust/cargo-vet/default.nix index 96822b3078d2..69c5d69d2c69 100644 --- a/pkgs/development/tools/rust/cargo-vet/default.nix +++ b/pkgs/development/tools/rust/cargo-vet/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-M8sZzgSEMIB6pPVaE+tC18MCbwYaYpHOnhrEvm9JTso="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; # the test_project tests require internet access checkFlags = [ diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index 69c04b520b30..91e7fea0fa10 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -8,20 +8,20 @@ rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "8.5.2"; + version = "8.5.3"; src = fetchFromGitHub { owner = "watchexec"; repo = pname; rev = "v${version}"; - hash = "sha256-Vf6BFr8MphaUJoHMtksbbVQb+jha7jowhktQCVFxlxQ="; + hash = "sha256-agwK20MkvnhqSVAWMy3HLkUJbraINn12i6VAg8mTzBk="; }; - cargoHash = "sha256-skUG1B6TCFEXeQSRwA6vWjXmNifk5bTR4+JESw7CZMo="; + cargoHash = "sha256-oqGc5haN8Jyi0eQf8egrRXWxi0RGVdIFhpGKgmFB8DI="; - buildInputs = lib.optionals stdenv.isDarwin [ Foundation Cocoa ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation Cocoa ]; - NIX_LDFLAGS = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "-framework" "AppKit" ]; + NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-framework" "AppKit" ]; # `test with_cargo` tries to call cargo-watch as a cargo subcommand # (calling cargo-watch with command `cargo watch`) diff --git a/pkgs/development/tools/rust/cargo-web/default.nix b/pkgs/development/tools/rust/cargo-web/default.nix index 11f1fc6aacf0..ace033d6a114 100644 --- a/pkgs/development/tools/rust/cargo-web/default.nix +++ b/pkgs/development/tools/rust/cargo-web/default.nix @@ -1,5 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, openssl, perl, pkg-config, rustPlatform -, CoreServices, Security +{ + lib, + stdenv, + fetchFromGitHub, + openssl, + perl, + pkg-config, + rustPlatform, + CoreServices, + Security, + fetchpatch, }: rustPlatform.buildRustPackage rec { @@ -13,16 +22,34 @@ rustPlatform.buildRustPackage rec { sha256 = "1dl5brj5fnmxmwl130v36lvy4j64igdpdvjwmxw3jgg2c6r6b7cd"; }; + patches = [ + (fetchpatch { + name = "fix-qualified-path.patch"; + url = "https://github.com/koute/cargo-web/commit/c9584542163d60d0aae6d6890509794e838e257f.patch"; + hash = "sha256-w59fXmrszptKt0llqGt0AF+0b3r9N6xUY6zQkpZnemE="; + }) + ]; + cargoHash = "sha256-apPXSG8RV9hZ+jttn4XHhgmuLQ7344SQJna7Z/fu/mA="; - nativeBuildInputs = [ openssl perl pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; + nativeBuildInputs = [ + openssl + perl + pkg-config + ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + CoreServices + Security + ]; meta = with lib; { description = "Cargo subcommand for the client-side Web"; mainProgram = "cargo-web"; homepage = "https://github.com/koute/cargo-web"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ kevincox ]; + license = with licenses; [ + asl20 # or + mit + ]; + maintainers = with maintainers; [ clevor ]; }; } diff --git a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix index 4e757c6402a3..42b3078f4e94 100644 --- a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix +++ b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Simple cargo plugin to get a list of features for a specific crate"; diff --git a/pkgs/development/tools/rust/cargo-wipe/default.nix b/pkgs/development/tools/rust/cargo-wipe/default.nix deleted file mode 100644 index af9ae57c7cb8..000000000000 --- a/pkgs/development/tools/rust/cargo-wipe/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, nix-update-script -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-wipe"; - version = "0.3.3"; - - src = fetchFromGitHub { - owner = "mihai-dinculescu"; - repo = "cargo-wipe"; - rev = "v${version}"; - sha256 = "sha256-xMYpZ6a8HdULblkfEqnqLjX8OVFJWx8MHDGNhuFzdTc="; - }; - - cargoHash = "sha256-/cne7uTGyxgTRONWMEE5dPbPDnCxf+ZnYzYXRAeHJyQ="; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = ''Cargo subcommand "wipe": recursively finds and optionally wipes all "target" or "node_modules" folders''; - mainProgram = "cargo-wipe"; - homepage = "https://github.com/mihai-dinculescu/cargo-wipe"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ otavio ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-workspaces/default.nix b/pkgs/development/tools/rust/cargo-workspaces/default.nix deleted file mode 100644 index 32c4730b3940..000000000000 --- a/pkgs/development/tools/rust/cargo-workspaces/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, pkg-config -, libssh2 -, openssl -, zlib -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-workspaces"; - version = "0.3.6"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-JqLKFVM/EnVAPF7erINpHdaaDG+g2nbB0iE/hB1gml8="; - }; - - cargoHash = "sha256-wFf6M99IJAZ7YlPBKUZA2mgAS/LNB128GIjDHxr4pMo="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - libssh2 - openssl - zlib - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - env = { - LIBSSH2_SYS_USE_PKG_CONFIG = true; - }; - - meta = with lib; { - description = "Tool for managing cargo workspaces and their crates, inspired by lerna"; - longDescription = '' - A tool that optimizes the workflow around cargo workspaces with - git and cargo by providing utilities to version, publish, execute - commands and more. - ''; - homepage = "https://github.com/pksunkara/cargo-workspaces"; - changelog = "https://github.com/pksunkara/cargo-workspaces/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda macalinao matthiasbeyer ]; - mainProgram = "cargo-workspaces"; - }; -} diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix deleted file mode 100644 index 55911b7f8a62..000000000000 --- a/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-xbuild"; - version = "0.6.6"; - - src = fetchFromGitHub { - owner = "rust-osdev"; - repo = pname; - rev = "v${version}"; - hash = "sha256-29rCjmzxxIjR5nBN2J3xxP+r8NnPIJV90FkSQQEBbo4="; - }; - - cargoHash = "sha256-tyPhKWDSDNxQy+vpWNS5VP5D8TkUR7MJSAlG8wZsDy4="; - - meta = with lib; { - description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc"; - homepage = "https://github.com/rust-osdev/cargo-xbuild"; - license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ johntitor xrelkd ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 3a6a509bda09..a481d649e576 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.2"; + version = "0.19.4"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - hash = "sha256-O3Sg7wVNqTH8uhBSlVpmPNmFv+JC9/tw3G0LcOYUzKc="; + hash = "sha256-b1TzMqX+mt14rhOLQQHnHYN69peEfXGpyM4rR6EcxbU="; }; - cargoHash = "sha256-C0TpZZ/CJgNx0sB920/0yJW3iY4tPF6M70bveS1Ux24="; + cargoHash = "sha256-NWP8jaQz4KzsZFFR9WAvdlecUI3ogPNN4pcyCUBSq6E="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/cargo2junit/default.nix b/pkgs/development/tools/rust/cargo2junit/default.nix deleted file mode 100644 index 907d92e3c437..000000000000 --- a/pkgs/development/tools/rust/cargo2junit/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ fetchCrate, lib, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "cargo2junit"; - version = "0.1.13"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-R3a87nXCnGhdeyR7409hFR5Cj3TFUWqaLNOtlXPsvto="; - }; - - cargoHash = "sha256-u5Pd967qxjqFl9fV/KkClLDBwKql7p66WqbIVBvWKuM="; - - meta = with lib; { - description = "Converts cargo's json output (from stdin) to JUnit XML (to stdout)"; - mainProgram = "cargo2junit"; - homepage = "https://github.com/johnterickson/cargo2junit"; - license = licenses.mit; - maintainers = with maintainers; [ alekseysidorov ]; - }; -} diff --git a/pkgs/development/tools/rust/cauwugo/default.nix b/pkgs/development/tools/rust/cauwugo/default.nix deleted file mode 100644 index 1f497a270b93..000000000000 --- a/pkgs/development/tools/rust/cauwugo/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, rustPlatform, fetchCrate, installShellFiles, stdenv }: - -rustPlatform.buildRustPackage rec { - pname = "cauwugo"; - version = "0.1.0"; - - src = fetchCrate { - inherit version; - pname = "bpaf_cauwugo"; - hash = "sha256-9gWUu2qbscKlbWZlRbOn+rrmizegkHxPnwnAmpaV1Ww="; - }; - - cargoHash = "sha256-dXlSBb3ey3dAiifrQ9Bbhscnm1QmcChiQbX1ic069V4="; - - nativeBuildInputs = [ installShellFiles ]; - - 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) \ - --zsh <($out/bin/cauwugo --bpaf-complete-style-zsh) - ''; - - meta = with lib; { - description = "Alternative cargo frontend that implements dynamic shell completion for usual cargo commands"; - mainProgram = "cauwugo"; - homepage = "https://github.com/pacak/bpaf/tree/master/bpaf_cauwugo"; - license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/cbindgen/1010-fix-test-failures-due-to-CARGO_BUILD_TARGET.patch b/pkgs/development/tools/rust/cbindgen/1010-fix-test-failures-due-to-CARGO_BUILD_TARGET.patch new file mode 100644 index 000000000000..85baa4fd03e0 --- /dev/null +++ b/pkgs/development/tools/rust/cbindgen/1010-fix-test-failures-due-to-CARGO_BUILD_TARGET.patch @@ -0,0 +1,56 @@ +diff --git a/tests/profile.rs b/tests/profile.rs +index 69433a2..596829d 100644 +--- a/tests/profile.rs ++++ b/tests/profile.rs +@@ -1,6 +1,7 @@ + use cbindgen::*; + + use serial_test::serial; ++use std::env; + use std::path::{Path, PathBuf}; + use std::process::Command; + +@@ -17,7 +18,12 @@ fn build_using_lib(config: fn(Builder) -> Builder) -> tempfile::TempDir { + .tempdir() + .expect("Creating tmp dir failed"); + +- std::env::set_var("CARGO_EXPAND_TARGET_DIR", tmp_dir.path()); ++ unsafe { ++ env::set_var("CARGO_EXPAND_TARGET_DIR", tmp_dir.path()); ++ env::remove_var("CARGO_BUILD_TARGET"); ++ // ^ avoid unexpected change of layout of the target directory; ++ // ... see: https://doc.rust-lang.org/cargo/guide/build-cache.html ++ } + let builder = Builder::new() + .with_config(Config::from_file(expand_dep_test_dir.join("cbindgen.toml")).unwrap()) + .with_crate(expand_dep_test_dir); +@@ -45,6 +51,9 @@ fn build_using_bin(extra_args: &[&str]) -> tempfile::TempDir { + Command::new(cbindgen_path) + .current_dir(expand_dep_test_dir) + .env("CARGO_EXPAND_TARGET_DIR", tmp_dir.path()) ++ .env_remove("CARGO_BUILD_TARGET") ++ // ^ avoid unexpected change of layout of the target directory; ++ // ... see: https://doc.rust-lang.org/cargo/guide/build-cache.html + .args(extra_args) + .output() + .expect("build should succeed"); +@@ -87,6 +96,19 @@ fn bin_default_uses_debug_build() { + assert_eq!(get_contents_of_dir(target_dir.path()), &["debug"]); + } + ++#[test] ++fn bin_ignore_cargo_build_target_in_tests() { ++ unsafe { ++ env::set_var("CARGO_BUILD_TARGET", "x86_64-unknown-linux-gnu"); ++ } ++ assert_eq!( ++ env::var("CARGO_BUILD_TARGET"), ++ Ok("x86_64-unknown-linux-gnu".into()) ++ ); ++ // ^ this env var should be ignored: ++ bin_default_uses_debug_build(); ++} ++ + #[test] + fn bin_explicit_debug_build() { + let target_dir = build_using_bin(&["--profile", "debug"]); diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 95dacabcf5d2..fa3b9fb98b78 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -23,9 +23,15 @@ rustPlatform.buildRustPackage rec { hash = "sha256-XTGHHD5Qw3mr+lkPKOXyqb0K3sEENW8Sf0n9mtrFFXI="; }; + patches = [ + # open PR: https://github.com/mozilla/cbindgen/pull/1010 + # see also: https://github.com/NixOS/nixpkgs/pull/298108 + ./1010-fix-test-failures-due-to-CARGO_BUILD_TARGET.patch + ]; + cargoHash = "sha256-l4FgwXdibek4BAnqjWd1rLxpEwuMNjYgvo6X3SS3fRo="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; nativeCheckInputs = [ cmake @@ -40,7 +46,7 @@ rustPlatform.buildRustPackage rec { "--skip lib_default_uses_debug_build" "--skip lib_explicit_debug_build" "--skip lib_explicit_release_build" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # WORKAROUND: test_body fails when using clang # https://github.com/eqrion/cbindgen/issues/628 "--skip test_body" diff --git a/pkgs/development/tools/rust/critcmp/default.nix b/pkgs/development/tools/rust/critcmp/default.nix deleted file mode 100644 index 0c142bbf2514..000000000000 --- a/pkgs/development/tools/rust/critcmp/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "critcmp"; - version = "0.1.8"; - - src = fetchFromGitHub { - owner = "BurntSushi"; - repo = "critcmp"; - rev = version; - hash = "sha256-cf78R9siH0RFbx+vXTs71VblpsQokL6Uo32N3X4lV2I="; - }; - - cargoHash = "sha256-yzWa+/08tG8h+5V8XBc3k8GDivS6SHW6zVb+ug1sbE0="; - - meta = with lib; { - description = "Command line tool for comparing benchmarks run by Criterion"; - mainProgram = "critcmp"; - homepage = "https://github.com/BurntSushi/critcmp"; - license = with licenses; [ mit unlicense ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/dioxus-cli/default.nix b/pkgs/development/tools/rust/dioxus-cli/default.nix deleted file mode 100644 index 68632a1d6002..000000000000 --- a/pkgs/development/tools/rust/dioxus-cli/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, stdenv -, fetchCrate -, rustPlatform -, pkg-config -, rustfmt -, cacert -, openssl -, darwin -, testers -, dioxus-cli -}: - -rustPlatform.buildRustPackage rec { - pname = "dioxus-cli"; - version = "0.5.6"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-cOd8OGkmebUYw6fNLO/kja81qKwqBuVpJqCix1Izf64="; - }; - - cargoHash = "sha256-shllaNdg9g6fD8qRyCKpN47keFUTu0g96MzVX4BrhXI="; - - nativeBuildInputs = [ pkg-config cacert ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - OPENSSL_NO_VENDOR = 1; - - nativeCheckInputs = [ rustfmt ]; - - checkFlags = [ - # requires network access - "--skip=server::web::proxy::test::add_proxy" - "--skip=server::web::proxy::test::add_proxy_trailing_slash" - ]; - - passthru.tests.version = testers.testVersion { - package = dioxus-cli; - command = "${meta.mainProgram} --version"; - inherit version; - }; - - meta = with lib; { - homepage = "https://dioxuslabs.com"; - description = "CLI tool for developing, testing, and publishing Dioxus apps"; - license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ xanderio cathalmullan ]; - mainProgram = "dx"; - }; -} diff --git a/pkgs/development/tools/rust/duckscript/default.nix b/pkgs/development/tools/rust/duckscript/default.nix index be536194d290..bfafef5c70c1 100644 --- a/pkgs/development/tools/rust/duckscript/default.nix +++ b/pkgs/development/tools/rust/duckscript/default.nix @@ -11,19 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "duckscript_cli"; - version = "0.9.3"; + version = "0.11.1"; src = fetchCrate { inherit pname version; - hash = "sha256-2ouEmI7BH9J+PEN7l3rE8nmd0Khe2Bjq1Bg9SgGnB4E="; + hash = "sha256-afxzZkmmYnprUBquH681VHMDs3Co9C71chNoKbu6lEY="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration libiconv ]; - cargoHash = "sha256-bBqcHETEWooMgQeqPOZIK/77DdTtGq1JusBKoRj5K6w="; + cargoHash = "sha256-TX/Xi57fn85GjHc74icxhsQ6n7FwqzGIr3Qoc2o681E="; meta = with lib; { description = "Simple, extendable and embeddable scripting language"; diff --git a/pkgs/development/tools/rust/genemichaels/Cargo.lock b/pkgs/development/tools/rust/genemichaels/Cargo.lock deleted file mode 100644 index 56b9df484a6d..000000000000 --- a/pkgs/development/tools/rust/genemichaels/Cargo.lock +++ /dev/null @@ -1,553 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "anyhow" -version = "1.0.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "cargo-manifest" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ce38d2d1efbe0e7180766a872570bc07cd5430a42e713b01006d4afa89912fe" -dependencies = [ - "serde", - "toml", -] - -[[package]] -name = "cc" -version = "1.0.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec7a4128863c188deefe750ac1d1dfe66c236909f845af04beed823638dc1b2" -dependencies = [ - "bitflags", - "clap_derive", - "clap_lex", - "is-terminal", - "once_cell", - "strsim", - "termcolor", -] - -[[package]] -name = "clap_derive" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version", - "syn", -] - -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[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 = "genemichaels" -version = "0.1.21" -dependencies = [ - "anyhow", - "cargo-manifest", - "clap", - "derive_more", - "markdown", - "proc-macro2", - "quote", - "structre", - "syn", - "threadpool", - "walkdir", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "is-terminal" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" -dependencies = [ - "hermit-abi", - "io-lifetimes", - "rustix", - "windows-sys", -] - -[[package]] -name = "libc" -version = "0.2.139" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" - -[[package]] -name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - -[[package]] -name = "litrs" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9275e0933cf8bb20f008924c0cb07a0692fe54d8064996520bf998de9eb79aa" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "markdown" -version = "1.0.0-alpha.5" -source = "git+https://github.com/wooorm/markdown-rs?rev=af202d3f0ea24e0a957b02a6f9fb23c6c3b4afe7#af202d3f0ea24e0a957b02a6f9fb23c6c3b4afe7" -dependencies = [ - "log", - "unicode-id", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" - -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - -[[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", - "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-macro2" -version = "1.0.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "regex" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" -dependencies = [ - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.36.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[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 = "semver" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" - -[[package]] -name = "serde" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "structre" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31eab0dcebb0d631c93629c0da9fdce1448123aa15e5e4c08fcd71d4f4fd5f4" -dependencies = [ - "anyhow", - "once_cell", - "regex", - "structre_proc_macros", -] - -[[package]] -name = "structre_proc_macros" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66e7698a9d57b3a475ce1d6cc37b1be9ee8ed188ec596603c863c06c9e06cf7e" -dependencies = [ - "litrs", - "proc-macro2", - "quote", - "regex-syntax", - "syn", -] - -[[package]] -name = "syn" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "toml" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" -dependencies = [ - "indexmap", - "serde", -] - -[[package]] -name = "unicode-id" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d70b6494226b36008c8366c288d77190b3fad2eb4c10533139c1c1f461127f1a" - -[[package]] -name = "unicode-ident" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi", - "winapi-util", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[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-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" diff --git a/pkgs/development/tools/rust/genemichaels/default.nix b/pkgs/development/tools/rust/genemichaels/default.nix deleted file mode 100644 index 5fa08d08d546..000000000000 --- a/pkgs/development/tools/rust/genemichaels/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "genemichaels"; - version = "0.1.21"; - src = fetchFromGitHub { - owner = "andrewbaxter"; - repo = pname; - rev = "158bb8eb705b073d84562554c1a6a63eedd44c6b"; - hash = "sha256-rAJYukxptasexZzwWgtGlUbHhyyI6OJvSzVxGLBO9vM="; - }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes."markdown-1.0.0-alpha.5" = "sha256-pjIKzXvRKoMfFVIyIXdm+29vvUzCHiJ0rrZgr4K+Ih8="; - }; - meta = { - description = "Even formats macros"; - mainProgram = "genemichaels"; - homepage = "https://github.com/andrewbaxter/genemichaels"; - license = lib.licenses.isc; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/rust/gitlab-clippy/default.nix b/pkgs/development/tools/rust/gitlab-clippy/default.nix deleted file mode 100644 index 8bdd529bb447..000000000000 --- a/pkgs/development/tools/rust/gitlab-clippy/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, fetchFromGitLab -, rustPlatform -}: - -rustPlatform.buildRustPackage rec { - pname = "gitlab-clippy"; - version = "1.0.3"; - - src = fetchFromGitLab { - owner = "dlalic"; - repo = pname; - rev = version; - hash = "sha256-d7SmlAWIV4SngJhIvlud90ZUSF55FWIrzFpkfSXIy2Y="; - }; - cargoHash = "sha256-ztPbI+ncMNMKnIxUksxgz8GHQpLZ7SVWdC4QJWh18Wk="; - - # TODO re-add theses tests once they get fixed in upstream - checkFlags = [ - "--skip cli::converts_error_from_pipe" - "--skip cli::converts_warnings_from_pipe" - ]; - - meta = { - homepage = "https://gitlab.com/dlalic/gitlab-clippy"; - description = "Convert clippy warnings into GitLab Code Quality report"; - mainProgram = "gitlab-clippy"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ wucke13 ]; - }; -} diff --git a/pkgs/development/tools/rust/humility/default.nix b/pkgs/development/tools/rust/humility/default.nix index a8c157f9ac4d..5486d0785233 100644 --- a/pkgs/development/tools/rust/humility/default.nix +++ b/pkgs/development/tools/rust/humility/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { version = "unstable-2023-11-08"; nativeBuildInputs = [ pkg-config cargo-readme ]; - buildInputs = [ libusb1 libftdi ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ libusb1 libftdi ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; diff --git a/pkgs/development/tools/rust/leptosfmt/default.nix b/pkgs/development/tools/rust/leptosfmt/default.nix deleted file mode 100644 index ef5324d4ba37..000000000000 --- a/pkgs/development/tools/rust/leptosfmt/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "leptosfmt"; - version = "0.1.30"; - - src = fetchFromGitHub { - owner = "bram209"; - repo = "leptosfmt"; - rev = "85b06b9a8bb0616b6a03ba43517245c79e1dd4cf"; - hash = "sha256-PiVPnni7W8SIhO6L9698RSMTD4VVTB+klLrqMzEtWWo="; - fetchSubmodules = true; - }; - - cargoHash = "sha256-zj81fXjDM648Y8mIb6QMmAh/ck9GGEypzuJIBWZ32r8="; - - meta = with lib; { - description = "Formatter for the leptos view! macro"; - mainProgram = "leptosfmt"; - homepage = "https://github.com/bram209/leptosfmt"; - changelog = "https://github.com/bram209/leptosfmt/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/ograc/default.nix b/pkgs/development/tools/rust/ograc/default.nix deleted file mode 100644 index 538a22ab688c..000000000000 --- a/pkgs/development/tools/rust/ograc/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ fetchFromGitLab, lib, rustPlatform, }: - -rustPlatform.buildRustPackage { - pname = "ograc"; - version = "0.1.6"; - src = fetchFromGitLab { - owner = "lirnril"; - repo = "ograc"; - rev = "d09b3102ff7a364bf2593589327a16a473bd4f25"; - hash = "sha256-vdHPFY6zZ/OBNlJO3N/6YXcvlddw2wYHgFWI0yfSgVo="; - }; - cargoHash = "sha256-HAeEd7HY+hbTUOkIt6aTfvPYLRPtdAcUGvkuBUMjohA="; - - meta = with lib; { - description = "like cargo, but backwards"; - mainProgram = "ograc"; - homepage = "https://crates.io/crates/ograc"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ sciencentistguy ]; - }; -} - diff --git a/pkgs/development/tools/rust/panamax/default.nix b/pkgs/development/tools/rust/panamax/default.nix deleted file mode 100644 index 16d8176de4eb..000000000000 --- a/pkgs/development/tools/rust/panamax/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, pkg-config -, libgit2 -, openssl -, zlib -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "panamax"; - version = "1.0.14"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-gIgw6JMGpHNXE/PZoz3jRdmjIWy4hETYf24Nd7/Jr/g="; - }; - - cargoHash = "sha256-doEBlUVmXxbuPkDgliWr+LfG5KAMVEGpvLyQpoCzSTc="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - libgit2 - openssl - zlib - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - meta = with lib; { - description = "Mirror rustup and crates.io repositories for offline Rust and cargo usage"; - mainProgram = "panamax"; - homepage = "https://github.com/panamax-rs/panamax"; - license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/ra-multiplex/default.nix b/pkgs/development/tools/rust/ra-multiplex/default.nix deleted file mode 100644 index 0eb064010109..000000000000 --- a/pkgs/development/tools/rust/ra-multiplex/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, fetchFromGitHub -, makeWrapper -, rustPlatform -, rust-analyzer -}: - -rustPlatform.buildRustPackage { - pname = "ra-multiplex"; - version = "0.2.2"; - - src = fetchFromGitHub { - owner = "pr2502"; - repo = "ra-multiplex"; - rev = "dcb5f83890cb91016b0a1590cc1b732606bb6ec1"; - hash = "sha256-Hf4Gj9eXEP4gXiqNV4Jq0oiGLX3DtDF9At1feEZ+bUE="; - }; - - cargoHash = "sha256-MeUtkPjOsL1kQ2W0Q1/OqhKDVXs4cECkATHISpyfp9U="; - - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram $out/bin/ra-multiplex \ - --suffix PATH ${lib.makeBinPath [ rust-analyzer ]} - ''; - - meta = with lib; { - description = "Multiplexer for rust-analyzer"; - mainProgram = "ra-multiplex"; - homepage = "https://github.com/pr2502/ra-multiplex"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ norfair ]; - }; -} diff --git a/pkgs/development/tools/rust/ravedude/default.nix b/pkgs/development/tools/rust/ravedude/default.nix deleted file mode 100644 index 1e6997065359..000000000000 --- a/pkgs/development/tools/rust/ravedude/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, pkg-config -, udev -, nix-update-script -, testers -, ravedude -}: - -rustPlatform.buildRustPackage rec { - pname = "ravedude"; - version = "0.1.8"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-AvnojcWQ4dQKk6B1Tjhkb4jfL6BJDsbeEo4tlgbOp84="; - }; - - cargoHash = "sha256-HeFmQsgr6uHrWi6s5sMQ6n63a44Msarb5p0+wUzKFkE="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ udev ]; - - passthru = { - updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = ravedude; - version = "v${version}"; - }; - }; - - meta = with lib; { - description = "Tool to easily flash code onto an AVR microcontroller with avrdude"; - homepage = "https://crates.io/crates/ravedude"; - license = with licenses; [ mit /* or */ asl20 ]; - platforms = platforms.linux; - maintainers = with maintainers; [ rvarago ]; - mainProgram = "ravedude"; - }; -} diff --git a/pkgs/development/tools/rust/rhack/default.nix b/pkgs/development/tools/rust/rhack/default.nix deleted file mode 100644 index 5be698ca6eb8..000000000000 --- a/pkgs/development/tools/rust/rhack/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "rhack"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "nakabonne"; - repo = pname; - rev = "v${version}"; - sha256 = "088ynf65szaa86pxwwasn3wwi00z5pn7i8w9gh5dyn983z4d8237"; - }; - - cargoHash = "sha256-HmBh2qbO/HuNPfHKifq41IB5ResnGka2iaAsnwppm9s="; - - meta = with lib; { - description = "Temporary edit external crates that your project depends on"; - mainProgram = "rhack"; - homepage = "https://github.com/nakabonne/rhack"; - license = licenses.bsd3; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/roogle/default.nix b/pkgs/development/tools/rust/roogle/default.nix deleted file mode 100644 index 2964f07f06b6..000000000000 --- a/pkgs/development/tools/rust/roogle/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "roogle"; - version = "0.1.4"; - - src = fetchFromGitHub { - owner = "hkmatsumoto"; - repo = pname; - rev = version; - sha256 = "1h0agialbvhhiijkdnr47y7babq432limdl6ag2rmjfs7yishn4r"; - }; - - cargoHash = "sha256-CzFfFKTmBUAafk8PkkWmUkRIyO+yEhmCfN1zsLRq4Iw="; - - postInstall = '' - mkdir -p $out/share/roogle - cp -r assets $out/share/roogle - ''; - - meta = with lib; { - description = "Rust API search engine which allows you to search functions by names and type signatures"; - mainProgram = "roogle"; - homepage = "https://github.com/hkmatsumoto/roogle"; - license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 6326657372c4..986458e90b27 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -32,14 +32,14 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = lib.optional useMimalloc cmake; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices libiconv ]; buildFeatures = lib.optional useMimalloc "mimalloc"; - CFG_RELEASE = version; + env.CFG_RELEASE = version; inherit doCheck; preCheck = lib.optionalString doCheck '' diff --git a/pkgs/development/tools/rust/rust-audit-info/default.nix b/pkgs/development/tools/rust/rust-audit-info/default.nix deleted file mode 100644 index 381e6d5bc71d..000000000000 --- a/pkgs/development/tools/rust/rust-audit-info/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, rustPlatform, fetchCrate }: - -rustPlatform.buildRustPackage rec { - pname = "rust-audit-info"; - version = "0.5.2"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-g7ElNehBAVSRRlqsxkNm20C0KOMkf310bXNs3EN+/NQ="; - }; - - cargoHash = "sha256-bKrdgz6dyv/PF5JXMq7uvsh7SsK/qEd2W7tm6+YYlxg="; - - meta = with lib; { - description = "Command-line tool to extract the dependency trees embedded in binaries by cargo-auditable"; - mainProgram = "rust-audit-info"; - homepage = "https://github.com/rust-secure-code/cargo-auditable/tree/master/rust-audit-info"; - license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/rust-script/default.nix b/pkgs/development/tools/rust/rust-script/default.nix deleted file mode 100644 index d9df9404fbca..000000000000 --- a/pkgs/development/tools/rust/rust-script/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "rust-script"; - version = "0.35.0"; - - src = fetchFromGitHub { - owner = "fornwall"; - repo = pname; - rev = version; - sha256 = "sha256-uKmQgrbsFIY0XwrO16Urz3L76Gm2SxHW/CpHeCIUinM="; - }; - - cargoHash = "sha256-WekXZ1bn2bGZu80SsEHtTY8wLwBhJsnJLu/r5GPdGzM="; - - # tests require network access - doCheck = false; - - meta = with lib; { - description = "Run Rust files and expressions as scripts without any setup or compilation step"; - mainProgram = "rust-script"; - homepage = "https://rust-script.org"; - changelog = "https://github.com/fornwall/rust-script/releases/tag/${version}"; - license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/rustfilt/default.nix b/pkgs/development/tools/rust/rustfilt/default.nix deleted file mode 100644 index 45312ccd7e49..000000000000 --- a/pkgs/development/tools/rust/rustfilt/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, fetchFromGitHub -, rustPlatform -}: - -rustPlatform.buildRustPackage rec { - pname = "rustfilt"; - version = "0.2.1"; - - src = fetchFromGitHub { - owner = "luser"; - repo = pname; - rev = version; - hash = "sha256-zb1tkeWmeMq7aM8hWssS/UpvGzGbfsaVYCOKBnAKwiQ="; - }; - - cargoHash = "sha256-rs2EWcvTxLVeJ0t+jLM75s+K72t+hqKzwy3oAdCZ8BE="; - - meta = with lib; { - description = "Demangle Rust symbol names using rustc-demangle"; - homepage = "https://github.com/luser/rustfilt"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ wykurz ]; - mainProgram = "rustfilt"; - }; -} diff --git a/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix b/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix index d71b1e655d78..f5dacb999a68 100644 --- a/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix +++ b/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix @@ -41,13 +41,13 @@ rustPlatform.buildRustPackage rec { --subst-var libPath ''; in - lib.optionals stdenv.isLinux [ patchelfPatch ]; + lib.optionals stdenv.hostPlatform.isLinux [ patchelfPatch ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl xz - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index b59d9d08ef23..5824696a43ac 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -39,13 +39,13 @@ rustPlatform.buildRustPackage rec { buildInputs = [ (curl.override { inherit openssl; }) zlib - ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv xz ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security libiconv xz ]; buildFeatures = [ "no-self-update" ]; checkFeatures = [ "test" ]; - patches = lib.optionals stdenv.isLinux [ + patches = lib.optionals stdenv.hostPlatform.isLinux [ (runCommand "0001-dynamically-patchelf-binaries.patch" { CC = stdenv.cc; @@ -62,7 +62,7 @@ rustPlatform.buildRustPackage rec { # Random tests fail nondeterministically on macOS. # TODO: Investigate this. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # skip failing tests checkFlags = [ diff --git a/pkgs/development/tools/rust/rusty-man/default.nix b/pkgs/development/tools/rust/rusty-man/default.nix deleted file mode 100644 index 164977facbe9..000000000000 --- a/pkgs/development/tools/rust/rusty-man/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, rustPlatform, fetchFromSourcehut }: - -rustPlatform.buildRustPackage rec { - pname = "rusty-man"; - version = "0.5.0"; - - src = fetchFromSourcehut { - owner = "~ireas"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-djprzmogT1OEf0/+twdxzx30YaMNzFjXkZd4IDsH8oo="; - }; - - cargoHash = "sha256-Wf8D6y3LRYJpQjFFt0w5X+BOllbR3mc4Gzcr1ad3zD0="; - - meta = with lib; { - description = "Command-line viewer for documentation generated by rustdoc"; - mainProgram = "rusty-man"; - homepage = "https://git.sr.ht/~ireas/rusty-man"; - changelog = "https://git.sr.ht/~ireas/rusty-man/tree/v${version}/item/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/rustycli/default.nix b/pkgs/development/tools/rust/rustycli/default.nix deleted file mode 100644 index 09bc2e44f748..000000000000 --- a/pkgs/development/tools/rust/rustycli/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "rustycli"; - version = "0.1.1"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-4Txw6Cmwwgu7K8VIVoX9GR76VUqAEw6uYptmczbjqg0="; - }; - - cargoHash = "sha256-WU3lgGJH6qVDI1Un3HBqg0edqiP5sobTsAIXdnjeNTU="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - # some examples fail to compile - cargoTestFlags = [ "--tests" ]; - - meta = with lib; { - description = "Access the rust playground right in terminal"; - mainProgram = "rustycli"; - homepage = "https://github.com/pwnwriter/rustycli"; - changelog = "https://github.com/pwnwriter/rustycli/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/specr-transpile/default.nix b/pkgs/development/tools/rust/specr-transpile/default.nix deleted file mode 100644 index bb15e8c3fa3f..000000000000 --- a/pkgs/development/tools/rust/specr-transpile/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -}: - -rustPlatform.buildRustPackage rec { - pname = "specr-transpile"; - version = "0.1.25"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-yB4b7VaZ22zk8jhQijBOWRks22TV19q9IQNlVXyBlss="; - }; - - cargoHash = "sha256-pD+Llzt4ekkQgKGidEL6jIbbFpuqjuFTmQM29FtReTY="; - - meta = with lib; { - description = "Converts Specr lang code to Rust"; - mainProgram = "specr-transpile"; - homepage = "https://github.com/RalfJung/minirust-tooling"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index ca608dafd10c..71f6b2b9ddcd 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -45,10 +45,10 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ openssl ] ++ - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security SystemConfiguration diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix deleted file mode 100644 index b01d04ad8123..000000000000 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, rustPlatform, fetchCrate }: - -rustPlatform.buildRustPackage rec { - pname = "svd2rust"; - version = "0.33.4"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-V7d/lVNL7J/ErBlJUf8btrukGC+KSvk3r9AAethFNyk="; - }; - - cargoHash = "sha256-Wu/F4PU02hrmiL7OaKIP59CfDVWrU5cw60TYngqJYNg="; - - # error: linker `aarch64-linux-gnu-gcc` not found - postPatch = '' - rm .cargo/config.toml - ''; - - meta = with lib; { - description = "Generate Rust register maps (`struct`s) from SVD files"; - mainProgram = "svd2rust"; - homepage = "https://github.com/rust-embedded/svd2rust"; - changelog = "https://github.com/rust-embedded/svd2rust/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ newam ]; - }; -} diff --git a/pkgs/development/tools/rust/typeshare/default.nix b/pkgs/development/tools/rust/typeshare/default.nix deleted file mode 100644 index 600c53e69d29..000000000000 --- a/pkgs/development/tools/rust/typeshare/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, installShellFiles -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "typeshare"; - version = "1.11.0"; - - src = fetchFromGitHub { - owner = "1password"; - repo = "typeshare"; - rev = "v${version}"; - hash = "sha256-hzlrhawHQOM12pYAHqmkk+PPI/3tJx8rFFQ9+znv9c8="; - }; - - cargoHash = "sha256-yHtKgQZlKJ/vmecjzMHkmA/0sbiNJdP0zoUSIowWttQ="; - - nativeBuildInputs = [ installShellFiles ]; - - buildFeatures = [ "go" ]; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd typeshare \ - --bash <($out/bin/typeshare completions bash) \ - --fish <($out/bin/typeshare completions fish) \ - --zsh <($out/bin/typeshare completions zsh) - ''; - - meta = with lib; { - description = "Command Line Tool for generating language files with typeshare"; - mainProgram = "typeshare"; - homepage = "https://github.com/1password/typeshare"; - changelog = "https://github.com/1password/typeshare/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix deleted file mode 100644 index 84488e0cb860..000000000000 --- a/pkgs/development/tools/sassc/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libsass }: - -stdenv.mkDerivation rec { - pname = "sassc"; - version = "3.6.2"; # also check libsass for updates - - src = fetchFromGitHub { - owner = "sass"; - repo = pname; - rev = version; - sha256 = "sha256-jcs3+orRqKt9C3c2FTdeaj4H2rBP74lW3HF8CHSm7lQ="; - }; - - postPatch = '' - export SASSC_VERSION=${version} - ''; - - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ libsass ]; - - meta = with lib; { - description = "Front-end for libsass"; - homepage = "https://github.com/sass/sassc/"; - license = licenses.mit; - mainProgram = "sassc"; - maintainers = with maintainers; [ codyopel pjones ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index 562125acf068..4a5972a4018e 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { }; aarch64-darwin = passthru.sources.x86_64-darwin; }; + updateScript = ./update.sh; }; src = passthru.sources.${stdenv.hostPlatform.system} @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; - patchPhase = lib.optionalString stdenv.isLinux '' + patchPhase = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${lib.makeLibraryPath [zlib]}" \ diff --git a/pkgs/development/tools/sca2d/default.nix b/pkgs/development/tools/sca2d/default.nix deleted file mode 100644 index 314a840ba262..000000000000 --- a/pkgs/development/tools/sca2d/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, python3 -, fetchFromGitLab -, fetchFromGitHub -}: -let - python = python3.override { - packageOverrides = self: super: { - lark010 = super.lark.overridePythonAttrs (old: rec { - version = "0.10.0"; - - src = fetchFromGitHub { - owner = "lark-parser"; - repo = "lark"; - rev = "refs/tags/${version}"; - sha256 = "sha256-ctdPPKPSD4weidyhyj7RCV89baIhmuxucF3/Ojx1Efo="; - }; - - patches = [ ]; - - disabledTestPaths = [ "tests/test_nearley/test_nearley.py" ]; - }); - }; - self = python; - }; -in -python.pkgs.buildPythonApplication rec { - pname = "sca2d"; - version = "0.2.0"; - format = "setuptools"; - - src = fetchFromGitLab { - owner = "bath_open_instrumentation_group"; - repo = "sca2d"; - rev = "v${version}"; - hash = "sha256-P+7g57AH8H7q0hBE2I9w8A+bN5M6MPbc9gA0b889aoQ="; - }; - - propagatedBuildInputs = with python.pkgs; [ lark010 colorama ]; - - pythonImportsCheck = [ "sca2d" ]; - - meta = with lib; { - description = "Experimental static code analyser for OpenSCAD"; - mainProgram = "sca2d"; - homepage = "https://gitlab.com/bath_open_instrumentation_group/sca2d"; - changelog = "https://gitlab.com/bath_open_instrumentation_group/sca2d/-/blob/${src.rev}/CHANGELOG.md"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ traxys ]; - }; -} diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix deleted file mode 100644 index 588274bcab89..000000000000 --- a/pkgs/development/tools/scalafmt/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, jre, coursier, makeWrapper, setJavaClassPath }: - -let - baseName = "scalafmt"; - version = "3.7.17"; - deps = stdenv.mkDerivation { - name = "${baseName}-deps-${version}"; - buildCommand = '' - export COURSIER_CACHE=$(pwd) - ${coursier}/bin/cs fetch org.scalameta:scalafmt-cli_2.13:${version} > deps - mkdir -p $out/share/java - cp $(< deps) $out/share/java/ - ''; - outputHashMode = "recursive"; - outputHash = "sha256-8gK+fOnqwPFBbSWltNKInzXRJQ3WZxPlLqpvuTxF4fk="; - }; -in -stdenv.mkDerivation { - pname = baseName; - inherit version; - - nativeBuildInputs = [ makeWrapper setJavaClassPath ]; - buildInputs = [ deps ]; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - - makeWrapper ${jre}/bin/java $out/bin/${baseName} \ - --add-flags "-cp $CLASSPATH org.scalafmt.cli.Cli" - - runHook postInstall - ''; - - installCheckPhase = '' - $out/bin/${baseName} --version | grep -q "${version}" - ''; - - meta = with lib; { - description = "Opinionated code formatter for Scala"; - homepage = "http://scalameta.org/scalafmt"; - license = licenses.asl20; - maintainers = [ maintainers.markus1189 ]; - mainProgram = "scalafmt"; - }; -} diff --git a/pkgs/development/tools/scenebuilder/default.nix b/pkgs/development/tools/scenebuilder/default.nix deleted file mode 100644 index 7f650a708501..000000000000 --- a/pkgs/development/tools/scenebuilder/default.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ lib -, jdk21 -, maven -, fetchFromGitHub -, makeDesktopItem -, copyDesktopItems -, glib -, makeWrapper -, wrapGAppsHook3 -}: - -let - jdk = jdk21.override { - enableJavaFX = true; - }; -in -maven.buildMavenPackage rec { - pname = "scenebuilder"; - version = "21.0.1"; - - src = fetchFromGitHub { - owner = "gluonhq"; - repo = "scenebuilder"; - rev = version; - hash = "sha256-YEcW1yQK6RKDqSstsrpdOqMt972ZagenGDxcJ/gP+SA="; - }; - - patches = [ - # makes the mvnHash platform-independent - ./pom-remove-javafx.patch - - # makes sure that maven upgrades don't change the mvnHash - ./fix-default-maven-plugin-versions.patch - ]; - - postPatch = '' - # set the build timestamp to $SOURCE_DATE_EPOCH - substituteInPlace app/pom.xml \ - --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" - ]; - - mvnHash = "sha256-fS7dS2Q4ORThLBwDOzJJnRboNNRmhp0RG6Dae9fl+pw="; - - nativeBuildInputs = [ - copyDesktopItems - glib - makeWrapper - wrapGAppsHook3 - ]; - - dontWrapGApps = true; # prevent double wrapping - - installPhase = '' - runHook preInstall - - install -Dm644 app/target/lib/scenebuilder-${version}-SNAPSHOT-all.jar $out/share/scenebuilder/scenebuilder.jar - install -Dm644 app/src/main/resources/com/oracle/javafx/scenebuilder/app/SB_Logo.png $out/share/icons/hicolor/128x128/apps/scenebuilder.png - - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${jdk}/bin/java $out/bin/scenebuilder \ - --add-flags "--add-modules javafx.web,javafx.fxml,javafx.swing,javafx.media" \ - --add-flags "--add-opens=javafx.fxml/javafx.fxml=ALL-UNNAMED" \ - --add-flags "-jar $out/share/scenebuilder/scenebuilder.jar" \ - "''${gappsWrapperArgs[@]}" - ''; - - desktopItems = [ - (makeDesktopItem { - name = "scenebuilder"; - exec = "scenebuilder"; - icon = "scenebuilder"; - comment = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces."; - desktopName = "Scene Builder"; - mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; - categories = [ "Development" ]; - }) - ]; - - meta = with lib; { - changelog = "https://github.com/gluonhq/scenebuilder/releases/tag/${src.rev}"; - description = "Visual, drag'n'drop, layout tool for designing JavaFX application user interfaces"; - homepage = "https://gluonhq.com/products/scene-builder/"; - license = licenses.bsd3; - mainProgram = "scenebuilder"; - maintainers = with maintainers; [ wirew0rm ]; - platforms = jdk.meta.platforms; - sourceProvenance = with sourceTypes; [ - fromSource - binaryBytecode # deps - ]; - }; -} - diff --git a/pkgs/development/tools/scenebuilder/fix-default-maven-plugin-versions.patch b/pkgs/development/tools/scenebuilder/fix-default-maven-plugin-versions.patch deleted file mode 100644 index be5e590694a0..000000000000 --- a/pkgs/development/tools/scenebuilder/fix-default-maven-plugin-versions.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/pom.xml b/pom.xml -index 193f7ca..45faa1a 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -137,6 +137,55 @@ - </plugins> - </pluginManagement> - <plugins> -+ <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-enforcer-plugin</artifactId> -+ <version>3.3.0</version> -+ <executions> -+ <execution> -+ <id>require-all-plugin-versions-to-be-set</id> -+ <phase>validate</phase> -+ <goals> -+ <goal>enforce</goal> -+ </goals> -+ <configuration> -+ <rules> -+ <requirePluginVersions /> -+ </rules> -+ </configuration> -+ </execution> -+ </executions> -+ </plugin> -+ <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-clean-plugin</artifactId> -+ <version>3.3.2</version> -+ </plugin> -+ <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-install-plugin</artifactId> -+ <version>3.1.1</version> -+ </plugin> -+ <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-site-plugin</artifactId> -+ <version>4.0.0-M13</version> -+ </plugin> -+ <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-deploy-plugin</artifactId> -+ <version>3.1.1</version> -+ </plugin> -+ <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-surefire-plugin</artifactId> -+ <version>3.2.5</version> -+ </plugin> -+ <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-jar-plugin</artifactId> -+ <version>3.3.0</version> -+ </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> diff --git a/pkgs/development/tools/scenebuilder/pom-remove-javafx.patch b/pkgs/development/tools/scenebuilder/pom-remove-javafx.patch deleted file mode 100644 index 6c9c9784d037..000000000000 --- a/pkgs/development/tools/scenebuilder/pom-remove-javafx.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/kit/pom.xml b/kit/pom.xml -index 644d36c..e4d91fb 100644 ---- a/kit/pom.xml -+++ b/kit/pom.xml -@@ -11,23 +11,6 @@ - </parent> - - <dependencies> -- <!-- JavaFX --> -- <dependency> -- <groupId>org.openjfx</groupId> -- <artifactId>javafx-fxml</artifactId> -- <version>${javafx.version}</version> -- </dependency> -- <dependency> -- <groupId>org.openjfx</groupId> -- <artifactId>javafx-web</artifactId> -- <version>${javafx.version}</version> -- </dependency> -- <dependency> -- <groupId>org.openjfx</groupId> -- <artifactId>javafx-swing</artifactId> -- <version>${javafx.version}</version> -- </dependency> -- - <!-- Eclipse Aether --> - <dependency> - <groupId>org.eclipse.aether</groupId> diff --git a/pkgs/development/tools/scenic-view/default.nix b/pkgs/development/tools/scenic-view/default.nix deleted file mode 100644 index 3fc74d7e3c73..000000000000 --- a/pkgs/development/tools/scenic-view/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, openjdk, openjfx, gradle_7, makeDesktopItem, makeWrapper }: -let - jdk = openjdk.override (lib.optionalAttrs stdenv.isLinux { - enableJavaFX = true; - openjfx = openjfx.override { withWebKit = true; }; - }); - - pname = "scenic-view"; - version = "11.0.2"; - - src = fetchFromGitHub { - owner = "JonathanGiles"; - repo = pname; - rev = version; - sha256 = "1idfh9hxqs4fchr6gvhblhvjqk4mpl4rnpi84vn1l3yb700z7dwy"; - }; - - gradle = gradle_7; - - desktopItem = makeDesktopItem { - name = pname; - desktopName = pname; - exec = pname; - comment = "JavaFx application to visualize and modify the scenegraph of running JavaFx applications."; - mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; - categories = [ "Development" ]; - }; - -in stdenv.mkDerivation rec { - inherit pname version src; - nativeBuildInputs = [ gradle makeWrapper ]; - - mitmCache = gradle.fetchDeps { - inherit pname; - data = ./deps.json; - }; - - __darwinAllowLocalNetworking = true; - - doCheck = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/${pname} - cp build/libs/scenicview.jar $out/share/${pname}/${pname}.jar - makeWrapper ${jdk}/bin/java $out/bin/${pname} --add-flags "-jar $out/share/${pname}/${pname}.jar" - - runHook postInstall - ''; - - desktopItems = [ desktopItem ]; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "JavaFx application to visualize and modify the scenegraph of running JavaFx applications"; - mainProgram = "scenic-view"; - longDescription = '' - A JavaFX application designed to make it simple to understand the current state of your application scenegraph - and to also easily manipulate properties of the scenegraph without having to keep editing your code. - This lets you find bugs and get things pixel perfect without having to do the compile-check-compile dance. - ''; - homepage = "https://github.com/JonathanGiles/scenic-view/"; - sourceProvenance = with sourceTypes; [ - fromSource - binaryBytecode # deps - ]; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ wirew0rm ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/scenic-view/deps.json b/pkgs/development/tools/scenic-view/deps.json deleted file mode 100644 index c0b49afdd3d8..000000000000 --- a/pkgs/development/tools/scenic-view/deps.json +++ /dev/null @@ -1,177 +0,0 @@ -{ - "!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 deleted file mode 100644 index 70d54d077445..000000000000 --- a/pkgs/development/tools/schemacrawler/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, fetchzip -, jre -, makeWrapper -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "schemacrawler"; - version = "16.22.2"; - - src = fetchzip { - url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip"; - hash = "sha256-N08lKCTbpX4b05i4UcCEy6wycsiIJu5BRr7EZ3oZ1rA="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp -r {config,lib} $out/ - - makeWrapper ${jre}/bin/java $out/bin/schemacrawler \ - --add-flags "-cp $out/lib/*:$out/config" \ - --add-flags schemacrawler.Main - - runHook postInstall - ''; - - preferLocalBuild = true; - - meta = with lib; { - description = "Database schema discovery and comprehension tool"; - mainProgram = "schemacrawler"; - homepage = "https://www.schemacrawler.com/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = with licenses; [ epl10 gpl3Only lgpl3Only ]; - platforms = platforms.unix; - maintainers = with maintainers; [ elohmeier ]; - }; -}) diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/development/tools/sd-local/default.nix deleted file mode 100644 index 29c1c2de4575..000000000000 --- a/pkgs/development/tools/sd-local/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: - -buildGoModule rec { - pname = "sd-local"; - version = "1.0.54"; - - src = fetchFromGitHub { - owner = "screwdriver-cd"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-2R/TVKCj3abUtrzzMW907GCC1H+lxTmg4J1kHHztE8I="; - }; - - vendorHash = "sha256-rAFfyMlnhDrb+f04S9+hNygXPaoG9mheQMxaJtXxBVw="; - - subPackages = [ "." ]; - - meta = with lib; { - description = "screwdriver.cd local mode"; - mainProgram = "sd-local"; - homepage = "https://github.com/screwdriver-cd/sd-local"; - license = licenses.bsd3; - maintainers = with maintainers; [ midchildan ]; - }; -} diff --git a/pkgs/development/tools/sea-orm-cli/default.nix b/pkgs/development/tools/sea-orm-cli/default.nix deleted file mode 100644 index 1562780858ae..000000000000 --- a/pkgs/development/tools/sea-orm-cli/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchCrate -, pkg-config -, openssl -, darwin -}: -rustPlatform.buildRustPackage rec { - pname = "sea-orm-cli"; - version = "1.0.1"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-b1Nlt3vsLDajTiIW9Vn51Tv9gXja8/ZZBD62iZjh3KY="; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; - - cargoHash = "sha256-ZGM+Y67ycBiukgEBUq+WiA1OUCGahya591gM6CGwzMQ="; - - meta = with lib; { - homepage = "https://www.sea-ql.org/SeaORM"; - description = " Command line utility for SeaORM"; - license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ traxys ]; - }; -} diff --git a/pkgs/development/tools/selene/default.nix b/pkgs/development/tools/selene/default.nix deleted file mode 100644 index 0d836fe7a24d..000000000000 --- a/pkgs/development/tools/selene/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, robloxSupport ? true -, pkg-config -, openssl -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "selene"; - version = "0.27.1"; - - src = fetchFromGitHub { - owner = "kampfkarren"; - repo = pname; - rev = version; - sha256 = "sha256-NbVSFYv3nyEjSf0bFajcMaoWP2bS0EfJT8tDddjS7jg="; - }; - - cargoHash = "sha256-e3oQUFtgdjqPiB2YpmqnFUG2scmYJhLSpUaw0W6RxIk="; - - nativeBuildInputs = lib.optionals robloxSupport [ - pkg-config - ]; - - buildInputs = lib.optionals robloxSupport [ - openssl - ] ++ lib.optionals (robloxSupport && stdenv.isDarwin) [ - darwin.apple_sdk.frameworks.Security - ]; - - buildNoDefaultFeatures = !robloxSupport; - - meta = with lib; { - description = "Blazing-fast modern Lua linter written in Rust"; - mainProgram = "selene"; - homepage = "https://github.com/kampfkarren/selene"; - changelog = "https://github.com/kampfkarren/selene/blob/${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/development/tools/selenium/htmlunit-driver/default.nix deleted file mode 100644 index 788a28a87f22..000000000000 --- a/pkgs/development/tools/selenium/htmlunit-driver/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "htmlunit-driver-standalone"; - version = "2.27"; - - src = fetchurl { - url = "https://github.com/SeleniumHQ/htmlunit-driver/releases/download/${version}/htmlunit-driver-${version}-with-dependencies.jar"; - sha256 = "1sd3cwpamcbq9pv0mvcm8x6minqrlb4i0r12q3jg91girqswm2dp"; - }; - - dontUnpack = true; - - installPhase = "install -D $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar"; - - meta = with lib; { - homepage = "https://github.com/SeleniumHQ/htmlunit-driver"; - description = "WebDriver server for running Selenium tests on the HtmlUnit headless browser"; - maintainers = with maintainers; [ coconnor offline ]; - platforms = platforms.all; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix deleted file mode 100644 index 66a9b97d0db9..000000000000 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, jdk, selenium-server-standalone }: - -let - pname = "selendroid-standalone"; - pluginName = "selendroid-grid-plugin-${version}"; - version = "0.17.0"; - srcs = { - jar = fetchurl { - url = "https://github.com/selendroid/selendroid/releases/download/${version}/selendroid-standalone-${version}-with-dependencies.jar"; - sha256 = "10lxdsgp711pv8r6dk2aagnbvnn1b25zfqjvz7plc73zqhx1dxvw"; - }; - gridPlugin = fetchurl { - url = "https://search.maven.org/remotecontent?filepath=io/selendroid/selendroid-grid-plugin/${version}/${pluginName}.jar"; - sha256 = "1x6cjmp2hpghbgbf8vss0qaj2n4sfl29wp3bc4k1s3hnnpccvz70"; - }; - }; -in -stdenv.mkDerivation { - inherit pname version; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk ]; - - installPhase = '' - mkdir -p $out/share/lib/selendroid - cp ${srcs.jar} $out/share/lib/selendroid/selendroid-standalone-${version}.jar - cp ${srcs.gridPlugin} $out/share/lib/selendroid/${pluginName}.jar - - makeWrapper ${jdk}/bin/java $out/bin/selendroid \ - --add-flags "-jar $out/share/lib/selendroid/selendroid-standalone-${version}.jar" - makeWrapper ${jdk}/bin/java $out/bin/selendroid-selenium \ - --add-flags "-Dfile.encoding=UTF-8" \ - --add-flags "-cp ${selenium-server-standalone}/share/lib/${selenium-server-standalone.name}/${selenium-server-standalone.name}.jar:$out/share/lib/selendroid/${pluginName}.jar" \ - --add-flags "org.openqa.grid.selenium.GridLauncherV3" \ - --add-flags "-role hub" \ - --add-flags "-capabilityMatcher io.selendroid.grid.SelendroidCapabilityMatcher" - ''; - - meta = with lib; { - homepage = "http://selendroid.io/"; - description = "Test automation for native or hybrid Android apps and the mobile web"; - maintainers = with maintainers; [ offline ]; - platforms = platforms.all; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix deleted file mode 100644 index b1cc26bec519..000000000000 --- a/pkgs/development/tools/selenium/server/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre -, htmlunit-driver, chromedriver, chromeSupport ? true }: - -let - minorVersion = "3.141"; - patchVersion = "59"; - -in stdenv.mkDerivation rec { - pname = "selenium-server-standalone"; - version = "${minorVersion}.${patchVersion}"; - - src = fetchurl { - url = "http://selenium-release.storage.googleapis.com/${minorVersion}/selenium-server-standalone-${version}.jar"; - sha256 = "1jzkx0ahsb27zzzfvjqv660x9fz2pbcddgmhdzdmasxns5vipxxc"; - }; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre ]; - - installPhase = '' - mkdir -p $out/share/lib/${pname}-${version} - cp $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar - makeWrapper ${jre}/bin/java $out/bin/selenium-server \ - --add-flags "-cp $out/share/lib/${pname}-${version}/${pname}-${version}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \ - ${lib.optionalString chromeSupport "--add-flags -Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \ - --add-flags "org.openqa.grid.selenium.GridLauncherV3" - ''; - - meta = with lib; { - homepage = "http://www.seleniumhq.org/"; - description = "Selenium Server for remote WebDriver"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.asl20; - maintainers = with maintainers; [ coconnor offline ]; - mainProgram = "selenium-server"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/sem/default.nix b/pkgs/development/tools/sem/default.nix deleted file mode 100644 index e8cd2256a59b..000000000000 --- a/pkgs/development/tools/sem/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "sem"; - version = "0.30.0"; - - src = fetchFromGitHub { - owner = "semaphoreci"; - repo = "cli"; - rev = "v${version}"; - sha256 = "sha256-bShQ+paDM9AdrdPrtwyQ5Mytf/SNZ4fVMDT2ZNswt3o="; - }; - - vendorHash = "sha256-p8+M+pRp12P7tYlFpXjU94JcJOugQpD8rFdowhonh74="; - subPackages = [ "." ]; - - ldflags = [ "-X main.version=${version}" "-X main.buildSource=nix" ]; - - postInstall = '' - install -m755 $out/bin/cli $out/bin/sem - ''; - - meta = with lib; { - description = "Cli to operate on semaphore ci (2.0)"; - homepage = "https://github.com/semaphoreci/cli"; - changelog = "https://github.com/semaphoreci/cli/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ liberatys ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/semantic-release/default.nix b/pkgs/development/tools/semantic-release/default.nix deleted file mode 100644 index 95f92919d15d..000000000000 --- a/pkgs/development/tools/semantic-release/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ cctools -, buildNpmPackage -, fetchFromGitHub -, lib -, python3 -, stdenv -}: - -buildNpmPackage rec { - pname = "semantic-release"; - version = "24.1.1"; - - src = fetchFromGitHub { - owner = "semantic-release"; - repo = "semantic-release"; - rev = "v${version}"; - hash = "sha256-BGSe05I1NconPkPCzGOOLPbH/JSlwXvAWbViJVYMU/c="; - }; - - npmDepsHash = "sha256-DsBklxeY9RbvFsEA56vkmvVms+W9mr9qA/JVgAgs81k="; - - dontNpmBuild = true; - - nativeBuildInputs = [ - python3 - ] ++ lib.optional stdenv.isDarwin cctools; - - # Fixes `semantic-release --version` output - postPatch = '' - substituteInPlace package.json --replace \ - '"version": "0.0.0-development"' \ - '"version": "${version}"' - ''; - - meta = { - description = "Fully automated version management and package publishing"; - mainProgram = "semantic-release"; - homepage = "https://semantic-release.gitbook.io/semantic-release/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.sestrella ]; - }; -} diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 2adcaf4dc462..5283f5377869 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -11,23 +11,23 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.36.1"; + version = "2.36.6"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-kmrSoUrhBJPgIAcMg73Ne4r8Wkx+SXiiNXbtfVp0Q88="; + sha256 = "sha256-l2Qj38wtlz0fSLvUdML36BRCCIk+Qnuv/cxPi33f+Zc="; }; doCheck = false; # Needed to get openssl-sys to use pkgconfig. OPENSSL_NO_VENDOR = 1; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration ]; nativeBuildInputs = [ installShellFiles pkg-config ]; - cargoHash = "sha256-fzQfU3xlRwV/GI69+sd7zz4okbNHbFAskJPgI1X0KQo="; + cargoHash = "sha256-gyNP6qYg/uKOmhq3elYw8jPknjfAzoGyhGegSq1wDoo="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd sentry-cli \ diff --git a/pkgs/development/tools/shadered/default.nix b/pkgs/development/tools/shadered/default.nix deleted file mode 100644 index cebb9704d180..000000000000 --- a/pkgs/development/tools/shadered/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, sfml -, glm -, python3 -, glew -, pkg-config -, SDL2 }: - -stdenv.mkDerivation rec { - pname = "SHADERed"; - version = "1.5.6"; - - src = fetchFromGitHub { - owner = "dfranx"; - repo = pname; - rev = "v${version}"; - fetchSubmodules = true; - sha256 = "0drf8wwx0gcmi22jq2yyjy7ppxynfq172wqakchscm313j248fjr"; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - SDL2 - glew - glm - python3 - sfml - ]; - - patches = [ - ./install_path_fix.patch - ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; - - meta = with lib; { - description = "Lightweight, cross-platform & full-featured shader IDE"; - homepage = "https://github.com/dfranx/SHADERed"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ Scriptkiddi ]; - broken = true; - }; -} diff --git a/pkgs/development/tools/shadered/install_path_fix.patch b/pkgs/development/tools/shadered/install_path_fix.patch deleted file mode 100644 index 6b39ca696b90..000000000000 --- a/pkgs/development/tools/shadered/install_path_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 55eb05c..18f7fc3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -234,7 +234,7 @@ endif() - - set(BINARY_INST_DESTINATION "bin") - set(RESOURCE_INST_DESTINATION "share/shadered") --install(PROGRAMS bin/SHADERed DESTINATION "${BINARY_INST_DESTINATION}" RENAME shadered) -+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bin/SHADERed DESTINATION "${BINARY_INST_DESTINATION}" RENAME shadered) - install(DIRECTORY bin/data bin/templates bin/themes bin/plugins DESTINATION "${RESOURCE_INST_DESTINATION}") - - if (UNIX AND NOT APPLE) diff --git a/pkgs/development/tools/shellharden/default.nix b/pkgs/development/tools/shellharden/default.nix deleted file mode 100644 index e1965aa2b006..000000000000 --- a/pkgs/development/tools/shellharden/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "shellharden"; - version = "4.3.1"; - - src = fetchFromGitHub { - owner = "anordal"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-aBX3RXfDhlXVMV8aPO0pu3527nDoYrUDUbH6crWO/W8="; - }; - - cargoHash = "sha256-/t5dsDOokuUC0ZG8hPzsUoAvteLHWby6eKZNtnL/XUw="; - - postPatch = "patchShebangs moduletests/run"; - - meta = with lib; { - description = "Corrective bash syntax highlighter"; - mainProgram = "shellharden"; - longDescription = '' - Shellharden is a syntax highlighter and a tool to semi-automate the - rewriting of scripts to ShellCheck conformance, mainly focused on quoting. - ''; - homepage = "https://github.com/anordal/shellharden"; - license = licenses.mpl20; - maintainers = with maintainers; [ oxzi ]; - }; -} diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix deleted file mode 100644 index f239d03cb6a4..000000000000 --- a/pkgs/development/tools/sigrok-cli/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, glib, libsigrok, libsigrokdecode }: - -stdenv.mkDerivation rec { - pname = "sigrok-cli"; - version = "0.7.2-unstable-2023-04-10"; - - src = fetchgit { - url = "git://sigrok.org/sigrok-cli"; - rev = "9d9f7b82008e3b3665bda12a63a3339e9f7aabc3"; - hash = "sha256-B2FJxRkfKELrtqxZDv5QTvntpu9zJnTK15CAUYbf+5M="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ glib libsigrok libsigrokdecode ]; - - meta = with lib; { - description = "Command-line frontend for the sigrok signal analysis software suite"; - mainProgram = "sigrok-cli"; - homepage = "https://sigrok.org/"; - license = licenses.gpl3Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ bjornfor vifino ]; - }; -} diff --git a/pkgs/development/tools/sigrok-firmware-fx2lafw/default.nix b/pkgs/development/tools/sigrok-firmware-fx2lafw/default.nix deleted file mode 100644 index 44a095bf59f9..000000000000 --- a/pkgs/development/tools/sigrok-firmware-fx2lafw/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, fetchgit -, autoreconfHook -, sdcc -}: - -stdenv.mkDerivation rec { - pname = "sigrok-firmware-fx2lafw"; - version = "0.1.7-unstable-2024-02-03"; - - src = fetchgit { - url = "git://sigrok.org/sigrok-firmware-fx2lafw"; - rev = "0f2d3242ffb5582e5b9a018ed9ae9812d517a56e"; - hash = "sha256-xveVcwAwtqKGD3/UvnBz5ASvTyg/6jAlTedZElhV2HE="; - }; - - enableParallelBuilding = true; - - nativeBuildInputs = [ autoreconfHook sdcc ]; - - meta = with lib; { - description = "Firmware for FX2 logic analyzers"; - homepage = "https://sigrok.org/"; - - # licensing details explained in: - # https://sigrok.org/gitweb/?p=sigrok-firmware-fx2lafw.git;a=blob;f=README;hb=HEAD#l122 - license = with licenses; [ - gpl2Plus # overall - lgpl21Plus # fx2lib, Hantek 6022BE, Sainsmart DDS120 firmwares - ]; - - sourceProvenance = with sourceTypes; [ fromSource ]; - platforms = platforms.all; - maintainers = with maintainers; [ panicgh vifino ]; - }; -} diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index deab8539ef14..e50986dd6502 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -31,12 +31,12 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ which pkg-config avrgcc ] - ++ lib.optional stdenv.isDarwin setupHookDarwin; + ++ lib.optional stdenv.hostPlatform.isDarwin setupHookDarwin; buildInputs = [ libelf libglut libGLU libGL ] - ++ lib.optional stdenv.isDarwin GLUT; + ++ lib.optional stdenv.hostPlatform.isDarwin GLUT; # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/bin/* ''; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix deleted file mode 100644 index 4303257d4b5b..000000000000 --- a/pkgs/development/tools/skaffold/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, makeWrapper }: - -buildGoModule rec { - pname = "skaffold"; - version = "2.13.2"; - - src = fetchFromGitHub { - owner = "GoogleContainerTools"; - repo = "skaffold"; - rev = "v${version}"; - hash = "sha256-7hYxSLZxTIu3DmIV7GIdGfEJQ2rWVGkm9/cTmpugI+A="; - }; - - vendorHash = null; - - subPackages = ["cmd/skaffold"]; - - ldflags = let t = "github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold"; in [ - "-s" "-w" - "-X ${t}/version.version=v${version}" - "-X ${t}/version.gitCommit=${src.rev}" - "-X ${t}/version.buildDate=unknown" - ]; - - nativeBuildInputs = [ installShellFiles makeWrapper ]; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/skaffold version | grep ${version} > /dev/null - ''; - - postInstall = '' - wrapProgram $out/bin/skaffold --set SKAFFOLD_UPDATE_CHECK false - - installShellCompletion --cmd skaffold \ - --bash <($out/bin/skaffold completion bash) \ - --zsh <($out/bin/skaffold completion zsh) - ''; - - meta = with lib; { - homepage = "https://skaffold.dev/"; - changelog = "https://github.com/GoogleContainerTools/skaffold/releases/tag/v${version}"; - description = "Easy and Repeatable Kubernetes Development"; - mainProgram = "skaffold"; - longDescription = '' - Skaffold is a command line tool that facilitates continuous development for Kubernetes applications. - You can iterate on your application source code locally then deploy to local or remote Kubernetes clusters. - Skaffold handles the workflow for building, pushing and deploying your application. - It also provides building blocks and describe customizations for a CI/CD pipeline. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ vdemeester bryanasdev000]; - }; -} diff --git a/pkgs/development/tools/skjold/default.nix b/pkgs/development/tools/skjold/default.nix deleted file mode 100644 index bbd5f57a778d..000000000000 --- a/pkgs/development/tools/skjold/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - lib, - fetchFromGitHub, - python3, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "skjold"; - version = "0.6.2"; - pyproject = true; - - src = fetchFromGitHub { - owner = "twu"; - repo = "skjold"; - rev = "refs/tags/v${version}"; - hash = "sha256-/ltaRs2WZXbrG3cVez+QIwupJrsV550TjOALbHX9Z0I="; - }; - - pythonRelaxDeps = [ "packaging" ]; - - build-system = with python3.pkgs; [ poetry-core ]; - - - dependencies = with python3.pkgs; [ - click - packaging - pyyaml - toml - ]; - - nativeCheckInputs = with python3.pkgs; [ - pytest-mock - pytest-watch - pytestCheckHook - ]; - - disabledTestPaths = [ - # Too sensitive to pass - "tests/test_cli.py" - ]; - - disabledTests = [ - # Requires network access - "pyup-werkzeug" - "test_ensure_accessing_advisories_triggers_update" - "test_ensure_accessing_advisories_triggers_update" - "test_ensure_gemnasium_update" - "test_ensure_missing_github_token_raises_usage_error" - "test_ensure_pypi_advisory_db_update" - "test_ensure_source_is_affected_single" - "test_osv_advisory_with_vulnerable_package_via_osv_api" - "urllib3" - ]; - - pythonImportsCheck = [ "skjold" ]; - - meta = with lib; { - description = "Tool to Python dependencies against security advisory databases"; - homepage = "https://github.com/twu/skjold"; - changelog = "https://github.com/twu/skjold/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix deleted file mode 100644 index 082abb488cb7..000000000000 --- a/pkgs/development/tools/skopeo/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub -, gpgme -, lvm2 -, btrfs-progs -, pkg-config -, go-md2man -, installShellFiles -, makeWrapper -, fuse-overlayfs -, dockerTools -, runCommand -, testers -, skopeo -}: - -buildGoModule rec { - pname = "skopeo"; - version = "1.16.1"; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "containers"; - repo = "skopeo"; - hash = "sha256-RsFfShru4ujB+x0hju8Xju43JJk/+PAevIPjjDC5YbQ="; - }; - - outputs = [ "out" "man" ]; - - vendorHash = null; - - doCheck = false; - - nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ]; - - buildInputs = [ gpgme ] - ++ lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; - - buildPhase = '' - runHook preBuild - patchShebangs . - make bin/skopeo completions docs - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - PREFIX=${placeholder "out"} make install-binary install-completions install-docs - install ${passthru.policy}/default-policy.json -Dt $out/etc/containers - '' + lib.optionalString stdenv.isLinux '' - wrapProgram $out/bin/skopeo \ - --prefix PATH : ${lib.makeBinPath [ fuse-overlayfs ]} - '' + '' - runHook postInstall - ''; - - passthru = { - policy = runCommand "policy" { } '' - install ${src}/default-policy.json -Dt $out - ''; - tests = { - version = testers.testVersion { - package = skopeo; - }; - inherit (dockerTools.examples) testNixFromDockerHub; - }; - }; - - meta = with lib; { - changelog = "https://github.com/containers/skopeo/releases/tag/${src.rev}"; - description = "Command line utility for various operations on container images and image repositories"; - mainProgram = "skopeo"; - homepage = "https://github.com/containers/skopeo"; - maintainers = with maintainers; [ lewo developer-guy ] ++ teams.podman.members; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix deleted file mode 100644 index dd3c5fd6d09b..000000000000 --- a/pkgs/development/tools/slimerjs/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, bash -, fetchFromGitHub -, firefox -, strip-nondeterminism -, stdenv -, unzip -, zip -}: - -stdenv.mkDerivation rec { - pname = "slimerjs"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "laurentj"; - repo = "slimerjs"; - sha256 = "sha256-RHd9PqcSkO9FYi5x+09TN7c4fKGf5pCPXjoCUXZ2mvA="; - rev = version; - }; - - buildInputs = [ zip ]; - nativeBuildInputs = [ - strip-nondeterminism - unzip - ]; - - preConfigure = '' - test -d src && cd src - test -f omni.ja || zip omni.ja -r */ - ''; - - installPhase = '' - strip-nondeterminism --type zip omni.ja - mkdir -p "$out"/{bin,share/doc/slimerjs,lib/slimerjs} - cp LICENSE README* "$out/share/doc/slimerjs" - cp -r * "$out/lib/slimerjs" - echo '#!${bash}/bin/bash' >> "$out/bin/slimerjs" - echo 'export SLIMERJSLAUNCHER=${firefox}/bin/firefox' >> "$out/bin/slimerjs" - echo "'$out/lib/slimerjs/slimerjs' \"\$@\"" >> "$out/bin/slimerjs" - chmod a+x "$out/bin/slimerjs" - sed -e 's@MaxVersion=[3456][0-9][.]@MaxVersion=99.@' -i "$out/lib/slimerjs/application.ini" - ''; - - meta = with lib; { - description = "Gecko-based programmatically-driven browser"; - mainProgram = "slimerjs"; - license = licenses.mpl20; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/smlfmt/default.nix b/pkgs/development/tools/smlfmt/default.nix deleted file mode 100644 index a8a1d4fb4d62..000000000000 --- a/pkgs/development/tools/smlfmt/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, mlton }: - -stdenv.mkDerivation rec { - pname = "smlfmt"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "shwestrick"; - repo = pname; - rev = "v${version}"; - hash = "sha256-qwhYOZrck028NliPDnqFZel3IxopQzouhHq6R7DkfPE="; - }; - - nativeBuildInputs = [ mlton ]; - - installPhase = '' - runHook preInstall - install -Dm755 -t $out/bin smlfmt - runHook postInstall - ''; - - meta = { - description = "Custom parser/auto-formatter for Standard ML"; - mainProgram = "smlfmt"; - longDescription = '' - A custom parser and code formatter for Standard ML, with helpful error messages. - - Supports SML source files (.sml, .sig, .fun, etc.) as well as MLBasis - compilation files (.mlb) using MLton conventions, including MLBasis path - maps. - ''; - - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ munksgaard ]; - platforms = mlton.meta.platforms; - homepage = "https://github.com/shwestrick/smlfmt"; - }; -} diff --git a/pkgs/development/tools/snazy/default.nix b/pkgs/development/tools/snazy/default.nix deleted file mode 100644 index c27942538454..000000000000 --- a/pkgs/development/tools/snazy/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, installShellFiles -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "snazy"; - version = "0.52.17"; - - src = fetchFromGitHub { - owner = "chmouel"; - repo = pname; - rev = version; - hash = "sha256-0r5xhmU9a9I+q24mjJ+C4EKK1Nw/67YThuBFibAx3Dw="; - }; - - cargoHash = "sha256-ljYsF5lBRqiTqx9nta5h/75052GWOBJ9uJnqZkWJvwI="; - - nativeBuildInputs = [ installShellFiles ]; - - 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) \ - --zsh <($out/bin/snazy --shell-completion zsh) - ''; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/snazy --help - $out/bin/snazy --version | grep "snazy ${version}" - runHook postInstallCheck - ''; - - meta = with lib; { - description = "Snazzy json log viewer"; - mainProgram = "snazy"; - longDescription = '' - Snazy is a simple tool to parse json logs and output them in a nice format - with nice colors. - ''; - homepage = "https://github.com/chmouel/snazy/"; - changelog = "https://github.com/chmouel/snazy/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda jk ]; - }; -} diff --git a/pkgs/development/tools/spicy/default.nix b/pkgs/development/tools/spicy/default.nix deleted file mode 100644 index 369747f0d571..000000000000 --- a/pkgs/development/tools/spicy/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "spicy"; - version = "0.6.2"; - - src = fetchFromGitHub { - owner = "trhodeos"; - repo = "spicy"; - rev = "v${version}"; - sha256 = "sha256-TodMm4UbnLB+LiyfPVXT7bcVLbyBFbGoOYQSsz3IMfM="; - }; - - vendorHash = "sha256-uy33vfsvyLCep1aN8qO0BMmpPylhzTLhosjjD5ghmHE="; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Nintendo 64 segment assembler"; - longDescription = '' - An open-source version of the Nintendo64 sdk's mild.exe. Assembles - segments into an n64-compatible rom. - ''; - homepage = "https://github.com/trhodeos/spicy"; - license = licenses.mit; - maintainers = with maintainers; [ _414owen ]; - }; -} diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix deleted file mode 100644 index 40764df42280..000000000000 --- a/pkgs/development/tools/spirv-tools/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3, spirv-headers }: - -stdenv.mkDerivation rec { - pname = "spirv-tools"; - version = "1.3.290.0"; - - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "SPIRV-Tools"; - rev = "vulkan-sdk-${version}"; - hash = "sha256-5swjNHeJpsCDkUVBL1uFqAzOPFzCESsYtDfRkno2bN4="; - }; - - # The cmake options are sufficient for turning on static building, but not - # for disabling shared building, just trim the shared lib from the CMake - # description - patches = lib.optional stdenv.hostPlatform.isStatic ./no-shared-libs.patch; - - nativeBuildInputs = [ cmake python3 ]; - - cmakeFlags = [ - "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}" - # Avoid blanket -Werror to evade build failures on less - # tested compilers. - "-DSPIRV_WERROR=OFF" - ]; - - # https://github.com/KhronosGroup/SPIRV-Tools/issues/3905 - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace '-P ''${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake' \ - '-DCMAKE_INSTALL_FULL_LIBDIR=''${CMAKE_INSTALL_FULL_LIBDIR} - -DCMAKE_INSTALL_FULL_INCLUDEDIR=''${CMAKE_INSTALL_FULL_INCLUDEDIR} - -P ''${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake' - substituteInPlace cmake/SPIRV-Tools.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - substituteInPlace cmake/SPIRV-Tools-shared.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - - meta = with lib; { - description = "SPIR-V Tools project provides an API and commands for processing SPIR-V modules"; - homepage = "https://github.com/KhronosGroup/SPIRV-Tools"; - license = licenses.asl20; - platforms = with platforms; unix ++ windows; - maintainers = [ maintainers.ralith ]; - }; -} diff --git a/pkgs/development/tools/spirv-tools/no-shared-libs.patch b/pkgs/development/tools/spirv-tools/no-shared-libs.patch deleted file mode 100644 index 45d2be6ec6ac..000000000000 --- a/pkgs/development/tools/spirv-tools/no-shared-libs.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index acfa0c12..bf3eb686 100644 ---- a/source/CMakeLists.txt -+++ b/source/CMakeLists.txt -@@ -378,16 +378,6 @@ function(spirv_tools_default_target_options target) - add_dependencies(${target} spirv-tools-build-version core_tables enum_string_mapping extinst_tables) - endfunction() - --# Always build ${SPIRV_TOOLS}-shared. This is expected distro packages, and --# unlike the other SPIRV_TOOLS target, defaults to hidden symbol visibility. --add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES}) --spirv_tools_default_target_options(${SPIRV_TOOLS}-shared) --set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES CXX_VISIBILITY_PRESET hidden) --target_compile_definitions(${SPIRV_TOOLS}-shared -- PRIVATE SPIRV_TOOLS_IMPLEMENTATION -- PUBLIC SPIRV_TOOLS_SHAREDLIB --) -- - if(SPIRV_TOOLS_BUILD_STATIC) - add_library(${SPIRV_TOOLS}-static STATIC ${SPIRV_SOURCES}) - spirv_tools_default_target_options(${SPIRV_TOOLS}-static) -@@ -402,7 +392,7 @@ if(SPIRV_TOOLS_BUILD_STATIC) - add_library(${SPIRV_TOOLS} ALIAS ${SPIRV_TOOLS}-static) - endif() - -- set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static ${SPIRV_TOOLS}-shared) -+ set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static) - else() - add_library(${SPIRV_TOOLS} ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_SOURCES}) - spirv_tools_default_target_options(${SPIRV_TOOLS}) diff --git a/pkgs/development/tools/spr/default.nix b/pkgs/development/tools/spr/default.nix index 7ecd5dcfb257..d7a9b4530c63 100644 --- a/pkgs/development/tools/spr/default.nix +++ b/pkgs/development/tools/spr/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-VQg3HDNw+L1FsFtHXnIw6dMVUxV63ZWHCxiknzsqXW8="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Submit pull requests for individual, amendable, rebaseable commits to GitHub"; diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix deleted file mode 100644 index d7d0acdd813c..000000000000 --- a/pkgs/development/tools/spring-boot-cli/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv, fetchzip, jdk, makeWrapper, installShellFiles, coreutils, testers, gitUpdater }: - -stdenv.mkDerivation (finalAttrs: { - pname = "spring-boot-cli"; - version = "3.3.2"; - - src = fetchzip { - url = "mirror://maven/org/springframework/boot/spring-boot-cli/${finalAttrs.version}/spring-boot-cli-${finalAttrs.version}-bin.zip"; - hash = "sha256-6xHiSd+CEFOZHiSLfAeMp/xcnTuEkFpCzYLgnnNkRN4="; - }; - - nativeBuildInputs = [ makeWrapper installShellFiles ]; - - installPhase = '' - runHook preInstall - rm bin/spring.bat - installShellCompletion --bash shell-completion/bash/spring - installShellCompletion --zsh shell-completion/zsh/_spring - rm -r shell-completion - cp -r . $out - wrapProgram $out/bin/spring \ - --set JAVA_HOME ${jdk} \ - --set PATH /bin:${coreutils}/bin:${jdk}/bin - runHook postInstall - ''; - - passthru = { - tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "${lib.getExe finalAttrs.finalPackage} --version"; - version = "v${finalAttrs.version}"; - }; - updateScript = gitUpdater { - url = "https://github.com/spring-projects/spring-boot"; - ignoredVersions = ".*-(RC|M).*"; - rev-prefix = "v"; - }; - }; - - meta = with lib; { - description = '' - CLI which makes it easy to create spring-based applications - ''; - longDescription = '' - Spring Boot makes it easy to create stand-alone, production-grade - Spring-based Applications that you can run. We take an opinionated view - of the Spring platform and third-party libraries, so that you can get - started with minimum fuss. Most Spring Boot applications need very - little Spring configuration. - - You can use Spring Boot to create Java applications that can be started - by using java -jar or more traditional war deployments. We also provide - a command line tool that runs “spring scripts”. - ''; - homepage = "https://spring.io/projects/spring-boot"; - changelog = "https://github.com/spring-projects/spring-boot/releases/tag/v${finalAttrs.version}"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - mainProgram = "spring"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ moaxcp ]; - }; -}) diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/development/tools/sq/default.nix deleted file mode 100644 index 2fe418b2ea49..000000000000 --- a/pkgs/development/tools/sq/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, sq }: - -buildGoModule rec { - pname = "sq"; - version = "0.48.3"; - - src = fetchFromGitHub { - owner = "neilotoole"; - repo = pname; - rev = "v${version}"; - hash = "sha256-22N8DEaLmGBA3Rx6VzxplUK9UAydo/gx4EsQzzaRHNE="; - }; - - vendorHash = "sha256-p0r7TuWFpV81Rnxqdj+UJec60EmvVQISURe43SpOpw0="; - - proxyVendor = true; - - nativeBuildInputs = [ installShellFiles ]; - - # Some tests violates sandbox constraints. - doCheck = false; - - ldflags = [ - "-s" - "-w" - "-X=github.com/neilotoole/sq/cli/buildinfo.Version=v${version}" - ]; - - postInstall = '' - installShellCompletion --cmd sq \ - --bash <($out/bin/sq completion bash) \ - --fish <($out/bin/sq completion fish) \ - --zsh <($out/bin/sq completion zsh) - ''; - - passthru.tests = { - version = testers.testVersion { - package = sq; - version = "v${version}"; - }; - }; - - meta = with lib; { - description = "Swiss army knife for data"; - mainProgram = "sq"; - homepage = "https://sq.io/"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ raitobezarius ]; - }; -} diff --git a/pkgs/development/tools/sqlboiler/default.nix b/pkgs/development/tools/sqlboiler/default.nix deleted file mode 100644 index 75342c9c863b..000000000000 --- a/pkgs/development/tools/sqlboiler/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "sqlboiler"; - version = "4.16.2"; - - src = fetchFromGitHub { - owner = "volatiletech"; - repo = "sqlboiler"; - rev = "refs/tags/v${version}"; - hash = "sha256-akfXYFgBbG/GCatoT820w4adXWqfG9wvHuChaqkewXs="; - }; - - vendorHash = "sha256-BTrQPWThfJ7gWXi/Y1l/s2BmkW5lVYS/PP0WRwntQxA="; - - tags = [ - "mysql" - "go" - "golang" - "postgres" - "orm" - "database" - "postgresql" - "mssql" - "sqlite3" - "sqlboiler" - ]; - - doCheck = false; - - meta = with lib; { - description = "Generate a Go ORM tailored to your database schema"; - homepage = "https://github.com/volatiletech/sqlboiler"; - changelog = "https://github.com/volatiletech/sqlboiler/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ mrityunjaygr8 ]; - mainProgram = "sqlboiler"; - }; -} diff --git a/pkgs/development/tools/sqldef/default.nix b/pkgs/development/tools/sqldef/default.nix deleted file mode 100644 index 5b357fb11ee6..000000000000 --- a/pkgs/development/tools/sqldef/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "sqldef"; - version = "0.17.19"; - - src = fetchFromGitHub { - owner = "k0kubun"; - repo = "sqldef"; - rev = "v${version}"; - hash = "sha256-euIP6ev1qc+75MA9vlTZHY7LT03AM8hya+sPWohvCWI="; - }; - - proxyVendor = true; - - vendorHash = "sha256-+5vfQoTRCbwY/Ydq21VG/xt6CeOWHIup8bxWI/2v24A="; - - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; - - # The test requires a running database - doCheck = false; - - meta = with lib; { - description = "Idempotent SQL schema management tool"; - license = with licenses; [ mit /* for everything except parser */ asl20 /* for parser */ ]; - homepage = "https://github.com/k0kubun/sqldef"; - changelog = "https://github.com/k0kubun/sqldef/blob/v${version}/CHANGELOG.md"; - maintainers = with maintainers; [ kgtkr ]; - }; -} diff --git a/pkgs/development/tools/sqlint/Gemfile.lock b/pkgs/development/tools/sqlint/Gemfile.lock index dab324f352f1..9359528117d1 100644 --- a/pkgs/development/tools/sqlint/Gemfile.lock +++ b/pkgs/development/tools/sqlint/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - google-protobuf (3.25.0) + google-protobuf (3.25.5) pg_query (4.2.3) google-protobuf (>= 3.22.3) sqlint (0.3.0) diff --git a/pkgs/development/tools/sqlint/gemset.nix b/pkgs/development/tools/sqlint/gemset.nix index 05925a45e69e..4ad8655564e9 100644 --- a/pkgs/development/tools/sqlint/gemset.nix +++ b/pkgs/development/tools/sqlint/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18d1w5j7vjaza3v1ig9j7zyis04kxqdkb1272vbgncxn03ck45mm"; + sha256 = "0fanhdf3vzghma51w1hqpp8s585mwzxgqkwvxj5is4q9j0pgwcs3"; type = "gem"; }; - version = "3.25.0"; + version = "3.25.5"; }; pg_query = { dependencies = ["google-protobuf"]; diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix deleted file mode 100644 index ec071f739efa..000000000000 --- a/pkgs/development/tools/sqsh/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, freetds, readline, libiconv }: - -let - mainVersion = "2.5"; - -in stdenv.mkDerivation rec { - pname = "sqsh"; - version = "${mainVersion}.16.1"; - - src = fetchurl { - url = "mirror://sourceforge/sqsh/sqsh/sqsh-${mainVersion}/${pname}-${version}.tgz"; - sha256 = "1wi0hdmhk7l8nrz4j3kaa177mmxyklmzhj7sq1gj4q6fb8v1yr6n"; - }; - - preConfigure = '' - export SYBASE=${freetds} - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace configure --replace "libct.so" "libct.dylib" - ''; - - enableParallelBuilding = true; - - buildInputs = [ freetds readline libiconv ]; - - nativeBuildInputs = [ autoreconfHook ]; - - patches = [ - (fetchurl { - # https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/databases/sqsh/patches/patch-src_cmd_connect_c - name = "patch-src_cmd_connect_c.patch"; - url = "https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/databases/sqsh/patches/patch-src_cmd_connect_c?rev=1.2&content-type=text/plain"; - sha256 = "1dz97knr2h0a0ca1vq2mx6h8s3ns9jb1a0qraa4wkfmcdi3aqw0j"; - }) - ]; - - patchFlags = [ "-p0" ]; - - meta = with lib; { - description = "Command line tool for querying Sybase/MSSQL databases"; - mainProgram = "sqsh"; - longDescription = '' - Sqsh (pronounced skwish) is short for SQshelL (pronounced s-q-shell), - it is intended as a replacement for the venerable 'isql' program supplied - by Sybase. - ''; - license = licenses.gpl2; - homepage = "https://sourceforge.net/projects/sqsh/"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/squawk/default.nix b/pkgs/development/tools/squawk/default.nix deleted file mode 100644 index 5270523caf6e..000000000000 --- a/pkgs/development/tools/squawk/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ darwin -, fetchFromGitHub -, lib -, libiconv -, libpg_query -, openssl -, pkg-config -, rustPlatform -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "squawk"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "sbdchd"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Uc357UspC2O/IxRRTy04jubzhKDRnIAN2CoHvbrGbHg="; - }; - - cargoHash = "sha256-G0t3wvcp1Dm0ZCDnzTVf1XJ2Dtr0LyrKM1Vvso0IoaA="; - - nativeBuildInputs = [ - pkg-config - rustPlatform.bindgenHook - ]; - - buildInputs = lib.optionals (!stdenv.isDarwin) [ - libiconv - openssl - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - CoreFoundation - Security - ]); - - OPENSSL_NO_VENDOR = 1; - - LIBPG_QUERY_PATH = libpg_query; - - checkFlags = [ - # depends on the PostgreSQL version - "--skip=parse::tests::test_parse_sql_query_json" - ]; - - meta = with lib; { - description = "Linter for PostgreSQL, focused on migrations"; - homepage = "https://squawkhq.com/"; - changelog = "https://github.com/sbdchd/squawk/blob/v${version}/CHANGELOG.md"; - license = licenses.gpl3Only; - maintainers = with lib.maintainers; [ andrewsmith ]; - }; -} diff --git a/pkgs/development/tools/sshs/default.nix b/pkgs/development/tools/sshs/default.nix deleted file mode 100644 index 3f4757d47c01..000000000000 --- a/pkgs/development/tools/sshs/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - testers, - sshs, -}: - -rustPlatform.buildRustPackage rec { - pname = "sshs"; - version = "4.5.1"; - - src = fetchFromGitHub { - owner = "quantumsheep"; - repo = "sshs"; - rev = version; - hash = "sha256-8tIIpGEQBXfLQ/Bok4KrpDGwoYhIQz/ylg6fUc6mBdc="; - }; - - cargoHash = "sha256-w+KYaYO3LXUEk4If6LSncS5KZJyNl8JMLGa+NtF3hf0="; - - passthru.tests.version = testers.testVersion { package = sshs; }; - - meta = { - description = "Terminal user interface for SSH"; - homepage = "https://github.com/quantumsheep/sshs"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ not-my-segfault ]; - mainProgram = "sshs"; - }; -} diff --git a/pkgs/development/tools/sslmate-agent/default.nix b/pkgs/development/tools/sslmate-agent/default.nix deleted file mode 100644 index 174507afc21c..000000000000 --- a/pkgs/development/tools/sslmate-agent/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook }: - -stdenv.mkDerivation rec { - pname = "sslmate-agent"; - version = "1.99.11"; - - src = fetchurl { - url = "https://packages.sslmate.com/debian/pool/sslmate2/s/sslmate-client/${pname}_${version}-1_amd64.deb"; - sha256 = "sha256-LBiZI0pGAFWnvTigEhtkhHq4FGdbYiMzjLheMuP0YTU="; - }; - - nativeBuildInputs = [ - dpkg - autoPatchelfHook - ]; - - unpackCmd = '' - dpkg-deb -x ${src} ./sslmate-agent-${pname} - ''; - - installPhase = '' - runHook preInstall - - # Not moving etc because it only contains init.rd setttings - mv usr $out - mv lib $out - - substituteInPlace $out/lib/systemd/system/sslmate-agent.service \ - --replace "/usr/s" "$out/" - - runHook postInstall - ''; - - meta = with lib; { - description = "Daemon for managing SSL/TLS certificates on a server"; - homepage = "https://sslmate.com/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix deleted file mode 100644 index 2dded22da82f..000000000000 --- a/pkgs/development/tools/sslmate/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, perlPackages, makeWrapper, openssl }: - -stdenv.mkDerivation rec { - pname = "sslmate"; - version = "1.9.1"; - - src = fetchurl { - url = "https://packages.sslmate.com/other/${pname}-${version}.tar.gz"; - sha256 = "sha256-F5szGn1cbw7R3lHMocM7as1RS/uaBqKCsvOxA+rXDOc="; - }; - - makeFlags = [ "PREFIX=$(out)" ]; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perlPackages.perl ]; - - postInstall = '' - wrapProgram $out/bin/sslmate --prefix PERL5LIB : \ - "${with perlPackages; makePerlPath [ - URI - JSONPP - TermReadKey - ]}" \ - --prefix PATH : "${openssl.bin}/bin" - ''; - - meta = with lib; { - homepage = "https://sslmate.com"; - maintainers = [ maintainers.domenkozar ]; - description = "Easy to buy, deploy, and manage your SSL certs"; - mainProgram = "sslmate"; - platforms = platforms.unix; - license = licenses.mit; # X11 - }; -} diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix deleted file mode 100644 index 05ea0d2e03e6..000000000000 --- a/pkgs/development/tools/stagit/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, libgit2, fetchgit }: - -stdenv.mkDerivation rec { - pname = "stagit"; - version = "1.2"; - - src = fetchgit { - url = "git://git.codemadness.org/stagit"; - rev = version; - sha256 = "sha256-mVYR8THGGfaTsx3aaSbQBxExRo87K47SD+PU5cZ8z58="; - }; - - makeFlags = [ "PREFIX=$(out)" ]; - - buildInputs = [ libgit2 ]; - - meta = with lib; { - description = "git static site generator"; - homepage = "https://git.codemadness.org/stagit/file/README.html"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ jb55 sikmir ]; - }; -} diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix deleted file mode 100644 index 5dec08d0d6e6..000000000000 --- a/pkgs/development/tools/statik/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "statik"; - version = "0.1.7"; - - src = fetchFromGitHub { - owner = "rakyll"; - repo = "statik"; - rev = "v${version}"; - sha256 = "ahsNiac/3I2+PUqc90E73Brb99M68ewh9nWXoupfE3g="; - }; - - vendorHash = null; - - # Avoid building example - subPackages = [ "." "fs" ]; - # Tests are checking that the files embedded are preserving - # their meta data like dates etc, but it assumes to be in 2048 - # which is not the case once entered the nix store - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/rakyll/statik"; - 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 deleted file mode 100644 index ed0e41b5f84a..000000000000 --- a/pkgs/development/tools/steamos-devkit/default.nix +++ /dev/null @@ -1,135 +0,0 @@ -{ lib -, fetchFromGitHub -, fetchFromGitLab -, python3 -, copyDesktopItems -, makeDesktopItem -, pkg-config -, SDL2 -}: -let - # steamos-devkit requires a build of the unreleased pyimgui 2.0 branch, move to pythonPackages when 2.0 is released. - pyimgui = python3.pkgs.buildPythonPackage { - pname = "pyimgui"; - version = "2.0.0"; - - src = fetchFromGitHub { - owner = "pyimgui"; - repo = "pyimgui"; - rev = "2.0.0"; - fetchSubmodules = true; - sha256 = "sha256-sw/bLTdrnPhBhrnk5yyXCbEK4kMo+PdEvoMJ9aaZbsE="; - }; - - nativeBuildInputs = with python3.pkgs; [ - cython_0 - pkg-config - SDL2 - ]; - - propagatedBuildInputs = with python3.pkgs; [ - click - pyopengl - pysdl2 - ]; - - # Requires OpenGL acceleration - doCheck = false; - pythonImportsCheck = [ "imgui" ]; - }; - steamos-devkit-script = '' - #!${python3.interpreter} - import os - - # Change the cwd to avoid imgui using cwd which often is ~ to store the state, use the same location as the settings - path = os.path.expanduser(os.path.join("~", ".devkit-client-gui")) - os.makedirs(path, exist_ok=True) - os.chdir(path) - - # Workaround to get pysdl to work on wayland, remove when https://gitlab.steamos.cloud/devkit/steamos-devkit/-/issues/1 is solved. - if os.environ.get("XDG_SESSION_TYPE") == "wayland": - os.environ["SDL_VIDEODRIVER"] = "wayland" - - import devkit_client.gui2 - devkit_client.gui2.main() - ''; -in -python3.pkgs.buildPythonPackage rec { - pname = "steamos-devkit"; - version = "0.20240216.0"; - - src = fetchFromGitLab { - domain = "gitlab.steamos.cloud"; - owner = "devkit"; - repo = "steamos-devkit"; - rev = "v${version}"; - sha256 = "sha256-eOtESkGMIjcijAFITOcYKPsXH6xH/Xcj9D+OItMqebM="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - appdirs - bcrypt - cffi - cryptography - idna - ifaddr - netifaces - numpy - paramiko - pycparser - pyimgui - pynacl - pysdl2 - signalslot - six - ]; - - nativeBuildInputs = [ - copyDesktopItems - ]; - - postUnpack = '' - # Find the absolute source root to link correctly to the previous root - prevRoot=$(realpath $sourceRoot) - - # Update the source root to the devkit_client package - sourceRoot="$sourceRoot/client" - - # Link the setup script into the new source root - ln -s $prevRoot/setup/shiv-linux-setup.py $sourceRoot/setup.py - ''; - - postInstall = '' - mkdir -p $out/bin - - # These are various assets like scripts that steamos-devkit will copy to the remote device - cp -R ./devkit-utils $out/${python3.sitePackages}/devkit-utils - - # writeScript + symlink will be ignored by wrapPythonPrograms - # Copying it is undesirable too, just write it directly to a script instead - cat << EOF > $out/bin/steamos-devkit - ${steamos-devkit-script} - EOF - chmod +x $out/bin/steamos-devkit - ''; - - # There are no checks for steamos-devkit - doCheck = false; - pythonImportsCheck = [ "devkit_client" ]; - - desktopItems = [ - (makeDesktopItem { - name = "SteamOS-Devkit"; - exec = "steamos-devkit"; - desktopName = "SteamOS Devkit Client"; - }) - ]; - - meta = with lib; { - description = "SteamOS Devkit Client"; - mainProgram = "steamos-devkit"; - homepage = "https://gitlab.steamos.cloud/devkit/steamos-devkit"; - license = licenses.mit; - maintainers = with maintainers; [ myaats ]; - }; -} diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix deleted file mode 100644 index b81b1f281b65..000000000000 --- a/pkgs/development/tools/stylua/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub - # lua54 implies lua52/lua53 -, features ? [ "lua54" "luau" ] -}: - -rustPlatform.buildRustPackage rec { - pname = "stylua"; - version = "0.20.0"; - - src = fetchFromGitHub { - owner = "johnnymorganz"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-bqUmLtJLjImWqe06CeIWIU4FP+/Vxszp2yKMosVeyZM="; - }; - - cargoHash = "sha256-EMHt9oskPJCeAu/5VG6PaMt/4NTmNOaFTM5TMOy0BV8="; - - # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu - postPatch = '' - rm .cargo/config.toml - ''; - - buildFeatures = features; - - meta = with lib; { - description = "Opinionated Lua code formatter"; - homepage = "https://github.com/johnnymorganz/stylua"; - changelog = "https://github.com/johnnymorganz/stylua/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "stylua"; - }; -} diff --git a/pkgs/development/tools/subxt/default.nix b/pkgs/development/tools/subxt/default.nix deleted file mode 100644 index e239483e4a61..000000000000 --- a/pkgs/development/tools/subxt/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, cmake -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "subxt"; - version = "0.37.0"; - - src = fetchFromGitHub { - owner = "paritytech"; - repo = "subxt"; - rev = "v${version}"; - hash = "sha256-GD4P+SXl9hyv0CxOximOMz+Gzi85kPahsiz0wHRqSWk="; - }; - - cargoHash = "sha256-luKtu9g+NtlwRhC1icpIxkBvP3GtggpKoj7Sx4anLAM="; - - # Only build the command line client - cargoBuildFlags = [ "--bin" "subxt" ]; - - # Needed by wabt-sys - nativeBuildInputs = [ cmake ]; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - # Requires a running substrate node - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/paritytech/subxt"; - description = "Submit transactions to a substrate node via RPC"; - mainProgram = "subxt"; - license = with licenses; [ gpl3Plus asl20 ]; - maintainers = [ maintainers.FlorianFranzen ]; - }; -} diff --git a/pkgs/development/tools/summon/default.nix b/pkgs/development/tools/summon/default.nix deleted file mode 100644 index db3eed974f45..000000000000 --- a/pkgs/development/tools/summon/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib }: - -buildGoModule rec { - pname = "summon"; - version = "0.10.1"; - - src = fetchFromGitHub { - owner = "cyberark"; - repo = "summon"; - rev = "v${version}"; - hash = "sha256-Y61lVqsKZiHLJF0X4DIq6U7eRXJ0+6I/dBPwXYb2GmQ="; - }; - - vendorHash = "sha256-StcJvUtMfBh7p1sD8ucvHNJ572whRfqz3id6XsFoXtk="; - - subPackages = [ "cmd" ]; - - postInstall = '' - mv $out/bin/cmd $out/bin/summon - ''; - - meta = with lib; { - description = - "CLI that provides on-demand secrets access for common DevOps tools"; - mainProgram = "summon"; - homepage = "https://cyberark.github.io/summon"; - license = lib.licenses.mit; - maintainers = with maintainers; [ quentini ]; - }; -} diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix deleted file mode 100644 index 320fcb1b04cd..000000000000 --- a/pkgs/development/tools/sunxi-tools/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, dtc, libusb1, zlib }: - -stdenv.mkDerivation rec { - pname = "sunxi-tools"; - version = "unstable-2021-08-29"; - - src = fetchFromGitHub { - owner = "linux-sunxi"; - repo = "sunxi-tools"; - rev = "74273b671a3fc34048383c40c85c684423009fb9"; - sha256 = "1gwamb64vr45iy2ry7jp1k3zc03q5sydmdflrbwr892f0ijh2wjl"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dtc libusb1 zlib ]; - - makeFlags = [ "PREFIX=$(out)" ]; - - buildFlags = [ "tools" "misc" ]; - - installTargets = [ "install-tools" "install-misc" ]; - - meta = with lib; { - description = "Tools for Allwinner SoC devices"; - homepage = "http://linux-sunxi.org/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ elitak ]; - }; -} diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix deleted file mode 100644 index d0feae3c2520..000000000000 --- a/pkgs/development/tools/supabase-cli/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -, testers -, supabase-cli -, nix-update-script -}: - -buildGoModule rec { - pname = "supabase-cli"; - version = "1.192.5"; - - src = fetchFromGitHub { - owner = "supabase"; - repo = "cli"; - rev = "v${version}"; - hash = "sha256-heGW7SS4OOZrKCdVHoGlYS4NAu29jncwE1cMwHDYB4c="; - }; - - vendorHash = "sha256-RiSZaNbMwOmKGzgFpeLmAjsiNg1ADMNAtMH7wHj/vlw="; - - ldflags = [ - "-s" - "-w" - "-X=github.com/supabase/cli/internal/utils.Version=${version}" - ]; - - doCheck = false; # tests are trying to connect to localhost - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - rm $out/bin/{docs,listdep} - mv $out/bin/{cli,supabase} - - installShellCompletion --cmd supabase \ - --bash <($out/bin/supabase completion bash) \ - --fish <($out/bin/supabase completion fish) \ - --zsh <($out/bin/supabase completion zsh) - ''; - - passthru = { - tests.version = testers.testVersion { - package = supabase-cli; - }; - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "CLI for interacting with supabase"; - homepage = "https://github.com/supabase/cli"; - license = licenses.mit; - maintainers = with maintainers; [ gerschtli kashw2 ]; - mainProgram = "supabase"; - }; -} diff --git a/pkgs/development/tools/surge-cli/default.nix b/pkgs/development/tools/surge-cli/default.nix deleted file mode 100644 index 13cd941d1a2b..000000000000 --- a/pkgs/development/tools/surge-cli/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ buildNpmPackage, fetchFromGitHub, lib }: - -buildNpmPackage rec { - pname = "surge-cli"; - version = "0.23.1"; - - src = fetchFromGitHub { - owner = "sintaxi"; - repo = "surge"; - rev = "v${version}"; - hash = "sha256-EpYww/YCQhPFmnOJ1zbigI2qyUrKN2TxKHEju/0Si3M="; - }; - - npmDepsHash = "sha256-F1C/sfOT/Tf+h28g1umP6czLFIsxDkbvT14ZfWLTiCE="; - - dontNpmBuild = true; - - meta = with lib; { - mainProgram = "surge"; - description = "CLI for the surge.sh CDN"; - homepage = "https://surge.sh"; - license = licenses.mit; - maintainers = with maintainers; [ MoritzBoehme ]; - }; -} diff --git a/pkgs/development/tools/swc/default.nix b/pkgs/development/tools/swc/default.nix deleted file mode 100644 index b9ed6d05d6f4..000000000000 --- a/pkgs/development/tools/swc/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -}: - -rustPlatform.buildRustPackage rec { - pname = "swc"; - version = "0.91.369"; - - env = { - # swc depends on nightly features - RUSTC_BOOTSTRAP = 1; - }; - - src = fetchCrate { - pname = "swc_cli"; - inherit version; - hash = "sha256-6n6zHMV87h1kmjzEmdE86/toHI99q2HO1EEGHUE9sg8="; - }; - - cargoHash = "sha256-/Ku0W+L2mqVYDSkd2zRqM7UhHueXya4zjewp/xO/XlQ"; - - meta = with lib; { - description = "Rust-based platform for the Web"; - mainProgram = "swc"; - homepage = "https://github.com/swc-project/swc"; - license = licenses.asl20; - maintainers = with maintainers; [ dit7ya kashw2 ]; - }; -} diff --git a/pkgs/development/tools/swiftformat/default.nix b/pkgs/development/tools/swiftformat/default.nix deleted file mode 100644 index 317f0ee41617..000000000000 --- a/pkgs/development/tools/swiftformat/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ 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 -# hydraPlatforms are copied pretty directly from the MacVim derivation, which -# is also impure. - -stdenv.mkDerivation rec { - pname = "swiftformat"; - version = "0.47.10"; - - src = fetchFromGitHub { - owner = "nicklockwood"; - repo = "SwiftFormat"; - rev = version; - sha256 = "1gqxpymbhpmap0i2blg9akarlql4mkzv45l4i212gsxcs991b939"; - }; - - preConfigure = "LD=$CC"; - - buildPhase = '' - /usr/bin/xcodebuild -project SwiftFormat.xcodeproj \ - -scheme "SwiftFormat (Command Line Tool)" \ - CODE_SIGN_IDENTITY= SYMROOT=build OBJROOT=build - ''; - - installPhase = '' - install -D -m 0555 build/Release/swiftformat $out/bin/swiftformat - ''; - - sandboxProfile = '' - (allow file-read* file-write* process-exec mach-lookup) - ; block homebrew dependencies - (deny file-read* file-write* process-exec mach-lookup (subpath "/usr/local") (with no-log)) - ''; - - meta = with lib; { - description = "Code formatting and linting tool for Swift"; - homepage = "https://github.com/nicklockwood/SwiftFormat"; - license = licenses.mit; - maintainers = [ maintainers.bdesham ]; - platforms = platforms.darwin; - hydraPlatforms = []; - }; -} diff --git a/pkgs/development/tools/systemfd/default.nix b/pkgs/development/tools/systemfd/default.nix deleted file mode 100644 index 041f88111b00..000000000000 --- a/pkgs/development/tools/systemfd/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, fetchFromGitHub -, rustPlatform -}: - -let - version = "0.4.4"; - -in -rustPlatform.buildRustPackage { - - pname = "systemfd"; - inherit version; - - src = fetchFromGitHub { - repo = "systemfd"; - owner = "mitsuhiko"; - rev = version; - sha256 = "sha256-U+pBKuoMhyIOhLl1nzmxk5yFt9nOq/KZ6rx9JhalLmM="; - }; - - cargoHash = "sha256-k8FgdNVjFYO/lflVzRQUwHvdy4+eCNTnTYImdfy1GaQ="; - - meta = { - description = "Convenient helper for passing sockets into another process"; - mainProgram = "systemfd"; - homepage = "https://github.com/mitsuhiko/systemfd"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.adisbladis ]; - platforms = lib.platforms.unix; - }; - -} diff --git a/pkgs/development/tools/tailwindcss/default.nix b/pkgs/development/tools/tailwindcss/default.nix index 40956b0851cc..14e859c9c510 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-8ZEfjHzAKl3zhR411+DG1dYCvH+5kjyKCaAsvGPxufM="; - aarch64-linux = "sha256-5SHOyRnJJusu07zCLg6t+Y+N9fchHrw/CDIea77p140="; - armv7l-linux = "sha256-Gww+nE22t1IGiZgMozdFt6UAARjS5GUU+TAouPCJU2s="; - x86_64-darwin = "sha256-kUQH5sENMfgL8AStspXMJfCaP+/KQ6t3i+1bqFbMndg="; - x86_64-linux = "sha256-DD4h2EeaTFP/4c/H/pZfa2DYz1l73zTbEyuMZcYUNUE="; + aarch64-darwin = "sha256-y1//nTmNDU8hw3wumVeK2kN2b7xoB7X5Kdg16/0HUms="; + aarch64-linux = "sha256-o1jubyQBq/z83CPzTII6ZclZUHVXVahsu024GXFrxX8="; + armv7l-linux = "sha256-+hb5ahgDCLSoR5o3YovdDp6igbXkHhxu0Lu1iY8Xros="; + x86_64-darwin = "sha256-raeEz+Kd3cfzPGTKC79h51vcXpGGDRuZY7luDGZphbs="; + x86_64-linux = "sha256-haR0CRyHcK8hXUAkW968Ui6vGpiPP5V1mi7n6lOS71M="; }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "tailwindcss"; - version = "3.4.10"; + version = "3.4.14"; src = fetchurl { url = "https://github.com/tailwindlabs/tailwindcss/releases/download/v${version}/tailwindcss-${plat}"; diff --git a/pkgs/development/tools/taplo/default.nix b/pkgs/development/tools/taplo/default.nix deleted file mode 100644 index 77774a0d9a72..000000000000 --- a/pkgs/development/tools/taplo/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, pkg-config -, openssl -, stdenv -, darwin -, withLsp ? true -}: - -rustPlatform.buildRustPackage rec { - pname = "taplo"; - version = "0.9.3"; - - src = fetchCrate { - inherit version; - pname = "taplo-cli"; - hash = "sha256-dNGQbaIfFmgXh2AOcaE74BTz7/jaiBgU7Y1pkg1rV7U="; - }; - - cargoHash = "sha256-iucjewjRCunKxKCqeZwf7bdEo7+aN9hfWPwUAJhaSq0="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - buildFeatures = lib.optional withLsp "lsp"; - - meta = with lib; { - description = "TOML toolkit written in Rust"; - homepage = "https://taplo.tamasfe.dev"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "taplo"; - }; -} diff --git a/pkgs/development/tools/tapview/default.nix b/pkgs/development/tools/tapview/default.nix deleted file mode 100644 index 718ef854225a..000000000000 --- a/pkgs/development/tools/tapview/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ asciidoctor -, fetchFromGitLab -, lib -, stdenv -}: - -stdenv.mkDerivation rec { - pname = "tapview"; - version = "1.1"; - - nativeBuildInputs = [ asciidoctor ]; - - src = fetchFromGitLab { - owner = "esr"; - repo = pname; - rev = version; - hash = "sha256-inrxICNglZU/tup+YnHaDiVss32K2OXht/7f8lOZI4g="; - }; - - # Remove unnecessary `echo` checks: `/bin/echo` fails, and `echo -n` works as expected. - patches = [ ./dont_check_echo.patch ]; - - makeFlags = [ "prefix=$(out)" ]; - - meta = with lib; { - description = "Minimalist pure consumer for TAP (Test Anything Protocol)"; - mainProgram = "tapview"; - homepage = "https://gitlab.com/esr/tapview"; - license = licenses.bsd2; - platforms = platforms.all; - maintainers = with maintainers; [ pamplemousse ]; - }; -} diff --git a/pkgs/development/tools/tapview/dont_check_echo.patch b/pkgs/development/tools/tapview/dont_check_echo.patch deleted file mode 100644 index 3b12adb84c57..000000000000 --- a/pkgs/development/tools/tapview/dont_check_echo.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/tapview b/tapview -index ad6a33a66d1..4cf9545d42f 100644 ---- a/tapview -+++ b/tapview -@@ -13,21 +13,6 @@ - # - # This is version 1.1 - # A newer version may be available at https://gitlab.com/esr/tapview --# --# POSIX allows but does not mandate that -n suppresses emission of a --# trailing newline in echo. Thus, some shell builtin echos don't do --# that. Cope gracefully. --# shellcheck disable=SC2039 --if [ "$(echo -n "a"; echo "b")" != "ab" ] --then -- ECHO="echo" --elif [ "$(/bin/echo -n "a"; /bin/echo "b")" = "ab" ] --then -- ECHO="/bin/echo" --else -- echo "tapview: bailing out, your echo lacks -n support." -- exit 3 --fi - - OK="." - FAIL="F" -@@ -37,7 +22,7 @@ TODO_OK="u" - - ship_char() { - # shellcheck disable=SC2039 -- "${ECHO}" -n "$1" -+ echo -n "$1" - } - - ship_line() { -@@ -155,7 +140,7 @@ do - fi - done - --/bin/echo "" -+echo "" - - if [ -z "$expect" ] - then diff --git a/pkgs/development/tools/tarmac/default.nix b/pkgs/development/tools/tarmac/default.nix index 34471106d73a..a2b03fa93cbd 100644 --- a/pkgs/development/tools/tarmac/default.nix +++ b/pkgs/development/tools/tarmac/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/tools/teller/default.nix b/pkgs/development/tools/teller/default.nix deleted file mode 100644 index 16e44c4637c6..000000000000 --- a/pkgs/development/tools/teller/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - nix-update-script, - protobuf, - stdenv, - darwin, - pkg-config, - openssl, -}: -let - pname = "teller"; - version = "2.0.7"; - date = "2024-05-19"; -in -rustPlatform.buildRustPackage { - inherit pname version; - - src = fetchFromGitHub { - owner = "tellerops"; - repo = pname; - rev = "v${version}"; - hash = "sha256-CI74nMMTIPwjJfy7ASR19V6EbYZ62NoAOxlP3Xt2BuI="; - }; - - cargoHash = "sha256-iqZX+9l3TWrFuaQreNz4RrCgPQCyKJt6RJ1UeKYaNRs="; - - nativeBuildInputs = [ - protobuf - pkg-config - ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; - - doCheck = false; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/teller --version 2>&1 | grep ${version}; - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - homepage = "https://github.com/tellerops/teller/"; - description = "Cloud native secrets management for developers"; - mainProgram = "teller"; - license = licenses.asl20; - maintainers = with maintainers; [ - cameronraysmith - wahtique - ]; - }; -} diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix deleted file mode 100644 index 182427c4b317..000000000000 --- a/pkgs/development/tools/textql/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch, sqlite }: - -buildGoModule rec { - pname = "textql"; - version = "unstable-2021-07-06"; - - src = fetchFromGitHub { - owner = "dinedal"; - repo = "textql"; - rev = "fca00ecc76c8d9891b195ad2c1359d39f0213604"; - hash = "sha256-NccRo5YdhwTo2eez5UE5nI3TEqzTL1rjPO1kKfDBNuw="; - }; - - patches = [ - # fix build with go 1.17 - (fetchpatch { - url = "https://github.com/jawn-smith/textql/commit/a0d7038c8c30671dfd618f47322814ab492c11a1.patch"; - sha256 = "1yjdbwipjxxhfcqlj1z6ngsm7dr8gfp4l61jynn2iw7f02cn1yck"; - }) - ]; - - vendorHash = "sha256-/DFtZA3Tml+RYTuv1YEUnC37jChTjrC01+zRO7Tj58A="; - - postInstall = '' - install -Dm644 -t $out/share/man/man1 ${src}/man/textql.1 - ''; - - # needed for tests - nativeBuildInputs = [ sqlite ]; - - doCheck = true; - - meta = with lib; { - description = "Execute SQL against structured text like CSV or TSV"; - mainProgram = "textql"; - homepage = "https://github.com/dinedal/textql"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/tf2pulumi/default.nix b/pkgs/development/tools/tf2pulumi/default.nix deleted file mode 100644 index bc5c92a98f22..000000000000 --- a/pkgs/development/tools/tf2pulumi/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "tf2pulumi"; - version = "0.12.0"; - - src = fetchFromGitHub { - owner = "pulumi"; - repo = "tf2pulumi"; - rev = "v${version}"; - sha256 = "sha256-i6nK1AEnQY47ro6tNDBExdcb9WvltY/21FVrVaiSTvo="; - }; - - vendorHash = "sha256-x7GAkbvhML2VUQ9/zitrTBBiy9lISb3iTx6yn5WbEig="; - - ldflags = [ - "-s" "-w" "-X=github.com/pulumi/tf2pulumi/version.Version=${src.rev}" - ]; - - subPackages = [ "." ]; - - meta = with lib; { - description = "Convert Terraform projects to Pulumi TypeScript programs"; - mainProgram = "tf2pulumi"; - homepage = "https://www.pulumi.com/tf2pulumi/"; - license = licenses.asl20; - maintainers = with maintainers; [ mausch ]; - }; -} diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix deleted file mode 100644 index 550553385828..000000000000 --- a/pkgs/development/tools/the-way/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, rustPlatform, fetchCrate, installShellFiles, stdenv, darwin }: - -rustPlatform.buildRustPackage rec { - pname = "the-way"; - version = "0.20.3"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-/vG5LkQiA8iPP+UV1opLeJwbYfmzqYwpsoMizpGT98o="; - }; - - cargoHash = "sha256-iZxV099582LuZ8A3uOsKPyekAQG2cQusLZhW+W1wW/8="; - - nativeBuildInputs = [ installShellFiles ]; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; - - useNextest = true; - - postInstall = '' - $out/bin/the-way config default tmp.toml - for shell in bash fish zsh; do - THE_WAY_CONFIG=tmp.toml $out/bin/the-way complete $shell > the-way.$shell - installShellCompletion the-way.$shell - done - ''; - - meta = with lib; { - description = "Terminal code snippets manager"; - mainProgram = "the-way"; - homepage = "https://github.com/out-of-cheese-error/the-way"; - changelog = "https://github.com/out-of-cheese-error/the-way/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ figsoda numkem ]; - }; -} diff --git a/pkgs/development/tools/time-ghc-modules/default.nix b/pkgs/development/tools/time-ghc-modules/default.nix deleted file mode 100644 index bbe0e4152fc0..000000000000 --- a/pkgs/development/tools/time-ghc-modules/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, makeWrapper -, sqlite -, python3 -, coreutils -, findutils -, gnused -}: - -stdenv.mkDerivation rec { - pname = "time-ghc-modules"; - version = "2.0.0"; - - src = fetchFromGitHub { - owner = "codedownio"; - repo = "time-ghc-modules"; - rev = version; - sha256 = "sha256-/PhJAhP3KCWFyeSk8e5JV0cpBueH/eVDwQTMZSnnZCo="; - }; - - nativeBuildInputs = [makeWrapper]; - - buildPhase = '' - runHook preBuild - - mkdir -p $out/bin - cp ./time-ghc-modules $out/bin/time-ghc-modules - wrapProgram $out/bin/time-ghc-modules --prefix PATH : ${lib.makeBinPath [ sqlite python3 coreutils findutils gnused ]} \ - --set PROCESS_SCRIPT $out/lib/process \ - --set HTML_FILE $out/lib/index.html - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - install -m 444 ./dist/index.html $out/lib - install ./scripts/process $out/lib - - runHook postInstall - ''; - - meta = with lib; { - description = "Analyze GHC .dump-timings files"; - mainProgram = "time-ghc-modules"; - homepage = "https://github.com/codedownio/time-ghc-modules"; - license = licenses.mit; - maintainers = [ maintainers.thomasjm ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/toast/default.nix b/pkgs/development/tools/toast/default.nix deleted file mode 100644 index a7fa40f035b1..000000000000 --- a/pkgs/development/tools/toast/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "toast"; - version = "0.47.6"; - - src = fetchFromGitHub { - owner = "stepchowfun"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-+qntd687LF4tJwHZglZ6mppHq3dOZ+l431oKBBNDI0k="; - }; - - cargoHash = "sha256-A2sJ0o0RDztk3NjxG0CD8wNA4tmOizY4Tvff6ADzYQ8="; - - checkFlags = [ "--skip=format::tests::code_str_display" ]; # fails - - meta = with lib; { - description = "Containerize your development and continuous integration environments"; - mainProgram = "toast"; - homepage = "https://github.com/stepchowfun/toast"; - license = licenses.mit; - maintainers = with maintainers; [ dit7ya ]; - }; -} diff --git a/pkgs/development/tools/tokio-console/default.nix b/pkgs/development/tools/tokio-console/default.nix deleted file mode 100644 index 03775abeeb51..000000000000 --- a/pkgs/development/tools/tokio-console/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, fetchFromGitHub -, installShellFiles -, rustPlatform -, protobuf -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "tokio-console"; - version = "0.1.10"; - - src = fetchFromGitHub { - owner = "tokio-rs"; - repo = "console"; - rev = "tokio-console-v${version}"; - hash = "sha256-sjfdxOeaNANYJuJMjZ/tCGc2mWM+98d8yPHAVSl4cF4="; - }; - - cargoHash = "sha256-86KQpRpYSCQs6SUeG0HV26b58x/QUyovoL+5fg8JCOI="; - - buildAndTestSubdir = "tokio-console"; - - nativeBuildInputs = [ - installShellFiles - protobuf - ]; - - # uses currently unstable tokio features - RUSTFLAGS = "--cfg tokio_unstable"; - - checkFlags = [ - # tests depend upon git repository at test execution time - "--skip bootstrap" - "--skip config::tests::args_example_changed" - "--skip config::tests::toml_example_changed" - ]; - - 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) \ - --zsh <($out/bin/tokio-console --log-dir $(mktemp -d) gen-completion zsh) - ''; - - meta = with lib; { - description = "Debugger for asynchronous Rust code"; - homepage = "https://github.com/tokio-rs/console"; - mainProgram = "tokio-console"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ max-niederman ]; - }; -} diff --git a/pkgs/development/tools/toml2json/default.nix b/pkgs/development/tools/toml2json/default.nix deleted file mode 100644 index 6d7a8dcf6a36..000000000000 --- a/pkgs/development/tools/toml2json/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, rustPlatform, fetchCrate }: - -rustPlatform.buildRustPackage rec { - pname = "toml2json"; - version = "1.3.1"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-9q2HtNzsRO0/5gcmxUfWuQlWsfvw/A21WEXZlifCUjY="; - }; - - cargoHash = "sha256-laOM7LpmsCpLcm4kPRsJiXHoKR58RCuQxVO5Z78beWI="; - - meta = with lib; { - description = "Very small CLI for converting TOML to JSON"; - mainProgram = "toml2json"; - homepage = "https://github.com/woodruffw/toml2json"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ rvarago ]; - }; -} diff --git a/pkgs/development/tools/toml2nix/Cargo.lock b/pkgs/development/tools/toml2nix/Cargo.lock deleted file mode 100644 index f6b37fbc189d..000000000000 --- a/pkgs/development/tools/toml2nix/Cargo.lock +++ /dev/null @@ -1,25 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "serde" -version = "1.0.145" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" - -[[package]] -name = "toml" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" -dependencies = [ - "serde", -] - -[[package]] -name = "toml2nix" -version = "0.1.1" -dependencies = [ - "toml", -] diff --git a/pkgs/development/tools/toml2nix/default.nix b/pkgs/development/tools/toml2nix/default.nix deleted file mode 100644 index b34f40933b76..000000000000 --- a/pkgs/development/tools/toml2nix/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, rustPlatform, fetchCrate }: - -rustPlatform.buildRustPackage rec { - pname = "toml2nix"; - version = "0.1.1"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-YhluLS4tFMibFrDzgIvNtfjM5dAqJQvygeZocKn3+Jg="; - }; - - cargoLock.lockFile = ./Cargo.lock; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - - meta = with lib; { - description = "Tool to convert TOML files to Nix expressions"; - mainProgram = "toml2nix"; - homepage = "https://crates.io/crates/toml2nix"; - license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix deleted file mode 100644 index 22dd5d2f6eeb..000000000000 --- a/pkgs/development/tools/toxiproxy/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, testers -, toxiproxy -}: - -buildGoModule rec { - pname = "toxiproxy"; - version = "2.9.0"; - - src = fetchFromGitHub { - owner = "Shopify"; - repo = "toxiproxy"; - rev = "v${version}"; - sha256 = "sha256-zwKeJ8LMMSSHvE0x0/9j3wBdAJG43RiGcszKz0B3dG8="; - }; - - vendorHash = "sha256-eSQvLsSWWypA5vXR/GiEf5j7TzzsL8ZFRPOeICsIrlY="; - - excludedPackages = [ "test/e2e" ]; - - ldflags = [ "-s" "-w" "-X github.com/Shopify/toxiproxy/v2.Version=${version}" ]; - - # Fixes tests on Darwin - __darwinAllowLocalNetworking = true; - - checkFlags = [ - "-short" - "-skip=TestVersionEndpointReturnsVersion|TestFullstreamLatencyBiasDown" - ]; - - postInstall = '' - mv $out/bin/cli $out/bin/toxiproxy-cli - mv $out/bin/server $out/bin/toxiproxy-server - ''; - - passthru.tests = { - cliVersion = testers.testVersion { - inherit version; - package = toxiproxy; - command = "${toxiproxy}/bin/toxiproxy-cli -version"; - }; - serverVersion = testers.testVersion { - inherit version; - package = toxiproxy; - command = "${toxiproxy}/bin/toxiproxy-server -version"; - }; - }; - - meta = { - changelog = "https://github.com/Shopify/toxiproxy/releases/tag/v${version}"; - description = "Proxy for for simulating network conditions"; - homepage = "https://github.com/Shopify/toxiproxy"; - maintainers = with lib.maintainers; [ avnik ]; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/tools/tradcpp/aarch64.patch b/pkgs/development/tools/tradcpp/aarch64.patch deleted file mode 100644 index ef7ad9828ace..000000000000 --- a/pkgs/development/tools/tradcpp/aarch64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff a/config.h b/config.h ---- a/config.h -+++ b/config.h -@@ -124,6 +124,8 @@ - #define CONFIG_CPU "__ppc64__" - #elif defined(__ARM__) - #define CONFIG_CPU "__ARM__" -+#elif defined(__aarch64__) -+#define CONFIG_CPU "__aarch64__" - #else - /* let it go */ - #endif diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/development/tools/tradcpp/default.nix deleted file mode 100644 index b26db0d22356..000000000000 --- a/pkgs/development/tools/tradcpp/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, autoconf }: - -stdenv.mkDerivation rec { - pname = "tradcpp"; - version = "0.5.2"; - - src = fetchurl { - url = "https://ftp.netbsd.org/pub/NetBSD/misc/dholland/${pname}-${version}.tar.gz"; - sha256 = "1h2bwxwc13rz3g2236l89hm47f72hn3m4h7wjir3j532kq0m68bc"; - }; - - strictDeps = true; - # tradcpp only comes with BSD-make Makefile; the patch adds configure support - nativeBuildInputs = [ autoconf ]; - preConfigure = "autoconf"; - patches = [ - ./tradcpp-configure.patch - ./aarch64.patch - ]; - - meta = with lib; { - description = "Traditional (K&R-style) C macro preprocessor"; - mainProgram = "tradcpp"; - platforms = platforms.all; - license = licenses.bsd2; - }; - -} diff --git a/pkgs/development/tools/tradcpp/tradcpp-configure.patch b/pkgs/development/tools/tradcpp/tradcpp-configure.patch deleted file mode 100644 index 39cc499e2180..000000000000 --- a/pkgs/development/tools/tradcpp/tradcpp-configure.patch +++ /dev/null @@ -1,84 +0,0 @@ -*** /dev/null Wed Jan 7 11:47:26 2015 ---- tradcpp-0.4/Makefile.in Wed Jan 7 11:43:15 2015 -*************** -*** 0 **** ---- 1,64 ---- -+ SHELL = /bin/sh -+ -+ ### Filled in by `configure' ### -+ srcdir = @srcdir@ -+ VPATH = @srcdir@ -+ CC = @CC@ -+ CFLAGS = @CFLAGS@ -+ CPPFLAGS = @CPPFLAGS@ -+ -+ LDFLAGS = @LDFLAGS@ -+ -+ prefix = @prefix@ -+ exec_prefix = @exec_prefix@ -+ -+ bindir = @bindir@ -+ libdir = @libdir@ -+ incdir = @includedir@ -+ manext = 1 -+ mandir = @mandir@/man$(manext) -+ docdir = @docdir@ -+ datarootdir = @datarootdir@ -+ datadir = @datadir@ -+ -+ OBJS= main.o \ -+ files.o directive.o eval.o macro.o output.o \ -+ place.o array.o utils.o -+ -+ .PHONY: all clean install man doc dist -+ -+ default: all -+ -+ all: tradcpp -+ -+ tradcpp: $(OBJS) -+ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -o $@ $(OBJS) -+ -+ clean: -+ rm -f *.o -+ -+ distclean: clean -+ rm -f Makefile config.log config.status config-cache -+ -+ install: tradcpp -+ mkdir -p $(DESTDIR)$(mandir) -+ install tradcpp.1 $(DESTDIR)$(mandir) -+ mkdir -p $(DESTDIR)$(bindir) -+ install tradcpp $(DESTDIR)$(bindir) -+ -+ .c.o: -+ $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< -+ -+ array.o: array.c array.h inlinedefs.h utils.h -+ directive.o: directive.c utils.h mode.h place.h files.h directive.h \ -+ macro.h eval.h output.h -+ eval.o: eval.c utils.h array.h inlinedefs.h mode.h place.h eval.h -+ files.o: files.c array.h inlinedefs.h utils.h mode.h place.h files.h \ -+ directive.h -+ macro.o: macro.c array.h inlinedefs.h utils.h mode.h place.h macro.h \ -+ output.h -+ main.o: main.c version.h config.h utils.h array.h inlinedefs.h mode.h \ -+ place.h files.h directive.h macro.h -+ output.o: output.c utils.h mode.h place.h output.h -+ place.o: place.c utils.h array.h inlinedefs.h place.h -+ utils.o: utils.c utils.h -*** /dev/null Wed Jan 7 11:47:26 2015 ---- tradcpp-0.4/configure.ac Wed Jan 7 11:22:18 2015 -*************** -*** 0 **** ---- 1,10 ---- -+ AC_PREREQ([2.60])dnl -+ AC_INIT(main.c) -+ AC_PROG_CC -+ AC_LANG(C) -+ AC_SUBST(CC) -+ AC_SUBST(CFLAGS) -+ AC_SUBST(CPPFLAGS) -+ AC_SUBST(LDFLAGS) -+ AC_SUBST(LD) -+ AC_OUTPUT(Makefile) diff --git a/pkgs/development/tools/trunk/default.nix b/pkgs/development/tools/trunk/default.nix deleted file mode 100644 index 17cf053b98f1..000000000000 --- a/pkgs/development/tools/trunk/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, -stdenv, -rustPlatform, -fetchFromGitHub, -pkg-config, -openssl, -CoreServices, -SystemConfiguration -}: - -rustPlatform.buildRustPackage rec { - pname = "trunk"; - version = "0.20.3"; - - src = fetchFromGitHub { - owner = "trunk-rs"; - repo = "trunk"; - rev = "v${version}"; - hash = "sha256-3p3HllZu69e2ERLoEJwSWL0OXl23lxvIPHV9HK30CqM="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = if stdenv.isDarwin - then [ CoreServices SystemConfiguration ] - else [ openssl ]; - # requires network - checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; - - cargoHash = "sha256-4b+ASz8uV17Y7gO50YKiu8Zhhq4sL+HJj1WAD7VkEE4="; - - meta = with lib; { - homepage = "https://github.com/trunk-rs/trunk"; - description = "Build, bundle & ship your Rust WASM application to the web"; - mainProgram = "trunk"; - maintainers = with maintainers; [ freezeboy ctron ]; - license = with licenses; [ asl20 ]; - }; -} diff --git a/pkgs/development/tools/ttfb/default.nix b/pkgs/development/tools/ttfb/default.nix deleted file mode 100644 index c2c599f32ff7..000000000000 --- a/pkgs/development/tools/ttfb/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ darwin -, fetchCrate -, lib -, rustPlatform -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "ttfb"; - version = "1.12.0"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-Cdup65w31wF1RZu0g4/msHfLESrNTcuCU5kxkk0gnW8="; - }; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - cargoHash = "sha256-U8CG0GqnUwya+ZK0qXtOFZ/MbbqSvB5egX7XJKtl88g="; - - # The bin feature activates all dependencies of the binary. Otherwise, - # only the library is build. - buildFeatures = [ "bin" ]; - - meta = { - description = "CLI-Tool to measure the TTFB (time to first byte) of HTTP(S) requests"; - mainProgram = "ttfb"; - longDescription = '' - ttfb measure the TTFB (time to first byte) of HTTP(S) requests. This includes data - of intermediate steps, such as the relative and absolute timings of DNS lookup, TCP - connect, and TLS handshake. - ''; - homepage = "https://github.com/phip1611/ttfb"; - changelog = "https://github.com/phip1611/ttfb/blob/v${version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ phip1611 ]; - }; -} - diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix deleted file mode 100644 index e87cd2c9e210..000000000000 --- a/pkgs/development/tools/turso-cli/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - stdenv, - buildGoModule, - fetchFromGitHub, - installShellFiles, - nix-update-script, -}: -buildGoModule rec { - pname = "turso-cli"; - version = "0.97.1"; - - src = fetchFromGitHub { - owner = "tursodatabase"; - repo = "turso-cli"; - rev = "v${version}"; - hash = "sha256-sS9H9mdbjV2EEsMKikQKND+gPeghH5cqRxhHcbjr7ok="; - }; - - vendorHash = "sha256-tBO21IgUczwMgrEyV7scV3YTY898lYHASaLeXqvBopU="; - - nativeBuildInputs = [ installShellFiles ]; - - ldflags = [ - "-X github.com/tursodatabase/turso-cli/internal/cmd.version=v${version}" - ]; - - preCheck = '' - export HOME=$(mktemp -d) - ''; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd turso \ - --bash <($out/bin/turso completion bash) \ - --fish <($out/bin/turso completion fish) \ - --zsh <($out/bin/turso completion zsh) - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "This is the command line interface (CLI) to Turso"; - homepage = "https://turso.tech"; - mainProgram = "turso"; - license = licenses.mit; - maintainers = with maintainers; [ zestsystem kashw2 fryuni ]; - }; -} diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix deleted file mode 100644 index defdf1ed92b4..000000000000 --- a/pkgs/development/tools/twilio-cli/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenvNoCC, nodejs-slim, fetchzip, testers }: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "twilio-cli"; - version = "5.22.1"; - - src = fetchzip { - url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-PxAc9sC44HBcm3Zv5dsN35cTZWfSYP0F46PFZ48xhrw="; - }; - - buildInputs = [ nodejs-slim ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/libexec/twilio-cli - cp -R . $out/libexec/twilio-cli - ln -s $out/libexec/twilio-cli/bin/run $out/bin/twilio - - runHook postInstall - ''; - - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - }; - - meta = with lib; { - description = "Unleash the power of Twilio from your command prompt"; - homepage = "https://github.com/twilio/twilio-cli"; - changelog = "https://github.com/twilio/twilio-cli/blob/${finalAttrs.version}/CHANGES.md"; - license = licenses.mit; - maintainers = [ ]; - platforms = nodejs-slim.meta.platforms; - mainProgram = "twilio"; - }; -}) diff --git a/pkgs/development/tools/twitch-cli/application-name.patch b/pkgs/development/tools/twitch-cli/application-name.patch deleted file mode 100644 index 0d80e7252c88..000000000000 --- a/pkgs/development/tools/twitch-cli/application-name.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmd/root.go b/cmd/root.go -index 3d85c19..cbbe40c 100644 ---- a/cmd/root.go -+++ b/cmd/root.go -@@ -16,7 +16,7 @@ import ( - var cfgFile string - - var rootCmd = &cobra.Command{ -- Use: "twitch", -+ Use: "twitch-cli", - Short: "A simple CLI tool for the New Twitch API and Webhook products.", - } - diff --git a/pkgs/development/tools/twitch-cli/default.nix b/pkgs/development/tools/twitch-cli/default.nix deleted file mode 100644 index c8dbc9b42d14..000000000000 --- a/pkgs/development/tools/twitch-cli/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, lib -, testers -, twitch-cli -}: - -buildGoModule rec { - pname = "twitch-cli"; - version = "1.1.24"; - - src = fetchFromGitHub { - owner = "twitchdev"; - repo = pname; - rev = "v${version}"; - hash = "sha256-kRyJl2SxppVGCO/6wrsb8cO+wpBT1nBsyI/JsPRYzMc="; - }; - - patches = [ - ./application-name.patch - ]; - - vendorHash = "sha256-Z5bWS4oqjkEfOsvBzupKKnF6rJPU0TLVdwxDkIKcBQY="; - - ldflags = [ - "-s" - "-w" - "-X=main.buildVersion=${version}" - ]; - - preCheck = '' - export HOME=$(mktemp -d) - ''; - - __darwinAllowLocalNetworking = true; - - passthru.tests.version = testers.testVersion { - package = twitch-cli; - command = "HOME=$(mktemp -d) ${pname} version"; - version = "${pname}/${version}"; - }; - - meta = with lib; { - description = "Official Twitch CLI to make developing on Twitch easier"; - mainProgram = "twitch-cli"; - homepage = "https://github.com/twitchdev/twitch-cli"; - license = licenses.asl20; - maintainers = with maintainers; [ benediktbroich ]; - }; -} diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix deleted file mode 100644 index cce9c36b259f..000000000000 --- a/pkgs/development/tools/typos/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "typos"; - version = "1.24.5"; - - src = fetchFromGitHub { - owner = "crate-ci"; - repo = pname; - rev = "v${version}"; - hash = "sha256-WuiLtAC+2ZkQUb7v2Jm3GfjyJkuTo+JAz0CiRVBWqGE="; - }; - - cargoHash = "sha256-twr87xoynfJ8e7xh0B0z7HDKasKoTYZ+CxIlu4xWS4I="; - - meta = with lib; { - description = "Source code spell checker"; - mainProgram = "typos"; - homepage = "https://github.com/crate-ci/typos"; - changelog = "https://github.com/crate-ci/typos/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ figsoda mgttlinger ]; - }; -} diff --git a/pkgs/development/tools/udis86/default.nix b/pkgs/development/tools/udis86/default.nix deleted file mode 100644 index 14a594a827da..000000000000 --- a/pkgs/development/tools/udis86/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, autoreconfHook -, python3 -}: - -stdenv.mkDerivation rec { - pname = "udis86"; - version = "unstable-2014-12-25"; - - src = fetchFromGitHub { - owner = "vmt"; - repo = "udis86"; - rev = "56ff6c87c11de0ffa725b14339004820556e343d"; - hash = "sha256-bmm1rgzZeStQJXEmcT8vnplsnmgN3LJlYs7COmqsDU8="; - }; - - patches = [ - (fetchpatch { - name = "support-python3-for-building"; - url = "https://github.com/vmt/udis86/commit/3c05ce60372cb2eba39d6eb87ac05af8a664e1b1.patch"; - hash = "sha256-uF4Cwt7UMkyd0RX6cCMQt9xvkkUNQvTDH/Z/6nHtVT8="; - }) - ]; - - nativeBuildInputs = [ autoreconfHook python3 ]; - - configureFlags = [ - "--enable-shared" - ]; - - outputs = [ "bin" "out" "dev" "lib" ]; - - meta = with lib; { - homepage = "https://udis86.sourceforge.net"; - license = licenses.bsd2; - maintainers = with maintainers; [ timor ]; - mainProgram = "udcli"; - description = '' - Easy-to-use, minimalistic x86 disassembler library (libudis86) - ''; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix deleted file mode 100644 index 8b8f9d80feb1..000000000000 --- a/pkgs/development/tools/uftrace/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, pandoc -, capstone -, elfutils -, libtraceevent -, ncurses -, withLuaJIT ? false -, luajit -, withPython ? false -, python3 -}: - -stdenv.mkDerivation rec { - pname = "uftrace"; - version = "0.16"; - - src = fetchFromGitHub { - owner = "namhyung"; - repo = "uftrace"; - rev = "v${version}"; - 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 . - ''; - - meta = { - description = "Function (graph) tracer for user-space"; - mainProgram = "uftrace"; - homepage = "https://github.com/namhyung/uftrace"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.nthorne ]; - }; -} diff --git a/pkgs/development/tools/unconvert/default.nix b/pkgs/development/tools/unconvert/default.nix deleted file mode 100644 index 478a111555a6..000000000000 --- a/pkgs/development/tools/unconvert/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "unconvert"; - version = "0-unstable-2023-09-07"; - - src = fetchFromGitHub { - owner = "mdempsky"; - repo = "unconvert"; - rev = "415706980c061b6f71ea923bd206aec88785638f"; - hash = "sha256-MchA8uvy+MyQ/VaglBDTC7j/lNIKAtGeeECLoFfH6pI="; - }; - - vendorHash = "sha256-vZDk+ZNCMP5RRNrgeIowdOKPot7rqM84JhlbfvcQbB4="; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Remove unnecessary type conversions from Go source"; - mainProgram = "unconvert"; - homepage = "https://github.com/mdempsky/unconvert"; - license = licenses.bsd3; - maintainers = with maintainers; [ kalbasit ]; - }; -} diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 893f476df63e..d7d2bd2c2a8c 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "unityhub"; - version = "3.9.1"; + version = "3.10.0"; src = fetchurl { url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb"; - sha256 = "sha256-ZNsViLT0sFnHeV3FvJFPQbJ99mgpD2rH+bZOOGPgIhA="; + sha256 = "sha256-9dm6tVQ5nsDC8X2clrT4cAl8jg4wLwcihE4bnFgdU+A="; }; nativeBuildInputs = [ @@ -97,6 +97,9 @@ stdenv.mkDerivation rec { xorg.libXrender gnome2.GConf libcap + + # Unity Editor 6000 specific dependencies + harfbuzz ] ++ extraLibs pkgs; }; diff --git a/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch b/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch deleted file mode 100644 index ae0b3f37d505..000000000000 --- a/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch +++ /dev/null @@ -1,349 +0,0 @@ -From dc7156d8951242231cfd9142b3d5628815dc6589 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Wed, 31 Mar 2021 14:30:01 +0200 -Subject: [PATCH] Revert "Merge pull request #12225 from - chrisroberts/resolution-isolation" - -This reverts commit 8a69d0c4dae035a4b1aa789bc4ec3db69c210df2, reversing -changes made to 5dd0a8c8acc36b654c13a5102e4327eedf1858f2. - ------ - -Rationale: NixOS-specific patch. The changes in here break our current -implementation of declarative plugins (only `vagrant-libvirt` atm). ---- - bin/vagrant | 28 +-------------- - lib/vagrant.rb | 2 +- - lib/vagrant/bundler.rb | 17 +++------ - lib/vagrant/errors.rb | 12 ------- - lib/vagrant/plugin/manager.rb | 22 ++---------- - templates/locales/en.yml | 23 ++---------- - test/unit/bin/vagrant_test.rb | 1 - - test/unit/vagrant/bundler_test.rb | 58 ++++++++++++++----------------- - 8 files changed, 39 insertions(+), 124 deletions(-) - -diff --git a/bin/vagrant b/bin/vagrant -index c019f30ff..ba7e40076 100755 ---- a/bin/vagrant -+++ b/bin/vagrant -@@ -23,9 +23,9 @@ if idx = argv.index("--") - argv = argv.slice(0, idx) - end - --require_relative "../lib/vagrant/version" - # Fast path the version of Vagrant - if argv.include?("-v") || argv.include?("--version") -+ require_relative "../lib/vagrant/version" - puts "Vagrant #{Vagrant::VERSION}" - exit 0 - end -@@ -82,29 +82,6 @@ end - $stdout.sync = true - $stderr.sync = true - --# Before we start activate all our dependencies --# so we can provide correct resolutions later --builtin_specs = [] -- --vagrant_spec = Gem::Specification.find_all_by_name("vagrant").detect do |spec| -- spec.version == Gem::Version.new(Vagrant::VERSION) --end -- --dep_activator = proc do |spec| -- spec.runtime_dependencies.each do |dep| -- gem(dep.name, *dep.requirement.as_list) -- dep_spec = Gem::Specification.find_all_by_name(dep.name).detect(&:activated?) -- if dep_spec -- builtin_specs << dep_spec -- dep_activator.call(dep_spec) -- end -- end --end -- --if vagrant_spec -- dep_activator.call(vagrant_spec) --end -- - env = nil - begin - require 'log4r' -@@ -114,9 +91,6 @@ begin - require 'vagrant/util/platform' - require 'vagrant/util/experimental' - -- # Set our list of builtin specs -- Vagrant::Bundler.instance.builtin_specs = builtin_specs -- - # Schedule the cleanup of things - at_exit(&Vagrant::Bundler.instance.method(:deinit)) - -diff --git a/lib/vagrant.rb b/lib/vagrant.rb -index f790039d3..97e67e3b8 100644 ---- a/lib/vagrant.rb -+++ b/lib/vagrant.rb -@@ -59,7 +59,7 @@ require "vagrant/plugin/manager" - # See https://github.com/rest-client/rest-client/issues/34#issuecomment-290858 - # for more information - class VagrantLogger < Log4r::Logger -- def << msg -+ def << (msg) - debug(msg.strip) - end - end -diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb -index eb2caabb0..d75f54362 100644 ---- a/lib/vagrant/bundler.rb -+++ b/lib/vagrant/bundler.rb -@@ -189,11 +189,8 @@ module Vagrant - attr_reader :env_plugin_gem_path - # @return [Pathname] Vagrant environment data path - attr_reader :environment_data_path -- # @return [Array<Gem::Specification>, nil] List of builtin specs -- attr_accessor :builtin_specs - - def initialize -- @builtin_specs = [] - @plugin_gem_path = Vagrant.user_data_path.join("gems", RUBY_VERSION).freeze - @logger = Log4r::Logger.new("vagrant::bundler") - end -@@ -290,6 +287,7 @@ module Vagrant - # Never allow dependencies to be remotely satisfied during init - request_set.remote = false - -+ repair_result = nil - begin - @logger.debug("resolving solution from available specification set") - # Resolve the request set to ensure proper activation order -@@ -652,6 +650,7 @@ module Vagrant - self_spec.activate - @logger.info("Activated vagrant specification version - #{self_spec.version}") - end -+ self_spec.runtime_dependencies.each { |d| gem d.name, *d.requirement.as_list } - # discover all the gems we have available - list = {} - if Gem.respond_to?(:default_specifications_dir) -@@ -660,16 +659,10 @@ module Vagrant - spec_dir = Gem::Specification.default_specifications_dir - end - directories = [spec_dir] -- if Vagrant.in_bundler? -- Gem::Specification.find_all{true}.each do |spec| -- list[spec.full_name] = spec -- end -- else -- builtin_specs.each do |spec| -- list[spec.full_name] = spec -- end -+ Gem::Specification.find_all{true}.each do |spec| -+ list[spec.full_name] = spec - end -- if Vagrant.in_installer? -+ if(!Object.const_defined?(:Bundler)) - directories += Gem::Specification.dirs.find_all do |path| - !path.start_with?(Gem.user_dir) - end -diff --git a/lib/vagrant/errors.rb b/lib/vagrant/errors.rb -index 5cb861c06..782615bc4 100644 ---- a/lib/vagrant/errors.rb -+++ b/lib/vagrant/errors.rb -@@ -636,18 +636,6 @@ module Vagrant - error_key(:provisioner_winrm_unsupported) - end - -- class PluginNeedsDeveloperTools < VagrantError -- error_key(:plugin_needs_developer_tools) -- end -- -- class PluginMissingLibrary < VagrantError -- error_key(:plugin_missing_library) -- end -- -- class PluginMissingRubyDev < VagrantError -- error_key(:plugin_missing_ruby_dev) -- end -- - class PluginGemNotFound < VagrantError - error_key(:plugin_gem_not_found) - end -diff --git a/lib/vagrant/plugin/manager.rb b/lib/vagrant/plugin/manager.rb -index b73f07f9c..9058e68b3 100644 ---- a/lib/vagrant/plugin/manager.rb -+++ b/lib/vagrant/plugin/manager.rb -@@ -179,26 +179,8 @@ module Vagrant - result - rescue Gem::GemNotFoundException - raise Errors::PluginGemNotFound, name: name -- rescue Gem::Exception => err -- @logger.warn("Failed to install plugin: #{err}") -- @logger.debug("#{err.class}: #{err}\n#{err.backtrace.join("\n")}") -- # Try and determine a cause for the failure -- case err.message -- when /install development tools first/ -- raise Errors::PluginNeedsDeveloperTools -- when /library not found in default locations/ -- lib = err.message.match(/(\w+) library not found in default locations/) -- if lib.nil? -- raise Errors::BundlerError, message: err.message -- end -- raise Errors::PluginMissingLibrary, -- library: lib.captures.first, -- name: name -- when /find header files for ruby/ -- raise Errors::PluginMissingRubyDev -- else -- raise Errors::BundlerError, message: err.message -- end -+ rescue Gem::Exception => e -+ raise Errors::BundlerError, message: e.to_s - end - - # Uninstalls the plugin with the given name. -diff --git a/templates/locales/en.yml b/templates/locales/en.yml -index edae9b477..782904f49 100644 ---- a/templates/locales/en.yml -+++ b/templates/locales/en.yml -@@ -794,9 +794,9 @@ en: - matching this provider. For example, if you're using VirtualBox, - the clone environment must also be using VirtualBox. - cloud_init_not_found: |- -- cloud-init is not found. Please ensure that cloud-init is installed and -+ cloud-init is not found. Please ensure that cloud-init is installed and - available on path for guest '%{guest_name}'. -- cloud_init_command_failed: |- -+ cloud_init_command_failed: |- - cloud init command '%{cmd}' failed on guest '%{guest_name}'. - command_deprecated: |- - The command 'vagrant %{name}' has been deprecated and is no longer functional -@@ -1245,30 +1245,6 @@ en: - following command: - - vagrant plugin install --local -- plugin_needs_developer_tools: |- -- Vagrant failed to install the requested plugin because development tools -- are required for installation but are not currently installed on this -- machine. Please install development tools and then try this command -- again. -- plugin_missing_library: |- -- Vagrant failed to install the requested plugin because it depends -- on development files for a library which is not currently installed -- on this system. The following library is required by the '%{name}' -- plugin: -- -- %{library} -- -- If a package manager is used on this system, please install the development -- package for the library. The name of the package will be similar to: -- -- %{library}-dev or %{library}-devel -- -- After the library and development files have been installed, please -- run the command again. -- plugin_missing_ruby_dev: |- -- Vagrant failed to install the requested plugin because the Ruby header -- files could not be found. Install the ruby development package for your -- system and then run this command again. - powershell_not_found: |- - Failed to locate the powershell executable on the available PATH. Please - ensure powershell is installed and available on the local PATH, then -@@ -3015,7 +2998,7 @@ en: - pushes: - file: - no_destination: "File destination must be specified." -- -+ - autocomplete: - installed: |- - Autocomplete installed at paths: -diff --git a/test/unit/bin/vagrant_test.rb b/test/unit/bin/vagrant_test.rb -index dbbd52112..bc11309aa 100644 ---- a/test/unit/bin/vagrant_test.rb -+++ b/test/unit/bin/vagrant_test.rb -@@ -30,7 +30,6 @@ describe "vagrant bin" do - allow(Kernel).to receive(:exit) - allow(Vagrant::Environment).to receive(:new).and_return(env) - allow(Vagrant).to receive(:in_installer?).and_return(true) -- allow(self).to receive(:require_relative) - end - - after { expect(run_vagrant).to eq(exit_code) } -diff --git a/test/unit/vagrant/bundler_test.rb b/test/unit/vagrant/bundler_test.rb -index 69f425c66..00cedc021 100644 ---- a/test/unit/vagrant/bundler_test.rb -+++ b/test/unit/vagrant/bundler_test.rb -@@ -778,46 +778,42 @@ describe Vagrant::Bundler do - end - end - -- context "when bundler is not defined" do -- before { expect(Vagrant).to receive(:in_bundler?).and_return(false) } -+ context "when run time dependencies are defined" do -+ let(:vagrant_dep_specs) { [double("spec", name: "vagrant-dep", requirement: double("spec-req", as_list: []))] } - -- context "when running inside the installer" do -- before { expect(Vagrant).to receive(:in_installer?).and_return(true) } -+ it "should call #gem to activate the dependencies" do -+ expect(subject).to receive(:gem).with("vagrant-dep", any_args) -+ subject.send(:vagrant_internal_specs) -+ end -+ end - -- it "should load gem specification directories" do -- expect(Gem::Specification).to receive(:dirs).and_return(spec_dirs) -- subject.send(:vagrant_internal_specs) -- end -+ context "when bundler is not defined" do -+ before { expect(Object).to receive(:const_defined?).with(:Bundler).and_return(false) } - -- context "when checking paths" do -- let(:spec_dirs) { [double("spec-dir", start_with?: in_user_dir)] } -- let(:in_user_dir) { true } -- let(:user_dir) { double("user-dir") } -+ it "should load gem specification directories" do -+ expect(Gem::Specification).to receive(:dirs).and_return(spec_dirs) -+ subject.send(:vagrant_internal_specs) -+ end - -- before { allow(Gem).to receive(:user_dir).and_return(user_dir) } -+ context "when checking paths" do -+ let(:spec_dirs) { [double("spec-dir", start_with?: in_user_dir)] } -+ let(:in_user_dir) { true } -+ let(:user_dir) { double("user-dir") } - -- it "should check if path is within local user directory" do -- expect(spec_dirs.first).to receive(:start_with?).with(user_dir).and_return(false) -- subject.send(:vagrant_internal_specs) -- end -- -- context "when path is not within user directory" do -- let(:in_user_dir) { false } -+ before { allow(Gem).to receive(:user_dir).and_return(user_dir) } - -- it "should use path when loading specs" do -- expect(Gem::Specification).to receive(:each_spec) { |arg| expect(arg).to include(spec_dirs.first) } -- subject.send(:vagrant_internal_specs) -- end -- end -+ it "should check if path is within local user directory" do -+ expect(spec_dirs.first).to receive(:start_with?).with(user_dir).and_return(false) -+ subject.send(:vagrant_internal_specs) - end -- end - -- context "when running outside the installer" do -- before { expect(Vagrant).to receive(:in_installer?).and_return(false) } -+ context "when path is not within user directory" do -+ let(:in_user_dir) { false } - -- it "should not load gem specification directories" do -- expect(Gem::Specification).not_to receive(:dirs) -- subject.send(:vagrant_internal_specs) -+ it "should use path when loading specs" do -+ expect(Gem::Specification).to receive(:each_spec) { |arg| expect(arg).to include(spec_dirs.first) } -+ subject.send(:vagrant_internal_specs) -+ end - end - end - end --- -2.29.3 - diff --git a/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch b/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch deleted file mode 100644 index fa6555c594ef..000000000000 --- a/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch +++ /dev/null @@ -1,93 +0,0 @@ -From: Antonio Terceiro <terceiro@debian.org> -Date: Wed, 27 May 2015 09:36:17 -0300 -Subject: Support system-installed plugins -Source: https://salsa.debian.org/ruby-team/vagrant/-/blob/9d86f222/debian/patches/0004-Support-system-installed-plugins.patch - -Plugins must be installed as regular Ruby libraries, and they must -contain /usr/share/vagrant-plugins/plugins.d/$PLUGINNAME.json with the -following content: - -{ - "${PLUGINNAME}": { - "ruby_version":"$(ruby -e 'puts RUBY_VERSION')", - "vagrant_version":"$(cat /usr/share/vagrant/version.txt)", - "gem_version":"", - "require":"", - "sources":[] - } -} ---- - lib/vagrant/plugin/manager.rb | 4 ++-- - lib/vagrant/plugin/state_file.rb | 22 +++++++++++++++++++++- - 2 files changed, 23 insertions(+), 3 deletions(-) - -diff --git a/lib/vagrant/plugin/manager.rb b/lib/vagrant/plugin/manager.rb -index 9058e68..2772131 100644 ---- a/lib/vagrant/plugin/manager.rb -+++ b/lib/vagrant/plugin/manager.rb -@@ -18,7 +18,7 @@ module Vagrant - - # Returns the path to the [StateFile] for system plugins. - def self.system_plugins_file -- dir = Vagrant.installer_embedded_dir -+ dir = '@system_plugin_dir@' - return nil if !dir - Pathname.new(dir).join("plugins.json") - end -@@ -38,7 +38,7 @@ module Vagrant - - system_path = self.class.system_plugins_file - @system_file = nil -- @system_file = StateFile.new(system_path) if system_path && system_path.file? -+ @system_file = StateFile.new(system_path, true) if system_path && system_path.file? - - @local_file = nil - @globalized = @localized = false -diff --git a/lib/vagrant/plugin/state_file.rb b/lib/vagrant/plugin/state_file.rb -index c6872d4..935d431 100644 ---- a/lib/vagrant/plugin/state_file.rb -+++ b/lib/vagrant/plugin/state_file.rb -@@ -11,8 +11,9 @@ module Vagrant - # @return [Pathname] path to file - attr_reader :path - -- def initialize(path) -+ def initialize(path, system = false) - @path = path -+ @system = system - - @data = {} - if @path.exist? -@@ -28,6 +29,21 @@ module Vagrant - - @data["version"] ||= "1" - @data["installed"] ||= {} -+ load_extra_plugins -+ end -+ -+ def load_extra_plugins -+ extra_plugins = Dir.glob(@path.dirname.join('plugins.d', '*.json')) -+ extra_plugins.each do |filename| -+ json = File.read(filename) -+ begin -+ plugin_data = JSON.parse(json) -+ @data["installed"].merge!(plugin_data) -+ rescue JSON::ParserError => e -+ raise Vagrant::Errors::PluginStateFileParseError, -+ path: filename, message: e.message -+ end -+ end - end - - # Add a plugin that is installed to the state file. -@@ -107,6 +123,10 @@ module Vagrant - f.close - FileUtils.mv(f.path, @path) - end -+ rescue Errno::EACCES -+ # Ignore permission denied against system-installed plugins; regular -+ # users are not supposed to write there. -+ raise unless @system - end - - protected diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix deleted file mode 100644 index 064f1cf6baaa..000000000000 --- a/pkgs/development/tools/vagrant/default.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ stdenv, lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive -, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux -, openssl -}: - -let - # NOTE: bumping the version and updating the hash is insufficient; - # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.4.1"; - url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - hash = "sha256-Gc+jBuP/rl3b8wUE9hoaMSSqmodyGxMKFAmNTqH+v4k="; - - deps = bundlerEnv rec { - name = "${pname}-${version}"; - pname = "vagrant"; - inherit version; - - inherit ruby; - gemfile = writeText "Gemfile" ""; - lockfile = writeText "Gemfile.lock" ""; - gemset = lib.recursiveUpdate (import ./gemset.nix) ({ - vagrant = { - source = { - type = "url"; - inherit url hash; - }; - inherit version; - }; - } // lib.optionalAttrs withLibvirt (import ./gemset_libvirt.nix)); - - # This replaces the gem symlinks with directories, resolving this - # error when running vagrant (I have no idea why): - # /nix/store/p4hrycs0zaa9x0gsqylbk577ppnryixr-vagrant-2.2.6/lib/ruby/gems/2.6.0/gems/i18n-1.1.1/lib/i18n/config.rb:6:in `<module:I18n>': uninitialized constant I18n::Config (NameError) - postBuild = '' - for gem in "$out"/lib/ruby/gems/*/gems/*; do - cp -a "$gem/" "$gem.new" - rm "$gem" - # needed on macOS, otherwise the mv yields permission denied - chmod +w "$gem.new" - mv "$gem.new" "$gem" - done - ''; - }; - -in buildRubyGem rec { - name = "${gemName}-${version}"; - gemName = "vagrant"; - inherit version; - - doInstallCheck = true; - dontBuild = false; - src = fetchurl { inherit url hash; }; - - # Some reports indicate that some connection types, particularly - # WinRM, suffer from "Digest initialization failed" errors. Adding - # openssl as a build input resolves this runtime error. - buildInputs = [ openssl ]; - - patches = [ - ./unofficial-installation-nowarn.patch - ./use-system-bundler-version.patch - ./0004-Support-system-installed-plugins.patch - ./0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch - ]; - - postPatch = '' - substituteInPlace lib/vagrant/plugin/manager.rb --subst-var-by \ - system_plugin_dir "$out/vagrant-plugins" - ''; - - # PATH additions: - # - libarchive: Make `bsdtar` available for extracting downloaded boxes - # withLibvirt only: - # - libguestfs: Make 'virt-sysprep' available for 'vagrant package' - # - qemu: Make 'qemu-img' available for 'vagrant package' - postInstall = - let - pathAdditions = lib.makeSearchPath "bin" - (map (x: lib.getBin x) ([ - libarchive - ] ++ lib.optionals withLibvirt [ - libguestfs - qemu - ])); - in '' - wrapProgram "$out/bin/vagrant" \ - --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" \ - --prefix PATH ':' ${pathAdditions} \ - --set-default VAGRANT_CHECKPOINT_DISABLE 1 - - mkdir -p "$out/vagrant-plugins/plugins.d" - echo '{}' > "$out/vagrant-plugins/plugins.json" - - # install bash completion - mkdir -p $out/share/bash-completion/completions/ - cp -av contrib/bash/completion.sh $out/share/bash-completion/completions/vagrant - # install zsh completion - mkdir -p $out/share/zsh/site-functions/ - cp -av contrib/zsh/_vagrant $out/share/zsh/site-functions/ - '' + - lib.optionalString withLibvirt '' - substitute ${./vagrant-libvirt.json.in} $out/vagrant-plugins/plugins.d/vagrant-libvirt.json \ - --subst-var-by ruby_version ${ruby.version} \ - --subst-var-by vagrant_version ${version} - ''; - - installCheckPhase = '' - HOME="$(mktemp -d)" $out/bin/vagrant init --output - > /dev/null - ''; - - passthru = { - inherit ruby deps; - }; - - meta = with lib; { - description = "Tool for building complete development environments"; - homepage = "https://www.vagrantup.com/"; - license = licenses.bsl11; - maintainers = with maintainers; [ tylerjl ]; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix deleted file mode 100644 index d69322bc17c7..000000000000 --- a/pkgs/development/tools/vagrant/gemset.nix +++ /dev/null @@ -1,652 +0,0 @@ -{ - bcrypt_pbkdf = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445"; - type = "gem"; - }; - version = "1.1.0"; - }; - bigdecimal = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; - type = "gem"; - }; - version = "3.1.6"; - }; - builder = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; - type = "gem"; - }; - version = "3.2.4"; - }; - childprocess = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lvcp8bsd35g57f7wz4jigcw2sryzzwrpcgjwwf3chmjrjcww5in"; - type = "gem"; - }; - version = "4.1.0"; - }; - concurrent-ruby = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; - type = "gem"; - }; - version = "1.2.3"; - }; - date = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp"; - type = "gem"; - }; - version = "3.3.4"; - }; - diff-lcs = { - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7"; - type = "gem"; - }; - version = "1.5.1"; - }; - ed25519 = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zb2dr2ihb1qiknn5iaj1ha1w9p7lj9yq5waasndlfadz225ajji"; - type = "gem"; - }; - version = "1.3.0"; - }; - erubi = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; - type = "gem"; - }; - version = "1.12.0"; - }; - excon = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kmmwgjzlrnc3nnrdnw1z67c95nbw0hv54a73yj8jw6pcvl9585x"; - type = "gem"; - }; - version = "0.109.0"; - }; - fake_ftp = { - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zl9q9m4x7lz9890g0h1qqj7hcxnwzpjfnfbxadjblps7b5054q4"; - type = "gem"; - }; - version = "0.3.0"; - }; - ffi = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; - type = "gem"; - }; - version = "1.16.3"; - }; - google-protobuf = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mnxzcq8kmyfb9bkzqnp019d1hx1vprip3yzdkkha6b3qz5rgg9r"; - type = "gem"; - }; - version = "3.25.3"; - }; - googleapis-common-protos-types = { - dependencies = ["google-protobuf"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zrxnv9s2q39f2nh32x7nbfi8lpwzmmn3ji4adglg8dlfr1xrz16"; - type = "gem"; - }; - version = "1.13.0"; - }; - grpc = { - dependencies = ["google-protobuf" "googleapis-common-protos-types"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ndyis4hyq5wyypvy5j2pxaax73k9xd9cdsc5hyvpk3vbnn26rdb"; - type = "gem"; - }; - version = "1.56.2"; - }; - grpc-tools = { - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0pwwsmw402y8f8l3s3v433lx1f3cahzh2bj3i6jhkg1z87z83pqm"; - type = "gem"; - }; - version = "1.62.0"; - }; - gssapi = { - dependencies = ["ffi"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1qdfhj12aq8v0y961v4xv96a1y2z80h3xhvzrs9vsfgf884g6765"; - type = "gem"; - }; - version = "1.3.1"; - }; - gyoku = { - dependencies = ["builder" "rexml"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kd2q59xpm39hpvmmvyi6g3f1fr05xjbnxwkrdqz4xy7hirqi79q"; - type = "gem"; - }; - version = "1.4.0"; - }; - hashicorp-checkpoint = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1z6mwzvd7p2wqhmk07dwrhvm0ncgqm7pxn0pr2k025rwsspp9bsd"; - type = "gem"; - }; - version = "0.1.5"; - }; - httpclient = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; - type = "gem"; - }; - version = "2.8.3"; - }; - i18n = { - dependencies = ["concurrent-ruby"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; - type = "gem"; - }; - version = "1.14.1"; - }; - ipaddr = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0p98v9b6rn5ma04qwvzs0nrg0hmnwpm70s9jshzdsrkqapcw4sh2"; - type = "gem"; - }; - version = "1.2.6"; - }; - listen = { - dependencies = ["rb-fsevent" "rb-inotify"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rwwsmvq79qwzl6324yc53py02kbrcww35si720490z5w0j497nv"; - type = "gem"; - }; - version = "3.9.0"; - }; - little-plugger = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; - type = "gem"; - }; - version = "1.1.4"; - }; - log4r = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ri90q0frfmigkirqv5ihyrj59xm8pq5zcmf156cbdv4r4l2jicv"; - type = "gem"; - }; - version = "1.1.10"; - }; - logging = { - dependencies = ["little-plugger" "multi_json"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zflchpx4g8c110gjdcs540bk5a336nq6nmx379rdg56xw0pjd02"; - type = "gem"; - }; - version = "2.3.1"; - }; - mime-types = { - dependencies = ["mime-types-data"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1"; - type = "gem"; - }; - version = "3.5.2"; - }; - mime-types-data = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zpn5brxdf5akh7ij511bkrd30fxd7697shmxxszahqj9m62zvn5"; - type = "gem"; - }; - version = "3.2024.0206"; - }; - multi_json = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; - type = "gem"; - }; - version = "1.15.0"; - }; - net-ftp = { - dependencies = ["net-protocol" "time"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pi67ywf8yvv18vr8kvyb1igdv8nsjafyy9c86fny5wvi10qcwqv"; - type = "gem"; - }; - version = "0.3.4"; - }; - net-protocol = { - dependencies = ["timeout"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1a32l4x73hz200cm587bc29q8q9az278syw3x6fkc9d1lv5y0wxa"; - type = "gem"; - }; - version = "0.2.2"; - }; - net-scp = { - dependencies = ["net-ssh"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1si2nq9l6jy5n2zw1q59a5gaji7v9vhy8qx08h4fg368906ysbdk"; - type = "gem"; - }; - version = "4.0.0"; - }; - net-sftp = { - dependencies = ["net-ssh"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0r33aa2d61hv1psm0l0mm6ik3ycsnq8symv7h84kpyf2b7493fv5"; - type = "gem"; - }; - version = "4.0.0"; - }; - net-ssh = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1i01340c4i144vvn3x54lc2rb77ch829qipl1rh6rqwm3yxzml9w"; - type = "gem"; - }; - version = "7.2.1"; - }; - nori = { - dependencies = ["bigdecimal"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12wfv36jzc0978ij5c56nnfh5k8ax574njawigs98ysmp1x5s2ql"; - type = "gem"; - }; - version = "2.7.0"; - }; - pairing_heap = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "059kqpw53cancnp0bp7y1s74y1955riw33w3lqfbnms4b4mdh5zj"; - type = "gem"; - }; - version = "3.1.0"; - }; - rake = { - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; - type = "gem"; - }; - version = "13.1.0"; - }; - rake-compiler = { - dependencies = ["rake"]; - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vhdkwblhzp4wp1jh95qiibly2zsnmg3659r6d5xp1mzgd9ghxji"; - type = "gem"; - }; - version = "1.2.7"; - }; - 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"; - }; - rb-kqueue = { - dependencies = ["ffi"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vpq1dmmlbggfk399s7jq2rrnjp6r8774amfli75bqhjn1sk2bxg"; - type = "gem"; - }; - version = "0.2.8"; - }; - rexml = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; - type = "gem"; - }; - version = "3.2.6"; - }; - rgl = { - dependencies = ["pairing_heap" "rexml" "stream"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jjc2v9hg42bzg6w5yg3azrsdr31qmc6ff93xb5adfjqg337vzz3"; - type = "gem"; - }; - version = "0.5.10"; - }; - rspec = { - dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l"; - type = "gem"; - }; - version = "3.13.0"; - }; - rspec-core = { - dependencies = ["rspec-support"]; - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0k252n7s80bvjvpskgfm285a3djjjqyjcarlh3aq7a4dx2s94xsm"; - type = "gem"; - }; - version = "3.13.0"; - }; - rspec-expectations = { - dependencies = ["diff-lcs" "rspec-support"]; - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bhhjzwdk96vf3gq3rs7mln80q27fhq82hda3r15byb24b34h7b2"; - type = "gem"; - }; - version = "3.13.0"; - }; - rspec-its = { - dependencies = ["rspec-core" "rspec-expectations"]; - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15zafd70gxly5i0s00nky14sj2n92dnj3xpj83ysl3c2wx0119ad"; - type = "gem"; - }; - version = "1.3.0"; - }; - rspec-mocks = { - dependencies = ["diff-lcs" "rspec-support"]; - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rkzkcfk2x0qjr5fxw6ib4wpjy0hqbziywplnp6pg3bm2l98jnkk"; - type = "gem"; - }; - version = "3.13.0"; - }; - rspec-support = { - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8"; - type = "gem"; - }; - version = "3.13.1"; - }; - rubyntlm = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; - type = "gem"; - }; - version = "0.6.3"; - }; - rubyzip = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; - type = "gem"; - }; - version = "2.3.2"; - }; - stream = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "016m9v81vpj14d8g5ins91zc4pzl7vf5f1gxl7jhfsfy601k7cv2"; - type = "gem"; - }; - version = "0.5.5"; - }; - thor = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3"; - type = "gem"; - }; - version = "0.18.1"; - }; - time = { - dependencies = ["date"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0c15v19hyxjcfzaviqlwhgajgyrrlb0pjilza6mkv49bhspy6av6"; - type = "gem"; - }; - version = "0.3.0"; - }; - timeout = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16mvvsmx90023wrhf8dxc1lpqh0m8alk65shb7xcya6a9gflw7vg"; - type = "gem"; - }; - version = "0.4.1"; - }; - vagrant-spec = { - dependencies = ["childprocess" "log4r" "rspec" "thor"]; - groups = ["default"]; - platforms = []; - source = { - fetchSubmodules = false; - rev = "2a5afa7512753288b4ec1e26ec13bc6479b2fabb"; - sha256 = "08l0qc7566126pqwn3cr91j5wgd2zqij8sacngr5yfsk2anl8fw0"; - type = "git"; - url = "https://github.com/hashicorp/vagrant-spec.git"; - }; - version = "0.0.1"; - }; - vagrant_cloud = { - dependencies = ["excon" "log4r" "rexml"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jhwciki5i8hjbgv2f1p544bi92s9wdsfrjympzslysdzk95djpg"; - type = "gem"; - }; - version = "3.1.1"; - }; - wdm = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0x5l2pn4x92734k6i2wcjbn2klmwgkiqaajvxadh35k74dgnyh18"; - type = "gem"; - }; - version = "0.1.1"; - }; - webrick = { - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; - type = "gem"; - }; - version = "1.7.0"; - }; - winrm = { - dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nxf6a47d1xf1nvi7rbfbzjyyjhz0iakrnrsr2hj6y24a381sd8i"; - type = "gem"; - }; - version = "2.3.6"; - }; - winrm-elevated = { - dependencies = ["erubi" "winrm" "winrm-fs"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lmlaii8qapn84wxdg5d82gbailracgk67d0qsnbdnffcg8kswzd"; - type = "gem"; - }; - version = "1.2.3"; - }; - winrm-fs = { - dependencies = ["erubi" "logging" "rubyzip" "winrm"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gb91k6s1yjqw387x4w1nkpnxblq3pjdqckayl0qvz5n3ygdsb0d"; - type = "gem"; - }; - version = "1.3.5"; - }; -} diff --git a/pkgs/development/tools/vagrant/gemset_libvirt.nix b/pkgs/development/tools/vagrant/gemset_libvirt.nix deleted file mode 100644 index d31b76a4e7f8..000000000000 --- a/pkgs/development/tools/vagrant/gemset_libvirt.nix +++ /dev/null @@ -1,199 +0,0 @@ -{ - builder = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; - type = "gem"; - }; - version = "3.2.4"; - }; - excon = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rv2hq29lx2337214a1p2qy70fi77ch6p0p77nw9h6x84q028qr0"; - type = "gem"; - }; - version = "0.92.3"; - }; - fog-core = { - dependencies = ["builder" "excon" "formatador" "mime-types"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06m6hxq8vspx9h9bgc2s19m56jzasvl45vblrfv1q5h1qg1k6amw"; - type = "gem"; - }; - version = "2.3.0"; - }; - fog-json = { - dependencies = ["fog-core" "multi_json"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx"; - type = "gem"; - }; - version = "1.2.0"; - }; - fog-libvirt = { - dependencies = ["fog-core" "fog-json" "fog-xml" "json" "ruby-libvirt"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "sha256-z0VkRqFk3JU02ULQ+xQbywekzrJgz1YPDul//Ov5ajU="; - type = "gem"; - }; - version = "0.11.0"; - }; - fog-xml = { - dependencies = ["fog-core" "nokogiri"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vyyb2429xqzys39xyk2r3fal80qqn397aj2kqsjrgg2y6m59i41"; - type = "gem"; - }; - version = "0.1.4"; - }; - formatador = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1l06bv4avphbdmr1y4g0rqlczr38k6r65b3zghrbj2ynyhm3xqjl"; - type = "gem"; - }; - version = "1.1.0"; - }; - json = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz"; - type = "gem"; - }; - version = "2.6.1"; - }; - mime-types = { - dependencies = ["mime-types-data"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; - type = "gem"; - }; - version = "3.4.1"; - }; - mime-types-data = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; - type = "gem"; - }; - version = "3.2022.0105"; - }; - mini_portile2 = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "sha256-RrLSRMxv8BqJv2EnRpDAn9vcpHqErp6sOQOegSMa7nw="; - type = "gem"; - }; - version = "2.8.2"; - }; - multi_json = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; - type = "gem"; - }; - version = "1.15.0"; - }; - nokogiri = { - dependencies = ["mini_portile2" "racc"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "sha256-INyAC4++TE9LWxZOaqOrgqNxvLJ+toXBZpYcNN2KItc="; - type = "gem"; - }; - version = "1.15.2"; - }; - racc = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "sha256-r2QSSDb908AOgwcD1/hz6l3qvekj83AGo59aXg2hY4c="; - type = "gem"; - }; - version = "1.7.1"; - }; - rexml = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; - type = "gem"; - }; - version = "3.2.5"; - }; - xml-simple = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "sha256-0hEx5RnIbxpbwrbS1X1G5pmOR/GO0kmyXK2GQz29aV0="; - type = "gem"; - }; - version = "1.1.9"; - }; - diffy = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "sha256-NrQv++UTjdxWGCEHwkrY1rBm7P0odoKfOR46SZPYmuE="; - type = "gem"; - }; - version = "3.4.2"; - }; - ruby-libvirt = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rnmbfhdz270fky0cm8w1i73gkrnlf3s1hdkm5yxjkdbvapwvjsd"; - type = "gem"; - }; - version = "0.8.0"; - }; - vagrant-libvirt = { - dependencies = ["fog-core" "fog-libvirt" "nokogiri" "rexml" "xml-simple" "diffy"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "sha256-NMiRjrVQo2Ui9nOJwpDmNJUk+95gsT85pwFMIiw3bwQ="; - type = "gem"; - }; - version = "0.12.2"; - }; -} diff --git a/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch b/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch deleted file mode 100644 index 0ea8b51ef527..000000000000 --- a/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/bin/vagrant b/bin/vagrant -index 7ca30b391..d3f4ea61a 100755 ---- a/bin/vagrant -+++ b/bin/vagrant -@@ -221,11 +221,6 @@ begin - end - end - -- if !Vagrant.in_installer? && !Vagrant.very_quiet? -- # If we're not in the installer, warn. -- env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false) -- end -- - # Acceptable experimental flag values include: - # - # Unset - Disables experimental features diff --git a/pkgs/development/tools/vagrant/use-system-bundler-version.patch b/pkgs/development/tools/vagrant/use-system-bundler-version.patch deleted file mode 100644 index 8262220140a6..000000000000 --- a/pkgs/development/tools/vagrant/use-system-bundler-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb -index 336ac1e05..1bfd84c0d 100644 ---- a/lib/vagrant/bundler.rb -+++ b/lib/vagrant/bundler.rb -@@ -470,7 +470,7 @@ module Vagrant - source_list = {} - system_plugins = plugins.map do |plugin_name, plugin_info| - plugin_name if plugin_info["system"] -- end.compact -+ end.compact << "bundler" - installer_set = VagrantSet.new(:both) - installer_set.system_plugins = system_plugins - diff --git a/pkgs/development/tools/vagrant/vagrant-libvirt.json.in b/pkgs/development/tools/vagrant/vagrant-libvirt.json.in deleted file mode 100644 index 22060e1c2db7..000000000000 --- a/pkgs/development/tools/vagrant/vagrant-libvirt.json.in +++ /dev/null @@ -1,9 +0,0 @@ -{ - "vagrant-libvirt": { - "ruby_version":"@ruby_version@", - "vagrant_version":"@vagrant_version@", - "gem_version":"", - "require":"", - "sources":[] - } -} diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix deleted file mode 100644 index d47e7c22470a..000000000000 --- a/pkgs/development/tools/vala-lint/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, glib -, json-glib -, meson -, ninja -, pantheon -, pkg-config -, vala -, gettext -, wrapGAppsHook3 -, unstableGitUpdater -}: - -stdenv.mkDerivation rec { - pname = "vala-lint"; - version = "0-unstable-2024-08-28"; - - src = fetchFromGitHub { - owner = "vala-lang"; - repo = "vala-lint"; - rev = "4ed1443c35a8a84445fb59292d539358365d8263"; - sha256 = "sha256-NPadBrL2g5w95slwDpp7kNXBgLJ9na8Yd/J7zm28SSo="; - }; - - nativeBuildInputs = [ - gettext - meson - ninja - pkg-config - vala - wrapGAppsHook3 - ]; - - buildInputs = [ - glib - json-glib - ]; - - postPatch = '' - # https://github.com/vala-lang/vala-lint/issues/181 - substituteInPlace test/meson.build \ - --replace "test('auto-fix', auto_fix_test, env: test_envars)" "" - ''; - - doCheck = true; - - passthru = { - updateScript = unstableGitUpdater { - url = "https://github.com/vala-lang/vala-lint.git"; - }; - }; - - meta = with lib; { - homepage = "https://github.com/vala-lang/vala-lint"; - description = "Check Vala code files for code-style errors"; - longDescription = '' - Small command line tool and library for checking Vala code files for code-style errors. - Based on the elementary Code-Style guidelines. - ''; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = teams.pantheon.members; - mainProgram = "io.elementary.vala-lint"; - }; -} diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix deleted file mode 100644 index 0350c7296fde..000000000000 --- a/pkgs/development/tools/vcstool/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, python3Packages, fetchPypi -, git, breezy, subversion }: - -with python3Packages; - -buildPythonApplication rec { - pname = "vcstool"; - version = "0.3.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "04b3a963e15386660f139e5b95d293e43e3cb414e3b13e14ee36f5223032ee2c"; - }; - - propagatedBuildInputs = [ pyyaml setuptools ]; - - makeWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ git breezy subversion ])]; - - doCheck = false; # requires network - - meta = with lib; { - description = "Provides a command line tool to invoke vcs commands on multiple repositories"; - homepage = "https://github.com/dirk-thomas/vcstool"; - license = licenses.asl20; - maintainers = with maintainers; [ sivteck ]; - }; -} diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/development/tools/vendir/default.nix deleted file mode 100644 index 2e53aa6d35fa..000000000000 --- a/pkgs/development/tools/vendir/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "vendir"; - version = "0.42.0"; - - src = fetchFromGitHub { - owner = "vmware-tanzu"; - repo = "carvel-vendir"; - rev = "v${version}"; - sha256 = "sha256-/lbCSZZQensoPQbzs3ZC3H02CE6V/eOruiqPRS5vlTE="; - }; - - vendorHash = null; - - subPackages = [ "cmd/vendir" ]; - - ldflags = [ - "-X carvel.dev/vendir/pkg/vendir/version.Version=${version}" - ]; - - meta = with lib; { - description = "CLI tool to vendor portions of git repos, github releases, helm charts, docker image contents, etc. declaratively"; - mainProgram = "vendir"; - homepage = "https://carvel.dev/vendir/"; - license = licenses.asl20; - maintainers = with maintainers; [ russell ]; - }; -} diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix index 16282c7f7dd9..2db121ea9341 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.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "fastly"; repo = pname; rev = "v${version}"; - hash = "sha256-0jED0Ju7ojqDxfEjZKmWuCfGR830/gJF5p+QtcVajIY="; + hash = "sha256-VzeHebbeqW+Tn1ZEiJRdfxJlWLg9Gf5+5dAaqPoTtP0="; }; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - cargoHash = "sha256-rSZe/MrJlbB0oaAsKg38mEnS3pqe9Rk4/aoRuLlOUFc="; + cargoHash = "sha256-WQzY4fh+plyJCBkJJ/4kgUZ8bEWzL5CVGX67LTu4rnI="; cargoTestFlags = [ "--package viceroy-lib" diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix deleted file mode 100644 index 9ff37be20512..000000000000 --- a/pkgs/development/tools/vim-vint/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, python3Packages, fetchPypi }: - -with python3Packages; - -buildPythonApplication rec { - pname = "vim-vint"; - version = "0.3.21"; - - src = fetchPypi { - inherit pname version; - sha256 = "15qdh8fby9xgfjxidcfv1xmrqqrxxapky7zmyn46qx1abhp9piax"; - }; - - # For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails. - disabled = ! pythonAtLeast "3.5"; - - nativeCheckInputs = [ pytest pytest-cov ]; - propagatedBuildInputs = [ ansicolor chardet pyyaml setuptools ]; - - # Unpin test dependency versions. This is fixed in master but not yet released. - preCheck = '' - sed -i 's/==.*//g' test-requirements.txt - sed -i 's/mock == 1.0.1/mock/g' setup.py - ''; - - meta = with lib; { - description = "Fast and Highly Extensible Vim script Language Lint implemented by Python"; - homepage = "https://github.com/Kuniwak/vint"; - license = licenses.mit; - mainProgram = "vint"; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/volta/Cargo.lock b/pkgs/development/tools/volta/Cargo.lock deleted file mode 100644 index 0925a8cc91fd..000000000000 --- a/pkgs/development/tools/volta/Cargo.lock +++ /dev/null @@ -1,1918 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -dependencies = [ - "memchr", -] - -[[package]] -name = "android_system_properties" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e" -dependencies = [ - "libc", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "archive" -version = "0.1.0" -dependencies = [ - "attohttpc", - "cfg-if 1.0.0", - "flate2", - "fs-utils", - "hyperx", - "progress-read", - "tar", - "tee", - "thiserror", - "verbatim", - "zip", -] - -[[package]] -name = "assert-json-diff" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f1c3703dd33532d7f0ca049168930e9099ecac238e23cf932f3a69c42f06da" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "attohttpc" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85f766c20e6ae766956f7a2fcc4e0931e79a7e1f48b29132b5d647021114914" -dependencies = [ - "flate2", - "http", - "log", - "rustls", - "rustls-native-certs", - "serde", - "serde_json", - "url", - "webpki", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" - -[[package]] -name = "autocfg" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" - -[[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 = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array", -] - -[[package]] -name = "block-padding" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[package]] -name = "byteorder" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" - -[[package]] -name = "bytes" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" - -[[package]] -name = "bzip2" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "cc" -version = "1.0.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" - -[[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 = "chain-map" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc076b92c3d763b90697600bf9833c204b517ff911f64dcfb58221b0663d3ee9" - -[[package]] -name = "chrono" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", - "num-traits", - "time", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "ci_info" -version = "0.14.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62a62f39080c8c83e899dff6abd46c4fac05c1cf8dafece96ad8238e79addbf8" -dependencies = [ - "envmnt", -] - -[[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 0.11.0", - "unicode-width", - "vec_map", -] - -[[package]] -name = "cmdline_words_parser" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75d8078f03daf673d8bd34a1ef48c680ea4a895204882ce5f0ccfb2487b2bd29" - -[[package]] -name = "colored" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" -dependencies = [ - "atty", - "lazy_static", - "winapi", -] - -[[package]] -name = "console" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.42.0", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "crc32fast" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -dependencies = [ - "cfg-if 0.1.10", -] - -[[package]] -name = "ctrlc" -version = "3.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1631ca6e3c59112501a9d87fd86f21591ff77acd31331e8a73f8d80a65bbdd71" -dependencies = [ - "nix", - "windows-sys 0.42.0", -] - -[[package]] -name = "detect-indent" -version = "0.1.0" -source = "git+https://github.com/stefanpenner/detect-indent-rs?branch=master#f645bcc81bfb1f9745c4a4dec7c7f6faf3f84ec5" -dependencies = [ - "lazy_static", - "regex", -] - -[[package]] -name = "digest" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f47366984d3ad862010e22c7ce81a7dbcaebbdfb37241a620f8b6596ee135c" -dependencies = [ - "generic-array", -] - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dunce" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" - -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - -[[package]] -name = "encode_unicode" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90b2c9496c001e8cb61827acdefad780795c42264c137744cae6f7d9e3450abd" - -[[package]] -name = "envmnt" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fbb2fcaad9e6c9e3388dfcc1b44ae5508ae864b7af36f163a8a7c1a48796eee" -dependencies = [ - "fsio", - "indexmap", -] - -[[package]] -name = "envoy" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb34b6240ca977e7ab7dff6f060f9cb9a8f92c7745fe9e292b9443944d1aa768" - -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - -[[package]] -name = "fastrand" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2" -dependencies = [ - "instant", -] - -[[package]] -name = "filetime" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "winapi", -] - -[[package]] -name = "flate2" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" - -[[package]] -name = "form_urlencoded" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -dependencies = [ - "matches", - "percent-encoding", -] - -[[package]] -name = "fs-utils" -version = "0.1.0" - -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "fsio" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09e87827efaf94c7a44b562ff57de06930712fe21b530c3797cdede26e6377eb" -dependencies = [ - "dunce", -] - -[[package]] -name = "generic-array" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" -dependencies = [ - "typenum", -] - -[[package]] -name = "getrandom" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi", -] - -[[package]] -name = "hamcrest2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f837c62de05dc9cc71ff6486cd85de8856a330395ae338a04bfcefe5e91075" -dependencies = [ - "num", - "regex", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - -[[package]] -name = "heck" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "http" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.1", -] - -[[package]] -name = "httparse" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83" - -[[package]] -name = "httpdate" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" - -[[package]] -name = "hyperx" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5617e92fc2f2501c3e2bc6ce547cad841adba2bae5b921c7e52510beca6d084c" -dependencies = [ - "base64", - "bytes", - "http", - "httpdate", - "language-tags", - "mime", - "percent-encoding", - "unicase", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5528d9c2817db4e10cc78f8d4c8228906e5854f389ff6b076cee3572a09d35" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "js-sys", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "idna" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg 1.0.0", - "hashbrown", -] - -[[package]] -name = "indicatif" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729" -dependencies = [ - "console", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[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 = "itoa" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" - -[[package]] -name = "itoa" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" - -[[package]] -name = "js-sys" -version = "0.3.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "language-tags" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.138" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" - -[[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 = "maplit" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43" - -[[package]] -name = "matches" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] -name = "memchr" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" - -[[package]] -name = "mime" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425" -dependencies = [ - "unicase", -] - -[[package]] -name = "miniz_oxide" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -dependencies = [ - "adler", -] - -[[package]] -name = "mockito" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80f9fece9bd97ab74339fe19f4bcaf52b76dcc18e5364c7977c1838f76b38de9" -dependencies = [ - "assert-json-diff", - "colored", - "httparse", - "lazy_static", - "log", - "rand", - "regex", - "serde_json", - "serde_urlencoded", - "similar", -] - -[[package]] -name = "msdos_time" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aad9dfe950c057b1bfe9c1f2aa51583a8468ef2a5baba2ebbe06d775efeb7729" -dependencies = [ - "time", - "winapi", -] - -[[package]] -name = "nix" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "libc", - "static_assertions", -] - -[[package]] -name = "num" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4825417e1e1406b3782a8ce92f4d53f26ec055e3622e1881ca8e9f5f9e08db" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9c3f34cdd24f334cb265d9bf8bfa8a241920d026916785747a92f0e55541a1a" -dependencies = [ - "autocfg 0.1.4", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb0cf31fb3ff77e6d2a6ebd6800df7fdcd106f2ad89113c9130bcd07f93dffc" -dependencies = [ - "autocfg 0.1.4", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" -dependencies = [ - "autocfg 0.1.4", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e" -dependencies = [ - "autocfg 0.1.4", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2885278d5fe2adc2f75ced642d52d879bffaceb5a2e0b1d4309ffdfb239b454" -dependencies = [ - "autocfg 0.1.4", - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" -dependencies = [ - "autocfg 0.1.4", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "once_cell" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" - -[[package]] -name = "opaque-debug" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f5bb2e8e8dec81642920ccff6b61f1eb94fa3020c5a325c9851ff604152409" - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "os_info" -version = "3.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f" -dependencies = [ - "log", - "serde", - "winapi", -] - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "pest" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "933085deae3f32071f135d799d75667b63c8dc1f4537159756e3d4ceab41868c" -dependencies = [ - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63120576c4efd69615b5537d3d052257328a4ca82876771d6944424ccfd9f646" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2 0.4.30", - "quote 0.6.12", - "syn 0.15.36", -] - -[[package]] -name = "pest_meta" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f249ea6de7c7b7aba92b4ff4376a994c6dbd98fd2166c89d5c4947397ecb574d" -dependencies = [ - "maplit", - "pest", - "sha-1", -] - -[[package]] -name = "podio" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780fb4b6698bbf9cf2444ea5d22411cef2953f0824b98f33cf454ec5615645bd" - -[[package]] -name = "portable-atomic" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" - -[[package]] -name = "ppv-lite86" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "proc-macro2" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "progress-read" -version = "0.1.0" - -[[package]] -name = "quote" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" -dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -dependencies = [ - "proc-macro2 1.0.47", -] - -[[package]] -name = "rand" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core", -] - -[[package]] -name = "readext" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abdc58f5f18bcf347b55cebb34ed4618b0feff9a9223160f5902adbc1f6a72a6" - -[[package]] -name = "redox_syscall" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" -dependencies = [ - "getrandom", - "redox_syscall", -] - -[[package]] -name = "regex" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" - -[[package]] -name = "remove_dir_all" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -dependencies = [ - "winapi", -] - -[[package]] -name = "retry" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9166d72162de3575f950507683fac47e30f6f2c3836b71b7fbc61aa517c9c5f4" -dependencies = [ - "rand", -] - -[[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.20.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "rustls-native-certs" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" -dependencies = [ - "base64", -] - -[[package]] -name = "ryu" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c9613b5a66ab9ba26415184cfc41156594925a9cf3a2057e57f31ff145f6568" - -[[package]] -name = "same-file" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" -dependencies = [ - "lazy_static", - "windows-sys 0.36.1", -] - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "security-framework" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "git+https://github.com/mikrostew/semver?branch=new-parser#7583eb352dc181ccd09978fd2b16461c1b1669c1" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.10.0" -source = "git+https://github.com/mikrostew/semver-parser?branch=rewrite#f5c74268a09eef16a289a667ca7b4925e690fe13" -dependencies = [ - "pest", - "pest_derive", -] - -[[package]] -name = "serde" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.2", - "syn 1.0.105", -] - -[[package]] -name = "serde_json" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" -dependencies = [ - "indexmap", - "itoa 1.0.1", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" -dependencies = [ - "form_urlencoded", - "itoa 0.4.4", - "ryu", - "serde", -] - -[[package]] -name = "sha-1" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68" -dependencies = [ - "block-buffer", - "digest", - "fake-simd", - "opaque-debug", -] - -[[package]] -name = "similar" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e24979f63a11545f5f2c60141afe249d4f19f84581ea2138065e400941d83d3" - -[[package]] -name = "smallvec" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" -dependencies = [ - "maybe-uninit", -] - -[[package]] -name = "smawk" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "structopt" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7" -dependencies = [ - "clap", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" -dependencies = [ - "heck", - "proc-macro2 0.4.30", - "quote 0.6.12", - "syn 0.15.36", -] - -[[package]] -name = "syn" -version = "0.15.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b4f551a91e2e3848aeef8751d0d4eec9489b6474c720fd4c55958d8d31a430c" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.12", - "unicode-xid", -] - -[[package]] -name = "syn" -version = "1.0.105" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.2", - "unicode-ident", -] - -[[package]] -name = "tar" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "tee" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c12559dba7383625faaff75be24becf35bfc885044375bcab931111799a3da" - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "term_size" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "test-support" -version = "0.1.0" -dependencies = [ - "archive", - "hamcrest2", - "serde_json", - "thiserror", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" -dependencies = [ - "smawk", - "unicode-linebreak", - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.2", - "syn 1.0.105", -] - -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi", - "winapi", -] - -[[package]] -name = "typenum" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" - -[[package]] -name = "ucd-trie" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71a9c5b1fe77426cf144cc30e49e955270f5086e31a6441dfa8b32efc09b9d77" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -dependencies = [ - "matches", -] - -[[package]] -name = "unicode-ident" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" - -[[package]] -name = "unicode-linebreak" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" -dependencies = [ - "hashbrown", - "regex", -] - -[[package]] -name = "unicode-normalization" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" -dependencies = [ - "smallvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "url" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fe195a4f217c25b25cb5058ced57059824a678474874038dc88d211bf508d3" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "validate-npm-package-name" -version = "0.1.0" -dependencies = [ - "lazy_static", - "percent-encoding", - "regex", -] - -[[package]] -name = "vec_map" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" - -[[package]] -name = "verbatim" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbad0679079b451226e954019b2efac46bafa8f7b1418b953861e864072a97c6" - -[[package]] -name = "version_check" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" - -[[package]] -name = "volta" -version = "1.1.1" -dependencies = [ - "atty", - "cfg-if 1.0.0", - "ci_info", - "dirs", - "envoy", - "hamcrest2", - "hyperx", - "lazy_static", - "log", - "mockito", - "semver", - "serde", - "serde_json", - "structopt", - "test-support", - "textwrap 0.16.0", - "volta-core", - "volta-migrate", - "which", - "winreg", -] - -[[package]] -name = "volta-core" -version = "0.1.0" -dependencies = [ - "archive", - "attohttpc", - "atty", - "cfg-if 1.0.0", - "chain-map", - "chrono", - "ci_info", - "cmdline_words_parser", - "console", - "ctrlc", - "detect-indent", - "dirs", - "dunce", - "envoy", - "fs-utils", - "fs2", - "hyperx", - "indexmap", - "indicatif", - "lazy_static", - "lazycell", - "log", - "mockito", - "once_cell", - "os_info", - "readext", - "regex", - "retry", - "semver", - "serde", - "serde_json", - "tempfile", - "term_size", - "textwrap 0.16.0", - "validate-npm-package-name", - "volta-layout", - "walkdir", - "winreg", -] - -[[package]] -name = "volta-layout" -version = "0.1.1" -dependencies = [ - "volta-layout-macro", -] - -[[package]] -name = "volta-layout-macro" -version = "0.1.0" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.2", - "syn 1.0.105", -] - -[[package]] -name = "volta-migrate" -version = "0.1.0" -dependencies = [ - "log", - "semver", - "serde", - "serde_json", - "tempfile", - "volta-core", - "volta-layout", - "walkdir", -] - -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi", - "winapi-util", -] - -[[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.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2 1.0.47", - "quote 1.0.2", - "syn 1.0.105", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" -dependencies = [ - "quote 1.0.2", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.2", - "syn 1.0.105", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" - -[[package]] -name = "web-sys" -version = "0.3.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" -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 = "which" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" -dependencies = [ - "either", - "libc", - "once_cell", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[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-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" - -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" - -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "xattr" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" -dependencies = [ - "libc", -] - -[[package]] -name = "zip" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7341988e4535c60882d5e5f0b7ad0a9a56b080ade8bdb5527cb512f7b2180e0" -dependencies = [ - "bzip2", - "flate2", - "msdos_time", - "podio", - "time", -] diff --git a/pkgs/development/tools/volta/default.nix b/pkgs/development/tools/volta/default.nix deleted file mode 100644 index 15c9c493b797..000000000000 --- a/pkgs/development/tools/volta/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - lib, - rustPlatform, - libiconv, - stdenv, - installShellFiles, - darwin, - fetchFromGitHub, -}: -rustPlatform.buildRustPackage rec { - pname = "volta"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "volta-cli"; - repo = "volta"; - rev = "v${version}"; - hash = "sha256-+j3WRpunV+3YfZnyuKA/CsiKr+gOaP2NbmnyoGMN+Mg="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "detect-indent-0.1.0" = "sha256-qtPkPaBiyuT8GhpEFdU7IkAgKnCbTES0FB2CvNKWqic="; - "semver-0.9.0" = "sha256-nw1somkZe9Qi36vjfWlTcDqHAIbaJj72KBTfmucVxXs="; - "semver-parser-0.10.0" = "sha256-iTGnKSddsriF6JS6lvJNjp9aDzGtfjrHEiCijeie3uE="; - }; - }; - - buildInputs = [ installShellFiles ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv ]; - - HOME = "$TMPDIR"; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd volta \ - --bash <($out/bin/volta completions bash) \ - --fish <($out/bin/volta completions fish) \ - --zsh <($out/bin/volta completions zsh) - ''; - meta = with lib; { - description = "Hassle-Free JavaScript Tool Manager"; - longDescription = '' - With Volta, you can select a Node engine once and then stop worrying - about it. You can switch between projects and stop having to manually - switch between Nodes. You can install npm package binaries in your - toolchain without having to periodically reinstall them or figure out why - they’ve stopped working. - - Note: Volta cannot be used on NixOS out of the box because it downloads - Node binaries that assume shared libraries are in FHS standard locations. - ''; - homepage = "https://volta.sh/"; - changelog = "https://github.com/volta-cli/volta/blob/main/RELEASES.md"; - license = with licenses; [ bsd2 ]; - maintainers = with maintainers; [ fbrs ]; - }; -} diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix deleted file mode 100644 index d5de37245c21..000000000000 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ lib -, callPackage -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, jq -, glslang -, libffi -, libX11 -, libXau -, libxcb -, libXdmcp -, libXrandr -, spirv-headers -, spirv-tools -, vulkan-headers -, vulkan-utility-libraries -, wayland -}: - -let - robin-hood-hashing = callPackage ./robin-hood-hashing.nix {}; -in -stdenv.mkDerivation rec { - pname = "vulkan-validation-layers"; - version = "1.3.290.0"; - - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "Vulkan-ValidationLayers"; - rev = "vulkan-sdk-${version}"; - hash = "sha256-FMzQpc7mwZGib544w0Dx6LeGi64cercm5oUW45raasc="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - jq - ]; - - buildInputs = [ - libX11 - libXau - libXdmcp - libXrandr - libffi - libxcb - spirv-tools - vulkan-headers - vulkan-utility-libraries - wayland - ]; - - cmakeFlags = [ - "-DGLSLANG_INSTALL_DIR=${glslang}" - "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}" - "-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}" - "-DBUILD_LAYER_SUPPORT_FILES=ON" - "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config" - # Hide dev warnings that are useless for packaging - "-Wno-dev" - ]; - - # Tests require access to vulkan-compatible GPU, which isn't - # available in Nix sandbox. Fails with VK_ERROR_INCOMPATIBLE_DRIVER. - doCheck = false; - - separateDebugInfo = true; - - # Include absolute paths to layer libraries in their associated - # layer definition json files. - preFixup = '' - for f in "$out"/share/vulkan/explicit_layer.d/*.json "$out"/share/vulkan/implicit_layer.d/*.json; do - jq <"$f" >tmp.json ".layer.library_path = \"$out/lib/\" + .layer.library_path" - mv tmp.json "$f" - done - ''; - - meta = with lib; { - description = "Official Khronos Vulkan validation layers"; - homepage = "https://github.com/KhronosGroup/Vulkan-ValidationLayers"; - platforms = platforms.linux; - license = licenses.asl20; - maintainers = [ maintainers.ralith ]; - }; -} diff --git a/pkgs/development/tools/vulkan-validation-layers/robin-hood-hashing.nix b/pkgs/development/tools/vulkan-validation-layers/robin-hood-hashing.nix deleted file mode 100644 index 9951d63b019c..000000000000 --- a/pkgs/development/tools/vulkan-validation-layers/robin-hood-hashing.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "robin-hood-hashing"; - version = "3.11.5"; # pin - - src = fetchFromGitHub { - owner = "martinus"; - repo = "robin-hood-hashing"; - rev = version; # pin - sha256 = "sha256-J4u9Q6cXF0SLHbomP42AAn5LSKBYeVgTooOhqxOIpuM="; - }; - - nativeBuildInputs = [ - cmake - ]; - - cmakeFlags = [ - "-DRH_STANDALONE_PROJECT=OFF" - ]; - - meta = with lib; { - description = "Faster, more efficient replacement for std::unordered_map / std::unordered_set"; - homepage = "https://github.com/martinus/robin-hood-hashing"; - platforms = platforms.linux; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix deleted file mode 100644 index 3861ad43e7cc..000000000000 --- a/pkgs/development/tools/vultr-cli/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "vultr-cli"; - version = "3.3.1"; - - src = fetchFromGitHub { - owner = "vultr"; - repo = pname; - rev = "v${version}"; - hash = "sha256-pJrujiZfIuqRFwIHReWT7xPi94Zh3owcZFz23jtpsQg="; - }; - - vendorHash = "sha256-4HRzd5p5u8h07/escAoatF97RZ/hejYqW61Dlkp27Gk="; - - nativeBuildInputs = [ installShellFiles ]; - - ldflags = [ "-s" "-w" ]; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd vultr-cli \ - --bash <($out/bin/vultr-cli completion bash) \ - --fish <($out/bin/vultr-cli completion fish) \ - --zsh <($out/bin/vultr-cli completion zsh) - ''; - - meta = with lib; { - description = "Official command line tool for Vultr services"; - homepage = "https://github.com/vultr/vultr-cli"; - changelog = "https://github.com/vultr/vultr-cli/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ Br1ght0ne ]; - mainProgram = "vultr-cli"; - }; -} diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix deleted file mode 100644 index e7f600b9765f..000000000000 --- a/pkgs/development/tools/vultr/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "vultr"; - version = "2.0.3"; - - src = fetchFromGitHub { - owner = "JamesClonk"; - repo = "vultr"; - rev = "v${version}"; - sha256 = "sha256-kyB6gUbc32NsSDqDy1zVT4HXn0pWxHdBOEBOSaI0Xro="; - }; - - vendorHash = null; - - # There are not test files - doCheck = false; - - meta = with lib; { - description = "Vultr CLI and API client library"; - mainProgram = "vultr"; - homepage = "https://jamesclonk.github.io/vultr"; - changelog = "https://github.com/JamesClonk/vultr/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ zauberpony ]; - }; -} diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix deleted file mode 100644 index f2be63608b69..000000000000 --- a/pkgs/development/tools/wabt/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "wabt"; - version = "1.0.36"; - - src = fetchFromGitHub { - owner = "WebAssembly"; - repo = "wabt"; - rev = version; - hash = "sha256-CswVvL6yxTf0ju/UPvEGMgTuNZ8mumSIcnVbYVfy178="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCMAKE_PROJECT_VERSION=${version}" ]; - - meta = with lib; { - description = "WebAssembly Binary Toolkit"; - longDescription = '' - WABT (pronounced "wabbit") is a suite of tools for WebAssembly, including: - * wat2wasm: translate from WebAssembly text format to the WebAssembly - binary format - * wasm2wat: the inverse of wat2wasm, translate from the binary format - back to the text format (also known as a .wat) - * wasm-objdump: print information about a wasm binary. Similiar to - objdump. - * wasm-interp: decode and run a WebAssembly binary file using a - stack-based interpreter - * wat-desugar: parse .wat text form as supported by the spec interpreter - (s-expressions, flat syntax, or mixed) and print "canonical" flat - format - * wasm2c: convert a WebAssembly binary file to a C source and header - ''; - homepage = "https://github.com/WebAssembly/wabt"; - license = licenses.asl20; - maintainers = with maintainers; [ ekleog ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index 8988424d7738..b024d5fe710c 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -9,7 +9,7 @@ , zlib # Linux specific dependencies , gtk3 -, webkitgtk +, webkitgtk_4_0 }: buildGoModule rec { @@ -46,9 +46,9 @@ buildGoModule rec { go stdenv.cc nodejs - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 - webkitgtk + webkitgtk_4_0 ]; ldflags = [ @@ -60,7 +60,7 @@ buildGoModule rec { postFixup = '' wrapProgram $out/bin/wails \ --prefix PATH : ${lib.makeBinPath [ pkg-config go stdenv.cc nodejs ]} \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.optionals stdenv.isLinux [ gtk3 webkitgtk ])}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.optionals stdenv.hostPlatform.isLinux [ gtk3 webkitgtk_4_0 ])}" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH" \ --set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}" ''; @@ -69,7 +69,7 @@ buildGoModule rec { description = "Build applications using Go + HTML + CSS + JS"; homepage = "https://wails.io"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ianmjones ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "wails"; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/tools/wally-cli/default.nix b/pkgs/development/tools/wally-cli/default.nix deleted file mode 100644 index a608b42dc0d5..000000000000 --- a/pkgs/development/tools/wally-cli/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, pkg-config, libusb1 }: - -buildGoModule rec { - pname = "wally-cli"; - version = "2.0.1"; - - subPackages = [ "." ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libusb1 ]; - - src = fetchFromGitHub { - owner = "zsa"; - repo = "wally-cli"; - rev = "${version}-linux"; - sha256 = "NuyQHEygy4LNqLtrpdwfCR+fNy3ZUxOClVdRen6AXMc="; - }; - - vendorHash = "sha256-HffgkuKmaOjTYi+jQ6vBlC50JqqbYiikURT6TCqL7e0="; - - meta = with lib; { - description = "Tool to flash firmware to mechanical keyboards"; - mainProgram = "wally-cli"; - homepage = "https://ergodox-ez.com/pages/wally-planck"; - platforms = with platforms; linux ++ darwin; - license = licenses.mit; - maintainers = with maintainers; [ spacekookie r-burns ]; - }; -} diff --git a/pkgs/development/tools/wambo/default.nix b/pkgs/development/tools/wambo/default.nix deleted file mode 100644 index fe79c186259b..000000000000 --- a/pkgs/development/tools/wambo/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ fetchCrate -, lib -, rustPlatform -}: - -rustPlatform.buildRustPackage rec { - pname = "wambo"; - version = "0.3.1"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-WZQgQmoFmsWLgPYRWonJmyKq9IIJ+a6J+O19XPppJG4="; - }; - - cargoHash = "sha256-ghUdhWW5gURWxj/OhbcKPNeLzeJvndqAxEZmwKBATUk="; - - meta = { - description = "All-in-one tool to convert decimal/bin/oct/hex and interpret bits as integers"; - mainProgram = "wambo"; - longDescription = '' - wambo is a binary that can easily shows you a numeric value in all important numeral systems - (bin, hex, dec) + interprets the input as both signed and unsigned values (from i8 to i64, - including f32 and f64). It also easily calculates you mibibytes to bytes, kilobytes to gibibytes, - and so on. - ''; - homepage = "https://github.com/phip1611/wambo"; - changelog = "https://github.com/phip1611/wambo/blob/v${version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ phip1611 ]; - }; -} diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix deleted file mode 100644 index 305a4e666c42..000000000000 --- a/pkgs/development/tools/wasm-pack/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - darwin, - cmake, - pkg-config, - zstd, -}: - -rustPlatform.buildRustPackage rec { - pname = "wasm-pack"; - version = "0.13.0"; - - src = fetchFromGitHub { - owner = "rustwasm"; - repo = "wasm-pack"; - rev = "refs/tags/v${version}"; - hash = "sha256-NEujk4ZPQ2xHWBCVjBCD7H6f58P4KrwCNoDHKa0d5JE="; - }; - - cargoHash = "sha256-pFKGQcWW1/GaIIWMyWBzts4w1hMu27hTG/uUMjkfDMo="; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security ++ [ zstd ]; - - # Most tests rely on external resources and build artifacts. - # Disabling check here to work with build sandboxing. - doCheck = false; - - meta = with lib; { - description = "Utility that builds rust-generated WebAssembly package"; - mainProgram = "wasm-pack"; - homepage = "https://github.com/rustwasm/wasm-pack"; - license = with licenses; [ - asl20 # or - mit - ]; - maintainers = [ maintainers.dhkl ]; - }; -} diff --git a/pkgs/development/tools/wasmedge/default.nix b/pkgs/development/tools/wasmedge/default.nix index 938fcba2da2e..4ca0844821d3 100644 --- a/pkgs/development/tools/wasmedge/default.nix +++ b/pkgs/development/tools/wasmedge/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wasmedge"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "WasmEdge"; repo = "WasmEdge"; rev = finalAttrs.version; - sha256 = "sha256-JPuJIM5OU1qCvFZEQ3gDNBZsIiJijtWLAVGp54z7lt0="; + sha256 = "sha256-70vvQGYcer3dosb1ulWO1F4xFwKwfo35l/TFSFa5idM="; }; nativeBuildInputs = [ @@ -33,13 +33,13 @@ stdenv.mkDerivation (finalAttrs: { llvmPackages.llvm libxml2 libffi - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; cmakeFlags = [ "-DWASMEDGE_BUILD_TESTS=OFF" # Tests are downloaded using git - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DWASMEDGE_FORCE_DISABLE_LTO=ON" ]; diff --git a/pkgs/development/tools/wasmi/Cargo.lock b/pkgs/development/tools/wasmi/Cargo.lock deleted file mode 100644 index dfc5d70f774f..000000000000 --- a/pkgs/development/tools/wasmi/Cargo.lock +++ /dev/null @@ -1,1439 +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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" -dependencies = [ - "memchr", -] - -[[package]] -name = "ambient-authority" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8ad6edb4840b78c5c3d88de606b22252d552b55f3a4699fbb10fc070ec3049" - -[[package]] -name = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - -[[package]] -name = "anstream" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" - -[[package]] -name = "anstyle-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "anstyle-wincon" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" -dependencies = [ - "anstyle", - "windows-sys 0.48.0", -] - -[[package]] -name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[package]] -name = "assert_cmd" -version = "2.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" -dependencies = [ - "anstyle", - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "assert_matches" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" - -[[package]] -name = "async-trait" -version = "0.1.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[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 = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[package]] -name = "bstr" -version = "1.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" -dependencies = [ - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "cap-fs-ext" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0e103ce36d217d568903ad27b14ec2238ecb5d65bad2e756a8f3c0d651506e" -dependencies = [ - "cap-primitives", - "cap-std", - "io-lifetimes", - "windows-sys 0.36.1", -] - -[[package]] -name = "cap-primitives" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af3f336aa91cce16033ed3c94ac91d98956c49b420e6d6cd0dd7d0e386a57085" -dependencies = [ - "ambient-authority", - "fs-set-times", - "io-extras", - "io-lifetimes", - "ipnet", - "maybe-owned", - "rustix 0.35.14", - "winapi-util", - "windows-sys 0.36.1", - "winx", -] - -[[package]] -name = "cap-rand" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d14b9606aa9550d34651bc481443203bc014237bdb992d201d2afa62d2ec6dea" -dependencies = [ - "ambient-authority", - "rand", -] - -[[package]] -name = "cap-std" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d6e70b626eceac9d6fc790fe2d72cc3f2f7bc3c35f467690c54a526b0f56db" -dependencies = [ - "cap-primitives", - "io-extras", - "io-lifetimes", - "ipnet", - "rustix 0.35.14", -] - -[[package]] -name = "cap-time-ext" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a0524f7c4cff2ea547ae2b652bf7a348fd3e48f76556dc928d8b45ab2f1d50" -dependencies = [ - "cap-primitives", - "once_cell", - "rustix 0.35.14", - "winx", -] - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "ciborium" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" - -[[package]] -name = "ciborium-ll" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" -dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "clap" -version = "4.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27" -dependencies = [ - "clap_builder", - "clap_derive", - "once_cell", -] - -[[package]] -name = "clap_builder" -version = "4.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[package]] -name = "clap_lex" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "criterion" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" -dependencies = [ - "anes", - "cast", - "ciborium", - "clap", - "criterion-plot", - "is-terminal 0.4.9", - "itertools", - "num-traits", - "once_cell", - "oorandom", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools", -] - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[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 = "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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" -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 = "fs-set-times" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a267b6a9304912e018610d53fe07115d8b530b160e85db4d2d3a59f3ddde1aec" -dependencies = [ - "io-lifetimes", - "rustix 0.35.14", - "windows-sys 0.36.1", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[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" -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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "indexmap-nostd" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" - -[[package]] -name = "io-extras" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5d8c2ab5becd8720e30fd25f8fa5500d8dc3fceadd8378f05859bd7b46fc49" -dependencies = [ - "io-lifetimes", - "windows-sys 0.36.1", -] - -[[package]] -name = "io-lifetimes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" -dependencies = [ - "libc", - "windows-sys 0.42.0", -] - -[[package]] -name = "ipnet" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" - -[[package]] -name = "is-terminal" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d508111813f9af3afd2f92758f77e4ed2cc9371b642112c6a48d22eb73105c5" -dependencies = [ - "hermit-abi 0.2.6", - "io-lifetimes", - "rustix 0.35.14", - "windows-sys 0.36.1", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi 0.3.2", - "rustix 0.38.10", - "windows-sys 0.48.0", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "leb128" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" - -[[package]] -name = "libc" -version = "0.2.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "libm" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" - -[[package]] -name = "linux-raw-sys" -version = "0.0.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" - -[[package]] -name = "linux-raw-sys" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "maybe-owned" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" - -[[package]] -name = "memchr" -version = "2.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" - -[[package]] -name = "num-traits" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" -dependencies = [ - "autocfg", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "predicates" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" -dependencies = [ - "anstyle", - "difflib", - "itertools", - "predicates-core", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "proc-macro2" -version = "1.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[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 = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "rustix" -version = "0.35.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6380889b07a03b5ecf1d44dc9ede6fd2145d84b502a2a9ca0b03c48e0cc3220f" -dependencies = [ - "bitflags 1.3.2", - "errno 0.2.8", - "io-lifetimes", - "itoa", - "libc", - "linux-raw-sys 0.0.46", - "once_cell", - "windows-sys 0.42.0", -] - -[[package]] -name = "rustix" -version = "0.38.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" -dependencies = [ - "bitflags 2.4.0", - "errno 0.3.3", - "libc", - "linux-raw-sys 0.4.5", - "windows-sys 0.48.0", -] - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[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 = "serde" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[package]] -name = "serde_json" -version = "1.0.105" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "shellexpand" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4" -dependencies = [ - "dirs", -] - -[[package]] -name = "smallvec" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[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.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "system-interface" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92adbaf536f5aff6986e1e62ba36cee72b1718c5153eee08b9e728ddde3f6029" -dependencies = [ - "atty", - "bitflags 1.3.2", - "cap-fs-ext", - "cap-std", - "io-lifetimes", - "rustix 0.35.14", - "windows-sys 0.36.1", - "winx", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "thiserror" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[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 = "unicode-ident" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "walkdir" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasi-cap-std-sync" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4b4953999c746173c263b81e9e5e3e335ff47face7187ba2a5ecc91c716e6f3" -dependencies = [ - "anyhow", - "async-trait", - "cap-fs-ext", - "cap-rand", - "cap-std", - "cap-time-ext", - "fs-set-times", - "io-extras", - "io-lifetimes", - "is-terminal 0.3.0", - "once_cell", - "rustix 0.35.14", - "system-interface", - "tracing", - "wasi-common", - "windows-sys 0.36.1", -] - -[[package]] -name = "wasi-common" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d47faf4f76ebfdeb1f3346a949c6fbf2f2471afc68280b00c76d6c02221d80ad" -dependencies = [ - "anyhow", - "bitflags 1.3.2", - "cap-rand", - "cap-std", - "io-extras", - "rustix 0.35.14", - "thiserror", - "tracing", - "wiggle", - "windows-sys 0.36.1", -] - -[[package]] -name = "wasm-encoder" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41763f20eafed1399fff1afb466496d3a959f58241436cfdc17e3f5ca954de16" -dependencies = [ - "leb128", -] - -[[package]] -name = "wasm-encoder" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba64e81215916eaeb48fee292f29401d69235d62d8b8fd92a7b2844ec5ae5f7" -dependencies = [ - "leb128", -] - -[[package]] -name = "wasmi" -version = "0.31.0" -dependencies = [ - "anyhow", - "assert_matches", - "criterion", - "smallvec", - "spin", - "wasmi_arena", - "wasmi_core", - "wasmparser-nostd", - "wast 62.0.1", - "wat", -] - -[[package]] -name = "wasmi_arena" -version = "0.4.0" - -[[package]] -name = "wasmi_cli" -version = "0.31.0" -dependencies = [ - "anyhow", - "assert_cmd", - "clap", - "wasmi", - "wasmi_wasi", - "wat", -] - -[[package]] -name = "wasmi_core" -version = "0.13.0" -dependencies = [ - "downcast-rs", - "libm", - "num-traits", - "paste", - "rand", -] - -[[package]] -name = "wasmi_wasi" -version = "0.31.0" -dependencies = [ - "wasi-cap-std-sync", - "wasi-common", - "wasmi", - "wat", - "wiggle", -] - -[[package]] -name = "wasmparser-nostd" -version = "0.100.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" -dependencies = [ - "indexmap-nostd", -] - -[[package]] -name = "wast" -version = "35.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ef140f1b49946586078353a453a1d28ba90adfc54dde75710bc1931de204d68" -dependencies = [ - "leb128", -] - -[[package]] -name = "wast" -version = "62.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ae06f09dbe377b889fbd620ff8fa21e1d49d1d9d364983c0cdbf9870cb9f1f" -dependencies = [ - "leb128", - "memchr", - "unicode-width", - "wasm-encoder 0.31.1", -] - -[[package]] -name = "wast" -version = "64.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a259b226fd6910225aa7baeba82f9d9933b6d00f2ce1b49b80fa4214328237cc" -dependencies = [ - "leb128", - "memchr", - "unicode-width", - "wasm-encoder 0.32.0", -] - -[[package]] -name = "wat" -version = "1.0.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53253d920ab413fca1c7dc2161d601c79b4fdf631d0ba51dd4343bf9b556c3f6" -dependencies = [ - "wast 64.0.0", -] - -[[package]] -name = "wiggle" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "211ef4d238fd83bbe6f1bc57f3e2e20dc8b1f999188be252e7a535b696c6f84f" -dependencies = [ - "anyhow", - "async-trait", - "bitflags 1.3.2", - "thiserror", - "tracing", - "wiggle-macro", - "witx", -] - -[[package]] -name = "wiggle-generate" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63feec26b2fc3708c7a63316949ca75dd96988f03a17e4cb8d533dc62587ada4" -dependencies = [ - "anyhow", - "heck", - "proc-macro2", - "quote", - "shellexpand", - "syn 1.0.109", - "witx", -] - -[[package]] -name = "wiggle-macro" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494dc2646618c2b7fb0ec5e1d27dbac5ca31194c00a64698a4b5b35a83d80c21" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "wiggle-generate", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[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-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - -[[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" -dependencies = [ - "windows-targets", -] - -[[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_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_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[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_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[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_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[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_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[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_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_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[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 = "winx" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b01e010390eb263a4518c8cebf86cb67469d1511c00b749a47b64c39e8054d" -dependencies = [ - "bitflags 1.3.2", - "io-lifetimes", - "windows-sys 0.36.1", -] - -[[package]] -name = "witx" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e366f27a5cabcddb2706a78296a40b8fcc451e1a6aba2fc1d94b4a01bdaaef4b" -dependencies = [ - "anyhow", - "log", - "thiserror", - "wast 35.0.2", -] diff --git a/pkgs/development/tools/wasmi/default.nix b/pkgs/development/tools/wasmi/default.nix deleted file mode 100644 index 558a27cce29a..000000000000 --- a/pkgs/development/tools/wasmi/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage rec { - pname = "wasmi"; - version = "0.31.0"; - - src = fetchFromGitHub { - owner = "paritytech"; - repo = "wasmi"; - rev = "v${version}"; - hash = "sha256-chLWrZ+OLUTSFmTu+qKpjApXDmJFhS68N2RKjaql75U="; - fetchSubmodules = true; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - - meta = with lib; { - description = "Efficient WebAssembly interpreter"; - homepage = "https://github.com/paritytech/wasmi"; - changelog = "https://github.com/paritytech/wasmi/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ asl20 mit ]; - mainProgram = "wasmi_cli"; - maintainers = with maintainers; [ dit7ya ]; - }; -} diff --git a/pkgs/development/tools/wasmserve/default.nix b/pkgs/development/tools/wasmserve/default.nix deleted file mode 100644 index 8369096b78dd..000000000000 --- a/pkgs/development/tools/wasmserve/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - buildGoModule, - lib, - fetchFromGitHub, -}: - -buildGoModule rec { - pname = "wasmserve"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "hajimehoshi"; - repo = "wasmserve"; - rev = "v${version}"; - hash = "sha256-e+pHwk+xJVc+Ki0iJC2B+W8ZN4mEawEQNyGhwITBDlo="; - }; - - vendorHash = null; - - meta = with lib; { - description = "HTTP server for testing Wasm"; - mainProgram = "wasmserve"; - homepage = "https://github.com/hajimehoshi/wasmserve"; - license = licenses.asl20; - maintainers = with maintainers; [ kirillrdy ]; - }; -} diff --git a/pkgs/development/tools/wasynth/Cargo.lock b/pkgs/development/tools/wasynth/Cargo.lock deleted file mode 100644 index c231fd9e9754..000000000000 --- a/pkgs/development/tools/wasynth/Cargo.lock +++ /dev/null @@ -1,278 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "arbitrary" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a7924531f38b1970ff630f03eb20a2fde69db5c590c93b0f3482e95dcc5fd60" -dependencies = [ - "derive_arbitrary", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "cc" -version = "1.0.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" - -[[package]] -name = "codegen-luajit" -version = "0.12.0" -dependencies = [ - "wasm-ast", - "wasmparser 0.86.0", -] - -[[package]] -name = "codegen-luau" -version = "0.12.0" -dependencies = [ - "wasm-ast", - "wasmparser 0.86.0", -] - -[[package]] -name = "derive_arbitrary" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a577516173adb681466d517d39bd468293bc2c2a16439375ef0f35bba45f3d" -dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.20", - "syn 1.0.98", -] - -[[package]] -name = "dev-test" -version = "0.12.0" -dependencies = [ - "codegen-luajit", - "codegen-luau", - "libfuzzer-sys", - "test-generator", - "wasm-ast", - "wasm-smith", - "wast", -] - -[[package]] -name = "flagset" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda653ca797810c02f7ca4b804b40b8b95ae046eb989d356bce17919a8c25499" - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "indexmap" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "leb128" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" - -[[package]] -name = "libfuzzer-sys" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336244aaeab6a12df46480dc585802aa743a72d66b11937844c61bbca84c991d" -dependencies = [ - "arbitrary", - "cc", - "once_cell", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "once_cell" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "proc-macro2" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" -dependencies = [ - "proc-macro2 1.0.40", -] - -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid", -] - -[[package]] -name = "syn" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" -dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.20", - "unicode-ident", -] - -[[package]] -name = "test-generator" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea97be90349ab3574f6e74d1566e1c5dd3a4bc74b89f4af4cc10ca010af103c0" -dependencies = [ - "glob", - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "unicode-ident" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" - -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "wasm-ast" -version = "0.12.0" -dependencies = [ - "wasmparser 0.86.0", -] - -[[package]] -name = "wasm-encoder" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f0c17267a5ffd6ae3d897589460e21db1673c84fb7016b909c9691369a75ea" -dependencies = [ - "leb128", -] - -[[package]] -name = "wasm-encoder" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f76068e87fe9b837a6bc2ccded66784173eadb828c4168643e9fddf6f9ed2e61" -dependencies = [ - "leb128", -] - -[[package]] -name = "wasm-smith" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b73250e61e41d0e467b78559c7d761841005d724384bb0b78d52ff974acf5520" -dependencies = [ - "arbitrary", - "flagset", - "indexmap", - "leb128", - "wasm-encoder 0.14.0", - "wasmparser 0.87.0", -] - -[[package]] -name = "wasmparser" -version = "0.86.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcbfe95447da2aa7ff171857fc8427513eb57c75a729bb190e974dc695e8f5c" -dependencies = [ - "indexmap", -] - -[[package]] -name = "wasmparser" -version = "0.87.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c04e207cd2e8ecb6f9bd28a2cf3119b4c6bfeee6fe3a25cc1daf8041d00a875" -dependencies = [ - "indexmap", -] - -[[package]] -name = "wast" -version = "42.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "badcb03f976f983ff0daf294da9697be659442f61e6b0942bb37a2b6cbfe9dd4" -dependencies = [ - "leb128", - "memchr", - "unicode-width", - "wasm-encoder 0.13.0", -] diff --git a/pkgs/development/tools/wasynth/default.nix b/pkgs/development/tools/wasynth/default.nix deleted file mode 100644 index bf7f0250f405..000000000000 --- a/pkgs/development/tools/wasynth/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, fetchFromGitHub -, rustPlatform -}: - -rustPlatform.buildRustPackage rec { - pname = "wasynth"; - version = "0.12.0"; - - src = fetchFromGitHub { - owner = "Rerumu"; - repo = "Wasynth"; - rev = "v${version}"; - sha256 = "sha256-hbY+epUtYSQrvnAbCELsVcqd3UoXGn24FkzWfrM0K14="; - }; - - # A lock file isn't provided, so it must be added manually. - cargoLock.lockFile = ./Cargo.lock; - postPatch = '' - cp ${./Cargo.lock} Cargo.lock - ''; - - # Not all of the tests pass. - doCheck = false; - - # These binaries are tests and should be removed. - postInstall = '' - rm $out/bin/{luajit,luau}_translate - ''; - - meta = with lib; { - description = "WebAssembly translation tools for various languages"; - longDescription = '' - Wasynth provides the following WebAssembly translation tools: - * wasm2luajit: translate WebAssembly to LuaJIT source code - * wasm2luau: translate WebAssembly Luau source code - ''; - homepage = "https://github.com/Rerumu/Wasynth"; - license = with licenses; [ gpl3Only ]; - maintainers = with maintainers; [ wackbyte ]; - }; -} diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index b60872dce673..aa915d89c7fa 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "-DENABLE_EDEN_SUPPORT=NO" # requires sapling (formerly known as eden), which is not packaged in nixpkgs "-DWATCHMAN_STATE_DIR=${stateDir}" "-DWATCHMAN_VERSION_OVERRIDE=${version}" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { lz4 zstd libiconv - ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; cargoRoot = "watchman/cli"; diff --git a/pkgs/development/tools/web-ext/default.nix b/pkgs/development/tools/web-ext/default.nix deleted file mode 100644 index 89e3f2257ff8..000000000000 --- a/pkgs/development/tools/web-ext/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -, runCommand -, web-ext -}: - -buildNpmPackage rec { - pname = "web-ext"; - version = "8.2.0"; - - src = fetchFromGitHub { - owner = "mozilla"; - repo = "web-ext"; - rev = version; - hash = "sha256-5q1vB1EN+Qmss6o6qn4BAaNSwLJBhC8joFJVzncBx6k="; - }; - - npmDepsHash = "sha256-MGuLCuTTUdh2L64j41K6GvCdquCDYPPPEk1Z/9R6sNA="; - - npmBuildFlags = [ "--production" ]; - - passthru.tests.help = runCommand "${pname}-tests" { } '' - ${web-ext}/bin/web-ext --help - touch $out - ''; - - meta = { - description = "Command line tool to help build, run, and test web extensions"; - homepage = "https://github.com/mozilla/web-ext"; - license = lib.licenses.mpl20; - mainProgram = "web-ext"; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/wgo/default.nix b/pkgs/development/tools/wgo/default.nix deleted file mode 100644 index e895ffa43ddb..000000000000 --- a/pkgs/development/tools/wgo/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -let - pname = "wgo"; - version = "0.5.6d"; -in -buildGoModule { - inherit pname version; - - src = fetchFromGitHub { - owner = "bokwoon95"; - repo = "wgo"; - rev = "v${version}"; - hash = "sha256-PzBje046mS844zpU5X1eoRcULJH8sh49yf8lrxeA764="; - }; - - vendorHash = "sha256-w6UJxZToHbbQmuXkyqFzyssFcE+7uVNqOuIF/XKdEsU="; - - ldflags = [ "-s" "-w" ]; - - subPackages = [ "." ]; - - checkFlags = [ - # Flaky tests. - # See https://github.com/bokwoon95/wgo/blob/e0448e04b6ca44323f507d1aca94425b7c69803c/START_HERE.md?plain=1#L26. - "-skip=TestWgoCmd_FileEvent" - ]; - - meta = with lib; { - description = "Live reload for Go apps"; - mainProgram = "wgo"; - homepage = "https://github.com/bokwoon95/wgo"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix deleted file mode 100644 index bb2ea2665749..000000000000 --- a/pkgs/development/tools/wiggle/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, groff }: - -stdenv.mkDerivation rec { - pname = "wiggle"; - version = "1.3"; - - src = fetchFromGitHub { - owner = "neilbrown"; - repo = "wiggle"; - rev = "v${version}"; - sha256 = "18ilzr9sbal1j8p1d94ilm1j5blac5cngvcvjpdmgmpw6diy2ldf"; - }; - - buildInputs = [ ncurses groff ]; - - configurePhase = '' - makeFlagsArray=( CFLAGS="-I. -O3" - STRIP="-s" - INSTALL="install" - BINDIR="$out/bin" - MANDIR="$out/share/man" - ) - patchShebangs . - ''; - - meta = with lib; { - homepage = "https://blog.neil.brown.name/category/wiggle/"; - description = "Tool for applying patches with conflicts"; - mainProgram = "wiggle"; - longDescription = '' - Wiggle applies patches to a file in a similar manner to the patch(1) - program. The distinctive difference is, however, that wiggle will - attempt to apply a patch even if the "before" part of the patch doesn't - match the target file perfectly. This is achieved by breaking the file - and patch into words and finding the best alignment of words in the file - with words in the patch. Once this alignment has been found, any - differences (word-wise) in the patch are applied to the file as best as - possible. Also, wiggle will (in some cases) detect changes that have - already been applied, and will ignore them. - ''; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/wiiload/default.nix b/pkgs/development/tools/wiiload/default.nix deleted file mode 100644 index f2ff285cb745..000000000000 --- a/pkgs/development/tools/wiiload/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, zlib }: -stdenv.mkDerivation rec { - version = "0.5.3"; - pname = "wiiload"; - - nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ zlib ]; - - src = fetchFromGitHub { - owner = "devkitPro"; - repo = "wiiload"; - rev = "v${version}"; - sha256 = "sha256-pZdZzCAPfAVucuiV/q/ROY3cz/wxQWep6dCTGNn2fSo="; - }; - - preConfigure = "./autogen.sh"; - - meta = with lib; { - description = "Load homebrew apps over network/usbgecko to your Wii"; - mainProgram = "wiiload"; - homepage = "https://wiibrew.org/wiki/Wiiload"; - license = licenses.gpl2; - maintainers = with maintainers; [ tomsmeets ]; - }; -} diff --git a/pkgs/development/tools/winhelpcgi/default.nix b/pkgs/development/tools/winhelpcgi/default.nix deleted file mode 100644 index c2d4dd31bf1c..000000000000 --- a/pkgs/development/tools/winhelpcgi/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, libwmf, libpng12, pkg-config, lib }: stdenv.mkDerivation { - pname = "winhelpcgi"; - version = "1.0-rc3"; - - src = fetchurl { - url = "http://www.herdsoft.com/ftp/winhelpcgi_1.0-1.tar.gz"; - sha256 = "sha256-9HIs50ZGoTfGixD9c/DQs0KJMQtmfsDVB8qRMnQtXNw="; - - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libwmf libpng12 ]; - - meta = { - description = "CGI module for Linux, Solaris, MacOS X and AIX to read Windows Help Files"; - mainProgram = "winhelpcgi.cgi"; - homepage = "http://www.herdsoft.com/linux/produkte/winhelpcgi.html"; - license = lib.licenses.gpl2Only; - maintainers = [ lib.maintainers.shlevy ]; - platforms = lib.platforms.linux; - broken = stdenv.isAarch64; - }; -} diff --git a/pkgs/development/tools/wire/default.nix b/pkgs/development/tools/wire/default.nix deleted file mode 100644 index c1099d069169..000000000000 --- a/pkgs/development/tools/wire/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "wire"; - version = "0.6.0"; - - src = fetchFromGitHub { - owner = "google"; - repo = "wire"; - rev = "v${version}"; - hash = "sha256-bV/bb577JzGF37HmvRprxr+GWcLLiFRisURwtGDbqko="; - }; - - patches = [ - # Bump the minimum version of Go required to compile packages in this module, - # as `golang.org/x/tools` requires go1.18 or later. - ./go-modules.patch - ]; - - vendorHash = "sha256-7IW97ZvCGlKCiVh8mKQutTdAxih7oFkXrKo4h3Pl9YY="; - - subPackages = [ "cmd/wire" ]; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - homepage = "https://github.com/google/wire"; - description = "Code generation tool that automates connecting components using dependency injection"; - mainProgram = "wire"; - license = licenses.asl20; - maintainers = with maintainers; [ svrana ]; - }; -} diff --git a/pkgs/development/tools/wire/go-modules.patch b/pkgs/development/tools/wire/go-modules.patch deleted file mode 100644 index cc6facd4d2d0..000000000000 --- a/pkgs/development/tools/wire/go-modules.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/go.mod b/go.mod -index 944aef0..ee579ff 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,6 +1,6 @@ - module github.com/google/wire - --go 1.12 -+go 1.18 - - require ( - github.com/google/go-cmp v0.2.0 -@@ -8,3 +8,5 @@ require ( - github.com/pmezard/go-difflib v1.0.0 - golang.org/x/tools v0.17.0 - ) -+ -+require golang.org/x/mod v0.14.0 // indirect -diff --git a/go.sum b/go.sum -index 8da3aae..fbca3c1 100644 ---- a/go.sum -+++ b/go.sum -@@ -4,56 +4,8 @@ github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN - github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= - github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= - github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= --github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= --golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= --golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= --golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= --golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= --golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= --golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= --golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= - golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= - golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= --golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= --golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= --golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= --golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= --golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= --golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= --golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= - golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= --golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= --golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= --golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= --golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= --golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= --golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= --golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= --golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= --golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= --golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= --golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= --golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= --golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= --golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= --golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= --golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= --golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= --golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= --golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= --golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= - golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= - golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= --golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/pkgs/development/tools/wlcs/default.nix b/pkgs/development/tools/wlcs/default.nix deleted file mode 100644 index 453da9b06be7..000000000000 --- a/pkgs/development/tools/wlcs/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv -, lib -, gitUpdater -, fetchFromGitHub -, testers -, cmake -, pkg-config -, boost -, gtest -, wayland -, wayland-scanner -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "wlcs"; - version = "1.7.0"; - - src = fetchFromGitHub { - owner = "MirServer"; - repo = "wlcs"; - rev = "v${finalAttrs.version}"; - hash = "sha256-BQPRymkbGu4YvTYXTaTMuyP5fHpqMWI4xPwjDRHZNEQ="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - pkg-config - wayland-scanner - ]; - - buildInputs = [ - boost - gtest - wayland - wayland-scanner # needed by cmake - ]; - - passthru = { - tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - updateScript = gitUpdater { - rev-prefix = "v"; - }; - }; - - meta = with lib; { - description = "Wayland Conformance Test Suite"; - longDescription = '' - wlcs aspires to be a protocol-conformance-verifying test suite usable by Wayland - compositor implementors. - - It is growing out of porting the existing Weston test suite to be run in Mir's - test suite, but it is designed to be usable by any compositor. - - wlcs relies on compositors providing an integration module, providing wlcs with - API hooks to start a compositor, connect a client, move a window, and so on. - This makes both writing and debugging tests easier - the tests are (generally) - in the same address space as the compositor, so there is a consistent global - clock available, it's easier to poke around in compositor internals, and - standard debugging tools can follow control flow from the test client to the - compositor and back again. - ''; - homepage = "https://github.com/MirServer/wlcs"; - changelog = "https://github.com/MirServer/wlcs/releases/tag/v${finalAttrs.version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.linux; - pkgConfigModules = [ - "wlcs" - ]; - }; -}) diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix deleted file mode 100644 index 38e10f726160..000000000000 --- a/pkgs/development/tools/wllvm/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, python3Packages, fetchPypi }: - -python3Packages.buildPythonApplication rec { - version = "1.3.1"; - pname = "wllvm"; - - src = fetchPypi { - inherit pname version; - 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 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/worker-build/default.nix b/pkgs/development/tools/worker-build/default.nix index fd7c1e378603..cc48ae31d39b 100644 --- a/pkgs/development/tools/worker-build/default.nix +++ b/pkgs/development/tools/worker-build/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; buildAndTestSubdir = "worker-build"; diff --git a/pkgs/development/tools/wp4nix/default.nix b/pkgs/development/tools/wp4nix/default.nix deleted file mode 100644 index 6a829b4ae267..000000000000 --- a/pkgs/development/tools/wp4nix/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitLab -, nix -, subversion -, makeWrapper -}: - -buildGoModule rec { - pname = "wp4nix"; - version = "1.0.0"; - - src = fetchFromGitLab { - domain = "git.helsinki.tools"; - owner = "helsinki-systems"; - repo = "wp4nix"; - rev = "v${version}"; - sha256 = "sha256-WJteeFUMr684yZEtUP13MqRjJ1UAeo48AzOPdLEE65w="; - }; - - vendorHash = null; - - nativeBuildInputs = [ - makeWrapper - ]; - - postInstall = '' - wrapProgram $out/bin/wp4nix \ - --prefix PATH : ${lib.makeBinPath [ nix subversion ]} - ''; - - meta = with lib; { - description = "Packaging helper for Wordpress themes and plugins"; - mainProgram = "wp4nix"; - homepage = "https://git.helsinki.tools/helsinki-systems/wp4nix"; - license = licenses.mit; - maintainers = with maintainers; [ onny ]; - platforms = platforms.unix; - }; -} - diff --git a/pkgs/development/tools/wrangler_1/default.nix b/pkgs/development/tools/wrangler_1/default.nix index 7fc33c2dda6d..570092b7ee48 100644 --- a/pkgs/development/tools/wrangler_1/default.nix +++ b/pkgs/development/tools/wrangler_1/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl CoreFoundation CoreServices Security libiconv ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/development/tools/wxformbuilder/default.nix b/pkgs/development/tools/wxformbuilder/default.nix deleted file mode 100644 index ad31bcad0d7b..000000000000 --- a/pkgs/development/tools/wxformbuilder/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, darwin -, makeWrapper -, shared-mime-info -, boost -, wxGTK32 -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "wxformbuilder"; - version = "4.2.1"; - - src = fetchFromGitHub { - owner = "wxFormBuilder"; - repo = "wxFormBuilder"; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - leaveDotGit = true; - postFetch = '' - substituteInPlace $out/.git-properties \ - --replace-fail "\$Format:%h\$" "$(git -C $out rev-parse --short HEAD)" \ - --replace-fail "\$Format:%(describe)\$" "$(git -C $out rev-parse --short HEAD)" - rm -rf $out/.git - ''; - hash = "sha256-e0oYyUv8EjGDVj/TWx2jGaj22YyFJf1xa6lredV1J0Y="; - }; - - postPatch = '' - substituteInPlace third_party/tinyxml2/cmake/tinyxml2.pc.in \ - --replace-fail '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace-fail '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - sed -i '/fixup_bundle/d' cmake/macros.cmake - ''; - - nativeBuildInputs = [ - cmake - ] ++ lib.optionals stdenv.isDarwin [ - darwin.sigtool - makeWrapper - ] ++ lib.optionals stdenv.isLinux [ - shared-mime-info - ]; - - buildInputs = [ - boost - wxGTK32 - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ]; - - postInstall = lib.optionalString stdenv.isDarwin '' - mkdir -p $out/{Applications,bin} - mv $out/wxFormBuilder.app $out/Applications - makeWrapper $out/Applications/wxFormBuilder.app/Contents/MacOS/wxFormBuilder $out/bin/wxformbuilder - ''; - - meta = with lib; { - description = "RAD tool for wxWidgets GUI design"; - homepage = "https://github.com/wxFormBuilder/wxFormBuilder"; - license = licenses.gpl2Only; - mainProgram = "wxformbuilder"; - maintainers = with maintainers; [ matthuszagh wegank ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/tools/xc/default.nix b/pkgs/development/tools/xc/default.nix deleted file mode 100644 index 9acf27ca3c33..000000000000 --- a/pkgs/development/tools/xc/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "xc"; - version = "0.8.0"; - - src = fetchFromGitHub { - owner = "joerdav"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-vTyCS85xbJnAgbasWD6LFxij9EezzlJ1pyvCJptqmOU="; - }; - - vendorHash = "sha256-EbIuktQ2rExa2DawyCamTrKRC1yXXMleRB8/pcKFY5c="; - - ldflags = [ - "-s" - "-w" - "-X=main.version=${version}" - ]; - - meta = with lib; { - description = "Markdown defined task runner"; - mainProgram = "xc"; - homepage = "https://xcfile.dev/"; - changelog = "https://github.com/joerdav/xc/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda joerdav ]; - }; -} diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix deleted file mode 100644 index 8dc527c0e1f5..000000000000 --- a/pkgs/development/tools/xcbuild/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib, stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng -, CoreServices, CoreGraphics, ImageIO, ninja }: - -let - googletest = fetchFromGitHub { - owner = "google"; - repo = "googletest"; - rev = "43359642a1c16ad3f4fc575c7edd0cb935810815"; - sha256 = "0y4xaah62fjr3isaryc3vfz3mn9xflr00vchdimj8785milxga4q"; - }; - - linenoise = fetchFromGitHub { - owner = "antirez"; - repo = "linenoise"; - rev = "c894b9e59f02203dbe4e2be657572cf88c4230c3"; - sha256 = "0wasql7ph5g473zxhc2z47z3pjp42q0dsn4gpijwzbxawid71b4w"; - }; -in stdenv.mkDerivation { - pname = "xcbuild"; - - # Once a version is released that includes - # https://github.com/facebook/xcbuild/commit/183c087a6484ceaae860c6f7300caf50aea0d710, - # we can stop doing this -pre thing. - version = "0.1.2-pre"; - - src = fetchFromGitHub { - owner = "facebook"; - repo = "xcbuild"; - rev = "32b9fbeb69bfa2682bd0351ec2f14548aaedd554"; - sha256 = "1xxwg2849jizxv0g1hy0b1m3i7iivp9bmc4f5pi76swsn423d41m"; - }; - - patches = [ ./includes.patch ]; - - prePatch = '' - rmdir ThirdParty/* - cp -r --no-preserve=all ${googletest} ThirdParty/googletest - cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise - ''; - - postPatch = lib.optionalString (!stdenv.isDarwin) '' - # Fix build on gcc-13 due to missing includes - sed -e '1i #include <cstdint>' -i \ - Libraries/libutil/Headers/libutil/Permissions.h \ - Libraries/pbxbuild/Headers/pbxbuild/Tool/AuxiliaryFile.h \ - Libraries/pbxbuild/Headers/pbxbuild/Tool/Invocation.h - - # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. - sed 1i'#include <sys/sysmacros.h>' \ - -i Libraries/xcassets/Headers/xcassets/Slot/SystemVersion.h - '' + lib.optionalString stdenv.isDarwin '' - # Apple Open Sourced LZFSE, but not libcompression, and it isn't - # part of an impure framework we can add - substituteInPlace Libraries/libcar/Sources/Rendition.cpp \ - --replace "#if HAVE_LIBCOMPRESSION" "#if 0" - ''; - - # TODO: instruct cmake not to put it in /usr, rather than cleaning up - postInstall = '' - mv $out/usr/* $out - rmdir $out/usr - cp liblinenoise.* $out/lib/ - ''; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - cmakeFlags = [ "-GNinja" ]; - - nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ zlib libxml2 libpng ] - ++ lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ]; - - meta = with lib; { - description = "Xcode-compatible build tool"; - homepage = "https://github.com/facebook/xcbuild"; - platforms = platforms.unix; - maintainers = with maintainers; [ copumpkin matthewbauer ]; - license = with licenses; [ bsd2 bsd3 ]; - }; -} diff --git a/pkgs/development/tools/xcbuild/includes.patch b/pkgs/development/tools/xcbuild/includes.patch deleted file mode 100644 index 7a05a33eb678..000000000000 --- a/pkgs/development/tools/xcbuild/includes.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Libraries/plist/Sources/Format/Encoding.cpp -+++ b/Libraries/plist/Sources/Format/Encoding.cpp -@@ -11,6 +11,7 @@ - #include <plist/Format/unicode.h> - - #include <cassert> -+#include <cstdlib> /* abort() */ - - #if defined(__linux__) - #include <endian.h> diff --git a/pkgs/development/tools/xcbuild/platforms.nix b/pkgs/development/tools/xcbuild/platforms.nix deleted file mode 100644 index 0108ac8ef697..000000000000 --- a/pkgs/development/tools/xcbuild/platforms.nix +++ /dev/null @@ -1,301 +0,0 @@ -{ stdenv, runCommand, lib, sdks, xcodePlatform, writeText }: - -let - - inherit (lib.generators) toPlist; - - Info = { - CFBundleIdentifier = "com.apple.platform.${lib.toLower xcodePlatform}"; - Type = "Platform"; - Name = lib.toLower xcodePlatform; - }; - - Version = { - ProjectName = "OSXPlatformSupport"; - }; - - # These files are all based off of Xcode spec fies found in - # /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/Xcode/PrivatePlugIns/IDEOSXSupportCore.ideplugin/Contents/Resources. - - # Based off of the "MacOSX Architectures.xcspec" file. All i386 stuff - # is removed because NixPkgs only supports darwin-x86_64 and darwin-arm64. - Architectures = [ - { - Identifier = "Standard"; - Type = "Architecture"; - Name = "Standard Architectures (Apple Silicon, 64-bit Intel)"; - RealArchitectures = [ "arm64" "x86_64" ]; - ArchitectureSetting = "ARCHS_STANDARD"; - } - { - Identifier = "Universal"; - Type = "Architecture"; - Name = "Universal (Apple Silicon, 64-bit Intel)"; - RealArchitectures = [ "arm64" "x86_64" ]; - ArchitectureSetting = "ARCHS_STANDARD_32_64_BIT"; - } - { - Identifier = "Native"; - Type = "Architecture"; - Name = "Native Architecture of Build Machine"; - ArchitectureSetting = "NATIVE_ARCH_ACTUAL"; - } - { - Identifier = "Standard64bit"; - Type = "Architecture"; - Name = "Apple Silicon, 64-bit Intel"; - RealArchitectures = [ "arm64" "x86_64" ]; - ArchitectureSetting = "ARCHS_STANDARD_64_BIT"; - } - { - Identifier = if stdenv.isAarch64 then "arm64" else "x86_64"; - Type = "Architecture"; - Name = "Apple Silicon or Intel 64-bit"; - } - { - Identifier = "Standard_Including_64_bit"; - Type = "Architecture"; - Name = "Standard Architectures (including 64-bit)"; - RealArchitectures = [ "arm64" "x86_64" ]; - ArchitectureSetting = "ARCHS_STANDARD_INCLUDING_64_BIT"; - } - ]; - - # Based off of the "MacOSX Package Types.xcspec" file. Only keep the - # bare minimum needed. - PackageTypes = [ - { - Identifier = "com.apple.package-type.mach-o-executable"; - Type = "PackageType"; - Name = "Mach-O Executable"; - DefaultBuildSettings = { - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; - }; - ProductReference = { - FileType = "compiled.mach-o.executable"; - Name = "$(EXECUTABLE_NAME)"; - }; - } - { - Identifier = "com.apple.package-type.mach-o-objfile"; - Type = "PackageType"; - Name = "Mach-O Object File"; - DefaultBuildSettings = { - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; - }; - ProductReference = { - FileType = "compiled.mach-o.objfile"; - Name = "$(EXECUTABLE_NAME)"; - }; - } - { - Identifier = "com.apple.package-type.mach-o-dylib"; - Type = "PackageType"; - Name = "Mach-O Dynamic Library"; - DefaultBuildSettings = { - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; - }; - ProductReference = { - FileType = "compiled.mach-o.dylib"; - Name = "$(EXECUTABLE_NAME)"; - }; - } - { - Identifier = "com.apple.package-type.static-library"; - Type = "PackageType"; - Name = "Mach-O Static Library"; - DefaultBuildSettings = { - EXECUTABLE_PREFIX = "lib"; - EXECUTABLE_SUFFIX = ".a"; - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; - }; - ProductReference = { - FileType = "archive.ar"; - Name = "$(EXECUTABLE_NAME)"; - IsLaunchable = "NO"; - }; - } - { - Identifier = "com.apple.package-type.wrapper"; - Type = "PackageType"; - Name = "Wrapper"; - DefaultBuildSettings = { - WRAPPER_SUFFIX = ".bundle"; - WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; - CONTENTS_FOLDER_PATH = "$(WRAPPER_NAME)/Contents"; - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/MacOS"; - EXECUTABLE_PATH = "$(EXECUTABLE_FOLDER_PATH)/$(EXECUTABLE_NAME)"; - INFOPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/Info.plist"; - INFOSTRINGS_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/InfoPlist.strings"; - PKGINFO_PATH = "$(CONTENTS_FOLDER_PATH)/PkgInfo"; - PBDEVELOPMENTPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/pbdevelopment.plist"; - VERSIONPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/version.plist"; - PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers"; - PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders"; - EXECUTABLES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Executables"; - FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Frameworks"; - SHARED_FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedFrameworks"; - SHARED_SUPPORT_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedSupport"; - UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Resources"; - LOCALIZED_RESOURCES_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(DEVELOPMENT_LANGUAGE).lproj"; - DOCUMENTATION_FOLDER_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/Documentation"; - PLUGINS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PlugIns"; - SCRIPTS_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Scripts"; - }; - ProductReference = { - FileType = "wrapper.cfbundle"; - Name = "$(WRAPPER_NAME)"; - IsLaunchable = "NO"; - }; - } - { - Identifier = "com.apple.package-type.wrapper.application"; - Type = "PackageType"; - BasedOn = "com.apple.package-type.wrapper"; - Name = "Application Wrapper"; - DefaultBuildSettings = { - GENERATE_PKGINFO_FILE = "YES"; - }; - ProductReference = { - FileType = "wrapper.application"; - Name = "$(WRAPPER_NAME)"; - IsLaunchable = "YES"; - }; - } - ]; - - # Based off of the "MacOSX Product Types.xcspec" file. All - # bundles/wrapper are removed, because we prefer dynamic products in - # NixPkgs. - ProductTypes = [ - { - Identifier = "com.apple.product-type.tool"; - Type = "ProductType"; - Name = "Command-line Tool"; - PackageTypes = [ "com.apple.package-type.mach-o-executable" ]; - } - { - Identifier = "com.apple.product-type.objfile"; - Type = "ProductType"; - Name = "Object File"; - PackageTypes = [ "com.apple.package-type.mach-o-objfile" ]; - } - { - Identifier = "com.apple.product-type.library.dynamic"; - Type = "ProductType"; - Name = "Dynamic Library"; - PackageTypes = [ "com.apple.package-type.mach-o-dylib" ]; - DefaultBuildProperties = { - FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; - MACH_O_TYPE = "mh_dylib"; - REZ_EXECUTABLE = "YES"; - EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; - EXECUTABLE_EXTENSION = "dylib"; - DYLIB_COMPATIBILITY_VERSION = "1"; - DYLIB_CURRENT_VERSION = "1"; - FRAMEWORK_FLAG_PREFIX = "-framework"; - LIBRARY_FLAG_PREFIX = "-l"; - LIBRARY_FLAG_NOSPACE = "YES"; - STRIP_STYLE = "debugging"; - GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; - CODE_SIGNING_ALLOWED = "YES"; - CODE_SIGNING_REQUIRED = "NO"; - }; - } - { - Identifier = "com.apple.product-type.library.static"; - Type = "ProductType"; - Name = "Static Library"; - PackageTypes = [ "com.apple.package-type.static-library" ]; - DefaultBuildProperties = { - FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; - MACH_O_TYPE = "staticlib"; - REZ_EXECUTABLE = "YES"; - EXECUTABLE_PREFIX = "lib"; - EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; - EXECUTABLE_EXTENSION = "a"; - FRAMEWORK_FLAG_PREFIX = "-framework"; - LIBRARY_FLAG_PREFIX = "-l"; - LIBRARY_FLAG_NOSPACE = "YES"; - STRIP_STYLE = "debugging"; - SEPARATE_STRIP = "YES"; - CLANG_ENABLE_MODULE_DEBUGGING = "NO"; - }; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.bundle"; - Name = "Bundle"; - DefaultBuildProperties = { - FULL_PRODUCT_NAME = "$(WRAPPER_NAME)"; - MACH_O_TYPE = "mh_bundle"; - WRAPPER_PREFIX = ""; - WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; - WRAPPER_EXTENSION = "bundle"; - WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; - FRAMEWORK_FLAG_PREFIX = "-framework"; - LIBRARY_FLAG_PREFIX = "-l"; - LIBRARY_FLAG_NOSPACE = "YES"; - STRIP_STYLE = "non-global"; - }; - PackageTypes = [ "com.apple.package-type.wrapper" ]; - IsWrapper = "YES"; - HasInfoPlist = "YES"; - HasInfoPlistStrings = "YES"; - } - { - Identifier = "com.apple.product-type.application"; - Type = "ProductType"; - BasedOn = "com.apple.product-type.bundle"; - Name = "Application"; - DefaultBuildProperties = { - MACH_O_TYPE = "mh_execute"; - WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; - WRAPPER_EXTENSION = "app"; - }; - PackageTypes = [ "com.apple.package-type.wrapper.application" ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.framework"; - Name = "Bundle"; - DefaultBuildProperties = { - FULL_PRODUCT_NAME = "$(WRAPPER_NAME)"; - MACH_O_TYPE = "mh_bundle"; - WRAPPER_PREFIX = ""; - WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; - WRAPPER_EXTENSION = "bundle"; - WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; - FRAMEWORK_FLAG_PREFIX = "-framework"; - LIBRARY_FLAG_PREFIX = "-l"; - LIBRARY_FLAG_NOSPACE = "YES"; - STRIP_STYLE = "non-global"; - }; - PackageTypes = [ "com.apple.package-type.wrapper" ]; - IsWrapper = "YES"; - HasInfoPlist = "YES"; - HasInfoPlistStrings = "YES"; - } - ]; - -in - -runCommand "Platforms" {} '' - platform=$out/${xcodePlatform}.platform - - install -D ${writeText "Info.plist" (toPlist {} Info)} $platform/Info.plist - install -D ${writeText "version.plist" (toPlist {} Version)} $platform/version.plist - install -D ${writeText "Architectures.xcspec" (toPlist {} Architectures)} $platform/Developer/Library/Xcode/Specifications/Architectures.xcspec - install -D ${writeText "PackageTypes.xcspec" (toPlist {} PackageTypes)} $platform/Developer/Library/Xcode/Specifications/PackageTypes.xcspec - install -D ${writeText "ProductTypes.xcspec" (toPlist {} ProductTypes)} $platform/Developer/Library/Xcode/Specifications/ProductTypes.xcspec - - ln -s $platform $platform/usr - - mkdir -p $platform/Developer - ln -s ${sdks} $platform/Developer/SDKs -'' diff --git a/pkgs/development/tools/xcbuild/sdks.nix b/pkgs/development/tools/xcbuild/sdks.nix deleted file mode 100644 index bf16bf132d77..000000000000 --- a/pkgs/development/tools/xcbuild/sdks.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ runCommand, lib, toolchainName, sdkName -, writeText, xcodePlatform, sdkVer, productBuildVer }: - -let - inherit (lib.generators) toPlist toJSON; - - SDKSettings = { - CanonicalName = sdkName; - DisplayName = sdkName; - Toolchains = [ toolchainName ]; - Version = sdkVer; - MaximumDeploymentTarget = sdkVer; - isBaseSDK = "YES"; - }; - - SystemVersion = lib.optionalAttrs (productBuildVer != null) { - ProductBuildVersion = productBuildVer; - } // { - ProductName = "Mac OS X"; - ProductVersion = sdkVer; - }; -in - -runCommand "SDKs" {} '' - sdk=$out/${sdkName}.sdk - install -D ${writeText "SDKSettings.plist" (toPlist {} SDKSettings)} $sdk/SDKSettings.plist - install -D ${writeText "SDKSettings.json" (toJSON {} SDKSettings)} $sdk/SDKSettings.json - install -D ${writeText "SystemVersion.plist" (toPlist {} SystemVersion)} $sdk/System/Library/CoreServices/SystemVersion.plist - ln -s $sdk $sdk/usr - - ln -s $sdk $out/${xcodePlatform}.sdk -'' diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh deleted file mode 100644 index f4b5abf2d8d3..000000000000 --- a/pkgs/development/tools/xcbuild/setup-hook.sh +++ /dev/null @@ -1,29 +0,0 @@ -xcbuildBuildPhase() { - export DSTROOT=$out - - runHook preBuild - - echo "running xcodebuild" - - xcodebuild SYMROOT=$PWD/Products OBJROOT=$PWD/Intermediates $xcbuildFlags build - - runHook postBuild -} - -xcbuildInstallPhase () { - runHook preInstall - - # not implemented - # xcodebuild install - - runHook postInstall -} - -buildPhase=xcbuildBuildPhase -if [ -z "${installPhase-}" ]; then - installPhase=xcbuildInstallPhase -fi - -# if [ -d "*.xcodeproj" ]; then -# buildPhase=xcbuildPhase -# fi diff --git a/pkgs/development/tools/xcbuild/toolchains.nix b/pkgs/development/tools/xcbuild/toolchains.nix deleted file mode 100644 index a5e8ed28ce1e..000000000000 --- a/pkgs/development/tools/xcbuild/toolchains.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ runCommand, toolchainName, fetchurl, stdenv -, buildPackages, lib, writeText }: - -let - - inherit (lib) getBin optionalString; - inherit (lib.generators) toPlist; - - ToolchainInfo = { - Identifier = toolchainName; - }; - - # We could pull this out of developer_cmds but it adds an annoying - # loop if we want to bootstrap and this is just a tiny script so I'm - # not going to bother. - mkdep-darwin-src = fetchurl { - url = "https://opensource.apple.com/source/developer_cmds/developer_cmds-63/mkdep/mkdep.sh"; - sha256 = "0n4wpqfslfjs5zbys5yri8pfi2awyhlmknsf6laa5jzqbzq9x541"; - executable = true; - }; -in - -runCommand "Toolchains" {} ('' - toolchain=$out/XcodeDefault.xctoolchain - mkdir -p $toolchain - - install -D ${writeText "ToolchainInfo.plist" (toPlist {} ToolchainInfo)} $toolchain/ToolchainInfo.plist - - ln -s $toolchain $toolchain/usr - - mkdir -p $toolchain/include - mkdir -p $toolchain/lib - mkdir -p $toolchain/libexec - mkdir -p $toolchain/share - mkdir -p $toolchain/bin - - for bin in ${getBin stdenv.cc}/bin/*; do - ln -s $bin $toolchain/bin - done - - for bin in ${getBin stdenv.cc.bintools.bintools}/bin/*; do - if ! [ -e "$toolchain/bin/$(basename $bin)" ]; then - ln -s $bin $toolchain/bin - fi - done - - ln -s ${buildPackages.bison}/bin/yacc $toolchain/bin/yacc - ln -s ${buildPackages.bison}/bin/bison $toolchain/bin/bison - ln -s ${buildPackages.flex}/bin/flex $toolchain/bin/flex - ln -s ${buildPackages.flex}/bin/flex++ $toolchain/bin/flex++ - ln -s $toolchain/bin/flex $toolchain/bin/lex - - ln -s ${buildPackages.m4}/bin/m4 $toolchain/bin/m4 - ln -s $toolchain/bin/m4 $toolchain/bin/gm4 - - ln -s ${buildPackages.unifdef}/bin/unifdef $toolchain/bin/unifdef - ln -s ${buildPackages.unifdef}/bin/unifdefall $toolchain/bin/unifdefall - - ln -s ${buildPackages.gperf}/bin/gperf $toolchain/bin/gperf - 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.cctools}/bin/*; do - if ! [ -e "$toolchain/bin/$(basename $bin)" ]; then - ln -s $bin $toolchain/bin - fi - done - - ln -s ${buildPackages.darwin.bootstrap_cmds}/bin/mig $toolchain/bin - mkdir -p $toolchain/libexec - ln -s ${buildPackages.darwin.bootstrap_cmds}/libexec/migcom $toolchain/libexec - ln -s ${mkdep-darwin-src} $toolchain/bin/mkdep -'') diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix deleted file mode 100644 index 9c8c846e5cca..000000000000 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ /dev/null @@ -1,167 +0,0 @@ -{ lib, stdenv, makeWrapper, writeText, writeTextFile, runCommand, callPackage -, CoreServices, ImageIO, CoreGraphics -, xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX" -, xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1" -, sdkVer ? stdenv.targetPlatform.darwinSdkVersion or "10.12" -, productBuildVer ? null -}: - -let - - toolchainName = "com.apple.dt.toolchain.XcodeDefault"; - sdkName = "${xcodePlatform}${sdkVer}"; - xcrunSdkName = lib.toLower xcodePlatform; - - # TODO: expose MACOSX_DEPLOYMENT_TARGET in nix so we can use it here. - sdkBuildVersion = "17E189"; - xcodeSelectVersion = "2349"; - - xcbuild = callPackage ./default.nix { - inherit CoreServices ImageIO CoreGraphics stdenv; - }; - - toolchains = callPackage ./toolchains.nix { - inherit toolchainName stdenv; - }; - - sdks = callPackage ./sdks.nix { - inherit toolchainName sdkName xcodePlatform sdkVer productBuildVer; - }; - - platforms = callPackage ./platforms.nix { - inherit sdks xcodePlatform stdenv; - }; - - xcconfig = writeText "nix.xcconfig" '' - SDKROOT=${sdkName} - ''; - - xcode-select = writeText "xcode-select" '' -#!${stdenv.shell} -while [ $# -gt 0 ]; do - case "$1" in - -h | --help) ;; # noop - -s | --switch) shift;; # noop - -r | --reset) ;; # noop - -v | --version) echo xcode-select version ${xcodeSelectVersion} ;; - -p | -print-path | --print-path) echo @DEVELOPER_DIR@ ;; - --install) ;; # noop - esac - shift -done - ''; - - xcrun = writeTextFile { - name = "xcrun"; - executable = true; - destination = "/bin/xcrun"; - text = '' -#!${stdenv.shell} -args=( "$@" ) - -# If an SDK was requested, check that it matches. -for ((i = 0; i < ''${#args[@]}; i++)); do - case "''${args[i]}" in - --sdk | -sdk) - i=$((i + 1)) - if [[ "''${args[i]}" != '${xcrunSdkName}' ]]; then - echo >&2 "xcodebuild: error: SDK \"''${args[i]}\" cannot be located." - exit 1 - fi - ;; - esac -done - -while [ $# -gt 0 ]; do - case "$1" in - --sdk | -sdk) shift ;; - --toolchain | -toolchain) shift ;; - --find | -find | -f) - shift - command -v $1 || exit 1 ;; - --log | -log) ;; # noop - --verbose | -verbose) ;; # noop - --no-cache | -no-cache) ;; # noop - --kill-cache | -kill-cache) ;; # noop - --show-sdk-path | -show-sdk-path) - echo ${sdks}/${sdkName}.sdk ;; - --show-sdk-platform-path | -show-sdk-platform-path) - echo ${platforms}/${xcodePlatform}.platform ;; - --show-sdk-version | -show-sdk-version) - echo ${sdkVer} ;; - --show-sdk-build-version | -show-sdk-build-version) - echo ${sdkBuildVersion} ;; - *) break ;; - esac - shift -done - -if ! [[ -z "$@" ]]; then - exec "$@" -fi - ''; - checkPhase = '' - ${stdenv.shellDryRun} "$target" - ''; - }; - -in - -runCommand "xcodebuild-${xcbuild.version}" { - nativeBuildInputs = [ makeWrapper ]; - inherit (xcbuild) meta; - - # ensure that the toolchain goes in PATH - propagatedBuildInputs = [ "${toolchains}/XcodeDefault.xctoolchain" ]; - - passthru = { - inherit xcbuild xcrun; - toolchain = "${toolchains}/XcodeDefault.xctoolchain"; - sdk = "${sdks}/${sdkName}"; - platform = "${platforms}/${xcodePlatform}.platform"; - }; - - preferLocalBuild = true; -} '' - mkdir -p $out/bin - - ln -s $out $out/usr - - mkdir -p $out/Library/Xcode - ln -s ${xcbuild}/Library/Xcode/Specifications $out/Library/Xcode/Specifications - - ln -s ${platforms} $out/Platforms - ln -s ${toolchains} $out/Toolchains - - mkdir -p $out/Applications/Xcode.app/Contents - ln -s $out $out/Applications/Xcode.app/Contents/Developer - - # The native xcodebuild command supports an invocation like "xcodebuild -version -sdk" without specifying the specific SDK, so we simulate this by - # detecting this case and simulating the output; printing the header and appending the normal output via appending the sdk version to the positional - # arguments we pass through to the wrapped xcodebuild. - makeWrapper ${xcbuild}/bin/xcodebuild $out/bin/xcodebuild \ - --add-flags "-xcconfig ${xcconfig}" \ - --add-flags "DERIVED_DATA_DIR=." \ - --set DEVELOPER_DIR "$out" \ - --set SDKROOT ${sdkName} \ - --run '[ "$#" -eq 2 ] && [ "$1" = "-version" ] && [ "$2" = "-sdk" ] && echo ${sdkName}.sdk - macOS ${sdkVer} \(macosx${sdkVer}\) && set -- "$@" "${sdkName}"' \ - --run '[ "$1" = "-version" ] && [ "$#" -eq 1 ] && (echo Xcode ${xcodeVer}; echo Build version ${sdkBuildVersion}) && exit 0' \ - --run '[ "$1" = "-license" ] && exit 0' - - substitute ${xcode-select} $out/bin/xcode-select \ - --subst-var-by DEVELOPER_DIR $out/Applications/Xcode.app/Contents/Developer - chmod +x $out/bin/xcode-select - - cp ${xcrun}/bin/xcrun $out/bin/xcrun - - for bin in PlistBuddy actool builtin-copy builtin-copyPlist \ - builtin-copyStrings builtin-copyTiff \ - builtin-embeddedBinaryValidationUtility \ - builtin-infoPlistUtility builtin-lsRegisterURL \ - builtin-productPackagingUtility builtin-validationUtility \ - lsbom plutil; do - ln -s ${xcbuild}/bin/$bin $out/bin/$bin - done - - fixupPhase -'' diff --git a/pkgs/development/tools/xcodes/default.nix b/pkgs/development/tools/xcodes/default.nix deleted file mode 100644 index f2fe98c0d493..000000000000 --- a/pkgs/development/tools/xcodes/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, swift -, swiftpm -, swiftpm2nix -, makeWrapper -, CryptoKit -, LocalAuthentication -, libcompression -, aria2 -}: -let - generated = swiftpm2nix.helpers ./generated; -in -stdenv.mkDerivation (finalAttrs: { - pname = "xcodes"; - version = "1.4.1"; - - src = fetchFromGitHub { - owner = "XcodesOrg"; - repo = "xcodes"; - rev = finalAttrs.version; - hash = "sha256-ARrSQ9ozM90Yg7y4WdU7jjNQ64sXHuhxZh/iNJcFfY0="; - }; - - nativeBuildInputs = [ swift swiftpm makeWrapper ]; - - buildInputs = [ - CryptoKit - LocalAuthentication - libcompression - ]; - - configurePhase = generated.configure; - - installPhase = '' - runHook preInstall - - binPath="$(swiftpmBinPath)" - install -D $binPath/xcodes $out/bin/xcodes - wrapProgram $out/bin/xcodes \ - --prefix PATH : ${lib.makeBinPath [ aria2 ]} - - runHook postInstall - ''; - - meta = with lib; { - changelog = "https://github.com/XcodesOrg/xcodes/releases/tag/${finalAttrs.version}"; - description = "Command-line tool to install and switch between multiple versions of Xcode"; - homepage = "https://github.com/XcodesOrg/xcodes"; - license = with licenses; [ - mit - # unxip - lgpl3Only - ]; - maintainers = with maintainers; [ _0x120581f emilytrau ]; - platforms = platforms.darwin; - }; -}) diff --git a/pkgs/development/tools/xcodes/generated/default.nix b/pkgs/development/tools/xcodes/generated/default.nix deleted file mode 100644 index 32ec081a9380..000000000000 --- a/pkgs/development/tools/xcodes/generated/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was generated by swiftpm2nix. -{ - workspaceStateFile = ./workspace-state.json; - hashes = { - "data" = "1jf2y9dbg1qvxkkabdkihdnr1kmznq79h18j65a7iw1hljdp8hyg"; - "Foundation" = "0hcpc15v38l32qc2sh4gqj909b1f90knln9yz3mfiyf6xi7iy6q7"; - "KeychainAccess" = "0m57pq1vn5qarmlx5x4kfv0yzjylafl3ipih5p60zyfsx6k5b55l"; - "LegibleError" = "08x5agha74chq1z5c7c5r2vasdk81pyl2k085miapd4l3jszz4fj"; - "Path.swift" = "05qk7kwb1254zwdxc3sjc3gprccnv9fwapmy5y6ygxjz8a6jfk83"; - "PromiseKit" = "0vlkd4famjgbd4qs2ldi5aqg13nk77h7ddsdigyxxzgkwgxl076d"; - "Rainbow" = "0iv31azny668vpsjgmldgkgn9cp8i5h9rlc6w5bs8q63nwq19wb0"; - "swift-argument-parser" = "19b4pkcx4xf0iwg0nbr7wvkkbwl6h8sch848gid6l98728glmcw9"; - "SwiftSoup" = "14klizw8jhmxhxays1b1yh4bp0nbb3l4l1pj6sdnf0iqs0wladv8"; - "Version" = "0s5bwr1li6dnsnalfyraq1kzhqmmn9qwp1mld4msrn3q5vvjmql9"; - "Yams" = "11abhcfkmqm3cmh7vp7rqzvxd1zj02j2866a2pp6v9m89456xb76"; - }; -} diff --git a/pkgs/development/tools/xcodes/generated/workspace-state.json b/pkgs/development/tools/xcodes/generated/workspace-state.json deleted file mode 100644 index f13a3a54c6d4..000000000000 --- a/pkgs/development/tools/xcodes/generated/workspace-state.json +++ /dev/null @@ -1,194 +0,0 @@ -{ - "object": { - "artifacts": [], - "dependencies": [ - { - "basedOn": null, - "packageRef": { - "identity": "data", - "kind": "remoteSourceControl", - "location": "https://github.com/xcodereleases/data", - "name": "XcodeReleases" - }, - "state": { - "checkoutState": { - "revision": "fcf527b187817f67c05223676341f3ab69d4214d" - }, - "name": "sourceControlCheckout" - }, - "subpath": "data" - }, - { - "basedOn": null, - "packageRef": { - "identity": "foundation", - "kind": "remoteSourceControl", - "location": "https://github.com/PromiseKit/Foundation.git", - "name": "PMKFoundation" - }, - "state": { - "checkoutState": { - "revision": "985f17fa69ee0e5b7eb3ff9be87ffc4e05fc0927", - "version": "3.4.0" - }, - "name": "sourceControlCheckout" - }, - "subpath": "Foundation" - }, - { - "basedOn": null, - "packageRef": { - "identity": "keychainaccess", - "kind": "remoteSourceControl", - "location": "https://github.com/kishikawakatsumi/KeychainAccess.git", - "name": "KeychainAccess" - }, - "state": { - "checkoutState": { - "revision": "8d33ffd6f74b3bcfc99af759d4204c6395a3f918", - "version": "3.2.1" - }, - "name": "sourceControlCheckout" - }, - "subpath": "KeychainAccess" - }, - { - "basedOn": null, - "packageRef": { - "identity": "legibleerror", - "kind": "remoteSourceControl", - "location": "https://github.com/mxcl/LegibleError.git", - "name": "LegibleError" - }, - "state": { - "checkoutState": { - "revision": "909e9bab3ded97350b28a5ab41dd745dd8aa9710", - "version": "1.0.4" - }, - "name": "sourceControlCheckout" - }, - "subpath": "LegibleError" - }, - { - "basedOn": null, - "packageRef": { - "identity": "path.swift", - "kind": "remoteSourceControl", - "location": "https://github.com/mxcl/Path.swift.git", - "name": "Path.swift" - }, - "state": { - "checkoutState": { - "revision": "dac007e907a4f4c565cfdc55a9ce148a761a11d5", - "version": "0.16.3" - }, - "name": "sourceControlCheckout" - }, - "subpath": "Path.swift" - }, - { - "basedOn": null, - "packageRef": { - "identity": "promisekit", - "kind": "remoteSourceControl", - "location": "https://github.com/mxcl/PromiseKit.git", - "name": "PromiseKit" - }, - "state": { - "checkoutState": { - "revision": "1c296a8637838901d2b01e4c46875ee749506133", - "version": "6.8.5" - }, - "name": "sourceControlCheckout" - }, - "subpath": "PromiseKit" - }, - { - "basedOn": null, - "packageRef": { - "identity": "rainbow", - "kind": "remoteSourceControl", - "location": "https://github.com/onevcat/Rainbow.git", - "name": "Rainbow" - }, - "state": { - "checkoutState": { - "revision": "626c3d4b6b55354b4af3aa309f998fae9b31a3d9", - "version": "3.2.0" - }, - "name": "sourceControlCheckout" - }, - "subpath": "Rainbow" - }, - { - "basedOn": null, - "packageRef": { - "identity": "swift-argument-parser", - "kind": "remoteSourceControl", - "location": "https://github.com/apple/swift-argument-parser", - "name": "swift-argument-parser" - }, - "state": { - "checkoutState": { - "revision": "9f39744e025c7d377987f30b03770805dcb0bcd1", - "version": "1.1.4" - }, - "name": "sourceControlCheckout" - }, - "subpath": "swift-argument-parser" - }, - { - "basedOn": null, - "packageRef": { - "identity": "swiftsoup", - "kind": "remoteSourceControl", - "location": "https://github.com/scinfu/SwiftSoup.git", - "name": "SwiftSoup" - }, - "state": { - "checkoutState": { - "revision": "aeb5b4249c273d1783a5299e05be1b26e061ea81", - "version": "2.0.0" - }, - "name": "sourceControlCheckout" - }, - "subpath": "SwiftSoup" - }, - { - "basedOn": null, - "packageRef": { - "identity": "version", - "kind": "remoteSourceControl", - "location": "https://github.com/mxcl/Version.git", - "name": "Version" - }, - "state": { - "checkoutState": { - "revision": "087c91fedc110f9f833b14ef4c32745dabca8913", - "version": "1.0.3" - }, - "name": "sourceControlCheckout" - }, - "subpath": "Version" - }, - { - "basedOn": null, - "packageRef": { - "identity": "yams", - "kind": "remoteSourceControl", - "location": "https://github.com/jpsim/Yams", - "name": "Yams" - }, - "state": { - "checkoutState": { - "revision": "01835dc202670b5bb90d07f3eae41867e9ed29f6", - "version": "5.0.1" - }, - "name": "sourceControlCheckout" - }, - "subpath": "Yams" - } - ] - }, - "version": 6 -} diff --git a/pkgs/development/tools/xqilla/default.nix b/pkgs/development/tools/xqilla/default.nix deleted file mode 100644 index 4e8e165de634..000000000000 --- a/pkgs/development/tools/xqilla/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, darwin, xercesc }: - -stdenv.mkDerivation rec { - pname = "xqilla"; - version = "2.3.4"; - - src = fetchurl { - url = "mirror://sourceforge/xqilla/XQilla-${version}.tar.gz"; - sha256 = "0m9z7diw7pdyb4qycbqyr2x55s13v8310xsi7yz0inpw27q4vzdd"; - }; - - patches = [ - (fetchpatch { - name = "xqilla-gcc11.patch"; - url = "https://git.pld-linux.org/gitweb.cgi?p=packages/xqilla.git;a=blob_plain;f=xqilla-gcc11.patch;h=c9e28be64097040348f710cb27be5f7dad001112;hb=4efe07397c6fb426a65b2eec6999d3c7e683848a"; - hash = "sha256-enMEF3U+PsbwOQ5SwlRVWc/FpyLS3aK6JgUgOp3ZbiA="; - }) - ]; - - configureFlags = [ - "--with-xerces=${xercesc}" - # code uses register storage specifier - "CXXFLAGS=-std=c++14" - ]; - - buildInputs = [ - xercesc - ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - CoreServices - SystemConfiguration - ]); - - meta = with lib; { - description = "XQuery and XPath 2 library and command line utility written in C++, implemented on top of the Xerces-C library"; - mainProgram = "xqilla"; - license = licenses.asl20 ; - maintainers = with maintainers; [ obadz ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix deleted file mode 100644 index 74d31fbb21f8..000000000000 --- a/pkgs/development/tools/yaml2json/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "yaml2json"; - version = "1.3.3"; - - src = fetchFromGitHub { - owner = "bronze1man"; - repo = "yaml2json"; - rev = "v${version}"; - hash = "sha256-SDKsmK2YVX+LiF0WQyZOQBpcHFVrBurzqf4xItIfmrE="; - }; - - vendorHash = "sha256-g+yaVIx4jxpAQ/+WrGKxhVeliYx7nLQe/zsGpxV4Fn4="; - - subPackages = [ "." ]; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - homepage = "https://github.com/bronze1man/yaml2json"; - description = "Convert yaml to json"; - mainProgram = "yaml2json"; - license = with licenses; [ mit ]; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/yamlfmt/default.nix b/pkgs/development/tools/yamlfmt/default.nix deleted file mode 100644 index 0287fd6f8bd8..000000000000 --- a/pkgs/development/tools/yamlfmt/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, yamlfmt }: - -buildGoModule rec { - pname = "yamlfmt"; - version = "0.13.0"; - - src = fetchFromGitHub { - owner = "google"; - repo = pname; - rev = "v${version}"; - hash = "sha256-B1bRYG7ldewdyK8K2Yy5liQcEqv/3/67cQD8JKp8vQI="; - }; - - vendorHash = "sha256-UfULQw7wAEJjTFp6+ACF5Ki04eFKeUEgmbt1c8pUolA="; - - ldflags = [ - "-s" - "-w" - "-X main.version=${version}" - "-X main.commit=${src.rev}" - ]; - - passthru.tests.version = testers.testVersion { - package = yamlfmt; - }; - - meta = with lib; { - description = "Extensible command line tool or library to format yaml files"; - homepage = "https://github.com/google/yamlfmt"; - license = licenses.asl20; - maintainers = with maintainers; [ sno2wman ]; - mainProgram = "yamlfmt"; - }; -} diff --git a/pkgs/development/tools/yamlpath/default.nix b/pkgs/development/tools/yamlpath/default.nix deleted file mode 100644 index 8bb0fcc8311c..000000000000 --- a/pkgs/development/tools/yamlpath/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, fetchFromGitHub -, hiera-eyaml -, python3 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "yamlpath"; - version = "3.8.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "wwkimball"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-6N2s/LWFa3mgMQ88rt3IaWk+b2PTWfT7z1mi+ioQEyU="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - python-dateutil - ruamel-yaml - ]; - - nativeCheckInputs = with python3.pkgs; [ - hiera-eyaml - mock - pytest-console-scripts - pytestCheckHook - ]; - - preCheck = '' - export PATH=$PATH:$out/bin - ''; - - pythonImportsCheck = [ - "yamlpath" - ]; - - meta = with lib; { - description = "Command-line processors for YAML/JSON/Compatible data"; - homepage = "https://github.com/wwkimball/yamlpath"; - changelog = "https://github.com/wwkimball/yamlpath/releases/tag/v${version}"; - longDescription = '' - Command-line get/set/merge/validate/scan/convert/diff processors for YAML/JSON/Compatible data - using powerful, intuitive, command-line friendly syntax - ''; - license = licenses.isc; - maintainers = with maintainers; [ Flakebi ]; - - # No support for ruamel.yaml > 0.17.21 - # https://github.com/wwkimball/yamlpath/issues/217 - broken = true; - }; -} diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix deleted file mode 100644 index e8bf911a7081..000000000000 --- a/pkgs/development/tools/yarn/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, fetchFromGitHub -, fetchzip -, nodejs -, stdenvNoCC -, testers -, gitUpdater -, withNode ? true -}: - -let - completion = fetchFromGitHub { - owner = "dsifford"; - repo = "yarn-completion"; - rev = "v0.17.0"; - hash = "sha256-z7KPXeYPPRuaEPxgY6YqsLt9n8cSsW3n2FhOzVde1HU="; - }; -in -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "yarn"; - version = "1.22.22"; - - src = fetchzip { - url = "https://github.com/yarnpkg/yarn/releases/download/v${finalAttrs.version}/yarn-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-kFa+kmnBerTB7fY/IvfAFy/4LWvrl9lrRHMOUdOZ+Wg="; - }; - - buildInputs = lib.optionals withNode [ nodejs ]; - - installPhase = '' - mkdir -p $out/{bin,libexec/yarn/,share/bash-completion/completions/} - cp -R . $out/libexec/yarn - ln -s $out/libexec/yarn/bin/yarn.js $out/bin/yarn - ln -s $out/libexec/yarn/bin/yarn.js $out/bin/yarnpkg - ln -s ${completion}/yarn-completion.bash $out/share/bash-completion/completions/yarn.bash - ''; - - passthru = { - tests.version = lib.optionalAttrs withNode (testers.testVersion { - package = finalAttrs.finalPackage; - }); - - updateScript = gitUpdater { - url = "https://github.com/yarnpkg/yarn.git"; - rev-prefix = "v"; - }; - }; - - meta = with lib; { - description = "Fast, reliable, and secure dependency management for javascript"; - homepage = "https://classic.yarnpkg.com/"; - changelog = "https://github.com/yarnpkg/yarn/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = licenses.bsd2; - maintainers = with maintainers; [ offline screendriver ]; - platforms = platforms.all; - mainProgram = "yarn"; - }; -}) diff --git a/pkgs/development/tools/yo/default.nix b/pkgs/development/tools/yo/default.nix deleted file mode 100644 index b3857d44a470..000000000000 --- a/pkgs/development/tools/yo/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "yo"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "yeoman"; - repo = "yo"; - rev = "v${version}"; - hash = "sha256-0UkDANW58OZcEXGAgZ0Omob2AWyO6WszbN1nHLavdsM="; - }; - - npmDepsHash = "sha256-z0ZYrIk7FJXBsZJ72LiBWXJMI7FrCP/EjSTgqis+zIs="; - - dontNpmBuild = true; - - meta = { - description = "CLI tool for running Yeoman generators"; - homepage = "https://github.com/yeoman/yo"; - license = lib.licenses.bsd2; - mainProgram = "yo"; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix deleted file mode 100644 index a2e62c9c00fa..000000000000 --- a/pkgs/development/tools/yq-go/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, runCommand, yq-go }: - -buildGoModule rec { - pname = "yq-go"; - version = "4.44.3"; - - src = fetchFromGitHub { - owner = "mikefarah"; - repo = "yq"; - rev = "v${version}"; - hash = "sha256-bQNa19K4wO2XoSecyfOQKTfHFTxkji1U42bL4k1G7Gg="; - }; - - vendorHash = "sha256-LsunMHKtyAkTAJhqURoAhIIyW//d37ZW4trr+x/Cd8U="; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - installShellCompletion --cmd yq \ - --bash <($out/bin/yq shell-completion bash) \ - --fish <($out/bin/yq shell-completion fish) \ - --zsh <($out/bin/yq shell-completion zsh) - ''; - - passthru.tests = { - simple = runCommand "${pname}-test" { } '' - echo "test: 1" | ${yq-go}/bin/yq eval -j > $out - [ "$(cat $out | tr -d $'\n ')" = '{"test":1}' ] - ''; - }; - - meta = with lib; { - description = "Portable command-line YAML processor"; - homepage = "https://mikefarah.gitbook.io/yq/"; - changelog = "https://github.com/mikefarah/yq/raw/v${version}/release_notes.txt"; - mainProgram = "yq"; - license = [ licenses.mit ]; - maintainers = with maintainers; [ lewo SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix deleted file mode 100644 index 4a3e61fb9059..000000000000 --- a/pkgs/development/tools/ytt/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "ytt"; - version = "0.50.0"; - - src = fetchFromGitHub { - owner = "vmware-tanzu"; - repo = "carvel-ytt"; - rev = "v${version}"; - sha256 = "sha256-57SCBlA2IoBy0iygqunFPBS/nyLtl7e7GlA3vB+ED/4="; - }; - - vendorHash = null; - - nativeBuildInputs = [ installShellFiles ]; - - ldflags = [ - "-X github.com/vmware-tanzu/carvel-ytt/pkg/version.Version=${version}" - ]; - - subPackages = [ "cmd/ytt" ]; - - postInstall = '' - installShellCompletion --cmd ytt \ - --bash <($out/bin/ytt completion bash) \ - --fish <($out/bin/ytt completion fish) \ - --zsh <($out/bin/ytt completion zsh) - ''; - - meta = with lib; { - description = "YAML templating tool that allows configuration of complex software via reusable templates with user-provided values"; - mainProgram = "ytt"; - homepage = "https://get-ytt.io"; - license = licenses.asl20; - maintainers = with maintainers; [ brodes techknowlogick ]; - }; -} diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix deleted file mode 100644 index e865160fb714..000000000000 --- a/pkgs/development/tools/yuicompressor/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre }: - -stdenv.mkDerivation rec { - pname = "yuicompressor"; - version = "2.4.8"; - - src = fetchurl { - url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${pname}-${version}.jar"; - sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre ]; - - buildCommand = '' - mkdir -p $out/{bin,lib} - ln -s $src $out/lib/yuicompressor.jar - makeWrapper ${jre}/bin/java $out/bin/yuicompressor --add-flags \ - "-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor" - ''; - - meta = with lib; { - description = "JavaScript and CSS minifier"; - mainProgram = "yuicompressor"; - homepage = "http://yui.github.io/yuicompressor/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.bsd3; - maintainers = with maintainers; [ jwiegley ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/zed/default.nix b/pkgs/development/tools/zed/default.nix deleted file mode 100644 index a567ce7f474b..000000000000 --- a/pkgs/development/tools/zed/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, testers -, zed -}: - -buildGoModule rec { - pname = "zed"; - version = "1.18.0"; - - src = fetchFromGitHub { - owner = "brimdata"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-NCoeTeOkxkCsj/nRBhMJeEshFuwozOXNJvgp8vyCQDk="; - }; - - vendorHash = "sha256-E9CXS3BQAglJV36BPgwhkb9SswxAj/yBcGqJ+XXwTmE="; - - subPackages = [ "cmd/zed" "cmd/zq" ]; - - ldflags = [ - "-s" - "-w" - "-X=github.com/brimdata/zed/cli.version=${version}" - ]; - - passthru.tests = { - zed-version = testers.testVersion { - package = zed; - }; - zq-version = testers.testVersion { - package = zed; - command = "zq --version"; - }; - }; - - meta = with lib; { - description = "Novel data lake based on super-structured data"; - homepage = "https://zed.brimdata.io"; - changelog = "https://github.com/brimdata/zed/blob/v${version}/CHANGELOG.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ dit7ya knl ]; - }; -} diff --git a/pkgs/development/tools/zld/default.nix b/pkgs/development/tools/zld/default.nix deleted file mode 100644 index af8509103067..000000000000 --- a/pkgs/development/tools/zld/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, lib, fetchzip }: - -stdenv.mkDerivation rec { - pname = "zld"; - version = "1.3.4"; - src = fetchzip { - url = "https://github.com/michaeleisel/zld/releases/download/${version}/zld.zip"; - sha256 = "sha256-w1Pe96sdCbrfYdfBpD0BBXu7cFdW3cpo0PCn1+UyZI8="; - }; - - installPhase = '' - mkdir -p $out/bin - cp zld $out/bin/ - ''; - - meta = with lib; { - description = "Faster version of Apple's linker"; - homepage = "https://github.com/michaeleisel/zld"; - license = licenses.mit; - maintainers = [ maintainers.rgnns ]; - platforms = platforms.darwin; - hydraPlatforms = []; - }; -} diff --git a/pkgs/development/tools/zprint/default.nix b/pkgs/development/tools/zprint/default.nix deleted file mode 100644 index 0d8f66d436f8..000000000000 --- a/pkgs/development/tools/zprint/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, buildGraalvmNativeImage -, fetchurl -, testers -, zprint -}: - -buildGraalvmNativeImage rec { - pname = "zprint"; - version = "1.2.9"; - - src = fetchurl { - url = "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}"; - sha256 = "sha256-4gSGD7Jiu1mqyPMoQrrPT60EFXs7ySfjpT9wSyhp3ig="; - }; - - extraNativeImageBuildArgs = [ - "--no-server" - "-H:EnableURLProtocols=https,http" - "-H:+ReportExceptionStackTraces" - "--report-unsupported-elements-at-runtime" - "--initialize-at-build-time" - "--no-fallback" - ]; - - passthru.tests.version = testers.testVersion { - inherit version; - package = zprint; - command = "zprint --version"; - }; - - meta = with lib; { - description = "Clojure/EDN source code formatter and pretty printer"; - longDescription = '' - Library and command line tool providing a variety of pretty printing capabilities - for both Clojure code and Clojure/EDN structures. It can meet almost anyone's needs. - As such, it supports a number of major source code formatting approaches - ''; - homepage = "https://github.com/kkinnear/zprint"; - license = licenses.mit; - maintainers = with maintainers; [ stelcodes ]; - mainProgram = "zprint"; - }; -} diff --git a/pkgs/development/tools/zsv/default.nix b/pkgs/development/tools/zsv/default.nix deleted file mode 100644 index ee24281798d7..000000000000 --- a/pkgs/development/tools/zsv/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, perl, jq }: - -stdenv.mkDerivation rec { - pname = "zsv"; - version = "0.3.8-alpha"; - - src = fetchFromGitHub { - owner = "liquidaty"; - repo = "zsv"; - rev = "v${version}"; - hash = "sha256-+6oZvMlfLVTDLRlqOpgdZP2YxT6Zlt13wBMFlryBrXY="; - }; - - nativeBuildInputs = [ perl ]; - - buildInputs = [ jq ]; - - configureFlags = [ - "--jq-prefix=${jq.lib}" - ]; - - meta = with lib; { - description = "World's fastest (simd) CSV parser, with an extensible CLI"; - mainProgram = "zsv"; - homepage = "https://github.com/liquidaty/zsv"; - changelog = "https://github.com/liquidaty/zsv/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/web/bloomrpc/default.nix b/pkgs/development/web/bloomrpc/default.nix deleted file mode 100644 index b2f3dbae4a25..000000000000 --- a/pkgs/development/web/bloomrpc/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, fetchurl, appimageTools }: - -let - pname = "bloomrpc"; - version = "1.5.3"; - - src = fetchurl { - url = "https://github.com/uw-labs/${pname}/releases/download/${version}/BloomRPC-${version}.AppImage"; - name = "${pname}-${version}.AppImage"; - hash = "sha512-PebdYDpcplPN5y3mRu1mG6CXenYfYvBXNLgIGEr7ZgKnR5pIaOfJNORSNYSdagdGDb/B1sxuKfX4+4f2cqgb6Q=="; - }; - - appimageContents = appimageTools.extractType2 { - inherit pname src version; - }; -in -appimageTools.wrapType2 { - inherit pname src version; - - profile = '' - export LC_ALL=C.UTF-8 - ''; - - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop - install -m 444 -D ${appimageContents}/${pname}.png \ - $out/share/icons/hicolor/512x512/apps/${pname}.png - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - ''; - - meta = with lib; { - description = "GUI Client for GRPC Services"; - longDescription = '' - Inspired by Postman and GraphQL Playground BloomRPC aims to provide the simplest - and most efficient developer experience for exploring and querying your GRPC services. - ''; - homepage = "https://github.com/uw-labs/bloomrpc"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ zoedsoupe ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/web/boa/default.nix b/pkgs/development/web/boa/default.nix deleted file mode 100644 index 122e0df08aa4..000000000000 --- a/pkgs/development/web/boa/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, fetchpatch -, pkg-config -, bzip2 -, openssl -, zstd -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "boa"; - version = "0.17.3"; - - src = fetchFromGitHub { - owner = "boa-dev"; - repo = "boa"; - rev = "v${version}"; - hash = "sha256-ROzdOanfHNPwHXA0SzU2fpuBonbDbgDqH+ZgOjwK/tg="; - fetchSubmodules = true; - }; - - patches = [ - (fetchpatch { - name = "fix-rust-1.71-lints.patch"; - url = "https://github.com/boa-dev/boa/commit/93d05bda6864aa6ee67682d84bd4fc2108093ef5.patch"; - hash = "sha256-hMp4/UBN5moGBSqf8BJV2nBwgV3cry9uC2fJmdT5hkQ="; - }) - ]; - - cargoHash = "sha256-UIUXayJwTrWbLm1UKnIXy1Df8a7ZoBzdNm/uZ1+H+SQ="; - - cargoBuildFlags = [ "--package" "boa_cli" ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = - [ bzip2 openssl zstd ] - ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - ]; - - env = { ZSTD_SYS_USE_PKG_CONFIG = true; }; - - meta = with lib; { - description = "Embeddable and experimental Javascript engine written in Rust"; - mainProgram = "boa"; - homepage = "https://github.com/boa-dev/boa"; - changelog = "https://github.com/boa-dev/boa/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ mit /* or */ unlicense ]; - maintainers = with maintainers; [ dit7ya ]; - }; -} diff --git a/pkgs/development/web/bootstrap-studio/default.nix b/pkgs/development/web/bootstrap-studio/default.nix deleted file mode 100644 index 50db729bca6e..000000000000 --- a/pkgs/development/web/bootstrap-studio/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, fetchurl, appimageTools }: - -let - pname = "bootstrap-studio"; - version = "6.7.2"; - src = fetchurl { - url = "https://releases.bootstrapstudio.io/${version}/Bootstrap%20Studio.AppImage"; - sha256 = "sha256-t75lmprCWumwt1wNVNWZSHdk1NBSmFqwjDQZHRpBv9g="; - }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname version src; - - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/bstudio.desktop -t $out/share/applications - - substituteInPlace $out/share/applications/bstudio.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - - install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/0x0/apps/bstudio.png \ - $out/share/icons/hicolor/512x512/apps/bstudio.png - ''; - - meta = with lib; { - description = "Drag-and-drop designer for bootstrap"; - homepage = "https://bootstrapstudio.io/"; - license = licenses.unfree; - maintainers = with maintainers; [ khushraj ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix deleted file mode 100644 index c3ff06006b37..000000000000 --- a/pkgs/development/web/bun/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ lib -, stdenvNoCC -, fetchurl -, autoPatchelfHook -, unzip -, installShellFiles -, openssl -, writeShellScript -, curl -, jq -, common-updater-scripts -}: - -stdenvNoCC.mkDerivation rec { - version = "1.1.29"; - pname = "bun"; - - src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); - - strictDeps = true; - nativeBuildInputs = [ unzip installShellFiles ] ++ lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ]; - buildInputs = [ openssl ]; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - install -Dm 755 ./bun $out/bin/bun - ln -s $out/bin/bun $out/bin/bunx - - runHook postInstall - ''; - - postPhases = [ "postPatchelf" ]; - postPatchelf = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' - completions_dir=$(mktemp -d) - - SHELL="bash" $out/bin/bun completions $completions_dir - SHELL="zsh" $out/bin/bun completions $completions_dir - SHELL="fish" $out/bin/bun completions $completions_dir - - installShellCompletion --name bun \ - --bash $completions_dir/bun.completion.bash \ - --zsh $completions_dir/_bun \ - --fish $completions_dir/bun.fish - ''; - - passthru = { - sources = { - "aarch64-darwin" = fetchurl { - url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-RSMuealmdHe7qGFwhK9e51TED3PaCwSqzd4aj2RKMxE="; - }; - "aarch64-linux" = fetchurl { - url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-gY+MDJqDjQamxQsk/CJJVuHsBAfwgrebs/h6nI0HV78="; - }; - "x86_64-darwin" = fetchurl { - url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-j5jpgofGcfjto/3CtBsC4QV411lUGdk2wHwLGmLduo4="; - }; - "x86_64-linux" = fetchurl { - url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-RnKczYB/IkUYVBnRktCFhHsmvObQovVMfCilqJq3q1g="; - }; - }; - updateScript = writeShellScript "update-bun" '' - set -o errexit - export PATH="${lib.makeBinPath [ curl jq common-updater-scripts ]}" - NEW_VERSION=$(curl --silent https://api.github.com/repos/oven-sh/bun/releases/latest | jq '.tag_name | ltrimstr("bun-v")' --raw-output) - if [[ "${version}" = "$NEW_VERSION" ]]; then - echo "The new version same as the old version." - exit 0 - fi - for platform in ${lib.escapeShellArgs meta.platforms}; do - update-source-version "bun" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform" - done - ''; - }; - meta = with lib; { - homepage = "https://bun.sh"; - changelog = "https://bun.sh/blog/bun-v${version}"; - description = "Incredibly fast JavaScript runtime, bundler, transpiler and package manager – all in one"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - longDescription = '' - All in one fast & easy-to-use tool. Instead of 1,000 node_modules for development, you only need bun. - ''; - license = with licenses; [ - mit # bun core - lgpl21Only # javascriptcore and webkit - ]; - mainProgram = "bun"; - maintainers = with maintainers; [ DAlperin jk thilobillerbeck cdmistman coffeeispower diogomdp ]; - platforms = builtins.attrNames passthru.sources; - # Broken for Musl at 2024-01-13, tracking issue: - # https://github.com/NixOS/nixpkgs/issues/280716 - broken = stdenvNoCC.hostPlatform.isMusl; - }; -} diff --git a/pkgs/development/web/cog/default.nix b/pkgs/development/web/cog/default.nix deleted file mode 100644 index e9352822b3bb..000000000000 --- a/pkgs/development/web/cog/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, wayland -, wayland-protocols -, libwpe -, libwpe-fdo -, glib-networking -, webkitgtk -, makeWrapper -, wrapGAppsHook3 -, adwaita-icon-theme -, gdk-pixbuf -}: - -stdenv.mkDerivation rec { - pname = "cog"; - version = "0.8.1"; - - src = fetchFromGitHub { - owner = "igalia"; - repo = "cog"; - rev = "v${version}"; - sha256 = "sha256-eF7rvOjZntcMmn622342yqfp4ksZ6R/FFBT36bYCViE="; - }; - - buildInputs = [ - wayland-protocols - wayland - libwpe - libwpe-fdo - webkitgtk - glib-networking - gdk-pixbuf - adwaita-icon-theme - ]; - - nativeBuildInputs = [ - cmake - pkg-config - wayland - makeWrapper - wrapGAppsHook3 - ]; - - depsBuildsBuild = [ - pkg-config - ]; - - cmakeFlags = [ - "-DCOG_USE_WEBKITGTK=ON" - ]; - - # https://github.com/Igalia/cog/issues/438 - postPatch = '' - substituteInPlace core/cogcore.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ - ''; - - # not ideal, see https://github.com/WebPlatformForEmbedded/libwpe/issues/59 - preFixup = '' - wrapProgram $out/bin/cog \ - --prefix LD_LIBRARY_PATH : ${libwpe-fdo}/lib - ''; - - meta = with lib; { - description = "Small single “window” launcher for the WebKit WPE port"; - license = licenses.mit; - maintainers = [ maintainers.matthewbauer ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index eebb68cc3fbe..2f3b8cf20808 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -4,14 +4,15 @@ , gtk2 , gtk3 , lib +, buildPackages , makeShellWrapper , mesa , nss , stdenv , udev , unzip -, wrapGAppsHook3 , xorg +, darwin }: let @@ -24,6 +25,10 @@ let platform = "linux-arm64"; checksum = "sha256-rB0ak6jYnJMb0aHDLAyhaGoOFK4FXDLEOeofNdW/Wk8="; }; + aarch64-darwin = { + platform = "darwin-arm64"; + checksum = "sha256-L2rhtB/DIK7Qum2YNoWVBn4mf+DA3rbcBUfZEEa/C8c="; + }; }; inherit (stdenv.hostPlatform) system; binary = availableBinaries.${system} or (throw "cypress: No binaries available for system ${system}"); @@ -35,27 +40,47 @@ in stdenv.mkDerivation rec { src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/${platform}/cypress.zip"; sha256 = checksum; + stripRoot = !stdenv.isDarwin; }; # don't remove runtime deps dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook (wrapGAppsHook3.override { makeWrapper = makeShellWrapper; }) unzip makeShellWrapper]; + nativeBuildInputs = + [ + unzip + makeShellWrapper + ] + ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) + ]; + - buildInputs = with xorg; [ + buildInputs = lib.optionals stdenv.isLinux (with xorg; [ libXScrnSaver libXdamage libXtst libxshmfence - ] ++ [ nss gtk2 alsa-lib gtk3 mesa # for libgbm - ]; + ]) ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Cocoa + CoreServices + CoreMedia + CoreAudio + AudioToolbox + AVFoundation + Foundation + ApplicationServices + ]); - runtimeDependencies = [ (lib.getLib udev) ]; + runtimeDependencies = lib.optional stdenv.isLinux (lib.getLib udev); installPhase = '' runHook preInstall @@ -68,11 +93,15 @@ in stdenv.mkDerivation rec { printf '{"version":"%b"}' $version > $out/bin/resources/app/package.json # Cypress now looks for binary_state.json in bin echo '{"verified": true}' > $out/binary_state.json - ln -s $out/opt/cypress/Cypress $out/bin/cypress + ${if stdenv.isDarwin then '' + ln -s $out/opt/cypress/Cypress.app/Contents/MacOS/Cypress $out/bin/cypress + '' else '' + ln -s $out/opt/cypress/Cypress $out/bin/cypress + ''} runHook postInstall ''; - postFixup = '' + postFixup = lib.optionalString (!stdenv.isDarwin) '' # exit with 1 after 25.05 makeWrapper $out/opt/cypress/Cypress $out/bin/Cypress \ --run 'echo "Warning: Use the lowercase cypress executable instead of the capitalized one."' diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix deleted file mode 100644 index c51adf84f6ee..000000000000 --- a/pkgs/development/web/deno/default.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ stdenv -, lib -, callPackage -, fetchFromGitHub -, rustPlatform -, cmake -, protobuf -, installShellFiles -, libiconv -, darwin -, librusty_v8 ? callPackage ./librusty_v8.nix { } -, -}: -rustPlatform.buildRustPackage rec { - pname = "deno"; - version = "1.46.2"; - - src = fetchFromGitHub { - owner = "denoland"; - repo = pname; - rev = "v${version}"; - hash = "sha256-6rmAgGX7BnhbyDk0Pmp1uLBDywlK4cptTOfuvNhm0KE="; - }; - - cargoHash = "sha256-B+O2QYQDH+mqbnJhLumFWnv1b7dvnbpR7JG/3IS5tnI="; - - postPatch = '' - # upstream uses lld on aarch64-darwin for faster builds - # within nix lld looks for CoreFoundation rather than CoreFoundation.tbd and fails - substituteInPlace .cargo/config.toml --replace "-fuse-ld=lld " "" - ''; - - # uses zlib-ng but can't dynamically link yet - # https://github.com/rust-lang/libz-sys/issues/158 - nativeBuildInputs = [ - # required by libz-ng-sys crate - cmake - # required by deno_kv crate - protobuf - installShellFiles - ]; - buildInputs = lib.optionals stdenv.isDarwin ( - [ libiconv darwin.libobjc ] - ++ (with darwin.apple_sdk_11_0.frameworks; [ - Security - CoreServices - Metal - MetalPerformanceShaders - Foundation - QuartzCore - ]) - ); - - # work around "error: unknown warning group '-Wunused-but-set-parameter'" - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unknown-warning-option"; - - buildAndTestSubdir = "cli"; - - # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem - # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE - RUSTY_V8_ARCHIVE = librusty_v8; - - # Tests have some inconsistencies between runs with output integration tests - # Skipping until resolved - doCheck = false; - - preInstall = '' - find ./target -name libswc_common${stdenv.hostPlatform.extensions.sharedLibrary} -delete - ''; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd deno \ - --bash <($out/bin/deno completions bash) \ - --fish <($out/bin/deno completions fish) \ - --zsh <($out/bin/deno completions zsh) - ''; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/deno --help - $out/bin/deno --version | grep "deno ${version}" - runHook postInstallCheck - ''; - - passthru.updateScript = ./update/update.ts; - passthru.tests = callPackage ./tests { }; - - meta = with lib; { - homepage = "https://deno.land/"; - changelog = "https://github.com/denoland/deno/releases/tag/v${version}"; - description = "Secure runtime for JavaScript and TypeScript"; - longDescription = '' - Deno aims to be a productive and secure scripting environment for the modern programmer. - Deno will always be distributed as a single executable. - Given a URL to a Deno program, it is runnable with nothing more than the ~15 megabyte zipped executable. - Deno explicitly takes on the role of both runtime and package manager. - It uses a standard browser-compatible protocol for loading modules: URLs. - Among other things, Deno is a great replacement for utility scripts that may have been historically written with - bash or python. - ''; - license = licenses.mit; - mainProgram = "deno"; - maintainers = with maintainers; [ jk ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - }; -} diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix deleted file mode 100644 index bb9e09d2e2f8..000000000000 --- a/pkgs/development/web/deno/librusty_v8.nix +++ /dev/null @@ -1,23 +0,0 @@ -# auto-generated file -- DO NOT EDIT! -{ lib, stdenv, fetchurl }: - -let - fetch_librusty_v8 = args: fetchurl { - name = "librusty_v8-${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz"; - sha256 = args.shas.${stdenv.hostPlatform.system}; - meta = { - inherit (args) version; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; - }; -in -fetch_librusty_v8 { - version = "0.105.0"; - shas = { - x86_64-linux = "sha256-9yON4DNPxm4IUZSLZp9VZtzSRPPWX1tEuQLVJmN8cLs="; - aarch64-linux = "sha256-5vAjw2vimjCHKPxjIp5vcwMCWUUDYVlk4QyOeEI0DLY="; - x86_64-darwin = "sha256-o4WRkg4ptiJTNMkorn5K+P8xOJwpChM5PqkZCjP076g="; - aarch64-darwin = "sha256-ZuWBnvxu1PgDtjtguxtj3BhFO01AChlbjAS0kZUws3A="; - }; -} diff --git a/pkgs/development/web/deno/tests/basic.ts b/pkgs/development/web/deno/tests/basic.ts deleted file mode 100644 index 5959aa217b3c..000000000000 --- a/pkgs/development/web/deno/tests/basic.ts +++ /dev/null @@ -1 +0,0 @@ -console.log(1 + 1) diff --git a/pkgs/development/web/deno/tests/default.nix b/pkgs/development/web/deno/tests/default.nix deleted file mode 100644 index b6787c913b12..000000000000 --- a/pkgs/development/web/deno/tests/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ deno, runCommand, lib, testers }: -let - testDenoRun = - name: - { args ? "" - , dir ? ./. + "/${name}" - , file ? "index.ts" - , expected ? "" - , expectFailure ? false - }: - let - command = "deno run ${args} ${dir}/${file}"; - in - runCommand "deno-test-${name}" { nativeBuildInputs = [ deno ]; meta.timeout = 60; } '' - HOME=$(mktemp -d) - if output=$(${command} 2>&1); then - if [[ $output =~ '${expected}' ]]; then - echo "Test '${name}' passed" - touch $out - else - echo -n ${lib.escapeShellArg command} >&2 - echo " output did not match what was expected." >&2 - echo "The expected was:" >&2 - echo '${expected}' >&2 - echo "The output was:" >&2 - echo "$output" >&2 - exit 1 - fi - else - if [[ "${toString expectFailure}" == "1" ]]; then - echo "Test '${name}' failed as expected" - touch $out - exit 0 - fi - echo -n ${lib.escapeShellArg command} >&2 - echo " returned a non-zero exit code." >&2 - echo "$output" >&2 - exit 1 - fi - ''; -in -(lib.mapAttrs testDenoRun { - basic = { - dir = ./.; - file = "basic.ts"; - expected = "2"; - }; - import-json = { - expected = "hello from JSON"; - }; - import-ts = { - expected = "hello from ts"; - }; - read-file = { - args = "--allow-read"; - expected = "hello from a file"; - }; - fail-read-file = { - expectFailure = true; - dir = ./read-file; - }; -}) // -{ - version = testers.testVersion { - package = deno; - command = "deno --version"; - }; -} diff --git a/pkgs/development/web/deno/tests/import-json/data.json b/pkgs/development/web/deno/tests/import-json/data.json deleted file mode 100644 index 7f0de9ebe0b9..000000000000 --- a/pkgs/development/web/deno/tests/import-json/data.json +++ /dev/null @@ -1 +0,0 @@ -{ "msg": "hello from JSON" } diff --git a/pkgs/development/web/deno/tests/import-json/index.ts b/pkgs/development/web/deno/tests/import-json/index.ts deleted file mode 100644 index 525f25f74da2..000000000000 --- a/pkgs/development/web/deno/tests/import-json/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -import file from "./data.json" assert { type: "json" }; -console.log(file.msg); diff --git a/pkgs/development/web/deno/tests/import-ts/index.ts b/pkgs/development/web/deno/tests/import-ts/index.ts deleted file mode 100644 index 34fec283a169..000000000000 --- a/pkgs/development/web/deno/tests/import-ts/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { sayHello } from "./lib.ts" - -sayHello("ts") diff --git a/pkgs/development/web/deno/tests/import-ts/lib.ts b/pkgs/development/web/deno/tests/import-ts/lib.ts deleted file mode 100644 index 3b5e05aaaaf3..000000000000 --- a/pkgs/development/web/deno/tests/import-ts/lib.ts +++ /dev/null @@ -1,3 +0,0 @@ -export function sayHello(thing: string) { - console.log(`hello from ${thing}`); -} diff --git a/pkgs/development/web/deno/tests/read-file/data.txt b/pkgs/development/web/deno/tests/read-file/data.txt deleted file mode 100644 index 7eee1b0c107c..000000000000 --- a/pkgs/development/web/deno/tests/read-file/data.txt +++ /dev/null @@ -1 +0,0 @@ -hello from a file diff --git a/pkgs/development/web/deno/tests/read-file/index.ts b/pkgs/development/web/deno/tests/read-file/index.ts deleted file mode 100644 index be792a3d6628..000000000000 --- a/pkgs/development/web/deno/tests/read-file/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -// trim 'file://' prefix -const thisDir = Deno.mainModule.substring(7, Deno.mainModule.length); -const getParent = (path: string) => path.substring(0, path.lastIndexOf("/")) -const text = await Deno.readTextFile(getParent(thisDir) + "/data.txt"); -console.log(text); diff --git a/pkgs/development/web/deno/update/common.ts b/pkgs/development/web/deno/update/common.ts deleted file mode 100644 index a31805269cb2..000000000000 --- a/pkgs/development/web/deno/update/common.ts +++ /dev/null @@ -1,55 +0,0 @@ -interface GHRelease { - tag_name: string; -} - -const decode = (buffer: Uint8Array) => new TextDecoder("utf-8").decode(buffer); -const decodeTrim = (b: Uint8Array) => decode(b).trimEnd(); -export const run = async (command: string, args: string[]) => { - const cmd = Deno.run({ - cmd: [command, ...args], - stdout: "piped", - stderr: "piped", - }); - if (!(await cmd.status()).success) { - const error = await cmd.stderrOutput().then(decodeTrim); - // Known error we can ignore - if (error.includes("'allow-unsafe-native-code-during-evaluation'")) { - // Extract the target sha256 out of the error - const target = " got: sha256:"; - const match = error - .split("\n") - .find((l) => l.includes(target)) - ?.split(target)[1]; - if (typeof match !== "undefined") { - return match; - } - } - throw new Error(error); - } - return cmd.output().then(decodeTrim); -}; - -// Exports -export const versionRegExp = /\d+\.\d+\.\d+/; -export const sha256RegExp = /[a-z0-9]{52}|sha256-.{44}/; - -export const getExistingVersion = async (filePath: string) => - read(filePath).then( - (s) => s.match(genValueRegExp("version", versionRegExp))?.shift() || "", - ); - -export const getLatestVersion = (owner: string, repo: string) => - fetch(`https://api.github.com/repos/${owner}/${repo}/releases`) - .then((res) => res.json()) - .then((res: GHRelease[]) => res[0].tag_name); - -// The (?<=) and (?=) allow replace to only change inside -// Match the regex passed in or empty -export const genValueRegExp = (key: string, regex: RegExp) => - new RegExp(`(?<=${key} = ")(${regex.source}|)(?=")`); - -export const logger = (name: string) => (...a: any) => - console.log(`[${name}]`, ...a); - -export const read = Deno.readTextFile; -export const write = Deno.writeTextFile; diff --git a/pkgs/development/web/deno/update/librusty_v8.ts b/pkgs/development/web/deno/update/librusty_v8.ts deleted file mode 100644 index 301af63cb99b..000000000000 --- a/pkgs/development/web/deno/update/librusty_v8.ts +++ /dev/null @@ -1,89 +0,0 @@ -import * as toml from "https://deno.land/std@0.202.0/toml/mod.ts"; -import { getExistingVersion, logger, run, write } from "./common.ts"; - -const log = logger("librusty_v8"); - -export interface Architecture { - nix: string; - rust: string; -} -interface PrefetchResult { - arch: Architecture; - sha256: string; -} - -const getCargoLock = async ( - owner: string, - repo: string, - version: string, -) => - fetch(`https://github.com/${owner}/${repo}/raw/${version}/Cargo.lock`) - .then((res) => res.text()) - .then((txt) => toml.parse(txt)); - -const fetchArchShaTasks = (version: string, arches: Architecture[]) => - arches.map( - async (arch: Architecture): Promise<PrefetchResult> => { - log("Fetching:", arch.nix); - const sha256 = await run("nix-prefetch", [ - ` -{ fetchurl }: -fetchurl { - url = "https://github.com/denoland/rusty_v8/releases/download/v${version}/librusty_v8_release_${arch.rust}.a.gz"; -} -`, - ]); - log("Done: ", arch.nix); - return { arch, sha256 }; - }, - ); - -const templateDeps = (version: string, deps: PrefetchResult[]) => - `# auto-generated file -- DO NOT EDIT! -{ lib, stdenv, fetchurl }: - -let - fetch_librusty_v8 = args: fetchurl { - name = "librusty_v8-\${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v\${args.version}/librusty_v8_release_\${stdenv.hostPlatform.rust.rustcTarget}.a.gz"; - sha256 = args.shas.\${stdenv.hostPlatform.system}; - meta = { - inherit (args) version; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; - }; -in -fetch_librusty_v8 { - version = "${version}"; - shas = { -${deps.map(({ arch, sha256 }) => ` ${arch.nix} = "${sha256}";`).join("\n")} - }; -} -`; - -export async function updateLibrustyV8( - filePath: string, - owner: string, - repo: string, - denoVersion: string, - arches: Architecture[], -) { - log("Starting librusty_v8 update"); - // 0.0.0 - const cargoLockData = await getCargoLock(owner, repo, denoVersion); - console.log(cargoLockData); - const packageItem = cargoLockData.package.find(({ name }) => name === "v8"); - const version = packageItem.version; - if (typeof version !== "string") { - throw "no librusty_v8 version"; - } - log("librusty_v8 version:", version); - const existingVersion = await getExistingVersion(filePath); - if (version === existingVersion) { - log("Version already matches latest, skipping..."); - return; - } - const archShaResults = await Promise.all(fetchArchShaTasks(version, arches)); - await write(filePath, templateDeps(version, archShaResults)); - log("Finished deps update"); -} diff --git a/pkgs/development/web/deno/update/src.ts b/pkgs/development/web/deno/update/src.ts deleted file mode 100644 index 20793a7178fa..000000000000 --- a/pkgs/development/web/deno/update/src.ts +++ /dev/null @@ -1,67 +0,0 @@ -import { - genValueRegExp, - logger, - read, - run, - sha256RegExp, - versionRegExp, - write, -} from "./common.ts"; - -interface Replacer { - regex: RegExp; - value: string; -} - -const log = logger("src"); - -const prefetchHash = (nixpkgs: string, version: string) => - run("nix-prefetch", ["-f", nixpkgs, "deno.src", "--rev", version]); -const prefetchCargoHash = (nixpkgs: string) => - run( - "nix-prefetch", - [`{ sha256 }: (import ${nixpkgs} {}).deno.cargoDeps.overrideAttrs (_: { hash = sha256; })`], - ); - -const replace = (str: string, replacers: Replacer[]) => - replacers.reduce( - (str, r) => str.replace(r.regex, r.value), - str, - ); - -const updateNix = (filePath: string, replacers: Replacer[]) => - read(filePath).then((str) => write(filePath, replace(str, replacers))); - -const genVerReplacer = (k: string, value: string): Replacer => ( - { regex: genValueRegExp(k, versionRegExp), value } -); -const genShaReplacer = (k: string, value: string): Replacer => ( - { regex: genValueRegExp(k, sha256RegExp), value } -); - -export async function updateSrc( - filePath: string, - nixpkgs: string, - denoVersion: string, -) { - log("Starting src update"); - const trimVersion = denoVersion.substring(1); - log("Fetching hash for:", trimVersion); - const sha256 = await prefetchHash(nixpkgs, denoVersion); - log("sha256 to update:", sha256); - await updateNix( - filePath, - [ - genVerReplacer("version", trimVersion), - genShaReplacer("hash", sha256), - ], - ); - log("Fetching cargoHash for:", sha256); - const cargoHash = await prefetchCargoHash(nixpkgs); - log("cargoHash to update:", cargoHash); - await updateNix( - filePath, - [genShaReplacer("cargoHash", cargoHash)], - ); - log("Finished src update"); -} diff --git a/pkgs/development/web/deno/update/update.ts b/pkgs/development/web/deno/update/update.ts deleted file mode 100755 index 27e1d86ee861..000000000000 --- a/pkgs/development/web/deno/update/update.ts +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env nix-shell -/* -#!nix-shell -i "deno run --allow-net --allow-run --allow-read --allow-write" -p deno git nix-prefetch -*/ -import { getExistingVersion, getLatestVersion, logger } from "./common.ts"; -import { Architecture, updateLibrustyV8 } from "./librusty_v8.ts"; -import { updateSrc } from "./src.ts"; - -const log = logger("update"); -// TODO: Getting current file position to more-safely point to nixpkgs root -const nixpkgs = Deno.cwd(); -// TODO: Read values from default.nix -const owner = "denoland"; -const repo = "deno"; -const denoDir = `${nixpkgs}/pkgs/development/web/${repo}`; -const src = `${denoDir}/default.nix`; -const librusty_v8 = `${denoDir}/librusty_v8.nix`; -const architectures: Architecture[] = [ - { nix: "x86_64-linux", rust: "x86_64-unknown-linux-gnu" }, - { nix: "aarch64-linux", rust: "aarch64-unknown-linux-gnu" }, - { nix: "x86_64-darwin", rust: "x86_64-apple-darwin" }, - { nix: "aarch64-darwin", rust: "aarch64-apple-darwin" }, -]; - -log("Updating deno"); - -log("Getting latest deno version"); -const version = await getLatestVersion(owner, repo); -const existingVersion = await getExistingVersion(src); -const trimVersion = version.substr(1); // Strip v from v0.0.0 -log("Latest version: ", trimVersion); -log("Extracted version:", existingVersion); -if (trimVersion === existingVersion) { - log("Version already matches latest, skipping..."); - Deno.exit(0); -} - -const tasks = [ - updateSrc(src, nixpkgs, version), - updateLibrustyV8(librusty_v8, owner, repo, version, architectures), -]; -await Promise.all(tasks); -log("Updating deno complete"); diff --git a/pkgs/development/web/edge-runtime/Cargo.lock b/pkgs/development/web/edge-runtime/Cargo.lock deleted file mode 100644 index 6f3f1aa872b0..000000000000 --- a/pkgs/development/web/edge-runtime/Cargo.lock +++ /dev/null @@ -1,7119 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" -dependencies = [ - "lazy_static", - "regex", -] - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aead" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" -dependencies = [ - "crypto-common", - "generic-array", -] - -[[package]] -name = "aead-gcm-stream" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a09ecb526d53de2842cc876ee5c9b51161ee60399edeca4cf74892a01b48177" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - -[[package]] -name = "aes" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" -dependencies = [ - "cfg-if 1.0.0", - "cipher", - "cpufeatures", -] - -[[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 = "aes-kw" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69fa2b352dcefb5f7f3a5fb840e02665d311d878955380515e4fd50095dd3d8c" -dependencies = [ - "aes", -] - -[[package]] -name = "ahash" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff" -dependencies = [ - "cfg-if 1.0.0", - "once_cell", - "version_check 0.9.4", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[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.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[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", -] - -[[package]] -name = "anstream" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" - -[[package]] -name = "approx" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278" -dependencies = [ - "num-traits", -] - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -dependencies = [ - "serde", -] - -[[package]] -name = "ash" -version = "0.37.3+1.3.251" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" -dependencies = [ - "libloading 0.7.4", -] - -[[package]] -name = "asn1-rs" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" -dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", - "displaydoc", - "nom 7.1.3", - "num-traits", - "rusticata-macros", - "thiserror", - "time", -] - -[[package]] -name = "asn1-rs-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 1.0.109", - "synstructure", -] - -[[package]] -name = "asn1-rs-impl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "ast_node" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e3e06ec6ac7d893a0db7127d91063ad7d9da8988f8a1a256f03729e6eec026" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "async-compression" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" -dependencies = [ - "brotli", - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-trait" -version = "0.1.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "async-tungstenite" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef0f8d64ef9351752fbe5462f242c625d9c4910d2bc3f7ec44c43857ca123f5d" -dependencies = [ - "futures-io", - "futures-util", - "log", - "pin-project-lite", - "tungstenite", -] - -[[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 = "auto_impl" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "823b8bb275161044e2ac7a25879cb3e2480cb403e3943022c7c769c599b756aa" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "async-tungstenite", - "bytes", - "cityhash", - "cooked-waker", - "cpu_timer", - "ctor", - "deno_ast", - "deno_broadcast_channel", - "deno_canvas", - "deno_config", - "deno_console", - "deno_core", - "deno_crypto", - "deno_fetch", - "deno_fs", - "deno_http", - "deno_io", - "deno_net", - "deno_npm", - "deno_semver", - "deno_tls", - "deno_url", - "deno_web", - "deno_webgpu", - "deno_webidl", - "deno_websocket", - "enum-as-inner 0.6.0", - "eszip", - "event_worker", - "fastwebsockets 0.4.4", - "flume", - "futures-util", - "http 0.2.11", - "http_utils", - "httparse", - "hyper 0.14.28", - "import_map", - "log", - "monch", - "notify", - "once_cell", - "pin-project", - "reqwest", - "rustls-pemfile 2.1.0", - "sb_ai", - "sb_core", - "sb_env", - "sb_fs", - "sb_graph", - "sb_module_loader", - "sb_node", - "sb_npm", - "sb_os", - "sb_workers", - "scopeguard", - "serde", - "serial_test", - "thiserror", - "tls-listener", - "tokio", - "tokio-rustls 0.25.0", - "tokio-util", - "tungstenite", - "url", - "urlencoding", - "uuid", -] - -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - -[[package]] -name = "base32" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" - -[[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-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 = "better_scoped_tls" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794edcc9b3fb07bb4aecaa11f093fd45663b4feadb782d68303a2268bc2701de" -dependencies = [ - "scoped-tls", -] - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bindgen" -version = "0.49.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c07087f3d5731bf3fb375a81841b99597e25dc11bd3bc72d16d43adf6624a6e" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "cfg-if 0.1.10", - "clang-sys", - "clap 2.34.0", - "env_logger 0.6.2", - "fxhash", - "lazy_static", - "log", - "peeking_take_while", - "proc-macro2 0.4.30", - "quote 0.6.13", - "regex", - "shlex", - "which 2.0.1", -] - -[[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.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" -dependencies = [ - "serde", -] - -[[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" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-padding" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" -dependencies = [ - "generic-array", -] - -[[package]] -name = "brotli" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "bytemuck" -version = "1.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - -[[package]] -name = "cache_control" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf2a5fb3207c12b5d208ebc145f967fea5cac41a021c37417ccc31ba40f39ee" - -[[package]] -name = "cauchy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff11ddd2af3b5e80dd0297fee6e56ac038d9bdc549573cdb51bd6d2efe7f05e" -dependencies = [ - "num-complex", - "num-traits", - "rand", - "serde", -] - -[[package]] -name = "cbc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" -dependencies = [ - "cipher", -] - -[[package]] -name = "cblas-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6feecd82cce51b0204cf063f0041d69f24ce83f680d87514b004248e7b0fa65" -dependencies = [ - "libc", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cexpr" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d" -dependencies = [ - "nom 4.2.3", -] - -[[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.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" -dependencies = [ - "iana-time-zone", - "num-integer", - "num-traits", - "winapi", -] - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "cityhash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7ecb82e5b6394ea8408bc8f454d50c75f339ca89f9af90a6ff8694e6a1c63da" -dependencies = [ - "bindgen", - "cc", - "clap 2.34.0", - "libc", -] - -[[package]] -name = "clang-sys" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853" -dependencies = [ - "glob", - "libc", - "libloading 0.5.2", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "term_size", - "textwrap", - "unicode-width", - "vec_map", - "yaml-rust", -] - -[[package]] -name = "clap" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" -dependencies = [ - "clap_builder", -] - -[[package]] -name = "clap_builder" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim 0.11.0", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "cli" -version = "0.1.0" -dependencies = [ - "anyhow", - "base", - "clap 4.5.0", - "deno_core", - "dotenv-build", - "env_logger 0.10.2", - "glob", - "log", - "sb_graph", - "tokio", - "tracing-subscriber", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "cooked-waker" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147be55d677052dabc6b22252d5dd0fd4c29c8c27aa4f2fbef0f94aa003b406f" - -[[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 = "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 = "cpu_timer" -version = "0.1.0" -dependencies = [ - "anyhow", - "ctor", - "futures", - "libc", - "log", - "nix", - "once_cell", - "signal-hook", - "signal-hook-tokio", - "tokio", -] - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "crc" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49fc9a695bca7f35f5f4c15cddc84415f66a74ea78eef08e90c5024f2b540e23" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403" - -[[package]] -name = "crc32fast" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" -dependencies = [ - "cfg-if 1.0.0", -] - -[[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-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[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.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" -dependencies = [ - "generic-array", - "rand_core", - "subtle", - "zeroize", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "rand_core", - "typenum", -] - -[[package]] -name = "ctor" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" -dependencies = [ - "quote 1.0.35", - "syn 2.0.48", -] - -[[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 = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "curve25519-dalek-derive", - "fiat-crypto", - "platforms", - "rustc_version 0.4.0", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "d3d12" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" -dependencies = [ - "bitflags 2.4.2", - "libloading 0.8.1", - "winapi", -] - -[[package]] -name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2 1.0.78", - "quote 1.0.35", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if 1.0.0", - "hashbrown 0.14.3", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "data-encoding" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" - -[[package]] -name = "data-url" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" - -[[package]] -name = "debugid" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" -dependencies = [ - "serde", - "uuid", -] - -[[package]] -name = "deno_ast" -version = "0.32.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa239d4d69bb6c61bd73e0fc23e3688c7e87e1f47f2f37f4cff7a0080017299" -dependencies = [ - "anyhow", - "base64 0.21.7", - "deno_media_type", - "dprint-swc-ext", - "serde", - "swc_atoms", - "swc_bundler", - "swc_common", - "swc_config", - "swc_config_macro", - "swc_ecma_ast", - "swc_ecma_codegen", - "swc_ecma_codegen_macros", - "swc_ecma_dep_graph", - "swc_ecma_loader", - "swc_ecma_parser", - "swc_ecma_transforms_base", - "swc_ecma_transforms_classes", - "swc_ecma_transforms_macros", - "swc_ecma_transforms_optimization", - "swc_ecma_transforms_proposal", - "swc_ecma_transforms_react", - "swc_ecma_transforms_typescript", - "swc_ecma_utils", - "swc_ecma_visit", - "swc_eq_ignore_macros", - "swc_graph_analyzer", - "swc_macros_common", - "swc_visit", - "swc_visit_macros", - "text_lines", - "url", -] - -[[package]] -name = "deno_broadcast_channel" -version = "0.130.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d0a2bcd833ba9aa02337c79108124a53e40b6491d78bb0588772fd62059c02" -dependencies = [ - "async-trait", - "deno_core", - "tokio", - "uuid", -] - -[[package]] -name = "deno_cache_dir" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbb245d9a3719b5eb2b5195aaaa25108c3c93d1762b181a20fb1af1c7703eaf" -dependencies = [ - "anyhow", - "deno_media_type", - "indexmap 2.2.3", - "log", - "once_cell", - "parking_lot", - "ring", - "serde", - "serde_json", - "thiserror", - "url", -] - -[[package]] -name = "deno_canvas" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cefb86183b4156b4222f128be746c5c96e3528e95eedc6f819f3cd57ecf7b3e" -dependencies = [ - "deno_core", - "deno_webgpu", - "image", - "serde", - "tokio", -] - -[[package]] -name = "deno_config" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aca0a5b9d2693efb14c8c80d66a052464f24cbf6b3473648037e282c0c616917" -dependencies = [ - "anyhow", - "glob", - "indexmap 2.2.3", - "jsonc-parser", - "log", - "percent-encoding", - "serde", - "serde_json", - "url", -] - -[[package]] -name = "deno_console" -version = "0.136.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598ab6c4aeb4bd4e3e31d90b8f6dd772f25ed92fc979ff12c641074ef4553030" -dependencies = [ - "deno_core", -] - -[[package]] -name = "deno_core" -version = "0.256.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd5997286bcc46199bbae727f43ee65cf4bd073ac2d240a36a6ceae3bfab14ac" -dependencies = [ - "anyhow", - "bit-set", - "bit-vec", - "bytes", - "cooked-waker", - "deno_core_icudata", - "deno_ops", - "deno_unsync", - "futures", - "libc", - "log", - "memoffset 0.9.0", - "parking_lot", - "pin-project", - "serde", - "serde_json", - "serde_v8", - "smallvec", - "sourcemap 7.0.1", - "static_assertions", - "tokio", - "url", - "v8", -] - -[[package]] -name = "deno_core_icudata" -version = "0.0.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13951ea98c0a4c372f162d669193b4c9d991512de9f2381dd161027f34b26b1" - -[[package]] -name = "deno_crypto" -version = "0.150.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe3cc83b7fe945183ef27be203c54276abef9fbda4844722f10e0af341a316fd" -dependencies = [ - "aes", - "aes-gcm", - "aes-kw", - "base64 0.21.7", - "cbc", - "const-oid", - "ctr", - "curve25519-dalek", - "deno_core", - "deno_web", - "elliptic-curve", - "num-traits", - "once_cell", - "p256", - "p384", - "p521", - "rand", - "ring", - "rsa", - "serde", - "serde_bytes", - "sha1", - "sha2", - "signature", - "spki", - "tokio", - "uuid", - "x25519-dalek", -] - -[[package]] -name = "deno_fetch" -version = "0.160.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5860515fb73057028018761e937edc4c910207d40d9d9721bb0bb1dfc355fb54" -dependencies = [ - "bytes", - "data-url", - "deno_core", - "deno_tls", - "dyn-clone", - "http 0.2.11", - "pin-project", - "reqwest", - "serde", - "serde_json", - "tokio", - "tokio-util", -] - -[[package]] -name = "deno_fs" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3eae95f88e4c5a348586b0f9d0d6f3e94aa89c6457f299d9cefed7f1ad4a30" -dependencies = [ - "async-trait", - "deno_core", - "deno_io", - "filetime", - "fs3", - "libc", - "log", - "nix", - "rand", - "rayon", - "serde", - "tokio", - "winapi", -] - -[[package]] -name = "deno_graph" -version = "0.64.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0eb6ad784fa5885867ba00e0db8ddcb2d98a4a0234fe336d50a13092e268c44" -dependencies = [ - "anyhow", - "async-trait", - "data-url", - "deno_ast", - "deno_semver", - "encoding_rs", - "futures", - "import_map", - "indexmap 2.2.3", - "log", - "monch", - "once_cell", - "parking_lot", - "regex", - "serde", - "serde_json", - "thiserror", - "url", -] - -[[package]] -name = "deno_http" -version = "0.133.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94007415787d966f964fb2c46ce81721a9de3a23943f22935dae9c56dfad77ec" -dependencies = [ - "async-compression", - "async-trait", - "base64 0.21.7", - "brotli", - "bytes", - "cache_control", - "deno_core", - "deno_net", - "deno_websocket", - "flate2", - "http 0.2.11", - "http 1.0.0", - "httparse", - "hyper 0.14.28", - "hyper 1.1.0", - "hyper-util", - "itertools 0.10.5", - "memmem", - "mime", - "once_cell", - "percent-encoding", - "phf", - "pin-project", - "ring", - "scopeguard", - "serde", - "smallvec", - "thiserror", - "tokio", - "tokio-util", -] - -[[package]] -name = "deno_io" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "484a121382c19f70413bb43c4a1d79a8feab6f84edd0efaaee28ef4ea3a70926" -dependencies = [ - "async-trait", - "deno_core", - "filetime", - "fs3", - "once_cell", - "tokio", - "winapi", -] - -[[package]] -name = "deno_lockfile" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f348633cc4425b2a9011436e256b1ae8f6c8026ec2705d852baee8643dc5562" -dependencies = [ - "ring", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "deno_media_type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a798670c20308e5770cc0775de821424ff9e85665b602928509c8c70430b3ee0" -dependencies = [ - "data-url", - "serde", - "url", -] - -[[package]] -name = "deno_native_certs" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4785d0bdc13819b665b71e4fb7e119d859568471e4c245ec5610857e70c9345" -dependencies = [ - "dlopen2", - "dlopen2_derive", - "once_cell", - "rustls-native-certs", - "rustls-pemfile 1.0.4", -] - -[[package]] -name = "deno_net" -version = "0.128.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342543e781289ca794756301f4ea9e08185ecc63843c135c719b5a29f51857" -dependencies = [ - "deno_core", - "deno_tls", - "enum-as-inner 0.5.1", - "log", - "pin-project", - "rustls-tokio-stream", - "serde", - "socket2", - "tokio", - "trust-dns-proto", - "trust-dns-resolver", -] - -[[package]] -name = "deno_npm" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "376262760b173ff01f8f5d05d58a64f6d863472396afb5582590fa0949342854" -dependencies = [ - "anyhow", - "async-trait", - "deno_lockfile", - "deno_semver", - "futures", - "log", - "monch", - "serde", - "thiserror", -] - -[[package]] -name = "deno_ops" -version = "0.132.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02163d08afdd6fcf21e37c399c7425987c7170203a853052a800e80c91c2e87b" -dependencies = [ - "proc-macro-rules", - "proc-macro2 1.0.78", - "quote 1.0.35", - "strum", - "strum_macros", - "syn 2.0.48", - "thiserror", -] - -[[package]] -name = "deno_semver" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b49e14effd9df8ed261f7a1a34ac19bbaf0fa940c59bd19a6d8313cf41525e1c" -dependencies = [ - "monch", - "once_cell", - "serde", - "thiserror", - "url", -] - -[[package]] -name = "deno_tls" -version = "0.123.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "334380ef454db2148df9aba7541bc8250bb4e6fb183ece9fdb293be0462eb7ad" -dependencies = [ - "deno_core", - "deno_native_certs", - "once_cell", - "rustls 0.21.11", - "rustls-pemfile 1.0.4", - "rustls-webpki 0.101.7", - "serde", - "webpki-roots", -] - -[[package]] -name = "deno_unsync" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30dff7e03584dbae188dae96a0f1876740054809b2ad0cf7c9fc5d361f20e739" -dependencies = [ - "tokio", -] - -[[package]] -name = "deno_url" -version = "0.136.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7978221ce33221ac7a18b649a5a18fe7983fbe2fddf5a6959fc672089c10f9a9" -dependencies = [ - "deno_core", - "serde", - "urlpattern", -] - -[[package]] -name = "deno_web" -version = "0.167.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67d78f50e55155b77abbf8fa6bdc24f68442c91742e03b67b66cc258f4b31cd1" -dependencies = [ - "async-trait", - "base64-simd", - "bytes", - "deno_core", - "encoding_rs", - "flate2", - "futures", - "serde", - "tokio", - "uuid", - "windows-sys 0.48.0", -] - -[[package]] -name = "deno_webgpu" -version = "0.103.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef171e8bc24e2c3e6934543784832fb5c3b29f0385f23ff604fc84c103d1283" -dependencies = [ - "deno_core", - "raw-window-handle", - "serde", - "tokio", - "wgpu-core", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "deno_webidl" -version = "0.136.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41eff4e69896e0f7fc432271c369052efd1d0b57a3d352688e2df800d1aa8dd9" -dependencies = [ - "deno_core", -] - -[[package]] -name = "deno_websocket" -version = "0.141.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "370c0f3137a37362a4737b92a4838ce2e848ee1a99ca7a4fc840293d15d841c4" -dependencies = [ - "bytes", - "deno_core", - "deno_net", - "deno_tls", - "fastwebsockets 0.6.0", - "h2 0.4.4", - "http 1.0.0", - "http-body-util", - "hyper 1.1.0", - "hyper-util", - "once_cell", - "rustls-tokio-stream", - "serde", - "tokio", -] - -[[package]] -name = "deno_webstorage" -version = "0.131.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cec9b81da6c28b78b801f995b167e021c9a0f8364080cabbd5eead7112be0032" -dependencies = [ - "deno_core", - "deno_web", - "rusqlite", - "serde", -] - -[[package]] -name = "deno_whoami" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e75e4caa92b98a27f09c671d1399aee0f5970aa491b9a598523aac000a2192e3" -dependencies = [ - "libc", - "whoami", -] - -[[package]] -name = "der" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" -dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", -] - -[[package]] -name = "der-parser" -version = "8.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" -dependencies = [ - "asn1-rs", - "displaydoc", - "nom 7.1.3", - "num-bigint", - "num-traits", - "rusticata-macros", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "derive_builder" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" -dependencies = [ - "darling", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 1.0.109", -] - -[[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", - "syn 1.0.109", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2 1.0.78", - "quote 1.0.35", - "rustc_version 0.4.0", - "syn 1.0.109", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "const-oid", - "crypto-common", - "subtle", -] - -[[package]] -name = "displaydoc" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "dlopen2" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bc2c7ed06fd72a8513ded8d0d2f6fd2655a85d6885c48cae8625d80faf28c03" -dependencies = [ - "dlopen2_derive", - "libc", - "once_cell", - "winapi", -] - -[[package]] -name = "dlopen2_derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "dotenv-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4547f16c17f6051a12cdb8c62b803f94bee6807c74aa7c530b30b737df981fc" - -[[package]] -name = "dprint-swc-ext" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2f24ce6b89a06ae3eb08d5d4f88c05d0aef1fa58e2eba8dd92c97b84210c25" -dependencies = [ - "bumpalo", - "num-bigint", - "rustc-hash", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_parser", - "text_lines", -] - -[[package]] -name = "dsa" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48bc224a9084ad760195584ce5abb3c2c34a225fa312a128ad245a6b412b7689" -dependencies = [ - "digest", - "num-bigint-dig", - "num-traits", - "pkcs8", - "rfc6979", - "sha2", - "signature", - "zeroize", -] - -[[package]] -name = "dyn-clone" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" - -[[package]] -name = "ecb" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a8bfa975b1aec2145850fcaa1c6fe269a16578c44705a532ae3edc92b8881c7" -dependencies = [ - "cipher", -] - -[[package]] -name = "ecdsa" -version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" -dependencies = [ - "der", - "digest", - "elliptic-curve", - "rfc6979", - "signature", - "spki", -] - -[[package]] -name = "either" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "elliptic-curve" -version = "0.13.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" -dependencies = [ - "base16ct", - "crypto-bigint", - "digest", - "ff", - "generic-array", - "group", - "hkdf", - "pem-rfc7468", - "pkcs8", - "rand_core", - "sec1", - "subtle", - "zeroize", -] - -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "enum-as-inner" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" -dependencies = [ - "heck", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "enum-as-inner" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" -dependencies = [ - "heck", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "env_logger" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" -dependencies = [ - "atty", - "humantime 1.3.0", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "env_logger" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" -dependencies = [ - "humantime 2.1.0", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.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 = "esaxx-rs" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" - -[[package]] -name = "eszip" -version = "0.60.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a060f8bb81229bd98c26e1c0efc066be2460558ee9187e73e40a89bd2c949f06" -dependencies = [ - "anyhow", - "base64 0.21.7", - "deno_ast", - "deno_graph", - "deno_npm", - "deno_semver", - "futures", - "hashlink", - "serde", - "serde_json", - "sha2", - "thiserror", - "url", -] - -[[package]] -name = "event_worker" -version = "0.1.0" -dependencies = [ - "anyhow", - "deno_core", - "log", - "serde", - "strum", - "tokio", - "uuid", -] - -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", -] - -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "faster-hex" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" -dependencies = [ - "serde", -] - -[[package]] -name = "fastwebsockets" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6185b6dc9dddc4db0dedd2e213047e93bcbf7a0fb092abc4c4e4f3195efdb4" -dependencies = [ - "base64 0.21.7", - "hyper 0.14.28", - "pin-project", - "rand", - "sha1", - "simdutf8", - "thiserror", - "tokio", - "utf-8", -] - -[[package]] -name = "fastwebsockets" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63dd7b57f9b33b1741fa631c9522eb35d43e96dcca4a6a91d5e4ca7c93acdc1" -dependencies = [ - "base64 0.21.7", - "http-body-util", - "hyper 1.1.0", - "hyper-util", - "pin-project", - "rand", - "sha1", - "simdutf8", - "thiserror", - "tokio", - "utf-8", -] - -[[package]] -name = "fdeflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "ff" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" -dependencies = [ - "rand_core", - "subtle", -] - -[[package]] -name = "fiat-crypto" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" - -[[package]] -name = "filetime" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "windows-sys 0.52.0", -] - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flate2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "spin 0.9.8", -] - -[[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.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[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 = "from_variant" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a0b11eeb173ce52f84ebd943d42e58813a2ebb78a6a3ff0a243b71c5199cd7b" -dependencies = [ - "proc-macro2 1.0.78", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "fs3" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb17cf6ed704f72485332f6ab65257460c4f9f3083934cf402bf9f5b3b600a90" -dependencies = [ - "libc", - "rustc_version 0.2.3", - "winapi", -] - -[[package]] -name = "fslock" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" -dependencies = [ - "libc", - "winapi", -] - -[[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 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[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-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 = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check 0.9.4", - "zeroize", -] - -[[package]] -name = "getrandom" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "ghash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" -dependencies = [ - "opaque-debug", - "polyval", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "gl_generator" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" -dependencies = [ - "khronos_api", - "log", - "xml-rs", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "glow" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "glutin_wgl_sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" -dependencies = [ - "gl_generator", -] - -[[package]] -name = "gpu-alloc" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" -dependencies = [ - "bitflags 2.4.2", - "gpu-alloc-types", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" -dependencies = [ - "bitflags 2.4.2", -] - -[[package]] -name = "gpu-allocator" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40fe17c8a05d60c38c0a4e5a3c802f2f1ceb66b76c67d96ffb34bef0475a7fad" -dependencies = [ - "backtrace", - "log", - "presser", - "thiserror", - "winapi", - "windows", -] - -[[package]] -name = "gpu-descriptor" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" -dependencies = [ - "bitflags 2.4.2", - "gpu-descriptor-types", - "hashbrown 0.14.3", -] - -[[package]] -name = "gpu-descriptor-types" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" -dependencies = [ - "bitflags 2.4.2", -] - -[[package]] -name = "group" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" -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.11", - "indexmap 2.2.3", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "h2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 1.0.0", - "indexmap 2.2.3", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" -dependencies = [ - "cfg-if 1.0.0", - "crunchy", -] - -[[package]] -name = "halfbrown" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5681137554ddff44396e5f149892c769d45301dd9aa19c51602a89ee214cb0ec" -dependencies = [ - "hashbrown 0.13.2", - "serde", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash", -] - -[[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.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" -dependencies = [ - "hashbrown 0.14.3", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hexf-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" - -[[package]] -name = "hkdf" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" -dependencies = [ - "hmac", -] - -[[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 = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi", -] - -[[package]] -name = "hstr" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17fafeca18cf0927e23ea44d7a5189c10536279dfe9094e0dfa953053fbb5377" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "phf", - "rustc-hash", - "smallvec", -] - -[[package]] -name = "http" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" -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.11", - "pin-project-lite", -] - -[[package]] -name = "http-body" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" -dependencies = [ - "bytes", - "http 1.0.0", -] - -[[package]] -name = "http-body-util" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" -dependencies = [ - "bytes", - "futures-util", - "http 1.0.0", - "http-body 1.0.0", - "pin-project-lite", -] - -[[package]] -name = "http_utils" -version = "0.1.0" -dependencies = [ - "bytes", - "futures-util", - "http 0.2.11", - "hyper 0.14.28", - "tokio", - "tokio-util", -] - -[[package]] -name = "httparse" -version = "1.8.0" -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 = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] - -[[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.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.11", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2 0.4.4", - "http 1.0.0", - "http-body 1.0.0", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "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.11", - "hyper 0.14.28", - "rustls 0.21.11", - "tokio", - "tokio-rustls 0.24.1", -] - -[[package]] -name = "hyper-util" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http 1.0.0", - "http-body 1.0.0", - "hyper 1.1.0", - "pin-project-lite", - "socket2", - "tokio", - "tracing", -] - -[[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 0.52.0", -] - -[[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.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 = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "if_chain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" - -[[package]] -name = "image" -version = "0.24.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-traits", - "png", -] - -[[package]] -name = "import_map" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ecd467768fe83c2860e70e5de5297a7366a230ff53e1da2158bdac2384cd39d" -dependencies = [ - "indexmap 1.9.3", - "log", - "serde", - "serde_json", - "url", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" -dependencies = [ - "equivalent", - "hashbrown 0.14.3", - "serde", -] - -[[package]] -name = "inotify" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" -dependencies = [ - "bitflags 1.3.2", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "block-padding", - "generic-array", -] - -[[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-macro" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a85abdc13717906baccb5a1e435556ce0df215f242892f721dff62bf25288f" -dependencies = [ - "Inflector", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[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.6", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[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 = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "js-sys" -version = "0.3.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "jsonc-parser" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7725c320caac8c21d8228c1d055af27a995d371f78cc763073d3e068323641b5" -dependencies = [ - "serde_json", -] - -[[package]] -name = "k256" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" -dependencies = [ - "cfg-if 1.0.0", - "ecdsa", - "elliptic-curve", - "once_cell", - "sha2", - "signature", -] - -[[package]] -name = "khronos-egl" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" -dependencies = [ - "libc", - "libloading 0.8.1", - "pkg-config", -] - -[[package]] -name = "khronos_api" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" - -[[package]] -name = "kqueue" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" -dependencies = [ - "bitflags 1.3.2", - "libc", -] - -[[package]] -name = "lapack" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a7f0050af10913bc5e4f6091df38870cb5d4e45094d3dd551c1aff9d1d59b26" -dependencies = [ - "lapack-sys", - "libc", - "num-complex", -] - -[[package]] -name = "lapack-sys" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1d3a8a9f07310243de6c6226f039f14bce8d2f4c96b5d30ddbcfa31eb4e94ad" -dependencies = [ - "libc", -] - -[[package]] -name = "lax" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccd3ec1cacffe7a44aee66f9e85d87e3ac69b472b546449884bd1fc1ca8ab359" -dependencies = [ - "cauchy", - "lapack", - "num-traits", - "thiserror", -] - -[[package]] -name = "lazy-regex" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d12be4595afdf58bd19e4a9f4e24187da2a66700786ff660a418e9059937a4c" -dependencies = [ - "lazy-regex-proc_macros", - "once_cell", - "regex", -] - -[[package]] -name = "lazy-regex-proc_macros" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bcd58e6c97a7fcbaffcdc95728b393b8d98933bfadad49ed4097845b57ef0b" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "regex", - "syn 2.0.48", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin 0.5.2", -] - -[[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.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "libloading" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" -dependencies = [ - "cc", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if 1.0.0", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" -dependencies = [ - "cfg-if 1.0.0", - "windows-sys 0.48.0", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libsqlite3-sys" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[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 = "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 = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[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" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "matrixmultiply" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" -dependencies = [ - "autocfg", - "rawpointer", -] - -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if 1.0.0", - "digest", -] - -[[package]] -name = "md4" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da5ac363534dce5fabf69949225e174fbf111a498bf0ff794c8ea1fba9f3dda" -dependencies = [ - "digest", -] - -[[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "memmem" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15" - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metal" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" -dependencies = [ - "bitflags 2.4.2", - "block", - "core-graphics-types", - "foreign-types", - "log", - "objc", - "paste", -] - -[[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 = "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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "monch" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b52c1b33ff98142aecea13138bd399b68aa7ab5d9546c300988c345004001eea" - -[[package]] -name = "monostate" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "878c2a1f1c70e5724fa28f101ca787b6a7e8ad5c5e4ae4ca3b0fa4a419fa9075" -dependencies = [ - "monostate-impl", - "serde", -] - -[[package]] -name = "monostate-impl" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f686d68a09079e63b1d2c64aa305095887ce50565f00a922ebfaeeee0d9ba6ce" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "naga" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e" -dependencies = [ - "bit-set", - "bitflags 2.4.2", - "codespan-reporting", - "hexf-parse", - "indexmap 2.2.3", - "log", - "num-traits", - "rustc-hash", - "serde", - "spirv", - "termcolor", - "thiserror", - "unicode-xid 0.2.4", -] - -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - -[[package]] -name = "ndarray" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" -dependencies = [ - "approx", - "cblas-sys", - "libc", - "matrixmultiply", - "num-complex", - "num-integer", - "num-traits", - "rawpointer", -] - -[[package]] -name = "ndarray-linalg" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f87ff36428f228c6056204d0f5cb8c5165f0db0a065429faace3edbc2718f1f" -dependencies = [ - "cauchy", - "lax", - "ndarray", - "num-complex", - "num-traits", - "rand", - "thiserror", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nix" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" -dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.0", - "libc", - "memoffset 0.7.1", - "pin-utils", - "static_assertions", -] - -[[package]] -name = "nom" -version = "4.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" -dependencies = [ - "memchr", - "version_check 0.1.5", -] - -[[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 = "notify" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" -dependencies = [ - "bitflags 2.4.2", - "filetime", - "inotify", - "kqueue", - "libc", - "log", - "mio", - "walkdir", - "windows-sys 0.48.0", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-bigint" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", - "rand", - "serde", -] - -[[package]] -name = "num-bigint-dig" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand", - "serde", - "smallvec", - "zeroize", -] - -[[package]] -name = "num-complex" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" -dependencies = [ - "num-traits", - "rand", - "serde", -] - -[[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.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -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 0.3.6", - "libc", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", - "objc_exception", -] - -[[package]] -name = "objc_exception" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" -dependencies = [ - "cc", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "oid-registry" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" -dependencies = [ - "asn1-rs", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[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 = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "ort" -version = "2.0.0-rc.0" -source = "git+https://github.com/pykeio/ort#2abc210f3958c5b94528cc71c6c8781813a2cc2f" -dependencies = [ - "half", - "libloading 0.8.1", - "ndarray", - "ort-sys", - "thiserror", - "tracing", -] - -[[package]] -name = "ort-sys" -version = "2.0.0-rc.0" -source = "git+https://github.com/pykeio/ort#2abc210f3958c5b94528cc71c6c8781813a2cc2f" - -[[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 = "p224" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c06436d66652bc2f01ade021592c80a2aad401570a18aa18b82e440d2b9aa1" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] -name = "p256" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] -name = "p384" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] -name = "p521" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2" -dependencies = [ - "base16ct", - "ecdsa", - "elliptic-curve", - "primeorder", - "rand_core", - "sha2", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "password-hash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" -dependencies = [ - "base64ct", - "rand_core", - "subtle", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "path-clean" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd" - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "pbkdf2" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" -dependencies = [ - "digest", - "hmac", -] - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap 2.2.3", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros", - "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_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der", - "pkcs8", - "spki", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -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 = "platforms" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" - -[[package]] -name = "pmutil" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "png" -version = "0.17.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "polyval" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[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" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "presser" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" - -[[package]] -name = "primeorder" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" -dependencies = [ - "elliptic-curve", -] - -[[package]] -name = "proc-macro-rules" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c277e4e643ef00c1233393c673f655e3672cf7eb3ba08a00bdd0ea59139b5f" -dependencies = [ - "proc-macro-rules-macros", - "proc-macro2 1.0.78", - "syn 2.0.48", -] - -[[package]] -name = "proc-macro-rules-macros" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "207fffb0fe655d1d47f6af98cc2793405e85929bdbc420d685554ff07be27ac7" -dependencies = [ - "once_cell", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "profiling" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0f7f43585c34e4fdd7497d746bc32e14458cf11c69341cc0587b1d825dde42" - -[[package]] -name = "psm" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" -dependencies = [ - "cc", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2 1.0.78", -] - -[[package]] -name = "radix_fmt" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce082a9940a7ace2ad4a8b7d0b1eac6aa378895f18be598230c5f2284ac05426" - -[[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 = "range-alloc" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" - -[[package]] -name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "rawpointer" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" - -[[package]] -name = "rayon" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" -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 = "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 = "ref-cast" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" -dependencies = [ - "ref-cast-impl", -] - -[[package]] -name = "ref-cast-impl" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "regex" -version = "1.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.5", - "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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.2", -] - -[[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 = "relative-path" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" - -[[package]] -name = "reqwest" -version = "0.11.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" -dependencies = [ - "async-compression", - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.11", - "http-body 0.4.6", - "hyper 0.14.28", - "hyper-rustls", - "ipnet", - "js-sys", - "log", - "mime", - "mime_guess", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.11", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-rustls 0.24.1", - "tokio-socks", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "webpki-roots", - "winreg", -] - -[[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 = "rfc6979" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" -dependencies = [ - "hmac", - "subtle", -] - -[[package]] -name = "ring" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" -dependencies = [ - "cc", - "getrandom", - "libc", - "spin 0.9.8", - "untrusted", - "windows-sys 0.48.0", -] - -[[package]] -name = "ripemd" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" -dependencies = [ - "digest", -] - -[[package]] -name = "ron" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" -dependencies = [ - "base64 0.21.7", - "bitflags 2.4.2", - "serde", - "serde_derive", -] - -[[package]] -name = "rsa" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core", - "signature", - "spki", - "subtle", - "zeroize", -] - -[[package]] -name = "rusqlite" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" -dependencies = [ - "bitflags 2.4.2", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[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.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.21", -] - -[[package]] -name = "rusticata-macros" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" -dependencies = [ - "nom 7.1.3", -] - -[[package]] -name = "rustix" -version = "0.38.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" -dependencies = [ - "bitflags 2.4.2", - "errno 0.3.8", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.21.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", -] - -[[package]] -name = "rustls" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" -dependencies = [ - "log", - "ring", - "rustls-pki-types", - "rustls-webpki 0.102.2", - "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-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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c333bb734fcdedcea57de1602543590f545f127dc8b533324318fd492c5c70b" -dependencies = [ - "base64 0.21.7", - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" - -[[package]] -name = "rustls-tokio-stream" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded7a36e8ac05b8ada77a84c5ceec95361942ee9dedb60a82f93f788a791aae8" -dependencies = [ - "futures", - "rustls 0.21.11", - "socket2", - "tokio", -] - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "ryu" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - -[[package]] -name = "ryu-js" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4950d85bc52415f8432144c97c4791bd0c4f7954de32a7270ee9cccd3c22b12b" - -[[package]] -name = "salsa20" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" -dependencies = [ - "cipher", -] - -[[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 = "sb_ai" -version = "0.1.0" -dependencies = [ - "anyhow", - "deno_core", - "log", - "ndarray", - "ndarray-linalg", - "once_cell", - "ort", - "rand", - "serde", - "tokenizers", - "tokio", -] - -[[package]] -name = "sb_core" -version = "0.1.0" -dependencies = [ - "anyhow", - "base64 0.21.7", - "bytes", - "cache_control", - "chrono", - "data-url", - "deno_ast", - "deno_cache_dir", - "deno_core", - "deno_crypto", - "deno_fetch", - "deno_fs", - "deno_graph", - "deno_http", - "deno_net", - "deno_tls", - "deno_web", - "deno_websocket", - "deno_webstorage", - "encoding_rs", - "enum-as-inner 0.6.0", - "faster-hex", - "fs3", - "futures", - "http 0.2.11", - "httparse", - "hyper 0.14.28", - "import_map", - "indexmap 2.2.3", - "libc", - "log", - "memmem", - "once_cell", - "percent-encoding", - "ring", - "sb_node", - "scopeguard", - "serde", - "thiserror", - "tokio", - "tokio-util", - "twox-hash", -] - -[[package]] -name = "sb_env" -version = "0.1.0" -dependencies = [ - "deno_core", - "sb_core", - "sb_node", -] - -[[package]] -name = "sb_fs" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "deno_ast", - "deno_core", - "deno_fs", - "deno_io", - "deno_npm", - "deno_semver", - "eszip", - "import_map", - "log", - "once_cell", - "sb_core", - "sb_node", - "sb_npm", - "serde", - "thiserror", - "tokio", -] - -[[package]] -name = "sb_graph" -version = "0.1.0" -dependencies = [ - "anyhow", - "deno_ast", - "deno_config", - "deno_core", - "deno_fs", - "deno_lockfile", - "deno_npm", - "deno_semver", - "deno_web", - "eszip", - "glob", - "import_map", - "log", - "once_cell", - "sb_core", - "sb_fs", - "sb_node", - "sb_npm", - "serde", - "tokio", - "urlencoding", -] - -[[package]] -name = "sb_module_loader" -version = "0.1.0" -dependencies = [ - "anyhow", - "base64 0.21.7", - "deno_ast", - "deno_core", - "deno_fs", - "deno_npm", - "deno_semver", - "deno_tls", - "eszip", - "import_map", - "log", - "monch", - "once_cell", - "sb_core", - "sb_fs", - "sb_graph", - "sb_node", - "sb_npm", - "serde", - "tokio", -] - -[[package]] -name = "sb_node" -version = "0.1.0" -dependencies = [ - "aead-gcm-stream", - "aes", - "brotli", - "bytes", - "cbc", - "const-oid", - "data-encoding", - "deno_core", - "deno_fetch", - "deno_fs", - "deno_media_type", - "deno_net", - "deno_whoami", - "digest", - "dsa", - "ecb", - "elliptic-curve", - "errno 0.2.8", - "h2 0.3.26", - "hex", - "hkdf", - "http 0.2.11", - "idna 0.3.0", - "indexmap 2.2.3", - "k256", - "lazy-regex", - "libc", - "libz-sys", - "md-5", - "md4", - "nix", - "num-bigint", - "num-bigint-dig", - "num-integer", - "num-traits", - "once_cell", - "p224", - "p256", - "p384", - "path-clean", - "pbkdf2", - "pin-project-lite", - "rand", - "regex", - "reqwest", - "ring", - "ripemd", - "rsa", - "scrypt", - "serde", - "sha-1", - "sha2", - "signature", - "simd-json", - "tokio", - "typenum", - "url", - "winapi", - "windows-sys 0.48.0", - "x25519-dalek", - "x509-parser", -] - -[[package]] -name = "sb_npm" -version = "0.1.0" -dependencies = [ - "async-trait", - "base32", - "base64 0.21.7", - "bincode", - "deno_ast", - "deno_core", - "deno_fs", - "deno_graph", - "deno_lockfile", - "deno_npm", - "deno_semver", - "flate2", - "hex", - "indexmap 2.2.3", - "log", - "once_cell", - "percent-encoding", - "ring", - "sb_core", - "sb_node", - "serde", - "tar", - "thiserror", -] - -[[package]] -name = "sb_os" -version = "0.1.0" -dependencies = [ - "deno_core", - "libc", - "sb_core", - "serde", -] - -[[package]] -name = "sb_workers" -version = "0.1.0" -dependencies = [ - "anyhow", - "bytes", - "deno_config", - "deno_core", - "deno_http", - "enum-as-inner 0.6.0", - "event_worker", - "futures-util", - "http_utils", - "hyper 0.14.28", - "log", - "sb_core", - "sb_graph", - "scopeguard", - "serde", - "thiserror", - "tokio", - "tokio-util", - "uuid", -] - -[[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 = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "scrypt" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" -dependencies = [ - "password-hash", - "pbkdf2", - "salsa20", - "sha2", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" -dependencies = [ - "base16ct", - "der", - "generic-array", - "pkcs8", - "subtle", - "zeroize", -] - -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -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.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" - -[[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.196" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_bytes" -version = "0.11.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.196" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "serde_json" -version = "1.0.113" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" -dependencies = [ - "indexmap 2.2.3", - "itoa", - "ryu", - "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_v8" -version = "0.165.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88862d513bcbc04a7f93b0f454dffd0b01a5c0d8e1964c7532ec55f52b9a6351" -dependencies = [ - "bytes", - "derive_more", - "num-bigint", - "serde", - "smallvec", - "thiserror", - "v8", -] - -[[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", -] - -[[package]] -name = "serial_test_derive" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "sha-1" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest", -] - -[[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" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shlex" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" - -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "signal-hook-tokio" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213241f76fb1e37e27de3b6aa1b068a2c333233b59cca6634f634b80a27ecf1e" -dependencies = [ - "futures-core", - "libc", - "signal-hook", - "tokio", -] - -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core", -] - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "simd-json" -version = "0.13.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2faf8f101b9bc484337a6a6b0409cf76c139f2fb70a9e3aee6b6774be7bfbf76" -dependencies = [ - "getrandom", - "halfbrown", - "lexical-core", - "ref-cast", - "serde", - "serde_json", - "simdutf8", - "value-trait", -] - -[[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 = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "slotmap" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" -dependencies = [ - "version_check 0.9.4", -] - -[[package]] -name = "smallvec" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - -[[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 0.9.4", -] - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "sourcemap" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4cbf65ca7dc576cf50e21f8d0712d96d4fcfd797389744b7b222a85cdf5bd90" -dependencies = [ - "data-encoding", - "debugid", - "if_chain", - "rustc_version 0.2.3", - "serde", - "serde_json", - "unicode-id", - "url", -] - -[[package]] -name = "sourcemap" -version = "7.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10da010a590ed2fa9ca8467b00ce7e9c5a8017742c0c09c45450efc172208c4b" -dependencies = [ - "data-encoding", - "debugid", - "if_chain", - "rustc_version 0.2.3", - "serde", - "serde_json", - "unicode-id", - "url", -] - -[[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 = "spirv" -version = "0.2.0+1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" -dependencies = [ - "bitflags 1.3.2", - "num-traits", -] - -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -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 7.1.3", - "serde", - "unicode-segmentation", -] - -[[package]] -name = "stacker" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" -dependencies = [ - "cc", - "cfg-if 1.0.0", - "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 = "string_enum" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b650ea2087d32854a0f20b837fc56ec987a1cb4f758c9757e1171ee9812da63" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" - -[[package]] -name = "strum" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" -dependencies = [ - "heck", - "proc-macro2 1.0.78", - "quote 1.0.35", - "rustversion", - "syn 2.0.48", -] - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "swc_atoms" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d538eaaa6f085161d088a04cf0a3a5a52c5a7f2b3bd9b83f73f058b0ed357c0" -dependencies = [ - "hstr", - "once_cell", - "rustc-hash", - "serde", -] - -[[package]] -name = "swc_bundler" -version = "0.223.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d7530df85b1a56f6a879ca102dc59718db4bcd6bfff55fb8bb379fbeab6c88c" -dependencies = [ - "anyhow", - "crc", - "indexmap 2.2.3", - "is-macro", - "once_cell", - "parking_lot", - "petgraph", - "radix_fmt", - "relative-path", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_codegen", - "swc_ecma_loader", - "swc_ecma_parser", - "swc_ecma_transforms_base", - "swc_ecma_transforms_optimization", - "swc_ecma_utils", - "swc_ecma_visit", - "swc_fast_graph", - "swc_graph_analyzer", - "tracing", -] - -[[package]] -name = "swc_common" -version = "0.33.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b3ae36feceded27f0178dc9dabb49399830847ffb7f866af01798844de8f973" -dependencies = [ - "ast_node", - "better_scoped_tls", - "cfg-if 1.0.0", - "either", - "from_variant", - "new_debug_unreachable", - "num-bigint", - "once_cell", - "rustc-hash", - "serde", - "siphasher", - "sourcemap 6.4.1", - "swc_atoms", - "swc_eq_ignore_macros", - "swc_visit", - "tracing", - "unicode-width", - "url", -] - -[[package]] -name = "swc_config" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112884e66b60e614c0f416138b91b8b82b7fea6ed0ecc5e26bad4726c57a6c99" -dependencies = [ - "indexmap 2.2.3", - "serde", - "serde_json", - "swc_config_macro", -] - -[[package]] -name = "swc_config_macro" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b2574f75082322a27d990116cd2a24de52945fc94172b24ca0b3e9e2a6ceb6b" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "swc_ecma_ast" -version = "0.110.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79401a45da704f4fb2552c5bf86ee2198e8636b121cb81f8036848a300edd53b" -dependencies = [ - "bitflags 2.4.2", - "is-macro", - "num-bigint", - "phf", - "scoped-tls", - "serde", - "string_enum", - "swc_atoms", - "swc_common", - "unicode-id", -] - -[[package]] -name = "swc_ecma_codegen" -version = "0.146.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b61ca275e3663238b71c4b5da8e6fb745bde9989ef37d94984dfc81fc6d009" -dependencies = [ - "memchr", - "num-bigint", - "once_cell", - "rustc-hash", - "serde", - "sourcemap 6.4.1", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_codegen_macros", - "tracing", -] - -[[package]] -name = "swc_ecma_codegen_macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "394b8239424b339a12012ceb18726ed0244fce6bf6345053cb9320b2791dcaa5" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "swc_ecma_dep_graph" -version = "0.113.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fc6ac1a84afe910182dcda33d70a16545e6058529d51afb63bd6be8764370f" -dependencies = [ - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_visit", -] - -[[package]] -name = "swc_ecma_loader" -version = "0.45.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5713ab3429530c10bdf167170ebbde75b046c8003558459e4de5aaec62ce0f1" -dependencies = [ - "anyhow", - "pathdiff", - "serde", - "swc_common", - "tracing", -] - -[[package]] -name = "swc_ecma_parser" -version = "0.141.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d17401dd95048a6a62b777d533c0999dabdd531ef9d667e22f8ae2a2a0d294" -dependencies = [ - "either", - "new_debug_unreachable", - "num-bigint", - "num-traits", - "phf", - "serde", - "smallvec", - "smartstring", - "stacker", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "tracing", - "typed-arena", -] - -[[package]] -name = "swc_ecma_transforms_base" -version = "0.135.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d4ab26ec124b03e47f54d4daade8e9a9dcd66d3a4ca3cd47045f138d267a60e" -dependencies = [ - "better_scoped_tls", - "bitflags 2.4.2", - "indexmap 2.2.3", - "once_cell", - "phf", - "rustc-hash", - "serde", - "smallvec", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_parser", - "swc_ecma_utils", - "swc_ecma_visit", - "tracing", -] - -[[package]] -name = "swc_ecma_transforms_classes" -version = "0.124.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fe4376c024fa04394cafb8faecafb4623722b92dbbe46532258cc0a6b569d9c" -dependencies = [ - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_transforms_base", - "swc_ecma_utils", - "swc_ecma_visit", -] - -[[package]] -name = "swc_ecma_transforms_macros" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17e309b88f337da54ef7fe4c5b99c2c522927071f797ee6c9fb8b6bf2d100481" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "swc_ecma_transforms_optimization" -version = "0.196.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec185cf4d18e90b7c8b18b0d1f04a5707e6f4c7b57c1bfd5086392cd07b75a9" -dependencies = [ - "dashmap", - "indexmap 2.2.3", - "once_cell", - "petgraph", - "rustc-hash", - "serde_json", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_parser", - "swc_ecma_transforms_base", - "swc_ecma_transforms_macros", - "swc_ecma_utils", - "swc_ecma_visit", - "swc_fast_graph", - "tracing", -] - -[[package]] -name = "swc_ecma_transforms_proposal" -version = "0.169.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed89d6ff74f60de490fb56e1cc505b057905e36c13d405d7d61dd5c9f6ee8fc9" -dependencies = [ - "either", - "rustc-hash", - "serde", - "smallvec", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_transforms_base", - "swc_ecma_transforms_classes", - "swc_ecma_transforms_macros", - "swc_ecma_utils", - "swc_ecma_visit", -] - -[[package]] -name = "swc_ecma_transforms_react" -version = "0.181.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e31a2f879fd21d18080b6c42e633e0ae8c6f3d54b83c1de876767d82b458c999" -dependencies = [ - "base64 0.21.7", - "dashmap", - "indexmap 2.2.3", - "once_cell", - "serde", - "sha-1", - "string_enum", - "swc_atoms", - "swc_common", - "swc_config", - "swc_ecma_ast", - "swc_ecma_parser", - "swc_ecma_transforms_base", - "swc_ecma_transforms_macros", - "swc_ecma_utils", - "swc_ecma_visit", -] - -[[package]] -name = "swc_ecma_transforms_typescript" -version = "0.186.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4263372cc7cd1a3b4570ccf7438f3c1e1575f134fd05cdf074edb322480a5b" -dependencies = [ - "ryu-js", - "serde", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_transforms_base", - "swc_ecma_transforms_react", - "swc_ecma_utils", - "swc_ecma_visit", -] - -[[package]] -name = "swc_ecma_utils" -version = "0.125.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cead1083e46b0f072a82938f16d366014468f7510350957765bb4d013496890" -dependencies = [ - "indexmap 2.2.3", - "num_cpus", - "once_cell", - "rustc-hash", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_visit", - "tracing", - "unicode-id", -] - -[[package]] -name = "swc_ecma_visit" -version = "0.96.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d0100c383fb08b6f34911ab6f925950416a5d14404c1cd520d59fb8dfbb3bf" -dependencies = [ - "num-bigint", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_visit", - "tracing", -] - -[[package]] -name = "swc_eq_ignore_macros" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "swc_fast_graph" -version = "0.21.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acfc056067a0fbfe26a4763c1eb246e813fdbe6b376415d07915e96e15481b6" -dependencies = [ - "indexmap 2.2.3", - "petgraph", - "rustc-hash", - "swc_common", -] - -[[package]] -name = "swc_graph_analyzer" -version = "0.22.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c6e0110c0433c27221f03e45419b7e18d1db4d472db309088caa458ac2f304e" -dependencies = [ - "auto_impl", - "petgraph", - "swc_common", - "swc_fast_graph", - "tracing", -] - -[[package]] -name = "swc_macros_common" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50176cfc1cbc8bb22f41c6fe9d1ec53fbe057001219b5954961b8ad0f336fce9" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "swc_visit" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b27078d8571abe23aa52ef608dd1df89096a37d867cf691cbb4f4c392322b7c9" -dependencies = [ - "either", - "swc_visit_macros", -] - -[[package]] -name = "swc_visit_macros" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8bb05975506741555ea4d10c3a3bdb0e2357cd58e1a4a4332b8ebb4b44c34d" -dependencies = [ - "Inflector", - "pmutil", - "proc-macro2 1.0.78", - "quote 1.0.35", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "unicode-ident", -] - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 1.0.109", - "unicode-xid 0.2.4", -] - -[[package]] -name = "tar" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "term_size" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "text_lines" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fd5828de7deaa782e1dd713006ae96b3bee32d3279b79eb67ecf8072c059bcf" -dependencies = [ - "serde", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "term_size", - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if 1.0.0", - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" -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.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" -dependencies = [ - "num-conv", - "time-core", -] - -[[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 = "tls-listener" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce110c38c3c9b6e5cc4fe72e60feb5b327750388a10a276e3d5d7d431e3dc76c" -dependencies = [ - "futures-util", - "pin-project-lite", - "thiserror", - "tokio", - "tokio-rustls 0.25.0", -] - -[[package]] -name = "tokenizers" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dd47962b0ba36e7fd33518fbf1754d136fd1474000162bbf2a8b5fcb2d3654d" -dependencies = [ - "aho-corasick", - "derive_builder", - "esaxx-rs", - "getrandom", - "itertools 0.12.1", - "lazy_static", - "log", - "macro_rules_attribute", - "monostate", - "onig", - "paste", - "rand", - "rayon", - "rayon-cond", - "regex", - "regex-syntax 0.8.2", - "serde", - "serde_json", - "spm_precompiled", - "thiserror", - "unicode-normalization-alignments", - "unicode-segmentation", - "unicode_categories", -] - -[[package]] -name = "tokio" -version = "1.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.11", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -dependencies = [ - "rustls 0.22.2", - "rustls-pki-types", - "tokio", -] - -[[package]] -name = "tokio-socks" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" -dependencies = [ - "either", - "futures-util", - "thiserror", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "futures-util", - "hashbrown 0.14.3", - "pin-project-lite", - "tokio", - "tracing", -] - -[[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 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "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", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "trust-dns-proto" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" -dependencies = [ - "async-trait", - "cfg-if 1.0.0", - "data-encoding", - "enum-as-inner 0.5.1", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.2.3", - "ipnet", - "lazy_static", - "rand", - "serde", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" -dependencies = [ - "cfg-if 1.0.0", - "futures-util", - "ipconfig", - "lazy_static", - "lru-cache", - "parking_lot", - "resolv-conf", - "serde", - "smallvec", - "thiserror", - "tokio", - "tracing", - "trust-dns-proto", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "tungstenite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 1.0.0", - "httparse", - "log", - "rand", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if 1.0.0", - "rand", - "static_assertions", -] - -[[package]] -name = "typed-arena" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unic-char-property" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" -dependencies = [ - "unic-char-range", -] - -[[package]] -name = "unic-char-range" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" - -[[package]] -name = "unic-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" - -[[package]] -name = "unic-ucd-ident" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" -dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] -name = "unic-ucd-version" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -dependencies = [ - "unic-common", -] - -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check 0.9.4", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-id" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f" - -[[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.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -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-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" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] -name = "universal-hash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" -dependencies = [ - "crypto-common", - "subtle", -] - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -dependencies = [ - "form_urlencoded", - "idna 0.4.0", - "percent-encoding", - "serde", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "urlpattern" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9bd5ff03aea02fa45b13a7980151fe45009af1980ba69f651ec367121a31609" -dependencies = [ - "derive_more", - "regex", - "serde", - "unic-ucd-ident", - "url", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" -dependencies = [ - "getrandom", - "serde", -] - -[[package]] -name = "v8" -version = "0.83.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f6c8a960dd2eb74b22eda64f7e9f3d1688f82b80202828dc0425ebdeda826ef" -dependencies = [ - "bitflags 2.4.2", - "fslock", - "once_cell", - "which 5.0.0", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "value-trait" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad8db98c1e677797df21ba03fca7d3bf9bec3ca38db930954e4fe6e1ea27eb4" -dependencies = [ - "float-cmp", - "halfbrown", - "itoa", - "ryu", -] - -[[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.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "vsimd" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" - -[[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 = "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 = "wasite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" - -[[package]] -name = "wasm-bindgen" -version = "0.2.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" -dependencies = [ - "quote 1.0.35", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" - -[[package]] -name = "wasm-streams" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "web-sys" -version = "0.3.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - -[[package]] -name = "wgpu-core" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef91c1d62d1e9e81c79e600131a258edf75c9531cbdbde09c44a011a47312726" -dependencies = [ - "arrayvec", - "bit-vec", - "bitflags 2.4.2", - "codespan-reporting", - "log", - "naga", - "parking_lot", - "profiling", - "raw-window-handle", - "ron", - "rustc-hash", - "serde", - "smallvec", - "thiserror", - "web-sys", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-hal" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84ecc802da3eb67b4cf3dd9ea6fe45bbb47ef13e6c49c5c3240868a9cc6cdd9" -dependencies = [ - "android_system_properties", - "arrayvec", - "ash", - "bit-set", - "bitflags 2.4.2", - "block", - "core-graphics-types", - "d3d12", - "glow", - "glutin_wgl_sys", - "gpu-alloc", - "gpu-allocator", - "gpu-descriptor", - "js-sys", - "khronos-egl", - "libc", - "libloading 0.8.1", - "log", - "metal", - "naga", - "objc", - "once_cell", - "parking_lot", - "profiling", - "range-alloc", - "raw-window-handle", - "rustc-hash", - "smallvec", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types", - "winapi", -] - -[[package]] -name = "wgpu-types" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd" -dependencies = [ - "bitflags 2.4.2", - "js-sys", - "serde", - "web-sys", -] - -[[package]] -name = "which" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" -dependencies = [ - "failure", - "libc", -] - -[[package]] -name = "which" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "whoami" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" -dependencies = [ - "redox_syscall", - "wasite", - "web-sys", -] - -[[package]] -name = "widestring" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" - -[[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.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" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" -dependencies = [ - "windows-core 0.51.1", - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", -] - -[[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.0", -] - -[[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.0", -] - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -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", -] - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if 1.0.0", - "windows-sys 0.48.0", -] - -[[package]] -name = "x25519-dalek" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" -dependencies = [ - "curve25519-dalek", - "rand_core", - "serde", - "zeroize", -] - -[[package]] -name = "x509-parser" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" -dependencies = [ - "asn1-rs", - "data-encoding", - "der-parser", - "lazy_static", - "nom 7.1.3", - "oid-registry", - "rusticata-macros", - "thiserror", - "time", -] - -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys", - "rustix", -] - -[[package]] -name = "xml-rs" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" - -[[package]] -name = "yaml-rust" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992" - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "zeroize" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] diff --git a/pkgs/development/web/edge-runtime/default.nix b/pkgs/development/web/edge-runtime/default.nix deleted file mode 100644 index 7a51944a4ff3..000000000000 --- a/pkgs/development/web/edge-runtime/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv -, lib -, callPackage -, fetchFromGitHub -, rustPlatform -, nix-update-script -, darwin -, openssl -, pkg-config -}: - -let - pname = "edge-runtime"; - version = "1.53.4"; -in -rustPlatform.buildRustPackage { - inherit pname version; - - src = fetchFromGitHub { - owner = "supabase"; - repo = pname; - rev = "v${version}"; - hash = "sha256-sDgGfQiAUuI+JaF0BRB5lwvjbWWIoTV/k/tbQsBBc4E="; - fetchSubmodules = true; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "ort-2.0.0-rc.0" = "sha256-j3g9ES2ZLmAAcPYgszBGDG16HiFJTnohwxSvXypFGTw="; - }; - }; - - nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; - - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security CoreFoundation SystemConfiguration ]); - - # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem - # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE - RUSTY_V8_ARCHIVE = callPackage ./librusty_v8.nix { }; - - # For version tag - GIT_V_TAG = version; - - passthru.updateScript = nix-update-script { }; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/edge-runtime --help - runHook postInstallCheck - ''; - - doCheck = false; - - meta = with lib; { - description = "Server based on Deno runtime, capable of running JavaScript, TypeScript, and WASM services"; - mainProgram = "edge-runtime"; - homepage = "https://github.com/supabase/edge-runtime"; - license = licenses.mit; - maintainers = with maintainers; [ happysalada ]; - }; -} diff --git a/pkgs/development/web/edge-runtime/librusty_v8.nix b/pkgs/development/web/edge-runtime/librusty_v8.nix deleted file mode 100644 index c08c50eea4cd..000000000000 --- a/pkgs/development/web/edge-runtime/librusty_v8.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl }: - -let - fetch_librusty_v8 = args: fetchurl { - name = "librusty_v8-${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a"; - sha256 = args.shas.${stdenv.hostPlatform.system}; - meta = { - inherit (args) version; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; - }; -in -fetch_librusty_v8 { - version = "0.83.2"; - shas = { - x86_64-linux = "sha256-RJNdy5jRZK3dTgrHsWuZZAHUyy1EogyNNuBekZ3Arrk="; - aarch64-linux = "sha256-mpOmuqtd7ob6xvrgH4P/6GLa/hXTS/ok0WOYo7+7ZhI="; - x86_64-darwin = "sha256-2o8CvJ3r5+4PLNGTySqPPDTqbU0piX4D1UtZMscMdHU="; - aarch64-darwin = "sha256-WHeITWSHjZxfQJndxcjsp4yIERKrKXSHFZ0UBc43p8o="; - }; -} diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix deleted file mode 100644 index 2fba60c53549..000000000000 --- a/pkgs/development/web/flyctl/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, flyctl, installShellFiles }: - -buildGoModule rec { - pname = "flyctl"; - version = "0.3.6"; - - src = fetchFromGitHub { - owner = "superfly"; - repo = "flyctl"; - rev = "v${version}"; - hash = "sha256-Wj9omHywqXYEaap4w4C6wtwRs0QyKx4kp+QAkmK07fE="; - }; - - vendorHash = "sha256-Z9qbrFctUv6F8374qyJ7Fw4HU/7BIhEfHfrwoFUXM4Q="; - - subPackages = [ "." ]; - - ldflags = [ - "-s" "-w" - "-X github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00Z" - "-X github.com/superfly/flyctl/internal/buildinfo.buildVersion=${version}" - ]; - tags = ["production"]; - - nativeBuildInputs = [ installShellFiles ]; - - patches = [ ./disable-auto-update.patch ]; - - preBuild = '' - GOOS= GOARCH= CGO_ENABLED=0 go generate ./... - ''; - - preCheck = '' - HOME=$(mktemp -d) - ''; - - # We override checkPhase to be able to test ./... while using subPackages - checkPhase = '' - runHook preCheck - # We do not set trimpath for tests, in case they reference test assets - export GOFLAGS=''${GOFLAGS//-trimpath/} - - buildGoDir test ./... - - runHook postCheck - ''; - - postInstall = '' - installShellCompletion --cmd flyctl \ - --bash <($out/bin/flyctl completion bash) \ - --fish <($out/bin/flyctl completion fish) \ - --zsh <($out/bin/flyctl completion zsh) - ln -s $out/bin/flyctl $out/bin/fly - ''; - - passthru.tests.version = testers.testVersion { - package = flyctl; - command = "HOME=$(mktemp -d) flyctl version"; - version = "v${flyctl.version}"; - }; - - meta = { - description = "Command line tools for fly.io services"; - downloadPage = "https://github.com/superfly/flyctl"; - homepage = "https://fly.io/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ adtya jsierles techknowlogick RaghavSood teutat3s ]; - mainProgram = "flyctl"; - }; -} diff --git a/pkgs/development/web/flyctl/disable-auto-update.patch b/pkgs/development/web/flyctl/disable-auto-update.patch deleted file mode 100644 index 3fe6048871e4..000000000000 --- a/pkgs/development/web/flyctl/disable-auto-update.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 - ---- - internal/config/config.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/internal/config/config.go b/internal/config/config.go -index 04583ca5..1b085b55 100644 ---- a/internal/config/config.go -+++ b/internal/config/config.go -@@ -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 { --- -2.45.2 - diff --git a/pkgs/development/web/function-runner/default.nix b/pkgs/development/web/function-runner/default.nix deleted file mode 100644 index 6ea238f53523..000000000000 --- a/pkgs/development/web/function-runner/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "function-runner"; - version = "6.2.1"; - - src = fetchFromGitHub { - owner = "Shopify"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-5X/d6phYXmJcCacHvGkk5o/J91SdlFamxJrqc5X/Y4Y="; - }; - - cargoHash = "sha256-D6BTP/a3wOpcOLnGUASyBL3pzAieAllLzEZuaEv2Oco="; - - meta = with lib; { - description = "CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure"; - mainProgram = "function-runner"; - homepage = "https://github.com/Shopify/function-runner"; - license = licenses.asl20; - maintainers = with maintainers; [ nintron ]; - }; -} diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 3daeaa7d41b4..b2cae35485b1 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "6.1.2"; + version = "6.2.1"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "sha256-PoiXZuAJbKsyBRVaxwsKSDh1BzPYlgAwe/xC0qfeDgs="; + sha256 = "sha256-+xwQPd9a7NQcrl0pZNCqktGryLTXXI8V/81a8pk/j48="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/web/ihp-new/default.nix b/pkgs/development/web/ihp-new/default.nix deleted file mode 100644 index 76e66a7ae454..000000000000 --- a/pkgs/development/web/ihp-new/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, git, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "ihp-new"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "digitallyinduced"; - repo = "ihp"; - rev = "v${version}"; - sha256 = "sha256-DmaIr9kF+TG24wVNPVufxC74TYMCLziLYS9hCZHBDTc="; - }; - - dontConfigure = true; - sourceRoot = "${src.name}/ProjectGenerator"; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - install -Dm755 bin/ihp-new -t $out/bin - wrapProgram $out/bin/ihp-new \ - --suffix PATH ":" "${lib.makeBinPath [ git ]}"; - ''; - - meta = with lib; { - description = "Project generator for the IHP (Integrated Haskell Platform) web framework"; - mainProgram = "ihp-new"; - homepage = "https://ihp.digitallyinduced.com"; - license = licenses.mit; - maintainers = [ maintainers.mpscholten ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix deleted file mode 100644 index 9317dbe8f4e9..000000000000 --- a/pkgs/development/web/insomnia/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - appimageTools -}: -let - pname = "insomnia"; - version = "9.0.0"; - - src = fetchurl { - x86_64-darwin = { - url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg"; - hash = "sha256-QIArPdThQcNTUgrXpWP8JHaZfrZ/6ztekIvzFdoWjsY="; - }; - x86_64-linux = { - url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.AppImage"; - hash = "sha256-2UiqopYmNxnDcIqQMn/H89ugvOtTWkHH4LrmKkQErSs="; - }; - }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); - - 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."; - mainProgram = "insomnia"; - changelog = "https://github.com/Kong/insomnia/releases/tag/core@${version}"; - license = licenses.asl20; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ markus1189 kashw2 DataHearth ]; - }; -in -if stdenv.isDarwin then stdenv.mkDerivation { - inherit pname version src meta; - sourceRoot = "."; - - unpackCmd = '' - echo "Creating temp directory" - mnt=$(TMPDIR=/tmp mktemp -d -t nix-XXXXXXXXXX) - function finish { - echo "Ejecting temp directory" - /usr/bin/hdiutil detach $mnt -force - rm -rf $mnt - } - # Detach volume when receiving SIG "0" - trap finish EXIT - # Mount DMG file - echo "Mounting DMG file into \"$mnt\"" - /usr/bin/hdiutil attach -nobrowse -mountpoint $mnt $curSrc - # Copy content to local dir for later use - echo 'Copying extracted content into "sourceRoot"' - cp -a $mnt/Insomnia.app $PWD/ - ''; - - installPhase = '' - runHook preInstall - mkdir -p "$out/Applications" - mv Insomnia.app $out/Applications/ - runHook postInstall - ''; -} else appimageTools.wrapType2 { - inherit pname version src meta; - - extraInstallCommands = let - appimageContents = appimageTools.extract { - inherit pname version src; - }; - in '' - # Install XDG Desktop file and its icon - install -Dm444 ${appimageContents}/insomnia.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/insomnia.png -t $out/share/pixmaps - # Replace wrong exec statement in XDG Desktop file - substituteInPlace $out/share/applications/insomnia.desktop \ - --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=insomnia' - ''; -} diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix deleted file mode 100644 index 84bfc654c773..000000000000 --- a/pkgs/development/web/kcgi/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, pkg-config, fetchFromGitHub, libbsd }: - -stdenv.mkDerivation rec { - pname = "kcgi"; - version = "0.10.8"; - underscoreVersion = lib.replaceStrings ["."] ["_"] version; - - src = fetchFromGitHub { - owner = "kristapsdz"; - repo = pname; - rev = "VERSION_${underscoreVersion}"; - sha256 = "0ha6r7bcgf6pcn5gbd2sl7835givhda1jql49c232f1iair1yqyp"; - }; - patchPhase = ''substituteInPlace configure \ - --replace /usr/local / - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ] ++ lib.optionals stdenv.isLinux [ libbsd ] ; - - dontAddPrefix = true; - - installFlags = [ "DESTDIR=$(out)" ]; - - meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); - homepage = "https://kristaps.bsd.lv/kcgi"; - description = "Minimal CGI and FastCGI library for C/C++"; - license = licenses.isc; - platforms = platforms.all; - maintainers = [ maintainers.leenaars ]; - mainProgram = "kfcgi"; - }; -} diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix deleted file mode 100644 index 9105afa52071..000000000000 --- a/pkgs/development/web/kore/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, openssl, curl, postgresql, yajl }: - - -stdenv.mkDerivation rec { - pname = "kore"; - version = "4.2.3"; - - src = fetchFromGitHub { - owner = "jorisvink"; - repo = pname; - rev = version; - sha256 = "sha256-p0M2P02xwww5EnT28VnEtj5b+/jkPW3YkJMuK79vp4k="; - }; - - buildInputs = [ openssl curl postgresql yajl ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - "ACME=1" - "CURL=1" - "TASKS=1" - "PGSQL=1" - "JSONRPC=1" - "DEBUG=1" - ]; - - preBuild = '' - make platform.h - ''; - - env.NIX_CFLAGS_COMPILE = toString ([ - "-Wno-error=deprecated-declarations" - ] ++ lib.optionals stdenv.cc.isGNU [ - "-Wno-error=pointer-compare" - "-Wno-error=discarded-qualifiers" - ] ++ lib.optionals stdenv.cc.isClang [ - "-Wno-error=incompatible-pointer-types-discards-qualifiers" - ]); - - enableParallelBuilding = true; - - meta = with lib; { - description = "Easy to use web application framework for C"; - homepage = "https://kore.io"; - license = licenses.isc; - platforms = platforms.all; - maintainers = with maintainers; [ johnmh ]; - }; -} diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/development/web/lucky-cli/default.nix deleted file mode 100644 index 2f5972d6c28d..000000000000 --- a/pkgs/development/web/lucky-cli/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, fetchFromGitHub, crystal, makeWrapper, openssl }: - -crystal.buildCrystalPackage rec { - pname = "lucky-cli"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "luckyframework"; - repo = "lucky_cli"; - rev = "v${version}"; - hash = "sha256-mDUx9cQoYpU9kSAls36kzNVYZ8a4aqHEMIWfzS41NBk="; - }; - - # the integration tests will try to clone a remote repos - postPatch = '' - rm -rf spec/integration - ''; - - format = "crystal"; - - lockFile = ./shard.lock; - shardsFile = ./shards.nix; - - crystalBinaries.lucky.src = "src/lucky.cr"; - - buildInputs = [ openssl ]; - - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram $out/bin/lucky \ - --prefix PATH : ${lib.makeBinPath [ crystal ]} - ''; - - meta = with lib; { - description = "Crystal library for creating and running tasks. Also generates Lucky projects"; - homepage = "https://luckyframework.org/"; - license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; - mainProgram = "lucky"; - platforms = platforms.unix; - broken = lib.versionOlder crystal.version "1.6.0"; - }; -} diff --git a/pkgs/development/web/lucky-cli/shard.lock b/pkgs/development/web/lucky-cli/shard.lock deleted file mode 100644 index b9956fd780df..000000000000 --- a/pkgs/development/web/lucky-cli/shard.lock +++ /dev/null @@ -1,18 +0,0 @@ -version: 2.0 -shards: - ameba: - git: https://github.com/crystal-ameba/ameba.git - version: 1.5.0 - - lucky_task: - git: https://github.com/luckyframework/lucky_task.git - version: 0.3.0 - - lucky_template: - git: https://github.com/luckyframework/lucky_template.git - version: 0.2.0 - - nox: - git: https://github.com/crystal-loot/nox.git - version: 0.2.2 - diff --git a/pkgs/development/web/lucky-cli/shards.nix b/pkgs/development/web/lucky-cli/shards.nix deleted file mode 100644 index a06b87c5029a..000000000000 --- a/pkgs/development/web/lucky-cli/shards.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - ameba = { - url = "https://github.com/crystal-ameba/ameba.git"; - rev = "v1.5.0"; - sha256 = "1idivsbpmi40aqvs82fsv37nrgikirprxrj3ls9chsb876fq9p2d"; - }; - lucky_task = { - url = "https://github.com/luckyframework/lucky_task.git"; - rev = "v0.3.0"; - sha256 = "0lp2wv01wdcfr3h43n3dqgaymvypy0i6kbffb4mg4l30lijgpfb6"; - }; - lucky_template = { - url = "https://github.com/luckyframework/lucky_template.git"; - rev = "v0.2.0"; - sha256 = "1xix82d0xanq4xkcv83hm56nj5f2rsbrqhk70j5zr37d3kydfypl"; - }; - nox = { - url = "https://github.com/crystal-loot/nox.git"; - rev = "v0.2.2"; - sha256 = "1dfq0aknrxwp9wc0glri4w5j8pfbc6b1xrsxkahci109p6dhcna5"; - }; -} diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix deleted file mode 100644 index 9227793f506a..000000000000 --- a/pkgs/development/web/minify/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -, nix-update-script -, testers -, minify -}: - -buildGoModule rec { - pname = "minify"; - version = "2.20.37"; - - src = fetchFromGitHub { - owner = "tdewolff"; - repo = pname; - rev = "v${version}"; - hash = "sha256-sBq1RlvyTelPS3gUgucWnyKV93npxvHetB4ezxnhIbU="; - }; - - vendorHash = "sha256-LT39GYDcFL3hjiYwvbSYjV8hcg0KNgQmLMRWcdz4T48="; - - nativeBuildInputs = [ installShellFiles ]; - - ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; - - subPackages = [ "cmd/minify" ]; - - passthru = { - updateScript = nix-update-script { }; - tests.version = testers.testVersion { - inherit version; - package = minify; - command = "minify --version"; - }; - }; - - postInstall = '' - installShellCompletion --cmd minify --bash cmd/minify/bash_completion - ''; - - meta = with lib; { - description = "Go minifiers for web formats"; - homepage = "https://go.tacodewolff.nl/minify"; - downloadPage = "https://github.com/tdewolff/minify"; - changelog = "https://github.com/tdewolff/minify/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ gaelreyrol ]; - mainProgram = "minify"; - }; -} diff --git a/pkgs/development/web/netlify-cli/composition.nix b/pkgs/development/web/netlify-cli/composition.nix index 2e54104d7dce..4bd736ddc723 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.cctools or pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; in import ./node-packages.nix { diff --git a/pkgs/development/web/netlify-cli/node-env.nix b/pkgs/development/web/netlify-cli/node-env.nix index bc1e36628ac8..eb94495aeba3 100644 --- a/pkgs/development/web/netlify-cli/node-env.nix +++ b/pkgs/development/web/netlify-cli/node-env.nix @@ -499,8 +499,8 @@ let stdenv.mkDerivation ({ name = "${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux + ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool ++ buildInputs; inherit nodejs; @@ -591,8 +591,8 @@ let name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux + ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -662,7 +662,7 @@ let stdenv.mkDerivation ({ name = "node-shell-${name}${if version == null then "" else "-${version}"}"; - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <<EOF diff --git a/pkgs/development/web/netlify-cli/test.nix b/pkgs/development/web/netlify-cli/test.nix index d25c6c48936b..5acd4f1046d5 100644 --- a/pkgs/development/web/netlify-cli/test.nix +++ b/pkgs/development/web/netlify-cli/test.nix @@ -11,7 +11,7 @@ runCommand "netlify-cli-test" { nativeBuildInputs = [ netlify-cli curl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.ps ]; meta.timeout = 600; diff --git a/pkgs/development/web/newman/default.nix b/pkgs/development/web/newman/default.nix deleted file mode 100644 index 806163741760..000000000000 --- a/pkgs/development/web/newman/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "newman"; - version = "6.1.3"; - - src = fetchFromGitHub { - owner = "postmanlabs"; - repo = "newman"; - rev = "refs/tags/v${version}"; - hash = "sha256-I9gpVwrrug1Ygi0UuBIeq16Nyn8rsaDkMDtpxBYJOuY="; - }; - - npmDepsHash = "sha256-StNu5NHGzivl3+GMBWkbxvsRJ/dYuS0dze+8/i7q9qg="; - - dontNpmBuild = true; - - meta = with lib; { - homepage = "https://www.getpostman.com"; - description = "Command-line collection runner for Postman"; - mainProgram = "newman"; - changelog = "https://github.com/postmanlabs/newman/releases/tag/v${version}"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch b/pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch deleted file mode 100644 index 4f1abea901c0..000000000000 --- a/pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch +++ /dev/null @@ -1,14 +0,0 @@ -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/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 07c945e2b230..8881d608c95b 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -294,15 +294,11 @@ let "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" # This is a bit weird, but for some reason fs watch tests fail with # sandbox. "test-fs-promises-watch" @@ -323,6 +319,8 @@ let "test-runner-run" "test-runner-watch-mode" "test-watch-mode-files_watcher" + ] ++ lib.optionals (!lib.versionAtLeast version "22") [ + "test-tls-multi-key" ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ # Disable tests that don’t work under macOS sandbox. "test-macos-app-sandbox" @@ -333,6 +331,7 @@ let # TODO: revisit at a later date. "test-fs-readv" "test-fs-readv-sync" + "test-vm-memleak" ])}" ]; @@ -363,7 +362,13 @@ let # assemble a static v8 library and put it in the 'libv8' output mkdir -p $libv8/lib pushd out/Release/obj - find . -path "./torque_*/**/*.o" -or -path "./v8*/**/*.o" | sort -u >files + find . -path "**/torque_*/**/*.o" -or -path "**/v8*/**/*.o" \ + -and -not -name "torque.*" \ + -and -not -name "mksnapshot.*" \ + -and -not -name "gen-regexp-special-case.*" \ + -and -not -name "bytecode_builtins_list_generator.*" \ + | sort -u >files + test -s files # ensure that the list is not empty $AR -cqs $libv8/lib/libv8.a @files popd diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 811c0646959e..556e163e3ae9 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -48,5 +48,103 @@ buildNodejs { url = "https://github.com/nodejs/node/commit/d0a6b605fba6cd69a82e6f12ff0363eef8fe1ee9.patch"; hash = "sha256-TfYal/PikRZHL6zpAlC3SmkYXCe+/8Gs83dLX/X/P/k="; }) + + # Patches for OpenSSL 3.2 + # Patches already in 20.13.0 + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/9f939f5af7d11299796999af3cbfa4845b505c78.patch?full_index=1"; + hash = "sha256-vZJMTI8KR+RoCl4r9dfNdNMKssk4osLS61A/F7gdeWQ="; + }) + # Patches already in 20.16.0 + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/5909cf3b047f708de6a1373232bfcc899fa97a1d.patch?full_index=1"; + hash = "sha256-JidSO/73fjxTcGBiMHC7x10muYtv04inXNVJebFmcgo="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/ce531af0c27acf29dd05ab2fac19b4af88f8780d.patch?full_index=1"; + hash = "sha256-2WD4lVCtfji0AXlIHq4tiQ2TWKVMPjYZjbaVxd3HEFw="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/3e7129e5d60d4f017ad06c006dec7f95d986095c.patch?full_index=1"; + hash = "sha256-2SRoUMswY25GamJ6APVAzDwqopSCpVPKAEIIqyaAmBA="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/da0f19208786cd7c57fec733e4ba24d0454f556a.patch?full_index=1"; + hash = "sha256-AyQe2eHIx0O2jUgMCqWnzLhW8XduPaU4ZmhFA3UQI+Q="; + }) + # Patches already in 20.17.0 + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/53ac448022b7cdfcc09296da88d9a1b59921f6bf.patch?full_index=1"; + hash = "sha256-JcEbluU9k20Q3W915D1O6wWgX5R/UKjxqsuDemjMoTc="; + }) + # Patches already in 22.7.0 + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/bd42e4c6a73f61f7ee47e4426d86708fd80c6c4f.patch?full_index=1"; + hash = "sha256-bsCLVwK5t8dD+wHd1FlFJ1wpCGtNGcwoOfq4fG5MHfo="; + includes = ["test/parallel/test-tls-set-sigalgs.js"]; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/e0634f58aba6a1634fe03107d5be849fd008cc02.patch?full_index=1"; + hash = "sha256-Jh7f4JPS1H2Rpj1nEOW53E66Z+GDNEFXl0jALrvyYXQ="; + }) + # Patches already in 22.8.0 + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/e9cd4766e39d96693320be9ce0a1044c450e8675.patch?full_index=1"; + hash = "sha256-RXRLRznz16B8MrfVrpIHgyqLV2edpJk2p717QBttyK4="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/2bfc9e467cb05578efa4d3db497f368fb144e5fc.patch?full_index=1"; + hash = "sha256-TyHSd+O0T/bFR7YZuxm4HumrMljnJu2a8RRLRvz6KNM="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/01f751b529d126529f1d2019f0dcb13b8e54b787.patch?full_index=1"; + hash = "sha256-m3IaWL7U8fQMnmP2Xch4M8Qn1AJU8Ao9GCqMPcDnqCk="; + }) + # Patches already in 22.9.0 + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/d9ca8b018efd172a99365ada8f536491b19bd87b.patch?full_index=1"; + hash = "sha256-KzoWVXcgjJaMUOXDyLlkwRcN6z3SdFhTJd0KYBYfElE="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/c4f295470392db237c0adfc9832214538a99a034.patch?full_index=1"; + hash = "sha256-sYTY+oiQ5K7bYLcI1+jSTlLFdwpteKGSu7S/bbaslLE="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/a65105ec284023960e93b3a66f6661ddd2f4121f.patch?full_index=1"; + hash = "sha256-ZNkiHlp+UlbnonPBhMUw6rqtjWrC1b9SgI9EcGhDlwY="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/c77bcf018716e97ae35203990bcd51c143840348.patch?full_index=1"; + hash = "sha256-EwrZKpLRzk3Yjen1WVQqKTiHKE2uLTpaPsE13czH2rY="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/18101d83a158b877ac765936aba973c664130ea2.patch?full_index=1"; + hash = "sha256-vpHDj5+340bjYLo7gTWFu7iS4vVveBZAMypQ2eLoQzM="; + }) + # Patches not yet released + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/f8b7a171463e775da304bccf4cf165e634525c7e.patch?full_index=1"; + hash = "sha256-imptUwt2oG8pPGKD3V6m5NQXuahis71UpXiJm4C0E6o="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/6dfa3e46d3d2f8cfba7da636d48a5c41b0132cd7.patch?full_index=1"; + hash = "sha256-ITtGsvZI6fliirCKvbMH9N2Xoy3001bz+hS3NPoqvzg="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/29b9c72b05786061cde58a5ae11cfcb580ab6c28.patch?full_index=1"; + hash = "sha256-xaqtwsrOIyRV5zzccab+nDNG8kUgO6AjrVYJNmjeNP0="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/cfe58cfdc488da71e655d3da709292ce6d9ddb58.patch?full_index=1"; + hash = "sha256-9GblpbQcYfoiE5R7fETsdW7v1Mm2Xdr4+xRNgUpLO+8="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/2cec716c48cea816dcd5bf4997ae3cdf1fe4cd90.patch?full_index=1"; + hash = "sha256-ExIkAj8yRJEK39OfV6A53HiuZsfQOm82/Tvj0nCaI8A="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/0f7bdcc17fbc7098b89f238f4bd8ecad9367887b.patch?full_index=1"; + hash = "sha256-lXx6QyD2anlY9qAwjNMFM2VcHckBshghUF1NaMoaNl4="; + }) ] ++ gypPatches; } diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index bb2a446d6eef..4b0be19dad77 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, python3, enableNpm ? true }: +{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -12,8 +12,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.17.0"; - sha256 = "9abf03ac23362c60387ebb633a516303637145cb3c177be3348b16880fd8b28c"; + version = "20.18.0"; + sha256 = "7d9433e91fd88d82ba8de86e711ec41907638e227993d22e95126b02f6cd714a"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch @@ -21,5 +21,32 @@ buildNodejs { ./bypass-darwin-xcrun-node16.patch ./node-npm-build-npm-package-logic.patch ./use-correct-env-in-tests.patch + + # Patches for OpenSSL 3.2 + # Patches not yet released + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/f8b7a171463e775da304bccf4cf165e634525c7e.patch?full_index=1"; + hash = "sha256-imptUwt2oG8pPGKD3V6m5NQXuahis71UpXiJm4C0E6o="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/6dfa3e46d3d2f8cfba7da636d48a5c41b0132cd7.patch?full_index=1"; + hash = "sha256-ITtGsvZI6fliirCKvbMH9N2Xoy3001bz+hS3NPoqvzg="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/29b9c72b05786061cde58a5ae11cfcb580ab6c28.patch?full_index=1"; + hash = "sha256-xaqtwsrOIyRV5zzccab+nDNG8kUgO6AjrVYJNmjeNP0="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/cfe58cfdc488da71e655d3da709292ce6d9ddb58.patch?full_index=1"; + hash = "sha256-9GblpbQcYfoiE5R7fETsdW7v1Mm2Xdr4+xRNgUpLO+8="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/2cec716c48cea816dcd5bf4997ae3cdf1fe4cd90.patch?full_index=1"; + hash = "sha256-ExIkAj8yRJEK39OfV6A53HiuZsfQOm82/Tvj0nCaI8A="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/0f7bdcc17fbc7098b89f238f4bd8ecad9367887b.patch?full_index=1"; + hash = "sha256-lXx6QyD2anlY9qAwjNMFM2VcHckBshghUF1NaMoaNl4="; + }) ] ++ gypPatches; } diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 90174977ffa9..6a71b0056bf7 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -1,19 +1,15 @@ -{ callPackage, openssl, python3, enableNpm ? true }: +{ callPackage, fetchpatch2, 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.8.0"; - sha256 = "f130e82176d1ee0702d99afc1995d0061bf8ed357c38834a32a08c9ef74f1ac7"; + version = "22.10.0"; + sha256 = "3180710d3130ad9df01466abf010e408d41b374be54301d1480d10eca73558e0"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch @@ -22,5 +18,5 @@ buildNodejs { ./node-npm-build-npm-package-logic.patch ./use-correct-env-in-tests.patch ./bin-sh-node-run-v22.patch - ] ++ gypPatches; + ]; } diff --git a/pkgs/development/web/nodejs/v23.nix b/pkgs/development/web/nodejs/v23.nix new file mode 100644 index 000000000000..2039e9385c4f --- /dev/null +++ b/pkgs/development/web/nodejs/v23.nix @@ -0,0 +1,52 @@ +{ + callPackage, + fetchpatch2, + openssl, + python3, + enableNpm ? true, +}: + +let + buildNodejs = callPackage ./nodejs.nix { + inherit openssl; + python = python3; + }; +in +buildNodejs { + inherit enableNpm; + version = "23.1.0"; + sha256 = "57cbfd3dd51f9300ea2b8e60a8ed215b1eaa71fbde4c3903a7d31a443a4a4423"; + patches = [ + ./configure-emulator.patch + ./configure-armv6-vfpv2.patch + ./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 + + # Those reverts are due to a mismatch with the libuv version used upstream + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/dcbc5fbe65b068a90c3d0970155d3a68774caa38.patch?full_index=1"; + hash = "sha256-Q7YrooolMjsGflTQEj5ra6hRVGhMP6APaydf1MGH54Q="; + revert = true; + excludes = [ "doc/*" ]; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/ec867ac7ce4e4913a8415eda48a7af9fc226097d.patch?full_index=1"; + hash = "sha256-zfnHxC7ZMZAiu0/6PsX7RFasTevHMETv+azhTZnKI64="; + revert = true; + excludes = [ "doc/*" ]; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/f97865fab436fba24b46dad14435ec4b482243a2.patch?full_index=1"; + hash = "sha256-o5aPQqUXubtJKMX28jn8LdjZHw37/BqENkYt6RAR3kY="; + revert = true; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/54d55f2337ebe04451da770935ad453accb147f9.patch?full_index=1"; + hash = "sha256-gmIyiSyNzC3pClL1SM2YicckWM+/2tsbV1xv2S3d5G0="; + revert = true; + }) + ]; +} diff --git a/pkgs/development/web/playwright/chromium.nix b/pkgs/development/web/playwright/chromium.nix index 0da9e66641c1..709cef5c5ca4 100644 --- a/pkgs/development/web/playwright/chromium.nix +++ b/pkgs/development/web/playwright/chromium.nix @@ -1,15 +1,10 @@ { runCommand, makeWrapper, - makeFontsConf, + fontconfig_file, chromium, ... }: -let - fontconfig = makeFontsConf { - fontDirectories = [ ]; - }; -in runCommand "playwright-chromium" { nativeBuildInputs = [ @@ -25,5 +20,5 @@ runCommand "playwright-chromium" # as headless nixos test vms. makeWrapper ${chromium}/bin/chromium $out/chrome-linux/chrome \ --set-default SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt \ - --set-default FONTCONFIG_FILE ${fontconfig} + --set-default FONTCONFIG_FILE ${fontconfig_file} '' diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix index f05d5fd6c081..1058a61d48fb 100644 --- a/pkgs/development/web/playwright/driver.nix +++ b/pkgs/development/web/playwright/driver.nix @@ -217,12 +217,15 @@ let meta.platforms = lib.platforms.darwin; }; - browsers-linux = + browsers-linux = lib.makeOverridable ( { withChromium ? true, withFirefox ? true, withWebkit ? true, withFfmpeg ? true, + fontconfig_file ? makeFontsConf { + fontDirectories = [ ]; + }, }: let browsers = @@ -242,14 +245,20 @@ let # TODO check platform for revisionOverrides "${name}-${value.revision}" ( - callPackage ./${name}.nix { - inherit suffix system throwSystem; - inherit (value) revision; - } + callPackage (./. + "/${name}.nix") ( + { + inherit suffix system throwSystem; + inherit (value) revision; + } + // lib.optionalAttrs (name == "chromium") { + inherit fontconfig_file; + } + ) ) ) browsers ) - ); + ) + ); in { playwright-core = playwright-core; diff --git a/pkgs/development/web/postman/darwin.nix b/pkgs/development/web/postman/darwin.nix deleted file mode 100644 index 79458298dcc1..000000000000 --- a/pkgs/development/web/postman/darwin.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenvNoCC -, fetchurl -, unzip -, pname -, version -, meta -}: - -let - appName = "Postman.app"; - dist = { - aarch64-darwin = { - arch = "arm64"; - sha256 = "sha256-V+JLXl12DnwZlPF0qNs2lQqRpWbSDiPXDTtl4FGcZcM="; - }; - - x86_64-darwin = { - arch = "64"; - sha256 = "sha256-l7J4Rrq+kUyk+0Chq5qo50K1VXC/7E3FC/hQ1DQ0PGA="; - }; - }.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); - -in - -stdenvNoCC.mkDerivation { - inherit pname version meta; - - src = fetchurl { - url = "https://dl.pstmn.io/download/version/${version}/osx_${dist.arch}"; - inherit (dist) sha256; - name = "${pname}-${version}.zip"; - }; - - nativeBuildInputs = [ unzip ]; - - # Postman is notarized on macOS. Running the fixup phase will change the shell scripts embedded - # in the bundle, which causes the notarization check to fail on macOS 13+. - # See https://eclecticlight.co/2022/06/17/app-security-changes-coming-in-ventura/ for more information. - dontFixup = true; - - sourceRoot = appName; - - installPhase = '' - runHook preInstall - mkdir -p $out/{Applications/${appName},bin} - cp -R . $out/Applications/${appName} - cat > $out/bin/${pname} << EOF - #!${stdenvNoCC.shell} - open -na $out/Applications/${appName} --args "$@" - EOF - chmod +x $out/bin/${pname} - runHook postInstall - ''; -} diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix deleted file mode 100644 index f9684f64feeb..000000000000 --- a/pkgs/development/web/postman/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenvNoCC, callPackage, lib }: - -let - pname = "postman"; - version = "11.1.0"; - meta = with lib; { - homepage = "https://www.getpostman.com"; - description = "API Development Environment"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.postman; - platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" ]; - maintainers = with maintainers; [ johnrichardrinehart evanjs tricktron Crafter ]; - }; - -in - -if stdenvNoCC.isDarwin -then callPackage ./darwin.nix { inherit pname version meta; } -else callPackage ./linux.nix { inherit pname version meta; } diff --git a/pkgs/development/web/postman/linux.nix b/pkgs/development/web/postman/linux.nix deleted file mode 100644 index bc1119103c44..000000000000 --- a/pkgs/development/web/postman/linux.nix +++ /dev/null @@ -1,161 +0,0 @@ -{ lib -, stdenv -, fetchurl -, makeDesktopItem -, wrapGAppsHook3 -, atk -, at-spi2-atk -, at-spi2-core -, alsa-lib -, cairo -, cups -, dbus -, expat -, gdk-pixbuf -, glib -, gtk3 -, freetype -, fontconfig -, nss -, nspr -, pango -, udev -, libsecret -, libuuid -, libX11 -, libxcb -, libXi -, libXcursor -, libXdamage -, libXrandr -, libXcomposite -, libXext -, libXfixes -, libXrender -, libXtst -, libXScrnSaver -, libxkbcommon -, libdrm -, mesa -# It's unknown which version of openssl that postman expects but it seems that -# OpenSSL 3+ seems to work fine (cf. -# https://github.com/NixOS/nixpkgs/issues/254325). If postman breaks apparently -# around OpenSSL stuff then try changing this dependency version. -, openssl -, xorg -, pname -, version -, meta -, copyDesktopItems -, makeWrapper -}: - -let - dist = { - aarch64-linux = { - arch = "arm64"; - sha256 = "sha256-yq2J5KRv/NJDaQG7e7RKyzbJqKWRolSU9X6khHxlrNo="; - }; - - x86_64-linux = { - arch = "64"; - sha256 = "sha256-fAaxrLZSXGBYr4Vu0Cz2pZwXivSTkaIF5wL217cB9qM="; - }; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - -in -stdenv.mkDerivation rec { - inherit pname version meta; - - src = fetchurl { - url = "https://dl.pstmn.io/download/version/${version}/linux${dist.arch}"; - inherit (dist) sha256; - name = "${pname}-${version}.tar.gz"; - }; - - dontConfigure = true; - - desktopItems = [ - (makeDesktopItem { - name = "postman"; - exec = "postman %U"; - icon = "postman"; - comment = "API Development Environment"; - desktopName = "Postman"; - genericName = "Postman"; - categories = [ "Development" ]; - }) - ]; - - buildInputs = [ - stdenv.cc.cc.lib - atk - at-spi2-atk - at-spi2-core - alsa-lib - cairo - cups - dbus - expat - gdk-pixbuf - glib - gtk3 - freetype - fontconfig - mesa - nss - nspr - pango - udev - libdrm - libsecret - libuuid - libX11 - libxcb - libXi - libXcursor - libXdamage - libXrandr - libXcomposite - libXext - libXfixes - libXrender - libXtst - libXScrnSaver - libxkbcommon - xorg.libxshmfence - ]; - - nativeBuildInputs = [ wrapGAppsHook3 copyDesktopItems ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/postman - cp -R app/* $out/share/postman - rm $out/share/postman/Postman - - mkdir -p $out/bin - ln -s $out/share/postman/postman $out/bin/postman - - source "${makeWrapper}/nix-support/setup-hook" - wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" - - mkdir -p $out/share/icons/hicolor/128x128/apps - ln -s $out/share/postman/resources/app/assets/icon.png $out/share/icons/postman.png - ln -s $out/share/postman/resources/app/assets/icon.png $out/share/icons/hicolor/128x128/apps/postman.png - runHook postInstall - ''; - - postFixup = '' - pushd $out/share/postman - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" postman - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" chrome_crashpad_handler - for file in $(find . -type f \( -name \*.node -o -name postman -o -name \*.so\* \) ); do - ORIGIN=$(patchelf --print-rpath $file); \ - patchelf --set-rpath "${lib.makeLibraryPath buildInputs}:$ORIGIN" $file - done - popd - wrapProgram $out/bin/postman --set PATH ${lib.makeBinPath [ openssl ]} - ''; -} diff --git a/pkgs/development/web/protege-distribution/default.nix b/pkgs/development/web/protege-distribution/default.nix deleted file mode 100644 index 3aa234b406bd..000000000000 --- a/pkgs/development/web/protege-distribution/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ lib -, stdenv -, fetchurl -, unzip -, jdk11 -, copyDesktopItems -, iconConvTools -, makeDesktopItem -, makeWrapper -}: - -stdenv.mkDerivation rec { - pname = "protege-distribution"; - version = "5.6.3"; - - src = fetchurl { - url = "https://github.com/protegeproject/protege-distribution/releases/download/protege-${version}/Protege-${version}-platform-independent.zip"; - sha256 = "08pr0rn76wcc9bczdf93nlshxbid4z4nyvmaz198hhlq96aqpc3i"; - }; - - nativeBuildInputs = [ - copyDesktopItems - iconConvTools - jdk11 - makeWrapper - unzip - ]; - - patches = [ - # Replace logic for searching the install directory with a static cd into $out - ./static-path.patch - # Disable console logging, maintaining only file-based logging - ./disable-console-log.patch - ]; - - postPatch = '' - # Resolve @out@ (introduced by "static-path.patch") to $out - substituteInPlace run.sh --subst-var-by out $out - ''; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - - # Wrap launch script to set $JAVA_HOME correctly - mv run.sh $out/bin/run-protege - wrapProgram $out/bin/run-protege --set JAVA_HOME ${jdk11.home} - - # Generate and copy icons to where they can be found - icoFileToHiColorTheme app/Protege.ico protege $out - - # Move everything else under protege/ - mkdir $out/protege - mv {bundles,conf,plugins} $out/protege - - runHook postInstall - ''; - - desktopItems = [ - (makeDesktopItem { - name = "Protege"; - desktopName = "Protege Desktop"; - icon = "protege"; - comment = "OWL2 ontology editor"; - categories = [ "Development" ]; - exec = "run-protege"; - }) - ]; - - meta = with lib; { - description = "OWL2 ontology editor from Stanford, with third-party plugins included"; - homepage = "https://protege.stanford.edu/"; - downloadPage = "https://protege.stanford.edu/products.php#desktop-protege"; - maintainers = with maintainers; [ nessdoor ]; - license = with licenses; [ asl20 bsd2 epl10 lgpl3 ]; - platforms = platforms.linux; - mainProgram = "run-protege"; - }; -} diff --git a/pkgs/development/web/protege-distribution/disable-console-log.patch b/pkgs/development/web/protege-distribution/disable-console-log.patch deleted file mode 100644 index edd6277ffa3a..000000000000 --- a/pkgs/development/web/protege-distribution/disable-console-log.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/conf/logback.xml 2021-06-25 00:49:10.446416341 +0900 -+++ b/conf/logback.xml 2021-06-25 00:50:32.889120465 +0900 -@@ -1,13 +1,6 @@ - <?xml version="1.0" encoding="UTF-8"?> - <configuration scan="true" scanPeriod="10 seconds"> - -- <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender"> -- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> -- <Pattern>%highlight(%msg) %n</Pattern> -- </encoder> -- </appender> -- -- - <appender name="files" class="ch.qos.logback.core.FileAppender"> - <file>${user.home}/.Protege/logs/protege.log</file> - <append>true</append> -@@ -18,9 +11,8 @@ - - - <root level="info"> -- <appender-ref ref="stdout" /> - <appender-ref ref="files"/> - </root> - - --</configuration> -\ No newline at end of file -+</configuration> diff --git a/pkgs/development/web/protege-distribution/static-path.patch b/pkgs/development/web/protege-distribution/static-path.patch deleted file mode 100644 index 66762f70ca9f..000000000000 --- a/pkgs/development/web/protege-distribution/static-path.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/run.sh 2021-06-24 22:30:20.764897745 +0900 -+++ b/run.sh 2021-06-24 22:29:47.211210142 +0900 -@@ -1,12 +1,6 @@ - #!/usr/bin/env bash - --SOURCE="${BASH_SOURCE[0]}" --while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink -- DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" -- SOURCE="$(readlink "$SOURCE")" -- [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located --done --cd "$( cd -P "$( dirname "$SOURCE" )" && pwd )" -+cd @out@/protege - - java -Xmx500M -Xms200M \ - -Xss16M \ diff --git a/pkgs/development/web/publii/default.nix b/pkgs/development/web/publii/default.nix deleted file mode 100644 index e81a7294e0cc..000000000000 --- a/pkgs/development/web/publii/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ stdenv -, lib -, fetchurl -, autoPatchelfHook -, makeShellWrapper -, wrapGAppsHook3 -, alsa-lib -, at-spi2-atk -, at-spi2-core -, atk -, cairo -, cups -, dbus -, expat -, glib -, gtk3 -, libsecret -, mesa -, nss -, pango -, udev -, xdg-utils -, xorg -}: - -stdenv.mkDerivation rec { - pname = "publii"; - version = "0.45.2"; - - src = fetchurl { - url = "https://getpublii.com/download/Publii-${version}.deb"; - hash = "sha256-NGS5ovaJ6XskCimN48mqvUdoA+N9eDlIpazV0GDEs3E="; - }; - - dontConfigure = true; - dontBuild = true; - dontWrapGApps = true; - - nativeBuildInputs = [ - autoPatchelfHook - makeShellWrapper - wrapGAppsHook3 - ]; - - buildInputs = [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - glib - gtk3 - libsecret - mesa - nss - pango - xorg.libX11 - xorg.libxcb - ]; - - unpackPhase = '' - ar p $src data.tar.xz | tar xJ - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - - mv usr/share $out - substituteInPlace $out/share/applications/Publii.desktop \ - --replace 'Exec=/opt/Publii/Publii' 'Exec=Publii' - - mv opt $out - - runHook postInstall - ''; - - preFixup = '' - makeWrapper $out/opt/Publii/Publii $out/bin/Publii \ - "''${gappsWrapperArgs[@]}" \ - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} - ''; - - meta = with lib; { - description = "Static Site CMS with GUI to build privacy-focused SEO-friendly website"; - mainProgram = "Publii"; - longDescription = '' - Creating a website doesn't have to be complicated or expensive. With Publii, the most - intuitive static site CMS, you can create a beautiful, safe, and privacy-friendly website - quickly and easily; perfect for anyone who wants a fast, secure website in a flash. - ''; - homepage = "https://getpublii.com"; - changelog = "https://github.com/getpublii/publii/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with lib.maintainers; [ urandom sebtm ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/web/shopify-themekit/default.nix b/pkgs/development/web/shopify-themekit/default.nix deleted file mode 100644 index d6bb23a8ed21..000000000000 --- a/pkgs/development/web/shopify-themekit/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "shopify-themekit"; - version = "1.3.2"; - - src = fetchFromGitHub { - owner = "Shopify"; - repo = "themekit"; - rev = "v${version}"; - sha256 = "sha256-A/t6yQW2xRFZYuYRyNN/0v4zdivch3tiv65a7TdHm2c="; - }; - - vendorHash = "sha256-o928qjp7+/U1W03esYTwVEfQ4A3TmPnmgmh4oWpqJoo="; - - ldflags = [ "-s" "-w" ]; - - postInstall = '' - # Keep `theme` only - rm -f $out/bin/{cmd,tkrelease} - ''; - - meta = with lib; { - description = "Command line tool for shopify themes"; - mainProgram = "theme"; - homepage = "https://shopify.github.io/themekit/"; - license = licenses.mit; - maintainers = with maintainers; [ _1000101 ]; - }; -} diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix deleted file mode 100644 index 328154ef810f..000000000000 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchurl -, unzip -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "bootstrap"; - version = "5.3.3"; - - src = fetchurl { - url = "https://github.com/twbs/bootstrap/releases/download/v${finalAttrs.version}/bootstrap-${finalAttrs.version}-dist.zip"; - hash = "sha256-WwokWrhFiVFmjSn9FJ/GyOY8Z2l378I4IqIjwIJF3ho="; - }; - - nativeBuildInputs = [ unzip ]; - - dontBuild = true; - installPhase = '' - runHook preInstall - - mkdir $out - cp -r * $out/ - - runHook postInstall - ''; - - meta = { - description = "Front-end framework for faster and easier web development"; - homepage = "https://getbootstrap.com/"; - license = lib.licenses.mit; - }; -}) diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix deleted file mode 100644 index caf29a2cc027..000000000000 --- a/pkgs/development/web/valum/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, meson, ninja, pkg-config, fetchFromGitHub, glib, vala, ctpl -, libgee, libsoup, fcgi }: - -stdenv.mkDerivation rec { - pname = "valum"; - version = "0.3.18"; - - src = fetchFromGitHub { - owner = "valum-framework"; - repo = "valum"; - rev = "v${version}"; - sha256 = "sha256-baAv83YiX8HdBm/t++ktB7pmTVlt4aWZ5xnsAs/NrTI="; - }; - - nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ glib vala ctpl libgee libsoup fcgi ]; - - meta = with lib; { - homepage = "https://github.com/valum-framework/valum"; - description = "Web micro-framework written in Vala"; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = [ ]; - # Likely broken by GLib 2.74 switch to PCRE 2. - # https://github.com/valum-framework/valum/issues/238 - broken = true; - }; -} diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix deleted file mode 100644 index 13295edd310a..000000000000 --- a/pkgs/development/web/wml/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib, fetchurl, perlPackages, ncurses, lynx, makeWrapper }: - -perlPackages.buildPerlPackage { - pname = "wml"; - version = "2.0.11"; - - src = fetchurl { - url = "http://thewml.org/distrib/wml-2.0.11.tar.gz"; - sha256 = "0jjxpq91x7y2mgixz7ghqp01m24qa37wl3zz515rrzv7x8cyy4cf"; - }; - - setOutputFlags = false; - - # Getting lots of Non-ASCII character errors from pod2man. - # Inserting =encoding utf8 before the first =head occurrence. - # Wasn't able to fix mp4h. - preConfigure = '' - touch Makefile.PL - for i in wml_backend/p6_asubst/asubst.src wml_aux/freetable/freetable.src wml_docs/*.pod wml_include/des/*.src wml_include/fmt/*.src; do - sed -i '0,/^=head/{s/^=head/=encoding utf8\n=head/}' $i - done - sed -i 's/ doc / /g' wml_backend/p2_mp4h/Makefile.in - sed -i '/p2_mp4h\/doc/d' Makefile.in - ''; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = with perlPackages; - [ perl TermReadKey GD BitVector ncurses lynx ImageSize ]; - - patches = [ ./redhat-with-thr.patch ./dynaloader.patch ./no_bitvector.patch ]; - - # Workaround build failure on -fno-common toolchains: - # ld: iselect_browse.o:(.bss+0x2020): multiple definition of `Line'; iselect_main.o:(.bss+0x100000): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - hardeningDisable = [ "format" ]; - - postPatch = '' - substituteInPlace wml_frontend/wml.src \ - --replace "File::PathConvert::realpath" "Cwd::realpath" \ - --replace "File::PathConvert::abs2rel" "File::Spec->abs2rel" \ - --replace "File::PathConvert" "File::Spec" - - for i in wml_include/des/imgbg.src wml_include/des/imgdot.src; do - substituteInPlace $i \ - --replace "WML::GD" "GD" - done - - rm wml_test/t/11-wmk.t - ''; - - preFixup = '' - wrapProgram $out/bin/wml \ - --set PERL5LIB ${with perlPackages; makePerlPath [ - BitVector TermReadKey ImageSize - ]} - ''; - - enableParallelBuilding = false; - - installTargets = [ "install" ]; - - meta = with lib; { - homepage = "https://www.shlomifish.org/open-source/projects/website-meta-language/"; - description = "Off-line HTML generation toolkit for Unix"; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/web/wml/dynaloader.patch b/pkgs/development/web/wml/dynaloader.patch deleted file mode 100644 index 89b9f0427f9b..000000000000 --- a/pkgs/development/web/wml/dynaloader.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/wml_backend/p3_eperl/configure 2009-10-03 19:12:29.000000000 -0500 -+++ b/wml_backend/p3_eperl/configure 2009-10-03 19:12:45.000000000 -0500 -@@ -678,7 +678,7 @@ - #define HAVE_PERL_DYNALOADER 1 - EOF - -- perl_dla=$perl_archlib/auto/DynaLoader/DynaLoader.a -+ perl_dla=$perl_archlib/CORE/libperl.so - ;; - * ) - rc=no \ No newline at end of file diff --git a/pkgs/development/web/wml/no_bitvector.patch b/pkgs/development/web/wml/no_bitvector.patch deleted file mode 100644 index d5fe926c4c7d..000000000000 --- a/pkgs/development/web/wml/no_bitvector.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/wml_common/Makefile.in 2014-12-17 00:28:25.156736048 +0100 -+++ b/wml_common/Makefile.in 2014-12-17 00:28:30.501817958 +0100 -@@ -45,7 +45,6 @@ - have_gd=0 - - SUBDIRS = \ -- bitvector \ - filepathconvert \ - gd \ - getoptlong \ diff --git a/pkgs/development/web/wml/redhat-with-thr.patch b/pkgs/development/web/wml/redhat-with-thr.patch deleted file mode 100644 index 4b06ccb3f56a..000000000000 --- a/pkgs/development/web/wml/redhat-with-thr.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Fix FTBFS with Perl 5.16 - Patch taken from Fedora -Debian-Bug: 676263 -Fedora-Bug: 839609 -Author: Jitka Plesnikova -Origin: https://bugzilla.redhat.com/show_bug.cgi?id=839609 - ---- a/wml_backend/p3_eperl/eperl_perl5.h 2012-07-27 10:49:27.048508799 +0200 -+++ b/wml_backend/p3_eperl/eperl_perl5.h 2012-07-27 10:50:16.288714291 +0200 -@@ -72,9 +72,6 @@ - # define PL_curstash curstash - #endif - --#ifndef WITH_THR --# define PL_defoutgv defoutgv --#endif - - /* - Initialization of locales when building a new Perl interpreter. \ No newline at end of file diff --git a/pkgs/development/web/woff2/brotli-static.patch b/pkgs/development/web/woff2/brotli-static.patch deleted file mode 100644 index 4ed6d7e741a8..000000000000 --- a/pkgs/development/web/woff2/brotli-static.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff a/cmake/FindBrotliDec.cmake b/cmake/FindBrotliDec.cmake ---- a/cmake/FindBrotliDec.cmake -+++ b/cmake/FindBrotliDec.cmake -@@ -18,10 +18,10 @@ find_path(BROTLIDEC_INCLUDE_DIRS - HINTS ${PC_BROTLIDEC_INCLUDEDIR} - ) - --find_library(BROTLIDEC_LIBRARIES -- NAMES brotlidec -- HINTS ${PC_BROTLIDEC_LIBDIR} --) -+if(NOT BUILD_SHARED_LIBS) -+ set(_S "STATIC_") -+endif() -+set(BROTLIDEC_LIBRARIES ${PC_BROTLIDEC_${_S}LIBRARIES}) - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(BrotliDec -diff a/cmake/FindBrotliEnc.cmake b/cmake/FindBrotliEnc.cmake ---- a/cmake/FindBrotliEnc.cmake -+++ b/cmake/FindBrotliEnc.cmake -@@ -18,10 +18,10 @@ find_path(BROTLIENC_INCLUDE_DIRS - HINTS ${PC_BROTLIENC_INCLUDEDIR} - ) - --find_library(BROTLIENC_LIBRARIES -- NAMES brotlienc -- HINTS ${PC_BROTLIENC_LIBDIR} --) -+if(NOT BUILD_SHARED_LIBS) -+ set(_S "STATIC_") -+endif() -+set(BROTLIENC_LIBRARIES ${PC_BROTLIENC_${_S}LIBRARIES}) - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(BrotliEnc diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix deleted file mode 100644 index 2f1863444980..000000000000 --- a/pkgs/development/web/woff2/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ brotli, cmake, pkg-config, fetchFromGitHub, lib, stdenv -, static ? stdenv.hostPlatform.isStatic -}: - -stdenv.mkDerivation rec { - pname = "woff2"; - version = "1.0.2"; - - src = fetchFromGitHub { - owner = "google"; - repo = "woff2"; - rev = "v${version}"; - sha256 = "13l4g536h0pr84ww4wxs2za439s0xp1va55g6l478rfbb1spp44y"; - }; - - outputs = [ "out" "dev" "lib" ]; - - # Need to explicitly link to brotlicommon - patches = lib.optional static ./brotli-static.patch; - - nativeBuildInputs = [ cmake pkg-config ]; - - cmakeFlags = [ - "-DCANONICAL_PREFIXES=ON" - "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" - ] ++ lib.optional static "-DCMAKE_SKIP_RPATH:BOOL=TRUE"; - - propagatedBuildInputs = [ brotli ]; - - postPatch = '' - # without this binaries only get built if shared libs are disable - sed 's@^if (NOT BUILD_SHARED_LIBS)$@if (TRUE)@g' -i CMakeLists.txt - ''; - - meta = with lib; { - description = "Webfont compression reference code"; - homepage = "https://github.com/google/woff2"; - license = licenses.mit; - maintainers = [ maintainers.hrdinka ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/web/xmlindent/default.nix b/pkgs/development/web/xmlindent/default.nix deleted file mode 100644 index a860c102a219..000000000000 --- a/pkgs/development/web/xmlindent/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, flex }: - -stdenv.mkDerivation rec { - pname = "xmlindent"; - version = "0.2.17"; - - src = fetchurl { - url = "mirror://sourceforge/project/xmlindent/xmlindent/${version}/${pname}-${version}.tar.gz"; - sha256 = "0k15rxh51a5r4bvfm6c4syxls8al96cx60a9mn6pn24nns3nh3rs"; - }; - - buildInputs = [ flex ]; - - preConfigure = '' - substituteInPlace Makefile --replace "PREFIX=/usr/local" "PREFIX=$out" - ''; - - meta = { - description = "XML stream reformatter"; - mainProgram = "xmlindent"; - homepage = "https://xmlindent.sourceforge.net/"; - license = lib.licenses.gpl3; - platforms = lib.platforms.linux; - maintainers = [ ]; - }; -} |